1917 files changed, 99032 insertions, 48505 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89fe482d7ec..5b70110947b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,3 @@
-# -*- mode: cmake; indent-tabs-mode: t; -*-
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
@@ -229,19 +228,17 @@ option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install fol
 set(PYTHON_NUMPY_PATH            "" CACHE PATH "Python to python site-packages or dist-packages containing 'numpy' module")
 mark_as_advanced(PYTHON_NUMPY_PATH)
 
-option(WITH_MINGW64                   "Use the 64-bit version of MinGW" OFF)
-mark_as_advanced(WITH_MINGW64)
+if(MINGW)
+	option(WITH_MINGW64                   "Use the 64-bit version of MinGW" OFF)
+	mark_as_advanced(WITH_MINGW64)
+endif()
 
 # Cycles
 option(WITH_CYCLES					"Enable cycles Render Engine" ON)
 option(WITH_CYCLES_TEST				"Build cycles test application" OFF)
+option(WITH_CYCLES_OSL				"Build Cycles with OSL support" OFF)
 option(WITH_CYCLES_CUDA_BINARIES	"Build cycles CUDA binaries" OFF)
-if(WIN32 AND NOT CMAKE_CL_64 AND NOT WITH_MINGW64)
-	set(PLATFORM_DEFAULT sm_20 sm_21)
-else()
-	set(PLATFORM_DEFAULT sm_13 sm_20 sm_21)
-endif()
-set(CYCLES_CUDA_BINARIES_ARCH ${PLATFORM_DEFAULT} CACHE STRING "CUDA architectures to build binaries for")
+set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build binaries for")
 mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
 unset(PLATFORM_DEFAULT)
 
@@ -557,7 +554,7 @@ if(UNIX AND NOT APPLE)
 		endif()
 
 		mark_as_advanced(FFMPEG)
-		set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
+		set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include/ffmpeg)
 		mark_as_advanced(FFMPEG_LIBRARIES)
 		set(FFMPEG_LIBPATH ${FFMPEG}/lib)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
@@ -650,10 +647,17 @@ if(UNIX AND NOT APPLE)
 
 		find_package(OpenImageIO)
 
-		set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})
+		set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})
 		set(OPENIMAGEIO_LIBPATH)  # TODO, remove and reference the absolute path everywhere
 		set(OPENIMAGEIO_DEFINITIONS)
 
+		if(WITH_IMAGE_TIFF)
+			list(APPEND OPENIMAGEIO_LIBRARIES "${TIFF_LIBRARY}")
+		endif()
+		if(WITH_IMAGE_OPENEXR)
+			list(APPEND OPENIMAGEIO_LIBRARIES "${OPENEXR_LIBRARIES}")
+		endif()
+
 		if(NOT OPENIMAGEIO_FOUND)
 			set(WITH_OPENIMAGEIO OFF)
 			set(WITH_CYCLES OFF)
@@ -1105,7 +1109,7 @@ elseif(WIN32)
 
 		if(WITH_CODEC_FFMPEG)
 			set(FFMPEG ${LIBDIR}/ffmpeg)
-			set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include)
+			set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
 			if(WITH_MINGW64)
 				set(FFMPEG_LIBRARIES avcodec.dll avformat.dll avdevice.dll avutil.dll swscale.dll swresample.dll)
 			else()
@@ -1601,6 +1605,20 @@ if(CMAKE_COMPILER_IS_GNUCC)
 		ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
 	endif()
 
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_AUTOLOGICAL_COMPARE -Wno-tautological-compare)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas)
+	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts)
+
+	ADD_CHECK_C_COMPILER_FLAG(CXX_WARNINGS C_WARN_ALL -Wall)
+	ADD_CHECK_C_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_AUTOLOGICAL_COMPARE -Wno-tautological-compare)
+	ADD_CHECK_C_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas)
+	ADD_CHECK_C_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts)
+	ADD_CHECK_C_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_OVERLOADED_VIRTUAL -Wno-overloaded-virtual)  # we get a lot of these, if its a problem a dev needs to look into it.
+	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof)
+
 elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
diff --git a/GNUmakefile b/GNUmakefile
index f2ac0285407..f5cba00d452 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -109,9 +109,12 @@ all:
 	@echo
 	@echo Configuring Blender ...
 
-	if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
-		$(CMAKE_CONFIG); \
-	fi
+	# if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
+	# 	$(CMAKE_CONFIG); \
+	# fi
+	
+	# do this always incase of failed initial build, could be smarter here...
+	$(CMAKE_CONFIG)
 
 	@echo
 	@echo Building Blender ...
diff --git a/SConstruct b/SConstruct
index bbf3dff0394..9bc61d7aeb2 100644
--- a/SConstruct
+++ b/SConstruct
@@ -667,42 +667,6 @@ if env['OURPLATFORM']=='linuxcross':
 
     scriptinstall.append(env.Install(dir=dir, source=source))
 
-#-- plugins
-pluglist = []
-plugtargetlist = []
-for tp, tn, tf in os.walk('release/plugins'):
-    if '.svn' in tn:
-        tn.remove('.svn')
-    if '_svn' in tn:
-        tn.remove('_svn')
-    df = tp[8:] # remove 'release/'
-    for f in tf:
-        pluglist.append(os.path.join(tp, f))
-        plugtargetlist.append( os.path.join(env['BF_INSTALLDIR'], VERSION, df, f) )
-
-
-# header files for plugins
-pluglist.append('source/blender/blenpluginapi/documentation.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'documentation.h'))
-pluglist.append('source/blender/blenpluginapi/externdef.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'externdef.h'))
-pluglist.append('source/blender/blenpluginapi/floatpatch.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'floatpatch.h'))
-pluglist.append('source/blender/blenpluginapi/iff.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'iff.h'))
-pluglist.append('source/blender/blenpluginapi/plugin.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'plugin.h'))
-pluglist.append('source/blender/blenpluginapi/util.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'util.h'))
-pluglist.append('source/blender/blenpluginapi/plugin.DEF')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'plugin.def'))
-
-plugininstall = []
-# plugins in blender 2.5 don't work at the moment.
-#for targetdir,srcfile in zip(plugtargetlist, pluglist):
-#    td, tf = os.path.split(targetdir)
-#    plugininstall.append(env.Install(dir=td, source=srcfile))
-
 textlist = []
 texttargetlist = []
 for tp, tn, tf in os.walk('release/text'):
@@ -716,11 +680,11 @@ for tp, tn, tf in os.walk('release/text'):
 textinstall = env.Install(dir=env['BF_INSTALLDIR'], source=textlist)
 
 if  env['OURPLATFORM']=='darwin':
-        allinstall = [blenderinstall, plugininstall, textinstall]
+        allinstall = [blenderinstall, textinstall]
 elif env['OURPLATFORM']=='linux':
-        allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall, iconinstall]
+        allinstall = [blenderinstall, dotblenderinstall, scriptinstall, textinstall, iconinstall]
 else:
-        allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall]
+        allinstall = [blenderinstall, dotblenderinstall, scriptinstall, textinstall]
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
     dllsources = []
diff --git a/build_files/buildbot/config/user-config-i686.py b/build_files/buildbot/config/user-config-i686.py
index f7190b3dedb..b07dd505369 100644
--- a/build_files/buildbot/config/user-config-i686.py
+++ b/build_files/buildbot/config/user-config-i686.py
@@ -97,6 +97,7 @@ WITH_BF_JACK = True
 # Cycles
 WITH_BF_CYCLES = True
 WITH_BF_CYCLES_CUDA_BINARIES = True
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
 
 WITH_BF_OIIO = True
 WITH_BF_STATICOIIO = True
diff --git a/build_files/buildbot/config/user-config-x86_64.py b/build_files/buildbot/config/user-config-x86_64.py
index ac2342057fb..5905a9c29dd 100644
--- a/build_files/buildbot/config/user-config-x86_64.py
+++ b/build_files/buildbot/config/user-config-x86_64.py
@@ -97,6 +97,7 @@ WITH_BF_JACK = True
 # Cycles
 WITH_BF_CYCLES = True
 WITH_BF_CYCLES_CUDA_BINARIES = True
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
 
 WITH_BF_OIIO = True
 WITH_BF_STATICOIIO = True
diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake
index e72a0fff355..d19f0cf32e8 100644
--- a/build_files/cmake/config/blender_lite.cmake
+++ b/build_files/cmake/config/blender_lite.cmake
@@ -17,6 +17,7 @@ set(WITH_FFTW3               OFF CACHE FORCE BOOL)
 set(WITH_LIBMV               OFF CACHE FORCE BOOL)
 set(WITH_CARVE               OFF CACHE FORCE BOOL)
 set(WITH_GAMEENGINE          OFF CACHE FORCE BOOL)
+set(WITH_GHOST_XDND          OFF CACHE FORCE BOOL)
 set(WITH_IK_ITASC            OFF CACHE FORCE BOOL)
 set(WITH_IMAGE_CINEON        OFF CACHE FORCE BOOL)
 set(WITH_IMAGE_DDS           OFF CACHE FORCE BOOL)
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index fbd28cc2398..2b61ddca648 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -1,5 +1,27 @@
-# -*- mode: cmake; indent-tabs-mode: t; -*-
-
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The Original Code is Copyright (C) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Jacques Beaurain.
+#
+# ***** END GPL LICENSE BLOCK *****
 
 # foo_bar.spam --> foo_barMySuffix.spam
 macro(file_suffix
diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py
index 5d52f0e34b6..db30f453228 100644
--- a/build_files/scons/config/win32-vc-config.py
+++ b/build_files/scons/config/win32-vc-config.py
@@ -165,7 +165,7 @@ BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 #CUDA
 WITH_BF_CYCLES_CUDA_BINARIES = False
 #BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21'] # don't build sm_13 until the compile can fit in 32bit process again :)
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
 
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py
index 3a376be6024..fe16278dd19 100644
--- a/build_files/scons/config/win64-vc-config.py
+++ b/build_files/scons/config/win64-vc-config.py
@@ -162,11 +162,12 @@ BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 #CUDA
 WITH_BF_CYCLES_CUDA_BINARIES = False
 #BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
 
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
-BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2']
+# No need to manually specify SSE/SSE2 on x64 systems.
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['']
 
 WITH_BF_STATICOPENGL = False
 BF_OPENGL_INC = '${BF_OPENGL}/include'
diff --git a/doc/python_api/examples/bpy.types.Object.py b/doc/python_api/examples/bpy.types.Object.py
new file mode 100644
index 00000000000..2ddce248a5b
--- /dev/null
+++ b/doc/python_api/examples/bpy.types.Object.py
@@ -0,0 +1,27 @@
+"""
+Basic Object Operations Example
++++++++++++++++++++++++++++++++
+This script demonstrates basic operations on object like creating new
+object, placing it into scene, selecting it and making it active.
+"""
+
+import bpy
+from mathutils import Matrix
+
+scene = bpy.context.scene
+
+# Create new lamp datablock
+lamp_data = bpy.data.lamps.new(name="New Lamp", type='POINT')
+
+# Create new object with our lamp datablock
+lamp_object = bpy.data.objects.new(name="New Lamp", object_data=lamp_data)
+
+# Link lamp object to the scene so it'll appear in this scene
+scene.objects.link(lamp_object)
+
+# Place lamp to a specified location
+lamp_object.location = (5.0, 5.0, 5.0)
+
+# And finally select it make active
+lamp_object.select = True
+scene.objects.active = lamp_object
diff --git a/doc/python_api/examples/bpy.types.Panel.1.py b/doc/python_api/examples/bpy.types.Panel.1.py
index cd85d30cea0..fbcdae8baeb 100644
--- a/doc/python_api/examples/bpy.types.Panel.1.py
+++ b/doc/python_api/examples/bpy.types.Panel.1.py
@@ -2,7 +2,7 @@
 Simple Object Panel
 +++++++++++++++++++
 This panel has a :class:`Panel.poll` and :class:`Panel.draw_header` function,
-even though the contents is basic this closely resemples blenders panels.
+even though the contents is basic this closely resembles blenders panels.
 """
 import bpy
 
diff --git a/doc/python_api/rst/bge.types.rst b/doc/python_api/rst/bge.types.rst
index bcef816dc9d..ff85df1f68b 100644
--- a/doc/python_api/rst/bge.types.rst
+++ b/doc/python_api/rst/bge.types.rst
@@ -2692,7 +2692,7 @@ Game Types (bge.types)
 
       The angle of the cone (in degrees) with which to test.
 
-      :type: float from 0 to 360
+      :type: float
 
    .. attribute:: axis
 
@@ -2703,11 +2703,6 @@ Game Types (bge.types)
       KX_RADAR_AXIS_POS_X, KX_RADAR_AXIS_POS_Y, KX_RADAR_AXIS_POS_Z, 
       KX_RADAR_AXIS_NEG_X, KX_RADAR_AXIS_NEG_Y, KX_RADAR_AXIS_NEG_Z
 
-   .. method:: getConeHeight()
-
-      :return: The height of the cone with which to test.
-      :rtype: float
-
 .. class:: KX_RaySensor(SCA_ISensor)
 
    A ray sensor detects the first object in a given direction.
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py
index bfef94b35d7..d61b5bb7521 100644
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -934,6 +934,8 @@ def pycontext2sphinx(basepath):
         "image_context_dir",
         "node_context_dir",
         "text_context_dir",
+        "clip_context_dir",
+        "sequencer_context_dir",
     )
 
     # Changes in blender will force errors here
@@ -943,6 +945,7 @@ def pycontext2sphinx(basepath):
         "active_object": ("Object", False),
         "active_operator": ("Operator", False),
         "active_pose_bone": ("PoseBone", False),
+        "active_node": ("Node", False),
         "armature": ("Armature", False),
         "bone": ("Bone", False),
         "brush": ("Brush", False),
@@ -953,6 +956,8 @@ def pycontext2sphinx(basepath):
         "dynamic_paint": ("DynamicPaintModifier", False),
         "edit_bone": ("EditBone", False),
         "edit_image": ("Image", False),
+        "edit_mask": ("Mask", False),
+        "edit_movieclip": ("MovieClip", False),
         "edit_object": ("Object", False),
         "edit_text": ("Text", False),
         "editable_bones": ("EditBone", True),
diff --git a/doc/python_api/sphinx_doc_gen.sh b/doc/python_api/sphinx_doc_gen.sh
index ccb293d7a0e..92461961920 100755
--- a/doc/python_api/sphinx_doc_gen.sh
+++ b/doc/python_api/sphinx_doc_gen.sh
@@ -61,7 +61,7 @@ if $DO_OUT_HTML ; then
 
 	# annoying bug in sphinx makes it very slow unless we do this. should report.
 	cd $SPHINXBASE
-	sphinx-build -n -b html sphinx-in sphinx-out
+	sphinx-build -b html sphinx-in sphinx-out
 
 	# XXX, saves space on upload and zip, should move HTML outside
 	# and zip up there, for now this is OK
diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt
index 51b295e897f..4bf26ab3794 100644
--- a/extern/bullet2/CMakeLists.txt
+++ b/extern/bullet2/CMakeLists.txt
@@ -43,9 +43,9 @@ set(SRC
 	src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
 	src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
 	src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
-	src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
 	src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp
 	src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
+	src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp
 	src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
 	src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
 	src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
@@ -54,16 +54,21 @@ set(SRC
 	src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
 	src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
 	src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
+	src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp
 	src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
 	src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp
 	src/BulletCollision/CollisionDispatch/btGhostObject.cpp
+	src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
+	src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h
 	src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
 	src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
 	src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
 	src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
 	src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
 	src/BulletCollision/CollisionDispatch/btUnionFind.cpp
+	src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
 	src/BulletCollision/CollisionShapes/btBoxShape.cpp
+	src/BulletCollision/CollisionShapes/btBox2dShape.cpp
 	src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
 	src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
 	src/BulletCollision/CollisionShapes/btCollisionShape.cpp
@@ -73,14 +78,16 @@ set(SRC
 	src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
 	src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
 	src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp
+	src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp
 	src/BulletCollision/CollisionShapes/btConvexShape.cpp
+	src/BulletCollision/CollisionShapes/btConvex2dShape.cpp
 	src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
 	src/BulletCollision/CollisionShapes/btCylinderShape.cpp
 	src/BulletCollision/CollisionShapes/btEmptyShape.cpp
 	src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
 	src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
-	src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
 	src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
+	src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
 	src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
 	src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
 	src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
@@ -97,11 +104,11 @@ set(SRC
 	src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
 	src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
 	src/BulletCollision/Gimpact/btContactProcessing.cpp
+	src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp
 	src/BulletCollision/Gimpact/btGImpactBvh.cpp
 	src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp
 	src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp
 	src/BulletCollision/Gimpact/btGImpactShape.cpp
-	src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp
 	src/BulletCollision/Gimpact/btTriangleShapeEx.cpp
 	src/BulletCollision/Gimpact/gim_box_set.cpp
 	src/BulletCollision/Gimpact/gim_contact.cpp
@@ -118,24 +125,28 @@ set(SRC
 	src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
 	src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
 	src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
+	src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp
+	
 	src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
 	src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
 	src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
 	src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp
+	src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp
 	src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
 	src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
 	src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
 	src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
 	src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp
 	src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
-	src/BulletDynamics/Dynamics/Bullet-C-API.cpp
-	src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
+	src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp
 	src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
 	src/BulletDynamics/Dynamics/btRigidBody.cpp
 	src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
+	src/BulletDynamics/Dynamics/Bullet-C-API.cpp
 	src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
 	src/BulletDynamics/Vehicle/btWheelInfo.cpp
-	src/BulletSoftBody/btDefaultSoftBodySolver.cpp
+	src/BulletDynamics/Character/btKinematicCharacterController.cpp
+	
 	src/BulletSoftBody/btSoftBody.cpp
 	src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
 	src/BulletSoftBody/btSoftBodyHelpers.cpp
@@ -143,22 +154,16 @@ set(SRC
 	src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
 	src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
 	src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
+	src/BulletSoftBody/btDefaultSoftBodySolver.cpp
+	
 	src/LinearMath/btAlignedAllocator.cpp
 	src/LinearMath/btConvexHull.cpp
+	src/LinearMath/btConvexHullComputer.cpp
 	src/LinearMath/btGeometryUtil.cpp
 	src/LinearMath/btQuickprof.cpp
 	src/LinearMath/btSerializer.cpp
-	# UNUSED
-	# src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp
-	# src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp
-	# src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
-	# src/BulletCollision/CollisionShapes/btBox2dShape.cpp
-	# src/BulletCollision/CollisionShapes/btConvex2dShape.cpp
-	# src/BulletDynamics/Character/btKinematicCharacterController.cpp
-	# src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp
-	# src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp
-
-	src/Bullet-C-Api.h
+	
+	
 	src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
 	src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
 	src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
@@ -171,9 +176,9 @@ set(SRC
 	src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
 	src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
 	src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
-	src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
 	src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h
 	src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
+	src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h
 	src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
 	src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
 	src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
@@ -183,6 +188,7 @@ set(SRC
 	src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
 	src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
 	src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
+	src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h
 	src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
 	src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
 	src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
@@ -193,7 +199,9 @@ set(SRC
 	src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
 	src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
 	src/BulletCollision/CollisionDispatch/btUnionFind.h
+	src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
 	src/BulletCollision/CollisionShapes/btBoxShape.h
+	src/BulletCollision/CollisionShapes/btBox2dShape.h
 	src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
 	src/BulletCollision/CollisionShapes/btCapsuleShape.h
 	src/BulletCollision/CollisionShapes/btCollisionMargin.h
@@ -204,15 +212,17 @@ set(SRC
 	src/BulletCollision/CollisionShapes/btConvexHullShape.h
 	src/BulletCollision/CollisionShapes/btConvexInternalShape.h
 	src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h
+	src/BulletCollision/CollisionShapes/btConvexPolyhedron.h
 	src/BulletCollision/CollisionShapes/btConvexShape.h
+	src/BulletCollision/CollisionShapes/btConvex2dShape.h
 	src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
 	src/BulletCollision/CollisionShapes/btCylinderShape.h
 	src/BulletCollision/CollisionShapes/btEmptyShape.h
 	src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
 	src/BulletCollision/CollisionShapes/btMaterial.h
 	src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
-	src/BulletCollision/CollisionShapes/btMultiSphereShape.h
 	src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
+	src/BulletCollision/CollisionShapes/btMultiSphereShape.h
 	src/BulletCollision/CollisionShapes/btOptimizedBvh.h
 	src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
 	src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
@@ -233,13 +243,13 @@ set(SRC
 	src/BulletCollision/Gimpact/btBoxCollision.h
 	src/BulletCollision/Gimpact/btClipPolygon.h
 	src/BulletCollision/Gimpact/btContactProcessing.h
+	src/BulletCollision/Gimpact/btGenericPoolAllocator.h
+	src/BulletCollision/Gimpact/btGeometryOperations.h
 	src/BulletCollision/Gimpact/btGImpactBvh.h
 	src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
 	src/BulletCollision/Gimpact/btGImpactMassUtil.h
 	src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h
 	src/BulletCollision/Gimpact/btGImpactShape.h
-	src/BulletCollision/Gimpact/btGenericPoolAllocator.h
-	src/BulletCollision/Gimpact/btGeometryOperations.h
 	src/BulletCollision/Gimpact/btQuantization.h
 	src/BulletCollision/Gimpact/btTriangleShapeEx.h
 	src/BulletCollision/Gimpact/gim_array.h
@@ -273,13 +283,15 @@ set(SRC
 	src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
 	src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h
 	src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h
-	src/BulletDynamics/Character/btCharacterControllerInterface.h
+	src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h
+	
 	src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
 	src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
 	src/BulletDynamics/ConstraintSolver/btContactConstraint.h
 	src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
 	src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
 	src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h
+	src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h
 	src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
 	src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
 	src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
@@ -289,41 +301,45 @@ set(SRC
 	src/BulletDynamics/ConstraintSolver/btSolverBody.h
 	src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
 	src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
+	src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h
 	src/BulletDynamics/Dynamics/btActionInterface.h
-	src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
 	src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
 	src/BulletDynamics/Dynamics/btDynamicsWorld.h
-	src/BulletDynamics/Dynamics/btRigidBody.h
 	src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
+	src/BulletDynamics/Dynamics/btRigidBody.h
 	src/BulletDynamics/Vehicle/btRaycastVehicle.h
 	src/BulletDynamics/Vehicle/btVehicleRaycaster.h
 	src/BulletDynamics/Vehicle/btWheelInfo.h
-	src/BulletSoftBody/btDefaultSoftBodySolver.h
+	src/BulletDynamics/Character/btCharacterControllerInterface.h
+	src/BulletDynamics/Character/btKinematicCharacterController.h
+	
 	src/BulletSoftBody/btSoftBody.h
-	src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
 	src/BulletSoftBody/btSoftBodyData.h
+	src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
 	src/BulletSoftBody/btSoftBodyHelpers.h
-	src/BulletSoftBody/btSoftBodyInternals.h
 	src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
-	src/BulletSoftBody/btSoftBodySolverVertexBuffer.h
-	src/BulletSoftBody/btSoftBodySolvers.h
 	src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
 	src/BulletSoftBody/btSoftRigidDynamicsWorld.h
 	src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
 	src/BulletSoftBody/btSparseSDF.h
+	src/BulletSoftBody/btSoftBodySolvers.h
+	src/BulletSoftBody/btDefaultSoftBodySolver.h
+	src/BulletSoftBody/btSoftBodySolverVertexBuffer.h
+	
 	src/LinearMath/btAabbUtil2.h
 	src/LinearMath/btAlignedAllocator.h
 	src/LinearMath/btAlignedObjectArray.h
 	src/LinearMath/btConvexHull.h
+	src/LinearMath/btConvexHullComputer.h
 	src/LinearMath/btDefaultMotionState.h
 	src/LinearMath/btGeometryUtil.h
+	src/LinearMath/btGrahamScan2dConvexHull.h
 	src/LinearMath/btHashMap.h
 	src/LinearMath/btIDebugDraw.h
 	src/LinearMath/btList.h
 	src/LinearMath/btMatrix3x3.h
 	src/LinearMath/btMinMax.h
 	src/LinearMath/btMotionState.h
-	src/LinearMath/btPoint3.h
 	src/LinearMath/btPoolAllocator.h
 	src/LinearMath/btQuadWord.h
 	src/LinearMath/btQuaternion.h
@@ -331,21 +347,14 @@ set(SRC
 	src/LinearMath/btRandom.h
 	src/LinearMath/btScalar.h
 	src/LinearMath/btSerializer.h
-	src/LinearMath/btSimdMinMax.h
 	src/LinearMath/btStackAlloc.h
 	src/LinearMath/btTransform.h
 	src/LinearMath/btTransformUtil.h
 	src/LinearMath/btVector3.h
+	
+	
 	src/btBulletCollisionCommon.h
 	src/btBulletDynamicsCommon.h
-	# src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h
-	# src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h
-	# src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h
-	# src/BulletCollision/CollisionShapes/btBox2dShape.h
-	# src/BulletCollision/CollisionShapes/btConvex2dShape.h
-	# src/BulletDynamics/Character/btKinematicCharacterController.h
-	# src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h
-	# src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h
 )
 
 if(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/extern/bullet2/patches/ghost_softbody.patch b/extern/bullet2/patches/ghost_softbody.patch
new file mode 100644
index 00000000000..b150d57040d
--- /dev/null
+++ b/extern/bullet2/patches/ghost_softbody.patch
@@ -0,0 +1,42 @@
+Index: extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
+===================================================================
+--- extern/bullet2/src/BulletSoftBody/btSoftBody.cpp	(Revision 43904)
++++ extern/bullet2/src/BulletSoftBody/btSoftBody.cpp	(Revision 43905)
+@@ -2780,21 +2780,23 @@
+ 	{
+ 		const RContact&		c = psb->m_rcontacts[i];
+ 		const sCti&			cti = c.m_cti;	
+-		btRigidBody* tmpRigid = btRigidBody::upcast(cti.m_colObj);
+ 
+-		const btVector3		va = tmpRigid ? tmpRigid->getVelocityInLocalPoint(c.m_c1)*dt : btVector3(0,0,0);
+-		const btVector3		vb = c.m_node->m_x-c.m_node->m_q;	
+-		const btVector3		vr = vb-va;
+-		const btScalar		dn = btDot(vr, cti.m_normal);		
+-		if(dn<=SIMD_EPSILON)
+-		{
+-			const btScalar		dp = btMin( (btDot(c.m_node->m_x, cti.m_normal) + cti.m_offset), mrg );
+-			const btVector3		fv = vr - (cti.m_normal * dn);
+-			// c0 is the impulse matrix, c3 is 1 - the friction coefficient or 0, c4 is the contact hardness coefficient
+-			const btVector3		impulse = c.m_c0 * ( (vr - (fv * c.m_c3) + (cti.m_normal * (dp * c.m_c4))) * kst );
+-			c.m_node->m_x -= impulse * c.m_c2;
+-			if (tmpRigid)
+-				tmpRigid->applyImpulse(impulse,c.m_c1);
++		if (cti.m_colObj->hasContactResponse()) {
++			btRigidBody* tmpRigid = btRigidBody::upcast(cti.m_colObj);
++			const btVector3		va = tmpRigid ? tmpRigid->getVelocityInLocalPoint(c.m_c1)*dt : btVector3(0,0,0);
++			const btVector3		vb = c.m_node->m_x-c.m_node->m_q;	
++			const btVector3		vr = vb-va;
++			const btScalar		dn = btDot(vr, cti.m_normal);		
++			if(dn<=SIMD_EPSILON)
++			{
++				const btScalar		dp = btMin( (btDot(c.m_node->m_x, cti.m_normal) + cti.m_offset), mrg );
++				const btVector3		fv = vr - (cti.m_normal * dn);
++				// c0 is the impulse matrix, c3 is 1 - the friction coefficient or 0, c4 is the contact hardness coefficient
++				const btVector3		impulse = c.m_c0 * ( (vr - (fv * c.m_c3) + (cti.m_normal * (dp * c.m_c4))) * kst );
++				c.m_node->m_x -= impulse * c.m_c2;
++				if (tmpRigid)
++					tmpRigid->applyImpulse(impulse,c.m_c1);
++			}
+ 		}
+ 	}
+ }
diff --git a/extern/bullet2/patches/pvs_warning_fixes.patch b/extern/bullet2/patches/pvs_warning_fixes.patch
new file mode 100644
index 00000000000..5a3fe140454
--- /dev/null
+++ b/extern/bullet2/patches/pvs_warning_fixes.patch
@@ -0,0 +1,31 @@
+Index: extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
+===================================================================
+--- extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h	(Revision 45907)
++++ extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h	(Revision 45908)
+@@ -45,7 +45,9 @@
+ 	int	getTriangleIndex() const
+ 	{
+ 		// Get only the lower bits where the triangle index is stored
+-		return (m_PartIdTriangleIndex&~((~0)<<(31-MAX_NUM_PARTS_IN_BITS)));
++		unsigned int x = 0;
++		unsigned int y = (~(x&0))<<(31-MAX_NUM_PARTS_IN_BITS);
++		return (m_PartIdTriangleIndex&~(y));
+ 	}
+ 	int	getPartId() const
+ 	{
+Index: extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
+===================================================================
+--- extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h	(Revision 45907)
++++ extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h	(Revision 45908)
+@@ -78,8 +78,10 @@
+ 	int	getTriangleIndex() const
+ 	{
+ 		btAssert(isLeafNode());
++		unsigned int x=0;
++		unsigned int y = (~(x&0))<<(31-MAX_NUM_PARTS_IN_BITS);
+ 		// Get only the lower bits where the triangle index is stored
+-		return (m_escapeIndexOrTriangleIndex&~((~0)<<(31-MAX_NUM_PARTS_IN_BITS)));
++		return (m_escapeIndexOrTriangleIndex&~(y));
+ 	}
+ 	int	getPartId() const
+ 	{
diff --git a/extern/bullet2/readme.txt b/extern/bullet2/readme.txt
index e2546b049e3..e537ac26189 100644
--- a/extern/bullet2/readme.txt
+++ b/extern/bullet2/readme.txt
@@ -1,21 +1,15 @@
-***
-Apply bullet_compound_raycast.patch if not already applied in Bullet source
-This patch is needed to return correct raycast results on compound shape.
-/ben
-
-
-*** These files in extern/bullet2 are NOT part of the Blender build yet ***
-
 This is the new refactored version of Bullet physics library version 2.x
 
-Soon this will replace the old Bullet version in extern/bullet.
-First the integration in Blender Game Engine needs to be updated.
-Once that is done all build systems can be updated to use/build extern/bullet2 files.
-
 Questions? mail blender at erwincoumans.com, or check the bf-blender mailing list.
 Thanks,
 Erwin
 
+Apply patches/ghost_softbody.patch to prevent softbodies being hit by ghost objects.
+Originally committed in blender svn revision: 43905.
+
+Apply patches/pvs_warning_fixes.patch to fix warnings reported by PVS-Studio.
+Originally committed in blender svn revision: 45908.
+
 Apply patches/make_id.patch to prevent duplicated define of MAKE_ID macro in blender
 side and bullet side.
 Sergey
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
index 70cf3e4ace8..4f4d94b3cc7 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
@@ -16,8 +16,8 @@
 //
 // 3. This notice may not be removed or altered from any source distribution.
 
-#ifndef AXIS_SWEEP_3_H
-#define AXIS_SWEEP_3_H
+#ifndef BT_AXIS_SWEEP_3_H
+#define BT_AXIS_SWEEP_3_H
 
 #include "LinearMath/btVector3.h"
 #include "btOverlappingPairCache.h"
@@ -1026,7 +1026,7 @@ void btAxisSweep3Internal<BP_FP_INT_TYPE>::sortMaxUp(int axis, BP_FP_INT_TYPE ed
 
 
 /// The btAxisSweep3 is an efficient implementation of the 3d axis sweep and prune broadphase.
-/// It uses arrays rather than lists for storage of the 3 axis. Also it operates using 16 bit integer coordinates instead of floats.
+/// It uses arrays rather then lists for storage of the 3 axis. Also it operates using 16 bit integer coordinates instead of floats.
 /// For large worlds and many objects, use bt32BitAxisSweep3 or btDbvtBroadphase instead. bt32BitAxisSweep3 has higher precision and allows more then 16384 objects at the cost of more memory and bit of performance.
 class btAxisSweep3 : public btAxisSweep3Internal<unsigned short int>
 {
@@ -1038,7 +1038,7 @@ public:
 
 /// The bt32BitAxisSweep3 allows higher precision quantization and more objects compared to the btAxisSweep3 sweep and prune.
 /// This comes at the cost of more memory per handle, and a bit slower performance.
-/// It uses arrays rather than lists for storage of the 3 axis.
+/// It uses arrays rather then lists for storage of the 3 axis.
 class bt32BitAxisSweep3 : public btAxisSweep3Internal<unsigned int>
 {
 public:
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
index fe414effbfc..f1bf00594d3 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef		BROADPHASE_INTERFACE_H
-#define 	BROADPHASE_INTERFACE_H
+#ifndef		BT_BROADPHASE_INTERFACE_H
+#define 	BT_BROADPHASE_INTERFACE_H
 
 
 
@@ -79,4 +79,4 @@ public:
 
 };
 
-#endif //BROADPHASE_INTERFACE_H
+#endif //BT_BROADPHASE_INTERFACE_H
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
index 62d349739c3..bb58b828936 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef BROADPHASE_PROXY_H
-#define BROADPHASE_PROXY_H
+#ifndef BT_BROADPHASE_PROXY_H
+#define BT_BROADPHASE_PROXY_H
 
 #include "LinearMath/btScalar.h" //for SIMD_FORCE_INLINE
 #include "LinearMath/btVector3.h"
@@ -246,7 +246,7 @@ class btBroadphasePairSortPredicate
 {
 	public:
 
-		bool operator() ( const btBroadphasePair& a, const btBroadphasePair& b )
+		bool operator() ( const btBroadphasePair& a, const btBroadphasePair& b ) const
 		{
 			const int uidA0 = a.m_pProxy0 ? a.m_pProxy0->m_uniqueId : -1;
 			const int uidB0 = b.m_pProxy0 ? b.m_pProxy0->m_uniqueId : -1;
@@ -266,5 +266,5 @@ SIMD_FORCE_INLINE bool operator==(const btBroadphasePair& a, const btBroadphaseP
 }
 
 
-#endif //BROADPHASE_PROXY_H
+#endif //BT_BROADPHASE_PROXY_H
 
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
index 0d8bca41c8e..36eec97174f 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef COLLISION_ALGORITHM_H
-#define COLLISION_ALGORITHM_H
+#ifndef BT_COLLISION_ALGORITHM_H
+#define BT_COLLISION_ALGORITHM_H
 
 #include "LinearMath/btScalar.h"
 #include "LinearMath/btAlignedObjectArray.h"
@@ -77,4 +77,4 @@ public:
 };
 
 
-#endif //COLLISION_ALGORITHM_H
+#endif //BT_COLLISION_ALGORITHM_H
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
index 2bb8ef5d2a7..409da80ae1b 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
@@ -259,6 +259,7 @@ struct	btDbvt
 
 	
 	btAlignedObjectArray<sStkNN>	m_stkStack;
+	mutable btAlignedObjectArray<const btDbvtNode*>	m_rayTestStack;
 
 
 	// Methods
@@ -955,7 +956,7 @@ inline void		btDbvt::rayTestInternal(	const btDbvtNode* root,
 
 		int								depth=1;
 		int								treshold=DOUBLE_STACKSIZE-2;
-		btAlignedObjectArray<const btDbvtNode*>	stack;
+		btAlignedObjectArray<const btDbvtNode*>&	stack = m_rayTestStack;
 		stack.resize(DOUBLE_STACKSIZE);
 		stack[0]=root;
 		btVector3 bounds[2];
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
index 8ded0006c3b..a79cf9402b1 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
@@ -13,9 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef _DISPATCHER_H
-#define _DISPATCHER_H
-
+#ifndef BT_DISPATCHER_H
+#define BT_DISPATCHER_H
 #include "LinearMath/btScalar.h"
 
 class btCollisionAlgorithm;
@@ -27,6 +26,7 @@ class btOverlappingPairCache;
 
 class btPersistentManifold;
 class btStackAlloc;
+class btPoolAllocator;
 
 struct btDispatcherInfo
 {
@@ -40,7 +40,7 @@ struct btDispatcherInfo
 		m_stepCount(0),
 		m_dispatchFunc(DISPATCH_DISCRETE),
 		m_timeOfImpact(btScalar(1.)),
-		m_useContinuous(false),
+		m_useContinuous(true),
 		m_debugDraw(0),
 		m_enableSatConvex(false),
 		m_enableSPU(true),
@@ -48,7 +48,6 @@ struct btDispatcherInfo
 		m_allowedCcdPenetration(btScalar(0.04)),
 		m_useConvexConservativeDistanceUtil(false),
 		m_convexConservativeDistanceThreshold(0.0f),
-		m_convexMaxDistanceUseCPT(false),
 		m_stackAllocator(0)
 	{
 
@@ -65,7 +64,6 @@ struct btDispatcherInfo
 	btScalar	m_allowedCcdPenetration;
 	bool		m_useConvexConservativeDistanceUtil;
 	btScalar	m_convexConservativeDistanceThreshold;
-	bool		m_convexMaxDistanceUseCPT;
 	btStackAlloc*	m_stackAllocator;
 };
 
@@ -98,6 +96,10 @@ public:
 
 	virtual	btPersistentManifold**	getInternalManifoldPointer() = 0;
 
+	virtual	btPoolAllocator*	getInternalManifoldPool() = 0;
+
+	virtual	const btPoolAllocator*	getInternalManifoldPool() const = 0;
+
 	virtual	void* allocateCollisionAlgorithm(int size)  = 0;
 
 	virtual	void freeCollisionAlgorithm(void* ptr) = 0;
@@ -105,4 +107,4 @@ public:
 };
 
 
-#endif //_DISPATCHER_H
+#endif //BT_DISPATCHER_H
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
index 6712f528e97..81369fe9b50 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
@@ -341,7 +341,7 @@ class btMultiSapBroadphasePairSortPredicate
 {
 	public:
 
-		bool operator() ( const btBroadphasePair& a1, const btBroadphasePair& b1 )
+		bool operator() ( const btBroadphasePair& a1, const btBroadphasePair& b1 ) const
 		{
 				btMultiSapBroadphase::btMultiSapProxy* aProxy0 = a1.m_pProxy0 ? (btMultiSapBroadphase::btMultiSapProxy*)a1.m_pProxy0->m_multiSapParentProxy : 0;
 				btMultiSapBroadphase::btMultiSapProxy* aProxy1 = a1.m_pProxy1 ? (btMultiSapBroadphase::btMultiSapProxy*)a1.m_pProxy1->m_multiSapParentProxy : 0;
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
index 3945afb8d70..7a3806c1d28 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef OVERLAPPING_PAIR_CACHE_H
-#define OVERLAPPING_PAIR_CACHE_H
+#ifndef BT_OVERLAPPING_PAIR_CACHE_H
+#define BT_OVERLAPPING_PAIR_CACHE_H
 
 
 #include "btBroadphaseInterface.h"
@@ -464,6 +464,6 @@ public:
 };
 
 
-#endif //OVERLAPPING_PAIR_CACHE_H
+#endif //BT_OVERLAPPING_PAIR_CACHE_H
 
 
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
index 51b27afe686..78382da79f0 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef QUANTIZED_BVH_H
-#define QUANTIZED_BVH_H
+#ifndef BT_QUANTIZED_BVH_H
+#define BT_QUANTIZED_BVH_H
 
 class btSerializer;
 
@@ -109,9 +109,9 @@ ATTRIBUTE_ALIGNED16 (struct) btOptimizedBvhNode
 	//for child nodes
 	int	m_subPart;
 	int	m_triangleIndex;
-	int	m_padding[5];//bad, due to alignment
-
 
+//pad the size to 64 bytes
+	char	m_padding[20];
 };
 
 
@@ -578,4 +578,4 @@ SIMD_FORCE_INLINE	int	btQuantizedBvh::calculateSerializeBufferSizeNew() const
 
 
 
-#endif //QUANTIZED_BVH_H
+#endif //BT_QUANTIZED_BVH_H
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
index 3e7c7ee3b62..7cb3c40a043 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef SIMPLE_BROADPHASE_H
-#define SIMPLE_BROADPHASE_H
+#ifndef BT_SIMPLE_BROADPHASE_H
+#define BT_SIMPLE_BROADPHASE_H
 
 
 #include "btOverlappingPairCache.h"
@@ -167,5 +167,5 @@ public:
 
 
 
-#endif //SIMPLE_BROADPHASE_H
+#endif //BT_SIMPLE_BROADPHASE_H
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
index f656e5c323a..22953af43fd 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef SPHERE_TRIANGLE_DETECTOR_H
-#define SPHERE_TRIANGLE_DETECTOR_H
+#ifndef BT_SPHERE_TRIANGLE_DETECTOR_H
+#define BT_SPHERE_TRIANGLE_DETECTOR_H
 
 #include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
 
@@ -47,5 +47,5 @@ private:
 	btScalar	m_contactBreakingThreshold;
 	
 };
-#endif //SPHERE_TRIANGLE_DETECTOR_H
+#endif //BT_SPHERE_TRIANGLE_DETECTOR_H
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h
index 21342175238..97c5be77003 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef BOX_2D_BOX_2D__COLLISION_ALGORITHM_H
-#define BOX_2D_BOX_2D__COLLISION_ALGORITHM_H
+#ifndef BT_BOX_2D_BOX_2D__COLLISION_ALGORITHM_H
+#define BT_BOX_2D_BOX_2D__COLLISION_ALGORITHM_H
 
 #include "BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h"
 #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
@@ -62,5 +62,5 @@ public:
 
 };
 
-#endif //BOX_2D_BOX_2D__COLLISION_ALGORITHM_H
+#endif //BT_BOX_2D_BOX_2D__COLLISION_ALGORITHM_H
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
index e7d2cc25c22..f0bbae61e3b 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef BOX_BOX__COLLISION_ALGORITHM_H
-#define BOX_BOX__COLLISION_ALGORITHM_H
+#ifndef BT_BOX_BOX__COLLISION_ALGORITHM_H
+#define BT_BOX_BOX__COLLISION_ALGORITHM_H
 
 #include "btActivatingCollisionAlgorithm.h"
 #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
@@ -62,5 +62,5 @@ public:
 
 };
 
-#endif //BOX_BOX__COLLISION_ALGORITHM_H
+#endif //BT_BOX_BOX__COLLISION_ALGORITHM_H
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
index 605294d47bd..3c941f7deb2 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
@@ -16,8 +16,8 @@ subject to the following restrictions:
 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.
 */
-#ifndef BOX_BOX_DETECTOR_H
-#define BOX_BOX_DETECTOR_H
+#ifndef BT_BOX_BOX_DETECTOR_H
+#define BT_BOX_BOX_DETECTOR_H
 
 
 class btBoxShape;
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
index 1db51a36d03..f63e0923b78 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
@@ -15,6 +15,7 @@ subject to the following restrictions:
 
 #ifndef BT_COLLISION_CONFIGURATION
 #define BT_COLLISION_CONFIGURATION
+
 struct btCollisionAlgorithmCreateFunc;
 
 class btStackAlloc;
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
index a6da5f61a3c..1d7e74401dd 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef COLLISION_CREATE_FUNC
-#define COLLISION_CREATE_FUNC
+#ifndef BT_COLLISION_CREATE_FUNC
+#define BT_COLLISION_CREATE_FUNC
 
 #include "LinearMath/btAlignedObjectArray.h"
 class btCollisionAlgorithm;
@@ -41,5 +41,5 @@ struct btCollisionAlgorithmCreateFunc
 		return 0;
 	}
 };
-#endif //COLLISION_CREATE_FUNC
+#endif //BT_COLLISION_CREATE_FUNC
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
index 9fed44a19f7..29674f3be46 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
@@ -92,8 +92,16 @@ btPersistentManifold*	btCollisionDispatcher::getNewManifold(void* b0,void* b1)
 		mem = m_persistentManifoldPoolAllocator->allocate(sizeof(btPersistentManifold));
 	} else
 	{
-		mem = btAlignedAlloc(sizeof(btPersistentManifold),16);
-
+		//we got a pool memory overflow, by default we fallback to dynamically allocate memory. If we require a contiguous contact pool then assert.
+		if ((m_dispatcherFlags&CD_DISABLE_CONTACTPOOL_DYNAMIC_ALLOCATION)==0)
+		{
+			mem = btAlignedAlloc(sizeof(btPersistentManifold),16);
+		} else
+		{
+			btAssert(0);
+			//make sure to increase the m_defaultMaxPersistentManifoldPoolSize in the btDefaultCollisionConstructionInfo/btDefaultCollisionConfiguration
+			return 0;
+		}
 	}
 	btPersistentManifold* manifold = new(mem) btPersistentManifold (body0,body1,0,contactBreakingThreshold,contactProcessingThreshold);
 	manifold->m_index1a = m_manifoldsPtr.size();
@@ -172,8 +180,7 @@ bool	btCollisionDispatcher::needsCollision(btCollisionObject* body0,btCollisionO
 	if (!(m_dispatcherFlags & btCollisionDispatcher::CD_STATIC_STATIC_REPORTED))
 	{
 		//broadphase filtering already deals with this
-		if ((body0->isStaticObject() || body0->isKinematicObject()) &&
-			(body1->isStaticObject() || body1->isKinematicObject()))
+		if (body0->isStaticOrKinematicObject() && body1->isStaticOrKinematicObject())
 		{
 			m_dispatcherFlags |= btCollisionDispatcher::CD_STATIC_STATIC_REPORTED;
 			printf("warning btCollisionDispatcher::needsCollision: static-static collision!\n");
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
index 3c4f039504a..5accad9a993 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef COLLISION__DISPATCHER_H
-#define COLLISION__DISPATCHER_H
+#ifndef BT_COLLISION__DISPATCHER_H
+#define BT_COLLISION__DISPATCHER_H
 
 #include "BulletCollision/BroadphaseCollision/btDispatcher.h"
 #include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
@@ -67,7 +67,8 @@ public:
 	enum DispatcherFlags
 	{
 		CD_STATIC_STATIC_REPORTED = 1,
-		CD_USE_RELATIVE_CONTACT_BREAKING_THRESHOLD = 2
+		CD_USE_RELATIVE_CONTACT_BREAKING_THRESHOLD = 2,
+		CD_DISABLE_CONTACTPOOL_DYNAMIC_ALLOCATION = 4
 	};
 
 	int	getDispatcherFlags() const
@@ -90,7 +91,7 @@ public:
 
 	btPersistentManifold**	getInternalManifoldPointer()
 	{
-		return &m_manifoldsPtr[0];
+		return m_manifoldsPtr.size()? &m_manifoldsPtr[0] : 0;
 	}
 
 	 btPersistentManifold* getManifoldByIndexInternal(int index)
@@ -155,7 +156,17 @@ public:
 		m_collisionConfiguration = config;
 	}
 
+	virtual	btPoolAllocator*	getInternalManifoldPool()
+	{
+		return m_persistentManifoldPoolAllocator;
+	}
+
+	virtual	const btPoolAllocator*	getInternalManifoldPool() const
+	{
+		return m_persistentManifoldPoolAllocator;
+	}
+
 };
 
-#endif //COLLISION__DISPATCHER_H
+#endif //BT_COLLISION__DISPATCHER_H
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
index 5de829824ff..3a11c967ac9 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef COLLISION_OBJECT_H
-#define COLLISION_OBJECT_H
+#ifndef BT_COLLISION_OBJECT_H
+#define BT_COLLISION_OBJECT_H
 
 #include "LinearMath/btTransform.h"
 
@@ -521,4 +521,4 @@ SIMD_FORCE_INLINE	int	btCollisionObject::calculateSerializeBufferSize() const
 
 
 
-#endif //COLLISION_OBJECT_H
+#endif //BT_COLLISION_OBJECT_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
index bfe8d4f52fb..66b93b88efa 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
@@ -33,6 +33,7 @@ subject to the following restrictions:
 #include "LinearMath/btQuickprof.h"
 #include "LinearMath/btStackAlloc.h"
 #include "LinearMath/btSerializer.h"
+#include "BulletCollision/CollisionShapes/btConvexPolyhedron.h"
 
 //#define DISABLE_DBVT_COMPOUNDSHAPE_RAYCAST_ACCELERATION
 
@@ -154,7 +155,7 @@ void	btCollisionWorld::updateSingleAabb(btCollisionObject* colObj)
 	minAabb -= contactThreshold;
 	maxAabb += contactThreshold;
 
-	if(getDispatchInfo().m_convexMaxDistanceUseCPT)
+	if(getDispatchInfo().m_useContinuous && colObj->getInternalType()==btCollisionObject::CO_RIGID_BODY && !colObj->isStaticOrKinematicObject())
 	{
 		btVector3 minAabb2,maxAabb2;
 		colObj->getCollisionShape()->getAabb(colObj->getInterpolationWorldTransform(),minAabb2,maxAabb2);
@@ -662,68 +663,103 @@ void	btCollisionWorld::objectQuerySingle(const btConvexShape* castShape,const bt
 				triangleMesh->performConvexcast(&tccb,convexFromLocal,convexToLocal,boxMinLocal, boxMaxLocal);
 			} else
 			{
-				//BT_PROFILE("convexSweepConcave");
-				btConcaveShape* concaveShape = (btConcaveShape*)collisionShape;
-				btTransform worldTocollisionObject = colObjWorldTransform.inverse();
-				btVector3 convexFromLocal = worldTocollisionObject * convexFromTrans.getOrigin();
-				btVector3 convexToLocal = worldTocollisionObject * convexToTrans.getOrigin();
-				// rotation of box in local mesh space = MeshRotation^-1 * ConvexToRotation
-				btTransform rotationXform = btTransform(worldTocollisionObject.getBasis() * convexToTrans.getBasis());
-
-				//ConvexCast::CastResult
-				struct BridgeTriangleConvexcastCallback : public btTriangleConvexcastCallback
+				if (collisionShape->getShapeType()==STATIC_PLANE_PROXYTYPE)
 				{
-					btCollisionWorld::ConvexResultCallback* m_resultCallback;
-					btCollisionObject*	m_collisionObject;
-					btConcaveShape*	m_triangleMesh;
-
-					BridgeTriangleConvexcastCallback(const btConvexShape* castShape, const btTransform& from,const btTransform& to,
-						btCollisionWorld::ConvexResultCallback* resultCallback, btCollisionObject* collisionObject,btConcaveShape*	triangleMesh, const btTransform& triangleToWorld):
-					btTriangleConvexcastCallback(castShape, from,to, triangleToWorld, triangleMesh->getMargin()),
-						m_resultCallback(resultCallback),
-						m_collisionObject(collisionObject),
-						m_triangleMesh(triangleMesh)
+					btConvexCast::CastResult castResult;
+					castResult.m_allowedPenetration = allowedPenetration;
+					castResult.m_fraction = resultCallback.m_closestHitFraction;
+					btStaticPlaneShape* planeShape = (btStaticPlaneShape*) collisionShape;
+					btContinuousConvexCollision convexCaster1(castShape,planeShape);
+					btConvexCast* castPtr = &convexCaster1;
+
+					if (castPtr->calcTimeOfImpact(convexFromTrans,convexToTrans,colObjWorldTransform,colObjWorldTransform,castResult))
 					{
+						//add hit
+						if (castResult.m_normal.length2() > btScalar(0.0001))
+						{
+							if (castResult.m_fraction < resultCallback.m_closestHitFraction)
+							{
+								castResult.m_normal.normalize();
+								btCollisionWorld::LocalConvexResult localConvexResult
+									(
+									collisionObject,
+									0,
+									castResult.m_normal,
+									castResult.m_hitPoint,
+									castResult.m_fraction
+									);
+
+								bool normalInWorldSpace = true;
+								resultCallback.addSingleResult(localConvexResult, normalInWorldSpace);
+							}
+						}
 					}
 
-
-					virtual btScalar reportHit(const btVector3& hitNormalLocal, const btVector3& hitPointLocal, btScalar hitFraction, int partId, int triangleIndex )
+				} else
+				{
+					//BT_PROFILE("convexSweepConcave");
+					btConcaveShape* concaveShape = (btConcaveShape*)collisionShape;
+					btTransform worldTocollisionObject = colObjWorldTransform.inverse();
+					btVector3 convexFromLocal = worldTocollisionObject * convexFromTrans.getOrigin();
+					btVector3 convexToLocal = worldTocollisionObject * convexToTrans.getOrigin();
+					// rotation of box in local mesh space = MeshRotation^-1 * ConvexToRotation
+					btTransform rotationXform = btTransform(worldTocollisionObject.getBasis() * convexToTrans.getBasis());
+
+					//ConvexCast::CastResult
+					struct BridgeTriangleConvexcastCallback : public btTriangleConvexcastCallback
 					{
-						btCollisionWorld::LocalShapeInfo	shapeInfo;
-						shapeInfo.m_shapePart = partId;
-						shapeInfo.m_triangleIndex = triangleIndex;
-						if (hitFraction <= m_resultCallback->m_closestHitFraction)
+						btCollisionWorld::ConvexResultCallback* m_resultCallback;
+						btCollisionObject*	m_collisionObject;
+						btConcaveShape*	m_triangleMesh;
+
+						BridgeTriangleConvexcastCallback(const btConvexShape* castShape, const btTransform& from,const btTransform& to,
+							btCollisionWorld::ConvexResultCallback* resultCallback, btCollisionObject* collisionObject,btConcaveShape*	triangleMesh, const btTransform& triangleToWorld):
+						btTriangleConvexcastCallback(castShape, from,to, triangleToWorld, triangleMesh->getMargin()),
+							m_resultCallback(resultCallback),
+							m_collisionObject(collisionObject),
+							m_triangleMesh(triangleMesh)
 						{
+						}
 
-							btCollisionWorld::LocalConvexResult convexResult
-								(m_collisionObject,
-								&shapeInfo,
-								hitNormalLocal,
-								hitPointLocal,
-								hitFraction);
 
-							bool	normalInWorldSpace = false;
+						virtual btScalar reportHit(const btVector3& hitNormalLocal, const btVector3& hitPointLocal, btScalar hitFraction, int partId, int triangleIndex )
+						{
+							btCollisionWorld::LocalShapeInfo	shapeInfo;
+							shapeInfo.m_shapePart = partId;
+							shapeInfo.m_triangleIndex = triangleIndex;
+							if (hitFraction <= m_resultCallback->m_closestHitFraction)
+							{
 
-							return m_resultCallback->addSingleResult(convexResult,normalInWorldSpace);
-						}
-						return hitFraction;
-					}
+								btCollisionWorld::LocalConvexResult convexResult
+									(m_collisionObject,
+									&shapeInfo,
+									hitNormalLocal,
+									hitPointLocal,
+									hitFraction);
 
-				};
+								bool	normalInWorldSpace = false;
 
-				BridgeTriangleConvexcastCallback tccb(castShape, convexFromTrans,convexToTrans,&resultCallback,collisionObject,concaveShape, colObjWorldTransform);
-				tccb.m_hitFraction = resultCallback.m_closestHitFraction;
-				tccb.m_allowedPenetration = allowedPenetration;
-				btVector3 boxMinLocal, boxMaxLocal;
-				castShape->getAabb(rotationXform, boxMinLocal, boxMaxLocal);
+								return m_resultCallback->addSingleResult(convexResult,normalInWorldSpace);
+							}
+							return hitFraction;
+						}
+
+					};
 
-				btVector3 rayAabbMinLocal = convexFromLocal;
-				rayAabbMinLocal.setMin(convexToLocal);
-				btVector3 rayAabbMaxLocal = convexFromLocal;
-				rayAabbMaxLocal.setMax(convexToLocal);
-				rayAabbMinLocal += boxMinLocal;
-				rayAabbMaxLocal += boxMaxLocal;
-				concaveShape->processAllTriangles(&tccb,rayAabbMinLocal,rayAabbMaxLocal);
+					BridgeTriangleConvexcastCallback tccb(castShape, convexFromTrans,convexToTrans,&resultCallback,collisionObject,concaveShape, colObjWorldTransform);
+					tccb.m_hitFraction = resultCallback.m_closestHitFraction;
+					tccb.m_allowedPenetration = allowedPenetration;
+					btVector3 boxMinLocal, boxMaxLocal;
+					castShape->getAabb(rotationXform, boxMinLocal, boxMaxLocal);
+
+					btVector3 rayAabbMinLocal = convexFromLocal;
+					rayAabbMinLocal.setMin(convexToLocal);
+					btVector3 rayAabbMaxLocal = convexFromLocal;
+					rayAabbMaxLocal.setMax(convexToLocal);
+					rayAabbMinLocal += boxMinLocal;
+					rayAabbMaxLocal += boxMaxLocal;
+					concaveShape->processAllTriangles(&tccb,rayAabbMinLocal,rayAabbMaxLocal);
+				}
 			}
 		} else {
 			///@todo : use AABB tree or other BVH acceleration structure!
@@ -1162,15 +1198,14 @@ public:
 		  wv1 = m_worldTrans*triangle[1];
 		  wv2 = m_worldTrans*triangle[2];
 		  btVector3 center = (wv0+wv1+wv2)*btScalar(1./3.);
-
-		  btVector3 normal = (wv1-wv0).cross(wv2-wv0);
-		  normal.normalize();
-		  btVector3 normalColor(1,1,0);
-		  m_debugDrawer->drawLine(center,center+normal,normalColor);
-
-
-
-		 
+          
+          if (m_debugDrawer->getDebugMode() & btIDebugDraw::DBG_DrawNormals )
+          {
+		    btVector3 normal = (wv1-wv0).cross(wv2-wv0);
+		    normal.normalize();
+		    btVector3 normalColor(1,1,0);
+		    m_debugDrawer->drawLine(center,center+normal,normalColor);
+          }
 		  m_debugDrawer->drawLine(wv0,wv1,m_color);
 		  m_debugDrawer->drawLine(wv1,wv2,m_color);
 		  m_debugDrawer->drawLine(wv2,wv0,m_color);
@@ -1195,126 +1230,162 @@ void btCollisionWorld::debugDrawObject(const btTransform& worldTransform, const
 
 	} else
 	{
-		switch (shape->getShapeType())
-		{
 
-		case BOX_SHAPE_PROXYTYPE:
-			{
-				const btBoxShape* boxShape = static_cast<const btBoxShape*>(shape);
-				btVector3 halfExtents = boxShape->getHalfExtentsWithMargin();
-				getDebugDrawer()->drawBox(-halfExtents,halfExtents,worldTransform,color);
-				break;
-			}
+		/// for polyhedral shapes
+		if (shape->isPolyhedral())
+		{
+			btPolyhedralConvexShape* polyshape = (btPolyhedralConvexShape*) shape;
 
-		case SPHERE_SHAPE_PROXYTYPE:
+			int i;
+			if (polyshape->getConvexPolyhedron())
 			{
-				const btSphereShape* sphereShape = static_cast<const btSphereShape*>(shape);
-				btScalar radius = sphereShape->getMargin();//radius doesn't include the margin, so draw with margin
+				const btConvexPolyhedron* poly = polyshape->getConvexPolyhedron();
+				for (i=0;i<poly->m_faces.size();i++)
+				{
+					btVector3 centroid(0,0,0);
+					int numVerts = poly->m_faces[i].m_indices.size();
+					if (numVerts)
+					{
+						int lastV = poly->m_faces[i].m_indices[numVerts-1];
+						for (int v=0;v<poly->m_faces[i].m_indices.size();v++)
+						{
+							int curVert = poly->m_faces[i].m_indices[v];
+							centroid+=poly->m_vertices[curVert];
+							getDebugDrawer()->drawLine(worldTransform*poly->m_vertices[lastV],worldTransform*poly->m_vertices[curVert],color);
+							lastV = curVert;
+						}
+					}
+					centroid*= btScalar(1.f)/btScalar(numVerts);
+                    if (getDebugDrawer()->getDebugMode() & btIDebugDraw::DBG_DrawNormals)
+                    {
+					  btVector3 normalColor(1,1,0);
+					  btVector3 faceNormal(poly->m_faces[i].m_plane[0],poly->m_faces[i].m_plane[1],poly->m_faces[i].m_plane[2]);
+					  getDebugDrawer()->drawLine(worldTransform*centroid,worldTransform*(centroid+faceNormal),normalColor);
+                    }
+					
+				}
 
-				getDebugDrawer()->drawSphere(radius, worldTransform, color);
-				break;
-			}
-		case MULTI_SPHERE_SHAPE_PROXYTYPE:
+				
+			} else
 			{
-				const btMultiSphereShape* multiSphereShape = static_cast<const btMultiSphereShape*>(shape);
-
-				btTransform childTransform;
-				childTransform.setIdentity();
-
-				for (int i = multiSphereShape->getSphereCount()-1; i>=0;i--)
+				for (i=0;i<polyshape->getNumEdges();i++)
 				{
-					childTransform.setOrigin(multiSphereShape->getSpherePosition(i));
-					getDebugDrawer()->drawSphere(multiSphereShape->getSphereRadius(i), worldTransform*childTransform, color);
+					btVector3 a,b;
+					polyshape->getEdge(i,a,b);
+					btVector3 wa = worldTransform * a;
+					btVector3 wb = worldTransform * b;
+					getDebugDrawer()->drawLine(wa,wb,color);
 				}
-
-				break;
 			}
-		case CAPSULE_SHAPE_PROXYTYPE:
-			{
-				const btCapsuleShape* capsuleShape = static_cast<const btCapsuleShape*>(shape);
 
-				btScalar radius = capsuleShape->getRadius();
-				btScalar halfHeight = capsuleShape->getHalfHeight();
 
-				int upAxis = capsuleShape->getUpAxis();
-				getDebugDrawer()->drawCapsule(radius, halfHeight, upAxis, worldTransform, color);
-				break;
-			}
-		case CONE_SHAPE_PROXYTYPE:
+		}
+		else
+		{
+			switch (shape->getShapeType())
 			{
-				const btConeShape* coneShape = static_cast<const btConeShape*>(shape);
-				btScalar radius = coneShape->getRadius();//+coneShape->getMargin();
-				btScalar height = coneShape->getHeight();//+coneShape->getMargin();
 
-				int upAxis= coneShape->getConeUpIndex();
-				getDebugDrawer()->drawCone(radius, height, upAxis, worldTransform, color);
-				break;
+			case BOX_SHAPE_PROXYTYPE:
+				{
+					const btBoxShape* boxShape = static_cast<const btBoxShape*>(shape);
+					btVector3 halfExtents = boxShape->getHalfExtentsWithMargin();
+					getDebugDrawer()->drawBox(-halfExtents,halfExtents,worldTransform,color);
+					break;
+				}
 
-			}
-		case CYLINDER_SHAPE_PROXYTYPE:
-			{
-				const btCylinderShape* cylinder = static_cast<const btCylinderShape*>(shape);
-				int upAxis = cylinder->getUpAxis();
-				btScalar radius = cylinder->getRadius();
-				btScalar halfHeight = cylinder->getHalfExtentsWithMargin()[upAxis];
-				getDebugDrawer()->drawCylinder(radius, halfHeight, upAxis, worldTransform, color);
-				break;
-			}
+			case SPHERE_SHAPE_PROXYTYPE:
+				{
+					const btSphereShape* sphereShape = static_cast<const btSphereShape*>(shape);
+					btScalar radius = sphereShape->getMargin();//radius doesn't include the margin, so draw with margin
 
-		case STATIC_PLANE_PROXYTYPE:
-			{
-				const btStaticPlaneShape* staticPlaneShape = static_cast<const btStaticPlaneShape*>(shape);
-				btScalar planeConst = staticPlaneShape->getPlaneConstant();
-				const btVector3& planeNormal = staticPlaneShape->getPlaneNormal();
-				getDebugDrawer()->drawPlane(planeNormal, planeConst,worldTransform, color);
-				break;
+					getDebugDrawer()->drawSphere(radius, worldTransform, color);
+					break;
+				}
+			case MULTI_SPHERE_SHAPE_PROXYTYPE:
+				{
+					const btMultiSphereShape* multiSphereShape = static_cast<const btMultiSphereShape*>(shape);
 
-			}
-		default:
-			{
+					btTransform childTransform;
+					childTransform.setIdentity();
 
-				if (shape->isConcave())
-				{
-					btConcaveShape* concaveMesh = (btConcaveShape*) shape;
+					for (int i = multiSphereShape->getSphereCount()-1; i>=0;i--)
+					{
+						childTransform.setOrigin(multiSphereShape->getSpherePosition(i));
+						getDebugDrawer()->drawSphere(multiSphereShape->getSphereRadius(i), worldTransform*childTransform, color);
+					}
 
-					///@todo pass camera, for some culling? no -> we are not a graphics lib
-					btVector3 aabbMax(btScalar(BT_LARGE_FLOAT),btScalar(BT_LARGE_FLOAT),btScalar(BT_LARGE_FLOAT));
-					btVector3 aabbMin(btScalar(-BT_LARGE_FLOAT),btScalar(-BT_LARGE_FLOAT),btScalar(-BT_LARGE_FLOAT));
+					break;
+				}
+			case CAPSULE_SHAPE_PROXYTYPE:
+				{
+					const btCapsuleShape* capsuleShape = static_cast<const btCapsuleShape*>(shape);
 
-					DebugDrawcallback drawCallback(getDebugDrawer(),worldTransform,color);
-					concaveMesh->processAllTriangles(&drawCallback,aabbMin,aabbMax);
+					btScalar radius = capsuleShape->getRadius();
+					btScalar halfHeight = capsuleShape->getHalfHeight();
 
+					int upAxis = capsuleShape->getUpAxis();
+					getDebugDrawer()->drawCapsule(radius, halfHeight, upAxis, worldTransform, color);
+					break;
 				}
+			case CONE_SHAPE_PROXYTYPE:
+				{
+					const btConeShape* coneShape = static_cast<const btConeShape*>(shape);
+					btScalar radius = coneShape->getRadius();//+coneShape->getMargin();
+					btScalar height = coneShape->getHeight();//+coneShape->getMargin();
 
-				if (shape->getShapeType() == CONVEX_TRIANGLEMESH_SHAPE_PROXYTYPE)
+					int upAxis= coneShape->getConeUpIndex();
+					getDebugDrawer()->drawCone(radius, height, upAxis, worldTransform, color);
+					break;
+
+				}
+			case CYLINDER_SHAPE_PROXYTYPE:
 				{
-					btConvexTriangleMeshShape* convexMesh = (btConvexTriangleMeshShape*) shape;
-					//todo: pass camera for some culling			
-					btVector3 aabbMax(btScalar(BT_LARGE_FLOAT),btScalar(BT_LARGE_FLOAT),btScalar(BT_LARGE_FLOAT));
-					btVector3 aabbMin(btScalar(-BT_LARGE_FLOAT),btScalar(-BT_LARGE_FLOAT),btScalar(-BT_LARGE_FLOAT));
-					//DebugDrawcallback drawCallback;
-					DebugDrawcallback drawCallback(getDebugDrawer(),worldTransform,color);
-					convexMesh->getMeshInterface()->InternalProcessAllTriangles(&drawCallback,aabbMin,aabbMax);
+					const btCylinderShape* cylinder = static_cast<const btCylinderShape*>(shape);
+					int upAxis = cylinder->getUpAxis();
+					btScalar radius = cylinder->getRadius();
+					btScalar halfHeight = cylinder->getHalfExtentsWithMargin()[upAxis];
+					getDebugDrawer()->drawCylinder(radius, halfHeight, upAxis, worldTransform, color);
+					break;
 				}
 
+			case STATIC_PLANE_PROXYTYPE:
+				{
+					const btStaticPlaneShape* staticPlaneShape = static_cast<const btStaticPlaneShape*>(shape);
+					btScalar planeConst = staticPlaneShape->getPlaneConstant();
+					const btVector3& planeNormal = staticPlaneShape->getPlaneNormal();
+					getDebugDrawer()->drawPlane(planeNormal, planeConst,worldTransform, color);
+					break;
 
-				/// for polyhedral shapes
-				if (shape->isPolyhedral())
+				}
+			default:
 				{
-					btPolyhedralConvexShape* polyshape = (btPolyhedralConvexShape*) shape;
 
-					int i;
-					for (i=0;i<polyshape->getNumEdges();i++)
+					if (shape->isConcave())
 					{
-						btVector3 a,b;
-						polyshape->getEdge(i,a,b);
-						btVector3 wa = worldTransform * a;
-						btVector3 wb = worldTransform * b;
-						getDebugDrawer()->drawLine(wa,wb,color);
+						btConcaveShape* concaveMesh = (btConcaveShape*) shape;
+
+						///@todo pass camera, for some culling? no -> we are not a graphics lib
+						btVector3 aabbMax(btScalar(BT_LARGE_FLOAT),btScalar(BT_LARGE_FLOAT),btScalar(BT_LARGE_FLOAT));
+						btVector3 aabbMin(btScalar(-BT_LARGE_FLOAT),btScalar(-BT_LARGE_FLOAT),btScalar(-BT_LARGE_FLOAT));
+
+						DebugDrawcallback drawCallback(getDebugDrawer(),worldTransform,color);
+						concaveMesh->processAllTriangles(&drawCallback,aabbMin,aabbMax);
 
 					}
 
+					if (shape->getShapeType() == CONVEX_TRIANGLEMESH_SHAPE_PROXYTYPE)
+					{
+						btConvexTriangleMeshShape* convexMesh = (btConvexTriangleMeshShape*) shape;
+						//todo: pass camera for some culling			
+						btVector3 aabbMax(btScalar(BT_LARGE_FLOAT),btScalar(BT_LARGE_FLOAT),btScalar(BT_LARGE_FLOAT));
+						btVector3 aabbMin(btScalar(-BT_LARGE_FLOAT),btScalar(-BT_LARGE_FLOAT),btScalar(-BT_LARGE_FLOAT));
+						//DebugDrawcallback drawCallback;
+						DebugDrawcallback drawCallback(getDebugDrawer(),worldTransform,color);
+						convexMesh->getMeshInterface()->InternalProcessAllTriangles(&drawCallback,aabbMin,aabbMax);
+					}
+
 
+					
 				}
 			}
 		}
@@ -1327,7 +1398,7 @@ void	btCollisionWorld::debugDrawWorld()
 	if (getDebugDrawer() && getDebugDrawer()->getDebugMode() & btIDebugDraw::DBG_DrawContactPoints)
 	{
 		int numManifolds = getDispatcher()->getNumManifolds();
-		btVector3 color(0,0,0);
+		btVector3 color(1,0.65,0);
 		for (int i=0;i<numManifolds;i++)
 		{
 			btPersistentManifold* contactManifold = getDispatcher()->getManifoldByIndexInternal(i);
@@ -1343,7 +1414,7 @@ void	btCollisionWorld::debugDrawWorld()
 		}
 	}
 
-	if (getDebugDrawer() && getDebugDrawer()->getDebugMode() & (btIDebugDraw::DBG_DrawWireframe | btIDebugDraw::DBG_DrawAabb))
+	if (getDebugDrawer() && (getDebugDrawer()->getDebugMode() & (btIDebugDraw::DBG_DrawWireframe | btIDebugDraw::DBG_DrawAabb)))
 	{
 		int i;
 
@@ -1352,7 +1423,7 @@ void	btCollisionWorld::debugDrawWorld()
 			btCollisionObject* colObj = m_collisionObjects[i];
 			if ((colObj->getCollisionFlags() & btCollisionObject::CF_DISABLE_VISUALIZE_OBJECT)==0)
 			{
-				if (getDebugDrawer() && getDebugDrawer()->getDebugMode() & btIDebugDraw::DBG_DrawWireframe)
+				if (getDebugDrawer() && (getDebugDrawer()->getDebugMode() & btIDebugDraw::DBG_DrawWireframe))
 				{
 					btVector3 color(btScalar(1.),btScalar(1.),btScalar(1.));
 					switch(colObj->getActivationState())
@@ -1386,12 +1457,14 @@ void	btCollisionWorld::debugDrawWorld()
 
 					btVector3 minAabb2,maxAabb2;
 
-					colObj->getCollisionShape()->getAabb(colObj->getInterpolationWorldTransform(),minAabb2,maxAabb2);
-					minAabb2 -= contactThreshold;
-					maxAabb2 += contactThreshold;
-
-					minAabb.setMin(minAabb2);
-					maxAabb.setMax(maxAabb2);
+					if(getDispatchInfo().m_useContinuous && colObj->getInternalType()==btCollisionObject::CO_RIGID_BODY && !colObj->isStaticOrKinematicObject())
+					{
+						colObj->getCollisionShape()->getAabb(colObj->getInterpolationWorldTransform(),minAabb2,maxAabb2);
+						minAabb2 -= contactThreshold;
+						maxAabb2 += contactThreshold;
+						minAabb.setMin(minAabb2);
+						maxAabb.setMax(maxAabb2);
+					}
 
 					m_debugDrawer->drawAabb(minAabb,maxAabb,colorvec);
 				}
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
index b42e2c40b21..0a92d2d6e15 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
@@ -62,8 +62,8 @@ subject to the following restrictions:
  
  
 
-#ifndef COLLISION_WORLD_H
-#define COLLISION_WORLD_H
+#ifndef BT_COLLISION_WORLD_H
+#define BT_COLLISION_WORLD_H
 
 class btStackAlloc;
 class btCollisionShape;
@@ -506,4 +506,4 @@ public:
 };
 
 
-#endif //COLLISION_WORLD_H
+#endif //BT_COLLISION_WORLD_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
index 255e0af668c..404574989ab 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef COMPOUND_COLLISION_ALGORITHM_H
-#define COMPOUND_COLLISION_ALGORITHM_H
+#ifndef BT_COMPOUND_COLLISION_ALGORITHM_H
+#define BT_COMPOUND_COLLISION_ALGORITHM_H
 
 #include "btActivatingCollisionAlgorithm.h"
 #include "BulletCollision/BroadphaseCollision/btDispatcher.h"
@@ -83,4 +83,4 @@ public:
 
 };
 
-#endif //COMPOUND_COLLISION_ALGORITHM_H
+#endif //BT_COMPOUND_COLLISION_ALGORITHM_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h
index 5738401401e..53d13b87151 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef CONVEX_2D_CONVEX_2D_ALGORITHM_H
-#define CONVEX_2D_CONVEX_2D_ALGORITHM_H
+#ifndef BT_CONVEX_2D_CONVEX_2D_ALGORITHM_H
+#define BT_CONVEX_2D_CONVEX_2D_ALGORITHM_H
 
 #include "BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h"
 #include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h"
@@ -92,4 +92,4 @@ public:
 
 };
 
-#endif //CONVEX_2D_CONVEX_2D_ALGORITHM_H
+#endif //BT_CONVEX_2D_CONVEX_2D_ALGORITHM_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
index 268ec4b6c7e..d2b2c221426 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
@@ -91,7 +91,7 @@ void btConvexTriangleCallback::processTriangle(btVector3* triangle,int partId, i
 	btCollisionObject* ob = static_cast<btCollisionObject*>(m_triBody);
 
 
-	
+#if 0	
 	///debug drawing of the overlapping triangles
 	if (m_dispatchInfoPtr && m_dispatchInfoPtr->m_debugDraw && (m_dispatchInfoPtr->m_debugDraw->getDebugMode() &btIDebugDraw::DBG_DrawWireframe ))
 	{
@@ -100,17 +100,8 @@ void btConvexTriangleCallback::processTriangle(btVector3* triangle,int partId, i
 		m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[0]),tr(triangle[1]),color);
 		m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[1]),tr(triangle[2]),color);
 		m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[2]),tr(triangle[0]),color);
-
-		//btVector3 center = triangle[0] + triangle[1]+triangle[2];
-		//center *= btScalar(0.333333);
-		//m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[0]),tr(center),color);
-		//m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[1]),tr(center),color);
-		//m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[2]),tr(center),color);
-
 	}
-
-
-	//btCollisionObject* colObj = static_cast<btCollisionObject*>(m_convexProxy->m_clientObject);
+#endif
 	
 	if (m_convexBody->getCollisionShape()->isConvex())
 	{
@@ -119,7 +110,7 @@ void btConvexTriangleCallback::processTriangle(btVector3* triangle,int partId, i
 		
 		btCollisionShape* tmpShape = ob->getCollisionShape();
 		ob->internalSetTemporaryCollisionShape( &tm );
-		
+
 		btCollisionAlgorithm* colAlgo = ci.m_dispatcher1->findAlgorithm(m_convexBody,m_triBody,m_manifoldPtr);
 
 		if (m_resultOut->getBody0Internal() == m_triBody)
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
index 984a4c39e8e..f718d1dec25 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef CONVEX_CONCAVE_COLLISION_ALGORITHM_H
-#define CONVEX_CONCAVE_COLLISION_ALGORITHM_H
+#ifndef BT_CONVEX_CONCAVE_COLLISION_ALGORITHM_H
+#define BT_CONVEX_CONCAVE_COLLISION_ALGORITHM_H
 
 #include "btActivatingCollisionAlgorithm.h"
 #include "BulletCollision/BroadphaseCollision/btDispatcher.h"
@@ -113,4 +113,4 @@ public:
 
 };
 
-#endif //CONVEX_CONCAVE_COLLISION_ALGORITHM_H
+#endif //BT_CONVEX_CONCAVE_COLLISION_ALGORITHM_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
index 94385fed909..dd1f3e2490f 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
@@ -17,6 +17,7 @@ subject to the following restrictions:
 ///If you experience problems with capsule-capsule collision, try to define BT_DISABLE_CAPSULE_CAPSULE_COLLIDER and report it in the Bullet forums
 ///with reproduction case
 //define BT_DISABLE_CAPSULE_CAPSULE_COLLIDER 1
+//#define ZERO_MARGIN
 
 #include "btConvexConvexAlgorithm.h"
 
@@ -26,6 +27,8 @@ subject to the following restrictions:
 #include "BulletCollision/CollisionDispatch/btCollisionObject.h"
 #include "BulletCollision/CollisionShapes/btConvexShape.h"
 #include "BulletCollision/CollisionShapes/btCapsuleShape.h"
+#include "BulletCollision/CollisionShapes/btTriangleShape.h"
+
 
 
 #include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h"
@@ -48,7 +51,7 @@ subject to the following restrictions:
 
 #include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h"
 #include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h"
-
+#include "BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h"
 
 
 ///////////
@@ -331,6 +334,8 @@ void btConvexConvexAlgorithm ::processCollision (btCollisionObject* body0,btColl
 #endif //BT_DISABLE_CAPSULE_CAPSULE_COLLIDER
 
 
+
+
 #ifdef USE_SEPDISTANCE_UTIL2
 	if (dispatchInfo.m_useConvexConservativeDistanceUtil)
 	{
@@ -357,13 +362,14 @@ void btConvexConvexAlgorithm ::processCollision (btCollisionObject* body0,btColl
 	} else
 #endif //USE_SEPDISTANCE_UTIL2
 	{
-		if (dispatchInfo.m_convexMaxDistanceUseCPT)
-		{
-			input.m_maximumDistanceSquared = min0->getMargin() + min1->getMargin() + m_manifoldPtr->getContactProcessingThreshold();
-		} else
-		{
-			input.m_maximumDistanceSquared = min0->getMargin() + min1->getMargin() + m_manifoldPtr->getContactBreakingThreshold();
-		}
+		//if (dispatchInfo.m_convexMaxDistanceUseCPT)
+		//{
+		//	input.m_maximumDistanceSquared = min0->getMargin() + min1->getMargin() + m_manifoldPtr->getContactProcessingThreshold();
+		//} else
+		//{
+		input.m_maximumDistanceSquared = min0->getMargin() + min1->getMargin() + m_manifoldPtr->getContactBreakingThreshold();
+//		}
+
 		input.m_maximumDistanceSquared*= input.m_maximumDistanceSquared;
 	}
 
@@ -371,7 +377,7 @@ void btConvexConvexAlgorithm ::processCollision (btCollisionObject* body0,btColl
 	input.m_transformA = body0->getWorldTransform();
 	input.m_transformB = body1->getWorldTransform();
 
-	gjkPairDetector.getClosestPoints(input,*resultOut,dispatchInfo.m_debugDraw);
+
 
 	
 
@@ -389,6 +395,155 @@ void btConvexConvexAlgorithm ::processCollision (btCollisionObject* body0,btColl
 	}
 #endif //USE_SEPDISTANCE_UTIL2
 
+	if (min0->isPolyhedral() && min1->isPolyhedral())
+	{
+
+
+		struct btDummyResult : public btDiscreteCollisionDetectorInterface::Result
+		{
+			virtual void setShapeIdentifiersA(int partId0,int index0){}
+			virtual void setShapeIdentifiersB(int partId1,int index1){}
+			virtual void addContactPoint(const btVector3& normalOnBInWorld,const btVector3& pointInWorld,btScalar depth) 
+			{
+			}
+		};
+		
+		btDummyResult dummy;
+
+
+		btPolyhedralConvexShape* polyhedronA = (btPolyhedralConvexShape*) min0;
+		btPolyhedralConvexShape* polyhedronB = (btPolyhedralConvexShape*) min1;
+		if (polyhedronA->getConvexPolyhedron() && polyhedronB->getConvexPolyhedron())
+		{
+
+
+			
+
+			btScalar threshold = m_manifoldPtr->getContactBreakingThreshold();
+
+			btScalar minDist = -1e30f;
+			btVector3 sepNormalWorldSpace;
+			bool foundSepAxis  = true;
+
+			if (dispatchInfo.m_enableSatConvex)
+			{
+				foundSepAxis = btPolyhedralContactClipping::findSeparatingAxis(
+					*polyhedronA->getConvexPolyhedron(), *polyhedronB->getConvexPolyhedron(),
+					body0->getWorldTransform(), 
+					body1->getWorldTransform(),
+					sepNormalWorldSpace);
+			} else
+			{
+#ifdef ZERO_MARGIN
+				gjkPairDetector.setIgnoreMargin(true);
+				gjkPairDetector.getClosestPoints(input,*resultOut,dispatchInfo.m_debugDraw);
+#else
+				//gjkPairDetector.getClosestPoints(input,*resultOut,dispatchInfo.m_debugDraw);
+				gjkPairDetector.getClosestPoints(input,dummy,dispatchInfo.m_debugDraw);
+#endif //ZERO_MARGIN
+				btScalar l2 = gjkPairDetector.getCachedSeparatingAxis().length2();
+				if (l2>SIMD_EPSILON)
+				{
+					sepNormalWorldSpace = gjkPairDetector.getCachedSeparatingAxis()*(1.f/l2);
+					//minDist = -1e30f;//gjkPairDetector.getCachedSeparatingDistance();
+					minDist = gjkPairDetector.getCachedSeparatingDistance()-min0->getMargin()-min1->getMargin();
+	
+#ifdef ZERO_MARGIN
+					foundSepAxis = true;//gjkPairDetector.getCachedSeparatingDistance()<0.f;
+#else
+					foundSepAxis = gjkPairDetector.getCachedSeparatingDistance()<(min0->getMargin()+min1->getMargin());
+#endif
+				}
+			}
+			if (foundSepAxis)
+			{
+//				printf("sepNormalWorldSpace=%f,%f,%f\n",sepNormalWorldSpace.getX(),sepNormalWorldSpace.getY(),sepNormalWorldSpace.getZ());
+
+				btPolyhedralContactClipping::clipHullAgainstHull(sepNormalWorldSpace, *polyhedronA->getConvexPolyhedron(), *polyhedronB->getConvexPolyhedron(),
+					body0->getWorldTransform(), 
+					body1->getWorldTransform(), minDist-threshold, threshold, *resultOut);
+ 				
+			}
+			if (m_ownManifold)
+			{
+				resultOut->refreshContactPoints();
+			}
+			return;
+
+		} else
+		{
+			//we can also deal with convex versus triangle (without connectivity data)
+			if (polyhedronA->getConvexPolyhedron() && polyhedronB->getShapeType()==TRIANGLE_SHAPE_PROXYTYPE)
+			{
+
+				btVertexArray vertices;
+				btTriangleShape* tri = (btTriangleShape*)polyhedronB;
+				vertices.push_back(	body1->getWorldTransform()*tri->m_vertices1[0]);
+				vertices.push_back(	body1->getWorldTransform()*tri->m_vertices1[1]);
+				vertices.push_back(	body1->getWorldTransform()*tri->m_vertices1[2]);
+				
+				//tri->initializePolyhedralFeatures();
+
+				btScalar threshold = m_manifoldPtr->getContactBreakingThreshold();
+
+				btVector3 sepNormalWorldSpace;
+				btScalar minDist =-1e30f;
+				btScalar maxDist = threshold;
+				
+				bool foundSepAxis = false;
+				if (0)
+				{
+					polyhedronB->initializePolyhedralFeatures();
+					 foundSepAxis = btPolyhedralContactClipping::findSeparatingAxis(
+					*polyhedronA->getConvexPolyhedron(), *polyhedronB->getConvexPolyhedron(),
+					body0->getWorldTransform(), 
+					body1->getWorldTransform(),
+					sepNormalWorldSpace);
+				//	 printf("sepNormalWorldSpace=%f,%f,%f\n",sepNormalWorldSpace.getX(),sepNormalWorldSpace.getY(),sepNormalWorldSpace.getZ());
+
+				} else
+				{
+#ifdef ZERO_MARGIN
+					gjkPairDetector.setIgnoreMargin(true);
+					gjkPairDetector.getClosestPoints(input,*resultOut,dispatchInfo.m_debugDraw);
+#else
+					gjkPairDetector.getClosestPoints(input,dummy,dispatchInfo.m_debugDraw);
+#endif//ZERO_MARGIN
+					
+					btScalar l2 = gjkPairDetector.getCachedSeparatingAxis().length2();
+					if (l2>SIMD_EPSILON)
+					{
+						sepNormalWorldSpace = gjkPairDetector.getCachedSeparatingAxis()*(1.f/l2);
+						//minDist = gjkPairDetector.getCachedSeparatingDistance();
+						//maxDist = threshold;
+						minDist = gjkPairDetector.getCachedSeparatingDistance()-min0->getMargin()-min1->getMargin();
+						foundSepAxis = true;
+					}
+				}
+
+				
+			if (foundSepAxis)
+			{
+				btPolyhedralContactClipping::clipFaceAgainstHull(sepNormalWorldSpace, *polyhedronA->getConvexPolyhedron(), 
+					body0->getWorldTransform(), vertices, minDist-threshold, maxDist, *resultOut);
+			}
+				
+				
+				if (m_ownManifold)
+				{
+					resultOut->refreshContactPoints();
+				}
+				
+				return;
+			}
+			
+		}
+
+
+	}
+	
+	gjkPairDetector.getClosestPoints(input,*resultOut,dispatchInfo.m_debugDraw);
+
 	//now perform 'm_numPerturbationIterations' collision queries with the perturbated collision objects
 	
 	//perform perturbation when more then 'm_minimumPointsPerturbationThreshold' points
@@ -398,66 +553,70 @@ void btConvexConvexAlgorithm ::processCollision (btCollisionObject* body0,btColl
 		int i;
 		btVector3 v0,v1;
 		btVector3 sepNormalWorldSpace;
+		btScalar l2 = gjkPairDetector.getCachedSeparatingAxis().length2();
 	
-		sepNormalWorldSpace = gjkPairDetector.getCachedSeparatingAxis().normalized();
-		btPlaneSpace1(sepNormalWorldSpace,v0,v1);
-
-
-		bool perturbeA = true;
-		const btScalar angleLimit = 0.125f * SIMD_PI;
-		btScalar perturbeAngle;
-		btScalar radiusA = min0->getAngularMotionDisc();
-		btScalar radiusB = min1->getAngularMotionDisc();
-		if (radiusA < radiusB)
-		{
-			perturbeAngle = gContactBreakingThreshold /radiusA;
-			perturbeA = true;
-		} else
+		if (l2>SIMD_EPSILON)
 		{
-			perturbeAngle = gContactBreakingThreshold / radiusB;
-			perturbeA = false;
-		}
-		if ( perturbeAngle > angleLimit ) 
-				perturbeAngle = angleLimit;
+			sepNormalWorldSpace = gjkPairDetector.getCachedSeparatingAxis()*(1.f/l2);
+			
+			btPlaneSpace1(sepNormalWorldSpace,v0,v1);
 
-		btTransform unPerturbedTransform;
-		if (perturbeA)
-		{
-			unPerturbedTransform = input.m_transformA;
-		} else
-		{
-			unPerturbedTransform = input.m_transformB;
-		}
-		
-		for ( i=0;i<m_numPerturbationIterations;i++)
-		{
-			if (v0.length2()>SIMD_EPSILON)
+
+			bool perturbeA = true;
+			const btScalar angleLimit = 0.125f * SIMD_PI;
+			btScalar perturbeAngle;
+			btScalar radiusA = min0->getAngularMotionDisc();
+			btScalar radiusB = min1->getAngularMotionDisc();
+			if (radiusA < radiusB)
 			{
-			btQuaternion perturbeRot(v0,perturbeAngle);
-			btScalar iterationAngle = i*(SIMD_2_PI/btScalar(m_numPerturbationIterations));
-			btQuaternion rotq(sepNormalWorldSpace,iterationAngle);
-			
-			
+				perturbeAngle = gContactBreakingThreshold /radiusA;
+				perturbeA = true;
+			} else
+			{
+				perturbeAngle = gContactBreakingThreshold / radiusB;
+				perturbeA = false;
+			}
+			if ( perturbeAngle > angleLimit ) 
+					perturbeAngle = angleLimit;
+
+			btTransform unPerturbedTransform;
 			if (perturbeA)
 			{
-				input.m_transformA.setBasis(  btMatrix3x3(rotq.inverse()*perturbeRot*rotq)*body0->getWorldTransform().getBasis());
-				input.m_transformB = body1->getWorldTransform();
-#ifdef DEBUG_CONTACTS
-				dispatchInfo.m_debugDraw->drawTransform(input.m_transformA,10.0);
-#endif //DEBUG_CONTACTS
+				unPerturbedTransform = input.m_transformA;
 			} else
 			{
-				input.m_transformA = body0->getWorldTransform();
-				input.m_transformB.setBasis( btMatrix3x3(rotq.inverse()*perturbeRot*rotq)*body1->getWorldTransform().getBasis());
-#ifdef DEBUG_CONTACTS
-				dispatchInfo.m_debugDraw->drawTransform(input.m_transformB,10.0);
-#endif
+				unPerturbedTransform = input.m_transformB;
 			}
 			
-			btPerturbedContactResult perturbedResultOut(resultOut,input.m_transformA,input.m_transformB,unPerturbedTransform,perturbeA,dispatchInfo.m_debugDraw);
-			gjkPairDetector.getClosestPoints(input,perturbedResultOut,dispatchInfo.m_debugDraw);
+			for ( i=0;i<m_numPerturbationIterations;i++)
+			{
+				if (v0.length2()>SIMD_EPSILON)
+				{
+				btQuaternion perturbeRot(v0,perturbeAngle);
+				btScalar iterationAngle = i*(SIMD_2_PI/btScalar(m_numPerturbationIterations));
+				btQuaternion rotq(sepNormalWorldSpace,iterationAngle);
+				
+				
+				if (perturbeA)
+				{
+					input.m_transformA.setBasis(  btMatrix3x3(rotq.inverse()*perturbeRot*rotq)*body0->getWorldTransform().getBasis());
+					input.m_transformB = body1->getWorldTransform();
+	#ifdef DEBUG_CONTACTS
+					dispatchInfo.m_debugDraw->drawTransform(input.m_transformA,10.0);
+	#endif //DEBUG_CONTACTS
+				} else
+				{
+					input.m_transformA = body0->getWorldTransform();
+					input.m_transformB.setBasis( btMatrix3x3(rotq.inverse()*perturbeRot*rotq)*body1->getWorldTransform().getBasis());
+	#ifdef DEBUG_CONTACTS
+					dispatchInfo.m_debugDraw->drawTransform(input.m_transformB,10.0);
+	#endif
+				}
+				
+				btPerturbedContactResult perturbedResultOut(resultOut,input.m_transformA,input.m_transformB,unPerturbedTransform,perturbeA,dispatchInfo.m_debugDraw);
+				gjkPairDetector.getClosestPoints(input,perturbedResultOut,dispatchInfo.m_debugDraw);
+				}
 			}
-			
 		}
 	}
 
@@ -487,7 +646,7 @@ btScalar	btConvexConvexAlgorithm::calculateTimeOfImpact(btCollisionObject* col0,
 {
 	(void)resultOut;
 	(void)dispatchInfo;
-	///rather than checking ALL pairs, only calculate TOI when motion exceeds threshold
+	///Rather then checking ALL pairs, only calculate TOI when motion exceeds threshold
     
 	///Linear motion for one of objects needs to exceed m_ccdSquareMotionThreshold
 	///col0->m_worldTransform,
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
index d38aff6862c..4380b80eb4d 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef CONVEX_CONVEX_ALGORITHM_H
-#define CONVEX_CONVEX_ALGORITHM_H
+#ifndef BT_CONVEX_CONVEX_ALGORITHM_H
+#define BT_CONVEX_CONVEX_ALGORITHM_H
 
 #include "btActivatingCollisionAlgorithm.h"
 #include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h"
@@ -106,4 +106,4 @@ public:
 
 };
 
-#endif //CONVEX_CONVEX_ALGORITHM_H
+#endif //BT_CONVEX_CONVEX_ALGORITHM_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
index dda85dc693f..b2e9bfaf593 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
@@ -96,23 +96,41 @@ void btConvexPlaneCollisionAlgorithm::processCollision (btCollisionObject* body0
 	if (!m_manifoldPtr)
 		return;
 
-    btCollisionObject* convexObj = m_isSwapped? body1 : body0;
+	btCollisionObject* convexObj = m_isSwapped? body1 : body0;
 	btCollisionObject* planeObj = m_isSwapped? body0: body1;
 
 	btConvexShape* convexShape = (btConvexShape*) convexObj->getCollisionShape();
 	btStaticPlaneShape* planeShape = (btStaticPlaneShape*) planeObj->getCollisionShape();
 
-    
+	bool hasCollision = false;
 	const btVector3& planeNormal = planeShape->getPlaneNormal();
-	//const btScalar& planeConstant = planeShape->getPlaneConstant();
+	const btScalar& planeConstant = planeShape->getPlaneConstant();
+	btTransform planeInConvex;
+	planeInConvex= convexObj->getWorldTransform().inverse() * planeObj->getWorldTransform();
+	btTransform convexInPlaneTrans;
+	convexInPlaneTrans= planeObj->getWorldTransform().inverse() * convexObj->getWorldTransform();
+
+	btVector3 vtx = convexShape->localGetSupportingVertex(planeInConvex.getBasis()*-planeNormal);
+	btVector3 vtxInPlane = convexInPlaneTrans(vtx);
+	btScalar distance = (planeNormal.dot(vtxInPlane) - planeConstant);
+
+	btVector3 vtxInPlaneProjected = vtxInPlane - distance*planeNormal;
+	btVector3 vtxInPlaneWorld = planeObj->getWorldTransform() * vtxInPlaneProjected;
 
-	//first perform a collision query with the non-perturbated collision objects
+	hasCollision = distance < m_manifoldPtr->getContactBreakingThreshold();
+	resultOut->setPersistentManifold(m_manifoldPtr);
+	if (hasCollision)
 	{
-		btQuaternion rotq(0,0,0,1);
-		collideSingleContact(rotq,body0,body1,dispatchInfo,resultOut);
+		/// report a contact. internally this will be kept persistent, and contact reduction is done
+		btVector3 normalOnSurfaceB = planeObj->getWorldTransform().getBasis() * planeNormal;
+		btVector3 pOnB = vtxInPlaneWorld;
+		resultOut->addContactPoint(normalOnSurfaceB,pOnB,distance);
 	}
 
-	if (resultOut->getPersistentManifold()->getNumContacts()<m_minimumPointsPerturbationThreshold)
+	//the perturbation algorithm doesn't work well with implicit surfaces such as spheres, cylinder and cones:
+	//they keep on rolling forever because of the additional off-center contact points
+	//so only enable the feature for polyhedral shapes (btBoxShape, btConvexHullShape etc)
+	if (convexShape->isPolyhedral() && resultOut->getPersistentManifold()->getNumContacts()<m_minimumPointsPerturbationThreshold)
 	{
 		btVector3 v0,v1;
 		btPlaneSpace1(planeNormal,v0,v1);
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
index f49ac45e772..b9494f5ad3b 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef CONVEX_PLANE_COLLISION_ALGORITHM_H
-#define CONVEX_PLANE_COLLISION_ALGORITHM_H
+#ifndef BT_CONVEX_PLANE_COLLISION_ALGORITHM_H
+#define BT_CONVEX_PLANE_COLLISION_ALGORITHM_H
 
 #include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
 #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
@@ -61,7 +61,7 @@ public:
 			
 		CreateFunc() 
 			: m_numPerturbationIterations(1),
-			m_minimumPointsPerturbationThreshold(1)
+			m_minimumPointsPerturbationThreshold(0)
 		{
 		}
 		
@@ -80,5 +80,5 @@ public:
 
 };
 
-#endif //CONVEX_PLANE_COLLISION_ALGORITHM_H
+#endif //BT_CONVEX_PLANE_COLLISION_ALGORITHM_H
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
index c27d8ce0752..7faee6faf50 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
@@ -296,3 +296,14 @@ void btDefaultCollisionConfiguration::setConvexConvexMultipointIterations(int nu
 	convexConvex->m_numPerturbationIterations = numPerturbationIterations;
 	convexConvex->m_minimumPointsPerturbationThreshold = minimumPointsPerturbationThreshold;
 }
+
+void	btDefaultCollisionConfiguration::setPlaneConvexMultipointIterations(int numPerturbationIterations, int minimumPointsPerturbationThreshold)
+{
+	btConvexPlaneCollisionAlgorithm::CreateFunc* cpCF = (btConvexPlaneCollisionAlgorithm::CreateFunc*)m_convexPlaneCF;
+	cpCF->m_numPerturbationIterations = numPerturbationIterations;
+	cpCF->m_minimumPointsPerturbationThreshold = minimumPointsPerturbationThreshold;
+	
+	btConvexPlaneCollisionAlgorithm::CreateFunc* pcCF = (btConvexPlaneCollisionAlgorithm::CreateFunc*)m_planeConvexCF;
+	pcCF->m_numPerturbationIterations = numPerturbationIterations;
+	pcCF->m_minimumPointsPerturbationThreshold = minimumPointsPerturbationThreshold;
+}
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
index 6aa0d8c270f..81ed424a3db 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
@@ -129,6 +129,8 @@ public:
 	///@todo we could add a per-object setting of those parameters, for level-of-detail collision detection.
 	void	setConvexConvexMultipointIterations(int numPerturbationIterations=3, int minimumPointsPerturbationThreshold = 3);
 
+	void	setPlaneConvexMultipointIterations(int numPerturbationIterations=3, int minimumPointsPerturbationThreshold = 3);
+
 };
 
 #endif //BT_DEFAULT_COLLISION_CONFIGURATION
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
index e54721dec21..f03c9dc3833 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef EMPTY_ALGORITH
-#define EMPTY_ALGORITH
+#ifndef BT_EMPTY_ALGORITH
+#define BT_EMPTY_ALGORITH
 #include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
 #include "btCollisionCreateFunc.h"
 #include "btCollisionDispatcher.h"
@@ -51,4 +51,4 @@ public:
 
 } ATTRIBUTE_ALIGNED(16);
 
-#endif //EMPTY_ALGORITH
+#endif //BT_EMPTY_ALGORITH
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
index 5cceb04dbb4..4353cdac0b1 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
@@ -1,6 +1,7 @@
 #include "btInternalEdgeUtility.h"
 
 #include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h"
+#include "BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h"
 #include "BulletCollision/CollisionShapes/btTriangleShape.h"
 #include "BulletCollision/CollisionDispatch/btCollisionObject.h"
 #include "BulletCollision/NarrowPhaseCollision/btManifoldPoint.h"
@@ -9,7 +10,6 @@
 
 //#define DEBUG_INTERNAL_EDGE
 
-
 #ifdef DEBUG_INTERNAL_EDGE
 #include <stdio.h>
 #endif //DEBUG_INTERNAL_EDGE
@@ -456,8 +456,14 @@ void btAdjustInternalEdgeContacts(btManifoldPoint& cp, const btCollisionObject*
 	if (colObj0->getCollisionShape()->getShapeType() != TRIANGLE_SHAPE_PROXYTYPE)
 		return;
 
-	btBvhTriangleMeshShape* trimesh = (btBvhTriangleMeshShape*)colObj0->getRootCollisionShape();
-	btTriangleInfoMap* triangleInfoMapPtr = (btTriangleInfoMap*) trimesh->getTriangleInfoMap();
+	btBvhTriangleMeshShape* trimesh = 0;
+	
+	if( colObj0->getRootCollisionShape()->getShapeType() == SCALED_TRIANGLE_MESH_SHAPE_PROXYTYPE )
+	   trimesh = ((btScaledBvhTriangleMeshShape*)colObj0->getRootCollisionShape())->getChildShape();
+   else	   
+	   trimesh = (btBvhTriangleMeshShape*)colObj0->getRootCollisionShape();
+	   
+   	btTriangleInfoMap* triangleInfoMapPtr = (btTriangleInfoMap*) trimesh->getTriangleInfoMap();
 	if (!triangleInfoMapPtr)
 		return;
 
@@ -501,14 +507,63 @@ void btAdjustInternalEdgeContacts(btManifoldPoint& cp, const btCollisionObject*
 
 	btVector3 localContactNormalOnB = colObj0->getWorldTransform().getBasis().transpose() * cp.m_normalWorldOnB;
 	localContactNormalOnB.normalize();//is this necessary?
-
-	if ((info->m_edgeV0V1Angle)< SIMD_2_PI)
+	
+	// Get closest edge
+	int      bestedge=-1;
+	btScalar    disttobestedge=BT_LARGE_FLOAT;
+	//
+	// Edge 0 -> 1
+	if (btFabs(info->m_edgeV0V1Angle)< triangleInfoMapPtr->m_maxEdgeAngleThreshold)
+	{	
+	   btVector3 nearest;
+	   btNearestPointInLineSegment( cp.m_localPointB, v0, v1, nearest );
+	   btScalar     len=(contact-nearest).length();
+	   //
+	   if( len < disttobestedge )
+	   {
+	      bestedge=0;
+	      disttobestedge=len;
+      }	      
+   }	   
+	// Edge 1 -> 2
+	if (btFabs(info->m_edgeV1V2Angle)< triangleInfoMapPtr->m_maxEdgeAngleThreshold)
+	{	
+	   btVector3 nearest;
+	   btNearestPointInLineSegment( cp.m_localPointB, v1, v2, nearest );
+	   btScalar     len=(contact-nearest).length();
+	   //
+	   if( len < disttobestedge )
+	   {
+	      bestedge=1;
+	      disttobestedge=len;
+      }	      
+   }	   
+	// Edge 2 -> 0
+	if (btFabs(info->m_edgeV2V0Angle)< triangleInfoMapPtr->m_maxEdgeAngleThreshold)
+	{	
+	   btVector3 nearest;
+	   btNearestPointInLineSegment( cp.m_localPointB, v2, v0, nearest );
+	   btScalar     len=(contact-nearest).length();
+	   //
+	   if( len < disttobestedge )
+	   {
+	      bestedge=2;
+	      disttobestedge=len;
+      }	      
+   }   	      	
+	
+#ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
+   btVector3 upfix=tri_normal * btVector3(0.1f,0.1f,0.1f);
+   btDebugDrawLine(tr * v0 + upfix, tr * v1 + upfix, red );
+#endif   
+	if (btFabs(info->m_edgeV0V1Angle)< triangleInfoMapPtr->m_maxEdgeAngleThreshold)
 	{
 #ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
 		btDebugDrawLine(tr*contact,tr*(contact+cp.m_normalWorldOnB*10),black);
 #endif
 		btScalar len = (contact-nearest).length();
 		if(len<triangleInfoMapPtr->m_edgeDistanceThreshold)
+		if( bestedge==0 )
 		{
 			btVector3 edge(v0-v1);
 			isNearEdge = true;
@@ -577,7 +632,11 @@ void btAdjustInternalEdgeContacts(btManifoldPoint& cp, const btCollisionObject*
 	btDebugDrawLine(tr*nearest,tr*cp.m_localPointB,green);
 #endif //BT_INTERNAL_EDGE_DEBUG_DRAW
 
-	if ((info->m_edgeV1V2Angle)< SIMD_2_PI)
+#ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
+   btDebugDrawLine(tr * v1 + upfix, tr * v2 + upfix , green );
+#endif   
+
+	if (btFabs(info->m_edgeV1V2Angle)< triangleInfoMapPtr->m_maxEdgeAngleThreshold)
 	{
 #ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
 		btDebugDrawLine(tr*contact,tr*(contact+cp.m_normalWorldOnB*10),black);
@@ -587,6 +646,7 @@ void btAdjustInternalEdgeContacts(btManifoldPoint& cp, const btCollisionObject*
 
 		btScalar len = (contact-nearest).length();
 		if(len<triangleInfoMapPtr->m_edgeDistanceThreshold)
+		if( bestedge==1 )
 		{
 			isNearEdge = true;
 #ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
@@ -658,8 +718,11 @@ void btAdjustInternalEdgeContacts(btManifoldPoint& cp, const btCollisionObject*
 #ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
 	btDebugDrawLine(tr*nearest,tr*cp.m_localPointB,blue);
 #endif //BT_INTERNAL_EDGE_DEBUG_DRAW
+#ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
+   btDebugDrawLine(tr * v2 + upfix, tr * v0 + upfix , blue );
+#endif   
 
-	if ((info->m_edgeV2V0Angle)< SIMD_2_PI)
+	if (btFabs(info->m_edgeV2V0Angle)< triangleInfoMapPtr->m_maxEdgeAngleThreshold)
 	{
 
 #ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
@@ -668,6 +731,7 @@ void btAdjustInternalEdgeContacts(btManifoldPoint& cp, const btCollisionObject*
 
 		btScalar len = (contact-nearest).length();
 		if(len<triangleInfoMapPtr->m_edgeDistanceThreshold)
+		if( bestedge==2 )
 		{
 			isNearEdge = true;
 #ifdef BT_INTERNAL_EDGE_DEBUG_DRAW
@@ -759,11 +823,17 @@ void btAdjustInternalEdgeContacts(btManifoldPoint& cp, const btCollisionObject*
 				cp.m_normalWorldOnB = colObj0->getWorldTransform().getBasis()*tri_normal;
 			} else
 			{
+				btVector3 newNormal = tri_normal *frontFacing;
+				//if the tri_normal is pointing opposite direction as the current local contact normal, skip it
+				btScalar d = newNormal.dot(localContactNormalOnB) ;
+				if (d< 0)
+				{
+					return;
+				}
 				//modify the normal to be the triangle normal (or backfacing normal)
-				cp.m_normalWorldOnB = colObj0->getWorldTransform().getBasis() *(tri_normal *frontFacing);
+				cp.m_normalWorldOnB = colObj0->getWorldTransform().getBasis() *newNormal;
 			}
-			
-			
+						
 			// Reproject collision point along normal.
 			cp.m_positionWorldOnB = cp.m_positionWorldOnA - cp.m_normalWorldOnB * cp.m_distance1;
 			cp.m_localPointB = colObj0->getWorldTransform().invXform(cp.m_positionWorldOnB);
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
index fd684c056f7..bf24246ea2f 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
@@ -64,8 +64,8 @@ void btManifoldResult::addContactPoint(const btVector3& normalOnBInWorld,const b
 	btAssert(m_manifoldPtr);
 	//order in manifold needs to match
 
-//	if (depth > m_manifoldPtr->getContactBreakingThreshold())
-	if (depth > m_manifoldPtr->getContactProcessingThreshold())
+	if (depth > m_manifoldPtr->getContactBreakingThreshold())
+//	if (depth > m_manifoldPtr->getContactProcessingThreshold())
 		return;
 
 	bool isSwapped = m_manifoldPtr->getBody0() != m_body0;
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
index 927e2bc4f76..18199b49752 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
@@ -14,8 +14,8 @@ subject to the following restrictions:
 */
 
 
-#ifndef MANIFOLD_RESULT_H
-#define MANIFOLD_RESULT_H
+#ifndef BT_MANIFOLD_RESULT_H
+#define BT_MANIFOLD_RESULT_H
 
 class btCollisionObject;
 #include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
@@ -125,4 +125,4 @@ public:
 	
 };
 
-#endif //MANIFOLD_RESULT_H
+#endif //BT_MANIFOLD_RESULT_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
index bb2a7f23985..871c64415a2 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
@@ -47,6 +47,8 @@ void btSimulationIslandManager::findUnions(btDispatcher* /* dispatcher */,btColl
 	{
 		btOverlappingPairCache* pairCachePtr = colWorld->getPairCache();
 		const int numOverlappingPairs = pairCachePtr->getNumOverlappingPairs();
+		if (numOverlappingPairs)
+		{
 		btBroadphasePair* pairPtr = pairCachePtr->getOverlappingPairArrayPtr();
 		
 		for (int i=0;i<numOverlappingPairs;i++)
@@ -63,6 +65,7 @@ void btSimulationIslandManager::findUnions(btDispatcher* /* dispatcher */,btColl
 					(colObj1)->getIslandTag());
 			}
 		}
+		}
 	}
 }
 
@@ -190,7 +193,7 @@ class btPersistentManifoldSortPredicate
 {
 	public:
 
-		SIMD_FORCE_INLINE bool operator() ( const btPersistentManifold* lhs, const btPersistentManifold* rhs )
+		SIMD_FORCE_INLINE bool operator() ( const btPersistentManifold* lhs, const btPersistentManifold* rhs ) const
 		{
 			return getIslandId(lhs) < getIslandId(rhs);
 		}
@@ -327,11 +330,13 @@ void btSimulationIslandManager::buildIslands(btDispatcher* dispatcher,btCollisio
 			//kinematic objects don't merge islands, but wake up all connected objects
 			if (colObj0->isKinematicObject() && colObj0->getActivationState() != ISLAND_SLEEPING)
 			{
-				colObj1->activate();
+				if (colObj0->hasContactResponse())
+					colObj1->activate();
 			}
 			if (colObj1->isKinematicObject() && colObj1->getActivationState() != ISLAND_SLEEPING)
 			{
-				colObj0->activate();
+				if (colObj1->hasContactResponse())
+					colObj0->activate();
 			}
 			if(m_splitIslands)
 			{ 
@@ -362,7 +367,7 @@ void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,
 	{
 		btPersistentManifold** manifold = dispatcher->getInternalManifoldPointer();
 		int maxNumManifolds = dispatcher->getNumManifolds();
-		callback->ProcessIsland(&collisionObjects[0],collisionObjects.size(),manifold,maxNumManifolds, -1);
+		callback->processIsland(&collisionObjects[0],collisionObjects.size(),manifold,maxNumManifolds, -1);
 	}
 	else
 	{
@@ -372,8 +377,10 @@ void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,
 
 		int numManifolds = int (m_islandmanifold.size());
 
-		//we should do radix sort, it it much faster (O(n) instead of O (n log2(n))
+		//tried a radix sort, but quicksort/heapsort seems still faster
+		//@todo rewrite island management
 		m_islandmanifold.quickSort(btPersistentManifoldSortPredicate());
+		//m_islandmanifold.heapSort(btPersistentManifoldSortPredicate());
 
 		//now process all active islands (sets of manifolds for now)
 
@@ -427,7 +434,7 @@ void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,
 
 			if (!islandSleeping)
 			{
-				callback->ProcessIsland(&m_islandBodies[0],m_islandBodies.size(),startManifold,numIslandManifolds, islandId);
+				callback->processIsland(&m_islandBodies[0],m_islandBodies.size(),startManifold,numIslandManifolds, islandId);
 	//			printf("Island callback of size:%d bodies, %d manifolds\n",islandBodies.size(),numIslandManifolds);
 			}
 			
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
index d059f5d6b0d..e24c6afeca1 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef SIMULATION_ISLAND_MANAGER_H
-#define SIMULATION_ISLAND_MANAGER_H
+#ifndef BT_SIMULATION_ISLAND_MANAGER_H
+#define BT_SIMULATION_ISLAND_MANAGER_H
 
 #include "BulletCollision/CollisionDispatch/btUnionFind.h"
 #include "btCollisionCreateFunc.h"
@@ -59,7 +59,7 @@ public:
 	{
 		virtual ~IslandCallback() {};
 
-		virtual	void	ProcessIsland(btCollisionObject** bodies,int numBodies,class btPersistentManifold**	manifolds,int numManifolds, int islandId) = 0;
+		virtual	void	processIsland(btCollisionObject** bodies,int numBodies,class btPersistentManifold**	manifolds,int numManifolds, int islandId) = 0;
 	};
 
 	void	buildAndProcessIslands(btDispatcher* dispatcher,btCollisionWorld* collisionWorld, IslandCallback* callback);
@@ -77,5 +77,5 @@ public:
 
 };
 
-#endif //SIMULATION_ISLAND_MANAGER_H
+#endif //BT_SIMULATION_ISLAND_MANAGER_H
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
index 47111d1c4af..60286ae0aa4 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef SPHERE_BOX_COLLISION_ALGORITHM_H
-#define SPHERE_BOX_COLLISION_ALGORITHM_H
+#ifndef BT_SPHERE_BOX_COLLISION_ALGORITHM_H
+#define BT_SPHERE_BOX_COLLISION_ALGORITHM_H
 
 #include "btActivatingCollisionAlgorithm.h"
 #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
@@ -71,5 +71,5 @@ public:
 
 };
 
-#endif //SPHERE_BOX_COLLISION_ALGORITHM_H
+#endif //BT_SPHERE_BOX_COLLISION_ALGORITHM_H
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
index 7d07512ca66..e55acf277e6 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef SPHERE_SPHERE_COLLISION_ALGORITHM_H
-#define SPHERE_SPHERE_COLLISION_ALGORITHM_H
+#ifndef BT_SPHERE_SPHERE_COLLISION_ALGORITHM_H
+#define BT_SPHERE_SPHERE_COLLISION_ALGORITHM_H
 
 #include "btActivatingCollisionAlgorithm.h"
 #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
@@ -62,5 +62,5 @@ public:
 
 };
 
-#endif //SPHERE_SPHERE_COLLISION_ALGORITHM_H
+#endif //BT_SPHERE_SPHERE_COLLISION_ALGORITHM_H
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
index 606c3635ae9..7c6c4d8f8d5 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef SPHERE_TRIANGLE_COLLISION_ALGORITHM_H
-#define SPHERE_TRIANGLE_COLLISION_ALGORITHM_H
+#ifndef BT_SPHERE_TRIANGLE_COLLISION_ALGORITHM_H
+#define BT_SPHERE_TRIANGLE_COLLISION_ALGORITHM_H
 
 #include "btActivatingCollisionAlgorithm.h"
 #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
@@ -65,5 +65,5 @@ public:
 
 };
 
-#endif //SPHERE_TRIANGLE_COLLISION_ALGORITHM_H
+#endif //BT_SPHERE_TRIANGLE_COLLISION_ALGORITHM_H
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp
index 4c4f58d44fa..5222933595d 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp
@@ -53,7 +53,7 @@ class btUnionFindElementSortPredicate
 {
 	public:
 
-		bool operator() ( const btElement& lhs, const btElement& rhs )
+		bool operator() ( const btElement& lhs, const btElement& rhs ) const
 		{
 			return lhs.m_id < rhs.m_id;
 		}
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
index 2cce335145b..ef2a29202f7 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef UNION_FIND_H
-#define UNION_FIND_H
+#ifndef BT_UNION_FIND_H
+#define BT_UNION_FIND_H
 
 #include "LinearMath/btAlignedObjectArray.h"
 
@@ -126,4 +126,4 @@ class btUnionFind
   };
 
 
-#endif //UNION_FIND_H
+#endif //BT_UNION_FIND_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.h
index fc032069c03..f4a9ca03e5c 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef OBB_BOX_2D_SHAPE_H
-#define OBB_BOX_2D_SHAPE_H
+#ifndef BT_OBB_BOX_2D_SHAPE_H
+#define BT_OBB_BOX_2D_SHAPE_H
 
 #include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h"
 #include "BulletCollision/CollisionShapes/btCollisionMargin.h"
@@ -83,6 +83,7 @@ public:
 	}
 
 
+	///a btBox2dShape is a flat 2D box in the X-Y plane (Z extents are zero)
 	btBox2dShape( const btVector3& boxHalfExtents) 
 		: btPolyhedralConvexShape(),
 		m_centroid(0,0,0)
@@ -97,6 +98,11 @@ public:
 		m_normals[2].setValue(0,1,0);
 		m_normals[3].setValue(-1,0,0);
 
+		btScalar minDimension = boxHalfExtents.getX();
+		if (minDimension>boxHalfExtents.getY())
+			minDimension = boxHalfExtents.getY();
+		setSafeMargin(minDimension);
+
 		m_shapeType = BOX_2D_SHAPE_PROXYTYPE;
 		btVector3 margin(getMargin(),getMargin(),getMargin());
 		m_implicitShapeDimensions = (boxHalfExtents * m_localScaling) - margin;
@@ -358,6 +364,6 @@ public:
 
 };
 
-#endif //OBB_BOX_2D_SHAPE_H
+#endif //BT_OBB_BOX_2D_SHAPE_H
 
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp
index c6644efbef3..3859138f18a 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp
@@ -14,8 +14,18 @@ subject to the following restrictions:
 */
 #include "btBoxShape.h"
 
+btBoxShape::btBoxShape( const btVector3& boxHalfExtents) 
+: btPolyhedralConvexShape()
+{
+	m_shapeType = BOX_SHAPE_PROXYTYPE;
+
+	setSafeMargin(boxHalfExtents);
+
+	btVector3 margin(getMargin(),getMargin(),getMargin());
+	m_implicitShapeDimensions = (boxHalfExtents * m_localScaling) - margin;
+};
+
 
-//{ 
 
 
 void btBoxShape::getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
index b405efc8e3c..0c5857dae62 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef OBB_BOX_MINKOWSKI_H
-#define OBB_BOX_MINKOWSKI_H
+#ifndef BT_OBB_BOX_MINKOWSKI_H
+#define BT_OBB_BOX_MINKOWSKI_H
 
 #include "btPolyhedralConvexShape.h"
 #include "btCollisionMargin.h"
@@ -80,13 +80,7 @@ public:
 	}
 
 
-	btBoxShape( const btVector3& boxHalfExtents) 
-		: btPolyhedralConvexShape()
-	{
-		m_shapeType = BOX_SHAPE_PROXYTYPE;
-		btVector3 margin(getMargin(),getMargin(),getMargin());
-		m_implicitShapeDimensions = (boxHalfExtents * m_localScaling) - margin;
-	};
+	btBoxShape( const btVector3& boxHalfExtents);
 
 	virtual void setMargin(btScalar collisionMargin)
 	{
@@ -145,7 +139,7 @@ public:
 
 	virtual void getVertex(int i,btVector3& vtx) const
 	{
-		btVector3 halfExtents = getHalfExtentsWithoutMargin();
+		btVector3 halfExtents = getHalfExtentsWithMargin();
 
 		vtx = btVector3(
 				halfExtents.x() * (1-(i&1)) - halfExtents.x() * (i&1),
@@ -313,6 +307,6 @@ public:
 };
 
 
-#endif //OBB_BOX_MINKOWSKI_H
+#endif //BT_OBB_BOX_MINKOWSKI_H
 
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
index c269ef27bdb..d1c21629873 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef BVH_TRIANGLE_MESH_SHAPE_H
-#define BVH_TRIANGLE_MESH_SHAPE_H
+#ifndef BT_BVH_TRIANGLE_MESH_SHAPE_H
+#define BT_BVH_TRIANGLE_MESH_SHAPE_H
 
 #include "btTriangleMeshShape.h"
 #include "btOptimizedBvh.h"
@@ -136,4 +136,4 @@ SIMD_FORCE_INLINE	int	btBvhTriangleMeshShape::calculateSerializeBufferSize() con
 
 
 
-#endif //BVH_TRIANGLE_MESH_SHAPE_H
+#endif //BT_BVH_TRIANGLE_MESH_SHAPE_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
index 2faa11d4360..864df26e931 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
@@ -55,7 +55,7 @@ btCapsuleShape::btCapsuleShape(btScalar radius, btScalar height) : btConvexInter
 		btVector3 pos(0,0,0);
 		pos[getUpAxis()] = getHalfHeight();
 
-		vtx = pos +vec*m_localScaling*(radius) - vec * getMargin();
+		vtx = pos +vec*(radius) - vec * getMargin();
 		newDot = vec.dot(vtx);
 		if (newDot > maxDot)
 		{
@@ -67,7 +67,7 @@ btCapsuleShape::btCapsuleShape(btScalar radius, btScalar height) : btConvexInter
 		btVector3 pos(0,0,0);
 		pos[getUpAxis()] = -getHalfHeight();
 
-		vtx = pos +vec*m_localScaling*(radius) - vec * getMargin();
+		vtx = pos +vec*(radius) - vec * getMargin();
 		newDot = vec.dot(vtx);
 		if (newDot > maxDot)
 		{
@@ -96,7 +96,7 @@ btCapsuleShape::btCapsuleShape(btScalar radius, btScalar height) : btConvexInter
 		{
 			btVector3 pos(0,0,0);
 			pos[getUpAxis()] = getHalfHeight();
-			vtx = pos +vec*m_localScaling*(radius) - vec * getMargin();
+			vtx = pos +vec*(radius) - vec * getMargin();
 			newDot = vec.dot(vtx);
 			if (newDot > maxDot)
 			{
@@ -107,7 +107,7 @@ btCapsuleShape::btCapsuleShape(btScalar radius, btScalar height) : btConvexInter
 		{
 			btVector3 pos(0,0,0);
 			pos[getUpAxis()] = -getHalfHeight();
-			vtx = pos +vec*m_localScaling*(radius) - vec * getMargin();
+			vtx = pos +vec*(radius) - vec * getMargin();
 			newDot = vec.dot(vtx);
 			if (newDot > maxDot)
 			{
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionMargin.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionMargin.h
index 18fd026041f..474bf1fb499 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionMargin.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionMargin.h
@@ -13,14 +13,15 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef COLLISION_MARGIN_H
-#define COLLISION_MARGIN_H
-
-//used by Gjk and some other algorithms
+#ifndef BT_COLLISION_MARGIN_H
+#define BT_COLLISION_MARGIN_H
 
+///The CONVEX_DISTANCE_MARGIN is a default collision margin for convex collision shapes derived from btConvexInternalShape.
+///This collision margin is used by Gjk and some other algorithms
+///Note that when creating small objects, you need to make sure to set a smaller collision margin, using the 'setMargin' API
 #define CONVEX_DISTANCE_MARGIN btScalar(0.04)// btScalar(0.1)//;//btScalar(0.01)
 
 
 
-#endif //COLLISION_MARGIN_H
+#endif //BT_COLLISION_MARGIN_H
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
index f32bd736a99..865c1067744 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef COLLISION_SHAPE_H
-#define COLLISION_SHAPE_H
+#ifndef BT_COLLISION_SHAPE_H
+#define BT_COLLISION_SHAPE_H
 
 #include "LinearMath/btTransform.h"
 #include "LinearMath/btVector3.h"
@@ -146,5 +146,5 @@ SIMD_FORCE_INLINE	int	btCollisionShape::calculateSerializeBufferSize() const
 
 
 
-#endif //COLLISION_SHAPE_H
+#endif //BT_COLLISION_SHAPE_H
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
index 7f41dd4517b..141034a8e8c 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef COMPOUND_SHAPE_H
-#define COMPOUND_SHAPE_H
+#ifndef BT_COMPOUND_SHAPE_H
+#define BT_COMPOUND_SHAPE_H
 
 #include "btCollisionShape.h"
 
@@ -209,4 +209,4 @@ SIMD_FORCE_INLINE	int	btCompoundShape::calculateSerializeBufferSize() const
 
 
 
-#endif //COMPOUND_SHAPE_H
+#endif //BT_COMPOUND_SHAPE_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
index 2a370a47c75..2a03241c9d7 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef CONCAVE_SHAPE_H
-#define CONCAVE_SHAPE_H
+#ifndef BT_CONCAVE_SHAPE_H
+#define BT_CONCAVE_SHAPE_H
 
 #include "btCollisionShape.h"
 #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
@@ -57,4 +57,4 @@ public:
 
 };
 
-#endif //CONCAVE_SHAPE_H
+#endif //BT_CONCAVE_SHAPE_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
index bd7d1443ac2..b69b5c5b0c8 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef CONE_MINKOWSKI_H
-#define CONE_MINKOWSKI_H
+#ifndef BT_CONE_MINKOWSKI_H
+#define BT_CONE_MINKOWSKI_H
 
 #include "btConvexInternalShape.h"
 #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
@@ -99,5 +99,5 @@ class btConeShapeZ : public btConeShape
 	public:
 		btConeShapeZ(btScalar radius,btScalar height);
 };
-#endif //CONE_MINKOWSKI_H
+#endif //BT_CONE_MINKOWSKI_H
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
index 69bc67cafab..226245979ab 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
@@ -208,4 +208,48 @@ const char*	btConvexHullShape::serialize(void* dataBuffer, btSerializer* seriali
 	return "btConvexHullShapeData";
 }
 
+void btConvexHullShape::project(const btTransform& trans, const btVector3& dir, btScalar& min, btScalar& max) const
+{
+#if 1
+	min = FLT_MAX;
+	max = -FLT_MAX;
+	btVector3 witnesPtMin;
+	btVector3 witnesPtMax;
+
+	int numVerts = m_unscaledPoints.size();
+	for(int i=0;i<numVerts;i++)
+	{
+		btVector3 vtx = m_unscaledPoints[i] * m_localScaling;
+		btVector3 pt = trans * vtx;
+		btScalar dp = pt.dot(dir);
+		if(dp < min)	
+		{
+			min = dp;
+			witnesPtMin = pt;
+		}
+		if(dp > max)	
+		{
+			max = dp;
+			witnesPtMax=pt;
+		}
+	}
+#else
+	btVector3 localAxis = dir*trans.getBasis();
+	btVector3 vtx1 = trans(localGetSupportingVertex(localAxis));
+	btVector3 vtx2 = trans(localGetSupportingVertex(-localAxis));
+
+	min = vtx1.dot(dir);
+	max = vtx2.dot(dir);
+#endif
+
+	if(min>max)
+	{
+		btScalar tmp = min;
+		min = max;
+		max = tmp;
+	}
+
+
+}
+
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
index bf960f4df92..95a2af6a3a0 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef CONVEX_HULL_SHAPE_H
-#define CONVEX_HULL_SHAPE_H
+#ifndef BT_CONVEX_HULL_SHAPE_H
+#define BT_CONVEX_HULL_SHAPE_H
 
 #include "btPolyhedralConvexShape.h"
 #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
@@ -73,6 +73,8 @@ public:
 	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const;
 	
 
+	virtual void project(const btTransform& trans, const btVector3& dir, btScalar& min, btScalar& max) const;
+
 
 	//debugging
 	virtual const char*	getName()const {return "Convex";}
@@ -116,5 +118,5 @@ SIMD_FORCE_INLINE	int	btConvexHullShape::calculateSerializeBufferSize() const
 }
 
 
-#endif //CONVEX_HULL_SHAPE_H
+#endif //BT_CONVEX_HULL_SHAPE_H
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
index 12527731804..85cd9ef90c7 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
@@ -21,6 +21,11 @@ subject to the following restrictions:
 
 
 ///The btConvexInternalShape is an internal base class, shared by most convex shape implementations.
+///The btConvexInternalShape uses a default collision margin set to CONVEX_DISTANCE_MARGIN.
+///This collision margin used by Gjk and some other algorithms, see also btCollisionMargin.h
+///Note that when creating small shapes (derived from btConvexInternalShape), 
+///you need to make sure to set a smaller collision margin, using the 'setMargin' API
+///There is a automatic mechanism 'setSafeMargin' used by btBoxShape and btCylinderShape
 class btConvexInternalShape : public btConvexShape
 {
 
@@ -62,6 +67,23 @@ public:
 		m_implicitShapeDimensions = dimensions;
 	}
 
+	void	setSafeMargin(btScalar minDimension, btScalar defaultMarginMultiplier = 0.1f)
+	{
+		btScalar safeMargin = defaultMarginMultiplier*minDimension;
+		if (safeMargin < getMargin())
+		{
+			setMargin(safeMargin);
+		}
+	}
+	void	setSafeMargin(const btVector3& halfExtents, btScalar defaultMarginMultiplier = 0.1f)
+	{
+		//see http://code.google.com/p/bullet/issues/detail?id=349
+		//this margin check could could be added to other collision shapes too,
+		//or add some assert/warning somewhere
+		btScalar minDimension=halfExtents[halfExtents.minAxis()]; 		
+		setSafeMargin(minDimension, defaultMarginMultiplier);
+	}
+
 	///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
 	void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const
 	{
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp
new file mode 100644
index 00000000000..1e26be531c2
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp
@@ -0,0 +1,296 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2011 Advanced Micro Devices, Inc.  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+
+///This file was written by Erwin Coumans
+///Separating axis rest based on work from Pierre Terdiman, see
+///And contact clipping based on work from Simon Hobbs
+
+#include "btConvexPolyhedron.h"
+#include "LinearMath/btHashMap.h"
+
+btConvexPolyhedron::btConvexPolyhedron()
+{
+
+}
+btConvexPolyhedron::~btConvexPolyhedron()
+{
+
+}
+
+
+inline bool IsAlmostZero(const btVector3& v)
+{
+	if(fabsf(v.x())>1e-6 || fabsf(v.y())>1e-6 || fabsf(v.z())>1e-6)	return false;
+	return true;
+}
+
+struct btInternalVertexPair
+{
+	btInternalVertexPair(short int v0,short int v1)
+		:m_v0(v0),
+		m_v1(v1)
+	{
+		if (m_v1>m_v0)
+			btSwap(m_v0,m_v1);
+	}
+	short int m_v0;
+	short int m_v1;
+	int getHash() const
+	{
+		return m_v0+(m_v1<<16);
+	}
+	bool equals(const btInternalVertexPair& other) const
+	{
+		return m_v0==other.m_v0 && m_v1==other.m_v1;
+	}
+};
+
+struct btInternalEdge
+{
+	btInternalEdge()
+		:m_face0(-1),
+		m_face1(-1)
+	{
+	}
+	short int m_face0;
+	short int m_face1;
+};
+
+//
+
+#ifdef TEST_INTERNAL_OBJECTS
+bool btConvexPolyhedron::testContainment() const
+{
+	for(int p=0;p<8;p++)
+	{
+		btVector3 LocalPt;
+		if(p==0)		LocalPt = m_localCenter + btVector3(m_extents[0], m_extents[1], m_extents[2]);
+		else if(p==1)	LocalPt = m_localCenter + btVector3(m_extents[0], m_extents[1], -m_extents[2]);
+		else if(p==2)	LocalPt = m_localCenter + btVector3(m_extents[0], -m_extents[1], m_extents[2]);
+		else if(p==3)	LocalPt = m_localCenter + btVector3(m_extents[0], -m_extents[1], -m_extents[2]);
+		else if(p==4)	LocalPt = m_localCenter + btVector3(-m_extents[0], m_extents[1], m_extents[2]);
+		else if(p==5)	LocalPt = m_localCenter + btVector3(-m_extents[0], m_extents[1], -m_extents[2]);
+		else if(p==6)	LocalPt = m_localCenter + btVector3(-m_extents[0], -m_extents[1], m_extents[2]);
+		else if(p==7)	LocalPt = m_localCenter + btVector3(-m_extents[0], -m_extents[1], -m_extents[2]);
+
+		for(int i=0;i<m_faces.size();i++)
+		{
+			const btVector3 Normal(m_faces[i].m_plane[0], m_faces[i].m_plane[1], m_faces[i].m_plane[2]);
+			const btScalar d = LocalPt.dot(Normal) + m_faces[i].m_plane[3];
+			if(d>0.0f)
+				return false;
+		}
+	}
+	return true;
+}
+#endif
+
+void	btConvexPolyhedron::initialize()
+{
+
+	btHashMap<btInternalVertexPair,btInternalEdge> edges;
+
+	btScalar TotalArea = 0.0f;
+	
+	m_localCenter.setValue(0, 0, 0);
+	for(int i=0;i<m_faces.size();i++)
+	{
+		int numVertices = m_faces[i].m_indices.size();
+		int NbTris = numVertices;
+		for(int j=0;j<NbTris;j++)
+		{
+			int k = (j+1)%numVertices;
+			btInternalVertexPair vp(m_faces[i].m_indices[j],m_faces[i].m_indices[k]);
+			btInternalEdge* edptr = edges.find(vp);
+			btVector3 edge = m_vertices[vp.m_v1]-m_vertices[vp.m_v0];
+			edge.normalize();
+
+			bool found = false;
+
+			for (int p=0;p<m_uniqueEdges.size();p++)
+			{
+				
+				if (IsAlmostZero(m_uniqueEdges[p]-edge) || 
+					IsAlmostZero(m_uniqueEdges[p]+edge))
+				{
+					found = true;
+					break;
+				}
+			}
+
+			if (!found)
+			{
+				m_uniqueEdges.push_back(edge);
+			}
+
+			if (edptr)
+			{
+				btAssert(edptr->m_face0>=0);
+				btAssert(edptr->m_face1<0);
+				edptr->m_face1 = i;
+			} else
+			{
+				btInternalEdge ed;
+				ed.m_face0 = i;
+				edges.insert(vp,ed);
+			}
+		}
+	}
+
+#ifdef USE_CONNECTED_FACES
+	for(int i=0;i<m_faces.size();i++)
+	{
+		int numVertices = m_faces[i].m_indices.size();
+		m_faces[i].m_connectedFaces.resize(numVertices);
+
+		for(int j=0;j<numVertices;j++)
+		{
+			int k = (j+1)%numVertices;
+			btInternalVertexPair vp(m_faces[i].m_indices[j],m_faces[i].m_indices[k]);
+			btInternalEdge* edptr = edges.find(vp);
+			btAssert(edptr);
+			btAssert(edptr->m_face0>=0);
+			btAssert(edptr->m_face1>=0);
+
+			int connectedFace = (edptr->m_face0==i)?edptr->m_face1:edptr->m_face0;
+			m_faces[i].m_connectedFaces[j] = connectedFace;
+		}
+	}
+#endif//USE_CONNECTED_FACES
+
+	for(int i=0;i<m_faces.size();i++)
+	{
+		int numVertices = m_faces[i].m_indices.size();
+		int NbTris = numVertices-2;
+		
+		const btVector3& p0 = m_vertices[m_faces[i].m_indices[0]];
+		for(int j=1;j<=NbTris;j++)
+		{
+			int k = (j+1)%numVertices;
+			const btVector3& p1 = m_vertices[m_faces[i].m_indices[j]];
+			const btVector3& p2 = m_vertices[m_faces[i].m_indices[k]];
+			btScalar Area = ((p0 - p1).cross(p0 - p2)).length() * 0.5f;
+			btVector3 Center = (p0+p1+p2)/3.0f;
+			m_localCenter += Area * Center;
+			TotalArea += Area;
+		}
+	}
+	m_localCenter /= TotalArea;
+
+
+
+
+#ifdef TEST_INTERNAL_OBJECTS
+	if(1)
+	{
+		m_radius = FLT_MAX;
+		for(int i=0;i<m_faces.size();i++)
+		{
+			const btVector3 Normal(m_faces[i].m_plane[0], m_faces[i].m_plane[1], m_faces[i].m_plane[2]);
+			const btScalar dist = btFabs(m_localCenter.dot(Normal) + m_faces[i].m_plane[3]);
+			if(dist<m_radius)
+				m_radius = dist;
+		}
+
+	
+		btScalar MinX = FLT_MAX;
+		btScalar MinY = FLT_MAX;
+		btScalar MinZ = FLT_MAX;
+		btScalar MaxX = -FLT_MAX;
+		btScalar MaxY = -FLT_MAX;
+		btScalar MaxZ = -FLT_MAX;
+		for(int i=0; i<m_vertices.size(); i++)
+		{
+			const btVector3& pt = m_vertices[i];
+			if(pt.x()<MinX)	MinX = pt.x();
+			if(pt.x()>MaxX)	MaxX = pt.x();
+			if(pt.y()<MinY)	MinY = pt.y();
+			if(pt.y()>MaxY)	MaxY = pt.y();
+			if(pt.z()<MinZ)	MinZ = pt.z();
+			if(pt.z()>MaxZ)	MaxZ = pt.z();
+		}
+		mC.setValue(MaxX+MinX, MaxY+MinY, MaxZ+MinZ);
+		mE.setValue(MaxX-MinX, MaxY-MinY, MaxZ-MinZ);
+
+
+
+//		const btScalar r = m_radius / sqrtf(2.0f);
+		const btScalar r = m_radius / sqrtf(3.0f);
+		const int LargestExtent = mE.maxAxis();
+		const btScalar Step = (mE[LargestExtent]*0.5f - r)/1024.0f;
+		m_extents[0] = m_extents[1] = m_extents[2] = r;
+		m_extents[LargestExtent] = mE[LargestExtent]*0.5f;
+		bool FoundBox = false;
+		for(int j=0;j<1024;j++)
+		{
+			if(testContainment())
+			{
+				FoundBox = true;
+				break;
+			}
+
+			m_extents[LargestExtent] -= Step;
+		}
+		if(!FoundBox)
+		{
+			m_extents[0] = m_extents[1] = m_extents[2] = r;
+		}
+		else
+		{
+			// Refine the box
+			const btScalar Step = (m_radius - r)/1024.0f;
+			const int e0 = (1<<LargestExtent) & 3;
+			const int e1 = (1<<e0) & 3;
+
+			for(int j=0;j<1024;j++)
+			{
+				const btScalar Saved0 = m_extents[e0];
+				const btScalar Saved1 = m_extents[e1];
+				m_extents[e0] += Step;
+				m_extents[e1] += Step;
+
+				if(!testContainment())
+				{
+					m_extents[e0] = Saved0;
+					m_extents[e1] = Saved1;
+					break;
+				}
+			}
+		}
+	}
+#endif
+}
+
+
+void btConvexPolyhedron::project(const btTransform& trans, const btVector3& dir, btScalar& min, btScalar& max) const
+{
+	min = FLT_MAX;
+	max = -FLT_MAX;
+	int numVerts = m_vertices.size();
+	for(int i=0;i<numVerts;i++)
+	{
+		btVector3 pt = trans * m_vertices[i];
+		btScalar dp = pt.dot(dir);
+		if(dp < min)	min = dp;
+		if(dp > max)	max = dp;
+	}
+	if(min>max)
+	{
+		btScalar tmp = min;
+		min = max;
+		max = tmp;
+	}
+}
\ No newline at end of file
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.h
new file mode 100644
index 00000000000..08db39a33c8
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPolyhedron.h
@@ -0,0 +1,62 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2011 Advanced Micro Devices, Inc.  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+
+///This file was written by Erwin Coumans
+
+
+#ifndef _BT_POLYHEDRAL_FEATURES_H
+#define _BT_POLYHEDRAL_FEATURES_H
+
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btAlignedObjectArray.h"
+
+#define TEST_INTERNAL_OBJECTS 1
+
+
+struct btFace
+{
+	btAlignedObjectArray<int>	m_indices;
+//	btAlignedObjectArray<int>	m_connectedFaces;
+	btScalar	m_plane[4];
+};
+
+
+class btConvexPolyhedron
+{
+	public:
+	btConvexPolyhedron();
+	virtual	~btConvexPolyhedron();
+
+	btAlignedObjectArray<btVector3>	m_vertices;
+	btAlignedObjectArray<btFace>	m_faces;
+	btAlignedObjectArray<btVector3> m_uniqueEdges;
+
+	btVector3		m_localCenter;
+	btVector3		m_extents;
+	btScalar		m_radius;
+	btVector3		mC;
+	btVector3		mE;
+
+	void	initialize();
+	bool testContainment() const;
+
+	void project(const btTransform& trans, const btVector3& dir, btScalar& min, btScalar& max) const;
+};
+
+	
+#endif //_BT_POLYHEDRAL_FEATURES_H
+
+
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
index f5f3aa58aa4..8c67d8ebef1 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
@@ -43,6 +43,23 @@ btConvexShape::~btConvexShape()
 }
 
 
+void btConvexShape::project(const btTransform& trans, const btVector3& dir, btScalar& min, btScalar& max) const
+{
+	btVector3 localAxis = dir*trans.getBasis();
+	btVector3 vtx1 = trans(localGetSupportingVertex(localAxis));
+	btVector3 vtx2 = trans(localGetSupportingVertex(-localAxis));
+
+	min = vtx1.dot(dir);
+	max = vtx2.dot(dir);
+
+	if(min>max)
+	{
+		btScalar tmp = min;
+		min = max;
+		max = tmp;
+	}
+}
+
 
 static btVector3 convexHullSupport (const btVector3& localDirOrg, const btVector3* points, int numPoints, const btVector3& localScaling)
 {	
@@ -227,7 +244,7 @@ btVector3 btConvexShape::localGetSupportVertexWithoutMarginNonVirtual (const btV
 			pos[capsuleUpAxis] = halfHeight;
 
 			//vtx = pos +vec*(radius);
-			vtx = pos +vec*capsuleShape->getLocalScalingNV()*(radius) - vec * capsuleShape->getMarginNV();
+			vtx = pos +vec*(radius) - vec * capsuleShape->getMarginNV();
 			newDot = vec.dot(vtx);
 			
 
@@ -242,7 +259,7 @@ btVector3 btConvexShape::localGetSupportVertexWithoutMarginNonVirtual (const btV
 			pos[capsuleUpAxis] = -halfHeight;
 
 			//vtx = pos +vec*(radius);
-			vtx = pos +vec*capsuleShape->getLocalScalingNV()*(radius) - vec * capsuleShape->getMarginNV();
+			vtx = pos +vec*(radius) - vec * capsuleShape->getMarginNV();
 			newDot = vec.dot(vtx);
 			if (newDot > maxDot)
 			{
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h
index 9c158259c1c..290cd9fd13c 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef CONVEX_SHAPE_INTERFACE1
-#define CONVEX_SHAPE_INTERFACE1
+#ifndef BT_CONVEX_SHAPE_INTERFACE1
+#define BT_CONVEX_SHAPE_INTERFACE1
 
 #include "btCollisionShape.h"
 
@@ -52,6 +52,8 @@ public:
 	btScalar getMarginNonVirtual () const;
 	void getAabbNonVirtual (const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const;
 
+	virtual void project(const btTransform& trans, const btVector3& dir, btScalar& min, btScalar& max) const;
+
 	
 	//notice that the vectors should be unit length
 	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const= 0;
@@ -79,4 +81,4 @@ public:
 
 
 
-#endif //CONVEX_SHAPE_INTERFACE1
+#endif //BT_CONVEX_SHAPE_INTERFACE1
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
index f5167e74b80..af5d00388e8 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
@@ -12,8 +12,8 @@ subject to the following restrictions:
 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.
 */
-#ifndef CONVEX_TRIANGLEMESH_SHAPE_H
-#define CONVEX_TRIANGLEMESH_SHAPE_H
+#ifndef BT_CONVEX_TRIANGLEMESH_SHAPE_H
+#define BT_CONVEX_TRIANGLEMESH_SHAPE_H
 
 
 #include "btPolyhedralConvexShape.h"
@@ -69,7 +69,7 @@ public:
 
 
 
-#endif //CONVEX_TRIANGLEMESH_SHAPE_H
+#endif //BT_CONVEX_TRIANGLEMESH_SHAPE_H
 
 
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
index c2e534b0b46..6cfe43be4da 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
@@ -19,6 +19,8 @@ btCylinderShape::btCylinderShape (const btVector3& halfExtents)
 :btConvexInternalShape(),
 m_upAxis(1)
 {
+	setSafeMargin(halfExtents);
+
 	btVector3 margin(getMargin(),getMargin(),getMargin());
 	m_implicitShapeDimensions = (halfExtents * m_localScaling) - margin;
 	m_shapeType = CYLINDER_SHAPE_PROXYTYPE;
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
index f7899265d31..125bfc78a77 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef CYLINDER_MINKOWSKI_H
-#define CYLINDER_MINKOWSKI_H
+#ifndef BT_CYLINDER_MINKOWSKI_H
+#define BT_CYLINDER_MINKOWSKI_H
 
 #include "btBoxShape.h"
 #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
@@ -196,5 +196,5 @@ SIMD_FORCE_INLINE	const char*	btCylinderShape::serialize(void* dataBuffer, btSer
 
 
 
-#endif //CYLINDER_MINKOWSKI_H
+#endif //BT_CYLINDER_MINKOWSKI_H
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
index 9f6b4435c29..87b7b66d1e1 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef EMPTY_SHAPE_H
-#define EMPTY_SHAPE_H
+#ifndef BT_EMPTY_SHAPE_H
+#define BT_EMPTY_SHAPE_H
 
 #include "btConcaveShape.h"
 
@@ -67,4 +67,4 @@ protected:
 
 
 
-#endif //EMPTY_SHAPE_H
+#endif //BT_EMPTY_SHAPE_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
index 3a1e6f4a2b9..95631c30190 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
@@ -21,7 +21,7 @@ subject to the following restrictions:
 
 btHeightfieldTerrainShape::btHeightfieldTerrainShape
 (
-int heightStickWidth, int heightStickLength, void* heightfieldData,
+int heightStickWidth, int heightStickLength, const void* heightfieldData,
 btScalar heightScale, btScalar minHeight, btScalar maxHeight,int upAxis,
 PHY_ScalarType hdt, bool flipQuadEdges
 )
@@ -33,7 +33,7 @@ PHY_ScalarType hdt, bool flipQuadEdges
 
 
 
-btHeightfieldTerrainShape::btHeightfieldTerrainShape(int heightStickWidth, int heightStickLength,void* heightfieldData,btScalar maxHeight,int upAxis,bool useFloatData,bool flipQuadEdges)
+btHeightfieldTerrainShape::btHeightfieldTerrainShape(int heightStickWidth, int heightStickLength,const void* heightfieldData,btScalar maxHeight,int upAxis,bool useFloatData,bool flipQuadEdges)
 {
 	// legacy constructor: support only float or unsigned char,
 	// 	and min height is zero
@@ -53,7 +53,7 @@ btHeightfieldTerrainShape::btHeightfieldTerrainShape(int heightStickWidth, int h
 
 void btHeightfieldTerrainShape::initialize
 (
-int heightStickWidth, int heightStickLength, void* heightfieldData,
+int heightStickWidth, int heightStickLength, const void* heightfieldData,
 btScalar heightScale, btScalar minHeight, btScalar maxHeight, int upAxis,
 PHY_ScalarType hdt, bool flipQuadEdges
 )
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
index 4f5d1e35bf3..78e231e08e6 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef HEIGHTFIELD_TERRAIN_SHAPE_H
-#define HEIGHTFIELD_TERRAIN_SHAPE_H
+#ifndef BT_HEIGHTFIELD_TERRAIN_SHAPE_H
+#define BT_HEIGHTFIELD_TERRAIN_SHAPE_H
 
 #include "btConcaveShape.h"
 
@@ -85,10 +85,10 @@ protected:
 	btScalar m_heightScale;
 	union
 	{
-		unsigned char*	m_heightfieldDataUnsignedChar;
-		short*		m_heightfieldDataShort;
-		btScalar*			m_heightfieldDataFloat;
-		void*			m_heightfieldDataUnknown;
+		const unsigned char*	m_heightfieldDataUnsignedChar;
+		const short*		m_heightfieldDataShort;
+		const btScalar*			m_heightfieldDataFloat;
+		const void*	m_heightfieldDataUnknown;
 	};
 
 	PHY_ScalarType	m_heightDataType;	
@@ -111,7 +111,7 @@ protected:
 	  backwards-compatible without a lot of copy/paste.
 	 */
 	void initialize(int heightStickWidth, int heightStickLength,
-	                void* heightfieldData, btScalar heightScale,
+	                const void* heightfieldData, btScalar heightScale,
 	                btScalar minHeight, btScalar maxHeight, int upAxis,
 	                PHY_ScalarType heightDataType, bool flipQuadEdges);
 
@@ -123,7 +123,7 @@ public:
 	  heightScale is needed for any integer-based heightfield data types.
 	 */
 	btHeightfieldTerrainShape(int heightStickWidth,int heightStickLength,
-	                          void* heightfieldData, btScalar heightScale,
+	                          const void* heightfieldData, btScalar heightScale,
 	                          btScalar minHeight, btScalar maxHeight,
 	                          int upAxis, PHY_ScalarType heightDataType,
 	                          bool flipQuadEdges);
@@ -135,7 +135,7 @@ public:
 	  compatibility reasons, heightScale is calculated as maxHeight / 65535 
 	  (and is only used when useFloatData = false).
  	 */
-	btHeightfieldTerrainShape(int heightStickWidth,int heightStickLength,void* heightfieldData, btScalar maxHeight,int upAxis,bool useFloatData,bool flipQuadEdges);
+	btHeightfieldTerrainShape(int heightStickWidth,int heightStickLength,const void* heightfieldData, btScalar maxHeight,int upAxis,bool useFloatData,bool flipQuadEdges);
 
 	virtual ~btHeightfieldTerrainShape();
 
@@ -158,4 +158,4 @@ public:
 
 };
 
-#endif //HEIGHTFIELD_TERRAIN_SHAPE_H
+#endif //BT_HEIGHTFIELD_TERRAIN_SHAPE_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
index 030e167da50..866f9b4da4d 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
@@ -15,8 +15,8 @@ subject to the following restrictions:
 
 /// This file was created by Alex Silverman
 
-#ifndef MATERIAL_H
-#define MATERIAL_H
+#ifndef BT_MATERIAL_H
+#define BT_MATERIAL_H
 
 // Material class to be used by btMultimaterialTriangleMeshShape to store triangle properties
 class btMaterial
@@ -31,5 +31,5 @@ public:
     btMaterial(btScalar fric, btScalar rest) { m_friction = fric; m_restitution = rest; }
 };
 
-#endif // MATERIAL_H
+#endif // BT_MATERIAL_H
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
index d6fd040213b..6c844e8c0af 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef MINKOWSKI_SUM_SHAPE_H
-#define MINKOWSKI_SUM_SHAPE_H
+#ifndef BT_MINKOWSKI_SUM_SHAPE_H
+#define BT_MINKOWSKI_SUM_SHAPE_H
 
 #include "btConvexInternalShape.h"
 #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
@@ -57,4 +57,4 @@ public:
 	}
 };
 
-#endif //MINKOWSKI_SUM_SHAPE_H
+#endif //BT_MINKOWSKI_SUM_SHAPE_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
index 3db7e320889..06c5d16d941 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef MULTI_SPHERE_MINKOWSKI_H
-#define MULTI_SPHERE_MINKOWSKI_H
+#ifndef BT_MULTI_SPHERE_MINKOWSKI_H
+#define BT_MULTI_SPHERE_MINKOWSKI_H
 
 #include "btConvexInternalShape.h"
 #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
@@ -96,4 +96,4 @@ SIMD_FORCE_INLINE	int	btMultiSphereShape::calculateSerializeBufferSize() const
 
 
 
-#endif //MULTI_SPHERE_MINKOWSKI_H
+#endif //BT_MULTI_SPHERE_MINKOWSKI_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
index 96b2ad95b6d..2b92ab7d1b7 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
@@ -15,8 +15,8 @@ subject to the following restrictions:
 
 /// This file was created by Alex Silverman
 
-#ifndef BVH_TRIANGLE_MATERIAL_MESH_SHAPE_H
-#define BVH_TRIANGLE_MATERIAL_MESH_SHAPE_H
+#ifndef BT_BVH_TRIANGLE_MATERIAL_MESH_SHAPE_H
+#define BT_BVH_TRIANGLE_MATERIAL_MESH_SHAPE_H
 
 #include "btBvhTriangleMeshShape.h"
 #include "btMaterial.h"
@@ -117,4 +117,4 @@ public:
 }
 ;
 
-#endif //BVH_TRIANGLE_MATERIAL_MESH_SHAPE_H
+#endif //BT_BVH_TRIANGLE_MATERIAL_MESH_SHAPE_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
index 981b8a2652c..6f36775f7c9 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
@@ -43,7 +43,7 @@ void btOptimizedBvh::build(btStridingMeshInterface* triangles, bool useQuantized
 
 		NodeTriangleCallback& operator=(NodeTriangleCallback& other)
 		{
-			m_triangleNodes = other.m_triangleNodes;
+			m_triangleNodes.copyFromArray(other.m_triangleNodes);
 			return *this;
 		}
 		
@@ -84,7 +84,7 @@ void btOptimizedBvh::build(btStridingMeshInterface* triangles, bool useQuantized
 
 		QuantizedNodeTriangleCallback& operator=(QuantizedNodeTriangleCallback& other)
 		{
-			m_triangleNodes = other.m_triangleNodes;
+			m_triangleNodes.copyFromArray(other.m_triangleNodes);
 			m_optimizedTree = other.m_optimizedTree;
 			return *this;
 		}
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
index 749fe6005dd..715961f5528 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
@@ -15,8 +15,8 @@ subject to the following restrictions:
 
 ///Contains contributions from Disney Studio's
 
-#ifndef OPTIMIZED_BVH_H
-#define OPTIMIZED_BVH_H
+#ifndef BT_OPTIMIZED_BVH_H
+#define BT_OPTIMIZED_BVH_H
 
 #include "BulletCollision/BroadphaseCollision/btQuantizedBvh.h"
 
@@ -60,6 +60,6 @@ public:
 };
 
 
-#endif //OPTIMIZED_BVH_H
+#endif //BT_OPTIMIZED_BVH_H
 
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
index b1ecb3e432c..82def79cf55 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
@@ -14,10 +14,289 @@ subject to the following restrictions:
 */
 
 #include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h"
+#include "btConvexPolyhedron.h"
+#include "LinearMath/btConvexHullComputer.h"
+#include <new>
+#include "LinearMath/btGeometryUtil.h"
+#include "LinearMath/btGrahamScan2dConvexHull.h"
 
-btPolyhedralConvexShape::btPolyhedralConvexShape() :btConvexInternalShape()
+
+btPolyhedralConvexShape::btPolyhedralConvexShape() :btConvexInternalShape(),
+m_polyhedron(0)
+{
+
+}
+
+btPolyhedralConvexShape::~btPolyhedralConvexShape()
+{
+	if (m_polyhedron)
+	{
+		btAlignedFree(m_polyhedron);
+	}
+}
+
+
+bool	btPolyhedralConvexShape::initializePolyhedralFeatures()
 {
 
+	if (m_polyhedron)
+		btAlignedFree(m_polyhedron);
+	
+	void* mem = btAlignedAlloc(sizeof(btConvexPolyhedron),16);
+	m_polyhedron = new (mem) btConvexPolyhedron;
+
+		btAlignedObjectArray<btVector3> orgVertices;
+
+	for (int i=0;i<getNumVertices();i++)
+	{
+		btVector3& newVertex = orgVertices.expand();
+		getVertex(i,newVertex);
+	}
+
+#if 0
+	btAlignedObjectArray<btVector3> planeEquations;
+	btGeometryUtil::getPlaneEquationsFromVertices(orgVertices,planeEquations);
+
+	btAlignedObjectArray<btVector3> shiftedPlaneEquations;
+	for (int p=0;p<planeEquations.size();p++)
+	{
+		   btVector3 plane = planeEquations[p];
+		   plane[3] -= getMargin();
+		   shiftedPlaneEquations.push_back(plane);
+	}
+
+	btAlignedObjectArray<btVector3> tmpVertices;
+
+	btGeometryUtil::getVerticesFromPlaneEquations(shiftedPlaneEquations,tmpVertices);
+	btConvexHullComputer conv;
+	conv.compute(&tmpVertices[0].getX(), sizeof(btVector3),tmpVertices.size(),0.f,0.f);
+
+#else
+	btConvexHullComputer conv;
+	conv.compute(&orgVertices[0].getX(), sizeof(btVector3),orgVertices.size(),0.f,0.f);
+
+#endif
+
+
+
+	btAlignedObjectArray<btVector3> faceNormals;
+	int numFaces = conv.faces.size();
+	faceNormals.resize(numFaces);
+	btConvexHullComputer* convexUtil = &conv;
+
+	
+	btAlignedObjectArray<btFace>	tmpFaces;
+	tmpFaces.resize(numFaces);
+
+	int numVertices = convexUtil->vertices.size();
+	m_polyhedron->m_vertices.resize(numVertices);
+	for (int p=0;p<numVertices;p++)
+	{
+		m_polyhedron->m_vertices[p] = convexUtil->vertices[p];
+	}
+
+
+	for (int i=0;i<numFaces;i++)
+	{
+		int face = convexUtil->faces[i];
+		//printf("face=%d\n",face);
+		const btConvexHullComputer::Edge*  firstEdge = &convexUtil->edges[face];
+		const btConvexHullComputer::Edge*  edge = firstEdge;
+
+		btVector3 edges[3];
+		int numEdges = 0;
+		//compute face normals
+
+		btScalar maxCross2 = 0.f;
+		int chosenEdge = -1;
+
+		do
+		{
+			
+			int src = edge->getSourceVertex();
+			tmpFaces[i].m_indices.push_back(src);
+			int targ = edge->getTargetVertex();
+			btVector3 wa = convexUtil->vertices[src];
+
+			btVector3 wb = convexUtil->vertices[targ];
+			btVector3 newEdge = wb-wa;
+			newEdge.normalize();
+			if (numEdges<2)
+				edges[numEdges++] = newEdge;
+
+			edge = edge->getNextEdgeOfFace();
+		} while (edge!=firstEdge);
+
+		btScalar planeEq = 1e30f;
+
+		
+		if (numEdges==2)
+		{
+			faceNormals[i] = edges[0].cross(edges[1]);
+			faceNormals[i].normalize();
+			tmpFaces[i].m_plane[0] = faceNormals[i].getX();
+			tmpFaces[i].m_plane[1] = faceNormals[i].getY();
+			tmpFaces[i].m_plane[2] = faceNormals[i].getZ();
+			tmpFaces[i].m_plane[3] = planeEq;
+
+		}
+		else
+		{
+			btAssert(0);//degenerate?
+			faceNormals[i].setZero();
+		}
+
+		for (int v=0;v<tmpFaces[i].m_indices.size();v++)
+		{
+			btScalar eq = m_polyhedron->m_vertices[tmpFaces[i].m_indices[v]].dot(faceNormals[i]);
+			if (planeEq>eq)
+			{
+				planeEq=eq;
+			}
+		}
+		tmpFaces[i].m_plane[3] = -planeEq;
+	}
+
+	//merge coplanar faces and copy them to m_polyhedron
+
+	btScalar faceWeldThreshold= 0.999f;
+	btAlignedObjectArray<int> todoFaces;
+	for (int i=0;i<tmpFaces.size();i++)
+		todoFaces.push_back(i);
+
+	while (todoFaces.size())
+	{
+		btAlignedObjectArray<int> coplanarFaceGroup;
+		int refFace = todoFaces[todoFaces.size()-1];
+
+		coplanarFaceGroup.push_back(refFace);
+		btFace& faceA = tmpFaces[refFace];
+		todoFaces.pop_back();
+
+		btVector3 faceNormalA(faceA.m_plane[0],faceA.m_plane[1],faceA.m_plane[2]);
+		for (int j=todoFaces.size()-1;j>=0;j--)
+		{
+			int i = todoFaces[j];
+			btFace& faceB = tmpFaces[i];
+			btVector3 faceNormalB(faceB.m_plane[0],faceB.m_plane[1],faceB.m_plane[2]);
+			if (faceNormalA.dot(faceNormalB)>faceWeldThreshold)
+			{
+				coplanarFaceGroup.push_back(i);
+				todoFaces.remove(i);
+			}
+		}
+
+
+		bool did_merge = false;
+		if (coplanarFaceGroup.size()>1)
+		{
+			//do the merge: use Graham Scan 2d convex hull
+
+			btAlignedObjectArray<GrahamVector2> orgpoints;
+
+			for (int i=0;i<coplanarFaceGroup.size();i++)
+			{
+//				m_polyhedron->m_faces.push_back(tmpFaces[coplanarFaceGroup[i]]);
+
+				btFace& face = tmpFaces[coplanarFaceGroup[i]];
+				btVector3 faceNormal(face.m_plane[0],face.m_plane[1],face.m_plane[2]);
+				btVector3 xyPlaneNormal(0,0,1);
+
+				btQuaternion rotationArc = shortestArcQuat(faceNormal,xyPlaneNormal);
+				
+				for (int f=0;f<face.m_indices.size();f++)
+				{
+					int orgIndex = face.m_indices[f];
+					btVector3 pt = m_polyhedron->m_vertices[orgIndex];
+					btVector3 rotatedPt =  quatRotate(rotationArc,pt);
+					rotatedPt.setZ(0);
+					bool found = false;
+
+					for (int i=0;i<orgpoints.size();i++)
+					{
+						//if ((orgpoints[i].m_orgIndex == orgIndex) || ((rotatedPt-orgpoints[i]).length2()<0.0001))
+						if (orgpoints[i].m_orgIndex == orgIndex)
+						{
+							found=true;
+							break;
+						}
+					}
+					if (!found)
+						orgpoints.push_back(GrahamVector2(rotatedPt,orgIndex));
+				}
+			}
+
+			btFace combinedFace;
+			for (int i=0;i<4;i++)
+				combinedFace.m_plane[i] = tmpFaces[coplanarFaceGroup[0]].m_plane[i];
+
+			btAlignedObjectArray<GrahamVector2> hull;
+			GrahamScanConvexHull2D(orgpoints,hull);
+
+			for (int i=0;i<hull.size();i++)
+			{
+				combinedFace.m_indices.push_back(hull[i].m_orgIndex);
+				for(int k = 0; k < orgpoints.size(); k++) {
+					if(orgpoints[k].m_orgIndex == hull[i].m_orgIndex) {
+						orgpoints[k].m_orgIndex = -1; // invalidate...
+						break;
+			}
+				}
+			}
+			// are there rejected vertices?
+			bool reject_merge = false;
+			for(int i = 0; i < orgpoints.size(); i++) {
+				if(orgpoints[i].m_orgIndex == -1)
+					continue; // this is in the hull...
+				// this vertex is rejected -- is anybody else using this vertex?
+				for(int j = 0; j < tmpFaces.size(); j++) {
+					btFace& face = tmpFaces[j];
+					// is this a face of the current coplanar group?
+					bool is_in_current_group = false;
+					for(int k = 0; k < coplanarFaceGroup.size(); k++) {
+						if(coplanarFaceGroup[k] == j) {
+							is_in_current_group = true;
+							break;
+						}
+					}
+					if(is_in_current_group) // ignore this face...
+						continue;
+					// does this face use this rejected vertex?
+					for(int v = 0; v < face.m_indices.size(); v++) {
+						if(face.m_indices[v] == orgpoints[i].m_orgIndex) {
+							// this rejected vertex is used in another face -- reject merge
+							reject_merge = true;
+							break;
+						}
+					}
+					if(reject_merge)
+						break;
+				}
+				if(reject_merge)
+					break;
+			}
+			if(!reject_merge) {
+				// do this merge!
+				did_merge = true;
+			m_polyhedron->m_faces.push_back(combinedFace);
+			}
+		}
+		if(!did_merge)
+		{
+			for (int i=0;i<coplanarFaceGroup.size();i++)
+			{
+				m_polyhedron->m_faces.push_back(tmpFaces[coplanarFaceGroup[i]]);
+			}
+
+		}
+
+
+
+	}
+	
+	m_polyhedron->initialize();
+
+	return true;
 }
 
 
@@ -183,11 +462,14 @@ void	btPolyhedralConvexAabbCachingShape::recalcLocalAabb()
 		btVector3 vec(btScalar(0.),btScalar(0.),btScalar(0.));
 		vec[i] = btScalar(1.);
 		btVector3 tmp = localGetSupportingVertex(vec);
-		m_localAabbMax[i] = tmp[i]+m_collisionMargin;
+		m_localAabbMax[i] = tmp[i];
 		vec[i] = btScalar(-1.);
 		tmp = localGetSupportingVertex(vec);
-		m_localAabbMin[i] = tmp[i]-m_collisionMargin;
+		m_localAabbMin[i] = tmp[i];
 	}
 	#endif
 }
 
+
+
+
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
index 2c691b95652..ee2e1e28277 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
@@ -13,23 +13,37 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef BU_SHAPE
-#define BU_SHAPE
+#ifndef BT_POLYHEDRAL_CONVEX_SHAPE_H
+#define BT_POLYHEDRAL_CONVEX_SHAPE_H
 
 #include "LinearMath/btMatrix3x3.h"
 #include "btConvexInternalShape.h"
+class btConvexPolyhedron;
 
 
 ///The btPolyhedralConvexShape is an internal interface class for polyhedral convex shapes.
 class btPolyhedralConvexShape : public btConvexInternalShape
 {
+	
 
 protected:
 	
+	btConvexPolyhedron* m_polyhedron;
+
 public:
 
 	btPolyhedralConvexShape();
 
+	virtual ~btPolyhedralConvexShape();
+
+	///optional method mainly used to generate multiple contact points by clipping polyhedral features (faces/edges)
+	virtual bool	initializePolyhedralFeatures();
+
+	const btConvexPolyhedron*	getConvexPolyhedron() const
+	{
+		return m_polyhedron;
+	}
+
 	//brute force implementations
 
 	virtual btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec)const;
@@ -95,4 +109,4 @@ public:
 
 };
 
-#endif //BU_SHAPE
+#endif //BT_POLYHEDRAL_CONVEX_SHAPE_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
index 4ab28555ba8..ff86ef319e9 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef SCALED_BVH_TRIANGLE_MESH_SHAPE_H
-#define SCALED_BVH_TRIANGLE_MESH_SHAPE_H
+#ifndef BT_SCALED_BVH_TRIANGLE_MESH_SHAPE_H
+#define BT_SCALED_BVH_TRIANGLE_MESH_SHAPE_H
 
 #include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h"
 
@@ -90,4 +90,4 @@ SIMD_FORCE_INLINE	const char*	btScaledBvhTriangleMeshShape::serialize(void* data
 }
 
 
-#endif //BVH_TRIANGLE_MESH_SHAPE_H
+#endif //BT_SCALED_BVH_TRIANGLE_MESH_SHAPE_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
index 07b3500f994..642a2887435 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
@@ -15,8 +15,8 @@ subject to the following restrictions:
 
 ///btShapeHull implemented by John McCutchan.
 
-#ifndef _SHAPE_HULL_H
-#define _SHAPE_HULL_H
+#ifndef BT_SHAPE_HULL_H
+#define BT_SHAPE_HULL_H
 
 #include "LinearMath/btAlignedObjectArray.h"
 #include "BulletCollision/CollisionShapes/btConvexShape.h"
@@ -56,4 +56,4 @@ public:
 	}
 };
 
-#endif //_SHAPE_HULL_H
+#endif //BT_SHAPE_HULL_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
index f98372442ba..b192efeeb8d 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
@@ -12,8 +12,8 @@ subject to the following restrictions:
 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.
 */
-#ifndef SPHERE_MINKOWSKI_H
-#define SPHERE_MINKOWSKI_H
+#ifndef BT_SPHERE_MINKOWSKI_H
+#define BT_SPHERE_MINKOWSKI_H
 
 #include "btConvexInternalShape.h"
 #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
@@ -70,4 +70,4 @@ public:
 };
 
 
-#endif //SPHERE_MINKOWSKI_H
+#endif //BT_SPHERE_MINKOWSKI_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
index beb53ef33a1..b13825e610d 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef STATIC_PLANE_SHAPE_H
-#define STATIC_PLANE_SHAPE_H
+#ifndef BT_STATIC_PLANE_SHAPE_H
+#define BT_STATIC_PLANE_SHAPE_H
 
 #include "btConcaveShape.h"
 
@@ -97,7 +97,7 @@ SIMD_FORCE_INLINE	const char*	btStaticPlaneShape::serialize(void* dataBuffer, bt
 }
 
 
-#endif //STATIC_PLANE_SHAPE_H
+#endif //BT_STATIC_PLANE_SHAPE_H
 
 
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
index bc2f9f21448..dd22fc5635a 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
@@ -253,9 +253,11 @@ const char*	btStridingMeshInterface::serialize(void* dataBuffer, btSerializer* s
 			memPtr->m_indices16 = 0;
 			memPtr->m_indices32 = 0;
 			memPtr->m_3indices16 = 0;
+			memPtr->m_3indices8 = 0;
 			memPtr->m_vertices3f = 0;
 			memPtr->m_vertices3d = 0;
 
+
 			switch (gfxindextype)
 			{
 			case PHY_INTEGER:
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
index 9e3e2ab0f59..f2b27ade8e8 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef STRIDING_MESHINTERFACE_H
-#define STRIDING_MESHINTERFACE_H
+#ifndef BT_STRIDING_MESHINTERFACE_H
+#define BT_STRIDING_MESHINTERFACE_H
 
 #include "LinearMath/btVector3.h"
 #include "btTriangleCallback.h"
@@ -159,4 +159,4 @@ SIMD_FORCE_INLINE	int	btStridingMeshInterface::calculateSerializeBufferSize() co
 
 
 
-#endif //STRIDING_MESHINTERFACE_H
+#endif //BT_STRIDING_MESHINTERFACE_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
index 72e9f232876..6b7128efc8e 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef BU_SIMPLEX_1TO4_SHAPE
-#define BU_SIMPLEX_1TO4_SHAPE
+#ifndef BT_SIMPLEX_1TO4_SHAPE
+#define BT_SIMPLEX_1TO4_SHAPE
 
 
 #include "btPolyhedralConvexShape.h"
@@ -71,4 +71,4 @@ public:
 
 };
 
-#endif //BU_SIMPLEX_1TO4_SHAPE
+#endif //BT_SIMPLEX_1TO4_SHAPE
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h
index 0499702b05b..461c57f8773 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef TRIANGLE_CALLBACK_H
-#define TRIANGLE_CALLBACK_H
+#ifndef BT_TRIANGLE_CALLBACK_H
+#define BT_TRIANGLE_CALLBACK_H
 
 #include "LinearMath/btVector3.h"
 
@@ -39,4 +39,4 @@ public:
 
 
 
-#endif //TRIANGLE_CALLBACK_H
+#endif //BT_TRIANGLE_CALLBACK_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
index c64ea6e7043..9e1544e87a4 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
@@ -29,9 +29,11 @@ ATTRIBUTE_ALIGNED16( struct)	btIndexedMesh
 
    int                     m_numTriangles;
    const unsigned char *   m_triangleIndexBase;
+   // Size in byte of the indices for one triangle (3*sizeof(index_type) if the indices are tightly packed)
    int                     m_triangleIndexStride;
    int                     m_numVertices;
    const unsigned char *   m_vertexBase;
+   // Size of a vertex, in bytes
    int                     m_vertexStride;
 
    // The index type is set when adding an indexed mesh to the
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleInfoMap.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleInfoMap.h
index 282a7702e80..1cea7045f20 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleInfoMap.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleInfoMap.h
@@ -61,6 +61,7 @@ struct	btTriangleInfoMap : public btInternalTriangleInfoMap
 	btScalar	m_planarEpsilon; ///used to determine if a triangle edge is planar with zero angle
 	btScalar	m_equalVertexThreshold; ///used to compute connectivity: if the distance between two vertices is smaller than m_equalVertexThreshold, they are considered to be 'shared'
 	btScalar	m_edgeDistanceThreshold; ///used to determine edge contacts: if the closest distance between a contact point and an edge is smaller than this distance threshold it is considered to "hit the edge"
+	btScalar	m_maxEdgeAngleThreshold; //ignore edges that connect triangles at an angle larger than this m_maxEdgeAngleThreshold
 	btScalar	m_zeroAreaThreshold; ///used to determine if a triangle is degenerate (length squared of cross product of 2 triangle edges < threshold)
 	
 	
@@ -71,6 +72,7 @@ struct	btTriangleInfoMap : public btInternalTriangleInfoMap
 		m_equalVertexThreshold = btScalar(0.0001)*btScalar(0.0001);
 		m_edgeDistanceThreshold = btScalar(0.1);
 		m_zeroAreaThreshold = btScalar(0.0001)*btScalar(0.0001);
+		m_maxEdgeAngleThreshold = SIMD_2_PI;
 	}
 	virtual ~btTriangleInfoMap() {}
 
@@ -83,6 +85,7 @@ struct	btTriangleInfoMap : public btInternalTriangleInfoMap
 
 };
 
+///those fields have to be float and not btScalar for the serialization to work properly
 struct	btTriangleInfoData
 {
 	int			m_flags;
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
index d2624fe18e1..f623157fac1 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef TRIANGLE_MESH_H
-#define TRIANGLE_MESH_H
+#ifndef BT_TRIANGLE_MESH_H
+#define BT_TRIANGLE_MESH_H
 
 #include "btTriangleIndexVertexArray.h"
 #include "LinearMath/btVector3.h"
@@ -65,5 +65,5 @@ class btTriangleMesh : public btTriangleIndexVertexArray
 		
 };
 
-#endif //TRIANGLE_MESH_H
+#endif //BT_TRIANGLE_MESH_H
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
index 2216698d275..c8caf8fe696 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef TRIANGLE_MESH_SHAPE_H
-#define TRIANGLE_MESH_SHAPE_H
+#ifndef BT_TRIANGLE_MESH_SHAPE_H
+#define BT_TRIANGLE_MESH_SHAPE_H
 
 #include "btConcaveShape.h"
 #include "btStridingMeshInterface.h"
@@ -86,4 +86,4 @@ public:
 
 
 
-#endif //TRIANGLE_MESH_SHAPE_H
+#endif //BT_TRIANGLE_MESH_SHAPE_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
index 847147cf6b4..71b0557384e 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef OBB_TRIANGLE_MINKOWSKI_H
-#define OBB_TRIANGLE_MINKOWSKI_H
+#ifndef BT_OBB_TRIANGLE_MINKOWSKI_H
+#define BT_OBB_TRIANGLE_MINKOWSKI_H
 
 #include "btConvexShape.h"
 #include "btBoxShape.h"
@@ -178,5 +178,5 @@ public:
 
 };
 
-#endif //OBB_TRIANGLE_MINKOWSKI_H
+#endif //BT_OBB_TRIANGLE_MINKOWSKI_H
 
diff --git a/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp b/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp
index c3b697bdd1e..eed31d839f8 100644
--- a/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp
+++ b/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp
@@ -58,7 +58,7 @@ class CONTACT_KEY_TOKEN_COMP
 {
 	public:
 
-		bool operator() ( const CONTACT_KEY_TOKEN& a, const CONTACT_KEY_TOKEN& b )
+		bool operator() ( const CONTACT_KEY_TOKEN& a, const CONTACT_KEY_TOKEN& b ) const
 		{
 			return ( a < b );
 		}
diff --git a/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
index ae5d55ab7d9..6b6e07c983d 100644
--- a/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
@@ -21,8 +21,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef BVH_CONCAVE_COLLISION_ALGORITHM_H
-#define BVH_CONCAVE_COLLISION_ALGORITHM_H
+#ifndef BT_GIMPACT_BVH_CONCAVE_COLLISION_ALGORITHM_H
+#define BT_GIMPACT_BVH_CONCAVE_COLLISION_ALGORITHM_H
 
 #include "BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h"
 #include "BulletCollision/BroadphaseCollision/btDispatcher.h"
@@ -303,4 +303,4 @@ public:
 
 
 
-#endif //BVH_CONCAVE_COLLISION_ALGORITHM_H
+#endif //BT_GIMPACT_BVH_CONCAVE_COLLISION_ALGORITHM_H
diff --git a/extern/bullet2/src/BulletCollision/Gimpact/btQuantization.h b/extern/bullet2/src/BulletCollision/Gimpact/btQuantization.h
index e0487c22766..bd2633cfc59 100644
--- a/extern/bullet2/src/BulletCollision/Gimpact/btQuantization.h
+++ b/extern/bullet2/src/BulletCollision/Gimpact/btQuantization.h
@@ -1,5 +1,5 @@
-#ifndef BT_QUANTIZATION_H_INCLUDED
-#define BT_QUANTIZATION_H_INCLUDED
+#ifndef BT_GIMPACT_QUANTIZATION_H_INCLUDED
+#define BT_GIMPACT_QUANTIZATION_H_INCLUDED
 
 /*! \file btQuantization.h
 *\author Francisco Leon Najera
@@ -85,4 +85,4 @@ SIMD_FORCE_INLINE btVector3 bt_unquantize(
 
 
 
-#endif // GIM_VECTOR_H_INCLUDED
+#endif // BT_GIMPACT_QUANTIZATION_H_INCLUDED
diff --git a/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.h b/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.h
index fcc981dfb69..973c2ed1277 100644
--- a/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.h
+++ b/extern/bullet2/src/BulletCollision/Gimpact/btTriangleShapeEx.h
@@ -22,8 +22,8 @@ subject to the following restrictions:
 */
 
 
-#ifndef TRIANGLE_SHAPE_EX_H
-#define TRIANGLE_SHAPE_EX_H
+#ifndef GIMPACT_TRIANGLE_SHAPE_EX_H
+#define GIMPACT_TRIANGLE_SHAPE_EX_H
 
 #include "BulletCollision/CollisionShapes/btCollisionShape.h"
 #include "BulletCollision/CollisionShapes/btTriangleShape.h"
@@ -177,4 +177,4 @@ public:
 };
 
 
-#endif //TRIANGLE_MESH_SHAPE_H
+#endif //GIMPACT_TRIANGLE_MESH_SHAPE_H
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
index 9ee83e7d561..91fcea57a3c 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
@@ -22,20 +22,72 @@ subject to the following restrictions:
 
 #include "btGjkPairDetector.h"
 #include "btPointCollector.h"
+#include "BulletCollision/CollisionShapes/btStaticPlaneShape.h"
 
 
 
 btContinuousConvexCollision::btContinuousConvexCollision ( const btConvexShape*	convexA,const btConvexShape*	convexB,btSimplexSolverInterface* simplexSolver, btConvexPenetrationDepthSolver* penetrationDepthSolver)
 :m_simplexSolver(simplexSolver),
 m_penetrationDepthSolver(penetrationDepthSolver),
-m_convexA(convexA),m_convexB(convexB)
+m_convexA(convexA),m_convexB1(convexB),m_planeShape(0)
 {
 }
 
+
+btContinuousConvexCollision::btContinuousConvexCollision( const btConvexShape*	convexA,const btStaticPlaneShape*	plane)
+:m_simplexSolver(0),
+m_penetrationDepthSolver(0),
+m_convexA(convexA),m_convexB1(0),m_planeShape(plane)
+{
+}
+
+
 /// This maximum should not be necessary. It allows for untested/degenerate cases in production code.
 /// You don't want your game ever to lock-up.
 #define MAX_ITERATIONS 64
 
+void btContinuousConvexCollision::computeClosestPoints( const btTransform& transA, const btTransform& transB,btPointCollector& pointCollector)
+{
+	if (m_convexB1)
+	{
+		m_simplexSolver->reset();
+		btGjkPairDetector gjk(m_convexA,m_convexB1,m_convexA->getShapeType(),m_convexB1->getShapeType(),m_convexA->getMargin(),m_convexB1->getMargin(),m_simplexSolver,m_penetrationDepthSolver);		
+		btGjkPairDetector::ClosestPointInput input;
+		input.m_transformA = transA;
+		input.m_transformB = transB;
+		gjk.getClosestPoints(input,pointCollector,0);
+	} else
+	{
+		//convex versus plane
+		const btConvexShape* convexShape = m_convexA;
+		const btStaticPlaneShape* planeShape = m_planeShape;
+		
+		bool hasCollision = false;
+		const btVector3& planeNormal = planeShape->getPlaneNormal();
+		const btScalar& planeConstant = planeShape->getPlaneConstant();
+		
+		btTransform convexWorldTransform = transA;
+		btTransform convexInPlaneTrans;
+		convexInPlaneTrans= transB.inverse() * convexWorldTransform;
+		btTransform planeInConvex;
+		planeInConvex= convexWorldTransform.inverse() * transB;
+		
+		btVector3 vtx = convexShape->localGetSupportingVertex(planeInConvex.getBasis()*-planeNormal);
+
+		btVector3 vtxInPlane = convexInPlaneTrans(vtx);
+		btScalar distance = (planeNormal.dot(vtxInPlane) - planeConstant);
+
+		btVector3 vtxInPlaneProjected = vtxInPlane - distance*planeNormal;
+		btVector3 vtxInPlaneWorld = transB * vtxInPlaneProjected;
+		btVector3 normalOnSurfaceB = transB.getBasis() * planeNormal;
+
+		pointCollector.addContactPoint(
+			normalOnSurfaceB,
+			vtxInPlaneWorld,
+			distance);
+	}
+}
+
 bool	btContinuousConvexCollision::calcTimeOfImpact(
 				const btTransform& fromA,
 				const btTransform& toA,
@@ -44,7 +96,6 @@ bool	btContinuousConvexCollision::calcTimeOfImpact(
 				CastResult& result)
 {
 
-	m_simplexSolver->reset();
 
 	/// compute linear and angular velocity for this interval, to interpolate
 	btVector3 linVelA,angVelA,linVelB,angVelB;
@@ -53,7 +104,7 @@ bool	btContinuousConvexCollision::calcTimeOfImpact(
 
 
 	btScalar boundingRadiusA = m_convexA->getAngularMotionDisc();
-	btScalar boundingRadiusB = m_convexB->getAngularMotionDisc();
+	btScalar boundingRadiusB = m_convexB1?m_convexB1->getAngularMotionDisc():0.f;
 
 	btScalar maxAngularProjectedVelocity = angVelA.length() * boundingRadiusA + angVelB.length() * boundingRadiusB;
 	btVector3 relLinVel = (linVelB-linVelA);
@@ -64,7 +115,6 @@ bool	btContinuousConvexCollision::calcTimeOfImpact(
 		return false;
 
 
-	btScalar radius = btScalar(0.001);
 
 	btScalar lambda = btScalar(0.);
 	btVector3 v(1,0,0);
@@ -83,28 +133,14 @@ bool	btContinuousConvexCollision::calcTimeOfImpact(
 	//first solution, using GJK
 
 
-	btTransform identityTrans;
-	identityTrans.setIdentity();
-
-	btSphereShape	raySphere(btScalar(0.0));
-	raySphere.setMargin(btScalar(0.));
-
-
+	btScalar radius = 0.001f;
 //	result.drawCoordSystem(sphereTr);
 
 	btPointCollector	pointCollector1;
 
 	{
-		
-		btGjkPairDetector gjk(m_convexA,m_convexB,m_convexA->getShapeType(),m_convexB->getShapeType(),m_convexA->getMargin(),m_convexB->getMargin(),m_simplexSolver,m_penetrationDepthSolver);		
-		btGjkPairDetector::ClosestPointInput input;
 	
-		//we don't use margins during CCD
-	//	gjk.setIgnoreMargin(true);
-
-		input.m_transformA = fromA;
-		input.m_transformB = fromB;
-		gjk.getClosestPoints(input,pointCollector1,0);
+		computeClosestPoints(fromA,fromB,pointCollector1);
 
 		hasResult = pointCollector1.m_hasResult;
 		c = pointCollector1.m_pointInWorld;
@@ -113,11 +149,12 @@ bool	btContinuousConvexCollision::calcTimeOfImpact(
 	if (hasResult)
 	{
 		btScalar dist;
-		dist = pointCollector1.m_distance;
+		dist = pointCollector1.m_distance + result.m_allowedPenetration;
 		n = pointCollector1.m_normalOnBInWorld;
-
 		btScalar projectedLinearVelocity = relLinVel.dot(n);
-		
+		if ((projectedLinearVelocity+ maxAngularProjectedVelocity)<=SIMD_EPSILON)
+			return false;
+
 		//not close enough
 		while (dist > radius)
 		{
@@ -125,19 +162,10 @@ bool	btContinuousConvexCollision::calcTimeOfImpact(
 			{
 				result.m_debugDrawer->drawSphere(c,0.2f,btVector3(1,1,1));
 			}
-			numIter++;
-			if (numIter > maxIter)
-			{
-				return false; //todo: report a failure
-			}
 			btScalar dLambda = btScalar(0.);
 
 			projectedLinearVelocity = relLinVel.dot(n);
 
-			//calculate safe moving fraction from distance / (linear+rotational velocity)
-			
-			//btScalar clippedDist  = GEN_min(angularConservativeRadius,dist);
-			//btScalar clippedDist  = dist;
 			
 			//don't report time of impact for motion away from the contact normal (or causes minor penetration)
 			if ((projectedLinearVelocity+ maxAngularProjectedVelocity)<=SIMD_EPSILON)
@@ -182,37 +210,27 @@ bool	btContinuousConvexCollision::calcTimeOfImpact(
 			result.DebugDraw( lambda );
 
 			btPointCollector	pointCollector;
-			btGjkPairDetector gjk(m_convexA,m_convexB,m_simplexSolver,m_penetrationDepthSolver);
-			btGjkPairDetector::ClosestPointInput input;
-			input.m_transformA = interpolatedTransA;
-			input.m_transformB = interpolatedTransB;
-			gjk.getClosestPoints(input,pointCollector,0);
+			computeClosestPoints(interpolatedTransA,interpolatedTransB,pointCollector);
+
 			if (pointCollector.m_hasResult)
 			{
-				if (pointCollector.m_distance < btScalar(0.))
-				{
-					//degenerate ?!
-					result.m_fraction = lastLambda;
-					n = pointCollector.m_normalOnBInWorld;
-					result.m_normal=n;//.setValue(1,1,1);// = n;
-					result.m_hitPoint = pointCollector.m_pointInWorld;
-					return true;
-				}
+				dist = pointCollector.m_distance+result.m_allowedPenetration;
 				c = pointCollector.m_pointInWorld;		
 				n = pointCollector.m_normalOnBInWorld;
-				dist = pointCollector.m_distance;
 			} else
 			{
-				//??
+				result.reportFailure(-1, numIter);
 				return false;
 			}
-			
 
+			numIter++;
+			if (numIter > maxIter)
+			{
+				result.reportFailure(-2, numIter);
+				return false;
+			}
 		}
 	
-		if ((projectedLinearVelocity+ maxAngularProjectedVelocity)<=result.m_allowedPenetration)//SIMD_EPSILON)
-			return false;
-			
 		result.m_fraction = lambda;
 		result.m_normal = n;
 		result.m_hitPoint = c;
@@ -221,16 +239,5 @@ bool	btContinuousConvexCollision::calcTimeOfImpact(
 
 	return false;
 
-/*
-//todo:
-	//if movement away from normal, discard result
-	btVector3 move = transBLocalTo.getOrigin() - transBLocalFrom.getOrigin();
-	if (result.m_fraction < btScalar(1.))
-	{
-		if (move.dot(result.m_normal) <= btScalar(0.))
-		{
-		}
-	}
-*/
-
 }
+
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h
index 28c2b4d6156..bdc0572f75a 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h
@@ -14,13 +14,14 @@ subject to the following restrictions:
 */
 
 
-#ifndef CONTINUOUS_COLLISION_CONVEX_CAST_H
-#define CONTINUOUS_COLLISION_CONVEX_CAST_H
+#ifndef BT_CONTINUOUS_COLLISION_CONVEX_CAST_H
+#define BT_CONTINUOUS_COLLISION_CONVEX_CAST_H
 
 #include "btConvexCast.h"
 #include "btSimplexSolverInterface.h"
 class btConvexPenetrationDepthSolver;
 class btConvexShape;
+class btStaticPlaneShape;
 
 /// btContinuousConvexCollision implements angular and linear time of impact for convex objects.
 /// Based on Brian Mirtich's Conservative Advancement idea (PhD thesis).
@@ -31,13 +32,18 @@ class btContinuousConvexCollision : public btConvexCast
 	btSimplexSolverInterface* m_simplexSolver;
 	btConvexPenetrationDepthSolver*	m_penetrationDepthSolver;
 	const btConvexShape*	m_convexA;
-	const btConvexShape*	m_convexB;
+	//second object is either a convex or a plane (code sharing)
+	const btConvexShape*	m_convexB1;
+	const btStaticPlaneShape*	m_planeShape;
 
+	void computeClosestPoints( const btTransform& transA, const btTransform& transB,struct btPointCollector& pointCollector);
 
 public:
 
 	btContinuousConvexCollision (const btConvexShape*	shapeA,const btConvexShape*	shapeB ,btSimplexSolverInterface* simplexSolver,btConvexPenetrationDepthSolver* penetrationDepthSolver);
 
+	btContinuousConvexCollision(const btConvexShape*	shapeA,const btStaticPlaneShape*	plane );
+
 	virtual bool	calcTimeOfImpact(
 				const btTransform& fromA,
 				const btTransform& toA,
@@ -48,5 +54,6 @@ public:
 
 };
 
-#endif //CONTINUOUS_COLLISION_CONVEX_CAST_H
+
+#endif //BT_CONTINUOUS_COLLISION_CONVEX_CAST_H
 
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
index b0bce341e41..bfd79d03beb 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
@@ -14,8 +14,8 @@ subject to the following restrictions:
 */
 
 
-#ifndef CONVEX_CAST_H
-#define CONVEX_CAST_H
+#ifndef BT_CONVEX_CAST_H
+#define BT_CONVEX_CAST_H
 
 #include "LinearMath/btTransform.h"
 #include "LinearMath/btVector3.h"
@@ -39,7 +39,7 @@ public:
 				
 		virtual void	DebugDraw(btScalar	fraction) {(void)fraction;}
 		virtual void	drawCoordSystem(const btTransform& trans) {(void)trans;}
-
+		virtual void	reportFailure(int errNo, int numIterations) {(void)errNo;(void)numIterations;}
 		CastResult()
 			:m_fraction(btScalar(BT_LARGE_FLOAT)),
 			m_debugDrawer(0),
@@ -70,4 +70,4 @@ public:
 					CastResult& result) = 0;
 };
 
-#endif //CONVEX_CAST_H
+#endif //BT_CONVEX_CAST_H
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
index 7e3fde8e291..72eb5aec461 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
@@ -14,8 +14,8 @@ subject to the following restrictions:
 */
 
 
-#ifndef __CONVEX_PENETRATION_DEPTH_H
-#define __CONVEX_PENETRATION_DEPTH_H
+#ifndef BT_CONVEX_PENETRATION_DEPTH_H
+#define BT_CONVEX_PENETRATION_DEPTH_H
 
 class btStackAlloc;
 class btVector3;
@@ -38,5 +38,5 @@ public:
 
 
 };
-#endif //CONVEX_PENETRATION_DEPTH_H
+#endif //BT_CONVEX_PENETRATION_DEPTH_H
 
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
index bc711ad495c..f958cc523ef 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
@@ -14,8 +14,9 @@ subject to the following restrictions:
 */
 
 
-#ifndef DISCRETE_COLLISION_DETECTOR1_INTERFACE_H
-#define DISCRETE_COLLISION_DETECTOR1_INTERFACE_H
+#ifndef BT_DISCRETE_COLLISION_DETECTOR1_INTERFACE_H
+#define BT_DISCRETE_COLLISION_DETECTOR1_INTERFACE_H
+
 #include "LinearMath/btTransform.h"
 #include "LinearMath/btVector3.h"
 class btStackAlloc;
@@ -86,4 +87,5 @@ struct btStorageResult : public btDiscreteCollisionDetectorInterface::Result
 		}
 };
 
-#endif //DISCRETE_COLLISION_DETECTOR_INTERFACE1_H
+#endif //BT_DISCRETE_COLLISION_DETECTOR1_INTERFACE_H
+
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
index a977c9e83f7..6a42ee63b03 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
@@ -15,8 +15,8 @@ subject to the following restrictions:
 
 
 
-#ifndef GJK_CONVEX_CAST_H
-#define GJK_CONVEX_CAST_H
+#ifndef BT_GJK_CONVEX_CAST_H
+#define BT_GJK_CONVEX_CAST_H
 
 #include "BulletCollision/CollisionShapes/btCollisionMargin.h"
 
@@ -47,4 +47,4 @@ public:
 
 };
 
-#endif //GJK_CONVEX_CAST_H
+#endif //BT_GJK_CONVEX_CAST_H
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
index f74261d4b21..3268f06c2f9 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
@@ -511,7 +511,6 @@ namespace gjkepa2_impl
 		{
 			btVector3	n;
 			btScalar	d;
-			btScalar	p;
 			sSV*		c[3];
 			sFace*		f[3];
 			sFace*		l[2];
@@ -657,7 +656,7 @@ namespace gjkepa2_impl
 										remove(m_hull,best);
 										append(m_stock,best);
 										best=findbest();
-										if(best->p>=outer.p) outer=*best;
+										outer=*best;
 									} else { m_status=eStatus::InvalidHull;break; }
 								} else { m_status=eStatus::AccuraryReached;break; }
 							} else { m_status=eStatus::OutOfVertices;break; }
@@ -696,6 +695,42 @@ namespace gjkepa2_impl
 				m_result.p[0]=1;	
 				return(m_status);
 			}
+			bool getedgedist(sFace* face, sSV* a, sSV* b, btScalar& dist)
+			{
+				const btVector3 ba = b->w - a->w;
+				const btVector3 n_ab = btCross(ba, face->n); // Outward facing edge normal direction, on triangle plane
+				const btScalar a_dot_nab = btDot(a->w, n_ab); // Only care about the sign to determine inside/outside, so not normalization required
+
+				if(a_dot_nab < 0)
+				{
+					// Outside of edge a->b
+
+					const btScalar ba_l2 = ba.length2();
+					const btScalar a_dot_ba = btDot(a->w, ba);
+					const btScalar b_dot_ba = btDot(b->w, ba);
+
+					if(a_dot_ba > 0)
+					{
+						// Pick distance vertex a
+						dist = a->w.length();
+					}
+					else if(b_dot_ba < 0)
+					{
+						// Pick distance vertex b
+						dist = b->w.length();
+					}
+					else
+					{
+						// Pick distance to edge a->b
+						const btScalar a_dot_b = btDot(a->w, b->w);
+						dist = btSqrt(btMax((a->w.length2() * b->w.length2() - a_dot_b * a_dot_b) / ba_l2, (btScalar)0));
+					}
+
+					return true;
+				}
+
+				return false;
+			}
 			sFace*				newface(sSV* a,sSV* b,sSV* c,bool forced)
 			{
 				if(m_stock.root)
@@ -710,41 +745,48 @@ namespace gjkepa2_impl
 					face->n		=	btCross(b->w-a->w,c->w-a->w);
 					const btScalar	l=face->n.length();
 					const bool		v=l>EPA_ACCURACY;
-					face->p		=	btMin(btMin(
-						btDot(a->w,btCross(face->n,a->w-b->w)),
-						btDot(b->w,btCross(face->n,b->w-c->w))),
-						btDot(c->w,btCross(face->n,c->w-a->w)))	/
-						(v?l:1);
-					face->p		=	face->p>=-EPA_INSIDE_EPS?0:face->p;
+
 					if(v)
 					{
-						face->d		=	btDot(a->w,face->n)/l;
-						face->n		/=	l;
-						if(forced||(face->d>=-EPA_PLANE_EPS))
+						if(!(getedgedist(face, a, b, face->d) ||
+							 getedgedist(face, b, c, face->d) ||
+							 getedgedist(face, c, a, face->d)))
+						{
+							// Origin projects to the interior of the triangle
+							// Use distance to triangle plane
+							face->d = btDot(a->w, face->n) / l;
+						}
+
+						face->n /= l;
+						if(forced || (face->d >= -EPA_PLANE_EPS))
 						{
-							return(face);
-						} else m_status=eStatus::NonConvex;
-					} else m_status=eStatus::Degenerated;
-					remove(m_hull,face);
-					append(m_stock,face);
-					return(0);
+							return face;
+						}
+						else
+							m_status=eStatus::NonConvex;
+					}
+					else
+						m_status=eStatus::Degenerated;
+
+					remove(m_hull, face);
+					append(m_stock, face);
+					return 0;
+
 				}
-				m_status=m_stock.root?eStatus::OutOfVertices:eStatus::OutOfFaces;
-				return(0);
+				m_status = m_stock.root ? eStatus::OutOfVertices : eStatus::OutOfFaces;
+				return 0;
 			}
 			sFace*				findbest()
 			{
 				sFace*		minf=m_hull.root;
 				btScalar	mind=minf->d*minf->d;
-				btScalar	maxp=minf->p;
 				for(sFace* f=minf->l[1];f;f=f->l[1])
 				{
 					const btScalar	sqd=f->d*f->d;
-					if((f->p>=maxp)&&(sqd<mind))
+					if(sqd<mind)
 					{
 						minf=f;
 						mind=sqd;
-						maxp=f->p;
 					}
 				}
 				return(minf);
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
index 2296527d7db..ac501d5ecfe 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
@@ -22,8 +22,9 @@ misrepresented as being the original software.
 /*
 GJK-EPA collision solver by Nathanael Presson, 2008
 */
-#ifndef _68DA1F85_90B7_4bb0_A705_83B4040A75C6_
-#define _68DA1F85_90B7_4bb0_A705_83B4040A75C6_
+#ifndef BT_GJK_EPA2_H
+#define BT_GJK_EPA2_H
+
 #include "BulletCollision/CollisionShapes/btConvexShape.h"
 
 ///btGjkEpaSolver contributed under zlib by Nathanael Presson
@@ -70,4 +71,5 @@ static bool		SignedDistance(	const btConvexShape* shape0,const btTransform& wtrs
 
 };
 
-#endif
+#endif //BT_GJK_EPA2_H
+
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
index cc6287c86b0..2277a19d981 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
@@ -16,8 +16,8 @@ subject to the following restrictions:
 
 
 
-#ifndef GJK_PAIR_DETECTOR_H
-#define GJK_PAIR_DETECTOR_H
+#ifndef BT_GJK_PAIR_DETECTOR_H
+#define BT_GJK_PAIR_DETECTOR_H
 
 #include "btDiscreteCollisionDetectorInterface.h"
 #include "BulletCollision/CollisionShapes/btCollisionMargin.h"
@@ -100,4 +100,4 @@ public:
 
 };
 
-#endif //GJK_PAIR_DETECTOR_H
+#endif //BT_GJK_PAIR_DETECTOR_H
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
index cd310570e06..0ce9dd25926 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
@@ -13,14 +13,14 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef MANIFOLD_CONTACT_POINT_H
-#define MANIFOLD_CONTACT_POINT_H
+#ifndef BT_MANIFOLD_CONTACT_POINT_H
+#define BT_MANIFOLD_CONTACT_POINT_H
 
 #include "LinearMath/btVector3.h"
 #include "LinearMath/btTransformUtil.h"
 
 #ifdef PFX_USE_FREE_VECTORMATH
-	#include "physics_effects\base_level\solver\pfx_constraint_row.h"
+	#include "physics_effects/base_level/solver/pfx_constraint_row.h"
 typedef sce::PhysicsEffects::PfxConstraintRow btConstraintRow;
 #else
 	// Don't change following order of parameters
@@ -155,4 +155,4 @@ class btManifoldPoint
 
 	};
 
-#endif //MANIFOLD_CONTACT_POINT_H
+#endif //BT_MANIFOLD_CONTACT_POINT_H
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
index 7b6c8a63779..6a8fe52f36f 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef MINKOWSKI_PENETRATION_DEPTH_SOLVER_H
-#define MINKOWSKI_PENETRATION_DEPTH_SOLVER_H
+#ifndef BT_MINKOWSKI_PENETRATION_DEPTH_SOLVER_H
+#define BT_MINKOWSKI_PENETRATION_DEPTH_SOLVER_H
 
 #include "btConvexPenetrationDepthSolver.h"
 
@@ -36,5 +36,5 @@ public:
 			);
 };
 
-#endif //MINKOWSKI_PENETRATION_DEPTH_SOLVER_H
+#endif //BT_MINKOWSKI_PENETRATION_DEPTH_SOLVER_H
 
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
index 924a8af87d1..954b8395299 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
@@ -21,7 +21,9 @@ subject to the following restrictions:
 btScalar					gContactBreakingThreshold = btScalar(0.02);
 ContactDestroyedCallback	gContactDestroyedCallback = 0;
 ContactProcessedCallback	gContactProcessedCallback = 0;
-
+///gContactCalcArea3Points will approximate the convex hull area using 3 points
+///when setting it to false, it will use 4 points to compute the area: it is more accurate but slower
+bool						gContactCalcArea3Points = true;
 
 
 btPersistentManifold::btPersistentManifold()
@@ -84,10 +86,28 @@ void btPersistentManifold::clearUserCache(btManifoldPoint& pt)
 	
 }
 
+static inline btScalar calcArea4Points(const btVector3 &p0,const btVector3 &p1,const btVector3 &p2,const btVector3 &p3)
+{
+	// It calculates possible 3 area constructed from random 4 points and returns the biggest one.
+
+	btVector3 a[3],b[3];
+	a[0] = p0 - p1;
+	a[1] = p0 - p2;
+	a[2] = p0 - p3;
+	b[0] = p2 - p3;
+	b[1] = p1 - p3;
+	b[2] = p1 - p2;
+
+	//todo: Following 3 cross production can be easily optimized by SIMD.
+	btVector3 tmp0 = a[0].cross(b[0]);
+	btVector3 tmp1 = a[1].cross(b[1]);
+	btVector3 tmp2 = a[2].cross(b[2]);
+
+	return btMax(btMax(tmp0.length2(),tmp1.length2()),tmp2.length2());
+}
 
 int btPersistentManifold::sortCachedPoints(const btManifoldPoint& pt) 
 {
-
 		//calculate 4 possible cases areas, and take biggest area
 		//also need to keep 'deepest'
 		
@@ -106,6 +126,9 @@ int btPersistentManifold::sortCachedPoints(const btManifoldPoint& pt)
 #endif //KEEP_DEEPEST_POINT
 		
 		btScalar res0(btScalar(0.)),res1(btScalar(0.)),res2(btScalar(0.)),res3(btScalar(0.));
+
+	if (gContactCalcArea3Points)
+	{
 		if (maxPenetrationIndex != 0)
 		{
 			btVector3 a0 = pt.m_localPointA-m_pointCache[1].m_localPointA;
@@ -136,10 +159,29 @@ int btPersistentManifold::sortCachedPoints(const btManifoldPoint& pt)
 			btVector3 cross = a3.cross(b3);
 			res3 = cross.length2();
 		}
+	} 
+	else
+	{
+		if(maxPenetrationIndex != 0) {
+			res0 = calcArea4Points(pt.m_localPointA,m_pointCache[1].m_localPointA,m_pointCache[2].m_localPointA,m_pointCache[3].m_localPointA);
+		}
 
-		btVector4 maxvec(res0,res1,res2,res3);
-		int biggestarea = maxvec.closestAxis4();
-		return biggestarea;
+		if(maxPenetrationIndex != 1) {
+			res1 = calcArea4Points(pt.m_localPointA,m_pointCache[0].m_localPointA,m_pointCache[2].m_localPointA,m_pointCache[3].m_localPointA);
+		}
+
+		if(maxPenetrationIndex != 2) {
+			res2 = calcArea4Points(pt.m_localPointA,m_pointCache[0].m_localPointA,m_pointCache[1].m_localPointA,m_pointCache[3].m_localPointA);
+		}
+
+		if(maxPenetrationIndex != 3) {
+			res3 = calcArea4Points(pt.m_localPointA,m_pointCache[0].m_localPointA,m_pointCache[1].m_localPointA,m_pointCache[2].m_localPointA);
+		}
+	}
+	btVector4 maxvec(res0,res1,res2,res3);
+	int biggestarea = maxvec.closestAxis4();
+	return biggestarea;
+	
 }
 
 
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
index c8aac637307..d877f09944f 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef PERSISTENT_MANIFOLD_H
-#define PERSISTENT_MANIFOLD_H
+#ifndef BT_PERSISTENT_MANIFOLD_H
+#define BT_PERSISTENT_MANIFOLD_H
 
 
 #include "LinearMath/btVector3.h"
@@ -197,14 +197,10 @@ public:
 #endif
 	}
 
+	
 	bool validContactDistance(const btManifoldPoint& pt) const
 	{
-		if (pt.m_lifeTime >1)
-		{
-			return pt.m_distance1 <= getContactBreakingThreshold();
-		}
-		return pt.m_distance1 <= getContactProcessingThreshold();
-	
+		return pt.m_distance1 <= getContactBreakingThreshold();
 	}
 	/// calculated new worldspace coordinates and depth, and reject points that exceed the collision margin
 	void	refreshContactPoints(  const btTransform& trA,const btTransform& trB);
@@ -229,4 +225,4 @@ public:
 
 
 
-#endif //PERSISTENT_MANIFOLD_H
+#endif //BT_PERSISTENT_MANIFOLD_H
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h
index 6ca60548e71..18da171011a 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPointCollector.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef POINT_COLLECTOR_H
-#define POINT_COLLECTOR_H
+#ifndef BT_POINT_COLLECTOR_H
+#define BT_POINT_COLLECTOR_H
 
 #include "btDiscreteCollisionDetectorInterface.h"
 
@@ -60,5 +60,5 @@ struct btPointCollector : public btDiscreteCollisionDetectorInterface::Result
 	}
 };
 
-#endif //POINT_COLLECTOR_H
+#endif //BT_POINT_COLLECTOR_H
 
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp
new file mode 100644
index 00000000000..db1909113b3
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp
@@ -0,0 +1,440 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2011 Advanced Micro Devices, Inc.  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+
+///This file was written by Erwin Coumans
+///Separating axis rest based on work from Pierre Terdiman, see
+///And contact clipping based on work from Simon Hobbs
+
+
+#include "btPolyhedralContactClipping.h"
+#include "BulletCollision/CollisionShapes/btConvexPolyhedron.h"
+
+#include <float.h> //for FLT_MAX
+
+int gExpectedNbTests=0;
+int gActualNbTests = 0;
+bool gUseInternalObject = true;
+
+// Clips a face to the back of a plane
+void btPolyhedralContactClipping::clipFace(const btVertexArray& pVtxIn, btVertexArray& ppVtxOut, const btVector3& planeNormalWS,btScalar planeEqWS)
+{
+	
+	int ve;
+	btScalar ds, de;
+	int numVerts = pVtxIn.size();
+	if (numVerts < 2)
+		return;
+
+	btVector3 firstVertex=pVtxIn[pVtxIn.size()-1];
+	btVector3 endVertex = pVtxIn[0];
+	
+	ds = planeNormalWS.dot(firstVertex)+planeEqWS;
+
+	for (ve = 0; ve < numVerts; ve++)
+	{
+		endVertex=pVtxIn[ve];
+
+		de = planeNormalWS.dot(endVertex)+planeEqWS;
+
+		if (ds<0)
+		{
+			if (de<0)
+			{
+				// Start < 0, end < 0, so output endVertex
+				ppVtxOut.push_back(endVertex);
+			}
+			else
+			{
+				// Start < 0, end >= 0, so output intersection
+				ppVtxOut.push_back( 	firstVertex.lerp(endVertex,btScalar(ds * 1.f/(ds - de))));
+			}
+		}
+		else
+		{
+			if (de<0)
+			{
+				// Start >= 0, end < 0 so output intersection and end
+				ppVtxOut.push_back(firstVertex.lerp(endVertex,btScalar(ds * 1.f/(ds - de))));
+				ppVtxOut.push_back(endVertex);
+			}
+		}
+		firstVertex = endVertex;
+		ds = de;
+	}
+}
+
+
+static bool TestSepAxis(const btConvexPolyhedron& hullA, const btConvexPolyhedron& hullB, const btTransform& transA,const btTransform& transB, const btVector3& sep_axis, btScalar& depth)
+{
+	btScalar Min0,Max0;
+	btScalar Min1,Max1;
+	hullA.project(transA,sep_axis, Min0, Max0);
+	hullB.project(transB, sep_axis, Min1, Max1);
+
+	if(Max0<Min1 || Max1<Min0)
+		return false;
+
+	btScalar d0 = Max0 - Min1;
+	assert(d0>=0.0f);
+	btScalar d1 = Max1 - Min0;
+	assert(d1>=0.0f);
+	depth = d0<d1 ? d0:d1;
+	return true;
+}
+
+
+
+static int gActualSATPairTests=0;
+
+inline bool IsAlmostZero(const btVector3& v)
+{
+	if(fabsf(v.x())>1e-6 || fabsf(v.y())>1e-6 || fabsf(v.z())>1e-6)	return false;
+	return true;
+}
+
+#ifdef TEST_INTERNAL_OBJECTS
+
+inline void BoxSupport(const btScalar extents[3], const btScalar sv[3], btScalar p[3])
+{
+	// This version is ~11.000 cycles (4%) faster overall in one of the tests.
+//	IR(p[0]) = IR(extents[0])|(IR(sv[0])&SIGN_BITMASK);
+//	IR(p[1]) = IR(extents[1])|(IR(sv[1])&SIGN_BITMASK);
+//	IR(p[2]) = IR(extents[2])|(IR(sv[2])&SIGN_BITMASK);
+	p[0] = sv[0] < 0.0f ? -extents[0] : extents[0];
+	p[1] = sv[1] < 0.0f ? -extents[1] : extents[1];
+	p[2] = sv[2] < 0.0f ? -extents[2] : extents[2];
+}
+
+void InverseTransformPoint3x3(btVector3& out, const btVector3& in, const btTransform& tr)
+{
+	const btMatrix3x3& rot = tr.getBasis();
+	const btVector3& r0 = rot[0];
+	const btVector3& r1 = rot[1];
+	const btVector3& r2 = rot[2];
+
+	const btScalar x = r0.x()*in.x() + r1.x()*in.y() + r2.x()*in.z();
+	const btScalar y = r0.y()*in.x() + r1.y()*in.y() + r2.y()*in.z();
+	const btScalar z = r0.z()*in.x() + r1.z()*in.y() + r2.z()*in.z();
+
+	out.setValue(x, y, z);
+}
+
+ bool TestInternalObjects( const btTransform& trans0, const btTransform& trans1, const btVector3& delta_c, const btVector3& axis, const btConvexPolyhedron& convex0, const btConvexPolyhedron& convex1, btScalar dmin)
+{
+	const btScalar dp = delta_c.dot(axis);
+
+	btVector3 localAxis0;
+	InverseTransformPoint3x3(localAxis0, axis,trans0);
+	btVector3 localAxis1;
+	InverseTransformPoint3x3(localAxis1, axis,trans1);
+
+	btScalar p0[3];
+	BoxSupport(convex0.m_extents, localAxis0, p0);
+	btScalar p1[3];
+	BoxSupport(convex1.m_extents, localAxis1, p1);
+
+	const btScalar Radius0 = p0[0]*localAxis0.x() + p0[1]*localAxis0.y() + p0[2]*localAxis0.z();
+	const btScalar Radius1 = p1[0]*localAxis1.x() + p1[1]*localAxis1.y() + p1[2]*localAxis1.z();
+
+	const btScalar MinRadius = Radius0>convex0.m_radius ? Radius0 : convex0.m_radius;
+	const btScalar MaxRadius = Radius1>convex1.m_radius ? Radius1 : convex1.m_radius;
+
+	const btScalar MinMaxRadius = MaxRadius + MinRadius;
+	const btScalar d0 = MinMaxRadius + dp;
+	const btScalar d1 = MinMaxRadius - dp;
+
+	const btScalar depth = d0<d1 ? d0:d1;
+	if(depth>dmin)
+		return false;
+	return true;
+}
+#endif //TEST_INTERNAL_OBJECTS
+
+
+bool btPolyhedralContactClipping::findSeparatingAxis(	const btConvexPolyhedron& hullA, const btConvexPolyhedron& hullB, const btTransform& transA,const btTransform& transB, btVector3& sep)
+{
+	gActualSATPairTests++;
+
+//#ifdef TEST_INTERNAL_OBJECTS
+	const btVector3 c0 = transA * hullA.m_localCenter;
+	const btVector3 c1 = transB * hullB.m_localCenter;
+	const btVector3 DeltaC2 = c0 - c1;
+//#endif
+
+	btScalar dmin = FLT_MAX;
+	int curPlaneTests=0;
+
+	int numFacesA = hullA.m_faces.size();
+	// Test normals from hullA
+	for(int i=0;i<numFacesA;i++)
+	{
+		const btVector3 Normal(hullA.m_faces[i].m_plane[0], hullA.m_faces[i].m_plane[1], hullA.m_faces[i].m_plane[2]);
+		const btVector3 faceANormalWS = transA.getBasis() * Normal;
+		if (DeltaC2.dot(faceANormalWS)<0)
+			continue;
+
+		curPlaneTests++;
+#ifdef TEST_INTERNAL_OBJECTS
+		gExpectedNbTests++;
+		if(gUseInternalObject && !TestInternalObjects(transA,transB, DeltaC2, faceANormalWS, hullA, hullB, dmin))
+			continue;
+		gActualNbTests++;
+#endif
+
+		btScalar d;
+		if(!TestSepAxis( hullA, hullB, transA,transB, faceANormalWS, d))
+			return false;
+
+		if(d<dmin)
+		{
+			dmin = d;
+			sep = faceANormalWS;
+		}
+	}
+
+	int numFacesB = hullB.m_faces.size();
+	// Test normals from hullB
+	for(int i=0;i<numFacesB;i++)
+	{
+		const btVector3 Normal(hullB.m_faces[i].m_plane[0], hullB.m_faces[i].m_plane[1], hullB.m_faces[i].m_plane[2]);
+		const btVector3 WorldNormal = transB.getBasis() * Normal;
+		if (DeltaC2.dot(WorldNormal)<0)
+			continue;
+
+		curPlaneTests++;
+#ifdef TEST_INTERNAL_OBJECTS
+		gExpectedNbTests++;
+		if(gUseInternalObject && !TestInternalObjects(transA,transB,DeltaC2, WorldNormal, hullA, hullB, dmin))
+			continue;
+		gActualNbTests++;
+#endif
+
+		btScalar d;
+		if(!TestSepAxis(hullA, hullB,transA,transB, WorldNormal,d))
+			return false;
+
+		if(d<dmin)
+		{
+			dmin = d;
+			sep = WorldNormal;
+		}
+	}
+
+	btVector3 edgeAstart,edgeAend,edgeBstart,edgeBend;
+
+	int curEdgeEdge = 0;
+	// Test edges
+	for(int e0=0;e0<hullA.m_uniqueEdges.size();e0++)
+	{
+		const btVector3 edge0 = hullA.m_uniqueEdges[e0];
+		const btVector3 WorldEdge0 = transA.getBasis() * edge0;
+		for(int e1=0;e1<hullB.m_uniqueEdges.size();e1++)
+		{
+			const btVector3 edge1 = hullB.m_uniqueEdges[e1];
+			const btVector3 WorldEdge1 = transB.getBasis() * edge1;
+
+			btVector3 Cross = WorldEdge0.cross(WorldEdge1);
+			curEdgeEdge++;
+			if(!IsAlmostZero(Cross))
+			{
+				Cross = Cross.normalize();
+				if (DeltaC2.dot(Cross)<0)
+					continue;
+
+
+#ifdef TEST_INTERNAL_OBJECTS
+				gExpectedNbTests++;
+				if(gUseInternalObject && !TestInternalObjects(transA,transB,DeltaC2, Cross, hullA, hullB, dmin))
+					continue;
+				gActualNbTests++;
+#endif
+
+				btScalar dist;
+				if(!TestSepAxis( hullA, hullB, transA,transB, Cross, dist))
+					return false;
+
+				if(dist<dmin)
+				{
+					dmin = dist;
+					sep = Cross;
+				}
+			}
+		}
+
+	}
+
+	const btVector3 deltaC = transB.getOrigin() - transA.getOrigin();
+	if((deltaC.dot(sep))>0.0f)
+		sep = -sep;
+
+	return true;
+}
+
+void	btPolyhedralContactClipping::clipFaceAgainstHull(const btVector3& separatingNormal, const btConvexPolyhedron& hullA,  const btTransform& transA, btVertexArray& worldVertsB1, const btScalar minDist, btScalar maxDist,btDiscreteCollisionDetectorInterface::Result& resultOut)
+{
+	btVertexArray worldVertsB2;
+	btVertexArray* pVtxIn = &worldVertsB1;
+	btVertexArray* pVtxOut = &worldVertsB2;
+	pVtxOut->reserve(pVtxIn->size());
+
+	int closestFaceA=-1;
+	{
+		btScalar dmin = FLT_MAX;
+		for(int face=0;face<hullA.m_faces.size();face++)
+		{
+			const btVector3 Normal(hullA.m_faces[face].m_plane[0], hullA.m_faces[face].m_plane[1], hullA.m_faces[face].m_plane[2]);
+			const btVector3 faceANormalWS = transA.getBasis() * Normal;
+		
+			btScalar d = faceANormalWS.dot(separatingNormal);
+			if (d < dmin)
+			{
+				dmin = d;
+				closestFaceA = face;
+			}
+		}
+	}
+	if (closestFaceA<0)
+		return;
+
+	const btFace& polyA = hullA.m_faces[closestFaceA];
+
+		// clip polygon to back of planes of all faces of hull A that are adjacent to witness face
+	int numContacts = pVtxIn->size();
+	int numVerticesA = polyA.m_indices.size();
+	for(int e0=0;e0<numVerticesA;e0++)
+	{
+		const btVector3& a = hullA.m_vertices[polyA.m_indices[e0]];
+		const btVector3& b = hullA.m_vertices[polyA.m_indices[(e0+1)%numVerticesA]];
+		const btVector3 edge0 = a - b;
+		const btVector3 WorldEdge0 = transA.getBasis() * edge0;
+		btVector3 worldPlaneAnormal1 = transA.getBasis()* btVector3(polyA.m_plane[0],polyA.m_plane[1],polyA.m_plane[2]);
+
+		btVector3 planeNormalWS1 = -WorldEdge0.cross(worldPlaneAnormal1);//.cross(WorldEdge0);
+		btVector3 worldA1 = transA*a;
+		btScalar planeEqWS1 = -worldA1.dot(planeNormalWS1);
+		
+//int otherFace=0;
+#ifdef BLA1
+		int otherFace = polyA.m_connectedFaces[e0];
+		btVector3 localPlaneNormal (hullA.m_faces[otherFace].m_plane[0],hullA.m_faces[otherFace].m_plane[1],hullA.m_faces[otherFace].m_plane[2]);
+		btScalar localPlaneEq = hullA.m_faces[otherFace].m_plane[3];
+
+		btVector3 planeNormalWS = transA.getBasis()*localPlaneNormal;
+		btScalar planeEqWS=localPlaneEq-planeNormalWS.dot(transA.getOrigin());
+#else 
+		btVector3 planeNormalWS = planeNormalWS1;
+		btScalar planeEqWS=planeEqWS1;
+		
+#endif
+		//clip face
+
+		clipFace(*pVtxIn, *pVtxOut,planeNormalWS,planeEqWS);
+		btSwap(pVtxIn,pVtxOut);
+		pVtxOut->resize(0);
+	}
+
+
+
+//#define ONLY_REPORT_DEEPEST_POINT
+
+	btVector3 point;
+	
+
+	// only keep points that are behind the witness face
+	{
+		btVector3 localPlaneNormal (polyA.m_plane[0],polyA.m_plane[1],polyA.m_plane[2]);
+		btScalar localPlaneEq = polyA.m_plane[3];
+		btVector3 planeNormalWS = transA.getBasis()*localPlaneNormal;
+		btScalar planeEqWS=localPlaneEq-planeNormalWS.dot(transA.getOrigin());
+		for (int i=0;i<pVtxIn->size();i++)
+		{
+			
+			btScalar depth = planeNormalWS.dot(pVtxIn->at(i))+planeEqWS;
+			if (depth <=minDist)
+			{
+//				printf("clamped: depth=%f to minDist=%f\n",depth,minDist);
+				depth = minDist;
+			}
+
+			if (depth <=maxDist)
+			{
+				btVector3 point = pVtxIn->at(i);
+#ifdef ONLY_REPORT_DEEPEST_POINT
+				curMaxDist = depth;
+#else
+#if 0
+				if (depth<-3)
+				{
+					printf("error in btPolyhedralContactClipping depth = %f\n", depth);
+					printf("likely wrong separatingNormal passed in\n");
+				} 
+#endif				
+				resultOut.addContactPoint(separatingNormal,point,depth);
+#endif
+			}
+		}
+	}
+#ifdef ONLY_REPORT_DEEPEST_POINT
+	if (curMaxDist<maxDist)
+	{
+		resultOut.addContactPoint(separatingNormal,point,curMaxDist);
+	}
+#endif //ONLY_REPORT_DEEPEST_POINT
+
+}
+
+
+void	btPolyhedralContactClipping::clipHullAgainstHull(const btVector3& separatingNormal1, const btConvexPolyhedron& hullA, const btConvexPolyhedron& hullB, const btTransform& transA,const btTransform& transB, const btScalar minDist, btScalar maxDist,btDiscreteCollisionDetectorInterface::Result& resultOut)
+{
+
+	btVector3 separatingNormal = separatingNormal1.normalized();
+	const btVector3 c0 = transA * hullA.m_localCenter;
+	const btVector3 c1 = transB * hullB.m_localCenter;
+	const btVector3 DeltaC2 = c0 - c1;
+
+
+	btScalar curMaxDist=maxDist;
+	int closestFaceB=-1;
+	btScalar dmax = -FLT_MAX;
+	{
+		for(int face=0;face<hullB.m_faces.size();face++)
+		{
+			const btVector3 Normal(hullB.m_faces[face].m_plane[0], hullB.m_faces[face].m_plane[1], hullB.m_faces[face].m_plane[2]);
+			const btVector3 WorldNormal = transB.getBasis() * Normal;
+			btScalar d = WorldNormal.dot(separatingNormal);
+			if (d > dmax)
+			{
+				dmax = d;
+				closestFaceB = face;
+			}
+		}
+	}
+				btVertexArray worldVertsB1;
+				{
+					const btFace& polyB = hullB.m_faces[closestFaceB];
+					const int numVertices = polyB.m_indices.size();
+					for(int e0=0;e0<numVertices;e0++)
+					{
+						const btVector3& b = hullB.m_vertices[polyB.m_indices[e0]];
+						worldVertsB1.push_back(transB*b);
+					}
+				}
+
+	
+	if (closestFaceB>=0)
+		clipFaceAgainstHull(separatingNormal, hullA, transA,worldVertsB1, minDist, maxDist,resultOut);
+
+}
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h
new file mode 100644
index 00000000000..99103df2027
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.h
@@ -0,0 +1,46 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2011 Advanced Micro Devices, Inc.  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+
+///This file was written by Erwin Coumans
+
+
+#ifndef BT_POLYHEDRAL_CONTACT_CLIPPING_H
+#define BT_POLYHEDRAL_CONTACT_CLIPPING_H
+
+
+#include "LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btTransform.h"
+#include "btDiscreteCollisionDetectorInterface.h"
+
+class btConvexPolyhedron;
+
+typedef btAlignedObjectArray<btVector3> btVertexArray;
+
+// Clips a face to the back of a plane
+struct btPolyhedralContactClipping
+{
+	static void clipHullAgainstHull(const btVector3& separatingNormal, const btConvexPolyhedron& hullA, const btConvexPolyhedron& hullB, const btTransform& transA,const btTransform& transB, const btScalar minDist, btScalar maxDist, btDiscreteCollisionDetectorInterface::Result& resultOut);
+	static void	clipFaceAgainstHull(const btVector3& separatingNormal, const btConvexPolyhedron& hullA,  const btTransform& transA, btVertexArray& worldVertsB1, const btScalar minDist, btScalar maxDist,btDiscreteCollisionDetectorInterface::Result& resultOut);
+
+	static bool findSeparatingAxis(	const btConvexPolyhedron& hullA, const btConvexPolyhedron& hullB, const btTransform& transA,const btTransform& transB, btVector3& sep);
+
+	///the clipFace method is used internally
+	static void clipFace(const btVertexArray& pVtxIn, btVertexArray& ppVtxOut, const btVector3& planeNormalWS,btScalar planeEqWS);
+
+};
+
+#endif // BT_POLYHEDRAL_CONTACT_CLIPPING_H
+
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
index bdd1add36d2..f012889a70e 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef RAYCAST_TRI_CALLBACK_H
-#define RAYCAST_TRI_CALLBACK_H
+#ifndef BT_RAYCAST_TRI_CALLBACK_H
+#define BT_RAYCAST_TRI_CALLBACK_H
 
 #include "BulletCollision/CollisionShapes/btTriangleCallback.h"
 #include "LinearMath/btTransform.h"
@@ -68,5 +68,5 @@ public:
 	virtual btScalar reportHit (const btVector3& hitNormalLocal, const btVector3& hitPointLocal, btScalar hitFraction, int partId, int triangleIndex) = 0;
 };
 
-#endif //RAYCAST_TRI_CALLBACK_H
+#endif //BT_RAYCAST_TRI_CALLBACK_H
 
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
index 823b4e7158b..da8a13914c9 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
@@ -15,8 +15,8 @@ subject to the following restrictions:
 
 
 
-#ifndef SIMPLEX_SOLVER_INTERFACE_H
-#define SIMPLEX_SOLVER_INTERFACE_H
+#ifndef BT_SIMPLEX_SOLVER_INTERFACE_H
+#define BT_SIMPLEX_SOLVER_INTERFACE_H
 
 #include "LinearMath/btVector3.h"
 
@@ -59,5 +59,5 @@ class btSimplexSolverInterface
 
 };
 #endif
-#endif //SIMPLEX_SOLVER_INTERFACE_H
+#endif //BT_SIMPLEX_SOLVER_INTERFACE_H
 
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h
index 05662db5d23..6c8127983eb 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h
@@ -14,8 +14,8 @@ subject to the following restrictions:
 */
 
 
-#ifndef SUBSIMPLEX_CONVEX_CAST_H
-#define SUBSIMPLEX_CONVEX_CAST_H
+#ifndef BT_SUBSIMPLEX_CONVEX_CAST_H
+#define BT_SUBSIMPLEX_CONVEX_CAST_H
 
 #include "btConvexCast.h"
 #include "btSimplexSolverInterface.h"
@@ -47,4 +47,4 @@ public:
 
 };
 
-#endif //SUBSIMPLEX_CONVEX_CAST_H
+#endif //BT_SUBSIMPLEX_CONVEX_CAST_H
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h
index 9a4f552924c..f1c7613efa1 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h
@@ -15,8 +15,8 @@ subject to the following restrictions:
 
 
 
-#ifndef btVoronoiSimplexSolver_H
-#define btVoronoiSimplexSolver_H
+#ifndef BT_VORONOI_SIMPLEX_SOLVER_H
+#define BT_VORONOI_SIMPLEX_SOLVER_H
 
 #include "btSimplexSolverInterface.h"
 
@@ -175,4 +175,5 @@ public:
 
 };
 
-#endif //VoronoiSimplexSolver
+#endif //BT_VORONOI_SIMPLEX_SOLVER_H
+
diff --git a/extern/bullet2/src/BulletDynamics/Character/btCharacterControllerInterface.h b/extern/bullet2/src/BulletDynamics/Character/btCharacterControllerInterface.h
index 19373daa241..c81813c92be 100644
--- a/extern/bullet2/src/BulletDynamics/Character/btCharacterControllerInterface.h
+++ b/extern/bullet2/src/BulletDynamics/Character/btCharacterControllerInterface.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef CHARACTER_CONTROLLER_INTERFACE_H
-#define CHARACTER_CONTROLLER_INTERFACE_H
+#ifndef BT_CHARACTER_CONTROLLER_INTERFACE_H
+#define BT_CHARACTER_CONTROLLER_INTERFACE_H
 
 #include "LinearMath/btVector3.h"
 #include "BulletDynamics/Dynamics/btActionInterface.h"
@@ -42,4 +42,5 @@ public:
 	virtual bool	onGround () const = 0;
 };
 
-#endif
+#endif //BT_CHARACTER_CONTROLLER_INTERFACE_H
+
diff --git a/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp b/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
index 9732553130d..f733dc0cd22 100644
--- a/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
+++ b/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
@@ -84,7 +84,7 @@ public:
 		} else
 		{
 			///need to transform normal into worldspace
-			hitNormalWorld = m_hitCollisionObject->getWorldTransform().getBasis()*convexResult.m_hitNormalLocal;
+			hitNormalWorld = convexResult.m_hitCollisionObject->getWorldTransform().getBasis()*convexResult.m_hitNormalLocal;
 		}
 
 		btScalar dotUp = m_up.dot(hitNormalWorld);
diff --git a/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h b/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h
index 704355c0ae1..ef01f8a3e60 100644
--- a/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h
+++ b/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h
@@ -14,8 +14,8 @@ subject to the following restrictions:
 */
 
 
-#ifndef KINEMATIC_CHARACTER_CONTROLLER_H
-#define KINEMATIC_CHARACTER_CONTROLLER_H
+#ifndef BT_KINEMATIC_CHARACTER_CONTROLLER_H
+#define BT_KINEMATIC_CHARACTER_CONTROLLER_H
 
 #include "LinearMath/btVector3.h"
 
@@ -25,6 +25,7 @@ subject to the following restrictions:
 
 
 class btCollisionShape;
+class btConvexShape;
 class btRigidBody;
 class btCollisionWorld;
 class btCollisionDispatcher;
@@ -159,4 +160,4 @@ public:
 	bool onGround () const;
 };
 
-#endif // KINEMATIC_CHARACTER_CONTROLLER_H
+#endif // BT_KINEMATIC_CHARACTER_CONTROLLER_H
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
index bc371e4062d..755544f0dee 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
@@ -638,6 +638,11 @@ void btConeTwistConstraint::calcAngleInfo2(const btTransform& transA, const btTr
 		btTransform trDeltaAB = trB * trPose * trA.inverse();
 		btQuaternion qDeltaAB = trDeltaAB.getRotation();
 		btVector3 swingAxis = 	btVector3(qDeltaAB.x(), qDeltaAB.y(), qDeltaAB.z());
+		float swingAxisLen2 = swingAxis.length2();
+		if(btFuzzyZero(swingAxisLen2))
+		{
+		   return;
+		}
 		m_swingAxis = swingAxis;
 		m_swingAxis.normalize();
 		m_swingCorrection = qDeltaAB.getAngle();
@@ -918,7 +923,7 @@ void btConeTwistConstraint::computeTwistLimitInfo(const btQuaternion& qTwist,
 
 	if (twistAngle > SIMD_PI) // long way around. flip quat and recalculate.
 	{
-		qMinTwist = operator-(qTwist);
+		qMinTwist = -(qTwist);
 		twistAngle = qMinTwist.getAngle();
 	}
 	if (twistAngle < 0)
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
index c1c5aa851b6..868e62f063e 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
@@ -33,8 +33,8 @@ and swing 1 and 2 are along the z and y axes respectively.
 
 
 
-#ifndef CONETWISTCONSTRAINT_H
-#define CONETWISTCONSTRAINT_H
+#ifndef BT_CONETWISTCONSTRAINT_H
+#define BT_CONETWISTCONSTRAINT_H
 
 #include "LinearMath/btVector3.h"
 #include "btJacobianEntry.h"
@@ -343,4 +343,4 @@ SIMD_FORCE_INLINE const char*	btConeTwistConstraint::serialize(void* dataBuffer,
 }
 
 
-#endif //CONETWISTCONSTRAINT_H
+#endif //BT_CONETWISTCONSTRAINT_H
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
index 7a8e9c1953d..6f673102be2 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef CONSTRAINT_SOLVER_H
-#define CONSTRAINT_SOLVER_H
+#ifndef BT_CONSTRAINT_SOLVER_H
+#define BT_CONSTRAINT_SOLVER_H
 
 #include "LinearMath/btScalar.h"
 
@@ -49,4 +49,4 @@ public:
 
 
 
-#endif //CONSTRAINT_SOLVER_H
+#endif //BT_CONSTRAINT_SOLVER_H
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
index d97096d9f26..88859182925 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
@@ -68,9 +68,53 @@ void	btContactConstraint::buildJacobian()
 #include "LinearMath/btMinMax.h"
 #include "BulletCollision/NarrowPhaseCollision/btManifoldPoint.h"
 
-#define ASSERT2 btAssert
 
-#define USE_INTERNAL_APPLY_IMPULSE 1
+
+//response  between two dynamic objects without friction, assuming 0 penetration depth
+btScalar resolveSingleCollision(
+        btRigidBody* body1,
+        btCollisionObject* colObj2,
+		const btVector3& contactPositionWorld,
+		const btVector3& contactNormalOnB,
+        const btContactSolverInfo& solverInfo,
+		btScalar distance)
+{
+	btRigidBody* body2 = btRigidBody::upcast(colObj2);
+    
+	
+    const btVector3& normal = contactNormalOnB;
+
+    btVector3 rel_pos1 = contactPositionWorld - body1->getWorldTransform().getOrigin(); 
+    btVector3 rel_pos2 = contactPositionWorld - colObj2->getWorldTransform().getOrigin();
+    
+    btVector3 vel1 = body1->getVelocityInLocalPoint(rel_pos1);
+	btVector3 vel2 = body2? body2->getVelocityInLocalPoint(rel_pos2) : btVector3(0,0,0);
+    btVector3 vel = vel1 - vel2;
+    btScalar rel_vel;
+    rel_vel = normal.dot(vel);
+    
+    btScalar combinedRestitution = body1->getRestitution() * colObj2->getRestitution();
+    btScalar restitution = combinedRestitution* -rel_vel;
+
+    btScalar positionalError = solverInfo.m_erp *-distance /solverInfo.m_timeStep ;
+    btScalar velocityError = -(1.0f + restitution) * rel_vel;// * damping;
+	btScalar denom0 = body1->computeImpulseDenominator(contactPositionWorld,normal);
+	btScalar denom1 = body2? body2->computeImpulseDenominator(contactPositionWorld,normal) : 0.f;
+	btScalar relaxation = 1.f;
+	btScalar jacDiagABInv = relaxation/(denom0+denom1);
+
+    btScalar penetrationImpulse = positionalError * jacDiagABInv;
+    btScalar velocityImpulse = velocityError * jacDiagABInv;
+
+    btScalar normalImpulse = penetrationImpulse+velocityImpulse;
+    normalImpulse = 0.f > normalImpulse ? 0.f: normalImpulse;
+
+	body1->applyImpulse(normal*(normalImpulse), rel_pos1);
+    if (body2)
+		body2->applyImpulse(-normal*(normalImpulse), rel_pos2);
+    
+    return normalImpulse;
+}
 
 
 //bilateral constraint between two dynamic objects
@@ -83,7 +127,7 @@ void resolveSingleBilateral(btRigidBody& body1, const btVector3& pos1,
 
 
 	btScalar normalLenSqr = normal.length2();
-	ASSERT2(btFabs(normalLenSqr) < btScalar(1.1));
+	btAssert(btFabs(normalLenSqr) < btScalar(1.1));
 	if (normalLenSqr > btScalar(1.1))
 	{
 		impulse = btScalar(0.);
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
index 63c1a417bc1..477c79d1756 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef CONTACT_CONSTRAINT_H
-#define CONTACT_CONSTRAINT_H
+#ifndef BT_CONTACT_CONSTRAINT_H
+#define BT_CONTACT_CONSTRAINT_H
 
 #include "LinearMath/btVector3.h"
 #include "btJacobianEntry.h"
@@ -57,6 +57,9 @@ public:
 
 };
 
+///very basic collision resolution without friction
+btScalar resolveSingleCollision(btRigidBody* body1, class btCollisionObject* colObj2, const btVector3& contactPositionWorld,const btVector3& contactNormalOnB, const struct btContactSolverInfo& solverInfo,btScalar distance);
+
 
 ///resolveSingleBilateral is an obsolete methods used for vehicle friction between two dynamic objects
 void resolveSingleBilateral(btRigidBody& body1, const btVector3& pos1,
@@ -65,4 +68,4 @@ void resolveSingleBilateral(btRigidBody& body1, const btVector3& pos1,
 
 
 
-#endif //CONTACT_CONSTRAINT_H
+#endif //BT_CONTACT_CONSTRAINT_H
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
index db5bb5e4c51..6204cb3d16c 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef CONTACT_SOLVER_INFO
-#define CONTACT_SOLVER_INFO
+#ifndef BT_CONTACT_SOLVER_INFO
+#define BT_CONTACT_SOLVER_INFO
 
 enum	btSolverMode
 {
@@ -84,4 +84,4 @@ struct btContactSolverInfo : public btContactSolverInfoData
 	}
 };
 
-#endif //CONTACT_SOLVER_INFO
+#endif //BT_CONTACT_SOLVER_INFO
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
index 7c5e4f6e7b2..8ff9940bba3 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
@@ -130,12 +130,20 @@ int btRotationalLimitMotor::testLimitValue(btScalar test_value)
 	{
 		m_currentLimit = 1;//low limit violation
 		m_currentLimitError =  test_value - m_loLimit;
+		if(m_currentLimitError>SIMD_PI) 
+			m_currentLimitError-=SIMD_2_PI;
+		else if(m_currentLimitError<-SIMD_PI) 
+			m_currentLimitError+=SIMD_2_PI;
 		return 1;
 	}
 	else if (test_value> m_hiLimit)
 	{
 		m_currentLimit = 2;//High limit violation
 		m_currentLimitError = test_value - m_hiLimit;
+		if(m_currentLimitError>SIMD_PI) 
+			m_currentLimitError-=SIMD_2_PI;
+		else if(m_currentLimitError<-SIMD_PI) 
+			m_currentLimitError+=SIMD_2_PI;
 		return 2;
 	};
 
@@ -1067,4 +1075,4 @@ void btGeneric6DofConstraint::setAxis(const btVector3& axis1,const btVector3& ax
 	m_frameInB = m_rbB.getCenterOfMassTransform().inverse() * frameInW;
 	
 	calculateTransforms();
-}
\ No newline at end of file
+}
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
index ab745ca5ad6..a8e7bc22902 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
@@ -24,8 +24,8 @@ http://gimpact.sf.net
 */
 
 
-#ifndef GENERIC_6DOF_CONSTRAINT_H
-#define GENERIC_6DOF_CONSTRAINT_H
+#ifndef BT_GENERIC_6DOF_CONSTRAINT_H
+#define BT_GENERIC_6DOF_CONSTRAINT_H
 
 #include "LinearMath/btVector3.h"
 #include "btJacobianEntry.h"
@@ -611,4 +611,4 @@ SIMD_FORCE_INLINE	const char*	btGeneric6DofConstraint::serialize(void* dataBuffe
 
 
 
-#endif //GENERIC_6DOF_CONSTRAINT_H
+#endif //BT_GENERIC_6DOF_CONSTRAINT_H
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp
index d3503456625..2b38714987b 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp
@@ -21,6 +21,19 @@ subject to the following restrictions:
 btGeneric6DofSpringConstraint::btGeneric6DofSpringConstraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB ,bool useLinearReferenceFrameA)
 	: btGeneric6DofConstraint(rbA, rbB, frameInA, frameInB, useLinearReferenceFrameA)
 {
+    init();
+}
+
+
+btGeneric6DofSpringConstraint::btGeneric6DofSpringConstraint(btRigidBody& rbB, const btTransform& frameInB, bool useLinearReferenceFrameB)
+        : btGeneric6DofConstraint(rbB, frameInB, useLinearReferenceFrameB)
+{
+    init();
+}
+
+
+void btGeneric6DofSpringConstraint::init()
+{
 	m_objectType = D6_SPRING_CONSTRAINT_TYPE;
 
 	for(int i = 0; i < 6; i++)
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h
index 16ff973e427..31e0cd531ae 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef GENERIC_6DOF_SPRING_CONSTRAINT_H
-#define GENERIC_6DOF_SPRING_CONSTRAINT_H
+#ifndef BT_GENERIC_6DOF_SPRING_CONSTRAINT_H
+#define BT_GENERIC_6DOF_SPRING_CONSTRAINT_H
 
 
 #include "LinearMath/btVector3.h"
@@ -39,9 +39,11 @@ protected:
 	btScalar	m_equilibriumPoint[6];
 	btScalar	m_springStiffness[6];
 	btScalar	m_springDamping[6]; // between 0 and 1 (1 == no damping)
+	void init();
 	void internalUpdateSprings(btConstraintInfo2* info);
 public: 
     btGeneric6DofSpringConstraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB ,bool useLinearReferenceFrameA);
+    btGeneric6DofSpringConstraint(btRigidBody& rbB, const btTransform& frameInB, bool useLinearReferenceFrameB);
 	void enableSpring(int index, bool onOff);
 	void setStiffness(int index, btScalar stiffness);
 	void setDamping(int index, btScalar damping);
@@ -93,5 +95,5 @@ SIMD_FORCE_INLINE	const char*	btGeneric6DofSpringConstraint::serialize(void* dat
 	return "btGeneric6DofConstraintData";
 }
 
-#endif // GENERIC_6DOF_SPRING_CONSTRAINT_H
+#endif // BT_GENERIC_6DOF_SPRING_CONSTRAINT_H
 
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h
index 15fd4a014cc..a76452ddb64 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef HINGE2_CONSTRAINT_H
-#define HINGE2_CONSTRAINT_H
+#ifndef BT_HINGE2_CONSTRAINT_H
+#define BT_HINGE2_CONSTRAINT_H
 
 
 
@@ -54,5 +54,5 @@ public:
 
 
 
-#endif // HINGE2_CONSTRAINT_H
+#endif // BT_HINGE2_CONSTRAINT_H
 
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
index 144beef1cd6..9e3a2baeed9 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
@@ -37,15 +37,15 @@ subject to the following restrictions:
 btHingeConstraint::btHingeConstraint(btRigidBody& rbA,btRigidBody& rbB, const btVector3& pivotInA,const btVector3& pivotInB,
 									 const btVector3& axisInA,const btVector3& axisInB, bool useReferenceFrameA)
 									 :btTypedConstraint(HINGE_CONSTRAINT_TYPE, rbA,rbB),
+#ifdef _BT_USE_CENTER_LIMIT_
+									 m_limit(),
+#endif
 									 m_angularOnly(false),
 									 m_enableAngularMotor(false),
 									 m_useSolveConstraintObsolete(HINGE_USE_OBSOLETE_SOLVER),
 									 m_useOffsetForConstraintFrame(HINGE_USE_FRAME_OFFSET),
 									 m_useReferenceFrameA(useReferenceFrameA),
 									 m_flags(0)
-#ifdef _BT_USE_CENTER_LIMIT_
-									,m_limit()
-#endif
 {
 	m_rbAFrame.getOrigin() = pivotInA;
 	
@@ -93,14 +93,15 @@ btHingeConstraint::btHingeConstraint(btRigidBody& rbA,btRigidBody& rbB, const bt
 
 
 btHingeConstraint::btHingeConstraint(btRigidBody& rbA,const btVector3& pivotInA,const btVector3& axisInA, bool useReferenceFrameA)
-:btTypedConstraint(HINGE_CONSTRAINT_TYPE, rbA), m_angularOnly(false), m_enableAngularMotor(false), 
+:btTypedConstraint(HINGE_CONSTRAINT_TYPE, rbA),
+#ifdef _BT_USE_CENTER_LIMIT_
+m_limit(),
+#endif
+m_angularOnly(false), m_enableAngularMotor(false), 
 m_useSolveConstraintObsolete(HINGE_USE_OBSOLETE_SOLVER),
 m_useOffsetForConstraintFrame(HINGE_USE_FRAME_OFFSET),
 m_useReferenceFrameA(useReferenceFrameA),
 m_flags(0)
-#ifdef	_BT_USE_CENTER_LIMIT_
-,m_limit()
-#endif
 {
 
 	// since no frame is given, assume this to be zero angle and just pick rb transform axis
@@ -142,15 +143,15 @@ m_flags(0)
 btHingeConstraint::btHingeConstraint(btRigidBody& rbA,btRigidBody& rbB, 
 								     const btTransform& rbAFrame, const btTransform& rbBFrame, bool useReferenceFrameA)
 :btTypedConstraint(HINGE_CONSTRAINT_TYPE, rbA,rbB),m_rbAFrame(rbAFrame),m_rbBFrame(rbBFrame),
+#ifdef _BT_USE_CENTER_LIMIT_
+m_limit(),
+#endif
 m_angularOnly(false),
 m_enableAngularMotor(false),
 m_useSolveConstraintObsolete(HINGE_USE_OBSOLETE_SOLVER),
 m_useOffsetForConstraintFrame(HINGE_USE_FRAME_OFFSET),
 m_useReferenceFrameA(useReferenceFrameA),
 m_flags(0)
-#ifdef	_BT_USE_CENTER_LIMIT_
-,m_limit()
-#endif
 {
 #ifndef	_BT_USE_CENTER_LIMIT_
 	//start with free
@@ -168,15 +169,15 @@ m_flags(0)
 
 btHingeConstraint::btHingeConstraint(btRigidBody& rbA, const btTransform& rbAFrame, bool useReferenceFrameA)
 :btTypedConstraint(HINGE_CONSTRAINT_TYPE, rbA),m_rbAFrame(rbAFrame),m_rbBFrame(rbAFrame),
+#ifdef _BT_USE_CENTER_LIMIT_
+m_limit(),
+#endif
 m_angularOnly(false),
 m_enableAngularMotor(false),
 m_useSolveConstraintObsolete(HINGE_USE_OBSOLETE_SOLVER),
 m_useOffsetForConstraintFrame(HINGE_USE_FRAME_OFFSET),
 m_useReferenceFrameA(useReferenceFrameA),
 m_flags(0)
-#ifdef	_BT_USE_CENTER_LIMIT_
-,m_limit()
-#endif
 {
 	///not providing rigidbody B means implicitly using worldspace for body B
 
@@ -663,7 +664,7 @@ void btHingeConstraint::setMotorTarget(const btQuaternion& qAinB, btScalar dt)
 	btScalar targetAngle = qHinge.getAngle();
 	if (targetAngle > SIMD_PI) // long way around. flip quat and recalculate.
 	{
-		qHinge = operator-(qHinge);
+		qHinge = -(qHinge);
 		targetAngle = qHinge.getAngle();
 	}
 	if (qHinge.getZ() < 0)
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
index 50e3f73cb6d..cb2973e1d1d 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
@@ -15,8 +15,9 @@ subject to the following restrictions:
 
 /* Hinge Constraint by Dirk Gregorius. Limits added by Marcus Hennix at Starbreeze Studios */
 
-#ifndef HINGECONSTRAINT_H
-#define HINGECONSTRAINT_H
+#ifndef BT_HINGECONSTRAINT_H
+#define BT_HINGECONSTRAINT_H
+
 #define _BT_USE_CENTER_LIMIT_ 1
 
 
@@ -377,4 +378,4 @@ SIMD_FORCE_INLINE	const char*	btHingeConstraint::serialize(void* dataBuffer, btS
 	return btHingeConstraintDataName;
 }
 
-#endif //HINGECONSTRAINT_H
+#endif //BT_HINGECONSTRAINT_H
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
index 22a8af66b8e..f1994a2dfd8 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef JACOBIAN_ENTRY_H
-#define JACOBIAN_ENTRY_H
+#ifndef BT_JACOBIAN_ENTRY_H
+#define BT_JACOBIAN_ENTRY_H
 
 #include "LinearMath/btVector3.h"
 #include "BulletDynamics/Dynamics/btRigidBody.h"
@@ -153,4 +153,4 @@ public:
 
 };
 
-#endif //JACOBIAN_ENTRY_H
+#endif //BT_JACOBIAN_ENTRY_H
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
index b589ee68254..b3bda03eec1 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef POINT2POINTCONSTRAINT_H
-#define POINT2POINTCONSTRAINT_H
+#ifndef BT_POINT2POINTCONSTRAINT_H
+#define BT_POINT2POINTCONSTRAINT_H
 
 #include "LinearMath/btVector3.h"
 #include "btJacobianEntry.h"
@@ -158,4 +158,4 @@ SIMD_FORCE_INLINE	const char*	btPoint2PointConstraint::serialize(void* dataBuffe
 	return btPoint2PointConstraintDataName;
 }
 
-#endif //POINT2POINTCONSTRAINT_H
+#endif //BT_POINT2POINTCONSTRAINT_H
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
index 0fc93cd3756..ab074224028 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
@@ -225,7 +225,7 @@ void	btSequentialImpulseConstraintSolver::resolveSplitPenetrationImpulseCacheFri
 	resultUpperLess = _mm_cmplt_ps(sum,upperLimit1);
 	__m128 lowMinApplied = _mm_sub_ps(lowerLimit1,cpAppliedImp);
 	deltaImpulse = _mm_or_ps( _mm_and_ps(resultLowerLess, lowMinApplied), _mm_andnot_ps(resultLowerLess, deltaImpulse) );
-	c.m_appliedImpulse = _mm_or_ps( _mm_and_ps(resultLowerLess, lowerLimit1), _mm_andnot_ps(resultLowerLess, sum) );
+	c.m_appliedPushImpulse = _mm_or_ps( _mm_and_ps(resultLowerLess, lowerLimit1), _mm_andnot_ps(resultLowerLess, sum) );
 	__m128	linearComponentA = _mm_mul_ps(c.m_contactNormal.mVec128,body1.internalGetInvMass().mVec128);
 	__m128	linearComponentB = _mm_mul_ps((c.m_contactNormal).mVec128,body2.internalGetInvMass().mVec128);
 	__m128 impulseMagnitude = deltaImpulse;
@@ -740,13 +740,13 @@ void	btSequentialImpulseConstraintSolver::convertContact(btPersistentManifold* m
 	}
 }
 
-
 btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCollisionObject** bodies, int numBodies, btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer,btStackAlloc* stackAlloc)
 {
 	BT_PROFILE("solveGroupCacheFriendlySetup");
 	(void)stackAlloc;
 	(void)debugDrawer;
 
+	m_maxOverrideNumSolverIterations = 0;
 
 	if (!(numConstraints + numManifolds))
 	{
@@ -788,6 +788,7 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol
 		{
 			btTypedConstraint* constraint = constraints[j];
 			constraint->buildJacobian();
+			constraint->internalSetAppliedImpulse(0.0f);
 		}
 	}
 	//btRigidBody* rb0=0,*rb1=0;
@@ -804,7 +805,14 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol
 			for (i=0;i<numConstraints;i++)
 			{
 				btTypedConstraint::btConstraintInfo1& info1 = m_tmpConstraintSizesPool[i];
-				constraints[i]->getInfo1(&info1);
+				if (constraints[i]->isEnabled())
+				{
+					constraints[i]->getInfo1(&info1);
+				} else
+				{
+					info1.m_numConstraintRows = 0;
+					info1.nub = 0;
+				}
 				totalNumRows += info1.m_numConstraintRows;
 			}
 			m_tmpSolverNonContactConstraintPool.resize(totalNumRows);
@@ -823,23 +831,26 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol
 
 					btSolverConstraint* currentConstraintRow = &m_tmpSolverNonContactConstraintPool[currentRow];
 					btTypedConstraint* constraint = constraints[i];
+					btRigidBody& rbA = constraint->getRigidBodyA();
+					btRigidBody& rbB = constraint->getRigidBodyB();
 
 
+					int overrideNumSolverIterations = constraint->getOverrideNumSolverIterations() > 0 ? constraint->getOverrideNumSolverIterations() : infoGlobal.m_numIterations;
+					if (overrideNumSolverIterations>m_maxOverrideNumSolverIterations)
+						m_maxOverrideNumSolverIterations = overrideNumSolverIterations;
 
-					btRigidBody& rbA = constraint->getRigidBodyA();
-					btRigidBody& rbB = constraint->getRigidBodyB();
 
-					
 					int j;
 					for ( j=0;j<info1.m_numConstraintRows;j++)
 					{
 						memset(&currentConstraintRow[j],0,sizeof(btSolverConstraint));
-						currentConstraintRow[j].m_lowerLimit = -FLT_MAX;
-						currentConstraintRow[j].m_upperLimit = FLT_MAX;
+						currentConstraintRow[j].m_lowerLimit = -SIMD_INFINITY;
+						currentConstraintRow[j].m_upperLimit = SIMD_INFINITY;
 						currentConstraintRow[j].m_appliedImpulse = 0.f;
 						currentConstraintRow[j].m_appliedPushImpulse = 0.f;
 						currentConstraintRow[j].m_solverBodyA = &rbA;
 						currentConstraintRow[j].m_solverBodyB = &rbB;
+						currentConstraintRow[j].m_overrideNumSolverIterations = overrideNumSolverIterations;
 					}
 
 					rbA.internalGetDeltaLinearVelocity().setValue(0.f,0.f,0.f);
@@ -872,6 +883,17 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol
 					for ( j=0;j<info1.m_numConstraintRows;j++)
 					{
 						btSolverConstraint& solverConstraint = currentConstraintRow[j];
+
+						if (solverConstraint.m_upperLimit>=constraints[i]->getBreakingImpulseThreshold())
+						{
+							solverConstraint.m_upperLimit = constraints[i]->getBreakingImpulseThreshold();
+						}
+
+						if (solverConstraint.m_lowerLimit<=-constraints[i]->getBreakingImpulseThreshold())
+						{
+							solverConstraint.m_lowerLimit = -constraints[i]->getBreakingImpulseThreshold();
+						}
+
 						solverConstraint.m_originalContactPoint = constraint;
 
 						{
@@ -939,15 +961,20 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol
 	btContactSolverInfo info = infoGlobal;
 
 
-
+	int numNonContactPool = m_tmpSolverNonContactConstraintPool.size();
 	int numConstraintPool = m_tmpSolverContactConstraintPool.size();
 	int numFrictionPool = m_tmpSolverContactFrictionConstraintPool.size();
 
 	///@todo: use stack allocator for such temporarily memory, same for solver bodies/constraints
+	m_orderNonContactConstraintPool.resize(numNonContactPool);
 	m_orderTmpConstraintPool.resize(numConstraintPool);
 	m_orderFrictionConstraintPool.resize(numFrictionPool);
 	{
 		int i;
+		for (i=0;i<numNonContactPool;i++)
+		{
+			m_orderNonContactConstraintPool[i] = i;
+		}
 		for (i=0;i<numConstraintPool;i++)
 		{
 			m_orderTmpConstraintPool[i] = i;
@@ -965,6 +992,7 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol
 btScalar btSequentialImpulseConstraintSolver::solveSingleIteration(int iteration, btCollisionObject** /*bodies */,int /*numBodies*/,btPersistentManifold** /*manifoldPtr*/, int /*numManifolds*/,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* /*debugDrawer*/,btStackAlloc* /*stackAlloc*/)
 {
 
+	int numNonContactPool = m_tmpSolverNonContactConstraintPool.size();
 	int numConstraintPool = m_tmpSolverContactConstraintPool.size();
 	int numFrictionPool = m_tmpSolverContactFrictionConstraintPool.size();
 
@@ -973,18 +1001,29 @@ btScalar btSequentialImpulseConstraintSolver::solveSingleIteration(int iteration
 	if (infoGlobal.m_solverMode & SOLVER_RANDMIZE_ORDER)
 	{
 		if ((iteration & 7) == 0) {
-			for (j=0; j<numConstraintPool; ++j) {
-				int tmp = m_orderTmpConstraintPool[j];
+			for (j=0; j<numNonContactPool; ++j) {
+				int tmp = m_orderNonContactConstraintPool[j];
 				int swapi = btRandInt2(j+1);
-				m_orderTmpConstraintPool[j] = m_orderTmpConstraintPool[swapi];
-				m_orderTmpConstraintPool[swapi] = tmp;
+				m_orderNonContactConstraintPool[j] = m_orderNonContactConstraintPool[swapi];
+				m_orderNonContactConstraintPool[swapi] = tmp;
 			}
 
-			for (j=0; j<numFrictionPool; ++j) {
-				int tmp = m_orderFrictionConstraintPool[j];
-				int swapi = btRandInt2(j+1);
-				m_orderFrictionConstraintPool[j] = m_orderFrictionConstraintPool[swapi];
-				m_orderFrictionConstraintPool[swapi] = tmp;
+			//contact/friction constraints are not solved more than 
+			if (iteration< infoGlobal.m_numIterations)
+			{
+				for (j=0; j<numConstraintPool; ++j) {
+					int tmp = m_orderTmpConstraintPool[j];
+					int swapi = btRandInt2(j+1);
+					m_orderTmpConstraintPool[j] = m_orderTmpConstraintPool[swapi];
+					m_orderTmpConstraintPool[swapi] = tmp;
+				}
+
+				for (j=0; j<numFrictionPool; ++j) {
+					int tmp = m_orderFrictionConstraintPool[j];
+					int swapi = btRandInt2(j+1);
+					m_orderFrictionConstraintPool[j] = m_orderFrictionConstraintPool[swapi];
+					m_orderFrictionConstraintPool[swapi] = tmp;
+				}
 			}
 		}
 	}
@@ -994,36 +1033,41 @@ btScalar btSequentialImpulseConstraintSolver::solveSingleIteration(int iteration
 		///solve all joint constraints, using SIMD, if available
 		for (j=0;j<m_tmpSolverNonContactConstraintPool.size();j++)
 		{
-			btSolverConstraint& constraint = m_tmpSolverNonContactConstraintPool[j];
-			resolveSingleConstraintRowGenericSIMD(*constraint.m_solverBodyA,*constraint.m_solverBodyB,constraint);
+			btSolverConstraint& constraint = m_tmpSolverNonContactConstraintPool[m_orderNonContactConstraintPool[j]];
+			if (iteration < constraint.m_overrideNumSolverIterations)
+				resolveSingleConstraintRowGenericSIMD(*constraint.m_solverBodyA,*constraint.m_solverBodyB,constraint);
 		}
 
-		for (j=0;j<numConstraints;j++)
+		if (iteration< infoGlobal.m_numIterations)
 		{
-			constraints[j]->solveConstraintObsolete(constraints[j]->getRigidBodyA(),constraints[j]->getRigidBodyB(),infoGlobal.m_timeStep);
-		}
-
-		///solve all contact constraints using SIMD, if available
-		int numPoolConstraints = m_tmpSolverContactConstraintPool.size();
-		for (j=0;j<numPoolConstraints;j++)
-		{
-			const btSolverConstraint& solveManifold = m_tmpSolverContactConstraintPool[m_orderTmpConstraintPool[j]];
-			resolveSingleConstraintRowLowerLimitSIMD(*solveManifold.m_solverBodyA,*solveManifold.m_solverBodyB,solveManifold);
+			for (j=0;j<numConstraints;j++)
+			{
+				constraints[j]->solveConstraintObsolete(constraints[j]->getRigidBodyA(),constraints[j]->getRigidBodyB(),infoGlobal.m_timeStep);
+			}
 
-		}
-		///solve all friction constraints, using SIMD, if available
-		int numFrictionPoolConstraints = m_tmpSolverContactFrictionConstraintPool.size();
-		for (j=0;j<numFrictionPoolConstraints;j++)
-		{
-			btSolverConstraint& solveManifold = m_tmpSolverContactFrictionConstraintPool[m_orderFrictionConstraintPool[j]];
-			btScalar totalImpulse = m_tmpSolverContactConstraintPool[solveManifold.m_frictionIndex].m_appliedImpulse;
+			///solve all contact constraints using SIMD, if available
+			int numPoolConstraints = m_tmpSolverContactConstraintPool.size();
+			for (j=0;j<numPoolConstraints;j++)
+			{
+				const btSolverConstraint& solveManifold = m_tmpSolverContactConstraintPool[m_orderTmpConstraintPool[j]];
+				resolveSingleConstraintRowLowerLimitSIMD(*solveManifold.m_solverBodyA,*solveManifold.m_solverBodyB,solveManifold);
 
-			if (totalImpulse>btScalar(0))
+			}
+		
+			///solve all friction constraints, using SIMD, if available
+			int numFrictionPoolConstraints = m_tmpSolverContactFrictionConstraintPool.size();
+			for (j=0;j<numFrictionPoolConstraints;j++)
 			{
-				solveManifold.m_lowerLimit = -(solveManifold.m_friction*totalImpulse);
-				solveManifold.m_upperLimit = solveManifold.m_friction*totalImpulse;
+				btSolverConstraint& solveManifold = m_tmpSolverContactFrictionConstraintPool[m_orderFrictionConstraintPool[j]];
+				btScalar totalImpulse = m_tmpSolverContactConstraintPool[solveManifold.m_frictionIndex].m_appliedImpulse;
+
+				if (totalImpulse>btScalar(0))
+				{
+					solveManifold.m_lowerLimit = -(solveManifold.m_friction*totalImpulse);
+					solveManifold.m_upperLimit = solveManifold.m_friction*totalImpulse;
 
-				resolveSingleConstraintRowGenericSIMD(*solveManifold.m_solverBodyA,	*solveManifold.m_solverBodyB,solveManifold);
+					resolveSingleConstraintRowGenericSIMD(*solveManifold.m_solverBodyA,	*solveManifold.m_solverBodyB,solveManifold);
+				}
 			}
 		}
 	} else
@@ -1032,34 +1076,38 @@ btScalar btSequentialImpulseConstraintSolver::solveSingleIteration(int iteration
 		///solve all joint constraints
 		for (j=0;j<m_tmpSolverNonContactConstraintPool.size();j++)
 		{
-			btSolverConstraint& constraint = m_tmpSolverNonContactConstraintPool[j];
-			resolveSingleConstraintRowGeneric(*constraint.m_solverBodyA,*constraint.m_solverBodyB,constraint);
+			btSolverConstraint& constraint = m_tmpSolverNonContactConstraintPool[m_orderNonContactConstraintPool[j]];
+			if (iteration < constraint.m_overrideNumSolverIterations)
+				resolveSingleConstraintRowGeneric(*constraint.m_solverBodyA,*constraint.m_solverBodyB,constraint);
 		}
 
-		for (j=0;j<numConstraints;j++)
-		{
-			constraints[j]->solveConstraintObsolete(constraints[j]->getRigidBodyA(),constraints[j]->getRigidBodyB(),infoGlobal.m_timeStep);
-		}
-		///solve all contact constraints
-		int numPoolConstraints = m_tmpSolverContactConstraintPool.size();
-		for (j=0;j<numPoolConstraints;j++)
+		if (iteration< infoGlobal.m_numIterations)
 		{
-			const btSolverConstraint& solveManifold = m_tmpSolverContactConstraintPool[m_orderTmpConstraintPool[j]];
-			resolveSingleConstraintRowLowerLimit(*solveManifold.m_solverBodyA,*solveManifold.m_solverBodyB,solveManifold);
-		}
-		///solve all friction constraints
-		int numFrictionPoolConstraints = m_tmpSolverContactFrictionConstraintPool.size();
-		for (j=0;j<numFrictionPoolConstraints;j++)
-		{
-			btSolverConstraint& solveManifold = m_tmpSolverContactFrictionConstraintPool[m_orderFrictionConstraintPool[j]];
-			btScalar totalImpulse = m_tmpSolverContactConstraintPool[solveManifold.m_frictionIndex].m_appliedImpulse;
-
-			if (totalImpulse>btScalar(0))
+			for (j=0;j<numConstraints;j++)
 			{
-				solveManifold.m_lowerLimit = -(solveManifold.m_friction*totalImpulse);
-				solveManifold.m_upperLimit = solveManifold.m_friction*totalImpulse;
+				constraints[j]->solveConstraintObsolete(constraints[j]->getRigidBodyA(),constraints[j]->getRigidBodyB(),infoGlobal.m_timeStep);
+			}
+			///solve all contact constraints
+			int numPoolConstraints = m_tmpSolverContactConstraintPool.size();
+			for (j=0;j<numPoolConstraints;j++)
+			{
+				const btSolverConstraint& solveManifold = m_tmpSolverContactConstraintPool[m_orderTmpConstraintPool[j]];
+				resolveSingleConstraintRowLowerLimit(*solveManifold.m_solverBodyA,*solveManifold.m_solverBodyB,solveManifold);
+			}
+			///solve all friction constraints
+			int numFrictionPoolConstraints = m_tmpSolverContactFrictionConstraintPool.size();
+			for (j=0;j<numFrictionPoolConstraints;j++)
+			{
+				btSolverConstraint& solveManifold = m_tmpSolverContactFrictionConstraintPool[m_orderFrictionConstraintPool[j]];
+				btScalar totalImpulse = m_tmpSolverContactConstraintPool[solveManifold.m_frictionIndex].m_appliedImpulse;
 
-				resolveSingleConstraintRowGeneric(*solveManifold.m_solverBodyA,*solveManifold.m_solverBodyB,solveManifold);
+				if (totalImpulse>btScalar(0))
+				{
+					solveManifold.m_lowerLimit = -(solveManifold.m_friction*totalImpulse);
+					solveManifold.m_upperLimit = solveManifold.m_friction*totalImpulse;
+
+					resolveSingleConstraintRowGeneric(*solveManifold.m_solverBodyA,*solveManifold.m_solverBodyB,solveManifold);
+				}
 			}
 		}
 	}
@@ -1111,16 +1159,18 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlyIterations(
 {
 	BT_PROFILE("solveGroupCacheFriendlyIterations");
 
-	
-	//should traverse the contacts random order...
-	int iteration;
 	{
-		for ( iteration = 0;iteration<infoGlobal.m_numIterations;iteration++)
+		///this is a special step to resolve penetrations (just for contacts)
+		solveGroupCacheFriendlySplitImpulseIterations(bodies ,numBodies,manifoldPtr, numManifolds,constraints,numConstraints,infoGlobal,debugDrawer,stackAlloc);
+
+		int maxIterations = m_maxOverrideNumSolverIterations > infoGlobal.m_numIterations? m_maxOverrideNumSolverIterations : infoGlobal.m_numIterations;
+
+		for ( int iteration = 0 ; iteration< maxIterations ; iteration++)
+		//for ( int iteration = maxIterations-1  ; iteration >= 0;iteration--)
 		{			
 			solveSingleIteration(iteration, bodies ,numBodies,manifoldPtr, numManifolds,constraints,numConstraints,infoGlobal,debugDrawer,stackAlloc);
 		}
 		
-		solveGroupCacheFriendlySplitImpulseIterations(bodies ,numBodies,manifoldPtr, numManifolds,constraints,numConstraints,infoGlobal,debugDrawer,stackAlloc);
 	}
 	return 0.f;
 }
@@ -1151,9 +1201,11 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlyFinish(btCo
 	{
 		const btSolverConstraint& solverConstr = m_tmpSolverNonContactConstraintPool[j];
 		btTypedConstraint* constr = (btTypedConstraint*)solverConstr.m_originalContactPoint;
-		btScalar sum = constr->internalGetAppliedImpulse();
-		sum += solverConstr.m_appliedImpulse;
-		constr->internalSetAppliedImpulse(sum);
+		constr->internalSetAppliedImpulse(solverConstr.m_appliedImpulse);
+		if (btFabs(solverConstr.m_appliedImpulse)>=constr->getBreakingImpulseThreshold())
+		{
+			constr->setEnabled(false);
+		}
 	}
 
 
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
index f268ec9ae74..bb377db8db9 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_H
-#define SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_H
+#ifndef BT_SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_H
+#define BT_SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_H
 
 #include "btConstraintSolver.h"
 class btIDebugDraw;
@@ -33,8 +33,10 @@ protected:
 	btConstraintArray			m_tmpSolverNonContactConstraintPool;
 	btConstraintArray			m_tmpSolverContactFrictionConstraintPool;
 	btAlignedObjectArray<int>	m_orderTmpConstraintPool;
+	btAlignedObjectArray<int>	m_orderNonContactConstraintPool;
 	btAlignedObjectArray<int>	m_orderFrictionConstraintPool;
 	btAlignedObjectArray<btTypedConstraint::btConstraintInfo1> m_tmpConstraintSizesPool;
+	int							m_maxOverrideNumSolverIterations;
 
 	void setupFrictionConstraint(	btSolverConstraint& solverConstraint, const btVector3& normalAxis,btRigidBody* solverBodyA,btRigidBody* solverBodyIdB,
 									btManifoldPoint& cp,const btVector3& rel_pos1,const btVector3& rel_pos2,
@@ -124,5 +126,5 @@ typedef btSequentialImpulseConstraintSolver btSequentialImpulseConstraintSolverP
 #endif
 
 
-#endif //SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_H
+#endif //BT_SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_H
 
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
index e9723a7bb40..2edc8d2b2e1 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
@@ -22,8 +22,8 @@ TODO:
  - add conversion for ODE constraint solver
 */
 
-#ifndef SLIDER_CONSTRAINT_H
-#define SLIDER_CONSTRAINT_H
+#ifndef BT_SLIDER_CONSTRAINT_H
+#define BT_SLIDER_CONSTRAINT_H
 
 
 
@@ -236,7 +236,10 @@ public:
 	btScalar getTargetAngMotorVelocity() { return m_targetAngMotorVelocity; }
 	void setMaxAngMotorForce(btScalar maxAngMotorForce) { m_maxAngMotorForce = maxAngMotorForce; }
 	btScalar getMaxAngMotorForce() { return m_maxAngMotorForce; }
-	btScalar getLinearPos() { return m_linPos; }
+
+	btScalar getLinearPos() const { return m_linPos; }
+	btScalar getAngularPos() const { return m_angPos; }
+	
 	
 
 	// access for ODE solver
@@ -326,5 +329,5 @@ SIMD_FORCE_INLINE	const char*	btSliderConstraint::serialize(void* dataBuffer, bt
 
 
 
-#endif //SLIDER_CONSTRAINT_H
+#endif //BT_SLIDER_CONSTRAINT_H
 
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h
index 057d3fac827..e8bfabf864e 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef SOLVE_2LINEAR_CONSTRAINT_H
-#define SOLVE_2LINEAR_CONSTRAINT_H
+#ifndef BT_SOLVE_2LINEAR_CONSTRAINT_H
+#define BT_SOLVE_2LINEAR_CONSTRAINT_H
 
 #include "LinearMath/btMatrix3x3.h"
 #include "LinearMath/btVector3.h"
@@ -104,4 +104,4 @@ public:
 
 };
 
-#endif //SOLVE_2LINEAR_CONSTRAINT_H
+#endif //BT_SOLVE_2LINEAR_CONSTRAINT_H
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
index 79e45a4383b..179e79d7911 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
@@ -51,6 +51,8 @@ ATTRIBUTE_ALIGNED64 (struct)	btSolverConstraint
 		btScalar	m_unusedPadding0;
 	};
 
+	int	m_overrideNumSolverIterations;
+
 	union
 	{
 		int			m_frictionIndex;
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
index 8212c36ff4e..06bde5e7eec 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
@@ -25,7 +25,10 @@ btTypedConstraint::btTypedConstraint(btTypedConstraintType type, btRigidBody& rb
 :btTypedObject(type),
 m_userConstraintType(-1),
 m_userConstraintId(-1),
+m_breakingImpulseThreshold(SIMD_INFINITY),
+m_isEnabled(true),
 m_needsFeedback(false),
+m_overrideNumSolverIterations(-1),
 m_rbA(rbA),
 m_rbB(getFixedBody()),
 m_appliedImpulse(btScalar(0.)),
@@ -38,7 +41,10 @@ btTypedConstraint::btTypedConstraint(btTypedConstraintType type, btRigidBody& rb
 :btTypedObject(type),
 m_userConstraintType(-1),
 m_userConstraintId(-1),
+m_breakingImpulseThreshold(SIMD_INFINITY),
+m_isEnabled(true),
 m_needsFeedback(false),
+m_overrideNumSolverIterations(-1),
 m_rbA(rbA),
 m_rbB(rbB),
 m_appliedImpulse(btScalar(0.)),
@@ -114,6 +120,10 @@ const char*	btTypedConstraint::serialize(void* dataBuffer, btSerializer* seriali
 
 	tcd->m_objectType = m_objectType;
 	tcd->m_needsFeedback = m_needsFeedback;
+	tcd->m_overrideNumSolverIterations = m_overrideNumSolverIterations;
+	tcd->m_breakingImpulseThreshold = float(m_breakingImpulseThreshold);
+	tcd->m_isEnabled = m_isEnabled? 1: 0;
+	
 	tcd->m_userConstraintId =m_userConstraintId;
 	tcd->m_userConstraintType =m_userConstraintType;
 
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
index 65e6d558300..a16e869a973 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef TYPED_CONSTRAINT_H
-#define TYPED_CONSTRAINT_H
+#ifndef BT_TYPED_CONSTRAINT_H
+#define BT_TYPED_CONSTRAINT_H
 
 class btRigidBody;
 #include "LinearMath/btScalar.h"
@@ -62,7 +62,11 @@ class btTypedConstraint : public btTypedObject
 		void* m_userConstraintPtr;
 	};
 
-	bool m_needsFeedback;
+	btScalar	m_breakingImpulseThreshold;
+	bool		m_isEnabled;
+	bool		m_needsFeedback;
+	int			m_overrideNumSolverIterations;
+
 
 	btTypedConstraint&	operator=(btTypedConstraint&	other)
 	{
@@ -80,7 +84,6 @@ protected:
 	///internal method used by the constraint solver, don't use them directly
 	btScalar getMotorFactor(btScalar pos, btScalar lowLim, btScalar uppLim, btScalar vel, btScalar timeFact);
 	
-	static btRigidBody& getFixedBody();
 
 public:
 
@@ -92,6 +95,8 @@ public:
 		int m_numConstraintRows,nub;
 	};
 
+	static btRigidBody& getFixedBody();
+
 	struct btConstraintInfo2 {
 		// integrator parameters: frames per second (1/stepsize), default error
 		// reduction parameter (0..1).
@@ -126,6 +131,18 @@ public:
 		btScalar	m_damping;
 	};
 
+	int	getOverrideNumSolverIterations() const
+	{
+		return m_overrideNumSolverIterations;
+	}
+
+	///override the number of constraint solver iterations used to solve this constraint
+	///-1 will use the default number of iterations, as specified in SolverInfo.m_numIterations
+	void setOverrideNumSolverIterations(int overideNumIterations)
+	{
+		m_overrideNumSolverIterations = overideNumIterations;
+	}
+
 	///internal method used by the constraint solver, don't use them directly
 	virtual void	buildJacobian() {};
 
@@ -155,6 +172,28 @@ public:
 		return m_appliedImpulse;
 	}
 
+
+	btScalar	getBreakingImpulseThreshold() const
+	{
+		return 	m_breakingImpulseThreshold;
+	}
+
+	void	setBreakingImpulseThreshold(btScalar threshold)
+	{
+		m_breakingImpulseThreshold = threshold;
+	}
+
+	bool	isEnabled() const
+	{
+		return m_isEnabled;
+	}
+
+	void	setEnabled(bool enabled)
+	{
+		m_isEnabled=enabled;
+	}
+
+
 	///internal method used by the constraint solver, don't use them directly
 	virtual	void	solveConstraintObsolete(btRigidBody& /*bodyA*/,btRigidBody& /*bodyB*/,btScalar	/*timeStep*/) {};
 
@@ -302,7 +341,10 @@ struct	btTypedConstraintData
 	float	m_dbgDrawSize;
 
 	int	m_disableCollisionsBetweenLinkedBodies;
-	char	m_pad4[4];
+	int	m_overrideNumSolverIterations;
+
+	float	m_breakingImpulseThreshold;
+	int		m_isEnabled;
 	
 };
 
@@ -407,4 +449,4 @@ public:
 
 
 
-#endif //TYPED_CONSTRAINT_H
+#endif //BT_TYPED_CONSTRAINT_H
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp
index 40c56e77954..b009f41aec8 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp
@@ -27,7 +27,7 @@ subject to the following restrictions:
 // constructor
 // anchor, axis1 and axis2 are in world coordinate system
 // axis1 must be orthogonal to axis2
-btUniversalConstraint::btUniversalConstraint(btRigidBody& rbA, btRigidBody& rbB, btVector3& anchor, btVector3& axis1, btVector3& axis2)
+btUniversalConstraint::btUniversalConstraint(btRigidBody& rbA, btRigidBody& rbB, const btVector3& anchor, const btVector3& axis1, const btVector3& axis2)
 : btGeneric6DofConstraint(rbA, rbB, btTransform::getIdentity(), btTransform::getIdentity(), true),
  m_anchor(anchor),
  m_axis1(axis1),
@@ -42,8 +42,8 @@ btUniversalConstraint::btUniversalConstraint(btRigidBody& rbA, btRigidBody& rbB,
 	// new position of X, allowed limits are (-PI,PI);
 	// So to simulate ODE Universal joint we should use parent axis as Z, child axis as Y and limit all other DOFs
 	// Build the frame in world coordinate system first
-	btVector3 zAxis = axis1.normalize();
-	btVector3 yAxis = axis2.normalize();
+	btVector3 zAxis = m_axis1.normalize();
+	btVector3 yAxis = m_axis2.normalize();
 	btVector3 xAxis = yAxis.cross(zAxis); // we want right coordinate system
 	btTransform frameInW;
 	frameInW.setIdentity();
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h
index a8d404a591c..a86939164ec 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef UNIVERSAL_CONSTRAINT_H
-#define UNIVERSAL_CONSTRAINT_H
+#ifndef BT_UNIVERSAL_CONSTRAINT_H
+#define BT_UNIVERSAL_CONSTRAINT_H
 
 
 
@@ -41,7 +41,7 @@ public:
 	// constructor
 	// anchor, axis1 and axis2 are in world coordinate system
 	// axis1 must be orthogonal to axis2
-    btUniversalConstraint(btRigidBody& rbA, btRigidBody& rbB, btVector3& anchor, btVector3& axis1, btVector3& axis2);
+    btUniversalConstraint(btRigidBody& rbA, btRigidBody& rbB, const btVector3& anchor, const btVector3& axis1, const btVector3& axis2);
 	// access
 	const btVector3& getAnchor() { return m_calculatedTransformA.getOrigin(); }
 	const btVector3& getAnchor2() { return m_calculatedTransformB.getOrigin(); }
@@ -58,5 +58,5 @@ public:
 
 
 
-#endif // UNIVERSAL_CONSTRAINT_H
+#endif // BT_UNIVERSAL_CONSTRAINT_H
 
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp b/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
deleted file mode 100644
index 23501c4435e..00000000000
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2007 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-
-#include "btContinuousDynamicsWorld.h"
-#include "LinearMath/btQuickprof.h"
-
-//collision detection
-#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
-#include "BulletCollision/BroadphaseCollision/btSimpleBroadphase.h"
-#include "BulletCollision/CollisionShapes/btCollisionShape.h"
-#include "BulletCollision/CollisionDispatch/btSimulationIslandManager.h"
-
-//rigidbody & constraints
-#include "BulletDynamics/Dynamics/btRigidBody.h"
-#include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h"
-#include "BulletDynamics/ConstraintSolver/btContactSolverInfo.h"
-#include "BulletDynamics/ConstraintSolver/btTypedConstraint.h"
-
-
-
-#include <stdio.h>
-
-btContinuousDynamicsWorld::btContinuousDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver,btCollisionConfiguration* collisionConfiguration)
-:btDiscreteDynamicsWorld(dispatcher,pairCache,constraintSolver,collisionConfiguration)
-{
-}
-
-btContinuousDynamicsWorld::~btContinuousDynamicsWorld()
-{
-}
-
-	
-void	btContinuousDynamicsWorld::internalSingleStepSimulation( btScalar timeStep)
-{
-	
-	startProfiling(timeStep);
-	
-	if(0 != m_internalPreTickCallback) {
-		(*m_internalPreTickCallback)(this, timeStep);
-	}
-
-
-	///update aabbs information
-	updateAabbs();
-	//static int frame=0;
-//	printf("frame %d\n",frame++);
-
-	///apply gravity, predict motion
-	predictUnconstraintMotion(timeStep);
-
-	btDispatcherInfo& dispatchInfo = getDispatchInfo();
-
-	dispatchInfo.m_timeStep = timeStep;
-	dispatchInfo.m_stepCount = 0;
-	dispatchInfo.m_debugDraw = getDebugDrawer();
-
-	///perform collision detection
-	performDiscreteCollisionDetection();
-
-	calculateSimulationIslands();
-
-	
-	getSolverInfo().m_timeStep = timeStep;
-	
-
-
-	///solve contact and other joint constraints
-	solveConstraints(getSolverInfo());
-	
-	///CallbackTriggers();
-	calculateTimeOfImpacts(timeStep);
-
-	btScalar toi = dispatchInfo.m_timeOfImpact;
-//	if (toi < 1.f)
-//		printf("toi = %f\n",toi);
-	if (toi < 0.f)
-		printf("toi = %f\n",toi);
-
-
-	///integrate transforms
-	integrateTransforms(timeStep * toi);
-
-	///update vehicle simulation
-	updateActions(timeStep);
-
-	updateActivationState( timeStep );
-	
-	if(0 != m_internalTickCallback) {
-		(*m_internalTickCallback)(this, timeStep);
-	}
-}
-
-void	btContinuousDynamicsWorld::calculateTimeOfImpacts(btScalar timeStep)
-{
-		///these should be 'temporal' aabbs!
-		updateTemporalAabbs(timeStep);
-		
-		///'toi' is the global smallest time of impact. However, we just calculate the time of impact for each object individually.
-		///so we handle the case moving versus static properly, and we cheat for moving versus moving
-		btScalar toi = 1.f;
-		
-	
-		btDispatcherInfo& dispatchInfo = getDispatchInfo();
-		dispatchInfo.m_timeStep = timeStep;
-		dispatchInfo.m_timeOfImpact = 1.f;
-		dispatchInfo.m_stepCount = 0;
-		dispatchInfo.m_dispatchFunc = btDispatcherInfo::DISPATCH_CONTINUOUS;
-
-		///calculate time of impact for overlapping pairs
-
-
-		btDispatcher* dispatcher = getDispatcher();
-		if (dispatcher)
-			dispatcher->dispatchAllCollisionPairs(m_broadphasePairCache->getOverlappingPairCache(),dispatchInfo,m_dispatcher1);
-
-		toi = dispatchInfo.m_timeOfImpact;
-
-		dispatchInfo.m_dispatchFunc = btDispatcherInfo::DISPATCH_DISCRETE;
-
-}
-
-void	btContinuousDynamicsWorld::updateTemporalAabbs(btScalar timeStep)
-{
-
-	btVector3 temporalAabbMin,temporalAabbMax;
-
-	for ( int i=0;i<m_collisionObjects.size();i++)
-	{
-		btCollisionObject* colObj = m_collisionObjects[i];
-		
-		btRigidBody* body = btRigidBody::upcast(colObj);
-		if (body)
-		{
-			body->getCollisionShape()->getAabb(m_collisionObjects[i]->getWorldTransform(),temporalAabbMin,temporalAabbMax);
-			const btVector3& linvel = body->getLinearVelocity();
-
-			//make the AABB temporal
-			btScalar temporalAabbMaxx = temporalAabbMax.getX();
-			btScalar temporalAabbMaxy = temporalAabbMax.getY();
-			btScalar temporalAabbMaxz = temporalAabbMax.getZ();
-			btScalar temporalAabbMinx = temporalAabbMin.getX();
-			btScalar temporalAabbMiny = temporalAabbMin.getY();
-			btScalar temporalAabbMinz = temporalAabbMin.getZ();
-
-			// add linear motion
-			btVector3 linMotion = linvel*timeStep;
-		
-			if (linMotion.x() > 0.f)
-				temporalAabbMaxx += linMotion.x(); 
-			else
-				temporalAabbMinx += linMotion.x();
-			if (linMotion.y() > 0.f)
-				temporalAabbMaxy += linMotion.y(); 
-			else
-				temporalAabbMiny += linMotion.y();
-			if (linMotion.z() > 0.f)
-				temporalAabbMaxz += linMotion.z(); 
-			else
-				temporalAabbMinz += linMotion.z();
-
-			//add conservative angular motion
-			btScalar angularMotion(0);// = angvel.length() * GetAngularMotionDisc() * timeStep;
-			btVector3 angularMotion3d(angularMotion,angularMotion,angularMotion);
-			temporalAabbMin = btVector3(temporalAabbMinx,temporalAabbMiny,temporalAabbMinz);
-			temporalAabbMax = btVector3(temporalAabbMaxx,temporalAabbMaxy,temporalAabbMaxz);
-
-			temporalAabbMin -= angularMotion3d;
-			temporalAabbMax += angularMotion3d;
-
-			m_broadphasePairCache->setAabb(body->getBroadphaseHandle(),temporalAabbMin,temporalAabbMax,m_dispatcher1);
-		}
-	}
-
-	//update aabb (of all moved objects)
-
-	m_broadphasePairCache->calculateOverlappingPairs(m_dispatcher1);
-	
-
-
-}
-
-
-
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h b/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
deleted file mode 100644
index 61c8dea03eb..00000000000
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2007 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef BT_CONTINUOUS_DYNAMICS_WORLD_H
-#define BT_CONTINUOUS_DYNAMICS_WORLD_H
-
-#include "btDiscreteDynamicsWorld.h"
-
-///btContinuousDynamicsWorld adds optional (per object) continuous collision detection for fast moving objects to the btDiscreteDynamicsWorld.
-///This copes with fast moving objects that otherwise would tunnel/miss collisions.
-///Under construction, don't use yet! Please use btDiscreteDynamicsWorld instead.
-class btContinuousDynamicsWorld : public btDiscreteDynamicsWorld
-{
-
-	void	updateTemporalAabbs(btScalar timeStep);
-
-	public:
-
-		btContinuousDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver,btCollisionConfiguration* collisionConfiguration);
-		virtual ~btContinuousDynamicsWorld();
-		
-		///time stepping with calculation of time of impact for selected fast moving objects
-		virtual void	internalSingleStepSimulation( btScalar timeStep);
-
-		virtual void	calculateTimeOfImpacts(btScalar timeStep);
-
-		virtual btDynamicsWorldType	getWorldType() const
-		{
-			return BT_CONTINUOUS_DYNAMICS_WORLD;
-		}
-
-};
-
-#endif //BT_CONTINUOUS_DYNAMICS_WORLD_H
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp b/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
index e1eada07c82..954ef241adc 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
@@ -35,6 +35,8 @@ subject to the following restrictions:
 #include "BulletDynamics/ConstraintSolver/btConeTwistConstraint.h"
 #include "BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h"
 #include "BulletDynamics/ConstraintSolver/btSliderConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btContactConstraint.h"
+
 
 #include "LinearMath/btIDebugDraw.h"
 #include "BulletCollision/CollisionShapes/btSphereShape.h"
@@ -46,6 +48,167 @@ subject to the following restrictions:
 
 #include "LinearMath/btSerializer.h"
 
+#if 0
+btAlignedObjectArray<btVector3> debugContacts;
+btAlignedObjectArray<btVector3> debugNormals;
+int startHit=2;
+int firstHit=startHit;
+#endif
+
+SIMD_FORCE_INLINE	int	btGetConstraintIslandId(const btTypedConstraint* lhs)
+{
+	int islandId;
+	
+	const btCollisionObject& rcolObj0 = lhs->getRigidBodyA();
+	const btCollisionObject& rcolObj1 = lhs->getRigidBodyB();
+	islandId= rcolObj0.getIslandTag()>=0?rcolObj0.getIslandTag():rcolObj1.getIslandTag();
+	return islandId;
+
+}
+
+
+class btSortConstraintOnIslandPredicate
+{
+	public:
+
+		bool operator() ( const btTypedConstraint* lhs, const btTypedConstraint* rhs ) const
+		{
+			int rIslandId0,lIslandId0;
+			rIslandId0 = btGetConstraintIslandId(rhs);
+			lIslandId0 = btGetConstraintIslandId(lhs);
+			return lIslandId0 < rIslandId0;
+		}
+};
+
+struct InplaceSolverIslandCallback : public btSimulationIslandManager::IslandCallback
+{
+	btContactSolverInfo*	m_solverInfo;
+	btConstraintSolver*		m_solver;
+	btTypedConstraint**		m_sortedConstraints;
+	int						m_numConstraints;
+	btIDebugDraw*			m_debugDrawer;
+	btStackAlloc*			m_stackAlloc;
+	btDispatcher*			m_dispatcher;
+	
+	btAlignedObjectArray<btCollisionObject*> m_bodies;
+	btAlignedObjectArray<btPersistentManifold*> m_manifolds;
+	btAlignedObjectArray<btTypedConstraint*> m_constraints;
+
+
+	InplaceSolverIslandCallback(
+		btConstraintSolver*	solver,
+		btStackAlloc* stackAlloc,
+		btDispatcher* dispatcher)
+		:m_solverInfo(NULL),
+		m_solver(solver),
+		m_sortedConstraints(NULL),
+		m_numConstraints(0),
+		m_debugDrawer(NULL),
+		m_stackAlloc(stackAlloc),
+		m_dispatcher(dispatcher)
+	{
+
+	}
+
+	InplaceSolverIslandCallback& operator=(InplaceSolverIslandCallback& other)
+	{
+		btAssert(0);
+		(void)other;
+		return *this;
+	}
+
+	SIMD_FORCE_INLINE void setup ( btContactSolverInfo* solverInfo, btTypedConstraint** sortedConstraints,	int	numConstraints,	btIDebugDraw* debugDrawer)
+	{
+		btAssert(solverInfo);
+		m_solverInfo = solverInfo;
+		m_sortedConstraints = sortedConstraints;
+		m_numConstraints = numConstraints;
+		m_debugDrawer = debugDrawer;
+		m_bodies.resize (0);
+		m_manifolds.resize (0);
+		m_constraints.resize (0);
+	}
+
+	
+	virtual	void	processIsland(btCollisionObject** bodies,int numBodies,btPersistentManifold**	manifolds,int numManifolds, int islandId)
+	{
+		if (islandId<0)
+		{
+			if (numManifolds + m_numConstraints)
+			{
+				///we don't split islands, so all constraints/contact manifolds/bodies are passed into the solver regardless the island id
+				m_solver->solveGroup( bodies,numBodies,manifolds, numManifolds,&m_sortedConstraints[0],m_numConstraints,*m_solverInfo,m_debugDrawer,m_stackAlloc,m_dispatcher);
+			}
+		} else
+		{
+				//also add all non-contact constraints/joints for this island
+			btTypedConstraint** startConstraint = 0;
+			int numCurConstraints = 0;
+			int i;
+			
+			//find the first constraint for this island
+			for (i=0;i<m_numConstraints;i++)
+			{
+				if (btGetConstraintIslandId(m_sortedConstraints[i]) == islandId)
+				{
+					startConstraint = &m_sortedConstraints[i];
+					break;
+				}
+			}
+			//count the number of constraints in this island
+			for (;i<m_numConstraints;i++)
+			{
+				if (btGetConstraintIslandId(m_sortedConstraints[i]) == islandId)
+				{
+					numCurConstraints++;
+				}
+			}
+
+			if (m_solverInfo->m_minimumSolverBatchSize<=1)
+			{
+				///only call solveGroup if there is some work: avoid virtual function call, its overhead can be excessive
+				if (numManifolds + numCurConstraints)
+				{
+					m_solver->solveGroup( bodies,numBodies,manifolds, numManifolds,startConstraint,numCurConstraints,*m_solverInfo,m_debugDrawer,m_stackAlloc,m_dispatcher);
+				}
+			} else
+			{
+				
+				for (i=0;i<numBodies;i++)
+					m_bodies.push_back(bodies[i]);
+				for (i=0;i<numManifolds;i++)
+					m_manifolds.push_back(manifolds[i]);
+				for (i=0;i<numCurConstraints;i++)
+					m_constraints.push_back(startConstraint[i]);
+				if ((m_constraints.size()+m_manifolds.size())>m_solverInfo->m_minimumSolverBatchSize)
+				{
+					processConstraints();
+				} else
+				{
+					//printf("deferred\n");
+				}
+			}
+		}
+	}
+	void	processConstraints()
+	{
+		if (m_manifolds.size() + m_constraints.size()>0)
+		{
+
+			btCollisionObject** bodies = m_bodies.size()? &m_bodies[0]:0;
+			btPersistentManifold** manifold = m_manifolds.size()?&m_manifolds[0]:0;
+			btTypedConstraint** constraints = m_constraints.size()?&m_constraints[0]:0;
+			
+			m_solver->solveGroup( bodies,m_bodies.size(),manifold, m_manifolds.size(),constraints, m_constraints.size() ,*m_solverInfo,m_debugDrawer,m_stackAlloc,m_dispatcher);
+		}
+		m_bodies.resize(0);
+		m_manifolds.resize(0);
+		m_constraints.resize(0);
+
+	}
+
+};
+
 
 
 btDiscreteDynamicsWorld::btDiscreteDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver, btCollisionConfiguration* collisionConfiguration)
@@ -54,7 +217,9 @@ m_constraintSolver(constraintSolver),
 m_gravity(0,-10,0),
 m_localTime(0),
 m_synchronizeAllMotionStates(false),
-m_profileTimings(0)
+m_profileTimings(0),
+m_sortedConstraints	(),
+m_solverIslandCallback ( NULL )
 {
 	if (!m_constraintSolver)
 	{
@@ -72,6 +237,11 @@ m_profileTimings(0)
 	}
 
 	m_ownsIslandManager = true;
+
+	{
+		void* mem = btAlignedAlloc(sizeof(InplaceSolverIslandCallback),16);
+		m_solverIslandCallback = new (mem) InplaceSolverIslandCallback (constraintSolver, m_stackAlloc, dispatcher);
+	}
 }
 
 
@@ -83,6 +253,11 @@ btDiscreteDynamicsWorld::~btDiscreteDynamicsWorld()
 		m_islandManager->~btSimulationIslandManager();
 		btAlignedFree( m_islandManager);
 	}
+	if (m_solverIslandCallback)
+	{
+		m_solverIslandCallback->~InplaceSolverIslandCallback();
+		btAlignedFree(m_solverIslandCallback);
+	}
 	if (m_ownsConstraintSolver)
 	{
 
@@ -138,7 +313,7 @@ void	btDiscreteDynamicsWorld::debugDrawWorld()
 
 
 
-	if (getDebugDrawer() && getDebugDrawer()->getDebugMode() & (btIDebugDraw::DBG_DrawWireframe | btIDebugDraw::DBG_DrawAabb))
+    if (getDebugDrawer() && (getDebugDrawer()->getDebugMode() & (btIDebugDraw::DBG_DrawWireframe | btIDebugDraw::DBG_DrawAabb | btIDebugDraw::DBG_DrawNormals)))
 	{
 		int i;
 
@@ -314,9 +489,11 @@ void	btDiscreteDynamicsWorld::internalSingleStepSimulation(btScalar timeStep)
 	dispatchInfo.m_stepCount = 0;
 	dispatchInfo.m_debugDraw = getDebugDrawer();
 
+
 	///perform collision detection
 	performDiscreteCollisionDetection();
 
+
 	calculateSimulationIslands();
 
 	
@@ -524,187 +701,39 @@ void	btDiscreteDynamicsWorld::removeCharacter(btActionInterface* character)
 }
 
 
-SIMD_FORCE_INLINE	int	btGetConstraintIslandId(const btTypedConstraint* lhs)
-{
-	int islandId;
-	
-	const btCollisionObject& rcolObj0 = lhs->getRigidBodyA();
-	const btCollisionObject& rcolObj1 = lhs->getRigidBodyB();
-	islandId= rcolObj0.getIslandTag()>=0?rcolObj0.getIslandTag():rcolObj1.getIslandTag();
-	return islandId;
-
-}
-
-
-class btSortConstraintOnIslandPredicate
-{
-	public:
-
-		bool operator() ( const btTypedConstraint* lhs, const btTypedConstraint* rhs )
-		{
-			int rIslandId0,lIslandId0;
-			rIslandId0 = btGetConstraintIslandId(rhs);
-			lIslandId0 = btGetConstraintIslandId(lhs);
-			return lIslandId0 < rIslandId0;
-		}
-};
-
 
 
 void	btDiscreteDynamicsWorld::solveConstraints(btContactSolverInfo& solverInfo)
 {
 	BT_PROFILE("solveConstraints");
 	
-	struct InplaceSolverIslandCallback : public btSimulationIslandManager::IslandCallback
-	{
-
-		btContactSolverInfo&	m_solverInfo;
-		btConstraintSolver*		m_solver;
-		btTypedConstraint**		m_sortedConstraints;
-		int						m_numConstraints;
-		btIDebugDraw*			m_debugDrawer;
-		btStackAlloc*			m_stackAlloc;
-		btDispatcher*			m_dispatcher;
-		
-		btAlignedObjectArray<btCollisionObject*> m_bodies;
-		btAlignedObjectArray<btPersistentManifold*> m_manifolds;
-		btAlignedObjectArray<btTypedConstraint*> m_constraints;
-
-
-		InplaceSolverIslandCallback(
-			btContactSolverInfo& solverInfo,
-			btConstraintSolver*	solver,
-			btTypedConstraint** sortedConstraints,
-			int	numConstraints,
-			btIDebugDraw*	debugDrawer,
-			btStackAlloc*			stackAlloc,
-			btDispatcher* dispatcher)
-			:m_solverInfo(solverInfo),
-			m_solver(solver),
-			m_sortedConstraints(sortedConstraints),
-			m_numConstraints(numConstraints),
-			m_debugDrawer(debugDrawer),
-			m_stackAlloc(stackAlloc),
-			m_dispatcher(dispatcher)
-		{
-
-		}
-
-
-		InplaceSolverIslandCallback& operator=(InplaceSolverIslandCallback& other)
-		{
-			btAssert(0);
-			(void)other;
-			return *this;
-		}
-		virtual	void	ProcessIsland(btCollisionObject** bodies,int numBodies,btPersistentManifold**	manifolds,int numManifolds, int islandId)
-		{
-			if (islandId<0)
-			{
-				if (numManifolds + m_numConstraints)
-				{
-					///we don't split islands, so all constraints/contact manifolds/bodies are passed into the solver regardless the island id
-					m_solver->solveGroup( bodies,numBodies,manifolds, numManifolds,&m_sortedConstraints[0],m_numConstraints,m_solverInfo,m_debugDrawer,m_stackAlloc,m_dispatcher);
-				}
-			} else
-			{
-					//also add all non-contact constraints/joints for this island
-				btTypedConstraint** startConstraint = 0;
-				int numCurConstraints = 0;
-				int i;
-				
-				//find the first constraint for this island
-				for (i=0;i<m_numConstraints;i++)
-				{
-					if (btGetConstraintIslandId(m_sortedConstraints[i]) == islandId)
-					{
-						startConstraint = &m_sortedConstraints[i];
-						break;
-					}
-				}
-				//count the number of constraints in this island
-				for (;i<m_numConstraints;i++)
-				{
-					if (btGetConstraintIslandId(m_sortedConstraints[i]) == islandId)
-					{
-						numCurConstraints++;
-					}
-				}
-
-				if (m_solverInfo.m_minimumSolverBatchSize<=1)
-				{
-					///only call solveGroup if there is some work: avoid virtual function call, its overhead can be excessive
-					if (numManifolds + numCurConstraints)
-					{
-						m_solver->solveGroup( bodies,numBodies,manifolds, numManifolds,startConstraint,numCurConstraints,m_solverInfo,m_debugDrawer,m_stackAlloc,m_dispatcher);
-					}
-				} else
-				{
-					
-					for (i=0;i<numBodies;i++)
-						m_bodies.push_back(bodies[i]);
-					for (i=0;i<numManifolds;i++)
-						m_manifolds.push_back(manifolds[i]);
-					for (i=0;i<numCurConstraints;i++)
-						m_constraints.push_back(startConstraint[i]);
-					if ((m_constraints.size()+m_manifolds.size())>m_solverInfo.m_minimumSolverBatchSize)
-					{
-						processConstraints();
-					} else
-					{
-						//printf("deferred\n");
-					}
-				}
-			}
-		}
-		void	processConstraints()
-		{
-			if (m_manifolds.size() + m_constraints.size()>0)
-			{
-				m_solver->solveGroup( &m_bodies[0],m_bodies.size(), &m_manifolds[0], m_manifolds.size(), &m_constraints[0], m_constraints.size() ,m_solverInfo,m_debugDrawer,m_stackAlloc,m_dispatcher);
-			}
-			m_bodies.resize(0);
-			m_manifolds.resize(0);
-			m_constraints.resize(0);
-
-		}
-
-	};
-
-	
-
-	//sorted version of all btTypedConstraint, based on islandId
-	btAlignedObjectArray<btTypedConstraint*>	sortedConstraints;
-	sortedConstraints.resize( m_constraints.size());
+	m_sortedConstraints.resize( m_constraints.size());
 	int i; 
 	for (i=0;i<getNumConstraints();i++)
 	{
-		sortedConstraints[i] = m_constraints[i];
+		m_sortedConstraints[i] = m_constraints[i];
 	}
 
 //	btAssert(0);
 		
 	
 
-	sortedConstraints.quickSort(btSortConstraintOnIslandPredicate());
+	m_sortedConstraints.quickSort(btSortConstraintOnIslandPredicate());
 	
-	btTypedConstraint** constraintsPtr = getNumConstraints() ? &sortedConstraints[0] : 0;
-	
-	InplaceSolverIslandCallback	solverCallback(	solverInfo,	m_constraintSolver, constraintsPtr,sortedConstraints.size(),	m_debugDrawer,m_stackAlloc,m_dispatcher1);
+	btTypedConstraint** constraintsPtr = getNumConstraints() ? &m_sortedConstraints[0] : 0;
 	
+	m_solverIslandCallback->setup(&solverInfo,constraintsPtr,m_sortedConstraints.size(),getDebugDrawer());
 	m_constraintSolver->prepareSolve(getCollisionWorld()->getNumCollisionObjects(), getCollisionWorld()->getDispatcher()->getNumManifolds());
 	
 	/// solve all the constraints for this island
-	m_islandManager->buildAndProcessIslands(getCollisionWorld()->getDispatcher(),getCollisionWorld(),&solverCallback);
+	m_islandManager->buildAndProcessIslands(getCollisionWorld()->getDispatcher(),getCollisionWorld(),m_solverIslandCallback);
 
-	solverCallback.processConstraints();
+	m_solverIslandCallback->processConstraints();
 
 	m_constraintSolver->allSolved(solverInfo, m_debugDrawer, m_stackAlloc);
 }
 
 
-
-
 void	btDiscreteDynamicsWorld::calculateSimulationIslands()
 {
 	BT_PROFILE("calculateSimulationIslands");
@@ -717,18 +746,20 @@ void	btDiscreteDynamicsWorld::calculateSimulationIslands()
 		for (i=0;i< numConstraints ; i++ )
 		{
 			btTypedConstraint* constraint = m_constraints[i];
-
-			const btRigidBody* colObj0 = &constraint->getRigidBodyA();
-			const btRigidBody* colObj1 = &constraint->getRigidBodyB();
-
-			if (((colObj0) && (!(colObj0)->isStaticOrKinematicObject())) &&
-				((colObj1) && (!(colObj1)->isStaticOrKinematicObject())))
+			if (constraint->isEnabled())
 			{
-				if (colObj0->isActive() || colObj1->isActive())
+				const btRigidBody* colObj0 = &constraint->getRigidBodyA();
+				const btRigidBody* colObj1 = &constraint->getRigidBodyB();
+
+				if (((colObj0) && (!(colObj0)->isStaticOrKinematicObject())) &&
+					((colObj1) && (!(colObj1)->isStaticOrKinematicObject())))
 				{
+					if (colObj0->isActive() || colObj1->isActive())
+					{
 
-					getSimulationIslandManager()->getUnionFind().unite((colObj0)->getIslandTag(),
-						(colObj1)->getIslandTag());
+						getSimulationIslandManager()->getUnionFind().unite((colObj0)->getIslandTag(),
+							(colObj1)->getIslandTag());
+					}
 				}
 			}
 		}
@@ -745,12 +776,13 @@ void	btDiscreteDynamicsWorld::calculateSimulationIslands()
 
 class btClosestNotMeConvexResultCallback : public btCollisionWorld::ClosestConvexResultCallback
 {
+public:
+
 	btCollisionObject* m_me;
 	btScalar m_allowedPenetration;
 	btOverlappingPairCache* m_pairCache;
 	btDispatcher* m_dispatcher;
 
-
 public:
 	btClosestNotMeConvexResultCallback (btCollisionObject* me,const btVector3& fromA,const btVector3& toA,btOverlappingPairCache* pairCache,btDispatcher* dispatcher) : 
 	  btCollisionWorld::ClosestConvexResultCallback(fromA,toA),
@@ -797,6 +829,7 @@ public:
 		//call needsResponse, see http://code.google.com/p/bullet/issues/detail?id=179
 		if (m_dispatcher->needsResponse(m_me,otherObj))
 		{
+#if 0
 			///don't do CCD when there are already contact points (touching contact/penetration)
 			btAlignedObjectArray<btPersistentManifold*> manifoldArray;
 			btBroadphasePair* collisionPair = m_pairCache->findPair(m_me->getBroadphaseHandle(),proxy0);
@@ -814,8 +847,11 @@ public:
 					}
 				}
 			}
+#endif
+			return true;
 		}
-		return true;
+
+		return false;
 	}
 
 
@@ -824,7 +860,6 @@ public:
 ///internal debugging variable. this value shouldn't be too high
 int gNumClampedCcdMotions=0;
 
-//#include "stdio.h"
 void	btDiscreteDynamicsWorld::integrateTransforms(btScalar timeStep)
 {
 	BT_PROFILE("integrateTransforms");
@@ -836,34 +871,93 @@ void	btDiscreteDynamicsWorld::integrateTransforms(btScalar timeStep)
 
 		if (body->isActive() && (!body->isStaticOrKinematicObject()))
 		{
+
 			body->predictIntegratedTransform(timeStep, predictedTrans);
+			
 			btScalar squareMotion = (predictedTrans.getOrigin()-body->getWorldTransform().getOrigin()).length2();
 
-			if (body->getCcdSquareMotionThreshold() && body->getCcdSquareMotionThreshold() < squareMotion)
+			
+
+			if (getDispatchInfo().m_useContinuous && body->getCcdSquareMotionThreshold() && body->getCcdSquareMotionThreshold() < squareMotion)
 			{
 				BT_PROFILE("CCD motion clamping");
 				if (body->getCollisionShape()->isConvex())
 				{
 					gNumClampedCcdMotions++;
-					
+#ifdef USE_STATIC_ONLY
+					class StaticOnlyCallback : public btClosestNotMeConvexResultCallback
+					{
+					public:
+
+						StaticOnlyCallback (btCollisionObject* me,const btVector3& fromA,const btVector3& toA,btOverlappingPairCache* pairCache,btDispatcher* dispatcher) : 
+						  btClosestNotMeConvexResultCallback(me,fromA,toA,pairCache,dispatcher)
+						{
+						}
+
+					  	virtual bool needsCollision(btBroadphaseProxy* proxy0) const
+						{
+							btCollisionObject* otherObj = (btCollisionObject*) proxy0->m_clientObject;
+							if (!otherObj->isStaticOrKinematicObject())
+								return false;
+							return btClosestNotMeConvexResultCallback::needsCollision(proxy0);
+						}
+					};
+
+					StaticOnlyCallback sweepResults(body,body->getWorldTransform().getOrigin(),predictedTrans.getOrigin(),getBroadphase()->getOverlappingPairCache(),getDispatcher());
+#else
 					btClosestNotMeConvexResultCallback sweepResults(body,body->getWorldTransform().getOrigin(),predictedTrans.getOrigin(),getBroadphase()->getOverlappingPairCache(),getDispatcher());
+#endif
 					//btConvexShape* convexShape = static_cast<btConvexShape*>(body->getCollisionShape());
 					btSphereShape tmpSphere(body->getCcdSweptSphereRadius());//btConvexShape* convexShape = static_cast<btConvexShape*>(body->getCollisionShape());
+					sweepResults.m_allowedPenetration=getDispatchInfo().m_allowedCcdPenetration;
 
 					sweepResults.m_collisionFilterGroup = body->getBroadphaseProxy()->m_collisionFilterGroup;
 					sweepResults.m_collisionFilterMask  = body->getBroadphaseProxy()->m_collisionFilterMask;
+					btTransform modifiedPredictedTrans = predictedTrans;
+					modifiedPredictedTrans.setBasis(body->getWorldTransform().getBasis());
 
-					convexSweepTest(&tmpSphere,body->getWorldTransform(),predictedTrans,sweepResults);
+					convexSweepTest(&tmpSphere,body->getWorldTransform(),modifiedPredictedTrans,sweepResults);
 					if (sweepResults.hasHit() && (sweepResults.m_closestHitFraction < 1.f))
 					{
+						
+						//printf("clamped integration to hit fraction = %f\n",fraction);
 						body->setHitFraction(sweepResults.m_closestHitFraction);
 						body->predictIntegratedTransform(timeStep*body->getHitFraction(), predictedTrans);
 						body->setHitFraction(0.f);
-//							printf("clamped integration to hit fraction = %f\n",fraction);
+						body->proceedToTransform( predictedTrans);
+
+#if 0
+						btVector3 linVel = body->getLinearVelocity();
+
+						btScalar maxSpeed = body->getCcdMotionThreshold()/getSolverInfo().m_timeStep;
+						btScalar maxSpeedSqr = maxSpeed*maxSpeed;
+						if (linVel.length2()>maxSpeedSqr)
+						{
+							linVel.normalize();
+							linVel*= maxSpeed;
+							body->setLinearVelocity(linVel);
+							btScalar ms2 = body->getLinearVelocity().length2();
+							body->predictIntegratedTransform(timeStep, predictedTrans);
+
+							btScalar sm2 = (predictedTrans.getOrigin()-body->getWorldTransform().getOrigin()).length2();
+							btScalar smt = body->getCcdSquareMotionThreshold();
+							printf("sm2=%f\n",sm2);
+						}
+#else
+						//response  between two dynamic objects without friction, assuming 0 penetration depth
+						btScalar appliedImpulse = 0.f;
+						btScalar depth = 0.f;
+						appliedImpulse = resolveSingleCollision(body,sweepResults.m_hitCollisionObject,sweepResults.m_hitPointWorld,sweepResults.m_hitNormalWorld,getSolverInfo(), depth);
+						
+
+#endif
+
+        				continue;
 					}
 				}
 			}
 			
+
 			body->proceedToTransform( predictedTrans);
 		}
 	}
@@ -873,6 +967,7 @@ void	btDiscreteDynamicsWorld::integrateTransforms(btScalar timeStep)
 
 
 
+
 void	btDiscreteDynamicsWorld::predictUnconstraintMotion(btScalar timeStep)
 {
 	BT_PROFILE("predictUnconstraintMotion");
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h b/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
index df47c29044f..23a38dd2a12 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
@@ -27,6 +27,8 @@ class btTypedConstraint;
 class btActionInterface;
 
 class btIDebugDraw;
+struct InplaceSolverIslandCallback;
+
 #include "LinearMath/btAlignedObjectArray.h"
 
 
@@ -35,6 +37,9 @@ class btIDebugDraw;
 class btDiscreteDynamicsWorld : public btDynamicsWorld
 {
 protected:
+	
+    btAlignedObjectArray<btTypedConstraint*>	m_sortedConstraints;
+	InplaceSolverIslandCallback* 	m_solverIslandCallback;
 
 	btConstraintSolver*	m_constraintSolver;
 
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h b/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
index 105317920ae..6b0093371b8 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
@@ -32,7 +32,8 @@ enum btDynamicsWorldType
 {
 	BT_SIMPLE_DYNAMICS_WORLD=1,
 	BT_DISCRETE_DYNAMICS_WORLD=2,
-	BT_CONTINUOUS_DYNAMICS_WORLD=3
+	BT_CONTINUOUS_DYNAMICS_WORLD=3,
+	BT_SOFT_RIGID_DYNAMICS_WORLD=4
 };
 
 ///The btDynamicsWorld is the interface class for several dynamics implementation, basic, discrete, parallel, and continuous etc.
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp b/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
index aefb26a1be2..911b5072394 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
@@ -286,7 +286,7 @@ btQuaternion btRigidBody::getOrientation() const
 void btRigidBody::setCenterOfMassTransform(const btTransform& xform)
 {
 
-	if (isStaticOrKinematicObject())
+	if (isKinematicObject())
 	{
 		m_interpolationWorldTransform = m_worldTransform;
 	} else
@@ -309,8 +309,9 @@ bool btRigidBody::checkCollideWithOverride(btCollisionObject* co)
 	for (int i = 0; i < m_constraintRefs.size(); ++i)
 	{
 		btTypedConstraint* c = m_constraintRefs[i];
-		if (&c->getRigidBodyA() == otherRb || &c->getRigidBodyB() == otherRb)
-			return false;
+		if (c->isEnabled())
+			if (&c->getRigidBodyA() == otherRb || &c->getRigidBodyB() == otherRb)
+				return false;
 	}
 
 	return true;
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h b/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
index 5a7ba97ccbc..7c121e6df13 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef RIGIDBODY_H
-#define RIGIDBODY_H
+#ifndef BT_RIGIDBODY_H
+#define BT_RIGIDBODY_H
 
 #include "LinearMath/btAlignedObjectArray.h"
 #include "LinearMath/btTransform.h"
@@ -687,5 +687,5 @@ struct	btRigidBodyDoubleData
 
 
 
-#endif
+#endif //BT_RIGIDBODY_H
 
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h b/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
index 07a727e2efe..d48d2e39c4d 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
@@ -23,7 +23,7 @@ class btOverlappingPairCache;
 class btConstraintSolver;
 
 ///The btSimpleDynamicsWorld serves as unit-test and to verify more complicated and optimized dynamics worlds.
-///Please use btDiscreteDynamicsWorld instead (or btContinuousDynamicsWorld once it is finished).
+///Please use btDiscreteDynamicsWorld instead
 class btSimpleDynamicsWorld : public btDynamicsWorld
 {
 protected:
diff --git a/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h b/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
index ac42f1313be..f59555f94d2 100644
--- a/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
+++ b/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
@@ -8,8 +8,8 @@
  * of this software for any purpose.  
  * It is provided "as is" without express or implied warranty.
 */
-#ifndef RAYCASTVEHICLE_H
-#define RAYCASTVEHICLE_H
+#ifndef BT_RAYCASTVEHICLE_H
+#define BT_RAYCASTVEHICLE_H
 
 #include "BulletDynamics/Dynamics/btRigidBody.h"
 #include "BulletDynamics/ConstraintSolver/btTypedConstraint.h"
@@ -232,5 +232,5 @@ public:
 };
 
 
-#endif //RAYCASTVEHICLE_H
+#endif //BT_RAYCASTVEHICLE_H
 
diff --git a/extern/bullet2/src/BulletDynamics/Vehicle/btVehicleRaycaster.h b/extern/bullet2/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
index 5112ce6d420..3cc909c6530 100644
--- a/extern/bullet2/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
+++ b/extern/bullet2/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005 Erwin Coumans http://continuousphysics.com/Bullet/
+ * Copyright (c) 2005 Erwin Coumans http://bulletphysics.org
  *
  * Permission to use, copy, modify, distribute and sell this software
  * and its documentation for any purpose is hereby granted without fee,
@@ -8,8 +8,8 @@
  * of this software for any purpose.  
  * It is provided "as is" without express or implied warranty.
 */
-#ifndef VEHICLE_RAYCASTER_H
-#define VEHICLE_RAYCASTER_H
+#ifndef BT_VEHICLE_RAYCASTER_H
+#define BT_VEHICLE_RAYCASTER_H
 
 #include "LinearMath/btVector3.h"
 
@@ -31,5 +31,5 @@ virtual ~btVehicleRaycaster()
 
 };
 
-#endif //VEHICLE_RAYCASTER_H
+#endif //BT_VEHICLE_RAYCASTER_H
 
diff --git a/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h b/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h
index b74f8c80acb..f916053ecac 100644
--- a/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h
+++ b/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h
@@ -8,8 +8,8 @@
  * of this software for any purpose.  
  * It is provided "as is" without express or implied warranty.
 */
-#ifndef WHEEL_INFO_H
-#define WHEEL_INFO_H
+#ifndef BT_WHEEL_INFO_H
+#define BT_WHEEL_INFO_H
 
 #include "LinearMath/btVector3.h"
 #include "LinearMath/btTransform.h"
@@ -115,5 +115,5 @@ struct btWheelInfo
 
 };
 
-#endif //WHEEL_INFO_H
+#endif //BT_WHEEL_INFO_H
 
diff --git a/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.cpp b/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.cpp
index c876ebf1fd6..d1435b65cda 100644
--- a/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.cpp
+++ b/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.cpp
@@ -35,7 +35,7 @@ btDefaultSoftBodySolver::~btDefaultSoftBodySolver()
 }
 
 // In this case the data is already in the soft bodies so there is no need for us to do anything
-void btDefaultSoftBodySolver::copyBackToSoftBodies()
+void btDefaultSoftBodySolver::copyBackToSoftBodies(bool bMove)
 {
 
 }
diff --git a/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.h b/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.h
index 8e7db3daf98..7d9092ce5b9 100644
--- a/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.h
+++ b/extern/bullet2/src/BulletSoftBody/btDefaultSoftBodySolver.h
@@ -46,7 +46,7 @@ public:
 
 	virtual void optimize( btAlignedObjectArray< btSoftBody * > &softBodies,bool forceUpdate=false );
 
-	virtual void copyBackToSoftBodies();
+	virtual void copyBackToSoftBodies(bool bMove = true);
 
 	virtual void solveConstraints( float solverdt );
 
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp b/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
index 0d19fd193e7..9c06841801c 100644
--- a/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
+++ b/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
@@ -19,9 +19,10 @@ subject to the following restrictions:
 #include "btSoftBodyData.h"
 #include "LinearMath/btSerializer.h"
 
+
 //
 btSoftBody::btSoftBody(btSoftBodyWorldInfo*	worldInfo,int node_count,  const btVector3* x,  const btScalar* m)
-:m_worldInfo(worldInfo),m_softBodySolver(0)
+:m_softBodySolver(0),m_worldInfo(worldInfo)
 {	
 	/* Init		*/ 
 	initDefaults();
@@ -357,14 +358,14 @@ void			btSoftBody::appendTetra(int node0,
 
 //
 
-void			btSoftBody::appendAnchor(int node,btRigidBody* body, bool disableCollisionBetweenLinkedBodies)
+void			btSoftBody::appendAnchor(int node,btRigidBody* body, bool disableCollisionBetweenLinkedBodies,btScalar influence)
 {
 	btVector3 local = body->getWorldTransform().inverse()*m_nodes[node].m_x;
-	appendAnchor(node,body,local,disableCollisionBetweenLinkedBodies);
+	appendAnchor(node,body,local,disableCollisionBetweenLinkedBodies,influence);
 }
 
 //
-void			btSoftBody::appendAnchor(int node,btRigidBody* body, const btVector3& localPivot,bool disableCollisionBetweenLinkedBodies)
+void			btSoftBody::appendAnchor(int node,btRigidBody* body, const btVector3& localPivot,bool disableCollisionBetweenLinkedBodies,btScalar influence)
 {
 	if (disableCollisionBetweenLinkedBodies)
 	{
@@ -379,6 +380,7 @@ void			btSoftBody::appendAnchor(int node,btRigidBody* body, const btVector3& loc
 	a.m_body			=	body;
 	a.m_local			=	localPivot;
 	a.m_node->m_battach	=	1;
+	a.m_influence = influence;
 	m_anchors.push_back(a);
 }
 
@@ -451,6 +453,167 @@ void			btSoftBody::addForce(const btVector3& force,int node)
 	}
 }
 
+void			btSoftBody::addAeroForceToNode(const btVector3& windVelocity,int nodeIndex)
+{
+	btAssert(nodeIndex >= 0 && nodeIndex < m_nodes.size());
+
+	const btScalar dt = m_sst.sdt;
+	const btScalar kLF = m_cfg.kLF;
+	const btScalar kDG = m_cfg.kDG;
+	const btScalar kPR = m_cfg.kPR;
+	const btScalar kVC = m_cfg.kVC;
+	const bool as_lift = kLF>0;
+	const bool as_drag = kDG>0;
+	const bool as_aero = as_lift || as_drag;
+	const bool as_vaero = as_aero && (m_cfg.aeromodel < btSoftBody::eAeroModel::F_TwoSided);
+
+	Node& n = m_nodes[nodeIndex];
+
+	if( n.m_im>0 )
+	{
+		btSoftBody::sMedium	medium;
+
+		EvaluateMedium(m_worldInfo, n.m_x, medium);
+		medium.m_velocity = windVelocity;
+		medium.m_density = m_worldInfo->air_density;
+
+		/* Aerodynamics			*/ 
+		if(as_vaero)
+		{				
+			const btVector3	rel_v = n.m_v - medium.m_velocity;					
+			const btScalar rel_v_len = rel_v.length();
+			const btScalar	rel_v2 = rel_v.length2();
+
+			if(rel_v2>SIMD_EPSILON)
+			{
+				const btVector3 rel_v_nrm = rel_v.normalized();
+				btVector3	nrm = n.m_n;						
+
+				if (m_cfg.aeromodel == btSoftBody::eAeroModel::V_TwoSidedLiftDrag)
+				{
+					nrm *= (btScalar)( (btDot(nrm,rel_v) < 0) ? -1 : +1);
+					btVector3 fDrag(0, 0, 0);
+					btVector3 fLift(0, 0, 0);
+
+					btScalar n_dot_v = nrm.dot(rel_v_nrm);
+					btScalar tri_area = 0.5f * n.m_area;
+							
+					fDrag = 0.5f * kDG * medium.m_density * rel_v2 * tri_area * n_dot_v * (-rel_v_nrm);
+							
+					// Check angle of attack
+					// cos(10º) = 0.98480
+					if ( 0 < n_dot_v && n_dot_v < 0.98480f)
+						fLift = 0.5f * kLF * medium.m_density * rel_v_len * tri_area * btSqrt(1.0f-n_dot_v*n_dot_v) * (nrm.cross(rel_v_nrm).cross(rel_v_nrm));
+
+					n.m_f += fDrag;
+					n.m_f += fLift;
+				}
+				else if (m_cfg.aeromodel == btSoftBody::eAeroModel::V_Point || m_cfg.aeromodel == btSoftBody::eAeroModel::V_OneSided || m_cfg.aeromodel == btSoftBody::eAeroModel::V_TwoSided)
+				{
+					if (btSoftBody::eAeroModel::V_TwoSided)
+						nrm *= (btScalar)( (btDot(nrm,rel_v) < 0) ? -1 : +1);
+
+					const btScalar dvn = btDot(rel_v,nrm);
+					/* Compute forces	*/ 
+					if(dvn>0)
+					{
+						btVector3		force(0,0,0);
+						const btScalar	c0	=	n.m_area * dvn * rel_v2/2;
+						const btScalar	c1	=	c0 * medium.m_density;
+						force	+=	nrm*(-c1*kLF);
+						force	+=	rel_v.normalized() * (-c1 * kDG);
+						ApplyClampedForce(n, force, dt);
+					}
+				}	
+			}
+		}
+	}
+}
+
+void			btSoftBody::addAeroForceToFace(const btVector3& windVelocity,int faceIndex)
+{
+	const btScalar dt = m_sst.sdt;
+	const btScalar kLF = m_cfg.kLF;
+	const btScalar kDG = m_cfg.kDG;
+	const btScalar kPR = m_cfg.kPR;
+	const btScalar kVC = m_cfg.kVC;
+	const bool as_lift = kLF>0;
+	const bool as_drag = kDG>0;
+	const bool as_aero = as_lift || as_drag;
+	const bool as_faero = as_aero && (m_cfg.aeromodel >= btSoftBody::eAeroModel::F_TwoSided);
+
+	if(as_faero)
+	{
+		btSoftBody::Face&	f=m_faces[faceIndex];
+
+		btSoftBody::sMedium	medium;
+		
+		const btVector3	v=(f.m_n[0]->m_v+f.m_n[1]->m_v+f.m_n[2]->m_v)/3;
+		const btVector3	x=(f.m_n[0]->m_x+f.m_n[1]->m_x+f.m_n[2]->m_x)/3;
+		EvaluateMedium(m_worldInfo,x,medium);
+		medium.m_velocity = windVelocity;
+		medium.m_density = m_worldInfo->air_density;
+		const btVector3	rel_v=v-medium.m_velocity;
+		const btScalar rel_v_len = rel_v.length();
+		const btScalar	rel_v2=rel_v.length2();
+
+		if(rel_v2>SIMD_EPSILON)
+		{
+			const btVector3 rel_v_nrm = rel_v.normalized();
+			btVector3	nrm = f.m_normal;
+
+			if (m_cfg.aeromodel == btSoftBody::eAeroModel::F_TwoSidedLiftDrag)
+			{
+				nrm *= (btScalar)( (btDot(nrm,rel_v) < 0) ? -1 : +1);
+
+				btVector3 fDrag(0, 0, 0);
+				btVector3 fLift(0, 0, 0);
+
+				btScalar n_dot_v = nrm.dot(rel_v_nrm);
+				btScalar tri_area = 0.5f * f.m_ra;
+					
+				fDrag = 0.5f * kDG * medium.m_density * rel_v2 * tri_area * n_dot_v * (-rel_v_nrm);
+
+				// Check angle of attack
+				// cos(10º) = 0.98480
+				if ( 0 < n_dot_v && n_dot_v < 0.98480f)
+					fLift = 0.5f * kLF * medium.m_density * rel_v_len * tri_area * btSqrt(1.0f-n_dot_v*n_dot_v) * (nrm.cross(rel_v_nrm).cross(rel_v_nrm));
+
+				fDrag /= 3;
+				fLift /= 3;
+
+				for(int j=0;j<3;++j) 
+				{
+					if (f.m_n[j]->m_im>0)
+					{
+						f.m_n[j]->m_f += fDrag; 
+						f.m_n[j]->m_f += fLift;
+					}
+				}
+			}
+			else if (m_cfg.aeromodel == btSoftBody::eAeroModel::F_OneSided || m_cfg.aeromodel == btSoftBody::eAeroModel::F_TwoSided)
+			{
+				if (btSoftBody::eAeroModel::F_TwoSided)
+					nrm *= (btScalar)( (btDot(nrm,rel_v) < 0) ? -1 : +1);
+
+				const btScalar	dvn=btDot(rel_v,nrm);
+				/* Compute forces	*/ 
+				if(dvn>0)
+				{
+					btVector3		force(0,0,0);
+					const btScalar	c0	=	f.m_ra*dvn*rel_v2;
+					const btScalar	c1	=	c0*medium.m_density;
+					force	+=	nrm*(-c1*kLF);
+					force	+=	rel_v.normalized()*(-c1*kDG);
+					force	/=	3;
+					for(int j=0;j<3;++j) ApplyClampedForce(*f.m_n[j],force,dt);
+				}
+			}
+		}
+	}
+
+}
+
 //
 void			btSoftBody::addVelocity(const btVector3& velocity)
 {
@@ -1820,7 +1983,7 @@ btScalar			btSoftBody::RayFromToCaster::rayFromToTriangle(	const btVector3& rayF
 void				btSoftBody::pointersToIndices()
 {
 #define	PTR2IDX(_p_,_b_)	reinterpret_cast<btSoftBody::Node*>((_p_)-(_b_))
-	btSoftBody::Node*	base=&m_nodes[0];
+	btSoftBody::Node*	base=m_nodes.size() ? &m_nodes[0] : 0;
 	int i,ni;
 
 	for(i=0,ni=m_nodes.size();i<ni;++i)
@@ -1864,7 +2027,7 @@ void				btSoftBody::indicesToPointers(const int* map)
 {
 #define	IDX2PTR(_p_,_b_)	map?(&(_b_)[map[(((char*)_p_)-(char*)0)]]):	\
 	(&(_b_)[(((char*)_p_)-(char*)0)])
-	btSoftBody::Node*	base=&m_nodes[0];
+	btSoftBody::Node*	base=m_nodes.size() ? &m_nodes[0]:0;
 	int i,ni;
 
 	for(i=0,ni=m_nodes.size();i<ni;++i)
@@ -1908,11 +2071,12 @@ int					btSoftBody::rayTest(const btVector3& rayFrom,const btVector3& rayTo,
 										btScalar& mint,eFeature::_& feature,int& index,bool bcountonly) const
 {
 	int	cnt=0;
+	btVector3 dir = rayTo-rayFrom;
+	
+
 	if(bcountonly||m_fdbvt.empty())
 	{/* Full search	*/ 
-		btVector3 dir = rayTo-rayFrom;
-		dir.normalize();
-
+		
 		for(int i=0,ni=m_faces.size();i<ni;++i)
 		{
 			const btSoftBody::Face&	f=m_faces[i];
@@ -1947,6 +2111,37 @@ int					btSoftBody::rayTest(const btVector3& rayFrom,const btVector3& rayTo,
 			cnt=1;
 		}
 	}
+
+	for (int i=0;i<m_tetras.size();i++)
+	{
+		const btSoftBody::Tetra& tet = m_tetras[i];
+		int tetfaces[4][3] = {{0,1,2},{0,1,3},{1,2,3},{0,2,3}};
+		for (int f=0;f<4;f++)
+		{
+
+			int index0=tetfaces[f][0];
+			int index1=tetfaces[f][1];
+			int index2=tetfaces[f][2];
+			btVector3 v0=tet.m_n[index0]->m_x;
+			btVector3 v1=tet.m_n[index1]->m_x;
+			btVector3 v2=tet.m_n[index2]->m_x;
+
+
+		const btScalar			t=RayFromToCaster::rayFromToTriangle(	rayFrom,rayTo,dir,
+			v0,v1,v2,
+				mint);
+		if(t>0)
+			{
+				++cnt;
+				if(!bcountonly)
+				{
+					feature=btSoftBody::eFeature::Tetra;
+					index=i;
+					mint=t;
+				}
+			}
+		}
+	}
 	return(cnt);
 }
 
@@ -2660,44 +2855,8 @@ void				btSoftBody::applyForces()
 		{
 			if(use_medium)
 			{
-				EvaluateMedium(m_worldInfo, n.m_x, medium);
-				medium.m_velocity = m_windVelocity;
-				medium.m_density = m_worldInfo->air_density;
-
 				/* Aerodynamics			*/ 
-				if(as_vaero)
-				{				
-					const btVector3	rel_v = n.m_v - medium.m_velocity;
-					const btScalar	rel_v2 = rel_v.length2();
-					if(rel_v2>SIMD_EPSILON)
-					{
-						btVector3	nrm = n.m_n;
-						/* Setup normal		*/ 
-						switch(m_cfg.aeromodel)
-						{
-						case	btSoftBody::eAeroModel::V_Point:
-							nrm = NormalizeAny(rel_v);
-							break;
-						case	btSoftBody::eAeroModel::V_TwoSided:
-							nrm *= (btScalar)( (btDot(nrm,rel_v) < 0) ? -1 : +1);
-							break;							
-						default:
-							{
-							}
-						}
-						const btScalar dvn = btDot(rel_v,nrm);
-						/* Compute forces	*/ 
-						if(dvn>0)
-						{
-							btVector3		force(0,0,0);
-							const btScalar	c0	=	n.m_area * dvn * rel_v2/2;
-							const btScalar	c1	=	c0 * medium.m_density;
-							force	+=	nrm*(-c1*kLF);
-							force	+=	rel_v.normalized() * (-c1 * kDG);
-							ApplyClampedForce(n, force, dt);
-						}
-					}
-				}
+				addAeroForceToNode(m_windVelocity, i);
 			}
 			/* Pressure				*/ 
 			if(as_pressure)
@@ -2711,43 +2870,14 @@ void				btSoftBody::applyForces()
 			}
 		}
 	}
+
 	/* Per face forces				*/ 
 	for(i=0,ni=m_faces.size();i<ni;++i)
 	{
 		btSoftBody::Face&	f=m_faces[i];
-		if(as_faero)
-		{
-			const btVector3	v=(f.m_n[0]->m_v+f.m_n[1]->m_v+f.m_n[2]->m_v)/3;
-			const btVector3	x=(f.m_n[0]->m_x+f.m_n[1]->m_x+f.m_n[2]->m_x)/3;
-			EvaluateMedium(m_worldInfo,x,medium);
-			const btVector3	rel_v=v-medium.m_velocity;
-			const btScalar	rel_v2=rel_v.length2();
-			if(rel_v2>SIMD_EPSILON)
-			{
-				btVector3	nrm=f.m_normal;
-				/* Setup normal		*/ 
-				switch(m_cfg.aeromodel)
-				{
-				case	btSoftBody::eAeroModel::F_TwoSided:
-					nrm*=(btScalar)(btDot(nrm,rel_v)<0?-1:+1);break;
-					default:
-					{
-					}
-				}
-				const btScalar	dvn=btDot(rel_v,nrm);
-				/* Compute forces	*/ 
-				if(dvn>0)
-				{
-					btVector3		force(0,0,0);
-					const btScalar	c0	=	f.m_ra*dvn*rel_v2;
-					const btScalar	c1	=	c0*medium.m_density;
-					force	+=	nrm*(-c1*kLF);
-					force	+=	rel_v.normalized()*(-c1*kDG);
-					force	/=	3;
-					for(int j=0;j<3;++j) ApplyClampedForce(*f.m_n[j],force,dt);
-				}
-			}
-		}
+
+		/* Aerodynamics			*/ 
+		addAeroForceToFace(m_windVelocity, i);	
 	}
 }
 
@@ -2765,7 +2895,7 @@ void				btSoftBody::PSolve_Anchors(btSoftBody* psb,btScalar kst,btScalar ti)
 		const btVector3		va=a.m_body->getVelocityInLocalPoint(a.m_c1)*dt;
 		const btVector3		vb=n.m_x-n.m_q;
 		const btVector3		vr=(va-vb)+(wa-n.m_x)*kAHR;
-		const btVector3		impulse=a.m_c0*vr;
+		const btVector3		impulse=a.m_c0*vr*a.m_influence;
 		n.m_x+=impulse*a.m_c2;
 		a.m_body->applyImpulse(-impulse,a.m_c1);
 	}
@@ -3196,7 +3326,7 @@ const char*	btSoftBody::serialize(void* dataBuffer, class btSerializer* serializ
 	sbd->m_config.m_softRigidClusterImpulseSplit = m_cfg.kSR_SPLT_CL;
 	sbd->m_config.m_softKineticClusterImpulseSplit = m_cfg.kSK_SPLT_CL;
 	sbd->m_config.m_softSoftClusterImpulseSplit = m_cfg.kSS_SPLT_CL;
-		
+
 	//pose for shape matching
 	{
 		sbd->m_pose = (SoftBodyPoseData*)serializer->getUniquePointer((void*)&m_pose);
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBody.h b/extern/bullet2/src/BulletSoftBody/btSoftBody.h
index ad8678f28b2..ba589486f26 100644
--- a/extern/bullet2/src/BulletSoftBody/btSoftBody.h
+++ b/extern/bullet2/src/BulletSoftBody/btSoftBody.h
@@ -80,11 +80,13 @@ public:
 
 	///eAeroModel 
 	struct eAeroModel { enum _ {
-		V_Point,	///Vertex normals are oriented toward velocity
-		V_TwoSided,	///Vertex normals are fliped to match velocity	
-		V_OneSided,	///Vertex normals are taken as it is	
-		F_TwoSided,	///Face normals are fliped to match velocity
-		F_OneSided,	///Face normals are taken as it is
+		V_Point,			///Vertex normals are oriented toward velocity
+		V_TwoSided,			///Vertex normals are flipped to match velocity	
+		V_TwoSidedLiftDrag, ///Vertex normals are flipped to match velocity and lift and drag forces are applied
+		V_OneSided,			///Vertex normals are taken as it is	
+		F_TwoSided,			///Face normals are flipped to match velocity
+		F_TwoSidedLiftDrag,	///Face normals are flipped to match velocity and lift and drag forces are applied 
+		F_OneSided,			///Face normals are taken as it is		
 		END
 	};};
 
@@ -117,6 +119,7 @@ public:
 		Node,
 		Link,
 		Face,
+		Tetra,
 		END
 	};};
 
@@ -282,6 +285,7 @@ public:
 		Node*					m_node;			// Node pointer
 		btVector3				m_local;		// Anchor position in body space
 		btRigidBody*			m_body;			// Body
+		btScalar				m_influence;
 		btMatrix3x3				m_c0;			// Impulse matrix
 		btVector3				m_c1;			// Relative anchor
 		btScalar				m_c2;			// ima*dt
@@ -752,8 +756,8 @@ public:
 
 	/* Append anchor														*/ 
 	void				appendAnchor(	int node,
-		btRigidBody* body, bool disableCollisionBetweenLinkedBodies=false);
-	void			appendAnchor(int node,btRigidBody* body, const btVector3& localPivot,bool disableCollisionBetweenLinkedBodies=false);
+		btRigidBody* body, bool disableCollisionBetweenLinkedBodies=false,btScalar influence = 1);
+	void			appendAnchor(int node,btRigidBody* body, const btVector3& localPivot,bool disableCollisionBetweenLinkedBodies=false,btScalar influence = 1);
 	/* Append linear joint													*/ 
 	void				appendLinearJoint(const LJoint::Specs& specs,Cluster* body0,Body body1);
 	void				appendLinearJoint(const LJoint::Specs& specs,Body body=Body());
@@ -767,6 +771,12 @@ public:
 	/* Add force (or gravity) to a node of the body							*/ 
 	void				addForce(		const btVector3& force,
 		int node);
+	/* Add aero force to a node of the body */
+	void			    addAeroForceToNode(const btVector3& windVelocity,int nodeIndex);
+
+	/* Add aero force to a face of the body */
+	void			    addAeroForceToFace(const btVector3& windVelocity,int faceIndex);
+
 	/* Add velocity to the entire body										*/ 
 	void				addVelocity(	const btVector3& velocity);
 
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp b/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
index 04ee7ea77cf..d99be3b8138 100644
--- a/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
+++ b/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
@@ -95,7 +95,7 @@ void btSoftBodyTriangleCallback::processTriangle(btVector3* triangle,int partId,
 	ci.m_dispatcher1 = m_dispatcher;
 
 	///debug drawing of the overlapping triangles
-	if (m_dispatchInfoPtr && m_dispatchInfoPtr->m_debugDraw && m_dispatchInfoPtr->m_debugDraw->getDebugMode() &btIDebugDraw::DBG_DrawWireframe)
+	if (m_dispatchInfoPtr && m_dispatchInfoPtr->m_debugDraw && (m_dispatchInfoPtr->m_debugDraw->getDebugMode() &btIDebugDraw::DBG_DrawWireframe))
 	{
 		btVector3 color(1,1,0);
 		btTransform& tr = ob->getWorldTransform();
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h b/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
index f311419d4a8..8a09fff2a37 100644
--- a/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
-#define SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
+#ifndef BT_SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
+#define BT_SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
 
 #include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
 #include "BulletCollision/BroadphaseCollision/btDispatcher.h"
@@ -152,4 +152,4 @@ public:
 
 };
 
-#endif //SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
+#endif //BT_SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp b/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
index 1a271066497..0fb3560e94c 100644
--- a/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
+++ b/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
@@ -19,6 +19,8 @@ subject to the following restrictions:
 #include <string.h>
 #include "btSoftBodyHelpers.h"
 #include "LinearMath/btConvexHull.h"
+#include "LinearMath/btConvexHullComputer.h"
+
 
 //
 static void				drawVertex(	btIDebugDraw* idraw,
@@ -183,6 +185,35 @@ void			btSoftBodyHelpers::Draw(	btSoftBody* psb,
 				{				
 					vertices[j]=psb->m_clusters[i]->m_nodes[j]->m_x;
 				}
+#define USE_NEW_CONVEX_HULL_COMPUTER
+#ifdef USE_NEW_CONVEX_HULL_COMPUTER
+				btConvexHullComputer	computer;
+				int stride = sizeof(btVector3);
+				int count = vertices.size();
+				btScalar shrink=0.f;
+				btScalar shrinkClamp=0.f;
+				computer.compute(&vertices[0].getX(),stride,count,shrink,shrinkClamp);
+				for (int i=0;i<computer.faces.size();i++)
+				{
+
+					int face = computer.faces[i];
+					//printf("face=%d\n",face);
+					const btConvexHullComputer::Edge*  firstEdge = &computer.edges[face];
+					const btConvexHullComputer::Edge*  edge = firstEdge->getNextEdgeOfFace();
+
+					int v0 = firstEdge->getSourceVertex();
+					int v1 = firstEdge->getTargetVertex();
+					while (edge!=firstEdge)
+					{
+						int v2 = edge->getTargetVertex();
+						idraw->drawTriangle(computer.vertices[v0],computer.vertices[v1],computer.vertices[v2],color,1);
+						edge = edge->getNextEdgeOfFace();
+						v0=v1;
+						v1=v2;
+					};
+				}
+#else
+
 				HullDesc		hdsc(QF_TRIANGLES,vertices.size(),&vertices[0]);
 				HullResult		hres;
 				HullLibrary		hlib;
@@ -201,6 +232,8 @@ void			btSoftBodyHelpers::Draw(	btSoftBody* psb,
 						color,1);
 				}
 				hlib.ReleaseResult(hres);
+#endif
+
 			}
 			/* Velocities	*/ 
 #if 0
@@ -296,7 +329,7 @@ void			btSoftBodyHelpers::Draw(	btSoftBody* psb,
 	{
 		const btScalar	scl=(btScalar)0.8;
 		const btScalar	alp=(btScalar)1;
-		const btVector3	col((btScalar)0.7,(btScalar)0.7,(btScalar)0.7);
+		const btVector3	col((btScalar)0.3,(btScalar)0.3,(btScalar)0.7);
 		for(int i=0;i<psb->m_tetras.size();++i)
 		{
 			const btSoftBody::Tetra&	t=psb->m_tetras[i];
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h b/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
index 49b1f0bbce8..620a52fe394 100644
--- a/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
+++ b/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef SOFT_BODY_HELPERS_H
-#define SOFT_BODY_HELPERS_H
+#ifndef BT_SOFT_BODY_HELPERS_H
+#define BT_SOFT_BODY_HELPERS_H
 
 #include "btSoftBody.h"
 
@@ -140,4 +140,4 @@ struct	btSoftBodyHelpers
 	
 };
 
-#endif //SOFT_BODY_HELPERS_H
+#endif //BT_SOFT_BODY_HELPERS_H
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h b/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
index 885571069d0..5ef8db19396 100644
--- a/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
+++ b/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
@@ -70,7 +70,7 @@ public:
 	///getAabb returns the axis aligned bounding box in the coordinate frame of the given transform t.
 	virtual void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const
 	{
-		/* t should be identity, but better be safe than...fast? */ 
+		/* t is usually identity, except when colliding against btCompoundShape. See Issue 512 */
 		const btVector3	mins=m_body->m_bounds[0];
 		const btVector3	maxs=m_body->m_bounds[1];
 		const btVector3	crns[]={t*btVector3(mins.x(),mins.y(),mins.z()),
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodySolvers.h b/extern/bullet2/src/BulletSoftBody/btSoftBodySolvers.h
index 440084c5f7b..2fcd8b67616 100644
--- a/extern/bullet2/src/BulletSoftBody/btSoftBodySolvers.h
+++ b/extern/bullet2/src/BulletSoftBody/btSoftBodySolvers.h
@@ -73,7 +73,7 @@ public:
 	virtual void optimize( btAlignedObjectArray< btSoftBody * > &softBodies , bool forceUpdate=false) = 0;
 
 	/** Copy necessary data back to the original soft body source objects. */
-	virtual void copyBackToSoftBodies() = 0;
+	virtual void copyBackToSoftBodies(bool bMove = true) = 0;
 
 	/** Predict motion of soft bodies into next timestep */
 	virtual void predictMotion( float solverdt ) = 0;
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h b/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
index adc3844e363..7658e3c2252 100644
--- a/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef SOFT_RIGID_COLLISION_ALGORITHM_H
-#define SOFT_RIGID_COLLISION_ALGORITHM_H
+#ifndef BT_SOFT_RIGID_COLLISION_ALGORITHM_H
+#define BT_SOFT_RIGID_COLLISION_ALGORITHM_H
 
 #include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
 #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
@@ -70,6 +70,6 @@ public:
 
 };
 
-#endif //SOFT_RIGID_COLLISION_ALGORITHM_H
+#endif //BT_SOFT_RIGID_COLLISION_ALGORITHM_H
 
 
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp b/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
index 1b9b5e392a1..8f4be231c13 100644
--- a/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
+++ b/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
@@ -165,7 +165,7 @@ void	btSoftRigidDynamicsWorld::debugDrawWorld()
 		for (  i=0;i<this->m_softBodies.size();i++)
 		{
 			btSoftBody*	psb=(btSoftBody*)this->m_softBodies[i];
-			if (getDebugDrawer() && getDebugDrawer()->getDebugMode() & (btIDebugDraw::DBG_DrawWireframe))
+			if (getDebugDrawer() && (getDebugDrawer()->getDebugMode() & (btIDebugDraw::DBG_DrawWireframe)))
 			{
 				btSoftBodyHelpers::DrawFrame(psb,m_debugDrawer);
 				btSoftBodyHelpers::Draw(psb,m_debugDrawer,m_drawFlags);
@@ -300,12 +300,19 @@ void	btSoftRigidDynamicsWorld::rayTestSingle(const btTransform& rayFromTrans,con
 					shapeInfo.m_shapePart = 0;
 					shapeInfo.m_triangleIndex = softResult.index;
 					// get the normal
-					btVector3 normal = softBody->m_faces[softResult.index].m_normal;
 					btVector3 rayDir = rayToTrans.getOrigin() - rayFromTrans.getOrigin();
-					if (normal.dot(rayDir) > 0) {
-						// normal always point toward origin of the ray
-						normal = -normal;
+					btVector3 normal=-rayDir;
+					normal.normalize();
+
+					if (softResult.feature == btSoftBody::eFeature::Face)
+					{
+						normal = softBody->m_faces[softResult.index].m_normal;
+						if (normal.dot(rayDir) > 0) {
+							// normal always point toward origin of the ray
+							normal = -normal;
+						}
 					}
+	
 					btCollisionWorld::LocalRayResult rayResult
 						(collisionObject,
 						 &shapeInfo,
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h b/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
index 7d8d0cb7daa..3e0efafd6c7 100644
--- a/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
+++ b/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
@@ -73,6 +73,10 @@ public:
 		return m_sbi;
 	}
 
+	virtual btDynamicsWorldType	getWorldType() const
+	{
+		return	BT_SOFT_RIGID_DYNAMICS_WORLD;
+	}
 
 	btSoftBodyArray& getSoftBodyArray()
 	{
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h b/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
index 1b34e0af60f..92d683c1dc8 100644
--- a/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef SOFT_SOFT_COLLISION_ALGORITHM_H
-#define SOFT_SOFT_COLLISION_ALGORITHM_H
+#ifndef BT_SOFT_SOFT_COLLISION_ALGORITHM_H
+#define BT_SOFT_SOFT_COLLISION_ALGORITHM_H
 
 #include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
 #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
@@ -64,6 +64,6 @@ public:
 
 };
 
-#endif //SOFT_SOFT_COLLISION_ALGORITHM_H
+#endif //BT_SOFT_SOFT_COLLISION_ALGORITHM_H
 
 
diff --git a/extern/bullet2/src/BulletSoftBody/btSparseSDF.h b/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
index cc4266732ae..90a26cdf7e3 100644
--- a/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
+++ b/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
@@ -14,8 +14,8 @@ subject to the following restrictions:
 */
 ///btSparseSdf implementation by Nathanael Presson
 
-#ifndef _14F9D17F_EAE8_4aba_B41C_292DB2AA70F3_
-#define _14F9D17F_EAE8_4aba_B41C_292DB2AA70F3_
+#ifndef BT_SPARSE_SDF_H
+#define BT_SPARSE_SDF_H
 
 #include "BulletCollision/CollisionDispatch/btCollisionObject.h"
 #include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h"
@@ -303,4 +303,4 @@ struct	btSparseSdf
 };
 
 
-#endif
+#endif //BT_SPARSE_SDF_H
diff --git a/extern/bullet2/src/LinearMath/btAabbUtil2.h b/extern/bullet2/src/LinearMath/btAabbUtil2.h
index 532ce1bf633..42b721dea22 100644
--- a/extern/bullet2/src/LinearMath/btAabbUtil2.h
+++ b/extern/bullet2/src/LinearMath/btAabbUtil2.h
@@ -14,8 +14,8 @@ subject to the following restrictions:
 
 
 
-#ifndef AABB_UTIL2
-#define AABB_UTIL2
+#ifndef BT_AABB_UTIL2
+#define BT_AABB_UTIL2
 
 #include "btTransform.h"
 #include "btVector3.h"
@@ -231,6 +231,6 @@ SIMD_FORCE_INLINE	void btTransformAabb(const btVector3& localAabbMin,const btVec
 	}
 #endif //USE_BANCHLESS
 
-#endif
+#endif //BT_AABB_UTIL2
 
 
diff --git a/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp b/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
index 189b759d237..c4c0ceb2ed2 100644
--- a/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
+++ b/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
@@ -58,16 +58,18 @@ static inline void btAlignedFreeDefault(void *ptr)
 	free(ptr);
 }
 #else
+
+
+
+
+
 static inline void *btAlignedAllocDefault(size_t size, int alignment)
 {
   void *ret;
   char *real;
-  unsigned long offset;
-
   real = (char *)sAllocFunc(size + sizeof(void *) + (alignment-1));
   if (real) {
-    offset = (alignment - (unsigned long)(real + sizeof(void *))) & (alignment-1);
-    ret = (void *)((real + sizeof(void *)) + offset);
+	ret = btAlignPointer(real + sizeof(void *),alignment);
     *((void **)(ret)-1) = (void *)(real);
   } else {
     ret = (void *)(real);
@@ -110,7 +112,6 @@ void*   btAlignedAllocInternal  (size_t size, int alignment,int line,char* filen
 {
  void *ret;
  char *real;
- unsigned long offset;
 
  gTotalBytesAlignedAllocs += size;
  gNumAlignedAllocs++;
@@ -118,9 +119,7 @@ void*   btAlignedAllocInternal  (size_t size, int alignment,int line,char* filen
  
  real = (char *)sAllocFunc(size + 2*sizeof(void *) + (alignment-1));
  if (real) {
-   offset = (alignment - (unsigned long)(real + 2*sizeof(void *))) &
-(alignment-1);
-   ret = (void *)((real + 2*sizeof(void *)) + offset);
+   ret = (void*) btAlignPointer((real + 2*sizeof(void *), alignment);
    *((void **)(ret)-1) = (void *)(real);
        *((int*)(ret)-2) = size;
 
diff --git a/extern/bullet2/src/LinearMath/btAlignedObjectArray.h b/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
index 955bb128e83..36090e13c89 100644
--- a/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
+++ b/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
@@ -28,6 +28,7 @@ subject to the following restrictions:
 
 #define BT_USE_PLACEMENT_NEW 1
 //#define BT_USE_MEMCPY 1 //disable, because it is cumbersome to find out for each platform where memcpy is defined. It can be in <memory.h> or <string.h> or otherwise...
+#define BT_ALLOW_ARRAY_COPY_OPERATOR // enabling this can accidently perform deep copies of data if you are not careful
 
 #ifdef BT_USE_MEMCPY
 #include <memory.h>
@@ -53,7 +54,19 @@ class btAlignedObjectArray
 	//PCK: added this line
 	bool				m_ownsMemory;
 
-	protected:
+#ifdef BT_ALLOW_ARRAY_COPY_OPERATOR
+public:
+	SIMD_FORCE_INLINE btAlignedObjectArray<T>& operator=(const btAlignedObjectArray<T> &other)
+	{
+		copyFromArray(other);
+		return *this;
+	}
+#else//BT_ALLOW_ARRAY_COPY_OPERATOR
+private:
+		SIMD_FORCE_INLINE btAlignedObjectArray<T>& operator=(const btAlignedObjectArray<T> &other);
+#endif//BT_ALLOW_ARRAY_COPY_OPERATOR
+
+protected:
 		SIMD_FORCE_INLINE	int	allocSize(int size)
 		{
 			return (size ? size*2 : 1);
@@ -140,21 +153,29 @@ class btAlignedObjectArray
 		
 		SIMD_FORCE_INLINE const T& at(int n) const
 		{
+			btAssert(n>=0);
+			btAssert(n<size());
 			return m_data[n];
 		}
 
 		SIMD_FORCE_INLINE T& at(int n)
 		{
+			btAssert(n>=0);
+			btAssert(n<size());
 			return m_data[n];
 		}
 
 		SIMD_FORCE_INLINE const T& operator[](int n) const
 		{
+			btAssert(n>=0);
+			btAssert(n<size());
 			return m_data[n];
 		}
 
 		SIMD_FORCE_INLINE T& operator[](int n)
 		{
+			btAssert(n>=0);
+			btAssert(n<size());
 			return m_data[n];
 		}
 		
@@ -171,6 +192,7 @@ class btAlignedObjectArray
 
 		SIMD_FORCE_INLINE	void	pop_back()
 		{
+			btAssert(m_size>0);
 			m_size--;
 			m_data[m_size].~T();
 		}
@@ -291,8 +313,9 @@ class btAlignedObjectArray
 				}
 		};
 	
+
 		template <typename L>
-		void quickSortInternal(L CompareFunc,int lo, int hi)
+		void quickSortInternal(const L& CompareFunc,int lo, int hi)
 		{
 		//  lo is the lower index, hi is the upper index
 		//  of the region of array a that is to be sorted
@@ -322,7 +345,7 @@ class btAlignedObjectArray
 
 
 		template <typename L>
-		void quickSort(L CompareFunc)
+		void quickSort(const L& CompareFunc)
 		{
 			//don't sort 0 or 1 elements
 			if (size()>1)
@@ -334,7 +357,7 @@ class btAlignedObjectArray
 
 		///heap sort from http://www.csse.monash.edu.au/~lloyd/tildeAlgDS/Sort/Heap/
 		template <typename L>
-		void downHeap(T *pArr, int k, int n,L CompareFunc)
+		void downHeap(T *pArr, int k, int n, const L& CompareFunc)
 		{
 			/*  PRE: a[k+1..N] is a heap */
 			/* POST:  a[k..N]  is a heap */
@@ -380,7 +403,7 @@ class btAlignedObjectArray
 		}
 
 	template <typename L>
-	void heapSort(L CompareFunc)
+	void heapSort(const L& CompareFunc)
 	{
 		/* sort a[0..N-1],  N.B. 0 to N-1 */
 		int k;
diff --git a/extern/bullet2/src/LinearMath/btConvexHull.h b/extern/bullet2/src/LinearMath/btConvexHull.h
index a23fa4d550f..69c52bc6f83 100644
--- a/extern/bullet2/src/LinearMath/btConvexHull.h
+++ b/extern/bullet2/src/LinearMath/btConvexHull.h
@@ -16,8 +16,8 @@ subject to the following restrictions:
 
 ///includes modifications/improvements by John Ratcliff, see BringOutYourDead below.
 
-#ifndef CD_HULL_H
-#define CD_HULL_H
+#ifndef BT_CD_HULL_H
+#define BT_CD_HULL_H
 
 #include "btVector3.h"
 #include "btAlignedObjectArray.h"
@@ -237,5 +237,5 @@ private:
 };
 
 
-#endif
+#endif //BT_CD_HULL_H
 
diff --git a/extern/bullet2/src/LinearMath/btConvexHullComputer.cpp b/extern/bullet2/src/LinearMath/btConvexHullComputer.cpp
new file mode 100644
index 00000000000..c03c901c051
--- /dev/null
+++ b/extern/bullet2/src/LinearMath/btConvexHullComputer.cpp
@@ -0,0 +1,2751 @@
+/*
+Copyright (c) 2011 Ole Kniemeyer, MAXON, www.maxon.net
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <string.h>
+
+#include "btConvexHullComputer.h"
+#include "btAlignedObjectArray.h"
+#include "btMinMax.h"
+#include "btVector3.h"
+
+#ifdef __GNUC__
+	#include <stdint.h>
+#elif defined(_MSC_VER)
+	typedef __int32 int32_t;
+	typedef __int64 int64_t;
+	typedef unsigned __int32 uint32_t;
+	typedef unsigned __int64 uint64_t;
+#else
+	typedef int int32_t;
+	typedef long long int int64_t;
+	typedef unsigned int uint32_t;
+	typedef unsigned long long int uint64_t;
+#endif
+
+
+//The definition of USE_X86_64_ASM is moved into the build system. You can enable it manually by commenting out the following lines
+//#if (defined(__GNUC__) && defined(__x86_64__) && !defined(__ICL))  // || (defined(__ICL) && defined(_M_X64))   bug in Intel compiler, disable inline assembly
+//	#define USE_X86_64_ASM
+//#endif
+
+
+//#define DEBUG_CONVEX_HULL
+//#define SHOW_ITERATIONS
+
+#if defined(DEBUG_CONVEX_HULL) || defined(SHOW_ITERATIONS)
+	#include <stdio.h>
+#endif
+
+// Convex hull implementation based on Preparata and Hong
+// Ole Kniemeyer, MAXON Computer GmbH
+class btConvexHullInternal
+{
+	public:
+		
+		class Point64
+		{
+			public:
+				int64_t x;
+				int64_t y;
+				int64_t z;
+				
+				Point64(int64_t x, int64_t y, int64_t z): x(x), y(y), z(z)
+				{
+				}
+
+				bool isZero()
+				{
+					return (x == 0) && (y == 0) && (z == 0);
+				}
+
+				int64_t dot(const Point64& b) const
+				{
+					return x * b.x + y * b.y + z * b.z;
+				}
+		};
+		
+		class Point32
+		{
+			public:
+				int32_t x;
+				int32_t y;
+				int32_t z;
+				int index;
+				
+				Point32()
+				{
+				}
+				
+				Point32(int32_t x, int32_t y, int32_t z): x(x), y(y), z(z), index(-1)
+				{
+				}
+				
+				bool operator==(const Point32& b) const
+				{
+					return (x == b.x) && (y == b.y) && (z == b.z);
+				}
+
+				bool operator!=(const Point32& b) const
+				{
+					return (x != b.x) || (y != b.y) || (z != b.z);
+				}
+
+				bool isZero()
+				{
+					return (x == 0) && (y == 0) && (z == 0);
+				}
+
+				Point64 cross(const Point32& b) const
+				{
+					return Point64(y * b.z - z * b.y, z * b.x - x * b.z, x * b.y - y * b.x);
+				}
+
+				Point64 cross(const Point64& b) const
+				{
+					return Point64(y * b.z - z * b.y, z * b.x - x * b.z, x * b.y - y * b.x);
+				}
+
+				int64_t dot(const Point32& b) const
+				{
+					return x * b.x + y * b.y + z * b.z;
+				}
+
+				int64_t dot(const Point64& b) const
+				{
+					return x * b.x + y * b.y + z * b.z;
+				}
+
+				Point32 operator+(const Point32& b) const
+				{
+					return Point32(x + b.x, y + b.y, z + b.z);
+				}
+
+				Point32 operator-(const Point32& b) const
+				{
+					return Point32(x - b.x, y - b.y, z - b.z);
+				}
+		};
+
+		class Int128
+		{
+			public:
+				uint64_t low;
+				uint64_t high;
+
+				Int128()
+				{
+				}
+
+				Int128(uint64_t low, uint64_t high): low(low), high(high)
+				{
+				}
+
+				Int128(uint64_t low): low(low), high(0)
+				{
+				}
+
+				Int128(int64_t value): low(value), high((value >= 0) ? 0 : (uint64_t) -1LL)
+				{
+				}
+
+				static Int128 mul(int64_t a, int64_t b);
+
+				static Int128 mul(uint64_t a, uint64_t b);
+
+				Int128 operator-() const
+				{
+					return Int128((uint64_t) -(int64_t)low, ~high + (low == 0));
+				}
+
+				Int128 operator+(const Int128& b) const
+				{
+#ifdef USE_X86_64_ASM
+					Int128 result;
+					__asm__ ("addq %[bl], %[rl]\n\t"
+									 "adcq %[bh], %[rh]\n\t"
+									 : [rl] "=r" (result.low), [rh] "=r" (result.high)
+									 : "0"(low), "1"(high), [bl] "g"(b.low), [bh] "g"(b.high)
+									 : "cc" );
+					return result;
+#else
+					uint64_t lo = low + b.low;
+					return Int128(lo, high + b.high + (lo < low));
+#endif
+				}
+
+				Int128 operator-(const Int128& b) const
+				{
+#ifdef USE_X86_64_ASM
+					Int128 result;
+					__asm__ ("subq %[bl], %[rl]\n\t"
+									 "sbbq %[bh], %[rh]\n\t"
+									 : [rl] "=r" (result.low), [rh] "=r" (result.high)
+									 : "0"(low), "1"(high), [bl] "g"(b.low), [bh] "g"(b.high)
+									 : "cc" );
+					return result;
+#else
+					return *this + -b;
+#endif
+				}
+
+				Int128& operator+=(const Int128& b)
+				{
+#ifdef USE_X86_64_ASM
+					__asm__ ("addq %[bl], %[rl]\n\t"
+									 "adcq %[bh], %[rh]\n\t"
+									 : [rl] "=r" (low), [rh] "=r" (high)
+									 : "0"(low), "1"(high), [bl] "g"(b.low), [bh] "g"(b.high)
+									 : "cc" );
+#else
+					uint64_t lo = low + b.low;
+					if (lo < low)
+					{
+						++high;
+					}
+					low = lo;
+					high += b.high;
+#endif
+					return *this;
+				}
+
+				Int128& operator++()
+				{
+					if (++low == 0)
+					{
+						++high;
+					}
+					return *this;
+				}
+
+				Int128 operator*(int64_t b) const;
+
+				btScalar toScalar() const
+				{
+					return ((int64_t) high >= 0) ? btScalar(high) * (btScalar(0x100000000LL) * btScalar(0x100000000LL)) + btScalar(low)
+						: -(-*this).toScalar();
+				}
+
+				int getSign() const
+				{
+					return ((int64_t) high < 0) ? -1 : (high || low) ? 1 : 0;
+				}
+
+				bool operator<(const Int128& b) const
+				{
+					return (high < b.high) || ((high == b.high) && (low < b.low));
+				}
+
+				int ucmp(const Int128&b) const
+				{
+					if (high < b.high)
+					{
+						return -1;
+					}
+					if (high > b.high)
+					{
+						return 1;
+					}
+					if (low < b.low)
+					{
+						return -1;
+					}
+					if (low > b.low)
+					{
+						return 1;
+					}
+					return 0;
+				}
+		};
+
+
+		class Rational64
+		{
+			private:
+				uint64_t m_numerator;
+				uint64_t m_denominator;
+				int sign;
+				
+			public:
+				Rational64(int64_t numerator, int64_t denominator)
+				{
+					if (numerator > 0)
+					{
+						sign = 1;
+						m_numerator = (uint64_t) numerator;
+					}
+					else if (numerator < 0)
+					{
+						sign = -1;
+						m_numerator = (uint64_t) -numerator;
+					}
+					else
+					{
+						sign = 0;
+						m_numerator = 0;
+					}
+					if (denominator > 0)
+					{
+						m_denominator = (uint64_t) denominator;
+					}
+					else if (denominator < 0)
+					{
+						sign = -sign;
+						m_denominator = (uint64_t) -denominator;
+					}
+					else
+					{
+						m_denominator = 0;
+					}
+				}
+				
+				bool isNegativeInfinity() const
+				{
+					return (sign < 0) && (m_denominator == 0);
+				}
+				
+				bool isNaN() const
+				{
+					return (sign == 0) && (m_denominator == 0);
+				}
+				
+				int compare(const Rational64& b) const;
+				
+				btScalar toScalar() const
+				{
+					return sign * ((m_denominator == 0) ? SIMD_INFINITY : (btScalar) m_numerator / m_denominator);
+				}
+		};
+
+
+		class Rational128
+		{
+			private:
+				Int128 numerator;
+				Int128 denominator;
+				int sign;
+				bool isInt64;
+
+			public:
+				Rational128(int64_t value)
+				{
+					if (value > 0)
+					{
+						sign = 1;
+						this->numerator = value;
+					}
+					else if (value < 0)
+					{
+						sign = -1;
+						this->numerator = -value;
+					}
+					else
+					{
+						sign = 0;
+						this->numerator = (uint64_t) 0;
+					}
+					this->denominator = (uint64_t) 1;
+					isInt64 = true;
+				}
+
+				Rational128(const Int128& numerator, const Int128& denominator)
+				{
+					sign = numerator.getSign();
+					if (sign >= 0)
+					{
+						this->numerator = numerator;
+					}
+					else
+					{
+						this->numerator = -numerator;
+					}
+					int dsign = denominator.getSign();
+					if (dsign >= 0)
+					{
+						this->denominator = denominator;
+					}
+					else
+					{
+						sign = -sign;
+						this->denominator = -denominator;
+					}
+					isInt64 = false;
+				}
+
+				int compare(const Rational128& b) const;
+
+				int compare(int64_t b) const;
+
+				btScalar toScalar() const
+				{
+					return sign * ((denominator.getSign() == 0) ? SIMD_INFINITY : numerator.toScalar() / denominator.toScalar());
+				}
+		};
+
+		class PointR128
+		{
+			public:
+				Int128 x;
+				Int128 y;
+				Int128 z;
+				Int128 denominator;
+
+				PointR128()
+				{
+				}
+
+				PointR128(Int128 x, Int128 y, Int128 z, Int128 denominator): x(x), y(y), z(z), denominator(denominator)
+				{
+				}
+
+				btScalar xvalue() const
+				{
+					return x.toScalar() / denominator.toScalar();
+				}
+
+				btScalar yvalue() const
+				{
+					return y.toScalar() / denominator.toScalar();
+				}
+
+				btScalar zvalue() const
+				{
+					return z.toScalar() / denominator.toScalar();
+				}
+		};
+
+
+		class Edge;
+		class Face;
+
+		class Vertex
+		{
+			public:
+				Vertex* next;
+				Vertex* prev;
+				Edge* edges;
+				Face* firstNearbyFace;
+				Face* lastNearbyFace;
+				PointR128 point128;
+				Point32 point;
+				int copy;
+				
+				Vertex(): next(NULL), prev(NULL), edges(NULL), firstNearbyFace(NULL), lastNearbyFace(NULL), copy(-1)
+				{
+				}
+
+#ifdef DEBUG_CONVEX_HULL
+				void print()
+				{
+					printf("V%d (%d, %d, %d)", point.index, point.x, point.y, point.z);
+				}
+
+				void printGraph();
+#endif
+
+				Point32 operator-(const Vertex& b) const
+				{
+					return point - b.point;
+				}
+
+				Rational128 dot(const Point64& b) const
+				{
+					return (point.index >= 0) ? Rational128(point.dot(b))
+						: Rational128(point128.x * b.x + point128.y * b.y + point128.z * b.z, point128.denominator);
+				}
+
+				btScalar xvalue() const
+				{
+					return (point.index >= 0) ? btScalar(point.x) : point128.xvalue();
+				}
+
+				btScalar yvalue() const
+				{
+					return (point.index >= 0) ? btScalar(point.y) : point128.yvalue();
+				}
+
+				btScalar zvalue() const
+				{
+					return (point.index >= 0) ? btScalar(point.z) : point128.zvalue();
+				}
+
+				void receiveNearbyFaces(Vertex* src)
+				{
+					if (lastNearbyFace)
+					{
+						lastNearbyFace->nextWithSameNearbyVertex = src->firstNearbyFace;
+					}
+					else
+					{
+						firstNearbyFace = src->firstNearbyFace;
+					}
+					if (src->lastNearbyFace)
+					{
+						lastNearbyFace = src->lastNearbyFace;
+					}
+					for (Face* f = src->firstNearbyFace; f; f = f->nextWithSameNearbyVertex)
+					{
+						btAssert(f->nearbyVertex == src);
+						f->nearbyVertex = this;
+					}
+					src->firstNearbyFace = NULL;
+					src->lastNearbyFace = NULL;
+				}
+		};
+
+
+		class Edge
+		{
+			public:
+				Edge* next;
+				Edge* prev;
+				Edge* reverse;
+				Vertex* target;
+				Face* face;
+				int copy;
+
+				~Edge()
+				{
+					next = NULL;
+					prev = NULL;
+					reverse = NULL;
+					target = NULL;
+					face = NULL;
+				}
+
+				void link(Edge* n)
+				{
+					btAssert(reverse->target == n->reverse->target);
+					next = n;
+					n->prev = this;
+				}
+
+#ifdef DEBUG_CONVEX_HULL
+				void print()
+				{
+					printf("E%p : %d -> %d,  n=%p p=%p   (0 %d\t%d\t%d) -> (%d %d %d)", this, reverse->target->point.index, target->point.index, next, prev,
+								 reverse->target->point.x, reverse->target->point.y, reverse->target->point.z, target->point.x, target->point.y, target->point.z);
+				}
+#endif
+		};
+
+		class Face
+		{
+			public:
+				Face* next;
+				Vertex* nearbyVertex;
+				Face* nextWithSameNearbyVertex;
+				Point32 origin;
+				Point32 dir0;
+				Point32 dir1;
+
+				Face(): next(NULL), nearbyVertex(NULL), nextWithSameNearbyVertex(NULL)
+				{
+				}
+
+				void init(Vertex* a, Vertex* b, Vertex* c)
+				{
+					nearbyVertex = a;
+					origin = a->point;
+					dir0 = *b - *a;
+					dir1 = *c - *a;
+					if (a->lastNearbyFace)
+					{
+						a->lastNearbyFace->nextWithSameNearbyVertex = this;
+					}
+					else
+					{
+						a->firstNearbyFace = this;
+					}
+					a->lastNearbyFace = this;
+				}
+
+				Point64 getNormal()
+				{
+					return dir0.cross(dir1);
+				}
+		};
+
+		template<typename UWord, typename UHWord> class DMul
+		{
+			private:
+				static uint32_t high(uint64_t value)
+				{
+					return (uint32_t) (value >> 32);
+				}
+				
+				static uint32_t low(uint64_t value)
+				{
+					return (uint32_t) value;
+				}
+				
+				static uint64_t mul(uint32_t a, uint32_t b)
+				{
+					return (uint64_t) a * (uint64_t) b;
+				}
+				
+				static void shlHalf(uint64_t& value)
+				{
+					value <<= 32;
+				}
+				
+				static uint64_t high(Int128 value)
+				{
+					return value.high;
+				}
+				
+				static uint64_t low(Int128 value)
+				{
+					return value.low;
+				}
+				
+				static Int128 mul(uint64_t a, uint64_t b)
+				{
+					return Int128::mul(a, b);
+				}
+				
+				static void shlHalf(Int128& value)
+				{
+					value.high = value.low;
+					value.low = 0;
+				}
+				
+			public:
+				
+				static void mul(UWord a, UWord b, UWord& resLow, UWord& resHigh)
+				{
+					UWord p00 = mul(low(a), low(b));
+					UWord p01 = mul(low(a), high(b));
+					UWord p10 = mul(high(a), low(b));
+					UWord p11 = mul(high(a), high(b));
+					UWord p0110 = UWord(low(p01)) + UWord(low(p10));
+					p11 += high(p01);
+					p11 += high(p10);
+					p11 += high(p0110);
+					shlHalf(p0110);
+					p00 += p0110;
+					if (p00 < p0110)
+					{
+						++p11;
+					}
+					resLow = p00;
+					resHigh = p11;
+				}
+		};
+	
+	private:
+
+		class IntermediateHull
+		{
+			public:
+				Vertex* minXy;
+				Vertex* maxXy;
+				Vertex* minYx;
+				Vertex* maxYx;
+				
+				IntermediateHull(): minXy(NULL), maxXy(NULL), minYx(NULL), maxYx(NULL)
+				{
+				}
+				
+				void print();
+		};
+	
+		enum Orientation {NONE, CLOCKWISE, COUNTER_CLOCKWISE};
+
+		template <typename T> class PoolArray
+		{
+			private:
+				T* array;
+				int size;
+
+			public:
+				PoolArray<T>* next;
+
+				PoolArray(int size): size(size), next(NULL)
+				{
+					array = (T*) btAlignedAlloc(sizeof(T) * size, 16);
+				}
+
+				~PoolArray()
+				{
+					btAlignedFree(array);
+				}
+
+				T* init()
+				{
+					T* o = array;
+					for (int i = 0; i < size; i++, o++)
+					{
+						o->next = (i+1 < size) ? o + 1 : NULL;
+					}
+					return array;
+				}
+		};
+
+		template <typename T> class Pool
+		{
+			private:
+				PoolArray<T>* arrays;
+				PoolArray<T>* nextArray;
+				T* freeObjects;
+				int arraySize;
+
+			public:
+				Pool(): arrays(NULL), nextArray(NULL), freeObjects(NULL), arraySize(256)
+				{
+				}
+
+				~Pool()
+				{
+					while (arrays)
+					{
+						PoolArray<T>* p = arrays;
+						arrays = p->next;
+						p->~PoolArray<T>();
+						btAlignedFree(p);
+					}
+				}
+
+				void reset()
+				{
+					nextArray = arrays;
+					freeObjects = NULL;
+				}
+
+				void setArraySize(int arraySize)
+				{
+					this->arraySize = arraySize;
+				}
+
+				T* newObject()
+				{
+					T* o = freeObjects;
+					if (!o)
+					{
+						PoolArray<T>* p = nextArray;
+						if (p)
+						{
+							nextArray = p->next;
+						}
+						else
+						{
+							p = new(btAlignedAlloc(sizeof(PoolArray<T>), 16)) PoolArray<T>(arraySize);
+							p->next = arrays;
+							arrays = p;
+						}
+						o = p->init();
+					}
+					freeObjects = o->next;
+					return new(o) T();
+				};
+
+				void freeObject(T* object)
+				{
+					object->~T();
+					object->next = freeObjects;
+					freeObjects = object;
+				}
+		};
+
+		btVector3 scaling;
+		btVector3 center;
+		Pool<Vertex> vertexPool;
+		Pool<Edge> edgePool;
+		Pool<Face> facePool;
+		btAlignedObjectArray<Vertex*> originalVertices;
+		int mergeStamp;
+		int minAxis;
+		int medAxis;
+		int maxAxis;
+		int usedEdgePairs;
+		int maxUsedEdgePairs;
+
+		static Orientation getOrientation(const Edge* prev, const Edge* next, const Point32& s, const Point32& t);
+		Edge* findMaxAngle(bool ccw, const Vertex* start, const Point32& s, const Point64& rxs, const Point64& sxrxs, Rational64& minCot);
+		void findEdgeForCoplanarFaces(Vertex* c0, Vertex* c1, Edge*& e0, Edge*& e1, Vertex* stop0, Vertex* stop1);
+
+		Edge* newEdgePair(Vertex* from, Vertex* to);
+
+		void removeEdgePair(Edge* edge)
+		{
+			Edge* n = edge->next;
+			Edge* r = edge->reverse;
+
+			btAssert(edge->target && r->target);
+
+			if (n != edge)
+			{
+				n->prev = edge->prev;
+				edge->prev->next = n;
+				r->target->edges = n;
+			}
+			else
+			{
+				r->target->edges = NULL;
+			}
+			
+			n = r->next;
+			
+			if (n != r)
+			{
+				n->prev = r->prev;
+				r->prev->next = n;
+				edge->target->edges = n;
+			}
+			else
+			{
+				edge->target->edges = NULL;
+			}
+
+			edgePool.freeObject(edge);
+			edgePool.freeObject(r);
+			usedEdgePairs--;
+		}
+		
+		void computeInternal(int start, int end, IntermediateHull& result);
+		
+		bool mergeProjection(IntermediateHull& h0, IntermediateHull& h1, Vertex*& c0, Vertex*& c1);
+		
+		void merge(IntermediateHull& h0, IntermediateHull& h1);
+
+		btVector3 toBtVector(const Point32& v);
+
+		btVector3 getBtNormal(Face* face);
+
+		bool shiftFace(Face* face, btScalar amount, btAlignedObjectArray<Vertex*> stack);
+
+	public:
+		Vertex* vertexList;
+
+		void compute(const void* coords, bool doubleCoords, int stride, int count);
+
+		btVector3 getCoordinates(const Vertex* v);
+
+		btScalar shrink(btScalar amount, btScalar clampAmount);
+};
+
+
+btConvexHullInternal::Int128 btConvexHullInternal::Int128::operator*(int64_t b) const
+{
+	bool negative = (int64_t) high < 0;
+	Int128 a = negative ? -*this : *this;
+	if (b < 0)
+	{
+		negative = !negative;
+		b = -b;
+	}
+	Int128 result = mul(a.low, (uint64_t) b);
+	result.high += a.high * (uint64_t) b;
+	return negative ? -result : result;
+}
+
+btConvexHullInternal::Int128 btConvexHullInternal::Int128::mul(int64_t a, int64_t b)
+{
+	Int128 result;
+	
+#ifdef USE_X86_64_ASM
+	__asm__ ("imulq %[b]"
+					 : "=a" (result.low), "=d" (result.high)
+					 : "0"(a), [b] "r"(b)
+					 : "cc" );
+	return result;
+	
+#else
+	bool negative = a < 0;
+	if (negative)
+	{
+		a = -a;
+	}
+	if (b < 0)
+	{
+		negative = !negative;
+		b = -b;
+	}
+	DMul<uint64_t, uint32_t>::mul((uint64_t) a, (uint64_t) b, result.low, result.high);
+	return negative ? -result : result;
+#endif
+}
+
+btConvexHullInternal::Int128 btConvexHullInternal::Int128::mul(uint64_t a, uint64_t b)
+{
+	Int128 result;
+
+#ifdef USE_X86_64_ASM
+	__asm__ ("mulq %[b]"
+					 : "=a" (result.low), "=d" (result.high)
+					 : "0"(a), [b] "r"(b)
+					 : "cc" );
+
+#else
+	DMul<uint64_t, uint32_t>::mul(a, b, result.low, result.high);
+#endif
+
+	return result;
+}
+
+int btConvexHullInternal::Rational64::compare(const Rational64& b) const
+{
+	if (sign != b.sign)
+	{
+		return sign - b.sign;
+	}
+	else if (sign == 0)
+	{
+		return 0;
+	}
+
+	//	return (numerator * b.denominator > b.numerator * denominator) ? sign : (numerator * b.denominator < b.numerator * denominator) ? -sign : 0;
+
+#ifdef USE_X86_64_ASM
+
+	int result;
+	int64_t tmp;
+	int64_t dummy;
+	__asm__ ("mulq %[bn]\n\t"
+					 "movq %%rax, %[tmp]\n\t"
+					 "movq %%rdx, %%rbx\n\t"
+					 "movq %[tn], %%rax\n\t"
+					 "mulq %[bd]\n\t"
+					 "subq %[tmp], %%rax\n\t"
+					 "sbbq %%rbx, %%rdx\n\t" // rdx:rax contains 128-bit-difference "numerator*b.denominator - b.numerator*denominator"
+					 "setnsb %%bh\n\t" // bh=1 if difference is non-negative, bh=0 otherwise
+					 "orq %%rdx, %%rax\n\t"
+					 "setnzb %%bl\n\t" // bl=1 if difference if non-zero, bl=0 if it is zero
+					 "decb %%bh\n\t" // now bx=0x0000 if difference is zero, 0xff01 if it is negative, 0x0001 if it is positive (i.e., same sign as difference)
+					 "shll $16, %%ebx\n\t" // ebx has same sign as difference
+					 : "=&b"(result), [tmp] "=&r"(tmp), "=a"(dummy)
+					 : "a"(denominator), [bn] "g"(b.numerator), [tn] "g"(numerator), [bd] "g"(b.denominator)
+					 : "%rdx", "cc" );
+	return result ? result ^ sign // if sign is +1, only bit 0 of result is inverted, which does not change the sign of result (and cannot result in zero)
+																// if sign is -1, all bits of result are inverted, which changes the sign of result (and again cannot result in zero)
+								: 0;
+
+#else
+
+	return sign * Int128::mul(m_numerator, b.m_denominator).ucmp(Int128::mul(m_denominator, b.m_numerator));
+
+#endif
+}
+
+int btConvexHullInternal::Rational128::compare(const Rational128& b) const
+{
+	if (sign != b.sign)
+	{
+		return sign - b.sign;
+	}
+	else if (sign == 0)
+	{
+		return 0;
+	}
+	if (isInt64)
+	{
+		return -b.compare(sign * (int64_t) numerator.low);
+	}
+
+	Int128 nbdLow, nbdHigh, dbnLow, dbnHigh;
+	DMul<Int128, uint64_t>::mul(numerator, b.denominator, nbdLow, nbdHigh);
+	DMul<Int128, uint64_t>::mul(denominator, b.numerator, dbnLow, dbnHigh);
+
+	int cmp = nbdHigh.ucmp(dbnHigh);
+	if (cmp)
+	{
+		return cmp * sign;
+	}
+	return nbdLow.ucmp(dbnLow) * sign;
+}
+
+int btConvexHullInternal::Rational128::compare(int64_t b) const
+{
+	if (isInt64)
+	{
+		int64_t a = sign * (int64_t) numerator.low;
+		return (a > b) ? 1 : (a < b) ? -1 : 0;
+	}
+	if (b > 0)
+	{
+		if (sign <= 0)
+		{
+			return -1;
+		}
+	}
+	else if (b < 0)
+	{
+		if (sign >= 0)
+		{
+			return 1;
+		}
+		b = -b;
+	}
+	else
+	{
+		return sign;
+	}
+
+	return numerator.ucmp(denominator * b) * sign;
+}
+
+
+btConvexHullInternal::Edge* btConvexHullInternal::newEdgePair(Vertex* from, Vertex* to)
+{
+	btAssert(from && to);
+	Edge* e = edgePool.newObject();
+	Edge* r = edgePool.newObject();
+	e->reverse = r;
+	r->reverse = e;
+	e->copy = mergeStamp;
+	r->copy = mergeStamp;
+	e->target = to;
+	r->target = from;
+	e->face = NULL;
+	r->face = NULL;
+	usedEdgePairs++;
+	if (usedEdgePairs > maxUsedEdgePairs)
+	{
+		maxUsedEdgePairs = usedEdgePairs;
+	}
+	return e;
+}
+
+bool btConvexHullInternal::mergeProjection(IntermediateHull& h0, IntermediateHull& h1, Vertex*& c0, Vertex*& c1)
+{
+	Vertex* v0 = h0.maxYx;
+	Vertex* v1 = h1.minYx;
+	if ((v0->point.x == v1->point.x) && (v0->point.y == v1->point.y))
+	{
+		btAssert(v0->point.z < v1->point.z);
+		Vertex* v1p = v1->prev;
+		if (v1p == v1)
+		{
+			c0 = v0;
+			if (v1->edges)
+			{
+				btAssert(v1->edges->next == v1->edges);
+				v1 = v1->edges->target;
+				btAssert(v1->edges->next == v1->edges);
+			}
+			c1 = v1;
+			return false;
+		}
+		Vertex* v1n = v1->next;
+		v1p->next = v1n;
+		v1n->prev = v1p;
+		if (v1 == h1.minXy)
+		{
+			if ((v1n->point.x < v1p->point.x) || ((v1n->point.x == v1p->point.x) && (v1n->point.y < v1p->point.y)))
+			{
+				h1.minXy = v1n;
+			}
+			else
+			{
+				h1.minXy = v1p;
+			}
+		}
+		if (v1 == h1.maxXy)
+		{
+			if ((v1n->point.x > v1p->point.x) || ((v1n->point.x == v1p->point.x) && (v1n->point.y > v1p->point.y)))
+			{
+				h1.maxXy = v1n;
+			}
+			else
+			{
+				h1.maxXy = v1p;
+			}
+		}
+	}
+	
+	v0 = h0.maxXy;
+	v1 = h1.maxXy;
+	Vertex* v00 = NULL;
+	Vertex* v10 = NULL;
+	int32_t sign = 1;
+
+	for (int side = 0; side <= 1; side++)
+	{		
+		int32_t dx = (v1->point.x - v0->point.x) * sign;
+		if (dx > 0)
+		{
+			while (true)
+			{
+				int32_t dy = v1->point.y - v0->point.y;
+
+				Vertex* w0 = side ? v0->next : v0->prev;
+				if (w0 != v0)
+				{
+					int32_t dx0 = (w0->point.x - v0->point.x) * sign;
+					int32_t dy0 = w0->point.y - v0->point.y;
+					if ((dy0 <= 0) && ((dx0 == 0) || ((dx0 < 0) && (dy0 * dx <= dy * dx0))))
+					{
+						v0 = w0;
+						dx = (v1->point.x - v0->point.x) * sign;
+						continue;
+					}
+				}
+
+				Vertex* w1 = side ? v1->next : v1->prev;
+				if (w1 != v1)
+				{
+					int32_t dx1 = (w1->point.x - v1->point.x) * sign;
+					int32_t dy1 = w1->point.y - v1->point.y;
+					int32_t dxn = (w1->point.x - v0->point.x) * sign;
+					if ((dxn > 0) && (dy1 < 0) && ((dx1 == 0) || ((dx1 < 0) && (dy1 * dx < dy * dx1))))
+					{
+						v1 = w1;
+						dx = dxn;
+						continue;
+					}
+				}
+
+				break;
+			}
+		}
+		else if (dx < 0)
+		{
+			while (true)
+			{
+				int32_t dy = v1->point.y - v0->point.y;
+				
+				Vertex* w1 = side ? v1->prev : v1->next;
+				if (w1 != v1)
+				{
+					int32_t dx1 = (w1->point.x - v1->point.x) * sign;
+					int32_t dy1 = w1->point.y - v1->point.y;
+					if ((dy1 >= 0) && ((dx1 == 0) || ((dx1 < 0) && (dy1 * dx <= dy * dx1))))
+					{
+						v1 = w1;
+						dx = (v1->point.x - v0->point.x) * sign;
+						continue;
+					}
+				}
+				
+				Vertex* w0 = side ? v0->prev : v0->next;
+				if (w0 != v0)
+				{
+					int32_t dx0 = (w0->point.x - v0->point.x) * sign;
+					int32_t dy0 = w0->point.y - v0->point.y;
+					int32_t dxn = (v1->point.x - w0->point.x) * sign;
+					if ((dxn < 0) && (dy0 > 0) && ((dx0 == 0) || ((dx0 < 0) && (dy0 * dx < dy * dx0))))
+					{
+						v0 = w0;
+						dx = dxn;
+						continue;
+					}
+				}
+				
+				break;
+			}
+		}
+		else
+		{
+			int32_t x = v0->point.x;
+			int32_t y0 = v0->point.y;
+			Vertex* w0 = v0;
+			Vertex* t;
+			while (((t = side ? w0->next : w0->prev) != v0) && (t->point.x == x) && (t->point.y <= y0))
+			{
+				w0 = t;
+				y0 = t->point.y;
+			}
+			v0 = w0;
+
+			int32_t y1 = v1->point.y;
+			Vertex* w1 = v1;
+			while (((t = side ? w1->prev : w1->next) != v1) && (t->point.x == x) && (t->point.y >= y1))
+			{
+				w1 = t;
+				y1 = t->point.y;
+			}
+			v1 = w1;
+		}
+		
+		if (side == 0)
+		{
+			v00 = v0;
+			v10 = v1;
+
+			v0 = h0.minXy;
+			v1 = h1.minXy;
+			sign = -1;
+		}
+	}
+
+	v0->prev = v1;
+	v1->next = v0;
+
+	v00->next = v10;
+	v10->prev = v00;
+
+	if (h1.minXy->point.x < h0.minXy->point.x)
+	{
+		h0.minXy = h1.minXy;
+	}
+	if (h1.maxXy->point.x >= h0.maxXy->point.x)
+	{
+		h0.maxXy = h1.maxXy;
+	}
+	
+	h0.maxYx = h1.maxYx;
+
+	c0 = v00;
+	c1 = v10;
+
+	return true;
+}
+
+void btConvexHullInternal::computeInternal(int start, int end, IntermediateHull& result)
+{
+	int n = end - start;
+	switch (n)
+	{
+		case 0:
+			result.minXy = NULL;
+			result.maxXy = NULL;
+			result.minYx = NULL;
+			result.maxYx = NULL;
+			return;
+		case 2:
+		{
+			Vertex* v = originalVertices[start];
+			Vertex* w = v + 1;
+			if (v->point != w->point)
+			{
+				int32_t dx = v->point.x - w->point.x;
+				int32_t dy = v->point.y - w->point.y;
+
+				if ((dx == 0) && (dy == 0))
+				{
+					if (v->point.z > w->point.z)
+					{
+						Vertex* t = w;
+						w = v;
+						v = t;
+					}
+					btAssert(v->point.z < w->point.z);
+					v->next = v;
+					v->prev = v;
+					result.minXy = v;
+					result.maxXy = v;
+					result.minYx = v;
+					result.maxYx = v;
+				}
+				else
+				{
+					v->next = w;
+					v->prev = w;
+					w->next = v;
+					w->prev = v;
+
+					if ((dx < 0) || ((dx == 0) && (dy < 0)))
+					{
+						result.minXy = v;
+						result.maxXy = w;
+					}
+					else
+					{
+						result.minXy = w;
+						result.maxXy = v;
+					}
+
+					if ((dy < 0) || ((dy == 0) && (dx < 0)))
+					{
+						result.minYx = v;
+						result.maxYx = w;
+					}
+					else
+					{
+						result.minYx = w;
+						result.maxYx = v;
+					}
+				}
+
+				Edge* e = newEdgePair(v, w);
+				e->link(e);
+				v->edges = e;
+
+				e = e->reverse;
+				e->link(e);
+				w->edges = e;
+
+				return;
+			}
+		}
+		// lint -fallthrough
+		case 1:
+		{
+			Vertex* v = originalVertices[start];
+			v->edges = NULL;
+			v->next = v;
+			v->prev = v;
+
+			result.minXy = v;
+			result.maxXy = v;
+			result.minYx = v;
+			result.maxYx = v;
+
+			return;
+		}
+	}
+
+	int split0 = start + n / 2;
+	Point32 p = originalVertices[split0-1]->point;
+	int split1 = split0;
+	while ((split1 < end) && (originalVertices[split1]->point == p))
+	{
+		split1++;
+	}
+	computeInternal(start, split0, result);
+	IntermediateHull hull1;
+	computeInternal(split1, end, hull1);
+#ifdef DEBUG_CONVEX_HULL
+	printf("\n\nMerge\n");
+	result.print();
+	hull1.print();
+#endif
+	merge(result, hull1);
+#ifdef DEBUG_CONVEX_HULL
+	printf("\n  Result\n");
+	result.print();
+#endif
+}
+
+#ifdef DEBUG_CONVEX_HULL
+void btConvexHullInternal::IntermediateHull::print()
+{
+	printf("    Hull\n");
+	for (Vertex* v = minXy; v; )
+	{
+		printf("      ");
+		v->print();
+		if (v == maxXy)
+		{
+			printf(" maxXy");
+		}
+		if (v == minYx)
+		{
+			printf(" minYx");
+		}
+		if (v == maxYx)
+		{
+			printf(" maxYx");
+		}
+		if (v->next->prev != v)
+		{
+			printf(" Inconsistency");
+		}
+		printf("\n");
+		v = v->next;
+		if (v == minXy)
+		{
+			break;
+		}
+	}
+	if (minXy)
+	{		
+		minXy->copy = (minXy->copy == -1) ? -2 : -1;
+		minXy->printGraph();
+	}
+}
+
+void btConvexHullInternal::Vertex::printGraph()
+{
+	print();
+	printf("\nEdges\n");
+	Edge* e = edges;
+	if (e)
+	{
+		do
+		{
+			e->print();
+			printf("\n");
+			e = e->next;
+		} while (e != edges);
+		do
+		{
+			Vertex* v = e->target;
+			if (v->copy != copy)
+			{
+				v->copy = copy;
+				v->printGraph();
+			}
+			e = e->next;
+		} while (e != edges);
+	}
+}
+#endif
+
+btConvexHullInternal::Orientation btConvexHullInternal::getOrientation(const Edge* prev, const Edge* next, const Point32& s, const Point32& t)
+{
+	btAssert(prev->reverse->target == next->reverse->target);
+	if (prev->next == next)
+	{
+		if (prev->prev == next)
+		{
+			Point64 n = t.cross(s);
+			Point64 m = (*prev->target - *next->reverse->target).cross(*next->target - *next->reverse->target);
+			btAssert(!m.isZero());
+			int64_t dot = n.dot(m);
+			btAssert(dot != 0);
+			return (dot > 0) ? COUNTER_CLOCKWISE : CLOCKWISE;
+		}
+		return COUNTER_CLOCKWISE;
+	}
+	else if (prev->prev == next)
+	{
+		return CLOCKWISE;
+	}
+	else
+	{
+		return NONE;
+	}
+}
+
+btConvexHullInternal::Edge* btConvexHullInternal::findMaxAngle(bool ccw, const Vertex* start, const Point32& s, const Point64& rxs, const Point64& sxrxs, Rational64& minCot)
+{
+	Edge* minEdge = NULL;
+
+#ifdef DEBUG_CONVEX_HULL
+	printf("find max edge for %d\n", start->point.index);
+#endif
+	Edge* e = start->edges;
+	if (e)
+	{
+		do
+		{
+			if (e->copy > mergeStamp)
+			{
+				Point32 t = *e->target - *start;
+				Rational64 cot(t.dot(sxrxs), t.dot(rxs));
+#ifdef DEBUG_CONVEX_HULL
+				printf("      Angle is %f (%d) for ", (float) btAtan(cot.toScalar()), (int) cot.isNaN());
+				e->print();
+#endif
+				if (cot.isNaN())
+				{
+					btAssert(ccw ? (t.dot(s) < 0) : (t.dot(s) > 0));
+				}
+				else
+				{
+					int cmp;
+					if (minEdge == NULL)
+					{
+						minCot = cot;
+						minEdge = e;
+					}
+					else if ((cmp = cot.compare(minCot)) < 0)
+					{
+						minCot = cot;
+						minEdge = e;
+					}
+					else if ((cmp == 0) && (ccw == (getOrientation(minEdge, e, s, t) == COUNTER_CLOCKWISE)))
+					{
+						minEdge = e;
+					}
+				}
+#ifdef DEBUG_CONVEX_HULL
+				printf("\n");
+#endif
+			}
+			e = e->next;
+		} while (e != start->edges);
+	}
+	return minEdge;
+}
+
+void btConvexHullInternal::findEdgeForCoplanarFaces(Vertex* c0, Vertex* c1, Edge*& e0, Edge*& e1, Vertex* stop0, Vertex* stop1)
+{
+	Edge* start0 = e0;
+	Edge* start1 = e1;
+	Point32 et0 = start0 ? start0->target->point : c0->point;
+	Point32 et1 = start1 ? start1->target->point : c1->point;
+	Point32 s = c1->point - c0->point;
+	Point64 normal = ((start0 ? start0 : start1)->target->point - c0->point).cross(s);
+	int64_t dist = c0->point.dot(normal);
+	btAssert(!start1 || (start1->target->point.dot(normal) == dist));
+	Point64 perp = s.cross(normal);
+	btAssert(!perp.isZero());
+	
+#ifdef DEBUG_CONVEX_HULL
+	printf("   Advancing %d %d  (%p %p, %d %d)\n", c0->point.index, c1->point.index, start0, start1, start0 ? start0->target->point.index : -1, start1 ? start1->target->point.index : -1);
+#endif
+
+	int64_t maxDot0 = et0.dot(perp);
+	if (e0)
+	{
+		while (e0->target != stop0)
+		{
+			Edge* e = e0->reverse->prev;
+			if (e->target->point.dot(normal) < dist)
+			{
+				break;
+			}
+			btAssert(e->target->point.dot(normal) == dist);
+			if (e->copy == mergeStamp)
+			{
+				break;
+			}
+			int64_t dot = e->target->point.dot(perp);
+			if (dot <= maxDot0)
+			{
+				break;
+			}
+			maxDot0 = dot;
+			e0 = e;
+			et0 = e->target->point;
+		}
+	}
+	
+	int64_t maxDot1 = et1.dot(perp);
+	if (e1)
+	{
+		while (e1->target != stop1)
+		{
+			Edge* e = e1->reverse->next;
+			if (e->target->point.dot(normal) < dist)
+			{
+				break;
+			}
+			btAssert(e->target->point.dot(normal) == dist);
+			if (e->copy == mergeStamp)
+			{
+				break;
+			}
+			int64_t dot = e->target->point.dot(perp);
+			if (dot <= maxDot1)
+			{
+				break;
+			}
+			maxDot1 = dot;
+			e1 = e;
+			et1 = e->target->point;
+		}
+	}
+
+#ifdef DEBUG_CONVEX_HULL
+	printf("   Starting at %d %d\n", et0.index, et1.index);
+#endif
+
+	int64_t dx = maxDot1 - maxDot0;
+	if (dx > 0)
+	{
+		while (true)
+		{
+			int64_t dy = (et1 - et0).dot(s);
+			
+			if (e0 && (e0->target != stop0))
+			{
+				Edge* f0 = e0->next->reverse;
+				if (f0->copy > mergeStamp)
+				{
+					int64_t dx0 = (f0->target->point - et0).dot(perp);
+					int64_t dy0 = (f0->target->point - et0).dot(s);
+					if ((dx0 == 0) ? (dy0 < 0) : ((dx0 < 0) && (Rational64(dy0, dx0).compare(Rational64(dy, dx)) >= 0)))
+					{
+						et0 = f0->target->point;
+						dx = (et1 - et0).dot(perp);
+						e0 = (e0 == start0) ? NULL : f0;
+						continue;
+					}
+				}
+			}
+			
+			if (e1 && (e1->target != stop1))
+			{
+				Edge* f1 = e1->reverse->next;
+				if (f1->copy > mergeStamp)
+				{
+					Point32 d1 = f1->target->point - et1;
+					if (d1.dot(normal) == 0)
+					{
+						int64_t dx1 = d1.dot(perp);
+						int64_t dy1 = d1.dot(s);
+						int64_t dxn = (f1->target->point - et0).dot(perp);
+						if ((dxn > 0) && ((dx1 == 0) ? (dy1 < 0) : ((dx1 < 0) && (Rational64(dy1, dx1).compare(Rational64(dy, dx)) > 0))))
+						{
+							e1 = f1;
+							et1 = e1->target->point;
+							dx = dxn;
+							continue;
+						}
+					}
+					else
+					{
+						btAssert((e1 == start1) && (d1.dot(normal) < 0));
+					}
+				}
+			}
+
+			break;
+		}
+	}
+	else if (dx < 0)
+	{
+		while (true)
+		{
+			int64_t dy = (et1 - et0).dot(s);
+			
+			if (e1 && (e1->target != stop1))
+			{
+				Edge* f1 = e1->prev->reverse;
+				if (f1->copy > mergeStamp)
+				{
+					int64_t dx1 = (f1->target->point - et1).dot(perp);
+					int64_t dy1 = (f1->target->point - et1).dot(s);
+					if ((dx1 == 0) ? (dy1 > 0) : ((dx1 < 0) && (Rational64(dy1, dx1).compare(Rational64(dy, dx)) <= 0)))
+					{
+						et1 = f1->target->point;
+						dx = (et1 - et0).dot(perp);
+						e1 = (e1 == start1) ? NULL : f1;
+						continue;
+					}
+				}
+			}
+			
+			if (e0 && (e0->target != stop0))
+			{
+				Edge* f0 = e0->reverse->prev;
+				if (f0->copy > mergeStamp)
+				{
+					Point32 d0 = f0->target->point - et0;
+					if (d0.dot(normal) == 0)
+					{
+						int64_t dx0 = d0.dot(perp);
+						int64_t dy0 = d0.dot(s);
+						int64_t dxn = (et1 - f0->target->point).dot(perp);
+						if ((dxn < 0) && ((dx0 == 0) ? (dy0 > 0) : ((dx0 < 0) && (Rational64(dy0, dx0).compare(Rational64(dy, dx)) < 0))))
+						{
+							e0 = f0;
+							et0 = e0->target->point;
+							dx = dxn;
+							continue;
+						}
+					}
+					else
+					{
+						btAssert((e0 == start0) && (d0.dot(normal) < 0));
+					}
+				}
+			}
+
+			break;
+		}
+	}
+#ifdef DEBUG_CONVEX_HULL
+	printf("   Advanced edges to %d %d\n", et0.index, et1.index);
+#endif
+}
+
+
+void btConvexHullInternal::merge(IntermediateHull& h0, IntermediateHull& h1)
+{
+	if (!h1.maxXy)
+	{
+		return;
+	}
+	if (!h0.maxXy)
+	{
+		h0 = h1;
+		return;
+	}
+	
+	mergeStamp--;
+
+	Vertex* c0 = NULL;
+	Edge* toPrev0 = NULL;
+	Edge* firstNew0 = NULL;
+	Edge* pendingHead0 = NULL;
+	Edge* pendingTail0 = NULL;
+	Vertex* c1 = NULL;
+	Edge* toPrev1 = NULL;
+	Edge* firstNew1 = NULL;
+	Edge* pendingHead1 = NULL;
+	Edge* pendingTail1 = NULL;
+	Point32 prevPoint;
+
+	if (mergeProjection(h0, h1, c0, c1))
+	{
+		Point32 s = *c1 - *c0;
+		Point64 normal = Point32(0, 0, -1).cross(s);
+		Point64 t = s.cross(normal);
+		btAssert(!t.isZero());
+
+		Edge* e = c0->edges;
+		Edge* start0 = NULL;
+		if (e)
+		{
+			do
+			{
+				int64_t dot = (*e->target - *c0).dot(normal);
+				btAssert(dot <= 0);
+				if ((dot == 0) && ((*e->target - *c0).dot(t) > 0))
+				{
+					if (!start0 || (getOrientation(start0, e, s, Point32(0, 0, -1)) == CLOCKWISE))
+					{
+						start0 = e;
+					}
+				}
+				e = e->next;
+			} while (e != c0->edges);
+		}
+		
+		e = c1->edges;
+		Edge* start1 = NULL;
+		if (e)
+		{
+			do
+			{
+				int64_t dot = (*e->target - *c1).dot(normal);
+				btAssert(dot <= 0);
+				if ((dot == 0) && ((*e->target - *c1).dot(t) > 0))
+				{
+					if (!start1 || (getOrientation(start1, e, s, Point32(0, 0, -1)) == COUNTER_CLOCKWISE))
+					{
+						start1 = e;
+					}
+				}
+				e = e->next;
+			} while (e != c1->edges);
+		}
+
+		if (start0 || start1)
+		{
+			findEdgeForCoplanarFaces(c0, c1, start0, start1, NULL, NULL);
+			if (start0)
+			{
+				c0 = start0->target;
+			}
+			if (start1)
+			{
+				c1 = start1->target;
+			}
+		}
+
+		prevPoint = c1->point;
+		prevPoint.z++;
+	}
+	else
+	{
+		prevPoint = c1->point;
+		prevPoint.x++;
+	}
+
+	Vertex* first0 = c0;
+	Vertex* first1 = c1;
+	bool firstRun = true;
+
+	while (true)
+	{
+		Point32 s = *c1 - *c0;
+		Point32 r = prevPoint - c0->point;
+		Point64 rxs = r.cross(s);
+		Point64 sxrxs = s.cross(rxs);
+		
+#ifdef DEBUG_CONVEX_HULL
+		printf("\n  Checking %d %d\n", c0->point.index, c1->point.index);
+#endif
+		Rational64 minCot0(0, 0);
+		Edge* min0 = findMaxAngle(false, c0, s, rxs, sxrxs, minCot0);
+		Rational64 minCot1(0, 0);
+		Edge* min1 = findMaxAngle(true, c1, s, rxs, sxrxs, minCot1);
+		if (!min0 && !min1)
+		{
+			Edge* e = newEdgePair(c0, c1);
+			e->link(e);
+			c0->edges = e;
+
+			e = e->reverse;
+			e->link(e);
+			c1->edges = e;
+			return;
+		}
+		else
+		{
+			int cmp = !min0 ? 1 : !min1 ? -1 : minCot0.compare(minCot1);
+#ifdef DEBUG_CONVEX_HULL
+			printf("    -> Result %d\n", cmp);
+#endif
+			if (firstRun || ((cmp >= 0) ? !minCot1.isNegativeInfinity() : !minCot0.isNegativeInfinity()))
+			{
+				Edge* e = newEdgePair(c0, c1);
+				if (pendingTail0)
+				{
+					pendingTail0->prev = e;
+				}
+				else
+				{
+					pendingHead0 = e;
+				}
+				e->next = pendingTail0;
+				pendingTail0 = e;
+
+				e = e->reverse;
+				if (pendingTail1)
+				{
+					pendingTail1->next = e;
+				}
+				else
+				{
+					pendingHead1 = e;
+				}
+				e->prev = pendingTail1;
+				pendingTail1 = e;
+			}
+			
+			Edge* e0 = min0;
+			Edge* e1 = min1;
+
+#ifdef DEBUG_CONVEX_HULL
+			printf("   Found min edges to %d %d\n", e0 ? e0->target->point.index : -1, e1 ? e1->target->point.index : -1);
+#endif
+
+			if (cmp == 0)
+			{
+				findEdgeForCoplanarFaces(c0, c1, e0, e1, NULL, NULL);
+			}
+
+			if ((cmp >= 0) && e1)
+			{
+				if (toPrev1)
+				{
+					for (Edge* e = toPrev1->next, *n = NULL; e != min1; e = n)
+					{
+						n = e->next;
+						removeEdgePair(e);
+					}
+				}
+
+				if (pendingTail1)
+				{
+					if (toPrev1)
+					{
+						toPrev1->link(pendingHead1);
+					}
+					else
+					{
+						min1->prev->link(pendingHead1);
+						firstNew1 = pendingHead1;
+					}
+					pendingTail1->link(min1);
+					pendingHead1 = NULL;
+					pendingTail1 = NULL;
+				}
+				else if (!toPrev1)
+				{
+					firstNew1 = min1;
+				}
+
+				prevPoint = c1->point;
+				c1 = e1->target;
+				toPrev1 = e1->reverse;
+			}
+
+			if ((cmp <= 0) && e0)
+			{
+				if (toPrev0)
+				{
+					for (Edge* e = toPrev0->prev, *n = NULL; e != min0; e = n)
+					{
+						n = e->prev;
+						removeEdgePair(e);
+					}
+				}
+
+				if (pendingTail0)
+				{
+					if (toPrev0)
+					{
+						pendingHead0->link(toPrev0);
+					}
+					else
+					{
+						pendingHead0->link(min0->next);
+						firstNew0 = pendingHead0;
+					}
+					min0->link(pendingTail0);
+					pendingHead0 = NULL;
+					pendingTail0 = NULL;
+				}
+				else if (!toPrev0)
+				{
+					firstNew0 = min0;
+				}
+
+				prevPoint = c0->point;
+				c0 = e0->target;
+				toPrev0 = e0->reverse;
+			}
+		}
+
+		if ((c0 == first0) && (c1 == first1))
+		{
+			if (toPrev0 == NULL)
+			{
+				pendingHead0->link(pendingTail0);
+				c0->edges = pendingTail0;
+			}
+			else
+			{
+				for (Edge* e = toPrev0->prev, *n = NULL; e != firstNew0; e = n)
+				{
+					n = e->prev;
+					removeEdgePair(e);
+				}
+				if (pendingTail0)
+				{
+					pendingHead0->link(toPrev0);
+					firstNew0->link(pendingTail0);
+				}
+			}
+
+			if (toPrev1 == NULL)
+			{
+				pendingTail1->link(pendingHead1);
+				c1->edges = pendingTail1;
+			}
+			else
+			{
+				for (Edge* e = toPrev1->next, *n = NULL; e != firstNew1; e = n)
+				{
+					n = e->next;
+					removeEdgePair(e);
+				}
+				if (pendingTail1)
+				{
+					toPrev1->link(pendingHead1);
+					pendingTail1->link(firstNew1);
+				}
+			}
+			
+			return;
+		}
+
+		firstRun = false;
+	}
+}
+
+
+static bool pointCmp(const btConvexHullInternal::Point32& p, const btConvexHullInternal::Point32& q)
+{
+	return (p.y < q.y) || ((p.y == q.y) && ((p.x < q.x) || ((p.x == q.x) && (p.z < q.z))));
+}
+
+void btConvexHullInternal::compute(const void* coords, bool doubleCoords, int stride, int count)
+{
+	btVector3 min(btScalar(1e30), btScalar(1e30), btScalar(1e30)), max(btScalar(-1e30), btScalar(-1e30), btScalar(-1e30));
+	const char* ptr = (const char*) coords;
+	if (doubleCoords)
+	{
+		for (int i = 0; i < count; i++)
+		{
+			const double* v = (const double*) ptr;
+			btVector3 p((btScalar) v[0], (btScalar) v[1], (btScalar) v[2]);
+			ptr += stride;
+			min.setMin(p);
+			max.setMax(p);
+		}
+	}
+	else
+	{
+		for (int i = 0; i < count; i++)
+		{
+			const float* v = (const float*) ptr;
+			btVector3 p(v[0], v[1], v[2]);
+			ptr += stride;
+			min.setMin(p);
+			max.setMax(p);
+		}
+	}
+
+	btVector3 s = max - min;
+	maxAxis = s.maxAxis();
+	minAxis = s.minAxis();
+	if (minAxis == maxAxis)
+	{
+		minAxis = (maxAxis + 1) % 3;
+	}
+	medAxis = 3 - maxAxis - minAxis;
+
+	s /= btScalar(10216);
+	if (((medAxis + 1) % 3) != maxAxis)
+	{
+		s *= -1;
+	}
+	scaling = s;
+
+	if (s[0] != 0)
+	{
+		s[0] = btScalar(1) / s[0];
+	}
+	if (s[1] != 0)
+	{
+		s[1] = btScalar(1) / s[1];
+	}
+	if (s[2] != 0)
+	{
+		s[2] = btScalar(1) / s[2];
+	}
+
+	center = (min + max) * btScalar(0.5);
+
+	btAlignedObjectArray<Point32> points;
+	points.resize(count);
+	ptr = (const char*) coords;
+	if (doubleCoords)
+	{
+		for (int i = 0; i < count; i++)
+		{
+			const double* v = (const double*) ptr;
+			btVector3 p((btScalar) v[0], (btScalar) v[1], (btScalar) v[2]);
+			ptr += stride;
+			p = (p - center) * s;
+			points[i].x = (int32_t) p[medAxis];
+			points[i].y = (int32_t) p[maxAxis];
+			points[i].z = (int32_t) p[minAxis];
+			points[i].index = i;
+		}
+	}
+	else
+	{
+		for (int i = 0; i < count; i++)
+		{
+			const float* v = (const float*) ptr;
+			btVector3 p(v[0], v[1], v[2]);
+			ptr += stride;
+			p = (p - center) * s;
+			points[i].x = (int32_t) p[medAxis];
+			points[i].y = (int32_t) p[maxAxis];
+			points[i].z = (int32_t) p[minAxis];
+			points[i].index = i;
+		}
+	}
+	points.quickSort(pointCmp);
+
+	vertexPool.reset();
+	vertexPool.setArraySize(count);
+	originalVertices.resize(count);
+	for (int i = 0; i < count; i++)
+	{
+		Vertex* v = vertexPool.newObject();
+		v->edges = NULL;
+		v->point = points[i];
+		v->copy = -1;
+		originalVertices[i] = v;
+	}
+
+	points.clear();
+
+	edgePool.reset();
+	edgePool.setArraySize(6 * count);
+
+	usedEdgePairs = 0;
+	maxUsedEdgePairs = 0;
+
+	mergeStamp = -3;
+
+	IntermediateHull hull;
+	computeInternal(0, count, hull);
+	vertexList = hull.minXy;
+#ifdef DEBUG_CONVEX_HULL
+	printf("max. edges %d (3v = %d)", maxUsedEdgePairs, 3 * count);
+#endif
+}
+
+btVector3 btConvexHullInternal::toBtVector(const Point32& v)
+{
+	btVector3 p;
+	p[medAxis] = btScalar(v.x);
+	p[maxAxis] = btScalar(v.y);
+	p[minAxis] = btScalar(v.z);
+	return p * scaling;
+}
+
+btVector3 btConvexHullInternal::getBtNormal(Face* face)
+{
+	return toBtVector(face->dir0).cross(toBtVector(face->dir1)).normalized();
+}
+
+btVector3 btConvexHullInternal::getCoordinates(const Vertex* v)
+{
+	btVector3 p;
+	p[medAxis] = v->xvalue();
+	p[maxAxis] = v->yvalue();
+	p[minAxis] = v->zvalue();
+	return p * scaling + center;
+}
+
+btScalar btConvexHullInternal::shrink(btScalar amount, btScalar clampAmount)
+{
+	if (!vertexList)
+	{
+		return 0;
+	}
+	int stamp = --mergeStamp;
+	btAlignedObjectArray<Vertex*> stack;
+	vertexList->copy = stamp;
+	stack.push_back(vertexList);
+	btAlignedObjectArray<Face*> faces;
+
+	Point32 ref = vertexList->point;
+	Int128 hullCenterX(0, 0);
+	Int128 hullCenterY(0, 0);
+	Int128 hullCenterZ(0, 0);
+	Int128 volume(0, 0);
+
+	while (stack.size() > 0)
+	{
+		Vertex* v = stack[stack.size() - 1];
+		stack.pop_back();
+		Edge* e = v->edges;
+		if (e)
+		{
+			do
+			{
+				if (e->target->copy != stamp)
+				{
+					e->target->copy = stamp;
+					stack.push_back(e->target);
+				}
+				if (e->copy != stamp)
+				{
+					Face* face = facePool.newObject();
+					face->init(e->target, e->reverse->prev->target, v);
+					faces.push_back(face);
+					Edge* f = e;
+
+					Vertex* a = NULL;
+					Vertex* b = NULL;
+					do
+					{
+						if (a && b)
+						{
+							int64_t vol = (v->point - ref).dot((a->point - ref).cross(b->point - ref));
+							btAssert(vol >= 0);
+							Point32 c = v->point + a->point + b->point + ref;
+							hullCenterX += vol * c.x;
+							hullCenterY += vol * c.y;
+							hullCenterZ += vol * c.z;
+							volume += vol;
+						}
+
+						btAssert(f->copy != stamp);
+						f->copy = stamp;
+						f->face = face;
+
+						a = b;
+						b = f->target;
+
+						f = f->reverse->prev;
+					} while (f != e);
+				}
+				e = e->next;
+			} while (e != v->edges);
+		}
+	}
+
+	if (volume.getSign() <= 0)
+	{
+		return 0;
+	}
+
+	btVector3 hullCenter;
+	hullCenter[medAxis] = hullCenterX.toScalar();
+	hullCenter[maxAxis] = hullCenterY.toScalar();
+	hullCenter[minAxis] = hullCenterZ.toScalar();
+	hullCenter /= 4 * volume.toScalar();
+	hullCenter *= scaling;
+
+	int faceCount = faces.size();
+
+	if (clampAmount > 0)
+	{
+		btScalar minDist = SIMD_INFINITY;
+		for (int i = 0; i < faceCount; i++)
+		{
+			btVector3 normal = getBtNormal(faces[i]);
+			btScalar dist = normal.dot(toBtVector(faces[i]->origin) - hullCenter);
+			if (dist < minDist)
+			{
+				minDist = dist;
+			}
+		}
+		
+		if (minDist <= 0)
+		{
+			return 0;
+		}
+
+		amount = btMin(amount, minDist * clampAmount);
+	}
+
+	unsigned int seed = 243703;
+	for (int i = 0; i < faceCount; i++, seed = 1664525 * seed + 1013904223)
+	{
+		btSwap(faces[i], faces[seed % faceCount]);
+	}
+
+	for (int i = 0; i < faceCount; i++)
+	{
+		if (!shiftFace(faces[i], amount, stack))
+		{
+			return -amount;
+		}
+	}
+
+	return amount;
+}
+
+bool btConvexHullInternal::shiftFace(Face* face, btScalar amount, btAlignedObjectArray<Vertex*> stack)
+{
+	btVector3 origShift = getBtNormal(face) * -amount;
+	if (scaling[0] != 0)
+	{
+		origShift[0] /= scaling[0];
+	}
+	if (scaling[1] != 0)
+	{
+		origShift[1] /= scaling[1];
+	}
+	if (scaling[2] != 0)
+	{
+		origShift[2] /= scaling[2];
+	}
+	Point32 shift((int32_t) origShift[medAxis], (int32_t) origShift[maxAxis], (int32_t) origShift[minAxis]);
+	if (shift.isZero())
+	{
+		return true;
+	}
+	Point64 normal = face->getNormal();
+#ifdef DEBUG_CONVEX_HULL
+	printf("\nShrinking face (%d %d %d) (%d %d %d) (%d %d %d) by (%d %d %d)\n",
+				 face->origin.x, face->origin.y, face->origin.z, face->dir0.x, face->dir0.y, face->dir0.z, face->dir1.x, face->dir1.y, face->dir1.z, shift.x, shift.y, shift.z);
+#endif
+	int64_t origDot = face->origin.dot(normal);
+	Point32 shiftedOrigin = face->origin + shift;
+	int64_t shiftedDot = shiftedOrigin.dot(normal);
+	btAssert(shiftedDot <= origDot);
+	if (shiftedDot >= origDot)
+	{
+		return false;
+	}
+
+	Edge* intersection = NULL;
+
+	Edge* startEdge = face->nearbyVertex->edges;
+#ifdef DEBUG_CONVEX_HULL
+	printf("Start edge is ");
+	startEdge->print();
+	printf(", normal is (%lld %lld %lld), shifted dot is %lld\n", normal.x, normal.y, normal.z, shiftedDot);
+#endif
+	Rational128 optDot = face->nearbyVertex->dot(normal);
+	int cmp = optDot.compare(shiftedDot);
+#ifdef SHOW_ITERATIONS
+	int n = 0;
+#endif
+	if (cmp >= 0)
+	{
+		Edge* e = startEdge;
+		do
+		{
+#ifdef SHOW_ITERATIONS
+			n++;
+#endif
+			Rational128 dot = e->target->dot(normal);
+			btAssert(dot.compare(origDot) <= 0);
+#ifdef DEBUG_CONVEX_HULL
+			printf("Moving downwards, edge is ");
+			e->print();
+			printf(", dot is %f (%f %lld)\n", (float) dot.toScalar(), (float) optDot.toScalar(), shiftedDot);
+#endif
+			if (dot.compare(optDot) < 0)
+			{
+				int c = dot.compare(shiftedDot);
+				optDot = dot;
+				e = e->reverse;
+				startEdge = e;
+				if (c < 0)
+				{
+					intersection = e;
+					break;
+				}
+				cmp = c;
+			}
+			e = e->prev;
+		} while (e != startEdge);
+
+		if (!intersection)
+		{
+			return false;
+		}
+	}
+	else
+	{
+		Edge* e = startEdge;
+		do
+		{
+#ifdef SHOW_ITERATIONS
+			n++;
+#endif
+			Rational128 dot = e->target->dot(normal);
+			btAssert(dot.compare(origDot) <= 0);
+#ifdef DEBUG_CONVEX_HULL
+			printf("Moving upwards, edge is ");
+			e->print();
+			printf(", dot is %f (%f %lld)\n", (float) dot.toScalar(), (float) optDot.toScalar(), shiftedDot);
+#endif
+			if (dot.compare(optDot) > 0)
+			{
+				cmp = dot.compare(shiftedDot);
+				if (cmp >= 0)
+				{
+					intersection = e;
+					break;
+				}
+				optDot = dot;
+				e = e->reverse;
+				startEdge = e;
+			}
+			e = e->prev;
+		} while (e != startEdge);
+		
+		if (!intersection)
+		{
+			return true;
+		}
+	}
+
+#ifdef SHOW_ITERATIONS
+	printf("Needed %d iterations to find initial intersection\n", n);
+#endif
+
+	if (cmp == 0)
+	{
+		Edge* e = intersection->reverse->next;
+#ifdef SHOW_ITERATIONS
+		n = 0;
+#endif
+		while (e->target->dot(normal).compare(shiftedDot) <= 0)
+		{
+#ifdef SHOW_ITERATIONS
+			n++;
+#endif
+			e = e->next;
+			if (e == intersection->reverse)
+			{
+				return true;
+			}
+#ifdef DEBUG_CONVEX_HULL
+			printf("Checking for outwards edge, current edge is ");
+			e->print();
+			printf("\n");
+#endif
+		}
+#ifdef SHOW_ITERATIONS
+		printf("Needed %d iterations to check for complete containment\n", n);
+#endif
+	}
+	
+	Edge* firstIntersection = NULL;
+	Edge* faceEdge = NULL;
+	Edge* firstFaceEdge = NULL;
+
+#ifdef SHOW_ITERATIONS
+	int m = 0;
+#endif
+	while (true)
+	{
+#ifdef SHOW_ITERATIONS
+		m++;
+#endif
+#ifdef DEBUG_CONVEX_HULL
+		printf("Intersecting edge is ");
+		intersection->print();
+		printf("\n");
+#endif
+		if (cmp == 0)
+		{
+			Edge* e = intersection->reverse->next;
+			startEdge = e;
+#ifdef SHOW_ITERATIONS
+			n = 0;
+#endif
+			while (true)
+			{
+#ifdef SHOW_ITERATIONS
+				n++;
+#endif
+				if (e->target->dot(normal).compare(shiftedDot) >= 0)
+				{
+					break;
+				}
+				intersection = e->reverse;
+				e = e->next;
+				if (e == startEdge)
+				{
+					return true;
+				}
+			}
+#ifdef SHOW_ITERATIONS
+			printf("Needed %d iterations to advance intersection\n", n);
+#endif
+		}
+
+#ifdef DEBUG_CONVEX_HULL
+		printf("Advanced intersecting edge to ");
+		intersection->print();
+		printf(", cmp = %d\n", cmp);
+#endif
+
+		if (!firstIntersection)
+		{
+			firstIntersection = intersection;
+		}
+		else if (intersection == firstIntersection)
+		{
+			break;
+		}
+
+		int prevCmp = cmp;
+		Edge* prevIntersection = intersection;
+		Edge* prevFaceEdge = faceEdge;
+
+		Edge* e = intersection->reverse;
+#ifdef SHOW_ITERATIONS
+		n = 0;
+#endif
+		while (true)
+		{
+#ifdef SHOW_ITERATIONS
+			n++;
+#endif
+			e = e->reverse->prev;
+			btAssert(e != intersection->reverse);
+			cmp = e->target->dot(normal).compare(shiftedDot);
+#ifdef DEBUG_CONVEX_HULL
+			printf("Testing edge ");
+			e->print();
+			printf(" -> cmp = %d\n", cmp);
+#endif
+			if (cmp >= 0)
+			{
+				intersection = e;
+				break;
+			}
+		}
+#ifdef SHOW_ITERATIONS
+		printf("Needed %d iterations to find other intersection of face\n", n);
+#endif
+
+		if (cmp > 0)
+		{
+			Vertex* removed = intersection->target;
+			e = intersection->reverse;
+			if (e->prev == e)
+			{
+				removed->edges = NULL;
+			}
+			else
+			{
+				removed->edges = e->prev;
+				e->prev->link(e->next);
+				e->link(e);
+			}
+#ifdef DEBUG_CONVEX_HULL
+			printf("1: Removed part contains (%d %d %d)\n", removed->point.x, removed->point.y, removed->point.z);
+#endif
+			
+			Point64 n0 = intersection->face->getNormal();
+			Point64 n1 = intersection->reverse->face->getNormal();
+			int64_t m00 = face->dir0.dot(n0);
+			int64_t m01 = face->dir1.dot(n0);
+			int64_t m10 = face->dir0.dot(n1);
+			int64_t m11 = face->dir1.dot(n1);
+			int64_t r0 = (intersection->face->origin - shiftedOrigin).dot(n0);
+			int64_t r1 = (intersection->reverse->face->origin - shiftedOrigin).dot(n1);
+			Int128 det = Int128::mul(m00, m11) - Int128::mul(m01, m10);
+			btAssert(det.getSign() != 0);
+			Vertex* v = vertexPool.newObject();
+			v->point.index = -1;
+			v->copy = -1;
+			v->point128 = PointR128(Int128::mul(face->dir0.x * r0, m11) - Int128::mul(face->dir0.x * r1, m01)
+															+ Int128::mul(face->dir1.x * r1, m00) - Int128::mul(face->dir1.x * r0, m10) + det * shiftedOrigin.x,
+															Int128::mul(face->dir0.y * r0, m11) - Int128::mul(face->dir0.y * r1, m01)
+															+ Int128::mul(face->dir1.y * r1, m00) - Int128::mul(face->dir1.y * r0, m10) + det * shiftedOrigin.y,
+															Int128::mul(face->dir0.z * r0, m11) - Int128::mul(face->dir0.z * r1, m01)
+															+ Int128::mul(face->dir1.z * r1, m00) - Int128::mul(face->dir1.z * r0, m10) + det * shiftedOrigin.z,
+															det);
+			v->point.x = (int32_t) v->point128.xvalue();
+			v->point.y = (int32_t) v->point128.yvalue();
+			v->point.z = (int32_t) v->point128.zvalue();
+			intersection->target = v;
+			v->edges = e;
+
+			stack.push_back(v);
+			stack.push_back(removed);
+			stack.push_back(NULL);
+		}
+
+		if (cmp || prevCmp || (prevIntersection->reverse->next->target != intersection->target))
+		{
+			faceEdge = newEdgePair(prevIntersection->target, intersection->target);
+			if (prevCmp == 0)
+			{
+				faceEdge->link(prevIntersection->reverse->next);
+			}
+			if ((prevCmp == 0) || prevFaceEdge)
+			{
+				prevIntersection->reverse->link(faceEdge);
+			}
+			if (cmp == 0)
+			{
+				intersection->reverse->prev->link(faceEdge->reverse);
+			}
+			faceEdge->reverse->link(intersection->reverse);
+		}
+		else
+		{
+			faceEdge = prevIntersection->reverse->next;
+		}
+
+		if (prevFaceEdge)
+		{
+			if (prevCmp > 0)
+			{
+				faceEdge->link(prevFaceEdge->reverse);
+			}
+			else if (faceEdge != prevFaceEdge->reverse)
+			{
+				stack.push_back(prevFaceEdge->target);
+				while (faceEdge->next != prevFaceEdge->reverse)
+				{
+					Vertex* removed = faceEdge->next->target;
+					removeEdgePair(faceEdge->next);
+					stack.push_back(removed);
+#ifdef DEBUG_CONVEX_HULL
+					printf("2: Removed part contains (%d %d %d)\n", removed->point.x, removed->point.y, removed->point.z);
+#endif
+				}
+				stack.push_back(NULL);
+			}
+		}
+		faceEdge->face = face;
+		faceEdge->reverse->face = intersection->face;
+
+		if (!firstFaceEdge)
+		{
+			firstFaceEdge = faceEdge;
+		}
+	}
+#ifdef SHOW_ITERATIONS
+	printf("Needed %d iterations to process all intersections\n", m);
+#endif
+
+	if (cmp > 0)
+	{
+		firstFaceEdge->reverse->target = faceEdge->target;
+		firstIntersection->reverse->link(firstFaceEdge);
+		firstFaceEdge->link(faceEdge->reverse);
+	}
+	else if (firstFaceEdge != faceEdge->reverse)
+	{
+		stack.push_back(faceEdge->target);
+		while (firstFaceEdge->next != faceEdge->reverse)
+		{
+			Vertex* removed = firstFaceEdge->next->target;
+			removeEdgePair(firstFaceEdge->next);
+			stack.push_back(removed);
+#ifdef DEBUG_CONVEX_HULL
+			printf("3: Removed part contains (%d %d %d)\n", removed->point.x, removed->point.y, removed->point.z);
+#endif
+		}
+		stack.push_back(NULL);
+	}
+
+	btAssert(stack.size() > 0);
+	vertexList = stack[0];
+
+#ifdef DEBUG_CONVEX_HULL
+	printf("Removing part\n");
+#endif
+#ifdef SHOW_ITERATIONS
+	n = 0;
+#endif
+	int pos = 0;
+	while (pos < stack.size())
+	{
+		int end = stack.size();
+		while (pos < end)
+		{
+			Vertex* kept = stack[pos++];
+#ifdef DEBUG_CONVEX_HULL
+			kept->print();
+#endif
+			bool deeper = false;
+			Vertex* removed;
+			while ((removed = stack[pos++]) != NULL)
+			{
+#ifdef SHOW_ITERATIONS
+				n++;
+#endif
+				kept->receiveNearbyFaces(removed);
+				while (removed->edges)
+				{
+					if (!deeper)
+					{
+						deeper = true;
+						stack.push_back(kept);
+					}
+					stack.push_back(removed->edges->target);
+					removeEdgePair(removed->edges);
+				}
+			}
+			if (deeper)
+			{
+				stack.push_back(NULL);
+			}
+		}
+	}
+#ifdef SHOW_ITERATIONS
+	printf("Needed %d iterations to remove part\n", n);
+#endif
+
+	stack.resize(0);
+	face->origin = shiftedOrigin;
+
+	return true;
+}
+
+
+static int getVertexCopy(btConvexHullInternal::Vertex* vertex, btAlignedObjectArray<btConvexHullInternal::Vertex*>& vertices)
+{
+	int index = vertex->copy;
+	if (index < 0)
+	{
+		index = vertices.size();
+		vertex->copy = index;
+		vertices.push_back(vertex);
+#ifdef DEBUG_CONVEX_HULL
+		printf("Vertex %d gets index *%d\n", vertex->point.index, index);
+#endif
+	}
+	return index;
+}
+
+btScalar btConvexHullComputer::compute(const void* coords, bool doubleCoords, int stride, int count, btScalar shrink, btScalar shrinkClamp)
+{
+	if (count <= 0)
+	{
+		vertices.clear();
+		edges.clear();
+		faces.clear();
+		return 0;
+	}
+
+	btConvexHullInternal hull;
+	hull.compute(coords, doubleCoords, stride, count);
+
+	btScalar shift = 0;
+	if ((shrink > 0) && ((shift = hull.shrink(shrink, shrinkClamp)) < 0))
+	{
+		vertices.clear();
+		edges.clear();
+		faces.clear();
+		return shift;
+	}
+
+	vertices.resize(0);
+	edges.resize(0);
+	faces.resize(0);
+
+	btAlignedObjectArray<btConvexHullInternal::Vertex*> oldVertices;
+	getVertexCopy(hull.vertexList, oldVertices);
+	int copied = 0;
+	while (copied < oldVertices.size())
+	{
+		btConvexHullInternal::Vertex* v = oldVertices[copied];
+		vertices.push_back(hull.getCoordinates(v));
+		btConvexHullInternal::Edge* firstEdge = v->edges;
+		if (firstEdge)
+		{
+			int firstCopy = -1;
+			int prevCopy = -1;
+			btConvexHullInternal::Edge* e = firstEdge;
+			do
+			{
+				if (e->copy < 0)
+				{
+					int s = edges.size();
+					edges.push_back(Edge());
+					edges.push_back(Edge());
+					Edge* c = &edges[s];
+					Edge* r = &edges[s + 1];
+					e->copy = s;
+					e->reverse->copy = s + 1;
+					c->reverse = 1;
+					r->reverse = -1;
+					c->targetVertex = getVertexCopy(e->target, oldVertices);
+					r->targetVertex = copied;
+#ifdef DEBUG_CONVEX_HULL
+					printf("      CREATE: Vertex *%d has edge to *%d\n", copied, c->getTargetVertex());
+#endif
+				}
+				if (prevCopy >= 0)
+				{
+					edges[e->copy].next = prevCopy - e->copy;
+				}
+				else
+				{
+					firstCopy = e->copy;
+				}
+				prevCopy = e->copy;
+				e = e->next;
+			} while (e != firstEdge);
+			edges[firstCopy].next = prevCopy - firstCopy;
+		}
+		copied++;
+	}
+
+	for (int i = 0; i < copied; i++)
+	{
+		btConvexHullInternal::Vertex* v = oldVertices[i];
+		btConvexHullInternal::Edge* firstEdge = v->edges;
+		if (firstEdge)
+		{
+			btConvexHullInternal::Edge* e = firstEdge;
+			do
+			{
+				if (e->copy >= 0)
+				{
+#ifdef DEBUG_CONVEX_HULL
+					printf("Vertex *%d has edge to *%d\n", i, edges[e->copy].getTargetVertex());
+#endif
+					faces.push_back(e->copy);
+					btConvexHullInternal::Edge* f = e;
+					do
+					{
+#ifdef DEBUG_CONVEX_HULL
+						printf("   Face *%d\n", edges[f->copy].getTargetVertex());
+#endif
+						f->copy = -1;
+						f = f->reverse->prev;
+					} while (f != e);
+				}
+				e = e->next;
+			} while (e != firstEdge);
+		}
+	}
+
+	return shift;
+}
+
+
+
+
+
diff --git a/extern/bullet2/src/LinearMath/btConvexHullComputer.h b/extern/bullet2/src/LinearMath/btConvexHullComputer.h
new file mode 100644
index 00000000000..7240ac4fb52
--- /dev/null
+++ b/extern/bullet2/src/LinearMath/btConvexHullComputer.h
@@ -0,0 +1,103 @@
+/*
+Copyright (c) 2011 Ole Kniemeyer, MAXON, www.maxon.net
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_CONVEX_HULL_COMPUTER_H
+#define BT_CONVEX_HULL_COMPUTER_H
+
+#include "btVector3.h"
+#include "btAlignedObjectArray.h"
+
+/// Convex hull implementation based on Preparata and Hong
+/// See http://code.google.com/p/bullet/issues/detail?id=275
+/// Ole Kniemeyer, MAXON Computer GmbH
+class btConvexHullComputer
+{
+	private:
+		btScalar compute(const void* coords, bool doubleCoords, int stride, int count, btScalar shrink, btScalar shrinkClamp);
+
+	public:
+
+		class Edge
+		{
+			private:
+				int next;
+				int reverse;
+				int targetVertex;
+
+				friend class btConvexHullComputer;
+
+			public:
+				int getSourceVertex() const
+				{
+					return (this + reverse)->targetVertex;
+				}
+
+				int getTargetVertex() const
+				{
+					return targetVertex;
+				}
+
+				const Edge* getNextEdgeOfVertex() const // clockwise list of all edges of a vertex
+				{
+					return this + next;
+				}
+
+				const Edge* getNextEdgeOfFace() const // counter-clockwise list of all edges of a face
+				{
+					return (this + reverse)->getNextEdgeOfVertex();
+				}
+
+				const Edge* getReverseEdge() const
+				{
+					return this + reverse;
+				}
+		};
+
+
+		// Vertices of the output hull
+		btAlignedObjectArray<btVector3> vertices;
+
+		// Edges of the output hull
+		btAlignedObjectArray<Edge> edges;
+
+		// Faces of the convex hull. Each entry is an index into the "edges" array pointing to an edge of the face. Faces are planar n-gons
+		btAlignedObjectArray<int> faces;
+
+		/*
+		Compute convex hull of "count" vertices stored in "coords". "stride" is the difference in bytes
+		between the addresses of consecutive vertices. If "shrink" is positive, the convex hull is shrunken
+		by that amount (each face is moved by "shrink" length units towards the center along its normal).
+		If "shrinkClamp" is positive, "shrink" is clamped to not exceed "shrinkClamp * innerRadius", where "innerRadius"
+		is the minimum distance of a face to the center of the convex hull.
+
+		The returned value is the amount by which the hull has been shrunken. If it is negative, the amount was so large
+		that the resulting convex hull is empty.
+
+		The output convex hull can be found in the member variables "vertices", "edges", "faces".
+		*/
+		btScalar compute(const float* coords, int stride, int count, btScalar shrink, btScalar shrinkClamp)
+		{
+			return compute(coords, false, stride, count, shrink, shrinkClamp);
+		}
+
+		// same as above, but double precision
+		btScalar compute(const double* coords, int stride, int count, btScalar shrink, btScalar shrinkClamp)
+		{
+			return compute(coords, true, stride, count, shrink, shrinkClamp);
+		}
+};
+
+
+#endif //BT_CONVEX_HULL_COMPUTER_H
+
diff --git a/extern/bullet2/src/LinearMath/btDefaultMotionState.h b/extern/bullet2/src/LinearMath/btDefaultMotionState.h
index 7858a10d219..a6b7ef15ac8 100644
--- a/extern/bullet2/src/LinearMath/btDefaultMotionState.h
+++ b/extern/bullet2/src/LinearMath/btDefaultMotionState.h
@@ -1,5 +1,5 @@
-#ifndef DEFAULT_MOTION_STATE_H
-#define DEFAULT_MOTION_STATE_H
+#ifndef BT_DEFAULT_MOTION_STATE_H
+#define BT_DEFAULT_MOTION_STATE_H
 
 #include "btMotionState.h"
 
@@ -37,4 +37,4 @@ struct	btDefaultMotionState : public btMotionState
 
 };
 
-#endif //DEFAULT_MOTION_STATE_H
+#endif //BT_DEFAULT_MOTION_STATE_H
diff --git a/extern/bullet2/src/LinearMath/btGrahamScan2dConvexHull.h b/extern/bullet2/src/LinearMath/btGrahamScan2dConvexHull.h
new file mode 100644
index 00000000000..d7bd3eb8911
--- /dev/null
+++ b/extern/bullet2/src/LinearMath/btGrahamScan2dConvexHull.h
@@ -0,0 +1,110 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2011 Advanced Micro Devices, Inc.  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+
+#ifndef GRAHAM_SCAN_2D_CONVEX_HULL_H
+#define GRAHAM_SCAN_2D_CONVEX_HULL_H
+
+
+#include "btVector3.h"
+#include "btAlignedObjectArray.h"
+
+struct GrahamVector2 : public btVector3
+{
+	GrahamVector2(const btVector3& org, int orgIndex)
+		:btVector3(org),
+			m_orgIndex(orgIndex)
+	{
+	}
+	btScalar	m_angle;
+	int m_orgIndex;
+};
+
+
+struct btAngleCompareFunc {
+	btVector3 m_anchor;
+	btAngleCompareFunc(const btVector3& anchor)
+	: m_anchor(anchor) 
+	{
+	}
+	bool operator()(const GrahamVector2& a, const GrahamVector2& b) const {
+		if (a.m_angle != b.m_angle)
+			return a.m_angle < b.m_angle;
+		else
+		{
+			btScalar al = (a-m_anchor).length2();
+			btScalar bl = (b-m_anchor).length2();
+			if (al != bl)
+				return  al < bl;
+			else
+			{
+				return a.m_orgIndex < b.m_orgIndex;
+			}
+		}
+	}
+};
+
+inline void GrahamScanConvexHull2D(btAlignedObjectArray<GrahamVector2>& originalPoints, btAlignedObjectArray<GrahamVector2>& hull)
+{
+	if (originalPoints.size()<=1)
+	{
+		for (int i=0;i<originalPoints.size();i++)
+			hull.push_back(originalPoints[0]);
+		return;
+	}
+	//step1 : find anchor point with smallest x/y and move it to first location
+	//also precompute angles
+	for (int i=0;i<originalPoints.size();i++)
+	{
+		const btVector3& left = originalPoints[i];
+		const btVector3& right = originalPoints[0];
+		if (left.x() < right.x() || !(right.x() < left.x()) && left.y() < right.y())
+		{
+			originalPoints.swap(0,i);
+		}
+	}
+
+	for (int i=0;i<originalPoints.size();i++)
+	{
+		btVector3 xvec(1,0,0);
+		btVector3 ar = originalPoints[i]-originalPoints[0];
+		originalPoints[i].m_angle = btCross(xvec, ar).dot(btVector3(0,0,1)) / ar.length();
+	}
+
+	//step 2: sort all points, based on 'angle' with this anchor
+	btAngleCompareFunc comp(originalPoints[0]);
+	originalPoints.quickSortInternal(comp,1,originalPoints.size()-1);
+
+	int i;
+	for (i = 0; i<2; i++) 
+		hull.push_back(originalPoints[i]);
+
+	//step 3: keep all 'convex' points and discard concave points (using back tracking)
+	for (; i != originalPoints.size(); i++) 
+	{
+		bool isConvex = false;
+		while (!isConvex&& hull.size()>1) {
+			btVector3& a = hull[hull.size()-2];
+			btVector3& b = hull[hull.size()-1];
+			isConvex = btCross(a-b,a-originalPoints[i]).dot(btVector3(0,0,1))> 0;
+			if (!isConvex)
+				hull.pop_back();
+			else 
+				hull.push_back(originalPoints[i]);
+		}
+	}
+}
+
+#endif //GRAHAM_SCAN_2D_CONVEX_HULL_H
diff --git a/extern/bullet2/src/LinearMath/btHashMap.h b/extern/bullet2/src/LinearMath/btHashMap.h
index e3302b5e9ff..ce07db3ac6b 100644
--- a/extern/bullet2/src/LinearMath/btHashMap.h
+++ b/extern/bullet2/src/LinearMath/btHashMap.h
@@ -1,3 +1,19 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+
 #ifndef BT_HASH_MAP_H
 #define BT_HASH_MAP_H
 
diff --git a/extern/bullet2/src/LinearMath/btIDebugDraw.h b/extern/bullet2/src/LinearMath/btIDebugDraw.h
index 48c15806a7d..935502f844f 100644
--- a/extern/bullet2/src/LinearMath/btIDebugDraw.h
+++ b/extern/bullet2/src/LinearMath/btIDebugDraw.h
@@ -14,8 +14,8 @@ subject to the following restrictions:
 */
 
 
-#ifndef IDEBUG_DRAW__H
-#define IDEBUG_DRAW__H
+#ifndef BT_IDEBUG_DRAW__H
+#define BT_IDEBUG_DRAW__H
 
 #include "btVector3.h"
 #include "btTransform.h"
@@ -46,6 +46,7 @@ class	btIDebugDraw
 		DBG_DrawConstraints = (1 << 11),
 		DBG_DrawConstraintLimits = (1 << 12),
 		DBG_FastWireframe = (1<<13),
+        DBG_DrawNormals = (1<<14),
 		DBG_MAX_DEBUG_DRAW_MODE
 	};
 
@@ -413,5 +414,5 @@ class	btIDebugDraw
 };
 
 
-#endif //IDEBUG_DRAW__H
+#endif //BT_IDEBUG_DRAW__H
 
diff --git a/extern/bullet2/src/LinearMath/btList.h b/extern/bullet2/src/LinearMath/btList.h
index c87b47faf2b..eec80a7064b 100644
--- a/extern/bullet2/src/LinearMath/btList.h
+++ b/extern/bullet2/src/LinearMath/btList.h
@@ -14,8 +14,8 @@ subject to the following restrictions:
 
 
 
-#ifndef GEN_LIST_H
-#define GEN_LIST_H
+#ifndef BT_GEN_LIST_H
+#define BT_GEN_LIST_H
 
 class btGEN_Link {
 public:
@@ -67,7 +67,7 @@ private:
     btGEN_Link m_tail;
 };
 
-#endif
+#endif //BT_GEN_LIST_H
 
 
 
diff --git a/extern/bullet2/src/LinearMath/btMinMax.h b/extern/bullet2/src/LinearMath/btMinMax.h
index 80601c1e232..5b436e9ba4e 100644
--- a/extern/bullet2/src/LinearMath/btMinMax.h
+++ b/extern/bullet2/src/LinearMath/btMinMax.h
@@ -14,10 +14,10 @@ subject to the following restrictions:
 
 
 
-#ifndef GEN_MINMAX_H
-#define GEN_MINMAX_H
+#ifndef BT_GEN_MINMAX_H
+#define BT_GEN_MINMAX_H
 
-#include "LinearMath/btScalar.h"
+#include "btScalar.h"
 
 template <class T>
 SIMD_FORCE_INLINE const T& btMin(const T& a, const T& b) 
@@ -68,4 +68,4 @@ SIMD_FORCE_INLINE void btClamp(T& a, const T& lb, const T& ub)
 	}
 }
 
-#endif
+#endif //BT_GEN_MINMAX_H
diff --git a/extern/bullet2/src/LinearMath/btPoint3.h b/extern/bullet2/src/LinearMath/btPoint3.h
deleted file mode 100644
index a2020e26d12..00000000000
--- a/extern/bullet2/src/LinearMath/btPoint3.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-
-
-#ifndef btPoint3_H
-#define btPoint3_H
-
-#include "btVector3.h"
-
-typedef btVector3 btPoint3;
-
-#endif
diff --git a/extern/bullet2/src/LinearMath/btPoolAllocator.h b/extern/bullet2/src/LinearMath/btPoolAllocator.h
index e3b4be9b155..ef2084537a2 100644
--- a/extern/bullet2/src/LinearMath/btPoolAllocator.h
+++ b/extern/bullet2/src/LinearMath/btPoolAllocator.h
@@ -62,6 +62,11 @@ public:
 		return m_maxElements - m_freeCount;
 	}
 
+	int getMaxCount() const
+	{
+		return m_maxElements;
+	}
+
 	void*	allocate(int size)
 	{
 		// release mode fix
diff --git a/extern/bullet2/src/LinearMath/btQuadWord.h b/extern/bullet2/src/LinearMath/btQuadWord.h
index c657afd2bb1..d5e9daa45a2 100644
--- a/extern/bullet2/src/LinearMath/btQuadWord.h
+++ b/extern/bullet2/src/LinearMath/btQuadWord.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 */
 
 
-#ifndef SIMD_QUADWORD_H
-#define SIMD_QUADWORD_H
+#ifndef BT_SIMD_QUADWORD_H
+#define BT_SIMD_QUADWORD_H
 
 #include "btScalar.h"
 #include "btMinMax.h"
@@ -177,4 +177,4 @@ protected:
 
 };
 
-#endif //SIMD_QUADWORD_H
+#endif //BT_SIMD_QUADWORD_H
diff --git a/extern/bullet2/src/LinearMath/btQuaternion.h b/extern/bullet2/src/LinearMath/btQuaternion.h
index 15cf5f868d9..ee79f6eaeee 100644
--- a/extern/bullet2/src/LinearMath/btQuaternion.h
+++ b/extern/bullet2/src/LinearMath/btQuaternion.h
@@ -14,8 +14,8 @@ subject to the following restrictions:
 
 
 
-#ifndef SIMD__QUATERNION_H_
-#define SIMD__QUATERNION_H_
+#ifndef BT_SIMD__QUATERNION_H_
+#define BT_SIMD__QUATERNION_H_
 
 
 #include "btVector3.h"
@@ -212,11 +212,12 @@ public:
 	/**@brief Return the axis of the rotation represented by this quaternion */
 	btVector3 getAxis() const
 	{
-		btScalar s_squared = btScalar(1.) - btPow(m_floats[3], btScalar(2.));
+		btScalar s_squared = 1.f-m_floats[3]*m_floats[3];
+		
 		if (s_squared < btScalar(10.) * SIMD_EPSILON) //Check for divide by zero
 			return btVector3(1.0, 0.0, 0.0);  // Arbitrary
-		btScalar s = btSqrt(s_squared);
-		return btVector3(m_floats[0] / s, m_floats[1] / s, m_floats[2] / s);
+		btScalar s = 1.f/btSqrt(s_squared);
+		return btVector3(m_floats[0] * s, m_floats[1] * s, m_floats[2] * s);
 	}
 
 	/**@brief Return the inverse of this quaternion */
@@ -279,23 +280,25 @@ public:
    * Slerp interpolates assuming constant velocity.  */
 	btQuaternion slerp(const btQuaternion& q, const btScalar& t) const
 	{
-		btScalar theta = angle(q);
-		if (theta != btScalar(0.0))
+	  btScalar magnitude = btSqrt(length2() * q.length2()); 
+	  btAssert(magnitude > btScalar(0));
+
+    btScalar product = dot(q) / magnitude;
+    if (btFabs(product) != btScalar(1))
 		{
-			btScalar d = btScalar(1.0) / btSin(theta);
-			btScalar s0 = btSin((btScalar(1.0) - t) * theta);
-			btScalar s1 = btSin(t * theta);   
-                        if (dot(q) < 0) // Take care of long angle case see http://en.wikipedia.org/wiki/Slerp
-                          return btQuaternion((m_floats[0] * s0 + -q.x() * s1) * d,
-                                              (m_floats[1] * s0 + -q.y() * s1) * d,
-                                              (m_floats[2] * s0 + -q.z() * s1) * d,
-                                              (m_floats[3] * s0 + -q.m_floats[3] * s1) * d);
-                        else
-                          return btQuaternion((m_floats[0] * s0 + q.x() * s1) * d,
-                                              (m_floats[1] * s0 + q.y() * s1) * d,
-                                              (m_floats[2] * s0 + q.z() * s1) * d,
-                                              (m_floats[3] * s0 + q.m_floats[3] * s1) * d);
-                        
+      // Take care of long angle case see http://en.wikipedia.org/wiki/Slerp
+      const btScalar sign = (product < 0) ? btScalar(-1) : btScalar(1);
+
+      const btScalar theta = btAcos(sign * product);
+      const btScalar s1 = btSin(sign * t * theta);   
+      const btScalar d = btScalar(1.0) / btSin(theta);
+      const btScalar s0 = btSin((btScalar(1.0) - t) * theta);
+
+      return btQuaternion(
+          (m_floats[0] * s0 + q.x() * s1) * d,
+          (m_floats[1] * s0 + q.y() * s1) * d,
+          (m_floats[2] * s0 + q.z() * s1) * d,
+          (m_floats[3] * s0 + q.m_floats[3] * s1) * d);
 		}
 		else
 		{
@@ -315,12 +318,6 @@ public:
 };
 
 
-/**@brief Return the negative of a quaternion */
-SIMD_FORCE_INLINE btQuaternion
-operator-(const btQuaternion& q)
-{
-	return btQuaternion(-q.x(), -q.y(), -q.z(), -q.w());
-}
 
 
 
@@ -426,7 +423,7 @@ shortestArcQuatNormalize2(btVector3& v0,btVector3& v1)
 	return shortestArcQuat(v0,v1);
 }
 
-#endif
+#endif //BT_SIMD__QUATERNION_H_
 
 
 
diff --git a/extern/bullet2/src/LinearMath/btQuickprof.cpp b/extern/bullet2/src/LinearMath/btQuickprof.cpp
index 14534068a0d..544aee89d02 100644
--- a/extern/bullet2/src/LinearMath/btQuickprof.cpp
+++ b/extern/bullet2/src/LinearMath/btQuickprof.cpp
@@ -276,7 +276,8 @@ CProfileNode::CProfileNode( const char * name, CProfileNode * parent ) :
 	RecursionCounter( 0 ),
 	Parent( parent ),
 	Child( NULL ),
-	Sibling( NULL )
+	Sibling( NULL ),
+	m_userPtr(0)
 {
 	Reset();
 }
diff --git a/extern/bullet2/src/LinearMath/btQuickprof.h b/extern/bullet2/src/LinearMath/btQuickprof.h
index adfbbe6149c..93f3f4a60fa 100644
--- a/extern/bullet2/src/LinearMath/btQuickprof.h
+++ b/extern/bullet2/src/LinearMath/btQuickprof.h
@@ -12,8 +12,8 @@
 
 
 
-#ifndef QUICK_PROF_H
-#define QUICK_PROF_H
+#ifndef BT_QUICK_PROF_H
+#define BT_QUICK_PROF_H
 
 //To disable built-in profiling, please comment out next line
 //#define BT_NO_PROFILE 1
@@ -82,7 +82,8 @@ public:
 	const char *	Get_Name( void )				{ return Name; }
 	int				Get_Total_Calls( void )		{ return TotalCalls; }
 	float				Get_Total_Time( void )		{ return TotalTime; }
-
+	void*			GetUserPointer() const {return m_userPtr;}
+	void			SetUserPointer(void* ptr) { m_userPtr = ptr;}
 protected:
 
 	const char *	Name;
@@ -94,6 +95,7 @@ protected:
 	CProfileNode *	Parent;
 	CProfileNode *	Child;
 	CProfileNode *	Sibling;
+	void*	m_userPtr;
 };
 
 ///An iterator to navigate through the tree
@@ -115,15 +117,20 @@ public:
 	int				Get_Current_Total_Calls( void )	{ return CurrentChild->Get_Total_Calls(); }
 	float				Get_Current_Total_Time( void )	{ return CurrentChild->Get_Total_Time(); }
 
+	void*	Get_Current_UserPointer( void )			{ return CurrentChild->GetUserPointer(); }
+	void	Set_Current_UserPointer(void* ptr) {CurrentChild->SetUserPointer(ptr);}
 	// Access the current parent
 	const char *	Get_Current_Parent_Name( void )			{ return CurrentParent->Get_Name(); }
 	int				Get_Current_Parent_Total_Calls( void )	{ return CurrentParent->Get_Total_Calls(); }
 	float				Get_Current_Parent_Total_Time( void )	{ return CurrentParent->Get_Total_Time(); }
 
+	
+
 protected:
 
 	CProfileNode *	CurrentParent;
 	CProfileNode *	CurrentChild;
+	
 
 	CProfileIterator( CProfileNode * start );
 	friend	class		CProfileManager;
@@ -191,6 +198,6 @@ public:
 
 
 
-#endif //QUICK_PROF_H
+#endif //BT_QUICK_PROF_H
 
 
diff --git a/extern/bullet2/src/LinearMath/btRandom.h b/extern/bullet2/src/LinearMath/btRandom.h
index fdf65e01caf..4cbfc6bfe9f 100644
--- a/extern/bullet2/src/LinearMath/btRandom.h
+++ b/extern/bullet2/src/LinearMath/btRandom.h
@@ -14,8 +14,8 @@ subject to the following restrictions:
 
 
 
-#ifndef GEN_RANDOM_H
-#define GEN_RANDOM_H
+#ifndef BT_GEN_RANDOM_H
+#define BT_GEN_RANDOM_H
 
 #ifdef MT19937
 
@@ -38,5 +38,5 @@ SIMD_FORCE_INLINE unsigned int GEN_rand()                   { return rand(); }
 
 #endif
 
-#endif
+#endif //BT_GEN_RANDOM_H
 
diff --git a/extern/bullet2/src/LinearMath/btScalar.h b/extern/bullet2/src/LinearMath/btScalar.h
index 6ba6c5ad30d..ecae972243c 100644
--- a/extern/bullet2/src/LinearMath/btScalar.h
+++ b/extern/bullet2/src/LinearMath/btScalar.h
@@ -14,8 +14,8 @@ subject to the following restrictions:
 
 
 
-#ifndef SIMD___SCALAR_H
-#define SIMD___SCALAR_H
+#ifndef BT_SCALAR_H
+#define BT_SCALAR_H
 
 #ifdef BT_MANAGED_CODE
 //Aligned data types not supported in managed code
@@ -25,12 +25,10 @@ subject to the following restrictions:
 
 #include <math.h>
 #include <stdlib.h>//size_t for MSVC 6.0
-#include <cstdlib>
-#include <cfloat>
 #include <float.h>
 
-/* SVN $Revision: 35500 $ on $Date: 2011-03-12 21:34:17 +0100 (Sat, 12 Mar 2011) $ from http://bullet.googlecode.com*/
-#define BT_BULLET_VERSION 278
+/* SVN $Revision$ on $Date$ from http://bullet.googlecode.com*/
+#define BT_BULLET_VERSION 280
 
 inline int	btGetVersion()
 {
@@ -521,4 +519,29 @@ struct btTypedObject
 		return m_objectType;
 	}
 };
-#endif //SIMD___SCALAR_H
+
+
+  
+///align a pointer to the provided alignment, upwards
+template <typename T>T* btAlignPointer(T* unalignedPtr, size_t alignment)
+{
+		
+	struct btConvertPointerSizeT
+	{
+		union 
+		{
+				T* ptr;
+				size_t integer;
+		};
+	};
+    btConvertPointerSizeT converter;
+    
+    
+	const size_t bit_mask = ~(alignment - 1);
+    converter.ptr = unalignedPtr;
+	converter.integer += alignment-1;
+	converter.integer &= bit_mask;
+	return converter.ptr;
+}
+
+#endif //BT_SCALAR_H
diff --git a/extern/bullet2/src/LinearMath/btSerializer.cpp b/extern/bullet2/src/LinearMath/btSerializer.cpp
index c6d387e6133..49c25b7ea2a 100644
--- a/extern/bullet2/src/LinearMath/btSerializer.cpp
+++ b/extern/bullet2/src/LinearMath/btSerializer.cpp
@@ -1,5 +1,5 @@
-unsigned char sBulletDNAstr[]= {
-83,68,78,65,78,65,77,69,42,1,0,0,109,95,115,105,122,101,0,109,
+char sBulletDNAstr[]= {
+83,68,78,65,78,65,77,69,44,1,0,0,109,95,115,105,122,101,0,109,
 95,99,97,112,97,99,105,116,121,0,42,109,95,100,97,116,97,0,109,95,
 99,111,108,108,105,115,105,111,110,83,104,97,112,101,115,0,109,95,99,111,
 108,108,105,115,105,111,110,79,98,106,101,99,116,115,0,109,95,99,111,110,
@@ -130,292 +130,297 @@ unsigned char sBulletDNAstr[]= {
 112,108,105,101,100,73,109,112,117,108,115,101,0,109,95,100,98,103,68,114,
 97,119,83,105,122,101,0,109,95,100,105,115,97,98,108,101,67,111,108,108,
 105,115,105,111,110,115,66,101,116,119,101,101,110,76,105,110,107,101,100,66,
-111,100,105,101,115,0,109,95,112,97,100,52,91,52,93,0,109,95,116,121,
-112,101,67,111,110,115,116,114,97,105,110,116,68,97,116,97,0,109,95,112,
-105,118,111,116,73,110,65,0,109,95,112,105,118,111,116,73,110,66,0,109,
-95,114,98,65,70,114,97,109,101,0,109,95,114,98,66,70,114,97,109,101,
-0,109,95,117,115,101,82,101,102,101,114,101,110,99,101,70,114,97,109,101,
-65,0,109,95,97,110,103,117,108,97,114,79,110,108,121,0,109,95,101,110,
-97,98,108,101,65,110,103,117,108,97,114,77,111,116,111,114,0,109,95,109,
-111,116,111,114,84,97,114,103,101,116,86,101,108,111,99,105,116,121,0,109,
-95,109,97,120,77,111,116,111,114,73,109,112,117,108,115,101,0,109,95,108,
-111,119,101,114,76,105,109,105,116,0,109,95,117,112,112,101,114,76,105,109,
-105,116,0,109,95,108,105,109,105,116,83,111,102,116,110,101,115,115,0,109,
-95,98,105,97,115,70,97,99,116,111,114,0,109,95,114,101,108,97,120,97,
-116,105,111,110,70,97,99,116,111,114,0,109,95,115,119,105,110,103,83,112,
-97,110,49,0,109,95,115,119,105,110,103,83,112,97,110,50,0,109,95,116,
-119,105,115,116,83,112,97,110,0,109,95,100,97,109,112,105,110,103,0,109,
-95,108,105,110,101,97,114,85,112,112,101,114,76,105,109,105,116,0,109,95,
-108,105,110,101,97,114,76,111,119,101,114,76,105,109,105,116,0,109,95,97,
-110,103,117,108,97,114,85,112,112,101,114,76,105,109,105,116,0,109,95,97,
-110,103,117,108,97,114,76,111,119,101,114,76,105,109,105,116,0,109,95,117,
-115,101,76,105,110,101,97,114,82,101,102,101,114,101,110,99,101,70,114,97,
-109,101,65,0,109,95,117,115,101,79,102,102,115,101,116,70,111,114,67,111,
-110,115,116,114,97,105,110,116,70,114,97,109,101,0,109,95,54,100,111,102,
-68,97,116,97,0,109,95,115,112,114,105,110,103,69,110,97,98,108,101,100,
-91,54,93,0,109,95,101,113,117,105,108,105,98,114,105,117,109,80,111,105,
-110,116,91,54,93,0,109,95,115,112,114,105,110,103,83,116,105,102,102,110,
-101,115,115,91,54,93,0,109,95,115,112,114,105,110,103,68,97,109,112,105,
-110,103,91,54,93,0,109,95,108,105,110,101,97,114,83,116,105,102,102,110,
-101,115,115,0,109,95,97,110,103,117,108,97,114,83,116,105,102,102,110,101,
-115,115,0,109,95,118,111,108,117,109,101,83,116,105,102,102,110,101,115,115,
-0,42,109,95,109,97,116,101,114,105,97,108,0,109,95,112,111,115,105,116,
-105,111,110,0,109,95,112,114,101,118,105,111,117,115,80,111,115,105,116,105,
-111,110,0,109,95,118,101,108,111,99,105,116,121,0,109,95,97,99,99,117,
-109,117,108,97,116,101,100,70,111,114,99,101,0,109,95,110,111,114,109,97,
-108,0,109,95,97,114,101,97,0,109,95,97,116,116,97,99,104,0,109,95,
-110,111,100,101,73,110,100,105,99,101,115,91,50,93,0,109,95,114,101,115,
-116,76,101,110,103,116,104,0,109,95,98,98,101,110,100,105,110,103,0,109,
-95,110,111,100,101,73,110,100,105,99,101,115,91,51,93,0,109,95,114,101,
-115,116,65,114,101,97,0,109,95,99,48,91,52,93,0,109,95,110,111,100,
-101,73,110,100,105,99,101,115,91,52,93,0,109,95,114,101,115,116,86,111,
-108,117,109,101,0,109,95,99,49,0,109,95,99,50,0,109,95,99,48,0,
-109,95,108,111,99,97,108,70,114,97,109,101,0,42,109,95,114,105,103,105,
-100,66,111,100,121,0,109,95,110,111,100,101,73,110,100,101,120,0,109,95,
-97,101,114,111,77,111,100,101,108,0,109,95,98,97,117,109,103,97,114,116,
-101,0,109,95,100,114,97,103,0,109,95,108,105,102,116,0,109,95,112,114,
-101,115,115,117,114,101,0,109,95,118,111,108,117,109,101,0,109,95,100,121,
-110,97,109,105,99,70,114,105,99,116,105,111,110,0,109,95,112,111,115,101,
-77,97,116,99,104,0,109,95,114,105,103,105,100,67,111,110,116,97,99,116,
-72,97,114,100,110,101,115,115,0,109,95,107,105,110,101,116,105,99,67,111,
-110,116,97,99,116,72,97,114,100,110,101,115,115,0,109,95,115,111,102,116,
-67,111,110,116,97,99,116,72,97,114,100,110,101,115,115,0,109,95,97,110,
-99,104,111,114,72,97,114,100,110,101,115,115,0,109,95,115,111,102,116,82,
-105,103,105,100,67,108,117,115,116,101,114,72,97,114,100,110,101,115,115,0,
-109,95,115,111,102,116,75,105,110,101,116,105,99,67,108,117,115,116,101,114,
-72,97,114,100,110,101,115,115,0,109,95,115,111,102,116,83,111,102,116,67,
-108,117,115,116,101,114,72,97,114,100,110,101,115,115,0,109,95,115,111,102,
-116,82,105,103,105,100,67,108,117,115,116,101,114,73,109,112,117,108,115,101,
-83,112,108,105,116,0,109,95,115,111,102,116,75,105,110,101,116,105,99,67,
-108,117,115,116,101,114,73,109,112,117,108,115,101,83,112,108,105,116,0,109,
-95,115,111,102,116,83,111,102,116,67,108,117,115,116,101,114,73,109,112,117,
-108,115,101,83,112,108,105,116,0,109,95,109,97,120,86,111,108,117,109,101,
-0,109,95,116,105,109,101,83,99,97,108,101,0,109,95,118,101,108,111,99,
-105,116,121,73,116,101,114,97,116,105,111,110,115,0,109,95,112,111,115,105,
-116,105,111,110,73,116,101,114,97,116,105,111,110,115,0,109,95,100,114,105,
-102,116,73,116,101,114,97,116,105,111,110,115,0,109,95,99,108,117,115,116,
-101,114,73,116,101,114,97,116,105,111,110,115,0,109,95,114,111,116,0,109,
-95,115,99,97,108,101,0,109,95,97,113,113,0,109,95,99,111,109,0,42,
-109,95,112,111,115,105,116,105,111,110,115,0,42,109,95,119,101,105,103,104,
-116,115,0,109,95,110,117,109,80,111,115,105,116,105,111,110,115,0,109,95,
-110,117,109,87,101,105,103,116,115,0,109,95,98,118,111,108,117,109,101,0,
-109,95,98,102,114,97,109,101,0,109,95,102,114,97,109,101,120,102,111,114,
-109,0,109,95,108,111,99,105,105,0,109,95,105,110,118,119,105,0,109,95,
-118,105,109,112,117,108,115,101,115,91,50,93,0,109,95,100,105,109,112,117,
-108,115,101,115,91,50,93,0,109,95,108,118,0,109,95,97,118,0,42,109,
-95,102,114,97,109,101,114,101,102,115,0,42,109,95,110,111,100,101,73,110,
-100,105,99,101,115,0,42,109,95,109,97,115,115,101,115,0,109,95,110,117,
-109,70,114,97,109,101,82,101,102,115,0,109,95,110,117,109,78,111,100,101,
-115,0,109,95,110,117,109,77,97,115,115,101,115,0,109,95,105,100,109,97,
-115,115,0,109,95,105,109,97,115,115,0,109,95,110,118,105,109,112,117,108,
-115,101,115,0,109,95,110,100,105,109,112,117,108,115,101,115,0,109,95,110,
-100,97,109,112,105,110,103,0,109,95,108,100,97,109,112,105,110,103,0,109,
-95,97,100,97,109,112,105,110,103,0,109,95,109,97,116,99,104,105,110,103,
-0,109,95,109,97,120,83,101,108,102,67,111,108,108,105,115,105,111,110,73,
-109,112,117,108,115,101,0,109,95,115,101,108,102,67,111,108,108,105,115,105,
-111,110,73,109,112,117,108,115,101,70,97,99,116,111,114,0,109,95,99,111,
-110,116,97,105,110,115,65,110,99,104,111,114,0,109,95,99,111,108,108,105,
-100,101,0,109,95,99,108,117,115,116,101,114,73,110,100,101,120,0,42,109,
-95,98,111,100,121,65,0,42,109,95,98,111,100,121,66,0,109,95,114,101,
-102,115,91,50,93,0,109,95,99,102,109,0,109,95,101,114,112,0,109,95,
-115,112,108,105,116,0,109,95,100,101,108,101,116,101,0,109,95,114,101,108,
-80,111,115,105,116,105,111,110,91,50,93,0,109,95,98,111,100,121,65,116,
-121,112,101,0,109,95,98,111,100,121,66,116,121,112,101,0,109,95,106,111,
-105,110,116,84,121,112,101,0,42,109,95,112,111,115,101,0,42,42,109,95,
-109,97,116,101,114,105,97,108,115,0,42,109,95,110,111,100,101,115,0,42,
-109,95,108,105,110,107,115,0,42,109,95,102,97,99,101,115,0,42,109,95,
-116,101,116,114,97,104,101,100,114,97,0,42,109,95,97,110,99,104,111,114,
-115,0,42,109,95,99,108,117,115,116,101,114,115,0,42,109,95,106,111,105,
-110,116,115,0,109,95,110,117,109,77,97,116,101,114,105,97,108,115,0,109,
-95,110,117,109,76,105,110,107,115,0,109,95,110,117,109,70,97,99,101,115,
-0,109,95,110,117,109,84,101,116,114,97,104,101,100,114,97,0,109,95,110,
-117,109,65,110,99,104,111,114,115,0,109,95,110,117,109,67,108,117,115,116,
-101,114,115,0,109,95,110,117,109,74,111,105,110,116,115,0,109,95,99,111,
-110,102,105,103,0,0,0,0,84,89,80,69,72,0,0,0,99,104,97,114,
-0,117,99,104,97,114,0,115,104,111,114,116,0,117,115,104,111,114,116,0,
-105,110,116,0,108,111,110,103,0,117,108,111,110,103,0,102,108,111,97,116,
-0,100,111,117,98,108,101,0,118,111,105,100,0,80,111,105,110,116,101,114,
-65,114,114,97,121,0,98,116,80,104,121,115,105,99,115,83,121,115,116,101,
-109,0,76,105,115,116,66,97,115,101,0,98,116,86,101,99,116,111,114,51,
-70,108,111,97,116,68,97,116,97,0,98,116,86,101,99,116,111,114,51,68,
-111,117,98,108,101,68,97,116,97,0,98,116,77,97,116,114,105,120,51,120,
-51,70,108,111,97,116,68,97,116,97,0,98,116,77,97,116,114,105,120,51,
-120,51,68,111,117,98,108,101,68,97,116,97,0,98,116,84,114,97,110,115,
-102,111,114,109,70,108,111,97,116,68,97,116,97,0,98,116,84,114,97,110,
-115,102,111,114,109,68,111,117,98,108,101,68,97,116,97,0,98,116,66,118,
-104,83,117,98,116,114,101,101,73,110,102,111,68,97,116,97,0,98,116,79,
-112,116,105,109,105,122,101,100,66,118,104,78,111,100,101,70,108,111,97,116,
-68,97,116,97,0,98,116,79,112,116,105,109,105,122,101,100,66,118,104,78,
-111,100,101,68,111,117,98,108,101,68,97,116,97,0,98,116,81,117,97,110,
-116,105,122,101,100,66,118,104,78,111,100,101,68,97,116,97,0,98,116,81,
-117,97,110,116,105,122,101,100,66,118,104,70,108,111,97,116,68,97,116,97,
-0,98,116,81,117,97,110,116,105,122,101,100,66,118,104,68,111,117,98,108,
-101,68,97,116,97,0,98,116,67,111,108,108,105,115,105,111,110,83,104,97,
-112,101,68,97,116,97,0,98,116,83,116,97,116,105,99,80,108,97,110,101,
-83,104,97,112,101,68,97,116,97,0,98,116,67,111,110,118,101,120,73,110,
-116,101,114,110,97,108,83,104,97,112,101,68,97,116,97,0,98,116,80,111,
-115,105,116,105,111,110,65,110,100,82,97,100,105,117,115,0,98,116,77,117,
-108,116,105,83,112,104,101,114,101,83,104,97,112,101,68,97,116,97,0,98,
-116,73,110,116,73,110,100,101,120,68,97,116,97,0,98,116,83,104,111,114,
-116,73,110,116,73,110,100,101,120,68,97,116,97,0,98,116,83,104,111,114,
-116,73,110,116,73,110,100,101,120,84,114,105,112,108,101,116,68,97,116,97,
-0,98,116,67,104,97,114,73,110,100,101,120,84,114,105,112,108,101,116,68,
-97,116,97,0,98,116,77,101,115,104,80,97,114,116,68,97,116,97,0,98,
-116,83,116,114,105,100,105,110,103,77,101,115,104,73,110,116,101,114,102,97,
-99,101,68,97,116,97,0,98,116,84,114,105,97,110,103,108,101,77,101,115,
-104,83,104,97,112,101,68,97,116,97,0,98,116,84,114,105,97,110,103,108,
-101,73,110,102,111,77,97,112,68,97,116,97,0,98,116,83,99,97,108,101,
-100,84,114,105,97,110,103,108,101,77,101,115,104,83,104,97,112,101,68,97,
-116,97,0,98,116,67,111,109,112,111,117,110,100,83,104,97,112,101,67,104,
-105,108,100,68,97,116,97,0,98,116,67,111,109,112,111,117,110,100,83,104,
-97,112,101,68,97,116,97,0,98,116,67,121,108,105,110,100,101,114,83,104,
-97,112,101,68,97,116,97,0,98,116,67,97,112,115,117,108,101,83,104,97,
+111,100,105,101,115,0,109,95,111,118,101,114,114,105,100,101,78,117,109,83,
+111,108,118,101,114,73,116,101,114,97,116,105,111,110,115,0,109,95,98,114,
+101,97,107,105,110,103,73,109,112,117,108,115,101,84,104,114,101,115,104,111,
+108,100,0,109,95,105,115,69,110,97,98,108,101,100,0,109,95,116,121,112,
+101,67,111,110,115,116,114,97,105,110,116,68,97,116,97,0,109,95,112,105,
+118,111,116,73,110,65,0,109,95,112,105,118,111,116,73,110,66,0,109,95,
+114,98,65,70,114,97,109,101,0,109,95,114,98,66,70,114,97,109,101,0,
+109,95,117,115,101,82,101,102,101,114,101,110,99,101,70,114,97,109,101,65,
+0,109,95,97,110,103,117,108,97,114,79,110,108,121,0,109,95,101,110,97,
+98,108,101,65,110,103,117,108,97,114,77,111,116,111,114,0,109,95,109,111,
+116,111,114,84,97,114,103,101,116,86,101,108,111,99,105,116,121,0,109,95,
+109,97,120,77,111,116,111,114,73,109,112,117,108,115,101,0,109,95,108,111,
+119,101,114,76,105,109,105,116,0,109,95,117,112,112,101,114,76,105,109,105,
+116,0,109,95,108,105,109,105,116,83,111,102,116,110,101,115,115,0,109,95,
+98,105,97,115,70,97,99,116,111,114,0,109,95,114,101,108,97,120,97,116,
+105,111,110,70,97,99,116,111,114,0,109,95,115,119,105,110,103,83,112,97,
+110,49,0,109,95,115,119,105,110,103,83,112,97,110,50,0,109,95,116,119,
+105,115,116,83,112,97,110,0,109,95,100,97,109,112,105,110,103,0,109,95,
+108,105,110,101,97,114,85,112,112,101,114,76,105,109,105,116,0,109,95,108,
+105,110,101,97,114,76,111,119,101,114,76,105,109,105,116,0,109,95,97,110,
+103,117,108,97,114,85,112,112,101,114,76,105,109,105,116,0,109,95,97,110,
+103,117,108,97,114,76,111,119,101,114,76,105,109,105,116,0,109,95,117,115,
+101,76,105,110,101,97,114,82,101,102,101,114,101,110,99,101,70,114,97,109,
+101,65,0,109,95,117,115,101,79,102,102,115,101,116,70,111,114,67,111,110,
+115,116,114,97,105,110,116,70,114,97,109,101,0,109,95,54,100,111,102,68,
+97,116,97,0,109,95,115,112,114,105,110,103,69,110,97,98,108,101,100,91,
+54,93,0,109,95,101,113,117,105,108,105,98,114,105,117,109,80,111,105,110,
+116,91,54,93,0,109,95,115,112,114,105,110,103,83,116,105,102,102,110,101,
+115,115,91,54,93,0,109,95,115,112,114,105,110,103,68,97,109,112,105,110,
+103,91,54,93,0,109,95,108,105,110,101,97,114,83,116,105,102,102,110,101,
+115,115,0,109,95,97,110,103,117,108,97,114,83,116,105,102,102,110,101,115,
+115,0,109,95,118,111,108,117,109,101,83,116,105,102,102,110,101,115,115,0,
+42,109,95,109,97,116,101,114,105,97,108,0,109,95,112,111,115,105,116,105,
+111,110,0,109,95,112,114,101,118,105,111,117,115,80,111,115,105,116,105,111,
+110,0,109,95,118,101,108,111,99,105,116,121,0,109,95,97,99,99,117,109,
+117,108,97,116,101,100,70,111,114,99,101,0,109,95,110,111,114,109,97,108,
+0,109,95,97,114,101,97,0,109,95,97,116,116,97,99,104,0,109,95,110,
+111,100,101,73,110,100,105,99,101,115,91,50,93,0,109,95,114,101,115,116,
+76,101,110,103,116,104,0,109,95,98,98,101,110,100,105,110,103,0,109,95,
+110,111,100,101,73,110,100,105,99,101,115,91,51,93,0,109,95,114,101,115,
+116,65,114,101,97,0,109,95,99,48,91,52,93,0,109,95,110,111,100,101,
+73,110,100,105,99,101,115,91,52,93,0,109,95,114,101,115,116,86,111,108,
+117,109,101,0,109,95,99,49,0,109,95,99,50,0,109,95,99,48,0,109,
+95,108,111,99,97,108,70,114,97,109,101,0,42,109,95,114,105,103,105,100,
+66,111,100,121,0,109,95,110,111,100,101,73,110,100,101,120,0,109,95,97,
+101,114,111,77,111,100,101,108,0,109,95,98,97,117,109,103,97,114,116,101,
+0,109,95,100,114,97,103,0,109,95,108,105,102,116,0,109,95,112,114,101,
+115,115,117,114,101,0,109,95,118,111,108,117,109,101,0,109,95,100,121,110,
+97,109,105,99,70,114,105,99,116,105,111,110,0,109,95,112,111,115,101,77,
+97,116,99,104,0,109,95,114,105,103,105,100,67,111,110,116,97,99,116,72,
+97,114,100,110,101,115,115,0,109,95,107,105,110,101,116,105,99,67,111,110,
+116,97,99,116,72,97,114,100,110,101,115,115,0,109,95,115,111,102,116,67,
+111,110,116,97,99,116,72,97,114,100,110,101,115,115,0,109,95,97,110,99,
+104,111,114,72,97,114,100,110,101,115,115,0,109,95,115,111,102,116,82,105,
+103,105,100,67,108,117,115,116,101,114,72,97,114,100,110,101,115,115,0,109,
+95,115,111,102,116,75,105,110,101,116,105,99,67,108,117,115,116,101,114,72,
+97,114,100,110,101,115,115,0,109,95,115,111,102,116,83,111,102,116,67,108,
+117,115,116,101,114,72,97,114,100,110,101,115,115,0,109,95,115,111,102,116,
+82,105,103,105,100,67,108,117,115,116,101,114,73,109,112,117,108,115,101,83,
+112,108,105,116,0,109,95,115,111,102,116,75,105,110,101,116,105,99,67,108,
+117,115,116,101,114,73,109,112,117,108,115,101,83,112,108,105,116,0,109,95,
+115,111,102,116,83,111,102,116,67,108,117,115,116,101,114,73,109,112,117,108,
+115,101,83,112,108,105,116,0,109,95,109,97,120,86,111,108,117,109,101,0,
+109,95,116,105,109,101,83,99,97,108,101,0,109,95,118,101,108,111,99,105,
+116,121,73,116,101,114,97,116,105,111,110,115,0,109,95,112,111,115,105,116,
+105,111,110,73,116,101,114,97,116,105,111,110,115,0,109,95,100,114,105,102,
+116,73,116,101,114,97,116,105,111,110,115,0,109,95,99,108,117,115,116,101,
+114,73,116,101,114,97,116,105,111,110,115,0,109,95,114,111,116,0,109,95,
+115,99,97,108,101,0,109,95,97,113,113,0,109,95,99,111,109,0,42,109,
+95,112,111,115,105,116,105,111,110,115,0,42,109,95,119,101,105,103,104,116,
+115,0,109,95,110,117,109,80,111,115,105,116,105,111,110,115,0,109,95,110,
+117,109,87,101,105,103,116,115,0,109,95,98,118,111,108,117,109,101,0,109,
+95,98,102,114,97,109,101,0,109,95,102,114,97,109,101,120,102,111,114,109,
+0,109,95,108,111,99,105,105,0,109,95,105,110,118,119,105,0,109,95,118,
+105,109,112,117,108,115,101,115,91,50,93,0,109,95,100,105,109,112,117,108,
+115,101,115,91,50,93,0,109,95,108,118,0,109,95,97,118,0,42,109,95,
+102,114,97,109,101,114,101,102,115,0,42,109,95,110,111,100,101,73,110,100,
+105,99,101,115,0,42,109,95,109,97,115,115,101,115,0,109,95,110,117,109,
+70,114,97,109,101,82,101,102,115,0,109,95,110,117,109,78,111,100,101,115,
+0,109,95,110,117,109,77,97,115,115,101,115,0,109,95,105,100,109,97,115,
+115,0,109,95,105,109,97,115,115,0,109,95,110,118,105,109,112,117,108,115,
+101,115,0,109,95,110,100,105,109,112,117,108,115,101,115,0,109,95,110,100,
+97,109,112,105,110,103,0,109,95,108,100,97,109,112,105,110,103,0,109,95,
+97,100,97,109,112,105,110,103,0,109,95,109,97,116,99,104,105,110,103,0,
+109,95,109,97,120,83,101,108,102,67,111,108,108,105,115,105,111,110,73,109,
+112,117,108,115,101,0,109,95,115,101,108,102,67,111,108,108,105,115,105,111,
+110,73,109,112,117,108,115,101,70,97,99,116,111,114,0,109,95,99,111,110,
+116,97,105,110,115,65,110,99,104,111,114,0,109,95,99,111,108,108,105,100,
+101,0,109,95,99,108,117,115,116,101,114,73,110,100,101,120,0,42,109,95,
+98,111,100,121,65,0,42,109,95,98,111,100,121,66,0,109,95,114,101,102,
+115,91,50,93,0,109,95,99,102,109,0,109,95,101,114,112,0,109,95,115,
+112,108,105,116,0,109,95,100,101,108,101,116,101,0,109,95,114,101,108,80,
+111,115,105,116,105,111,110,91,50,93,0,109,95,98,111,100,121,65,116,121,
+112,101,0,109,95,98,111,100,121,66,116,121,112,101,0,109,95,106,111,105,
+110,116,84,121,112,101,0,42,109,95,112,111,115,101,0,42,42,109,95,109,
+97,116,101,114,105,97,108,115,0,42,109,95,110,111,100,101,115,0,42,109,
+95,108,105,110,107,115,0,42,109,95,102,97,99,101,115,0,42,109,95,116,
+101,116,114,97,104,101,100,114,97,0,42,109,95,97,110,99,104,111,114,115,
+0,42,109,95,99,108,117,115,116,101,114,115,0,42,109,95,106,111,105,110,
+116,115,0,109,95,110,117,109,77,97,116,101,114,105,97,108,115,0,109,95,
+110,117,109,76,105,110,107,115,0,109,95,110,117,109,70,97,99,101,115,0,
+109,95,110,117,109,84,101,116,114,97,104,101,100,114,97,0,109,95,110,117,
+109,65,110,99,104,111,114,115,0,109,95,110,117,109,67,108,117,115,116,101,
+114,115,0,109,95,110,117,109,74,111,105,110,116,115,0,109,95,99,111,110,
+102,105,103,0,84,89,80,69,72,0,0,0,99,104,97,114,0,117,99,104,
+97,114,0,115,104,111,114,116,0,117,115,104,111,114,116,0,105,110,116,0,
+108,111,110,103,0,117,108,111,110,103,0,102,108,111,97,116,0,100,111,117,
+98,108,101,0,118,111,105,100,0,80,111,105,110,116,101,114,65,114,114,97,
+121,0,98,116,80,104,121,115,105,99,115,83,121,115,116,101,109,0,76,105,
+115,116,66,97,115,101,0,98,116,86,101,99,116,111,114,51,70,108,111,97,
+116,68,97,116,97,0,98,116,86,101,99,116,111,114,51,68,111,117,98,108,
+101,68,97,116,97,0,98,116,77,97,116,114,105,120,51,120,51,70,108,111,
+97,116,68,97,116,97,0,98,116,77,97,116,114,105,120,51,120,51,68,111,
+117,98,108,101,68,97,116,97,0,98,116,84,114,97,110,115,102,111,114,109,
+70,108,111,97,116,68,97,116,97,0,98,116,84,114,97,110,115,102,111,114,
+109,68,111,117,98,108,101,68,97,116,97,0,98,116,66,118,104,83,117,98,
+116,114,101,101,73,110,102,111,68,97,116,97,0,98,116,79,112,116,105,109,
+105,122,101,100,66,118,104,78,111,100,101,70,108,111,97,116,68,97,116,97,
+0,98,116,79,112,116,105,109,105,122,101,100,66,118,104,78,111,100,101,68,
+111,117,98,108,101,68,97,116,97,0,98,116,81,117,97,110,116,105,122,101,
+100,66,118,104,78,111,100,101,68,97,116,97,0,98,116,81,117,97,110,116,
+105,122,101,100,66,118,104,70,108,111,97,116,68,97,116,97,0,98,116,81,
+117,97,110,116,105,122,101,100,66,118,104,68,111,117,98,108,101,68,97,116,
+97,0,98,116,67,111,108,108,105,115,105,111,110,83,104,97,112,101,68,97,
+116,97,0,98,116,83,116,97,116,105,99,80,108,97,110,101,83,104,97,112,
+101,68,97,116,97,0,98,116,67,111,110,118,101,120,73,110,116,101,114,110,
+97,108,83,104,97,112,101,68,97,116,97,0,98,116,80,111,115,105,116,105,
+111,110,65,110,100,82,97,100,105,117,115,0,98,116,77,117,108,116,105,83,
+112,104,101,114,101,83,104,97,112,101,68,97,116,97,0,98,116,73,110,116,
+73,110,100,101,120,68,97,116,97,0,98,116,83,104,111,114,116,73,110,116,
+73,110,100,101,120,68,97,116,97,0,98,116,83,104,111,114,116,73,110,116,
+73,110,100,101,120,84,114,105,112,108,101,116,68,97,116,97,0,98,116,67,
+104,97,114,73,110,100,101,120,84,114,105,112,108,101,116,68,97,116,97,0,
+98,116,77,101,115,104,80,97,114,116,68,97,116,97,0,98,116,83,116,114,
+105,100,105,110,103,77,101,115,104,73,110,116,101,114,102,97,99,101,68,97,
+116,97,0,98,116,84,114,105,97,110,103,108,101,77,101,115,104,83,104,97,
 112,101,68,97,116,97,0,98,116,84,114,105,97,110,103,108,101,73,110,102,
-111,68,97,116,97,0,98,116,71,73,109,112,97,99,116,77,101,115,104,83,
-104,97,112,101,68,97,116,97,0,98,116,67,111,110,118,101,120,72,117,108,
-108,83,104,97,112,101,68,97,116,97,0,98,116,67,111,108,108,105,115,105,
-111,110,79,98,106,101,99,116,68,111,117,98,108,101,68,97,116,97,0,98,
-116,67,111,108,108,105,115,105,111,110,79,98,106,101,99,116,70,108,111,97,
-116,68,97,116,97,0,98,116,82,105,103,105,100,66,111,100,121,70,108,111,
-97,116,68,97,116,97,0,98,116,82,105,103,105,100,66,111,100,121,68,111,
-117,98,108,101,68,97,116,97,0,98,116,67,111,110,115,116,114,97,105,110,
-116,73,110,102,111,49,0,98,116,84,121,112,101,100,67,111,110,115,116,114,
-97,105,110,116,68,97,116,97,0,98,116,82,105,103,105,100,66,111,100,121,
-68,97,116,97,0,98,116,80,111,105,110,116,50,80,111,105,110,116,67,111,
-110,115,116,114,97,105,110,116,70,108,111,97,116,68,97,116,97,0,98,116,
-80,111,105,110,116,50,80,111,105,110,116,67,111,110,115,116,114,97,105,110,
-116,68,111,117,98,108,101,68,97,116,97,0,98,116,72,105,110,103,101,67,
-111,110,115,116,114,97,105,110,116,68,111,117,98,108,101,68,97,116,97,0,
-98,116,72,105,110,103,101,67,111,110,115,116,114,97,105,110,116,70,108,111,
-97,116,68,97,116,97,0,98,116,67,111,110,101,84,119,105,115,116,67,111,
-110,115,116,114,97,105,110,116,68,97,116,97,0,98,116,71,101,110,101,114,
-105,99,54,68,111,102,67,111,110,115,116,114,97,105,110,116,68,97,116,97,
-0,98,116,71,101,110,101,114,105,99,54,68,111,102,83,112,114,105,110,103,
-67,111,110,115,116,114,97,105,110,116,68,97,116,97,0,98,116,83,108,105,
-100,101,114,67,111,110,115,116,114,97,105,110,116,68,97,116,97,0,83,111,
-102,116,66,111,100,121,77,97,116,101,114,105,97,108,68,97,116,97,0,83,
-111,102,116,66,111,100,121,78,111,100,101,68,97,116,97,0,83,111,102,116,
-66,111,100,121,76,105,110,107,68,97,116,97,0,83,111,102,116,66,111,100,
-121,70,97,99,101,68,97,116,97,0,83,111,102,116,66,111,100,121,84,101,
-116,114,97,68,97,116,97,0,83,111,102,116,82,105,103,105,100,65,110,99,
-104,111,114,68,97,116,97,0,83,111,102,116,66,111,100,121,67,111,110,102,
-105,103,68,97,116,97,0,83,111,102,116,66,111,100,121,80,111,115,101,68,
-97,116,97,0,83,111,102,116,66,111,100,121,67,108,117,115,116,101,114,68,
-97,116,97,0,98,116,83,111,102,116,66,111,100,121,74,111,105,110,116,68,
-97,116,97,0,98,116,83,111,102,116,66,111,100,121,70,108,111,97,116,68,
-97,116,97,0,84,76,69,78,1,0,1,0,2,0,2,0,4,0,4,0,
-4,0,4,0,8,0,0,0,12,0,36,0,8,0,16,0,32,0,48,0,
-96,0,64,0,-128,0,20,0,48,0,80,0,16,0,84,0,-124,0,12,0,
-52,0,52,0,20,0,64,0,4,0,4,0,8,0,4,0,32,0,28,0,
-60,0,56,0,76,0,76,0,24,0,60,0,60,0,16,0,64,0,68,0,
--56,1,-8,0,-32,1,-104,3,8,0,44,0,0,0,76,0,108,0,84,1,
--44,0,-52,0,-12,0,84,1,-60,0,16,0,100,0,20,0,36,0,100,0,
-92,0,104,0,-64,0,92,1,104,0,-92,1,83,84,82,67,61,0,0,0,
-10,0,3,0,4,0,0,0,4,0,1,0,9,0,2,0,11,0,3,0,
-10,0,3,0,10,0,4,0,10,0,5,0,12,0,2,0,9,0,6,0,
-9,0,7,0,13,0,1,0,7,0,8,0,14,0,1,0,8,0,8,0,
-15,0,1,0,13,0,9,0,16,0,1,0,14,0,9,0,17,0,2,0,
-15,0,10,0,13,0,11,0,18,0,2,0,16,0,10,0,14,0,11,0,
-19,0,4,0,4,0,12,0,4,0,13,0,2,0,14,0,2,0,15,0,
-20,0,6,0,13,0,16,0,13,0,17,0,4,0,18,0,4,0,19,0,
-4,0,20,0,0,0,21,0,21,0,6,0,14,0,16,0,14,0,17,0,
-4,0,18,0,4,0,19,0,4,0,20,0,0,0,21,0,22,0,3,0,
-2,0,14,0,2,0,15,0,4,0,22,0,23,0,12,0,13,0,23,0,
-13,0,24,0,13,0,25,0,4,0,26,0,4,0,27,0,4,0,28,0,
-4,0,29,0,20,0,30,0,22,0,31,0,19,0,32,0,4,0,33,0,
-4,0,34,0,24,0,12,0,14,0,23,0,14,0,24,0,14,0,25,0,
-4,0,26,0,4,0,27,0,4,0,28,0,4,0,29,0,21,0,30,0,
-22,0,31,0,4,0,33,0,4,0,34,0,19,0,32,0,25,0,3,0,
-0,0,35,0,4,0,36,0,0,0,37,0,26,0,5,0,25,0,38,0,
-13,0,39,0,13,0,40,0,7,0,41,0,0,0,21,0,27,0,5,0,
-25,0,38,0,13,0,39,0,13,0,42,0,7,0,43,0,4,0,44,0,
-28,0,2,0,13,0,45,0,7,0,46,0,29,0,4,0,27,0,47,0,
-28,0,48,0,4,0,49,0,0,0,37,0,30,0,1,0,4,0,50,0,
-31,0,2,0,2,0,50,0,0,0,51,0,32,0,2,0,2,0,52,0,
-0,0,51,0,33,0,2,0,0,0,52,0,0,0,53,0,34,0,8,0,
-13,0,54,0,14,0,55,0,30,0,56,0,32,0,57,0,33,0,58,0,
-31,0,59,0,4,0,60,0,4,0,61,0,35,0,4,0,34,0,62,0,
-13,0,63,0,4,0,64,0,0,0,37,0,36,0,7,0,25,0,38,0,
-35,0,65,0,23,0,66,0,24,0,67,0,37,0,68,0,7,0,43,0,
-0,0,69,0,38,0,2,0,36,0,70,0,13,0,39,0,39,0,4,0,
-17,0,71,0,25,0,72,0,4,0,73,0,7,0,74,0,40,0,4,0,
-25,0,38,0,39,0,75,0,4,0,76,0,7,0,43,0,41,0,3,0,
-27,0,47,0,4,0,77,0,0,0,37,0,42,0,3,0,27,0,47,0,
-4,0,77,0,0,0,37,0,43,0,4,0,4,0,78,0,7,0,79,0,
-7,0,80,0,7,0,81,0,37,0,14,0,4,0,82,0,4,0,83,0,
-43,0,84,0,4,0,85,0,7,0,86,0,7,0,87,0,7,0,88,0,
-7,0,89,0,7,0,90,0,4,0,91,0,4,0,92,0,4,0,93,0,
-4,0,94,0,0,0,37,0,44,0,5,0,25,0,38,0,35,0,65,0,
-13,0,39,0,7,0,43,0,4,0,95,0,45,0,5,0,27,0,47,0,
-13,0,96,0,14,0,97,0,4,0,98,0,0,0,99,0,46,0,24,0,
-9,0,100,0,9,0,101,0,25,0,102,0,0,0,35,0,18,0,103,0,
-18,0,104,0,14,0,105,0,14,0,106,0,14,0,107,0,8,0,108,0,
-8,0,109,0,8,0,110,0,8,0,111,0,8,0,112,0,8,0,113,0,
-8,0,114,0,4,0,115,0,4,0,116,0,4,0,117,0,4,0,118,0,
-4,0,119,0,4,0,120,0,4,0,121,0,0,0,37,0,47,0,23,0,
-9,0,100,0,9,0,101,0,25,0,102,0,0,0,35,0,17,0,103,0,
-17,0,104,0,13,0,105,0,13,0,106,0,13,0,107,0,7,0,108,0,
-7,0,109,0,7,0,110,0,7,0,111,0,7,0,112,0,7,0,113,0,
-7,0,114,0,4,0,115,0,4,0,116,0,4,0,117,0,4,0,118,0,
-4,0,119,0,4,0,120,0,4,0,121,0,48,0,21,0,47,0,122,0,
-15,0,123,0,13,0,124,0,13,0,125,0,13,0,126,0,13,0,127,0,
-13,0,-128,0,13,0,-127,0,13,0,-126,0,13,0,-125,0,13,0,-124,0,
-7,0,-123,0,7,0,-122,0,7,0,-121,0,7,0,-120,0,7,0,-119,0,
-7,0,-118,0,7,0,-117,0,7,0,-116,0,7,0,-115,0,4,0,-114,0,
-49,0,22,0,46,0,122,0,16,0,123,0,14,0,124,0,14,0,125,0,
-14,0,126,0,14,0,127,0,14,0,-128,0,14,0,-127,0,14,0,-126,0,
-14,0,-125,0,14,0,-124,0,8,0,-123,0,8,0,-122,0,8,0,-121,0,
-8,0,-120,0,8,0,-119,0,8,0,-118,0,8,0,-117,0,8,0,-116,0,
-8,0,-115,0,4,0,-114,0,0,0,37,0,50,0,2,0,4,0,-113,0,
-4,0,-112,0,51,0,11,0,52,0,-111,0,52,0,-110,0,0,0,35,0,
-4,0,-109,0,4,0,-108,0,4,0,-107,0,4,0,-106,0,7,0,-105,0,
-7,0,-104,0,4,0,-103,0,0,0,-102,0,53,0,3,0,51,0,-101,0,
-13,0,-100,0,13,0,-99,0,54,0,3,0,51,0,-101,0,14,0,-100,0,
-14,0,-99,0,55,0,13,0,51,0,-101,0,18,0,-98,0,18,0,-97,0,
-4,0,-96,0,4,0,-95,0,4,0,-94,0,7,0,-93,0,7,0,-92,0,
-7,0,-91,0,7,0,-90,0,7,0,-89,0,7,0,-88,0,7,0,-87,0,
-56,0,13,0,51,0,-101,0,17,0,-98,0,17,0,-97,0,4,0,-96,0,
-4,0,-95,0,4,0,-94,0,7,0,-93,0,7,0,-92,0,7,0,-91,0,
-7,0,-90,0,7,0,-89,0,7,0,-88,0,7,0,-87,0,57,0,11,0,
-51,0,-101,0,17,0,-98,0,17,0,-97,0,7,0,-86,0,7,0,-85,0,
-7,0,-84,0,7,0,-89,0,7,0,-88,0,7,0,-87,0,7,0,-83,0,
-0,0,21,0,58,0,9,0,51,0,-101,0,17,0,-98,0,17,0,-97,0,
-13,0,-82,0,13,0,-81,0,13,0,-80,0,13,0,-79,0,4,0,-78,0,
-4,0,-77,0,59,0,5,0,58,0,-76,0,4,0,-75,0,7,0,-74,0,
-7,0,-73,0,7,0,-72,0,60,0,9,0,51,0,-101,0,17,0,-98,0,
-17,0,-97,0,7,0,-82,0,7,0,-81,0,7,0,-80,0,7,0,-79,0,
-4,0,-78,0,4,0,-77,0,61,0,4,0,7,0,-71,0,7,0,-70,0,
-7,0,-69,0,4,0,78,0,62,0,10,0,61,0,-68,0,13,0,-67,0,
-13,0,-66,0,13,0,-65,0,13,0,-64,0,13,0,-63,0,7,0,-123,0,
-7,0,-62,0,4,0,-61,0,4,0,53,0,63,0,4,0,61,0,-68,0,
-4,0,-60,0,7,0,-59,0,4,0,-58,0,64,0,4,0,13,0,-63,0,
-61,0,-68,0,4,0,-57,0,7,0,-56,0,65,0,7,0,13,0,-55,0,
-61,0,-68,0,4,0,-54,0,7,0,-53,0,7,0,-52,0,7,0,-51,0,
-4,0,53,0,66,0,6,0,15,0,-50,0,13,0,-52,0,13,0,-49,0,
-52,0,-48,0,4,0,-47,0,7,0,-51,0,67,0,26,0,4,0,-46,0,
-7,0,-45,0,7,0,-83,0,7,0,-44,0,7,0,-43,0,7,0,-42,0,
-7,0,-41,0,7,0,-40,0,7,0,-39,0,7,0,-38,0,7,0,-37,0,
-7,0,-36,0,7,0,-35,0,7,0,-34,0,7,0,-33,0,7,0,-32,0,
-7,0,-31,0,7,0,-30,0,7,0,-29,0,7,0,-28,0,7,0,-27,0,
-4,0,-26,0,4,0,-25,0,4,0,-24,0,4,0,-23,0,4,0,116,0,
-68,0,12,0,15,0,-22,0,15,0,-21,0,15,0,-20,0,13,0,-19,0,
-13,0,-18,0,7,0,-17,0,4,0,-16,0,4,0,-15,0,4,0,-14,0,
-4,0,-13,0,7,0,-53,0,4,0,53,0,69,0,27,0,17,0,-12,0,
-15,0,-11,0,15,0,-10,0,13,0,-19,0,13,0,-9,0,13,0,-8,0,
-13,0,-7,0,13,0,-6,0,13,0,-5,0,4,0,-4,0,7,0,-3,0,
-4,0,-2,0,4,0,-1,0,4,0,0,1,7,0,1,1,7,0,2,1,
-4,0,3,1,4,0,4,1,7,0,5,1,7,0,6,1,7,0,7,1,
-7,0,8,1,7,0,9,1,7,0,10,1,4,0,11,1,4,0,12,1,
-4,0,13,1,70,0,12,0,9,0,14,1,9,0,15,1,13,0,16,1,
-7,0,17,1,7,0,18,1,7,0,19,1,4,0,20,1,13,0,21,1,
-4,0,22,1,4,0,23,1,4,0,24,1,4,0,53,0,71,0,19,0,
-47,0,122,0,68,0,25,1,61,0,26,1,62,0,27,1,63,0,28,1,
-64,0,29,1,65,0,30,1,66,0,31,1,69,0,32,1,70,0,33,1,
-4,0,34,1,4,0,-1,0,4,0,35,1,4,0,36,1,4,0,37,1,
-4,0,38,1,4,0,39,1,4,0,40,1,67,0,41,1,};
+111,77,97,112,68,97,116,97,0,98,116,83,99,97,108,101,100,84,114,105,
+97,110,103,108,101,77,101,115,104,83,104,97,112,101,68,97,116,97,0,98,
+116,67,111,109,112,111,117,110,100,83,104,97,112,101,67,104,105,108,100,68,
+97,116,97,0,98,116,67,111,109,112,111,117,110,100,83,104,97,112,101,68,
+97,116,97,0,98,116,67,121,108,105,110,100,101,114,83,104,97,112,101,68,
+97,116,97,0,98,116,67,97,112,115,117,108,101,83,104,97,112,101,68,97,
+116,97,0,98,116,84,114,105,97,110,103,108,101,73,110,102,111,68,97,116,
+97,0,98,116,71,73,109,112,97,99,116,77,101,115,104,83,104,97,112,101,
+68,97,116,97,0,98,116,67,111,110,118,101,120,72,117,108,108,83,104,97,
+112,101,68,97,116,97,0,98,116,67,111,108,108,105,115,105,111,110,79,98,
+106,101,99,116,68,111,117,98,108,101,68,97,116,97,0,98,116,67,111,108,
+108,105,115,105,111,110,79,98,106,101,99,116,70,108,111,97,116,68,97,116,
+97,0,98,116,82,105,103,105,100,66,111,100,121,70,108,111,97,116,68,97,
+116,97,0,98,116,82,105,103,105,100,66,111,100,121,68,111,117,98,108,101,
+68,97,116,97,0,98,116,67,111,110,115,116,114,97,105,110,116,73,110,102,
+111,49,0,98,116,84,121,112,101,100,67,111,110,115,116,114,97,105,110,116,
+68,97,116,97,0,98,116,82,105,103,105,100,66,111,100,121,68,97,116,97,
+0,98,116,80,111,105,110,116,50,80,111,105,110,116,67,111,110,115,116,114,
+97,105,110,116,70,108,111,97,116,68,97,116,97,0,98,116,80,111,105,110,
+116,50,80,111,105,110,116,67,111,110,115,116,114,97,105,110,116,68,111,117,
+98,108,101,68,97,116,97,0,98,116,72,105,110,103,101,67,111,110,115,116,
+114,97,105,110,116,68,111,117,98,108,101,68,97,116,97,0,98,116,72,105,
+110,103,101,67,111,110,115,116,114,97,105,110,116,70,108,111,97,116,68,97,
+116,97,0,98,116,67,111,110,101,84,119,105,115,116,67,111,110,115,116,114,
+97,105,110,116,68,97,116,97,0,98,116,71,101,110,101,114,105,99,54,68,
+111,102,67,111,110,115,116,114,97,105,110,116,68,97,116,97,0,98,116,71,
+101,110,101,114,105,99,54,68,111,102,83,112,114,105,110,103,67,111,110,115,
+116,114,97,105,110,116,68,97,116,97,0,98,116,83,108,105,100,101,114,67,
+111,110,115,116,114,97,105,110,116,68,97,116,97,0,83,111,102,116,66,111,
+100,121,77,97,116,101,114,105,97,108,68,97,116,97,0,83,111,102,116,66,
+111,100,121,78,111,100,101,68,97,116,97,0,83,111,102,116,66,111,100,121,
+76,105,110,107,68,97,116,97,0,83,111,102,116,66,111,100,121,70,97,99,
+101,68,97,116,97,0,83,111,102,116,66,111,100,121,84,101,116,114,97,68,
+97,116,97,0,83,111,102,116,82,105,103,105,100,65,110,99,104,111,114,68,
+97,116,97,0,83,111,102,116,66,111,100,121,67,111,110,102,105,103,68,97,
+116,97,0,83,111,102,116,66,111,100,121,80,111,115,101,68,97,116,97,0,
+83,111,102,116,66,111,100,121,67,108,117,115,116,101,114,68,97,116,97,0,
+98,116,83,111,102,116,66,111,100,121,74,111,105,110,116,68,97,116,97,0,
+98,116,83,111,102,116,66,111,100,121,70,108,111,97,116,68,97,116,97,0,
+84,76,69,78,1,0,1,0,2,0,2,0,4,0,4,0,4,0,4,0,
+8,0,0,0,12,0,36,0,8,0,16,0,32,0,48,0,96,0,64,0,
+-128,0,20,0,48,0,80,0,16,0,84,0,-124,0,12,0,52,0,52,0,
+20,0,64,0,4,0,4,0,8,0,4,0,32,0,28,0,60,0,56,0,
+76,0,76,0,24,0,60,0,60,0,16,0,64,0,68,0,-56,1,-8,0,
+-32,1,-104,3,8,0,52,0,0,0,84,0,116,0,92,1,-36,0,-44,0,
+-4,0,92,1,-52,0,16,0,100,0,20,0,36,0,100,0,92,0,104,0,
+-64,0,92,1,104,0,-92,1,83,84,82,67,61,0,0,0,10,0,3,0,
+4,0,0,0,4,0,1,0,9,0,2,0,11,0,3,0,10,0,3,0,
+10,0,4,0,10,0,5,0,12,0,2,0,9,0,6,0,9,0,7,0,
+13,0,1,0,7,0,8,0,14,0,1,0,8,0,8,0,15,0,1,0,
+13,0,9,0,16,0,1,0,14,0,9,0,17,0,2,0,15,0,10,0,
+13,0,11,0,18,0,2,0,16,0,10,0,14,0,11,0,19,0,4,0,
+4,0,12,0,4,0,13,0,2,0,14,0,2,0,15,0,20,0,6,0,
+13,0,16,0,13,0,17,0,4,0,18,0,4,0,19,0,4,0,20,0,
+0,0,21,0,21,0,6,0,14,0,16,0,14,0,17,0,4,0,18,0,
+4,0,19,0,4,0,20,0,0,0,21,0,22,0,3,0,2,0,14,0,
+2,0,15,0,4,0,22,0,23,0,12,0,13,0,23,0,13,0,24,0,
+13,0,25,0,4,0,26,0,4,0,27,0,4,0,28,0,4,0,29,0,
+20,0,30,0,22,0,31,0,19,0,32,0,4,0,33,0,4,0,34,0,
+24,0,12,0,14,0,23,0,14,0,24,0,14,0,25,0,4,0,26,0,
+4,0,27,0,4,0,28,0,4,0,29,0,21,0,30,0,22,0,31,0,
+4,0,33,0,4,0,34,0,19,0,32,0,25,0,3,0,0,0,35,0,
+4,0,36,0,0,0,37,0,26,0,5,0,25,0,38,0,13,0,39,0,
+13,0,40,0,7,0,41,0,0,0,21,0,27,0,5,0,25,0,38,0,
+13,0,39,0,13,0,42,0,7,0,43,0,4,0,44,0,28,0,2,0,
+13,0,45,0,7,0,46,0,29,0,4,0,27,0,47,0,28,0,48,0,
+4,0,49,0,0,0,37,0,30,0,1,0,4,0,50,0,31,0,2,0,
+2,0,50,0,0,0,51,0,32,0,2,0,2,0,52,0,0,0,51,0,
+33,0,2,0,0,0,52,0,0,0,53,0,34,0,8,0,13,0,54,0,
+14,0,55,0,30,0,56,0,32,0,57,0,33,0,58,0,31,0,59,0,
+4,0,60,0,4,0,61,0,35,0,4,0,34,0,62,0,13,0,63,0,
+4,0,64,0,0,0,37,0,36,0,7,0,25,0,38,0,35,0,65,0,
+23,0,66,0,24,0,67,0,37,0,68,0,7,0,43,0,0,0,69,0,
+38,0,2,0,36,0,70,0,13,0,39,0,39,0,4,0,17,0,71,0,
+25,0,72,0,4,0,73,0,7,0,74,0,40,0,4,0,25,0,38,0,
+39,0,75,0,4,0,76,0,7,0,43,0,41,0,3,0,27,0,47,0,
+4,0,77,0,0,0,37,0,42,0,3,0,27,0,47,0,4,0,77,0,
+0,0,37,0,43,0,4,0,4,0,78,0,7,0,79,0,7,0,80,0,
+7,0,81,0,37,0,14,0,4,0,82,0,4,0,83,0,43,0,84,0,
+4,0,85,0,7,0,86,0,7,0,87,0,7,0,88,0,7,0,89,0,
+7,0,90,0,4,0,91,0,4,0,92,0,4,0,93,0,4,0,94,0,
+0,0,37,0,44,0,5,0,25,0,38,0,35,0,65,0,13,0,39,0,
+7,0,43,0,4,0,95,0,45,0,5,0,27,0,47,0,13,0,96,0,
+14,0,97,0,4,0,98,0,0,0,99,0,46,0,24,0,9,0,100,0,
+9,0,101,0,25,0,102,0,0,0,35,0,18,0,103,0,18,0,104,0,
+14,0,105,0,14,0,106,0,14,0,107,0,8,0,108,0,8,0,109,0,
+8,0,110,0,8,0,111,0,8,0,112,0,8,0,113,0,8,0,114,0,
+4,0,115,0,4,0,116,0,4,0,117,0,4,0,118,0,4,0,119,0,
+4,0,120,0,4,0,121,0,0,0,37,0,47,0,23,0,9,0,100,0,
+9,0,101,0,25,0,102,0,0,0,35,0,17,0,103,0,17,0,104,0,
+13,0,105,0,13,0,106,0,13,0,107,0,7,0,108,0,7,0,109,0,
+7,0,110,0,7,0,111,0,7,0,112,0,7,0,113,0,7,0,114,0,
+4,0,115,0,4,0,116,0,4,0,117,0,4,0,118,0,4,0,119,0,
+4,0,120,0,4,0,121,0,48,0,21,0,47,0,122,0,15,0,123,0,
+13,0,124,0,13,0,125,0,13,0,126,0,13,0,127,0,13,0,-128,0,
+13,0,-127,0,13,0,-126,0,13,0,-125,0,13,0,-124,0,7,0,-123,0,
+7,0,-122,0,7,0,-121,0,7,0,-120,0,7,0,-119,0,7,0,-118,0,
+7,0,-117,0,7,0,-116,0,7,0,-115,0,4,0,-114,0,49,0,22,0,
+46,0,122,0,16,0,123,0,14,0,124,0,14,0,125,0,14,0,126,0,
+14,0,127,0,14,0,-128,0,14,0,-127,0,14,0,-126,0,14,0,-125,0,
+14,0,-124,0,8,0,-123,0,8,0,-122,0,8,0,-121,0,8,0,-120,0,
+8,0,-119,0,8,0,-118,0,8,0,-117,0,8,0,-116,0,8,0,-115,0,
+4,0,-114,0,0,0,37,0,50,0,2,0,4,0,-113,0,4,0,-112,0,
+51,0,13,0,52,0,-111,0,52,0,-110,0,0,0,35,0,4,0,-109,0,
+4,0,-108,0,4,0,-107,0,4,0,-106,0,7,0,-105,0,7,0,-104,0,
+4,0,-103,0,4,0,-102,0,7,0,-101,0,4,0,-100,0,53,0,3,0,
+51,0,-99,0,13,0,-98,0,13,0,-97,0,54,0,3,0,51,0,-99,0,
+14,0,-98,0,14,0,-97,0,55,0,13,0,51,0,-99,0,18,0,-96,0,
+18,0,-95,0,4,0,-94,0,4,0,-93,0,4,0,-92,0,7,0,-91,0,
+7,0,-90,0,7,0,-89,0,7,0,-88,0,7,0,-87,0,7,0,-86,0,
+7,0,-85,0,56,0,13,0,51,0,-99,0,17,0,-96,0,17,0,-95,0,
+4,0,-94,0,4,0,-93,0,4,0,-92,0,7,0,-91,0,7,0,-90,0,
+7,0,-89,0,7,0,-88,0,7,0,-87,0,7,0,-86,0,7,0,-85,0,
+57,0,11,0,51,0,-99,0,17,0,-96,0,17,0,-95,0,7,0,-84,0,
+7,0,-83,0,7,0,-82,0,7,0,-87,0,7,0,-86,0,7,0,-85,0,
+7,0,-81,0,0,0,21,0,58,0,9,0,51,0,-99,0,17,0,-96,0,
+17,0,-95,0,13,0,-80,0,13,0,-79,0,13,0,-78,0,13,0,-77,0,
+4,0,-76,0,4,0,-75,0,59,0,5,0,58,0,-74,0,4,0,-73,0,
+7,0,-72,0,7,0,-71,0,7,0,-70,0,60,0,9,0,51,0,-99,0,
+17,0,-96,0,17,0,-95,0,7,0,-80,0,7,0,-79,0,7,0,-78,0,
+7,0,-77,0,4,0,-76,0,4,0,-75,0,61,0,4,0,7,0,-69,0,
+7,0,-68,0,7,0,-67,0,4,0,78,0,62,0,10,0,61,0,-66,0,
+13,0,-65,0,13,0,-64,0,13,0,-63,0,13,0,-62,0,13,0,-61,0,
+7,0,-123,0,7,0,-60,0,4,0,-59,0,4,0,53,0,63,0,4,0,
+61,0,-66,0,4,0,-58,0,7,0,-57,0,4,0,-56,0,64,0,4,0,
+13,0,-61,0,61,0,-66,0,4,0,-55,0,7,0,-54,0,65,0,7,0,
+13,0,-53,0,61,0,-66,0,4,0,-52,0,7,0,-51,0,7,0,-50,0,
+7,0,-49,0,4,0,53,0,66,0,6,0,15,0,-48,0,13,0,-50,0,
+13,0,-47,0,52,0,-46,0,4,0,-45,0,7,0,-49,0,67,0,26,0,
+4,0,-44,0,7,0,-43,0,7,0,-81,0,7,0,-42,0,7,0,-41,0,
+7,0,-40,0,7,0,-39,0,7,0,-38,0,7,0,-37,0,7,0,-36,0,
+7,0,-35,0,7,0,-34,0,7,0,-33,0,7,0,-32,0,7,0,-31,0,
+7,0,-30,0,7,0,-29,0,7,0,-28,0,7,0,-27,0,7,0,-26,0,
+7,0,-25,0,4,0,-24,0,4,0,-23,0,4,0,-22,0,4,0,-21,0,
+4,0,116,0,68,0,12,0,15,0,-20,0,15,0,-19,0,15,0,-18,0,
+13,0,-17,0,13,0,-16,0,7,0,-15,0,4,0,-14,0,4,0,-13,0,
+4,0,-12,0,4,0,-11,0,7,0,-51,0,4,0,53,0,69,0,27,0,
+17,0,-10,0,15,0,-9,0,15,0,-8,0,13,0,-17,0,13,0,-7,0,
+13,0,-6,0,13,0,-5,0,13,0,-4,0,13,0,-3,0,4,0,-2,0,
+7,0,-1,0,4,0,0,1,4,0,1,1,4,0,2,1,7,0,3,1,
+7,0,4,1,4,0,5,1,4,0,6,1,7,0,7,1,7,0,8,1,
+7,0,9,1,7,0,10,1,7,0,11,1,7,0,12,1,4,0,13,1,
+4,0,14,1,4,0,15,1,70,0,12,0,9,0,16,1,9,0,17,1,
+13,0,18,1,7,0,19,1,7,0,20,1,7,0,21,1,4,0,22,1,
+13,0,23,1,4,0,24,1,4,0,25,1,4,0,26,1,4,0,53,0,
+71,0,19,0,47,0,122,0,68,0,27,1,61,0,28,1,62,0,29,1,
+63,0,30,1,64,0,31,1,65,0,32,1,66,0,33,1,69,0,34,1,
+70,0,35,1,4,0,36,1,4,0,1,1,4,0,37,1,4,0,38,1,
+4,0,39,1,4,0,40,1,4,0,41,1,4,0,42,1,67,0,43,1,
+};
 int sBulletDNAlen= sizeof(sBulletDNAstr);
-unsigned char sBulletDNAstr64[]= {
-83,68,78,65,78,65,77,69,42,1,0,0,109,95,115,105,122,101,0,109,
+
+ char sBulletDNAstr64[]= {
+83,68,78,65,78,65,77,69,44,1,0,0,109,95,115,105,122,101,0,109,
 95,99,97,112,97,99,105,116,121,0,42,109,95,100,97,116,97,0,109,95,
 99,111,108,108,105,115,105,111,110,83,104,97,112,101,115,0,109,95,99,111,
 108,108,105,115,105,111,110,79,98,106,101,99,116,115,0,109,95,99,111,110,
@@ -546,287 +551,291 @@ unsigned char sBulletDNAstr64[]= {
 112,108,105,101,100,73,109,112,117,108,115,101,0,109,95,100,98,103,68,114,
 97,119,83,105,122,101,0,109,95,100,105,115,97,98,108,101,67,111,108,108,
 105,115,105,111,110,115,66,101,116,119,101,101,110,76,105,110,107,101,100,66,
-111,100,105,101,115,0,109,95,112,97,100,52,91,52,93,0,109,95,116,121,
-112,101,67,111,110,115,116,114,97,105,110,116,68,97,116,97,0,109,95,112,
-105,118,111,116,73,110,65,0,109,95,112,105,118,111,116,73,110,66,0,109,
-95,114,98,65,70,114,97,109,101,0,109,95,114,98,66,70,114,97,109,101,
-0,109,95,117,115,101,82,101,102,101,114,101,110,99,101,70,114,97,109,101,
-65,0,109,95,97,110,103,117,108,97,114,79,110,108,121,0,109,95,101,110,
-97,98,108,101,65,110,103,117,108,97,114,77,111,116,111,114,0,109,95,109,
-111,116,111,114,84,97,114,103,101,116,86,101,108,111,99,105,116,121,0,109,
-95,109,97,120,77,111,116,111,114,73,109,112,117,108,115,101,0,109,95,108,
-111,119,101,114,76,105,109,105,116,0,109,95,117,112,112,101,114,76,105,109,
-105,116,0,109,95,108,105,109,105,116,83,111,102,116,110,101,115,115,0,109,
-95,98,105,97,115,70,97,99,116,111,114,0,109,95,114,101,108,97,120,97,
-116,105,111,110,70,97,99,116,111,114,0,109,95,115,119,105,110,103,83,112,
-97,110,49,0,109,95,115,119,105,110,103,83,112,97,110,50,0,109,95,116,
-119,105,115,116,83,112,97,110,0,109,95,100,97,109,112,105,110,103,0,109,
-95,108,105,110,101,97,114,85,112,112,101,114,76,105,109,105,116,0,109,95,
-108,105,110,101,97,114,76,111,119,101,114,76,105,109,105,116,0,109,95,97,
-110,103,117,108,97,114,85,112,112,101,114,76,105,109,105,116,0,109,95,97,
-110,103,117,108,97,114,76,111,119,101,114,76,105,109,105,116,0,109,95,117,
-115,101,76,105,110,101,97,114,82,101,102,101,114,101,110,99,101,70,114,97,
-109,101,65,0,109,95,117,115,101,79,102,102,115,101,116,70,111,114,67,111,
-110,115,116,114,97,105,110,116,70,114,97,109,101,0,109,95,54,100,111,102,
-68,97,116,97,0,109,95,115,112,114,105,110,103,69,110,97,98,108,101,100,
-91,54,93,0,109,95,101,113,117,105,108,105,98,114,105,117,109,80,111,105,
-110,116,91,54,93,0,109,95,115,112,114,105,110,103,83,116,105,102,102,110,
-101,115,115,91,54,93,0,109,95,115,112,114,105,110,103,68,97,109,112,105,
-110,103,91,54,93,0,109,95,108,105,110,101,97,114,83,116,105,102,102,110,
-101,115,115,0,109,95,97,110,103,117,108,97,114,83,116,105,102,102,110,101,
-115,115,0,109,95,118,111,108,117,109,101,83,116,105,102,102,110,101,115,115,
-0,42,109,95,109,97,116,101,114,105,97,108,0,109,95,112,111,115,105,116,
-105,111,110,0,109,95,112,114,101,118,105,111,117,115,80,111,115,105,116,105,
-111,110,0,109,95,118,101,108,111,99,105,116,121,0,109,95,97,99,99,117,
-109,117,108,97,116,101,100,70,111,114,99,101,0,109,95,110,111,114,109,97,
-108,0,109,95,97,114,101,97,0,109,95,97,116,116,97,99,104,0,109,95,
-110,111,100,101,73,110,100,105,99,101,115,91,50,93,0,109,95,114,101,115,
-116,76,101,110,103,116,104,0,109,95,98,98,101,110,100,105,110,103,0,109,
-95,110,111,100,101,73,110,100,105,99,101,115,91,51,93,0,109,95,114,101,
-115,116,65,114,101,97,0,109,95,99,48,91,52,93,0,109,95,110,111,100,
-101,73,110,100,105,99,101,115,91,52,93,0,109,95,114,101,115,116,86,111,
-108,117,109,101,0,109,95,99,49,0,109,95,99,50,0,109,95,99,48,0,
-109,95,108,111,99,97,108,70,114,97,109,101,0,42,109,95,114,105,103,105,
-100,66,111,100,121,0,109,95,110,111,100,101,73,110,100,101,120,0,109,95,
-97,101,114,111,77,111,100,101,108,0,109,95,98,97,117,109,103,97,114,116,
-101,0,109,95,100,114,97,103,0,109,95,108,105,102,116,0,109,95,112,114,
-101,115,115,117,114,101,0,109,95,118,111,108,117,109,101,0,109,95,100,121,
-110,97,109,105,99,70,114,105,99,116,105,111,110,0,109,95,112,111,115,101,
-77,97,116,99,104,0,109,95,114,105,103,105,100,67,111,110,116,97,99,116,
-72,97,114,100,110,101,115,115,0,109,95,107,105,110,101,116,105,99,67,111,
-110,116,97,99,116,72,97,114,100,110,101,115,115,0,109,95,115,111,102,116,
-67,111,110,116,97,99,116,72,97,114,100,110,101,115,115,0,109,95,97,110,
-99,104,111,114,72,97,114,100,110,101,115,115,0,109,95,115,111,102,116,82,
-105,103,105,100,67,108,117,115,116,101,114,72,97,114,100,110,101,115,115,0,
-109,95,115,111,102,116,75,105,110,101,116,105,99,67,108,117,115,116,101,114,
-72,97,114,100,110,101,115,115,0,109,95,115,111,102,116,83,111,102,116,67,
-108,117,115,116,101,114,72,97,114,100,110,101,115,115,0,109,95,115,111,102,
-116,82,105,103,105,100,67,108,117,115,116,101,114,73,109,112,117,108,115,101,
-83,112,108,105,116,0,109,95,115,111,102,116,75,105,110,101,116,105,99,67,
-108,117,115,116,101,114,73,109,112,117,108,115,101,83,112,108,105,116,0,109,
-95,115,111,102,116,83,111,102,116,67,108,117,115,116,101,114,73,109,112,117,
-108,115,101,83,112,108,105,116,0,109,95,109,97,120,86,111,108,117,109,101,
-0,109,95,116,105,109,101,83,99,97,108,101,0,109,95,118,101,108,111,99,
-105,116,121,73,116,101,114,97,116,105,111,110,115,0,109,95,112,111,115,105,
-116,105,111,110,73,116,101,114,97,116,105,111,110,115,0,109,95,100,114,105,
-102,116,73,116,101,114,97,116,105,111,110,115,0,109,95,99,108,117,115,116,
-101,114,73,116,101,114,97,116,105,111,110,115,0,109,95,114,111,116,0,109,
-95,115,99,97,108,101,0,109,95,97,113,113,0,109,95,99,111,109,0,42,
-109,95,112,111,115,105,116,105,111,110,115,0,42,109,95,119,101,105,103,104,
-116,115,0,109,95,110,117,109,80,111,115,105,116,105,111,110,115,0,109,95,
-110,117,109,87,101,105,103,116,115,0,109,95,98,118,111,108,117,109,101,0,
-109,95,98,102,114,97,109,101,0,109,95,102,114,97,109,101,120,102,111,114,
-109,0,109,95,108,111,99,105,105,0,109,95,105,110,118,119,105,0,109,95,
-118,105,109,112,117,108,115,101,115,91,50,93,0,109,95,100,105,109,112,117,
-108,115,101,115,91,50,93,0,109,95,108,118,0,109,95,97,118,0,42,109,
-95,102,114,97,109,101,114,101,102,115,0,42,109,95,110,111,100,101,73,110,
-100,105,99,101,115,0,42,109,95,109,97,115,115,101,115,0,109,95,110,117,
-109,70,114,97,109,101,82,101,102,115,0,109,95,110,117,109,78,111,100,101,
-115,0,109,95,110,117,109,77,97,115,115,101,115,0,109,95,105,100,109,97,
-115,115,0,109,95,105,109,97,115,115,0,109,95,110,118,105,109,112,117,108,
-115,101,115,0,109,95,110,100,105,109,112,117,108,115,101,115,0,109,95,110,
-100,97,109,112,105,110,103,0,109,95,108,100,97,109,112,105,110,103,0,109,
-95,97,100,97,109,112,105,110,103,0,109,95,109,97,116,99,104,105,110,103,
-0,109,95,109,97,120,83,101,108,102,67,111,108,108,105,115,105,111,110,73,
-109,112,117,108,115,101,0,109,95,115,101,108,102,67,111,108,108,105,115,105,
-111,110,73,109,112,117,108,115,101,70,97,99,116,111,114,0,109,95,99,111,
-110,116,97,105,110,115,65,110,99,104,111,114,0,109,95,99,111,108,108,105,
-100,101,0,109,95,99,108,117,115,116,101,114,73,110,100,101,120,0,42,109,
-95,98,111,100,121,65,0,42,109,95,98,111,100,121,66,0,109,95,114,101,
-102,115,91,50,93,0,109,95,99,102,109,0,109,95,101,114,112,0,109,95,
-115,112,108,105,116,0,109,95,100,101,108,101,116,101,0,109,95,114,101,108,
-80,111,115,105,116,105,111,110,91,50,93,0,109,95,98,111,100,121,65,116,
-121,112,101,0,109,95,98,111,100,121,66,116,121,112,101,0,109,95,106,111,
-105,110,116,84,121,112,101,0,42,109,95,112,111,115,101,0,42,42,109,95,
-109,97,116,101,114,105,97,108,115,0,42,109,95,110,111,100,101,115,0,42,
-109,95,108,105,110,107,115,0,42,109,95,102,97,99,101,115,0,42,109,95,
-116,101,116,114,97,104,101,100,114,97,0,42,109,95,97,110,99,104,111,114,
-115,0,42,109,95,99,108,117,115,116,101,114,115,0,42,109,95,106,111,105,
-110,116,115,0,109,95,110,117,109,77,97,116,101,114,105,97,108,115,0,109,
-95,110,117,109,76,105,110,107,115,0,109,95,110,117,109,70,97,99,101,115,
-0,109,95,110,117,109,84,101,116,114,97,104,101,100,114,97,0,109,95,110,
-117,109,65,110,99,104,111,114,115,0,109,95,110,117,109,67,108,117,115,116,
-101,114,115,0,109,95,110,117,109,74,111,105,110,116,115,0,109,95,99,111,
-110,102,105,103,0,0,0,0,84,89,80,69,72,0,0,0,99,104,97,114,
-0,117,99,104,97,114,0,115,104,111,114,116,0,117,115,104,111,114,116,0,
-105,110,116,0,108,111,110,103,0,117,108,111,110,103,0,102,108,111,97,116,
-0,100,111,117,98,108,101,0,118,111,105,100,0,80,111,105,110,116,101,114,
-65,114,114,97,121,0,98,116,80,104,121,115,105,99,115,83,121,115,116,101,
-109,0,76,105,115,116,66,97,115,101,0,98,116,86,101,99,116,111,114,51,
-70,108,111,97,116,68,97,116,97,0,98,116,86,101,99,116,111,114,51,68,
-111,117,98,108,101,68,97,116,97,0,98,116,77,97,116,114,105,120,51,120,
-51,70,108,111,97,116,68,97,116,97,0,98,116,77,97,116,114,105,120,51,
-120,51,68,111,117,98,108,101,68,97,116,97,0,98,116,84,114,97,110,115,
-102,111,114,109,70,108,111,97,116,68,97,116,97,0,98,116,84,114,97,110,
-115,102,111,114,109,68,111,117,98,108,101,68,97,116,97,0,98,116,66,118,
-104,83,117,98,116,114,101,101,73,110,102,111,68,97,116,97,0,98,116,79,
-112,116,105,109,105,122,101,100,66,118,104,78,111,100,101,70,108,111,97,116,
-68,97,116,97,0,98,116,79,112,116,105,109,105,122,101,100,66,118,104,78,
-111,100,101,68,111,117,98,108,101,68,97,116,97,0,98,116,81,117,97,110,
-116,105,122,101,100,66,118,104,78,111,100,101,68,97,116,97,0,98,116,81,
-117,97,110,116,105,122,101,100,66,118,104,70,108,111,97,116,68,97,116,97,
-0,98,116,81,117,97,110,116,105,122,101,100,66,118,104,68,111,117,98,108,
-101,68,97,116,97,0,98,116,67,111,108,108,105,115,105,111,110,83,104,97,
-112,101,68,97,116,97,0,98,116,83,116,97,116,105,99,80,108,97,110,101,
-83,104,97,112,101,68,97,116,97,0,98,116,67,111,110,118,101,120,73,110,
-116,101,114,110,97,108,83,104,97,112,101,68,97,116,97,0,98,116,80,111,
-115,105,116,105,111,110,65,110,100,82,97,100,105,117,115,0,98,116,77,117,
-108,116,105,83,112,104,101,114,101,83,104,97,112,101,68,97,116,97,0,98,
-116,73,110,116,73,110,100,101,120,68,97,116,97,0,98,116,83,104,111,114,
-116,73,110,116,73,110,100,101,120,68,97,116,97,0,98,116,83,104,111,114,
-116,73,110,116,73,110,100,101,120,84,114,105,112,108,101,116,68,97,116,97,
-0,98,116,67,104,97,114,73,110,100,101,120,84,114,105,112,108,101,116,68,
-97,116,97,0,98,116,77,101,115,104,80,97,114,116,68,97,116,97,0,98,
-116,83,116,114,105,100,105,110,103,77,101,115,104,73,110,116,101,114,102,97,
-99,101,68,97,116,97,0,98,116,84,114,105,97,110,103,108,101,77,101,115,
-104,83,104,97,112,101,68,97,116,97,0,98,116,84,114,105,97,110,103,108,
-101,73,110,102,111,77,97,112,68,97,116,97,0,98,116,83,99,97,108,101,
-100,84,114,105,97,110,103,108,101,77,101,115,104,83,104,97,112,101,68,97,
-116,97,0,98,116,67,111,109,112,111,117,110,100,83,104,97,112,101,67,104,
-105,108,100,68,97,116,97,0,98,116,67,111,109,112,111,117,110,100,83,104,
-97,112,101,68,97,116,97,0,98,116,67,121,108,105,110,100,101,114,83,104,
-97,112,101,68,97,116,97,0,98,116,67,97,112,115,117,108,101,83,104,97,
+111,100,105,101,115,0,109,95,111,118,101,114,114,105,100,101,78,117,109,83,
+111,108,118,101,114,73,116,101,114,97,116,105,111,110,115,0,109,95,98,114,
+101,97,107,105,110,103,73,109,112,117,108,115,101,84,104,114,101,115,104,111,
+108,100,0,109,95,105,115,69,110,97,98,108,101,100,0,109,95,116,121,112,
+101,67,111,110,115,116,114,97,105,110,116,68,97,116,97,0,109,95,112,105,
+118,111,116,73,110,65,0,109,95,112,105,118,111,116,73,110,66,0,109,95,
+114,98,65,70,114,97,109,101,0,109,95,114,98,66,70,114,97,109,101,0,
+109,95,117,115,101,82,101,102,101,114,101,110,99,101,70,114,97,109,101,65,
+0,109,95,97,110,103,117,108,97,114,79,110,108,121,0,109,95,101,110,97,
+98,108,101,65,110,103,117,108,97,114,77,111,116,111,114,0,109,95,109,111,
+116,111,114,84,97,114,103,101,116,86,101,108,111,99,105,116,121,0,109,95,
+109,97,120,77,111,116,111,114,73,109,112,117,108,115,101,0,109,95,108,111,
+119,101,114,76,105,109,105,116,0,109,95,117,112,112,101,114,76,105,109,105,
+116,0,109,95,108,105,109,105,116,83,111,102,116,110,101,115,115,0,109,95,
+98,105,97,115,70,97,99,116,111,114,0,109,95,114,101,108,97,120,97,116,
+105,111,110,70,97,99,116,111,114,0,109,95,115,119,105,110,103,83,112,97,
+110,49,0,109,95,115,119,105,110,103,83,112,97,110,50,0,109,95,116,119,
+105,115,116,83,112,97,110,0,109,95,100,97,109,112,105,110,103,0,109,95,
+108,105,110,101,97,114,85,112,112,101,114,76,105,109,105,116,0,109,95,108,
+105,110,101,97,114,76,111,119,101,114,76,105,109,105,116,0,109,95,97,110,
+103,117,108,97,114,85,112,112,101,114,76,105,109,105,116,0,109,95,97,110,
+103,117,108,97,114,76,111,119,101,114,76,105,109,105,116,0,109,95,117,115,
+101,76,105,110,101,97,114,82,101,102,101,114,101,110,99,101,70,114,97,109,
+101,65,0,109,95,117,115,101,79,102,102,115,101,116,70,111,114,67,111,110,
+115,116,114,97,105,110,116,70,114,97,109,101,0,109,95,54,100,111,102,68,
+97,116,97,0,109,95,115,112,114,105,110,103,69,110,97,98,108,101,100,91,
+54,93,0,109,95,101,113,117,105,108,105,98,114,105,117,109,80,111,105,110,
+116,91,54,93,0,109,95,115,112,114,105,110,103,83,116,105,102,102,110,101,
+115,115,91,54,93,0,109,95,115,112,114,105,110,103,68,97,109,112,105,110,
+103,91,54,93,0,109,95,108,105,110,101,97,114,83,116,105,102,102,110,101,
+115,115,0,109,95,97,110,103,117,108,97,114,83,116,105,102,102,110,101,115,
+115,0,109,95,118,111,108,117,109,101,83,116,105,102,102,110,101,115,115,0,
+42,109,95,109,97,116,101,114,105,97,108,0,109,95,112,111,115,105,116,105,
+111,110,0,109,95,112,114,101,118,105,111,117,115,80,111,115,105,116,105,111,
+110,0,109,95,118,101,108,111,99,105,116,121,0,109,95,97,99,99,117,109,
+117,108,97,116,101,100,70,111,114,99,101,0,109,95,110,111,114,109,97,108,
+0,109,95,97,114,101,97,0,109,95,97,116,116,97,99,104,0,109,95,110,
+111,100,101,73,110,100,105,99,101,115,91,50,93,0,109,95,114,101,115,116,
+76,101,110,103,116,104,0,109,95,98,98,101,110,100,105,110,103,0,109,95,
+110,111,100,101,73,110,100,105,99,101,115,91,51,93,0,109,95,114,101,115,
+116,65,114,101,97,0,109,95,99,48,91,52,93,0,109,95,110,111,100,101,
+73,110,100,105,99,101,115,91,52,93,0,109,95,114,101,115,116,86,111,108,
+117,109,101,0,109,95,99,49,0,109,95,99,50,0,109,95,99,48,0,109,
+95,108,111,99,97,108,70,114,97,109,101,0,42,109,95,114,105,103,105,100,
+66,111,100,121,0,109,95,110,111,100,101,73,110,100,101,120,0,109,95,97,
+101,114,111,77,111,100,101,108,0,109,95,98,97,117,109,103,97,114,116,101,
+0,109,95,100,114,97,103,0,109,95,108,105,102,116,0,109,95,112,114,101,
+115,115,117,114,101,0,109,95,118,111,108,117,109,101,0,109,95,100,121,110,
+97,109,105,99,70,114,105,99,116,105,111,110,0,109,95,112,111,115,101,77,
+97,116,99,104,0,109,95,114,105,103,105,100,67,111,110,116,97,99,116,72,
+97,114,100,110,101,115,115,0,109,95,107,105,110,101,116,105,99,67,111,110,
+116,97,99,116,72,97,114,100,110,101,115,115,0,109,95,115,111,102,116,67,
+111,110,116,97,99,116,72,97,114,100,110,101,115,115,0,109,95,97,110,99,
+104,111,114,72,97,114,100,110,101,115,115,0,109,95,115,111,102,116,82,105,
+103,105,100,67,108,117,115,116,101,114,72,97,114,100,110,101,115,115,0,109,
+95,115,111,102,116,75,105,110,101,116,105,99,67,108,117,115,116,101,114,72,
+97,114,100,110,101,115,115,0,109,95,115,111,102,116,83,111,102,116,67,108,
+117,115,116,101,114,72,97,114,100,110,101,115,115,0,109,95,115,111,102,116,
+82,105,103,105,100,67,108,117,115,116,101,114,73,109,112,117,108,115,101,83,
+112,108,105,116,0,109,95,115,111,102,116,75,105,110,101,116,105,99,67,108,
+117,115,116,101,114,73,109,112,117,108,115,101,83,112,108,105,116,0,109,95,
+115,111,102,116,83,111,102,116,67,108,117,115,116,101,114,73,109,112,117,108,
+115,101,83,112,108,105,116,0,109,95,109,97,120,86,111,108,117,109,101,0,
+109,95,116,105,109,101,83,99,97,108,101,0,109,95,118,101,108,111,99,105,
+116,121,73,116,101,114,97,116,105,111,110,115,0,109,95,112,111,115,105,116,
+105,111,110,73,116,101,114,97,116,105,111,110,115,0,109,95,100,114,105,102,
+116,73,116,101,114,97,116,105,111,110,115,0,109,95,99,108,117,115,116,101,
+114,73,116,101,114,97,116,105,111,110,115,0,109,95,114,111,116,0,109,95,
+115,99,97,108,101,0,109,95,97,113,113,0,109,95,99,111,109,0,42,109,
+95,112,111,115,105,116,105,111,110,115,0,42,109,95,119,101,105,103,104,116,
+115,0,109,95,110,117,109,80,111,115,105,116,105,111,110,115,0,109,95,110,
+117,109,87,101,105,103,116,115,0,109,95,98,118,111,108,117,109,101,0,109,
+95,98,102,114,97,109,101,0,109,95,102,114,97,109,101,120,102,111,114,109,
+0,109,95,108,111,99,105,105,0,109,95,105,110,118,119,105,0,109,95,118,
+105,109,112,117,108,115,101,115,91,50,93,0,109,95,100,105,109,112,117,108,
+115,101,115,91,50,93,0,109,95,108,118,0,109,95,97,118,0,42,109,95,
+102,114,97,109,101,114,101,102,115,0,42,109,95,110,111,100,101,73,110,100,
+105,99,101,115,0,42,109,95,109,97,115,115,101,115,0,109,95,110,117,109,
+70,114,97,109,101,82,101,102,115,0,109,95,110,117,109,78,111,100,101,115,
+0,109,95,110,117,109,77,97,115,115,101,115,0,109,95,105,100,109,97,115,
+115,0,109,95,105,109,97,115,115,0,109,95,110,118,105,109,112,117,108,115,
+101,115,0,109,95,110,100,105,109,112,117,108,115,101,115,0,109,95,110,100,
+97,109,112,105,110,103,0,109,95,108,100,97,109,112,105,110,103,0,109,95,
+97,100,97,109,112,105,110,103,0,109,95,109,97,116,99,104,105,110,103,0,
+109,95,109,97,120,83,101,108,102,67,111,108,108,105,115,105,111,110,73,109,
+112,117,108,115,101,0,109,95,115,101,108,102,67,111,108,108,105,115,105,111,
+110,73,109,112,117,108,115,101,70,97,99,116,111,114,0,109,95,99,111,110,
+116,97,105,110,115,65,110,99,104,111,114,0,109,95,99,111,108,108,105,100,
+101,0,109,95,99,108,117,115,116,101,114,73,110,100,101,120,0,42,109,95,
+98,111,100,121,65,0,42,109,95,98,111,100,121,66,0,109,95,114,101,102,
+115,91,50,93,0,109,95,99,102,109,0,109,95,101,114,112,0,109,95,115,
+112,108,105,116,0,109,95,100,101,108,101,116,101,0,109,95,114,101,108,80,
+111,115,105,116,105,111,110,91,50,93,0,109,95,98,111,100,121,65,116,121,
+112,101,0,109,95,98,111,100,121,66,116,121,112,101,0,109,95,106,111,105,
+110,116,84,121,112,101,0,42,109,95,112,111,115,101,0,42,42,109,95,109,
+97,116,101,114,105,97,108,115,0,42,109,95,110,111,100,101,115,0,42,109,
+95,108,105,110,107,115,0,42,109,95,102,97,99,101,115,0,42,109,95,116,
+101,116,114,97,104,101,100,114,97,0,42,109,95,97,110,99,104,111,114,115,
+0,42,109,95,99,108,117,115,116,101,114,115,0,42,109,95,106,111,105,110,
+116,115,0,109,95,110,117,109,77,97,116,101,114,105,97,108,115,0,109,95,
+110,117,109,76,105,110,107,115,0,109,95,110,117,109,70,97,99,101,115,0,
+109,95,110,117,109,84,101,116,114,97,104,101,100,114,97,0,109,95,110,117,
+109,65,110,99,104,111,114,115,0,109,95,110,117,109,67,108,117,115,116,101,
+114,115,0,109,95,110,117,109,74,111,105,110,116,115,0,109,95,99,111,110,
+102,105,103,0,84,89,80,69,72,0,0,0,99,104,97,114,0,117,99,104,
+97,114,0,115,104,111,114,116,0,117,115,104,111,114,116,0,105,110,116,0,
+108,111,110,103,0,117,108,111,110,103,0,102,108,111,97,116,0,100,111,117,
+98,108,101,0,118,111,105,100,0,80,111,105,110,116,101,114,65,114,114,97,
+121,0,98,116,80,104,121,115,105,99,115,83,121,115,116,101,109,0,76,105,
+115,116,66,97,115,101,0,98,116,86,101,99,116,111,114,51,70,108,111,97,
+116,68,97,116,97,0,98,116,86,101,99,116,111,114,51,68,111,117,98,108,
+101,68,97,116,97,0,98,116,77,97,116,114,105,120,51,120,51,70,108,111,
+97,116,68,97,116,97,0,98,116,77,97,116,114,105,120,51,120,51,68,111,
+117,98,108,101,68,97,116,97,0,98,116,84,114,97,110,115,102,111,114,109,
+70,108,111,97,116,68,97,116,97,0,98,116,84,114,97,110,115,102,111,114,
+109,68,111,117,98,108,101,68,97,116,97,0,98,116,66,118,104,83,117,98,
+116,114,101,101,73,110,102,111,68,97,116,97,0,98,116,79,112,116,105,109,
+105,122,101,100,66,118,104,78,111,100,101,70,108,111,97,116,68,97,116,97,
+0,98,116,79,112,116,105,109,105,122,101,100,66,118,104,78,111,100,101,68,
+111,117,98,108,101,68,97,116,97,0,98,116,81,117,97,110,116,105,122,101,
+100,66,118,104,78,111,100,101,68,97,116,97,0,98,116,81,117,97,110,116,
+105,122,101,100,66,118,104,70,108,111,97,116,68,97,116,97,0,98,116,81,
+117,97,110,116,105,122,101,100,66,118,104,68,111,117,98,108,101,68,97,116,
+97,0,98,116,67,111,108,108,105,115,105,111,110,83,104,97,112,101,68,97,
+116,97,0,98,116,83,116,97,116,105,99,80,108,97,110,101,83,104,97,112,
+101,68,97,116,97,0,98,116,67,111,110,118,101,120,73,110,116,101,114,110,
+97,108,83,104,97,112,101,68,97,116,97,0,98,116,80,111,115,105,116,105,
+111,110,65,110,100,82,97,100,105,117,115,0,98,116,77,117,108,116,105,83,
+112,104,101,114,101,83,104,97,112,101,68,97,116,97,0,98,116,73,110,116,
+73,110,100,101,120,68,97,116,97,0,98,116,83,104,111,114,116,73,110,116,
+73,110,100,101,120,68,97,116,97,0,98,116,83,104,111,114,116,73,110,116,
+73,110,100,101,120,84,114,105,112,108,101,116,68,97,116,97,0,98,116,67,
+104,97,114,73,110,100,101,120,84,114,105,112,108,101,116,68,97,116,97,0,
+98,116,77,101,115,104,80,97,114,116,68,97,116,97,0,98,116,83,116,114,
+105,100,105,110,103,77,101,115,104,73,110,116,101,114,102,97,99,101,68,97,
+116,97,0,98,116,84,114,105,97,110,103,108,101,77,101,115,104,83,104,97,
 112,101,68,97,116,97,0,98,116,84,114,105,97,110,103,108,101,73,110,102,
-111,68,97,116,97,0,98,116,71,73,109,112,97,99,116,77,101,115,104,83,
-104,97,112,101,68,97,116,97,0,98,116,67,111,110,118,101,120,72,117,108,
-108,83,104,97,112,101,68,97,116,97,0,98,116,67,111,108,108,105,115,105,
-111,110,79,98,106,101,99,116,68,111,117,98,108,101,68,97,116,97,0,98,
-116,67,111,108,108,105,115,105,111,110,79,98,106,101,99,116,70,108,111,97,
-116,68,97,116,97,0,98,116,82,105,103,105,100,66,111,100,121,70,108,111,
-97,116,68,97,116,97,0,98,116,82,105,103,105,100,66,111,100,121,68,111,
-117,98,108,101,68,97,116,97,0,98,116,67,111,110,115,116,114,97,105,110,
-116,73,110,102,111,49,0,98,116,84,121,112,101,100,67,111,110,115,116,114,
-97,105,110,116,68,97,116,97,0,98,116,82,105,103,105,100,66,111,100,121,
-68,97,116,97,0,98,116,80,111,105,110,116,50,80,111,105,110,116,67,111,
-110,115,116,114,97,105,110,116,70,108,111,97,116,68,97,116,97,0,98,116,
-80,111,105,110,116,50,80,111,105,110,116,67,111,110,115,116,114,97,105,110,
-116,68,111,117,98,108,101,68,97,116,97,0,98,116,72,105,110,103,101,67,
-111,110,115,116,114,97,105,110,116,68,111,117,98,108,101,68,97,116,97,0,
-98,116,72,105,110,103,101,67,111,110,115,116,114,97,105,110,116,70,108,111,
-97,116,68,97,116,97,0,98,116,67,111,110,101,84,119,105,115,116,67,111,
-110,115,116,114,97,105,110,116,68,97,116,97,0,98,116,71,101,110,101,114,
-105,99,54,68,111,102,67,111,110,115,116,114,97,105,110,116,68,97,116,97,
-0,98,116,71,101,110,101,114,105,99,54,68,111,102,83,112,114,105,110,103,
-67,111,110,115,116,114,97,105,110,116,68,97,116,97,0,98,116,83,108,105,
-100,101,114,67,111,110,115,116,114,97,105,110,116,68,97,116,97,0,83,111,
-102,116,66,111,100,121,77,97,116,101,114,105,97,108,68,97,116,97,0,83,
-111,102,116,66,111,100,121,78,111,100,101,68,97,116,97,0,83,111,102,116,
-66,111,100,121,76,105,110,107,68,97,116,97,0,83,111,102,116,66,111,100,
-121,70,97,99,101,68,97,116,97,0,83,111,102,116,66,111,100,121,84,101,
-116,114,97,68,97,116,97,0,83,111,102,116,82,105,103,105,100,65,110,99,
-104,111,114,68,97,116,97,0,83,111,102,116,66,111,100,121,67,111,110,102,
-105,103,68,97,116,97,0,83,111,102,116,66,111,100,121,80,111,115,101,68,
-97,116,97,0,83,111,102,116,66,111,100,121,67,108,117,115,116,101,114,68,
-97,116,97,0,98,116,83,111,102,116,66,111,100,121,74,111,105,110,116,68,
-97,116,97,0,98,116,83,111,102,116,66,111,100,121,70,108,111,97,116,68,
-97,116,97,0,84,76,69,78,1,0,1,0,2,0,2,0,4,0,4,0,
-4,0,4,0,8,0,0,0,16,0,48,0,16,0,16,0,32,0,48,0,
-96,0,64,0,-128,0,20,0,48,0,80,0,16,0,96,0,-112,0,16,0,
-56,0,56,0,20,0,72,0,4,0,4,0,8,0,4,0,56,0,32,0,
-80,0,72,0,96,0,80,0,32,0,64,0,64,0,16,0,72,0,80,0,
--40,1,8,1,-16,1,-88,3,8,0,56,0,0,0,88,0,120,0,96,1,
--32,0,-40,0,0,1,96,1,-48,0,16,0,104,0,24,0,40,0,104,0,
-96,0,104,0,-56,0,104,1,112,0,-40,1,83,84,82,67,61,0,0,0,
-10,0,3,0,4,0,0,0,4,0,1,0,9,0,2,0,11,0,3,0,
-10,0,3,0,10,0,4,0,10,0,5,0,12,0,2,0,9,0,6,0,
-9,0,7,0,13,0,1,0,7,0,8,0,14,0,1,0,8,0,8,0,
-15,0,1,0,13,0,9,0,16,0,1,0,14,0,9,0,17,0,2,0,
-15,0,10,0,13,0,11,0,18,0,2,0,16,0,10,0,14,0,11,0,
-19,0,4,0,4,0,12,0,4,0,13,0,2,0,14,0,2,0,15,0,
-20,0,6,0,13,0,16,0,13,0,17,0,4,0,18,0,4,0,19,0,
-4,0,20,0,0,0,21,0,21,0,6,0,14,0,16,0,14,0,17,0,
-4,0,18,0,4,0,19,0,4,0,20,0,0,0,21,0,22,0,3,0,
-2,0,14,0,2,0,15,0,4,0,22,0,23,0,12,0,13,0,23,0,
-13,0,24,0,13,0,25,0,4,0,26,0,4,0,27,0,4,0,28,0,
-4,0,29,0,20,0,30,0,22,0,31,0,19,0,32,0,4,0,33,0,
-4,0,34,0,24,0,12,0,14,0,23,0,14,0,24,0,14,0,25,0,
-4,0,26,0,4,0,27,0,4,0,28,0,4,0,29,0,21,0,30,0,
-22,0,31,0,4,0,33,0,4,0,34,0,19,0,32,0,25,0,3,0,
-0,0,35,0,4,0,36,0,0,0,37,0,26,0,5,0,25,0,38,0,
-13,0,39,0,13,0,40,0,7,0,41,0,0,0,21,0,27,0,5,0,
-25,0,38,0,13,0,39,0,13,0,42,0,7,0,43,0,4,0,44,0,
-28,0,2,0,13,0,45,0,7,0,46,0,29,0,4,0,27,0,47,0,
-28,0,48,0,4,0,49,0,0,0,37,0,30,0,1,0,4,0,50,0,
-31,0,2,0,2,0,50,0,0,0,51,0,32,0,2,0,2,0,52,0,
-0,0,51,0,33,0,2,0,0,0,52,0,0,0,53,0,34,0,8,0,
-13,0,54,0,14,0,55,0,30,0,56,0,32,0,57,0,33,0,58,0,
-31,0,59,0,4,0,60,0,4,0,61,0,35,0,4,0,34,0,62,0,
-13,0,63,0,4,0,64,0,0,0,37,0,36,0,7,0,25,0,38,0,
-35,0,65,0,23,0,66,0,24,0,67,0,37,0,68,0,7,0,43,0,
-0,0,69,0,38,0,2,0,36,0,70,0,13,0,39,0,39,0,4,0,
-17,0,71,0,25,0,72,0,4,0,73,0,7,0,74,0,40,0,4,0,
-25,0,38,0,39,0,75,0,4,0,76,0,7,0,43,0,41,0,3,0,
-27,0,47,0,4,0,77,0,0,0,37,0,42,0,3,0,27,0,47,0,
-4,0,77,0,0,0,37,0,43,0,4,0,4,0,78,0,7,0,79,0,
-7,0,80,0,7,0,81,0,37,0,14,0,4,0,82,0,4,0,83,0,
-43,0,84,0,4,0,85,0,7,0,86,0,7,0,87,0,7,0,88,0,
-7,0,89,0,7,0,90,0,4,0,91,0,4,0,92,0,4,0,93,0,
-4,0,94,0,0,0,37,0,44,0,5,0,25,0,38,0,35,0,65,0,
-13,0,39,0,7,0,43,0,4,0,95,0,45,0,5,0,27,0,47,0,
-13,0,96,0,14,0,97,0,4,0,98,0,0,0,99,0,46,0,24,0,
-9,0,100,0,9,0,101,0,25,0,102,0,0,0,35,0,18,0,103,0,
-18,0,104,0,14,0,105,0,14,0,106,0,14,0,107,0,8,0,108,0,
-8,0,109,0,8,0,110,0,8,0,111,0,8,0,112,0,8,0,113,0,
-8,0,114,0,4,0,115,0,4,0,116,0,4,0,117,0,4,0,118,0,
-4,0,119,0,4,0,120,0,4,0,121,0,0,0,37,0,47,0,23,0,
-9,0,100,0,9,0,101,0,25,0,102,0,0,0,35,0,17,0,103,0,
-17,0,104,0,13,0,105,0,13,0,106,0,13,0,107,0,7,0,108,0,
-7,0,109,0,7,0,110,0,7,0,111,0,7,0,112,0,7,0,113,0,
-7,0,114,0,4,0,115,0,4,0,116,0,4,0,117,0,4,0,118,0,
-4,0,119,0,4,0,120,0,4,0,121,0,48,0,21,0,47,0,122,0,
-15,0,123,0,13,0,124,0,13,0,125,0,13,0,126,0,13,0,127,0,
-13,0,-128,0,13,0,-127,0,13,0,-126,0,13,0,-125,0,13,0,-124,0,
-7,0,-123,0,7,0,-122,0,7,0,-121,0,7,0,-120,0,7,0,-119,0,
-7,0,-118,0,7,0,-117,0,7,0,-116,0,7,0,-115,0,4,0,-114,0,
-49,0,22,0,46,0,122,0,16,0,123,0,14,0,124,0,14,0,125,0,
-14,0,126,0,14,0,127,0,14,0,-128,0,14,0,-127,0,14,0,-126,0,
-14,0,-125,0,14,0,-124,0,8,0,-123,0,8,0,-122,0,8,0,-121,0,
-8,0,-120,0,8,0,-119,0,8,0,-118,0,8,0,-117,0,8,0,-116,0,
-8,0,-115,0,4,0,-114,0,0,0,37,0,50,0,2,0,4,0,-113,0,
-4,0,-112,0,51,0,11,0,52,0,-111,0,52,0,-110,0,0,0,35,0,
-4,0,-109,0,4,0,-108,0,4,0,-107,0,4,0,-106,0,7,0,-105,0,
-7,0,-104,0,4,0,-103,0,0,0,-102,0,53,0,3,0,51,0,-101,0,
-13,0,-100,0,13,0,-99,0,54,0,3,0,51,0,-101,0,14,0,-100,0,
-14,0,-99,0,55,0,13,0,51,0,-101,0,18,0,-98,0,18,0,-97,0,
-4,0,-96,0,4,0,-95,0,4,0,-94,0,7,0,-93,0,7,0,-92,0,
-7,0,-91,0,7,0,-90,0,7,0,-89,0,7,0,-88,0,7,0,-87,0,
-56,0,13,0,51,0,-101,0,17,0,-98,0,17,0,-97,0,4,0,-96,0,
-4,0,-95,0,4,0,-94,0,7,0,-93,0,7,0,-92,0,7,0,-91,0,
-7,0,-90,0,7,0,-89,0,7,0,-88,0,7,0,-87,0,57,0,11,0,
-51,0,-101,0,17,0,-98,0,17,0,-97,0,7,0,-86,0,7,0,-85,0,
-7,0,-84,0,7,0,-89,0,7,0,-88,0,7,0,-87,0,7,0,-83,0,
-0,0,21,0,58,0,9,0,51,0,-101,0,17,0,-98,0,17,0,-97,0,
-13,0,-82,0,13,0,-81,0,13,0,-80,0,13,0,-79,0,4,0,-78,0,
-4,0,-77,0,59,0,5,0,58,0,-76,0,4,0,-75,0,7,0,-74,0,
-7,0,-73,0,7,0,-72,0,60,0,9,0,51,0,-101,0,17,0,-98,0,
-17,0,-97,0,7,0,-82,0,7,0,-81,0,7,0,-80,0,7,0,-79,0,
-4,0,-78,0,4,0,-77,0,61,0,4,0,7,0,-71,0,7,0,-70,0,
-7,0,-69,0,4,0,78,0,62,0,10,0,61,0,-68,0,13,0,-67,0,
-13,0,-66,0,13,0,-65,0,13,0,-64,0,13,0,-63,0,7,0,-123,0,
-7,0,-62,0,4,0,-61,0,4,0,53,0,63,0,4,0,61,0,-68,0,
-4,0,-60,0,7,0,-59,0,4,0,-58,0,64,0,4,0,13,0,-63,0,
-61,0,-68,0,4,0,-57,0,7,0,-56,0,65,0,7,0,13,0,-55,0,
-61,0,-68,0,4,0,-54,0,7,0,-53,0,7,0,-52,0,7,0,-51,0,
-4,0,53,0,66,0,6,0,15,0,-50,0,13,0,-52,0,13,0,-49,0,
-52,0,-48,0,4,0,-47,0,7,0,-51,0,67,0,26,0,4,0,-46,0,
-7,0,-45,0,7,0,-83,0,7,0,-44,0,7,0,-43,0,7,0,-42,0,
-7,0,-41,0,7,0,-40,0,7,0,-39,0,7,0,-38,0,7,0,-37,0,
-7,0,-36,0,7,0,-35,0,7,0,-34,0,7,0,-33,0,7,0,-32,0,
-7,0,-31,0,7,0,-30,0,7,0,-29,0,7,0,-28,0,7,0,-27,0,
-4,0,-26,0,4,0,-25,0,4,0,-24,0,4,0,-23,0,4,0,116,0,
-68,0,12,0,15,0,-22,0,15,0,-21,0,15,0,-20,0,13,0,-19,0,
-13,0,-18,0,7,0,-17,0,4,0,-16,0,4,0,-15,0,4,0,-14,0,
-4,0,-13,0,7,0,-53,0,4,0,53,0,69,0,27,0,17,0,-12,0,
-15,0,-11,0,15,0,-10,0,13,0,-19,0,13,0,-9,0,13,0,-8,0,
-13,0,-7,0,13,0,-6,0,13,0,-5,0,4,0,-4,0,7,0,-3,0,
-4,0,-2,0,4,0,-1,0,4,0,0,1,7,0,1,1,7,0,2,1,
-4,0,3,1,4,0,4,1,7,0,5,1,7,0,6,1,7,0,7,1,
-7,0,8,1,7,0,9,1,7,0,10,1,4,0,11,1,4,0,12,1,
-4,0,13,1,70,0,12,0,9,0,14,1,9,0,15,1,13,0,16,1,
-7,0,17,1,7,0,18,1,7,0,19,1,4,0,20,1,13,0,21,1,
-4,0,22,1,4,0,23,1,4,0,24,1,4,0,53,0,71,0,19,0,
-47,0,122,0,68,0,25,1,61,0,26,1,62,0,27,1,63,0,28,1,
-64,0,29,1,65,0,30,1,66,0,31,1,69,0,32,1,70,0,33,1,
-4,0,34,1,4,0,-1,0,4,0,35,1,4,0,36,1,4,0,37,1,
-4,0,38,1,4,0,39,1,4,0,40,1,67,0,41,1,};
+111,77,97,112,68,97,116,97,0,98,116,83,99,97,108,101,100,84,114,105,
+97,110,103,108,101,77,101,115,104,83,104,97,112,101,68,97,116,97,0,98,
+116,67,111,109,112,111,117,110,100,83,104,97,112,101,67,104,105,108,100,68,
+97,116,97,0,98,116,67,111,109,112,111,117,110,100,83,104,97,112,101,68,
+97,116,97,0,98,116,67,121,108,105,110,100,101,114,83,104,97,112,101,68,
+97,116,97,0,98,116,67,97,112,115,117,108,101,83,104,97,112,101,68,97,
+116,97,0,98,116,84,114,105,97,110,103,108,101,73,110,102,111,68,97,116,
+97,0,98,116,71,73,109,112,97,99,116,77,101,115,104,83,104,97,112,101,
+68,97,116,97,0,98,116,67,111,110,118,101,120,72,117,108,108,83,104,97,
+112,101,68,97,116,97,0,98,116,67,111,108,108,105,115,105,111,110,79,98,
+106,101,99,116,68,111,117,98,108,101,68,97,116,97,0,98,116,67,111,108,
+108,105,115,105,111,110,79,98,106,101,99,116,70,108,111,97,116,68,97,116,
+97,0,98,116,82,105,103,105,100,66,111,100,121,70,108,111,97,116,68,97,
+116,97,0,98,116,82,105,103,105,100,66,111,100,121,68,111,117,98,108,101,
+68,97,116,97,0,98,116,67,111,110,115,116,114,97,105,110,116,73,110,102,
+111,49,0,98,116,84,121,112,101,100,67,111,110,115,116,114,97,105,110,116,
+68,97,116,97,0,98,116,82,105,103,105,100,66,111,100,121,68,97,116,97,
+0,98,116,80,111,105,110,116,50,80,111,105,110,116,67,111,110,115,116,114,
+97,105,110,116,70,108,111,97,116,68,97,116,97,0,98,116,80,111,105,110,
+116,50,80,111,105,110,116,67,111,110,115,116,114,97,105,110,116,68,111,117,
+98,108,101,68,97,116,97,0,98,116,72,105,110,103,101,67,111,110,115,116,
+114,97,105,110,116,68,111,117,98,108,101,68,97,116,97,0,98,116,72,105,
+110,103,101,67,111,110,115,116,114,97,105,110,116,70,108,111,97,116,68,97,
+116,97,0,98,116,67,111,110,101,84,119,105,115,116,67,111,110,115,116,114,
+97,105,110,116,68,97,116,97,0,98,116,71,101,110,101,114,105,99,54,68,
+111,102,67,111,110,115,116,114,97,105,110,116,68,97,116,97,0,98,116,71,
+101,110,101,114,105,99,54,68,111,102,83,112,114,105,110,103,67,111,110,115,
+116,114,97,105,110,116,68,97,116,97,0,98,116,83,108,105,100,101,114,67,
+111,110,115,116,114,97,105,110,116,68,97,116,97,0,83,111,102,116,66,111,
+100,121,77,97,116,101,114,105,97,108,68,97,116,97,0,83,111,102,116,66,
+111,100,121,78,111,100,101,68,97,116,97,0,83,111,102,116,66,111,100,121,
+76,105,110,107,68,97,116,97,0,83,111,102,116,66,111,100,121,70,97,99,
+101,68,97,116,97,0,83,111,102,116,66,111,100,121,84,101,116,114,97,68,
+97,116,97,0,83,111,102,116,82,105,103,105,100,65,110,99,104,111,114,68,
+97,116,97,0,83,111,102,116,66,111,100,121,67,111,110,102,105,103,68,97,
+116,97,0,83,111,102,116,66,111,100,121,80,111,115,101,68,97,116,97,0,
+83,111,102,116,66,111,100,121,67,108,117,115,116,101,114,68,97,116,97,0,
+98,116,83,111,102,116,66,111,100,121,74,111,105,110,116,68,97,116,97,0,
+98,116,83,111,102,116,66,111,100,121,70,108,111,97,116,68,97,116,97,0,
+84,76,69,78,1,0,1,0,2,0,2,0,4,0,4,0,4,0,4,0,
+8,0,0,0,16,0,48,0,16,0,16,0,32,0,48,0,96,0,64,0,
+-128,0,20,0,48,0,80,0,16,0,96,0,-112,0,16,0,56,0,56,0,
+20,0,72,0,4,0,4,0,8,0,4,0,56,0,32,0,80,0,72,0,
+96,0,80,0,32,0,64,0,64,0,16,0,72,0,80,0,-40,1,8,1,
+-16,1,-88,3,8,0,64,0,0,0,96,0,-128,0,104,1,-24,0,-32,0,
+8,1,104,1,-40,0,16,0,104,0,24,0,40,0,104,0,96,0,104,0,
+-56,0,104,1,112,0,-40,1,83,84,82,67,61,0,0,0,10,0,3,0,
+4,0,0,0,4,0,1,0,9,0,2,0,11,0,3,0,10,0,3,0,
+10,0,4,0,10,0,5,0,12,0,2,0,9,0,6,0,9,0,7,0,
+13,0,1,0,7,0,8,0,14,0,1,0,8,0,8,0,15,0,1,0,
+13,0,9,0,16,0,1,0,14,0,9,0,17,0,2,0,15,0,10,0,
+13,0,11,0,18,0,2,0,16,0,10,0,14,0,11,0,19,0,4,0,
+4,0,12,0,4,0,13,0,2,0,14,0,2,0,15,0,20,0,6,0,
+13,0,16,0,13,0,17,0,4,0,18,0,4,0,19,0,4,0,20,0,
+0,0,21,0,21,0,6,0,14,0,16,0,14,0,17,0,4,0,18,0,
+4,0,19,0,4,0,20,0,0,0,21,0,22,0,3,0,2,0,14,0,
+2,0,15,0,4,0,22,0,23,0,12,0,13,0,23,0,13,0,24,0,
+13,0,25,0,4,0,26,0,4,0,27,0,4,0,28,0,4,0,29,0,
+20,0,30,0,22,0,31,0,19,0,32,0,4,0,33,0,4,0,34,0,
+24,0,12,0,14,0,23,0,14,0,24,0,14,0,25,0,4,0,26,0,
+4,0,27,0,4,0,28,0,4,0,29,0,21,0,30,0,22,0,31,0,
+4,0,33,0,4,0,34,0,19,0,32,0,25,0,3,0,0,0,35,0,
+4,0,36,0,0,0,37,0,26,0,5,0,25,0,38,0,13,0,39,0,
+13,0,40,0,7,0,41,0,0,0,21,0,27,0,5,0,25,0,38,0,
+13,0,39,0,13,0,42,0,7,0,43,0,4,0,44,0,28,0,2,0,
+13,0,45,0,7,0,46,0,29,0,4,0,27,0,47,0,28,0,48,0,
+4,0,49,0,0,0,37,0,30,0,1,0,4,0,50,0,31,0,2,0,
+2,0,50,0,0,0,51,0,32,0,2,0,2,0,52,0,0,0,51,0,
+33,0,2,0,0,0,52,0,0,0,53,0,34,0,8,0,13,0,54,0,
+14,0,55,0,30,0,56,0,32,0,57,0,33,0,58,0,31,0,59,0,
+4,0,60,0,4,0,61,0,35,0,4,0,34,0,62,0,13,0,63,0,
+4,0,64,0,0,0,37,0,36,0,7,0,25,0,38,0,35,0,65,0,
+23,0,66,0,24,0,67,0,37,0,68,0,7,0,43,0,0,0,69,0,
+38,0,2,0,36,0,70,0,13,0,39,0,39,0,4,0,17,0,71,0,
+25,0,72,0,4,0,73,0,7,0,74,0,40,0,4,0,25,0,38,0,
+39,0,75,0,4,0,76,0,7,0,43,0,41,0,3,0,27,0,47,0,
+4,0,77,0,0,0,37,0,42,0,3,0,27,0,47,0,4,0,77,0,
+0,0,37,0,43,0,4,0,4,0,78,0,7,0,79,0,7,0,80,0,
+7,0,81,0,37,0,14,0,4,0,82,0,4,0,83,0,43,0,84,0,
+4,0,85,0,7,0,86,0,7,0,87,0,7,0,88,0,7,0,89,0,
+7,0,90,0,4,0,91,0,4,0,92,0,4,0,93,0,4,0,94,0,
+0,0,37,0,44,0,5,0,25,0,38,0,35,0,65,0,13,0,39,0,
+7,0,43,0,4,0,95,0,45,0,5,0,27,0,47,0,13,0,96,0,
+14,0,97,0,4,0,98,0,0,0,99,0,46,0,24,0,9,0,100,0,
+9,0,101,0,25,0,102,0,0,0,35,0,18,0,103,0,18,0,104,0,
+14,0,105,0,14,0,106,0,14,0,107,0,8,0,108,0,8,0,109,0,
+8,0,110,0,8,0,111,0,8,0,112,0,8,0,113,0,8,0,114,0,
+4,0,115,0,4,0,116,0,4,0,117,0,4,0,118,0,4,0,119,0,
+4,0,120,0,4,0,121,0,0,0,37,0,47,0,23,0,9,0,100,0,
+9,0,101,0,25,0,102,0,0,0,35,0,17,0,103,0,17,0,104,0,
+13,0,105,0,13,0,106,0,13,0,107,0,7,0,108,0,7,0,109,0,
+7,0,110,0,7,0,111,0,7,0,112,0,7,0,113,0,7,0,114,0,
+4,0,115,0,4,0,116,0,4,0,117,0,4,0,118,0,4,0,119,0,
+4,0,120,0,4,0,121,0,48,0,21,0,47,0,122,0,15,0,123,0,
+13,0,124,0,13,0,125,0,13,0,126,0,13,0,127,0,13,0,-128,0,
+13,0,-127,0,13,0,-126,0,13,0,-125,0,13,0,-124,0,7,0,-123,0,
+7,0,-122,0,7,0,-121,0,7,0,-120,0,7,0,-119,0,7,0,-118,0,
+7,0,-117,0,7,0,-116,0,7,0,-115,0,4,0,-114,0,49,0,22,0,
+46,0,122,0,16,0,123,0,14,0,124,0,14,0,125,0,14,0,126,0,
+14,0,127,0,14,0,-128,0,14,0,-127,0,14,0,-126,0,14,0,-125,0,
+14,0,-124,0,8,0,-123,0,8,0,-122,0,8,0,-121,0,8,0,-120,0,
+8,0,-119,0,8,0,-118,0,8,0,-117,0,8,0,-116,0,8,0,-115,0,
+4,0,-114,0,0,0,37,0,50,0,2,0,4,0,-113,0,4,0,-112,0,
+51,0,13,0,52,0,-111,0,52,0,-110,0,0,0,35,0,4,0,-109,0,
+4,0,-108,0,4,0,-107,0,4,0,-106,0,7,0,-105,0,7,0,-104,0,
+4,0,-103,0,4,0,-102,0,7,0,-101,0,4,0,-100,0,53,0,3,0,
+51,0,-99,0,13,0,-98,0,13,0,-97,0,54,0,3,0,51,0,-99,0,
+14,0,-98,0,14,0,-97,0,55,0,13,0,51,0,-99,0,18,0,-96,0,
+18,0,-95,0,4,0,-94,0,4,0,-93,0,4,0,-92,0,7,0,-91,0,
+7,0,-90,0,7,0,-89,0,7,0,-88,0,7,0,-87,0,7,0,-86,0,
+7,0,-85,0,56,0,13,0,51,0,-99,0,17,0,-96,0,17,0,-95,0,
+4,0,-94,0,4,0,-93,0,4,0,-92,0,7,0,-91,0,7,0,-90,0,
+7,0,-89,0,7,0,-88,0,7,0,-87,0,7,0,-86,0,7,0,-85,0,
+57,0,11,0,51,0,-99,0,17,0,-96,0,17,0,-95,0,7,0,-84,0,
+7,0,-83,0,7,0,-82,0,7,0,-87,0,7,0,-86,0,7,0,-85,0,
+7,0,-81,0,0,0,21,0,58,0,9,0,51,0,-99,0,17,0,-96,0,
+17,0,-95,0,13,0,-80,0,13,0,-79,0,13,0,-78,0,13,0,-77,0,
+4,0,-76,0,4,0,-75,0,59,0,5,0,58,0,-74,0,4,0,-73,0,
+7,0,-72,0,7,0,-71,0,7,0,-70,0,60,0,9,0,51,0,-99,0,
+17,0,-96,0,17,0,-95,0,7,0,-80,0,7,0,-79,0,7,0,-78,0,
+7,0,-77,0,4,0,-76,0,4,0,-75,0,61,0,4,0,7,0,-69,0,
+7,0,-68,0,7,0,-67,0,4,0,78,0,62,0,10,0,61,0,-66,0,
+13,0,-65,0,13,0,-64,0,13,0,-63,0,13,0,-62,0,13,0,-61,0,
+7,0,-123,0,7,0,-60,0,4,0,-59,0,4,0,53,0,63,0,4,0,
+61,0,-66,0,4,0,-58,0,7,0,-57,0,4,0,-56,0,64,0,4,0,
+13,0,-61,0,61,0,-66,0,4,0,-55,0,7,0,-54,0,65,0,7,0,
+13,0,-53,0,61,0,-66,0,4,0,-52,0,7,0,-51,0,7,0,-50,0,
+7,0,-49,0,4,0,53,0,66,0,6,0,15,0,-48,0,13,0,-50,0,
+13,0,-47,0,52,0,-46,0,4,0,-45,0,7,0,-49,0,67,0,26,0,
+4,0,-44,0,7,0,-43,0,7,0,-81,0,7,0,-42,0,7,0,-41,0,
+7,0,-40,0,7,0,-39,0,7,0,-38,0,7,0,-37,0,7,0,-36,0,
+7,0,-35,0,7,0,-34,0,7,0,-33,0,7,0,-32,0,7,0,-31,0,
+7,0,-30,0,7,0,-29,0,7,0,-28,0,7,0,-27,0,7,0,-26,0,
+7,0,-25,0,4,0,-24,0,4,0,-23,0,4,0,-22,0,4,0,-21,0,
+4,0,116,0,68,0,12,0,15,0,-20,0,15,0,-19,0,15,0,-18,0,
+13,0,-17,0,13,0,-16,0,7,0,-15,0,4,0,-14,0,4,0,-13,0,
+4,0,-12,0,4,0,-11,0,7,0,-51,0,4,0,53,0,69,0,27,0,
+17,0,-10,0,15,0,-9,0,15,0,-8,0,13,0,-17,0,13,0,-7,0,
+13,0,-6,0,13,0,-5,0,13,0,-4,0,13,0,-3,0,4,0,-2,0,
+7,0,-1,0,4,0,0,1,4,0,1,1,4,0,2,1,7,0,3,1,
+7,0,4,1,4,0,5,1,4,0,6,1,7,0,7,1,7,0,8,1,
+7,0,9,1,7,0,10,1,7,0,11,1,7,0,12,1,4,0,13,1,
+4,0,14,1,4,0,15,1,70,0,12,0,9,0,16,1,9,0,17,1,
+13,0,18,1,7,0,19,1,7,0,20,1,7,0,21,1,4,0,22,1,
+13,0,23,1,4,0,24,1,4,0,25,1,4,0,26,1,4,0,53,0,
+71,0,19,0,47,0,122,0,68,0,27,1,61,0,28,1,62,0,29,1,
+63,0,30,1,64,0,31,1,65,0,32,1,66,0,33,1,69,0,34,1,
+70,0,35,1,4,0,36,1,4,0,1,1,4,0,37,1,4,0,38,1,
+4,0,39,1,4,0,40,1,4,0,41,1,4,0,42,1,67,0,43,1,
+};
 int sBulletDNAlen64= sizeof(sBulletDNAstr64);
diff --git a/extern/bullet2/src/LinearMath/btSerializer.h b/extern/bullet2/src/LinearMath/btSerializer.h
index 52520d72b9e..76f3cf32f8e 100644
--- a/extern/bullet2/src/LinearMath/btSerializer.h
+++ b/extern/bullet2/src/LinearMath/btSerializer.h
@@ -28,9 +28,9 @@ subject to the following restrictions:
 
 
 ///only the 32bit versions for now
-extern unsigned char sBulletDNAstr[];
+extern char sBulletDNAstr[];
 extern int sBulletDNAlen;
-extern unsigned char sBulletDNAstr64[];
+extern char sBulletDNAstr64[];
 extern int sBulletDNAlen64;
 
 SIMD_FORCE_INLINE	int btStrLen(const char* str) 
@@ -213,7 +213,7 @@ protected:
 
 			int *intPtr=0;
 			short *shtPtr=0;
-			char *cp = 0;int dataLen =0;long nr=0;
+			char *cp = 0;int dataLen =0;
 			intPtr = (int*)m_dna;
 
 			/*
@@ -246,15 +246,7 @@ protected:
 				while (*cp)cp++;
 				cp++;
 			}
-			{
-				nr= (long)cp;
-			//	long mask=3;
-				nr= ((nr+3)&~3)-nr;
-				while (nr--)
-				{
-					cp++;
-				}
-			}
+			cp = btAlignPointer(cp,4);
 
 			/*
 				TYPE (4 bytes)
@@ -281,15 +273,7 @@ protected:
 				cp++;
 			}
 
-		{
-				nr= (long)cp;
-			//	long mask=3;
-				nr= ((nr+3)&~3)-nr;
-				while (nr--)
-				{
-					cp++;
-				}
-			}
+			cp = btAlignPointer(cp,4);
 
 
 			/*
@@ -453,8 +437,8 @@ public:
 
 
 			buffer[9] = '2';
-			buffer[10] = '7';
-			buffer[11] = '8';
+			buffer[10] = '8';
+			buffer[11] = '0';
 
 		}
 
diff --git a/extern/bullet2/src/LinearMath/btSimdMinMax.h b/extern/bullet2/src/LinearMath/btSimdMinMax.h
deleted file mode 100644
index 75e83f3c53f..00000000000
--- a/extern/bullet2/src/LinearMath/btSimdMinMax.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-
-
-#ifndef SIMD_MINMAX_H
-#define SIMD_MINMAX_H
-#include "btScalar.h"
-
-template <class T>
-SIMD_FORCE_INLINE const T& btMin(const T& a, const T& b) {
-  return b < a ? b : a;
-}
-
-template <class T>
-SIMD_FORCE_INLINE const T& btMax(const T& a, const T& b) {
-  return  a < b ? b : a;
-}
-
-template <class T>
-SIMD_FORCE_INLINE void btSetMin(T& a, const T& b) {
-    if (a > b) a = b;
-}
-
-template <class T>
-SIMD_FORCE_INLINE void btSetMax(T& a, const T& b) {
-    if (a < b) a = b;
-}
-
-#endif
diff --git a/extern/bullet2/src/LinearMath/btTransform.h b/extern/bullet2/src/LinearMath/btTransform.h
index 187b09116cc..5e52d183acb 100644
--- a/extern/bullet2/src/LinearMath/btTransform.h
+++ b/extern/bullet2/src/LinearMath/btTransform.h
@@ -14,8 +14,8 @@ subject to the following restrictions:
 
 
 
-#ifndef btTransform_H
-#define btTransform_H
+#ifndef BT_TRANSFORM_H
+#define BT_TRANSFORM_H
 
 
 #include "btMatrix3x3.h"
@@ -298,7 +298,7 @@ SIMD_FORCE_INLINE	void	btTransform::deSerializeDouble(const btTransformDoubleDat
 }
 
 
-#endif
+#endif //BT_TRANSFORM_H
 
 
 
diff --git a/extern/bullet2/src/LinearMath/btTransformUtil.h b/extern/bullet2/src/LinearMath/btTransformUtil.h
index 626110ce4ee..2303c274275 100644
--- a/extern/bullet2/src/LinearMath/btTransformUtil.h
+++ b/extern/bullet2/src/LinearMath/btTransformUtil.h
@@ -13,8 +13,8 @@ subject to the following restrictions:
 */
 
 
-#ifndef SIMD_TRANSFORM_UTIL_H
-#define SIMD_TRANSFORM_UTIL_H
+#ifndef BT_TRANSFORM_UTIL_H
+#define BT_TRANSFORM_UTIL_H
 
 #include "btTransform.h"
 #define ANGULAR_MOTION_THRESHOLD btScalar(0.5)*SIMD_HALF_PI
@@ -224,5 +224,5 @@ public:
 };
 
 
-#endif //SIMD_TRANSFORM_UTIL_H
+#endif //BT_TRANSFORM_UTIL_H
 
diff --git a/extern/bullet2/src/LinearMath/btVector3.h b/extern/bullet2/src/LinearMath/btVector3.h
index 068e87c94ab..d99b7c83ae3 100644
--- a/extern/bullet2/src/LinearMath/btVector3.h
+++ b/extern/bullet2/src/LinearMath/btVector3.h
@@ -14,8 +14,8 @@ subject to the following restrictions:
 
 
 
-#ifndef SIMD__VECTOR3_H
-#define SIMD__VECTOR3_H
+#ifndef BT_VECTOR3_H
+#define BT_VECTOR3_H
 
 
 #include "btScalar.h"
@@ -763,4 +763,4 @@ SIMD_FORCE_INLINE void	btVector3::deSerialize(const struct	btVector3Data& dataIn
 }
 
 
-#endif //SIMD__VECTOR3_H
+#endif //BT_VECTOR3_H
diff --git a/extern/bullet2/src/SConscript b/extern/bullet2/src/SConscript
index f59bcba9fa6..8a3db17f6d1 100644
--- a/extern/bullet2/src/SConscript
+++ b/extern/bullet2/src/SConscript
@@ -21,25 +21,18 @@ elif sys.platform=='darwin':
     defs += ' NDEBUG'
     cflags += ['-O2','-pipe', '-fPIC', '-funsigned-char', '-ffast-math']
 
-linearmath_src = env.Glob("LinearMath/*.cpp")
-
-bulletdyn_src = env.Glob("BulletDynamics/Vehicle/*.cpp") + env.Glob("BulletDynamics/ConstraintSolver/*.cpp") + env.Glob("BulletDynamics/Dynamics/*.cpp")
-
-collision_broadphase_src = env.Glob("BulletCollision/BroadphaseCollision/*.cpp")
-collision_dispatch_src = env.Glob("BulletCollision/CollisionDispatch/*.cpp")
-collision_gimpact_src = env.Glob("BulletCollision/Gimpact/*.cpp")
-collision_shapes_src =  env.Glob("BulletCollision/CollisionShapes/*.cpp")
-collision_narrowphase_src =  env.Glob("BulletCollision/NarrowPhaseCollision/*.cpp")
-
-softbody_src = env.Glob("BulletSoftBody/*.cpp")
+bullet2_src = env.Glob("LinearMath/*.cpp")
+bullet2_src += env.Glob("BulletCollision/BroadphaseCollision/*.cpp")
+bullet2_src += env.Glob("BulletCollision/CollisionDispatch/*.cpp")
+bullet2_src += env.Glob("BulletCollision/Gimpact/*.cpp")
+bullet2_src += env.Glob("BulletCollision/CollisionShapes/*.cpp")
+bullet2_src += env.Glob("BulletCollision/NarrowPhaseCollision/*.cpp")
+bullet2_src += env.Glob("BulletDynamics/Vehicle/*.cpp")
+bullet2_src += env.Glob("BulletDynamics/ConstraintSolver/*.cpp")
+bullet2_src += env.Glob("BulletDynamics/Dynamics/*.cpp")
+bullet2_src += env.Glob("BulletDynamics/Character/*.cpp")
+bullet2_src += env.Glob("BulletSoftBody/*.cpp")
 
 incs = '. BulletCollision BulletDynamics LinearMath BulletSoftBody'
 
-env.BlenderLib ( libname = 'extern_bullet2linmath', sources=linearmath_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,137], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2dynamics', sources=bulletdyn_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[19,136], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2collision_broadphase', sources=collision_broadphase_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[25,145], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2collision_dispatch', sources=collision_dispatch_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,138], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2collision_gimpact', sources=collision_gimpact_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,138], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2collision_shapes', sources=collision_shapes_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,138], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2collision_narrowphase', sources=collision_narrowphase_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,138], compileflags=cflags )
-env.BlenderLib ( libname = 'extern_bullet2softbody', sources=softbody_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[30,135], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2', sources=bullet2_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,137], compileflags=cflags )
diff --git a/extern/bullet2/src/btBulletDynamicsCommon.h b/extern/bullet2/src/btBulletDynamicsCommon.h
index db8b37989f5..ccfad19b87a 100644
--- a/extern/bullet2/src/btBulletDynamicsCommon.h
+++ b/extern/bullet2/src/btBulletDynamicsCommon.h
@@ -20,7 +20,6 @@ subject to the following restrictions:
 #include "btBulletCollisionCommon.h"
 
 #include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h"
-#include "BulletDynamics/Dynamics/btContinuousDynamicsWorld.h"
 
 #include "BulletDynamics/Dynamics/btSimpleDynamicsWorld.h"
 #include "BulletDynamics/Dynamics/btRigidBody.h"
diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt
index 6be813883ec..60cd84d89d4 100644
--- a/extern/libmv/CMakeLists.txt
+++ b/extern/libmv/CMakeLists.txt
@@ -32,6 +32,7 @@ set(INC
 	third_party/ssba
 	third_party/ldl/Include
 	../colamd/Include
+	third_party/ceres/include
 )
 
 set(INC_SYS
@@ -61,6 +62,7 @@ set(SRC
 	libmv/multiview/fundamental.cc
 	libmv/multiview/projection.cc
 	libmv/multiview/triangulation.cc
+	libmv/multiview/homography.cc
 	libmv/numeric/numeric.cc
 	libmv/numeric/poly.cc
 	libmv/simple_pipeline/bundle.cc
@@ -83,6 +85,7 @@ set(SRC
 	libmv/tracking/pyramid_region_tracker.cc
 	libmv/tracking/retrack_region_tracker.cc
 	libmv/tracking/trklt_region_tracker.cc
+	libmv/tracking/track_region.cc
 
 	third_party/fast/fast_10.c
 	third_party/fast/fast_11.c
@@ -250,3 +253,5 @@ add_definitions(
 )
 
 blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}")
+
+add_subdirectory(third_party)
diff --git a/extern/libmv/SConscript b/extern/libmv/SConscript
index fbb6ee36f85..b47086f3e91 100644
--- a/extern/libmv/SConscript
+++ b/extern/libmv/SConscript
@@ -30,7 +30,7 @@ src += env.Glob('third_party/ldl/Source/*.c')
 src += env.Glob('third_party/ssba/Geometry/*.cpp')
 src += env.Glob('third_party/ssba/Math/*.cpp')
 
-incs = '. ../Eigen3'
+incs = '. ../Eigen3 third_party/ceres/include'
 incs += ' ' + env['BF_PNG_INC']
 incs += ' ' + env['BF_ZLIB_INC']
 
@@ -65,3 +65,5 @@ else:
 incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'
 
 env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137], compileflags=cflags_libmv, cc_compileflags=ccflags_libmv, cxx_compileflags=cxxflags_libmv )
+
+SConscript(['third_party/SConscript'])
diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh
index 3f58097b881..3f877508c46 100755
--- a/extern/libmv/bundle.sh
+++ b/extern/libmv/bundle.sh
@@ -25,7 +25,9 @@ for p in `cat ./patches/series`; do
 done
 
 find libmv -type f -not -iwholename '*.svn*' -exec rm -rf {} \;
-find third_party -type f -not -iwholename '*.svn*' -exec rm -rf {} \;
+find third_party -type f -not -iwholename '*.svn*' -not -iwholename '*third_party/ceres*' \
+    -not -iwholename '*third_party/SConscript*' -not -iwholename '*third_party/CMakeLists.txt*' \
+    -exec rm -rf {} \;
 
 cat "files.txt" | while read f; do
   mkdir -p `dirname $f`
@@ -39,14 +41,14 @@ chmod 664 ./third_party/glog/src/windows/*.cc ./third_party/glog/src/windows/*.h
 sources=`find ./libmv -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | sed -r 's/^\.\//\t/' | sort -d`
 headers=`find ./libmv -type f -iname '*.h' | sed -r 's/^\.\//\t/' | sort -d`
 
-third_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep -v glog | sed -r 's/^\.\//\t/' | sort -d`
-third_headers=`find ./third_party -type f -iname '*.h' | grep -v glog | sed -r 's/^\.\//\t/' | sort -d`
+third_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep -v glog | grep -v ceres | sed -r 's/^\.\//\t/' | sort -d`
+third_headers=`find ./third_party -type f -iname '*.h' | grep -v glog | grep -v ceres | sed -r 's/^\.\//\t/' | sort -d`
 
 third_glog_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep glog | grep -v windows | sed -r 's/^\.\//\t\t/' | sort -d`
 third_glog_headers=`find ./third_party -type f -iname '*.h' | grep glog | grep -v windows | sed -r 's/^\.\//\t\t/' | sort -d`
 
 src_dir=`find ./libmv -type f -iname '*.cc' -exec dirname {} \; -or -iname '*.cpp' -exec dirname {} \; -or -iname '*.c' -exec dirname {} \; | sed -r 's/^\.\//\t/' | sort -d | uniq`
-src_third_dir=`find ./third_party -type f -iname '*.cc' -exec dirname {} \; -or -iname '*.cpp' -exec dirname {} \; -or -iname '*.c' -exec dirname {} \; | sed -r 's/^\.\//\t/'  | sort -d | uniq`
+src_third_dir=`find ./third_party -type f -iname '*.cc' -exec dirname {} \; -or -iname '*.cpp' -exec dirname {} \; -or -iname '*.c' -exec dirname {} \;  | grep -v ceres | sed -r 's/^\.\//\t/'  | sort -d | uniq`
 src=""
 win_src=""
 for x in $src_dir $src_third_dir; do
@@ -126,6 +128,7 @@ set(INC
 	third_party/ssba
 	third_party/ldl/Include
 	../colamd/Include
+	third_party/ceres/include
 )
 
 set(INC_SYS
@@ -220,6 +223,8 @@ add_definitions(
 )
 
 blender_add_lib(extern_libmv "\${SRC}" "\${INC}" "\${INC_SYS}")
+
+add_subdirectory(third_party)
 EOF
 
 cat > SConscript << EOF
@@ -246,7 +251,7 @@ defs.append('GOOGLE_GLOG_DLL_DECL=')
 src = env.Glob("*.cpp")
 $src
 
-incs = '. ../Eigen3'
+incs = '. ../Eigen3 third_party/ceres/include'
 incs += ' ' + env['BF_PNG_INC']
 incs += ' ' + env['BF_ZLIB_INC']
 
@@ -281,4 +286,6 @@ else:
 incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'
 
 env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137], compileflags=cflags_libmv, cc_compileflags=ccflags_libmv, cxx_compileflags=cxxflags_libmv )
+
+SConscript(['third_party/SConscript'])
 EOF
diff --git a/extern/libmv/libmv-capi.cpp b/extern/libmv/libmv-capi.cpp
index 6c20d76eeac..3d3b7398c9b 100644
--- a/extern/libmv/libmv-capi.cpp
+++ b/extern/libmv/libmv-capi.cpp
@@ -28,6 +28,10 @@
    tracking between which failed */
 #undef DUMP_FAILURE
 
+/* define this to generate PNG images with content of search areas
+   on every itteration of tracking */
+#undef DUMP_ALWAYS
+
 #include "libmv-capi.h"
 
 #include "third_party/gflags/gflags/gflags.h"
@@ -45,6 +49,7 @@
 #include "libmv/tracking/trklt_region_tracker.h"
 #include "libmv/tracking/lmicklt_region_tracker.h"
 #include "libmv/tracking/pyramid_region_tracker.h"
+#include "libmv/tracking/track_region.h"
 
 #include "libmv/simple_pipeline/callbacks.h"
 #include "libmv/simple_pipeline/tracks.h"
@@ -59,7 +64,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#ifdef DUMP_FAILURE
+#if defined(DUMP_FAILURE) || defined (DUMP_ALWAYS)
 #  include <png.h>
 #endif
 
@@ -97,7 +102,7 @@ void libmv_initLogging(const char *argv0)
 void libmv_startDebugLogging(void)
 {
 	google::SetCommandLineOption("logtostderr", "1");
-	google::SetCommandLineOption("v", "0");
+	google::SetCommandLineOption("v", "2");
 	google::SetCommandLineOption("stderrthreshold", "1");
 	google::SetCommandLineOption("minloglevel", "0");
 	V3D::optimizerVerbosenessLevel = 1;
@@ -158,20 +163,35 @@ libmv_RegionTracker *libmv_bruteRegionTrackerNew(int half_window_size, double mi
 	return (libmv_RegionTracker *)brute_region_tracker;
 }
 
-static void floatBufToImage(const float *buf, int width, int height, libmv::FloatImage *image)
+static void floatBufToImage(const float *buf, int width, int height, int channels, libmv::FloatImage *image)
 {
-	int x, y, a = 0;
+	int x, y, k, a = 0;
 
-	image->resize(height, width);
+	image->Resize(height, width, channels);
 
 	for (y = 0; y < height; y++) {
 		for (x = 0; x < width; x++) {
-			(*image)(y, x, 0) = buf[a++];
+			for (k = 0; k < channels; k++) {
+				(*image)(y, x, k) = buf[a++];
+			}
+		}
+	}
+}
+
+static void imageToFloatBuf(const libmv::FloatImage *image, int channels, float *buf)
+{
+	int x, y, k, a = 0;
+
+	for (y = 0; y < image->Height(); y++) {
+		for (x = 0; x < image->Width(); x++) {
+			for (k = 0; k < channels; k++) {
+				buf[a++] = (*image)(y, x, k);
+			}
 		}
 	}
 }
 
-#ifdef DUMP_FAILURE
+#if defined(DUMP_FAILURE) || defined (DUMP_ALWAYS)
 void savePNGImage(png_bytep *row_pointers, int width, int height, int depth, int color_type, char *file_name)
 {
 	png_infop info_ptr;
@@ -223,7 +243,7 @@ void savePNGImage(png_bytep *row_pointers, int width, int height, int depth, int
 	fclose(fp);
 }
 
-static void saveImage(char *prefix, libmv::FloatImage image, int x0, int y0)
+static void saveImage(const char *prefix, libmv::FloatImage image, int x0, int y0)
 {
 	int x, y;
 	png_bytep *row_pointers;
@@ -234,14 +254,14 @@ static void saveImage(char *prefix, libmv::FloatImage image, int x0, int y0)
 		row_pointers[y]= (png_bytep)malloc(sizeof(png_byte)*4*image.Width());
 
 		for (x = 0; x < image.Width(); x++) {
-			if (x0 == x && y0 == y) {
+			if (x0 == x && image.Height() - y0 - 1 == y) {
 				row_pointers[y][x*4+0]= 255;
 				row_pointers[y][x*4+1]= 0;
 				row_pointers[y][x*4+2]= 0;
 				row_pointers[y][x*4+3]= 255;
 			}
 			else {
-				float pixel = image(y, x, 0);
+				float pixel = image(image.Height() - y - 1, x, 0);
 				row_pointers[y][x*4+0]= pixel*255;
 				row_pointers[y][x*4+1]= pixel*255;
 				row_pointers[y][x*4+2]= pixel*255;
@@ -263,7 +283,7 @@ static void saveImage(char *prefix, libmv::FloatImage image, int x0, int y0)
 	free(row_pointers);
 }
 
-static void saveBytesImage(char *prefix, unsigned char *data, int width, int height)
+static void saveBytesImage(const char *prefix, unsigned char *data, int width, int height)
 {
 	int x, y;
 	png_bytep *row_pointers;
@@ -302,19 +322,23 @@ int libmv_regionTrackerTrack(libmv_RegionTracker *libmv_tracker, const float *im
 	libmv::RegionTracker *region_tracker = (libmv::RegionTracker *)libmv_tracker;
 	libmv::FloatImage old_patch, new_patch;
 
-	floatBufToImage(ima1, width, height, &old_patch);
-	floatBufToImage(ima2, width, height, &new_patch);
+	floatBufToImage(ima1, width, height, 1, &old_patch);
+	floatBufToImage(ima2, width, height, 1, &new_patch);
 
-#ifndef DUMP_FAILURE
+#if !defined(DUMP_FAILURE) && !defined(DUMP_ALWAYS)
 	return region_tracker->Track(old_patch, new_patch, x1, y1, x2, y2);
 #else
 	{
-		double sx2 = *x2, sy2 = *y2;
+		/* double sx2 = *x2, sy2 = *y2; */
 		int result = region_tracker->Track(old_patch, new_patch, x1, y1, x2, y2);
 
+#if defined(DUMP_ALWAYS)
+		{
+#else
 		if (!result) {
+#endif
 			saveImage("old_patch", old_patch, x1, y1);
-			saveImage("new_patch", new_patch, sx2, sy2);
+			saveImage("new_patch", new_patch, *x2, *y2);
 		}
 
 		return result;
@@ -329,6 +353,120 @@ void libmv_regionTrackerDestroy(libmv_RegionTracker *libmv_tracker)
 	delete region_tracker;
 }
 
+/* ************ Planar tracker ************ */
+
+/* TrackRegion (new planar tracker) */
+int libmv_trackRegion(const struct libmv_trackRegionOptions *options,
+                      const float *image1, int image1_width, int image1_height,
+                      const float *image2, int image2_width, int image2_height,
+                      const double *x1, const double *y1,
+                      struct libmv_trackRegionResult *result,
+                      double *x2, double *y2)
+{
+	double xx1[5], yy1[5];
+	double xx2[5], yy2[5];
+	bool tracking_result = false;
+
+	/* Convert to doubles for the libmv api. The four corners and the center. */
+	for (int i = 0; i < 5; ++i) {
+		xx1[i] = x1[i];
+		yy1[i] = y1[i];
+		xx2[i] = x2[i];
+		yy2[i] = y2[i];
+	}
+
+	libmv::TrackRegionOptions track_region_options;
+	libmv::FloatImage image1_mask;
+
+	switch (options->motion_model) {
+#define LIBMV_CONVERT(the_model) \
+    case libmv::TrackRegionOptions::the_model: \
+		track_region_options.mode = libmv::TrackRegionOptions::the_model; \
+		break;
+		LIBMV_CONVERT(TRANSLATION)
+		LIBMV_CONVERT(TRANSLATION_ROTATION)
+		LIBMV_CONVERT(TRANSLATION_SCALE)
+		LIBMV_CONVERT(TRANSLATION_ROTATION_SCALE)
+		LIBMV_CONVERT(AFFINE)
+		LIBMV_CONVERT(HOMOGRAPHY)
+#undef LIBMV_CONVERT
+	}
+
+	track_region_options.minimum_correlation = options->minimum_correlation;
+	track_region_options.max_iterations = options->num_iterations;
+	track_region_options.sigma = options->sigma;
+	track_region_options.num_extra_points = 1;
+	track_region_options.image1_mask = NULL;
+	track_region_options.use_brute_initialization = options->use_brute;
+	track_region_options.use_normalized_intensities = options->use_normalization;
+
+	if (options->image1_mask) {
+		floatBufToImage(options->image1_mask, image1_width, image1_height, 1, &image1_mask);
+
+		track_region_options.image1_mask = &image1_mask;
+	}
+
+	/* Convert from raw float buffers to libmv's FloatImage. */
+	libmv::FloatImage old_patch, new_patch;
+	floatBufToImage(image1, image1_width, image1_height, 1, &old_patch);
+	floatBufToImage(image2, image2_width, image2_height, 1, &new_patch);
+
+	libmv::TrackRegionResult track_region_result;
+	libmv::TrackRegion(old_patch, new_patch, xx1, yy1, track_region_options, xx2, yy2, &track_region_result);
+
+	/* Convert to floats for the blender api. */
+	for (int i = 0; i < 5; ++i) {
+		x2[i] = xx2[i];
+		y2[i] = yy2[i];
+	}
+
+	/* TODO(keir): Update the termination string with failure details. */
+	if (track_region_result.termination == libmv::TrackRegionResult::PARAMETER_TOLERANCE ||
+	    track_region_result.termination == libmv::TrackRegionResult::FUNCTION_TOLERANCE  ||
+	    track_region_result.termination == libmv::TrackRegionResult::GRADIENT_TOLERANCE  ||
+	    track_region_result.termination == libmv::TrackRegionResult::NO_CONVERGENCE)
+	{
+		tracking_result = true;
+	}
+
+#if defined(DUMP_FAILURE) || defined(DUMP_ALWAYS)
+#if defined(DUMP_ALWAYS)
+	{
+#else
+	if (!tracking_result) {
+#endif
+		saveImage("old_patch", old_patch, x1[4], y1[4]);
+		saveImage("new_patch", new_patch, x2[4], y2[4]);
+	}
+#endif
+
+	return tracking_result;
+}
+
+void libmv_samplePlanarPatch(const float *image, int width, int height,
+                             int channels, const double *xs, const double *ys,
+                             int num_samples_x, int num_samples_y,
+                             const float *mask, float *patch,
+                             double *warped_position_x, double *warped_position_y)
+{
+	libmv::FloatImage libmv_image, libmv_patch, libmv_mask;
+	libmv::FloatImage *libmv_mask_for_sample = NULL;
+
+	floatBufToImage(image, width, height, channels, &libmv_image);
+
+	if (mask) {
+		floatBufToImage(mask, width, height, 1, &libmv_mask);
+
+		libmv_mask_for_sample = &libmv_mask;
+	}
+
+	libmv::SamplePlanarPatch(libmv_image, xs, ys, num_samples_x, num_samples_y,
+	                         libmv_mask_for_sample, &libmv_patch,
+	                         warped_position_x, warped_position_y);
+
+	imageToFloatBuf(&libmv_patch, channels, patch);
+}
+
 /* ************ Tracks ************ */
 
 libmv_Tracks *libmv_tracksNew(void)
diff --git a/extern/libmv/libmv-capi.h b/extern/libmv/libmv-capi.h
index bccc4706832..fc3b6f94f62 100644
--- a/extern/libmv/libmv-capi.h
+++ b/extern/libmv/libmv-capi.h
@@ -50,6 +50,36 @@ int libmv_regionTrackerTrack(struct libmv_RegionTracker *libmv_tracker, const fl
 			int width, int height, double  x1, double  y1, double *x2, double *y2);
 void libmv_regionTrackerDestroy(struct libmv_RegionTracker *libmv_tracker);
 
+/* TrackRegion (new planar tracker) */
+struct libmv_trackRegionOptions {
+	int motion_model;
+	int num_iterations;
+	int use_brute;
+	int use_normalization;
+	double minimum_correlation;
+	double sigma;
+	float *image1_mask;
+};
+
+struct libmv_trackRegionResult {
+	int termination;
+	const char *termination_reason;
+	double correlation;
+};
+
+int libmv_trackRegion(const struct libmv_trackRegionOptions *options,
+                      const float *image1, int image1_width, int image1_height,
+                      const float *image2, int image2_width, int image2_height,
+                      const double *x1, const double *y1,
+                      struct libmv_trackRegionResult *result,
+                      double *x2, double *y2);
+
+void libmv_samplePlanarPatch(const float *image, int width, int height,
+                             int channels, const double *xs, const double *ys,
+                             int num_samples_x, int num_samples_y,
+                             const float *mask, float *patch,
+                             double *warped_position_x, double *warped_position_y);
+
 /* Tracks */
 struct libmv_Tracks *libmv_tracksNew(void);
 void libmv_tracksInsert(struct libmv_Tracks *libmv_tracks, int image, int track, double x, double y);
diff --git a/extern/libmv/libmv/image/sample.h b/extern/libmv/libmv/image/sample.h
index e842747e6d4..a8850effeab 100644
--- a/extern/libmv/libmv/image/sample.h
+++ b/extern/libmv/libmv/image/sample.h
@@ -34,25 +34,22 @@ inline T SampleNearest(const Array3D<T> &image,
   return image(i, j, v);
 }
 
-static inline void LinearInitAxis(float fx, int width,
-                                  int *x1, int *x2,
-                                  float *dx1, float *dx2) {
-  const int ix = int(fx);
+inline void LinearInitAxis(float x, int size,
+                           int *x1, int *x2,
+                           float *dx) {
+  const int ix = static_cast<int>(x);
   if (ix < 0) {
     *x1 = 0;
     *x2 = 0;
-    *dx1 = 1;
-    *dx2 = 0;
-  } else if (ix > width-2) {
-    *x1 = width-1;
-    *x2 = width-1;
-    *dx1 = 1;
-    *dx2 = 0;
+    *dx = 1.0;
+  } else if (ix > size - 2) {
+    *x1 = size - 1;
+    *x2 = size - 1;
+    *dx = 1.0;
   } else {
     *x1 = ix;
-    *x2 = *x1 + 1;
-    *dx1 = *x2 - fx;
-    *dx2 = 1 - *dx1;
+    *x2 = ix + 1;
+    *dx = *x2 - x;
   }
 }
 
@@ -60,18 +57,47 @@ static inline void LinearInitAxis(float fx, int width,
 template<typename T>
 inline T SampleLinear(const Array3D<T> &image, float y, float x, int v = 0) {
   int x1, y1, x2, y2;
-  float dx1, dy1, dx2, dy2;
+  float dx, dy;
 
-  LinearInitAxis(y, image.Height(), &y1, &y2, &dy1, &dy2);
-  LinearInitAxis(x, image.Width(),  &x1, &x2, &dx1, &dx2);
+  // Take the upper left corner as integer pixel positions.
+  x -= 0.5;
+  y -= 0.5;
+
+  LinearInitAxis(y, image.Height(), &y1, &y2, &dy);
+  LinearInitAxis(x, image.Width(),  &x1, &x2, &dx);
 
   const T im11 = image(y1, x1, v);
   const T im12 = image(y1, x2, v);
   const T im21 = image(y2, x1, v);
   const T im22 = image(y2, x2, v);
 
-  return T(dy1 * ( dx1 * im11 + dx2 * im12 ) +
-           dy2 * ( dx1 * im21 + dx2 * im22 ));
+  return T(     dy  * ( dx * im11 + (1.0 - dx) * im12 ) +
+           (1 - dy) * ( dx * im21 + (1.0 - dx) * im22 ));
+}
+
+/// Linear interpolation, of all channels. The sample is assumed to have the
+/// same size as the number of channels in image.
+template<typename T>
+inline void SampleLinear(const Array3D<T> &image, float y, float x, T *sample) {
+  int x1, y1, x2, y2;
+  float dx, dy;
+
+  // Take the upper left corner as integer pixel positions.
+  x -= 0.5;
+  y -= 0.5;
+
+  LinearInitAxis(y, image.Height(), &y1, &y2, &dy);
+  LinearInitAxis(x, image.Width(),  &x1, &x2, &dx);
+
+  for (int i = 0; i < image.Depth(); ++i) {
+    const T im11 = image(y1, x1, i);
+    const T im12 = image(y1, x2, i);
+    const T im21 = image(y2, x1, i);
+    const T im22 = image(y2, x2, i);
+
+    sample[i] = T(     dy  * ( dx * im11 + (1.0 - dx) * im12 ) +
+                  (1 - dy) * ( dx * im21 + (1.0 - dx) * im22 ));
+  }
 }
 
 // Downsample all channels by 2. If the image has odd width or height, the last
diff --git a/extern/libmv/libmv/multiview/homography.cc b/extern/libmv/libmv/multiview/homography.cc
new file mode 100644
index 00000000000..366392f3923
--- /dev/null
+++ b/extern/libmv/libmv/multiview/homography.cc
@@ -0,0 +1,267 @@
+// Copyright (c) 2008, 2009 libmv authors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+
+#include "libmv/logging/logging.h"
+#include "libmv/multiview/homography.h"
+#include "libmv/multiview/homography_parameterization.h"
+
+namespace libmv {
+/** 2D Homography transformation estimation in the case that points are in 
+ * euclidean coordinates.
+ *
+ * x = H y
+ * x and y vector must have the same direction, we could write
+ * crossproduct(|x|, * H * |y| ) = |0|
+ *
+ * | 0 -1  x2|   |a b c|   |y1|    |0|
+ * | 1  0 -x1| * |d e f| * |y2| =  |0|
+ * |-x2  x1 0|   |g h 1|   |1 |    |0|
+ *
+ * That gives :
+ *
+ * (-d+x2*g)*y1    + (-e+x2*h)*y2 + -f+x2          |0|
+ * (a-x1*g)*y1     + (b-x1*h)*y2  + c-x1         = |0|
+ * (-x2*a+x1*d)*y1 + (-x2*b+x1*e)*y2 + -x2*c+x1*f  |0|
+ */
+bool Homography2DFromCorrespondencesLinearEuc(
+    const Mat &x1,
+    const Mat &x2,
+    Mat3 *H,
+    double expected_precision) {
+  assert(2 == x1.rows());
+  assert(4 <= x1.cols());
+  assert(x1.rows() == x2.rows());
+  assert(x1.cols() == x2.cols());
+
+  int n = x1.cols();
+  MatX8 L = Mat::Zero(n * 3, 8);
+  Mat b = Mat::Zero(n * 3, 1);
+  for (int i = 0; i < n; ++i) {
+    int j = 3 * i;
+    L(j, 0) =  x1(0, i);            // a
+    L(j, 1) =  x1(1, i);            // b
+    L(j, 2) =  1.0;                 // c
+    L(j, 6) = -x2(0, i) * x1(0, i); // g
+    L(j, 7) = -x2(0, i) * x1(1, i); // h
+    b(j, 0) =  x2(0, i);            // i
+
+    ++j;
+    L(j, 3) =  x1(0, i);            // d
+    L(j, 4) =  x1(1, i);            // e
+    L(j, 5) =  1.0;                 // f
+    L(j, 6) = -x2(1, i) * x1(0, i); // g
+    L(j, 7) = -x2(1, i) * x1(1, i); // h
+    b(j, 0) =  x2(1, i);            // i
+    
+    // This ensures better stability
+    // TODO(julien) make a lite version without this 3rd set
+    ++j;
+    L(j, 0) =  x2(1, i) * x1(0, i); // a
+    L(j, 1) =  x2(1, i) * x1(1, i); // b
+    L(j, 2) =  x2(1, i);            // c
+    L(j, 3) = -x2(0, i) * x1(0, i); // d
+    L(j, 4) = -x2(0, i) * x1(1, i); // e
+    L(j, 5) = -x2(0, i) ;           // f
+  }
+  // Solve Lx=B
+  Vec h = L.fullPivLu().solve(b);
+  Homography2DNormalizedParameterization<double>::To(h, H);
+  if ((L * h).isApprox(b, expected_precision))  {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+/** 2D Homography transformation estimation in the case that points are in 
+ * homogeneous coordinates.
+ *
+ * | 0 -x3  x2|   |a b c|   |y1|   -x3*d+x2*g -x3*e+x2*h -x3*f+x2*1    |y1|   (-x3*d+x2*g)*y1 (-x3*e+x2*h)*y2 (-x3*f+x2*1)*y3   |0|
+ * | x3  0 -x1| * |d e f| * |y2| =  x3*a-x1*g  x3*b-x1*h  x3*c-x1*1  * |y2| =  (x3*a-x1*g)*y1  (x3*b-x1*h)*y2  (x3*c-x1*1)*y3 = |0|
+ * |-x2  x1  0|   |g h 1|   |y3|   -x2*a+x1*d -x2*b+x1*e -x2*c+x1*f    |y3|   (-x2*a+x1*d)*y1 (-x2*b+x1*e)*y2 (-x2*c+x1*f)*y3   |0|
+ * X = |a b c d e f g h|^t
+ */
+bool Homography2DFromCorrespondencesLinear(const Mat &x1,
+                                           const Mat &x2,
+                                           Mat3 *H,
+                                           double expected_precision) {
+  if (x1.rows() == 2) {
+    return Homography2DFromCorrespondencesLinearEuc(x1, x2, H, 
+                                                    expected_precision);
+  }
+  assert(3 == x1.rows());
+  assert(4 <= x1.cols());
+  assert(x1.rows() == x2.rows());
+  assert(x1.cols() == x2.cols());
+
+  const int x = 0;
+  const int y = 1;
+  const int w = 2;
+  int n = x1.cols();
+  MatX8 L = Mat::Zero(n * 3, 8);
+  Mat b = Mat::Zero(n * 3, 1);
+  for (int i = 0; i < n; ++i) {
+    int j = 3 * i;
+    L(j, 0) =  x2(w, i) * x1(x, i);//a
+    L(j, 1) =  x2(w, i) * x1(y, i);//b
+    L(j, 2) =  x2(w, i) * x1(w, i);//c
+    L(j, 6) = -x2(x, i) * x1(x, i);//g
+    L(j, 7) = -x2(x, i) * x1(y, i);//h
+    b(j, 0) =  x2(x, i) * x1(w, i);
+
+    ++j;
+    L(j, 3) =  x2(w, i) * x1(x, i);//d
+    L(j, 4) =  x2(w, i) * x1(y, i);//e
+    L(j, 5) =  x2(w, i) * x1(w, i);//f
+    L(j, 6) = -x2(y, i) * x1(x, i);//g
+    L(j, 7) = -x2(y, i) * x1(y, i);//h
+    b(j, 0) =  x2(y, i) * x1(w, i);
+
+    // This ensures better stability
+    ++j;
+    L(j, 0) =  x2(y, i) * x1(x, i);//a
+    L(j, 1) =  x2(y, i) * x1(y, i);//b
+    L(j, 2) =  x2(y, i) * x1(w, i);//c
+    L(j, 3) = -x2(x, i) * x1(x, i);//d
+    L(j, 4) = -x2(x, i) * x1(y, i);//e
+    L(j, 5) = -x2(x, i) * x1(w, i);//f
+  }
+  // Solve Lx=B
+  Vec h = L.fullPivLu().solve(b);
+  if ((L * h).isApprox(b, expected_precision))  {
+    Homography2DNormalizedParameterization<double>::To(h, H);
+    return true;
+  } else {
+    return false;
+  }
+}
+/**
+ * x2 ~ A * x1
+ * x2^t * Hi * A *x1 = 0
+ * H1 =              H2 =               H3 = 
+ * | 0 0 0 1|     |-x2w|  |0 0 0 0|      |  0 |  | 0 0 1 0|     |-x2z|
+ * | 0 0 0 0|  -> |  0 |  |0 0 1 0|   -> |-x2z|  | 0 0 0 0|  -> |  0 |
+ * | 0 0 0 0|     |  0 |  |0-1 0 0|      | x2y|  |-1 0 0 0|     | x2x|
+ * |-1 0 0 0|     | x2x|  |0 0 0 0|      |  0 |  | 0 0 0 0|     |  0 |
+ * H4 =              H5 =               H6 = 
+ *  |0 0 0 0|     |  0 |  | 0 1 0 0|     |-x2y|   |0 0 0 0|     |  0 |
+ *  |0 0 0 1|  -> |-x2w|  |-1 0 0 0|  -> | x2x|   |0 0 0 0|  -> |  0 |
+ *  |0 0 0 0|     |  0 |  | 0 0 0 0|     |  0 |   |0 0 0 1|     |-x2w|
+ *  |0-1 0 0|     | x2y|  | 0 0 0 0|     |  0 |   |0 0-1 0|     | x2z|
+ *     |a b c d| 
+ * A = |e f g h| 
+ *     |i j k l|
+ *     |m n o 1| 
+ *     
+ * x2^t * H1 * A *x1 = (-x2w*a +x2x*m )*x1x + (-x2w*b +x2x*n )*x1y + (-x2w*c +x2x*o )*x1z + (-x2w*d +x2x*1 )*x1w = 0
+ * x2^t * H2 * A *x1 = (-x2z*e +x2y*i )*x1x + (-x2z*f +x2y*j )*x1y + (-x2z*g +x2y*k )*x1z + (-x2z*h +x2y*l )*x1w = 0
+ * x2^t * H3 * A *x1 = (-x2z*a +x2x*i )*x1x + (-x2z*b +x2x*j )*x1y + (-x2z*c +x2x*k )*x1z + (-x2z*d +x2x*l )*x1w = 0
+ * x2^t * H4 * A *x1 = (-x2w*e +x2y*m )*x1x + (-x2w*f +x2y*n )*x1y + (-x2w*g +x2y*o )*x1z + (-x2w*h +x2y*1 )*x1w = 0
+ * x2^t * H5 * A *x1 = (-x2y*a +x2x*e )*x1x + (-x2y*b +x2x*f )*x1y + (-x2y*c +x2x*g )*x1z + (-x2y*d +x2x*h )*x1w = 0
+ * x2^t * H6 * A *x1 = (-x2w*i +x2z*m )*x1x + (-x2w*j +x2z*n )*x1y + (-x2w*k +x2z*o )*x1z + (-x2w*l +x2z*1 )*x1w = 0
+ *
+ * X = |a b c d e f g h i j k l m n o|^t
+*/
+bool Homography3DFromCorrespondencesLinear(const Mat &x1,
+                                           const Mat &x2,
+                                           Mat4 *H,
+                                           double expected_precision) {
+  assert(4 == x1.rows());
+  assert(5 <= x1.cols());
+  assert(x1.rows() == x2.rows());
+  assert(x1.cols() == x2.cols());
+  const int x = 0;
+  const int y = 1;
+  const int z = 2;
+  const int w = 3;
+  int n = x1.cols();
+  MatX15 L = Mat::Zero(n * 6, 15);
+  Mat b = Mat::Zero(n * 6, 1);
+  for (int i = 0; i < n; ++i) {
+    int j = 6 * i;
+    L(j, 0) = -x2(w, i) * x1(x, i);//a
+    L(j, 1) = -x2(w, i) * x1(y, i);//b
+    L(j, 2) = -x2(w, i) * x1(z, i);//c
+    L(j, 3) = -x2(w, i) * x1(w, i);//d
+    L(j,12) =  x2(x, i) * x1(x, i);//m
+    L(j,13) =  x2(x, i) * x1(y, i);//n
+    L(j,14) =  x2(x, i) * x1(z, i);//o
+    b(j, 0) = -x2(x, i) * x1(w, i);
+    
+    ++j;
+    L(j, 4) = -x2(z, i) * x1(x, i);//e
+    L(j, 5) = -x2(z, i) * x1(y, i);//f
+    L(j, 6) = -x2(z, i) * x1(z, i);//g
+    L(j, 7) = -x2(z, i) * x1(w, i);//h
+    L(j, 8) =  x2(y, i) * x1(x, i);//i
+    L(j, 9) =  x2(y, i) * x1(y, i);//j
+    L(j,10) =  x2(y, i) * x1(z, i);//k
+    L(j,11) =  x2(y, i) * x1(w, i);//l
+    
+    ++j;
+    L(j, 0) = -x2(z, i) * x1(x, i);//a
+    L(j, 1) = -x2(z, i) * x1(y, i);//b
+    L(j, 2) = -x2(z, i) * x1(z, i);//c
+    L(j, 3) = -x2(z, i) * x1(w, i);//d
+    L(j, 8) =  x2(x, i) * x1(x, i);//i
+    L(j, 9) =  x2(x, i) * x1(y, i);//j
+    L(j,10) =  x2(x, i) * x1(z, i);//k
+    L(j,11) =  x2(x, i) * x1(w, i);//l
+    
+    ++j;
+    L(j, 4) = -x2(w, i) * x1(x, i);//e
+    L(j, 5) = -x2(w, i) * x1(y, i);//f
+    L(j, 6) = -x2(w, i) * x1(z, i);//g
+    L(j, 7) = -x2(w, i) * x1(w, i);//h
+    L(j,12) =  x2(y, i) * x1(x, i);//m
+    L(j,13) =  x2(y, i) * x1(y, i);//n
+    L(j,14) =  x2(y, i) * x1(z, i);//o
+    b(j, 0) = -x2(y, i) * x1(w, i);
+    
+    ++j;
+    L(j, 0) = -x2(y, i) * x1(x, i);//a
+    L(j, 1) = -x2(y, i) * x1(y, i);//b
+    L(j, 2) = -x2(y, i) * x1(z, i);//c
+    L(j, 3) = -x2(y, i) * x1(w, i);//d
+    L(j, 4) =  x2(x, i) * x1(x, i);//e
+    L(j, 5) =  x2(x, i) * x1(y, i);//f
+    L(j, 6) =  x2(x, i) * x1(z, i);//g
+    L(j, 7) =  x2(x, i) * x1(w, i);//h
+    
+    ++j;
+    L(j, 8) = -x2(w, i) * x1(x, i);//i
+    L(j, 9) = -x2(w, i) * x1(y, i);//j
+    L(j,10) = -x2(w, i) * x1(z, i);//k
+    L(j,11) = -x2(w, i) * x1(w, i);//l
+    L(j,12) =  x2(z, i) * x1(x, i);//m
+    L(j,13) =  x2(z, i) * x1(y, i);//n
+    L(j,14) =  x2(z, i) * x1(z, i);//o
+    b(j, 0) = -x2(z, i) * x1(w, i);
+  }
+  // Solve Lx=B
+  Vec h = L.fullPivLu().solve(b);
+  if ((L * h).isApprox(b, expected_precision))  {
+    Homography3DNormalizedParameterization<double>::To(h, H);
+    return true;
+  } else {
+    return false;
+  }
+}
+}  // namespace libmv
diff --git a/extern/libmv/libmv/multiview/homography.h b/extern/libmv/libmv/multiview/homography.h
new file mode 100644
index 00000000000..786fd3df8ca
--- /dev/null
+++ b/extern/libmv/libmv/multiview/homography.h
@@ -0,0 +1,84 @@
+// Copyright (c) 2011 libmv authors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+
+#ifndef LIBMV_MULTIVIEW_HOMOGRAPHY_H_
+#define LIBMV_MULTIVIEW_HOMOGRAPHY_H_
+
+#include "libmv/numeric/numeric.h"
+
+namespace libmv {
+
+/**
+ * 2D homography transformation estimation.
+ * 
+ * This function estimates the homography transformation from a list of 2D
+ * correspondences which represents either:
+ *
+ * - 3D points on a plane, with a general moving camera.
+ * - 3D points with a rotating camera (pure rotation).
+ * - 3D points + different planar projections
+ * 
+ * \param x1 The first 2xN or 3xN matrix of euclidean or homogeneous points.
+ * \param x2 The second 2xN or 3xN matrix of euclidean or homogeneous points.
+ * \param  H The 3x3 homography transformation matrix (8 dof) such that
+ *               x2 = H * x1   with       |a b c| 
+ *                                    H = |d e f|
+ *                                        |g h 1| 
+ * \param expected_precision The expected precision in order for instance 
+ *                           to accept almost homography matrices.
+ *
+ * \return True if the transformation estimation has succeeded.
+ * \note There must be at least 4 non-colinear points.
+ */
+bool Homography2DFromCorrespondencesLinear(const Mat &x1,
+                                           const Mat &x2,
+                                           Mat3 *H,
+                                           double expected_precision = 
+                                             EigenDouble::dummy_precision());
+
+/**
+ * 3D Homography transformation estimation.
+ * 
+ * This function can be used in order to estimate the homography transformation
+ * from a list of 3D correspondences.
+ *
+ * \param[in] x1 The first 4xN matrix of homogeneous points
+ * \param[in] x2 The second 4xN matrix of homogeneous points
+ * \param[out] H The 4x4 homography transformation matrix (15 dof) such that
+ *               x2 = H * x1   with       |a b c d| 
+ *                                    H = |e f g h|
+ *                                        |i j k l|
+ *                                        |m n o 1| 
+ * \param[in] expected_precision The expected precision in order for instance 
+ *        to accept almost homography matrices.
+ * 
+ * \return true if the transformation estimation has succeeded
+ * 
+ * \note Need at least 5 non coplanar points 
+ * \note Points coordinates must be in homogeneous coordinates
+ */
+bool Homography3DFromCorrespondencesLinear(const Mat &x1,
+                                           const Mat &x2,
+                                           Mat4 *H,
+                                           double expected_precision = 
+                                             EigenDouble::dummy_precision());
+} // namespace libmv
+
+#endif  // LIBMV_MULTIVIEW_HOMOGRAPHY_H_
diff --git a/extern/libmv/libmv/multiview/homography_parameterization.h b/extern/libmv/libmv/multiview/homography_parameterization.h
new file mode 100644
index 00000000000..b31642eea15
--- /dev/null
+++ b/extern/libmv/libmv/multiview/homography_parameterization.h
@@ -0,0 +1,91 @@
+// Copyright (c) 2011 libmv authors.
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+
+#ifndef LIBMV_MULTIVIEW_HOMOGRAPHY_PARAMETERIZATION_H_
+#define LIBMV_MULTIVIEW_HOMOGRAPHY_PARAMETERIZATION_H_
+
+#include "libmv/numeric/numeric.h"
+
+namespace libmv {
+
+/** A parameterization of the 2D homography matrix that uses 8 parameters so 
+ * that the matrix is normalized (H(2,2) == 1).
+ * The homography matrix H is built from a list of 8 parameters (a, b,...g, h)
+ * as follows
+ *         |a b c| 
+ *     H = |d e f|
+ *         |g h 1| 
+ */
+template<typename T = double>
+class Homography2DNormalizedParameterization {
+ public:
+  typedef Eigen::Matrix<T, 8, 1> Parameters;     // a, b, ... g, h
+  typedef Eigen::Matrix<T, 3, 3> Parameterized;  // H
+
+  /// Convert from the 8 parameters to a H matrix.
+  static void To(const Parameters &p, Parameterized *h) {    
+    *h << p(0), p(1), p(2),
+          p(3), p(4), p(5),
+          p(6), p(7), 1.0;
+  }
+
+  /// Convert from a H matrix to the 8 parameters.
+  static void From(const Parameterized &h, Parameters *p) {
+    *p << h(0, 0), h(0, 1), h(0, 2),
+          h(1, 0), h(1, 1), h(1, 2),
+          h(2, 0), h(2, 1);
+  }
+};
+
+/** A parameterization of the 2D homography matrix that uses 15 parameters so 
+ * that the matrix is normalized (H(3,3) == 1).
+ * The homography matrix H is built from a list of 15 parameters (a, b,...n, o)
+ * as follows
+ *          |a b c d| 
+ *      H = |e f g h|
+ *          |i j k l|
+ *          |m n o 1| 
+ */
+template<typename T = double>
+class Homography3DNormalizedParameterization {
+ public:
+  typedef Eigen::Matrix<T, 15, 1> Parameters;     // a, b, ... n, o
+  typedef Eigen::Matrix<T, 4, 4>  Parameterized;  // H
+
+  /// Convert from the 15 parameters to a H matrix.
+  static void To(const Parameters &p, Parameterized *h) {   
+    *h << p(0), p(1), p(2), p(3),
+          p(4), p(5), p(6), p(7),
+          p(8), p(9), p(10), p(11),
+          p(12), p(13), p(14), 1.0;
+  }
+
+  /// Convert from a H matrix to the 15 parameters.
+  static void From(const Parameterized &h, Parameters *p) {
+    *p << h(0, 0), h(0, 1), h(0, 2), h(0, 3),
+          h(1, 0), h(1, 1), h(1, 2), h(1, 3),
+          h(2, 0), h(2, 1), h(2, 2), h(2, 3),
+          h(3, 0), h(3, 1), h(3, 2);
+  }
+};
+
+} // namespace libmv
+
+#endif  // LIBMV_MULTIVIEW_HOMOGRAPHY_PARAMETERIZATION_H_
diff --git a/extern/libmv/libmv/tracking/esm_region_tracker.cc b/extern/libmv/libmv/tracking/esm_region_tracker.cc
index 221fa4d081b..a8dc46d439b 100644
--- a/extern/libmv/libmv/tracking/esm_region_tracker.cc
+++ b/extern/libmv/libmv/tracking/esm_region_tracker.cc
@@ -29,6 +29,7 @@
 #include "libmv/image/correlation.h"
 #include "libmv/image/sample.h"
 #include "libmv/numeric/numeric.h"
+#include "libmv/tracking/track_region.h"
 
 namespace libmv {
 
@@ -72,6 +73,44 @@ bool EsmRegionTracker::Track(const FloatImage &image1,
     return false;
   }
   
+  // XXX
+  // TODO(keir): Delete the block between the XXX's once the planar tracker is
+  // integrated into blender.
+  //
+  // For now, to test, replace the ESM tracker with the Ceres tracker in
+  // translation mode. In the future, this should get removed and alloed to
+  // co-exist, since Ceres is not as fast as the ESM implementation since it
+  // specializes for translation.
+  double xx1[4], yy1[4];
+  double xx2[4], yy2[4];
+  // Clockwise winding, starting from the "origin" (top-left).
+  xx1[0] = xx2[0] = x1 - half_window_size;
+  yy1[0] = yy2[0] = y1 - half_window_size;
+
+  xx1[1] = xx2[1] = x1 + half_window_size;
+  yy1[1] = yy2[1] = y1 - half_window_size;
+
+  xx1[2] = xx2[2] = x1 + half_window_size;
+  yy1[2] = yy2[2] = y1 + half_window_size;
+
+  xx1[3] = xx2[3] = x1 - half_window_size;
+  yy1[3] = yy2[3] = y1 + half_window_size;
+
+  TrackRegionOptions options;
+  options.mode = TrackRegionOptions::TRANSLATION;
+  options.max_iterations = 20;
+  options.sigma = sigma;
+  options.use_esm = true;
+  
+  TrackRegionResult result;
+  TrackRegion(image1, image2, xx1, yy1, options, xx2, yy2, &result);
+
+  *x2 = xx2[0] + half_window_size;
+  *y2 = yy2[0] + half_window_size;
+
+  return true;
+
+  // XXX
   int width = 2 * half_window_size + 1;
 
   // TODO(keir): Avoid recomputing gradients for e.g. the pyramid tracker.
diff --git a/extern/libmv/libmv/tracking/track_region.cc b/extern/libmv/libmv/tracking/track_region.cc
new file mode 100644
index 00000000000..f52919b2a61
--- /dev/null
+++ b/extern/libmv/libmv/tracking/track_region.cc
@@ -0,0 +1,1398 @@
+// Copyright (c) 2012 libmv authors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//
+// Author: mierle@google.com (Keir Mierle)
+//
+// TODO(keir): While this tracking code works rather well, it has some
+// outragous inefficiencies. There is probably a 5-10x speedup to be had if a
+// smart coder went through the TODO's and made the suggested performance
+// enhancements.
+
+// Necessary for M_E when building with MSVC.
+#define _USE_MATH_DEFINES
+
+#include "libmv/tracking/track_region.h"
+
+#include <Eigen/SVD>
+#include <Eigen/QR>
+#include <iostream>
+#include "ceres/ceres.h"
+#include "libmv/logging/logging.h"
+#include "libmv/image/image.h"
+#include "libmv/image/sample.h"
+#include "libmv/image/convolve.h"
+#include "libmv/multiview/homography.h"
+#include "libmv/numeric/numeric.h"
+
+namespace libmv {
+
+using ceres::Jet;
+using ceres::JetOps;
+using ceres::Chain;
+
+TrackRegionOptions::TrackRegionOptions()
+    : mode(TRANSLATION),
+      minimum_correlation(0),
+      max_iterations(20),
+      use_esm(true),
+      use_brute_initialization(true),
+      use_normalized_intensities(false),
+      sigma(0.9),
+      num_extra_points(0),
+      regularization_coefficient(0.0),
+      image1_mask(NULL) {
+}
+
+namespace {
+
+// TODO(keir): Consider adding padding.
+template<typename T>
+bool InBounds(const FloatImage &image,
+              const T &x,
+              const T &y) {
+  return 0.0 <= x && x < image.Width() &&
+         0.0 <= y && y < image.Height();
+}
+
+bool AllInBounds(const FloatImage &image,
+                 const double *x,
+                 const double *y) {
+  for (int i = 0; i < 4; ++i) {
+    if (!InBounds(image, x[i], y[i])) {
+      return false;
+    }
+  }
+  return true;
+}
+
+// Sample the image at position (x, y) but use the gradient, if present, to
+// propagate derivatives from x and y. This is needed to integrate the numeric
+// image gradients with Ceres's autodiff framework.
+template<typename T>
+static T SampleWithDerivative(const FloatImage &image_and_gradient,
+                              const T &x,
+                              const T &y) {
+  float scalar_x = JetOps<T>::GetScalar(x);
+  float scalar_y = JetOps<T>::GetScalar(y);
+
+  // Note that sample[1] and sample[2] will be uninitialized in the scalar
+  // case, but that is not an issue because the Chain::Rule below will not read
+  // the uninitialized values.
+  float sample[3];
+  if (JetOps<T>::IsScalar()) {
+    // For the scalar case, only sample the image.
+    sample[0] = SampleLinear(image_and_gradient, scalar_y, scalar_x, 0);
+  } else {
+    // For the derivative case, sample the gradient as well.
+    SampleLinear(image_and_gradient, scalar_y, scalar_x, sample);
+  }
+  T xy[2] = { x, y };
+  return Chain<float, 2, T>::Rule(sample[0], sample + 1, xy);
+}
+
+template<typename Warp>
+class BoundaryCheckingCallback : public ceres::IterationCallback {
+ public:
+  BoundaryCheckingCallback(const FloatImage& image2,
+                           const Warp &warp,
+                           const double *x1, const double *y1)
+      : image2_(image2), warp_(warp), x1_(x1), y1_(y1) {}
+
+  virtual ceres::CallbackReturnType operator()(
+      const ceres::IterationSummary& summary) {
+    // Warp the original 4 points with the current warp into image2.
+    double x2[4];
+    double y2[4];
+    for (int i = 0; i < 4; ++i) {
+      warp_.Forward(warp_.parameters, x1_[i], y1_[i], x2 + i, y2 + i);
+    }
+    // Enusre they are all in bounds.
+    if (!AllInBounds(image2_, x2, y2)) {
+      return ceres::SOLVER_ABORT;
+    }
+    return ceres::SOLVER_CONTINUE;
+  }
+
+ private:
+  const FloatImage &image2_;
+  const Warp &warp_;
+  const double *x1_;
+  const double *y1_;
+};
+
+template<typename Warp>
+class PixelDifferenceCostFunctor {
+ public:
+  PixelDifferenceCostFunctor(const TrackRegionOptions &options,
+                  const FloatImage &image_and_gradient1,
+                  const FloatImage &image_and_gradient2,
+                  const Mat3 &canonical_to_image1,
+                  int num_samples_x,
+                  int num_samples_y,
+                  const Warp &warp)
+      : options_(options),
+        image_and_gradient1_(image_and_gradient1),       
+        image_and_gradient2_(image_and_gradient2),       
+        canonical_to_image1_(canonical_to_image1),
+        num_samples_x_(num_samples_x),
+        num_samples_y_(num_samples_y),
+        warp_(warp),
+        pattern_and_gradient_(num_samples_y_, num_samples_x_, 3),
+        pattern_positions_(num_samples_y_, num_samples_x_, 2),
+        pattern_mask_(num_samples_y_, num_samples_x_, 1) {
+    ComputeCanonicalPatchAndNormalizer();
+  }
+
+  void ComputeCanonicalPatchAndNormalizer() {
+    src_mean_ = 0.0;
+    double num_samples = 0.0;
+    for (int r = 0; r < num_samples_y_; ++r) {
+      for (int c = 0; c < num_samples_x_; ++c) {
+        // Compute the position; cache it.
+        Vec3 image_position = canonical_to_image1_ * Vec3(c, r, 1);
+        image_position /= image_position(2);
+        pattern_positions_(r, c, 0) = image_position(0);
+        pattern_positions_(r, c, 1) = image_position(1);
+
+        // Sample the pattern and gradients.
+        SampleLinear(image_and_gradient1_,
+                     image_position(1),  // SampleLinear is r, c.
+                     image_position(0),
+                     &pattern_and_gradient_(r, c, 0));
+
+        // Sample sample the mask.
+        double mask_value = 1.0;
+        if (options_.image1_mask != NULL) {
+          SampleLinear(*options_.image1_mask,
+                       image_position(1),  // SampleLinear is r, c.
+                       image_position(0),
+                       &pattern_mask_(r, c, 0));
+          mask_value = pattern_mask_(r, c);
+        }
+        src_mean_ += pattern_and_gradient_(r, c, 0) * mask_value;
+        num_samples += mask_value;
+      }
+    }
+    src_mean_ /= num_samples;
+  }
+
+  template<typename T>
+  bool operator()(const T *warp_parameters, T *residuals) const {
+    if (options_.image1_mask != NULL) {
+      VLOG(2) << "Using a mask.";
+    }
+    for (int i = 0; i < Warp::NUM_PARAMETERS; ++i) {
+      VLOG(2) << "warp_parameters[" << i << "]: " << warp_parameters[i];
+    }
+
+    T dst_mean = T(1.0);
+    if (options_.use_normalized_intensities) {
+      ComputeNormalizingCoefficient(warp_parameters,
+                                    &dst_mean);
+    }
+
+    int cursor = 0;
+    for (int r = 0; r < num_samples_y_; ++r) {
+      for (int c = 0; c < num_samples_x_; ++c) {
+        // Use the pre-computed image1 position.
+        Vec2 image1_position(pattern_positions_(r, c, 0),
+                             pattern_positions_(r, c, 1));
+
+        // Sample the mask early; if it's zero, this pixel has no effect. This
+        // allows early bailout from the expensive sampling that happens below.
+        //
+        // Note that partial masks are not short circuited. To see why short
+        // circuiting produces bitwise-exact same results, consider that the
+        // residual for each pixel is 
+        //
+        //    residual = mask * (src - dst)  ,
+        //
+        // and for jets, multiplying by a scalar multiplies the derivative
+        // components by the scalar as well. Therefore, if the mask is exactly
+        // zero, then so too will the final residual and derivatives.
+        double mask_value = 1.0;
+        if (options_.image1_mask != NULL) {
+          mask_value = pattern_mask_(r, c);
+          if (mask_value == 0.0) {
+            residuals[cursor++] = T(0.0);
+            continue;
+          }
+        }
+
+        // Compute the location of the destination pixel.
+        T image2_position[2];
+        warp_.Forward(warp_parameters,
+                      T(image1_position[0]),
+                      T(image1_position[1]),
+                      &image2_position[0],
+                      &image2_position[1]);
+
+        // Sample the destination, propagating derivatives.
+        T dst_sample = SampleWithDerivative(image_and_gradient2_,
+                                            image2_position[0],
+                                            image2_position[1]);
+
+        // Sample the source. This is made complicated by ESM mode.
+        T src_sample;
+        if (options_.use_esm && !JetOps<T>::IsScalar()) {
+          // In ESM mode, the derivative of the source is also taken into
+          // account. This changes the linearization in a way that causes
+          // better convergence. Copy the derivative of the warp parameters
+          // onto the jets for the image1 position. This is the ESM hack.
+          T image1_position_jet[2] = {
+            image2_position[0],  // Order is x, y. This matches the
+            image2_position[1]   // derivative order in the patch.
+          };
+          JetOps<T>::SetScalar(image1_position[0], image1_position_jet + 0);
+          JetOps<T>::SetScalar(image1_position[1], image1_position_jet + 1);
+
+          // Now that the image1 positions have the jets applied from the
+          // image2 position (the ESM hack), chain the image gradients to
+          // obtain a sample with the derivative with respect to the warp
+          // parameters attached.
+          src_sample = Chain<float, 2, T>::Rule(pattern_and_gradient_(r, c),
+                                                &pattern_and_gradient_(r, c, 1),
+                                                image1_position_jet);
+
+          // The jacobians for these should be averaged. Due to the subtraction
+          // below, flip the sign of the src derivative so that the effect
+          // after subtraction of the jets is that they are averaged.
+          JetOps<T>::ScaleDerivative(-0.5, &src_sample);
+          JetOps<T>::ScaleDerivative(0.5, &dst_sample);
+        } else {
+          // This is the traditional, forward-mode KLT solution.
+          src_sample = T(pattern_and_gradient_(r, c));
+        }
+
+        // Normalize the samples by the mean values of each signal. The typical
+        // light model assumes multiplicative intensity changes with changing
+        // light, so this is a reasonable choice. Note that dst_mean has
+        // derivative information attached thanks to autodiff.
+        if (options_.use_normalized_intensities) {
+          src_sample /= T(src_mean_);
+          dst_sample /= dst_mean;
+        }
+
+        // The difference is the error.
+        T error = src_sample - dst_sample;
+
+        // Weight the error by the mask, if one is present.
+        if (options_.image1_mask != NULL) {
+          error *= T(mask_value);
+        }
+        residuals[cursor++] = error;
+      }
+    }
+    return true;
+  }
+
+  // For normalized matching, the average and 
+  template<typename T>
+  void ComputeNormalizingCoefficient(const T *warp_parameters,
+                                     T *dst_mean) const {
+
+    *dst_mean = T(0.0);
+    double num_samples = 0.0;
+    for (int r = 0; r < num_samples_y_; ++r) {
+      for (int c = 0; c < num_samples_x_; ++c) {
+        // Use the pre-computed image1 position.
+        Vec2 image1_position(pattern_positions_(r, c, 0),
+                             pattern_positions_(r, c, 1));
+        
+        // Sample the mask early; if it's zero, this pixel has no effect. This
+        // allows early bailout from the expensive sampling that happens below.
+        double mask_value = 1.0;
+        if (options_.image1_mask != NULL) {
+          mask_value = pattern_mask_(r, c);
+          if (mask_value == 0.0) {
+            continue;
+          }
+        }
+
+        // Compute the location of the destination pixel.
+        T image2_position[2];
+        warp_.Forward(warp_parameters,
+                      T(image1_position[0]),
+                      T(image1_position[1]),
+                      &image2_position[0],
+                      &image2_position[1]);
+
+
+        // Sample the destination, propagating derivatives.
+        // TODO(keir): This accumulation can, surprisingly, be done as a
+        // pre-pass by using integral images. This is complicated by the need
+        // to store the jets in the integral image, but it is possible.
+        T dst_sample = SampleWithDerivative(image_and_gradient2_,
+                                            image2_position[0],
+                                            image2_position[1]);
+
+        // Weight the sample by the mask, if one is present.
+        if (options_.image1_mask != NULL) {
+          dst_sample *= T(mask_value);
+        }
+
+        *dst_mean += dst_sample;
+        num_samples += mask_value;
+      }
+    }
+    *dst_mean /= T(num_samples);
+    LG << "Normalization for dst:" << *dst_mean;
+  }
+
+ // TODO(keir): Consider also computing the cost here.
+ double PearsonProductMomentCorrelationCoefficient(
+     const double *warp_parameters) const {
+   for (int i = 0; i < Warp::NUM_PARAMETERS; ++i) {
+     VLOG(2) << "Correlation warp_parameters[" << i << "]: "
+             << warp_parameters[i];
+   }
+
+   // The single-pass PMCC computation is somewhat numerically unstable, but
+   // it's sufficient for the tracker.
+   double sX = 0, sY = 0, sXX = 0, sYY = 0, sXY = 0;
+
+   // Due to masking, it's important to account for fractional samples.
+   // For example, samples with a 50% mask are counted as a half sample.
+   double num_samples = 0;
+
+   for (int r = 0; r < num_samples_y_; ++r) {
+     for (int c = 0; c < num_samples_x_; ++c) {
+        // Use the pre-computed image1 position.
+        Vec2 image1_position(pattern_positions_(r, c, 0),
+                             pattern_positions_(r, c, 1));
+        
+        double mask_value = 1.0;
+        if (options_.image1_mask != NULL) {
+          mask_value = pattern_mask_(r, c);
+          if (mask_value == 0.0) {
+            continue;
+          }
+        }
+
+        // Compute the location of the destination pixel.
+        double image2_position[2];
+        warp_.Forward(warp_parameters,
+                      image1_position[0],
+                      image1_position[1],
+                      &image2_position[0],
+                      &image2_position[1]);
+
+        double x = pattern_and_gradient_(r, c);
+        double y = SampleLinear(image_and_gradient2_,
+                                image2_position[1],  // SampleLinear is r, c.
+                                image2_position[0]);
+
+        // Weight the signals by the mask, if one is present.
+        if (options_.image1_mask != NULL) {
+          x *= mask_value;
+          y *= mask_value;
+          num_samples += mask_value;
+        } else {
+          num_samples++;
+        }
+        sX += x;
+        sY += y;
+        sXX += x*x;
+        sYY += y*y;
+        sXY += x*y;
+      }
+    }
+    // Normalize.
+    sX /= num_samples;
+    sY /= num_samples;
+    sXX /= num_samples;
+    sYY /= num_samples;
+    sXY /= num_samples;
+
+    double var_x = sXX - sX*sX;
+    double var_y = sYY - sY*sY;
+    double covariance_xy = sXY - sX*sY;
+
+    double correlation = covariance_xy / sqrt(var_x * var_y);
+    LG << "Covariance xy: " << covariance_xy
+       << ", var 1: " << var_x << ", var 2: " << var_y
+       << ", correlation: " << correlation;
+    return correlation;
+  }
+
+ private:
+  const TrackRegionOptions &options_;
+  const FloatImage &image_and_gradient1_;
+  const FloatImage &image_and_gradient2_;
+  const Mat3 &canonical_to_image1_;
+  int num_samples_x_;
+  int num_samples_y_;
+  const Warp &warp_;
+  double src_mean_;
+  FloatImage pattern_and_gradient_;
+
+  // This contains the position from where the cached pattern samples were
+  // taken from. This is also used to warp from src to dest without going from
+  // canonical pixels to src first.
+  FloatImage pattern_positions_;
+
+  FloatImage pattern_mask_;
+};
+
+template<typename Warp>
+class WarpRegularizingCostFunctor {
+ public:
+  WarpRegularizingCostFunctor(const TrackRegionOptions &options,
+                              const double *x1,
+                              const double *y1,
+                              const double *x2_original,
+                              const double *y2_original,
+                              const Warp &warp)
+      : options_(options),
+        x1_(x1),
+        y1_(y1),
+        x2_original_(x2_original),
+        y2_original_(y2_original),
+        warp_(warp) {
+    // Compute the centroid of the first guess quad.
+    // TODO(keir): Use Quad class here.
+    original_centroid_[0] = 0.0;
+    original_centroid_[1] = 0.0;
+    for (int i = 0; i < 4; ++i) {
+      original_centroid_[0] += x2_original[i];
+      original_centroid_[1] += y2_original[i];
+    }
+    original_centroid_[0] /= 4;
+    original_centroid_[1] /= 4;
+  }
+
+  template<typename T>
+  bool operator()(const T *warp_parameters, T *residuals) const {
+    T dst_centroid[2] = { T(0.0), T(0.0) };
+    for (int i = 0; i < 4; ++i) {
+      T image1_position[2] = { T(x1_[i]), T(y1_[i]) };
+      T image2_position[2];
+      warp_.Forward(warp_parameters,
+                    T(x1_[i]),
+                    T(y1_[i]),
+                    &image2_position[0],
+                    &image2_position[1]);
+
+      // Subtract the positions. Note that this ignores the centroids.
+      residuals[2 * i + 0] = image2_position[0] - image1_position[0];
+      residuals[2 * i + 1] = image2_position[1] - image1_position[1];
+
+      // Accumulate the dst centroid.
+      dst_centroid[0] += image2_position[0];
+      dst_centroid[1] += image2_position[1];
+    }
+    dst_centroid[0] /= T(4.0);
+    dst_centroid[1] /= T(4.0);
+
+    // Adjust for the centroids.
+    for (int i = 0; i < 4; ++i) {
+      residuals[2 * i + 0] += T(original_centroid_[0]) - dst_centroid[0];
+      residuals[2 * i + 1] += T(original_centroid_[1]) - dst_centroid[1];
+    }
+
+    // Reweight the residuals.
+    for (int i = 0; i < 8; ++i) {
+      residuals[i] *= T(options_.regularization_coefficient);
+    }
+
+    return true;
+  }
+
+  const TrackRegionOptions &options_;
+  const double *x1_;
+  const double *y1_;
+  const double *x2_original_;
+  const double *y2_original_;
+  double original_centroid_[2];
+  const Warp &warp_;
+};
+
+// Compute the warp from rectangular coordinates, where one corner is the
+// origin, and the opposite corner is at (num_samples_x, num_samples_y).
+Mat3 ComputeCanonicalHomography(const double *x1,
+                                const double *y1,
+                                int num_samples_x,
+                                int num_samples_y) {
+  Mat canonical(2, 4);
+  canonical << 0, num_samples_x, num_samples_x, 0,
+               0, 0,             num_samples_y, num_samples_y;
+
+  Mat xy1(2, 4);
+  xy1 << x1[0], x1[1], x1[2], x1[3],
+         y1[0], y1[1], y1[2], y1[3];
+
+  Mat3 H;
+  if (!Homography2DFromCorrespondencesLinear(canonical, xy1, &H, 1e-12)) {
+    LG << "Couldn't construct homography.";
+  }
+  return H;
+}
+
+class Quad {
+ public:
+  Quad(const double *x, const double *y) : x_(x), y_(y) {
+    // Compute the centroid and store it.
+    centroid_ = Vec2(0.0, 0.0);
+    for (int i = 0; i < 4; ++i) {
+      centroid_ += Vec2(x_[i], y_[i]);
+    }
+    centroid_ /= 4.0;
+  }
+
+  // The centroid of the four points representing the quad.
+  const Vec2& Centroid() const {
+    return centroid_;
+  }
+
+  // The average magnitude of the four points relative to the centroid.
+  double Scale() const {
+    double scale = 0.0;
+    for (int i = 0; i < 4; ++i) {
+      scale += (Vec2(x_[i], y_[i]) - Centroid()).norm();
+    }
+    return scale / 4.0;
+  }
+
+  Vec2 CornerRelativeToCentroid(int i) const {
+    return Vec2(x_[i], y_[i]) - centroid_;
+  }
+
+ private:
+  const double *x_;
+  const double *y_;
+  Vec2 centroid_;
+};
+
+struct TranslationWarp {
+  TranslationWarp(const double *x1, const double *y1,
+                  const double *x2, const double *y2) {
+    Vec2 t = Quad(x2, y2).Centroid() - Quad(x1, y1).Centroid();
+    parameters[0] = t[0];
+    parameters[1] = t[1];
+  }
+
+  template<typename T>
+  void Forward(const T *warp_parameters,
+               const T &x1, const T& y1, T *x2, T* y2) const {
+    *x2 = x1 + warp_parameters[0];
+    *y2 = y1 + warp_parameters[1];
+  }
+
+  // Translation x, translation y.
+  enum { NUM_PARAMETERS = 2 };
+  double parameters[NUM_PARAMETERS];
+};
+
+struct TranslationScaleWarp {
+  TranslationScaleWarp(const double *x1, const double *y1,
+                       const double *x2, const double *y2)
+      : q1(x1, y1) {
+    Quad q2(x2, y2);
+
+    // The difference in centroids is the best guess for translation.
+    Vec2 t = q2.Centroid() - q1.Centroid();
+    parameters[0] = t[0];
+    parameters[1] = t[1];
+
+    // The difference in scales is the estimate for the scale.
+    parameters[2] = 1.0 - q2.Scale() / q1.Scale();
+  }
+
+  // The strange way of parameterizing the translation and scaling is to make
+  // the knobs that the optimizer sees easy to adjust. This is less important
+  // for the scaling case than the rotation case.
+  template<typename T>
+  void Forward(const T *warp_parameters,
+               const T &x1, const T& y1, T *x2, T* y2) const {
+    // Make the centroid of Q1 the origin.
+    const T x1_origin = x1 - q1.Centroid()(0);
+    const T y1_origin = y1 - q1.Centroid()(1);
+
+    // Scale uniformly about the origin.
+    const T scale = 1.0 + warp_parameters[2];
+    const T x1_origin_scaled = scale * x1_origin;
+    const T y1_origin_scaled = scale * y1_origin;
+
+    // Translate back into the space of Q1 (but scaled).
+    const T x1_scaled = x1_origin_scaled + q1.Centroid()(0);
+    const T y1_scaled = y1_origin_scaled + q1.Centroid()(1);
+
+    // Translate into the space of Q2.
+    *x2 = x1_scaled + warp_parameters[0];
+    *y2 = y1_scaled + warp_parameters[1];
+  }
+
+  // Translation x, translation y, scale.
+  enum { NUM_PARAMETERS = 3 };
+  double parameters[NUM_PARAMETERS];
+
+  Quad q1;
+};
+
+// Assumes the given points are already zero-centroid and the same size.
+Mat2 OrthogonalProcrustes(const Mat2 &correlation_matrix) {
+  Eigen::JacobiSVD<Mat2> svd(correlation_matrix,
+                             Eigen::ComputeFullU | Eigen::ComputeFullV);
+  return svd.matrixV() * svd.matrixU().transpose();
+}
+
+struct TranslationRotationWarp {
+  TranslationRotationWarp(const double *x1, const double *y1,
+                          const double *x2, const double *y2)
+      : q1(x1, y1) {
+    Quad q2(x2, y2);
+
+    // The difference in centroids is the best guess for translation.
+    Vec2 t = q2.Centroid() - q1.Centroid();
+    parameters[0] = t[0];
+    parameters[1] = t[1];
+
+    // Obtain the rotation via orthorgonal procrustes.
+    Mat2 correlation_matrix;
+    for (int i = 0; i < 4; ++i) {
+      correlation_matrix += q1.CornerRelativeToCentroid(i) * 
+                            q2.CornerRelativeToCentroid(i).transpose();
+    }
+    Mat2 R = OrthogonalProcrustes(correlation_matrix);
+    parameters[2] = atan2(R(1, 0), R(0, 0));
+
+    LG << "Correlation_matrix:\n" << correlation_matrix;
+    LG << "R:\n" << R;
+    LG << "Theta:" << parameters[2];
+  }
+
+  // The strange way of parameterizing the translation and rotation is to make
+  // the knobs that the optimizer sees easy to adjust. The reason is that while
+  // it is always the case that it is possible to express composed rotations
+  // and translations as a single translation and rotation, the numerical
+  // values needed for the composition are often large in magnitude. This is
+  // enough to throw off any minimizer, since it must do the equivalent of
+  // compose rotations and translations.
+  //
+  // Instead, use the parameterization below that offers a parameterization
+  // that exposes the degrees of freedom in a way amenable to optimization.
+  template<typename T>
+  void Forward(const T *warp_parameters,
+                      const T &x1, const T& y1, T *x2, T* y2) const {
+    // Make the centroid of Q1 the origin.
+    const T x1_origin = x1 - q1.Centroid()(0);
+    const T y1_origin = y1 - q1.Centroid()(1);
+
+    // Rotate about the origin (i.e. centroid of Q1).
+    const T theta = warp_parameters[2];
+    const T costheta = cos(theta);
+    const T sintheta = sin(theta);
+    const T x1_origin_rotated = costheta * x1_origin - sintheta * y1_origin;
+    const T y1_origin_rotated = sintheta * x1_origin + costheta * y1_origin;
+
+    // Translate back into the space of Q1 (but scaled).
+    const T x1_rotated = x1_origin_rotated + q1.Centroid()(0);
+    const T y1_rotated = y1_origin_rotated + q1.Centroid()(1);
+
+    // Translate into the space of Q2.
+    *x2 = x1_rotated + warp_parameters[0];
+    *y2 = y1_rotated + warp_parameters[1];
+  }
+
+  // Translation x, translation y, rotation about the center of Q1 degrees.
+  enum { NUM_PARAMETERS = 3 };
+  double parameters[NUM_PARAMETERS];
+
+  Quad q1;
+};
+
+struct TranslationRotationScaleWarp {
+  TranslationRotationScaleWarp(const double *x1, const double *y1,
+                               const double *x2, const double *y2)
+      : q1(x1, y1) {
+    Quad q2(x2, y2);
+
+    // The difference in centroids is the best guess for translation.
+    Vec2 t = q2.Centroid() - q1.Centroid();
+    parameters[0] = t[0];
+    parameters[1] = t[1];
+
+    // The difference in scales is the estimate for the scale.
+    parameters[2] = 1.0 - q2.Scale() / q1.Scale();
+
+    // Obtain the rotation via orthorgonal procrustes.
+    Mat2 correlation_matrix;
+    for (int i = 0; i < 4; ++i) {
+      correlation_matrix += q1.CornerRelativeToCentroid(i) * 
+                            q2.CornerRelativeToCentroid(i).transpose();
+    }
+    Mat2 R = OrthogonalProcrustes(correlation_matrix);
+    parameters[3] = atan2(R(1, 0), R(0, 0));
+
+    LG << "Correlation_matrix:\n" << correlation_matrix;
+    LG << "R:\n" << R;
+    LG << "Theta:" << parameters[3];
+  }
+
+  // The strange way of parameterizing the translation and rotation is to make
+  // the knobs that the optimizer sees easy to adjust. The reason is that while
+  // it is always the case that it is possible to express composed rotations
+  // and translations as a single translation and rotation, the numerical
+  // values needed for the composition are often large in magnitude. This is
+  // enough to throw off any minimizer, since it must do the equivalent of
+  // compose rotations and translations.
+  //
+  // Instead, use the parameterization below that offers a parameterization
+  // that exposes the degrees of freedom in a way amenable to optimization.
+  template<typename T>
+  void Forward(const T *warp_parameters,
+                      const T &x1, const T& y1, T *x2, T* y2) const {
+    // Make the centroid of Q1 the origin.
+    const T x1_origin = x1 - q1.Centroid()(0);
+    const T y1_origin = y1 - q1.Centroid()(1);
+
+    // Rotate about the origin (i.e. centroid of Q1).
+    const T theta = warp_parameters[3];
+    const T costheta = cos(theta);
+    const T sintheta = sin(theta);
+    const T x1_origin_rotated = costheta * x1_origin - sintheta * y1_origin;
+    const T y1_origin_rotated = sintheta * x1_origin + costheta * y1_origin;
+
+    // Scale uniformly about the origin.
+    const T scale = 1.0 + warp_parameters[2];
+    const T x1_origin_rotated_scaled = scale * x1_origin_rotated;
+    const T y1_origin_rotated_scaled = scale * y1_origin_rotated;
+
+    // Translate back into the space of Q1 (but scaled and rotated).
+    const T x1_rotated_scaled = x1_origin_rotated_scaled + q1.Centroid()(0);
+    const T y1_rotated_scaled = y1_origin_rotated_scaled + q1.Centroid()(1);
+
+    // Translate into the space of Q2.
+    *x2 = x1_rotated_scaled + warp_parameters[0];
+    *y2 = y1_rotated_scaled + warp_parameters[1];
+  }
+
+  // Translation x, translation y, rotation about the center of Q1 degrees,
+  // scale.
+  enum { NUM_PARAMETERS = 4 };
+  double parameters[NUM_PARAMETERS];
+
+  Quad q1;
+};
+
+struct AffineWarp {
+  AffineWarp(const double *x1, const double *y1,
+             const double *x2, const double *y2)
+      : q1(x1, y1) {
+    Quad q2(x2, y2);
+
+    // The difference in centroids is the best guess for translation.
+    Vec2 t = q2.Centroid() - q1.Centroid();
+    parameters[0] = t[0];
+    parameters[1] = t[1];
+
+    // Estimate the four affine parameters with the usual least squares.
+    Mat Q1(8, 4);
+    Vec Q2(8);
+    for (int i = 0; i < 4; ++i) {
+      Vec2 v1 = q1.CornerRelativeToCentroid(i);
+      Vec2 v2 = q2.CornerRelativeToCentroid(i);
+
+      Q1.row(2 * i + 0) << v1[0], v1[1],   0,     0  ;
+      Q1.row(2 * i + 1) <<   0,     0,   v1[0], v1[1];
+
+      Q2(2 * i + 0) = v2[0];
+      Q2(2 * i + 1) = v2[1];
+    }
+
+    // TODO(keir): Check solution quality.
+    Vec4 a = Q1.jacobiSvd(Eigen::ComputeThinU | Eigen::ComputeThinV).solve(Q2);
+    parameters[2] = a[0];
+    parameters[3] = a[1];
+    parameters[4] = a[2];
+    parameters[5] = a[3];
+
+    LG << "a:" << a.transpose();
+    LG << "t:" << t.transpose();
+  }
+
+  // See comments in other parameterizations about why the centroid is used.
+  template<typename T>
+  void Forward(const T *p, const T &x1, const T& y1, T *x2, T* y2) const {
+    // Make the centroid of Q1 the origin.
+    const T x1_origin = x1 - q1.Centroid()(0);
+    const T y1_origin = y1 - q1.Centroid()(1);
+
+    // Apply the affine transformation.
+    const T x1_origin_affine = p[2] * x1_origin + p[3] * y1_origin;
+    const T y1_origin_affine = p[4] * x1_origin + p[5] * y1_origin;
+
+    // Translate back into the space of Q1 (but affine transformed).
+    const T x1_affine = x1_origin_affine + q1.Centroid()(0);
+    const T y1_affine = y1_origin_affine + q1.Centroid()(1);
+
+    // Translate into the space of Q2.
+    *x2 = x1_affine + p[0];
+    *y2 = y1_affine + p[1];
+  }
+
+  // Translation x, translation y, rotation about the center of Q1 degrees,
+  // scale.
+  enum { NUM_PARAMETERS = 6 };
+  double parameters[NUM_PARAMETERS];
+
+  Quad q1;
+};
+
+struct HomographyWarp {
+  HomographyWarp(const double *x1, const double *y1,
+                 const double *x2, const double *y2) {
+    Mat quad1(2, 4);
+    quad1 << x1[0], x1[1], x1[2], x1[3],
+             y1[0], y1[1], y1[2], y1[3];
+
+    Mat quad2(2, 4);
+    quad2 << x2[0], x2[1], x2[2], x2[3],
+             y2[0], y2[1], y2[2], y2[3];
+
+    Mat3 H;
+    if (!Homography2DFromCorrespondencesLinear(quad1, quad2, &H, 1e-12)) {
+      LG << "Couldn't construct homography.";
+    }
+
+    // Assume H(2, 2) != 0, and fix scale at H(2, 2) == 1.0.
+    H /= H(2, 2);
+
+    // Assume H is close to identity, so subtract out the diagonal.
+    H(0, 0) -= 1.0;
+    H(1, 1) -= 1.0;
+
+    CHECK_NE(H(2, 2), 0.0) << H;
+    for (int i = 0; i < 8; ++i) {
+      parameters[i] = H(i / 3, i % 3);
+      LG << "Parameters[" << i << "]: " << parameters[i];
+    }
+  }
+
+  template<typename T>
+  static void Forward(const T *p,
+                      const T &x1, const T& y1, T *x2, T* y2) {
+    // Homography warp with manual 3x3 matrix multiply.
+    const T xx2 = (1.0 + p[0]) * x1 +     p[1]     * y1 + p[2];
+    const T yy2 =     p[3]     * x1 + (1.0 + p[4]) * y1 + p[5];
+    const T zz2 =     p[6]     * x1 +     p[7]     * y1 + 1.0;
+    *x2 = xx2 / zz2;
+    *y2 = yy2 / zz2;
+  }
+
+  enum { NUM_PARAMETERS = 8 };
+  double parameters[NUM_PARAMETERS];
+};
+
+// Determine the number of samples to use for x and y. Quad winding goes:
+//
+//    0 1
+//    3 2
+//
+// The idea is to take the maximum x or y distance. This may be oversampling.
+// TODO(keir): Investigate the various choices; perhaps average is better?
+void PickSampling(const double *x1, const double *y1,
+                  const double *x2, const double *y2,
+                  int *num_samples_x, int *num_samples_y) {
+  Vec2 a0(x1[0], y1[0]);
+  Vec2 a1(x1[1], y1[1]);
+  Vec2 a2(x1[2], y1[2]);
+  Vec2 a3(x1[3], y1[3]);
+
+  Vec2 b0(x1[0], y1[0]);
+  Vec2 b1(x1[1], y1[1]);
+  Vec2 b2(x1[2], y1[2]);
+  Vec2 b3(x1[3], y1[3]);
+
+  double x_dimensions[4] = {
+    (a1 - a0).norm(),
+    (a3 - a2).norm(),
+    (b1 - b0).norm(),
+    (b3 - b2).norm()
+  };
+
+  double y_dimensions[4] = {
+    (a3 - a0).norm(),
+    (a1 - a2).norm(),
+    (b3 - b0).norm(),
+    (b1 - b2).norm()
+  };
+  const double kScaleFactor = 1.0;
+  *num_samples_x = static_cast<int>(
+      kScaleFactor * *std::max_element(x_dimensions, x_dimensions + 4));
+  *num_samples_y = static_cast<int>(
+      kScaleFactor * *std::max_element(y_dimensions, y_dimensions + 4));
+  LG << "Automatic num_samples_x: " << *num_samples_x
+     << ", num_samples_y: " << *num_samples_y;
+}
+
+bool SearchAreaTooBigForDescent(const FloatImage &image2,
+                                const double *x2, const double *y2) {
+  // TODO(keir): Check the bounds and enable only when it makes sense.
+  return true;
+}
+
+bool PointOnRightHalfPlane(const Vec2 &a, const Vec2 &b, double x, double y) {
+  Vec2 ba = b - a;
+  return ((Vec2(x, y) - b).transpose() * Vec2(-ba.y(), ba.x())) > 0;
+}
+
+// Determine if a point is in a quad. The quad is arranged as:
+//
+//    +-------> x
+//    |
+//    |  a0------a1
+//    |   |       |
+//    |   |       |
+//    |   |       |
+//    |  a3------a2
+//    v
+//    y
+//
+// The implementation does up to four half-plane comparisons.
+bool PointInQuad(const double *xs, const double *ys, double x, double y) {
+  Vec2 a0(xs[0], ys[0]);
+  Vec2 a1(xs[1], ys[1]);
+  Vec2 a2(xs[2], ys[2]);
+  Vec2 a3(xs[3], ys[3]);
+
+  return PointOnRightHalfPlane(a0, a1, x, y) &&
+         PointOnRightHalfPlane(a1, a2, x, y) &&
+         PointOnRightHalfPlane(a2, a3, x, y) &&
+         PointOnRightHalfPlane(a3, a0, x, y);
+}
+
+// This makes it possible to map between Eigen float arrays and FloatImage
+// without using comparisons.
+typedef Eigen::Array<float, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor> FloatArray;
+
+// This creates a pattern in the frame of image2, from the pixel is image1,
+// based on the initial guess represented by the two quads x1, y1, and x2, y2.
+template<typename Warp>
+void CreateBrutePattern(const double *x1, const double *y1,
+                        const double *x2, const double *y2,
+                        const FloatImage &image1,
+                        const FloatImage *image1_mask,
+                        FloatArray *pattern,
+                        FloatArray *mask,
+                        int *origin_x,
+                        int *origin_y) {
+  // Get integer bounding box of quad2 in image2.
+  int min_x = static_cast<int>(floor(*std::min_element(x2, x2 + 4)));
+  int min_y = static_cast<int>(floor(*std::min_element(y2, y2 + 4)));
+  int max_x = static_cast<int>(ceil (*std::max_element(x2, x2 + 4)));
+  int max_y = static_cast<int>(ceil (*std::max_element(y2, y2 + 4)));
+
+  int w = max_x - min_x;
+  int h = max_y - min_y;
+
+  pattern->resize(h, w);
+  mask->resize(h, w);
+
+  Warp inverse_warp(x2, y2, x1, y1);
+
+  // r,c are in the coordinate frame of image2.
+  for (int r = min_y; r < max_y; ++r) {
+    for (int c = min_x; c < max_x; ++c) {
+      // i and j are in the coordinate frame of the pattern in image2.
+      int i = r - min_y;
+      int j = c - min_x;
+
+      double dst_x = c;
+      double dst_y = r;
+      double src_x;
+      double src_y;
+      inverse_warp.Forward(inverse_warp.parameters,
+                           dst_x, dst_y,
+                           &src_x, &src_y);
+      
+      if (PointInQuad(x1, y1, src_x, src_y)) {
+        (*pattern)(i, j) = SampleLinear(image1, src_y, src_x);
+        (*mask)(i, j) = 1.0;
+        if (image1_mask) {
+          (*mask)(i, j) = SampleLinear(*image1_mask, src_y, src_x);;
+        }
+      } else {
+        (*pattern)(i, j) = 0.0;
+        (*mask)(i, j) = 0.0;
+      }
+    }
+  }
+  *origin_x = min_x;
+  *origin_y = min_y;
+}
+
+// Compute a translation-only estimate of the warp, using brute force search. A
+// smarter implementation would use the FFT to compute the normalized cross
+// correlation. Instead, this is a dumb implementation. Surprisingly, it is
+// fast enough in practice.
+//
+// TODO(keir): The normalization is less effective for the brute force search
+// than it is with the Ceres solver. It's unclear if this is a bug or due to
+// the original frame being too different from the reprojected reference in the
+// destination frame.
+//
+// The likely solution is to use the previous frame, instead of the original
+// pattern, when doing brute initialization. Unfortunately that implies a
+// totally different warping interface, since access to more than a the source
+// and current destination frame is necessary.
+template<typename Warp>
+void BruteTranslationOnlyInitialize(const FloatImage &image1,
+                                    const FloatImage *image1_mask,
+                                    const FloatImage &image2,
+                                    const int num_extra_points,
+                                    const bool use_normalized_intensities,
+                                    const double *x1, const double *y1,
+                                    double *x2, double *y2) {
+  // Create the pattern to match in the space of image2, assuming our inital
+  // guess isn't too far from the template in image1. If there is no image1
+  // mask, then the resulting mask is binary.
+  FloatArray pattern;
+  FloatArray mask;
+  int origin_x = -1, origin_y = -1;
+  CreateBrutePattern<Warp>(x1, y1, x2, y2,
+                           image1, image1_mask,
+                           &pattern, &mask,
+                           &origin_x, &origin_y);
+
+  // For normalization, premultiply the pattern by the inverse pattern mean.
+  double mask_sum = 1.0;
+  if (use_normalized_intensities) {
+    mask_sum = mask.sum();
+    double inverse_pattern_mean = mask_sum / ((mask * pattern).sum());
+    pattern *= inverse_pattern_mean;
+  }
+
+  // Use Eigen on the images via maps for strong vectorization.
+  Map<const FloatArray> search(image2.Data(), image2.Height(), image2.Width());
+
+  // Try all possible locations inside the search area. Yes, everywhere.
+  //
+  // TODO(keir): There are a number of possible optimizations here. One choice
+  // is to make a grid and only try one out of every N possible samples.
+  // 
+  // Another, slightly more clever idea, is to compute some sort of spatial
+  // frequency distribution of the pattern patch. If the spatial resolution is
+  // high (e.g. a grating pattern or fine lines) then checking every possible
+  // translation is necessary, since a 1-pixel shift may induce a massive
+  // change in the cost function. If the image is a blob or splotch with blurry
+  // edges, then fewer samples are necessary since a few pixels offset won't
+  // change the cost function much.
+  double best_sad = std::numeric_limits<double>::max();
+  int best_r = -1;
+  int best_c = -1;
+  int w = pattern.cols();
+  int h = pattern.rows();
+  for (int r = 0; r < (image2.Height() - h); ++r) {
+    for (int c = 0; c < (image2.Width() - w); ++c) {
+      // Compute the weighted sum of absolute differences, Eigen style. Note
+      // that the block from the search image is never stored in a variable, to
+      // avoid copying overhead and permit inlining.
+      double sad;
+      if (use_normalized_intensities) {
+        // TODO(keir): It's really dumb to recompute the search mean for every
+        // shift. A smarter implementation would use summed area tables
+        // instead, reducing the mean calculation to an O(1) operation.
+        double inverse_search_mean =
+            mask_sum / ((mask * search.block(r, c, h, w)).sum());
+        sad = (mask * (pattern - (search.block(r, c, h, w) *
+                                  inverse_search_mean))).abs().sum();
+      } else {
+        sad = (mask * (pattern - search.block(r, c, h, w))).abs().sum();
+      }
+      if (sad < best_sad) {
+        best_r = r;
+        best_c = c;
+        best_sad = sad;
+      }
+    }
+  }
+  CHECK_NE(best_r, -1);
+  CHECK_NE(best_c, -1);
+
+  LG << "Brute force translation found a shift. "
+     << "best_c: " << best_c << ", best_r: " << best_r << ", "
+     << "origin_x: " << origin_x << ", origin_y: " << origin_y << ", "
+     << "dc: " << (best_c - origin_x) << ", "
+     << "dr: " << (best_r - origin_y)
+     << ", tried " << ((image2.Height() - h) * (image2.Width() - w))
+     << " shifts.";
+
+  // Apply the shift.
+  for (int i = 0; i < 4 + num_extra_points; ++i) {
+    x2[i] += best_c - origin_x;
+    y2[i] += best_r - origin_y;
+  }
+}
+
+}  // namespace
+
+template<typename Warp>
+void TemplatedTrackRegion(const FloatImage &image1,
+                          const FloatImage &image2,
+                          const double *x1, const double *y1,
+                          const TrackRegionOptions &options,
+                          double *x2, double *y2,
+                          TrackRegionResult *result) {
+  for (int i = 0; i < 4; ++i) {
+    LG << "P" << i << ": (" << x1[i] << ", " << y1[i] << "); guess ("
+       << x2[i] << ", " << y2[i] << "); (dx, dy): (" << (x2[i] - x1[i]) << ", "
+       << (y2[i] - y1[i]) << ").";
+  }
+  if (options.use_normalized_intensities) {
+    LG << "Using normalized intensities.";
+  }
+
+  // Bail early if the points are already outside.
+  if (!AllInBounds(image1, x1, y1)) {
+    result->termination = TrackRegionResult::SOURCE_OUT_OF_BOUNDS;
+    return;
+  }
+  if (!AllInBounds(image2, x2, y2)) {
+    result->termination = TrackRegionResult::DESTINATION_OUT_OF_BOUNDS;
+    return;
+  }
+  // TODO(keir): Check quads to ensure there is some area.
+
+  // Keep a copy of the "original" guess for regularization.
+  double x2_original[4];
+  double y2_original[4];
+  for (int i = 0; i < 4; ++i) {
+    x2_original[i] = x2[i];
+    y2_original[i] = y2[i];
+  }
+
+  // Prepare the image and gradient.
+  Array3Df image_and_gradient1;
+  Array3Df image_and_gradient2;
+  BlurredImageAndDerivativesChannels(image1, options.sigma,
+                                     &image_and_gradient1);
+  BlurredImageAndDerivativesChannels(image2, options.sigma,
+                                     &image_and_gradient2);
+
+  // Possibly do a brute-force translation-only initialization.
+  if (SearchAreaTooBigForDescent(image2, x2, y2) &&
+      options.use_brute_initialization) {
+    LG << "Running brute initialization...";
+    BruteTranslationOnlyInitialize<Warp>(image_and_gradient1,
+                                         options.image1_mask,
+                                         image2,
+                                         options.num_extra_points,
+                                         options.use_normalized_intensities,
+                                         x1, y1, x2, y2);
+    for (int i = 0; i < 4; ++i) {
+      LG << "P" << i << ": (" << x1[i] << ", " << y1[i] << "); brute ("
+         << x2[i] << ", " << y2[i] << "); (dx, dy): (" << (x2[i] - x1[i])
+         << ", " << (y2[i] - y1[i]) << ").";
+    }
+  }
+
+  // Prepare the initial warp parameters from the four correspondences.
+  // Note: This must happen after the brute initialization runs, since the
+  // brute initialization mutates x2 and y2 in place.
+  Warp warp(x1, y1, x2, y2);
+
+  // Decide how many samples to use in the x and y dimensions.
+  int num_samples_x;
+  int num_samples_y;
+  PickSampling(x1, y1, x2, y2, &num_samples_x, &num_samples_y);
+
+
+  // Compute the warp from rectangular coordinates.
+  Mat3 canonical_homography = ComputeCanonicalHomography(x1, y1,
+                                                         num_samples_x,
+                                                         num_samples_y);
+
+  ceres::Problem problem;
+
+  // Construct the warp cost function. AutoDiffCostFunction takes ownership.
+  PixelDifferenceCostFunctor<Warp> *pixel_difference_cost_function =
+      new PixelDifferenceCostFunctor<Warp>(options,
+                                           image_and_gradient1,
+                                           image_and_gradient2,
+                                           canonical_homography,
+                                           num_samples_x,
+                                           num_samples_y,
+                                           warp);
+   problem.AddResidualBlock(
+       new ceres::AutoDiffCostFunction<
+           PixelDifferenceCostFunctor<Warp>,
+           ceres::DYNAMIC,
+           Warp::NUM_PARAMETERS>(pixel_difference_cost_function,
+                                 num_samples_x * num_samples_y),
+       NULL,
+       warp.parameters);
+
+  // Construct the regularizing cost function
+  if (options.regularization_coefficient != 0.0) {
+    WarpRegularizingCostFunctor<Warp> *regularizing_warp_cost_function =
+        new WarpRegularizingCostFunctor<Warp>(options,
+                                              x1, y2,
+                                              x2_original,
+                                              y2_original,
+                                              warp);
+
+    problem.AddResidualBlock(
+        new ceres::AutoDiffCostFunction<
+            WarpRegularizingCostFunctor<Warp>,
+            8 /* num_residuals */,
+            Warp::NUM_PARAMETERS>(regularizing_warp_cost_function),
+        NULL,
+        warp.parameters);
+  }
+
+  // Configure the solve.
+  ceres::Solver::Options solver_options;
+  solver_options.linear_solver_type = ceres::DENSE_QR;
+  solver_options.max_num_iterations = options.max_iterations;
+  solver_options.update_state_every_iteration = true;
+  solver_options.parameter_tolerance = 1e-16;
+  solver_options.function_tolerance = 1e-16;
+
+  // Prevent the corners from going outside the destination image.
+  BoundaryCheckingCallback<Warp> callback(image2, warp, x1, y1);
+  solver_options.callbacks.push_back(&callback);
+
+  // Run the solve.
+  ceres::Solver::Summary summary;
+  ceres::Solve(solver_options, &problem, &summary);
+
+  LG << "Summary:\n" << summary.FullReport();
+
+  // Update the four points with the found solution; if the solver failed, then
+  // the warp parameters are the identity (so ignore failure).
+  //
+  // Also warp any extra points on the end of the array.
+  for (int i = 0; i < 4 + options.num_extra_points; ++i) {
+    warp.Forward(warp.parameters, x1[i], y1[i], x2 + i, y2 + i);
+    LG << "Warped point " << i << ": (" << x1[i] << ", " << y1[i] << ") -> ("
+       << x2[i] << ", " << y2[i] << "); (dx, dy): (" << (x2[i] - x1[i]) << ", "
+       << (y2[i] - y1[i]) << ").";
+  }
+
+  // TODO(keir): Update the result statistics.
+  // TODO(keir): Add a normalize-cross-correlation variant.
+
+  CHECK_NE(summary.termination_type, ceres::USER_ABORT) << "Libmv bug.";
+  if (summary.termination_type == ceres::USER_ABORT) {
+    result->termination = TrackRegionResult::FELL_OUT_OF_BOUNDS;
+    return;
+  }
+#define HANDLE_TERMINATION(termination_enum) \
+  if (summary.termination_type == ceres::termination_enum) { \
+    result->termination = TrackRegionResult::termination_enum; \
+    return; \
+  }
+
+  // Avoid computing correlation for tracking failures.
+  HANDLE_TERMINATION(DID_NOT_RUN);
+  HANDLE_TERMINATION(NUMERICAL_FAILURE);
+
+  // Otherwise, run a final correlation check.
+  if (options.minimum_correlation > 0.0) {
+    result->correlation = pixel_difference_cost_function->
+        PearsonProductMomentCorrelationCoefficient(warp.parameters);
+    if (result->correlation < options.minimum_correlation) {
+      LG << "Failing with insufficient correlation.";
+      result->termination = TrackRegionResult::INSUFFICIENT_CORRELATION;
+      return;
+    }
+  }
+
+  HANDLE_TERMINATION(PARAMETER_TOLERANCE);
+  HANDLE_TERMINATION(FUNCTION_TOLERANCE);
+  HANDLE_TERMINATION(GRADIENT_TOLERANCE);
+  HANDLE_TERMINATION(NO_CONVERGENCE);
+#undef HANDLE_TERMINATION
+};
+
+void TrackRegion(const FloatImage &image1,
+                 const FloatImage &image2,
+                 const double *x1, const double *y1,
+                 const TrackRegionOptions &options,
+                 double *x2, double *y2,
+                 TrackRegionResult *result) {
+  // Enum is necessary due to templated nature of autodiff.
+#define HANDLE_MODE(mode_enum, mode_type) \
+  if (options.mode == TrackRegionOptions::mode_enum) { \
+    TemplatedTrackRegion<mode_type>(image1, image2, \
+                                    x1, y1, \
+                                    options, \
+                                    x2, y2, \
+                                    result); \
+    return; \
+  }
+  HANDLE_MODE(TRANSLATION,                TranslationWarp);
+  HANDLE_MODE(TRANSLATION_SCALE,          TranslationScaleWarp);
+  HANDLE_MODE(TRANSLATION_ROTATION,       TranslationRotationWarp);
+  HANDLE_MODE(TRANSLATION_ROTATION_SCALE, TranslationRotationScaleWarp);
+  HANDLE_MODE(AFFINE,                     AffineWarp);
+  HANDLE_MODE(HOMOGRAPHY,                 HomographyWarp);
+#undef HANDLE_MODE
+}
+
+bool SamplePlanarPatch(const FloatImage &image,
+                       const double *xs, const double *ys,
+                       int num_samples_x, int num_samples_y,
+                       FloatImage *mask, FloatImage *patch,
+                       double *warped_position_x, double *warped_position_y) {
+  // Bail early if the points are outside the image.
+  if (!AllInBounds(image, xs, ys)) {
+    LG << "Can't sample patch: out of bounds.";
+    return false;
+  }
+
+  // Make the patch have the appropriate size, and match the depth of image.
+  patch->Resize(num_samples_y, num_samples_x, image.Depth());
+
+  // Compute the warp from rectangular coordinates.
+  Mat3 canonical_homography = ComputeCanonicalHomography(xs, ys,
+                                                         num_samples_x,
+                                                         num_samples_y);
+
+  // Walk over the coordinates in the canonical space, sampling from the image
+  // in the original space and copying the result into the patch.
+  for (int r = 0; r < num_samples_y; ++r) {
+    for (int c = 0; c < num_samples_x; ++c) {
+      Vec3 image_position = canonical_homography * Vec3(c, r, 1);
+      image_position /= image_position(2);
+      SampleLinear(image, image_position(1),
+                   image_position(0),
+                   &(*patch)(r, c, 0));
+      if (mask) {
+        float maskValue = SampleLinear(*mask, image_position(1),
+                                       image_position(0), 0);
+
+        for (int d = 0; d < image.Depth(); d++)
+          (*patch)(r, c, d) *= maskValue;
+      }
+    }
+  }
+
+  Vec3 warped_position = canonical_homography.inverse() * Vec3(xs[4], ys[4], 1);
+  warped_position /= warped_position(2);
+
+  *warped_position_x = warped_position(0);
+  *warped_position_y = warped_position(1);
+
+  return true;
+}
+
+}  // namespace libmv
diff --git a/extern/libmv/libmv/tracking/track_region.h b/extern/libmv/libmv/tracking/track_region.h
new file mode 100644
index 00000000000..22ecfc54a15
--- /dev/null
+++ b/extern/libmv/libmv/tracking/track_region.h
@@ -0,0 +1,150 @@
+// Copyright (c) 2012 libmv authors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+
+#ifndef LIBMV_TRACKING_TRACK_REGION_H_
+
+// Necessary for M_E when building with MSVC.
+#define _USE_MATH_DEFINES
+
+#include "libmv/tracking/esm_region_tracker.h"
+
+#include "libmv/image/image.h"
+#include "libmv/image/sample.h"
+#include "libmv/numeric/numeric.h"
+
+namespace libmv {
+
+struct TrackRegionOptions {
+  TrackRegionOptions();
+
+  enum Mode {
+    TRANSLATION,
+    TRANSLATION_ROTATION,
+    TRANSLATION_SCALE,
+    TRANSLATION_ROTATION_SCALE,
+    AFFINE,
+    HOMOGRAPHY,
+  };
+  Mode mode;
+
+  double minimum_correlation;
+  int max_iterations;
+
+  // Use the "Efficient Second-order Minimization" scheme. This increases
+  // convergence speed at the cost of more per-iteration work.
+  bool use_esm;
+
+  // If true, apply a brute-force translation-only search before attempting the
+  // full search. This is not enabled if the destination image ("image2") is
+  // too small; in that case eithen the basin of attraction is close enough
+  // that the nearby minima is correct, or the search area is too small.
+  bool use_brute_initialization;
+
+  // If true, normalize the image patches by their mean before doing the sum of
+  // squared error calculation. This is reasonable since the effect of
+  // increasing light intensity is multiplicative on the pixel intensities.
+  //
+  // Note: This does nearly double the solving time, so it is not advised to
+  // turn this on all the time.
+  bool use_normalized_intensities;
+
+  // The size in pixels of the blur kernel used to both smooth the image and
+  // take the image derivative.
+  double sigma;
+
+  // Extra points that should get transformed by the warp. This is useful
+  // because the actual warp parameters are not exposed.
+  int num_extra_points;
+
+  // For motion models other than translation, the optimizer sometimes has
+  // trouble deciding what to do around flat areas in the cost function. This
+  // leads to the optimizer picking poor solutions near the minimum. Visually,
+  // the effect is that the quad corners jiggle around, even though the center
+  // of the patch is well estimated. regularization_coefficient controls a term
+  // in the sum of squared error cost that makes it expensive for the optimizer
+  // to pick a warp that changes the shape of the patch dramatically (e.g.
+  // rotating, scaling, skewing, etc).
+  //
+  // In particular it adds an 8-residual cost function to the optimization,
+  // where each corner induces 2 residuals: the difference between the warped
+  // and the initial guess. However, the patch centroids are subtracted so that
+  // only patch distortions are penalized.
+  //
+  // If zero, no regularization is used.
+  double regularization_coefficient;
+
+  // If non-null, this is used as the pattern mask. It should match the size of
+  // image1, even though only values inside the image1 quad are examined. The
+  // values must be in the range 0.0 to 0.1.
+  FloatImage *image1_mask;
+};
+
+struct TrackRegionResult {
+  enum Termination {
+    // Ceres termination types, duplicated; though, not the int values.
+    PARAMETER_TOLERANCE,
+    FUNCTION_TOLERANCE,
+    GRADIENT_TOLERANCE,
+    NO_CONVERGENCE,
+    DID_NOT_RUN,
+    NUMERICAL_FAILURE,
+
+    // Libmv specific errors.
+    SOURCE_OUT_OF_BOUNDS,
+    DESTINATION_OUT_OF_BOUNDS,
+    FELL_OUT_OF_BOUNDS,
+    INSUFFICIENT_CORRELATION,
+    CONFIGURATION_ERROR,
+  };
+  Termination termination;
+
+  int num_iterations;
+  double correlation;
+
+  // Final parameters?
+  bool used_brute_translation_initialization;
+};
+
+// Always needs 4 correspondences.
+void TrackRegion(const FloatImage &image1,
+                 const FloatImage &image2,
+                 const double *x1, const double *y1,
+                 const TrackRegionOptions &options,
+                 double *x2, double *y2,
+                 TrackRegionResult *result);
+
+// Sample a "canonical" version of the passed planar patch, using bilinear
+// sampling. The passed corners must be within the image, and have at least two
+// pixels of border around them. (so e.g. a corner of the patch cannot lie
+// directly on the edge of the image). Four corners are always required. All
+// channels are interpolated.
+// When mask is not null it'll be used as a pattern mask. Ot should match
+// the size of image.
+// Warped coordinates of marker's position would be returned in
+// warped_position_x and warped_position_y
+bool SamplePlanarPatch(const FloatImage &image,
+                       const double *xs, const double *ys,
+                       int num_samples_x, int num_samples_y,
+                       FloatImage *mask, FloatImage *patch,
+                       double *warped_position_x, double *warped_position_y);
+
+}  // namespace libmv
+
+#endif  // LIBMV_TRACKING_TRACK_REGION_H_
diff --git a/extern/libmv/mkfiles.sh b/extern/libmv/mkfiles.sh
index fe84c357de4..c7c8c33f725 100755
--- a/extern/libmv/mkfiles.sh
+++ b/extern/libmv/mkfiles.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 find ./libmv/ -type f | sed -r 's/^\.\///' | sort > files.txt
-find ./third_party/ -type f | sed -r 's/^\.\///' | sort >> files.txt
+find ./third_party/ -mindepth 2 -type f | grep -v third_party/ceres | sed -r 's/^\.\///' | sort >> files.txt
diff --git a/extern/libmv/third_party/CMakeLists.txt b/extern/libmv/third_party/CMakeLists.txt
new file mode 100644
index 00000000000..6212fe480b1
--- /dev/null
+++ b/extern/libmv/third_party/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+add_subdirectory(ceres)
diff --git a/extern/libmv/third_party/SConscript b/extern/libmv/third_party/SConscript
new file mode 100644
index 00000000000..b05692e385f
--- /dev/null
+++ b/extern/libmv/third_party/SConscript
@@ -0,0 +1,3 @@
+#!/usr/bin/python
+
+SConscript(['ceres/SConscript'])
diff --git a/extern/libmv/third_party/ceres/CMakeLists.txt b/extern/libmv/third_party/ceres/CMakeLists.txt
new file mode 100644
index 00000000000..e6a9e430c47
--- /dev/null
+++ b/extern/libmv/third_party/ceres/CMakeLists.txt
@@ -0,0 +1,224 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The Original Code is Copyright (C) 2012, Blender Foundation
+# All rights reserved.
+#
+# Contributor(s): Blender Foundation,
+#                 Sergey Sharybin
+#
+# ***** END GPL LICENSE BLOCK *****
+
+# NOTE: This file is automatically generated by bundle.sh script
+#       If you're doing changes in this file, please update template
+#       in that script too
+
+set(INC
+	.
+	../../../Eigen3
+	include
+	internal
+	../gflags
+)
+
+set(INC_SYS
+)
+
+set(SRC
+	internal/ceres/block_evaluate_preparer.cc
+	internal/ceres/block_jacobian_writer.cc
+	internal/ceres/block_jacobi_preconditioner.cc
+	internal/ceres/block_random_access_dense_matrix.cc
+	internal/ceres/block_random_access_matrix.cc
+	internal/ceres/block_random_access_sparse_matrix.cc
+	internal/ceres/block_sparse_matrix.cc
+	internal/ceres/block_structure.cc
+	internal/ceres/canonical_views_clustering.cc
+	internal/ceres/cgnr_solver.cc
+	internal/ceres/compressed_row_jacobian_writer.cc
+	internal/ceres/compressed_row_sparse_matrix.cc
+	internal/ceres/conditioned_cost_function.cc
+	internal/ceres/conjugate_gradients_solver.cc
+	internal/ceres/corrector.cc
+	internal/ceres/dense_qr_solver.cc
+	internal/ceres/dense_sparse_matrix.cc
+	internal/ceres/detect_structure.cc
+	internal/ceres/evaluator.cc
+	internal/ceres/file.cc
+	internal/ceres/generated/schur_eliminator_d_d_d.cc
+	internal/ceres/gradient_checking_cost_function.cc
+	internal/ceres/implicit_schur_complement.cc
+	internal/ceres/iterative_schur_complement_solver.cc
+	internal/ceres/levenberg_marquardt.cc
+	internal/ceres/linear_least_squares_problems.cc
+	internal/ceres/linear_operator.cc
+	internal/ceres/linear_solver.cc
+	internal/ceres/local_parameterization.cc
+	internal/ceres/loss_function.cc
+	internal/ceres/normal_prior.cc
+	internal/ceres/partitioned_matrix_view.cc
+	internal/ceres/problem.cc
+	internal/ceres/problem_impl.cc
+	internal/ceres/program.cc
+	internal/ceres/residual_block.cc
+	internal/ceres/residual_block_utils.cc
+	internal/ceres/runtime_numeric_diff_cost_function.cc
+	internal/ceres/schur_complement_solver.cc
+	internal/ceres/schur_eliminator.cc
+	internal/ceres/schur_ordering.cc
+	internal/ceres/scratch_evaluate_preparer.cc
+	internal/ceres/solver.cc
+	internal/ceres/solver_impl.cc
+	internal/ceres/sparse_matrix.cc
+	internal/ceres/sparse_normal_cholesky_solver.cc
+	internal/ceres/split.cc
+	internal/ceres/stringprintf.cc
+	internal/ceres/suitesparse.cc
+	internal/ceres/triplet_sparse_matrix.cc
+	internal/ceres/types.cc
+	internal/ceres/visibility_based_preconditioner.cc
+	internal/ceres/visibility.cc
+
+	include/ceres/autodiff_cost_function.h
+	include/ceres/ceres.h
+	include/ceres/conditioned_cost_function.h
+	include/ceres/cost_function.h
+	include/ceres/internal/autodiff.h
+	include/ceres/internal/eigen.h
+	include/ceres/internal/fixed_array.h
+	include/ceres/internal/macros.h
+	include/ceres/internal/manual_constructor.h
+	include/ceres/internal/port.h
+	include/ceres/internal/scoped_ptr.h
+	include/ceres/iteration_callback.h
+	include/ceres/jet.h
+	include/ceres/local_parameterization.h
+	include/ceres/loss_function.h
+	include/ceres/normal_prior.h
+	include/ceres/numeric_diff_cost_function.h
+	include/ceres/problem.h
+	include/ceres/rotation.h
+	include/ceres/sized_cost_function.h
+	include/ceres/solver.h
+	include/ceres/types.h
+	internal/ceres/block_evaluate_preparer.h
+	internal/ceres/block_jacobian_writer.h
+	internal/ceres/block_jacobi_preconditioner.h
+	internal/ceres/block_random_access_dense_matrix.h
+	internal/ceres/block_random_access_matrix.h
+	internal/ceres/block_random_access_sparse_matrix.h
+	internal/ceres/block_sparse_matrix.h
+	internal/ceres/block_structure.h
+	internal/ceres/canonical_views_clustering.h
+	internal/ceres/casts.h
+	internal/ceres/cgnr_linear_operator.h
+	internal/ceres/cgnr_solver.h
+	internal/ceres/collections_port.h
+	internal/ceres/compressed_row_jacobian_writer.h
+	internal/ceres/compressed_row_sparse_matrix.h
+	internal/ceres/conjugate_gradients_solver.h
+	internal/ceres/corrector.h
+	internal/ceres/dense_jacobian_writer.h
+	internal/ceres/dense_qr_solver.h
+	internal/ceres/dense_sparse_matrix.h
+	internal/ceres/detect_structure.h
+	internal/ceres/evaluator.h
+	internal/ceres/file.h
+	internal/ceres/gradient_checking_cost_function.h
+	internal/ceres/graph_algorithms.h
+	internal/ceres/graph.h
+	internal/ceres/implicit_schur_complement.h
+	internal/ceres/integral_types.h
+	internal/ceres/iterative_schur_complement_solver.h
+	internal/ceres/levenberg_marquardt.h
+	internal/ceres/linear_least_squares_problems.h
+	internal/ceres/linear_operator.h
+	internal/ceres/linear_solver.h
+	internal/ceres/map_util.h
+	internal/ceres/matrix_proto.h
+	internal/ceres/minimizer.h
+	internal/ceres/mutex.h
+	internal/ceres/parameter_block.h
+	internal/ceres/partitioned_matrix_view.h
+	internal/ceres/problem_impl.h
+	internal/ceres/program_evaluator.h
+	internal/ceres/program.h
+	internal/ceres/random.h
+	internal/ceres/residual_block.h
+	internal/ceres/residual_block_utils.h
+	internal/ceres/runtime_numeric_diff_cost_function.h
+	internal/ceres/schur_complement_solver.h
+	internal/ceres/schur_eliminator.h
+	internal/ceres/schur_eliminator_impl.h
+	internal/ceres/schur_ordering.h
+	internal/ceres/scratch_evaluate_preparer.h
+	internal/ceres/solver_impl.h
+	internal/ceres/sparse_matrix.h
+	internal/ceres/sparse_normal_cholesky_solver.h
+	internal/ceres/stl_util.h
+	internal/ceres/stringprintf.h
+	internal/ceres/suitesparse.h
+	internal/ceres/triplet_sparse_matrix.h
+	internal/ceres/visibility_based_preconditioner.h
+	internal/ceres/visibility.h
+)
+
+#if(FALSE)
+#	list(APPEND SRC
+#		internal/ceres/generated/schur_eliminator_2_2_2.cc
+#		internal/ceres/generated/schur_eliminator_2_2_3.cc
+#		internal/ceres/generated/schur_eliminator_2_2_4.cc
+#		internal/ceres/generated/schur_eliminator_2_2_d.cc
+#		internal/ceres/generated/schur_eliminator_2_3_3.cc
+#		internal/ceres/generated/schur_eliminator_2_3_4.cc
+#		internal/ceres/generated/schur_eliminator_2_3_9.cc
+#		internal/ceres/generated/schur_eliminator_2_3_d.cc
+#		internal/ceres/generated/schur_eliminator_2_4_3.cc
+#		internal/ceres/generated/schur_eliminator_2_4_4.cc
+#		internal/ceres/generated/schur_eliminator_2_4_d.cc
+#		internal/ceres/generated/schur_eliminator_4_4_2.cc
+#		internal/ceres/generated/schur_eliminator_4_4_3.cc
+#		internal/ceres/generated/schur_eliminator_4_4_4.cc
+#		internal/ceres/generated/schur_eliminator_4_4_d.cc
+#	)
+#endif()
+
+if(WIN32)
+	list(APPEND INC
+		../glog/src/windows
+	)
+
+	if(NOT MINGW)
+		list(APPEND INC
+			third_party/msinttypes
+		)
+	endif()
+else()
+	list(APPEND INC
+		../glog/src
+	)
+endif()
+
+add_definitions(
+	-DCERES_HAVE_PTHREAD
+	-D"CERES_HASH_NAMESPACE_START=namespace std { namespace tr1 {"
+	-D"CERES_HASH_NAMESPACE_END=}}"
+	-DCERES_NO_SUITESPARSE
+	-DCERES_DONT_HAVE_PROTOCOL_BUFFERS
+	-DCERES_RESTRICT_SCHUR_SPECIALIZATION
+)
+
+blender_add_lib(extern_ceres "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/extern/libmv/third_party/ceres/ChangeLog b/extern/libmv/third_party/ceres/ChangeLog
new file mode 100644
index 00000000000..6e919658f13
--- /dev/null
+++ b/extern/libmv/third_party/ceres/ChangeLog
@@ -0,0 +1,324 @@
+commit ca72152362ae1f4b9928c012e74b4d49d094a4ca
+Merge: d297f8d 0a04199
+Author: Keir Mierle <mierle@gmail.com>
+Date:   Wed May 9 13:10:59 2012 -0700
+
+    Merge branch 'master' into windows
+
+commit 0a04199ef279cc9ea97f665fed8e7fae717813c3
+Merge: fdeb577 f2571f1
+Author: Keir Mierle <mierle@gmail.com>
+Date:   Wed May 9 12:54:56 2012 -0700
+
+    Merge branch 'master' of https://code.google.com/p/ceres-solver
+
+commit fdeb5772cc5eeebca4d776d220d80cc91b6d0f74
+Author: Keir Mierle <mierle@gmail.com>
+Date:   Wed May 9 07:38:07 2012 -0700
+
+    Support varying numbers of residuals in autodiff.
+    
+    This commit modifies the only function in autodiff that takes a
+    templated number of outputs (i.e. residuals) and makes that
+    template parameter a normal parameter. With that change, it
+    is a trivial matter to support a dynamic number of residuals.
+    
+    The API for dynamic residuals is to pass a fake number of
+    residuals as the second template argument to
+    AutoDiffCostFunction, and to pass the real number of
+    parameters as a second constructor argument.
+
+commit da3e0563cc12e08e7b3e0fbf11d9cc8cfe9658aa
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Wed May 9 11:57:47 2012 -0700
+
+    Typo corrections in the documentation from Bing
+
+commit aa9526d8e8fb34c23d63e3af5bf9239b0c4ea603
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Tue May 8 21:22:09 2012 -0700
+
+    Share search paths across various library searches.
+    Fix typos in glog search.
+    Split the error messages for include and lib.
+    Enable building of tests by default.
+    Made building on homebrew installations a bit better.
+    Remove temporary variables for glog and gflags.
+
+commit f2571f186850ed3dd316236ac4be488979df7d30
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Wed May 9 11:57:47 2012 -0700
+
+    Typo corrections in the documentation from Bing
+
+commit 8f7f11ff7d07737435428a2620c52419cf99f98e
+Merge: e6c17c4 eaccbb3
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Wed May 9 11:34:15 2012 -0700
+
+    Merge branch 'master' of https://code.google.com/p/ceres-solver
+
+commit e6c17c4c9d9307218f6f739cea39bc2d87733d4d
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Tue May 8 21:22:09 2012 -0700
+
+    Share search paths across various library searches.
+    Fix typos in glog search.
+    Split the error messages for include and lib.
+    Enable building of tests by default.
+    Made building on homebrew installations a bit better.
+    Remove temporary variables for glog and gflags.
+
+commit eaccbb345614c0d24c5e21fa931f470cfda874df
+Author: Keir Mierle <mierle@gmail.com>
+Date:   Wed May 9 05:31:29 2012 -0700
+
+    Remove unused template parameter from VariadicEvaluate.
+
+commit 82f4b88c34b0b2cf85064e5fc20e374e978b2e3b
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Sun May 6 21:05:28 2012 -0700
+
+    Extend support writing linear least squares problems to disk.
+    
+    1. Make the mechanism for writing problems to disk, generic and
+    controllable using an enum DumpType visible in the API.
+    
+    2. Instead of single file containing protocol buffers, now matrices can
+    be written in a matlab/octave friendly format. This is now the default.
+    
+    3. The support for writing problems to disk is moved into
+    linear_least_squares_problem.cc/h
+    
+    4. SparseMatrix now has a ToTextFile virtual method which is
+    implemented by each of its subclasses to write a (i,j,s) triplets.
+    
+    5. Minor changes to simple_bundle_adjuster to enable logging at startup.
+
+commit d297f8d3d3f5025c24752f0f4c1ec2469a769f99
+Merge: 7e74d81 f8bd7fa
+Author: Keir Mierle <mierle@gmail.com>
+Date:   Tue May 8 05:39:56 2012 -0700
+
+    Merge branch 'master' into windows
+
+commit f8bd7fa9aa9dbf64b6165606630287cf8cf21194
+Author: Keir Mierle <mierle@gmail.com>
+Date:   Tue May 8 05:39:32 2012 -0700
+
+    Small tweaks to the block jacobi preconditioner.
+
+commit 7e74d81ad57a159f14110eb5348b3bc7990b8bd4
+Merge: ecd7c8d e2a6cdc
+Author: Keir Mierle <mierle@gmail.com>
+Date:   Mon May 7 07:02:49 2012 -0700
+
+    Merge branch 'master' into windows
+
+commit e2a6cdc0816af9d0c77933f5017f137da3d52a35
+Author: Keir Mierle <mierle@gmail.com>
+Date:   Mon May 7 06:39:56 2012 -0700
+
+    Address some of the comments on CGNR patch
+    
+    - Rename BlockDiagonalPreconditioner to BlockJacobiPreconditioner
+    - Include the diagonal in the block jacobi preconditioner.
+    - Better flag help for eta.
+    - Enable test for CGNR
+    - Rename CONJUGATE_GRADIENTS to CGNR.
+    - etc.
+
+commit 1b95dc580aa5d89be021c0915e26df83f18013bb
+Merge: 211812a 7646039
+Author: Keir Mierle <mierle@gmail.com>
+Date:   Mon May 7 04:34:10 2012 -0700
+
+    Merge branch 'master' of https://code.google.com/p/ceres-solver
+
+commit 211812a57360d2011cbcfd115cd55e0eb73600db
+Author: Keir Mierle <mierle@gmail.com>
+Date:   Mon May 7 04:33:50 2012 -0700
+
+    Better error handling in bundle_adjuster.cc
+
+commit 7646039ad9672b267495f5b31925473ad3022ac8
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Sun May 6 22:02:19 2012 -0700
+
+    Kashif's corrections to the docs
+
+commit 0d2d34148d10c5c7e924b3ca82ad2b237573ef64
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Sun May 6 21:16:03 2012 -0700
+
+    glog minimum version requirements
+    
+    Building Ceres requires version 0.3.1 or better of glog.
+    Fedora 16 ships with a busted version 0.3.
+    
+    issue 15 contains the gory details.
+    
+    Added a note to the build documentation to this effect.
+
+commit 39efc5ec4b64b8f5a2c5a3dbacdbc45421221547
+Author: Keir Mierle <mierle@gmail.com>
+Date:   Sun May 6 16:09:52 2012 -0700
+
+    Fix tests broken by the CGNR change.
+
+commit 3faa08b7f7c4ac73661c6a15a6824c12080dfcb1
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Sun May 6 16:08:22 2012 -0700
+
+    Formatting fixed based on Keir's comments and extended the tests
+
+commit 4f21c68409bc478c431a9b6aedf9e5cfdf11d2f3
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Sun May 6 15:33:47 2012 -0700
+
+    Fix the struct weak ordering used by independent set ordering, tests for it
+
+commit 887b156b917ccd4c172484452b059d33ea45f4f0
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Sun May 6 15:14:47 2012 -0700
+
+    fix he degree ordering routine
+
+commit ecd7c8df2af19404dc394b36bbe96e9db3bce840
+Author: Keir Mierle <mierle@gmail.com>
+Date:   Sun May 6 00:09:41 2012 -0700
+
+    First step towards windows compatibilty
+    
+    This adds some small changes to Ceres to make it mostly
+    compile on Windows. There are still issues with the
+    hash map use in schur_ordering.cc but I will fix those
+    shortly.
+
+commit f7898fba1b92f0e996571b5bfa22a37f5e3644de
+Author: Keir Mierle <mierle@gmail.com>
+Date:   Sat May 5 20:55:08 2012 -0700
+
+    Add a general sparse iterative solver: CGNR
+    
+    This adds a new LinearOperator which implements symmetric
+    products of a matrix, and a new CGNR solver to leverage
+    CG to directly solve the normal equations. This also
+    includes a block diagonal preconditioner. In experiments
+    on problem-16, the non-preconditioned version is about
+    1/5 the speed of SPARSE_SCHUR, and the preconditioned
+    version using block cholesky is about 20% slower than
+    SPARSE_SCHUR.
+
+commit 0a359d6198d257776a8831c3eb98f64ee91cf836
+Author: Keir Mierle <mierle@gmail.com>
+Date:   Sat May 5 20:33:46 2012 -0700
+
+    Comment formatting.
+
+commit db4ec9312bb2f1ca7b2337812f6bad6cdd75b227
+Author: Keir Mierle <mierle@gmail.com>
+Date:   Sat May 5 20:33:16 2012 -0700
+
+    Comment formatting
+
+commit f10163aaf3e57f52551bcd60bbdae873890a49dd
+Author: Keir Mierle <mierle@gmail.com>
+Date:   Fri May 4 21:33:53 2012 -0700
+
+    Warn about disabled schur specializations.
+    
+    This commit brought to you from 30,000ft.
+
+commit ad7b2b4aaf3ccc51f2b854febd53a9df54686cfe
+Author: Keir Mierle <mierle@gmail.com>
+Date:   Fri May 4 20:15:28 2012 -0700
+
+    Add vim swapfiles to .gitignore
+
+commit 6447219826bf6e47b0c99d9ff0eaf5e2ba573d79
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Thu May 3 21:53:07 2012 -0700
+
+    1. Changes the tutorial to refer to BriefReport.
+    2. Some of the enums have commas at the end.
+    3. Fix a bug in the default value of circle_fit.cc in the examples.
+
+commit 30c5f93c7f88dec49f76168663372772e06f17f5
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Thu May 3 10:44:43 2012 -0700
+
+    Rework the glog and gtest path checking to be consistent with the rest of the file and disable the dashboard support enabled by the earlier ctesting related patch.
+
+commit f10b033eb4aca77919987bc551d16d8a88b10110
+Merge: cc38774 e0a52a9
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Thu May 3 08:45:20 2012 -0700
+
+    Merge branch 'ctest'
+
+commit e0a52a993394e73bc7f7db8d520728926feab83e
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Thu May 3 08:43:34 2012 -0700
+
+    Arnaus Gelas' patch to add better path searching for gflags and glog
+
+commit a9b8e815e1c026599734510399b10f4cf014c9cd
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Thu May 3 08:41:52 2012 -0700
+
+    Arnaus Gelas' patch to add .gitignore
+
+commit a0cefc3347c32b2065053bbaff4f34d11529d931
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Thu May 3 08:38:33 2012 -0700
+
+    Arnaus Gelas' patch to move to Ctest
+
+commit cc38774d74e287704915282425fbd16818a72ec3
+Author: Keir Mierle <mierle@gmail.com>
+Date:   Thu May 3 01:27:50 2012 -0700
+
+    Clarify ProgramEvaluator comments.
+
+commit 017c9530df557863f78212fb5ccd02814baa9fa8
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Wed May 2 08:21:59 2012 -0700
+
+    Mac OS X build instructions are much simpler, as homebrew takes care of gflags when glog is brought in. Also CMAKE does not need any flags to do the default thing
+
+commit 92d5ab5f8ae6fe355c30b606a5f230415ee0494b
+Author: Keir Mierle <mierle@gmail.com>
+Date:   Tue May 1 18:33:08 2012 -0700
+
+    Link BLAS explicitly on non-Mac platforms
+    
+    Fixes issue #3.
+
+commit df3e54eb4a6b001b7f0560a2da73a5bd7f18615e
+Author: Keir Mierle <mierle@gmail.com>
+Date:   Tue May 1 18:22:51 2012 -0700
+
+    Fix link order of CHOLMOD
+    
+    This was working by accident due to dynamic linking. Fixes issue #2.
+
+commit f477a3835329e2b48eb20c34c631a480b0f0d5bf
+Author: Keir Mierle <mierle@gmail.com>
+Date:   Tue May 1 18:10:48 2012 -0700
+
+    Fix Eigen search paths
+    
+    Fixes issue #1 on http://code.google.com/p/ceres-solver.
+
+commit 17fbc8ebb894c1d22bb3b0b02ea1394b580120f8
+Author: Sameer Agarwal <sameeragarwal@google.com>
+Date:   Tue May 1 00:21:19 2012 -0700
+
+    Minor changes to the documentation. Formatting, and typos.
+
+commit 8ebb0730388045570f22b89fe8672c860cd2ad1b
+Author: Keir Mierle <mierle@gmail.com>
+Date:   Mon Apr 30 23:09:08 2012 -0700
+
+    Initial commit of Ceres Solver.
diff --git a/extern/libmv/third_party/ceres/LICENSE b/extern/libmv/third_party/ceres/LICENSE
new file mode 100644
index 00000000000..2e3ead5ed45
--- /dev/null
+++ b/extern/libmv/third_party/ceres/LICENSE
@@ -0,0 +1,27 @@
+Ceres Solver - A fast non-linear least squares minimizer
+Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+http://code.google.com/p/ceres-solver/
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+* Neither the name of Google Inc. nor the names of its contributors may be
+  used to endorse or promote products derived from this software without
+  specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/extern/libmv/third_party/ceres/README b/extern/libmv/third_party/ceres/README
new file mode 100644
index 00000000000..8dd8ccf91a1
--- /dev/null
+++ b/extern/libmv/third_party/ceres/README
@@ -0,0 +1,3 @@
+Ceres Solver - A non-linear least squares minimizer
+==================================================
+Please see ceres.pdf in docs/ for a tutorial and reference.
diff --git a/extern/libmv/third_party/ceres/SConscript b/extern/libmv/third_party/ceres/SConscript
new file mode 100644
index 00000000000..6b5f1b8d64d
--- /dev/null
+++ b/extern/libmv/third_party/ceres/SConscript
@@ -0,0 +1,36 @@
+#!/usr/bin/python
+
+# NOTE: This file is automatically generated by bundle.sh script
+#       If you're doing changes in this file, please update template
+#       in that script too
+
+import sys
+import os
+
+Import('env')
+
+src = []
+defs = []
+
+src += env.Glob('internal/ceres/*.cc')
+src += env.Glob('internal/ceres/generated/schur_eliminator_d_d_d.cc')
+#src += env.Glob('internal/ceres/generated/*.cc')
+
+defs.append('CERES_HAVE_PTHREAD')
+defs.append('CERES_HASH_NAMESPACE_START=namespace std { namespace tr1 {')
+defs.append('CERES_HASH_NAMESPACE_END=}}')
+defs.append('CERES_NO_SUITESPARSE')
+defs.append('CERES_DONT_HAVE_PROTOCOL_BUFFERS')
+defs.append('CERES_RESTRICT_SCHUR_SPECIALIZATION')
+
+incs = '. ../../ ../../../Eigen3 ./include ./internal ../gflags'
+
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
+    if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
+        incs += ' ../msinttypes'
+
+    incs += ' ../glog/src/windows'
+else:
+    incs += ' ../glog/src'
+
+env.BlenderLib ( libname = 'extern_ceres', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137])
diff --git a/extern/libmv/third_party/ceres/bundle.sh b/extern/libmv/third_party/ceres/bundle.sh
new file mode 100755
index 00000000000..99aaadd8d87
--- /dev/null
+++ b/extern/libmv/third_party/ceres/bundle.sh
@@ -0,0 +1,203 @@
+#!/bin/sh
+
+if false; then
+if [ "x$1" = "x--i-really-know-what-im-doing" ] ; then
+  echo Proceeding as requested by command line ...
+else
+  echo "*** Please run again with --i-really-know-what-im-doing ..."
+  exit 1
+fi
+
+repo="https://code.google.com/p/ceres-solver/"
+branch="windows"
+tmp=`mktemp -d`
+
+GIT="git --git-dir $tmp/ceres/.git --work-tree $tmp/ceres"
+
+git clone $repo $tmp/ceres
+
+if [ $branch != "master" ]; then
+    $GIT checkout -t remotes/origin/$branch
+fi
+
+$GIT log -n 50 > ChangeLog
+
+for p in `cat ./patches/series`; do
+  echo "Applying patch $p..."
+  cat ./patches/$p | patch -d $tmp/ceres -p1
+done
+
+find include -type f -not -iwholename '*.svn*' -exec rm -rf {} \;
+find internal -type f -not -iwholename '*.svn*' -exec rm -rf {} \;
+
+cat "files.txt" | while read f; do
+  mkdir -p `dirname $f`
+  cp $tmp/ceres/$f $f
+done
+
+rm -rf $tmp
+
+fi
+
+sources=`find ./include ./internal -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | sed -r 's/^\.\//\t/' | grep -v -E 'schur_eliminator_[0-9]_[0-9]_[0-9d].cc' | sort -d`
+generated_sources=`find ./include ./internal -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | sed -r 's/^\.\//#\t\t/' | grep -E 'schur_eliminator_[0-9]_[0-9]_[0-9d].cc' | sort -d`
+headers=`find ./include ./internal -type f -iname '*.h' | sed -r 's/^\.\//\t/' | sort -d`
+
+src_dir=`find ./internal -type f -iname '*.cc' -exec dirname {} \; -or -iname '*.cpp' -exec dirname {} \; -or -iname '*.c' -exec dirname {} \; | sed -r 's/^\.\//\t/' | sort -d | uniq`
+src=""
+for x in $src_dir $src_third_dir; do
+  t=""
+
+  if test  `echo "$x" | grep -c glog ` -eq 1; then
+    continue;
+  fi
+
+  if test  `echo "$x" | grep -c generated` -eq 1; then
+    continue;
+  fi
+
+  if stat $x/*.cpp > /dev/null 2>&1; then
+    t="src += env.Glob('`echo $x'/*.cpp'`')"
+  fi
+
+  if stat $x/*.c > /dev/null 2>&1; then
+    if [ -z "$t" ]; then
+      t="src += env.Glob('`echo $x'/*.c'`')"
+    else
+      t="$t + env.Glob('`echo $x'/*.c'`')"
+    fi
+  fi
+
+  if stat $x/*.cc > /dev/null 2>&1; then
+    if [ -z "$t" ]; then
+      t="src += env.Glob('`echo $x'/*.cc'`')"
+    else
+      t="$t + env.Glob('`echo $x'/*.cc'`')"
+    fi
+  fi
+
+  if [ -z "$src" ]; then
+    src=$t
+  else
+    src=`echo "$src\n$t"`
+  fi
+done
+
+cat > CMakeLists.txt << EOF
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The Original Code is Copyright (C) 2012, Blender Foundation
+# All rights reserved.
+#
+# Contributor(s): Blender Foundation,
+#                 Sergey Sharybin
+#
+# ***** END GPL LICENSE BLOCK *****
+
+# NOTE: This file is automatically generated by bundle.sh script
+#       If you're doing changes in this file, please update template
+#       in that script too
+
+set(INC
+	.
+	../../../Eigen3
+	include
+	internal
+	../gflags
+)
+
+set(INC_SYS
+)
+
+set(SRC
+${sources}
+
+${headers}
+)
+
+#if(FALSE)
+#	list(APPEND SRC
+${generated_sources}
+#	)
+#endif()
+
+if(WIN32)
+	list(APPEND INC
+		../glog/src/windows
+	)
+
+	if(NOT MINGW)
+		list(APPEND INC
+			third_party/msinttypes
+		)
+	endif()
+else()
+	list(APPEND INC
+		../glog/src
+	)
+endif()
+
+add_definitions(
+	-DCERES_HAVE_PTHREAD
+	-D"CERES_HASH_NAMESPACE_START=namespace std { namespace tr1 {"
+	-D"CERES_HASH_NAMESPACE_END=}}"
+	-DCERES_NO_SUITESPARSE
+	-DCERES_DONT_HAVE_PROTOCOL_BUFFERS
+	-DCERES_RESTRICT_SCHUR_SPECIALIZATION
+)
+
+blender_add_lib(extern_ceres "\${SRC}" "\${INC}" "\${INC_SYS}")
+EOF
+
+cat > SConscript << EOF
+#!/usr/bin/python
+
+# NOTE: This file is automatically generated by bundle.sh script
+#       If you're doing changes in this file, please update template
+#       in that script too
+
+import sys
+import os
+
+Import('env')
+
+src = []
+defs = []
+
+$src
+src += env.Glob('internal/ceres/generated/schur_eliminator_d_d_d.cc')
+#src += env.Glob('internal/ceres/generated/*.cc')
+
+defs.append('CERES_HAVE_PTHREAD')
+defs.append('CERES_HASH_NAMESPACE_START=namespace std { namespace tr1 {')
+defs.append('CERES_HASH_NAMESPACE_END=}}')
+defs.append('CERES_NO_SUITESPARSE')
+defs.append('CERES_DONT_HAVE_PROTOCOL_BUFFERS')
+defs.append('CERES_RESTRICT_SCHUR_SPECIALIZATION')
+
+incs = '. ../../ ../../../Eigen3 ./include ./internal ../gflags'
+
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
+    if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
+        incs += ' ../msinttypes'
+
+    incs += ' ../glog/src/windows'
+else:
+    incs += ' ../glog/src'
+
+env.BlenderLib ( libname = 'extern_ceres', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137])
+EOF
diff --git a/extern/libmv/third_party/ceres/files.txt b/extern/libmv/third_party/ceres/files.txt
new file mode 100644
index 00000000000..e9d7f585260
--- /dev/null
+++ b/extern/libmv/third_party/ceres/files.txt
@@ -0,0 +1,150 @@
+include/ceres/autodiff_cost_function.h
+include/ceres/ceres.h
+include/ceres/conditioned_cost_function.h
+include/ceres/cost_function.h
+include/ceres/internal/autodiff.h
+include/ceres/internal/eigen.h
+include/ceres/internal/fixed_array.h
+include/ceres/internal/macros.h
+include/ceres/internal/manual_constructor.h
+include/ceres/internal/port.h
+include/ceres/internal/scoped_ptr.h
+include/ceres/iteration_callback.h
+include/ceres/jet.h
+include/ceres/local_parameterization.h
+include/ceres/loss_function.h
+include/ceres/normal_prior.h
+include/ceres/numeric_diff_cost_function.h
+include/ceres/problem.h
+include/ceres/rotation.h
+include/ceres/sized_cost_function.h
+include/ceres/solver.h
+include/ceres/types.h
+internal/ceres/block_evaluate_preparer.cc
+internal/ceres/block_evaluate_preparer.h
+internal/ceres/block_jacobian_writer.cc
+internal/ceres/block_jacobian_writer.h
+internal/ceres/block_jacobi_preconditioner.cc
+internal/ceres/block_jacobi_preconditioner.h
+internal/ceres/block_random_access_dense_matrix.cc
+internal/ceres/block_random_access_dense_matrix.h
+internal/ceres/block_random_access_matrix.cc
+internal/ceres/block_random_access_matrix.h
+internal/ceres/block_random_access_sparse_matrix.cc
+internal/ceres/block_random_access_sparse_matrix.h
+internal/ceres/block_sparse_matrix.cc
+internal/ceres/block_sparse_matrix.h
+internal/ceres/block_structure.cc
+internal/ceres/block_structure.h
+internal/ceres/canonical_views_clustering.cc
+internal/ceres/canonical_views_clustering.h
+internal/ceres/casts.h
+internal/ceres/cgnr_linear_operator.h
+internal/ceres/cgnr_solver.cc
+internal/ceres/cgnr_solver.h
+internal/ceres/collections_port.h
+internal/ceres/compressed_row_jacobian_writer.cc
+internal/ceres/compressed_row_jacobian_writer.h
+internal/ceres/compressed_row_sparse_matrix.cc
+internal/ceres/compressed_row_sparse_matrix.h
+internal/ceres/conditioned_cost_function.cc
+internal/ceres/conjugate_gradients_solver.cc
+internal/ceres/conjugate_gradients_solver.h
+internal/ceres/corrector.cc
+internal/ceres/corrector.h
+internal/ceres/dense_jacobian_writer.h
+internal/ceres/dense_qr_solver.cc
+internal/ceres/dense_qr_solver.h
+internal/ceres/dense_sparse_matrix.cc
+internal/ceres/dense_sparse_matrix.h
+internal/ceres/detect_structure.cc
+internal/ceres/detect_structure.h
+internal/ceres/evaluator.cc
+internal/ceres/evaluator.h
+internal/ceres/file.cc
+internal/ceres/file.h
+internal/ceres/generated/schur_eliminator_2_2_2.cc
+internal/ceres/generated/schur_eliminator_2_2_3.cc
+internal/ceres/generated/schur_eliminator_2_2_4.cc
+internal/ceres/generated/schur_eliminator_2_2_d.cc
+internal/ceres/generated/schur_eliminator_2_3_3.cc
+internal/ceres/generated/schur_eliminator_2_3_4.cc
+internal/ceres/generated/schur_eliminator_2_3_9.cc
+internal/ceres/generated/schur_eliminator_2_3_d.cc
+internal/ceres/generated/schur_eliminator_2_4_3.cc
+internal/ceres/generated/schur_eliminator_2_4_4.cc
+internal/ceres/generated/schur_eliminator_2_4_d.cc
+internal/ceres/generated/schur_eliminator_4_4_2.cc
+internal/ceres/generated/schur_eliminator_4_4_3.cc
+internal/ceres/generated/schur_eliminator_4_4_4.cc
+internal/ceres/generated/schur_eliminator_4_4_d.cc
+internal/ceres/generated/schur_eliminator_d_d_d.cc
+internal/ceres/gradient_checking_cost_function.cc
+internal/ceres/gradient_checking_cost_function.h
+internal/ceres/graph_algorithms.h
+internal/ceres/graph.h
+internal/ceres/implicit_schur_complement.cc
+internal/ceres/implicit_schur_complement.h
+internal/ceres/integral_types.h
+internal/ceres/iterative_schur_complement_solver.cc
+internal/ceres/iterative_schur_complement_solver.h
+internal/ceres/levenberg_marquardt.cc
+internal/ceres/levenberg_marquardt.h
+internal/ceres/linear_least_squares_problems.cc
+internal/ceres/linear_least_squares_problems.h
+internal/ceres/linear_operator.cc
+internal/ceres/linear_operator.h
+internal/ceres/linear_solver.cc
+internal/ceres/linear_solver.h
+internal/ceres/local_parameterization.cc
+internal/ceres/loss_function.cc
+internal/ceres/map_util.h
+internal/ceres/matrix_proto.h
+internal/ceres/minimizer.h
+internal/ceres/mutex.h
+internal/ceres/normal_prior.cc
+internal/ceres/parameter_block.h
+internal/ceres/partitioned_matrix_view.cc
+internal/ceres/partitioned_matrix_view.h
+internal/ceres/problem.cc
+internal/ceres/problem_impl.cc
+internal/ceres/problem_impl.h
+internal/ceres/program.cc
+internal/ceres/program_evaluator.h
+internal/ceres/program.h
+internal/ceres/random.h
+internal/ceres/residual_block.cc
+internal/ceres/residual_block.h
+internal/ceres/residual_block_utils.cc
+internal/ceres/residual_block_utils.h
+internal/ceres/runtime_numeric_diff_cost_function.cc
+internal/ceres/runtime_numeric_diff_cost_function.h
+internal/ceres/schur_complement_solver.cc
+internal/ceres/schur_complement_solver.h
+internal/ceres/schur_eliminator.cc
+internal/ceres/schur_eliminator.h
+internal/ceres/schur_eliminator_impl.h
+internal/ceres/schur_ordering.cc
+internal/ceres/schur_ordering.h
+internal/ceres/scratch_evaluate_preparer.cc
+internal/ceres/scratch_evaluate_preparer.h
+internal/ceres/solver.cc
+internal/ceres/solver_impl.cc
+internal/ceres/solver_impl.h
+internal/ceres/sparse_matrix.cc
+internal/ceres/sparse_matrix.h
+internal/ceres/sparse_normal_cholesky_solver.cc
+internal/ceres/sparse_normal_cholesky_solver.h
+internal/ceres/split.cc
+internal/ceres/stl_util.h
+internal/ceres/stringprintf.cc
+internal/ceres/stringprintf.h
+internal/ceres/suitesparse.cc
+internal/ceres/suitesparse.h
+internal/ceres/triplet_sparse_matrix.cc
+internal/ceres/triplet_sparse_matrix.h
+internal/ceres/types.cc
+internal/ceres/visibility_based_preconditioner.cc
+internal/ceres/visibility_based_preconditioner.h
+internal/ceres/visibility.cc
+internal/ceres/visibility.h
diff --git a/extern/libmv/third_party/ceres/include/ceres/autodiff_cost_function.h b/extern/libmv/third_party/ceres/include/ceres/autodiff_cost_function.h
new file mode 100644
index 00000000000..e86d6993864
--- /dev/null
+++ b/extern/libmv/third_party/ceres/include/ceres/autodiff_cost_function.h
@@ -0,0 +1,211 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Helpers for making CostFunctions as needed by the least squares framework,
+// with Jacobians computed via automatic differentiation. For more information
+// on automatic differentation, see the wikipedia article at
+// http://en.wikipedia.org/wiki/Automatic_differentiation
+//
+// To get an auto differentiated cost function, you must define a class with a
+// templated operator() (a functor) that computes the cost function in terms of
+// the template parameter T. The autodiff framework substitutes appropriate
+// "jet" objects for T in order to compute the derivative when necessary, but
+// this is hidden, and you should write the function as if T were a scalar type
+// (e.g. a double-precision floating point number).
+//
+// The function must write the computed value in the last argument (the only
+// non-const one) and return true to indicate success.
+//
+// For example, consider a scalar error e = k - x'y, where both x and y are
+// two-dimensional column vector parameters, the prime sign indicates
+// transposition, and k is a constant. The form of this error, which is the
+// difference between a constant and an expression, is a common pattern in least
+// squares problems. For example, the value x'y might be the model expectation
+// for a series of measurements, where there is an instance of the cost function
+// for each measurement k.
+//
+// The actual cost added to the total problem is e^2, or (k - x'k)^2; however,
+// the squaring is implicitly done by the optimization framework.
+//
+// To write an auto-differentiable cost function for the above model, first
+// define the object
+//
+//   class MyScalarCostFunction {
+//     MyScalarCostFunction(double k): k_(k) {}
+//
+//     template <typename T>
+//     bool operator()(const T* const x , const T* const y, T* e) const {
+//       e[0] = T(k_) - x[0] * y[0] + x[1] * y[1];
+//       return true;
+//     }
+//
+//    private:
+//     double k_;
+//   };
+//
+// Note that in the declaration of operator() the input parameters x and y come
+// first, and are passed as const pointers to arrays of T. If there were three
+// input parameters, then the third input parameter would come after y. The
+// output is always the last parameter, and is also a pointer to an array. In
+// the example above, e is a scalar, so only e[0] is set.
+//
+// Then given this class definition, the auto differentiated cost function for
+// it can be constructed as follows.
+//
+//   CostFunction* cost_function
+//       = new AutoDiffCostFunction<MyScalarCostFunction, 1, 2, 2>(
+//           new MyScalarCostFunction(1.0));              ^  ^  ^
+//                                                        |  |  |
+//                            Dimension of residual ------+  |  |
+//                            Dimension of x ----------------+  |
+//                            Dimension of y -------------------+
+//
+// In this example, there is usually an instance for each measumerent of k.
+//
+// In the instantiation above, the template parameters following
+// "MyScalarCostFunction", "1, 2, 2", describe the functor as computing a
+// 1-dimensional output from two arguments, both 2-dimensional.
+//
+// The autodiff cost function also supports cost functions with a
+// runtime-determined number of residuals. For example:
+//
+//   CostFunction* cost_function
+//       = new AutoDiffCostFunction<MyScalarCostFunction, DYNAMIC, 2, 2>(
+//           new CostFunctionWithDynamicNumResiduals(1.0),   ^     ^  ^
+//           runtime_number_of_residuals); <----+            |     |  |
+//                                              |            |     |  |
+//                                              |            |     |  |
+//             Actual number of residuals ------+            |     |  |
+//             Indicate dynamic number of residuals ---------+     |  |
+//             Dimension of x -------------------------------------+  |
+//             Dimension of y ----------------------------------------+
+//
+// The framework can currently accommodate cost functions of up to 6 independent
+// variables, and there is no limit on the dimensionality of each of them.
+//
+// WARNING #1: Since the functor will get instantiated with different types for
+// T, you must to convert from other numeric types to T before mixing
+// computations with other variables of type T. In the example above, this is
+// seen where instead of using k_ directly, k_ is wrapped with T(k_).
+//
+// WARNING #2: A common beginner's error when first using autodiff cost
+// functions is to get the sizing wrong. In particular, there is a tendency to
+// set the template parameters to (dimension of residual, number of parameters)
+// instead of passing a dimension parameter for *every parameter*. In the
+// example above, that would be <MyScalarCostFunction, 1, 2>, which is missing
+// the last '2' argument. Please be careful when setting the size parameters.
+
+#ifndef CERES_PUBLIC_AUTODIFF_COST_FUNCTION_H_
+#define CERES_PUBLIC_AUTODIFF_COST_FUNCTION_H_
+
+#include <glog/logging.h>
+#include "ceres/internal/autodiff.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/sized_cost_function.h"
+#include "ceres/types.h"
+
+namespace ceres {
+
+// A cost function which computes the derivative of the cost with respect to
+// the parameters (a.k.a. the jacobian) using an autodifferentiation framework.
+// The first template argument is the functor object, described in the header
+// comment. The second argument is the dimension of the residual (or
+// ceres::DYNAMIC to indicate it will be set at runtime), and subsequent
+// arguments describe the size of the Nth parameter, one per parameter.
+//
+// The constructors take ownership of the cost functor.
+//
+// If the number of residuals (argument "M" below) is ceres::DYNAMIC, then the
+// two-argument constructor must be used. The second constructor takes a number
+// of residuals (in addition to the templated number of residuals). This allows
+// for varying the number of residuals for a single autodiff cost function at
+// runtime.
+template <typename CostFunctor,
+          int M,        // Number of residuals, or ceres::DYNAMIC.
+          int N0,       // Number of parameters in block 0.
+          int N1 = 0,   // Number of parameters in block 1.
+          int N2 = 0,   // Number of parameters in block 2.
+          int N3 = 0,   // Number of parameters in block 3.
+          int N4 = 0,   // Number of parameters in block 4.
+          int N5 = 0>   // Number of parameters in block 5.
+class AutoDiffCostFunction :
+  public SizedCostFunction<M, N0, N1, N2, N3, N4, N5> {
+ public:
+  // Takes ownership of functor. Uses the template-provided value for the
+  // number of residuals ("M").
+  explicit AutoDiffCostFunction(CostFunctor* functor)
+      : functor_(functor) {
+    CHECK_NE(M, DYNAMIC) << "Can't run the fixed-size constructor if the "
+                         << "number of residuals is set to ceres::DYNAMIC.";
+  }
+
+  // Takes ownership of functor. Ignores the template-provided number of
+  // residuals ("M") in favor of the "num_residuals" argument provided.
+  //
+  // This allows for having autodiff cost functions which return varying
+  // numbers of residuals at runtime.
+  AutoDiffCostFunction(CostFunctor* functor, int num_residuals)
+      : functor_(functor) {
+    CHECK_EQ(M, DYNAMIC) << "Can't run the dynamic-size constructor if the "
+                         << "number of residuals is not ceres::DYNAMIC.";
+    SizedCostFunction<M, N0, N1, N2, N3, N4, N5>::set_num_residuals(num_residuals);
+  }
+
+  virtual ~AutoDiffCostFunction() {}
+
+  // Implementation details follow; clients of the autodiff cost function should
+  // not have to examine below here.
+  //
+  // To handle varardic cost functions, some template magic is needed. It's
+  // mostly hidden inside autodiff.h.
+  virtual bool Evaluate(double const* const* parameters,
+                        double* residuals,
+                        double** jacobians) const {
+    if (!jacobians) {
+      return internal::VariadicEvaluate<
+          CostFunctor, double, N0, N1, N2, N3, N4, N5>
+          ::Call(*functor_, parameters, residuals);
+    }
+    return internal::AutoDiff<CostFunctor, double,
+           N0, N1, N2, N3, N4, N5>::Differentiate(
+               *functor_,
+               parameters,
+               SizedCostFunction<M, N0, N1, N2, N3, N4, N5>::num_residuals(),
+               residuals,
+               jacobians);
+  }
+
+ private:
+  internal::scoped_ptr<CostFunctor> functor_;
+};
+
+}  // namespace ceres
+
+#endif  // CERES_PUBLIC_AUTODIFF_COST_FUNCTION_H_
diff --git a/extern/libmv/third_party/ceres/include/ceres/ceres.h b/extern/libmv/third_party/ceres/include/ceres/ceres.h
new file mode 100644
index 00000000000..22aaf8ff21a
--- /dev/null
+++ b/extern/libmv/third_party/ceres/include/ceres/ceres.h
@@ -0,0 +1,48 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//
+// This is a forwarding header containing the public symbols exported from
+// Ceres. Anything in the "ceres" namespace is available for use.
+
+#ifndef CERES_PUBLIC_CERES_H_
+#define CERES_PUBLIC_CERES_H_
+
+#include "ceres/autodiff_cost_function.h"
+#include "ceres/cost_function.h"
+#include "ceres/iteration_callback.h"
+#include "ceres/local_parameterization.h"
+#include "ceres/loss_function.h"
+#include "ceres/numeric_diff_cost_function.h"
+#include "ceres/problem.h"
+#include "ceres/sized_cost_function.h"
+#include "ceres/solver.h"
+#include "ceres/types.h"
+
+#endif  // CERES_PUBLIC_CERES_H_
diff --git a/extern/libmv/third_party/ceres/include/ceres/conditioned_cost_function.h b/extern/libmv/third_party/ceres/include/ceres/conditioned_cost_function.h
new file mode 100644
index 00000000000..498d36ee55a
--- /dev/null
+++ b/extern/libmv/third_party/ceres/include/ceres/conditioned_cost_function.h
@@ -0,0 +1,97 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wjr@google.com (William Rucklidge)
+//
+// This file contains a cost function that can apply a transformation to
+// each residual value before they are square-summed.
+
+#ifndef CERES_PUBLIC_CONDITIONED_COST_FUNCTION_H_
+#define CERES_PUBLIC_CONDITIONED_COST_FUNCTION_H_
+
+#include <vector>
+
+#include "ceres/cost_function.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/types.h"
+
+namespace ceres {
+
+// This class allows you to apply different conditioning to the residual
+// values of a wrapped cost function. An example where this is useful is
+// where you have an existing cost function that produces N values, but you
+// want the total cost to be something other than just the sum of these
+// squared values - maybe you want to apply a different scaling to some
+// values, to change their contribution to the cost.
+//
+// Usage:
+//
+//   // my_cost_function produces N residuals
+//   CostFunction* my_cost_function = ...
+//   CHECK_EQ(N, my_cost_function->num_residuals());
+//   vector<CostFunction*> conditioners;
+//
+//   // Make N 1x1 cost functions (1 parameter, 1 residual)
+//   CostFunction* f_1 = ...
+//   conditioners.push_back(f_1);
+//   ...
+//   CostFunction* f_N = ...
+//   conditioners.push_back(f_N);
+//   ConditionedCostFunction* ccf =
+//     new ConditionedCostFunction(my_cost_function, conditioners);
+//
+// Now ccf's residual i (i=0..N-1) will be passed though the i'th conditioner.
+//
+//   ccf_residual[i] = f_i(my_cost_function_residual[i])
+//
+// and the Jacobian will be affected appropriately.
+class ConditionedCostFunction : public CostFunction {
+ public:
+  // Builds a cost function based on a wrapped cost function, and a
+  // per-residual conditioner. Takes ownership of all of the wrapped cost
+  // functions, or not, depending on the ownership parameter. Conditioners
+  // may be NULL, in which case the corresponding residual is not modified.
+  ConditionedCostFunction(CostFunction* wrapped_cost_function,
+                          const vector<CostFunction*>& conditioners,
+                          Ownership ownership);
+  virtual ~ConditionedCostFunction();
+
+  virtual bool Evaluate(double const* const* parameters,
+                        double* residuals,
+                        double** jacobians) const;
+
+ private:
+  internal::scoped_ptr<CostFunction> wrapped_cost_function_;
+  vector<CostFunction*> conditioners_;
+  Ownership ownership_;
+};
+
+}  // namespace ceres
+
+
+#endif  // CERES_PUBLIC_CONDITIONED_COST_FUNCTION_H_
diff --git a/extern/libmv/third_party/ceres/include/ceres/cost_function.h b/extern/libmv/third_party/ceres/include/ceres/cost_function.h
new file mode 100644
index 00000000000..84403d90636
--- /dev/null
+++ b/extern/libmv/third_party/ceres/include/ceres/cost_function.h
@@ -0,0 +1,127 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//         keir@google.m (Keir Mierle)
+//
+// This is the interface through which the least squares solver accesses the
+// residual and Jacobian of the least squares problem. Users are expected to
+// subclass CostFunction to define their own terms in the least squares problem.
+//
+// It is recommended that users define templated residual functors for use as
+// arguments for AutoDiffCostFunction (see autodiff_cost_function.h), instead of
+// directly implementing the CostFunction interface. This often results in both
+// shorter code and faster execution than hand-coded derivatives. However,
+// specialized cases may demand direct implementation of the lower-level
+// CostFunction interface; for example, this is true when calling legacy code
+// which is not templated on numeric types.
+
+#ifndef CERES_PUBLIC_COST_FUNCTION_H_
+#define CERES_PUBLIC_COST_FUNCTION_H_
+
+#include <vector>
+#include "ceres/internal/macros.h"
+#include "ceres/internal/port.h"
+#include "ceres/types.h"
+
+namespace ceres {
+
+// This class implements the computation of the cost (a.k.a. residual) terms as
+// a function of the input (control) variables, and is the interface for users
+// to describe their least squares problem to Ceres. In other words, this is the
+// modelling layer between users and the Ceres optimizer. The signature of the
+// function (number and sizes of input parameter blocks and number of outputs)
+// is stored in parameter_block_sizes_ and num_residuals_ respectively. User
+// code inheriting from this class is expected to set these two members with the
+// corresponding accessors. This information will be verified by the Problem
+// when added with AddResidualBlock().
+class CostFunction {
+ public:
+  CostFunction() : num_residuals_(0) {}
+
+  virtual ~CostFunction() {}
+
+  // Inputs:
+  //
+  // parameters is an array of pointers to arrays containing the
+  // various parameter blocks. parameters has the same number of
+  // elements as parameter_block_sizes_.  Parameter blocks are in the
+  // same order as parameter_block_sizes_.i.e.,
+  //
+  //   parameters_[i] = double[parameter_block_sizes_[i]]
+  //
+  // Outputs:
+  //
+  // residuals is an array of size num_residuals_.
+  //
+  // jacobians is an array of size parameter_block_sizes_ containing
+  // pointers to storage for jacobian blocks corresponding to each
+  // parameter block. Jacobian blocks are in the same order as
+  // parameter_block_sizes, i.e. jacobians[i], is an
+  // array that contains num_residuals_* parameter_block_sizes_[i]
+  // elements. Each jacobian block is stored in row-major order, i.e.,
+  //
+  //   jacobians[i][r*parameter_block_size_[i] + c] =
+  //                              d residual[r] / d parameters[i][c]
+  //
+  // If jacobians is NULL, then no derivatives are returned; this is
+  // the case when computing cost only. If jacobians[i] is NULL, then
+  // the jacobian block corresponding to the i'th parameter block must
+  // not to be returned.
+  virtual bool Evaluate(double const* const* parameters,
+                        double* residuals,
+                        double** jacobians) const = 0;
+
+  const vector<int16>& parameter_block_sizes() const {
+    return parameter_block_sizes_;
+  }
+
+  int num_residuals() const {
+    return num_residuals_;
+  }
+
+ protected:
+  vector<int16>* mutable_parameter_block_sizes() {
+    return &parameter_block_sizes_;
+  }
+
+  void set_num_residuals(int num_residuals) {
+    num_residuals_ = num_residuals;
+  }
+
+ private:
+  // Cost function signature metadata: number of inputs & their sizes,
+  // number of outputs (residuals).
+  vector<int16> parameter_block_sizes_;
+  int num_residuals_;
+  DISALLOW_COPY_AND_ASSIGN(CostFunction);
+};
+
+}  // namespace ceres
+
+#endif  // CERES_PUBLIC_COST_FUNCTION_H_
diff --git a/extern/libmv/third_party/ceres/include/ceres/internal/autodiff.h b/extern/libmv/third_party/ceres/include/ceres/internal/autodiff.h
new file mode 100644
index 00000000000..4f5081f8f66
--- /dev/null
+++ b/extern/libmv/third_party/ceres/include/ceres/internal/autodiff.h
@@ -0,0 +1,370 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//
+// Computation of the Jacobian matrix for vector-valued functions of multiple
+// variables, using automatic differentiation based on the implementation of
+// dual numbers in jet.h. Before reading the rest of this file, it is adivsable
+// to read jet.h's header comment in detail.
+//
+// The helper wrapper AutoDiff::Differentiate() computes the jacobian of
+// functors with templated operator() taking this form:
+//
+//   struct F {
+//     template<typename T>
+//     bool operator(const T *x, const T *y, ..., T *z) {
+//       // Compute z[] based on x[], y[], ...
+//       // return true if computation succeeded, false otherwise.
+//     }
+//   };
+//
+// All inputs and outputs may be vector-valued.
+//
+// To understand how jets are used to compute the jacobian, a
+// picture may help. Consider a vector-valued function, F, returning 3
+// dimensions and taking a vector-valued parameter of 4 dimensions:
+//
+//     y            x
+//   [ * ]    F   [ * ]
+//   [ * ]  <---  [ * ]
+//   [ * ]        [ * ]
+//                [ * ]
+//
+// Similar to the 2-parameter example for f described in jet.h, computing the
+// jacobian dy/dx is done by substutiting a suitable jet object for x and all
+// intermediate steps of the computation of F. Since x is has 4 dimensions, use
+// a Jet<double, 4>.
+//
+// Before substituting a jet object for x, the dual components are set
+// appropriately for each dimension of x:
+//
+//          y                       x
+//   [ * | * * * * ]    f   [ * | 1 0 0 0 ]   x0
+//   [ * | * * * * ]  <---  [ * | 0 1 0 0 ]   x1
+//   [ * | * * * * ]        [ * | 0 0 1 0 ]   x2
+//         ---+---          [ * | 0 0 0 1 ]   x3
+//            |                   ^ ^ ^ ^
+//          dy/dx                 | | | +----- infinitesimal for x3
+//                                | | +------- infinitesimal for x2
+//                                | +--------- infinitesimal for x1
+//                                +----------- infinitesimal for x0
+//
+// The reason to set the internal 4x4 submatrix to the identity is that we wish
+// to take the derivative of y separately with respect to each dimension of x.
+// Each column of the 4x4 identity is therefore for a single component of the
+// independent variable x.
+//
+// Then the jacobian of the mapping, dy/dx, is the 3x4 sub-matrix of the
+// extended y vector, indicated in the above diagram.
+//
+// Functors with multiple parameters
+// ---------------------------------
+// In practice, it is often convenient to use a function f of two or more
+// vector-valued parameters, for example, x[3] and z[6]. Unfortunately, the jet
+// framework is designed for a single-parameter vector-valued input. The wrapper
+// in this file addresses this issue adding support for functions with one or
+// more parameter vectors.
+//
+// To support multiple parameters, all the parameter vectors are concatenated
+// into one and treated as a single parameter vector, except that since the
+// functor expects different inputs, we need to construct the jets as if they
+// were part of a single parameter vector. The extended jets are passed
+// separately for each parameter.
+//
+// For example, consider a functor F taking two vector parameters, p[2] and
+// q[3], and producing an output y[4]:
+//
+//   struct F {
+//     template<typename T>
+//     bool operator(const T *p, const T *q, T *z) {
+//       // ...
+//     }
+//   };
+//
+// In this case, the necessary jet type is Jet<double, 5>. Here is a
+// visualization of the jet objects in this case:
+//
+//          Dual components for p ----+
+//                                    |
+//                                   -+-
+//           y                 [ * | 1 0 | 0 0 0 ]    --- p[0]
+//                             [ * | 0 1 | 0 0 0 ]    --- p[1]
+//   [ * | . . | + + + ]         |
+//   [ * | . . | + + + ]         v
+//   [ * | . . | + + + ]  <--- F(p, q)
+//   [ * | . . | + + + ]            ^
+//         ^^^   ^^^^^              |
+//        dy/dp  dy/dq            [ * | 0 0 | 1 0 0 ] --- q[0]
+//                                [ * | 0 0 | 0 1 0 ] --- q[1]
+//                                [ * | 0 0 | 0 0 1 ] --- q[2]
+//                                            --+--
+//                                              |
+//          Dual components for q --------------+
+//
+// where the 4x2 submatrix (marked with ".") and 4x3 submatrix (marked with "+"
+// of y in the above diagram are the derivatives of y with respect to p and q
+// respectively. This is how autodiff works for functors taking multiple vector
+// valued arguments (up to 6).
+//
+// Jacobian NULL pointers
+// ----------------------
+// In general, the functions below will accept NULL pointers for all or some of
+// the Jacobian parameters, meaning that those Jacobians will not be computed.
+
+#ifndef CERES_PUBLIC_INTERNAL_AUTODIFF_H_
+#define CERES_PUBLIC_INTERNAL_AUTODIFF_H_
+
+#include <stddef.h>
+
+#include <glog/logging.h>
+#include "ceres/jet.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/fixed_array.h"
+
+namespace ceres {
+namespace internal {
+
+// Extends src by a 1st order pertubation for every dimension and puts it in
+// dst. The size of src is N. Since this is also used for perturbations in
+// blocked arrays, offset is used to shift which part of the jet the
+// perturbation occurs. This is used to set up the extended x augmented by an
+// identity matrix. The JetT type should be a Jet type, and T should be a
+// numeric type (e.g. double). For example,
+//
+//             0   1 2   3 4 5   6 7 8
+//   dst[0]  [ * | . . | 1 0 0 | . . . ]
+//   dst[1]  [ * | . . | 0 1 0 | . . . ]
+//   dst[2]  [ * | . . | 0 0 1 | . . . ]
+//
+// is what would get put in dst if N was 3, offset was 3, and the jet type JetT
+// was 8-dimensional.
+template <typename JetT, typename T>
+inline void Make1stOrderPerturbation(int offset, int N, const T *src,
+                                     JetT *dst) {
+  DCHECK(src);
+  DCHECK(dst);
+  for (int j = 0; j < N; ++j) {
+    dst[j] = JetT(src[j], offset + j);
+  }
+}
+
+// Takes the 0th order part of src, assumed to be a Jet type, and puts it in
+// dst. This is used to pick out the "vector" part of the extended y.
+template <typename JetT, typename T>
+inline void Take0thOrderPart(int M, const JetT *src, T dst) {
+  DCHECK(src);
+  for (int i = 0; i < M; ++i) {
+    dst[i] = src[i].a;
+  }
+}
+
+// Takes N 1st order parts, starting at index N0, and puts them in the M x N
+// matrix 'dst'. This is used to pick out the "matrix" parts of the extended y.
+template <typename JetT, typename T, int N0, int N>
+inline void Take1stOrderPart(const int M, const JetT *src, T *dst) {
+  DCHECK(src);
+  DCHECK(dst);
+  for (int i = 0; i < M; ++i) {
+    Eigen::Map<Eigen::Matrix<T, N, 1> >(dst + N * i, N) = src[i].v.template segment<N>(N0);
+  }
+}
+
+// This block of quasi-repeated code calls the user-supplied functor, which may
+// take a variable number of arguments. This is accomplished by specializing the
+// struct based on the size of the trailing parameters; parameters with 0 size
+// are assumed missing.
+//
+// Supporting variadic functions is the primary source of complexity in the
+// autodiff implementation.
+
+template<typename Functor, typename T,
+         int N0, int N1, int N2, int N3, int N4, int N5>
+struct VariadicEvaluate {
+  static bool Call(const Functor& functor, T const *const *input, T* output) {
+    return functor(input[0],
+                   input[1],
+                   input[2],
+                   input[3],
+                   input[4],
+                   input[5],
+                   output);
+  }
+};
+
+template<typename Functor, typename T,
+         int N0, int N1, int N2, int N3, int N4>
+struct VariadicEvaluate<Functor, T, N0, N1, N2, N3, N4, 0> {
+  static bool Call(const Functor& functor, T const *const *input, T* output) {
+    return functor(input[0],
+                   input[1],
+                   input[2],
+                   input[3],
+                   input[4],
+                   output);
+  }
+};
+
+template<typename Functor, typename T,
+         int N0, int N1, int N2, int N3>
+struct VariadicEvaluate<Functor, T, N0, N1, N2, N3, 0, 0> {
+  static bool Call(const Functor& functor, T const *const *input, T* output) {
+    return functor(input[0],
+                   input[1],
+                   input[2],
+                   input[3],
+                   output);
+  }
+};
+
+template<typename Functor, typename T,
+         int N0, int N1, int N2>
+struct VariadicEvaluate<Functor, T, N0, N1, N2, 0, 0, 0> {
+  static bool Call(const Functor& functor, T const *const *input, T* output) {
+    return functor(input[0],
+                   input[1],
+                   input[2],
+                   output);
+  }
+};
+
+template<typename Functor, typename T,
+         int N0, int N1>
+struct VariadicEvaluate<Functor, T, N0, N1, 0, 0, 0, 0> {
+  static bool Call(const Functor& functor, T const *const *input, T* output) {
+    return functor(input[0],
+                   input[1],
+                   output);
+  }
+};
+
+template<typename Functor, typename T, int N0>
+struct VariadicEvaluate<Functor, T, N0, 0, 0, 0, 0, 0> {
+  static bool Call(const Functor& functor, T const *const *input, T* output) {
+    return functor(input[0],
+                   output);
+  }
+};
+
+// This is in a struct because default template parameters on a function are not
+// supported in C++03 (though it is available in C++0x). N0 through N5 are the
+// dimension of the input arguments to the user supplied functor.
+template <typename Functor, typename T,
+          int N0 = 0, int N1 = 0, int N2 = 0, int N3 = 0, int N4 = 0, int N5=0>
+struct AutoDiff {
+  static bool Differentiate(const Functor& functor,
+                            T const *const *parameters,
+                            int num_outputs,
+                            T *function_value,
+                            T **jacobians) {
+    typedef Jet<T, N0 + N1 + N2 + N3 + N4 + N5> JetT;
+
+    DCHECK_GT(N0, 0)
+        << "Cost functions must have at least one parameter block.";
+    DCHECK((!N1 && !N2 && !N3 && !N4 && !N5) ||
+           ((N1 > 0) && !N2 && !N3 && !N4 && !N5) ||
+           ((N1 > 0) && (N2 > 0) && !N3 && !N4 && !N5) ||
+           ((N1 > 0) && (N2 > 0) && (N3 > 0) && !N4 && !N5) ||
+           ((N1 > 0) && (N2 > 0) && (N3 > 0) && (N4 > 0) && !N5) ||
+           ((N1 > 0) && (N2 > 0) && (N3 > 0) && (N4 > 0) && (N5 > 0)))
+        << "Zero block cannot precede a non-zero block. Block sizes are "
+        << "(ignore trailing 0s): " << N0 << ", " << N1 << ", " << N2 << ", "
+        << N3 << ", " << N4 << ", " << N5;
+
+    DCHECK_GT(num_outputs, 0);
+
+    FixedArray<JetT, (256 * 7) / sizeof(JetT)> x(
+        N0 + N1 + N2 + N3 + N4 + N5 + num_outputs);
+
+    // It's ugly, but it works.
+    const int jet0 = 0;
+    const int jet1 = N0;
+    const int jet2 = N0 + N1;
+    const int jet3 = N0 + N1 + N2;
+    const int jet4 = N0 + N1 + N2 + N3;
+    const int jet5 = N0 + N1 + N2 + N3 + N4;
+    const int jet6 = N0 + N1 + N2 + N3 + N4 + N5;
+
+    const JetT *unpacked_parameters[6] = {
+        x.get() + jet0,
+        x.get() + jet1,
+        x.get() + jet2,
+        x.get() + jet3,
+        x.get() + jet4,
+        x.get() + jet5,
+    };
+    JetT *output = x.get() + jet6;
+
+#define CERES_MAKE_1ST_ORDER_PERTURBATION(i) \
+    if (N ## i) { \
+      internal::Make1stOrderPerturbation(jet ## i, \
+                                         N ## i, \
+                                         parameters[i], \
+                                         x.get() + jet ## i); \
+    }
+    CERES_MAKE_1ST_ORDER_PERTURBATION(0);
+    CERES_MAKE_1ST_ORDER_PERTURBATION(1);
+    CERES_MAKE_1ST_ORDER_PERTURBATION(2);
+    CERES_MAKE_1ST_ORDER_PERTURBATION(3);
+    CERES_MAKE_1ST_ORDER_PERTURBATION(4);
+    CERES_MAKE_1ST_ORDER_PERTURBATION(5);
+#undef CERES_MAKE_1ST_ORDER_PERTURBATION
+
+    if (!VariadicEvaluate<Functor, JetT,
+                          N0, N1, N2, N3, N4, N5>::Call(
+        functor, unpacked_parameters, output)) {
+      return false;
+    }
+
+    internal::Take0thOrderPart(num_outputs, output, function_value);
+
+#define CERES_TAKE_1ST_ORDER_PERTURBATION(i) \
+    if (N ## i) { \
+      if (jacobians[i]) { \
+        internal::Take1stOrderPart<JetT, T, \
+                                   jet ## i, \
+                                   N ## i>(num_outputs, \
+                                           output, \
+                                           jacobians[i]); \
+      } \
+    }
+    CERES_TAKE_1ST_ORDER_PERTURBATION(0);
+    CERES_TAKE_1ST_ORDER_PERTURBATION(1);
+    CERES_TAKE_1ST_ORDER_PERTURBATION(2);
+    CERES_TAKE_1ST_ORDER_PERTURBATION(3);
+    CERES_TAKE_1ST_ORDER_PERTURBATION(4);
+    CERES_TAKE_1ST_ORDER_PERTURBATION(5);
+#undef CERES_TAKE_1ST_ORDER_PERTURBATION
+    return true;
+  }
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_PUBLIC_INTERNAL_AUTODIFF_H_
diff --git a/extern/libmv/third_party/ceres/include/ceres/internal/eigen.h b/extern/libmv/third_party/ceres/include/ceres/internal/eigen.h
new file mode 100644
index 00000000000..be76f9eff98
--- /dev/null
+++ b/extern/libmv/third_party/ceres/include/ceres/internal/eigen.h
@@ -0,0 +1,80 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#ifndef CERES_INTERNAL_EIGEN_H_
+#define CERES_INTERNAL_EIGEN_H_
+
+#include "Eigen/Core"
+
+namespace ceres {
+
+using Eigen::Dynamic;
+using Eigen::RowMajor;
+
+typedef Eigen::Matrix<double, Dynamic, 1> Vector;
+typedef Eigen::Matrix<double, Dynamic, Dynamic, RowMajor> Matrix;
+typedef Eigen::Map<Vector> VectorRef;
+typedef Eigen::Map<Matrix> MatrixRef;
+typedef Eigen::Map<Matrix, Eigen::Aligned> AlignedMatrixRef;
+typedef Eigen::Map<const Vector> ConstVectorRef;
+typedef Eigen::Map<const Matrix, Eigen::Aligned> ConstAlignedMatrixRef;
+typedef Eigen::Map<const Matrix> ConstMatrixRef;
+
+// C++ does not support templated typdefs, thus the need for this
+// struct so that we can support statically sized Matrix and Maps.
+template <int num_rows = Eigen::Dynamic, int num_cols = Eigen::Dynamic>
+struct EigenTypes {
+  typedef Eigen::Matrix <double, num_rows, num_cols, RowMajor>
+  Matrix;
+
+  typedef Eigen::Map<
+    Eigen::Matrix<double, num_rows, num_cols, RowMajor> >
+  MatrixRef;
+
+  typedef Eigen::Matrix <double, num_rows, 1>
+  Vector;
+
+  typedef Eigen::Map <
+    Eigen::Matrix<double, num_rows, 1> >
+  VectorRef;
+
+
+  typedef Eigen::Map<
+    const Eigen::Matrix<double, num_rows, num_cols, RowMajor> >
+  ConstMatrixRef;
+
+  typedef Eigen::Map <
+    const Eigen::Matrix<double, num_rows, 1> >
+  ConstVectorRef;
+};
+
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_EIGEN_H_
diff --git a/extern/libmv/third_party/ceres/include/ceres/internal/fixed_array.h b/extern/libmv/third_party/ceres/include/ceres/internal/fixed_array.h
new file mode 100644
index 00000000000..84617c4fa06
--- /dev/null
+++ b/extern/libmv/third_party/ceres/include/ceres/internal/fixed_array.h
@@ -0,0 +1,194 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: rennie@google.com (Jeffrey Rennie)
+// Author: sanjay@google.com (Sanjay Ghemawat) -- renamed to FixedArray
+
+#ifndef CERES_PUBLIC_INTERNAL_FIXED_ARRAY_H_
+#define CERES_PUBLIC_INTERNAL_FIXED_ARRAY_H_
+
+#include <cstddef>
+#include <glog/logging.h>
+#include "ceres/internal/manual_constructor.h"
+
+namespace ceres {
+namespace internal {
+
+// A FixedArray<T> represents a non-resizable array of T where the
+// length of the array does not need to be a compile time constant.
+//
+// FixedArray allocates small arrays inline, and large arrays on
+// the heap.  It is a good replacement for non-standard and deprecated
+// uses of alloca() and variable length arrays (a GCC extension).
+//
+// FixedArray keeps performance fast for small arrays, because it
+// avoids heap operations.  It also helps reduce the chances of
+// accidentally overflowing your stack if large input is passed to
+// your function.
+//
+// Also, FixedArray is useful for writing portable code.  Not all
+// compilers support arrays of dynamic size.
+
+// Most users should not specify an inline_elements argument and let
+// FixedArray<> automatically determine the number of elements
+// to store inline based on sizeof(T).
+//
+// If inline_elements is specified, the FixedArray<> implementation
+// will store arrays of length <= inline_elements inline.
+//
+// Finally note that unlike vector<T> FixedArray<T> will not zero-initialize
+// simple types like int, double, bool, etc.
+//
+// Non-POD types will be default-initialized just like regular vectors or
+// arrays.
+
+#if defined(_WIN64)
+   typedef __int64      ssize_t;
+#elif defined(_WIN32)
+   typedef __int32      ssize_t;
+#endif
+
+template <typename T, ssize_t inline_elements = -1>
+class FixedArray {
+ public:
+  // For playing nicely with stl:
+  typedef T value_type;
+  typedef T* iterator;
+  typedef T const* const_iterator;
+  typedef T& reference;
+  typedef T const& const_reference;
+  typedef T* pointer;
+  typedef std::ptrdiff_t difference_type;
+  typedef size_t size_type;
+
+  // REQUIRES: n >= 0
+  // Creates an array object that can store "n" elements.
+  //
+  // FixedArray<T> will not zero-initialiaze POD (simple) types like int,
+  // double, bool, etc.
+  // Non-POD types will be default-initialized just like regular vectors or
+  // arrays.
+  explicit FixedArray(size_type n);
+
+  // Releases any resources.
+  ~FixedArray();
+
+  // Returns the length of the array.
+  inline size_type size() const { return size_; }
+
+  // Returns the memory size of the array in bytes.
+  inline size_t memsize() const { return size_ * sizeof(T); }
+
+  // Returns a pointer to the underlying element array.
+  inline const T* get() const { return &array_[0].element; }
+  inline T* get() { return &array_[0].element; }
+
+  // REQUIRES: 0 <= i < size()
+  // Returns a reference to the "i"th element.
+  inline T& operator[](size_type i) {
+    DCHECK_GE(i, 0);
+    DCHECK_LT(i, size_);
+    return array_[i].element;
+  }
+
+  // REQUIRES: 0 <= i < size()
+  // Returns a reference to the "i"th element.
+  inline const T& operator[](size_type i) const {
+    DCHECK_GE(i, 0);
+    DCHECK_LT(i, size_);
+    return array_[i].element;
+  }
+
+  inline iterator begin() { return &array_[0].element; }
+  inline iterator end() { return &array_[size_].element; }
+
+  inline const_iterator begin() const { return &array_[0].element; }
+  inline const_iterator end() const { return &array_[size_].element; }
+
+ private:
+  // Container to hold elements of type T.  This is necessary to handle
+  // the case where T is a a (C-style) array.  The size of InnerContainer
+  // and T must be the same, otherwise callers' assumptions about use
+  // of this code will be broken.
+  struct InnerContainer {
+    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
+    T element;
+  };
+
+  // How many elements should we store inline?
+  //   a. If not specified, use a default of 256 bytes (256 bytes
+  //      seems small enough to not cause stack overflow or unnecessary
+  //      stack pollution, while still allowing stack allocation for
+  //      reasonably long character arrays.
+  //   b. Never use 0 length arrays (not ISO C++)
+  static const size_type S1 = ((inline_elements < 0)
+                               ? (256/sizeof(T)) : inline_elements);
+  static const size_type S2 = (S1 <= 0) ? 1 : S1;
+  static const size_type kInlineElements = S2;
+
+  size_type const       size_;
+  InnerContainer* const array_;
+
+  // Allocate some space, not an array of elements of type T, so that we can
+  // skip calling the T constructors and destructors for space we never use.
+  ManualConstructor<InnerContainer> inline_space_[kInlineElements];
+};
+
+// Implementation details follow
+
+template <class T, ssize_t S>
+inline FixedArray<T, S>::FixedArray(typename FixedArray<T, S>::size_type n)
+    : size_(n),
+      array_((n <= kInlineElements
+              ? reinterpret_cast<InnerContainer*>(inline_space_)
+              : new InnerContainer[n])) {
+  DCHECK_GE(n, 0);
+
+  // Construct only the elements actually used.
+  if (array_ == reinterpret_cast<InnerContainer*>(inline_space_)) {
+    for (int i = 0; i != size_; ++i) {
+      inline_space_[i].Init();
+    }
+  }
+}
+
+template <class T, ssize_t S>
+inline FixedArray<T, S>::~FixedArray() {
+  if (array_ != reinterpret_cast<InnerContainer*>(inline_space_)) {
+    delete[] array_;
+  } else {
+    for (int i = 0; i != size_; ++i) {
+      inline_space_[i].Destroy();
+    }
+  }
+}
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_PUBLIC_INTERNAL_FIXED_ARRAY_H_
diff --git a/extern/libmv/third_party/ceres/include/ceres/internal/macros.h b/extern/libmv/third_party/ceres/include/ceres/internal/macros.h
new file mode 100644
index 00000000000..0cfd773bcca
--- /dev/null
+++ b/extern/libmv/third_party/ceres/include/ceres/internal/macros.h
@@ -0,0 +1,154 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+//
+// Various Google-specific macros.
+//
+// This code is compiled directly on many platforms, including client
+// platforms like Windows, Mac, and embedded systems.  Before making
+// any changes here, make sure that you're not breaking any platforms.
+
+#ifndef CERES_PUBLIC_INTERNAL_MACROS_H_
+#define CERES_PUBLIC_INTERNAL_MACROS_H_
+
+#include <cstddef>  // For size_t.
+
+// A macro to disallow the copy constructor and operator= functions
+// This should be used in the private: declarations for a class
+//
+// For disallowing only assign or copy, write the code directly, but declare
+// the intend in a comment, for example:
+// void operator=(const TypeName&);  // DISALLOW_ASSIGN
+// Note, that most uses of DISALLOW_ASSIGN and DISALLOW_COPY are broken
+// semantically, one should either use disallow both or neither. Try to
+// avoid these in new code.
+#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
+  TypeName(const TypeName&);               \
+  void operator=(const TypeName&)
+
+// A macro to disallow all the implicit constructors, namely the
+// default constructor, copy constructor and operator= functions.
+//
+// This should be used in the private: declarations for a class
+// that wants to prevent anyone from instantiating it. This is
+// especially useful for classes containing only static methods.
+#define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
+  TypeName();                                    \
+  DISALLOW_COPY_AND_ASSIGN(TypeName)
+
+// The arraysize(arr) macro returns the # of elements in an array arr.
+// The expression is a compile-time constant, and therefore can be
+// used in defining new arrays, for example.  If you use arraysize on
+// a pointer by mistake, you will get a compile-time error.
+//
+// One caveat is that arraysize() doesn't accept any array of an
+// anonymous type or a type defined inside a function.  In these rare
+// cases, you have to use the unsafe ARRAYSIZE() macro below.  This is
+// due to a limitation in C++'s template system.  The limitation might
+// eventually be removed, but it hasn't happened yet.
+
+// This template function declaration is used in defining arraysize.
+// Note that the function doesn't need an implementation, as we only
+// use its type.
+template <typename T, size_t N>
+char (&ArraySizeHelper(T (&array)[N]))[N];
+
+// That gcc wants both of these prototypes seems mysterious. VC, for
+// its part, can't decide which to use (another mystery). Matching of
+// template overloads: the final frontier.
+#ifndef _WIN32
+template <typename T, size_t N>
+char (&ArraySizeHelper(const T (&array)[N]))[N];
+#endif
+
+#define arraysize(array) (sizeof(ArraySizeHelper(array)))
+
+// ARRAYSIZE performs essentially the same calculation as arraysize,
+// but can be used on anonymous types or types defined inside
+// functions.  It's less safe than arraysize as it accepts some
+// (although not all) pointers.  Therefore, you should use arraysize
+// whenever possible.
+//
+// The expression ARRAYSIZE(a) is a compile-time constant of type
+// size_t.
+//
+// ARRAYSIZE catches a few type errors.  If you see a compiler error
+//
+//   "warning: division by zero in ..."
+//
+// when using ARRAYSIZE, you are (wrongfully) giving it a pointer.
+// You should only use ARRAYSIZE on statically allocated arrays.
+//
+// The following comments are on the implementation details, and can
+// be ignored by the users.
+//
+// ARRAYSIZE(arr) works by inspecting sizeof(arr) (the # of bytes in
+// the array) and sizeof(*(arr)) (the # of bytes in one array
+// element).  If the former is divisible by the latter, perhaps arr is
+// indeed an array, in which case the division result is the # of
+// elements in the array.  Otherwise, arr cannot possibly be an array,
+// and we generate a compiler error to prevent the code from
+// compiling.
+//
+// Since the size of bool is implementation-defined, we need to cast
+// !(sizeof(a) & sizeof(*(a))) to size_t in order to ensure the final
+// result has type size_t.
+//
+// This macro is not perfect as it wrongfully accepts certain
+// pointers, namely where the pointer size is divisible by the pointee
+// size.  Since all our code has to go through a 32-bit compiler,
+// where a pointer is 4 bytes, this means all pointers to a type whose
+// size is 3 or greater than 4 will be (righteously) rejected.
+//
+// Kudos to Jorg Brown for this simple and elegant implementation.
+//
+// - wan 2005-11-16
+//
+// Starting with Visual C++ 2005, WinNT.h includes ARRAYSIZE. However,
+// the definition comes from the over-broad windows.h header that 
+// introduces a macro, ERROR, that conflicts with the logging framework
+// that Ceres uses. Instead, rename ARRAYSIZE to CERES_ARRAYSIZE.
+#define CERES_ARRAYSIZE(a) \
+  ((sizeof(a) / sizeof(*(a))) / \
+   static_cast<size_t>(!(sizeof(a) % sizeof(*(a)))))
+
+// Tell the compiler to warn about unused return values for functions declared
+// with this macro.  The macro should be used on function declarations
+// following the argument list:
+//
+//   Sprocket* AllocateSprocket() MUST_USE_RESULT;
+//
+#undef MUST_USE_RESULT
+#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) \
+  && !defined(COMPILER_ICC)
+#define MUST_USE_RESULT __attribute__ ((warn_unused_result))
+#else
+#define MUST_USE_RESULT
+#endif
+
+#endif  // CERES_PUBLIC_INTERNAL_MACROS_H_
diff --git a/extern/libmv/third_party/ceres/include/ceres/internal/manual_constructor.h b/extern/libmv/third_party/ceres/include/ceres/internal/manual_constructor.h
new file mode 100644
index 00000000000..a1d1f444e36
--- /dev/null
+++ b/extern/libmv/third_party/ceres/include/ceres/internal/manual_constructor.h
@@ -0,0 +1,214 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: kenton@google.com (Kenton Varda)
+//
+// ManualConstructor statically-allocates space in which to store some
+// object, but does not initialize it.  You can then call the constructor
+// and destructor for the object yourself as you see fit.  This is useful
+// for memory management optimizations, where you want to initialize and
+// destroy an object multiple times but only allocate it once.
+//
+// (When I say ManualConstructor statically allocates space, I mean that
+// the ManualConstructor object itself is forced to be the right size.)
+
+#ifndef CERES_PUBLIC_INTERNAL_MANUAL_CONSTRUCTOR_H_
+#define CERES_PUBLIC_INTERNAL_MANUAL_CONSTRUCTOR_H_
+
+#include <new>
+
+namespace ceres {
+namespace internal {
+
+// ------- Define ALIGNED_CHAR_ARRAY --------------------------------
+
+#ifndef ALIGNED_CHAR_ARRAY
+
+// Because MSVC and older GCCs require that the argument to their alignment
+// construct to be a literal constant integer, we use a template instantiated
+// at all the possible powers of two.
+template<int alignment, int size> struct AlignType { };
+template<int size> struct AlignType<0, size> { typedef char result[size]; };
+#if defined(_MSC_VER)
+#define BASE_PORT_H_ALIGN_ATTRIBUTE(X) __declspec(align(X))
+#define BASE_PORT_H_ALIGN_OF(T) __alignof(T)
+#elif defined(__GNUC__)
+#define BASE_PORT_H_ALIGN_ATTRIBUTE(X) __attribute__((aligned(X)))
+#define BASE_PORT_H_ALIGN_OF(T) __alignof__(T)
+#endif
+
+#if defined(BASE_PORT_H_ALIGN_ATTRIBUTE)
+
+#define BASE_PORT_H_ALIGNTYPE_TEMPLATE(X) \
+  template<int size> struct AlignType<X, size> { \
+    typedef BASE_PORT_H_ALIGN_ATTRIBUTE(X) char result[size]; \
+  }
+
+BASE_PORT_H_ALIGNTYPE_TEMPLATE(1);
+BASE_PORT_H_ALIGNTYPE_TEMPLATE(2);
+BASE_PORT_H_ALIGNTYPE_TEMPLATE(4);
+BASE_PORT_H_ALIGNTYPE_TEMPLATE(8);
+BASE_PORT_H_ALIGNTYPE_TEMPLATE(16);
+BASE_PORT_H_ALIGNTYPE_TEMPLATE(32);
+BASE_PORT_H_ALIGNTYPE_TEMPLATE(64);
+BASE_PORT_H_ALIGNTYPE_TEMPLATE(128);
+BASE_PORT_H_ALIGNTYPE_TEMPLATE(256);
+BASE_PORT_H_ALIGNTYPE_TEMPLATE(512);
+BASE_PORT_H_ALIGNTYPE_TEMPLATE(1024);
+BASE_PORT_H_ALIGNTYPE_TEMPLATE(2048);
+BASE_PORT_H_ALIGNTYPE_TEMPLATE(4096);
+BASE_PORT_H_ALIGNTYPE_TEMPLATE(8192);
+// Any larger and MSVC++ will complain.
+
+#define ALIGNED_CHAR_ARRAY(T, Size) \
+  typename AlignType<BASE_PORT_H_ALIGN_OF(T), sizeof(T) * Size>::result
+
+#undef BASE_PORT_H_ALIGNTYPE_TEMPLATE
+#undef BASE_PORT_H_ALIGN_ATTRIBUTE
+
+#else  // defined(BASE_PORT_H_ALIGN_ATTRIBUTE)
+#define ALIGNED_CHAR_ARRAY you_must_define_ALIGNED_CHAR_ARRAY_for_your_compiler
+#endif // defined(BASE_PORT_H_ALIGN_ATTRIBUTE)
+
+#undef BASE_PORT_H_ALIGNTYPE_TEMPLATE
+#undef BASE_PORT_H_ALIGN_ATTRIBUTE
+
+#endif  // ALIGNED_CHAR_ARRAY
+
+template <typename Type>
+class ManualConstructor {
+ public:
+  // No constructor or destructor because one of the most useful uses of
+  // this class is as part of a union, and members of a union cannot have
+  // constructors or destructors.  And, anyway, the whole point of this
+  // class is to bypass these.
+
+  inline Type* get() {
+    return reinterpret_cast<Type*>(space_);
+  }
+  inline const Type* get() const  {
+    return reinterpret_cast<const Type*>(space_);
+  }
+
+  inline Type* operator->() { return get(); }
+  inline const Type* operator->() const { return get(); }
+
+  inline Type& operator*() { return *get(); }
+  inline const Type& operator*() const { return *get(); }
+
+  // You can pass up to four constructor arguments as arguments of Init().
+  inline void Init() {
+    new(space_) Type;
+  }
+
+  template <typename T1>
+  inline void Init(const T1& p1) {
+    new(space_) Type(p1);
+  }
+
+  template <typename T1, typename T2>
+  inline void Init(const T1& p1, const T2& p2) {
+    new(space_) Type(p1, p2);
+  }
+
+  template <typename T1, typename T2, typename T3>
+  inline void Init(const T1& p1, const T2& p2, const T3& p3) {
+    new(space_) Type(p1, p2, p3);
+  }
+
+  template <typename T1, typename T2, typename T3, typename T4>
+  inline void Init(const T1& p1, const T2& p2, const T3& p3, const T4& p4) {
+    new(space_) Type(p1, p2, p3, p4);
+  }
+
+  template <typename T1, typename T2, typename T3, typename T4, typename T5>
+  inline void Init(const T1& p1, const T2& p2, const T3& p3, const T4& p4,
+                   const T5& p5) {
+    new(space_) Type(p1, p2, p3, p4, p5);
+  }
+
+  template <typename T1, typename T2, typename T3, typename T4, typename T5,
+            typename T6>
+  inline void Init(const T1& p1, const T2& p2, const T3& p3, const T4& p4,
+                   const T5& p5, const T6& p6) {
+    new(space_) Type(p1, p2, p3, p4, p5, p6);
+  }
+
+  template <typename T1, typename T2, typename T3, typename T4, typename T5,
+            typename T6, typename T7>
+  inline void Init(const T1& p1, const T2& p2, const T3& p3, const T4& p4,
+                   const T5& p5, const T6& p6, const T7& p7) {
+    new(space_) Type(p1, p2, p3, p4, p5, p6, p7);
+  }
+
+  template <typename T1, typename T2, typename T3, typename T4, typename T5,
+            typename T6, typename T7, typename T8>
+  inline void Init(const T1& p1, const T2& p2, const T3& p3, const T4& p4,
+                   const T5& p5, const T6& p6, const T7& p7, const T8& p8) {
+    new(space_) Type(p1, p2, p3, p4, p5, p6, p7, p8);
+  }
+
+  template <typename T1, typename T2, typename T3, typename T4, typename T5,
+            typename T6, typename T7, typename T8, typename T9>
+  inline void Init(const T1& p1, const T2& p2, const T3& p3, const T4& p4,
+                   const T5& p5, const T6& p6, const T7& p7, const T8& p8,
+                   const T9& p9) {
+    new(space_) Type(p1, p2, p3, p4, p5, p6, p7, p8, p9);
+  }
+
+  template <typename T1, typename T2, typename T3, typename T4, typename T5,
+            typename T6, typename T7, typename T8, typename T9, typename T10>
+  inline void Init(const T1& p1, const T2& p2, const T3& p3, const T4& p4,
+                   const T5& p5, const T6& p6, const T7& p7, const T8& p8,
+                   const T9& p9, const T10& p10) {
+    new(space_) Type(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10);
+  }
+
+  template <typename T1, typename T2, typename T3, typename T4, typename T5,
+            typename T6, typename T7, typename T8, typename T9, typename T10,
+            typename T11>
+  inline void Init(const T1& p1, const T2& p2, const T3& p3, const T4& p4,
+                   const T5& p5, const T6& p6, const T7& p7, const T8& p8,
+                   const T9& p9, const T10& p10, const T11& p11) {
+    new(space_) Type(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);
+  }
+
+  inline void Destroy() {
+    get()->~Type();
+  }
+
+ private:
+  ALIGNED_CHAR_ARRAY(Type, 1) space_;
+};
+
+#undef ALIGNED_CHAR_ARRAY
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_PUBLIC_INTERNAL_MANUAL_CONSTRUCTOR_H_
diff --git a/extern/libmv/third_party/ceres/include/ceres/internal/port.h b/extern/libmv/third_party/ceres/include/ceres/internal/port.h
new file mode 100644
index 00000000000..9a3e5cced58
--- /dev/null
+++ b/extern/libmv/third_party/ceres/include/ceres/internal/port.h
@@ -0,0 +1,44 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+
+#ifndef CERES_PUBLIC_INTERNAL_PORT_H_
+#define CERES_PUBLIC_INTERNAL_PORT_H_
+
+namespace ceres {
+
+// It is unfortunate that this import of the entire standard namespace is
+// necessary. The reasons are historical and won't be explained here, but
+// suffice to say it is not a mistake and can't be removed without breaking
+// things outside of the Ceres optimization package.
+using namespace std;
+
+}  // namespace ceres
+
+#endif  // CERES_PUBLIC_INTERNAL_PORT_H_
diff --git a/extern/libmv/third_party/ceres/include/ceres/internal/scoped_ptr.h b/extern/libmv/third_party/ceres/include/ceres/internal/scoped_ptr.h
new file mode 100644
index 00000000000..44f198b339d
--- /dev/null
+++ b/extern/libmv/third_party/ceres/include/ceres/internal/scoped_ptr.h
@@ -0,0 +1,311 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: jorg@google.com (Jorg Brown)
+//
+// This is an implementation designed to match the anticipated future TR2
+// implementation of the scoped_ptr class, and its closely-related brethren,
+// scoped_array, scoped_ptr_malloc, and make_scoped_ptr.
+
+#ifndef CERES_PUBLIC_INTERNAL_SCOPED_PTR_H_
+#define CERES_PUBLIC_INTERNAL_SCOPED_PTR_H_
+
+#include <assert.h>
+#include <stdlib.h>
+#include <cstddef>
+
+namespace ceres {
+namespace internal {
+
+template <class C> class scoped_ptr;
+template <class C, class Free> class scoped_ptr_malloc;
+template <class C> class scoped_array;
+
+template <class C>
+scoped_ptr<C> make_scoped_ptr(C *);
+
+// A scoped_ptr<T> is like a T*, except that the destructor of scoped_ptr<T>
+// automatically deletes the pointer it holds (if any). That is, scoped_ptr<T>
+// owns the T object that it points to. Like a T*, a scoped_ptr<T> may hold
+// either NULL or a pointer to a T object. Also like T*, scoped_ptr<T> is
+// thread-compatible, and once you dereference it, you get the threadsafety
+// guarantees of T.
+//
+// The size of a scoped_ptr is small: sizeof(scoped_ptr<C>) == sizeof(C*)
+template <class C>
+class scoped_ptr {
+ public:
+
+  // The element type
+  typedef C element_type;
+
+  // Constructor.  Defaults to intializing with NULL.
+  // There is no way to create an uninitialized scoped_ptr.
+  // The input parameter must be allocated with new.
+  explicit scoped_ptr(C* p = NULL) : ptr_(p) { }
+
+  // Destructor.  If there is a C object, delete it.
+  // We don't need to test ptr_ == NULL because C++ does that for us.
+  ~scoped_ptr() {
+    enum { type_must_be_complete = sizeof(C) };
+    delete ptr_;
+  }
+
+  // Reset.  Deletes the current owned object, if any.
+  // Then takes ownership of a new object, if given.
+  // this->reset(this->get()) works.
+  void reset(C* p = NULL) {
+    if (p != ptr_) {
+      enum { type_must_be_complete = sizeof(C) };
+      delete ptr_;
+      ptr_ = p;
+    }
+  }
+
+  // Accessors to get the owned object.
+  // operator* and operator-> will assert() if there is no current object.
+  C& operator*() const {
+    assert(ptr_ != NULL);
+    return *ptr_;
+  }
+  C* operator->() const  {
+    assert(ptr_ != NULL);
+    return ptr_;
+  }
+  C* get() const { return ptr_; }
+
+  // Comparison operators.
+  // These return whether a scoped_ptr and a raw pointer refer to
+  // the same object, not just to two different but equal objects.
+  bool operator==(const C* p) const { return ptr_ == p; }
+  bool operator!=(const C* p) const { return ptr_ != p; }
+
+  // Swap two scoped pointers.
+  void swap(scoped_ptr& p2) {
+    C* tmp = ptr_;
+    ptr_ = p2.ptr_;
+    p2.ptr_ = tmp;
+  }
+
+  // Release a pointer.
+  // The return value is the current pointer held by this object.
+  // If this object holds a NULL pointer, the return value is NULL.
+  // After this operation, this object will hold a NULL pointer,
+  // and will not own the object any more.
+  C* release() {
+    C* retVal = ptr_;
+    ptr_ = NULL;
+    return retVal;
+  }
+
+ private:
+  C* ptr_;
+
+  // google3 friend class that can access copy ctor (although if it actually
+  // calls a copy ctor, there will be a problem) see below
+  friend scoped_ptr<C> make_scoped_ptr<C>(C *p);
+
+  // Forbid comparison of scoped_ptr types.  If C2 != C, it totally doesn't
+  // make sense, and if C2 == C, it still doesn't make sense because you should
+  // never have the same object owned by two different scoped_ptrs.
+  template <class C2> bool operator==(scoped_ptr<C2> const& p2) const;
+  template <class C2> bool operator!=(scoped_ptr<C2> const& p2) const;
+
+  // Disallow evil constructors
+  scoped_ptr(const scoped_ptr&);
+  void operator=(const scoped_ptr&);
+};
+
+// Free functions
+template <class C>
+inline void swap(scoped_ptr<C>& p1, scoped_ptr<C>& p2) {
+  p1.swap(p2);
+}
+
+template <class C>
+inline bool operator==(const C* p1, const scoped_ptr<C>& p2) {
+  return p1 == p2.get();
+}
+
+template <class C>
+inline bool operator==(const C* p1, const scoped_ptr<const C>& p2) {
+  return p1 == p2.get();
+}
+
+template <class C>
+inline bool operator!=(const C* p1, const scoped_ptr<C>& p2) {
+  return p1 != p2.get();
+}
+
+template <class C>
+inline bool operator!=(const C* p1, const scoped_ptr<const C>& p2) {
+  return p1 != p2.get();
+}
+
+template <class C>
+scoped_ptr<C> make_scoped_ptr(C *p) {
+  // This does nothing but to return a scoped_ptr of the type that the passed
+  // pointer is of.  (This eliminates the need to specify the name of T when
+  // making a scoped_ptr that is used anonymously/temporarily.)  From an
+  // access control point of view, we construct an unnamed scoped_ptr here
+  // which we return and thus copy-construct.  Hence, we need to have access
+  // to scoped_ptr::scoped_ptr(scoped_ptr const &).  However, it is guaranteed
+  // that we never actually call the copy constructor, which is a good thing
+  // as we would call the temporary's object destructor (and thus delete p)
+  // if we actually did copy some object, here.
+  return scoped_ptr<C>(p);
+}
+
+// scoped_array<C> is like scoped_ptr<C>, except that the caller must allocate
+// with new [] and the destructor deletes objects with delete [].
+//
+// As with scoped_ptr<C>, a scoped_array<C> either points to an object
+// or is NULL.  A scoped_array<C> owns the object that it points to.
+// scoped_array<T> is thread-compatible, and once you index into it,
+// the returned objects have only the threadsafety guarantees of T.
+//
+// Size: sizeof(scoped_array<C>) == sizeof(C*)
+template <class C>
+class scoped_array {
+ public:
+
+  // The element type
+  typedef C element_type;
+
+  // Constructor.  Defaults to intializing with NULL.
+  // There is no way to create an uninitialized scoped_array.
+  // The input parameter must be allocated with new [].
+  explicit scoped_array(C* p = NULL) : array_(p) { }
+
+  // Destructor.  If there is a C object, delete it.
+  // We don't need to test ptr_ == NULL because C++ does that for us.
+  ~scoped_array() {
+    enum { type_must_be_complete = sizeof(C) };
+    delete[] array_;
+  }
+
+  // Reset. Deletes the current owned object, if any.
+  // Then takes ownership of a new object, if given.
+  // this->reset(this->get()) works.
+  void reset(C* p = NULL) {
+    if (p != array_) {
+      enum { type_must_be_complete = sizeof(C) };
+      delete[] array_;
+      array_ = p;
+    }
+  }
+
+  // Get one element of the current object.
+  // Will assert() if there is no current object, or index i is negative.
+  C& operator[](std::ptrdiff_t i) const {
+    assert(i >= 0);
+    assert(array_ != NULL);
+    return array_[i];
+  }
+
+  // Get a pointer to the zeroth element of the current object.
+  // If there is no current object, return NULL.
+  C* get() const {
+    return array_;
+  }
+
+  // Comparison operators.
+  // These return whether a scoped_array and a raw pointer refer to
+  // the same array, not just to two different but equal arrays.
+  bool operator==(const C* p) const { return array_ == p; }
+  bool operator!=(const C* p) const { return array_ != p; }
+
+  // Swap two scoped arrays.
+  void swap(scoped_array& p2) {
+    C* tmp = array_;
+    array_ = p2.array_;
+    p2.array_ = tmp;
+  }
+
+  // Release an array.
+  // The return value is the current pointer held by this object.
+  // If this object holds a NULL pointer, the return value is NULL.
+  // After this operation, this object will hold a NULL pointer,
+  // and will not own the object any more.
+  C* release() {
+    C* retVal = array_;
+    array_ = NULL;
+    return retVal;
+  }
+
+ private:
+  C* array_;
+
+  // Forbid comparison of different scoped_array types.
+  template <class C2> bool operator==(scoped_array<C2> const& p2) const;
+  template <class C2> bool operator!=(scoped_array<C2> const& p2) const;
+
+  // Disallow evil constructors
+  scoped_array(const scoped_array&);
+  void operator=(const scoped_array&);
+};
+
+// Free functions
+template <class C>
+inline void swap(scoped_array<C>& p1, scoped_array<C>& p2) {
+  p1.swap(p2);
+}
+
+template <class C>
+inline bool operator==(const C* p1, const scoped_array<C>& p2) {
+  return p1 == p2.get();
+}
+
+template <class C>
+inline bool operator==(const C* p1, const scoped_array<const C>& p2) {
+  return p1 == p2.get();
+}
+
+template <class C>
+inline bool operator!=(const C* p1, const scoped_array<C>& p2) {
+  return p1 != p2.get();
+}
+
+template <class C>
+inline bool operator!=(const C* p1, const scoped_array<const C>& p2) {
+  return p1 != p2.get();
+}
+
+// This class wraps the c library function free() in a class that can be
+// passed as a template argument to scoped_ptr_malloc below.
+class ScopedPtrMallocFree {
+ public:
+  inline void operator()(void* x) const {
+    free(x);
+  }
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_PUBLIC_INTERNAL_SCOPED_PTR_H_
diff --git a/extern/libmv/third_party/ceres/include/ceres/iteration_callback.h b/extern/libmv/third_party/ceres/include/ceres/iteration_callback.h
new file mode 100644
index 00000000000..88da992d0c5
--- /dev/null
+++ b/extern/libmv/third_party/ceres/include/ceres/iteration_callback.h
@@ -0,0 +1,159 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// When an iteration callback is specified, Ceres calls the callback after each
+// optimizer step and pass it an IterationSummary object, defined below.
+
+#ifndef CERES_PUBLIC_ITERATION_CALLBACK_H_
+#define CERES_PUBLIC_ITERATION_CALLBACK_H_
+
+#include "ceres/types.h"
+
+namespace ceres {
+
+// This struct describes the state of the optimizer after each
+// iteration of the minimization.
+struct IterationSummary {
+  // Current iteration number.
+  int32 iteration;
+
+  // Whether or not the algorithm made progress in this iteration.
+  bool step_is_successful;
+
+  // Value of the objective function.
+  double cost;
+
+  // Change in the value of the objective function in this
+  // iteration. This can be positive or negative. Negative change
+  // means that the step was not successful.
+  double cost_change;
+
+  // Infinity norm of the gradient vector.
+  double gradient_max_norm;
+
+  // 2-norm of the size of the step computed by the optimization
+  // algorithm.
+  double step_norm;
+
+  // For trust region algorithms, the ratio of the actual change in
+  // cost and the change in the cost of the linearized approximation.
+  double relative_decrease;
+
+  // Value of the regularization parameter for Levenberg-Marquardt
+  // algorithm at the end of the current iteration.
+  double mu;
+
+  // For the inexact step Levenberg-Marquardt algorithm, this is the
+  // relative accuracy with which the Newton(LM) step is solved. This
+  // number affects only the iterative solvers capable of solving
+  // linear systems inexactly. Factorization-based exact solvers
+  // ignore it.
+  double eta;
+
+  // Number of iterations taken by the linear solver to solve for the
+  // Newton step.
+  int linear_solver_iterations;
+
+  // TODO(sameeragarwal): Change to use a higher precision timer using
+  // clock_gettime.
+  // Time (in seconds) spent inside the linear least squares solver.
+  int iteration_time_sec;
+
+  // Time (in seconds) spent inside the linear least squares solver.
+  int linear_solver_time_sec;
+};
+
+// Interface for specifying callbacks that are executed at the end of
+// each iteration of the Minimizer. The solver uses the return value
+// of operator() to decide whether to continue solving or to
+// terminate. The user can return three values.
+//
+// SOLVER_ABORT indicates that the callback detected an abnormal
+// situation. The solver returns without updating the parameter blocks
+// (unless Solver::Options::update_state_every_iteration is set
+// true). Solver returns with Solver::Summary::termination_type set to
+// USER_ABORT.
+//
+// SOLVER_TERMINATE_SUCCESSFULLY indicates that there is no need to
+// optimize anymore (some user specified termination criterion has
+// been met). Solver returns with Solver::Summary::termination_type
+// set to USER_SUCCESS.
+//
+// SOLVER_CONTINUE indicates that the solver should continue
+// optimizing.
+//
+// For example, the following Callback is used internally by Ceres to
+// log the progress of the optimization.
+//
+// Callback for logging the state of the minimizer to STDERR or STDOUT
+// depending on the user's preferences and logging level.
+//
+//   class LoggingCallback : public IterationCallback {
+//    public:
+//     explicit LoggingCallback(bool log_to_stdout)
+//         : log_to_stdout_(log_to_stdout) {}
+//
+//     ~LoggingCallback() {}
+//
+//     CallbackReturnType operator()(const IterationSummary& summary) {
+//       const char* kReportRowFormat =
+//           "% 4d: f:% 8e d:% 3.2e g:% 3.2e h:% 3.2e "
+//           "rho:% 3.2e mu:% 3.2e eta:% 3.2e li:% 3d";
+//       string output = StringPrintf(kReportRowFormat,
+//                                    summary.iteration,
+//                                    summary.cost,
+//                                    summary.cost_change,
+//                                    summary.gradient_max_norm,
+//                                    summary.step_norm,
+//                                    summary.relative_decrease,
+//                                    summary.mu,
+//                                    summary.eta,
+//                                    summary.linear_solver_iterations);
+//       if (log_to_stdout_) {
+//         cout << output << endl;
+//       } else {
+//         VLOG(1) << output;
+//       }
+//       return SOLVER_CONTINUE;
+//     }
+//
+//    private:
+//     const bool log_to_stdout_;
+//   };
+//
+class IterationCallback {
+ public:
+  virtual ~IterationCallback() {}
+  virtual CallbackReturnType operator()(const IterationSummary& summary) = 0;
+};
+
+}  // namespace ceres
+
+#endif  // CERES_PUBLIC_ITERATION_CALLBACK_H_
diff --git a/extern/libmv/third_party/ceres/include/ceres/jet.h b/extern/libmv/third_party/ceres/include/ceres/jet.h
new file mode 100644
index 00000000000..264861735ed
--- /dev/null
+++ b/extern/libmv/third_party/ceres/include/ceres/jet.h
@@ -0,0 +1,755 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//
+// A simple implementation of N-dimensional dual numbers, for automatically
+// computing exact derivatives of functions.
+//
+// While a complete treatment of the mechanics of automatic differentation is
+// beyond the scope of this header (see
+// http://en.wikipedia.org/wiki/Automatic_differentiation for details), the
+// basic idea is to extend normal arithmetic with an extra element, "e," often
+// denoted with the greek symbol epsilon, such that e != 0 but e^2 = 0. Dual
+// numbers are extensions of the real numbers analogous to complex numbers:
+// whereas complex numbers augment the reals by introducing an imaginary unit i
+// such that i^2 = -1, dual numbers introduce an "infinitesimal" unit e such
+// that e^2 = 0. Dual numbers have two components: the "real" component and the
+// "infinitesimal" component, generally written as x + y*e. Surprisingly, this
+// leads to a convenient method for computing exact derivatives without needing
+// to manipulate complicated symbolic expressions.
+//
+// For example, consider the function
+//
+//   f(x) = x^2 ,
+//
+// evaluated at 10. Using normal arithmetic, f(10) = 100, and df/dx(10) = 20.
+// Next, augument 10 with an infinitesimal to get:
+//
+//   f(10 + e) = (10 + e)^2
+//             = 100 + 2 * 10 * e + e^2
+//             = 100 + 20 * e       -+-
+//                     --            |
+//                     |             +--- This is zero, since e^2 = 0
+//                     |
+//                     +----------------- This is df/dx!
+//
+// Note that the derivative of f with respect to x is simply the infinitesimal
+// component of the value of f(x + e). So, in order to take the derivative of
+// any function, it is only necessary to replace the numeric "object" used in
+// the function with one extended with infinitesimals. The class Jet, defined in
+// this header, is one such example of this, where substitution is done with
+// templates.
+//
+// To handle derivatives of functions taking multiple arguments, different
+// infinitesimals are used, one for each variable to take the derivative of. For
+// example, consider a scalar function of two scalar parameters x and y:
+//
+//   f(x, y) = x^2 + x * y
+//
+// Following the technique above, to compute the derivatives df/dx and df/dy for
+// f(1, 3) involves doing two evaluations of f, the first time replacing x with
+// x + e, the second time replacing y with y + e.
+//
+// For df/dx:
+//
+//   f(1 + e, y) = (1 + e)^2 + (1 + e) * 3
+//               = 1 + 2 * e + 3 + 3 * e
+//               = 4 + 5 * e
+//
+//               --> df/dx = 5
+//
+// For df/dy:
+//
+//   f(1, 3 + e) = 1^2 + 1 * (3 + e)
+//               = 1 + 3 + e
+//               = 4 + e
+//
+//               --> df/dy = 1
+//
+// To take the gradient of f with the implementation of dual numbers ("jets") in
+// this file, it is necessary to create a single jet type which has components
+// for the derivative in x and y, and passing them to a templated version of f:
+//
+//   template<typename T>
+//   T f(const T &x, const T &y) {
+//     return x * x + x * y;
+//   }
+//
+//   // The "2" means there should be 2 dual number components.
+//   Jet<double, 2> x(0);  // Pick the 0th dual number for x.
+//   Jet<double, 2> y(1);  // Pick the 1st dual number for y.
+//   Jet<double, 2> z = f(x, y);
+//
+//   LG << "df/dx = " << z.a[0]
+//      << "df/dy = " << z.a[1];
+//
+// Most users should not use Jet objects directly; a wrapper around Jet objects,
+// which makes computing the derivative, gradient, or jacobian of templated
+// functors simple, is in autodiff.h. Even autodiff.h should not be used
+// directly; instead autodiff_cost_function.h is typically the file of interest.
+//
+// For the more mathematically inclined, this file implements first-order
+// "jets". A 1st order jet is an element of the ring
+//
+//   T[N] = T[t_1, ..., t_N] / (t_1, ..., t_N)^2
+//
+// which essentially means that each jet consists of a "scalar" value 'a' from T
+// and a 1st order perturbation vector 'v' of length N:
+//
+//   x = a + \sum_i v[i] t_i
+//
+// A shorthand is to write an element as x = a + u, where u is the pertubation.
+// Then, the main point about the arithmetic of jets is that the product of
+// perturbations is zero:
+//
+//   (a + u) * (b + v) = ab + av + bu + uv
+//                     = ab + (av + bu) + 0
+//
+// which is what operator* implements below. Addition is simpler:
+//
+//   (a + u) + (b + v) = (a + b) + (u + v).
+//
+// The only remaining question is how to evaluate the function of a jet, for
+// which we use the chain rule:
+//
+//   f(a + u) = f(a) + f'(a) u
+//
+// where f'(a) is the (scalar) derivative of f at a.
+//
+// By pushing these things through sufficiently and suitably templated
+// functions, we can do automatic differentiation. Just be sure to turn on
+// function inlining and common-subexpression elimination, or it will be very
+// slow!
+//
+// WARNING: Most Ceres users should not directly include this file or know the
+// details of how jets work. Instead the suggested method for automatic
+// derivatives is to use autodiff_cost_function.h, which is a wrapper around
+// both jets.h and autodiff.h to make taking derivatives of cost functions for
+// use in Ceres easier.
+
+#ifndef CERES_PUBLIC_JET_H_
+#define CERES_PUBLIC_JET_H_
+
+#include <cmath>
+#include <iosfwd>
+#include <iostream>  // NOLINT
+#include <string>
+
+#include "Eigen/Core"
+
+// Visual Studio 2010 or older version
+#if defined(_MSC_VER) && _MSC_VER <= 1600
+namespace std {
+inline bool isfinite(double x) { return _finite(x);                }
+inline bool isinf   (double x) { return !_finite(x) && !_isnan(x); }
+inline bool isnan   (double x) { return _isnan(x);                 }
+inline bool isnormal(double x) { return _finite(x) && x != 0.0;    }
+}  // namespace std
+#endif
+
+namespace ceres {
+
+template <typename T, int N>
+struct Jet {
+  enum { DIMENSION = N };
+
+  // Default-construct "a" because otherwise this can lead to false errors about
+  // uninitialized uses when other classes relying on default constructed T
+  // (where T is a Jet<T, N>). This usually only happens in opt mode. Note that
+  // the C++ standard mandates that e.g. default constructed doubles are
+  // initialized to 0.0; see sections 8.5 of the C++03 standard.
+  Jet() : a() {}
+
+  // Constructor from scalar: a + 0.
+  explicit Jet(const T& value) {
+    a = value;
+    v.setZero();
+  }
+
+  // Constructor from scalar plus variable: a + t_i.
+  Jet(const T& value, int k) {
+    a = value;
+    v.setZero();
+    v[k] = T(1.0);
+  }
+
+  /*
+
+  // Construct from an array where the first element is the scalar.
+  // This is templated to support converting from other data types.
+  template<typename D>
+  Jet(const D* scalar_and_derivatives) {
+    a = T(scalar_and_derivatives[0]);
+    v = Eigen::Map<const Eigen::Matrix<D, N, 1> >(
+        scalar_and_derivatives + 1, N).cast<T>();
+  }
+  */
+
+  // Compound operators
+  Jet<T, N>& operator+=(const Jet<T, N> &y) {
+    *this = *this + y;
+    return *this;
+  }
+
+  Jet<T, N>& operator-=(const Jet<T, N> &y) {
+    *this = *this - y;
+    return *this;
+  }
+
+  Jet<T, N>& operator*=(const Jet<T, N> &y) {
+    *this = *this * y;
+    return *this;
+  }
+
+  Jet<T, N>& operator/=(const Jet<T, N> &y) {
+    *this = *this / y;
+    return *this;
+  }
+
+  T a;  // The scalar part.
+  Eigen::Matrix<T, N, 1> v;  // The infinitesimal part.
+};
+
+// Unary +
+template<typename T, int N> inline
+Jet<T, N> const& operator+(const Jet<T, N>& f) {
+  return f;
+}
+
+// TODO(keir): Try adding __attribute__((always_inline)) to these functions to
+// see if it causes a performance increase.
+
+// Unary -
+template<typename T, int N> inline
+Jet<T, N> operator-(const Jet<T, N>&f) {
+  Jet<T, N> g;
+  g.a = -f.a;
+  g.v = -f.v;
+  return g;
+}
+
+// Binary +
+template<typename T, int N> inline
+Jet<T, N> operator+(const Jet<T, N>& f,
+                    const Jet<T, N>& g) {
+  Jet<T, N> h;
+  h.a = f.a + g.a;
+  h.v = f.v + g.v;
+  return h;
+}
+
+// Binary + with a scalar: x + s
+template<typename T, int N> inline
+Jet<T, N> operator+(const Jet<T, N>& f, T s) {
+  Jet<T, N> h;
+  h.a = f.a + s;
+  h.v = f.v;
+  return h;
+}
+
+// Binary + with a scalar: s + x
+template<typename T, int N> inline
+Jet<T, N> operator+(T s, const Jet<T, N>& f) {
+  Jet<T, N> h;
+  h.a = f.a + s;
+  h.v = f.v;
+  return h;
+}
+
+// Binary -
+template<typename T, int N> inline
+Jet<T, N> operator-(const Jet<T, N>& f,
+                    const Jet<T, N>& g) {
+  Jet<T, N> h;
+  h.a = f.a - g.a;
+  h.v = f.v - g.v;
+  return h;
+}
+
+// Binary - with a scalar: x - s
+template<typename T, int N> inline
+Jet<T, N> operator-(const Jet<T, N>& f, T s) {
+  Jet<T, N> h;
+  h.a = f.a - s;
+  h.v = f.v;
+  return h;
+}
+
+// Binary - with a scalar: s - x
+template<typename T, int N> inline
+Jet<T, N> operator-(T s, const Jet<T, N>& f) {
+  Jet<T, N> h;
+  h.a = s - f.a;
+  h.v = -f.v;
+  return h;
+}
+
+// Binary *
+template<typename T, int N> inline
+Jet<T, N> operator*(const Jet<T, N>& f,
+                    const Jet<T, N>& g) {
+  Jet<T, N> h;
+  h.a = f.a * g.a;
+  h.v = f.a * g.v + f.v * g.a;
+  return h;
+}
+
+// Binary * with a scalar: x * s
+template<typename T, int N> inline
+Jet<T, N> operator*(const Jet<T, N>& f, T s) {
+  Jet<T, N> h;
+  h.a = f.a * s;
+  h.v = f.v * s;
+  return h;
+}
+
+// Binary * with a scalar: s * x
+template<typename T, int N> inline
+Jet<T, N> operator*(T s, const Jet<T, N>& f) {
+  Jet<T, N> h;
+  h.a = f.a * s;
+  h.v = f.v * s;
+  return h;
+}
+
+// Binary /
+template<typename T, int N> inline
+Jet<T, N> operator/(const Jet<T, N>& f,
+                    const Jet<T, N>& g) {
+  Jet<T, N> h;
+  // This uses:
+  //
+  //   a + u   (a + u)(b - v)   (a + u)(b - v)
+  //   ----- = -------------- = --------------
+  //   b + v   (b + v)(b - v)        b^2
+  //
+  // which holds because v*v = 0.
+  h.a = f.a / g.a;
+  h.v = (f.v - f.a / g.a * g.v) / g.a;
+  return h;
+}
+
+// Binary / with a scalar: s / x
+template<typename T, int N> inline
+Jet<T, N> operator/(T s, const Jet<T, N>& g) {
+  Jet<T, N> h;
+  h.a = s / g.a;
+  h.v = - s * g.v / (g.a * g.a);
+  return h;
+}
+
+// Binary / with a scalar: x / s
+template<typename T, int N> inline
+Jet<T, N> operator/(const Jet<T, N>& f, T s) {
+  Jet<T, N> h;
+  h.a = f.a / s;
+  h.v = f.v / s;
+  return h;
+}
+
+// Binary comparison operators for both scalars and jets.
+#define CERES_DEFINE_JET_COMPARISON_OPERATOR(op) \
+template<typename T, int N> inline \
+bool operator op(const Jet<T, N>& f, const Jet<T, N>& g) { \
+  return f.a op g.a; \
+} \
+template<typename T, int N> inline \
+bool operator op(const T& s, const Jet<T, N>& g) { \
+  return s op g.a; \
+} \
+template<typename T, int N> inline \
+bool operator op(const Jet<T, N>& f, const T& s) { \
+  return f.a op s; \
+}
+CERES_DEFINE_JET_COMPARISON_OPERATOR( <  )  // NOLINT
+CERES_DEFINE_JET_COMPARISON_OPERATOR( <= )  // NOLINT
+CERES_DEFINE_JET_COMPARISON_OPERATOR( >  )  // NOLINT
+CERES_DEFINE_JET_COMPARISON_OPERATOR( >= )  // NOLINT
+CERES_DEFINE_JET_COMPARISON_OPERATOR( == )  // NOLINT
+CERES_DEFINE_JET_COMPARISON_OPERATOR( != )  // NOLINT
+#undef CERES_DEFINE_JET_COMPARISON_OPERATOR
+
+// Pull some functions from namespace std.
+//
+// This is necessary because we want to use the same name (e.g. 'sqrt') for
+// double-valued and Jet-valued functions, but we are not allowed to put
+// Jet-valued functions inside namespace std.
+//
+// Missing: cosh, sinh, tanh, tan
+// TODO(keir): Switch to "using".
+inline double abs     (double x) { return std::abs(x);      }
+inline double log     (double x) { return std::log(x);      }
+inline double exp     (double x) { return std::exp(x);      }
+inline double sqrt    (double x) { return std::sqrt(x);     }
+inline double cos     (double x) { return std::cos(x);      }
+inline double acos    (double x) { return std::acos(x);     }
+inline double sin     (double x) { return std::sin(x);      }
+inline double asin    (double x) { return std::asin(x);     }
+inline bool   isfinite(double x) { return std::isfinite(x); }
+inline bool   isinf   (double x) { return std::isinf(x);    }
+inline bool   isnan   (double x) { return std::isnan(x);    }
+inline bool   isnormal(double x) { return std::isnormal(x); }
+inline double pow  (double x, double y) { return std::pow(x, y);   }
+inline double atan2(double y, double x) { return std::atan2(y, x); }
+
+// In general, f(a + h) ~= f(a) + f'(a) h, via the chain rule.
+
+// abs(x + h) ~= x + h or -(x + h)
+template <typename T, int N> inline
+Jet<T, N> abs(const Jet<T, N>& f) {
+  return f.a < T(0.0) ? -f : f;
+}
+
+// log(a + h) ~= log(a) + h / a
+template <typename T, int N> inline
+Jet<T, N> log(const Jet<T, N>& f) {
+  Jet<T, N> g;
+  g.a = log(f.a);
+  g.v = f.v / f.a;
+  return g;
+}
+
+// exp(a + h) ~= exp(a) + exp(a) h
+template <typename T, int N> inline
+Jet<T, N> exp(const Jet<T, N>& f) {
+  Jet<T, N> g;
+  g.a = exp(f.a);
+  g.v = g.a * f.v;
+  return g;
+}
+
+// sqrt(a + h) ~= sqrt(a) + h / (2 sqrt(a))
+template <typename T, int N> inline
+Jet<T, N> sqrt(const Jet<T, N>& f) {
+  Jet<T, N> g;
+  g.a = sqrt(f.a);
+  g.v = f.v / (T(2.0) * g.a);
+  return g;
+}
+
+// cos(a + h) ~= cos(a) - sin(a) h
+template <typename T, int N> inline
+Jet<T, N> cos(const Jet<T, N>& f) {
+  Jet<T, N> g;
+  g.a = cos(f.a);
+  T sin_a = sin(f.a);
+  g.v = - sin_a * f.v;
+  return g;
+}
+
+// acos(a + h) ~= acos(a) - 1 / sqrt(1 - a^2) h
+template <typename T, int N> inline
+Jet<T, N> acos(const Jet<T, N>& f) {
+  Jet<T, N> g;
+  g.a = acos(f.a);
+  g.v = - T(1.0) / sqrt(T(1.0) - f.a * f.a) * f.v;
+  return g;
+}
+
+// sin(a + h) ~= sin(a) + cos(a) h
+template <typename T, int N> inline
+Jet<T, N> sin(const Jet<T, N>& f) {
+  Jet<T, N> g;
+  g.a = sin(f.a);
+  T cos_a = cos(f.a);
+  g.v = cos_a * f.v;
+  return g;
+}
+
+// asin(a + h) ~= asin(a) + 1 / sqrt(1 - a^2) h
+template <typename T, int N> inline
+Jet<T, N> asin(const Jet<T, N>& f) {
+  Jet<T, N> g;
+  g.a = asin(f.a);
+  g.v = T(1.0) / sqrt(T(1.0) - f.a * f.a) * f.v;
+  return g;
+}
+
+// Jet Classification. It is not clear what the appropriate semantics are for
+// these classifications. This picks that isfinite and isnormal are "all"
+// operations, i.e. all elements of the jet must be finite for the jet itself to
+// be finite (or normal). For isnan and isinf, the answer is less clear. This
+// takes a "any" approach for isnan and isinf such that if any part of a jet is
+// nan or inf, then the entire jet is nan or inf. This leads to strange
+// situations like a jet can be both isinf and isnan, but in practice the "any"
+// semantics are the most useful for e.g. checking that derivatives are sane.
+
+// The jet is finite if all parts of the jet are finite.
+template <typename T, int N> inline
+bool isfinite(const Jet<T, N>& f) {
+  if (!isfinite(f.a)) {
+    return false;
+  }
+  for (int i = 0; i < N; ++i) {
+    if (!isfinite(f.v[i])) {
+      return false;
+    }
+  }
+  return true;
+}
+
+// The jet is infinite if any part of the jet is infinite.
+template <typename T, int N> inline
+bool isinf(const Jet<T, N>& f) {
+  if (isinf(f.a)) {
+    return true;
+  }
+  for (int i = 0; i < N; i++) {
+    if (isinf(f.v[i])) {
+      return true;
+    }
+  }
+  return false;
+}
+
+// The jet is NaN if any part of the jet is NaN.
+template <typename T, int N> inline
+bool isnan(const Jet<T, N>& f) {
+  if (isnan(f.a)) {
+    return true;
+  }
+  for (int i = 0; i < N; ++i) {
+    if (isnan(f.v[i])) {
+      return true;
+    }
+  }
+  return false;
+}
+
+// The jet is normal if all parts of the jet are normal.
+template <typename T, int N> inline
+bool isnormal(const Jet<T, N>& f) {
+  if (!isnormal(f.a)) {
+    return false;
+  }
+  for (int i = 0; i < N; ++i) {
+    if (!isnormal(f.v[i])) {
+      return false;
+    }
+  }
+  return true;
+}
+
+// atan2(b + db, a + da) ~= atan2(b, a) + (- b da + a db) / (a^2 + b^2)
+//
+// In words: the rate of change of theta is 1/r times the rate of
+// change of (x, y) in the positive angular direction.
+template <typename T, int N> inline
+Jet<T, N> atan2(const Jet<T, N>& g, const Jet<T, N>& f) {
+  // Note order of arguments:
+  //
+  //   f = a + da
+  //   g = b + db
+
+  Jet<T, N> out;
+
+  out.a = atan2(g.a, f.a);
+
+  T const temp = T(1.0) / (f.a * f.a + g.a * g.a);
+  out.v = temp * (- g.a * f.v + f.a * g.v);
+  return out;
+}
+
+
+// pow -- base is a differentiatble function, exponent is a constant.
+// (a+da)^p ~= a^p + p*a^(p-1) da
+template <typename T, int N> inline
+Jet<T, N> pow(const Jet<T, N>& f, double g) {
+  Jet<T, N> out;
+  out.a = pow(f.a, g);
+  T const temp = g * pow(f.a, g - T(1.0));
+  out.v = temp * f.v;
+  return out;
+}
+
+// pow -- base is a constant, exponent is a differentiable function.
+// (a)^(p+dp) ~= a^p + a^p log(a) dp
+template <typename T, int N> inline
+Jet<T, N> pow(double f, const Jet<T, N>& g) {
+  Jet<T, N> out;
+  out.a = pow(f, g.a);
+  T const temp = log(f) * out.a;
+  out.v = temp * g.v;
+  return out;
+}
+
+
+// pow -- both base and exponent are differentiable functions.
+// (a+da)^(b+db) ~= a^b + b * a^(b-1) da + a^b log(a) * db
+template <typename T, int N> inline
+Jet<T, N> pow(const Jet<T, N>& f, const Jet<T, N>& g) {
+  Jet<T, N> out;
+
+  T const temp1 = pow(f.a, g.a);
+  T const temp2 = g.a * pow(f.a, g.a - T(1.0));
+  T const temp3 = temp1 * log(f.a);
+
+  out.a = temp1;
+  out.v = temp2 * f.v + temp3 * g.v;
+  return out;
+}
+
+// Define the helper functions Eigen needs to embed Jet types.
+//
+// NOTE(keir): machine_epsilon() and precision() are missing, because they don't
+// work with nested template types (e.g. where the scalar is itself templated).
+// Among other things, this means that decompositions of Jet's does not work,
+// for example
+//
+//   Matrix<Jet<T, N> ... > A, x, b;
+//   ...
+//   A.solve(b, &x)
+//
+// does not work and will fail with a strange compiler error.
+//
+// TODO(keir): This is an Eigen 2.0 limitation that is lifted in 3.0. When we
+// switch to 3.0, also add the rest of the specialization functionality.
+template<typename T, int N> inline const Jet<T, N>& ei_conj(const Jet<T, N>& x) { return x;              }  // NOLINT
+template<typename T, int N> inline const Jet<T, N>& ei_real(const Jet<T, N>& x) { return x;              }  // NOLINT
+template<typename T, int N> inline       Jet<T, N>  ei_imag(const Jet<T, N>&  ) { return Jet<T, N>(0.0); }  // NOLINT
+template<typename T, int N> inline       Jet<T, N>  ei_abs (const Jet<T, N>& x) { return fabs(x);        }  // NOLINT
+template<typename T, int N> inline       Jet<T, N>  ei_abs2(const Jet<T, N>& x) { return x * x;          }  // NOLINT
+template<typename T, int N> inline       Jet<T, N>  ei_sqrt(const Jet<T, N>& x) { return sqrt(x);        }  // NOLINT
+template<typename T, int N> inline       Jet<T, N>  ei_exp (const Jet<T, N>& x) { return exp(x);         }  // NOLINT
+template<typename T, int N> inline       Jet<T, N>  ei_log (const Jet<T, N>& x) { return log(x);         }  // NOLINT
+template<typename T, int N> inline       Jet<T, N>  ei_sin (const Jet<T, N>& x) { return sin(x);         }  // NOLINT
+template<typename T, int N> inline       Jet<T, N>  ei_cos (const Jet<T, N>& x) { return cos(x);         }  // NOLINT
+template<typename T, int N> inline       Jet<T, N>  ei_pow (const Jet<T, N>& x, Jet<T, N> y) { return pow(x, y); }  // NOLINT
+
+// Note: This has to be in the ceres namespace for argument dependent lookup to
+// function correctly. Otherwise statements like CHECK_LE(x, 2.0) fail with
+// strange compile errors.
+template <typename T, int N>
+inline std::ostream &operator<<(std::ostream &s, const Jet<T, N>& z) {
+  return s << "[" << z.a << " ; " << z.v.transpose() << "]";
+}
+
+// A jet traits class to make it easier to work with mixed auto / numeric diff.
+template<typename T>
+struct JetOps {
+  static bool IsScalar() {
+    return true;
+  }
+  static T GetScalar(const T& t) {
+    return t;
+  }
+  static void SetScalar(const T& scalar, T* t) {
+    *t = scalar;
+  }
+  static void ScaleDerivative(double scale_by, T *value) {
+    // For double, there is no derivative to scale.
+  }
+};
+
+template<typename T, int N>
+struct JetOps<Jet<T, N> > {
+  static bool IsScalar() {
+    return false;
+  }
+  static T GetScalar(const Jet<T, N>& t) {
+    return t.a;
+  }
+  static void SetScalar(const T& scalar, Jet<T, N>* t) {
+    t->a = scalar;
+  }
+  static void ScaleDerivative(double scale_by, Jet<T, N> *value) {
+    value->v *= scale_by;
+  }
+};
+
+template<typename FunctionType, int kNumArgs, typename ArgumentType>
+struct Chain {
+  static ArgumentType Rule(const FunctionType &f,
+                           const FunctionType dfdx[kNumArgs],
+                           const ArgumentType x[kNumArgs]) {
+    // In the default case of scalars, there's nothing to do since there are no
+    // derivatives to propagate. 
+    return f;
+  }
+};
+
+// XXX Add documentation here!
+template<typename FunctionType, int kNumArgs, typename T, int N>
+struct Chain<FunctionType, kNumArgs, Jet<T, N> > {
+  static Jet<T, N> Rule(const FunctionType &f,
+                        const FunctionType dfdx[kNumArgs],
+                        const Jet<T, N> x[kNumArgs]) {
+    // x is itself a function of another variable ("z"); what this function
+    // needs to return is "f", but with the derivative with respect to z
+    // attached to the jet. So combine the derivative part of x's jets to form
+    // a Jacobian matrix between x and z (i.e. dx/dz).
+    Eigen::Matrix<T, kNumArgs, N> dxdz;
+    for (int i = 0; i < kNumArgs; ++i) {
+      dxdz.row(i) = x[i].v.transpose();
+    }
+
+    // Map the input gradient dfdx into an Eigen row vector.
+    Eigen::Map<const Eigen::Matrix<FunctionType, 1, kNumArgs> >
+        vector_dfdx(dfdx, 1, kNumArgs);
+
+    // Now apply the chain rule to obtain df/dz. Combine the derivative with
+    // the scalar part to obtain f with full derivative information.
+    Jet<T, N> jet_f;
+    jet_f.a = f;
+    jet_f.v = vector_dfdx.template cast<T>() * dxdz;  // Also known as dfdz.
+    return jet_f;
+  }
+};
+
+}  // namespace ceres
+
+namespace Eigen {
+
+// Creating a specialization of NumTraits enables placing Jet objects inside
+// Eigen arrays, getting all the goodness of Eigen combined with autodiff.
+template<typename T, int N>
+struct NumTraits<ceres::Jet<T, N> > {
+  typedef ceres::Jet<T, N> Real;
+  typedef ceres::Jet<T, N> NonInteger;
+  typedef ceres::Jet<T, N> Nested;
+
+  static typename ceres::Jet<T, N> dummy_precision() {
+    return ceres::Jet<T, N>(1e-12);
+  }
+
+  enum {
+    IsComplex = 0,
+    IsInteger = 0,
+    IsSigned,
+    ReadCost = 1,
+    AddCost = 1,
+    // For Jet types, multiplication is more expensive than addition.
+    MulCost = 3,
+    HasFloatingPoint = 1
+  };
+};
+
+}  // namespace Eigen
+
+#endif  // CERES_PUBLIC_JET_H_
diff --git a/extern/libmv/third_party/ceres/include/ceres/local_parameterization.h b/extern/libmv/third_party/ceres/include/ceres/local_parameterization.h
new file mode 100644
index 00000000000..c0f7dc77a57
--- /dev/null
+++ b/extern/libmv/third_party/ceres/include/ceres/local_parameterization.h
@@ -0,0 +1,189 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//         sameeragarwal@google.com (Sameer Agarwal)
+
+#ifndef CERES_PUBLIC_LOCAL_PARAMETERIZATION_H_
+#define CERES_PUBLIC_LOCAL_PARAMETERIZATION_H_
+
+#include <vector>
+#include "ceres/internal/port.h"
+
+namespace ceres {
+
+// Purpose: Sometimes parameter blocks x can overparameterize a problem
+//
+//   min f(x)
+//    x
+//
+// In that case it is desirable to choose a parameterization for the
+// block itself to remove the null directions of the cost. More
+// generally, if x lies on a manifold of a smaller dimension than the
+// ambient space that it is embedded in, then it is numerically and
+// computationally more effective to optimize it using a
+// parameterization that lives in the tangent space of that manifold
+// at each point.
+//
+// For example, a sphere in three dimensions is a 2 dimensional
+// manifold, embedded in a three dimensional space. At each point on
+// the sphere, the plane tangent to it defines a two dimensional
+// tangent space. For a cost function defined on this sphere, given a
+// point x, moving in the direction normal to the sphere at that point
+// is not useful. Thus a better way to do a local optimization is to
+// optimize over two dimensional vector delta in the tangent space at
+// that point and then "move" to the point x + delta, where the move
+// operation involves projecting back onto the sphere. Doing so
+// removes a redundent dimension from the optimization, making it
+// numerically more robust and efficient.
+//
+// More generally we can define a function
+//
+//   x_plus_delta = Plus(x, delta),
+//
+// where x_plus_delta has the same size as x, and delta is of size
+// less than or equal to x. The function Plus, generalizes the
+// definition of vector addition. Thus it satisfies the identify
+//
+//   Plus(x, 0) = x, for all x.
+//
+// A trivial version of Plus is when delta is of the same size as x
+// and
+//
+//   Plus(x, delta) = x + delta
+//
+// A more interesting case if x is two dimensional vector, and the
+// user wishes to hold the first coordinate constant. Then, delta is a
+// scalar and Plus is defined as
+//
+//   Plus(x, delta) = x + [0] * delta
+//                        [1]
+//
+// An example that occurs commonly in Structure from Motion problems
+// is when camera rotations are parameterized using Quaternion. There,
+// it is useful only make updates orthogonal to that 4-vector defining
+// the quaternion. One way to do this is to let delta be a 3
+// dimensional vector and define Plus to be
+//
+//   Plus(x, delta) = [cos(|delta|), sin(|delta|) delta / |delta|] * x
+//
+// The multiplication between the two 4-vectors on the RHS is the
+// standard quaternion product.
+//
+// Given g and a point x, optimizing f can now be restated as
+//
+//     min  f(Plus(x, delta))
+//    delta
+//
+// Given a solution delta to this problem, the optimal value is then
+// given by
+//
+//   x* = Plus(x, delta)
+//
+// The class LocalParameterization defines the function Plus and its
+// Jacobian which is needed to compute the Jacobian of f w.r.t delta.
+class LocalParameterization {
+ public:
+  virtual ~LocalParameterization() {}
+
+  // Generalization of the addition operation,
+  //
+  //   x_plus_delta = Plus(x, delta)
+  //
+  // with the condition that Plus(x, 0) = x.
+  virtual bool Plus(const double* x,
+                    const double* delta,
+                    double* x_plus_delta) const = 0;
+
+  // The jacobian of Plus(x, delta) w.r.t delta at delta = 0.
+  virtual bool ComputeJacobian(const double* x, double* jacobian) const = 0;
+
+  // Size of x.
+  virtual int GlobalSize() const = 0;
+
+  // Size of delta.
+  virtual int LocalSize() const = 0;
+};
+
+// Some basic parameterizations
+
+// Identity Parameterization: Plus(x, delta) = x + delta
+class IdentityParameterization : public LocalParameterization {
+ public:
+  explicit IdentityParameterization(int size);
+  virtual ~IdentityParameterization() {}
+  virtual bool Plus(const double* x,
+                    const double* delta,
+                    double* x_plus_delta) const;
+  virtual bool ComputeJacobian(const double* x,
+                               double* jacobian) const;
+  virtual int GlobalSize() const { return size_; }
+  virtual int LocalSize() const { return size_; }
+
+ private:
+  const int size_;
+};
+
+// Hold a subset of the parameters inside a parameter block constant.
+class SubsetParameterization : public LocalParameterization {
+ public:
+  explicit SubsetParameterization(int size,
+                                  const vector<int>& constant_parameters);
+  virtual ~SubsetParameterization() {}
+  virtual bool Plus(const double* x,
+                    const double* delta,
+                    double* x_plus_delta) const;
+  virtual bool ComputeJacobian(const double* x,
+                               double* jacobian) const;
+  virtual int GlobalSize() const { return constancy_mask_.size(); }
+  virtual int LocalSize() const { return local_size_; }
+
+ private:
+  const int local_size_;
+  vector<int> constancy_mask_;
+};
+
+// Plus(x, delta) = [cos(|delta|), sin(|delta|) delta / |delta|] * x
+// with * being the quaternion multiplication operator. Here we assume
+// that the first element of the quaternion vector is the real (cos
+// theta) part.
+class QuaternionParameterization : public LocalParameterization {
+ public:
+  virtual ~QuaternionParameterization() {}
+  virtual bool Plus(const double* x,
+                    const double* delta,
+                    double* x_plus_delta) const;
+  virtual bool ComputeJacobian(const double* x,
+                               double* jacobian) const;
+  virtual int GlobalSize() const { return 4; }
+  virtual int LocalSize() const { return 3; }
+};
+
+}  // namespace ceres
+
+#endif  // CERES_PUBLIC_LOCAL_PARAMETERIZATION_H_
diff --git a/extern/libmv/third_party/ceres/include/ceres/loss_function.h b/extern/libmv/third_party/ceres/include/ceres/loss_function.h
new file mode 100644
index 00000000000..81add02cdee
--- /dev/null
+++ b/extern/libmv/third_party/ceres/include/ceres/loss_function.h
@@ -0,0 +1,322 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// The LossFunction interface is the way users describe how residuals
+// are converted to cost terms for the overall problem cost function.
+// For the exact manner in which loss functions are converted to the
+// overall cost for a problem, see problem.h.
+//
+// For least squares problem where there are no outliers and standard
+// squared loss is expected, it is not necessary to create a loss
+// function; instead passing a NULL to the problem when adding
+// residuals implies a standard squared loss.
+//
+// For least squares problems where the minimization may encounter
+// input terms that contain outliers, that is, completely bogus
+// measurements, it is important to use a loss function that reduces
+// their associated penalty.
+//
+// Consider a structure from motion problem. The unknowns are 3D
+// points and camera parameters, and the measurements are image
+// coordinates describing the expected reprojected position for a
+// point in a camera. For example, we want to model the geometry of a
+// street scene with fire hydrants and cars, observed by a moving
+// camera with unknown parameters, and the only 3D points we care
+// about are the pointy tippy-tops of the fire hydrants. Our magic
+// image processing algorithm, which is responsible for producing the
+// measurements that are input to Ceres, has found and matched all
+// such tippy-tops in all image frames, except that in one of the
+// frame it mistook a car's headlight for a hydrant. If we didn't do
+// anything special (i.e. if we used a basic quadratic loss), the
+// residual for the erroneous measurement will result in extreme error
+// due to the quadratic nature of squared loss. This results in the
+// entire solution getting pulled away from the optimimum to reduce
+// the large error that would otherwise be attributed to the wrong
+// measurement.
+//
+// Using a robust loss function, the cost for large residuals is
+// reduced. In the example above, this leads to outlier terms getting
+// downweighted so they do not overly influence the final solution.
+//
+// What cost function is best?
+//
+// In general, there isn't a principled way to select a robust loss
+// function. The authors suggest starting with a non-robust cost, then
+// only experimenting with robust loss functions if standard squared
+// loss doesn't work.
+
+#ifndef CERES_PUBLIC_LOSS_FUNCTION_H_
+#define CERES_PUBLIC_LOSS_FUNCTION_H_
+
+#include <glog/logging.h>
+#include "ceres/internal/macros.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/types.h"
+
+namespace ceres {
+
+class LossFunction {
+ public:
+  virtual ~LossFunction() {}
+
+  // For a residual vector with squared 2-norm 'sq_norm', this method
+  // is required to fill in the value and derivatives of the loss
+  // function (rho in this example):
+  //
+  //   out[0] = rho(sq_norm),
+  //   out[1] = rho'(sq_norm),
+  //   out[2] = rho''(sq_norm),
+  //
+  // Here the convention is that the contribution of a term to the
+  // cost function is given by 1/2 rho(s),  where
+  //
+  //   s = ||residuals||^2.
+  //
+  // Calling the method with a negative value of 's' is an error and
+  // the implementations are not required to handle that case.
+  //
+  // Most sane choices of rho() satisfy:
+  //
+  //   rho(0) = 0,
+  //   rho'(0) = 1,
+  //   rho'(s) < 1 in outlier region,
+  //   rho''(s) < 0 in outlier region,
+  //
+  // so that they mimic the least squares cost for small residuals.
+  virtual void Evaluate(double sq_norm, double out[3]) const = 0;
+};
+
+// Some common implementations follow below.
+//
+// Note: in the region of interest (i.e. s < 3) we have:
+//   TrivialLoss >= HuberLoss >= SoftLOneLoss >= CauchyLoss
+
+
+// This corresponds to no robustification.
+//
+//   rho(s) = s
+//
+// At s = 0: rho = [0, 1, 0].
+//
+// It is not normally necessary to use this, as passing NULL for the
+// loss function when building the problem accomplishes the same
+// thing.
+class TrivialLoss : public LossFunction {
+ public:
+  virtual void Evaluate(double, double*) const;
+};
+
+// Scaling
+// -------
+// Given one robustifier
+//   s -> rho(s)
+// one can change the length scale at which robustification takes
+// place, by adding a scale factor 'a' as follows:
+//
+//   s -> a^2 rho(s / a^2).
+//
+// The first and second derivatives are:
+//
+//   s -> rho'(s / a^2),
+//   s -> (1 / a^2) rho''(s / a^2),
+//
+// but the behaviour near s = 0 is the same as the original function,
+// i.e.
+//
+//   rho(s) = s + higher order terms,
+//   a^2 rho(s / a^2) = s + higher order terms.
+//
+// The scalar 'a' should be positive.
+//
+// The reason for the appearance of squaring is that 'a' is in the
+// units of the residual vector norm whereas 's' is a squared
+// norm. For applications it is more convenient to specify 'a' than
+// its square. The commonly used robustifiers below are described in
+// un-scaled format (a = 1) but their implementations work for any
+// non-zero value of 'a'.
+
+// Huber.
+//
+//   rho(s) = s               for s <= 1,
+//   rho(s) = 2 sqrt(s) - 1   for s >= 1.
+//
+// At s = 0: rho = [0, 1, 0].
+//
+// The scaling parameter 'a' corresponds to 'delta' on this page:
+//   http://en.wikipedia.org/wiki/Huber_Loss_Function
+class HuberLoss : public LossFunction {
+ public:
+  explicit HuberLoss(double a) : a_(a), b_(a * a) { }
+  virtual void Evaluate(double, double*) const;
+ private:
+  const double a_;
+  // b = a^2.
+  const double b_;
+};
+
+// Soft L1, similar to Huber but smooth.
+//
+//   rho(s) = 2 (sqrt(1 + s) - 1).
+//
+// At s = 0: rho = [0, 1, -1/2].
+class SoftLOneLoss : public LossFunction {
+ public:
+  explicit SoftLOneLoss(double a) : b_(a * a), c_(1 / b_) { }
+  virtual void Evaluate(double, double*) const;
+ private:
+  // b = a^2.
+  const double b_;
+  // c = 1 / a^2.
+  const double c_;
+};
+
+// Inspired by the Cauchy distribution
+//
+//   rho(s) = log(1 + s).
+//
+// At s = 0: rho = [0, 1, -1].
+class CauchyLoss : public LossFunction {
+ public:
+  explicit CauchyLoss(double a) : b_(a * a), c_(1 / b_) { }
+  virtual void Evaluate(double, double*) const;
+ private:
+  // b = a^2.
+  const double b_;
+  // c = 1 / a^2.
+  const double c_;
+};
+
+// The discussion above has to do with length scaling: it affects the space
+// in which s is measured. Sometimes you want to simply scale the output
+// value of the robustifier. For example, you might want to weight
+// different error terms differently (e.g., weight pixel reprojection
+// errors differently from terrain errors).
+//
+// If rho is the wrapped robustifier, then this simply outputs
+// s -> a * rho(s)
+//
+// The first and second derivatives are, not surprisingly
+// s -> a * rho'(s)
+// s -> a * rho''(s)
+//
+// Since we treat the a NULL Loss function as the Identity loss
+// function, rho = NULL is a valid input and will result in the input
+// being scaled by a. This provides a simple way of implementing a
+// scaled ResidualBlock.
+class ScaledLoss : public LossFunction {
+ public:
+  // Constructs a ScaledLoss wrapping another loss function. Takes
+  // ownership of the wrapped loss function or not depending on the
+  // ownership parameter.
+  ScaledLoss(const LossFunction* rho, double a, Ownership ownership) :
+      rho_(rho), a_(a), ownership_(ownership) { }
+
+  virtual ~ScaledLoss() {
+    if (ownership_ == DO_NOT_TAKE_OWNERSHIP) {
+      rho_.release();
+    }
+  }
+  virtual void Evaluate(double, double*) const;
+
+ private:
+  internal::scoped_ptr<const LossFunction> rho_;
+  const double a_;
+  const Ownership ownership_;
+  DISALLOW_COPY_AND_ASSIGN(ScaledLoss);
+};
+
+// Sometimes after the optimization problem has been constructed, we
+// wish to mutate the scale of the loss function. For example, when
+// performing estimation from data which has substantial outliers,
+// convergence can be improved by starting out with a large scale,
+// optimizing the problem and then reducing the scale. This can have
+// better convergence behaviour than just using a loss function with a
+// small scale.
+//
+// This templated class allows the user to implement a loss function
+// whose scale can be mutated after an optimization problem has been
+// constructed.
+//
+// Example usage
+//
+//  Problem problem;
+//
+//  // Add parameter blocks
+//
+//  CostFunction* cost_function =
+//    new AutoDiffCostFunction < UW_Camera_Mapper, 2, 9, 3>(
+//      new UW_Camera_Mapper(data->observations[2*i + 0],
+//                           data->observations[2*i + 1]));
+//
+//  LossFunctionWrapper* loss_function(new HuberLoss(1.0), TAKE_OWNERSHIP);
+//
+//  problem.AddResidualBlock(cost_function, loss_function, parameters);
+//
+//  Solver::Options options;
+//  scoped_ptr<Solver::Summary> summary1(Solve(problem, options));
+//
+//  loss_function->Reset(new HuberLoss(1.0), TAKE_OWNERSHIP);
+//
+//  scoped_ptr<Solver::Summary> summary2(Solve(problem, options));
+//
+class LossFunctionWrapper : public LossFunction {
+ public:
+  LossFunctionWrapper(LossFunction* rho, Ownership ownership)
+      : rho_(rho), ownership_(ownership) {
+  }
+
+  virtual ~LossFunctionWrapper() {
+    if (ownership_ == DO_NOT_TAKE_OWNERSHIP) {
+      rho_.release();
+    }
+  }
+
+  virtual void Evaluate(double sq_norm, double out[3]) const {
+    CHECK_NOTNULL(rho_.get());
+    rho_->Evaluate(sq_norm, out);
+  }
+
+  void Reset(LossFunction* rho, Ownership ownership) {
+    if (ownership_ == DO_NOT_TAKE_OWNERSHIP) {
+      rho_.release();
+    }
+    rho_.reset(rho);
+    ownership_ = ownership;
+  }
+
+ private:
+  internal::scoped_ptr<const LossFunction> rho_;
+  Ownership ownership_;
+  DISALLOW_COPY_AND_ASSIGN(LossFunctionWrapper);
+};
+
+}  // namespace ceres
+
+#endif  // CERES_PUBLIC_LOSS_FUNCTION_H_
diff --git a/extern/libmv/third_party/ceres/include/ceres/normal_prior.h b/extern/libmv/third_party/ceres/include/ceres/normal_prior.h
new file mode 100644
index 00000000000..480a07474a7
--- /dev/null
+++ b/extern/libmv/third_party/ceres/include/ceres/normal_prior.h
@@ -0,0 +1,75 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Cost term that implements a prior on a parameter block using a
+// normal distribution.
+
+#ifndef CERES_PUBLIC_NORMAL_PRIOR_H_
+#define CERES_PUBLIC_NORMAL_PRIOR_H_
+
+#include "ceres/cost_function.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+
+// Implements a cost function of the form
+//
+//   cost(x) = ||A(x - b)||^2
+//
+// where, the matrix A and the vector b are fixed and x is the
+// variable. In case the user is interested in implementing a cost
+// function of the form
+//
+//   cost(x) = (x - mu)^T S^{-1} (x - mu)
+//
+// where, mu is a vector and S is a covariance matrix, then, A =
+// S^{-1/2}, i.e the matrix A is the square root of the inverse of the
+// covariance, also known as the stiffness matrix. There are however
+// no restrictions on the shape of A. It is free to be rectangular,
+// which would be the case if the covariance matrix S is rank
+// deficient.
+
+class NormalPrior: public CostFunction {
+ public:
+  // Check that the number of rows in the vector b are the same as the
+  // number of columns in the matrix A, crash otherwise.
+  NormalPrior(const Matrix& A, const Vector& b);
+
+  virtual bool Evaluate(double const* const* parameters,
+                        double* residuals,
+                        double** jacobians) const;
+ private:
+  Matrix A_;
+  Vector b_;
+};
+
+}  // namespace ceres
+
+#endif  // CERES_PUBLIC_NORMAL_PRIOR_H_
diff --git a/extern/libmv/third_party/ceres/include/ceres/numeric_diff_cost_function.h b/extern/libmv/third_party/ceres/include/ceres/numeric_diff_cost_function.h
new file mode 100644
index 00000000000..bbaefca5b6c
--- /dev/null
+++ b/extern/libmv/third_party/ceres/include/ceres/numeric_diff_cost_function.h
@@ -0,0 +1,283 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//
+// Create CostFunctions as needed by the least squares framework with jacobians
+// computed via numeric (a.k.a. finite) differentiation. For more details see
+// http://en.wikipedia.org/wiki/Numerical_differentiation.
+//
+// To get a numerically differentiated cost function, define a subclass of
+// CostFunction such that the Evaluate() function ignores the jacobian
+// parameter. The numeric differentiation wrapper will fill in the jacobian
+// parameter if nececssary by repeatedly calling the Evaluate() function with
+// small changes to the appropriate parameters, and computing the slope. For
+// performance, the numeric differentiation wrapper class is templated on the
+// concrete cost function, even though it could be implemented only in terms of
+// the virtual CostFunction interface.
+//
+// The numerically differentiated version of a cost function for a cost function
+// can be constructed as follows:
+//
+//   CostFunction* cost_function
+//       = new NumericDiffCostFunction<MyCostFunction, CENTRAL, 1, 4, 8>(
+//           new MyCostFunction(...), TAKE_OWNERSHIP);
+//
+// where MyCostFunction has 1 residual and 2 parameter blocks with sizes 4 and 8
+// respectively. Look at the tests for a more detailed example.
+//
+// The central difference method is considerably more accurate at the cost of
+// twice as many function evaluations than forward difference. Consider using
+// central differences begin with, and only after that works, trying forward
+// difference to improve performance.
+//
+// TODO(keir): Characterize accuracy; mention pitfalls; provide alternatives.
+
+#ifndef CERES_PUBLIC_NUMERIC_DIFF_COST_FUNCTION_H_
+#define CERES_PUBLIC_NUMERIC_DIFF_COST_FUNCTION_H_
+
+#include <cstring>
+#include <glog/logging.h>
+#include "Eigen/Dense"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/sized_cost_function.h"
+#include "ceres/types.h"
+
+namespace ceres {
+
+enum NumericDiffMethod {
+  CENTRAL,
+  FORWARD
+};
+
+// This is split from the main class because C++ doesn't allow partial template
+// specializations for member functions. The alternative is to repeat the main
+// class for differing numbers of parameters, which is also unfortunate.
+template <typename CostFunctionNoJacobian,
+          int num_residuals,
+          int parameter_block_size,
+          int parameter_block,
+          NumericDiffMethod method>
+struct Differencer {
+  // Mutates parameters but must restore them before return.
+  static bool EvaluateJacobianForParameterBlock(
+      const CostFunctionNoJacobian *function,
+      double const* residuals_at_eval_point,
+      double **parameters,
+      double **jacobians) {
+    using Eigen::Map;
+    using Eigen::Matrix;
+    using Eigen::RowMajor;
+
+    typedef Matrix<double, num_residuals, 1> ResidualVector;
+    typedef Matrix<double, parameter_block_size, 1> ParameterVector;
+    typedef Matrix<double, num_residuals, parameter_block_size, RowMajor>
+        JacobianMatrix;
+
+    Map<JacobianMatrix> parameter_jacobian(jacobians[parameter_block],
+                                           num_residuals,
+                                           parameter_block_size);
+
+    // Mutate 1 element at a time and then restore.
+    Map<ParameterVector> x_plus_delta(parameters[parameter_block],
+                                      parameter_block_size);
+    ParameterVector x(x_plus_delta);
+
+    // TODO(keir): Pick a smarter number! In theory a good choice is sqrt(eps) *
+    // x, which for doubles means about 1e-8 * x. However, I have found this
+    // number too optimistic. This number should be exposed for users to change.
+    const double kRelativeStepSize = 1e-6;
+
+    ParameterVector step_size = x.array().abs() * kRelativeStepSize;
+
+    // To handle cases where a parameter is exactly zero, instead use the mean
+    // step_size for the other dimensions.
+    double fallback_step_size = step_size.sum() / step_size.rows();
+    if (fallback_step_size == 0.0) {
+      // If all the parameters are zero, there's no good answer. Take
+      // kRelativeStepSize as a guess and hope for the best.
+      fallback_step_size = kRelativeStepSize;
+    }
+
+    // For each parameter in the parameter block, use finite differences to
+    // compute the derivative for that parameter.
+    for (int j = 0; j < parameter_block_size; ++j) {
+      if (step_size(j) == 0.0) {
+        // The parameter is exactly zero, so compromise and use the mean
+        // step_size from the other parameters. This can break in many cases,
+        // but it's hard to pick a good number without problem specific
+        // knowledge.
+        step_size(j) = fallback_step_size;
+      }
+      x_plus_delta(j) = x(j) + step_size(j);
+
+      double residuals[num_residuals];  // NOLINT
+      if (!function->Evaluate(parameters, residuals, NULL)) {
+        // Something went wrong; bail.
+        return false;
+      }
+
+      // Compute this column of the jacobian in 3 steps:
+      // 1. Store residuals for the forward part.
+      // 2. Subtract residuals for the backward (or 0) part.
+      // 3. Divide out the run.
+      parameter_jacobian.col(j) =
+          Map<const ResidualVector>(residuals, num_residuals);
+
+      double one_over_h = 1 / step_size(j);
+      if (method == CENTRAL) {
+        // Compute the function on the other side of x(j).
+        x_plus_delta(j) = x(j) - step_size(j);
+
+        if (!function->Evaluate(parameters, residuals, NULL)) {
+          // Something went wrong; bail.
+          return false;
+        }
+        parameter_jacobian.col(j) -=
+            Map<ResidualVector>(residuals, num_residuals, 1);
+        one_over_h /= 2;
+      } else {
+        // Forward difference only; reuse existing residuals evaluation.
+        parameter_jacobian.col(j) -=
+            Map<const ResidualVector>(residuals_at_eval_point, num_residuals);
+      }
+      x_plus_delta(j) = x(j);  // Restore x_plus_delta.
+
+      // Divide out the run to get slope.
+      parameter_jacobian.col(j) *= one_over_h;
+    }
+    return true;
+  }
+};
+
+// Prevent invalid instantiations.
+template <typename CostFunctionNoJacobian,
+          int num_residuals,
+          int parameter_block,
+          NumericDiffMethod method>
+struct Differencer<CostFunctionNoJacobian,
+                  num_residuals,
+                  0 /* parameter_block_size */,
+                  parameter_block,
+                  method> {
+  static bool EvaluateJacobianForParameterBlock(
+      const CostFunctionNoJacobian *function,
+      double const* residuals_at_eval_point,
+      double **parameters,
+      double **jacobians) {
+    LOG(FATAL) << "Shouldn't get here.";
+    return true;
+  }
+};
+
+template <typename CostFunctionNoJacobian,
+         NumericDiffMethod method = CENTRAL, int M = 0,
+         int N0 = 0, int N1 = 0, int N2 = 0, int N3 = 0, int N4 = 0, int N5 = 0>
+class NumericDiffCostFunction
+    : public SizedCostFunction<M, N0, N1, N2, N3, N4, N5> {
+ public:
+  NumericDiffCostFunction(CostFunctionNoJacobian* function,
+                          Ownership ownership)
+      : function_(function), ownership_(ownership) {}
+
+  virtual ~NumericDiffCostFunction() {
+    if (ownership_ != TAKE_OWNERSHIP) {
+      function_.release();
+    }
+  }
+
+  virtual bool Evaluate(double const* const* parameters,
+                        double* residuals,
+                        double** jacobians) const {
+    // Get the function value (residuals) at the the point to evaluate.
+    bool success = function_->Evaluate(parameters, residuals, NULL);
+    if (!success) {
+      // Something went wrong; ignore the jacobian.
+      return false;
+    }
+    if (!jacobians) {
+      // Nothing to do; just forward.
+      return true;
+    }
+
+    // Create a copy of the parameters which will get mutated.
+    const int kParametersSize = N0 + N1 + N2 + N3 + N4 + N5;
+    double parameters_copy[kParametersSize];
+    double *parameters_references_copy[6];
+    parameters_references_copy[0] = &parameters_copy[0];
+    parameters_references_copy[1] = &parameters_copy[0] + N0;
+    parameters_references_copy[2] = &parameters_copy[0] + N0 + N1;
+    parameters_references_copy[3] = &parameters_copy[0] + N0 + N1 + N2;
+    parameters_references_copy[4] = &parameters_copy[0] + N0 + N1 + N2 + N3;
+    parameters_references_copy[5] =
+        &parameters_copy[0] + N0 + N1 + N2 + N3 + N4;
+
+#define COPY_PARAMETER_BLOCK(block) \
+    if (N ## block) memcpy(parameters_references_copy[block], \
+                           parameters[block], \
+                           sizeof(double) * N ## block);  // NOLINT
+    COPY_PARAMETER_BLOCK(0);
+    COPY_PARAMETER_BLOCK(1);
+    COPY_PARAMETER_BLOCK(2);
+    COPY_PARAMETER_BLOCK(3);
+    COPY_PARAMETER_BLOCK(4);
+    COPY_PARAMETER_BLOCK(5);
+#undef COPY_PARAMETER_BLOCK
+
+#define EVALUATE_JACOBIAN_FOR_BLOCK(block) \
+    if (N ## block && jacobians[block]) { \
+      if (!Differencer<CostFunctionNoJacobian, /* NOLINT */ \
+                       M, \
+                       N ## block, \
+                       block, \
+                       method>::EvaluateJacobianForParameterBlock( \
+          function_.get(), \
+          residuals, \
+          parameters_references_copy, \
+          jacobians)) { \
+        return false; \
+      } \
+    }
+    EVALUATE_JACOBIAN_FOR_BLOCK(0);
+    EVALUATE_JACOBIAN_FOR_BLOCK(1);
+    EVALUATE_JACOBIAN_FOR_BLOCK(2);
+    EVALUATE_JACOBIAN_FOR_BLOCK(3);
+    EVALUATE_JACOBIAN_FOR_BLOCK(4);
+    EVALUATE_JACOBIAN_FOR_BLOCK(5);
+#undef EVALUATE_JACOBIAN_FOR_BLOCK
+    return true;
+  }
+
+ private:
+  internal::scoped_ptr<CostFunctionNoJacobian> function_;
+  Ownership ownership_;
+};
+
+}  // namespace ceres
+
+#endif  // CERES_PUBLIC_NUMERIC_DIFF_COST_FUNCTION_H_
diff --git a/extern/libmv/third_party/ceres/include/ceres/problem.h b/extern/libmv/third_party/ceres/include/ceres/problem.h
new file mode 100644
index 00000000000..0ca61006bdb
--- /dev/null
+++ b/extern/libmv/third_party/ceres/include/ceres/problem.h
@@ -0,0 +1,265 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//         keir@google.com (Keir Mierle)
+//
+// The Problem object is used to build and hold least squares problems.
+
+#ifndef CERES_PUBLIC_PROBLEM_H_
+#define CERES_PUBLIC_PROBLEM_H_
+
+#include <cstddef>
+#include <map>
+#include <set>
+#include <vector>
+
+#include <glog/logging.h>
+#include "ceres/internal/macros.h"
+#include "ceres/internal/port.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/types.h"
+
+namespace ceres {
+
+class CostFunction;
+class LossFunction;
+class LocalParameterization;
+
+namespace internal {
+class Preprocessor;
+class ProblemImpl;
+class ParameterBlock;
+class ResidualBlock;
+class SolverImpl;
+}  // namespace internal
+
+// A ResidualBlockId is a handle clients can use to delete residual
+// blocks after creating them. They are opaque for any purposes other
+// than that.
+typedef const internal::ResidualBlock* ResidualBlockId;
+
+// A class to represent non-linear least squares problems. Such
+// problems have a cost function that is a sum of error terms (known
+// as "residuals"), where each residual is a function of some subset
+// of the parameters. The cost function takes the form
+//
+//    N    1
+//   SUM  --- loss( || r_i1, r_i2,..., r_ik ||^2  ),
+//   i=1   2
+//
+// where
+//
+//   r_ij     is residual number i, component j; the residual is a
+//            function of some subset of the parameters x1...xk. For
+//            example, in a structure from motion problem a residual
+//            might be the difference between a measured point in an
+//            image and the reprojected position for the matching
+//            camera, point pair. The residual would have two
+//            components, error in x and error in y.
+//
+//   loss(y)  is the loss function; for example, squared error or
+//            Huber L1 loss. If loss(y) = y, then the cost function is
+//            non-robustified least squares.
+//
+// This class is specifically designed to address the important subset
+// of "sparse" least squares problems, where each component of the
+// residual depends only on a small number number of parameters, even
+// though the total number of residuals and parameters may be very
+// large. This property affords tremendous gains in scale, allowing
+// efficient solving of large problems that are otherwise
+// inaccessible.
+//
+// The canonical example of a sparse least squares problem is
+// "structure-from-motion" (SFM), where the parameters are points and
+// cameras, and residuals are reprojection errors. Typically a single
+// residual will depend only on 9 parameters (3 for the point, 6 for
+// the camera).
+//
+// To create a least squares problem, use the AddResidualBlock() and
+// AddParameterBlock() methods, documented below. Here is an example least
+// squares problem containing 3 parameter blocks of sizes 3, 4 and 5
+// respectively and two residual terms of size 2 and 6:
+//
+//   double x1[] = { 1.0, 2.0, 3.0 };
+//   double x2[] = { 1.0, 2.0, 3.0, 5.0 };
+//   double x3[] = { 1.0, 2.0, 3.0, 6.0, 7.0 };
+//
+//   Problem problem;
+//
+//   problem.AddResidualBlock(new MyUnaryCostFunction(...), x1);
+//   problem.AddResidualBlock(new MyBinaryCostFunction(...), x2, x3);
+//
+// Please see cost_function.h for details of the CostFunction object.
+class Problem {
+ public:
+  struct Options {
+    Options()
+        : cost_function_ownership(TAKE_OWNERSHIP),
+          loss_function_ownership(TAKE_OWNERSHIP),
+          local_parameterization_ownership(TAKE_OWNERSHIP) {}
+
+    // These flags control whether the Problem object owns the cost
+    // functions, loss functions, and parameterizations passed into
+    // the Problem. If set to TAKE_OWNERSHIP, then the problem object
+    // will delete the corresponding cost or loss functions on
+    // destruction. The destructor is careful to delete the pointers
+    // only once, since sharing cost/loss/parameterizations is
+    // allowed.
+    Ownership cost_function_ownership;
+    Ownership loss_function_ownership;
+    Ownership local_parameterization_ownership;
+  };
+
+  // The default constructor is equivalent to the
+  // invocation Problem(Problem::Options()).
+  Problem();
+  explicit Problem(const Options& options);
+
+  ~Problem();
+
+  // Add a residual block to the overall cost function. The cost
+  // function carries with it information about the sizes of the
+  // parameter blocks it expects. The function checks that these match
+  // the sizes of the parameter blocks listed in parameter_blocks. The
+  // program aborts if a mismatch is detected. loss_function can be
+  // NULL, in which case the cost of the term is just the squared norm
+  // of the residuals.
+  //
+  // The user has the option of explicitly adding the parameter blocks
+  // using AddParameterBlock. This causes additional correctness
+  // checking; however, AddResidualBlock implicitly adds the parameter
+  // blocks if they are not present, so calling AddParameterBlock
+  // explicitly is not required.
+  //
+  // The Problem object by default takes ownership of the
+  // cost_function and loss_function pointers. These objects remain
+  // live for the life of the Problem object. If the user wishes to
+  // keep control over the destruction of these objects, then they can
+  // do this by setting the corresponding enums in the Options struct.
+  //
+  // Note: Even though the Problem takes ownership of cost_function
+  // and loss_function, it does not preclude the user from re-using
+  // them in another residual block. The destructor takes care to call
+  // delete on each cost_function or loss_function pointer only once,
+  // regardless of how many residual blocks refer to them.
+  //
+  // Example usage:
+  //
+  //   double x1[] = {1.0, 2.0, 3.0};
+  //   double x2[] = {1.0, 2.0, 5.0, 6.0};
+  //   double x3[] = {3.0, 6.0, 2.0, 5.0, 1.0};
+  //
+  //   Problem problem;
+  //
+  //   problem.AddResidualBlock(new MyUnaryCostFunction(...), NULL, x1);
+  //   problem.AddResidualBlock(new MyBinaryCostFunction(...), NULL, x2, x1);
+  //
+  ResidualBlockId AddResidualBlock(CostFunction* cost_function,
+                                   LossFunction* loss_function,
+                                   const vector<double*>& parameter_blocks);
+
+  // Convenience methods for adding residuals with a small number of
+  // parameters. This is the common case. Instead of specifying the
+  // parameter block arguments as a vector, list them as pointers.
+  ResidualBlockId AddResidualBlock(CostFunction* cost_function,
+                                   LossFunction* loss_function,
+                                   double* x0);
+  ResidualBlockId AddResidualBlock(CostFunction* cost_function,
+                                   LossFunction* loss_function,
+                                   double* x0, double* x1);
+  ResidualBlockId AddResidualBlock(CostFunction* cost_function,
+                                   LossFunction* loss_function,
+                                   double* x0, double* x1, double* x2);
+  ResidualBlockId AddResidualBlock(CostFunction* cost_function,
+                                   LossFunction* loss_function,
+                                   double* x0, double* x1, double* x2,
+                                   double* x3);
+  ResidualBlockId AddResidualBlock(CostFunction* cost_function,
+                                   LossFunction* loss_function,
+                                   double* x0, double* x1, double* x2,
+                                   double* x3, double* x4);
+  ResidualBlockId AddResidualBlock(CostFunction* cost_function,
+                                   LossFunction* loss_function,
+                                   double* x0, double* x1, double* x2,
+                                   double* x3, double* x4, double* x5);
+
+  // Add a parameter block with appropriate size to the problem.
+  // Repeated calls with the same arguments are ignored. Repeated
+  // calls with the same double pointer but a different size results
+  // in undefined behaviour.
+  void AddParameterBlock(double* values, int size);
+
+  // Add a parameter block with appropriate size and parameterization
+  // to the problem. Repeated calls with the same arguments are
+  // ignored. Repeated calls with the same double pointer but a
+  // different size results in undefined behaviour.
+  void AddParameterBlock(double* values,
+                         int size,
+                         LocalParameterization* local_parameterization);
+
+  // Hold the indicated parameter block constant during optimization.
+  void SetParameterBlockConstant(double* values);
+
+  // Allow the indicated parameter to vary during optimization.
+  void SetParameterBlockVariable(double* values);
+
+  // Set the local parameterization for one of the parameter blocks.
+  // The local_parameterization is owned by the Problem by default. It
+  // is acceptable to set the same parameterization for multiple
+  // parameters; the destructor is careful to delete local
+  // parameterizations only once. The local parameterization can only
+  // be set once per parameter, and cannot be changed once set.
+  void SetParameterization(double* values,
+                           LocalParameterization* local_parameterization);
+
+  // Number of parameter blocks in the problem. Always equals
+  // parameter_blocks().size() and parameter_block_sizes().size().
+  int NumParameterBlocks() const;
+
+  // The size of the parameter vector obtained by summing over the
+  // sizes of all the parameter blocks.
+  int NumParameters() const;
+
+  // Number of residual blocks in the problem. Always equals
+  // residual_blocks().size().
+  int NumResidualBlocks() const;
+
+  // The size of the residual vector obtained by summing over the
+  // sizes of all of the residual blocks.
+  int NumResiduals() const;
+
+ private:
+  friend class internal::SolverImpl;
+  internal::scoped_ptr<internal::ProblemImpl> problem_impl_;
+  DISALLOW_COPY_AND_ASSIGN(Problem);
+};
+
+}  // namespace ceres
+
+#endif  // CERES_PUBLIC_PROBLEM_H_
diff --git a/extern/libmv/third_party/ceres/include/ceres/rotation.h b/extern/libmv/third_party/ceres/include/ceres/rotation.h
new file mode 100644
index 00000000000..e4227e78b9a
--- /dev/null
+++ b/extern/libmv/third_party/ceres/include/ceres/rotation.h
@@ -0,0 +1,526 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//         sameeragarwal@google.com (Sameer Agarwal)
+//
+// Templated functions for manipulating rotations. The templated
+// functions are useful when implementing functors for automatic
+// differentiation.
+//
+// In the following, the Quaternions are laid out as 4-vectors, thus:
+//
+//   q[0]  scalar part.
+//   q[1]  coefficient of i.
+//   q[2]  coefficient of j.
+//   q[3]  coefficient of k.
+//
+// where: i*i = j*j = k*k = -1 and i*j = k, j*k = i, k*i = j.
+
+#ifndef CERES_PUBLIC_ROTATION_H_
+#define CERES_PUBLIC_ROTATION_H_
+
+#include <algorithm>
+#include <cmath>
+
+namespace ceres {
+
+// Convert a value in combined axis-angle representation to a quaternion.
+// The value angle_axis is a triple whose norm is an angle in radians,
+// and whose direction is aligned with the axis of rotation,
+// and quaternion is a 4-tuple that will contain the resulting quaternion.
+// The implementation may be used with auto-differentiation up to the first
+// derivative, higher derivatives may have unexpected results near the origin.
+template<typename T>
+void AngleAxisToQuaternion(T const* angle_axis, T* quaternion);
+
+// Convert a quaternion to the equivalent combined axis-angle representation.
+// The value quaternion must be a unit quaternion - it is not normalized first,
+// and angle_axis will be filled with a value whose norm is the angle of
+// rotation in radians, and whose direction is the axis of rotation.
+// The implemention may be used with auto-differentiation up to the first
+// derivative, higher derivatives may have unexpected results near the origin.
+template<typename T>
+void QuaternionToAngleAxis(T const* quaternion, T* angle_axis);
+
+// Conversions between 3x3 rotation matrix (in column major order) and
+// axis-angle rotation representations.  Templated for use with
+// autodifferentiation.
+template <typename T>
+void RotationMatrixToAngleAxis(T const * R, T * angle_axis);
+template <typename T>
+void AngleAxisToRotationMatrix(T const * angle_axis, T * R);
+
+// Conversions between 3x3 rotation matrix (in row major order) and
+// Euler angle (in degrees) rotation representations.
+//
+// The {pitch,roll,yaw} Euler angles are rotations around the {x,y,z}
+// axes, respectively.  They are applied in that same order, so the
+// total rotation R is Rz * Ry * Rx.
+template <typename T>
+void EulerAnglesToRotationMatrix(const T* euler, int row_stride, T* R);
+
+// Convert a 4-vector to a 3x3 scaled rotation matrix.
+//
+// The choice of rotation is such that the quaternion [1 0 0 0] goes to an
+// identity matrix and for small a, b, c the quaternion [1 a b c] goes to
+// the matrix
+//
+//         [  0 -c  b ]
+//   I + 2 [  c  0 -a ] + higher order terms
+//         [ -b  a  0 ]
+//
+// which corresponds to a Rodrigues approximation, the last matrix being
+// the cross-product matrix of [a b c]. Together with the property that
+// R(q1 * q2) = R(q1) * R(q2) this uniquely defines the mapping from q to R.
+//
+// The rotation matrix is row-major.
+//
+// No normalization of the quaternion is performed, i.e.
+// R = ||q||^2 * Q, where Q is an orthonormal matrix
+// such that det(Q) = 1 and Q*Q' = I
+template <typename T> inline
+void QuaternionToScaledRotation(const T q[4], T R[3 * 3]);
+
+// Same as above except that the rotation matrix is normalized by the
+// Frobenius norm, so that R * R' = I (and det(R) = 1).
+template <typename T> inline
+void QuaternionToRotation(const T q[4], T R[3 * 3]);
+
+// Rotates a point pt by a quaternion q:
+//
+//   result = R(q) * pt
+//
+// Assumes the quaternion is unit norm. This assumption allows us to
+// write the transform as (something)*pt + pt, as is clear from the
+// formula below. If you pass in a quaternion with |q|^2 = 2 then you
+// WILL NOT get back 2 times the result you get for a unit quaternion.
+template <typename T> inline
+void UnitQuaternionRotatePoint(const T q[4], const T pt[3], T result[3]);
+
+// With this function you do not need to assume that q has unit norm.
+// It does assume that the norm is non-zero.
+template <typename T> inline
+void QuaternionRotatePoint(const T q[4], const T pt[3], T result[3]);
+
+// zw = z * w, where * is the Quaternion product between 4 vectors.
+template<typename T> inline
+void QuaternionProduct(const T z[4], const T w[4], T zw[4]);
+
+// xy = x cross y;
+template<typename T> inline
+void CrossProduct(const T x[3], const T y[3], T x_cross_y[3]);
+
+template<typename T> inline
+T DotProduct(const T x[3], const T y[3]);
+
+// y = R(angle_axis) * x;
+template<typename T> inline
+void AngleAxisRotatePoint(const T angle_axis[3], const T pt[3], T result[3]);
+
+// --- IMPLEMENTATION
+
+// Duplicate rather than decorate every use of cmath with _USE_MATH_CONSTANTS.
+// Necessitated by Windows.
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#define CERES_NEED_M_PI_UNDEF
+#endif
+
+template<typename T>
+inline void AngleAxisToQuaternion(const T* angle_axis, T* quaternion) {
+  const T &a0 = angle_axis[0];
+  const T &a1 = angle_axis[1];
+  const T &a2 = angle_axis[2];
+  const T theta_squared = a0 * a0 + a1 * a1 + a2 * a2;
+
+  // For points not at the origin, the full conversion is numerically stable.
+  if (theta_squared > T(0.0)) {
+    const T theta = sqrt(theta_squared);
+    const T half_theta = theta * T(0.5);
+    const T k = sin(half_theta) / theta;
+    quaternion[0] = cos(half_theta);
+    quaternion[1] = a0 * k;
+    quaternion[2] = a1 * k;
+    quaternion[3] = a2 * k;
+  } else {
+    // At the origin, sqrt() will produce NaN in the derivative since
+    // the argument is zero.  By approximating with a Taylor series,
+    // and truncating at one term, the value and first derivatives will be
+    // computed correctly when Jets are used.
+    const T k(0.5);
+    quaternion[0] = T(1.0);
+    quaternion[1] = a0 * k;
+    quaternion[2] = a1 * k;
+    quaternion[3] = a2 * k;
+  }
+}
+
+template<typename T>
+inline void QuaternionToAngleAxis(const T* quaternion, T* angle_axis) {
+  const T &q1 = quaternion[1];
+  const T &q2 = quaternion[2];
+  const T &q3 = quaternion[3];
+  const T sin_squared = q1 * q1 + q2 * q2 + q3 * q3;
+
+  // For quaternions representing non-zero rotation, the conversion
+  // is numerically stable.
+  if (sin_squared > T(0.0)) {
+    const T sin_theta = sqrt(sin_squared);
+    const T k = T(2.0) * atan2(sin_theta, quaternion[0]) / sin_theta;
+    angle_axis[0] = q1 * k;
+    angle_axis[1] = q2 * k;
+    angle_axis[2] = q3 * k;
+  } else {
+    // For zero rotation, sqrt() will produce NaN in the derivative since
+    // the argument is zero.  By approximating with a Taylor series,
+    // and truncating at one term, the value and first derivatives will be
+    // computed correctly when Jets are used.
+    const T k(2.0);
+    angle_axis[0] = q1 * k;
+    angle_axis[1] = q2 * k;
+    angle_axis[2] = q3 * k;
+  }
+}
+
+// The conversion of a rotation matrix to the angle-axis form is
+// numerically problematic when then rotation angle is close to zero
+// or to Pi. The following implementation detects when these two cases
+// occurs and deals with them by taking code paths that are guaranteed
+// to not perform division by a small number.
+template <typename T>
+inline void RotationMatrixToAngleAxis(const T * R, T * angle_axis) {
+  // x = k * 2 * sin(theta), where k is the axis of rotation.
+  angle_axis[0] = R[5] - R[7];
+  angle_axis[1] = R[6] - R[2];
+  angle_axis[2] = R[1] - R[3];
+
+  static const T kOne = T(1.0);
+  static const T kTwo = T(2.0);
+
+  // Since the right hand side may give numbers just above 1.0 or
+  // below -1.0 leading to atan misbehaving, we threshold.
+  T costheta = std::min(std::max((R[0] + R[4] + R[8] - kOne) / kTwo,
+                                 T(-1.0)),
+                        kOne);
+
+  // sqrt is guaranteed to give non-negative results, so we only
+  // threshold above.
+  T sintheta = std::min(sqrt(angle_axis[0] * angle_axis[0] +
+                             angle_axis[1] * angle_axis[1] +
+                             angle_axis[2] * angle_axis[2]) / kTwo,
+                        kOne);
+
+  // Use the arctan2 to get the right sign on theta
+  const T theta = atan2(sintheta, costheta);
+
+  // Case 1: sin(theta) is large enough, so dividing by it is not a
+  // problem. We do not use abs here, because while jets.h imports
+  // std::abs into the namespace, here in this file, abs resolves to
+  // the int version of the function, which returns zero always.
+  //
+  // We use a threshold much larger then the machine epsilon, because
+  // if sin(theta) is small, not only do we risk overflow but even if
+  // that does not occur, just dividing by a small number will result
+  // in numerical garbage. So we play it safe.
+  static const double kThreshold = 1e-12;
+  if ((sintheta > kThreshold) || (sintheta < -kThreshold)) {
+    const T r = theta / (kTwo * sintheta);
+    for (int i = 0; i < 3; ++i) {
+      angle_axis[i] *= r;
+    }
+    return;
+  }
+
+  // Case 2: theta ~ 0, means sin(theta) ~ theta to a good
+  // approximation.
+  if (costheta > 0) {
+    const T kHalf = T(0.5);
+    for (int i = 0; i < 3; ++i) {
+      angle_axis[i] *= kHalf;
+    }
+    return;
+  }
+
+  // Case 3: theta ~ pi, this is the hard case. Since theta is large,
+  // and sin(theta) is small. Dividing by theta by sin(theta) will
+  // either give an overflow or worse still numerically meaningless
+  // results. Thus we use an alternate more complicated formula
+  // here.
+
+  // Since cos(theta) is negative, division by (1-cos(theta)) cannot
+  // overflow.
+  const T inv_one_minus_costheta = kOne / (kOne - costheta);
+
+  // We now compute the absolute value of coordinates of the axis
+  // vector using the diagonal entries of R. To resolve the sign of
+  // these entries, we compare the sign of angle_axis[i]*sin(theta)
+  // with the sign of sin(theta). If they are the same, then
+  // angle_axis[i] should be positive, otherwise negative.
+  for (int i = 0; i < 3; ++i) {
+    angle_axis[i] = theta * sqrt((R[i*4] - costheta) * inv_one_minus_costheta);
+    if (((sintheta < 0) && (angle_axis[i] > 0)) ||
+        ((sintheta > 0) && (angle_axis[i] < 0))) {
+      angle_axis[i] = -angle_axis[i];
+    }
+  }
+}
+
+template <typename T>
+inline void AngleAxisToRotationMatrix(const T * angle_axis, T * R) {
+  static const T kOne = T(1.0);
+  const T theta2 = DotProduct(angle_axis, angle_axis);
+  if (theta2 > 0.0) {
+    // We want to be careful to only evaluate the square root if the
+    // norm of the angle_axis vector is greater than zero. Otherwise
+    // we get a division by zero.
+    const T theta = sqrt(theta2);
+    const T wx = angle_axis[0] / theta;
+    const T wy = angle_axis[1] / theta;
+    const T wz = angle_axis[2] / theta;
+
+    const T costheta = cos(theta);
+    const T sintheta = sin(theta);
+
+    R[0] =     costheta   + wx*wx*(kOne -    costheta);
+    R[1] =  wz*sintheta   + wx*wy*(kOne -    costheta);
+    R[2] = -wy*sintheta   + wx*wz*(kOne -    costheta);
+    R[3] =  wx*wy*(kOne - costheta)     - wz*sintheta;
+    R[4] =     costheta   + wy*wy*(kOne -    costheta);
+    R[5] =  wx*sintheta   + wy*wz*(kOne -    costheta);
+    R[6] =  wy*sintheta   + wx*wz*(kOne -    costheta);
+    R[7] = -wx*sintheta   + wy*wz*(kOne -    costheta);
+    R[8] =     costheta   + wz*wz*(kOne -    costheta);
+  } else {
+    // At zero, we switch to using the first order Taylor expansion.
+    R[0] =  kOne;
+    R[1] = -angle_axis[2];
+    R[2] =  angle_axis[1];
+    R[3] =  angle_axis[2];
+    R[4] =  kOne;
+    R[5] = -angle_axis[0];
+    R[6] = -angle_axis[1];
+    R[7] =  angle_axis[0];
+    R[8] = kOne;
+  }
+}
+
+template <typename T>
+inline void EulerAnglesToRotationMatrix(const T* euler,
+                                        const int row_stride,
+                                        T* R) {
+  const T degrees_to_radians(M_PI / 180.0);
+
+  const T pitch(euler[0] * degrees_to_radians);
+  const T roll(euler[1] * degrees_to_radians);
+  const T yaw(euler[2] * degrees_to_radians);
+
+  const T c1 = cos(yaw);
+  const T s1 = sin(yaw);
+  const T c2 = cos(roll);
+  const T s2 = sin(roll);
+  const T c3 = cos(pitch);
+  const T s3 = sin(pitch);
+
+  // Rows of the rotation matrix.
+  T* R1 = R;
+  T* R2 = R1 + row_stride;
+  T* R3 = R2 + row_stride;
+
+  R1[0] = c1*c2;
+  R1[1] = -s1*c3 + c1*s2*s3;
+  R1[2] = s1*s3 + c1*s2*c3;
+
+  R2[0] = s1*c2;
+  R2[1] = c1*c3 + s1*s2*s3;
+  R2[2] = -c1*s3 + s1*s2*c3;
+
+  R3[0] = -s2;
+  R3[1] = c2*s3;
+  R3[2] = c2*c3;
+}
+
+template <typename T> inline
+void QuaternionToScaledRotation(const T q[4], T R[3 * 3]) {
+  // Make convenient names for elements of q.
+  T a = q[0];
+  T b = q[1];
+  T c = q[2];
+  T d = q[3];
+  // This is not to eliminate common sub-expression, but to
+  // make the lines shorter so that they fit in 80 columns!
+  T aa = a * a;
+  T ab = a * b;
+  T ac = a * c;
+  T ad = a * d;
+  T bb = b * b;
+  T bc = b * c;
+  T bd = b * d;
+  T cc = c * c;
+  T cd = c * d;
+  T dd = d * d;
+
+  R[0] =  aa + bb - cc - dd; R[1] = T(2) * (bc - ad); R[2] = T(2) * (ac + bd);  // NOLINT
+  R[3] = T(2) * (ad + bc); R[4] =  aa - bb + cc - dd; R[5] = T(2) * (cd - ab);  // NOLINT
+  R[6] = T(2) * (bd - ac); R[7] = T(2) * (ab + cd); R[8] =  aa - bb - cc + dd;  // NOLINT
+}
+
+template <typename T> inline
+void QuaternionToRotation(const T q[4], T R[3 * 3]) {
+  QuaternionToScaledRotation(q, R);
+
+  T normalizer = q[0]*q[0] + q[1]*q[1] + q[2]*q[2] + q[3]*q[3];
+  CHECK_NE(normalizer, T(0));
+  normalizer = T(1) / normalizer;
+
+  for (int i = 0; i < 9; ++i) {
+    R[i] *= normalizer;
+  }
+}
+
+template <typename T> inline
+void UnitQuaternionRotatePoint(const T q[4], const T pt[3], T result[3]) {
+  const T t2 =  q[0] * q[1];
+  const T t3 =  q[0] * q[2];
+  const T t4 =  q[0] * q[3];
+  const T t5 = -q[1] * q[1];
+  const T t6 =  q[1] * q[2];
+  const T t7 =  q[1] * q[3];
+  const T t8 = -q[2] * q[2];
+  const T t9 =  q[2] * q[3];
+  const T t1 = -q[3] * q[3];
+  result[0] = T(2) * ((t8 + t1) * pt[0] + (t6 - t4) * pt[1] + (t3 + t7) * pt[2]) + pt[0];  // NOLINT
+  result[1] = T(2) * ((t4 + t6) * pt[0] + (t5 + t1) * pt[1] + (t9 - t2) * pt[2]) + pt[1];  // NOLINT
+  result[2] = T(2) * ((t7 - t3) * pt[0] + (t2 + t9) * pt[1] + (t5 + t8) * pt[2]) + pt[2];  // NOLINT
+}
+
+
+template <typename T> inline
+void QuaternionRotatePoint(const T q[4], const T pt[3], T result[3]) {
+  // 'scale' is 1 / norm(q).
+  const T scale = T(1) / sqrt(q[0] * q[0] +
+                              q[1] * q[1] +
+                              q[2] * q[2] +
+                              q[3] * q[3]);
+
+  // Make unit-norm version of q.
+  const T unit[4] = {
+    scale * q[0],
+    scale * q[1],
+    scale * q[2],
+    scale * q[3],
+  };
+
+  UnitQuaternionRotatePoint(unit, pt, result);
+}
+
+template<typename T> inline
+void QuaternionProduct(const T z[4], const T w[4], T zw[4]) {
+  zw[0] = z[0] * w[0] - z[1] * w[1] - z[2] * w[2] - z[3] * w[3];
+  zw[1] = z[0] * w[1] + z[1] * w[0] + z[2] * w[3] - z[3] * w[2];
+  zw[2] = z[0] * w[2] - z[1] * w[3] + z[2] * w[0] + z[3] * w[1];
+  zw[3] = z[0] * w[3] + z[1] * w[2] - z[2] * w[1] + z[3] * w[0];
+}
+
+// xy = x cross y;
+template<typename T> inline
+void CrossProduct(const T x[3], const T y[3], T x_cross_y[3]) {
+  x_cross_y[0] = x[1] * y[2] - x[2] * y[1];
+  x_cross_y[1] = x[2] * y[0] - x[0] * y[2];
+  x_cross_y[2] = x[0] * y[1] - x[1] * y[0];
+}
+
+template<typename T> inline
+T DotProduct(const T x[3], const T y[3]) {
+  return (x[0] * y[0] + x[1] * y[1] + x[2] * y[2]);
+}
+
+template<typename T> inline
+void AngleAxisRotatePoint(const T angle_axis[3], const T pt[3], T result[3]) {
+  T w[3];
+  T sintheta;
+  T costheta;
+
+  const T theta2 = DotProduct(angle_axis, angle_axis);
+  if (theta2 > 0.0) {
+    // Away from zero, use the rodriguez formula
+    //
+    //   result = pt costheta +
+    //            (w x pt) * sintheta +
+    //            w (w . pt) (1 - costheta)
+    //
+    // We want to be careful to only evaluate the square root if the
+    // norm of the angle_axis vector is greater than zero. Otherwise
+    // we get a division by zero.
+    //
+    const T theta = sqrt(theta2);
+    w[0] = angle_axis[0] / theta;
+    w[1] = angle_axis[1] / theta;
+    w[2] = angle_axis[2] / theta;
+    costheta = cos(theta);
+    sintheta = sin(theta);
+    T w_cross_pt[3];
+    CrossProduct(w, pt, w_cross_pt);
+    T w_dot_pt = DotProduct(w, pt);
+    for (int i = 0; i < 3; ++i) {
+      result[i] = pt[i] * costheta +
+          w_cross_pt[i] * sintheta +
+          w[i] * (T(1.0) - costheta) * w_dot_pt;
+    }
+  } else {
+    // Near zero, the first order Taylor approximation of the rotation
+    // matrix R corresponding to a vector w and angle w is
+    //
+    //   R = I + hat(w) * sin(theta)
+    //
+    // But sintheta ~ theta and theta * w = angle_axis, which gives us
+    //
+    //  R = I + hat(w)
+    //
+    // and actually performing multiplication with the point pt, gives us
+    // R * pt = pt + w x pt.
+    //
+    // Switching to the Taylor expansion at zero helps avoid all sorts
+    // of numerical nastiness.
+    T w_cross_pt[3];
+    CrossProduct(angle_axis, pt, w_cross_pt);
+    for (int i = 0; i < 3; ++i) {
+      result[i] = pt[i] + w_cross_pt[i];
+    }
+  }
+}
+
+}  // namespace ceres
+
+// Clean define pollution.
+#ifdef CERES_NEED_M_PI_UNDEF
+#undef CERES_NEED_M_PI_UNDEF
+#undef M_PI
+#endif
+
+#endif  // CERES_PUBLIC_ROTATION_H_
diff --git a/extern/libmv/third_party/ceres/include/ceres/sized_cost_function.h b/extern/libmv/third_party/ceres/include/ceres/sized_cost_function.h
new file mode 100644
index 00000000000..2894a9fba5c
--- /dev/null
+++ b/extern/libmv/third_party/ceres/include/ceres/sized_cost_function.h
@@ -0,0 +1,88 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//
+// A convenience class for cost functions which are statically sized.
+// Compared to the dynamically-sized base class, this reduces boilerplate.
+//
+// The kNumResiduals template parameter can be a constant such as 2 or 5, or it
+// can be ceres::DYNAMIC. If kNumResiduals is ceres::DYNAMIC, then subclasses
+// are responsible for calling set_num_residuals() at runtime.
+
+#ifndef CERES_PUBLIC_SIZED_COST_FUNCTION_H_
+#define CERES_PUBLIC_SIZED_COST_FUNCTION_H_
+
+#include <glog/logging.h>
+#include "ceres/types.h"
+#include "ceres/cost_function.h"
+
+namespace ceres {
+
+template<int kNumResiduals,
+         int N0 = 0, int N1 = 0, int N2 = 0, int N3 = 0, int N4 = 0, int N5 = 0>
+class SizedCostFunction : public CostFunction {
+ public:
+  SizedCostFunction() {
+    // Sanity checking.
+    CHECK(kNumResiduals > 0 || kNumResiduals == DYNAMIC)
+        << "Cost functions must have at least one residual block.";
+
+    CHECK_GT(N0, 0)
+        << "Cost functions must have at least one parameter block.";
+    CHECK((!N1 && !N2 && !N3 && !N4 && !N5) ||
+           ((N1 > 0) && !N2 && !N3 && !N4 && !N5) ||
+           ((N1 > 0) && (N2 > 0) && !N3 && !N4 && !N5) ||
+           ((N1 > 0) && (N2 > 0) && (N3 > 0) && !N4 && !N5) ||
+           ((N1 > 0) && (N2 > 0) && (N3 > 0) && (N4 > 0) && !N5) ||
+           ((N1 > 0) && (N2 > 0) && (N3 > 0) && (N4 > 0) && (N5 > 0)))
+        << "Zero block cannot precede a non-zero block. Block sizes are "
+        << "(ignore trailing 0s): " << N0 << ", " << N1 << ", " << N2 << ", "
+        << N3 << ", " << N4 << ", " << N5;
+
+    set_num_residuals(kNumResiduals);
+
+#define ADD_PARAMETER_BLOCK(N) \
+    if (N) mutable_parameter_block_sizes()->push_back(N);
+    ADD_PARAMETER_BLOCK(N0);
+    ADD_PARAMETER_BLOCK(N1);
+    ADD_PARAMETER_BLOCK(N2);
+    ADD_PARAMETER_BLOCK(N3);
+    ADD_PARAMETER_BLOCK(N4);
+    ADD_PARAMETER_BLOCK(N5);
+#undef ADD_PARAMETER_BLOCK
+  }
+
+  virtual ~SizedCostFunction() { }
+
+  // Subclasses must implement Evaluate().
+};
+
+}  // namespace ceres
+
+#endif  // CERES_PUBLIC_SIZED_COST_FUNCTION_H_
diff --git a/extern/libmv/third_party/ceres/include/ceres/solver.h b/extern/libmv/third_party/ceres/include/ceres/solver.h
new file mode 100644
index 00000000000..bd669272023
--- /dev/null
+++ b/extern/libmv/third_party/ceres/include/ceres/solver.h
@@ -0,0 +1,376 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#ifndef CERES_PUBLIC_SOLVER_H_
+#define CERES_PUBLIC_SOLVER_H_
+
+#include <cmath>
+#include <string>
+#include <vector>
+
+#include "ceres/iteration_callback.h"
+#include "ceres/internal/macros.h"
+#include "ceres/internal/port.h"
+#include "ceres/types.h"
+
+namespace ceres {
+
+class Problem;
+
+// Interface for non-linear least squares solvers.
+class Solver {
+ public:
+  virtual ~Solver();
+
+  // The options structure contains, not surprisingly, options that control how
+  // the solver operates. The defaults should be suitable for a wide range of
+  // problems; however, better performance is often obtainable with tweaking.
+  //
+  // The constants are defined inside types.h
+  struct Options {
+    // Default constructor that sets up a generic sparse problem.
+    Options() {
+      minimizer_type = LEVENBERG_MARQUARDT;
+      max_num_iterations = 50;
+      max_solver_time_sec = 1.0e9;
+      num_threads = 1;
+      tau = 1e-4;
+      min_relative_decrease = 1e-3;
+      function_tolerance = 1e-6;
+      gradient_tolerance = 1e-10;
+      parameter_tolerance = 1e-8;
+#ifndef CERES_NO_SUITESPARSE
+      linear_solver_type = SPARSE_NORMAL_CHOLESKY;
+#else
+      linear_solver_type = DENSE_QR;
+#endif  // CERES_NO_SUITESPARSE
+      preconditioner_type = JACOBI;
+      num_linear_solver_threads = 1;
+      num_eliminate_blocks = 0;
+      ordering_type = NATURAL;
+      linear_solver_min_num_iterations = 1;
+      linear_solver_max_num_iterations = 500;
+      eta = 1e-1;
+      jacobi_scaling = true;
+      logging_type = PER_MINIMIZER_ITERATION;
+      minimizer_progress_to_stdout = false;
+      return_initial_residuals = false;
+      return_final_residuals = false;
+      lsqp_dump_directory = "/tmp";
+      lsqp_dump_format_type = TEXTFILE;
+      crash_and_dump_lsqp_on_failure = false;
+      check_gradients = false;
+      gradient_check_relative_precision = 1e-8;
+      numeric_derivative_relative_step_size = 1e-6;
+      update_state_every_iteration = false;
+    }
+
+    // Minimizer options ----------------------------------------
+
+    MinimizerType minimizer_type;
+
+    // Maximum number of iterations for the minimizer to run for.
+    int max_num_iterations;
+
+    // Maximum time for which the minimizer should run for.
+    double max_solver_time_sec;
+
+    // Number of threads used by Ceres for evaluating the cost and
+    // jacobians.
+    int num_threads;
+
+    // For Levenberg-Marquardt, the initial value for the
+    // regularizer. This is the inversely related to the size of the
+    // initial trust region.
+    double tau;
+
+    // For trust region methods, this is lower threshold for the
+    // relative decrease before a step is accepted.
+    double min_relative_decrease;
+
+    // Minimizer terminates when
+    //
+    //   (new_cost - old_cost) < function_tolerance * old_cost;
+    //
+    double function_tolerance;
+
+    // Minimizer terminates when
+    //
+    //   max_i |gradient_i| < gradient_tolerance * max_i|initial_gradient_i|
+    //
+    // This value should typically be 1e-4 * function_tolerance.
+    double gradient_tolerance;
+
+    // Minimizer terminates when
+    //
+    //   |step|_2 <= parameter_tolerance * ( |x|_2 +  parameter_tolerance)
+    //
+    double parameter_tolerance;
+
+    // Linear least squares solver options -------------------------------------
+
+    LinearSolverType linear_solver_type;
+
+    // Type of preconditioner to use with the iterative linear solvers.
+    PreconditionerType preconditioner_type;
+
+    // Number of threads used by Ceres to solve the Newton
+    // step. Currently only the SPARSE_SCHUR solver is capable of
+    // using this setting.
+    int num_linear_solver_threads;
+
+    // For Schur reduction based methods, the first 0 to num blocks are
+    // eliminated using the Schur reduction. For example, when solving
+    // traditional structure from motion problems where the parameters are in
+    // two classes (cameras and points) then num_eliminate_blocks would be the
+    // number of points.
+    //
+    // This parameter is used in conjunction with the ordering.
+    // Applies to: Preprocessor and linear least squares solver.
+    int num_eliminate_blocks;
+
+    // Internally Ceres reorders the parameter blocks to help the
+    // various linear solvers. This parameter allows the user to
+    // influence the re-ordering strategy used. For structure from
+    // motion problems use SCHUR, for other problems NATURAL (default)
+    // is a good choice. In case you wish to specify your own ordering
+    // scheme, for example in conjunction with num_eliminate_blocks,
+    // use USER.
+    OrderingType ordering_type;
+
+    // The ordering of the parameter blocks. The solver pays attention
+    // to it if the ordering_type is set to USER and the vector is
+    // non-empty.
+    vector<double*> ordering;
+
+
+    // Minimum number of iterations for which the linear solver should
+    // run, even if the convergence criterion is satisfied.
+    int linear_solver_min_num_iterations;
+
+    // Maximum number of iterations for which the linear solver should
+    // run. If the solver does not converge in less than
+    // linear_solver_max_num_iterations, then it returns
+    // MAX_ITERATIONS, as its termination type.
+    int linear_solver_max_num_iterations;
+
+    // Forcing sequence parameter. The truncated Newton solver uses
+    // this number to control the relative accuracy with which the
+    // Newton step is computed.
+    //
+    // This constant is passed to ConjugateGradientsSolver which uses
+    // it to terminate the iterations when
+    //
+    //  (Q_i - Q_{i-1})/Q_i < eta/i
+    double eta;
+
+    // Normalize the jacobian using Jacobi scaling before calling
+    // the linear least squares solver.
+    bool jacobi_scaling;
+
+    // Logging options ---------------------------------------------------------
+
+    LoggingType logging_type;
+
+    // By default the Minimizer progress is logged to VLOG(1), which
+    // is sent to STDERR depending on the vlog level. If this flag is
+    // set to true, and logging_type is not SILENT, the logging output
+    // is sent to STDOUT.
+    bool minimizer_progress_to_stdout;
+
+    bool return_initial_residuals;
+    bool return_final_residuals;
+
+    // List of iterations at which the optimizer should dump the
+    // linear least squares problem to disk. Useful for testing and
+    // benchmarking. If empty (default), no problems are dumped.
+    //
+    // This is ignored if protocol buffers are disabled.
+    vector<int> lsqp_iterations_to_dump;
+    string lsqp_dump_directory;
+    DumpFormatType lsqp_dump_format_type;
+
+    // Dump the linear least squares problem to disk if the minimizer
+    // fails due to NUMERICAL_FAILURE and crash the process. This flag
+    // is useful for generating debugging information. The problem is
+    // dumped in a file whose name is determined by
+    // Solver::Options::lsqp_dump_format.
+    //
+    // Note: This requires a version of Ceres built with protocol buffers.
+    bool crash_and_dump_lsqp_on_failure;
+
+    // Finite differences options ----------------------------------------------
+
+    // Check all jacobians computed by each residual block with finite
+    // differences. This is expensive since it involves computing the
+    // derivative by normal means (e.g. user specified, autodiff,
+    // etc), then also computing it using finite differences. The
+    // results are compared, and if they differ substantially, details
+    // are printed to the log.
+    bool check_gradients;
+
+    // Relative precision to check for in the gradient checker. If the
+    // relative difference between an element in a jacobian exceeds
+    // this number, then the jacobian for that cost term is dumped.
+    double gradient_check_relative_precision;
+
+    // Relative shift used for taking numeric derivatives. For finite
+    // differencing, each dimension is evaluated at slightly shifted
+    // values; for the case of central difference, this is what gets
+    // evaluated:
+    //
+    //   delta = numeric_derivative_relative_step_size;
+    //   f_initial  = f(x)
+    //   f_forward  = f((1 + delta) * x)
+    //   f_backward = f((1 - delta) * x)
+    //
+    // The finite differencing is done along each dimension. The
+    // reason to use a relative (rather than absolute) step size is
+    // that this way, numeric differentation works for functions where
+    // the arguments are typically large (e.g. 1e9) and when the
+    // values are small (e.g. 1e-5). It is possible to construct
+    // "torture cases" which break this finite difference heuristic,
+    // but they do not come up often in practice.
+    //
+    // TODO(keir): Pick a smarter number than the default above! In
+    // theory a good choice is sqrt(eps) * x, which for doubles means
+    // about 1e-8 * x. However, I have found this number too
+    // optimistic. This number should be exposed for users to change.
+    double numeric_derivative_relative_step_size;
+
+    // If true, the user's parameter blocks are updated at the end of
+    // every Minimizer iteration, otherwise they are updated when the
+    // Minimizer terminates. This is useful if, for example, the user
+    // wishes to visualize the state of the optimization every
+    // iteration.
+    bool update_state_every_iteration;
+
+    // Callbacks that are executed at the end of each iteration of the
+    // Minimizer. They are executed in the order that they are
+    // specified in this vector. By default, parameter blocks are
+    // updated only at the end of the optimization, i.e when the
+    // Minimizer terminates. This behaviour is controlled by
+    // update_state_every_variable. If the user wishes to have access
+    // to the update parameter blocks when his/her callbacks are
+    // executed, then set update_state_every_iteration to true.
+    //
+    // The solver does NOT take ownership of these pointers.
+    vector<IterationCallback*> callbacks;
+  };
+
+  struct Summary {
+    Summary();
+
+    // A brief one line description of the state of the solver after
+    // termination.
+    string BriefReport() const;
+
+    // A full multiline description of the state of the solver after
+    // termination.
+    string FullReport() const;
+
+    // Minimizer summary -------------------------------------------------
+    SolverTerminationType termination_type;
+
+    // If the solver did not run, or there was a failure, a
+    // description of the error.
+    string error;
+
+    // Cost of the problem before and after the optimization. See
+    // problem.h for definition of the cost of a problem.
+    double initial_cost;
+    double final_cost;
+
+    // The part of the total cost that comes from residual blocks that
+    // were held fixed by the preprocessor because all the parameter
+    // blocks that they depend on were fixed.
+    double fixed_cost;
+
+    // Residuals before and after the optimization. Each vector
+    // contains problem.NumResiduals() elements. Residuals are in the
+    // same order in which they were added to the problem object when
+    // constructing this problem.
+    vector<double> initial_residuals;
+    vector<double> final_residuals;
+
+    vector<IterationSummary> iterations;
+
+    int num_successful_steps;
+    int num_unsuccessful_steps;
+
+    double preprocessor_time_in_seconds;
+    double minimizer_time_in_seconds;
+    double total_time_in_seconds;
+
+    // Preprocessor summary.
+    int num_parameter_blocks;
+    int num_parameters;
+    int num_residual_blocks;
+    int num_residuals;
+
+    int num_parameter_blocks_reduced;
+    int num_parameters_reduced;
+    int num_residual_blocks_reduced;
+    int num_residuals_reduced;
+
+    int num_eliminate_blocks_given;
+    int num_eliminate_blocks_used;
+
+    int num_threads_given;
+    int num_threads_used;
+
+    int num_linear_solver_threads_given;
+    int num_linear_solver_threads_used;
+
+    LinearSolverType linear_solver_type_given;
+    LinearSolverType linear_solver_type_used;
+
+    PreconditionerType preconditioner_type;
+    OrderingType ordering_type;
+  };
+
+  // Once a least squares problem has been built, this function takes
+  // the problem and optimizes it based on the values of the options
+  // parameters. Upon return, a detailed summary of the work performed
+  // by the preprocessor, the non-linear minmizer and the linear
+  // solver are reported in the summary object.
+  virtual void Solve(const Options& options,
+                     Problem* problem,
+                     Solver::Summary* summary);
+};
+
+// Helper function which avoids going through the interface.
+void Solve(const Solver::Options& options,
+           Problem* problem,
+           Solver::Summary* summary);
+
+}  // namespace ceres
+
+#endif  // CERES_PUBLIC_SOLVER_H_
diff --git a/extern/libmv/third_party/ceres/include/ceres/types.h b/extern/libmv/third_party/ceres/include/ceres/types.h
new file mode 100644
index 00000000000..a30c79029ac
--- /dev/null
+++ b/extern/libmv/third_party/ceres/include/ceres/types.h
@@ -0,0 +1,258 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Enums and other top level class definitions.
+//
+// Note: internal/types.cc defines stringification routines for some
+// of these enums. Please update those routines if you extend or
+// remove enums from here.
+
+#ifndef CERES_PUBLIC_TYPES_H_
+#define CERES_PUBLIC_TYPES_H_
+
+namespace ceres {
+
+// Basic integer types. These typedefs are in the Ceres namespace to avoid
+// conflicts with other packages having similar typedefs.
+typedef short int16;
+typedef int   int32;
+
+// Argument type used in interfaces that can optionally take ownership
+// of a passed in argument. If TAKE_OWNERSHIP is passed, the called
+// object takes ownership of the pointer argument, and will call
+// delete on it upon completion.
+enum Ownership {
+  DO_NOT_TAKE_OWNERSHIP,
+  TAKE_OWNERSHIP
+};
+
+// TODO(keir): Considerably expand the explanations of each solver type.
+enum LinearSolverType {
+  // These solvers are for general rectangular systems formed from the
+  // normal equations A'A x = A'b. They are direct solvers and do not
+  // assume any special problem structure.
+
+  // Solve the normal equations using a sparse cholesky solver; based
+  // on CHOLMOD.
+  SPARSE_NORMAL_CHOLESKY,
+
+  // Solve the normal equations using a dense QR solver; based on
+  // Eigen.
+  DENSE_QR,
+
+  // Specialized solvers, specific to problems with a generalized
+  // bi-partitite structure.
+
+  // Solves the reduced linear system using a dense Cholesky solver;
+  // based on Eigen.
+  DENSE_SCHUR,
+
+  // Solves the reduced linear system using a sparse Cholesky solver;
+  // based on CHOLMOD.
+  SPARSE_SCHUR,
+
+  // Solves the reduced linear system using Conjugate Gradients, based
+  // on a new Ceres implementation.  Suitable for large scale
+  // problems.
+  ITERATIVE_SCHUR,
+
+  // Conjugate gradients on the normal equations.
+  CGNR
+};
+
+enum PreconditionerType {
+  // Trivial preconditioner - the identity matrix.
+  IDENTITY,
+
+  // Block diagonal of the Gauss-Newton Hessian.
+  JACOBI,
+
+  // Block diagonal of the Schur complement. This preconditioner may
+  // only be used with the ITERATIVE_SCHUR solver. Requires
+  // SuiteSparse/CHOLMOD.
+  SCHUR_JACOBI,
+
+  // Visibility clustering based preconditioners.
+  //
+  // These preconditioners are well suited for Structure from Motion
+  // problems, particularly problems arising from community photo
+  // collections. These preconditioners use the visibility structure
+  // of the scene to determine the sparsity structure of the
+  // preconditioner. Requires SuiteSparse/CHOLMOD.
+  CLUSTER_JACOBI,
+  CLUSTER_TRIDIAGONAL
+};
+
+enum LinearSolverTerminationType {
+  // Termination criterion was met. For factorization based solvers
+  // the tolerance is assumed to be zero. Any user provided values are
+  // ignored.
+  TOLERANCE,
+
+  // Solver ran for max_num_iterations and terminated before the
+  // termination tolerance could be satified.
+  MAX_ITERATIONS,
+
+  // Solver is stuck and further iterations will not result in any
+  // measurable progress.
+  STAGNATION,
+
+  // Solver failed. Solver was terminated due to numerical errors. The
+  // exact cause of failure depends on the particular solver being
+  // used.
+  FAILURE
+};
+
+enum OrderingType {
+  // The order in which the parameter blocks were defined.
+  NATURAL,
+
+  // Use the ordering specificed in the vector ordering.
+  USER,
+
+  // Automatically figure out the best ordering to use the schur
+  // complement based solver.
+  SCHUR
+};
+
+// Logging options
+// The options get progressively noisier.
+enum LoggingType {
+  SILENT,
+  PER_MINIMIZER_ITERATION
+};
+
+enum MinimizerType {
+  LEVENBERG_MARQUARDT
+};
+
+enum SolverTerminationType {
+  // The minimizer did not run at all; usually due to errors in the user's
+  // Problem or the solver options.
+  DID_NOT_RUN,
+
+  // The solver ran for maximum number of iterations specified by the
+  // user, but none of the convergence criterion specified by the user
+  // were met.
+  NO_CONVERGENCE,
+
+  // Minimizer terminated because
+  //  (new_cost - old_cost) < function_tolerance * old_cost;
+  FUNCTION_TOLERANCE,
+
+  // Minimizer terminated because
+  // max_i |gradient_i| < gradient_tolerance * max_i|initial_gradient_i|
+  GRADIENT_TOLERANCE,
+
+  // Minimized terminated because
+  //  |step|_2 <= parameter_tolerance * ( |x|_2 +  parameter_tolerance)
+  PARAMETER_TOLERANCE,
+
+  // The minimizer terminated because it encountered a numerical error
+  // that it could not recover from.
+  NUMERICAL_FAILURE,
+
+  // Using an IterationCallback object, user code can control the
+  // minimizer. The following enums indicate that the user code was
+  // responsible for termination.
+
+  // User's IterationCallback returned SOLVER_ABORT.
+  USER_ABORT,
+
+  // User's IterationCallback returned SOLVER_TERMINATE_SUCCESSFULLY
+  USER_SUCCESS
+};
+
+// Enums used by the IterationCallback instances to indicate to the
+// solver whether it should continue solving, the user detected an
+// error or the solution is good enough and the solver should
+// terminate.
+enum CallbackReturnType {
+  // Continue solving to next iteration.
+  SOLVER_CONTINUE,
+
+  // Terminate solver, and do not update the parameter blocks upon
+  // return. Unless the user has set
+  // Solver:Options:::update_state_every_iteration, in which case the
+  // state would have been updated every iteration
+  // anyways. Solver::Summary::termination_type is set to USER_ABORT.
+  SOLVER_ABORT,
+
+  // Terminate solver, update state and
+  // return. Solver::Summary::termination_type is set to USER_SUCCESS.
+  SOLVER_TERMINATE_SUCCESSFULLY
+};
+
+// The format in which linear least squares problems should be logged
+// when Solver::Options::lsqp_iterations_to_dump is non-empty.
+enum DumpFormatType {
+  // Print the linear least squares problem in a human readable format
+  // to stderr. The Jacobian is printed as a dense matrix. The vectors
+  // D, x and f are printed as dense vectors. This should only be used
+  // for small problems.
+  CONSOLE,
+
+  // Write out the linear least squares problem to the directory
+  // pointed to by Solver::Options::lsqp_dump_directory as a protocol
+  // buffer. linear_least_squares_problems.h/cc contains routines for
+  // loading these problems. For details on the on disk format used,
+  // see matrix.proto. The files are named lm_iteration_???.lsqp.
+  PROTOBUF,
+
+  // Write out the linear least squares problem to the directory
+  // pointed to by Solver::Options::lsqp_dump_directory as text files
+  // which can be read into MATLAB/Octave. The Jacobian is dumped as a
+  // text file containing (i,j,s) triplets, the vectors D, x and f are
+  // dumped as text files containing a list of their values.
+  //
+  // A MATLAB/octave script called lm_iteration_???.m is also output,
+  // which can be used to parse and load the problem into memory.
+  TEXTFILE
+};
+
+// For SizedCostFunction and AutoDiffCostFunction, DYNAMIC can be specified for
+// the number of residuals. If specified, then the number of residuas for that
+// cost function can vary at runtime.
+enum DimensionType {
+  DYNAMIC = -1
+};
+
+const char* LinearSolverTypeToString(LinearSolverType type);
+const char* PreconditionerTypeToString(PreconditionerType type);
+const char* LinearSolverTerminationTypeToString(
+    LinearSolverTerminationType type);
+const char* OrderingTypeToString(OrderingType type);
+const char* SolverTerminationTypeToString(SolverTerminationType type);
+
+bool IsSchurType(LinearSolverType type);
+
+}  // namespace ceres
+
+#endif  // CERES_PUBLIC_TYPES_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_evaluate_preparer.cc b/extern/libmv/third_party/ceres/internal/ceres/block_evaluate_preparer.cc
new file mode 100644
index 00000000000..05e63eb560b
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/block_evaluate_preparer.cc
@@ -0,0 +1,73 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+
+#include "ceres/block_evaluate_preparer.h"
+
+#include <vector>
+#include "ceres/block_sparse_matrix.h"
+#include "ceres/casts.h"
+#include "ceres/parameter_block.h"
+#include "ceres/residual_block.h"
+#include "ceres/sparse_matrix.h"
+
+namespace ceres {
+namespace internal {
+
+void BlockEvaluatePreparer::Init(int** jacobian_layout) {
+  jacobian_layout_ = jacobian_layout;
+}
+
+// Point the jacobian blocks directly into the block sparse matrix.
+void BlockEvaluatePreparer::Prepare(const ResidualBlock* residual_block,
+                                    int residual_block_index,
+                                    SparseMatrix* jacobian,
+                                    double** jacobians) const {
+  CHECK(jacobian != NULL);
+  double* jacobian_values =
+      down_cast<BlockSparseMatrix*>(jacobian)->mutable_values();
+
+  const int* jacobian_block_offset = jacobian_layout_[residual_block_index];
+  const int num_parameter_blocks = residual_block->NumParameterBlocks();
+  for (int j = 0; j < num_parameter_blocks; ++j) {
+    if (!residual_block->parameter_blocks()[j]->IsConstant()) {
+      jacobians[j] = jacobian_values + *jacobian_block_offset;
+
+      // The jacobian_block_offset can't be indexed with 'j' since the code
+      // that creates the layout strips out any blocks for inactive
+      // parameters. Instead, bump the pointer for active parameters only.
+      jacobian_block_offset++;
+    } else {
+      jacobians[j] = NULL;
+    }
+  }
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_evaluate_preparer.h b/extern/libmv/third_party/ceres/internal/ceres/block_evaluate_preparer.h
new file mode 100644
index 00000000000..a7869311e6e
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/block_evaluate_preparer.h
@@ -0,0 +1,67 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//
+// A evaluate preparer which puts jacobian the evaluated jacobian blocks
+// directly into their final resting place in an overall block sparse matrix.
+// The evaluator takes care to avoid evaluating the jacobian for fixed
+// parameters.
+
+#ifndef CERES_INTERNAL_BLOCK_EVALUATE_PREPARER_H_
+#define CERES_INTERNAL_BLOCK_EVALUATE_PREPARER_H_
+
+namespace ceres {
+namespace internal {
+
+class ResidualBlock;
+class SparseMatrix;
+
+class BlockEvaluatePreparer {
+ public:
+  // Using Init() instead of a constructor allows for allocating this structure
+  // with new[]. This is because C++ doesn't allow passing arguments to objects
+  // constructed with new[] (as opposed to plain 'new').
+  void Init(int** jacobian_layout);
+
+  // EvaluatePreparer interface
+
+  // Point the jacobian blocks directly into the block sparse matrix.
+  void Prepare(const ResidualBlock* residual_block,
+               int residual_block_index,
+               SparseMatrix* jacobian,
+               double** jacobians) const;
+
+ private:
+  int const* const* jacobian_layout_;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_BLOCK_EVALUATE_PREPARER_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.cc b/extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.cc
new file mode 100644
index 00000000000..1a5001f9c71
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.cc
@@ -0,0 +1,136 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+
+#include "ceres/block_jacobi_preconditioner.h"
+
+#include "Eigen/Cholesky"
+#include "ceres/block_sparse_matrix.h"
+#include "ceres/block_structure.h"
+#include "ceres/casts.h"
+#include "ceres/integral_types.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+BlockJacobiPreconditioner::BlockJacobiPreconditioner(
+    const LinearOperator& A)
+    : block_structure_(
+        *(down_cast<const BlockSparseMatrix*>(&A)->block_structure())),
+      num_rows_(A.num_rows()) {
+  // Calculate the amount of storage needed.
+  int storage_needed = 0;
+  for (int c = 0; c < block_structure_.cols.size(); ++c) {
+    int size = block_structure_.cols[c].size;
+    storage_needed += size * size;
+  }
+
+  // Size the offsets and storage.
+  blocks_.resize(block_structure_.cols.size());
+  block_storage_.resize(storage_needed);
+
+  // Put pointers to the storage in the offsets.
+  double* block_cursor = &block_storage_[0];
+  for (int c = 0; c < block_structure_.cols.size(); ++c) {
+    int size = block_structure_.cols[c].size;
+    blocks_[c] = block_cursor;
+    block_cursor += size * size;
+  }
+}
+
+BlockJacobiPreconditioner::~BlockJacobiPreconditioner() {
+}
+
+void BlockJacobiPreconditioner::Update(const LinearOperator& matrix, const double* D) {
+  const BlockSparseMatrix& A = *(down_cast<const BlockSparseMatrix*>(&matrix));
+  const CompressedRowBlockStructure* bs = A.block_structure();
+
+  // Compute the diagonal blocks by block inner products.
+  std::fill(block_storage_.begin(), block_storage_.end(), 0.0);
+  for (int r = 0; r < bs->rows.size(); ++r) {
+    const int row_block_size = bs->rows[r].block.size;
+    const vector<Cell>& cells = bs->rows[r].cells;
+    const double* row_values = A.RowBlockValues(r);
+    for (int c = 0; c < cells.size(); ++c) {
+      const int col_block_size = bs->cols[cells[c].block_id].size;
+      ConstMatrixRef m(row_values + cells[c].position,
+                       row_block_size,
+                       col_block_size);
+
+      MatrixRef(blocks_[cells[c].block_id],
+                col_block_size,
+                col_block_size).noalias() += m.transpose() * m;
+
+      // TODO(keir): Figure out when the below expression is actually faster
+      // than doing the full rank update. The issue is that for smaller sizes,
+      // the rankUpdate() function is slower than the full product done above.
+      //
+      // On the typical bundling problems, the above product is ~5% faster.
+      //
+      //   MatrixRef(blocks_[cells[c].block_id],
+      //             col_block_size,
+      //             col_block_size).selfadjointView<Eigen::Upper>().rankUpdate(m);
+      //
+    }
+  }
+
+  // Add the diagonal and invert each block.
+  for (int c = 0; c < bs->cols.size(); ++c) {
+    const int size = block_structure_.cols[c].size;
+    const int position = block_structure_.cols[c].position;
+    MatrixRef block(blocks_[c], size, size);
+
+    if (D != NULL) {
+      block.diagonal() += ConstVectorRef(D + position, size).array().square().matrix();
+    }
+
+    block = block.selfadjointView<Eigen::Upper>()
+                 .ldlt()
+                 .solve(Matrix::Identity(size, size));
+  }
+}
+
+void BlockJacobiPreconditioner::RightMultiply(const double* x, double* y) const {
+  for (int c = 0; c < block_structure_.cols.size(); ++c) {
+    const int size = block_structure_.cols[c].size;
+    const int position = block_structure_.cols[c].position;
+    ConstMatrixRef D(blocks_[c], size, size);
+    ConstVectorRef x_block(x + position, size);
+    VectorRef y_block(y + position, size);
+    y_block += D * x_block;
+  }
+}
+
+void BlockJacobiPreconditioner::LeftMultiply(const double* x, double* y) const {
+  RightMultiply(x, y);
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.h b/extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.h
new file mode 100644
index 00000000000..91cfeddb688
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.h
@@ -0,0 +1,84 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+
+#ifndef CERES_INTERNAL_BLOCK_JACOBI_PRECONDITIONER_H_
+#define CERES_INTERNAL_BLOCK_JACOBI_PRECONDITIONER_H_
+
+#include <vector>
+#include "ceres/linear_operator.h"
+
+namespace ceres {
+namespace internal {
+
+class CompressedRowBlockStructure;
+class LinearOperator;
+class SparseMatrix;
+
+// A block Jacobi preconditioner. This is intended for use with conjugate
+// gradients, or other iterative symmetric solvers. To use the preconditioner,
+// create one by passing a BlockSparseMatrix as the linear operator "A" to the
+// constructor. This fixes the sparsity pattern to the pattern of the matrix
+// A^TA.
+//
+// Before each use of the preconditioner in a solve with conjugate gradients,
+// update the matrix by running Update(A, D). The values of the matrix A are
+// inspected to construct the preconditioner. The vector D is applied as the
+// D^TD diagonal term.
+class BlockJacobiPreconditioner : public LinearOperator {
+ public:
+  // A must remain valid while the BlockJacobiPreconditioner is.
+  BlockJacobiPreconditioner(const LinearOperator& A);
+  virtual ~BlockJacobiPreconditioner();
+
+  // Update the preconditioner with the values found in A. The sparsity pattern
+  // must match that of the A passed to the constructor. D is a vector that
+  // must have the same number of rows as A, and is applied as a diagonal in
+  // addition to the block diagonals of A.
+  void Update(const LinearOperator& A, const double* D);
+
+  // LinearOperator interface.
+  virtual void RightMultiply(const double* x, double* y) const;
+  virtual void LeftMultiply(const double* x, double* y) const;
+  virtual int num_rows() const { return num_rows_; }
+  virtual int num_cols() const { return num_rows_; }
+
+ private:
+  std::vector<double*> blocks_;
+  std::vector<double> block_storage_;
+  int num_rows_;
+
+  // The block structure of the matrix this preconditioner is for (e.g. J).
+  const CompressedRowBlockStructure& block_structure_;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_BLOCK_JACOBI_PRECONDITIONER_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_jacobian_writer.cc b/extern/libmv/third_party/ceres/internal/ceres/block_jacobian_writer.cc
new file mode 100644
index 00000000000..52a58bb43a6
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/block_jacobian_writer.cc
@@ -0,0 +1,209 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+
+#include "ceres/block_jacobian_writer.h"
+
+#include "ceres/block_evaluate_preparer.h"
+#include "ceres/block_sparse_matrix.h"
+#include "ceres/parameter_block.h"
+#include "ceres/program.h"
+#include "ceres/residual_block.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/port.h"
+#include "ceres/internal/scoped_ptr.h"
+
+namespace ceres {
+namespace internal {
+namespace {
+
+// Given the residual block ordering, build a lookup table to determine which
+// per-parameter jacobian goes where in the overall program jacobian.
+//
+// Since we expect to use a Schur type linear solver to solve the LM step, take
+// extra care to place the E blocks and the F blocks contiguously. E blocks are
+// the first num_eliminate_blocks parameter blocks as indicated by the parameter
+// block ordering. The remaining parameter blocks are the F blocks.
+//
+// TODO(keir): Consider if we should use a boolean for each parameter block
+// instead of num_eliminate_blocks.
+void BuildJacobianLayout(const Program& program,
+                         int num_eliminate_blocks,
+                         vector<int*>* jacobian_layout,
+                         vector<int>* jacobian_layout_storage) {
+  const vector<ResidualBlock*>& residual_blocks = program.residual_blocks();
+
+  // Iterate over all the active residual blocks and determine how many E blocks
+  // are there. This will determine where the F blocks start in the jacobian
+  // matrix. Also compute the number of jacobian blocks.
+  int f_block_pos = 0;
+  int num_jacobian_blocks = 0;
+  for (int i = 0; i < residual_blocks.size(); ++i) {
+    ResidualBlock* residual_block = residual_blocks[i];
+    const int num_residuals = residual_block->NumResiduals();
+    const int num_parameter_blocks = residual_block->NumParameterBlocks();
+
+    // Advance f_block_pos over each E block for this residual.
+    for (int j = 0; j < num_parameter_blocks; ++j) {
+      ParameterBlock* parameter_block = residual_block->parameter_blocks()[j];
+      if (!parameter_block->IsConstant()) {
+        // Only count blocks for active parameters.
+        num_jacobian_blocks++;
+        if (parameter_block->index() < num_eliminate_blocks) {
+          f_block_pos += num_residuals * parameter_block->LocalSize();
+        }
+      }
+    }
+  }
+
+  // We now know that the E blocks are laid out starting at zero, and the F
+  // blocks are laid out starting at f_block_pos. Iterate over the residual
+  // blocks again, and this time fill the jacobian_layout array with the
+  // position information.
+
+  jacobian_layout->resize(program.NumResidualBlocks());
+  jacobian_layout_storage->resize(num_jacobian_blocks);
+
+  int e_block_pos = 0;
+  int* jacobian_pos = &(*jacobian_layout_storage)[0];
+  for (int i = 0; i < residual_blocks.size(); ++i) {
+    const ResidualBlock* residual_block = residual_blocks[i];
+    const int num_residuals = residual_block->NumResiduals();
+    const int num_parameter_blocks = residual_block->NumParameterBlocks();
+
+    (*jacobian_layout)[i] = jacobian_pos;
+    for (int j = 0; j < num_parameter_blocks; ++j) {
+      ParameterBlock* parameter_block = residual_block->parameter_blocks()[j];
+      const int parameter_block_index = parameter_block->index();
+      if (parameter_block->IsConstant()) {
+        continue;
+      }
+      const int jacobian_block_size =
+          num_residuals * parameter_block->LocalSize();
+      if (parameter_block_index < num_eliminate_blocks) {
+        *jacobian_pos = e_block_pos;
+        e_block_pos += jacobian_block_size;
+      } else {
+        *jacobian_pos = f_block_pos;
+        f_block_pos += jacobian_block_size;
+      }
+      jacobian_pos++;
+    }
+  }
+}
+
+}  // namespace
+
+BlockJacobianWriter::BlockJacobianWriter(const Evaluator::Options& options,
+                                         Program* program)
+    : program_(program) {
+  CHECK_GE(options.num_eliminate_blocks, 0)
+      << "num_eliminate_blocks must be greater than 0.";
+
+  BuildJacobianLayout(*program,
+                      options.num_eliminate_blocks,
+                      &jacobian_layout_,
+                      &jacobian_layout_storage_);
+}
+
+// Create evaluate prepareres that point directly into the final jacobian. This
+// makes the final Write() a nop.
+BlockEvaluatePreparer* BlockJacobianWriter::CreateEvaluatePreparers(
+    int num_threads) {
+  BlockEvaluatePreparer* preparers = new BlockEvaluatePreparer[num_threads];
+  for (int i = 0; i < num_threads; i++) {
+    preparers[i].Init(&jacobian_layout_[0]);
+  }
+  return preparers;
+}
+
+SparseMatrix* BlockJacobianWriter::CreateJacobian() const {
+  CompressedRowBlockStructure* bs = new CompressedRowBlockStructure;
+
+  const vector<ParameterBlock*>& parameter_blocks =
+      program_->parameter_blocks();
+
+  // Construct the column blocks.
+  bs->cols.resize(parameter_blocks.size());
+  for (int i = 0, cursor = 0; i < parameter_blocks.size(); ++i) {
+    CHECK_NE(parameter_blocks[i]->index(), -1);
+    CHECK(!parameter_blocks[i]->IsConstant());
+    bs->cols[i].size = parameter_blocks[i]->LocalSize();
+    bs->cols[i].position = cursor;
+    cursor += bs->cols[i].size;
+  }
+
+  // Construct the cells in each row.
+  const vector<ResidualBlock*>& residual_blocks =
+      program_->residual_blocks();
+  int row_block_position = 0;
+  bs->rows.resize(residual_blocks.size());
+  for (int i = 0; i < residual_blocks.size(); ++i) {
+    const ResidualBlock* residual_block = residual_blocks[i];
+    CompressedRow* row = &bs->rows[i];
+
+    row->block.size = residual_block->NumResiduals();
+    row->block.position = row_block_position;
+    row_block_position += row->block.size;
+
+    // Size the row by the number of active parameters in this residual.
+    const int num_parameter_blocks = residual_block->NumParameterBlocks();
+    int num_active_parameter_blocks = 0;
+    for (int j = 0; j < num_parameter_blocks; ++j) {
+      if (residual_block->parameter_blocks()[j]->index() != -1) {
+        num_active_parameter_blocks++;
+      }
+    }
+    row->cells.resize(num_active_parameter_blocks);
+
+    // Add layout information for the active parameters in this row.
+    for (int j = 0, k = 0; j < num_parameter_blocks; ++j) {
+      const ParameterBlock* parameter_block =
+          residual_block->parameter_blocks()[j];
+      if (!parameter_block->IsConstant()) {
+        Cell& cell = row->cells[k];
+        cell.block_id = parameter_block->index();
+        cell.position = jacobian_layout_[i][k];
+
+        // Only increment k for active parameters, since there is only layout
+        // information for active parameters.
+        k++;
+      }
+    }
+
+    sort(row->cells.begin(), row->cells.end(), CellLessThan);
+  }
+
+  BlockSparseMatrix* jacobian = new BlockSparseMatrix(bs);
+  CHECK_NOTNULL(jacobian);
+  return jacobian;
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_jacobian_writer.h b/extern/libmv/third_party/ceres/internal/ceres/block_jacobian_writer.h
new file mode 100644
index 00000000000..140c7211129
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/block_jacobian_writer.h
@@ -0,0 +1,127 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//
+// A jacobian writer that writes to block sparse matrices. The "writer" name is
+// misleading, since the Write() operation on the block jacobian writer does not
+// write anything. Instead, the Prepare() method on the BlockEvaluatePreparers
+// makes a jacobians array which has direct pointers into the block sparse
+// jacobian. When the cost function is evaluated, the jacobian blocks get placed
+// directly in their final location.
+
+#ifndef CERES_INTERNAL_BLOCK_JACOBIAN_WRITER_H_
+#define CERES_INTERNAL_BLOCK_JACOBIAN_WRITER_H_
+
+#include <vector>
+#include "ceres/evaluator.h"
+#include "ceres/internal/port.h"
+
+namespace ceres {
+namespace internal {
+
+class BlockEvaluatePreparer;
+class Program;
+class SparseMatrix;
+
+class BlockJacobianWriter {
+ public:
+  BlockJacobianWriter(const Evaluator::Options& options,
+                      Program* program);
+
+  // JacobianWriter interface.
+
+  // Create evaluate prepareres that point directly into the final jacobian.
+  // This makes the final Write() a nop.
+  BlockEvaluatePreparer* CreateEvaluatePreparers(int num_threads);
+
+  SparseMatrix* CreateJacobian() const;
+
+  void Write(int /* residual_id */,
+             int /* residual_offset */,
+             double** /* jacobians */,
+             SparseMatrix* /* jacobian */) {
+    // This is a noop since the blocks were written directly into their final
+    // position by the outside evaluate call, thanks to the jacobians array
+    // prepared by the BlockEvaluatePreparers.
+  }
+
+ private:
+  Program* program_;
+
+  // Stores the position of each residual / parameter jacobian.
+  //
+  // The block sparse matrix that this writer writes to is stored as a set of
+  // contiguos dense blocks, one after each other; see BlockSparseMatrix. The
+  // "double* values_" member of the block sparse matrix contains all of these
+  // blocks. Given a pointer to the first element of a block and the size of
+  // that block, it's possible to write to it.
+  //
+  // In the case of a block sparse jacobian, the jacobian writer needs a way to
+  // find the offset in the values_ array of each residual/parameter jacobian
+  // block.
+  //
+  // That is the purpose of jacobian_layout_.
+  //
+  // In particular, jacobian_layout_[i][j] is the offset in the values_ array of
+  // the derivative of residual block i with respect to the parameter block at
+  // active argument position j.
+  //
+  // The active qualifier means that non-active parameters do not count. Care
+  // must be taken when indexing into jacobian_layout_ to account for this.
+  // Consider a single residual example:
+  //
+  //   r(x, y, z)
+  //
+  // with r in R^3, x in R^4, y in R^2, and z in R^5.
+  // Take y as a constant (non-active) parameter.
+  // Take r as residual number 0.
+  //
+  // In this case, the active arguments are only (x, z), so the active argument
+  // position for x is 0, and the active argument position for z is 1. This is
+  // similar to thinking of r as taking only 2 parameters:
+  //
+  //   r(x, z)
+  //
+  // There are only 2 jacobian blocks: dr/dx and dr/dz. jacobian_layout_ would
+  // have the following contents:
+  //
+  //   jacobian_layout_[0] = { 0, 12 }
+  //
+  // which indicates that dr/dx is located at values_[0], and dr/dz is at
+  // values_[12]. See BlockEvaluatePreparer::Prepare()'s comments about 'j'.
+  vector<int*> jacobian_layout_;
+
+  // The pointers in jacobian_layout_ point directly into this vector.
+  vector<int> jacobian_layout_storage_;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_BLOCK_JACOBIAN_WRITER_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.cc b/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.cc
new file mode 100644
index 00000000000..2afaf5e2ea2
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.cc
@@ -0,0 +1,83 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#include "ceres/block_random_access_dense_matrix.h"
+
+#include <vector>
+#include <glog/logging.h>
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/scoped_ptr.h"
+
+namespace ceres {
+namespace internal {
+
+BlockRandomAccessDenseMatrix::BlockRandomAccessDenseMatrix(
+    const vector<int>& blocks) {
+  block_layout_.resize(blocks.size(), 0);
+  num_rows_ = 0;
+  for (int i = 0; i < blocks.size(); ++i) {
+    block_layout_[i] = num_rows_;
+    num_rows_ += blocks[i];
+  }
+
+  values_.reset(new double[num_rows_ * num_rows_]);
+  CHECK_NOTNULL(values_.get());
+  cell_info_.values = values_.get();
+  SetZero();
+}
+
+// Assume that the user does not hold any locks on any cell blocks
+// when they are calling SetZero.
+BlockRandomAccessDenseMatrix::~BlockRandomAccessDenseMatrix() {
+}
+
+CellInfo* BlockRandomAccessDenseMatrix::GetCell(const int row_block_id,
+                                                const int col_block_id,
+                                                int* row,
+                                                int* col,
+                                                int* row_stride,
+                                                int* col_stride) {
+  *row = block_layout_[row_block_id];
+  *col = block_layout_[col_block_id];
+  *row_stride = num_rows_;
+  *col_stride = num_rows_;
+  return &cell_info_;
+}
+
+// Assume that the user does not hold any locks on any cell blocks
+// when they are calling SetZero.
+void BlockRandomAccessDenseMatrix::SetZero() {
+  if (num_rows_) {
+    VectorRef(values_.get(), num_rows_ * num_rows_).setZero();
+  }
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.h b/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.h
new file mode 100644
index 00000000000..3a0096209f7
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.h
@@ -0,0 +1,98 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#ifndef CERES_INTERNAL_BLOCK_RANDOM_ACCESS_DENSE_MATRIX_H_
+#define CERES_INTERNAL_BLOCK_RANDOM_ACCESS_DENSE_MATRIX_H_
+
+#include "ceres/block_random_access_matrix.h"
+
+#include <vector>
+
+#include "ceres/internal/macros.h"
+#include "ceres/internal/port.h"
+#include "ceres/internal/scoped_ptr.h"
+
+namespace ceres {
+namespace internal {
+
+// A square block random accessible matrix with the same row and
+// column block structure. All cells are stored in the same single
+// array, so that its also accessible as a dense matrix of size
+// num_rows x num_cols.
+//
+// This class is NOT thread safe. Since all n^2 cells are stored,
+// GetCell never returns NULL for any (row_block_id, col_block_id)
+// pair.
+//
+// ReturnCell is a nop.
+class BlockRandomAccessDenseMatrix : public BlockRandomAccessMatrix {
+ public:
+  // blocks is a vector of block sizes. The resulting matrix has
+  // blocks.size() * blocks.size() cells.
+  explicit BlockRandomAccessDenseMatrix(const vector<int>& blocks);
+
+  // The destructor is not thread safe. It assumes that no one is
+  // modifying any cells when the matrix is being destroyed.
+  virtual ~BlockRandomAccessDenseMatrix();
+
+  // BlockRandomAccessMatrix interface.
+  virtual CellInfo* GetCell(int row_block_id,
+                            int col_block_id,
+                            int* row,
+                            int* col,
+                            int* row_stride,
+                            int* col_stride);
+
+  // This is not a thread safe method, it assumes that no cell is
+  // locked.
+  virtual void SetZero();
+
+  // Since the matrix is square with the same row and column block
+  // structure, num_rows() = num_cols().
+  virtual int num_rows() const { return num_rows_; }
+  virtual int num_cols() const { return num_rows_; }
+
+  // The underlying matrix storing the cells.
+  const double* values() const { return values_.get(); }
+  double* mutable_values() { return values_.get(); }
+
+ private:
+  CellInfo cell_info_;
+  int num_rows_;
+  vector<int> block_layout_;
+  scoped_array<double> values_;
+
+  DISALLOW_COPY_AND_ASSIGN(BlockRandomAccessDenseMatrix);
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_BLOCK_RANDOM_ACCESS_DENSE_MATRIX_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_random_access_matrix.cc b/extern/libmv/third_party/ceres/internal/ceres/block_random_access_matrix.cc
new file mode 100644
index 00000000000..58fe4a10de3
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/block_random_access_matrix.cc
@@ -0,0 +1,40 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#include "ceres/block_random_access_matrix.h"
+
+namespace ceres {
+namespace internal {
+
+BlockRandomAccessMatrix::~BlockRandomAccessMatrix() {
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_random_access_matrix.h b/extern/libmv/third_party/ceres/internal/ceres/block_random_access_matrix.h
new file mode 100644
index 00000000000..f398af3be87
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/block_random_access_matrix.h
@@ -0,0 +1,132 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Interface for matrices that allow block based random access.
+
+#ifndef CERES_INTERNAL_BLOCK_RANDOM_ACCESS_MATRIX_H_
+#define CERES_INTERNAL_BLOCK_RANDOM_ACCESS_MATRIX_H_
+
+#include "ceres/mutex.h"
+
+namespace ceres {
+namespace internal {
+
+// A matrix implementing the BlockRandomAccessMatrix interface is a
+// matrix whose rows and columns are divided into blocks. For example
+// the matrix A:
+//
+//            3     4      5
+//  A =  5 [c_11  c_12  c_13]
+//       4 [c_21  c_22  c_23]
+//
+// has row blocks of size 5 and 4, and column blocks of size 3, 4 and
+// 5. It has six cells corresponding to the six row-column block
+// combinations.
+//
+// BlockRandomAccessMatrix objects provide access to cells c_ij using
+// the GetCell method. when a cell is present, GetCell will return a
+// CellInfo object containing a pointer to an array which contains the
+// cell as a submatrix and a mutex that guards this submatrix. If the
+// user is accessing the matrix concurrently, it is his responsibility
+// to use the mutex to exclude other writers from writing to the cell
+// concurrently.
+//
+// There is no requirement that all cells be present, i.e. the matrix
+// itself can be block sparse. When a cell is not present, the GetCell
+// method will return a NULL pointer.
+//
+// There is no requirement about how the cells are stored beyond that
+// form a dense submatrix of a larger dense matrix. Like everywhere
+// else in Ceres, RowMajor storage assumed.
+//
+// Example usage:
+//
+//  BlockRandomAccessMatrix* A = new BlockRandomAccessMatrixSubClass(...)
+//
+//  int row, col, row_stride, col_stride;
+//  CellInfo* cell = A->GetCell(row_block_id, col_block_id,
+//                              &row, &col,
+//                              &row_stride, &col_stride);
+//
+//  if (cell != NULL) {
+//     MatrixRef m(cell->values, row_stride, col_stride);
+//     MutexLock l(&cell->m);
+//     m.block(row, col, row_block_size, col_block_size) = ...
+//  }
+
+// Structure to carry a pointer to the array containing a cell and the
+// Mutex guarding it.
+struct CellInfo {
+  CellInfo()
+      : values(NULL) {
+  }
+
+  explicit CellInfo(double* ptr)
+      : values(ptr) {
+  }
+
+  double* values;
+  Mutex m;
+};
+
+class BlockRandomAccessMatrix {
+ public:
+  virtual ~BlockRandomAccessMatrix();
+
+  // If the cell (row_block_id, col_block_id) is present, then return
+  // a CellInfo with a pointer to the dense matrix containing it,
+  // otherwise return NULL. The dense matrix containing this cell has
+  // size row_stride, col_stride and the cell is located at position
+  // (row, col) within this matrix.
+  //
+  // The size of the cell is row_block_size x col_block_size is
+  // assumed known to the caller. row_block_size less than or equal to
+  // row_stride and col_block_size is upper bounded by col_stride.
+  virtual CellInfo* GetCell(int row_block_id,
+                            int col_block_id,
+                            int* row,
+                            int* col,
+                            int* row_stride,
+                            int* col_stride) = 0;
+
+  // Zero out the values of the array. The structure of the matrix
+  // (size and sparsity) is preserved.
+  virtual void SetZero() = 0;
+
+  // Number of scalar rows and columns in the matrix, i.e the sum of
+  // all row blocks and column block sizes respectively.
+  virtual int num_rows() const = 0;
+  virtual int num_cols() const = 0;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_BLOCK_RANDOM_ACCESS_MATRIX_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.cc b/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.cc
new file mode 100644
index 00000000000..c496fcd13de
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.cc
@@ -0,0 +1,158 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#include "ceres/block_random_access_sparse_matrix.h"
+
+#include <algorithm>
+#include <set>
+#include <utility>
+#include <vector>
+#include <glog/logging.h>
+#include "ceres/mutex.h"
+#include "ceres/triplet_sparse_matrix.h"
+#include "ceres/internal/port.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+
+BlockRandomAccessSparseMatrix::BlockRandomAccessSparseMatrix(
+    const vector<int>& blocks,
+    const set<pair<int, int> >& block_pairs)
+    : kMaxRowBlocks(10 * 1000 * 1000),
+      blocks_(blocks) {
+  CHECK_LT(blocks.size(), kMaxRowBlocks);
+
+  // Build the row/column layout vector and count the number of scalar
+  // rows/columns.
+  int num_cols = 0;
+  vector<int> col_layout;
+  for (int i = 0; i < blocks_.size(); ++i) {
+    col_layout.push_back(num_cols);
+    num_cols += blocks_[i];
+  }
+
+  // Count the number of scalar non-zero entries and build the layout
+  // object for looking into the values array of the
+  // TripletSparseMatrix.
+  int num_nonzeros = 0;
+  for (set<pair<int, int> >::const_iterator it = block_pairs.begin();
+       it != block_pairs.end();
+       ++it) {
+    const int row_block_size = blocks_[it->first];
+    const int col_block_size = blocks_[it->second];
+    num_nonzeros += row_block_size * col_block_size;
+  }
+
+  VLOG(1) << "Matrix Size [" << num_cols
+          << "," << num_cols
+          << "] " << num_nonzeros;
+
+  tsm_.reset(new TripletSparseMatrix(num_cols, num_cols, num_nonzeros));
+  tsm_->set_num_nonzeros(num_nonzeros);
+  int* rows = tsm_->mutable_rows();
+  int* cols = tsm_->mutable_cols();
+  double* values = tsm_->mutable_values();
+
+  int pos = 0;
+  for (set<pair<int, int> >::const_iterator it = block_pairs.begin();
+       it != block_pairs.end();
+       ++it) {
+    const int row_block_size = blocks_[it->first];
+    const int col_block_size = blocks_[it->second];
+    layout_[IntPairToLong(it->first, it->second)] =
+        new CellInfo(values + pos);
+    pos += row_block_size * col_block_size;
+  }
+
+  // Fill the sparsity pattern of the underlying matrix.
+  for (set<pair<int, int> >::const_iterator it = block_pairs.begin();
+       it != block_pairs.end();
+       ++it) {
+    const int row_block_id = it->first;
+    const int col_block_id = it->second;
+    const int row_block_size = blocks_[row_block_id];
+    const int col_block_size = blocks_[col_block_id];
+    int pos =
+        layout_[IntPairToLong(row_block_id, col_block_id)]->values - values;
+    for (int r = 0; r < row_block_size; ++r) {
+      for (int c = 0; c < col_block_size; ++c, ++pos) {
+          rows[pos] = col_layout[row_block_id] + r;
+          cols[pos] = col_layout[col_block_id] + c;
+          values[pos] = 1.0;
+          DCHECK_LT(rows[pos], tsm_->num_rows());
+          DCHECK_LT(cols[pos], tsm_->num_rows());
+      }
+    }
+  }
+}
+
+// Assume that the user does not hold any locks on any cell blocks
+// when they are calling SetZero.
+BlockRandomAccessSparseMatrix::~BlockRandomAccessSparseMatrix() {
+  for (LayoutType::iterator it = layout_.begin();
+       it != layout_.end();
+       ++it) {
+    delete it->second;
+  }
+}
+
+CellInfo* BlockRandomAccessSparseMatrix::GetCell(int row_block_id,
+                                                 int col_block_id,
+                                                 int* row,
+                                                 int* col,
+                                                 int* row_stride,
+                                                 int* col_stride) {
+  const LayoutType::iterator it  =
+      layout_.find(IntPairToLong(row_block_id, col_block_id));
+  if (it == layout_.end()) {
+    return NULL;
+  }
+
+  // Each cell is stored contiguously as its own little dense matrix.
+  *row = 0;
+  *col = 0;
+  *row_stride = blocks_[row_block_id];
+  *col_stride = blocks_[col_block_id];
+  return it->second;
+}
+
+// Assume that the user does not hold any locks on any cell blocks
+// when they are calling SetZero.
+void BlockRandomAccessSparseMatrix::SetZero() {
+  if (tsm_->num_nonzeros()) {
+    VectorRef(tsm_->mutable_values(),
+              tsm_->num_nonzeros()).setZero();
+  }
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.h b/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.h
new file mode 100644
index 00000000000..12613c3daa0
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.h
@@ -0,0 +1,109 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#ifndef CERES_INTERNAL_BLOCK_RANDOM_ACCESS_SPARSE_MATRIX_H_
+#define CERES_INTERNAL_BLOCK_RANDOM_ACCESS_SPARSE_MATRIX_H_
+
+#include <set>
+#include <vector>
+#include <utility>
+#include "ceres/mutex.h"
+#include "ceres/block_random_access_matrix.h"
+#include "ceres/collections_port.h"
+#include "ceres/triplet_sparse_matrix.h"
+#include "ceres/internal/macros.h"
+#include "ceres/internal/port.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+
+// A threaf safe square block sparse implementation of
+// BlockRandomAccessMatrix. Internally a TripletSparseMatrix is used
+// for doing the actual storage. This class augments this matrix with
+// an unordered_map that allows random read/write access.
+class BlockRandomAccessSparseMatrix : public BlockRandomAccessMatrix {
+ public:
+  // blocks is an array of block sizes. block_pairs is a set of
+  // <row_block_id, col_block_id> pairs to identify the non-zero cells
+  // of this matrix.
+  BlockRandomAccessSparseMatrix(const vector<int>& blocks,
+                                const set<pair<int, int> >& block_pairs);
+
+  // The destructor is not thread safe. It assumes that no one is
+  // modifying any cells when the matrix is being destroyed.
+  virtual ~BlockRandomAccessSparseMatrix();
+
+  // BlockRandomAccessMatrix Interface.
+  virtual CellInfo* GetCell(int row_block_id,
+                            int col_block_id,
+                            int* row,
+                            int* col,
+                            int* row_stride,
+                            int* col_stride);
+
+  // This is not a thread safe method, it assumes that no cell is
+  // locked.
+  virtual void SetZero();
+  virtual bool IsThreadSafe() const { return true; }
+
+  // Since the matrix is square, num_rows() == num_cols().
+  virtual int num_rows() const { return tsm_->num_rows(); }
+  virtual int num_cols() const { return tsm_->num_cols(); }
+
+  // Access to the underlying matrix object.
+  const TripletSparseMatrix* matrix() const { return tsm_.get(); }
+  TripletSparseMatrix* mutable_matrix() { return tsm_.get(); }
+
+ private:
+  long int IntPairToLong(int a, int b) {
+    return a * kMaxRowBlocks + b;
+  }
+
+  const int kMaxRowBlocks;
+  // row/column block sizes.
+  const vector<int> blocks_;
+
+  // A mapping from <row_block_id, col_block_id> to the position in
+  // the values array of tsm_ where the block is stored.
+  typedef HashMap<long int, CellInfo* > LayoutType;
+  LayoutType layout_;
+
+  // The underlying matrix object which actually stores the cells.
+  scoped_ptr<TripletSparseMatrix> tsm_;
+
+  DISALLOW_COPY_AND_ASSIGN(BlockRandomAccessSparseMatrix);
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_BLOCK_RANDOM_ACCESS_SPARSE_MATRIX_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.cc b/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.cc
new file mode 100644
index 00000000000..7dd395e2975
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.cc
@@ -0,0 +1,286 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#include "ceres/block_sparse_matrix.h"
+
+#include <cstddef>
+#include <algorithm>
+#include <vector>
+#include <glog/logging.h>
+#include "ceres/block_structure.h"
+#include "ceres/matrix_proto.h"
+#include "ceres/triplet_sparse_matrix.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+BlockSparseMatrix::~BlockSparseMatrix() {}
+
+BlockSparseMatrix::BlockSparseMatrix(
+    CompressedRowBlockStructure* block_structure)
+    : num_rows_(0),
+      num_cols_(0),
+      num_nonzeros_(0),
+      values_(NULL),
+      block_structure_(block_structure) {
+  CHECK_NOTNULL(block_structure_.get());
+
+  // Count the number of columns in the matrix.
+  for (int i = 0; i < block_structure_->cols.size(); ++i) {
+    num_cols_ += block_structure_->cols[i].size;
+  }
+
+  // Count the number of non-zero entries and the number of rows in
+  // the matrix.
+  for (int i = 0; i < block_structure_->rows.size(); ++i) {
+    int row_block_size = block_structure_->rows[i].block.size;
+    num_rows_ += row_block_size;
+
+    const vector<Cell>& cells = block_structure_->rows[i].cells;
+    for (int j = 0; j < cells.size(); ++j) {
+      int col_block_id = cells[j].block_id;
+      int col_block_size = block_structure_->cols[col_block_id].size;
+      num_nonzeros_ += col_block_size * row_block_size;
+    }
+  }
+
+  CHECK_GE(num_rows_, 0);
+  CHECK_GE(num_cols_, 0);
+  CHECK_GE(num_nonzeros_, 0);
+  VLOG(2) << "Allocating values array with "
+          << num_nonzeros_ * sizeof(double) << " bytes.";  // NOLINT
+  values_.reset(new double[num_nonzeros_]);
+  CHECK_NOTNULL(values_.get());
+}
+
+#ifndef CERES_DONT_HAVE_PROTOCOL_BUFFERS
+BlockSparseMatrix::BlockSparseMatrix(const SparseMatrixProto& outer_proto) {
+  CHECK(outer_proto.has_block_matrix());
+
+  const BlockSparseMatrixProto& proto = outer_proto.block_matrix();
+  CHECK(proto.has_num_rows());
+  CHECK(proto.has_num_cols());
+  CHECK_EQ(proto.num_nonzeros(), proto.values_size());
+
+  num_rows_ = proto.num_rows();
+  num_cols_ = proto.num_cols();
+  num_nonzeros_ = proto.num_nonzeros();
+
+  // Copy out the values into *this.
+  values_.reset(new double[num_nonzeros_]);
+  for (int i = 0; i < proto.num_nonzeros(); ++i) {
+    values_[i] = proto.values(i);
+  }
+
+  // Create the block structure according to the proto.
+  block_structure_.reset(new CompressedRowBlockStructure);
+  ProtoToBlockStructure(proto.block_structure(), block_structure_.get());
+}
+#endif
+
+void BlockSparseMatrix::SetZero() {
+  fill(values_.get(), values_.get() + num_nonzeros_, 0.0);
+}
+
+void BlockSparseMatrix::RightMultiply(const double* x,  double* y) const {
+  CHECK_NOTNULL(x);
+  CHECK_NOTNULL(y);
+
+  for (int i = 0; i < block_structure_->rows.size(); ++i) {
+    int row_block_pos = block_structure_->rows[i].block.position;
+    int row_block_size = block_structure_->rows[i].block.size;
+    VectorRef yref(y + row_block_pos, row_block_size);
+    const vector<Cell>& cells = block_structure_->rows[i].cells;
+    for (int j = 0; j < cells.size(); ++j) {
+      int col_block_id = cells[j].block_id;
+      int col_block_size = block_structure_->cols[col_block_id].size;
+      int col_block_pos = block_structure_->cols[col_block_id].position;
+      ConstVectorRef xref(x + col_block_pos, col_block_size);
+      MatrixRef m(values_.get() + cells[j].position,
+                  row_block_size, col_block_size);
+      yref += m.lazyProduct(xref);
+    }
+  }
+}
+
+void BlockSparseMatrix::LeftMultiply(const double* x, double* y) const {
+  CHECK_NOTNULL(x);
+  CHECK_NOTNULL(y);
+
+  for (int i = 0; i < block_structure_->rows.size(); ++i) {
+    int row_block_pos = block_structure_->rows[i].block.position;
+    int row_block_size = block_structure_->rows[i].block.size;
+    const ConstVectorRef xref(x + row_block_pos, row_block_size);
+    const vector<Cell>& cells = block_structure_->rows[i].cells;
+    for (int j = 0; j < cells.size(); ++j) {
+      int col_block_id = cells[j].block_id;
+      int col_block_size = block_structure_->cols[col_block_id].size;
+      int col_block_pos = block_structure_->cols[col_block_id].position;
+      VectorRef yref(y + col_block_pos, col_block_size);
+      MatrixRef m(values_.get() + cells[j].position,
+                  row_block_size, col_block_size);
+      yref += m.transpose().lazyProduct(xref);
+    }
+  }
+}
+
+void BlockSparseMatrix::SquaredColumnNorm(double* x) const {
+  CHECK_NOTNULL(x);
+  VectorRef(x, num_cols_).setZero();
+  for (int i = 0; i < block_structure_->rows.size(); ++i) {
+    int row_block_size = block_structure_->rows[i].block.size;
+    const vector<Cell>& cells = block_structure_->rows[i].cells;
+    for (int j = 0; j < cells.size(); ++j) {
+      int col_block_id = cells[j].block_id;
+      int col_block_size = block_structure_->cols[col_block_id].size;
+      int col_block_pos = block_structure_->cols[col_block_id].position;
+      const MatrixRef m(values_.get() + cells[j].position,
+                        row_block_size, col_block_size);
+      VectorRef(x + col_block_pos, col_block_size) += m.colwise().squaredNorm();
+    }
+  }
+}
+
+void BlockSparseMatrix::ScaleColumns(const double* scale) {
+  CHECK_NOTNULL(scale);
+
+  for (int i = 0; i < block_structure_->rows.size(); ++i) {
+    int row_block_size = block_structure_->rows[i].block.size;
+    const vector<Cell>& cells = block_structure_->rows[i].cells;
+    for (int j = 0; j < cells.size(); ++j) {
+      int col_block_id = cells[j].block_id;
+      int col_block_size = block_structure_->cols[col_block_id].size;
+      int col_block_pos = block_structure_->cols[col_block_id].position;
+      MatrixRef m(values_.get() + cells[j].position,
+                        row_block_size, col_block_size);
+      m *= ConstVectorRef(scale + col_block_pos, col_block_size).asDiagonal();
+    }
+  }
+}
+
+void BlockSparseMatrix::ToDenseMatrix(Matrix* dense_matrix) const {
+  CHECK_NOTNULL(dense_matrix);
+
+  dense_matrix->resize(num_rows_, num_cols_);
+  dense_matrix->setZero();
+  Matrix& m = *dense_matrix;
+
+  for (int i = 0; i < block_structure_->rows.size(); ++i) {
+    int row_block_pos = block_structure_->rows[i].block.position;
+    int row_block_size = block_structure_->rows[i].block.size;
+    const vector<Cell>& cells = block_structure_->rows[i].cells;
+    for (int j = 0; j < cells.size(); ++j) {
+      int col_block_id = cells[j].block_id;
+      int col_block_size = block_structure_->cols[col_block_id].size;
+      int col_block_pos = block_structure_->cols[col_block_id].position;
+      int jac_pos = cells[j].position;
+      m.block(row_block_pos, col_block_pos, row_block_size, col_block_size)
+          += MatrixRef(values_.get() + jac_pos, row_block_size, col_block_size);
+    }
+  }
+}
+
+void BlockSparseMatrix::ToTripletSparseMatrix(
+    TripletSparseMatrix* matrix) const {
+  CHECK_NOTNULL(matrix);
+
+  matrix->Reserve(num_nonzeros_);
+  matrix->Resize(num_rows_, num_cols_);
+  matrix->SetZero();
+
+  for (int i = 0; i < block_structure_->rows.size(); ++i) {
+    int row_block_pos = block_structure_->rows[i].block.position;
+    int row_block_size = block_structure_->rows[i].block.size;
+    const vector<Cell>& cells = block_structure_->rows[i].cells;
+    for (int j = 0; j < cells.size(); ++j) {
+      int col_block_id = cells[j].block_id;
+      int col_block_size = block_structure_->cols[col_block_id].size;
+      int col_block_pos = block_structure_->cols[col_block_id].position;
+      int jac_pos = cells[j].position;
+       for (int r = 0; r < row_block_size; ++r) {
+        for (int c = 0; c < col_block_size; ++c, ++jac_pos) {
+          matrix->mutable_rows()[jac_pos] = row_block_pos + r;
+          matrix->mutable_cols()[jac_pos] = col_block_pos + c;
+          matrix->mutable_values()[jac_pos] = values_[jac_pos];
+        }
+      }
+    }
+  }
+  matrix->set_num_nonzeros(num_nonzeros_);
+}
+
+// Return a pointer to the block structure. We continue to hold
+// ownership of the object though.
+const CompressedRowBlockStructure* BlockSparseMatrix::block_structure()
+    const {
+  return block_structure_.get();
+}
+
+#ifndef CERES_DONT_HAVE_PROTOCOL_BUFFERS
+void BlockSparseMatrix::ToProto(SparseMatrixProto* outer_proto) const {
+  outer_proto->Clear();
+
+  BlockSparseMatrixProto* proto = outer_proto->mutable_block_matrix();
+  proto->set_num_rows(num_rows_);
+  proto->set_num_cols(num_cols_);
+  proto->set_num_nonzeros(num_nonzeros_);
+  for (int i = 0; i < num_nonzeros_; ++i) {
+    proto->add_values(values_[i]);
+  }
+  BlockStructureToProto(*block_structure_, proto->mutable_block_structure());
+}
+#endif
+
+void BlockSparseMatrix::ToTextFile(FILE* file) const {
+  CHECK_NOTNULL(file);
+  for (int i = 0; i < block_structure_->rows.size(); ++i) {
+    const int row_block_pos = block_structure_->rows[i].block.position;
+    const int row_block_size = block_structure_->rows[i].block.size;
+    const vector<Cell>& cells = block_structure_->rows[i].cells;
+    for (int j = 0; j < cells.size(); ++j) {
+      const int col_block_id = cells[j].block_id;
+      const int col_block_size = block_structure_->cols[col_block_id].size;
+      const int col_block_pos = block_structure_->cols[col_block_id].position;
+      int jac_pos = cells[j].position;
+      for (int r = 0; r < row_block_size; ++r) {
+        for (int c = 0; c < col_block_size; ++c) {
+          fprintf(file, "% 10d % 10d %17f\n",
+                  row_block_pos + r,
+                  col_block_pos + c,
+                  values_[jac_pos++]);
+        }
+      }
+    }
+  }
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.h b/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.h
new file mode 100644
index 00000000000..f71446e8f58
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.h
@@ -0,0 +1,144 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Implementation of the SparseMatrix interface for block sparse
+// matrices.
+
+#ifndef CERES_INTERNAL_BLOCK_SPARSE_MATRIX_H_
+#define CERES_INTERNAL_BLOCK_SPARSE_MATRIX_H_
+
+#include "ceres/block_structure.h"
+#include "ceres/sparse_matrix.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/macros.h"
+#include "ceres/internal/scoped_ptr.h"
+
+namespace ceres {
+namespace internal {
+
+class SparseMatrixProto;
+class TripletSparseMatrix;
+
+// A further extension of the SparseMatrix interface to support block-oriented
+// matrices. The key addition is the RowBlockValues() accessor, which enables
+// the lazy block sparse matrix implementation.
+class BlockSparseMatrixBase : public SparseMatrix {
+ public:
+  BlockSparseMatrixBase() {}
+  virtual ~BlockSparseMatrixBase() {}
+
+  // Convert this matrix into a triplet sparse matrix.
+  virtual void ToTripletSparseMatrix(TripletSparseMatrix* matrix) const = 0;
+
+  // Returns a pointer to the block structure. Does not transfer
+  // ownership.
+  virtual const CompressedRowBlockStructure* block_structure() const = 0;
+
+  // Returns a pointer to a row of the matrix. The returned array is only valid
+  // until the next call to RowBlockValues. The caller does not own the result.
+  //
+  // The returned array is laid out such that cells on the specified row are
+  // contiguous in the returned array, though neighbouring cells in row order
+  // may not be contiguous in the row values. The cell values for cell
+  // (row_block, cell_block) are found at offset
+  //
+  //   block_structure()->rows[row_block].cells[cell_block].position
+  //
+  virtual const double* RowBlockValues(int row_block_index) const = 0;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(BlockSparseMatrixBase);
+};
+
+// This class implements the SparseMatrix interface for storing and
+// manipulating block sparse matrices. The block structure is stored
+// in the CompressedRowBlockStructure object and one is needed to
+// initialize the matrix. For details on how the blocks structure of
+// the matrix is stored please see the documentation
+//
+//   internal/ceres/block_structure.h
+//
+class BlockSparseMatrix : public BlockSparseMatrixBase {
+ public:
+  // Construct a block sparse matrix with a fully initialized
+  // CompressedRowBlockStructure objected. The matrix takes over
+  // ownership of this object and destroys it upon destruction.
+  //
+  // TODO(sameeragarwal): Add a function which will validate legal
+  // CompressedRowBlockStructure objects.
+  explicit BlockSparseMatrix(CompressedRowBlockStructure* block_structure);
+
+  // Construct a block sparse matrix from a protocol buffer.
+#ifndef CERES_DONT_HAVE_PROTOCOL_BUFFERS
+  explicit BlockSparseMatrix(const SparseMatrixProto& proto);
+#endif
+
+  BlockSparseMatrix();
+  virtual ~BlockSparseMatrix();
+
+  // Implementation of SparseMatrix interface.
+  virtual void SetZero();
+  virtual void RightMultiply(const double* x, double* y) const;
+  virtual void LeftMultiply(const double* x, double* y) const;
+  virtual void SquaredColumnNorm(double* x) const;
+  virtual void ScaleColumns(const double* scale);
+  virtual void ToDenseMatrix(Matrix* dense_matrix) const;
+#ifndef CERES_DONT_HAVE_PROTOCOL_BUFFERS
+  virtual void ToProto(SparseMatrixProto* proto) const;
+#endif
+  virtual void ToTextFile(FILE* file) const;
+
+  virtual int num_rows()         const { return num_rows_;     }
+  virtual int num_cols()         const { return num_cols_;     }
+  virtual int num_nonzeros()     const { return num_nonzeros_; }
+  virtual const double* values() const { return values_.get(); }
+  virtual double* mutable_values()     { return values_.get(); }
+
+  // Implementation of BlockSparseMatrixBase interface.
+  virtual void ToTripletSparseMatrix(TripletSparseMatrix* matrix) const;
+  virtual const CompressedRowBlockStructure* block_structure() const;
+  virtual const double* RowBlockValues(int row_block_index) const {
+    return values_.get();
+  }
+
+ private:
+  int num_rows_;
+  int num_cols_;
+  int max_num_nonzeros_;
+  int num_nonzeros_;
+  scoped_array<double> values_;
+  scoped_ptr<CompressedRowBlockStructure> block_structure_;
+  DISALLOW_COPY_AND_ASSIGN(BlockSparseMatrix);
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_BLOCK_SPARSE_MATRIX_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_structure.cc b/extern/libmv/third_party/ceres/internal/ceres/block_structure.cc
new file mode 100644
index 00000000000..5add4f3b94d
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/block_structure.cc
@@ -0,0 +1,92 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#include "ceres/block_structure.h"
+#include "ceres/matrix_proto.h"
+
+namespace ceres {
+namespace internal {
+
+bool CellLessThan(const Cell& lhs, const Cell& rhs) {
+  return (lhs.block_id < rhs.block_id);
+}
+
+#ifndef CERES_DONT_HAVE_PROTOCOL_BUFFERS
+void ProtoToBlockStructure(const BlockStructureProto &proto,
+                           CompressedRowBlockStructure *block_structure) {
+  // Decode the column blocks.
+  block_structure->cols.resize(proto.cols_size());
+  for (int i = 0; i < proto.cols_size(); ++i) {
+    block_structure->cols[i].size = proto.cols(i).size();
+    block_structure->cols[i].position =
+        proto.cols(i).position();
+  }
+  // Decode the row structure.
+  block_structure->rows.resize(proto.rows_size());
+  for (int i = 0; i < proto.rows_size(); ++i) {
+    const CompressedRowProto &row = proto.rows(i);
+    block_structure->rows[i].block.size = row.block().size();
+    block_structure->rows[i].block.position = row.block().position();
+
+    // Copy the cells within the row.
+    block_structure->rows[i].cells.resize(row.cells_size());
+    for (int j = 0; j < row.cells_size(); ++j) {
+      const CellProto &cell = row.cells(j);
+      block_structure->rows[i].cells[j].block_id = cell.block_id();
+      block_structure->rows[i].cells[j].position = cell.position();
+    }
+  }
+}
+
+void BlockStructureToProto(const CompressedRowBlockStructure &block_structure,
+                           BlockStructureProto *proto) {
+  // Encode the column blocks.
+  for (int i = 0; i < block_structure.cols.size(); ++i) {
+    BlockProto *block = proto->add_cols();
+    block->set_size(block_structure.cols[i].size);
+    block->set_position(block_structure.cols[i].position);
+  }
+  // Encode the row structure.
+  for (int i = 0; i < block_structure.rows.size(); ++i) {
+    CompressedRowProto *row = proto->add_rows();
+    BlockProto *block = row->mutable_block();
+    block->set_size(block_structure.rows[i].block.size);
+    block->set_position(block_structure.rows[i].block.position);
+    for (int j = 0; j < block_structure.rows[i].cells.size(); ++j) {
+      CellProto *cell = row->add_cells();
+      cell->set_block_id(block_structure.rows[i].cells[j].block_id);
+      cell->set_position(block_structure.rows[i].cells[j].position);
+    }
+  }
+}
+#endif
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/block_structure.h b/extern/libmv/third_party/ceres/internal/ceres/block_structure.h
new file mode 100644
index 00000000000..f509067d216
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/block_structure.h
@@ -0,0 +1,105 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Block structure objects are used to carry information about the
+// dense block structure of sparse matrices. The BlockSparseMatrix
+// object uses the BlockStructure objects to keep track of the matrix
+// structure and operate upon it. This allows us to use more cache
+// friendly block oriented linear algebra operations on the matrix
+// instead of accessing it one scalar entry at a time.
+
+#ifndef CERES_INTERNAL_BLOCK_STRUCTURE_H_
+#define CERES_INTERNAL_BLOCK_STRUCTURE_H_
+
+#include <vector>
+#include "ceres/internal/port.h"
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+
+class BlockStructureProto;
+
+typedef int16 BlockSize;
+
+struct Block {
+  Block() : size(-1), position(-1) {}
+  Block(int size_, int position_) : size(size_), position(position_) {}
+
+  BlockSize size;
+  int position;  // Position along the row/column.
+};
+
+struct Cell {
+  Cell() : block_id(-1), position(-1) {}
+  Cell(int block_id_, int position_)
+      : block_id(block_id_), position(position_) {}
+
+  // Column or row block id as the case maybe.
+  int block_id;
+  // Where in the values array of the jacobian is this cell located.
+  int position;
+};
+
+// Order cell by their block_id;
+bool CellLessThan(const Cell& lhs, const Cell& rhs);
+
+struct CompressedList {
+  Block block;
+  vector<Cell> cells;
+};
+
+typedef CompressedList CompressedRow;
+typedef CompressedList CompressedColumn;
+
+struct CompressedRowBlockStructure {
+  vector<Block> cols;
+  vector<CompressedRow> rows;
+};
+
+struct CompressedColumnBlockStructure {
+  vector<Block> rows;
+  vector<CompressedColumn> cols;
+};
+
+// Deserialize the given block structure proto to the given block structure.
+// Destroys previous contents of block_structure.
+void ProtoToBlockStructure(const BlockStructureProto &proto,
+                           CompressedRowBlockStructure *block_structure);
+
+// Serialize the given block structure to the given proto. Destroys previous
+// contents of proto.
+void BlockStructureToProto(const CompressedRowBlockStructure &block_structure,
+                           BlockStructureProto *proto);
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_BLOCK_STRUCTURE_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.cc b/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.cc
new file mode 100644
index 00000000000..53190ada6fc
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.cc
@@ -0,0 +1,238 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: David Gallup (dgallup@google.com)
+//         Sameer Agarwal (sameeragarwal@google.com)
+
+#include "ceres/canonical_views_clustering.h"
+
+#include <glog/logging.h>
+#include "ceres/graph.h"
+#include "ceres/collections_port.h"
+#include "ceres/map_util.h"
+#include "ceres/internal/macros.h"
+
+namespace ceres {
+namespace internal {
+
+typedef HashMap<int, int> IntMap;
+typedef HashSet<int> IntSet;
+
+class CanonicalViewsClustering {
+ public:
+  CanonicalViewsClustering() {}
+
+  // Compute the canonical views clustering of the vertices of the
+  // graph. centers will contain the vertices that are the identified
+  // as the canonical views/cluster centers, and membership is a map
+  // from vertices to cluster_ids. The i^th cluster center corresponds
+  // to the i^th cluster. It is possible depending on the
+  // configuration of the clustering algorithm that some of the
+  // vertices may not be assigned to any cluster. In this case they
+  // are assigned to a cluster with id = kInvalidClusterId.
+  void ComputeClustering(const Graph<int>& graph,
+                         const CanonicalViewsClusteringOptions& options,
+                         vector<int>* centers,
+                         IntMap* membership);
+
+ private:
+  void FindValidViews(IntSet* valid_views) const;
+  double ComputeClusteringQualityDifference(const int candidate,
+                                            const vector<int>& centers) const;
+  void UpdateCanonicalViewAssignments(const int canonical_view);
+  void ComputeClusterMembership(const vector<int>& centers,
+                                IntMap* membership) const;
+
+  CanonicalViewsClusteringOptions options_;
+  const Graph<int>* graph_;
+  // Maps a view to its representative canonical view (its cluster
+  // center).
+  IntMap view_to_canonical_view_;
+  // Maps a view to its similarity to its current cluster center.
+  HashMap<int, double> view_to_canonical_view_similarity_;
+  DISALLOW_COPY_AND_ASSIGN(CanonicalViewsClustering);
+};
+
+void ComputeCanonicalViewsClustering(
+    const Graph<int>& graph,
+    const CanonicalViewsClusteringOptions& options,
+    vector<int>* centers,
+    IntMap* membership) {
+  time_t start_time = time(NULL);
+  CanonicalViewsClustering cv;
+  cv.ComputeClustering(graph, options, centers, membership);
+  VLOG(2) << "Canonical views clustering time (secs): "
+          << time(NULL) - start_time;
+}
+
+// Implementation of CanonicalViewsClustering
+void CanonicalViewsClustering::ComputeClustering(
+    const Graph<int>& graph,
+    const CanonicalViewsClusteringOptions& options,
+    vector<int>* centers,
+    IntMap* membership) {
+  options_ = options;
+  CHECK_NOTNULL(centers)->clear();
+  CHECK_NOTNULL(membership)->clear();
+  graph_ = &graph;
+
+  IntSet valid_views;
+  FindValidViews(&valid_views);
+  while (valid_views.size() > 0) {
+    // Find the next best canonical view.
+    double best_difference = -std::numeric_limits<double>::max();
+    int best_view = 0;
+
+    // TODO(sameeragarwal): Make this loop multi-threaded.
+    for (IntSet::const_iterator view = valid_views.begin();
+         view != valid_views.end();
+         ++view) {
+      const double difference =
+          ComputeClusteringQualityDifference(*view, *centers);
+      if (difference > best_difference) {
+        best_difference = difference;
+        best_view = *view;
+      }
+    }
+
+    CHECK_GT(best_difference, -std::numeric_limits<double>::max());
+
+    // Add canonical view if quality improves, or if minimum is not
+    // yet met, otherwise break.
+    if ((best_difference <= 0) &&
+        (centers->size() >= options_.min_views)) {
+      break;
+    }
+
+    centers->push_back(best_view);
+    valid_views.erase(best_view);
+    UpdateCanonicalViewAssignments(best_view);
+  }
+
+  ComputeClusterMembership(*centers, membership);
+}
+
+// Return the set of vertices of the graph which have valid vertex
+// weights.
+void CanonicalViewsClustering::FindValidViews(
+    IntSet* valid_views) const {
+  const IntSet& views = graph_->vertices();
+  for (IntSet::const_iterator view = views.begin();
+       view != views.end();
+       ++view) {
+    if (graph_->VertexWeight(*view) != Graph<int>::InvalidWeight()) {
+      valid_views->insert(*view);
+    }
+  }
+}
+
+// Computes the difference in the quality score if 'candidate' were
+// added to the set of canonical views.
+double CanonicalViewsClustering::ComputeClusteringQualityDifference(
+    const int candidate,
+    const vector<int>& centers) const {
+  // View score.
+  double difference =
+      options_.view_score_weight * graph_->VertexWeight(candidate);
+
+  // Compute how much the quality score changes if the candidate view
+  // was added to the list of canonical views and its nearest
+  // neighbors became members of its cluster.
+  const IntSet& neighbors = graph_->Neighbors(candidate);
+  for (IntSet::const_iterator neighbor = neighbors.begin();
+       neighbor != neighbors.end();
+       ++neighbor) {
+    const double old_similarity =
+        FindWithDefault(view_to_canonical_view_similarity_, *neighbor, 0.0);
+    const double new_similarity = graph_->EdgeWeight(*neighbor, candidate);
+    if (new_similarity > old_similarity) {
+      difference += new_similarity - old_similarity;
+    }
+  }
+
+  // Number of views penalty.
+  difference -= options_.size_penalty_weight;
+
+  // Orthogonality.
+  for (int i = 0; i < centers.size(); ++i) {
+    difference -= options_.similarity_penalty_weight *
+        graph_->EdgeWeight(centers[i], candidate);
+  }
+
+  return difference;
+}
+
+// Reassign views if they're more similar to the new canonical view.
+void CanonicalViewsClustering::UpdateCanonicalViewAssignments(
+    const int canonical_view) {
+  const IntSet& neighbors = graph_->Neighbors(canonical_view);
+  for (IntSet::const_iterator neighbor = neighbors.begin();
+       neighbor != neighbors.end();
+       ++neighbor) {
+    const double old_similarity =
+        FindWithDefault(view_to_canonical_view_similarity_, *neighbor, 0.0);
+    const double new_similarity =
+        graph_->EdgeWeight(*neighbor, canonical_view);
+    if (new_similarity > old_similarity) {
+      view_to_canonical_view_[*neighbor] = canonical_view;
+      view_to_canonical_view_similarity_[*neighbor] = new_similarity;
+    }
+  }
+}
+
+// Assign a cluster id to each view.
+void CanonicalViewsClustering::ComputeClusterMembership(
+    const vector<int>& centers,
+    IntMap* membership) const {
+  CHECK_NOTNULL(membership)->clear();
+
+  // The i^th cluster has cluster id i.
+  IntMap center_to_cluster_id;
+  for (int i = 0; i < centers.size(); ++i) {
+    center_to_cluster_id[centers[i]] = i;
+  }
+
+  static const int kInvalidClusterId = -1;
+
+  const IntSet& views = graph_->vertices();
+  for (IntSet::const_iterator view = views.begin();
+       view != views.end();
+       ++view) {
+    IntMap::const_iterator it =
+        view_to_canonical_view_.find(*view);
+    int cluster_id = kInvalidClusterId;
+    if (it != view_to_canonical_view_.end()) {
+      cluster_id = FindOrDie(center_to_cluster_id, it->second);
+    }
+
+    InsertOrDie(membership, *view, cluster_id);
+  }
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.h b/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.h
new file mode 100644
index 00000000000..2d1eb403995
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.h
@@ -0,0 +1,133 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// An implementation of the Canonical Views clustering algorithm from
+// "Scene Summarization for Online Image Collections", Ian Simon, Noah
+// Snavely, Steven M. Seitz, ICCV 2007.
+//
+// More details can be found at
+// http://grail.cs.washington.edu/projects/canonview/
+//
+// Ceres uses this algorithm to perform view clustering for
+// constructing visibility based preconditioners.
+
+#ifndef CERES_INTERNAL_CANONICAL_VIEWS_CLUSTERING_H_
+#define CERES_INTERNAL_CANONICAL_VIEWS_CLUSTERING_H_
+
+#include <vector>
+
+#include <glog/logging.h>
+#include "ceres/collections_port.h"
+#include "ceres/graph.h"
+#include "ceres/map_util.h"
+#include "ceres/internal/macros.h"
+
+namespace ceres {
+namespace internal {
+
+class CanonicalViewsClusteringOptions;
+
+// Compute a partitioning of the vertices of the graph using the
+// canonical views clustering algorithm.
+//
+// In the following we will use the terms vertices and views
+// interchangably.  Given a weighted Graph G(V,E), the canonical views
+// of G are the the set of vertices that best "summarize" the content
+// of the graph. If w_ij i s the weight connecting the vertex i to
+// vertex j, and C is the set of canonical views. Then the objective
+// of the canonical views algorithm is
+//
+//   E[C] = sum_[i in V] max_[j in C] w_ij
+//          - size_penalty_weight * |C|
+//          - similarity_penalty_weight * sum_[i in C, j in C, j > i] w_ij
+//
+// alpha is the size penalty that penalizes large number of canonical
+// views.
+//
+// beta is the similarity penalty that penalizes canonical views that
+// are too similar to other canonical views.
+//
+// Thus the canonical views algorithm tries to find a canonical view
+// for each vertex in the graph which best explains it, while trying
+// to minimize the number of canonical views and the overlap between
+// them.
+//
+// We further augment the above objective function by allowing for per
+// vertex weights, higher weights indicating a higher preference for
+// being chosen as a canonical view. Thus if w_i is the vertex weight
+// for vertex i, the objective function is then
+//
+//   E[C] = sum_[i in V] max_[j in C] w_ij
+//          - size_penalty_weight * |C|
+//          - similarity_penalty_weight * sum_[i in C, j in C, j > i] w_ij
+//          + view_score_weight * sum_[i in C] w_i
+//
+// centers will contain the vertices that are the identified
+// as the canonical views/cluster centers, and membership is a map
+// from vertices to cluster_ids. The i^th cluster center corresponds
+// to the i^th cluster.
+//
+// It is possible depending on the configuration of the clustering
+// algorithm that some of the vertices may not be assigned to any
+// cluster. In this case they are assigned to a cluster with id = -1;
+void ComputeCanonicalViewsClustering(
+    const Graph<int>& graph,
+    const CanonicalViewsClusteringOptions& options,
+    vector<int>* centers,
+    HashMap<int, int>* membership);
+
+struct CanonicalViewsClusteringOptions {
+  CanonicalViewsClusteringOptions()
+      : min_views(3),
+        size_penalty_weight(5.75),
+        similarity_penalty_weight(100.0),
+        view_score_weight(0.0) {
+  }
+  // The minimum number of canonical views to compute.
+  int min_views;
+
+  // Penalty weight for the number of canonical views.  A higher
+  // number will result in fewer canonical views.
+  double size_penalty_weight;
+
+  // Penalty weight for the diversity (orthogonality) of the
+  // canonical views.  A higher number will encourage less similar
+  // canonical views.
+  double similarity_penalty_weight;
+
+  // Weight for per-view scores.  Lower weight places less
+  // confidence in the view scores.
+  double view_score_weight;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_CANONICAL_VIEWS_CLUSTERING_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/casts.h b/extern/libmv/third_party/ceres/internal/ceres/casts.h
new file mode 100644
index 00000000000..99cf2186cc7
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/casts.h
@@ -0,0 +1,108 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+
+#ifndef CERES_INTERNAL_CASTS_H_
+#define CERES_INTERNAL_CASTS_H_
+
+#include <cassert>
+#include <cstddef>  // For NULL.
+
+namespace ceres {
+
+// Identity metafunction.
+template <class T>
+struct identity_ {
+  typedef T type;
+};
+
+// Use implicit_cast as a safe version of static_cast or const_cast
+// for implicit conversions. For example:
+// - Upcasting in a type hierarchy.
+// - Performing arithmetic conversions (int32 to int64, int to double, etc.).
+// - Adding const or volatile qualifiers.
+//
+// In general, implicit_cast can be used to convert this code
+//   To to = from;
+//   DoSomething(to);
+// to this
+//   DoSomething(implicit_cast<To>(from));
+//
+// base::identity_ is used to make a non-deduced context, which
+// forces all callers to explicitly specify the template argument.
+template<typename To>
+inline To implicit_cast(typename identity_<To>::type to) {
+  return to;
+}
+
+// This version of implicit_cast is used when two template arguments
+// are specified. It's obsolete and should not be used.
+template<typename To, typename From>
+inline To implicit_cast(typename identity_<From>::type const &f) {
+  return f;
+}
+
+// When you upcast (that is, cast a pointer from type Foo to type
+// SuperclassOfFoo), it's fine to use implicit_cast<>, since upcasts
+// always succeed.  When you downcast (that is, cast a pointer from
+// type Foo to type SubclassOfFoo), static_cast<> isn't safe, because
+// how do you know the pointer is really of type SubclassOfFoo?  It
+// could be a bare Foo, or of type DifferentSubclassOfFoo.  Thus,
+// when you downcast, you should use this macro.  In debug mode, we
+// use dynamic_cast<> to double-check the downcast is legal (we die
+// if it's not).  In normal mode, we do the efficient static_cast<>
+// instead.  Thus, it's important to test in debug mode to make sure
+// the cast is legal!
+//    This is the only place in the code we should use dynamic_cast<>.
+// In particular, you SHOULDN'T be using dynamic_cast<> in order to
+// do RTTI (eg code like this:
+//    if (dynamic_cast<Subclass1>(foo)) HandleASubclass1Object(foo);
+//    if (dynamic_cast<Subclass2>(foo)) HandleASubclass2Object(foo);
+// You should design the code some other way not to need this.
+
+template<typename To, typename From>     // use like this: down_cast<T*>(foo);
+inline To down_cast(From* f) {                   // so we only accept pointers
+  // Ensures that To is a sub-type of From *.  This test is here only
+  // for compile-time type checking, and has no overhead in an
+  // optimized build at run-time, as it will be optimized away
+  // completely.
+
+  // TODO(csilvers): This should use COMPILE_ASSERT.
+  if (false) {
+    implicit_cast<From*, To>(NULL);
+  }
+
+  // uses RTTI in dbg and fastbuild. asserts are disabled in opt builds.
+  assert(f == NULL || dynamic_cast<To>(f) != NULL);  // NOLINT
+  return static_cast<To>(f);
+}
+
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_CASTS_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/cgnr_linear_operator.h b/extern/libmv/third_party/ceres/internal/ceres/cgnr_linear_operator.h
new file mode 100644
index 00000000000..f32d8d95c19
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/cgnr_linear_operator.h
@@ -0,0 +1,120 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+
+#ifndef CERES_INTERNAL_CGNR_LINEAR_OPERATOR_H_
+#define CERES_INTERNAL_CGNR_LINEAR_OPERATOR_H_
+
+#include <algorithm>
+#include "ceres/linear_operator.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+class SparseMatrix;
+
+// A linear operator which takes a matrix A and a diagonal vector D and
+// performs products of the form
+//
+//   (A^T A + D^T D)x
+//
+// This is used to implement iterative general sparse linear solving with
+// conjugate gradients, where A is the Jacobian and D is a regularizing
+// parameter. A brief proof that D^T D is the correct regularizer:
+//
+// Given a regularized least squares problem:
+//
+//   min  ||Ax - b||^2 + ||Dx||^2
+//    x
+//
+// First expand into matrix notation:
+//
+//   (Ax - b)^T (Ax - b) + xD^TDx
+//
+// Then multiply out to get:
+//
+//   = xA^TAx - 2b^T Ax + b^Tb + xD^TDx
+//
+// Take the derivative:
+//
+//   0 = 2A^TAx - 2A^T b + 2 D^TDx
+//   0 = A^TAx - A^T b + D^TDx
+//   0 = (A^TA + D^TD)x - A^T b
+//
+// Thus, the symmetric system we need to solve for CGNR is
+//
+//   Sx = z
+//
+// with S = A^TA + D^TD
+//  and z = A^T b
+//
+// Note: This class is not thread safe, since it uses some temporary storage.
+class CgnrLinearOperator : public LinearOperator {
+ public:
+  CgnrLinearOperator(const LinearOperator& A, const double *D)
+      : A_(A), D_(D), z_(new double[A.num_rows()]) {
+  }
+  virtual ~CgnrLinearOperator() {}
+
+  virtual void RightMultiply(const double* x, double* y) const {
+    std::fill(z_.get(), z_.get() + A_.num_rows(), 0.0);
+
+    // z = Ax
+    A_.RightMultiply(x, z_.get());
+
+    // y = y + Atz
+    A_.LeftMultiply(z_.get(), y);
+
+    // y = y + DtDx
+    if (D_ != NULL) {
+      int n = A_.num_cols();
+      VectorRef(y, n).array() += ConstVectorRef(D_, n).array().square() *
+                                 ConstVectorRef(x, n).array();
+    }
+  }
+
+  virtual void LeftMultiply(const double* x, double* y) const {
+    RightMultiply(x, y);
+  }
+
+  virtual int num_rows() const { return A_.num_cols(); }
+  virtual int num_cols() const { return A_.num_cols(); }
+
+ private:
+  const LinearOperator& A_;
+  const double* D_;
+  scoped_array<double> z_;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_CGNR_LINEAR_OPERATOR_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.cc b/extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.cc
new file mode 100644
index 00000000000..ccc8026f9f7
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.cc
@@ -0,0 +1,80 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+
+#include "ceres/cgnr_solver.h"
+
+#include "glog/logging.h"
+#include "ceres/linear_solver.h"
+#include "ceres/cgnr_linear_operator.h"
+#include "ceres/conjugate_gradients_solver.h"
+#include "ceres/block_jacobi_preconditioner.h"
+
+namespace ceres {
+namespace internal {
+
+CgnrSolver::CgnrSolver(const LinearSolver::Options& options)
+  : options_(options),
+    jacobi_preconditioner_(NULL) {
+}
+
+LinearSolver::Summary CgnrSolver::Solve(
+    LinearOperator* A,
+    const double* b,
+    const LinearSolver::PerSolveOptions& per_solve_options,
+    double* x) {
+  // Form z = Atb.
+  scoped_array<double> z(new double[A->num_cols()]);
+  std::fill(z.get(), z.get() + A->num_cols(), 0.0);
+  A->LeftMultiply(b, z.get());
+
+  // Precondition if necessary.
+  LinearSolver::PerSolveOptions cg_per_solve_options = per_solve_options;
+  if (options_.preconditioner_type == JACOBI) {
+    if (jacobi_preconditioner_.get() == NULL) {
+      jacobi_preconditioner_.reset(new BlockJacobiPreconditioner(*A));
+    }
+    jacobi_preconditioner_->Update(*A, per_solve_options.D);
+    cg_per_solve_options.preconditioner = jacobi_preconditioner_.get();
+  } else if (options_.preconditioner_type != IDENTITY) {
+    LOG(FATAL) << "CGNR only supports IDENTITY and JACOBI preconditioners.";
+  }
+
+  // Solve (AtA + DtD)x = z (= Atb).
+  std::fill(x, x + A->num_cols(), 0.0);
+  CgnrLinearOperator lhs(*A, per_solve_options.D);
+  ConjugateGradientsSolver conjugate_gradient_solver(options_);
+  return conjugate_gradient_solver.Solve(&lhs,
+                                         z.get(),
+                                         cg_per_solve_options,
+                                         x);
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.h b/extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.h
new file mode 100644
index 00000000000..dd36f99006b
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.h
@@ -0,0 +1,66 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+
+#ifndef CERES_INTERNAL_CGNR_SOLVER_H_
+#define CERES_INTERNAL_CGNR_SOLVER_H_
+
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/linear_solver.h"
+
+namespace ceres {
+namespace internal {
+
+class BlockJacobiPreconditioner;
+
+// A conjugate gradients on the normal equations solver. This directly solves
+// for the solution to
+//
+//   (A^T A + D^T D)x = A^T b
+//
+// as required for solving for x in the least squares sense. Currently only
+// block diagonal preconditioning is supported.
+class CgnrSolver : public LinearSolver {
+ public:
+  explicit CgnrSolver(const LinearSolver::Options& options);
+  virtual Summary Solve(LinearOperator* A,
+                        const double* b,
+                        const LinearSolver::PerSolveOptions& per_solve_options,
+                        double* x);
+
+ private:
+  const LinearSolver::Options options_;
+  scoped_ptr<BlockJacobiPreconditioner> jacobi_preconditioner_;
+  DISALLOW_COPY_AND_ASSIGN(CgnrSolver);
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_CGNR_SOLVER_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/collections_port.h b/extern/libmv/third_party/ceres/internal/ceres/collections_port.h
new file mode 100644
index 00000000000..55f72539023
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/collections_port.h
@@ -0,0 +1,141 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//
+// Portable HashMap and HashSet, and a specialized overload for hashing pairs.
+
+#ifndef CERES_INTERNAL_COLLECTIONS_PORT_H_
+#define CERES_INTERNAL_COLLECTIONS_PORT_H_
+
+#if defined(_MSC_VER) && _MSC_VER <= 1600
+#include <unordered_map>
+#include <unordered_set>
+#else
+#include <tr1/unordered_map>
+#include <tr1/unordered_set>
+#endif
+#include <utility>
+#include "ceres/integral_types.h"
+#include "ceres/internal/port.h"
+
+namespace ceres {
+namespace internal {
+
+template<typename K, typename V>
+struct HashMap : tr1::unordered_map<K, V> {};
+
+template<typename K>
+struct HashSet : tr1::unordered_set<K> {};
+
+#if defined(_WIN32) && !defined(__MINGW64__) && !defined(__MINGW32__)
+#define GG_LONGLONG(x) x##I64
+#define GG_ULONGLONG(x) x##UI64
+#else
+#define GG_LONGLONG(x) x##LL
+#define GG_ULONGLONG(x) x##ULL
+#endif
+
+// The hash function is due to Bob Jenkins (see
+// http://burtleburtle.net/bob/hash/index.html). Each mix takes 36 instructions,
+// in 18 cycles if you're lucky. On x86 architectures, this requires 45
+// instructions in 27 cycles, if you're lucky.
+//
+// 32bit version
+inline void hash_mix(uint32& a, uint32& b, uint32& c) {
+  a -= b; a -= c; a ^= (c>>13);
+  b -= c; b -= a; b ^= (a<<8);
+  c -= a; c -= b; c ^= (b>>13);
+  a -= b; a -= c; a ^= (c>>12);
+  b -= c; b -= a; b ^= (a<<16);
+  c -= a; c -= b; c ^= (b>>5);
+  a -= b; a -= c; a ^= (c>>3);
+  b -= c; b -= a; b ^= (a<<10);
+  c -= a; c -= b; c ^= (b>>15);
+}
+
+// 64bit version
+inline void hash_mix(uint64& a, uint64& b, uint64& c) {
+  a -= b; a -= c; a ^= (c>>43);
+  b -= c; b -= a; b ^= (a<<9);
+  c -= a; c -= b; c ^= (b>>8);
+  a -= b; a -= c; a ^= (c>>38);
+  b -= c; b -= a; b ^= (a<<23);
+  c -= a; c -= b; c ^= (b>>5);
+  a -= b; a -= c; a ^= (c>>35);
+  b -= c; b -= a; b ^= (a<<49);
+  c -= a; c -= b; c ^= (b>>11);
+}
+
+inline uint32 Hash32NumWithSeed(uint32 num, uint32 c) {
+  // The golden ratio; an arbitrary value.
+  uint32 b = 0x9e3779b9UL;
+  hash_mix(num, b, c);
+  return c;
+}
+
+inline uint64 Hash64NumWithSeed(uint64 num, uint64 c) {
+  // More of the golden ratio.
+  uint64 b = GG_ULONGLONG(0xe08c1d668b756f82);
+  hash_mix(num, b, c);
+  return c;
+}
+
+}  // namespace internal
+}  // namespace ceres
+
+// Since on some platforms this is a doubly-nested namespace (std::tr1) and
+// others it is not, the entire namespace line must be in a macro.
+CERES_HASH_NAMESPACE_START
+
+// The outrageously annoying specializations below are for portability reasons.
+// In short, it's not possible to have two overloads of hash<pair<T1, T2>
+
+// Hasher for STL pairs. Requires hashers for both members to be defined.
+template<typename T>
+struct hash<pair<T, T> > {
+  size_t operator()(const pair<T, T>& p) const {
+    size_t h1 = hash<T>()(p.first);
+    size_t h2 = hash<T>()(p.second);
+    // The decision below is at compile time
+    return (sizeof(h1) <= sizeof(ceres::internal::uint32)) ?
+            ceres::internal::Hash32NumWithSeed(h1, h2) :
+            ceres::internal::Hash64NumWithSeed(h1, h2);
+  }
+  // Less than operator for MSVC.
+  bool operator()(const pair<T, T>& a,
+                  const pair<T, T>& b) const {
+    return a < b;
+  }
+  static const size_t bucket_size = 4;  // These are required by MSVC
+  static const size_t min_buckets = 8;  // 4 and 8 are defaults.
+};
+
+CERES_HASH_NAMESPACE_END
+
+#endif  // CERES_INTERNAL_COLLECTIONS_PORT_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/compressed_row_jacobian_writer.cc b/extern/libmv/third_party/ceres/internal/ceres/compressed_row_jacobian_writer.cc
new file mode 100644
index 00000000000..aa883b7d353
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/compressed_row_jacobian_writer.cc
@@ -0,0 +1,201 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+
+#include "ceres/compressed_row_jacobian_writer.h"
+
+#include "ceres/casts.h"
+#include "ceres/compressed_row_sparse_matrix.h"
+#include "ceres/parameter_block.h"
+#include "ceres/program.h"
+#include "ceres/residual_block.h"
+#include "ceres/scratch_evaluate_preparer.h"
+
+namespace ceres {
+namespace internal {
+
+SparseMatrix* CompressedRowJacobianWriter::CreateJacobian() const {
+  const vector<ResidualBlock*>& residual_blocks =
+      program_->residual_blocks();
+
+  int total_num_residuals = program_->NumResiduals();
+  int total_num_effective_parameters = program_->NumEffectiveParameters();
+
+  // Count the number of jacobian nonzeros.
+  int num_jacobian_nonzeros = 0;
+  for (int i = 0; i < residual_blocks.size(); ++i) {
+    ResidualBlock* residual_block = residual_blocks[i];
+    const int num_residuals = residual_block->NumResiduals();
+    const int num_parameter_blocks = residual_block->NumParameterBlocks();
+    for (int j = 0; j < num_parameter_blocks; ++j) {
+      ParameterBlock* parameter_block = residual_block->parameter_blocks()[j];
+      if (!parameter_block->IsConstant()) {
+        num_jacobian_nonzeros += num_residuals * parameter_block->LocalSize();
+      }
+    }
+  }
+
+  // Allocate storage for the jacobian with some extra space at the end.
+  // Allocate more space than needed to store the jacobian so that when the LM
+  // algorithm adds the diagonal, no reallocation is necessary. This reduces
+  // peak memory usage significantly.
+  CompressedRowSparseMatrix* jacobian =
+      new CompressedRowSparseMatrix(
+          total_num_residuals,
+          total_num_effective_parameters,
+          num_jacobian_nonzeros + total_num_effective_parameters);
+
+  // At this stage, the CompressedSparseMatrix is an invalid state. But this
+  // seems to be the only way to construct it without doing a memory copy.
+  int* rows = jacobian->mutable_rows();
+  int* cols = jacobian->mutable_cols();
+  int row_pos = 0;
+  rows[0] = 0;
+  for (int i = 0; i < residual_blocks.size(); ++i) {
+    const ResidualBlock* residual_block = residual_blocks[i];
+    const int num_parameter_blocks = residual_block->NumParameterBlocks();
+
+    // Count the number of derivatives for a row of this residual block and
+    // build a list of active parameter block indices.
+    int num_derivatives = 0;
+    vector<int> parameter_indices;
+    for (int j = 0; j < num_parameter_blocks; ++j) {
+      ParameterBlock* parameter_block = residual_block->parameter_blocks()[j];
+      if (!parameter_block->IsConstant()) {
+        parameter_indices.push_back(parameter_block->index());
+        num_derivatives += parameter_block->LocalSize();
+      }
+    }
+
+    // Sort the parameters by their position in the state vector.
+    sort(parameter_indices.begin(), parameter_indices.end());
+    CHECK(unique(parameter_indices.begin(), parameter_indices.end()) ==
+          parameter_indices.end())
+          << "Ceres internal error:  "
+          << "Duplicate parameter blocks detected in a cost function. "
+          << "This should never happen. Please report this to "
+          << "the Ceres developers.";
+
+    // Update the row indices.
+    const int num_residuals = residual_block->NumResiduals();
+    for (int j = 0; j < num_residuals; ++j) {
+      rows[row_pos + j + 1] = rows[row_pos + j] + num_derivatives;
+    }
+
+    // Iterate over parameter blocks in the order which they occur in the
+    // parameter vector. This code mirrors that in Write(), where jacobian
+    // values are updated.
+    int col_pos = 0;
+    for (int j = 0; j < parameter_indices.size(); ++j) {
+      ParameterBlock* parameter_block =
+          program_->parameter_blocks()[parameter_indices[j]];
+      const int parameter_block_size = parameter_block->LocalSize();
+
+      for (int r = 0; r < num_residuals; ++r) {
+        // This is the position in the values array of the jacobian where this
+        // row of the jacobian block should go.
+        const int column_block_begin = rows[row_pos + r] + col_pos;
+
+        for (int c = 0; c < parameter_block_size; ++c) {
+          cols[column_block_begin + c] = parameter_block->delta_offset() + c;
+        }
+      }
+      col_pos += parameter_block_size;
+    }
+    row_pos += num_residuals;
+  }
+
+  CHECK_EQ(num_jacobian_nonzeros, rows[total_num_residuals]);
+  return jacobian;
+}
+
+void CompressedRowJacobianWriter::Write(int residual_id,
+                                        int residual_offset,
+                                        double **jacobians,
+                                        SparseMatrix* base_jacobian) {
+  CompressedRowSparseMatrix* jacobian =
+      down_cast<CompressedRowSparseMatrix*>(base_jacobian);
+
+  double* jacobian_values = jacobian->mutable_values();
+  const int* jacobian_rows = jacobian->rows();
+
+  const ResidualBlock* residual_block =
+      program_->residual_blocks()[residual_id];
+  const int num_parameter_blocks = residual_block->NumParameterBlocks();
+  const int num_residuals = residual_block->NumResiduals();
+
+  // It is necessary to determine the order of the jacobian blocks before
+  // copying them into the CompressedRowSparseMatrix. Just because a cost
+  // function uses parameter blocks 1 after 2 in its arguments does not mean
+  // that the block 1 occurs before block 2 in the column layout of the
+  // jacobian. Thus, determine the order by sorting the jacobian blocks by their
+  // position in the state vector.
+  vector<pair<int, int> > evaluated_jacobian_blocks;
+  for (int j = 0; j < num_parameter_blocks; ++j) {
+    const ParameterBlock* parameter_block =
+        residual_block->parameter_blocks()[j];
+    if (!parameter_block->IsConstant()) {
+      evaluated_jacobian_blocks.push_back(
+          make_pair(parameter_block->index(), j));
+    }
+  }
+  sort(evaluated_jacobian_blocks.begin(), evaluated_jacobian_blocks.end());
+
+  // Where in the current row does the jacobian for a parameter block begin.
+  int col_pos = 0;
+
+  // Iterate over the jacobian blocks in increasing order of their
+  // positions in the reduced parameter vector.
+  for (int i = 0; i < evaluated_jacobian_blocks.size(); ++i) {
+    const ParameterBlock* parameter_block =
+        program_->parameter_blocks()[evaluated_jacobian_blocks[i].first];
+    const int argument = evaluated_jacobian_blocks[i].second;
+    const int parameter_block_size = parameter_block->LocalSize();
+
+    // Copy one row of the jacobian block at a time.
+    for (int r = 0; r < num_residuals; ++r) {
+      // Position of the r^th row of the current jacobian block.
+      const double* block_row_begin =
+          jacobians[argument] + r * parameter_block_size;
+
+      // Position in the values array of the jacobian where this
+      // row of the jacobian block should go.
+      double* column_block_begin =
+          jacobian_values + jacobian_rows[residual_offset + r] + col_pos;
+
+      copy(block_row_begin,
+           block_row_begin + parameter_block_size,
+           column_block_begin);
+    }
+    col_pos += parameter_block_size;
+  }
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/compressed_row_jacobian_writer.h b/extern/libmv/third_party/ceres/internal/ceres/compressed_row_jacobian_writer.h
new file mode 100644
index 00000000000..c103165eaf1
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/compressed_row_jacobian_writer.h
@@ -0,0 +1,75 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//
+// A jacobian writer that directly writes to compressed row sparse matrices.
+
+#ifndef CERES_INTERNAL_COMPRESSED_ROW_JACOBIAN_WRITER_H_
+#define CERES_INTERNAL_COMPRESSED_ROW_JACOBIAN_WRITER_H_
+
+#include "ceres/evaluator.h"
+#include "ceres/scratch_evaluate_preparer.h"
+
+namespace ceres {
+namespace internal {
+
+class Program;
+class SparseMatrix;
+
+class CompressedRowJacobianWriter {
+ public:
+  CompressedRowJacobianWriter(Evaluator::Options /* ignored */,
+                              Program* program)
+    : program_(program) {
+  }
+
+  // JacobianWriter interface.
+
+  // Since the compressed row matrix has different layout than that assumed by
+  // the cost functions, use scratch space to store the jacobians temporarily
+  // then copy them over to the larger jacobian in the Write() function.
+  ScratchEvaluatePreparer* CreateEvaluatePreparers(int num_threads) {
+    return ScratchEvaluatePreparer::Create(*program_, num_threads);
+  }
+
+  SparseMatrix* CreateJacobian() const;
+
+  void Write(int residual_id,
+             int residual_offset,
+             double **jacobians,
+             SparseMatrix* base_jacobian);
+
+ private:
+  Program* program_;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_COMPRESSED_ROW_JACOBIAN_WRITER_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.cc b/extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.cc
new file mode 100644
index 00000000000..95edf5396af
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.cc
@@ -0,0 +1,334 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#include "ceres/compressed_row_sparse_matrix.h"
+
+#include <algorithm>
+#include <vector>
+#include "ceres/matrix_proto.h"
+#include "ceres/internal/port.h"
+
+namespace ceres {
+namespace internal {
+namespace {
+
+// Helper functor used by the constructor for reordering the contents
+// of a TripletSparseMatrix.
+struct RowColLessThan {
+  RowColLessThan(const int* rows, const int* cols)
+      : rows(rows), cols(cols) {
+  }
+
+  bool operator()(const int x, const int y) const {
+    if (rows[x] == rows[y]) {
+      return (cols[x] < cols[y]);
+    }
+    return (rows[x] < rows[y]);
+  }
+
+  const int* rows;
+  const int* cols;
+};
+
+}  // namespace
+
+// This constructor gives you a semi-initialized CompressedRowSparseMatrix.
+CompressedRowSparseMatrix::CompressedRowSparseMatrix(int num_rows,
+                                                     int num_cols,
+                                                     int max_num_nonzeros) {
+  num_rows_ = num_rows;
+  num_cols_ = num_cols;
+  max_num_nonzeros_ = max_num_nonzeros;
+
+  VLOG(1) << "# of rows: " << num_rows_ << " # of columns: " << num_cols_
+          << " max_num_nonzeros: " << max_num_nonzeros_
+          << ". Allocating " << (num_rows_ + 1) * sizeof(int) +  // NOLINT
+      max_num_nonzeros_ * sizeof(int) +  // NOLINT
+      max_num_nonzeros_ * sizeof(double);  // NOLINT
+
+  rows_.reset(new int[num_rows_ + 1]);
+  cols_.reset(new int[max_num_nonzeros_]);
+  values_.reset(new double[max_num_nonzeros_]);
+
+  fill(rows_.get(), rows_.get() + num_rows_ + 1, 0);
+  fill(cols_.get(), cols_.get() + max_num_nonzeros_, 0);
+  fill(values_.get(), values_.get() + max_num_nonzeros_, 0);
+}
+
+CompressedRowSparseMatrix::CompressedRowSparseMatrix(
+    const TripletSparseMatrix& m) {
+  num_rows_ = m.num_rows();
+  num_cols_ = m.num_cols();
+  max_num_nonzeros_ = m.max_num_nonzeros();
+
+  // index is the list of indices into the TripletSparseMatrix m.
+  vector<int> index(m.num_nonzeros(), 0);
+  for (int i = 0; i < m.num_nonzeros(); ++i) {
+    index[i] = i;
+  }
+
+  // Sort index such that the entries of m are ordered by row and ties
+  // are broken by column.
+  sort(index.begin(), index.end(), RowColLessThan(m.rows(), m.cols()));
+
+  VLOG(1) << "# of rows: " << num_rows_ << " # of columns: " << num_cols_
+          << " max_num_nonzeros: " << max_num_nonzeros_
+          << ". Allocating " << (num_rows_ + 1) * sizeof(int) +  // NOLINT
+      max_num_nonzeros_ * sizeof(int) +  // NOLINT
+      max_num_nonzeros_ * sizeof(double);  // NOLINT
+
+  rows_.reset(new int[num_rows_ + 1]);
+  cols_.reset(new int[max_num_nonzeros_]);
+  values_.reset(new double[max_num_nonzeros_]);
+
+  // rows_ = 0
+  fill(rows_.get(), rows_.get() + num_rows_ + 1, 0);
+
+  // Copy the contents of the cols and values array in the order given
+  // by index and count the number of entries in each row.
+  for (int i = 0; i < m.num_nonzeros(); ++i) {
+    const int idx = index[i];
+    ++rows_[m.rows()[idx] + 1];
+    cols_[i] = m.cols()[idx];
+    values_[i] = m.values()[idx];
+  }
+
+  // Find the cumulative sum of the row counts.
+  for (int i = 1; i < num_rows_ + 1; ++i) {
+    rows_[i] += rows_[i-1];
+  }
+
+  CHECK_EQ(num_nonzeros(), m.num_nonzeros());
+}
+
+#ifndef CERES_DONT_HAVE_PROTOCOL_BUFFERS
+CompressedRowSparseMatrix::CompressedRowSparseMatrix(
+    const SparseMatrixProto& outer_proto) {
+  CHECK(outer_proto.has_compressed_row_matrix());
+
+  const CompressedRowSparseMatrixProto& proto =
+      outer_proto.compressed_row_matrix();
+
+  num_rows_ = proto.num_rows();
+  num_cols_ = proto.num_cols();
+
+  rows_.reset(new int[proto.rows_size()]);
+  cols_.reset(new int[proto.cols_size()]);
+  values_.reset(new double[proto.values_size()]);
+
+  for (int i = 0; i < proto.rows_size(); ++i) {
+    rows_[i] = proto.rows(i);
+  }
+
+  CHECK_EQ(proto.rows_size(), num_rows_ + 1);
+  CHECK_EQ(proto.cols_size(), proto.values_size());
+  CHECK_EQ(proto.cols_size(), rows_[num_rows_]);
+
+  for (int i = 0; i < proto.cols_size(); ++i) {
+    cols_[i] = proto.cols(i);
+    values_[i] = proto.values(i);
+  }
+
+  max_num_nonzeros_ = proto.cols_size();
+}
+#endif
+
+CompressedRowSparseMatrix::CompressedRowSparseMatrix(const double* diagonal,
+                                                     int num_rows) {
+  CHECK_NOTNULL(diagonal);
+
+  num_rows_ = num_rows;
+  num_cols_ = num_rows;
+  max_num_nonzeros_ = num_rows;
+
+  rows_.reset(new int[num_rows_ + 1]);
+  cols_.reset(new int[num_rows_]);
+  values_.reset(new double[num_rows_]);
+
+  rows_[0] = 0;
+  for (int i = 0; i < num_rows_; ++i) {
+    cols_[i] = i;
+    values_[i] = diagonal[i];
+    rows_[i + 1] = i + 1;
+  }
+
+  CHECK_EQ(num_nonzeros(), num_rows);
+}
+
+CompressedRowSparseMatrix::~CompressedRowSparseMatrix() {
+}
+
+void CompressedRowSparseMatrix::SetZero() {
+  fill(values_.get(), values_.get() + num_nonzeros(), 0.0);
+}
+
+void CompressedRowSparseMatrix::RightMultiply(const double* x,
+                                              double* y) const {
+  CHECK_NOTNULL(x);
+  CHECK_NOTNULL(y);
+
+  for (int r = 0; r < num_rows_; ++r) {
+    for (int idx = rows_[r]; idx < rows_[r + 1]; ++idx) {
+      y[r] += values_[idx] * x[cols_[idx]];
+    }
+  }
+}
+
+void CompressedRowSparseMatrix::LeftMultiply(const double* x, double* y) const {
+  CHECK_NOTNULL(x);
+  CHECK_NOTNULL(y);
+
+  for (int r = 0; r < num_rows_; ++r) {
+    for (int idx = rows_[r]; idx < rows_[r + 1]; ++idx) {
+      y[cols_[idx]] += values_[idx] * x[r];
+    }
+  }
+}
+
+void CompressedRowSparseMatrix::SquaredColumnNorm(double* x) const {
+  CHECK_NOTNULL(x);
+
+  fill(x, x + num_cols_, 0.0);
+  for (int idx = 0; idx < rows_[num_rows_]; ++idx) {
+    x[cols_[idx]] += values_[idx] * values_[idx];
+  }
+}
+
+void CompressedRowSparseMatrix::ScaleColumns(const double* scale) {
+  CHECK_NOTNULL(scale);
+
+  for (int idx = 0; idx < rows_[num_rows_]; ++idx) {
+    values_[idx] *= scale[cols_[idx]];
+  }
+}
+
+void CompressedRowSparseMatrix::ToDenseMatrix(Matrix* dense_matrix) const {
+  CHECK_NOTNULL(dense_matrix);
+  dense_matrix->resize(num_rows_, num_cols_);
+  dense_matrix->setZero();
+
+  for (int r = 0; r < num_rows_; ++r) {
+    for (int idx = rows_[r]; idx < rows_[r + 1]; ++idx) {
+      (*dense_matrix)(r, cols_[idx]) = values_[idx];
+    }
+  }
+}
+
+#ifndef CERES_DONT_HAVE_PROTOCOL_BUFFERS
+void CompressedRowSparseMatrix::ToProto(SparseMatrixProto* outer_proto) const {
+  CHECK_NOTNULL(outer_proto);
+
+  outer_proto->Clear();
+  CompressedRowSparseMatrixProto* proto
+      = outer_proto->mutable_compressed_row_matrix();
+
+  proto->set_num_rows(num_rows_);
+  proto->set_num_cols(num_cols_);
+
+  for (int r = 0; r < num_rows_ + 1; ++r) {
+    proto->add_rows(rows_[r]);
+  }
+
+  for (int idx = 0; idx < rows_[num_rows_]; ++idx) {
+    proto->add_cols(cols_[idx]);
+    proto->add_values(values_[idx]);
+  }
+}
+#endif
+
+void CompressedRowSparseMatrix::DeleteRows(int delta_rows) {
+  CHECK_GE(delta_rows, 0);
+  CHECK_LE(delta_rows, num_rows_);
+
+  int new_num_rows = num_rows_ - delta_rows;
+
+  num_rows_ = new_num_rows;
+  int* new_rows = new int[num_rows_ + 1];
+  copy(rows_.get(), rows_.get() + num_rows_ + 1, new_rows);
+  rows_.reset(new_rows);
+}
+
+void CompressedRowSparseMatrix::AppendRows(const CompressedRowSparseMatrix& m) {
+  CHECK_EQ(m.num_cols(), num_cols_);
+
+  // Check if there is enough space. If not, then allocate new arrays
+  // to hold the combined matrix and copy the contents of this matrix
+  // into it.
+  if (max_num_nonzeros_ < num_nonzeros() + m.num_nonzeros()) {
+    int new_max_num_nonzeros =  num_nonzeros() + m.num_nonzeros();
+
+    VLOG(1) << "Reallocating " << sizeof(int) * new_max_num_nonzeros;  // NOLINT
+
+    int* new_cols = new int[new_max_num_nonzeros];
+    copy(cols_.get(), cols_.get() + max_num_nonzeros_, new_cols);
+    cols_.reset(new_cols);
+
+    double* new_values = new double[new_max_num_nonzeros];
+    copy(values_.get(), values_.get() + max_num_nonzeros_, new_values);
+    values_.reset(new_values);
+
+    max_num_nonzeros_ = new_max_num_nonzeros;
+  }
+
+  // Copy the contents of m into this matrix.
+  copy(m.cols(), m.cols() + m.num_nonzeros(), cols_.get() + num_nonzeros());
+  copy(m.values(),
+       m.values() + m.num_nonzeros(),
+       values_.get() + num_nonzeros());
+
+  // Create the new rows array to hold the enlarged matrix.
+  int* new_rows = new int[num_rows_ + m.num_rows() + 1];
+  // The first num_rows_ entries are the same
+  copy(rows_.get(), rows_.get() + num_rows_, new_rows);
+
+  // new_rows = [rows_, m.row() + rows_[num_rows_]]
+  fill(new_rows + num_rows_,
+       new_rows + num_rows_ + m.num_rows() + 1,
+       rows_[num_rows_]);
+
+  for (int r = 0; r < m.num_rows() + 1; ++r) {
+    new_rows[num_rows_ + r] += m.rows()[r];
+  }
+
+  rows_.reset(new_rows);
+  num_rows_ += m.num_rows();
+}
+
+void CompressedRowSparseMatrix::ToTextFile(FILE* file) const {
+  CHECK_NOTNULL(file);
+  for (int r = 0; r < num_rows_; ++r) {
+    for (int idx = rows_[r]; idx < rows_[r + 1]; ++idx) {
+      fprintf(file, "% 10d % 10d %17f\n", r, cols_[idx], values_[idx]);
+    }
+  }
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.h b/extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.h
new file mode 100644
index 00000000000..9a39d28e111
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.h
@@ -0,0 +1,129 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#ifndef CERES_INTERNAL_COMPRESSED_ROW_SPARSE_MATRIX_H_
+#define CERES_INTERNAL_COMPRESSED_ROW_SPARSE_MATRIX_H_
+
+#include <glog/logging.h>
+#include "ceres/sparse_matrix.h"
+#include "ceres/triplet_sparse_matrix.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/macros.h"
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+
+class SparseMatrixProto;
+
+class CompressedRowSparseMatrix : public SparseMatrix {
+ public:
+  // Build a matrix with the same content as the TripletSparseMatrix
+  // m. TripletSparseMatrix objects are easier to construct
+  // incrementally, so we use them to initialize SparseMatrix
+  // objects.
+  //
+  // We assume that m does not have any repeated entries.
+  explicit CompressedRowSparseMatrix(const TripletSparseMatrix& m);
+#ifndef CERES_DONT_HAVE_PROTOCOL_BUFFERS
+  explicit CompressedRowSparseMatrix(const SparseMatrixProto& proto);
+#endif
+
+  // Use this constructor only if you know what you are doing. This
+  // creates a "blank" matrix with the appropriate amount of memory
+  // allocated. However, the object itself is in an inconsistent state
+  // as the rows and cols matrices do not match the values of
+  // num_rows, num_cols and max_num_nonzeros.
+  //
+  // The use case for this constructor is that when the user knows the
+  // size of the matrix to begin with and wants to update the layout
+  // manually, instead of going via the indirect route of first
+  // constructing a TripletSparseMatrix, which leads to more than
+  // double the peak memory usage.
+  CompressedRowSparseMatrix(int num_rows,
+                            int num_cols,
+                            int max_num_nonzeros);
+
+  // Build a square sparse diagonal matrix with num_rows rows and
+  // columns. The diagonal m(i,i) = diagonal(i);
+  CompressedRowSparseMatrix(const double* diagonal, int num_rows);
+
+  virtual ~CompressedRowSparseMatrix();
+
+  // SparseMatrix interface.
+  virtual void SetZero();
+  virtual void RightMultiply(const double* x, double* y) const;
+  virtual void LeftMultiply(const double* x, double* y) const;
+  virtual void SquaredColumnNorm(double* x) const;
+  virtual void ScaleColumns(const double* scale);
+
+  virtual void ToDenseMatrix(Matrix* dense_matrix) const;
+#ifndef CERES_DONT_HAVE_PROTOCOL_BUFFERS
+  virtual void ToProto(SparseMatrixProto* proto) const;
+#endif
+  virtual void ToTextFile(FILE* file) const;
+  virtual int num_rows() const { return num_rows_; }
+  virtual int num_cols() const { return num_cols_; }
+  virtual int num_nonzeros() const { return rows_[num_rows_]; }
+  virtual const double* values() const { return values_.get(); }
+  virtual double* mutable_values() { return values_.get(); }
+
+  // Delete the bottom delta_rows.
+  // num_rows -= delta_rows
+  void DeleteRows(int delta_rows);
+
+  // Append the contents of m to the bottom of this matrix. m must
+  // have the same number of columns as this matrix.
+  void AppendRows(const CompressedRowSparseMatrix& m);
+
+  // Low level access methods that expose the structure of the matrix.
+  const int* cols() const { return cols_.get(); }
+  int* mutable_cols() { return cols_.get(); }
+
+  const int* rows() const { return rows_.get(); }
+  int* mutable_rows() { return rows_.get(); }
+
+ private:
+  scoped_array<int> cols_;
+  scoped_array<int> rows_;
+  scoped_array<double> values_;
+
+  int num_rows_;
+  int num_cols_;
+
+  int max_num_nonzeros_;
+
+  DISALLOW_COPY_AND_ASSIGN(CompressedRowSparseMatrix);
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_COMPRESSED_ROW_SPARSE_MATRIX_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/conditioned_cost_function.cc b/extern/libmv/third_party/ceres/internal/ceres/conditioned_cost_function.cc
new file mode 100644
index 00000000000..ca80bfb9c9d
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/conditioned_cost_function.cc
@@ -0,0 +1,130 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wjr@google.com (William Rucklidge)
+//
+// This file contains the implementation of the conditioned cost function.
+
+#include "ceres/conditioned_cost_function.h"
+
+#include <cstddef>
+
+#include <glog/logging.h>
+#include "ceres/stl_util.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/types.h"
+
+namespace ceres {
+
+// This cost function has the same dimensions (parameters, residuals) as
+// the one it's wrapping.
+ConditionedCostFunction::ConditionedCostFunction(
+    CostFunction* wrapped_cost_function,
+    const vector<CostFunction*>& conditioners,
+    Ownership ownership)
+    : wrapped_cost_function_(wrapped_cost_function),
+      conditioners_(conditioners),
+      ownership_(ownership) {
+  // Set up our dimensions.
+  set_num_residuals(wrapped_cost_function_->num_residuals());
+  *mutable_parameter_block_sizes() =
+      wrapped_cost_function_->parameter_block_sizes();
+
+  // Sanity-check the conditioners' dimensions.
+  CHECK_EQ(wrapped_cost_function_->num_residuals(), conditioners_.size());
+  for (int i = 0; i < wrapped_cost_function_->num_residuals(); i++) {
+    if (conditioners[i]) {
+      CHECK_EQ(1, conditioners[i]->num_residuals());
+      CHECK_EQ(1, conditioners[i]->parameter_block_sizes().size());
+      CHECK_EQ(1, conditioners[i]->parameter_block_sizes()[0]);
+    }
+  }
+}
+
+ConditionedCostFunction::~ConditionedCostFunction() {
+  if (ownership_ == TAKE_OWNERSHIP) {
+    STLDeleteElements(&conditioners_);
+  } else {
+    wrapped_cost_function_.release();
+  }
+}
+
+bool ConditionedCostFunction::Evaluate(double const* const* parameters,
+                                       double* residuals,
+                                       double** jacobians) const {
+  bool success = wrapped_cost_function_->Evaluate(parameters, residuals,
+                                                  jacobians);
+  if (!success) {
+    return false;
+  }
+
+  for (int r = 0; r < wrapped_cost_function_->num_residuals(); r++) {
+    // On output, we want to have
+    // residuals[r] = conditioners[r](wrapped_residuals[r])
+    // For parameter block i, column c,
+    // jacobians[i][r*parameter_block_size_[i] + c] =
+    //   = d residual[r] / d parameters[i][c]
+    //   = conditioners[r]'(wrapped_residuals[r]) *
+    //       d wrapped_residuals[r] / d parameters[i][c]
+    if (conditioners_[r]) {
+      double conditioner_derivative;
+      double* conditioner_derivative_pointer = &conditioner_derivative;
+      double** conditioner_derivative_pointer2 =
+          &conditioner_derivative_pointer;
+      if (!jacobians) {
+        conditioner_derivative_pointer2 = NULL;
+      }
+
+      double unconditioned_residual = residuals[r];
+      double* parameter_pointer = &unconditioned_residual;
+      success = conditioners_[r]->Evaluate(&parameter_pointer,
+                                           &residuals[r],
+                                           conditioner_derivative_pointer2);
+      if (!success) {
+        return false;
+      }
+
+      if (jacobians) {
+        for (int i = 0;
+             i < wrapped_cost_function_->parameter_block_sizes().size();
+             i++) {
+          if (jacobians[i]) {
+            int parameter_block_size =
+                wrapped_cost_function_->parameter_block_sizes()[i];
+            VectorRef jacobian_row(jacobians[i] + r * parameter_block_size,
+                                   parameter_block_size, 1);
+            jacobian_row *= conditioner_derivative;
+          }
+        }
+      }
+    }
+  }
+  return true;
+}
+
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/conjugate_gradients_solver.cc b/extern/libmv/third_party/ceres/internal/ceres/conjugate_gradients_solver.cc
new file mode 100644
index 00000000000..75f9e043fa5
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/conjugate_gradients_solver.cc
@@ -0,0 +1,233 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// A preconditioned conjugate gradients solver
+// (ConjugateGradientsSolver) for positive semidefinite linear
+// systems.
+//
+// We have also augmented the termination criterion used by this
+// solver to support not just residual based termination but also
+// termination based on decrease in the value of the quadratic model
+// that CG optimizes.
+
+#include "ceres/conjugate_gradients_solver.h"
+
+#include <cmath>
+#include <cstddef>
+#include <glog/logging.h>
+#include "ceres/linear_operator.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/types.h"
+#include "ceres/jet.h"
+
+namespace ceres {
+namespace internal {
+namespace {
+
+bool IsZeroOrInfinity(double x) {
+  return ((x == 0.0) || (isinf(x)));
+}
+
+// Constant used in the MATLAB implementation ~ 2 * eps.
+const double kEpsilon = 2.2204e-16;
+
+}  // namespace
+
+ConjugateGradientsSolver::ConjugateGradientsSolver(
+    const LinearSolver::Options& options)
+    : options_(options) {
+}
+
+LinearSolver::Summary ConjugateGradientsSolver::Solve(
+    LinearOperator* A,
+    const double* b,
+    const LinearSolver::PerSolveOptions& per_solve_options,
+    double* x) {
+  CHECK_NOTNULL(A);
+  CHECK_NOTNULL(x);
+  CHECK_NOTNULL(b);
+  CHECK_EQ(A->num_rows(), A->num_cols());
+
+  LinearSolver::Summary summary;
+  summary.termination_type = MAX_ITERATIONS;
+  summary.num_iterations = 0;
+
+  int num_cols = A->num_cols();
+  VectorRef xref(x, num_cols);
+  ConstVectorRef bref(b, num_cols);
+
+  double norm_b = bref.norm();
+  if (norm_b == 0.0) {
+    xref.setZero();
+    summary.termination_type = TOLERANCE;
+    return summary;
+  }
+
+  Vector r(num_cols);
+  Vector p(num_cols);
+  Vector z(num_cols);
+  Vector tmp(num_cols);
+
+  double tol_r = per_solve_options.r_tolerance * norm_b;
+
+  tmp.setZero();
+  A->RightMultiply(x, tmp.data());
+  r = bref - tmp;
+  double norm_r = r.norm();
+
+  if (norm_r <= tol_r) {
+    summary.termination_type = TOLERANCE;
+    return summary;
+  }
+
+  double rho = 1.0;
+
+  // Initial value of the quadratic model Q = x'Ax - 2 * b'x.
+  double Q0 = -1.0 * xref.dot(bref + r);
+
+  for (summary.num_iterations = 1;
+       summary.num_iterations < options_.max_num_iterations;
+       ++summary.num_iterations) {
+    VLOG(2) << "cg iteration " << summary.num_iterations;
+
+    // Apply preconditioner
+    if (per_solve_options.preconditioner != NULL) {
+      z.setZero();
+      per_solve_options.preconditioner->RightMultiply(r.data(), z.data());
+    } else {
+      z = r;
+    }
+
+    double last_rho = rho;
+    rho = r.dot(z);
+
+    if (IsZeroOrInfinity(rho)) {
+      LOG(ERROR) << "Numerical failure. rho = " << rho;
+      summary.termination_type = FAILURE;
+      break;
+    };
+
+    if (summary.num_iterations == 1) {
+      p = z;
+    } else {
+      double beta = rho / last_rho;
+      if (IsZeroOrInfinity(beta)) {
+        LOG(ERROR) << "Numerical failure. beta = " << beta;
+        summary.termination_type = FAILURE;
+        break;
+      }
+      p = z + beta * p;
+    }
+
+    Vector& q = z;
+    q.setZero();
+    A->RightMultiply(p.data(), q.data());
+    double pq = p.dot(q);
+
+    if ((pq <= 0) || isinf(pq))  {
+      LOG(ERROR) << "Numerical failure. pq = " << pq;
+      summary.termination_type = FAILURE;
+      break;
+    }
+
+    double alpha = rho / pq;
+    if (isinf(alpha)) {
+      LOG(ERROR) << "Numerical failure. alpha " << alpha;
+      summary.termination_type = FAILURE;
+      break;
+    }
+
+    xref = xref + alpha * p;
+
+    // Ideally we would just use the update r = r - alpha*q to keep
+    // track of the residual vector. However this estimate tends to
+    // drift over time due to round off errors. Thus every
+    // residual_reset_period iterations, we calculate the residual as
+    // r = b - Ax. We do not do this every iteration because this
+    // requires an additional matrix vector multiply which would
+    // double the complexity of the CG algorithm.
+    if (summary.num_iterations % options_.residual_reset_period == 0) {
+      tmp.setZero();
+      A->RightMultiply(x, tmp.data());
+      r = bref - tmp;
+    } else {
+      r = r - alpha * q;
+    }
+
+    // Quadratic model based termination.
+    //   Q1 = x'Ax - 2 * b' x.
+    double Q1 = -1.0 * xref.dot(bref + r);
+
+    // For PSD matrices A, let
+    //
+    //   Q(x) = x'Ax - 2b'x
+    //
+    // be the cost of the quadratic function defined by A and b. Then,
+    // the solver terminates at iteration i if
+    //
+    //   i * (Q(x_i) - Q(x_i-1)) / Q(x_i) < q_tolerance.
+    //
+    // This termination criterion is more useful when using CG to
+    // solve the Newton step. This particular convergence test comes
+    // from Stephen Nash's work on truncated Newton
+    // methods. References:
+    //
+    //   1. Stephen G. Nash & Ariela Sofer, Assessing A Search
+    //   Direction Within A Truncated Newton Method, Operation
+    //   Research Letters 9(1990) 219-221.
+    //   
+    //   2. Stephen G. Nash, A Survey of Truncated Newton Methods,
+    //   Journal of Computational and Applied Mathematics,
+    //   124(1-2), 45-59, 2000.
+    //
+    double zeta = summary.num_iterations * (Q1 - Q0) / Q1;
+    VLOG(2) << "Q termination: zeta " << zeta
+            << " " << per_solve_options.q_tolerance;
+    if (zeta < per_solve_options.q_tolerance) {
+      summary.termination_type = TOLERANCE;
+      break;
+    }
+    Q0 = Q1;
+
+    // Residual based termination.
+    norm_r = r. norm();
+    VLOG(2) << "R termination: norm_r " << norm_r
+            << " " << tol_r;
+    if (norm_r <= tol_r) {
+      summary.termination_type = TOLERANCE;
+      break;
+    }
+  }
+
+  return summary;
+};
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/conjugate_gradients_solver.h b/extern/libmv/third_party/ceres/internal/ceres/conjugate_gradients_solver.h
new file mode 100644
index 00000000000..57f99e31db7
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/conjugate_gradients_solver.h
@@ -0,0 +1,74 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Preconditioned Conjugate Gradients based solver for positive
+// semidefinite linear systems.
+
+#ifndef CERES_INTERNAL_CONJUGATE_GRADIENTS_SOLVER_H_
+#define CERES_INTERNAL_CONJUGATE_GRADIENTS_SOLVER_H_
+
+#include "ceres/linear_solver.h"
+#include "ceres/internal/macros.h"
+
+namespace ceres {
+namespace internal {
+
+class LinearOperator;
+
+// This class implements the now classical Conjugate Gradients
+// algorithm of Hestenes & Stiefel for solving postive semidefinite
+// linear sytems. Optionally it can use a preconditioner also to
+// reduce the condition number of the linear system and improve the
+// convergence rate. Modern references for Conjugate Gradients are the
+// books by Yousef Saad and Trefethen & Bau. This implementation of CG
+// has been augmented with additional termination tests that are
+// needed for forcing early termination when used as part of an
+// inexact Newton solver.
+//
+// For more details see the documentation for
+// LinearSolver::PerSolveOptions::r_tolerance and
+// LinearSolver::PerSolveOptions::q_tolerance in linear_solver.h.
+class ConjugateGradientsSolver : public LinearSolver {
+ public:
+  explicit ConjugateGradientsSolver(const LinearSolver::Options& options);
+  virtual Summary Solve(LinearOperator* A,
+                        const double* b,
+                        const LinearSolver::PerSolveOptions& per_solve_options,
+                        double* x);
+
+ private:
+  const LinearSolver::Options options_;
+  DISALLOW_COPY_AND_ASSIGN(ConjugateGradientsSolver);
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_CONJUGATE_GRADIENTS_SOLVER_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/corrector.cc b/extern/libmv/third_party/ceres/internal/ceres/corrector.cc
new file mode 100644
index 00000000000..4ca2c6f6c86
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/corrector.cc
@@ -0,0 +1,125 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#include "ceres/corrector.h"
+
+#include <cstddef>
+#include <cmath>
+#include <glog/logging.h>
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+Corrector::Corrector(double sq_norm, const double rho[3]) {
+  CHECK_GE(sq_norm, 0.0);
+  CHECK_GT(rho[1], 0.0);
+  sqrt_rho1_ = sqrt(rho[1]);
+
+  // If sq_norm = 0.0, the correction becomes trivial, the residual
+  // and the jacobian are scaled by the squareroot of the derivative
+  // of rho. Handling this case explicitly avoids the divide by zero
+  // error that would occur below.
+  //
+  // The case where rho'' < 0 also gets special handling. Technically
+  // it shouldn't, and the computation of the scaling should proceed
+  // as below, however we found in experiments that applying the
+  // curvature correction when rho'' < 0, which is the case when we
+  // are in the outlier region slows down the convergence of the
+  // algorithm significantly.
+  //
+  // Thus, we have divided the action of the robustifier into two
+  // parts. In the inliner region, we do the full second order
+  // correction which re-wights the gradient of the function by the
+  // square root of the derivative of rho, and the Gauss-Newton
+  // Hessian gets both the scaling and the rank-1 curvature
+  // correction. Normaly, alpha is upper bounded by one, but with this
+  // change, alpha is bounded above by zero.
+  //
+  // Empirically we have observed that the full Triggs correction and
+  // the clamped correction both start out as very good approximations
+  // to the loss function when we are in the convex part of the
+  // function, but as the function starts transitioning from convex to
+  // concave, the Triggs approximation diverges more and more and
+  // ultimately becomes linear. The clamped Triggs model however
+  // remains quadratic.
+  //
+  // The reason why the Triggs approximation becomes so poor is
+  // because the curvature correction that it applies to the gauss
+  // newton hessian goes from being a full rank correction to a rank
+  // deficient correction making the inversion of the Hessian fraught
+  // with all sorts of misery and suffering.
+  //
+  // The clamped correction retains its quadratic nature and inverting it
+  // is always well formed.
+  if ((sq_norm == 0.0) || (rho[2] <= 0.0)) {
+    residual_scaling_ = sqrt_rho1_;
+    alpha_sq_norm_ = 0.0;
+    return;
+  }
+
+  // Calculate the smaller of the two solutions to the equation
+  //
+  // 0.5 *  alpha^2 - alpha - rho'' / rho' *  z'z = 0.
+  //
+  // Start by calculating the discriminant D.
+  const double D = 1.0 + 2.0 * sq_norm*rho[2] / rho[1];
+
+  // Since both rho[1] and rho[2] are guaranteed to be positive at
+  // this point, we know that D > 1.0.
+
+  const double alpha = 1.0 - sqrt(D);
+
+  // Calculate the constants needed by the correction routines.
+  residual_scaling_ = sqrt_rho1_ / (1 - alpha);
+  alpha_sq_norm_ = alpha / sq_norm;
+}
+
+void Corrector::CorrectResiduals(int nrow, double* residuals) {
+  DCHECK(residuals != NULL);
+  VectorRef r_ref(residuals, nrow);
+  // Equation 11 in BANS.
+  r_ref *= residual_scaling_;
+}
+
+void Corrector::CorrectJacobian(int nrow, int ncol,
+                                double* residuals, double* jacobian) {
+  DCHECK(residuals != NULL);
+  DCHECK(jacobian != NULL);
+  ConstVectorRef r_ref(residuals, nrow);
+  MatrixRef j_ref(jacobian, nrow, ncol);
+
+  // Equation 11 in BANS.
+  j_ref = sqrt_rho1_ * (j_ref - alpha_sq_norm_ *
+                        r_ref * (r_ref.transpose() * j_ref));
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/corrector.h b/extern/libmv/third_party/ceres/internal/ceres/corrector.h
new file mode 100644
index 00000000000..9914641cb01
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/corrector.h
@@ -0,0 +1,88 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Class definition for the object that is responsible for applying a
+// second order correction to the Gauss-Newton based on the ideas in
+// BANS by Triggs et al.
+
+#ifndef CERES_INTERNAL_CORRECTOR_H_
+#define CERES_INTERNAL_CORRECTOR_H_
+
+namespace ceres {
+namespace internal {
+
+// Corrector is responsible for applying the second order correction
+// to the residual and jacobian of a least squares problem based on a
+// radial robust loss.
+//
+// The key idea here is to look at the expressions for the robustified
+// gauss newton approximation and then take its squareroot to get the
+// corresponding corrections to the residual and jacobian.  For the
+// full expressions see Eq. 10 and 11 in BANS by Triggs et al.
+class Corrector {
+ public:
+  // The constructor takes the squared norm, the value, the first and
+  // second derivatives of the LossFunction. It precalculates some of
+  // the constants that are needed to apply the correction. The
+  // correction constant alpha is constrained to be smaller than 1, if
+  // it becomes larger than 1, then it will reverse the sign of the
+  // residual and the correction. If alpha is equal to 1 will result
+  // in a divide by zero error. Thus we constrain alpha to be upper
+  // bounded by 1 - epsilon_.
+  //
+  // rho[1] needs to be positive. The constructor will crash if this
+  // condition is not met.
+  //
+  // In practical use CorrectJacobian should always be called before
+  // CorrectResidual, because the jacobian correction depends on the
+  // value of the uncorrected residual values.
+  explicit Corrector(double sq_norm, const double rho[3]);
+
+  // residuals *= sqrt(rho[1]) / (1 - alpha)
+  void CorrectResiduals(int nrow, double* residuals);
+
+  // jacobian = sqrt(rho[1]) * jacobian -
+  // sqrt(rho[1]) * alpha / sq_norm * residuals residuals' * jacobian.
+  //
+  // The method assumes that the jacobian has row-major storage. It is
+  // the caller's responsibility to ensure that the pointer to
+  // jacobian is not null.
+  void CorrectJacobian(int nrow, int ncol,
+                       double* residuals, double* jacobian);
+
+ private:
+  double sqrt_rho1_;
+  double residual_scaling_;
+  double alpha_sq_norm_;
+};
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_CORRECTOR_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/dense_jacobian_writer.h b/extern/libmv/third_party/ceres/internal/ceres/dense_jacobian_writer.h
new file mode 100644
index 00000000000..1177b83a556
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/dense_jacobian_writer.h
@@ -0,0 +1,110 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//
+// A jacobian writer that writes to dense Eigen matrices.
+
+#ifndef CERES_INTERNAL_DENSE_JACOBIAN_WRITER_H_
+#define CERES_INTERNAL_DENSE_JACOBIAN_WRITER_H_
+
+#include "ceres/casts.h"
+#include "ceres/dense_sparse_matrix.h"
+#include "ceres/parameter_block.h"
+#include "ceres/program.h"
+#include "ceres/residual_block.h"
+#include "ceres/scratch_evaluate_preparer.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+class DenseJacobianWriter {
+ public:
+  DenseJacobianWriter(Evaluator::Options /* ignored */,
+                      Program* program)
+    : program_(program) {
+  }
+
+  // JacobianWriter interface.
+
+  // Since the dense matrix has different layout than that assumed by the cost
+  // functions, use scratch space to store the jacobians temporarily then copy
+  // them over to the larger jacobian later.
+  ScratchEvaluatePreparer* CreateEvaluatePreparers(int num_threads) {
+    return ScratchEvaluatePreparer::Create(*program_, num_threads);
+  }
+
+  SparseMatrix* CreateJacobian() const {
+    return new DenseSparseMatrix(program_->NumResiduals(),
+                                 program_->NumEffectiveParameters());
+  }
+
+  void Write(int residual_id,
+             int residual_offset,
+             double **jacobians,
+             SparseMatrix* jacobian) {
+    DenseSparseMatrix* dense_jacobian;
+    if (jacobian != NULL) {
+      dense_jacobian = down_cast<DenseSparseMatrix*>(jacobian);
+    }
+    const ResidualBlock* residual_block =
+        program_->residual_blocks()[residual_id];
+    int num_parameter_blocks = residual_block->NumParameterBlocks();
+    int num_residuals = residual_block->NumResiduals();
+
+    // Now copy the jacobians for each parameter into the dense jacobian matrix.
+    for (int j = 0; j < num_parameter_blocks; ++j) {
+      ParameterBlock* parameter_block = residual_block->parameter_blocks()[j];
+
+      // If the parameter block is fixed, then there is nothing to do.
+      if (parameter_block->IsConstant()) {
+        continue;
+      }
+
+      int parameter_block_size = parameter_block->LocalSize();
+      MatrixRef parameter_jacobian(jacobians[j],
+                                   num_residuals,
+                                   parameter_block_size);
+
+      dense_jacobian->mutable_matrix().block(
+          residual_offset,
+          parameter_block->delta_offset(),
+          num_residuals,
+          parameter_block_size) = parameter_jacobian;
+    }
+  }
+
+ private:
+  Program* program_;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_DENSE_JACOBIAN_WRITER_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.cc b/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.cc
new file mode 100644
index 00000000000..328505404d7
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.cc
@@ -0,0 +1,93 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#include "ceres/dense_qr_solver.h"
+
+#include <cstddef>
+
+#include "Eigen/Dense"
+#include "ceres/linear_solver.h"
+#include "ceres/triplet_sparse_matrix.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+
+DenseQRSolver::DenseQRSolver(const LinearSolver::Options& options)
+    : options_(options) {}
+
+LinearSolver::Summary DenseQRSolver::SolveImpl(
+    DenseSparseMatrix* A,
+    const double* b,
+    const LinearSolver::PerSolveOptions& per_solve_options,
+    double* x) {
+  const int num_rows = A->num_rows();
+  const int num_cols = A->num_cols();
+  VLOG(2) << "DenseQRSolver: "
+          << num_rows << " x " << num_cols << " system.";
+
+  if (per_solve_options.D != NULL) {
+    // Temporarily append a diagonal block to the A matrix, but undo
+    // it before returning the matrix to the user.
+    A->AppendDiagonal(per_solve_options.D);
+  }
+
+  // rhs = [b;0] to account for the additional rows in the lhs.
+  Vector rhs(num_rows + ((per_solve_options.D !=NULL) ? num_cols : 0));
+  rhs.setZero();
+  rhs.head(num_rows) = ConstVectorRef(b, num_rows);
+
+  // Solve the system.
+  VectorRef(x, num_cols) = A->matrix().colPivHouseholderQr().solve(rhs);
+
+  VLOG(3) << "A:\n" << A->matrix();
+  VLOG(3) << "x:\n" << VectorRef(x, num_cols);
+  VLOG(3) << "b:\n" << rhs;
+  VLOG(3) << "error: " << (A->matrix() * VectorRef(x, num_cols) - rhs).norm();
+
+
+  if (per_solve_options.D != NULL) {
+    // Undo the modifications to the matrix A.
+    A->RemoveDiagonal();
+  }
+
+  // We always succeed, since the QR solver returns the best solution
+  // it can. It is the job of the caller to determine if the solution
+  // is good enough or not.
+  LinearSolver::Summary summary;
+  summary.num_iterations = 1;
+  summary.termination_type = TOLERANCE;
+  return summary;
+}
+
+}   // namespace internal
+}   // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.h b/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.h
new file mode 100644
index 00000000000..990c8d445eb
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.h
@@ -0,0 +1,99 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Solve dense rectangular systems Ax = b using the QR factoriztion.
+#ifndef CERES_INTERNAL_DENSE_QR_SOLVER_H_
+#define CERES_INTERNAL_DENSE_QR_SOLVER_H_
+
+#include "ceres/linear_solver.h"
+#include "ceres/internal/macros.h"
+
+namespace ceres {
+namespace internal {
+
+class DenseSparseMatrix;
+
+// This class implements the LinearSolver interface for solving
+// rectangular/unsymmetric (well constrained) linear systems of the
+// form
+//
+//   Ax = b
+//
+// Since there does not usually exist a solution that satisfies these
+// equations, the solver instead solves the linear least squares
+// problem
+//
+//   min_x |Ax - b|^2
+//
+// The solution strategy is based on computing the QR decomposition of
+// A, i.e.
+//
+//   A = QR
+//
+// Where Q is an orthonormal matrix and R is an upper triangular
+// matrix. Then
+//
+//     Ax = b
+//    QRx = b
+//  Q'QRx = Q'b
+//     Rx = Q'b
+//      x = R^{-1} Q'b
+//
+// If the PerSolveOptions struct has a non-null array D, then the
+// augmented/regularized linear system
+//
+//   [    A    ]x = [b]
+//   [ diag(D) ]    [0]
+//
+// is solved.
+//
+// This class uses the dense QR factorization routines from the Eigen
+// library. This solver always returns a solution, it is the user's
+// responsibility to judge if the solution is good enough for their
+// purposes.
+class DenseQRSolver: public DenseSparseMatrixSolver {
+ public:
+  explicit DenseQRSolver(const LinearSolver::Options& options);
+
+ private:
+  virtual LinearSolver::Summary SolveImpl(
+      DenseSparseMatrix* A,
+      const double* b,
+      const LinearSolver::PerSolveOptions& per_solve_options,
+      double* x);
+
+  const LinearSolver::Options options_;
+  DISALLOW_COPY_AND_ASSIGN(DenseQRSolver);
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_DENSE_QR_SOLVER_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.cc b/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.cc
new file mode 100644
index 00000000000..5d392ba6c3b
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.cc
@@ -0,0 +1,197 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+
+#include "ceres/dense_sparse_matrix.h"
+
+#include <algorithm>
+#include "ceres/matrix_proto.h"
+#include "ceres/triplet_sparse_matrix.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/port.h"
+
+namespace ceres {
+namespace internal {
+
+DenseSparseMatrix::DenseSparseMatrix(int num_rows, int num_cols)
+    : has_diagonal_appended_(false),
+      has_diagonal_reserved_(false) {
+  // Allocate enough space for the diagonal.
+  m_.resize(num_rows, num_cols);
+  m_.setZero();
+}
+
+DenseSparseMatrix::DenseSparseMatrix(const TripletSparseMatrix& m)
+    : m_(Eigen::MatrixXd::Zero(m.num_rows(), m.num_cols())),
+      has_diagonal_appended_(false),
+      has_diagonal_reserved_(false) {
+  const double *values = m.values();
+  const int *rows = m.rows();
+  const int *cols = m.cols();
+  int num_nonzeros = m.num_nonzeros();
+
+  for (int i = 0; i < num_nonzeros; ++i) {
+    m_(rows[i], cols[i]) += values[i];
+  }
+}
+
+DenseSparseMatrix::DenseSparseMatrix(const Matrix& m)
+    : m_(m),
+      has_diagonal_appended_(false),
+      has_diagonal_reserved_(false) {
+}
+
+#ifndef CERES_DONT_HAVE_PROTOCOL_BUFFERS
+DenseSparseMatrix::DenseSparseMatrix(const SparseMatrixProto& outer_proto)
+    : m_(Eigen::MatrixXd::Zero(
+        outer_proto.dense_matrix().num_rows(),
+        outer_proto.dense_matrix().num_cols())),
+      has_diagonal_appended_(false),
+      has_diagonal_reserved_(false) {
+  const DenseSparseMatrixProto& proto = outer_proto.dense_matrix();
+  for (int i = 0; i < m_.rows(); ++i) {
+    for (int j = 0; j < m_.cols(); ++j) {
+      m_(i, j) = proto.values(m_.cols() * i + j);
+    }
+  }
+}
+#endif
+
+void DenseSparseMatrix::SetZero() {
+  m_.setZero();
+}
+
+void DenseSparseMatrix::RightMultiply(const double* x, double* y) const {
+  VectorRef(y, num_rows()) += matrix() * ConstVectorRef(x, num_cols());
+}
+
+void DenseSparseMatrix::LeftMultiply(const double* x, double* y) const {
+  VectorRef(y, num_cols()) +=
+      matrix().transpose() * ConstVectorRef(x, num_rows());
+}
+
+void DenseSparseMatrix::SquaredColumnNorm(double* x) const {
+  VectorRef(x, num_cols()) = m_.colwise().squaredNorm();
+}
+
+void DenseSparseMatrix::ScaleColumns(const double* scale) {
+  m_ *= ConstVectorRef(scale, num_cols()).asDiagonal();
+}
+
+void DenseSparseMatrix::ToDenseMatrix(Matrix* dense_matrix) const {
+  *dense_matrix = m_;
+}
+
+#ifndef CERES_DONT_HAVE_PROTOCOL_BUFFERS
+void DenseSparseMatrix::ToProto(SparseMatrixProto* outer_proto) const {
+  CHECK(!has_diagonal_appended_) << "Not supported.";
+  outer_proto->Clear();
+  DenseSparseMatrixProto* proto = outer_proto->mutable_dense_matrix();
+
+  proto->set_num_rows(num_rows());
+  proto->set_num_cols(num_cols());
+
+  int num_nnz = num_nonzeros();
+  for (int i = 0; i < num_nnz; ++i) {
+    proto->add_values(m_.data()[i]);
+  }
+}
+#endif
+
+void DenseSparseMatrix::AppendDiagonal(double *d) {
+  CHECK(!has_diagonal_appended_);
+  if (!has_diagonal_reserved_) {
+    Matrix tmp = m_;
+    m_.resize(m_.rows() + m_.cols(), m_.cols());
+    m_.setZero();
+    m_.block(0, 0, tmp.rows(), tmp.cols()) = tmp;
+    has_diagonal_reserved_ = true;
+  }
+
+  m_.bottomLeftCorner(m_.cols(), m_.cols()) =
+      ConstVectorRef(d, m_.cols()).asDiagonal();
+  has_diagonal_appended_ = true;
+}
+
+void DenseSparseMatrix::RemoveDiagonal() {
+  CHECK(has_diagonal_appended_);
+  has_diagonal_appended_ = false;
+  // Leave the diagonal reserved.
+}
+
+int DenseSparseMatrix::num_rows() const {
+  if (has_diagonal_reserved_ && !has_diagonal_appended_) {
+    return m_.rows() - m_.cols();
+  }
+  return m_.rows();
+}
+
+int DenseSparseMatrix::num_cols() const {
+  return m_.cols();
+}
+
+int DenseSparseMatrix::num_nonzeros() const {
+  if (has_diagonal_reserved_ && !has_diagonal_appended_) {
+    return (m_.rows() - m_.cols()) * m_.cols();
+  }
+  return m_.rows() * m_.cols();
+}
+
+ConstAlignedMatrixRef DenseSparseMatrix::matrix() const {
+  if (has_diagonal_reserved_ && !has_diagonal_appended_) {
+    return ConstAlignedMatrixRef(
+        m_.data(), m_.rows() - m_.cols(), m_.cols());
+  }
+  return ConstAlignedMatrixRef(m_.data(), m_.rows(), m_.cols());
+}
+
+AlignedMatrixRef DenseSparseMatrix::mutable_matrix() {
+  if (has_diagonal_reserved_ && !has_diagonal_appended_) {
+    return AlignedMatrixRef(
+        m_.data(), m_.rows() - m_.cols(), m_.cols());
+  }
+  return AlignedMatrixRef(m_.data(), m_.rows(), m_.cols());
+}
+
+void DenseSparseMatrix::ToTextFile(FILE* file) const {
+  CHECK_NOTNULL(file);
+  const int active_rows =
+      (has_diagonal_reserved_ && !has_diagonal_appended_)
+      ? (m_.rows() - m_.cols()) 
+      : m_.rows();
+
+  for (int r = 0; r < active_rows; ++r) {
+    for (int c = 0; c < m_.cols(); ++c) {
+      fprintf(file,  "% 10d % 10d %17f\n", r, c, m_(r, c));
+    }
+  }
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.h b/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.h
new file mode 100644
index 00000000000..416c2143c2c
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.h
@@ -0,0 +1,116 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//
+// A dense matrix implemented under the SparseMatrix interface.
+
+#ifndef CERES_INTERNAL_DENSE_SPARSE_MATRIX_H_
+#define CERES_INTERNAL_DENSE_SPARSE_MATRIX_H_
+
+#include <glog/logging.h>
+#include "ceres/sparse_matrix.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/macros.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+
+class SparseMatrixProto;
+class TripletSparseMatrix;
+
+class DenseSparseMatrix : public SparseMatrix {
+ public:
+  // Build a matrix with the same content as the TripletSparseMatrix
+  // m. This assumes that m does not have any repeated entries.
+  explicit DenseSparseMatrix(const TripletSparseMatrix& m);
+  explicit DenseSparseMatrix(const Matrix& m);
+#ifndef CERES_DONT_HAVE_PROTOCOL_BUFFERS
+  explicit DenseSparseMatrix(const SparseMatrixProto& proto);
+#endif
+
+  DenseSparseMatrix(int num_rows, int num_cols);
+
+  virtual ~DenseSparseMatrix() {}
+
+  // SparseMatrix interface.
+  virtual void SetZero();
+  virtual void RightMultiply(const double* x, double* y) const;
+  virtual void LeftMultiply(const double* x, double* y) const;
+  virtual void SquaredColumnNorm(double* x) const;
+  virtual void ScaleColumns(const double* scale);
+  virtual void ToDenseMatrix(Matrix* dense_matrix) const;
+#ifndef CERES_DONT_HAVE_PROTOCOL_BUFFERS
+  virtual void ToProto(SparseMatrixProto* proto) const;
+#endif
+  virtual void ToTextFile(FILE* file) const;
+  virtual int num_rows() const;
+  virtual int num_cols() const;
+  virtual int num_nonzeros() const;
+  virtual const double* values() const { return m_.data(); }
+  virtual double* mutable_values() { return m_.data(); }
+
+  ConstAlignedMatrixRef matrix() const;
+  AlignedMatrixRef mutable_matrix();
+
+  // Only one diagonal can be appended at a time. The diagonal is appended to
+  // as a new set of rows, e.g.
+  //
+  // Original matrix:
+  //
+  //   x x x
+  //   x x x
+  //   x x x
+  //
+  // After append diagonal (1, 2, 3):
+  //
+  //   x x x
+  //   x x x
+  //   x x x
+  //   1 0 0
+  //   0 2 0
+  //   0 0 3
+  //
+  // Calling RemoveDiagonal removes the block. It is a fatal error to append a
+  // diagonal to a matrix that already has an appended diagonal, and it is also
+  // a fatal error to remove a diagonal from a matrix that has none.
+  void AppendDiagonal(double *d);
+  void RemoveDiagonal();
+
+ private:
+  Matrix m_;
+  bool has_diagonal_appended_;
+  bool has_diagonal_reserved_;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_DENSE_SPARSE_MATRIX_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/detect_structure.cc b/extern/libmv/third_party/ceres/internal/ceres/detect_structure.cc
new file mode 100644
index 00000000000..e9755043bab
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/detect_structure.cc
@@ -0,0 +1,114 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#include <glog/logging.h>
+#include "ceres/detect_structure.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+void DetectStructure(const CompressedRowBlockStructure& bs,
+                     const int num_eliminate_blocks,
+                     int* row_block_size,
+                     int* e_block_size,
+                     int* f_block_size) {
+  const int num_row_blocks = bs.rows.size();
+  *row_block_size = 0;
+  *e_block_size = 0;
+  *f_block_size = 0;
+
+  // Iterate over row blocks of the matrix, checking if row_block,
+  // e_block or f_block sizes remain constant.
+  for (int r = 0; r < num_row_blocks; ++r) {
+    const CompressedRow& row = bs.rows[r];
+    // We do not care about the sizes of the blocks in rows which do
+    // not contain e_blocks.
+    if (row.cells.front().block_id >= num_eliminate_blocks) {
+      break;
+    }
+    const int e_block_id = row.cells.front().block_id;
+
+    if (*row_block_size == 0) {
+      *row_block_size = row.block.size;
+    } else if (*row_block_size != Eigen::Dynamic &&
+               *row_block_size != row.block.size) {
+      *row_block_size = Eigen::Dynamic;
+      VLOG(2) << "Dynamic row block size because the block size changed from "
+              << *row_block_size << " to "
+              << row.block.size;
+    }
+
+
+    if (*e_block_size == 0) {
+      *e_block_size = bs.cols[e_block_id].size;
+    } else if (*e_block_size != Eigen::Dynamic &&
+               *e_block_size != bs.cols[e_block_id].size) {
+      *e_block_size = Eigen::Dynamic;
+      VLOG(2) << "Dynamic e block size because the block size changed from "
+              << *e_block_size << " to "
+              << bs.cols[e_block_id].size;
+    }
+
+    if (*f_block_size == 0) {
+      if (row.cells.size() > 1) {
+        const int f_block_id = row.cells[1].block_id;
+        *f_block_size = bs.cols[f_block_id].size;
+      }
+    } else if (*f_block_size != Eigen::Dynamic) {
+      for (int c = 1; c < row.cells.size(); ++c) {
+        if (*f_block_size != bs.cols[row.cells[c].block_id].size) {
+          *f_block_size = Eigen::Dynamic;
+          VLOG(2) << "Dynamic f block size because the block size "
+                    << "changed from " << *f_block_size << " to "
+                    << bs.cols[row.cells[c].block_id].size;
+            break;
+        }
+      }
+    }
+
+    const bool is_everything_dynamic = (*row_block_size == Eigen::Dynamic &&
+                                        *e_block_size == Eigen::Dynamic &&
+                                        *f_block_size == Eigen::Dynamic);
+    if (is_everything_dynamic) {
+      break;
+    }
+  }
+
+  CHECK_NE(*row_block_size, 0) << "No rows found";
+  CHECK_NE(*e_block_size, 0) << "No e type blocks found";
+  VLOG(1) << "Schur complement static structure <"
+          << *row_block_size << ","
+          << *e_block_size << ","
+          << *f_block_size << ">.";
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/detect_structure.h b/extern/libmv/third_party/ceres/internal/ceres/detect_structure.h
new file mode 100644
index 00000000000..8af4f236690
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/detect_structure.h
@@ -0,0 +1,63 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#ifndef CERES_INTERNAL_DETECT_STRUCTURE_H_
+#define CERES_INTERNAL_DETECT_STRUCTURE_H_
+
+#include "ceres/block_structure.h"
+
+namespace ceres {
+namespace internal {
+
+// Detect static blocks in the problem sparsity. For rows containing
+// e_blocks, we are interested in detecting if the size of the row
+// blocks, e_blocks and the f_blocks remain constant. If they do, then
+// we can use template specialization to improve the performance of
+// the block level linear algebra operations used by the
+// SchurEliminator.
+//
+// If a block size is not constant, we return Eigen::Dynamic as the
+// value. This just means that the eliminator uses dynamically sized
+// linear algebra operations rather than static operations whose size
+// is known as compile time.
+//
+// For more details about e_blocks and f_blocks, see
+// schur_complement.h. This information is used to initialized an
+// appropriate template specialization of SchurEliminator.
+void DetectStructure(const CompressedRowBlockStructure& bs,
+                     const int num_eliminate_blocks,
+                     int* row_block_size,
+                     int* e_block_size,
+                     int* f_block_size);
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_DETECT_STRUCTURE_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/evaluator.cc b/extern/libmv/third_party/ceres/internal/ceres/evaluator.cc
new file mode 100644
index 00000000000..ea05aefec8c
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/evaluator.cc
@@ -0,0 +1,71 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+
+#include <glog/logging.h>
+#include "ceres/evaluator.h"
+#include "ceres/block_evaluate_preparer.h"
+#include "ceres/block_jacobian_writer.h"
+#include "ceres/compressed_row_jacobian_writer.h"
+#include "ceres/scratch_evaluate_preparer.h"
+#include "ceres/dense_jacobian_writer.h"
+#include "ceres/program_evaluator.h"
+
+namespace ceres {
+namespace internal {
+
+Evaluator::~Evaluator() {}
+
+Evaluator* Evaluator::Create(const Evaluator::Options& options,
+                             Program* program,
+                             string* error) {
+  switch (options.linear_solver_type) {
+    case DENSE_QR:
+      return new ProgramEvaluator<ScratchEvaluatePreparer,
+                                  DenseJacobianWriter>(options,
+                                                       program);
+    case DENSE_SCHUR:
+    case SPARSE_SCHUR:
+    case ITERATIVE_SCHUR:
+    case CGNR:
+      return new ProgramEvaluator<BlockEvaluatePreparer,
+                                  BlockJacobianWriter>(options,
+                                                       program);
+    case SPARSE_NORMAL_CHOLESKY:
+      return new ProgramEvaluator<ScratchEvaluatePreparer,
+                                  CompressedRowJacobianWriter>(options,
+                                                               program);
+    default:
+      *error = "Invalid Linear Solver Type. Unable to create evaluator.";
+      return NULL;
+  }
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/evaluator.h b/extern/libmv/third_party/ceres/internal/ceres/evaluator.h
new file mode 100644
index 00000000000..adefdd26660
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/evaluator.h
@@ -0,0 +1,129 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//         keir@google.com (Keir Mierle)
+
+#ifndef CERES_INTERNAL_EVALUATOR_H_
+#define CERES_INTERNAL_EVALUATOR_H_
+
+#include <string>
+#include "ceres/internal/port.h"
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+
+class Program;
+class SparseMatrix;
+
+// The Evaluator interface offers a way to interact with a least squares cost
+// function that is useful for an optimizer that wants to minimize the least
+// squares objective. This insulates the optimizer from issues like Jacobian
+// storage, parameterization, etc.
+class Evaluator {
+ public:
+  virtual ~Evaluator();
+
+  struct Options {
+    Options()
+        : num_threads(1),
+          num_eliminate_blocks(-1),
+          linear_solver_type(DENSE_QR) {}
+
+    int num_threads;
+    int num_eliminate_blocks;
+    LinearSolverType linear_solver_type;
+  };
+
+  static Evaluator* Create(const Options& options,
+                           Program* program,
+                           string* error);
+
+  // Build and return a sparse matrix for storing and working with the Jacobian
+  // of the objective function. The jacobian has dimensions
+  // NumEffectiveParameters() by NumParameters(), and is typically extremely
+  // sparse. Since the sparsity pattern of the Jacobian remains constant over
+  // the lifetime of the optimization problem, this method is used to
+  // instantiate a SparseMatrix object with the appropriate sparsity structure
+  // (which can be an expensive operation) and then reused by the optimization
+  // algorithm and the various linear solvers.
+  //
+  // It is expected that the classes implementing this interface will be aware
+  // of their client's requirements for the kind of sparse matrix storage and
+  // layout that is needed for an efficient implementation. For example
+  // CompressedRowOptimizationProblem creates a compressed row representation of
+  // the jacobian for use with CHOLMOD, where as BlockOptimizationProblem
+  // creates a BlockSparseMatrix representation of the jacobian for use in the
+  // Schur complement based methods.
+  virtual SparseMatrix* CreateJacobian() const = 0;
+
+  // Evaluate the cost function for the given state. Returns the cost,
+  // residuals, and jacobian in the corresponding arguments. Both residuals and
+  // jacobian are optional; to avoid computing them, pass NULL.
+  //
+  // If non-NULL, the Jacobian must have a suitable sparsity pattern; only the
+  // values array of the jacobian is modified.
+  //
+  // state is an array of size NumParameters(), cost is a pointer to a single
+  // double, and residuals is an array of doubles of size NumResiduals().
+  virtual bool Evaluate(const double* state,
+                        double* cost,
+                        double* residuals,
+                        SparseMatrix* jacobian) = 0;
+
+  // Make a change delta (of size NumEffectiveParameters()) to state (of size
+  // NumParameters()) and store the result in state_plus_delta.
+  //
+  // In the case that there are no parameterizations used, this is equivalent to
+  //
+  //   state_plus_delta[i] = state[i] + delta[i] ;
+  //
+  // however, the mapping is more complicated in the case of parameterizations
+  // like quaternions. This is the same as the "Plus()" operation in
+  // local_parameterization.h, but operating over the entire state vector for a
+  // problem.
+  virtual bool Plus(const double* state,
+                    const double* delta,
+                    double* state_plus_delta) const = 0;
+
+  // The number of parameters in the optimization problem.
+  virtual int NumParameters() const = 0;
+
+  // This is the effective number of parameters that the optimizer may adjust.
+  // This applies when there are parameterizations on some of the parameters.
+  virtual int NumEffectiveParameters()  const = 0;
+
+  // The number of residuals in the optimization problem.
+  virtual int NumResiduals() const = 0;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_EVALUATOR_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/file.cc b/extern/libmv/third_party/ceres/internal/ceres/file.cc
new file mode 100644
index 00000000000..5fc9d220861
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/file.cc
@@ -0,0 +1,93 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//
+// Really simple file IO.
+
+#include <cstdio>
+#include <glog/logging.h>
+
+namespace ceres {
+namespace internal {
+
+using std::string;
+
+void WriteStringToFileOrDie(const string &data, const string &filename) {
+  FILE* file_descriptor = fopen(filename.c_str(), "wb");
+  if (!file_descriptor) {
+    LOG(FATAL) << "Couldn't write to file: " << filename;
+  }
+  fwrite(data.c_str(), 1, data.size(), file_descriptor);
+  fclose(file_descriptor);
+}
+
+void ReadFileToStringOrDie(const string &filename, string *data) {
+  FILE* file_descriptor = file_descriptor = fopen(filename.c_str(), "r");
+
+  if (!file_descriptor) {
+    LOG(FATAL) << "Couldn't read file: " << filename;
+  }
+
+  // Resize the input buffer appropriately.
+  fseek(file_descriptor, 0L, SEEK_END);
+  int num_bytes = ftell(file_descriptor);
+  data->resize(num_bytes);
+
+  // Read the data.
+  fseek(file_descriptor, 0L, SEEK_SET);
+  int num_read = fread(&((*data)[0]),
+                       sizeof((*data)[0]),
+                       num_bytes,
+                       file_descriptor);
+  if (num_read != num_bytes) {
+    LOG(FATAL) << "Couldn't read all of " << filename
+               << "expected bytes: " << num_bytes * sizeof((*data)[0])
+               << "actual bytes: " << num_read;
+  }
+  fclose(file_descriptor);
+}
+
+string JoinPath(const string& dirname, const string& basename) {
+#ifdef _WIN32
+    static const char separator = '\\';
+#else
+    static const char separator = '/';
+#endif  // _WIN32
+
+  if ((!basename.empty() && basename[0] == separator) || dirname.empty()) {
+    return basename;
+  } else if (dirname[dirname.size() - 1] == separator) {
+    return dirname + basename;
+  } else {
+    return dirname + string(&separator, 1) + basename;
+  }
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/file.h b/extern/libmv/third_party/ceres/internal/ceres/file.h
new file mode 100644
index 00000000000..4741d650646
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/file.h
@@ -0,0 +1,52 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//
+// Simple file IO support. This is a portability shim.
+
+#ifndef CERES_INTERNAL_FILE_H_
+#define CERES_INTERNAL_FILE_H_
+
+#include <string>
+#include "ceres/internal/port.h"
+
+namespace ceres {
+namespace internal {
+
+void WriteStringToFileOrDie(const string &data, const string &filename);
+void ReadFileToStringOrDie(const string &filename, string *data);
+
+// Join two path components, adding a slash if necessary.  If basename is an
+// absolute path then JoinPath ignores dirname and simply returns basename.
+string JoinPath(const string& dirname, const string& basename);
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_FILE_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_2.cc b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_2.cc
new file mode 100644
index 00000000000..5529386e485
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_2.cc
@@ -0,0 +1,53 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Template specialization of SchurEliminator.
+//
+// ========================================
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+//=========================================
+//
+// This file is generated using generate_eliminator_specializations.py.
+// Editing it manually is not recommended.
+
+#include "ceres/schur_eliminator_impl.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+template class SchurEliminator<2, 2, 2>;
+
+}  // namespace internal
+}  // namespace ceres
+
diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_3.cc b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_3.cc
new file mode 100644
index 00000000000..fd7af95192e
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_3.cc
@@ -0,0 +1,53 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Template specialization of SchurEliminator.
+//
+// ========================================
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+//=========================================
+//
+// This file is generated using generate_eliminator_specializations.py.
+// Editing it manually is not recommended.
+
+#include "ceres/schur_eliminator_impl.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+template class SchurEliminator<2, 2, 3>;
+
+}  // namespace internal
+}  // namespace ceres
+
diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_4.cc b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_4.cc
new file mode 100644
index 00000000000..109483e9fc0
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_4.cc
@@ -0,0 +1,53 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Template specialization of SchurEliminator.
+//
+// ========================================
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+//=========================================
+//
+// This file is generated using generate_eliminator_specializations.py.
+// Editing it manually is not recommended.
+
+#include "ceres/schur_eliminator_impl.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+template class SchurEliminator<2, 2, 4>;
+
+}  // namespace internal
+}  // namespace ceres
+
diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_d.cc b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_d.cc
new file mode 100644
index 00000000000..b93e82fe2fa
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_d.cc
@@ -0,0 +1,53 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Template specialization of SchurEliminator.
+//
+// ========================================
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+//=========================================
+//
+// This file is generated using generate_eliminator_specializations.py.
+// Editing it manually is not recommended.
+
+#include "ceres/schur_eliminator_impl.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+template class SchurEliminator<2, 2, Dynamic>;
+
+}  // namespace internal
+}  // namespace ceres
+
diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_3.cc b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_3.cc
new file mode 100644
index 00000000000..86352c07304
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_3.cc
@@ -0,0 +1,53 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Template specialization of SchurEliminator.
+//
+// ========================================
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+//=========================================
+//
+// This file is generated using generate_eliminator_specializations.py.
+// Editing it manually is not recommended.
+
+#include "ceres/schur_eliminator_impl.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+template class SchurEliminator<2, 3, 3>;
+
+}  // namespace internal
+}  // namespace ceres
+
diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_4.cc b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_4.cc
new file mode 100644
index 00000000000..200df7f5931
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_4.cc
@@ -0,0 +1,53 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Template specialization of SchurEliminator.
+//
+// ========================================
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+//=========================================
+//
+// This file is generated using generate_eliminator_specializations.py.
+// Editing it manually is not recommended.
+
+#include "ceres/schur_eliminator_impl.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+template class SchurEliminator<2, 3, 4>;
+
+}  // namespace internal
+}  // namespace ceres
+
diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_9.cc b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_9.cc
new file mode 100644
index 00000000000..1fda3434bef
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_9.cc
@@ -0,0 +1,53 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Template specialization of SchurEliminator.
+//
+// ========================================
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+//=========================================
+//
+// This file is generated using generate_eliminator_specializations.py.
+// Editing it manually is not recommended.
+
+#include "ceres/schur_eliminator_impl.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+template class SchurEliminator<2, 3, 9>;
+
+}  // namespace internal
+}  // namespace ceres
+
diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_d.cc b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_d.cc
new file mode 100644
index 00000000000..385cd2d70c9
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_d.cc
@@ -0,0 +1,53 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Template specialization of SchurEliminator.
+//
+// ========================================
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+//=========================================
+//
+// This file is generated using generate_eliminator_specializations.py.
+// Editing it manually is not recommended.
+
+#include "ceres/schur_eliminator_impl.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+template class SchurEliminator<2, 3, Dynamic>;
+
+}  // namespace internal
+}  // namespace ceres
+
diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_3.cc b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_3.cc
new file mode 100644
index 00000000000..7b15d6366ac
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_3.cc
@@ -0,0 +1,53 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Template specialization of SchurEliminator.
+//
+// ========================================
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+//=========================================
+//
+// This file is generated using generate_eliminator_specializations.py.
+// Editing it manually is not recommended.
+
+#include "ceres/schur_eliminator_impl.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+template class SchurEliminator<2, 4, 3>;
+
+}  // namespace internal
+}  // namespace ceres
+
diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_4.cc b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_4.cc
new file mode 100644
index 00000000000..29a610d743e
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_4.cc
@@ -0,0 +1,53 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Template specialization of SchurEliminator.
+//
+// ========================================
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+//=========================================
+//
+// This file is generated using generate_eliminator_specializations.py.
+// Editing it manually is not recommended.
+
+#include "ceres/schur_eliminator_impl.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+template class SchurEliminator<2, 4, 4>;
+
+}  // namespace internal
+}  // namespace ceres
+
diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_d.cc b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_d.cc
new file mode 100644
index 00000000000..a3bc4dc6f83
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_d.cc
@@ -0,0 +1,53 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Template specialization of SchurEliminator.
+//
+// ========================================
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+//=========================================
+//
+// This file is generated using generate_eliminator_specializations.py.
+// Editing it manually is not recommended.
+
+#include "ceres/schur_eliminator_impl.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+template class SchurEliminator<2, 4, Dynamic>;
+
+}  // namespace internal
+}  // namespace ceres
+
diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_2.cc b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_2.cc
new file mode 100644
index 00000000000..f71a4f62944
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_2.cc
@@ -0,0 +1,53 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Template specialization of SchurEliminator.
+//
+// ========================================
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+//=========================================
+//
+// This file is generated using generate_eliminator_specializations.py.
+// Editing it manually is not recommended.
+
+#include "ceres/schur_eliminator_impl.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+template class SchurEliminator<4, 4, 2>;
+
+}  // namespace internal
+}  // namespace ceres
+
diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_3.cc b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_3.cc
new file mode 100644
index 00000000000..52259fb1a67
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_3.cc
@@ -0,0 +1,53 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Template specialization of SchurEliminator.
+//
+// ========================================
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+//=========================================
+//
+// This file is generated using generate_eliminator_specializations.py.
+// Editing it manually is not recommended.
+
+#include "ceres/schur_eliminator_impl.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+template class SchurEliminator<4, 4, 3>;
+
+}  // namespace internal
+}  // namespace ceres
+
diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_4.cc b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_4.cc
new file mode 100644
index 00000000000..775424e6c8f
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_4.cc
@@ -0,0 +1,53 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Template specialization of SchurEliminator.
+//
+// ========================================
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+//=========================================
+//
+// This file is generated using generate_eliminator_specializations.py.
+// Editing it manually is not recommended.
+
+#include "ceres/schur_eliminator_impl.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+template class SchurEliminator<4, 4, 4>;
+
+}  // namespace internal
+}  // namespace ceres
+
diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_d.cc b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_d.cc
new file mode 100644
index 00000000000..97cde594059
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_d.cc
@@ -0,0 +1,53 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Template specialization of SchurEliminator.
+//
+// ========================================
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+//=========================================
+//
+// This file is generated using generate_eliminator_specializations.py.
+// Editing it manually is not recommended.
+
+#include "ceres/schur_eliminator_impl.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+template class SchurEliminator<4, 4, Dynamic>;
+
+}  // namespace internal
+}  // namespace ceres
+
diff --git a/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_d_d_d.cc b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_d_d_d.cc
new file mode 100644
index 00000000000..4cba32e26c8
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_d_d_d.cc
@@ -0,0 +1,53 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Template specialization of SchurEliminator.
+//
+// ========================================
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+//=========================================
+//
+// This file is generated using generate_eliminator_specializations.py.
+// Editing it manually is not recommended.
+
+#include "ceres/schur_eliminator_impl.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+template class SchurEliminator<Dynamic, Dynamic, Dynamic>;
+
+}  // namespace internal
+}  // namespace ceres
+
diff --git a/extern/libmv/third_party/ceres/internal/ceres/gradient_checking_cost_function.cc b/extern/libmv/third_party/ceres/internal/ceres/gradient_checking_cost_function.cc
new file mode 100644
index 00000000000..abba40824ef
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/gradient_checking_cost_function.cc
@@ -0,0 +1,308 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+
+#include "ceres/gradient_checking_cost_function.h"
+
+#include <algorithm>
+#include <cmath>
+#include <numeric>
+#include <string>
+#include <vector>
+
+#include <glog/logging.h>
+#include "ceres/parameter_block.h"
+#include "ceres/problem_impl.h"
+#include "ceres/program.h"
+#include "ceres/residual_block.h"
+#include "ceres/runtime_numeric_diff_cost_function.h"
+#include "ceres/stringprintf.h"
+#include "ceres/cost_function.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/problem.h"
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+namespace {
+
+// True if x and y have an absolute relative difference less than
+// relative_precision and false otherwise. Stores the relative and absolute
+// difference in relative/absolute_error if non-NULL.
+bool IsClose(double x, double y, double relative_precision,
+             double *relative_error,
+             double *absolute_error) {
+  double local_absolute_error;
+  double local_relative_error;
+  if (!absolute_error) {
+    absolute_error = &local_absolute_error;
+  }
+  if (!relative_error) {
+    relative_error = &local_relative_error;
+  }
+  *absolute_error = fabs(x - y);
+  *relative_error = *absolute_error / max(fabs(x), fabs(y));
+  if (x == 0 || y == 0) {
+    // If x or y is exactly zero, then relative difference doesn't have any
+    // meaning. Take the absolute difference instead.
+    *relative_error = *absolute_error;
+  }
+  return fabs(*relative_error) < fabs(relative_precision);
+}
+
+class GradientCheckingCostFunction : public CostFunction {
+ public:
+  GradientCheckingCostFunction(const CostFunction* function,
+                               double relative_step_size,
+                               double relative_precision,
+                               const string& extra_info)
+      : function_(function),
+        finite_diff_cost_function_(
+            CreateRuntimeNumericDiffCostFunction(function,
+                                                 CENTRAL,
+                                                 relative_step_size)),
+        relative_precision_(relative_precision),
+        extra_info_(extra_info) {
+    *mutable_parameter_block_sizes() = function->parameter_block_sizes();
+    set_num_residuals(function->num_residuals());
+  }
+
+  virtual ~GradientCheckingCostFunction() { }
+
+  virtual bool Evaluate(double const* const* parameters,
+                        double* residuals,
+                        double** jacobians) const {
+    if (!jacobians) {
+      // Nothing to check in this case; just forward.
+      return function_->Evaluate(parameters, residuals, NULL);
+    }
+
+    int num_residuals = function_->num_residuals();
+
+    // Make space for the jacobians of the two methods.
+    const vector<int16>& block_sizes = function_->parameter_block_sizes();
+    vector<Matrix> term_jacobians(block_sizes.size());
+    vector<Matrix> finite_difference_jacobians(block_sizes.size());
+    vector<double*> term_jacobian_pointers(block_sizes.size());
+    vector<double*> finite_difference_jacobian_pointers(block_sizes.size());
+    for (int i = 0; i < block_sizes.size(); i++) {
+      term_jacobians[i].resize(num_residuals, block_sizes[i]);
+      term_jacobian_pointers[i] = term_jacobians[i].data();
+      finite_difference_jacobians[i].resize(num_residuals, block_sizes[i]);
+      finite_difference_jacobian_pointers[i] =
+          finite_difference_jacobians[i].data();
+    }
+
+    // Evaluate the derivative using the user supplied code.
+    if (!function_->Evaluate(parameters,
+                             residuals,
+                             &term_jacobian_pointers[0])) {
+      LOG(WARNING) << "Function evaluation failed.";
+      return false;
+    }
+
+    // Evaluate the derivative using numeric derivatives.
+    finite_diff_cost_function_->Evaluate(
+        parameters,
+        residuals,
+        &finite_difference_jacobian_pointers[0]);
+
+    // See if any elements have relative error larger than the threshold.
+    int num_bad_jacobian_components = 0;
+    double worst_relative_error = 0;
+
+    // Accumulate the error message for all the jacobians, since it won't get
+    // output if there are no bad jacobian components.
+    string m;
+    for (int k = 0; k < block_sizes.size(); k++) {
+      // Copy the original jacobian blocks into the jacobians array.
+      if (jacobians[k] != NULL) {
+        MatrixRef(jacobians[k],
+                  term_jacobians[k].rows(),
+                  term_jacobians[k].cols()) = term_jacobians[k];
+      }
+
+      StringAppendF(&m,
+                    "========== "
+                    "Jacobian for " "block %d: (%ld by %ld)) "
+                    "==========\n",
+                    k,
+                    term_jacobians[k].rows(),
+                    term_jacobians[k].cols());
+      // The funny spacing creates appropriately aligned column headers.
+      m += " block  row  col        user dx/dy    num diff dx/dy         "
+           "abs error    relative error         parameter          residual\n";
+
+      for (int i = 0; i < term_jacobians[k].rows(); i++) {
+        for (int j = 0; j < term_jacobians[k].cols(); j++) {
+          double term_jacobian = term_jacobians[k](i, j);
+          double finite_jacobian = finite_difference_jacobians[k](i, j);
+          double relative_error, absolute_error;
+          bool bad_jacobian_entry =
+              !IsClose(term_jacobian,
+                       finite_jacobian,
+                       relative_precision_,
+                       &relative_error,
+                       &absolute_error);
+          worst_relative_error = std::max(worst_relative_error,
+                                          relative_error);
+
+          StringAppendF(&m, "%6d %4d %4d %17g %17g %17g %17g %17g %17g",
+                        k, i, j,
+                        term_jacobian, finite_jacobian,
+                        absolute_error, relative_error,
+                        parameters[k][j],
+                        residuals[i]);
+
+          if (bad_jacobian_entry) {
+            num_bad_jacobian_components++;
+            StringAppendF(
+                &m, " ------ (%d,%d,%d) Relative error worse than %g",
+                k, i, j, relative_precision_);
+          }
+          m += "\n";
+        }
+      }
+    }
+
+    // Since there were some bad errors, dump comprehensive debug info.
+    if (num_bad_jacobian_components) {
+      string header = StringPrintf("Detected %d bad jacobian component(s). "
+                                   "Worst relative error was %g.\n",
+                                   num_bad_jacobian_components,
+                                   worst_relative_error);
+      if (!extra_info_.empty()) {
+        header += "Extra info for this residual: " + extra_info_ + "\n";
+      }
+      LOG(WARNING) << "\n" << header << m;
+    }
+    return true;
+  }
+
+ private:
+  const CostFunction* function_;
+  internal::scoped_ptr<CostFunction> finite_diff_cost_function_;
+  double relative_precision_;
+  string extra_info_;
+};
+
+}  // namespace
+
+CostFunction *CreateGradientCheckingCostFunction(
+    const CostFunction *cost_function,
+    double relative_step_size,
+    double relative_precision,
+    const string& extra_info) {
+  return new GradientCheckingCostFunction(cost_function,
+                                          relative_step_size,
+                                          relative_precision,
+                                          extra_info);
+}
+
+ProblemImpl* CreateGradientCheckingProblemImpl(ProblemImpl* problem_impl,
+                                               double relative_step_size,
+                                               double relative_precision) {
+  // We create new CostFunctions by wrapping the original CostFunction
+  // in a gradient checking CostFunction. So its okay for the
+  // ProblemImpl to take ownership of it and destroy it. The
+  // LossFunctions and LocalParameterizations are reused and since
+  // they are owned by problem_impl, gradient_checking_problem_impl
+  // should not take ownership of it.
+  Problem::Options gradient_checking_problem_options;
+  gradient_checking_problem_options.cost_function_ownership = TAKE_OWNERSHIP;
+  gradient_checking_problem_options.loss_function_ownership =
+      DO_NOT_TAKE_OWNERSHIP;
+  gradient_checking_problem_options.local_parameterization_ownership =
+      DO_NOT_TAKE_OWNERSHIP;
+
+  ProblemImpl* gradient_checking_problem_impl = new ProblemImpl(
+      gradient_checking_problem_options);
+
+  Program* program = problem_impl->mutable_program();
+
+  // For every ParameterBlock in problem_impl, create a new parameter
+  // block with the same local parameterization and constancy.
+  const vector<ParameterBlock*>& parameter_blocks = program->parameter_blocks();
+  for (int i = 0; i < parameter_blocks.size(); ++i) {
+    ParameterBlock* parameter_block = parameter_blocks[i];
+    gradient_checking_problem_impl->AddParameterBlock(
+        parameter_block->mutable_user_state(),
+        parameter_block->Size(),
+        parameter_block->mutable_local_parameterization());
+
+    if (parameter_block->IsConstant()) {
+      gradient_checking_problem_impl->SetParameterBlockConstant(
+          parameter_block->mutable_user_state());
+    }
+  }
+
+  // For every ResidualBlock in problem_impl, create a new
+  // ResidualBlock by wrapping its CostFunction inside a
+  // GradientCheckingCostFunction.
+  const vector<ResidualBlock*>& residual_blocks = program->residual_blocks();
+  for (int i = 0; i < residual_blocks.size(); ++i) {
+    ResidualBlock* residual_block = residual_blocks[i];
+
+    // Build a human readable string which identifies the
+    // ResidualBlock. This is used by the GradientCheckingCostFunction
+    // when logging debugging information.
+    string extra_info = StringPrintf(
+        "Residual block id %d; depends on parameters [", i);
+    vector<double*> parameter_blocks;
+    for (int j = 0; j < residual_block->NumParameterBlocks(); ++j) {
+      ParameterBlock* parameter_block = residual_block->parameter_blocks()[j];
+      parameter_blocks.push_back(parameter_block->mutable_user_state());
+      StringAppendF(&extra_info, "%p", parameter_block->mutable_user_state());
+      extra_info += (j < residual_block->NumParameterBlocks() - 1) ? ", " : "]";
+    }
+
+    // Wrap the original CostFunction in a GradientCheckingCostFunction.
+    CostFunction* gradient_checking_cost_function =
+        CreateGradientCheckingCostFunction(residual_block->cost_function(),
+                                           relative_step_size,
+                                           relative_precision,
+                                           extra_info);
+
+    // The const_cast is necessary because
+    // ProblemImpl::AddResidualBlock can potentially take ownership of
+    // the LossFunction, but in this case we are guaranteed that this
+    // will not be the case, so this const_cast is harmless.
+    gradient_checking_problem_impl->AddResidualBlock(
+        gradient_checking_cost_function,
+        const_cast<LossFunction*>(residual_block->loss_function()),
+        parameter_blocks);
+  }
+
+  return gradient_checking_problem_impl;
+}
+
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/gradient_checking_cost_function.h b/extern/libmv/third_party/ceres/internal/ceres/gradient_checking_cost_function.h
new file mode 100644
index 00000000000..d49c8e6c244
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/gradient_checking_cost_function.h
@@ -0,0 +1,85 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+
+#ifndef CERES_INTERNAL_GRADIENT_CHECKING_COST_FUNCTION_H_
+#define CERES_INTERNAL_GRADIENT_CHECKING_COST_FUNCTION_H_
+
+#include <string>
+
+#include "ceres/cost_function.h"
+
+namespace ceres {
+namespace internal {
+
+class ProblemImpl;
+
+// Creates a CostFunction that checks the jacobians that cost_function computes
+// with finite differences. Bad results are logged; required precision is
+// controlled by relative_precision and the numeric differentiation step size is
+// controlled with relative_step_size. See solver.h for a better explanation of
+// relative_step_size. Caller owns result.
+//
+// The condition enforced is that
+//
+//    (J_actual(i, j) - J_numeric(i, j))
+//   ------------------------------------  <  relative_precision
+//   max(J_actual(i, j), J_numeric(i, j))
+//
+// where J_actual(i, j) is the jacobian as computed by the supplied cost
+// function (by the user) and J_numeric is the jacobian as computed by finite
+// differences.
+//
+// Note: This is quite inefficient and is intended only for debugging.
+CostFunction* CreateGradientCheckingCostFunction(
+    const CostFunction* cost_function,
+    double relative_step_size,
+    double relative_precision,
+    const string& extra_info);
+
+// Create a new ProblemImpl object from the input problem_impl, where
+// each CostFunctions in problem_impl are wrapped inside a
+// GradientCheckingCostFunctions. This gives us a ProblemImpl object
+// which checks its derivatives against estimates from numeric
+// differentiation everytime a ResidualBlock is evaluated.
+//
+// relative_step_size and relative_precision are parameters to control
+// the numeric differentiation and the relative tolerance between the
+// jacobian computed by the CostFunctions in problem_impl and
+// jacobians obtained by numerically differentiating them. For more
+// details see the documentation for
+// CreateGradientCheckingCostFunction above.
+ProblemImpl* CreateGradientCheckingProblemImpl(ProblemImpl* problem_impl,
+                                               double relative_step_size,
+                                               double relative_precision);
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_GRADIENT_CHECKING_COST_FUNCTION_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/graph.h b/extern/libmv/third_party/ceres/internal/ceres/graph.h
new file mode 100644
index 00000000000..fd7a224f0aa
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/graph.h
@@ -0,0 +1,138 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#ifndef CERES_INTERNAL_GRAPH_H_
+#define CERES_INTERNAL_GRAPH_H_
+
+#include <limits>
+#include <glog/logging.h>
+#include "ceres/integral_types.h"
+#include "ceres/map_util.h"
+#include "ceres/collections_port.h"
+#include "ceres/internal/macros.h"
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+
+// A weighted undirected graph templated over the vertex ids. Vertex
+// should be hashable and comparable.
+template <typename Vertex>
+class Graph {
+ public:
+  Graph() {}
+
+  // Add a weighted vertex. If the vertex already exists in the graph,
+  // its weight is set to the new weight.
+  void AddVertex(const Vertex& vertex, double weight) {
+    if (vertices_.find(vertex) == vertices_.end()) {
+      vertices_.insert(vertex);
+      edges_[vertex] = HashSet<Vertex>();
+    }
+    vertex_weights_[vertex] = weight;
+  }
+
+  // Uses weight = 1.0. If vertex already exists, its weight is set to
+  // 1.0.
+  void AddVertex(const Vertex& vertex) {
+    AddVertex(vertex, 1.0);
+  }
+
+  // Add a weighted edge between the vertex1 and vertex2. Calling
+  // AddEdge on a pair of vertices which do not exist in the graph yet
+  // will result in undefined behavior.
+  //
+  // It is legal to call this method repeatedly for the same set of
+  // vertices.
+  void AddEdge(const Vertex& vertex1, const Vertex& vertex2, double weight) {
+    DCHECK(vertices_.find(vertex1) != vertices_.end());
+    DCHECK(vertices_.find(vertex2) != vertices_.end());
+
+    if (edges_[vertex1].insert(vertex2).second) {
+      edges_[vertex2].insert(vertex1);
+    }
+
+    if (vertex1 < vertex2) {
+      edge_weights_[make_pair(vertex1, vertex2)] = weight;
+    } else {
+      edge_weights_[make_pair(vertex2, vertex1)] = weight;
+    }
+  }
+
+  // Uses weight = 1.0.
+  void AddEdge(const Vertex& vertex1, const Vertex& vertex2) {
+    AddEdge(vertex1, vertex2, 1.0);
+  }
+
+  // Calling VertexWeight on a vertex not in the graph will result in
+  // undefined behavior.
+  double VertexWeight(const Vertex& vertex) const {
+    return FindOrDie(vertex_weights_, vertex);
+  }
+
+  // Calling EdgeWeight on a pair of vertices where either one of the
+  // vertices is not present in the graph will result in undefined
+  // behaviour. If there is no edge connecting vertex1 and vertex2,
+  // the edge weight is zero.
+  double EdgeWeight(const Vertex& vertex1, const Vertex& vertex2) const {
+    if (vertex1 < vertex2) {
+      return FindWithDefault(edge_weights_, make_pair(vertex1, vertex2), 0.0);
+    } else {
+      return FindWithDefault(edge_weights_, make_pair(vertex2, vertex1), 0.0);
+    }
+  }
+
+  // Calling Neighbors on a vertex not in the graph will result in
+  // undefined behaviour.
+  const HashSet<Vertex>& Neighbors(const Vertex& vertex) const {
+    return FindOrDie(edges_, vertex);
+  }
+
+  const HashSet<Vertex>& vertices() const {
+    return vertices_;
+  }
+
+  static double InvalidWeight() {
+    return std::numeric_limits<double>::quiet_NaN();
+  };
+
+ private:
+  HashSet<Vertex> vertices_;
+  HashMap<Vertex, double> vertex_weights_;
+  HashMap<Vertex, HashSet<Vertex> > edges_;
+  HashMap<pair<Vertex, Vertex>, double> edge_weights_;
+
+  DISALLOW_COPY_AND_ASSIGN(Graph);
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_GRAPH_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/graph_algorithms.h b/extern/libmv/third_party/ceres/internal/ceres/graph_algorithms.h
new file mode 100644
index 00000000000..3b42d936336
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/graph_algorithms.h
@@ -0,0 +1,270 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Various algorithms that operate on undirected graphs.
+
+#ifndef CERES_INTERNAL_GRAPH_ALGORITHMS_H_
+#define CERES_INTERNAL_GRAPH_ALGORITHMS_H_
+
+#include <vector>
+#include <glog/logging.h>
+#include "ceres/collections_port.h"
+#include "ceres/graph.h"
+
+namespace ceres {
+namespace internal {
+
+// Compare two vertices of a graph by their degrees.
+template <typename Vertex>
+class VertexDegreeLessThan {
+ public:
+  explicit VertexDegreeLessThan(const Graph<Vertex>& graph)
+      : graph_(graph) {}
+
+  bool operator()(const Vertex& lhs, const Vertex& rhs) const {
+    if (graph_.Neighbors(lhs).size() == graph_.Neighbors(rhs).size()) {
+      return lhs < rhs;
+    }
+    return graph_.Neighbors(lhs).size() < graph_.Neighbors(rhs).size();
+  }
+
+ private:
+  const Graph<Vertex>& graph_;
+};
+
+// Order the vertices of a graph using its (approximately) largest
+// independent set, where an independent set of a graph is a set of
+// vertices that have no edges connecting them. The maximum
+// independent set problem is NP-Hard, but there are effective
+// approximation algorithms available. The implementation here uses a
+// breadth first search that explores the vertices in order of
+// increasing degree. The same idea is used by Saad & Li in "MIQR: A
+// multilevel incomplete QR preconditioner for large sparse
+// least-squares problems", SIMAX, 2007.
+//
+// Given a undirected graph G(V,E), the algorithm is a greedy BFS
+// search where the vertices are explored in increasing order of their
+// degree. The output vector ordering contains elements of S in
+// increasing order of their degree, followed by elements of V - S in
+// increasing order of degree. The return value of the function is the
+// cardinality of S.
+template <typename Vertex>
+int IndependentSetOrdering(const Graph<Vertex>& graph,
+                           vector<Vertex>* ordering) {
+  const HashSet<Vertex>& vertices = graph.vertices();
+  const int num_vertices = vertices.size();
+
+  CHECK_NOTNULL(ordering);
+  ordering->clear();
+  ordering->reserve(num_vertices);
+
+  // Colors for labeling the graph during the BFS.
+  const char kWhite = 0;
+  const char kGrey = 1;
+  const char kBlack = 2;
+
+  // Mark all vertices white.
+  HashMap<Vertex, char> vertex_color;
+  vector<Vertex> vertex_queue;
+  for (typename HashSet<Vertex>::const_iterator it = vertices.begin();
+       it != vertices.end();
+       ++it) {
+    vertex_color[*it] = kWhite;
+    vertex_queue.push_back(*it);
+  }
+
+
+  sort(vertex_queue.begin(), vertex_queue.end(),
+       VertexDegreeLessThan<Vertex>(graph));
+
+  // Iterate over vertex_queue. Pick the first white vertex, add it
+  // to the independent set. Mark it black and its neighbors grey.
+  for (int i = 0; i < vertex_queue.size(); ++i) {
+    const Vertex& vertex = vertex_queue[i];
+    if (vertex_color[vertex] != kWhite) {
+      continue;
+    }
+
+    ordering->push_back(vertex);
+    vertex_color[vertex] = kBlack;
+    const HashSet<Vertex>& neighbors = graph.Neighbors(vertex);
+    for (typename HashSet<Vertex>::const_iterator it = neighbors.begin();
+         it != neighbors.end();
+         ++it) {
+      vertex_color[*it] = kGrey;
+    }
+  }
+
+  int independent_set_size = ordering->size();
+
+  // Iterate over the vertices and add all the grey vertices to the
+  // ordering. At this stage there should only be black or grey
+  // vertices in the graph.
+  for (typename vector<Vertex>::const_iterator it = vertex_queue.begin();
+       it != vertex_queue.end();
+       ++it) {
+    const Vertex vertex = *it;
+    DCHECK(vertex_color[vertex] != kWhite);
+    if (vertex_color[vertex] != kBlack) {
+      ordering->push_back(vertex);
+    }
+  }
+
+  CHECK_EQ(ordering->size(), num_vertices);
+  return independent_set_size;
+}
+
+// Find the connected component for a vertex implemented using the
+// find and update operation for disjoint-set. Recursively traverse
+// the disjoint set structure till you reach a vertex whose connected
+// component has the same id as the vertex itself. Along the way
+// update the connected components of all the vertices. This updating
+// is what gives this data structure its efficiency.
+template <typename Vertex>
+Vertex FindConnectedComponent(const Vertex& vertex,
+                              HashMap<Vertex, Vertex>* union_find) {
+  typename HashMap<Vertex, Vertex>::iterator it = union_find->find(vertex);
+  DCHECK(it != union_find->end());
+  if (it->second != vertex) {
+    it->second = FindConnectedComponent(it->second, union_find);
+  }
+
+  return it->second;
+}
+
+// Compute a degree two constrained Maximum Spanning Tree/forest of
+// the input graph. Caller owns the result.
+//
+// Finding degree 2 spanning tree of a graph is not always
+// possible. For example a star graph, i.e. a graph with n-nodes
+// where one node is connected to the other n-1 nodes does not have
+// a any spanning trees of degree less than n-1.Even if such a tree
+// exists, finding such a tree is NP-Hard.
+
+// We get around both of these problems by using a greedy, degree
+// constrained variant of Kruskal's algorithm. We start with a graph
+// G_T with the same vertex set V as the input graph G(V,E) but an
+// empty edge set. We then iterate over the edges of G in decreasing
+// order of weight, adding them to G_T if doing so does not create a
+// cycle in G_T} and the degree of all the vertices in G_T remains
+// bounded by two. This O(|E|) algorithm results in a degree-2
+// spanning forest, or a collection of linear paths that span the
+// graph G.
+template <typename Vertex>
+Graph<Vertex>*
+Degree2MaximumSpanningForest(const Graph<Vertex>& graph) {
+  // Array of edges sorted in decreasing order of their weights.
+  vector<pair<double, pair<Vertex, Vertex> > > weighted_edges;
+  Graph<Vertex>* forest = new Graph<Vertex>();
+
+  // Disjoint-set to keep track of the connected components in the
+  // maximum spanning tree.
+  HashMap<Vertex, Vertex> disjoint_set;
+
+  // Sort of the edges in the graph in decreasing order of their
+  // weight. Also add the vertices of the graph to the Maximum
+  // Spanning Tree graph and set each vertex to be its own connected
+  // component in the disjoint_set structure.
+  const HashSet<Vertex>& vertices = graph.vertices();
+  for (typename HashSet<Vertex>::const_iterator it = vertices.begin();
+       it != vertices.end();
+       ++it) {
+    const Vertex vertex1 = *it;
+    forest->AddVertex(vertex1, graph.VertexWeight(vertex1));
+    disjoint_set[vertex1] = vertex1;
+
+    const HashSet<Vertex>& neighbors = graph.Neighbors(vertex1);
+    for (typename HashSet<Vertex>::const_iterator it2 = neighbors.begin();
+         it2 != neighbors.end();
+         ++it2) {
+      const Vertex vertex2 = *it2;
+      if (vertex1 >= vertex2) {
+        continue;
+      }
+      const double weight = graph.EdgeWeight(vertex1, vertex2);
+      weighted_edges.push_back(make_pair(weight, make_pair(vertex1, vertex2)));
+    }
+  }
+
+  // The elements of this vector, are pairs<edge_weight,
+  // edge>. Sorting it using the reverse iterators gives us the edges
+  // in decreasing order of edges.
+  sort(weighted_edges.rbegin(), weighted_edges.rend());
+
+  // Greedily add edges to the spanning tree/forest as long as they do
+  // not violate the degree/cycle constraint.
+  for (int i =0; i < weighted_edges.size(); ++i) {
+    const pair<Vertex, Vertex>& edge = weighted_edges[i].second;
+    const Vertex vertex1 = edge.first;
+    const Vertex vertex2 = edge.second;
+
+    // Check if either of the vertices are of degree 2 already, in
+    // which case adding this edge will violate the degree 2
+    // constraint.
+    if ((forest->Neighbors(vertex1).size() == 2) ||
+        (forest->Neighbors(vertex2).size() == 2)) {
+      continue;
+    }
+
+    // Find the id of the connected component to which the two
+    // vertices belong to. If the id is the same, it means that the
+    // two of them are already connected to each other via some other
+    // vertex, and adding this edge will create a cycle.
+    Vertex root1 = FindConnectedComponent(vertex1, &disjoint_set);
+    Vertex root2 = FindConnectedComponent(vertex2, &disjoint_set);
+
+    if (root1 == root2) {
+      continue;
+    }
+
+    // This edge can be added, add an edge in either direction with
+    // the same weight as the original graph.
+    const double edge_weight = graph.EdgeWeight(vertex1, vertex2);
+    forest->AddEdge(vertex1, vertex2, edge_weight);
+    forest->AddEdge(vertex2, vertex1, edge_weight);
+
+    // Connected the two connected components by updating the
+    // disjoint_set structure. Always connect the connected component
+    // with the greater index with the connected component with the
+    // smaller index. This should ensure shallower trees, for quicker
+    // lookup.
+    if (root2 < root1) {
+      std::swap(root1, root2);
+    };
+
+    disjoint_set[root2] = root1;
+  }
+  return forest;
+}
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_GRAPH_ALGORITHMS_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.cc b/extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.cc
new file mode 100644
index 00000000000..bd908846362
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.cc
@@ -0,0 +1,237 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#include "ceres/implicit_schur_complement.h"
+
+#include <glog/logging.h>
+#include "Eigen/Dense"
+#include "ceres/block_sparse_matrix.h"
+#include "ceres/block_structure.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+
+ImplicitSchurComplement::ImplicitSchurComplement(int num_eliminate_blocks,
+                                                 bool constant_sparsity,
+                                                 bool preconditioner)
+    : num_eliminate_blocks_(num_eliminate_blocks),
+      constant_sparsity_(constant_sparsity),
+      preconditioner_(preconditioner),
+      A_(NULL),
+      D_(NULL),
+      b_(NULL),
+      block_diagonal_EtE_inverse_(NULL),
+      block_diagonal_FtF_inverse_(NULL) {
+}
+
+ImplicitSchurComplement::~ImplicitSchurComplement() {
+}
+
+void ImplicitSchurComplement::Init(const BlockSparseMatrixBase& A,
+                                   const double* D,
+                                   const double* b) {
+  // Since initialization is reasonably heavy, perhaps we can save on
+  // constructing a new object everytime.
+  if ((A_ == NULL) || !constant_sparsity_) {
+    A_.reset(new PartitionedMatrixView(A, num_eliminate_blocks_));
+  }
+
+  D_ = D;
+  b_ = b;
+
+  // Initialize temporary storage and compute the block diagonals of
+  // E'E and F'E.
+  if ((!constant_sparsity_) || (block_diagonal_EtE_inverse_ == NULL)) {
+    block_diagonal_EtE_inverse_.reset(A_->CreateBlockDiagonalEtE());
+    if (preconditioner_) {
+      block_diagonal_FtF_inverse_.reset(A_->CreateBlockDiagonalFtF());
+    }
+    rhs_.resize(A_->num_cols_f());
+    rhs_.setZero();
+    tmp_rows_.resize(A_->num_rows());
+    tmp_e_cols_.resize(A_->num_cols_e());
+    tmp_e_cols_2_.resize(A_->num_cols_e());
+    tmp_f_cols_.resize(A_->num_cols_f());
+  } else {
+    A_->UpdateBlockDiagonalEtE(block_diagonal_EtE_inverse_.get());
+    if (preconditioner_) {
+      A_->UpdateBlockDiagonalFtF(block_diagonal_FtF_inverse_.get());
+    }
+  }
+
+  // The block diagonals of the augmented linear system contain
+  // contributions from the diagonal D if it is non-null. Add that to
+  // the block diagonals and invert them.
+  if (D_ != NULL)  {
+    AddDiagonalAndInvert(D_, block_diagonal_EtE_inverse_.get());
+    if (preconditioner_) {
+      AddDiagonalAndInvert(D_ + A_->num_cols_e(),
+                           block_diagonal_FtF_inverse_.get());
+    }
+  } else {
+    AddDiagonalAndInvert(NULL, block_diagonal_EtE_inverse_.get());
+    if (preconditioner_) {
+      AddDiagonalAndInvert(NULL, block_diagonal_FtF_inverse_.get());
+    }
+  }
+
+  // Compute the RHS of the Schur complement system.
+  UpdateRhs();
+}
+
+// Evaluate the product
+//
+//   Sx = [F'F - F'E (E'E)^-1 E'F]x
+//
+// By breaking it down into individual matrix vector products
+// involving the matrices E and F. This is implemented using a
+// PartitionedMatrixView of the input matrix A.
+void ImplicitSchurComplement::RightMultiply(const double* x, double* y) const {
+  // y1 = F x
+  tmp_rows_.setZero();
+  A_->RightMultiplyF(x, tmp_rows_.data());
+
+  // y2 = E' y1
+  tmp_e_cols_.setZero();
+  A_->LeftMultiplyE(tmp_rows_.data(), tmp_e_cols_.data());
+
+  // y3 = -(E'E)^-1 y2
+  tmp_e_cols_2_.setZero();
+  block_diagonal_EtE_inverse_->RightMultiply(tmp_e_cols_.data(),
+                                             tmp_e_cols_2_.data());
+  tmp_e_cols_2_ *= -1.0;
+
+  // y1 = y1 + E y3
+  A_->RightMultiplyE(tmp_e_cols_2_.data(), tmp_rows_.data());
+
+  // y5 = D * x
+  if (D_ != NULL) {
+    ConstVectorRef Dref(D_ + A_->num_cols_e(), num_cols());
+    VectorRef(y, num_cols()) =
+        (Dref.array().square() *
+         ConstVectorRef(x, num_cols()).array()).matrix();
+  } else {
+    VectorRef(y, num_cols()).setZero();
+  }
+
+  // y = y5 + F' y1
+  A_->LeftMultiplyF(tmp_rows_.data(), y);
+}
+
+// Given a block diagonal matrix and an optional array of diagonal
+// entries D, add them to the diagonal of the matrix and compute the
+// inverse of each diagonal block.
+void ImplicitSchurComplement::AddDiagonalAndInvert(
+    const double* D,
+    BlockSparseMatrix* block_diagonal) {
+  const CompressedRowBlockStructure* block_diagonal_structure =
+      block_diagonal->block_structure();
+  for (int r = 0; r < block_diagonal_structure->rows.size(); ++r) {
+    const int row_block_pos = block_diagonal_structure->rows[r].block.position;
+    const int row_block_size = block_diagonal_structure->rows[r].block.size;
+    const Cell& cell = block_diagonal_structure->rows[r].cells[0];
+    MatrixRef m(block_diagonal->mutable_values() + cell.position,
+                row_block_size, row_block_size);
+
+    if (D != NULL) {
+      ConstVectorRef d(D + row_block_pos, row_block_size);
+      m += d.array().square().matrix().asDiagonal();
+    }
+
+    m = m
+        .selfadjointView<Eigen::Upper>()
+        .ldlt()
+        .solve(Matrix::Identity(row_block_size, row_block_size));
+  }
+}
+
+// Similar to RightMultiply, use the block structure of the matrix A
+// to compute y = (E'E)^-1 (E'b - E'F x).
+void ImplicitSchurComplement::BackSubstitute(const double* x, double* y) {
+  const int num_cols_e = A_->num_cols_e();
+  const int num_cols_f = A_->num_cols_f();
+  const int num_cols =  A_->num_cols();
+  const int num_rows = A_->num_rows();
+
+  // y1 = F x
+  tmp_rows_.setZero();
+  A_->RightMultiplyF(x, tmp_rows_.data());
+
+  // y2 = b - y1
+  tmp_rows_ = ConstVectorRef(b_, num_rows) - tmp_rows_;
+
+  // y3 = E' y2
+  tmp_e_cols_.setZero();
+  A_->LeftMultiplyE(tmp_rows_.data(), tmp_e_cols_.data());
+
+  // y = (E'E)^-1 y3
+  VectorRef(y, num_cols).setZero();
+  block_diagonal_EtE_inverse_->RightMultiply(tmp_e_cols_.data(), y);
+
+  // The full solution vector y has two blocks. The first block of
+  // variables corresponds to the eliminated variables, which we just
+  // computed via back substitution. The second block of variables
+  // corresponds to the Schur complement system, so we just copy those
+  // values from the solution to the Schur complement.
+  VectorRef(y + num_cols_e, num_cols_f) =  ConstVectorRef(x, num_cols_f);
+}
+
+// Compute the RHS of the Schur complement system.
+//
+// rhs = F'b - F'E (E'E)^-1 E'b
+//
+// Like BackSubstitute, we use the block structure of A to implement
+// this using a series of matrix vector products.
+void ImplicitSchurComplement::UpdateRhs() {
+  // y1 = E'b
+  tmp_e_cols_.setZero();
+  A_->LeftMultiplyE(b_, tmp_e_cols_.data());
+
+  // y2 = (E'E)^-1 y1
+  Vector y2 = Vector::Zero(A_->num_cols_e());
+  block_diagonal_EtE_inverse_->RightMultiply(tmp_e_cols_.data(), y2.data());
+
+  // y3 = E y2
+  tmp_rows_.setZero();
+  A_->RightMultiplyE(y2.data(), tmp_rows_.data());
+
+  // y3 = b - y3
+  tmp_rows_ = ConstVectorRef(b_, A_->num_rows()) - tmp_rows_;
+
+  // rhs = F' y3
+  rhs_.setZero();
+  A_->LeftMultiplyF(tmp_rows_.data(), rhs_.data());
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.h b/extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.h
new file mode 100644
index 00000000000..37a319f9c57
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.h
@@ -0,0 +1,176 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// An iterative solver for solving the Schur complement/reduced camera
+// linear system that arise in SfM problems.
+
+#ifndef CERES_INTERNAL_IMPLICIT_SCHUR_COMPLEMENT_H_
+#define CERES_INTERNAL_IMPLICIT_SCHUR_COMPLEMENT_H_
+
+#include "ceres/linear_operator.h"
+#include "ceres/partitioned_matrix_view.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+
+class BlockSparseMatrix;
+class BlockSparseMatrixBase;
+
+// This class implements various linear algebraic operations related
+// to the Schur complement without explicitly forming it.
+//
+//
+// Given a reactangular linear system Ax = b, where
+//
+//   A = [E F]
+//
+// The normal equations are given by
+//
+//   A'Ax = A'b
+//
+//  |E'E E'F||y| = |E'b|
+//  |F'E F'F||z|   |F'b|
+//
+// and the Schur complement system is given by
+//
+//  [F'F - F'E (E'E)^-1 E'F] z = F'b - F'E (E'E)^-1 E'b
+//
+// Now if we wish to solve Ax = b in the least squares sense, one way
+// is to form this Schur complement system and solve it using
+// Preconditioned Conjugate Gradients.
+//
+// The key operation in a conjugate gradient solver is the evaluation of the
+// matrix vector product with the Schur complement
+//
+//   S = F'F - F'E (E'E)^-1 E'F
+//
+// It is straightforward to see that matrix vector products with S can
+// be evaluated without storing S in memory. Instead, given (E'E)^-1
+// (which for our purposes is an easily inverted block diagonal
+// matrix), it can be done in terms of matrix vector products with E,
+// F and (E'E)^-1. This class implements this functionality and other
+// auxilliary bits needed to implement a CG solver on the Schur
+// complement using the PartitionedMatrixView object.
+//
+// THREAD SAFETY: This class is nqot thread safe. In particular, the
+// RightMultiply (and the LeftMultiply) methods are not thread safe as
+// they depend on mutable arrays used for the temporaries needed to
+// compute the product y += Sx;
+class ImplicitSchurComplement : public LinearOperator {
+ public:
+  // num_eliminate_blocks is the number of E blocks in the matrix
+  // A.
+  //
+  // constant_sparsity indicates if across calls to Init, the sparsity
+  // structure of the matrix A remains constant or not. This makes for
+  // significant savings across multiple matrices A, e.g. when used in
+  // conjunction with an optimization algorithm.
+  //
+  // preconditioner indicates whether the inverse of the matrix F'F
+  // should be computed or not as a preconditioner for the Schur
+  // Complement.
+  //
+  // TODO(sameeragarwal): Get rid of the two bools below and replace
+  // them with enums.
+  ImplicitSchurComplement(int num_eliminate_blocks,
+                          bool constant_sparsity,
+                          bool preconditioner);
+  virtual ~ImplicitSchurComplement();
+
+  // Initialize the Schur complement for a linear least squares
+  // problem of the form
+  //
+  //   |A      | x = |b|
+  //   |diag(D)|     |0|
+  //
+  // If D is null, then it is treated as a zero dimensional matrix. It
+  // is important that the matrix A have a BlockStructure object
+  // associated with it and has a block structure that is compatible
+  // with the SchurComplement solver.
+  void Init(const BlockSparseMatrixBase& A, const double* D, const double* b);
+
+  // y += Sx, where S is the Schur complement.
+  virtual void RightMultiply(const double* x, double* y) const;
+
+  // The Schur complement is a symmetric positive definite matrix,
+  // thus the left and right multiply operators are the same.
+  virtual void LeftMultiply(const double* x, double* y) const {
+    RightMultiply(x, y);
+  }
+
+  // y = (E'E)^-1 (E'b - E'F x). Given an estimate of the solution to
+  // the Schur complement system, this method computes the value of
+  // the e_block variables that were eliminated to form the Schur
+  // complement.
+  void BackSubstitute(const double* x, double* y);
+
+  virtual int num_rows() const { return A_->num_cols_f(); }
+  virtual int num_cols() const { return A_->num_cols_f(); }
+  const Vector& rhs()    const { return rhs_;             }
+
+  const BlockSparseMatrix* block_diagonal_EtE_inverse() const {
+    return block_diagonal_EtE_inverse_.get();
+  }
+
+  const BlockSparseMatrix* block_diagonal_FtF_inverse() const {
+    return block_diagonal_FtF_inverse_.get();
+  }
+
+ private:
+  void AddDiagonalAndInvert(const double* D, BlockSparseMatrix* matrix);
+  void UpdateRhs();
+
+  int num_eliminate_blocks_;
+  bool constant_sparsity_;
+  bool preconditioner_;
+
+  scoped_ptr<PartitionedMatrixView> A_;
+  const double* D_;
+  const double* b_;
+
+  scoped_ptr<BlockSparseMatrix> block_diagonal_EtE_inverse_;
+  scoped_ptr<BlockSparseMatrix> block_diagonal_FtF_inverse_;
+
+  Vector rhs_;
+
+  // Temporary storage vectors used to implement RightMultiply.
+  mutable Vector tmp_rows_;
+  mutable Vector tmp_e_cols_;
+  mutable Vector tmp_e_cols_2_;
+  mutable Vector tmp_f_cols_;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_IMPLICIT_SCHUR_COMPLEMENT_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/integral_types.h b/extern/libmv/third_party/ceres/internal/ceres/integral_types.h
new file mode 100644
index 00000000000..01e04937e3e
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/integral_types.h
@@ -0,0 +1,92 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//
+// Portable typedefs for various fixed-size integers. Uses template
+// metaprogramming instead of fragile compiler defines.
+
+#ifndef CERES_INTERNAL_INTEGRAL_TYPES_H_
+#define CERES_INTERNAL_INTEGRAL_TYPES_H_
+
+namespace ceres {
+namespace internal {
+
+// Compile time ternary on types.
+template<bool kCondition, typename kTrueType, typename kFalseType>
+struct Ternary {
+  typedef kTrueType type;
+};
+template<typename kTrueType, typename kFalseType>
+struct Ternary<false, kTrueType, kFalseType> {
+  typedef kFalseType type;
+};
+
+#define CERES_INTSIZE(TYPE) \
+    typename Ternary<sizeof(TYPE) * 8 == kBits, TYPE,
+
+template<int kBits>
+struct Integer {
+  typedef
+      CERES_INTSIZE(char)
+      CERES_INTSIZE(short)
+      CERES_INTSIZE(int)
+      CERES_INTSIZE(long int)
+      CERES_INTSIZE(long long)
+      void>::type >::type >::type >::type >::type
+      type;
+};
+
+template<int kBits>
+struct UnsignedInteger {
+  typedef
+      CERES_INTSIZE(unsigned char)
+      CERES_INTSIZE(unsigned short)
+      CERES_INTSIZE(unsigned int)
+      CERES_INTSIZE(unsigned long int)
+      CERES_INTSIZE(unsigned long long)
+      void>::type >::type >::type >::type >::type
+      type;
+};
+
+#undef CERES_INTSIZE
+
+typedef Integer< 8>::type int8;
+typedef Integer<16>::type int16;
+typedef Integer<32>::type int32;
+typedef Integer<64>::type int64;
+
+typedef UnsignedInteger< 8>::type uint8;
+typedef UnsignedInteger<16>::type uint16;
+typedef UnsignedInteger<32>::type uint32;
+typedef UnsignedInteger<64>::type uint64;
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_INTEGRAL_TYPES_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.cc b/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.cc
new file mode 100644
index 00000000000..51303195317
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.cc
@@ -0,0 +1,150 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#include "ceres/iterative_schur_complement_solver.h"
+
+#include <algorithm>
+#include <cstring>
+#include <vector>
+
+#include <glog/logging.h>
+#include "Eigen/Dense"
+#include "ceres/block_sparse_matrix.h"
+#include "ceres/block_structure.h"
+#include "ceres/conjugate_gradients_solver.h"
+#include "ceres/implicit_schur_complement.h"
+#include "ceres/linear_solver.h"
+#include "ceres/triplet_sparse_matrix.h"
+#include "ceres/visibility_based_preconditioner.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/linear_solver.h"
+#include "ceres/triplet_sparse_matrix.h"
+#include "ceres/types.h"
+#include "ceres/visibility_based_preconditioner.h"
+
+namespace ceres {
+namespace internal {
+
+IterativeSchurComplementSolver::IterativeSchurComplementSolver(
+    const LinearSolver::Options& options)
+    : options_(options) {
+}
+
+IterativeSchurComplementSolver::~IterativeSchurComplementSolver() {
+}
+
+LinearSolver::Summary IterativeSchurComplementSolver::SolveImpl(
+    BlockSparseMatrixBase* A,
+    const double* b,
+    const LinearSolver::PerSolveOptions& per_solve_options,
+    double* x) {
+  CHECK_NOTNULL(A->block_structure());
+
+  // Initialize a ImplicitSchurComplement object.
+  if ((schur_complement_ == NULL) || (!options_.constant_sparsity)) {
+    schur_complement_.reset(
+        new ImplicitSchurComplement(options_.num_eliminate_blocks,
+                                    options_.constant_sparsity,
+                                    options_.preconditioner_type == JACOBI));
+  }
+  schur_complement_->Init(*A, per_solve_options.D, b);
+
+  // Initialize the solution to the Schur complement system to zero.
+  //
+  // TODO(sameeragarwal): There maybe a better initialization than an
+  // all zeros solution. Explore other cheap starting points.
+  reduced_linear_system_solution_.resize(schur_complement_->num_rows());
+  reduced_linear_system_solution_.setZero();
+
+  // Instantiate a conjugate gradient solver that runs on the Schur complement
+  // matrix with the block diagonal of the matrix F'F as the preconditioner.
+  LinearSolver::Options cg_options;
+  cg_options.max_num_iterations = options_.max_num_iterations;
+  ConjugateGradientsSolver cg_solver(cg_options);
+  LinearSolver::PerSolveOptions cg_per_solve_options;
+
+  cg_per_solve_options.r_tolerance = per_solve_options.r_tolerance;
+  cg_per_solve_options.q_tolerance = per_solve_options.q_tolerance;
+
+  bool is_preconditioner_good = false;
+  switch (options_.preconditioner_type) {
+    case IDENTITY:
+      is_preconditioner_good = true;
+      break;
+    case JACOBI:
+      // We need to strip the constness of the block_diagonal_FtF_inverse
+      // matrix here because the only other way to initialize the struct
+      // cg_solve_options would be to add a constructor to it. We know
+      // that the only method ever called on the preconditioner is the
+      // RightMultiply which is a const method so we don't need to worry
+      // about the object getting modified.
+      cg_per_solve_options.preconditioner =
+          const_cast<BlockSparseMatrix*>(
+              schur_complement_->block_diagonal_FtF_inverse());
+      is_preconditioner_good = true;
+      break;
+    case SCHUR_JACOBI:
+    case CLUSTER_JACOBI:
+    case CLUSTER_TRIDIAGONAL:
+      if (visibility_based_preconditioner_.get() == NULL) {
+        visibility_based_preconditioner_.reset(
+            new VisibilityBasedPreconditioner(*A->block_structure(), options_));
+      }
+      is_preconditioner_good =
+          visibility_based_preconditioner_->Compute(*A, per_solve_options.D);
+      cg_per_solve_options.preconditioner =
+          visibility_based_preconditioner_.get();
+      break;
+    default:
+      LOG(FATAL) << "Unknown Preconditioner Type";
+  }
+
+  LinearSolver::Summary cg_summary;
+  cg_summary.num_iterations = 0;
+  cg_summary.termination_type = FAILURE;
+
+  if (is_preconditioner_good) {
+    cg_summary = cg_solver.Solve(schur_complement_.get(),
+                                 schur_complement_->rhs().data(),
+                                 cg_per_solve_options,
+                                 reduced_linear_system_solution_.data());
+    if (cg_summary.termination_type != FAILURE) {
+      schur_complement_->BackSubstitute(
+          reduced_linear_system_solution_.data(), x);
+    }
+  }
+
+  VLOG(2) << "CG Iterations : " << cg_summary.num_iterations;
+  return cg_summary;
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.h b/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.h
new file mode 100644
index 00000000000..cfeb65e1eec
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.h
@@ -0,0 +1,94 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#ifndef CERES_INTERNAL_ITERATIVE_SCHUR_COMPLEMENT_SOLVER_H_
+#define CERES_INTERNAL_ITERATIVE_SCHUR_COMPLEMENT_SOLVER_H_
+
+#include "ceres/linear_solver.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+
+class BlockSparseMatrix;
+class BlockSparseMatrixBase;
+class ImplicitSchurComplement;
+class VisibilityBasedPreconditioner;
+
+// This class implements an iterative solver for the linear least
+// squares problems that have a bi-partitte sparsity structure common
+// to Structure from Motion problems.
+//
+// The algorithm used by this solver was developed in a series of
+// papers - "Agarwal et al, Bundle Adjustment in the Large, ECCV 2010"
+// and "Wu et al, Multicore Bundle Adjustment, submitted to CVPR
+// 2011" at the Univeristy of Washington.
+//
+// The key idea is that one can run Conjugate Gradients on the Schur
+// Complement system without explicitly forming the Schur Complement
+// in memory. The heavy lifting for this is done by the
+// ImplicitSchurComplement class. Not forming the Schur complement in
+// memory and factoring it results in substantial savings in time and
+// memory. Further, iterative solvers like this open up the
+// possibility of solving the Newton equations in a non-linear solver
+// only approximately and terminating early, thereby saving even more
+// time.
+//
+// For the curious, running CG on the Schur complement is the same as
+// running CG on the Normal Equations with an SSOR preconditioner. For
+// a proof of this fact and others related to this solver please see
+// the section on Domain Decomposition Methods in Saad's book
+// "Iterative Methods for Sparse Linear Systems".
+class IterativeSchurComplementSolver : public BlockSparseMatrixBaseSolver {
+ public:
+  explicit IterativeSchurComplementSolver(
+      const LinearSolver::Options& options);
+
+  virtual ~IterativeSchurComplementSolver();
+
+ private:
+  virtual LinearSolver::Summary SolveImpl(
+      BlockSparseMatrixBase* A,
+      const double* b,
+      const LinearSolver::PerSolveOptions& options,
+      double* x);
+
+  LinearSolver::Options options_;
+  scoped_ptr<internal::ImplicitSchurComplement> schur_complement_;
+  scoped_ptr<VisibilityBasedPreconditioner> visibility_based_preconditioner_;
+  Vector reduced_linear_system_solution_;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_ITERATIVE_SCHUR_COMPLEMENT_SOLVER_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt.cc b/extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt.cc
new file mode 100644
index 00000000000..b40a5162adc
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt.cc
@@ -0,0 +1,574 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Implementation of a simple LM algorithm which uses the step sizing
+// rule of "Methods for Nonlinear Least Squares" by K. Madsen,
+// H.B. Nielsen and O. Tingleff. Available to download from
+//
+// http://www2.imm.dtu.dk/pubdb/views/edoc_download.php/3215/pdf/imm3215.pdf
+//
+// The basic algorithm described in this note is an exact step
+// algorithm that depends on the Newton(LM) step being solved exactly
+// in each iteration. When a suitable iterative solver is available to
+// solve the Newton(LM) step, the algorithm will automatically switch
+// to an inexact step solution method. This trades some slowdown in
+// convergence for significant savings in solve time and memory
+// usage. Our implementation of the Truncated Newton algorithm follows
+// the discussion and recommendataions in "Stephen G. Nash, A Survey
+// of Truncated Newton Methods, Journal of Computational and Applied
+// Mathematics, 124(1-2), 45-59, 2000.
+
+#include "ceres/levenberg_marquardt.h"
+
+#include <algorithm>
+#include <cstdlib>
+#include <cmath>
+#include <cstring>
+#include <string>
+#include <vector>
+
+#include <glog/logging.h>
+#include "Eigen/Core"
+#include "ceres/evaluator.h"
+#include "ceres/file.h"
+#include "ceres/linear_least_squares_problems.h"
+#include "ceres/linear_solver.h"
+#include "ceres/matrix_proto.h"
+#include "ceres/sparse_matrix.h"
+#include "ceres/stringprintf.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+namespace {
+
+// Numbers for clamping the size of the LM diagonal. The size of these
+// numbers is heuristic. We will probably be adjusting them in the
+// future based on more numerical experience. With jacobi scaling
+// enabled, these numbers should be all but redundant.
+const double kMinLevenbergMarquardtDiagonal = 1e-6;
+const double kMaxLevenbergMarquardtDiagonal = 1e32;
+
+// Small constant for various floating point issues.
+const double kEpsilon = 1e-12;
+
+// Number of times the linear solver should be retried in case of
+// numerical failure. The retries are done by exponentially scaling up
+// mu at each retry. This leads to stronger and stronger
+// regularization making the linear least squares problem better
+// conditioned at each retry.
+const int kMaxLinearSolverRetries = 5;
+
+// D = 1/sqrt(diag(J^T * J))
+void EstimateScale(const SparseMatrix& jacobian, double* D) {
+  CHECK_NOTNULL(D);
+  jacobian.SquaredColumnNorm(D);
+  for (int i = 0; i < jacobian.num_cols(); ++i) {
+    D[i] = 1.0 / (kEpsilon + sqrt(D[i]));
+  }
+}
+
+// D = diag(J^T * J)
+void LevenbergMarquardtDiagonal(const SparseMatrix& jacobian,
+                                double* D) {
+  CHECK_NOTNULL(D);
+  jacobian.SquaredColumnNorm(D);
+  for (int i = 0; i < jacobian.num_cols(); ++i) {
+    D[i] = min(max(D[i], kMinLevenbergMarquardtDiagonal),
+               kMaxLevenbergMarquardtDiagonal);
+  }
+}
+
+bool RunCallback(IterationCallback* callback,
+                 const IterationSummary& iteration_summary,
+                 Solver::Summary* summary) {
+  const CallbackReturnType status = (*callback)(iteration_summary);
+  switch (status) {
+    case SOLVER_TERMINATE_SUCCESSFULLY:
+      summary->termination_type = USER_SUCCESS;
+      VLOG(1) << "Terminating on USER_SUCCESS.";
+      return false;
+    case SOLVER_ABORT:
+      summary->termination_type = USER_ABORT;
+      VLOG(1) << "Terminating on USER_ABORT.";
+      return false;
+    case SOLVER_CONTINUE:
+      return true;
+    default:
+      LOG(FATAL) << "Unknown status returned by callback: "
+                 << status;
+	  return NULL;
+  }
+}
+
+}  // namespace
+
+LevenbergMarquardt::~LevenbergMarquardt() {}
+
+void LevenbergMarquardt::Minimize(const Minimizer::Options& options,
+                                  Evaluator* evaluator,
+                                  LinearSolver* linear_solver,
+                                  const double* initial_parameters,
+                                  double* final_parameters,
+                                  Solver::Summary* summary) {
+  time_t start_time = time(NULL);
+  const int num_parameters = evaluator->NumParameters();
+  const int num_effective_parameters = evaluator->NumEffectiveParameters();
+  const int num_residuals = evaluator->NumResiduals();
+
+  summary->termination_type = NO_CONVERGENCE;
+  summary->num_successful_steps = 0;
+  summary->num_unsuccessful_steps = 0;
+
+  // Allocate the various vectors needed by the algorithm.
+  memcpy(final_parameters, initial_parameters,
+         num_parameters * sizeof(*initial_parameters));
+
+  VectorRef x(final_parameters, num_parameters);
+  Vector x_new(num_parameters);
+
+  Vector lm_step(num_effective_parameters);
+  Vector gradient(num_effective_parameters);
+  Vector scaled_gradient(num_effective_parameters);
+  // Jacobi scaling vector
+  Vector scale(num_effective_parameters);
+
+  Vector f_model(num_residuals);
+  Vector f(num_residuals);
+  Vector f_new(num_residuals);
+  Vector D(num_parameters);
+  Vector muD(num_parameters);
+
+  // Ask the Evaluator to create the jacobian matrix. The sparsity
+  // pattern of this matrix is going to remain constant, so we only do
+  // this once and then re-use this matrix for all subsequent Jacobian
+  // computations.
+  scoped_ptr<SparseMatrix> jacobian(evaluator->CreateJacobian());
+
+  double x_norm  = x.norm();
+
+  double cost = 0.0;
+  D.setOnes();
+  f.setZero();
+
+  // Do initial cost and Jacobian evaluation.
+  if (!evaluator->Evaluate(x.data(), &cost, f.data(), jacobian.get())) {
+    LOG(WARNING) << "Failed to compute residuals and Jacobian. "
+                 << "Terminating.";
+    summary->termination_type = NUMERICAL_FAILURE;
+    return;
+  }
+
+  if (options.jacobi_scaling) {
+    EstimateScale(*jacobian, scale.data());
+    jacobian->ScaleColumns(scale.data());
+  } else {
+    scale.setOnes();
+  }
+
+  // This is a poor way to do this computation. Even if fixed_cost is
+  // zero, because we are subtracting two possibly large numbers, we
+  // are depending on exact cancellation to give us a zero here. But
+  // initial_cost and cost have been computed by two different
+  // evaluators. One which runs on the whole problem (in
+  // solver_impl.cc) in single threaded mode and another which runs
+  // here on the reduced problem, so fixed_cost can (and does) contain
+  // some numerical garbage with a relative magnitude of 1e-14.
+  //
+  // The right way to do this, would be to compute the fixed cost on
+  // just the set of residual blocks which are held constant and were
+  // removed from the original problem when the reduced problem was
+  // constructed.
+  summary->fixed_cost = summary->initial_cost - cost;
+
+  double model_cost = f.squaredNorm() / 2.0;
+  double total_cost = summary->fixed_cost + cost;
+
+  scaled_gradient.setZero();
+  jacobian->LeftMultiply(f.data(), scaled_gradient.data());
+  gradient = scaled_gradient.array() / scale.array();
+
+  double gradient_max_norm = gradient.lpNorm<Eigen::Infinity>();
+  // We need the max here to guard againt the gradient being zero.
+  const double gradient_max_norm_0 = max(gradient_max_norm, kEpsilon);
+  double gradient_tolerance = options.gradient_tolerance * gradient_max_norm_0;
+
+  double mu = options.tau;
+  double nu = 2.0;
+  int iteration = 0;
+  double actual_cost_change = 0.0;
+  double step_norm = 0.0;
+  double relative_decrease = 0.0;
+
+  // Insane steps are steps which are not sane, i.e. there is some
+  // numerical kookiness going on with them. There are various reasons
+  // for this kookiness, some easier to diagnose then others. From the
+  // point of view of the non-linear solver, they are steps which
+  // cannot be used. We return with NUMERICAL_FAILURE after
+  // kMaxLinearSolverRetries consecutive insane steps.
+  bool step_is_sane = false;
+  int num_consecutive_insane_steps = 0;
+
+  // Whether the step resulted in a sufficient decrease in the
+  // objective function when compared to the decrease in the value of
+  // the lineariztion.
+  bool step_is_successful = false;
+
+  // Parse the iterations for which to dump the linear problem.
+  vector<int> iterations_to_dump = options.lsqp_iterations_to_dump;
+  sort(iterations_to_dump.begin(), iterations_to_dump.end());
+
+  IterationSummary iteration_summary;
+  iteration_summary.iteration = iteration;
+  iteration_summary.step_is_successful = false;
+  iteration_summary.cost = total_cost;
+  iteration_summary.cost_change = actual_cost_change;
+  iteration_summary.gradient_max_norm = gradient_max_norm;
+  iteration_summary.step_norm = step_norm;
+  iteration_summary.relative_decrease = relative_decrease;
+  iteration_summary.mu = mu;
+  iteration_summary.eta = options.eta;
+  iteration_summary.linear_solver_iterations = 0;
+  iteration_summary.linear_solver_time_sec = 0.0;
+  iteration_summary.iteration_time_sec = (time(NULL) - start_time);
+  if (options.logging_type >= PER_MINIMIZER_ITERATION) {
+    summary->iterations.push_back(iteration_summary);
+  }
+
+  // Check if the starting point is an optimum.
+  VLOG(2) << "Gradient max norm: " << gradient_max_norm
+          << " tolerance: " << gradient_tolerance
+          << " ratio: " << gradient_max_norm / gradient_max_norm_0
+          << " tolerance: " << options.gradient_tolerance;
+  if (gradient_max_norm <= gradient_tolerance) {
+    summary->termination_type = GRADIENT_TOLERANCE;
+    VLOG(1) << "Terminating on GRADIENT_TOLERANCE. "
+            << "Relative gradient max norm: "
+            << gradient_max_norm / gradient_max_norm_0
+            << " <= " << options.gradient_tolerance;
+    return;
+  }
+
+  // Call the various callbacks.
+  for (int i = 0; i < options.callbacks.size(); ++i) {
+    if (!RunCallback(options.callbacks[i], iteration_summary, summary)) {
+      return;
+    }
+  }
+
+  // We only need the LM diagonal if we are actually going to do at
+  // least one iteration of the optimization. So we wait to do it
+  // until now.
+  LevenbergMarquardtDiagonal(*jacobian, D.data());
+
+  while ((iteration < options.max_num_iterations) &&
+         (time(NULL) - start_time) <= options.max_solver_time_sec) {
+    time_t iteration_start_time = time(NULL);
+    step_is_sane = false;
+    step_is_successful = false;
+
+    IterationSummary iteration_summary;
+    // The while loop here is just to provide an easily breakable
+    // control structure. We are guaranteed to always exit this loop
+    // at the end of one iteration or before.
+    while (1) {
+      muD = (mu * D).array().sqrt();
+      LinearSolver::PerSolveOptions solve_options;
+      solve_options.D = muD.data();
+      solve_options.q_tolerance = options.eta;
+      // Disable r_tolerance checking. Since we only care about
+      // termination via the q_tolerance. As Nash and Sofer show,
+      // r_tolerance based termination is essentially useless in
+      // Truncated Newton methods.
+      solve_options.r_tolerance = -1.0;
+
+      const time_t linear_solver_start_time = time(NULL);
+      LinearSolver::Summary linear_solver_summary =
+          linear_solver->Solve(jacobian.get(),
+                               f.data(),
+                               solve_options,
+                               lm_step.data());
+      iteration_summary.linear_solver_time_sec =
+          (time(NULL) - linear_solver_start_time);
+      iteration_summary.linear_solver_iterations =
+          linear_solver_summary.num_iterations;
+
+      if (binary_search(iterations_to_dump.begin(),
+                        iterations_to_dump.end(),
+                        iteration)) {
+        CHECK(DumpLinearLeastSquaresProblem(options.lsqp_dump_directory,
+                                            iteration,
+                                            options.lsqp_dump_format_type,
+                                            jacobian.get(),
+                                            muD.data(),
+                                            f.data(),
+                                            lm_step.data(),
+                                            options.num_eliminate_blocks))
+            << "Tried writing linear least squares problem: " 
+            << options.lsqp_dump_directory
+            << " but failed.";
+      }
+
+      // We ignore the case where the linear solver did not converge,
+      // since the partial solution computed by it still maybe of use,
+      // and there is no reason to ignore it, especially since we
+      // spent so much time computing it.
+      if ((linear_solver_summary.termination_type != TOLERANCE) &&
+          (linear_solver_summary.termination_type != MAX_ITERATIONS)) {
+        VLOG(1) << "Linear solver failure: retrying with a higher mu";
+        break;
+      }
+
+      step_norm = (lm_step.array() * scale.array()).matrix().norm();
+
+      // Check step length based convergence. If the step length is
+      // too small, then we are done.
+      const double step_size_tolerance =  options.parameter_tolerance *
+          (x_norm + options.parameter_tolerance);
+
+      VLOG(2) << "Step size: " << step_norm
+              << " tolerance: " <<  step_size_tolerance
+              << " ratio: " << step_norm / step_size_tolerance
+              << " tolerance: " << options.parameter_tolerance;
+      if (step_norm <= options.parameter_tolerance *
+          (x_norm + options.parameter_tolerance)) {
+        summary->termination_type = PARAMETER_TOLERANCE;
+        VLOG(1) << "Terminating on PARAMETER_TOLERANCE."
+                << "Relative step size: " << step_norm / step_size_tolerance
+            << " <= " << options.parameter_tolerance;
+        return;
+      }
+
+      Vector delta =  -(lm_step.array() * scale.array()).matrix();
+      if (!evaluator->Plus(x.data(), delta.data(), x_new.data())) {
+        LOG(WARNING) << "Failed to compute Plus(x, delta, x_plus_delta). "
+                     << "Terminating.";
+        summary->termination_type = NUMERICAL_FAILURE;
+        return;
+      }
+
+      double cost_new = 0.0;
+      if (!evaluator->Evaluate(x_new.data(), &cost_new, NULL, NULL)) {
+        LOG(WARNING) << "Failed to compute the value of the objective "
+                     << "function. Terminating.";
+        summary->termination_type = NUMERICAL_FAILURE;
+        return;
+      }
+
+      f_model.setZero();
+      jacobian->RightMultiply(lm_step.data(), f_model.data());
+      const double model_cost_new =
+          (f.segment(0, num_residuals) - f_model).squaredNorm() / 2;
+
+      actual_cost_change = cost - cost_new;
+      double model_cost_change = model_cost - model_cost_new;
+
+      VLOG(2) << "[Model cost] current: " << model_cost
+              << " new : " << model_cost_new
+              << " change: " << model_cost_change;
+
+      VLOG(2) << "[Nonlinear cost] current: " << cost
+              << " new : " << cost_new
+              << " change: " << actual_cost_change
+              << " relative change: " << fabs(actual_cost_change) / cost
+              << " tolerance: " << options.function_tolerance;
+
+      // In exact arithmetic model_cost_change should never be
+      // negative. But due to numerical precision issues, we may end up
+      // with a small negative number. model_cost_change which are
+      // negative and large in absolute value are indicative of a
+      // numerical failure in the solver.
+      if (model_cost_change < -kEpsilon) {
+        VLOG(1) << "Model cost change is negative.\n"
+                << "Current : " << model_cost
+                << " new : " << model_cost_new
+                << " change: " << model_cost_change << "\n";
+        break;
+      }
+
+      // If we have reached this far, then we are willing to trust the
+      // numerical quality of the step.
+      step_is_sane = true;
+      num_consecutive_insane_steps = 0;
+
+      // Check function value based convergence.
+      if (fabs(actual_cost_change) < options.function_tolerance * cost) {
+        VLOG(1) << "Termination on FUNCTION_TOLERANCE."
+                << " Relative cost change: " << fabs(actual_cost_change) / cost
+                << " tolerance: " << options.function_tolerance;
+        summary->termination_type = FUNCTION_TOLERANCE;
+        return;
+      }
+
+      // Clamp model_cost_change at kEpsilon from below.
+      if (model_cost_change < kEpsilon) {
+        VLOG(1) << "Clamping model cost change " << model_cost_change
+                << " to " << kEpsilon;
+        model_cost_change = kEpsilon;
+      }
+
+      relative_decrease = actual_cost_change / model_cost_change;
+      VLOG(2) << "actual_cost_change / model_cost_change = "
+              << relative_decrease;
+
+      if (relative_decrease < options.min_relative_decrease) {
+        VLOG(2) << "Unsuccessful step.";
+        break;
+      }
+
+      VLOG(2) << "Successful step.";
+
+      ++summary->num_successful_steps;
+      x = x_new;
+      x_norm = x.norm();
+
+      if (!evaluator->Evaluate(x.data(), &cost, f.data(), jacobian.get())) {
+        LOG(WARNING) << "Failed to compute residuals and jacobian. "
+                     << "Terminating.";
+        summary->termination_type = NUMERICAL_FAILURE;
+        return;
+      }
+
+      if (options.jacobi_scaling) {
+        jacobian->ScaleColumns(scale.data());
+      }
+
+      model_cost = f.squaredNorm() / 2.0;
+      LevenbergMarquardtDiagonal(*jacobian, D.data());
+      scaled_gradient.setZero();
+      jacobian->LeftMultiply(f.data(), scaled_gradient.data());
+      gradient = scaled_gradient.array() / scale.array();
+      gradient_max_norm = gradient.lpNorm<Eigen::Infinity>();
+
+      // Check gradient based convergence.
+      VLOG(2) << "Gradient max norm: " << gradient_max_norm
+              << " tolerance: " << gradient_tolerance
+              << " ratio: " << gradient_max_norm / gradient_max_norm_0
+              << " tolerance: " << options.gradient_tolerance;
+      if (gradient_max_norm <= gradient_tolerance) {
+        summary->termination_type = GRADIENT_TOLERANCE;
+        VLOG(1) << "Terminating on GRADIENT_TOLERANCE. "
+                << "Relative gradient max norm: "
+                << gradient_max_norm / gradient_max_norm_0
+                << " <= " << options.gradient_tolerance
+                << " (tolerance).";
+        return;
+      }
+
+      mu = mu * max(1.0 / 3.0, 1 - pow(2 * relative_decrease - 1, 3));
+      nu = 2.0;
+      step_is_successful = true;
+      break;
+    }
+
+    if (!step_is_sane) {
+      ++num_consecutive_insane_steps;
+    }
+
+    if (num_consecutive_insane_steps == kMaxLinearSolverRetries) {
+      summary->termination_type = NUMERICAL_FAILURE;
+      VLOG(1) << "Too many consecutive retries; ending with numerical fail.";
+
+      if (!options.crash_and_dump_lsqp_on_failure) {
+        return;
+      }
+
+      // Dump debugging information to disk.
+      CHECK(options.lsqp_dump_format_type == TEXTFILE ||
+            options.lsqp_dump_format_type == PROTOBUF)
+          << "Dumping the linear least squares problem on crash "
+          << "requires Solver::Options::lsqp_dump_format_type to be "
+          << "PROTOBUF or TEXTFILE.";
+
+      if (DumpLinearLeastSquaresProblem(options.lsqp_dump_directory,
+                                        iteration,
+                                        options.lsqp_dump_format_type,
+                                        jacobian.get(),
+                                        muD.data(),
+                                        f.data(),
+                                        lm_step.data(),
+                                        options.num_eliminate_blocks)) {
+        LOG(FATAL) << "Linear least squares problem saved to: " 
+                   << options.lsqp_dump_directory
+                   << ". Please provide this to the Ceres developers for "
+                   << " debugging along with the v=2 log.";
+      } else {
+        LOG(FATAL) << "Tried writing linear least squares problem: " 
+                   << options.lsqp_dump_directory
+                   << " but failed.";
+      }
+    }
+
+    if (!step_is_successful) {
+      // Either the step did not lead to a decrease in cost or there
+      // was numerical failure. In either case we will scale mu up and
+      // retry. If it was a numerical failure, we hope that the
+      // stronger regularization will make the linear system better
+      // conditioned. If it was numerically sane, but there was no
+      // decrease in cost, then increasing mu reduces the size of the
+      // trust region and we look for a decrease closer to the
+      // linearization point.
+      ++summary->num_unsuccessful_steps;
+      mu = mu * nu;
+      nu = 2 * nu;
+    }
+
+    ++iteration;
+
+    total_cost = summary->fixed_cost + cost;
+
+    iteration_summary.iteration = iteration;
+    iteration_summary.step_is_successful = step_is_successful;
+    iteration_summary.cost = total_cost;
+    iteration_summary.cost_change = actual_cost_change;
+    iteration_summary.gradient_max_norm = gradient_max_norm;
+    iteration_summary.step_norm = step_norm;
+    iteration_summary.relative_decrease = relative_decrease;
+    iteration_summary.mu = mu;
+    iteration_summary.eta = options.eta;
+    iteration_summary.iteration_time_sec = (time(NULL) - iteration_start_time);
+
+    if (options.logging_type >= PER_MINIMIZER_ITERATION) {
+      summary->iterations.push_back(iteration_summary);
+    }
+
+    // Call the various callbacks.
+    for (int i = 0; i < options.callbacks.size(); ++i) {
+      if (!RunCallback(options.callbacks[i], iteration_summary, summary)) {
+        return;
+      }
+    }
+  }
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt.h b/extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt.h
new file mode 100644
index 00000000000..d00bb9095be
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt.h
@@ -0,0 +1,65 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Implmentation of Levenberg Marquardt algorithm based on "Methods for
+// Nonlinear Least Squares" by K. Madsen, H.B. Nielsen and
+// O. Tingleff. Available to download from
+//
+// http://www2.imm.dtu.dk/pubdb/views/edoc_download.php/3215/pdf/imm3215.pdf
+//
+
+#ifndef CERES_INTERNAL_LEVENBERG_MARQUARDT_H_
+#define CERES_INTERNAL_LEVENBERG_MARQUARDT_H_
+
+#include "ceres/minimizer.h"
+#include "ceres/solver.h"
+
+namespace ceres {
+namespace internal {
+
+class Evaluator;
+class LinearSolver;
+
+class LevenbergMarquardt : public Minimizer {
+ public:
+  virtual ~LevenbergMarquardt();
+
+  virtual void Minimize(const Minimizer::Options& options,
+                        Evaluator* evaluator,
+                        LinearSolver* linear_solver,
+                        const double* initial_parameters,
+                        double* final_parameters,
+                        Solver::Summary* summary);
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_LEVENBERG_MARQUARDT_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.cc b/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.cc
new file mode 100644
index 00000000000..cca9f442fe7
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.cc
@@ -0,0 +1,744 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#include "ceres/linear_least_squares_problems.h"
+
+#include <cstdio>
+#include <string>
+#include <vector>
+#include <glog/logging.h>
+#include "ceres/block_sparse_matrix.h"
+#include "ceres/block_structure.h"
+#include "ceres/casts.h"
+#include "ceres/compressed_row_sparse_matrix.h"
+#include "ceres/file.h"
+#include "ceres/matrix_proto.h"
+#include "ceres/triplet_sparse_matrix.h"
+#include "ceres/stringprintf.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+
+LinearLeastSquaresProblem* CreateLinearLeastSquaresProblemFromId(int id) {
+  switch (id) {
+    case 0:
+      return LinearLeastSquaresProblem0();
+    case 1:
+      return LinearLeastSquaresProblem1();
+    case 2:
+      return LinearLeastSquaresProblem2();
+    case 3:
+      return LinearLeastSquaresProblem3();
+    default:
+      LOG(FATAL) << "Unknown problem id requested " << id;
+  }
+  return NULL;
+}
+
+#ifndef CERES_DONT_HAVE_PROTOCOL_BUFFERS
+LinearLeastSquaresProblem* CreateLinearLeastSquaresProblemFromFile(
+    const string& filename) {
+  LinearLeastSquaresProblemProto problem_proto;
+  {
+    string serialized_proto;
+    ReadFileToStringOrDie(filename, &serialized_proto);
+    CHECK(problem_proto.ParseFromString(serialized_proto));
+  }
+
+  LinearLeastSquaresProblem* problem = new LinearLeastSquaresProblem;
+  const SparseMatrixProto& A = problem_proto.a();
+
+  if (A.has_block_matrix()) {
+    problem->A.reset(new BlockSparseMatrix(A));
+  } else if (A.has_triplet_matrix()) {
+    problem->A.reset(new TripletSparseMatrix(A));
+  } else {
+    problem->A.reset(new CompressedRowSparseMatrix(A));
+  }
+
+  if (problem_proto.b_size() > 0) {
+    problem->b.reset(new double[problem_proto.b_size()]);
+    for (int i = 0; i < problem_proto.b_size(); ++i) {
+      problem->b[i] = problem_proto.b(i);
+    }
+  }
+
+  if (problem_proto.d_size() > 0) {
+    problem->D.reset(new double[problem_proto.d_size()]);
+    for (int i = 0; i < problem_proto.d_size(); ++i) {
+      problem->D[i] = problem_proto.d(i);
+    }
+  }
+
+  if (problem_proto.d_size() > 0) {
+    if (problem_proto.x_size() > 0) {
+      problem->x_D.reset(new double[problem_proto.x_size()]);
+      for (int i = 0; i < problem_proto.x_size(); ++i) {
+        problem->x_D[i] = problem_proto.x(i);
+      }
+    }
+  } else {
+    if (problem_proto.x_size() > 0) {
+      problem->x.reset(new double[problem_proto.x_size()]);
+      for (int i = 0; i < problem_proto.x_size(); ++i) {
+        problem->x[i] = problem_proto.x(i);
+      }
+    }
+  }
+
+  problem->num_eliminate_blocks = 0;
+  if (problem_proto.has_num_eliminate_blocks()) {
+    problem->num_eliminate_blocks = problem_proto.num_eliminate_blocks();
+  }
+
+  return problem;
+}
+#else
+LinearLeastSquaresProblem* CreateLinearLeastSquaresProblemFromFile(
+    const string& filename) {
+  LOG(FATAL)
+      << "Loading a least squares problem from disk requires "
+      << "Ceres to be built with Protocol Buffers support.";
+  return NULL;
+}
+#endif  // CERES_DONT_HAVE_PROTOCOL_BUFFERS
+
+/*
+A = [1   2]
+    [3   4]
+    [6 -10]
+
+b = [  8
+      18
+     -18]
+
+x = [2
+     3]
+
+D = [1
+     2]
+
+x_D = [1.78448275;
+       2.82327586;]
+ */
+LinearLeastSquaresProblem* LinearLeastSquaresProblem0() {
+  LinearLeastSquaresProblem* problem = new LinearLeastSquaresProblem;
+
+  TripletSparseMatrix* A = new TripletSparseMatrix(3, 2, 6);
+  problem->b.reset(new double[3]);
+  problem->D.reset(new double[2]);
+
+  problem->x.reset(new double[2]);
+  problem->x_D.reset(new double[2]);
+
+  int* Ai = A->mutable_rows();
+  int* Aj = A->mutable_cols();
+  double* Ax = A->mutable_values();
+
+  int counter = 0;
+  for (int i = 0; i < 3; ++i) {
+    for (int j = 0; j< 2; ++j) {
+      Ai[counter]=i;
+      Aj[counter]=j;
+      ++counter;
+    }
+  };
+
+  Ax[0] = 1.;
+  Ax[1] = 2.;
+  Ax[2] = 3.;
+  Ax[3] = 4.;
+  Ax[4] = 6;
+  Ax[5] = -10;
+  A->set_num_nonzeros(6);
+  problem->A.reset(A);
+
+  problem->b[0] = 8;
+  problem->b[1] = 18;
+  problem->b[2] = -18;
+
+  problem->x[0] = 2.0;
+  problem->x[1] = 3.0;
+
+  problem->D[0] = 1;
+  problem->D[1] = 2;
+
+  problem->x_D[0] = 1.78448275;
+  problem->x_D[1] = 2.82327586;
+  return problem;
+}
+
+
+/*
+      A = [1 0  | 2 0 0
+           3 0  | 0 4 0
+           0 5  | 0 0 6
+           0 7  | 8 0 0
+           0 9  | 1 0 0
+           0 0  | 1 1 1]
+
+      b = [0
+           1
+           2
+           3
+           4
+           5]
+
+      c = A'* b = [ 3
+                   67
+                   33
+                    9
+                   17]
+
+      A'A = [10    0    2   12   0
+              0  155   65    0  30
+              2   65   70    1   1
+             12    0    1   17   1
+              0   30    1    1  37]
+
+      S = [ 42.3419  -1.4000  -11.5806
+            -1.4000   2.6000    1.0000
+            11.5806   1.0000   31.1935]
+
+      r = [ 4.3032
+            5.4000
+            5.0323]
+
+      S\r = [ 0.2102
+              2.1367
+              0.1388]
+
+      A\b = [-2.3061
+              0.3172
+              0.2102
+              2.1367
+              0.1388]
+*/
+// The following two functions create a TripletSparseMatrix and a
+// BlockSparseMatrix version of this problem.
+
+// TripletSparseMatrix version.
+LinearLeastSquaresProblem* LinearLeastSquaresProblem1() {
+  int num_rows = 6;
+  int num_cols = 5;
+
+  LinearLeastSquaresProblem* problem = new LinearLeastSquaresProblem;
+  TripletSparseMatrix* A = new TripletSparseMatrix(num_rows,
+                                                   num_cols,
+                                                   num_rows * num_cols);
+  problem->b.reset(new double[num_rows]);
+  problem->D.reset(new double[num_cols]);
+  problem->num_eliminate_blocks = 2;
+
+  int* rows = A->mutable_rows();
+  int* cols = A->mutable_cols();
+  double* values = A->mutable_values();
+
+  int nnz = 0;
+
+  // Row 1
+  {
+    rows[nnz] = 0;
+    cols[nnz] = 0;
+    values[nnz++] = 1;
+
+    rows[nnz] = 0;
+    cols[nnz] = 2;
+    values[nnz++] = 2;
+  }
+
+  // Row 2
+  {
+    rows[nnz] = 1;
+    cols[nnz] = 0;
+    values[nnz++] = 3;
+
+    rows[nnz] = 1;
+    cols[nnz] = 3;
+    values[nnz++] = 4;
+  }
+
+  // Row 3
+  {
+    rows[nnz] = 2;
+    cols[nnz] = 1;
+    values[nnz++] = 5;
+
+    rows[nnz] = 2;
+    cols[nnz] = 4;
+    values[nnz++] = 6;
+  }
+
+  // Row 4
+  {
+    rows[nnz] = 3;
+    cols[nnz] = 1;
+    values[nnz++] = 7;
+
+    rows[nnz] = 3;
+    cols[nnz] = 2;
+    values[nnz++] = 8;
+  }
+
+  // Row 5
+  {
+    rows[nnz] = 4;
+    cols[nnz] = 1;
+    values[nnz++] = 9;
+
+    rows[nnz] = 4;
+    cols[nnz] = 2;
+    values[nnz++] = 1;
+  }
+
+  // Row 6
+  {
+    rows[nnz] = 5;
+    cols[nnz] = 2;
+    values[nnz++] = 1;
+
+    rows[nnz] = 5;
+    cols[nnz] = 3;
+    values[nnz++] = 1;
+
+    rows[nnz] = 5;
+    cols[nnz] = 4;
+    values[nnz++] = 1;
+  }
+
+  A->set_num_nonzeros(nnz);
+  CHECK(A->IsValid());
+
+  problem->A.reset(A);
+
+  for (int i = 0; i < num_cols; ++i) {
+    problem->D.get()[i] = 1;
+  }
+
+  for (int i = 0; i < num_rows; ++i) {
+    problem->b.get()[i] = i;
+  }
+
+  return problem;
+}
+
+// BlockSparseMatrix version
+LinearLeastSquaresProblem* LinearLeastSquaresProblem2() {
+  int num_rows = 6;
+  int num_cols = 5;
+
+  LinearLeastSquaresProblem* problem = new LinearLeastSquaresProblem;
+
+  problem->b.reset(new double[num_rows]);
+  problem->D.reset(new double[num_cols]);
+  problem->num_eliminate_blocks = 2;
+
+  CompressedRowBlockStructure* bs = new CompressedRowBlockStructure;
+  scoped_array<double> values(new double[num_rows * num_cols]);
+
+  for (int c = 0; c < num_cols; ++c) {
+    bs->cols.push_back(Block());
+    bs->cols.back().size = 1;
+    bs->cols.back().position = c;
+  }
+
+  int nnz = 0;
+
+  // Row 1
+  {
+    values[nnz++] = 1;
+    values[nnz++] = 2;
+
+    bs->rows.push_back(CompressedRow());
+    CompressedRow& row = bs->rows.back();
+    row.block.size = 1;
+    row.block.position = 0;
+    row.cells.push_back(Cell(0, 0));
+    row.cells.push_back(Cell(2, 1));
+  }
+
+  // Row 2
+  {
+    values[nnz++] = 3;
+    values[nnz++] = 4;
+
+    bs->rows.push_back(CompressedRow());
+    CompressedRow& row = bs->rows.back();
+    row.block.size = 1;
+    row.block.position = 1;
+    row.cells.push_back(Cell(0, 2));
+    row.cells.push_back(Cell(3, 3));
+  }
+
+  // Row 3
+  {
+    values[nnz++] = 5;
+    values[nnz++] = 6;
+
+    bs->rows.push_back(CompressedRow());
+    CompressedRow& row = bs->rows.back();
+    row.block.size = 1;
+    row.block.position = 2;
+    row.cells.push_back(Cell(1, 4));
+    row.cells.push_back(Cell(4, 5));
+  }
+
+  // Row 4
+  {
+    values[nnz++] = 7;
+    values[nnz++] = 8;
+
+    bs->rows.push_back(CompressedRow());
+    CompressedRow& row = bs->rows.back();
+    row.block.size = 1;
+    row.block.position = 3;
+    row.cells.push_back(Cell(1, 6));
+    row.cells.push_back(Cell(2, 7));
+  }
+
+  // Row 5
+  {
+    values[nnz++] = 9;
+    values[nnz++] = 1;
+
+    bs->rows.push_back(CompressedRow());
+    CompressedRow& row = bs->rows.back();
+    row.block.size = 1;
+    row.block.position = 4;
+    row.cells.push_back(Cell(1, 8));
+    row.cells.push_back(Cell(2, 9));
+  }
+
+  // Row 6
+  {
+    values[nnz++] = 1;
+    values[nnz++] = 1;
+    values[nnz++] = 1;
+
+    bs->rows.push_back(CompressedRow());
+    CompressedRow& row = bs->rows.back();
+    row.block.size = 1;
+    row.block.position = 5;
+    row.cells.push_back(Cell(2, 10));
+    row.cells.push_back(Cell(3, 11));
+    row.cells.push_back(Cell(4, 12));
+  }
+
+  BlockSparseMatrix* A = new BlockSparseMatrix(bs);
+  memcpy(A->mutable_values(), values.get(), nnz * sizeof(*A->values()));
+
+  for (int i = 0; i < num_cols; ++i) {
+    problem->D.get()[i] = 1;
+  }
+
+  for (int i = 0; i < num_rows; ++i) {
+    problem->b.get()[i] = i;
+  }
+
+  problem->A.reset(A);
+
+  return problem;
+}
+
+
+/*
+      A = [1 0
+           3 0
+           0 5
+           0 7
+           0 9
+           0 0]
+
+      b = [0
+           1
+           2
+           3
+           4
+           5]
+*/
+// BlockSparseMatrix version
+LinearLeastSquaresProblem* LinearLeastSquaresProblem3() {
+  int num_rows = 5;
+  int num_cols = 2;
+
+  LinearLeastSquaresProblem* problem = new LinearLeastSquaresProblem;
+
+  problem->b.reset(new double[num_rows]);
+  problem->D.reset(new double[num_cols]);
+  problem->num_eliminate_blocks = 2;
+
+  CompressedRowBlockStructure* bs = new CompressedRowBlockStructure;
+  scoped_array<double> values(new double[num_rows * num_cols]);
+
+  for (int c = 0; c < num_cols; ++c) {
+    bs->cols.push_back(Block());
+    bs->cols.back().size = 1;
+    bs->cols.back().position = c;
+  }
+
+  int nnz = 0;
+
+  // Row 1
+  {
+    values[nnz++] = 1;
+    bs->rows.push_back(CompressedRow());
+    CompressedRow& row = bs->rows.back();
+    row.block.size = 1;
+    row.block.position = 0;
+    row.cells.push_back(Cell(0, 0));
+  }
+
+  // Row 2
+  {
+    values[nnz++] = 3;
+    bs->rows.push_back(CompressedRow());
+    CompressedRow& row = bs->rows.back();
+    row.block.size = 1;
+    row.block.position = 1;
+    row.cells.push_back(Cell(0, 1));
+  }
+
+  // Row 3
+  {
+    values[nnz++] = 5;
+    bs->rows.push_back(CompressedRow());
+    CompressedRow& row = bs->rows.back();
+    row.block.size = 1;
+    row.block.position = 2;
+    row.cells.push_back(Cell(1, 2));
+  }
+
+  // Row 4
+  {
+    values[nnz++] = 7;
+    bs->rows.push_back(CompressedRow());
+    CompressedRow& row = bs->rows.back();
+    row.block.size = 1;
+    row.block.position = 3;
+    row.cells.push_back(Cell(1, 3));
+  }
+
+  // Row 5
+  {
+    values[nnz++] = 9;
+    bs->rows.push_back(CompressedRow());
+    CompressedRow& row = bs->rows.back();
+    row.block.size = 1;
+    row.block.position = 4;
+    row.cells.push_back(Cell(1, 4));
+  }
+
+  BlockSparseMatrix* A = new BlockSparseMatrix(bs);
+  memcpy(A->mutable_values(), values.get(), nnz * sizeof(*A->values()));
+
+  for (int i = 0; i < num_cols; ++i) {
+    problem->D.get()[i] = 1;
+  }
+
+  for (int i = 0; i < num_rows; ++i) {
+    problem->b.get()[i] = i;
+  }
+
+  problem->A.reset(A);
+
+  return problem;
+}
+
+bool DumpLinearLeastSquaresProblemToConsole(const string& directory,
+                                            int iteration,
+                                            const SparseMatrix* A,
+                                            const double* D,
+                                            const double* b,
+                                            const double* x,
+                                            int num_eliminate_blocks) {
+  CHECK_NOTNULL(A);
+  Matrix AA;
+  A->ToDenseMatrix(&AA);
+  LOG(INFO) << "A^T: \n" << AA.transpose();
+
+  if (D != NULL) {
+    LOG(INFO) << "A's appended diagonal:\n"
+              << ConstVectorRef(D, A->num_cols());
+  }
+
+  if (b != NULL) {
+    LOG(INFO) << "b: \n" << ConstVectorRef(b, A->num_rows());
+  }
+
+  if (x != NULL) {
+    LOG(INFO) << "x: \n" << ConstVectorRef(x, A->num_cols());
+  }
+  return true;
+};
+
+#ifndef CERES_DONT_HAVE_PROTOCOL_BUFFERS
+bool DumpLinearLeastSquaresProblemToProtocolBuffer(const string& directory,
+                                                   int iteration,
+                                                   const SparseMatrix* A,
+                                                   const double* D,
+                                                   const double* b,
+                                                   const double* x,
+                                                   int num_eliminate_blocks) {
+  CHECK_NOTNULL(A);
+  LinearLeastSquaresProblemProto lsqp;
+  A->ToProto(lsqp.mutable_a());
+
+  if (D != NULL) {
+    for (int i = 0; i < A->num_cols(); ++i) {
+      lsqp.add_d(D[i]);
+    }
+  }
+
+  if (b != NULL) {
+    for (int i = 0; i < A->num_rows(); ++i) {
+      lsqp.add_b(b[i]);
+    }
+  }
+
+  if (x != NULL) {
+    for (int i = 0; i < A->num_cols(); ++i) {
+      lsqp.add_x(x[i]);
+    }
+  }
+
+  lsqp.set_num_eliminate_blocks(num_eliminate_blocks);
+  string format_string = JoinPath(directory,
+                                  "lm_iteration_%03d.lsqp");
+  string filename =
+      StringPrintf(format_string.c_str(),  iteration);
+  LOG(INFO) << "Dumping least squares problem for iteration " << iteration
+            << " to disk. File: " << filename;
+  WriteStringToFileOrDie(lsqp.SerializeAsString(), filename);
+  return true;
+}
+#else
+bool DumpLinearLeastSquaresProblemToProtocolBuffer(const string& directory,
+                                                   int iteration,
+                                                   const SparseMatrix* A,
+                                                   const double* D,
+                                                   const double* b,
+                                                   const double* x,
+                                                   int num_eliminate_blocks) {
+  LOG(ERROR) << "Dumping least squares problems is only "
+             << "supported when Ceres is compiled with "
+             << "protocol buffer support.";
+  return false;
+}
+#endif
+
+void WriteArrayToFileOrDie(const string& filename,
+                           const double* x,
+                           const int size) {
+  CHECK_NOTNULL(x);
+  VLOG(2) << "Writing array to: " << filename;
+  FILE* fptr = fopen(filename.c_str(), "w");
+  CHECK_NOTNULL(fptr);
+  for (int i = 0; i < size; ++i) {
+    fprintf(fptr, "%17f\n", x[i]);
+  }
+  fclose(fptr);
+}
+
+bool DumpLinearLeastSquaresProblemToTextFile(const string& directory,
+                                             int iteration,
+                                             const SparseMatrix* A,
+                                             const double* D,
+                                             const double* b,
+                                             const double* x,
+                                             int num_eliminate_blocks) {
+  CHECK_NOTNULL(A);
+  string format_string = JoinPath(directory,
+                                  "lm_iteration_%03d");
+  string filename_prefix =
+      StringPrintf(format_string.c_str(), iteration);
+
+  {
+    string filename = filename_prefix + "_A.txt";
+    LOG(INFO) << "writing to: " << filename;
+    FILE* fptr = fopen(filename.c_str(), "w");
+    CHECK_NOTNULL(fptr);
+    A->ToTextFile(fptr);
+    fclose(fptr);
+  }
+
+  if (D != NULL) {
+    string filename = filename_prefix + "_D.txt";
+    WriteArrayToFileOrDie(filename, D, A->num_cols());
+  }
+
+  if (b != NULL) {
+    string filename = filename_prefix + "_b.txt";
+    WriteArrayToFileOrDie(filename, b, A->num_rows());
+  }
+
+  if (x != NULL) {
+    string filename = filename_prefix + "_x.txt";
+    WriteArrayToFileOrDie(filename, x, A->num_cols());
+  }
+
+  return true;
+}
+
+bool DumpLinearLeastSquaresProblem(const string& directory,
+                              	   int iteration,
+                                   DumpFormatType dump_format_type,
+                                   const SparseMatrix* A,
+                                   const double* D,
+                                   const double* b,
+                                   const double* x,
+                                   int num_eliminate_blocks) {
+  switch (dump_format_type) {
+    case (CONSOLE):
+      return DumpLinearLeastSquaresProblemToConsole(directory,
+                                                    iteration,
+                                                    A, D, b, x,
+                                                    num_eliminate_blocks);
+    case (PROTOBUF):
+      return DumpLinearLeastSquaresProblemToProtocolBuffer(
+          directory,
+          iteration,
+          A, D, b, x,
+          num_eliminate_blocks);
+    case (TEXTFILE):
+      return DumpLinearLeastSquaresProblemToTextFile(directory,
+                                                     iteration,
+                                                     A, D, b, x,
+                                                     num_eliminate_blocks);
+    default:
+      LOG(FATAL) << "Unknown DumpFormatType " << dump_format_type;
+  };
+
+  return true;
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.h b/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.h
new file mode 100644
index 00000000000..553cc0d3db3
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.h
@@ -0,0 +1,87 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#ifndef CERES_INTERNAL_LINEAR_LEAST_SQUARES_PROBLEMS_H_
+#define CERES_INTERNAL_LINEAR_LEAST_SQUARES_PROBLEMS_H_
+
+#include <string>
+#include <vector>
+#include "ceres/sparse_matrix.h"
+#include "ceres/internal/port.h"
+#include "ceres/internal/scoped_ptr.h"
+
+namespace ceres {
+namespace internal {
+
+// Structure defining a linear least squares problem and if possible
+// ground truth solutions. To be used by various LinearSolver tests.
+struct LinearLeastSquaresProblem {
+  LinearLeastSquaresProblem()
+      : A(NULL), b(NULL), D(NULL), num_eliminate_blocks(0),
+        x(NULL), x_D(NULL) {
+  }
+
+  scoped_ptr<SparseMatrix> A;
+  scoped_array<double> b;
+  scoped_array<double> D;
+  // If using the schur eliminator then how many of the variable
+  // blocks are e_type blocks.
+  int num_eliminate_blocks;
+
+  // Solution to min_x |Ax - b|^2
+  scoped_array<double> x;
+  // Solution to min_x |Ax - b|^2 + |Dx|^2
+  scoped_array<double> x_D;
+};
+
+// Factories for linear least squares problem.
+LinearLeastSquaresProblem* CreateLinearLeastSquaresProblemFromId(int id);
+LinearLeastSquaresProblem* CreateLinearLeastSquaresProblemFromFile(
+    const string& filename);
+
+LinearLeastSquaresProblem* LinearLeastSquaresProblem0();
+LinearLeastSquaresProblem* LinearLeastSquaresProblem1();
+LinearLeastSquaresProblem* LinearLeastSquaresProblem2();
+LinearLeastSquaresProblem* LinearLeastSquaresProblem3();
+
+// Write the linear least squares problem to disk. The exact format
+// depends on dump_format_type.
+bool DumpLinearLeastSquaresProblem(const string& directory,
+                              	   int iteration,
+                                   DumpFormatType dump_format_type,
+                                   const SparseMatrix* A,
+                                   const double* D,
+                                   const double* b,
+                                   const double* x,
+                                   int num_eliminate_blocks);
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_LINEAR_LEAST_SQUARES_PROBLEMS_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/linear_operator.cc b/extern/libmv/third_party/ceres/internal/ceres/linear_operator.cc
new file mode 100644
index 00000000000..4b59fa13009
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/linear_operator.cc
@@ -0,0 +1,40 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#include "ceres/linear_operator.h"
+
+namespace ceres {
+namespace internal {
+
+LinearOperator::~LinearOperator() {
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/linear_operator.h b/extern/libmv/third_party/ceres/internal/ceres/linear_operator.h
new file mode 100644
index 00000000000..d5c15cee6a9
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/linear_operator.h
@@ -0,0 +1,59 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Base classes for access to an linear operator.
+
+#ifndef CERES_INTERNAL_LINEAR_OPERATOR_H_
+#define CERES_INTERNAL_LINEAR_OPERATOR_H_
+
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+
+// This is an abstract base class for linear operators. It supports
+// access to size information and left and right multiply operators.
+class LinearOperator {
+ public:
+  virtual ~LinearOperator();
+
+  // y = y + Ax;
+  virtual void RightMultiply(const double* x, double* y) const = 0;
+  // y = y + A'x;
+  virtual void LeftMultiply(const double* x, double* y) const = 0;
+
+  virtual int num_rows() const = 0;
+  virtual int num_cols() const = 0;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_LINEAR_OPERATOR_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/linear_solver.cc b/extern/libmv/third_party/ceres/internal/ceres/linear_solver.cc
new file mode 100644
index 00000000000..b2e3941eea1
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/linear_solver.cc
@@ -0,0 +1,87 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#include "ceres/linear_solver.h"
+
+#include <glog/logging.h>
+#include "ceres/cgnr_solver.h"
+#include "ceres/dense_qr_solver.h"
+#include "ceres/iterative_schur_complement_solver.h"
+#include "ceres/schur_complement_solver.h"
+#include "ceres/sparse_normal_cholesky_solver.h"
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+
+LinearSolver::~LinearSolver() {
+}
+
+LinearSolver* LinearSolver::Create(const LinearSolver::Options& options) {
+  switch (options.type) {
+    case CGNR:
+      return new CgnrSolver(options);
+
+    case SPARSE_NORMAL_CHOLESKY:
+#ifndef CERES_NO_SUITESPARSE
+      return new SparseNormalCholeskySolver(options);
+#else
+      LOG(WARNING) << "SPARSE_NORMAL_CHOLESKY is not available. Please "
+                   << "build Ceres with SuiteSparse. Returning NULL.";
+      return NULL;
+#endif  // CERES_NO_SUITESPARSE
+
+    case SPARSE_SCHUR:
+#ifndef CERES_NO_SUITESPARSE
+      return new SparseSchurComplementSolver(options);
+#else
+      LOG(WARNING) << "SPARSE_SCHUR is not available. Please "
+                   << "build Ceres with SuiteSparse. Returning NULL.";
+      return NULL;
+#endif  // CERES_NO_SUITESPARSE
+
+    case DENSE_SCHUR:
+      return new DenseSchurComplementSolver(options);
+
+    case ITERATIVE_SCHUR:
+      return new IterativeSchurComplementSolver(options);
+
+    case DENSE_QR:
+      return new DenseQRSolver(options);
+
+    default:
+      LOG(FATAL) << "Unknown linear solver type :"
+                 << options.type;
+	  return NULL;  // MSVC doesn't understand that LOG(FATAL) never returns.
+  }
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/linear_solver.h b/extern/libmv/third_party/ceres/internal/ceres/linear_solver.h
new file mode 100644
index 00000000000..5860ecc8a77
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/linear_solver.h
@@ -0,0 +1,291 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Abstract interface for objects solving linear systems of various
+// kinds.
+
+#ifndef CERES_INTERNAL_LINEAR_SOLVER_H_
+#define CERES_INTERNAL_LINEAR_SOLVER_H_
+
+#include <cstddef>
+
+#include <glog/logging.h>
+#include "ceres/block_sparse_matrix.h"
+#include "ceres/casts.h"
+#include "ceres/compressed_row_sparse_matrix.h"
+#include "ceres/dense_sparse_matrix.h"
+#include "ceres/triplet_sparse_matrix.h"
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+
+class LinearOperator;
+
+// Abstract base class for objects that implement algorithms for
+// solving linear systems
+//
+//   Ax = b
+//
+// It is expected that a single instance of a LinearSolver object
+// maybe used multiple times for solving different linear
+// systems. This allows them to cache and reuse information across
+// solves if for example the sparsity of the linear system remains
+// constant.
+//
+// Subclasses of LinearSolver use two structs to configure themselves.
+// The Options struct configures the LinearSolver object for its
+// lifetime. The PerSolveOptions struct is used to specify options for
+// a particular Solve call.
+class LinearSolver {
+ public:
+  struct Options {
+    Options()
+        : type(SPARSE_NORMAL_CHOLESKY),
+          preconditioner_type(JACOBI),
+          min_num_iterations(1),
+          max_num_iterations(1),
+          num_threads(1),
+          constant_sparsity(false),
+          num_eliminate_blocks(0),
+          residual_reset_period(10),
+          row_block_size(Dynamic),
+          e_block_size(Dynamic),
+          f_block_size(Dynamic) {
+    }
+
+    LinearSolverType type;
+
+    PreconditionerType preconditioner_type;
+
+    // Number of internal iterations that the solver uses. This
+    // parameter only makes sense for iterative solvers like CG.
+    int min_num_iterations;
+    int max_num_iterations;
+
+    // If possible, how many threads can the solver use.
+    int num_threads;
+
+    // If possible cache and reuse the symbolic factorization across
+    // multiple calls.
+    bool constant_sparsity;
+
+    // Eliminate 0 to num_eliminate_blocks - 1 from the Normal
+    // equations to form a schur complement. Only used by the Schur
+    // complement based solver. The most common use for this parameter
+    // is in the case of structure from motion problems where we have
+    // camera blocks and point blocks. Then setting the
+    // num_eliminate_blocks to the number of points allows the solver
+    // to use the Schur complement trick. For more details see the
+    // description of this parameter in solver.h.
+    int num_eliminate_blocks;
+
+    // Iterative solvers, e.g. Preconditioned Conjugate Gradients
+    // maintain a cheap estimate of the residual which may become
+    // inaccurate over time. Thus for non-zero values of this
+    // parameter, the solver can be told to recalculate the value of
+    // the residual using a |b - Ax| evaluation.
+    int residual_reset_period;
+
+    // If the block sizes in a BlockSparseMatrix are fixed, then in
+    // some cases the Schur complement based solvers can detect and
+    // specialize on them.
+    //
+    // It is expected that these parameters are set programmatically
+    // rather than manually.
+    //
+    // Please see explicit_schur_complement_solver_impl.h for more
+    // details.
+    int row_block_size;
+    int e_block_size;
+    int f_block_size;
+  };
+
+  // Options for the Solve method.
+  struct PerSolveOptions {
+    PerSolveOptions()
+        : D(NULL),
+          preconditioner(NULL),
+          r_tolerance(0.0),
+          q_tolerance(0.0) {
+    }
+
+    // This option only makes sense for unsymmetric linear solvers
+    // that can solve rectangular linear systems.
+    //
+    // Given a matrix A, an optional diagonal matrix D as a vector,
+    // and a vector b, the linear solver will solve for
+    //
+    //   | A | x = | b |
+    //   | D |     | 0 |
+    //
+    // If D is null, then it is treated as zero, and the solver returns
+    // the solution to
+    //
+    //   A x = b
+    //
+    // In either case, x is the vector that solves the following
+    // optimization problem.
+    //
+    //   arg min_x ||Ax - b||^2 + ||Dx||^2
+    //
+    // Here A is a matrix of size m x n, with full column rank. If A
+    // does not have full column rank, the results returned by the
+    // solver cannot be relied on. D, if it is not null is an array of
+    // size n.  b is an array of size m and x is an array of size n.
+    double * D;
+
+    // This option only makes sense for iterative solvers.
+    //
+    // In general the performance of an iterative linear solver
+    // depends on the condition number of the matrix A. For example
+    // the convergence rate of the conjugate gradients algorithm
+    // is proportional to the square root of the condition number.
+    //
+    // One particularly useful technique for improving the
+    // conditioning of a linear system is to precondition it. In its
+    // simplest form a preconditioner is a matrix M such that instead
+    // of solving Ax = b, we solve the linear system AM^{-1} y = b
+    // instead, where M is such that the condition number k(AM^{-1})
+    // is smaller than the conditioner k(A). Given the solution to
+    // this system, x = M^{-1} y. The iterative solver takes care of
+    // the mechanics of solving the preconditioned system and
+    // returning the corrected solution x. The user only needs to
+    // supply a linear operator.
+    //
+    // A null preconditioner is equivalent to an identity matrix being
+    // used a preconditioner.
+    LinearOperator* preconditioner;
+
+
+    // The following tolerance related options only makes sense for
+    // iterative solvers. Direct solvers ignore them.
+
+    // Solver terminates when
+    //
+    //   |Ax - b| <= r_tolerance * |b|.
+    //
+    // This is the most commonly used termination criterion for
+    // iterative solvers.
+    double r_tolerance;
+
+    // For PSD matrices A, let
+    //
+    //   Q(x) = x'Ax - 2b'x
+    //
+    // be the cost of the quadratic function defined by A and b. Then,
+    // the solver terminates at iteration i if
+    //
+    //   i * (Q(x_i) - Q(x_i-1)) / Q(x_i) < q_tolerance.
+    //
+    // This termination criterion is more useful when using CG to
+    // solve the Newton step. This particular convergence test comes
+    // from Stephen Nash's work on truncated Newton
+    // methods. References:
+    //
+    //   1. Stephen G. Nash & Ariela Sofer, Assessing A Search
+    //      Direction Within A Truncated Newton Method, Operation
+    //      Research Letters 9(1990) 219-221.
+    //
+    //   2. Stephen G. Nash, A Survey of Truncated Newton Methods,
+    //      Journal of Computational and Applied Mathematics,
+    //      124(1-2), 45-59, 2000.
+    //
+    double q_tolerance;
+  };
+
+  // Summary of a call to the Solve method. We should move away from
+  // the true/false method for determining solver success. We should
+  // let the summary object do the talking.
+  struct Summary {
+    Summary()
+        : residual_norm(0.0),
+          num_iterations(-1),
+          termination_type(FAILURE) {
+    }
+
+    double residual_norm;
+    int num_iterations;
+    LinearSolverTerminationType termination_type;
+  };
+
+  virtual ~LinearSolver();
+
+  // Solve Ax = b.
+  virtual Summary Solve(LinearOperator* A,
+                        const double* b,
+                        const PerSolveOptions& per_solve_options,
+                        double* x) = 0;
+
+  static LinearSolver* Create(const Options& options);
+};
+
+// This templated subclass of LinearSolver serves as a base class for
+// other linear solvers that depend on the particular matrix layout of
+// the underlying linear operator. For example some linear solvers
+// need low level access to the TripletSparseMatrix implementing the
+// LinearOperator interface. This class hides those implementation
+// details behind a private virtual method, and has the Solve method
+// perform the necessary upcasting.
+template <typename MatrixType>
+class TypedLinearSolver : public LinearSolver {
+ public:
+  virtual ~TypedLinearSolver() {}
+  virtual LinearSolver::Summary Solve(
+      LinearOperator* A,
+      const double* b,
+      const LinearSolver::PerSolveOptions& per_solve_options,
+      double* x) {
+    CHECK_NOTNULL(A);
+    CHECK_NOTNULL(b);
+    CHECK_NOTNULL(x);
+    return SolveImpl(down_cast<MatrixType*>(A), b, per_solve_options, x);
+  }
+
+ private:
+  virtual LinearSolver::Summary SolveImpl(
+      MatrixType* A,
+      const double* b,
+      const LinearSolver::PerSolveOptions& per_solve_options,
+      double* x) = 0;
+};
+
+// Linear solvers that depend on acccess to the low level structure of
+// a SparseMatrix.
+typedef TypedLinearSolver<BlockSparseMatrix>         BlockSparseMatrixSolver;          // NOLINT
+typedef TypedLinearSolver<BlockSparseMatrixBase>     BlockSparseMatrixBaseSolver;      // NOLINT
+typedef TypedLinearSolver<CompressedRowSparseMatrix> CompressedRowSparseMatrixSolver;  // NOLINT
+typedef TypedLinearSolver<DenseSparseMatrix>         DenseSparseMatrixSolver;          // NOLINT
+typedef TypedLinearSolver<TripletSparseMatrix>       TripletSparseMatrixSolver;        // NOLINT
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_LINEAR_SOLVER_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/local_parameterization.cc b/extern/libmv/third_party/ceres/internal/ceres/local_parameterization.cc
new file mode 100644
index 00000000000..eeae74e3f95
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/local_parameterization.cc
@@ -0,0 +1,140 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#include <glog/logging.h>
+#include "ceres/internal/eigen.h"
+#include "ceres/local_parameterization.h"
+#include "ceres/rotation.h"
+
+namespace ceres {
+
+IdentityParameterization::IdentityParameterization(const int size)
+    : size_(size) {
+  CHECK_GT(size, 0);
+}
+
+bool IdentityParameterization::Plus(const double* x,
+                                    const double* delta,
+                                    double* x_plus_delta) const {
+  VectorRef(x_plus_delta, size_) =
+      ConstVectorRef(x, size_) + ConstVectorRef(delta, size_);
+  return true;
+}
+
+bool IdentityParameterization::ComputeJacobian(const double* x,
+                                               double* jacobian) const {
+  MatrixRef(jacobian, size_, size_) = Matrix::Identity(size_, size_);
+  return true;
+}
+
+SubsetParameterization::SubsetParameterization(
+    int size,
+    const vector<int>& constant_parameters)
+    : local_size_(size - constant_parameters.size()),
+      constancy_mask_(size, 0) {
+  CHECK_GT(constant_parameters.size(), 0)
+      << "The set of constant parameters should contain at least "
+      << "one element. If you do not wish to hold any parameters "
+      << "constant, then do not use a SubsetParameterization";
+
+  vector<int> constant = constant_parameters;
+  sort(constant.begin(), constant.end());
+  CHECK(unique(constant.begin(), constant.end()) == constant.end())
+      << "The set of constant parameters cannot contain duplicates";
+  CHECK_LT(constant_parameters.size(), size)
+      << "Number of parameters held constant should be less "
+      << "than the size of the parameter block. If you wish "
+      << "to hold the entire parameter block constant, then a "
+      << "efficient way is to directly mark it as constant "
+      << "instead of using a LocalParameterization to do so.";
+  CHECK_GE(*min_element(constant.begin(), constant.end()), 0);
+  CHECK_LT(*max_element(constant.begin(), constant.end()), size);
+
+  for (int i = 0; i < constant_parameters.size(); ++i) {
+    constancy_mask_[constant_parameters[i]] = 1;
+  }
+}
+
+bool SubsetParameterization::Plus(const double* x,
+                                  const double* delta,
+                                  double* x_plus_delta) const {
+  for (int i = 0, j = 0; i < constancy_mask_.size(); ++i) {
+    if (constancy_mask_[i]) {
+      x_plus_delta[i] = x[i];
+    } else {
+      x_plus_delta[i] = x[i] + delta[j++];
+    }
+  }
+  return true;
+}
+
+bool SubsetParameterization::ComputeJacobian(const double* x,
+                                             double* jacobian) const {
+  MatrixRef m(jacobian, constancy_mask_.size(), local_size_);
+  m.setZero();
+  for (int i = 0, j = 0; i < constancy_mask_.size(); ++i) {
+    if (!constancy_mask_[i]) {
+      m(i, j++) = 1.0;
+    }
+  }
+  return true;
+}
+
+bool QuaternionParameterization::Plus(const double* x,
+                                      const double* delta,
+                                      double* x_plus_delta) const {
+  const double norm_delta =
+      sqrt(delta[0] * delta[0] + delta[1] * delta[1] + delta[2] * delta[2]);
+  if (norm_delta > 0.0) {
+    const double sin_delta_by_delta = (sin(norm_delta) / norm_delta);
+    double q_delta[4];
+    q_delta[0] = cos(norm_delta);
+    q_delta[1] = sin_delta_by_delta * delta[0];
+    q_delta[2] = sin_delta_by_delta * delta[1];
+    q_delta[3] = sin_delta_by_delta * delta[2];
+    QuaternionProduct(q_delta, x, x_plus_delta);
+  } else {
+    for (int i = 0; i < 4; ++i) {
+      x_plus_delta[i] = x[i];
+    }
+  }
+  return true;
+}
+
+bool QuaternionParameterization::ComputeJacobian(const double* x,
+                                                 double* jacobian) const {
+  jacobian[0] = -x[1]; jacobian[1]  = -x[2]; jacobian[2]  = -x[3];  // NOLINT
+  jacobian[3] =  x[0]; jacobian[4]  =  x[3]; jacobian[5]  = -x[2];  // NOLINT
+  jacobian[6] = -x[3]; jacobian[7]  =  x[0]; jacobian[8]  =  x[1];  // NOLINT
+  jacobian[9] =  x[2]; jacobian[10] = -x[1]; jacobian[11] =  x[0];  // NOLINT
+  return true;
+}
+
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/loss_function.cc b/extern/libmv/third_party/ceres/internal/ceres/loss_function.cc
new file mode 100644
index 00000000000..00b2b184729
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/loss_function.cc
@@ -0,0 +1,93 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Purpose: See .h file.
+
+#include "ceres/loss_function.h"
+
+#include <cmath>
+#include <cstddef>
+
+namespace ceres {
+
+void TrivialLoss::Evaluate(double s, double rho[3]) const {
+  rho[0] = s;
+  rho[1] = 1;
+  rho[2] = 0;
+}
+
+void HuberLoss::Evaluate(double s, double rho[3]) const {
+  if (s > b_) {
+    // Outlier region.
+    // 'r' is always positive.
+    const double r = sqrt(s);
+    rho[0] = 2 * a_ * r - b_;
+    rho[1] = a_ / r;
+    rho[2] = - rho[1] / (2 * s);
+  } else {
+    // Inlier region.
+    rho[0] = s;
+    rho[1] = 1;
+    rho[2] = 0;
+  }
+}
+
+void SoftLOneLoss::Evaluate(double s, double rho[3]) const {
+  const double sum = 1 + s * c_;
+  const double tmp = sqrt(sum);
+  // 'sum' and 'tmp' are always positive, assuming that 's' is.
+  rho[0] = 2 * b_ * (tmp - 1);
+  rho[1] = 1 / tmp;
+  rho[2] = - (c_ * rho[1]) / (2 * sum);
+}
+
+void CauchyLoss::Evaluate(double s, double rho[3]) const {
+  const double sum = 1 + s * c_;
+  const double inv = 1 / sum;
+  // 'sum' and 'inv' are always positive, assuming that 's' is.
+  rho[0] = b_ * log(sum);
+  rho[1] = inv;
+  rho[2] = - c_ * (inv * inv);
+}
+
+void ScaledLoss::Evaluate(double s, double rho[3]) const {
+  if (rho_.get() == NULL) {
+    rho[0] = a_ * s;
+    rho[1] = a_;
+    rho[2] = 0.0;
+  } else {
+    rho_->Evaluate(s, rho);
+    rho[0] *= a_;
+    rho[1] *= a_;
+    rho[2] *= a_;
+  }
+}
+
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/map_util.h b/extern/libmv/third_party/ceres/internal/ceres/map_util.h
new file mode 100644
index 00000000000..ddf1252f674
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/map_util.h
@@ -0,0 +1,129 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//
+// Originally by Anton Carver
+
+#ifndef CERES_INTERNAL_MAP_UTIL_H_
+#define CERES_INTERNAL_MAP_UTIL_H_
+
+#include <utility>
+#include "ceres/internal/port.h"
+
+namespace ceres {
+
+// Perform a lookup in a map or hash_map, assuming that the key exists.
+// Crash if it does not.
+//
+// This is intended as a replacement for operator[] as an rvalue (for reading)
+// when the key is guaranteed to exist.
+//
+// operator[] is discouraged for several reasons:
+//  * It has a side-effect of inserting missing keys
+//  * It is not thread-safe (even when it is not inserting, it can still
+//      choose to resize the underlying storage)
+//  * It invalidates iterators (when it chooses to resize)
+//  * It default constructs a value object even if it doesn't need to
+//
+// This version assumes the key is printable, and includes it in the fatal log
+// message.
+template <class Collection>
+const typename Collection::value_type::second_type&
+FindOrDie(const Collection& collection,
+          const typename Collection::value_type::first_type& key) {
+  typename Collection::const_iterator it = collection.find(key);
+  CHECK(it != collection.end()) << "Map key not found: " << key;
+  return it->second;
+}
+
+// Perform a lookup in a map or hash_map.
+// If the key is present in the map then the value associated with that
+// key is returned, otherwise the value passed as a default is returned.
+template <class Collection>
+const typename Collection::value_type::second_type&
+FindWithDefault(const Collection& collection,
+                const typename Collection::value_type::first_type& key,
+                const typename Collection::value_type::second_type& value) {
+  typename Collection::const_iterator it = collection.find(key);
+  if (it == collection.end()) {
+    return value;
+  }
+  return it->second;
+}
+
+// Insert a new key and value into a map or hash_map.
+// If the key is not present in the map the key and value are
+// inserted, otherwise nothing happens. True indicates that an insert
+// took place, false indicates the key was already present.
+template <class Collection>
+bool InsertIfNotPresent(
+    Collection * const collection,
+    const typename Collection::value_type::first_type& key,
+    const typename Collection::value_type::second_type& value) {
+  pair<typename Collection::iterator, bool> ret =
+    collection->insert(typename Collection::value_type(key, value));
+  return ret.second;
+}
+
+// Perform a lookup in a map or hash_map.
+// Same as above but the returned pointer is not const and can be used to change
+// the stored value.
+template <class Collection>
+typename Collection::value_type::second_type*
+FindOrNull(Collection& collection,  // NOLINT
+           const typename Collection::value_type::first_type& key) {
+  typename Collection::iterator it = collection.find(key);
+  if (it == collection.end()) {
+    return 0;
+  }
+  return &it->second;
+}
+
+// Test to see if a set, map, hash_set or hash_map contains a particular key.
+// Returns true if the key is in the collection.
+template <class Collection, class Key>
+bool ContainsKey(const Collection& collection, const Key& key) {
+  typename Collection::const_iterator it = collection.find(key);
+  return it != collection.end();
+}
+
+// Inserts a new key/value into a map or hash_map.
+// Dies if the key is already present.
+template<class Collection>
+void InsertOrDie(Collection* const collection,
+                 const typename Collection::value_type::first_type& key,
+                 const typename Collection::value_type::second_type& data) {
+  typedef typename Collection::value_type value_type;
+  CHECK(collection->insert(value_type(key, data)).second)
+    << "duplicate key: " << key;
+}
+
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_MAP_UTIL_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/matrix_proto.h b/extern/libmv/third_party/ceres/internal/ceres/matrix_proto.h
new file mode 100644
index 00000000000..b8a3a1a6de6
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/matrix_proto.h
@@ -0,0 +1,40 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//
+// A portability header to make optional protocol buffer support less intrusive.
+
+#ifndef CERES_INTERNAL_MATRIX_PROTO_H_
+#define CERES_INTERNAL_MATRIX_PROTO_H_
+
+#ifndef CERES_DONT_HAVE_PROTOCOL_BUFFERS
+#include "ceres/matrix.pb.h"
+#endif
+
+#endif  // CERES_INTERNAL_MATRIX_PROTO_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/minimizer.h b/extern/libmv/third_party/ceres/internal/ceres/minimizer.h
new file mode 100644
index 00000000000..77cb00cb6b4
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/minimizer.h
@@ -0,0 +1,104 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#ifndef CERES_INTERNAL_MINIMIZER_H_
+#define CERES_INTERNAL_MINIMIZER_H_
+
+#include <vector>
+#include "ceres/solver.h"
+#include "ceres/iteration_callback.h"
+
+namespace ceres {
+namespace internal {
+
+class Evaluator;
+class LinearSolver;
+
+// Interface for non-linear least squares solvers.
+class Minimizer {
+ public:
+  // Options struct to control the behaviour of the Minimizer. Please
+  // see solver.h for detailed information about the meaning and
+  // default values of each of these parameters.
+  struct Options {
+    explicit Options(const Solver::Options& options) {
+      max_num_iterations = options.max_num_iterations;
+      max_solver_time_sec = options.max_solver_time_sec;
+      gradient_tolerance = options.gradient_tolerance;
+      parameter_tolerance = options.parameter_tolerance;
+      function_tolerance = options.function_tolerance;
+      min_relative_decrease = options.min_relative_decrease;
+      eta = options.eta;
+      tau = options.tau;
+      jacobi_scaling = options.jacobi_scaling;
+      crash_and_dump_lsqp_on_failure = options.crash_and_dump_lsqp_on_failure;
+      lsqp_dump_directory = options.lsqp_dump_directory;
+      lsqp_iterations_to_dump = options.lsqp_iterations_to_dump;
+      lsqp_dump_format_type = options.lsqp_dump_format_type;
+      num_eliminate_blocks = options.num_eliminate_blocks;
+      logging_type = options.logging_type;
+    }
+
+    int max_num_iterations;
+    int max_solver_time_sec;
+    double gradient_tolerance;
+    double parameter_tolerance;
+    double function_tolerance;
+    double min_relative_decrease;
+    double eta;
+    double tau;
+    bool jacobi_scaling;
+    bool crash_and_dump_lsqp_on_failure;
+    vector<int> lsqp_iterations_to_dump;
+    DumpFormatType lsqp_dump_format_type;
+    string lsqp_dump_directory;
+    int num_eliminate_blocks;
+    LoggingType logging_type;
+
+    // List of callbacks that are executed by the Minimizer at the end
+    // of each iteration.
+    //
+    // Client owns these pointers.
+    vector<IterationCallback*> callbacks;
+  };
+
+  virtual ~Minimizer() {}
+  virtual void Minimize(const Options& options,
+                        Evaluator* evaluator,
+                        LinearSolver* linear_solver,
+                        const double* initial_parameters,
+                        double* final_parameters,
+                        Solver::Summary* summary) = 0;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_MINIMIZER_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/mutex.h b/extern/libmv/third_party/ceres/internal/ceres/mutex.h
new file mode 100644
index 00000000000..6514b107041
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/mutex.h
@@ -0,0 +1,312 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: Craig Silverstein.
+//
+// A simple mutex wrapper, supporting locks and read-write locks.
+// You should assume the locks are *not* re-entrant.
+//
+// This class is meant to be internal-only and should be wrapped by an
+// internal namespace.  Before you use this module, please give the
+// name of your internal namespace for this module.  Or, if you want
+// to expose it, you'll want to move it to the Google namespace.  We
+// cannot put this class in global namespace because there can be some
+// problems when we have multiple versions of Mutex in each shared object.
+//
+// NOTE: by default, we have #ifdef'ed out the TryLock() method.
+//       This is for two reasons:
+// 1) TryLock() under Windows is a bit annoying (it requires a
+//    #define to be defined very early).
+// 2) TryLock() is broken for NO_THREADS mode, at least in NDEBUG
+//    mode.
+// If you need TryLock(), and either these two caveats are not a
+// problem for you, or you're willing to work around them, then
+// feel free to #define GMUTEX_TRYLOCK, or to remove the #ifdefs
+// in the code below.
+//
+// CYGWIN NOTE: Cygwin support for rwlock seems to be buggy:
+//    http://www.cygwin.com/ml/cygwin/2008-12/msg00017.html
+// Because of that, we might as well use windows locks for
+// cygwin.  They seem to be more reliable than the cygwin pthreads layer.
+//
+// TRICKY IMPLEMENTATION NOTE:
+// This class is designed to be safe to use during
+// dynamic-initialization -- that is, by global constructors that are
+// run before main() starts.  The issue in this case is that
+// dynamic-initialization happens in an unpredictable order, and it
+// could be that someone else's dynamic initializer could call a
+// function that tries to acquire this mutex -- but that all happens
+// before this mutex's constructor has run.  (This can happen even if
+// the mutex and the function that uses the mutex are in the same .cc
+// file.)  Basically, because Mutex does non-trivial work in its
+// constructor, it's not, in the naive implementation, safe to use
+// before dynamic initialization has run on it.
+//
+// The solution used here is to pair the actual mutex primitive with a
+// bool that is set to true when the mutex is dynamically initialized.
+// (Before that it's false.)  Then we modify all mutex routines to
+// look at the bool, and not try to lock/unlock until the bool makes
+// it to true (which happens after the Mutex constructor has run.)
+//
+// This works because before main() starts -- particularly, during
+// dynamic initialization -- there are no threads, so a) it's ok that
+// the mutex operations are a no-op, since we don't need locking then
+// anyway; and b) we can be quite confident our bool won't change
+// state between a call to Lock() and a call to Unlock() (that would
+// require a global constructor in one translation unit to call Lock()
+// and another global constructor in another translation unit to call
+// Unlock() later, which is pretty perverse).
+//
+// That said, it's tricky, and can conceivably fail; it's safest to
+// avoid trying to acquire a mutex in a global constructor, if you
+// can.  One way it can fail is that a really smart compiler might
+// initialize the bool to true at static-initialization time (too
+// early) rather than at dynamic-initialization time.  To discourage
+// that, we set is_safe_ to true in code (not the constructor
+// colon-initializer) and set it to true via a function that always
+// evaluates to true, but that the compiler can't know always
+// evaluates to true.  This should be good enough.
+
+#ifndef CERES_INTERNAL_MUTEX_H_
+#define CERES_INTERNAL_MUTEX_H_
+
+#if defined(NO_THREADS)
+  typedef int MutexType;      // to keep a lock-count
+#elif defined(_WIN32) || defined(__CYGWIN32__) || defined(__CYGWIN64__)
+# define WIN32_LEAN_AND_MEAN  // We only need minimal includes
+# ifdef GMUTEX_TRYLOCK
+  // We need Windows NT or later for TryEnterCriticalSection().  If you
+  // don't need that functionality, you can remove these _WIN32_WINNT
+  // lines, and change TryLock() to assert(0) or something.
+#   ifndef _WIN32_WINNT
+#     define _WIN32_WINNT 0x0400
+#   endif
+# endif
+// To avoid macro definition of ERROR.
+# define NOGDI
+// To avoid macro definition of min/max.
+# define NOMINMAX
+# include <windows.h>
+  typedef CRITICAL_SECTION MutexType;
+#elif defined(CERES_HAVE_PTHREAD) && defined(CERES_HAVE_RWLOCK)
+  // Needed for pthread_rwlock_*.  If it causes problems, you could take it
+  // out, but then you'd have to unset CERES_HAVE_RWLOCK (at least on linux --
+  // it *does* cause problems for FreeBSD, or MacOSX, but isn't needed for
+  // locking there.)
+# if defined(__linux__) && !defined(_XOPEN_SOURCE)
+#   define _XOPEN_SOURCE 500  // may be needed to get the rwlock calls
+# endif
+# include <pthread.h>
+  typedef pthread_rwlock_t MutexType;
+#elif defined(CERES_HAVE_PTHREAD)
+# include <pthread.h>
+  typedef pthread_mutex_t MutexType;
+#else
+# error Need to implement mutex.h for your architecture, or #define NO_THREADS
+#endif
+
+// We need to include these header files after defining _XOPEN_SOURCE
+// as they may define the _XOPEN_SOURCE macro.
+#include <assert.h>
+#include <stdlib.h>      // for abort()
+
+namespace ceres {
+namespace internal {
+
+class Mutex {
+ public:
+  // Create a Mutex that is not held by anybody.  This constructor is
+  // typically used for Mutexes allocated on the heap or the stack.
+  // See below for a recommendation for constructing global Mutex
+  // objects.
+  inline Mutex();
+
+  // Destructor
+  inline ~Mutex();
+
+  inline void Lock();    // Block if needed until free then acquire exclusively
+  inline void Unlock();  // Release a lock acquired via Lock()
+#ifdef GMUTEX_TRYLOCK
+  inline bool TryLock(); // If free, Lock() and return true, else return false
+#endif
+  // Note that on systems that don't support read-write locks, these may
+  // be implemented as synonyms to Lock() and Unlock().  So you can use
+  // these for efficiency, but don't use them anyplace where being able
+  // to do shared reads is necessary to avoid deadlock.
+  inline void ReaderLock();   // Block until free or shared then acquire a share
+  inline void ReaderUnlock(); // Release a read share of this Mutex
+  inline void WriterLock() { Lock(); }     // Acquire an exclusive lock
+  inline void WriterUnlock() { Unlock(); } // Release a lock from WriterLock()
+
+  // TODO(hamaji): Do nothing, implement correctly.
+  inline void AssertHeld() {}
+
+ private:
+  MutexType mutex_;
+  // We want to make sure that the compiler sets is_safe_ to true only
+  // when we tell it to, and never makes assumptions is_safe_ is
+  // always true.  volatile is the most reliable way to do that.
+  volatile bool is_safe_;
+
+  inline void SetIsSafe() { is_safe_ = true; }
+
+  // Catch the error of writing Mutex when intending MutexLock.
+  Mutex(Mutex* /*ignored*/) {}
+  // Disallow "evil" constructors
+  Mutex(const Mutex&);
+  void operator=(const Mutex&);
+};
+
+// Now the implementation of Mutex for various systems
+#if defined(NO_THREADS)
+
+// When we don't have threads, we can be either reading or writing,
+// but not both.  We can have lots of readers at once (in no-threads
+// mode, that's most likely to happen in recursive function calls),
+// but only one writer.  We represent this by having mutex_ be -1 when
+// writing and a number > 0 when reading (and 0 when no lock is held).
+//
+// In debug mode, we assert these invariants, while in non-debug mode
+// we do nothing, for efficiency.  That's why everything is in an
+// assert.
+
+Mutex::Mutex() : mutex_(0) { }
+Mutex::~Mutex()            { assert(mutex_ == 0); }
+void Mutex::Lock()         { assert(--mutex_ == -1); }
+void Mutex::Unlock()       { assert(mutex_++ == -1); }
+#ifdef GMUTEX_TRYLOCK
+bool Mutex::TryLock()      { if (mutex_) return false; Lock(); return true; }
+#endif
+void Mutex::ReaderLock()   { assert(++mutex_ > 0); }
+void Mutex::ReaderUnlock() { assert(mutex_-- > 0); }
+
+#elif defined(_WIN32) || defined(__CYGWIN32__) || defined(__CYGWIN64__)
+
+Mutex::Mutex()             { InitializeCriticalSection(&mutex_); SetIsSafe(); }
+Mutex::~Mutex()            { DeleteCriticalSection(&mutex_); }
+void Mutex::Lock()         { if (is_safe_) EnterCriticalSection(&mutex_); }
+void Mutex::Unlock()       { if (is_safe_) LeaveCriticalSection(&mutex_); }
+#ifdef GMUTEX_TRYLOCK
+bool Mutex::TryLock()      { return is_safe_ ?
+                                 TryEnterCriticalSection(&mutex_) != 0 : true; }
+#endif
+void Mutex::ReaderLock()   { Lock(); }      // we don't have read-write locks
+void Mutex::ReaderUnlock() { Unlock(); }
+
+#elif defined(CERES_HAVE_PTHREAD) && defined(CERES_HAVE_RWLOCK)
+
+#define SAFE_PTHREAD(fncall)  do {   /* run fncall if is_safe_ is true */  \
+  if (is_safe_ && fncall(&mutex_) != 0) abort();                           \
+} while (0)
+
+Mutex::Mutex() {
+  SetIsSafe();
+  if (is_safe_ && pthread_rwlock_init(&mutex_, NULL) != 0) abort();
+}
+Mutex::~Mutex()            { SAFE_PTHREAD(pthread_rwlock_destroy); }
+void Mutex::Lock()         { SAFE_PTHREAD(pthread_rwlock_wrlock); }
+void Mutex::Unlock()       { SAFE_PTHREAD(pthread_rwlock_unlock); }
+#ifdef GMUTEX_TRYLOCK
+bool Mutex::TryLock()      { return is_safe_ ?
+                                    pthread_rwlock_trywrlock(&mutex_) == 0 :
+                                    true; }
+#endif
+void Mutex::ReaderLock()   { SAFE_PTHREAD(pthread_rwlock_rdlock); }
+void Mutex::ReaderUnlock() { SAFE_PTHREAD(pthread_rwlock_unlock); }
+#undef SAFE_PTHREAD
+
+#elif defined(CERES_HAVE_PTHREAD)
+
+#define SAFE_PTHREAD(fncall)  do {   /* run fncall if is_safe_ is true */  \
+  if (is_safe_ && fncall(&mutex_) != 0) abort();                           \
+} while (0)
+
+Mutex::Mutex()             {
+  SetIsSafe();
+  if (is_safe_ && pthread_mutex_init(&mutex_, NULL) != 0) abort();
+}
+Mutex::~Mutex()            { SAFE_PTHREAD(pthread_mutex_destroy); }
+void Mutex::Lock()         { SAFE_PTHREAD(pthread_mutex_lock); }
+void Mutex::Unlock()       { SAFE_PTHREAD(pthread_mutex_unlock); }
+#ifdef GMUTEX_TRYLOCK
+bool Mutex::TryLock()      { return is_safe_ ?
+                                 pthread_mutex_trylock(&mutex_) == 0 : true; }
+#endif
+void Mutex::ReaderLock()   { Lock(); }
+void Mutex::ReaderUnlock() { Unlock(); }
+#undef SAFE_PTHREAD
+
+#endif
+
+// --------------------------------------------------------------------------
+// Some helper classes
+
+// MutexLock(mu) acquires mu when constructed and releases it when destroyed.
+class MutexLock {
+ public:
+  explicit MutexLock(Mutex *mu) : mu_(mu) { mu_->Lock(); }
+  ~MutexLock() { mu_->Unlock(); }
+ private:
+  Mutex * const mu_;
+  // Disallow "evil" constructors
+  MutexLock(const MutexLock&);
+  void operator=(const MutexLock&);
+};
+
+// ReaderMutexLock and WriterMutexLock do the same, for rwlocks
+class ReaderMutexLock {
+ public:
+  explicit ReaderMutexLock(Mutex *mu) : mu_(mu) { mu_->ReaderLock(); }
+  ~ReaderMutexLock() { mu_->ReaderUnlock(); }
+ private:
+  Mutex * const mu_;
+  // Disallow "evil" constructors
+  ReaderMutexLock(const ReaderMutexLock&);
+  void operator=(const ReaderMutexLock&);
+};
+
+class WriterMutexLock {
+ public:
+  explicit WriterMutexLock(Mutex *mu) : mu_(mu) { mu_->WriterLock(); }
+  ~WriterMutexLock() { mu_->WriterUnlock(); }
+ private:
+  Mutex * const mu_;
+  // Disallow "evil" constructors
+  WriterMutexLock(const WriterMutexLock&);
+  void operator=(const WriterMutexLock&);
+};
+
+// Catch bug where variable name is omitted, e.g. MutexLock (&mu);
+#define MutexLock(x) COMPILE_ASSERT(0, mutex_lock_decl_missing_var_name)
+#define ReaderMutexLock(x) COMPILE_ASSERT(0, rmutex_lock_decl_missing_var_name)
+#define WriterMutexLock(x) COMPILE_ASSERT(0, wmutex_lock_decl_missing_var_name)
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_MUTEX_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/normal_prior.cc b/extern/libmv/third_party/ceres/internal/ceres/normal_prior.cc
new file mode 100644
index 00000000000..f30bbc8b46b
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/normal_prior.cc
@@ -0,0 +1,67 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#include "ceres/normal_prior.h"
+
+#include <cstddef>
+#include <vector>
+
+#include <glog/logging.h>
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/types.h"
+
+namespace ceres {
+
+NormalPrior::NormalPrior(const Matrix& A, const Vector& b)
+    : A_(A), b_(b) {
+  CHECK_GT(b_.rows(), 0);
+  CHECK_GT(A_.rows(), 0);
+  CHECK_EQ(b_.rows(), A.cols());
+  set_num_residuals(A_.rows());
+  mutable_parameter_block_sizes()->push_back(b_.rows());
+}
+
+bool NormalPrior::Evaluate(double const* const* parameters,
+                           double* residuals,
+                           double** jacobians) const {
+  ConstVectorRef p(parameters[0], parameter_block_sizes()[0]);
+  VectorRef r(residuals, num_residuals());
+  // The following line should read
+  // r = A_ * (p - b_);
+  // The extra eval is to get around a bug in the eigen library.
+  r = A_ * (p - b_).eval();
+  if ((jacobians != NULL) && (jacobians[0] != NULL)) {
+    MatrixRef(jacobians[0], num_residuals(), parameter_block_sizes()[0]) = A_;
+  }
+  return true;
+}
+
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/parameter_block.h b/extern/libmv/third_party/ceres/internal/ceres/parameter_block.h
new file mode 100644
index 00000000000..4bac1a85828
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/parameter_block.h
@@ -0,0 +1,256 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+
+#ifndef CERES_INTERNAL_PARAMETER_BLOCK_H_
+#define CERES_INTERNAL_PARAMETER_BLOCK_H_
+
+#include <cstdlib>
+#include "ceres/integral_types.h"
+#include <glog/logging.h>
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/port.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/local_parameterization.h"
+#include "ceres/residual_block_utils.h"
+
+namespace ceres {
+namespace internal {
+
+class ProblemImpl;
+
+// The parameter block encodes the location of the user's original value, and
+// also the "current state" of the parameter. The evaluator uses whatever is in
+// the current state of the parameter when evaluating. This is inlined since the
+// methods are performance sensitive.
+//
+// The class is not thread-safe, unless only const methods are called. The
+// parameter block may also hold a pointer to a local parameterization; the
+// parameter block does not take ownership of this pointer, so the user is
+// responsible for the proper disposal of the local parameterization.
+class ParameterBlock {
+ public:
+  ParameterBlock(double* user_state, int size) {
+    Init(user_state, size, NULL);
+  }
+  ParameterBlock(double* user_state,
+                 int size,
+                 LocalParameterization* local_parameterization) {
+    Init(user_state, size, local_parameterization);
+  }
+
+  // The size of the parameter block.
+  int Size() const { return size_; }
+
+  // Manipulate the parameter state.
+  bool SetState(const double* x) {
+    CHECK(x != NULL)
+        << "Tried to set the state of constant parameter "
+        << "with user location " << user_state_;
+    CHECK(!is_constant_)
+        << "Tried to set the state of constant parameter "
+        << "with user location " << user_state_;
+
+    state_ = x;
+    return UpdateLocalParameterizationJacobian();
+  }
+
+  // Copy the current parameter state out to x. This is "GetState()" rather than
+  // simply "state()" since it is actively copying the data into the passed
+  // pointer.
+  void GetState(double *x) const {
+    if (x != state_) {
+      memcpy(x, state_, sizeof(*state_) * size_);
+    }
+  }
+
+  // Direct pointers to the current state.
+  const double* state() const { return state_; }
+  const double* user_state() const { return user_state_; }
+  double* mutable_user_state() { return user_state_; }
+  LocalParameterization* local_parameterization() const {
+    return local_parameterization_;
+  }
+  LocalParameterization* mutable_local_parameterization() {
+    return local_parameterization_;
+  }
+
+  // Set this parameter block to vary or not.
+  void SetConstant() { is_constant_ = true; }
+  void SetVarying() { is_constant_ = false; }
+  bool IsConstant() const { return is_constant_; }
+
+  // This parameter block's index in an array.
+  int index() const { return index_; }
+  void set_index(int index) { index_ = index; }
+
+  // This parameter offset inside a larger state vector.
+  int state_offset() const { return state_offset_; }
+  void set_state_offset(int state_offset) { state_offset_ = state_offset; }
+
+  // This parameter offset inside a larger delta vector.
+  int delta_offset() const { return delta_offset_; }
+  void set_delta_offset(int delta_offset) { delta_offset_ = delta_offset; }
+
+  // Methods relating to the parameter block's parameterization.
+
+  // The local to global jacobian. Returns NULL if there is no local
+  // parameterization for this parameter block. The returned matrix is row-major
+  // and has Size() rows and  LocalSize() columns.
+  const double* LocalParameterizationJacobian() const {
+    return local_parameterization_jacobian_.get();
+  }
+
+  int LocalSize() const {
+    return (local_parameterization_ == NULL)
+        ? size_
+        : local_parameterization_->LocalSize();
+  }
+
+  // Set the parameterization. The parameterization can be set exactly once;
+  // multiple calls to set the parameterization to different values will crash.
+  // It is an error to pass NULL for the parameterization. The parameter block
+  // does not take ownership of the parameterization.
+  void SetParameterization(LocalParameterization* new_parameterization) {
+    CHECK(new_parameterization != NULL) << "NULL parameterization invalid.";
+    CHECK(new_parameterization->GlobalSize() == size_)
+        << "Invalid parameterization for parameter block. The parameter block "
+        << "has size " << size_ << " while the parameterization has a global "
+        << "size of " << new_parameterization->GlobalSize() << ". Did you "
+        << "accidentally use the wrong parameter block or parameterization?";
+    if (new_parameterization != local_parameterization_) {
+      CHECK(local_parameterization_ == NULL)
+          << "Can't re-set the local parameterization; it leads to "
+          << "ambiguous ownership.";
+      local_parameterization_ = new_parameterization;
+      local_parameterization_jacobian_.reset(
+          new double[local_parameterization_->GlobalSize() *
+                     local_parameterization_->LocalSize()]);
+      CHECK(UpdateLocalParameterizationJacobian())
+          "Local parameterization Jacobian computation failed"
+          "for x: " << ConstVectorRef(state_, Size()).transpose();
+    } else {
+      // Ignore the case that the parameterizations match.
+    }
+  }
+
+  // Generalization of the addition operation. This is the same as
+  // LocalParameterization::Plus() but uses the parameter's current state
+  // instead of operating on a passed in pointer.
+  bool Plus(const double *x, const double* delta, double* x_plus_delta) {
+    if (local_parameterization_ == NULL) {
+      VectorRef(x_plus_delta, size_) = ConstVectorRef(x, size_) +
+                                       ConstVectorRef(delta,  size_);
+      return true;
+    }
+    return local_parameterization_->Plus(x, delta, x_plus_delta);
+  }
+
+ private:
+  void Init(double* user_state,
+            int size,
+            LocalParameterization* local_parameterization) {
+    user_state_ = user_state;
+    size_ = size;
+    is_constant_ = false;
+    state_ = user_state_;
+
+    local_parameterization_ = NULL;
+    if (local_parameterization != NULL) {
+      SetParameterization(local_parameterization);
+    }
+
+    index_ = -1;
+    state_offset_ = -1;
+    delta_offset_ = -1;
+  }
+
+  bool UpdateLocalParameterizationJacobian() {
+    if (local_parameterization_ == NULL) {
+      return true;
+    }
+
+    // Update the local to global Jacobian. In some cases this is
+    // wasted effort; if this is a bottleneck, we will find a solution
+    // at that time.
+
+    const int jacobian_size = Size() * LocalSize();
+    InvalidateArray(jacobian_size,
+                    local_parameterization_jacobian_.get());
+    if (!local_parameterization_->ComputeJacobian(
+            state_,
+            local_parameterization_jacobian_.get())) {
+      LOG(WARNING) << "Local parameterization Jacobian computation failed"
+          "for x: " << ConstVectorRef(state_, Size()).transpose();
+      return false;
+    }
+
+    if (!IsArrayValid(jacobian_size, local_parameterization_jacobian_.get())) {
+      LOG(WARNING) << "Local parameterization Jacobian computation returned"
+                   << "an invalid matrix for x: "
+                   << ConstVectorRef(state_, Size()).transpose()
+                   << "\n Jacobian matrix : "
+                   << ConstMatrixRef(local_parameterization_jacobian_.get(),
+                                     Size(),
+                                     LocalSize());
+      return false;
+    }
+    return true;
+  }
+
+  double* user_state_;
+  int size_;
+  bool is_constant_;
+  LocalParameterization* local_parameterization_;
+
+  // The "state" of the parameter. These fields are only needed while the
+  // solver is running. While at first glance using mutable is a bad idea, this
+  // ends up simplifying the internals of Ceres enough to justify the potential
+  // pitfalls of using "mutable."
+  mutable const double* state_;
+  mutable scoped_array<double> local_parameterization_jacobian_;
+
+  // The index of the parameter. This is used by various other parts of Ceres to
+  // permit switching from a ParameterBlock* to an index in another array.
+  int32 index_;
+
+  // The offset of this parameter block inside a larger state vector.
+  int32 state_offset_;
+
+  // The offset of this parameter block inside a larger delta vector.
+  int32 delta_offset_;
+
+  // Necessary so ProblemImpl can clean up the parameterizations.
+  friend class ProblemImpl;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_PARAMETER_BLOCK_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.cc b/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.cc
new file mode 100644
index 00000000000..fcf8fd53aed
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.cc
@@ -0,0 +1,315 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#define EIGEN_CACHEFRIENDLY_PRODUCT_THRESHOLD 10
+
+#include "ceres/partitioned_matrix_view.h"
+
+#include <algorithm>
+#include <cstring>
+#include <vector>
+#include <glog/logging.h>
+#include "ceres/block_sparse_matrix.h"
+#include "ceres/block_structure.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+PartitionedMatrixView::PartitionedMatrixView(
+    const BlockSparseMatrixBase& matrix,
+    int num_col_blocks_a)
+    : matrix_(matrix),
+      num_col_blocks_e_(num_col_blocks_a) {
+  const CompressedRowBlockStructure* bs = matrix_.block_structure();
+  CHECK_NOTNULL(bs);
+
+  num_col_blocks_f_ = bs->cols.size() - num_col_blocks_a;
+
+  // Compute the number of row blocks in E. The number of row blocks
+  // in E maybe less than the number of row blocks in the input matrix
+  // as some of the row blocks at the bottom may not have any
+  // e_blocks. For a definition of what an e_block is, please see
+  // explicit_schur_complement_solver.h
+  num_row_blocks_e_ = 0;
+  for (int r = 0; r < bs->rows.size(); ++r) {
+    const vector<Cell>& cells = bs->rows[r].cells;
+    if (cells[0].block_id < num_col_blocks_a) {
+      ++num_row_blocks_e_;
+    }
+  }
+
+  // Compute the number of columns in E and F.
+  num_cols_e_ = 0;
+  num_cols_f_ = 0;
+
+  for (int c = 0; c < bs->cols.size(); ++c) {
+    const Block& block = bs->cols[c];
+    if (c < num_col_blocks_a) {
+      num_cols_e_ += block.size;
+    } else {
+      num_cols_f_ += block.size;
+    }
+  }
+
+  CHECK_EQ(num_cols_e_ + num_cols_f_, matrix_.num_cols());
+}
+
+PartitionedMatrixView::~PartitionedMatrixView() {
+}
+
+// The next four methods don't seem to be particularly cache
+// friendly. This is an artifact of how the BlockStructure of the
+// input matrix is constructed. These methods will benefit from
+// multithreading as well as improved data layout.
+
+void PartitionedMatrixView::RightMultiplyE(const double* x, double* y) const {
+  const CompressedRowBlockStructure* bs = matrix_.block_structure();
+
+  // Iterate over the first num_row_blocks_e_ row blocks, and multiply
+  // by the first cell in each row block.
+  for (int r = 0; r < num_row_blocks_e_; ++r) {
+    const double* row_values = matrix_.RowBlockValues(r);
+    const Cell& cell = bs->rows[r].cells[0];
+    const int row_block_pos = bs->rows[r].block.position;
+    const int row_block_size = bs->rows[r].block.size;
+    const int col_block_id = cell.block_id;
+    const int col_block_pos = bs->cols[col_block_id].position;
+    const int col_block_size = bs->cols[col_block_id].size;
+
+    ConstVectorRef xref(x + col_block_pos, col_block_size);
+    VectorRef yref(y + row_block_pos, row_block_size);
+    ConstMatrixRef m(row_values + cell.position,
+                     row_block_size,
+                     col_block_size);
+    yref += m.lazyProduct(xref);
+  }
+}
+
+void PartitionedMatrixView::RightMultiplyF(const double* x, double* y) const {
+  const CompressedRowBlockStructure* bs = matrix_.block_structure();
+
+  // Iterate over row blocks, and if the row block is in E, then
+  // multiply by all the cells except the first one which is of type
+  // E. If the row block is not in E (i.e its in the bottom
+  // num_row_blocks - num_row_blocks_e row blocks), then all the cells
+  // are of type F and multiply by them all.
+  for (int r = 0; r < bs->rows.size(); ++r) {
+    const int row_block_pos = bs->rows[r].block.position;
+    const int row_block_size = bs->rows[r].block.size;
+    VectorRef yref(y + row_block_pos, row_block_size);
+    const vector<Cell>& cells = bs->rows[r].cells;
+    for (int c = (r < num_row_blocks_e_) ? 1 : 0; c < cells.size(); ++c) {
+      const double* row_values = matrix_.RowBlockValues(r);
+      const int col_block_id = cells[c].block_id;
+      const int col_block_pos = bs->cols[col_block_id].position;
+      const int col_block_size = bs->cols[col_block_id].size;
+
+      ConstVectorRef xref(x + col_block_pos - num_cols_e(),
+                          col_block_size);
+      ConstMatrixRef m(row_values + cells[c].position,
+                       row_block_size,
+                       col_block_size);
+      yref += m.lazyProduct(xref);
+    }
+  }
+}
+
+void PartitionedMatrixView::LeftMultiplyE(const double* x, double* y) const {
+  const CompressedRowBlockStructure* bs = matrix_.block_structure();
+
+  // Iterate over the first num_row_blocks_e_ row blocks, and multiply
+  // by the first cell in each row block.
+  for (int r = 0; r < num_row_blocks_e_; ++r) {
+    const Cell& cell = bs->rows[r].cells[0];
+    const double* row_values = matrix_.RowBlockValues(r);
+    const int row_block_pos = bs->rows[r].block.position;
+    const int row_block_size = bs->rows[r].block.size;
+    const int col_block_id = cell.block_id;
+    const int col_block_pos = bs->cols[col_block_id].position;
+    const int col_block_size = bs->cols[col_block_id].size;
+
+    ConstVectorRef xref(x + row_block_pos, row_block_size);
+    VectorRef yref(y + col_block_pos, col_block_size);
+    ConstMatrixRef m(row_values + cell.position,
+                     row_block_size,
+                     col_block_size);
+    yref += m.transpose().lazyProduct(xref);
+  }
+}
+
+void PartitionedMatrixView::LeftMultiplyF(const double* x, double* y) const {
+  const CompressedRowBlockStructure* bs = matrix_.block_structure();
+
+  // Iterate over row blocks, and if the row block is in E, then
+  // multiply by all the cells except the first one which is of type
+  // E. If the row block is not in E (i.e its in the bottom
+  // num_row_blocks - num_row_blocks_e row blocks), then all the cells
+  // are of type F and multiply by them all.
+  for (int r = 0; r < bs->rows.size(); ++r) {
+    const int row_block_pos = bs->rows[r].block.position;
+    const int row_block_size = bs->rows[r].block.size;
+    ConstVectorRef xref(x + row_block_pos, row_block_size);
+    const vector<Cell>& cells = bs->rows[r].cells;
+    for (int c = (r < num_row_blocks_e_) ? 1 : 0; c < cells.size(); ++c) {
+      const double* row_values = matrix_.RowBlockValues(r);
+      const int col_block_id = cells[c].block_id;
+      const int col_block_pos = bs->cols[col_block_id].position;
+      const int col_block_size = bs->cols[col_block_id].size;
+
+      VectorRef yref(y + col_block_pos - num_cols_e(), col_block_size);
+      ConstMatrixRef m(row_values + cells[c].position,
+                       row_block_size,
+                       col_block_size);
+      yref += m.transpose().lazyProduct(xref);
+    }
+  }
+}
+
+// Given a range of columns blocks of a matrix m, compute the block
+// structure of the block diagonal of the matrix m(:,
+// start_col_block:end_col_block)'m(:, start_col_block:end_col_block)
+// and return a BlockSparseMatrix with the this block structure. The
+// caller owns the result.
+BlockSparseMatrix* PartitionedMatrixView::CreateBlockDiagonalMatrixLayout(
+    int start_col_block, int end_col_block) const {
+  const CompressedRowBlockStructure* bs = matrix_.block_structure();
+  CompressedRowBlockStructure* block_diagonal_structure =
+      new CompressedRowBlockStructure;
+
+  int block_position = 0;
+  int diagonal_cell_position = 0;
+
+  // Iterate over the column blocks, creating a new diagonal block for
+  // each column block.
+  for (int c = start_col_block; c < end_col_block; ++c) {
+    const Block& block = bs->cols[c];
+    block_diagonal_structure->cols.push_back(Block());
+    Block& diagonal_block = block_diagonal_structure->cols.back();
+    diagonal_block.size = block.size;
+    diagonal_block.position = block_position;
+
+    block_diagonal_structure->rows.push_back(CompressedRow());
+    CompressedRow& row = block_diagonal_structure->rows.back();
+    row.block = diagonal_block;
+
+    row.cells.push_back(Cell());
+    Cell& cell = row.cells.back();
+    cell.block_id = c - start_col_block;
+    cell.position = diagonal_cell_position;
+
+    block_position += block.size;
+    diagonal_cell_position += block.size * block.size;
+  }
+
+  // Build a BlockSparseMatrix with the just computed block
+  // structure.
+  return new BlockSparseMatrix(block_diagonal_structure);
+}
+
+BlockSparseMatrix* PartitionedMatrixView::CreateBlockDiagonalEtE() const {
+  BlockSparseMatrix* block_diagonal =
+      CreateBlockDiagonalMatrixLayout(0, num_col_blocks_e_);
+  UpdateBlockDiagonalEtE(block_diagonal);
+  return block_diagonal;
+}
+
+BlockSparseMatrix* PartitionedMatrixView::CreateBlockDiagonalFtF() const {
+  BlockSparseMatrix* block_diagonal =
+      CreateBlockDiagonalMatrixLayout(
+          num_col_blocks_e_, num_col_blocks_e_ + num_col_blocks_f_);
+  UpdateBlockDiagonalFtF(block_diagonal);
+  return block_diagonal;
+}
+
+// Similar to the code in RightMultiplyE, except instead of the matrix
+// vector multiply its an outer product.
+//
+//    block_diagonal = block_diagonal(E'E)
+void PartitionedMatrixView::UpdateBlockDiagonalEtE(
+    BlockSparseMatrix* block_diagonal) const {
+  const CompressedRowBlockStructure* bs = matrix_.block_structure();
+  const CompressedRowBlockStructure* block_diagonal_structure =
+      block_diagonal->block_structure();
+
+  block_diagonal->SetZero();
+
+  for (int r = 0; r < num_row_blocks_e_ ; ++r) {
+    const double* row_values = matrix_.RowBlockValues(r);
+    const Cell& cell = bs->rows[r].cells[0];
+    const int row_block_size = bs->rows[r].block.size;
+    const int block_id = cell.block_id;
+    const int col_block_size = bs->cols[block_id].size;
+    ConstMatrixRef m(row_values + cell.position,
+                           row_block_size,
+                           col_block_size);
+
+    const int cell_position =
+        block_diagonal_structure->rows[block_id].cells[0].position;
+
+    MatrixRef(block_diagonal->mutable_values() + cell_position,
+              col_block_size, col_block_size).noalias() += m.transpose() * m;
+  }
+}
+
+// Similar to the code in RightMultiplyF, except instead of the matrix
+// vector multiply its an outer product.
+//
+//   block_diagonal = block_diagonal(F'F)
+//
+void PartitionedMatrixView::UpdateBlockDiagonalFtF(
+    BlockSparseMatrix* block_diagonal) const {
+  const CompressedRowBlockStructure* bs = matrix_.block_structure();
+  const CompressedRowBlockStructure* block_diagonal_structure =
+      block_diagonal->block_structure();
+
+  block_diagonal->SetZero();
+  for (int r = 0; r < bs->rows.size(); ++r) {
+    const int row_block_size = bs->rows[r].block.size;
+    const vector<Cell>& cells = bs->rows[r].cells;
+    const double* row_values = matrix_.RowBlockValues(r);
+    for (int c = (r < num_row_blocks_e_) ? 1 : 0; c < cells.size(); ++c) {
+      const int col_block_id = cells[c].block_id;
+      const int col_block_size = bs->cols[col_block_id].size;
+      ConstMatrixRef m(row_values + cells[c].position,
+                       row_block_size,
+                       col_block_size);
+      const int diagonal_block_id = col_block_id - num_col_blocks_e_;
+      const int cell_position =
+          block_diagonal_structure->rows[diagonal_block_id].cells[0].position;
+
+      MatrixRef(block_diagonal->mutable_values() + cell_position,
+                col_block_size, col_block_size).noalias() += m.transpose() * m;
+    }
+  }
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.h b/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.h
new file mode 100644
index 00000000000..cfe4de5b436
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.h
@@ -0,0 +1,121 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// For generalized bi-partite Jacobian matrices that arise in
+// Structure from Motion related problems, it is sometimes useful to
+// have access to the two parts of the matrix as linear operators
+// themselves. This class provides that functionality.
+
+#ifndef CERES_INTERNAL_PARTITIONED_MATRIX_VIEW_H_
+#define CERES_INTERNAL_PARTITIONED_MATRIX_VIEW_H_
+
+#include "ceres/block_sparse_matrix.h"
+
+namespace ceres {
+namespace internal {
+
+// Given generalized bi-partite matrix A = [E F], with the same block
+// structure as required by the Schur complement based solver, found
+// in explicit_schur_complement_solver.h, provide access to the
+// matrices E and F and their outer products E'E and F'F with
+// themselves.
+//
+// Lack of BlockStructure object will result in a crash and if the
+// block structure of the matrix does not satisfy the requirements of
+// the Schur complement solver it will result in unpredictable and
+// wrong output.
+//
+// This class lives in the internal name space as its a utility class
+// to be used by the IterativeSchurComplementSolver class, found in
+// iterative_schur_complement_solver.h, and is not meant for general
+// consumption.
+class PartitionedMatrixView {
+ public:
+  // matrix = [E F], where the matrix E contains the first
+  // num_col_blocks_a column blocks.
+  PartitionedMatrixView(const BlockSparseMatrixBase& matrix,
+                        int num_col_blocks_a);
+  ~PartitionedMatrixView();
+
+  // y += E'x
+  void LeftMultiplyE(const double* x, double* y) const;
+
+  // y += F'x
+  void LeftMultiplyF(const double* x, double* y) const;
+
+  // y += Ex
+  void RightMultiplyE(const double* x, double* y) const;
+
+  // y += Fx
+  void RightMultiplyF(const double* x, double* y) const;
+
+  // Create and return the block diagonal of the matrix E'E.
+  BlockSparseMatrix* CreateBlockDiagonalEtE() const;
+
+  // Create and return the block diagonal of the matrix F'F.
+  BlockSparseMatrix* CreateBlockDiagonalFtF() const;
+
+  // Compute the block diagonal of the matrix E'E and store it in
+  // block_diagonal. The matrix block_diagonal is expected to have a
+  // BlockStructure (preferably created using
+  // CreateBlockDiagonalMatrixEtE) which is has the same structure as
+  // the block diagonal of E'E.
+  void UpdateBlockDiagonalEtE(BlockSparseMatrix* block_diagonal) const;
+
+  // Compute the block diagonal of the matrix F'F and store it in
+  // block_diagonal. The matrix block_diagonal is expected to have a
+  // BlockStructure (preferably created using
+  // CreateBlockDiagonalMatrixFtF) which is has the same structure as
+  // the block diagonal of F'F.
+  void UpdateBlockDiagonalFtF(BlockSparseMatrix* block_diagonal) const;
+
+  int num_col_blocks_e() const { return num_col_blocks_e_;  }
+  int num_col_blocks_f() const { return num_col_blocks_f_;  }
+  int num_cols_e()       const { return num_cols_e_;        }
+  int num_cols_f()       const { return num_cols_f_;        }
+  int num_rows()         const { return matrix_.num_rows(); }
+  int num_cols()         const { return matrix_.num_cols(); }
+
+ private:
+  BlockSparseMatrix* CreateBlockDiagonalMatrixLayout(int start_col_block,
+                                                     int end_col_block) const;
+
+  const BlockSparseMatrixBase& matrix_;
+  int num_row_blocks_e_;
+  int num_col_blocks_e_;
+  int num_col_blocks_f_;
+  int num_cols_e_;
+  int num_cols_f_;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_PARTITIONED_MATRIX_VIEW_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/problem.cc b/extern/libmv/third_party/ceres/internal/ceres/problem.cc
new file mode 100644
index 00000000000..b8c25d9db84
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/problem.cc
@@ -0,0 +1,149 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//         keir@google.com (Keir Mierle)
+
+#include "ceres/problem.h"
+
+#include <vector>
+#include "ceres/problem_impl.h"
+
+namespace ceres {
+
+class ResidualBlock;
+
+Problem::Problem() : problem_impl_(new internal::ProblemImpl) {}
+Problem::Problem(const Problem::Options& options)
+    : problem_impl_(new internal::ProblemImpl(options)) {}
+Problem::~Problem() {}
+
+ResidualBlockId Problem::AddResidualBlock(
+    CostFunction* cost_function,
+    LossFunction* loss_function,
+    const vector<double*>& parameter_blocks) {
+  return problem_impl_->AddResidualBlock(cost_function,
+                                         loss_function,
+                                         parameter_blocks);
+}
+
+ResidualBlockId Problem::AddResidualBlock(
+    CostFunction* cost_function,
+    LossFunction* loss_function,
+    double* x0) {
+  return problem_impl_->AddResidualBlock(cost_function,
+                                         loss_function,
+                                         x0);
+}
+
+ResidualBlockId Problem::AddResidualBlock(
+    CostFunction* cost_function,
+    LossFunction* loss_function,
+    double* x0, double* x1) {
+  return problem_impl_->AddResidualBlock(cost_function,
+                                         loss_function,
+                                         x0, x1);
+}
+
+ResidualBlockId Problem::AddResidualBlock(
+    CostFunction* cost_function,
+    LossFunction* loss_function,
+    double* x0, double* x1, double* x2) {
+  return problem_impl_->AddResidualBlock(cost_function,
+                                         loss_function,
+                                         x0, x1, x2);
+}
+
+ResidualBlockId Problem::AddResidualBlock(
+    CostFunction* cost_function,
+    LossFunction* loss_function,
+    double* x0, double* x1, double* x2, double* x3) {
+  return problem_impl_->AddResidualBlock(cost_function,
+                                         loss_function,
+                                         x0, x1, x2, x3);
+}
+
+ResidualBlockId Problem::AddResidualBlock(
+    CostFunction* cost_function,
+    LossFunction* loss_function,
+    double* x0, double* x1, double* x2, double* x3, double* x4) {
+  return problem_impl_->AddResidualBlock(cost_function,
+                                         loss_function,
+                                         x0, x1, x2, x3, x4);
+}
+
+ResidualBlockId Problem::AddResidualBlock(
+    CostFunction* cost_function,
+    LossFunction* loss_function,
+    double* x0, double* x1, double* x2, double* x3, double* x4, double* x5) {
+  return problem_impl_->AddResidualBlock(cost_function,
+                                         loss_function,
+                                         x0, x1, x2, x3, x4, x5);
+}
+
+void Problem::AddParameterBlock(double* values, int size) {
+  problem_impl_->AddParameterBlock(values, size);
+}
+
+void Problem::AddParameterBlock(double* values,
+                                int size,
+                                LocalParameterization* local_parameterization) {
+  problem_impl_->AddParameterBlock(values, size, local_parameterization);
+}
+
+void Problem::SetParameterBlockConstant(double* values) {
+  problem_impl_->SetParameterBlockConstant(values);
+}
+
+void Problem::SetParameterBlockVariable(double* values) {
+  problem_impl_->SetParameterBlockVariable(values);
+}
+
+void Problem::SetParameterization(
+    double* values,
+    LocalParameterization* local_parameterization) {
+  problem_impl_->SetParameterization(values, local_parameterization);
+}
+
+int Problem::NumParameterBlocks() const {
+  return problem_impl_->NumParameterBlocks();
+}
+
+int Problem::NumParameters() const {
+  return problem_impl_->NumParameters();
+}
+
+int Problem::NumResidualBlocks() const {
+  return problem_impl_->NumResidualBlocks();
+}
+
+int Problem::NumResiduals() const {
+  return problem_impl_->NumResiduals();
+}
+
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc b/extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc
new file mode 100644
index 00000000000..68242477d6f
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc
@@ -0,0 +1,359 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//         keir@google.com (Keir Mierle)
+
+#include "ceres/problem_impl.h"
+
+#include <algorithm>
+#include <cstddef>
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include <glog/logging.h>
+#include "ceres/parameter_block.h"
+#include "ceres/program.h"
+#include "ceres/residual_block.h"
+#include "ceres/stl_util.h"
+#include "ceres/map_util.h"
+#include "ceres/stringprintf.h"
+#include "ceres/cost_function.h"
+#include "ceres/loss_function.h"
+
+namespace ceres {
+namespace internal {
+
+typedef map<double*, internal::ParameterBlock*> ParameterMap;
+
+// Returns true if two regions of memory, a and b, with sizes size_a and size_b
+// respectively, overlap.
+static bool RegionsAlias(const double* a, int size_a,
+                         const double* b, int size_b) {
+  return (a < b) ? b < (a + size_a)
+                 : a < (b + size_b);
+}
+
+static void CheckForNoAliasing(double* existing_block,
+                               int existing_block_size,
+                               double* new_block,
+                               int new_block_size) {
+  CHECK(!RegionsAlias(existing_block, existing_block_size,
+                      new_block, new_block_size))
+      << "Aliasing detected between existing parameter block at memory "
+      << "location " << existing_block
+      << " and has size " << existing_block_size << " with new parameter "
+      << "block that has memory adderss " << new_block << " and would have "
+      << "size " << new_block_size << ".";
+}
+
+static ParameterBlock* InternalAddParameterBlock(
+    double* values,
+    int size,
+    ParameterMap* parameter_map,
+    vector<ParameterBlock*>* parameter_blocks) {
+  CHECK(values) << "Null pointer passed to AddParameterBlock for a parameter "
+                << "with size " << size;
+
+  // Ignore the request if there is a block for the given pointer already.
+  ParameterMap::iterator it = parameter_map->find(values);
+  if (it != parameter_map->end()) {
+    int existing_size = it->second->Size();
+    CHECK(size == existing_size)
+        << "Tried adding a parameter block with the same double pointer, "
+        << values << ", twice, but with different block sizes. Original "
+        << "size was " << existing_size << " but new size is "
+        << size;
+    return it->second;
+  }
+  // Before adding the parameter block, also check that it doesn't alias any
+  // other parameter blocks.
+  if (!parameter_map->empty()) {
+    ParameterMap::iterator lb = parameter_map->lower_bound(values);
+
+    // If lb is not the first block, check the previous block for aliasing.
+    if (lb != parameter_map->begin()) {
+      ParameterMap::iterator previous = lb;
+      --previous;
+      CheckForNoAliasing(previous->first,
+                         previous->second->Size(),
+                         values,
+                         size);
+    }
+
+    // If lb is not off the end, check lb for aliasing.
+    if (lb != parameter_map->end()) {
+      CheckForNoAliasing(lb->first,
+                         lb->second->Size(),
+                         values,
+                         size);
+    }
+  }
+  ParameterBlock* new_parameter_block = new ParameterBlock(values, size);
+  (*parameter_map)[values] = new_parameter_block;
+  parameter_blocks->push_back(new_parameter_block);
+  return new_parameter_block;
+}
+
+ProblemImpl::ProblemImpl() : program_(new internal::Program) {}
+ProblemImpl::ProblemImpl(const Problem::Options& options)
+    : options_(options),
+      program_(new internal::Program) {}
+
+ProblemImpl::~ProblemImpl() {
+  // Collect the unique cost/loss functions and delete the residuals.
+  set<CostFunction*> cost_functions;
+  set<LossFunction*> loss_functions;
+  for (int i = 0; i < program_->residual_blocks_.size(); ++i) {
+    ResidualBlock* residual_block = program_->residual_blocks_[i];
+
+    // The const casts here are legit, since ResidualBlock holds these
+    // pointers as const pointers but we have ownership of them and
+    // have the right to destroy them when the destructor is called.
+    if (options_.cost_function_ownership == TAKE_OWNERSHIP) {
+      cost_functions.insert(
+          const_cast<CostFunction*>(residual_block->cost_function()));
+    }
+    if (options_.loss_function_ownership == TAKE_OWNERSHIP) {
+      loss_functions.insert(
+          const_cast<LossFunction*>(residual_block->loss_function()));
+    }
+
+    delete residual_block;
+  }
+
+  // Collect the unique parameterizations and delete the parameters.
+  set<LocalParameterization*> local_parameterizations;
+  for (int i = 0; i < program_->parameter_blocks_.size(); ++i) {
+    ParameterBlock* parameter_block = program_->parameter_blocks_[i];
+
+    if (options_.local_parameterization_ownership == TAKE_OWNERSHIP) {
+      local_parameterizations.insert(parameter_block->local_parameterization_);
+    }
+
+    delete parameter_block;
+  }
+
+  // Delete the owned cost/loss functions and parameterizations.
+  STLDeleteContainerPointers(local_parameterizations.begin(),
+                             local_parameterizations.end());
+  STLDeleteContainerPointers(cost_functions.begin(),
+                             cost_functions.end());
+  STLDeleteContainerPointers(loss_functions.begin(),
+                             loss_functions.end());
+}
+
+const ResidualBlock* ProblemImpl::AddResidualBlock(
+    CostFunction* cost_function,
+    LossFunction* loss_function,
+    const vector<double*>& parameter_blocks) {
+  CHECK_NOTNULL(cost_function);
+  CHECK_EQ(parameter_blocks.size(),
+           cost_function->parameter_block_sizes().size());
+
+  // Check the sizes match.
+  const vector<int16>& parameter_block_sizes =
+      cost_function->parameter_block_sizes();
+  CHECK_EQ(parameter_block_sizes.size(), parameter_blocks.size())
+      << "Number of blocks input is different than the number of blocks "
+      << "that the cost function expects.";
+
+  // Check for duplicate parameter blocks.
+  vector<double*> sorted_parameter_blocks(parameter_blocks);
+  sort(sorted_parameter_blocks.begin(), sorted_parameter_blocks.end());
+  vector<double*>::const_iterator duplicate_items =
+      unique(sorted_parameter_blocks.begin(),
+             sorted_parameter_blocks.end());
+  if (duplicate_items != sorted_parameter_blocks.end()) {
+    string blocks;
+    for (int i = 0; i < parameter_blocks.size(); ++i) {
+      blocks += internal::StringPrintf(" %p ", parameter_blocks[i]);
+    }
+
+    LOG(FATAL) << "Duplicate parameter blocks in a residual parameter "
+               << "are not allowed. Parameter block pointers: ["
+               << blocks << "]";
+  }
+
+  // Add parameter blocks and convert the double*'s to parameter blocks.
+  vector<ParameterBlock*> parameter_block_ptrs(parameter_blocks.size());
+  for (int i = 0; i < parameter_blocks.size(); ++i) {
+    parameter_block_ptrs[i] =
+        InternalAddParameterBlock(parameter_blocks[i],
+                                  parameter_block_sizes[i],
+                                  &parameter_block_map_,
+                                  &program_->parameter_blocks_);
+  }
+
+  // Check that the block sizes match the block sizes expected by the
+  // cost_function.
+  for (int i = 0; i < parameter_block_ptrs.size(); ++i) {
+    CHECK_EQ(cost_function->parameter_block_sizes()[i],
+             parameter_block_ptrs[i]->Size())
+        << "The cost function expects parameter block " << i
+        << " of size " << cost_function->parameter_block_sizes()[i]
+        << " but was given a block of size "
+        << parameter_block_ptrs[i]->Size();
+  }
+
+  ResidualBlock* new_residual_block =
+      new ResidualBlock(cost_function,
+                        loss_function,
+                        parameter_block_ptrs);
+  program_->residual_blocks_.push_back(new_residual_block);
+  return new_residual_block;
+}
+
+// Unfortunately, macros don't help much to reduce this code, and var args don't
+// work because of the ambiguous case that there is no loss function.
+const ResidualBlock* ProblemImpl::AddResidualBlock(
+    CostFunction* cost_function,
+    LossFunction* loss_function,
+    double* x0) {
+  vector<double*> residual_parameters;
+  residual_parameters.push_back(x0);
+  return AddResidualBlock(cost_function, loss_function, residual_parameters);
+}
+
+const ResidualBlock* ProblemImpl::AddResidualBlock(
+    CostFunction* cost_function,
+    LossFunction* loss_function,
+    double* x0, double* x1) {
+  vector<double*> residual_parameters;
+  residual_parameters.push_back(x0);
+  residual_parameters.push_back(x1);
+  return AddResidualBlock(cost_function, loss_function, residual_parameters);
+}
+
+const ResidualBlock* ProblemImpl::AddResidualBlock(
+    CostFunction* cost_function,
+    LossFunction* loss_function,
+    double* x0, double* x1, double* x2) {
+  vector<double*> residual_parameters;
+  residual_parameters.push_back(x0);
+  residual_parameters.push_back(x1);
+  residual_parameters.push_back(x2);
+  return AddResidualBlock(cost_function, loss_function, residual_parameters);
+}
+
+const ResidualBlock* ProblemImpl::AddResidualBlock(
+    CostFunction* cost_function,
+    LossFunction* loss_function,
+    double* x0, double* x1, double* x2, double* x3) {
+  vector<double*> residual_parameters;
+  residual_parameters.push_back(x0);
+  residual_parameters.push_back(x1);
+  residual_parameters.push_back(x2);
+  residual_parameters.push_back(x3);
+  return AddResidualBlock(cost_function, loss_function, residual_parameters);
+}
+
+const ResidualBlock* ProblemImpl::AddResidualBlock(
+    CostFunction* cost_function,
+    LossFunction* loss_function,
+    double* x0, double* x1, double* x2, double* x3, double* x4) {
+  vector<double*> residual_parameters;
+  residual_parameters.push_back(x0);
+  residual_parameters.push_back(x1);
+  residual_parameters.push_back(x2);
+  residual_parameters.push_back(x3);
+  residual_parameters.push_back(x4);
+  return AddResidualBlock(cost_function, loss_function, residual_parameters);
+}
+
+const ResidualBlock* ProblemImpl::AddResidualBlock(
+    CostFunction* cost_function,
+    LossFunction* loss_function,
+    double* x0, double* x1, double* x2, double* x3, double* x4, double* x5) {
+  vector<double*> residual_parameters;
+  residual_parameters.push_back(x0);
+  residual_parameters.push_back(x1);
+  residual_parameters.push_back(x2);
+  residual_parameters.push_back(x3);
+  residual_parameters.push_back(x4);
+  residual_parameters.push_back(x5);
+  return AddResidualBlock(cost_function, loss_function, residual_parameters);
+}
+
+
+void ProblemImpl::AddParameterBlock(double* values, int size) {
+  InternalAddParameterBlock(values,
+                            size,
+                            &parameter_block_map_,
+                            &program_->parameter_blocks_);
+}
+
+void ProblemImpl::AddParameterBlock(
+    double* values,
+    int size,
+    LocalParameterization* local_parameterization) {
+  ParameterBlock* parameter_block =
+      InternalAddParameterBlock(values,
+                                size,
+                                &parameter_block_map_,
+                                &program_->parameter_blocks_);
+  if (local_parameterization != NULL) {
+    parameter_block->SetParameterization(local_parameterization);
+  }
+}
+
+void ProblemImpl::SetParameterBlockConstant(double* values) {
+  FindOrDie(parameter_block_map_, values)->SetConstant();
+}
+
+void ProblemImpl::SetParameterBlockVariable(double* values) {
+  FindOrDie(parameter_block_map_, values)->SetVarying();
+}
+
+void ProblemImpl::SetParameterization(
+    double* values,
+    LocalParameterization* local_parameterization) {
+  FindOrDie(parameter_block_map_, values)
+      ->SetParameterization(local_parameterization);
+}
+
+int ProblemImpl::NumParameterBlocks() const {
+  return program_->NumParameterBlocks();
+}
+
+int ProblemImpl::NumParameters() const {
+  return program_->NumParameters();
+}
+
+int ProblemImpl::NumResidualBlocks() const {
+  return program_->NumResidualBlocks();
+}
+
+int ProblemImpl::NumResiduals() const {
+  return program_->NumResiduals();
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/problem_impl.h b/extern/libmv/third_party/ceres/internal/ceres/problem_impl.h
new file mode 100644
index 00000000000..523860e652a
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/problem_impl.h
@@ -0,0 +1,127 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//
+// This is the implementation of the public Problem API. The pointer to
+// implementation (PIMPL) idiom makes it possible for Ceres internal code to
+// refer to the private data members without needing to exposing it to the
+// world. An alternative to PIMPL is to have a factory which returns instances
+// of a virtual base class; while that approach would work, it requires clients
+// to always put a Problem object into a scoped pointer; this needlessly muddies
+// client code for little benefit. Therefore, the PIMPL comprise was chosen.
+
+#ifndef CERES_PUBLIC_PROBLEM_IMPL_H_
+#define CERES_PUBLIC_PROBLEM_IMPL_H_
+
+#include <map>
+#include <vector>
+
+#include "ceres/internal/macros.h"
+#include "ceres/internal/port.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/problem.h"
+#include "ceres/types.h"
+
+namespace ceres {
+
+class CostFunction;
+class LossFunction;
+class LocalParameterization;
+
+namespace internal {
+
+class Program;
+class ResidualBlock;
+
+class ProblemImpl {
+ public:
+  typedef map<double*, ParameterBlock*> ParameterMap;
+
+  ProblemImpl();
+  explicit ProblemImpl(const Problem::Options& options);
+
+  ~ProblemImpl();
+
+  // See the public problem.h file for description of these methods.
+  ResidualBlockId AddResidualBlock(CostFunction* cost_function,
+                                   LossFunction* loss_function,
+                                   const vector<double*>& parameter_blocks);
+  ResidualBlockId AddResidualBlock(CostFunction* cost_function,
+                                   LossFunction* loss_function,
+                                   double* x0);
+  ResidualBlockId AddResidualBlock(CostFunction* cost_function,
+                                   LossFunction* loss_function,
+                                   double* x0, double* x1);
+  ResidualBlockId AddResidualBlock(CostFunction* cost_function,
+                                   LossFunction* loss_function,
+                                   double* x0, double* x1, double* x2);
+  ResidualBlockId AddResidualBlock(CostFunction* cost_function,
+                                   LossFunction* loss_function,
+                                   double* x0, double* x1, double* x2,
+                                   double* x3);
+  ResidualBlockId AddResidualBlock(CostFunction* cost_function,
+                                   LossFunction* loss_function,
+                                   double* x0, double* x1, double* x2,
+                                   double* x3, double* x4);
+  ResidualBlockId AddResidualBlock(CostFunction* cost_function,
+                                   LossFunction* loss_function,
+                                   double* x0, double* x1, double* x2,
+                                   double* x3, double* x4, double* x5);
+  void AddParameterBlock(double* values, int size);
+  void AddParameterBlock(double* values,
+                         int size,
+                         LocalParameterization* local_parameterization);
+  void SetParameterBlockConstant(double* values);
+  void SetParameterBlockVariable(double* values);
+  void SetParameterization(double* values,
+                           LocalParameterization* local_parameterization);
+  int NumParameterBlocks() const;
+  int NumParameters() const;
+  int NumResidualBlocks() const;
+  int NumResiduals() const;
+
+  const Program& program() const { return *program_; }
+  Program* mutable_program() { return program_.get(); }
+
+  const ParameterMap& parameter_map() const { return parameter_block_map_; }
+
+ private:
+  const Problem::Options options_;
+
+  // The mapping from user pointers to parameter blocks.
+  map<double*, ParameterBlock*> parameter_block_map_;
+
+  internal::scoped_ptr<internal::Program> program_;
+  DISALLOW_COPY_AND_ASSIGN(ProblemImpl);
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_PUBLIC_PROBLEM_IMPL_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/program.cc b/extern/libmv/third_party/ceres/internal/ceres/program.cc
new file mode 100644
index 00000000000..444b1020253
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/program.cc
@@ -0,0 +1,233 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+
+#include "ceres/program.h"
+
+#include <map>
+#include <vector>
+#include "ceres/parameter_block.h"
+#include "ceres/residual_block.h"
+#include "ceres/stl_util.h"
+#include "ceres/map_util.h"
+#include "ceres/problem.h"
+#include "ceres/cost_function.h"
+#include "ceres/loss_function.h"
+#include "ceres/local_parameterization.h"
+
+namespace ceres {
+namespace internal {
+
+Program::Program() {}
+
+Program::Program(const Program& program)
+    : parameter_blocks_(program.parameter_blocks_),
+      residual_blocks_(program.residual_blocks_) {
+}
+
+const vector<ParameterBlock*>& Program::parameter_blocks() const {
+  return parameter_blocks_;
+}
+
+const vector<ResidualBlock*>& Program::residual_blocks() const {
+  return residual_blocks_;
+}
+
+vector<ParameterBlock*>* Program::mutable_parameter_blocks() {
+  return &parameter_blocks_;
+}
+
+vector<ResidualBlock*>* Program::mutable_residual_blocks() {
+  return &residual_blocks_;
+}
+
+bool Program::StateVectorToParameterBlocks(const double *state) {
+  for (int i = 0; i < parameter_blocks_.size(); ++i) {
+    if (!parameter_blocks_[i]->SetState(state)) {
+      return false;
+    }
+    state += parameter_blocks_[i]->Size();
+  }
+  return true;
+}
+
+void Program::ParameterBlocksToStateVector(double *state) const {
+  for (int i = 0; i < parameter_blocks_.size(); ++i) {
+    parameter_blocks_[i]->GetState(state);
+    state += parameter_blocks_[i]->Size();
+  }
+}
+
+void Program::CopyParameterBlockStateToUserState() {
+  for (int i = 0; i < parameter_blocks_.size(); ++i) {
+    parameter_blocks_[i]->GetState(
+        parameter_blocks_[i]->mutable_user_state());
+  }
+}
+
+bool Program::Plus(const double* state,
+                   const double* delta,
+                   double* state_plus_delta) const {
+  for (int i = 0; i < parameter_blocks_.size(); ++i) {
+    if (!parameter_blocks_[i]->Plus(state, delta, state_plus_delta)) {
+      return false;
+    }
+    state += parameter_blocks_[i]->Size();
+    delta += parameter_blocks_[i]->LocalSize();
+    state_plus_delta += parameter_blocks_[i]->Size();
+  }
+  return true;
+}
+
+void Program::SetParameterOffsetsAndIndex() {
+  // Set positions for all parameters appearing as arguments to residuals to one
+  // past the end of the parameter block array.
+  for (int i = 0; i < residual_blocks_.size(); ++i) {
+    ResidualBlock* residual_block = residual_blocks_[i];
+    for (int j = 0; j < residual_block->NumParameterBlocks(); ++j) {
+      residual_block->parameter_blocks()[j]->set_index(-1);
+    }
+  }
+  // For parameters that appear in the program, set their position and offset.
+  int state_offset = 0;
+  int delta_offset = 0;
+  for (int i = 0; i < parameter_blocks_.size(); ++i) {
+    parameter_blocks_[i]->set_index(i);
+    parameter_blocks_[i]->set_state_offset(state_offset);
+    parameter_blocks_[i]->set_delta_offset(delta_offset);
+    state_offset += parameter_blocks_[i]->Size();
+    delta_offset += parameter_blocks_[i]->LocalSize();
+  }
+}
+
+int Program::NumResidualBlocks() const {
+  return residual_blocks_.size();
+}
+
+int Program::NumParameterBlocks() const {
+  return parameter_blocks_.size();
+}
+
+int Program::NumResiduals() const {
+  int num_residuals = 0;
+  for (int i = 0; i < residual_blocks_.size(); ++i) {
+    num_residuals += residual_blocks_[i]->NumResiduals();
+  }
+  return num_residuals;
+}
+
+int Program::NumParameters() const {
+  int num_parameters = 0;
+  for (int i = 0; i < parameter_blocks_.size(); ++i) {
+    num_parameters += parameter_blocks_[i]->Size();
+  }
+  return num_parameters;
+}
+
+int Program::NumEffectiveParameters() const {
+  int num_parameters = 0;
+  for (int i = 0; i < parameter_blocks_.size(); ++i) {
+    num_parameters += parameter_blocks_[i]->LocalSize();
+  }
+  return num_parameters;
+}
+
+int Program::MaxScratchDoublesNeededForEvaluate() const {
+  // Compute the scratch space needed for evaluate.
+  int max_scratch_bytes_for_evaluate = 0;
+  for (int i = 0; i < residual_blocks_.size(); ++i) {
+    max_scratch_bytes_for_evaluate =
+        max(max_scratch_bytes_for_evaluate,
+            residual_blocks_[i]->NumScratchDoublesForEvaluate());
+  }
+  return max_scratch_bytes_for_evaluate;
+}
+
+int Program::MaxDerivativesPerResidualBlock() const {
+  int max_derivatives = 0;
+  for (int i = 0; i < residual_blocks_.size(); ++i) {
+    int derivatives = 0;
+    ResidualBlock* residual_block = residual_blocks_[i];
+    int num_parameters = residual_block->NumParameterBlocks();
+    for (int j = 0; j < num_parameters; ++j) {
+      derivatives += residual_block->NumResiduals() *
+                     residual_block->parameter_blocks()[j]->LocalSize();
+    }
+    max_derivatives = max(max_derivatives, derivatives);
+  }
+  return max_derivatives;
+}
+
+int Program::MaxParametersPerResidualBlock() const {
+  int max_parameters = 0;
+  for (int i = 0; i < residual_blocks_.size(); ++i) {
+    max_parameters = max(max_parameters,
+                         residual_blocks_[i]->NumParameterBlocks());
+  }
+  return max_parameters;
+}
+
+bool Program::Evaluate(double* cost, double* residuals) {
+  *cost = 0.0;
+
+  // Scratch space is only needed if residuals is NULL.
+  scoped_array<double> scratch;
+  if (residuals == NULL) {
+    scratch.reset(new double[MaxScratchDoublesNeededForEvaluate()]);
+  } else {
+    // TODO(keir): Is this needed? Check by removing the equivalent statement in
+    // dense_evaluator.cc and running the tests.
+    VectorRef(residuals, NumResiduals()).setZero();
+  }
+
+  for (int i = 0; i < residual_blocks_.size(); ++i) {
+    ResidualBlock* residual_block = residual_blocks_[i];
+
+    // Evaluate the cost function for this residual.
+    double residual_cost;
+    if (!residual_block->Evaluate(&residual_cost,
+                                  residuals,
+                                  NULL,  // No jacobian.
+                                  scratch.get())) {
+      return false;
+    }
+
+    // Accumulate residual cost into the total cost.
+    *cost += residual_cost;
+
+    // Update the residuals cursor.
+    if (residuals != NULL) {
+      residuals += residual_block->NumResiduals();
+    }
+  }
+  return true;
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/program.h b/extern/libmv/third_party/ceres/internal/ceres/program.h
new file mode 100644
index 00000000000..113d352d562
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/program.h
@@ -0,0 +1,128 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+
+#ifndef CERES_INTERNAL_PROGRAM_H_
+#define CERES_INTERNAL_PROGRAM_H_
+
+#include <vector>
+#include "ceres/internal/port.h"
+
+namespace ceres {
+namespace internal {
+
+class ParameterBlock;
+class ProblemImpl;
+class ResidualBlock;
+
+// A nonlinear least squares optimization problem. This is different from the
+// similarly-named "Problem" object, which offers a mutation interface for
+// adding and modifying parameters and residuals. The Program contains the core
+// part of the Problem, which is the parameters and the residuals, stored in a
+// particular ordering. The ordering is critical, since it defines the mapping
+// between (residual, parameter) pairs and a position in the jacobian of the
+// objective function. Various parts of Ceres transform one Program into
+// another; for example, the first stage of solving involves stripping all
+// constant parameters and residuals. This is in contrast with Problem, which is
+// not built for transformation.
+class Program {
+ public:
+  Program();
+  explicit Program(const Program& program);
+
+  // The ordered parameter and residual blocks for the program.
+  const vector<ParameterBlock*>& parameter_blocks() const;
+  const vector<ResidualBlock*>& residual_blocks() const;
+  vector<ParameterBlock*>* mutable_parameter_blocks();
+  vector<ResidualBlock*>* mutable_residual_blocks();
+
+  // Serialize to/from the program and update states.
+  //
+  // NOTE: Setting the state of a parameter block can trigger the
+  // computation of the Jacobian of its local parameterization. If
+  // this computation fails for some reason, then this method returns
+  // false and the state of the parameter blocks cannot be trusted.
+  bool StateVectorToParameterBlocks(const double *state);
+  void ParameterBlocksToStateVector(double *state) const;
+
+  // Copy internal state out to the user's parameters.
+  void CopyParameterBlockStateToUserState();
+
+  // Update a state vector for the program given a delta.
+  bool Plus(const double* state,
+            const double* delta,
+            double* state_plus_delta) const;
+
+  // Set the parameter indices and offsets. This permits mapping backward
+  // from a ParameterBlock* to an index in the parameter_blocks() vector. For
+  // any parameter block p, after calling SetParameterOffsetsAndIndex(), it
+  // is true that
+  //
+  //   parameter_blocks()[p->index()] == p
+  //
+  // If a parameter appears in a residual but not in the parameter block, then
+  // it will have an index of -1.
+  //
+  // This also updates p->state_offset() and p->delta_offset(), which are the
+  // position of the parameter in the state and delta vector respectively.
+  void SetParameterOffsetsAndIndex();
+
+  // See problem.h for what these do.
+  int NumParameterBlocks() const;
+  int NumParameters() const;
+  int NumEffectiveParameters() const;
+  int NumResidualBlocks() const;
+  int NumResiduals() const;
+
+  int MaxScratchDoublesNeededForEvaluate() const;
+  int MaxDerivativesPerResidualBlock() const;
+  int MaxParametersPerResidualBlock() const;
+
+  // Evaluate the cost and maybe the residuals for the program. If residuals is
+  // NULL, then residuals are not calculated. If the jacobian is needed, instead
+  // use the various evaluators (e.g. dense_evaluator.h).
+  //
+  // This is a trivial implementation of evaluate not intended for use in the
+  // core solving loop. The other evaluators, which support constructing the
+  // jacobian in addition to the cost and residuals, are considerably
+  // complicated by the need to construct the jacobian.
+  bool Evaluate(double* cost, double* residuals);
+
+ private:
+  // The Program does not own the ParameterBlock or ResidualBlock objects.
+  vector<ParameterBlock*> parameter_blocks_;
+  vector<ResidualBlock*> residual_blocks_;
+
+  friend class ProblemImpl;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_PROGRAM_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/program_evaluator.h b/extern/libmv/third_party/ceres/internal/ceres/program_evaluator.h
new file mode 100644
index 00000000000..7ec74b1b269
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/program_evaluator.h
@@ -0,0 +1,279 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//
+// The ProgramEvaluator runs the cost functions contained in each residual block
+// and stores the result into a jacobian. The particular type of jacobian is
+// abstracted out using two template parameters:
+//
+//   - An "EvaluatePreparer" that is responsible for creating the array with
+//     pointers to the jacobian blocks where the cost function evaluates to.
+//   - A "JacobianWriter" that is responsible for storing the resulting
+//     jacobian blocks in the passed sparse matrix.
+//
+// This abstraction affords an efficient evaluator implementation while still
+// supporting writing to multiple sparse matrix formats. For example, when the
+// ProgramEvaluator is parameterized for writing to block sparse matrices, the
+// residual jacobians are written directly into their final position in the
+// block sparse matrix by the user's CostFunction; there is no copying.
+//
+// The evaluation is threaded with OpenMP.
+//
+// The EvaluatePreparer and JacobianWriter interfaces are as follows:
+//
+//   class EvaluatePreparer {
+//     // Prepare the jacobians array for use as the destination of a call to
+//     // a cost function's evaluate method.
+//     void Prepare(const ResidualBlock* residual_block,
+//                  int residual_block_index,
+//                  SparseMatrix* jacobian,
+//                  double** jacobians);
+//   }
+//
+//   class JacobianWriter {
+//     // Create a jacobian that this writer can write. Same as
+//     // Evaluator::CreateJacobian.
+//     SparseMatrix* CreateJacobian() const;
+//
+//     // Create num_threads evaluate preparers. Caller owns result which must
+//     // be freed with delete[]. Resulting preparers are valid while *this is.
+//     EvaluatePreparer* CreateEvaluatePreparers(int num_threads);
+//
+//     // Write the block jacobians from a residual block evaluation to the
+//     // larger sparse jacobian.
+//     void Write(int residual_id,
+//                int residual_offset,
+//                double** jacobians,
+//                SparseMatrix* jacobian);
+//   }
+//
+// Note: The ProgramEvaluator is not thread safe, since internally it maintains
+// some per-thread scratch space.
+
+#ifndef CERES_INTERNAL_PROGRAM_EVALUATOR_H_
+#define CERES_INTERNAL_PROGRAM_EVALUATOR_H_
+
+#ifdef CERES_USE_OPENMP
+#include <omp.h>
+#endif
+
+#include "ceres/parameter_block.h"
+#include "ceres/program.h"
+#include "ceres/residual_block.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/scoped_ptr.h"
+
+namespace ceres {
+namespace internal {
+
+template<typename EvaluatePreparer, typename JacobianWriter>
+class ProgramEvaluator : public Evaluator {
+ public:
+  ProgramEvaluator(const Evaluator::Options &options, Program* program)
+      : options_(options),
+        program_(program),
+        jacobian_writer_(options, program),
+        evaluate_preparers_(
+            jacobian_writer_.CreateEvaluatePreparers(options.num_threads)) {
+#ifndef CERES_USE_OPENMP
+    CHECK_EQ(1, options_.num_threads)
+        << "OpenMP support is not compiled into this binary; "
+        << "only options.num_threads=1 is supported.";
+#endif
+
+    BuildResidualLayout(*program, &residual_layout_);
+    evaluate_scratch_.reset(CreateEvaluatorScratch(*program,
+                                                   options.num_threads));
+  }
+
+  // Implementation of Evaluator interface.
+  SparseMatrix* CreateJacobian() const {
+    return jacobian_writer_.CreateJacobian();
+  }
+
+  bool Evaluate(const double* state,
+                double* cost,
+                double* residuals,
+                SparseMatrix* jacobian) {
+    // The parameters are stateful, so set the state before evaluating.
+    if (!program_->StateVectorToParameterBlocks(state)) {
+      return false;
+    }
+
+    if (jacobian) {
+      jacobian->SetZero();
+    }
+
+    // Each thread gets it's own cost and evaluate scratch space.
+    for (int i = 0; i < options_.num_threads; ++i) {
+      evaluate_scratch_[i].cost = 0.0;
+    }
+
+    // This bool is used to disable the loop if an error is encountered
+    // without breaking out of it. The remaining loop iterations are still run,
+    // but with an empty body, and so will finish quickly.
+    bool abort = false;
+    int num_residual_blocks = program_->NumResidualBlocks();
+#pragma omp parallel for num_threads(options_.num_threads)
+    for (int i = 0; i < num_residual_blocks; ++i) {
+// Disable the loop instead of breaking, as required by OpenMP.
+#pragma omp flush(abort)
+      if (abort) {
+        continue;
+      }
+
+#ifdef CERES_USE_OPENMP
+      int thread_id = omp_get_thread_num();
+#else
+      int thread_id = 0;
+#endif
+      EvaluatePreparer* preparer = &evaluate_preparers_[thread_id];
+      EvaluateScratch* scratch = &evaluate_scratch_[thread_id];
+
+      // Prepare block residuals if requested.
+      const ResidualBlock* residual_block = program_->residual_blocks()[i];
+      double* block_residuals = (residuals != NULL)
+                              ? (residuals + residual_layout_[i])
+                              : NULL;
+
+      // Prepare block jacobians if requested.
+      double** block_jacobians = NULL;
+      if (jacobian != NULL) {
+        preparer->Prepare(residual_block,
+                          i,
+                          jacobian,
+                          scratch->jacobian_block_ptrs.get());
+        block_jacobians = scratch->jacobian_block_ptrs.get();
+      }
+
+      // Evaluate the cost, residuals, and jacobians.
+      double block_cost;
+      if (!residual_block->Evaluate(&block_cost,
+                                    block_residuals,
+                                    block_jacobians,
+                                    scratch->scratch.get())) {
+        abort = true;
+// This ensures that the OpenMP threads have a consistent view of 'abort'. Do
+// the flush inside the failure case so that there is usually only one
+// synchronization point per loop iteration instead of two.
+#pragma omp flush(abort)
+        continue;
+      }
+
+      scratch->cost += block_cost;
+
+      if (jacobian != NULL) {
+        jacobian_writer_.Write(i,
+                               residual_layout_[i],
+                               block_jacobians,
+                               jacobian);
+      }
+    }
+
+    if (!abort) {
+      // Sum the cost from each thread.
+      (*cost) = 0.0;
+      for (int i = 0; i < options_.num_threads; ++i) {
+        (*cost) += evaluate_scratch_[i].cost;
+      }
+    }
+    return !abort;
+  }
+
+  bool Plus(const double* state,
+            const double* delta,
+            double* state_plus_delta) const {
+    return program_->Plus(state, delta, state_plus_delta);
+  }
+
+  int NumParameters() const {
+    return program_->NumParameters();
+  }
+  int NumEffectiveParameters() const {
+    return program_->NumEffectiveParameters();
+  }
+
+  int NumResiduals() const {
+    return program_->NumResiduals();
+  }
+
+ private:
+  struct EvaluateScratch {
+    void Init(int max_parameters_per_residual_block,
+              int max_scratch_doubles_needed_for_evaluate) {
+      jacobian_block_ptrs.reset(
+          new double*[max_parameters_per_residual_block]);
+      scratch.reset(new double[max_scratch_doubles_needed_for_evaluate]);
+    }
+
+    double cost;
+    scoped_array<double> scratch;
+    scoped_array<double*> jacobian_block_ptrs;
+  };
+
+  static void BuildResidualLayout(const Program& program,
+                                  vector<int>* residual_layout) {
+    const vector<ResidualBlock*>& residual_blocks = program.residual_blocks();
+    residual_layout->resize(program.NumResidualBlocks());
+    int residual_pos = 0;
+    for (int i = 0; i < residual_blocks.size(); ++i) {
+      const int num_residuals = residual_blocks[i]->NumResiduals();
+      (*residual_layout)[i] = residual_pos;
+      residual_pos += num_residuals;
+    }
+  }
+
+  // Create scratch space for each thread evaluating the program.
+  static EvaluateScratch* CreateEvaluatorScratch(const Program& program,
+                                                 int num_threads) {
+    int max_parameters_per_residual_block =
+        program.MaxParametersPerResidualBlock();
+    int max_scratch_doubles_needed_for_evaluate =
+        program.MaxScratchDoublesNeededForEvaluate();
+
+    EvaluateScratch* evaluate_scratch = new EvaluateScratch[num_threads];
+    for (int i = 0; i < num_threads; i++) {
+      evaluate_scratch[i].Init(max_parameters_per_residual_block,
+                               max_scratch_doubles_needed_for_evaluate);
+    }
+    return evaluate_scratch;
+  }
+
+  Evaluator::Options options_;
+  Program* program_;
+  JacobianWriter jacobian_writer_;
+  scoped_array<EvaluatePreparer> evaluate_preparers_;
+  scoped_array<EvaluateScratch> evaluate_scratch_;
+  vector<int> residual_layout_;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_PROGRAM_EVALUATOR_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/random.h b/extern/libmv/third_party/ceres/internal/ceres/random.h
new file mode 100644
index 00000000000..769e0b4dd27
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/random.h
@@ -0,0 +1,47 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+
+#ifndef CERES_INTERNAL_RANDOM_H_
+#define CERES_INTERNAL_RANDOM_H_
+
+namespace ceres {
+
+inline double RandDouble() {
+  double r = rand();
+  return r / RAND_MAX;
+}
+
+inline int Uniform(int n) {
+  return rand() % n;
+}
+
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_RANDOM_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/residual_block.cc b/extern/libmv/third_party/ceres/internal/ceres/residual_block.cc
new file mode 100644
index 00000000000..03867891dba
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/residual_block.cc
@@ -0,0 +1,212 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//         sameeragarwal@google.com (Sameer Agarwal)
+
+#include "ceres/residual_block.h"
+
+#include <algorithm>
+#include <cstddef>
+#include <vector>
+
+#include "ceres/corrector.h"
+#include "ceres/parameter_block.h"
+#include "ceres/residual_block_utils.h"
+#include "ceres/cost_function.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/fixed_array.h"
+#include "ceres/local_parameterization.h"
+#include "ceres/loss_function.h"
+
+namespace ceres {
+namespace internal {
+
+ResidualBlock::ResidualBlock(const CostFunction* cost_function,
+                             const LossFunction* loss_function,
+                             const vector<ParameterBlock*>& parameter_blocks)
+    : cost_function_(cost_function),
+      loss_function_(loss_function),
+      parameter_blocks_(
+          new ParameterBlock* [
+              cost_function->parameter_block_sizes().size()]) {
+  std::copy(parameter_blocks.begin(),
+            parameter_blocks.end(),
+            parameter_blocks_.get());
+}
+
+bool ResidualBlock::Evaluate(double* cost,
+                             double* residuals,
+                             double** jacobians,
+                             double* scratch) const {
+  const int num_parameter_blocks = NumParameterBlocks();
+  const int num_residuals = cost_function_->num_residuals();
+
+  // Collect the parameters from their blocks. This will rarely allocate, since
+  // residuals taking more than 8 parameter block arguments are rare.
+  FixedArray<const double*, 8> parameters(num_parameter_blocks);
+  for (int i = 0; i < num_parameter_blocks; ++i) {
+    parameters[i] = parameter_blocks_[i]->state();
+  }
+
+  // Put pointers into the scratch space into global_jacobians as appropriate.
+  FixedArray<double*, 8> global_jacobians(num_parameter_blocks);
+  if (jacobians != NULL) {
+    for (int i = 0; i < num_parameter_blocks; ++i) {
+      const ParameterBlock* parameter_block = parameter_blocks_[i];
+      if (jacobians[i] != NULL &&
+          parameter_block->LocalParameterizationJacobian() != NULL) {
+        global_jacobians[i] = scratch;
+        scratch += num_residuals * parameter_block->Size();
+      } else {
+        global_jacobians[i] = jacobians[i];
+      }
+    }
+  }
+
+  // If the caller didn't request residuals, use the scratch space for them.
+  bool outputting_residuals = (residuals != NULL);
+  if (!outputting_residuals) {
+    residuals = scratch;
+  }
+
+  // Invalidate the evaluation buffers so that we can check them after
+  // the CostFunction::Evaluate call, to see if all the return values
+  // that were required were written to and that they are finite.
+  double** eval_jacobians = (jacobians != NULL) ? global_jacobians.get() : NULL;
+
+  InvalidateEvaluation(*this, cost, residuals, eval_jacobians);
+
+  if (!cost_function_->Evaluate(parameters.get(), residuals, eval_jacobians) ||
+      !IsEvaluationValid(*this,
+                         parameters.get(),
+                         cost,
+                         residuals,
+                         eval_jacobians)) {
+    string message =
+        "\n\n"
+        "Error in evaluating the ResidualBlock.\n\n"
+        "There are two possible reasons. Either the CostFunction did not evaluate and fill all    \n"  // NOLINT
+        "residual and jacobians that were requested or there was a non-finite value (nan/infinite)\n"  // NOLINT
+        "generated during the or jacobian computation. \n\n" +
+        EvaluationToString(*this,
+                           parameters.get(),
+                           cost,
+                           residuals,
+                           eval_jacobians);
+    LOG(WARNING) << message;
+    return false;
+  }
+
+  double squared_norm = VectorRef(residuals, num_residuals).squaredNorm();
+
+  // Update the jacobians with the local parameterizations.
+  if (jacobians != NULL) {
+    for (int i = 0; i < num_parameter_blocks; ++i) {
+      if (jacobians[i] != NULL) {
+        const ParameterBlock* parameter_block = parameter_blocks_[i];
+
+        // Apply local reparameterization to the jacobians.
+        if (parameter_block->LocalParameterizationJacobian() != NULL) {
+          ConstMatrixRef local_to_global(
+              parameter_block->LocalParameterizationJacobian(),
+              parameter_block->Size(),
+              parameter_block->LocalSize());
+          MatrixRef global_jacobian(global_jacobians[i],
+                                    num_residuals,
+                                    parameter_block->Size());
+          MatrixRef local_jacobian(jacobians[i],
+                                   num_residuals,
+                                   parameter_block->LocalSize());
+          local_jacobian.noalias() = global_jacobian * local_to_global;
+        }
+      }
+    }
+  }
+
+  if (loss_function_ == NULL) {
+    *cost = 0.5 * squared_norm;
+    return true;
+  }
+
+  double rho[3];
+  loss_function_->Evaluate(squared_norm, rho);
+  *cost = 0.5 * rho[0];
+
+  // No jacobians and not outputting residuals? All done. Doing an early exit
+  // here avoids constructing the "Corrector" object below in a common case.
+  if (jacobians == NULL && !outputting_residuals) {
+    return true;
+  }
+
+  // Correct for the effects of the loss function. The jacobians need to be
+  // corrected before the residuals, since they use the uncorrected residuals.
+  Corrector correct(squared_norm, rho);
+  if (jacobians != NULL) {
+    for (int i = 0; i < num_parameter_blocks; ++i) {
+      if (jacobians[i] != NULL) {
+        const ParameterBlock* parameter_block = parameter_blocks_[i];
+
+        // Correct the jacobians for the loss function.
+        correct.CorrectJacobian(num_residuals,
+                                parameter_block->LocalSize(),
+                                residuals,
+                                jacobians[i]);
+      }
+    }
+  }
+
+  // Correct the residuals with the loss function.
+  if (outputting_residuals) {
+    correct.CorrectResiduals(num_residuals, residuals);
+  }
+  return true;
+}
+
+int ResidualBlock::NumScratchDoublesForEvaluate() const {
+  // Compute the amount of scratch space needed to store the full-sized
+  // jacobians. For parameters that have no local parameterization  no storage
+  // is needed and the passed-in jacobian array is used directly. Also include
+  // space to store the residuals, which is needed for cost-only evaluations.
+  // This is slightly pessimistic, since both won't be needed all the time, but
+  // the amount of excess should not cause problems for the caller.
+  int num_parameters = NumParameterBlocks();
+  int scratch_doubles = 1;
+  for (int i = 0; i < num_parameters; ++i) {
+    const ParameterBlock* parameter_block = parameter_blocks_[i];
+    if (!parameter_block->IsConstant() &&
+        parameter_block->LocalParameterizationJacobian() != NULL) {
+      scratch_doubles += parameter_block->Size();
+    }
+  }
+  scratch_doubles *= NumResiduals();
+  return scratch_doubles;
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/residual_block.h b/extern/libmv/third_party/ceres/internal/ceres/residual_block.h
new file mode 100644
index 00000000000..e0a06e78958
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/residual_block.h
@@ -0,0 +1,124 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//         keir@google.com (Keir Mierle)
+//
+// Purpose : Class and struct definitions for parameter and residual blocks.
+
+#ifndef CERES_INTERNAL_RESIDUAL_BLOCK_H_
+#define CERES_INTERNAL_RESIDUAL_BLOCK_H_
+
+#include <vector>
+
+#include "ceres/cost_function.h"
+#include "ceres/internal/port.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/types.h"
+
+namespace ceres {
+
+class LossFunction;
+
+namespace internal {
+
+class ParameterBlock;
+
+// A term in the least squares problem. The mathematical form of each term in
+// the overall least-squares cost function is:
+//
+//    1
+//   --- loss_function( || cost_function(block1, block2, ...) ||^2  ),
+//    2
+//
+// Storing the cost function and the loss function separately permits optimizing
+// the problem with standard non-linear least techniques, without requiring a
+// more general non-linear solver.
+//
+// The residual block stores pointers to but does not own the cost functions,
+// loss functions, and parameter blocks.
+class ResidualBlock {
+ public:
+  ResidualBlock(const CostFunction* cost_function,
+                const LossFunction* loss_function,
+                const vector<ParameterBlock*>& parameter_blocks);
+
+  // Evaluates the residual term, storing the scalar cost in *cost, the residual
+  // components in *residuals, and the jacobians between the parameters and
+  // residuals in jacobians[i], in row-major order. If residuals is NULL, the
+  // residuals are not computed. If jacobians is NULL, no jacobians are
+  // computed. If jacobians[i] is NULL, then the jacobian for that parameter is
+  // not computed.
+  //
+  // Evaluate needs scratch space which must be supplied by the caller via
+  // scratch. The array should have at least NumScratchDoublesForEvaluate()
+  // space available.
+  //
+  // The return value indicates the success or failure. If the function returns
+  // false, the caller should expect the the output memory locations to have
+  // been modified.
+  //
+  // The returned cost and jacobians have had robustification and local
+  // parameterizations applied already; for example, the jacobian for a
+  // 4-dimensional quaternion parameter using the "QuaternionParameterization"
+  // is num_residuals by 3 instead of num_residuals by 4.
+  bool Evaluate(double* cost,
+                double* residuals,
+                double** jacobians,
+                double* scratch) const;
+
+  const CostFunction* cost_function() const { return cost_function_; }
+  const LossFunction* loss_function() const { return loss_function_; }
+
+  // Access the parameter blocks for this residual. The array has size
+  // NumParameterBlocks().
+  ParameterBlock* const* parameter_blocks() const {
+    return parameter_blocks_.get();
+  }
+
+  // Number of variable blocks that this residual term depends on.
+  int NumParameterBlocks() const {
+    return cost_function_->parameter_block_sizes().size();
+  }
+
+  // The size of the residual vector returned by this residual function.
+  int NumResiduals() const { return cost_function_->num_residuals(); }
+
+  // The minimum amount of scratch space needed to pass to Evaluate().
+  int NumScratchDoublesForEvaluate() const;
+
+ private:
+  const CostFunction* cost_function_;
+  const LossFunction* loss_function_;
+  scoped_array<ParameterBlock*> parameter_blocks_;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_RESIDUAL_BLOCK_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.cc b/extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.cc
new file mode 100644
index 00000000000..28e03130844
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.cc
@@ -0,0 +1,185 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#include "ceres/residual_block_utils.h"
+
+#include <cmath>
+#include <cstddef>
+#include <limits>
+#include <glog/logging.h>
+#include "ceres/residual_block.h"
+#include "ceres/parameter_block.h"
+#include "ceres/stringprintf.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/port.h"
+
+#ifdef _MSC_VER
+#  define isfinite _finite
+#endif
+
+namespace ceres {
+namespace internal {
+
+// It is a near impossibility that user code generates this exact
+// value in normal operation, thus we will use it to fill arrays
+// before passing them to user code. If on return an element of the
+// array still contains this value, we will assume that the user code
+// did not write to that memory location.
+static const double kImpossibleValue = 1e302;
+
+bool IsArrayValid(const int size, const double* x) {
+  if (x != NULL) {
+    for (int i = 0; i < size; ++i) {
+      if (!isfinite(x[i]) || (x[i] == kImpossibleValue))  {
+        return false;
+      }
+    }
+  }
+  return true;
+}
+
+void InvalidateArray(const int size, double* x) {
+  if (x != NULL) {
+    for (int i = 0; i < size; ++i) {
+      x[i] = kImpossibleValue;
+    }
+  }
+}
+
+void InvalidateEvaluation(const ResidualBlock& block,
+                          double* cost,
+                          double* residuals,
+                          double** jacobians) {
+  const int num_parameter_blocks = block.NumParameterBlocks();
+  const int num_residuals = block.NumResiduals();
+
+  InvalidateArray(1, cost);
+  InvalidateArray(num_residuals, residuals);
+  if (jacobians != NULL) {
+    for (int i = 0; i < num_parameter_blocks; ++i) {
+      const int parameter_block_size = block.parameter_blocks()[i]->Size();
+      InvalidateArray(num_residuals * parameter_block_size, jacobians[i]);
+    }
+  }
+}
+
+// Utility routine to print an array of doubles to a string. If the
+// array pointer is NULL, it is treated as an array of zeros.
+void AppendArrayToString(const int size, const double* x, string* result) {
+  for (int i = 0; i < size; ++i) {
+    if (x == NULL) {
+      StringAppendF(result, "Not Computed  ");
+    } else {
+      if (x[i] == kImpossibleValue) {
+        StringAppendF(result, "Uninitialized ");
+      } else {
+        StringAppendF(result, "%12g ", x[i]);
+      }
+    }
+  }
+}
+
+string EvaluationToString(const ResidualBlock& block,
+                          double const* const* parameters,
+                          double* cost,
+                          double* residuals,
+                          double** jacobians) {
+  CHECK_NOTNULL(cost);
+  CHECK_NOTNULL(residuals);
+
+  const int num_parameter_blocks = block.NumParameterBlocks();
+  const int num_residuals = block.NumResiduals();
+  string result = "";
+
+  StringAppendF(&result,
+                "Residual Block size: %d parameter blocks x %d residuals\n\n",
+                num_parameter_blocks, num_residuals);
+  result +=
+      "For each parameter block, the value of the parameters are printed in the first column   \n"  // NOLINT
+      "and the value of the jacobian under the corresponding residual. If a ParameterBlock was \n"  // NOLINT
+      "held constant then the corresponding jacobian is printed as 'Not Computed'. If an entry \n"  // NOLINT
+      "of the Jacobian/residual array was requested but was not written to by user code, it is \n"  // NOLINT
+      "indicated by 'Uninitialized'. This is an error. Residuals or Jacobian values evaluating \n"  // NOLINT
+      "to Inf or NaN is also an error.  \n\n"; // NOLINT
+
+  string space = "Residuals:     ";
+  result += space;
+  AppendArrayToString(num_residuals, residuals, &result);
+  StringAppendF(&result, "\n\n");
+
+  for (int i = 0; i < num_parameter_blocks; ++i) {
+    const int parameter_block_size = block.parameter_blocks()[i]->Size();
+    StringAppendF(
+        &result, "Parameter Block %d, size: %d\n", i, parameter_block_size);
+    StringAppendF(&result, "\n");
+    for (int j = 0; j < parameter_block_size; ++j) {
+      AppendArrayToString(1, parameters[i] + j, &result);
+      StringAppendF(&result, "| ");
+      for (int k = 0; k < num_residuals; ++k) {
+        AppendArrayToString(1,
+                            (jacobians != NULL && jacobians[i] != NULL)
+                            ? jacobians[i] + k * parameter_block_size + j
+                            : NULL,
+                            &result);
+      }
+      StringAppendF(&result, "\n");
+    }
+    StringAppendF(&result, "\n");
+  }
+  StringAppendF(&result, "\n");
+  return result;
+}
+
+bool IsEvaluationValid(const ResidualBlock& block,
+                       double const* const* parameters,
+                       double* cost,
+                       double* residuals,
+                       double** jacobians) {
+  const int num_parameter_blocks = block.NumParameterBlocks();
+  const int num_residuals = block.NumResiduals();
+
+  if (!IsArrayValid(num_residuals, residuals)) {
+    return false;
+  }
+
+  if (jacobians != NULL) {
+    for (int i = 0; i < num_parameter_blocks; ++i) {
+      const int parameter_block_size = block.parameter_blocks()[i]->Size();
+      if (!IsArrayValid(num_residuals * parameter_block_size, jacobians[i])) {
+        return false;
+      }
+    }
+  }
+
+  return true;
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.h b/extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.h
new file mode 100644
index 00000000000..228867cc60c
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.h
@@ -0,0 +1,89 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Utility routines for ResidualBlock evaluation.
+//
+// These are useful for detecting two common class of errors.
+//
+// 1. Uninitialized memory - where the user for some reason did not
+// compute part of a cost/residual/jacobian.
+//
+// 2. Numerical failure while computing the cost/residual/jacobian,
+// e.g. NaN, infinities etc. This is particularly useful since the
+// automatic differentiation code does computations that are not
+// evident to the user and can silently generate hard to debug errors.
+
+#ifndef CERES_INTERNAL_RESIDUAL_BLOCK_UTILS_H_
+#define CERES_INTERNAL_RESIDUAL_BLOCK_UTILS_H_
+
+#include <string>
+#include "ceres/internal/port.h"
+
+namespace ceres {
+namespace internal {
+
+class ResidualBlock;
+
+// Fill the array x with an impossible value that the user code is
+// never expected to compute.
+void InvalidateArray(int size, double* x);
+
+// Check if all the entries of the array x are valid, i.e. all the
+// values in the array should be finite and none of them should be
+// equal to the "impossible" value used by InvalidateArray.
+bool IsArrayValid(int size, const double* x);
+
+// Invalidate cost, resdual and jacobian arrays (if not NULL).
+void InvalidateEvaluation(const ResidualBlock& block,
+                          double* cost,
+                          double* residuals,
+                          double** jacobians);
+
+// Check if any of the arrays cost, residuals or jacobians contains an
+// NaN, return true if it does.
+bool IsEvaluationValid(const ResidualBlock& block,
+                       double const* const* parameters,
+                       double* cost,
+                       double* residuals,
+                       double** jacobians);
+
+// Create a string representation of the Residual block containing the
+// value of the parameters, residuals and jacobians if present.
+// Useful for debugging output.
+string EvaluationToString(const ResidualBlock& block,
+                          double const* const* parameters,
+                          double* cost,
+                          double* residuals,
+                          double** jacobians);
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_RESIDUAL_BLOCK_UTILS_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/runtime_numeric_diff_cost_function.cc b/extern/libmv/third_party/ceres/internal/ceres/runtime_numeric_diff_cost_function.cc
new file mode 100644
index 00000000000..ac6d8aa279a
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/runtime_numeric_diff_cost_function.cc
@@ -0,0 +1,218 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//
+// Based on the templated version in public/numeric_diff_cost_function.h.
+
+#include "ceres/runtime_numeric_diff_cost_function.h"
+
+#include <algorithm>
+#include <numeric>
+#include <vector>
+
+#include <glog/logging.h>
+#include "Eigen/Dense"
+#include "ceres/cost_function.h"
+#include "ceres/internal/scoped_ptr.h"
+
+namespace ceres {
+namespace internal {
+namespace {
+
+bool EvaluateJacobianForParameterBlock(const CostFunction* function,
+                                       int parameter_block_size,
+                                       int parameter_block,
+                                       RuntimeNumericDiffMethod method,
+                                       double relative_step_size,
+                                       double const* residuals_at_eval_point,
+                                       double** parameters,
+                                       double** jacobians) {
+  using Eigen::Map;
+  using Eigen::Matrix;
+  using Eigen::Dynamic;
+  using Eigen::RowMajor;
+
+  typedef Matrix<double, Dynamic, 1> ResidualVector;
+  typedef Matrix<double, Dynamic, 1> ParameterVector;
+  typedef Matrix<double, Dynamic, Dynamic, RowMajor> JacobianMatrix;
+
+  int num_residuals = function->num_residuals();
+
+  Map<JacobianMatrix> parameter_jacobian(jacobians[parameter_block],
+                                         num_residuals,
+                                         parameter_block_size);
+
+  // Mutate one element at a time and then restore.
+  Map<ParameterVector> x_plus_delta(parameters[parameter_block],
+                                    parameter_block_size);
+  ParameterVector x(x_plus_delta);
+  ParameterVector step_size = x.array().abs() * relative_step_size;
+
+  // To handle cases where a paremeter is exactly zero, instead use the mean
+  // step_size for the other dimensions.
+  double fallback_step_size = step_size.sum() / step_size.rows();
+  if (fallback_step_size == 0.0) {
+    // If all the parameters are zero, there's no good answer. Use the given
+    // relative step_size as absolute step_size and hope for the best.
+    fallback_step_size = relative_step_size;
+  }
+
+  // For each parameter in the parameter block, use finite differences to
+  // compute the derivative for that parameter.
+  for (int j = 0; j < parameter_block_size; ++j) {
+    if (step_size(j) == 0.0) {
+      // The parameter is exactly zero, so compromise and use the mean step_size
+      // from the other parameters. This can break in many cases, but it's hard
+      // to pick a good number without problem specific knowledge.
+      step_size(j) = fallback_step_size;
+    }
+    x_plus_delta(j) = x(j) + step_size(j);
+
+    ResidualVector residuals(num_residuals);
+    if (!function->Evaluate(parameters, &residuals[0], NULL)) {
+      // Something went wrong; bail.
+      return false;
+    }
+
+    // Compute this column of the jacobian in 3 steps:
+    // 1. Store residuals for the forward part.
+    // 2. Subtract residuals for the backward (or 0) part.
+    // 3. Divide out the run.
+    parameter_jacobian.col(j) = residuals;
+
+    double one_over_h = 1 / step_size(j);
+    if (method == CENTRAL) {
+      // Compute the function on the other side of x(j).
+      x_plus_delta(j) = x(j) - step_size(j);
+
+      if (!function->Evaluate(parameters, &residuals[0], NULL)) {
+        // Something went wrong; bail.
+        return false;
+      }
+      parameter_jacobian.col(j) -= residuals;
+      one_over_h /= 2;
+    } else {
+      // Forward difference only; reuse existing residuals evaluation.
+      parameter_jacobian.col(j) -=
+          Map<const ResidualVector>(residuals_at_eval_point, num_residuals);
+    }
+    x_plus_delta(j) = x(j);  // Restore x_plus_delta.
+
+    // Divide out the run to get slope.
+    parameter_jacobian.col(j) *= one_over_h;
+  }
+  return true;
+}
+
+class RuntimeNumericDiffCostFunction : public CostFunction {
+ public:
+  RuntimeNumericDiffCostFunction(const CostFunction* function,
+                                 RuntimeNumericDiffMethod method,
+                                 double relative_step_size)
+      : function_(function),
+        method_(method),
+        relative_step_size_(relative_step_size) {
+    *mutable_parameter_block_sizes() = function->parameter_block_sizes();
+    set_num_residuals(function->num_residuals());
+  }
+
+  virtual ~RuntimeNumericDiffCostFunction() { }
+
+  virtual bool Evaluate(double const* const* parameters,
+                        double* residuals,
+                        double** jacobians) const {
+    // Get the function value (residuals) at the the point to evaluate.
+    bool success = function_->Evaluate(parameters, residuals, NULL);
+    if (!success) {
+      // Something went wrong; ignore the jacobian.
+      return false;
+    }
+    if (!jacobians) {
+      // Nothing to do; just forward.
+      return true;
+    }
+
+    const vector<int16>& block_sizes = function_->parameter_block_sizes();
+    CHECK(!block_sizes.empty());
+
+    // Create local space for a copy of the parameters which will get mutated.
+    int parameters_size = accumulate(block_sizes.begin(), block_sizes.end(), 0);
+    vector<double> parameters_copy(parameters_size);
+    vector<double*> parameters_references_copy(block_sizes.size());
+    parameters_references_copy[0] = &parameters_copy[0];
+    for (int block = 1; block < block_sizes.size(); ++block) {
+      parameters_references_copy[block] = parameters_references_copy[block - 1]
+          + block_sizes[block - 1];
+    }
+
+    // Copy the parameters into the local temp space.
+    for (int block = 0; block < block_sizes.size(); ++block) {
+      memcpy(parameters_references_copy[block],
+             parameters[block],
+             block_sizes[block] * sizeof(*parameters[block]));
+    }
+
+    for (int block = 0; block < block_sizes.size(); ++block) {
+      if (!jacobians[block]) {
+        // No jacobian requested for this parameter / residual pair.
+        continue;
+      }
+      if (!EvaluateJacobianForParameterBlock(function_,
+                                             block_sizes[block],
+                                             block,
+                                             method_,
+                                             relative_step_size_,
+                                             residuals,
+                                             &parameters_references_copy[0],
+                                             jacobians)) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+ private:
+  const CostFunction* function_;
+  RuntimeNumericDiffMethod method_;
+  double relative_step_size_;
+};
+
+}  // namespace
+
+CostFunction* CreateRuntimeNumericDiffCostFunction(
+    const CostFunction* cost_function,
+    RuntimeNumericDiffMethod method,
+    double relative_step_size) {
+  return new RuntimeNumericDiffCostFunction(cost_function,
+                                            method,
+                                            relative_step_size);
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/runtime_numeric_diff_cost_function.h b/extern/libmv/third_party/ceres/internal/ceres/runtime_numeric_diff_cost_function.h
new file mode 100644
index 00000000000..01b57f92ef3
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/runtime_numeric_diff_cost_function.h
@@ -0,0 +1,87 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//
+// Create CostFunctions as needed by the least squares framework with jacobians
+// computed via numeric differentiation.
+//
+// To get a numerically differentiated cost function, define a subclass of
+// CostFunction such that the Evaluate() function ignores the jacobian
+// parameter. The numeric differentiation wrapper will fill in the jacobian
+// parameter if nececssary by repeatedly calling the Evaluate() function with
+// small changes to the appropriate parameters, and computing the slope. This
+// implementation is not templated (hence the "Runtime" prefix), which is a bit
+// slower than but is more convenient than the templated version in
+// numeric_diff_cost_function.h
+//
+// The numerically differentiated version of a cost function for a cost function
+// can be constructed as follows:
+//
+//   CostFunction* cost_function =
+//     CreateRuntimeNumericDiffCostFunction(new MyCostFunction(...),
+//                                          CENTRAL,
+//                                          TAKE_OWNERSHIP);
+//
+// The central difference method is considerably more accurate; consider using
+// to start and only after that works, trying forward difference.
+//
+// TODO(keir): Characterize accuracy; mention pitfalls; provide alternatives.
+
+#ifndef CERES_INTERNAL_RUNTIME_NUMERIC_DIFF_COST_FUNCTION_H_
+#define CERES_INTERNAL_RUNTIME_NUMERIC_DIFF_COST_FUNCTION_H_
+
+#include "ceres/cost_function.h"
+
+namespace ceres {
+namespace internal {
+
+enum RuntimeNumericDiffMethod {
+  CENTRAL,
+  FORWARD,
+};
+
+// Create a cost function that evaluates the derivative with finite differences.
+// The base cost_function's implementation of Evaluate() only needs to fill in
+// the "residuals" argument and not the "jacobians". Any data written to the
+// jacobians by the base cost_function is overwritten.
+//
+// Forward difference or central difference is selected with CENTRAL or FORWARD.
+// The relative eps, which determines the step size for forward and central
+// differencing, is set with relative eps. Caller owns the resulting cost
+// function, and the resulting cost function does not own the base cost
+// function.
+CostFunction *CreateRuntimeNumericDiffCostFunction(
+    const CostFunction *cost_function,
+    RuntimeNumericDiffMethod method,
+    double relative_eps);
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_RUNTIME_NUMERIC_DIFF_COST_FUNCTION_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc b/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc
new file mode 100644
index 00000000000..2bc8cdd6bec
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc
@@ -0,0 +1,285 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#include <algorithm>
+#include <ctime>
+#include <set>
+#include <vector>
+#include "Eigen/Dense"
+#include "ceres/block_random_access_dense_matrix.h"
+#include "ceres/block_random_access_matrix.h"
+#include "ceres/block_random_access_sparse_matrix.h"
+#include "ceres/block_sparse_matrix.h"
+#include "ceres/block_structure.h"
+#include "ceres/detect_structure.h"
+#include "ceres/linear_solver.h"
+#include "ceres/schur_complement_solver.h"
+#include "ceres/suitesparse.h"
+#include "ceres/triplet_sparse_matrix.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/port.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+
+LinearSolver::Summary SchurComplementSolver::SolveImpl(
+    BlockSparseMatrixBase* A,
+    const double* b,
+    const LinearSolver::PerSolveOptions& per_solve_options,
+    double* x) {
+  const time_t start_time = time(NULL);
+  if (!options_.constant_sparsity || (eliminator_.get() == NULL)) {
+    InitStorage(A->block_structure());
+    DetectStructure(*A->block_structure(),
+                    options_.num_eliminate_blocks,
+                    &options_.row_block_size,
+                    &options_.e_block_size,
+                    &options_.f_block_size);
+    eliminator_.reset(CHECK_NOTNULL(SchurEliminatorBase::Create(options_)));
+    eliminator_->Init(options_.num_eliminate_blocks, A->block_structure());
+  };
+  const time_t init_time = time(NULL);
+  fill(x, x + A->num_cols(), 0.0);
+
+  LinearSolver::Summary summary;
+  summary.num_iterations = 1;
+  summary.termination_type = FAILURE;
+  eliminator_->Eliminate(A, b, per_solve_options.D, lhs_.get(), rhs_.get());
+  const time_t eliminate_time = time(NULL);
+
+  double* reduced_solution = x + A->num_cols() - lhs_->num_cols();
+  const bool status = SolveReducedLinearSystem(reduced_solution);
+  const time_t solve_time = time(NULL);
+
+  if (!status) {
+    return summary;
+  }
+
+  eliminator_->BackSubstitute(A, b, per_solve_options.D, reduced_solution, x);
+  const time_t backsubstitute_time = time(NULL);
+  summary.termination_type = TOLERANCE;
+
+  VLOG(2) << "time (sec) total: " << backsubstitute_time - start_time
+          << " init: " << init_time - start_time
+          << " eliminate: " << eliminate_time - init_time
+          << " solve: " << solve_time - eliminate_time
+          << " backsubstitute: " << backsubstitute_time - solve_time;
+  return summary;
+}
+
+// Initialize a BlockRandomAccessDenseMatrix to store the Schur
+// complement.
+void DenseSchurComplementSolver::InitStorage(
+    const CompressedRowBlockStructure* bs) {
+  const int num_eliminate_blocks = options().num_eliminate_blocks;
+  const int num_col_blocks = bs->cols.size();
+
+  vector<int> blocks(num_col_blocks - num_eliminate_blocks, 0);
+  for (int i = num_eliminate_blocks, j = 0;
+       i < num_col_blocks;
+       ++i, ++j) {
+    blocks[j] = bs->cols[i].size;
+  }
+
+  set_lhs(new BlockRandomAccessDenseMatrix(blocks));
+  set_rhs(new double[lhs()->num_rows()]);
+}
+
+// Solve the system Sx = r, assuming that the matrix S is stored in a
+// BlockRandomAccessDenseMatrix. The linear system is solved using
+// Eigen's Cholesky factorization.
+bool DenseSchurComplementSolver::SolveReducedLinearSystem(double* solution) {
+  const BlockRandomAccessDenseMatrix* m =
+      down_cast<const BlockRandomAccessDenseMatrix*>(lhs());
+  const int num_rows = m->num_rows();
+
+  // The case where there are no f blocks, and the system is block
+  // diagonal.
+  if (num_rows == 0) {
+    return true;
+  }
+
+  // TODO(sameeragarwal): Add proper error handling; this completely ignores
+  // the quality of the solution to the solve.
+  VectorRef(solution, num_rows) =
+      ConstMatrixRef(m->values(), num_rows, num_rows)
+      .selfadjointView<Eigen::Upper>()
+      .ldlt()
+      .solve(ConstVectorRef(rhs(), num_rows));
+
+  return true;
+}
+
+#ifndef CERES_NO_SUITESPARSE
+SparseSchurComplementSolver::SparseSchurComplementSolver(
+    const LinearSolver::Options& options)
+    : SchurComplementSolver(options),
+      symbolic_factor_(NULL) {
+}
+
+SparseSchurComplementSolver::~SparseSchurComplementSolver() {
+  if (symbolic_factor_ != NULL) {
+    ss_.Free(symbolic_factor_);
+    symbolic_factor_ = NULL;
+  }
+}
+
+// Determine the non-zero blocks in the Schur Complement matrix, and
+// initialize a BlockRandomAccessSparseMatrix object.
+void SparseSchurComplementSolver::InitStorage(
+    const CompressedRowBlockStructure* bs) {
+  const int num_eliminate_blocks = options().num_eliminate_blocks;
+  const int num_col_blocks = bs->cols.size();
+  const int num_row_blocks = bs->rows.size();
+
+  vector<int> blocks(num_col_blocks - num_eliminate_blocks, 0);
+  for (int i = num_eliminate_blocks; i < num_col_blocks; ++i) {
+    blocks[i - num_eliminate_blocks] = bs->cols[i].size;
+  }
+
+  set<pair<int, int> > block_pairs;
+  for (int i = 0; i < blocks.size(); ++i) {
+    block_pairs.insert(make_pair(i, i));
+  }
+
+  int r = 0;
+  while (r < num_row_blocks) {
+    int e_block_id = bs->rows[r].cells.front().block_id;
+    if (e_block_id >= num_eliminate_blocks) {
+      break;
+    }
+    vector<int> f_blocks;
+
+    // Add to the chunk until the first block in the row is
+    // different than the one in the first row for the chunk.
+    for (; r < num_row_blocks; ++r) {
+      const CompressedRow& row = bs->rows[r];
+      if (row.cells.front().block_id != e_block_id) {
+        break;
+      }
+
+      // Iterate over the blocks in the row, ignoring the first
+      // block since it is the one to be eliminated.
+      for (int c = 1; c < row.cells.size(); ++c) {
+        const Cell& cell = row.cells[c];
+        f_blocks.push_back(cell.block_id - num_eliminate_blocks);
+      }
+    }
+
+    sort(f_blocks.begin(), f_blocks.end());
+    f_blocks.erase(unique(f_blocks.begin(), f_blocks.end()), f_blocks.end());
+    for (int i = 0; i < f_blocks.size(); ++i) {
+      for (int j = i + 1; j < f_blocks.size(); ++j) {
+        block_pairs.insert(make_pair(f_blocks[i], f_blocks[j]));
+      }
+    }
+  }
+
+  // Remaing rows do not contribute to the chunks and directly go
+  // into the schur complement via an outer product.
+  for (; r < num_row_blocks; ++r) {
+    const CompressedRow& row = bs->rows[r];
+    CHECK_GE(row.cells.front().block_id, num_eliminate_blocks);
+    for (int i = 0; i < row.cells.size(); ++i) {
+      int r_block1_id = row.cells[i].block_id - num_eliminate_blocks;
+      for (int j = 0; j < row.cells.size(); ++j) {
+        int r_block2_id = row.cells[j].block_id - num_eliminate_blocks;
+        if (r_block1_id <= r_block2_id) {
+          block_pairs.insert(make_pair(r_block1_id, r_block2_id));
+        }
+      }
+    }
+  }
+
+  set_lhs(new BlockRandomAccessSparseMatrix(blocks, block_pairs));
+  set_rhs(new double[lhs()->num_rows()]);
+}
+
+// Solve the system Sx = r, assuming that the matrix S is stored in a
+// BlockRandomAccessSparseMatrix.  The linear system is solved using
+// CHOLMOD's sparse cholesky factorization routines.
+bool SparseSchurComplementSolver::SolveReducedLinearSystem(double* solution) {
+  // Extract the TripletSparseMatrix that is used for actually storing S.
+  TripletSparseMatrix* tsm =
+      const_cast<TripletSparseMatrix*>(
+          down_cast<const BlockRandomAccessSparseMatrix*>(lhs())->matrix());
+
+  const int num_rows = tsm->num_rows();
+
+  // The case where there are no f blocks, and the system is block
+  // diagonal.
+  if (num_rows == 0) {
+    return true;
+  }
+
+  cholmod_sparse* cholmod_lhs = ss_.CreateSparseMatrix(tsm);
+  // The matrix is symmetric, and the upper triangular part of the
+  // matrix contains the values.
+  cholmod_lhs->stype = 1;
+
+  cholmod_dense*  cholmod_rhs =
+      ss_.CreateDenseVector(const_cast<double*>(rhs()), num_rows, num_rows);
+
+  // Symbolic factorization is computed if we don't already have one handy.
+  if (symbolic_factor_ == NULL) {
+    symbolic_factor_ = ss_.AnalyzeCholesky(cholmod_lhs);
+  }
+
+  cholmod_dense* cholmod_solution =
+      ss_.SolveCholesky(cholmod_lhs, symbolic_factor_, cholmod_rhs);
+
+  ss_.Free(cholmod_lhs);
+  cholmod_lhs = NULL;
+  ss_.Free(cholmod_rhs);
+  cholmod_rhs = NULL;
+
+  // If sparsity is not constant across calls, then reset the symbolic
+  // factorization.
+  if (!options().constant_sparsity) {
+    ss_.Free(symbolic_factor_);
+    symbolic_factor_ = NULL;
+  }
+
+  if (cholmod_solution == NULL) {
+    LOG(ERROR) << "CHOLMOD solve failed.";
+    return false;
+  }
+
+  VectorRef(solution, num_rows)
+      = VectorRef(static_cast<double*>(cholmod_solution->x), num_rows);
+  ss_.Free(cholmod_solution);
+  return true;
+}
+#endif  // CERES_NO_SUITESPARSE
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.h b/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.h
new file mode 100644
index 00000000000..039bc09e3ce
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.h
@@ -0,0 +1,182 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#ifndef CERES_INTERNAL_SCHUR_COMPLEMENT_SOLVER_H_
+#define CERES_INTERNAL_SCHUR_COMPLEMENT_SOLVER_H_
+
+#include "ceres/block_random_access_matrix.h"
+#include "ceres/block_sparse_matrix.h"
+#include "ceres/block_structure.h"
+#include "ceres/linear_solver.h"
+#include "ceres/schur_eliminator.h"
+#include "ceres/suitesparse.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+
+class BlockSparseMatrixBase;
+
+// Base class for Schur complement based linear least squares
+// solvers. It assumes that the input linear system Ax = b can be
+// partitioned into
+//
+//  E y + F z = b
+//
+// Where x = [y;z] is a partition of the variables.  The paritioning
+// of the variables is such that, E'E is a block diagonal
+// matrix. Further, the rows of A are ordered so that for every
+// variable block in y, all the rows containing that variable block
+// occur as a vertically contiguous block. i.e the matrix A looks like
+//
+//              E                 F
+//  A = [ y1   0   0   0 |  z1    0    0   0    z5]
+//      [ y1   0   0   0 |  z1   z2    0   0     0]
+//      [  0  y2   0   0 |   0    0   z3   0     0]
+//      [  0   0  y3   0 |  z1   z2   z3  z4    z5]
+//      [  0   0  y3   0 |  z1    0    0   0    z5]
+//      [  0   0   0  y4 |   0    0    0   0    z5]
+//      [  0   0   0  y4 |   0   z2    0   0     0]
+//      [  0   0   0  y4 |   0    0    0   0     0]
+//      [  0   0   0   0 |  z1    0    0   0     0]
+//      [  0   0   0   0 |   0    0   z3  z4    z5]
+//
+// This structure should be reflected in the corresponding
+// CompressedRowBlockStructure object associated with A. The linear
+// system Ax = b should either be well posed or the array D below
+// should be non-null and the diagonal matrix corresponding to it
+// should be non-singular.
+//
+// SchurComplementSolver has two sub-classes.
+//
+// DenseSchurComplementSolver: For problems where the Schur complement
+// matrix is small and dense, or if CHOLMOD/SuiteSparse is not
+// installed. For structure from motion problems, this is solver can
+// be used for problems with upto a few hundred cameras.
+//
+// SparseSchurComplementSolver: For problems where the Schur
+// complement matrix is large and sparse. It requires that
+// CHOLMOD/SuiteSparse be installed, as it uses CHOLMOD to find a
+// sparse Cholesky factorization of the Schur complement. This solver
+// can be used for solving structure from motion problems with tens of
+// thousands of cameras, though depending on the exact sparsity
+// structure, it maybe better to use an iterative solver.
+//
+// The two solvers can be instantiated by calling
+// LinearSolver::CreateLinearSolver with LinearSolver::Options::type
+// set to DENSE_SCHUR and SPARSE_SCHUR
+// respectively. LinearSolver::Options::num_eliminate_blocks should be
+// at least 1.
+class SchurComplementSolver : public BlockSparseMatrixBaseSolver {
+ public:
+  explicit SchurComplementSolver(const LinearSolver::Options& options)
+      : options_(options) {
+    CHECK_GT(options.num_eliminate_blocks, 0);
+  }
+
+  // LinearSolver methods
+  virtual ~SchurComplementSolver() {}
+  virtual LinearSolver::Summary SolveImpl(
+      BlockSparseMatrixBase* A,
+      const double* b,
+      const LinearSolver::PerSolveOptions& per_solve_options,
+      double* x);
+
+ protected:
+  const LinearSolver::Options& options() const { return options_; }
+
+  const BlockRandomAccessMatrix* lhs() const { return lhs_.get(); }
+  void set_lhs(BlockRandomAccessMatrix* lhs) { lhs_.reset(lhs); }
+  const double* rhs() const { return rhs_.get(); }
+  void set_rhs(double* rhs) { rhs_.reset(rhs); }
+
+ private:
+  virtual void InitStorage(const CompressedRowBlockStructure* bs) = 0;
+  virtual bool SolveReducedLinearSystem(double* solution) = 0;
+
+  LinearSolver::Options options_;
+
+  scoped_ptr<SchurEliminatorBase> eliminator_;
+  scoped_ptr<BlockRandomAccessMatrix> lhs_;
+  scoped_array<double> rhs_;
+
+  DISALLOW_COPY_AND_ASSIGN(SchurComplementSolver);
+};
+
+// Dense Cholesky factorization based solver.
+class DenseSchurComplementSolver : public SchurComplementSolver {
+ public:
+  explicit DenseSchurComplementSolver(const LinearSolver::Options& options)
+      : SchurComplementSolver(options) {}
+  virtual ~DenseSchurComplementSolver() {}
+
+ private:
+  virtual void InitStorage(const CompressedRowBlockStructure* bs);
+  virtual bool SolveReducedLinearSystem(double* solution);
+
+  DISALLOW_COPY_AND_ASSIGN(DenseSchurComplementSolver);
+};
+
+#ifndef CERES_NO_SUITESPARSE
+// Sparse Cholesky factorization based solver.
+class SparseSchurComplementSolver : public SchurComplementSolver {
+ public:
+  explicit SparseSchurComplementSolver(const LinearSolver::Options& options);
+  virtual ~SparseSchurComplementSolver();
+
+ private:
+  virtual void InitStorage(const CompressedRowBlockStructure* bs);
+  virtual bool SolveReducedLinearSystem(double* solution);
+
+
+  SuiteSparse ss_;
+  // Symbolic factorization of the reduced linear system. Precomputed
+  // once and reused if constant_sparsity_ is true.
+  cholmod_factor* symbolic_factor_;
+  DISALLOW_COPY_AND_ASSIGN(SparseSchurComplementSolver);
+};
+#else  // CERES_NO_SUITESPARSE
+class SparseSchurComplementSolver : public SchurComplementSolver {
+ public:
+  explicit SparseSchurComplementSolver(const LinearSolver::Options& options)
+      : SchurComplementSolver(options) {
+    LOG(FATAL) << "SPARSE_SCHUR is not available. Please "
+        "build Ceres with SuiteSparse.";
+  }
+
+  virtual ~SparseSchurComplementSolver() {}
+};
+#endif  // CERES_NO_SUITESPARSE
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_SCHUR_COMPLEMENT_SOLVER_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.cc b/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.cc
new file mode 100644
index 00000000000..44f5be3b4e9
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.cc
@@ -0,0 +1,141 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// ========================================
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+// THIS FILE IS AUTOGENERATED. DO NOT EDIT.
+//=========================================
+//
+// This file is generated using generate_template_specializations.py.
+// Editing it manually is not recommended.
+
+#include "ceres/linear_solver.h"
+#include "ceres/schur_eliminator.h"
+#include "ceres/internal/eigen.h"
+
+namespace ceres {
+namespace internal {
+
+SchurEliminatorBase*
+SchurEliminatorBase::Create(const LinearSolver::Options& options) {
+#ifndef CERES_RESTRICT_SCHUR_SPECIALIZATION
+  if ((options.row_block_size == 2) &&
+      (options.e_block_size == 2) &&
+      (options.f_block_size == 2)) {
+    return new SchurEliminator<2, 2, 2>(options);
+  }
+  if ((options.row_block_size == 2) &&
+      (options.e_block_size == 2) &&
+      (options.f_block_size == 3)) {
+    return new SchurEliminator<2, 2, 3>(options);
+  }
+  if ((options.row_block_size == 2) &&
+      (options.e_block_size == 2) &&
+      (options.f_block_size == 4)) {
+    return new SchurEliminator<2, 2, 4>(options);
+  }
+  if ((options.row_block_size == 2) &&
+      (options.e_block_size == 2) &&
+      (options.f_block_size == Dynamic)) {
+    return new SchurEliminator<2, 2, Dynamic>(options);
+  }
+  if ((options.row_block_size == 2) &&
+      (options.e_block_size == 3) &&
+      (options.f_block_size == 3)) {
+    return new SchurEliminator<2, 3, 3>(options);
+  }
+  if ((options.row_block_size == 2) &&
+      (options.e_block_size == 3) &&
+      (options.f_block_size == 4)) {
+    return new SchurEliminator<2, 3, 4>(options);
+  }
+  if ((options.row_block_size == 2) &&
+      (options.e_block_size == 3) &&
+      (options.f_block_size == 9)) {
+    return new SchurEliminator<2, 3, 9>(options);
+  }
+  if ((options.row_block_size == 2) &&
+      (options.e_block_size == 3) &&
+      (options.f_block_size == Dynamic)) {
+    return new SchurEliminator<2, 3, Dynamic>(options);
+  }
+  if ((options.row_block_size == 2) &&
+      (options.e_block_size == 4) &&
+      (options.f_block_size == 3)) {
+    return new SchurEliminator<2, 4, 3>(options);
+  }
+  if ((options.row_block_size == 2) &&
+      (options.e_block_size == 4) &&
+      (options.f_block_size == 4)) {
+    return new SchurEliminator<2, 4, 4>(options);
+  }
+  if ((options.row_block_size == 2) &&
+      (options.e_block_size == 4) &&
+      (options.f_block_size == Dynamic)) {
+    return new SchurEliminator<2, 4, Dynamic>(options);
+  }
+  if ((options.row_block_size == 4) &&
+      (options.e_block_size == 4) &&
+      (options.f_block_size == 2)) {
+    return new SchurEliminator<4, 4, 2>(options);
+  }
+  if ((options.row_block_size == 4) &&
+      (options.e_block_size == 4) &&
+      (options.f_block_size == 3)) {
+    return new SchurEliminator<4, 4, 3>(options);
+  }
+  if ((options.row_block_size == 4) &&
+      (options.e_block_size == 4) &&
+      (options.f_block_size == 4)) {
+    return new SchurEliminator<4, 4, 4>(options);
+  }
+  if ((options.row_block_size == 4) &&
+      (options.e_block_size == 4) &&
+      (options.f_block_size == Dynamic)) {
+    return new SchurEliminator<4, 4, Dynamic>(options);
+  }
+  if ((options.row_block_size == Dynamic) &&
+      (options.e_block_size == Dynamic) &&
+      (options.f_block_size == Dynamic)) {
+    return new SchurEliminator<Dynamic, Dynamic, Dynamic>(options);
+  }
+
+#endif
+  VLOG(1) << "Template specializations not found for <"
+          << options.row_block_size << ","
+          << options.e_block_size << ","
+          << options.f_block_size << ">";
+  return new SchurEliminator<Dynamic, Dynamic, Dynamic>(options);
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.h b/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.h
new file mode 100644
index 00000000000..c24fe435f54
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.h
@@ -0,0 +1,339 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#ifndef CERES_INTERNAL_SCHUR_ELIMINATOR_H_
+#define CERES_INTERNAL_SCHUR_ELIMINATOR_H_
+
+#include <map>
+#include <vector>
+#include "ceres/mutex.h"
+#include "ceres/block_random_access_matrix.h"
+#include "ceres/block_sparse_matrix.h"
+#include "ceres/block_structure.h"
+#include "ceres/linear_solver.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/scoped_ptr.h"
+
+namespace ceres {
+namespace internal {
+
+// Classes implementing the SchurEliminatorBase interface implement
+// variable elimination for linear least squares problems. Assuming
+// that the input linear system Ax = b can be partitioned into
+//
+//  E y + F z = b
+//
+// Where x = [y;z] is a partition of the variables.  The paritioning
+// of the variables is such that, E'E is a block diagonal matrix. Or
+// in other words, the parameter blocks in E form an independent set
+// of the of the graph implied by the block matrix A'A. Then, this
+// class provides the functionality to compute the Schur complement
+// system
+//
+//   S z = r
+//
+// where
+//
+//   S = F'F - F'E (E'E)^{-1} E'F and r = F'b - F'E(E'E)^(-1) E'b
+//
+// This is the Eliminate operation, i.e., construct the linear system
+// obtained by eliminating the variables in E.
+//
+// The eliminator also provides the reverse functionality, i.e. given
+// values for z it can back substitute for the values of y, by solving the
+// linear system
+//
+//  Ey = b - F z
+//
+// which is done by observing that
+//
+//  y = (E'E)^(-1) [E'b - E'F z]
+//
+// The eliminator has a number of requirements.
+//
+// The rows of A are ordered so that for every variable block in y,
+// all the rows containing that variable block occur as a vertically
+// contiguous block. i.e the matrix A looks like
+//
+//              E                 F                   chunk
+//  A = [ y1   0   0   0 |  z1    0    0   0    z5]     1
+//      [ y1   0   0   0 |  z1   z2    0   0     0]     1
+//      [  0  y2   0   0 |   0    0   z3   0     0]     2
+//      [  0   0  y3   0 |  z1   z2   z3  z4    z5]     3
+//      [  0   0  y3   0 |  z1    0    0   0    z5]     3
+//      [  0   0   0  y4 |   0    0    0   0    z5]     4
+//      [  0   0   0  y4 |   0   z2    0   0     0]     4
+//      [  0   0   0  y4 |   0    0    0   0     0]     4
+//      [  0   0   0   0 |  z1    0    0   0     0] non chunk blocks
+//      [  0   0   0   0 |   0    0   z3  z4    z5] non chunk blocks
+//
+// This structure should be reflected in the corresponding
+// CompressedRowBlockStructure object associated with A. The linear
+// system Ax = b should either be well posed or the array D below
+// should be non-null and the diagonal matrix corresponding to it
+// should be non-singular. For simplicity of exposition only the case
+// with a null D is described.
+//
+// The usual way to do the elimination is as follows. Starting with
+//
+//  E y + F z = b
+//
+// we can form the normal equations,
+//
+//  E'E y + E'F z = E'b
+//  F'E y + F'F z = F'b
+//
+// multiplying both sides of the first equation by (E'E)^(-1) and then
+// by F'E we get
+//
+//  F'E y + F'E (E'E)^(-1) E'F z =  F'E (E'E)^(-1) E'b
+//  F'E y +                F'F z =  F'b
+//
+// now subtracting the two equations we get
+//
+// [FF' - F'E (E'E)^(-1) E'F] z = F'b - F'E(E'E)^(-1) E'b
+//
+// Instead of forming the normal equations and operating on them as
+// general sparse matrices, the algorithm here deals with one
+// parameter block in y at a time. The rows corresponding to a single
+// parameter block yi are known as a chunk, and the algorithm operates
+// on one chunk at a time. The mathematics remains the same since the
+// reduced linear system can be shown to be the sum of the reduced
+// linear systems for each chunk. This can be seen by observing two
+// things.
+//
+//  1. E'E is a block diagonal matrix.
+//
+//  2. When E'F is computed, only the terms within a single chunk
+//  interact, i.e for y1 column blocks when transposed and multiplied
+//  with F, the only non-zero contribution comes from the blocks in
+//  chunk1.
+//
+// Thus, the reduced linear system
+//
+//  FF' - F'E (E'E)^(-1) E'F
+//
+// can be re-written as
+//
+//  sum_k F_k F_k' - F_k'E_k (E_k'E_k)^(-1) E_k' F_k
+//
+// Where the sum is over chunks and E_k'E_k is dense matrix of size y1
+// x y1.
+//
+// Advanced usage. Uptil now it has been assumed that the user would
+// be interested in all of the Schur Complement S. However, it is also
+// possible to use this eliminator to obtain an arbitrary submatrix of
+// the full Schur complement. When the eliminator is generating the
+// blocks of S, it asks the RandomAccessBlockMatrix instance passed to
+// it if it has storage for that block. If it does, the eliminator
+// computes/updates it, if not it is skipped. This is useful when one
+// is interested in constructing a preconditioner based on the Schur
+// Complement, e.g., computing the block diagonal of S so that it can
+// be used as a preconditioner for an Iterative Substructuring based
+// solver [See Agarwal et al, Bundle Adjustment in the Large, ECCV
+// 2008 for an example of such use].
+//
+// Example usage: Please see schur_complement_solver.cc
+class SchurEliminatorBase {
+ public:
+  virtual ~SchurEliminatorBase() {}
+
+  // Initialize the eliminator. It is the user's responsibilty to call
+  // this function before calling Eliminate or BackSubstitute. It is
+  // also the caller's responsibilty to ensure that the
+  // CompressedRowBlockStructure object passed to this method is the
+  // same one (or is equivalent to) the one associated with the
+  // BlockSparseMatrixBase objects below.
+  virtual void Init(int num_eliminate_blocks,
+                    const CompressedRowBlockStructure* bs) = 0;
+
+  // Compute the Schur complement system from the augmented linear
+  // least squares problem [A;D] x = [b;0]. The left hand side and the
+  // right hand side of the reduced linear system are returned in lhs
+  // and rhs respectively.
+  //
+  // It is the caller's responsibility to construct and initialize
+  // lhs. Depending upon the structure of the lhs object passed here,
+  // the full or a submatrix of the Schur complement will be computed.
+  //
+  // Since the Schur complement is a symmetric matrix, only the upper
+  // triangular part of the Schur complement is computed.
+  virtual void Eliminate(const BlockSparseMatrixBase* A,
+                         const double* b,
+                         const double* D,
+                         BlockRandomAccessMatrix* lhs,
+                         double* rhs) = 0;
+
+  // Given values for the variables z in the F block of A, solve for
+  // the optimal values of the variables y corresponding to the E
+  // block in A.
+  virtual void BackSubstitute(const BlockSparseMatrixBase* A,
+                              const double* b,
+                              const double* D,
+                              const double* z,
+                              double* y) = 0;
+  // Factory
+  static SchurEliminatorBase* Create(const LinearSolver::Options& options);
+};
+
+// Templated implementation of the SchurEliminatorBase interface. The
+// templating is on the sizes of the row, e and f blocks sizes in the
+// input matrix. In many problems, the sizes of one or more of these
+// blocks are constant, in that case, its worth passing these
+// parameters as template arguments so that they are visible to the
+// compiler and can be used for compile time optimization of the low
+// level linear algebra routines.
+//
+// This implementation is mulithreaded using OpenMP. The level of
+// parallelism is controlled by LinearSolver::Options::num_threads.
+template <int kRowBlockSize = Dynamic,
+          int kEBlockSize = Dynamic,
+          int kFBlockSize = Dynamic >
+class SchurEliminator : public SchurEliminatorBase {
+ public:
+  explicit SchurEliminator(const LinearSolver::Options& options)
+      : num_threads_(options.num_threads) {
+  }
+
+  // SchurEliminatorBase Interface
+  virtual ~SchurEliminator();
+  virtual void Init(int num_eliminate_blocks,
+                    const CompressedRowBlockStructure* bs);
+  virtual void Eliminate(const BlockSparseMatrixBase* A,
+                         const double* b,
+                         const double* D,
+                         BlockRandomAccessMatrix* lhs,
+                         double* rhs);
+  virtual void BackSubstitute(const BlockSparseMatrixBase* A,
+                              const double* b,
+                              const double* D,
+                              const double* z,
+                              double* y);
+
+ private:
+  // Chunk objects store combinatorial information needed to
+  // efficiently eliminate a whole chunk out of the least squares
+  // problem. Consider the first chunk in the example matrix above.
+  //
+  //      [ y1   0   0   0 |  z1    0    0   0    z5]
+  //      [ y1   0   0   0 |  z1   z2    0   0     0]
+  //
+  // One of the intermediate quantities that needs to be calculated is
+  // for each row the product of the y block transposed with the
+  // non-zero z block, and the sum of these blocks across rows. A
+  // temporary array "buffer_" is used for computing and storing them
+  // and the buffer_layout maps the indices of the z-blocks to
+  // position in the buffer_ array.  The size of the chunk is the
+  // number of row blocks/residual blocks for the particular y block
+  // being considered.
+  //
+  // For the example chunk shown above,
+  //
+  // size = 2
+  //
+  // The entries of buffer_layout will be filled in the following order.
+  //
+  // buffer_layout[z1] = 0
+  // buffer_layout[z5] = y1 * z1
+  // buffer_layout[z2] = y1 * z1 + y1 * z5
+  typedef map<int, int> BufferLayoutType;
+  struct Chunk {
+    Chunk() : size(0) {}
+    int size;
+    int start;
+    BufferLayoutType buffer_layout;
+  };
+
+  void ChunkDiagonalBlockAndGradient(
+      const Chunk& chunk,
+      const BlockSparseMatrixBase* A,
+      const double* b,
+      int row_block_counter,
+      typename EigenTypes<kEBlockSize, kEBlockSize>::Matrix* eet,
+      typename EigenTypes<kEBlockSize>::Vector* g,
+      double* buffer,
+      BlockRandomAccessMatrix* lhs);
+
+  void UpdateRhs(const Chunk& chunk,
+                 const BlockSparseMatrixBase* A,
+                 const double* b,
+                 int row_block_counter,
+                 const Vector& inverse_ete_g,
+                 double* rhs);
+
+  void ChunkOuterProduct(const CompressedRowBlockStructure* bs,
+                         const Matrix& inverse_eet,
+                         const double* buffer,
+                         const BufferLayoutType& buffer_layout,
+                         BlockRandomAccessMatrix* lhs);
+  void EBlockRowOuterProduct(const BlockSparseMatrixBase* A,
+                             int row_block_index,
+                             BlockRandomAccessMatrix* lhs);
+
+
+  void NoEBlockRowsUpdate(const BlockSparseMatrixBase* A,
+                             const double* b,
+                             int row_block_counter,
+                             BlockRandomAccessMatrix* lhs,
+                             double* rhs);
+
+  void NoEBlockRowOuterProduct(const BlockSparseMatrixBase* A,
+                               int row_block_index,
+                               BlockRandomAccessMatrix* lhs);
+
+  int num_eliminate_blocks_;
+
+  // Block layout of the columns of the reduced linear system. Since
+  // the f blocks can be of varying size, this vector stores the
+  // position of each f block in the row/col of the reduced linear
+  // system. Thus lhs_row_layout_[i] is the row/col position of the
+  // i^th f block.
+  vector<int> lhs_row_layout_;
+
+  // Combinatorial structure of the chunks in A. For more information
+  // see the documentation of the Chunk object above.
+  vector<Chunk> chunks_;
+
+  // Buffer to store the products of the y and z blocks generated
+  // during the elimination phase.
+  scoped_array<double> buffer_;
+  int buffer_size_;
+  int num_threads_;
+  int uneliminated_row_begins_;
+
+  // Locks for the blocks in the right hand side of the reduced linear
+  // system.
+  vector<Mutex*> rhs_locks_;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_SCHUR_ELIMINATOR_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator_impl.h b/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator_impl.h
new file mode 100644
index 00000000000..a388d005424
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator_impl.h
@@ -0,0 +1,702 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// TODO(sameeragarwal): row_block_counter can perhaps be replaced by
+// Chunk::start ?
+
+#ifndef CERES_INTERNAL_SCHUR_ELIMINATOR_IMPL_H_
+#define CERES_INTERNAL_SCHUR_ELIMINATOR_IMPL_H_
+
+#ifdef CERES_USE_OPENMP
+#include <omp.h>
+#endif
+
+// Eigen has an internal threshold switching between different matrix
+// multiplication algorithms. In particular for matrices larger than
+// EIGEN_CACHEFRIENDLY_PRODUCT_THRESHOLD it uses a cache friendly
+// matrix matrix product algorithm that has a higher setup cost. For
+// matrix sizes close to this threshold, especially when the matrices
+// are thin and long, the default choice may not be optimal. This is
+// the case for us, as the default choice causes a 30% performance
+// regression when we moved from Eigen2 to Eigen3.
+#define EIGEN_CACHEFRIENDLY_PRODUCT_THRESHOLD 10
+
+#include <algorithm>
+#include <map>
+#include <glog/logging.h>
+#include "Eigen/Dense"
+#include "ceres/block_random_access_matrix.h"
+#include "ceres/block_sparse_matrix.h"
+#include "ceres/block_structure.h"
+#include "ceres/map_util.h"
+#include "ceres/schur_eliminator.h"
+#include "ceres/stl_util.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/scoped_ptr.h"
+
+namespace ceres {
+namespace internal {
+
+template <int kRowBlockSize, int kEBlockSize, int kFBlockSize>
+SchurEliminator<kRowBlockSize, kEBlockSize, kFBlockSize>::~SchurEliminator() {
+  STLDeleteElements(&rhs_locks_);
+}
+
+template <int kRowBlockSize, int kEBlockSize, int kFBlockSize>
+void
+SchurEliminator<kRowBlockSize, kEBlockSize, kFBlockSize>::
+Init(int num_eliminate_blocks, const CompressedRowBlockStructure* bs) {
+  CHECK_GT(num_eliminate_blocks, 0)
+      << "SchurComplementSolver cannot be initialized with "
+      << "num_eliminate_blocks = 0.";
+
+  num_eliminate_blocks_ = num_eliminate_blocks;
+
+  const int num_col_blocks = bs->cols.size();
+  const int num_row_blocks = bs->rows.size();
+
+  buffer_size_ = 1;
+  chunks_.clear();
+  lhs_row_layout_.clear();
+
+  int lhs_num_rows = 0;
+  // Add a map object for each block in the reduced linear system
+  // and build the row/column block structure of the reduced linear
+  // system.
+  lhs_row_layout_.resize(num_col_blocks - num_eliminate_blocks_);
+  for (int i = num_eliminate_blocks_; i < num_col_blocks; ++i) {
+    lhs_row_layout_[i - num_eliminate_blocks_] = lhs_num_rows;
+    lhs_num_rows += bs->cols[i].size;
+  }
+
+  int r = 0;
+  // Iterate over the row blocks of A, and detect the chunks. The
+  // matrix should already have been ordered so that all rows
+  // containing the same y block are vertically contiguous. Along
+  // the way also compute the amount of space each chunk will need
+  // to perform the elimination.
+  while (r < num_row_blocks) {
+    const int chunk_block_id = bs->rows[r].cells.front().block_id;
+    if (chunk_block_id >= num_eliminate_blocks_) {
+      break;
+    }
+
+    chunks_.push_back(Chunk());
+    Chunk& chunk = chunks_.back();
+    chunk.size = 0;
+    chunk.start = r;
+    int buffer_size = 0;
+    const int e_block_size = bs->cols[chunk_block_id].size;
+
+    // Add to the chunk until the first block in the row is
+    // different than the one in the first row for the chunk.
+    while (r + chunk.size < num_row_blocks) {
+      const CompressedRow& row = bs->rows[r + chunk.size];
+      if (row.cells.front().block_id != chunk_block_id) {
+        break;
+      }
+
+      // Iterate over the blocks in the row, ignoring the first
+      // block since it is the one to be eliminated.
+      for (int c = 1; c < row.cells.size(); ++c) {
+        const Cell& cell = row.cells[c];
+        if (InsertIfNotPresent(
+                &(chunk.buffer_layout), cell.block_id, buffer_size)) {
+          buffer_size += e_block_size * bs->cols[cell.block_id].size;
+        }
+      }
+
+      buffer_size_ = max(buffer_size, buffer_size_);
+      ++chunk.size;
+    }
+
+    CHECK_GT(chunk.size, 0);
+    r += chunk.size;
+  }
+  const Chunk& chunk = chunks_.back();
+
+  uneliminated_row_begins_ = chunk.start + chunk.size;
+  if (num_threads_ > 1) {
+    random_shuffle(chunks_.begin(), chunks_.end());
+  }
+
+  buffer_.reset(new double[buffer_size_ * num_threads_]);
+
+  STLDeleteElements(&rhs_locks_);
+  rhs_locks_.resize(num_col_blocks - num_eliminate_blocks_);
+  for (int i = 0; i < num_col_blocks - num_eliminate_blocks_; ++i) {
+    rhs_locks_[i] = new Mutex;
+  }
+
+  VLOG(1) << "Eliminator threads: " << num_threads_;
+}
+
+template <int kRowBlockSize, int kEBlockSize, int kFBlockSize>
+void
+SchurEliminator<kRowBlockSize, kEBlockSize, kFBlockSize>::
+Eliminate(const BlockSparseMatrixBase* A,
+          const double* b,
+          const double* D,
+          BlockRandomAccessMatrix* lhs,
+          double* rhs) {
+  if (lhs->num_rows() > 0) {
+    lhs->SetZero();
+    VectorRef(rhs, lhs->num_rows()).setZero();
+  }
+
+  const CompressedRowBlockStructure* bs = A->block_structure();
+  const int num_col_blocks = bs->cols.size();
+
+  // Add the diagonal to the schur complement.
+  if (D != NULL) {
+#pragma omp parallel for num_threads(num_threads_) schedule(dynamic)
+    for (int i = num_eliminate_blocks_; i < num_col_blocks; ++i) {
+      const int block_id = i - num_eliminate_blocks_;
+      int r, c, row_stride, col_stride;
+      CellInfo* cell_info = lhs->GetCell(block_id, block_id,
+                                         &r, &c,
+                                         &row_stride, &col_stride);
+      if (cell_info != NULL) {
+        const int block_size = bs->cols[i].size;
+        typename EigenTypes<kFBlockSize>::ConstVectorRef
+            diag(D + bs->cols[i].position, block_size);
+
+        MutexLock l(&cell_info->m);
+        MatrixRef m(cell_info->values, row_stride, col_stride);
+        m.block(r, c, block_size, block_size).diagonal()
+            += diag.array().square().matrix();
+      }
+    }
+  }
+
+  // Eliminate y blocks one chunk at a time.  For each chunk,x3
+  // compute the entries of the normal equations and the gradient
+  // vector block corresponding to the y block and then apply
+  // Gaussian elimination to them. The matrix ete stores the normal
+  // matrix corresponding to the block being eliminated and array
+  // buffer_ contains the non-zero blocks in the row corresponding
+  // to this y block in the normal equations. This computation is
+  // done in ChunkDiagonalBlockAndGradient. UpdateRhs then applies
+  // gaussian elimination to the rhs of the normal equations,
+  // updating the rhs of the reduced linear system by modifying rhs
+  // blocks for all the z blocks that share a row block/residual
+  // term with the y block. EliminateRowOuterProduct does the
+  // corresponding operation for the lhs of the reduced linear
+  // system.
+#pragma omp parallel for num_threads(num_threads_) schedule(dynamic)
+  for (int i = 0; i < chunks_.size(); ++i) {
+#ifdef CERES_USE_OPENMP
+    int thread_id = omp_get_thread_num();
+#else
+    int thread_id = 0;
+#endif
+    double* buffer = buffer_.get() + thread_id * buffer_size_;
+    const Chunk& chunk = chunks_[i];
+    const int e_block_id = bs->rows[chunk.start].cells.front().block_id;
+    const int e_block_size = bs->cols[e_block_id].size;
+
+    VectorRef(buffer, buffer_size_).setZero();
+
+    typename EigenTypes<kEBlockSize, kEBlockSize>::Matrix
+        ete(e_block_size, e_block_size);
+
+    if (D != NULL) {
+      const typename EigenTypes<kEBlockSize>::ConstVectorRef
+          diag(D + bs->cols[e_block_id].position, e_block_size);
+      ete = diag.array().square().matrix().asDiagonal();
+    } else {
+      ete.setZero();
+    }
+
+    typename EigenTypes<kEBlockSize>::Vector g(e_block_size);
+    g.setZero();
+
+    // We are going to be computing
+    //
+    //   S += F'F - F'E(E'E)^{-1}E'F
+    //
+    // for each Chunk. The computation is broken down into a number of
+    // function calls as below.
+
+    // Compute the outer product of the e_blocks with themselves (ete
+    // = E'E). Compute the product of the e_blocks with the
+    // corresonding f_blocks (buffer = E'F), the gradient of the terms
+    // in this chunk (g) and add the outer product of the f_blocks to
+    // Schur complement (S += F'F).
+    ChunkDiagonalBlockAndGradient(
+        chunk, A, b, chunk.start, &ete, &g, buffer, lhs);
+
+    // Normally one wouldn't compute the inverse explicitly, but
+    // e_block_size will typically be a small number like 3, in
+    // which case its much faster to compute the inverse once and
+    // use it to multiply other matrices/vectors instead of doing a
+    // Solve call over and over again.
+    typename EigenTypes<kEBlockSize, kEBlockSize>::Matrix inverse_ete =
+        ete
+        .template selfadjointView<Eigen::Upper>()
+        .ldlt()
+        .solve(Matrix::Identity(e_block_size, e_block_size));
+
+    // For the current chunk compute and update the rhs of the reduced
+    // linear system.
+    //
+    //   rhs = F'b - F'E(E'E)^(-1) E'b
+    UpdateRhs(chunk, A, b, chunk.start, inverse_ete * g, rhs);
+
+    // S -= F'E(E'E)^{-1}E'F
+    ChunkOuterProduct(bs, inverse_ete, buffer, chunk.buffer_layout, lhs);
+  }
+
+  // For rows with no e_blocks, the schur complement update reduces to
+  // S += F'F.
+  NoEBlockRowsUpdate(A, b,  uneliminated_row_begins_, lhs, rhs);
+}
+
+template <int kRowBlockSize, int kEBlockSize, int kFBlockSize>
+void
+SchurEliminator<kRowBlockSize, kEBlockSize, kFBlockSize>::
+BackSubstitute(const BlockSparseMatrixBase* A,
+               const double* b,
+               const double* D,
+               const double* z,
+               double* y) {
+  const CompressedRowBlockStructure* bs = A->block_structure();
+#pragma omp parallel for num_threads(num_threads_) schedule(dynamic)
+  for (int i = 0; i < chunks_.size(); ++i) {
+    const Chunk& chunk = chunks_[i];
+    const int e_block_id = bs->rows[chunk.start].cells.front().block_id;
+    const int e_block_size = bs->cols[e_block_id].size;
+
+    typename EigenTypes<kEBlockSize>::VectorRef y_block(
+        y +  bs->cols[e_block_id].position, e_block_size);
+
+    typename EigenTypes<kEBlockSize, kEBlockSize>::Matrix
+        ete(e_block_size, e_block_size);
+    if (D != NULL) {
+      const typename EigenTypes<kEBlockSize>::ConstVectorRef
+          diag(D + bs->cols[e_block_id].position, e_block_size);
+      ete = diag.array().square().matrix().asDiagonal();
+    } else {
+      ete.setZero();
+    }
+
+    for (int j = 0; j < chunk.size; ++j) {
+      const CompressedRow& row = bs->rows[chunk.start + j];
+      const double* row_values = A->RowBlockValues(chunk.start + j);
+      const Cell& e_cell = row.cells.front();
+      DCHECK_EQ(e_block_id, e_cell.block_id);
+      const typename EigenTypes<kRowBlockSize, kEBlockSize>::ConstMatrixRef
+          e_block(row_values + e_cell.position,
+                  row.block.size,
+                  e_block_size);
+
+      typename EigenTypes<kRowBlockSize>::Vector
+          sj =
+          typename EigenTypes<kRowBlockSize>::ConstVectorRef
+          (b + bs->rows[chunk.start + j].block.position,
+           row.block.size);
+
+      for (int c = 1; c < row.cells.size(); ++c) {
+        const int f_block_id = row.cells[c].block_id;
+        const int f_block_size = bs->cols[f_block_id].size;
+        const typename EigenTypes<kRowBlockSize, kFBlockSize>::ConstMatrixRef
+            f_block(row_values + row.cells[c].position,
+                    row.block.size, f_block_size);
+        const int r_block = f_block_id - num_eliminate_blocks_;
+
+        sj -= f_block *
+            typename EigenTypes<kFBlockSize>::ConstVectorRef
+            (z + lhs_row_layout_[r_block], f_block_size);
+      }
+
+      y_block += e_block.transpose() * sj;
+      ete.template selfadjointView<Eigen::Upper>()
+          .rankUpdate(e_block.transpose(), 1.0);
+    }
+
+    y_block =
+        ete
+        .template selfadjointView<Eigen::Upper>()
+        .ldlt()
+        .solve(y_block);
+  }
+}
+
+// Update the rhs of the reduced linear system. Compute
+//
+//   F'b - F'E(E'E)^(-1) E'b
+template <int kRowBlockSize, int kEBlockSize, int kFBlockSize>
+void
+SchurEliminator<kRowBlockSize, kEBlockSize, kFBlockSize>::
+UpdateRhs(const Chunk& chunk,
+          const BlockSparseMatrixBase* A,
+          const double* b,
+          int row_block_counter,
+          const Vector& inverse_ete_g,
+          double* rhs) {
+  const CompressedRowBlockStructure* bs = A->block_structure();
+  const int e_block_size = inverse_ete_g.rows();
+  int b_pos = bs->rows[row_block_counter].block.position;
+  for (int j = 0; j < chunk.size; ++j) {
+    const CompressedRow& row = bs->rows[row_block_counter + j];
+    const double *row_values = A->RowBlockValues(row_block_counter + j);
+    const Cell& e_cell = row.cells.front();
+
+    const typename EigenTypes<kRowBlockSize, kEBlockSize>::ConstMatrixRef
+        e_block(row_values + e_cell.position,
+                row.block.size,
+                e_block_size);
+
+    const typename EigenTypes<kRowBlockSize>::Vector
+        sj =
+        typename EigenTypes<kRowBlockSize>::ConstVectorRef
+         (b + b_pos, row.block.size) - e_block * (inverse_ete_g);
+
+    for (int c = 1; c < row.cells.size(); ++c) {
+      const int block_id = row.cells[c].block_id;
+      const int block_size = bs->cols[block_id].size;
+      const typename EigenTypes<kRowBlockSize, kFBlockSize>::ConstMatrixRef
+          b(row_values + row.cells[c].position,
+            row.block.size, block_size);
+
+      const int block = block_id - num_eliminate_blocks_;
+      MutexLock l(rhs_locks_[block]);
+      typename EigenTypes<kFBlockSize>::VectorRef
+          (rhs + lhs_row_layout_[block], block_size).noalias()
+          += b.transpose() * sj;
+    }
+    b_pos += row.block.size;
+  }
+}
+
+// Given a Chunk - set of rows with the same e_block, e.g. in the
+// following Chunk with two rows.
+//
+//                E                   F
+//      [ y11   0   0   0 |  z11     0    0   0    z51]
+//      [ y12   0   0   0 |  z12   z22    0   0      0]
+//
+// this function computes twp matrices. The diagonal block matrix
+//
+//   ete = y11 * y11' + y12 * y12'
+//
+// and the off diagonal blocks in the Guass Newton Hessian.
+//
+//   buffer = [y11'(z11 + z12), y12' * z22, y11' * z51]
+//
+// which are zero compressed versions of the block sparse matrices E'E
+// and E'F.
+//
+// and the gradient of the e_block, E'b.
+template <int kRowBlockSize, int kEBlockSize, int kFBlockSize>
+void
+SchurEliminator<kRowBlockSize, kEBlockSize, kFBlockSize>::
+ChunkDiagonalBlockAndGradient(
+    const Chunk& chunk,
+    const BlockSparseMatrixBase* A,
+    const double* b,
+    int row_block_counter,
+    typename EigenTypes<kEBlockSize, kEBlockSize>::Matrix* ete,
+    typename EigenTypes<kEBlockSize>::Vector* g,
+    double* buffer,
+    BlockRandomAccessMatrix* lhs) {
+  const CompressedRowBlockStructure* bs = A->block_structure();
+
+  int b_pos = bs->rows[row_block_counter].block.position;
+  const int e_block_size = ete->rows();
+
+  // Iterate over the rows in this chunk, for each row, compute the
+  // contribution of its F blocks to the Schur complement, the
+  // contribution of its E block to the matrix EE' (ete), and the
+  // corresponding block in the gradient vector.
+  for (int j = 0; j < chunk.size; ++j) {
+    const CompressedRow& row = bs->rows[row_block_counter + j];
+    const double *row_values = A->RowBlockValues(row_block_counter + j);
+
+    if (row.cells.size() > 1) {
+      EBlockRowOuterProduct(A, row_block_counter + j, lhs);
+    }
+
+    // Extract the e_block, ETE += E_i' E_i
+    const Cell& e_cell = row.cells.front();
+    const typename EigenTypes<kRowBlockSize, kEBlockSize>::ConstMatrixRef
+        e_block(row_values + e_cell.position,
+                row.block.size,
+                e_block_size);
+
+    ete->template selfadjointView<Eigen::Upper>()
+        .rankUpdate(e_block.transpose(), 1.0);
+
+    // g += E_i' b_i
+    g->noalias() += e_block.transpose() *
+        typename EigenTypes<kRowBlockSize>::ConstVectorRef
+        (b + b_pos, row.block.size);
+
+    // buffer = E'F. This computation is done by iterating over the
+    // f_blocks for each row in the chunk.
+    for (int c = 1; c < row.cells.size(); ++c) {
+      const int f_block_id = row.cells[c].block_id;
+      const int f_block_size = bs->cols[f_block_id].size;
+      const typename EigenTypes<kRowBlockSize, kFBlockSize>::ConstMatrixRef
+          f_block(row_values + row.cells[c].position,
+                  row.block.size, f_block_size);
+
+      double* buffer_ptr =
+          buffer +  FindOrDie(chunk.buffer_layout, f_block_id);
+
+      typename EigenTypes<kEBlockSize, kFBlockSize>::MatrixRef
+          (buffer_ptr,  e_block_size, f_block_size).noalias()
+          += e_block.transpose() * f_block;
+    }
+    b_pos += row.block.size;
+  }
+}
+
+// Compute the outer product F'E(E'E)^{-1}E'F and subtract it from the
+// Schur complement matrix, i.e
+//
+//  S -= F'E(E'E)^{-1}E'F.
+template <int kRowBlockSize, int kEBlockSize, int kFBlockSize>
+void
+SchurEliminator<kRowBlockSize, kEBlockSize, kFBlockSize>::
+ChunkOuterProduct(const CompressedRowBlockStructure* bs,
+                  const Matrix& inverse_ete,
+                  const double* buffer,
+                  const BufferLayoutType& buffer_layout,
+                  BlockRandomAccessMatrix* lhs) {
+  // This is the most computationally expensive part of this
+  // code. Profiling experiments reveal that the bottleneck is not the
+  // computation of the right-hand matrix product, but memory
+  // references to the left hand side.
+  const int e_block_size = inverse_ete.rows();
+  BufferLayoutType::const_iterator it1 = buffer_layout.begin();
+  // S(i,j) -= bi' * ete^{-1} b_j
+  for (; it1 != buffer_layout.end(); ++it1) {
+    const int block1 = it1->first - num_eliminate_blocks_;
+    const int block1_size = bs->cols[it1->first].size;
+
+    const typename EigenTypes<kEBlockSize, kFBlockSize>::ConstMatrixRef
+        b1(buffer + it1->second, e_block_size, block1_size);
+    const typename EigenTypes<kFBlockSize, kEBlockSize>::Matrix
+        b1_transpose_inverse_ete = b1.transpose() * inverse_ete;
+
+    BufferLayoutType::const_iterator it2 = it1;
+    for (; it2 != buffer_layout.end(); ++it2) {
+      const int block2 = it2->first - num_eliminate_blocks_;
+
+      int r, c, row_stride, col_stride;
+      CellInfo* cell_info = lhs->GetCell(block1, block2,
+                                         &r, &c,
+                                         &row_stride, &col_stride);
+      if (cell_info == NULL) {
+        continue;
+      }
+
+      const int block2_size = bs->cols[it2->first].size;
+      const typename EigenTypes<kEBlockSize, kFBlockSize>::ConstMatrixRef
+          b2(buffer + it2->second, e_block_size, block2_size);
+
+      MutexLock l(&cell_info->m);
+      MatrixRef m(cell_info->values, row_stride, col_stride);
+
+      // We explicitly construct a block object here instead of using
+      // m.block(), as m.block() variant of the constructor does not
+      // allow mixing of template sizing and runtime sizing parameters
+      // like the Matrix class does.
+      Eigen::Block<MatrixRef, kFBlockSize, kFBlockSize>
+          block(m, r, c,  block1_size, block2_size);
+      block.noalias() -=  b1_transpose_inverse_ete * b2;
+    }
+  }
+}
+
+// For rows with no e_blocks, the schur complement update reduces to S
+// += F'F. This function iterates over the rows of A with no e_block,
+// and calls NoEBlockRowOuterProduct on each row.
+template <int kRowBlockSize, int kEBlockSize, int kFBlockSize>
+void
+SchurEliminator<kRowBlockSize, kEBlockSize, kFBlockSize>::
+NoEBlockRowsUpdate(const BlockSparseMatrixBase* A,
+                   const double* b,
+                   int row_block_counter,
+                   BlockRandomAccessMatrix* lhs,
+                   double* rhs) {
+  const CompressedRowBlockStructure* bs = A->block_structure();
+  for (; row_block_counter < bs->rows.size(); ++row_block_counter) {
+    const CompressedRow& row = bs->rows[row_block_counter];
+    const double *row_values = A->RowBlockValues(row_block_counter);
+    for (int c = 0; c < row.cells.size(); ++c) {
+      const int block_id = row.cells[c].block_id;
+      const int block_size = bs->cols[block_id].size;
+      const int block = block_id - num_eliminate_blocks_;
+      VectorRef(rhs + lhs_row_layout_[block], block_size).noalias()
+          += (ConstMatrixRef(row_values + row.cells[c].position,
+                             row.block.size, block_size).transpose() *
+              ConstVectorRef(b + row.block.position, row.block.size));
+    }
+    NoEBlockRowOuterProduct(A, row_block_counter, lhs);
+  }
+}
+
+
+// A row r of A, which has no e_blocks gets added to the Schur
+// Complement as S += r r'. This function is responsible for computing
+// the contribution of a single row r to the Schur complement. It is
+// very similar in structure to EBlockRowOuterProduct except for
+// one difference. It does not use any of the template
+// parameters. This is because the algorithm used for detecting the
+// static structure of the matrix A only pays attention to rows with
+// e_blocks. This is becase rows without e_blocks are rare and
+// typically arise from regularization terms in the original
+// optimization problem, and have a very different structure than the
+// rows with e_blocks. Including them in the static structure
+// detection will lead to most template parameters being set to
+// dynamic. Since the number of rows without e_blocks is small, the
+// lack of templating is not an issue.
+template <int kRowBlockSize, int kEBlockSize, int kFBlockSize>
+void
+SchurEliminator<kRowBlockSize, kEBlockSize, kFBlockSize>::
+NoEBlockRowOuterProduct(const BlockSparseMatrixBase* A,
+                     int row_block_index,
+                     BlockRandomAccessMatrix* lhs) {
+  const CompressedRowBlockStructure* bs = A->block_structure();
+  const CompressedRow& row = bs->rows[row_block_index];
+  const double *row_values = A->RowBlockValues(row_block_index);
+  for (int i = 0; i < row.cells.size(); ++i) {
+    const int block1 = row.cells[i].block_id - num_eliminate_blocks_;
+    DCHECK_GE(block1, 0);
+
+    const int block1_size = bs->cols[row.cells[i].block_id].size;
+    const ConstMatrixRef b1(row_values + row.cells[i].position,
+                            row.block.size, block1_size);
+    int r, c, row_stride, col_stride;
+    CellInfo* cell_info = lhs->GetCell(block1, block1,
+                                       &r, &c,
+                                       &row_stride, &col_stride);
+    if (cell_info != NULL) {
+      MutexLock l(&cell_info->m);
+      MatrixRef m(cell_info->values, row_stride, col_stride);
+      m.block(r, c, block1_size, block1_size)
+          .selfadjointView<Eigen::Upper>()
+          .rankUpdate(b1.transpose(), 1.0);
+    }
+
+    for (int j = i + 1; j < row.cells.size(); ++j) {
+      const int block2 = row.cells[j].block_id - num_eliminate_blocks_;
+      DCHECK_GE(block2, 0);
+      DCHECK_LT(block1, block2);
+      int r, c, row_stride, col_stride;
+      CellInfo* cell_info = lhs->GetCell(block1, block2,
+                                         &r, &c,
+                                         &row_stride, &col_stride);
+      if (cell_info == NULL) {
+        continue;
+      }
+
+      const int block2_size = bs->cols[row.cells[j].block_id].size;
+      MutexLock l(&cell_info->m);
+      MatrixRef m(cell_info->values, row_stride, col_stride);
+      m.block(r, c, block1_size, block2_size).noalias() +=
+          b1.transpose() * ConstMatrixRef(row_values + row.cells[j].position,
+                                          row.block.size,
+                                          block2_size);
+    }
+  }
+}
+
+// For a row with an e_block, compute the contribition S += F'F. This
+// function has the same structure as NoEBlockRowOuterProduct, except
+// that this function uses the template parameters.
+template <int kRowBlockSize, int kEBlockSize, int kFBlockSize>
+void
+SchurEliminator<kRowBlockSize, kEBlockSize, kFBlockSize>::
+EBlockRowOuterProduct(const BlockSparseMatrixBase* A,
+                      int row_block_index,
+                      BlockRandomAccessMatrix* lhs) {
+  const CompressedRowBlockStructure* bs = A->block_structure();
+  const CompressedRow& row = bs->rows[row_block_index];
+  const double *row_values = A->RowBlockValues(row_block_index);
+  for (int i = 1; i < row.cells.size(); ++i) {
+    const int block1 = row.cells[i].block_id - num_eliminate_blocks_;
+    DCHECK_GE(block1, 0);
+
+    const int block1_size = bs->cols[row.cells[i].block_id].size;
+    const typename EigenTypes<kRowBlockSize, kFBlockSize>::ConstMatrixRef
+        b1(row_values + row.cells[i].position,
+           row.block.size, block1_size);
+    {
+      int r, c, row_stride, col_stride;
+      CellInfo* cell_info = lhs->GetCell(block1, block1,
+                                         &r, &c,
+                                         &row_stride, &col_stride);
+      if (cell_info == NULL) {
+        continue;
+      }
+
+      MutexLock l(&cell_info->m);
+      MatrixRef m(cell_info->values, row_stride, col_stride);
+
+      Eigen::Block<MatrixRef, kFBlockSize, kFBlockSize>
+          block(m, r, c,  block1_size, block1_size);
+      block.template selfadjointView<Eigen::Upper>()
+          .rankUpdate(b1.transpose(), 1.0);
+    }
+
+    for (int j = i + 1; j < row.cells.size(); ++j) {
+      const int block2 = row.cells[j].block_id - num_eliminate_blocks_;
+      DCHECK_GE(block2, 0);
+      DCHECK_LT(block1, block2);
+      const int block2_size = bs->cols[row.cells[j].block_id].size;
+      int r, c, row_stride, col_stride;
+      CellInfo* cell_info = lhs->GetCell(block1, block2,
+                                         &r, &c,
+                                         &row_stride, &col_stride);
+      if (cell_info == NULL) {
+        continue;
+      }
+
+      const typename EigenTypes<kRowBlockSize, kFBlockSize>::ConstMatrixRef
+          b2(row_values + row.cells[j].position,
+             row.block.size,
+             block2_size);
+
+      MutexLock l(&cell_info->m);
+      MatrixRef m(cell_info->values, row_stride, col_stride);
+      Eigen::Block<MatrixRef, kFBlockSize, kFBlockSize>
+          block(m, r, c,  block1_size, block2_size);
+      block.noalias() += b1.transpose() * b2;
+    }
+  }
+}
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_SCHUR_ELIMINATOR_IMPL_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/schur_ordering.cc b/extern/libmv/third_party/ceres/internal/ceres/schur_ordering.cc
new file mode 100644
index 00000000000..c4fc1da3c2f
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/schur_ordering.cc
@@ -0,0 +1,113 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#include "ceres/schur_ordering.h"
+
+#include <glog/logging.h>
+#include "ceres/graph.h"
+#include "ceres/graph_algorithms.h"
+#include "ceres/map_util.h"
+#include "ceres/parameter_block.h"
+#include "ceres/program.h"
+#include "ceres/residual_block.h"
+#include "ceres/internal/scoped_ptr.h"
+
+CERES_HASH_NAMESPACE_START
+
+// Allow us to hash pointers as if they were int's
+template<> struct hash< ::ceres::internal::ParameterBlock*> {
+  size_t operator()(::ceres::internal::ParameterBlock* x) const {
+    return reinterpret_cast<size_t>(x);
+  }
+};
+
+CERES_HASH_NAMESPACE_END
+
+namespace ceres {
+namespace internal {
+
+int ComputeSchurOrdering(const Program& program,
+                         vector<ParameterBlock*>* ordering) {
+  CHECK_NOTNULL(ordering)->clear();
+
+  scoped_ptr<Graph< ParameterBlock*> > graph(
+      CHECK_NOTNULL(CreateHessianGraph(program)));
+  int independent_set_size =
+      IndependentSetOrdering<ParameterBlock*>(*graph, ordering);
+  const vector<ParameterBlock*>& parameter_blocks = program.parameter_blocks();
+
+  // Add the excluded blocks to back of the ordering vector.
+  for (int i = 0; i < parameter_blocks.size(); ++i) {
+    ParameterBlock* parameter_block = parameter_blocks[i];
+    if (parameter_block->IsConstant()) {
+      ordering->push_back(parameter_block);
+    }
+  }
+
+  return independent_set_size;
+}
+
+Graph<ParameterBlock*>*
+CreateHessianGraph(const Program& program) {
+  Graph<ParameterBlock*>* graph = new Graph<ParameterBlock*>;
+  const vector<ParameterBlock*>& parameter_blocks = program.parameter_blocks();
+  for (int i = 0; i < parameter_blocks.size(); ++i) {
+    ParameterBlock* parameter_block = parameter_blocks[i];
+    if (!parameter_block->IsConstant()) {
+      graph->AddVertex(parameter_block);
+    }
+  }
+
+  const vector<ResidualBlock*>& residual_blocks = program.residual_blocks();
+  for (int i = 0; i < residual_blocks.size(); ++i) {
+    const ResidualBlock* residual_block = residual_blocks[i];
+    const int num_parameter_blocks = residual_block->NumParameterBlocks();
+    ParameterBlock* const* parameter_blocks =
+        residual_block->parameter_blocks();
+    for (int j = 0; j < num_parameter_blocks; ++j) {
+      if (parameter_blocks[j]->IsConstant()) {
+        continue;
+      }
+
+      for (int k = j + 1; k < num_parameter_blocks; ++k) {
+        if (parameter_blocks[k]->IsConstant()) {
+          continue;
+        }
+
+        graph->AddEdge(parameter_blocks[j], parameter_blocks[k]);
+      }
+    }
+  }
+
+  return graph;
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/schur_ordering.h b/extern/libmv/third_party/ceres/internal/ceres/schur_ordering.h
new file mode 100644
index 00000000000..1f9a4ff354f
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/schur_ordering.h
@@ -0,0 +1,74 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Compute a parameter block ordering for use with the Schur
+// complement based algorithms.
+
+#ifndef CERES_INTERNAL_SCHUR_ORDERING_H_
+#define CERES_INTERNAL_SCHUR_ORDERING_H_
+
+#include <vector>
+#include "ceres/graph.h"
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+
+class Program;
+class ParameterBlock;
+
+// Uses an approximate independent set ordering to order the parameter
+// blocks of a problem so that it is suitable for use with Schur
+// complement based solvers. The output variable ordering contains an
+// ordering of the parameter blocks and the return value is size of
+// the independent set or the number of e_blocks (see
+// schur_complement_solver.h for an explanation). Constant parameters
+// are added to the end.
+//
+// The ordering vector has the structure
+//
+// ordering = [independent set,
+//             complement of the independent set,
+//             fixed blocks]
+int ComputeSchurOrdering(const Program& program,
+                         vector<ParameterBlock* >* ordering);
+
+
+// Builds a graph on the parameter blocks of a Problem, whose
+// structure reflects the sparsity structure of the Hessian. Each
+// vertex corresponds to a parameter block in the Problem except for
+// parameter blocks that are marked constant. An edge connects two
+// parameter blocks, if they co-occur in a residual block.
+Graph<ParameterBlock*>* CreateHessianGraph(const Program& program);
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_SCHUR_ORDERING_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/scratch_evaluate_preparer.cc b/extern/libmv/third_party/ceres/internal/ceres/scratch_evaluate_preparer.cc
new file mode 100644
index 00000000000..6f0ceefd87d
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/scratch_evaluate_preparer.cc
@@ -0,0 +1,78 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+
+#include "ceres/scratch_evaluate_preparer.h"
+
+#include "ceres/parameter_block.h"
+#include "ceres/program.h"
+#include "ceres/residual_block.h"
+
+namespace ceres {
+namespace internal {
+
+ScratchEvaluatePreparer* ScratchEvaluatePreparer::Create(
+    const Program &program,
+    int num_threads) {
+  ScratchEvaluatePreparer* preparers = new ScratchEvaluatePreparer[num_threads];
+  int max_derivatives_per_residual_block =
+      program.MaxDerivativesPerResidualBlock();
+  for (int i = 0; i < num_threads; i++) {
+    preparers[i].Init(max_derivatives_per_residual_block);
+  }
+  return preparers;
+}
+
+void ScratchEvaluatePreparer::Init(int max_derivatives_per_residual_block) {
+  jacobian_scratch_.reset(
+      new double[max_derivatives_per_residual_block]);
+}
+
+// Point the jacobian blocks into the scratch area of this evaluate preparer.
+void ScratchEvaluatePreparer::Prepare(const ResidualBlock* residual_block,
+                                      int /* residual_block_index */,
+                                      SparseMatrix* /* jacobian */,
+                                      double** jacobians) {
+  double* jacobian_block_cursor = jacobian_scratch_.get();
+  int num_residuals = residual_block->NumResiduals();
+  int num_parameter_blocks = residual_block->NumParameterBlocks();
+  for (int j = 0; j < num_parameter_blocks; ++j) {
+    const ParameterBlock* parameter_block =
+        residual_block->parameter_blocks()[j];
+    if (parameter_block->IsConstant()) {
+      jacobians[j] = NULL;
+    } else {
+      jacobians[j] = jacobian_block_cursor;
+      jacobian_block_cursor += num_residuals * parameter_block->LocalSize();
+    }
+  }
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/scratch_evaluate_preparer.h b/extern/libmv/third_party/ceres/internal/ceres/scratch_evaluate_preparer.h
new file mode 100644
index 00000000000..6b127081976
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/scratch_evaluate_preparer.h
@@ -0,0 +1,69 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//
+// A scratch evaluate preparer provides temporary storage for the jacobians that
+// are created when running user-provided cost functions. The evaluator takes
+// care to avoid evaluating the jacobian for fixed parameters.
+
+#ifndef CERES_INTERNAL_SCRATCH_EVALUATE_PREPARER_H_
+#define CERES_INTERNAL_SCRATCH_EVALUATE_PREPARER_H_
+
+#include "ceres/internal/scoped_ptr.h"
+
+namespace ceres {
+namespace internal {
+
+class Program;
+class ResidualBlock;
+class SparseMatrix;
+
+class ScratchEvaluatePreparer {
+ public:
+  // Create num_threads ScratchEvaluatePreparers.
+  static ScratchEvaluatePreparer* Create(const Program &program,
+                                         int num_threads);
+
+  // EvaluatePreparer interface
+  void Init(int max_derivatives_per_residual_block);
+  void Prepare(const ResidualBlock* residual_block,
+               int residual_block_index,
+               SparseMatrix* jacobian,
+               double** jacobians);
+
+ private:
+  // Scratch space for the jacobians; each jacobian is packed one after another.
+  // There is enough scratch to hold all the jacobians for the largest residual.
+  scoped_array<double> jacobian_scratch_;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_SCRATCH_EVALUATE_PREPARER_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/solver.cc b/extern/libmv/third_party/ceres/internal/ceres/solver.cc
new file mode 100644
index 00000000000..77f04d1d918
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/solver.cc
@@ -0,0 +1,230 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+//         sameeragarwal@google.com (Sameer Agarwal)
+
+#include "ceres/solver.h"
+
+#include <vector>
+#include "ceres/levenberg_marquardt.h"
+#include "ceres/program.h"
+#include "ceres/solver_impl.h"
+#include "ceres/stringprintf.h"
+#include "ceres/problem.h"
+
+namespace ceres {
+
+Solver::~Solver() {}
+
+// TODO(sameeragarwal): The timing code here should use a sub-second
+// timer.
+void Solver::Solve(const Solver::Options& options,
+                   Problem* problem,
+                   Solver::Summary* summary) {
+  time_t start_time_seconds = time(NULL);
+  internal::SolverImpl::Solve(options, problem, summary);
+  summary->total_time_in_seconds =  time(NULL) - start_time_seconds;
+  summary->preprocessor_time_in_seconds =
+      summary->total_time_in_seconds - summary->minimizer_time_in_seconds;
+}
+
+void Solve(const Solver::Options& options,
+           Problem* problem,
+           Solver::Summary* summary) {
+  time_t start_time_seconds = time(NULL);
+  internal::SolverImpl::Solve(options, problem, summary);
+  summary->total_time_in_seconds =  time(NULL) - start_time_seconds;
+  summary->preprocessor_time_in_seconds =
+      summary->total_time_in_seconds - summary->minimizer_time_in_seconds;
+}
+
+Solver::Summary::Summary()
+    // Invalid values for most fields, to ensure that we are not
+    // accidentally reporting default values.
+    : termination_type(DID_NOT_RUN),
+      initial_cost(-1.0),
+      final_cost(-1.0),
+      fixed_cost(-1.0),
+      num_successful_steps(-1),
+      num_unsuccessful_steps(-1),
+      preprocessor_time_in_seconds(-1.0),
+      minimizer_time_in_seconds(-1.0),
+      total_time_in_seconds(-1.0),
+      num_parameter_blocks(-1),
+      num_parameters(-1),
+      num_residual_blocks(-1),
+      num_residuals(-1),
+      num_parameter_blocks_reduced(-1),
+      num_parameters_reduced(-1),
+      num_residual_blocks_reduced(-1),
+      num_residuals_reduced(-1),
+      num_eliminate_blocks_given(-1),
+      num_eliminate_blocks_used(-1),
+      num_threads_given(-1),
+      num_threads_used(-1),
+      num_linear_solver_threads_given(-1),
+      num_linear_solver_threads_used(-1),
+      linear_solver_type_given(SPARSE_NORMAL_CHOLESKY),
+      linear_solver_type_used(SPARSE_NORMAL_CHOLESKY),
+      preconditioner_type(IDENTITY),
+      ordering_type(NATURAL) {
+}
+
+string Solver::Summary::BriefReport() const {
+  string report = "Ceres Solver Report: ";
+  if (termination_type == DID_NOT_RUN) {
+    CHECK(!error.empty())
+          << "Solver terminated with DID_NOT_RUN but the solver did not "
+          << "return a reason. This is a Ceres error. Please report this "
+          << "to the Ceres team";
+    return report + "Termination: DID_NOT_RUN, because " + error;
+  }
+
+  internal::StringAppendF(&report, "Iterations: %d",
+                          num_successful_steps + num_unsuccessful_steps);
+  internal::StringAppendF(&report, ", Initial cost: %e", initial_cost);
+
+  // If the solver failed or was aborted, then the final_cost has no
+  // meaning.
+  if (termination_type != NUMERICAL_FAILURE &&
+      termination_type != USER_ABORT) {
+    internal::StringAppendF(&report, ", Final cost: %e", final_cost);
+  }
+
+  internal::StringAppendF(&report, ", Termination: %s.",
+                          SolverTerminationTypeToString(termination_type));
+  return report;
+};
+
+string Solver::Summary::FullReport() const {
+  string report =
+      "\n"
+      "Ceres Solver Report\n"
+      "-------------------\n";
+
+  if (termination_type == DID_NOT_RUN) {
+    internal::StringAppendF(&report, "                      Original\n");
+    internal::StringAppendF(&report, "Parameter blocks    % 10d\n",
+                            num_parameter_blocks);
+    internal::StringAppendF(&report, "Parameters          % 10d\n",
+                            num_parameters);
+    internal::StringAppendF(&report, "Residual blocks     % 10d\n",
+                            num_residual_blocks);
+    internal::StringAppendF(&report, "Residual            % 10d\n\n",
+                            num_residuals);
+  } else {
+    internal::StringAppendF(&report, "%45s    %21s\n", "Original", "Reduced");
+    internal::StringAppendF(&report, "Parameter blocks    % 25d% 25d\n",
+                            num_parameter_blocks, num_parameter_blocks_reduced);
+    internal::StringAppendF(&report, "Parameters          % 25d% 25d\n",
+                            num_parameters, num_parameters_reduced);
+    internal::StringAppendF(&report, "Residual blocks     % 25d% 25d\n",
+                            num_residual_blocks, num_residual_blocks_reduced);
+    internal::StringAppendF(&report, "Residual            % 25d% 25d\n\n",
+                          num_residuals, num_residuals_reduced);
+  }
+
+  internal::StringAppendF(&report,   "%45s    %21s\n", "Given",  "Used");
+  internal::StringAppendF(&report, "Linear solver       %25s%25s\n",
+                          LinearSolverTypeToString(linear_solver_type_given),
+                          LinearSolverTypeToString(linear_solver_type_used));
+
+  if (linear_solver_type_given == CGNR ||
+      linear_solver_type_given == ITERATIVE_SCHUR) {
+    internal::StringAppendF(&report, "Preconditioner      %25s%25s\n",
+                            PreconditionerTypeToString(preconditioner_type),
+                            PreconditionerTypeToString(preconditioner_type));
+  } else {
+    internal::StringAppendF(&report, "Preconditioner      %25s%25s\n",
+                            "N/A", "N/A");
+  }
+
+  internal::StringAppendF(&report, "Ordering            %25s%25s\n",
+                          OrderingTypeToString(ordering_type),
+                          OrderingTypeToString(ordering_type));
+
+  if (IsSchurType(linear_solver_type_given)) {
+    if (ordering_type == SCHUR) {
+      internal::StringAppendF(&report, "num_eliminate_blocks%25s% 25d\n",
+                              "N/A",
+                              num_eliminate_blocks_used);
+    } else {
+      internal::StringAppendF(&report, "num_eliminate_blocks% 25d% 25d\n",
+                              num_eliminate_blocks_given,
+                              num_eliminate_blocks_used);
+    }
+  }
+
+  internal::StringAppendF(&report, "Threads:            % 25d% 25d\n",
+                          num_threads_given, num_threads_used);
+  internal::StringAppendF(&report, "Linear Solver Threads:% 23d% 25d\n",
+                          num_linear_solver_threads_given,
+                          num_linear_solver_threads_used);
+
+
+  if (termination_type == DID_NOT_RUN) {
+    CHECK(!error.empty())
+        << "Solver terminated with DID_NOT_RUN but the solver did not "
+        << "return a reason. This is a Ceres error. Please report this "
+        << "to the Ceres team";
+    internal::StringAppendF(&report, "Termination:           %20s\n",
+                            "DID_NOT_RUN");
+    internal::StringAppendF(&report, "Reason: %s\n", error.c_str());
+    return report;
+  }
+
+  internal::StringAppendF(&report, "\nCost:\n");
+  internal::StringAppendF(&report, "Initial        % 30e\n", initial_cost);
+  if (termination_type != NUMERICAL_FAILURE && termination_type != USER_ABORT) {
+    internal::StringAppendF(&report, "Final          % 30e\n", final_cost);
+    internal::StringAppendF(&report, "Change         % 30e\n",
+                            initial_cost - final_cost);
+  }
+
+  internal::StringAppendF(&report, "\nNumber of iterations:\n");
+  internal::StringAppendF(&report, "Successful               % 20d\n",
+                          num_successful_steps);
+  internal::StringAppendF(&report, "Unsuccessful             % 20d\n",
+                          num_unsuccessful_steps);
+  internal::StringAppendF(&report, "Total                    % 20d\n",
+                          num_successful_steps + num_unsuccessful_steps);
+  internal::StringAppendF(&report, "\nTime (in seconds):\n");
+  internal::StringAppendF(&report, "Preprocessor        % 25e\n",
+                          preprocessor_time_in_seconds);
+  internal::StringAppendF(&report, "Minimizer           % 25e\n",
+                          minimizer_time_in_seconds);
+  internal::StringAppendF(&report, "Total               % 25e\n",
+                          total_time_in_seconds);
+
+  internal::StringAppendF(&report, "Termination:        %25s\n",
+                SolverTerminationTypeToString(termination_type));
+  return report;
+};
+
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/solver_impl.cc b/extern/libmv/third_party/ceres/internal/ceres/solver_impl.cc
new file mode 100644
index 00000000000..ed07d9dc6d7
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/solver_impl.cc
@@ -0,0 +1,693 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+
+#include "ceres/solver_impl.h"
+
+#include <iostream>  // NOLINT
+#include <numeric>
+#include "ceres/evaluator.h"
+#include "ceres/gradient_checking_cost_function.h"
+#include "ceres/levenberg_marquardt.h"
+#include "ceres/linear_solver.h"
+#include "ceres/map_util.h"
+#include "ceres/minimizer.h"
+#include "ceres/parameter_block.h"
+#include "ceres/problem_impl.h"
+#include "ceres/program.h"
+#include "ceres/residual_block.h"
+#include "ceres/schur_ordering.h"
+#include "ceres/stringprintf.h"
+#include "ceres/iteration_callback.h"
+#include "ceres/problem.h"
+
+namespace ceres {
+namespace internal {
+namespace {
+
+void EvaluateCostAndResiduals(ProblemImpl* problem_impl,
+                              double* cost,
+                              vector<double>* residuals) {
+  CHECK_NOTNULL(cost);
+  Program* program = CHECK_NOTNULL(problem_impl)->mutable_program();
+  if (residuals != NULL) {
+    residuals->resize(program->NumResiduals());
+    program->Evaluate(cost, &(*residuals)[0]);
+  } else {
+    program->Evaluate(cost, NULL);
+  }
+}
+
+// Callback for updating the user's parameter blocks. Updates are only
+// done if the step is successful.
+class StateUpdatingCallback : public IterationCallback {
+ public:
+  StateUpdatingCallback(Program* program, double* parameters)
+      : program_(program), parameters_(parameters) {}
+
+  CallbackReturnType operator()(const IterationSummary& summary) {
+    if (summary.step_is_successful) {
+      program_->StateVectorToParameterBlocks(parameters_);
+      program_->CopyParameterBlockStateToUserState();
+    }
+    return SOLVER_CONTINUE;
+  }
+
+ private:
+  Program* program_;
+  double* parameters_;
+};
+
+// Callback for logging the state of the minimizer to STDERR or STDOUT
+// depending on the user's preferences and logging level.
+class LoggingCallback : public IterationCallback {
+ public:
+  explicit LoggingCallback(bool log_to_stdout)
+      : log_to_stdout_(log_to_stdout) {}
+
+  ~LoggingCallback() {}
+
+  CallbackReturnType operator()(const IterationSummary& summary) {
+    const char* kReportRowFormat =
+        "% 4d: f:% 8e d:% 3.2e g:% 3.2e h:% 3.2e "
+        "rho:% 3.2e mu:% 3.2e li:% 3d";
+    string output = StringPrintf(kReportRowFormat,
+                                 summary.iteration,
+                                 summary.cost,
+                                 summary.cost_change,
+                                 summary.gradient_max_norm,
+                                 summary.step_norm,
+                                 summary.relative_decrease,
+                                 summary.mu,
+                                 summary.linear_solver_iterations);
+    if (log_to_stdout_) {
+      cout << output << endl;
+    } else {
+      VLOG(1) << output;
+    }
+    return SOLVER_CONTINUE;
+  }
+
+ private:
+  const bool log_to_stdout_;
+};
+
+}  // namespace
+
+void SolverImpl::Minimize(const Solver::Options& options,
+                          Program* program,
+                          Evaluator* evaluator,
+                          LinearSolver* linear_solver,
+                          double* initial_parameters,
+                          double* final_parameters,
+                          Solver::Summary* summary) {
+  Minimizer::Options minimizer_options(options);
+
+  LoggingCallback logging_callback(options.minimizer_progress_to_stdout);
+  if (options.logging_type != SILENT) {
+    minimizer_options.callbacks.push_back(&logging_callback);
+  }
+
+  StateUpdatingCallback updating_callback(program, initial_parameters);
+  if (options.update_state_every_iteration) {
+    minimizer_options.callbacks.push_back(&updating_callback);
+  }
+
+  LevenbergMarquardt levenberg_marquardt;
+
+  time_t start_minimizer_time_seconds = time(NULL);
+  levenberg_marquardt.Minimize(minimizer_options,
+                               evaluator,
+                               linear_solver,
+                               initial_parameters,
+                               final_parameters,
+                               summary);
+  summary->minimizer_time_in_seconds =
+      time(NULL) - start_minimizer_time_seconds;
+}
+
+void SolverImpl::Solve(const Solver::Options& original_options,
+                       Problem* problem,
+                       Solver::Summary* summary) {
+  Solver::Options options(original_options);
+
+#ifndef CERES_USE_OPENMP
+  if (options.num_threads > 1) {
+    LOG(WARNING)
+        << "OpenMP support is not compiled into this binary; "
+        << "only options.num_threads=1 is supported. Switching"
+        << "to single threaded mode.";
+    options.num_threads = 1;
+  }
+  if (options.num_linear_solver_threads > 1) {
+    LOG(WARNING)
+        << "OpenMP support is not compiled into this binary; "
+        << "only options.num_linear_solver_threads=1 is supported. Switching"
+        << "to single threaded mode.";
+    options.num_linear_solver_threads = 1;
+  }
+#endif
+
+  // Reset the summary object to its default values;
+  *CHECK_NOTNULL(summary) = Solver::Summary();
+  summary->linear_solver_type_given = options.linear_solver_type;
+  summary->num_eliminate_blocks_given = original_options.num_eliminate_blocks;
+  summary->num_threads_given = original_options.num_threads;
+  summary->num_linear_solver_threads_given =
+      original_options.num_linear_solver_threads;
+  summary->ordering_type = original_options.ordering_type;
+
+  ProblemImpl* problem_impl = CHECK_NOTNULL(problem)->problem_impl_.get();
+
+  summary->num_parameter_blocks = problem_impl->NumParameterBlocks();
+  summary->num_parameters = problem_impl->NumParameters();
+  summary->num_residual_blocks = problem_impl->NumResidualBlocks();
+  summary->num_residuals = problem_impl->NumResiduals();
+
+  summary->num_threads_used = options.num_threads;
+
+  // Evaluate the initial cost and residual vector (if needed). The
+  // initial cost needs to be computed on the original unpreprocessed
+  // problem, as it is used to determine the value of the "fixed" part
+  // of the objective function after the problem has undergone
+  // reduction. Also the initial residuals are in the order in which
+  // the user added the ResidualBlocks to the optimization problem.
+  EvaluateCostAndResiduals(problem_impl,
+                           &summary->initial_cost,
+                           options.return_initial_residuals
+                           ? &summary->initial_residuals
+                           : NULL);
+
+  // If the user requests gradient checking, construct a new
+  // ProblemImpl by wrapping the CostFunctions of problem_impl inside
+  // GradientCheckingCostFunction and replacing problem_impl with
+  // gradient_checking_problem_impl.
+  scoped_ptr<ProblemImpl> gradient_checking_problem_impl;
+  if (options.check_gradients) {
+    VLOG(1) << "Checking Gradients";
+    gradient_checking_problem_impl.reset(
+        CreateGradientCheckingProblemImpl(
+            problem_impl,
+            options.numeric_derivative_relative_step_size,
+            options.gradient_check_relative_precision));
+
+    // From here on, problem_impl will point to the GradientChecking version.
+    problem_impl = gradient_checking_problem_impl.get();
+  }
+
+  // Create the three objects needed to minimize: the transformed program, the
+  // evaluator, and the linear solver.
+
+  scoped_ptr<Program> reduced_program(
+      CreateReducedProgram(&options, problem_impl, &summary->error));
+  if (reduced_program == NULL) {
+    return;
+  }
+
+  summary->num_parameter_blocks_reduced = reduced_program->NumParameterBlocks();
+  summary->num_parameters_reduced = reduced_program->NumParameters();
+  summary->num_residual_blocks_reduced = reduced_program->NumResidualBlocks();
+  summary->num_residuals_reduced = reduced_program->NumResiduals();
+
+  scoped_ptr<LinearSolver>
+      linear_solver(CreateLinearSolver(&options, &summary->error));
+  summary->linear_solver_type_used = options.linear_solver_type;
+  summary->preconditioner_type = options.preconditioner_type;
+  summary->num_eliminate_blocks_used = options.num_eliminate_blocks;
+  summary->num_linear_solver_threads_used = options.num_linear_solver_threads;
+
+  if (linear_solver == NULL) {
+    return;
+  }
+
+  if (!MaybeReorderResidualBlocks(options,
+                                  reduced_program.get(),
+                                  &summary->error)) {
+    return;
+  }
+
+  scoped_ptr<Evaluator> evaluator(
+      CreateEvaluator(options, reduced_program.get(), &summary->error));
+  if (evaluator == NULL) {
+    return;
+  }
+
+  // The optimizer works on contiguous parameter vectors; allocate some.
+  Vector initial_parameters(reduced_program->NumParameters());
+  Vector optimized_parameters(reduced_program->NumParameters());
+
+  // Collect the discontiguous parameters into a contiguous state vector.
+  reduced_program->ParameterBlocksToStateVector(&initial_parameters[0]);
+
+  // Run the optimization.
+  Minimize(options,
+           reduced_program.get(),
+           evaluator.get(),
+           linear_solver.get(),
+           initial_parameters.data(),
+           optimized_parameters.data(),
+           summary);
+
+  // If the user aborted mid-optimization or the optimization
+  // terminated because of a numerical failure, then return without
+  // updating user state.
+  if (summary->termination_type == USER_ABORT ||
+      summary->termination_type == NUMERICAL_FAILURE) {
+    return;
+  }
+
+  // Push the contiguous optimized parameters back to the user's parameters.
+  reduced_program->StateVectorToParameterBlocks(&optimized_parameters[0]);
+  reduced_program->CopyParameterBlockStateToUserState();
+
+  // Return the final cost and residuals for the original problem.
+  EvaluateCostAndResiduals(problem->problem_impl_.get(),
+                           &summary->final_cost,
+                           options.return_final_residuals
+                           ? &summary->final_residuals
+                           : NULL);
+
+  // Stick a fork in it, we're done.
+  return;
+}
+
+// Strips varying parameters and residuals, maintaining order, and updating
+// num_eliminate_blocks.
+bool SolverImpl::RemoveFixedBlocksFromProgram(Program* program,
+                                              int* num_eliminate_blocks,
+                                              string* error) {
+  int original_num_eliminate_blocks = *num_eliminate_blocks;
+  vector<ParameterBlock*>* parameter_blocks =
+      program->mutable_parameter_blocks();
+
+  // Mark all the parameters as unused. Abuse the index member of the parameter
+  // blocks for the marking.
+  for (int i = 0; i < parameter_blocks->size(); ++i) {
+    (*parameter_blocks)[i]->set_index(-1);
+  }
+
+  // Filter out residual that have all-constant parameters, and mark all the
+  // parameter blocks that appear in residuals.
+  {
+    vector<ResidualBlock*>* residual_blocks =
+        program->mutable_residual_blocks();
+    int j = 0;
+    for (int i = 0; i < residual_blocks->size(); ++i) {
+      ResidualBlock* residual_block = (*residual_blocks)[i];
+      int num_parameter_blocks = residual_block->NumParameterBlocks();
+
+      // Determine if the residual block is fixed, and also mark varying
+      // parameters that appear in the residual block.
+      bool all_constant = true;
+      for (int k = 0; k < num_parameter_blocks; k++) {
+        ParameterBlock* parameter_block = residual_block->parameter_blocks()[k];
+        if (!parameter_block->IsConstant()) {
+          all_constant = false;
+          parameter_block->set_index(1);
+        }
+      }
+
+      if (!all_constant) {
+        (*residual_blocks)[j++] = (*residual_blocks)[i];
+      }
+    }
+    residual_blocks->resize(j);
+  }
+
+  // Filter out unused or fixed parameter blocks, and update
+  // num_eliminate_blocks as necessary.
+  {
+    vector<ParameterBlock*>* parameter_blocks =
+        program->mutable_parameter_blocks();
+    int j = 0;
+    for (int i = 0; i < parameter_blocks->size(); ++i) {
+      ParameterBlock* parameter_block = (*parameter_blocks)[i];
+      if (parameter_block->index() == 1) {
+        (*parameter_blocks)[j++] = parameter_block;
+      } else if (i < original_num_eliminate_blocks) {
+        (*num_eliminate_blocks)--;
+      }
+    }
+    parameter_blocks->resize(j);
+  }
+
+  CHECK(((program->NumResidualBlocks() == 0) &&
+         (program->NumParameterBlocks() == 0)) ||
+        ((program->NumResidualBlocks() != 0) &&
+         (program->NumParameterBlocks() != 0)))
+      << "Congratulations, you found a bug in Ceres. Please report it.";
+  return true;
+}
+
+Program* SolverImpl::CreateReducedProgram(Solver::Options* options,
+                                          ProblemImpl* problem_impl,
+                                          string* error) {
+  Program* original_program = problem_impl->mutable_program();
+  scoped_ptr<Program> transformed_program(new Program(*original_program));
+
+  if (options->ordering_type == USER &&
+      !ApplyUserOrdering(*problem_impl,
+                         options->ordering,
+                         transformed_program.get(),
+                         error)) {
+    return NULL;
+  }
+
+  if (options->ordering_type == SCHUR && options->num_eliminate_blocks != 0) {
+    *error = "Can't specify SCHUR ordering and num_eliminate_blocks "
+        "at the same time; SCHUR ordering determines "
+        "num_eliminate_blocks automatically.";
+    return NULL;
+  }
+
+  if (options->ordering_type == SCHUR && options->ordering.size() != 0) {
+    *error = "Can't specify SCHUR ordering type and the ordering "
+        "vector at the same time; SCHUR ordering determines "
+        "a suitable parameter ordering automatically.";
+    return NULL;
+  }
+
+  int num_eliminate_blocks = options->num_eliminate_blocks;
+
+  if (!RemoveFixedBlocksFromProgram(transformed_program.get(),
+                                    &num_eliminate_blocks,
+                                    error)) {
+    return NULL;
+  }
+
+  if (transformed_program->NumParameterBlocks() == 0) {
+    LOG(WARNING) << "No varying parameter blocks to optimize; "
+                 << "bailing early.";
+    return transformed_program.release();
+  }
+
+  if (options->ordering_type == SCHUR) {
+    vector<ParameterBlock*> schur_ordering;
+    num_eliminate_blocks = ComputeSchurOrdering(*transformed_program,
+                                                &schur_ordering);
+    CHECK_EQ(schur_ordering.size(), transformed_program->NumParameterBlocks())
+        << "Congratulations, you found a Ceres bug! Please report this error "
+        << "to the developers.";
+
+    // Replace the transformed program's ordering with the schur ordering.
+    swap(*transformed_program->mutable_parameter_blocks(), schur_ordering);
+  }
+  options->num_eliminate_blocks = num_eliminate_blocks;
+  CHECK_GE(options->num_eliminate_blocks, 0)
+      << "Congratulations, you found a Ceres bug! Please report this error "
+      << "to the developers.";
+
+  // Since the transformed program is the "active" program, and it is mutated,
+  // update the parameter offsets and indices.
+  transformed_program->SetParameterOffsetsAndIndex();
+  return transformed_program.release();
+}
+
+LinearSolver* SolverImpl::CreateLinearSolver(Solver::Options* options,
+                                             string* error) {
+#ifdef CERES_NO_SUITESPARSE
+  if (options->linear_solver_type == SPARSE_NORMAL_CHOLESKY) {
+    *error = "Can't use SPARSE_NORMAL_CHOLESKY because SuiteSparse was not "
+        "enabled when Ceres was built.";
+    return NULL;
+  }
+#endif  // CERES_NO_SUITESPARSE
+
+  if (options->linear_solver_max_num_iterations <= 0) {
+    *error = "Solver::Options::linear_solver_max_num_iterations is 0.";
+    return NULL;
+  }
+  if (options->linear_solver_min_num_iterations <= 0) {
+    *error = "Solver::Options::linear_solver_min_num_iterations is 0.";
+    return NULL;
+  }
+  if (options->linear_solver_min_num_iterations >
+      options->linear_solver_max_num_iterations) {
+    *error = "Solver::Options::linear_solver_min_num_iterations > "
+        "Solver::Options::linear_solver_max_num_iterations.";
+    return NULL;
+  }
+
+  LinearSolver::Options linear_solver_options;
+  linear_solver_options.constant_sparsity = true;
+  linear_solver_options.min_num_iterations =
+        options->linear_solver_min_num_iterations;
+  linear_solver_options.max_num_iterations =
+      options->linear_solver_max_num_iterations;
+  linear_solver_options.type = options->linear_solver_type;
+  linear_solver_options.preconditioner_type = options->preconditioner_type;
+
+#ifdef CERES_NO_SUITESPARSE
+  if (linear_solver_options.preconditioner_type == SCHUR_JACOBI) {
+    *error =  "SCHUR_JACOBI preconditioner not suppored. Please build Ceres "
+        "with SuiteSparse support";
+    return NULL;
+  }
+
+  if (linear_solver_options.preconditioner_type == CLUSTER_JACOBI) {
+    *error =  "CLUSTER_JACOBI preconditioner not suppored. Please build Ceres "
+        "with SuiteSparse support";
+    return NULL;
+  }
+
+  if (linear_solver_options.preconditioner_type == CLUSTER_TRIDIAGONAL) {
+    *error =  "CLUSTER_TRIDIAGONAL preconditioner not suppored. Please build "
+        "Ceres with SuiteSparse support";
+    return NULL;
+  }
+#endif
+
+  linear_solver_options.num_threads = options->num_linear_solver_threads;
+  linear_solver_options.num_eliminate_blocks =
+      options->num_eliminate_blocks;
+
+  if ((linear_solver_options.num_eliminate_blocks == 0) &&
+      IsSchurType(linear_solver_options.type)) {
+#ifndef CERES_NO_SUITESPARSE
+    LOG(INFO) << "No elimination block remaining "
+              << "switching to SPARSE_NORMAL_CHOLESKY.";
+    linear_solver_options.type = SPARSE_NORMAL_CHOLESKY;
+#else
+    LOG(INFO) << "No elimination block remaining switching to DENSE_QR.";
+    linear_solver_options.type = DENSE_QR;
+#endif  // CERES_NO_SUITESPARSE
+  }
+
+#ifdef CERES_NO_SUITESPARSE
+  if (linear_solver_options.type == SPARSE_SCHUR) {
+    *error = "Can't use SPARSE_SCHUR because SuiteSparse was not "
+        "enabled when Ceres was built.";
+    return NULL;
+  }
+#endif  // CERES_NO_SUITESPARSE
+
+  // The matrix used for storing the dense Schur complement has a
+  // single lock guarding the whole matrix. Running the
+  // SchurComplementSolver with multiple threads leads to maximum
+  // contention and slowdown. If the problem is large enough to
+  // benefit from a multithreaded schur eliminator, you should be
+  // using a SPARSE_SCHUR solver anyways.
+  if ((linear_solver_options.num_threads > 1) &&
+      (linear_solver_options.type == DENSE_SCHUR)) {
+    LOG(WARNING) << "Warning: Solver::Options::num_linear_solver_threads = "
+                 << options->num_linear_solver_threads
+                 << " with DENSE_SCHUR will result in poor performance; "
+                 << "switching to single-threaded.";
+    linear_solver_options.num_threads = 1;
+  }
+
+  options->linear_solver_type = linear_solver_options.type;
+  options->num_linear_solver_threads = linear_solver_options.num_threads;
+
+  return LinearSolver::Create(linear_solver_options);
+}
+
+bool SolverImpl::ApplyUserOrdering(const ProblemImpl& problem_impl,
+                                   vector<double*>& ordering,
+                                   Program* program,
+                                   string* error) {
+  if (ordering.size() != program->NumParameterBlocks()) {
+    *error = StringPrintf("User specified ordering does not have the same "
+                          "number of parameters as the problem. The problem"
+                          "has %d blocks while the ordering has %ld blocks.",
+                          program->NumParameterBlocks(),
+                          ordering.size());
+    return false;
+  }
+
+  // Ensure that there are no duplicates in the user's ordering.
+  {
+    vector<double*> ordering_copy(ordering);
+    sort(ordering_copy.begin(), ordering_copy.end());
+    if (unique(ordering_copy.begin(), ordering_copy.end())
+        != ordering_copy.end()) {
+      *error = "User specified ordering contains duplicates.";
+      return false;
+    }
+  }
+
+  vector<ParameterBlock*>* parameter_blocks =
+      program->mutable_parameter_blocks();
+
+  fill(parameter_blocks->begin(),
+       parameter_blocks->end(),
+       static_cast<ParameterBlock*>(NULL));
+
+  const ProblemImpl::ParameterMap& parameter_map = problem_impl.parameter_map();
+  for (int i = 0; i < ordering.size(); ++i) {
+    ProblemImpl::ParameterMap::const_iterator it =
+        parameter_map.find(ordering[i]);
+    if (it == parameter_map.end()) {
+      *error = StringPrintf("User specified ordering contains a pointer "
+                            "to a double that is not a parameter block in the "
+                            "problem. The invalid double is at position %d "
+                            " in options.ordering.", i);
+      return false;
+    }
+    (*parameter_blocks)[i] = it->second;
+  }
+  return true;
+}
+
+// Find the minimum index of any parameter block to the given residual.
+// Parameter blocks that have indices greater than num_eliminate_blocks are
+// considered to have an index equal to num_eliminate_blocks.
+int MinParameterBlock(const ResidualBlock* residual_block,
+                      int num_eliminate_blocks) {
+  int min_parameter_block_position = num_eliminate_blocks;
+  for (int i = 0; i < residual_block->NumParameterBlocks(); ++i) {
+    ParameterBlock* parameter_block = residual_block->parameter_blocks()[i];
+    DCHECK_NE(parameter_block->index(), -1)
+        << "Did you forget to call Program::SetParameterOffsetsAndIndex()?";
+    min_parameter_block_position = std::min(parameter_block->index(),
+                                            min_parameter_block_position);
+  }
+  return min_parameter_block_position;
+}
+
+// Reorder the residuals for program, if necessary, so that the residuals
+// involving each E block occur together. This is a necessary condition for the
+// Schur eliminator, which works on these "row blocks" in the jacobian.
+bool SolverImpl::MaybeReorderResidualBlocks(const Solver::Options& options,
+                                            Program* program,
+                                            string* error) {
+  // Only Schur types require the lexicographic reordering.
+  if (!IsSchurType(options.linear_solver_type)) {
+    return true;
+  }
+
+  CHECK_NE(0, options.num_eliminate_blocks)
+        << "Congratulations, you found a Ceres bug! Please report this error "
+        << "to the developers.";
+
+  // Create a histogram of the number of residuals for each E block. There is an
+  // extra bucket at the end to catch all non-eliminated F blocks.
+  vector<int> residual_blocks_per_e_block(options.num_eliminate_blocks + 1);
+  vector<ResidualBlock*>* residual_blocks = program->mutable_residual_blocks();
+  vector<int> min_position_per_residual(residual_blocks->size());
+  for (int i = 0; i < residual_blocks->size(); ++i) {
+    ResidualBlock* residual_block = (*residual_blocks)[i];
+    int position = MinParameterBlock(residual_block,
+                                     options.num_eliminate_blocks);
+    min_position_per_residual[i] = position;
+    DCHECK_LE(position, options.num_eliminate_blocks);
+    residual_blocks_per_e_block[position]++;
+  }
+
+  // Run a cumulative sum on the histogram, to obtain offsets to the start of
+  // each histogram bucket (where each bucket is for the residuals for that
+  // E-block).
+  vector<int> offsets(options.num_eliminate_blocks + 1);
+  std::partial_sum(residual_blocks_per_e_block.begin(),
+                   residual_blocks_per_e_block.end(),
+                   offsets.begin());
+  CHECK_EQ(offsets.back(), residual_blocks->size())
+      << "Congratulations, you found a Ceres bug! Please report this error "
+      << "to the developers.";
+
+  CHECK(find(residual_blocks_per_e_block.begin(),
+             residual_blocks_per_e_block.end() - 1, 0) !=
+        residual_blocks_per_e_block.end())
+      << "Congratulations, you found a Ceres bug! Please report this error "
+      << "to the developers.";
+
+  // Fill in each bucket with the residual blocks for its corresponding E block.
+  // Each bucket is individually filled from the back of the bucket to the front
+  // of the bucket. The filling order among the buckets is dictated by the
+  // residual blocks. This loop uses the offsets as counters; subtracting one
+  // from each offset as a residual block is placed in the bucket. When the
+  // filling is finished, the offset pointerts should have shifted down one
+  // entry (this is verified below).
+  vector<ResidualBlock*> reordered_residual_blocks(
+      (*residual_blocks).size(), static_cast<ResidualBlock*>(NULL));
+  for (int i = 0; i < residual_blocks->size(); ++i) {
+    int bucket = min_position_per_residual[i];
+
+    // Decrement the cursor, which should now point at the next empty position.
+    offsets[bucket]--;
+
+    // Sanity.
+    CHECK(reordered_residual_blocks[offsets[bucket]] == NULL)
+        << "Congratulations, you found a Ceres bug! Please report this error "
+        << "to the developers.";
+
+    reordered_residual_blocks[offsets[bucket]] = (*residual_blocks)[i];
+  }
+
+  // Sanity check #1: The difference in bucket offsets should match the
+  // histogram sizes.
+  for (int i = 0; i < options.num_eliminate_blocks; ++i) {
+    CHECK_EQ(residual_blocks_per_e_block[i], offsets[i + 1] - offsets[i])
+        << "Congratulations, you found a Ceres bug! Please report this error "
+        << "to the developers.";
+  }
+  // Sanity check #2: No NULL's left behind.
+  for (int i = 0; i < reordered_residual_blocks.size(); ++i) {
+    CHECK(reordered_residual_blocks[i] != NULL)
+        << "Congratulations, you found a Ceres bug! Please report this error "
+        << "to the developers.";
+  }
+
+  // Now that the residuals are collected by E block, swap them in place.
+  swap(*program->mutable_residual_blocks(), reordered_residual_blocks);
+  return true;
+}
+
+Evaluator* SolverImpl::CreateEvaluator(const Solver::Options& options,
+                                       Program* program,
+                                       string* error) {
+  Evaluator::Options evaluator_options;
+  evaluator_options.linear_solver_type = options.linear_solver_type;
+  evaluator_options.num_eliminate_blocks = options.num_eliminate_blocks;
+  evaluator_options.num_threads = options.num_threads;
+  return Evaluator::Create(evaluator_options, program, error);
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/solver_impl.h b/extern/libmv/third_party/ceres/internal/ceres/solver_impl.h
new file mode 100644
index 00000000000..957ebcc65df
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/solver_impl.h
@@ -0,0 +1,111 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+
+#ifndef CERES_INTERNAL_SOLVER_IMPL_H_
+#define CERES_INTERNAL_SOLVER_IMPL_H_
+
+#include "ceres/solver.h"
+
+namespace ceres {
+namespace internal {
+
+class Evaluator;
+class LinearSolver;
+class ProblemImpl;
+class Program;
+
+class SolverImpl {
+ public:
+  // Mirrors the interface in solver.h, but exposes implementation
+  // details for testing internally.
+  static void Solve(const Solver::Options& options,
+                    Problem* problem,
+                    Solver::Summary* summary);
+
+  // Create the transformed Program, which has all the fixed blocks
+  // and residuals eliminated, and in the case of automatic schur
+  // ordering, has the E blocks first in the resulting program, with
+  // options.num_eliminate_blocks set appropriately.
+  static Program* CreateReducedProgram(Solver::Options* options,
+                                       ProblemImpl* problem_impl,
+                                       string* error);
+
+  // Create the appropriate linear solver, taking into account any
+  // config changes decided by CreateTransformedProgram(). The
+  // selected linear solver, which may be different from what the user
+  // selected; consider the case that the remaining elimininated
+  // blocks is zero after removing fixed blocks.
+  static LinearSolver* CreateLinearSolver(Solver::Options* options,
+                                          string* error);
+
+  // Reorder the parameter blocks in program using the vector
+  // ordering. A return value of true indicates success and false
+  // indicates an error was encountered whose cause is logged to
+  // LOG(ERROR).
+  static bool ApplyUserOrdering(const ProblemImpl& problem_impl,
+                                vector<double*>& ordering,
+                                Program* program,
+                                string* error);
+
+  // Reorder the residuals for program, if necessary, so that the
+  // residuals involving each E block occur together. This is a
+  // necessary condition for the Schur eliminator, which works on
+  // these "row blocks" in the jacobian.
+  static bool MaybeReorderResidualBlocks(const Solver::Options& options,
+                                         Program* program,
+                                         string* error);
+
+  // Create the appropriate evaluator for the transformed program.
+  static Evaluator* CreateEvaluator(const Solver::Options& options,
+                                    Program* program,
+                                    string* error);
+
+  // Run the minimization for the given evaluator and configuration.
+  static void Minimize(const Solver::Options &options,
+                       Program* program,
+                       Evaluator* evaluator,
+                       LinearSolver* linear_solver,
+                       double* initial_parameters,
+                       double* final_parameters,
+                       Solver::Summary* summary);
+
+  // Remove the fixed or unused parameter blocks and residuals
+  // depending only on fixed parameters from the problem. Also updates
+  // num_eliminate_blocks, since removed parameters changes the point
+  // at which the eliminated blocks is valid.
+  static bool RemoveFixedBlocksFromProgram(Program* program,
+                                           int* num_eliminate_blocks,
+                                           string* error);
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_SOLVER_IMPL_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/sparse_matrix.cc b/extern/libmv/third_party/ceres/internal/ceres/sparse_matrix.cc
new file mode 100644
index 00000000000..55336fd3130
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/sparse_matrix.cc
@@ -0,0 +1,40 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#include "ceres/sparse_matrix.h"
+
+namespace ceres {
+namespace internal {
+
+SparseMatrix::~SparseMatrix() {
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/sparse_matrix.h b/extern/libmv/third_party/ceres/internal/ceres/sparse_matrix.h
new file mode 100644
index 00000000000..562210dfec8
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/sparse_matrix.h
@@ -0,0 +1,114 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Interface definition for sparse matrices.
+
+#ifndef CERES_INTERNAL_SPARSE_MATRIX_H_
+#define CERES_INTERNAL_SPARSE_MATRIX_H_
+
+#include <cstdio>
+#include "ceres/linear_operator.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+
+class SparseMatrixProto;
+
+// This class defines the interface for storing and manipulating
+// sparse matrices. The key property that differentiates different
+// sparse matrices is how they are organized in memory and how the
+// information about the sparsity structure of the matrix is
+// stored. This has significant implications for linear solvers
+// operating on these matrices.
+//
+// To deal with the different kinds of layouts, we will assume that a
+// sparse matrix will have a two part representation. A values array
+// that will be used to store the entries of the sparse matrix and
+// some sort of a layout object that tells the user the sparsity
+// structure and layout of the values array. For example in case of
+// the TripletSparseMatrix, this information is carried in the rows
+// and cols arrays and for the BlockSparseMatrix, this information is
+// carried in the CompressedRowBlockStructure object.
+//
+// This interface deliberately does not contain any information about
+// the structure of the sparse matrix as that seems to be highly
+// matrix type dependent and we are at this stage unable to come up
+// with an efficient high level interface that spans multiple sparse
+// matrix types.
+class SparseMatrix : public LinearOperator {
+ public:
+  virtual ~SparseMatrix();
+
+  // y += Ax;
+  virtual void RightMultiply(const double* x, double* y) const = 0;
+  // y += A'x;
+  virtual void LeftMultiply(const double* x, double* y) const = 0;
+
+  // In MATLAB notation sum(A.*A, 1)
+  virtual void SquaredColumnNorm(double* x) const = 0;
+  // A = A * diag(scale)
+  virtual void ScaleColumns(const double* scale) = 0;
+
+  // A = 0. A->num_nonzeros() == 0 is true after this call. The
+  // sparsity pattern is preserved.
+  virtual void SetZero() = 0;
+
+  // Resize and populate dense_matrix with a dense version of the
+  // sparse matrix.
+  virtual void ToDenseMatrix(Matrix* dense_matrix) const = 0;
+
+#ifndef CERES_DONT_HAVE_PROTOCOL_BUFFERS
+  // Dump the sparse matrix to a proto. Destroys the contents of proto.
+  virtual void ToProto(SparseMatrixProto* proto) const = 0;
+#endif
+
+  // Write out the matrix as a sequence of (i,j,s) triplets. This
+  // format is useful for loading the matrix into MATLAB/octave as a
+  // sparse matrix.
+  virtual void ToTextFile(FILE* file) const = 0;
+
+  // Accessors for the values array that stores the entries of the
+  // sparse matrix. The exact interpreptation of the values of this
+  // array depends on the particular kind of SparseMatrix being
+  // accessed.
+  virtual double* mutable_values() = 0;
+  virtual const double* values() const = 0;
+
+  virtual int num_rows() const = 0;
+  virtual int num_cols() const = 0;
+  virtual int num_nonzeros() const = 0;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_SPARSE_MATRIX_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.cc b/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.cc
new file mode 100644
index 00000000000..59222dc374d
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.cc
@@ -0,0 +1,129 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#ifndef CERES_NO_SUITESPARSE
+
+#include "ceres/sparse_normal_cholesky_solver.h"
+
+#include <algorithm>
+#include <cstring>
+#include <ctime>
+#include "ceres/compressed_row_sparse_matrix.h"
+#include "ceres/linear_solver.h"
+#include "ceres/suitesparse.h"
+#include "ceres/triplet_sparse_matrix.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+
+SparseNormalCholeskySolver::SparseNormalCholeskySolver(
+    const LinearSolver::Options& options)
+    : options_(options), symbolic_factor_(NULL) {}
+
+SparseNormalCholeskySolver::~SparseNormalCholeskySolver() {
+  if (symbolic_factor_ != NULL) {
+    ss_.Free(symbolic_factor_);
+    symbolic_factor_ = NULL;
+  }
+}
+
+LinearSolver::Summary SparseNormalCholeskySolver::SolveImpl(
+    CompressedRowSparseMatrix* A,
+    const double* b,
+    const LinearSolver::PerSolveOptions& per_solve_options,
+    double * x) {
+  const time_t start_time = time(NULL);
+  const int num_cols = A->num_cols();
+
+  LinearSolver::Summary summary;
+  Vector Atb = Vector::Zero(num_cols);
+  A->LeftMultiply(b, Atb.data());
+
+  if (per_solve_options.D != NULL) {
+    // Temporarily append a diagonal block to the A matrix, but undo it before
+    // returning the matrix to the user.
+    CompressedRowSparseMatrix D(per_solve_options.D, num_cols);
+    A->AppendRows(D);
+  }
+
+  VectorRef(x, num_cols).setZero();
+
+  scoped_ptr<cholmod_sparse> lhs(ss_.CreateSparseMatrixTransposeView(A));
+  CHECK_NOTNULL(lhs.get());
+
+  cholmod_dense* rhs = ss_.CreateDenseVector(Atb.data(), num_cols, num_cols);
+  const time_t init_time = time(NULL);
+
+  if (symbolic_factor_ == NULL) {
+    symbolic_factor_ = CHECK_NOTNULL(ss_.AnalyzeCholesky(lhs.get()));
+  }
+
+  const time_t symbolic_time = time(NULL);
+
+  cholmod_dense* sol = ss_.SolveCholesky(lhs.get(), symbolic_factor_, rhs);
+  const time_t solve_time = time(NULL);
+
+  ss_.Free(rhs);
+  rhs = NULL;
+
+  if (per_solve_options.D != NULL) {
+    A->DeleteRows(num_cols);
+  }
+
+  if (!options_.constant_sparsity) {
+    ss_.Free(symbolic_factor_);
+    symbolic_factor_ = NULL;
+  }
+
+  summary.num_iterations = 1;
+  if (sol != NULL) {
+    memcpy(x, sol->x, num_cols * sizeof(*x));
+
+    ss_.Free(sol);
+    sol = NULL;
+    summary.termination_type = TOLERANCE;
+  }
+
+  const time_t cleanup_time = time(NULL);
+  VLOG(2) << "time (sec) total: " << cleanup_time - start_time
+          << " init: " << init_time - start_time
+          << " symbolic: " << symbolic_time - init_time
+          << " solve: " << solve_time - symbolic_time
+          << " cleanup: " << cleanup_time - solve_time;
+  return summary;
+}
+
+}   // namespace internal
+}   // namespace ceres
+
+#endif  // CERES_NO_SUITESPARSE
diff --git a/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.h b/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.h
new file mode 100644
index 00000000000..ce1d6d285be
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.h
@@ -0,0 +1,77 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// A solver for sparse linear least squares problem based on solving
+// the normal equations via a sparse cholesky factorization.
+
+#ifndef CERES_INTERNAL_SPARSE_NORMAL_CHOLESKY_SOLVER_H_
+#define CERES_INTERNAL_SPARSE_NORMAL_CHOLESKY_SOLVER_H_
+
+#ifndef CERES_NO_SUITESPARSE
+
+#include "cholmod.h"
+#include "cholmod_core.h"
+#include "ceres/linear_solver.h"
+#include "ceres/suitesparse.h"
+#include "ceres/internal/macros.h"
+
+namespace ceres {
+namespace internal {
+
+class CompressedRowSparseMatrix;
+
+// Solves the normal equations (A'A + D'D) x = A'b, using the CHOLMOD sparse
+// cholesky solver.
+class SparseNormalCholeskySolver : public CompressedRowSparseMatrixSolver {
+ public:
+  explicit SparseNormalCholeskySolver(const LinearSolver::Options& options);
+  virtual ~SparseNormalCholeskySolver();
+
+ private:
+  virtual LinearSolver::Summary SolveImpl(
+      CompressedRowSparseMatrix* A,
+      const double* b,
+      const LinearSolver::PerSolveOptions& options,
+      double* x);
+
+  const LinearSolver::Options options_;
+  SuiteSparse ss_;
+
+  // Cached factorization
+  cholmod_factor* symbolic_factor_;
+  DISALLOW_COPY_AND_ASSIGN(SparseNormalCholeskySolver);
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_NO_SUITESPARSE
+
+#endif  // CERES_INTERNAL_SPARSE_NORMAL_CHOLESKY_SOLVER_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/split.cc b/extern/libmv/third_party/ceres/internal/ceres/split.cc
new file mode 100644
index 00000000000..4fa1bd468b9
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/split.cc
@@ -0,0 +1,115 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+
+#include <string>
+#include <vector>
+#include <iterator>
+#include "ceres/internal/port.h"
+
+namespace ceres {
+
+// If we know how much to allocate for a vector of strings, we can allocate the
+// vector<string> only once and directly to the right size. This saves in
+// between 33-66 % of memory space needed for the result, and runs faster in the
+// microbenchmarks.
+//
+// The reserve is only implemented for the single character delim.
+//
+// The implementation for counting is cut-and-pasted from
+// SplitStringToIteratorUsing. I could have written my own counting iterator,
+// and use the existing template function, but probably this is more clear and
+// more sure to get optimized to reasonable code.
+static int CalculateReserveForVector(const string& full, const char* delim) {
+  int count = 0;
+  if (delim[0] != '\0' && delim[1] == '\0') {
+    // Optimize the common case where delim is a single character.
+    char c = delim[0];
+    const char* p = full.data();
+    const char* end = p + full.size();
+    while (p != end) {
+      if (*p == c) {  // This could be optimized with hasless(v,1) trick.
+        ++p;
+      } else {
+        while (++p != end && *p != c) {
+          // Skip to the next occurence of the delimiter.
+        }
+        ++count;
+      }
+    }
+  }
+  return count;
+}
+
+template <typename StringType, typename ITR>
+static inline
+void SplitStringToIteratorUsing(const StringType& full,
+                                const char* delim,
+                                ITR& result) {
+  // Optimize the common case where delim is a single character.
+  if (delim[0] != '\0' && delim[1] == '\0') {
+    char c = delim[0];
+    const char* p = full.data();
+    const char* end = p + full.size();
+    while (p != end) {
+      if (*p == c) {
+        ++p;
+      } else {
+        const char* start = p;
+        while (++p != end && *p != c) {
+          // Skip to the next occurence of the delimiter.
+        }
+        *result++ = StringType(start, p - start);
+      }
+    }
+    return;
+  }
+
+  string::size_type begin_index, end_index;
+  begin_index = full.find_first_not_of(delim);
+  while (begin_index != string::npos) {
+    end_index = full.find_first_of(delim, begin_index);
+    if (end_index == string::npos) {
+      *result++ = full.substr(begin_index);
+      return;
+    }
+    *result++ = full.substr(begin_index, (end_index - begin_index));
+    begin_index = full.find_first_not_of(delim, end_index);
+  }
+}
+
+void SplitStringUsing(const string& full,
+                      const char* delim,
+                      vector<string>* result) {
+  result->reserve(result->size() + CalculateReserveForVector(full, delim));
+  back_insert_iterator< vector<string> > it(*result);
+  SplitStringToIteratorUsing(full, delim, it);
+}
+
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/stl_util.h b/extern/libmv/third_party/ceres/internal/ceres/stl_util.h
new file mode 100644
index 00000000000..a1a19e8b3ce
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/stl_util.h
@@ -0,0 +1,75 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: keir@google.com (Keir Mierle)
+
+#ifndef CERES_INTERNAL_STL_UTIL_H_
+#define CERES_INTERNAL_STL_UTIL_H_
+
+namespace ceres {
+
+// STLDeleteContainerPointers()
+//  For a range within a container of pointers, calls delete
+//  (non-array version) on these pointers.
+// NOTE: for these three functions, we could just implement a DeleteObject
+// functor and then call for_each() on the range and functor, but this
+// requires us to pull in all of algorithm.h, which seems expensive.
+// For hash_[multi]set, it is important that this deletes behind the iterator
+// because the hash_set may call the hash function on the iterator when it is
+// advanced, which could result in the hash function trying to deference a
+// stale pointer.
+template <class ForwardIterator>
+void STLDeleteContainerPointers(ForwardIterator begin,
+                                ForwardIterator end) {
+  while (begin != end) {
+    ForwardIterator temp = begin;
+    ++begin;
+    delete *temp;
+  }
+}
+
+// STLDeleteElements() deletes all the elements in an STL container and clears
+// the container.  This function is suitable for use with a vector, set,
+// hash_set, or any other STL container which defines sensible begin(), end(),
+// and clear() methods.
+//
+// If container is NULL, this function is a no-op.
+//
+// As an alternative to calling STLDeleteElements() directly, consider
+// ElementDeleter (defined below), which ensures that your container's elements
+// are deleted when the ElementDeleter goes out of scope.
+template <class T>
+void STLDeleteElements(T *container) {
+  if (!container) return;
+  STLDeleteContainerPointers(container->begin(), container->end());
+  container->clear();
+}
+
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_STL_UTIL_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/stringprintf.cc b/extern/libmv/third_party/ceres/internal/ceres/stringprintf.cc
new file mode 100644
index 00000000000..c0f35225bc3
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/stringprintf.cc
@@ -0,0 +1,126 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: Sanjay Ghemawat
+
+#include <cerrno>
+#include <cstdarg>  // For va_list and related operations
+#include <cstdio>   // MSVC requires this for _vsnprintf
+#include <string>
+#include <vector>
+
+#include "ceres/internal/port.h"
+
+namespace ceres {
+namespace internal {
+
+#ifdef _MSC_VER
+enum { IS_COMPILER_MSVC = 1 };
+#define va_copy(d,s) ((d) = (s))
+#else
+enum { IS_COMPILER_MSVC = 0 };
+#endif
+
+void StringAppendV(string* dst, const char* format, va_list ap) {
+  // First try with a small fixed size buffer
+  char space[1024];
+
+  // It's possible for methods that use a va_list to invalidate
+  // the data in it upon use.  The fix is to make a copy
+  // of the structure before using it and use that copy instead.
+  va_list backup_ap;
+  va_copy(backup_ap, ap);
+  int result = vsnprintf(space, sizeof(space), format, backup_ap);
+  va_end(backup_ap);
+
+  if (result < sizeof(space)) {
+    if (result >= 0) {
+      // Normal case -- everything fit.
+      dst->append(space, result);
+      return;
+    }
+
+    if (IS_COMPILER_MSVC) {
+      // Error or MSVC running out of space.  MSVC 8.0 and higher
+      // can be asked about space needed with the special idiom below:
+      va_copy(backup_ap, ap);
+      result = vsnprintf(NULL, 0, format, backup_ap);
+      va_end(backup_ap);
+    }
+
+    if (result < 0) {
+      // Just an error.
+      return;
+    }
+  }
+
+  // Increase the buffer size to the size requested by vsnprintf,
+  // plus one for the closing \0.
+  int length = result+1;
+  char* buf = new char[length];
+
+  // Restore the va_list before we use it again
+  va_copy(backup_ap, ap);
+  result = vsnprintf(buf, length, format, backup_ap);
+  va_end(backup_ap);
+
+  if (result >= 0 && result < length) {
+    // It fit
+    dst->append(buf, result);
+  }
+  delete[] buf;
+}
+
+
+string StringPrintf(const char* format, ...) {
+  va_list ap;
+  va_start(ap, format);
+  string result;
+  StringAppendV(&result, format, ap);
+  va_end(ap);
+  return result;
+}
+
+const string& SStringPrintf(string* dst, const char* format, ...) {
+  va_list ap;
+  va_start(ap, format);
+  dst->clear();
+  StringAppendV(dst, format, ap);
+  va_end(ap);
+  return *dst;
+}
+
+void StringAppendF(string* dst, const char* format, ...) {
+  va_list ap;
+  va_start(ap, format);
+  StringAppendV(dst, format, ap);
+  va_end(ap);
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/stringprintf.h b/extern/libmv/third_party/ceres/internal/ceres/stringprintf.h
new file mode 100644
index 00000000000..30b974e7ae5
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/stringprintf.h
@@ -0,0 +1,89 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: Sanjay Ghemawat
+//
+// Printf variants that place their output in a C++ string.
+//
+// Usage:
+//      string result = StringPrintf("%d %s\n", 10, "hello");
+//      SStringPrintf(&result, "%d %s\n", 10, "hello");
+//      StringAppendF(&result, "%d %s\n", 20, "there");
+
+#ifndef CERES_INTERNAL_STRINGPRINTF_H_
+#define CERES_INTERNAL_STRINGPRINTF_H_
+
+#include <cstdarg>
+#include <string>
+
+#include "ceres/internal/port.h"
+
+namespace ceres {
+namespace internal {
+
+#if (defined(__GNUC__) || defined(__clang__))
+// Tell the compiler to do printf format string checking if the compiler
+// supports it; see the 'format' attribute in
+// <http://gcc.gnu.org/onlinedocs/gcc-4.3.0/gcc/Function-Attributes.html>.
+//
+// N.B.: As the GCC manual states, "[s]ince non-static C++ methods
+// have an implicit 'this' argument, the arguments of such methods
+// should be counted from two, not one."
+#define PRINTF_ATTRIBUTE(string_index, first_to_check) \
+    __attribute__((__format__ (__printf__, string_index, first_to_check)))
+#define SCANF_ATTRIBUTE(string_index, first_to_check) \
+    __attribute__((__format__ (__scanf__, string_index, first_to_check)))
+#else
+#define PRINTF_ATTRIBUTE(string_index, first_to_check)
+#endif
+
+// Return a C++ string.
+extern string StringPrintf(const char* format, ...)
+    // Tell the compiler to do printf format string checking.
+    PRINTF_ATTRIBUTE(1,2);
+
+// Store result into a supplied string and return it.
+extern const string& SStringPrintf(string* dst, const char* format, ...)
+    // Tell the compiler to do printf format string checking.
+    PRINTF_ATTRIBUTE(2,3);
+
+// Append result to a supplied string.
+extern void StringAppendF(string* dst, const char* format, ...)
+    // Tell the compiler to do printf format string checking.
+    PRINTF_ATTRIBUTE(2,3);
+
+// Lower-level routine that takes a va_list and appends to a specified string.
+// All other routines are just convenience wrappers around it.
+extern void StringAppendV(string* dst, const char* format, va_list ap);
+
+#undef PRINTF_ATTRIBUTE
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_STRINGPRINTF_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/suitesparse.cc b/extern/libmv/third_party/ceres/internal/ceres/suitesparse.cc
new file mode 100644
index 00000000000..1cf6a7496a7
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/suitesparse.cc
@@ -0,0 +1,193 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#ifndef CERES_NO_SUITESPARSE
+
+#include "ceres/suitesparse.h"
+
+#include "cholmod.h"
+#include "ceres/compressed_row_sparse_matrix.h"
+#include "ceres/triplet_sparse_matrix.h"
+namespace ceres {
+namespace internal {
+
+cholmod_sparse* SuiteSparse::CreateSparseMatrix(TripletSparseMatrix* A) {
+  cholmod_triplet triplet;
+
+  triplet.nrow = A->num_rows();
+  triplet.ncol = A->num_cols();
+  triplet.nzmax = A->max_num_nonzeros();
+  triplet.nnz = A->num_nonzeros();
+  triplet.i = reinterpret_cast<void*>(A->mutable_rows());
+  triplet.j = reinterpret_cast<void*>(A->mutable_cols());
+  triplet.x = reinterpret_cast<void*>(A->mutable_values());
+  triplet.stype = 0;  // Matrix is not symmetric.
+  triplet.itype = CHOLMOD_INT;
+  triplet.xtype = CHOLMOD_REAL;
+  triplet.dtype = CHOLMOD_DOUBLE;
+
+  return cholmod_triplet_to_sparse(&triplet, triplet.nnz, &cc_);
+}
+
+
+cholmod_sparse* SuiteSparse::CreateSparseMatrixTranspose(
+    TripletSparseMatrix* A) {
+  cholmod_triplet triplet;
+
+  triplet.ncol = A->num_rows();  // swap row and columns
+  triplet.nrow = A->num_cols();
+  triplet.nzmax = A->max_num_nonzeros();
+  triplet.nnz = A->num_nonzeros();
+
+  // swap rows and columns
+  triplet.j = reinterpret_cast<void*>(A->mutable_rows());
+  triplet.i = reinterpret_cast<void*>(A->mutable_cols());
+  triplet.x = reinterpret_cast<void*>(A->mutable_values());
+  triplet.stype = 0;  // Matrix is not symmetric.
+  triplet.itype = CHOLMOD_INT;
+  triplet.xtype = CHOLMOD_REAL;
+  triplet.dtype = CHOLMOD_DOUBLE;
+
+  return cholmod_triplet_to_sparse(&triplet, triplet.nnz, &cc_);
+}
+
+cholmod_sparse* SuiteSparse::CreateSparseMatrixTransposeView(
+    CompressedRowSparseMatrix* A) {
+  cholmod_sparse* m = new cholmod_sparse_struct;
+  m->nrow = A->num_cols();
+  m->ncol = A->num_rows();
+  m->nzmax = A->num_nonzeros();
+
+  m->p = reinterpret_cast<void*>(A->mutable_rows());
+  m->i = reinterpret_cast<void*>(A->mutable_cols());
+  m->x = reinterpret_cast<void*>(A->mutable_values());
+
+  m->stype = 0;  // Matrix is not symmetric.
+  m->itype = CHOLMOD_INT;
+  m->xtype = CHOLMOD_REAL;
+  m->dtype = CHOLMOD_DOUBLE;
+  m->sorted = 1;
+  m->packed = 1;
+
+  return m;
+}
+
+cholmod_dense* SuiteSparse::CreateDenseVector(const double* x,
+                                              int in_size,
+                                              int out_size) {
+    CHECK_LE(in_size, out_size);
+    cholmod_dense* v = cholmod_zeros(out_size, 1, CHOLMOD_REAL, &cc_);
+    if (x != NULL) {
+      memcpy(v->x, x, in_size*sizeof(*x));
+    }
+    return v;
+}
+
+cholmod_factor* SuiteSparse::AnalyzeCholesky(cholmod_sparse* A) {
+  cholmod_factor* factor = cholmod_analyze(A, &cc_);
+  CHECK_EQ(cc_.status, CHOLMOD_OK)
+      << "Cholmod symbolic analysis failed " << cc_.status;
+  CHECK_NOTNULL(factor);
+  return factor;
+}
+
+bool SuiteSparse::Cholesky(cholmod_sparse* A, cholmod_factor* L) {
+  CHECK_NOTNULL(A);
+  CHECK_NOTNULL(L);
+
+  cc_.quick_return_if_not_posdef = 1;
+  int status = cholmod_factorize(A, L, &cc_);
+  switch (cc_.status) {
+    case CHOLMOD_NOT_INSTALLED:
+      LOG(WARNING) << "Cholmod failure: method not installed.";
+      return false;
+    case CHOLMOD_OUT_OF_MEMORY:
+      LOG(WARNING) << "Cholmod failure: out of memory.";
+      return false;
+    case CHOLMOD_TOO_LARGE:
+      LOG(WARNING) << "Cholmod failure: integer overflow occured.";
+      return false;
+    case CHOLMOD_INVALID:
+      LOG(WARNING) << "Cholmod failure: invalid input.";
+      return false;
+    case CHOLMOD_NOT_POSDEF:
+      // TODO(sameeragarwal): These two warnings require more
+      // sophisticated handling going forward. For now we will be
+      // strict and treat them as failures.
+      LOG(WARNING) << "Cholmod warning: matrix not positive definite.";
+      return false;
+    case CHOLMOD_DSMALL:
+      LOG(WARNING) << "Cholmod warning: D for LDL' or diag(L) or "
+                   << "LL' has tiny absolute value.";
+      return false;
+    case CHOLMOD_OK:
+      if (status != 0) {
+        return true;
+      }
+      LOG(WARNING) << "Cholmod failure: cholmod_factorize returned zero "
+                   << "but cholmod_common::status is CHOLMOD_OK."
+                   << "Please report this to ceres-solver@googlegroups.com.";
+      return false;
+    default:
+      LOG(WARNING) << "Unknown cholmod return code. "
+                   << "Please report this to ceres-solver@googlegroups.com.";
+      return false;
+  }
+  return false;
+}
+
+cholmod_dense* SuiteSparse::Solve(cholmod_factor* L,
+                                  cholmod_dense* b) {
+  if (cc_.status != CHOLMOD_OK) {
+    LOG(WARNING) << "CHOLMOD status NOT OK";
+    return NULL;
+  }
+
+  return cholmod_solve(CHOLMOD_A, L, b, &cc_);
+}
+
+cholmod_dense* SuiteSparse::SolveCholesky(cholmod_sparse* A,
+                                          cholmod_factor* L,
+                                          cholmod_dense* b) {
+  CHECK_NOTNULL(A);
+  CHECK_NOTNULL(L);
+  CHECK_NOTNULL(b);
+
+  if (Cholesky(A, L)) {
+    return Solve(L, b);
+  }
+
+  return NULL;
+}
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_NO_SUITESPARSE
diff --git a/extern/libmv/third_party/ceres/internal/ceres/suitesparse.h b/extern/libmv/third_party/ceres/internal/ceres/suitesparse.h
new file mode 100644
index 00000000000..091e67a69a9
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/suitesparse.h
@@ -0,0 +1,159 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// A simple C++ interface to the SuiteSparse and CHOLMOD libraries.
+
+#ifndef CERES_INTERNAL_SUITESPARSE_H_
+#define CERES_INTERNAL_SUITESPARSE_H_
+
+#ifndef CERES_NO_SUITESPARSE
+
+#include <cstring>
+#include <string>
+
+#include <glog/logging.h>
+#include "cholmod.h"
+#include "ceres/internal/port.h"
+
+namespace ceres {
+namespace internal {
+
+class CompressedRowSparseMatrix;
+class TripletSparseMatrix;
+
+// The raw CHOLMOD and SuiteSparseQR libraries have a slightly
+// cumbersome c like calling format. This object abstracts it away and
+// provides the user with a simpler interface. The methods here cannot
+// be static as a cholmod_common object serves as a global variable
+// for all cholmod function calls.
+class SuiteSparse {
+ public:
+  SuiteSparse()  { cholmod_start(&cc_);  }
+  ~SuiteSparse() { cholmod_finish(&cc_); }
+
+  // Functions for building cholmod_sparse objects from sparse
+  // matrices stored in triplet form. The matrix A is not
+  // modifed. Called owns the result.
+  cholmod_sparse* CreateSparseMatrix(TripletSparseMatrix* A);
+
+  // This function works like CreateSparseMatrix, except that the
+  // return value corresponds to A' rather than A.
+  cholmod_sparse* CreateSparseMatrixTranspose(TripletSparseMatrix* A);
+
+  // Create a cholmod_sparse wrapper around the contents of A. This is
+  // a shallow object, which refers to the contents of A and does not
+  // use the SuiteSparse machinery to allocate memory, this object
+  // should be disposed off with a delete and not a call to Free as is
+  // the case for objects returned by CreateSparseMatrixTranspose.
+  cholmod_sparse* CreateSparseMatrixTransposeView(CompressedRowSparseMatrix* A);
+
+  // Given a vector x, build a cholmod_dense vector of size out_size
+  // with the first in_size entries copied from x. If x is NULL, then
+  // an all zeros vector is returned. Caller owns the result.
+  cholmod_dense* CreateDenseVector(const double* x, int in_size, int out_size);
+
+  // The matrix A is scaled using the matrix whose diagonal is the
+  // vector scale. mode describes how scaling is applied. Possible
+  // values are CHOLMOD_ROW for row scaling - diag(scale) * A,
+  // CHOLMOD_COL for column scaling - A * diag(scale) and CHOLMOD_SYM
+  // for symmetric scaling which scales both the rows and the columns
+  // - diag(scale) * A * diag(scale).
+  void Scale(cholmod_dense* scale, int mode, cholmod_sparse* A) {
+     cholmod_scale(scale, mode, A, &cc_);
+  }
+
+  // Create and return a matrix m = A * A'. Caller owns the
+  // result. The matrix A is not modified.
+  cholmod_sparse* AATranspose(cholmod_sparse* A) {
+    cholmod_sparse*m =  cholmod_aat(A, NULL, A->nrow, 1, &cc_);
+    m->stype = 1;  // Pay attention to the upper triangular part.
+    return m;
+  }
+
+  // y = alpha * A * x + beta * y. Only y is modified.
+  void SparseDenseMultiply(cholmod_sparse* A, double alpha, double beta,
+                           cholmod_dense* x, cholmod_dense* y) {
+    double alpha_[2] = {alpha, 0};
+    double beta_[2] = {beta, 0};
+    cholmod_sdmult(A, 0, alpha_, beta_, x, y, &cc_);
+  }
+
+  // Analyze the sparsity structure of the matrix A compute the
+  // symbolic factorization of A. A is not modified, only the pattern
+  // of non-zeros of A is used, the actual numerical values in A are
+  // of no consequence. Caller owns the result.
+  cholmod_factor* AnalyzeCholesky(cholmod_sparse* A);
+
+  // Use the symbolic factorization in L, to find the numerical
+  // factorization for the matrix A or AA^T. Return true if
+  // successful, false otherwise. L contains the numeric factorization
+  // on return.
+  bool Cholesky(cholmod_sparse* A, cholmod_factor* L);
+
+  // Given a Cholesky factorization of a matrix A = LL^T, solve the
+  // linear system Ax = b, and return the result. If the Solve fails
+  // NULL is returned. Caller owns the result.
+  cholmod_dense* Solve(cholmod_factor* L, cholmod_dense* b);
+
+  // Combine the calls to Cholesky and Solve into a single call. If
+  // the cholesky factorization or the solve fails, return
+  // NULL. Caller owns the result.
+  cholmod_dense* SolveCholesky(cholmod_sparse* A,
+                               cholmod_factor* L,
+                               cholmod_dense* b);
+
+  void Free(cholmod_sparse* m) { cholmod_free_sparse(&m, &cc_); }
+  void Free(cholmod_dense* m)  { cholmod_free_dense(&m, &cc_);  }
+  void Free(cholmod_factor* m) { cholmod_free_factor(&m, &cc_); }
+
+  void Print(cholmod_sparse* m, const string& name) {
+    cholmod_print_sparse(m, const_cast<char*>(name.c_str()), &cc_);
+  }
+
+  void Print(cholmod_dense* m, const string& name) {
+    cholmod_print_dense(m, const_cast<char*>(name.c_str()), &cc_);
+  }
+
+  void Print(cholmod_triplet* m, const string& name) {
+    cholmod_print_triplet(m, const_cast<char*>(name.c_str()), &cc_);
+  }
+
+  cholmod_common* mutable_cc() { return &cc_; }
+
+ private:
+  cholmod_common cc_;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_NO_SUITESPARSE
+
+#endif  // CERES_INTERNAL_SUITESPARSE_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.cc b/extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.cc
new file mode 100644
index 00000000000..247ab2e697b
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.cc
@@ -0,0 +1,306 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#include "ceres/triplet_sparse_matrix.h"
+
+#include <algorithm>
+#include <cstddef>
+#include <glog/logging.h>
+#include "ceres/matrix_proto.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/port.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+
+TripletSparseMatrix::TripletSparseMatrix()
+    : num_rows_(0),
+      num_cols_(0),
+      max_num_nonzeros_(0),
+      num_nonzeros_(0),
+      rows_(NULL),
+      cols_(NULL),
+      values_(NULL) {}
+
+TripletSparseMatrix::~TripletSparseMatrix() {}
+
+TripletSparseMatrix::TripletSparseMatrix(int num_rows,
+                                         int num_cols,
+                                         int max_num_nonzeros)
+    : num_rows_(num_rows),
+      num_cols_(num_cols),
+      max_num_nonzeros_(max_num_nonzeros),
+      num_nonzeros_(0),
+      rows_(NULL),
+      cols_(NULL),
+      values_(NULL) {
+  // All the sizes should at least be zero
+  CHECK_GE(num_rows, 0);
+  CHECK_GE(num_cols, 0);
+  CHECK_GE(max_num_nonzeros, 0);
+  AllocateMemory();
+}
+
+TripletSparseMatrix::TripletSparseMatrix(const TripletSparseMatrix& orig)
+    : num_rows_(orig.num_rows_),
+      num_cols_(orig.num_cols_),
+      max_num_nonzeros_(orig.max_num_nonzeros_),
+      num_nonzeros_(orig.num_nonzeros_),
+      rows_(NULL),
+      cols_(NULL),
+      values_(NULL) {
+  AllocateMemory();
+  CopyData(orig);
+}
+
+#ifndef CERES_DONT_HAVE_PROTOCOL_BUFFERS
+TripletSparseMatrix::TripletSparseMatrix(const SparseMatrixProto& outer_proto) {
+  CHECK(outer_proto.has_triplet_matrix());
+
+  const TripletSparseMatrixProto& proto = outer_proto.triplet_matrix();
+  CHECK(proto.has_num_rows());
+  CHECK(proto.has_num_cols());
+  CHECK_EQ(proto.rows_size(), proto.cols_size());
+  CHECK_EQ(proto.cols_size(), proto.values_size());
+
+  // Initialize the matrix with the appropriate size and capacity.
+  max_num_nonzeros_ = 0;
+  set_num_nonzeros(0);
+  Reserve(proto.num_nonzeros());
+  Resize(proto.num_rows(), proto.num_cols());
+  set_num_nonzeros(proto.num_nonzeros());
+
+  // Copy the entries in.
+  for (int i = 0; i < proto.num_nonzeros(); ++i) {
+    rows_[i] = proto.rows(i);
+    cols_[i] = proto.cols(i);
+    values_[i] = proto.values(i);
+  }
+}
+#endif
+
+TripletSparseMatrix& TripletSparseMatrix::operator=(
+    const TripletSparseMatrix& rhs) {
+  num_rows_ = rhs.num_rows_;
+  num_cols_ = rhs.num_cols_;
+  num_nonzeros_ = rhs.num_nonzeros_;
+  max_num_nonzeros_ = rhs.max_num_nonzeros_;
+  AllocateMemory();
+  CopyData(rhs);
+  return *this;
+}
+
+bool TripletSparseMatrix::AllTripletsWithinBounds() const {
+  for (int i = 0; i < num_nonzeros_; ++i) {
+    if ((rows_[i] < 0) || (rows_[i] >= num_rows_) ||
+        (cols_[i] < 0) || (cols_[i] >= num_cols_))
+      return false;
+  }
+  return true;
+}
+
+void TripletSparseMatrix::Reserve(int new_max_num_nonzeros) {
+  CHECK_LE(num_nonzeros_, new_max_num_nonzeros)
+    << "Reallocation will cause data loss";
+
+  // Nothing to do if we have enough space already.
+  if (new_max_num_nonzeros <= max_num_nonzeros_)
+    return;
+
+  int* new_rows = new int[new_max_num_nonzeros];
+  int* new_cols = new int[new_max_num_nonzeros];
+  double* new_values = new double[new_max_num_nonzeros];
+
+  for (int i = 0; i < num_nonzeros_; ++i) {
+    new_rows[i] = rows_[i];
+    new_cols[i] = cols_[i];
+    new_values[i] = values_[i];
+  }
+
+  rows_.reset(new_rows);
+  cols_.reset(new_cols);
+  values_.reset(new_values);
+
+  max_num_nonzeros_ = new_max_num_nonzeros;
+}
+
+void TripletSparseMatrix::SetZero() {
+  fill(values_.get(), values_.get() + max_num_nonzeros_, 0.0);
+  num_nonzeros_ = 0;
+}
+
+void TripletSparseMatrix::set_num_nonzeros(int num_nonzeros) {
+  CHECK_GE(num_nonzeros, 0);
+  CHECK_LE(num_nonzeros, max_num_nonzeros_);
+  num_nonzeros_ = num_nonzeros;
+};
+
+void TripletSparseMatrix::AllocateMemory() {
+  rows_.reset(new int[max_num_nonzeros_]);
+  cols_.reset(new int[max_num_nonzeros_]);
+  values_.reset(new double[max_num_nonzeros_]);
+}
+
+void TripletSparseMatrix::CopyData(const TripletSparseMatrix& orig) {
+  for (int i = 0; i < num_nonzeros_; ++i) {
+    rows_[i] = orig.rows_[i];
+    cols_[i] = orig.cols_[i];
+    values_[i] = orig.values_[i];
+  }
+}
+
+void TripletSparseMatrix::RightMultiply(const double* x,  double* y) const {
+  for (int i = 0; i < num_nonzeros_; ++i) {
+    y[rows_[i]] += values_[i]*x[cols_[i]];
+  }
+}
+
+void TripletSparseMatrix::LeftMultiply(const double* x, double* y) const {
+  for (int i = 0; i < num_nonzeros_; ++i) {
+    y[cols_[i]] += values_[i]*x[rows_[i]];
+  }
+}
+
+void TripletSparseMatrix::SquaredColumnNorm(double* x) const {
+  CHECK_NOTNULL(x);
+  VectorRef(x, num_cols_).setZero();
+  for (int i = 0; i < num_nonzeros_; ++i) {
+    x[cols_[i]] += values_[i] * values_[i];
+  }
+}
+
+void TripletSparseMatrix::ScaleColumns(const double* scale) {
+  CHECK_NOTNULL(scale);
+  for (int i = 0; i < num_nonzeros_; ++i) {
+    values_[i] = values_[i] * scale[cols_[i]];
+  }
+}
+
+void TripletSparseMatrix::ToDenseMatrix(Matrix* dense_matrix) const {
+  dense_matrix->resize(num_rows_, num_cols_);
+  dense_matrix->setZero();
+  Matrix& m = *dense_matrix;
+  for (int i = 0; i < num_nonzeros_; ++i) {
+    m(rows_[i], cols_[i]) += values_[i];
+  }
+}
+
+#ifndef CERES_DONT_HAVE_PROTOCOL_BUFFERS
+void TripletSparseMatrix::ToProto(SparseMatrixProto *proto) const {
+  proto->Clear();
+
+  TripletSparseMatrixProto* tsm_proto = proto->mutable_triplet_matrix();
+  tsm_proto->set_num_rows(num_rows_);
+  tsm_proto->set_num_cols(num_cols_);
+  tsm_proto->set_num_nonzeros(num_nonzeros_);
+  for (int i = 0; i < num_nonzeros_; ++i) {
+    tsm_proto->add_rows(rows_[i]);
+    tsm_proto->add_cols(cols_[i]);
+    tsm_proto->add_values(values_[i]);
+  }
+}
+#endif
+
+void TripletSparseMatrix::AppendRows(const TripletSparseMatrix& B) {
+  CHECK_EQ(B.num_cols(), num_cols_);
+  Reserve(num_nonzeros_ + B.num_nonzeros_);
+  for (int i = 0; i < B.num_nonzeros_; ++i) {
+    rows_.get()[num_nonzeros_] = B.rows()[i] + num_rows_;
+    cols_.get()[num_nonzeros_] = B.cols()[i];
+    values_.get()[num_nonzeros_++] = B.values()[i];
+  }
+  num_rows_ = num_rows_ + B.num_rows();
+}
+
+void TripletSparseMatrix::AppendCols(const TripletSparseMatrix& B) {
+  CHECK_EQ(B.num_rows(), num_rows_);
+  Reserve(num_nonzeros_ + B.num_nonzeros_);
+  for (int i = 0; i < B.num_nonzeros_; ++i, ++num_nonzeros_) {
+    rows_.get()[num_nonzeros_] = B.rows()[i];
+    cols_.get()[num_nonzeros_] = B.cols()[i] + num_cols_;
+    values_.get()[num_nonzeros_] = B.values()[i];
+  }
+  num_cols_ = num_cols_ + B.num_cols();
+}
+
+
+void TripletSparseMatrix::Resize(int new_num_rows, int new_num_cols) {
+  if ((new_num_rows >= num_rows_) && (new_num_cols >= num_cols_)) {
+    num_rows_  = new_num_rows;
+    num_cols_ = new_num_cols;
+    return;
+  }
+
+  num_rows_ = new_num_rows;
+  num_cols_ = new_num_cols;
+
+  int* r_ptr = rows_.get();
+  int* c_ptr = cols_.get();
+  double* v_ptr = values_.get();
+
+  int dropped_terms = 0;
+  for (int i = 0; i < num_nonzeros_; ++i) {
+    if ((r_ptr[i] < num_rows_) && (c_ptr[i] < num_cols_)) {
+      if (dropped_terms) {
+        r_ptr[i-dropped_terms] = r_ptr[i];
+        c_ptr[i-dropped_terms] = c_ptr[i];
+        v_ptr[i-dropped_terms] = v_ptr[i];
+      }
+    } else {
+      ++dropped_terms;
+    }
+  }
+  num_nonzeros_ -= dropped_terms;
+}
+
+TripletSparseMatrix* TripletSparseMatrix::CreateSparseDiagonalMatrix(
+    const double* values, int num_rows) {
+  TripletSparseMatrix* m =
+      new TripletSparseMatrix(num_rows, num_rows, num_rows);
+  for (int i = 0; i < num_rows; ++i) {
+    m->mutable_rows()[i] = i;
+    m->mutable_cols()[i] = i;
+    m->mutable_values()[i] = values[i];
+  }
+  m->set_num_nonzeros(num_rows);
+  return m;
+}
+
+void TripletSparseMatrix::ToTextFile(FILE* file) const {
+  CHECK_NOTNULL(file);
+  for (int i = 0; i < num_nonzeros_; ++i) {
+    fprintf(file, "% 10d % 10d %17f\n", rows_[i], cols_[i], values_[i]);
+  }
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.h b/extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.h
new file mode 100644
index 00000000000..300e74d0bbc
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.h
@@ -0,0 +1,137 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#ifndef CERES_INTERNAL_TRIPLET_SPARSE_MATRIX_H_
+#define CERES_INTERNAL_TRIPLET_SPARSE_MATRIX_H_
+
+#include "ceres/sparse_matrix.h"
+#include "ceres/internal/eigen.h"
+#include "ceres/internal/scoped_ptr.h"
+#include "ceres/types.h"
+
+namespace ceres {
+namespace internal {
+
+class SparseMatrixProto;
+
+// An implementation of the SparseMatrix interface to store and
+// manipulate sparse matrices in triplet (i,j,s) form.  This object is
+// inspired by the design of the cholmod_triplet struct used in the
+// SuiteSparse package and is memory layout compatible with it.
+class TripletSparseMatrix : public SparseMatrix {
+ public:
+  TripletSparseMatrix();
+  TripletSparseMatrix(int num_rows, int num_cols, int max_num_nonzeros);
+  explicit TripletSparseMatrix(const TripletSparseMatrix& orig);
+#ifndef CERES_DONT_HAVE_PROTOCOL_BUFFERS
+  explicit TripletSparseMatrix(const SparseMatrixProto& proto);
+#endif
+
+  TripletSparseMatrix& operator=(const TripletSparseMatrix& rhs);
+
+  ~TripletSparseMatrix();
+
+  // Implementation of the SparseMatrix interface.
+  virtual void SetZero();
+  virtual void RightMultiply(const double* x, double* y) const;
+  virtual void LeftMultiply(const double* x, double* y) const;
+  virtual void SquaredColumnNorm(double* x) const;
+  virtual void ScaleColumns(const double* scale);
+  virtual void ToDenseMatrix(Matrix* dense_matrix) const;
+#ifndef CERES_DONT_HAVE_PROTOCOL_BUFFERS
+  virtual void ToProto(SparseMatrixProto *proto) const;
+#endif
+  virtual void ToTextFile(FILE* file) const;
+  virtual int num_rows()        const { return num_rows_;     }
+  virtual int num_cols()        const { return num_cols_;     }
+  virtual int num_nonzeros()    const { return num_nonzeros_; }
+  virtual const double* values()  const { return values_.get(); }
+  virtual double* mutable_values()      { return values_.get(); }
+  virtual void set_num_nonzeros(int num_nonzeros);
+
+  // Increase max_num_nonzeros and correspondingly increase the size
+  // of rows_, cols_ and values_. If new_max_num_nonzeros is smaller
+  // than max_num_nonzeros_, then num_non_zeros should be less than or
+  // equal to new_max_num_nonzeros, otherwise data loss is possible
+  // and the method crashes.
+  void Reserve(int new_max_num_nonzeros);
+
+  // Append the matrix B at the bottom of this matrix. B should have
+  // the same number of columns as num_cols_.
+  void AppendRows(const TripletSparseMatrix& B);
+
+  // Append the matrix B at the right of this matrix. B should have
+  // the same number of rows as num_rows_;
+  void AppendCols(const TripletSparseMatrix& B);
+
+  // Resize the matrix. Entries which fall outside the new matrix
+  // bounds are dropped and the num_non_zeros changed accordingly.
+  void Resize(int new_num_rows, int new_num_cols);
+
+  int max_num_nonzeros() const { return max_num_nonzeros_; }
+  const int* rows()      const { return rows_.get();       }
+  const int* cols()      const { return cols_.get();       }
+  int* mutable_rows()          { return rows_.get();       }
+  int* mutable_cols()          { return cols_.get();       }
+
+  // Returns true if the entries of the matrix obey the row, column,
+  // and column size bounds and false otherwise.
+  bool AllTripletsWithinBounds() const;
+
+  bool IsValid() const { return AllTripletsWithinBounds(); }
+
+  // Build a sparse diagonal matrix of size num_rows x num_rows from
+  // the array values. Entries of the values array are copied into the
+  // sparse matrix.
+  static TripletSparseMatrix* CreateSparseDiagonalMatrix(const double* values,
+                                                         int num_rows);
+
+ private:
+  void AllocateMemory();
+  void CopyData(const TripletSparseMatrix& orig);
+
+  int num_rows_;
+  int num_cols_;
+  int max_num_nonzeros_;
+  int num_nonzeros_;
+
+  // The data is stored as three arrays. For each i, values_[i] is
+  // stored at the location (rows_[i], cols_[i]). If the there are
+  // multiple entries with the same (rows_[i], cols_[i]), the values_
+  // entries corresponding to them are summed up.
+  scoped_array<int> rows_;
+  scoped_array<int> cols_;
+  scoped_array<double> values_;
+};
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_TRIPLET_SPARSE_MATRIX_H__
diff --git a/extern/libmv/third_party/ceres/internal/ceres/types.cc b/extern/libmv/third_party/ceres/internal/ceres/types.cc
new file mode 100644
index 00000000000..860f8a43f37
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/types.cc
@@ -0,0 +1,98 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#include <string>
+#include "ceres/types.h"
+
+namespace ceres {
+
+#define CASESTR(x) case x: return #x
+
+const char* LinearSolverTypeToString(LinearSolverType solver_type) {
+  switch (solver_type) {
+    CASESTR(SPARSE_NORMAL_CHOLESKY);
+    CASESTR(DENSE_QR);
+    CASESTR(DENSE_SCHUR);
+    CASESTR(SPARSE_SCHUR);
+    CASESTR(ITERATIVE_SCHUR);
+    CASESTR(CGNR);
+    default:
+      return "UNKNOWN";
+  }
+}
+
+const char* PreconditionerTypeToString(
+    PreconditionerType preconditioner_type) {
+  switch (preconditioner_type) {
+    CASESTR(IDENTITY);
+    CASESTR(JACOBI);
+    CASESTR(SCHUR_JACOBI);
+    CASESTR(CLUSTER_JACOBI);
+    CASESTR(CLUSTER_TRIDIAGONAL);
+    default:
+      return "UNKNOWN";
+  }
+}
+
+const char* OrderingTypeToString(OrderingType ordering_type) {
+  switch (ordering_type) {
+    CASESTR(NATURAL);
+    CASESTR(USER);
+    CASESTR(SCHUR);
+    default:
+      return "UNKNOWN";
+  }
+}
+
+const char* SolverTerminationTypeToString(
+    SolverTerminationType termination_type) {
+  switch (termination_type) {
+    CASESTR(NO_CONVERGENCE);
+    CASESTR(FUNCTION_TOLERANCE);
+    CASESTR(GRADIENT_TOLERANCE);
+    CASESTR(PARAMETER_TOLERANCE);
+    CASESTR(NUMERICAL_FAILURE);
+    CASESTR(USER_ABORT);
+    CASESTR(USER_SUCCESS);
+    CASESTR(DID_NOT_RUN);
+    default:
+      return "UNKNOWN";
+  }
+}
+
+#undef CASESTR
+
+bool IsSchurType(LinearSolverType type) {
+  return ((type == SPARSE_SCHUR) ||
+          (type == DENSE_SCHUR)  ||
+          (type == ITERATIVE_SCHUR));
+}
+
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/visibility.cc b/extern/libmv/third_party/ceres/internal/ceres/visibility.cc
new file mode 100644
index 00000000000..fd41648a7af
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/visibility.cc
@@ -0,0 +1,150 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: kushalav@google.com (Avanish Kushal)
+
+#include <cmath>
+#include <ctime>
+#include <algorithm>
+#include <set>
+#include <vector>
+#include <utility>
+
+#include <glog/logging.h>
+#include "ceres/block_structure.h"
+#include "ceres/collections_port.h"
+#include "ceres/graph.h"
+
+namespace ceres {
+namespace internal {
+
+void ComputeVisibility(const CompressedRowBlockStructure& block_structure,
+                       const int num_eliminate_blocks,
+                       vector< set<int> >* visibility) {
+  CHECK_NOTNULL(visibility);
+
+  // Clear the visibility vector and resize it to hold a
+  // vector for each camera.
+  visibility->resize(0);
+  visibility->resize(block_structure.cols.size() - num_eliminate_blocks);
+
+  for (int i = 0; i < block_structure.rows.size(); ++i) {
+    const vector<Cell>& cells = block_structure.rows[i].cells;
+    int block_id = cells[0].block_id;
+    // If the first block is not an e_block, then skip this row block.
+    if (block_id >= num_eliminate_blocks) {
+      continue;
+    }
+
+    for (int j = 1; j < cells.size(); ++j) {
+      int camera_block_id = cells[j].block_id - num_eliminate_blocks;
+      DCHECK_GE(camera_block_id, 0);
+      DCHECK_LT(camera_block_id, visibility->size());
+      (*visibility)[camera_block_id].insert(block_id);
+    }
+  }
+}
+
+Graph<int>* CreateSchurComplementGraph(const vector<set<int> >& visibility) {
+  const time_t start_time = time(NULL);
+  // Compute the number of e_blocks/point blocks. Since the visibility
+  // set for each e_block/camera contains the set of e_blocks/points
+  // visible to it, we find the maximum across all visibility sets.
+  int num_points = 0;
+  for (int i = 0; i < visibility.size(); i++) {
+    if (visibility[i].size() > 0) {
+      num_points = max(num_points, (*visibility[i].rbegin()) + 1);
+    }
+  }
+
+  // Invert the visibility. The input is a camera->point mapping,
+  // which tells us which points are visible in which
+  // cameras. However, to compute the sparsity structure of the Schur
+  // Complement efficiently, its better to have the point->camera
+  // mapping.
+  vector<set<int> > inverse_visibility(num_points);
+  for (int i = 0; i < visibility.size(); i++) {
+    const set<int>& visibility_set = visibility[i];
+    for (set<int>::const_iterator it = visibility_set.begin();
+         it != visibility_set.end();
+         ++it) {
+      inverse_visibility[*it].insert(i);
+    }
+  }
+
+  // Map from camera pairs to number of points visible to both cameras
+  // in the pair.
+  HashMap<pair<int, int>, int > camera_pairs;
+
+  // Count the number of points visible to each camera/f_block pair.
+  for (vector<set<int> >::const_iterator it = inverse_visibility.begin();
+       it != inverse_visibility.end();
+       ++it) {
+    const set<int>& inverse_visibility_set = *it;
+    for (set<int>::const_iterator camera1 = inverse_visibility_set.begin();
+         camera1 != inverse_visibility_set.end();
+         ++camera1) {
+      set<int>::const_iterator camera2 = camera1;
+      for (++camera2; camera2 != inverse_visibility_set.end(); ++camera2) {
+        ++(camera_pairs[make_pair(*camera1, *camera2)]);
+      }
+    }
+  }
+
+  Graph<int>* graph = new Graph<int>();
+
+  // Add vertices and initialize the pairs for self edges so that self
+  // edges are guaranteed. This is needed for the Canonical views
+  // algorithm to work correctly.
+  static const double kSelfEdgeWeight = 1.0;
+  for (int i = 0; i < visibility.size(); ++i) {
+    graph->AddVertex(i);
+    graph->AddEdge(i, i, kSelfEdgeWeight);
+  }
+
+  // Add an edge for each camera pair.
+  for (HashMap<pair<int, int>, int>::const_iterator it = camera_pairs.begin();
+       it != camera_pairs.end();
+       ++it) {
+    const int camera1 = it->first.first;
+    const int camera2 = it->first.second;
+    CHECK_NE(camera1, camera2);
+
+    const int count = it->second;
+    // Static cast necessary for Windows.
+    const double weight = static_cast<double>(count) /
+        (sqrt(static_cast<double>(visibility[camera1].size() * visibility[camera2].size())));
+    graph->AddEdge(camera1, camera2, weight);
+  }
+
+  VLOG(2) << "Schur complement graph time: " << (time(NULL) - start_time);
+  return graph;
+}
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/visibility.h b/extern/libmv/third_party/ceres/internal/ceres/visibility.h
new file mode 100644
index 00000000000..692dd87201e
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/visibility.h
@@ -0,0 +1,77 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: kushalav@google.com (Avanish Kushal)
+//         sameeragarwal@google.com (Sameer Agarwal)
+//
+// Functions to manipulate visibility information from the block
+// structure of sparse matrices.
+
+#ifndef CERES_INTERNAL_VISIBILITY_H_
+#define CERES_INTERNAL_VISIBILITY_H_
+
+#include <set>
+#include <vector>
+#include "ceres/graph.h"
+
+namespace ceres {
+namespace internal {
+
+class CompressedRowBlockStructure;
+
+// Given a compressed row block structure, computes the set of
+// e_blocks "visible" to each f_block. If an e_block co-occurs with an
+// f_block in a residual block, it is visible to the f_block. The
+// first num_eliminate_blocks columns blocks are e_blocks and the rest
+// f_blocks.
+//
+// In a structure from motion problem, e_blocks correspond to 3D
+// points and f_blocks correspond to cameras.
+void ComputeVisibility(const CompressedRowBlockStructure& block_structure,
+                       int num_eliminate_blocks,
+                       vector<set<int> >* visibility);
+
+// Given f_block visibility as computed by the ComputeVisibility
+// function above, construct and return a graph whose vertices are
+// f_blocks and an edge connects two vertices if they have atleast one
+// e_block in common. The weight of this edge is normalized dot
+// product between the visibility vectors of the two
+// vertices/f_blocks.
+//
+// This graph reflects the sparsity structure of reduced camera
+// matrix/Schur complement matrix obtained by eliminating the e_blocks
+// from the normal equations.
+//
+// Caller acquires ownership of the returned Graph pointer
+// (heap-allocated).
+Graph<int>* CreateSchurComplementGraph(const vector<set<int> >& visibility);
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_VISIBILITY_H_
diff --git a/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.cc b/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.cc
new file mode 100644
index 00000000000..aca77528215
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.cc
@@ -0,0 +1,611 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+
+#include "ceres/visibility_based_preconditioner.h"
+
+#include <algorithm>
+#include <functional>
+#include <iterator>
+#include <numeric>
+#include <set>
+#include <utility>
+#include <vector>
+#include <glog/logging.h>
+#include "Eigen/Dense"
+#include "ceres/block_random_access_sparse_matrix.h"
+#include "ceres/block_sparse_matrix.h"
+#include "ceres/canonical_views_clustering.h"
+#include "ceres/collections_port.h"
+#include "ceres/detect_structure.h"
+#include "ceres/graph.h"
+#include "ceres/graph_algorithms.h"
+#include "ceres/linear_solver.h"
+#include "ceres/schur_eliminator.h"
+#include "ceres/visibility.h"
+#include "ceres/internal/scoped_ptr.h"
+
+namespace ceres {
+namespace internal {
+
+// TODO(sameeragarwal): Currently these are magic weights for the
+// preconditioner construction. Move these higher up into the Options
+// struct and provide some guidelines for choosing them.
+//
+// This will require some more work on the clustering algorithm and
+// possibly some more refactoring of the code.
+static const double kSizePenaltyWeight = 3.0;
+static const double kSimilarityPenaltyWeight = 0.0;
+
+#ifndef CERES_NO_SUITESPARSE
+VisibilityBasedPreconditioner::VisibilityBasedPreconditioner(
+    const CompressedRowBlockStructure& bs,
+    const LinearSolver::Options& options)
+    : options_(options),
+      num_blocks_(0),
+      num_clusters_(0),
+      factor_(NULL) {
+  CHECK_GT(options_.num_eliminate_blocks, 0);
+  CHECK(options_.preconditioner_type == SCHUR_JACOBI ||
+        options_.preconditioner_type == CLUSTER_JACOBI ||
+        options_.preconditioner_type == CLUSTER_TRIDIAGONAL)
+      << "Unknown preconditioner type: " << options_.preconditioner_type;
+  num_blocks_ = bs.cols.size() - options_.num_eliminate_blocks;
+  CHECK_GT(num_blocks_, 0)
+      << "Jacobian should have atleast 1 f_block for "
+      << "visibility based preconditioning.";
+
+  // Vector of camera block sizes
+  block_size_.resize(num_blocks_);
+  for (int i = 0; i < num_blocks_; ++i) {
+    block_size_[i] = bs.cols[i + options_.num_eliminate_blocks].size;
+  }
+
+  const time_t start_time = time(NULL);
+  switch (options_.preconditioner_type) {
+    case SCHUR_JACOBI:
+      ComputeSchurJacobiSparsity(bs);
+      break;
+    case CLUSTER_JACOBI:
+      ComputeClusterJacobiSparsity(bs);
+      break;
+    case CLUSTER_TRIDIAGONAL:
+      ComputeClusterTridiagonalSparsity(bs);
+      break;
+    default:
+      LOG(FATAL) << "Unknown preconditioner type";
+  }
+  const time_t structure_time = time(NULL);
+  InitStorage(bs);
+  const time_t storage_time = time(NULL);
+  InitEliminator(bs);
+  const time_t eliminator_time = time(NULL);
+
+  // Allocate temporary storage for a vector used during
+  // RightMultiply.
+  tmp_rhs_ = CHECK_NOTNULL(ss_.CreateDenseVector(NULL,
+                                                 m_->num_rows(),
+                                                 m_->num_rows()));
+  const time_t init_time = time(NULL);
+  VLOG(2) << "init time: "
+          << init_time - start_time
+          << " structure time: " << structure_time - start_time
+          << " storage time:" << storage_time - structure_time
+          << " eliminator time: " << eliminator_time - storage_time;
+}
+
+VisibilityBasedPreconditioner::~VisibilityBasedPreconditioner() {
+  if (factor_ != NULL) {
+    ss_.Free(factor_);
+    factor_ = NULL;
+  }
+  if (tmp_rhs_ != NULL) {
+    ss_.Free(tmp_rhs_);
+    tmp_rhs_ = NULL;
+  }
+}
+
+// Determine the sparsity structure of the SCHUR_JACOBI
+// preconditioner. SCHUR_JACOBI is an extreme case of a visibility
+// based preconditioner where each camera block corresponds to a
+// cluster and there is no interaction between clusters.
+void VisibilityBasedPreconditioner::ComputeSchurJacobiSparsity(
+    const CompressedRowBlockStructure& bs) {
+  num_clusters_ = num_blocks_;
+  cluster_membership_.resize(num_blocks_);
+  cluster_pairs_.clear();
+
+  // Each camea block is a member of its own cluster and the only
+  // cluster pairs are the self edges (i,i).
+  for (int i = 0; i < num_clusters_; ++i) {
+    cluster_membership_[i] = i;
+    cluster_pairs_.insert(make_pair(i, i));
+  }
+}
+
+// Determine the sparsity structure of the CLUSTER_JACOBI
+// preconditioner. It clusters cameras using their scene
+// visibility. The clusters form the diagonal blocks of the
+// preconditioner matrix.
+void VisibilityBasedPreconditioner::ComputeClusterJacobiSparsity(
+    const CompressedRowBlockStructure& bs) {
+  vector<set<int> > visibility;
+  ComputeVisibility(bs, options_.num_eliminate_blocks, &visibility);
+  CHECK_EQ(num_blocks_, visibility.size());
+  ClusterCameras(visibility);
+  cluster_pairs_.clear();
+  for (int i = 0; i < num_clusters_; ++i) {
+    cluster_pairs_.insert(make_pair(i, i));
+  }
+}
+
+// Determine the sparsity structure of the CLUSTER_TRIDIAGONAL
+// preconditioner. It clusters cameras using using the scene
+// visibility and then finds the strongly interacting pairs of
+// clusters by constructing another graph with the clusters as
+// vertices and approximating it with a degree-2 maximum spanning
+// forest. The set of edges in this forest are the cluster pairs.
+void VisibilityBasedPreconditioner::ComputeClusterTridiagonalSparsity(
+    const CompressedRowBlockStructure& bs) {
+  vector<set<int> > visibility;
+  ComputeVisibility(bs, options_.num_eliminate_blocks, &visibility);
+  CHECK_EQ(num_blocks_, visibility.size());
+  ClusterCameras(visibility);
+
+  // Construct a weighted graph on the set of clusters, where the
+  // edges are the number of 3D points/e_blocks visible in both the
+  // clusters at the ends of the edge. Return an approximate degree-2
+  // maximum spanning forest of this graph.
+  vector<set<int> > cluster_visibility;
+  ComputeClusterVisibility(visibility, &cluster_visibility);
+  scoped_ptr<Graph<int> > cluster_graph(
+      CHECK_NOTNULL(CreateClusterGraph(cluster_visibility)));
+  scoped_ptr<Graph<int> > forest(
+      CHECK_NOTNULL(Degree2MaximumSpanningForest(*cluster_graph)));
+  ForestToClusterPairs(*forest, &cluster_pairs_);
+}
+
+// Allocate storage for the preconditioner matrix.
+void VisibilityBasedPreconditioner::InitStorage(
+    const CompressedRowBlockStructure& bs) {
+  ComputeBlockPairsInPreconditioner(bs);
+  m_.reset(new BlockRandomAccessSparseMatrix(block_size_, block_pairs_));
+}
+
+// Call the canonical views algorithm and cluster the cameras based on
+// their visibility sets. The visibility set of a camera is the set of
+// e_blocks/3D points in the scene that are seen by it.
+//
+// The cluster_membership_ vector is updated to indicate cluster
+// memberships for each camera block.
+void VisibilityBasedPreconditioner::ClusterCameras(
+    const vector<set<int> >& visibility) {
+  scoped_ptr<Graph<int> > schur_complement_graph(
+      CHECK_NOTNULL(CreateSchurComplementGraph(visibility)));
+
+  CanonicalViewsClusteringOptions options;
+  options.size_penalty_weight = kSizePenaltyWeight;
+  options.similarity_penalty_weight = kSimilarityPenaltyWeight;
+
+  vector<int> centers;
+  HashMap<int, int> membership;
+  ComputeCanonicalViewsClustering(*schur_complement_graph,
+                                  options,
+                                  &centers,
+                                  &membership);
+  num_clusters_ = centers.size();
+  CHECK_GT(num_clusters_, 0);
+  VLOG(2) << "num_clusters: " << num_clusters_;
+  FlattenMembershipMap(membership, &cluster_membership_);
+}
+
+// Compute the block sparsity structure of the Schur complement
+// matrix. For each pair of cameras contributing a non-zero cell to
+// the schur complement, determine if that cell is present in the
+// preconditioner or not.
+//
+// A pair of cameras contribute a cell to the preconditioner if they
+// are part of the same cluster or if the the two clusters that they
+// belong have an edge connecting them in the degree-2 maximum
+// spanning forest.
+//
+// For example, a camera pair (i,j) where i belonges to cluster1 and
+// j belongs to cluster2 (assume that cluster1 < cluster2).
+//
+// The cell corresponding to (i,j) is present in the preconditioner
+// if cluster1 == cluster2 or the pair (cluster1, cluster2) were
+// connected by an edge in the degree-2 maximum spanning forest.
+//
+// Since we have already expanded the forest into a set of camera
+// pairs/edges, including self edges, the check can be reduced to
+// checking membership of (cluster1, cluster2) in cluster_pairs_.
+void VisibilityBasedPreconditioner::ComputeBlockPairsInPreconditioner(
+    const CompressedRowBlockStructure& bs) {
+  block_pairs_.clear();
+  for (int i = 0; i < num_blocks_; ++i) {
+    block_pairs_.insert(make_pair(i, i));
+  }
+
+  int r = 0;
+  set<pair<int, int> > skipped_pairs;
+  const int num_row_blocks = bs.rows.size();
+  const int num_eliminate_blocks = options_.num_eliminate_blocks;
+
+  // Iterate over each row of the matrix. The block structure of the
+  // matrix is assumed to be sorted in order of the e_blocks/point
+  // blocks. Thus all row blocks containing an e_block/point occur
+  // contiguously. Further, if present, an e_block is always the first
+  // parameter block in each row block.  These structural assumptions
+  // are common to all Schur complement based solvers in Ceres.
+  //
+  // For each e_block/point block we identify the set of cameras
+  // seeing it. The cross product of this set with itself is the set
+  // of non-zero cells contibuted by this e_block.
+  //
+  // The time complexity of this is O(nm^2) where, n is the number of
+  // 3d points and m is the maximum number of cameras seeing any
+  // point, which for most scenes is a fairly small number.
+  while (r < num_row_blocks) {
+    int e_block_id = bs.rows[r].cells.front().block_id;
+    if (e_block_id >= num_eliminate_blocks) {
+      // Skip the rows whose first block is an f_block.
+      break;
+    }
+
+    set<int> f_blocks;
+    for (; r < num_row_blocks; ++r) {
+      const CompressedRow& row = bs.rows[r];
+      if (row.cells.front().block_id != e_block_id) {
+        break;
+      }
+
+      // Iterate over the blocks in the row, ignoring the first block
+      // since it is the one to be eliminated and adding the rest to
+      // the list of f_blocks associated with this e_block.
+      for (int c = 1; c < row.cells.size(); ++c) {
+        const Cell& cell = row.cells[c];
+        const int f_block_id = cell.block_id - num_eliminate_blocks;
+        CHECK_GE(f_block_id, 0);
+        f_blocks.insert(f_block_id);
+      }
+    }
+
+    for (set<int>::const_iterator block1 = f_blocks.begin();
+         block1 != f_blocks.end();
+         ++block1) {
+      set<int>::const_iterator block2 = block1;
+      ++block2;
+      for (; block2 != f_blocks.end(); ++block2) {
+        if (IsBlockPairInPreconditioner(*block1, *block2)) {
+          block_pairs_.insert(make_pair(*block1, *block2));
+        } else {
+          skipped_pairs.insert(make_pair(*block1, *block2));
+        }
+      }
+    }
+  }
+
+  // The remaining rows which do not contain any e_blocks.
+  for (; r < num_row_blocks; ++r) {
+    const CompressedRow& row = bs.rows[r];
+    CHECK_GE(row.cells.front().block_id, num_eliminate_blocks);
+    for (int i = 0; i < row.cells.size(); ++i) {
+      const int block1 = row.cells[i].block_id - num_eliminate_blocks;
+      for (int j = 0; j < row.cells.size(); ++j) {
+        const int block2 = row.cells[j].block_id - num_eliminate_blocks;
+        if (block1 <= block2) {
+          if (IsBlockPairInPreconditioner(block1, block2)) {
+            block_pairs_.insert(make_pair(block1, block2));
+          } else {
+            skipped_pairs.insert(make_pair(block1, block2));
+          }
+        }
+      }
+    }
+  }
+
+  VLOG(1) << "Block pair stats: "
+          << block_pairs_.size() << " included "
+          << skipped_pairs.size() << " excluded";
+}
+
+// Initialize the SchurEliminator.
+void VisibilityBasedPreconditioner::InitEliminator(
+    const CompressedRowBlockStructure& bs) {
+  LinearSolver::Options eliminator_options;
+  eliminator_options.num_eliminate_blocks = options_.num_eliminate_blocks;
+  eliminator_options.num_threads = options_.num_threads;
+  eliminator_options.constant_sparsity = true;
+
+  DetectStructure(bs, options_.num_eliminate_blocks,
+                  &eliminator_options.row_block_size,
+                  &eliminator_options.e_block_size,
+                  &eliminator_options.f_block_size);
+
+  eliminator_.reset(SchurEliminatorBase::Create(eliminator_options));
+  eliminator_->Init(options_.num_eliminate_blocks, &bs);
+}
+
+// Compute the values of the preconditioner matrix and factorize it.
+bool VisibilityBasedPreconditioner::Compute(const BlockSparseMatrixBase& A,
+                                            const double* D) {
+  const time_t start_time = time(NULL);
+  const int num_rows = m_->num_rows();
+  CHECK_GT(num_rows, 0);
+
+  // We need a dummy rhs vector and a dummy b vector since the Schur
+  // eliminator combines the computation of the reduced camera matrix
+  // with the computation of the right hand side of that linear
+  // system.
+  //
+  // TODO(sameeragarwal): Perhaps its worth refactoring the
+  // SchurEliminator::Eliminate function to allow NULL for the rhs. As
+  // of now it does not seem to be worth the effort.
+  Vector rhs = Vector::Zero(m_->num_rows());
+  Vector b = Vector::Zero(A.num_rows());
+
+  // Compute a subset of the entries of the Schur complement.
+  eliminator_->Eliminate(&A, b.data(), D, m_.get(), rhs.data());
+
+  // Try factorizing the matrix. For SCHUR_JACOBI and CLUSTER_JACOBI,
+  // this should always succeed modulo some numerical/conditioning
+  // problems. For CLUSTER_TRIDIAGONAL, in general the preconditioner
+  // matrix as constructed is not positive definite. However, we will
+  // go ahead and try factorizing it. If it works, great, otherwise we
+  // scale all the cells in the preconditioner corresponding to the
+  // edges in the degree-2 forest and that guarantees positive
+  // definiteness. The proof of this fact can be found in Lemma 1 in
+  // "Visibility Based Preconditioning for Bundle Adjustment".
+  //
+  // Doing the factorization like this saves us matrix mass when
+  // scaling is not needed, which is quite often in our experience.
+  bool status = Factorize();
+
+  // The scaling only affects the tri-diagonal case, since
+  // ScaleOffDiagonalBlocks only pays attenion to the cells that
+  // belong to the edges of the degree-2 forest. In the SCHUR_JACOBI
+  // and the CLUSTER_JACOBI cases, the preconditioner is guaranteed to
+  // be positive semidefinite.
+  if (!status && options_.preconditioner_type == CLUSTER_TRIDIAGONAL) {
+    VLOG(1) << "Unscaled factorization failed. Retrying with off-diagonal "
+            << "scaling";
+    ScaleOffDiagonalCells();
+    status = Factorize();
+  }
+
+  VLOG(2) << "Compute time: " << time(NULL) - start_time;
+  return status;
+}
+
+// Consider the preconditioner matrix as meta-block matrix, whose
+// blocks correspond to the clusters. Then cluster pairs corresponding
+// to edges in the degree-2 forest are off diagonal entries of this
+// matrix. Scaling these off-diagonal entries by 1/2 forces this
+// matrix to be positive definite.
+void VisibilityBasedPreconditioner::ScaleOffDiagonalCells() {
+  for (set< pair<int, int> >::const_iterator it = block_pairs_.begin();
+       it != block_pairs_.end();
+       ++it) {
+    const int block1 = it->first;
+    const int block2 = it->second;
+    if (!IsBlockPairOffDiagonal(block1, block2)) {
+      continue;
+    }
+
+    int r, c, row_stride, col_stride;
+    CellInfo* cell_info = m_->GetCell(block1, block2,
+                                      &r, &c,
+                                      &row_stride, &col_stride);
+    CHECK(cell_info != NULL)
+        << "Cell missing for block pair (" << block1 << "," << block2 << ")"
+        << " cluster pair (" << cluster_membership_[block1]
+        << " " << cluster_membership_[block2] << ")";
+
+    // Ah the magic of tri-diagonal matrices and diagonal
+    // dominance. See Lemma 1 in "Visibility Based Preconditioning
+    // For Bundle Adjustment".
+    MatrixRef m(cell_info->values, row_stride, col_stride);
+    m.block(r, c, block_size_[block1], block_size_[block2]) *= 0.5;
+  }
+}
+
+// Compute the sparse Cholesky factorization of the preconditioner
+// matrix.
+bool VisibilityBasedPreconditioner::Factorize() {
+  // Extract the TripletSparseMatrix that is used for actually storing
+  // S and convert it into a cholmod_sparse object.
+  cholmod_sparse* lhs = ss_.CreateSparseMatrix(
+      down_cast<BlockRandomAccessSparseMatrix*>(
+          m_.get())->mutable_matrix());
+
+  // The matrix is symmetric, and the upper triangular part of the
+  // matrix contains the values.
+  lhs->stype = 1;
+
+  // Symbolic factorization is computed if we don't already have one
+  // handy.
+  if (factor_ == NULL) {
+    factor_ = ss_.AnalyzeCholesky(lhs);
+  }
+
+  bool status = ss_.Cholesky(lhs, factor_);
+  ss_.Free(lhs);
+  return status;
+}
+
+void VisibilityBasedPreconditioner::RightMultiply(const double* x,
+                                                  double* y) const {
+  CHECK_NOTNULL(x);
+  CHECK_NOTNULL(y);
+  SuiteSparse* ss = const_cast<SuiteSparse*>(&ss_);
+
+  const int num_rows = m_->num_rows();
+  memcpy(CHECK_NOTNULL(tmp_rhs_)->x, x, m_->num_rows() * sizeof(*x));
+  cholmod_dense* solution = CHECK_NOTNULL(ss->Solve(factor_, tmp_rhs_));
+  memcpy(y, solution->x, sizeof(*y) * num_rows);
+  ss->Free(solution);
+}
+
+int VisibilityBasedPreconditioner::num_rows() const {
+  return m_->num_rows();
+}
+
+// Classify camera/f_block pairs as in and out of the preconditioner,
+// based on whether the cluster pair that they belong to is in the
+// preconditioner or not.
+bool VisibilityBasedPreconditioner::IsBlockPairInPreconditioner(
+    const int block1,
+    const int block2) const {
+  int cluster1 = cluster_membership_[block1];
+  int cluster2 = cluster_membership_[block2];
+  if (cluster1 > cluster2) {
+    std::swap(cluster1, cluster2);
+  }
+  return (cluster_pairs_.count(make_pair(cluster1, cluster2)) > 0);
+}
+
+bool VisibilityBasedPreconditioner::IsBlockPairOffDiagonal(
+    const int block1,
+    const int block2) const {
+  return (cluster_membership_[block1] != cluster_membership_[block2]);
+}
+
+// Convert a graph into a list of edges that includes self edges for
+// each vertex.
+void VisibilityBasedPreconditioner::ForestToClusterPairs(
+    const Graph<int>& forest,
+    HashSet<pair<int, int> >* cluster_pairs) const {
+  CHECK_NOTNULL(cluster_pairs)->clear();
+  const HashSet<int>& vertices = forest.vertices();
+  CHECK_EQ(vertices.size(), num_clusters_);
+
+  // Add all the cluster pairs corresponding to the edges in the
+  // forest.
+  for (HashSet<int>::const_iterator it1 = vertices.begin();
+       it1 != vertices.end();
+       ++it1) {
+    const int cluster1 = *it1;
+    cluster_pairs->insert(make_pair(cluster1, cluster1));
+    const HashSet<int>& neighbors = forest.Neighbors(cluster1);
+    for (HashSet<int>::const_iterator it2 = neighbors.begin();
+         it2 != neighbors.end();
+         ++it2) {
+      const int cluster2 = *it2;
+      if (cluster1 < cluster2) {
+        cluster_pairs->insert(make_pair(cluster1, cluster2));
+      }
+    }
+  }
+}
+
+// The visibilty set of a cluster is the union of the visibilty sets
+// of all its cameras. In other words, the set of points visible to
+// any camera in the cluster.
+void VisibilityBasedPreconditioner::ComputeClusterVisibility(
+    const vector<set<int> >& visibility,
+    vector<set<int> >* cluster_visibility) const {
+  CHECK_NOTNULL(cluster_visibility)->resize(0);
+  cluster_visibility->resize(num_clusters_);
+  for (int i = 0; i < num_blocks_; ++i) {
+    const int cluster_id = cluster_membership_[i];
+    (*cluster_visibility)[cluster_id].insert(visibility[i].begin(),
+                                             visibility[i].end());
+  }
+}
+
+// Construct a graph whose vertices are the clusters, and the edge
+// weights are the number of 3D points visible to cameras in both the
+// vertices.
+Graph<int>* VisibilityBasedPreconditioner::CreateClusterGraph(
+    const vector<set<int> >& cluster_visibility) const {
+  Graph<int>* cluster_graph = new Graph<int>;
+
+  for (int i = 0; i < num_clusters_; ++i) {
+    cluster_graph->AddVertex(i);
+  }
+
+  for (int i = 0; i < num_clusters_; ++i) {
+    const set<int>& cluster_i = cluster_visibility[i];
+    for (int j = i+1; j < num_clusters_; ++j) {
+      vector<int> intersection;
+      const set<int>& cluster_j = cluster_visibility[j];
+      set_intersection(cluster_i.begin(), cluster_i.end(),
+                       cluster_j.begin(), cluster_j.end(),
+                       back_inserter(intersection));
+
+      if (intersection.size() > 0) {
+        // Clusters interact strongly when they share a large number
+        // of 3D points. The degree-2 maximum spanning forest
+        // alorithm, iterates on the edges in decreasing order of
+        // their weight, which is the number of points shared by the
+        // two cameras that it connects.
+        cluster_graph->AddEdge(i, j, intersection.size());
+      }
+    }
+  }
+  return cluster_graph;
+}
+
+// Canonical views clustering returns a HashMap from vertices to
+// cluster ids. Convert this into a flat array for quick lookup. It is
+// possible that some of the vertices may not be associated with any
+// cluster. In that case, randomly assign them to one of the clusters.
+void VisibilityBasedPreconditioner::FlattenMembershipMap(
+    const HashMap<int, int>& membership_map,
+    vector<int>* membership_vector) const {
+  CHECK_NOTNULL(membership_vector)->resize(0);
+  membership_vector->resize(num_blocks_, -1);
+  // Iterate over the cluster membership map and update the
+  // cluster_membership_ vector assigning arbitrary cluster ids to
+  // the few cameras that have not been clustered.
+  for (HashMap<int, int>::const_iterator it = membership_map.begin();
+       it != membership_map.end();
+       ++it) {
+    const int camera_id = it->first;
+    int cluster_id = it->second;
+
+    // If the view was not clustered, randomly assign it to one of the
+    // clusters. This preserves the mathematical correctness of the
+    // preconditioner. If there are too many views which are not
+    // clustered, it may lead to some quality degradation though.
+    //
+    // TODO(sameeragarwal): Check if a large number of views have not
+    // been clustered and deal with it?
+    if (cluster_id == -1) {
+      cluster_id = camera_id % num_clusters_;
+    }
+
+    membership_vector->at(camera_id) = cluster_id;
+  }
+}
+
+#endif  // CERES_NO_SUITESPARSE
+
+}  // namespace internal
+}  // namespace ceres
diff --git a/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.h b/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.h
new file mode 100644
index 00000000000..fa095ca1dd8
--- /dev/null
+++ b/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.h
@@ -0,0 +1,273 @@
+// Ceres Solver - A fast non-linear least squares minimizer
+// Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+// http://code.google.com/p/ceres-solver/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+// * Neither the name of Google Inc. nor the names of its contributors may be
+//   used to endorse or promote products derived from this software without
+//   specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: sameeragarwal@google.com (Sameer Agarwal)
+//
+// Preconditioners for linear systems that arise in Structure from
+// Motion problems. VisibilityBasedPreconditioner implements three
+// preconditioners:
+//
+//  SCHUR_JACOBI
+//  CLUSTER_JACOBI
+//  CLUSTER_TRIDIAGONAL
+//
+// Detailed descriptions of these preconditions beyond what is
+// documented here can be found in
+//
+// Bundle Adjustment in the Large
+// S. Agarwal, N. Snavely, S. Seitz & R. Szeliski, ECCV 2010
+// http://www.cs.washington.edu/homes/sagarwal/bal.pdf
+//
+// Visibility Based Preconditioning for Bundle Adjustment
+// A. Kushal & S. Agarwal, submitted to CVPR 2012
+// http://www.cs.washington.edu/homes/sagarwal/vbp.pdf
+//
+// The three preconditioners share enough code that its most efficient
+// to implement them as part of the same code base.
+
+#ifndef CERES_INTERNAL_VISIBILITY_BASED_PRECONDITIONER_H_
+#define CERES_INTERNAL_VISIBILITY_BASED_PRECONDITIONER_H_
+
+#include <set>
+#include <vector>
+#include <utility>
+#include "ceres/collections_port.h"
+#include "ceres/graph.h"
+#include "ceres/linear_solver.h"
+#include "ceres/linear_operator.h"
+#include "ceres/suitesparse.h"
+#include "ceres/internal/macros.h"
+#include "ceres/internal/scoped_ptr.h"
+
+namespace ceres {
+namespace internal {
+
+class BlockRandomAccessSparseMatrix;
+class BlockSparseMatrixBase;
+class CompressedRowBlockStructure;
+class SchurEliminatorBase;
+
+// This class implements three preconditioners for Structure from
+// Motion/Bundle Adjustment problems. The name
+// VisibilityBasedPreconditioner comes from the fact that the sparsity
+// structure of the preconditioner matrix is determined by analyzing
+// the visibility structure of the scene, i.e. which cameras see which
+// points.
+//
+// Strictly speaking, SCHUR_JACOBI is not a visibility based
+// preconditioner but it is an extreme case of CLUSTER_JACOBI, where
+// every cluster contains exactly one camera block. Treating it as a
+// special case of CLUSTER_JACOBI makes it easy to implement as part
+// of the same code base with no significant loss of performance.
+//
+// In the following, we will only discuss CLUSTER_JACOBI and
+// CLUSTER_TRIDIAGONAL.
+//
+// The key idea of visibility based preconditioning is to identify
+// cameras that we expect have strong interactions, and then using the
+// entries in the Schur complement matrix corresponding to these
+// camera pairs as an approximation to the full Schur complement.
+//
+// CLUSTER_JACOBI identifies these camera pairs by clustering cameras,
+// and considering all non-zero camera pairs within each cluster. The
+// clustering in the current implementation is done using the
+// Canonical Views algorithm of Simon et al. (see
+// canonical_views_clustering.h). For the purposes of clustering, the
+// similarity or the degree of interaction between a pair of cameras
+// is measured by counting the number of points visible in both the
+// cameras. Thus the name VisibilityBasedPreconditioner. Further, if we
+// were to permute the parameter blocks such that all the cameras in
+// the same cluster occur contiguously, the preconditioner matrix will
+// be a block diagonal matrix with blocks corresponding to the
+// clusters. Thus in analogy with the Jacobi preconditioner we refer
+// to this as the CLUSTER_JACOBI preconditioner.
+//
+// CLUSTER_TRIDIAGONAL adds more mass to the CLUSTER_JACOBI
+// preconditioner by considering the interaction between clusters and
+// identifying strong interactions between cluster pairs. This is done
+// by constructing a weighted graph on the clusters, with the weight
+// on the edges connecting two clusters proportional to the number of
+// 3D points visible to cameras in both the clusters. A degree-2
+// maximum spanning forest is identified in this graph and the camera
+// pairs contained in the edges of this forest are added to the
+// preconditioner. The detailed reasoning for this construction is
+// explained in the paper mentioned above.
+//
+// Degree-2 spanning trees and forests have the property that they
+// correspond to tri-diagonal matrices. Thus there exist a permutation
+// of the camera blocks under which the CLUSTER_TRIDIAGONAL
+// preconditioner matrix is a block tridiagonal matrix, and thus the
+// name for the preconditioner.
+//
+// Thread Safety: This class is NOT thread safe.
+//
+// Example usage:
+//
+//   LinearSolver::Options options;
+//   options.preconditioner_type = CLUSTER_JACOBI;
+//   options.num_eliminate_blocks = num_points;
+//   VisibilityBasedPreconditioner preconditioner(
+//      *A.block_structure(), options);
+//   preconditioner.Compute(A, NULL);
+//   preconditioner.RightMultiply(x, y);
+//
+
+#ifndef CERES_NO_SUITESPARSE
+class VisibilityBasedPreconditioner : public LinearOperator {
+ public:
+  // Initialize the symbolic structure of the preconditioner. bs is
+  // the block structure of the linear system to be solved. It is used
+  // to determine the sparsity structure of the preconditioner matrix.
+  //
+  // It has the same structural requirement as other Schur complement
+  // based solvers. Please see schur_eliminator.h for more details.
+  //
+  // LinearSolver::Options::num_eliminate_blocks should be set to the
+  // number of e_blocks in the block structure.
+  //
+  // TODO(sameeragarwal): The use of LinearSolver::Options should
+  // ultimately be replaced with Preconditioner::Options and some sort
+  // of preconditioner factory along the lines of
+  // LinearSolver::CreateLinearSolver. I will wait to do this till I
+  // create a general purpose block Jacobi preconditioner for general
+  // sparse problems along with a CGLS solver.
+  VisibilityBasedPreconditioner(const CompressedRowBlockStructure& bs,
+                                const LinearSolver::Options& options);
+  virtual ~VisibilityBasedPreconditioner();
+
+  // Compute the numerical value of the preconditioner for the linear
+  // system:
+  //
+  //  |   A   | x = |b|
+  //  |diag(D)|     |0|
+  //
+  // for some vector b. It is important that the matrix A have the
+  // same block structure as the one used to construct this object.
+  //
+  // D can be NULL, in which case its interpreted as a diagonal matrix
+  // of size zero.
+  bool Compute(const BlockSparseMatrixBase& A,
+               const double* D);
+
+  // LinearOperator interface. Since the operator is symmetric,
+  // LeftMultiply and num_cols are just calls to RightMultiply and
+  // num_rows respectively. Compute() must be called before
+  // RightMultiply can be called.
+  virtual void RightMultiply(const double* x, double* y) const;
+  virtual void LeftMultiply(const double* x, double* y) const {
+    RightMultiply(x, y);
+  }
+  virtual int num_rows() const;
+  virtual int num_cols() const { return num_rows(); }
+
+  friend class VisibilityBasedPreconditionerTest;
+ private:
+  void ComputeSchurJacobiSparsity(const CompressedRowBlockStructure& bs);
+  void ComputeClusterJacobiSparsity(const CompressedRowBlockStructure& bs);
+  void ComputeClusterTridiagonalSparsity(const CompressedRowBlockStructure& bs);
+  void InitStorage(const CompressedRowBlockStructure& bs);
+  void InitEliminator(const CompressedRowBlockStructure& bs);
+  bool Factorize();
+  void ScaleOffDiagonalCells();
+
+  void ClusterCameras(const vector< set<int> >& visibility);
+  void FlattenMembershipMap(const HashMap<int, int>& membership_map,
+                            vector<int>* membership_vector) const;
+  void ComputeClusterVisibility(const vector<set<int> >& visibility,
+                                vector<set<int> >* cluster_visibility) const;
+  Graph<int>* CreateClusterGraph(const vector<set<int> >& visibility) const;
+  void ForestToClusterPairs(const Graph<int>& forest,
+                            HashSet<pair<int, int> >* cluster_pairs) const;
+  void ComputeBlockPairsInPreconditioner(const CompressedRowBlockStructure& bs);
+  bool IsBlockPairInPreconditioner(int block1, int block2) const;
+  bool IsBlockPairOffDiagonal(int block1, int block2) const;
+
+  LinearSolver::Options options_;
+
+  // Number of parameter blocks in the schur complement.
+  int num_blocks_;
+  int num_clusters_;
+
+  // Sizes of the blocks in the schur complement.
+  vector<int> block_size_;
+
+  // Mapping from cameras to clusters.
+  vector<int> cluster_membership_;
+
+  // Non-zero camera pairs from the schur complement matrix that are
+  // present in the preconditioner, sorted by row (first element of
+  // each pair), then column (second).
+  set<pair<int, int> > block_pairs_;
+
+  // Set of cluster pairs (including self pairs (i,i)) in the
+  // preconditioner.
+  HashSet<pair<int, int> > cluster_pairs_;
+  scoped_ptr<SchurEliminatorBase> eliminator_;
+
+  // Preconditioner matrix.
+  scoped_ptr<BlockRandomAccessSparseMatrix> m_;
+
+  // RightMultiply is a const method for LinearOperators. It is
+  // implemented using CHOLMOD's sparse triangular matrix solve
+  // function. This however requires non-const access to the
+  // SuiteSparse context object, even though it does not result in any
+  // of the state of the preconditioner being modified.
+  SuiteSparse ss_;
+
+  // Symbolic and numeric factorization of the preconditioner.
+  cholmod_factor* factor_;
+
+  // Temporary vector used by RightMultiply.
+  cholmod_dense* tmp_rhs_;
+  DISALLOW_COPY_AND_ASSIGN(VisibilityBasedPreconditioner);
+};
+#else  // SuiteSparse
+// If SuiteSparse is not compiled in, the preconditioner is not
+// available.
+class VisibilityBasedPreconditioner : public LinearOperator {
+ public:
+  VisibilityBasedPreconditioner(const CompressedRowBlockStructure& bs,
+                                const LinearSolver::Options& options) {
+    LOG(FATAL) << "Visibility based preconditioning is not available. Please "
+        "build Ceres with SuiteSparse.";
+  }
+  virtual ~VisibilityBasedPreconditioner() {}
+  virtual void RightMultiply(const double* x, double* y) const {}
+  virtual void LeftMultiply(const double* x, double* y) const {}
+  virtual int num_rows() const { return -1; }
+  virtual int num_cols() const { return -1; }
+  bool Compute(const BlockSparseMatrixBase& A, const double* D) {
+    return false;
+  }
+};
+#endif  // CERES_NO_SUITESPARSE
+
+}  // namespace internal
+}  // namespace ceres
+
+#endif  // CERES_INTERNAL_VISIBILITY_BASED_PRECONDITIONER_H_
diff --git a/extern/libmv/third_party/ceres/mkfiles.sh b/extern/libmv/third_party/ceres/mkfiles.sh
new file mode 100755
index 00000000000..d335829aa2c
--- /dev/null
+++ b/extern/libmv/third_party/ceres/mkfiles.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+find ./include/ -type f | sed -r 's/^\.\///' | sort > files.txt
+find ./internal/ -type f | sed -r 's/^\.\///' | sort >> files.txt
diff --git a/extern/libmv/third_party/ceres/patches/collections_port.h.mingw.patch b/extern/libmv/third_party/ceres/patches/collections_port.h.mingw.patch
new file mode 100644
index 00000000000..bbb366e22bc
--- /dev/null
+++ b/extern/libmv/third_party/ceres/patches/collections_port.h.mingw.patch
@@ -0,0 +1,13 @@
+Index: internal/ceres/collections_port.h
+===================================================================
+--- internal/ceres/collections_port.h	(revision 47730)
++++ internal/ceres/collections_port.h	(working copy)
+@@ -53,7 +53,7 @@
+ template<typename K>
+ struct HashSet : tr1::unordered_set<K> {};
+ 
+-#ifdef _WIN32
++#if defined(_WIN32) && !defined(__MINGW64__) && !defined(__MINGW32__)
+ #define GG_LONGLONG(x) x##I64
+ #define GG_ULONGLONG(x) x##UI64
+ #else
diff --git a/extern/libmv/third_party/ceres/patches/msvc_isfinite.patch b/extern/libmv/third_party/ceres/patches/msvc_isfinite.patch
new file mode 100644
index 00000000000..c3129d8e02b
--- /dev/null
+++ b/extern/libmv/third_party/ceres/patches/msvc_isfinite.patch
@@ -0,0 +1,15 @@
+diff --git a/internal/ceres/residual_block_utils.cc b/internal/ceres/residual_block_utils.cc
+index ed3499b..28e0313 100644
+--- a/internal/ceres/residual_block_utils.cc
++++ b/internal/ceres/residual_block_utils.cc
+@@ -40,6 +40,10 @@
+ #include "ceres/internal/eigen.h"
+ #include "ceres/internal/port.h"
+ 
++#ifdef _MSC_VER
++#  define isfinite _finite
++#endif
++
+ namespace ceres {
+ namespace internal {
+ 
diff --git a/extern/libmv/third_party/ceres/patches/series b/extern/libmv/third_party/ceres/patches/series
new file mode 100644
index 00000000000..dbe955ae61e
--- /dev/null
+++ b/extern/libmv/third_party/ceres/patches/series
@@ -0,0 +1 @@
+msvc_isfinite.patch
diff --git a/extern/libredcode/codec.c b/extern/libredcode/codec.c
index f47a85cbb13..4a2dcdd6f5b 100644
--- a/extern/libredcode/codec.c
+++ b/extern/libredcode/codec.c
@@ -7,17 +7,20 @@
 #include <stdio.h>
 #include <string.h>
 
-static void error_callback(const char *msg, void *client_data) {
+static void error_callback(const char *msg, void *client_data)
+{
 	FILE *stream = (FILE*)client_data;
 	fprintf(stream, "[R3D ERR] %s", msg);
 }
 
-static void warning_callback(const char *msg, void *client_data) {
+static void warning_callback(const char *msg, void *client_data)
+{
 	FILE *stream = (FILE*)client_data;
 	fprintf(stream, "[R3D WARN] %s", msg);
 }
 
-static void info_callback(const char *msg, void *client_data) {
+static void info_callback(const char *msg, void *client_data)
+{
 	(void)client_data;
 	fprintf(stdout, "[R3D INFO] %s", msg);
 }
diff --git a/extern/recastnavigation/Recast/Include/RecastAssert.h b/extern/recastnavigation/Recast/Include/RecastAssert.h
index b58b8fcd286..45cb01fb595 100644
--- a/extern/recastnavigation/Recast/Include/RecastAssert.h
+++ b/extern/recastnavigation/Recast/Include/RecastAssert.h
@@ -24,7 +24,7 @@
 
 #ifdef NDEBUG
 // From http://cnicholson.net/2009/02/stupid-c-tricks-adventures-in-assert/
-#	define rcAssert(x) do { (void)sizeof(x); } while(__LINE__==-1,false)  
+#	define rcAssert(x) do { (void)sizeof(x); } while((void)(__LINE__ == -1), false)
 #else
 #	include <assert.h> 
 #	define rcAssert assert
diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt
index c85f0fddc34..71d2ef5e410 100644
--- a/intern/CMakeLists.txt
+++ b/intern/CMakeLists.txt
@@ -31,6 +31,7 @@ add_subdirectory(memutil)
 add_subdirectory(iksolver)
 add_subdirectory(opennl)
 add_subdirectory(mikktspace)
+add_subdirectory(raskter)
 
 if(WITH_AUDASPACE)
 	add_subdirectory(audaspace)
diff --git a/intern/SConscript b/intern/SConscript
index a1e7f840800..3bfdc2c4ca7 100644
--- a/intern/SConscript
+++ b/intern/SConscript
@@ -14,7 +14,8 @@ SConscript(['audaspace/SConscript',
             'boolop/SConscript',
             'opennl/SConscript',
             'mikktspace/SConscript',
-            'smoke/SConscript'])
+            'smoke/SConscript',
+            'raskter/SConscript'])
 
 if env ['WITH_BF_REMESH']:
     SConscript(['dualcon/SConscript'])
diff --git a/intern/audaspace/Python/AUD_PyAPI.cpp b/intern/audaspace/Python/AUD_PyAPI.cpp
index bbc7a0ca52e..238249bc7c8 100644
--- a/intern/audaspace/Python/AUD_PyAPI.cpp
+++ b/intern/audaspace/Python/AUD_PyAPI.cpp
@@ -28,7 +28,7 @@
 
 
 #include "AUD_PyAPI.h"
-#include "structmember.h"
+#include <structmember.h>
 
 #include "AUD_I3DDevice.h"
 #include "AUD_I3DHandle.h"
diff --git a/intern/boolop/intern/BOP_Face2Face.cpp b/intern/boolop/intern/BOP_Face2Face.cpp
index f88a271bfdb..905d23fddff 100644
--- a/intern/boolop/intern/BOP_Face2Face.cpp
+++ b/intern/boolop/intern/BOP_Face2Face.cpp
@@ -534,7 +534,7 @@ void BOP_mergeSort(MT_Point3 *points, unsigned int *face, unsigned int &size, bo
 		invertB = false;
 		if (face[1] == 1) {
 
-			// invertAø?
+			// invertA?
 			for(i=0;i<size;i++) {
 				if (position[i] == 1) {
 					invertA = true;
@@ -543,7 +543,7 @@ void BOP_mergeSort(MT_Point3 *points, unsigned int *face, unsigned int &size, bo
 				else if (position[i] == 0) break;
 			}
 
-			// invertBø?
+			// invertB?
 			if (size == 4) {
 				for(i=0;i<size;i++) {
 					if (position[i] == 3) {
@@ -555,7 +555,7 @@ void BOP_mergeSort(MT_Point3 *points, unsigned int *face, unsigned int &size, bo
 			}
 		}
 		else if (face[1] == 2) {
-			// invertBø?
+			// invertB?
 			for(i=0;i<size;i++) {
 				if (position[i] == 2) {
 					invertB = true;
diff --git a/intern/bsp/intern/BSP_CSGMesh_CFIterator.h b/intern/bsp/intern/BSP_CSGMesh_CFIterator.h
index cadd3df4360..928d04eda20 100644
--- a/intern/bsp/intern/BSP_CSGMesh_CFIterator.h
+++ b/intern/bsp/intern/BSP_CSGMesh_CFIterator.h
@@ -127,10 +127,10 @@ BSP_CSGMeshVertexIt_Construct(
 	
 	BSP_CSGMesh_VertexIt * v_it = new BSP_CSGMesh_VertexIt;
 	v_it->mesh = mesh;
-	if( output->num_elements > 0 )
+	if ( output->num_elements > 0 )
 		v_it->pos = &mesh->VertexSet()[0];
 	output->it = v_it;
-};			
+}
 
 
 /**
diff --git a/intern/container/CTR_UHeap.h b/intern/container/CTR_UHeap.h
index ad3d7d2bb02..8711d4375cb 100644
--- a/intern/container/CTR_UHeap.h
+++ b/intern/container/CTR_UHeap.h
@@ -56,7 +56,7 @@ class CTR_UHeapable {
 public :
 		int &
 	HeapPos(
-	){
+	) {
 		return m_ind;
 	};
 		float &
@@ -93,7 +93,7 @@ protected :
 	};
 
 	~CTR_UHeapable(
-	){
+	) {
 	};
 };
 	
@@ -214,7 +214,7 @@ private:
 		HeapType *base,
 		int i, 
 		int j
-	){
+	) {
 		std::swap(m_vector[i],m_vector[j]);
 		
 		CTR_UHeapable *heap_i = base + m_vector[i];
diff --git a/intern/container/intern/CTR_List.cpp b/intern/container/intern/CTR_List.cpp
index 2fc7b0261ef..c72d3ccf0d8 100644
--- a/intern/container/intern/CTR_List.cpp
+++ b/intern/container/intern/CTR_List.cpp
@@ -33,118 +33,95 @@
 #include "CTR_List.h"
 
 
-CTR_Link::
-CTR_Link(
-) : 
+CTR_Link::CTR_Link() :
 	m_next(0), 
 	m_prev(0) 
 {
 }
 
-CTR_Link::
-CTR_Link(
-	CTR_Link *next,
-	CTR_Link *prev
-) : 
+CTR_Link::CTR_Link(CTR_Link *next, CTR_Link *prev) :
 	m_next(next), 
 	m_prev(prev) 
 {
 }
 
-	CTR_Link *
-CTR_Link::
-getNext(
-) const {
+CTR_Link *
+CTR_Link::getNext() const
+{
 	return m_next; 
 }
 
-	CTR_Link *
-CTR_Link::
-getPrev(
-) const { 
+CTR_Link *
+CTR_Link::getPrev() const
+{
 	return m_prev; 
 }  
 
-	bool 
-CTR_Link::
-isHead(
-) const { 
+bool
+CTR_Link::isHead() const
+{
 	return m_prev == 0; 
 }
 
-	bool 
-CTR_Link::
-isTail(
-) const { 
+bool
+CTR_Link::isTail() const
+{
 	return m_next == 0; 
 }
 
-	void 
-CTR_Link::
-insertBefore(
-	CTR_Link *link
-) {
-    m_next         = link;
-    m_prev         = link->m_prev;
-    m_next->m_prev = this;
-    m_prev->m_next = this;
+void
+CTR_Link::insertBefore(CTR_Link *link)
+{
+	m_next = link;
+	m_prev = link->m_prev;
+	m_next->m_prev = this;
+	m_prev->m_next = this;
 } 
 
-	void 
-CTR_Link::
-insertAfter(
-	CTR_Link *link
-) {
-    m_next         = link->m_next;
-    m_prev         = link;
-    m_next->m_prev = this;
-    m_prev->m_next = this;
+void
+CTR_Link::insertAfter(CTR_Link *link)
+{
+	m_next = link->m_next;
+	m_prev = link;
+	m_next->m_prev = this;
+	m_prev->m_next = this;
 } 
 
-	void 
-CTR_Link::
-remove(
-) { 
-    m_next->m_prev = m_prev; 
-    m_prev->m_next = m_next;
+void
+CTR_Link::remove()
+{
+	m_next->m_prev = m_prev;
+	m_prev->m_next = m_next;
 }
 
 
-CTR_List::
-CTR_List(
-) : 
+CTR_List::CTR_List() :
 	m_head(&m_tail, 0), 
 	m_tail(0, &m_head) 
 {
 }
 
-	CTR_Link *
-CTR_List::
-getHead(
-) const { 
+CTR_Link *
+CTR_List:: getHead() const
+{
 	return m_head.getNext(); 
 }
 
-	CTR_Link *
-CTR_List::
-getTail(
-) const { 
+CTR_Link *
+CTR_List::getTail() const
+{
 	return m_tail.getPrev();
 } 
 
-	void 
-CTR_List::
-addHead(
-	CTR_Link *link
-) { 
+void
+CTR_List::addHead(CTR_Link *link)
+{
 	link->insertAfter(&m_head); 
 }
 
-	void 
-CTR_List::
-addTail(
-	CTR_Link *link
-) { 
+void
+CTR_List::addTail(CTR_Link *link)
+{
 	link->insertBefore(&m_tail); 
 }
 
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index 114ff47663b..2127ad23bd3 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -65,7 +65,7 @@ include_directories(
 if(WITH_CYCLES_BLENDER)
 	add_definitions(-DBLENDER_PLUGIN)
 	add_subdirectory(blender)
-endif(WITH_CYCLES_BLENDER)
+endif()
 
 add_subdirectory(app)
 add_subdirectory(bvh)
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript
index 34c6e8df2fd..03880bddd8a 100644
--- a/intern/cycles/SConscript
+++ b/intern/cycles/SConscript
@@ -46,8 +46,10 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', '
 if env['WITH_BF_RAYOPTIMIZATION']:
     optim_cxxflags = []
 
-    if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
+    if env['OURPLATFORM'] == 'win32-vc':
         optim_cxxflags.append('/arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc'.split())
+    elif env['OURPLATFORM'] == 'win64-vc':
+        optim_cxxflags.append('-D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc'.split())
     else:
         optim_cxxflags.append('-ffast-math -msse -msse2 -msse3 -mfpmath=sse'.split())
     
diff --git a/intern/cycles/app/cycles_test.cpp b/intern/cycles/app/cycles_test.cpp
index 0b8853d7036..f5890998adc 100644
--- a/intern/cycles/app/cycles_test.cpp
+++ b/intern/cycles/app/cycles_test.cpp
@@ -172,8 +172,8 @@ static void display()
 
 static void resize(int width, int height)
 {
-	options.width= width;
-	options.height= height;
+	options.width = width;
+	options.height = height;
 
 	if(options.session)
 		options.session->reset(session_buffer_params(), options.session_params.samples);
@@ -197,8 +197,8 @@ static int files_parse(int argc, const char *argv[])
 
 static void options_parse(int argc, const char **argv)
 {
-	options.width= 0;
-	options.height= 0;
+	options.width = 0;
+	options.height = 0;
 	options.filepath = "";
 	options.session = NULL;
 	options.quiet = false;
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp
index db3592f1227..1190ee185fd 100644
--- a/intern/cycles/app/cycles_xml.cpp
+++ b/intern/cycles/app/cycles_xml.cpp
@@ -392,9 +392,9 @@ static void xml_read_shader_graph(const XMLReadState& state, Shader *shader, pug
 			snode = dist;
 		}
 		else if(string_iequals(node.name(), "wave_texture")) {
-			WaveTextureNode *wood = new WaveTextureNode();
-			xml_read_enum(&wood->type, WaveTextureNode::type_enum, node, "type");
-			snode = wood;
+			WaveTextureNode *wave = new WaveTextureNode();
+			xml_read_enum(&wave->type, WaveTextureNode::type_enum, node, "type");
+			snode = wave;
 		}
 		else if(string_iequals(node.name(), "normal")) {
 			snode = new NormalNode();
@@ -673,7 +673,7 @@ static void xml_read_mesh(const XMLReadState& state, pugi::xml_node node)
 				for(int j = 0; j < nverts[i]-2; j++) {
 					int v0 = verts[index_offset];
 					int v1 = verts[index_offset + j + 1];
-					int v2 = verts[index_offset + j + 2];;
+					int v2 = verts[index_offset + j + 2];
 
 					sdmesh.add_face(v0, v1, v2);
 				}
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
index 003c6c84f8f..a8c7eef89fa 100644
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@ -22,6 +22,7 @@ set(SRC
 	blender_camera.cpp
 	blender_mesh.cpp
 	blender_object.cpp
+	blender_particles.cpp
 	blender_python.cpp
 	blender_session.cpp
 	blender_shader.cpp
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 3ade04c4658..b4673ec6206 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -57,6 +57,12 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
                 default='GPU_COMPATIBLE',
                 )
 
+        cls.progressive = BoolProperty(
+                name="Progressive",
+                description="Use progressive sampling of lighting",
+                default=True,
+                )
+
         cls.samples = IntProperty(
                 name="Samples",
                 description="Number of samples to render for each pixel",
@@ -80,6 +86,49 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
                 default=False,
                 )
 
+        cls.aa_samples = IntProperty(
+                name="AA Samples",
+                description="Number of antialiasing samples to render for each pixel",
+                min=1, max=10000,
+                default=4,
+                )
+        cls.preview_aa_samples = IntProperty(
+                name="AA Samples",
+                description="Number of antialiasing samples to render in the viewport, unlimited if 0",
+                min=0, max=10000,
+                default=4,
+                )
+        cls.diffuse_samples = IntProperty(
+                name="Diffuse Samples",
+                description="Number of diffuse bounce samples to render for each AA sample",
+                min=1, max=10000,
+                default=1,
+                )
+        cls.glossy_samples = IntProperty(
+                name="Glossy Samples",
+                description="Number of glossy bounce samples to render for each AA sample",
+                min=1, max=10000,
+                default=1,
+                )
+        cls.transmission_samples = IntProperty(
+                name="Transmission Samples",
+                description="Number of transmission bounce samples to render for each AA sample",
+                min=1, max=10000,
+                default=1,
+                )
+        cls.ao_samples = IntProperty(
+                name="Ambient Occlusion Samples",
+                description="Number of ambient occlusion samples to render for each AA sample",
+                min=1, max=10000,
+                default=1,
+                )
+        cls.mesh_light_samples = IntProperty(
+                name="Mesh Light Samples",
+                description="Number of mesh emission light samples to render for each AA sample",
+                min=1, max=10000,
+                default=1,
+                )
+
         cls.no_caustics = BoolProperty(
                 name="No Caustics",
                 description="Leave out caustics, resulting in a darker image with less noise",
@@ -340,6 +389,12 @@ class CyclesLampSettings(bpy.types.PropertyGroup):
                 description="Lamp casts shadows",
                 default=True,
                 )
+        cls.samples = IntProperty(
+                name="Samples",
+                description="Number of light samples to render for each AA sample",
+                min=1, max=10000,
+                default=1,
+                )
 
     @classmethod
     def unregister(cls):
@@ -365,6 +420,12 @@ class CyclesWorldSettings(bpy.types.PropertyGroup):
                 min=4, max=8096,
                 default=256,
                 )
+        cls.samples = IntProperty(
+                name="Samples",
+                description="Number of light samples to render for each AA sample",
+                min=1, max=10000,
+                default=4,
+                )
 
     @classmethod
     def unregister(cls):
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 8480b0a5256..bda8249c17e 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -44,8 +44,49 @@ class CyclesButtonsPanel():
         return rd.engine == 'CYCLES'
 
 
-class CyclesRender_PT_integrator(CyclesButtonsPanel, Panel):
-    bl_label = "Integrator"
+class CyclesRender_PT_sampling(CyclesButtonsPanel, Panel):
+    bl_label = "Sampling"
+    bl_options = {'DEFAULT_CLOSED'}
+
+    def draw(self, context):
+        layout = self.layout
+
+        scene = context.scene
+        cscene = scene.cycles
+
+        split = layout.split()
+
+        col = split.column()
+        sub = col.column()
+        sub.active = cscene.device == 'CPU'
+        sub.prop(cscene, "progressive")
+
+        sub = col.column(align=True)
+        sub.prop(cscene, "seed")
+        sub.prop(cscene, "sample_clamp")
+
+        if cscene.progressive or cscene.device != 'CPU':
+            col = split.column()
+            col.label(text="Samples:")
+            sub = col.column(align=True)
+            sub.prop(cscene, "samples", text="Render")
+            sub.prop(cscene, "preview_samples", text="Preview")
+        else:
+            sub.label(text="AA Samples:")
+            sub.prop(cscene, "aa_samples", text="Render")
+            sub.prop(cscene, "preview_aa_samples", text="Preview")
+
+            col = split.column()
+            col.label(text="Samples:")
+            sub = col.column(align=True)
+            sub.prop(cscene, "diffuse_samples", text="Diffuse")
+            sub.prop(cscene, "glossy_samples", text="Glossy")
+            sub.prop(cscene, "transmission_samples", text="Transmission")
+            sub.prop(cscene, "ao_samples", text="AO")
+            sub.prop(cscene, "mesh_light_samples", text="Mesh Light")
+
+class CyclesRender_PT_light_paths(CyclesButtonsPanel, Panel):
+    bl_label = "Light Paths"
     bl_options = {'DEFAULT_CLOSED'}
 
     def draw(self, context):
@@ -62,12 +103,6 @@ class CyclesRender_PT_integrator(CyclesButtonsPanel, Panel):
         split = layout.split()
 
         col = split.column()
-        sub = col.column(align=True)
-        sub.label(text="Samples:")
-        sub.prop(cscene, "samples", text="Render")
-        sub.prop(cscene, "preview_samples", text="Preview")
-        sub.prop(cscene, "seed")
-        sub.prop(cscene, "sample_clamp")
 
         sub = col.column(align=True)
         sub.label("Transparency:")
@@ -75,6 +110,11 @@ class CyclesRender_PT_integrator(CyclesButtonsPanel, Panel):
         sub.prop(cscene, "transparent_min_bounces", text="Min")
         sub.prop(cscene, "use_transparent_shadows", text="Shadows")
 
+        col.separator()
+
+        col.prop(cscene, "no_caustics")
+        col.prop(cscene, "blur_glossy")
+
         col = split.column()
 
         sub = col.column(align=True)
@@ -83,16 +123,10 @@ class CyclesRender_PT_integrator(CyclesButtonsPanel, Panel):
         sub.prop(cscene, "min_bounces", text="Min")
 
         sub = col.column(align=True)
-        sub.label(text="Light Paths:")
         sub.prop(cscene, "diffuse_bounces", text="Diffuse")
         sub.prop(cscene, "glossy_bounces", text="Glossy")
         sub.prop(cscene, "transmission_bounces", text="Transmission")
 
-        col.separator()
-
-        col.prop(cscene, "no_caustics")
-        col.prop(cscene, "blur_glossy")
-
 
 class CyclesRender_PT_motion_blur(CyclesButtonsPanel, Panel):
     bl_label = "Motion Blur"
@@ -467,6 +501,7 @@ class CyclesLamp_PT_lamp(CyclesButtonsPanel, Panel):
 
         lamp = context.lamp
         clamp = lamp.cycles
+        cscene = context.scene.cycles
 
         layout.prop(lamp, "type", expand=True)
 
@@ -485,12 +520,13 @@ class CyclesLamp_PT_lamp(CyclesButtonsPanel, Panel):
                 sub.prop(lamp, "size", text="Size X")
                 sub.prop(lamp, "size_y", text="Size Y")
 
+        if not cscene.progressive and cscene.device == 'CPU':
+            col.prop(clamp, "samples")
+
         col = split.column()
         col.prop(clamp, "cast_shadow")
 
-        if lamp.type == 'SPOT':
-            layout.label(text="Not supported, interpreted as point lamp.")
-        elif lamp.type == 'HEMI':
+        if lamp.type == 'HEMI':
             layout.label(text="Not supported, interpreted as sun lamp.")
 
 
@@ -509,6 +545,29 @@ class CyclesLamp_PT_nodes(CyclesButtonsPanel, Panel):
         if not panel_node_draw(layout, lamp, 'OUTPUT_LAMP', 'Surface'):
             layout.prop(lamp, "color")
 
+class CyclesLamp_PT_spot(CyclesButtonsPanel, Panel):
+    bl_label = "Spot Shape"
+    bl_context = "data"
+
+    @classmethod
+    def poll(cls, context):
+        lamp = context.lamp
+        return (lamp and lamp.type == 'SPOT') and CyclesButtonsPanel.poll(context)
+
+    def draw(self, context):
+        layout = self.layout
+
+        lamp = context.lamp
+
+        split = layout.split()
+
+        col = split.column()
+        sub = col.column()
+        sub.prop(lamp, "spot_size", text="Size")
+        sub.prop(lamp, "spot_blend", text="Blend", slider=True)
+
+        col = split.column()
+        col.prop(lamp, "show_cone")
 
 class CyclesWorld_PT_surface(CyclesButtonsPanel, Panel):
     bl_label = "Surface"
@@ -583,13 +642,16 @@ class CyclesWorld_PT_settings(CyclesButtonsPanel, Panel):
 
         world = context.world
         cworld = world.cycles
+        cscene = context.scene.cycles
 
         col = layout.column()
 
         col.prop(cworld, "sample_as_light")
-        row = col.row()
-        row.active = cworld.sample_as_light
-        row.prop(cworld, "sample_map_resolution")
+        sub = col.row(align=True)
+        sub.active = cworld.sample_as_light
+        sub.prop(cworld, "sample_map_resolution")
+        if not cscene.progressive and cscene.device == 'CPU':
+            sub.prop(cworld, "samples")
 
 
 class CyclesMaterial_PT_surface(CyclesButtonsPanel, Panel):
diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp
index bdd02bb5086..46d5fefd4dc 100644
--- a/intern/cycles/blender/blender_camera.cpp
+++ b/intern/cycles/blender/blender_camera.cpp
@@ -56,6 +56,11 @@ struct BlenderCamera {
 	float sensor_width;
 	float sensor_height;
 
+	float border_left;
+	float border_right;
+	float border_bottom;
+	float border_top;
+
 	Transform matrix;
 };
 
@@ -70,6 +75,8 @@ static void blender_camera_init(BlenderCamera *bcam)
 	bcam->sensor_height = 18.0f;
 	bcam->sensor_fit = BlenderCamera::AUTO;
 	bcam->shuttertime = 1.0f;
+	bcam->border_right = 1.0f;
+	bcam->border_top = 1.0f;
 }
 
 static float blender_camera_focal_distance(BL::Object b_ob, BL::Camera b_camera)
@@ -134,7 +141,7 @@ static void blender_camera_from_object(BlenderCamera *bcam, BL::Object b_ob)
 		bcam->lens = b_camera.lens();
 
 		/* allow f/stop number to change aperture_size but still
-		   give manual control over aperture radius */
+		 * give manual control over aperture radius */
 		int aperture_type = RNA_enum_get(&ccamera, "aperture_type");
 
 		if(aperture_type == 1) {
@@ -172,8 +179,8 @@ static Transform blender_camera_matrix(const Transform& tfm, CameraType type)
 
 	if(type == CAMERA_PANORAMA) {
 		/* make it so environment camera needs to be pointed in the direction
-		   of the positive x-axis to match an environment texture, this way
-		   it is looking at the center of the texture */
+		 * of the positive x-axis to match an environment texture, this way
+		 * it is looking at the center of the texture */
 		result = tfm *
 			make_transform( 0.0f, -1.0f, 0.0f, 0.0f,
 			                0.0f,  0.0f, 1.0f, 0.0f,
@@ -188,85 +195,94 @@ static Transform blender_camera_matrix(const Transform& tfm, CameraType type)
 	return transform_clear_scale(result);
 }
 
-static void blender_camera_sync(Camera *cam, BlenderCamera *bcam, int width, int height)
+static void blender_camera_viewplane(BlenderCamera *bcam, int width, int height,
+	float *left, float *right, float *bottom, float *top, float *aspectratio, float *sensor_size)
 {
-	/* copy camera to compare later */
-	Camera prevcam = *cam;
-
 	/* dimensions */
 	float xratio = width*bcam->pixelaspect.x;
 	float yratio = height*bcam->pixelaspect.y;
 
 	/* compute x/y aspect and ratio */
-	float aspectratio, xaspect, yaspect;
+	float xaspect, yaspect;
 
 	/* sensor fitting */
 	bool horizontal_fit;
-	float sensor_size;
-
-	cam->sensorwidth = bcam->sensor_width;
-	cam->sensorheight = bcam->sensor_height;
 
 	if(bcam->sensor_fit == BlenderCamera::AUTO) {
 		horizontal_fit = (xratio > yratio);
-		sensor_size = bcam->sensor_width;
+		*sensor_size = bcam->sensor_width;
 	}
 	else if(bcam->sensor_fit == BlenderCamera::HORIZONTAL) {
 		horizontal_fit = true;
-		sensor_size = bcam->sensor_width;
+		*sensor_size = bcam->sensor_width;
 	}
 	else {
 		horizontal_fit = false;
-		sensor_size = bcam->sensor_height;
+		*sensor_size = bcam->sensor_height;
 	}
 
 	if(horizontal_fit) {
-		aspectratio= xratio/yratio;
-		xaspect= aspectratio;
-		yaspect= 1.0f;
+		*aspectratio = xratio/yratio;
+		xaspect = *aspectratio;
+		yaspect = 1.0f;
 	}
 	else {
-		aspectratio= yratio/xratio;
-		xaspect= 1.0f;
-		yaspect= aspectratio;
+		*aspectratio = yratio/xratio;
+		xaspect = 1.0f;
+		yaspect = *aspectratio;
 	}
 
 	/* modify aspect for orthographic scale */
 	if(bcam->type == CAMERA_ORTHOGRAPHIC) {
-		xaspect = xaspect*bcam->ortho_scale/(aspectratio*2.0f);
-		yaspect = yaspect*bcam->ortho_scale/(aspectratio*2.0f);
-		aspectratio = bcam->ortho_scale/2.0f;
+		xaspect = xaspect*bcam->ortho_scale/(*aspectratio*2.0f);
+		yaspect = yaspect*bcam->ortho_scale/(*aspectratio*2.0f);
+		*aspectratio = bcam->ortho_scale/2.0f;
 	}
 
 	if(bcam->type == CAMERA_PANORAMA) {
 		/* set viewplane */
-		cam->left = 0.0f;
-		cam->right = 1.0f;
-		cam->bottom = 0.0f;
-		cam->top = 1.0f;
+		*left = 0.0f;
+		*right = 1.0f;
+		*bottom = 0.0f;
+		*top = 1.0f;
 	}
 	else {
 		/* set viewplane */
-		cam->left = -xaspect;
-		cam->right = xaspect;
-		cam->bottom = -yaspect;
-		cam->top = yaspect;
+		*left = -xaspect;
+		*right = xaspect;
+		*bottom = -yaspect;
+		*top = yaspect;
 
 		/* zoom for 3d camera view */
-		cam->left *= bcam->zoom;
-		cam->right *= bcam->zoom;
-		cam->bottom *= bcam->zoom;
-		cam->top *= bcam->zoom;
+		*left *= bcam->zoom;
+		*right *= bcam->zoom;
+		*bottom *= bcam->zoom;
+		*top *= bcam->zoom;
 
 		/* modify viewplane with camera shift and 3d camera view offset */
-		float dx = 2.0f*(aspectratio*bcam->shift.x + bcam->offset.x*xaspect*2.0f);
-		float dy = 2.0f*(aspectratio*bcam->shift.y + bcam->offset.y*yaspect*2.0f);
+		float dx = 2.0f*(*aspectratio*bcam->shift.x + bcam->offset.x*xaspect*2.0f);
+		float dy = 2.0f*(*aspectratio*bcam->shift.y + bcam->offset.y*yaspect*2.0f);
 
-		cam->left += dx;
-		cam->right += dx;
-		cam->bottom += dy;
-		cam->top += dy;
+		*left += dx;
+		*right += dx;
+		*bottom += dy;
+		*top += dy;
 	}
+}
+
+static void blender_camera_sync(Camera *cam, BlenderCamera *bcam, int width, int height)
+{
+	/* copy camera to compare later */
+	Camera prevcam = *cam;
+	float aspectratio, sensor_size;
+
+	/* viewplane */
+	blender_camera_viewplane(bcam, width, height,
+		&cam->left, &cam->right, &cam->bottom, &cam->top, &aspectratio, &sensor_size);
+
+	/* sensor */
+	cam->sensorwidth = bcam->sensor_width;
+	cam->sensorheight = bcam->sensor_height;
 
 	/* clipping distances */
 	cam->nearclip = bcam->nearclip;
@@ -281,7 +297,7 @@ static void blender_camera_sync(Camera *cam, BlenderCamera *bcam, int width, int
 	cam->fisheye_lens = bcam->fisheye_lens;
 
 	/* perspective */
-	cam->fov = 2.0f*atan((0.5f*sensor_size)/bcam->lens/aspectratio);
+	cam->fov = 2.0f * atanf((0.5f * sensor_size) / bcam->lens / aspectratio);
 	cam->focaldistance = bcam->focaldistance;
 	cam->aperturesize = bcam->aperturesize;
 	cam->blades = bcam->apertureblades;
@@ -294,6 +310,12 @@ static void blender_camera_sync(Camera *cam, BlenderCamera *bcam, int width, int
 	cam->use_motion = false;
 	cam->shuttertime = bcam->shuttertime;
 
+	/* border */
+	cam->border_left = bcam->border_left;
+	cam->border_right = bcam->border_right;
+	cam->border_bottom = bcam->border_bottom;
+	cam->border_top = bcam->border_top;
+
 	/* set update flag */
 	if(cam->modified(prevcam))
 		cam->tag_update();
@@ -313,6 +335,14 @@ void BlenderSync::sync_camera(BL::Object b_override, int width, int height)
 	bcam.pixelaspect.y = r.pixel_aspect_y();
 	bcam.shuttertime = r.motion_blur_shutter();
 
+	/* border */
+	if(r.use_border()) {
+		bcam.border_left = r.border_min_x();
+		bcam.border_right = r.border_max_x();
+		bcam.border_bottom = r.border_min_y();
+		bcam.border_top = r.border_max_y();
+	}
+
 	/* camera object */
 	BL::Object b_ob = b_scene.camera();
 
@@ -348,67 +378,146 @@ void BlenderSync::sync_camera_motion(BL::Object b_ob, int motion)
 
 /* Sync 3D View Camera */
 
-void BlenderSync::sync_view(BL::SpaceView3D b_v3d, BL::RegionView3D b_rv3d, int width, int height)
+static void blender_camera_from_view(BlenderCamera *bcam, BL::Scene b_scene, BL::SpaceView3D b_v3d, BL::RegionView3D b_rv3d, int width, int height)
 {
-	BlenderCamera bcam;
-	blender_camera_init(&bcam);
-
 	/* 3d view parameters */
-	bcam.nearclip = b_v3d.clip_start();
-	bcam.farclip = b_v3d.clip_end();
-	bcam.lens = b_v3d.lens();
-	bcam.shuttertime = b_scene.render().motion_blur_shutter();
+	bcam->nearclip = b_v3d.clip_start();
+	bcam->farclip = b_v3d.clip_end();
+	bcam->lens = b_v3d.lens();
+	bcam->shuttertime = b_scene.render().motion_blur_shutter();
 
 	if(b_rv3d.view_perspective() == BL::RegionView3D::view_perspective_CAMERA) {
 		/* camera view */
 		BL::Object b_ob = (b_v3d.lock_camera_and_layers())? b_scene.camera(): b_v3d.camera();
 
 		if(b_ob) {
-			blender_camera_from_object(&bcam, b_ob);
+			blender_camera_from_object(bcam, b_ob);
 
 			/* magic zoom formula */
-			bcam.zoom = (float)b_rv3d.view_camera_zoom();
-			bcam.zoom = (1.41421f + bcam.zoom/50.0f);
-			bcam.zoom *= bcam.zoom;
-			bcam.zoom = 2.0f/bcam.zoom;
+			bcam->zoom = (float)b_rv3d.view_camera_zoom();
+			bcam->zoom = (1.41421f + bcam->zoom/50.0f);
+			bcam->zoom *= bcam->zoom;
+			bcam->zoom = 2.0f/bcam->zoom;
 
 			/* offset */
-			bcam.offset = get_float2(b_rv3d.view_camera_offset());
+			bcam->offset = get_float2(b_rv3d.view_camera_offset());
 		}
 	}
 	else if(b_rv3d.view_perspective() == BL::RegionView3D::view_perspective_ORTHO) {
 		/* orthographic view */
-		bcam.farclip *= 0.5;
-		bcam.nearclip = -bcam.farclip;
+		bcam->farclip *= 0.5f;
+		bcam->nearclip = -bcam->farclip;
 
-		bcam.type = CAMERA_ORTHOGRAPHIC;
-		bcam.ortho_scale = b_rv3d.view_distance();
+		bcam->type = CAMERA_ORTHOGRAPHIC;
+		bcam->ortho_scale = b_rv3d.view_distance();
 	}
 
-	bcam.zoom *= 2.0f;
+	bcam->zoom *= 2.0f;
 
 	/* 3d view transform */
-	bcam.matrix = transform_inverse(get_transform(b_rv3d.view_matrix()));
+	bcam->matrix = transform_inverse(get_transform(b_rv3d.view_matrix()));
+}
+
+static void blender_camera_border(BlenderCamera *bcam, BL::Scene b_scene, BL::SpaceView3D b_v3d,
+	BL::RegionView3D b_rv3d, int width, int height)
+{
+	BL::RenderSettings r = b_scene.render();
+
+	if(!r.use_border())
+		return;
+
+	/* camera view? */
+	if(!(b_rv3d && b_rv3d.view_perspective() == BL::RegionView3D::view_perspective_CAMERA))
+		return;
+
+	BL::Object b_ob = (b_v3d.lock_camera_and_layers())? b_scene.camera(): b_v3d.camera();
+
+	if(!b_ob)
+		return;
+
+	bcam->border_left = r.border_min_x();
+	bcam->border_right = r.border_max_x();
+	bcam->border_bottom = r.border_min_y();
+	bcam->border_top = r.border_max_y();
+
+	float cam_left, cam_right, cam_bottom, cam_top;
+	float view_left, view_right, view_bottom, view_top;
+	float view_aspect, cam_aspect, sensor_size;
+
+	/* get viewport viewplane */
+	BlenderCamera view_bcam;
+	blender_camera_init(&view_bcam);
+	blender_camera_from_view(&view_bcam, b_scene, b_v3d, b_rv3d, width, height);
+
+	blender_camera_viewplane(&view_bcam, width, height,
+		&view_left, &view_right, &view_bottom, &view_top, &view_aspect, &sensor_size);
+
+	view_left /= view_aspect;
+	view_right /= view_aspect;
+	view_bottom /= view_aspect;
+	view_top /= view_aspect;
+
+	/* get camera viewplane */
+	BlenderCamera cam_bcam;
+	blender_camera_init(&cam_bcam);
+	blender_camera_from_object(&cam_bcam, b_ob);
+
+	width = (int)(r.resolution_x()*r.resolution_percentage()/100);
+	height = (int)(r.resolution_y()*r.resolution_percentage()/100);
+
+	blender_camera_viewplane(&cam_bcam, width, height,
+		&cam_left, &cam_right, &cam_bottom, &cam_top, &cam_aspect, &sensor_size);
+
+	cam_left /= cam_aspect;
+	cam_right /= cam_aspect;
+	cam_bottom /= cam_aspect;
+	cam_top /= cam_aspect;
+
+	/* determine viewport subset matching camera border */
+	float tmp_left = ((cam_left - view_left) / (view_right - view_left));
+	float tmp_right = ((cam_right - view_left) / (view_right - view_left));
+	float tmp_bottom = ((cam_bottom - view_bottom) / (view_top - view_bottom));
+	float tmp_top = ((cam_top - view_bottom) / (view_top - view_bottom));
+
+	bcam->border_left = tmp_left + bcam->border_left*(tmp_right - tmp_left);
+	bcam->border_right = tmp_left + bcam->border_right*(tmp_right - tmp_left);
+	bcam->border_bottom = tmp_bottom + bcam->border_bottom*(tmp_top - tmp_bottom);
+	bcam->border_top = tmp_bottom + bcam->border_top*(tmp_top - tmp_bottom);
+
+	/* clamp */
+	bcam->border_left = clamp(bcam->border_left, 0.0f, 1.0f);
+	bcam->border_right = clamp(bcam->border_right, 0.0f, 1.0f);
+	bcam->border_bottom = clamp(bcam->border_bottom, 0.0f, 1.0f);
+	bcam->border_top = clamp(bcam->border_top, 0.0f, 1.0f);
+}
+
+void BlenderSync::sync_view(BL::SpaceView3D b_v3d, BL::RegionView3D b_rv3d, int width, int height)
+{
+	BlenderCamera bcam;
+	blender_camera_init(&bcam);
+	blender_camera_from_view(&bcam, b_scene, b_v3d, b_rv3d, width, height);
+	blender_camera_border(&bcam, b_scene, b_v3d, b_rv3d, width, height);
 
-	/* sync */
 	blender_camera_sync(scene->camera, &bcam, width, height);
 }
 
-BufferParams BlenderSync::get_buffer_params(BL::Scene b_scene, BL::RegionView3D b_rv3d, int width, int height)
+BufferParams BlenderSync::get_buffer_params(BL::Scene b_scene, Camera *cam, int width, int height)
 {
 	BufferParams params;
 
 	params.full_width = width;
 	params.full_height = height;
 
-	/* border render */
-	BL::RenderSettings r = b_scene.render();
+	if(b_scene.render().use_border()) {
+		/* border render */
+		params.full_x = cam->border_left*width;
+		params.full_y = cam->border_bottom*height;
+		params.width = (int)(cam->border_right*width) - params.full_x;
+		params.height = (int)(cam->border_top*height) - params.full_y;
 
-	if(!b_rv3d && r.use_border()) {
-		params.full_x = r.border_min_x()*width;
-		params.full_y = r.border_min_y()*height;
-		params.width = (int)(r.border_max_x()*width) - params.full_x;
-		params.height = (int)(r.border_max_y()*height) - params.full_y;
+		/* survive in case border goes out of view or becomes too small */
+		params.width = max(params.width, 1);
+		params.height = max(params.height, 1);
 	}
 	else {
 		params.width = width;
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index d7003729c46..16e4ceded89 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -46,7 +46,7 @@ static void create_mesh(Scene *scene, Mesh *mesh, BL::Mesh b_mesh, const vector<
 	float3 *N = attr_N->data_float3();
 
 	for(b_mesh.vertices.begin(v); v != b_mesh.vertices.end(); ++v, ++N)
-		*N= get_float3(v->normal());
+		*N = get_float3(v->normal());
 
 	/* create faces */
 	BL::Mesh::tessfaces_iterator f;
@@ -68,8 +68,8 @@ static void create_mesh(Scene *scene, Mesh *mesh, BL::Mesh b_mesh, const vector<
 	}
 
 	/* create generated coordinates. todo: we should actually get the orco
-	   coordinates from modifiers, for now we use texspace loc/size which
-	   is available in the api. */
+	 * coordinates from modifiers, for now we use texspace loc/size which
+	 * is available in the api. */
 	if(mesh->need_attribute(scene, ATTR_STD_GENERATED)) {
 		Attribute *attr = mesh->attributes.add(ATTR_STD_GENERATED);
 		float3 loc = get_float3(b_mesh.texspace_location());
@@ -82,7 +82,6 @@ static void create_mesh(Scene *scene, Mesh *mesh, BL::Mesh b_mesh, const vector<
 		loc = loc*size - make_float3(0.5f, 0.5f, 0.5f);
 
 		float3 *fdata = attr->data_float3();
-		BL::Mesh::vertices_iterator v;
 		size_t i = 0;
 
 		for(b_mesh.vertices.begin(v); v != b_mesh.vertices.end(); ++v)
@@ -176,13 +175,15 @@ static void create_subd_mesh(Mesh *mesh, BL::Mesh b_mesh, PointerRNA *cmesh, con
 
 	for(b_mesh.tessfaces.begin(f); f != b_mesh.tessfaces.end(); ++f) {
 		int4 vi = get_int4(f->vertices_raw());
-		int n= (vi[3] == 0)? 3: 4;
+		int n = (vi[3] == 0) ? 3: 4;
 		//int shader = used_shaders[f->material_index()];
 
 		if(n == 4)
 			sdmesh.add_face(vi[0], vi[1], vi[2], vi[3]);
-		/*else
-			sdmesh.add_face(vi[0], vi[1], vi[2]);*/
+#if 0
+		else
+			sdmesh.add_face(vi[0], vi[1], vi[2]);
+#endif
 	}
 
 	/* finalize subd mesh */
@@ -210,8 +211,6 @@ Mesh *BlenderSync::sync_mesh(BL::Object b_ob, bool object_updated)
 
 	BL::Object::material_slots_iterator slot;
 	for(b_ob.material_slots.begin(slot); slot != b_ob.material_slots.end(); ++slot) {
-		BL::Material material_override = render_layer.material_override;
-
 		if(material_override)
 			find_shader(material_override, used_shaders, scene->default_surface);
 		else
@@ -232,7 +231,7 @@ Mesh *BlenderSync::sync_mesh(BL::Object b_ob, bool object_updated)
 		/* if transform was applied to mesh, need full update */
 		if(object_updated && mesh->transform_applied);
 		/* test if shaders changed, these can be object level so mesh
-		   does not get tagged for recalc */
+		 * does not get tagged for recalc */
 		else if(mesh->used_shaders != used_shaders);
 		else {
 			/* even if not tagged for recalc, we may need to sync anyway
@@ -304,7 +303,6 @@ Mesh *BlenderSync::sync_mesh(BL::Object b_ob, bool object_updated)
 void BlenderSync::sync_mesh_motion(BL::Object b_ob, Mesh *mesh, int motion)
 {
 	/* todo: displacement, subdivision */
-	BL::ID b_ob_data = b_ob.data();
 	size_t size = mesh->verts.size();
 
 	/* skip objects without deforming modifiers. this is not a totally reliable,
@@ -320,7 +318,7 @@ void BlenderSync::sync_mesh_motion(BL::Object b_ob, Mesh *mesh, int motion)
 		AttributeStandard std = (motion == -1)? ATTR_STD_MOTION_PRE: ATTR_STD_MOTION_POST;
 		Attribute *attr_M = mesh->attributes.add(std);
 		float3 *M = attr_M->data_float3();
-		size_t i = 0, size = mesh->verts.size();
+		size_t i = 0;
 
 		for(b_mesh.vertices.begin(v); v != b_mesh.vertices.end() && i < size; ++v, M++, i++)
 			*M = get_float3(v->co());
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp
index 14d4c2f3ddf..d5b884cfccd 100644
--- a/intern/cycles/blender/blender_object.cpp
+++ b/intern/cycles/blender/blender_object.cpp
@@ -29,6 +29,7 @@
 #include "blender_util.h"
 
 #include "util_foreach.h"
+#include "util_hash.h"
 
 CCL_NAMESPACE_BEGIN
 
@@ -105,7 +106,9 @@ void BlenderSync::sync_light(BL::Object b_parent, int b_index, BL::Object b_ob,
 		case BL::Lamp::type_SPOT: {
 			BL::SpotLamp b_spot_lamp(b_lamp);
 			light->size = b_spot_lamp.shadow_soft_size();
-			light->type = LIGHT_POINT;
+			light->type = LIGHT_SPOT;
+			light->spot_angle = b_spot_lamp.spot_size();
+			light->spot_smooth = b_spot_lamp.spot_blend();
 			break;
 		}
 		case BL::Lamp::type_HEMI: {
@@ -151,6 +154,7 @@ void BlenderSync::sync_light(BL::Object b_parent, int b_index, BL::Object b_ob,
 	/* shadow */
 	PointerRNA clamp = RNA_pointer_get(&b_lamp.ptr, "cycles");
 	light->cast_shadow = get_boolean(clamp, "cast_shadow");
+	light->samples = get_int(clamp, "samples");
 
 	/* tag */
 	light->tag_update(scene);
@@ -175,6 +179,7 @@ void BlenderSync::sync_background_light()
 			{
 				light->type = LIGHT_BACKGROUND;
 				light->map_resolution  = get_int(cworld, "sample_map_resolution");
+				light->samples  = get_int(cworld, "samples");
 				light->shader = scene->default_background;
 
 				light->tag_update(scene);
@@ -189,7 +194,7 @@ void BlenderSync::sync_background_light()
 
 /* Object */
 
-void BlenderSync::sync_object(BL::Object b_parent, int b_index, BL::Object b_ob, Transform& tfm, uint layer_flag, int motion)
+void BlenderSync::sync_object(BL::Object b_parent, int b_index, BL::Object b_ob, Transform& tfm, uint layer_flag, int motion, int particle_id)
 {
 	/* light is handled separately */
 	if(object_is_light(b_ob)) {
@@ -245,25 +250,34 @@ void BlenderSync::sync_object(BL::Object b_parent, int b_index, BL::Object b_ob,
 	/* object sync */
 	if(object_updated || (object->mesh && object->mesh->need_update)) {
 		object->name = b_ob.name().c_str();
-		object->instance_id = b_index;
 		object->pass_id = b_ob.pass_index();
 		object->tfm = tfm;
 		object->motion.pre = tfm;
 		object->motion.post = tfm;
 		object->use_motion = false;
 
+		object->random_id = hash_int_2d(hash_string(object->name.c_str()), b_index);
+
 		/* visibility flags for both parent */
 		object->visibility = object_ray_visibility(b_ob) & PATH_RAY_ALL;
-		if(b_parent.ptr.data != b_ob.ptr.data)
+		if(b_parent.ptr.data != b_ob.ptr.data) {
 			object->visibility &= object_ray_visibility(b_parent);
+			object->random_id ^= hash_int(hash_string(b_parent.name().c_str()));
+		}
 
 		/* camera flag is not actually used, instead is tested
-		   against render layer flags */
+		 * against render layer flags */
 		if(object->visibility & PATH_RAY_CAMERA) {
 			object->visibility |= layer_flag << PATH_RAY_LAYER_SHIFT;
 			object->visibility &= ~PATH_RAY_CAMERA;
 		}
 
+		object->particle_id = particle_id;
+
+		/* particle sync */
+		if (object_use_particles(b_ob))
+			sync_particles(object, b_ob);
+	
 		object->tag_update(scene);
 	}
 }
@@ -286,14 +300,21 @@ void BlenderSync::sync_objects(BL::SpaceView3D b_v3d, int motion)
 	/* object loop */
 	BL::Scene::objects_iterator b_ob;
 	BL::Scene b_sce = b_scene;
+	int particle_offset = 0;
 
 	for(; b_sce; b_sce = b_sce.background_set()) {
 		for(b_sce.objects.begin(b_ob); b_ob != b_sce.objects.end(); ++b_ob) {
 			bool hide = (render_layer.use_viewport_visibility)? b_ob->hide(): b_ob->hide_render();
 			uint ob_layer = get_layer(b_ob->layers());
+			hide = hide || !(ob_layer & scene_layer);
+
+			if(!hide) {
+
+				int num_particles = object_count_particles(*b_ob);
 
-			if(!hide && (ob_layer & scene_layer)) {
 				if(b_ob->is_duplicator()) {
+					hide = true;	/* duplicators hidden by default */
+
 					/* dupli objects */
 					object_create_duplilist(*b_ob, b_scene);
 
@@ -305,35 +326,29 @@ void BlenderSync::sync_objects(BL::SpaceView3D b_v3d, int motion)
 						BL::Object b_dup_ob = b_dup->object();
 						bool dup_hide = (b_v3d)? b_dup_ob.hide(): b_dup_ob.hide_render();
 
-						if(!(b_dup->hide() || dup_hide))
-							sync_object(*b_ob, b_index, b_dup_ob, tfm, ob_layer, motion);
-
-						b_index++;
+						if(!(b_dup->hide() || dup_hide)) {
+							sync_object(*b_ob, b_index, b_dup_ob, tfm, ob_layer, motion, b_dup->particle_index() + particle_offset);
+						}
+						
+						++b_index;
 					}
 
 					object_free_duplilist(*b_ob);
-
-					hide = true;
 				}
 
 				/* check if we should render or hide particle emitter */
 				BL::Object::particle_systems_iterator b_psys;
-				bool render_emitter = false;
-
-				for(b_ob->particle_systems.begin(b_psys); b_psys != b_ob->particle_systems.end(); ++b_psys) {
-					if(b_psys->settings().use_render_emitter()) {
+				for(b_ob->particle_systems.begin(b_psys); b_psys != b_ob->particle_systems.end(); ++b_psys)
+					if(b_psys->settings().use_render_emitter())
 						hide = false;
-						render_emitter = true;
-					}
-					else if(!render_emitter)
-						hide = true;
-				}
 
 				if(!hide) {
 					/* object itself */
 					Transform tfm = get_transform(b_ob->matrix_world());
-					sync_object(*b_ob, 0, *b_ob, tfm, ob_layer, motion);
+					sync_object(*b_ob, 0, *b_ob, tfm, ob_layer, motion, 0);
 				}
+
+				particle_offset += num_particles;
 			}
 		}
 	}
diff --git a/intern/cycles/blender/blender_particles.cpp b/intern/cycles/blender/blender_particles.cpp
new file mode 100644
index 00000000000..f591aaa6d83
--- /dev/null
+++ b/intern/cycles/blender/blender_particles.cpp
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2011, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "object.h"
+
+#include "mesh.h"
+#include "blender_sync.h"
+#include "blender_util.h"
+
+#include "util_foreach.h"
+
+CCL_NAMESPACE_BEGIN
+
+/* Utilities */
+
+
+/* Particles Sync */
+
+bool BlenderSync::object_use_particles(BL::Object b_ob)
+{
+	/* Particle data is only needed for
+	 * a) Billboard render mode if object's own material uses particle info
+	 * b) object/group render mode if any dupli object's material uses particle info
+	 *
+	 * Note: Meshes have to be synced at this point!
+	 */
+	bool use_particles = false;
+	
+	BL::Object::particle_systems_iterator b_psys;
+	for (b_ob.particle_systems.begin(b_psys); b_psys != b_ob.particle_systems.end(); ++b_psys) {
+		switch (b_psys->settings().render_type()) {
+		/* XXX not implemented yet! 
+		 * billboards/strands would become part of the mesh data (?),
+		 * so the mesh attributes would store whether particle info is required.
+		 */
+		#if 0
+		case BL::ParticleSettings::render_type_BILLBOARD:
+		case BL::ParticleSettings::render_type_PATH: {	/* for strand rendering */
+			BL::ID key = (BKE_object_is_modified(b_ob))? b_ob: b_ob.data();
+			Mesh *mesh = mesh_map.find(key);
+			if (mesh) {
+				use_particles |= mesh->need_attribute(scene, ATTR_STD_PARTICLE);
+			}
+			break;
+		}
+		#endif
+		
+		case BL::ParticleSettings::render_type_OBJECT: {
+			BL::Object b_dupli_ob = b_psys->settings().dupli_object();
+			if (b_dupli_ob) {
+				BL::ID key = (BKE_object_is_modified(b_dupli_ob))? b_dupli_ob: b_dupli_ob.data();
+				Mesh *mesh = mesh_map.find(key);
+				if (mesh) {
+					use_particles |= mesh->need_attribute(scene, ATTR_STD_PARTICLE);
+				}
+			}
+			break;
+		}
+		
+		case BL::ParticleSettings::render_type_GROUP: {
+			BL::Group b_dupli_group = b_psys->settings().dupli_group();
+			if (b_dupli_group) {
+				BL::Group::objects_iterator b_gob;
+				for (b_dupli_group.objects.begin(b_gob); b_gob != b_dupli_group.objects.end(); ++b_gob) {
+					BL::ID key = (BKE_object_is_modified(*b_gob))? *b_gob: b_gob->data();
+					Mesh *mesh = mesh_map.find(key);
+					if (mesh) {
+						use_particles |= mesh->need_attribute(scene, ATTR_STD_PARTICLE);
+					}
+				}
+			}
+			break;
+		}
+		
+		default:
+			/* avoid compiler warning */
+			break;
+		}
+	}
+	
+	return use_particles;
+}
+
+static bool use_particle_system(BL::ParticleSystem b_psys)
+{
+	/* only use duplicator particles? disabled particle info for
+	 * halo and billboard to reduce particle count.
+	 * Probably not necessary since particles don't contain a huge amount
+	 * of data compared to other textures.
+	 */
+	#if 0
+	int render_type = b_psys->settings().render_type();
+	return (render_type == BL::ParticleSettings::render_type_OBJECT
+	        || render_type == BL::ParticleSettings::render_type_GROUP);
+	#endif
+	
+	return true;
+}
+
+static bool use_particle(BL::Particle b_pa)
+{
+	return b_pa.is_exist() && b_pa.is_visible() && b_pa.alive_state()==BL::Particle::alive_state_ALIVE;
+}
+
+int BlenderSync::object_count_particles(BL::Object b_ob)
+{
+	int tot = 0;
+	BL::Object::particle_systems_iterator b_psys;
+	for(b_ob.particle_systems.begin(b_psys); b_psys != b_ob.particle_systems.end(); ++b_psys) {
+		if (use_particle_system(*b_psys)) {
+			BL::ParticleSystem::particles_iterator b_pa;
+			for(b_psys->particles.begin(b_pa); b_pa != b_psys->particles.end(); ++b_pa) {
+				if(use_particle(*b_pa))
+					++tot;
+			}
+		}
+	}
+	return tot;
+}
+
+void BlenderSync::sync_particles(Object *ob, BL::Object b_ob)
+{
+	int tot = object_count_particles(b_ob);
+	
+	ob->particles.clear();
+	ob->particles.reserve(tot);
+	
+	int index;
+	BL::Object::particle_systems_iterator b_psys;
+	for(b_ob.particle_systems.begin(b_psys); b_psys != b_ob.particle_systems.end(); ++b_psys) {
+		if (use_particle_system(*b_psys)) {
+			BL::ParticleSystem::particles_iterator b_pa;
+			for(b_psys->particles.begin(b_pa), index = 0; b_pa != b_psys->particles.end(); ++b_pa, ++index) {
+				if(use_particle(*b_pa)) {
+					Particle pa;
+					
+					pa.age = b_scene.frame_current() - b_pa->birth_time();
+					pa.lifetime = b_pa->lifetime();
+					
+					ob->particles.push_back(pa);
+				}
+			}
+		}
+	}
+}
+
+CCL_NAMESPACE_END
diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp
index 6e892095387..4560c2f8543 100644
--- a/intern/cycles/blender/blender_python.cpp
+++ b/intern/cycles/blender/blender_python.cpp
@@ -193,7 +193,8 @@ CCLDeviceInfo *compute_device_list(DeviceType type)
 
 		foreach(DeviceInfo& info, devices) {
 			if(info.type == type ||
-			   (info.type == DEVICE_MULTI && info.multi_devices[0].type == type)) {
+			   (info.type == DEVICE_MULTI && info.multi_devices[0].type == type))
+			{
 				CCLDeviceInfo cinfo = {info.id.c_str(), info.description.c_str(), i++};
 				device_list.push_back(cinfo);
 			}
@@ -214,7 +215,7 @@ CCL_NAMESPACE_END
 
 void *CCL_python_module_init()
 {
-	PyObject *mod= PyModule_Create(&ccl::module);
+	PyObject *mod = PyModule_Create(&ccl::module);
 
 #ifdef WITH_OSL
 	PyModule_AddObject(mod, "with_osl", Py_True);
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index 997909f1b92..12d7d00fb61 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -83,8 +83,8 @@ void BlenderSession::create_session()
 	SessionParams session_params = BlenderSync::get_session_params(b_userpref, b_scene, background);
 
 	/* reset status/progress */
-	last_status= "";
-	last_progress= -1.0f;
+	last_status = "";
+	last_progress = -1.0f;
 
 	/* create scene */
 	scene = new Scene(scene_params);
@@ -106,7 +106,7 @@ void BlenderSession::create_session()
 	session->set_pause(BlenderSync::get_session_pause(b_scene, background));
 
 	/* set buffer parameters */
-	BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene, b_rv3d, width, height);
+	BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene, scene->camera, width, height);
 	session->reset(buffer_params, session_params.samples);
 }
 
@@ -181,7 +181,7 @@ void BlenderSession::render()
 {
 	/* get buffer parameters */
 	SessionParams session_params = BlenderSync::get_session_params(b_userpref, b_scene, background);
-	BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene, b_rv3d, width, height);
+	BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene, scene->camera, width, height);
 	int w = buffer_params.width, h = buffer_params.height;
 
 	/* create render result */
@@ -292,7 +292,8 @@ void BlenderSession::synchronize()
 	SessionParams session_params = BlenderSync::get_session_params(b_userpref, b_scene, background);
 
 	if(session->params.modified(session_params) ||
-	   scene->params.modified(scene_params)) {
+	   scene->params.modified(scene_params))
+	{
 		free_session();
 		create_session();
 		session->start();
@@ -304,7 +305,7 @@ void BlenderSession::synchronize()
 	session->set_pause(BlenderSync::get_session_pause(b_scene, background));
 
 	/* copy recalc flags, outside of mutex so we can decide to do the real
-	   synchronization at a later time to not block on running updates */
+	 * synchronization at a later time to not block on running updates */
 	sync->sync_recalc();
 
 	/* try to acquire mutex. if we don't want to or can't, come back later */
@@ -326,7 +327,7 @@ void BlenderSession::synchronize()
 
 	/* reset if needed */
 	if(scene->need_reset()) {
-		BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene, b_rv3d, width, height);
+		BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene, scene->camera, width, height);
 		session->reset(buffer_params, session_params.samples);
 	}
 }
@@ -334,7 +335,7 @@ void BlenderSession::synchronize()
 bool BlenderSession::draw(int w, int h)
 {
 	/* before drawing, we verify camera and viewport size changes, because
-	   we do not get update callbacks for those, we must detect them here */
+	 * we do not get update callbacks for those, we must detect them here */
 	if(session->ready_to_reset()) {
 		bool reset = false;
 
@@ -364,7 +365,7 @@ bool BlenderSession::draw(int w, int h)
 		/* reset if requested */
 		if(reset) {
 			SessionParams session_params = BlenderSync::get_session_params(b_userpref, b_scene, background);
-			BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene, b_rv3d, width, height);
+			BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene, scene->camera, w, h);
 
 			session->reset(buffer_params, session_params.samples);
 		}
@@ -374,7 +375,7 @@ bool BlenderSession::draw(int w, int h)
 	update_status_progress();
 
 	/* draw */
-	BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene, b_rv3d, width, height);
+	BufferParams buffer_params = BlenderSync::get_buffer_params(b_scene, scene->camera, width, height);
 
 	return !session->draw(buffer_params);
 }
@@ -429,11 +430,11 @@ void BlenderSession::tag_redraw()
 {
 	if(background) {
 		/* update stats and progress, only for background here because
-		   in 3d view we do it in draw for thread safety reasons */
+		 * in 3d view we do it in draw for thread safety reasons */
 		update_status_progress();
 
 		/* offline render, redraw if timeout passed */
-		if(time_dt() - last_redraw_time > 1.0f) {
+		if(time_dt() - last_redraw_time > 1.0) {
 			write_render_result();
 			engine_tag_redraw((RenderEngine*)b_engine.ptr.data);
 			last_redraw_time = time_dt();
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index 59eeb25ed74..2c15a60dab6 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -75,6 +75,52 @@ static float get_node_output_value(BL::Node b_node, const string& name)
 	return sock.default_value();
 }
 
+static ShaderSocketType convert_socket_type(BL::NodeSocket::type_enum b_type)
+{
+	switch (b_type) {
+	case BL::NodeSocket::type_VALUE:
+		return SHADER_SOCKET_FLOAT;
+	case BL::NodeSocket::type_VECTOR:
+		return SHADER_SOCKET_VECTOR;
+	case BL::NodeSocket::type_RGBA:
+		return SHADER_SOCKET_COLOR;
+	case BL::NodeSocket::type_SHADER:
+		return SHADER_SOCKET_CLOSURE;
+	
+	case BL::NodeSocket::type_BOOLEAN:
+	case BL::NodeSocket::type_MESH:
+	case BL::NodeSocket::type_INT:
+	default:
+		return SHADER_SOCKET_FLOAT;
+	}
+}
+
+static void set_default_value(ShaderInput *input, BL::NodeSocket sock)
+{
+	/* copy values for non linked inputs */
+	switch(input->type) {
+	case SHADER_SOCKET_FLOAT: {
+		BL::NodeSocketFloatNone value_sock(sock);
+		input->set(value_sock.default_value());
+		break;
+	}
+	case SHADER_SOCKET_COLOR: {
+		BL::NodeSocketRGBA rgba_sock(sock);
+		input->set(get_float3(rgba_sock.default_value()));
+		break;
+	}
+	case SHADER_SOCKET_NORMAL:
+	case SHADER_SOCKET_POINT:
+	case SHADER_SOCKET_VECTOR: {
+		BL::NodeSocketVectorNone vec_sock(sock);
+		input->set(get_float3(vec_sock.default_value()));
+		break;
+	}
+	case SHADER_SOCKET_CLOSURE:
+		break;
+	}
+}
+
 static void get_tex_mapping(TextureMapping *mapping, BL::TexMapping b_mapping)
 {
 	if(!b_mapping)
@@ -106,7 +152,7 @@ static void get_tex_mapping(TextureMapping *mapping, BL::ShaderNodeMapping b_map
 		mapping->max = get_float3(b_mapping.max());
 }
 
-static ShaderNode *add_node(BL::BlendData b_data, ShaderGraph *graph, BL::ShaderNode b_node)
+static ShaderNode *add_node(BL::BlendData b_data, BL::Scene b_scene, ShaderGraph *graph, BL::ShaderNode b_node)
 {
 	ShaderNode *node = NULL;
 
@@ -117,12 +163,20 @@ static ShaderNode *add_node(BL::BlendData b_data, ShaderGraph *graph, BL::Shader
 		case BL::ShaderNode::type_MATERIAL: break;
 		case BL::ShaderNode::type_MATERIAL_EXT: break;
 		case BL::ShaderNode::type_OUTPUT: break;
-		case BL::ShaderNode::type_SCRIPT: break;
 		case BL::ShaderNode::type_SQUEEZE: break;
 		case BL::ShaderNode::type_TEXTURE: break;
 		/* handled outside this function */
 		case BL::ShaderNode::type_GROUP: break;
 		/* existing blender nodes */
+		case BL::ShaderNode::type_REROUTE: {
+			BL::Node::inputs_iterator b_input;
+			b_node.inputs.begin(b_input);
+			BL::Node::outputs_iterator b_output;
+			b_node.outputs.begin(b_output);
+			ProxyNode *proxy = new ProxyNode(convert_socket_type(b_input->type()), convert_socket_type(b_output->type()));
+			node = proxy;
+			break;
+		}
 		case BL::ShaderNode::type_CURVE_RGB: {
 			RGBCurvesNode *ramp = new RGBCurvesNode();
 			node = ramp;
@@ -338,13 +392,17 @@ static ShaderNode *add_node(BL::BlendData b_data, ShaderGraph *graph, BL::Shader
 			node = new ObjectInfoNode();
 			break;
 		}
+		case BL::ShaderNode::type_PARTICLE_INFO: {
+			node = new ParticleInfoNode();
+			break;
+		}
 		case BL::ShaderNode::type_TEX_IMAGE: {
 			BL::ShaderNodeTexImage b_image_node(b_node);
 			BL::Image b_image(b_image_node.image());
 			ImageTextureNode *image = new ImageTextureNode();
 			/* todo: handle generated/builtin images */
 			if(b_image)
-				image->filename = blender_absolute_path(b_data, b_image, b_image.filepath());
+				image->filename = image_user_file_path(b_image_node.image_user(), b_image, b_scene.frame_current());
 			image->color_space = ImageTextureNode::color_space_enum[(int)b_image_node.color_space()];
 			get_tex_mapping(&image->tex_mapping, b_image_node.texture_mapping());
 			node = image;
@@ -355,7 +413,7 @@ static ShaderNode *add_node(BL::BlendData b_data, ShaderGraph *graph, BL::Shader
 			BL::Image b_image(b_env_node.image());
 			EnvironmentTextureNode *env = new EnvironmentTextureNode();
 			if(b_image)
-				env->filename = blender_absolute_path(b_data, b_image, b_image.filepath());
+				env->filename = image_user_file_path(b_env_node.image_user(), b_image, b_scene.frame_current());
 			env->color_space = EnvironmentTextureNode::color_space_enum[(int)b_env_node.color_space()];
 			env->projection = EnvironmentTextureNode::projection_enum[(int)b_env_node.projection()];
 			get_tex_mapping(&env->tex_mapping, b_env_node.texture_mapping());
@@ -417,7 +475,7 @@ static ShaderNode *add_node(BL::BlendData b_data, ShaderGraph *graph, BL::Shader
 			break;
 		}
 		case BL::ShaderNode::type_TEX_COORD: {
-			node = new TextureCoordinateNode();;
+			node = new TextureCoordinateNode();
 			break;
 		}
 		case BL::ShaderNode::type_TEX_SKY: {
@@ -485,53 +543,7 @@ static SocketPair node_socket_map_pair(PtrNodeMap& node_map, BL::Node b_node, BL
 	return SocketPair(node_map[b_node.ptr.data], name);
 }
 
-static ShaderSocketType convert_socket_type(BL::NodeSocket::type_enum b_type)
-{
-	switch (b_type) {
-	case BL::NodeSocket::type_VALUE:
-		return SHADER_SOCKET_FLOAT;
-	case BL::NodeSocket::type_VECTOR:
-		return SHADER_SOCKET_VECTOR;
-	case BL::NodeSocket::type_RGBA:
-		return SHADER_SOCKET_COLOR;
-	case BL::NodeSocket::type_SHADER:
-		return SHADER_SOCKET_CLOSURE;
-	
-	case BL::NodeSocket::type_BOOLEAN:
-	case BL::NodeSocket::type_MESH:
-	case BL::NodeSocket::type_INT:
-	default:
-		return SHADER_SOCKET_FLOAT;
-	}
-}
-
-static void set_default_value(ShaderInput *input, BL::NodeSocket sock)
-{
-	/* copy values for non linked inputs */
-	switch(input->type) {
-	case SHADER_SOCKET_FLOAT: {
-		BL::NodeSocketFloatNone value_sock(sock);
-		input->set(value_sock.default_value());
-		break;
-	}
-	case SHADER_SOCKET_COLOR: {
-		BL::NodeSocketRGBA rgba_sock(sock);
-		input->set(get_float3(rgba_sock.default_value()));
-		break;
-	}
-	case SHADER_SOCKET_NORMAL:
-	case SHADER_SOCKET_POINT:
-	case SHADER_SOCKET_VECTOR: {
-		BL::NodeSocketVectorNone vec_sock(sock);
-		input->set(get_float3(vec_sock.default_value()));
-		break;
-	}
-	case SHADER_SOCKET_CLOSURE:
-		break;
-	}
-}
-
-static void add_nodes(BL::BlendData b_data, ShaderGraph *graph, BL::ShaderNodeTree b_ntree, PtrSockMap& sockets_map)
+static void add_nodes(BL::BlendData b_data, BL::Scene b_scene, ShaderGraph *graph, BL::ShaderNodeTree b_ntree, PtrSockMap& sockets_map)
 {
 	/* add nodes */
 	BL::ShaderNodeTree::nodes_iterator b_node;
@@ -579,10 +591,10 @@ static void add_nodes(BL::BlendData b_data, ShaderGraph *graph, BL::ShaderNodeTr
 				set_default_value(proxy->inputs[0], b_output->group_socket());
 			}
 			
-			add_nodes(b_data, graph, b_group_ntree, group_sockmap);
+			add_nodes(b_data, b_scene, graph, b_group_ntree, group_sockmap);
 		}
 		else {
-			ShaderNode *node = add_node(b_data, graph, BL::ShaderNode(*b_node));
+			ShaderNode *node = add_node(b_data, b_scene, graph, BL::ShaderNode(*b_node));
 			
 			if(node) {
 				BL::Node::inputs_iterator b_input;
@@ -638,7 +650,7 @@ static void add_nodes(BL::BlendData b_data, ShaderGraph *graph, BL::ShaderNodeTr
 			to_pair = sockets_map[b_to_sock.ptr.data];
 
 		/* either node may be NULL when the node was not exported, typically
-		   because the node type is not supported */
+		 * because the node type is not supported */
 		if(from_pair.first && to_pair.first) {
 			ShaderOutput *output = from_pair.first->output(from_pair.second.c_str());
 			ShaderInput *input = to_pair.first->input(to_pair.second.c_str());
@@ -672,7 +684,7 @@ void BlenderSync::sync_materials()
 				PtrSockMap sock_to_node;
 				BL::ShaderNodeTree b_ntree(b_mat->node_tree());
 
-				add_nodes(b_data, graph, b_ntree, sock_to_node);
+				add_nodes(b_data, b_scene, graph, b_ntree, sock_to_node);
 			}
 			else {
 				ShaderNode *closure, *out;
@@ -713,7 +725,7 @@ void BlenderSync::sync_world()
 			PtrSockMap sock_to_node;
 			BL::ShaderNodeTree b_ntree(b_world.node_tree());
 
-			add_nodes(b_data, graph, b_ntree, sock_to_node);
+			add_nodes(b_data, b_scene, graph, b_ntree, sock_to_node);
 		}
 		else if(b_world) {
 			ShaderNode *closure, *out;
@@ -772,7 +784,7 @@ void BlenderSync::sync_lamps()
 				PtrSockMap sock_to_node;
 				BL::ShaderNodeTree b_ntree(b_lamp->node_tree());
 
-				add_nodes(b_data, graph, b_ntree, sock_to_node);
+				add_nodes(b_data, b_scene, graph, b_ntree, sock_to_node);
 			}
 			else {
 				ShaderNode *closure, *out;
@@ -781,7 +793,9 @@ void BlenderSync::sync_lamps()
 				if(b_lamp->type() == BL::Lamp::type_POINT ||
 				   b_lamp->type() == BL::Lamp::type_SPOT ||
 				   b_lamp->type() == BL::Lamp::type_AREA)
+				{
 					strength = 100.0f;
+				}
 
 				closure = graph->add(new EmissionNode());
 				closure->input("Color")->value = get_float3(b_lamp->color());
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index c0b6e210bb1..5640a411fd7 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -63,7 +63,7 @@ BlenderSync::~BlenderSync()
 bool BlenderSync::sync_recalc()
 {
 	/* sync recalc flags from blender to cycles. actual update is done separate,
-	   so we can do it later on if doing it immediate is not suitable */
+	 * so we can do it later on if doing it immediate is not suitable */
 
 	BL::BlendData::materials_iterator b_mat;
 
@@ -105,10 +105,13 @@ bool BlenderSync::sync_recalc()
 
 	BL::BlendData::worlds_iterator b_world;
 
-	for(b_data.worlds.begin(b_world); b_world != b_data.worlds.end(); ++b_world)
+	for(b_data.worlds.begin(b_world); b_world != b_data.worlds.end(); ++b_world) {
 		if(world_map == b_world->ptr.data &&
-			(b_world->is_updated() || (b_world->node_tree() && b_world->node_tree().is_updated())))
+		   (b_world->is_updated() || (b_world->node_tree() && b_world->node_tree().is_updated())))
+		{
 			world_recalc = true;
+		}
+	}
 
 	bool recalc =
 		shader_map.has_recalc() ||
@@ -135,7 +138,6 @@ void BlenderSync::sync_data(BL::SpaceView3D b_v3d, BL::Object b_override, const
 
 void BlenderSync::sync_integrator()
 {
-	BL::RenderSettings r = b_scene.render();
 	PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles");
 
 	experimental = (RNA_enum_get(&cscene, "feature_set") != 0);
@@ -166,6 +168,13 @@ void BlenderSync::sync_integrator()
 	integrator->motion_blur = (!preview && r.use_motion_blur());
 #endif
 
+	integrator->diffuse_samples = get_int(cscene, "diffuse_samples");
+	integrator->glossy_samples = get_int(cscene, "glossy_samples");
+	integrator->transmission_samples = get_int(cscene, "transmission_samples");
+	integrator->ao_samples = get_int(cscene, "ao_samples");
+	integrator->mesh_light_samples = get_int(cscene, "mesh_light_samples");
+	integrator->progressive = get_boolean(cscene, "progressive");
+
 	if(integrator->modified(previntegrator))
 		integrator->tag_update(scene);
 }
@@ -306,15 +315,27 @@ SessionParams BlenderSync::get_session_params(BL::UserPreferences b_userpref, BL
 
 	/* Background */
 	params.background = background;
-			
+
 	/* samples */
-	if(background) {
-		params.samples = get_int(cscene, "samples");
+	if(get_boolean(cscene, "progressive")) {
+		if(background) {
+			params.samples = get_int(cscene, "samples");
+		}
+		else {
+			params.samples = get_int(cscene, "preview_samples");
+			if(params.samples == 0)
+				params.samples = INT_MAX;
+		}
 	}
 	else {
-		params.samples = get_int(cscene, "preview_samples");
-		if(params.samples == 0)
-			params.samples = INT_MAX;
+		if(background) {
+			params.samples = get_int(cscene, "aa_samples");
+		}
+		else {
+			params.samples = get_int(cscene, "preview_aa_samples");
+			if(params.samples == 0)
+				params.samples = INT_MAX;
+		}
 	}
 
 	/* other parameters */
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h
index 10afd468850..8c31c4b86ba 100644
--- a/intern/cycles/blender/blender_sync.h
+++ b/intern/cycles/blender/blender_sync.h
@@ -63,7 +63,7 @@ public:
 	static SceneParams get_scene_params(BL::Scene b_scene, bool background);
 	static SessionParams get_session_params(BL::UserPreferences b_userpref, BL::Scene b_scene, bool background);
 	static bool get_session_pause(BL::Scene b_scene, bool background);
-	static BufferParams get_buffer_params(BL::Scene b_scene, BL::RegionView3D b_rv3d, int width, int height);
+	static BufferParams get_buffer_params(BL::Scene b_scene, Camera *cam, int width, int height);
 
 private:
 	/* sync */
@@ -80,17 +80,20 @@ private:
 
 	void sync_nodes(Shader *shader, BL::ShaderNodeTree b_ntree);
 	Mesh *sync_mesh(BL::Object b_ob, bool object_updated);
-	void sync_object(BL::Object b_parent, int b_index, BL::Object b_object, Transform& tfm, uint layer_flag, int motion);
+	void sync_object(BL::Object b_parent, int b_index, BL::Object b_object, Transform& tfm, uint layer_flag, int motion, int particle_id);
 	void sync_light(BL::Object b_parent, int b_index, BL::Object b_ob, Transform& tfm);
 	void sync_background_light();
 	void sync_mesh_motion(BL::Object b_ob, Mesh *mesh, int motion);
 	void sync_camera_motion(BL::Object b_ob, int motion);
+	void sync_particles(Object *ob, BL::Object b_ob);
 
 	/* util */
 	void find_shader(BL::ID id, vector<uint>& used_shaders, int default_shader);
 	bool BKE_object_is_modified(BL::Object b_ob);
 	bool object_is_mesh(BL::Object b_ob);
 	bool object_is_light(BL::Object b_ob);
+	bool object_use_particles(BL::Object b_ob);
+	int object_count_particles(BL::Object b_ob);
 
 	/* variables */
 	BL::BlendData b_data;
diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h
index b01fa81ee40..b5a76836bed 100644
--- a/intern/cycles/blender/blender_util.h
+++ b/intern/cycles/blender/blender_util.h
@@ -27,7 +27,7 @@
 #include "util_vector.h"
 
 /* Hacks to hook into Blender API
-   todo: clean this up ... */
+ * todo: clean this up ... */
 
 extern "C" {
 
@@ -53,6 +53,8 @@ int rna_Object_is_deform_modified(void *ob, void *scene, int settings);
 void BLI_timestr(double _time, char *str);
 void rna_ColorRamp_eval(void *coba, float position, float color[4]);
 void rna_Scene_frame_set(void *scene, int frame, float subframe);
+void BKE_image_user_frame_calc(void *iuser, int cfra, int fieldnr);
+void BKE_image_user_file_path(void *iuser, void *ima, char *path);
 
 }
 
@@ -101,6 +103,14 @@ static inline bool BKE_object_is_deform_modified(BL::Object self, BL::Scene scen
 	return rna_Object_is_deform_modified(self.ptr.data, scene.ptr.data, (preview)? (1<<0): (1<<1))? true: false;
 }
 
+static inline string image_user_file_path(BL::ImageUser iuser, BL::Image ima, int cfra)
+{
+	char filepath[1024];
+	BKE_image_user_frame_calc(iuser.ptr.data, cfra, 0);
+	BKE_image_user_file_path(iuser.ptr.data, ima.ptr.data, filepath);
+	return string(filepath);
+}
+
 static inline void scene_frame_set(BL::Scene scene, int frame)
 {
 	rna_Scene_frame_set(scene.ptr.data, frame, 0.0f);
@@ -113,7 +123,7 @@ static inline Transform get_transform(BL::Array<float, 16> array)
 	Transform tfm;
 
 	/* we assume both types to be just 16 floats, and transpose because blender
-	   use column major matrix order while we use row major */
+	 * use column major matrix order while we use row major */
 	memcpy(&tfm, &array, sizeof(float)*16);
 	tfm = transform_transpose(tfm);
 
@@ -156,12 +166,14 @@ static inline uint get_layer(BL::Array<int, 20> array)
 	return layer;
 }
 
-/*static inline float3 get_float3(PointerRNA& ptr, const char *name)
+#if 0
+static inline float3 get_float3(PointerRNA& ptr, const char *name)
 {
 	float3 f;
 	RNA_float_get_array(&ptr, name, &f.x);
 	return f;
-}*/
+}
+#endif
 
 static inline bool get_boolean(PointerRNA& ptr, const char *name)
 {
diff --git a/intern/cycles/bvh/bvh.cpp b/intern/cycles/bvh/bvh.cpp
index 15695dddf45..a383ad317ab 100644
--- a/intern/cycles/bvh/bvh.cpp
+++ b/intern/cycles/bvh/bvh.cpp
@@ -292,13 +292,13 @@ void BVH::pack_triangles()
 void BVH::pack_instances(size_t nodes_size)
 {
 	/* The BVH's for instances are built separately, but for traversal all
-	   BVH's are stored in global arrays. This function merges them into the
-	   top level BVH, adjusting indexes and offsets where appropriate. */
+	 * BVH's are stored in global arrays. This function merges them into the
+	 * top level BVH, adjusting indexes and offsets where appropriate. */
 	bool use_qbvh = params.use_qbvh;
 	size_t nsize = (use_qbvh)? BVH_QNODE_SIZE: BVH_NODE_SIZE;
 
 	/* adjust primitive index to point to the triangle in the global array, for
-	   meshes with transform applied and already in the top level BVH */
+	 * meshes with transform applied and already in the top level BVH */
 	for(size_t i = 0; i < pack.prim_index.size(); i++)
 		if(pack.prim_index[i] != -1)
 			pack.prim_index[i] += objects[pack.prim_object[i]]->mesh->tri_offset;
@@ -356,14 +356,14 @@ void BVH::pack_instances(size_t nodes_size)
 		Mesh *mesh = ob->mesh;
 
 		/* if mesh transform is applied, that means it's already in the top
-		   level BVH, and we don't need to merge it in */
+		 * level BVH, and we don't need to merge it in */
 		if(mesh->transform_applied) {
 			pack.object_node[object_offset++] = 0;
 			continue;
 		}
 
 		/* if mesh already added once, don't add it again, but used set
-		   node offset for this object */
+		 * node offset for this object */
 		map<Mesh*, int>::iterator it = mesh_map.find(mesh);
 
 		if(mesh_map.find(mesh) != mesh_map.end()) {
diff --git a/intern/cycles/bvh/bvh.h b/intern/cycles/bvh/bvh.h
index 30ae7dac106..549f1e3ac1d 100644
--- a/intern/cycles/bvh/bvh.h
+++ b/intern/cycles/bvh/bvh.h
@@ -46,7 +46,7 @@ class Progress;
 
 struct PackedBVH {
 	/* BVH nodes storage, one node is 4x int4, and contains two bounding boxes,
-	   and child, triangle or object indexes dependening on the node type */
+	 * and child, triangle or object indexes dependening on the node type */
 	array<int4> nodes; 
 	/* object index to BVH node index mapping for instances */
 	array<int> object_node; 
@@ -55,12 +55,12 @@ struct PackedBVH {
 	/* visibility visibilitys for primitives */
 	array<uint> prim_visibility;
 	/* mapping from BVH primitive index to true primitive index, as primitives
-	   may be duplicated due to spatial splits. -1 for instances. */
+	 * may be duplicated due to spatial splits. -1 for instances. */
 	array<int> prim_index;
 	/* mapping from BVH primitive index, to the object id of that primitive. */
 	array<int> prim_object;
 	/* quick array to lookup if a node is a leaf, not used for traversal, only
-	   for instance BVH merging  */
+	 * for instance BVH merging  */
 	array<int> is_leaf;
 
 	/* index of the root node. */
diff --git a/intern/cycles/bvh/bvh_binning.cpp b/intern/cycles/bvh/bvh_binning.cpp
index e4b88584a33..05a674a47a7 100644
--- a/intern/cycles/bvh/bvh_binning.cpp
+++ b/intern/cycles/bvh/bvh_binning.cpp
@@ -200,7 +200,7 @@ void BVHObjectBinning::split(BVHReference* prims, BVHObjectBinning& left_o, BVHO
 	}
 
 	/* object medium split if we did not make progress, can happen when all
-	   primitives have same centroid */
+	 * primitives have same centroid */
 	lgeom_bounds = BoundBox::empty;
 	rgeom_bounds = BoundBox::empty;
 	lcent_bounds = BoundBox::empty;
diff --git a/intern/cycles/bvh/bvh_build.cpp b/intern/cycles/bvh/bvh_build.cpp
index 28237aea611..705b805a3a9 100644
--- a/intern/cycles/bvh/bvh_build.cpp
+++ b/intern/cycles/bvh/bvh_build.cpp
@@ -196,14 +196,14 @@ BVHNode* BVHBuild::run()
 
 void BVHBuild::progress_update()
 {
-	if(time_dt() - progress_start_time < 0.25f)
+	if(time_dt() - progress_start_time < 0.25)
 		return;
 	
 	double progress_start = (double)progress_count/(double)progress_total;
 	double duplicates = (double)(progress_total - progress_original_total)/(double)progress_total;
 
 	string msg = string_printf("Building BVH %.0f%%, duplicates %.0f%%",
-		progress_start*100.0f, duplicates*100.0f);
+	                           progress_start * 100.0, duplicates * 100.0);
 
 	progress.set_substatus(msg);
 	progress_start_time = time_dt(); 
diff --git a/intern/cycles/bvh/bvh_node.cpp b/intern/cycles/bvh/bvh_node.cpp
index 4edfb4b70a4..7cc9bd333b0 100644
--- a/intern/cycles/bvh/bvh_node.cpp
+++ b/intern/cycles/bvh/bvh_node.cpp
@@ -52,7 +52,7 @@ int BVHNode::getSubtreeSize(BVH_STAT stat) const
 	}
 
 	if(!is_leaf())
-		for(int i=0;i<num_children();i++)
+		for(int i = 0; i < num_children(); i++)
 			cnt += get_child(i)->getSubtreeSize(stat);
 
 	return cnt;
@@ -60,7 +60,7 @@ int BVHNode::getSubtreeSize(BVH_STAT stat) const
 
 void BVHNode::deleteSubtree()
 {
-	for(int i=0;i<num_children();i++)
+	for(int i = 0; i < num_children(); i++)
 		if(get_child(i))
 			get_child(i)->deleteSubtree();
 
@@ -71,7 +71,7 @@ float BVHNode::computeSubtreeSAHCost(const BVHParams& p, float probability) cons
 {
 	float SAH = probability * p.cost(num_children(), num_triangles());
 
-	for(int i=0;i<num_children();i++) {
+	for(int i = 0; i < num_children(); i++) {
 		BVHNode *child = get_child(i);
 		SAH += child->computeSubtreeSAHCost(p, probability * child->m_bounds.safe_area()/m_bounds.safe_area());
 	}
diff --git a/intern/cycles/bvh/bvh_params.h b/intern/cycles/bvh/bvh_params.h
index 0cf5e905fea..a78496d841d 100644
--- a/intern/cycles/bvh/bvh_params.h
+++ b/intern/cycles/bvh/bvh_params.h
@@ -98,11 +98,11 @@ class BVHReference
 public:
 	__forceinline BVHReference() {}
 
-	__forceinline BVHReference(const BoundBox& bounds_, int prim_index, int prim_object)
+	__forceinline BVHReference(const BoundBox& bounds_, int prim_index_, int prim_object_)
 	: rbounds(bounds_)
 	{
-		rbounds.min.w = __int_as_float(prim_index);
-		rbounds.max.w = __int_as_float(prim_object);
+		rbounds.min.w = __int_as_float(prim_index_);
+		rbounds.max.w = __int_as_float(prim_object_);
 	}
 
 	__forceinline const BoundBox& bounds() const { return rbounds; }
diff --git a/intern/cycles/bvh/bvh_sort.h b/intern/cycles/bvh/bvh_sort.h
index ba35ba3fae7..18aafb5f1ff 100644
--- a/intern/cycles/bvh/bvh_sort.h
+++ b/intern/cycles/bvh/bvh_sort.h
@@ -1,4 +1,4 @@
- /*
+/*
  * Adapted from code copyright 2009-2010 NVIDIA Corporation
  * Modifications Copyright 2011, Blender Foundation.
  *
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp
index 42dda1180c7..33040f287d1 100644
--- a/intern/cycles/device/device.cpp
+++ b/intern/cycles/device/device.cpp
@@ -124,7 +124,7 @@ void Device::draw_pixels(device_memory& rgba, int y, int w, int h, int dy, int w
 	uint8_t *pixels = (uint8_t*)rgba.data_pointer;
 
 	/* for multi devices, this assumes the ineffecient method that we allocate
-	   all pixels on the device even though we only render to a subset */
+	 * all pixels on the device even though we only render to a subset */
 	pixels += 4*y*w;
 
 	glDrawPixels(w, h, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index 5f422332cd2..070b20aec49 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -226,7 +226,7 @@ public:
 	void task_add(DeviceTask& task)
 	{
 		/* split task into smaller ones, more than number of threads for uneven
-		   workloads where some parts of the image render slower than others */
+		 * workloads where some parts of the image render slower than others */
 		list<DeviceTask> tasks;
 
 		task.split(tasks, TaskScheduler::num_threads()*10);
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 937dbf2d87c..357f99145b2 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -226,7 +226,7 @@ public:
 		string kernel_path = path_get("kernel");
 		string md5 = path_files_md5_hash(kernel_path);
 
-		cubin = string_printf("cycles_kernel_sm%d%d_%s.cubin", major, minor, md5.c_str());;
+		cubin = string_printf("cycles_kernel_sm%d%d_%s.cubin", major, minor, md5.c_str());
 		cubin = path_user_get(path_join("cache", cubin));
 
 		/* if exists already, use it */
@@ -259,7 +259,7 @@ public:
 
 		path_create_directories(cubin);
 
-		string command = string_printf("\"%s\" -arch=sm_%d%d -m%d --cubin \"%s\" --use_fast_math "
+		string command = string_printf("\"%s\" -arch=sm_%d%d -m%d --cubin \"%s\" "
 			"-o \"%s\" --ptxas-options=\"-v\" --maxrregcount=%d --opencc-options -OPT:Olimit=0 -I\"%s\" -DNVCC",
 			nvcc.c_str(), major, minor, machine, kernel.c_str(), cubin.c_str(), maxreg, include.c_str());
 
@@ -771,7 +771,7 @@ public:
 			cuda_push_context();
 
 			/* for multi devices, this assumes the ineffecient method that we allocate
-			   all pixels on the device even though we only render to a subset */
+			 * all pixels on the device even though we only render to a subset */
 			size_t offset = sizeof(uint8_t)*4*y*w;
 
 			glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, pmem.cuPBO);
diff --git a/intern/cycles/device/device_network.h b/intern/cycles/device/device_network.h
index 591216a77b9..e3afe46d2b0 100644
--- a/intern/cycles/device/device_network.h
+++ b/intern/cycles/device/device_network.h
@@ -126,8 +126,10 @@ typedef struct RPCReceive {
 
 				if(len == data_size) {
 					archive_str = (data.size())? string(&data[0], data.size()): string("");
-					/*istringstream archive_stream(archive_str);
-					boost::archive::text_iarchive archive(archive_stream);*/
+#if 0
+					istringstream archive_stream(archive_str);
+					boost::archive::text_iarchive archive(archive_stream);
+#endif
 					archive_stream = new istringstream(archive_str);
 					archive = new boost::archive::text_iarchive(*archive_stream);
 
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index 09235506048..13ebeff70d2 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -239,7 +239,7 @@ public:
 		}
 
 		/* we don't check CL_DEVICE_VERSION since for e.g. nvidia sm 1.3 cards this is
-			1.0 even if the language features are there, just limited shared memory */
+		 * 1.0 even if the language features are there, just limited shared memory */
 
 		return true;
 	}
@@ -344,8 +344,8 @@ public:
 	bool compile_kernel(const string& kernel_path, const string& kernel_md5)
 	{
 		/* we compile kernels consisting of many files. unfortunately opencl
-		   kernel caches do not seem to recognize changes in included files.
-		   so we force recompile on changes by adding the md5 hash of all files */
+		 * kernel caches do not seem to recognize changes in included files.
+		 * so we force recompile on changes by adding the md5 hash of all files */
 		string source = "#include \"kernel.cl\" // " + kernel_md5 + "\n";
 		source = path_source_replace_includes(source, kernel_path);
 
@@ -407,7 +407,7 @@ public:
 		string device_md5 = device_md5_hash();
 
 		/* try to use cache binary */
-		string clbin = string_printf("cycles_kernel_%s_%s.clbin", device_md5.c_str(), kernel_md5.c_str());;
+		string clbin = string_printf("cycles_kernel_%s_%s.clbin", device_md5.c_str(), kernel_md5.c_str());
 		clbin = path_user_get(path_join("cache", clbin));
 
 		if(path_exists(clbin)) {
@@ -680,8 +680,6 @@ public:
 		else
 			tasks.push_back(maintask);
 
-		DeviceTask task;
-
 		foreach(DeviceTask& task, tasks) {
 			if(task.type == DeviceTask::TONEMAP)
 				tonemap(task);
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index d165716aaca..98cb16d5dfc 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -114,7 +114,7 @@ if(WITH_CYCLES_CUDA_BINARIES)
 
 		add_custom_command(
 			OUTPUT ${cuda_cubin}
-			COMMAND ${CUDA_NVCC_EXECUTABLE} -arch=${arch} -m${CUDA_BITS} --cubin ${CMAKE_CURRENT_SOURCE_DIR}/kernel.cu --use_fast_math -o ${CMAKE_CURRENT_BINARY_DIR}/${cuda_cubin} --ptxas-options="-v" --maxrregcount=24 --opencc-options -OPT:Olimit=0 -I${CMAKE_CURRENT_SOURCE_DIR}/../util -I${CMAKE_CURRENT_SOURCE_DIR}/svm -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -DNVCC
+			COMMAND ${CUDA_NVCC_EXECUTABLE} -arch=${arch} -m${CUDA_BITS} --cubin ${CMAKE_CURRENT_SOURCE_DIR}/kernel.cu -o ${CMAKE_CURRENT_BINARY_DIR}/${cuda_cubin} --ptxas-options="-v" --maxrregcount=24 --opencc-options -OPT:Olimit=0 -I${CMAKE_CURRENT_SOURCE_DIR}/../util -I${CMAKE_CURRENT_SOURCE_DIR}/svm -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -DNVCC
 			DEPENDS ${cuda_sources})
 
 		delayed_install("${CMAKE_CURRENT_BINARY_DIR}" "${cuda_cubin}" ${CYCLES_INSTALL_PATH}/lib)
diff --git a/intern/cycles/kernel/SConscript b/intern/cycles/kernel/SConscript
index be3c37b476c..14890164a42 100644
--- a/intern/cycles/kernel/SConscript
+++ b/intern/cycles/kernel/SConscript
@@ -35,7 +35,7 @@ if env['WITH_BF_CYCLES_CUDA_BINARIES']:
 
     # nvcc flags
     nvcc_flags = "-m%s" % (bits)
-    nvcc_flags += " --cubin -use_fast_math --ptxas-options=\"-v\" --maxrregcount=24"
+    nvcc_flags += " --cubin --ptxas-options=\"-v\" --maxrregcount=24"
     nvcc_flags += " --opencc-options -OPT:Olimit=0"
     nvcc_flags += " -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -DNVCC"
     nvcc_flags += " -I \"%s\" -I \"%s\"" % (util_dir, svm_dir)
diff --git a/intern/cycles/kernel/kernel_accumulate.h b/intern/cycles/kernel/kernel_accumulate.h
index 6c3ade1c531..d99beb8905a 100644
--- a/intern/cycles/kernel/kernel_accumulate.h
+++ b/intern/cycles/kernel/kernel_accumulate.h
@@ -271,8 +271,8 @@ __device_inline float3 path_radiance_sum(KernelGlobals *kg, PathRadiance *L)
 #ifdef __PASSES__
 	if(L->use_light_pass) {
 		/* this division is a bit ugly, but means we only have to keep track of
-		   only a single throughput further along the path, here we recover just
-		   the indirect parth that is not influenced by any particular BSDF type */
+		 * only a single throughput further along the path, here we recover just
+		 * the indirect parth that is not influenced by any particular BSDF type */
 		L->direct_emission = safe_divide_color(L->direct_emission, L->direct_throughput);
 		L->direct_diffuse += L->indirect_diffuse*L->direct_emission;
 		L->direct_glossy += L->indirect_glossy*L->direct_emission;
diff --git a/intern/cycles/kernel/kernel_bvh.h b/intern/cycles/kernel/kernel_bvh.h
index 5da4253bd86..34a44af8b8d 100644
--- a/intern/cycles/kernel/kernel_bvh.h
+++ b/intern/cycles/kernel/kernel_bvh.h
@@ -34,8 +34,8 @@ CCL_NAMESPACE_BEGIN
 #define TRI_NODE_SIZE 3
 
 /* silly workaround for float extended precision that happens when compiling
-   without sse support on x86, it results in different results for float ops
-   that you would otherwise expect to compare correctly */
+ * without sse support on x86, it results in different results for float ops
+ * that you would otherwise expect to compare correctly */
 #if !defined(__i386__) || defined(__SSE__)
 #define NO_EXTENDED_PRECISION
 #else
@@ -74,10 +74,10 @@ __device_inline void bvh_instance_push(KernelGlobals *kg, int object, const Ray
 
 __device_inline void bvh_instance_pop(KernelGlobals *kg, int object, const Ray *ray, float3 *P, float3 *idir, float *t, const float tmax)
 {
-	Transform tfm = object_fetch_transform(kg, object, ray->time, OBJECT_TRANSFORM);
-
-	if(*t != FLT_MAX)
+	if(*t != FLT_MAX) {
+		Transform tfm = object_fetch_transform(kg, object, ray->time, OBJECT_TRANSFORM);
 		*t *= len(transform_direction(&tfm, 1.0f/(*idir)));
+	}
 
 	*P = ray->P;
 	*idir = bvh_inverse_direction(ray->D);
@@ -160,7 +160,7 @@ __device_inline void bvh_triangle_intersect(KernelGlobals *kg, Intersection *ise
 			if(v >= 0.0f && u + v <= 1.0f) {
 #ifdef __VISIBILITY_FLAG__
 				/* visibility flag test. we do it here under the assumption
-				   that most triangles are culled by node flags */
+				 * that most triangles are culled by node flags */
 				if(kernel_tex_fetch(__prim_visibility, triAddr) & visibility)
 #endif
 				{
diff --git a/intern/cycles/kernel/kernel_compat_cpu.h b/intern/cycles/kernel/kernel_compat_cpu.h
index 2bd0b61b4fa..cc8f1f3323b 100644
--- a/intern/cycles/kernel/kernel_compat_cpu.h
+++ b/intern/cycles/kernel/kernel_compat_cpu.h
@@ -28,13 +28,13 @@
 CCL_NAMESPACE_BEGIN
 
 /* Assertions inside the kernel only work for the CPU device, so we wrap it in
-   a macro which is empty for other devices */
+ * a macro which is empty for other devices */
 
 #define kernel_assert(cond) assert(cond)
 
 /* Texture types to be compatible with CUDA textures. These are really just
-   simple arrays and after inlining fetch hopefully revert to being a simple
-   pointer lookup. */
+ * simple arrays and after inlining fetch hopefully revert to being a simple
+ * pointer lookup. */
 
 template<typename T> struct texture  {
 	T fetch(int index)
@@ -43,7 +43,8 @@ template<typename T> struct texture  {
 		return data[index];
 	}
 
-	/*__m128 fetch_m128(int index)
+#if 0
+	__m128 fetch_m128(int index)
 	{
 		kernel_assert(index >= 0 && index < width);
 		return ((__m128*)data)[index];
@@ -53,7 +54,8 @@ template<typename T> struct texture  {
 	{
 		kernel_assert(index >= 0 && index < width);
 		return ((__m128i*)data)[index];
-	}*/
+	}
+#endif
 
 	float interp(float x, int size)
 	{
diff --git a/intern/cycles/kernel/kernel_compat_cuda.h b/intern/cycles/kernel/kernel_compat_cuda.h
index 2f9f2c45e88..40bae069dea 100644
--- a/intern/cycles/kernel/kernel_compat_cuda.h
+++ b/intern/cycles/kernel/kernel_compat_cuda.h
@@ -62,5 +62,14 @@ typedef texture<uchar4, 2, cudaReadModeNormalizedFloat> texture_image_uchar4;
 
 #define kernel_data __data
 
+/* Use fast math functions */
+
+#define cosf(x) __cosf(((float)x))
+#define sinf(x) __sinf(((float)x))
+#define powf(x, y) __powf(((float)x), ((float)y))
+#define tanf(x) __tanf(((float)x))
+#define logf(x) __logf(((float)x))
+#define expf(x) __expf(((float)x))
+
 #endif /* __KERNEL_COMPAT_CUDA_H__ */
 
diff --git a/intern/cycles/kernel/kernel_differential.h b/intern/cycles/kernel/kernel_differential.h
index 5b4290a7722..04027523ea5 100644
--- a/intern/cycles/kernel/kernel_differential.h
+++ b/intern/cycles/kernel/kernel_differential.h
@@ -49,9 +49,9 @@ __device void differential_dudv(differential *du, differential *dv, float3 dPdu,
 	 * mainly used for differentials of arbitrary mesh attributes. */
 
 	/* find most stable axis to project to 2D */
-	float xn= fabsf(Ng.x);
-	float yn= fabsf(Ng.y);
-	float zn= fabsf(Ng.z);
+	float xn = fabsf(Ng.x);
+	float yn = fabsf(Ng.y);
+	float zn = fabsf(Ng.z);
 
 	if(zn < xn || zn < yn) {
 		if(yn < xn || yn < zn) {
diff --git a/intern/cycles/kernel/kernel_emission.h b/intern/cycles/kernel/kernel_emission.h
index 0ef1425e68a..53d53b4bedd 100644
--- a/intern/cycles/kernel/kernel_emission.h
+++ b/intern/cycles/kernel/kernel_emission.h
@@ -44,7 +44,7 @@ __device float3 direct_emissive_eval(KernelGlobals *kg, float rando,
 		ls->Ng = sd.Ng;
 
 		/* no path flag, we're evaluating this for all closures. that's weak but
-		   we'd have to do multiple evaluations otherwise */
+		 * we'd have to do multiple evaluations otherwise */
 		shader_eval_surface(kg, &sd, rando, 0);
 
 		/* evaluate emissive closure */
@@ -67,7 +67,7 @@ __device bool direct_emission(KernelGlobals *kg, ShaderData *sd, int lindex,
 
 	float pdf = -1.0f;
 
-#ifdef __MULTI_LIGHT__
+#ifdef __NON_PROGRESSIVE__
 	if(lindex != -1) {
 		/* sample position on a specified light */
 		light_select(kg, lindex, randu, randv, sd->P, &ls, &pdf);
@@ -104,13 +104,8 @@ __device bool direct_emission(KernelGlobals *kg, ShaderData *sd, int lindex,
 		float mis_weight = power_heuristic(pdf, bsdf_pdf);
 		light_eval *= mis_weight;
 	}
-	/* todo: clean up these weights */
-	else if(ls.shader & SHADER_AREA_LIGHT)
-		light_eval *= 0.25f; /* area lamp */
-	else if(ls.t != FLT_MAX)
-		light_eval *= 0.25f*M_1_PI_F; /* point lamp */
 	
-	bsdf_eval_mul(eval, light_eval/pdf);
+	bsdf_eval_mul(eval, light_eval*(ls.eval_fac/pdf));
 
 	if(bsdf_eval_is_zero(eval))
 		return false;
@@ -150,7 +145,7 @@ __device float3 indirect_emission(KernelGlobals *kg, ShaderData *sd, float t, in
 
 	if(!(path_flag & PATH_RAY_MIS_SKIP) && (sd->flag & SD_SAMPLE_AS_LIGHT)) {
 		/* multiple importance sampling, get triangle light pdf,
-		   and compute weight with respect to BSDF pdf */
+		 * and compute weight with respect to BSDF pdf */
 		float pdf = triangle_light_pdf(kg, sd->Ng, sd->I, t);
 		float mis_weight = power_heuristic(bsdf_pdf, pdf);
 
@@ -177,7 +172,7 @@ __device float3 indirect_background(KernelGlobals *kg, Ray *ray, int path_flag,
 
 	if(!(path_flag & PATH_RAY_MIS_SKIP) && res) {
 		/* multiple importance sampling, get background light pdf for ray
-		   direction, and compute weight with respect to BSDF pdf */
+		 * direction, and compute weight with respect to BSDF pdf */
 		float pdf = background_light_pdf(kg, ray->D);
 		float mis_weight = power_heuristic(bsdf_pdf, pdf);
 
diff --git a/intern/cycles/kernel/kernel_globals.h b/intern/cycles/kernel/kernel_globals.h
index 1f2fc97e685..a99fffbc519 100644
--- a/intern/cycles/kernel/kernel_globals.h
+++ b/intern/cycles/kernel/kernel_globals.h
@@ -29,9 +29,9 @@
 CCL_NAMESPACE_BEGIN
 
 /* On the CPU, we pass along the struct KernelGlobals to nearly everywhere in
-   the kernel, to access constant data. These are all stored as "textures", but
-   these are really just standard arrays. We can't use actually globals because
-   multiple renders may be running inside the same process. */
+ * the kernel, to access constant data. These are all stored as "textures", but
+ * these are really just standard arrays. We can't use actually globals because
+ * multiple renders may be running inside the same process. */
 
 #ifdef __KERNEL_CPU__
 
@@ -45,7 +45,7 @@ typedef struct KernelGlobals {
 
 #ifdef __OSL__
 	/* On the CPU, we also have the OSL globals here. Most data structures are shared
-	   with SVM, the difference is in the shaders and object/mesh attributes. */
+	 * with SVM, the difference is in the shaders and object/mesh attributes. */
 	OSLGlobals osl;
 #endif
 
@@ -54,9 +54,9 @@ typedef struct KernelGlobals {
 #endif
 
 /* For CUDA, constant memory textures must be globals, so we can't put them
-   into a struct. As a result we don't actually use this struct and use actual
-   globals and simply pass along a NULL pointer everywhere, which we hope gets
-   optimized out. */
+ * into a struct. As a result we don't actually use this struct and use actual
+ * globals and simply pass along a NULL pointer everywhere, which we hope gets
+ * optimized out. */
 
 #ifdef __KERNEL_CUDA__
 
diff --git a/intern/cycles/kernel/kernel_light.h b/intern/cycles/kernel/kernel_light.h
index e9e7fbd4ca1..1084415d0cf 100644
--- a/intern/cycles/kernel/kernel_light.h
+++ b/intern/cycles/kernel/kernel_light.h
@@ -23,6 +23,7 @@ typedef struct LightSample {
 	float3 D;
 	float3 Ng;
 	float t;
+	float eval_fac;
 	int object;
 	int prim;
 	int shader;
@@ -63,8 +64,8 @@ __device float3 area_light_sample(float3 axisu, float3 axisv, float randu, float
 __device float3 background_light_sample(KernelGlobals *kg, float randu, float randv, float *pdf)
 {
 	/* for the following, the CDF values are actually a pair of floats, with the
-	   function value as X and the actual CDF as Y.  The last entry's function
-	   value is the CDF total. */
+	 * function value as X and the actual CDF as Y.  The last entry's function
+	 * value is the CDF total. */
 	int res = kernel_data.integrator.pdf_background_res;
 	int cdf_count = res + 1;
 
@@ -189,6 +190,7 @@ __device void regular_light_sample(KernelGlobals *kg, int point,
 		ls->Ng = D;
 		ls->D = -D;
 		ls->t = FLT_MAX;
+		ls->eval_fac = 1.0f;
 	}
 #ifdef __BACKGROUND_MIS__
 	else if(type == LIGHT_BACKGROUND) {
@@ -199,6 +201,7 @@ __device void regular_light_sample(KernelGlobals *kg, int point,
 		ls->Ng = D;
 		ls->D = -D;
 		ls->t = FLT_MAX;
+		ls->eval_fac = 1.0f;
 	}
 #endif
 	else {
@@ -212,6 +215,36 @@ __device void regular_light_sample(KernelGlobals *kg, int point,
 				ls->P += sphere_light_sample(P, ls->P, size, randu, randv);
 
 			ls->Ng = normalize(P - ls->P);
+			ls->eval_fac = 0.25f*M_1_PI_F;
+		}
+		else if(type == LIGHT_SPOT) {
+			float4 data2 = kernel_tex_fetch(__light_data, point*LIGHT_SIZE + 2);
+			float size = data1.y;
+
+			/* spot light */
+			if(size > 0.0f)
+				ls->P += sphere_light_sample(P, ls->P, size, randu, randv);
+
+			float3 dir = make_float3(data1.z, data1.w, data2.x);
+			float3 I = normalize(P - ls->P);
+
+			float spot_angle = data2.y;
+			float spot_smooth = data2.z;
+
+			float eval_fac = dot(dir, I);
+
+			if(eval_fac <= spot_angle) {
+				eval_fac = 0.0f;
+			}
+			else {
+				float t = eval_fac - spot_angle;
+
+				if(t < spot_smooth && spot_smooth != 0.0f)
+					eval_fac *= smoothstepf(t/spot_smooth);
+			}
+
+			ls->Ng = I;
+			ls->eval_fac = eval_fac*0.25f*M_1_PI_F;
 		}
 		else {
 			/* area light */
@@ -224,6 +257,7 @@ __device void regular_light_sample(KernelGlobals *kg, int point,
 
 			ls->P += area_light_sample(axisu, axisv, randu, randv);
 			ls->Ng = D;
+			ls->eval_fac = 0.25f;
 		}
 
 		ls->t = 0.0f;
@@ -262,6 +296,7 @@ __device void triangle_light_sample(KernelGlobals *kg, int prim, int object,
 	ls->prim = prim;
 	ls->t = 0.0f;
 	ls->type = LIGHT_AREA;
+	ls->eval_fac = 1.0f;
 
 #ifdef __INSTANCING__
 	/* instance transform */
@@ -291,9 +326,9 @@ __device float triangle_light_pdf(KernelGlobals *kg,
 __device int light_distribution_sample(KernelGlobals *kg, float randt)
 {
 	/* this is basically std::upper_bound as used by pbrt, to find a point light or
-	   triangle to emit from, proportional to area. a good improvement would be to
-	   also sample proportional to power, though it's not so well defined with
-	   OSL shaders. */
+	 * triangle to emit from, proportional to area. a good improvement would be to
+	 * also sample proportional to power, though it's not so well defined with
+	 * OSL shaders. */
 	int first = 0;
 	int len = kernel_data.integrator.num_distribution + 1;
 
@@ -353,9 +388,19 @@ __device float light_sample_pdf(KernelGlobals *kg, LightSample *ls, float3 I, fl
 	return pdf;
 }
 
+__device int light_select_num_samples(KernelGlobals *kg, int index)
+{
+	float4 data3 = kernel_tex_fetch(__light_data, index*LIGHT_SIZE + 3);
+	return __float_as_int(data3.x);
+}
+
 __device void light_select(KernelGlobals *kg, int index, float randu, float randv, float3 P, LightSample *ls, float *pdf)
 {
 	regular_light_sample(kg, index, randu, randv, P, ls, pdf);
+
+	/* compute incoming direction and distance */
+	if(ls->t != FLT_MAX)
+		ls->D = normalize_len(ls->P - P, &ls->t);
 }
 
 __device float light_select_pdf(KernelGlobals *kg, LightSample *ls, float3 I, float t)
diff --git a/intern/cycles/kernel/kernel_montecarlo.h b/intern/cycles/kernel/kernel_montecarlo.h
index bdd147f83d3..939f3915b6c 100644
--- a/intern/cycles/kernel/kernel_montecarlo.h
+++ b/intern/cycles/kernel/kernel_montecarlo.h
@@ -28,7 +28,7 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef __KERNEL_MONTECARLO_CL__
 #define __KERNEL_MONTECARLO_CL__
diff --git a/intern/cycles/kernel/kernel_object.h b/intern/cycles/kernel/kernel_object.h
index 05c45c490d8..18e0b1e8a87 100644
--- a/intern/cycles/kernel/kernel_object.h
+++ b/intern/cycles/kernel/kernel_object.h
@@ -154,10 +154,35 @@ __device_inline float object_random_number(KernelGlobals *kg, int object)
 	return f.z;
 }
 
+__device_inline uint object_particle_id(KernelGlobals *kg, int object)
+{
+	if(object == ~0)
+		return 0.0f;
+
+	int offset = object*OBJECT_SIZE + OBJECT_PROPERTIES;
+	float4 f = kernel_tex_fetch(__objects, offset);
+	return __float_as_int(f.w);
+}
+
 __device int shader_pass_id(KernelGlobals *kg, ShaderData *sd)
 {
 	return kernel_tex_fetch(__shader_flag, (sd->shader & SHADER_MASK)*2 + 1);
 }
 
+__device float particle_age(KernelGlobals *kg, int particle)
+{
+	int offset = particle*PARTICLE_SIZE;
+	float4 f = kernel_tex_fetch(__particles, offset);
+	return f.x;
+}
+
+__device float particle_lifetime(KernelGlobals *kg, int particle)
+{
+	int offset = particle*PARTICLE_SIZE;
+	float4 f = kernel_tex_fetch(__particles, offset);
+	return f.y;
+}
+
+
 CCL_NAMESPACE_END
 
diff --git a/intern/cycles/kernel/kernel_optimized.cpp b/intern/cycles/kernel/kernel_optimized.cpp
index 393686bb203..0b662095133 100644
--- a/intern/cycles/kernel/kernel_optimized.cpp
+++ b/intern/cycles/kernel/kernel_optimized.cpp
@@ -17,8 +17,8 @@
  */
 
 /* Optimized CPU kernel entry points. This file is compiled with SSE3
-   optimization flags and nearly all functions inlined, while kernel.cpp
-   is compiled without for other CPU's. */
+ * optimization flags and nearly all functions inlined, while kernel.cpp
+ * is compiled without for other CPU's. */
 
 #ifdef WITH_OPTIMIZED_KERNEL
 
diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h
index e0e17ee57dc..98ab9169c21 100644
--- a/intern/cycles/kernel/kernel_path.h
+++ b/intern/cycles/kernel/kernel_path.h
@@ -59,7 +59,7 @@ __device_inline void path_state_init(PathState *state)
 __device_inline void path_state_next(KernelGlobals *kg, PathState *state, int label)
 {
 	/* ray through transparent keeps same flags from previous ray and is
-	   not counted as a regular bounce, transparent has separate max */
+	 * not counted as a regular bounce, transparent has separate max */
 	if(label & LABEL_TRANSPARENT) {
 		state->flag |= PATH_RAY_TRANSPARENT;
 		state->transparent_bounce++;
@@ -137,9 +137,12 @@ __device_inline float path_state_terminate_probability(KernelGlobals *kg, PathSt
 		   (state->diffuse_bounce >= kernel_data.integrator.max_diffuse_bounce) ||
 		   (state->glossy_bounce >= kernel_data.integrator.max_glossy_bounce) ||
 		   (state->transmission_bounce >= kernel_data.integrator.max_transmission_bounce))
+		{
 			return 0.0f;
-		else if(state->bounce <= kernel_data.integrator.min_bounce)
+		}
+		else if(state->bounce <= kernel_data.integrator.min_bounce) {
 			return 1.0f;
+		}
 	}
 
 	/* probalistic termination */
@@ -159,13 +162,13 @@ __device_inline bool shadow_blocked(KernelGlobals *kg, PathState *state, Ray *ra
 #ifdef __TRANSPARENT_SHADOWS__
 	if(result && kernel_data.integrator.transparent_shadows) {
 		/* transparent shadows work in such a way to try to minimize overhead
-		   in cases where we don't need them. after a regular shadow ray is
-		   cast we check if the hit primitive was potentially transparent, and
-		   only in that case start marching. this gives on extra ray cast for
-		   the cases were we do want transparency.
-		   
-		   also note that for this to work correct, multi close sampling must
-		   be used, since we don't pass a random number to shader_eval_surface */
+		 * in cases where we don't need them. after a regular shadow ray is
+		 * cast we check if the hit primitive was potentially transparent, and
+		 * only in that case start marching. this gives on extra ray cast for
+		 * the cases were we do want transparency.
+		 *
+		 * also note that for this to work correct, multi close sampling must
+		 * be used, since we don't pass a random number to shader_eval_surface */
 		if(shader_transparent_shadow(kg, &isect)) {
 			float3 throughput = make_float3(1.0f, 1.0f, 1.0f);
 			float3 Pend = ray->P + ray->D*ray->t;
@@ -215,7 +218,7 @@ __device_inline bool shadow_blocked(KernelGlobals *kg, PathState *state, Ray *ra
 	return result;
 }
 
-__device float4 kernel_path_integrate(KernelGlobals *kg, RNG *rng, int sample, Ray ray, __global float *buffer)
+__device float4 kernel_path_progressive(KernelGlobals *kg, RNG *rng, int sample, Ray ray, __global float *buffer)
 {
 	/* initialize */
 	PathRadiance L;
@@ -266,7 +269,7 @@ __device float4 kernel_path_integrate(KernelGlobals *kg, RNG *rng, int sample, R
 		kernel_write_data_passes(kg, buffer, &L, &sd, sample, state.flag, throughput);
 
 		/* blurring of bsdf after bounces, for rays that have a small likelihood
-		   of following this particular path (diffuse, rough glossy) */
+		 * of following this particular path (diffuse, rough glossy) */
 		if(kernel_data.integrator.filter_glossy != FLT_MAX) {
 			float blur_pdf = kernel_data.integrator.filter_glossy*min_ray_pdf;
 
@@ -305,8 +308,8 @@ __device float4 kernel_path_integrate(KernelGlobals *kg, RNG *rng, int sample, R
 #endif
 
 		/* path termination. this is a strange place to put the termination, it's
-		   mainly due to the mixed in MIS that we use. gives too many unneeded
-		   shader evaluations, only need emission if we are going to terminate */
+		 * mainly due to the mixed in MIS that we use. gives too many unneeded
+		 * shader evaluations, only need emission if we are going to terminate */
 		float probability = path_state_terminate_probability(kg, &state, throughput);
 		float terminate = path_rng(kg, rng, sample, rng_offset + PRNG_TERMINATE);
 
@@ -363,26 +366,189 @@ __device float4 kernel_path_integrate(KernelGlobals *kg, RNG *rng, int sample, R
 				light_ray.time = sd.time;
 #endif
 
-#ifdef __MULTI_LIGHT__
-				/* index -1 means randomly sample from distribution */
-				int i = (kernel_data.integrator.num_distribution)? -1: 0;
+				if(direct_emission(kg, &sd, -1, light_t, light_o, light_u, light_v, &light_ray, &L_light, &is_lamp)) {
+					/* trace shadow ray */
+					float3 shadow;
 
-				for(; i < kernel_data.integrator.num_all_lights; i++) {
-#else
-				const int i = -1;
+					if(!shadow_blocked(kg, &state, &light_ray, &shadow)) {
+						/* accumulate */
+						path_radiance_accum_light(&L, throughput, &L_light, shadow, state.bounce, is_lamp);
+					}
+				}
+			}
+		}
 #endif
-					if(direct_emission(kg, &sd, i, light_t, light_o, light_u, light_v, &light_ray, &L_light, &is_lamp)) {
-						/* trace shadow ray */
-						float3 shadow;
 
-						if(!shadow_blocked(kg, &state, &light_ray, &shadow)) {
-							/* accumulate */
-							path_radiance_accum_light(&L, throughput, &L_light, shadow, state.bounce, is_lamp);
-						}
-					}
-#ifdef __MULTI_LIGHT__
+		/* no BSDF? we can stop here */
+		if(!(sd.flag & SD_BSDF))
+			break;
+
+		/* sample BSDF */
+		float bsdf_pdf;
+		BsdfEval bsdf_eval;
+		float3 bsdf_omega_in;
+		differential3 bsdf_domega_in;
+		float bsdf_u = path_rng(kg, rng, sample, rng_offset + PRNG_BSDF_U);
+		float bsdf_v = path_rng(kg, rng, sample, rng_offset + PRNG_BSDF_V);
+		int label;
+
+		label = shader_bsdf_sample(kg, &sd, bsdf_u, bsdf_v, &bsdf_eval,
+			&bsdf_omega_in, &bsdf_domega_in, &bsdf_pdf);
+
+		shader_release(kg, &sd);
+
+		if(bsdf_pdf == 0.0f || bsdf_eval_is_zero(&bsdf_eval))
+			break;
+
+		/* modify throughput */
+		path_radiance_bsdf_bounce(&L, &throughput, &bsdf_eval, bsdf_pdf, state.bounce, label);
+
+		/* set labels */
+		if(!(label & LABEL_TRANSPARENT)) {
+			ray_pdf = bsdf_pdf;
+			min_ray_pdf = fminf(bsdf_pdf, min_ray_pdf);
+		}
+
+		/* update path state */
+		path_state_next(kg, &state, label);
+
+		/* setup ray */
+		ray.P = ray_offset(sd.P, (label & LABEL_TRANSMIT)? -sd.Ng: sd.Ng);
+		ray.D = bsdf_omega_in;
+		ray.t = FLT_MAX;
+#ifdef __RAY_DIFFERENTIALS__
+		ray.dP = sd.dP;
+		ray.dD = bsdf_domega_in;
+#endif
+	}
+
+	float3 L_sum = path_radiance_sum(kg, &L);
+
+#ifdef __CLAMP_SAMPLE__
+	path_radiance_clamp(&L, &L_sum, kernel_data.integrator.sample_clamp);
+#endif
+
+	kernel_write_light_passes(kg, buffer, &L, sample);
+
+	return make_float4(L_sum.x, L_sum.y, L_sum.z, 1.0f - L_transparent);
+}
+
+#ifdef __NON_PROGRESSIVE__
+
+__device void kernel_path_indirect(KernelGlobals *kg, RNG *rng, int sample, Ray ray, __global float *buffer,
+	float3 throughput, float min_ray_pdf, float ray_pdf, PathState state, int rng_offset, PathRadiance *L)
+{
+	/* path iteration */
+	for(;; rng_offset += PRNG_BOUNCE_NUM) {
+		/* intersect scene */
+		Intersection isect;
+		uint visibility = path_state_ray_visibility(kg, &state);
+
+		if(!scene_intersect(kg, &ray, visibility, &isect)) {
+#ifdef __BACKGROUND__
+			/* sample background shader */
+			float3 L_background = indirect_background(kg, &ray, state.flag, ray_pdf);
+			path_radiance_accum_background(L, throughput, L_background, state.bounce);
+#endif
+
+			break;
+		}
+
+		/* setup shading */
+		ShaderData sd;
+		shader_setup_from_ray(kg, &sd, &isect, &ray);
+		float rbsdf = path_rng(kg, rng, sample, rng_offset + PRNG_BSDF);
+		shader_eval_surface(kg, &sd, rbsdf, state.flag);
+		shader_merge_closures(kg, &sd);
+
+		/* blurring of bsdf after bounces, for rays that have a small likelihood
+		 * of following this particular path (diffuse, rough glossy) */
+		if(kernel_data.integrator.filter_glossy != FLT_MAX) {
+			float blur_pdf = kernel_data.integrator.filter_glossy*min_ray_pdf;
+
+			if(blur_pdf < 1.0f) {
+				float blur_roughness = sqrtf(1.0f - blur_pdf)*0.5f;
+				shader_bsdf_blur(kg, &sd, blur_roughness);
+			}
+		}
+
+#ifdef __EMISSION__
+		/* emission */
+		if(sd.flag & SD_EMISSION) {
+			float3 emission = indirect_emission(kg, &sd, isect.t, state.flag, ray_pdf);
+			path_radiance_accum_emission(L, throughput, emission, state.bounce);
+		}
+#endif
+
+		/* path termination. this is a strange place to put the termination, it's
+		 * mainly due to the mixed in MIS that we use. gives too many unneeded
+		 * shader evaluations, only need emission if we are going to terminate */
+		float probability = path_state_terminate_probability(kg, &state, throughput);
+		float terminate = path_rng(kg, rng, sample, rng_offset + PRNG_TERMINATE);
+
+		if(terminate >= probability)
+			break;
+
+		throughput /= probability;
+
+#ifdef __AO__
+		/* ambient occlusion */
+		if(kernel_data.integrator.use_ambient_occlusion) {
+			/* todo: solve correlation */
+			float bsdf_u = path_rng(kg, rng, sample, rng_offset + PRNG_BSDF_U);
+			float bsdf_v = path_rng(kg, rng, sample, rng_offset + PRNG_BSDF_V);
+
+			float3 ao_D;
+			float ao_pdf;
+
+			sample_cos_hemisphere(sd.N, bsdf_u, bsdf_v, &ao_D, &ao_pdf);
+
+			if(dot(sd.Ng, ao_D) > 0.0f && ao_pdf != 0.0f) {
+				Ray light_ray;
+				float3 ao_shadow;
+
+				light_ray.P = ray_offset(sd.P, sd.Ng);
+				light_ray.D = ao_D;
+				light_ray.t = kernel_data.background.ao_distance;
+#ifdef __MOTION__
+				light_ray.time = sd.time;
+#endif
+
+				if(!shadow_blocked(kg, &state, &light_ray, &ao_shadow)) {
+					float3 ao_bsdf = shader_bsdf_diffuse(kg, &sd)*kernel_data.background.ao_factor;
+					path_radiance_accum_ao(L, throughput, ao_bsdf, ao_shadow, state.bounce);
 				}
+			}
+		}
 #endif
+
+#ifdef __EMISSION__
+		if(kernel_data.integrator.use_direct_light) {
+			/* sample illumination from lights to find path contribution */
+			if(sd.flag & SD_BSDF_HAS_EVAL) {
+				float light_t = path_rng(kg, rng, sample, rng_offset + PRNG_LIGHT);
+				float light_o = path_rng(kg, rng, sample, rng_offset + PRNG_LIGHT_F);
+				float light_u = path_rng(kg, rng, sample, rng_offset + PRNG_LIGHT_U);
+				float light_v = path_rng(kg, rng, sample, rng_offset + PRNG_LIGHT_V);
+
+				Ray light_ray;
+				BsdfEval L_light;
+				bool is_lamp;
+
+#ifdef __MOTION__
+				light_ray.time = sd.time;
+#endif
+
+				/* sample random light */
+				if(direct_emission(kg, &sd, -1, light_t, light_o, light_u, light_v, &light_ray, &L_light, &is_lamp)) {
+					/* trace shadow ray */
+					float3 shadow;
+
+					if(!shadow_blocked(kg, &state, &light_ray, &shadow)) {
+						/* accumulate */
+						path_radiance_accum_light(L, throughput, &L_light, shadow, state.bounce, is_lamp);
+					}
+				}
 			}
 		}
 #endif
@@ -409,7 +575,7 @@ __device float4 kernel_path_integrate(KernelGlobals *kg, RNG *rng, int sample, R
 			break;
 
 		/* modify throughput */
-		path_radiance_bsdf_bounce(&L, &throughput, &bsdf_eval, bsdf_pdf, state.bounce, label);
+		path_radiance_bsdf_bounce(L, &throughput, &bsdf_eval, bsdf_pdf, state.bounce, label);
 
 		/* set labels */
 		if(!(label & LABEL_TRANSPARENT)) {
@@ -429,6 +595,276 @@ __device float4 kernel_path_integrate(KernelGlobals *kg, RNG *rng, int sample, R
 		ray.dD = bsdf_domega_in;
 #endif
 	}
+}
+
+__device float4 kernel_path_non_progressive(KernelGlobals *kg, RNG *rng, int sample, Ray ray, __global float *buffer)
+{
+	/* initialize */
+	PathRadiance L;
+	float3 throughput = make_float3(1.0f, 1.0f, 1.0f);
+	float L_transparent = 0.0f;
+
+	path_radiance_init(&L, kernel_data.film.use_light_pass);
+
+	float ray_pdf = 0.0f;
+	PathState state;
+	int rng_offset = PRNG_BASE_NUM;
+
+	path_state_init(&state);
+
+	for(;; rng_offset += PRNG_BOUNCE_NUM) {
+		/* intersect scene */
+		Intersection isect;
+		uint visibility = path_state_ray_visibility(kg, &state);
+
+		if(!scene_intersect(kg, &ray, visibility, &isect)) {
+			/* eval background shader if nothing hit */
+			if(kernel_data.background.transparent) {
+				L_transparent += average(throughput);
+
+#ifdef __PASSES__
+				if(!(kernel_data.film.pass_flag & PASS_BACKGROUND))
+#endif
+					break;
+			}
+
+#ifdef __BACKGROUND__
+			/* sample background shader */
+			float3 L_background = indirect_background(kg, &ray, state.flag, ray_pdf);
+			path_radiance_accum_background(&L, throughput, L_background, state.bounce);
+#endif
+
+			break;
+		}
+
+		/* setup shading */
+		ShaderData sd;
+		shader_setup_from_ray(kg, &sd, &isect, &ray);
+		float rbsdf = path_rng(kg, rng, sample, rng_offset + PRNG_BSDF);
+		shader_eval_surface(kg, &sd, rbsdf, state.flag);
+		shader_merge_closures(kg, &sd);
+
+		kernel_write_data_passes(kg, buffer, &L, &sd, sample, state.flag, throughput);
+
+		/* holdout */
+#ifdef __HOLDOUT__
+		if((sd.flag & (SD_HOLDOUT|SD_HOLDOUT_MASK))) {
+			if(kernel_data.background.transparent) {
+				float3 holdout_weight;
+				
+				if(sd.flag & SD_HOLDOUT_MASK)
+					holdout_weight = make_float3(1.0f, 1.0f, 1.0f);
+				else
+					shader_holdout_eval(kg, &sd);
+
+				/* any throughput is ok, should all be identical here */
+				L_transparent += average(holdout_weight*throughput);
+			}
+
+			if(sd.flag & SD_HOLDOUT_MASK)
+				break;
+		}
+#endif
+
+#ifdef __EMISSION__
+		/* emission */
+		if(sd.flag & SD_EMISSION) {
+			float3 emission = indirect_emission(kg, &sd, isect.t, state.flag, ray_pdf);
+			path_radiance_accum_emission(&L, throughput, emission, state.bounce);
+		}
+#endif
+
+		/* transparency termination */
+		if(state.flag & PATH_RAY_TRANSPARENT) {
+			/* path termination. this is a strange place to put the termination, it's
+			 * mainly due to the mixed in MIS that we use. gives too many unneeded
+			 * shader evaluations, only need emission if we are going to terminate */
+			float probability = path_state_terminate_probability(kg, &state, throughput);
+			float terminate = path_rng(kg, rng, sample, rng_offset + PRNG_TERMINATE);
+
+			if(terminate >= probability)
+				break;
+
+			throughput /= probability;
+		}
+
+#ifdef __AO__
+		/* ambient occlusion */
+		if(kernel_data.integrator.use_ambient_occlusion) {
+			int num_samples = kernel_data.integrator.ao_samples;
+			float num_samples_inv = 1.0f/num_samples;
+			float ao_factor = kernel_data.background.ao_factor/num_samples;
+
+			for(int j = 0; j < num_samples; j++) {
+				/* todo: solve correlation */
+				float bsdf_u = path_rng(kg, rng, sample*num_samples + j, rng_offset + PRNG_BSDF_U);
+				float bsdf_v = path_rng(kg, rng, sample*num_samples + j, rng_offset + PRNG_BSDF_V);
+
+				float3 ao_D;
+				float ao_pdf;
+
+				sample_cos_hemisphere(sd.N, bsdf_u, bsdf_v, &ao_D, &ao_pdf);
+
+				if(dot(sd.Ng, ao_D) > 0.0f && ao_pdf != 0.0f) {
+					Ray light_ray;
+					float3 ao_shadow;
+
+					light_ray.P = ray_offset(sd.P, sd.Ng);
+					light_ray.D = ao_D;
+					light_ray.t = kernel_data.background.ao_distance;
+#ifdef __MOTION__
+					light_ray.time = sd.time;
+#endif
+
+					if(!shadow_blocked(kg, &state, &light_ray, &ao_shadow)) {
+						float3 ao_bsdf = shader_bsdf_diffuse(kg, &sd)*ao_factor;
+						path_radiance_accum_ao(&L, throughput*num_samples_inv, ao_bsdf, ao_shadow, state.bounce);
+					}
+				}
+			}
+		}
+#endif
+
+#ifdef __EMISSION__
+		/* sample illumination from lights to find path contribution */
+		if(sd.flag & SD_BSDF_HAS_EVAL) {
+			Ray light_ray;
+			BsdfEval L_light;
+			bool is_lamp;
+
+#ifdef __MOTION__
+			light_ray.time = sd.time;
+#endif
+
+			/* lamp sampling */
+			for(int i = 0; i < kernel_data.integrator.num_all_lights; i++) {
+				int num_samples = light_select_num_samples(kg, i);
+				float num_samples_inv = 1.0f/(num_samples*kernel_data.integrator.num_all_lights);
+
+				if(kernel_data.integrator.pdf_triangles != 0.0f)
+					num_samples_inv *= 0.5f;
+
+				for(int j = 0; j < num_samples; j++) {
+					float light_u = path_rng(kg, rng, sample*num_samples + j, rng_offset + PRNG_LIGHT_U);
+					float light_v = path_rng(kg, rng, sample*num_samples + j, rng_offset + PRNG_LIGHT_V);
+
+					if(direct_emission(kg, &sd, i, 0.0f, 0.0f, light_u, light_v, &light_ray, &L_light, &is_lamp)) {
+						/* trace shadow ray */
+						float3 shadow;
+
+						if(!shadow_blocked(kg, &state, &light_ray, &shadow)) {
+							/* accumulate */
+							path_radiance_accum_light(&L, throughput*num_samples_inv, &L_light, shadow, state.bounce, is_lamp);
+						}
+					}
+				}
+			}
+
+			/* mesh light sampling */
+			if(kernel_data.integrator.pdf_triangles != 0.0f) {
+				int num_samples = kernel_data.integrator.mesh_light_samples;
+				float num_samples_inv = 1.0f/num_samples;
+
+				if(kernel_data.integrator.num_all_lights)
+					num_samples_inv *= 0.5f;
+
+				for(int j = 0; j < num_samples; j++) {
+					float light_t = path_rng(kg, rng, sample*num_samples + j, rng_offset + PRNG_LIGHT);
+					float light_u = path_rng(kg, rng, sample*num_samples + j, rng_offset + PRNG_LIGHT_U);
+					float light_v = path_rng(kg, rng, sample*num_samples + j, rng_offset + PRNG_LIGHT_V);
+
+					/* only sample triangle lights */
+					if(kernel_data.integrator.num_all_lights)
+						light_t = 0.5f*light_t;
+
+					if(direct_emission(kg, &sd, -1, light_t, 0.0f, light_u, light_v, &light_ray, &L_light, &is_lamp)) {
+						/* trace shadow ray */
+						float3 shadow;
+
+						if(!shadow_blocked(kg, &state, &light_ray, &shadow)) {
+							/* accumulate */
+							path_radiance_accum_light(&L, throughput*num_samples_inv, &L_light, shadow, state.bounce, is_lamp);
+						}
+					}
+				}
+			}
+		}
+#endif
+
+		for(int i = 0; i< sd.num_closure; i++) {
+			const ShaderClosure *sc = &sd.closure[i];
+
+			if(!CLOSURE_IS_BSDF(sc->type))
+				continue;
+			/* transparency is not handled here, but in outer loop */
+			if(sc->type == CLOSURE_BSDF_TRANSPARENT_ID)
+				continue;
+
+			int num_samples;
+
+			if(CLOSURE_IS_BSDF_DIFFUSE(sc->type))
+				num_samples = kernel_data.integrator.diffuse_samples;
+			else if(CLOSURE_IS_BSDF_GLOSSY(sc->type))
+				num_samples = kernel_data.integrator.glossy_samples;
+			else
+				num_samples = kernel_data.integrator.transmission_samples;
+
+			float num_samples_inv = 1.0f/num_samples;
+
+			for(int j = 0; j < num_samples; j++) {
+				/* sample BSDF */
+				float bsdf_pdf;
+				BsdfEval bsdf_eval;
+				float3 bsdf_omega_in;
+				differential3 bsdf_domega_in;
+				float bsdf_u = path_rng(kg, rng, sample*num_samples + j, rng_offset + PRNG_BSDF_U);
+				float bsdf_v = path_rng(kg, rng, sample*num_samples + j, rng_offset + PRNG_BSDF_V);
+				int label;
+
+				label = shader_bsdf_sample_closure(kg, &sd, sc, bsdf_u, bsdf_v, &bsdf_eval,
+					&bsdf_omega_in, &bsdf_domega_in, &bsdf_pdf);
+
+				if(bsdf_pdf == 0.0f || bsdf_eval_is_zero(&bsdf_eval))
+					continue;
+
+				/* modify throughput */
+				float3 tp = throughput;
+				path_radiance_bsdf_bounce(&L, &tp, &bsdf_eval, bsdf_pdf, state.bounce, label);
+
+				/* set labels */
+				float min_ray_pdf = FLT_MAX;
+
+				if(!(label & LABEL_TRANSPARENT))
+					min_ray_pdf = fminf(bsdf_pdf, min_ray_pdf);
+
+				/* modify path state */
+				PathState ps = state;
+				path_state_next(kg, &ps, label);
+
+				/* setup ray */
+				ray.P = ray_offset(sd.P, (label & LABEL_TRANSMIT)? -sd.Ng: sd.Ng);
+				ray.D = bsdf_omega_in;
+				ray.t = FLT_MAX;
+#ifdef __RAY_DIFFERENTIALS__
+				ray.dP = sd.dP;
+				ray.dD = bsdf_domega_in;
+#endif
+
+				kernel_path_indirect(kg, rng, sample*num_samples, ray, buffer,
+					tp*num_samples_inv, min_ray_pdf, bsdf_pdf, ps, rng_offset+PRNG_BOUNCE_NUM, &L);
+			}
+		}
+
+		/* continue in case of transparency */
+		throughput *= shader_bsdf_transparency(kg, &sd);
+		shader_release(kg, &sd);
+
+		if(is_zero(throughput))
+			break;
+
+		path_state_next(kg, &state, LABEL_TRANSPARENT);
+		ray.P = ray_offset(sd.P, -sd.Ng);
+	}
 
 	float3 L_sum = path_radiance_sum(kg, &L);
 
@@ -441,6 +877,8 @@ __device float4 kernel_path_integrate(KernelGlobals *kg, RNG *rng, int sample, R
 	return make_float4(L_sum.x, L_sum.y, L_sum.z, 1.0f - L_transparent);
 }
 
+#endif
+
 __device void kernel_path_trace(KernelGlobals *kg,
 	__global float *buffer, __global uint *rng_state,
 	int sample, int x, int y, int offset, int stride)
@@ -477,8 +915,16 @@ __device void kernel_path_trace(KernelGlobals *kg,
 	/* integrate */
 	float4 L;
 
-	if (ray.t != 0.f)
-		L = kernel_path_integrate(kg, &rng, sample, ray, buffer);
+	if (ray.t != 0.0f) {
+#ifdef __NON_PROGRESSIVE__
+		if(kernel_data.integrator.progressive)
+#endif
+			L = kernel_path_progressive(kg, &rng, sample, ray, buffer);
+#ifdef __NON_PROGRESSIVE__
+		else
+			L = kernel_path_non_progressive(kg, &rng, sample, ray, buffer);
+#endif
+	}
 	else
 		L = make_float4(0.f, 0.f, 0.f, 0.f);
 
diff --git a/intern/cycles/kernel/kernel_projection.h b/intern/cycles/kernel/kernel_projection.h
index a5735920cd9..64747bcb42e 100644
--- a/intern/cycles/kernel/kernel_projection.h
+++ b/intern/cycles/kernel/kernel_projection.h
@@ -28,7 +28,7 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef __KERNEL_PROJECTION_CL__
 #define __KERNEL_PROJECTION_CL__
@@ -69,20 +69,20 @@ __device float3 equirectangular_to_direction(float u, float v)
 	float theta = M_PI_F*(1.0f - v);
 
 	return make_float3(
-		sin(theta)*cos(phi),
-		sin(theta)*sin(phi),
-		cos(theta));
+		sinf(theta)*cosf(phi),
+		sinf(theta)*sinf(phi),
+		cosf(theta));
 }
 
 /* Fisheye <-> Cartesian direction */
 
 __device float2 direction_to_fisheye(float3 dir, float fov)
 {
-	float r = atan2f(sqrt(dir.y*dir.y +  dir.z*dir.z), dir.x) / fov;
-	float phi = atan2(dir.z, dir.y);
+	float r = atan2f(sqrtf(dir.y*dir.y +  dir.z*dir.z), dir.x) / fov;
+	float phi = atan2f(dir.z, dir.y);
 
-	float u = r * cos(phi) + 0.5f;
-	float v = r * sin(phi) + 0.5f;
+	float u = r * cosf(phi) + 0.5f;
+	float v = r * sinf(phi) + 0.5f;
 
 	return make_float2(u, v);
 }
@@ -92,7 +92,7 @@ __device float3 fisheye_to_direction(float u, float v, float fov)
 	u = (u - 0.5f) * 2.0f;
 	v = (v - 0.5f) * 2.0f;
 
-	float r = sqrt(u*u + v*v);
+	float r = sqrtf(u*u + v*v);
 
 	if(r > 1.0f)
 		return make_float3(0.0f, 0.0f, 0.0f);
@@ -127,7 +127,7 @@ __device float3 fisheye_equisolid_to_direction(float u, float v, float lens, flo
 	v = (v - 0.5f) * height;
 
 	float rmax = 2.0f * lens * sinf(fov * 0.25f);
-	float r = sqrt(u*u + v*v);
+	float r = sqrtf(u*u + v*v);
 
 	if(r > rmax)
 		return make_float3(0.0f, 0.0f, 0.0f);
@@ -153,7 +153,7 @@ __device float3 mirrorball_to_direction(float u, float v)
 
 	dir.x = 2.0f*u - 1.0f;
 	dir.z = 2.0f*v - 1.0f;
-	dir.y = -sqrt(max(1.0f - dir.x*dir.x - dir.z*dir.z, 0.0f));
+	dir.y = -sqrtf(max(1.0f - dir.x*dir.x - dir.z*dir.z, 0.0f));
 
 	/* reflection */
 	float3 I = make_float3(0.0f, -1.0f, 0.0f);
@@ -166,7 +166,7 @@ __device float2 direction_to_mirrorball(float3 dir)
 	/* inverse of mirrorball_to_direction */
 	dir.y -= 1.0f;
 
-	float div = 2.0f*sqrt(max(-0.5f*dir.y, 0.0f));
+	float div = 2.0f*sqrtf(max(-0.5f*dir.y, 0.0f));
 	if(div > 0.0f)
 		dir /= div;
 
diff --git a/intern/cycles/kernel/kernel_random.h b/intern/cycles/kernel/kernel_random.h
index 6d15100f8a3..9083b7cbfd7 100644
--- a/intern/cycles/kernel/kernel_random.h
+++ b/intern/cycles/kernel/kernel_random.h
@@ -23,8 +23,8 @@ typedef uint RNG;
 #ifdef __SOBOL__
 
 /* skip initial numbers that are not as well distributed, especially the
-   first sequence is just 0 everywhere, which can be problematic for e.g.
-   path termination */
+ * first sequence is just 0 everywhere, which can be problematic for e.g.
+ * path termination */
 #define SOBOL_SKIP 64
 
 /* High Dimensional Sobol */
@@ -66,7 +66,7 @@ __device uint sobol_inverse(uint i)
 }
 
 /* multidimensional sobol with generator matrices
-   dimension 0 and 1 are equal to van_der_corput() and sobol() respectively */
+ * dimension 0 and 1 are equal to van_der_corput() and sobol() respectively */
 __device uint sobol_dimension(KernelGlobals *kg, int index, int dimension)
 {
 	uint result = 0;
@@ -119,7 +119,7 @@ __device_inline float path_rng(KernelGlobals *kg, RNG *rng, int sample, int dime
 	else
 		shift = (*rng & 0xFFFF)/((float)0xFFFF);
 
-	return r + shift - floor(r + shift);
+	return r + shift - floorf(r + shift);
 #endif
 }
 
diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h
index 8e0d36705ad..bc873f4e112 100644
--- a/intern/cycles/kernel/kernel_shader.h
+++ b/intern/cycles/kernel/kernel_shader.h
@@ -407,6 +407,25 @@ __device int shader_bsdf_sample(KernelGlobals *kg, const ShaderData *sd,
 #endif
 }
 
+__device int shader_bsdf_sample_closure(KernelGlobals *kg, const ShaderData *sd,
+	const ShaderClosure *sc, float randu, float randv, BsdfEval *bsdf_eval,
+	float3 *omega_in, differential3 *domega_in, float *pdf)
+{
+	int label;
+	float3 eval;
+
+	*pdf = 0.0f;
+#ifdef __OSL__
+	label = OSLShader::bsdf_sample(sd, sc, randu, randv, eval, *omega_in, *domega_in, *pdf);
+#else
+	label = svm_bsdf_sample(sd, sc, randu, randv, &eval, omega_in, domega_in, pdf);
+#endif
+	if(*pdf != 0.0f)
+		bsdf_eval_init(bsdf_eval, sc->type, eval*sc->weight, kernel_data.film.use_light_pass);
+
+	return label;
+}
+
 __device void shader_bsdf_blur(KernelGlobals *kg, ShaderData *sd, float roughness)
 {
 #ifndef __OSL__
@@ -520,7 +539,7 @@ __device float3 shader_emissive_eval(KernelGlobals *kg, ShaderData *sd)
 
 		if(CLOSURE_IS_EMISSION(sc->type)) {
 #ifdef __OSL__
-			eval += OSLShader::emissive_eval(sd)*sc->weight;
+			eval += OSLShader::emissive_eval(sd, sc)*sc->weight;
 #else
 			eval += svm_emissive_eval(sd, sc)*sc->weight;
 #endif
@@ -624,7 +643,7 @@ __device float3 shader_volume_eval_phase(KernelGlobals *kg, ShaderData *sd,
 
 		if(CLOSURE_IS_VOLUME(sc->type)) {
 #ifdef __OSL__
-			eval += OSLShader::volume_eval_phase(sd, omega_in, omega_out);
+			eval += OSLShader::volume_eval_phase(sd, sc, omega_in, omega_out);
 #else
 			eval += volume_eval_phase(sd, sc, omega_in, omega_out);
 #endif
@@ -679,6 +698,35 @@ __device bool shader_transparent_shadow(KernelGlobals *kg, Intersection *isect)
 }
 #endif
 
+/* Merging */
+
+#ifdef __NON_PROGRESSIVE__
+__device void shader_merge_closures(KernelGlobals *kg, ShaderData *sd)
+{
+#ifndef __OSL__
+	/* merge identical closures, better when we sample a single closure at a time */
+	for(int i = 0; i < sd->num_closure; i++) {
+		ShaderClosure *sci = &sd->closure[i];
+
+		for(int j = i + 1; j < sd->num_closure; j++) {
+			ShaderClosure *scj = &sd->closure[j];
+
+			if(sci->type == scj->type && sci->data0 == scj->data0 && sci->data1 == scj->data1) {
+				sci->weight += scj->weight;
+				sci->sample_weight += scj->sample_weight;
+
+				int size = sd->num_closure - (j+1);
+				if(size > 0)
+					memmove(scj, scj+1, size*sizeof(ShaderClosure));
+
+				sd->num_closure--;
+			}
+		}
+	}
+#endif
+}
+#endif
+
 /* Free ShaderData */
 
 __device void shader_release(KernelGlobals *kg, ShaderData *sd)
diff --git a/intern/cycles/kernel/kernel_textures.h b/intern/cycles/kernel/kernel_textures.h
index 4ab2574c8ad..c1b8eed3dff 100644
--- a/intern/cycles/kernel/kernel_textures.h
+++ b/intern/cycles/kernel/kernel_textures.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright 2011, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
 
 #ifndef KERNEL_TEX
 #define KERNEL_TEX(type, ttype, name)
@@ -35,6 +52,9 @@ KERNEL_TEX(float4, texture_float4, __light_data)
 KERNEL_TEX(float2, texture_float2, __light_background_marginal_cdf)
 KERNEL_TEX(float2, texture_float2, __light_background_conditional_cdf)
 
+/* particles */
+KERNEL_TEX(float4, texture_float4, __particles)
+
 /* shaders */
 KERNEL_TEX(uint4, texture_uint4, __svm_nodes)
 KERNEL_TEX(uint, texture_uint, __shader_flag)
diff --git a/intern/cycles/kernel/kernel_triangle.h b/intern/cycles/kernel/kernel_triangle.h
index 674c3b52539..384c3a8a506 100644
--- a/intern/cycles/kernel/kernel_triangle.h
+++ b/intern/cycles/kernel/kernel_triangle.h
@@ -208,7 +208,7 @@ __device float4 triangle_motion_vector(KernelGlobals *kg, ShaderData *sd)
 		motion_post = triangle_attribute_float3(kg, sd, ATTR_ELEMENT_VERTEX, offset_post, NULL, NULL);
 
 	/* object motion. note that depending on the mesh having motion vectors, this
-	   transformation was set match the world/object space of motion_pre/post */
+	 * transformation was set match the world/object space of motion_pre/post */
 	Transform tfm;
 	
 	tfm = object_fetch_transform(kg, sd->object, TIME_INVALID, OBJECT_TRANSFORM_MOTION_PRE);
@@ -220,7 +220,7 @@ __device float4 triangle_motion_vector(KernelGlobals *kg, ShaderData *sd)
 	float3 P;
 
 	/* camera motion, for perspective/orthographic motion.pre/post will be a
-	   world-to-raster matrix, for panorama it's world-to-camera */
+	 * world-to-raster matrix, for panorama it's world-to-camera */
 	if (kernel_data.cam.type != CAMERA_PANORAMA) {
 		tfm = kernel_data.cam.worldtoraster;
 		P = transform_perspective(&tfm, sd->P);
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index a64c850d35a..d204b114b8e 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -33,12 +33,17 @@ CCL_NAMESPACE_BEGIN
 #define LIGHT_SIZE			4
 #define FILTER_TABLE_SIZE	256
 #define RAMP_TABLE_SIZE		256
+#define PARTICLE_SIZE 		1
 #define TIME_INVALID		FLT_MAX
 
 /* device capabilities */
 #ifdef __KERNEL_CPU__
 #define __KERNEL_SHADING__
 #define __KERNEL_ADV_SHADING__
+#ifdef WITH_OSL
+#define __OSL__
+#endif
+#define __NON_PROGRESSIVE__
 #endif
 
 #ifdef __KERNEL_CUDA__
@@ -106,8 +111,6 @@ CCL_NAMESPACE_BEGIN
 //#define __MOTION__
 #endif
 
-//#define __MULTI_LIGHT__
-//#define __OSL__
 //#define __SOBOL_FULL_SCREEN__
 //#define __QBVH__
 
@@ -283,7 +286,8 @@ typedef enum LightType {
 	LIGHT_DISTANT,
 	LIGHT_BACKGROUND,
 	LIGHT_AREA,
-	LIGHT_AO
+	LIGHT_AO,
+	LIGHT_SPOT
 } LightType;
 
 /* Camera Type */
@@ -356,6 +360,7 @@ typedef enum AttributeStandard {
 	ATTR_STD_POSITION_UNDISPLACED,
 	ATTR_STD_MOTION_PRE,
 	ATTR_STD_MOTION_POST,
+	ATTR_STD_PARTICLE,
 	ATTR_STD_NUM,
 
 	ATTR_STD_NOT_FOUND = ~0
@@ -622,6 +627,15 @@ typedef struct KernelIntegrator {
 
 	/* clamp */
 	float sample_clamp;
+
+	/* non-progressive */
+	int progressive;
+	int diffuse_samples;
+	int glossy_samples;
+	int transmission_samples;
+	int ao_samples;
+	int mesh_light_samples;
+	int pad1, pad2;
 } KernelIntegrator;
 
 typedef struct KernelBVH {
diff --git a/intern/cycles/kernel/osl/background.cpp b/intern/cycles/kernel/osl/background.cpp
index c35119ae9cf..81812a46b6c 100644
--- a/intern/cycles/kernel/osl/background.cpp
+++ b/intern/cycles/kernel/osl/background.cpp
@@ -48,17 +48,17 @@ using namespace OSL;
 ///
 class GenericBackgroundClosure : public BackgroundClosure {
 public:
-    GenericBackgroundClosure() { }
+	GenericBackgroundClosure() {}
 
-    void setup() {};
+	void setup() {};
 
-    size_t memsize () const { return sizeof(*this); }
+	size_t memsize() const { return sizeof(*this); }
 
-    const char *name () const { return "background"; }
+	const char *name() const { return "background"; }
 
-    void print_on (std::ostream &out) const {
-        out << name() << " ()";
-    }
+	void print_on(std::ostream &out) const {
+		out << name() << " ()";
+	}
 
 };
 
@@ -72,27 +72,29 @@ public:
 ///
 class HoldoutClosure : ClosurePrimitive {
 public:
-    HoldoutClosure () : ClosurePrimitive (Holdout) { }
+	HoldoutClosure () : ClosurePrimitive(Holdout) {}
 
-    void setup() {};
+	void setup() {};
 
-    size_t memsize () const { return sizeof(*this); }
+	size_t memsize() const { return sizeof(*this); }
 
-    const char *name () const { return "holdout"; }
+	const char *name() const { return "holdout"; }
 
-    void print_on (std::ostream &out) const {
-        out << name() << " ()";
-    }
+	void print_on(std::ostream &out) const {
+		out << name() << " ()";
+	}
 };
 
 ClosureParam closure_background_params[] = {
-    CLOSURE_STRING_KEYPARAM("label"),
-    CLOSURE_FINISH_PARAM(GenericBackgroundClosure) };
+	CLOSURE_STRING_KEYPARAM("label"),
+	CLOSURE_FINISH_PARAM(GenericBackgroundClosure)
+};
 
 CLOSURE_PREPARE(closure_background_prepare, GenericBackgroundClosure)
 
 ClosureParam closure_holdout_params[] = {
-    CLOSURE_FINISH_PARAM(HoldoutClosure) };
+	CLOSURE_FINISH_PARAM(HoldoutClosure)
+};
 
 CLOSURE_PREPARE(closure_holdout_prepare, HoldoutClosure)
 
diff --git a/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp b/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp
index a38c5b55cf5..cb6be6959f5 100644
--- a/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp
+++ b/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp
@@ -36,138 +36,142 @@
 
 #include "osl_closures.h"
 
+#include "util_math.h"
+
 CCL_NAMESPACE_BEGIN
 
 using namespace OSL;
 
 class AshikhminVelvetClosure : public BSDFClosure {
 public:
-    Vec3 m_N;
-    float m_sigma;
-    float m_invsigma2;
-
-    AshikhminVelvetClosure() : BSDFClosure(Labels::DIFFUSE) { }
-
-    void setup()
-    {
-        m_sigma = std::max(m_sigma, 0.01f);
-        m_invsigma2 = 1.0f/(m_sigma * m_sigma);
-    }
-
-    bool mergeable (const ClosurePrimitive *other) const {
-        const AshikhminVelvetClosure *comp = (const AshikhminVelvetClosure *)other;
-        return m_N == comp->m_N && m_sigma == comp->m_sigma &&
-            BSDFClosure::mergeable(other);
-    }
-
-    size_t memsize () const { return sizeof(*this); }
-
-    const char *name () const { return "ashikhmin_velvet"; }
-
-    void print_on (std::ostream &out) const
-    {
-        out << name() << " (";
-        out << "(" << m_N[0] << ", " << m_N[1] << ", " << m_N[2] << "), ";
-        out << m_sigma;
-        out << ")";
-    }
-
-    float albedo (const Vec3 &omega_out) const
-    {
+	Vec3 m_N;
+	float m_sigma;
+	float m_invsigma2;
+
+	AshikhminVelvetClosure() : BSDFClosure(Labels::DIFFUSE) {}
+
+	void setup()
+	{
+		m_sigma = max(m_sigma, 0.01f);
+		m_invsigma2 = 1.0f / (m_sigma * m_sigma);
+	}
+
+	bool mergeable(const ClosurePrimitive *other) const {
+		const AshikhminVelvetClosure *comp = (const AshikhminVelvetClosure *)other;
+		return m_N == comp->m_N && m_sigma == comp->m_sigma &&
+		       BSDFClosure::mergeable(other);
+	}
+
+	size_t memsize() const { return sizeof(*this); }
+
+	const char *name() const { return "ashikhmin_velvet"; }
+
+	void print_on(std::ostream &out) const
+	{
+		out << name() << " (";
+		out << "(" << m_N[0] << ", " << m_N[1] << ", " << m_N[2] << "), ";
+		out << m_sigma;
+		out << ")";
+	}
+
+	float albedo(const Vec3 &omega_out) const
+	{
 		return 1.0f;
-    }
-
-    Color3 eval_reflect (const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
-    {
-        float cosNO = m_N.dot(omega_out);
-        float cosNI = m_N.dot(omega_in);
-        if (cosNO > 0 && cosNI > 0) {
-            Vec3 H = omega_in + omega_out;
-            H.normalize();
-
-            float cosNH = m_N.dot(H);
-            float cosHO = fabsf(omega_out.dot(H));
-
-            float cosNHdivHO = cosNH / cosHO;
-            cosNHdivHO = std::max(cosNHdivHO, 0.00001f);
-
-            float fac1 = 2 * fabsf(cosNHdivHO * cosNO);
-            float fac2 = 2 * fabsf(cosNHdivHO * cosNI);
-
-            float sinNH2 = 1 - cosNH * cosNH;
-            float sinNH4 = sinNH2 * sinNH2;
-            float cotangent2 =  (cosNH * cosNH) / sinNH2; 
-
-            float D = expf(-cotangent2 * m_invsigma2) * m_invsigma2 * float(M_1_PI) / sinNH4;
-            float G = std::min(1.0f, std::min(fac1, fac2)); // TODO: derive G from D analytically
-
-            float out = 0.25f * (D * G) / cosNO;
-
-            pdf = 0.5f * (float) M_1_PI;
-            return Color3 (out, out, out);
-        }
-        return Color3 (0, 0, 0);
-    }
-
-    Color3 eval_transmit (const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
-    {
-        return Color3 (0, 0, 0);
-    }
-
-    ustring sample (const Vec3 &Ng,
-                 const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
-                 float randu, float randv,
-                 Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
-                 float &pdf, Color3 &eval) const
-    {
-        // we are viewing the surface from above - send a ray out with uniform
-        // distribution over the hemisphere
-        sample_uniform_hemisphere (m_N, omega_out, randu, randv, omega_in, pdf);
-        if (Ng.dot(omega_in) > 0) {
-            Vec3 H = omega_in + omega_out;
-            H.normalize();
-
-            float cosNI = m_N.dot(omega_in);
-            float cosNO = m_N.dot(omega_out);
-            float cosNH = m_N.dot(H);
-            float cosHO = fabsf(omega_out.dot(H));
-
-            float cosNHdivHO = cosNH / cosHO;
-            cosNHdivHO = std::max(cosNHdivHO, 0.00001f);
-
-            float fac1 = 2 * fabsf(cosNHdivHO * cosNO);
-            float fac2 = 2 * fabsf(cosNHdivHO * cosNI);
-
-            float sinNH2 = 1 - cosNH * cosNH;
-            float sinNH4 = sinNH2 * sinNH2;
-            float cotangent2 =  (cosNH * cosNH) / sinNH2; 
-
-            float D = expf(-cotangent2 * m_invsigma2) * m_invsigma2 * float(M_1_PI) / sinNH4;
-            float G = std::min(1.0f, std::min(fac1, fac2)); // TODO: derive G from D analytically
-
-            float power = 0.25f * (D * G) / cosNO;
-
-            eval.setValue(power, power, power);
-
-            // TODO: find a better approximation for the retroreflective bounce
-            domega_in_dx = (2 * m_N.dot(domega_out_dx)) * m_N - domega_out_dx;
-            domega_in_dy = (2 * m_N.dot(domega_out_dy)) * m_N - domega_out_dy;
-            domega_in_dx *= 125;
-            domega_in_dy *= 125;
-        } else
-            pdf = 0;
-        return Labels::REFLECT;
-    }
+	}
+
+	Color3 eval_reflect(const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
+	{
+		float cosNO = m_N.dot(omega_out);
+		float cosNI = m_N.dot(omega_in);
+		if (cosNO > 0 && cosNI > 0) {
+			Vec3 H = omega_in + omega_out;
+			H.normalize();
+
+			float cosNH = m_N.dot(H);
+			float cosHO = fabsf(omega_out.dot(H));
+
+			float cosNHdivHO = cosNH / cosHO;
+			cosNHdivHO = max(cosNHdivHO, 0.00001f);
+
+			float fac1 = 2 * fabsf(cosNHdivHO * cosNO);
+			float fac2 = 2 * fabsf(cosNHdivHO * cosNI);
+
+			float sinNH2 = 1 - cosNH * cosNH;
+			float sinNH4 = sinNH2 * sinNH2;
+			float cotangent2 =  (cosNH * cosNH) / sinNH2;
+
+			float D = expf(-cotangent2 * m_invsigma2) * m_invsigma2 * float(M_1_PI) / sinNH4;
+			float G = min(1.0f, min(fac1, fac2)); // TODO: derive G from D analytically
+
+			float out = 0.25f * (D * G) / cosNO;
+
+			pdf = 0.5f * (float) M_1_PI;
+			return Color3(out, out, out);
+		}
+		return Color3(0, 0, 0);
+	}
+
+	Color3 eval_transmit(const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
+	{
+		return Color3(0, 0, 0);
+	}
+
+	ustring sample(const Vec3 &Ng,
+	               const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
+	               float randu, float randv,
+	               Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
+	               float &pdf, Color3 &eval) const
+	{
+		// we are viewing the surface from above - send a ray out with uniform
+		// distribution over the hemisphere
+		sample_uniform_hemisphere(m_N, omega_out, randu, randv, omega_in, pdf);
+		if (Ng.dot(omega_in) > 0) {
+			Vec3 H = omega_in + omega_out;
+			H.normalize();
+
+			float cosNI = m_N.dot(omega_in);
+			float cosNO = m_N.dot(omega_out);
+			float cosNH = m_N.dot(H);
+			float cosHO = fabsf(omega_out.dot(H));
+
+			float cosNHdivHO = cosNH / cosHO;
+			cosNHdivHO = max(cosNHdivHO, 0.00001f);
+
+			float fac1 = 2 * fabsf(cosNHdivHO * cosNO);
+			float fac2 = 2 * fabsf(cosNHdivHO * cosNI);
+
+			float sinNH2 = 1 - cosNH * cosNH;
+			float sinNH4 = sinNH2 * sinNH2;
+			float cotangent2 =  (cosNH * cosNH) / sinNH2;
+
+			float D = expf(-cotangent2 * m_invsigma2) * m_invsigma2 * float(M_1_PI) / sinNH4;
+			float G = min(1.0f, min(fac1, fac2)); // TODO: derive G from D analytically
+
+			float power = 0.25f * (D * G) / cosNO;
+
+			eval.setValue(power, power, power);
+
+			// TODO: find a better approximation for the retroreflective bounce
+			domega_in_dx = (2 * m_N.dot(domega_out_dx)) * m_N - domega_out_dx;
+			domega_in_dy = (2 * m_N.dot(domega_out_dy)) * m_N - domega_out_dy;
+			domega_in_dx *= 125;
+			domega_in_dy *= 125;
+		}
+		else
+			pdf = 0;
+		return Labels::REFLECT;
+	}
 
 };
 
 
 
 ClosureParam bsdf_ashikhmin_velvet_params[] = {
-    CLOSURE_VECTOR_PARAM(AshikhminVelvetClosure, m_N),
-    CLOSURE_FLOAT_PARAM (AshikhminVelvetClosure, m_sigma),
-    CLOSURE_STRING_KEYPARAM("label"),
-    CLOSURE_FINISH_PARAM(AshikhminVelvetClosure) };
+	CLOSURE_VECTOR_PARAM(AshikhminVelvetClosure, m_N),
+	CLOSURE_FLOAT_PARAM(AshikhminVelvetClosure, m_sigma),
+	CLOSURE_STRING_KEYPARAM("label"),
+	CLOSURE_FINISH_PARAM(AshikhminVelvetClosure)
+};
 
 CLOSURE_PREPARE(bsdf_ashikhmin_velvet_prepare, AshikhminVelvetClosure)
 
diff --git a/intern/cycles/kernel/osl/bsdf_diffuse.cpp b/intern/cycles/kernel/osl/bsdf_diffuse.cpp
index 0d4b3fa471f..582ac01d959 100644
--- a/intern/cycles/kernel/osl/bsdf_diffuse.cpp
+++ b/intern/cycles/kernel/osl/bsdf_diffuse.cpp
@@ -36,143 +36,149 @@
 
 #include "osl_closures.h"
 
+#include "util_math.h"
+
 CCL_NAMESPACE_BEGIN
 
 using namespace OSL;
 
 class DiffuseClosure : public BSDFClosure {
 public:
-    Vec3 m_N;
-
-    DiffuseClosure() : BSDFClosure(Labels::DIFFUSE) { }
-
-    void setup() {};
-
-    bool mergeable (const ClosurePrimitive *other) const {
-        const DiffuseClosure *comp = (const DiffuseClosure *)other;
-        return m_N == comp->m_N && BSDFClosure::mergeable(other);
-    }
-
-    size_t memsize () const { return sizeof(*this); }
-
-    const char *name () const { return "diffuse"; }
-
-    void print_on (std::ostream &out) const
-    {
-        out << name() << " ((" << m_N[0] << ", " << m_N[1] << ", " << m_N[2] << "))";
-    }
-
-    float albedo (const Vec3 &omega_out) const
-    {
-        return 1.0f;
-    }
-
-    Color3 eval_reflect (const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
-    {
-        float cos_pi = std::max(m_N.dot(omega_in),0.0f) * (float) M_1_PI;
-        pdf = cos_pi;
-        return Color3 (cos_pi, cos_pi, cos_pi);
-    }
-
-    Color3 eval_transmit (const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
-    {
-        return Color3 (0, 0, 0);
-    }
-
-    ustring sample (const Vec3 &Ng,
-                 const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
-                 float randu, float randv,
-                 Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
-                 float &pdf, Color3 &eval) const
-    {
-        // we are viewing the surface from the right side - send a ray out with cosine
-        // distribution over the hemisphere
-        sample_cos_hemisphere (m_N, omega_out, randu, randv, omega_in, pdf);
-        if (Ng.dot(omega_in) > 0) {
-            eval.setValue(pdf, pdf, pdf);
-            // TODO: find a better approximation for the diffuse bounce
-            domega_in_dx = (2 * m_N.dot(domega_out_dx)) * m_N - domega_out_dx;
-            domega_in_dy = (2 * m_N.dot(domega_out_dy)) * m_N - domega_out_dy;
-            domega_in_dx *= 125;
-            domega_in_dy *= 125;
-        } else
-            pdf = 0;
-        return Labels::REFLECT;
-    }
+	Vec3 m_N;
+
+	DiffuseClosure() : BSDFClosure(Labels::DIFFUSE) {}
+
+	void setup() {};
+
+	bool mergeable(const ClosurePrimitive *other) const {
+		const DiffuseClosure *comp = (const DiffuseClosure *)other;
+		return m_N == comp->m_N && BSDFClosure::mergeable(other);
+	}
+
+	size_t memsize() const { return sizeof(*this); }
+
+	const char *name() const { return "diffuse"; }
+
+	void print_on(std::ostream &out) const
+	{
+		out << name() << " ((" << m_N[0] << ", " << m_N[1] << ", " << m_N[2] << "))";
+	}
+
+	float albedo(const Vec3 &omega_out) const
+	{
+		return 1.0f;
+	}
+
+	Color3 eval_reflect(const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
+	{
+		float cos_pi = max(m_N.dot(omega_in), 0.0f) * (float) M_1_PI;
+		pdf = cos_pi;
+		return Color3(cos_pi, cos_pi, cos_pi);
+	}
+
+	Color3 eval_transmit(const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
+	{
+		return Color3(0, 0, 0);
+	}
+
+	ustring sample(const Vec3 &Ng,
+	               const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
+	               float randu, float randv,
+	               Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
+	               float &pdf, Color3 &eval) const
+	{
+		// we are viewing the surface from the right side - send a ray out with cosine
+		// distribution over the hemisphere
+		sample_cos_hemisphere(m_N, omega_out, randu, randv, omega_in, pdf);
+		if (Ng.dot(omega_in) > 0) {
+			eval.setValue(pdf, pdf, pdf);
+			// TODO: find a better approximation for the diffuse bounce
+			domega_in_dx = (2 * m_N.dot(domega_out_dx)) * m_N - domega_out_dx;
+			domega_in_dy = (2 * m_N.dot(domega_out_dy)) * m_N - domega_out_dy;
+			domega_in_dx *= 125;
+			domega_in_dy *= 125;
+		}
+		else
+			pdf = 0;
+		return Labels::REFLECT;
+	}
 };
 
 
 
 class TranslucentClosure : public BSDFClosure {
 public:
-    Vec3 m_N;
-
-    TranslucentClosure() : BSDFClosure(Labels::DIFFUSE, Back) { }
-
-    void setup() {};
-
-    bool mergeable (const ClosurePrimitive *other) const {
-        const TranslucentClosure *comp = (const TranslucentClosure *)other;
-        return m_N == comp->m_N && BSDFClosure::mergeable(other);
-    }
-
-    size_t memsize () const { return sizeof(*this); }
-
-    const char *name () const { return "translucent"; }
-
-    void print_on (std::ostream &out) const
-    {
-        out << name() << " ((" << m_N[0] << ", " << m_N[1] << ", " << m_N[2] << "))";
-    }
-
-    Color3 eval_reflect (const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
-    {
-        return Color3 (0, 0, 0);
-    }
-
-    float albedo (const Vec3 &omega_out) const
-    {
-        return 1.0f;
-    }
-
-    Color3 eval_transmit (const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
-    {
-        float cos_pi = std::max(-m_N.dot(omega_in), 0.0f) * (float) M_1_PI;
-        pdf = cos_pi;
-        return Color3 (cos_pi, cos_pi, cos_pi);
-    }
-
-    ustring sample (const Vec3 &Ng,
-                 const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
-                 float randu, float randv,
-                 Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
-                 float &pdf, Color3 &eval) const
-    {
-        // we are viewing the surface from the right side - send a ray out with cosine
-        // distribution over the hemisphere
-        sample_cos_hemisphere (-m_N, omega_out, randu, randv, omega_in, pdf);
-        if (Ng.dot(omega_in) < 0) {
-            eval.setValue(pdf, pdf, pdf);
-            // TODO: find a better approximation for the diffuse bounce
-            domega_in_dx = (2 * m_N.dot(domega_out_dx)) * m_N - domega_out_dx;
-            domega_in_dy = (2 * m_N.dot(domega_out_dy)) * m_N - domega_out_dy;
-            domega_in_dx *= -125;
-            domega_in_dy *= -125;
-        } else
-            pdf = 0;
-        return Labels::TRANSMIT;
-    }
+	Vec3 m_N;
+
+	TranslucentClosure() : BSDFClosure(Labels::DIFFUSE, Back) {}
+
+	void setup() {};
+
+	bool mergeable(const ClosurePrimitive *other) const {
+		const TranslucentClosure *comp = (const TranslucentClosure *)other;
+		return m_N == comp->m_N && BSDFClosure::mergeable(other);
+	}
+
+	size_t memsize() const { return sizeof(*this); }
+
+	const char *name() const { return "translucent"; }
+
+	void print_on(std::ostream &out) const
+	{
+		out << name() << " ((" << m_N[0] << ", " << m_N[1] << ", " << m_N[2] << "))";
+	}
+
+	Color3 eval_reflect(const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
+	{
+		return Color3(0, 0, 0);
+	}
+
+	float albedo(const Vec3 &omega_out) const
+	{
+		return 1.0f;
+	}
+
+	Color3 eval_transmit(const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
+	{
+		float cos_pi = max(-m_N.dot(omega_in), 0.0f) * (float) M_1_PI;
+		pdf = cos_pi;
+		return Color3(cos_pi, cos_pi, cos_pi);
+	}
+
+	ustring sample(const Vec3 &Ng,
+	               const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
+	               float randu, float randv,
+	               Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
+	               float &pdf, Color3 &eval) const
+	{
+		// we are viewing the surface from the right side - send a ray out with cosine
+		// distribution over the hemisphere
+		sample_cos_hemisphere(-m_N, omega_out, randu, randv, omega_in, pdf);
+		if (Ng.dot(omega_in) < 0) {
+			eval.setValue(pdf, pdf, pdf);
+			// TODO: find a better approximation for the diffuse bounce
+			domega_in_dx = (2 * m_N.dot(domega_out_dx)) * m_N - domega_out_dx;
+			domega_in_dy = (2 * m_N.dot(domega_out_dy)) * m_N - domega_out_dy;
+			domega_in_dx *= -125;
+			domega_in_dy *= -125;
+		}
+		else
+			pdf = 0;
+		return Labels::TRANSMIT;
+	}
 };
 
 ClosureParam bsdf_diffuse_params[] = {
-    CLOSURE_VECTOR_PARAM   (DiffuseClosure, m_N),
-    CLOSURE_STRING_KEYPARAM("label"),
-    CLOSURE_FINISH_PARAM   (DiffuseClosure) };
+	CLOSURE_VECTOR_PARAM(DiffuseClosure, m_N),
+	CLOSURE_STRING_KEYPARAM("label"),
+	CLOSURE_FINISH_PARAM(DiffuseClosure)
+};
 
 ClosureParam bsdf_translucent_params[] = {
-    CLOSURE_VECTOR_PARAM   (TranslucentClosure, m_N),
-    CLOSURE_STRING_KEYPARAM("label"),
-    CLOSURE_FINISH_PARAM   (TranslucentClosure) };
+	CLOSURE_VECTOR_PARAM(TranslucentClosure, m_N),
+	CLOSURE_STRING_KEYPARAM("label"),
+	CLOSURE_FINISH_PARAM(TranslucentClosure)
+};
 
 CLOSURE_PREPARE(bsdf_diffuse_prepare, DiffuseClosure)
 CLOSURE_PREPARE(bsdf_translucent_prepare, TranslucentClosure)
diff --git a/intern/cycles/kernel/osl/bsdf_microfacet.cpp b/intern/cycles/kernel/osl/bsdf_microfacet.cpp
index d87268da81e..09730d8c3e1 100644
--- a/intern/cycles/kernel/osl/bsdf_microfacet.cpp
+++ b/intern/cycles/kernel/osl/bsdf_microfacet.cpp
@@ -52,85 +52,85 @@ CCL_NAMESPACE_BEGIN
 template <int Refractive = 0>
 class MicrofacetGGXClosure : public BSDFClosure {
 public:
-    Vec3 m_N;
-    float m_ag;   // width parameter (roughness)
-    float m_eta;  // index of refraction (for fresnel term)
-    MicrofacetGGXClosure() : BSDFClosure(Labels::GLOSSY, Refractive ? Back : Front) { m_eta = 1.0f; }
+	Vec3 m_N;
+	float m_ag;   // width parameter (roughness)
+	float m_eta;  // index of refraction (for fresnel term)
+	MicrofacetGGXClosure() : BSDFClosure(Labels::GLOSSY, Refractive ? Back : Front) { m_eta = 1.0f; }
 
-    void setup()
+	void setup()
 	{
 		m_ag = clamp(m_ag, 1e-5f, 1.0f);
 	}
 
-    bool mergeable (const ClosurePrimitive *other) const {
-        const MicrofacetGGXClosure *comp = (const MicrofacetGGXClosure *)other;
-        return m_N == comp->m_N && m_ag == comp->m_ag &&
-            m_eta == comp->m_eta && BSDFClosure::mergeable(other);
-    }
+	bool mergeable(const ClosurePrimitive *other) const {
+		const MicrofacetGGXClosure *comp = (const MicrofacetGGXClosure *)other;
+		return m_N == comp->m_N && m_ag == comp->m_ag &&
+		       m_eta == comp->m_eta && BSDFClosure::mergeable(other);
+	}
 
-    size_t memsize () const { return sizeof(*this); }
+	size_t memsize() const { return sizeof(*this); }
 
-    const char *name () const {
-        return Refractive ? "microfacet_ggx_refraction" : "microfacet_ggx";
-    }
+	const char *name() const {
+		return Refractive ? "microfacet_ggx_refraction" : "microfacet_ggx";
+	}
 
-    void print_on (std::ostream &out) const {
-        out << name() << " (";
-        out << "(" << m_N[0] << ", " << m_N[1] << ", " << m_N[2] << "), ";
-        out << m_ag << ", ";
-        out << m_eta;
-        out << ")";
-    }
+	void print_on(std::ostream &out) const {
+		out << name() << " (";
+		out << "(" << m_N[0] << ", " << m_N[1] << ", " << m_N[2] << "), ";
+		out << m_ag << ", ";
+		out << m_eta;
+		out << ")";
+	}
 
-    float albedo (const Vec3 &omega_out) const
-    {
+	float albedo(const Vec3 &omega_out) const
+	{
 		return 1.0f;
-    }
-
-    Color3 eval_reflect (const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
-    {
-        if (Refractive == 1) return Color3 (0, 0, 0);
-        float cosNO = m_N.dot(omega_out);
-        float cosNI = m_N.dot(omega_in);
-        if (cosNI > 0 && cosNO > 0) {
-            // get half vector
-            Vec3 Hr = omega_in + omega_out;
-            Hr.normalize();
-            // eq. 20: (F*G*D)/(4*in*on)
-            // eq. 33: first we calculate D(m) with m=Hr:
-            float alpha2 = m_ag * m_ag;
-            float cosThetaM = m_N.dot(Hr);
-            float cosThetaM2 = cosThetaM * cosThetaM;
-            float tanThetaM2 = (1 - cosThetaM2) / cosThetaM2;
-            float cosThetaM4 = cosThetaM2 * cosThetaM2;
-            float D = alpha2 / ((float) M_PI * cosThetaM4 * (alpha2 + tanThetaM2) * (alpha2 + tanThetaM2));
-            // eq. 34: now calculate G1(i,m) and G1(o,m)
-            float G1o = 2 / (1 + sqrtf(1 + alpha2 * (1 - cosNO * cosNO) / (cosNO * cosNO)));
-            float G1i = 2 / (1 + sqrtf(1 + alpha2 * (1 - cosNI * cosNI) / (cosNI * cosNI))); 
-            float G = G1o * G1i;
-            float out = (G * D) * 0.25f / cosNO;
-            // eq. 24
-            float pm = D * cosThetaM;
-            // convert into pdf of the sampled direction
-            // eq. 38 - but see also:
-            // eq. 17 in http://www.graphics.cornell.edu/~bjw/wardnotes.pdf
-            pdf = pm * 0.25f / Hr.dot(omega_out);
-            return Color3 (out, out, out);
-        }
-        return Color3 (0, 0, 0);
-    }
-
-    Color3 eval_transmit (const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
-    {
-        if (Refractive == 0) return Color3 (0, 0, 0);
-        float cosNO = m_N.dot(omega_out);
-        float cosNI = m_N.dot(omega_in);
-        if (cosNO <= 0 || cosNI >= 0)
-            return Color3 (0, 0, 0); // vectors on same side -- not possible
-        // compute half-vector of the refraction (eq. 16)
-        Vec3 ht = -(m_eta * omega_in + omega_out);
-        Vec3 Ht = ht; Ht.normalize();
-        float cosHO = Ht.dot(omega_out);
+	}
+
+	Color3 eval_reflect(const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
+	{
+		if (Refractive == 1) return Color3(0, 0, 0);
+		float cosNO = m_N.dot(omega_out);
+		float cosNI = m_N.dot(omega_in);
+		if (cosNI > 0 && cosNO > 0) {
+			// get half vector
+			Vec3 Hr = omega_in + omega_out;
+			Hr.normalize();
+			// eq. 20: (F*G*D)/(4*in*on)
+			// eq. 33: first we calculate D(m) with m=Hr:
+			float alpha2 = m_ag * m_ag;
+			float cosThetaM = m_N.dot(Hr);
+			float cosThetaM2 = cosThetaM * cosThetaM;
+			float tanThetaM2 = (1 - cosThetaM2) / cosThetaM2;
+			float cosThetaM4 = cosThetaM2 * cosThetaM2;
+			float D = alpha2 / ((float) M_PI * cosThetaM4 * (alpha2 + tanThetaM2) * (alpha2 + tanThetaM2));
+			// eq. 34: now calculate G1(i,m) and G1(o,m)
+			float G1o = 2 / (1 + sqrtf(1 + alpha2 * (1 - cosNO * cosNO) / (cosNO * cosNO)));
+			float G1i = 2 / (1 + sqrtf(1 + alpha2 * (1 - cosNI * cosNI) / (cosNI * cosNI)));
+			float G = G1o * G1i;
+			float out = (G * D) * 0.25f / cosNO;
+			// eq. 24
+			float pm = D * cosThetaM;
+			// convert into pdf of the sampled direction
+			// eq. 38 - but see also:
+			// eq. 17 in http://www.graphics.cornell.edu/~bjw/wardnotes.pdf
+			pdf = pm * 0.25f / Hr.dot(omega_out);
+			return Color3(out, out, out);
+		}
+		return Color3(0, 0, 0);
+	}
+
+	Color3 eval_transmit(const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
+	{
+		if (Refractive == 0) return Color3(0, 0, 0);
+		float cosNO = m_N.dot(omega_out);
+		float cosNI = m_N.dot(omega_in);
+		if (cosNO <= 0 || cosNI >= 0)
+			return Color3(0, 0, 0);  // vectors on same side -- not possible
+		// compute half-vector of the refraction (eq. 16)
+		Vec3 ht = -(m_eta * omega_in + omega_out);
+		Vec3 Ht = ht; Ht.normalize();
+		float cosHO = Ht.dot(omega_out);
 
 		float cosHI = Ht.dot(omega_in);
 		// eq. 33: first we calculate D(m) with m=Ht:
@@ -148,122 +148,123 @@ public:
 		float invHt2 = 1 / ht.dot(ht);
 		pdf = D * fabsf(cosThetaM) * (fabsf(cosHI) * (m_eta * m_eta)) * invHt2;
 		float out = (fabsf(cosHI * cosHO) * (m_eta * m_eta) * (G * D) * invHt2) / cosNO;
-		return Color3 (out, out, out);
-    }
-
-    ustring sample (const Vec3 &Ng,
-                 const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
-                 float randu, float randv,
-                 Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
-                 float &pdf, Color3 &eval) const
-    {
-        float cosNO = m_N.dot(omega_out);
-        if (cosNO > 0) {
-            Vec3 X, Y, Z = m_N;
-            make_orthonormals(Z, X, Y);
-            // generate a random microfacet normal m
-            // eq. 35,36:
-            // we take advantage of cos(atan(x)) == 1/sqrt(1+x^2)
-            //                  and sin(atan(x)) == x/sqrt(1+x^2)
-            float alpha2 = m_ag * m_ag;
-            float tanThetaM2 = alpha2 * randu / (1 - randu);
-            float cosThetaM  = 1 / sqrtf(1 + tanThetaM2);
-            float sinThetaM  = cosThetaM * sqrtf(tanThetaM2);
-            float phiM = 2 * float(M_PI) * randv;
-            Vec3 m = (cosf(phiM) * sinThetaM) * X +
-                     (sinf(phiM) * sinThetaM) * Y +
-                                   cosThetaM  * Z;
-            if (Refractive == 0) {
-                float cosMO = m.dot(omega_out);
-                if (cosMO > 0) {
-                    // eq. 39 - compute actual reflected direction
-                    omega_in = 2 * cosMO * m - omega_out;
-                    if (Ng.dot(omega_in) > 0) {
-                        // microfacet normal is visible to this ray
-                        // eq. 33
-                        float cosThetaM2 = cosThetaM * cosThetaM;
-                        float cosThetaM4 = cosThetaM2 * cosThetaM2;
-                        float D = alpha2 / (float(M_PI) * cosThetaM4 * (alpha2 + tanThetaM2) * (alpha2 + tanThetaM2));
-                        // eq. 24
-                        float pm = D * cosThetaM;
-                        // convert into pdf of the sampled direction
-                        // eq. 38 - but see also:
-                        // eq. 17 in http://www.graphics.cornell.edu/~bjw/wardnotes.pdf
-                        pdf = pm * 0.25f / cosMO;
-                        // eval BRDF*cosNI
-                        float cosNI = m_N.dot(omega_in);
-                        // eq. 34: now calculate G1(i,m) and G1(o,m)
-                        float G1o = 2 / (1 + sqrtf(1 + alpha2 * (1 - cosNO * cosNO) / (cosNO * cosNO)));
-                        float G1i = 2 / (1 + sqrtf(1 + alpha2 * (1 - cosNI * cosNI) / (cosNI * cosNI))); 
-                        float G = G1o * G1i;
-                        // eq. 20: (F*G*D)/(4*in*on)
-                        float out = (G * D) * 0.25f / cosNO;
-                        eval.setValue(out, out, out);
-                        domega_in_dx = (2 * m.dot(domega_out_dx)) * m - domega_out_dx;
-                        domega_in_dy = (2 * m.dot(domega_out_dy)) * m - domega_out_dy;
+		return Color3(out, out, out);
+	}
+
+	ustring sample(const Vec3 &Ng,
+	               const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
+	               float randu, float randv,
+	               Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
+	               float &pdf, Color3 &eval) const
+	{
+		float cosNO = m_N.dot(omega_out);
+		if (cosNO > 0) {
+			Vec3 X, Y, Z = m_N;
+			make_orthonormals(Z, X, Y);
+			// generate a random microfacet normal m
+			// eq. 35,36:
+			// we take advantage of cos(atan(x)) == 1/sqrt(1+x^2)
+			//                  and sin(atan(x)) == x/sqrt(1+x^2)
+			float alpha2 = m_ag * m_ag;
+			float tanThetaM2 = alpha2 * randu / (1 - randu);
+			float cosThetaM  = 1 / sqrtf(1 + tanThetaM2);
+			float sinThetaM  = cosThetaM * sqrtf(tanThetaM2);
+			float phiM = 2 * float(M_PI) * randv;
+			Vec3 m = (cosf(phiM) * sinThetaM) * X +
+			         (sinf(phiM) * sinThetaM) * Y +
+			         cosThetaM  * Z;
+			if (Refractive == 0) {
+				float cosMO = m.dot(omega_out);
+				if (cosMO > 0) {
+					// eq. 39 - compute actual reflected direction
+					omega_in = 2 * cosMO * m - omega_out;
+					if (Ng.dot(omega_in) > 0) {
+						// microfacet normal is visible to this ray
+						// eq. 33
+						float cosThetaM2 = cosThetaM * cosThetaM;
+						float cosThetaM4 = cosThetaM2 * cosThetaM2;
+						float D = alpha2 / (float(M_PI) * cosThetaM4 * (alpha2 + tanThetaM2) * (alpha2 + tanThetaM2));
+						// eq. 24
+						float pm = D * cosThetaM;
+						// convert into pdf of the sampled direction
+						// eq. 38 - but see also:
+						// eq. 17 in http://www.graphics.cornell.edu/~bjw/wardnotes.pdf
+						pdf = pm * 0.25f / cosMO;
+						// eval BRDF*cosNI
+						float cosNI = m_N.dot(omega_in);
+						// eq. 34: now calculate G1(i,m) and G1(o,m)
+						float G1o = 2 / (1 + sqrtf(1 + alpha2 * (1 - cosNO * cosNO) / (cosNO * cosNO)));
+						float G1i = 2 / (1 + sqrtf(1 + alpha2 * (1 - cosNI * cosNI) / (cosNI * cosNI)));
+						float G = G1o * G1i;
+						// eq. 20: (F*G*D)/(4*in*on)
+						float out = (G * D) * 0.25f / cosNO;
+						eval.setValue(out, out, out);
+						domega_in_dx = (2 * m.dot(domega_out_dx)) * m - domega_out_dx;
+						domega_in_dy = (2 * m.dot(domega_out_dy)) * m - domega_out_dy;
 
 						/* disabled for now - gives texture filtering problems */
 #if 0
-                        // Since there is some blur to this reflection, make the
-                        // derivatives a bit bigger. In theory this varies with the
-                        // roughness but the exact relationship is complex and
-                        // requires more ops than are practical.
-                        domega_in_dx *= 10;
-                        domega_in_dy *= 10;
+						// Since there is some blur to this reflection, make the
+						// derivatives a bit bigger. In theory this varies with the
+						// roughness but the exact relationship is complex and
+						// requires more ops than are practical.
+						domega_in_dx *= 10;
+						domega_in_dy *= 10;
 #endif
-                    }
-                }
-            } else {
-                // CAUTION: the i and o variables are inverted relative to the paper
-                // eq. 39 - compute actual refractive direction
-                Vec3 R, dRdx, dRdy;
-                Vec3 T, dTdx, dTdy;
-                bool inside;
-                fresnel_dielectric(m_eta, m, omega_out, domega_out_dx, domega_out_dy,
-                                   R, dRdx, dRdy,
-                                   T, dTdx, dTdy,
-                                   inside);
-
-                if (!inside) {
-                    omega_in = T;
-                    domega_in_dx = dTdx;
-                    domega_in_dy = dTdy;
-                    // eq. 33
-                    float cosThetaM2 = cosThetaM * cosThetaM;
-                    float cosThetaM4 = cosThetaM2 * cosThetaM2;
-                    float D = alpha2 / (float(M_PI) * cosThetaM4 * (alpha2 + tanThetaM2) * (alpha2 + tanThetaM2));
-                    // eq. 24
-                    float pm = D * cosThetaM;
-                    // eval BRDF*cosNI
-                    float cosNI = m_N.dot(omega_in);
-                    // eq. 34: now calculate G1(i,m) and G1(o,m)
-                    float G1o = 2 / (1 + sqrtf(1 + alpha2 * (1 - cosNO * cosNO) / (cosNO * cosNO)));
-                    float G1i = 2 / (1 + sqrtf(1 + alpha2 * (1 - cosNI * cosNI) / (cosNI * cosNI))); 
-                    float G = G1o * G1i;
-                    // eq. 21
-                    float cosHI = m.dot(omega_in);
-                    float cosHO = m.dot(omega_out);
-                    float Ht2 = m_eta * cosHI + cosHO;
-                    Ht2 *= Ht2;
-                    float out = (fabsf(cosHI * cosHO) * (m_eta * m_eta) * (G * D)) / (cosNO * Ht2);
-                    // eq. 38 and eq. 17
-                    pdf = pm * (m_eta * m_eta) * fabsf(cosHI) / Ht2;
-                    eval.setValue(out, out, out);
+					}
+				}
+			}
+			else {
+				// CAUTION: the i and o variables are inverted relative to the paper
+				// eq. 39 - compute actual refractive direction
+				Vec3 R, dRdx, dRdy;
+				Vec3 T, dTdx, dTdy;
+				bool inside;
+				fresnel_dielectric(m_eta, m, omega_out, domega_out_dx, domega_out_dy,
+				                   R, dRdx, dRdy,
+				                   T, dTdx, dTdy,
+				                   inside);
+
+				if (!inside) {
+					omega_in = T;
+					domega_in_dx = dTdx;
+					domega_in_dy = dTdy;
+					// eq. 33
+					float cosThetaM2 = cosThetaM * cosThetaM;
+					float cosThetaM4 = cosThetaM2 * cosThetaM2;
+					float D = alpha2 / (float(M_PI) * cosThetaM4 * (alpha2 + tanThetaM2) * (alpha2 + tanThetaM2));
+					// eq. 24
+					float pm = D * cosThetaM;
+					// eval BRDF*cosNI
+					float cosNI = m_N.dot(omega_in);
+					// eq. 34: now calculate G1(i,m) and G1(o,m)
+					float G1o = 2 / (1 + sqrtf(1 + alpha2 * (1 - cosNO * cosNO) / (cosNO * cosNO)));
+					float G1i = 2 / (1 + sqrtf(1 + alpha2 * (1 - cosNI * cosNI) / (cosNI * cosNI)));
+					float G = G1o * G1i;
+					// eq. 21
+					float cosHI = m.dot(omega_in);
+					float cosHO = m.dot(omega_out);
+					float Ht2 = m_eta * cosHI + cosHO;
+					Ht2 *= Ht2;
+					float out = (fabsf(cosHI * cosHO) * (m_eta * m_eta) * (G * D)) / (cosNO * Ht2);
+					// eq. 38 and eq. 17
+					pdf = pm * (m_eta * m_eta) * fabsf(cosHI) / Ht2;
+					eval.setValue(out, out, out);
 
 					/* disabled for now - gives texture filtering problems */
 #if 0
-                    // Since there is some blur to this refraction, make the
-                    // derivatives a bit bigger. In theory this varies with the
-                    // roughness but the exact relationship is complex and
-                    // requires more ops than are practical.
-                    domega_in_dx *= 10;
-                    domega_in_dy *= 10;
+					// Since there is some blur to this refraction, make the
+					// derivatives a bit bigger. In theory this varies with the
+					// roughness but the exact relationship is complex and
+					// requires more ops than are practical.
+					domega_in_dx *= 10;
+					domega_in_dy *= 10;
 #endif
-                }
-            }
-        }
-        return Refractive ? Labels::TRANSMIT : Labels::REFLECT;
-    }
+				}
+			}
+		}
+		return Refractive ? Labels::TRANSMIT : Labels::REFLECT;
+	}
 };
 
 // microfacet model with Beckmann facet distribution
@@ -271,89 +272,92 @@ public:
 template <int Refractive = 0>
 class MicrofacetBeckmannClosure : public BSDFClosure {
 public:
-    Vec3 m_N;
-    float m_ab;   // width parameter (roughness)
-    float m_eta;  // index of refraction (for fresnel term)
-    MicrofacetBeckmannClosure() : BSDFClosure(Labels::GLOSSY, Refractive ? Back : Front) { }
+	Vec3 m_N;
+	float m_ab;   // width parameter (roughness)
+	float m_eta;  // index of refraction (for fresnel term)
+	MicrofacetBeckmannClosure() : BSDFClosure(Labels::GLOSSY, Refractive ? Back : Front) {
+	}
 
-    void setup()
+	void setup()
 	{
 		m_ab = clamp(m_ab, 1e-5f, 1.0f);
 	}
 
-    bool mergeable (const ClosurePrimitive *other) const {
-        const MicrofacetBeckmannClosure *comp = (const MicrofacetBeckmannClosure *)other;
-        return m_N == comp->m_N && m_ab == comp->m_ab &&
-            m_eta == comp->m_eta && BSDFClosure::mergeable(other);
-    }
-
-    size_t memsize () const { return sizeof(*this); }
-
-    const char * name () const {
-        return Refractive ? "microfacet_beckmann_refraction" 
-                          : "microfacet_beckmann";
-    }
-
-    void print_on (std::ostream &out) const
-    {
-        out << name() << " (";
-        out << "(" << m_N[0] << ", " << m_N[1] << ", " << m_N[2] << "), ";
-        out << m_ab << ", ";
-        out << m_eta;
-        out << ")";
-    }
-
-    float albedo (const Vec3 &omega_out) const
-    {
+	bool mergeable(const ClosurePrimitive *other) const {
+		const MicrofacetBeckmannClosure *comp = (const MicrofacetBeckmannClosure *)other;
+		return m_N == comp->m_N && m_ab == comp->m_ab &&
+		       m_eta == comp->m_eta && BSDFClosure::mergeable(other);
+	}
+
+	size_t memsize() const {
+		return sizeof(*this);
+	}
+
+	const char *name() const {
+		return Refractive ? "microfacet_beckmann_refraction"
+			   : "microfacet_beckmann";
+	}
+
+	void print_on(std::ostream &out) const
+	{
+		out << name() << " (";
+		out << "(" << m_N[0] << ", " << m_N[1] << ", " << m_N[2] << "), ";
+		out << m_ab << ", ";
+		out << m_eta;
+		out << ")";
+	}
+
+	float albedo(const Vec3 &omega_out) const
+	{
 		return 1.0f;
-    }
-
-    Color3 eval_reflect (const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
-    {
-        if (Refractive == 1) return Color3 (0, 0, 0);
-        float cosNO = m_N.dot(omega_out);
-        float cosNI = m_N.dot(omega_in);
-        if (cosNO > 0 && cosNI > 0) {
-           // get half vector
-           Vec3 Hr = omega_in + omega_out;
-           Hr.normalize();
-           // eq. 20: (F*G*D)/(4*in*on)
-           // eq. 25: first we calculate D(m) with m=Hr:
-           float alpha2 = m_ab * m_ab;
-           float cosThetaM = m_N.dot(Hr);
-           float cosThetaM2 = cosThetaM * cosThetaM;
-           float tanThetaM2 = (1 - cosThetaM2) / cosThetaM2;
-           float cosThetaM4 = cosThetaM2 * cosThetaM2;
-           float D = expf(-tanThetaM2 / alpha2) / (float(M_PI) * alpha2 *  cosThetaM4);
-           // eq. 26, 27: now calculate G1(i,m) and G1(o,m)
-           float ao = 1 / (m_ab * sqrtf((1 - cosNO * cosNO) / (cosNO * cosNO)));
-           float ai = 1 / (m_ab * sqrtf((1 - cosNI * cosNI) / (cosNI * cosNI)));
-           float G1o = ao < 1.6f ? (3.535f * ao + 2.181f * ao * ao) / (1 + 2.276f * ao + 2.577f * ao * ao) : 1.0f;
-           float G1i = ai < 1.6f ? (3.535f * ai + 2.181f * ai * ai) / (1 + 2.276f * ai + 2.577f * ai * ai) : 1.0f;
-           float G = G1o * G1i;
-           float out = (G * D) * 0.25f / cosNO;
-           // eq. 24
-           float pm = D * cosThetaM;
-           // convert into pdf of the sampled direction
-           // eq. 38 - but see also:
-           // eq. 17 in http://www.graphics.cornell.edu/~bjw/wardnotes.pdf
-           pdf = pm * 0.25f / Hr.dot(omega_out);
-           return Color3 (out, out, out);
-        }
-        return Color3 (0, 0, 0);
-    }
-
-    Color3 eval_transmit (const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
-    {
-        if (Refractive == 0) return Color3 (0, 0, 0);
-        float cosNO = m_N.dot(omega_out);
-        float cosNI = m_N.dot(omega_in);
-        if (cosNO <= 0 || cosNI >= 0)
-            return Color3 (0, 0, 0);
-        // compute half-vector of the refraction (eq. 16)
-        Vec3 ht = -(m_eta * omega_in + omega_out);
-        Vec3 Ht = ht; Ht.normalize();
-        float cosHO = Ht.dot(omega_out);
+	}
+
+	Color3 eval_reflect(const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
+	{
+		if (Refractive == 1) return Color3(0, 0, 0);
+		float cosNO = m_N.dot(omega_out);
+		float cosNI = m_N.dot(omega_in);
+		if (cosNO > 0 && cosNI > 0) {
+			// get half vector
+			Vec3 Hr = omega_in + omega_out;
+			Hr.normalize();
+			// eq. 20: (F*G*D)/(4*in*on)
+			// eq. 25: first we calculate D(m) with m=Hr:
+			float alpha2 = m_ab * m_ab;
+			float cosThetaM = m_N.dot(Hr);
+			float cosThetaM2 = cosThetaM * cosThetaM;
+			float tanThetaM2 = (1 - cosThetaM2) / cosThetaM2;
+			float cosThetaM4 = cosThetaM2 * cosThetaM2;
+			float D = expf(-tanThetaM2 / alpha2) / (float(M_PI) * alpha2 *  cosThetaM4);
+			// eq. 26, 27: now calculate G1(i,m) and G1(o,m)
+			float ao = 1 / (m_ab * sqrtf((1 - cosNO * cosNO) / (cosNO * cosNO)));
+			float ai = 1 / (m_ab * sqrtf((1 - cosNI * cosNI) / (cosNI * cosNI)));
+			float G1o = ao < 1.6f ? (3.535f * ao + 2.181f * ao * ao) / (1 + 2.276f * ao + 2.577f * ao * ao) : 1.0f;
+			float G1i = ai < 1.6f ? (3.535f * ai + 2.181f * ai * ai) / (1 + 2.276f * ai + 2.577f * ai * ai) : 1.0f;
+			float G = G1o * G1i;
+			float out = (G * D) * 0.25f / cosNO;
+			// eq. 24
+			float pm = D * cosThetaM;
+			// convert into pdf of the sampled direction
+			// eq. 38 - but see also:
+			// eq. 17 in http://www.graphics.cornell.edu/~bjw/wardnotes.pdf
+			pdf = pm * 0.25f / Hr.dot(omega_out);
+			return Color3(out, out, out);
+		}
+		return Color3(0, 0, 0);
+	}
+
+	Color3 eval_transmit(const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
+	{
+		if (Refractive == 0) return Color3(0, 0, 0);
+		float cosNO = m_N.dot(omega_out);
+		float cosNI = m_N.dot(omega_in);
+		if (cosNO <= 0 || cosNI >= 0)
+			return Color3(0, 0, 0);
+		// compute half-vector of the refraction (eq. 16)
+		Vec3 ht = -(m_eta * omega_in + omega_out);
+		Vec3 Ht = ht; Ht.normalize();
+		float cosHO = Ht.dot(omega_out);
 
 		float cosHI = Ht.dot(omega_in);
 		// eq. 33: first we calculate D(m) with m=Ht:
@@ -373,156 +377,161 @@ public:
 		float invHt2 = 1 / ht.dot(ht);
 		pdf = D * fabsf(cosThetaM) * (fabsf(cosHI) * (m_eta * m_eta)) * invHt2;
 		float out = (fabsf(cosHI * cosHO) * (m_eta * m_eta) * (G * D) * invHt2) / cosNO;
-		return Color3 (out, out, out);
-    }
-
-    ustring sample (const Vec3 &Ng,
-                 const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
-                 float randu, float randv,
-                 Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
-                 float &pdf, Color3 &eval) const
-    {
-        float cosNO = m_N.dot(omega_out);
-        if (cosNO > 0) {
-            Vec3 X, Y, Z = m_N;
-            make_orthonormals(Z, X, Y);
-            // generate a random microfacet normal m
-            // eq. 35,36:
-            // we take advantage of cos(atan(x)) == 1/sqrt(1+x^2)
-            //                  and sin(atan(x)) == x/sqrt(1+x^2)
-            float alpha2 = m_ab * m_ab;
-            float tanThetaM = sqrtf(-alpha2 * logf(1 - randu));
-            float cosThetaM = 1 / sqrtf(1 + tanThetaM * tanThetaM);
-            float sinThetaM = cosThetaM * tanThetaM;
-            float phiM = 2 * float(M_PI) * randv;
-            Vec3 m = (cosf(phiM) * sinThetaM) * X +
-                     (sinf(phiM) * sinThetaM) * Y +
-                                   cosThetaM  * Z;
-            if (Refractive == 0) {
-                float cosMO = m.dot(omega_out);
-                if (cosMO > 0) {
-                    // eq. 39 - compute actual reflected direction
-                    omega_in = 2 * cosMO * m - omega_out;
-                    if (Ng.dot(omega_in) > 0) {
-                        // microfacet normal is visible to this ray
-                        // eq. 25
-                        float cosThetaM2 = cosThetaM * cosThetaM;
-                        float tanThetaM2 = tanThetaM * tanThetaM;
-                        float cosThetaM4 = cosThetaM2 * cosThetaM2;
-                        float D = expf(-tanThetaM2 / alpha2) / (float(M_PI) * alpha2 *  cosThetaM4);
-                        // eq. 24
-                        float pm = D * cosThetaM;
-                        // convert into pdf of the sampled direction
-                        // eq. 38 - but see also:
-                        // eq. 17 in http://www.graphics.cornell.edu/~bjw/wardnotes.pdf
-                        pdf = pm * 0.25f / cosMO;
-                        // Eval BRDF*cosNI
-                        float cosNI = m_N.dot(omega_in);
-                        // eq. 26, 27: now calculate G1(i,m) and G1(o,m)
-                        float ao = 1 / (m_ab * sqrtf((1 - cosNO * cosNO) / (cosNO * cosNO)));
-                        float ai = 1 / (m_ab * sqrtf((1 - cosNI * cosNI) / (cosNI * cosNI)));
-                        float G1o = ao < 1.6f ? (3.535f * ao + 2.181f * ao * ao) / (1 + 2.276f * ao + 2.577f * ao * ao) : 1.0f;
-                        float G1i = ai < 1.6f ? (3.535f * ai + 2.181f * ai * ai) / (1 + 2.276f * ai + 2.577f * ai * ai) : 1.0f;
-                        float G = G1o * G1i;
-                        // eq. 20: (F*G*D)/(4*in*on)
-                        float out = (G * D) * 0.25f / cosNO;
-                        eval.setValue(out, out, out);
-                        domega_in_dx = (2 * m.dot(domega_out_dx)) * m - domega_out_dx;
-                        domega_in_dy = (2 * m.dot(domega_out_dy)) * m - domega_out_dy;
+		return Color3(out, out, out);
+	}
+
+	ustring sample(const Vec3 &Ng,
+	               const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
+	               float randu, float randv,
+	               Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
+	               float &pdf, Color3 &eval) const
+	{
+		float cosNO = m_N.dot(omega_out);
+		if (cosNO > 0) {
+			Vec3 X, Y, Z = m_N;
+			make_orthonormals(Z, X, Y);
+			// generate a random microfacet normal m
+			// eq. 35,36:
+			// we take advantage of cos(atan(x)) == 1/sqrt(1+x^2)
+			//                  and sin(atan(x)) == x/sqrt(1+x^2)
+			float alpha2 = m_ab * m_ab;
+			float tanThetaM = sqrtf(-alpha2 * logf(1 - randu));
+			float cosThetaM = 1 / sqrtf(1 + tanThetaM * tanThetaM);
+			float sinThetaM = cosThetaM * tanThetaM;
+			float phiM = 2 * float(M_PI) * randv;
+			Vec3 m = (cosf(phiM) * sinThetaM) * X +
+			         (sinf(phiM) * sinThetaM) * Y +
+			         cosThetaM  * Z;
+			if (Refractive == 0) {
+				float cosMO = m.dot(omega_out);
+				if (cosMO > 0) {
+					// eq. 39 - compute actual reflected direction
+					omega_in = 2 * cosMO * m - omega_out;
+					if (Ng.dot(omega_in) > 0) {
+						// microfacet normal is visible to this ray
+						// eq. 25
+						float cosThetaM2 = cosThetaM * cosThetaM;
+						float tanThetaM2 = tanThetaM * tanThetaM;
+						float cosThetaM4 = cosThetaM2 * cosThetaM2;
+						float D = expf(-tanThetaM2 / alpha2) / (float(M_PI) * alpha2 *  cosThetaM4);
+						// eq. 24
+						float pm = D * cosThetaM;
+						// convert into pdf of the sampled direction
+						// eq. 38 - but see also:
+						// eq. 17 in http://www.graphics.cornell.edu/~bjw/wardnotes.pdf
+						pdf = pm * 0.25f / cosMO;
+						// Eval BRDF*cosNI
+						float cosNI = m_N.dot(omega_in);
+						// eq. 26, 27: now calculate G1(i,m) and G1(o,m)
+						float ao = 1 / (m_ab * sqrtf((1 - cosNO * cosNO) / (cosNO * cosNO)));
+						float ai = 1 / (m_ab * sqrtf((1 - cosNI * cosNI) / (cosNI * cosNI)));
+						float G1o = ao < 1.6f ? (3.535f * ao + 2.181f * ao * ao) / (1 + 2.276f * ao + 2.577f * ao * ao) : 1.0f;
+						float G1i = ai < 1.6f ? (3.535f * ai + 2.181f * ai * ai) / (1 + 2.276f * ai + 2.577f * ai * ai) : 1.0f;
+						float G = G1o * G1i;
+						// eq. 20: (F*G*D)/(4*in*on)
+						float out = (G * D) * 0.25f / cosNO;
+						eval.setValue(out, out, out);
+						domega_in_dx = (2 * m.dot(domega_out_dx)) * m - domega_out_dx;
+						domega_in_dy = (2 * m.dot(domega_out_dy)) * m - domega_out_dy;
 
 						/* disabled for now - gives texture filtering problems */
 #if 0
-                        // Since there is some blur to this reflection, make the
-                        // derivatives a bit bigger. In theory this varies with the
-                        // roughness but the exact relationship is complex and
-                        // requires more ops than are practical.
-                        domega_in_dx *= 10;
-                        domega_in_dy *= 10;
+						// Since there is some blur to this reflection, make the
+						// derivatives a bit bigger. In theory this varies with the
+						// roughness but the exact relationship is complex and
+						// requires more ops than are practical.
+						domega_in_dx *= 10;
+						domega_in_dy *= 10;
 #endif
-                    }
-                }
-            } else {
-                // CAUTION: the i and o variables are inverted relative to the paper
-                // eq. 39 - compute actual refractive direction
-                Vec3 R, dRdx, dRdy;
-                Vec3 T, dTdx, dTdy;
-                bool inside;
-                fresnel_dielectric(m_eta, m, omega_out, domega_out_dx, domega_out_dy,
-                                   R, dRdx, dRdy,
-                                   T, dTdx, dTdy,
-                                   inside);
-                if (!inside) {
-                    omega_in = T;
-                    domega_in_dx = dTdx;
-                    domega_in_dy = dTdy;
-                    // eq. 33
-                    float cosThetaM2 = cosThetaM * cosThetaM;
-                    float tanThetaM2 = tanThetaM * tanThetaM;
-                    float cosThetaM4 = cosThetaM2 * cosThetaM2;
-                    float D = expf(-tanThetaM2 / alpha2) / (float(M_PI) * alpha2 *  cosThetaM4);
-                    // eq. 24
-                    float pm = D * cosThetaM;
-                    // eval BRDF*cosNI
-                    float cosNI = m_N.dot(omega_in);
-                    // eq. 26, 27: now calculate G1(i,m) and G1(o,m)
-                    float ao = 1 / (m_ab * sqrtf((1 - cosNO * cosNO) / (cosNO * cosNO)));
-                    float ai = 1 / (m_ab * sqrtf((1 - cosNI * cosNI) / (cosNI * cosNI)));
-                    float G1o = ao < 1.6f ? (3.535f * ao + 2.181f * ao * ao) / (1 + 2.276f * ao + 2.577f * ao * ao) : 1.0f;
-                    float G1i = ai < 1.6f ? (3.535f * ai + 2.181f * ai * ai) / (1 + 2.276f * ai + 2.577f * ai * ai) : 1.0f;
-                    float G = G1o * G1i;
-                    // eq. 21
-                    float cosHI = m.dot(omega_in);
-                    float cosHO = m.dot(omega_out);
-                    float Ht2 = m_eta * cosHI + cosHO;
-                    Ht2 *= Ht2;
-                    float out = (fabsf(cosHI * cosHO) * (m_eta * m_eta) * (G * D)) / (cosNO * Ht2);
-                    // eq. 38 and eq. 17
-                    pdf = pm * (m_eta * m_eta) * fabsf(cosHI) / Ht2;
-                    eval.setValue(out, out, out);
+					}
+				}
+			}
+			else {
+				// CAUTION: the i and o variables are inverted relative to the paper
+				// eq. 39 - compute actual refractive direction
+				Vec3 R, dRdx, dRdy;
+				Vec3 T, dTdx, dTdy;
+				bool inside;
+				fresnel_dielectric(m_eta, m, omega_out, domega_out_dx, domega_out_dy,
+				                   R, dRdx, dRdy,
+				                   T, dTdx, dTdy,
+				                   inside);
+				if (!inside) {
+					omega_in = T;
+					domega_in_dx = dTdx;
+					domega_in_dy = dTdy;
+					// eq. 33
+					float cosThetaM2 = cosThetaM * cosThetaM;
+					float tanThetaM2 = tanThetaM * tanThetaM;
+					float cosThetaM4 = cosThetaM2 * cosThetaM2;
+					float D = expf(-tanThetaM2 / alpha2) / (float(M_PI) * alpha2 *  cosThetaM4);
+					// eq. 24
+					float pm = D * cosThetaM;
+					// eval BRDF*cosNI
+					float cosNI = m_N.dot(omega_in);
+					// eq. 26, 27: now calculate G1(i,m) and G1(o,m)
+					float ao = 1 / (m_ab * sqrtf((1 - cosNO * cosNO) / (cosNO * cosNO)));
+					float ai = 1 / (m_ab * sqrtf((1 - cosNI * cosNI) / (cosNI * cosNI)));
+					float G1o = ao < 1.6f ? (3.535f * ao + 2.181f * ao * ao) / (1 + 2.276f * ao + 2.577f * ao * ao) : 1.0f;
+					float G1i = ai < 1.6f ? (3.535f * ai + 2.181f * ai * ai) / (1 + 2.276f * ai + 2.577f * ai * ai) : 1.0f;
+					float G = G1o * G1i;
+					// eq. 21
+					float cosHI = m.dot(omega_in);
+					float cosHO = m.dot(omega_out);
+					float Ht2 = m_eta * cosHI + cosHO;
+					Ht2 *= Ht2;
+					float out = (fabsf(cosHI * cosHO) * (m_eta * m_eta) * (G * D)) / (cosNO * Ht2);
+					// eq. 38 and eq. 17
+					pdf = pm * (m_eta * m_eta) * fabsf(cosHI) / Ht2;
+					eval.setValue(out, out, out);
 
 					/* disabled for now - gives texture filtering problems */
 #if 0
-                    // Since there is some blur to this refraction, make the
-                    // derivatives a bit bigger. In theory this varies with the
-                    // roughness but the exact relationship is complex and
-                    // requires more ops than are practical.
-                    domega_in_dx *= 10;
-                    domega_in_dy *= 10;
+					// Since there is some blur to this refraction, make the
+					// derivatives a bit bigger. In theory this varies with the
+					// roughness but the exact relationship is complex and
+					// requires more ops than are practical.
+					domega_in_dx *= 10;
+					domega_in_dy *= 10;
 #endif
-                }
-            }
-        }
-        return Refractive ? Labels::TRANSMIT : Labels::REFLECT;
-    }
+				}
+			}
+		}
+		return Refractive ? Labels::TRANSMIT : Labels::REFLECT;
+	}
 };
 
 
 
 ClosureParam bsdf_microfacet_ggx_params[] = {
-    CLOSURE_VECTOR_PARAM(MicrofacetGGXClosure<0>, m_N),
-    CLOSURE_FLOAT_PARAM (MicrofacetGGXClosure<0>, m_ag),
-    CLOSURE_STRING_KEYPARAM("label"),
-    CLOSURE_FINISH_PARAM(MicrofacetGGXClosure<0>) };
+	CLOSURE_VECTOR_PARAM(MicrofacetGGXClosure<0>, m_N),
+	CLOSURE_FLOAT_PARAM(MicrofacetGGXClosure<0>, m_ag),
+	CLOSURE_STRING_KEYPARAM("label"),
+	CLOSURE_FINISH_PARAM(MicrofacetGGXClosure<0>)
+};
 
 ClosureParam bsdf_microfacet_ggx_refraction_params[] = {
-    CLOSURE_VECTOR_PARAM(MicrofacetGGXClosure<1>, m_N),
-    CLOSURE_FLOAT_PARAM (MicrofacetGGXClosure<1>, m_ag),
-    CLOSURE_FLOAT_PARAM (MicrofacetGGXClosure<1>, m_eta),
-    CLOSURE_STRING_KEYPARAM("label"),
-    CLOSURE_FINISH_PARAM(MicrofacetGGXClosure<1>) };
+	CLOSURE_VECTOR_PARAM(MicrofacetGGXClosure<1>, m_N),
+	CLOSURE_FLOAT_PARAM(MicrofacetGGXClosure<1>, m_ag),
+	CLOSURE_FLOAT_PARAM(MicrofacetGGXClosure<1>, m_eta),
+	CLOSURE_STRING_KEYPARAM("label"),
+	CLOSURE_FINISH_PARAM(MicrofacetGGXClosure<1>)
+};
 
 ClosureParam bsdf_microfacet_beckmann_params[] = {
-    CLOSURE_VECTOR_PARAM(MicrofacetBeckmannClosure<0>, m_N),
-    CLOSURE_FLOAT_PARAM (MicrofacetBeckmannClosure<0>, m_ab),
-    CLOSURE_STRING_KEYPARAM("label"),
-    CLOSURE_FINISH_PARAM(MicrofacetBeckmannClosure<0>) };
+	CLOSURE_VECTOR_PARAM(MicrofacetBeckmannClosure<0>, m_N),
+	CLOSURE_FLOAT_PARAM(MicrofacetBeckmannClosure<0>, m_ab),
+	CLOSURE_STRING_KEYPARAM("label"),
+	CLOSURE_FINISH_PARAM(MicrofacetBeckmannClosure<0>)
+};
 
 ClosureParam bsdf_microfacet_beckmann_refraction_params[] = {
-    CLOSURE_VECTOR_PARAM(MicrofacetBeckmannClosure<1>, m_N),
-    CLOSURE_FLOAT_PARAM (MicrofacetBeckmannClosure<1>, m_ab),
-    CLOSURE_FLOAT_PARAM (MicrofacetBeckmannClosure<1>, m_eta),
-    CLOSURE_STRING_KEYPARAM("label"),
-    CLOSURE_FINISH_PARAM(MicrofacetBeckmannClosure<1>) };
+	CLOSURE_VECTOR_PARAM(MicrofacetBeckmannClosure<1>, m_N),
+	CLOSURE_FLOAT_PARAM(MicrofacetBeckmannClosure<1>, m_ab),
+	CLOSURE_FLOAT_PARAM(MicrofacetBeckmannClosure<1>, m_eta),
+	CLOSURE_STRING_KEYPARAM("label"),
+	CLOSURE_FINISH_PARAM(MicrofacetBeckmannClosure<1>)
+};
 
 CLOSURE_PREPARE(bsdf_microfacet_ggx_prepare,                 MicrofacetGGXClosure<0>)
 CLOSURE_PREPARE(bsdf_microfacet_ggx_refraction_prepare,      MicrofacetGGXClosure<1>)
diff --git a/intern/cycles/kernel/osl/bsdf_oren_nayar.cpp b/intern/cycles/kernel/osl/bsdf_oren_nayar.cpp
index a42c81e78f3..83d0e583695 100644
--- a/intern/cycles/kernel/osl/bsdf_oren_nayar.cpp
+++ b/intern/cycles/kernel/osl/bsdf_oren_nayar.cpp
@@ -16,67 +16,46 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-/*
- *	An implementation of Oren-Nayar reflectance model, public domain
- *		http://www1.cs.columbia.edu/CAVE/publications/pdfs/Oren_SIGGRAPH94.pdf
- *
- *	NOTE:
- *		BSDF = A + B * cos() * sin() * tan()
- *
- *		The parameter sigma means different from original.
- *		A and B are calculated by the following formula:
- *			0 <= sigma <= 1
- *			A =     1 / ((1 + sigma / 2) * pi);
- *			B = sigma / ((1 + sigma / 2) * pi);
- *
- *		This formula is derived as following:
- *
- *		0. Normalize A-term and B-term of BSDF *individually*.
- *		   B-term is normalized at maximum point: dot(L, N) = 0.
- *			A = (1/pi) * A'
- *			B = (2/pi) * B'
- *
- *		1. Solve the following equation:
- *			A' + B' = 1
- *			B / A = sigma
- */
-
 #include <OpenImageIO/fmath.h>
 #include <OSL/genclosure.h>
 #include "osl_closures.h"
+#include "util_math.h"
 
 CCL_NAMESPACE_BEGIN
 
 using namespace OSL;
 
 
-class OrenNayarClosure: public BSDFClosure {
+class OrenNayarClosure : public BSDFClosure {
 public:
 	Vec3 m_N;
 	float m_sigma;
 	float m_a, m_b;
 
-	OrenNayarClosure(): BSDFClosure(Labels::DIFFUSE) {}
+	OrenNayarClosure() : BSDFClosure(Labels::DIFFUSE) {}
 
 	void setup() {
 		m_sigma = clamp(m_sigma, 0.0f, 1.0f);
-		m_a =    1.0f / ((1.0f + 0.5f * m_sigma) * M_PI);
-		m_b = m_sigma / ((1.0f + 0.5f * m_sigma) * M_PI);
+		
+		float div = 1.0f / (M_PI + ((3.0f * M_PI - 4.0f) / 6.0f) * m_sigma);
+
+		m_a =    1.0f * div;
+		m_b = m_sigma * div;
 	}
 
-	bool mergeable(const ClosurePrimitive* other) const {
-		const OrenNayarClosure* comp = static_cast<const OrenNayarClosure*>(other);
+	bool mergeable(const ClosurePrimitive *other) const {
+		const OrenNayarClosure *comp = static_cast<const OrenNayarClosure *>(other);
 		return
-			m_N == comp->m_N &&
-			m_sigma == comp->m_sigma &&
-			BSDFClosure::mergeable(other);
+		    m_N == comp->m_N &&
+		    m_sigma == comp->m_sigma &&
+		    BSDFClosure::mergeable(other);
 	}
 
 	size_t memsize() const {
 		return sizeof(*this);
 	}
 
-	const char* name() const {
+	const char *name() const {
 		return "oren_nayar";
 	}
 
@@ -108,13 +87,13 @@ public:
 	}
 
 	ustring sample(
-		const Vec3& Ng,
-		const Vec3& omega_out, const Vec3& domega_out_dx, const Vec3& domega_out_dy,
-		float randu, float randv,
-		Vec3& omega_in, Vec3& domega_in_dx, Vec3& domega_in_dy,
-		float& pdf, Color3& eval
-	) const {
-		sample_uniform_hemisphere (m_N, omega_out, randu, randv, omega_in, pdf);
+	    const Vec3& Ng,
+	    const Vec3& omega_out, const Vec3& domega_out_dx, const Vec3& domega_out_dy,
+	    float randu, float randv,
+	    Vec3& omega_in, Vec3& domega_in_dx, Vec3& domega_in_dy,
+	    float& pdf, Color3& eval
+	    ) const {
+		sample_uniform_hemisphere(m_N, omega_out, randu, randv, omega_in, pdf);
 
 		if (Ng.dot(omega_in) > 0.0f) {
 			float is = get_intensity(m_N, omega_out, omega_in);
@@ -137,35 +116,20 @@ private:
 	float get_intensity(Vec3 const& n, Vec3 const& v, Vec3 const& l) const {
 		float nl = max(n.dot(l), 0.0f);
 		float nv = max(n.dot(v), 0.0f);
-
-		Vec3 al = l - nl * n;
-		al.normalize();
-		Vec3 av = v - nv * n;
-		av.normalize();
-		float t = max(al.dot(av), 0.0f);
-
-		float cos_a, cos_b;
-		if (nl < nv) {
-			cos_a = nl;
-			cos_b = nv;
+		float t = l.dot(v) - nl * nv;
+		
+		if (t > 0.0f) {
+			t /= max(nl, nv) + 1e-8f;
 		}
-		else {
-			cos_a = nv;
-			cos_b = nl;
-		}
-
-		float sin_a = sqrtf(1.0f - cos_a * cos_a);
-		float tan_b = sqrtf(1.0f - cos_b * cos_b) / (cos_b + FLT_MIN);
-
-		return nl * (m_a + m_b * t * sin_a * tan_b);
+		return nl * (m_a + m_b * t);
 	}
 };
 
 ClosureParam bsdf_oren_nayar_params[] = {
-	CLOSURE_VECTOR_PARAM	(OrenNayarClosure, m_N),
-	CLOSURE_FLOAT_PARAM		(OrenNayarClosure, m_sigma),
-	CLOSURE_STRING_KEYPARAM ("label"),
-	CLOSURE_FINISH_PARAM	(OrenNayarClosure)
+	CLOSURE_VECTOR_PARAM(OrenNayarClosure, m_N),
+	CLOSURE_FLOAT_PARAM(OrenNayarClosure, m_sigma),
+	CLOSURE_STRING_KEYPARAM("label"),
+	CLOSURE_FINISH_PARAM(OrenNayarClosure)
 };
 
 CLOSURE_PREPARE(bsdf_oren_nayar_prepare, OrenNayarClosure)
diff --git a/intern/cycles/kernel/osl/bsdf_reflection.cpp b/intern/cycles/kernel/osl/bsdf_reflection.cpp
index b0caff6df44..7041b4ced6f 100644
--- a/intern/cycles/kernel/osl/bsdf_reflection.cpp
+++ b/intern/cycles/kernel/osl/bsdf_reflection.cpp
@@ -42,65 +42,66 @@ using namespace OSL;
 
 class ReflectionClosure : public BSDFClosure {
 public:
-    Vec3  m_N;    // shading normal
-    ReflectionClosure() : BSDFClosure(Labels::SINGULAR) { }
-
-    void setup() {};
-
-    bool mergeable (const ClosurePrimitive *other) const {
-        const ReflectionClosure *comp = (const ReflectionClosure *)other;
-        return m_N == comp->m_N && BSDFClosure::mergeable(other);
-    }
-
-    size_t memsize () const { return sizeof(*this); }
-
-    const char *name () const { return "reflection"; }
-
-    void print_on (std::ostream &out) const {
-        out << name() << " (";
-        out << "(" << m_N[0] << ", " << m_N[1] << ", " << m_N[2] << "))";
-    }
-
-    float albedo (const Vec3 &omega_out) const
-    {
-        return 1.0f;
-    }
-
-    Color3 eval_reflect (const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
-    {
-        return Color3 (0, 0, 0);
-    }
-
-    Color3 eval_transmit (const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
-    {
-        return Color3 (0, 0, 0);
-    }
-
-    ustring sample (const Vec3 &Ng,
-                 const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
-                 float randu, float randv,
-                 Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
-                 float &pdf, Color3 &eval) const
-    {
-        // only one direction is possible
-        float cosNO = m_N.dot(omega_out);
-        if (cosNO > 0) {
-            omega_in = (2 * cosNO) * m_N - omega_out;
-            if (Ng.dot(omega_in) > 0) {
-                domega_in_dx = 2 * m_N.dot(domega_out_dx) * m_N - domega_out_dx;
-                domega_in_dy = 2 * m_N.dot(domega_out_dy) * m_N - domega_out_dy;
-                pdf = 1;
-                eval.setValue(1, 1, 1);
-            }
-        }
-        return Labels::REFLECT;
-    }
+	Vec3 m_N;     // shading normal
+	ReflectionClosure() : BSDFClosure(Labels::SINGULAR) {}
+
+	void setup() {};
+
+	bool mergeable(const ClosurePrimitive *other) const {
+		const ReflectionClosure *comp = (const ReflectionClosure *)other;
+		return m_N == comp->m_N && BSDFClosure::mergeable(other);
+	}
+
+	size_t memsize() const { return sizeof(*this); }
+
+	const char *name() const { return "reflection"; }
+
+	void print_on(std::ostream &out) const {
+		out << name() << " (";
+		out << "(" << m_N[0] << ", " << m_N[1] << ", " << m_N[2] << "))";
+	}
+
+	float albedo(const Vec3 &omega_out) const
+	{
+		return 1.0f;
+	}
+
+	Color3 eval_reflect(const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
+	{
+		return Color3(0, 0, 0);
+	}
+
+	Color3 eval_transmit(const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
+	{
+		return Color3(0, 0, 0);
+	}
+
+	ustring sample(const Vec3 &Ng,
+	               const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
+	               float randu, float randv,
+	               Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
+	               float &pdf, Color3 &eval) const
+	{
+		// only one direction is possible
+		float cosNO = m_N.dot(omega_out);
+		if (cosNO > 0) {
+			omega_in = (2 * cosNO) * m_N - omega_out;
+			if (Ng.dot(omega_in) > 0) {
+				domega_in_dx = 2 * m_N.dot(domega_out_dx) * m_N - domega_out_dx;
+				domega_in_dy = 2 * m_N.dot(domega_out_dy) * m_N - domega_out_dy;
+				pdf = 1;
+				eval.setValue(1, 1, 1);
+			}
+		}
+		return Labels::REFLECT;
+	}
 };
 
 ClosureParam bsdf_reflection_params[] = {
-    CLOSURE_VECTOR_PARAM(ReflectionClosure, m_N),
-    CLOSURE_STRING_KEYPARAM("label"),
-    CLOSURE_FINISH_PARAM(ReflectionClosure) };
+	CLOSURE_VECTOR_PARAM(ReflectionClosure, m_N),
+	CLOSURE_STRING_KEYPARAM("label"),
+	CLOSURE_FINISH_PARAM(ReflectionClosure)
+};
 
 CLOSURE_PREPARE(bsdf_reflection_prepare, ReflectionClosure)
 
diff --git a/intern/cycles/kernel/osl/bsdf_refraction.cpp b/intern/cycles/kernel/osl/bsdf_refraction.cpp
index 3ae7a3811b4..f56ad7b127c 100644
--- a/intern/cycles/kernel/osl/bsdf_refraction.cpp
+++ b/intern/cycles/kernel/osl/bsdf_refraction.cpp
@@ -42,77 +42,78 @@ using namespace OSL;
 
 class RefractionClosure : public BSDFClosure {
 public:
-    Vec3  m_N;     // shading normal
-    float m_eta;   // ratio of indices of refraction (inside / outside)
-    RefractionClosure() : BSDFClosure(Labels::SINGULAR, Back) { }
+	Vec3 m_N;      // shading normal
+	float m_eta;   // ratio of indices of refraction (inside / outside)
+	RefractionClosure() : BSDFClosure(Labels::SINGULAR, Back) {}
 
-    void setup() {}
+	void setup() {}
 
-    bool mergeable (const ClosurePrimitive *other) const {
-        const RefractionClosure *comp = (const RefractionClosure *)other;
-        return m_N == comp->m_N && m_eta == comp->m_eta &&
-            BSDFClosure::mergeable(other);
-    }
+	bool mergeable(const ClosurePrimitive *other) const {
+		const RefractionClosure *comp = (const RefractionClosure *)other;
+		return m_N == comp->m_N && m_eta == comp->m_eta &&
+		       BSDFClosure::mergeable(other);
+	}
 
-    size_t memsize () const { return sizeof(*this); }
+	size_t memsize() const { return sizeof(*this); }
 
-    const char *name () const { return "refraction"; }
+	const char *name() const { return "refraction"; }
 
-    void print_on (std::ostream &out) const {
-        out << name() << " (";
-        out << "(" << m_N[0] << ", " << m_N[1] << ", " << m_N[2] << "), ";
-        out << m_eta;
-        out << ")";
-    }
+	void print_on(std::ostream &out) const {
+		out << name() << " (";
+		out << "(" << m_N[0] << ", " << m_N[1] << ", " << m_N[2] << "), ";
+		out << m_eta;
+		out << ")";
+	}
 
-    Color3 eval_reflect (const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
-    {
-        return Color3 (0, 0, 0);
-    }
+	Color3 eval_reflect(const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
+	{
+		return Color3(0, 0, 0);
+	}
 
-    Color3 eval_transmit (const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
-    {
-        return Color3 (0, 0, 0);
-    }
+	Color3 eval_transmit(const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
+	{
+		return Color3(0, 0, 0);
+	}
 
-    float albedo (const Vec3 &omega_out) const
-    {
+	float albedo(const Vec3 &omega_out) const
+	{
 		return 1.0f;
-    }
-
-    ustring sample (const Vec3 &Ng,
-                 const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
-                 float randu, float randv,
-                 Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
-                 float &pdf, Color3 &eval) const
-    {
-        Vec3 R, dRdx, dRdy;
-        Vec3 T, dTdx, dTdy;
-        bool inside;
-
-        fresnel_dielectric(m_eta, m_N,
-                           omega_out, domega_out_dx, domega_out_dy,
-                           R, dRdx, dRdy,
-                           T, dTdx, dTdy,
-                           inside);
-
-        if (!inside) {
-            pdf = 1;
-            eval.setValue(1.0f, 1.0f, 1.0f);
-            omega_in = T;
-            domega_in_dx = dTdx;
-            domega_in_dy = dTdy;
-        }
-
-        return Labels::TRANSMIT;
-    }
+	}
+
+	ustring sample(const Vec3 &Ng,
+	               const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
+	               float randu, float randv,
+	               Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
+	               float &pdf, Color3 &eval) const
+	{
+		Vec3 R, dRdx, dRdy;
+		Vec3 T, dTdx, dTdy;
+		bool inside;
+
+		fresnel_dielectric(m_eta, m_N,
+		                   omega_out, domega_out_dx, domega_out_dy,
+		                   R, dRdx, dRdy,
+		                   T, dTdx, dTdy,
+		                   inside);
+
+		if (!inside) {
+			pdf = 1;
+			eval.setValue(1.0f, 1.0f, 1.0f);
+			omega_in = T;
+			domega_in_dx = dTdx;
+			domega_in_dy = dTdy;
+		}
+
+		return Labels::TRANSMIT;
+	}
 };
 
 ClosureParam bsdf_refraction_params[] = {
-    CLOSURE_VECTOR_PARAM(RefractionClosure, m_N),
-    CLOSURE_FLOAT_PARAM (RefractionClosure, m_eta),
-    CLOSURE_STRING_KEYPARAM("label"),
-    CLOSURE_FINISH_PARAM(RefractionClosure) };
+	CLOSURE_VECTOR_PARAM(RefractionClosure, m_N),
+	CLOSURE_FLOAT_PARAM(RefractionClosure, m_eta),
+	CLOSURE_STRING_KEYPARAM("label"),
+	CLOSURE_FINISH_PARAM(RefractionClosure)
+};
 
 CLOSURE_PREPARE(bsdf_refraction_prepare, RefractionClosure)
 
diff --git a/intern/cycles/kernel/osl/bsdf_transparent.cpp b/intern/cycles/kernel/osl/bsdf_transparent.cpp
index 941abd6a483..acde92530a2 100644
--- a/intern/cycles/kernel/osl/bsdf_transparent.cpp
+++ b/intern/cycles/kernel/osl/bsdf_transparent.cpp
@@ -42,54 +42,55 @@ using namespace OSL;
 
 class TransparentClosure : public BSDFClosure {
 public:
-    TransparentClosure() : BSDFClosure(Labels::STRAIGHT, Back) { }
-
-    void setup() {}
-
-    size_t memsize () const { return sizeof(*this); }
-
-    const char *name () const { return "transparent"; }
-
-    void print_on (std::ostream &out) const {
-        out << name() << " ()";
-    }
-
-    float albedo (const Vec3 &omega_out) const
-    {
-        return 1.0f;
-    }
-
-    Color3 eval_reflect (const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
-    {
-        return Color3 (0, 0, 0);
-    }
-
-    Color3 eval_transmit (const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
-    {
-        return Color3 (0, 0, 0);
-    }
-
-    ustring sample (const Vec3 &Ng,
-                 const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
-                 float randu, float randv,
-                 Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
-                 float &pdf, Color3 &eval) const
-    {
-        // only one direction is possible
-        omega_in = -omega_out;
-        domega_in_dx = -domega_out_dx;
-        domega_in_dy = -domega_out_dy;
-        pdf = 1;
-        eval.setValue(1, 1, 1);
-        return Labels::TRANSMIT;
-    }
+	TransparentClosure() : BSDFClosure(Labels::STRAIGHT, Back) {}
+
+	void setup() {}
+
+	size_t memsize() const { return sizeof(*this); }
+
+	const char *name() const { return "transparent"; }
+
+	void print_on(std::ostream &out) const {
+		out << name() << " ()";
+	}
+
+	float albedo(const Vec3 &omega_out) const
+	{
+		return 1.0f;
+	}
+
+	Color3 eval_reflect(const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
+	{
+		return Color3(0, 0, 0);
+	}
+
+	Color3 eval_transmit(const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
+	{
+		return Color3(0, 0, 0);
+	}
+
+	ustring sample(const Vec3 &Ng,
+	               const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
+	               float randu, float randv,
+	               Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
+	               float &pdf, Color3 &eval) const
+	{
+		// only one direction is possible
+		omega_in = -omega_out;
+		domega_in_dx = -domega_out_dx;
+		domega_in_dy = -domega_out_dy;
+		pdf = 1;
+		eval.setValue(1, 1, 1);
+		return Labels::TRANSMIT;
+	}
 };
 
 
 
 ClosureParam bsdf_transparent_params[] = {
-    CLOSURE_STRING_KEYPARAM("label"),
-    CLOSURE_FINISH_PARAM(TransparentClosure) };
+	CLOSURE_STRING_KEYPARAM("label"),
+	CLOSURE_FINISH_PARAM(TransparentClosure)
+};
 
 CLOSURE_PREPARE(bsdf_transparent_prepare, TransparentClosure)
 
diff --git a/intern/cycles/kernel/osl/bsdf_ward.cpp b/intern/cycles/kernel/osl/bsdf_ward.cpp
index a7742a04d13..4aacbc4ffc3 100644
--- a/intern/cycles/kernel/osl/bsdf_ward.cpp
+++ b/intern/cycles/kernel/osl/bsdf_ward.cpp
@@ -46,175 +46,179 @@ using namespace OSL;
 // see http://www.graphics.cornell.edu/~bjw/wardnotes.pdf 
 class WardClosure : public BSDFClosure {
 public:
-    Vec3 m_N;
-    Vec3 m_T;
-    float m_ax, m_ay;
-    WardClosure() : BSDFClosure(Labels::GLOSSY) { }
+	Vec3 m_N;
+	Vec3 m_T;
+	float m_ax, m_ay;
+	WardClosure() : BSDFClosure(Labels::GLOSSY) {}
 
-    void setup()
+	void setup()
 	{
 		m_ax = clamp(m_ax, 1e-5f, 1.0f);
 		m_ay = clamp(m_ay, 1e-5f, 1.0f);
 	}
 
-    bool mergeable (const ClosurePrimitive *other) const {
-        const WardClosure *comp = (const WardClosure *)other;
-        return m_N == comp->m_N && m_T == comp->m_T &&
-            m_ax == comp->m_ax && m_ay == comp->m_ay &&
-            BSDFClosure::mergeable(other);
-    }
-
-    size_t memsize () const { return sizeof(*this); }
-
-    const char *name () const { return "ward"; }
-
-    void print_on (std::ostream &out) const {
-        out << name() << " ((";
-        out << m_N[0] << ", " << m_N[1] << ", " << m_N[2] << "), (";
-        out << m_T[0] << ", " << m_T[1] << ", " << m_T[2] << "), ";
-        out << m_ax << ", " << m_ay << ")";
-    }
-
-    float albedo (const Vec3 &omega_out) const
-    {
-        return 1.0f;
-    }
-
-    Color3 eval_reflect (const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
-    {
-        float cosNO = m_N.dot(omega_out);
-        float cosNI = m_N.dot(omega_in);
-        if (cosNI > 0 && cosNO > 0) {
-            // get half vector and get x,y basis on the surface for anisotropy
-            Vec3 H = omega_in + omega_out;
-            H.normalize();  // normalize needed for pdf
-            Vec3 X, Y;
-            make_orthonormals(m_N, m_T, X, Y);
-            // eq. 4
-            float dotx = H.dot(X) / m_ax;
-            float doty = H.dot(Y) / m_ay;
-            float dotn = H.dot(m_N);
-            float exp_arg = (dotx * dotx + doty * doty) / (dotn * dotn);
-            float denom = (4 * (float) M_PI * m_ax * m_ay * sqrtf(cosNO * cosNI));
-            float exp_val = expf(-exp_arg);
-            float out = cosNI * exp_val / denom;
-            float oh = H.dot(omega_out);
-            denom = 4 * (float) M_PI * m_ax * m_ay * oh * dotn * dotn * dotn;
-            pdf = exp_val / denom;
-            return Color3 (out, out, out);
-        }
-        return Color3 (0, 0, 0);
-    }
-
-    Color3 eval_transmit (const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
-    {
-        return Color3 (0, 0, 0);
-    }
-
-    ustring sample (const Vec3 &Ng,
-                 const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
-                 float randu, float randv,
-                 Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
-                 float &pdf, Color3 &eval) const
-    {
-        float cosNO = m_N.dot(omega_out);
-        if (cosNO > 0) {
-            // get x,y basis on the surface for anisotropy
-            Vec3 X, Y;
-            make_orthonormals(m_N, m_T, X, Y);
-            // generate random angles for the half vector
-            // eq. 7 (taking care around discontinuities to keep
-            //        output angle in the right quadrant)
-            // we take advantage of cos(atan(x)) == 1/sqrt(1+x^2)
-            //                  and sin(atan(x)) == x/sqrt(1+x^2)
-            float alphaRatio = m_ay / m_ax;
-            float cosPhi, sinPhi;
-            if (randu < 0.25f) {
-                float val = 4 * randu;
-                float tanPhi = alphaRatio * tanf((float) M_PI_2 * val);
-                cosPhi = 1 / sqrtf(1 + tanPhi * tanPhi);
-                sinPhi = tanPhi * cosPhi;
-            } else if (randu < 0.5) {
-                float val = 1 - 4 * (0.5f - randu);
-                float tanPhi = alphaRatio * tanf((float) M_PI_2 * val);
-                // phi = (float) M_PI - phi;
-                cosPhi = -1 / sqrtf(1 + tanPhi * tanPhi);
-                sinPhi = -tanPhi * cosPhi;
-            } else if (randu < 0.75f) {
-                float val = 4 * (randu - 0.5f);
-                float tanPhi = alphaRatio * tanf((float) M_PI_2 * val);
-                //phi = (float) M_PI + phi;
-                cosPhi = -1 / sqrtf(1 + tanPhi * tanPhi);
-                sinPhi = tanPhi * cosPhi;
-            } else {
-                float val = 1 - 4 * (1 - randu);
-                float tanPhi = alphaRatio * tanf((float) M_PI_2 * val);
-                // phi = 2 * (float) M_PI - phi;
-                cosPhi = 1 / sqrtf(1 + tanPhi * tanPhi);
-                sinPhi = -tanPhi * cosPhi;
-            }
-            // eq. 6
-            // we take advantage of cos(atan(x)) == 1/sqrt(1+x^2)
-            //                  and sin(atan(x)) == x/sqrt(1+x^2)
-            float thetaDenom = (cosPhi * cosPhi) / (m_ax * m_ax) + (sinPhi * sinPhi) / (m_ay * m_ay);
-            float tanTheta2 = -logf(1 - randv) / thetaDenom;
-            float cosTheta  = 1 / sqrtf(1 + tanTheta2);
-            float sinTheta  = cosTheta * sqrtf(tanTheta2);
-
-            Vec3 h; // already normalized becaused expressed from spherical coordinates
-            h.x = sinTheta * cosPhi;
-            h.y = sinTheta * sinPhi;
-            h.z = cosTheta;
-            // compute terms that are easier in local space
-            float dotx = h.x / m_ax;
-            float doty = h.y / m_ay;
-            float dotn = h.z;
-            // transform to world space
-            h = h.x * X + h.y * Y + h.z * m_N;
-            // generate the final sample
-            float oh = h.dot(omega_out);
-            omega_in.x = 2 * oh * h.x - omega_out.x;
-            omega_in.y = 2 * oh * h.y - omega_out.y;
-            omega_in.z = 2 * oh * h.z - omega_out.z;
-            if (Ng.dot(omega_in) > 0) {
-                float cosNI = m_N.dot(omega_in);
-                if (cosNI > 0) {
-                    // eq. 9
-                    float exp_arg = (dotx * dotx + doty * doty) / (dotn * dotn);
-                    float denom = 4 * (float) M_PI * m_ax * m_ay * oh * dotn * dotn * dotn;
-                    pdf = expf(-exp_arg) / denom;
-                    // compiler will reuse expressions already computed
-                    denom = (4 * (float) M_PI * m_ax * m_ay * sqrtf(cosNO * cosNI));
-                    float power = cosNI * expf(-exp_arg) / denom;
-                    eval.setValue(power, power, power);
-                    domega_in_dx = (2 * m_N.dot(domega_out_dx)) * m_N - domega_out_dx;
-                    domega_in_dy = (2 * m_N.dot(domega_out_dy)) * m_N - domega_out_dy;
+	bool mergeable(const ClosurePrimitive *other) const {
+		const WardClosure *comp = (const WardClosure *)other;
+		return m_N == comp->m_N && m_T == comp->m_T &&
+		       m_ax == comp->m_ax && m_ay == comp->m_ay &&
+		       BSDFClosure::mergeable(other);
+	}
+
+	size_t memsize() const { return sizeof(*this); }
+
+	const char *name() const { return "ward"; }
+
+	void print_on(std::ostream &out) const {
+		out << name() << " ((";
+		out << m_N[0] << ", " << m_N[1] << ", " << m_N[2] << "), (";
+		out << m_T[0] << ", " << m_T[1] << ", " << m_T[2] << "), ";
+		out << m_ax << ", " << m_ay << ")";
+	}
+
+	float albedo(const Vec3 &omega_out) const
+	{
+		return 1.0f;
+	}
+
+	Color3 eval_reflect(const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
+	{
+		float cosNO = m_N.dot(omega_out);
+		float cosNI = m_N.dot(omega_in);
+		if (cosNI > 0 && cosNO > 0) {
+			// get half vector and get x,y basis on the surface for anisotropy
+			Vec3 H = omega_in + omega_out;
+			H.normalize();  // normalize needed for pdf
+			Vec3 X, Y;
+			make_orthonormals(m_N, m_T, X, Y);
+			// eq. 4
+			float dotx = H.dot(X) / m_ax;
+			float doty = H.dot(Y) / m_ay;
+			float dotn = H.dot(m_N);
+			float exp_arg = (dotx * dotx + doty * doty) / (dotn * dotn);
+			float denom = (4 * (float) M_PI * m_ax * m_ay * sqrtf(cosNO * cosNI));
+			float exp_val = expf(-exp_arg);
+			float out = cosNI * exp_val / denom;
+			float oh = H.dot(omega_out);
+			denom = 4 * (float) M_PI * m_ax * m_ay * oh * dotn * dotn * dotn;
+			pdf = exp_val / denom;
+			return Color3(out, out, out);
+		}
+		return Color3(0, 0, 0);
+	}
+
+	Color3 eval_transmit(const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
+	{
+		return Color3(0, 0, 0);
+	}
+
+	ustring sample(const Vec3 &Ng,
+	               const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
+	               float randu, float randv,
+	               Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
+	               float &pdf, Color3 &eval) const
+	{
+		float cosNO = m_N.dot(omega_out);
+		if (cosNO > 0) {
+			// get x,y basis on the surface for anisotropy
+			Vec3 X, Y;
+			make_orthonormals(m_N, m_T, X, Y);
+			// generate random angles for the half vector
+			// eq. 7 (taking care around discontinuities to keep
+			//        output angle in the right quadrant)
+			// we take advantage of cos(atan(x)) == 1/sqrt(1+x^2)
+			//                  and sin(atan(x)) == x/sqrt(1+x^2)
+			float alphaRatio = m_ay / m_ax;
+			float cosPhi, sinPhi;
+			if (randu < 0.25f) {
+				float val = 4 * randu;
+				float tanPhi = alphaRatio * tanf((float) M_PI_2 * val);
+				cosPhi = 1 / sqrtf(1 + tanPhi * tanPhi);
+				sinPhi = tanPhi * cosPhi;
+			}
+			else if (randu < 0.5) {
+				float val = 1 - 4 * (0.5f - randu);
+				float tanPhi = alphaRatio * tanf((float) M_PI_2 * val);
+				// phi = (float) M_PI - phi;
+				cosPhi = -1 / sqrtf(1 + tanPhi * tanPhi);
+				sinPhi = -tanPhi * cosPhi;
+			}
+			else if (randu < 0.75f) {
+				float val = 4 * (randu - 0.5f);
+				float tanPhi = alphaRatio * tanf((float) M_PI_2 * val);
+				//phi = (float) M_PI + phi;
+				cosPhi = -1 / sqrtf(1 + tanPhi * tanPhi);
+				sinPhi = tanPhi * cosPhi;
+			}
+			else {
+				float val = 1 - 4 * (1 - randu);
+				float tanPhi = alphaRatio * tanf((float) M_PI_2 * val);
+				// phi = 2 * (float) M_PI - phi;
+				cosPhi = 1 / sqrtf(1 + tanPhi * tanPhi);
+				sinPhi = -tanPhi * cosPhi;
+			}
+			// eq. 6
+			// we take advantage of cos(atan(x)) == 1/sqrt(1+x^2)
+			//                  and sin(atan(x)) == x/sqrt(1+x^2)
+			float thetaDenom = (cosPhi * cosPhi) / (m_ax * m_ax) + (sinPhi * sinPhi) / (m_ay * m_ay);
+			float tanTheta2 = -logf(1 - randv) / thetaDenom;
+			float cosTheta  = 1 / sqrtf(1 + tanTheta2);
+			float sinTheta  = cosTheta * sqrtf(tanTheta2);
+
+			Vec3 h; // already normalized becaused expressed from spherical coordinates
+			h.x = sinTheta * cosPhi;
+			h.y = sinTheta * sinPhi;
+			h.z = cosTheta;
+			// compute terms that are easier in local space
+			float dotx = h.x / m_ax;
+			float doty = h.y / m_ay;
+			float dotn = h.z;
+			// transform to world space
+			h = h.x * X + h.y * Y + h.z * m_N;
+			// generate the final sample
+			float oh = h.dot(omega_out);
+			omega_in.x = 2 * oh * h.x - omega_out.x;
+			omega_in.y = 2 * oh * h.y - omega_out.y;
+			omega_in.z = 2 * oh * h.z - omega_out.z;
+			if (Ng.dot(omega_in) > 0) {
+				float cosNI = m_N.dot(omega_in);
+				if (cosNI > 0) {
+					// eq. 9
+					float exp_arg = (dotx * dotx + doty * doty) / (dotn * dotn);
+					float denom = 4 * (float) M_PI * m_ax * m_ay * oh * dotn * dotn * dotn;
+					pdf = expf(-exp_arg) / denom;
+					// compiler will reuse expressions already computed
+					denom = (4 * (float) M_PI * m_ax * m_ay * sqrtf(cosNO * cosNI));
+					float power = cosNI * expf(-exp_arg) / denom;
+					eval.setValue(power, power, power);
+					domega_in_dx = (2 * m_N.dot(domega_out_dx)) * m_N - domega_out_dx;
+					domega_in_dy = (2 * m_N.dot(domega_out_dy)) * m_N - domega_out_dy;
 
 					/* disabled for now - gives texture filtering problems */
 #if 0
-                    // Since there is some blur to this reflection, make the
-                    // derivatives a bit bigger. In theory this varies with the
-                    // roughness but the exact relationship is complex and
-                    // requires more ops than are practical.
-                    domega_in_dx *= 10;
-                    domega_in_dy *= 10;
+					// Since there is some blur to this reflection, make the
+					// derivatives a bit bigger. In theory this varies with the
+					// roughness but the exact relationship is complex and
+					// requires more ops than are practical.
+					domega_in_dx *= 10;
+					domega_in_dy *= 10;
 #endif
-                }
-            }
-        }
-        return Labels::REFLECT;
-    }
+				}
+			}
+		}
+		return Labels::REFLECT;
+	}
 };
 
 
 
 ClosureParam bsdf_ward_params[] = {
-    CLOSURE_VECTOR_PARAM(WardClosure, m_N),
-    CLOSURE_VECTOR_PARAM(WardClosure, m_T),
-    CLOSURE_FLOAT_PARAM (WardClosure, m_ax),
-    CLOSURE_FLOAT_PARAM (WardClosure, m_ay),
-    CLOSURE_STRING_KEYPARAM("label"),
-    CLOSURE_FINISH_PARAM(WardClosure) };
+	CLOSURE_VECTOR_PARAM(WardClosure, m_N),
+	CLOSURE_VECTOR_PARAM(WardClosure, m_T),
+	CLOSURE_FLOAT_PARAM(WardClosure, m_ax),
+	CLOSURE_FLOAT_PARAM(WardClosure, m_ay),
+	CLOSURE_STRING_KEYPARAM("label"),
+	CLOSURE_FINISH_PARAM(WardClosure)
+};
 
 CLOSURE_PREPARE(bsdf_ward_prepare, WardClosure)
 
diff --git a/intern/cycles/kernel/osl/bsdf_westin.cpp b/intern/cycles/kernel/osl/bsdf_westin.cpp
index d322f6a7f7e..a476e8045f7 100644
--- a/intern/cycles/kernel/osl/bsdf_westin.cpp
+++ b/intern/cycles/kernel/osl/bsdf_westin.cpp
@@ -44,193 +44,197 @@ using namespace OSL;
 
 class WestinBackscatterClosure : public BSDFClosure {
 public:
-    Vec3 m_N;
-    float m_roughness;
-    float m_invroughness;
-    WestinBackscatterClosure() : BSDFClosure(Labels::GLOSSY) { }
+	Vec3 m_N;
+	float m_roughness;
+	float m_invroughness;
+	WestinBackscatterClosure() : BSDFClosure(Labels::GLOSSY) {}
 
-    void setup()
-    {
+	void setup()
+	{
 		m_roughness = clamp(m_roughness, 1e-5f, 1.0f);
-        m_invroughness = m_roughness > 0 ? 1 / m_roughness : 0;
-    }
-
-    bool mergeable (const ClosurePrimitive *other) const {
-        const WestinBackscatterClosure *comp = (const WestinBackscatterClosure *)other;
-        return m_N == comp->m_N && m_roughness == comp->m_roughness &&
-            BSDFClosure::mergeable(other);
-    }
-
-    size_t memsize () const { return sizeof(*this); }
-
-    const char *name () const { return "westin_backscatter"; }
-
-    void print_on (std::ostream &out) const
-    {
-        out << name() << " (";
-        out << "(" << m_N[0] << ", " << m_N[1] << ", " << m_N[2] << "), ";
-        out << m_roughness;
-        out << ")";
-    }
-
-    float albedo (const Vec3 &omega_out) const
-    {
-        return 1.0f;
-    }
-
-    Color3 eval_reflect (const Vec3 &omega_out, const Vec3 &omega_in, float &pdf) const
-    {
-        // pdf is implicitly 0 (no indirect sampling)
-        float cosNO = m_N.dot(omega_out);
-        float cosNI = m_N.dot(omega_in);
-        if (cosNO > 0 && cosNI > 0) {
-            float cosine = omega_out.dot(omega_in);
-            pdf = cosine > 0 ? (m_invroughness + 1) * powf(cosine, m_invroughness) : 0;
-            pdf *= 0.5f * float(M_1_PI);
-            return Color3 (pdf, pdf, pdf);
-        }
-        return Color3 (0, 0, 0);
-    }
-
-    Color3 eval_transmit (const Vec3 &omega_out, const Vec3 &omega_in, float &pdf) const
-    {
-        return Color3 (0, 0, 0);
-    }
-
-    ustring sample (const Vec3 &Ng,
-                 const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
-                 float randu, float randv,
-                 Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
-                 float &pdf, Color3 &eval) const
-    {
-        float cosNO = m_N.dot(omega_out);
-        if (cosNO > 0) {
-            domega_in_dx = domega_out_dx;
-            domega_in_dy = domega_out_dy;
-            Vec3 T, B;
-            make_orthonormals (omega_out, T, B);
-            float phi = 2 * (float) M_PI * randu;
-            float cosTheta = powf(randv, 1 / (m_invroughness + 1));
-            float sinTheta2 = 1 - cosTheta * cosTheta;
-            float sinTheta = sinTheta2 > 0 ? sqrtf(sinTheta2) : 0;
-            omega_in = (cosf(phi) * sinTheta) * T +
-                       (sinf(phi) * sinTheta) * B +
-                       (            cosTheta) * omega_out;
-            if (Ng.dot(omega_in) > 0)
-            {
-                // common terms for pdf and eval
-                float cosNI = m_N.dot(omega_in);
-                // make sure the direction we chose is still in the right hemisphere
-                if (cosNI > 0)
-                {
-                    pdf = 0.5f * (float) M_1_PI * powf(cosTheta, m_invroughness);
-                    pdf = (m_invroughness + 1) * pdf;
-                    eval.setValue(pdf, pdf, pdf);
-                    // Since there is some blur to this reflection, make the
-                    // derivatives a bit bigger. In theory this varies with the
-                    // exponent but the exact relationship is complex and
-                    // requires more ops than are practical.
-                    domega_in_dx *= 10;
-                    domega_in_dy *= 10;
-                }
-            }
-        }
-        return Labels::REFLECT;
-    }
+		m_invroughness = m_roughness > 0 ? 1 / m_roughness : 0;
+	}
+
+	bool mergeable(const ClosurePrimitive *other) const {
+		const WestinBackscatterClosure *comp = (const WestinBackscatterClosure *)other;
+		return m_N == comp->m_N && m_roughness == comp->m_roughness &&
+		       BSDFClosure::mergeable(other);
+	}
+
+	size_t memsize() const { return sizeof(*this); }
+
+	const char *name() const { return "westin_backscatter"; }
+
+	void print_on(std::ostream &out) const
+	{
+		out << name() << " (";
+		out << "(" << m_N[0] << ", " << m_N[1] << ", " << m_N[2] << "), ";
+		out << m_roughness;
+		out << ")";
+	}
+
+	float albedo(const Vec3 &omega_out) const
+	{
+		return 1.0f;
+	}
+
+	Color3 eval_reflect(const Vec3 &omega_out, const Vec3 &omega_in, float &pdf) const
+	{
+		// pdf is implicitly 0 (no indirect sampling)
+		float cosNO = m_N.dot(omega_out);
+		float cosNI = m_N.dot(omega_in);
+		if (cosNO > 0 && cosNI > 0) {
+			float cosine = omega_out.dot(omega_in);
+			pdf = cosine > 0 ? (m_invroughness + 1) * powf(cosine, m_invroughness) : 0;
+			pdf *= 0.5f * float(M_1_PI);
+			return Color3(pdf, pdf, pdf);
+		}
+		return Color3(0, 0, 0);
+	}
+
+	Color3 eval_transmit(const Vec3 &omega_out, const Vec3 &omega_in, float &pdf) const
+	{
+		return Color3(0, 0, 0);
+	}
+
+	ustring sample(const Vec3 &Ng,
+	               const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
+	               float randu, float randv,
+	               Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
+	               float &pdf, Color3 &eval) const
+	{
+		float cosNO = m_N.dot(omega_out);
+		if (cosNO > 0) {
+			domega_in_dx = domega_out_dx;
+			domega_in_dy = domega_out_dy;
+			Vec3 T, B;
+			make_orthonormals(omega_out, T, B);
+			float phi = 2 * (float) M_PI * randu;
+			float cosTheta = powf(randv, 1 / (m_invroughness + 1));
+			float sinTheta2 = 1 - cosTheta * cosTheta;
+			float sinTheta = sinTheta2 > 0 ? sqrtf(sinTheta2) : 0;
+			omega_in = (cosf(phi) * sinTheta) * T +
+			           (sinf(phi) * sinTheta) * B +
+			           (cosTheta) * omega_out;
+			if (Ng.dot(omega_in) > 0)
+			{
+				// common terms for pdf and eval
+				float cosNI = m_N.dot(omega_in);
+				// make sure the direction we chose is still in the right hemisphere
+				if (cosNI > 0)
+				{
+					pdf = 0.5f * (float) M_1_PI * powf(cosTheta, m_invroughness);
+					pdf = (m_invroughness + 1) * pdf;
+					eval.setValue(pdf, pdf, pdf);
+					// Since there is some blur to this reflection, make the
+					// derivatives a bit bigger. In theory this varies with the
+					// exponent but the exact relationship is complex and
+					// requires more ops than are practical.
+					domega_in_dx *= 10;
+					domega_in_dy *= 10;
+				}
+			}
+		}
+		return Labels::REFLECT;
+	}
 
 };
 
 
 class WestinSheenClosure : public BSDFClosure {
 public:
-    Vec3 m_N;
-    float m_edginess;
+	Vec3 m_N;
+	float m_edginess;
 //    float m_normalization;
-    WestinSheenClosure() : BSDFClosure(Labels::DIFFUSE) { }
-
-    void setup() {};
-
-    bool mergeable (const ClosurePrimitive *other) const {
-        const WestinSheenClosure *comp = (const WestinSheenClosure *)other;
-        return m_N == comp->m_N && m_edginess == comp->m_edginess &&
-            BSDFClosure::mergeable(other);
-    }
-
-    size_t memsize () const { return sizeof(*this); }
-
-    const char *name () const { return "westin_sheen"; }
-
-    void print_on (std::ostream &out) const
-    {
-        out << name() << " (";
-        out << "(" << m_N[0] << ", " << m_N[1] << ", " << m_N[2] << "), ";
-        out << m_edginess;
-        out << ")";
-    }
-
-    float albedo (const Vec3 &omega_out) const
-    {
-        return 1.0f;
-    }
-
-    Color3 eval_reflect (const Vec3 &omega_out, const Vec3 &omega_in, float &pdf) const
-    {
-        // pdf is implicitly 0 (no indirect sampling)
-        float cosNO = m_N.dot(omega_out);
-        float cosNI = m_N.dot(omega_in);
-        if (cosNO > 0 && cosNI > 0) {
-            float sinNO2 = 1 - cosNO * cosNO;
-            pdf = cosNI * float(M_1_PI);
-            float westin = sinNO2 > 0 ? powf(sinNO2, 0.5f * m_edginess) * pdf : 0;
-            return Color3 (westin, westin, westin);
-        }
-        return Color3 (0, 0, 0);
-    }
-
-    Color3 eval_transmit (const Vec3 &omega_out, const Vec3 &omega_in, float &pdf) const
-    {
-        return Color3 (0, 0, 0);
-    }
-
-    ustring sample (const Vec3 &Ng,
-                 const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
-                 float randu, float randv,
-                 Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
-                 float &pdf, Color3 &eval) const
-    {
-        // we are viewing the surface from the right side - send a ray out with cosine
-        // distribution over the hemisphere
-        sample_cos_hemisphere (m_N, omega_out, randu, randv, omega_in, pdf);
-        if (Ng.dot(omega_in) > 0) {
-            // TODO: account for sheen when sampling
-            float cosNO = m_N.dot(omega_out);
-            float sinNO2 = 1 - cosNO * cosNO;
-            float westin = sinNO2 > 0 ? powf(sinNO2, 0.5f * m_edginess) * pdf : 0;
-            eval.setValue(westin, westin, westin);
-            // TODO: find a better approximation for the diffuse bounce
-            domega_in_dx = (2 * m_N.dot(domega_out_dx)) * m_N - domega_out_dx;
-            domega_in_dy = (2 * m_N.dot(domega_out_dy)) * m_N - domega_out_dy;
-            domega_in_dx *= 125;
-            domega_in_dy *= 125;
-        } else
-            pdf = 0;
-        return Labels::REFLECT;
-    }
+	WestinSheenClosure() : BSDFClosure(Labels::DIFFUSE) {}
+
+	void setup() {};
+
+	bool mergeable(const ClosurePrimitive *other) const {
+		const WestinSheenClosure *comp = (const WestinSheenClosure *)other;
+		return m_N == comp->m_N && m_edginess == comp->m_edginess &&
+		       BSDFClosure::mergeable(other);
+	}
+
+	size_t memsize() const { return sizeof(*this); }
+
+	const char *name() const { return "westin_sheen"; }
+
+	void print_on(std::ostream &out) const
+	{
+		out << name() << " (";
+		out << "(" << m_N[0] << ", " << m_N[1] << ", " << m_N[2] << "), ";
+		out << m_edginess;
+		out << ")";
+	}
+
+	float albedo(const Vec3 &omega_out) const
+	{
+		return 1.0f;
+	}
+
+	Color3 eval_reflect(const Vec3 &omega_out, const Vec3 &omega_in, float &pdf) const
+	{
+		// pdf is implicitly 0 (no indirect sampling)
+		float cosNO = m_N.dot(omega_out);
+		float cosNI = m_N.dot(omega_in);
+		if (cosNO > 0 && cosNI > 0) {
+			float sinNO2 = 1 - cosNO * cosNO;
+			pdf = cosNI * float(M_1_PI);
+			float westin = sinNO2 > 0 ? powf(sinNO2, 0.5f * m_edginess) * pdf : 0;
+			return Color3(westin, westin, westin);
+		}
+		return Color3(0, 0, 0);
+	}
+
+	Color3 eval_transmit(const Vec3 &omega_out, const Vec3 &omega_in, float &pdf) const
+	{
+		return Color3(0, 0, 0);
+	}
+
+	ustring sample(const Vec3 &Ng,
+	               const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
+	               float randu, float randv,
+	               Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
+	               float &pdf, Color3 &eval) const
+	{
+		// we are viewing the surface from the right side - send a ray out with cosine
+		// distribution over the hemisphere
+		sample_cos_hemisphere(m_N, omega_out, randu, randv, omega_in, pdf);
+		if (Ng.dot(omega_in) > 0) {
+			// TODO: account for sheen when sampling
+			float cosNO = m_N.dot(omega_out);
+			float sinNO2 = 1 - cosNO * cosNO;
+			float westin = sinNO2 > 0 ? powf(sinNO2, 0.5f * m_edginess) * pdf : 0;
+			eval.setValue(westin, westin, westin);
+			// TODO: find a better approximation for the diffuse bounce
+			domega_in_dx = (2 * m_N.dot(domega_out_dx)) * m_N - domega_out_dx;
+			domega_in_dy = (2 * m_N.dot(domega_out_dy)) * m_N - domega_out_dy;
+			domega_in_dx *= 125;
+			domega_in_dy *= 125;
+		}
+		else {
+			pdf = 0;
+		}
+		return Labels::REFLECT;
+	}
 };
 
 
 
 ClosureParam bsdf_westin_backscatter_params[] = {
-    CLOSURE_VECTOR_PARAM(WestinBackscatterClosure, m_N),
-    CLOSURE_FLOAT_PARAM (WestinBackscatterClosure, m_roughness),
-    CLOSURE_STRING_KEYPARAM("label"),
-    CLOSURE_FINISH_PARAM(WestinBackscatterClosure) };
+	CLOSURE_VECTOR_PARAM(WestinBackscatterClosure, m_N),
+	CLOSURE_FLOAT_PARAM(WestinBackscatterClosure, m_roughness),
+	CLOSURE_STRING_KEYPARAM("label"),
+	CLOSURE_FINISH_PARAM(WestinBackscatterClosure)
+};
 
 ClosureParam bsdf_westin_sheen_params[] = {
-    CLOSURE_VECTOR_PARAM(WestinSheenClosure, m_N),
-    CLOSURE_FLOAT_PARAM (WestinSheenClosure, m_edginess),
-    CLOSURE_STRING_KEYPARAM("label"),
-    CLOSURE_FINISH_PARAM(WestinSheenClosure) };
+	CLOSURE_VECTOR_PARAM(WestinSheenClosure, m_N),
+	CLOSURE_FLOAT_PARAM(WestinSheenClosure, m_edginess),
+	CLOSURE_STRING_KEYPARAM("label"),
+	CLOSURE_FINISH_PARAM(WestinSheenClosure)
+};
 
 CLOSURE_PREPARE(bsdf_westin_backscatter_prepare, WestinBackscatterClosure)
 CLOSURE_PREPARE(bsdf_westin_sheen_prepare,        WestinSheenClosure)
diff --git a/intern/cycles/kernel/osl/bssrdf.cpp b/intern/cycles/kernel/osl/bssrdf.cpp
index 66d7818e677..b195cf513cd 100644
--- a/intern/cycles/kernel/osl/bssrdf.cpp
+++ b/intern/cycles/kernel/osl/bssrdf.cpp
@@ -42,62 +42,63 @@ using namespace OSL;
 
 class BSSRDFCubicClosure : public BSSRDFClosure {
 public:
-    Color3 m_radius;
-    Color3 m_scale;
-    float  m_max_radius;
-
-    template <typename T>
-    static inline T pow3 (const T &x) { return x * x * x; }
-
-    template <typename T>
-    static inline T pow5 (const T &x) { T x2 = x * x; return x2 * x2 * x; }
-
-    BSSRDFCubicClosure() { }
-
-    void setup()
-    {
-        // pre-compute some terms
-        m_max_radius = 0;
-        for (int i = 0; i < 3; i++) {
-            m_scale[i] = m_radius[i] > 0 ? 4 / pow5 (m_radius[i]) : 0;
-            m_max_radius = std::max (m_max_radius, m_radius[i]);
-        }
-    }
-
-    bool mergeable (const ClosurePrimitive *other) const {
-        const BSSRDFCubicClosure *comp = (const BSSRDFCubicClosure *)other;
-        return m_radius == comp->m_radius && BSSRDFClosure::mergeable(other);
-    }
-
-    size_t memsize () const { return sizeof(*this); }
-
-    const char *name () const { return "bssrdf_cubic"; }
-
-    void print_on (std::ostream &out) const
-    {
-        out << name() << " ((" << m_radius[0] << ", " << m_radius[1] << ", " << m_radius[2] << "), ("
-            << m_scale[0] << ", " << m_scale[1] << ", " << m_scale[2] << "))";
-    }
-
-    Color3 eval (float r) const
-    {
-        return Color3 ((r < m_radius.x) ? pow3 (m_radius.x - r) * m_scale.x : 0,
-                       (r < m_radius.y) ? pow3 (m_radius.y - r) * m_scale.y : 0,
-                       (r < m_radius.z) ? pow3 (m_radius.z - r) * m_scale.z : 0);
-    }
-
-    float max_radius() const
-    {
-        return m_max_radius;
-    }
+	Color3 m_radius;
+	Color3 m_scale;
+	float m_max_radius;
+
+	template <typename T>
+	static inline T pow3(const T &x) { return x * x * x; }
+
+	template <typename T>
+	static inline T pow5(const T &x) { T x2 = x * x; return x2 * x2 * x; }
+
+	BSSRDFCubicClosure() {}
+
+	void setup()
+	{
+		// pre-compute some terms
+		m_max_radius = 0;
+		for (int i = 0; i < 3; i++) {
+			m_scale[i] = m_radius[i] > 0 ? 4 / pow5(m_radius[i]) : 0;
+			m_max_radius = std::max(m_max_radius, m_radius[i]);
+		}
+	}
+
+	bool mergeable(const ClosurePrimitive *other) const {
+		const BSSRDFCubicClosure *comp = (const BSSRDFCubicClosure *)other;
+		return m_radius == comp->m_radius && BSSRDFClosure::mergeable(other);
+	}
+
+	size_t memsize() const { return sizeof(*this); }
+
+	const char *name() const { return "bssrdf_cubic"; }
+
+	void print_on(std::ostream &out) const
+	{
+		out << name() << " ((" << m_radius[0] << ", " << m_radius[1] << ", " << m_radius[2] << "), ("
+		    << m_scale[0] << ", " << m_scale[1] << ", " << m_scale[2] << "))";
+	}
+
+	Color3 eval(float r) const
+	{
+		return Color3((r < m_radius.x) ? pow3(m_radius.x - r) * m_scale.x : 0,
+		              (r < m_radius.y) ? pow3(m_radius.y - r) * m_scale.y : 0,
+		              (r < m_radius.z) ? pow3(m_radius.z - r) * m_scale.z : 0);
+	}
+
+	float max_radius() const
+	{
+		return m_max_radius;
+	}
 };
 
 
 
 ClosureParam closure_bssrdf_cubic_params[] = {
-    CLOSURE_COLOR_PARAM (BSSRDFCubicClosure, m_radius),
-    CLOSURE_STRING_KEYPARAM ("label"),
-    CLOSURE_FINISH_PARAM(BSSRDFCubicClosure) };
+	CLOSURE_COLOR_PARAM(BSSRDFCubicClosure, m_radius),
+	CLOSURE_STRING_KEYPARAM("label"),
+	CLOSURE_FINISH_PARAM(BSSRDFCubicClosure)
+};
 
 CLOSURE_PREPARE(closure_bssrdf_cubic_prepare, BSSRDFCubicClosure)
 
diff --git a/intern/cycles/kernel/osl/debug.cpp b/intern/cycles/kernel/osl/debug.cpp
index 8c3f8b2b323..768a9100e8a 100644
--- a/intern/cycles/kernel/osl/debug.cpp
+++ b/intern/cycles/kernel/osl/debug.cpp
@@ -49,30 +49,31 @@ using namespace OSL;
 
 class DebugClosure : public ClosurePrimitive {
 public:
-    ustring m_tag;
+	ustring m_tag;
 
-    DebugClosure () : ClosurePrimitive (Debug) { }
+	DebugClosure () : ClosurePrimitive(Debug) {}
 
-    bool mergeable (const ClosurePrimitive *other) const {
-        const DebugClosure *comp = (const DebugClosure *)other;
-        return m_tag == comp->m_tag &&
-            ClosurePrimitive::mergeable(other);
-    }
+	bool mergeable(const ClosurePrimitive *other) const {
+		const DebugClosure *comp = (const DebugClosure *)other;
+		return m_tag == comp->m_tag &&
+		       ClosurePrimitive::mergeable(other);
+	}
 
-    size_t memsize () const { return sizeof(*this); }
+	size_t memsize() const { return sizeof(*this); }
 
-    const char *name () const { return "debug"; }
+	const char *name() const { return "debug"; }
 
-    void print_on (std::ostream &out) const {
-        out << name() << " (\"" << m_tag.c_str() << "\")";
-    }
+	void print_on(std::ostream &out) const {
+		out << name() << " (\"" << m_tag.c_str() << "\")";
+	}
 
 };
 
 ClosureParam closure_debug_params[] = {
-    CLOSURE_STRING_PARAM(DebugClosure, m_tag),
-    CLOSURE_STRING_KEYPARAM("label"),
-    CLOSURE_FINISH_PARAM(DebugClosure) };
+	CLOSURE_STRING_PARAM(DebugClosure, m_tag),
+	CLOSURE_STRING_KEYPARAM("label"),
+	CLOSURE_FINISH_PARAM(DebugClosure)
+};
 
 CLOSURE_PREPARE(closure_debug_prepare, DebugClosure)
 
diff --git a/intern/cycles/kernel/osl/emissive.cpp b/intern/cycles/kernel/osl/emissive.cpp
index 2d2d6e1fdde..0a582c3f558 100644
--- a/intern/cycles/kernel/osl/emissive.cpp
+++ b/intern/cycles/kernel/osl/emissive.cpp
@@ -49,57 +49,58 @@ using namespace OSL;
 ///
 class GenericEmissiveClosure : public EmissiveClosure {
 public:
-    GenericEmissiveClosure() { }
-
-    void setup() { }
-
-    size_t memsize () const { return sizeof(*this); }
-
-    const char *name () const { return "emission"; }
-
-    void print_on (std::ostream &out) const {
-        out << name() << "()";
-    }
-
-    Color3 eval (const Vec3 &Ng, const Vec3 &omega_out) const
-    {
-        float cosNO = fabsf(Ng.dot(omega_out));
-        float res = cosNO > 0 ? 1.0f: 0.0f;
-        return Color3(res, res, res);
-    }
-
-    void sample (const Vec3 &Ng, float randu, float randv,
-                 Vec3 &omega_out, float &pdf) const
-    {
-        // We don't do anything sophisticated here for the step
-        // We just sample the whole cone uniformly to the cosine
-        Vec3 T, B;
-        make_orthonormals(Ng, T, B);
-        float phi = 2 * (float) M_PI * randu;
-        float cosTheta = sqrtf(1.0f - 1.0f * randv);
-        float sinTheta = sqrtf(1.0f - cosTheta * cosTheta);
-        omega_out = (cosf(phi) * sinTheta) * T +
-                    (sinf(phi) * sinTheta) * B +
-                                 cosTheta  * Ng;
-        pdf = 1.0f / float(M_PI);
-    }
-
-    /// Return the probability distribution function in the direction omega_out,
-    /// given the parameters and the light's surface normal.  This MUST match
-    /// the PDF computed by sample().
-    float pdf (const Vec3 &Ng,
-               const Vec3 &omega_out) const
-    {
-        float cosNO = Ng.dot(omega_out);
-        return cosNO > 0 ? 1.0f: 0.0f;
-    }
+	GenericEmissiveClosure() { }
+
+	void setup() {}
+
+	size_t memsize() const { return sizeof(*this); }
+
+	const char *name() const { return "emission"; }
+
+	void print_on(std::ostream &out) const {
+		out << name() << "()";
+	}
+
+	Color3 eval(const Vec3 &Ng, const Vec3 &omega_out) const
+	{
+		float cosNO = fabsf(Ng.dot(omega_out));
+		float res = cosNO > 0 ? 1.0f : 0.0f;
+		return Color3(res, res, res);
+	}
+
+	void sample(const Vec3 &Ng, float randu, float randv,
+	            Vec3 &omega_out, float &pdf) const
+	{
+		// We don't do anything sophisticated here for the step
+		// We just sample the whole cone uniformly to the cosine
+		Vec3 T, B;
+		make_orthonormals(Ng, T, B);
+		float phi = 2 * (float) M_PI * randu;
+		float cosTheta = sqrtf(1.0f - 1.0f * randv);
+		float sinTheta = sqrtf(1.0f - cosTheta * cosTheta);
+		omega_out = (cosf(phi) * sinTheta) * T +
+		            (sinf(phi) * sinTheta) * B +
+		            cosTheta  * Ng;
+		pdf = 1.0f / float(M_PI);
+	}
+
+	/// Return the probability distribution function in the direction omega_out,
+	/// given the parameters and the light's surface normal.  This MUST match
+	/// the PDF computed by sample().
+	float pdf(const Vec3 &Ng,
+	          const Vec3 &omega_out) const
+	{
+		float cosNO = Ng.dot(omega_out);
+		return cosNO > 0 ? 1.0f : 0.0f;
+	}
 };
 
 
 
 ClosureParam closure_emission_params[] = {
-    CLOSURE_STRING_KEYPARAM("label"),
-    CLOSURE_FINISH_PARAM(GenericEmissiveClosure) };
+	CLOSURE_STRING_KEYPARAM("label"),
+	CLOSURE_FINISH_PARAM(GenericEmissiveClosure)
+};
 
 CLOSURE_PREPARE(closure_emission_prepare, GenericEmissiveClosure)
 
diff --git a/intern/cycles/kernel/osl/nodes/CMakeLists.txt b/intern/cycles/kernel/osl/nodes/CMakeLists.txt
index d3a1cf59a37..5a645919358 100644
--- a/intern/cycles/kernel/osl/nodes/CMakeLists.txt
+++ b/intern/cycles/kernel/osl/nodes/CMakeLists.txt
@@ -5,21 +5,20 @@ set(SRC_OSL
 	node_add_closure.osl
 	node_attribute.osl
 	node_background.osl
-	node_blend_texture.osl
 	node_bump.osl
 	node_camera.osl
-	node_clouds_texture.osl
+	node_checker_texture.osl
 	node_convert_from_color.osl
 	node_convert_from_float.osl
 	node_convert_from_normal.osl
 	node_convert_from_point.osl
 	node_convert_from_vector.osl
 	node_diffuse_bsdf.osl
-	node_distorted_noise_texture.osl
 	node_emission.osl
 	node_environment_texture.osl
 	node_fresnel.osl
 	node_gamma.osl
+	node_gradient_texture.osl
 	node_brightness.osl
 	node_geometry.osl
 	node_glass_bsdf.osl
@@ -30,7 +29,6 @@ set(SRC_OSL
 	node_light_path.osl
 	node_magic_texture.osl
 	node_mapping.osl
-	node_marble_texture.osl
 	node_math.osl
 	node_mix.osl
 	node_mix_closure.osl
@@ -43,7 +41,6 @@ set(SRC_OSL
 	node_output_volume.osl
 	node_sepcomb_rgb.osl
 	node_sky_texture.osl
-	node_stucci_texture.osl
 	node_texture_coordinate.osl
 	node_translucent_bsdf.osl
 	node_transparent_bsdf.osl
@@ -52,7 +49,7 @@ set(SRC_OSL
 	node_velvet_bsdf.osl
 	node_voronoi_texture.osl
 	node_ward_bsdf.osl
-	node_wood_texture.osl
+	node_wave_texture.osl
 )
 
 set(SRC_OSL_HEADERS
diff --git a/intern/cycles/kernel/osl/nodes/node_marble_texture.osl b/intern/cycles/kernel/osl/nodes/node_checker_texture.osl
index 9e18dee3235..306798b645f 100644
--- a/intern/cycles/kernel/osl/nodes/node_marble_texture.osl
+++ b/intern/cycles/kernel/osl/nodes/node_checker_texture.osl
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Blender Foundation.
+ * Copyright 2012, Blender Foundation.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -19,40 +19,40 @@
 #include "stdosl.h"
 #include "node_texture.h"
 
-/* Marble */
+/* Checker */
 
-float marble(point p, float size, string type, string wave, string basis, int hard, float turb, int depth)
+float checker(point p)
 {
-	float x = p[0];
-	float y = p[1];
-	float z = p[2];
-
-    float n = 5.0 * (x + y + z);
-
-	float mi = n + turb * noise_turbulence(p/size, basis, depth, hard);
-
-	mi = noise_wave(wave, mi);
-
-	if(type == "Sharp")
-		mi = sqrt(mi);
-	else if(type == "Sharper")
-		mi = sqrt(sqrt(mi));
-
-    return mi;
+	p[0] = (p[0] + 0.00001)*0.9999;
+	p[1] = (p[1] + 0.00001)*0.9999;
+	p[2] = (p[2] + 0.00001)*0.9999;
+	
+	int xi = (int)fabs(floor(p[0]));
+	int yi = (int)fabs(floor(p[1]));
+	int zi = (int)fabs(floor(p[2]));
+
+	if((xi % 2 == yi % 2) == (zi % 2)) {
+		return 1.0;
+	}
+	else {
+		return 0.0;
+	}
 }
 
-shader node_marble_texture(
-	string Type = "Soft",
-	string Wave = "Sine",
-	string Basis = "Perlin",
-	int Hard = 0,
-	float Size = 0.25,
-	float Turbulence = 5.0,
-	int Depth = 2,
+shader node_checker_texture(
+	float Scale = 5.0,
 	point Vector = P,
-	output float Fac = 0.0)
+	color Color1 = color(0.8, 0.8, 0.8),
+	color Color2 = color(0.2, 0.2, 0.2),
+	output float Fac = 0.0,
+	output color Color = color(0.0, 0.0, 0.0))
 {
-	float size = nonzero(Size, 1e-5);
-	Fac = marble(Vector, size, Type, Wave, Basis, Hard, Turbulence, Depth);
+	Fac = checker(Vector*Scale);
+	if(Fac == 1.0) {
+		Color = color(Color1, Color1, Color1);
+	}
+	else {
+		Color = color(Color2, Color2, Color2);
+	}
 }
 
diff --git a/intern/cycles/kernel/osl/nodes/node_color.h b/intern/cycles/kernel/osl/nodes/node_color.h
index 37d092eae78..80786e4e369 100644
--- a/intern/cycles/kernel/osl/nodes/node_color.h
+++ b/intern/cycles/kernel/osl/nodes/node_color.h
@@ -18,18 +18,18 @@
 
 float color_srgb_to_scene_linear(float c)
 {
-	if(c < 0.04045)
-		return (c < 0.0)? 0.0: c * (1.0/12.92);
+	if (c < 0.04045)
+		return (c < 0.0) ? 0.0 : c * (1.0 / 12.92);
 	else
-		return pow((c + 0.055)*(1.0/1.055), 2.4);
+		return pow((c + 0.055) * (1.0 / 1.055), 2.4);
 }
 
 float color_scene_linear_to_srgb(float c)
 {
-	if(c < 0.0031308)
-		return (c < 0.0)? 0.0: c * 12.92;
-    else
-		return 1.055 * pow(c, 1.0/2.4) - 0.055;
+	if (c < 0.0031308)
+		return (c < 0.0) ? 0.0 : c * 12.92;
+	else
+		return 1.055 * pow(c, 1.0 / 2.4) - 0.055;
 }
 
 color color_srgb_to_scene_linear(color c)
@@ -61,27 +61,27 @@ color rgb_to_hsv(color rgb)
 
 	v = cmax;
 
-	if(cmax != 0.0) {
-		s = cdelta/cmax;
+	if (cmax != 0.0) {
+		s = cdelta / cmax;
 	}
 	else {
 		s = 0.0;
 		h = 0.0;
 	}
 
-	if(s == 0.0) {
+	if (s == 0.0) {
 		h = 0.0;
 	}
 	else {
-		c = (color(cmax, cmax, cmax) - rgb)/cdelta;
+		c = (color(cmax, cmax, cmax) - rgb) / cdelta;
 
-		if(rgb[0] == cmax) h = c[2] - c[1];
-		else if(rgb[1] == cmax) h = 2.0 + c[0] -  c[2];
+		if (rgb[0] == cmax) h = c[2] - c[1];
+		else if (rgb[1] == cmax) h = 2.0 + c[0] -  c[2];
 		else h = 4.0 + c[1] - c[0];
 
 		h /= 6.0;
 
-		if(h < 0.0)
+		if (h < 0.0)
 			h += 1.0;
 	}
 
@@ -97,26 +97,26 @@ color hsv_to_rgb(color hsv)
 	s = hsv[1];
 	v = hsv[2];
 
-	if(s==0.0) {
+	if (s == 0.0) {
 		rgb = color(v, v, v);
 	}
 	else {
-		if(h==1.0)
+		if (h == 1.0)
 			h = 0.0;
 		
 		h *= 6.0;
 		i = floor(h);
 		f = h - i;
 		rgb = color(f, f, f);
-		p = v*(1.0-s);
-		q = v*(1.0-(s*f));
-		t = v*(1.0-(s*(1.0-f)));
-		
-		if(i == 0.0) rgb = color(v, t, p);
-		else if(i == 1.0) rgb = color(q, v, p);
-		else if(i == 2.0) rgb = color(p, v, t);
-		else if(i == 3.0) rgb = color(p, q, v);
-		else if(i == 4.0) rgb = color(t, p, v);
+		p = v * (1.0 - s);
+		q = v * (1.0 - (s * f));
+		t = v * (1.0 - (s * (1.0 - f)));
+
+		if (i == 0.0) rgb = color(v, t, p);
+		else if (i == 1.0) rgb = color(q, v, p);
+		else if (i == 2.0) rgb = color(p, v, t);
+		else if (i == 3.0) rgb = color(p, q, v);
+		else if (i == 4.0) rgb = color(t, p, v);
 		else rgb = color(v, p, q);
 	}
 
diff --git a/intern/cycles/kernel/osl/nodes/node_fresnel.h b/intern/cycles/kernel/osl/nodes/node_fresnel.h
index 0c8a5276ede..dfd0a23fe1e 100644
--- a/intern/cycles/kernel/osl/nodes/node_fresnel.h
+++ b/intern/cycles/kernel/osl/nodes/node_fresnel.h
@@ -1,17 +1,32 @@
-
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+ 
 float fresnel_dielectric(vector Incoming, normal Normal, float eta)
 {
 	/* compute fresnel reflectance without explicitly computing
-	   the refracted direction */
+	 * the refracted direction */
 	float c = fabs(dot(Incoming, Normal));
 	float g = eta * eta - 1 + c * c;
 	float result;
 
-	if(g > 0) {
+	if (g > 0) {
 		g = sqrt(g);
-		float A =(g - c)/(g + c);
-		float B =(c *(g + c)- 1)/(c *(g - c)+ 1);
-		result = 0.5 * A * A *(1 + B * B);
+		float A = (g - c) / (g + c);
+		float B = (c * (g + c) - 1) / (c * (g - c) + 1);
+		result = 0.5 * A * A * (1 + B * B);
 	}
 	else
 		result = 1.0;  /* TIR (no refracted component) */
diff --git a/intern/cycles/kernel/osl/nodes/node_blend_texture.osl b/intern/cycles/kernel/osl/nodes/node_gradient_texture.osl
index de1bdaca90b..e6fa014324c 100644
--- a/intern/cycles/kernel/osl/nodes/node_blend_texture.osl
+++ b/intern/cycles/kernel/osl/nodes/node_gradient_texture.osl
@@ -19,9 +19,9 @@
 #include "stdosl.h"
 #include "node_texture.h"
 
-/* Blend */
+/* Gradient */
 
-float blend(point p, string progression, string axis)
+float gradient(point p, string progression, string axis)
 {
 	float x, y;
 
@@ -67,12 +67,12 @@ float blend(point p, string progression, string axis)
 	return result;
 }
 
-shader node_blend_texture(
+shader node_gradient_texture(
 	string Progression = "Linear",
 	string Axis = "Horizontal",
 	point Vector = P,
 	output float Fac = 0.0)
 {
-	Fac = blend(Vector, Progression, Axis);
+	Fac = gradient(Vector, Progression, Axis);
 }
 
diff --git a/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl b/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
index fbd0ce5c3bd..3ab345279f1 100644
--- a/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
+++ b/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
@@ -193,16 +193,15 @@ shader node_musgrave_texture(
 	float Offset = 0.0,
 	float Intensity = 1.0,
 	float Gain = 1.0,
-	float Size = 0.25,
+	float Scale = 5.0,
 	point Vector = P,
 	output float Fac = 0.0)
 {
 	float dimension = max(Dimension, 0.0);
 	float octaves = max(Octaves, 0.0);
 	float lacunarity = max(Lacunarity, 1e-5);
-	float size = nonzero(Size, 1e-5);
 
-	point p = Vector/size;
+	point p = Vector*Scale;
 
 	if(Type == "Multifractal")
 		Fac = Intensity*noise_musgrave_multi_fractal(p, Basis, dimension, lacunarity, octaves);
diff --git a/intern/cycles/kernel/osl/nodes/node_noise_texture.osl b/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
index 193ed67d16e..fd9fc1dedc0 100644
--- a/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
+++ b/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
@@ -19,18 +19,41 @@
 #include "stdosl.h"
 #include "node_texture.h"
 
+/* Noise */
+
+float noise(point p, string basis, float distortion, float detail)
+{
+	point r;
+	int hard = 0;
+	float fac = 0.0;
+	
+	if(distortion != 0.0( {
+		r[0] = noise_basis(p + point(13.5), basis) * distortion;
+		r[1] = noise_basis(p, basis) * distortion;
+		r[2] = noise_basis(p - point(13.5), basis) * distortion;
+		
+		p += r;
+	}
+
+	fac = noise_turbulence(p, basis, detail, hard);
+	
+	return fac;
+    
+	/*
+	Color[0] = Fac;
+	Color[1] = noise_turbulence(point(p[1], p[0], p[2]), basis, detail, hard);
+	Color[2] = noise_turbulence(point(p[1], p[2], p[0]), basis, detail, hard);
+	*/
+}
+
 shader node_noise_texture(
+	string Basis = "Perlin",
+	float Distortion = 0.0,
+	float Scale = 5.0,
+	float Detail = 2.0,
 	point Vector = P,
-	output color Color = color(0.0, 0.0, 0.0),
 	output float Fac = 0.0)
 {
-	point p = Vector*1e8;
-
-	float r = cellnoise(p);
-	float g = cellnoise(point(p[1], p[0], p[2]));
-	float b = cellnoise(point(p[1], p[2], p[0]));
-
-	Fac = r;
-	Color = color(r, g, b);
+	Fac = noise(Vector*Scale, Basis, Distortion, Detail);
 }
 
diff --git a/intern/cycles/kernel/osl/nodes/node_texture.h b/intern/cycles/kernel/osl/nodes/node_texture.h
index e0ec8038ee4..d2dbd6db8b3 100644
--- a/intern/cycles/kernel/osl/nodes/node_texture.h
+++ b/intern/cycles/kernel/osl/nodes/node_texture.h
@@ -20,20 +20,20 @@ float voronoi_distance(string distance_metric, vector d, float e)
 {
 	float result = 0.0;
 
-	if(distance_metric == "Distance Squared")
+	if (distance_metric == "Distance Squared")
 		result = dot(d, d);
-	if(distance_metric == "Actual Distance")
+	if (distance_metric == "Actual Distance")
 		result = length(d);
-	if(distance_metric == "Manhattan")
+	if (distance_metric == "Manhattan")
 		result = fabs(d[0]) + fabs(d[1]) + fabs(d[2]);
-	if(distance_metric == "Chebychev")
+	if (distance_metric == "Chebychev")
 		result = max(fabs(d[0]), max(fabs(d[1]), fabs(d[2])));
-	if(distance_metric == "Minkovsky 1/2")
+	if (distance_metric == "Minkovsky 1/2")
 		result = sqrt(fabs(d[0])) + sqrt(fabs(d[1])) + sqrt(fabs(d[1]));
-	if(distance_metric == "Minkovsky 4")
-		result = sqrt(sqrt(dot(d*d, d*d)));
-	if(distance_metric == "Minkovsky")
-		result = pow(pow(fabs(d[0]), e) + pow(fabs(d[1]), e) + pow(fabs(d[2]), e), 1.0/e);
+	if (distance_metric == "Minkovsky 4")
+		result = sqrt(sqrt(dot(d * d, d * d)));
+	if (distance_metric == "Minkovsky")
+		result = pow(pow(fabs(d[0]), e) + pow(fabs(d[1]), e) + pow(fabs(d[2]), e), 1.0 / e);
 	
 	return result;
 }
@@ -63,9 +63,9 @@ void voronoi(point p, string distance_metric, float e, float da[4], point pa[4])
 	da[2] = 1e10;
 	da[3] = 1e10;
 
-	for(xx = xi-1; xx <= xi+1; xx++) {
-		for(yy = yi-1; yy <= yi+1; yy++) {
-			for(zz = zi-1; zz <= zi+1; zz++) {
+	for (xx = xi - 1; xx <= xi + 1; xx++) {
+		for (yy = yi - 1; yy <= yi + 1; yy++) {
+			for (zz = zi - 1; zz <= zi + 1; zz++) {
 				point ip = point(xx, yy, zz);
 				point vp = (point)cellnoise_color(ip);
 				point pd = p - (vp + ip);
@@ -73,7 +73,7 @@ void voronoi(point p, string distance_metric, float e, float da[4], point pa[4])
 
 				vp += point(xx, yy, zz);
 
-				if(d < da[0]) {
+				if (d < da[0]) {
 					da[3] = da[2];
 					da[2] = da[1];
 					da[1] = da[0];
@@ -84,7 +84,7 @@ void voronoi(point p, string distance_metric, float e, float da[4], point pa[4])
 					pa[1] = pa[0];
 					pa[0] = vp;
 				}
-				else if(d < da[1]) {
+				else if (d < da[1]) {
 					da[3] = da[2];
 					da[2] = da[1];
 					da[1] = d;
@@ -93,14 +93,14 @@ void voronoi(point p, string distance_metric, float e, float da[4], point pa[4])
 					pa[2] = pa[1];
 					pa[1] = vp;
 				}
-				else if(d < da[2]) {
+				else if (d < da[2]) {
 					da[3] = da[2];
 					da[2] = d;
 
 					pa[3] = pa[2];
 					pa[2] = vp;
 				}
-				else if(d < da[3]) {
+				else if (d < da[3]) {
 					da[3] = d;
 					pa[3] = vp;
 				}
@@ -138,16 +138,16 @@ float voronoi_F1F2(point p) { return voronoi_FnFn(p, 0, 1); }
 float voronoi_Cr(point p)
 {
 	/* crackle type pattern, just a scale/clamp of F2-F1 */
-	float t = 10.0*voronoi_F1F2(p);
-	return (t > 1.0)? 1.0: t;
+	float t = 10.0 * voronoi_F1F2(p);
+	return (t > 1.0) ? 1.0 : t;
 }
 
-float voronoi_F1S(point p) { return 2.0*voronoi_F1(p) - 1.0; }
-float voronoi_F2S(point p) { return 2.0*voronoi_F2(p) - 1.0; }
-float voronoi_F3S(point p) { return 2.0*voronoi_F3(p) - 1.0; }
-float voronoi_F4S(point p) { return 2.0*voronoi_F4(p) - 1.0; }
-float voronoi_F1F2S(point p) { return 2.0*voronoi_F1F2(p) - 1.0; }
-float voronoi_CrS(point p) { return 2.0*voronoi_Cr(p) - 1.0; }
+float voronoi_F1S(point p) { return 2.0 * voronoi_F1(p) - 1.0; }
+float voronoi_F2S(point p) { return 2.0 * voronoi_F2(p) - 1.0; }
+float voronoi_F3S(point p) { return 2.0 * voronoi_F3(p) - 1.0; }
+float voronoi_F4S(point p) { return 2.0 * voronoi_F4(p) - 1.0; }
+float voronoi_F1F2S(point p) { return 2.0 * voronoi_F1F2(p) - 1.0; }
+float voronoi_CrS(point p) { return 2.0 * voronoi_Cr(p) - 1.0; }
 
 /* Noise Bases */
 
@@ -155,21 +155,21 @@ float noise_basis(point p, string basis)
 {
 	float result = 0.0;
 
-	if(basis == "Perlin")
+	if (basis == "Perlin")
 		result = noise(p);
-	if(basis == "Voronoi F1")
+	if (basis == "Voronoi F1")
 		result = voronoi_F1S(p);
-	if(basis == "Voronoi F2")
+	if (basis == "Voronoi F2")
 		result = voronoi_F2S(p);
-	if(basis == "Voronoi F3")
+	if (basis == "Voronoi F3")
 		result = voronoi_F3S(p);
-	if(basis == "Voronoi F4")
+	if (basis == "Voronoi F4")
 		result = voronoi_F4S(p);
-	if(basis == "Voronoi F2-F1")
+	if (basis == "Voronoi F2-F1")
 		result = voronoi_F1F2S(p);
-	if(basis == "Voronoi Crackle")
+	if (basis == "Voronoi Crackle")
 		result = voronoi_CrS(p);
-	if(basis == "Cell Noise")
+	if (basis == "Cell Noise")
 		result = cellnoise(p);
 	
 	return result;
@@ -180,7 +180,7 @@ float noise_basis(point p, string basis)
 float noise_basis_hard(point p, string basis, int hard)
 {
 	float t = noise_basis(p, basis);
-	return (hard)? fabs(2.0*t - 1.0): t;
+	return (hard) ? fabs(2.0 * t - 1.0) : t;
 }
 
 /* Waves */
@@ -189,22 +189,22 @@ float noise_wave(string wave, float a)
 {
 	float result = 0.0;
 
-	if(wave == "Sine") {
-		result = 0.5 + 0.5*sin(a);
+	if (wave == "Sine") {
+		result = 0.5 + 0.5 * sin(a);
 	}
-	else if(wave == "Saw") {
-		float b = 2*M_PI;
+	else if (wave == "Saw") {
+		float b = 2 * M_PI;
 		int n = (int)(a / b);
-		a -= n*b;
-		if(a < 0) a += b;
+		a -= n * b;
+		if (a < 0) a += b;
 
 		result = a / b;
 	}
-	else if(wave == "Tri") {
-		float b = 2*M_PI;
+	else if (wave == "Tri") {
+		float b = 2 * M_PI;
 		float rmax = 1.0;
 
-		result = rmax - 2.0*fabs(floor((a*(1.0/b))+0.5) - (a*(1.0/b)));
+		result = rmax - 2.0 * fabs(floor((a * (1.0 / b)) + 0.5) - (a * (1.0 / b)));
 	}
 
 	return result;
@@ -219,18 +219,18 @@ float noise_turbulence(point p, string basis, int octaves, int hard)
 	float sum = 0.0;
 	int i;
 
-	for(i = 0; i <= octaves; i++) {
-		float t = noise_basis(fscale*p, basis);
+	for (i = 0; i <= octaves; i++) {
+		float t = noise_basis(fscale * p, basis);
 
-		if(hard)
-			t = fabs(2.0*t - 1.0);
+		if (hard)
+			t = fabs(2.0 * t - 1.0);
 
-		sum += t*amp;
+		sum += t * amp;
 		amp *= 0.5;
 		fscale *= 2.0;
 	}
 
-	sum *= ((float)(1 << octaves)/(float)((1 << (octaves+1)) - 1));
+	sum *= ((float)(1 << octaves) / (float)((1 << (octaves + 1)) - 1));
 
 	return sum;
 }
@@ -241,8 +241,8 @@ float nonzero(float f, float eps)
 {
 	float r;
 
-	if(abs(f) < eps)
-		r = sign(f)*eps;
+	if (abs(f) < eps)
+		r = sign(f) * eps;
 	else
 		r = f;
 	
diff --git a/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl b/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl
index 140ba6a6ba1..f24f154be84 100644
--- a/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl
+++ b/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl
@@ -30,13 +30,12 @@ shader node_voronoi_texture(
 	float Weight4 = 0.0,
 	float Exponent = 2.5,
 	float Intensity = 1.0,
-	float Size = 0.25,
+	float Scale = 5.0,
 	point Vector = P,
 	output float Fac = 0.0,
 	output color Color = color(0.0, 0.0, 0.0))
 {
 	float exponent = max(Exponent, 1e-5);
-	float size = nonzero(Size, 1e-5);
 
 	float aw1 = fabs(Weight1);
 	float aw2 = fabs(Weight2);
@@ -51,7 +50,7 @@ shader node_voronoi_texture(
 	float da[4];
 	point pa[4];
 
-	voronoi(Vector/size, DistanceMetric, exponent, da, pa);
+	voronoi(Vector*Scale, DistanceMetric, exponent, da, pa);
 
 	/* Scalar output */
 	Fac = sc * fabs(Weight1*da[0] + Weight2*da[1] + Weight3*da[2] + Weight4*da[3]);
diff --git a/intern/cycles/kernel/osl/nodes/node_distorted_noise_texture.osl b/intern/cycles/kernel/osl/nodes/node_wave_texture.osl
index bb338c4ef0f..b55ec771be8 100644
--- a/intern/cycles/kernel/osl/nodes/node_distorted_noise_texture.osl
+++ b/intern/cycles/kernel/osl/nodes/node_wave_texture.osl
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Blender Foundation.
+ * Copyright 2012, Blender Foundation.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -19,28 +19,41 @@
 #include "stdosl.h"
 #include "node_texture.h"
 
-/* Distorted Noise (variable lacunarity noise) */
+/* Wave */
 
-float noise_distorted(point p, string basis, string distortion_basis, float distortion)
+float wave(point p, float scale, string type, float detail, float distortion, float dscale)
 {
-	point r;
+	float x = p[0] * scale;
+	float y = p[1] * scale;
+	float z = p[2] * scale;
 
-	r[0] = noise_basis(p + point(13.5), basis) * distortion;
-	r[1] = noise_basis(p, basis) * distortion;
-	r[2] = noise_basis(p - point(13.5), basis) * distortion;
+	float result = 0.0;
+	float n = 0.0;
 
-    return noise_basis(p + r, distortion_basis); /* distorted-domain noise */
+	if(type == "Bands") {
+		n = (x + y + z)*10.0);
+	}
+	else if(type == "Rings") {
+		n = (sqrt(x*x + y*y + z*z)*20.0);
+	}
+	
+	if(distortion != 0.0) {
+		n = n +(distortion * noise_turbulence(p*dscale, "Perlin", detail, 0);
+	}
+	result = noise_wave("Sine", n);
+	
+	return result;
 }
 
-shader node_distorted_noise_texture(
-	string Basis = "Perlin",
-	string DistortionBasis = "Perlin",
-	float Distortion = 1.0,
-	float Size = 0.25,
+shader node_wave_texture(
+	string Type = "Bands",
+	float Scale = 5.0,
+	float distortion = 0.0,
+	float detail = 2.0,
+	float dscale = 1.0,
 	point Vector = P,
 	output float Fac = 0.0)
 {
-	float size = nonzero(Size, 1e-5);
-	Fac = noise_distorted(Vector/size, Basis, DistortionBasis, Distortion);
+	Fac = wave(Vector, Scale, Type, detail, distortion, dscale);
 }
 
diff --git a/intern/cycles/kernel/osl/nodes/node_wood_texture.osl b/intern/cycles/kernel/osl/nodes/node_wood_texture.osl
deleted file mode 100644
index f1d2e278597..00000000000
--- a/intern/cycles/kernel/osl/nodes/node_wood_texture.osl
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2011, Blender Foundation.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include "stdosl.h"
-#include "node_texture.h"
-
-/* Wood */
-
-float wood(point p, float size, string type, string wave, string basis, int hard, float turb)
-{
-	float x = p[0];
-	float y = p[1];
-	float z = p[2];
-
-	float result = 0.0;
-
-	if(type == "Bands") {
-		result = noise_wave(wave, (x + y + z)*10.0);
-	}
-	else if(type == "Rings") {
-		result = noise_wave(wave, sqrt(x*x + y*y + z*z)*20.0);
-	}
-	else if (type == "Band Noise") {
-		float wi = turb*noise_basis_hard(p/size, basis, hard);
-		result = noise_wave(wave, (x + y + z)*10.0 + wi);
-	}
-	else if (type == "Ring Noise") {
-		float wi = turb*noise_basis_hard(p/size, basis, hard);
-		result = noise_wave(wave, sqrt(x*x + y*y + z*z)*20.0 + wi);
-	}
-
-	return result;
-}
-
-shader node_wood_texture(
-	string Type = "Bands",
-	string Wave = "Sine",
-	string Basis = "Perlin",
-	int Hard = 0,
-	float Size = 0.25,
-	float Turbulence = 5.0,
-	point Vector = P,
-	output float Fac = 0.0)
-{
-	float size = nonzero(Size, 1e-5);
-	Fac = wood(Vector, size, Type, Wave, Basis, Hard, Turbulence);
-}
-
diff --git a/intern/cycles/kernel/osl/nodes/stdosl.h b/intern/cycles/kernel/osl/nodes/stdosl.h
index e4a110e737c..0c07c501d69 100644
--- a/intern/cycles/kernel/osl/nodes/stdosl.h
+++ b/intern/cycles/kernel/osl/nodes/stdosl.h
@@ -163,241 +163,246 @@ vector normalize (vector v) BUILTIN;
 vector faceforward (vector N, vector I, vector Nref) BUILTIN;
 vector faceforward (vector N, vector I) BUILTIN;
 vector reflect (vector I, vector N) { return I - 2*dot(N,I)*N; }
-vector refract (vector I, vector N, float eta) {
-    float IdotN = dot (I, N);
-    float k = 1 - eta*eta * (1 - IdotN*IdotN);
-    return (k < 0) ? vector(0,0,0) : (eta*I - N * (eta*IdotN + sqrt(k)));
+vector refract(vector I, vector N, float eta) {
+	float IdotN = dot(I, N);
+	float k = 1 - eta * eta * (1 - IdotN * IdotN);
+	return (k < 0) ? vector(0, 0, 0) : (eta * I - N * (eta * IdotN + sqrt(k)));
 }
-void fresnel (vector I, normal N, float eta,
-              output float Kr, output float Kt,
-              output vector R, output vector T)
+void fresnel(vector I, normal N, float eta,
+             output float Kr, output float Kt,
+             output vector R, output vector T)
 {
-    float sqr(float x) { return x*x; }
-    float c = dot(I, N);
-    if (c < 0)
-        c = -c;
-    R = reflect(I, N);
-    float g = 1.0 / sqr(eta) - 1.0 + c * c;
-    if (g >= 0.0) {
-        g = sqrt (g);
-        float beta = g - c;
-        float F = (c * (g+c) - 1.0) / (c * beta + 1.0);
-        F = 0.5 * (1.0 + sqr(F));
-        F *= sqr (beta / (g+c));
-        Kr = F;
-        Kt = (1.0 - Kr) * eta*eta;
-        // OPT: the following recomputes some of the above values, but it 
-        // gives us the same result as if the shader-writer called refract()
-        T = refract(I, N, eta);
-    } else {
-        // total internal reflection
-        Kr = 1.0;
-        Kt = 0.0;
-        T = vector (0,0,0);
-    }
+	float sqr(float x) {
+		return x * x;
+	}
+	float c = dot(I, N);
+	if (c < 0)
+		c = -c;
+	R = reflect(I, N);
+	float g = 1.0 / sqr(eta) - 1.0 + c * c;
+	if (g >= 0.0) {
+		g = sqrt(g);
+		float beta = g - c;
+		float F = (c * (g + c) - 1.0) / (c * beta + 1.0);
+		F = 0.5 * (1.0 + sqr(F));
+		F *= sqr(beta / (g + c));
+		Kr = F;
+		Kt = (1.0 - Kr) * eta * eta;
+		// OPT: the following recomputes some of the above values, but it
+		// gives us the same result as if the shader-writer called refract()
+		T = refract(I, N, eta);
+	}
+	else {
+		// total internal reflection
+		Kr = 1.0;
+		Kt = 0.0;
+		T = vector(0, 0, 0);
+	}
 #undef sqr
 }
 
-void fresnel (vector I, normal N, float eta,
-              output float Kr, output float Kt)
+void fresnel(vector I, normal N, float eta,
+             output float Kr, output float Kt)
 {
-    vector R, T;
-    fresnel(I, N, eta, Kr, Kt, R, T);
+	vector R, T;
+	fresnel(I, N, eta, Kr, Kt, R, T);
 }
 
-point rotate (point q, float angle, point a, point b) BUILTIN;
+point rotate(point q, float angle, point a, point b) BUILTIN;
 
-normal transform (matrix Mto, normal p) BUILTIN;
-vector transform (matrix Mto, vector p) BUILTIN;
-point transform (matrix Mto, point p) BUILTIN;
+normal transform(matrix Mto, normal p) BUILTIN;
+vector transform(matrix Mto, vector p) BUILTIN;
+point transform(matrix Mto, point p) BUILTIN;
 
 // Implementation of transform-with-named-space in terms of matrices:
 
-point transform (string tospace, point x)
+point transform(string tospace, point x)
 {
-    return transform (matrix ("common", tospace), x);
+	return transform(matrix("common", tospace), x);
 }
 
-point transform (string fromspace, string tospace, point x)
+point transform(string fromspace, string tospace, point x)
 {
-    return transform (matrix (fromspace, tospace), x);
+	return transform(matrix(fromspace, tospace), x);
 }
 
 
-vector transform (string tospace, vector x)
+vector transform(string tospace, vector x)
 {
-    return transform (matrix ("common", tospace), x);
+	return transform(matrix("common", tospace), x);
 }
 
-vector transform (string fromspace, string tospace, vector x)
+vector transform(string fromspace, string tospace, vector x)
 {
-    return transform (matrix (fromspace, tospace), x);
+	return transform(matrix(fromspace, tospace), x);
 }
 
 
-normal transform (string tospace, normal x)
+normal transform(string tospace, normal x)
 {
-    return transform (matrix ("common", tospace), x);
+	return transform(matrix("common", tospace), x);
 }
 
-normal transform (string fromspace, string tospace, normal x)
+normal transform(string fromspace, string tospace, normal x)
 {
-    return transform (matrix (fromspace, tospace), x);
+	return transform(matrix(fromspace, tospace), x);
 }
 
-float transformu (string tounits, float x) BUILTIN;
-float transformu (string fromunits, string tounits, float x) BUILTIN;
+float transformu(string tounits, float x) BUILTIN;
+float transformu(string fromunits, string tounits, float x) BUILTIN;
 
 
 // Color functions
 
-float luminance (color c) {
-    return dot ((vector)c, vector(0.2126, 0.7152, 0.0722));
+float luminance(color c) {
+	return dot((vector)c, vector(0.2126, 0.7152, 0.0722));
 }
 
 
 
-color transformc (string to, color x)
+color transformc(string to, color x)
 {
-    color rgb_to_hsv (color rgb) {  // See Foley & van Dam
-        float r = rgb[0], g = rgb[1], b = rgb[2];
-        float mincomp = min (r, min (g, b));
-        float maxcomp = max (r, max (g, b));
-        float delta = maxcomp - mincomp;  // chroma
-        float h, s, v;
-        v = maxcomp;
-        if (maxcomp > 0)
-            s = delta / maxcomp;
-        else s = 0;
-        if (s <= 0)
-            h = 0;
-        else {
-            if      (r >= maxcomp) h = (g-b) / delta;
-            else if (g >= maxcomp) h = 2 + (b-r) / delta;
-            else                   h = 4 + (r-g) / delta;
-            h /= 6;
-            if (h < 0)
-                h += 1;
-        }
-        return color (h, s, v);
-    }
-
-    color rgb_to_hsl (color rgb) {  // See Foley & van Dam
-        // First convert rgb to hsv, then to hsl
-        float minval = min (rgb[0], min (rgb[1], rgb[2]));
-        color hsv = rgb_to_hsv (rgb);
-        float maxval = hsv[2];   // v == maxval
-        float h = hsv[0], s, l = (minval+maxval) / 2;
-        if (minval == maxval)
-            s = 0;  // special 'achromatic' case, hue is 0
-        else if (l <= 0.5)
-            s = (maxval - minval) / (maxval + minval);
-        else
-            s = (maxval - minval) / (2 - maxval - minval);
-        return color (h, s, l);
-    }
-
-    color r;
-    if (to == "rgb" || to == "RGB")
-        r = x;
-    else if (to == "hsv")
-        r = rgb_to_hsv (x);
-    else if (to == "hsl")
-        r = rgb_to_hsl (x);
-    else if (to == "YIQ")
-        r = color (dot (vector(0.299,  0.587,  0.114), (vector)x),
-                   dot (vector(0.596, -0.275, -0.321), (vector)x),
-                   dot (vector(0.212, -0.523,  0.311), (vector)x));
-    else if (to == "xyz")
-        r = color (dot (vector(0.412453, 0.357580, 0.180423), (vector)x),
-                   dot (vector(0.212671, 0.715160, 0.072169), (vector)x),
-                   dot (vector(0.019334, 0.119193, 0.950227), (vector)x));
-    else {
-        error ("Unknown color space \"%s\"", to);
-        r = x;
-    }
-    return r;
+	color rgb_to_hsv(color rgb) {   // See Foley & van Dam
+		float r = rgb[0], g = rgb[1], b = rgb[2];
+		float mincomp = min(r, min(g, b));
+		float maxcomp = max(r, max(g, b));
+		float delta = maxcomp - mincomp;  // chroma
+		float h, s, v;
+		v = maxcomp;
+		if (maxcomp > 0)
+			s = delta / maxcomp;
+		else s = 0;
+		if (s <= 0)
+			h = 0;
+		else {
+			if      (r >= maxcomp) h = (g - b) / delta;
+			else if (g >= maxcomp) h = 2 + (b - r) / delta;
+			else h = 4 + (r - g) / delta;
+			h /= 6;
+			if (h < 0)
+				h += 1;
+		}
+		return color(h, s, v);
+	}
+
+	color rgb_to_hsl(color rgb) {   // See Foley & van Dam
+		// First convert rgb to hsv, then to hsl
+		float minval = min(rgb[0], min(rgb[1], rgb[2]));
+		color hsv = rgb_to_hsv(rgb);
+		float maxval = hsv[2];   // v == maxval
+		float h = hsv[0], s, l = (minval + maxval) / 2;
+		if (minval == maxval)
+			s = 0;  // special 'achromatic' case, hue is 0
+		else if (l <= 0.5)
+			s = (maxval - minval) / (maxval + minval);
+		else
+			s = (maxval - minval) / (2 - maxval - minval);
+		return color(h, s, l);
+	}
+
+	color r;
+	if (to == "rgb" || to == "RGB")
+		r = x;
+	else if (to == "hsv")
+		r = rgb_to_hsv(x);
+	else if (to == "hsl")
+		r = rgb_to_hsl(x);
+	else if (to == "YIQ")
+		r = color(dot(vector(0.299,  0.587,  0.114), (vector)x),
+		          dot(vector(0.596, -0.275, -0.321), (vector)x),
+		          dot(vector(0.212, -0.523,  0.311), (vector)x));
+	else if (to == "xyz")
+		r = color(dot(vector(0.412453, 0.357580, 0.180423), (vector)x),
+		          dot(vector(0.212671, 0.715160, 0.072169), (vector)x),
+		          dot(vector(0.019334, 0.119193, 0.950227), (vector)x));
+	else {
+		error("Unknown color space \"%s\"", to);
+		r = x;
+	}
+	return r;
 }
 
 
-color transformc (string from, string to, color x)
+color transformc(string from, string to, color x)
 {
-    color hsv_to_rgb (color c) { // Reference: Foley & van Dam
-        float h = c[0], s = c[1], v = c[2];
-        color r;
-        if (s < 0.0001) {
-            r = v;
-        } else {
-            h = 6 * (h - floor(h));  // expand to [0..6)
-            int hi = (int)h;
-            float f = h - hi;
-            float p = v * (1-s);
-            float q = v * (1-s*f);
-            float t = v * (1-s*(1-f));
-            if      (hi == 0) r = color (v, t, p);
-            else if (hi == 1) r = color (q, v, p);
-            else if (hi == 2) r = color (p, v, t);
-            else if (hi == 3) r = color (p, q, v);
-            else if (hi == 4) r = color (t, p, v);
-            else              r = color (v, p, q);
-        }
-        return r;
-    }
-
-    color hsl_to_rgb (color c) {
-        float h = c[0], s = c[1], l = c[2];
-        // Easiest to convert hsl -> hsv, then hsv -> RGB (per Foley & van Dam)
-        float v = (l <= 0.5) ? (l * (1 + s)) : (l * (1 - s) + s);
-        color r;
-        if (v <= 0) {
-            r = 0;
-        } else {
-            float min = 2 * l - v;
-            s = (v - min) / v;
-            r = hsv_to_rgb (color (h, s, v));
-        }
-        return r;
-    }
-
-    color r;
-    if (from == "rgb" || from == "RGB")
-        r = x;
-    else if (from == "hsv")
-        r = hsv_to_rgb (x);
-    else if (from == "hsl")
-        r = hsl_to_rgb (x);
-    else if (from == "YIQ")
-        r = color (dot (vector(1,  0.9557,  0.6199), (vector)x),
-                   dot (vector(1, -0.2716, -0.6469), (vector)x),
-                   dot (vector(1, -1.1082,  1.7051), (vector)x));
-    else if (from == "xyz")
-        r = color (dot (vector( 3.240479, -1.537150, -0.498535), (vector)x),
-                   dot (vector(-0.969256,  1.875991,  0.041556), (vector)x),
-                   dot (vector( 0.055648, -0.204043,  1.057311), (vector)x));
-    else {
-        error ("Unknown color space \"%s\"", to);
-        r = x;
-    }
-    return transformc (to, r);
+	color hsv_to_rgb(color c) {  // Reference: Foley & van Dam
+		float h = c[0], s = c[1], v = c[2];
+		color r;
+		if (s < 0.0001) {
+			r = v;
+		}
+		else {
+			h = 6 * (h - floor(h));  // expand to [0..6)
+			int hi = (int)h;
+			float f = h - hi;
+			float p = v * (1 - s);
+			float q = v * (1 - s * f);
+			float t = v * (1 - s * (1 - f));
+			if      (hi == 0) r = color(v, t, p);
+			else if (hi == 1) r = color(q, v, p);
+			else if (hi == 2) r = color(p, v, t);
+			else if (hi == 3) r = color(p, q, v);
+			else if (hi == 4) r = color(t, p, v);
+			else r = color(v, p, q);
+		}
+		return r;
+	}
+
+	color hsl_to_rgb(color c) {
+		float h = c[0], s = c[1], l = c[2];
+		// Easiest to convert hsl -> hsv, then hsv -> RGB (per Foley & van Dam)
+		float v = (l <= 0.5) ? (l * (1 + s)) : (l * (1 - s) + s);
+		color r;
+		if (v <= 0) {
+			r = 0;
+		}
+		else {
+			float min = 2 * l - v;
+			s = (v - min) / v;
+			r = hsv_to_rgb(color(h, s, v));
+		}
+		return r;
+	}
+
+	color r;
+	if (from == "rgb" || from == "RGB")
+		r = x;
+	else if (from == "hsv")
+		r = hsv_to_rgb(x);
+	else if (from == "hsl")
+		r = hsl_to_rgb(x);
+	else if (from == "YIQ")
+		r = color(dot(vector(1,  0.9557,  0.6199), (vector)x),
+		          dot(vector(1, -0.2716, -0.6469), (vector)x),
+		          dot(vector(1, -1.1082,  1.7051), (vector)x));
+	else if (from == "xyz")
+		r = color(dot(vector(3.240479, -1.537150, -0.498535), (vector)x),
+		          dot(vector(-0.969256,  1.875991,  0.041556), (vector)x),
+		          dot(vector(0.055648, -0.204043,  1.057311), (vector)x));
+	else {
+		error("Unknown color space \"%s\"", to);
+		r = x;
+	}
+	return transformc(to, r);
 }
 
  
 
 // Matrix functions
 
-float determinant (matrix m) BUILTIN;
-matrix transpose (matrix m) BUILTIN;
+float determinant(matrix m) BUILTIN;
+matrix transpose(matrix m) BUILTIN;
 
 
 
 // Pattern generation
 
-float step (float edge, float x) BUILTIN;
-color step (color edge, color x) BUILTIN;
-point step (point edge, point x) BUILTIN;
-vector step (vector edge, vector x) BUILTIN;
-normal step (normal edge, normal x) BUILTIN;
-float smoothstep (float edge0, float edge1, float x) BUILTIN;
+float step(float edge, float x) BUILTIN;
+color step(color edge, color x) BUILTIN;
+point step(point edge, point x) BUILTIN;
+vector step(vector edge, vector x) BUILTIN;
+normal step(normal edge, normal x) BUILTIN;
+float smoothstep(float edge0, float edge1, float x) BUILTIN;
 
 
 // Derivatives and area operators
@@ -408,24 +413,26 @@ float smoothstep (float edge0, float edge1, float x) BUILTIN;
 
 // String functions
 
-int strlen (string s) BUILTIN;
-int startswith (string s, string prefix) BUILTIN;
-int endswith (string s, string suffix) BUILTIN;
-string substr (string s, int start, int len) BUILTIN;
-string substr (string s, int start) { return substr (s, start, strlen(s)); }
+int strlen(string s) BUILTIN;
+int startswith(string s, string prefix) BUILTIN;
+int endswith(string s, string suffix) BUILTIN;
+string substr(string s, int start, int len) BUILTIN;
+string substr(string s, int start) {
+	return substr(s, start, strlen(s));
+}
 
 // Define concat in terms of shorter concat
-string concat (string a, string b, string c) {
-    return concat(concat(a,b), c);
+string concat(string a, string b, string c) {
+	return concat(concat(a, b), c);
 }
-string concat (string a, string b, string c, string d) {
-    return concat(concat(a,b,c), d);
+string concat(string a, string b, string c, string d) {
+	return concat(concat(a, b, c), d);
 }
-string concat (string a, string b, string c, string d, string e) {
-    return concat(concat(a,b,c,d), e);
+string concat(string a, string b, string c, string d, string e) {
+	return concat(concat(a, b, c, d), e);
 }
-string concat (string a, string b, string c, string d, string e, string f) {
-    return concat(concat(a,b,c,d,e), f);
+string concat(string a, string b, string c, string d, string e, string f) {
+	return concat(concat(a, b, c, d, e), f);
 }
 
 
@@ -438,7 +445,7 @@ closure color diffuse(normal N) BUILTIN;
 closure color oren_nayar(normal N, float sigma) BUILTIN;
 closure color translucent(normal N) BUILTIN;
 closure color reflection(normal N, float eta) BUILTIN;
-closure color reflection(normal N) { return reflection (N, 0.0); }
+closure color reflection(normal N) { return reflection(N, 0.0); }
 closure color refraction(normal N, float eta) BUILTIN;
 closure color dielectric(normal N, float eta) BUILTIN;
 closure color transparent() BUILTIN;
@@ -446,7 +453,7 @@ closure color microfacet_ggx(normal N, float ag) BUILTIN;
 closure color microfacet_ggx_refraction(normal N, float ag, float eta) BUILTIN;
 closure color microfacet_beckmann(normal N, float ab) BUILTIN;
 closure color microfacet_beckmann_refraction(normal N, float ab, float eta) BUILTIN;
-closure color ward(normal N, vector T,float ax, float ay) BUILTIN;
+closure color ward(normal N, vector T, float ax, float ay) BUILTIN;
 closure color ashikhmin_velvet(normal N, float sigma) BUILTIN;
 closure color westin_backscatter(normal N, float roughness) BUILTIN;
 closure color westin_sheen(normal N, float edginess) BUILTIN;
@@ -460,7 +467,7 @@ closure color holdout() BUILTIN;
 closure color subsurface(float eta, float g, float mfp, float albedo) BUILTIN;
 
 // Renderer state
-int raytype (string typename) BUILTIN;
+int raytype(string typename) BUILTIN;
 
 #undef BUILTIN
 #undef BUILTIN_DERIV
diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/osl_closures.cpp
index b87cdf8af86..0793b29d1ac 100644
--- a/intern/cycles/kernel/osl/osl_closures.cpp
+++ b/intern/cycles/kernel/osl/osl_closures.cpp
@@ -48,7 +48,7 @@ static void generic_closure_setup(OSL::RendererServices *, int id, void *data)
 	prim->setup();
 }
 
-static bool generic_closure_mergeable(int id, const void *dataA, const void *dataB)
+static bool generic_closure_compare(int id, const void *dataA, const void *dataB)
 {
 	assert(dataA && dataB);
 
@@ -59,11 +59,7 @@ static bool generic_closure_mergeable(int id, const void *dataA, const void *dat
 
 static void register_closure(OSL::ShadingSystem *ss, const char *name, int id, OSL::ClosureParam *params, OSL::PrepareClosureFunc prepare)
 {
-	int j;
-	for(j = 0; params[j].type != TypeDesc(); ++j) {}
-	int size = params[j].offset;
-
-	ss->register_closure(name, id, params, size, prepare, generic_closure_setup, generic_closure_mergeable);
+	ss->register_closure(name, id, params, prepare, generic_closure_setup, generic_closure_compare);
 }
 
 void OSLShader::register_closures(OSL::ShadingSystem *ss)
diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp
index 1b52a3e489b..a1574d6e0db 100644
--- a/intern/cycles/kernel/osl/osl_services.cpp
+++ b/intern/cycles/kernel/osl/osl_services.cpp
@@ -37,7 +37,7 @@ CCL_NAMESPACE_BEGIN
 
 /* RenderServices implementation */
 
-#define TO_MATRIX44(m) (*(OSL::Matrix44*)&(m))
+#define TO_MATRIX44(m) (*(OSL::Matrix44 *)&(m))
 
 /* static ustrings */
 ustring OSLRenderServices::u_distance("distance");
@@ -65,14 +65,14 @@ void OSLRenderServices::thread_init(KernelGlobals *kernel_globals_)
 bool OSLRenderServices::get_matrix(OSL::Matrix44 &result, OSL::TransformationPtr xform, float time)
 {
 	/* this is only used for shader and object space, we don't really have
-	   a concept of shader space, so we just use object space for both. */
-	if(xform) {
+	 * a concept of shader space, so we just use object space for both. */
+	if (xform) {
 		KernelGlobals *kg = kernel_globals;
-		const ShaderData *sd = (const ShaderData*)xform;
+		const ShaderData *sd = (const ShaderData *)xform;
 		int object = sd->object;
 
-		if(object != ~0) {
-			Transform tfm = object_fetch_transform(kg, object, OBJECT_TRANSFORM);
+		if (object != ~0) {
+			Transform tfm = object_fetch_transform(kg, object, time, OBJECT_TRANSFORM);
 			tfm = transform_transpose(tfm);
 			result = TO_MATRIX44(tfm);
 
@@ -86,14 +86,14 @@ bool OSLRenderServices::get_matrix(OSL::Matrix44 &result, OSL::TransformationPtr
 bool OSLRenderServices::get_inverse_matrix(OSL::Matrix44 &result, OSL::TransformationPtr xform, float time)
 {
 	/* this is only used for shader and object space, we don't really have
-	   a concept of shader space, so we just use object space for both. */
-	if(xform) {
+	 * a concept of shader space, so we just use object space for both. */
+	if (xform) {
 		KernelGlobals *kg = kernel_globals;
-		const ShaderData *sd = (const ShaderData*)xform;
+		const ShaderData *sd = (const ShaderData *)xform;
 		int object = sd->object;
 
-		if(object != ~0) {
-			Transform tfm = object_fetch_transform(kg, object, OBJECT_INVERSE_TRANSFORM);
+		if (object != ~0) {
+			Transform tfm = object_fetch_transform(kg, object, time, OBJECT_INVERSE_TRANSFORM);
 			tfm = transform_transpose(tfm);
 			result = TO_MATRIX44(tfm);
 
@@ -108,22 +108,22 @@ bool OSLRenderServices::get_matrix(OSL::Matrix44 &result, ustring from, float ti
 {
 	KernelGlobals *kg = kernel_globals;
 
-	if(from == u_ndc) {
+	if (from == u_ndc) {
 		Transform tfm = transform_transpose(kernel_data.cam.ndctoworld);
 		result = TO_MATRIX44(tfm);
 		return true;
 	}
-	else if(from == u_raster) {
+	else if (from == u_raster) {
 		Transform tfm = transform_transpose(kernel_data.cam.rastertoworld);
 		result = TO_MATRIX44(tfm);
 		return true;
 	}
-	else if(from == u_screen) {
+	else if (from == u_screen) {
 		Transform tfm = transform_transpose(kernel_data.cam.screentoworld);
 		result = TO_MATRIX44(tfm);
 		return true;
 	}
-	else if(from == u_camera) {
+	else if (from == u_camera) {
 		Transform tfm = transform_transpose(kernel_data.cam.cameratoworld);
 		result = TO_MATRIX44(tfm);
 		return true;
@@ -136,22 +136,22 @@ bool OSLRenderServices::get_inverse_matrix(OSL::Matrix44 &result, ustring to, fl
 {
 	KernelGlobals *kg = kernel_globals;
 
-	if(to == u_ndc) {
+	if (to == u_ndc) {
 		Transform tfm = transform_transpose(kernel_data.cam.worldtondc);
 		result = TO_MATRIX44(tfm);
 		return true;
 	}
-	else if(to == u_raster) {
+	else if (to == u_raster) {
 		Transform tfm = transform_transpose(kernel_data.cam.worldtoraster);
 		result = TO_MATRIX44(tfm);
 		return true;
 	}
-	else if(to == u_screen) {
+	else if (to == u_screen) {
 		Transform tfm = transform_transpose(kernel_data.cam.worldtoscreen);
 		result = TO_MATRIX44(tfm);
 		return true;
 	}
-	else if(to == u_camera) {
+	else if (to == u_camera) {
 		Transform tfm = transform_transpose(kernel_data.cam.worldtocamera);
 		result = TO_MATRIX44(tfm);
 		return true;
@@ -161,56 +161,57 @@ bool OSLRenderServices::get_inverse_matrix(OSL::Matrix44 &result, ustring to, fl
 }
 
 bool OSLRenderServices::get_array_attribute(void *renderstate, bool derivatives, 
-	ustring object, TypeDesc type, ustring name,
-	int index, void *val)
+                                            ustring object, TypeDesc type, ustring name,
+                                            int index, void *val)
 {
 	return false;
 }
 
 static bool get_mesh_attribute(KernelGlobals *kg, const ShaderData *sd,
-	const OSLGlobals::Attribute& attr, bool derivatives, void *val)
+                               const OSLGlobals::Attribute& attr, bool derivatives, void *val)
 {
-	if(attr.type == TypeDesc::TypeFloat) {
-		float *fval = (float*)val;
+	if (attr.type == TypeDesc::TypeFloat) {
+		float *fval = (float *)val;
 		fval[0] = triangle_attribute_float(kg, sd, attr.elem, attr.offset,
-			(derivatives)? &fval[1]: NULL, (derivatives)? &fval[2]: NULL);
+		                                   (derivatives) ? &fval[1] : NULL, (derivatives) ? &fval[2] : NULL);
 	}
 	else {
 		/* todo: this won't work when float3 has w component */
-		float3 *fval = (float3*)val;
+		float3 *fval = (float3 *)val;
 		fval[0] = triangle_attribute_float3(kg, sd, attr.elem, attr.offset,
-			(derivatives)? &fval[1]: NULL, (derivatives)? &fval[2]: NULL);
+		                                    (derivatives) ? &fval[1] : NULL, (derivatives) ? &fval[2] : NULL);
 	}
 
 	return true;
 }
 
 static bool get_mesh_attribute_convert(KernelGlobals *kg, const ShaderData *sd,
-	const OSLGlobals::Attribute& attr, const TypeDesc& type, bool derivatives, void *val)
+                                       const OSLGlobals::Attribute& attr, const TypeDesc& type, bool derivatives, void *val)
 {
-	if(attr.type == TypeDesc::TypeFloat) {
+	if (attr.type == TypeDesc::TypeFloat) {
 		float tmp[3];
-		float3 *fval = (float3*)val;
+		float3 *fval = (float3 *)val;
 
 		get_mesh_attribute(kg, sd, attr, derivatives, tmp);
 
 		fval[0] = make_float3(tmp[0], tmp[0], tmp[0]);
-		if(derivatives) {
+		if (derivatives) {
 			fval[1] = make_float3(tmp[1], tmp[1], tmp[1]);
 			fval[2] = make_float3(tmp[2], tmp[2], tmp[2]);
 		}
 
 		return true;
 	}
-	else if(attr.type == TypeDesc::TypePoint || attr.type == TypeDesc::TypeVector ||
-		attr.type == TypeDesc::TypeNormal || attr.type == TypeDesc::TypeColor) {
+	else if (attr.type == TypeDesc::TypePoint || attr.type == TypeDesc::TypeVector ||
+	         attr.type == TypeDesc::TypeNormal || attr.type == TypeDesc::TypeColor)
+	{
 		float3 tmp[3];
-		float *fval = (float*)val;
+		float *fval = (float *)val;
 
 		get_mesh_attribute(kg, sd, attr, derivatives, tmp);
 
 		fval[0] = average(tmp[0]);
-		if(derivatives) {
+		if (derivatives) {
 			fval[1] = average(tmp[1]);
 			fval[2] = average(tmp[2]);
 		}
@@ -226,29 +227,29 @@ static void get_object_attribute(const OSLGlobals::Attribute& attr, bool derivat
 	size_t datasize = attr.value.datasize();
 
 	memcpy(val, attr.value.data(), datasize);
-	if(derivatives)
-		memset((char*)val + datasize, 0, datasize*2);
+	if (derivatives)
+		memset((char *)val + datasize, 0, datasize * 2);
 }
 
 bool OSLRenderServices::get_attribute(void *renderstate, bool derivatives, ustring object_name,
-	TypeDesc type, ustring name, void *val)
+                                      TypeDesc type, ustring name, void *val)
 {
 	KernelGlobals *kg = kernel_globals;
-	const ShaderData *sd = (const ShaderData*)renderstate;
+	const ShaderData *sd = (const ShaderData *)renderstate;
 	int object = sd->object;
 	int tri = sd->prim;
 
 	/* lookup of attribute on another object */
-	if(object_name != u_empty) {
+	if (object_name != u_empty) {
 		OSLGlobals::ObjectNameMap::iterator it = kg->osl.object_name_map.find(object_name);
 
-		if(it == kg->osl.object_name_map.end())
+		if (it == kg->osl.object_name_map.end())
 			return false;
 
 		object = it->second;
 		tri = ~0;
 	}
-	else if(object == ~0) {
+	else if (object == ~0) {
 		/* no background attributes supported */
 		return false;
 	}
@@ -257,20 +258,23 @@ bool OSLRenderServices::get_attribute(void *renderstate, bool derivatives, ustri
 	OSLGlobals::AttributeMap& attribute_map = kg->osl.attribute_map[object];
 	OSLGlobals::AttributeMap::iterator it = attribute_map.find(name);
 
-	if(it == attribute_map.end())
+	if (it == attribute_map.end())
 		return false;
 
 	/* type mistmatch? */
 	const OSLGlobals::Attribute& attr = it->second;
 
-	if(attr.elem != ATTR_ELEMENT_VALUE) {
+	if (attr.elem != ATTR_ELEMENT_VALUE) {
 		/* triangle and vertex attributes */
-		if(tri != ~0) {
-			if(attr.type == type || (attr.type == TypeDesc::TypeColor &&
-				(type == TypeDesc::TypePoint || type == TypeDesc::TypeVector || type == TypeDesc::TypeNormal)))
+		if (tri != ~0) {
+			if (attr.type == type || (attr.type == TypeDesc::TypeColor &&
+			                          (type == TypeDesc::TypePoint || type == TypeDesc::TypeVector || type == TypeDesc::TypeNormal)))
+			{
 				return get_mesh_attribute(kg, sd, attr, derivatives, val);
-			else
+			}
+			else {
 				return get_mesh_attribute_convert(kg, sd, attr, type, derivatives, val);
+			}
 		}
 	}
 	else {
@@ -283,7 +287,7 @@ bool OSLRenderServices::get_attribute(void *renderstate, bool derivatives, ustri
 }
 
 bool OSLRenderServices::get_userdata(bool derivatives, ustring name, TypeDesc type, 
-	void *renderstate, void *val)
+                                     void *renderstate, void *val)
 {
 	return false; /* disabled by lockgeom */
 }
@@ -294,42 +298,46 @@ bool OSLRenderServices::has_userdata(ustring name, TypeDesc type, void *renderst
 }
 
 void *OSLRenderServices::get_pointcloud_attr_query(ustring *attr_names,
-	TypeDesc *attr_types, int nattrs)
+                                                   TypeDesc *attr_types, int nattrs)
 {
 #ifdef WITH_PARTIO
 	m_attr_queries.push_back(AttrQuery());
 	AttrQuery &query = m_attr_queries.back();
 
 	/* make space for what we need. the only reason to use
-	   std::vector is to skip the delete */
+	 * std::vector is to skip the delete */
 	query.attr_names.resize(nattrs);
 	query.attr_partio_types.resize(nattrs);
 	/* capacity will keep the length of the smallest array passed
-	   to the query. Just to prevent buffer overruns */
+	 * to the query. Just to prevent buffer overruns */
 	query.capacity = -1;
 
-	for(int i = 0; i < nattrs; ++i)
-	{
+	for (int i = 0; i < nattrs; ++i) {
 		query.attr_names[i] = attr_names[i];
 
-		TypeDesc element_type = attr_types[i].elementtype ();
+		TypeDesc element_type = attr_types[i].elementtype();
 
-		if(query.capacity < 0)
-		   query.capacity = attr_types[i].numelements();
+		if (query.capacity < 0)
+			query.capacity = attr_types[i].numelements();
 		else
-		   query.capacity = min(query.capacity, (int)attr_types[i].numelements());
+			query.capacity = min(query.capacity, (int)attr_types[i].numelements());
 
 		/* convert the OSL (OIIO) type to the equivalent Partio type so
-		   we can do a fast check at query time. */
-		if(element_type == TypeDesc::TypeFloat)
-		   query.attr_partio_types[i] = Partio::FLOAT;
-		else if(element_type == TypeDesc::TypeInt)
-		   query.attr_partio_types[i] = Partio::INT;
-		else if(element_type == TypeDesc::TypeColor  || element_type == TypeDesc::TypePoint ||
-				 element_type == TypeDesc::TypeVector || element_type == TypeDesc::TypeNormal)
-		   query.attr_partio_types[i] = Partio::VECTOR;
-		else
-			return NULL; /* report some error of unknown type */
+		 * we can do a fast check at query time. */
+		if (element_type == TypeDesc::TypeFloat) {
+			query.attr_partio_types[i] = Partio::FLOAT;
+		}
+		else if (element_type == TypeDesc::TypeInt) {
+			query.attr_partio_types[i] = Partio::INT;
+		}
+		else if (element_type == TypeDesc::TypeColor  || element_type == TypeDesc::TypePoint ||
+		         element_type == TypeDesc::TypeVector || element_type == TypeDesc::TypeNormal)
+		{
+			query.attr_partio_types[i] = Partio::VECTOR;
+		}
+		else {
+			return NULL;  /* report some error of unknown type */
+		}
 	}
 
 	/* this is valid until the end of RenderServices */
@@ -348,35 +356,35 @@ Partio::ParticlesData *OSLRenderServices::get_pointcloud(ustring filename)
 #endif
 
 int OSLRenderServices::pointcloud(ustring filename, const OSL::Vec3 &center, float radius,
-	int max_points, void *_attr_query, void **attr_outdata)
+                                  int max_points, void *_attr_query, void **attr_outdata)
 {
 	/* todo: this code has never been tested, and most likely does not
-	   work. it's based on the example code in OSL */
+	 * work. it's based on the example code in OSL */
 
 #ifdef WITH_PARTIO
 	/* query Partio for this pointcloud lookup using cached attr_query */
-	if(!_attr_query)
+	if (!_attr_query)
 		return 0;
 
 	AttrQuery *attr_query = (AttrQuery *)_attr_query;
-	if(attr_query->capacity < max_points)
+	if (attr_query->capacity < max_points)
 		return 0;
 
 	/* get the pointcloud entry for the given filename */
 	Partio::ParticlesData *cloud = get_pointcloud(filename);
 
 	/* now we have to look up all the attributes in the file. we can't do this
-	   before hand cause we never know what we are going to load. */
+	 * before hand cause we never know what we are going to load. */
 	int nattrs = attr_query->attr_names.size();
 	Partio::ParticleAttribute *attr = (Partio::ParticleAttribute *)alloca(sizeof(Partio::ParticleAttribute) * nattrs);
 
-	for(int i = 0; i < nattrs; ++i) {
+	for (int i = 0; i < nattrs; ++i) {
 		/* special case attributes */
-		if(attr_query->attr_names[i] == u_distance || attr_query->attr_names[i] == u_index)
+		if (attr_query->attr_names[i] == u_distance || attr_query->attr_names[i] == u_index)
 			continue;
 
 		/* lookup the attribute by name*/
-		if(!cloud->attributeInfo(attr_query->attr_names[i].c_str(), attr[i])) {
+		if (!cloud->attributeInfo(attr_query->attr_names[i].c_str(), attr[i])) {
 			/* issue an error here and return, types don't match */
 			Partio::endCachedAccess(cloud);
 			cloud->release();
@@ -394,20 +402,20 @@ int OSLRenderServices::pointcloud(ustring filename, const OSL::Vec3 &center, flo
 	int count = indices.size();
 
 	/* retrieve the attributes directly to user space */
-	for(int j = 0; j < nattrs; ++j) {
+	for (int j = 0; j < nattrs; ++j) {
 		/* special cases */
-		if(attr_query->attr_names[j] == u_distance) {
-			for(int i = 0; i < count; ++i)
+		if (attr_query->attr_names[j] == u_distance) {
+			for (int i = 0; i < count; ++i)
 				((float *)attr_outdata[j])[i] = sqrtf(dist2[i]);
 		}
-		else if(attr_query->attr_names[j] == u_index) {
-			for(int i = 0; i < count; ++i)
+		else if (attr_query->attr_names[j] == u_index) {
+			for (int i = 0; i < count; ++i)
 				((int *)attr_outdata[j])[i] = indices[i];
 		}
 		else {
 			/* note we make a single call per attribute, we don't loop over the
-			   points. Partio does it, so it is there that we have to care about
-			   performance */
+			 * points. Partio does it, so it is there that we have to care about
+			 * performance */
 			cloud->data(attr[j], count, &indices[0], true, attr_outdata[j]);
 		}
 	}
diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/osl_services.h
index 85a01e54e5c..e637b53ab78 100644
--- a/intern/cycles/kernel/osl/osl_services.h
+++ b/intern/cycles/kernel/osl/osl_services.h
@@ -57,34 +57,33 @@ public:
 	bool get_inverse_matrix(OSL::Matrix44 &result, ustring to, float time);
 
 	bool get_array_attribute(void *renderstate, bool derivatives, 
-		ustring object, TypeDesc type, ustring name,
-		int index, void *val);
+	                         ustring object, TypeDesc type, ustring name,
+	                         int index, void *val);
 	bool get_attribute(void *renderstate, bool derivatives, ustring object,
-		TypeDesc type, ustring name, void *val);
+	                   TypeDesc type, ustring name, void *val);
 
 	bool get_userdata(bool derivatives, ustring name, TypeDesc type, 
-		void *renderstate, void *val);
+	                  void *renderstate, void *val);
 	bool has_userdata(ustring name, TypeDesc type, void *renderstate);
 
 	void *get_pointcloud_attr_query(ustring *attr_names,
-		TypeDesc *attr_types, int nattrs);
+	                                TypeDesc *attr_types, int nattrs);
 	int pointcloud(ustring filename, const OSL::Vec3 &center, float radius,
-		int max_points, void *attr_query, void **attr_outdata);
+	               int max_points, void *attr_query, void **attr_outdata);
 
 private:
 	KernelGlobals *kernel_globals;
 
 #ifdef WITH_PARTIO
 	/* OSL gets pointers to this but its definition is private.
-	   right now it only caches the types already converted to
-	   Partio constants. this is what get_pointcloud_attr_query
-	   returns */
-	struct AttrQuery
-	{
+	 * right now it only caches the types already converted to
+	 * Partio constants. this is what get_pointcloud_attr_query
+	 * returns */
+	struct AttrQuery {
 		/* names of the attributes to query */
 		std::vector<ustring> attr_names;
 		/* types as (enum Partio::ParticleAttributeType) of the
-		   attributes in the query */
+		 * attributes in the query */
 		std::vector<int> attr_partio_types;
 		/* for sanity checks, capacity of the output arrays */
 		int capacity;
diff --git a/intern/cycles/kernel/osl/osl_shader.cpp b/intern/cycles/kernel/osl/osl_shader.cpp
index 18a8e974492..d8d510a7c9b 100644
--- a/intern/cycles/kernel/osl/osl_shader.cpp
+++ b/intern/cycles/kernel/osl/osl_shader.cpp
@@ -27,7 +27,6 @@
 #include "util_foreach.h"
 
 #include <OSL/oslexec.h>
-#include <oslexec_pvt.h>
 
 CCL_NAMESPACE_BEGIN
 
@@ -37,7 +36,7 @@ tls_ptr(OSLGlobals::ThreadData, OSLGlobals::thread_data);
 
 void OSLShader::thread_init(KernelGlobals *kg)
 {
-	OSL::pvt::ShadingSystemImpl *ssi = (OSL::pvt::ShadingSystemImpl*)kg->osl.ss;
+	OSL::pvt::ShadingSystemImpl *ssi = (OSL::pvt::ShadingSystemImpl *)kg->osl.ss;
 
 	OSLGlobals::ThreadData *tdata = new OSLGlobals::ThreadData();
 
@@ -46,12 +45,12 @@ void OSLShader::thread_init(KernelGlobals *kg)
 
 	tls_set(kg->osl.thread_data, tdata);
 
-	((OSLRenderServices*)ssi->renderer())->thread_init(kg);
+	((OSLRenderServices *)ssi->renderer())->thread_init(kg);
 }
 
 void OSLShader::thread_free(KernelGlobals *kg)
 {
-	OSL::pvt::ShadingSystemImpl *ssi = (OSL::pvt::ShadingSystemImpl*)kg->osl.ss;
+	OSL::pvt::ShadingSystemImpl *ssi = (OSL::pvt::ShadingSystemImpl *)kg->osl.ss;
 
 	OSLGlobals::ThreadData *tdata = tls_get(OSLGlobals::ThreadData, kg->osl.thread_data);
 
@@ -62,12 +61,12 @@ void OSLShader::thread_free(KernelGlobals *kg)
 
 /* Globals */
 
-#define TO_VEC3(v) (*(OSL::Vec3*)&(v))
-#define TO_COLOR3(v) (*(OSL::Color3*)&(v))
+#define TO_VEC3(v) (*(OSL::Vec3 *)&(v))
+#define TO_COLOR3(v) (*(OSL::Color3 *)&(v))
 #define TO_FLOAT3(v) make_float3(v[0], v[1], v[2])
 
 static void shaderdata_to_shaderglobals(KernelGlobals *kg, ShaderData *sd,
-	int path_flag, OSL::ShaderGlobals *globals)
+                                        int path_flag, OSL::ShaderGlobals *globals)
 {
 	/* copy from shader data to shader globals */
 	globals->P = TO_VEC3(sd->P);
@@ -86,7 +85,7 @@ static void shaderdata_to_shaderglobals(KernelGlobals *kg, ShaderData *sd,
 	globals->dvdy = sd->dv.dy;
 	globals->dPdu = TO_VEC3(sd->dPdu);
 	globals->dPdv = TO_VEC3(sd->dPdv);
-	globals->surfacearea = (sd->object == ~0)? 1.0f: object_surface_area(kg, sd->object);
+	globals->surfacearea = (sd->object == ~0) ? 1.0f : object_surface_area(kg, sd->object);
 
 	/* booleans */
 	globals->raytype = path_flag; /* todo: add our own ray types */
@@ -109,35 +108,35 @@ static void shaderdata_to_shaderglobals(KernelGlobals *kg, ShaderData *sd,
 /* Surface */
 
 static void flatten_surface_closure_tree(ShaderData *sd, bool no_glossy,
-	const OSL::ClosureColor *closure, float3 weight = make_float3(1.0f, 1.0f, 1.0f))
+                                         const OSL::ClosureColor *closure, float3 weight = make_float3(1.0f, 1.0f, 1.0f))
 {
-	/* OSL gives use a closure tree, we flatten it into arrays per
+	/* OSL gives us a closure tree, we flatten it into arrays per
 	 * closure type, for evaluation, sampling, etc later on. */
 
-	if(closure->type == OSL::ClosureColor::COMPONENT) {
-		OSL::ClosureComponent *comp = (OSL::ClosureComponent*)closure;
-		OSL::ClosurePrimitive *prim = (OSL::ClosurePrimitive*)comp->data();
+	if (closure->type == OSL::ClosureColor::COMPONENT) {
+		OSL::ClosureComponent *comp = (OSL::ClosureComponent *)closure;
+		OSL::ClosurePrimitive *prim = (OSL::ClosurePrimitive *)comp->data();
 
-		if(prim) {
+		if (prim) {
 			ShaderClosure sc;
 			sc.prim = prim;
 			sc.weight = weight;
 
-			switch(prim->category()) {
+			switch (prim->category()) {
 				case ClosurePrimitive::BSDF: {
-					if(sd->num_closure == MAX_CLOSURE)
+					if (sd->num_closure == MAX_CLOSURE)
 						return;
 
-					OSL::BSDFClosure *bsdf = (OSL::BSDFClosure*)prim;
+					OSL::BSDFClosure *bsdf = (OSL::BSDFClosure *)prim;
 					ustring scattering = bsdf->scattering();
 
 					/* no caustics option */
-					if(no_glossy && scattering == OSL::Labels::GLOSSY)
+					if (no_glossy && scattering == OSL::Labels::GLOSSY)
 						return;
 
 					/* sample weight */
 					float albedo = bsdf->albedo(TO_VEC3(sd->I));
-					float sample_weight = fabsf(average(weight))*albedo;
+					float sample_weight = fabsf(average(weight)) * albedo;
 					float sample_sum = sd->osl_closure.bsdf_sample_sum + sample_weight;
 
 					sc.sample_weight = sample_weight;
@@ -145,10 +144,10 @@ static void flatten_surface_closure_tree(ShaderData *sd, bool no_glossy,
 					sd->osl_closure.bsdf_sample_sum = sample_sum;
 
 					/* scattering flags */
-					if(scattering == OSL::Labels::DIFFUSE)
-						sd->flag |= SD_BSDF|SD_BSDF_HAS_EVAL;
-					else if(scattering == OSL::Labels::GLOSSY)
-						sd->flag |= SD_BSDF|SD_BSDF_HAS_EVAL|SD_BSDF_GLOSSY;
+					if (scattering == OSL::Labels::DIFFUSE)
+						sd->flag |= SD_BSDF | SD_BSDF_HAS_EVAL;
+					else if (scattering == OSL::Labels::GLOSSY)
+						sd->flag |= SD_BSDF | SD_BSDF_HAS_EVAL | SD_BSDF_GLOSSY;
 					else
 						sd->flag |= SD_BSDF;
 
@@ -157,7 +156,7 @@ static void flatten_surface_closure_tree(ShaderData *sd, bool no_glossy,
 					break;
 				}
 				case ClosurePrimitive::Emissive: {
-					if(sd->num_closure == MAX_CLOSURE)
+					if (sd->num_closure == MAX_CLOSURE)
 						return;
 
 					/* sample weight */
@@ -175,7 +174,7 @@ static void flatten_surface_closure_tree(ShaderData *sd, bool no_glossy,
 					break;
 				}
 				case ClosurePrimitive::Holdout:
-					if(sd->num_closure == MAX_CLOSURE)
+					if (sd->num_closure == MAX_CLOSURE)
 						return;
 
 					sc.sample_weight = 0.0f;
@@ -192,12 +191,12 @@ static void flatten_surface_closure_tree(ShaderData *sd, bool no_glossy,
 			}
 		}
 	}
-	else if(closure->type == OSL::ClosureColor::MUL) {
-		OSL::ClosureMul *mul = (OSL::ClosureMul*)closure;
+	else if (closure->type == OSL::ClosureColor::MUL) {
+		OSL::ClosureMul *mul = (OSL::ClosureMul *)closure;
 		flatten_surface_closure_tree(sd, no_glossy, mul->closure, TO_FLOAT3(mul->weight) * weight);
 	}
-	else if(closure->type == OSL::ClosureColor::ADD) {
-		OSL::ClosureAdd *add = (OSL::ClosureAdd*)closure;
+	else if (closure->type == OSL::ClosureColor::ADD) {
+		OSL::ClosureAdd *add = (OSL::ClosureAdd *)closure;
 		flatten_surface_closure_tree(sd, no_glossy, add->closureA, weight);
 		flatten_surface_closure_tree(sd, no_glossy, add->closureB, weight);
 	}
@@ -206,7 +205,7 @@ static void flatten_surface_closure_tree(ShaderData *sd, bool no_glossy,
 void OSLShader::eval_surface(KernelGlobals *kg, ShaderData *sd, float randb, int path_flag)
 {
 	/* gather pointers */
-	OSL::pvt::ShadingSystemImpl *ssi = (OSL::pvt::ShadingSystemImpl*)kg->osl.ss;
+	OSL::pvt::ShadingSystemImpl *ssi = (OSL::pvt::ShadingSystemImpl *)kg->osl.ss;
 	OSLGlobals::ThreadData *tdata = tls_get(OSLGlobals::ThreadData, kg->osl.thread_data);
 	OSL::ShaderGlobals *globals = &tdata->globals;
 	OSL::pvt::ShadingContext *ctx = ssi->get_context(tdata->thread_info);
@@ -218,14 +217,14 @@ void OSLShader::eval_surface(KernelGlobals *kg, ShaderData *sd, float randb, int
 	/* execute shader for this point */
 	int shader = sd->shader & SHADER_MASK;
 
-	if(kg->osl.surface_state[shader])
+	if (kg->osl.surface_state[shader])
 		ctx->execute(OSL::pvt::ShadUseSurface, *(kg->osl.surface_state[shader]), *globals);
 
 	/* flatten closure tree */
 	sd->num_closure = 0;
 	sd->randb_closure = randb;
 
-	if(globals->Ci) {
+	if (globals->Ci) {
 		bool no_glossy = (path_flag & PATH_RAY_DIFFUSE) && kernel_data.integrator.no_caustics;
 		flatten_surface_closure_tree(sd, no_glossy, globals->Ci);
 	}
@@ -235,27 +234,27 @@ void OSLShader::eval_surface(KernelGlobals *kg, ShaderData *sd, float randb, int
 
 static float3 flatten_background_closure_tree(const OSL::ClosureColor *closure)
 {
-	/* OSL gives use a closure tree, if we are shading for background there
+	/* OSL gives us a closure tree, if we are shading for background there
 	 * is only one supported closure type at the moment, which has no evaluation
 	 * functions, so we just sum the weights */
 
-	if(closure->type == OSL::ClosureColor::COMPONENT) {
-		OSL::ClosureComponent *comp = (OSL::ClosureComponent*)closure;
-		OSL::ClosurePrimitive *prim = (OSL::ClosurePrimitive*)comp->data();
+	if (closure->type == OSL::ClosureColor::COMPONENT) {
+		OSL::ClosureComponent *comp = (OSL::ClosureComponent *)closure;
+		OSL::ClosurePrimitive *prim = (OSL::ClosurePrimitive *)comp->data();
 
-		if(prim && prim->category() == OSL::ClosurePrimitive::Background)
+		if (prim && prim->category() == OSL::ClosurePrimitive::Background)
 			return make_float3(1.0f, 1.0f, 1.0f);
 	}
-	else if(closure->type == OSL::ClosureColor::MUL) {
-		OSL::ClosureMul *mul = (OSL::ClosureMul*)closure;
+	else if (closure->type == OSL::ClosureColor::MUL) {
+		OSL::ClosureMul *mul = (OSL::ClosureMul *)closure;
 
 		return TO_FLOAT3(mul->weight) * flatten_background_closure_tree(mul->closure);
 	}
-	else if(closure->type == OSL::ClosureColor::ADD) {
-		OSL::ClosureAdd *add = (OSL::ClosureAdd*)closure;
+	else if (closure->type == OSL::ClosureColor::ADD) {
+		OSL::ClosureAdd *add = (OSL::ClosureAdd *)closure;
 
 		return flatten_background_closure_tree(add->closureA) +
-			flatten_background_closure_tree(add->closureB);
+		       flatten_background_closure_tree(add->closureB);
 	}
 
 	return make_float3(0.0f, 0.0f, 0.0f);
@@ -264,7 +263,7 @@ static float3 flatten_background_closure_tree(const OSL::ClosureColor *closure)
 float3 OSLShader::eval_background(KernelGlobals *kg, ShaderData *sd, int path_flag)
 {
 	/* gather pointers */
-	OSL::pvt::ShadingSystemImpl *ssi = (OSL::pvt::ShadingSystemImpl*)kg->osl.ss;
+	OSL::pvt::ShadingSystemImpl *ssi = (OSL::pvt::ShadingSystemImpl *)kg->osl.ss;
 	OSLGlobals::ThreadData *tdata = tls_get(OSLGlobals::ThreadData, kg->osl.thread_data);
 	OSL::ShaderGlobals *globals = &tdata->globals;
 	OSL::pvt::ShadingContext *ctx = ssi->get_context(tdata->thread_info);
@@ -274,11 +273,11 @@ float3 OSLShader::eval_background(KernelGlobals *kg, ShaderData *sd, int path_fl
 	shaderdata_to_shaderglobals(kg, sd, path_flag, globals);
 
 	/* execute shader for this point */
-	if(kg->osl.background_state)
+	if (kg->osl.background_state)
 		ctx->execute(OSL::pvt::ShadUseSurface, *kg->osl.background_state, *globals);
 
 	/* return background color immediately */
-	if(globals->Ci)
+	if (globals->Ci)
 		return flatten_background_closure_tree(globals->Ci);
 
 	return make_float3(0.0f, 0.0f, 0.0f);
@@ -287,23 +286,23 @@ float3 OSLShader::eval_background(KernelGlobals *kg, ShaderData *sd, int path_fl
 /* Volume */
 
 static void flatten_volume_closure_tree(ShaderData *sd,
-	const OSL::ClosureColor *closure, float3 weight = make_float3(1.0f, 1.0f, 1.0f))
+                                        const OSL::ClosureColor *closure, float3 weight = make_float3(1.0f, 1.0f, 1.0f))
 {
-	/* OSL gives use a closure tree, we flatten it into arrays per
+	/* OSL gives us a closure tree, we flatten it into arrays per
 	 * closure type, for evaluation, sampling, etc later on. */
 
-	if(closure->type == OSL::ClosureColor::COMPONENT) {
-		OSL::ClosureComponent *comp = (OSL::ClosureComponent*)closure;
-		OSL::ClosurePrimitive *prim = (OSL::ClosurePrimitive*)comp->data();
+	if (closure->type == OSL::ClosureColor::COMPONENT) {
+		OSL::ClosureComponent *comp = (OSL::ClosureComponent *)closure;
+		OSL::ClosurePrimitive *prim = (OSL::ClosurePrimitive *)comp->data();
 
-		if(prim) {
+		if (prim) {
 			ShaderClosure sc;
 			sc.prim = prim;
 			sc.weight = weight;
 
-			switch(prim->category()) {
+			switch (prim->category()) {
 				case ClosurePrimitive::Volume: {
-					if(sd->num_closure == MAX_CLOSURE)
+					if (sd->num_closure == MAX_CLOSURE)
 						return;
 
 					/* sample weight */
@@ -329,12 +328,12 @@ static void flatten_volume_closure_tree(ShaderData *sd,
 			}
 		}
 	}
-	else if(closure->type == OSL::ClosureColor::MUL) {
-		OSL::ClosureMul *mul = (OSL::ClosureMul*)closure;
+	else if (closure->type == OSL::ClosureColor::MUL) {
+		OSL::ClosureMul *mul = (OSL::ClosureMul *)closure;
 		flatten_volume_closure_tree(sd, mul->closure, TO_FLOAT3(mul->weight) * weight);
 	}
-	else if(closure->type == OSL::ClosureColor::ADD) {
-		OSL::ClosureAdd *add = (OSL::ClosureAdd*)closure;
+	else if (closure->type == OSL::ClosureColor::ADD) {
+		OSL::ClosureAdd *add = (OSL::ClosureAdd *)closure;
 		flatten_volume_closure_tree(sd, add->closureA, weight);
 		flatten_volume_closure_tree(sd, add->closureB, weight);
 	}
@@ -343,7 +342,7 @@ static void flatten_volume_closure_tree(ShaderData *sd,
 void OSLShader::eval_volume(KernelGlobals *kg, ShaderData *sd, float randb, int path_flag)
 {
 	/* gather pointers */
-	OSL::pvt::ShadingSystemImpl *ssi = (OSL::pvt::ShadingSystemImpl*)kg->osl.ss;
+	OSL::pvt::ShadingSystemImpl *ssi = (OSL::pvt::ShadingSystemImpl *)kg->osl.ss;
 	OSLGlobals::ThreadData *tdata = tls_get(OSLGlobals::ThreadData, kg->osl.thread_data);
 	OSL::ShaderGlobals *globals = &tdata->globals;
 	OSL::pvt::ShadingContext *ctx = ssi->get_context(tdata->thread_info);
@@ -355,7 +354,7 @@ void OSLShader::eval_volume(KernelGlobals *kg, ShaderData *sd, float randb, int
 	/* execute shader */
 	int shader = sd->shader & SHADER_MASK;
 
-	if(kg->osl.volume_state[shader])
+	if (kg->osl.volume_state[shader])
 		ctx->execute(OSL::pvt::ShadUseSurface, *(kg->osl.volume_state[shader]), *globals);
 
 	/* retrieve resulting closures */
@@ -363,7 +362,7 @@ void OSLShader::eval_volume(KernelGlobals *kg, ShaderData *sd, float randb, int
 	sd->osl_closure.num_volume = 0;
 	sd->osl_closure.randb = randb;
 
-	if(globals->Ci)
+	if (globals->Ci)
 		flatten_volume_closure_tree(sd, globals->Ci);
 }
 
@@ -372,7 +371,7 @@ void OSLShader::eval_volume(KernelGlobals *kg, ShaderData *sd, float randb, int
 void OSLShader::eval_displacement(KernelGlobals *kg, ShaderData *sd)
 {
 	/* gather pointers */
-	OSL::pvt::ShadingSystemImpl *ssi = (OSL::pvt::ShadingSystemImpl*)kg->osl.ss;
+	OSL::pvt::ShadingSystemImpl *ssi = (OSL::pvt::ShadingSystemImpl *)kg->osl.ss;
 	OSLGlobals::ThreadData *tdata = tls_get(OSLGlobals::ThreadData, kg->osl.thread_data);
 	OSL::ShaderGlobals *globals = &tdata->globals;
 	OSL::pvt::ShadingContext *ctx = ssi->get_context(tdata->thread_info);
@@ -384,7 +383,7 @@ void OSLShader::eval_displacement(KernelGlobals *kg, ShaderData *sd)
 	/* execute shader */
 	int shader = sd->shader & SHADER_MASK;
 
-	if(kg->osl.displacement_state[shader])
+	if (kg->osl.displacement_state[shader])
 		ctx->execute(OSL::pvt::ShadUseSurface, *(kg->osl.displacement_state[shader]), *globals);
 
 	/* get back position */
@@ -393,17 +392,17 @@ void OSLShader::eval_displacement(KernelGlobals *kg, ShaderData *sd)
 
 void OSLShader::release(KernelGlobals *kg, const ShaderData *sd)
 {
-	OSL::pvt::ShadingSystemImpl *ssi = (OSL::pvt::ShadingSystemImpl*)kg->osl.ss;
+	OSL::pvt::ShadingSystemImpl *ssi = (OSL::pvt::ShadingSystemImpl *)kg->osl.ss;
 	OSLGlobals::ThreadData *tdata = tls_get(OSLGlobals::ThreadData, kg->osl.thread_data);
 
-	ssi->release_context((OSL::pvt::ShadingContext*)sd->osl_ctx, tdata->thread_info);
+	ssi->release_context((OSL::pvt::ShadingContext *)sd->osl_ctx, tdata->thread_info);
 }
 
 /* BSDF Closure */
 
 int OSLShader::bsdf_sample(const ShaderData *sd, const ShaderClosure *sc, float randu, float randv, float3& eval, float3& omega_in, differential3& domega_in, float& pdf)
 {
-	OSL::BSDFClosure *sample_bsdf = (OSL::BSDFClosure*)sc->prim;
+	OSL::BSDFClosure *sample_bsdf = (OSL::BSDFClosure *)sc->prim;
 	int label = LABEL_NONE;
 
 	pdf = 0.0f;
@@ -412,27 +411,27 @@ int OSLShader::bsdf_sample(const ShaderData *sd, const ShaderClosure *sc, float
 	ustring ulabel;
 
 	ulabel = sample_bsdf->sample(TO_VEC3(sd->Ng),
-		TO_VEC3(sd->I), TO_VEC3(sd->dI.dx), TO_VEC3(sd->dI.dy),
-		randu, randv,
-		TO_VEC3(omega_in), TO_VEC3(domega_in.dx), TO_VEC3(domega_in.dy),
-		pdf, TO_COLOR3(eval));
+	                             TO_VEC3(sd->I), TO_VEC3(sd->dI.dx), TO_VEC3(sd->dI.dy),
+	                             randu, randv,
+	                             TO_VEC3(omega_in), TO_VEC3(domega_in.dx), TO_VEC3(domega_in.dy),
+	                             pdf, TO_COLOR3(eval));
 
 	/* convert OSL label */
-	if(ulabel == OSL::Labels::REFLECT)
+	if (ulabel == OSL::Labels::REFLECT)
 		label = LABEL_REFLECT;
-	else if(ulabel == OSL::Labels::TRANSMIT)
+	else if (ulabel == OSL::Labels::TRANSMIT)
 		label = LABEL_TRANSMIT;
 	else
-		return LABEL_NONE; /* sampling failed */
+		return LABEL_NONE;  /* sampling failed */
 
 	/* convert scattering to our bitflag label */
 	ustring uscattering = sample_bsdf->scattering();
 
-	if(uscattering == OSL::Labels::DIFFUSE)
+	if (uscattering == OSL::Labels::DIFFUSE)
 		label |= LABEL_DIFFUSE;
-	else if(uscattering == OSL::Labels::GLOSSY)
+	else if (uscattering == OSL::Labels::GLOSSY)
 		label |= LABEL_GLOSSY;
-	else if(uscattering == OSL::Labels::SINGULAR)
+	else if (uscattering == OSL::Labels::SINGULAR)
 		label |= LABEL_SINGULAR;
 	else
 		label |= LABEL_TRANSPARENT;
@@ -442,10 +441,10 @@ int OSLShader::bsdf_sample(const ShaderData *sd, const ShaderClosure *sc, float
 
 float3 OSLShader::bsdf_eval(const ShaderData *sd, const ShaderClosure *sc, const float3& omega_in, float& pdf)
 {
-	OSL::BSDFClosure *bsdf = (OSL::BSDFClosure*)sc->prim;
+	OSL::BSDFClosure *bsdf = (OSL::BSDFClosure *)sc->prim;
 	OSL::Color3 bsdf_eval;
 
-	if(dot(sd->Ng, omega_in) >= 0.0f)
+	if (dot(sd->Ng, omega_in) >= 0.0f)
 		bsdf_eval = bsdf->eval_reflect(TO_VEC3(sd->I), TO_VEC3(omega_in), pdf);
 	else
 		bsdf_eval = bsdf->eval_transmit(TO_VEC3(sd->I), TO_VEC3(omega_in), pdf);
@@ -457,7 +456,7 @@ float3 OSLShader::bsdf_eval(const ShaderData *sd, const ShaderClosure *sc, const
 
 float3 OSLShader::emissive_eval(const ShaderData *sd, const ShaderClosure *sc)
 {
-	OSL::EmissiveClosure *emissive = (OSL::EmissiveClosure*)sc->prim;
+	OSL::EmissiveClosure *emissive = (OSL::EmissiveClosure *)sc->prim;
 	OSL::Color3 emissive_eval = emissive->eval(TO_VEC3(sd->Ng), TO_VEC3(sd->I));
 	eval += TO_FLOAT3(emissive_eval);
 
@@ -468,9 +467,9 @@ float3 OSLShader::emissive_eval(const ShaderData *sd, const ShaderClosure *sc)
 
 float3 OSLShader::volume_eval_phase(const ShaderData *sd, const ShaderClosure *sc, const float3 omega_in, const float3 omega_out)
 {
-	OSL::VolumeClosure *volume = (OSL::VolumeClosure*)sc->prim;
+	OSL::VolumeClosure *volume = (OSL::VolumeClosure *)sc->prim;
 	OSL::Color3 volume_eval = volume->eval_phase(TO_VEC3(omega_in), TO_VEC3(omega_out));
-	return TO_FLOAT3(volume_eval)*sc->weight;
+	return TO_FLOAT3(volume_eval) * sc->weight;
 }
 
 CCL_NAMESPACE_END
diff --git a/intern/cycles/kernel/osl/osl_shader.h b/intern/cycles/kernel/osl/osl_shader.h
index 6b1d402989b..815557ed203 100644
--- a/intern/cycles/kernel/osl/osl_shader.h
+++ b/intern/cycles/kernel/osl/osl_shader.h
@@ -68,15 +68,15 @@ public:
 
 	/* sample & eval */
 	static int bsdf_sample(const ShaderData *sd, const ShaderClosure *sc,
-		float randu, float randv,
-		float3& eval, float3& omega_in, differential3& domega_in, float& pdf);
+	                       float randu, float randv,
+	                       float3& eval, float3& omega_in, differential3& domega_in, float& pdf);
 	static float3 bsdf_eval(const ShaderData *sd, const ShaderClosure *sc,
-		const float3& omega_in, float& pdf);
+	                        const float3& omega_in, float& pdf);
 
 	static float3 emissive_eval(const ShaderData *sd, const ShaderClosure *sc);
 
 	static float3 volume_eval_phase(const ShaderData *sd, const ShaderClosure *sc,
-		const float3 omega_in, const float3 omega_out);
+	                                const float3 omega_in, const float3 omega_out);
 
 	/* release */
 	static void release(KernelGlobals *kg, const ShaderData *sd);
diff --git a/intern/cycles/kernel/osl/vol_subsurface.cpp b/intern/cycles/kernel/osl/vol_subsurface.cpp
index 0cd3060051b..818a057b6cc 100644
--- a/intern/cycles/kernel/osl/vol_subsurface.cpp
+++ b/intern/cycles/kernel/osl/vol_subsurface.cpp
@@ -46,88 +46,90 @@ using namespace OSL;
 
 class SubsurfaceClosure : public VolumeClosure {
 public:
-    float  m_g;
-    float  m_eta;
-    Color3 m_mfp, m_albedo;
-    static float root_find_Rd(const float Rd0, const float A) {
-        // quick exit for trivial cases
-        if (Rd0 <= 0) return 0;
-        const float A43 = A * 4.0f / 3.0f;
-        // Find alpha such that f(alpha) = Rd (see eq.15). A simple bisection
-        // method can be used because this function is monotonicaly increasing.
-        float lo = 0, hi = 1;
-        for (int i = 0; i < 20; i++) { // 2^20 divisions should be sufficient
-            // eval function at midpoint
-            float alpha = 0.5f * (lo + hi);
-            float a1 = sqrtf(3 * (1 - alpha));
-            float e1 = expf(-a1);
-            float e2 = expf(-A43 * a1);
-            float Rd = 0.5f * alpha * (1 + e2) * e1 - Rd0;
-            if (fabsf(Rd) < 1e-6f)
-                return alpha; // close enough
-            else if (Rd > 0)
-                hi = alpha; // root is on left side
-            else
-                lo = alpha; // root is on right side
-        }
-        // didn't quite converge, pick result in the middle of remaining interval
-        return 0.5f * (lo + hi);
-    }
-    SubsurfaceClosure() { }
-
-    void setup()
-    {
-        ior(m_eta);
-
-        if (m_g >=  0.99f) m_g =  0.99f;
-        if (m_g <= -0.99f) m_g = -0.99f;
-
-        // eq.10
-        float inv_eta = 1 / m_eta;
-        float Fdr = -1.440f * inv_eta * inv_eta + 0.710 * inv_eta + 0.668f + 0.0636 * m_eta;
-        float A = (1 + Fdr) / (1 - Fdr);
-        // compute sigma_s, sigma_a (eq.16)
-        Color3 alpha_prime = Color3 (root_find_Rd(m_albedo[0], A),
-                                     root_find_Rd(m_albedo[1], A),
-                                     root_find_Rd(m_albedo[2], A));
-        Color3 sigma_t_prime = Color3 (m_mfp.x > 0 ? 1.0f / (m_mfp[0] * sqrtf(3 * (1 - alpha_prime[0]))) : 0.0f,
-                                       m_mfp.y > 0 ? 1.0f / (m_mfp[1] * sqrtf(3 * (1 - alpha_prime[1]))) : 0.0f,
-                                       m_mfp.z > 0 ? 1.0f / (m_mfp[2] * sqrtf(3 * (1 - alpha_prime[2]))) : 0.0f);
-        Color3 sigma_s_prime = alpha_prime * sigma_t_prime;
-
-        sigma_s((1.0f / (1 - m_g)) * sigma_s_prime);
-        sigma_a(sigma_t_prime - sigma_s_prime);
-    }
-
-    bool mergeable (const ClosurePrimitive *other) const {
-        const SubsurfaceClosure *comp = (const SubsurfaceClosure *)other;
-        return m_g == comp->m_g && VolumeClosure::mergeable(other);
-    }
-
-    size_t memsize () const { return sizeof(*this); }
-
-    const char *name () const { return "subsurface"; }
-
-    void print_on (std::ostream &out) const {
-        out << name() << " ()";
-    }
-
-    virtual Color3 eval_phase(const Vec3 &omega_in, const Vec3 &omega_out) const {
-        float costheta = omega_in.dot(omega_out);
-        float ph = 0.25f * float(M_1_PI) * ((1 - m_g * m_g) / powf(1 + m_g * m_g - 2.0f * m_g * costheta, 1.5f));
-        return Color3 (ph, ph, ph);
-    }
+	float m_g;
+	float m_eta;
+	Color3 m_mfp, m_albedo;
+	static float root_find_Rd(const float Rd0, const float A) {
+		// quick exit for trivial cases
+		if (Rd0 <= 0) return 0;
+		const float A43 = A * 4.0f / 3.0f;
+		// Find alpha such that f(alpha) = Rd (see eq.15). A simple bisection
+		// method can be used because this function is monotonicaly increasing.
+		float lo = 0, hi = 1;
+		for (int i = 0; i < 20; i++) { // 2^20 divisions should be sufficient
+			// eval function at midpoint
+			float alpha = 0.5f * (lo + hi);
+			float a1 = sqrtf(3 * (1 - alpha));
+			float e1 = expf(-a1);
+			float e2 = expf(-A43 * a1);
+			float Rd = 0.5f * alpha * (1 + e2) * e1 - Rd0;
+			if (fabsf(Rd) < 1e-6f)
+				return alpha;  // close enough
+			else if (Rd > 0)
+				hi = alpha;  // root is on left side
+			else
+				lo = alpha;  // root is on right side
+		}
+		// didn't quite converge, pick result in the middle of remaining interval
+		return 0.5f * (lo + hi);
+	}
+	SubsurfaceClosure() {
+	}
+
+	void setup()
+	{
+		ior(m_eta);
+
+		if (m_g >=  0.99f) m_g =  0.99f;
+		if (m_g <= -0.99f) m_g = -0.99f;
+
+		// eq.10
+		float inv_eta = 1 / m_eta;
+		float Fdr = -1.440f * inv_eta * inv_eta + 0.710 * inv_eta + 0.668f + 0.0636 * m_eta;
+		float A = (1 + Fdr) / (1 - Fdr);
+		// compute sigma_s, sigma_a (eq.16)
+		Color3 alpha_prime = Color3(root_find_Rd(m_albedo[0], A),
+		                            root_find_Rd(m_albedo[1], A),
+		                            root_find_Rd(m_albedo[2], A));
+		Color3 sigma_t_prime = Color3(m_mfp.x > 0 ? 1.0f / (m_mfp[0] * sqrtf(3 * (1 - alpha_prime[0]))) : 0.0f,
+		                              m_mfp.y > 0 ? 1.0f / (m_mfp[1] * sqrtf(3 * (1 - alpha_prime[1]))) : 0.0f,
+		                              m_mfp.z > 0 ? 1.0f / (m_mfp[2] * sqrtf(3 * (1 - alpha_prime[2]))) : 0.0f);
+		Color3 sigma_s_prime = alpha_prime * sigma_t_prime;
+
+		sigma_s((1.0f / (1 - m_g)) * sigma_s_prime);
+		sigma_a(sigma_t_prime - sigma_s_prime);
+	}
+
+	bool mergeable(const ClosurePrimitive *other) const {
+		const SubsurfaceClosure *comp = (const SubsurfaceClosure *)other;
+		return m_g == comp->m_g && VolumeClosure::mergeable(other);
+	}
+
+	size_t memsize() const { return sizeof(*this); }
+
+	const char *name() const { return "subsurface"; }
+
+	void print_on(std::ostream &out) const {
+		out << name() << " ()";
+	}
+
+	virtual Color3 eval_phase(const Vec3 &omega_in, const Vec3 &omega_out) const {
+		float costheta = omega_in.dot(omega_out);
+		float ph = 0.25f * float(M_1_PI) * ((1 - m_g * m_g) / powf(1 + m_g * m_g - 2.0f * m_g * costheta, 1.5f));
+		return Color3(ph, ph, ph);
+	}
 };
 
 
 
 ClosureParam closure_subsurface_params[] = {
-    CLOSURE_FLOAT_PARAM (SubsurfaceClosure, m_eta),
-    CLOSURE_FLOAT_PARAM (SubsurfaceClosure, m_g),
-    CLOSURE_COLOR_PARAM (SubsurfaceClosure, m_mfp),
-    CLOSURE_COLOR_PARAM (SubsurfaceClosure, m_albedo),
-    CLOSURE_STRING_KEYPARAM("label"),
-    CLOSURE_FINISH_PARAM(SubsurfaceClosure) };
+	CLOSURE_FLOAT_PARAM(SubsurfaceClosure, m_eta),
+	CLOSURE_FLOAT_PARAM(SubsurfaceClosure, m_g),
+	CLOSURE_COLOR_PARAM(SubsurfaceClosure, m_mfp),
+	CLOSURE_COLOR_PARAM(SubsurfaceClosure, m_albedo),
+	CLOSURE_STRING_KEYPARAM("label"),
+	CLOSURE_FINISH_PARAM(SubsurfaceClosure)
+};
 
 CLOSURE_PREPARE(closure_subsurface_prepare, SubsurfaceClosure)
 
diff --git a/intern/cycles/kernel/svm/bsdf.h b/intern/cycles/kernel/svm/bsdf.h
index 18c1da73fbd..1a90eab0cd1 100644
--- a/intern/cycles/kernel/svm/bsdf.h
+++ b/intern/cycles/kernel/svm/bsdf.h
@@ -1,34 +1,34 @@
-/* 
- * Adapted from Open Shading Language with this license: 
- * 
- * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al. 
- * All Rights Reserved. 
- * 
- * Modifications Copyright 2011, Blender Foundation. 
- *  
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are 
- * met: 
- * * Redistributions of source code must retain the above copyright 
- *   notice, this list of conditions and the following disclaimer. 
- * * Redistributions in binary form must reproduce the above copyright 
- *   notice, this list of conditions and the following disclaimer in the 
- *   documentation and/or other materials provided with the distribution. 
- * * Neither the name of Sony Pictures Imageworks nor the names of its 
- *   contributors may be used to endorse or promote products derived from 
- *   this software without specific prior written permission. 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-*/
+/*
+ * Adapted from Open Shading Language with this license:
+ *
+ * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al.
+ * All Rights Reserved.
+ *
+ * Modifications Copyright 2011, Blender Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of Sony Pictures Imageworks nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #ifndef __OSL_BSDF_H__
 #define __OSL_BSDF_H__
@@ -47,7 +47,7 @@ __device float fresnel_dielectric(float eta, const float3 N,
 	float cos = dot(N, I), neta;
 	float3 Nn;
 	// compute reflection
-	*R =(2 * cos)* N - I;
+	*R = (2 * cos)* N - I;
 #ifdef __RAY_DIFFERENTIALS__
 	*dRdx = (2 * dot(N, dIdx)) * N - dIdx;
 	*dRdy = (2 * dot(N, dIdy)) * N - dIdy;
@@ -65,18 +65,18 @@ __device float fresnel_dielectric(float eta, const float3 N,
 		Nn   = -N;
 		*is_inside = true;
 	}
-	*R =(2 * cos)* Nn - I;
+	*R = (2 * cos)* Nn - I;
 	float arg = 1 -(neta * neta *(1 -(cos * cos)));
 	if(arg < 0) {
-		*T= make_float3(0.0f, 0.0f, 0.0f);
+		*T = make_float3(0.0f, 0.0f, 0.0f);
 #ifdef __RAY_DIFFERENTIALS__
-		*dTdx= make_float3(0.0f, 0.0f, 0.0f);
-		*dTdy= make_float3(0.0f, 0.0f, 0.0f);
+		*dTdx = make_float3(0.0f, 0.0f, 0.0f);
+		*dTdy = make_float3(0.0f, 0.0f, 0.0f);
 #endif
 		return 1; // total internal reflection
 	} else {
 		float dnp = sqrtf(arg);
-		float nK =(neta * cos)- dnp;
+		float nK = (neta * cos)- dnp;
 		*T = -(neta * I)+(nK * Nn);
 #ifdef __RAY_DIFFERENTIALS__
 		*dTdx = -(neta * dIdx) + ((neta - neta * neta * cos / dnp) * dot(dIdx, Nn)) * Nn;
@@ -85,8 +85,8 @@ __device float fresnel_dielectric(float eta, const float3 N,
 		// compute Fresnel terms
 		float cosTheta1 = cos; // N.R
 		float cosTheta2 = -dot(Nn, *T);
-		float pPara =(cosTheta1 - eta * cosTheta2)/(cosTheta1 + eta * cosTheta2);
-		float pPerp =(eta * cosTheta1 - cosTheta2)/(eta * cosTheta1 + cosTheta2);
+		float pPara = (cosTheta1 - eta * cosTheta2)/(cosTheta1 + eta * cosTheta2);
+		float pPerp = (eta * cosTheta1 - cosTheta2)/(eta * cosTheta1 + cosTheta2);
 		return 0.5f * (pPara * pPara + pPerp * pPerp);
 	}
 }
@@ -99,8 +99,8 @@ __device float fresnel_dielectric_cos(float cosi, float eta)
 	float g = eta * eta - 1 + c * c;
 	if(g > 0) {
 		g = sqrtf(g);
-		float A =(g - c)/(g + c);
-		float B =(c *(g + c)- 1)/(c *(g - c)+ 1);
+		float A = (g - c)/(g + c);
+		float B = (c *(g + c)- 1)/(c *(g - c)+ 1);
 		return 0.5f * A * A *(1 + B * B);
 	}
 	return 1.0f; // TIR(no refracted component)
@@ -110,10 +110,10 @@ __device float fresnel_conductor(float cosi, float eta, float k)
 {
 	float tmp_f = eta * eta + k * k;
 	float tmp = tmp_f * cosi * cosi;
-	float Rparl2 =(tmp -(2.0f * eta * cosi)+ 1)/
-				 (tmp +(2.0f * eta * cosi)+ 1);
-	float Rperp2 =(tmp_f -(2.0f * eta * cosi)+ cosi * cosi)/
-				 (tmp_f +(2.0f * eta * cosi)+ cosi * cosi);
+	float Rparl2 = (tmp - (2.0f * eta * cosi) + 1)/
+	               (tmp + (2.0f * eta * cosi) + 1);
+	float Rperp2 = (tmp_f - (2.0f * eta * cosi) + cosi * cosi)/
+	               (tmp_f + (2.0f * eta * cosi) + cosi * cosi);
 	return(Rparl2 + Rperp2) * 0.5f;
 }
 
diff --git a/intern/cycles/kernel/svm/bsdf_ashikhmin_velvet.h b/intern/cycles/kernel/svm/bsdf_ashikhmin_velvet.h
index 2e9343647b8..40249dbe9c6 100644
--- a/intern/cycles/kernel/svm/bsdf_ashikhmin_velvet.h
+++ b/intern/cycles/kernel/svm/bsdf_ashikhmin_velvet.h
@@ -28,7 +28,7 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 #ifndef __BSDF_ASHIKHMIN_VELVET_H__
 #define __BSDF_ASHIKHMIN_VELVET_H__
diff --git a/intern/cycles/kernel/svm/bsdf_diffuse.h b/intern/cycles/kernel/svm/bsdf_diffuse.h
index e8a002cb84c..45e82a566c0 100644
--- a/intern/cycles/kernel/svm/bsdf_diffuse.h
+++ b/intern/cycles/kernel/svm/bsdf_diffuse.h
@@ -1,34 +1,34 @@
-/* 
- * Adapted from Open Shading Language with this license: 
- * 
- * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al. 
- * All Rights Reserved. 
- * 
- * Modifications Copyright 2011, Blender Foundation. 
- *  
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are 
- * met: 
- * * Redistributions of source code must retain the above copyright 
- *   notice, this list of conditions and the following disclaimer. 
- * * Redistributions in binary form must reproduce the above copyright 
- *   notice, this list of conditions and the following disclaimer in the 
- *   documentation and/or other materials provided with the distribution. 
- * * Neither the name of Sony Pictures Imageworks nor the names of its 
- *   contributors may be used to endorse or promote products derived from 
- *   this software without specific prior written permission. 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-*/
+/*
+ * Adapted from Open Shading Language with this license:
+ *
+ * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al.
+ * All Rights Reserved.
+ *
+ * Modifications Copyright 2011, Blender Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of Sony Pictures Imageworks nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #ifndef __BSDF_DIFFUSE_H__
 #define __BSDF_DIFFUSE_H__
diff --git a/intern/cycles/kernel/svm/bsdf_microfacet.h b/intern/cycles/kernel/svm/bsdf_microfacet.h
index 8771578a2fd..01e3acb76e8 100644
--- a/intern/cycles/kernel/svm/bsdf_microfacet.h
+++ b/intern/cycles/kernel/svm/bsdf_microfacet.h
@@ -1,34 +1,34 @@
-/* 
- * Adapted from Open Shading Language with this license: 
- * 
- * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al. 
- * All Rights Reserved. 
- * 
- * Modifications Copyright 2011, Blender Foundation. 
- *  
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are 
- * met: 
- * * Redistributions of source code must retain the above copyright 
- *   notice, this list of conditions and the following disclaimer. 
- * * Redistributions in binary form must reproduce the above copyright 
- *   notice, this list of conditions and the following disclaimer in the 
- *   documentation and/or other materials provided with the distribution. 
- * * Neither the name of Sony Pictures Imageworks nor the names of its 
- *   contributors may be used to endorse or promote products derived from 
- *   this software without specific prior written permission. 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-*/
+/*
+ * Adapted from Open Shading Language with this license:
+ *
+ * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al.
+ * All Rights Reserved.
+ *
+ * Modifications Copyright 2011, Blender Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of Sony Pictures Imageworks nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #ifndef __BSDF_MICROFACET_H__
 #define __BSDF_MICROFACET_H__
diff --git a/intern/cycles/kernel/svm/bsdf_reflection.h b/intern/cycles/kernel/svm/bsdf_reflection.h
index f00b72c4869..09b4e0e48f0 100644
--- a/intern/cycles/kernel/svm/bsdf_reflection.h
+++ b/intern/cycles/kernel/svm/bsdf_reflection.h
@@ -1,34 +1,34 @@
-/* 
- * Adapted from Open Shading Language with this license: 
- * 
- * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al. 
- * All Rights Reserved. 
- * 
- * Modifications Copyright 2011, Blender Foundation. 
- *  
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are 
- * met: 
- * * Redistributions of source code must retain the above copyright 
- *   notice, this list of conditions and the following disclaimer. 
- * * Redistributions in binary form must reproduce the above copyright 
- *   notice, this list of conditions and the following disclaimer in the 
- *   documentation and/or other materials provided with the distribution. 
- * * Neither the name of Sony Pictures Imageworks nor the names of its 
- *   contributors may be used to endorse or promote products derived from 
- *   this software without specific prior written permission. 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-*/
+/*
+ * Adapted from Open Shading Language with this license:
+ *
+ * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al.
+ * All Rights Reserved.
+ *
+ * Modifications Copyright 2011, Blender Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of Sony Pictures Imageworks nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #ifndef __BSDF_REFLECTION_H__
 #define __BSDF_REFLECTION_H__
diff --git a/intern/cycles/kernel/svm/bsdf_refraction.h b/intern/cycles/kernel/svm/bsdf_refraction.h
index 07ef8633e0d..c9c268999c0 100644
--- a/intern/cycles/kernel/svm/bsdf_refraction.h
+++ b/intern/cycles/kernel/svm/bsdf_refraction.h
@@ -1,34 +1,34 @@
-/* 
- * Adapted from Open Shading Language with this license: 
- * 
- * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al. 
- * All Rights Reserved. 
- * 
- * Modifications Copyright 2011, Blender Foundation. 
- *  
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are 
- * met: 
- * * Redistributions of source code must retain the above copyright 
- *   notice, this list of conditions and the following disclaimer. 
- * * Redistributions in binary form must reproduce the above copyright 
- *   notice, this list of conditions and the following disclaimer in the 
- *   documentation and/or other materials provided with the distribution. 
- * * Neither the name of Sony Pictures Imageworks nor the names of its 
- *   contributors may be used to endorse or promote products derived from 
- *   this software without specific prior written permission. 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-*/
+/*
+ * Adapted from Open Shading Language with this license:
+ *
+ * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al.
+ * All Rights Reserved.
+ *
+ * Modifications Copyright 2011, Blender Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of Sony Pictures Imageworks nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #ifndef __BSDF_REFRACTION_H__
 #define __BSDF_REFRACTION_H__
diff --git a/intern/cycles/kernel/svm/bsdf_transparent.h b/intern/cycles/kernel/svm/bsdf_transparent.h
index 4425c4bf104..511836cdfa2 100644
--- a/intern/cycles/kernel/svm/bsdf_transparent.h
+++ b/intern/cycles/kernel/svm/bsdf_transparent.h
@@ -1,34 +1,34 @@
-/* 
- * Adapted from Open Shading Language with this license: 
- * 
- * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al. 
- * All Rights Reserved. 
- * 
- * Modifications Copyright 2011, Blender Foundation. 
- *  
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are 
- * met: 
- * * Redistributions of source code must retain the above copyright 
- *   notice, this list of conditions and the following disclaimer. 
- * * Redistributions in binary form must reproduce the above copyright 
- *   notice, this list of conditions and the following disclaimer in the 
- *   documentation and/or other materials provided with the distribution. 
- * * Neither the name of Sony Pictures Imageworks nor the names of its 
- *   contributors may be used to endorse or promote products derived from 
- *   this software without specific prior written permission. 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-*/
+/*
+ * Adapted from Open Shading Language with this license:
+ *
+ * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al.
+ * All Rights Reserved.
+ *
+ * Modifications Copyright 2011, Blender Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of Sony Pictures Imageworks nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #ifndef __BSDF_TRANSPARENT_H__
 #define __BSDF_TRANSPARENT_H__
diff --git a/intern/cycles/kernel/svm/bsdf_ward.h b/intern/cycles/kernel/svm/bsdf_ward.h
index d46baf099a6..86bca69425d 100644
--- a/intern/cycles/kernel/svm/bsdf_ward.h
+++ b/intern/cycles/kernel/svm/bsdf_ward.h
@@ -1,34 +1,34 @@
-/* 
- * Adapted from Open Shading Language with this license: 
- * 
- * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al. 
- * All Rights Reserved. 
- * 
- * Modifications Copyright 2011, Blender Foundation. 
- *  
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are 
- * met: 
- * * Redistributions of source code must retain the above copyright 
- *   notice, this list of conditions and the following disclaimer. 
- * * Redistributions in binary form must reproduce the above copyright 
- *   notice, this list of conditions and the following disclaimer in the 
- *   documentation and/or other materials provided with the distribution. 
- * * Neither the name of Sony Pictures Imageworks nor the names of its 
- *   contributors may be used to endorse or promote products derived from 
- *   this software without specific prior written permission. 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-*/
+/*
+ * Adapted from Open Shading Language with this license:
+ *
+ * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al.
+ * All Rights Reserved.
+ *
+ * Modifications Copyright 2011, Blender Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of Sony Pictures Imageworks nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #ifndef __BSDF_WARD_H__
 #define __BSDF_WARD_H__
diff --git a/intern/cycles/kernel/svm/bsdf_westin.h b/intern/cycles/kernel/svm/bsdf_westin.h
index 21e5018c489..6193d81c244 100644
--- a/intern/cycles/kernel/svm/bsdf_westin.h
+++ b/intern/cycles/kernel/svm/bsdf_westin.h
@@ -1,34 +1,34 @@
-/* 
- * Adapted from Open Shading Language with this license: 
- * 
- * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al. 
- * All Rights Reserved. 
- * 
- * Modifications Copyright 2011, Blender Foundation. 
- *  
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are 
- * met: 
- * * Redistributions of source code must retain the above copyright 
- *   notice, this list of conditions and the following disclaimer. 
- * * Redistributions in binary form must reproduce the above copyright 
- *   notice, this list of conditions and the following disclaimer in the 
- *   documentation and/or other materials provided with the distribution. 
- * * Neither the name of Sony Pictures Imageworks nor the names of its 
- *   contributors may be used to endorse or promote products derived from 
- *   this software without specific prior written permission. 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-*/
+/*
+ * Adapted from Open Shading Language with this license:
+ *
+ * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al.
+ * All Rights Reserved.
+ *
+ * Modifications Copyright 2011, Blender Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of Sony Pictures Imageworks nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #ifndef __BSDF_WESTIN_H__
 #define __BSDF_WESTIN_H__
diff --git a/intern/cycles/kernel/svm/emissive.h b/intern/cycles/kernel/svm/emissive.h
index e3f99e9b729..9a906f82963 100644
--- a/intern/cycles/kernel/svm/emissive.h
+++ b/intern/cycles/kernel/svm/emissive.h
@@ -1,47 +1,39 @@
-/* 
- * Adapted from Open Shading Language with this license: 
- * 
- * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al. 
- * All Rights Reserved. 
- * 
- * Modifications Copyright 2011, Blender Foundation. 
- *  
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are 
- * met: 
- * * Redistributions of source code must retain the above copyright 
- *   notice, this list of conditions and the following disclaimer. 
- * * Redistributions in binary form must reproduce the above copyright 
- *   notice, this list of conditions and the following disclaimer in the 
- *   documentation and/or other materials provided with the distribution. 
- * * Neither the name of Sony Pictures Imageworks nor the names of its 
- *   contributors may be used to endorse or promote products derived from 
- *   this software without specific prior written permission. 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-*/
+/*
+ * Adapted from Open Shading Language with this license:
+ *
+ * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al.
+ * All Rights Reserved.
+ *
+ * Modifications Copyright 2011, Blender Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of Sony Pictures Imageworks nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 CCL_NAMESPACE_BEGIN
 
 /* EMISSION CLOSURE */
 
-__device float3 emissive_eval(const float3 Ng, const float3 I)
-{
-	float cosNO = fabsf(dot(Ng, I));
-	float res = (cosNO > 0.0f)? 1.0f: 0.0f;
-	
-	return make_float3(res, res, res);
-}
-
 /// Return the probability distribution function in the direction I,
 /// given the parameters and the light's surface normal.  This MUST match
 /// the PDF computed by sample().
@@ -51,6 +43,13 @@ __device float emissive_pdf(const float3 Ng, const float3 I)
 	return (cosNO > 0.0f)? 1.0f: 0.0f;
 }
 
+__device float3 emissive_eval(const float3 Ng, const float3 I)
+{
+	float res = emissive_pdf(Ng, I);
+	
+	return make_float3(res, res, res);
+}
+
 __device float3 svm_emissive_eval(ShaderData *sd, ShaderClosure *sc)
 {
 	return emissive_eval(sd->Ng, sd->I);
diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h
index 6a05639beb9..8901e5e9628 100644
--- a/intern/cycles/kernel/svm/svm.h
+++ b/intern/cycles/kernel/svm/svm.h
@@ -269,6 +269,9 @@ __device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderT
 			case NODE_OBJECT_INFO:
 				svm_node_object_info(kg, sd, stack, node.y, node.z);
 				break;
+			case NODE_PARTICLE_INFO:
+				svm_node_particle_info(kg, sd, stack, node.y, node.z);
+				break;
 #endif
 			case NODE_CONVERT:
 				svm_node_convert(sd, stack, node.y, node.z, node.w);
diff --git a/intern/cycles/kernel/svm/svm_closure.h b/intern/cycles/kernel/svm/svm_closure.h
index 8409e83d94e..935504026ef 100644
--- a/intern/cycles/kernel/svm/svm_closure.h
+++ b/intern/cycles/kernel/svm/svm_closure.h
@@ -374,7 +374,7 @@ __device void svm_node_mix_closure(ShaderData *sd, float *stack,
 {
 #ifdef __MULTI_CLOSURE__
 	/* fetch weight from blend input, previous mix closures,
-	   and write to stack to be used by closure nodes later */
+	 * and write to stack to be used by closure nodes later */
 	uint weight_offset, in_weight_offset, weight1_offset, weight2_offset;
 	decode_node_uchar4(node.y, &weight_offset, &in_weight_offset, &weight1_offset, &weight2_offset);
 
@@ -387,8 +387,8 @@ __device void svm_node_mix_closure(ShaderData *sd, float *stack,
 		stack_store_float(stack, weight2_offset, in_weight*weight);
 #else
 	/* pick a closure and make the random number uniform over 0..1 again.
-	   closure 1 starts on the next node, for closure 2 the start is at an
-	   offset from the current node, so we jump */
+	 * closure 1 starts on the next node, for closure 2 the start is at an
+	 * offset from the current node, so we jump */
 	uint weight_offset = node.y;
 	uint node_jump = node.z;
 	float weight = stack_load_float(stack, weight_offset);
@@ -410,8 +410,8 @@ __device void svm_node_add_closure(ShaderData *sd, float *stack, uint unused,
 	/* nothing to do, handled in compiler */
 #else
 	/* pick one of the two closures with probability 0.5. sampling quality
-	   is not going to be great, for that we'd need to evaluate the weights
-	   of the two closures being added */
+	 * is not going to be great, for that we'd need to evaluate the weights
+	 * of the two closures being added */
 	float weight = 0.5f;
 
 	if(*randb < weight) {
diff --git a/intern/cycles/kernel/svm/svm_geometry.h b/intern/cycles/kernel/svm/svm_geometry.h
index dab19983946..88127b56474 100644
--- a/intern/cycles/kernel/svm/svm_geometry.h
+++ b/intern/cycles/kernel/svm/svm_geometry.h
@@ -94,5 +94,27 @@ __device void svm_node_object_info(KernelGlobals *kg, ShaderData *sd, float *sta
 	stack_store_float(stack, out_offset, data);
 }
 
+/* Particle Info */
+
+__device void svm_node_particle_info(KernelGlobals *kg, ShaderData *sd, float *stack, uint type, uint out_offset)
+{
+	float data;
+
+	switch(type) {
+		case NODE_INFO_PAR_AGE: {
+			uint particle_id = object_particle_id(kg, sd->object);
+			data = particle_age(kg, particle_id);
+			stack_store_float(stack, out_offset, data);
+			break;
+		}
+		case NODE_INFO_PAR_LIFETIME: {
+			uint particle_id = object_particle_id(kg, sd->object);
+			data = particle_lifetime(kg, particle_id);
+			stack_store_float(stack, out_offset, data);
+			break;
+		}
+	}
+}
+
 CCL_NAMESPACE_END
 
diff --git a/intern/cycles/kernel/svm/svm_gradient.h b/intern/cycles/kernel/svm/svm_gradient.h
index c7013800d6b..7fad1175c49 100644
--- a/intern/cycles/kernel/svm/svm_gradient.h
+++ b/intern/cycles/kernel/svm/svm_gradient.h
@@ -20,13 +20,13 @@ CCL_NAMESPACE_BEGIN
 
 /* Gradient */
 
-__device float svm_gradient(float3 p, NodeBlendType type)
+__device float svm_gradient(float3 p, NodeGradientType type)
 {
 	float x, y, z;
 
-	x= p.x;
-	y= p.y;
-	z= p.z;
+	x = p.x;
+	y = p.y;
+	z = p.z;
 
 	if(type == NODE_BLEND_LINEAR) {
 		return x;
@@ -45,7 +45,7 @@ __device float svm_gradient(float3 p, NodeBlendType type)
 		return (x + y)/2.0f;
 	}
 	else if(type == NODE_BLEND_RADIAL) {
-		return atan2(y, x)/(2.0f*M_PI_F) + 0.5f;
+		return atan2f(y, x) / (2.0f * M_PI_F) + 0.5f;
 	}
 	else {
 		float r = fmaxf(1.0f - sqrtf(x*x + y*y + z*z), 0.0f);
@@ -67,7 +67,7 @@ __device void svm_node_tex_gradient(ShaderData *sd, float *stack, uint4 node)
 
 	float3 co = stack_load_float3(stack, co_offset);
 
-	float f = svm_gradient(co, (NodeBlendType)type);
+	float f = svm_gradient(co, (NodeGradientType)type);
 	f = clamp(f, 0.0f, 1.0f);
 
 	if(stack_valid(fac_offset))
diff --git a/intern/cycles/kernel/svm/svm_image.h b/intern/cycles/kernel/svm/svm_image.h
index 388f006c40f..3b2b9204d86 100644
--- a/intern/cycles/kernel/svm/svm_image.h
+++ b/intern/cycles/kernel/svm/svm_image.h
@@ -92,13 +92,13 @@ __device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y)
 	float4 r;
 
 	/* not particularly proud of this massive switch, what are the
-	   alternatives?
-	   - use a single big 1D texture, and do our own lookup/filtering
-	   - group by size and use a 3d texture, performance impact
-	   - group into larger texture with some padding for correct lerp
-
-	   also note that cuda has 128 textures limit, we use 100 now, since
-	   we still need some for other storage */
+	 * alternatives?
+	 * - use a single big 1D texture, and do our own lookup/filtering
+	 * - group by size and use a 3d texture, performance impact
+	 * - group into larger texture with some padding for correct lerp
+	 *
+	 * also note that cuda has 128 textures limit, we use 100 now, since
+	 * we still need some for other storage */
 
 	switch(id) {
 		case 0: r = kernel_tex_image_interp(__tex_image_000, x, y); break;
diff --git a/intern/cycles/kernel/svm/svm_magic.h b/intern/cycles/kernel/svm/svm_magic.h
index 65d37937e1e..fdded813784 100644
--- a/intern/cycles/kernel/svm/svm_magic.h
+++ b/intern/cycles/kernel/svm/svm_magic.h
@@ -34,39 +34,39 @@ __device_noinline float3 svm_magic(float3 p, int n, float distortion)
 		y *= distortion;
 
 		if(n > 1) {
-			x= cosf(x-y-z);
+			x = cosf(x-y-z);
 			x *= distortion;
 
 			if(n > 2) {
-				z= sinf(-x-y-z);
+				z = sinf(-x-y-z);
 				z *= distortion;
 
 				if(n > 3) {
-					x= -cosf(-x+y-z);
+					x = -cosf(-x+y-z);
 					x *= distortion;
 
 					if(n > 4) {
-						y= -sinf(-x+y+z);
+						y = -sinf(-x+y+z);
 						y *= distortion;
 
 						if(n > 5) {
-							y= -cosf(-x+y+z);
+							y = -cosf(-x+y+z);
 							y *= distortion;
 
 							if(n > 6) {
-								x= cosf(x+y+z);
+								x = cosf(x+y+z);
 								x *= distortion;
 
 								if(n > 7) {
-									z= sinf(x+y-z);
+									z = sinf(x+y-z);
 									z *= distortion;
 
 									if(n > 8) {
-										x= -cosf(-x-y+z);
+										x = -cosf(-x-y+z);
 										x *= distortion;
 
 										if(n > 9) {
-											y= -sinf(x-y+z);
+											y = -sinf(x-y+z);
 											y *= distortion;
 										}
 									}
diff --git a/intern/cycles/kernel/svm/svm_mix.h b/intern/cycles/kernel/svm/svm_mix.h
index e2274a2e691..6b455e713c2 100644
--- a/intern/cycles/kernel/svm/svm_mix.h
+++ b/intern/cycles/kernel/svm/svm_mix.h
@@ -248,8 +248,8 @@ __device float3 svm_mix_soft(float t, float3 col1, float3 col2)
 {
 	float tm = 1.0f - t;
 
-	float3 one= make_float3(1.0f, 1.0f, 1.0f);
-	float3 scr= one - (one - col2)*(one - col1);
+	float3 one = make_float3(1.0f, 1.0f, 1.0f);
+	float3 scr = one - (one - col2)*(one - col1);
 
 	return tm*col1 + t*((one - col1)*col2*col1 + col1*scr);
 }
@@ -259,19 +259,19 @@ __device float3 svm_mix_linear(float t, float3 col1, float3 col2)
 	float3 outcol = col1;
 
 	if(col2.x > 0.5f)
-		outcol.x= col1.x + t*(2.0f*(col2.x - 0.5f));
+		outcol.x = col1.x + t*(2.0f*(col2.x - 0.5f));
 	else
-		outcol.x= col1.x + t*(2.0f*(col2.x) - 1.0f);
+		outcol.x = col1.x + t*(2.0f*(col2.x) - 1.0f);
 
 	if(col2.y > 0.5f)
-		outcol.y= col1.y + t*(2.0f*(col2.y - 0.5f));
+		outcol.y = col1.y + t*(2.0f*(col2.y - 0.5f));
 	else
-		outcol.y= col1.y + t*(2.0f*(col2.y) - 1.0f);
+		outcol.y = col1.y + t*(2.0f*(col2.y) - 1.0f);
 
 	if(col2.z > 0.5f)
-		outcol.z= col1.z + t*(2.0f*(col2.z - 0.5f));
+		outcol.z = col1.z + t*(2.0f*(col2.z - 0.5f));
 	else
-		outcol.z= col1.z + t*(2.0f*(col2.z) - 1.0f);
+		outcol.z = col1.z + t*(2.0f*(col2.z) - 1.0f);
 	
 	return outcol;
 }
diff --git a/intern/cycles/kernel/svm/svm_musgrave.h b/intern/cycles/kernel/svm/svm_musgrave.h
index 9444dc20e6e..425909e59f1 100644
--- a/intern/cycles/kernel/svm/svm_musgrave.h
+++ b/intern/cycles/kernel/svm/svm_musgrave.h
@@ -41,7 +41,7 @@ __device_noinline float noise_musgrave_fBm(float3 p, NodeNoiseBasis basis, float
 		p *= lacunarity;
 	}
 
-	rmd = octaves - floor(octaves);
+	rmd = octaves - floorf(octaves);
 	if(rmd != 0.0f)
 		value += rmd * snoise(p) * pwr;
 
@@ -69,7 +69,7 @@ __device_noinline float noise_musgrave_multi_fractal(float3 p, NodeNoiseBasis ba
 		p *= lacunarity;
 	}
 
-	rmd = octaves - floor(octaves);
+	rmd = octaves - floorf(octaves);
 	if(rmd != 0.0f)
 		value *= (rmd * pwr * snoise(p) + 1.0f); /* correct? */
 
@@ -102,7 +102,7 @@ __device_noinline float noise_musgrave_hetero_terrain(float3 p, NodeNoiseBasis b
 		p *= lacunarity;
 	}
 
-	rmd = octaves - floor(octaves);
+	rmd = octaves - floorf(octaves);
 	if(rmd != 0.0f) {
 		increment = (snoise(p) + offset) * pwr * value;
 		value += rmd * increment;
@@ -141,7 +141,7 @@ __device_noinline float noise_musgrave_hybrid_multi_fractal(float3 p, NodeNoiseB
 		p *= lacunarity;
 	}
 
-	rmd = octaves - floor(octaves);
+	rmd = octaves - floorf(octaves);
 	if(rmd != 0.0f)
 		result += rmd * ((snoise(p) + offset) * pwr);
 
diff --git a/intern/cycles/kernel/svm/svm_noise.h b/intern/cycles/kernel/svm/svm_noise.h
index 1d3ace061ab..dfaf43acbd4 100644
--- a/intern/cycles/kernel/svm/svm_noise.h
+++ b/intern/cycles/kernel/svm/svm_noise.h
@@ -28,7 +28,7 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
 
 CCL_NAMESPACE_BEGIN
 
@@ -84,9 +84,9 @@ __device uint phash(int kx, int ky, int kz, int3 p)
 
 __device float floorfrac(float x, int* i)
 {
-    float f = floorf(x);
-    *i = (int)f;
-    return x - f;
+	float f = floorf(x);
+	*i = (int)f;
+	return x - f;
 }
 
 __device float fade(float t)
@@ -96,7 +96,7 @@ __device float fade(float t)
 
 __device float nerp(float t, float a, float b)
 {
-    return (1.0f - t) * a + t * b;
+	return (1.0f - t) * a + t * b;
 }
 
 __device float grad(int hash, float x, float y, float z)
diff --git a/intern/cycles/kernel/svm/svm_noisetex.h b/intern/cycles/kernel/svm/svm_noisetex.h
index 7421597040e..96b47a055bc 100644
--- a/intern/cycles/kernel/svm/svm_noisetex.h
+++ b/intern/cycles/kernel/svm/svm_noisetex.h
@@ -18,7 +18,7 @@
 
 CCL_NAMESPACE_BEGIN
 
-/* Clouds */
+/* Noise */
 
 __device_inline void svm_noise(float3 p, float scale, float detail, float distortion, float *fac, float3 *color)
 {
diff --git a/intern/cycles/kernel/svm/svm_tex_coord.h b/intern/cycles/kernel/svm/svm_tex_coord.h
index 9952557d614..854a708a988 100644
--- a/intern/cycles/kernel/svm/svm_tex_coord.h
+++ b/intern/cycles/kernel/svm/svm_tex_coord.h
@@ -43,7 +43,7 @@ __device_inline float3 svm_world_to_ndc(KernelGlobals *kg, ShaderData *sd, float
 		else
 			P = normalize(transform_direction(&tfm, P));
 
-		float2 uv = direction_to_panorama(kg, P);;
+		float2 uv = direction_to_panorama(kg, P);
 
 		return make_float3(uv.x, uv.y, 0.0f);
 	}
diff --git a/intern/cycles/kernel/svm/svm_texture.h b/intern/cycles/kernel/svm/svm_texture.h
index 448132bff46..6c22d98e0df 100644
--- a/intern/cycles/kernel/svm/svm_texture.h
+++ b/intern/cycles/kernel/svm/svm_texture.h
@@ -152,7 +152,7 @@ __device float voronoi_CrS(float3 p) { return 2.0f*voronoi_Cr(p) - 1.0f; }
 __device float noise_basis(float3 p, NodeNoiseBasis basis)
 {
 	/* Only Perlin enabled for now, others break CUDA compile by making kernel
-	   too big, with compile using > 4GB, due to everything being inlined. */
+	 * too big, with compile using > 4GB, due to everything being inlined. */
 
 #if 0
 	if(basis == NODE_NOISE_PERLIN)
@@ -188,10 +188,10 @@ __device float noise_basis_hard(float3 p, NodeNoiseBasis basis, int hard)
 
 /* Waves */
 
-__device float noise_wave(NodeWaveType wave, float a)
+__device float noise_wave(NodeWaveBasis wave, float a)
 {
 	if(wave == NODE_WAVE_SINE) {
-		return 0.5f + 0.5f*sin(a);
+		return 0.5f + 0.5f * sinf(a);
 	}
 	else if(wave == NODE_WAVE_SAW) {
 		float b = 2.0f*M_PI_F;
@@ -221,7 +221,7 @@ __device_noinline float noise_turbulence(float3 p, NodeNoiseBasis basis, float o
 	int i, n;
 
 	octaves = clamp(octaves, 0.0f, 16.0f);
-	n= (int)octaves;
+	n = (int)octaves;
 
 	for(i = 0; i <= n; i++) {
 		float t = noise_basis(fscale*p, basis);
@@ -234,7 +234,7 @@ __device_noinline float noise_turbulence(float3 p, NodeNoiseBasis basis, float o
 		fscale *= 2.0f;
 	}
 
-	float rmd = octaves - floor(octaves);
+	float rmd = octaves - floorf(octaves);
 
 	if(rmd != 0.0f) {
 		float t = noise_basis(fscale*p, basis);
diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/svm_types.h
index 97849736ef6..c1eeeb55268 100644
--- a/intern/cycles/kernel/svm/svm_types.h
+++ b/intern/cycles/kernel/svm/svm_types.h
@@ -30,70 +30,66 @@ CCL_NAMESPACE_BEGIN
 
 /* Nodes */
 
-/* note that we do not simply use 0, 1, 2, .. as values for these. this works
- * around an obscure CUDA bug that happens when compiling for fermi. why it
- * happens i have no idea, but consecutive values are problematic, maybe it
- * generates an incorrect jump table. */
-
 typedef enum NodeType {
 	NODE_END = 0,
-	NODE_CLOSURE_BSDF = 100,
-	NODE_CLOSURE_EMISSION = 200,
-	NODE_CLOSURE_BACKGROUND = 300,
-	NODE_CLOSURE_SET_WEIGHT = 400,
-	NODE_CLOSURE_WEIGHT = 500,
-	NODE_MIX_CLOSURE = 600,
-	NODE_JUMP = 700,
-	NODE_TEX_IMAGE = 1000,
-	NODE_TEX_SKY = 1100,
-	NODE_GEOMETRY = 1200,
-	NODE_LIGHT_PATH = 1300,
-	NODE_VALUE_F = 1400,
-	NODE_VALUE_V = 1500,
-	NODE_MIX = 1600,
-	NODE_ATTR = 1700,
-	NODE_CONVERT = 1900,
-	NODE_FRESNEL = 2000,
-	NODE_EMISSION_WEIGHT = 2100,
-	NODE_TEX_GRADIENT = 2200,
-	NODE_TEX_VORONOI = 2300,
-	NODE_TEX_MUSGRAVE = 2400,
-	NODE_TEX_WAVE = 2500,
-	NODE_TEX_MAGIC = 2600,
-	NODE_TEX_NOISE = 3000,
-	NODE_SHADER_JUMP = 3100,
-	NODE_SET_DISPLACEMENT = 3200,
-	NODE_GEOMETRY_BUMP_DX = 3300,
-	NODE_GEOMETRY_BUMP_DY = 3400,
-	NODE_SET_BUMP = 3500,
-	NODE_MATH = 3600,
-	NODE_VECTOR_MATH = 3700,
-	NODE_MAPPING = 3800,
-	NODE_TEX_COORD = 3900,
-	NODE_TEX_COORD_BUMP_DX = 4000,
-	NODE_TEX_COORD_BUMP_DY = 4100,
-	NODE_ADD_CLOSURE = 4200,
-	NODE_EMISSION_SET_WEIGHT_TOTAL = 4300,
-	NODE_ATTR_BUMP_DX = 4400,
-	NODE_ATTR_BUMP_DY = 4500,
-	NODE_TEX_ENVIRONMENT = 4600,
-	NODE_CLOSURE_HOLDOUT = 4700,
-	NODE_LAYER_WEIGHT = 4800,
-	NODE_CLOSURE_VOLUME = 4900,
-	NODE_SEPARATE_RGB = 5000,
-	NODE_COMBINE_RGB = 5100,
-	NODE_HSV = 5200,
-	NODE_CAMERA = 5300,
-	NODE_INVERT = 5400,
-	NODE_NORMAL = 5500,
-	NODE_GAMMA = 5600,
-	NODE_TEX_CHECKER = 5700,
-	NODE_BRIGHTCONTRAST = 5800,
-	NODE_RGB_RAMP = 5900,
-	NODE_RGB_CURVES = 6000,
-	NODE_MIN_MAX = 6100,
-	NODE_LIGHT_FALLOFF = 6200,
-	NODE_OBJECT_INFO = 6300
+	NODE_CLOSURE_BSDF,
+	NODE_CLOSURE_EMISSION,
+	NODE_CLOSURE_BACKGROUND,
+	NODE_CLOSURE_SET_WEIGHT,
+	NODE_CLOSURE_WEIGHT,
+	NODE_MIX_CLOSURE,
+	NODE_JUMP,
+	NODE_TEX_IMAGE,
+	NODE_TEX_SKY,
+	NODE_GEOMETRY,
+	NODE_LIGHT_PATH,
+	NODE_VALUE_F,
+	NODE_VALUE_V,
+	NODE_MIX,
+	NODE_ATTR,
+	NODE_CONVERT,
+	NODE_FRESNEL,
+	NODE_EMISSION_WEIGHT,
+	NODE_TEX_GRADIENT,
+	NODE_TEX_VORONOI,
+	NODE_TEX_MUSGRAVE,
+	NODE_TEX_WAVE,
+	NODE_TEX_MAGIC,
+	NODE_TEX_NOISE,
+	NODE_SHADER_JUMP,
+	NODE_SET_DISPLACEMENT,
+	NODE_GEOMETRY_BUMP_DX,
+	NODE_GEOMETRY_BUMP_DY,
+	NODE_SET_BUMP,
+	NODE_MATH,
+	NODE_VECTOR_MATH,
+	NODE_MAPPING,
+	NODE_TEX_COORD,
+	NODE_TEX_COORD_BUMP_DX,
+	NODE_TEX_COORD_BUMP_DY,
+	NODE_ADD_CLOSURE,
+	NODE_EMISSION_SET_WEIGHT_TOTAL,
+	NODE_ATTR_BUMP_DX,
+	NODE_ATTR_BUMP_DY,
+	NODE_TEX_ENVIRONMENT,
+	NODE_CLOSURE_HOLDOUT,
+	NODE_LAYER_WEIGHT,
+	NODE_CLOSURE_VOLUME,
+	NODE_SEPARATE_RGB,
+	NODE_COMBINE_RGB,
+	NODE_HSV,
+	NODE_CAMERA,
+	NODE_INVERT,
+	NODE_NORMAL,
+	NODE_GAMMA,
+	NODE_TEX_CHECKER,
+	NODE_BRIGHTCONTRAST,
+	NODE_RGB_RAMP,
+	NODE_RGB_CURVES,
+	NODE_MIN_MAX,
+	NODE_LIGHT_FALLOFF,
+	NODE_OBJECT_INFO,
+	NODE_PARTICLE_INFO
 } NodeType;
 
 typedef enum NodeAttributeType {
@@ -117,6 +113,11 @@ typedef enum NodeObjectInfo {
 	NODE_INFO_OB_RANDOM
 } NodeObjectInfo;
 
+typedef enum NodeParticleInfo {
+	NODE_INFO_PAR_AGE,
+	NODE_INFO_PAR_LIFETIME
+} NodeParticleInfo;
+
 typedef enum NodeLightPath {
 	NODE_LP_camera = 0,
 	NODE_LP_shadow,
@@ -220,11 +221,11 @@ typedef enum NodeNoiseBasis {
 	NODE_NOISE_CELL_NOISE
 } NodeNoiseBasis;
 
-typedef enum NodeWaveType {
+typedef enum NodeWaveBasis {
 	NODE_WAVE_SINE,
 	NODE_WAVE_SAW,
 	NODE_WAVE_TRI
-} NodeWaveType;
+} NodeWaveBasis;
 
 typedef enum NodeMusgraveType {
 	NODE_MUSGRAVE_MULTIFRACTAL,
@@ -234,12 +235,12 @@ typedef enum NodeMusgraveType {
 	NODE_MUSGRAVE_HETERO_TERRAIN
 } NodeMusgraveType;
 
-typedef enum NodeWoodType {
+typedef enum NodeWaveType {
 	NODE_WAVE_BANDS,
 	NODE_WAVE_RINGS
-} NodeWoodType;
+} NodeWaveType;
 
-typedef enum NodeBlendType {
+typedef enum NodeGradientType {
 	NODE_BLEND_LINEAR,
 	NODE_BLEND_QUADRATIC,
 	NODE_BLEND_EASING,
@@ -247,24 +248,7 @@ typedef enum NodeBlendType {
 	NODE_BLEND_RADIAL,
 	NODE_BLEND_QUADRATIC_SPHERE,
 	NODE_BLEND_SPHERICAL
-} NodeBlendType;
-
-typedef enum NodeBlendAxis {
-	NODE_BLEND_HORIZONTAL,
-	NODE_BLEND_VERTICAL
-} NodeBlendAxis;
-
-typedef enum NodeMarbleType {
-	NODE_MARBLE_SOFT,
-	NODE_MARBLE_SHARP,
-	NODE_MARBLE_SHARPER
-} NodeMarbleType;
-
-typedef enum NodeStucciType {
-	NODE_STUCCI_PLASTIC,
-	NODE_STUCCI_WALL_IN,
-	NODE_STUCCI_WALL_OUT
-} NodeStucciType;
+} NodeGradientType;
 
 typedef enum NodeVoronoiColoring {
 	NODE_VORONOI_INTENSITY,
diff --git a/intern/cycles/kernel/svm/svm_voronoi.h b/intern/cycles/kernel/svm/svm_voronoi.h
index f5ee7851a51..7e7bd970320 100644
--- a/intern/cycles/kernel/svm/svm_voronoi.h
+++ b/intern/cycles/kernel/svm/svm_voronoi.h
@@ -38,7 +38,7 @@ __device_noinline float4 svm_voronoi(NodeVoronoiColoring coloring, float scale,
 	}
 	else {
 		color = cellnoise_color(pa[0]);
-        fac= average(color);
+		fac = average(color);
 	}
 
 	return make_float4(color.x, color.y, color.z, fac);
diff --git a/intern/cycles/kernel/svm/svm_wave.h b/intern/cycles/kernel/svm/svm_wave.h
index 8f2131156c4..d2d808e4063 100644
--- a/intern/cycles/kernel/svm/svm_wave.h
+++ b/intern/cycles/kernel/svm/svm_wave.h
@@ -18,18 +18,18 @@
 
 CCL_NAMESPACE_BEGIN
 
-/* Marble */
+/* Wave */
 
-__device_noinline float svm_wave(NodeWoodType type, float3 p, float scale, float detail, float distortion, float dscale)
+__device_noinline float svm_wave(NodeWaveType type, float3 p, float scale, float detail, float distortion, float dscale)
 {
 	float w, n;
 
 	p *= scale;
 
 	if(type == NODE_WAVE_BANDS)
-		n= (p.x + p.x + p.z)*10.0f;
+		n = (p.x + p.y + p.z) * 10.0f;
 	else /* if(type == NODE_WAVE_RINGS) */
-		n= len(p)*20.0f;
+		n = len(p) * 20.0f;
 	
 	if(distortion != 0.0f)
 		n += distortion * noise_turbulence(p*dscale, NODE_NOISE_PERLIN, detail, 0);
@@ -55,7 +55,7 @@ __device void svm_node_tex_wave(KernelGlobals *kg, ShaderData *sd, float *stack,
 	float distortion = stack_load_float_default(stack, distortion_offset, node2.z);
 	float dscale = stack_load_float_default(stack, dscale_offset, node2.w);
 
-	float f = svm_wave((NodeWoodType)type, co, scale, detail, distortion, dscale);
+	float f = svm_wave((NodeWaveType)type, co, scale, detail, distortion, dscale);
 
 	if(stack_valid(fac_offset)) stack_store_float(stack, fac_offset, f);
 	if(stack_valid(color_offset)) stack_store_float3(stack, color_offset, make_float3(f, f, f));
diff --git a/intern/cycles/kernel/svm/volume.h b/intern/cycles/kernel/svm/volume.h
index 86cb2dcc24e..10e9c5de352 100644
--- a/intern/cycles/kernel/svm/volume.h
+++ b/intern/cycles/kernel/svm/volume.h
@@ -19,7 +19,7 @@
 CCL_NAMESPACE_BEGIN
 
 /* note: the interfaces here are just as an example, need to figure
-   out the right functions and parameters to use */
+ * out the right functions and parameters to use */
 
 /* ISOTROPIC VOLUME CLOSURE */
 
diff --git a/intern/cycles/render/attribute.cpp b/intern/cycles/render/attribute.cpp
index c1a089cc872..5c7966d6d96 100644
--- a/intern/cycles/render/attribute.cpp
+++ b/intern/cycles/render/attribute.cpp
@@ -74,10 +74,13 @@ bool Attribute::same_storage(TypeDesc a, TypeDesc b)
 	
 	if(a == TypeDesc::TypeColor || a == TypeDesc::TypePoint ||
 	   a == TypeDesc::TypeVector || a == TypeDesc::TypeNormal)
+	{
 		if(b == TypeDesc::TypeColor || b == TypeDesc::TypePoint ||
 		   b == TypeDesc::TypeVector || b == TypeDesc::TypeNormal)
+		{
 			return true;
-	
+		}
+	}
 	return false;
 }
 
@@ -286,10 +289,13 @@ bool AttributeRequestSet::modified(const AttributeRequestSet& other)
 		for(size_t j = 0; j < requests.size() && !found; j++)
 			if(requests[i].name == other.requests[j].name &&
 			   requests[i].std == other.requests[j].std)
+			{
 				found = true;
+			}
 
-		if(!found)
+		if(!found) {
 			return true;
+		}
 	}
 
 	return false;
diff --git a/intern/cycles/render/buffers.cpp b/intern/cycles/render/buffers.cpp
index a80851b945a..a79a3591e0f 100644
--- a/intern/cycles/render/buffers.cpp
+++ b/intern/cycles/render/buffers.cpp
@@ -117,8 +117,8 @@ void RenderBuffers::reset(Device *device, BufferParams& params_)
 	uint *init_state = rng_state.resize(params.width, params.height);
 	int x, y, width = params.width, height = params.height;
 	
-	for(x=0; x<width; x++)
-		for(y=0; y<height; y++)
+	for(x = 0; x < width; x++)
+		for(y = 0; y < height; y++)
 			init_state[x + y*width] = hash_int_2d(params.full_x+x, params.full_y+y);
 
 	device->mem_alloc(rng_state, MEM_READ_WRITE);
@@ -311,8 +311,14 @@ void DisplayBuffer::draw_set(int width, int height)
 
 void DisplayBuffer::draw(Device *device)
 {
-	if(draw_width != 0 && draw_height != 0)
+	if(draw_width != 0 && draw_height != 0) {
+		glPushMatrix();
+		glTranslatef(params.full_x, params.full_y, 0.0f);
+
 		device->draw_pixels(rgba, 0, draw_width, draw_height, 0, params.width, params.height, transparent);
+
+		glPopMatrix();
+	}
 }
 
 bool DisplayBuffer::draw_ready()
diff --git a/intern/cycles/render/buffers.h b/intern/cycles/render/buffers.h
index 77ad4a5a4b0..78712ed89ef 100644
--- a/intern/cycles/render/buffers.h
+++ b/intern/cycles/render/buffers.h
@@ -35,7 +35,7 @@ class Device;
 struct float4;
 
 /* Buffer Parameters
-   Size of render buffer and how it fits in the full image (border render). */
+ * Size of render buffer and how it fits in the full image (border render). */
 
 class BufferParams {
 public:
@@ -98,8 +98,8 @@ public:
 	/* buffer parameters */
 	BufferParams params;
 	/* dimensions for how much of the buffer is actually ready for display.
-	   with progressive render we can be using only a subset of the buffer.
-	   if these are zero, it means nothing can be drawn yet */
+	 * with progressive render we can be using only a subset of the buffer.
+	 * if these are zero, it means nothing can be drawn yet */
 	int draw_width, draw_height;
 	/* draw alpha channel? */
 	bool transparent;
diff --git a/intern/cycles/render/camera.cpp b/intern/cycles/render/camera.cpp
index 3ecffab7cbc..55a0f23f8d0 100644
--- a/intern/cycles/render/camera.cpp
+++ b/intern/cycles/render/camera.cpp
@@ -58,6 +58,11 @@ Camera::Camera()
 	bottom = -1.0f;
 	top = 1.0f;
 
+	border_left = 0.0f;
+	border_right = 1.0f;
+	border_bottom = 0.0f;
+	border_top = 1.0f;
+
 	screentoworld = transform_identity();
 	rastertoworld = transform_identity();
 	ndctoworld = transform_identity();
@@ -194,7 +199,7 @@ void Camera::device_update(Device *device, DeviceScene *dscene, Scene *scene)
 	kcam->bladesrotation = bladesrotation;
 
 	/* motion blur */
-	kcam->shuttertime= (need_motion == Scene::MOTION_BLUR)? shuttertime: 0.0f;
+	kcam->shuttertime = (need_motion == Scene::MOTION_BLUR) ? shuttertime: 0.0f;
 
 	/* type */
 	kcam->type = type;
@@ -248,6 +253,10 @@ bool Camera::modified(const Camera& cam)
 		(right == cam.right) &&
 		(bottom == cam.bottom) &&
 		(top == cam.top) &&
+		(border_left == cam.border_left) &&
+		(border_right == cam.border_right) &&
+		(border_bottom == cam.border_bottom) &&
+		(border_top == cam.border_top) &&
 		(matrix == cam.matrix) &&
 		(motion == cam.motion) &&
 		(use_motion == cam.use_motion) &&
diff --git a/intern/cycles/render/camera.h b/intern/cycles/render/camera.h
index 7a09b5981e4..d2a3cce1817 100644
--- a/intern/cycles/render/camera.h
+++ b/intern/cycles/render/camera.h
@@ -67,6 +67,9 @@ public:
 	int width, height;
 	float left, right, bottom, top;
 
+	/* border */
+	float border_left, border_right, border_bottom, border_top;
+
 	/* transformation */
 	Transform matrix;
 
@@ -75,7 +78,7 @@ public:
 	bool use_motion;
 
 	/* computed camera parameters */
-    Transform screentoworld;
+	Transform screentoworld;
 	Transform rastertoworld;
 	Transform ndctoworld;
 	Transform rastertocamera;
diff --git a/intern/cycles/render/film.cpp b/intern/cycles/render/film.cpp
index 878aa87510e..035821fadde 100644
--- a/intern/cycles/render/film.cpp
+++ b/intern/cycles/render/film.cpp
@@ -142,7 +142,7 @@ void Pass::add(PassType type, vector<Pass>& passes)
 	passes.push_back(pass);
 
 	/* order from by components, to ensure alignment so passes with size 4
-	   come first and then passes with size 1 */
+	 * come first and then passes with size 1 */
 	sort(passes.begin(), passes.end(), compare_pass_order);
 
 	if(pass.divide_type != PASS_NONE)
diff --git a/intern/cycles/render/filter.cpp b/intern/cycles/render/filter.cpp
index 9bcf57b5a27..0bd4fb4d579 100644
--- a/intern/cycles/render/filter.cpp
+++ b/intern/cycles/render/filter.cpp
@@ -73,17 +73,17 @@ static vector<float> filter_table(FilterType type, float width)
 	/* compute cumulative distribution function */
 	filter_table_cdf[0] = 0.0f;
 	
-	for(i=0; i<filter_table_size; i++) {
+	for(i = 0; i < filter_table_size; i++) {
 		float x = i*width*0.5f/(filter_table_size-1);
 		float y = filter_func(x, width);
 		filter_table_cdf[i+1] += filter_table_cdf[i] + fabsf(y);
 	}
 
-	for(i=0; i<=filter_table_size; i++)
+	for(i = 0; i <= filter_table_size; i++)
 		filter_table_cdf[i] /= filter_table_cdf[filter_table_size];
 	
 	/* create importance sampling table */
-	for(i=0; i<=half_size; i++) {
+	for(i = 0; i <= half_size; i++) {
 		float x = i/(float)half_size;
 		int index = upper_bound(filter_table_cdf.begin(), filter_table_cdf.end(), x) - filter_table_cdf.begin();
 		float t;
diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp
index 77bc9cf27ec..34c8879aa1f 100644
--- a/intern/cycles/render/graph.cpp
+++ b/intern/cycles/render/graph.cpp
@@ -340,7 +340,8 @@ void ShaderGraph::remove_proxy_nodes(vector<bool>& removed)
 
 				foreach(ShaderInput *input, inputs) {
 					disconnect(input);
-					connect(output, input);
+					if (output)
+						connect(output, input);
 				}
 			}
 		}
@@ -374,8 +375,8 @@ void ShaderGraph::break_cycles(ShaderNode *node, vector<bool>& visited, vector<b
 void ShaderGraph::clean()
 {
 	/* we do two things here: find cycles and break them, and remove unused
-	   nodes that don't feed into the output. how cycles are broken is
-	   undefined, they are invalid input, the important thing is to not crash */
+	 * nodes that don't feed into the output. how cycles are broken is
+	 * undefined, they are invalid input, the important thing is to not crash */
 
 	vector<bool> removed(nodes.size(), false);
 	vector<bool> visited(nodes.size(), false);
@@ -494,7 +495,7 @@ void ShaderGraph::bump_from_displacement()
 	copy_nodes(nodes_displace, nodes_dy);
 
 	/* mark nodes to indicate they are use for bump computation, so
-	   that any texture coordinates are shifted by dx/dy when sampling */
+	 * that any texture coordinates are shifted by dx/dy when sampling */
 	foreach(NodePair& pair, nodes_center)
 		pair.second->bump = SHADER_BUMP_CENTER;
 	foreach(NodePair& pair, nodes_dx)
@@ -515,15 +516,15 @@ void ShaderGraph::bump_from_displacement()
 	connect(out_dy, bump->input("SampleY"));
 
 	/* connect bump output to normal input nodes that aren't set yet. actually
-	   this will only set the normal input to the geometry node that we created
-	   and connected to all other normal inputs already. */
+	 * this will only set the normal input to the geometry node that we created
+	 * and connected to all other normal inputs already. */
 	foreach(ShaderNode *node, nodes)
 		foreach(ShaderInput *input, node->inputs)
 			if(!input->link && input->default_value == ShaderInput::NORMAL)
 				connect(bump->output("Normal"), input);
 	
 	/* finally, add the copied nodes to the graph. we can't do this earlier
-	   because we would create dependency cycles in the above loop */
+	 * because we would create dependency cycles in the above loop */
 	foreach(NodePair& pair, nodes_center)
 		add(pair.second);
 	foreach(NodePair& pair, nodes_dx)
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index 6417d0e2103..dc20dbdbea2 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -66,7 +66,7 @@ static bool is_float_image(const string& filename)
 
 		if(in->open(filename, spec)) {
 			/* check the main format, and channel formats;
-			   if any take up more than one byte, we'll need a float texture slot */
+			 * if any take up more than one byte, we'll need a float texture slot */
 			if(spec.format.basesize() > 1)
 				is_float = true;
 
@@ -171,8 +171,8 @@ void ImageManager::remove_image(const string& filename)
 			assert(images[slot]->users >= 0);
 
 			/* don't remove immediately, rather do it all together later on. one of
-			   the reasons for this is that on shader changes we add and remove nodes
-			   that use them, but we do not want to reload the image all the time. */
+			 * the reasons for this is that on shader changes we add and remove nodes
+			 * that use them, but we do not want to reload the image all the time. */
 			if(images[slot]->users == 0)
 				need_update = true;
 
@@ -189,8 +189,8 @@ void ImageManager::remove_image(const string& filename)
 				assert(float_images[slot]->users >= 0);
 
 				/* don't remove immediately, rather do it all together later on. one of
-				   the reasons for this is that on shader changes we add and remove nodes
-				   that use them, but we do not want to reload the image all the time. */
+				 * the reasons for this is that on shader changes we add and remove nodes
+				 * that use them, but we do not want to reload the image all the time. */
 				if(float_images[slot]->users == 0)
 					need_update = true;
 
@@ -483,7 +483,7 @@ void ImageManager::device_update(Device *device, DeviceScene *dscene, Progress&
 void ImageManager::device_pack_images(Device *device, DeviceScene *dscene, Progress& progess)
 {
 	/* for OpenCL, we pack all image textures inside a single big texture, and
-	   will do our own interpolation in the kernel */
+	 * will do our own interpolation in the kernel */
 	size_t size = 0;
 
 	for(size_t slot = 0; slot < images.size(); slot++) {
diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp
index b26ebfd91e1..da563c9c4ec 100644
--- a/intern/cycles/render/integrator.cpp
+++ b/intern/cycles/render/integrator.cpp
@@ -18,9 +18,11 @@
 
 #include "device.h"
 #include "integrator.h"
+#include "light.h"
 #include "scene.h"
 #include "sobol.h"
 
+#include "util_foreach.h"
 #include "util_hash.h"
 
 CCL_NAMESPACE_BEGIN
@@ -47,6 +49,13 @@ Integrator::Integrator()
 	sample_clamp = 0.0f;
 	motion_blur = false;
 
+	diffuse_samples = 1;
+	glossy_samples = 1;
+	transmission_samples = 1;
+	ao_samples = 1;
+	mesh_light_samples = 1;
+	progressive = true;
+
 	need_update = true;
 }
 
@@ -54,7 +63,7 @@ Integrator::~Integrator()
 {
 }
 
-void Integrator::device_update(Device *device, DeviceScene *dscene)
+void Integrator::device_update(Device *device, DeviceScene *dscene, Scene *scene)
 {
 	if(!need_update)
 		return;
@@ -93,8 +102,27 @@ void Integrator::device_update(Device *device, DeviceScene *dscene)
 	
 	kintegrator->sample_clamp = (sample_clamp == 0.0f)? FLT_MAX: sample_clamp*3.0f;
 
+	kintegrator->progressive = progressive;
+	kintegrator->diffuse_samples = diffuse_samples;
+	kintegrator->glossy_samples = glossy_samples;
+	kintegrator->transmission_samples = transmission_samples;
+	kintegrator->ao_samples = ao_samples;
+	kintegrator->mesh_light_samples = mesh_light_samples;
+
 	/* sobol directions table */
-	int dimensions = PRNG_BASE_NUM + (max_bounce + transparent_max_bounce + 2)*PRNG_BOUNCE_NUM;
+	int max_samples = 1;
+
+	if(!progressive) {
+		foreach(Light *light, scene->lights)
+			max_samples = max(max_samples, light->samples);
+
+		max_samples = max(max_samples, max(diffuse_samples, max(glossy_samples, transmission_samples)));
+		max_samples = max(max_samples, max(ao_samples, mesh_light_samples));
+	}
+
+	max_samples *= (max_bounce + transparent_max_bounce + 2);
+
+	int dimensions = PRNG_BASE_NUM + max_samples*PRNG_BOUNCE_NUM;
 	uint *directions = dscene->sobol_directions.resize(SOBOL_BITS*dimensions);
 
 	sobol_generate_direction_vectors((uint(*)[SOBOL_BITS])directions, dimensions);
@@ -127,6 +155,12 @@ bool Integrator::modified(const Integrator& integrator)
 		layer_flag == integrator.layer_flag &&
 		seed == integrator.seed &&
 		sample_clamp == integrator.sample_clamp &&
+		progressive == integrator.progressive &&
+		diffuse_samples == integrator.diffuse_samples &&
+		glossy_samples == integrator.glossy_samples &&
+		transmission_samples == integrator.transmission_samples &&
+		ao_samples == integrator.ao_samples &&
+		mesh_light_samples == integrator.mesh_light_samples &&
 		motion_blur == integrator.motion_blur);
 }
 
diff --git a/intern/cycles/render/integrator.h b/intern/cycles/render/integrator.h
index afda41a857d..8fb341182b7 100644
--- a/intern/cycles/render/integrator.h
+++ b/intern/cycles/render/integrator.h
@@ -49,12 +49,20 @@ public:
 	float sample_clamp;
 	bool motion_blur;
 
+	int diffuse_samples;
+	int glossy_samples;
+	int transmission_samples;
+	int ao_samples;
+	int mesh_light_samples;
+
+	bool progressive;
+
 	bool need_update;
 
 	Integrator();
 	~Integrator();
 
-	void device_update(Device *device, DeviceScene *dscene);
+	void device_update(Device *device, DeviceScene *dscene, Scene *scene);
 	void device_free(Device *device, DeviceScene *dscene);
 
 	bool modified(const Integrator& integrator);
diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp
index 267cb8e6d3a..6c03d0859a7 100644
--- a/intern/cycles/render/light.cpp
+++ b/intern/cycles/render/light.cpp
@@ -17,6 +17,7 @@
  */
 
 #include "device.h"
+#include "integrator.h"
 #include "light.h"
 #include "mesh.h"
 #include "object.h"
@@ -109,8 +110,12 @@ Light::Light()
 
 	map_resolution = 512;
 
+	spot_angle = M_PI_F/4.0f;
+	spot_smooth = 0.0f;
+
 	cast_shadow = true;
 	shader = 0;
+	samples = 1;
 }
 
 void Light::tag_update(Scene *scene)
@@ -133,9 +138,6 @@ void LightManager::device_update_distribution(Device *device, DeviceScene *dscen
 {
 	progress.set_status("Updating Lights", "Computing distribution");
 
-	/* option to always sample all point lights */
-	bool multi_light = false;
-
 	/* count */
 	size_t num_lights = scene->lights.size();
 	size_t num_triangles = 0;
@@ -166,9 +168,7 @@ void LightManager::device_update_distribution(Device *device, DeviceScene *dscen
 	}
 
 	size_t num_distribution = num_triangles;
-
-	if(!multi_light)
-		num_distribution += num_lights;
+	num_distribution += num_lights;
 
 	/* emission area */
 	float4 *distribution = dscene->light_distribution.resize(num_distribution + 1);
@@ -228,16 +228,14 @@ void LightManager::device_update_distribution(Device *device, DeviceScene *dscen
 	float trianglearea = totarea;
 
 	/* point lights */
-	if(!multi_light) {
-		float lightarea = (totarea > 0.0f)? totarea/scene->lights.size(): 1.0f;
-
-		for(int i = 0; i < scene->lights.size(); i++, offset++) {
-			distribution[offset].x = totarea;
-			distribution[offset].y = __int_as_float(~(int)i);
-			distribution[offset].z = 1.0f;
-			distribution[offset].w = scene->lights[i]->size;
-			totarea += lightarea;
-		}
+	float lightarea = (totarea > 0.0f)? totarea/scene->lights.size(): 1.0f;
+
+	for(int i = 0; i < scene->lights.size(); i++, offset++) {
+		distribution[offset].x = totarea;
+		distribution[offset].y = __int_as_float(~(int)i);
+		distribution[offset].z = 1.0f;
+		distribution[offset].w = scene->lights[i]->size;
+		totarea += lightarea;
 	}
 
 	/* normalize cumulative distribution functions */
@@ -256,7 +254,7 @@ void LightManager::device_update_distribution(Device *device, DeviceScene *dscen
 
 	/* update device */
 	KernelIntegrator *kintegrator = &dscene->data.integrator;
-	kintegrator->use_direct_light = (totarea > 0.0f) || (multi_light && num_lights);
+	kintegrator->use_direct_light = (totarea > 0.0f);
 
 	if(kintegrator->use_direct_light) {
 		/* number of emissives */
@@ -266,30 +264,19 @@ void LightManager::device_update_distribution(Device *device, DeviceScene *dscen
 		kintegrator->pdf_triangles = 0.0f;
 		kintegrator->pdf_lights = 0.0f;
 
-		if(multi_light) {
-			/* sample one of all triangles and all lights */
-			kintegrator->num_all_lights = num_lights;
+		/* sample one, with 0.5 probability of light or triangle */
+		kintegrator->num_all_lights = num_lights;
 
-			if(trianglearea > 0.0f)
-				kintegrator->pdf_triangles = 1.0f/trianglearea;
+		if(trianglearea > 0.0f) {
+			kintegrator->pdf_triangles = 1.0f/trianglearea;
 			if(num_lights)
-				kintegrator->pdf_lights = 1.0f;
+				kintegrator->pdf_triangles *= 0.5f;
 		}
-		else {
-			/* sample one, with 0.5 probability of light or triangle */
-			kintegrator->num_all_lights = 0;
-
-			if(trianglearea > 0.0f) {
-				kintegrator->pdf_triangles = 1.0f/trianglearea;
-				if(num_lights)
-					kintegrator->pdf_triangles *= 0.5f;
-			}
 
-			if(num_lights) {
-				kintegrator->pdf_lights = 1.0f/num_lights;
-				if(trianglearea > 0.0f)
-					kintegrator->pdf_lights *= 0.5f;
-			}
+		if(num_lights) {
+			kintegrator->pdf_lights = 1.0f/num_lights;
+			if(trianglearea > 0.0f)
+				kintegrator->pdf_lights *= 0.5f;
 		}
 
 		/* CDF */
@@ -359,7 +346,7 @@ void LightManager::device_update_background(Device *device, DeviceScene *dscene,
 		float cdf_total = cond_cdf[i * cdf_count + res - 1].y + cond_cdf[i * cdf_count + res - 1].x / res;
 
 		/* stuff the total into the brightness value for the last entry, because
-		   we are going to normalize the CDFs to 0.0 to 1.0 afterwards */
+		 * we are going to normalize the CDFs to 0.0 to 1.0 afterwards */
 		cond_cdf[i * cdf_count + res].x = cdf_total;
 
 		if(cdf_total > 0.0f)
@@ -414,6 +401,7 @@ void LightManager::device_update_points(Device *device, DeviceScene *dscene, Sce
 		float3 co = light->co;
 		float3 dir = normalize(light->dir);
 		int shader_id = scene->shader_manager->get_shader_id(scene->lights[i]->shader);
+		float samples = __int_as_float(light->samples);
 
 		if(!light->cast_shadow)
 			shader_id &= ~SHADER_CAST_SHADOW;
@@ -424,7 +412,7 @@ void LightManager::device_update_points(Device *device, DeviceScene *dscene, Sce
 			light_data[i*LIGHT_SIZE + 0] = make_float4(__int_as_float(light->type), co.x, co.y, co.z);
 			light_data[i*LIGHT_SIZE + 1] = make_float4(__int_as_float(shader_id), light->size, 0.0f, 0.0f);
 			light_data[i*LIGHT_SIZE + 2] = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
-			light_data[i*LIGHT_SIZE + 3] = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
+			light_data[i*LIGHT_SIZE + 3] = make_float4(samples, 0.0f, 0.0f, 0.0f);
 		}
 		else if(light->type == LIGHT_DISTANT) {
 			shader_id &= ~SHADER_AREA_LIGHT;
@@ -432,7 +420,7 @@ void LightManager::device_update_points(Device *device, DeviceScene *dscene, Sce
 			light_data[i*LIGHT_SIZE + 0] = make_float4(__int_as_float(light->type), dir.x, dir.y, dir.z);
 			light_data[i*LIGHT_SIZE + 1] = make_float4(__int_as_float(shader_id), light->size, 0.0f, 0.0f);
 			light_data[i*LIGHT_SIZE + 2] = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
-			light_data[i*LIGHT_SIZE + 3] = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
+			light_data[i*LIGHT_SIZE + 3] = make_float4(samples, 0.0f, 0.0f, 0.0f);
 		}
 		else if(light->type == LIGHT_BACKGROUND) {
 			shader_id &= ~SHADER_AREA_LIGHT;
@@ -440,7 +428,7 @@ void LightManager::device_update_points(Device *device, DeviceScene *dscene, Sce
 			light_data[i*LIGHT_SIZE + 0] = make_float4(__int_as_float(light->type), 0.0f, 0.0f, 0.0f);
 			light_data[i*LIGHT_SIZE + 1] = make_float4(__int_as_float(shader_id), 0.0f, 0.0f, 0.0f);
 			light_data[i*LIGHT_SIZE + 2] = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
-			light_data[i*LIGHT_SIZE + 3] = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
+			light_data[i*LIGHT_SIZE + 3] = make_float4(samples, 0.0f, 0.0f, 0.0f);
 		}
 		else if(light->type == LIGHT_AREA) {
 			float3 axisu = light->axisu*(light->sizeu*light->size);
@@ -449,7 +437,18 @@ void LightManager::device_update_points(Device *device, DeviceScene *dscene, Sce
 			light_data[i*LIGHT_SIZE + 0] = make_float4(__int_as_float(light->type), co.x, co.y, co.z);
 			light_data[i*LIGHT_SIZE + 1] = make_float4(__int_as_float(shader_id), axisu.x, axisu.y, axisu.z);
 			light_data[i*LIGHT_SIZE + 2] = make_float4(0.0f, axisv.x, axisv.y, axisv.z);
-			light_data[i*LIGHT_SIZE + 3] = make_float4(0.0f, dir.x, dir.y, dir.z);
+			light_data[i*LIGHT_SIZE + 3] = make_float4(samples, dir.x, dir.y, dir.z);
+		}
+		else if(light->type == LIGHT_SPOT) {
+			shader_id &= ~SHADER_AREA_LIGHT;
+
+			float spot_angle = cosf(light->spot_angle*0.5f);
+			float spot_smooth = (1.0f - spot_angle)*light->spot_smooth;
+
+			light_data[i*LIGHT_SIZE + 0] = make_float4(__int_as_float(light->type), co.x, co.y, co.z);
+			light_data[i*LIGHT_SIZE + 1] = make_float4(__int_as_float(shader_id), light->size, dir.x, dir.y);
+			light_data[i*LIGHT_SIZE + 2] = make_float4(dir.z, spot_angle, spot_smooth, 0.0f);
+			light_data[i*LIGHT_SIZE + 3] = make_float4(samples, 0.0f, 0.0f, 0.0f);
 		}
 	}
 	
diff --git a/intern/cycles/render/light.h b/intern/cycles/render/light.h
index 0ed143f5ad1..3cedde2596e 100644
--- a/intern/cycles/render/light.h
+++ b/intern/cycles/render/light.h
@@ -48,9 +48,13 @@ public:
 
 	int map_resolution;
 
+	float spot_angle;
+	float spot_smooth;
+
 	bool cast_shadow;
 
 	int shader;
+	int samples;
 
 	void tag_update(Scene *scene);
 };
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp
index cabbd5760c2..8f5f2647ebf 100644
--- a/intern/cycles/render/mesh.cpp
+++ b/intern/cycles/render/mesh.cpp
@@ -474,7 +474,7 @@ void MeshManager::device_update_attributes(Device *device, DeviceScene *dscene,
 		AttributeRequestSet& attributes = mesh_attributes[i];
 
 		/* todo: we now store std and name attributes from requests even if
-		   they actually refer to the same mesh attributes, optimize */
+		 * they actually refer to the same mesh attributes, optimize */
 		foreach(AttributeRequest& req, attributes.requests) {
 			Attribute *mattr = mesh->attributes.find(req);
 
@@ -493,7 +493,7 @@ void MeshManager::device_update_attributes(Device *device, DeviceScene *dscene,
 			}
 
 			/* we abuse AttributeRequest to pass on info like element and
-			   offset, it doesn't really make sense but is convenient */
+			 * offset, it doesn't really make sense but is convenient */
 
 			/* store element and type */
 			if(mattr->element == Attribute::VERTEX)
@@ -528,7 +528,7 @@ void MeshManager::device_update_attributes(Device *device, DeviceScene *dscene,
 			}
 
 			/* mesh vertex/triangle index is global, not per object, so we sneak
-			   a correction for that in here */
+			 * a correction for that in here */
 			if(req.element == ATTR_ELEMENT_VERTEX)
 				req.offset -= mesh->vert_offset;
 			else if(mattr->element == Attribute::FACE)
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 506458d82e1..0f64d858de0 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -332,7 +332,7 @@ static void sky_texture_precompute(KernelSunSky *ksunsky, float3 dir, float turb
 	float T2 = T * T;
 
 	float chi = (4.0f / 9.0f - T / 120.0f) * (M_PI_F - 2.0f * theta);
-	ksunsky->zenith_Y = (4.0453f * T - 4.9710f) * tan(chi) - 0.2155f * T + 2.4192f;
+	ksunsky->zenith_Y = (4.0453f * T - 4.9710f) * tanf(chi) - 0.2155f * T + 2.4192f;
 	ksunsky->zenith_Y *= 0.06f;
 
 	ksunsky->zenith_x =
@@ -695,7 +695,7 @@ static ShaderEnum wave_type_init()
 ShaderEnum WaveTextureNode::type_enum = wave_type_init();
 
 WaveTextureNode::WaveTextureNode()
-: TextureNode("marble_texture")
+: TextureNode("wave_texture")
 {
 	type = ustring("Bands");
 
@@ -755,7 +755,7 @@ void WaveTextureNode::compile(OSLCompiler& compiler)
 {
 	compiler.parameter("Type", type);
 
-	compiler.add(this, "node_marble_texture");
+	compiler.add(this, "node_wave_texture");
 }
 
 /* Magic Texture */
@@ -1789,6 +1789,47 @@ void ObjectInfoNode::compile(OSLCompiler& compiler)
 	compiler.add(this, "node_object_info");
 }
 
+/* Particle Info */
+
+ParticleInfoNode::ParticleInfoNode()
+: ShaderNode("particle_info")
+{
+	add_output("Age", SHADER_SOCKET_FLOAT);
+	add_output("Lifetime", SHADER_SOCKET_FLOAT);
+}
+
+void ParticleInfoNode::attributes(AttributeRequestSet *attributes)
+{
+	if(!output("Age")->links.empty())
+		attributes->add(ATTR_STD_PARTICLE);
+	if(!output("Lifetime")->links.empty())
+		attributes->add(ATTR_STD_PARTICLE);
+
+	ShaderNode::attributes(attributes);
+}
+
+void ParticleInfoNode::compile(SVMCompiler& compiler)
+{
+	ShaderOutput *out;
+	
+	out = output("Age");
+	if(!out->links.empty()) {
+		compiler.stack_assign(out);
+		compiler.add_node(NODE_PARTICLE_INFO, NODE_INFO_PAR_AGE, out->stack_offset);
+	}
+	
+	out = output("Lifetime");
+	if(!out->links.empty()) {
+		compiler.stack_assign(out);
+		compiler.add_node(NODE_PARTICLE_INFO, NODE_INFO_PAR_LIFETIME, out->stack_offset);
+	}
+}
+
+void ParticleInfoNode::compile(OSLCompiler& compiler)
+{
+	compiler.add(this, "node_particle_info");
+}
+
 /* Value */
 
 ValueNode::ValueNode()
diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h
index 2d0d58d1e94..efd814e4ae6 100644
--- a/intern/cycles/render/nodes.h
+++ b/intern/cycles/render/nodes.h
@@ -44,7 +44,7 @@ public:
 	float3 min, max;
 	bool use_minmax;
 
-	enum Mapping { NONE=0, X=1, Y=2, Z=3 };
+	enum Mapping { NONE = 0, X = 1, Y = 2, Z = 3 };
 	Mapping x_mapping, y_mapping, z_mapping;
 
 	enum Projection { FLAT, CUBE, TUBE, SPHERE };
@@ -55,7 +55,7 @@ public:
 
 class TextureNode : public ShaderNode {
 public:
-	TextureNode(const char *name) : ShaderNode(name) {}
+	TextureNode(const char *name_) : ShaderNode(name_) {}
 	TextureMapping tex_mapping;
 };
 
@@ -290,6 +290,12 @@ public:
 	SHADER_NODE_CLASS(ObjectInfoNode)
 };
 
+class ParticleInfoNode : public ShaderNode {
+public:
+	SHADER_NODE_CLASS(ParticleInfoNode)
+	void attributes(AttributeRequestSet *attributes);
+};
+
 class ValueNode : public ShaderNode {
 public:
 	SHADER_NODE_CLASS(ValueNode)
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index e38b2635f90..6de7eaea343 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -23,9 +23,9 @@
 #include "scene.h"
 
 #include "util_foreach.h"
-#include "util_hash.h"
 #include "util_map.h"
 #include "util_progress.h"
+#include "util_vector.h"
 
 CCL_NAMESPACE_BEGIN
 
@@ -37,8 +37,9 @@ Object::Object()
 	mesh = NULL;
 	tfm = transform_identity();
 	visibility = ~0;
-	instance_id = 0;
+	random_id = 0;
 	pass_id = 0;
+	particle_id = 0;
 	bounds = BoundBox::empty;
 	motion.pre = transform_identity();
 	motion.post = transform_identity();
@@ -88,7 +89,7 @@ void Object::apply_transform()
 	Transform ntfm = transform_transpose(transform_inverse(tfm));
 
 	/* we keep normals pointing in same direction on negative scale, notify
-	   mesh about this in it (re)calculates normals */
+	 * mesh about this in it (re)calculates normals */
 	if(transform_negative_scale(tfm))
 		mesh->transform_negative_scaled = true;
 
@@ -146,7 +147,7 @@ ObjectManager::~ObjectManager()
 void ObjectManager::device_update_transforms(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress)
 {
 	float4 *objects = dscene->objects.resize(OBJECT_SIZE*scene->objects.size());
-	uint *object_flag = dscene->object_flag.resize(OBJECT_SIZE*scene->objects.size());
+	uint *object_flag = dscene->object_flag.resize(scene->objects.size());
 	int i = 0;
 	map<Mesh*, float> surface_area_map;
 	Scene::MotionType need_motion = scene->need_motion();
@@ -160,14 +161,12 @@ void ObjectManager::device_update_transforms(Device *device, DeviceScene *dscene
 		Transform itfm = transform_inverse(tfm);
 
 		/* compute surface area. for uniform scale we can do avoid the many
-		   transform calls and share computation for instances */
+		 * transform calls and share computation for instances */
 		/* todo: correct for displacement, and move to a better place */
 		float uniform_scale;
 		float surface_area = 0.0f;
 		float pass_id = ob->pass_id;
-		
-		uint ob_hash = hash_int_2d(hash_string(ob->name.c_str()), ob->instance_id);
-		float random_number = (float)ob_hash * (1.0f/(float)0xFFFFFFFF);
+		float random_number = (float)ob->random_id * (1.0f/(float)0xFFFFFFFF);
 		
 		if(transform_uniform_scale(tfm, uniform_scale)) {
 			map<Mesh*, float>::iterator it = surface_area_map.find(mesh);
@@ -203,12 +202,12 @@ void ObjectManager::device_update_transforms(Device *device, DeviceScene *dscene
 
 		memcpy(&objects[offset], &tfm, sizeof(float4)*3);
 		memcpy(&objects[offset+3], &itfm, sizeof(float4)*3);
-		objects[offset+6] = make_float4(surface_area, pass_id, random_number, 0.0f);
+		objects[offset+6] = make_float4(surface_area, pass_id, random_number, __int_as_float(ob->particle_id));
 
 		if(need_motion == Scene::MOTION_PASS) {
 			/* motion transformations, is world/object space depending if mesh
-			   comes with deformed position in object space, or if we transform
-			   the shading point in world space */
+			 * comes with deformed position in object space, or if we transform
+			 * the shading point in world space */
 			Transform mtfm_pre = ob->motion.pre;
 			Transform mtfm_post = ob->motion.post;
 
@@ -249,6 +248,38 @@ void ObjectManager::device_update_transforms(Device *device, DeviceScene *dscene
 	device->tex_alloc("__object_flag", dscene->object_flag);
 }
 
+void ObjectManager::device_update_particles(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress)
+{
+	/* count particles.
+	 * adds one dummy particle at the beginning to avoid invalid lookups,
+	 * in case a shader uses particle info without actual particle data.
+	 */
+	int num_particles = 1;
+	foreach(Object *ob, scene->objects)
+		num_particles += ob->particles.size();
+	
+	float4 *particles = dscene->particles.resize(PARTICLE_SIZE*num_particles);
+	
+	/* dummy particle */
+	particles[0] = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
+	
+	int i = 1;
+	foreach(Object *ob, scene->objects) {
+		foreach(Particle &pa, ob->particles) {
+			/* pack in texture */
+			int offset = i*PARTICLE_SIZE;
+			
+			particles[offset] = make_float4(pa.age, pa.lifetime, 0.0f, 0.0f);
+			
+			i++;
+			
+			if(progress.get_cancel()) return;
+		}
+	}
+	
+	device->tex_alloc("__particles", dscene->particles);
+}
+
 void ObjectManager::device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress)
 {
 	if(!need_update)
@@ -274,6 +305,11 @@ void ObjectManager::device_update(Device *device, DeviceScene *dscene, Scene *sc
 
 	if(progress.get_cancel()) return;
 
+	progress.set_status("Updating Objects", "Copying Particles to device");
+	device_update_particles(device, dscene, scene, progress);
+	
+	if(progress.get_cancel()) return;
+	
 	need_update = false;
 }
 
@@ -284,6 +320,9 @@ void ObjectManager::device_free(Device *device, DeviceScene *dscene)
 
 	device->tex_free(dscene->object_flag);
 	dscene->object_flag.clear();
+	
+	device->tex_free(dscene->particles);
+	dscene->particles.clear();
 }
 
 void ObjectManager::apply_static_transforms(Scene *scene, Progress& progress)
diff --git a/intern/cycles/render/object.h b/intern/cycles/render/object.h
index b8169e3758e..6d674731b07 100644
--- a/intern/cycles/render/object.h
+++ b/intern/cycles/render/object.h
@@ -35,13 +35,18 @@ struct Transform;
 
 /* Object */
 
+struct Particle {
+	float age;
+	float lifetime;
+};
+
 class Object {
 public:
 	Mesh *mesh;
 	Transform tfm;
 	BoundBox bounds;
 	ustring name;
-	int instance_id;
+	uint random_id;
 	int pass_id;
 	vector<ParamValue> attributes;
 	uint visibility;
@@ -49,6 +54,9 @@ public:
 	bool use_motion;
 	bool use_holdout;
 
+	int particle_id;
+	vector<Particle> particles;
+
 	Object();
 	~Object();
 
@@ -69,6 +77,7 @@ public:
 
 	void device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress);
 	void device_update_transforms(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress);
+	void device_update_particles(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress);
 	void device_free(Device *device, DeviceScene *dscene);
 
 	void tag_update(Scene *scene);
diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp
index b0173334c76..04af9b48280 100644
--- a/intern/cycles/render/osl.cpp
+++ b/intern/cycles/render/osl.cpp
@@ -167,7 +167,7 @@ string OSLCompiler::compatible_name(const char *name)
 bool OSLCompiler::node_skip_input(ShaderNode *node, ShaderInput *input)
 {
 	/* exception for output node, only one input is actually used
-	   depending on the current shader type */
+	 * depending on the current shader type */
 
 	if(node->name == ustring("output")) {
 		if(strcmp(input->name, "Surface") == 0 && current_type != SHADER_TYPE_SURFACE)
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp
index a5f90bfe34b..45c8a05c27d 100644
--- a/intern/cycles/render/scene.cpp
+++ b/intern/cycles/render/scene.cpp
@@ -160,7 +160,7 @@ void Scene::device_update(Device *device_, Progress& progress)
 	if(progress.get_cancel()) return;
 
 	progress.set_status("Updating Integrator");
-	integrator->device_update(device, &dscene);
+	integrator->device_update(device, &dscene, this);
 
 	if(progress.get_cancel()) return;
 
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h
index 90bc47d5c8e..8b9944cb76e 100644
--- a/intern/cycles/render/scene.h
+++ b/intern/cycles/render/scene.h
@@ -82,6 +82,9 @@ public:
 	device_vector<float2> light_background_marginal_cdf;
 	device_vector<float2> light_background_conditional_cdf;
 
+	/* particles */
+	device_vector<float4> particles;
+
 	/* shaders */
 	device_vector<uint4> svm_nodes;
 	device_vector<uint> shader_flag;
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 34a0c0ff877..a9f7e5beb56 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -27,6 +27,7 @@
 
 #include "util_foreach.h"
 #include "util_function.h"
+#include "util_opengl.h"
 #include "util_task.h"
 #include "util_time.h"
 
@@ -115,8 +116,8 @@ bool Session::ready_to_reset()
 void Session::reset_gpu(BufferParams& buffer_params, int samples)
 {
 	/* block for buffer acces and reset immediately. we can't do this
-	   in the thread, because we need to allocate an OpenGL buffer, and
-	   that only works in the main thread */
+	 * in the thread, because we need to allocate an OpenGL buffer, and
+	 * that only works in the main thread */
 	thread_scoped_lock display_lock(display->mutex);
 	thread_scoped_lock buffers_lock(buffers->mutex);
 
@@ -139,10 +140,10 @@ bool Session::draw_gpu(BufferParams& buffer_params)
 	/* first check we already rendered something */
 	if(gpu_draw_ready) {
 		/* then verify the buffers have the expected size, so we don't
-		   draw previous results in a resized window */
+		 * draw previous results in a resized window */
 		if(!buffer_params.modified(display->params)) {
 			/* for CUDA we need to do tonemapping still, since we can
-			   only access GL buffers from the main thread */
+			 * only access GL buffers from the main thread */
 			if(gpu_need_tonemap) {
 				thread_scoped_lock buffers_lock(buffers->mutex);
 				tonemap();
@@ -184,7 +185,7 @@ void Session::run_gpu()
 		}
 		else {
 			/* if in interactive mode, and we are either paused or done for now,
-			   wait for pause condition notify to wake up again */
+			 * wait for pause condition notify to wake up again */
 			thread_scoped_lock pause_lock(pause_mutex);
 
 			if(pause || no_tiles) {
@@ -223,8 +224,8 @@ void Session::run_gpu()
 
 		if(!no_tiles) {
 			/* buffers mutex is locked entirely while rendering each
-			   sample, and released/reacquired on each iteration to allow
-			   reset and draw in between */
+			 * sample, and released/reacquired on each iteration to allow
+			 * reset and draw in between */
 			thread_scoped_lock buffers_lock(buffers->mutex);
 
 			/* update status and timing */
@@ -293,7 +294,7 @@ bool Session::draw_cpu(BufferParams& buffer_params)
 	/* first check we already rendered something */
 	if(display->draw_ready()) {
 		/* then verify the buffers have the expected size, so we don't
-		   draw previous results in a resized window */
+		 * draw previous results in a resized window */
 		if(!buffer_params.modified(display->params)) {
 			display->draw(device);
 
@@ -333,7 +334,7 @@ void Session::run_cpu()
 		}
 		else {
 			/* if in interactive mode, and we are either paused or done for now,
-			   wait for pause condition notify to wake up again */
+			 * wait for pause condition notify to wake up again */
 			thread_scoped_lock pause_lock(pause_mutex);
 
 			if(pause || no_tiles) {
@@ -361,8 +362,8 @@ void Session::run_cpu()
 
 		if(!no_tiles) {
 			/* buffers mutex is locked entirely while rendering each
-			   sample, and released/reacquired on each iteration to allow
-			   reset and draw in between */
+			 * sample, and released/reacquired on each iteration to allow
+			 * reset and draw in between */
 			thread_scoped_lock buffers_lock(buffers->mutex);
 
 			/* update scene */
@@ -405,7 +406,7 @@ void Session::run_cpu()
 			}
 			else if(need_tonemap) {
 				/* tonemap only if we do not reset, we don't we don't
-				   want to show the result of an incomplete sample*/
+				 * wan't to show the result of an incomplete sample*/
 				tonemap();
 			}
 
@@ -534,8 +535,8 @@ void Session::update_scene()
 	progress.set_status("Updating Scene");
 
 	/* update camera if dimensions changed for progressive render. the camera
-	   knows nothing about progressive or cropped rendering, it just gets the
-	   image dimensions passed in */
+	 * knows nothing about progressive or cropped rendering, it just gets the
+	 * image dimensions passed in */
 	Camera *cam = scene->camera;
 	int width = tile_manager.state.buffer.full_width;
 	int height = tile_manager.state.buffer.full_height;
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index f50709146ef..fae1d6bd81c 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -81,9 +81,9 @@ void Shader::tag_update(Scene *scene)
 		scene->light_manager->need_update = true;
 
 	/* get requested attributes. this could be optimized by pruning unused
-	   nodes here already, but that's the job of the shader manager currently,
-	   and may not be so great for interactive rendering where you temporarily
-	   disconnect a node */
+	 * nodes here already, but that's the job of the shader manager currently,
+	 * and may not be so great for interactive rendering where you temporarily
+	 * disconnect a node */
 	AttributeRequestSet prev_attributes = attributes;
 
 	attributes.clear();
@@ -91,7 +91,7 @@ void Shader::tag_update(Scene *scene)
 		node->attributes(&attributes);
 	
 	/* compare if the attributes changed, mesh manager will check
-	   need_update_attributes, update the relevant meshes and clear it. */
+	 * need_update_attributes, update the relevant meshes and clear it. */
 	if(attributes.modified(prev_attributes)) {
 		need_update_attributes = true;
 		scene->mesh_manager->need_update = true;
diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h
index 48d517ce21a..02788008060 100644
--- a/intern/cycles/render/shader.h
+++ b/intern/cycles/render/shader.h
@@ -53,8 +53,8 @@ public:
 	ShaderGraph *graph;
 
 	/* shader graph with auto bump mapping included, we compile two shaders,
-	   with and without bump,  because the displacement method is a mesh
-	   level setting, so we need to handle both */
+	 * with and without bump,  because the displacement method is a mesh
+	 * level setting, so we need to handle both */
 	ShaderGraph *graph_bump;
 
 	/* sampling */
@@ -109,7 +109,7 @@ public:
 	int get_shader_id(uint shader, Mesh *mesh = NULL, bool smooth = false);
 
 	/* add default shaders to scene, to use as default for things that don't
-	   have any shader assigned explicitly */
+	 * have any shader assigned explicitly */
 	static void add_default(Scene *scene);
 
 protected:
diff --git a/intern/cycles/render/svm.cpp b/intern/cycles/render/svm.cpp
index 1ff3ac20d50..844ce01569f 100644
--- a/intern/cycles/render/svm.cpp
+++ b/intern/cycles/render/svm.cpp
@@ -251,11 +251,11 @@ void SVMCompiler::stack_link(ShaderInput *input, ShaderOutput *output)
 void SVMCompiler::stack_clear_users(ShaderNode *node, set<ShaderNode*>& done)
 {
 	/* optimization we should add:
-	   find and lower user counts for outputs for which all inputs are done.
-	   this is done before the node is compiled, under the assumption that the
-	   node will first load all inputs from the stack and then writes its
-	   outputs. this used to work, but was disabled because it gave trouble
-	   with inputs getting stack positions assigned */
+	 * find and lower user counts for outputs for which all inputs are done.
+	 * this is done before the node is compiled, under the assumption that the
+	 * node will first load all inputs from the stack and then writes its
+	 * outputs. this used to work, but was disabled because it gave trouble
+	 * with inputs getting stack positions assigned */
 
 	foreach(ShaderInput *input, node->inputs) {
 		ShaderOutput *output = input->link;
@@ -418,8 +418,8 @@ void SVMCompiler::generate_closure(ShaderNode *node, set<ShaderNode*>& done)
 			add_node(NODE_ADD_CLOSURE, 0, 0, 0);
 
 		/* generate code for closure 1
-		   note we backup all compiler state and restore it afterwards, so one
-		   closure choice doesn't influence the other*/
+		 * note we backup all compiler state and restore it afterwards, so one
+		 * closure choice doesn't influence the other*/
 		if(cl1in->link) {
 			StackBackup backup;
 			stack_backup(backup, done);
@@ -448,7 +448,7 @@ void SVMCompiler::generate_closure(ShaderNode *node, set<ShaderNode*>& done)
 			add_node(NODE_END, 0, 0, 0);
 
 		/* set jump for mix node, -1 because offset is already
-		   incremented when this jump is added to it */
+		 * incremented when this jump is added to it */
 		svm_nodes[mix_offset].z = cl2_offset - mix_offset - 1;
 
 		done.insert(node);
@@ -482,9 +482,9 @@ void SVMCompiler::generate_closure(ShaderNode *node, set<ShaderNode*>& done)
 void SVMCompiler::generate_multi_closure(ShaderNode *node, set<ShaderNode*>& done, uint in_offset)
 {
 	/* todo: the weaks point here is that unlike the single closure sampling 
-	   we will evaluate all nodes even if they are used as input for closures
-	   that are unused. it's not clear what would be the best way to skip such
-	   nodes at runtime, especially if they are tangled up  */
+	 * we will evaluate all nodes even if they are used as input for closures
+	 * that are unused. it's not clear what would be the best way to skip such
+	 * nodes at runtime, especially if they are tangled up  */
 
 	if(node->name == ustring("mix_closure") || node->name == ustring("add_closure")) {
 		ShaderInput *fin = node->input("Fac");
@@ -597,10 +597,10 @@ void SVMCompiler::compile_type(Shader *shader, ShaderGraph *graph, ShaderType ty
 	memset(&active_stack, 0, sizeof(active_stack));
 	svm_nodes.clear();
 
-	foreach(ShaderNode *node, graph->nodes) {
-		foreach(ShaderInput *input, node->inputs)
+	foreach(ShaderNode *node_iter, graph->nodes) {
+		foreach(ShaderInput *input, node_iter->inputs)
 			input->stack_offset = SVM_STACK_INVALID;
-		foreach(ShaderOutput *output, node->outputs)
+		foreach(ShaderOutput *output, node_iter->outputs)
 			output->stack_offset = SVM_STACK_INVALID;
 	}
 
diff --git a/intern/cycles/subd/subd_build.cpp b/intern/cycles/subd/subd_build.cpp
index 640c30eba9d..c8181838ec3 100644
--- a/intern/cycles/subd/subd_build.cpp
+++ b/intern/cycles/subd/subd_build.cpp
@@ -82,7 +82,7 @@ static float pseudoValence(SubdVert *vert)
 
 	if(vert->is_boundary()) {
 		/* we treat boundary verts as being half a closed mesh. corners are
-		   special case. n = 4 for corners and n = 2*(n-1) for boundaries. */
+		 * special case. n = 4 for corners and n = 2*(n-1) for boundaries. */
 		if(valence == 2) return 4;
 		return (valence - 1)*2;
 	}
@@ -314,7 +314,7 @@ void SubdAccBuilder::computeEdgeStencil(SubdFaceRing *ring, GregoryAccStencil *s
 			stencil->get(eid1) = stencil->get(cid);
 			stencil->get(eid2) = stencil->get(cid);
 
-			int j = 0;
+			j = 0;
 			for(SubdVert::EdgeIterator eit(vert->edges()); !eit.isDone(); eit.advance(), j++) {
 				SubdEdge *edge = eit.current();
 				assert(vert->co == edge->from()->co);
@@ -402,8 +402,8 @@ void SubdAccBuilder::computeInteriorStencil(SubdFaceRing *ring, GregoryAccStenci
 			int idx2 = interior2Indices[primitiveOffset+v];
 
 			int i = 0;
-			for(SubdFace::EdgeIterator it(face->edges(edge)); !it.isDone(); it.advance(), i++) {
-				SubdVert *vert = it.current()->from();
+			for(SubdFace::EdgeIterator it_sub(face->edges(edge)); !it_sub.isDone(); it_sub.advance(), i++) {
+				SubdVert *vert = it_sub.current()->from();
 				stencil->get(idx1, vert) += weights1[i];
 				stencil->get(idx2, vert) += weights2[i];
 			}
@@ -481,10 +481,11 @@ void SubdAccBuilder::computeInteriorStencil(SubdFaceRing *ring, GregoryAccStenci
 			}
 
 			/* this change makes the triangle boundaries smoother, but distorts the quads next to them */
-			/*if(ring->is_triangle() || SubdFaceRing::is_triangle(edge->pair->face))
-			{
+#if 0
+			if(ring->is_triangle() || SubdFaceRing::is_triangle(edge->pair->face)) {
 				y *= 4.0f / 3.0f;
-			}*/
+			}
+#endif
 
 			stencil->get(interior1Indices[primitiveOffset+v]) = stencil->get(edge1Indices[primitiveOffset+v]);
 			stencil->get(interior1Indices[primitiveOffset+v]) += x;
@@ -539,8 +540,10 @@ void SubdAccBuilder::computeInteriorStencil(SubdFaceRing *ring, GregoryAccStenci
 			}
 
 			/* this change makes the triangle boundaries smoother, but distorts the quads next to them. */
-			/*if(ring->is_triangle() || SubdFaceRing::is_triangle(edge->pair->face))
-				y *= 4.0f / 3.0f;*/
+#if 0
+			if(ring->is_triangle() || SubdFaceRing::is_triangle(edge->pair->face))
+				y *= 4.0f / 3.0f;
+#endif
 
 			stencil->get(interior2Indices[primitiveOffset+v]) = stencil->get(edge2Indices[primitiveOffset+v]);
 			stencil->get(interior2Indices[primitiveOffset+v]) += x;
diff --git a/intern/cycles/subd/subd_dice.cpp b/intern/cycles/subd/subd_dice.cpp
index 6e24bb410b5..6920df9954c 100644
--- a/intern/cycles/subd/subd_dice.cpp
+++ b/intern/cycles/subd/subd_dice.cpp
@@ -81,9 +81,9 @@ void EdgeDice::stitch_triangles(vector<int>& outer, vector<int>& inner)
 		return; // XXX avoid crashes for Mu or Mv == 1, missing polygons
 
 	/* stitch together two arrays of verts with triangles. at each step,
-	   we compare using the next verts on both sides, to find the split
-	   direction with the smallest diagonal, and use that in order to keep
-	   the triangle shape reasonable. */
+	 * we compare using the next verts on both sides, to find the split
+	 * direction with the smallest diagonal, and use that in order to keep
+	 * the triangle shape reasonable. */
 	for(size_t i = 0, j = 0; i+1 < inner.size() || j+1 < outer.size();) {
 		int v0, v1, v2;
 
@@ -354,8 +354,8 @@ void TriangleDice::add_grid(SubPatch& sub, EdgeFactors& ef, int M)
 	// XXX normals are flipped, why?
 
 	/* grid is constructed starting from the outside edges, and adding
-	   progressively smaller inner triangles that connected to the outer
-	   one, until M = 1 or 2, the we fill up the last part. */
+	 * progressively smaller inner triangles that connected to the outer
+	 * one, until M = 1 or 2, the we fill up the last part. */
 	vector<int> outer_u, outer_v, outer_w;
 	int m;
 
@@ -388,13 +388,13 @@ void TriangleDice::add_grid(SubPatch& sub, EdgeFactors& ef, int M)
 	for(m = M-2; m > 0; m -= 2) {
 		vector<int> inner_u, inner_v, inner_w;
 
-		float t = m/(float)M;
+		const float t0 = m / (float)M;
 		float2 center = make_float2(1.0f/3.0f, 1.0f/3.0f);
 
 		/* 3 corner vertices */
-		float2 p_u = interp(center, make_float2(1.0f, 0.0f), t);
-		float2 p_v = interp(center, make_float2(0.0f, 1.0f), t);
-		float2 p_w = interp(center, make_float2(0.0f, 0.0f), t);
+		float2 p_u = interp(center, make_float2(1.0f, 0.0f), t0);
+		float2 p_v = interp(center, make_float2(0.0f, 1.0f), t0);
+		float2 p_w = interp(center, make_float2(0.0f, 0.0f), t0);
 
 		int corner_u = add_vert(sub, p_u);
 		int corner_v = add_vert(sub, p_v);
@@ -407,11 +407,11 @@ void TriangleDice::add_grid(SubPatch& sub, EdgeFactors& ef, int M)
 
 		for(int i = 1; i < m; i++) {
 			/* add vertices between corners */
-			float t = i/(float)m;
+			const float t1 = i / (float)m;
 
-			inner_u.push_back(add_vert(sub, interp(p_v, p_w, t)));
-			inner_v.push_back(add_vert(sub, interp(p_w, p_u, t)));
-			inner_w.push_back(add_vert(sub, interp(p_u, p_v, t)));
+			inner_u.push_back(add_vert(sub, interp(p_v, p_w, t1)));
+			inner_v.push_back(add_vert(sub, interp(p_w, p_u, t1)));
+			inner_w.push_back(add_vert(sub, interp(p_u, p_v, t1)));
 		}
 
 		inner_u.push_back(corner_w);
diff --git a/intern/cycles/subd/subd_ring.cpp b/intern/cycles/subd/subd_ring.cpp
index cbd12e60da0..66eab02231c 100644
--- a/intern/cycles/subd/subd_ring.cpp
+++ b/intern/cycles/subd/subd_ring.cpp
@@ -82,8 +82,8 @@ int SubdFaceRing::vert_index(SubdVert *vertex)
 void SubdFaceRing::evaluate_stencils(float3 *P, StencilMask *mask, int num)
 {
 	/* first we sort verts by id. this way verts will always be added
-	   in the same order to ensure the exact same float ops happen for control
-	   points of other patches, so we get water-tight patches */
+	 * in the same order to ensure the exact same float ops happen for control
+	 * points of other patches, so we get water-tight patches */
 	int num_verts = m_verts.size();
 
 	vector<int> vmap(num_verts);
@@ -161,8 +161,8 @@ bool SubdFaceRing::is_quad(SubdFace *face)
 bool SubdFaceRing::is_boundary(SubdFace *face)
 {
 	/* note that face->is_boundary() returns a different result. That function
-	   returns true when any of the *edges* are on the boundary. however, this
-	   function returns true if any of the face *verts* are on the boundary.  */
+	 * returns true when any of the *edges* are on the boundary. however, this
+	 * function returns true if any of the face *verts* are on the boundary.  */
 
 	for(SubdFace::EdgeIterator it(face->edges()); !it.isDone(); it.advance()) {
 		SubdEdge *edge = it.current();
diff --git a/intern/cycles/subd/subd_split.cpp b/intern/cycles/subd/subd_split.cpp
index f0b87200f08..074c82a2348 100644
--- a/intern/cycles/subd/subd_split.cpp
+++ b/intern/cycles/subd/subd_split.cpp
@@ -248,19 +248,19 @@ void DiagSplit::split(QuadDice::SubPatch& sub, QuadDice::EdgeFactors& ef, int de
 
 void DiagSplit::split_triangle(Mesh *mesh, Patch *patch, int shader, bool smooth)
 {
-	TriangleDice::SubPatch sub;
-	TriangleDice::EdgeFactors ef;
+	TriangleDice::SubPatch sub_split;
+	TriangleDice::EdgeFactors ef_split;
 
-	sub.patch = patch;
-	sub.Pu = make_float2(1.0f, 0.0f);
-	sub.Pv = make_float2(0.0f, 1.0f);
-	sub.Pw = make_float2(0.0f, 0.0f);
+	sub_split.patch = patch;
+	sub_split.Pu = make_float2(1.0f, 0.0f);
+	sub_split.Pv = make_float2(0.0f, 1.0f);
+	sub_split.Pw = make_float2(0.0f, 0.0f);
 
-	ef.tu = T(patch, sub.Pv, sub.Pw);
-	ef.tv = T(patch, sub.Pw, sub.Pu);
-	ef.tw = T(patch, sub.Pu, sub.Pv);
+	ef_split.tu = T(patch, sub_split.Pv, sub_split.Pw);
+	ef_split.tv = T(patch, sub_split.Pw, sub_split.Pu);
+	ef_split.tw = T(patch, sub_split.Pu, sub_split.Pv);
 
-	split(sub, ef);
+	split(sub_split, ef_split);
 
 	TriangleDice dice(mesh, shader, smooth, dicing_rate);
 	dice.camera = camera;
@@ -286,21 +286,21 @@ void DiagSplit::split_triangle(Mesh *mesh, Patch *patch, int shader, bool smooth
 
 void DiagSplit::split_quad(Mesh *mesh, Patch *patch, int shader, bool smooth)
 {
-	QuadDice::SubPatch sub;
-	QuadDice::EdgeFactors ef;
+	QuadDice::SubPatch sub_split;
+	QuadDice::EdgeFactors ef_split;
 
-	sub.patch = patch;
-	sub.P00 = make_float2(0.0f, 0.0f);
-	sub.P10 = make_float2(1.0f, 0.0f);
-	sub.P01 = make_float2(0.0f, 1.0f);
-	sub.P11 = make_float2(1.0f, 1.0f);
+	sub_split.patch = patch;
+	sub_split.P00 = make_float2(0.0f, 0.0f);
+	sub_split.P10 = make_float2(1.0f, 0.0f);
+	sub_split.P01 = make_float2(0.0f, 1.0f);
+	sub_split.P11 = make_float2(1.0f, 1.0f);
 
-	ef.tu0 = T(patch, sub.P00, sub.P10);
-	ef.tu1 = T(patch, sub.P01, sub.P11);
-	ef.tv0 = T(patch, sub.P00, sub.P01);
-	ef.tv1 = T(patch, sub.P10, sub.P11);
+	ef_split.tu0 = T(patch, sub_split.P00, sub_split.P10);
+	ef_split.tu1 = T(patch, sub_split.P01, sub_split.P11);
+	ef_split.tv0 = T(patch, sub_split.P00, sub_split.P01);
+	ef_split.tv1 = T(patch, sub_split.P10, sub_split.P11);
 
-	split(sub, ef);
+	split(sub_split, ef_split);
 
 	QuadDice dice(mesh, shader, smooth, dicing_rate);
 	dice.camera = camera;
diff --git a/intern/cycles/util/util_color.h b/intern/cycles/util/util_color.h
index 8b4a175f498..5136ea5c5db 100644
--- a/intern/cycles/util/util_color.h
+++ b/intern/cycles/util/util_color.h
@@ -29,15 +29,15 @@ __device float color_srgb_to_scene_linear(float c)
 	if(c < 0.04045f)
 		return (c < 0.0f)? 0.0f: c * (1.0f/12.92f);
 	else
-		return pow((c + 0.055f)*(1.0f/1.055f), 2.4f);
+		return powf((c + 0.055f) * (1.0f / 1.055f), 2.4f);
 }
 
 __device float color_scene_linear_to_srgb(float c)
 {
 	if(c < 0.0031308f)
 		return (c < 0.0f)? 0.0f: c * 12.92f;
-    else
-		return 1.055f * pow(c, 1.0f/2.4f) - 0.055f;
+	else
+		return 1.055f * powf(c, 1.0f / 2.4f) - 0.055f;
 }
 
 #ifndef __KERNEL_OPENCL__
diff --git a/intern/cycles/util/util_cuda.cpp b/intern/cycles/util/util_cuda.cpp
index f81a11ba9da..2960022fd8d 100644
--- a/intern/cycles/util/util_cuda.cpp
+++ b/intern/cycles/util/util_cuda.cpp
@@ -326,8 +326,8 @@ bool cuLibraryInit()
 	CUDA_LIBRARY_FIND(cuCtxGetLimit);
 
 	/* functions which changed 3.1 -> 3.2 for 64 bit stuff, the cuda library
-	   has both the old ones for compatibility and new ones with _v2 postfix,
-	   we load the _v2 ones here. */
+	 * has both the old ones for compatibility and new ones with _v2 postfix,
+	 * we load the _v2 ones here. */
 	CUDA_LIBRARY_FIND_V2(cuDeviceTotalMem);
 	CUDA_LIBRARY_FIND_V2(cuCtxCreate);
 	CUDA_LIBRARY_FIND_V2(cuModuleGetGlobal);
diff --git a/intern/cycles/util/util_cuda.h b/intern/cycles/util/util_cuda.h
index ffc71b8864e..d9d956b7bd9 100644
--- a/intern/cycles/util/util_cuda.h
+++ b/intern/cycles/util/util_cuda.h
@@ -56,225 +56,225 @@ typedef struct CUstream_st *CUstream;
 typedef struct CUgraphicsResource_st *CUgraphicsResource;
 
 typedef struct CUuuid_st {
-    char bytes[16];
+	char bytes[16];
 } CUuuid;
 
 typedef enum CUctx_flags_enum {
-    CU_CTX_SCHED_AUTO  = 0,
-    CU_CTX_SCHED_SPIN  = 1,
-    CU_CTX_SCHED_YIELD = 2,
-    CU_CTX_SCHED_MASK  = 0x3,
-    CU_CTX_BLOCKING_SYNC = 4,
-    CU_CTX_MAP_HOST = 8,
-    CU_CTX_LMEM_RESIZE_TO_MAX = 16,
-    CU_CTX_FLAGS_MASK  = 0x1f
+	CU_CTX_SCHED_AUTO  = 0,
+	CU_CTX_SCHED_SPIN  = 1,
+	CU_CTX_SCHED_YIELD = 2,
+	CU_CTX_SCHED_MASK  = 0x3,
+	CU_CTX_BLOCKING_SYNC = 4,
+	CU_CTX_MAP_HOST = 8,
+	CU_CTX_LMEM_RESIZE_TO_MAX = 16,
+	CU_CTX_FLAGS_MASK  = 0x1f
 } CUctx_flags;
 
 typedef enum CUevent_flags_enum {
-    CU_EVENT_DEFAULT        = 0,
-    CU_EVENT_BLOCKING_SYNC  = 1,
-    CU_EVENT_DISABLE_TIMING = 2
+	CU_EVENT_DEFAULT        = 0,
+	CU_EVENT_BLOCKING_SYNC  = 1,
+	CU_EVENT_DISABLE_TIMING = 2
 } CUevent_flags;
 
 typedef enum CUarray_format_enum {
-    CU_AD_FORMAT_UNSIGNED_INT8  = 0x01,
-    CU_AD_FORMAT_UNSIGNED_INT16 = 0x02,
-    CU_AD_FORMAT_UNSIGNED_INT32 = 0x03,
-    CU_AD_FORMAT_SIGNED_INT8    = 0x08,
-    CU_AD_FORMAT_SIGNED_INT16   = 0x09,
-    CU_AD_FORMAT_SIGNED_INT32   = 0x0a,
-    CU_AD_FORMAT_HALF           = 0x10,
-    CU_AD_FORMAT_FLOAT          = 0x20
+	CU_AD_FORMAT_UNSIGNED_INT8  = 0x01,
+	CU_AD_FORMAT_UNSIGNED_INT16 = 0x02,
+	CU_AD_FORMAT_UNSIGNED_INT32 = 0x03,
+	CU_AD_FORMAT_SIGNED_INT8    = 0x08,
+	CU_AD_FORMAT_SIGNED_INT16   = 0x09,
+	CU_AD_FORMAT_SIGNED_INT32   = 0x0a,
+	CU_AD_FORMAT_HALF           = 0x10,
+	CU_AD_FORMAT_FLOAT          = 0x20
 } CUarray_format;
 
 typedef enum CUaddress_mode_enum {
-    CU_TR_ADDRESS_MODE_WRAP   = 0,
-    CU_TR_ADDRESS_MODE_CLAMP  = 1,
-    CU_TR_ADDRESS_MODE_MIRROR = 2,
-    CU_TR_ADDRESS_MODE_BORDER = 3
+	CU_TR_ADDRESS_MODE_WRAP   = 0,
+	CU_TR_ADDRESS_MODE_CLAMP  = 1,
+	CU_TR_ADDRESS_MODE_MIRROR = 2,
+	CU_TR_ADDRESS_MODE_BORDER = 3
 } CUaddress_mode;
 
 typedef enum CUfilter_mode_enum {
-    CU_TR_FILTER_MODE_POINT  = 0,
-    CU_TR_FILTER_MODE_LINEAR = 1
+	CU_TR_FILTER_MODE_POINT  = 0,
+	CU_TR_FILTER_MODE_LINEAR = 1
 } CUfilter_mode;
 
 typedef enum CUdevice_attribute_enum {
-    CU_DEVICE_ATTRIBUTE_MAX_THREADS_PER_BLOCK = 1,
-    CU_DEVICE_ATTRIBUTE_MAX_BLOCK_DIM_X = 2,
-    CU_DEVICE_ATTRIBUTE_MAX_BLOCK_DIM_Y = 3,
-    CU_DEVICE_ATTRIBUTE_MAX_BLOCK_DIM_Z = 4,
-    CU_DEVICE_ATTRIBUTE_MAX_GRID_DIM_X = 5,
-    CU_DEVICE_ATTRIBUTE_MAX_GRID_DIM_Y = 6,
-    CU_DEVICE_ATTRIBUTE_MAX_GRID_DIM_Z = 7,
-    CU_DEVICE_ATTRIBUTE_MAX_SHARED_MEMORY_PER_BLOCK = 8,
-    CU_DEVICE_ATTRIBUTE_SHARED_MEMORY_PER_BLOCK = 8,
-    CU_DEVICE_ATTRIBUTE_TOTAL_CONSTANT_MEMORY = 9,
-    CU_DEVICE_ATTRIBUTE_WARP_SIZE = 10,
-    CU_DEVICE_ATTRIBUTE_MAX_PITCH = 11,
-    CU_DEVICE_ATTRIBUTE_MAX_REGISTERS_PER_BLOCK = 12,
-    CU_DEVICE_ATTRIBUTE_REGISTERS_PER_BLOCK = 12,
-    CU_DEVICE_ATTRIBUTE_CLOCK_RATE = 13,
-    CU_DEVICE_ATTRIBUTE_TEXTURE_ALIGNMENT = 14,
-    CU_DEVICE_ATTRIBUTE_GPU_OVERLAP = 15,
-    CU_DEVICE_ATTRIBUTE_MULTIPROCESSOR_COUNT = 16,
-    CU_DEVICE_ATTRIBUTE_KERNEL_EXEC_TIMEOUT = 17,
-    CU_DEVICE_ATTRIBUTE_INTEGRATED = 18,
-    CU_DEVICE_ATTRIBUTE_CAN_MAP_HOST_MEMORY = 19,
-    CU_DEVICE_ATTRIBUTE_COMPUTE_MODE = 20,
-    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE1D_WIDTH = 21,
-    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_WIDTH = 22,
-    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_HEIGHT = 23,
-    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE3D_WIDTH = 24,
-    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE3D_HEIGHT = 25,
-    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE3D_DEPTH = 26,
-    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_ARRAY_WIDTH = 27,
-    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_ARRAY_HEIGHT = 28,
-    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_ARRAY_NUMSLICES = 29,
-    CU_DEVICE_ATTRIBUTE_SURFACE_ALIGNMENT = 30,
-    CU_DEVICE_ATTRIBUTE_CONCURRENT_KERNELS = 31,
-    CU_DEVICE_ATTRIBUTE_ECC_ENABLED = 32,
-    CU_DEVICE_ATTRIBUTE_PCI_BUS_ID = 33,
-    CU_DEVICE_ATTRIBUTE_PCI_DEVICE_ID = 34,
-    CU_DEVICE_ATTRIBUTE_TCC_DRIVER = 35
+	CU_DEVICE_ATTRIBUTE_MAX_THREADS_PER_BLOCK = 1,
+	CU_DEVICE_ATTRIBUTE_MAX_BLOCK_DIM_X = 2,
+	CU_DEVICE_ATTRIBUTE_MAX_BLOCK_DIM_Y = 3,
+	CU_DEVICE_ATTRIBUTE_MAX_BLOCK_DIM_Z = 4,
+	CU_DEVICE_ATTRIBUTE_MAX_GRID_DIM_X = 5,
+	CU_DEVICE_ATTRIBUTE_MAX_GRID_DIM_Y = 6,
+	CU_DEVICE_ATTRIBUTE_MAX_GRID_DIM_Z = 7,
+	CU_DEVICE_ATTRIBUTE_MAX_SHARED_MEMORY_PER_BLOCK = 8,
+	CU_DEVICE_ATTRIBUTE_SHARED_MEMORY_PER_BLOCK = 8,
+	CU_DEVICE_ATTRIBUTE_TOTAL_CONSTANT_MEMORY = 9,
+	CU_DEVICE_ATTRIBUTE_WARP_SIZE = 10,
+	CU_DEVICE_ATTRIBUTE_MAX_PITCH = 11,
+	CU_DEVICE_ATTRIBUTE_MAX_REGISTERS_PER_BLOCK = 12,
+	CU_DEVICE_ATTRIBUTE_REGISTERS_PER_BLOCK = 12,
+	CU_DEVICE_ATTRIBUTE_CLOCK_RATE = 13,
+	CU_DEVICE_ATTRIBUTE_TEXTURE_ALIGNMENT = 14,
+	CU_DEVICE_ATTRIBUTE_GPU_OVERLAP = 15,
+	CU_DEVICE_ATTRIBUTE_MULTIPROCESSOR_COUNT = 16,
+	CU_DEVICE_ATTRIBUTE_KERNEL_EXEC_TIMEOUT = 17,
+	CU_DEVICE_ATTRIBUTE_INTEGRATED = 18,
+	CU_DEVICE_ATTRIBUTE_CAN_MAP_HOST_MEMORY = 19,
+	CU_DEVICE_ATTRIBUTE_COMPUTE_MODE = 20,
+	CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE1D_WIDTH = 21,
+	CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_WIDTH = 22,
+	CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_HEIGHT = 23,
+	CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE3D_WIDTH = 24,
+	CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE3D_HEIGHT = 25,
+	CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE3D_DEPTH = 26,
+	CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_ARRAY_WIDTH = 27,
+	CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_ARRAY_HEIGHT = 28,
+	CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_ARRAY_NUMSLICES = 29,
+	CU_DEVICE_ATTRIBUTE_SURFACE_ALIGNMENT = 30,
+	CU_DEVICE_ATTRIBUTE_CONCURRENT_KERNELS = 31,
+	CU_DEVICE_ATTRIBUTE_ECC_ENABLED = 32,
+	CU_DEVICE_ATTRIBUTE_PCI_BUS_ID = 33,
+	CU_DEVICE_ATTRIBUTE_PCI_DEVICE_ID = 34,
+	CU_DEVICE_ATTRIBUTE_TCC_DRIVER = 35
 } CUdevice_attribute;
 
 typedef struct CUdevprop_st {
-    int maxThreadsPerBlock;
-    int maxThreadsDim[3];
-    int maxGridSize[3];
-    int sharedMemPerBlock;
-    int totalConstantMemory;
-    int SIMDWidth;
-    int memPitch;
-    int regsPerBlock;
-    int clockRate;
-    int textureAlign;
+	int maxThreadsPerBlock;
+	int maxThreadsDim[3];
+	int maxGridSize[3];
+	int sharedMemPerBlock;
+	int totalConstantMemory;
+	int SIMDWidth;
+	int memPitch;
+	int regsPerBlock;
+	int clockRate;
+	int textureAlign;
 } CUdevprop;
 
 typedef enum CUfunction_attribute_enum {
-    CU_FUNC_ATTRIBUTE_MAX_THREADS_PER_BLOCK = 0,
-    CU_FUNC_ATTRIBUTE_SHARED_SIZE_BYTES = 1,
-    CU_FUNC_ATTRIBUTE_CONST_SIZE_BYTES = 2,
-    CU_FUNC_ATTRIBUTE_LOCAL_SIZE_BYTES = 3,
-    CU_FUNC_ATTRIBUTE_NUM_REGS = 4,
-    CU_FUNC_ATTRIBUTE_PTX_VERSION = 5,
-    CU_FUNC_ATTRIBUTE_BINARY_VERSION = 6,
-    CU_FUNC_ATTRIBUTE_MAX
+	CU_FUNC_ATTRIBUTE_MAX_THREADS_PER_BLOCK = 0,
+	CU_FUNC_ATTRIBUTE_SHARED_SIZE_BYTES = 1,
+	CU_FUNC_ATTRIBUTE_CONST_SIZE_BYTES = 2,
+	CU_FUNC_ATTRIBUTE_LOCAL_SIZE_BYTES = 3,
+	CU_FUNC_ATTRIBUTE_NUM_REGS = 4,
+	CU_FUNC_ATTRIBUTE_PTX_VERSION = 5,
+	CU_FUNC_ATTRIBUTE_BINARY_VERSION = 6,
+	CU_FUNC_ATTRIBUTE_MAX
 } CUfunction_attribute;
 
 typedef enum CUfunc_cache_enum {
-    CU_FUNC_CACHE_PREFER_NONE    = 0x00,
-    CU_FUNC_CACHE_PREFER_SHARED  = 0x01,
-    CU_FUNC_CACHE_PREFER_L1      = 0x02
+	CU_FUNC_CACHE_PREFER_NONE    = 0x00,
+	CU_FUNC_CACHE_PREFER_SHARED  = 0x01,
+	CU_FUNC_CACHE_PREFER_L1      = 0x02
 } CUfunc_cache;
 
 typedef enum CUmemorytype_enum {
-    CU_MEMORYTYPE_HOST   = 0x01,
-    CU_MEMORYTYPE_DEVICE = 0x02,
-    CU_MEMORYTYPE_ARRAY  = 0x03
+	CU_MEMORYTYPE_HOST   = 0x01,
+	CU_MEMORYTYPE_DEVICE = 0x02,
+	CU_MEMORYTYPE_ARRAY  = 0x03
 } CUmemorytype;
 
 typedef enum CUcomputemode_enum {
-    CU_COMPUTEMODE_DEFAULT    = 0,
-    CU_COMPUTEMODE_EXCLUSIVE  = 1,
-    CU_COMPUTEMODE_PROHIBITED = 2
+	CU_COMPUTEMODE_DEFAULT    = 0,
+	CU_COMPUTEMODE_EXCLUSIVE  = 1,
+	CU_COMPUTEMODE_PROHIBITED = 2
 } CUcomputemode;
 
 typedef enum CUjit_option_enum
 {
-    CU_JIT_MAX_REGISTERS = 0,
-    CU_JIT_THREADS_PER_BLOCK,
-    CU_JIT_WALL_TIME,
-    CU_JIT_INFO_LOG_BUFFER,
-    CU_JIT_INFO_LOG_BUFFER_SIZE_BYTES,
-    CU_JIT_ERROR_LOG_BUFFER,
-    CU_JIT_ERROR_LOG_BUFFER_SIZE_BYTES,
-    CU_JIT_OPTIMIZATION_LEVEL,
-    CU_JIT_TARGET_FROM_CUCONTEXT,
-    CU_JIT_TARGET,
-    CU_JIT_FALLBACK_STRATEGY
+	CU_JIT_MAX_REGISTERS = 0,
+	CU_JIT_THREADS_PER_BLOCK,
+	CU_JIT_WALL_TIME,
+	CU_JIT_INFO_LOG_BUFFER,
+	CU_JIT_INFO_LOG_BUFFER_SIZE_BYTES,
+	CU_JIT_ERROR_LOG_BUFFER,
+	CU_JIT_ERROR_LOG_BUFFER_SIZE_BYTES,
+	CU_JIT_OPTIMIZATION_LEVEL,
+	CU_JIT_TARGET_FROM_CUCONTEXT,
+	CU_JIT_TARGET,
+	CU_JIT_FALLBACK_STRATEGY
 
 } CUjit_option;
 
 typedef enum CUjit_target_enum
 {
-    CU_TARGET_COMPUTE_10 = 0,
-    CU_TARGET_COMPUTE_11,
-    CU_TARGET_COMPUTE_12,
-    CU_TARGET_COMPUTE_13,
-    CU_TARGET_COMPUTE_20,
-    CU_TARGET_COMPUTE_21,
-    CU_TARGET_COMPUTE_30
+	CU_TARGET_COMPUTE_10 = 0,
+	CU_TARGET_COMPUTE_11,
+	CU_TARGET_COMPUTE_12,
+	CU_TARGET_COMPUTE_13,
+	CU_TARGET_COMPUTE_20,
+	CU_TARGET_COMPUTE_21,
+	CU_TARGET_COMPUTE_30
 } CUjit_target;
 
 typedef enum CUjit_fallback_enum
 {
-    CU_PREFER_PTX = 0,
-    CU_PREFER_BINARY
+	CU_PREFER_PTX = 0,
+	CU_PREFER_BINARY
 
 } CUjit_fallback;
 
 typedef enum CUgraphicsRegisterFlags_enum {
-    CU_GRAPHICS_REGISTER_FLAGS_NONE  = 0x00
+	CU_GRAPHICS_REGISTER_FLAGS_NONE  = 0x00
 } CUgraphicsRegisterFlags;
 
 typedef enum CUgraphicsMapResourceFlags_enum {
-    CU_GRAPHICS_MAP_RESOURCE_FLAGS_NONE          = 0x00,
-    CU_GRAPHICS_MAP_RESOURCE_FLAGS_READ_ONLY     = 0x01,
-    CU_GRAPHICS_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02
+	CU_GRAPHICS_MAP_RESOURCE_FLAGS_NONE          = 0x00,
+	CU_GRAPHICS_MAP_RESOURCE_FLAGS_READ_ONLY     = 0x01,
+	CU_GRAPHICS_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02
 } CUgraphicsMapResourceFlags;
 
 typedef enum CUarray_cubemap_face_enum {
-    CU_CUBEMAP_FACE_POSITIVE_X  = 0x00,
-    CU_CUBEMAP_FACE_NEGATIVE_X  = 0x01,
-    CU_CUBEMAP_FACE_POSITIVE_Y  = 0x02,
-    CU_CUBEMAP_FACE_NEGATIVE_Y  = 0x03,
-    CU_CUBEMAP_FACE_POSITIVE_Z  = 0x04,
-    CU_CUBEMAP_FACE_NEGATIVE_Z  = 0x05
+	CU_CUBEMAP_FACE_POSITIVE_X  = 0x00,
+	CU_CUBEMAP_FACE_NEGATIVE_X  = 0x01,
+	CU_CUBEMAP_FACE_POSITIVE_Y  = 0x02,
+	CU_CUBEMAP_FACE_NEGATIVE_Y  = 0x03,
+	CU_CUBEMAP_FACE_POSITIVE_Z  = 0x04,
+	CU_CUBEMAP_FACE_NEGATIVE_Z  = 0x05
 } CUarray_cubemap_face;
 
 typedef enum CUlimit_enum {
-    CU_LIMIT_STACK_SIZE        = 0x00,
-    CU_LIMIT_PRINTF_FIFO_SIZE  = 0x01,
-    CU_LIMIT_MALLOC_HEAP_SIZE  = 0x02
+	CU_LIMIT_STACK_SIZE        = 0x00,
+	CU_LIMIT_PRINTF_FIFO_SIZE  = 0x01,
+	CU_LIMIT_MALLOC_HEAP_SIZE  = 0x02
 } CUlimit;
 
 typedef enum cudaError_enum {
-    CUDA_SUCCESS                              = 0,
-    CUDA_ERROR_INVALID_VALUE                  = 1,
-    CUDA_ERROR_OUT_OF_MEMORY                  = 2,
-    CUDA_ERROR_NOT_INITIALIZED                = 3,
-    CUDA_ERROR_DEINITIALIZED                  = 4,
-    CUDA_ERROR_NO_DEVICE                      = 100,
-    CUDA_ERROR_INVALID_DEVICE                 = 101,
-    CUDA_ERROR_INVALID_IMAGE                  = 200,
-    CUDA_ERROR_INVALID_CONTEXT                = 201,
-    CUDA_ERROR_CONTEXT_ALREADY_CURRENT        = 202,
-    CUDA_ERROR_MAP_FAILED                     = 205,
-    CUDA_ERROR_UNMAP_FAILED                   = 206,
-    CUDA_ERROR_ARRAY_IS_MAPPED                = 207,
-    CUDA_ERROR_ALREADY_MAPPED                 = 208,
-    CUDA_ERROR_NO_BINARY_FOR_GPU              = 209,
-    CUDA_ERROR_ALREADY_ACQUIRED               = 210,
-    CUDA_ERROR_NOT_MAPPED                     = 211,
-    CUDA_ERROR_NOT_MAPPED_AS_ARRAY            = 212,
-    CUDA_ERROR_NOT_MAPPED_AS_POINTER          = 213,
-    CUDA_ERROR_ECC_UNCORRECTABLE              = 214,
-    CUDA_ERROR_UNSUPPORTED_LIMIT              = 215,
-    CUDA_ERROR_INVALID_SOURCE                 = 300,
-    CUDA_ERROR_FILE_NOT_FOUND                 = 301,
-    CUDA_ERROR_SHARED_OBJECT_SYMBOL_NOT_FOUND = 302,
-    CUDA_ERROR_SHARED_OBJECT_INIT_FAILED      = 303,
-    CUDA_ERROR_OPERATING_SYSTEM               = 304,
-    CUDA_ERROR_INVALID_HANDLE                 = 400,
-    CUDA_ERROR_NOT_FOUND                      = 500,
-    CUDA_ERROR_NOT_READY                      = 600,
-    CUDA_ERROR_LAUNCH_FAILED                  = 700,
-    CUDA_ERROR_LAUNCH_OUT_OF_RESOURCES        = 701,
-    CUDA_ERROR_LAUNCH_TIMEOUT                 = 702,
-    CUDA_ERROR_LAUNCH_INCOMPATIBLE_TEXTURING  = 703,
-    CUDA_ERROR_UNKNOWN                        = 999
+	CUDA_SUCCESS                              = 0,
+	CUDA_ERROR_INVALID_VALUE                  = 1,
+	CUDA_ERROR_OUT_OF_MEMORY                  = 2,
+	CUDA_ERROR_NOT_INITIALIZED                = 3,
+	CUDA_ERROR_DEINITIALIZED                  = 4,
+	CUDA_ERROR_NO_DEVICE                      = 100,
+	CUDA_ERROR_INVALID_DEVICE                 = 101,
+	CUDA_ERROR_INVALID_IMAGE                  = 200,
+	CUDA_ERROR_INVALID_CONTEXT                = 201,
+	CUDA_ERROR_CONTEXT_ALREADY_CURRENT        = 202,
+	CUDA_ERROR_MAP_FAILED                     = 205,
+	CUDA_ERROR_UNMAP_FAILED                   = 206,
+	CUDA_ERROR_ARRAY_IS_MAPPED                = 207,
+	CUDA_ERROR_ALREADY_MAPPED                 = 208,
+	CUDA_ERROR_NO_BINARY_FOR_GPU              = 209,
+	CUDA_ERROR_ALREADY_ACQUIRED               = 210,
+	CUDA_ERROR_NOT_MAPPED                     = 211,
+	CUDA_ERROR_NOT_MAPPED_AS_ARRAY            = 212,
+	CUDA_ERROR_NOT_MAPPED_AS_POINTER          = 213,
+	CUDA_ERROR_ECC_UNCORRECTABLE              = 214,
+	CUDA_ERROR_UNSUPPORTED_LIMIT              = 215,
+	CUDA_ERROR_INVALID_SOURCE                 = 300,
+	CUDA_ERROR_FILE_NOT_FOUND                 = 301,
+	CUDA_ERROR_SHARED_OBJECT_SYMBOL_NOT_FOUND = 302,
+	CUDA_ERROR_SHARED_OBJECT_INIT_FAILED      = 303,
+	CUDA_ERROR_OPERATING_SYSTEM               = 304,
+	CUDA_ERROR_INVALID_HANDLE                 = 400,
+	CUDA_ERROR_NOT_FOUND                      = 500,
+	CUDA_ERROR_NOT_READY                      = 600,
+	CUDA_ERROR_LAUNCH_FAILED                  = 700,
+	CUDA_ERROR_LAUNCH_OUT_OF_RESOURCES        = 701,
+	CUDA_ERROR_LAUNCH_TIMEOUT                 = 702,
+	CUDA_ERROR_LAUNCH_INCOMPATIBLE_TEXTURING  = 703,
+	CUDA_ERROR_UNKNOWN                        = 999
 } CUresult;
 
 #define CU_MEMHOSTALLOC_PORTABLE        0x01
@@ -282,76 +282,76 @@ typedef enum cudaError_enum {
 #define CU_MEMHOSTALLOC_WRITECOMBINED   0x04
 
 typedef struct CUDA_MEMCPY2D_st {
-    size_t srcXInBytes;
-    size_t srcY;
-
-    CUmemorytype srcMemoryType;
-    const void *srcHost;
-    CUdeviceptr srcDevice;
-    CUarray srcArray;
-    size_t srcPitch;
-
-    size_t dstXInBytes;
-    size_t dstY;
-
-    CUmemorytype dstMemoryType;
-    void *dstHost;
-    CUdeviceptr dstDevice;
-    CUarray dstArray;
-    size_t dstPitch;
-
-    size_t WidthInBytes;
-    size_t Height;
+	size_t srcXInBytes;
+	size_t srcY;
+
+	CUmemorytype srcMemoryType;
+	const void *srcHost;
+	CUdeviceptr srcDevice;
+	CUarray srcArray;
+	size_t srcPitch;
+
+	size_t dstXInBytes;
+	size_t dstY;
+
+	CUmemorytype dstMemoryType;
+	void *dstHost;
+	CUdeviceptr dstDevice;
+	CUarray dstArray;
+	size_t dstPitch;
+
+	size_t WidthInBytes;
+	size_t Height;
 } CUDA_MEMCPY2D;
 
 typedef struct CUDA_MEMCPY3D_st {
-    size_t srcXInBytes;
-    size_t srcY;
-    size_t srcZ;
-    size_t srcLOD;
-    CUmemorytype srcMemoryType;
-    const void *srcHost;
-    CUdeviceptr srcDevice;
-    CUarray srcArray;
-    void *reserved0;
-    size_t srcPitch;
-    size_t srcHeight;
-
-    size_t dstXInBytes;
-    size_t dstY;
-    size_t dstZ;
-    size_t dstLOD;
-    CUmemorytype dstMemoryType;
-    void *dstHost;
-    CUdeviceptr dstDevice;
-    CUarray dstArray;
-    void *reserved1;
-    size_t dstPitch;
-    size_t dstHeight;
-
-    size_t WidthInBytes;
-    size_t Height;
-    size_t Depth;
+	size_t srcXInBytes;
+	size_t srcY;
+	size_t srcZ;
+	size_t srcLOD;
+	CUmemorytype srcMemoryType;
+	const void *srcHost;
+	CUdeviceptr srcDevice;
+	CUarray srcArray;
+	void *reserved0;
+	size_t srcPitch;
+	size_t srcHeight;
+
+	size_t dstXInBytes;
+	size_t dstY;
+	size_t dstZ;
+	size_t dstLOD;
+	CUmemorytype dstMemoryType;
+	void *dstHost;
+	CUdeviceptr dstDevice;
+	CUarray dstArray;
+	void *reserved1;
+	size_t dstPitch;
+	size_t dstHeight;
+
+	size_t WidthInBytes;
+	size_t Height;
+	size_t Depth;
 } CUDA_MEMCPY3D;
 
 typedef struct CUDA_ARRAY_DESCRIPTOR_st
 {
-    size_t Width;
-    size_t Height;
+	size_t Width;
+	size_t Height;
 
-    CUarray_format Format;
-    unsigned int NumChannels;
+	CUarray_format Format;
+	unsigned int NumChannels;
 } CUDA_ARRAY_DESCRIPTOR;
 
 typedef struct CUDA_ARRAY3D_DESCRIPTOR_st
 {
-    size_t Width;
-    size_t Height;
-    size_t Depth;
+	size_t Width;
+	size_t Height;
+	size_t Depth;
 
-    CUarray_format Format;
-    unsigned int NumChannels;
-    unsigned int Flags;
+	CUarray_format Format;
+	unsigned int NumChannels;
+	unsigned int Flags;
 } CUDA_ARRAY3D_DESCRIPTOR;
 
 #define CUDA_ARRAY3D_2DARRAY        0x01
diff --git a/intern/cycles/util/util_hash.h b/intern/cycles/util/util_hash.h
index c31b46e1580..5b3ff76af7f 100644
--- a/intern/cycles/util/util_hash.h
+++ b/intern/cycles/util/util_hash.h
@@ -34,14 +34,14 @@ static inline uint hash_int_2d(uint kx, uint ky)
 	b += ky;
 
 	c ^= b; c -= rot(b,14);
-    a ^= c; a -= rot(c,11);
-    b ^= a; b -= rot(a,25);
-    c ^= b; c -= rot(b,16);
-    a ^= c; a -= rot(c,4);
-    b ^= a; b -= rot(a,14);
-    c ^= b; c -= rot(b,24);
-
-    return c;
+	a ^= c; a -= rot(c,11);
+	b ^= a; b -= rot(a,25);
+	c ^= b; c -= rot(b,16);
+	a ^= c; a -= rot(c,4);
+	b ^= a; b -= rot(a,14);
+	c ^= b; c -= rot(b,24);
+
+	return c;
 
 	#undef rot
 }
diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h
index fee2f10085b..a6bc478ee64 100644
--- a/intern/cycles/util/util_math.h
+++ b/intern/cycles/util/util_math.h
@@ -162,6 +162,12 @@ __device_inline float nonzerof(float f, float eps)
 		return f;
 }
 
+__device_inline float smoothstepf(float f)
+{
+	float ff = f*f;
+	return (3.0f*ff - 2.0f*ff*f);
+}
+
 /* Float2 Vector */
 
 #ifndef __KERNEL_OPENCL__
@@ -328,7 +334,7 @@ __device_inline float2 as_float2(const float4 a)
 
 __device_inline void print_float2(const char *label, const float2& a)
 {
-	printf("%s: %.8f %.8f\n", label, a.x, a.y);
+	printf("%s: %.8f %.8f\n", label, (double)a.x, (double)a.y);
 }
 
 #endif
@@ -526,7 +532,7 @@ __device_inline float4 float3_to_float4(const float3 a)
 
 __device_inline void print_float3(const char *label, const float3& a)
 {
-	printf("%s: %.8f %.8f %.8f\n", label, a.x, a.y, a.z);
+	printf("%s: %.8f %.8f %.8f\n", label, (double)a.x, (double)a.y, (double)a.z);
 }
 
 __device_inline float3 rcp(const float3& a)
@@ -838,7 +844,7 @@ __device_inline float4 reduce_add(const float4& a)
 
 __device_inline void print_float4(const char *label, const float4& a)
 {
-	printf("%s: %.8f %.8f %.8f %.8f\n", label, a.x, a.y, a.z, a.w);
+	printf("%s: %.8f %.8f %.8f %.8f\n", label, (double)a.x, (double)a.y, (double)a.z, (double)a.w);
 }
 
 #endif
diff --git a/intern/cycles/util/util_md5.cpp b/intern/cycles/util/util_md5.cpp
index 25a77f18d02..9dcd69cec99 100644
--- a/intern/cycles/util/util_md5.cpp
+++ b/intern/cycles/util/util_md5.cpp
@@ -148,7 +148,7 @@ void MD5Hash::process(const uint8_t *data /*[64]*/)
 
 	/* Round 1. */
 	/* Let [abcd k s i] denote the operation
-	   a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
+	 * a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
 #define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
 #define SET(a, b, c, d, k, s, Ti)\
   t = a + F(b,c,d) + X[k] + Ti;\
@@ -172,9 +172,9 @@ void MD5Hash::process(const uint8_t *data /*[64]*/)
 	SET(b, c, d, a, 15, 22, T16);
 #undef SET
 
-	 /* Round 2. */
-	 /* Let [abcd k s i] denote the operation
-		  a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
+	/* Round 2. */
+	/* Let [abcd k s i] denote the operation
+	 * a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
 #define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
 #define SET(a, b, c, d, k, s, Ti)\
   t = a + G(b,c,d) + X[k] + Ti;\
@@ -198,9 +198,9 @@ void MD5Hash::process(const uint8_t *data /*[64]*/)
 	SET(b, c, d, a, 12, 20, T32);
 #undef SET
 
-	 /* Round 3. */
-	 /* Let [abcd k s t] denote the operation
-		  a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
+	/* Round 3. */
+	/* Let [abcd k s t] denote the operation
+	 * a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
 #define H(x, y, z) ((x) ^ (y) ^ (z))
 #define SET(a, b, c, d, k, s, Ti)\
   t = a + H(b,c,d) + X[k] + Ti;\
@@ -224,9 +224,9 @@ void MD5Hash::process(const uint8_t *data /*[64]*/)
 	SET(b, c, d, a,  2, 23, T48);
 #undef SET
 
-	 /* Round 4. */
-	 /* Let [abcd k s t] denote the operation
-		  a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
+	/* Round 4. */
+	/* Let [abcd k s t] denote the operation
+	 * a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
 #define I(x, y, z) ((y) ^ ((x) | ~(z)))
 #define SET(a, b, c, d, k, s, Ti)\
   t = a + I(b,c,d) + X[k] + Ti;\
@@ -250,9 +250,9 @@ void MD5Hash::process(const uint8_t *data /*[64]*/)
 	SET(b, c, d, a,  9, 21, T64);
 #undef SET
 
-	 /* Then perform the following additions. (That is increment each
-		of the four registers by the value it had before this block
-		was started.) */
+	/* Then perform the following additions. (That is increment each
+	 * of the four registers by the value it had before this block
+	 * was started.) */
 	abcd[0] += a;
 	abcd[1] += b;
 	abcd[2] += c;
@@ -365,7 +365,7 @@ string MD5Hash::get_hex()
 
 	finish(digest);
 
-	for(int i=0; i<16; i++)
+	for(int i = 0; i < 16; i++)
 		sprintf(buf + i*2, "%02X", digest[i]);
 	buf[sizeof(buf)-1] = '\0';
 	
diff --git a/intern/cycles/util/util_md5.h b/intern/cycles/util/util_md5.h
index 5e7e604c4cf..43e08e64f39 100644
--- a/intern/cycles/util/util_md5.h
+++ b/intern/cycles/util/util_md5.h
@@ -44,13 +44,13 @@ public:
 	bool append_file(const string& filepath);
 	string get_hex();
 
-protected:
+	protected:
 	void process(const uint8_t *data);
 	void finish(uint8_t digest[16]);
 
-    uint32_t count[2]; /* message length in bits, lsw first */
-    uint32_t abcd[4]; /* digest buffer */
-    uint8_t buf[64]; /* accumulate block */
+	uint32_t count[2]; /* message length in bits, lsw first */
+	uint32_t abcd[4]; /* digest buffer */
+	uint8_t buf[64]; /* accumulate block */
 };
 
 CCL_NAMESPACE_END
diff --git a/intern/cycles/util/util_opencl.cpp b/intern/cycles/util/util_opencl.cpp
index 4087c2c3823..c9df9c2ff5c 100644
--- a/intern/cycles/util/util_opencl.cpp
+++ b/intern/cycles/util/util_opencl.cpp
@@ -13,29 +13,29 @@
 
 #ifndef CLCC_GENERATE_DOCUMENTATION
 #ifdef _WIN32
-    #define WIN32_LEAN_AND_MEAN
-    #define VC_EXTRALEAN
-    #include <windows.h>
+#  define WIN32_LEAN_AND_MEAN
+#  define VC_EXTRALEAN
+#  include <windows.h>
 
-    typedef HMODULE             CLCC_DYNLIB_HANDLE;
+   typedef HMODULE             CLCC_DYNLIB_HANDLE;
 
-    #define CLCC_DYNLIB_OPEN    LoadLibrary
-    #define CLCC_DYNLIB_CLOSE   FreeLibrary
-    #define CLCC_DYNLIB_IMPORT  GetProcAddress
+#  define CLCC_DYNLIB_OPEN    LoadLibrary
+#  define CLCC_DYNLIB_CLOSE   FreeLibrary
+#  define CLCC_DYNLIB_IMPORT  GetProcAddress
 #else
-    #include <dlfcn.h>
-    
-    typedef void*                   CLCC_DYNLIB_HANDLE;
+#  include <dlfcn.h>
 
-    #define CLCC_DYNLIB_OPEN(path)  dlopen(path, RTLD_NOW | RTLD_GLOBAL)
-    #define CLCC_DYNLIB_CLOSE       dlclose
-    #define CLCC_DYNLIB_IMPORT      dlsym
+   typedef void*                   CLCC_DYNLIB_HANDLE;
+
+#  define CLCC_DYNLIB_OPEN(path)  dlopen(path, RTLD_NOW | RTLD_GLOBAL)
+#  define CLCC_DYNLIB_CLOSE       dlclose
+#  define CLCC_DYNLIB_IMPORT      dlsym
 #endif
 #else
-    //typedef implementation_defined  CLCC_DYNLIB_HANDLE;
-    //#define CLCC_DYNLIB_OPEN(path)  implementation_defined
-    //#define CLCC_DYNLIB_CLOSE       implementation_defined
-    //#define CLCC_DYNLIB_IMPORT      implementation_defined
+//  typedef implementation_defined  CLCC_DYNLIB_HANDLE;
+//#  define CLCC_DYNLIB_OPEN(path)  implementation_defined
+//#  define CLCC_DYNLIB_CLOSE       implementation_defined
+//#  define CLCC_DYNLIB_IMPORT      implementation_defined
 #endif
 
 CCL_NAMESPACE_BEGIN
@@ -117,12 +117,12 @@ PFNCLGETEXTENSIONFUNCTIONADDRESS    __clewGetExtensionFunctionAddress   = NULL;
 //! \brief Unloads OpenCL dynamic library, should not be called directly
 static void clewExit(void)
 {
-    if (module != NULL)
-    {
-        //  Ignore errors
-        CLCC_DYNLIB_CLOSE(module);
-        module = NULL;
-    }
+	if (module != NULL)
+	{
+		//  Ignore errors
+		CLCC_DYNLIB_CLOSE(module);
+		module = NULL;
+	}
 }
 
 //! \param path path to dynamic library to load
@@ -138,186 +138,186 @@ int clLibraryInit()
 #else
 	const char *path = "libOpenCL.so";
 #endif
-    int error = 0;
+	int error = 0;
 
-    //  Check if already initialized
-    if (module != NULL)
-    {
-        return 1;
-    }
+	//  Check if already initialized
+	if (module != NULL)
+	{
+		return 1;
+	}
 
-    //  Load library
-    module = CLCC_DYNLIB_OPEN(path);
+	//  Load library
+	module = CLCC_DYNLIB_OPEN(path);
 
-    //  Check for errors
-    if (module == NULL)
-    {
-        return 0;
-    }
+	//  Check for errors
+	if (module == NULL)
+	{
+		return 0;
+	}
 
-    //  Set unloading
-    error = atexit(clewExit);
+	//  Set unloading
+	error = atexit(clewExit);
 
-    if (error)
-    {
-        //  Failure queing atexit, shutdown with error
-        CLCC_DYNLIB_CLOSE(module);
-        module = NULL;
+	if (error)
+	{
+		//  Failure queing atexit, shutdown with error
+		CLCC_DYNLIB_CLOSE(module);
+		module = NULL;
 
-        return 0;
-    }
+		return 0;
+	}
 
-    //  Determine function entry-points
-    __clewGetPlatformIDs                = (PFNCLGETPLATFORMIDS              )CLCC_DYNLIB_IMPORT(module, "clGetPlatformIDs");
-    __clewGetPlatformInfo               = (PFNCLGETPLATFORMINFO             )CLCC_DYNLIB_IMPORT(module, "clGetPlatformInfo");
-    __clewGetDeviceIDs                  = (PFNCLGETDEVICEIDS                )CLCC_DYNLIB_IMPORT(module, "clGetDeviceIDs");
-    __clewGetDeviceInfo                 = (PFNCLGETDEVICEINFO               )CLCC_DYNLIB_IMPORT(module, "clGetDeviceInfo");
-    __clewCreateContext                 = (PFNCLCREATECONTEXT               )CLCC_DYNLIB_IMPORT(module, "clCreateContext");
-    __clewCreateContextFromType         = (PFNCLCREATECONTEXTFROMTYPE       )CLCC_DYNLIB_IMPORT(module, "clCreateContextFromType");
-    __clewRetainContext                 = (PFNCLRETAINCONTEXT               )CLCC_DYNLIB_IMPORT(module, "clRetainContext");
-    __clewReleaseContext                = (PFNCLRELEASECONTEXT              )CLCC_DYNLIB_IMPORT(module, "clReleaseContext");
-    __clewGetContextInfo                = (PFNCLGETCONTEXTINFO              )CLCC_DYNLIB_IMPORT(module, "clGetContextInfo");
-    __clewCreateCommandQueue            = (PFNCLCREATECOMMANDQUEUE          )CLCC_DYNLIB_IMPORT(module, "clCreateCommandQueue");
-    __clewRetainCommandQueue            = (PFNCLRETAINCOMMANDQUEUE          )CLCC_DYNLIB_IMPORT(module, "clRetainCommandQueue");
-    __clewReleaseCommandQueue           = (PFNCLRELEASECOMMANDQUEUE         )CLCC_DYNLIB_IMPORT(module, "clReleaseCommandQueue");
-    __clewGetCommandQueueInfo           = (PFNCLGETCOMMANDQUEUEINFO         )CLCC_DYNLIB_IMPORT(module, "clGetCommandQueueInfo");
-    __clewSetCommandQueueProperty       = (PFNCLSETCOMMANDQUEUEPROPERTY     )CLCC_DYNLIB_IMPORT(module, "clSetCommandQueueProperty");
-    __clewCreateBuffer                  = (PFNCLCREATEBUFFER                )CLCC_DYNLIB_IMPORT(module, "clCreateBuffer");
-    __clewCreateImage2D                 = (PFNCLCREATEIMAGE2D               )CLCC_DYNLIB_IMPORT(module, "clCreateImage2D");
-    __clewCreateImage3D                 = (PFNCLCREATEIMAGE3D               )CLCC_DYNLIB_IMPORT(module, "clCreateImage3D");
-    __clewRetainMemObject               = (PFNCLRETAINMEMOBJECT             )CLCC_DYNLIB_IMPORT(module, "clRetainMemObject");
-    __clewReleaseMemObject              = (PFNCLRELEASEMEMOBJECT            )CLCC_DYNLIB_IMPORT(module, "clReleaseMemObject");
-    __clewGetSupportedImageFormats      = (PFNCLGETSUPPORTEDIMAGEFORMATS    )CLCC_DYNLIB_IMPORT(module, "clGetSupportedImageFormats");
-    __clewGetMemObjectInfo              = (PFNCLGETMEMOBJECTINFO            )CLCC_DYNLIB_IMPORT(module, "clGetMemObjectInfo");
-    __clewGetImageInfo                  = (PFNCLGETIMAGEINFO                )CLCC_DYNLIB_IMPORT(module, "clGetImageInfo");
-    __clewCreateSampler                 = (PFNCLCREATESAMPLER               )CLCC_DYNLIB_IMPORT(module, "clCreateSampler");
-    __clewRetainSampler                 = (PFNCLRETAINSAMPLER               )CLCC_DYNLIB_IMPORT(module, "clRetainSampler");
-    __clewReleaseSampler                = (PFNCLRELEASESAMPLER              )CLCC_DYNLIB_IMPORT(module, "clReleaseSampler");
-    __clewGetSamplerInfo                = (PFNCLGETSAMPLERINFO              )CLCC_DYNLIB_IMPORT(module, "clGetSamplerInfo");
-    __clewCreateProgramWithSource       = (PFNCLCREATEPROGRAMWITHSOURCE     )CLCC_DYNLIB_IMPORT(module, "clCreateProgramWithSource");
-    __clewCreateProgramWithBinary       = (PFNCLCREATEPROGRAMWITHBINARY     )CLCC_DYNLIB_IMPORT(module, "clCreateProgramWithBinary");
-    __clewRetainProgram                 = (PFNCLRETAINPROGRAM               )CLCC_DYNLIB_IMPORT(module, "clRetainProgram");
-    __clewReleaseProgram                = (PFNCLRELEASEPROGRAM              )CLCC_DYNLIB_IMPORT(module, "clReleaseProgram");
-    __clewBuildProgram                  = (PFNCLBUILDPROGRAM                )CLCC_DYNLIB_IMPORT(module, "clBuildProgram");
-    __clewUnloadCompiler                = (PFNCLUNLOADCOMPILER              )CLCC_DYNLIB_IMPORT(module, "clUnloadCompiler");
-    __clewGetProgramInfo                = (PFNCLGETPROGRAMINFO              )CLCC_DYNLIB_IMPORT(module, "clGetProgramInfo");
-    __clewGetProgramBuildInfo           = (PFNCLGETPROGRAMBUILDINFO         )CLCC_DYNLIB_IMPORT(module, "clGetProgramBuildInfo");
-    __clewCreateKernel                  = (PFNCLCREATEKERNEL                )CLCC_DYNLIB_IMPORT(module, "clCreateKernel");
-    __clewCreateKernelsInProgram        = (PFNCLCREATEKERNELSINPROGRAM      )CLCC_DYNLIB_IMPORT(module, "clCreateKernelsInProgram");
-    __clewRetainKernel                  = (PFNCLRETAINKERNEL                )CLCC_DYNLIB_IMPORT(module, "clRetainKernel");
-    __clewReleaseKernel                 = (PFNCLRELEASEKERNEL               )CLCC_DYNLIB_IMPORT(module, "clReleaseKernel");
-    __clewSetKernelArg                  = (PFNCLSETKERNELARG                )CLCC_DYNLIB_IMPORT(module, "clSetKernelArg");
-    __clewGetKernelInfo                 = (PFNCLGETKERNELINFO               )CLCC_DYNLIB_IMPORT(module, "clGetKernelInfo");
-    __clewGetKernelWorkGroupInfo        = (PFNCLGETKERNELWORKGROUPINFO      )CLCC_DYNLIB_IMPORT(module, "clGetKernelWorkGroupInfo");
-    __clewWaitForEvents                 = (PFNCLWAITFOREVENTS               )CLCC_DYNLIB_IMPORT(module, "clWaitForEvents");
-    __clewGetEventInfo                  = (PFNCLGETEVENTINFO                )CLCC_DYNLIB_IMPORT(module, "clGetEventInfo");
-    __clewRetainEvent                   = (PFNCLRETAINEVENT                 )CLCC_DYNLIB_IMPORT(module, "clRetainEvent");
-    __clewReleaseEvent                  = (PFNCLRELEASEEVENT                )CLCC_DYNLIB_IMPORT(module, "clReleaseEvent");
-    __clewGetEventProfilingInfo         = (PFNCLGETEVENTPROFILINGINFO       )CLCC_DYNLIB_IMPORT(module, "clGetEventProfilingInfo");
-    __clewFlush                         = (PFNCLFLUSH                       )CLCC_DYNLIB_IMPORT(module, "clFlush");
-    __clewFinish                        = (PFNCLFINISH                      )CLCC_DYNLIB_IMPORT(module, "clFinish");
-    __clewEnqueueReadBuffer             = (PFNCLENQUEUEREADBUFFER           )CLCC_DYNLIB_IMPORT(module, "clEnqueueReadBuffer");
-    __clewEnqueueWriteBuffer            = (PFNCLENQUEUEWRITEBUFFER          )CLCC_DYNLIB_IMPORT(module, "clEnqueueWriteBuffer");
-    __clewEnqueueCopyBuffer             = (PFNCLENQUEUECOPYBUFFER           )CLCC_DYNLIB_IMPORT(module, "clEnqueueCopyBuffer");
-    __clewEnqueueReadImage              = (PFNCLENQUEUEREADIMAGE            )CLCC_DYNLIB_IMPORT(module, "clEnqueueReadImage");
-    __clewEnqueueWriteImage             = (PFNCLENQUEUEWRITEIMAGE           )CLCC_DYNLIB_IMPORT(module, "clEnqueueWriteImage");
-    __clewEnqueueCopyImage              = (PFNCLENQUEUECOPYIMAGE            )CLCC_DYNLIB_IMPORT(module, "clEnqueueCopyImage");
-    __clewEnqueueCopyImageToBuffer      = (PFNCLENQUEUECOPYIMAGETOBUFFER    )CLCC_DYNLIB_IMPORT(module, "clEnqueueCopyImageToBuffer");
-    __clewEnqueueCopyBufferToImage      = (PFNCLENQUEUECOPYBUFFERTOIMAGE    )CLCC_DYNLIB_IMPORT(module, "clEnqueueCopyBufferToImage");
-    __clewEnqueueMapBuffer              = (PFNCLENQUEUEMAPBUFFER            )CLCC_DYNLIB_IMPORT(module, "clEnqueueMapBuffer");
-    __clewEnqueueMapImage               = (PFNCLENQUEUEMAPIMAGE             )CLCC_DYNLIB_IMPORT(module, "clEnqueueMapImage");
-    __clewEnqueueUnmapMemObject         = (PFNCLENQUEUEUNMAPMEMOBJECT       )CLCC_DYNLIB_IMPORT(module, "clEnqueueUnmapMemObject");
-    __clewEnqueueNDRangeKernel          = (PFNCLENQUEUENDRANGEKERNEL        )CLCC_DYNLIB_IMPORT(module, "clEnqueueNDRangeKernel");
-    __clewEnqueueTask                   = (PFNCLENQUEUETASK                 )CLCC_DYNLIB_IMPORT(module, "clEnqueueTask");
-    __clewEnqueueNativeKernel           = (PFNCLENQUEUENATIVEKERNEL         )CLCC_DYNLIB_IMPORT(module, "clEnqueueNativeKernel");
-    __clewEnqueueMarker                 = (PFNCLENQUEUEMARKER               )CLCC_DYNLIB_IMPORT(module, "clEnqueueMarker");
-    __clewEnqueueWaitForEvents          = (PFNCLENQUEUEWAITFOREVENTS        )CLCC_DYNLIB_IMPORT(module, "clEnqueueWaitForEvents");
-    __clewEnqueueBarrier                = (PFNCLENQUEUEBARRIER              )CLCC_DYNLIB_IMPORT(module, "clEnqueueBarrier");
-    __clewGetExtensionFunctionAddress   = (PFNCLGETEXTENSIONFUNCTIONADDRESS )CLCC_DYNLIB_IMPORT(module, "clGetExtensionFunctionAddress");
+	//  Determine function entry-points
+	__clewGetPlatformIDs                = (PFNCLGETPLATFORMIDS              )CLCC_DYNLIB_IMPORT(module, "clGetPlatformIDs");
+	__clewGetPlatformInfo               = (PFNCLGETPLATFORMINFO             )CLCC_DYNLIB_IMPORT(module, "clGetPlatformInfo");
+	__clewGetDeviceIDs                  = (PFNCLGETDEVICEIDS                )CLCC_DYNLIB_IMPORT(module, "clGetDeviceIDs");
+	__clewGetDeviceInfo                 = (PFNCLGETDEVICEINFO               )CLCC_DYNLIB_IMPORT(module, "clGetDeviceInfo");
+	__clewCreateContext                 = (PFNCLCREATECONTEXT               )CLCC_DYNLIB_IMPORT(module, "clCreateContext");
+	__clewCreateContextFromType         = (PFNCLCREATECONTEXTFROMTYPE       )CLCC_DYNLIB_IMPORT(module, "clCreateContextFromType");
+	__clewRetainContext                 = (PFNCLRETAINCONTEXT               )CLCC_DYNLIB_IMPORT(module, "clRetainContext");
+	__clewReleaseContext                = (PFNCLRELEASECONTEXT              )CLCC_DYNLIB_IMPORT(module, "clReleaseContext");
+	__clewGetContextInfo                = (PFNCLGETCONTEXTINFO              )CLCC_DYNLIB_IMPORT(module, "clGetContextInfo");
+	__clewCreateCommandQueue            = (PFNCLCREATECOMMANDQUEUE          )CLCC_DYNLIB_IMPORT(module, "clCreateCommandQueue");
+	__clewRetainCommandQueue            = (PFNCLRETAINCOMMANDQUEUE          )CLCC_DYNLIB_IMPORT(module, "clRetainCommandQueue");
+	__clewReleaseCommandQueue           = (PFNCLRELEASECOMMANDQUEUE         )CLCC_DYNLIB_IMPORT(module, "clReleaseCommandQueue");
+	__clewGetCommandQueueInfo           = (PFNCLGETCOMMANDQUEUEINFO         )CLCC_DYNLIB_IMPORT(module, "clGetCommandQueueInfo");
+	__clewSetCommandQueueProperty       = (PFNCLSETCOMMANDQUEUEPROPERTY     )CLCC_DYNLIB_IMPORT(module, "clSetCommandQueueProperty");
+	__clewCreateBuffer                  = (PFNCLCREATEBUFFER                )CLCC_DYNLIB_IMPORT(module, "clCreateBuffer");
+	__clewCreateImage2D                 = (PFNCLCREATEIMAGE2D               )CLCC_DYNLIB_IMPORT(module, "clCreateImage2D");
+	__clewCreateImage3D                 = (PFNCLCREATEIMAGE3D               )CLCC_DYNLIB_IMPORT(module, "clCreateImage3D");
+	__clewRetainMemObject               = (PFNCLRETAINMEMOBJECT             )CLCC_DYNLIB_IMPORT(module, "clRetainMemObject");
+	__clewReleaseMemObject              = (PFNCLRELEASEMEMOBJECT            )CLCC_DYNLIB_IMPORT(module, "clReleaseMemObject");
+	__clewGetSupportedImageFormats      = (PFNCLGETSUPPORTEDIMAGEFORMATS    )CLCC_DYNLIB_IMPORT(module, "clGetSupportedImageFormats");
+	__clewGetMemObjectInfo              = (PFNCLGETMEMOBJECTINFO            )CLCC_DYNLIB_IMPORT(module, "clGetMemObjectInfo");
+	__clewGetImageInfo                  = (PFNCLGETIMAGEINFO                )CLCC_DYNLIB_IMPORT(module, "clGetImageInfo");
+	__clewCreateSampler                 = (PFNCLCREATESAMPLER               )CLCC_DYNLIB_IMPORT(module, "clCreateSampler");
+	__clewRetainSampler                 = (PFNCLRETAINSAMPLER               )CLCC_DYNLIB_IMPORT(module, "clRetainSampler");
+	__clewReleaseSampler                = (PFNCLRELEASESAMPLER              )CLCC_DYNLIB_IMPORT(module, "clReleaseSampler");
+	__clewGetSamplerInfo                = (PFNCLGETSAMPLERINFO              )CLCC_DYNLIB_IMPORT(module, "clGetSamplerInfo");
+	__clewCreateProgramWithSource       = (PFNCLCREATEPROGRAMWITHSOURCE     )CLCC_DYNLIB_IMPORT(module, "clCreateProgramWithSource");
+	__clewCreateProgramWithBinary       = (PFNCLCREATEPROGRAMWITHBINARY     )CLCC_DYNLIB_IMPORT(module, "clCreateProgramWithBinary");
+	__clewRetainProgram                 = (PFNCLRETAINPROGRAM               )CLCC_DYNLIB_IMPORT(module, "clRetainProgram");
+	__clewReleaseProgram                = (PFNCLRELEASEPROGRAM              )CLCC_DYNLIB_IMPORT(module, "clReleaseProgram");
+	__clewBuildProgram                  = (PFNCLBUILDPROGRAM                )CLCC_DYNLIB_IMPORT(module, "clBuildProgram");
+	__clewUnloadCompiler                = (PFNCLUNLOADCOMPILER              )CLCC_DYNLIB_IMPORT(module, "clUnloadCompiler");
+	__clewGetProgramInfo                = (PFNCLGETPROGRAMINFO              )CLCC_DYNLIB_IMPORT(module, "clGetProgramInfo");
+	__clewGetProgramBuildInfo           = (PFNCLGETPROGRAMBUILDINFO         )CLCC_DYNLIB_IMPORT(module, "clGetProgramBuildInfo");
+	__clewCreateKernel                  = (PFNCLCREATEKERNEL                )CLCC_DYNLIB_IMPORT(module, "clCreateKernel");
+	__clewCreateKernelsInProgram        = (PFNCLCREATEKERNELSINPROGRAM      )CLCC_DYNLIB_IMPORT(module, "clCreateKernelsInProgram");
+	__clewRetainKernel                  = (PFNCLRETAINKERNEL                )CLCC_DYNLIB_IMPORT(module, "clRetainKernel");
+	__clewReleaseKernel                 = (PFNCLRELEASEKERNEL               )CLCC_DYNLIB_IMPORT(module, "clReleaseKernel");
+	__clewSetKernelArg                  = (PFNCLSETKERNELARG                )CLCC_DYNLIB_IMPORT(module, "clSetKernelArg");
+	__clewGetKernelInfo                 = (PFNCLGETKERNELINFO               )CLCC_DYNLIB_IMPORT(module, "clGetKernelInfo");
+	__clewGetKernelWorkGroupInfo        = (PFNCLGETKERNELWORKGROUPINFO      )CLCC_DYNLIB_IMPORT(module, "clGetKernelWorkGroupInfo");
+	__clewWaitForEvents                 = (PFNCLWAITFOREVENTS               )CLCC_DYNLIB_IMPORT(module, "clWaitForEvents");
+	__clewGetEventInfo                  = (PFNCLGETEVENTINFO                )CLCC_DYNLIB_IMPORT(module, "clGetEventInfo");
+	__clewRetainEvent                   = (PFNCLRETAINEVENT                 )CLCC_DYNLIB_IMPORT(module, "clRetainEvent");
+	__clewReleaseEvent                  = (PFNCLRELEASEEVENT                )CLCC_DYNLIB_IMPORT(module, "clReleaseEvent");
+	__clewGetEventProfilingInfo         = (PFNCLGETEVENTPROFILINGINFO       )CLCC_DYNLIB_IMPORT(module, "clGetEventProfilingInfo");
+	__clewFlush                         = (PFNCLFLUSH                       )CLCC_DYNLIB_IMPORT(module, "clFlush");
+	__clewFinish                        = (PFNCLFINISH                      )CLCC_DYNLIB_IMPORT(module, "clFinish");
+	__clewEnqueueReadBuffer             = (PFNCLENQUEUEREADBUFFER           )CLCC_DYNLIB_IMPORT(module, "clEnqueueReadBuffer");
+	__clewEnqueueWriteBuffer            = (PFNCLENQUEUEWRITEBUFFER          )CLCC_DYNLIB_IMPORT(module, "clEnqueueWriteBuffer");
+	__clewEnqueueCopyBuffer             = (PFNCLENQUEUECOPYBUFFER           )CLCC_DYNLIB_IMPORT(module, "clEnqueueCopyBuffer");
+	__clewEnqueueReadImage              = (PFNCLENQUEUEREADIMAGE            )CLCC_DYNLIB_IMPORT(module, "clEnqueueReadImage");
+	__clewEnqueueWriteImage             = (PFNCLENQUEUEWRITEIMAGE           )CLCC_DYNLIB_IMPORT(module, "clEnqueueWriteImage");
+	__clewEnqueueCopyImage              = (PFNCLENQUEUECOPYIMAGE            )CLCC_DYNLIB_IMPORT(module, "clEnqueueCopyImage");
+	__clewEnqueueCopyImageToBuffer      = (PFNCLENQUEUECOPYIMAGETOBUFFER    )CLCC_DYNLIB_IMPORT(module, "clEnqueueCopyImageToBuffer");
+	__clewEnqueueCopyBufferToImage      = (PFNCLENQUEUECOPYBUFFERTOIMAGE    )CLCC_DYNLIB_IMPORT(module, "clEnqueueCopyBufferToImage");
+	__clewEnqueueMapBuffer              = (PFNCLENQUEUEMAPBUFFER            )CLCC_DYNLIB_IMPORT(module, "clEnqueueMapBuffer");
+	__clewEnqueueMapImage               = (PFNCLENQUEUEMAPIMAGE             )CLCC_DYNLIB_IMPORT(module, "clEnqueueMapImage");
+	__clewEnqueueUnmapMemObject         = (PFNCLENQUEUEUNMAPMEMOBJECT       )CLCC_DYNLIB_IMPORT(module, "clEnqueueUnmapMemObject");
+	__clewEnqueueNDRangeKernel          = (PFNCLENQUEUENDRANGEKERNEL        )CLCC_DYNLIB_IMPORT(module, "clEnqueueNDRangeKernel");
+	__clewEnqueueTask                   = (PFNCLENQUEUETASK                 )CLCC_DYNLIB_IMPORT(module, "clEnqueueTask");
+	__clewEnqueueNativeKernel           = (PFNCLENQUEUENATIVEKERNEL         )CLCC_DYNLIB_IMPORT(module, "clEnqueueNativeKernel");
+	__clewEnqueueMarker                 = (PFNCLENQUEUEMARKER               )CLCC_DYNLIB_IMPORT(module, "clEnqueueMarker");
+	__clewEnqueueWaitForEvents          = (PFNCLENQUEUEWAITFOREVENTS        )CLCC_DYNLIB_IMPORT(module, "clEnqueueWaitForEvents");
+	__clewEnqueueBarrier                = (PFNCLENQUEUEBARRIER              )CLCC_DYNLIB_IMPORT(module, "clEnqueueBarrier");
+	__clewGetExtensionFunctionAddress   = (PFNCLGETEXTENSIONFUNCTIONADDRESS )CLCC_DYNLIB_IMPORT(module, "clGetExtensionFunctionAddress");
 
 	if(__clewGetPlatformIDs == NULL)
 		return 0;
 
-    return 1;
+	return 1;
 }
 
 //! \param error CL error code
 //! \return a string representation of the error code
 const char *clErrorString(cl_int error)
 {
-    static const char* strings[] =
-    {
-        // Error Codes
-          "CL_SUCCESS"                                  //   0
-        , "CL_DEVICE_NOT_FOUND"                         //  -1
-        , "CL_DEVICE_NOT_AVAILABLE"                     //  -2
-        , "CL_COMPILER_NOT_AVAILABLE"                   //  -3
-        , "CL_MEM_OBJECT_ALLOCATION_FAILURE"            //  -4
-        , "CL_OUT_OF_RESOURCES"                         //  -5
-        , "CL_OUT_OF_HOST_MEMORY"                       //  -6
-        , "CL_PROFILING_INFO_NOT_AVAILABLE"             //  -7
-        , "CL_MEM_COPY_OVERLAP"                         //  -8
-        , "CL_IMAGE_FORMAT_MISMATCH"                    //  -9
-        , "CL_IMAGE_FORMAT_NOT_SUPPORTED"               //  -10
-        , "CL_BUILD_PROGRAM_FAILURE"                    //  -11
-        , "CL_MAP_FAILURE"                              //  -12
+	static const char* strings[] =
+	{
+	    // Error Codes
+	    "CL_SUCCESS"                                  //   0
+	    , "CL_DEVICE_NOT_FOUND"                         //  -1
+	    , "CL_DEVICE_NOT_AVAILABLE"                     //  -2
+	    , "CL_COMPILER_NOT_AVAILABLE"                   //  -3
+	    , "CL_MEM_OBJECT_ALLOCATION_FAILURE"            //  -4
+	    , "CL_OUT_OF_RESOURCES"                         //  -5
+	    , "CL_OUT_OF_HOST_MEMORY"                       //  -6
+	    , "CL_PROFILING_INFO_NOT_AVAILABLE"             //  -7
+	    , "CL_MEM_COPY_OVERLAP"                         //  -8
+	    , "CL_IMAGE_FORMAT_MISMATCH"                    //  -9
+	    , "CL_IMAGE_FORMAT_NOT_SUPPORTED"               //  -10
+	    , "CL_BUILD_PROGRAM_FAILURE"                    //  -11
+	    , "CL_MAP_FAILURE"                              //  -12
 
-        , ""    //  -13
-        , ""    //  -14
-        , ""    //  -15
-        , ""    //  -16
-        , ""    //  -17
-        , ""    //  -18
-        , ""    //  -19
+	    , ""    //  -13
+	    , ""    //  -14
+	    , ""    //  -15
+	    , ""    //  -16
+	    , ""    //  -17
+	    , ""    //  -18
+	    , ""    //  -19
 
-        , ""    //  -20
-        , ""    //  -21
-        , ""    //  -22
-        , ""    //  -23
-        , ""    //  -24
-        , ""    //  -25
-        , ""    //  -26
-        , ""    //  -27
-        , ""    //  -28
-        , ""    //  -29
+	    , ""    //  -20
+	    , ""    //  -21
+	    , ""    //  -22
+	    , ""    //  -23
+	    , ""    //  -24
+	    , ""    //  -25
+	    , ""    //  -26
+	    , ""    //  -27
+	    , ""    //  -28
+	    , ""    //  -29
 
-        , "CL_INVALID_VALUE"                            //  -30
-        , "CL_INVALID_DEVICE_TYPE"                      //  -31
-        , "CL_INVALID_PLATFORM"                         //  -32
-        , "CL_INVALID_DEVICE"                           //  -33
-        , "CL_INVALID_CONTEXT"                          //  -34
-        , "CL_INVALID_QUEUE_PROPERTIES"                 //  -35
-        , "CL_INVALID_COMMAND_QUEUE"                    //  -36
-        , "CL_INVALID_HOST_PTR"                         //  -37
-        , "CL_INVALID_MEM_OBJECT"                       //  -38
-        , "CL_INVALID_IMAGE_FORMAT_DESCRIPTOR"          //  -39
-        , "CL_INVALID_IMAGE_SIZE"                       //  -40
-        , "CL_INVALID_SAMPLER"                          //  -41
-        , "CL_INVALID_BINARY"                           //  -42
-        , "CL_INVALID_BUILD_OPTIONS"                    //  -43
-        , "CL_INVALID_PROGRAM"                          //  -44
-        , "CL_INVALID_PROGRAM_EXECUTABLE"               //  -45
-        , "CL_INVALID_KERNEL_NAME"                      //  -46
-        , "CL_INVALID_KERNEL_DEFINITION"                //  -47
-        , "CL_INVALID_KERNEL"                           //  -48
-        , "CL_INVALID_ARG_INDEX"                        //  -49
-        , "CL_INVALID_ARG_VALUE"                        //  -50
-        , "CL_INVALID_ARG_SIZE"                         //  -51
-        , "CL_INVALID_KERNEL_ARGS"                      //  -52
-        , "CL_INVALID_WORK_DIMENSION"                   //  -53
-        , "CL_INVALID_WORK_GROUP_SIZE"                  //  -54
-        , "CL_INVALID_WORK_ITEM_SIZE"                   //  -55
-        , "CL_INVALID_GLOBAL_OFFSET"                    //  -56
-        , "CL_INVALID_EVENT_WAIT_LIST"                  //  -57
-        , "CL_INVALID_EVENT"                            //  -58
-        , "CL_INVALID_OPERATION"                        //  -59
-        , "CL_INVALID_GL_OBJECT"                        //  -60
-        , "CL_INVALID_BUFFER_SIZE"                      //  -61
-        , "CL_INVALID_MIP_LEVEL"                        //  -62
-        , "CL_INVALID_GLOBAL_WORK_SIZE"                 //  -63
-    };
+	    , "CL_INVALID_VALUE"                            //  -30
+	    , "CL_INVALID_DEVICE_TYPE"                      //  -31
+	    , "CL_INVALID_PLATFORM"                         //  -32
+	    , "CL_INVALID_DEVICE"                           //  -33
+	    , "CL_INVALID_CONTEXT"                          //  -34
+	    , "CL_INVALID_QUEUE_PROPERTIES"                 //  -35
+	    , "CL_INVALID_COMMAND_QUEUE"                    //  -36
+	    , "CL_INVALID_HOST_PTR"                         //  -37
+	    , "CL_INVALID_MEM_OBJECT"                       //  -38
+	    , "CL_INVALID_IMAGE_FORMAT_DESCRIPTOR"          //  -39
+	    , "CL_INVALID_IMAGE_SIZE"                       //  -40
+	    , "CL_INVALID_SAMPLER"                          //  -41
+	    , "CL_INVALID_BINARY"                           //  -42
+	    , "CL_INVALID_BUILD_OPTIONS"                    //  -43
+	    , "CL_INVALID_PROGRAM"                          //  -44
+	    , "CL_INVALID_PROGRAM_EXECUTABLE"               //  -45
+	    , "CL_INVALID_KERNEL_NAME"                      //  -46
+	    , "CL_INVALID_KERNEL_DEFINITION"                //  -47
+	    , "CL_INVALID_KERNEL"                           //  -48
+	    , "CL_INVALID_ARG_INDEX"                        //  -49
+	    , "CL_INVALID_ARG_VALUE"                        //  -50
+	    , "CL_INVALID_ARG_SIZE"                         //  -51
+	    , "CL_INVALID_KERNEL_ARGS"                      //  -52
+	    , "CL_INVALID_WORK_DIMENSION"                   //  -53
+	    , "CL_INVALID_WORK_GROUP_SIZE"                  //  -54
+	    , "CL_INVALID_WORK_ITEM_SIZE"                   //  -55
+	    , "CL_INVALID_GLOBAL_OFFSET"                    //  -56
+	    , "CL_INVALID_EVENT_WAIT_LIST"                  //  -57
+	    , "CL_INVALID_EVENT"                            //  -58
+	    , "CL_INVALID_OPERATION"                        //  -59
+	    , "CL_INVALID_GL_OBJECT"                        //  -60
+	    , "CL_INVALID_BUFFER_SIZE"                      //  -61
+	    , "CL_INVALID_MIP_LEVEL"                        //  -62
+	    , "CL_INVALID_GLOBAL_WORK_SIZE"                 //  -63
+	};
 
-    return strings[-error];
+	return strings[-error];
 }
 
 CCL_NAMESPACE_END
diff --git a/intern/cycles/util/util_opencl.h b/intern/cycles/util/util_opencl.h
index 2e97097ef36..5f3f1667bcc 100644
--- a/intern/cycles/util/util_opencl.h
+++ b/intern/cycles/util/util_opencl.h
@@ -36,27 +36,27 @@ CCL_NAMESPACE_BEGIN
 #endif  //  CLCC_GENERATE_DOCUMENTATION
 
 /*******************************************************************************
-* Copyright (c) 2008-2009 The Khronos Group Inc.
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
-* copy of this software and/or associated documentation files (the
-* "Materials"), to deal in the Materials without restriction, including
-* without limitation the rights to use, copy, modify, merge, publish,
-* distribute, sublicense, and/or sell copies of the Materials, and to
-* permit persons to whom the Materials are furnished to do so, subject to
-* the following conditions:
-*
-* The above copyright notice and this permission notice shall be included
-* in all copies or substantial portions of the Materials.
-*
-* THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-* MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-******************************************************************************/
+ * Copyright (c) 2008-2009 The Khronos Group Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and/or associated documentation files (the
+ * "Materials"), to deal in the Materials without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Materials, and to
+ * permit persons to whom the Materials are furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Materials.
+ *
+ * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+ ******************************************************************************/
 
 #ifndef CLCC_GENERATE_DOCUMENTATION
 
@@ -88,20 +88,20 @@ typedef double                  cl_double;
 
 
 /*
-* Vector types 
-*
-*  Note:   OpenCL requires that all types be naturally aligned. 
-*          This means that vector types must be naturally aligned.
-*          For example, a vector of four floats must be aligned to
-*          a 16 byte boundary (calculated as 4 * the natural 4-byte 
-*          alignment of the float).  The alignment qualifiers here
-*          will only function properly if your compiler supports them
-*          and if you don't actively work to defeat them.  For example,
-*          in order for a cl_float4 to be 16 byte aligned in a struct,
-*          the start of the struct must itself be 16-byte aligned. 
-*
-*          Maintaining proper alignment is the user's responsibility.
-*/
+ * Vector types
+ *
+ *  Note:   OpenCL requires that all types be naturally aligned.
+ *          This means that vector types must be naturally aligned.
+ *          For example, a vector of four floats must be aligned to
+ *          a 16 byte boundary (calculated as 4 * the natural 4-byte
+ *          alignment of the float).  The alignment qualifiers here
+ *          will only function properly if your compiler supports them
+ *          and if you don't actively work to defeat them.  For example,
+ *          in order for a cl_float4 to be 16 byte aligned in a struct,
+ *          the start of the struct must itself be 16-byte aligned.
+ *
+ *          Maintaining proper alignment is the user's responsibility.
+ */
 typedef signed   __int8          cl_char2[2];
 typedef signed   __int8          cl_char4[4];
 typedef signed   __int8          cl_char8[8];
@@ -168,20 +168,20 @@ typedef float           cl_float    __attribute__((aligned(4)));
 typedef double          cl_double   __attribute__((aligned(8)));
 
 /*
-* Vector types 
-*
-*  Note:   OpenCL requires that all types be naturally aligned. 
-*          This means that vector types must be naturally aligned.
-*          For example, a vector of four floats must be aligned to
-*          a 16 byte boundary (calculated as 4 * the natural 4-byte 
-*          alignment of the float).  The alignment qualifiers here
-*          will only function properly if your compiler supports them
-*          and if you don't actively work to defeat them.  For example,
-*          in order for a cl_float4 to be 16 byte aligned in a struct,
-*          the start of the struct must itself be 16-byte aligned. 
-*
-*          Maintaining proper alignment is the user's responsibility.
-*/
+ * Vector types
+ *
+ *  Note:   OpenCL requires that all types be naturally aligned.
+ *          This means that vector types must be naturally aligned.
+ *          For example, a vector of four floats must be aligned to
+ *          a 16 byte boundary (calculated as 4 * the natural 4-byte
+ *          alignment of the float).  The alignment qualifiers here
+ *          will only function properly if your compiler supports them
+ *          and if you don't actively work to defeat them.  For example,
+ *          in order for a cl_float4 to be 16 byte aligned in a struct,
+ *          the start of the struct must itself be 16-byte aligned.
+ *
+ *          Maintaining proper alignment is the user's responsibility.
+ */
 typedef int8_t          cl_char2[2]     __attribute__((aligned(2)));
 typedef int8_t          cl_char4[4]     __attribute__((aligned(4)));
 typedef int8_t          cl_char8[8]     __attribute__((aligned(8)));
@@ -339,8 +339,8 @@ typedef cl_uint             cl_command_type;
 typedef cl_uint             cl_profiling_info;
 
 typedef struct _cl_image_format {
-    cl_channel_order        image_channel_order;
-    cl_channel_type         image_channel_data_type;
+	cl_channel_order        image_channel_order;
+	cl_channel_type         image_channel_data_type;
 } cl_image_format;
 
 
diff --git a/intern/cycles/util/util_path.cpp b/intern/cycles/util/util_path.cpp
index 69069a3bbce..717aa34c426 100644
--- a/intern/cycles/util/util_path.cpp
+++ b/intern/cycles/util/util_path.cpp
@@ -179,8 +179,8 @@ static bool path_read_text(const string& path, string& text)
 string path_source_replace_includes(const string& source_, const string& path)
 {
 	/* our own little c preprocessor that replaces #includes with the file
-	   contents, to work around issue of opencl drivers not supporting
-	   include paths with spaces in them */
+	 * contents, to work around issue of opencl drivers not supporting
+	 * include paths with spaces in them */
 	string source = source_;
 	const string include = "#include \"";
 	size_t n, pos = 0;
diff --git a/intern/cycles/util/util_system.cpp b/intern/cycles/util/util_system.cpp
index e8c81e57654..2d9f0fffae6 100644
--- a/intern/cycles/util/util_system.cpp
+++ b/intern/cycles/util/util_system.cpp
@@ -149,10 +149,12 @@ bool system_cpu_support_optimized()
 		__cpuid(result, 0);
 		num = result[0];
 
-		/*__cpuid(result, 0x80000000);
-		num_ex = result[0];*/
+#if 0
+		__cpuid(result, 0x80000000);
+		num_ex = result[0];
+#endif
 
-		if(num >= 1){
+		if(num >= 1) {
 			__cpuid(result, 0x00000001);
 			caps.mmx = (result[3] & ((int)1 << 23)) != 0;
 			caps.sse = (result[3] & ((int)1 << 25)) != 0;
@@ -167,13 +169,15 @@ bool system_cpu_support_optimized()
 			caps.fma3 = (result[2] & ((int)1 << 12)) != 0;
 		}
 
-		/*if(num_ex >= 0x80000001){
+#if 0
+		if(num_ex >= 0x80000001) {
 			__cpuid(result, 0x80000001);
 			caps.x64 = (result[3] & ((int)1 << 29)) != 0;
 			caps.sse4a = (result[2] & ((int)1 <<  6)) != 0;
 			caps.fma4 = (result[2] & ((int)1 << 16)) != 0;
 			caps.xop = (result[2] & ((int)1 << 11)) != 0;
-		}*/
+		}
+#endif
 
 		caps_init = true;
 	}
diff --git a/intern/cycles/util/util_task.cpp b/intern/cycles/util/util_task.cpp
index 023630e8fae..ea0abd6f54f 100644
--- a/intern/cycles/util/util_task.cpp
+++ b/intern/cycles/util/util_task.cpp
@@ -164,7 +164,7 @@ void TaskScheduler::init(int num_threads)
 	thread_scoped_lock lock(mutex);
 
 	/* multiple cycles instances can use this task scheduler, sharing the same
-	   threads, so we keep track of the number of users. */
+	 * threads, so we keep track of the number of users. */
 	if(users == 0) {
 		do_exit = false;
 
diff --git a/intern/cycles/util/util_thread.h b/intern/cycles/util/util_thread.h
index 3d15b342fe5..9bea4e7808a 100644
--- a/intern/cycles/util/util_thread.h
+++ b/intern/cycles/util/util_thread.h
@@ -34,7 +34,7 @@ typedef boost::mutex::scoped_lock thread_scoped_lock;
 typedef boost::condition_variable thread_condition_variable;
 
 /* own pthread based implementation, to avoid boost version conflicts with
-   dynamically loaded blender plugins */
+ * dynamically loaded blender plugins */
 
 class thread {
 public:
@@ -54,7 +54,7 @@ public:
 
 	static void *run(void *arg)
 	{
-		((thread*)arg)->run_cb();;
+		((thread*)arg)->run_cb();
 		return NULL;
 	}
 
diff --git a/intern/cycles/util/util_transform.cpp b/intern/cycles/util/util_transform.cpp
index 1780994da27..b3c6506dfa0 100644
--- a/intern/cycles/util/util_transform.cpp
+++ b/intern/cycles/util/util_transform.cpp
@@ -139,7 +139,7 @@ Transform transform_inverse(const Transform& tfm)
 
 	if(!transform_matrix4_gj_inverse(R, M)) {
 		/* matrix is degenerate (e.g. 0 scale on some axis), ideally we should
-		   never be in this situation, but try to invert it anyway with tweak */
+		 * never be in this situation, but try to invert it anyway with tweak */
 		M[0][0] += 1e-8f;
 		M[1][1] += 1e-8f;
 		M[2][2] += 1e-8f;
@@ -160,15 +160,15 @@ static float4 transform_to_quat(const Transform& tfm)
 	double trace = tfm[0][0] + tfm[1][1] + tfm[2][2];
 	float4 qt;
 
-	if(trace > 0.0f) {
+	if(trace > 0.0) {
 		double s = sqrt(trace + 1.0);
 
 		qt.w = (float)(s/2.0);
 		s = 0.5/s;
 
-		qt.x = (float)((tfm[2][1] - tfm[1][2]) * s);
-		qt.y = (float)((tfm[0][2] - tfm[2][0]) * s);
-		qt.z = (float)((tfm[1][0] - tfm[0][1]) * s);
+		qt.x = (float)((double)(tfm[2][1] - tfm[1][2]) * s);
+		qt.y = (float)((double)(tfm[0][2] - tfm[2][0]) * s);
+		qt.z = (float)((double)(tfm[1][0] - tfm[0][1]) * s);
 	}
 	else {
 		int i = 0;
@@ -181,16 +181,16 @@ static float4 transform_to_quat(const Transform& tfm)
 		int j = (i + 1)%3;
 		int k = (j + 1)%3;
 
-		double s = sqrt((tfm[i][i] - (tfm[j][j] + tfm[k][k])) + 1.0);
+		double s = sqrt((double)(tfm[i][i] - (tfm[j][j] + tfm[k][k])) + 1.0);
 
 		double q[3];
 		q[i] = s * 0.5;
 		if(s != 0.0)
 			s = 0.5/s;
 
-		double w = (tfm[k][j] - tfm[j][k]) * s;
-		q[j] = (tfm[j][i] + tfm[i][j]) * s;
-		q[k] = (tfm[k][i] + tfm[i][k]) * s;
+		double w = (double)(tfm[k][j] - tfm[j][k]) * s;
+		q[j] = (double)(tfm[j][i] + tfm[i][j]) * s;
+		q[k] = (double)(tfm[k][i] + tfm[i][k]) * s;
 
 		qt.x = (float)q[0];
 		qt.y = (float)q[1];
diff --git a/intern/cycles/util/util_transform.h b/intern/cycles/util/util_transform.h
index e4897ee6787..d93bbff5415 100644
--- a/intern/cycles/util/util_transform.h
+++ b/intern/cycles/util/util_transform.h
@@ -61,16 +61,20 @@ __device_inline float3 transform_perspective(const Transform *t, const float3 a)
 
 __device_inline float3 transform_point(const Transform *t, const float3 a)
 {
-	float4 b = make_float4(a.x, a.y, a.z, 1.0f);
-	float3 c = make_float3(dot(t->x, b), dot(t->y, b), dot(t->z, b));
+	float3 c = make_float3(
+		a.x*t->x.x + a.y*t->x.y + a.z*t->x.z + t->x.w,
+		a.x*t->y.x + a.y*t->y.y + a.z*t->y.z + t->y.w,
+		a.x*t->z.x + a.y*t->z.y + a.z*t->z.z + t->z.w);
 
 	return c;
 }
 
 __device_inline float3 transform_direction(const Transform *t, const float3 a)
 {
-	float4 b = make_float4(a.x, a.y, a.z, 0.0f);
-	float3 c = make_float3(dot(t->x, b), dot(t->y, b), dot(t->z, b));
+	float3 c = make_float3(
+		a.x*t->x.x + a.y*t->x.y + a.z*t->x.z,
+		a.x*t->y.x + a.y*t->y.y + a.z*t->y.z,
+		a.x*t->z.x + a.y*t->z.y + a.z*t->z.z);
 
 	return c;
 }
@@ -251,7 +255,7 @@ Transform transform_inverse(const Transform& a);
 __device_inline bool transform_uniform_scale(const Transform& tfm, float& scale)
 {
 	/* the epsilon here is quite arbitrary, but this function is only used for
-	   surface area and bump, where we except it to not be so sensitive */
+	 * surface area and bump, where we except it to not be so sensitive */
 	Transform ttfm = transform_transpose(tfm);
 	float eps = 1e-6f; 
 	
diff --git a/intern/cycles/util/util_view.cpp b/intern/cycles/util/util_view.cpp
index 0b311b0331a..328c0c97391 100644
--- a/intern/cycles/util/util_view.cpp
+++ b/intern/cycles/util/util_view.cpp
@@ -55,7 +55,7 @@ static void view_display_text(int x, int y, const char *text)
 
 	glRasterPos3f(x, y, 0);
 
-	for(c=text; *c != '\0'; c++)
+	for(c = text; *c != '\0'; c++)
 		glutBitmapCharacter(GLUT_BITMAP_HELVETICA_10, *c);
 }
 
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index 277b14e2c66..e52ac0af2ed 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -143,6 +143,7 @@ if(WITH_HEADLESS OR WITH_GHOST_SDL)
 				intern/GHOST_SystemPathsCarbon.h
 			)
 		endif()
+
 	elseif(UNIX)
 		list(APPEND SRC
 			intern/GHOST_SystemPathsX11.cpp
@@ -152,13 +153,17 @@ if(WITH_HEADLESS OR WITH_GHOST_SDL)
 		if(NOT WITH_INSTALL_PORTABLE)
 			add_definitions(-DPREFIX="${CMAKE_INSTALL_PREFIX}")
 		endif()
-	elseif(WIN32)
 
+	elseif(WIN32)
 		list(APPEND SRC
 			intern/GHOST_SystemPathsWin32.cpp
 
 			intern/GHOST_SystemPathsWin32.h
 		)
+
+		list(APPEND INC
+			../utfconv
+		)
 	endif()
 
 	if(NOT WITH_HEADLESS)
diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h
index 7614cb80e00..8454f338645 100644
--- a/intern/ghost/GHOST_Types.h
+++ b/intern/ghost/GHOST_Types.h
@@ -56,8 +56,7 @@ typedef unsigned long long GHOST_TUns64;
 
 typedef void *GHOST_TUserDataPtr;
 
-typedef enum
-{
+typedef enum {
 	GHOST_kFailure = 0,
 	GHOST_kSuccess
 } GHOST_TSuccess;
diff --git a/intern/ghost/intern/GHOST_Debug.h b/intern/ghost/intern/GHOST_Debug.h
index a6392fce9bf..c364f1d26a4 100644
--- a/intern/ghost/intern/GHOST_Debug.h
+++ b/intern/ghost/intern/GHOST_Debug.h
@@ -51,8 +51,8 @@
 
 
 #ifdef GHOST_DEBUG
-#  define GHOST_PRINT(x) { std::cout << x; }
-#  define GHOST_PRINTF(x, ...) { printf(x, __VA_ARGS__); }
+#  define GHOST_PRINT(x) { std::cout << x; } (void)0
+#  define GHOST_PRINTF(x, ...) { printf(x, __VA_ARGS__); } (void)0
 #else  // GHOST_DEBUG
 #  define GHOST_PRINT(x)
 #  define GHOST_PRINTF(x, ...)
@@ -67,7 +67,7 @@
 	        GHOST_PRINT(info);                                                \
 	        GHOST_PRINT("\n");                                                \
 	    }                                                                     \
-	}
+	} (void)0
 #else  // GHOST_DEBUG
 #  define GHOST_ASSERT(x, info)
 #endif // GHOST_DEBUG
diff --git a/intern/ghost/intern/GHOST_DisplayManagerNULL.h b/intern/ghost/intern/GHOST_DisplayManagerNULL.h
index eb116e30d2d..4d5a0b008dc 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerNULL.h
+++ b/intern/ghost/intern/GHOST_DisplayManagerNULL.h
@@ -41,7 +41,7 @@ public:
 	GHOST_TSuccess getNumDisplaySettings( GHOST_TUns8 display, GHOST_TInt32& numSettings ) const{  return GHOST_kFailure; }
 	GHOST_TSuccess getDisplaySetting( GHOST_TUns8 display, GHOST_TInt32 index, GHOST_DisplaySetting& setting ) const { return GHOST_kFailure; }
 	GHOST_TSuccess getCurrentDisplaySetting( GHOST_TUns8 display, GHOST_DisplaySetting& setting ) const { return getDisplaySetting(display,GHOST_TInt32(0),setting); }
-	GHOST_TSuccess setCurrentDisplaySetting( GHOST_TUns8 display, const GHOST_DisplaySetting& setting ){ return GHOST_kSuccess; }
+	GHOST_TSuccess setCurrentDisplaySetting( GHOST_TUns8 display, const GHOST_DisplaySetting& setting ) { return GHOST_kSuccess; }
 
 private:
 	GHOST_SystemNULL * m_system;
diff --git a/intern/ghost/intern/GHOST_System.cpp b/intern/ghost/intern/GHOST_System.cpp
index ee21128ecbb..8c6491bcbfd 100644
--- a/intern/ghost/intern/GHOST_System.cpp
+++ b/intern/ghost/intern/GHOST_System.cpp
@@ -142,7 +142,7 @@ GHOST_TSuccess GHOST_System::beginFullScreen(const GHOST_DisplaySetting& setting
                                              const bool stereoVisual, const GHOST_TUns16 numOfAASamples)
 {
 	GHOST_TSuccess success = GHOST_kFailure;
-	GHOST_ASSERT(m_windowManager, "GHOST_System::beginFullScreen(): invalid window manager")
+	GHOST_ASSERT(m_windowManager, "GHOST_System::beginFullScreen(): invalid window manager");
 	if (m_displayManager) {
 		if (!m_windowManager->getFullScreen()) {
 			m_displayManager->getCurrentDisplaySetting(GHOST_DisplayManager::kMainDisplay, m_preFullScreenSetting);
@@ -184,12 +184,12 @@ GHOST_TSuccess GHOST_System::updateFullScreen(const GHOST_DisplaySetting& settin
 GHOST_TSuccess GHOST_System::endFullScreen(void)
 {
 	GHOST_TSuccess success = GHOST_kFailure;
-	GHOST_ASSERT(m_windowManager, "GHOST_System::endFullScreen(): invalid window manager")
+	GHOST_ASSERT(m_windowManager, "GHOST_System::endFullScreen(): invalid window manager");
 	if (m_windowManager->getFullScreen()) {
 		//GHOST_IWindow* window = m_windowManager->getFullScreenWindow();
 		//GHOST_PRINT("GHOST_System::endFullScreen(): leaving window manager full-screen mode\n");
 		success = m_windowManager->endFullScreen();
-		GHOST_ASSERT(m_displayManager, "GHOST_System::endFullScreen(): invalid display manager")
+		GHOST_ASSERT(m_displayManager, "GHOST_System::endFullScreen(): invalid display manager");
 		//GHOST_PRINT("GHOST_System::endFullScreen(): leaving full-screen mode\n");
 		success = m_displayManager->setCurrentDisplaySetting(GHOST_DisplayManager::kMainDisplay, m_preFullScreenSetting);
 	}
@@ -350,7 +350,7 @@ GHOST_TSuccess GHOST_System::exit()
 GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window **window, const bool stereoVisual, const GHOST_TUns16 numOfAASamples)
 {
 	GHOST_TSuccess success;
-	GHOST_ASSERT(m_displayManager, "GHOST_System::createFullScreenWindow(): invalid display manager")
+	GHOST_ASSERT(m_displayManager, "GHOST_System::createFullScreenWindow(): invalid display manager");
 	GHOST_DisplaySetting settings;
 
 	success = m_displayManager->getCurrentDisplaySetting(GHOST_DisplayManager::kMainDisplay, settings);
diff --git a/intern/ghost/intern/GHOST_SystemCarbon.cpp b/intern/ghost/intern/GHOST_SystemCarbon.cpp
index fc4ca8f8f61..1e53e7f4291 100644
--- a/intern/ghost/intern/GHOST_SystemCarbon.cpp
+++ b/intern/ghost/intern/GHOST_SystemCarbon.cpp
@@ -57,8 +57,6 @@
 #include "GHOST_NDOFManager.h"
 #include "AssertMacros.h"
 
-#define GHOST_KEY_SWITCH(mac, ghost) { case (mac): ghostKey = (ghost); break; }
-
 /* blender class and types events */
 enum {
 	kEventClassBlender              = 'blnd'
@@ -1027,7 +1025,7 @@ bool GHOST_SystemCarbon::handleMouseDown(EventRef event)
 			GHOST_ASSERT(ghostWindow, "GHOST_SystemCarbon::handleMouseEvent: ghostWindow==0");
 			if (::TrackGoAway(window, mousePos))
 			{
-				// todo: add option-close, because itÿs in the HIG
+				// todo: add option-close, because it's in the HIG
 				// if (event.modifiers & optionKey) {
 				// Close the clean documents, others will be confirmed one by one.
 				//}
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm
index 6013f3519ec..760dc0cbfd5 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -915,7 +915,7 @@ bool GHOST_SystemCocoa::processEvents(bool waitForEvent)
 				case NSFlagsChanged:
 					handleKeyEvent(event);
 					
-					/* Support system-wide keyboard shortcuts, like Exposé, ...) =>included in always NSApp sendEvent */
+					/* Support system-wide keyboard shortcuts, like Exposé, ...) =>included in always NSApp sendEvent */
 					/*		if (([event modifierFlags] & NSCommandKeyMask) || [event type] == NSFlagsChanged) {
 					 [NSApp sendEvent:event];
 					 }*/
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index 7a65c741532..a647f82a325 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -27,18 +27,12 @@
 
 /** \file ghost/intern/GHOST_SystemWin32.cpp
  *  \ingroup GHOST
+ *
+ * \author	Maarten Gribnau
  */
 
-
-/**
-
- * Copyright (C) 2001 NaN Technologies B.V.
- * @author	Maarten Gribnau
- * @date	May 7, 2001
- */
-
-#ifdef BF_GHOST_DEBUG
-#include <iostream>
+#ifdef WITH_GHOST_DEBUG
+#  include <iostream>
 #endif
 
 #include <stdio.h> // [mce] temporary debug, remove soon!
@@ -47,17 +41,18 @@
 #include "GHOST_EventDragnDrop.h"
 
 #ifndef _WIN32_IE
-#define _WIN32_IE 0x0501 /* shipped before XP, so doesn't impose additional requirements */
+#  define _WIN32_IE 0x0501 /* shipped before XP, so doesn't impose additional requirements */
 #endif
+
 #include <shlobj.h>
 #include <tlhelp32.h>
 
 // win64 doesn't define GWL_USERDATA
 #ifdef WIN32
-#ifndef GWL_USERDATA
-#define GWL_USERDATA GWLP_USERDATA
-#define GWL_WNDPROC GWLP_WNDPROC 
-#endif
+#  ifndef GWL_USERDATA
+#    define GWL_USERDATA GWLP_USERDATA
+#    define GWL_WNDPROC GWLP_WNDPROC
+#  endif
 #endif
 
 #include "utfconv.h"
@@ -389,11 +384,11 @@ GHOST_TSuccess GHOST_SystemWin32::init()
 	// Determine whether this system has a high frequency performance counter. */
 	m_hasPerformanceCounter = ::QueryPerformanceFrequency((LARGE_INTEGER *)&m_freq) == TRUE;
 	if (m_hasPerformanceCounter) {
-		GHOST_PRINT("GHOST_SystemWin32::init: High Frequency Performance Timer available\n")
+		GHOST_PRINT("GHOST_SystemWin32::init: High Frequency Performance Timer available\n");
 		::QueryPerformanceCounter((LARGE_INTEGER *)&m_start);
 	}
 	else {
-		GHOST_PRINT("GHOST_SystemWin32::init: High Frequency Performance Timer not available\n")
+		GHOST_PRINT("GHOST_SystemWin32::init: High Frequency Performance Timer not available\n");
 	}
 
 	if (success) {
@@ -885,7 +880,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
 
 	LRESULT lResult = 0;
 	GHOST_SystemWin32 *system = ((GHOST_SystemWin32 *)getSystem());
-	GHOST_ASSERT(system, "GHOST_SystemWin32::s_wndProc(): system not initialized")
+	GHOST_ASSERT(system, "GHOST_SystemWin32::s_wndProc(): system not initialized");
 
 	if (hwnd) {
 		GHOST_WindowWin32 *window = (GHOST_WindowWin32 *)::GetWindowLong(hwnd, GWL_USERDATA);
@@ -917,9 +912,9 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
 						case RIM_TYPEKEYBOARD:
 							event = processKeyEvent(window, raw);
 							if (!event) {
-								GHOST_PRINT("GHOST_SystemWin32::wndProc: key event ")
-								GHOST_PRINT(msg)
-								GHOST_PRINT(" key ignored\n")
+								GHOST_PRINT("GHOST_SystemWin32::wndProc: key event ");
+								GHOST_PRINT(msg);
+								GHOST_PRINT(" key ignored\n");
 							}
 							break;
 #ifdef WITH_INPUT_NDOF
@@ -1233,7 +1228,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
 		}
 		else {
 			// Event found for a window before the pointer to the class has been set.
-			GHOST_PRINT("GHOST_SystemWin32::wndProc: GHOST window event before creation\n")
+			GHOST_PRINT("GHOST_SystemWin32::wndProc: GHOST window event before creation\n");
 			/* These are events we typically miss at this point:
 			   WM_GETMINMAXINFO	0x24
 			   WM_NCCREATE			0x81
@@ -1245,7 +1240,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
 	}
 	else {
 		// Events without valid hwnd
-		GHOST_PRINT("GHOST_SystemWin32::wndProc: event without window\n")
+		GHOST_PRINT("GHOST_SystemWin32::wndProc: event without window\n");
 	}
 
 	if (event) {
diff --git a/intern/ghost/intern/GHOST_WindowCarbon.cpp b/intern/ghost/intern/GHOST_WindowCarbon.cpp
index 16e3cb49652..d67b02fce6b 100644
--- a/intern/ghost/intern/GHOST_WindowCarbon.cpp
+++ b/intern/ghost/intern/GHOST_WindowCarbon.cpp
@@ -221,7 +221,7 @@ bool GHOST_WindowCarbon::getValid() const
 
 void GHOST_WindowCarbon::setTitle(const STR_String& title)
 {
-	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::setTitle(): window invalid")
+	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::setTitle(): window invalid");
 	Str255 title255;
 	gen2mac(title, title255);
 	::SetWTitle(m_windowRef, title255);
@@ -230,7 +230,7 @@ void GHOST_WindowCarbon::setTitle(const STR_String& title)
 
 void GHOST_WindowCarbon::getTitle(STR_String& title) const
 {
-	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::getTitle(): window invalid")
+	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::getTitle(): window invalid");
 	Str255 title255;
 	::GetWTitle(m_windowRef, title255);
 	mac2gen(title255, title);
@@ -241,7 +241,7 @@ void GHOST_WindowCarbon::getWindowBounds(GHOST_Rect& bounds) const
 {
 	OSStatus success;
 	Rect rect;
-	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::getWindowBounds(): window invalid")
+	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::getWindowBounds(): window invalid");
 	success = ::GetWindowBounds(m_windowRef, kWindowStructureRgn, &rect);
 	bounds.m_b = rect.bottom;
 	bounds.m_l = rect.left;
@@ -253,7 +253,7 @@ void GHOST_WindowCarbon::getWindowBounds(GHOST_Rect& bounds) const
 void GHOST_WindowCarbon::getClientBounds(GHOST_Rect& bounds) const
 {
 	Rect rect;
-	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::getClientBounds(): window invalid")
+	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::getClientBounds(): window invalid");
 	//::GetPortBounds(m_grafPtr, &rect);
 	::GetWindowBounds(m_windowRef, kWindowContentRgn, &rect);
 
@@ -277,7 +277,7 @@ void GHOST_WindowCarbon::getClientBounds(GHOST_Rect& bounds) const
 
 GHOST_TSuccess GHOST_WindowCarbon::setClientWidth(GHOST_TUns32 width)
 {
-	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::setClientWidth(): window invalid")
+	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::setClientWidth(): window invalid");
 	GHOST_Rect cBnds, wBnds;
 	getClientBounds(cBnds);
 	if (((GHOST_TUns32)cBnds.getWidth()) != width) {
@@ -289,7 +289,7 @@ GHOST_TSuccess GHOST_WindowCarbon::setClientWidth(GHOST_TUns32 width)
 
 GHOST_TSuccess GHOST_WindowCarbon::setClientHeight(GHOST_TUns32 height)
 {
-	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::setClientHeight(): window invalid")
+	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::setClientHeight(): window invalid");
 	GHOST_Rect cBnds, wBnds;
 	getClientBounds(cBnds);
 #ifdef GHOST_DRAW_CARBON_GUTTER
@@ -307,7 +307,7 @@ GHOST_TSuccess GHOST_WindowCarbon::setClientHeight(GHOST_TUns32 height)
 
 GHOST_TSuccess GHOST_WindowCarbon::setClientSize(GHOST_TUns32 width, GHOST_TUns32 height)
 {
-	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::setClientSize(): window invalid")
+	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::setClientSize(): window invalid");
 	GHOST_Rect cBnds, wBnds;
 	getClientBounds(cBnds);
 #ifdef GHOST_DRAW_CARBON_GUTTER
@@ -328,7 +328,7 @@ GHOST_TSuccess GHOST_WindowCarbon::setClientSize(GHOST_TUns32 width, GHOST_TUns3
 
 GHOST_TWindowState GHOST_WindowCarbon::getState() const
 {
-	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::getState(): window invalid")
+	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::getState(): window invalid");
 	GHOST_TWindowState state;
 	if (::IsWindowVisible(m_windowRef) == false) {
 		state = GHOST_kWindowStateMinimized;
@@ -345,7 +345,7 @@ GHOST_TWindowState GHOST_WindowCarbon::getState() const
 
 void GHOST_WindowCarbon::screenToClient(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY) const
 {
-	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::screenToClient(): window invalid")
+	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::screenToClient(): window invalid");
 	Point point;
 	point.h = inX;
 	point.v = inY;
@@ -361,7 +361,7 @@ void GHOST_WindowCarbon::screenToClient(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOS
 
 void GHOST_WindowCarbon::clientToScreen(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY) const
 {
-	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::clientToScreen(): window invalid")
+	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::clientToScreen(): window invalid");
 	Point point;
 	point.h = inX;
 	point.v = inY;
@@ -377,7 +377,7 @@ void GHOST_WindowCarbon::clientToScreen(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOS
 
 GHOST_TSuccess GHOST_WindowCarbon::setState(GHOST_TWindowState state)
 {
-	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::setState(): window invalid")
+	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::setState(): window invalid");
 	switch (state) {
 		case GHOST_kWindowStateMinimized:
 			::HideWindow(m_windowRef);
@@ -400,7 +400,7 @@ GHOST_TSuccess GHOST_WindowCarbon::setState(GHOST_TWindowState state)
 
 GHOST_TSuccess GHOST_WindowCarbon::setOrder(GHOST_TWindowOrder order)
 {
-	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::setOrder(): window invalid")
+	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::setOrder(): window invalid");
 	if (order == GHOST_kWindowOrderTop) {
 		//::BringToFront(m_windowRef); is wrong, front window should be active for input too
 		::SelectWindow(m_windowRef);
@@ -555,7 +555,7 @@ GHOST_TSuccess GHOST_WindowCarbon::removeDrawingContext()
 
 GHOST_TSuccess GHOST_WindowCarbon::invalidate()
 {
-	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::invalidate(): window invalid")
+	GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::invalidate(): window invalid");
 	if (!m_fullScreen) {
 		Rect rect;
 		::GetPortBounds(m_grafPtr, &rect);
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm
index b7d14873e7b..f94f08b1d13 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.mm
+++ b/intern/ghost/intern/GHOST_WindowCocoa.mm
@@ -482,7 +482,7 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(
 	i=0;
 	pixelFormatAttrsWindow[i++] = NSOpenGLPFADoubleBuffer;
 	
-	// Guarantees the back buffer contents to be valid after a call to NSOpenGLContext object’s flushBuffer
+	// Guarantees the back buffer contents to be valid after a call to NSOpenGLContext object's flushBuffer
 	// needed for 'Draw Overlap' drawing method
 	pixelFormatAttrsWindow[i++] = NSOpenGLPFABackingStore; 
 	
@@ -525,7 +525,7 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(
 		i=0;
 		pixelFormatAttrsWindow[i++] = NSOpenGLPFADoubleBuffer;
 		
-		// Guarantees the back buffer contents to be valid after a call to NSOpenGLContext object’s flushBuffer
+		// Guarantees the back buffer contents to be valid after a call to NSOpenGLContext object's flushBuffer
 		// needed for 'Draw Overlap' drawing method
 		pixelFormatAttrsWindow[i++] = NSOpenGLPFABackingStore;
 		
diff --git a/intern/ghost/intern/GHOST_WindowNULL.h b/intern/ghost/intern/GHOST_WindowNULL.h
index cde2cb0ba76..dcbb7d2b346 100644
--- a/intern/ghost/intern/GHOST_WindowNULL.h
+++ b/intern/ghost/intern/GHOST_WindowNULL.h
@@ -60,27 +60,27 @@ public:
 	}
 
 protected:
-	GHOST_TSuccess installDrawingContext( GHOST_TDrawingContextType type ){ return GHOST_kSuccess; }
-	GHOST_TSuccess removeDrawingContext( ){ return GHOST_kSuccess; }
-	GHOST_TSuccess setWindowCursorGrab( GHOST_TGrabCursorMode mode ){ return GHOST_kSuccess; }
-	GHOST_TSuccess setWindowCursorShape( GHOST_TStandardCursor shape ){ return GHOST_kSuccess; }
+	GHOST_TSuccess installDrawingContext( GHOST_TDrawingContextType type ) { return GHOST_kSuccess; }
+	GHOST_TSuccess removeDrawingContext( ) { return GHOST_kSuccess; }
+	GHOST_TSuccess setWindowCursorGrab( GHOST_TGrabCursorMode mode ) { return GHOST_kSuccess; }
+	GHOST_TSuccess setWindowCursorShape( GHOST_TStandardCursor shape ) { return GHOST_kSuccess; }
 	GHOST_TSuccess setWindowCustomCursorShape( GHOST_TUns8 bitmap[16][2], GHOST_TUns8 mask[16][2], int hotX, int hotY ) { return GHOST_kSuccess; }
-	GHOST_TSuccess setWindowCustomCursorShape( GHOST_TUns8 *bitmap, GHOST_TUns8 *mask, int sizex, int sizey, int hotX, int hotY, int fg_color, int bg_color ){ return GHOST_kSuccess; }
+	GHOST_TSuccess setWindowCustomCursorShape( GHOST_TUns8 *bitmap, GHOST_TUns8 *mask, int sizex, int sizey, int hotX, int hotY, int fg_color, int bg_color ) { return GHOST_kSuccess; }
 
 	bool getValid( ) const { return true; }
-	void setTitle( const STR_String& title ){ /* nothing */ }
+	void setTitle( const STR_String& title ) { /* nothing */ }
 	void getTitle( STR_String& title ) const { title= "untitled"; }
 	void getWindowBounds( GHOST_Rect& bounds ) const { getClientBounds(bounds); }
 	void getClientBounds( GHOST_Rect& bounds ) const { /* nothing */ }
-	GHOST_TSuccess setClientWidth( GHOST_TUns32 width ){ return GHOST_kFailure; }
-	GHOST_TSuccess setClientHeight( GHOST_TUns32 height ){ return GHOST_kFailure;  }
-	GHOST_TSuccess setClientSize( GHOST_TUns32 width, GHOST_TUns32 height ){ return GHOST_kFailure;  }
+	GHOST_TSuccess setClientWidth( GHOST_TUns32 width ) { return GHOST_kFailure; }
+	GHOST_TSuccess setClientHeight( GHOST_TUns32 height ) { return GHOST_kFailure;  }
+	GHOST_TSuccess setClientSize( GHOST_TUns32 width, GHOST_TUns32 height ) { return GHOST_kFailure;  }
 	void screenToClient( GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY ) const { outX = inX; outY = inY; }
 	void clientToScreen( GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY ) const { outX = inX; outY = inY; }
-	GHOST_TSuccess swapBuffers( ){ return GHOST_kFailure; }
-	GHOST_TSuccess activateDrawingContext( ){ return GHOST_kFailure; }
-	~GHOST_WindowNULL( ){ /* nothing */ }
-	GHOST_TSuccess setWindowCursorVisibility( bool visible ){ return GHOST_kSuccess; }
+	GHOST_TSuccess swapBuffers( ) { return GHOST_kFailure; }
+	GHOST_TSuccess activateDrawingContext( ) { return GHOST_kFailure; }
+	~GHOST_WindowNULL( ) { /* nothing */ }
+	GHOST_TSuccess setWindowCursorVisibility( bool visible ) { return GHOST_kSuccess; }
 	GHOST_TSuccess setState(GHOST_TWindowState state)  { return GHOST_kSuccess; }
 	GHOST_TWindowState getState() const	{ return GHOST_kWindowStateNormal; }
 	GHOST_TSuccess invalidate()  { return GHOST_kSuccess; }
diff --git a/intern/ghost/test/multitest/EventToBuf.c b/intern/ghost/test/multitest/EventToBuf.c
index f58d243fb0b..034fbe04447 100644
--- a/intern/ghost/test/multitest/EventToBuf.c
+++ b/intern/ghost/test/multitest/EventToBuf.c
@@ -34,8 +34,9 @@
 #include "GHOST_C-api.h"
 #include "EventToBuf.h"
 
-char *eventtype_to_string(GHOST_TEventType type) {
-	switch(type) {
+char *eventtype_to_string(GHOST_TEventType type)
+{
+	switch (type) {
 	case GHOST_kEventCursorMove:		return "CursorMove";
 	case GHOST_kEventButtonDown:		return "ButtonDown";
 	case GHOST_kEventButtonUp:			return "ButtonUp";
@@ -55,7 +56,8 @@ char *eventtype_to_string(GHOST_TEventType type) {
 	}
 }
 
-static char *keytype_to_string(GHOST_TKey key) {
+static char *keytype_to_string(GHOST_TKey key)
+{
 #define K(key)	case GHOST_k##key:	return #key;
 	switch (key) {
 	K(KeyBackSpace);
@@ -193,7 +195,8 @@ static char *keytype_to_string(GHOST_TKey key) {
 #undef K
 }
 
-void event_to_buf(GHOST_EventHandle evt, char buf[128]) {
+void event_to_buf(GHOST_EventHandle evt, char buf[128])
+{
 	GHOST_TEventType type= GHOST_GetEventType(evt);
 	double time= (double) ((GHOST_TInt64) GHOST_GetEventTime(evt))/1000;
 	GHOST_WindowHandle win= GHOST_GetEventWindow(evt);
diff --git a/intern/ghost/test/multitest/MultiTest.c b/intern/ghost/test/multitest/MultiTest.c
index 3f912ce1d33..da1c56d0a3a 100644
--- a/intern/ghost/test/multitest/MultiTest.c
+++ b/intern/ghost/test/multitest/MultiTest.c
@@ -75,7 +75,8 @@ void multitestapp_exit(MultiTestApp *app);
 
 /**/
 
-void rect_bevel_side(int rect[2][2], int side, float *lt, float *dk, float *col, int width) {
+void rect_bevel_side(int rect[2][2], int side, float *lt, float *dk, float *col, int width)
+{
 	int ltidx = (side / 2) % 4;
 	int dkidx = (ltidx + 1 + (side & 1)) % 4;
 	int i, corner;
@@ -107,7 +108,8 @@ void rect_bevel_side(int rect[2][2], int side, float *lt, float *dk, float *col,
 	glRecti(rect[0][0] + width, rect[0][1] + width, rect[1][0] - width, rect[1][1] - width);
 }
 
-void rect_bevel_smooth(int rect[2][2], int width) {
+void rect_bevel_smooth(int rect[2][2], int width)
+{
 	float *lt = malloc(sizeof(*lt) * width);
 	float *dk = malloc(sizeof(*dk) * width);
 	float col[4];
@@ -143,11 +145,13 @@ typedef struct {
 	int tmouse[2];
 } MainWindow;
 
-static void mainwindow_log(MainWindow *mw, char *str) {
+static void mainwindow_log(MainWindow *mw, char *str)
+{
 	loggerwindow_log(multitestapp_get_logger(mw->app), str);
 }
 
-static void mainwindow_do_draw(MainWindow *mw) {
+static void mainwindow_do_draw(MainWindow *mw)
+{
 	GHOST_ActivateWindowDrawingContext(mw->win);
 	
 	if (mw->lmbut[0]) {
@@ -164,7 +168,8 @@ static void mainwindow_do_draw(MainWindow *mw) {
 	GHOST_SwapWindowBuffers(mw->win);
 }
 
-static void mainwindow_do_reshape(MainWindow *mw) {
+static void mainwindow_do_reshape(MainWindow *mw)
+{
 	GHOST_RectangleHandle bounds = GHOST_GetClientBounds(mw->win);
 
 	GHOST_ActivateWindowDrawingContext(mw->win);
@@ -183,7 +188,8 @@ static void mainwindow_do_reshape(MainWindow *mw) {
 	glLoadIdentity();
 }
 
-static void mainwindow_do_key(MainWindow *mw, GHOST_TKey key, int press) {
+static void mainwindow_do_key(MainWindow *mw, GHOST_TKey key, int press)
+{
 	switch (key) {
 		case GHOST_kKeyC:
 			if (press)
@@ -226,7 +232,8 @@ static void mainwindow_do_key(MainWindow *mw, GHOST_TKey key, int press) {
 	}
 }
 
-static void mainwindow_do_move(MainWindow *mw, int x, int y) {
+static void mainwindow_do_move(MainWindow *mw, int x, int y)
+{
 	mw->lmouse[0] = x, mw->lmouse[1] = y;
 	
 	if (mw->lmbut[0]) {
@@ -235,7 +242,8 @@ static void mainwindow_do_move(MainWindow *mw, int x, int y) {
 	}
 }
 
-static void mainwindow_do_button(MainWindow *mw, int which, int press) {
+static void mainwindow_do_button(MainWindow *mw, int which, int press)
+{
 	if (which == GHOST_kButtonMaskLeft) {
 		mw->lmbut[0] = press;
 		mw->tmouse[0] = mw->lmouse[0], mw->tmouse[1] = mw->lmouse[1];
@@ -249,7 +257,8 @@ static void mainwindow_do_button(MainWindow *mw, int which, int press) {
 	}
 }
 
-static void mainwindow_handle(void *priv, GHOST_EventHandle evt) {
+static void mainwindow_handle(void *priv, GHOST_EventHandle evt)
+{
 	MainWindow *mw = priv;
 	GHOST_TEventType type = GHOST_GetEventType(evt);
 	char buf[256];
@@ -289,7 +298,8 @@ static void mainwindow_handle(void *priv, GHOST_EventHandle evt) {
 
 /**/
 
-static void mainwindow_timer_proc(GHOST_TimerTaskHandle task, GHOST_TUns64 time) {
+static void mainwindow_timer_proc(GHOST_TimerTaskHandle task, GHOST_TUns64 time)
+{
 	MainWindow *mw = GHOST_GetTimerTaskUserData(task);
 	char buf[64];
 	
@@ -321,7 +331,8 @@ MainWindow *mainwindow_new(MultiTestApp *app) {
 	}
 }
 
-void mainwindow_free(MainWindow *mw) {
+void mainwindow_free(MainWindow *mw)
+{
 	GHOST_SystemHandle sys = multitestapp_get_system(mw->app);
 
 	windowdata_free(GHOST_GetWindowUserData(mw->win));
@@ -362,7 +373,8 @@ struct _LoggerWindow {
 #define SCROLLBAR_PAD 2
 #define SCROLLBAR_WIDTH 14
 #define TEXTAREA_PAD 2
-static void loggerwindow_recalc_regions(LoggerWindow *lw) {
+static void loggerwindow_recalc_regions(LoggerWindow *lw)
+{
 	int nscroll[2][2];
 	
 	nscroll[0][0] = SCROLLBAR_PAD;
@@ -381,7 +393,8 @@ static void loggerwindow_recalc_regions(LoggerWindow *lw) {
 	scrollbar_set_rect(lw->scroll, nscroll);
 }
 
-static void loggerwindow_setup_window_gl(LoggerWindow *lw) {
+static void loggerwindow_setup_window_gl(LoggerWindow *lw)
+{
 	glViewport(0, 0, lw->size[0], lw->size[1]);
 
 	glMatrixMode(GL_PROJECTION);
@@ -393,7 +406,8 @@ static void loggerwindow_setup_window_gl(LoggerWindow *lw) {
 	glLoadIdentity();
 }
 
-static void loggerwindow_do_reshape(LoggerWindow *lw) {
+static void loggerwindow_do_reshape(LoggerWindow *lw)
+{
 	GHOST_RectangleHandle bounds = GHOST_GetClientBounds(lw->win);
 
 	GHOST_ActivateWindowDrawingContext(lw->win);
@@ -405,7 +419,8 @@ static void loggerwindow_do_reshape(LoggerWindow *lw) {
 	loggerwindow_setup_window_gl(lw);
 }
 
-static void loggerwindow_do_draw(LoggerWindow *lw) {
+static void loggerwindow_do_draw(LoggerWindow *lw)
+{
 	int i, ndisplines, startline;
 	int sb_rect[2][2], sb_thumb[2][2];
 		
@@ -472,7 +487,8 @@ static void loggerwindow_do_draw(LoggerWindow *lw) {
 	GHOST_SwapWindowBuffers(lw->win);
 }
 
-static void loggerwindow_do_move(LoggerWindow *lw, int x, int y) {
+static void loggerwindow_do_move(LoggerWindow *lw, int x, int y)
+{
 	lw->lmouse[0] = x, lw->lmouse[1] = y;
 	
 	if (scrollbar_is_scrolling(lw->scroll)) {
@@ -481,7 +497,8 @@ static void loggerwindow_do_move(LoggerWindow *lw, int x, int y) {
 	}
 }
 
-static void loggerwindow_do_button(LoggerWindow *lw, int which, int press) {
+static void loggerwindow_do_button(LoggerWindow *lw, int which, int press)
+{
 	if (which == GHOST_kButtonMaskLeft) {
 		lw->lmbut[0] = press;
 		
@@ -508,7 +525,8 @@ static void loggerwindow_do_button(LoggerWindow *lw, int which, int press) {
 	}
 }
 
-static void loggerwindow_do_key(LoggerWindow *lw, GHOST_TKey key, int press) {
+static void loggerwindow_do_key(LoggerWindow *lw, GHOST_TKey key, int press)
+{
 	switch (key) {
 		case GHOST_kKeyQ:
 			if (press)
@@ -517,7 +535,8 @@ static void loggerwindow_do_key(LoggerWindow *lw, GHOST_TKey key, int press) {
 	}
 }
 
-static void loggerwindow_handle(void *priv, GHOST_EventHandle evt) {
+static void loggerwindow_handle(void *priv, GHOST_EventHandle evt)
+{
 	LoggerWindow *lw = priv;
 	GHOST_TEventType type = GHOST_GetEventType(evt);
 	
@@ -597,7 +616,8 @@ LoggerWindow *loggerwindow_new(MultiTestApp *app) {
 	}
 }
 
-void loggerwindow_log(LoggerWindow *lw, char *line) {
+void loggerwindow_log(LoggerWindow *lw, char *line)
+{
 	if (lw->nloglines == lw->logsize) {
 		lw->loglines = memdbl(lw->loglines, &lw->logsize, sizeof(*lw->loglines));
 	}
@@ -608,7 +628,8 @@ void loggerwindow_log(LoggerWindow *lw, char *line) {
 	GHOST_InvalidateWindow(lw->win);
 }
 
-void loggerwindow_free(LoggerWindow *lw) {
+void loggerwindow_free(LoggerWindow *lw)
+{
 	GHOST_SystemHandle sys = multitestapp_get_system(lw->app);
 	int i;
 
@@ -635,7 +656,8 @@ typedef struct {
 	int size[2];
 } ExtraWindow;
 
-static void extrawindow_do_draw(ExtraWindow *ew) {
+static void extrawindow_do_draw(ExtraWindow *ew)
+{
 	GHOST_ActivateWindowDrawingContext(ew->win);
 
 	glClearColor(1, 1, 1, 1);
@@ -647,7 +669,8 @@ static void extrawindow_do_draw(ExtraWindow *ew) {
 	GHOST_SwapWindowBuffers(ew->win);
 }
 
-static void extrawindow_do_reshape(ExtraWindow *ew) {
+static void extrawindow_do_reshape(ExtraWindow *ew)
+{
 	GHOST_RectangleHandle bounds = GHOST_GetClientBounds(ew->win);
 
 	GHOST_ActivateWindowDrawingContext(ew->win);
@@ -666,7 +689,8 @@ static void extrawindow_do_reshape(ExtraWindow *ew) {
 	glLoadIdentity();
 }
 
-static void extrawindow_do_key(ExtraWindow *ew, GHOST_TKey key, int press) {
+static void extrawindow_do_key(ExtraWindow *ew, GHOST_TKey key, int press)
+{
 	switch (key) {
 		case GHOST_kKeyE:
 			if (press)
@@ -675,7 +699,8 @@ static void extrawindow_do_key(ExtraWindow *ew, GHOST_TKey key, int press) {
 	}
 }
 
-static void extrawindow_spin_cursor(ExtraWindow *ew, GHOST_TUns64 time) {
+static void extrawindow_spin_cursor(ExtraWindow *ew, GHOST_TUns64 time)
+{
 	GHOST_TUns8 bitmap[16][2];
 	GHOST_TUns8 mask[16][2];
 	double ftime = (double) ((GHOST_TInt64) time) / 1000;
@@ -707,7 +732,8 @@ static void extrawindow_spin_cursor(ExtraWindow *ew, GHOST_TUns64 time) {
 	GHOST_SetCustomCursorShape(ew->win, bitmap, mask, 0, 0);
 }
 
-static void extrawindow_handle(void *priv, GHOST_EventHandle evt) {
+static void extrawindow_handle(void *priv, GHOST_EventHandle evt)
+{
 	ExtraWindow *ew = priv;
 	GHOST_TEventType type = GHOST_GetEventType(evt);
 	char buf[256];
@@ -764,7 +790,8 @@ ExtraWindow *extrawindow_new(MultiTestApp *app) {
 	}
 }
 
-void extrawindow_free(ExtraWindow *ew) {
+void extrawindow_free(ExtraWindow *ew)
+{
 	GHOST_SystemHandle sys = multitestapp_get_system(ew->app);
 
 	windowdata_free(GHOST_GetWindowUserData(ew->win));
@@ -785,7 +812,8 @@ struct _MultiTestApp {
 	int exit;
 };
 
-static int multitest_event_handler(GHOST_EventHandle evt, GHOST_TUserDataPtr data) {
+static int multitest_event_handler(GHOST_EventHandle evt, GHOST_TUserDataPtr data)
+{
 	MultiTestApp *app = data;
 	GHOST_WindowHandle win;
 	
@@ -855,12 +883,14 @@ GHOST_SystemHandle multitestapp_get_system(MultiTestApp *app) {
 	return app->sys;
 }
 
-void multitestapp_free_extrawindow(MultiTestApp *app) {
+void multitestapp_free_extrawindow(MultiTestApp *app)
+{
 	extrawindow_free(app->extra);
 	app->extra = NULL;
 }
 
-void multitestapp_toggle_extra_window(MultiTestApp *app) {
+void multitestapp_toggle_extra_window(MultiTestApp *app)
+{
 	if (app->extra) {
 		multitestapp_free_extrawindow(app);
 	}
@@ -869,18 +899,21 @@ void multitestapp_toggle_extra_window(MultiTestApp *app) {
 	}
 }
 
-void multitestapp_exit(MultiTestApp *app) {
+void multitestapp_exit(MultiTestApp *app)
+{
 	app->exit = 1;
 }
 
-void multitestapp_run(MultiTestApp *app) {
+void multitestapp_run(MultiTestApp *app)
+{
 	while (!app->exit) {
 		GHOST_ProcessEvents(app->sys, 1);
 		GHOST_DispatchEvents(app->sys);
 	}
 }
 
-void multitestapp_free(MultiTestApp *app) {
+void multitestapp_free(MultiTestApp *app)
+{
 	mainwindow_free(app->main);
 	loggerwindow_free(app->logger);
 	GHOST_DisposeSystem(app->sys);
@@ -889,7 +922,8 @@ void multitestapp_free(MultiTestApp *app) {
 
 /***/
 	
-int main(int argc, char **argv) {
+int main(int argc, char **argv)
+{
 #ifndef USE_BMF
 	BLF_init(11, 72);
 #endif
diff --git a/intern/ghost/test/multitest/ScrollBar.c b/intern/ghost/test/multitest/ScrollBar.c
index a57300c38f0..8964d304920 100644
--- a/intern/ghost/test/multitest/ScrollBar.c
+++ b/intern/ghost/test/multitest/ScrollBar.c
@@ -96,7 +96,8 @@ int scrollbar_is_scrolling(ScrollBar *sb)
 {
 	return sb->scrolling;
 }
-int scrollbar_contains_pt(ScrollBar *sb, int pt[2]) {
+int scrollbar_contains_pt(ScrollBar *sb, int pt[2])
+{
 	return rect_contains_pt(sb->rect, pt);
 }
 
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c
index bb3a1c66ddc..f1a83583715 100644
--- a/intern/guardedalloc/intern/mallocn.c
+++ b/intern/guardedalloc/intern/mallocn.c
@@ -27,33 +27,28 @@
 
 /** \file guardedalloc/intern/mallocn.c
  *  \ingroup MEM
- */
-
-
-/**
-
- * Copyright (C) 2001 NaN Technologies B.V.
+ *
  * Guarded memory allocation, and boundary-write detection.
  */
 
 #include <stdlib.h>
-#include <string.h>	/* memcpy */
+#include <string.h> /* memcpy */
 #include <stdarg.h>
 #include <sys/types.h>
 /* Blame Microsoft for LLP64 and no inttypes.h, quick workaround needed: */
 #if defined(WIN64)
-#define SIZET_FORMAT "%I64u"
-#define SIZET_ARG(a) ((unsigned long long)(a))
+#  define SIZET_FORMAT "%I64u"
+#  define SIZET_ARG(a) ((unsigned long long)(a))
 #else
-#define SIZET_FORMAT "%lu"
-#define SIZET_ARG(a) ((unsigned long)(a))
+#  define SIZET_FORMAT "%lu"
+#  define SIZET_ARG(a) ((unsigned long)(a))
 #endif
 
 /* mmap exception */
 #if defined(WIN32)
-#include "mmap_win.h"
+#  include "mmap_win.h"
 #else
-#include <sys/mman.h>
+#  include <sys/mman.h>
 #endif
 
 #include "MEM_guardedalloc.h"
@@ -65,7 +60,8 @@
 // #define DEBUG_MEMCOUNTER
 
 #ifdef DEBUG_MEMCOUNTER
-#define DEBUG_MEMCOUNTER_ERROR_VAL 0 /* set this to the value that isn't being freed */
+   /* set this to the value that isn't being freed */
+#  define DEBUG_MEMCOUNTER_ERROR_VAL 0
 static int _mallocn_count = 0;
 
 /* breakpoint here */
@@ -79,25 +75,23 @@ static void memcount_raise(const char *name)
 /* Data definition                                                       */
 /* --------------------------------------------------------------------- */
 /* all memory chunks are put in linked lists */
-typedef struct localLink
-{
-	struct localLink *next,*prev;
+typedef struct localLink {
+	struct localLink *next, *prev;
 } localLink;
 
-typedef struct localListBase 
-{
+typedef struct localListBase {
 	void *first, *last;
 } localListBase;
 
-	/* note: keep this struct aligned (e.g., irix/gcc) - Hos */
+/* note: keep this struct aligned (e.g., irix/gcc) - Hos */
 typedef struct MemHead {
 	int tag1;
 	size_t len;
-	struct MemHead *next,*prev;
-	const char * name;
-	const char * nextname;
+	struct MemHead *next, *prev;
+	const char *name;
+	const char *nextname;
 	int tag2;
-	int mmap;	/* if true, memory was mmapped */
+	int mmap;  /* if true, memory was mmapped */
 #ifdef DEBUG_MEMCOUNTER
 	int _count;
 #endif
@@ -123,9 +117,9 @@ static const char *check_memlist(MemHead *memh);
 /* --------------------------------------------------------------------- */
 
 #ifdef __BIG_ENDIAN__
-#  define MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) )
+#  define MAKE_ID(a, b, c, d) ((int)(a) << 24 | (int)(b) << 16 | (c) << 8 | (d))
 #else
-#  define MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) )
+#  define MAKE_ID(a, b, c, d) ((int)(d) << 24 | (int)(c) << 16 | (b) << 8 | (a))
 #endif
 
 #define MEMTAG1 MAKE_ID('M', 'E', 'M', 'O')
@@ -133,15 +127,16 @@ static const char *check_memlist(MemHead *memh);
 #define MEMTAG3 MAKE_ID('O', 'C', 'K', '!')
 #define MEMFREE MAKE_ID('F', 'R', 'E', 'E')
 
-#define MEMNEXT(x) ((MemHead *)(((char *) x) - ((char *) & (((MemHead *)0)->next))))
+#define MEMNEXT(x) \
+	((MemHead *)(((char *) x) - ((char *) &(((MemHead *)0)->next))))
 	
 /* --------------------------------------------------------------------- */
 /* vars                                                                  */
 /* --------------------------------------------------------------------- */
 	
 
-static volatile int totblock= 0;
-static volatile uintptr_t mem_in_use= 0, mmap_in_use= 0, peak_mem = 0;
+static volatile int totblock = 0;
+static volatile uintptr_t mem_in_use = 0, mmap_in_use = 0, peak_mem = 0;
 
 static volatile struct localListBase _membase;
 static volatile struct localListBase *membase = &_membase;
@@ -149,7 +144,7 @@ static void (*error_callback)(const char *) = NULL;
 static void (*thread_lock_callback)(void) = NULL;
 static void (*thread_unlock_callback)(void) = NULL;
 
-static int malloc_debug_memset= 0;
+static int malloc_debug_memset = 0;
 
 #ifdef malloc
 #undef malloc
@@ -195,8 +190,8 @@ static void mem_unlock_thread(void)
 
 int MEM_check_memory_integrity(void)
 {
-	const char* err_val = NULL;
-	MemHead* listend;
+	const char *err_val = NULL;
+	MemHead *listend;
 	/* check_memlist starts from the front, and runs until it finds
 	 * the requested chunk. For this test, that's the last one. */
 	listend = membase->last;
@@ -221,32 +216,34 @@ void MEM_set_lock_callback(void (*lock)(void), void (*unlock)(void))
 
 void MEM_set_memory_debug(void)
 {
-	malloc_debug_memset= 1;
+	malloc_debug_memset = 1;
 }
 
 size_t MEM_allocN_len(void *vmemh)
 {
 	if (vmemh) {
-		MemHead *memh= vmemh;
+		MemHead *memh = vmemh;
 	
 		memh--;
 		return memh->len;
-	} else
+	}
+	else {
 		return 0;
+	}
 }
 
 void *MEM_dupallocN(void *vmemh)
 {
-	void *newp= NULL;
+	void *newp = NULL;
 	
 	if (vmemh) {
-		MemHead *memh= vmemh;
+		MemHead *memh = vmemh;
 		memh--;
 		
 		if (memh->mmap)
-			newp= MEM_mapallocN(memh->len, "dupli_mapalloc");
+			newp = MEM_mapallocN(memh->len, "dupli_mapalloc");
 		else
-			newp= MEM_mallocN(memh->len, "dupli_alloc");
+			newp = MEM_mallocN(memh->len, "dupli_alloc");
 
 		if (newp == NULL) return NULL;
 
@@ -258,13 +255,13 @@ void *MEM_dupallocN(void *vmemh)
 
 void *MEM_reallocN(void *vmemh, size_t len)
 {
-	void *newp= NULL;
+	void *newp = NULL;
 	
 	if (vmemh) {
-		MemHead *memh= vmemh;
+		MemHead *memh = vmemh;
 		memh--;
 
-		newp= MEM_mallocN(len, memh->name);
+		newp = MEM_mallocN(len, memh->name);
 		if (newp) {
 			if (len < memh->len)
 				memcpy(newp, vmemh, len);
@@ -292,8 +289,10 @@ static void make_memhead_header(MemHead *memh, size_t len, const char *str)
 	memt = (MemTail *)(((char *) memh) + sizeof(MemHead) + len);
 	memt->tag3 = MEMTAG3;
 	
-	addtail(membase,&memh->next);
-	if (memh->next) memh->nextname = MEMNEXT(memh->next)->name;
+	addtail(membase, &memh->next);
+	if (memh->next) {
+		memh->nextname = MEMNEXT(memh->next)->name;
+	}
 	
 	totblock++;
 	mem_in_use += len;
@@ -307,25 +306,26 @@ void *MEM_mallocN(size_t len, const char *str)
 
 	mem_lock_thread();
 
-	len = (len + 3 ) & ~3; 	/* allocate in units of 4 */
+	len = (len + 3) & ~3;   /* allocate in units of 4 */
 	
-	memh= (MemHead *)malloc(len+sizeof(MemHead)+sizeof(MemTail));
+	memh = (MemHead *)malloc(len + sizeof(MemHead) + sizeof(MemTail));
 
 	if (memh) {
 		make_memhead_header(memh, len, str);
 		mem_unlock_thread();
 		if (malloc_debug_memset && len)
-			memset(memh+1, 255, len);
+			memset(memh + 1, 255, len);
 
 #ifdef DEBUG_MEMCOUNTER
-		if (_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL)
+		if (_mallocn_count == DEBUG_MEMCOUNTER_ERROR_VAL)
 			memcount_raise(__func__);
-		memh->_count= _mallocn_count++;
+		memh->_count = _mallocn_count++;
 #endif
 		return (++memh);
 	}
 	mem_unlock_thread();
-	print_error("Malloc returns null: len=" SIZET_FORMAT " in %s, total %u\n", SIZET_ARG(len), str, mem_in_use);
+	print_error("Malloc returns null: len=" SIZET_FORMAT " in %s, total %u\n",
+	            SIZET_ARG(len), str, mem_in_use);
 	return NULL;
 }
 
@@ -335,22 +335,23 @@ void *MEM_callocN(size_t len, const char *str)
 
 	mem_lock_thread();
 
-	len = (len + 3 ) & ~3; 	/* allocate in units of 4 */
+	len = (len + 3) & ~3;   /* allocate in units of 4 */
 
-	memh= (MemHead *)calloc(len+sizeof(MemHead)+sizeof(MemTail),1);
+	memh = (MemHead *)calloc(len + sizeof(MemHead) + sizeof(MemTail), 1);
 
 	if (memh) {
 		make_memhead_header(memh, len, str);
 		mem_unlock_thread();
 #ifdef DEBUG_MEMCOUNTER
-		if (_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL)
+		if (_mallocn_count == DEBUG_MEMCOUNTER_ERROR_VAL)
 			memcount_raise(__func__);
-		memh->_count= _mallocn_count++;
+		memh->_count = _mallocn_count++;
 #endif
 		return (++memh);
 	}
 	mem_unlock_thread();
-	print_error("Calloc returns null: len=" SIZET_FORMAT " in %s, total %u\n", SIZET_ARG(len), str, mem_in_use);
+	print_error("Calloc returns null: len=" SIZET_FORMAT " in %s, total %u\n",
+	            SIZET_ARG(len), str, mem_in_use);
 	return NULL;
 }
 
@@ -361,27 +362,29 @@ void *MEM_mapallocN(size_t len, const char *str)
 
 	mem_lock_thread();
 	
-	len = (len + 3 ) & ~3; 	/* allocate in units of 4 */
+	len = (len + 3) & ~3;   /* allocate in units of 4 */
 
-	memh= mmap(NULL, len+sizeof(MemHead)+sizeof(MemTail),
-			PROT_READ|PROT_WRITE, MAP_SHARED|MAP_ANON, -1, 0);
+	memh = mmap(NULL, len + sizeof(MemHead) + sizeof(MemTail),
+	            PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
 
-	if (memh!=(MemHead *)-1) {
+	if (memh != (MemHead *)-1) {
 		make_memhead_header(memh, len, str);
-		memh->mmap= 1;
+		memh->mmap = 1;
 		mmap_in_use += len;
 		peak_mem = mmap_in_use > peak_mem ? mmap_in_use : peak_mem;
 		mem_unlock_thread();
 #ifdef DEBUG_MEMCOUNTER
-		if (_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL)
+		if (_mallocn_count == DEBUG_MEMCOUNTER_ERROR_VAL)
 			memcount_raise(__func__);
-		memh->_count= _mallocn_count++;
+		memh->_count = _mallocn_count++;
 #endif
 		return (++memh);
 	}
 	else {
 		mem_unlock_thread();
-		print_error("Mapalloc returns null, fallback to regular malloc: len=" SIZET_FORMAT " in %s, total %u\n", SIZET_ARG(len), str, mmap_in_use);
+		print_error("Mapalloc returns null, fallback to regular malloc: "
+		            "len=" SIZET_FORMAT " in %s, total %u\n",
+		            SIZET_ARG(len), str, mmap_in_use);
 		return MEM_callocN(len, str);
 	}
 }
@@ -395,16 +398,16 @@ typedef struct MemPrintBlock {
 
 static int compare_name(const void *p1, const void *p2)
 {
-	const MemPrintBlock *pb1= (const MemPrintBlock*)p1;
-	const MemPrintBlock *pb2= (const MemPrintBlock*)p2;
+	const MemPrintBlock *pb1 = (const MemPrintBlock *)p1;
+	const MemPrintBlock *pb2 = (const MemPrintBlock *)p2;
 
 	return strcmp(pb1->name, pb2->name);
 }
 
 static int compare_len(const void *p1, const void *p2)
 {
-	const MemPrintBlock *pb1= (const MemPrintBlock*)p1;
-	const MemPrintBlock *pb2= (const MemPrintBlock*)p2;
+	const MemPrintBlock *pb1 = (const MemPrintBlock *)p1;
+	const MemPrintBlock *pb2 = (const MemPrintBlock *)p2;
 
 	if (pb1->len < pb2->len)
 		return 1;
@@ -423,30 +426,30 @@ void MEM_printmemlist_stats(void)
 	mem_lock_thread();
 
 	/* put memory blocks into array */
-	printblock= malloc(sizeof(MemPrintBlock)*totblock);
+	printblock = malloc(sizeof(MemPrintBlock) * totblock);
 
-	pb= printblock;
-	totpb= 0;
+	pb = printblock;
+	totpb = 0;
 
 	membl = membase->first;
 	if (membl) membl = MEMNEXT(membl);
 
 	while (membl) {
-		pb->name= membl->name;
-		pb->len= membl->len;
-		pb->items= 1;
+		pb->name = membl->name;
+		pb->len = membl->len;
+		pb->items = 1;
 
 		totpb++;
 		pb++;
 
 		if (membl->next)
-			membl= MEMNEXT(membl->next);
+			membl = MEMNEXT(membl->next);
 		else break;
 	}
 
 	/* sort by name and add together blocks with the same name */
 	qsort(printblock, totpb, sizeof(MemPrintBlock), compare_name);
-	for (a = 0, b=0; a<totpb; a++) {
+	for (a = 0, b = 0; a < totpb; a++) {
 		if (a == b) {
 			continue;
 		}
@@ -459,15 +462,18 @@ void MEM_printmemlist_stats(void)
 			memcpy(&printblock[b], &printblock[a], sizeof(MemPrintBlock));
 		}
 	}
-	totpb= b+1;
+	totpb = b + 1;
 
 	/* sort by length and print */
 	qsort(printblock, totpb, sizeof(MemPrintBlock), compare_len);
-	printf("\ntotal memory len: %.3f MB\n", (double)mem_in_use/(double)(1024*1024));
+	printf("\ntotal memory len: %.3f MB\n",
+	       (double)mem_in_use / (double)(1024 * 1024));
 	printf(" ITEMS TOTAL-MiB AVERAGE-KiB TYPE\n");
-	for (a = 0, pb=printblock; a<totpb; a++, pb++)
-		printf("%6d (%8.3f  %8.3f) %s\n", pb->items, (double)pb->len/(double)(1024*1024), (double)pb->len/1024.0/(double)pb->items, pb->name);
-
+	for (a = 0, pb = printblock; a < totpb; a++, pb++) {
+		printf("%6d (%8.3f  %8.3f) %s\n",
+		       pb->items, (double)pb->len / (double)(1024 * 1024),
+		       (double)pb->len / 1024.0 / (double)pb->items, pb->name);
+	}
 	free(printblock);
 	
 	mem_unlock_thread();
@@ -477,8 +483,28 @@ void MEM_printmemlist_stats(void)
 #endif
 }
 
+static const char mem_printmemlist_pydict_script[] =
+"mb_userinfo = {}\n"
+"totmem = 0\n"
+"for mb_item in membase:\n"
+"    mb_item_user_size = mb_userinfo.setdefault(mb_item['name'], [0,0])\n"
+"    mb_item_user_size[0] += 1 # Add a user\n"
+"    mb_item_user_size[1] += mb_item['len'] # Increment the size\n"
+"    totmem += mb_item['len']\n"
+"print('(membase) items:', len(membase), '| unique-names:',\n"
+"      len(mb_userinfo), '| total-mem:', totmem)\n"
+"mb_userinfo_sort = list(mb_userinfo.items())\n"
+"for sort_name, sort_func in (('size', lambda a: -a[1][1]),\n"
+"                             ('users', lambda a: -a[1][0]),\n"
+"                             ('name', lambda a: a[0])):\n"
+"    print('\\nSorting by:', sort_name)\n"
+"    mb_userinfo_sort.sort(key = sort_func)\n"
+"    for item in mb_userinfo_sort:\n"
+"        print('name:%%s, users:%%i, len:%%i' %%\n"
+"              (item[0], item[1][0], item[1][1]))\n";
+
 /* Prints in python syntax for easy */
-static void MEM_printmemlist_internal( int pydict )
+static void MEM_printmemlist_internal(int pydict)
 {
 	MemHead *membl;
 
@@ -489,46 +515,40 @@ static void MEM_printmemlist_internal( int pydict )
 	
 	if (pydict) {
 		print_error("# membase_debug.py\n");
-		print_error("membase = [\\\n");
+		print_error("membase = [\n");
 	}
 	while (membl) {
 		if (pydict) {
-			fprintf(stderr, "{'len':" SIZET_FORMAT ", 'name':'''%s''', 'pointer':'%p'},\\\n", SIZET_ARG(membl->len), membl->name, (void *)(membl+1));
-		} else {
+			fprintf(stderr,
+			        "    {'len':" SIZET_FORMAT ", "
+			        "'name':'''%s''', "
+			        "'pointer':'%p'},\n",
+			        SIZET_ARG(membl->len), membl->name, (void *)(membl + 1));
+		}
+		else {
 #ifdef DEBUG_MEMCOUNTER
-			print_error("%s len: " SIZET_FORMAT " %p, count: %d\n", membl->name, SIZET_ARG(membl->len), membl+1, membl->_count);
+			print_error("%s len: " SIZET_FORMAT " %p, count: %d\n",
+			            membl->name, SIZET_ARG(membl->len), membl + 1,
+			            membl->_count);
 #else
-			print_error("%s len: " SIZET_FORMAT " %p\n", membl->name, SIZET_ARG(membl->len), membl+1);
+			print_error("%s len: " SIZET_FORMAT " %p\n",
+			            membl->name, SIZET_ARG(membl->len), membl + 1);
 #endif
 		}
 		if (membl->next)
-			membl= MEMNEXT(membl->next);
+			membl = MEMNEXT(membl->next);
 		else break;
 	}
 	if (pydict) {
 		fprintf(stderr, "]\n\n");
-		fprintf(stderr,
-"mb_userinfo = {}\n"
-"totmem = 0\n"
-"for mb_item in membase:\n"
-"\tmb_item_user_size = mb_userinfo.setdefault(mb_item['name'], [0,0])\n"
-"\tmb_item_user_size[0] += 1 # Add a user\n"
-"\tmb_item_user_size[1] += mb_item['len'] # Increment the size\n"
-"\ttotmem += mb_item['len']\n"
-"print '(membase) items:', len(membase), '| unique-names:', len(mb_userinfo), '| total-mem:', totmem\n"
-"mb_userinfo_sort = mb_userinfo.items()\n"
-"for sort_name, sort_func in (('size', lambda a: -a[1][1]), ('users', lambda a: -a[1][0]), ('name', lambda a: a[0])):\n"
-"\tprint '\\nSorting by:', sort_name\n"
-"\tmb_userinfo_sort.sort(key = sort_func)\n"
-"\tfor item in mb_userinfo_sort:\n"
-"\t\tprint 'name:%%s, users:%%i, len:%%i' %% (item[0], item[1][0], item[1][1])\n"
-		);
+		fprintf(stderr, mem_printmemlist_pydict_script);
 	}
 	
 	mem_unlock_thread();
 }
 
-void MEM_callbackmemlist(void (*func)(void*)) {
+void MEM_callbackmemlist(void (*func)(void *))
+{
 	MemHead *membl;
 
 	mem_lock_thread();
@@ -537,16 +557,17 @@ void MEM_callbackmemlist(void (*func)(void*)) {
 	if (membl) membl = MEMNEXT(membl);
 
 	while (membl) {
-		func(membl+1);
+		func(membl + 1);
 		if (membl->next)
-			membl= MEMNEXT(membl->next);
+			membl = MEMNEXT(membl->next);
 		else break;
 	}
 
 	mem_unlock_thread();
 }
 
-short MEM_testN(void *vmemh) {
+short MEM_testN(void *vmemh)
+{
 	MemHead *membl;
 
 	mem_lock_thread();
@@ -555,13 +576,13 @@ short MEM_testN(void *vmemh) {
 	if (membl) membl = MEMNEXT(membl);
 
 	while (membl) {
-		if (vmemh == membl+1) {
+		if (vmemh == membl + 1) {
 			mem_unlock_thread();
 			return 1;
 		}
 
 		if (membl->next)
-			membl= MEMNEXT(membl->next);
+			membl = MEMNEXT(membl->next);
 		else break;
 	}
 
@@ -571,47 +592,52 @@ short MEM_testN(void *vmemh) {
 	return 0;
 }
 
-void MEM_printmemlist( void ) {
+void MEM_printmemlist(void)
+{
 	MEM_printmemlist_internal(0);
 }
-void MEM_printmemlist_pydict( void ) {
+void MEM_printmemlist_pydict(void)
+{
 	MEM_printmemlist_internal(1);
 }
 
-short MEM_freeN(void *vmemh)		/* anders compileertie niet meer */
+short MEM_freeN(void *vmemh)        /* anders compileertie niet meer */
 {
 	short error = 0;
 	MemTail *memt;
-	MemHead *memh= vmemh;
+	MemHead *memh = vmemh;
 	const char *name;
 
 	if (memh == NULL) {
-		MemorY_ErroR("free","attempt to free NULL pointer");
+		MemorY_ErroR("free", "attempt to free NULL pointer");
 		/* print_error(err_stream, "%d\n", (memh+4000)->tag1); */
 		return(-1);
 	}
 
-	if (sizeof(intptr_t)==8) {
+	if (sizeof(intptr_t) == 8) {
 		if (((intptr_t) memh) & 0x7) {
-			MemorY_ErroR("free","attempt to free illegal pointer");
+			MemorY_ErroR("free", "attempt to free illegal pointer");
 			return(-1);
 		}
 	}
 	else {
 		if (((intptr_t) memh) & 0x3) {
-			MemorY_ErroR("free","attempt to free illegal pointer");
+			MemorY_ErroR("free", "attempt to free illegal pointer");
 			return(-1);
 		}
 	}
 	
 	memh--;
 	if (memh->tag1 == MEMFREE && memh->tag2 == MEMFREE) {
-		MemorY_ErroR(memh->name,"double free");
+		MemorY_ErroR(memh->name, "double free");
 		return(-1);
 	}
 
 	mem_lock_thread();
-	if ((memh->tag1 == MEMTAG1) && (memh->tag2 == MEMTAG2) && ((memh->len & 0x3) == 0)) {
+	if ((memh->tag1 == MEMTAG1) &&
+	    (memh->tag2 == MEMTAG2) &&
+	    ((memh->len & 0x3) == 0))
+	{
 		memt = (MemTail *)(((char *) memh) + sizeof(MemHead) + memh->len);
 		if (memt->tag3 == MEMTAG3) {
 			
@@ -626,18 +652,19 @@ short MEM_freeN(void *vmemh)		/* anders compileertie niet meer */
 			return(0);
 		}
 		error = 2;
-		MemorY_ErroR(memh->name,"end corrupt");
+		MemorY_ErroR(memh->name, "end corrupt");
 		name = check_memlist(memh);
 		if (name != NULL) {
-			if (name != memh->name) MemorY_ErroR(name,"is also corrupt");
+			if (name != memh->name) MemorY_ErroR(name, "is also corrupt");
 		}
-	} else{
+	}
+	else {
 		error = -1;
 		name = check_memlist(memh);
 		if (name == NULL)
-			MemorY_ErroR("free","pointer not in memlist");
+			MemorY_ErroR("free", "pointer not in memlist");
 		else
-			MemorY_ErroR(name,"error in header");
+			MemorY_ErroR(name, "error in header");
 	}
 
 	totblock--;
@@ -654,10 +681,14 @@ short MEM_freeN(void *vmemh)		/* anders compileertie niet meer */
 
 static void addtail(volatile localListBase *listbase, void *vlink)
 {
-	struct localLink *link= vlink;
+	struct localLink *link = vlink;
 
+	/* for a generic API error checks here is fine but
+	 * the limited use here they will never be NULL */
+#if 0
 	if (link == NULL) return;
 	if (listbase == NULL) return;
+#endif
 
 	link->next = NULL;
 	link->prev = listbase->last;
@@ -669,10 +700,14 @@ static void addtail(volatile localListBase *listbase, void *vlink)
 
 static void remlink(volatile localListBase *listbase, void *vlink)
 {
-	struct localLink *link= vlink;
+	struct localLink *link = vlink;
 
+	/* for a generic API error checks here is fine but
+	 * the limited use here they will never be NULL */
+#if 0
 	if (link == NULL) return;
 	if (listbase == NULL) return;
+#endif
 
 	if (link->next) link->next->prev = link->prev;
 	if (link->prev) link->prev->next = link->next;
@@ -683,7 +718,7 @@ static void remlink(volatile localListBase *listbase, void *vlink)
 
 static void rem_memblock(MemHead *memh)
 {
-	remlink(membase,&memh->next);
+	remlink(membase, &memh->next);
 	if (memh->prev) {
 		if (memh->next)
 			MEMNEXT(memh->prev)->nextname = MEMNEXT(memh->next)->name;
@@ -701,14 +736,14 @@ static void rem_memblock(MemHead *memh)
 	}
 	else {
 		if (malloc_debug_memset && memh->len)
-			memset(memh+1, 255, memh->len);
+			memset(memh + 1, 255, memh->len);
 		free(memh);
 	}
 }
 
 static void MemorY_ErroR(const char *block, const char *error)
 {
-	print_error("Memoryblock %s: %s\n",block, error);
+	print_error("Memoryblock %s: %s\n", block, error);
 
 #ifdef WITH_ASSERT_ABORT
 	abort();
@@ -717,7 +752,7 @@ static void MemorY_ErroR(const char *block, const char *error)
 
 static const char *check_memlist(MemHead *memh)
 {
-	MemHead *forw,*back,*forwok,*backok;
+	MemHead *forw, *back, *forwok, *backok;
 	const char *name;
 
 	forw = membase->first;
@@ -743,7 +778,7 @@ static const char *check_memlist(MemHead *memh)
 	if (forw != back) return ("MORE THAN 1 MEMORYBLOCK CORRUPT");
 
 	if (forw == NULL && back == NULL) {
-		/* geen foute headers gevonden dan maar op zoek naar memblock*/
+		/* no wrong headers found then but in search of memblock */
 
 		forw = membase->first;
 		if (forw) forw = MEMNEXT(forw);
@@ -773,27 +808,30 @@ static const char *check_memlist(MemHead *memh)
 	else name = "No name found";
 
 	if (forw == memh) {
-		/* voor alle zekerheid wordt dit block maar uit de lijst gehaald */
+		/* to be sure but this block is removed from the list */
 		if (forwok) {
 			if (backok) {
 				forwok->next = (MemHead *)&backok->next;
 				backok->prev = (MemHead *)&forwok->next;
 				forwok->nextname = backok->name;
-			} else{
+			}
+			else {
 				forwok->next = NULL;
 				membase->last = (struct localLink *) &forwok->next;
-/*  				membase->last = (struct Link *) &forwok->next; */
 			}
-		} else{
+		}
+		else {
 			if (backok) {
 				backok->prev = NULL;
 				membase->first = &backok->next;
-			} else{
+			}
+			else {
 				membase->first = membase->last = NULL;
 			}
 		}
-	} else{
-		MemorY_ErroR(name,"Additional error in header");
+	}
+	else {
+		MemorY_ErroR(name, "Additional error in header");
 		return("Additional error in header");
 	}
 
@@ -823,7 +861,7 @@ uintptr_t MEM_get_memory_in_use(void)
 	uintptr_t _mem_in_use;
 
 	mem_lock_thread();
-	_mem_in_use= mem_in_use;
+	_mem_in_use = mem_in_use;
 	mem_unlock_thread();
 
 	return _mem_in_use;
@@ -834,7 +872,7 @@ uintptr_t MEM_get_mapped_memory_in_use(void)
 	uintptr_t _mmap_in_use;
 
 	mem_lock_thread();
-	_mmap_in_use= mmap_in_use;
+	_mmap_in_use = mmap_in_use;
 	mem_unlock_thread();
 
 	return _mmap_in_use;
@@ -845,7 +883,7 @@ int MEM_get_memory_blocks_in_use(void)
 	int _totblock;
 
 	mem_lock_thread();
-	_totblock= totblock;
+	_totblock = totblock;
 	mem_unlock_thread();
 
 	return _totblock;
@@ -855,7 +893,7 @@ int MEM_get_memory_blocks_in_use(void)
 const char *MEM_name_ptr(void *vmemh)
 {
 	if (vmemh) {
-		MemHead *memh= vmemh;
+		MemHead *memh = vmemh;
 		memh--;
 		return memh->name;
 	}
diff --git a/intern/itasc/Armature.cpp b/intern/itasc/Armature.cpp
index 916b0bc7bf3..1dacb8bc184 100644
--- a/intern/itasc/Armature.cpp
+++ b/intern/itasc/Armature.cpp
@@ -158,7 +158,7 @@ void Armature::pushQ(CacheTS timestamp)
 {
 	if (m_qCCh >= 0) {
 		// try to keep the cache if the joints are the same
-		m_cache->addCacheVectorIfDifferent(this, m_qCCh, timestamp, &m_qKdl(0), m_qKdl.rows(), KDL::epsilon);
+		m_cache->addCacheVectorIfDifferent(this, m_qCCh, timestamp, m_qKdl(0), m_qKdl.rows(), KDL::epsilon);
 		m_qCTs = timestamp;
 	}
 }
@@ -170,8 +170,8 @@ bool Armature::popQ(CacheTS timestamp)
 		double* item;
 		item = (double*)m_cache->getPreviousCacheItem(this, m_qCCh, &timestamp);
 		if (item && m_qCTs != timestamp) {
-			double& q = m_qKdl(0);
-			memcpy(&q, item, m_qKdl.rows()*sizeof(q));
+			double* q = m_qKdl(0);
+			memcpy(q, item, m_qKdl.rows()*sizeof(double));
 			m_qCTs = timestamp;
 			// changing the joint => recompute the jacobian
 			updateJacobian();
@@ -255,7 +255,7 @@ bool Armature::getSegment(const std::string& name, const unsigned int q_size, co
 	p_tip = &sit->second.segment.getFrameToTip();
 	for (unsigned int dof=0; dof<p_joint->getNDof(); dof++) {
 		(&q_rest)[dof] = m_joints[sit->second.q_nr+dof].rest;
-		(&q)[dof] = m_qKdl(sit->second.q_nr+dof);
+		(&q)[dof] = m_qKdl[sit->second.q_nr+dof];
 	}
 	return true;
 }
@@ -267,7 +267,7 @@ double Armature::getMaxJointChange()
 	double maxJoint = 0.0;
 	for (unsigned int i=0; i<m_njoint; i++) {
 		// this is a very rough calculation, it doesn't work well for spherical joint
-		double joint = fabs(m_oldqKdl(i)-m_qKdl(i));
+		double joint = fabs(m_oldqKdl[i]-m_qKdl[i]);
 		if (maxJoint < joint)
 			maxJoint = joint;
 	}
@@ -369,11 +369,13 @@ int Armature::addEndEffector(const std::string& name)
 	return m_neffector++;
 }
 
-void Armature::finalize()
+bool Armature::finalize()
 {
 	unsigned int i, j, c;
 	if (m_finalized)
-		return;
+		return true;
+	if (m_njoint == 0)
+		return false;
 	initialize(m_njoint, m_noutput, m_neffector);
 	for (i=c=0; i<m_nconstraint; i++) {
 		JointConstraint_struct* pConstraint = m_constraints[i];
@@ -390,7 +392,7 @@ void Armature::finalize()
 	m_newqKdl.resize(m_njoint);
 	m_qdotKdl.resize(m_njoint);
 	for (i=0; i<m_njoint; i++) {
-		m_newqKdl(i) = m_oldqKdl(i) = m_qKdl(i) = m_joints[i].rest;
+		m_newqKdl[i] = m_oldqKdl[i] = m_qKdl[i] = m_joints[i].rest;
 	}
 	updateJacobian();
 	// estimate the maximum size of the robot arms
@@ -410,6 +412,7 @@ void Armature::finalize()
 	if (m_armlength < KDL::epsilon)
 		m_armlength = KDL::epsilon;
 	m_finalized = true;
+	return true;
 }
 
 void Armature::pushCache(const Timestamp& timestamp)
@@ -444,15 +447,15 @@ bool Armature::updateJoint(const Timestamp& timestamp, JointLockCallback& callba
 	// integration and joint limit
 	// for spherical joint we must use a more sophisticated method
 	unsigned int q_nr;
-	double* qdot=&m_qdotKdl(0);
-	double* q=&m_qKdl(0);
-	double* newq=&m_newqKdl(0);
+	double* qdot=m_qdotKdl(0);
+	double* q=m_qKdl(0);
+	double* newq=m_newqKdl(0);
 	double norm, qx, qz, CX, CZ, sx, sz;
 	bool locked = false;
 	int unlocked = 0;
 
 	for (q_nr=0; q_nr<m_nq; ++q_nr)
-		m_qdotKdl(q_nr)=m_qdot(q_nr);
+		qdot[q_nr]=m_qdot[q_nr];
 
 	for (q_nr=0; q_nr<m_nq; ) {
 		Joint_struct* joint = &m_joints[q_nr];
@@ -621,7 +624,7 @@ void Armature::updateKinematics(const Timestamp& timestamp){
 		return;
 
 	// the new joint value have been computed already, just copy
-	memcpy(&m_qKdl(0), &m_newqKdl(0), sizeof(double)*m_qKdl.rows());
+	memcpy(m_qKdl(0), m_newqKdl(0), sizeof(double)*m_qKdl.rows());
 	pushCache(timestamp);
 	updateJacobian();
 	// here update the desired output.
@@ -674,7 +677,7 @@ void Armature::updateControlOutput(const Timestamp& timestamp)
 
 	if (!timestamp.substep) {
 		// save previous joint state for getMaxJointChange()
-		memcpy(&m_oldqKdl(0), &m_qKdl(0), sizeof(double)*m_qKdl.rows());
+		memcpy(m_oldqKdl(0), m_qKdl(0), sizeof(double)*m_qKdl.rows());
 		for (unsigned int i=0; i<m_neffector; i++) {
 			m_effectors[i].oldpose = m_effectors[i].pose;
 		}
@@ -693,8 +696,8 @@ void Armature::updateControlOutput(const Timestamp& timestamp)
 		JointConstraint_struct* pConstraint = *it;
 		unsigned int nr, i;
 		for (i=0, nr = pConstraint->segment->second.q_nr; i<pConstraint->v_nr; i++, nr++) {
-			*(double*)&pConstraint->value[i].y = m_qKdl(nr);
-			*(double*)&pConstraint->value[i].ydot = m_qdotKdl(nr);
+			*(double*)&pConstraint->value[i].y = m_qKdl[nr];
+			*(double*)&pConstraint->value[i].ydot = m_qdotKdl[nr];
 		}
 		if (pConstraint->function && (pConstraint->substep || (!timestamp.reiterate && !timestamp.substep))) {
 			(*pConstraint->function)(timestamp, pConstraint->values, pConstraint->v_nr, pConstraint->param);
diff --git a/intern/itasc/Armature.hpp b/intern/itasc/Armature.hpp
index 0f4abeab4f0..63d1899f4e9 100644
--- a/intern/itasc/Armature.hpp
+++ b/intern/itasc/Armature.hpp
@@ -31,7 +31,7 @@ public:
 	bool getSegment(const std::string& segment_name, const unsigned int q_size, const Joint* &p_joint, double &q_rest, double &q, const Frame* &p_tip);
 	bool getRelativeFrame(Frame& result, const std::string& segment_name, const std::string& base_name=m_root);
 
-	virtual void finalize();
+	virtual bool finalize();
 
 	virtual int addEndEffector(const std::string& name);
 	virtual const Frame& getPose(const unsigned int end_effector);
diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt
index 3d24a0cb8c6..f4bc0326ea1 100644
--- a/intern/itasc/CMakeLists.txt
+++ b/intern/itasc/CMakeLists.txt
@@ -318,8 +318,5 @@ set(SRC
 	../../extern/Eigen3/Eigen/src/Cholesky/LLT.h
 )
 
-if(WIN32)
-	add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY)
-endif()
 
 blender_add_lib(bf_intern_itasc "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/itasc/Distance.cpp b/intern/itasc/Distance.cpp
index 7cf04367a4e..c9efca101e3 100644
--- a/intern/itasc/Distance.cpp
+++ b/intern/itasc/Distance.cpp
@@ -189,7 +189,7 @@ void Distance::updateKinematics(const Timestamp& timestamp)
 void Distance::updateJacobian()
 {
     for(unsigned int i=0;i<6;i++)
-        m_chiKdl(i)=m_chi(i);
+        m_chiKdl[i]=m_chi[i];
 
     m_fksolver->JntToCart(m_chiKdl,m_internalPose);
     m_jacsolver->JntToJac(m_chiKdl,m_jac);
diff --git a/intern/itasc/FixedObject.cpp b/intern/itasc/FixedObject.cpp
index 9dc4d69878a..2a1e66f9c6f 100644
--- a/intern/itasc/FixedObject.cpp
+++ b/intern/itasc/FixedObject.cpp
@@ -53,12 +53,13 @@ int FixedObject::addEndEffector(const std::string& name)
 	return -1;
 }
 
-void FixedObject::finalize()
+bool FixedObject::finalize()
 {
 	if (m_finalized)
-		return;
+		return true;
 	initialize(0, m_nframe);
 	m_finalized = true;
+	return true;
 }
 
 const Frame& FixedObject::getPose(const unsigned int frameIndex)
diff --git a/intern/itasc/FixedObject.hpp b/intern/itasc/FixedObject.hpp
index b4279d9adcb..ad26e7cb2d6 100644
--- a/intern/itasc/FixedObject.hpp
+++ b/intern/itasc/FixedObject.hpp
@@ -23,7 +23,7 @@ public:
 
 	virtual void updateCoordinates(const Timestamp& timestamp) {};
 	virtual int addEndEffector(const std::string& name);
-	virtual void finalize();
+	virtual bool finalize();
 	virtual const Frame& getPose(const unsigned int frameIndex);
 	virtual void updateKinematics(const Timestamp& timestamp) {};
 	virtual void pushCache(const Timestamp& timestamp) {};
diff --git a/intern/itasc/MovingFrame.cpp b/intern/itasc/MovingFrame.cpp
index 3b0ee7842ca..90ebe091eb5 100644
--- a/intern/itasc/MovingFrame.cpp
+++ b/intern/itasc/MovingFrame.cpp
@@ -27,9 +27,10 @@ MovingFrame::~MovingFrame()
 {
 }
 
-void MovingFrame::finalize()
+bool MovingFrame::finalize()
 {
 	updateJacobian();
+	return true;
 }
 
 void MovingFrame::initCache(Cache *_cache)
diff --git a/intern/itasc/MovingFrame.hpp b/intern/itasc/MovingFrame.hpp
index 21cb344980a..d2a956d7312 100644
--- a/intern/itasc/MovingFrame.hpp
+++ b/intern/itasc/MovingFrame.hpp
@@ -28,7 +28,7 @@ public:
 	virtual void updateKinematics(const Timestamp& timestamp);
     virtual void pushCache(const Timestamp& timestamp);
 	virtual void initCache(Cache *_cache);
-	virtual void finalize();
+	virtual bool finalize();
 protected:
 	virtual void updateJacobian();
 
diff --git a/intern/itasc/Object.hpp b/intern/itasc/Object.hpp
index 5aa4346fc4b..bf80d83e5aa 100644
--- a/intern/itasc/Object.hpp
+++ b/intern/itasc/Object.hpp
@@ -33,7 +33,7 @@ public:
     virtual ~Object(){};
 
 	virtual int addEndEffector(const std::string& name){return 0;};
-	virtual void finalize(){};
+	virtual bool finalize(){return true;};
 	virtual const KDL::Frame& getPose(const unsigned int end_effector=0){return m_internalPose;};
     virtual const ObjectType getType(){return m_type;};
     virtual const unsigned int getNrOfCoordinates(){return 0;};
diff --git a/intern/itasc/SConscript b/intern/itasc/SConscript
index 69dddf40228..c1ad931c665 100644
--- a/intern/itasc/SConscript
+++ b/intern/itasc/SConscript
@@ -9,8 +9,5 @@ incs = '. ../../extern/Eigen3'
 
 defs = []
 
-if env['PLATFORM'] == 'win32':
-    defs.append('EIGEN_DONT_ALIGN_STATICALLY')
-
 env.BlenderLib ('bf_intern_itasc', sources, Split(incs), defs, libtype=['intern','player'], priority=[20,100] )
 
diff --git a/intern/itasc/Scene.cpp b/intern/itasc/Scene.cpp
index 16f8551bfc7..877cd883208 100644
--- a/intern/itasc/Scene.cpp
+++ b/intern/itasc/Scene.cpp
@@ -91,7 +91,8 @@ bool Scene::setParam(SceneParam paramId, double value)
 bool Scene::addObject(const std::string& name, Object* object, UncontrolledObject* base, const std::string& baseFrame)
 {
 	// finalize the object before adding
-	object->finalize();
+	if (!object->finalize())
+		return false;
     //Check if Object is controlled or uncontrolled.
     if(object->getType()==Object::Controlled){
 		int baseFrameIndex = base->addEndEffector(baseFrame);
diff --git a/intern/itasc/kdl/frames.hpp b/intern/itasc/kdl/frames.hpp
index 2a1ed3296f9..28a59898e20 100644
--- a/intern/itasc/kdl/frames.hpp
+++ b/intern/itasc/kdl/frames.hpp
@@ -201,6 +201,9 @@ public:
      //! Adds a vector from the Vector object itself
      inline Vector& operator +=(const Vector& arg);
 
+     //! Multiply by a scalar
+     inline Vector& operator *=(double arg);
+
      //! Scalar multiplication is defined
      inline friend Vector operator*(const Vector& lhs,double rhs);
      //! Scalar multiplication is defined
diff --git a/intern/itasc/kdl/frames.inl b/intern/itasc/kdl/frames.inl
index ff1307766bf..a09b532762b 100644
--- a/intern/itasc/kdl/frames.inl
+++ b/intern/itasc/kdl/frames.inl
@@ -20,8 +20,8 @@
  *                                                                         *
  *   You should have received a copy of the GNU Lesser General Public      *
  *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street,                                    *
- *   Fifth Floor, Boston, MA 02110-1301, USA.                               *
+ *   Foundation, Inc., 51 Franklin Street,                                 *
+ *   Fifth Floor, Boston, MA 02110-1301, USA.                              *
  *                                                                         *
  ***************************************************************************/
 
@@ -143,6 +143,14 @@ Vector& Vector::operator -=(const Vector & arg)
     return *this;
 }
 
+Vector& Vector::operator *=(double arg)
+{
+	data[0] *= arg;
+	data[1] *= arg;
+	data[2] *= arg;
+	return *this;
+}
+
 Vector Vector::Zero()
 {
     return Vector(0,0,0);
diff --git a/intern/itasc/kdl/jntarray.cpp b/intern/itasc/kdl/jntarray.cpp
index 77c75e6af6c..db2c913a532 100644
--- a/intern/itasc/kdl/jntarray.cpp
+++ b/intern/itasc/kdl/jntarray.cpp
@@ -71,20 +71,25 @@ namespace KDL
         SetToZero(*this);
     }
 
-    double JntArray::operator()(unsigned int i,unsigned int j)const
+    double JntArray::operator[](unsigned int i)const
     {
-        assert(i<size&&j==0);
-        assert(0 != size);  // found JntArray containing no data
+        assert(i<size);
         return data[i];
     }
 
-    double& JntArray::operator()(unsigned int i,unsigned int j)
+    double& JntArray::operator[](unsigned int i)
     {
-        assert(i<size&&j==0);
-        assert(0 != size);  // found JntArray containing no data
+        assert(i<size);
         return data[i];
     }
 
+    double* JntArray::operator()(unsigned int i)
+    {
+        if (i>=size)
+			return NULL;
+        return &data[i];
+    }
+
     unsigned int JntArray::rows()const
     {
         return size;
diff --git a/intern/itasc/kdl/jntarray.hpp b/intern/itasc/kdl/jntarray.hpp
index 8db4cd6f2b3..ece6b0bdb6b 100644
--- a/intern/itasc/kdl/jntarray.hpp
+++ b/intern/itasc/kdl/jntarray.hpp
@@ -107,24 +107,30 @@ class MyTask : public RTT::TaskContext
 		
         JntArray& operator = ( const JntArray& arg);
         /**
-         * get_item operator for the joint array, if a second value is
-         * given it should be zero, since a JntArray resembles a column.
+         * get_item operator for the joint array
          *
          *
          * @return the joint value at position i, starting from 0
          * @pre 0 != size (ie non-default constructor or resize() called)
          */
-        double operator()(unsigned int i,unsigned int j=0)const;
+        double operator[](unsigned int i) const;
         /**
-         * set_item operator, again if a second value is given it
-         *should be zero.
+         * set_item operator
          *
          * @return reference to the joint value at position i,starting
          *from zero.
          * @pre 0 != size (ie non-default constructor or resize() called)
          */
-        double& operator()(unsigned int i,unsigned int j=0);
+        double& operator[](unsigned int i);
         /**
+         * access operator for the joint array. Use pointer here to allow
+		 * access to sequential joint angles (required for ndof joints)
+         * 
+         *
+         * @return the joint value at position i, NULL if i is outside the valid range
+         */
+        double* operator()(unsigned int i);
+		/**
          * Returns the number of rows (size) of the array
          *
          */
diff --git a/intern/itasc/kdl/joint.cpp b/intern/itasc/kdl/joint.cpp
index 5458efc4fcf..161794ddd72 100644
--- a/intern/itasc/kdl/joint.cpp
+++ b/intern/itasc/kdl/joint.cpp
@@ -55,37 +55,45 @@ namespace KDL {
     {
     }
 
-    Frame Joint::pose(const double& q)const
+    Frame Joint::pose(const double* q)const
     {
 
         switch(type){
         case RotX:
-            return Frame(Rotation::RotX(scale*q+offset));
+			assert(q);
+            return Frame(Rotation::RotX(scale*q[0]+offset));
             break;
         case RotY:
-            return  Frame(Rotation::RotY(scale*q+offset));
+			assert(q);
+            return  Frame(Rotation::RotY(scale*q[0]+offset));
             break;
         case RotZ:
-            return  Frame(Rotation::RotZ(scale*q+offset));
+			assert(q);
+            return  Frame(Rotation::RotZ(scale*q[0]+offset));
             break;
         case TransX:
-            return  Frame(Vector(scale*q+offset,0.0,0.0));
+			assert(q);
+            return  Frame(Vector(scale*q[0]+offset,0.0,0.0));
             break;
         case TransY:
-            return Frame(Vector(0.0,scale*q+offset,0.0));
+			assert(q);
+            return Frame(Vector(0.0,scale*q[0]+offset,0.0));
             break;
         case TransZ:
-            return Frame(Vector(0.0,0.0,scale*q+offset));
+			assert(q);
+            return Frame(Vector(0.0,0.0,scale*q[0]+offset));
             break;
 		case Sphere:
 			// the joint angles represent a rotation vector expressed in the base frame of the joint
 			// (= the frame you get when there is no offset nor rotation)
-			return Frame(Rot(Vector((&q)[0], (&q)[1], (&q)[2])));
+			assert(q);
+			return Frame(Rot(Vector(q[0], q[1], q[2])));
 			break;
 		case Swing:
 			// the joint angles represent a 2D rotation vector in the XZ planee of the base frame of the joint
 			// (= the frame you get when there is no offset nor rotation)
-			return Frame(Rot(Vector((&q)[0], 0.0, (&q)[1])));
+			assert(q);
+			return Frame(Rot(Vector(q[0], 0.0, q[1])));
 			break;
         default:
             return Frame::Identity();
diff --git a/intern/itasc/kdl/joint.hpp b/intern/itasc/kdl/joint.hpp
index a1291509f0f..9d25b427499 100644
--- a/intern/itasc/kdl/joint.hpp
+++ b/intern/itasc/kdl/joint.hpp
@@ -70,7 +70,7 @@ namespace KDL {
          *
          * @return the resulting 6D-pose
          */
-        Frame pose(const double& q)const;
+        Frame pose(const double* q)const;
         /**
          * Request the resulting 6D-velocity with a joint velocity qdot
          *
diff --git a/intern/itasc/kdl/kinfam_io.cpp b/intern/itasc/kdl/kinfam_io.cpp
index 15557ab5f05..ff4cab862ce 100644
--- a/intern/itasc/kdl/kinfam_io.cpp
+++ b/intern/itasc/kdl/kinfam_io.cpp
@@ -76,7 +76,7 @@ std::istream& operator >>(std::istream& is, Tree& tree) {
 std::ostream& operator <<(std::ostream& os, const JntArray& array) {
 	os << "[";
 	for (unsigned int i = 0; i < array.rows(); i++)
-		os << std::setw(KDL_FRAME_WIDTH) << array(i);
+		os << std::setw(KDL_FRAME_WIDTH) << array[i];
 	os << "]";
 	return os;
 }
diff --git a/intern/itasc/kdl/segment.cpp b/intern/itasc/kdl/segment.cpp
index cba797899e1..f963559c4c8 100644
--- a/intern/itasc/kdl/segment.cpp
+++ b/intern/itasc/kdl/segment.cpp
@@ -48,12 +48,12 @@ namespace KDL {
     {
     }
 
-    Frame Segment::pose(const double& q)const
+    Frame Segment::pose(const double* q)const
     {
         return joint.pose(q)*f_tip;
     }
 
-    Twist Segment::twist(const double& q, const double& qdot, int dof)const
+    Twist Segment::twist(const double* q, const double& qdot, int dof)const
     {
         return joint.twist(qdot, dof).RefPoint(pose(q).p);
     }
diff --git a/intern/itasc/kdl/segment.hpp b/intern/itasc/kdl/segment.hpp
index 7c82ab418fa..130bfb13f8b 100644
--- a/intern/itasc/kdl/segment.hpp
+++ b/intern/itasc/kdl/segment.hpp
@@ -46,8 +46,8 @@ namespace KDL {
     class Segment {
         friend class Chain;
     private:
-        Joint joint;
         Inertia M;
+        Joint joint;
         Frame f_tip;
 
     public:
@@ -73,7 +73,7 @@ namespace KDL {
          *
          * @return pose from the root to the tip of the segment
          */
-        Frame pose(const double& q)const;
+        Frame pose(const double* q)const;
         /**
          * Request the 6D-velocity of the tip of the segment, given
          * the joint position q and the joint velocity qdot.
@@ -85,7 +85,7 @@ namespace KDL {
          *in the base-frame of the segment(root) and with the tip of
          *the segment as reference point.
          */
-        Twist twist(const double& q,const double& qdot, int dof=0)const;
+        Twist twist(const double* q,const double& qdot, int dof=0)const;
 
         /**
          * Request the 6D-velocity at a given point p, relative to base frame of the segment
diff --git a/intern/itasc/kdl/tree.cpp b/intern/itasc/kdl/tree.cpp
index 097a729f577..8776e43f5b4 100644
--- a/intern/itasc/kdl/tree.cpp
+++ b/intern/itasc/kdl/tree.cpp
@@ -29,15 +29,18 @@ using namespace std;
 
 Tree::Tree() :
     nrOfJoints(0), nrOfSegments(0) {
-    segments.insert(make_pair("root", TreeElement::Root()));
+	TreeElement root;
+	std::pair<std::string, TreeElement> val("root", root);
+    segments.insert(val);
 }
 
 Tree::Tree(const Tree& in) {
     segments.clear();
     nrOfSegments = 0;
     nrOfJoints = 0;
-
-    segments.insert(make_pair("root", TreeElement::Root()));
+	TreeElement root;
+	std::pair<std::string, TreeElement> val("root", root);
+    segments.insert(val);
     this->addTree(in, "", "root");
 
 }
@@ -46,8 +49,9 @@ Tree& Tree::operator=(const Tree& in) {
     segments.clear();
     nrOfSegments = 0;
     nrOfJoints = 0;
-
-    segments.insert(make_pair("root", TreeElement::Root()));
+	TreeElement root;
+	std::pair<std::string, TreeElement> val("root", root);
+    segments.insert(val);
     this->addTree(in, "", "root");
     return *this;
 }
@@ -60,8 +64,10 @@ bool Tree::addSegment(const Segment& segment, const std::string& segment_name,
         return false;
     pair<SegmentMap::iterator, bool> retval;
     //insert new element
-    retval = segments.insert(make_pair(segment_name, TreeElement(segment,
-            parent, nrOfJoints)));
+	TreeElement elem(segment, parent, nrOfJoints);
+	std::pair<std::string, TreeElement> val(segment_name, elem);
+
+    retval = segments.insert(val);
     //check if insertion succeeded
     if (!retval.second)
         return false;
diff --git a/intern/itasc/kdl/tree.hpp b/intern/itasc/kdl/tree.hpp
index 4dfb55c7823..08c1aadc6de 100644
--- a/intern/itasc/kdl/tree.hpp
+++ b/intern/itasc/kdl/tree.hpp
@@ -43,7 +43,7 @@ namespace KDL
 #endif
     class TreeElement
     {
-    private:
+    public:
         TreeElement():q_nr(0)
         {};
     public:
diff --git a/intern/itasc/kdl/utilities/utility.h b/intern/itasc/kdl/utilities/utility.h
index fbf9982665a..892b375d442 100644
--- a/intern/itasc/kdl/utilities/utility.h
+++ b/intern/itasc/kdl/utilities/utility.h
@@ -27,6 +27,10 @@
 #include <cassert>
 #include <cmath>
 
+#ifdef NDEBUG
+#undef assert
+#define assert(e) ((void)0)
+#endif
 
 /////////////////////////////////////////////////////////////
 // configurable options for the frames library.
diff --git a/intern/memutil/MEM_Allocator.h b/intern/memutil/MEM_Allocator.h
index 9541604b680..0020094ebbb 100644
--- a/intern/memutil/MEM_Allocator.h
+++ b/intern/memutil/MEM_Allocator.h
@@ -72,7 +72,7 @@ struct MEM_Allocator
 	}
 
 	// __p is not permitted to be a null pointer.
-	void deallocate(pointer __p, size_type){ 
+	void deallocate(pointer __p, size_type) {
 		MEM_freeN(__p);
 	}
 
diff --git a/intern/memutil/MEM_RefCountPtr.h b/intern/memutil/MEM_RefCountPtr.h
index 4f475345076..ffdf927b551 100644
--- a/intern/memutil/MEM_RefCountPtr.h
+++ b/intern/memutil/MEM_RefCountPtr.h
@@ -98,7 +98,7 @@
  *
  *  static
  *      MEM_RefCountPtr<RcUsefullClass>
- *  New(...){
+ *  New(...) {
  *       return MEM_RefCountPtr<RcUsefullClass> output(
  *           new UsefullClass(...)
  *       );
diff --git a/intern/memutil/MEM_SmartPtr.h b/intern/memutil/MEM_SmartPtr.h
index 6a0dc1723c4..722a0a8fd3b 100644
--- a/intern/memutil/MEM_SmartPtr.h
+++ b/intern/memutil/MEM_SmartPtr.h
@@ -119,7 +119,7 @@ public :
 
 	MEM_SmartPtr(
 		const MEM_SmartPtr &rhs
-	){
+	) {
 		m_val = rhs.Release();
 	}
 
diff --git a/intern/mikktspace/mikktspace.c b/intern/mikktspace/mikktspace.c
index 24c77c439a7..0a3141d6782 100644
--- a/intern/mikktspace/mikktspace.c
+++ b/intern/mikktspace/mikktspace.c
@@ -40,8 +40,7 @@
 #define INTERNAL_RND_SORT_SEED		39871946
 
 // internal structure
-typedef struct
-{
+typedef struct {
 	float x, y, z;
 } SVec3;
 
@@ -119,14 +118,12 @@ static tbool VNotZero(const SVec3 v)
 
 
 
-typedef struct
-{
+typedef struct {
 	int iNrFaces;
 	int * pTriMembers;
 } SSubGroup;
 
-typedef struct
-{
+typedef struct {
 	int iNrFaces;
 	int * pFaceIndices;
 	int iVertexRepresentitive;
@@ -141,8 +138,7 @@ typedef struct
 
 
 
-typedef struct
-{
+typedef struct {
 	int FaceNeighbors[3];
 	SGroup * AssignedGroup[3];
 	
@@ -156,8 +152,7 @@ typedef struct
 	unsigned char vert_num[4];
 } STriInfo;
 
-typedef struct
-{
+typedef struct {
 	SVec3 vOs;
 	float fMagS;
 	SVec3 vOt;
@@ -258,7 +253,7 @@ tbool genTangSpace(const SMikkTSpaceContext * pContext, const float fAngularThre
 	{
 		const int verts = pContext->m_pInterface->m_getNumVerticesOfFace(pContext, f);
 		if (verts==3) ++iNrTrianglesIn;
-		else if(verts==4) iNrTrianglesIn += 2;
+		else if (verts==4) iNrTrianglesIn += 2;
 	}
 	if (iNrTrianglesIn<=0) return TFALSE;
 
@@ -426,8 +421,7 @@ tbool genTangSpace(const SMikkTSpaceContext * pContext, const float fAngularThre
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-typedef struct
-{
+typedef struct {
 	float vert[3];
 	int index;
 } STmpVert;
@@ -470,11 +464,11 @@ static void GenerateSharedVerticesIndexList(int piTriList_in_and_out[], const SM
 
 		const SVec3 vP = GetPosition(pContext, index);
 		if (vMin.x > vP.x) vMin.x = vP.x;
-		else if(vMax.x < vP.x) vMax.x = vP.x;
+		else if (vMax.x < vP.x) vMax.x = vP.x;
 		if (vMin.y > vP.y) vMin.y = vP.y;
-		else if(vMax.y < vP.y) vMax.y = vP.y;
+		else if (vMax.y < vP.y) vMax.y = vP.y;
 		if (vMin.z > vP.z) vMin.z = vP.z;
-		else if(vMax.z < vP.z) vMax.z = vP.z;
+		else if (vMax.z < vP.z) vMax.z = vP.z;
 	}
 
 	vDim = vsub(vMax,vMin);
@@ -485,7 +479,7 @@ static void GenerateSharedVerticesIndexList(int piTriList_in_and_out[], const SM
 		iChannel=1;
 		fMin = vMin.y, fMax=vMax.y;
 	}
-	else if(vDim.z>vDim.x)
+	else if (vDim.z>vDim.x)
 	{
 		iChannel=2;
 		fMin = vMin.z, fMax=vMax.z;
@@ -590,7 +584,7 @@ static void MergeVertsFast(int piTriList_in_and_out[], STmpVert pTmpVert[], cons
 	for (l=(iL_in+1); l<=iR_in; l++)
 		for (c=0; c<3; c++)
 			if (fvMin[c]>pTmpVert[l].vert[c]) fvMin[c]=pTmpVert[l].vert[c];
-			else if(fvMax[c]<pTmpVert[l].vert[c]) fvMax[c]=pTmpVert[l].vert[c];
+			else if (fvMax[c]<pTmpVert[l].vert[c]) fvMax[c]=pTmpVert[l].vert[c];
 
 	dx = fvMax[0]-fvMin[0];
 	dy = fvMax[1]-fvMin[1];
@@ -598,7 +592,7 @@ static void MergeVertsFast(int piTriList_in_and_out[], STmpVert pTmpVert[], cons
 
 	channel = 0;
 	if (dy>dx && dy>dz) channel=1;
-	else if(dz>dx) channel=2;
+	else if (dz>dx) channel=2;
 
 	fSep = 0.5f*(fvMax[channel]+fvMin[channel]);
 
@@ -626,7 +620,7 @@ static void MergeVertsFast(int piTriList_in_and_out[], STmpVert pTmpVert[], cons
 				const SVec3 vT2 = GetTexCoord(pContext, index2);
 				i2rec=i2;
 
-				//if(vP==vP2 && vN==vN2 && vT==vT2)
+				//if (vP==vP2 && vN==vN2 && vT==vT2)
 				if (vP.x==vP2.x && vP.y==vP2.y && vP.z==vP2.z &&
 					vN.x==vN2.x && vN.y==vN2.y && vN.z==vN2.z &&
 					vT.x==vT2.x && vT.y==vT2.y && vT.z==vT2.z)
@@ -812,7 +806,7 @@ static int GenerateInitialVerticesIndexList(STriInfo pTriInfos[], int piTriList_
 				tbool bQuadDiagIs_02;
 				if (distSQ_02<distSQ_13)
 					bQuadDiagIs_02 = TTRUE;
-				else if(distSQ_13<distSQ_02)
+				else if (distSQ_13<distSQ_02)
 					bQuadDiagIs_02 = TFALSE;
 				else
 				{
@@ -911,8 +905,7 @@ static SVec3 GetTexCoord(const SMikkTSpaceContext * pContext, const int index)
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 
-typedef union
-{
+typedef union {
 	struct
 	{
 		int i0, i1, f;
@@ -1027,7 +1020,7 @@ static void InitTriInfo(STriInfo pTriInfos[], const int piTriListIn[], const SMi
 					//printf("found quad with bad mapping\n");
 					tbool bChooseOrientFirstTri = TFALSE;
 					if ((pTriInfos[t+1].iFlag&GROUP_WITH_ANY)!=0) bChooseOrientFirstTri = TTRUE;
-					else if( CalcTexArea(pContext, &piTriListIn[t*3+0]) >= CalcTexArea(pContext, &piTriListIn[(t+1)*3+0]) )
+					else if ( CalcTexArea(pContext, &piTriListIn[t*3+0]) >= CalcTexArea(pContext, &piTriListIn[(t+1)*3+0]) )
 						bChooseOrientFirstTri = TTRUE;
 
 					// force match
@@ -1142,13 +1135,13 @@ static tbool AssignRecur(const int piTriListIn[], STriInfo psTriInfos[],
 	const int * pVerts = &piTriListIn[3*iMyTriIndex+0];
 	int i=-1;
 	if (pVerts[0]==iVertRep) i=0;
-	else if(pVerts[1]==iVertRep) i=1;
-	else if(pVerts[2]==iVertRep) i=2;
+	else if (pVerts[1]==iVertRep) i=1;
+	else if (pVerts[2]==iVertRep) i=2;
 	assert(i>=0 && i<3);
 
 	// early out
 	if (pMyTriInfo->AssignedGroup[i] == pGroup) return TTRUE;
-	else if(pMyTriInfo->AssignedGroup[i]!=NULL) return TFALSE;
+	else if (pMyTriInfo->AssignedGroup[i]!=NULL) return TFALSE;
 	if ((pMyTriInfo->iFlag&GROUP_WITH_ANY)!=0)
 	{
 		// first to group with a group-with-anything triangle
@@ -1232,8 +1225,8 @@ static tbool GenerateTSpaces(STSpace psTspace[], const STriInfo pTriInfos[], con
 			tbool bFound;
 			SVec3 n, vOs, vOt;
 			if (pTriInfos[f].AssignedGroup[0]==pGroup) index=0;
-			else if(pTriInfos[f].AssignedGroup[1]==pGroup) index=1;
-			else if(pTriInfos[f].AssignedGroup[2]==pGroup) index=2;
+			else if (pTriInfos[f].AssignedGroup[1]==pGroup) index=1;
+			else if (pTriInfos[f].AssignedGroup[2]==pGroup) index=2;
 			assert(index>=0 && index<3);
 
 			iVertIndex = piTriListIn[f*3+index];
@@ -1381,8 +1374,8 @@ static STSpace EvalTspace(int face_indices[], const int iFaces, const int piTriL
 			float fCos, fAngle, fMagS, fMagT;
 			int i=-1, index=-1, i0=-1, i1=-1, i2=-1;
 			if (piTriListIn[3*f+0]==iVertexRepresentitive) i=0;
-			else if(piTriListIn[3*f+1]==iVertexRepresentitive) i=1;
-			else if(piTriListIn[3*f+2]==iVertexRepresentitive) i=2;
+			else if (piTriListIn[3*f+1]==iVertexRepresentitive) i=1;
+			else if (piTriListIn[3*f+2]==iVertexRepresentitive) i=2;
 			assert(i>=0 && i<3);
 
 			// project
@@ -1404,8 +1397,8 @@ static STSpace EvalTspace(int face_indices[], const int iFaces, const int piTriL
 			v2 = vsub(p2,p1);
 
 			// project
-			v1 = vsub(v1, vscale(vdot(n,v1),n)); if( VNotZero(v1) ) v1 = Normalize(v1);
-			v2 = vsub(v2, vscale(vdot(n,v2),n)); if( VNotZero(v2) ) v2 = Normalize(v2);
+			v1 = vsub(v1, vscale(vdot(n,v1),n)); if ( VNotZero(v1) ) v1 = Normalize(v1);
+			v2 = vsub(v2, vscale(vdot(n,v2),n)); if ( VNotZero(v2) ) v2 = Normalize(v2);
 
 			// weight contribution by the angle
 			// between the two edge vectors
@@ -1647,7 +1640,7 @@ static void QuickSortEdges(SEdge * pSortBuffer, int iLeft, int iRight, const int
 	SEdge sTmp;
 	const int iElems = iRight-iLeft+1;
 	if (iElems<2) return;
-	else if(iElems==2)
+	else if (iElems==2)
 	{
 		if (pSortBuffer[iLeft].array[channel] > pSortBuffer[iRight].array[channel])
 		{
@@ -1868,8 +1861,8 @@ static void DegenEpilogue(STSpace psTspace[], STriInfo pTriInfos[], int piTriLis
 			int iFlag = (1<<pV[0]) | (1<<pV[1]) | (1<<pV[2]);
 			int iMissingIndex = 0;
 			if ((iFlag&2)==0) iMissingIndex=1;
-			else if((iFlag&4)==0) iMissingIndex=2;
-			else if((iFlag&8)==0) iMissingIndex=3;
+			else if ((iFlag&4)==0) iMissingIndex=2;
+			else if ((iFlag&8)==0) iMissingIndex=3;
 
 			iOrgF = pTriInfos[t].iOrgFaceNumber;
 			vDstP = GetPosition(pContext, MakeIndex(iOrgF, iMissingIndex));
diff --git a/intern/mikktspace/mikktspace.h b/intern/mikktspace/mikktspace.h
index dc2308f6116..52c44a713c6 100644
--- a/intern/mikktspace/mikktspace.h
+++ b/intern/mikktspace/mikktspace.h
@@ -62,8 +62,7 @@ extern "C" {
 typedef int tbool;
 typedef struct SMikkTSpaceContext SMikkTSpaceContext;
 
-typedef struct
-{
+typedef struct {
 	// Returns the number of faces (triangles/quads) on the mesh to be processed.
 	int (*m_getNumFaces)(const SMikkTSpaceContext * pContext);
 
diff --git a/release/plugins/sequence/Makefile b/intern/raskter/CMakeLists.txt
index 2b12e62d24a..3e1368d8eb0 100644
--- a/release/plugins/sequence/Makefile
+++ b/intern/raskter/CMakeLists.txt
@@ -14,19 +14,27 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
-# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+# The Original Code is Copyright (C) 2012, Blender Foundation
 # All rights reserved.
 #
 # The Original Code is: all of this file.
 #
-# Contributor(s): none yet.
+# Contributor(s): Peter Larabell
 #
 # ***** END GPL LICENSE BLOCK *****
 
-all: plugins
+set(INC
+	.
+)
 
-plugins:
-	@/bin/sh -c 'for i in *.c; do ../bmake $$i; done;'
+set(INC_SYS
+	
+)
 
-clean:
-	rm -rf *.o *.so
+set(SRC
+	raskter.c
+
+	raskter.h
+)
+
+blender_add_lib(bf_intern_raskter "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/raskter/SConscript b/intern/raskter/SConscript
new file mode 100644
index 00000000000..7ad505d70e4
--- /dev/null
+++ b/intern/raskter/SConscript
@@ -0,0 +1,10 @@
+#!/usr/bin/python
+
+Import ('env')
+
+sources = ['raskter.c']
+
+incs = ''
+defs = ''
+
+env.BlenderLib ('bf_intern_raskter', sources, Split(incs), Split(defs), libtype=['intern'], priority=[100] )
diff --git a/intern/raskter/raskter.c b/intern/raskter/raskter.c
new file mode 100644
index 00000000000..910cd4c6a3d
--- /dev/null
+++ b/intern/raskter/raskter.c
@@ -0,0 +1,1327 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2012 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Peter Larabell.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+/** \file raskter.c
+ *  \ingroup RASKTER
+ */
+
+#include <stdlib.h>
+#include "raskter.h"
+
+/* from BLI_utildefines.h */
+#define MIN2(x, y)               ( (x) < (y) ? (x) : (y) )
+#define MAX2(x, y)               ( (x) > (y) ? (x) : (y) )
+#define ABS(a)          ( (a) < 0 ? (-(a)) : (a) )
+
+struct e_status {
+	int x;
+	int ybeg;
+	int xshift;
+	int xdir;
+	int drift;
+	int drift_inc;
+	int drift_dec;
+	int num;
+	struct e_status *e_next;
+};
+
+struct r_buffer_stats {
+	float *buf;
+	int sizex;
+	int sizey;
+};
+
+struct r_fill_context {
+	struct e_status *all_edges, *possible_edges;
+	struct r_buffer_stats rb;
+};
+
+/*
+ * Sort all the edges of the input polygon by Y, then by X, of the "first" vertex encountered.
+ * This will ensure we can scan convert the entire poly in one pass.
+ *
+ * Really the poly should be clipped to the frame buffer's dimensions here for speed of drawing
+ * just the poly. Since the DEM code could end up being coupled with this, we'll keep it separate
+ * for now.
+ */
+static void preprocess_all_edges(struct r_fill_context *ctx, struct poly_vert *verts, int num_verts, struct e_status *open_edge) {
+	int i;
+	int xbeg;
+	int ybeg;
+	int xend;
+	int yend;
+	int dx;
+	int dy;
+	int temp_pos;
+	int xdist;
+	struct e_status *e_new;
+	struct e_status *next_edge;
+	struct e_status **next_edge_ref;
+	struct poly_vert *v;
+	/* set up pointers */
+	v = verts;
+	ctx->all_edges = NULL;
+	/* loop all verts */
+	for (i = 0; i < num_verts; i++) {
+		/* determine beginnings and endings of edges, linking last vertex to first vertex */
+		xbeg = v[i].x;
+		ybeg = v[i].y;
+		if (i) {
+			/* we're not at the last vert, so end of the edge is the previous vertex */
+			xend = v[i - 1].x;
+			yend = v[i - 1].y;
+		} else {
+			/* we're at the first vertex, so the "end" of this edge is the last vertex */
+			xend = v[num_verts - 1].x;
+			yend = v[num_verts - 1].y;
+		}
+		/* make sure our edges are facing the correct direction */
+		if (ybeg > yend) {
+			/* flip the Xs */
+			temp_pos = xbeg;
+			xbeg = xend;
+			xend = temp_pos;
+			/* flip the Ys */
+			temp_pos = ybeg;
+			ybeg = yend;
+			yend = temp_pos;
+		}
+
+		/* calculate y delta */
+		dy = yend - ybeg;
+		/* dont draw horizontal lines directly, they are scanned as part of the edges they connect, so skip em. :) */
+		if (dy) {
+			/* create the edge and determine it's slope (for incremental line drawing) */
+			e_new = open_edge++;
+
+			/* calculate x delta */
+			dx = xend - xbeg;
+			if (dx > 0) {
+				e_new->xdir = 1;
+				xdist = dx;
+			} else {
+				e_new->xdir = -1;
+				xdist = -dx;
+			}
+
+			e_new->x = xbeg;
+			e_new->ybeg = ybeg;
+			e_new->num = dy;
+			e_new->drift_dec = dy;
+
+			/* calculate deltas for incremental drawing */
+			if (dx >= 0) {
+				e_new->drift = 0;
+			} else {
+				e_new->drift = -dy + 1;
+			}
+			if (dy >= xdist) {
+				e_new->drift_inc = xdist;
+				e_new->xshift = 0;
+			} else {
+				e_new->drift_inc = xdist % dy;
+				e_new->xshift = (xdist / dy) * e_new->xdir;
+			}
+			next_edge_ref = &ctx->all_edges;
+			/* link in all the edges, in sorted order */
+			for (;; ) {
+				next_edge = *next_edge_ref;
+				if (!next_edge || (next_edge->ybeg > ybeg) || ((next_edge->ybeg == ybeg) && (next_edge->x >= xbeg))) {
+					e_new->e_next = next_edge;
+					*next_edge_ref = e_new;
+					break;
+				}
+				next_edge_ref = &next_edge->e_next;
+			}
+		}
+	}
+}
+
+/*
+ * This function clips drawing to the frame buffer. That clipping will likely be moved into the preprocessor
+ * for speed, but waiting on final design choices for curve-data before eliminating data the DEM code will need
+ * if it ends up being coupled with this function.
+ */
+static int rast_scan_fill(struct r_fill_context *ctx, struct poly_vert *verts, int num_verts, float intensity) {
+	int x_curr;                 /* current pixel position in X */
+	int y_curr;                 /* current scan line being drawn */
+	int yp;                     /* y-pixel's position in frame buffer */
+	int swixd = 0;              /* whether or not edges switched position in X */
+	float *cpxl;                /* pixel pointers... */
+	float *mpxl;
+	float *spxl;
+	struct e_status *e_curr;    /* edge pointers... */
+	struct e_status *e_temp;
+	struct e_status *edgbuf;
+	struct e_status **edgec;
+
+
+	/*
+	 * If the number of verts specified to render as a polygon is less than 3,
+	 * return immediately. Obviously we cant render a poly with sides < 3. The
+	 * return for this we set to 1, simply so it can be distinguished from the
+	 * next place we could return, /home/guest/blender-svn/soc-2011-tomato/intern/raskter/raskter.
+	 * which is a failure to allocate memory.
+	 */
+	if (num_verts < 3) {
+		return(1);
+	}
+
+	/*
+	 * Try to allocate an edge buffer in memory. needs to be the size of the edge tracking data
+	 * multiplied by the number of edges, which is always equal to the number of verts in
+	 * a 2D polygon. Here we return 0 to indicate a memory allocation failure, as opposed to a 1 for
+	 * the preceeding error, which was a rasterization request on a 2D poly with less than
+	 * 3 sides.
+	 */
+	if ((edgbuf = (struct e_status *)(malloc(sizeof(struct e_status) * num_verts))) == NULL) {
+		return(0);
+	}
+
+	/*
+	 * Do some preprocessing on all edges. This constructs a table structure in memory of all
+	 * the edge properties and can "flip" some edges so sorting works correctly.
+	 */
+	preprocess_all_edges(ctx, verts, num_verts, edgbuf);
+
+	/*
+	 * Set the pointer for tracking the edges currently in processing to NULL to make sure
+	 * we don't get some crazy value after initialization.
+	 */
+	ctx->possible_edges = NULL;
+
+	/*
+	 * Loop through all scan lines to be drawn. Since we sorted by Y values during
+	 * preprocess_all_edges(), we can already exact values for the lowest and
+	 * highest Y values we could possibly need by induction. The preprocessing sorted
+	 * out edges by Y position, we can cycle the current edge being processed once
+	 * it runs out of Y pixels. When we have no more edges, meaning the current edge
+	 * is NULL after setting the "current" edge to be the previous current edge's
+	 * "next" edge in the Y sorted edge connection chain, we can stop looping Y values,
+	 * since we can't possibly have more scan lines if we ran out of edges. :)
+	 *
+	 * TODO: This clips Y to the frame buffer, which should be done in the preprocessor, but for now is done here.
+	 *       Will get changed once DEM code gets in.
+	 */
+	for (y_curr = ctx->all_edges->ybeg; (ctx->all_edges || ctx->possible_edges); y_curr++) {
+
+		/*
+		 * Link any edges that start on the current scan line into the list of
+		 * edges currently needed to draw at least this, if not several, scan lines.
+		 */
+
+		/*
+		 * Set the current edge to the beginning of the list of edges to be rasterized
+		 * into this scan line.
+		 *
+		 * We could have lots of edge here, so iterate over all the edges needed. The
+		 * preprocess_all_edges() function sorted edges by X within each chunk of Y sorting
+		 * so we safely cycle edges to thier own "next" edges in order.
+		 *
+		 * At each iteration, make sure we still have a non-NULL edge.
+		 */
+		for (edgec = &ctx->possible_edges; ctx->all_edges && (ctx->all_edges->ybeg == y_curr); ) {
+			x_curr = ctx->all_edges->x;                  /* Set current X position. */
+			for (;; ) {                                  /* Start looping edges. Will break when edges run out. */
+				e_curr = *edgec;                         /* Set up a current edge pointer. */
+				if (!e_curr || (e_curr->x >= x_curr)) {  /* If we have an no edge, or we need to skip some X-span, */
+					e_temp = ctx->all_edges->e_next;     /* set a temp "next" edge to test. */
+					*edgec = ctx->all_edges;             /* Add this edge to the list to be scanned. */
+					ctx->all_edges->e_next = e_curr;     /* Set up the next edge. */
+					edgec = &ctx->all_edges->e_next;     /* Set our list to the next edge's location in memory. */
+					ctx->all_edges = e_temp;             /* Skip the NULL or bad X edge, set pointer to next edge. */
+					break;                               /* Stop looping edges (since we ran out or hit empty X span. */
+				} else {
+					edgec = &e_curr->e_next;             /* Set the pointer to the edge list the "next" edge. */
+				}
+			}
+		}
+
+		/*
+		 * Determine the current scan line's offset in the pixel buffer based on its Y position.
+		 * Basically we just multiply the current scan line's Y value by the number of pixels in each line.
+		 */
+		yp = y_curr * ctx->rb.sizex;
+		/*
+		 * Set a "scan line pointer" in memory. The location of the buffer plus the row offset.
+		 */
+		spxl = ctx->rb.buf + (yp);
+		/*
+		 * Set up the current edge to the first (in X) edge. The edges which could possibly be in this
+		 * list were determined in the preceeding edge loop above. They were already sorted in X by the
+		 * initial processing function.
+		 *
+		 * At each iteration, test for a NULL edge. Since we'll keep cycling edge's to their own "next" edge
+		 * we will eventually hit a NULL when the list runs out.
+		 */
+		for (e_curr = ctx->possible_edges; e_curr; e_curr = e_curr->e_next) {
+			/*
+			 * Calculate a span of pixels to fill on the current scan line.
+			 *
+			 * Set the current pixel pointer by adding the X offset to the scan line's start offset.
+			 * Cycle the current edge the next edge.
+			 * Set the max X value to draw to be one less than the next edge's first pixel. This way we are
+			 * sure not to ever get into a situation where we have overdraw. (drawing the same pixel more than
+			 * one time because it's on a vertex connecting two edges)
+			 *
+			 * Then blast through all the pixels in the span, advancing the pointer and setting the color to white.
+			 *
+			 * TODO: Here we clip to the scan line, this is not efficient, and should be done in the preprocessor,
+			 *       but for now it is done here until the DEM code comes in.
+			 */
+
+			/* set up xmin and xmax bounds on this scan line */
+			cpxl = spxl + MAX2(e_curr->x, 0);
+			e_curr = e_curr->e_next;
+			mpxl = spxl + MIN2(e_curr->x, ctx->rb.sizex) - 1;
+
+			if ((y_curr >= 0) && (y_curr < ctx->rb.sizey)) {
+				/* draw the pixels. */
+				for(; cpxl <= mpxl; *cpxl++ += intensity);
+			}
+		}
+
+		/*
+		 * Loop through all edges of polygon that could be hit by this scan line,
+		 * and figure out their x-intersections with the next scan line.
+		 *
+		 * Either A.) we wont have any more edges to test, or B.) we just add on the
+		 * slope delta computed in preprocessing step. Since this draws non-antialiased
+		 * polygons, we dont have fractional positions, so we only move in x-direction
+		 * when needed to get all the way to the next pixel over...
+		 */
+		for (edgec = &ctx->possible_edges; (e_curr = *edgec); ) {
+			if (!(--(e_curr->num))) {
+				*edgec = e_curr->e_next;
+			} else {
+				e_curr->x += e_curr->xshift;
+				if ((e_curr->drift += e_curr->drift_inc) > 0) {
+					e_curr->x += e_curr->xdir;
+					e_curr->drift -= e_curr->drift_dec;
+				}
+				edgec = &e_curr->e_next;
+			}
+		}
+		/*
+		 * It's possible that some edges may have crossed during the last step, so we'll be sure
+		 * that we ALWAYS intersect scan lines in order by shuffling if needed to make all edges
+		 * sorted by x-intersection coordinate. We'll always scan through at least once to see if
+		 * edges crossed, and if so, we set the 'swixd' flag. If 'swixd' gets set on the initial
+		 * pass, then we know we need to sort by x, so then cycle through edges again and perform
+		 * the sort.-
+		 */
+		if (ctx->possible_edges) {
+			for (edgec = &ctx->possible_edges; (e_curr = *edgec)->e_next; edgec = &(*edgec)->e_next) {
+				/* if the current edge hits scan line at greater X than the next edge, we need to exchange the edges */
+				if (e_curr->x > e_curr->e_next->x) {
+					*edgec = e_curr->e_next;
+					/* exchange the pointers */
+					e_temp = e_curr->e_next->e_next;
+					e_curr->e_next->e_next = e_curr;
+					e_curr->e_next = e_temp;
+					/* set flag that we had at least one switch */
+					swixd = 1;
+				}
+			}
+			/* if we did have a switch, look for more (there will more if there was one) */
+			for (;; ) {
+				/* reset exchange flag so it's only set if we encounter another one */
+				swixd = 0;
+				for (edgec = &ctx->possible_edges; (e_curr = *edgec)->e_next; edgec = &(*edgec)->e_next) {
+					/* again, if current edge hits scan line at higher X than next edge, exchange the edges and set flag */
+					if (e_curr->x > e_curr->e_next->x) {
+						*edgec = e_curr->e_next;
+						/* exchange the pointers */
+						e_temp = e_curr->e_next->e_next;
+						e_curr->e_next->e_next = e_curr;
+						e_curr->e_next = e_temp;
+						/* flip the exchanged flag */
+						swixd = 1;
+					}
+				}
+				/* if we had no exchanges, we're done reshuffling the pointers */
+				if (!swixd) {
+					break;
+				}
+			}
+		}
+	}
+
+	free(edgbuf);
+	return 1;
+}
+
+int PLX_raskterize(float (*base_verts)[2], int num_base_verts,
+				   float *buf, int buf_x, int buf_y, int do_mask_AA) {
+	int subdiv_AA = (do_mask_AA != 0)? 8:0;
+	int i;                                   /* i: Loop counter. */
+	int sAx;
+	int sAy;
+	struct poly_vert *ply;                   /* ply: Pointer to a list of integer buffer-space vertex coordinates. */
+	struct r_fill_context ctx = {0};
+	const float buf_x_f = (float)(buf_x);
+	const float buf_y_f = (float)(buf_y);
+	float div_offset=(1.0f / (float)(subdiv_AA));
+	float div_offset_static = 0.5f * (float)(subdiv_AA) * div_offset;
+	/*
+	 * Allocate enough memory for our poly_vert list. It'll be the size of the poly_vert
+	 * data structure multiplied by the number of base_verts.
+	 *
+	 * In the event of a failure to allocate the memory, return 0, so this error can
+	 * be distinguished as a memory allocation error.
+	 */
+	if ((ply = (struct poly_vert *)(malloc(sizeof(struct poly_vert) * num_base_verts))) == NULL) {
+		return(0);
+	}
+
+	ctx.rb.buf = buf;                            /* Set the output buffer pointer. */
+	ctx.rb.sizex = buf_x;                        /* Set the output buffer size in X. (width) */
+	ctx.rb.sizey = buf_y;                        /* Set the output buffer size in Y. (height) */
+	/*
+	 * Loop over all verts passed in to be rasterized. Each vertex's X and Y coordinates are
+	 * then converted from normalized screen space (0.0 <= POS <= 1.0) to integer coordinates
+	 * in the buffer-space coordinates passed in inside buf_x and buf_y.
+	 *
+	 * It's worth noting that this function ONLY outputs fully white pixels in a mask. Every pixel
+	 * drawn will be 1.0f in value, there is no anti-aliasing.
+	 */
+
+	if(!subdiv_AA) {
+	for (i = 0; i < num_base_verts; i++) {                          /* Loop over all base_verts. */
+			ply[i].x = (int)((base_verts[i][0] * buf_x_f) + 0.5f);       /* Range expand normalized X to integer buffer-space X. */
+			ply[i].y = (int)((base_verts[i][1] * buf_y_f) + 0.5f); /* Range expand normalized Y to integer buffer-space Y. */
+	}
+
+		i = rast_scan_fill(&ctx, ply, num_base_verts,1.0f);  /* Call our rasterizer, passing in the integer coords for each vert. */
+	} else {
+		for(sAx=0; sAx < subdiv_AA; sAx++) {
+			for(sAy=0; sAy < subdiv_AA; sAy++) {
+				for(i=0; i < num_base_verts; i++) {
+					ply[i].x = (int)((base_verts[i][0]*buf_x_f)+0.5f - div_offset_static + (div_offset*(float)(sAx)));
+					ply[i].y = (int)((base_verts[i][1]*buf_y_f)+0.5f - div_offset_static + (div_offset*(float)(sAy)));
+				}
+				i = rast_scan_fill(&ctx, ply, num_base_verts,(1.0f / (float)(subdiv_AA*subdiv_AA)));
+			}
+		}
+	}
+	free(ply);                                      /* Free the memory allocated for the integer coordinate table. */
+	return(i);                                      /* Return the value returned by the rasterizer. */
+}
+
+/*
+ * This function clips drawing to the frame buffer. That clipping will likely be moved into the preprocessor
+ * for speed, but waiting on final design choices for curve-data before eliminating data the DEM code will need
+ * if it ends up being coupled with this function.
+ */
+static int rast_scan_feather(struct r_fill_context *ctx,
+                             float (*base_verts_f)[2], int num_base_verts,
+							 struct poly_vert *feather_verts, float(*feather_verts_f)[2], int num_feather_verts) {
+	int x_curr;                 /* current pixel position in X */
+	int y_curr;                 /* current scan line being drawn */
+	int yp;                     /* y-pixel's position in frame buffer */
+	int swixd = 0;              /* whether or not edges switched position in X */
+	float *cpxl;                /* pixel pointers... */
+	float *mpxl;
+	float *spxl;
+	struct e_status *e_curr;    /* edge pointers... */
+	struct e_status *e_temp;
+	struct e_status *edgbuf;
+	struct e_status **edgec;
+
+	/* from dem */
+	int a;                          // a = temporary pixel index buffer loop counter
+	float fsz;                        // size of the frame
+	unsigned int rsl;               // long used for finding fast 1.0/sqrt
+	float rsf;                      // float used for finding fast 1.0/sqrt
+	const float rsopf = 1.5f;       // constant float used for finding fast 1.0/sqrt
+
+	//unsigned int gradientFillOffset;
+	float t;
+	float ud;                // ud = unscaled edge distance
+	float dmin;              // dmin = minimun edge distance
+	float odist;                    // odist = current outer edge distance
+	float idist;                    // idist = current inner edge distance
+	float dx;                         // dx = X-delta (used for distance proportion calculation)
+	float dy;                         // dy = Y-delta (used for distance proportion calculation)
+	float xpxw = (1.0f / (float)(ctx->rb.sizex));  // xpxw = normalized pixel width
+	float ypxh = (1.0f / (float)(ctx->rb.sizey));  // ypxh = normalized pixel height
+
+	/*
+	 * If the number of verts specified to render as a polygon is less than 3,
+	 * return immediately. Obviously we cant render a poly with sides < 3. The
+	 * return for this we set to 1, simply so it can be distinguished from the
+	 * next place we could return, /home/guest/blender-svn/soc-2011-tomato/intern/raskter/raskter
+	 * which is a failure to allocate memory.
+	 */
+	if (num_feather_verts < 3) {
+		return(1);
+	}
+
+	/*
+	 * Try to allocate an edge buffer in memory. needs to be the size of the edge tracking data
+	 * multiplied by the number of edges, which is always equal to the number of verts in
+	 * a 2D polygon. Here we return 0 to indicate a memory allocation failure, as opposed to a 1 for
+	 * the preceeding error, which was a rasterization request on a 2D poly with less than
+	 * 3 sides.
+	 */
+	if ((edgbuf = (struct e_status *)(malloc(sizeof(struct e_status) * num_feather_verts))) == NULL) {
+		return(0);
+	}
+
+	/*
+	 * Do some preprocessing on all edges. This constructs a table structure in memory of all
+	 * the edge properties and can "flip" some edges so sorting works correctly.
+	 */
+	preprocess_all_edges(ctx, feather_verts, num_feather_verts, edgbuf);
+
+	/*
+	 * Set the pointer for tracking the edges currently in processing to NULL to make sure
+	 * we don't get some crazy value after initialization.
+	 */
+	ctx->possible_edges = NULL;
+
+	/*
+	 * Loop through all scan lines to be drawn. Since we sorted by Y values during
+	 * preprocess_all_edges(), we can already exact values for the lowest and
+	 * highest Y values we could possibly need by induction. The preprocessing sorted
+	 * out edges by Y position, we can cycle the current edge being processed once
+	 * it runs out of Y pixels. When we have no more edges, meaning the current edge
+	 * is NULL after setting the "current" edge to be the previous current edge's
+	 * "next" edge in the Y sorted edge connection chain, we can stop looping Y values,
+	 * since we can't possibly have more scan lines if we ran out of edges. :)
+	 *
+	 * TODO: This clips Y to the frame buffer, which should be done in the preprocessor, but for now is done here.
+	 *       Will get changed once DEM code gets in.
+	 */
+	for (y_curr = ctx->all_edges->ybeg; (ctx->all_edges || ctx->possible_edges); y_curr++) {
+
+		/*
+		 * Link any edges that start on the current scan line into the list of
+		 * edges currently needed to draw at least this, if not several, scan lines.
+		 */
+
+		/*
+		 * Set the current edge to the beginning of the list of edges to be rasterized
+		 * into this scan line.
+		 *
+		 * We could have lots of edge here, so iterate over all the edges needed. The
+		 * preprocess_all_edges() function sorted edges by X within each chunk of Y sorting
+		 * so we safely cycle edges to thier own "next" edges in order.
+		 *
+		 * At each iteration, make sure we still have a non-NULL edge.
+		 */
+		for (edgec = &ctx->possible_edges; ctx->all_edges && (ctx->all_edges->ybeg == y_curr); ) {
+			x_curr = ctx->all_edges->x;                  /* Set current X position. */
+			for (;; ) {                                  /* Start looping edges. Will break when edges run out. */
+				e_curr = *edgec;                         /* Set up a current edge pointer. */
+				if (!e_curr || (e_curr->x >= x_curr)) {  /* If we have an no edge, or we need to skip some X-span, */
+					e_temp = ctx->all_edges->e_next;     /* set a temp "next" edge to test. */
+					*edgec = ctx->all_edges;             /* Add this edge to the list to be scanned. */
+					ctx->all_edges->e_next = e_curr;     /* Set up the next edge. */
+					edgec = &ctx->all_edges->e_next;     /* Set our list to the next edge's location in memory. */
+					ctx->all_edges = e_temp;             /* Skip the NULL or bad X edge, set pointer to next edge. */
+					break;                               /* Stop looping edges (since we ran out or hit empty X span. */
+				} else {
+					edgec = &e_curr->e_next;             /* Set the pointer to the edge list the "next" edge. */
+				}
+			}
+		}
+
+		/*
+		 * Determine the current scan line's offset in the pixel buffer based on its Y position.
+		 * Basically we just multiply the current scan line's Y value by the number of pixels in each line.
+		 */
+		yp = y_curr * ctx->rb.sizex;
+		/*
+		 * Set a "scan line pointer" in memory. The location of the buffer plus the row offset.
+		 */
+		spxl = ctx->rb.buf + (yp);
+		/*
+		 * Set up the current edge to the first (in X) edge. The edges which could possibly be in this
+		 * list were determined in the preceeding edge loop above. They were already sorted in X by the
+		 * initial processing function.
+		 *
+		 * At each iteration, test for a NULL edge. Since we'll keep cycling edge's to their own "next" edge
+		 * we will eventually hit a NULL when the list runs out.
+		 */
+		for (e_curr = ctx->possible_edges; e_curr; e_curr = e_curr->e_next) {
+			/*
+			 * Calculate a span of pixels to fill on the current scan line.
+			 *
+			 * Set the current pixel pointer by adding the X offset to the scan line's start offset.
+			 * Cycle the current edge the next edge.
+			 * Set the max X value to draw to be one less than the next edge's first pixel. This way we are
+			 * sure not to ever get into a situation where we have overdraw. (drawing the same pixel more than
+			 * one time because it's on a vertex connecting two edges)
+			 *
+			 * Then blast through all the pixels in the span, advancing the pointer and setting the color to white.
+			 *
+			 * TODO: Here we clip to the scan line, this is not efficient, and should be done in the preprocessor,
+			 *       but for now it is done here until the DEM code comes in.
+			 */
+
+			/* set up xmin and xmax bounds on this scan line */
+			cpxl = spxl + MAX2(e_curr->x, 0);
+			e_curr = e_curr->e_next;
+			mpxl = spxl + MIN2(e_curr->x, ctx->rb.sizex) - 1;
+
+			if ((y_curr >= 0) && (y_curr < ctx->rb.sizey)) {
+				t = ((float)((cpxl - spxl) % ctx->rb.sizex) + 0.5f) * xpxw;
+				fsz = ((float)(y_curr) + 0.5f) * ypxh;
+				/* draw the pixels. */
+				for (; cpxl <= mpxl; cpxl++, t += xpxw) {
+					//do feather check
+					// first check that pixel isn't already full, and only operate if it is not
+					if (*cpxl < 0.9999f) {
+
+						dmin = 2.0f;                        // reset min distance to edge pixel
+						for (a = 0; a < num_feather_verts; a++) { // loop through all outer edge buffer pixels
+							dy = t - feather_verts_f[a][0];          // set dx to gradient pixel column - outer edge pixel row
+							dx = fsz - feather_verts_f[a][1];        // set dy to gradient pixel row - outer edge pixel column
+							ud = dx * dx + dy * dy;               // compute sum of squares
+							if (ud < dmin) {                      // if our new sum of squares is less than the current minimum
+								dmin = ud;                        // set a new minimum equal to the new lower value
+							}
+						}
+						odist = dmin;                    // cast outer min to a float
+						rsf = odist * 0.5f;                       //
+						rsl = *(unsigned int *)&odist;            // use some peculiar properties of the way bits are stored
+						rsl = 0x5f3759df - (rsl >> 1);            // in floats vs. unsigned ints to compute an approximate
+						odist = *(float *)&rsl;                   // reciprocal square root
+						odist = odist * (rsopf - (rsf * odist * odist));  // -- ** this line can be iterated for more accuracy ** --
+						odist = odist * (rsopf - (rsf * odist * odist));
+						dmin = 2.0f;                        // reset min distance to edge pixel
+						for (a = 0; a < num_base_verts; a++) {    // loop through all inside edge pixels
+							dy = t - base_verts_f[a][0];             // compute delta in Y from gradient pixel to inside edge pixel
+							dx = fsz - base_verts_f[a][1];           // compute delta in X from gradient pixel to inside edge pixel
+							ud = dx * dx + dy * dy;   // compute sum of squares
+							if (ud < dmin) {          // if our new sum of squares is less than the current minimum we've found
+								dmin = ud;            // set a new minimum equal to the new lower value
+							}
+						}
+						idist = dmin;                    // cast inner min to a float
+						rsf = idist * 0.5f;                       //
+						rsl = *(unsigned int *)&idist;            //
+						rsl = 0x5f3759df - (rsl >> 1);            // see notes above
+						idist = *(float *)&rsl;                   //
+						idist = idist * (rsopf - (rsf * idist * idist));  //
+						idist = idist * (rsopf - (rsf * idist * idist));
+						/*
+						 * Note once again that since we are using reciprocals of distance values our
+						 * proportion is already the correct intensity, and does not need to be
+						 * subracted from 1.0 like it would have if we used real distances.
+						 */
+
+						/* set intensity, do the += so overlapping gradients are additive */
+						*cpxl = (idist / (idist + odist));
+					}
+				}
+			}
+		}
+
+		/*
+		 * Loop through all edges of polygon that could be hit by this scan line,
+		 * and figure out their x-intersections with the next scan line.
+		 *
+		 * Either A.) we wont have any more edges to test, or B.) we just add on the
+		 * slope delta computed in preprocessing step. Since this draws non-antialiased
+		 * polygons, we dont have fractional positions, so we only move in x-direction
+		 * when needed to get all the way to the next pixel over...
+		 */
+		for (edgec = &ctx->possible_edges; (e_curr = *edgec); ) {
+			if (!(--(e_curr->num))) {
+				*edgec = e_curr->e_next;
+			} else {
+				e_curr->x += e_curr->xshift;
+				if ((e_curr->drift += e_curr->drift_inc) > 0) {
+					e_curr->x += e_curr->xdir;
+					e_curr->drift -= e_curr->drift_dec;
+				}
+				edgec = &e_curr->e_next;
+			}
+		}
+		/*
+		 * It's possible that some edges may have crossed during the last step, so we'll be sure
+		 * that we ALWAYS intersect scan lines in order by shuffling if needed to make all edges
+		 * sorted by x-intersection coordinate. We'll always scan through at least once to see if
+		 * edges crossed, and if so, we set the 'swixd' flag. If 'swixd' gets set on the initial
+		 * pass, then we know we need to sort by x, so then cycle through edges again and perform
+		 * the sort.-
+		 */
+		if (ctx->possible_edges) {
+			for (edgec = &ctx->possible_edges; (e_curr = *edgec)->e_next; edgec = &(*edgec)->e_next) {
+				/* if the current edge hits scan line at greater X than the next edge, we need to exchange the edges */
+				if (e_curr->x > e_curr->e_next->x) {
+					*edgec = e_curr->e_next;
+					/* exchange the pointers */
+					e_temp = e_curr->e_next->e_next;
+					e_curr->e_next->e_next = e_curr;
+					e_curr->e_next = e_temp;
+					/* set flag that we had at least one switch */
+					swixd = 1;
+				}
+			}
+			/* if we did have a switch, look for more (there will more if there was one) */
+			for (;; ) {
+				/* reset exchange flag so it's only set if we encounter another one */
+				swixd = 0;
+				for (edgec = &ctx->possible_edges; (e_curr = *edgec)->e_next; edgec = &(*edgec)->e_next) {
+					/* again, if current edge hits scan line at higher X than next edge,
+					 * exchange the edges and set flag */
+					if (e_curr->x > e_curr->e_next->x) {
+						*edgec = e_curr->e_next;
+						/* exchange the pointers */
+						e_temp = e_curr->e_next->e_next;
+						e_curr->e_next->e_next = e_curr;
+						e_curr->e_next = e_temp;
+						/* flip the exchanged flag */
+						swixd = 1;
+					}
+				}
+				/* if we had no exchanges, we're done reshuffling the pointers */
+				if (!swixd) {
+					break;
+				}
+			}
+		}
+	}
+
+	free(edgbuf);
+	return 1;
+}
+
+int PLX_raskterize_feather(float (*base_verts)[2], int num_base_verts, float (*feather_verts)[2], int num_feather_verts,
+						   float *buf, int buf_x, int buf_y) {
+	int i;                            /* i: Loop counter. */
+	struct poly_vert *fe;             /* fe: Pointer to a list of integer buffer-space feather vertex coords. */
+	struct r_fill_context ctx = {0};
+
+	/* for faster multiply */
+	const float buf_x_f = (float)buf_x;
+	const float buf_y_f = (float)buf_y;
+
+	/*
+	 * Allocate enough memory for our poly_vert list. It'll be the size of the poly_vert
+	 * data structure multiplied by the number of verts.
+	 *
+	 * In the event of a failure to allocate the memory, return 0, so this error can
+	 * be distinguished as a memory allocation error.
+	 */
+	if ((fe = (struct poly_vert *)(malloc(sizeof(struct poly_vert) * num_feather_verts))) == NULL) {
+		return(0);
+	}
+
+	/*
+	 * Loop over all verts passed in to be rasterized. Each vertex's X and Y coordinates are
+	 * then converted from normalized screen space (0.0 <= POS <= 1.0) to integer coordinates
+	 * in the buffer-space coordinates passed in inside buf_x and buf_y.
+	 *
+	 * It's worth noting that this function ONLY outputs fully white pixels in a mask. Every pixel
+	 * drawn will be 1.0f in value, there is no anti-aliasing.
+	 */
+	for (i = 0; i < num_feather_verts; i++) {            /* Loop over all verts. */
+		fe[i].x = (int)((feather_verts[i][0] * buf_x_f) + 0.5f);  /* Range expand normalized X to integer buffer-space X. */
+		fe[i].y = (int)((feather_verts[i][1] * buf_y_f) + 0.5f);  /* Range expand normalized Y to integer buffer-space Y. */
+	}
+
+	ctx.rb.buf = buf;                            /* Set the output buffer pointer. */
+	ctx.rb.sizex = buf_x;                        /* Set the output buffer size in X. (width) */
+	ctx.rb.sizey = buf_y;                        /* Set the output buffer size in Y. (height) */
+
+	/* Call our rasterizer, passing in the integer coords for each vert. */
+	i = rast_scan_feather(&ctx, base_verts, num_base_verts, fe, feather_verts, num_feather_verts);
+	free(fe);
+	return i;                                   /* Return the value returned by the rasterizer. */
+}
+
+int get_range_expanded_pixel_coord(float normalized_value, int max_value) {
+	return (int)((normalized_value * (float)(max_value)) + 0.5f);
+}
+
+float get_pixel_intensity(float *buf, int buf_x, int buf_y, int pos_x, int pos_y) {
+	if(pos_x < 0 || pos_x >= buf_x || pos_y < 0 || pos_y >= buf_y) {
+		return 0.0f;
+	}
+	return buf[(pos_y * buf_y) + buf_x];
+}
+
+float get_pixel_intensity_bilinear(float *buf, int buf_x, int buf_y, float u, float v) {
+	int a;
+	int b;
+	int a_plus_1;
+	int b_plus_1;
+	float prop_u;
+	float prop_v;
+	float inv_prop_u;
+	float inv_prop_v;
+	if(u<0.0f || u>1.0f || v<0.0f || v>1.0f) {
+		return 0.0f;
+	}
+	u = u * (float)(buf_x) - 0.5f;
+	v = v * (float)(buf_y) - 0.5f;
+	a = (int)(u);
+	b = (int)(v);
+	prop_u = u - (float)(a);
+	prop_v = v - (float)(b);
+	inv_prop_u = 1.0f - prop_u;
+	inv_prop_v = 1.0f - prop_v;
+	a_plus_1 = MIN2((buf_x-1),a+1);
+	b_plus_1 = MIN2((buf_y-1),b+1);
+	return (buf[(b * buf_y) + a] * inv_prop_u + buf[(b*buf_y)+(a_plus_1)] * prop_u)*inv_prop_v+(buf[((b_plus_1) * buf_y)+a] * inv_prop_u + buf[((b_plus_1)*buf_y)+(a_plus_1)] * prop_u) * prop_v;
+
+}
+
+void set_pixel_intensity(float *buf, int buf_x, int buf_y, int pos_x, int pos_y, float intensity) {
+	if(pos_x < 0 || pos_x >= buf_x || pos_y < 0 || pos_y >= buf_y) {
+		return;
+	}
+	buf[(pos_y * buf_y) + buf_x] = intensity;
+}
+#define __PLX__FAKE_AA__
+int PLX_antialias_buffer(float *buf, int buf_x, int buf_y) {
+#ifdef __PLX__FAKE_AA__
+#ifdef __PLX_GREY_AA__
+	int i=0;
+	int sz = buf_x * buf_y;
+	for(i=0; i<sz; i++) {
+		buf[i] *= 0.5f;
+	}
+#endif
+	(void)buf_x;
+	(void)buf_y;
+	(void)buf;
+	return 1;
+#else
+	/*XXX - TODO: THIS IS NOT FINAL CODE - IT DOES NOT WORK - DO NOT ENABLE IT */
+	const float p0 = 1.0f;
+	const float p1 = 1.0f;
+	const float p2 = 1.0f;
+	const float p3 = 1.0f;
+	const float p4 = 1.0f;
+	const float p5 = 1.5f;
+	const float p6 = 2.0f;
+	const float p7 = 2.0f;
+	const float p8 = 2.0f;
+	const float p9 = 2.0f;
+	const float p10 = 4.0f;
+	const float p11 = 8.0f;
+
+	const float edge_threshold = 0.063f;
+	const float edge_threshold_min = 0.0312f;
+	const float quality_subpix = 1.0f;
+//	int px_x;
+//	int px_y;
+
+	float posM_x,posM_y;
+	float posB_x,posB_y;
+	float posN_x,posN_y;
+	float posP_x,posP_y;
+	float offNP_x,offNP_y;
+	float lumaM;
+	float lumaS;
+	float lumaE;
+	float lumaN;
+	float lumaW;
+	float lumaNW;
+	float lumaSE;
+	float lumaNE;
+	float lumaSW;
+	float lumaNS;
+	float lumaWE;
+	float lumaNESE;
+	float lumaNWNE;
+	float lumaNWSW;
+	float lumaSWSE;
+	float lumaNN;
+	float lumaSS;
+	float lumaEndN;
+	float lumaEndP;
+	float lumaMM;
+	float lumaMLTZero;
+	float subpixNWSWNESE;
+	float subpixRcpRange;
+	float subpixNSWE;
+	float maxSM;
+	float minSM;
+	float maxESM;
+	float minESM;
+	float maxWN;
+	float minWN;
+	float rangeMax;
+	float rangeMin;
+	float rangeMaxScaled;
+	float range;
+	float rangeMaxClamped;
+	float edgeHorz;
+	float edgeVert;
+	float edgeHorz1;
+	float edgeVert1;
+	float edgeHorz2;
+	float edgeVert2;
+	float edgeHorz3;
+	float edgeVert3;
+	float edgeHorz4;
+	float edgeVert4;
+	float lengthSign;
+	float subpixA;
+	float subpixB;
+	float subpixC;
+	float subpixD;
+	float subpixE;
+	float subpixF;
+	float subpixG;
+	float subpixH;
+	float gradientN;
+	float gradientS;
+	float gradient;
+	float gradientScaled;
+	float dstN;
+	float dstP;
+	float dst;
+	float spanLength;
+	float spanLengthRcp;
+	float pixelOffset;
+	float pixelOffsetGood;
+	float pixelOffsetSubpix;
+	int directionN;
+	int goodSpan;
+	int goodSpanN;
+	int goodSpanP;
+	int horzSpan;
+	int earlyExit;
+	int pairN;
+	int doneN;
+	int doneP;
+	int doneNP;
+	int curr_x=0;
+	int curr_y=0;
+	for(curr_y=0; curr_y < buf_y; curr_y++) {
+		for(curr_x=0; curr_x < buf_x; curr_x++) {
+			posM_x = ((float)(curr_x) + 0.5f) * (1.0f/(float)(buf_x));
+			posM_y = ((float)(curr_y) + 0.5f) * (1.0f/(float)(buf_y));
+
+			lumaM = get_pixel_intensity(buf, buf_x, buf_y, curr_x, curr_y);
+			lumaS = get_pixel_intensity(buf, buf_x, buf_y, curr_x, curr_y - 1);
+			lumaE = get_pixel_intensity(buf, buf_x, buf_y, curr_x + 1, curr_y);
+			lumaN = get_pixel_intensity(buf, buf_x, buf_y, curr_x, curr_y + 1);
+			lumaW = get_pixel_intensity(buf, buf_x, buf_y, curr_x - 1, curr_y);
+
+			maxSM = MAX2(lumaS, lumaM);
+			minSM = MIN2(lumaS, lumaM);
+			maxESM = MAX2(lumaE, maxSM);
+			minESM = MIN2(lumaE, minSM);
+			maxWN = MAX2(lumaN, lumaW);
+			minWN = MIN2(lumaN, lumaW);
+			rangeMax = MAX2(maxWN, maxESM);
+			rangeMin = MIN2(minWN, minESM);
+			rangeMaxScaled = rangeMax * edge_threshold;
+			range = rangeMax - rangeMin;
+			rangeMaxClamped = MAX2(edge_threshold_min, rangeMaxScaled);
+
+			earlyExit = range < rangeMaxClamped ? 1:0;
+			if(earlyExit) {
+				set_pixel_intensity(buf, buf_x, buf_y, curr_x, curr_y, lumaM);
+			}
+
+			lumaNW = get_pixel_intensity(buf, buf_x, buf_y, curr_x + 1, curr_y - 1);
+			lumaSE = get_pixel_intensity(buf, buf_x, buf_y, curr_x - 1, curr_y + 1);
+			lumaNE = get_pixel_intensity(buf, buf_x, buf_y, curr_x + 1, curr_y + 1);
+			lumaSW = get_pixel_intensity(buf, buf_x, buf_y, curr_x - 1, curr_y - 1);
+
+			lumaNS = lumaN + lumaS;
+			lumaWE = lumaW + lumaE;
+			subpixRcpRange = 1.0f/range;
+			subpixNSWE = lumaNS + lumaWE;
+			edgeHorz1 = (-2.0f * lumaM) + lumaNS;
+			edgeVert1 = (-2.0f * lumaM) + lumaWE;
+
+			lumaNESE = lumaNE + lumaSE;
+			lumaNWNE = lumaNW + lumaNE;
+			edgeHorz2 = (-2.0f * lumaE) + lumaNESE;
+			edgeVert2 = (-2.0f * lumaN) + lumaNWNE;
+
+			lumaNWSW = lumaNW + lumaSW;
+			lumaSWSE = lumaSW + lumaSE;
+			edgeHorz4 = (ABS(edgeHorz1) * 2.0f) + ABS(edgeHorz2);
+			edgeVert4 = (ABS(edgeVert1) * 2.0f) + ABS(edgeVert2);
+			edgeHorz3 = (-2.0f * lumaW) + lumaNWSW;
+			edgeVert3 = (-2.0f * lumaS) + lumaSWSE;
+			edgeHorz = ABS(edgeHorz3) + edgeHorz4;
+			edgeVert = ABS(edgeVert3) + edgeVert4;
+
+			subpixNWSWNESE = lumaNWSW + lumaNESE;
+			lengthSign = 1.0f / (float)(buf_x);
+			horzSpan = edgeHorz >= edgeVert ? 1:0;
+			subpixA = subpixNSWE * 2.0f + subpixNWSWNESE;
+
+			if(!horzSpan) {
+				lumaN = lumaW;
+				lumaS = lumaE;
+			} else {
+				lengthSign = 1.0f / (float)(buf_y);
+			}
+			subpixB = (subpixA * (1.0f/12.0f)) - lumaM;
+
+			gradientN = lumaN - lumaM;
+			gradientS = lumaS - lumaM;
+			lumaNN = lumaN + lumaM;
+			lumaSS = lumaS + lumaM;
+			pairN = (ABS(gradientN)) >= (ABS(gradientS)) ? 1:0;
+			gradient = MAX2(ABS(gradientN), ABS(gradientS));
+			if(pairN) {
+				lengthSign = -lengthSign;
+			}
+			subpixC = MAX2(MIN2(ABS(subpixB) * subpixRcpRange,1.0f),0.0f);
+
+			posB_x = posM_x;
+			posB_y = posM_y;
+			offNP_x = (!horzSpan) ? 0.0f:(1.0f / (float)(buf_x));
+			offNP_y = (horzSpan) ? 0.0f:(1.0f / (float)(buf_y));
+			if(!horzSpan) {
+				posB_x += lengthSign * 0.5f;
+			} else {
+				posB_y += lengthSign * 0.5f;
+			}
+
+			posN_x = posB_x - offNP_x * p0;
+			posN_y = posB_y - offNP_y * p0;
+			posP_x = posB_x + offNP_x * p0;
+			posP_y = posB_y + offNP_y * p0;
+			subpixD = ((-2.0f)*subpixC) + 3.0f;
+			//may need bilinear filtered get_pixel_intensity() here...done
+			lumaEndN = get_pixel_intensity_bilinear(buf, buf_x, buf_y,posN_x,posN_y);
+			subpixE = subpixC * subpixC;
+			//may need bilinear filtered get_pixel_intensity() here...done
+			lumaEndP = get_pixel_intensity_bilinear(buf, buf_x, buf_y, posP_x,posP_y);
+
+			if(!pairN) {
+				lumaNN = lumaSS;
+			}
+			gradientScaled = gradient * 1.0f/4.0f;
+			lumaMM =lumaM - lumaNN * 0.5f;
+			subpixF = subpixD * subpixE;
+			lumaMLTZero = lumaMM < 0.0f ? 1:0;
+
+			lumaEndN -= lumaNN * 0.5f;
+			lumaEndP -= lumaNN * 0.5f;
+			doneN = (ABS(lumaEndN)) >= gradientScaled ? 1:0;
+			doneP = (ABS(lumaEndP)) >= gradientScaled ? 1:0;
+			if(!doneN) {
+				posN_x -= offNP_x * p1;
+				posN_y -= offNP_y * p1;
+			}
+			doneNP = (!doneN) || (!doneP) ? 1:0;
+			if(!doneP) {
+				posP_x += offNP_x * p1;
+				posP_y += offNP_y * p1;
+			}
+
+			if(doneNP) {
+				if(!doneN) {
+					lumaEndN = get_pixel_intensity_bilinear(buf, buf_x, buf_y, posN_x,posN_y);
+				}
+				if(!doneP) {
+					lumaEndP = get_pixel_intensity_bilinear(buf, buf_x, buf_y, posP_x, posP_y);
+				}
+				if(!doneN) {
+					lumaEndN = lumaEndN - lumaNN * 0.5;
+				}
+				if(!doneP) {
+					lumaEndP = lumaEndP - lumaNN * 0.5;
+				}
+				doneN = (ABS(lumaEndN)) >= gradientScaled ? 1:0;
+				doneP = (ABS(lumaEndP)) >= gradientScaled ? 1:0;
+				if(!doneN) {
+					posN_x -= offNP_x * p2;
+					posN_y -= offNP_y * p2;
+				}
+				doneNP = (!doneN) || (!doneP) ? 1:0;
+				if(!doneP) {
+					posP_x += offNP_x * p2;
+					posP_y += offNP_y * p2;
+				}
+				if(doneNP) {
+					if(!doneN) {
+						lumaEndN = get_pixel_intensity_bilinear(buf, buf_x, buf_y,posN_x,posN_y);
+					}
+					if(!doneP) {
+						lumaEndP = get_pixel_intensity_bilinear(buf, buf_x, buf_y, posP_x,posP_y);
+					}
+					if(!doneN) {
+						lumaEndN = lumaEndN - lumaNN * 0.5;
+					}
+					if(!doneP) {
+						lumaEndP = lumaEndP - lumaNN * 0.5;
+					}
+					doneN = (ABS(lumaEndN)) >= gradientScaled ? 1:0;
+					doneP = (ABS(lumaEndP)) >= gradientScaled ? 1:0;
+					if(!doneN) {
+						posN_x -= offNP_x * p3;
+						posN_y -= offNP_y * p3;
+					}
+					doneNP = (!doneN) || (!doneP) ? 1:0;
+					if(!doneP) {
+						posP_x += offNP_x * p3;
+						posP_y += offNP_y * p3;
+					}
+					if(doneNP) {
+						if(!doneN) {
+							lumaEndN = get_pixel_intensity_bilinear(buf, buf_x, buf_y,posN_x,posN_y);
+						}
+						if(!doneP) {
+							lumaEndP = get_pixel_intensity_bilinear(buf, buf_x, buf_y, posP_x,posP_y);
+						}
+						if(!doneN) {
+							lumaEndN = lumaEndN - lumaNN * 0.5;
+						}
+						if(!doneP) {
+							lumaEndP = lumaEndP - lumaNN * 0.5;
+						}
+						doneN = (ABS(lumaEndN)) >= gradientScaled ? 1:0;
+						doneP = (ABS(lumaEndP)) >= gradientScaled ? 1:0;
+						if(!doneN) {
+							posN_x -= offNP_x * p4;
+							posN_y -= offNP_y * p4;
+						}
+						doneNP = (!doneN) || (!doneP) ? 1:0;
+						if(!doneP) {
+							posP_x += offNP_x * p4;
+							posP_y += offNP_y * p4;
+						}
+						if(doneNP) {
+							if(!doneN) {
+								lumaEndN = get_pixel_intensity_bilinear(buf, buf_x, buf_y,posN_x,posN_y);
+							}
+							if(!doneP) {
+								lumaEndP = get_pixel_intensity_bilinear(buf, buf_x, buf_y, posP_x,posP_y);
+							}
+							if(!doneN) {
+								lumaEndN = lumaEndN - lumaNN * 0.5;
+							}
+							if(!doneP) {
+								lumaEndP = lumaEndP - lumaNN * 0.5;
+							}
+							doneN = (ABS(lumaEndN)) >= gradientScaled ? 1:0;
+							doneP = (ABS(lumaEndP)) >= gradientScaled ? 1:0;
+							if(!doneN) {
+								posN_x -= offNP_x * p5;
+								posN_y -= offNP_y * p5;
+							}
+							doneNP = (!doneN) || (!doneP) ? 1:0;
+							if(!doneP) {
+								posP_x += offNP_x * p5;
+								posP_y += offNP_y * p5;
+							}
+							if(doneNP) {
+								if(!doneN) {
+									lumaEndN = get_pixel_intensity_bilinear(buf, buf_x, buf_y,posN_x,posN_y);
+								}
+								if(!doneP) {
+									lumaEndP = get_pixel_intensity_bilinear(buf, buf_x, buf_y, posP_x,posP_y);
+								}
+								if(!doneN) {
+									lumaEndN = lumaEndN - lumaNN * 0.5;
+								}
+								if(!doneP) {
+									lumaEndP = lumaEndP - lumaNN * 0.5;
+								}
+								doneN = (ABS(lumaEndN)) >= gradientScaled ? 1:0;
+								doneP = (ABS(lumaEndP)) >= gradientScaled ? 1:0;
+								if(!doneN) {
+									posN_x -= offNP_x * p6;
+									posN_y -= offNP_y * p6;
+								}
+								doneNP = (!doneN) || (!doneP) ? 1:0;
+								if(!doneP) {
+									posP_x += offNP_x * p6;
+									posP_y += offNP_y * p6;
+								}
+								if(doneNP) {
+									if(!doneN) {
+										lumaEndN = get_pixel_intensity_bilinear(buf, buf_x, buf_y,posN_x,posN_y);
+									}
+									if(!doneP) {
+										lumaEndP = get_pixel_intensity_bilinear(buf, buf_x, buf_y, posP_x,posP_y);
+									}
+									if(!doneN) {
+										lumaEndN = lumaEndN - lumaNN * 0.5;
+									}
+									if(!doneP) {
+										lumaEndP = lumaEndP - lumaNN * 0.5;
+									}
+									doneN = (ABS(lumaEndN)) >= gradientScaled ? 1:0;
+									doneP = (ABS(lumaEndP)) >= gradientScaled ? 1:0;
+									if(!doneN) {
+										posN_x -= offNP_x * p7;
+										posN_y -= offNP_y * p7;
+									}
+									doneNP = (!doneN) || (!doneP) ? 1:0;
+									if(!doneP) {
+										posP_x += offNP_x * p7;
+										posP_y += offNP_y * p7;
+									}
+									if(doneNP) {
+										if(!doneN) {
+											lumaEndN = get_pixel_intensity_bilinear(buf, buf_x, buf_y,posN_x,posN_y);
+										}
+										if(!doneP) {
+											lumaEndP = get_pixel_intensity_bilinear(buf, buf_x, buf_y, posP_x,posP_y);
+										}
+										if(!doneN) {
+											lumaEndN = lumaEndN - lumaNN * 0.5;
+										}
+										if(!doneP) {
+											lumaEndP = lumaEndP - lumaNN * 0.5;
+										}
+										doneN = (ABS(lumaEndN)) >= gradientScaled ? 1:0;
+										doneP = (ABS(lumaEndP)) >= gradientScaled ? 1:0;
+										if(!doneN) {
+											posN_x -= offNP_x * p8;
+											posN_y -= offNP_y * p8;
+										}
+										doneNP = (!doneN) || (!doneP) ? 1:0;
+										if(!doneP) {
+											posP_x += offNP_x * p8;
+											posP_y += offNP_y * p8;
+										}
+										if(doneNP) {
+											if(!doneN) {
+												lumaEndN = get_pixel_intensity_bilinear(buf, buf_x, buf_y,posN_x,posN_y);
+											}
+											if(!doneP) {
+												lumaEndP = get_pixel_intensity_bilinear(buf, buf_x, buf_y, posP_x,posP_y);
+											}
+											if(!doneN) {
+												lumaEndN = lumaEndN - lumaNN * 0.5;
+											}
+											if(!doneP) {
+												lumaEndP = lumaEndP - lumaNN * 0.5;
+											}
+											doneN = (ABS(lumaEndN)) >= gradientScaled ? 1:0;
+											doneP = (ABS(lumaEndP)) >= gradientScaled ? 1:0;
+											if(!doneN) {
+												posN_x -= offNP_x * p9;
+												posN_y -= offNP_y * p9;
+											}
+											doneNP = (!doneN) || (!doneP) ? 1:0;
+											if(!doneP) {
+												posP_x += offNP_x * p9;
+												posP_y += offNP_y * p9;
+											}
+											if(doneNP) {
+												if(!doneN) {
+													lumaEndN = get_pixel_intensity_bilinear(buf, buf_x, buf_y,posN_x,posN_y);
+												}
+												if(!doneP) {
+													lumaEndP = get_pixel_intensity_bilinear(buf, buf_x, buf_y, posP_x,posP_y);
+												}
+												if(!doneN) {
+													lumaEndN = lumaEndN - lumaNN * 0.5;
+												}
+												if(!doneP) {
+													lumaEndP = lumaEndP - lumaNN * 0.5;
+												}
+												doneN = (ABS(lumaEndN)) >= gradientScaled ? 1:0;
+												doneP = (ABS(lumaEndP)) >= gradientScaled ? 1:0;
+												if(!doneN) {
+													posN_x -= offNP_x * p10;
+													posN_y -= offNP_y * p10;
+												}
+												doneNP = (!doneN) || (!doneP) ? 1:0;
+												if(!doneP) {
+													posP_x += offNP_x * p10;
+													posP_y += offNP_y * p10;
+												}
+												if(doneNP) {
+													if(!doneN) {
+														lumaEndN = get_pixel_intensity_bilinear(buf, buf_x, buf_y,posN_x,posN_y);
+													}
+													if(!doneP) {
+														lumaEndP = get_pixel_intensity_bilinear(buf, buf_x, buf_y, posP_x,posP_y);
+													}
+													if(!doneN) {
+														lumaEndN = lumaEndN - lumaNN * 0.5;
+													}
+													if(!doneP) {
+														lumaEndP = lumaEndP - lumaNN * 0.5;
+													}
+													doneN = (ABS(lumaEndN)) >= gradientScaled ? 1:0;
+													doneP = (ABS(lumaEndP)) >= gradientScaled ? 1:0;
+													if(!doneN) {
+														posN_x -= offNP_x * p11;
+														posN_y -= offNP_y * p11;
+													}
+													doneNP = (!doneN) || (!doneP) ? 1:0;
+													if(!doneP) {
+														posP_x += offNP_x * p11;
+														posP_y += offNP_y * p11;
+													}
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			dstN = posM_x - posN_x;
+			dstP = posP_x - posM_x;
+			if(!horzSpan) {
+				dstN = posM_y - posN_y;
+				dstP = posP_y - posM_y;
+			}
+
+			goodSpanN = ((lumaEndN < 0.0f) ? 1:0) != lumaMLTZero ? 1:0;
+			spanLength = (dstP + dstN);
+			goodSpanP = ((lumaEndP < 0.0f) ? 1:0) != lumaMLTZero ? 1:0;
+			spanLengthRcp = 1.0f/spanLength;
+
+			directionN = dstN < dstP ? 1:0;
+			dst = MIN2(dstN, dstP);
+			goodSpan = (directionN==1) ? goodSpanN:goodSpanP;
+			subpixG = subpixF * subpixF;
+			pixelOffset = (dst * (-spanLengthRcp)) + 0.5f;
+			subpixH = subpixG * quality_subpix;
+
+			pixelOffsetGood = (goodSpan==1) ? pixelOffset : 0.0f;
+			pixelOffsetSubpix = MAX2(pixelOffsetGood, subpixH);
+			if(!horzSpan) {
+				posM_x += pixelOffsetSubpix * lengthSign;
+			} else {
+				posM_y += pixelOffsetSubpix * lengthSign;
+			}
+			//may need bilinear filtered get_pixel_intensity() here...
+			set_pixel_intensity(buf,buf_x,buf_y,curr_x,curr_y,get_pixel_intensity_bilinear(buf, buf_x, buf_y, posM_x,posM_y)* lumaM);
+
+		}
+	}
+	return 1;
+
+#endif
+}
+
diff --git a/intern/raskter/raskter.h b/intern/raskter/raskter.h
new file mode 100644
index 00000000000..e078b0d26be
--- /dev/null
+++ b/intern/raskter/raskter.h
@@ -0,0 +1,59 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2012 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Peter Larabell.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+/** \file raskter.h
+ *  \ingroup RASKTER
+ */
+
+struct poly_vert {
+	int x;
+	int y;
+};
+
+struct scan_line {
+	int xstart;
+	int xend;
+};
+
+struct scan_line_batch {
+	int num;
+	int ystart;
+	struct scan_line *slines;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int PLX_raskterize(float (*base_verts)[2], int num_base_verts,
+                   float *buf, int buf_x, int buf_y, int do_mask_AA);
+int PLX_raskterize_feather(float (*base_verts)[2], int num_base_verts,
+                           float (*feather_verts)[2], int num_feather_verts,
+                           float *buf, int buf_x, int buf_y);
+int PLX_antialias_buffer(float *buf, int buf_x, int buf_y);
+#ifdef __cplusplus
+}
+#endif
diff --git a/intern/smoke/intern/FLUID_3D.cpp b/intern/smoke/intern/FLUID_3D.cpp
index 821b428363e..f638a936049 100644
--- a/intern/smoke/intern/FLUID_3D.cpp
+++ b/intern/smoke/intern/FLUID_3D.cpp
@@ -153,11 +153,11 @@ void FLUID_3D::setBorderObstacles()
 	{
 		// bottom slab
 		index = x + y * _xRes;
-		if(_domainBcBottom==1) _obstacles[index] = 1;
+		if(_domainBcBottom) _obstacles[index] = 1;
 
 		// top slab
 		index += _totalCells - _slabSize;
-		if(_domainBcTop==1) _obstacles[index] = 1;
+		if(_domainBcTop) _obstacles[index] = 1;
 	}
 
 	for (int z = 0; z < _zRes; z++)
@@ -165,11 +165,11 @@ void FLUID_3D::setBorderObstacles()
 	{
 		// front slab
 		index = x + z * _slabSize;
-		if(_domainBcFront==1) _obstacles[index] = 1;
+		if(_domainBcFront) _obstacles[index] = 1;
 
 		// back slab
 		index += _slabSize - _xRes;
-		if(_domainBcBack==1) _obstacles[index] = 1;
+		if(_domainBcBack) _obstacles[index] = 1;
 	}
 
 	for (int z = 0; z < _zRes; z++)
@@ -177,11 +177,11 @@ void FLUID_3D::setBorderObstacles()
 	{
 		// left slab
 		index = y * _xRes + z * _slabSize;
-		if(_domainBcLeft==1) _obstacles[index] = 1;
+		if(_domainBcLeft) _obstacles[index] = 1;
 
 		// right slab
 		index += _xRes - 1;
-		if(_domainBcRight==1) _obstacles[index] = 1;
+		if(_domainBcRight) _obstacles[index] = 1;
 	}
 }
 
@@ -449,48 +449,7 @@ void FLUID_3D::setBorderCollisions() {
 
 
 	// set side obstacles
-	int index;
-	for (int y = 0; y < _yRes; y++)
-	for (int x = 0; x < _xRes; x++)
-	{
-		// front slab
-		index = x + y * _xRes;
-		if(_domainBcBottom==1) _obstacles[index] = 1;
-		else _obstacles[index] = 0;
-
-		// back slab
-		index += _totalCells - _slabSize;
-		if(_domainBcTop==1) _obstacles[index] = 1;
-		else _obstacles[index] = 0;
-	}
-
-	for (int z = 0; z < _zRes; z++)
-	for (int x = 0; x < _xRes; x++)
-	{
-		// bottom slab
-		index = x + z * _slabSize;
-		if(_domainBcFront==1) _obstacles[index] = 1;
-		else _obstacles[index] = 0;
-
-		// top slab
-		index += _slabSize - _xRes;
-		if(_domainBcBack==1) _obstacles[index] = 1;
-		else _obstacles[index] = 0;
-	}
-
-	for (int z = 0; z < _zRes; z++)
-	for (int y = 0; y < _yRes; y++)
-	{
-		// left slab
-		index = y * _xRes + z * _slabSize;
-		if(_domainBcLeft==1) _obstacles[index] = 1;
-		else _obstacles[index] = 0;
-
-		// right slab
-		index += _xRes - 1;
-		if(_domainBcRight==1) _obstacles[index] = 1;
-		else _obstacles[index] = 0;
-	}
+	setBorderObstacles();
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -813,13 +772,13 @@ void FLUID_3D::project()
 	setObstacleBoundaries(_pressure, 0, _zRes);
 	
 	// copy out the boundaries
-	if(_domainBcLeft == 0)  setNeumannX(_xVelocity, _res, 0, _zRes);
+	if(!_domainBcLeft)  setNeumannX(_xVelocity, _res, 0, _zRes);
 	else setZeroX(_xVelocity, _res, 0, _zRes); 
 
-	if(_domainBcFront == 0)   setNeumannY(_yVelocity, _res, 0, _zRes);
+	if(!_domainBcFront)   setNeumannY(_yVelocity, _res, 0, _zRes);
 	else setZeroY(_yVelocity, _res, 0, _zRes); 
 
-	if(_domainBcTop == 0) setNeumannZ(_zVelocity, _res, 0, _zRes);
+	if(!_domainBcTop) setNeumannZ(_zVelocity, _res, 0, _zRes);
 	else setZeroZ(_zVelocity, _res, 0, _zRes);
 
 	/*
@@ -1369,13 +1328,13 @@ void FLUID_3D::advectMacCormackBegin(int zBegin, int zEnd)
 {
 	Vec3Int res = Vec3Int(_xRes,_yRes,_zRes);
 
-	if(_domainBcLeft == 0) copyBorderX(_xVelocityOld, res, zBegin, zEnd);
+	if(!_domainBcLeft) copyBorderX(_xVelocityOld, res, zBegin, zEnd);
 	else setZeroX(_xVelocityOld, res, zBegin, zEnd);
 
-	if(_domainBcFront == 0) copyBorderY(_yVelocityOld, res, zBegin, zEnd);
+	if(!_domainBcFront) copyBorderY(_yVelocityOld, res, zBegin, zEnd);
 	else setZeroY(_yVelocityOld, res, zBegin, zEnd); 
 
-	if(_domainBcTop == 0) copyBorderZ(_zVelocityOld, res, zBegin, zEnd);
+	if(!_domainBcTop) copyBorderZ(_zVelocityOld, res, zBegin, zEnd);
 	else setZeroZ(_zVelocityOld, res, zBegin, zEnd);
 }
 
@@ -1423,13 +1382,13 @@ void FLUID_3D::advectMacCormackEnd2(int zBegin, int zEnd)
 	advectFieldMacCormack2(dt0, _xVelocityOld, _yVelocityOld, _zVelocityOld, _yVelocityOld, _yVelocityTemp, _yVelocity, t1, res, _obstacles, zBegin, zEnd);
 	advectFieldMacCormack2(dt0, _xVelocityOld, _yVelocityOld, _zVelocityOld, _zVelocityOld, _zVelocityTemp, _zVelocity, t1, res, _obstacles, zBegin, zEnd);
 
-	if(_domainBcLeft == 0) copyBorderX(_xVelocityTemp, res, zBegin, zEnd);
+	if(!_domainBcLeft) copyBorderX(_xVelocityTemp, res, zBegin, zEnd);
 	else setZeroX(_xVelocityTemp, res, zBegin, zEnd);				
 
-	if(_domainBcFront == 0) copyBorderY(_yVelocityTemp, res, zBegin, zEnd);
+	if(!_domainBcFront) copyBorderY(_yVelocityTemp, res, zBegin, zEnd);
 	else setZeroY(_yVelocityTemp, res, zBegin, zEnd); 
 
-	if(_domainBcTop == 0) copyBorderZ(_zVelocityTemp, res, zBegin, zEnd);
+	if(!_domainBcTop) copyBorderZ(_zVelocityTemp, res, zBegin, zEnd);
 	else setZeroZ(_zVelocityTemp, res, zBegin, zEnd);
 
 	setZeroBorder(_density, res, zBegin, zEnd);
diff --git a/intern/smoke/intern/FLUID_3D_STATIC.cpp b/intern/smoke/intern/FLUID_3D_STATIC.cpp
index 85b3657dc92..c7a0ddcd04c 100644
--- a/intern/smoke/intern/FLUID_3D_STATIC.cpp
+++ b/intern/smoke/intern/FLUID_3D_STATIC.cpp
@@ -92,19 +92,15 @@ void FLUID_3D::setNeumannX(float* field, Vec3Int res, int zBegin, int zEnd)
 			// left slab
 			index = y * res[0] + z * slabSize;
 			field[index] = field[index + 2];
+			/* only allow outwards flux */
+			if(field[index]>0.) field[index] = 0.;
+			index += 1;
+			if(field[index]>0.) field[index] = 0.;
 
 			// right slab
-			index += res[0] - 1;
+			index = y * res[0] + z * slabSize + res[0] - 1;
 			field[index] = field[index - 2];
-		}
-
-	// fix, force top slab to only allow outwards flux
-	for (int y = 0; y < res[1]; y++)
-		for (int z = zBegin; z < zEnd; z++)
-		{
-			// top slab
-			index = y * res[0] + z * slabSize;
-			index += res[0] - 1;
+			/* only allow outwards flux */
 			if(field[index]<0.) field[index] = 0.;
 			index -= 1;
 			if(field[index]<0.) field[index] = 0.;
@@ -121,27 +117,22 @@ void FLUID_3D::setNeumannY(float* field, Vec3Int res, int zBegin, int zEnd)
 	for (int z = zBegin; z < zEnd; z++)
 		for (int x = 0; x < res[0]; x++)
 		{
-			// bottom slab
+			// front slab
 			index = x + z * slabSize;
 			field[index] = field[index + 2 * res[0]];
+			/* only allow outwards flux */
+			if(field[index]>0.) field[index] = 0.;
+			index += res[0];
+			if(field[index]>0.) field[index] = 0.;
 
-			// top slab
-			index += slabSize - res[0];
+			// back slab
+			index = x + z * slabSize + slabSize - res[0];
 			field[index] = field[index - 2 * res[0]];
-		}
-
-	// fix, force top slab to only allow outwards flux
-	for (int z = zBegin; z < zEnd; z++)
-		for (int x = 0; x < res[0]; x++)
-		{
-			// top slab
-			index = x + z * slabSize;
-			index += slabSize - res[0];
+			/* only allow outwards flux */
 			if(field[index]<0.) field[index] = 0.;
 			index -= res[0];
 			if(field[index]<0.) field[index] = 0.;
 		}
-		
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -154,43 +145,37 @@ void FLUID_3D::setNeumannZ(float* field, Vec3Int res, int zBegin, int zEnd)
 	const int cellsslab = totalCells - slabSize;
 	int index;
 
-	index = 0;
-	if (zBegin == 0)
-	for (int y = 0; y < res[1]; y++)
-		for (int x = 0; x < res[0]; x++, index++)
-		{
-			// front slab
-			field[index] = field[index + 2 * slabSize];
-		}
-
-	if (zEnd == res[2])
-	{
-	index = 0;
-	int indexx = 0;
-
-	for (int y = 0; y < res[1]; y++)
-		for (int x = 0; x < res[0]; x++, index++)
-		{
-
-			// back slab
-			indexx = index + cellsslab;
-			field[indexx] = field[indexx - 2 * slabSize];
-		}
-	
-
-	// fix, force top slab to only allow outwards flux
-	for (int y = 0; y < res[1]; y++)
-		for (int x = 0; x < res[0]; x++)
-		{
-			// top slab
-			index = x + y * res[0];
-			index += cellsslab;
-			if(field[index]<0.) field[index] = 0.;
-			index -= slabSize;
-			if(field[index]<0.) field[index] = 0.;
-		}
+	if (zBegin == 0) {
+		for (int y = 0; y < res[1]; y++)
+			for (int x = 0; x < res[0]; x++)
+			{
+				// front slab
+				index = x + y * res[0];
+				field[index] = field[index + 2 * slabSize];
+				/* only allow outwards flux */
+
+				// DG: Disable this for z-axis.
+				// The problem is that smoke somehow gets sucked in again
+				// from the TOP slab when this is enabled
+				// if(field[index]>0.) field[index] = 0.;
+				// index += slabSize;
+				// if(field[index]>0.) field[index] = 0.;
+			}
+	}
 
-	}	// zEnd == res[2]
+	if (zEnd == res[2]) {
+		for (int y = 0; y < res[1]; y++)
+			for (int x = 0; x < res[0]; x++)
+			{
+				// back slab
+				index = x + y * res[0] + cellsslab;
+				field[index] = field[index - 2 * slabSize];
+				/* only allow outwards flux */
+				if(field[index]<0.) field[index] = 0.;
+				index -= slabSize;
+				if(field[index]<0.) field[index] = 0.;
+			}
+	}
 		
 }
 
diff --git a/intern/smoke/intern/WTURBULENCE.cpp b/intern/smoke/intern/WTURBULENCE.cpp
index 83bec466c9f..671198065e8 100644
--- a/intern/smoke/intern/WTURBULENCE.cpp
+++ b/intern/smoke/intern/WTURBULENCE.cpp
@@ -511,7 +511,7 @@ void WTURBULENCE::computeEnergy(float *_energy, float* xvel, float* yvel, float*
         if (obstacles[index])
           obstacles[index] = 1; // DG TODO ? animated obstacle flag?
 
-  free(obstacles);
+  delete [] obstacles;
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
diff --git a/intern/utfconv/utfconv.c b/intern/utfconv/utfconv.c
index b9946a61cdb..a9b2920111d 100644
--- a/intern/utfconv/utfconv.c
+++ b/intern/utfconv/utfconv.c
@@ -34,7 +34,7 @@ size_t count_utf_8_from_16(const wchar_t *string16)
 		return 0;
 	}
 
-    for (i = 0; (u = string16[i]); i++) {
+	for (i = 0; (u = string16[i]); i++) {
 		if (u < 0x0080) {
 			count += 1;
 		}
@@ -132,7 +132,7 @@ int conv_utf_16_to_8(const wchar_t *in16, char *out8, size_t size8)
 		else if (u < 0xD800 || u >= 0xE000) {
 			if (out8 + 2 >= out8end) break;
 			*out8++ = (0x7 << 5) | (0xF & (u >> 12));
-			*out8++ = (0x1 << 7) | (0x3F & (u >> 6));;
+			*out8++ = (0x1 << 7) | (0x3F & (u >> 6));
 			*out8  = (0x1 << 7) | (0x3F & (u));
 		}
 		else if (u < 0xDC00) {
diff --git a/release/datafiles/clkernelstoh.py b/release/datafiles/clkernelstoh.py
new file mode 100755
index 00000000000..8fb5d4e6bae
--- /dev/null
+++ b/release/datafiles/clkernelstoh.py
@@ -0,0 +1,70 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The Original Code is Copyright (C) 2012 Blender Foundation.
+# All rights reserved.
+#
+# Contributor(s): Jeroen Bakker
+#
+# ***** END GPL LICENCE BLOCK *****
+
+# <pep8 compliant>
+
+import sys
+import os
+
+if len(sys.argv) < 2:
+    sys.stdout.write("Usage: clkernelstoh <cl_file>\n")
+    sys.exit(1)
+
+filename = sys.argv[1]
+
+try:
+    fpin = open(filename, "r")
+except:
+    sys.stdout.write("Unable to open input %s\n" % sys.argv[1])
+    sys.exit(1)
+
+if filename[0:2] == "." + os.sep:
+    filename = filename[2:]
+
+cname = filename + ".h"
+sys.stdout.write("Making H file <%s>\n" % cname)
+
+filename = filename.split("/")[-1].split("\\")[-1]
+filename = filename.replace(".", "_")
+
+try:
+    fpout = open(cname, "w")
+except:
+    sys.stdout.write("Unable to open output %s\n" % cname)
+    sys.exit(1)
+
+fpout.write("/* clkernelstoh output of file <%s> */\n\n" % filename)
+fpout.write("const char * clkernelstoh_%s = " % filename)
+
+lines = fpin.readlines()
+for line in lines:
+	fpout.write("\"")
+	fpout.write(line.rstrip())
+	fpout.write("\\n\" \\\n")
+fpout.write("\"\\0\";\n")
+
+fpin.close()
+fpout.close()
diff --git a/release/plugins/Makefile b/release/plugins/Makefile
deleted file mode 100644
index 353e559e622..00000000000
--- a/release/plugins/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): none yet.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-all: textures sequences
-
-textures:
-	$(MAKE) -C texture
-
-sequences:
-	$(MAKE) -C sequence
-
-clean:
-	$(MAKE) -C texture clean
-	$(MAKE) -C sequence clean
diff --git a/release/plugins/bmake b/release/plugins/bmake
deleted file mode 100644
index e2f9e9cc596..00000000000
--- a/release/plugins/bmake
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/bin/sh
-#
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): none yet.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# detect the system
-
-UNAME=`uname`
-EXT="so";
-if ( test "WIN32" = "$TARGET" ) then
-        CC="gcc";
-        CFLAGS="-funsigned-char -O2";
-
-        LD="ld";
-        LDFLAGS="-Bshareable -lm";
-elif ( test $UNAME = "IRIX64" -o $UNAME = "IRIX" ) then
-	CC="cc";
-	CFLAGS="-KPIC -O2 -mips3";
-
-	LD="ld";
-	LDFLAGS="-shared -U";	
-elif ( test $UNAME = "FreeBSD" ) then
-	CC="gcc";
-	CFLAGS="-fPIC -funsigned-char -O2";
-
-	LD="ld";
-	LDFLAGS="-Bshareable";
-elif ( test $UNAME = "OpenBSD" ) then
-	CC="gcc";
-	CFLAGS="-fPIC -funsigned-char -O2";
-
-	LD="ld";
-	LDFLAGS="-Bshareable";
-elif ( test $UNAME = "Linux" ) then
-	CC="gcc";
-	CFLAGS="-fPIC -funsigned-char -O2";
-
-	LD="ld";
-	LDFLAGS="-Bshareable";
-elif ( test $UNAME = "SunOS" ) then
-	CC="cc";
-	CFLAGS="-O";
-
-	LD="ld";
-	LDFLAGS="-r";
-elif ( test $UNAME = "Darwin" ) then
-        CC="cc";
-        CFLAGS="-fPIC -funsigned-char -O2 -fno-common";
-        LD="cc";
-        LDFLAGS="-flat_namespace -bundle -bundle_loader ../../blender.app/Contents/MacOS/blender -lm";
-        EXT="so";
-fi
-
-if ( test "$#" = "1" ) then 
-	if ( test -f $1 ) then
-		BASE_FILE=`echo $1 | sed -e "1 s/\.c//g"`;
-	else 
-		BASE_FILE=$1;
-	fi
-
-	CFILE="$BASE_FILE.c"
-	OFILE="$BASE_FILE.o"
-	SOFILE="$BASE_FILE.$EXT"
-else 
-	if ( test -f $1$2 ) then
-		BASE_FILE=`echo $2 | sed -e "1 s/\.c//g"`;
-	else 
-		BASE_FILE=$2;
-	fi
-
-	CFILE="$1$BASE_FILE.c"
-        if (test "$TARGET" = "WIN32" ) then
-                DLLFILE="$BASE_FILE.dll";
-        fi
-	OFILE="$BASE_FILE.o"
-	SOFILE="$BASE_FILE.$EXT"
-fi
-
-INCLUDES=
-if ( test -f plugin.h ) then
-	INCLUDES=-I.;
-elif ( test -f "include/plugin.h" ) then
-	INCLUDES=-Iinclude/
-elif ( test -f "../plugin.h" ) then
-	INCLUDES=-I..;
-elif ( test -f "../include/plugin.h" ) then
-	INCLUDES=-I../include
-else 
-	echo "Couldn't find plugin.h";
-	exit;
-fi
-
-LIBM=`fgrep "#include <math.h>" $CFILE`
-LIBC=`fgrep "#include <std" $CFILE`
-
-LIBS=
-
-if ( test -n "$LIBM" ) then
-	LIBS="$LIBS -lm"; 
-fi
-if ( test -n "$LIBC" ) then 
-	LIBS="$LIBS -lc"; 
-fi
-
-echo "$CC $CFLAGS -c $CFILE $INCLUDES"
-$CC $CFLAGS -c $CFILE $INCLUDES
-
-if ( test "$?" != "0") then 
-	echo "Compile error"; 
-	exit;
-fi
-
-echo "$LD $LDFLAGS $OFILE -o $SOFILE $LIBS"
-$LD $LDFLAGS $OFILE -o $SOFILE $LIBS
-
-if ( test "$?" != "0") then 
-	echo "Link error"; 
-	exit;
-fi
diff --git a/release/plugins/sequence/blur.c b/release/plugins/sequence/blur.c
deleted file mode 100644
index d33feb0bb68..00000000000
--- a/release/plugins/sequence/blur.c
+++ /dev/null
@@ -1,284 +0,0 @@
-/**
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include <stdio.h>
-#include "plugin.h"
-
-/* ******************** GLOBAL VARIABLES ***************** */
-
-
-char name[24] = "Blur";
-
-/* structure for buttons, 
- *  butcode      name           default  min  max  0
- */
-
-VarStruct varstr[] = {
-	LABEL,          "Input: 1 strip", 0.0, 0.0, 0.0, "",
-	NUMSLI | FLO,     "Blur",     0.5,    0.0,    10.0, "Maximum filtersize",
-	NUMSLI | FLO,     "Gamma",    1.0,    0.4,    2.0, "Gamma correction",
-	TOG | INT,        "Animated", 0.0,    0.0,    1.0, "For (Ipo) animated blur",
-	NUM | INT,            "debug",        0.0,    0.0,    2.0,
-	"0:off 1: show primary blur buffer 2: show 2nd blur buffer",
-
-};
-
-/* The cast struct is for input in the main doit function
-   Varstr and Cast must have the same variables in the same order */ 
-
-typedef struct Cast {
-	int dummy;          /* because of the 'label' button */
-	float blur;
-	float gamma;
-	float use_ipo;
-	int show;
-} Cast;
-
-
-/* cfra: the current frame */
-
-float cfra;
-
-void plugin_seq_doit(Cast *, float, float, int, int, ImBuf *, ImBuf *, ImBuf *, ImBuf *);
-
-/* ******************** Fixed functions ***************** */
-
-int plugin_seq_getversion(void) 
-{
-	return B_PLUGIN_VERSION;
-}
-
-void plugin_but_changed(int but) 
-{
-}
-
-void plugin_init(void)
-{
-}
-
-void plugin_getinfo(PluginInfo *info)
-{
-	info->name = name;
-	info->nvars = sizeof(varstr) / sizeof(VarStruct);
-	info->cfra = &cfra;
-
-	info->varstr = varstr;
-
-	info->init = plugin_init;
-	info->seq_doit = (SeqDoit) plugin_seq_doit;
-	info->callback = plugin_but_changed;
-}
-
-
-void blurbuf(struct ImBuf *ibuf, int nr, Cast *cast)
-{
-	/* nr = number of blurs */
-	/* the ibuf->rect is replaced */
-	struct ImBuf *tbuf, *ttbuf;
-	int i, x4;
-	
-	tbuf = dupImBuf(ibuf);
-	x4 = ibuf->x / 4;
-	
-	/* This doesn't seem to work... paprmh */
-	if (cast->gamma != 1.0) gamwarp(tbuf, cast->gamma);
-
-	/* reduce */
-	for (i = 0; i < nr; i++) {
-		ttbuf = onehalf(tbuf);
-		if (ttbuf) {
-			freeImBuf(tbuf);
-			tbuf = ttbuf;
-		}
-		if (tbuf->x < 4 || tbuf->y < 4) break;
-	}
-
-	/* enlarge */
-	for (i = 0; i < nr; i++) {
-		ttbuf = double_x(tbuf);
-		if (ttbuf) {
-			freeImBuf(tbuf);
-			tbuf = ttbuf;
-		}
-		ttbuf = double_y(tbuf);
-		if (ttbuf) {
-			freeImBuf(tbuf);
-			tbuf = ttbuf;
-		}
-		if (tbuf->x > x4) {
-			scaleImBuf(tbuf, ibuf->x, ibuf->y);
-			break;
-		}
-	}
-	
-	/* this doesn't seem to work...paprmh*/
-	if (cast->gamma != 1.0) gamwarp(tbuf, 1.0 / cast->gamma);
-
-	if (ibuf->rect) memcpy(ibuf->rect, tbuf->rect, 4 * ibuf->x * ibuf->y);
-
-	if (ibuf->rect_float)
-		memcpy(ibuf->rect_float, tbuf->rect_float, 4 * ibuf->x * ibuf->y * sizeof(float));
-
-	freeImBuf(tbuf);
-	
-}
-
-void doblur(struct ImBuf *mbuf, float fac, Cast *cast)
-{
-	/* make two filtered images, like a mipmap structure
-	 * fac is filtersize in pixels
-	 */
-	struct ImBuf *ibuf, *pbuf;
-	float ifac, pfac, infac;
-	int n, b1, b2;
-	char *irect, *prect, *mrect;
-	float *irectf, *prectf, *mrectf;
-	
-	/* which buffers ? */
-				
-	if (fac > 7.0) fac = 7.0;
-	if (fac <= 1.0) return;
-	
-	pfac = 2.0;
-	pbuf = dupImBuf(mbuf);
-	n = 1;
-	while (pfac < fac) {
-		blurbuf(pbuf, n, cast);
-		blurbuf(pbuf, n, cast);
-		
-		n++;
-		pfac += 1.0;
-	}
-
-	ifac = pfac;
-	pfac -= 1.0;
-
-	ibuf = dupImBuf(pbuf);
-	blurbuf(ibuf, n, cast);
-	blurbuf(ibuf, n, cast);
-	
-	fac = (fac - pfac) / (ifac - pfac);
-	n = mbuf->x * mbuf->y;
-	
-	if (cast->show) fac = cast->show - 1;
-	
-	if (mbuf->rect_float) {
-		if (fac >= 1) {
-			memcpy(mbuf->rect_float, ibuf->rect_float, 4 * n * sizeof(float));
-		}
-		else if (fac <= 0) {
-			memcpy(mbuf->rect_float, pbuf->rect_float, 4 * n * sizeof(float));
-		}
-		else {  /* interpolate */
-			infac = 1 - fac;
-			
-			irectf = (float *)ibuf->rect_float;
-			prectf = (float *)pbuf->rect_float;
-			mrectf = (float *)mbuf->rect_float;
-			while (n--) {
-				mrectf[0] = irectf[0] * fac + prectf[0] * infac;
-				mrectf[1] = irectf[1] * fac + prectf[1] * infac;
-				mrectf[2] = irectf[2] * fac + prectf[2] * infac;
-				mrectf[3] = irectf[3] * fac + prectf[3] * infac;
-				mrectf += 4;
-				irectf += 4;
-				prectf += 4;
-			}
-		}
-	}	
-	else if (mbuf->rect) {
-		b1 = (int)fac * 255.0;
-		if (b1 > 255) b1 = 255;
-		b2 = 255 - b1;
-
-		if (b1 == 255) {
-			memcpy(mbuf->rect, ibuf->rect, 4 * n);
-		}
-		else if (b1 == 0) {
-			memcpy(mbuf->rect, pbuf->rect, 4 * n);
-		}
-		else {  /* interpolate */
-			irect = (char *)ibuf->rect;
-			prect = (char *)pbuf->rect;
-			mrect = (char *)mbuf->rect;
-			while (n--) {
-				mrect[0] = (irect[0] * b1 + prect[0] * b2) >> 8;
-				mrect[1] = (irect[1] * b1 + prect[1] * b2) >> 8;
-				mrect[2] = (irect[2] * b1 + prect[2] * b2) >> 8;
-				mrect[3] = (irect[3] * b1 + prect[3] * b2) >> 8;
-				mrect += 4;
-				irect += 4;
-				prect += 4;
-			}
-		}
-	}
-
-	freeImBuf(ibuf);
-	freeImBuf(pbuf);
-}
-
-
-void plugin_seq_doit(Cast *cast, float facf0, float facf1, int x, int y, ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *out, ImBuf *use)
-{
-	float bfacf0, bfacf1;
-	
-	if (cast->use_ipo == 0) {
-		bfacf0 = bfacf1 = cast->blur + 1.0;
-	}
-	else {
-		bfacf0 = (facf0 * 6.0) + 1.0;
-		bfacf1 = (facf1 * 6.0) + 1.0;
-	}
-
-	if (out->rect) memcpy(out->rect, ibuf1->rect, 4 * out->x * out->y);
-	if (out->rect_float) memcpy(out->rect_float, ibuf1->rect_float, 4 * out->x * out->y * sizeof(float));
-	
-/****************I can't get this field code to work... works ok without...paprmh****************/
-
-
-	/* it blurs interlaced, only tested with even fields */
-
-/*	de_interlace(out);*/
-	/* otherwise scaling goes wrong */
-/*	out->flags &= ~IB_fields;*/
-	
-	doblur(out, bfacf0, cast); /*fieldA*/
-
-/*	if (out->rect)out->rect += out->x * out->y;
-    if (out->rect_float)out->rect_float += out->x * out->y;
-		
-    doblur(out, bfacf1, cast);*/ /*fieldB*/
-
-/*	if (out->rect)out->rect -= out->x * out->y;
-    if (out->rect_float)out->rect_float -= out->x * out->y;
-    out->flags |= IB_fields;
-
-    interlace(out);*/
-	
-}
-
diff --git a/release/plugins/sequence/color-correction-hsv.c b/release/plugins/sequence/color-correction-hsv.c
deleted file mode 100644
index b9ffd88b26c..00000000000
--- a/release/plugins/sequence/color-correction-hsv.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * Color Correction Plugin (YUV Version) 0.01
- *
- * Copyright (c) 2005 Peter Schlaile
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#include <math.h>
-#include "plugin.h"
-#include <stdio.h>
-
-char name[]= "Color Correction";
-
-VarStruct varstr[]= {
-	{ NUMSLI|FLO, "St Y:", 0.0,	-1.0,	1.0, "Setup Y"}, 
-	{ NUMSLI|FLO, "Gn Y:",  1.0,	0.0,	10.0,"Gain Y"},
-	{ NUMSLI|FLO, "Ga Y:", 1.0,	0.0,	10.0, "Gamma Y"},
-
-	{ NUMSLI|FLO, "Lo S:",  1.0,	0.0,	10.0,"Saturation Shadows"},
-	{ NUMSLI|FLO, "Md S:",  1.0,	0.0,	10.0,"Saturation Midtones"},
-	{ NUMSLI|FLO, "Hi S:",  1.0,	0.0,	10.0,"Saturation Highlights"},
-
-	{ NUMSLI|FLO, "MA S:",  1.0,	0.0,	10.0,"Master Saturation"}, 
-
-	{ NUMSLI|FLO, "Lo T:",  0.25, 0.0, 1.0,
-	  "Saturation Shadow Thres"}, 
-	{ NUMSLI|FLO, "Hi T:",  0.75, 0.0, 1.0,
-	  "Saturation Highlights Thres"}, 
-	{ TOG|INT,	"Debug", 0.0,	0.0,	1.0,   
-	  "Show curves as overlay"}, 
-};
-
-typedef struct Cast {
-	float setup_y;
-	float gain_y;
-	float gamma_y;
-	float sat_shadows;
-	float sat_midtones;
-	float sat_highlights;
-
-	float master_sat;
-	float lo_thres;
-	float hi_thres;
-	int debug;
-} Cast;
-
-float cfra;
-
-void plugin_seq_doit(Cast *, float, float, int, int, ImBuf *, ImBuf *, ImBuf *, ImBuf *);
-
-int plugin_seq_getversion(void) { return B_PLUGIN_VERSION;}
-void plugin_but_changed(int but) {}
-void plugin_init() {}
-
-void plugin_getinfo(PluginInfo *info)
-{
-	info->name= name;
-	info->nvars= sizeof(varstr)/sizeof(VarStruct);
-	info->cfra= &cfra;
-
-	info->varstr= varstr;
-
-	info->init= plugin_init;
-	info->seq_doit= (SeqDoit) plugin_seq_doit;
-	info->callback= plugin_but_changed;
-}
-
-static void hsv_to_rgb (double  h, double  s, double  v,
-			double *r, double *g, double *b)
-{
-	int i;
-	double f, w, q, t;
-
-	if (s == 0.0)
-		s = 0.000001;
-	
-	if (h == -1.0)
-	{
-		*r = v;
-		*g = v;
-		*b = v;
-	}
-	else
-	{
-		if (h == 360.0)
-			h = 0.0;
-		h = h / 60.0;
-		i = (int) h;
-		f = h - i;
-		w = v * (1.0 - s);
-		q = v * (1.0 - (s * f));
-		t = v * (1.0 - (s * (1.0 - f)));
-		
-		switch (i)
-		{
-		case 0:
-			*r = v;
-			*g = t;
-			*b = w;
-			break;
-		case 1:
-			*r = q;
-			*g = v;
-			*b = w;
-			break;
-		case 2:
-			*r = w;
-			*g = v;
-			*b = t;
-			break;
-		case 3:
-			*r = w;
-			*g = q;
-			*b = v;
-			break;
-		case 4:
-			*r = t;
-			*g = w;
-			*b = v;
-			break;
-		case 5:
-			*r = v;
-			*g = w;
-			*b = q;
-			break;
-		}
-	}
-}
-
-static void rgb_to_hsv (double  r, double  g, double  b,
-			double *h, double *s, double *v)
-{
-	double max, min, delta;
-
-	max = r;
-	if (g > max)
-		max = g;
-	if (b > max)
-		max = b;
-	
-	min = r;
-	if (g < min)
-		min = g;
-	if (b < min)
-		min = b;
-	
-	*v = max;
-	
-	if (max != 0.0)
-		*s = (max - min) / max;
-	else
-		*s = 0.0;
-	
-	if (*s == 0.0)
-		*h = -1.0;
-	else
-	{
-		delta = max - min;
-		
-		if (r == max)
-			*h = (g - b) / delta;
-		else if (g == max)
-			*h = 2.0 + (b - r) / delta;
-		else if (b == max)
-			*h = 4.0 + (r - g) / delta;
-		
-		*h = *h * 60.0;
-		
-		if (*h < 0.0)
-			*h = *h + 360;
-	}
-}
-
-void plugin_seq_doit(Cast *cast, float facf0, float facf1, int width, 
-	int height, ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *out, ImBuf *use) {
-	char *dest, *src1;
-	int x, y, c;
-	double gamma_table[256];
-	double uv_table[256];
-	float *destf = out->rect_float;
-	float *src1f;
-	
-	if (!ibuf1) return;
-
-	dest= (char *) out->rect;
-	src1= (char *) ibuf1->rect;
-	src1f= ibuf1->rect_float;
-
-	for (y = 0; y < 256; y++) {
-		float v = 1.0 * y / 255;
-		v += cast->setup_y;
-		v *= cast->gain_y;
-		v = pow(v, cast->gamma_y);
-		if ( v > 1.0) {
-			v = 1.0;
-		} else if (v < 0.0) {
-			v = 0.0;
-		}
-		gamma_table[y] = v * 255;
-	}
-
-	for (y = 0; y < 256; y++) {
-		float v = 1.0;
-		v *= cast->master_sat;
-		if (y < cast->lo_thres * 255) {
-			v *= cast->sat_shadows;
-		} else if (y > cast->hi_thres * 255) {
-			v *= cast->sat_highlights;
-		} else {
-			v *= cast->sat_midtones;
-		}
-		uv_table[y] = v;
-	}
-
-
-	for (y = 0; y < height; y++) {
-		for (x = 0; x < width; x++) {
-			double h,s,v,r,g,b;
-			double fac;
-
-			if (ibuf1->rect_float) rgb_to_hsv(src1f[0], src1f[1],
-				src1f[2],&h,&s,&v);
-			else rgb_to_hsv((double) src1[0]/255.0,
-				   (double) src1[1]/255.0,
-				   (double) src1[2]/255.0,
-				   &h, &s, &v);
-			v = gamma_table[(int) (v * 255.0)] / 255.0;
-
-			fac = uv_table[(int) (255.0 * v)];
-
-			s *= fac;
-			if (s >= 1.0) {
-				s = 1.0;
-			}
-			hsv_to_rgb(h,s,v, &r, &g, &b);
-			
-			if (out->rect_float) {
-				destf[0] = r;
-				destf[1] = g;
-				destf[2] = b;
-				destf = destf + 4;
-				src1f +=4;
-			} else {
-				dest[0] = r*255.0;
-				dest[1] = g*255.0;
-				dest[2] = b*255.0;
-				dest += 4;
-			}
-
-			src1 += 4;
-		}
-	}
-
-	if (cast->debug) {
-		dest= (char *) out->rect;
-		for (c = 0; c < 10; c++) {
-			x = 0;
-			for (y = 0; y < 256; y++) {
-				char val = gamma_table[y];
-				while (x < y * width / 255) {
-					*dest++ = val;
-					*dest++ = val;
-					*dest++ = val;
-					dest++;
-					x++;
-				}
-			}
-		}
-		for (c = 0; c < 10; c++) {
-			x = 0;
-			for (y = 0; y < 256; y++) {
-				char val = uv_table[y] * 255.0/10.0;
-				while (x < y * width / 255) {
-					*dest++ = val;
-					*dest++ = val;
-					*dest++ = val;
-					dest++;
-					x++;
-				}
-			}
-		}
-	}
-}
diff --git a/release/plugins/sequence/color-correction-yuv.c b/release/plugins/sequence/color-correction-yuv.c
deleted file mode 100644
index c0c5d048b8f..00000000000
--- a/release/plugins/sequence/color-correction-yuv.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Color Correction Plugin (YUV Version) 0.01
- *
- * Copyright (c) 2005 Peter Schlaile
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#include <math.h>
-#include "plugin.h"
-#include <stdio.h>
-
-char name[]= "Color Correction";
-
-VarStruct varstr[]= {
-	{ NUMSLI|FLO, "St Y:", 0.0,	-1.0,	1.0, "Setup Y"}, 
-	{ NUMSLI|FLO, "Gn Y:",  1.0,	0.0,	10.0,"Gain Y"},
-	{ NUMSLI|FLO, "Ga Y:", 1.0,	0.0,	10.0, "Gamma Y"},
-
-	{ NUMSLI|FLO, "Lo S:",  1.0,	0.0,	10.0,"Saturation Shadows"},
-	{ NUMSLI|FLO, "Md S:",  1.0,	0.0,	10.0,"Saturation Midtones"},
-	{ NUMSLI|FLO, "Hi S:",  1.0,	0.0,	10.0,"Saturation Highlights"},
-
-	{ NUMSLI|FLO, "MA S:",  1.0,	0.0,	10.0,"Master Saturation"}, 
-	{ NUMSLI|FLO, "Lo T:",  0.25, 0.0, 1.0,
-	  "Saturation Shadow Thres"}, 
-	{ NUMSLI|FLO, "Hi T:",  0.75, 0.0, 1.0,
-	  "Saturation Highlights Thres"}, 
-	{ TOG|INT,	"Debug", 0.0,	0.0,	1.0,   
-	  "Show curves as overlay"}, 
-};
-
-typedef struct Cast {
-	float setup_y;
-	float gain_y;
-	float gamma_y;
-	
-	float sat_shadows;
-	float sat_midtones;
-	float sat_highlights;
-
-	float master_sat;
-	float lo_thres;
-	float hi_thres;
-	int debug;
-} Cast;
-
-float cfra;
-
-void plugin_seq_doit(Cast *, float, float, int, int, ImBuf *, ImBuf *, ImBuf *, ImBuf *);
-
-int plugin_seq_getversion(void) { return B_PLUGIN_VERSION;}
-void plugin_but_changed(int but) {}
-void plugin_init() {}
-
-void plugin_getinfo(PluginInfo *info)
-{
-	info->name= name;
-	info->nvars= sizeof(varstr)/sizeof(VarStruct);
-	info->cfra= &cfra;
-
-	info->varstr= varstr;
-
-	info->init= plugin_init;
-	info->seq_doit= (SeqDoit) plugin_seq_doit;
-	info->callback= plugin_but_changed;
-}
-
-static void rgb_to_yuv(float rgb[3], float yuv[3])
-{
-	yuv[0]= 0.299*rgb[0] + 0.587*rgb[1] + 0.114*rgb[2];
-	yuv[1]= 0.492*(rgb[2] - yuv[0]);
-	yuv[2]= 0.877*(rgb[0] - yuv[0]);
-	
-	/* Normalize */
-	yuv[1] /= 0.436;
-	yuv[2] /= 0.615;
-}
-
-static void yuv_to_rgb(float yuv[3], float rgb[3])
-{
-	yuv[1] *= 0.436;
-	yuv[2] *= 0.615;
-
-	rgb[0] = yuv[2]/0.877 + yuv[0];
-	rgb[2] = yuv[1]/0.492 + yuv[0];
-	rgb[1] = (yuv[0] - 0.299*rgb[0] - 0.114*rgb[2]) / 0.587;
-	if (rgb[0] > 1.0) {
-		rgb[0] = 1.0;
-	}
-	if (rgb[0] < 0.0) {
-		rgb[0] = 0.0;
-	}
-	if (rgb[1] > 1.0) {
-		rgb[1] = 1.0;
-	}
-	if (rgb[1] < 0.0) {
-		rgb[1] = 0.0;
-	}
-	if (rgb[2] > 1.0) {
-		rgb[2] = 1.0;
-	}
-	if (rgb[2] < 0.0) {
-		rgb[2] = 0.0;
-	}
-}
-
-void plugin_seq_doit(Cast *cast, float facf0, float facf1, int width, 
-	int height, ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *out, ImBuf *use) {
-	char *dest, *src1, *src2;
-	int x, y, c;
-	float rgb[3];
-	float yuv[3];
-	float gamma_table[256];
-	float uv_table[256];
-	float *destf = out->rect_float;
-	float *src1f;
-	
-	if (!ibuf1) return;
-
-	dest= (char *) out->rect;
-	src1= (char *) ibuf1->rect;
-	src1f= ibuf1->rect_float;
-
-	for (y = 0; y < 256; y++) {
-		float v = 1.0 * y / 255;
-		v += cast->setup_y;
-		v *= cast->gain_y;
-		v = pow(v, cast->gamma_y);
-		if ( v > 1.0) {
-			v = 1.0;
-		} else if (v < 0.0) {
-			v = 0.0;
-		}
-		gamma_table[y] = v * 255;
-	}
-
-	for (y = 0; y < 256; y++) {
-		float v = 1.0;
-		v *= cast->master_sat;
-		if (y < cast->lo_thres * 255) {
-			v *= cast->sat_shadows;
-		} else if (y > cast->hi_thres * 255) {
-			v *= cast->sat_highlights;
-		} else {
-			v *= cast->sat_midtones;
-		}
-		uv_table[y] = v;
-	}
-
-
-	for (y = 0; y < height; y++) {
-		for (x = 0; x < width; x++) {
-			float fac;
-			if (out->rect_float) {
-				rgb[0]= (float)src1f[0]/255.0;
-				rgb[1]= (float)src1f[1]/255.0;
-				rgb[2]= (float)src1f[2]/255.0;
-			} else {
-				rgb[0]= (float)src1[0]/255.0;
-				rgb[1]= (float)src1[1]/255.0;
-				rgb[2]= (float)src1[2]/255.0;
-			}
-			rgb_to_yuv(rgb, yuv);
-
-			yuv[0] = gamma_table[(int) (yuv[0] * 255.0)] / 255.0;
-			fac = uv_table[(int) (255.0 * yuv[0])];
-
-			yuv[1] = yuv[1] * fac;
-			yuv[2] = yuv[2] * fac;
-			if (yuv[1] > 1.0) {
-				yuv[1] = 1.0;
-			}
-			if (yuv[1] < -1.0) {
-				yuv[1] = -1.0;
-			}
-			if (yuv[2] > 1.0) {
-				yuv[2] = 1.0;
-			}
-			if (yuv[2] < -1.0) {
-				yuv[2] = -1.0;
-			}
-			yuv_to_rgb(yuv, rgb);
-			
-			if (out->rect_float) {
-				*destf++ = rgb[0];
-				*destf++ = rgb[1];
-				*destf++ = rgb[2];
-				destf++;
-				src1f += 4;
-			} else {
-				*dest++ = rgb[0]*255.0;
-				*dest++ = rgb[1]*255.0;
-				*dest++ = rgb[2]*255.0;
-				dest++;
-				src1 += 4;
-			}
-		}
-	}
-
-	if (cast->debug) {
-		dest= (char *) out->rect;
-		for (c = 0; c < 10; c++) {
-			x = 0;
-			for (y = 0; y < 256; y++) {
-				char val = gamma_table[y];
-				while (x < y * width / 255) {
-					*dest++ = val;
-					*dest++ = val;
-					*dest++ = val;
-					dest++;
-					x++;
-				}
-			}
-		}
-		for (c = 0; c < 10; c++) {
-			x = 0;
-			for (y = 0; y < 256; y++) {
-				char val = uv_table[y] * 255.0/10.0;
-				while (x < y * width / 255) {
-					*dest++ = val;
-					*dest++ = val;
-					*dest++ = val;
-					dest++;
-					x++;
-				}
-			}
-		}
-	}
-}
diff --git a/release/plugins/sequence/dnr.c b/release/plugins/sequence/dnr.c
deleted file mode 100644
index d374c40633c..00000000000
--- a/release/plugins/sequence/dnr.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Dynamic Noise Reduction (based on the VirtualDub filter by Steven Don)
- *
- * Copyright (c) 2005 Peter Schlaile 
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#include <math.h>
-#include "plugin.h"
-#include <stdio.h>
-
-char name[]= "Dynamic Noise Reduction";
-
-VarStruct varstr[]= {
-	{ NUMSLI|INT, "Level:", 10.0,	0.0,	15.0, "Level"}, 
-};
-
-typedef struct Cast {
-	int level;
-} Cast;
-
-float cfra;
-void * plugin_private_data;
-
-struct my_data {
-	unsigned char lookup_table[65536];
-	int last_level;
-	float last_cfra;
-	int last_width;
-	int last_height;
-	unsigned char * last_frame;
-};
-
-void plugin_seq_doit(Cast *, float, float, int, int, 
-                     ImBuf *, ImBuf *, ImBuf *, ImBuf *);
-
-int plugin_seq_getversion(void) { return B_PLUGIN_VERSION;}
-
-static void precalculate(unsigned char * table, int level)
-{
-	int ap_, bp;
-
-	for (ap_ = 0; ap_ < 256; ap_++) {
-		for (bp = 0; bp < 256; bp++) {
-			int ap = ap_;
-			int diff = ap - bp;
-			if (diff < 0) {
-				diff = -diff;
-			}
-			if (diff < level) {
-				if (diff > (level >> 1)) {
-					ap = (ap + ap + bp)/3;
-				} else {
-					ap = bp;
-				}
-			}
-		
-			*table++ = ap;
-		}
-	}
-}
-
-void plugin_but_changed(int but) { }
-void plugin_init() { }
-
-void * plugin_seq_alloc_private_data()
-{
-	struct my_data * result = (struct my_data*) calloc(
-		sizeof(struct my_data), 1);
-	result->last_cfra = -1;
-	return result;
-}
-
-void plugin_seq_free_private_data(void * data)
-{
-	struct my_data * d = (struct my_data*) data;
-	if (d->last_frame) {
-		free(d->last_frame);
-	}
-	free(d);
-}
-
-void plugin_getinfo(PluginInfo *info)
-{
-	info->name= name;
-	info->nvars= sizeof(varstr)/sizeof(VarStruct);
-	info->cfra= &cfra;
-
-	info->varstr= varstr;
-
-	info->init= plugin_init;
-	info->seq_doit= (SeqDoit) plugin_seq_doit;
-	info->callback= plugin_but_changed;
-}
-
-static void doit(unsigned char * src_, unsigned char * dst_,
-		 unsigned char * table, int width, int height)
-{
-	int count = width * height;
-	unsigned char * src = src_;
-	unsigned char * dst = dst_;
-
-	while (count--) {
-		*dst = table[(*src++ << 8) | *dst]; dst++;
-		*dst = table[(*src++ << 8) | *dst]; dst++;
-		*dst = table[(*src++ << 8) | *dst]; dst++;
-		*dst++ = *src++;
-	}
-
-	memcpy(src_, dst_, width * height * 4);
-}
-
-void plugin_seq_doit(Cast *cast, float facf0, float facf1, int width, 
-	int height, ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *out, ImBuf *use) {
-
-	struct my_data * d = (struct my_data*) plugin_private_data;
-
-	if (!ibuf1) return;
-
-	if (cast->level != d->last_level) {
-		precalculate(d->lookup_table, cast->level);
-		d->last_level = cast->level;
-	}
-
-	if (width != d->last_width || height != d->last_height ||
-	    cfra != d->last_cfra + 1)
-	{
-		free(d->last_frame);
-		d->last_frame = (unsigned char*) calloc(width * height, 4);
-		
-		d->last_width = width;
-		d->last_height = height;
-	}
-
-	memcpy(out->rect, ibuf1->rect, width * height * 4);
-
-	doit((unsigned char*) out->rect, 
-	     d->last_frame, d->lookup_table, width, height);
-	
-	d->last_cfra = cfra;
-}
diff --git a/release/plugins/sequence/gamma.c b/release/plugins/sequence/gamma.c
deleted file mode 100644
index d6181eb0e9d..00000000000
--- a/release/plugins/sequence/gamma.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Gamma Correction Plugin (RGB Version) 0.01
- *
- * Copyright (c) 2005 Peter Schlaile
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#include <math.h>
-#include "plugin.h"
-#include "util.h"
-#include <stdio.h>
-
-#define alpha_epsilon 0.0001f
-char name[]= "Gamma Correction";
-
-VarStruct varstr[]= {
-	{ NUMSLI|FLO, "St M:", 0.0,	-1.0,	1.0, "Setup Main"}, 
-	{ NUMSLI|FLO, "Gn M:",  1.0,	0.0,	10.0,"Gain Main"},
-	{ NUMSLI|FLO, "Ga M:", 1.0,	0.0,	10.0, "Gamma Main"},
-
-	{ NUMSLI|FLO, "St R:", 0.0,	-1.0,	1.0, "Setup Red"}, 
-	{ NUMSLI|FLO, "Gn R:",  1.0,	0.0,	10.0,"Gain Red"},
-	{ NUMSLI|FLO, "Ga R:", 1.0,	0.0,	10.0, "Gamma Red"},
-
-	{ NUMSLI|FLO, "St G:", 0.0,	-1.0,	1.0, "Setup Green"}, 
-	{ NUMSLI|FLO, "Gn G:",  1.0,	0.0,	10.0,"Gain Green"},
-	{ NUMSLI|FLO, "Ga G:", 1.0,	0.0,	10.0, "Gamma Green"},
-
-	{ NUMSLI|FLO, "St B:", 0.0,	-1.0,	1.0, "Setup Blue"}, 
-	{ NUMSLI|FLO, "Gn B:",  1.0,	0.0,	10.0,"Gain Blue"},
-	{ NUMSLI|FLO, "Ga B:", 1.0,	0.0,	10.0, "Gamma Blue"},
-};
-
-typedef struct Cast {
-	float setup_m;
-	float gain_m;
-	float gamma_m;
-
-	float setup_r;
-	float gain_r;
-	float gamma_r;
-
-	float setup_g;
-	float gain_g;
-	float gamma_g;
-
-	float setup_b;
-	float gain_b;
-	float gamma_b;
-} Cast;
-
-float cfra;
-
-void plugin_seq_doit(Cast *, float, float, int, int, ImBuf *, ImBuf *, ImBuf *, ImBuf *);
-
-int plugin_seq_getversion(void) { return B_PLUGIN_VERSION; }
-void plugin_but_changed(int but) {}
-void plugin_init() {}
-
-void plugin_getinfo(PluginInfo *info)
-{
-	info->name= name;
-	info->nvars= sizeof(varstr)/sizeof(VarStruct);
-	info->cfra= &cfra;
-
-	info->varstr= varstr;
-
-	info->init= plugin_init;
-	info->seq_doit= (SeqDoit) plugin_seq_doit;
-	info->callback= plugin_but_changed;
-}
-
-static void make_gamma_table(float setup, float gain, float gamma,
-			     unsigned char * table)
-{
-	int y;
-
-	for (y = 0; y < 256; y++) {
-		float v = 1.0 * y / 255;
-		v += setup;
-		v *= gain;
-		v = pow(v, gamma);
-		if ( v > 1.0) {
-			v = 1.0;
-		} else if (v < 0.0) {
-			v = 0.0;
-		}
-		table[y] = v * 255;
-	}
-
-}
-
-
-void plugin_seq_doit(Cast *cast, float facf0, float facf1, int width, 
-	int height, ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *out, ImBuf *use) {
-	if (!out->rect_float)
-	{
-		unsigned char *dest, *src1, *src2;
-		int x, y, c;
-		unsigned char gamma_table_m[256];
-		unsigned char gamma_table_r[256];
-		unsigned char gamma_table_g[256];
-		unsigned char gamma_table_b[256];
-		
-		if (!ibuf1) return;
-
-		dest= (unsigned char *) out->rect;
-		src1= (unsigned char *) ibuf1->rect;
-
-		make_gamma_table(cast->setup_m, cast->gain_m, cast->gamma_m,
-		                 gamma_table_m);
-		make_gamma_table(cast->setup_r, cast->gain_r, cast->gamma_r,
-		                 gamma_table_r);
-		make_gamma_table(cast->setup_g, cast->gain_g, cast->gamma_g,
-		                 gamma_table_g);
-		make_gamma_table(cast->setup_b, cast->gain_b, cast->gamma_b,
-		                 gamma_table_b);
-
-		for (y = 0; y < height; y++) {
-			for (x = 0; x < width; x++) {
-				*dest++ = gamma_table_r[gamma_table_m[*src1++]];
-				*dest++ = gamma_table_g[gamma_table_m[*src1++]];
-				*dest++ = gamma_table_b[gamma_table_m[*src1++]];
-				dest++; src1++;
-			}
-		}
-	}
-	else
-	{
-		float *i=ibuf1->rect_float;
-		float *o=out->rect_float;
-		unsigned int size=width*height;
-		unsigned int k;
-		float val_r[3]={cast->setup_r,cast->gain_r,cast->gamma_r};
-		float val_g[3]={cast->setup_g,cast->gain_g,cast->gamma_g};
-		float val_b[3]={cast->setup_b,cast->gain_b,cast->gamma_b};
-		float *vals[3]={val_r,val_g,val_b};
-		for (k=0;k<size;++k)
-		{
-			if (cast->gamma_m!=1.f || cast->setup_m!=0.f || cast->gain_m!=1.f)
-			{
-				float alpha=CLAMP(i[3],0.f,1.f);
-				if (alpha>alpha_epsilon) {
-					int l;
-					for (l=0;l<3;++l)
-					{
-						float *val=vals[l];
-						o[l]=i[l]/alpha;
-						o[l]=pow((o[l]+cast->setup_m)*cast->gain_m,cast->gamma_m);
-						if (val[2]!=1.f || val[0]!=0.f || val[1]!=1.f)
-						{
-							o[l]=pow((o[l]+val[0])*val[1],val[2]);
-						}
-						o[l]*=alpha;
-						o[l]=CLAMP(o[l],0.f,1.f);
-					}
-				} else {
-					o[0]=o[1]=o[2]=0.0;
-				}
-				o[3]=1.0;
-			}
-			else
-			{
-				int l;
-				for (l=0;l<3;++l)
-					o[l]=CLAMP(i[l],0.f,1.f);
-				o[3]=1.0;
-			}
-			i+=4;
-			o+=4;
-		}
-	}
-}
diff --git a/release/plugins/sequence/scatter.c b/release/plugins/sequence/scatter.c
deleted file mode 100644
index a480f194bea..00000000000
--- a/release/plugins/sequence/scatter.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/**
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include "plugin.h"
-
-/* ******************** GLOBAL VARIABLES ***************** */
-
-
-char name[24] = "scatter";
-
-/* structure for buttons, 
- *  butcode      name           default  min  max  0
- */
-
-VarStruct varstr[] = {
-	LABEL,      "Input: 1 strip", 0.0, 0.0, 0.0, "",
-	NUM | INT,    "seed: ",       1.0,    0.0, 10.0, "Offset in random table",
-	NUMSLI | FLO, "swing: ",      1.0,    0.0, 3.0, "The amplitude, width of the effect",
-	TOG | INT,    "wrap",         0.0,    0.0, 1.0, "Cyclic wrap around the left/right edges",
-	NUM | INT,    "type: ",       1.0,    0.0, 1.0, "Type 1 is random for each frame",
-};
-
-/* The cast struct is for input in the main doit function
-   Varstr and Cast must have the same variables in the same order */ 
-
-typedef struct Cast {
-	int dummy;          /* because of the 'label' button */
-	int seed;
-	float swing;
-	int wrap;
-	int type;
-} Cast;
-
-/* cfra: the current frame */
-
-float cfra;
-
-void plugin_seq_doit(Cast *, float, float, int, int, ImBuf *, ImBuf *, ImBuf *, ImBuf *);
-
-
-/* ******************** Fixed functions ***************** */
-
-int plugin_seq_getversion(void) 
-{
-	return B_PLUGIN_VERSION;
-}
-
-void plugin_but_changed(int but) 
-{
-}
-
-void plugin_init()
-{
-}
-
-void plugin_getinfo(PluginInfo *info)
-{
-	info->name = name;
-	info->nvars = sizeof(varstr) / sizeof(VarStruct);
-	info->cfra = &cfra;
-
-	info->varstr = varstr;
-
-	info->init = plugin_init;
-	info->seq_doit = (SeqDoit) plugin_seq_doit;
-	info->callback = plugin_but_changed;
-}
-
-
-/* ************************************************************
-    Scatter
-	
-************************************************************ */
-
-static void rectcpy(ImBuf *dbuf, ImBuf *sbuf,	
-                    int destx, int desty,
-                    int srcx, int srcy, int width, int height)
-{
-	uint *drect, *srect;
-	float *dfrect, *sfrect;
-	int tmp;
-
-	if (dbuf == 0) return;
-
-	if (destx < 0) {
-		srcx -= destx;
-		width += destx;
-		destx = 0;
-	}
-	if (srcx < 0) {
-		destx -= srcx;
-		width += destx;
-		srcx = 0;
-	}
-	if (desty < 0) {
-		srcy -= desty;
-		height += desty;
-		desty = 0;
-	}
-	if (srcy < 0) {
-		desty -= srcy;
-		height += desty;
-		srcy = 0;
-	}
-
-	if (width > dbuf->x - destx) width = dbuf->x - destx;
-	if (height > dbuf->y - desty) height = dbuf->y - desty;
-	if (sbuf) {
-		if (width > sbuf->x - srcx) width = sbuf->x - srcx;
-		if (height > sbuf->y - srcy) height = sbuf->y - srcy;
-		srect = sbuf->rect;
-		sfrect = sbuf->rect_float;
-	}
-
-	if (width <= 0) return;
-	if (height <= 0) return;
-
-	drect = dbuf->rect;
-	dfrect = dbuf->rect_float;
-
-	tmp = (desty * dbuf->x + destx);
-
-	if (dbuf->rect_float) dfrect += 4 * tmp;
-	else drect += tmp;
-
-	destx = dbuf->x;
-
-	if (sbuf) {
-		tmp = (srcy * sbuf->x + srcx);
-		if (dbuf->rect_float) sfrect += 4 * tmp; 
-		else srect += tmp;
-		srcx = sbuf->x;
-	}
-	else {
-		if (dbuf->rect_float) sfrect = dfrect;
-		else srect = drect;
-		srcx = destx;
-	}
-
-	for (; height > 0; height--) {
-		if (dbuf->rect_float) {
-			memcpy(dfrect, sfrect, 4 * width * sizeof(float));
-			dfrect += destx;
-			sfrect += srcx;
-		}
-		else {
-			memcpy(drect, srect, width * sizeof(int));
-			drect += destx;
-			srect += srcx;
-		}
-	}
-}
-
-static void fill_out(ImBuf *out, float r, float g, float b, float a)
-{
-	int tot, x;
-	float *rectf = out->rect_float;
-	unsigned char *rect = (unsigned char *)out->rect;
-
-	tot = out->x * out->y;
-	if (out->rect_float) {
-		for (x = 0; x < tot; x++) {
-			rectf[0] = r;
-			rectf[1] = g;
-			rectf[2] = b;
-			rectf[3] = a;
-			rectf += 4;
-		}
-	}
-	else {
-		for (x = 0; x < tot; x++) {
-			rect[0] = (int)(r * 255);
-			rect[1] = (int)(g * 255);
-			rect[2] = (int)(b * 255);
-			rect[3] = (int)(a * 255);
-			rect += 4;
-		}
-	}
-}
-
-
-void plugin_seq_doit(Cast *cast, float facf0, float facf1, int sx, int sy, ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *out, ImBuf *use)
-{
-	float f1, f2, t1, t2, t3;
-	int x, y, lr;
-	
-	/* fill imbuf 'out' with black */
-	fill_out(out, 0, 0, 0, 0);
-
-
-	switch (cast->type) {
-		case 0:
-			srand48(cast->seed);
-			break;
-		case 1:
-			srand48(cast->seed + facf0 * 1000);
-			break;
-	}
-
-	for (y = 0; y < sy; y++) {
-		switch (cast->type) {
-			case 0:
-				if ((y & 1) == 0) {
-					f1 = drand48() - 0.5;
-					f2 = drand48() - 0.5;
-					f1 = cast->swing * f1;
-					f2 = cast->swing * f2;
-					if (cast->wrap) f2 += 1.0;
-					lr = drand48() > 0.5;
-					t1 = facf0;
-				}
-				else t1 = facf1;
-				
-				t2 = 1.0 - t1;
-				t3 = 3.0 * (f1 * t1 * t1 * t2 + f2 * t1 * t2 * t2);
-				if (cast->wrap) t3 += t2 * t2 * t2;
-				x = sx * t3;
-				if (lr) x = -x;
-				break;
-			case 1:
-				f1 = drand48() - 0.5;
-				f1 = f1 * cast->swing;
-				if ((y & 1) == 0) f1 *= facf0;
-				else f1 *= facf1;
-				x = f1 * sx;
-				break;
-		}
-		
-		rectcpy(out, ibuf1, 0, y, x, y, 32767, 1);
-		if (cast->wrap) {
-			rectcpy(out, ibuf1, 0, y, x + sx, y, 32767, 1);
-			rectcpy(out, ibuf1, 0, y, x + sx + sx, y, 32767, 1);
-			rectcpy(out, ibuf1, 0, y, x - sx, y, 32767, 1);
-			rectcpy(out, ibuf1, 0, y, x - sx - sx, y, 32767, 1);
-		}
-	}
-}
-
diff --git a/release/plugins/texture/Makefile b/release/plugins/texture/Makefile
deleted file mode 100644
index 2b12e62d24a..00000000000
--- a/release/plugins/texture/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): none yet.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-all: plugins
-
-plugins:
-	@/bin/sh -c 'for i in *.c; do ../bmake $$i; done;'
-
-clean:
-	rm -rf *.o *.so
diff --git a/release/plugins/texture/clouds2.c b/release/plugins/texture/clouds2.c
deleted file mode 100644
index 8561d11dc3b..00000000000
--- a/release/plugins/texture/clouds2.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/**
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
- 
-#include <math.h>
-#include "plugin.h"
-
-/* ******************** GLOBAL VARIABLES ***************** */
-
-/* Texture name */
-
-char name[24]= "Clouds2";
-
-/* Subtype names must be less than 15 characters */
-
-#define NR_TYPES	3
-char stnames[NR_TYPES][16]= {"Intens", "Col", "Bump" };
-
-/* Structure for buttons, 
- *  butcode      name           default  min  max  0
- */
-
-VarStruct varstr[]= {
-{	NUM|FLO,	"Offset",		-0.5, 	 -20.0, 20.0, ""}, 
-{	NUM|INT,	"Depth",		8.0, 	1.0, 12.0, ""}, 
-{	NUM|FLO,	"Scale",		2.2, 	-20.0, 20.0, ""},  
-{	NUM|FLO,	"Falloff",		1.0, 	-20.0, 20.0, ""}
-};
-
-/* The cast struct is for input in the main doit function
-   Varstr and Cast must have the same variables in the same order, 
-   INCLUDING dummy variables for label fields. */ 
-
-typedef struct Cast {
-	float offset;
-	int depth;
-	float txtscale;
-	float falloff;
-} Cast;
-
-/* result:
-   Intensity, R, G, B, Alpha, nor.x, nor.y, nor.z
- */
-
-float result[8];
-
-/* cfra: the current frame */
-
-float cfra;
-
-int plugin_tex_doit(int, Cast*, float*, float*, float*, float*);
-void plugin_instance_init(Cast*);
-
-/* ******************** Fixed functions ***************** */
-
-int plugin_tex_getversion(void) 
-{	
-	return B_PLUGIN_VERSION;
-}
-
-void plugin_but_changed(int but) 
-{
-}
-
-void plugin_init(void)
-{
-	
-}
-
-/* 
- * initialize any data for a particular instance of
- * the plugin here
- */
-void plugin_instance_init(Cast *cast)
-{
-}
-
-/* this function should not be changed: */
-
-void plugin_getinfo(PluginInfo *info)
-{
-	info->name= name;
-	info->stypes= NR_TYPES;
-	info->nvars= sizeof(varstr)/sizeof(VarStruct);
-	
-	info->snames= stnames[0];
-	info->result= result;
-	info->cfra= &cfra;
-	info->varstr= varstr;
-
-	info->init= plugin_init;
-	info->tex_doit= (TexDoit) plugin_tex_doit;
-	info->callback= plugin_but_changed;
-	info->instance_init= (void (*)(void *)) plugin_instance_init;
-}
-
-/* ********************* the texture ******************** */
-
-
-int plugin_tex_doit(int stype, Cast *cast, float *texvec, float *dxt, float *dyt, float *result)
-{
-	float val = 0.0;
-	float a = 1.0;
-	float p[3];
-	float tv[3];
-	int i;
-	int res = TEX_INT;
-
-	tv[0]=(texvec[0]+1.0)/2.0;
-	tv[1]=(texvec[1]+1.0)/2.0;
-	tv[2]=(texvec[2]+1.0)/2.0;
-
-	p[0] = cast->txtscale * tv[0];
-	p[1] = cast->txtscale * tv[1];
-	p[2] = cast->txtscale * tv[2];
-	
-	for (i=0; i<cast->depth; i++) {
-		val += a * hnoise(1.0, p[0], p[1], p[2]);
-		
-		p[0] *= 2.0;
-		p[1] *= 2.0;
-		p[2] *= 2.0;
-		a *= 0.5;
-	}
-	
-	/* always return this value */
-	result[0] = CLAMP (val+cast->offset, 0.0, 1.0) * pow (fabs(sqrt(tv[0]*tv[0]+tv[1]*tv[1]+tv[2]*tv[2])), cast->falloff);
-	
-	if (stype==1) {
-		/*
-		 * this is r, g, b, a:
-		 */
-		result[1]= 0.5*result[0];
-		result[2]= 1.0-val;
-		result[3]= fsqrt(fabs(result[0]));
-		result[4]= 1.0;
-
-		res |= TEX_RGB;
-	}
-	if (stype==2) {
-		/*
-		 * This value is the displacement of the actual normal in 
-		 * the Material calculation. 
-		 */
-		result[5]+= val;
-		result[6]+= 1.0-val;
-		result[7]= 0.0;
-
-		res |= TEX_NOR;
-	}
-	
-	return res;
-}
-	
diff --git a/release/plugins/texture/tiles.c b/release/plugins/texture/tiles.c
deleted file mode 100644
index 11e1ed8f8af..00000000000
--- a/release/plugins/texture/tiles.c
+++ /dev/null
@@ -1,177 +0,0 @@
- /**
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include <math.h>
-#include "plugin.h"
-
-/* ******************** GLOBAL VARIABLES ***************** */
-
-char name[]= "tiles";
-
-/* Subtype names must be less than 15 characters */
-
-#define NR_TYPES	2
-char stnames[NR_TYPES][16]= {"Square", "Deformed"};
-
-VarStruct varstr[]= {
-	 NUM|FLO,	"size",			1.0,	 0.0, 1.0,  "The size of each tile", 
-	 NUM|FLO,	"Noise",		1.0,	 0.01, 10.0, ""
-};
-
-/* The cast struct is for input in the main doit function
-   Varstr and Cast must have the same variables in the same order */ 
-
-typedef struct Cast {
-	float size;
-	float noise;
-} Cast;
-
-/* result: 
-   Intensity, R, G, B, Alpha, nor.x, nor.y, nor.z
- */
-
-float result[8];
-
-/* cfra: the current frame */
-
-float cfra;
-
-int plugin_tex_doit(int, Cast *, float *, float *, float *, float *);
-void plugin_instance_init(Cast*);
-
-/* ******************** Fixed functions ***************** */
-
-int plugin_tex_getversion(void) 
-{	
-	return B_PLUGIN_VERSION;
-}
-
-void plugin_but_changed(int but) 
-{
-}
-
-void plugin_init(void)
-{
-}
-
-/* 
- * initialize any data for a particular instance of
- * the plugin here
- */
-void plugin_instance_init(Cast *cast)
-{
-}
-
-/* this function should not be changed: */
-
-void plugin_getinfo(PluginInfo *info)
-{
-	info->name= name;
-	info->stypes= NR_TYPES;
-	info->nvars= sizeof(varstr)/sizeof(VarStruct);
-	
-	info->snames= stnames[0];
-	info->result= result;
-	info->cfra= &cfra;
-	info->varstr= varstr;
-
-	info->init= plugin_init;
-	info->tex_doit=  (TexDoit) plugin_tex_doit;
-	info->callback= plugin_but_changed;
-	info->instance_init= (void (*)(void *)) plugin_instance_init;
-
-}
-
-/* ************************************************************
-	Tiles
-	
-	Demonstration of a simple square wave function sampled
-	with anti-aliasing.
-	It is not mipmapped yet...
-	
-   ************************************************************ */
-
-
-/* square wave, antialiased, no mipmap! */
-
-float sample_wave(float freq, float coord, float pixsize)
-{
-	float fac, frac,  retval;
-	int part1, part2;
-	
-	if (pixsize > freq) return 0.5;
-	
-	pixsize/= freq;
-	
-	fac= coord/freq;
-	part1= ffloor(fac);
-	frac= fac - part1;
-
-	if (part1 & 1) retval= 0.0;
-	else retval = 1.0;
-	
-	if (pixsize != 0.0) {
-		
-		/* is coord+pixsize another value? */
-		
-		part2= ffloor(fac + pixsize);
-		if (part1==part2) return retval;
-		
-		/* antialias */	
-		if (retval == 1.0) retval= (1.0 - frac) / pixsize;
-		else retval= 1.0 - (1.0 - frac) / pixsize;
-	}
-	return retval;
-}
-
-int plugin_tex_doit(int stype, Cast *cast, float *texvec, float *dxt, float *dyt, float *result)
-{
-	float xwave, ywave;
-	
-	if (stype==1) {
-		texvec[0]+= hnoise(cast->noise, texvec[0], texvec[1], texvec[2]);
-		texvec[1]+= hnoise(cast->noise, texvec[1], texvec[2], texvec[0]);
-	}
-	
-	if (dxt && dyt) {
-		xwave= sample_wave(cast->size, texvec[0], fabs(dxt[0]) + fabs(dyt[0]) );
-		ywave= sample_wave(cast->size, texvec[1], fabs(dxt[1]) + fabs(dyt[1]) );
-
-		if (xwave > ywave) result[0]= xwave-ywave;
-		else result[0]= ywave-xwave;
-	} 
-	else {
-		xwave= sample_wave(cast->size, texvec[0], 0.0 );
-		ywave= sample_wave(cast->size, texvec[1], 0.0 );
-		
-		if (xwave > ywave) result[0]= xwave-ywave;
-		else result[0]= ywave-xwave;
-	}
-
-	return TEX_INT;
-}
diff --git a/release/scripts/modules/bpy/utils.py b/release/scripts/modules/bpy/utils.py
index 2824d6245e5..4e8179775d5 100644
--- a/release/scripts/modules/bpy/utils.py
+++ b/release/scripts/modules/bpy/utils.py
@@ -345,8 +345,7 @@ def preset_paths(subdir):
             dirs.append(directory)
 
     # Find addons preset paths
-    import addon_utils
-    for path in addon_utils.paths():
+    for path in _addon_utils.paths():
         directory = _os.path.join(path, "presets", subdir)
         if _os.path.isdir(directory):
             dirs.append(directory)
@@ -391,6 +390,11 @@ def smpte_from_frame(frame, fps=None, fps_base=None):
     Returns an SMPTE formatted string from the frame: "HH:MM:SS:FF".
 
     If *fps* and *fps_base* are not given the current scene is used.
+
+    :arg time: time in seconds.
+    :type time: number or timedelta object
+    :return: the frame.
+    :rtype: float
     """
 
     if fps is None:
@@ -402,6 +406,56 @@ def smpte_from_frame(frame, fps=None, fps_base=None):
     return smpte_from_seconds((frame * fps_base) / fps, fps)
 
 
+def time_from_frame(frame, fps=None, fps_base=None):
+    """
+    Returns the time from a frame number .
+
+    If *fps* and *fps_base* are not given the current scene is used.
+
+    :arg frame: number.
+    :type frame: the frame number
+    :return: the time in seconds.
+    :rtype: timedate.timedelta
+    """
+
+    if fps is None:
+        fps = _bpy.context.scene.render.fps
+
+    if fps_base is None:
+        fps_base = _bpy.context.scene.render.fps_base
+
+    from datetime import timedelta
+
+    return timedelta((frame * fps_base) / fps)
+
+
+def time_to_frame(time, fps=None, fps_base=None):
+    """
+    Returns a float frame number from a time given in seconds or
+    as a timedate.timedelta object.
+
+    If *fps* and *fps_base* are not given the current scene is used.
+
+    :arg time: time in seconds.
+    :type time: number or a timedate.timedelta object
+    :return: the frame.
+    :rtype: float
+    """
+
+    if fps is None:
+        fps = _bpy.context.scene.render.fps
+
+    if fps_base is None:
+        fps_base = _bpy.context.scene.render.fps_base
+
+    from datetime import timedelta
+
+    if isinstance(time, timedelta):
+        time = time.total_seconds()
+
+    return (time / fps_base) * fps
+
+
 def preset_find(name, preset_path, display_name=False, ext=".py"):
     if not name:
         return None
diff --git a/release/scripts/modules/bpy_extras/keyconfig_utils.py b/release/scripts/modules/bpy_extras/keyconfig_utils.py
index 20b0669e531..f8b0abd03ea 100644
--- a/release/scripts/modules/bpy_extras/keyconfig_utils.py
+++ b/release/scripts/modules/bpy_extras/keyconfig_utils.py
@@ -95,6 +95,7 @@ KM_HIERARCHY = [
     ('Clip', 'CLIP_EDITOR', 'WINDOW', [
         ('Clip Editor', 'CLIP_EDITOR', 'WINDOW', []),
         ('Clip Graph Editor', 'CLIP_EDITOR', 'WINDOW', []),
+        ('Mask Editing', 'EMPTY', 'WINDOW', []),  # image (reverse order, UVEdit before Image
         ]),
 
     ('View3D Gesture Circle', 'EMPTY', 'WINDOW', []),
@@ -145,7 +146,7 @@ def _export_properties(prefix, properties, lines=None):
         return result
 
     for pname in properties.bl_rna.properties.keys():
-        if pname != "rna_type" and not properties.is_property_hidden(pname):
+        if pname != "rna_type":
             value = getattr(properties, pname)
             if isinstance(value, OperatorProperties):
                 _export_properties(prefix + "." + pname, value, lines)
diff --git a/release/scripts/presets/interface_theme/back_to_black.xml b/release/scripts/presets/interface_theme/back_to_black.xml
index 66a2ae54ade..866c4ab412d 100644
--- a/release/scripts/presets/interface_theme/back_to_black.xml
+++ b/release/scripts/presets/interface_theme/back_to_black.xml
@@ -42,6 +42,7 @@
                    object_selected="#f15800"
                    outline_width="1"
                    panel="#a5a5a57f"
+                   skin_root="#000000"
                    speaker="#535353"
                    transform="#ffffff"
                    handle_vect="#409030"
@@ -80,7 +81,9 @@
                        marker_outline="#0094af"
                        path_after="#0000ff"
                        path_before="#ff0000"
-                       selected_marker="#ffff00">
+                       selected_marker="#ffff00"
+                       strips="#0c0a0a"
+                       strips_selected="#ff8c00">
         <space>
           <ThemeSpaceGeneric header="#000000"
                              header_text="#979797"
@@ -95,6 +98,13 @@
                              back="#0d0d0d">
           </ThemeSpaceGeneric>
         </space>
+        <space_list>
+          <ThemeSpaceListGeneric list="#666666"
+                                 list_text="#000000"
+                                 list_text_hi="#ffffff"
+                                 list_title="#000000">
+          </ThemeSpaceListGeneric>
+        </space_list>
       </ThemeClipEditor>
     </clip_editor>
     <console>
@@ -130,6 +140,7 @@
                       grid="#212121"
                       long_key="#0c0a0a"
                       long_key_selected="#ff8c00"
+                      summary="#00000000"
                       value_sliders="#000000"
                       view_sliders="#969696">
         <space>
@@ -304,12 +315,20 @@
       </ThemeLogicEditor>
     </logic_editor>
     <nla_editor>
-      <ThemeNLAEditor bars="#707070"
-                      bars_selected="#60c040"
+      <ThemeNLAEditor active_action="#00000000"
                       frame_current="#2f6421"
                       grid="#5e5e5e"
+                      meta_strips="#000000"
+                      meta_strips_selected="#000000"
+                      active_action_unset="#00000000"
+                      sound_strips="#000000"
+                      sound_strips_selected="#000000"
                       strips="#aa8d8d"
                       strips_selected="#ff8c00"
+                      transition_strips="#000000"
+                      transition_strips_selected="#000000"
+                      tweak="#000000"
+                      tweak_duplicate="#000000"
                       view_sliders="#969696">
         <space>
           <ThemeSpaceGeneric header="#000000"
@@ -335,10 +354,13 @@
       </ThemeNLAEditor>
     </nla_editor>
     <node_editor>
-      <ThemeNodeEditor converter_node="#113941"
+      <ThemeNodeEditor node_active="#ffffff"
+                       converter_node="#113941"
+                       frame_node="#9a9b9ba0"
                        group_node="#091a07"
                        in_out_node="#273053"
                        node_backdrop="#202030bc"
+                       node_selected="#ffffff"
                        noodle_curving="5"
                        operator_node="#0e3157"
                        selected_text="#7f7070"
@@ -415,7 +437,6 @@
                            keyframe="#ff8500"
                            meta_strip="#6d9183"
                            movie_strip="#516987"
-                           plugin_strip="#7e7e50"
                            preview_back="#000000"
                            scene_strip="#4e983e"
                            transition_strip="#a25f6f"
diff --git a/release/scripts/presets/interface_theme/blender_24x.xml b/release/scripts/presets/interface_theme/blender_24x.xml
index d36e54262ba..79d1ed4ecf4 100644
--- a/release/scripts/presets/interface_theme/blender_24x.xml
+++ b/release/scripts/presets/interface_theme/blender_24x.xml
@@ -42,6 +42,7 @@
                    object_selected="#ff88ff"
                    outline_width="1"
                    panel="#a5a5a5ff"
+                   skin_root="#000000"
                    speaker="#000000"
                    transform="#ffffff"
                    handle_vect="#409030"
@@ -80,7 +81,9 @@
                        marker_outline="#000000"
                        path_after="#0000ff"
                        path_before="#ff0000"
-                       selected_marker="#ffff00">
+                       selected_marker="#ffff00"
+                       strips="#0c0a0a"
+                       strips_selected="#ff8c00">
         <space>
           <ThemeSpaceGeneric header="#b4b4b4"
                              header_text="#000000"
@@ -95,6 +98,13 @@
                              back="#757575">
           </ThemeSpaceGeneric>
         </space>
+        <space_list>
+          <ThemeSpaceListGeneric list="#666666"
+                                 list_text="#000000"
+                                 list_text_hi="#ffffff"
+                                 list_title="#000000">
+          </ThemeSpaceListGeneric>
+        </space_list>
       </ThemeClipEditor>
     </clip_editor>
     <console>
@@ -130,6 +140,7 @@
                       grid="#858585"
                       long_key="#0c0a0a"
                       long_key_selected="#ff8c00"
+                      summary="#00000000"
                       value_sliders="#000000"
                       view_sliders="#969696">
         <space>
@@ -304,12 +315,20 @@
       </ThemeLogicEditor>
     </logic_editor>
     <nla_editor>
-      <ThemeNLAEditor bars="#707070"
-                      bars_selected="#60c040"
+      <ThemeNLAEditor active_action="#00000000"
                       frame_current="#60c040"
                       grid="#5e5e5e"
+                      meta_strips="#000000"
+                      meta_strips_selected="#000000"
+                      active_action_unset="#00000000"
+                      sound_strips="#000000"
+                      sound_strips_selected="#000000"
                       strips="#0c0a0a"
                       strips_selected="#ff8c00"
+                      transition_strips="#000000"
+                      transition_strips_selected="#000000"
+                      tweak="#000000"
+                      tweak_duplicate="#000000"
                       view_sliders="#969696">
         <space>
           <ThemeSpaceGeneric header="#b4b4b4"
@@ -335,10 +354,13 @@
       </ThemeNLAEditor>
     </nla_editor>
     <node_editor>
-      <ThemeNodeEditor converter_node="#686a75"
+      <ThemeNodeEditor node_active="#ffffff"
+                       converter_node="#686a75"
+                       frame_node="#9a9b9ba0"
                        group_node="#69756e"
                        in_out_node="#646464"
                        node_backdrop="#9b9b9ba0"
+                       node_selected="#ffffff"
                        noodle_curving="5"
                        operator_node="#6c696f"
                        selected_text="#7f7070"
@@ -415,7 +437,6 @@
                            keyframe="#ff8500"
                            meta_strip="#6d9183"
                            movie_strip="#516987"
-                           plugin_strip="#7e7e50"
                            preview_back="#000000"
                            scene_strip="#4e983e"
                            transition_strip="#a25f6f"
diff --git a/release/scripts/presets/interface_theme/elsyiun.xml b/release/scripts/presets/interface_theme/elsyiun.xml
index 9e4c17a1715..bfeb3a0175e 100644
--- a/release/scripts/presets/interface_theme/elsyiun.xml
+++ b/release/scripts/presets/interface_theme/elsyiun.xml
@@ -42,6 +42,7 @@
                    object_selected="#ff8500"
                    outline_width="1"
                    panel="#a5a5a57f"
+                   skin_root="#000000"
                    speaker="#000000"
                    transform="#ffffff"
                    handle_vect="#409030"
@@ -80,7 +81,9 @@
                        marker_outline="#000000"
                        path_after="#0000ff"
                        path_before="#ff0000"
-                       selected_marker="#ffff00">
+                       selected_marker="#ffff00"
+                       strips="#0c0a0a"
+                       strips_selected="#ff8c00">
         <space>
           <ThemeSpaceGeneric header="#313131"
                              header_text="#000000"
@@ -95,6 +98,13 @@
                              back="#393939">
           </ThemeSpaceGeneric>
         </space>
+        <space_list>
+          <ThemeSpaceListGeneric list="#666666"
+                                 list_text="#000000"
+                                 list_text_hi="#ffffff"
+                                 list_title="#000000">
+          </ThemeSpaceListGeneric>
+        </space_list>
       </ThemeClipEditor>
     </clip_editor>
     <console>
@@ -130,6 +140,7 @@
                       grid="#585858"
                       long_key="#0c0a0a"
                       long_key_selected="#ff8c00"
+                      summary="#00000000"
                       value_sliders="#000000"
                       view_sliders="#969696">
         <space>
@@ -304,12 +315,20 @@
       </ThemeLogicEditor>
     </logic_editor>
     <nla_editor>
-      <ThemeNLAEditor bars="#707070"
-                      bars_selected="#60c040"
+      <ThemeNLAEditor active_action="#00000000"
                       frame_current="#60c040"
                       grid="#585858"
+                      meta_strips="#000000"
+                      meta_strips_selected="#000000"
+                      active_action_unset="#00000000"
+                      sound_strips="#000000"
+                      sound_strips_selected="#000000"
                       strips="#0c0a0a"
                       strips_selected="#ff8c00"
+                      transition_strips="#000000"
+                      transition_strips_selected="#000000"
+                      tweak="#000000"
+                      tweak_duplicate="#000000"
                       view_sliders="#969696">
         <space>
           <ThemeSpaceGeneric header="#3b3b3b"
@@ -335,10 +354,13 @@
       </ThemeNLAEditor>
     </nla_editor>
     <node_editor>
-      <ThemeNodeEditor converter_node="#575675"
+      <ThemeNodeEditor node_active="#ffffff"
+                       converter_node="#575675"
+                       frame_node="#9a9b9ba0"
                        group_node="#1e7524"
                        in_out_node="#e08706"
                        node_backdrop="#9b9b9ba0"
+                       node_selected="#ffffff"
                        noodle_curving="5"
                        operator_node="#2c6f6f"
                        selected_text="#7f7070"
@@ -415,7 +437,6 @@
                            keyframe="#ff8500"
                            meta_strip="#6d9183"
                            movie_strip="#516987"
-                           plugin_strip="#7e7e50"
                            preview_back="#000000"
                            scene_strip="#4e983e"
                            transition_strip="#a25f6f"
diff --git a/release/scripts/presets/interface_theme/hexagon.xml b/release/scripts/presets/interface_theme/hexagon.xml
index 4f6dbb376e2..7727d860a90 100644
--- a/release/scripts/presets/interface_theme/hexagon.xml
+++ b/release/scripts/presets/interface_theme/hexagon.xml
@@ -42,6 +42,7 @@
                    object_selected="#52c6ff"
                    outline_width="1"
                    panel="#a5a5a5ff"
+                   skin_root="#000000"
                    speaker="#000000"
                    transform="#ffffff"
                    handle_vect="#409030"
@@ -80,7 +81,9 @@
                        marker_outline="#000000"
                        path_after="#0000ff"
                        path_before="#ff0000"
-                       selected_marker="#ffff00">
+                       selected_marker="#ffff00"
+                       strips="#0c0a0a"
+                       strips_selected="#ff8c00">
         <space>
           <ThemeSpaceGeneric header="#5c606c"
                              header_text="#000000"
@@ -95,6 +98,13 @@
                              back="#7c7e88">
           </ThemeSpaceGeneric>
         </space>
+        <space_list>
+          <ThemeSpaceListGeneric list="#666666"
+                                 list_text="#000000"
+                                 list_text_hi="#ffffff"
+                                 list_title="#000000">
+          </ThemeSpaceListGeneric>
+        </space_list>
       </ThemeClipEditor>
     </clip_editor>
     <console>
@@ -130,6 +140,7 @@
                       grid="#58587c"
                       long_key="#0c0a0a"
                       long_key_selected="#ff8c00"
+                      summary="#00000000"
                       value_sliders="#000000"
                       view_sliders="#969696">
         <space>
@@ -304,12 +315,20 @@
       </ThemeLogicEditor>
     </logic_editor>
     <nla_editor>
-      <ThemeNLAEditor bars="#707070"
-                      bars_selected="#60c040"
+      <ThemeNLAEditor active_action="#00000000"
                       frame_current="#60c040"
                       grid="#5e5e5e"
+                      meta_strips="#000000"
+                      meta_strips_selected="#000000"
+                      active_action_unset="#00000000"
+                      sound_strips="#000000"
+                      sound_strips_selected="#000000"
                       strips="#0c0a0a"
                       strips_selected="#ff8c00"
+                      transition_strips="#000000"
+                      transition_strips_selected="#000000"
+                      tweak="#000000"
+                      tweak_duplicate="#000000"
                       view_sliders="#969696">
         <space>
           <ThemeSpaceGeneric header="#5c606c"
@@ -335,10 +354,13 @@
       </ThemeNLAEditor>
     </nla_editor>
     <node_editor>
-      <ThemeNodeEditor converter_node="#686a84"
+      <ThemeNodeEditor node_active="#ffffff"
+                       converter_node="#686a84"
+                       frame_node="#9a9b9ba0"
                        group_node="#69756e"
                        in_out_node="#64647b"
                        node_backdrop="#9b9baca0"
+                       node_selected="#ffffff"
                        noodle_curving="5"
                        operator_node="#6c697e"
                        selected_text="#7f7070"
@@ -415,7 +437,6 @@
                            keyframe="#ff8500"
                            meta_strip="#6d9183"
                            movie_strip="#516987"
-                           plugin_strip="#7e7e50"
                            preview_back="#000000"
                            scene_strip="#4e983e"
                            transition_strip="#a25f6f"
diff --git a/release/scripts/presets/interface_theme/ubuntu_ambiance.xml b/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
index 3897c41f808..72852e27604 100644
--- a/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
+++ b/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
@@ -42,6 +42,7 @@
                    object_selected="#f15800"
                    outline_width="1"
                    panel="#a5a5a57f"
+                   skin_root="#000000"
                    speaker="#000000"
                    transform="#ffffff"
                    handle_vect="#409030"
@@ -80,7 +81,9 @@
                        marker_outline="#000000"
                        path_after="#19b6ee"
                        path_before="#ff5100"
-                       selected_marker="#d5ff00">
+                       selected_marker="#d5ff00"
+                       strips="#0c0a0a"
+                       strips_selected="#ff8c00">
         <space>
           <ThemeSpaceGeneric header="#3c3b37"
                              header_text="#000000"
@@ -95,6 +98,13 @@
                              back="#131311">
           </ThemeSpaceGeneric>
         </space>
+        <space_list>
+          <ThemeSpaceListGeneric list="#666666"
+                                 list_text="#000000"
+                                 list_text_hi="#ffffff"
+                                 list_title="#000000">
+          </ThemeSpaceListGeneric>
+        </space_list>
       </ThemeClipEditor>
     </clip_editor>
     <console>
@@ -130,6 +140,7 @@
                       grid="#525252"
                       long_key="#0c0a0a"
                       long_key_selected="#f47421"
+                      summary="#00000000"
                       value_sliders="#000000"
                       view_sliders="#969696">
         <space>
@@ -304,12 +315,20 @@
       </ThemeLogicEditor>
     </logic_editor>
     <nla_editor>
-      <ThemeNLAEditor bars="#3c3b37"
-                      bars_selected="#60c040"
+      <ThemeNLAEditor active_action="#00000000"
                       frame_current="#f58032"
                       grid="#5c5c52"
+                      meta_strips="#000000"
+                      meta_strips_selected="#000000"
+                      active_action_unset="#00000000"
+                      sound_strips="#000000"
+                      sound_strips_selected="#000000"
                       strips="#0c0a0a"
                       strips_selected="#6b395a"
+                      transition_strips="#000000"
+                      transition_strips_selected="#000000"
+                      tweak="#000000"
+                      tweak_duplicate="#000000"
                       view_sliders="#969696">
         <space>
           <ThemeSpaceGeneric header="#464541"
@@ -335,10 +354,13 @@
       </ThemeNLAEditor>
     </nla_editor>
     <node_editor>
-      <ThemeNodeEditor converter_node="#93be00"
+      <ThemeNodeEditor node_active="#ffffff"
+                       converter_node="#93be00"
+                       frame_node="#9a9b9ba0"
                        group_node="#19b6ee"
                        in_out_node="#f40051"
                        node_backdrop="#52524ed1"
+                       node_selected="#ffffff"
                        noodle_curving="5"
                        operator_node="#000000"
                        selected_text="#7f7070"
@@ -415,7 +437,6 @@
                            keyframe="#f47421"
                            meta_strip="#6d9183"
                            movie_strip="#516987"
-                           plugin_strip="#7e7e50"
                            preview_back="#000000"
                            scene_strip="#4e983e"
                            transition_strip="#a25f6f"
diff --git a/release/scripts/presets/operator/wm.collada_export/second_life.py b/release/scripts/presets/operator/wm.collada_export/second_life.py
index 5e04903470b..bacf49a61ae 100755..100644
--- a/release/scripts/presets/operator/wm.collada_export/second_life.py
+++ b/release/scripts/presets/operator/wm.collada_export/second_life.py
@@ -1,7 +1,10 @@
 import bpy
 op = bpy.context.active_operator
-
-op.selected = True
 op.apply_modifiers = True
-op.include_bone_children = False
+op.selected = True
+op.include_children = False
+op.include_armatures = True
+op.deform_bones_only = True
+op.use_object_instantiation = False
+op.sort_by_name = True
 op.second_life = True
diff --git a/release/scripts/startup/bl_operators/anim.py b/release/scripts/startup/bl_operators/anim.py
index 2689cfda8eb..5a428467f12 100644
--- a/release/scripts/startup/bl_operators/anim.py
+++ b/release/scripts/startup/bl_operators/anim.py
@@ -223,6 +223,11 @@ class BakeAction(Operator):
         return {'FINISHED'}
 
     def invoke(self, context, event):
+        scene = context.scene
+        self.frame_start = scene.frame_start
+        self.frame_end = scene.frame_end
+        self.bake_types = {'POSE'} if context.mode == 'POSE' else {'OBJECT'}
+        
         wm = context.window_manager
         return wm.invoke_props_dialog(self)
 
diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py
index 151e1e93d8c..fbf0e47f0c8 100644
--- a/release/scripts/startup/bl_operators/object.py
+++ b/release/scripts/startup/bl_operators/object.py
@@ -34,7 +34,7 @@ class SelectPattern(Operator):
 
     pattern = StringProperty(
             name="Pattern",
-            description="Name filter using '*' and '?' wildcard chars",
+            description="Name filter using '*', '?' and '[abc]' unix style wildcards",
             maxlen=64,
             default="*",
             )
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index 2b820add10e..4d95c2d5d03 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -799,6 +799,88 @@ class WM_OT_path_open(Operator):
         return {'FINISHED'}
 
 
+
+def _wm_doc_get_id(doc_id, do_url=True, url_prefix=""):
+    id_split = doc_id.split(".")
+    url = rna = None
+
+    if len(id_split) == 1:  # rna, class
+        if do_url:
+            url = "%s/bpy.types.%s.html" % (url_prefix, id_split[0])
+        else:
+            rna = "bpy.types.%s" % id_split[0]
+
+    elif len(id_split) == 2:  # rna, class.prop
+        class_name, class_prop = id_split
+
+        if hasattr(bpy.types, class_name.upper() + "_OT_" + class_prop):
+            if do_url:
+                url = ("%s/bpy.ops.%s.html#bpy.ops.%s.%s" % (url_prefix, class_name, class_name, class_prop))
+            else:
+                rna = "bpy.ops.%s.%s" % (class_name, class_prop)
+        else:
+
+            # detect if this is a inherited member and use that name instead
+            rna_parent = getattr(bpy.types, class_name).bl_rna
+            rna_prop = rna_parent.properties[class_prop]
+            rna_parent = rna_parent.base
+            while rna_parent and rna_prop == rna_parent.properties.get(class_prop):
+                class_name = rna_parent.identifier
+                rna_parent = rna_parent.base
+
+            if do_url:
+                url = ("%s/bpy.types.%s.html#bpy.types.%s.%s" % (url_prefix, class_name, class_name, class_prop))
+            else:
+                rna = ("bpy.types.%s.%s" % (class_name, class_prop))
+    
+    return url if do_url else rna
+
+
+class WM_OT_doc_view_manual(Operator):
+    '''Load online manual'''
+    bl_idname = "wm.doc_view_manual"
+    bl_label = "View Manual"
+
+    doc_id = doc_id
+
+    @staticmethod
+    def _find_reference(rna_id, url_mapping):
+        print("online manual check for: '%s'... " % rna_id)
+        from fnmatch import fnmatch
+        for pattern, url_suffix in url_mapping:
+            if fnmatch(rna_id, pattern):
+                print("            match found: '%s' --> '%s'" % (pattern, url_suffix))
+                return url_suffix
+        print("match not found")
+        return None
+
+    def execute(self, context):
+        rna_id = _wm_doc_get_id(self.doc_id, do_url=False)
+        if rna_id is None:
+            return {'PASS_THROUGH'}
+
+        import rna_wiki_reference
+        rna_ref = self._find_reference(rna_id, rna_wiki_reference.url_manual_mapping)
+
+        if rna_ref is None:
+            self.report({'WARNING'}, "No reference available '%s', "
+                                     "Update info in %r" %
+                                     (self.doc_id, rna_wiki_reference.__file__))
+
+        import sys
+        del sys.modules["rna_wiki_reference"]
+
+        if rna_ref is None:
+            return {'CANCELLED'}
+        else:
+            url = rna_wiki_reference.url_manual_prefix + rna_ref
+
+        import webbrowser
+        webbrowser.open(url)
+
+        return {'FINISHED'}
+
+
 class WM_OT_doc_view(Operator):
     '''Load online reference docs'''
     bl_idname = "wm.doc_view"
@@ -812,39 +894,9 @@ class WM_OT_doc_view(Operator):
         _prefix = ("http://www.blender.org/documentation/blender_python_api_%s" %
                    "_".join(str(v) for v in bpy.app.version))
 
-    def _nested_class_string(self, class_string):
-        ls = []
-        class_obj = getattr(bpy.types, class_string, None).bl_rna
-        while class_obj:
-            ls.insert(0, class_obj)
-            class_obj = class_obj.nested
-        return '.'.join(class_obj.identifier for class_obj in ls)
-
     def execute(self, context):
-        id_split = self.doc_id.split('.')
-        if len(id_split) == 1:  # rna, class
-            url = '%s/bpy.types.%s.html' % (self._prefix, id_split[0])
-        elif len(id_split) == 2:  # rna, class.prop
-            class_name, class_prop = id_split
-
-            if hasattr(bpy.types, class_name.upper() + '_OT_' + class_prop):
-                url = ("%s/bpy.ops.%s.html#bpy.ops.%s.%s" %
-                       (self._prefix, class_name, class_name, class_prop))
-            else:
-
-                # detect if this is a inherited member and use that name instead
-                rna_parent = getattr(bpy.types, class_name).bl_rna
-                rna_prop = rna_parent.properties[class_prop]
-                rna_parent = rna_parent.base
-                while rna_parent and rna_prop == rna_parent.properties.get(class_prop):
-                    class_name = rna_parent.identifier
-                    rna_parent = rna_parent.base
-
-                #~ class_name_full = self._nested_class_string(class_name)
-                url = ("%s/bpy.types.%s.html#bpy.types.%s.%s" %
-                       (self._prefix, class_name, class_name, class_prop))
-
-        else:
+        url = _wm_doc_get_id(self.doc_id, do_url=True, url_prefix=self._prefix)
+        if url is None:
             return {'PASS_THROUGH'}
 
         import webbrowser
@@ -1803,7 +1855,7 @@ class WM_OT_addon_remove(Operator):
 
         path, isdir = WM_OT_addon_remove.path_from_addon(self.module)
         if path is None:
-            self.report('WARNING', "Addon path %r could not be found" % path)
+            self.report({'WARNING'}, "Addon path %r could not be found" % path)
             return {'CANCELLED'}
 
         # in case its enabled
diff --git a/release/scripts/startup/bl_ui/properties_data_bone.py b/release/scripts/startup/bl_ui/properties_data_bone.py
index 11524cf9c03..0f09893647a 100644
--- a/release/scripts/startup/bl_ui/properties_data_bone.py
+++ b/release/scripts/startup/bl_ui/properties_data_bone.py
@@ -119,21 +119,28 @@ class BONE_PT_transform_locks(BoneButtonsPanel, Panel):
         bone = context.bone
         pchan = ob.pose.bones[bone.name]
 
-        row = layout.row()
-        col = row.column()
-        col.prop(pchan, "lock_location")
-        col.active = not (bone.parent and bone.use_connect)
+        split = layout.split(percentage=0.1)
+        
+        col = split.column(align=True)
+        col.label(text="")
+        col.label(text="X:")
+        col.label(text="Y:")
+        col.label(text="Z:")
+        
+        col = split.row()
+        sub = col.row()
+        sub.active = not (bone.parent and bone.use_connect)
+        sub.column().prop(pchan, "lock_location", text="Location")
+        col.column().prop(pchan, "lock_rotation", text="Rotation")
+        col.column().prop(pchan, "lock_scale", text="Scale")
 
-        col = row.column()
         if pchan.rotation_mode in {'QUATERNION', 'AXIS_ANGLE'}:
-            col.prop(pchan, "lock_rotations_4d", text="Lock Rotation")
-            if pchan.lock_rotations_4d:
-                col.prop(pchan, "lock_rotation_w", text="W")
-            col.prop(pchan, "lock_rotation", text="")
-        else:
-            col.prop(pchan, "lock_rotation", text="Rotation")
-
-        row.column().prop(pchan, "lock_scale")
+            row = layout.row()
+            row.prop(pchan, "lock_rotations_4d", text="Lock Rotation")
+            
+            sub = row.row()
+            sub.active = pchan.lock_rotations_4d
+            sub.prop(pchan, "lock_rotation_w", text="W")
 
 
 class BONE_PT_relations(BoneButtonsPanel, Panel):
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 72429743c93..2e980f776a1 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -682,6 +682,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         row = row.row()
         row.active = md.use_rim
         row.prop(md, "material_offset_rim", text="Rim")
+        sub.prop(md, "use_flip_normals")
 
     def SUBSURF(self, layout, ob, md):
         layout.row().prop(md, "subdivision_type", expand=True)
diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py
index 2aff07bd98e..549e2181a2b 100644
--- a/release/scripts/startup/bl_ui/properties_game.py
+++ b/release/scripts/startup/bl_ui/properties_game.py
@@ -49,7 +49,12 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel, Panel):
 
         physics_type = game.physics_type
 
-        if physics_type in {'DYNAMIC', 'RIGID_BODY'}:
+        if physics_type == 'CHARACTER':
+            layout.prop(game, "step_height", slider=True)
+            layout.prop(game, "jump_speed")
+            layout.prop(game, "fall_speed")
+
+        elif physics_type in {'DYNAMIC', 'RIGID_BODY'}:
             split = layout.split()
 
             col = split.column()
@@ -192,7 +197,7 @@ class PHYSICS_PT_game_collision_bounds(PhysicsButtonsPanel, Panel):
     def poll(cls, context):
         game = context.object.game
         rd = context.scene.render
-        return (game.physics_type in {'DYNAMIC', 'RIGID_BODY', 'SENSOR', 'SOFT_BODY', 'STATIC'}) and (rd.engine in cls.COMPAT_ENGINES)
+        return (game.physics_type in {'DYNAMIC', 'RIGID_BODY', 'SENSOR', 'SOFT_BODY', 'STATIC', 'CHARACTER'}) and (rd.engine in cls.COMPAT_ENGINES)
 
     def draw_header(self, context):
         game = context.active_object.game
@@ -617,6 +622,14 @@ class WORLD_PT_game_physics(WorldButtonsPanel, Panel):
             col.prop(gs, "logic_step_max", text="Max")
 
             col = layout.column()
+            col.label(text="Physics Deactivation:")
+            sub = col.row(align=True)
+            sub.prop(gs, "deactivation_linear_threshold", text="Linear Threshold")
+            sub.prop(gs, "deactivation_angular_threshold", text="Angular Threshold")
+            sub = col.row()
+            sub.prop(gs, "deactivation_time", text="Time")
+
+            col = layout.column()
             col.prop(gs, "use_occlusion_culling", text="Occlusion Culling")
             sub = col.column()
             sub.active = gs.use_occlusion_culling
diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py
index 4f3ca26725c..87c62e2791f 100644
--- a/release/scripts/startup/bl_ui/properties_object.py
+++ b/release/scripts/startup/bl_ui/properties_object.py
@@ -104,21 +104,26 @@ class OBJECT_PT_transform_locks(ObjectButtonsPanel, Panel):
 
         ob = context.object
 
-        row = layout.row()
-
-        col = row.column()
-        col.prop(ob, "lock_location", text="Location")
+        split = layout.split(percentage=0.1)
+        
+        col = split.column(align=True)
+        col.label(text="")
+        col.label(text="X:")
+        col.label(text="Y:")
+        col.label(text="Z:")
+        
+        col = split.row()
+        col.column().prop(ob, "lock_location", text="Location")
+        col.column().prop(ob, "lock_rotation", text="Rotation")
+        col.column().prop(ob, "lock_scale", text="Scale")
 
-        col = row.column()
         if ob.rotation_mode in {'QUATERNION', 'AXIS_ANGLE'}:
-            col.prop(ob, "lock_rotations_4d", text="Rotation")
-            if ob.lock_rotations_4d:
-                col.prop(ob, "lock_rotation_w", text="W")
-            col.prop(ob, "lock_rotation", text="")
-        else:
-            col.prop(ob, "lock_rotation", text="Rotation")
-
-        row.column().prop(ob, "lock_scale", text="Scale")
+            row = layout.row()
+            row.prop(ob, "lock_rotations_4d", text="Lock Rotation")
+            
+            sub = row.row()
+            sub.active = ob.lock_rotations_4d
+            sub.prop(ob, "lock_rotation_w", text="W")
 
 
 class OBJECT_PT_relations(ObjectButtonsPanel, Panel):
diff --git a/release/scripts/startup/bl_ui/properties_object_constraint.py b/release/scripts/startup/bl_ui/properties_object_constraint.py
index bfa2b4f60ef..e4da581ab83 100644
--- a/release/scripts/startup/bl_ui/properties_object_constraint.py
+++ b/release/scripts/startup/bl_ui/properties_object_constraint.py
@@ -444,6 +444,7 @@ class ConstraintButtonsPanel():
         col = split.column()
         col.label(text="To Action:")
         col.prop(con, "action", text="")
+        col.prop(con, "use_bone_object_action")
 
         split = layout.split()
 
diff --git a/release/scripts/startup/bl_ui/properties_physics_cloth.py b/release/scripts/startup/bl_ui/properties_physics_cloth.py
index e313112d61a..33b977b5f04 100644
--- a/release/scripts/startup/bl_ui/properties_physics_cloth.py
+++ b/release/scripts/startup/bl_ui/properties_physics_cloth.py
@@ -117,10 +117,6 @@ class PHYSICS_PT_cloth_cache(PhysicButtonsPanel, Panel):
     bl_label = "Cloth Cache"
     bl_options = {'DEFAULT_CLOSED'}
 
-    @classmethod
-    def poll(cls, context):
-        return context.cloth
-
     def draw(self, context):
         md = context.cloth
         point_cache_ui(self, context, md.point_cache, cloth_panel_enabled(md), 'CLOTH')
@@ -130,10 +126,6 @@ class PHYSICS_PT_cloth_collision(PhysicButtonsPanel, Panel):
     bl_label = "Cloth Collision"
     bl_options = {'DEFAULT_CLOSED'}
 
-    @classmethod
-    def poll(cls, context):
-        return context.cloth
-
     def draw_header(self, context):
         cloth = context.cloth.collision_settings
 
@@ -145,6 +137,7 @@ class PHYSICS_PT_cloth_collision(PhysicButtonsPanel, Panel):
 
         cloth = context.cloth.collision_settings
         md = context.cloth
+        ob = context.object
 
         layout.active = cloth.use_collision and cloth_panel_enabled(md)
 
@@ -163,6 +156,7 @@ class PHYSICS_PT_cloth_collision(PhysicButtonsPanel, Panel):
         sub.active = cloth.use_self_collision
         sub.prop(cloth, "self_collision_quality", slider=True, text="Quality")
         sub.prop(cloth, "self_distance_min", slider=True, text="Distance")
+        sub.prop_search(cloth, "vertex_group_self_collisions", ob, "vertex_groups", text="")
 
         layout.prop(cloth, "group")
 
@@ -171,10 +165,6 @@ class PHYSICS_PT_cloth_stiffness(PhysicButtonsPanel, Panel):
     bl_label = "Cloth Stiffness Scaling"
     bl_options = {'DEFAULT_CLOSED'}
 
-    @classmethod
-    def poll(cls, context):
-        return context.cloth
-
     def draw_header(self, context):
         cloth = context.cloth.settings
 
@@ -207,10 +197,6 @@ class PHYSICS_PT_cloth_field_weights(PhysicButtonsPanel, Panel):
     bl_label = "Cloth Field Weights"
     bl_options = {'DEFAULT_CLOSED'}
 
-    @classmethod
-    def poll(cls, context):
-        return (context.cloth)
-
     def draw(self, context):
         cloth = context.cloth.settings
         effector_weights_ui(self, context, cloth.effector_weights)
diff --git a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
index 04696c793a6..db0794d8a8a 100644
--- a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
+++ b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
@@ -120,7 +120,8 @@ class PHYSICS_PT_dp_advanced_canvas(PhysicButtonsPanel, Panel):
     @classmethod
     def poll(cls, context):
         md = context.dynamic_paint
-        return md and md.ui_type == 'CANVAS' and md.canvas_settings and md.canvas_settings.canvas_surfaces.active
+        rd = context.scene.render
+        return md and md.ui_type == 'CANVAS' and md.canvas_settings and md.canvas_settings.canvas_surfaces.active and (not rd.use_game_engine)
 
     def draw(self, context):
         layout = self.layout
@@ -194,10 +195,13 @@ class PHYSICS_PT_dp_canvas_output(PhysicButtonsPanel, Panel):
     @classmethod
     def poll(cls, context):
         md = context.dynamic_paint
+        rd = context.scene.render
         if not (md and md.ui_type == 'CANVAS' and md.canvas_settings):
             return 0
         surface = context.dynamic_paint.canvas_settings.canvas_surfaces.active
-        return surface and not (surface.surface_format == 'VERTEX' and (surface.surface_type in {'DISPLACE', 'WAVE'}))
+        return (surface and
+                (not (surface.surface_format == 'VERTEX' and (surface.surface_type in {'DISPLACE', 'WAVE'}))) and
+                (not rd.use_game_engine))
 
     def draw(self, context):
         layout = self.layout
@@ -284,10 +288,11 @@ class PHYSICS_PT_dp_canvas_initial_color(PhysicButtonsPanel, Panel):
     @classmethod
     def poll(cls, context):
         md = context.dynamic_paint
+        rd = context.scene.render
         if not (md and md.ui_type == 'CANVAS' and md.canvas_settings):
             return 0
         surface = context.dynamic_paint.canvas_settings.canvas_surfaces.active
-        return (surface and surface.surface_type == 'PAINT')
+        return (surface and surface.surface_type == 'PAINT') and (not rd.use_game_engine)
 
     def draw(self, context):
         layout = self.layout
@@ -318,10 +323,11 @@ class PHYSICS_PT_dp_effects(PhysicButtonsPanel, Panel):
     @classmethod
     def poll(cls, context):
         md = context.dynamic_paint
+        rd = context.scene.render
         if not (md and md.ui_type == 'CANVAS' and md.canvas_settings):
             return False
         surface = context.dynamic_paint.canvas_settings.canvas_surfaces.active
-        return (surface and surface.surface_type == 'PAINT')
+        return (surface and surface.surface_type == 'PAINT') and (not rd.use_game_engine)
 
     def draw(self, context):
         layout = self.layout
@@ -366,11 +372,13 @@ class PHYSICS_PT_dp_cache(PhysicButtonsPanel, Panel):
     @classmethod
     def poll(cls, context):
         md = context.dynamic_paint
+        rd = context.scene.render
         return (md and
                 md.ui_type == 'CANVAS' and
                 md.canvas_settings and
                 md.canvas_settings.canvas_surfaces.active and
-                md.canvas_settings.canvas_surfaces.active.is_cache_user)
+                md.canvas_settings.canvas_surfaces.active.is_cache_user and
+                (not rd.use_game_engine))
 
     def draw(self, context):
         surface = context.dynamic_paint.canvas_settings.canvas_surfaces.active
@@ -385,7 +393,8 @@ class PHYSICS_PT_dp_brush_source(PhysicButtonsPanel, Panel):
     @classmethod
     def poll(cls, context):
         md = context.dynamic_paint
-        return md and md.ui_type == 'BRUSH' and md.brush_settings
+        rd = context.scene.render
+        return md and md.ui_type == 'BRUSH' and md.brush_settings and (not rd.use_game_engine)
 
     def draw(self, context):
         layout = self.layout
@@ -437,7 +446,8 @@ class PHYSICS_PT_dp_brush_velocity(PhysicButtonsPanel, Panel):
     @classmethod
     def poll(cls, context):
         md = context.dynamic_paint
-        return md and md.ui_type == 'BRUSH' and md.brush_settings
+        rd = context.scene.render
+        return md and md.ui_type == 'BRUSH' and md.brush_settings and (not rd.use_game_engine)
 
     def draw(self, context):
         layout = self.layout
@@ -472,7 +482,8 @@ class PHYSICS_PT_dp_brush_wave(PhysicButtonsPanel, Panel):
     @classmethod
     def poll(cls, context):
         md = context.dynamic_paint
-        return md and md.ui_type == 'BRUSH' and md.brush_settings
+        rd = context.scene.render
+        return md and md.ui_type == 'BRUSH' and md.brush_settings and (not rd.use_game_engine)
 
     def draw(self, context):
         layout = self.layout
diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py
index beb525bbd07..751f3e18acc 100644
--- a/release/scripts/startup/bl_ui/properties_physics_fluid.py
+++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py
@@ -192,13 +192,14 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, Panel):
 
 
 class PHYSICS_PT_domain_gravity(PhysicButtonsPanel, Panel):
-    bl_label = "Domain World"
+    bl_label = "Fluid World"
     bl_options = {'DEFAULT_CLOSED'}
 
     @classmethod
     def poll(cls, context):
         md = context.fluid
-        return md and md.settings and (md.settings.type == 'DOMAIN')
+        rd = context.scene.render
+        return md and md.settings and (md.settings.type == 'DOMAIN') and (not rd.use_game_engine)
 
     def draw(self, context):
         layout = self.layout
@@ -244,13 +245,14 @@ class PHYSICS_PT_domain_gravity(PhysicButtonsPanel, Panel):
 
 
 class PHYSICS_PT_domain_boundary(PhysicButtonsPanel, Panel):
-    bl_label = "Domain Boundary"
+    bl_label = "Fluid Boundary"
     bl_options = {'DEFAULT_CLOSED'}
 
     @classmethod
     def poll(cls, context):
         md = context.fluid
-        return md and md.settings and (md.settings.type == 'DOMAIN')
+        rd = context.scene.render
+        return md and md.settings and (md.settings.type == 'DOMAIN') and (not rd.use_game_engine)
 
     def draw(self, context):
         layout = self.layout
@@ -273,13 +275,14 @@ class PHYSICS_PT_domain_boundary(PhysicButtonsPanel, Panel):
 
 
 class PHYSICS_PT_domain_particles(PhysicButtonsPanel, Panel):
-    bl_label = "Domain Particles"
+    bl_label = "Fluid Particles"
     bl_options = {'DEFAULT_CLOSED'}
 
     @classmethod
     def poll(cls, context):
         md = context.fluid
-        return md and md.settings and (md.settings.type == 'DOMAIN')
+        rd = context.scene.render
+        return md and md.settings and (md.settings.type == 'DOMAIN') and (not rd.use_game_engine)
 
     def draw(self, context):
         layout = self.layout
diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py
index 012aefebb6e..1b333f1e505 100644
--- a/release/scripts/startup/bl_ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@ -117,7 +117,8 @@ class PHYSICS_PT_smoke_groups(PhysicButtonsPanel, Panel):
     @classmethod
     def poll(cls, context):
         md = context.smoke
-        return md and (md.smoke_type == 'DOMAIN')
+        rd = context.scene.render
+        return md and (md.smoke_type == 'DOMAIN') and (not rd.use_game_engine)
 
     def draw(self, context):
         layout = self.layout
@@ -145,7 +146,8 @@ class PHYSICS_PT_smoke_highres(PhysicButtonsPanel, Panel):
     @classmethod
     def poll(cls, context):
         md = context.smoke
-        return md and (md.smoke_type == 'DOMAIN')
+        rd = context.scene.render
+        return md and (md.smoke_type == 'DOMAIN') and (not rd.use_game_engine)
 
     def draw_header(self, context):
         md = context.smoke.domain_settings
@@ -182,7 +184,8 @@ class PHYSICS_PT_smoke_cache(PhysicButtonsPanel, Panel):
     @classmethod
     def poll(cls, context):
         md = context.smoke
-        return md and (md.smoke_type == 'DOMAIN')
+        rd = context.scene.render
+        return md and (md.smoke_type == 'DOMAIN') and (not rd.use_game_engine)
 
     def draw(self, context):
         layout = self.layout
@@ -202,8 +205,9 @@ class PHYSICS_PT_smoke_field_weights(PhysicButtonsPanel, Panel):
 
     @classmethod
     def poll(cls, context):
-        smoke = context.smoke
-        return (smoke and smoke.smoke_type == 'DOMAIN')
+        md = context.smoke
+        rd = context.scene.render
+        return md and (md.smoke_type == 'DOMAIN') and (not rd.use_game_engine)
 
     def draw(self, context):
         domain = context.smoke.domain_settings
diff --git a/release/scripts/startup/bl_ui/properties_physics_softbody.py b/release/scripts/startup/bl_ui/properties_physics_softbody.py
index ea4180c891f..b043c1f9b68 100644
--- a/release/scripts/startup/bl_ui/properties_physics_softbody.py
+++ b/release/scripts/startup/bl_ui/properties_physics_softbody.py
@@ -72,10 +72,6 @@ class PHYSICS_PT_softbody_cache(PhysicButtonsPanel, Panel):
     bl_label = "Soft Body Cache"
     bl_options = {'DEFAULT_CLOSED'}
 
-    @classmethod
-    def poll(cls, context):
-        return context.soft_body
-
     def draw(self, context):
         md = context.soft_body
         point_cache_ui(self, context, md.point_cache, softbody_panel_enabled(md), 'SOFTBODY')
@@ -85,10 +81,6 @@ class PHYSICS_PT_softbody_goal(PhysicButtonsPanel, Panel):
     bl_label = "Soft Body Goal"
     bl_options = {'DEFAULT_CLOSED'}
 
-    @classmethod
-    def poll(cls, context):
-        return context.soft_body
-
     def draw_header(self, context):
         softbody = context.soft_body.settings
 
@@ -128,10 +120,6 @@ class PHYSICS_PT_softbody_edge(PhysicButtonsPanel, Panel):
     bl_label = "Soft Body Edges"
     bl_options = {'DEFAULT_CLOSED'}
 
-    @classmethod
-    def poll(cls, context):
-        return context.soft_body
-
     def draw_header(self, context):
         softbody = context.soft_body.settings
 
@@ -181,10 +169,6 @@ class PHYSICS_PT_softbody_collision(PhysicButtonsPanel, Panel):
     bl_label = "Soft Body Self Collision"
     bl_options = {'DEFAULT_CLOSED'}
 
-    @classmethod
-    def poll(cls, context):
-        return context.soft_body
-
     def draw_header(self, context):
         softbody = context.soft_body.settings
 
@@ -213,10 +197,6 @@ class PHYSICS_PT_softbody_solver(PhysicButtonsPanel, Panel):
     bl_label = "Soft Body Solver"
     bl_options = {'DEFAULT_CLOSED'}
 
-    @classmethod
-    def poll(cls, context):
-        return context.soft_body
-
     def draw(self, context):
         layout = self.layout
 
@@ -249,10 +229,6 @@ class PHYSICS_PT_softbody_field_weights(PhysicButtonsPanel, Panel):
     bl_label = "Soft Body Field Weights"
     bl_options = {'DEFAULT_CLOSED'}
 
-    @classmethod
-    def poll(cls, context):
-        return (context.soft_body)
-
     def draw(self, context):
         md = context.soft_body
         softbody = md.settings
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py
index 4ab23359fd8..a77302ff4ae 100644
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@ -25,7 +25,7 @@ from bpy.types import Panel, Header, Menu
 class CLIP_HT_header(Header):
     bl_space_type = 'CLIP_EDITOR'
 
-    def draw(self, context):
+    def _draw_tracking(self, context):
         layout = self.layout
 
         sc = context.space_data
@@ -41,23 +41,41 @@ class CLIP_HT_header(Header):
             if sc.view == 'CLIP':
                 if clip:
                     sub.menu("CLIP_MT_select")
+                    sub.menu("CLIP_MT_clip")
+                    sub.menu("CLIP_MT_track")
+                    sub.menu("CLIP_MT_reconstruction")
+                else:
+                    sub.menu("CLIP_MT_clip")
 
-                sub.menu("CLIP_MT_clip")
-
-                sub.menu("CLIP_MT_track")
-                sub.menu("CLIP_MT_reconstruction")
-
-        layout.prop(sc, "view", text="", expand=True)
+        row = layout.row()
+        row.template_ID(sc, "clip", open='clip.open')
 
         if clip:
+            tracking = clip.tracking
+            active_object = tracking.objects.active
+
             if sc.view == 'CLIP':
                 layout.prop(sc, "mode", text="")
-            if sc.view == 'GRAPH':
+                layout.prop(sc, "view", text="", expand=True)
+                layout.prop(sc, "pivot_point", text="", icon_only=True)
+
+                r = active_object.reconstruction
+
+                if r.is_valid and sc.view == 'CLIP':
+                    layout.label(text="Solve error: %.4f" %
+                                 (r.average_error))
+            elif sc.view == 'GRAPH':
+                layout.prop(sc, "view", text="", expand=True)
+
+                row = layout.row(align=True)
+                row.prop(sc, "show_graph_only_selected", text="")
+                row.prop(sc, "show_graph_hidden", text="")
+
                 row = layout.row(align=True)
 
                 if sc.show_filters:
                     row.prop(sc, "show_filters", icon='DISCLOSURE_TRI_DOWN',
-                        text="Filters")
+                             text="Filters")
 
                     sub = row.column()
                     sub.active = clip.tracking.reconstruction.is_valid
@@ -66,28 +84,68 @@ class CLIP_HT_header(Header):
                     row.prop(sc, "show_graph_tracks", icon='ANIM', text="")
                 else:
                     row.prop(sc, "show_filters", icon='DISCLOSURE_TRI_RIGHT',
-                        text="Filters")
+                             text="Filters")
+            elif sc.view == 'DOPESHEET':
+                dopesheet = tracking.dopesheet
+                layout.prop(sc, "view", text="", expand=True)
+
+                row = layout.row(align=True)
+                row.prop(dopesheet, "show_only_selected", text="")
+                row.prop(dopesheet, "show_hidden", text="")
+
+                row = layout.row(align=True)
+                row.prop(dopesheet, "sort_method", text="")
+                row.prop(dopesheet, "use_invert_sort", text="Invert", toggle=True)
+        else:
+            layout.prop(sc, "view", text="", expand=True)
+
+    def _draw_masking(self, context):
+        layout = self.layout
+
+        toolsettings = context.tool_settings
+        sc = context.space_data
+        clip = sc.clip
+
+        row = layout.row(align=True)
+        row.template_header()
+
+        if context.area.show_menus:
+            sub = row.row(align=True)
+            sub.menu("CLIP_MT_view")
+
+            if clip:
+                sub.menu("CLIP_MT_select")
+                sub.menu("CLIP_MT_clip")
+                sub.menu("CLIP_MT_mask")
+            else:
+                sub.menu("CLIP_MT_clip")
 
         row = layout.row()
         row.template_ID(sc, "clip", open='clip.open')
 
-        if clip:
-            tracking = clip.tracking
-            active = tracking.objects.active
+        layout.prop(sc, "mode", text="")
 
-            if active and not active.is_camera:
-                r = active.reconstruction
-            else:
-                r = tracking.reconstruction
+        row = layout.row()
+        row.template_ID(sc, "mask", new="mask.new")
 
-            if r.is_valid and sc.view == 'CLIP':
-                layout.label(text="Average solve error: %.4f" %
-                    (r.average_error))
+        layout.prop(sc, "pivot_point", text="", icon_only=True)
 
-            if sc.view == 'DOPESHEET':
-                layout.label(text="Sort by:")
-                layout.prop(sc, "dopesheet_sort_method", text="")
-                layout.prop(sc, "invert_dopesheet_sort", text="Invert")
+        row = layout.row(align=True)
+        row.prop(toolsettings, "use_proportional_edit_mask",
+                 text="", icon_only=True)
+        if toolsettings.use_proportional_edit_mask:
+            row.prop(toolsettings, "proportional_edit_falloff",
+                     text="", icon_only=True)
+
+    def draw(self, context):
+        layout = self.layout
+
+        sc = context.space_data
+
+        if sc.mode in {'TRACKING', 'RECONSTRUCTION', 'DISTORTION'}:
+            self._draw_tracking(context)
+        else:
+            self._draw_masking(context)
 
         layout.template_running_jobs()
 
@@ -102,34 +160,34 @@ class CLIP_PT_clip_view_panel:
         return clip and sc.view == 'CLIP'
 
 
-class CLIP_PT_tracking_panel:
+class CLIP_PT_mask_view_panel:
 
     @classmethod
     def poll(cls, context):
         sc = context.space_data
         clip = sc.clip
 
-        return clip and sc.mode == 'TRACKING' and sc.view == 'CLIP'
+        return clip and sc.view == 'CLIP' and sc.mode == 'MASKEDIT'
 
 
-class CLIP_PT_reconstruction_panel:
+class CLIP_PT_tracking_panel:
 
     @classmethod
     def poll(cls, context):
         sc = context.space_data
         clip = sc.clip
 
-        return clip and sc.mode == 'RECONSTRUCTION' and sc.view == 'CLIP'
+        return clip and sc.mode == 'TRACKING' and sc.view == 'CLIP'
 
 
-class CLIP_PT_distortion_panel:
+class CLIP_PT_reconstruction_panel:
 
     @classmethod
     def poll(cls, context):
         sc = context.space_data
         clip = sc.clip
 
-        return clip and sc.mode == 'DISTORTION' and sc.view == 'CLIP'
+        return clip and sc.mode == 'RECONSTRUCTION' and sc.view == 'CLIP'
 
 
 class CLIP_PT_tools_marker(CLIP_PT_tracking_panel, Panel):
@@ -181,10 +239,10 @@ class CLIP_PT_tools_marker(CLIP_PT_tracking_panel, Panel):
             sub.prop(settings, "default_search_size")
 
             col.label(text="Tracker:")
-            col.prop(settings, "default_tracker", text="")
-
-            if settings.default_tracker == 'KLT':
-                col.prop(settings, "default_pyramid_levels")
+            col.prop(settings, "default_motion_model")
+            col.prop(settings, "default_use_brute")
+            col.prop(settings, "default_use_normalization")
+            col.prop(settings, "default_use_mask")
             col.prop(settings, "default_correlation_min")
 
             col.separator()
@@ -213,6 +271,7 @@ class CLIP_PT_tools_tracking(CLIP_PT_tracking_panel, Panel):
 
         props = row.operator("clip.track_markers", text="", icon='FRAME_PREV')
         props.backwards = True
+        props.sequence = False
         props = row.operator("clip.track_markers", text="",
                              icon='PLAY_REVERSE')
         props.backwards = True
@@ -220,7 +279,9 @@ class CLIP_PT_tools_tracking(CLIP_PT_tracking_panel, Panel):
         props = row.operator("clip.track_markers", text="", icon='PLAY')
         props.backwards = False
         props.sequence = True
-        row.operator("clip.track_markers", text="", icon='FRAME_NEXT')
+        props = row.operator("clip.track_markers", text="", icon='FRAME_NEXT')
+        props.backwards = False
+        props.sequence = False
 
         col = layout.column(align=True)
         props = col.operator("clip.clear_track_path", text="Clear After")
@@ -261,7 +322,8 @@ class CLIP_PT_tools_solve(CLIP_PT_tracking_panel, Panel):
         col.prop(settings, "keyframe_b")
 
         col = layout.column(align=True)
-        col.active = tracking_object.is_camera and not settings.use_tripod_solver
+        col.active = (tracking_object.is_camera and
+                      not settings.use_tripod_solver)
         col.label(text="Refine:")
         col.prop(settings, "refine_intrinsics", text="")
 
@@ -359,11 +421,54 @@ class CLIP_PT_tools_object(CLIP_PT_reconstruction_panel, Panel):
         col.prop(settings, "object_distance")
 
 
-class CLIP_PT_tools_grease_pencil(CLIP_PT_distortion_panel, Panel):
+class CLIP_PT_tools_mask(CLIP_PT_mask_view_panel, Panel):
+    bl_space_type = 'CLIP_EDITOR'
+    bl_region_type = 'TOOLS'
+    bl_label = "Mask Tools"
+
+    def draw(self, context):
+        layout = self.layout
+
+        col = layout.column(align=True)
+        col.label(text="Transform:")
+        col.operator("transform.translate")
+        col.operator("transform.rotate")
+        col.operator("transform.resize", text="Scale")
+        props = col.operator("transform.transform", text="Shrink/Fatten")
+        props.mode = 'MASK_SHRINKFATTEN'
+
+        col = layout.column(align=True)
+        col.label(text="Spline:")
+        col.operator("mask.delete")
+        col.operator("mask.cyclic_toggle")
+        col.operator("mask.switch_direction")
+
+        col = layout.column(align=True)
+        col.label(text="Parenting:")
+        col.operator("mask.parent_set")
+        col.operator("mask.parent_clear")
+
+
+class CLIP_PT_tools_grease_pencil(Panel):
     bl_space_type = 'CLIP_EDITOR'
     bl_region_type = 'TOOLS'
     bl_label = "Grease Pencil"
 
+    @classmethod
+    def poll(cls, context):
+        sc = context.space_data
+        clip = sc.clip
+
+        if not clip:
+            return False
+
+        if sc.mode == 'DISTORTION':
+            return sc.view == 'CLIP'
+        elif sc.mode == 'MASKEDIT':
+            return True
+
+        return False
+
     def draw(self, context):
         layout = self.layout
 
@@ -446,6 +551,10 @@ class CLIP_PT_track(CLIP_PT_tracking_panel, Panel):
         sub = row.row()
         sub.prop(act_track, "use_grayscale_preview", text="B/W", toggle=True)
 
+        row.separator()
+        sub = row.row()
+        sub.prop(act_track, "use_alpha_preview", text="", toggle=True, icon='IMAGE_ALPHA')
+
         layout.separator()
 
         row = layout.row(align=True)
@@ -482,10 +591,10 @@ class CLIP_PT_track_settings(CLIP_PT_tracking_panel, Panel):
 
         active = clip.tracking.tracks.active
         if active:
-            col.prop(active, "tracker")
-
-            if active.tracker == 'KLT':
-                col.prop(active, "pyramid_levels")
+            col.prop(active, "motion_model")
+            col.prop(active, "use_brute")
+            col.prop(active, "use_normalization")
+            col.prop(active, "use_mask")
             col.prop(active, "correlation_min")
 
             col.separator()
@@ -550,6 +659,121 @@ class CLIP_PT_tracking_camera(Panel):
         col.prop(clip.tracking.camera, "k3")
 
 
+class CLIP_PT_mask_layers(Panel):
+    bl_space_type = 'CLIP_EDITOR'
+    bl_region_type = 'UI'
+    bl_label = "Mask Layers"
+
+    @classmethod
+    def poll(cls, context):
+        sc = context.space_data
+
+        return sc.mask and sc.mode == 'MASKEDIT'
+
+    def draw(self, context):
+        layout = self.layout
+
+        sc = context.space_data
+        mask = sc.mask
+
+        row = layout.row()
+        row.template_list(mask, "layers",
+                          mask, "active_layer_index", rows=3)
+
+        sub = row.column(align=True)
+
+        sub.operator("mask.layer_new", icon='ZOOMIN', text="")
+        sub.operator("mask.layer_remove", icon='ZOOMOUT', text="")
+
+        active = mask.layers.active
+        if active:
+            layout.prop(active, "name")
+
+            # blending
+            row = layout.row(align=True)
+            row.prop(active, "alpha")
+            row.prop(active, "invert", text="", icon='IMAGE_ALPHA')
+
+            layout.prop(active, "blend")
+
+
+class CLIP_PT_active_mask_spline(Panel):
+    bl_space_type = 'CLIP_EDITOR'
+    bl_region_type = 'UI'
+    bl_label = "Active Spline"
+
+    @classmethod
+    def poll(cls, context):
+        sc = context.space_data
+        mask = sc.mask
+
+        if mask and sc.mode == 'MASKEDIT':
+            return mask.layers.active and mask.layers.active.splines.active
+
+        return False
+
+    def draw(self, context):
+        layout = self.layout
+
+        sc = context.space_data
+        mask = sc.mask
+        spline = mask.layers.active.splines.active
+
+        col = layout.column()
+        col.prop(spline, "weight_interpolation")
+        col.prop(spline, "use_cyclic")
+
+
+class CLIP_PT_active_mask_point(Panel):
+    bl_space_type = 'CLIP_EDITOR'
+    bl_region_type = 'UI'
+    bl_label = "Active Point"
+
+    @classmethod
+    def poll(cls, context):
+        sc = context.space_data
+        mask = sc.mask
+
+        if mask and sc.mode == 'MASKEDIT':
+            return mask.layers.active and mask.layers.active.splines.active_point
+
+        return False
+
+    def draw(self, context):
+        layout = self.layout
+
+        sc = context.space_data
+        mask = sc.mask
+        point = mask.layers.active.splines.active_point
+        parent = point.parent
+
+        col = layout.column()
+        col.prop(point, "handle_type")
+
+        col = layout.column()
+        # Currently only parenting yo movie clip is allowed, so do not
+        # ver-oplicate things for now and use single template_ID
+        #col.template_any_ID(parent, "id", "id_type", text="")
+
+        col.label("Parent:")
+        col.prop(parent, "id", text="")
+
+        if parent.id_type == 'MOVIECLIP' and parent.id:
+            clip = parent.id
+            tracking = clip.tracking
+
+            col.prop_search(parent, "parent", tracking,
+                            "objects", icon='OBJECT_DATA', text="Object:")
+
+            if parent.parent in tracking.objects:
+                object = tracking.objects[parent.parent]
+                col.prop_search(parent, "sub_parent", object,
+                                "tracks", icon='ANIM_DATA', text="Track:")
+            else:
+                col.prop_search(parent, "sub_parent", tracking,
+                                "tracks", icon='ANIM_DATA', text="Track:")
+
+
 class CLIP_PT_display(CLIP_PT_clip_view_panel, Panel):
     bl_space_type = 'CLIP_EDITOR'
     bl_region_type = 'UI'
@@ -594,12 +818,41 @@ class CLIP_PT_display(CLIP_PT_clip_view_panel, Panel):
             row = col.row()
             row.prop(clip, "display_aspect", text="")
 
+        if sc.mode == 'MASKEDIT':
+            col = layout.column()
+            col.prop(sc, "mask_draw_type", text="")
+            col.prop(sc, "show_mask_smooth")
+
+
+# TODO, move into its own file
+class CLIP_PT_mask(CLIP_PT_mask_view_panel, Panel):
+    bl_space_type = 'CLIP_EDITOR'
+    bl_region_type = 'UI'
+    bl_label = "Mask Settings"
+    bl_options = {'DEFAULT_CLOSED'}
+
+    def draw(self, context):
+        layout = self.layout
+
+        sc = context.space_data
+        mask = sc.mask
+
+        col = layout.column(align=True)
+        col.prop(mask, "frame_start")
+        col.prop(mask, "frame_end")
+
 
 class CLIP_PT_marker_display(CLIP_PT_clip_view_panel, Panel):
     bl_space_type = 'CLIP_EDITOR'
     bl_region_type = 'UI'
     bl_label = "Marker Display"
 
+    @classmethod
+    def poll(cls, context):
+        sc = context.space_data
+
+        return sc.mode != 'MASKEDIT'
+
     def draw(self, context):
         layout = self.layout
         sc = context.space_data
@@ -757,10 +1010,10 @@ class CLIP_PT_footage(CLIP_PT_clip_view_panel, Panel):
         sc = context.space_data
         clip = sc.clip
 
-        if clip:
-            layout.template_movieclip(sc, "clip", compact=True)
-        else:
-            layout.operator("clip.open", icon='FILESEL')
+        col = layout.column()
+        col.template_movieclip(sc, "clip", compact=True)
+        col.prop(clip, "start_frame")
+        col.prop(clip, "frame_offset")
 
 
 class CLIP_PT_tools_clip(CLIP_PT_clip_view_panel, Panel):
@@ -942,16 +1195,26 @@ class CLIP_MT_select(Menu):
 
     def draw(self, context):
         layout = self.layout
+        sc = context.space_data
 
-        layout.operator("clip.select_border")
-        layout.operator("clip.select_circle")
+        if sc.mode == 'MASKEDIT':
+            layout.operator("mask.select_border")
+            layout.operator("mask.select_circle")
 
-        layout.separator()
+            layout.separator()
 
-        layout.operator("clip.select_all").action = 'TOGGLE'
-        layout.operator("clip.select_all", text="Inverse").action = 'INVERT'
+            layout.operator("mask.select_all").action = 'TOGGLE'
+            layout.operator("mask.select_all", text="Inverse").action = 'INVERT'
+        else:
+            layout.operator("clip.select_border")
+            layout.operator("clip.select_circle")
+
+            layout.separator()
+
+            layout.operator("clip.select_all").action = 'TOGGLE'
+            layout.operator("clip.select_all", text="Inverse").action = 'INVERT'
 
-        layout.menu("CLIP_MT_select_grouped")
+            layout.menu("CLIP_MT_select_grouped")
 
 
 class CLIP_MT_select_grouped(Menu):
@@ -995,6 +1258,67 @@ class CLIP_MT_tracking_specials(Menu):
         props.action = 'UNLOCK'
 
 
+class CLIP_MT_mask(Menu):
+    bl_label = "Mask"
+
+    def draw(self, context):
+        layout = self.layout
+
+        layout.operator("mask.delete")
+
+        layout.separator()
+        layout.operator("mask.cyclic_toggle")
+        layout.operator("mask.switch_direction")
+        layout.operator("mask.normals_make_consistent")
+        layout.operator("mask.feather_weight_clear")  # TODO, better place?
+
+        layout.separator()
+        layout.operator("mask.parent_clear")
+        layout.operator("mask.parent_set")
+
+        layout.separator()
+        layout.menu("CLIP_MT_mask_visibility")
+        layout.menu("CLIP_MT_mask_transform")
+        layout.menu("CLIP_MT_mask_animation")
+
+
+class CLIP_MT_mask_visibility(Menu):
+    bl_label = "Show/Hide"
+
+    def draw(self, context):
+        layout = self.layout
+
+        layout.operator("mask.hide_view_clear", text="Show Hidden")
+        layout.operator("mask.hide_view_set", text="Hide Selected")
+
+        props = layout.operator("mask.hide_view_set", text="Hide Unselected")
+        props.unselected = True
+
+
+class CLIP_MT_mask_transform(Menu):
+    bl_label = "Transform"
+
+    def draw(self, context):
+        layout = self.layout
+
+        layout.operator("transform.translate")
+        layout.operator("transform.rotate")
+        layout.operator("transform.resize")
+        props = layout.operator("transform.transform", text="Shrink/Fatten")
+        props.mode = 'MASK_SHRINKFATTEN'
+
+
+class CLIP_MT_mask_animation(Menu):
+    bl_label = "Animation"
+
+    def draw(self, context):
+        layout = self.layout
+
+        layout.operator("mask.shape_key_clear")
+        layout.operator("mask.shape_key_insert")
+        layout.operator("mask.shape_key_feather_reset")
+
+
 class CLIP_MT_camera_presets(Menu):
     """Predefined tracking camera intrinsics"""
     bl_label = "Camera Presets"
diff --git a/release/scripts/startup/bl_ui/space_console.py b/release/scripts/startup/bl_ui/space_console.py
index fc1d8e2d4be..5ec9d06ec89 100644
--- a/release/scripts/startup/bl_ui/space_console.py
+++ b/release/scripts/startup/bl_ui/space_console.py
@@ -41,8 +41,16 @@ class CONSOLE_MT_console(Menu):
     def draw(self, context):
         layout = self.layout
 
+        layout.operator("console.indent")
+        layout.operator("console.unindent")
+
+        layout.separator()
+
         layout.operator("console.clear")
         layout.operator("console.clear_line")
+
+        layout.separator()
+
         layout.operator("console.copy")
         layout.operator("console.paste")
         layout.menu("CONSOLE_MT_language")
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 861a5670393..44fb429ffe7 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -502,9 +502,12 @@ class IMAGE_PT_view_histogram(Panel):
         layout = self.layout
 
         sima = context.space_data
+        hist = sima.scopes.histogram
 
         layout.template_histogram(sima.scopes, "histogram")
-        layout.prop(sima.scopes.histogram, "mode", icon_only=True)
+        row = layout.row(align=True)
+        row.prop(hist, "mode", icon_only=True, expand=True)
+        row.prop(hist, "show_line", text="")
 
 
 class IMAGE_PT_view_waveform(Panel):
@@ -560,10 +563,13 @@ class IMAGE_PT_sample_line(Panel):
         layout = self.layout
 
         sima = context.space_data
+        hist = sima.sample_histogram
 
         layout.operator("image.sample_line")
         layout.template_histogram(sima, "sample_histogram")
-        layout.prop(sima.sample_histogram, "mode")
+        row = layout.row(align=True)
+        row.prop(hist, "mode", expand=True)
+        row.prop(hist, "show_line", text="")
 
 
 class IMAGE_PT_scope_sample(Panel):
diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py
index fd47b3b809c..b4100819ab0 100644
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@ -222,7 +222,7 @@ class NODE_PT_quality(bpy.types.Panel):
 
         layout.prop(tree, "render_quality", text="Render")
         layout.prop(tree, "edit_quality", text="Edit")
-        layout.prop(tree, "chunksize")
+        layout.prop(tree, "chunk_size")
         layout.prop(tree, "use_opencl")
 
         
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index 732f675c208..276e8e5ae1d 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -198,6 +198,12 @@ class SEQUENCER_MT_add(Menu):
         else:
             layout.operator_menu_enum("sequencer.movieclip_strip_add", "clip", text="Clip...")
 
+        if len(bpy.data.masks) > 10:
+            layout.operator_context = 'INVOKE_DEFAULT'
+            layout.operator("sequencer.mask_strip_add", text="Masks...")
+        else:
+            layout.operator_menu_enum("sequencer.mask_strip_add", "mask", text="Mask...")
+
         layout.operator("sequencer.movie_strip_add", text="Movie")
         layout.operator("sequencer.image_strip_add", text="Image")
         layout.operator("sequencer.sound_strip_add", text="Sound")
@@ -670,6 +676,35 @@ class SEQUENCER_PT_scene(SequencerButtonsPanel, Panel):
             layout.label(text="Original frame range" + ": %d-%d (%d)" % (sta, end, end - sta + 1))
 
 
+class SEQUENCER_PT_mask(SequencerButtonsPanel, Panel):
+    bl_label = "Mask"
+
+    @classmethod
+    def poll(cls, context):
+        if not cls.has_sequencer(context):
+            return False
+
+        strip = act_strip(context)
+        if not strip:
+            return False
+
+        return (strip.type == 'MASK')
+
+    def draw(self, context):
+        layout = self.layout
+
+        strip = act_strip(context)
+
+        layout.template_ID(strip, "mask")
+
+        mask = strip.mask
+
+        if mask:
+            sta = mask.frame_start
+            end = mask.frame_end
+            layout.label(text="Original frame range" + ": %d-%d (%d)" % (sta, end, end - sta + 1))
+
+
 class SEQUENCER_PT_filter(SequencerButtonsPanel, Panel):
     bl_label = "Filter"
 
@@ -682,10 +717,10 @@ class SEQUENCER_PT_filter(SequencerButtonsPanel, Panel):
         if not strip:
             return False
 
-        return strip.type in {'MOVIE', 'IMAGE', 'SCENE', 'MOVIECLIP', 'META',
-                              'ADD', 'SUBTRACT', 'ALPHA_OVER', 'ALPHA_UNDER',
-                              'CROSS', 'GAMMA_CROSS', 'MULTIPLY', 'OVER_DROP',
-                              'WIPE', 'GLOW', 'TRANSFORM', 'COLOR',
+        return strip.type in {'MOVIE', 'IMAGE', 'SCENE', 'MOVIECLIP', 'MASK',
+                              'META', 'ADD', 'SUBTRACT', 'ALPHA_OVER',
+                              'ALPHA_UNDER', 'CROSS', 'GAMMA_CROSS', 'MULTIPLY',
+                              'OVER_DROP', 'WIPE', 'GLOW', 'TRANSFORM', 'COLOR',
                               'MULTICAM', 'SPEED', 'ADJUSTMENT'}
 
     def draw(self, context):
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index dec3960f376..2d349931dc4 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -434,6 +434,7 @@ class USERPREF_PT_system(Panel):
         col.label(text="OpenGL:")
         col.prop(system, "gl_clip_alpha", slider=True)
         col.prop(system, "use_mipmaps")
+        col.prop(system, "use_gpu_mipmap")
         col.prop(system, "use_16bit_textures")
         col.label(text="Anisotropic Filtering")
         col.prop(system, "anisotropic_filter", text="")
diff --git a/release/scripts/startup/bl_ui/space_userpref_keymap.py b/release/scripts/startup/bl_ui/space_userpref_keymap.py
index 58697225811..6646da4a91a 100644
--- a/release/scripts/startup/bl_ui/space_userpref_keymap.py
+++ b/release/scripts/startup/bl_ui/space_userpref_keymap.py
@@ -217,7 +217,9 @@ class InputKeyMapPanel:
             km = km.active()
             layout.context_pointer_set("keymap", km)
 
-            filtered_items = [kmi for kmi in km.keymap_items if filter_text in kmi.name.lower()]
+            filtered_items = [kmi for kmi in km.keymap_items
+                              if filter_text in kmi.idname.lower() or
+                                 filter_text in kmi.name.lower()]
 
             if filtered_items:
                 col = layout.column()
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 397bdc0d74e..b525ab922d2 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2575,13 +2575,21 @@ class VIEW3D_PT_background_image(Panel):
 
                 if has_bg:
                     col = box.column()
-                    col.prop(bg, "show_on_foreground")
                     col.prop(bg, "opacity", slider=True)
+
+                    rowsub = col.row()
+                    rowsub.prop(bg, "draw_depth", expand=True)
+
+                    if bg.view_axis in {'CAMERA', 'ALL'}:
+                        rowsub = col.row()
+                        rowsub.prop(bg, "frame_method", expand=True)
+
+                    row = col.row(align=True)
+                    row.prop(bg, "offset_x", text="X")
+                    row.prop(bg, "offset_y", text="Y")
+
                     if bg.view_axis != 'CAMERA':
                         col.prop(bg, "size")
-                        row = col.row(align=True)
-                        row.prop(bg, "offset_x", text="X")
-                        row.prop(bg, "offset_y", text="Y")
 
 
 class VIEW3D_PT_transform_orientations(Panel):
diff --git a/release/scripts/templates/operator_node.py b/release/scripts/templates/operator_node.py
new file mode 100644
index 00000000000..5962651995b
--- /dev/null
+++ b/release/scripts/templates/operator_node.py
@@ -0,0 +1,59 @@
+import bpy
+
+
+def main(operator, context):
+    space = context.space_data
+    node_tree = space.node_tree
+    node_active = context.active_node
+    node_selected = context.selected_nodes
+
+    # now we have the context, perform a simple operation
+    if node_active in node_selected:
+        node_selected.remove(node_active)
+    if len(node_selected) != 1:
+        operator.report({'ERROR'}, "2 nodes must be selected")
+        return
+
+    node_other, = node_selected
+
+    # now we have 2 nodes to operate on
+    if not node_active.inputs:
+        operator.report({'ERROR'}, "Active node has no inputs")
+        return
+
+    if not node_other.outputs:
+        operator.report({'ERROR'}, "Selected node has no outputs")
+        return
+
+    socket_in = node_active.inputs[0]
+    socket_out = node_other.outputs[0]
+
+    # add a link between the two nodes
+    node_link = node_tree.links.new(socket_in, socket_out)
+
+
+class NodeOperator(bpy.types.Operator):
+    '''Tooltip'''
+    bl_idname = "node.simple_operator"
+    bl_label = "Simple Node Operator"
+
+    @classmethod
+    def poll(cls, context):
+        space = context.space_data
+        return space.type == 'NODE_EDITOR'
+
+    def execute(self, context):
+        main(context)
+        return {'FINISHED'}
+
+
+def register():
+    bpy.utils.register_class(NodeOperator)
+
+
+def unregister():
+    bpy.utils.unregister_class(NodeOperator)
+
+
+if __name__ == "__main__":
+    register()
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index e0fd33d1316..a0d840b5de6 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -86,6 +86,7 @@ set(SRC_DNA_INC
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_world_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_movieclip_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_tracking_types.h
+	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_mask_types.h
 )
 
 add_subdirectory(editors)
@@ -97,7 +98,6 @@ add_subdirectory(render)
 add_subdirectory(compositor)
 add_subdirectory(blenfont)
 add_subdirectory(blenloader)
-add_subdirectory(blenpluginapi)
 add_subdirectory(ikplugin)
 add_subdirectory(gpu)
 add_subdirectory(opencl)
diff --git a/source/blender/SConscript b/source/blender/SConscript
index 411a04528c5..c2ca6eb5ae5 100644
--- a/source/blender/SConscript
+++ b/source/blender/SConscript
@@ -7,7 +7,6 @@ SConscript(['avi/SConscript',
             'blenkernel/SConscript',
             'blenlib/SConscript',
             'blenloader/SConscript',
-            'blenpluginapi/SConscript',
             'gpu/SConscript',
             'opencl/SConscript',
             'editors/SConscript',
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c
index 626c591c40f..70794a11ff2 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -154,7 +154,7 @@ int BLF_load(const char *name)
 	/* check if we already load this font. */
 	i = blf_search(name);
 	if (i >= 0) {
-		/*font= global_font[i];*/ /*UNUSED*/
+		/*font = global_font[i];*/ /*UNUSED*/
 		return i;
 	}
 
@@ -237,7 +237,7 @@ int BLF_load_mem(const char *name, unsigned char *mem, int mem_size)
 
 	i = blf_search(name);
 	if (i >= 0) {
-		/*font= global_font[i];*/ /*UNUSED*/
+		/*font = global_font[i];*/ /*UNUSED*/
 		return i;
 	}
 
diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c
index 1b4ce59067d..6ab942f4e4d 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -132,7 +132,7 @@ static void blf_font_ensure_ascii_table(FontBLF *font)
 			_g = blf_glyph_add(_font,                                            \
 			                  FT_Get_Char_Index((_font)->face, _c), _c);         \
 		}                                                                        \
-	}                                                                            \
+	} (void)0
 
 
 #define BLF_KERNING_VARS(_font, _has_kerning, _kern_mode)                        \
@@ -155,7 +155,7 @@ static void blf_font_ensure_ascii_table(FontBLF *font)
 			_pen_x += delta.x >> 6;                                              \
 		}                                                                        \
 	}                                                                            \
-}                                                                                \
+} (void)0
 
 void blf_font_draw(FontBLF *font, const char *str, unsigned int len)
 {
diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h
index c1361788379..527d85c7cf3 100644
--- a/source/blender/blenkernel/BKE_action.h
+++ b/source/blender/blenkernel/BKE_action.h
@@ -112,6 +112,9 @@ struct bActionGroup *get_active_actiongroup(struct bAction *act);
 /* Make the given Action Group the active one */
 void set_active_action_group(struct bAction *act, struct bActionGroup *agrp, short select);
 
+/* Sync colors used for action/bone group with theme settings */
+void action_group_colors_sync(struct bActionGroup *grp);
+
 /* Add a new action group with the given name to the action */
 struct bActionGroup *action_groups_add_new(struct bAction *act, const char name[]);
 
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h
index e2bca1bb93e..faa996b9888 100644
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@ -42,14 +42,14 @@ extern "C" {
  * and keep comment above the defines.
  * Use STRINGIFY() rather than defining with quotes */
 #define BLENDER_VERSION         263
-#define BLENDER_SUBVERSION      7
+#define BLENDER_SUBVERSION      11
 
 #define BLENDER_MINVERSION      250
 #define BLENDER_MINSUBVERSION   0
 
 /* used by packaging tools */
 /* can be left blank, otherwise a,b,c... etc with no quotes */
-#define BLENDER_VERSION_CHAR	a
+#define BLENDER_VERSION_CHAR    a
 /* alpha/beta/rc/release, docs use this */
 #define BLENDER_VERSION_CYCLE   alpha
 
diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h
index 378cc72beb1..bcda970e60c 100644
--- a/source/blender/blenkernel/BKE_cloth.h
+++ b/source/blender/blenkernel/BKE_cloth.h
@@ -56,7 +56,7 @@ struct CollisionTree;
 
 /* Bits to or into the ClothVertex.flags. */
 #define CLOTH_VERT_FLAG_PINNED 1
-#define CLOTH_VERT_FLAG_COLLISION 2
+#define CLOTH_VERT_FLAG_NOSELFCOLL 2 /* vertex NOT used for self collisions */
 #define CLOTH_VERT_FLAG_PINNED_EM 3
 
 /**
@@ -69,8 +69,7 @@ struct CollisionTree;
  * own connectivity of the mesh based on the actual edges in the mesh.
  *
  */
-typedef struct Cloth
-{
+typedef struct Cloth {
 	struct ClothVertex	*verts;			/* The vertices that represent this cloth. */
 	struct	LinkNode	*springs;		/* The springs connecting the mesh. */
 	unsigned int		numverts;		/* The number of verts == m * n. */
@@ -91,8 +90,7 @@ typedef struct Cloth
 /**
  * The definition of a cloth vertex.
  */
-typedef struct ClothVertex
-{
+typedef struct ClothVertex {
 	int	flags;		/* General flags per vertex.		*/
 	float	v[3];		/* The velocity of the point.		*/
 	float	xconst[3];	/* constrained position			*/
@@ -117,8 +115,7 @@ ClothVertex;
 /**
  * The definition of a spring.
  */
-typedef struct ClothSpring
-{
+typedef struct ClothSpring {
 	int	ij;		/* Pij from the paper, one end of the spring.	*/
 	int	kl;		/* Pkl from the paper, one end of the spring.	*/
 	float	restlen;	/* The original length of the spring.	*/
@@ -149,8 +146,7 @@ ClothSpring;
 
 /* SIMULATION FLAGS: goal flags,.. */
 /* These are the bits used in SimSettings.flags. */
-typedef enum
-{
+typedef enum {
 	CLOTH_SIMSETTINGS_FLAG_COLLOBJ = ( 1 << 2 ),// object is only collision object, no cloth simulation is done
 	CLOTH_SIMSETTINGS_FLAG_GOAL = ( 1 << 3 ), 	// we have goals enabled
 	CLOTH_SIMSETTINGS_FLAG_TEARING = ( 1 << 4 ),// true if tearing is enabled
@@ -160,15 +156,13 @@ typedef enum
 } CLOTH_SIMSETTINGS_FLAGS;
 
 /* COLLISION FLAGS */
-typedef enum
-{
+typedef enum {
 	CLOTH_COLLSETTINGS_FLAG_ENABLED = ( 1 << 1 ), /* enables cloth - object collisions */
 	CLOTH_COLLSETTINGS_FLAG_SELF = ( 1 << 2 ), /* enables selfcollisions */
 } CLOTH_COLLISIONSETTINGS_FLAGS;
 
 /* Spring types as defined in the paper.*/
-typedef enum
-{
+typedef enum {
 	CLOTH_SPRING_TYPE_STRUCTURAL  = (1 << 1),
 	CLOTH_SPRING_TYPE_SHEAR       = (1 << 2),
 	CLOTH_SPRING_TYPE_BENDING     = (1 << 3),
@@ -176,8 +170,7 @@ typedef enum
 } CLOTH_SPRING_TYPES;
 
 /* SPRING FLAGS */
-typedef enum
-{
+typedef enum {
 	CLOTH_SPRING_FLAG_DEACTIVATE = ( 1 << 1 ),
 	CLOTH_SPRING_FLAG_NEEDED = ( 1 << 2 ), // springs has values to be applied
 } CLOTH_SPRINGS_FLAGS;
@@ -230,16 +223,14 @@ int cloth_add_spring (struct ClothModifierData *clmd, unsigned int indexA, unsig
 
 /* This enum provides the IDs for our solvers. */
 // only one available in the moment
-typedef enum
-{
+typedef enum {
 	CM_IMPLICIT = 0,
 } CM_SOLVER_ID;
 
 
 /* This structure defines how to call the solver.
  */
-typedef struct
-{
+typedef struct {
 	const char		*name;
 	CM_SOLVER_ID	id;
 	int	( *init ) (struct Object *ob, struct ClothModifierData *clmd );
diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h
index 191056571c0..ec257a2f394 100644
--- a/source/blender/blenkernel/BKE_collision.h
+++ b/source/blender/blenkernel/BKE_collision.h
@@ -59,8 +59,7 @@ struct LinkNode;
 ////////////////////////////////////////
 
 /* COLLISION FLAGS */
-typedef enum
-{
+typedef enum {
 	COLLISION_IN_FUTURE =       (1 << 1),
 #ifdef WITH_ELTOPO
 	COLLISION_USE_COLLFACE =    (1 << 2),
diff --git a/source/blender/blenkernel/BKE_colortools.h b/source/blender/blenkernel/BKE_colortools.h
index d67e1a9118e..f58af8f39a0 100644
--- a/source/blender/blenkernel/BKE_colortools.h
+++ b/source/blender/blenkernel/BKE_colortools.h
@@ -35,6 +35,7 @@ struct CurveMapping;
 struct CurveMap;
 struct CurveMapPoint;
 struct Scopes;
+struct Histogram;
 struct ImBuf;
 struct rctf;
 
@@ -74,7 +75,7 @@ void                curvemapping_premultiply(struct CurveMapping *cumap, int res
 int                 curvemapping_RGBA_does_something(struct CurveMapping *cumap);
 void                curvemapping_initialize(struct CurveMapping *cumap);
 void                curvemapping_table_RGBA(struct CurveMapping *cumap, float **array, int *size);
-
+void                BKE_histogram_update_sample_line(struct Histogram *hist, struct ImBuf *ibuf, const short use_color_management);
 void                scopes_update(struct Scopes *scopes, struct ImBuf *ibuf, int use_color_management);
 void                scopes_free(struct Scopes *scopes);
 void                scopes_new(struct Scopes *scopes);
diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index 23df246b430..7a1172335d8 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -260,6 +260,7 @@ struct Image *CTX_data_edit_image(const bContext *C);
 
 struct Text *CTX_data_edit_text(const bContext *C);
 struct MovieClip *CTX_data_edit_movieclip(const bContext *C);
+struct Mask *CTX_data_edit_mask(const bContext *C);
 
 int CTX_data_selected_nodes(const bContext *C, ListBase *list);
 
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h
index bbe68db8bfe..3dc68edf12b 100644
--- a/source/blender/blenkernel/BKE_customdata.h
+++ b/source/blender/blenkernel/BKE_customdata.h
@@ -321,6 +321,7 @@ void CustomData_to_bmeshpoly(struct CustomData *fdata, struct CustomData *pdata,
                              struct CustomData *ldata, int totloop, int totpoly);
 void CustomData_from_bmeshpoly(struct CustomData *fdata, struct CustomData *pdata, struct CustomData *ldata, int total);
 void CustomData_bmesh_update_active_layers(struct CustomData *fdata, struct CustomData *pdata, struct CustomData *ldata);
+void CustomData_bmesh_do_versions_update_active_layers(struct CustomData *fdata, struct CustomData *pdata, struct CustomData *ldata);
 void CustomData_bmesh_init_pool(struct CustomData *data, int totelem, const char htype);
 
 /* External file storage */
diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index 134ec1acd8e..f3223fb4af1 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -57,6 +57,7 @@ struct bGPdata *gpencil_data_duplicate(struct bGPdata *gpd);
 
 void gpencil_frame_delete_laststroke(struct bGPDlayer *gpl, struct bGPDframe *gpf);
 
+struct bGPDframe *BKE_gpencil_layer_find_frame(struct bGPDlayer *gpl, int cframe);
 struct bGPDframe *gpencil_layer_getframe(struct bGPDlayer *gpl, int cframe, short addnew);
 void gpencil_layer_delframe(struct bGPDlayer *gpl, struct bGPDframe *gpf);
 struct bGPDlayer *gpencil_layer_getactive(struct bGPdata *gpd);
diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h
index 91e3e9edbf0..baa530c0599 100644
--- a/source/blender/blenkernel/BKE_image.h
+++ b/source/blender/blenkernel/BKE_image.h
@@ -44,6 +44,7 @@ struct anim;
 struct Scene;
 struct Object;
 struct ImageFormatData;
+struct Main;
 
 /* call from library */
 void    BKE_image_free(struct Image *me);
@@ -143,6 +144,9 @@ struct Image *BKE_image_add_from_imbuf(struct ImBuf *ibuf);
 /* for reload, refresh, pack */
 void BKE_image_signal(struct Image *ima, struct ImageUser *iuser, int signal);
 
+void BKE_image_walk_all_users(const struct Main *mainp, void *customdata,
+                              void callback(struct Image *ima, struct ImageUser *iuser, void *customdata));
+
 /* ensures an Image exists for viewing nodes or render */
 struct Image *BKE_image_verify_viewer(int type, const char *name);
 
@@ -151,7 +155,9 @@ void BKE_image_assign_ibuf(struct Image *ima, struct ImBuf *ibuf);
 
 /* called on frame change or before render */
 void BKE_image_user_frame_calc(struct ImageUser *iuser, int cfra, int fieldnr);
+void BKE_image_user_check_frame_calc(struct ImageUser *iuser, int cfra, int fieldnr);
 int  BKE_image_user_frame_get(const struct ImageUser *iuser, int cfra, int fieldnr);
+void BKE_image_user_file_path(struct ImageUser *iuser, struct Image *ima, char *path); 
 
 /* sets index offset for multilayer files */
 struct RenderPass *BKE_image_multilayer_index(struct RenderResult *rr, struct ImageUser *iuser);
diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h
index 3a19d6c9007..3248944dae8 100644
--- a/source/blender/blenkernel/BKE_library.h
+++ b/source/blender/blenkernel/BKE_library.h
@@ -66,7 +66,7 @@ void id_clear_lib_data(struct Main *bmain, struct ID *id);
 
 struct ListBase *which_libbase(struct Main *mainlib, short type);
 
-#define MAX_LIBARRAY    40
+#define MAX_LIBARRAY    41
 int set_listbasepointers(struct Main *main, struct ListBase **lb);
 
 void BKE_libblock_free(struct ListBase *lb, void *idv);
diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h
index 09c91a59ac5..3074e1c0e63 100644
--- a/source/blender/blenkernel/BKE_main.h
+++ b/source/blender/blenkernel/BKE_main.h
@@ -86,6 +86,7 @@ typedef struct Main {
 	ListBase wm;
 	ListBase gpencil;
 	ListBase movieclip;
+	ListBase mask;
 
 	char id_tag_update[256];
 } Main;
diff --git a/source/blender/blenkernel/BKE_mask.h b/source/blender/blenkernel/BKE_mask.h
new file mode 100644
index 00000000000..0e93869a8b0
--- /dev/null
+++ b/source/blender/blenkernel/BKE_mask.h
@@ -0,0 +1,187 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2012 Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): Blender Foundation,
+ *                 Sergey Sharybin
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef __BKE_MASK_H__
+#define __BKE_MASK_H__
+
+struct Main;
+struct Mask;
+struct MaskParent;
+struct MaskLayer;
+struct MaskLayerShape;
+struct MaskSpline;
+struct MaskSplinePoint;
+struct MaskSplinePointUW;
+struct MovieClip;
+struct MovieClipUser;
+struct Scene;
+
+struct MaskSplinePoint *BKE_mask_spline_point_array(struct MaskSpline *spline);
+struct MaskSplinePoint *BKE_mask_spline_point_array_from_point(struct MaskSpline *spline, struct MaskSplinePoint *point_ref);
+
+/* mask layers */
+struct MaskLayer *BKE_mask_layer_new(struct Mask *mask, const char *name);
+struct MaskLayer *BKE_mask_layer_active(struct Mask *mask);
+void BKE_mask_layer_active_set(struct Mask *mask, struct MaskLayer *masklay);
+void BKE_mask_layer_remove(struct Mask *mask, struct MaskLayer *masklay);
+
+void BKE_mask_layer_free_shapes(struct MaskLayer *masklay);
+void BKE_mask_layer_free(struct MaskLayer *masklay);
+void BKE_mask_spline_free(struct MaskSpline *spline);
+struct MaskSpline *BKE_mask_spline_copy(struct MaskSpline *spline);
+void BKE_mask_point_free(struct MaskSplinePoint *point);
+
+void BKE_mask_layer_unique_name(struct Mask *mask, struct MaskLayer *masklay);
+
+/* splines */
+struct MaskSpline *BKE_mask_spline_add(struct MaskLayer *masklay);
+
+float (*BKE_mask_spline_differentiate(struct MaskSpline *spline, int *tot_diff_point))[2];
+float (*BKE_mask_spline_feather_differentiated_points(struct MaskSpline *spline, int *tot_feather_point))[2];
+
+float (*BKE_mask_spline_differentiate_with_resolution(struct MaskSpline *spline, int width, int height, int *tot_diff_point))[2];
+float (*BKE_mask_spline_feather_differentiated_points_with_resolution(struct MaskSpline *spline,
+                                                                      int width, int height, int *tot_feather_point))[2];
+
+float (*BKE_mask_spline_feather_points(struct MaskSpline *spline, int *tot_feather_point))[2];
+
+void BKE_mask_point_direction_switch(struct MaskSplinePoint *point);
+void BKE_mask_spline_direction_switch(struct MaskLayer *masklay, struct MaskSpline *spline);
+
+typedef enum {
+	MASK_PROJ_NEG = -1,
+	MASK_PROJ_ANY = 0,
+	MASK_PROJ_POS = 1
+} eMaskSign;
+float BKE_mask_spline_project_co(struct MaskSpline *spline, struct MaskSplinePoint *point,
+                                 float start_u, const float co[2], const eMaskSign sign);
+
+/* point */
+int BKE_mask_point_has_handle(struct MaskSplinePoint *point);
+void BKE_mask_point_handle(struct MaskSplinePoint *point, float handle[2]);
+void BKE_mask_point_set_handle(struct MaskSplinePoint *point, float loc[2], int keep_direction,
+                               float orig_handle[2], float orig_vec[3][3]);
+
+float *BKE_mask_point_segment_diff(struct MaskSpline *spline, struct MaskSplinePoint *point, int *tot_diff_point);
+float *BKE_mask_point_segment_feather_diff(struct MaskSpline *spline, struct MaskSplinePoint *point,
+                                           int *tot_feather_point);
+
+float *BKE_mask_point_segment_diff_with_resolution(struct MaskSpline *spline, struct MaskSplinePoint *point,
+                                                   int width, int height, int *tot_diff_point);
+
+float *BKE_mask_point_segment_feather_diff_with_resolution(struct MaskSpline *spline, struct MaskSplinePoint *point,
+                                                           int width, int height,
+                                                           int *tot_feather_point);
+
+void BKE_mask_point_segment_co(struct MaskSpline *spline, struct MaskSplinePoint *point, float u, float co[2]);
+void BKE_mask_point_normal(struct MaskSpline *spline, struct MaskSplinePoint *point,
+                           float u, float n[2]);
+float BKE_mask_point_weight_scalar(struct MaskSpline *spline, struct MaskSplinePoint *point, const float u);
+float BKE_mask_point_weight(struct MaskSpline *spline, struct MaskSplinePoint *point, const float u);
+struct MaskSplinePointUW *BKE_mask_point_sort_uw(struct MaskSplinePoint *point, struct MaskSplinePointUW *uw);
+void BKE_mask_point_add_uw(struct MaskSplinePoint *point, float u, float w);
+
+void BKE_mask_point_select_set(struct MaskSplinePoint *point, const short do_select);
+void BKE_mask_point_select_set_handle(struct MaskSplinePoint *point, const short do_select);
+
+/* general */
+struct Mask *BKE_mask_new(const char *name);
+
+void BKE_mask_free(struct Mask *mask);
+void BKE_mask_unlink(struct Main *bmain, struct Mask *mask);
+
+void BKE_mask_coord_from_movieclip(struct MovieClip *clip, struct MovieClipUser *user, float r_co[2], const float co[2]);
+void BKE_mask_coord_to_movieclip(struct MovieClip *clip, struct MovieClipUser *user, float r_co[2], const float co[2]);
+
+/* parenting */
+
+void BKE_mask_update_display(struct Mask *mask, float ctime);
+
+void BKE_mask_evaluate_all_masks(struct Main *bmain, float ctime, const int do_newframe);
+void BKE_mask_evaluate(struct Mask *mask, const float ctime, const int do_newframe);
+void BKE_mask_update_scene(struct Main *bmain, struct Scene *scene, const int do_newframe);
+void BKE_mask_parent_init(struct MaskParent *parent);
+void BKE_mask_calc_handle_adjacent_interp(struct MaskSpline *spline, struct MaskSplinePoint *point, const float u);
+void BKE_mask_calc_tangent_polyline(struct MaskSpline *spline, struct MaskSplinePoint *point, float t[2]);
+void BKE_mask_calc_handle_point(struct MaskSpline *spline, struct MaskSplinePoint *point);
+void BKE_mask_calc_handle_point_auto(struct MaskSpline *spline, struct MaskSplinePoint *point,
+                                     const short do_recalc_length);
+void BKE_mask_get_handle_point_adjacent(struct MaskSpline *spline, struct MaskSplinePoint *point,
+                                        struct MaskSplinePoint **r_point_prev, struct MaskSplinePoint **r_point_next);
+void BKE_mask_layer_calc_handles(struct MaskLayer *masklay);
+void BKE_mask_layer_calc_handles_deform(struct MaskLayer *masklay);
+void BKE_mask_calc_handles(struct Mask *mask);
+void BKE_mask_calc_handles_deform(struct Mask *mask);
+void BKE_mask_spline_ensure_deform(struct MaskSpline *spline);
+
+/* animation */
+int  BKE_mask_layer_shape_totvert(struct MaskLayer *masklay);
+void BKE_mask_layer_shape_from_mask(struct MaskLayer *masklay, struct MaskLayerShape *masklay_shape);
+void BKE_mask_layer_shape_to_mask(struct MaskLayer *masklay, struct MaskLayerShape *masklay_shape);
+void BKE_mask_layer_shape_to_mask_interp(struct MaskLayer *masklay,
+                                         struct MaskLayerShape *masklay_shape_a,
+                                         struct MaskLayerShape *masklay_shape_b,
+                                         const float fac);
+struct MaskLayerShape *BKE_mask_layer_shape_find_frame(struct MaskLayer *masklay, const int frame);
+int BKE_mask_layer_shape_find_frame_range(struct MaskLayer *masklay, const float frame,
+                                          struct MaskLayerShape **r_masklay_shape_a,
+                                          struct MaskLayerShape **r_masklay_shape_b);
+struct MaskLayerShape *BKE_mask_layer_shape_alloc(struct MaskLayer *masklay, const int frame);
+void BKE_mask_layer_shape_free(struct MaskLayerShape *masklay_shape);
+struct MaskLayerShape *BKE_mask_layer_shape_varify_frame(struct MaskLayer *masklay, const int frame);
+struct MaskLayerShape *BKE_mask_layer_shape_duplicate(struct MaskLayerShape *masklay_shape);
+void BKE_mask_layer_shape_unlink(struct MaskLayer *masklay, struct MaskLayerShape *masklay_shape);
+void BKE_mask_layer_shape_sort(struct MaskLayer *masklay);
+
+int BKE_mask_layer_shape_spline_from_index(struct MaskLayer *masklay, int index,
+                                            struct MaskSpline **r_masklay_shape, int *r_index);
+int BKE_mask_layer_shape_spline_to_index(struct MaskLayer *masklay, struct MaskSpline *spline);
+
+int BKE_mask_layer_shape_spline_index(struct MaskLayer *masklay, int index,
+                                       struct MaskSpline **r_masklay_shape, int *r_index);
+void BKE_mask_layer_shape_changed_add(struct MaskLayer *masklay, int index,
+                                       int do_init, int do_init_interpolate);
+
+void BKE_mask_layer_shape_changed_remove(struct MaskLayer *masklay, int index, int count);
+
+/* rasterization */
+int BKE_mask_get_duration(struct Mask *mask);
+void BKE_mask_rasterize(struct Mask *mask, int width, int height, float *buffer,
+                        const short do_aspect_correct, int do_mask_aa);
+
+#define MASKPOINT_ISSEL_ANY(p)          ( ((p)->bezt.f1 | (p)->bezt.f2 | (p)->bezt.f2) & SELECT)
+#define MASKPOINT_ISSEL_KNOT(p)         ( (p)->bezt.f2 & SELECT)
+#define MASKPOINT_ISSEL_HANDLE_ONLY(p)  ( (((p)->bezt.f1 | (p)->bezt.f2) & SELECT) && (((p)->bezt.f2 & SELECT) == 0) )
+#define MASKPOINT_ISSEL_HANDLE(p)       ( (((p)->bezt.f1 | (p)->bezt.f2) & SELECT) )
+
+#define MASKPOINT_SEL_ALL(p)    { (p)->bezt.f1 |=  SELECT; (p)->bezt.f2 |=  SELECT; (p)->bezt.f3 |=  SELECT; } (void)0
+#define MASKPOINT_DESEL_ALL(p)  { (p)->bezt.f1 &= ~SELECT; (p)->bezt.f2 &= ~SELECT; (p)->bezt.f3 &= ~SELECT; } (void)0
+#define MASKPOINT_INVSEL_ALL(p) { (p)->bezt.f1 ^=  SELECT; (p)->bezt.f2 ^=  SELECT; (p)->bezt.f3 ^=  SELECT; } (void)0
+
+#define MASKPOINT_SEL_HANDLE(p)     { (p)->bezt.f1 |=  SELECT; (p)->bezt.f3 |=  SELECT; } (void)0
+#define MASKPOINT_DESEL_HANDLE(p)   { (p)->bezt.f1 &= ~SELECT; (p)->bezt.f3 &= ~SELECT; } (void)0
+
+#endif
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index 7abec074647..887340622ad 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -33,6 +33,7 @@
 
 /***/
 
+struct ID;
 struct BoundBox;
 struct DispList;
 struct ListBase;
@@ -150,6 +151,14 @@ void copy_dverts(struct MDeformVert *dst, struct MDeformVert *src, int totvert);
 void BKE_mesh_delete_material_index(struct Mesh *me, short index);
 void BKE_mesh_smooth_flag_set(struct Object *meshOb, int enableSmooth);
 void BKE_mesh_convert_mfaces_to_mpolys(struct Mesh *mesh);
+void BKE_mesh_do_versions_convert_mfaces_to_mpolys(struct Mesh *mesh);
+void BKE_mesh_convert_mfaces_to_mpolys_ex(struct ID *id,
+                                          struct CustomData *fdata, struct CustomData *ldata, struct CustomData *pdata,
+                                          int totedge_i, int totface_i, int totloop_i, int totpoly_i,
+                                          struct MEdge *medge, struct MFace *mface,
+										  int *totloop_r, int *totpoly_r,
+										  struct MLoop **mloop_r, struct MPoly **mpoly_r);
+
 void BKE_mesh_calc_normals_tessface(struct MVert *mverts, int numVerts, struct MFace *mfaces, int numFaces, float (*faceNors_r)[3]);
 
 /* used for unit testing; compares two meshes, checking only
diff --git a/source/blender/blenkernel/BKE_movieclip.h b/source/blender/blenkernel/BKE_movieclip.h
index 15b3cb91b90..221ae99a0ec 100644
--- a/source/blender/blenkernel/BKE_movieclip.h
+++ b/source/blender/blenkernel/BKE_movieclip.h
@@ -63,6 +63,9 @@ void BKE_movieclip_get_cache_segments(struct MovieClip *clip, struct MovieClipUs
 void BKE_movieclip_build_proxy_frame(struct MovieClip *clip, int clip_flag, struct MovieDistortion *distortion,
                                      int cfra, int *build_sizes, int build_count, int undistorted);
 
+int BKE_movieclip_remap_scene_to_clip_frame(struct MovieClip *clip, int framenr);
+int BKE_movieclip_remap_clip_to_scene_frame(struct MovieClip *clip, int framenr);
+
 /* cacheing flags */
 #define MOVIECLIP_CACHE_SKIP        (1 << 0)
 
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 2632a982a01..b3f17c06d5c 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -156,6 +156,10 @@ typedef struct bNodeType {
 	const char *(*labelfunc)(struct bNode *);
 	/// Optional custom resize handle polling.
 	int (*resize_area_func)(struct bNode *node, int x, int y);
+	/// Optional selection area polling.
+	int (*select_area_func)(struct bNode *node, int x, int y);
+	/// Optional tweak area polling (for grabbing).
+	int (*tweak_area_func)(struct bNode *node, int x, int y);
 	
 	/// Called when the node is updated in the editor.
 	void (*updatefunc)(struct bNodeTree *ntree, struct bNode *node);
@@ -229,7 +233,7 @@ typedef struct bNodeType {
 #define NODE_CLASS_CONVERTOR		8
 #define NODE_CLASS_MATTE			9
 #define NODE_CLASS_DISTORT			10
-#define NODE_CLASS_OP_DYNAMIC		11
+#define NODE_CLASS_OP_DYNAMIC		11 /* deprecated */
 #define NODE_CLASS_PATTERN			12
 #define NODE_CLASS_TEXTURE			13
 #define NODE_CLASS_EXECUTION		14
@@ -262,8 +266,7 @@ struct bNodeTreeExec;
 
 typedef void (*bNodeTreeCallback)(void *calldata, struct ID *owner_id, struct bNodeTree *ntree);
 typedef void (*bNodeClassCallback)(void *calldata, int nclass, const char *name);
-typedef struct bNodeTreeType
-{
+typedef struct bNodeTreeType {
 	int type;						/* type identifier */
 	char idname[64];				/* id name for RNA identification */
 	
@@ -336,7 +339,7 @@ struct bNodeSocket *nodeInsertSocket(struct bNodeTree *ntree, struct bNode *node
 void nodeRemoveSocket(struct bNodeTree *ntree, struct bNode *node, struct bNodeSocket *sock);
 void nodeRemoveAllSockets(struct bNodeTree *ntree, struct bNode *node);
 
-void			nodeAddToPreview(struct bNode *, float *, int, int, int);
+void			nodeAddToPreview(struct bNode *node, float col[4], int x, int y, int do_manage);
 
 struct bNode	*nodeAddNode(struct bNodeTree *ntree, struct bNodeTemplate *ntemp);
 void			nodeUnlinkNode(struct bNodeTree *ntree, struct bNode *node);
@@ -369,6 +372,7 @@ void			nodeSetActive(struct bNodeTree *ntree, struct bNode *node);
 struct bNode	*nodeGetActive(struct bNodeTree *ntree);
 struct bNode	*nodeGetActiveID(struct bNodeTree *ntree, short idtype);
 int				nodeSetActiveID(struct bNodeTree *ntree, short idtype, struct ID *id);
+void			nodeClearActive(struct bNodeTree *ntree);
 void			nodeClearActiveID(struct bNodeTree *ntree, short idtype);
 struct bNode	*nodeGetActiveTexture(struct bNodeTree *ntree);
 
@@ -434,8 +438,7 @@ void			node_type_compatibility(struct bNodeType *ntype, short compatibility);
 #define NODE_FORLOOP	3
 #define NODE_WHILELOOP	4
 #define NODE_FRAME		5
-#define NODE_GROUP_MENU		10000
-#define NODE_DYNAMIC_MENU	20000
+#define NODE_REROUTE	6
 
 /* look up a socket on a group node by the internal group socket */
 struct bNodeSocket *node_group_find_input(struct bNode *gnode, struct bNodeSocket *gsock);
@@ -445,12 +448,11 @@ struct bNodeSocket *node_group_add_socket(struct bNodeTree *ngroup, const char *
 struct bNodeSocket *node_group_expose_socket(struct bNodeTree *ngroup, struct bNodeSocket *sock, int in_out);
 void node_group_expose_all_sockets(struct bNodeTree *ngroup);
 void node_group_remove_socket(struct bNodeTree *ngroup, struct bNodeSocket *gsock, int in_out);
-
-struct bNode	*node_group_make_from_selected(struct bNodeTree *ntree);
-int				node_group_ungroup(struct bNodeTree *ntree, struct bNode *gnode);
+struct bNodeSocket *node_group_add_extern_socket(struct bNodeTree *ntree, ListBase *lb, int in_out, struct bNodeSocket *gsock);
 
 /* in node_common.c */
 void register_node_type_frame(struct bNodeTreeType *ttype);
+void register_node_type_reroute(struct bNodeTreeType *ttype);
 
 /* ************** SHADER NODES *************** */
 
@@ -524,6 +526,7 @@ struct ShadeResult;
 #define SH_NODE_BRIGHTCONTRAST			165
 #define SH_NODE_LIGHT_FALLOFF			166
 #define SH_NODE_OBJECT_INFO				167
+#define SH_NODE_PARTICLE_INFO           168
 
 /* custom defines options for Material node */
 #define SH_NODE_MAT_DIFF   1
@@ -654,6 +657,9 @@ void			ntreeGPUMaterialNodes(struct bNodeTree *ntree, struct GPUMaterial *mat);
 #define CMP_NODE_MOVIEDISTORTION	265
 #define CMP_NODE_DOUBLEEDGEMASK    266
 #define CMP_NODE_OUTPUT_MULTI_FILE__DEPRECATED	267	/* DEPRECATED multi file node has been merged into regular CMP_NODE_OUTPUT_FILE */
+#define CMP_NODE_MASK		268
+#define CMP_NODE_KEYINGSCREEN		269
+#define CMP_NODE_KEYING			270
 
 #define CMP_NODE_GLARE		301
 #define CMP_NODE_TONEMAP	302
@@ -687,6 +693,9 @@ void			ntreeGPUMaterialNodes(struct bNodeTree *ntree, struct GPUMaterial *mat);
 #define CMP_SCALE_ABSOLUTE		1
 #define CMP_SCALE_SCENEPERCENT	2
 #define CMP_SCALE_RENDERPERCENT 3
+/* custom2 */
+#define CMP_SCALE_RENDERSIZE_FRAME_ASPECT  (1 << 0)
+#define CMP_SCALE_RENDERSIZE_FRAME_CROP    (1 << 1)
 
 
 /* API */
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index 890fc40c284..b8ba3095905 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -158,6 +158,26 @@ void BKE_object_relink(struct Object *ob);
 
 struct MovieClip *BKE_object_movieclip_get(struct Scene *scene, struct Object *ob, int use_default);
 
+/* this function returns a superset of the scenes selection based on relationships */
+
+typedef enum eObRelationTypes {
+	OB_REL_NONE               = 0,        /* just the selection as is */
+	OB_REL_PARENT             = (1 << 0), /* immediate parent */
+	OB_REL_PARENT_RECURSIVE   = (1 << 1), /* parents up to root of selection tree*/
+	OB_REL_CHILDREN           = (1 << 2), /* immediate children */
+	OB_REL_CHILDREN_RECURSIVE = (1 << 3), /* All children */
+	OB_REL_MOD_ARMATURE       = (1 << 4), /* Armatures related to the selected objects */
+	OB_REL_SCENE_CAMERA       = (1 << 5), /* you might want the scene camera too even if unselected? */
+} eObRelationTypes;
+
+typedef enum eObjectSet {
+	OB_SET_SELECTED, /* Selected Objects */
+	OB_SET_VISIBLE,  /* Visible Objects  */
+	OB_SET_ALL       /* All Objects      */
+} eObjectSet;
+
+struct LinkNode *BKE_object_relational_superset(struct Scene *scene, eObjectSet objectSet, eObRelationTypes includeFilter);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index b32b7145ff4..419fb4cedae 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -32,6 +32,7 @@
  *  \ingroup bke
  */
 
+struct bContext;
 struct Brush;
 struct MDisps;
 struct MeshElemMap;
@@ -55,6 +56,7 @@ void free_paint(struct Paint *p);
 void copy_paint(struct Paint *src, struct Paint *tar);
 
 struct Paint *paint_get_active(struct Scene *sce);
+struct Paint *paint_get_active_from_context(const struct bContext *C);
 struct Brush *paint_brush(struct Paint *paint);
 void paint_brush_set(struct Paint *paint, struct Brush *br);
 
diff --git a/source/blender/blenkernel/BKE_plugin_types.h b/source/blender/blenkernel/BKE_plugin_types.h
deleted file mode 100644
index f3c5db02427..00000000000
--- a/source/blender/blenkernel/BKE_plugin_types.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-#ifndef __BKE_PLUGIN_TYPES_H__
-#define __BKE_PLUGIN_TYPES_H__
-
-/** \file BKE_plugin_types.h
- *  \ingroup bke
- *  \author nzc
- */
-
-struct ImBuf;
-
-typedef int (*TexDoitold)(int stype, void *cast, float *texvec, float *dxt, float *dyt);
-typedef int (*TexDoit)(int stype, void *cast, float *texvec, float *dxt, float *dyt, float *result);
-typedef void (*SeqDoit)(void *, float, float, int, int,
-                        struct ImBuf *, struct ImBuf *,
-                        struct ImBuf *, struct ImBuf *);
-
-typedef struct VarStruct {
-	int type;
-	char name[16];
-	float def, min, max;
-	char tip[80];
-} VarStruct;
-
-typedef struct _PluginInfo {
-	char *name;
-	char *snames;
-
-	int stypes;
-	int nvars;
-	VarStruct *varstr;
-	float *result;
-	float *cfra;
-
-	void (*init)(void);
-	void (*callback)(int);
-	void (*tex_doit)(void *);
-	SeqDoit seq_doit;
-	void (*instance_init)(void *);
-} PluginInfo;
-
-#endif
-
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h
index f06e0e2f71a..d6c1a26fdba 100644
--- a/source/blender/blenkernel/BKE_sequencer.h
+++ b/source/blender/blenkernel/BKE_sequencer.h
@@ -113,9 +113,8 @@ enum {
 
 struct SeqEffectHandle {
 	/* constructors & destructor */
-	/* init & init_plugin are _only_ called on first creation */
+	/* init is _only_ called on first creation */
 	void (*init)(struct Sequence *seq);
-	void (*init_plugin)(struct Sequence *seq, const char *fname);
 	
 	/* number of input strips needed 
 	 * (called directly after construction) */
diff --git a/source/blender/blenkernel/BKE_shrinkwrap.h b/source/blender/blenkernel/BKE_shrinkwrap.h
index 5b09f8fdf3d..a7b03cef933 100644
--- a/source/blender/blenkernel/BKE_shrinkwrap.h
+++ b/source/blender/blenkernel/BKE_shrinkwrap.h
@@ -72,8 +72,8 @@ typedef struct SpaceTransform {
 } SpaceTransform;
 
 void space_transform_from_matrixs(struct SpaceTransform *data, float local[4][4], float target[4][4]);
-void space_transform_apply(const struct SpaceTransform *data, float *co);
-void space_transform_invert(const struct SpaceTransform *data, float *co);
+void space_transform_apply(const struct SpaceTransform *data, float co[3]);
+void space_transform_invert(const struct SpaceTransform *data, float co[3]);
 
 #define space_transform_setup(data, local, target) space_transform_from_matrixs(data, (local)->obmat, (target)->obmat)
 
diff --git a/source/blender/blenkernel/BKE_sketch.h b/source/blender/blenkernel/BKE_sketch.h
index 50ee1184b3e..ed7ce05506d 100644
--- a/source/blender/blenkernel/BKE_sketch.h
+++ b/source/blender/blenkernel/BKE_sketch.h
@@ -26,14 +26,12 @@
  *  \ingroup bke
  */
 
-typedef enum SK_PType
-{
+typedef enum SK_PType {
 	PT_CONTINUOUS,
 	PT_EXACT,
 } SK_PType;
 
-typedef enum SK_PMode
-{
+typedef enum SK_PMode {
 	PT_SNAP,
 	PT_PROJECT,
 } SK_PMode;
diff --git a/source/blender/blenkernel/BKE_texture.h b/source/blender/blenkernel/BKE_texture.h
index 339b78ae2d1..78fdd26c9e0 100644
--- a/source/blender/blenkernel/BKE_texture.h
+++ b/source/blender/blenkernel/BKE_texture.h
@@ -48,7 +48,6 @@ struct Material;
 struct MTex;
 struct OceanTex;
 struct ParticleSettings;
-struct PluginTex;
 struct PointDensity;
 struct Tex;
 struct TexMapping;
@@ -60,10 +59,6 @@ struct World;
 
 
 void BKE_texture_free(struct Tex *t); 
-int test_dlerr(const char *name,  const char *symbol);
-void open_plugin_tex(struct PluginTex *pit);
-struct PluginTex *add_plugin_tex(char *str);
-void free_plugin_tex(struct PluginTex *pit);
 
 void init_colorband(struct ColorBand *coba, int rangetype);
 struct ColorBand *add_colorband(int rangetype);
diff --git a/source/blender/blenkernel/BKE_tracking.h b/source/blender/blenkernel/BKE_tracking.h
index 817cb477aba..2b30c845754 100644
--- a/source/blender/blenkernel/BKE_tracking.h
+++ b/source/blender/blenkernel/BKE_tracking.h
@@ -47,160 +47,191 @@ struct Camera;
 struct Object;
 struct Scene;
 
-void BKE_tracking_init_settings(struct MovieTracking *tracking);
-void BKE_tracking_clamp_track(struct MovieTrackingTrack *track, int event);
-void BKE_tracking_track_flag(struct MovieTrackingTrack *track, int area, int flag, int clear);
+/* **** Common functions **** */
 
-struct MovieTrackingTrack *BKE_tracking_add_track(struct MovieTracking *tracking, struct ListBase *tracksbase,
-                                                  float x, float y, int framenr, int width, int height);
-struct MovieTrackingMarker *BKE_tracking_insert_marker(struct MovieTrackingTrack *track,
-                                                       struct MovieTrackingMarker *marker);
-void BKE_tracking_delete_marker(struct MovieTrackingTrack *track, int framenr);
+void BKE_tracking_free(struct MovieTracking *tracking);
 
-struct MovieTrackingMarker *BKE_tracking_get_marker(struct MovieTrackingTrack *track, int framenr);
-struct MovieTrackingMarker *BKE_tracking_ensure_marker(struct MovieTrackingTrack *track, int framenr);
-struct MovieTrackingMarker *BKE_tracking_exact_marker(struct MovieTrackingTrack *track, int framenr);
-int BKE_tracking_has_marker(struct MovieTrackingTrack *track, int framenr);
-int BKE_tracking_has_enabled_marker(struct MovieTrackingTrack *track, int framenr);
+void BKE_tracking_settings_init(struct MovieTracking *tracking);
 
-void BKE_tracking_free_track(struct MovieTrackingTrack *track);
+struct ListBase *BKE_tracking_get_active_tracks(struct MovieTracking *tracking);
+struct MovieTrackingReconstruction *BKE_tracking_get_active_reconstruction(struct MovieTracking *tracking);
 
-void BKE_tracking_clear_path(struct MovieTrackingTrack *track, int ref_frame, int action);
+/* matrices for constraints and drawing */
+void BKE_tracking_get_camera_object_matrix(struct Scene *scene, struct Object *ob, float mat[4][4]);
+void BKE_tracking_get_projection_matrix(struct MovieTracking *tracking, struct MovieTrackingObject *object,
+                                        int framenr, int winx, int winy, float mat[4][4]);
 
-void BKE_tracking_join_tracks(struct MovieTrackingTrack *dst_track, struct MovieTrackingTrack *src_track);
-void BKE_tracking_free(struct MovieTracking *tracking);
+/* **** Clipboard **** */
+void BKE_tracking_clipboard_free(void);
+void BKE_tracking_clipboard_copy_tracks(struct MovieTracking *tracking, struct MovieTrackingObject *object);
+int BKE_tracking_clipboard_has_tracks(void);
+void BKE_tracking_clipboard_paste_tracks(struct MovieTracking *tracking, struct MovieTrackingObject *object);
 
-struct ImBuf *BKE_tracking_get_pattern_imbuf(struct ImBuf *ibuf, struct MovieTrackingTrack *track,
-                                             struct MovieTrackingMarker *marker, int margin, int anchored,
-                                             float pos[2], int origin[2]);
-struct ImBuf *BKE_tracking_get_search_imbuf(struct ImBuf *ibuf, struct MovieTrackingTrack *track,
-                                            struct MovieTrackingMarker *marker, int margin, int anchored,
-                                            float pos[2], int origin[2]);
+/* **** Track **** */
+struct MovieTrackingTrack *BKE_tracking_track_add(struct MovieTracking *tracking, struct ListBase *tracksbase,
+                                                  float x, float y, int framenr, int width, int height);
+void BKE_tracking_track_unique_name(struct ListBase *tracksbase, struct MovieTrackingTrack *track);
+void BKE_tracking_track_free(struct MovieTrackingTrack *track);
 
-void BKE_track_unique_name(struct ListBase *tracksbase, struct MovieTrackingTrack *track);
+void BKE_tracking_track_flag_set(struct MovieTrackingTrack *track, int area, int flag);
+void BKE_tracking_track_flag_clear(struct MovieTrackingTrack *track, int area, int flag);
 
-struct MovieTrackingTrack *BKE_tracking_named_track(struct MovieTracking *tracking, struct MovieTrackingObject *object, const char *name);
-struct MovieTrackingTrack *BKE_tracking_indexed_track(struct MovieTracking *tracking, int tracknr, struct ListBase **tracksbase_r);
+int BKE_tracking_track_has_marker_at_frame(struct MovieTrackingTrack *track, int framenr);
+int BKE_tracking_track_has_enabled_marker_at_frame(struct MovieTrackingTrack *track, int framenr);
 
-void BKE_tracking_camera_shift(struct MovieTracking *tracking, int winx, int winy, float *shiftx, float *shifty);
-void BKE_tracking_camera_to_blender(struct MovieTracking *tracking, struct Scene *scene, struct Camera *camera, int width, int height);
+void BKE_tracking_track_path_clear(struct MovieTrackingTrack *track, int ref_frame, int action);
+void BKE_tracking_tracks_join(struct MovieTrackingTrack *dst_track, struct MovieTrackingTrack *src_track);
 
-void BKE_get_tracking_mat(struct Scene *scene, struct Object *ob, float mat[4][4]);
-void BKE_tracking_projection_matrix(struct MovieTracking *tracking, struct MovieTrackingObject *object,
-                                    int framenr, int winx, int winy, float mat[4][4]);
+struct MovieTrackingTrack *BKE_tracking_track_get_named(struct MovieTracking *tracking,
+                                                        struct MovieTrackingObject *object,
+                                                        const char *name);
+struct MovieTrackingTrack *BKE_tracking_track_get_indexed(struct MovieTracking *tracking, int tracknr,
+                                                          struct ListBase **tracksbase_r);
 
-struct ListBase *BKE_tracking_get_tracks(struct MovieTracking *tracking);
-struct MovieTrackingReconstruction *BKE_tracking_get_reconstruction(struct MovieTracking *tracking);
+struct MovieTrackingTrack *BKE_tracking_track_get_active(struct MovieTracking *tracking);
 
-struct MovieTrackingTrack *BKE_tracking_active_track(struct MovieTracking *tracking);
-struct MovieTrackingObject *BKE_tracking_active_object(struct MovieTracking *tracking);
-struct MovieTrackingObject *BKE_tracking_get_camera_object(struct MovieTracking *tracking);
-struct ListBase *BKE_tracking_object_tracks(struct MovieTracking *tracking, struct MovieTrackingObject *object);
-struct MovieTrackingReconstruction *BKE_tracking_object_reconstruction(struct MovieTracking *tracking,
-                                                                       struct MovieTrackingObject *object);
+float *BKE_tracking_track_get_mask(int frame_width, int frame_height, struct MovieTrackingTrack *track,
+                                   struct MovieTrackingMarker *marker);
 
-void BKE_tracking_disable_imbuf_channels(struct ImBuf *ibuf, int disable_red, int disable_green, int disable_blue, int grayscale);
+/* selection */
+void BKE_tracking_track_select(struct ListBase *tracksbase, struct MovieTrackingTrack *track, int area, int extend);
+void BKE_tracking_track_deselect(struct MovieTrackingTrack *track, int area);
 
-/* clipboard */
-void BKE_tracking_free_clipboard(void);
-void BKE_tracking_clipboard_copy_tracks(struct MovieTracking *tracking, struct MovieTrackingObject *object);
-int BKE_tracking_clipboard_has_tracks(void);
-void BKE_tracking_clipboard_paste_tracks(struct MovieTracking *tracking, struct MovieTrackingObject *object);
+/* **** Marker **** */
+struct MovieTrackingMarker *BKE_tracking_marker_insert(struct MovieTrackingTrack *track,
+                                                       struct MovieTrackingMarker *marker);
+void BKE_tracking_marker_delete(struct MovieTrackingTrack *track, int framenr);
 
-/* 2D tracking */
-struct MovieTrackingContext *BKE_tracking_context_new(struct MovieClip *clip, struct MovieClipUser *user,
-			short backwards, short sequence);
-void BKE_tracking_context_free(struct MovieTrackingContext *context);
-void BKE_tracking_sync(struct MovieTrackingContext *context);
-void BKE_tracking_sync_user(struct MovieClipUser *user, struct MovieTrackingContext *context);
-int BKE_tracking_next(struct MovieTrackingContext *context);
+void BKE_tracking_marker_clamp(struct MovieTrackingMarker *marker, int event);
 
-/* Camera solving */
-int BKE_tracking_can_reconstruct(struct MovieTracking *tracking, struct MovieTrackingObject *object,
-                                 char *error_msg, int error_size);
+struct MovieTrackingMarker *BKE_tracking_marker_get(struct MovieTrackingTrack *track, int framenr);
+struct MovieTrackingMarker *BKE_tracking_marker_get_exact(struct MovieTrackingTrack *track, int framenr);
+struct MovieTrackingMarker *BKE_tracking_marker_ensure(struct MovieTrackingTrack *track, int framenr);
 
-struct MovieReconstructContext* BKE_tracking_reconstruction_context_new(struct MovieTracking *tracking,
-			struct MovieTrackingObject *object, int keyframe1, int keyframe2, int width, int height);
-void BKE_tracking_reconstruction_context_free(struct MovieReconstructContext *context);
-void BKE_tracking_solve_reconstruction(struct MovieReconstructContext *context, short *stop, short *do_update,
-                                       float *progress, char *stats_message, int message_size);
-int BKE_tracking_finish_reconstruction(struct MovieReconstructContext *context, struct MovieTracking *tracking);
+void BKE_tracking_marker_pattern_minmax(const struct MovieTrackingMarker *marker, float min[2], float max[2]);
 
-struct MovieReconstructedCamera *BKE_tracking_get_reconstructed_camera(struct MovieTracking *tracking,
-			struct MovieTrackingObject *object, int framenr);
-void BKE_tracking_get_interpolated_camera(struct MovieTracking *tracking, struct MovieTrackingObject *object,
-                                          int framenr, float mat[4][4]);
+/* **** Object **** */
+struct MovieTrackingObject *BKE_tracking_object_add(struct MovieTracking *tracking, const char *name);
+void BKE_tracking_object_delete(struct MovieTracking *tracking, struct MovieTrackingObject *object);
 
-/* Feature detection */
-void BKE_tracking_detect_fast(struct MovieTracking *tracking, struct ListBase *tracksbase, struct ImBuf *imbuf,
-                              int framenr, int margin, int min_trackness, int min_distance, struct bGPDlayer *layer,
-                              int place_outside_layer);
+void BKE_tracking_object_unique_name(struct MovieTracking *tracking, struct MovieTrackingObject *object);
+
+struct MovieTrackingObject *BKE_tracking_object_get_named(struct MovieTracking *tracking, const char *name);
+
+struct MovieTrackingObject *BKE_tracking_object_get_active(struct MovieTracking *tracking);
+struct MovieTrackingObject *BKE_tracking_object_get_camera(struct MovieTracking *tracking);
+
+struct ListBase *BKE_tracking_object_get_tracks(struct MovieTracking *tracking, struct MovieTrackingObject *object);
+struct MovieTrackingReconstruction *BKE_tracking_object_get_reconstruction(struct MovieTracking *tracking,
+                                                                           struct MovieTrackingObject *object);
 
-/* 2D stabilization */
-void BKE_tracking_stabilization_data(struct MovieTracking *tracking, int framenr, int width, int height, float loc[2], float *scale, float *angle);
-struct ImBuf *BKE_tracking_stabilize(struct MovieTracking *tracking, int framenr, struct ImBuf *ibuf, float loc[2], float *scale, float *angle);
-void BKE_tracking_stabdata_to_mat4(int width, int height, float aspect, float loc[2], float scale, float angle, float mat[4][4]);
+/* **** Camera **** */
+void BKE_tracking_camera_shift_get(struct MovieTracking *tracking, int winx, int winy, float *shiftx, float *shifty);
+void BKE_tracking_camera_to_blender(struct MovieTracking *tracking, struct Scene *scene,
+                                    struct Camera *camera, int width, int height);
 
-/* Distortion/Undistortion */
-void BKE_tracking_apply_intrinsics(struct MovieTracking *tracking, float co[2], float nco[2]);
-void BKE_tracking_invert_intrinsics(struct MovieTracking *tracking, float co[2], float nco[2]);
+struct MovieReconstructedCamera *BKE_tracking_camera_get_reconstructed(struct MovieTracking *tracking,
+                                                                       struct MovieTrackingObject *object,
+                                                                       int framenr);
+void BKE_tracking_camera_get_reconstructed_interpolate(struct MovieTracking *tracking,
+                                                       struct MovieTrackingObject *object,
+                                                       int framenr, float mat[4][4]);
 
-struct MovieDistortion *BKE_tracking_distortion_create(void);
+/* **** Distortion/Undistortion **** */
+struct MovieDistortion *BKE_tracking_distortion_new(void);
+void BKE_tracking_distortion_update(struct MovieDistortion *distortion, struct MovieTracking *tracking,
+                                    int calibration_width, int calibration_height);
 struct MovieDistortion *BKE_tracking_distortion_copy(struct MovieDistortion *distortion);
 struct ImBuf *BKE_tracking_distortion_exec(struct MovieDistortion *distortion, struct MovieTracking *tracking,
                                            struct ImBuf *ibuf, int width, int height, float overscan, int undistort);
-void BKE_tracking_distortion_destroy(struct MovieDistortion *distortion);
+void BKE_tracking_distortion_free(struct MovieDistortion *distortion);
 
-struct ImBuf *BKE_tracking_undistort(struct MovieTracking *tracking, struct ImBuf *ibuf, int width, int height, float overscan);
-struct ImBuf *BKE_tracking_distort(struct MovieTracking *tracking, struct ImBuf *ibuf, int width, int height, float overscan);
+void BKE_tracking_distort_v2(struct MovieTracking *tracking, float co[2], float nco[2]);
+void BKE_tracking_undistort_v2(struct MovieTracking *tracking, float co[2], float nco[2]);
 
-/* Object tracking */
-struct MovieTrackingObject *BKE_tracking_new_object(struct MovieTracking *tracking, const char *name);
-void BKE_tracking_remove_object(struct MovieTracking *tracking, struct MovieTrackingObject *object);
-void BKE_tracking_object_unique_name(struct MovieTracking *tracking, struct MovieTrackingObject *object);
-struct MovieTrackingObject *BKE_tracking_named_object(struct MovieTracking *tracking, const char *name);
+struct ImBuf *BKE_tracking_undistort_frame(struct MovieTracking *tracking, struct ImBuf *ibuf,
+                                           int calibration_width, int calibration_height, float overscan);
+struct ImBuf *BKE_tracking_distort_frame(struct MovieTracking *tracking, struct ImBuf *ibuf,
+                                         int calibration_width, int calibration_height, float overscan);
+
+/* **** Image sampling **** */
+struct ImBuf *BKE_tracking_sample_pattern(int frame_width, int frame_height,
+                                          struct ImBuf *struct_ibuf, struct MovieTrackingTrack *track,
+                                          struct MovieTrackingMarker *marker, int use_mask,
+                                          int num_samples_x, int num_samples_y, float pos[2]);
+struct ImBuf *BKE_tracking_get_pattern_imbuf(struct ImBuf *ibuf, struct MovieTrackingTrack *track,
+                                             struct MovieTrackingMarker *marker, int anchored, int disable_channels);
+struct ImBuf *BKE_tracking_get_search_imbuf(struct ImBuf *ibuf, struct MovieTrackingTrack *track,
+                                            struct MovieTrackingMarker *marker, int anchored, int disable_channels);
+
+void BKE_tracking_disable_channels(struct ImBuf *ibuf, int disable_red, int disable_green,
+                                   int disable_blue, int grayscale);
 
-/* Select */
-void BKE_tracking_select_track(struct ListBase *tracksbase, struct MovieTrackingTrack *track, int area, int extend);
-void BKE_tracking_deselect_track(struct MovieTrackingTrack *track, int area);
+/* **** 2D tracking **** */
+struct MovieTrackingContext *BKE_tracking_context_new(struct MovieClip *clip, struct MovieClipUser *user,
+                                                      short backwards, short sequence);
+void BKE_tracking_context_free(struct MovieTrackingContext *context);
+void BKE_tracking_context_sync(struct MovieTrackingContext *context);
+void BKE_tracking_context_sync_user(const struct MovieTrackingContext *context, struct MovieClipUser *user);
+int BKE_tracking_context_step(struct MovieTrackingContext *context);
+
+/* **** Camera solving **** */
+int BKE_tracking_reconstruction_check(struct MovieTracking *tracking, struct MovieTrackingObject *object,
+                                      char *error_msg, int error_size);
+
+struct MovieReconstructContext *BKE_tracking_reconstruction_context_new(struct MovieTracking *tracking,
+                                                                        struct MovieTrackingObject *object,
+                                                                        int keyframe1, int keyframe2,
+                                                                        int width, int height);
+void BKE_tracking_reconstruction_context_free(struct MovieReconstructContext *context);
+void BKE_tracking_reconstruction_solve(struct MovieReconstructContext *context, short *stop, short *do_update,
+                                       float *progress, char *stats_message, int message_size);
+int BKE_tracking_reconstruction_finish(struct MovieReconstructContext *context, struct MovieTracking *tracking);
+
+/* **** Feature detection **** */
+void BKE_tracking_detect_fast(struct MovieTracking *tracking, struct ListBase *tracksbase, struct ImBuf *imbuf,
+                              int framenr, int margin, int min_trackness, int min_distance, struct bGPDlayer *layer,
+                              int place_outside_layer);
+
+/* **** 2D stabilization **** */
+void BKE_tracking_stabilization_data_get(struct MovieTracking *tracking, int framenr, int width, int height,
+                                         float loc[2], float *scale, float *angle);
+struct ImBuf *BKE_tracking_stabilize_frame(struct MovieTracking *tracking, int framenr, struct ImBuf *ibuf,
+                                           float loc[2], float *scale, float *angle);
+void BKE_tracking_stabilization_data_to_mat4(int width, int height, float aspect, float loc[2],
+                                             float scale, float angle, float mat[4][4]);
 
 /* Dopesheet */
 void BKE_tracking_dopesheet_tag_update(struct MovieTracking *tracking);
-void BKE_tracking_dopesheet_update(struct MovieTracking *tracking, int sort_method, int inverse);
-
-#define TRACK_SELECTED(track)				((track)->flag&SELECT || (track)->pat_flag&SELECT || (track)->search_flag&SELECT)
+void BKE_tracking_dopesheet_update(struct MovieTracking *tracking);
 
-#define TRACK_AREA_SELECTED(track, area)	((area)==TRACK_AREA_POINT ? (track)->flag&SELECT : \
-                                                                        ((area)==TRACK_AREA_PAT ? (track)->pat_flag&SELECT : \
-                                                                                                  (track)->search_flag&SELECT))
+#define TRACK_SELECTED(track)               ((track)->flag & SELECT || (track)->pat_flag & SELECT || (track)->search_flag & SELECT)
 
-#define TRACK_VIEW_SELECTED(sc, track)		((((track)->flag & TRACK_HIDDEN)==0) && \
-                                             (  TRACK_AREA_SELECTED(track, TRACK_AREA_POINT) || \
-                                                (((sc)->flag & SC_SHOW_MARKER_PATTERN) && TRACK_AREA_SELECTED(track, TRACK_AREA_PAT)) || \
-                                                (((sc)->flag & SC_SHOW_MARKER_SEARCH) && TRACK_AREA_SELECTED(track, TRACK_AREA_SEARCH))))
+#define TRACK_AREA_SELECTED(track, area)    ((area) == TRACK_AREA_POINT ? (track)->flag & SELECT : \
+                                             ((area) == TRACK_AREA_PAT ? (track)->pat_flag & SELECT : \
+                                              (track)->search_flag & SELECT))
 
-#define MARKER_VISIBLE(sc, track, marker)		(((marker)->flag & MARKER_DISABLED)==0 || ((sc)->flag & SC_HIDE_DISABLED)==0 || (sc->clip->tracking.act_track == track))
+#define TRACK_VIEW_SELECTED(sc, track)      ((((track)->flag & TRACK_HIDDEN) == 0) && \
+                                             (TRACK_AREA_SELECTED(track, TRACK_AREA_POINT) || \
+                                              (((sc)->flag & SC_SHOW_MARKER_PATTERN) && TRACK_AREA_SELECTED(track, TRACK_AREA_PAT)) || \
+                                              (((sc)->flag & SC_SHOW_MARKER_SEARCH) && TRACK_AREA_SELECTED(track, TRACK_AREA_SEARCH))))
 
-#define TRACK_CLEAR_UPTO		0
-#define TRACK_CLEAR_REMAINED	1
-#define TRACK_CLEAR_ALL			2
+#define MARKER_VISIBLE(sc, track, marker)       (((marker)->flag & MARKER_DISABLED) == 0 || ((sc)->flag & SC_HIDE_DISABLED) == 0 || (sc->clip->tracking.act_track == track))
 
-#define CLAMP_PAT_DIM		1
-#define CLAMP_PAT_POS		2
-#define CLAMP_SEARCH_DIM	3
-#define CLAMP_SEARCH_POS	4
-#define CLAMP_PYRAMID_LEVELS	5
+#define TRACK_CLEAR_UPTO        0
+#define TRACK_CLEAR_REMAINED    1
+#define TRACK_CLEAR_ALL         2
 
-#define TRACK_AREA_NONE		-1
-#define TRACK_AREA_POINT	1
-#define TRACK_AREA_PAT		2
-#define TRACK_AREA_SEARCH	4
+#define CLAMP_PAT_DIM       1
+#define CLAMP_PAT_POS       2
+#define CLAMP_SEARCH_DIM    3
+#define CLAMP_SEARCH_POS    4
 
-#define TRACK_AREA_ALL		(TRACK_AREA_POINT|TRACK_AREA_PAT|TRACK_AREA_SEARCH)
+#define TRACK_AREA_NONE     -1
+#define TRACK_AREA_POINT    1
+#define TRACK_AREA_PAT      2
+#define TRACK_AREA_SEARCH   4
 
-#define TRACK_SORT_NONE		-1
-#define TRACK_SORT_NAME		0
-#define TRACK_SORT_LONGEST	1
-#define TRACK_SORT_TOTAL	2
+#define TRACK_AREA_ALL      (TRACK_AREA_POINT | TRACK_AREA_PAT | TRACK_AREA_SEARCH)
 
 #endif
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index a791d6f269f..056a6bf5866 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -43,6 +43,7 @@ set(INC
 	../../../intern/memutil
 	../../../intern/mikktspace
 	../../../intern/opennl/extern
+	../../../intern/raskter
 
 	# XXX - BAD LEVEL CALL WM_api.h
 	../windowmanager
@@ -100,6 +101,7 @@ set(SRC
 	intern/lamp.c
 	intern/lattice.c
 	intern/library.c
+	intern/mask.c
 	intern/material.c
 	intern/mball.c
 	intern/mesh.c
@@ -187,6 +189,7 @@ set(SRC
 	BKE_lamp.h
 	BKE_lattice.h
 	BKE_library.h
+	BKE_mask.h
 	BKE_main.h
 	BKE_material.h
 	BKE_mball.h
@@ -201,7 +204,6 @@ set(SRC
 	BKE_packedFile.h
 	BKE_paint.h
 	BKE_particle.h
-	BKE_plugin_types.h
 	BKE_pointcache.h
 	BKE_property.h
 	BKE_report.h
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index ee9e6bc7739..64544adb26d 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -17,6 +17,7 @@ incs += ' #/intern/smoke/extern'
 incs += ' #/intern/mikktspace'
 incs += ' #/intern/audaspace/intern'
 incs += ' #/intern/ffmpeg'
+incs += ' #/intern/raskter'
 
 incs += ' ' + env['BF_OPENGL_INC']
 incs += ' ' + env['BF_ZLIB_INC']
diff --git a/source/blender/blenkernel/intern/CCGSubSurf.c b/source/blender/blenkernel/intern/CCGSubSurf.c
index e4309a64e56..d26a722b628 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf.c
+++ b/source/blender/blenkernel/intern/CCGSubSurf.c
@@ -275,9 +275,9 @@ static int ccg_edgebase(int level)
 
 /***/
 
-#define NormZero(av)     { float *_a = (float *) av; _a[0] = _a[1] = _a[2] = 0.0f; }
-#define NormCopy(av, bv) { float *_a = (float *) av, *_b = (float *) bv; _a[0]  = _b[0]; _a[1]  = _b[1]; _a[2]  = _b[2]; }
-#define NormAdd(av, bv)  { float *_a = (float *) av, *_b = (float *) bv; _a[0] += _b[0]; _a[1] += _b[1]; _a[2] += _b[2]; }
+#define NormZero(av)     { float *_a = (float *) av; _a[0] = _a[1] = _a[2] = 0.0f; } (void)0
+#define NormCopy(av, bv) { float *_a = (float *) av, *_b = (float *) bv; _a[0]  = _b[0]; _a[1]  = _b[1]; _a[2]  = _b[2]; } (void)0
+#define NormAdd(av, bv)  { float *_a = (float *) av, *_b = (float *) bv; _a[0] += _b[0]; _a[1] += _b[1]; _a[2] += _b[2]; } (void)0
 
 /***/
 
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 7e2d881689c..3f28a4afe8d 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -426,7 +426,7 @@ void DM_update_tessface_data(DerivedMesh *dm)
 
 		/* Find out loop indices. */
 		/* XXX Is there a better way to do this? */
-		/* NOTE: This assumes tessface are valid and in sync with loop/poly… Else, most likely, segfault! */
+		/* NOTE: This assumes tessface are valid and in sync with loop/poly... Else, most likely, segfault! */
 		for (i = mp[polyindex[mf_idx]].loopstart, not_done = mf_len; not_done; i++) {
 			MLoop *tml = &ml[i];
 			if (tml->v == mf->v1) {
@@ -1054,10 +1054,10 @@ static void calc_weightpaint_vert_color(
 	}
 
 	if (make_black) { /* TODO, theme color */
-		r_col[3] = 0;
+		r_col[3] = 255;
 		r_col[2] = 0;
 		r_col[1] = 0;
-		r_col[0] = 255;
+		r_col[0] = 0;
 	}
 	else {
 		CLAMP(input, 0.0f, 1.0f);
@@ -1651,7 +1651,9 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
 					orcodm = create_orco_dm(ob, me, NULL, CD_ORCO);
 
 				nextmask &= ~CD_MASK_ORCO;
-				DM_set_only_copy(orcodm, nextmask | CD_MASK_ORIGINDEX);
+				DM_set_only_copy(orcodm, nextmask | CD_MASK_ORIGINDEX |
+								 (mti->requiredDataMask ?
+								  mti->requiredDataMask(ob, md) : 0));
 				ndm = mti->applyModifier(md, ob, orcodm, app_flags & ~MOD_APPLY_USECACHE);
 
 				if (ndm) {
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index 233647c9ec6..b3d2e3371f4 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -252,6 +252,31 @@ void set_active_action_group(bAction *act, bActionGroup *agrp, short select)
 	}
 }
 
+/* Sync colors used for action/bone group with theme settings */
+void action_group_colors_sync(bActionGroup *grp)
+{
+	/* only do color copying if using a custom color (i.e. not default color)  */
+	if (grp->customCol) {
+		if (grp->customCol > 0) {
+			/* copy theme colors on-to group's custom color in case user tries to edit color */
+			bTheme *btheme = U.themes.first;
+			ThemeWireColor *col_set = &btheme->tarm[(grp->customCol - 1)];
+			
+			memcpy(&grp->cs, col_set, sizeof(ThemeWireColor));
+		}
+		else {
+			/* init custom colors with a generic multi-color rgb set, if not initialized already
+			 * (for custom color set) */
+			if (grp->cs.solid[0] == 0) {
+				/* define for setting colors in theme below */
+				rgba_char_args_set(grp->cs.solid, 0xff, 0x00, 0x00, 255);
+				rgba_char_args_set(grp->cs.select, 0x81, 0xe6, 0x14, 255);
+				rgba_char_args_set(grp->cs.active, 0x18, 0xb6, 0xe0, 255);
+			}
+		}
+	}
+}
+
 /* Add a new action group with the given name to the action */
 bActionGroup *action_groups_add_new(bAction *act, const char name[])
 {
@@ -409,10 +434,9 @@ void action_groups_clear_tempflags(bAction *act)
 
 /* *************** Pose channels *************** */
 
-/* usually used within a loop, so we got a N^2 slowdown */
 bPoseChannel *BKE_pose_channel_find_name(const bPose *pose, const char *name)
 {
-	if (ELEM(NULL, pose, name) || (name[0] == 0))
+	if (ELEM(NULL, pose, name) || (name[0] == '\0'))
 		return NULL;
 	
 	if (pose->chanhash)
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c
index f73221066b1..170638f0e8d 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -75,7 +75,7 @@
 /* --------------------- */
 /* forward declarations */
 
-static void object_duplilist_recursive(ID *id, Scene *scene, Object *ob, ListBase *duplilist, float par_space_mat[][4], int level, int animated);
+static void object_duplilist_recursive(ID *id, Scene *scene, Object *ob, ListBase *duplilist, float par_space_mat[][4], int par_index, int level, int animated);
 
 /* ******************************************************************** */
 /* Animation Visualisation */
@@ -699,7 +699,7 @@ int where_on_path(Object *ob, float ctime, float vec[4], float dir[3], float qua
 /* ******************************************************************** */
 /* Dupli-Geometry */
 
-static DupliObject *new_dupli_object(ListBase *lb, Object *ob, float mat[][4], int lay, int index, int type, int animated)
+static DupliObject *new_dupli_object(ListBase *lb, Object *ob, float mat[][4], int lay, int index, int par_index, int type, int animated)
 {
 	DupliObject *dob = MEM_callocN(sizeof(DupliObject), "dupliobject");
 	
@@ -709,6 +709,7 @@ static DupliObject *new_dupli_object(ListBase *lb, Object *ob, float mat[][4], i
 	copy_m4_m4(dob->omat, ob->obmat);
 	dob->origlay = ob->lay;
 	dob->index = index;
+	dob->particle_index = par_index;
 	dob->type = type;
 	dob->animated = (type == OB_DUPLIGROUP) && animated;
 	ob->lay = lay;
@@ -716,7 +717,7 @@ static DupliObject *new_dupli_object(ListBase *lb, Object *ob, float mat[][4], i
 	return dob;
 }
 
-static void group_duplilist(ListBase *lb, Scene *scene, Object *ob, int level, int animated)
+static void group_duplilist(ListBase *lb, Scene *scene, Object *ob, int par_index, int level, int animated)
 {
 	DupliObject *dob;
 	Group *group;
@@ -748,7 +749,7 @@ static void group_duplilist(ListBase *lb, Scene *scene, Object *ob, int level, i
 				mult_m4_m4m4(mat, ob->obmat, go->ob->obmat);
 			}
 			
-			dob = new_dupli_object(lb, go->ob, mat, ob->lay, 0, OB_DUPLIGROUP, animated);
+			dob = new_dupli_object(lb, go->ob, mat, ob->lay, 0, par_index, OB_DUPLIGROUP, animated);
 
 			/* check the group instance and object layers match, also that the object visible flags are ok. */
 			if ((dob->origlay & group->layer) == 0 ||
@@ -763,14 +764,14 @@ static void group_duplilist(ListBase *lb, Scene *scene, Object *ob, int level, i
 
 			if (go->ob->transflag & OB_DUPLI) {
 				copy_m4_m4(dob->ob->obmat, dob->mat);
-				object_duplilist_recursive(&group->id, scene, go->ob, lb, ob->obmat, level + 1, animated);
+				object_duplilist_recursive(&group->id, scene, go->ob, lb, ob->obmat, par_index, level + 1, animated);
 				copy_m4_m4(dob->ob->obmat, dob->omat);
 			}
 		}
 	}
 }
 
-static void frames_duplilist(ListBase *lb, Scene *scene, Object *ob, int level, int animated)
+static void frames_duplilist(ListBase *lb, Scene *scene, Object *ob, int par_index, int level, int animated)
 {
 	extern int enable_cu_speed; /* object.c */
 	Object copyob;
@@ -818,7 +819,7 @@ static void frames_duplilist(ListBase *lb, Scene *scene, Object *ob, int level,
 			BKE_animsys_evaluate_animdata(scene, &ob->id, ob->adt, (float)scene->r.cfra, ADT_RECALC_ANIM); /* ob-eval will do drivers, so we don't need to do them */
 			BKE_object_where_is_calc_time(scene, ob, (float)scene->r.cfra);
 			
-			dob = new_dupli_object(lb, ob, ob->obmat, ob->lay, scene->r.cfra, OB_DUPLIFRAMES, animated);
+			dob = new_dupli_object(lb, ob, ob->obmat, ob->lay, scene->r.cfra, par_index, OB_DUPLIFRAMES, animated);
 			copy_m4_m4(dob->omat, copyob.obmat);
 		}
 	}
@@ -839,7 +840,7 @@ static void frames_duplilist(ListBase *lb, Scene *scene, Object *ob, int level,
 	*ob = copyob;
 }
 
-typedef struct vertexDupliData {
+typedef struct VertexDupliData {
 	ID *id; /* scene or group, for recursive loops */
 	int level;
 	int animated;
@@ -849,7 +850,8 @@ typedef struct vertexDupliData {
 	Scene *scene;
 	Object *ob, *par;
 	float (*orco)[3];
-} vertexDupliData;
+	int par_index;
+} VertexDupliData;
 
 /* ------------- */
 
@@ -857,7 +859,7 @@ static void vertex_dupli__mapFunc(void *userData, int index, const float co[3],
                                   const float no_f[3], const short no_s[3])
 {
 	DupliObject *dob;
-	vertexDupliData *vdd = userData;
+	VertexDupliData *vdd = userData;
 	float vec[3], q2[4], mat[3][3], tmat[4][4], obmat[4][4];
 	int origlay;
 	
@@ -885,7 +887,7 @@ static void vertex_dupli__mapFunc(void *userData, int index, const float co[3],
 
 	origlay = vdd->ob->lay;
 	
-	dob = new_dupli_object(vdd->lb, vdd->ob, obmat, vdd->par->lay, index, OB_DUPLIVERTS, vdd->animated);
+	dob = new_dupli_object(vdd->lb, vdd->ob, obmat, vdd->par->lay, index, vdd->par_index, OB_DUPLIVERTS, vdd->animated);
 
 	/* restore the original layer so that each dupli will have proper dob->origlay */
 	vdd->ob->lay = origlay;
@@ -897,18 +899,18 @@ static void vertex_dupli__mapFunc(void *userData, int index, const float co[3],
 		float tmpmat[4][4];
 		copy_m4_m4(tmpmat, vdd->ob->obmat);
 		copy_m4_m4(vdd->ob->obmat, obmat); /* pretend we are really this mat */
-		object_duplilist_recursive((ID *)vdd->id, vdd->scene, vdd->ob, vdd->lb, obmat, vdd->level + 1, vdd->animated);
+		object_duplilist_recursive((ID *)vdd->id, vdd->scene, vdd->ob, vdd->lb, obmat, vdd->par_index, vdd->level + 1, vdd->animated);
 		copy_m4_m4(vdd->ob->obmat, tmpmat);
 	}
 }
 
-static void vertex_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, float par_space_mat[][4], int level, int animated)
+static void vertex_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, float par_space_mat[][4], int par_index, int level, int animated)
 {
 	Object *ob, *ob_iter;
 	Mesh *me = par->data;
 	Base *base = NULL;
 	DerivedMesh *dm;
-	vertexDupliData vdd;
+	VertexDupliData vdd;
 	Scene *sce = NULL;
 	Group *group = NULL;
 	GroupObject *go = NULL;
@@ -986,6 +988,7 @@ static void vertex_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, fl
 					vdd.scene = scene;
 					vdd.par = par;
 					copy_m4_m4(vdd.pmat, pmat);
+					vdd.par_index = par_index;
 					
 					/* mballs have a different dupli handling */
 					if (ob->type != OB_MBALL) ob->flag |= OB_DONE;  /* doesnt render */
@@ -1024,7 +1027,7 @@ static void vertex_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, fl
 	dm->release(dm);
 }
 
-static void face_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, float par_space_mat[][4], int level, int animated)
+static void face_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, float par_space_mat[][4], int par_index, int level, int animated)
 {
 	Object *ob, *ob_iter;
 	Base *base = NULL;
@@ -1171,7 +1174,7 @@ static void face_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, floa
 						copy_m4_m4(tmat, obmat);
 						mul_m4_m4m3(obmat, tmat, mat);
 						
-						dob = new_dupli_object(lb, ob, obmat, par->lay, a, OB_DUPLIFACES, animated);
+						dob = new_dupli_object(lb, ob, obmat, par->lay, a, par_index, OB_DUPLIFACES, animated);
 						if (G.rendering) {
 							w = 1.0f / (float)mp->totloop;
 
@@ -1194,7 +1197,7 @@ static void face_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, floa
 							float tmpmat[4][4];
 							copy_m4_m4(tmpmat, ob->obmat);
 							copy_m4_m4(ob->obmat, obmat); /* pretend we are really this mat */
-							object_duplilist_recursive((ID *)id, scene, ob, lb, ob->obmat, level + 1, animated);
+							object_duplilist_recursive((ID *)id, scene, ob, lb, ob->obmat, par_index, level + 1, animated);
 							copy_m4_m4(ob->obmat, tmpmat);
 						}
 					}
@@ -1214,7 +1217,7 @@ static void face_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, floa
 	dm->release(dm);
 }
 
-static void new_particle_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, float par_space_mat[][4], ParticleSystem *psys, int level, int animated)
+static void new_particle_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, float par_space_mat[][4], int UNUSED(par_index), ParticleSystem *psys, int level, int animated)
 {
 	GroupObject *go;
 	Object *ob = NULL, **oblist = NULL, obcopy, *obcopylist = NULL;
@@ -1228,7 +1231,7 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Scene *scene, Object *p
 	float ctime, pa_time, scale = 1.0f;
 	float tmat[4][4], mat[4][4], pamat[4][4], vec[3], size = 0.0;
 	float (*obmat)[4], (*oldobmat)[4];
-	int a, b, counter, hair = 0;
+	int a, b, counter, index, hair = 0;
 	int totpart, totchild, totgroup = 0 /*, pa_num */;
 
 	int no_draw_flag = PARS_UNEXIST;
@@ -1342,6 +1345,7 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Scene *scene, Object *p
 		else
 			a = totpart;
 
+		index = 0;
 		for (pa = psys->particles, counter = 0; a < totpart + totchild; a++, pa++, counter++) {
 			if (a < totpart) {
 				/* handle parent particle */
@@ -1437,7 +1441,7 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Scene *scene, Object *p
 					else
 						copy_m4_m4(mat, tmat);
 
-					dob = new_dupli_object(lb, go->ob, mat, par->lay, counter, OB_DUPLIPARTS, animated);
+					dob = new_dupli_object(lb, go->ob, mat, par->lay, counter, index, OB_DUPLIPARTS, animated);
 					copy_m4_m4(dob->omat, obcopylist[b].obmat);
 					if (G.rendering)
 						psys_get_dupli_texture(psys, part, sim.psmd, pa, cpa, dob->uv, dob->orco);
@@ -1479,11 +1483,14 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Scene *scene, Object *p
 				if (part->draw & PART_DRAW_GLOBAL_OB)
 					add_v3_v3v3(mat[3], mat[3], vec);
 
-				dob = new_dupli_object(lb, ob, mat, ob->lay, counter, GS(id->name) == ID_GR ? OB_DUPLIGROUP : OB_DUPLIPARTS, animated);
+				dob = new_dupli_object(lb, ob, mat, ob->lay, counter, index, GS(id->name) == ID_GR ? OB_DUPLIGROUP : OB_DUPLIPARTS, animated);
 				copy_m4_m4(dob->omat, oldobmat);
 				if (G.rendering)
 					psys_get_dupli_texture(psys, part, sim.psmd, pa, cpa, dob->uv, dob->orco);
 			}
+
+			/* only counts visible particles */
+			++index;
 		}
 
 		/* restore objects since they were changed in BKE_object_where_is_calc_time */
@@ -1530,7 +1537,7 @@ static Object *find_family_object(Object **obar, char *family, char ch)
 }
 
 
-static void font_duplilist(ListBase *lb, Scene *scene, Object *par, int level, int animated)
+static void font_duplilist(ListBase *lb, Scene *scene, Object *par, int par_index, int level, int animated)
 {
 	Object *ob, *obar[256] = {NULL};
 	Curve *cu;
@@ -1569,7 +1576,7 @@ static void font_duplilist(ListBase *lb, Scene *scene, Object *par, int level, i
 			copy_m4_m4(obmat, par->obmat);
 			copy_v3_v3(obmat[3], vec);
 			
-			new_dupli_object(lb, ob, obmat, par->lay, a, OB_DUPLIVERTS, animated);
+			new_dupli_object(lb, ob, obmat, par->lay, a, par_index, OB_DUPLIVERTS, animated);
 		}
 	}
 	
@@ -1578,7 +1585,7 @@ static void font_duplilist(ListBase *lb, Scene *scene, Object *par, int level, i
 
 /* ------------- */
 
-static void object_duplilist_recursive(ID *id, Scene *scene, Object *ob, ListBase *duplilist, float par_space_mat[][4], int level, int animated)
+static void object_duplilist_recursive(ID *id, Scene *scene, Object *ob, ListBase *duplilist, float par_space_mat[][4], int par_index, int level, int animated)
 {	
 	if ((ob->transflag & OB_DUPLI) == 0)
 		return;
@@ -1598,31 +1605,31 @@ static void object_duplilist_recursive(ID *id, Scene *scene, Object *ob, ListBas
 	if (ob->transflag & OB_DUPLIPARTS) {
 		ParticleSystem *psys = ob->particlesystem.first;
 		for (; psys; psys = psys->next)
-			new_particle_duplilist(duplilist, id, scene, ob, par_space_mat, psys, level + 1, animated);
+			new_particle_duplilist(duplilist, id, scene, ob, par_space_mat, par_index, psys, level + 1, animated);
 	}
 	else if (ob->transflag & OB_DUPLIVERTS) {
 		if (ob->type == OB_MESH) {
-			vertex_duplilist(duplilist, id, scene, ob, par_space_mat, level + 1, animated);
+			vertex_duplilist(duplilist, id, scene, ob, par_space_mat, par_index, level + 1, animated);
 		}
 		else if (ob->type == OB_FONT) {
 			if (GS(id->name) == ID_SCE) { /* TODO - support dupligroups */
-				font_duplilist(duplilist, scene, ob, level + 1, animated);
+				font_duplilist(duplilist, scene, ob, par_index, level + 1, animated);
 			}
 		}
 	}
 	else if (ob->transflag & OB_DUPLIFACES) {
 		if (ob->type == OB_MESH)
-			face_duplilist(duplilist, id, scene, ob, par_space_mat, level + 1, animated);
+			face_duplilist(duplilist, id, scene, ob, par_space_mat, par_index, level + 1, animated);
 	}
 	else if (ob->transflag & OB_DUPLIFRAMES) {
 		if (GS(id->name) == ID_SCE) { /* TODO - support dupligroups */
-			frames_duplilist(duplilist, scene, ob, level + 1, animated);
+			frames_duplilist(duplilist, scene, ob, par_index, level + 1, animated);
 		}
 	}
 	else if (ob->transflag & OB_DUPLIGROUP) {
 		DupliObject *dob;
 		
-		group_duplilist(duplilist, scene, ob, level + 1, animated); /* now recursive */
+		group_duplilist(duplilist, scene, ob, par_index, level + 1, animated); /* now recursive */
 
 		if (level == 0) {
 			for (dob = duplilist->first; dob; dob = dob->next)
@@ -1638,7 +1645,7 @@ ListBase *object_duplilist(Scene *sce, Object *ob)
 {
 	ListBase *duplilist = MEM_mallocN(sizeof(ListBase), "duplilist");
 	duplilist->first = duplilist->last = NULL;
-	object_duplilist_recursive((ID *)sce, sce, ob, duplilist, NULL, 0, 0);
+	object_duplilist_recursive((ID *)sce, sce, ob, duplilist, NULL, 0, 0, 0);
 	return duplilist;
 }
 
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index b66a90ab911..a0da23a8f8f 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -90,6 +90,7 @@ short id_type_can_have_animdata(ID *id)
 		case ID_SPK:
 		case ID_SCE:
 		case ID_MC:
+		case ID_MSK:
 		{
 			return 1;
 		}
@@ -744,7 +745,7 @@ void BKE_animdata_main_cb(Main *mainptr, ID_AnimData_Edit_Callback func, void *u
 	for (id = first; id; id = id->next) { \
 		AnimData *adt = BKE_animdata_from_id(id); \
 		if (adt) func(id, adt, user_data); \
-	}
+	} (void)0
 	
 	/* "embedded" nodetree cases (i.e. scene/material/texture->nodetree) */
 #define ANIMDATA_NODETREE_IDS_CB(first, NtId_Type) \
@@ -756,7 +757,7 @@ void BKE_animdata_main_cb(Main *mainptr, ID_AnimData_Edit_Callback func, void *u
 			if (adt2) func(id, adt2, user_data); \
 		} \
 		if (adt) func(id, adt, user_data); \
-	}
+	} (void)0
 	
 	/* nodes */
 	ANIMDATA_IDS_CB(mainptr->nodetree.first);
@@ -802,10 +803,13 @@ void BKE_animdata_main_cb(Main *mainptr, ID_AnimData_Edit_Callback func, void *u
 
 	/* objects */
 	ANIMDATA_IDS_CB(mainptr->object.first);
+
+	/* masks */
+	ANIMDATA_IDS_CB(mainptr->mask.first);
 	
 	/* worlds */
 	ANIMDATA_IDS_CB(mainptr->world.first);
-	
+
 	/* scenes */
 	ANIMDATA_NODETREE_IDS_CB(mainptr->scene.first, Scene);
 }
@@ -828,7 +832,7 @@ void BKE_all_animdata_fix_paths_rename(ID *ref_id, const char *prefix, const cha
 	for (id = first; id; id = id->next) { \
 		AnimData *adt = BKE_animdata_from_id(id); \
 		BKE_animdata_fix_paths_rename(id, adt, ref_id, prefix, oldName, newName, 0, 0, 1); \
-	}
+	} (void)0
 	
 	/* another version of this macro for nodetrees */
 #define RENAMEFIX_ANIM_NODETREE_IDS(first, NtId_Type) \
@@ -840,7 +844,7 @@ void BKE_all_animdata_fix_paths_rename(ID *ref_id, const char *prefix, const cha
 			BKE_animdata_fix_paths_rename((ID *)ntp, adt2, ref_id, prefix, oldName, newName, 0, 0, 1); \
 		} \
 		BKE_animdata_fix_paths_rename(id, adt, ref_id, prefix, oldName, newName, 0, 0, 1); \
-	}
+	} (void)0
 	
 	/* nodes */
 	RENAMEFIX_ANIM_IDS(mainptr->nodetree.first);
@@ -886,6 +890,9 @@ void BKE_all_animdata_fix_paths_rename(ID *ref_id, const char *prefix, const cha
 
 	/* objects */
 	RENAMEFIX_ANIM_IDS(mainptr->object.first); 
+
+	/* masks */
+	RENAMEFIX_ANIM_IDS(mainptr->mask.first);
 	
 	/* worlds */
 	RENAMEFIX_ANIM_IDS(mainptr->world.first);
@@ -1280,9 +1287,11 @@ static void animsys_evaluate_drivers(PointerRNA *ptr, AnimData *adt, float ctime
 		/* check if this driver's curve should be skipped */
 		if ((fcu->flag & (FCURVE_MUTED | FCURVE_DISABLED)) == 0) {
 			/* check if driver itself is tagged for recalculation */
-			if ((driver) && !(driver->flag & DRIVER_FLAG_INVALID) /*&& (driver->flag & DRIVER_FLAG_RECALC)*/) {  // XXX driver recalc flag is not set yet by depsgraph!
-				/* evaluate this using values set already in other places */
-				// NOTE: for 'layering' option later on, we should check if we should remove old value before adding new to only be done when drivers only changed
+			/* XXX driver recalc flag is not set yet by depsgraph! */
+			if ((driver) && !(driver->flag & DRIVER_FLAG_INVALID) /*&& (driver->flag & DRIVER_FLAG_RECALC)*/) {
+				/* evaluate this using values set already in other places
+				 * NOTE: for 'layering' option later on, we should check if we should remove old value before adding
+				 *       new to only be done when drivers only changed */
 				calculate_fcurve(fcu, ctime);
 				ok = animsys_execute_fcurve(ptr, NULL, fcu);
 				
@@ -1577,7 +1586,7 @@ static NlaEvalChannel *nlaevalchan_verify(PointerRNA *ptr, ListBase *channels, N
 	PropertyRNA *prop;
 	PointerRNA new_ptr;
 	char *path = NULL;
-	/* short free_path=0; */
+	/* short free_path = 0; */
 	
 	/* sanity checks */
 	if (channels == NULL)
@@ -1585,7 +1594,7 @@ static NlaEvalChannel *nlaevalchan_verify(PointerRNA *ptr, ListBase *channels, N
 	
 	/* get RNA pointer+property info from F-Curve for more convenient handling */
 	/* get path, remapped as appropriate to work in its new environment */
-	/* free_path= */ /* UNUSED */ animsys_remap_path(strip->remap, fcu->rna_path, &path);
+	/* free_path = */ /* UNUSED */ animsys_remap_path(strip->remap, fcu->rna_path, &path);
 	
 	/* a valid property must be available, and it must be animatable */
 	if (RNA_path_resolve(ptr, path, &new_ptr, &prop) == 0) {
@@ -2266,7 +2275,8 @@ void BKE_animsys_evaluate_all_animation(Main *main, Scene *scene, float ctime)
 			AnimData *adt = BKE_animdata_from_id(id); \
 			BKE_animsys_evaluate_animdata(scene, id, adt, ctime, aflag); \
 		} \
-	}
+	} (void)0
+
 	/* another macro for the "embedded" nodetree cases 
 	 *	- this is like EVAL_ANIM_IDS, but this handles the case "embedded nodetrees" 
 	 *	  (i.e. scene/material/texture->nodetree) which we need a special exception
@@ -2284,7 +2294,7 @@ void BKE_animsys_evaluate_all_animation(Main *main, Scene *scene, float ctime)
 			} \
 			BKE_animsys_evaluate_animdata(scene, id, adt, ctime, aflag); \
 		} \
-	}
+	} (void)0
 	
 	/* optimization: 
 	 * when there are no actions, don't go over database and loop over heaps of datablocks, 
@@ -2349,6 +2359,9 @@ void BKE_animsys_evaluate_all_animation(Main *main, Scene *scene, float ctime)
 	 * linked from other (not-visible) scenes will not need their data calculated.
 	 */
 	EVAL_ANIM_IDS(main->object.first, 0); 
+
+	/* masks */
+	EVAL_ANIM_IDS(main->mask.first, ADT_RECALC_ANIM);
 	
 	/* worlds */
 	EVAL_ANIM_NODETREE_IDS(main->world.first, World, ADT_RECALC_ANIM);
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 752036c6b9f..9af1d5f52c4 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -734,7 +734,7 @@ static void pchan_deform_mat_add(bPoseChannel *pchan, float weight, float bbonem
 }
 
 static float dist_bone_deform(bPoseChannel *pchan, bPoseChanDeform *pdef_info, float vec[3], DualQuat *dq,
-                              float mat[][3], float *co)
+                              float mat[][3], const float co[3])
 {
 	Bone *bone = pchan->bone;
 	float fac, contrib = 0.0;
@@ -781,7 +781,7 @@ static float dist_bone_deform(bPoseChannel *pchan, bPoseChanDeform *pdef_info, f
 }
 
 static void pchan_bone_deform(bPoseChannel *pchan, bPoseChanDeform *pdef_info, float weight, float vec[3], DualQuat *dq,
-                              float mat[][3], float *co, float *contrib)
+                              float mat[][3], const float co[3], float *contrib)
 {
 	float cop[3], bbonemat[3][3];
 	DualQuat bbonedq;
@@ -986,7 +986,7 @@ void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm, float
 
 			for (j = dvert->totweight; j != 0; j--, dw++) {
 				const int index = dw->def_nr;
-				if (index < defbase_tot && (pchan = defnrToPC[index])) {
+				if (index >= 0 && index < defbase_tot && (pchan = defnrToPC[index])) {
 					float weight = dw->weight;
 					Bone *bone = pchan->bone;
 					pdef_info = pdef_info_array + defnrToPCIndex[index];
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index e6333ed74aa..0def299c24a 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -518,7 +518,7 @@ void BKE_write_undo(bContext *C, const char *name)
 	if ( (U.uiflag & USER_GLOBALUNDO) == 0) return;
 	if (U.undosteps == 0) return;
 	
-	/* remove all undos after (also when curundo==NULL) */
+	/* remove all undos after (also when curundo == NULL) */
 	while (undobase.last != curundo) {
 		uel = undobase.last;
 		BLI_remlink(&undobase, uel);
@@ -564,7 +564,7 @@ void BKE_write_undo(bContext *C, const char *name)
 		BLI_snprintf(numstr, sizeof(numstr), "%d.blend", counter);
 		BLI_make_file_string("/", filepath, BLI_temporary_dir(), numstr);
 	
-		/* success= */ /* UNUSED */ BLO_write_file(CTX_data_main(C), filepath, fileflags, NULL, NULL);
+		/* success = */ /* UNUSED */ BLO_write_file(CTX_data_main(C), filepath, fileflags, NULL, NULL);
 		
 		BLI_strncpy(curundo->str, filepath, sizeof(curundo->str));
 	}
@@ -574,7 +574,7 @@ void BKE_write_undo(bContext *C, const char *name)
 		if (curundo->prev) prevfile = &(curundo->prev->memfile);
 		
 		memused = MEM_get_memory_in_use();
-		/* success= */ /* UNUSED */ BLO_write_file_mem(CTX_data_main(C), prevfile, &curundo->memfile, G.fileflags);
+		/* success = */ /* UNUSED */ BLO_write_file_mem(CTX_data_main(C), prevfile, &curundo->memfile, G.fileflags);
 		curundo->undosize = MEM_get_memory_in_use() - memused;
 	}
 
diff --git a/source/blender/blenkernel/intern/bullet.c b/source/blender/blenkernel/intern/bullet.c
index 9fcb4389c62..7defa7e1be3 100644
--- a/source/blender/blenkernel/intern/bullet.c
+++ b/source/blender/blenkernel/intern/bullet.c
@@ -45,7 +45,7 @@ BulletSoftBody *bsbNew(void)
 {
 	BulletSoftBody *bsb;
 	
-	bsb= MEM_callocN(sizeof(BulletSoftBody), "bulletsoftbody");
+	bsb = MEM_callocN(sizeof(BulletSoftBody), "bulletsoftbody");
 		
 	bsb->flag = OB_BSB_BENDING_CONSTRAINTS | OB_BSB_SHAPE_MATCHING | OB_BSB_AERO_VPOINT;
 	bsb->linStiff = 0.5f;
diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c
index 24583c124e6..752bdab2c00 100644
--- a/source/blender/blenkernel/intern/bvhutils.c
+++ b/source/blender/blenkernel/intern/bvhutils.c
@@ -383,6 +383,9 @@ static void mesh_faces_nearest_point(void *userdata, int index, const float co[3
 			nearest->dist = dist;
 			copy_v3_v3(nearest->co, nearest_tmp);
 			normal_tri_v3(nearest->no, t0, t1, t2);
+
+			if (t1 == vert[face->v3].co)
+				nearest->flags |= BVH_ONQUAD;
 		}
 
 		t1 = t2;
@@ -420,6 +423,9 @@ static void mesh_faces_spherecast(void *userdata, int index, const BVHTreeRay *r
 			madd_v3_v3v3fl(hit->co, ray->origin, ray->direction, dist);
 
 			normal_tri_v3(hit->no, t0, t1, t2);
+
+			if (t1 == vert[face->v3].co)
+				hit->flags |= BVH_ONQUAD;
 		}
 
 		t1 = t2;
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index f6eee44b92c..e5e73061d52 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -927,7 +927,7 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm,
 					//int actualFace = dm->drawObject->triangle_to_mface[i];
 					int actualFace = next_actualFace;
 					MFace *mface = mf + actualFace;
-					/*int drawSmooth= (flag & DM_DRAW_ALWAYS_SMOOTH) ? 1 : (mface->flag & ME_SMOOTH);*/ /* UNUSED */
+					/*int drawSmooth = (flag & DM_DRAW_ALWAYS_SMOOTH) ? 1 : (mface->flag & ME_SMOOTH);*/ /* UNUSED */
 					DMDrawOption draw_option = DM_DRAW_OPTION_NORMAL;
 					int flush = 0;
 
@@ -1208,7 +1208,7 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm,
 						else {
 							/* if the buffer was set, don't use it again.
 							 * prevdraw was assumed true but didnt run so set to false - [#21036] */
-							/* prevdraw= 0; */ /* UNUSED */
+							/* prevdraw = 0; */ /* UNUSED */
 							buffer = NULL;
 						}
 					}
@@ -2594,94 +2594,15 @@ MPoly *CDDM_get_polys(DerivedMesh *dm)
 
 void CDDM_tessfaces_to_faces(DerivedMesh *dm)
 {
-	/*converts mfaces to mpolys/mloops*/
+	/* converts mfaces to mpolys/mloops */
 	CDDerivedMesh *cddm = (CDDerivedMesh *)dm;
-	MFace *mf;
-	MEdge *me;
-	EdgeHash *eh = BLI_edgehash_new();
-	int i, totloop;
 
-	/* ... on second thaughts, better comment this and assume caller knows edge state. */
-#if 0
-	/* ensure we have all the edges we need */
-	CDDM_calc_edges_tessface(dm);
-#else
-#  ifndef NDEBUG
-	{
-		/* ensure we have correct edges on non release builds */
-		i = cddm->dm.numEdgeData;
-		CDDM_calc_edges_tessface(dm);
-		BLI_assert(cddm->dm.numEdgeData == i);
-	}
-#  endif
-#endif
-
-	/*build edge hash*/
-	me = cddm->medge;
-	for (i = 0; i < cddm->dm.numEdgeData; i++, me++) {
-		BLI_edgehash_insert(eh, me->v1, me->v2, SET_INT_IN_POINTER(i));
-	}
-
-	mf = cddm->mface;
-	totloop = 0;
-	for (i = 0; i < cddm->dm.numTessFaceData; i++, mf++) {
-		totloop += mf->v4 ? 4 : 3;
-	}
-
-	CustomData_free(&cddm->dm.polyData, cddm->dm.numPolyData);
-	CustomData_free(&cddm->dm.loopData, cddm->dm.numLoopData);
-	
-	cddm->dm.numLoopData = totloop;
-	cddm->dm.numPolyData = cddm->dm.numTessFaceData;
-
-	if (totloop) {
-		MLoop *ml;
-		MPoly *mp;
-		int l, *polyindex;
-
-		cddm->mloop = MEM_callocN(sizeof(MLoop) * totloop, "cddm->mloop in CDDM_tessfaces_to_faces");
-		cddm->mpoly = MEM_callocN(sizeof(MPoly) * cddm->dm.numTessFaceData, "cddm->mpoly in CDDM_tessfaces_to_faces");
-
-		CustomData_add_layer(&cddm->dm.loopData, CD_MLOOP, CD_ASSIGN, cddm->mloop, totloop);
-		CustomData_add_layer(&cddm->dm.polyData, CD_MPOLY, CD_ASSIGN, cddm->mpoly, cddm->dm.numPolyData);
-		CustomData_merge(&cddm->dm.faceData, &cddm->dm.polyData,
-		                 CD_MASK_ORIGINDEX, CD_DUPLICATE, cddm->dm.numTessFaceData);
-
-		polyindex = CustomData_get_layer(&cddm->dm.faceData, CD_POLYINDEX);
-
-		mf = cddm->mface;
-		mp = cddm->mpoly;
-		ml = cddm->mloop;
-		l = 0;
-		for (i = 0; i < cddm->dm.numTessFaceData; i++, mf++, mp++, polyindex++) {
-			mp->flag = mf->flag;
-			mp->loopstart = l;
-			mp->mat_nr = mf->mat_nr;
-			mp->totloop = mf->v4 ? 4 : 3;
-
-			ml->v = mf->v1;
-			ml->e = GET_INT_FROM_POINTER(BLI_edgehash_lookup(eh, mf->v1, mf->v2));
-			ml++, l++;
-
-			ml->v = mf->v2;
-			ml->e = GET_INT_FROM_POINTER(BLI_edgehash_lookup(eh, mf->v2, mf->v3));
-			ml++, l++;
-
-			ml->v = mf->v3;
-			ml->e = GET_INT_FROM_POINTER(BLI_edgehash_lookup(eh, mf->v3, mf->v4 ? mf->v4 : mf->v1));
-			ml++, l++;
-
-			if (mf->v4) {
-				ml->v = mf->v4;
-				ml->e = GET_INT_FROM_POINTER(BLI_edgehash_lookup(eh, mf->v4, mf->v1));
-				ml++, l++;
-			}
-
-			*polyindex = i;
-		}
-	}
-
-	BLI_edgehash_free(eh, NULL);
+	BKE_mesh_convert_mfaces_to_mpolys_ex(NULL, &cddm->dm.faceData, &cddm->dm.loopData, &cddm->dm.polyData,
+	                                     cddm->dm.numEdgeData, cddm->dm.numTessFaceData,
+	                                     cddm->dm.numLoopData, cddm->dm.numPolyData,
+	                                     cddm->medge, cddm->mface,
+	                                     &cddm->dm.numLoopData, &cddm->dm.numPolyData,
+	                                     &cddm->mloop, &cddm->mpoly);
 }
 
 void CDDM_set_mvert(DerivedMesh *dm, MVert *mvert)
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index e067b7195ce..b681426f8a7 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -143,6 +143,7 @@ void cloth_init(ClothModifierData *clmd )
 	clmd->coll_parms->collision_list = NULL;
 	clmd->coll_parms->self_loop_count = 1.0;
 	clmd->coll_parms->selfepsilon = 0.75;
+	clmd->coll_parms->vgroup_selfcol = 0;
 
 	/* These defaults are copied from softbody.c's
 	 * softbody_calc_forces() function.
@@ -756,10 +757,12 @@ static void cloth_to_object (Object *ob,  ClothModifierData *clmd, float (*verte
 int cloth_uses_vgroup(ClothModifierData *clmd)
 {
 	return (((clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_SCALING ) || 
-		(clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_GOAL )) && 
+		(clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_GOAL ) ||
+		(clmd->coll_parms->flags & CLOTH_COLLSETTINGS_FLAG_SELF)) && 
 		((clmd->sim_parms->vgroup_mass>0) || 
 		(clmd->sim_parms->vgroup_struct>0)||
-		(clmd->sim_parms->vgroup_bend>0)));
+		(clmd->sim_parms->vgroup_bend>0)  ||
+		(clmd->coll_parms->vgroup_selfcol>0)));
 }
 
 /**
@@ -815,6 +818,13 @@ static void cloth_apply_vgroup ( ClothModifierData *clmd, DerivedMesh *dm )
 							verts->bend_stiff = dvert->dw [j].weight;
 						}
 					}
+
+					if (clmd->coll_parms->flags & CLOTH_COLLSETTINGS_FLAG_SELF ) {
+						if ( dvert->dw[j].def_nr == (clmd->coll_parms->vgroup_selfcol-1)) {
+							if( dvert->dw [j].weight > 0.0)
+								verts->flags |= CLOTH_VERT_FLAG_NOSELFCOLL;
+						}
+					}
 					/*
 					// for later
 					if ( dvert->dw[j].def_nr == (clmd->sim_parms->vgroup_weight-1))
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index 7c5cf68affa..44f524304d2 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -302,6 +302,10 @@ static int cloth_collision_response_static ( ClothModifierData *clmd, CollisionM
 
 			// Apply repulse impulse if distance too short
 			// I_r = -min(dt*kd, m(0, 1d/dt - v_n))
+			// DG: this formula ineeds to be changed for this code since we apply impulses/repulses like this:
+			// v += impulse; x_new = x + v; 
+			// We don't use dt!!
+			// DG TODO: Fix usage of dt here!
 			spf = (float)clmd->sim_parms->stepsPerFrame / clmd->sim_parms->timescale;
 
 			d = clmd->coll_parms->epsilon*8.0f/9.0f + epsilon2*8.0f/9.0f - collpair->distance;
@@ -324,7 +328,10 @@ static int cloth_collision_response_static ( ClothModifierData *clmd, CollisionM
 		else
 		{
 			// Apply repulse impulse if distance too short
-			// I_r = -min(dt*kd, m(0, 1d/dt - v_n))
+			// I_r = -min(dt*kd, max(0, 1d/dt - v_n))
+			// DG: this formula ineeds to be changed for this code since we apply impulses/repulses like this:
+			// v += impulse; x_new = x + v; 
+			// We don't use dt!!
 			float spf = (float)clmd->sim_parms->stepsPerFrame / clmd->sim_parms->timescale;
 
 			float d = clmd->coll_parms->epsilon*8.0f/9.0f + epsilon2*8.0f/9.0f - collpair->distance;
@@ -332,7 +339,8 @@ static int cloth_collision_response_static ( ClothModifierData *clmd, CollisionM
 				// stay on the safe side and clamp repulse
 				float repulse = d*1.0f/spf;
 
-				float impulse = repulse / ( 1.0f + w1*w1 + w2*w2 + w3*w3 ); // original 2.0 / 0.25
+				float impulse = repulse / ( 3.0 * ( 1.0f + w1*w1 + w2*w2 + w3*w3 )); // original 2.0 / 0.25 
+
 				VECADDMUL ( i1, collpair->normal,  impulse );
 				VECADDMUL ( i2, collpair->normal,  impulse );
 				VECADDMUL ( i3, collpair->normal,  impulse );
@@ -832,6 +840,10 @@ int cloth_bvh_objcollision(Object *ob, ClothModifierData * clmd, float step, flo
 								continue;
 							}
 						}
+
+						if( ( cloth->verts[i].flags & CLOTH_VERT_FLAG_NOSELFCOLL ) || 
+							( cloth->verts[j].flags & CLOTH_VERT_FLAG_NOSELFCOLL ) )
+							continue;
 	
 						sub_v3_v3v3(temp, verts[i].tx, verts[j].tx);
 	
diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c
index d15f678f1c5..6879ec506f0 100644
--- a/source/blender/blenkernel/intern/colortools.c
+++ b/source/blender/blenkernel/intern/colortools.c
@@ -910,7 +910,7 @@ DO_INLINE int get_bin_float(float f)
 	return bin;
 }
 
-DO_INLINE void save_sample_line(Scopes *scopes, const int idx, const float fx, const float rgb[3], const float ycc[3])
+static void save_sample_line(Scopes *scopes, const int idx, const float fx, const float rgb[3], const float ycc[3])
 {
 	float yuv[3];
 
@@ -946,6 +946,62 @@ DO_INLINE void save_sample_line(Scopes *scopes, const int idx, const float fx, c
 	}
 }
 
+void BKE_histogram_update_sample_line(Histogram *hist, ImBuf *ibuf, const short use_color_management)
+{
+	int i, x, y;
+	float *fp;
+	float rgb[3];
+	unsigned char *cp;
+
+	int x1 = 0.5f + hist->co[0][0] * ibuf->x;
+	int x2 = 0.5f + hist->co[1][0] * ibuf->x;
+	int y1 = 0.5f + hist->co[0][1] * ibuf->y;
+	int y2 = 0.5f + hist->co[1][1] * ibuf->y;
+
+	hist->channels = 3;
+	hist->x_resolution = 256;
+	hist->xmax = 1.0f;
+	hist->ymax = 1.0f;
+
+	if (ibuf->rect == NULL && ibuf->rect_float == NULL) return;
+
+	/* persistent draw */
+	hist->flag |= HISTO_FLAG_SAMPLELINE; /* keep drawing the flag after */
+
+	for (i = 0; i < 256; i++) {
+		x = (int)(0.5f + x1 + (float)i * (x2 - x1) / 255.0f);
+		y = (int)(0.5f + y1 + (float)i * (y2 - y1) / 255.0f);
+
+		if (x < 0 || y < 0 || x >= ibuf->x || y >= ibuf->y) {
+			hist->data_luma[i] = hist->data_r[i] = hist->data_g[i] = hist->data_b[i] = hist->data_a[i] = 0.0f;
+		}
+		else {
+			if (ibuf->rect_float) {
+				fp = (ibuf->rect_float + (ibuf->channels) * (y * ibuf->x + x));
+
+				if (use_color_management)
+					linearrgb_to_srgb_v3_v3(rgb, fp);
+				else
+					copy_v3_v3(rgb, fp);
+
+				hist->data_luma[i]  = rgb_to_luma(rgb);
+				hist->data_r[i]     = rgb[0];
+				hist->data_g[i]     = rgb[1];
+				hist->data_b[i]     = rgb[2];
+				hist->data_a[i]     = fp[3];
+			}
+			else if (ibuf->rect) {
+				cp = (unsigned char *)(ibuf->rect + y * ibuf->x + x);
+				hist->data_luma[i]  = (float)rgb_to_luma_byte(cp) / 255.0f;
+				hist->data_r[i]     = (float)cp[0] / 255.0f;
+				hist->data_g[i]     = (float)cp[1] / 255.0f;
+				hist->data_b[i]     = (float)cp[2] / 255.0f;
+				hist->data_a[i]     = (float)cp[3] / 255.0f;
+			}
+		}
+	}
+}
+
 void scopes_update(Scopes *scopes, ImBuf *ibuf, int use_color_management)
 {
 	int x, y, c;
@@ -953,9 +1009,9 @@ void scopes_update(Scopes *scopes, ImBuf *ibuf, int use_color_management)
 	double div, divl;
 	float *rf = NULL;
 	unsigned char *rc = NULL;
-	unsigned int *bin_r, *bin_g, *bin_b, *bin_lum;
+	unsigned int *bin_lum, *bin_r, *bin_g, *bin_b, *bin_a;
 	int savedlines, saveline;
-	float rgb[3], ycc[3], luma;
+	float rgba[4], ycc[3], luma;
 	int ycc_mode = -1;
 	const short is_float = (ibuf->rect_float != NULL);
 
@@ -987,11 +1043,12 @@ void scopes_update(Scopes *scopes, ImBuf *ibuf, int use_color_management)
 			break;
 	}
 
-	/* temp table to count pix value for histo */
-	bin_r = MEM_callocN(256 * sizeof(unsigned int), "temp historgram bins");
-	bin_g = MEM_callocN(256 * sizeof(unsigned int), "temp historgram bins");
-	bin_b = MEM_callocN(256 * sizeof(unsigned int), "temp historgram bins");
-	bin_lum = MEM_callocN(256 * sizeof(unsigned int), "temp historgram bins");
+	/* temp table to count pix value for histogram */
+	bin_r     = MEM_callocN(256 * sizeof(unsigned int), "temp historgram bins");
+	bin_g     = MEM_callocN(256 * sizeof(unsigned int), "temp historgram bins");
+	bin_b     = MEM_callocN(256 * sizeof(unsigned int), "temp historgram bins");
+	bin_a = MEM_callocN(256 * sizeof(unsigned int), "temp historgram bins");
+	bin_lum   = MEM_callocN(256 * sizeof(unsigned int), "temp historgram bins");
 
 	/* convert to number of lines with logarithmic scale */
 	scopes->sample_lines = (scopes->accuracy * 0.01f) * (scopes->accuracy * 0.01f) * ibuf->y;
@@ -1038,27 +1095,28 @@ void scopes_update(Scopes *scopes, ImBuf *ibuf, int use_color_management)
 
 			if (is_float) {
 				if (use_color_management)
-					linearrgb_to_srgb_v3_v3(rgb, rf);
+					linearrgb_to_srgb_v3_v3(rgba, rf);
 				else
-					copy_v3_v3(rgb, rf);
+					copy_v3_v3(rgba, rf);
+				rgba[3] = rf[3];
 			}
 			else {
-				for (c = 0; c < 3; c++)
-					rgb[c] = rc[c] * INV_255;
+				for (c = 0; c < 4; c++)
+					rgba[c] = rc[c] * INV_255;
 			}
 
 			/* we still need luma for histogram */
-			luma = rgb_to_luma(rgb);
+			luma = rgb_to_luma(rgba);
 
 			/* check for min max */
 			if (ycc_mode == -1) {
 				for (c = 0; c < 3; c++) {
-					if (rgb[c] < scopes->minmax[c][0]) scopes->minmax[c][0] = rgb[c];
-					if (rgb[c] > scopes->minmax[c][1]) scopes->minmax[c][1] = rgb[c];
+					if (rgba[c] < scopes->minmax[c][0]) scopes->minmax[c][0] = rgba[c];
+					if (rgba[c] > scopes->minmax[c][1]) scopes->minmax[c][1] = rgba[c];
 				}
 			}
 			else {
-				rgb_to_ycc(rgb[0], rgb[1], rgb[2], &ycc[0], &ycc[1], &ycc[2], ycc_mode);
+				rgb_to_ycc(rgba[0], rgba[1], rgba[2], &ycc[0], &ycc[1], &ycc[2], ycc_mode);
 				for (c = 0; c < 3; c++) {
 					ycc[c] *= INV_255;
 					if (ycc[c] < scopes->minmax[c][0]) scopes->minmax[c][0] = ycc[c];
@@ -1066,16 +1124,17 @@ void scopes_update(Scopes *scopes, ImBuf *ibuf, int use_color_management)
 				}
 			}
 			/* increment count for histo*/
-			bin_r[get_bin_float(rgb[0])] += 1;
-			bin_g[get_bin_float(rgb[1])] += 1;
-			bin_b[get_bin_float(rgb[2])] += 1;
 			bin_lum[get_bin_float(luma)] += 1;
+			bin_r[get_bin_float(rgba[0])] += 1;
+			bin_g[get_bin_float(rgba[1])] += 1;
+			bin_b[get_bin_float(rgba[2])] += 1;
+			bin_a[get_bin_float(rgba[3])] += 1;
 
 			/* save sample if needed */
 			if (saveline) {
 				const float fx = (float)x / (float)ibuf->x;
 				const int idx = 2 * (ibuf->x * savedlines + x);
-				save_sample_line(scopes, idx, fx, rgb, ycc);
+				save_sample_line(scopes, idx, fx, rgba, ycc);
 			}
 
 			rf += ibuf->channels;
@@ -1089,27 +1148,26 @@ void scopes_update(Scopes *scopes, ImBuf *ibuf, int use_color_management)
 	n = 0;
 	nl = 0;
 	for (x = 0; x < 256; x++) {
-		if (bin_r[x] > n)
-			n = bin_r[x];
-		if (bin_g[x] > n)
-			n = bin_g[x];
-		if (bin_b[x] > n)
-			n = bin_b[x];
-		if (bin_lum[x] > nl)
-			nl = bin_lum[x];
+		if (bin_lum[x] > nl) nl = bin_lum[x];
+		if (bin_r[x]   > n) n = bin_r[x];
+		if (bin_g[x]   > n) n = bin_g[x];
+		if (bin_b[x]   > n) n = bin_b[x];
+		if (bin_a[x]   > n) n = bin_a[x];
 	}
 	div = 1.0 / (double)n;
 	divl = 1.0 / (double)nl;
 	for (x = 0; x < 256; x++) {
+		scopes->hist.data_luma[x] = bin_lum[x] * divl;
 		scopes->hist.data_r[x] = bin_r[x] * div;
 		scopes->hist.data_g[x] = bin_g[x] * div;
 		scopes->hist.data_b[x] = bin_b[x] * div;
-		scopes->hist.data_luma[x] = bin_lum[x] * divl;
+		scopes->hist.data_a[x] = bin_a[x] * div;
 	}
+	MEM_freeN(bin_lum);
 	MEM_freeN(bin_r);
 	MEM_freeN(bin_g);
 	MEM_freeN(bin_b);
-	MEM_freeN(bin_lum);
+	MEM_freeN(bin_a);
 
 	scopes->ok = 1;
 }
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index da9350cc7b9..c12e740958c 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -701,7 +701,7 @@ static void default_get_tarmat(bConstraint *con, bConstraintOb *UNUSED(cob), bCo
 		} \
 		 \
 		BLI_addtail(list, ct); \
-	}
+	} (void)0
 	
 /* This following macro should be used for all standard single-target *_get_tars functions 
  * to save typing and reduce maintenance woes. It does not do the subtarget related operations
@@ -720,7 +720,7 @@ static void default_get_tarmat(bConstraint *con, bConstraintOb *UNUSED(cob), bCo
 		if (ct->tar) ct->type = CONSTRAINT_OBTYPE_OBJECT; \
 		 \
 		BLI_addtail(list, ct); \
-	}
+	} (void)0
 
 /* This following macro should be used for all standard single-target *_flush_tars functions
  * to save typing and reduce maintenance woes.
@@ -741,7 +741,7 @@ static void default_get_tarmat(bConstraint *con, bConstraintOb *UNUSED(cob), bCo
 			BLI_freelinkN(list, ct); \
 			ct = ctn; \
 		} \
-	}
+	} (void)0
 	
 /* This following macro should be used for all standard single-target *_flush_tars functions
  * to save typing and reduce maintenance woes. It does not do the subtarget related operations.
@@ -761,7 +761,7 @@ static void default_get_tarmat(bConstraint *con, bConstraintOb *UNUSED(cob), bCo
 			BLI_freelinkN(list, ct); \
 			ct = ctn; \
 		} \
-	}
+	} (void)0
  
 /* --------- ChildOf Constraint ------------ */
 
@@ -790,7 +790,7 @@ static int childof_get_tars(bConstraint *con, ListBase *list)
 		bConstraintTarget *ct;
 		
 		/* standard target-getting macro for single-target constraints */
-		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list)
+		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list);
 		
 		return 1;
 	}
@@ -805,7 +805,7 @@ static void childof_flush_tars(bConstraint *con, ListBase *list, short nocopy)
 		bConstraintTarget *ct = list->first;
 		
 		/* the following macro is used for all standard single-target constraints */
-		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy)
+		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy);
 	}
 }
 
@@ -822,12 +822,12 @@ static void childof_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *tar
 		if (data->flag == CHILDOF_ALL) {
 			
 			/* multiply target (parent matrix) by offset (parent inverse) to get 
-			 * the effect of the parent that will be exherted on the owner
+			 * the effect of the parent that will be exerted on the owner
 			 */
 			mult_m4_m4m4(parmat, ct->matrix, data->invmat);
 			
 			/* now multiply the parent matrix by the owner matrix to get the 
-			 * the effect of this constraint (i.e.  owner is 'parented' to parent)
+			 * the effect of this constraint (i.e. owner is 'parented' to parent)
 			 */
 			mult_m4_m4m4(cob->matrix, parmat, cob->matrix);
 		}
@@ -864,7 +864,7 @@ static void childof_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *tar
 			loc_eulO_size_to_mat4(invmat, loco, eulo, sizo, cob->rotOrder);
 			
 			/* multiply target (parent matrix) by offset (parent inverse) to get 
-			 * the effect of the parent that will be exherted on the owner
+			 * the effect of the parent that will be exerted on the owner
 			 */
 			mult_m4_m4m4(parmat, ct->matrix, invmat);
 			
@@ -925,7 +925,7 @@ static int trackto_get_tars(bConstraint *con, ListBase *list)
 		bConstraintTarget *ct;
 		
 		/* standard target-getting macro for single-target constraints */
-		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list)
+		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list);
 		
 		return 1;
 	}
@@ -940,7 +940,7 @@ static void trackto_flush_tars(bConstraint *con, ListBase *list, short nocopy)
 		bConstraintTarget *ct = list->first;
 		
 		/* the following macro is used for all standard single-target constraints */
-		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy)
+		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy);
 	}
 }
 
@@ -1108,8 +1108,8 @@ static int kinematic_get_tars(bConstraint *con, ListBase *list)
 		bConstraintTarget *ct;
 		
 		/* standard target-getting macro for single-target constraints is used twice here */
-		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list)
-		SINGLETARGET_GET_TARS(con, data->poletar, data->polesubtarget, ct, list)
+		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list);
+		SINGLETARGET_GET_TARS(con, data->poletar, data->polesubtarget, ct, list);
 		
 		return 2;
 	}
@@ -1124,8 +1124,8 @@ static void kinematic_flush_tars(bConstraint *con, ListBase *list, short nocopy)
 		bConstraintTarget *ct = list->first;
 		
 		/* the following macro is used for all standard single-target constraints */
-		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy)
-		SINGLETARGET_FLUSH_TARS(con, data->poletar, data->polesubtarget, ct, list, nocopy)
+		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy);
+		SINGLETARGET_FLUSH_TARS(con, data->poletar, data->polesubtarget, ct, list, nocopy);
 	}
 }
 
@@ -1197,7 +1197,7 @@ static int followpath_get_tars(bConstraint *con, ListBase *list)
 		bConstraintTarget *ct;
 		
 		/* standard target-getting macro for single-target constraints without subtargets */
-		SINGLETARGETNS_GET_TARS(con, data->tar, ct, list)
+		SINGLETARGETNS_GET_TARS(con, data->tar, ct, list);
 		
 		return 1;
 	}
@@ -1212,7 +1212,7 @@ static void followpath_flush_tars(bConstraint *con, ListBase *list, short nocopy
 		bConstraintTarget *ct = list->first;
 		
 		/* the following macro is used for all standard single-target constraints */
-		SINGLETARGETNS_FLUSH_TARS(con, data->tar, ct, list, nocopy)
+		SINGLETARGETNS_FLUSH_TARS(con, data->tar, ct, list, nocopy);
 	}
 }
 
@@ -1460,7 +1460,7 @@ static bConstraintTypeInfo CTI_ROTLIMIT = {
 	rotlimit_evaluate /* evaluate */
 };
 
-/* --------- Limit Scaling --------- */
+/* --------- Limit Scale --------- */
 
 
 static void sizelimit_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *UNUSED(targets))
@@ -1507,7 +1507,7 @@ static void sizelimit_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *U
 static bConstraintTypeInfo CTI_SIZELIMIT = {
 	CONSTRAINT_TYPE_SIZELIMIT, /* type */
 	sizeof(bSizeLimitConstraint), /* size */
-	"Limit Scaling", /* name */
+	"Limit Scale", /* name */
 	"bSizeLimitConstraint", /* struct name */
 	NULL, /* free data */
 	NULL, /* id looper */
@@ -1543,7 +1543,7 @@ static int loclike_get_tars(bConstraint *con, ListBase *list)
 		bConstraintTarget *ct;
 		
 		/* standard target-getting macro for single-target constraints */
-		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list)
+		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list);
 		
 		return 1;
 	}
@@ -1558,7 +1558,7 @@ static void loclike_flush_tars(bConstraint *con, ListBase *list, short nocopy)
 		bConstraintTarget *ct = list->first;
 		
 		/* the following macro is used for all standard single-target constraints */
-		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy)
+		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy);
 	}
 }
 
@@ -1620,7 +1620,7 @@ static void rotlike_new_data(void *cdata)
 
 static void rotlike_id_looper(bConstraint *con, ConstraintIDFunc func, void *userdata)
 {
-	bChildOfConstraint *data = con->data;
+	bRotateLikeConstraint *data = con->data;
 	
 	/* target only */
 	func(con, (ID **)&data->tar, FALSE, userdata);
@@ -1633,7 +1633,7 @@ static int rotlike_get_tars(bConstraint *con, ListBase *list)
 		bConstraintTarget *ct;
 		
 		/* standard target-getting macro for single-target constraints */
-		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list)
+		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list);
 		
 		return 1;
 	}
@@ -1648,7 +1648,7 @@ static void rotlike_flush_tars(bConstraint *con, ListBase *list, short nocopy)
 		bConstraintTarget *ct = list->first;
 		
 		/* the following macro is used for all standard single-target constraints */
-		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy)
+		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy);
 	}
 }
 
@@ -1721,7 +1721,7 @@ static bConstraintTypeInfo CTI_ROTLIKE = {
 	rotlike_evaluate /* evaluate */
 };
 
-/* ---------- Copy Scaling ---------- */
+/* ---------- Copy Scale ---------- */
 
 static void sizelike_new_data(void *cdata)
 {
@@ -1745,7 +1745,7 @@ static int sizelike_get_tars(bConstraint *con, ListBase *list)
 		bConstraintTarget *ct;
 		
 		/* standard target-getting macro for single-target constraints */
-		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list)
+		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list);
 		
 		return 1;
 	}
@@ -1760,7 +1760,7 @@ static void sizelike_flush_tars(bConstraint *con, ListBase *list, short nocopy)
 		bConstraintTarget *ct = list->first;
 		
 		/* the following macro is used for all standard single-target constraints */
-		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy)
+		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy);
 	}
 }
 
@@ -1834,7 +1834,7 @@ static int translike_get_tars(bConstraint *con, ListBase *list)
 		bConstraintTarget *ct;
 		
 		/* standard target-getting macro for single-target constraints */
-		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list)
+		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list);
 		
 		return 1;
 	}
@@ -1849,7 +1849,7 @@ static void translike_flush_tars(bConstraint *con, ListBase *list, short nocopy)
 		bConstraintTarget *ct = list->first;
 		
 		/* the following macro is used for all standard single-target constraints */
-		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy)
+		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy);
 	}
 }
 
@@ -2093,7 +2093,7 @@ static int actcon_get_tars(bConstraint *con, ListBase *list)
 		bConstraintTarget *ct;
 		
 		/* standard target-getting macro for single-target constraints */
-		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list)
+		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list);
 		
 		return 1;
 	}
@@ -2108,7 +2108,7 @@ static void actcon_flush_tars(bConstraint *con, ListBase *list, short nocopy)
 		bConstraintTarget *ct = list->first;
 		
 		/* the following macro is used for all standard single-target constraints */
-		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy)
+		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy);
 	}
 }
 
@@ -2159,7 +2159,15 @@ static void actcon_get_tarmat(bConstraint *con, bConstraintOb *cob, bConstraintT
 			printf("do Action Constraint %s - Ob %s Pchan %s\n", con->name, cob->ob->id.name + 2, (cob->pchan) ? cob->pchan->name : NULL);
 		
 		/* Get the appropriate information from the action */
-		if (cob->type == CONSTRAINT_OBTYPE_BONE) {
+		if (cob->type == CONSTRAINT_OBTYPE_OBJECT || (data->flag & ACTCON_BONE_USE_OBJECT_ACTION)) {
+			Object workob;
+			
+			/* evaluate using workob */
+			// FIXME: we don't have any consistent standards on limiting effects on object...
+			what_does_obaction(cob->ob, &workob, NULL, data->act, NULL, t);
+			BKE_object_to_mat4(&workob, ct->matrix);
+		}
+		else if (cob->type == CONSTRAINT_OBTYPE_BONE) {
 			Object workob;
 			bPose *pose;
 			bPoseChannel *pchan, *tchan;
@@ -2185,14 +2193,6 @@ static void actcon_get_tarmat(bConstraint *con, bConstraintOb *cob, bConstraintT
 			/* Clean up */
 			BKE_pose_free(pose);
 		}
-		else if (cob->type == CONSTRAINT_OBTYPE_OBJECT) {
-			Object workob;
-			
-			/* evaluate using workob */
-			// FIXME: we don't have any consistent standards on limiting effects on object...
-			what_does_obaction(cob->ob, &workob, NULL, data->act, NULL, t);
-			BKE_object_to_mat4(&workob, ct->matrix);
-		}
 		else {
 			/* behavior undefined... */
 			puts("Error: unknown owner type for Action Constraint");
@@ -2255,7 +2255,7 @@ static int locktrack_get_tars(bConstraint *con, ListBase *list)
 		bConstraintTarget *ct;
 		
 		/* the following macro is used for all standard single-target constraints */
-		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list)
+		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list);
 		
 		return 1;
 	}
@@ -2270,7 +2270,7 @@ static void locktrack_flush_tars(bConstraint *con, ListBase *list, short nocopy)
 		bConstraintTarget *ct = list->first;
 		
 		/* the following macro is used for all standard single-target constraints */
-		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy)
+		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy);
 	}
 }
 
@@ -2565,7 +2565,7 @@ static int distlimit_get_tars(bConstraint *con, ListBase *list)
 		bConstraintTarget *ct;
 		
 		/* standard target-getting macro for single-target constraints */
-		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list)
+		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list);
 		
 		return 1;
 	}
@@ -2580,7 +2580,7 @@ static void distlimit_flush_tars(bConstraint *con, ListBase *list, short nocopy)
 		bConstraintTarget *ct = list->first;
 		
 		/* the following macro is used for all standard single-target constraints */
-		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy)
+		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy);
 	}
 }
 
@@ -2692,7 +2692,7 @@ static int stretchto_get_tars(bConstraint *con, ListBase *list)
 		bConstraintTarget *ct;
 		
 		/* standard target-getting macro for single-target constraints */
-		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list)
+		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list);
 		
 		return 1;
 	}
@@ -2707,7 +2707,7 @@ static void stretchto_flush_tars(bConstraint *con, ListBase *list, short nocopy)
 		bConstraintTarget *ct = list->first;
 		
 		/* the following macro is used for all standard single-target constraints */
-		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy)
+		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy);
 	}
 }
 
@@ -2866,7 +2866,7 @@ static int minmax_get_tars(bConstraint *con, ListBase *list)
 		bConstraintTarget *ct;
 		
 		/* standard target-getting macro for single-target constraints */
-		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list)
+		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list);
 		
 		return 1;
 	}
@@ -2881,7 +2881,7 @@ static void minmax_flush_tars(bConstraint *con, ListBase *list, short nocopy)
 		bConstraintTarget *ct = list->first;
 		
 		/* the following macro is used for all standard single-target constraints */
-		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy)
+		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy);
 	}
 }
 
@@ -3009,7 +3009,7 @@ static int rbj_get_tars(bConstraint *con, ListBase *list)
 		bConstraintTarget *ct;
 		
 		/* standard target-getting macro for single-target constraints without subtargets */
-		SINGLETARGETNS_GET_TARS(con, data->tar, ct, list)
+		SINGLETARGETNS_GET_TARS(con, data->tar, ct, list);
 		
 		return 1;
 	}
@@ -3024,7 +3024,7 @@ static void rbj_flush_tars(bConstraint *con, ListBase *list, short nocopy)
 		bConstraintTarget *ct = list->first;
 		
 		/* the following macro is used for all standard single-target constraints */
-		SINGLETARGETNS_FLUSH_TARS(con, data->tar, ct, list, nocopy)
+		SINGLETARGETNS_FLUSH_TARS(con, data->tar, ct, list, nocopy);
 	}
 }
 
@@ -3060,7 +3060,7 @@ static int clampto_get_tars(bConstraint *con, ListBase *list)
 		bConstraintTarget *ct;
 		
 		/* standard target-getting macro for single-target constraints without subtargets */
-		SINGLETARGETNS_GET_TARS(con, data->tar, ct, list)
+		SINGLETARGETNS_GET_TARS(con, data->tar, ct, list);
 		
 		return 1;
 	}
@@ -3075,7 +3075,7 @@ static void clampto_flush_tars(bConstraint *con, ListBase *list, short nocopy)
 		bConstraintTarget *ct = list->first;
 		
 		/* the following macro is used for all standard single-target constraints */
-		SINGLETARGETNS_FLUSH_TARS(con, data->tar, ct, list, nocopy)
+		SINGLETARGETNS_FLUSH_TARS(con, data->tar, ct, list, nocopy);
 	}
 }
 
@@ -3244,7 +3244,7 @@ static int transform_get_tars(bConstraint *con, ListBase *list)
 		bConstraintTarget *ct;
 		
 		/* standard target-getting macro for single-target constraints */
-		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list)
+		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list);
 		
 		return 1;
 	}
@@ -3259,7 +3259,7 @@ static void transform_flush_tars(bConstraint *con, ListBase *list, short nocopy)
 		bConstraintTarget *ct = list->first;
 		
 		/* the following macro is used for all standard single-target constraints */
-		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy)
+		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy);
 	}
 }
 
@@ -3278,6 +3278,15 @@ static void transform_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
 		switch (data->from) {
 			case 2: /* scale */
 				mat4_to_size(dvec, ct->matrix);
+				
+				if (is_negative_m4(ct->matrix)) {
+					/* Bugfix [#27886] 
+					 * We can't be sure which axis/axes are negative, though we know that something is negative.
+					 * Assume we don't care about negativity of separate axes. <--- This is a limitation that
+					 * riggers will have to live with for now.
+					 */
+					negate_v3(dvec);
+				}
 				break;
 			case 1: /* rotation (convert to degrees first) */
 				mat4_to_eulO(dvec, cob->rotOrder, ct->matrix);
@@ -3352,7 +3361,7 @@ static void transform_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
 static bConstraintTypeInfo CTI_TRANSFORM = {
 	CONSTRAINT_TYPE_TRANSFORM, /* type */
 	sizeof(bTransformConstraint), /* size */
-	"Transform", /* name */
+	"Transformation", /* name */
 	"bTransformConstraint", /* struct name */
 	NULL, /* free data */
 	transform_id_looper, /* id looper */
@@ -3380,7 +3389,7 @@ static int shrinkwrap_get_tars(bConstraint *con, ListBase *list)
 		bShrinkwrapConstraint *data = con->data;
 		bConstraintTarget *ct;
 		
-		SINGLETARGETNS_GET_TARS(con, data->target, ct, list)
+		SINGLETARGETNS_GET_TARS(con, data->target, ct, list);
 		
 		return 1;
 	}
@@ -3395,7 +3404,7 @@ static void shrinkwrap_flush_tars(bConstraint *con, ListBase *list, short nocopy
 		bShrinkwrapConstraint *data = con->data;
 		bConstraintTarget *ct = list->first;
 		
-		SINGLETARGETNS_FLUSH_TARS(con, data->target, ct, list, nocopy)
+		SINGLETARGETNS_FLUSH_TARS(con, data->target, ct, list, nocopy);
 	}
 }
 
@@ -3545,7 +3554,7 @@ static int damptrack_get_tars(bConstraint *con, ListBase *list)
 		bConstraintTarget *ct;
 		
 		/* the following macro is used for all standard single-target constraints */
-		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list)
+		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list);
 		
 		return 1;
 	}
@@ -3560,7 +3569,7 @@ static void damptrack_flush_tars(bConstraint *con, ListBase *list, short nocopy)
 		bConstraintTarget *ct = list->first;
 		
 		/* the following macro is used for all standard single-target constraints */
-		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy)
+		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy);
 	}
 }
 
@@ -3690,7 +3699,7 @@ static int splineik_get_tars(bConstraint *con, ListBase *list)
 		bConstraintTarget *ct;
 		
 		/* standard target-getting macro for single-target constraints without subtargets */
-		SINGLETARGETNS_GET_TARS(con, data->tar, ct, list)
+		SINGLETARGETNS_GET_TARS(con, data->tar, ct, list);
 		
 		return 1;
 	}
@@ -3705,7 +3714,7 @@ static void splineik_flush_tars(bConstraint *con, ListBase *list, short nocopy)
 		bConstraintTarget *ct = list->first;
 		
 		/* the following macro is used for all standard single-target constraints */
-		SINGLETARGETNS_FLUSH_TARS(con, data->tar, ct, list, nocopy)
+		SINGLETARGETNS_FLUSH_TARS(con, data->tar, ct, list, nocopy);
 	}
 }
 
@@ -3762,7 +3771,7 @@ static int pivotcon_get_tars(bConstraint *con, ListBase *list)
 		bConstraintTarget *ct;
 		
 		/* standard target-getting macro for single-target constraints */
-		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list)
+		SINGLETARGET_GET_TARS(con, data->tar, data->subtarget, ct, list);
 		
 		return 1;
 	}
@@ -3777,7 +3786,7 @@ static void pivotcon_flush_tars(bConstraint *con, ListBase *list, short nocopy)
 		bConstraintTarget *ct = list->first;
 		
 		/* the following macro is used for all standard single-target constraints */
-		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy)
+		SINGLETARGET_FLUSH_TARS(con, data->tar, data->subtarget, ct, list, nocopy);
 	}
 }
 
@@ -3897,6 +3906,7 @@ static void followtrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase
 	MovieTrackingTrack *track;
 	MovieTrackingObject *tracking_object;
 	Object *camob = data->camera ? data->camera : scene->camera;
+	int framenr;
 
 	if (data->flag & FOLLOWTRACK_ACTIVECLIP)
 		clip = scene->clip;
@@ -3907,18 +3917,20 @@ static void followtrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase
 	tracking = &clip->tracking;
 
 	if (data->object[0])
-		tracking_object = BKE_tracking_named_object(tracking, data->object);
+		tracking_object = BKE_tracking_object_get_named(tracking, data->object);
 	else
-		tracking_object = BKE_tracking_get_camera_object(tracking);
+		tracking_object = BKE_tracking_object_get_camera(tracking);
 
 	if (!tracking_object)
 		return;
 
-	track = BKE_tracking_named_track(tracking, tracking_object, data->track);
+	track = BKE_tracking_track_get_named(tracking, tracking_object, data->track);
 
 	if (!track)
 		return;
 
+	framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, scene->r.cfra);
+
 	if (data->flag & FOLLOWTRACK_USE_3D_POSITION) {
 		if (track->flag & TRACK_HAS_BUNDLE) {
 			float obmat[4][4], mat[4][4];
@@ -3930,14 +3942,14 @@ static void followtrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase
 
 				copy_m4_m4(mat, camob->obmat);
 
-				BKE_tracking_get_interpolated_camera(tracking, tracking_object, scene->r.cfra, imat);
+				BKE_tracking_camera_get_reconstructed_interpolate(tracking, tracking_object, framenr, imat);
 				invert_m4(imat);
 
 				mul_serie_m4(cob->matrix, obmat, mat, imat, NULL, NULL, NULL, NULL, NULL);
 				translate_m4(cob->matrix, track->bundle_pos[0], track->bundle_pos[1], track->bundle_pos[2]);
 			}
 			else {
-				BKE_get_tracking_mat(cob->scene, camob, mat);
+				BKE_tracking_get_camera_object_matrix(cob->scene, camob, mat);
 
 				mult_m4_m4m4(cob->matrix, obmat, mat);
 				translate_m4(cob->matrix, track->bundle_pos[0], track->bundle_pos[1], track->bundle_pos[2]);
@@ -3969,7 +3981,7 @@ static void followtrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase
 			CameraParams params;
 			float pos[2], rmat[4][4];
 
-			marker = BKE_tracking_get_marker(track, scene->r.cfra);
+			marker = BKE_tracking_marker_get(track, framenr);
 
 			add_v2_v2v2(pos, marker->pos, track->offset);
 
@@ -4091,9 +4103,10 @@ static void camerasolver_evaluate(bConstraint *con, bConstraintOb *cob, ListBase
 	if (clip) {
 		float mat[4][4], obmat[4][4];
 		MovieTracking *tracking = &clip->tracking;
-		MovieTrackingObject *object = BKE_tracking_get_camera_object(tracking);
+		MovieTrackingObject *object = BKE_tracking_object_get_camera(tracking);
+		int framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, scene->r.cfra);
 
-		BKE_tracking_get_interpolated_camera(tracking, object, scene->r.cfra, mat);
+		BKE_tracking_camera_get_reconstructed_interpolate(tracking, object, framenr, mat);
 
 		copy_m4_m4(obmat, cob->matrix);
 
@@ -4152,14 +4165,15 @@ static void objectsolver_evaluate(bConstraint *con, bConstraintOb *cob, ListBase
 		MovieTracking *tracking = &clip->tracking;
 		MovieTrackingObject *object;
 
-		object = BKE_tracking_named_object(tracking, data->object);
+		object = BKE_tracking_object_get_named(tracking, data->object);
 
 		if (object) {
 			float mat[4][4], obmat[4][4], imat[4][4], cammat[4][4], camimat[4][4], parmat[4][4];
+			int framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, scene->r.cfra);
 
 			BKE_object_where_is_calc_mat4(scene, camob, cammat);
 
-			BKE_tracking_get_interpolated_camera(tracking, object, scene->r.cfra, mat);
+			BKE_tracking_camera_get_reconstructed_interpolate(tracking, object, framenr, mat);
 
 			invert_m4_m4(camimat, cammat);
 			mult_m4_m4m4(parmat, cammat, data->invmat);
@@ -4208,10 +4222,10 @@ static void constraints_init_typeinfo(void)
 	constraintsTypeInfo[4] =  &CTI_FOLLOWPATH;       /* Follow-Path Constraint */
 	constraintsTypeInfo[5] =  &CTI_ROTLIMIT;         /* Limit Rotation Constraint */
 	constraintsTypeInfo[6] =  &CTI_LOCLIMIT;         /* Limit Location Constraint */
-	constraintsTypeInfo[7] =  &CTI_SIZELIMIT;        /* Limit Scaling Constraint */
+	constraintsTypeInfo[7] =  &CTI_SIZELIMIT;        /* Limit Scale Constraint */
 	constraintsTypeInfo[8] =  &CTI_ROTLIKE;          /* Copy Rotation Constraint */
 	constraintsTypeInfo[9] =  &CTI_LOCLIKE;          /* Copy Location Constraint */
-	constraintsTypeInfo[10] = &CTI_SIZELIKE;         /* Copy Scaling Constraint */
+	constraintsTypeInfo[10] = &CTI_SIZELIKE;         /* Copy Scale Constraint */
 	constraintsTypeInfo[11] = &CTI_PYTHON;           /* Python/Script Constraint */
 	constraintsTypeInfo[12] = &CTI_ACTION;           /* Action Constraint */
 	constraintsTypeInfo[13] = &CTI_LOCKTRACK;        /* Locked-Track Constraint */
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index 4cdb4e1b66e..ff2dd27e0c9 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -267,7 +267,7 @@ static int ctx_data_get(bContext *C, const char *member, bContextDataResult *res
 	 * loops requesting data from ourselfs in a context callback */
 
 	/* Ok, this looks evil...
-	 * if (ret) done= -(-ret | -done);
+	 * if (ret) done = -(-ret | -done);
 	 *
 	 * Values in order of importance
 	 * (0, -1, 1) - Where 1 is highest priority
@@ -973,6 +973,11 @@ struct MovieClip *CTX_data_edit_movieclip(const bContext *C)
 	return ctx_data_pointer_get(C, "edit_movieclip");
 }
 
+struct Mask *CTX_data_edit_mask(const bContext *C)
+{
+	return ctx_data_pointer_get(C, "edit_mask");
+}
+
 struct EditBone *CTX_data_active_bone(const bContext *C)
 {
 	return ctx_data_pointer_get(C, "active_bone");
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index ce62b9c10dc..623d4b8a931 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -1002,9 +1002,7 @@ void BKE_nurb_makeFaces(Nurb *nu, float *coord_array, int rowstride, int resolu,
 						bp++;
 
 					if (*fp != 0.0f) {
-						in[0] += (*fp) * bp->vec[0];
-						in[1] += (*fp) * bp->vec[1];
-						in[2] += (*fp) * bp->vec[2];
+						madd_v3_v3fl(in, bp->vec, *fp);
 					}
 				}
 			}
@@ -1106,9 +1104,7 @@ void BKE_nurb_makeCurve(Nurb *nu, float *coord_array, float *tilt_array, float *
 				bp++;
 
 			if (*fp != 0.0f) {
-				coord_fp[0] += (*fp) * bp->vec[0];
-				coord_fp[1] += (*fp) * bp->vec[1];
-				coord_fp[2] += (*fp) * bp->vec[2];
+				madd_v3_v3fl(coord_fp, bp->vec, *fp);
 
 				if (tilt_fp)
 					(*tilt_fp) += (*fp) * bp->alfa;
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 4e7653e2473..f551b2d18a4 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1193,6 +1193,18 @@ static const char *layerType_getName(int type)
 	return LAYERTYPENAMES[type];
 }
 
+void customData_mask_layers__print(CustomDataMask mask)
+{
+	int i;
+
+	printf("mask=0x%lx:\n", (long unsigned int)mask);
+	for (i = 0; i < CD_NUMTYPES; i++) {
+		if (mask & CD_TYPE_AS_MASK(i)) {
+			printf("  %s\n", layerType_getName(i));
+		}
+	}
+}
+
 /********************* CustomData functions *********************/
 static void customData_update_offsets(CustomData *data);
 
@@ -2207,6 +2219,48 @@ void CustomData_bmesh_update_active_layers(CustomData *fdata, CustomData *pdata,
 	}
 }
 
+/* update active indices for active/render/clone/stencil custom data layers
+ * based on indices from fdata layers
+ * used by do_versions in readfile.c when creating pdata and ldata for pre-bmesh
+ * meshes and needed to preserve active/render/clone/stencil flags set in pre-bmesh files
+ */
+void CustomData_bmesh_do_versions_update_active_layers(CustomData *fdata, CustomData *pdata, CustomData *ldata)
+{
+	int act;
+
+	if (CustomData_has_layer(fdata, CD_MTFACE)) {
+		act = CustomData_get_active_layer(fdata, CD_MTFACE);
+		CustomData_set_layer_active(pdata, CD_MTEXPOLY, act);
+		CustomData_set_layer_active(ldata, CD_MLOOPUV, act);
+
+		act = CustomData_get_render_layer(fdata, CD_MTFACE);
+		CustomData_set_layer_render(pdata, CD_MTEXPOLY, act);
+		CustomData_set_layer_render(ldata, CD_MLOOPUV, act);
+
+		act = CustomData_get_clone_layer(fdata, CD_MTFACE);
+		CustomData_set_layer_clone(pdata, CD_MTEXPOLY, act);
+		CustomData_set_layer_clone(ldata, CD_MLOOPUV, act);
+
+		act = CustomData_get_stencil_layer(fdata, CD_MTFACE);
+		CustomData_set_layer_stencil(pdata, CD_MTEXPOLY, act);
+		CustomData_set_layer_stencil(ldata, CD_MLOOPUV, act);
+	}
+
+	if (CustomData_has_layer(fdata, CD_MCOL)) {
+		act = CustomData_get_active_layer(fdata, CD_MCOL);
+		CustomData_set_layer_active(ldata, CD_MLOOPCOL, act);
+
+		act = CustomData_get_render_layer(fdata, CD_MCOL);
+		CustomData_set_layer_render(ldata, CD_MLOOPCOL, act);
+
+		act = CustomData_get_clone_layer(fdata, CD_MCOL);
+		CustomData_set_layer_clone(ldata, CD_MLOOPCOL, act);
+
+		act = CustomData_get_stencil_layer(fdata, CD_MCOL);
+		CustomData_set_layer_stencil(ldata, CD_MLOOPCOL, act);
+	}
+}
+
 void CustomData_bmesh_init_pool(CustomData *data, int totelem, const char htype)
 {
 	int chunksize;
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index 2b08c085417..a1e67ebd414 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -54,6 +54,7 @@
 #include "DNA_screen_types.h"
 #include "DNA_windowmanager_types.h"
 #include "DNA_movieclip_types.h"
+#include "DNA_mask_types.h"
 
 #include "BKE_animsys.h"
 #include "BKE_action.h"
@@ -2469,6 +2470,15 @@ void DAG_on_visible_update(Main *bmain, const short do_time)
 
 	/* hack to get objects updating on layer changes */
 	DAG_id_type_tag(bmain, ID_OB);
+
+	/* so masks update on load */
+	if (bmain->mask.first) {
+		Mask *mask;
+
+		for (mask = bmain->mask.first; mask; mask = mask->id.next) {
+			DAG_id_tag_update(&mask->id, 0);
+		}
+	}
 }
 
 static void dag_id_flush_update__isDependentTexture(void *userData, Object *UNUSED(ob), ID **idpoin)
@@ -2611,6 +2621,18 @@ static void dag_id_flush_update(Scene *sce, ID *id)
 			}
 		}
 
+		if (idtype == ID_MSK) {
+			if (sce->nodetree) {
+				bNode *node;
+
+				for (node = sce->nodetree->nodes.first; node; node = node->next) {
+					if (node->id == id) {
+						nodeUpdate(sce->nodetree, node);
+					}
+				}
+			}
+		}
+
 		/* camera's matrix is used to orient reconstructed stuff,
 		 * so it should happen tracking-related constraints recalculation
 		 * when camera is changing (sergey) */
@@ -2938,7 +2960,7 @@ void DAG_pose_sort(Object *ob)
 	queue_delete(nqueue);
 	
 //	printf("\nordered\n");
-//	for (pchan = pose->chanbase.first; pchan; pchan= pchan->next) {
+//	for (pchan = pose->chanbase.first; pchan; pchan = pchan->next) {
 //		printf(" %s\n", pchan->name);
 //	}
 	
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c
index e0c3b257273..32c6caffff7 100644
--- a/source/blender/blenkernel/intern/editderivedmesh.c
+++ b/source/blender/blenkernel/intern/editderivedmesh.c
@@ -594,7 +594,7 @@ static void emDM_drawMappedFaces(DerivedMesh *dm,
 		float (*vertexCos)[3] = bmdm->vertexCos;
 		float (*vertexNos)[3] = bmdm->vertexNos;
 		float (*polyNos)[3]   = bmdm->polyNos;
-		// int *triPolyMap= bmdm->triPolyMap;
+		// int *triPolyMap = bmdm->triPolyMap;
 
 		BM_mesh_elem_index_ensure(bmdm->tc->bm, BM_VERT | BM_FACE);
 
@@ -802,7 +802,7 @@ static void emDM_drawFacesTex_common(DerivedMesh *dm,
 			BMLoop **ls = em->looptris[i];
 			MTexPoly *tp = has_uv ? CustomData_bmesh_get(&bm->pdata, ls[0]->f->head.data, CD_MTEXPOLY) : NULL;
 			MTFace mtf = {{{0}}};
-			/*unsigned char *cp= NULL;*/ /*UNUSED*/
+			/*unsigned char *cp = NULL;*/ /*UNUSED*/
 			int drawSmooth = BM_elem_flag_test(ls[0]->f, BM_ELEM_SMOOTH);
 			DMDrawOption draw_option;
 
@@ -874,7 +874,7 @@ static void emDM_drawFacesTex_common(DerivedMesh *dm,
 			BMLoop **ls = em->looptris[i];
 			MTexPoly *tp = has_uv ? CustomData_bmesh_get(&bm->pdata, ls[0]->f->head.data, CD_MTEXPOLY) : NULL;
 			MTFace mtf = {{{0}}};
-			/*unsigned char *cp= NULL;*/ /*UNUSED*/
+			/*unsigned char *cp = NULL;*/ /*UNUSED*/
 			int drawSmooth = BM_elem_flag_test(ls[0]->f, BM_ELEM_SMOOTH);
 			DMDrawOption draw_option;
 
@@ -1697,8 +1697,8 @@ DerivedMesh *getEditDerivedBMesh(BMEditMesh *em,
 
 		BM_ITER_MESH_INDEX (eve, &iter, bmdm->tc->bm, BM_VERTS_OF_MESH, i) {
 			DM_set_vert_data(&bmdm->dm, i, CD_MVERT_SKIN,
-							 CustomData_bmesh_get(&bm->vdata, eve->head.data,
-												  CD_MVERT_SKIN));
+			                 CustomData_bmesh_get(&bm->vdata, eve->head.data,
+			                                      CD_MVERT_SKIN));
 		}
 	}
 
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c
index 1d109d5f616..b5254b97844 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -929,6 +929,8 @@ static void do_physical_effector(EffectorCache *eff, EffectorData *efd, Effected
 		}
 	}
 
+	if (point->ave)
+		zero_v3(point->ave);
 	if (pd->flag & PFIELD_DO_ROTATION && point->ave && point->rot) {
 		float xvec[3] = {1.0f, 0.0f, 0.0f};
 		float dave[3];
diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c
index 59c8a529d85..b7ede15d00b 100644
--- a/source/blender/blenkernel/intern/fmodifier.c
+++ b/source/blender/blenkernel/intern/fmodifier.c
@@ -613,7 +613,7 @@ static float fcm_cycles_time(FCurve *fcu, FModifier *fcm, float UNUSED(cvalue),
 		
 		/* check that cyclic is still enabled for the specified time */
 		if (cycles == 0) {
-			/* catch this case so that we don't exit when we have cycles=0
+			/* catch this case so that we don't exit when we have (cycles = 0)
 			 * as this indicates infinite cycles...
 			 */
 		}
@@ -810,7 +810,7 @@ static void fcm_python_copy(FModifier *fcm, FModifier *src)
 static void fcm_python_evaluate(FCurve *UNUSED(fcu), FModifier *UNUSED(fcm), float *UNUSED(cvalue), float UNUSED(evaltime))
 {
 #ifdef WITH_PYTHON
-	//FMod_Python *data= (FMod_Python *)fcm->data;
+	//FMod_Python *data = (FMod_Python *)fcm->data;
 	
 	/* FIXME... need to implement this modifier...
 	 *	It will need it execute a script using the custom properties 
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 6ec19018ab5..c317dc63ef7 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -321,6 +321,19 @@ void gpencil_frame_delete_laststroke(bGPDlayer *gpl, bGPDframe *gpf)
 
 /* -------- GP-Layer API ---------- */
 
+bGPDframe *BKE_gpencil_layer_find_frame(bGPDlayer *gpl, int cframe)
+{
+	bGPDframe *gpf;
+
+	for (gpf = gpl->frames.last; gpf; gpf = gpf->prev) {
+		if (gpf->framenum == cframe) {
+			return gpf;
+		}
+	}
+
+	return NULL;
+}
+
 /* get the appropriate gp-frame from a given layer
  *	- this sets the layer's actframe var (if allowed to)
  *	- extension beyond range (if first gp-frame is after all frame in interest and cannot add)
diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c
index 8f077ab107c..0725b1732d3 100644
--- a/source/blender/blenkernel/intern/group.c
+++ b/source/blender/blenkernel/intern/group.c
@@ -196,7 +196,7 @@ int add_to_group(Group *group, Object *object, Scene *scene, Base *base)
 	}
 }
 
-/* also used for ob==NULL */
+/* also used for (ob == NULL) */
 static int rem_from_group_internal(Group *group, Object *ob)
 {
 	GroupObject *go, *gon;
diff --git a/source/blender/blenkernel/intern/idcode.c b/source/blender/blenkernel/intern/idcode.c
index ca10f39246c..30427a81c4b 100644
--- a/source/blender/blenkernel/intern/idcode.c
+++ b/source/blender/blenkernel/intern/idcode.c
@@ -79,6 +79,7 @@ static IDType idtypes[] = {
 	{ ID_WO,        "World",    "worlds",       IDTYPE_FLAGS_ISLINKABLE},
 	{ ID_WM,        "WindowManager", "window_managers", 0},
 	{ ID_MC,        "MovieClip", "movieclips",  IDTYPE_FLAGS_ISLINKABLE},
+	{ ID_MSK,        "Mask",     "masks",       IDTYPE_FLAGS_ISLINKABLE},
 };
 static int nidtypes = sizeof(idtypes) / sizeof(idtypes[0]);
 
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 797a2093729..eaf4c898b86 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -91,6 +91,14 @@
 
 #include "BLO_sys_types.h" // for intptr_t support
 
+/* for image user iteration */
+#include "DNA_node_types.h"
+#include "DNA_space_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_view3d_types.h"
+
+#include "WM_api.h"
+
 /* max int, to indicate we don't store sequences in ibuf */
 #define IMA_NO_INDEX    0x7FEFEFEF
 
@@ -111,8 +119,8 @@ static void de_interlace_ng(struct ImBuf *ibuf) /* neogeo fields */
 	
 	if (ibuf->rect) {
 		/* make copies */
-		tbuf1 = IMB_allocImBuf(ibuf->x, (short)(ibuf->y >> 1), (unsigned char)32, (int)IB_rect);
-		tbuf2 = IMB_allocImBuf(ibuf->x, (short)(ibuf->y >> 1), (unsigned char)32, (int)IB_rect);
+		tbuf1 = IMB_allocImBuf(ibuf->x, (ibuf->y >> 1), (unsigned char)32, (int)IB_rect);
+		tbuf2 = IMB_allocImBuf(ibuf->x, (ibuf->y >> 1), (unsigned char)32, (int)IB_rect);
 		
 		ibuf->x *= 2;
 		
@@ -139,8 +147,8 @@ static void de_interlace_st(struct ImBuf *ibuf) /* standard fields */
 	
 	if (ibuf->rect) {
 		/* make copies */
-		tbuf1 = IMB_allocImBuf(ibuf->x, (short)(ibuf->y >> 1), (unsigned char)32, IB_rect);
-		tbuf2 = IMB_allocImBuf(ibuf->x, (short)(ibuf->y >> 1), (unsigned char)32, IB_rect);
+		tbuf1 = IMB_allocImBuf(ibuf->x, (ibuf->y >> 1), (unsigned char)32, IB_rect);
+		tbuf2 = IMB_allocImBuf(ibuf->x, (ibuf->y >> 1), (unsigned char)32, IB_rect);
 		
 		ibuf->x *= 2;
 		
@@ -290,7 +298,7 @@ static void image_assign_ibuf(Image *ima, ImBuf *ibuf, int index, int frame)
 		else
 			ibuf->flags &= ~IB_cm_predivide;
 
-		/* this function accepts link==NULL */
+		/* this function accepts (link == NULL) */
 		BLI_insertlinkbefore(&ima->ibufs, link, ibuf);
 
 		/* now we don't want copies? */
@@ -592,10 +600,12 @@ static ImBuf *add_ibuf_size(unsigned int width, unsigned int height, const char
 	if (floatbuf) {
 		ibuf = IMB_allocImBuf(width, height, depth, IB_rectfloat);
 		rect_float = (float *)ibuf->rect_float;
+		ibuf->profile = IB_PROFILE_LINEAR_RGB;
 	}
 	else {
 		ibuf = IMB_allocImBuf(width, height, depth, IB_rect);
 		rect = (unsigned char *)ibuf->rect;
+		ibuf->profile = IB_PROFILE_SRGB;
 	}
 	
 	BLI_strncpy(ibuf->name, name, sizeof(ibuf->name));
@@ -800,7 +810,7 @@ void BKE_image_free_all_textures(void)
 {
 	Tex *tex;
 	Image *ima;
-	/* unsigned int totsize= 0; */
+	/* unsigned int totsize = 0; */
 	
 	for (ima = G.main->image.first; ima; ima = ima->id.next)
 		ima->id.flag &= ~LIB_DOIT;
@@ -1812,6 +1822,65 @@ void BKE_image_assign_ibuf(Image *ima, ImBuf *ibuf)
 	image_assign_ibuf(ima, ibuf, IMA_NO_INDEX, 0);
 }
 
+void BKE_image_walk_all_users(const Main *mainp, void *customdata,
+                              void callback(Image *ima, ImageUser *iuser, void *customdata))
+{
+	wmWindowManager *wm;
+	wmWindow *win;
+	Tex *tex;
+
+	/* texture users */
+	for (tex = mainp->tex.first; tex; tex = tex->id.next) {
+		if (tex->type == TEX_IMAGE && tex->ima) {
+			if (ELEM(tex->ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE)) {
+				callback(tex->ima, &tex->iuser, customdata);
+			}
+		}
+	}
+
+	/* image window, compo node users */
+	for (wm = mainp->wm.first; wm; wm = wm->id.next) { /* only 1 wm */
+		for (win = wm->windows.first; win; win = win->next) {
+			ScrArea *sa;
+			for (sa = win->screen->areabase.first; sa; sa = sa->next) {
+				if (sa->spacetype == SPACE_VIEW3D) {
+					View3D *v3d = sa->spacedata.first;
+					BGpic *bgpic;
+					for (bgpic = v3d->bgpicbase.first; bgpic; bgpic = bgpic->next) {
+						callback(bgpic->ima, &bgpic->iuser, customdata);
+					}
+				}
+				else if (sa->spacetype == SPACE_IMAGE) {
+					SpaceImage *sima = sa->spacedata.first;
+					callback(sima->image, &sima->iuser, customdata);
+				}
+				else if (sa->spacetype == SPACE_NODE) {
+					SpaceNode *snode = sa->spacedata.first;
+					if ((snode->treetype == NTREE_COMPOSIT) && (snode->nodetree)) {
+						bNode *node;
+						for (node = snode->nodetree->nodes.first; node; node = node->next) {
+							if (node->id && node->type == CMP_NODE_IMAGE) {
+								Image *ima = (Image *)node->id;
+								ImageUser *iuser = node->storage;
+								callback(ima, iuser, customdata);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+static void image_tag_frame_recalc(Image *ima, ImageUser *iuser, void *customdata)
+{
+	Image *changed_image = customdata;
+
+	if (ima == changed_image) {
+		iuser->flag |= IMA_NEED_FRAME_RECALC;
+	}
+}
+
 void BKE_image_signal(Image *ima, ImageUser *iuser, int signal)
 {
 	if (ima == NULL)
@@ -1845,6 +1914,9 @@ void BKE_image_signal(Image *ima, ImageUser *iuser, int signal)
 			ima->ok = 1;
 			if (iuser)
 				iuser->ok = 1;
+
+			BKE_image_walk_all_users(G.main, ima, image_tag_frame_recalc);
+
 			break;
 
 		case IMA_SIGNAL_RELOAD:
@@ -2012,8 +2084,7 @@ static void image_initialize_after_load(Image *ima, ImBuf *ibuf)
 static ImBuf *image_load_sequence_file(Image *ima, ImageUser *iuser, int frame)
 {
 	struct ImBuf *ibuf;
-	unsigned short numlen;
-	char name[FILE_MAX], head[FILE_MAX], tail[FILE_MAX];
+	char name[FILE_MAX];
 	int flag;
 	
 	/* XXX temp stuff? */
@@ -2021,11 +2092,7 @@ static ImBuf *image_load_sequence_file(Image *ima, ImageUser *iuser, int frame)
 		ima->tpageflag |= IMA_TPAGE_REFRESH;
 
 	ima->lastframe = frame;
-	BLI_strncpy(name, ima->name, sizeof(name));
-	BLI_stringdec(name, head, tail, &numlen);
-	BLI_stringenc(name, head, tail, numlen, frame);
-
-	BLI_path_abs(name, ID_BLEND_PATH(G.main, &ima->id));
+	BKE_image_user_file_path(iuser, ima, name);
 	
 	flag = IB_rect | IB_multilayer;
 	if (ima->flag & IMA_DO_PREMUL)
@@ -2137,8 +2204,7 @@ static ImBuf *image_load_movie_file(Image *ima, ImageUser *iuser, int frame)
 	if (ima->anim == NULL) {
 		char str[FILE_MAX];
 		
-		BLI_strncpy(str, ima->name, FILE_MAX);
-		BLI_path_abs(str, ID_BLEND_PATH(G.main, &ima->id));
+		BKE_image_user_file_path(iuser, ima, str);
 
 		/* FIXME: make several stream accessible in image editor, too*/
 		ima->anim = openanim(str, IB_rect, 0);
@@ -2201,8 +2267,8 @@ static ImBuf *image_load_image_file(Image *ima, ImageUser *iuser, int cfra)
 			flag |= IB_premul;
 			
 		/* get the right string */
-		BLI_strncpy(str, ima->name, sizeof(str));
-		BLI_path_abs(str, ID_BLEND_PATH(G.main, &ima->id));
+		BKE_image_user_frame_calc(iuser, cfra, 0);
+		BKE_image_user_file_path(iuser, ima, str);
 		
 		/* read ibuf */
 		ibuf = IMB_loadiffname(str, flag);
@@ -2656,15 +2722,42 @@ int BKE_image_user_frame_get(const ImageUser *iuser, int cfra, int fieldnr)
 
 void BKE_image_user_frame_calc(ImageUser *iuser, int cfra, int fieldnr)
 {
-	const int framenr = BKE_image_user_frame_get(iuser, cfra, fieldnr);
+	if (iuser) {
+		const int framenr = BKE_image_user_frame_get(iuser, cfra, fieldnr);
+		
+		/* allows image users to handle redraws */
+		if (iuser->flag & IMA_ANIM_ALWAYS)
+			if (framenr != iuser->framenr)
+				iuser->flag |= IMA_ANIM_REFRESHED;
+		
+		iuser->framenr = framenr;
+		if (iuser->ok == 0) iuser->ok = 1;
+	}
+}
+
+void BKE_image_user_check_frame_calc(ImageUser *iuser, int cfra, int fieldnr)
+{
+	if ((iuser->flag & IMA_ANIM_ALWAYS) || (iuser->flag & IMA_NEED_FRAME_RECALC)) {
+		BKE_image_user_frame_calc(iuser, cfra, fieldnr);
 
-	/* allows image users to handle redraws */
-	if (iuser->flag & IMA_ANIM_ALWAYS)
-		if (framenr != iuser->framenr)
-			iuser->flag |= IMA_ANIM_REFRESHED;
+		iuser->flag &= ~IMA_NEED_FRAME_RECALC;
+	}
+}
 
-	iuser->framenr = framenr;
-	if (iuser->ok == 0) iuser->ok = 1;
+void BKE_image_user_file_path(ImageUser *iuser, Image *ima, char *filepath)
+{
+	BLI_strncpy(filepath, ima->name, FILE_MAX);
+
+	if (ima->source == IMA_SRC_SEQUENCE) {
+		char head[FILE_MAX], tail[FILE_MAX];
+		unsigned short numlen;
+		int frame = iuser->framenr;
+
+		BLI_stringdec(filepath, head, tail, &numlen);
+		BLI_stringenc(filepath, head, tail, numlen, frame);
+	}
+
+	BLI_path_abs(filepath, ID_BLEND_PATH(G.main, &ima->id));
 }
 
 int BKE_image_has_alpha(struct Image *image)
@@ -2682,4 +2775,3 @@ int BKE_image_has_alpha(struct Image *image)
 	else
 		return 0;
 }
-
diff --git a/source/blender/blenkernel/intern/image_gen.c b/source/blender/blenkernel/intern/image_gen.c
index f135bebb8ce..d460368784a 100644
--- a/source/blender/blenkernel/intern/image_gen.c
+++ b/source/blender/blenkernel/intern/image_gen.c
@@ -78,7 +78,9 @@ void BKE_image_buf_fill_checker(unsigned char *rect, float *rect_float, int widt
 	float *rect_float_orig = rect_float;
 
 	
-	float h = 0.0, hoffs = 0.0, hue = 0.0, s = 0.9, v = 0.9, r, g, b;
+	float h = 0.0, hoffs = 0.0;
+	float hsv[3] = {0.0f, 0.9f, 0.9f};
+	float rgb[3];
 
 	/* checkers */
 	for (y = 0; y < height; y++) {
@@ -128,20 +130,20 @@ void BKE_image_buf_fill_checker(unsigned char *rect, float *rect_float, int widt
 				if ((fabs((x % checkerwidth) - (checkerwidth / 2)) < 1) ||
 				    (fabs((y % checkerwidth) - (checkerwidth / 2)) < 1))
 				{
-					hue = fmodf(fabs(h - hoffs), 1.0f);
-					hsv_to_rgb(hue, s, v, &r, &g, &b);
+					hsv[0] = fmodf(fabs(h - hoffs), 1.0f);
+					hsv_to_rgb_v(hsv, rgb);
 					
 					if (rect) {
-						rect[0] = (char)(r * 255.0f);
-						rect[1] = (char)(g * 255.0f);
-						rect[2] = (char)(b * 255.0f);
+						rect[0] = (char)(rgb[0] * 255.0f);
+						rect[1] = (char)(rgb[1] * 255.0f);
+						rect[2] = (char)(rgb[2] * 255.0f);
 						rect[3] = 255;
 					}
 					
 					if (rect_float) {
-						rect_float[0] = r;
-						rect_float[1] = g;
-						rect_float[2] = b;
+						rect_float[0] = rgb[0];
+						rect_float[1] = rgb[1];
+						rect_float[2] = rgb[2];
 						rect_float[3] = 1.0f;
 					}
 				}
@@ -162,33 +164,33 @@ void BKE_image_buf_fill_checker(unsigned char *rect, float *rect_float, int widt
 static void checker_board_color_fill(unsigned char *rect, float *rect_float, int width, int height)
 {
 	int hue_step, y, x;
-	float hue, val, sat, r, g, b;
+	float hsv[3], rgb[3];
 
-	sat = 1.0;
+	hsv[1] = 1.0;
 
 	hue_step = power_of_2_max_i(width / 8);
 	if (hue_step < 8) hue_step = 8;
 
 	for (y = 0; y < height; y++) {
 
-		val = 0.1 + (y * (0.4 / height)); /* use a number lower then 1.0 else its too bright */
+		hsv[2] = 0.1 + (y * (0.4 / height)); /* use a number lower then 1.0 else its too bright */
 		for (x = 0; x < width; x++) {
-			hue = (float)((double)(x / hue_step) * 1.0 / width * hue_step);
-			hsv_to_rgb(hue, sat, val, &r, &g, &b);
+			hsv[0] = (float)((double)(x / hue_step) * 1.0 / width * hue_step);
+			hsv_to_rgb_v(hsv, rgb);
 
 			if (rect) {
-				rect[0] = (char)(r * 255.0f);
-				rect[1] = (char)(g * 255.0f);
-				rect[2] = (char)(b * 255.0f);
+				rect[0] = (char)(rgb[0] * 255.0f);
+				rect[1] = (char)(rgb[1] * 255.0f);
+				rect[2] = (char)(rgb[2] * 255.0f);
 				rect[3] = 255;
 				
 				rect += 4;
 			}
 
 			if (rect_float) {
-				rect_float[0] = r;
-				rect_float[1] = g;
-				rect_float[2] = b;
+				rect_float[0] = rgb[0];
+				rect_float[1] = rgb[1];
+				rect_float[2] = rgb[2];
 				rect_float[3] = 1.0f;
 				
 				rect_float += 4;
diff --git a/source/blender/blenkernel/intern/implicit.c b/source/blender/blenkernel/intern/implicit.c
index d4861a27057..4aef47159df 100644
--- a/source/blender/blenkernel/intern/implicit.c
+++ b/source/blender/blenkernel/intern/implicit.c
@@ -695,8 +695,7 @@ DO_INLINE void subadd_bfmatrixS_bfmatrixS( fmatrix3x3 *to, fmatrix3x3 *from, flo
 ///////////////////////////////////////////////////////////////////
 // simulator start
 ///////////////////////////////////////////////////////////////////
-typedef struct Implicit_Data 
-{
+typedef struct Implicit_Data  {
 	lfVector *X, *V, *Xnew, *Vnew, *olddV, *F, *B, *dV, *z;
 	fmatrix3x3 *A, *dFdV, *dFdX, *S, *P, *Pinv, *bigI, *M; 
 } Implicit_Data;
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index 1077b5ad7c3..bbc1874c2ae 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -162,14 +162,14 @@ static AdrBit2Path ma_mode_bits[] = {
 static AdrBit2Path *adrcode_bitmaps_to_paths(int blocktype, int adrcode, int *tot)
 {
 	/* Object layers */
-	if ((blocktype == ID_OB) && (adrcode == OB_LAY)) 
+	if ((blocktype == ID_OB) && (adrcode == OB_LAY))
 		RET_ABP(ob_layer_bits)
-		else if ((blocktype == ID_MA) && (adrcode == MA_MODE))
-			RET_ABP(ma_mode_bits)
-			// XXX TODO: add other types...
+	else if ((blocktype == ID_MA) && (adrcode == MA_MODE))
+		RET_ABP(ma_mode_bits)
+	// XXX TODO: add other types...
 	
-			/* Normal curve */
-			return NULL;
+	/* Normal curve */
+	return NULL;
 }
 
 /* *************************************************** */
@@ -1924,14 +1924,14 @@ void do_versions_ipos_to_animato(Main *main)
 				 * (semi-hack (tm) )
 				 */
 				switch (seq->type) {
-					case SEQ_IMAGE:
-					case SEQ_META:
-					case SEQ_SCENE:
-					case SEQ_MOVIE:
-					case SEQ_COLOR:
+					case SEQ_TYPE_IMAGE:
+					case SEQ_TYPE_META:
+					case SEQ_TYPE_SCENE:
+					case SEQ_TYPE_MOVIE:
+					case SEQ_TYPE_COLOR:
 						adrcode = SEQ_FAC_OPACITY;
 						break;
-					case SEQ_SPEED:
+					case SEQ_TYPE_SPEED:
 						adrcode = SEQ_FAC_SPEED;
 						break;
 				}
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index 15db290ff14..e3495a15871 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -305,7 +305,7 @@ void init_latt_deform(Object *oblatt, Object *ob)
 	
 	fp = lt->latticedata = MEM_mallocN(sizeof(float) * 3 * lt->pntsu * lt->pntsv * lt->pntsw, "latticedata");
 	
-	/* for example with a particle system: ob==0 */
+	/* for example with a particle system: (ob == NULL) */
 	if (ob == NULL) {
 		/* in deformspace, calc matrix  */
 		invert_m4_m4(lt->latmat, oblatt->obmat);
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 25e34bf1879..c81e607ce93 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -66,6 +66,7 @@
 #include "DNA_world_types.h"
 #include "DNA_gpencil_types.h"
 #include "DNA_movieclip_types.h"
+#include "DNA_mask_types.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_dynstr.h"
@@ -108,6 +109,7 @@
 #include "BKE_speaker.h"
 #include "BKE_utildefines.h"
 #include "BKE_movieclip.h"
+#include "BKE_mask.h"
 
 #include "RNA_access.h"
 
@@ -486,6 +488,8 @@ ListBase *which_libbase(Main *mainlib, short type)
 			return &(mainlib->gpencil);
 		case ID_MC:
 			return &(mainlib->movieclip);
+		case ID_MSK:
+			return &(mainlib->mask);
 	}
 	return NULL;
 }
@@ -569,6 +573,7 @@ int set_listbasepointers(Main *main, ListBase **lb)
 	lb[a++] = &(main->library);
 	lb[a++] = &(main->wm);
 	lb[a++] = &(main->movieclip);
+	lb[a++] = &(main->mask);
 	
 	lb[a] = NULL;
 
@@ -645,7 +650,7 @@ static ID *alloc_libblock_notest(short type)
 			id = MEM_callocN(sizeof(Text), "text");
 			break;
 		case ID_SCRIPT:
-			//XXX id= MEM_callocN(sizeof(Script), "script");
+			//XXX id = MEM_callocN(sizeof(Script), "script");
 			break;
 		case ID_SPK:
 			id = MEM_callocN(sizeof(Speaker), "speaker");
@@ -680,6 +685,9 @@ static ID *alloc_libblock_notest(short type)
 		case ID_MC:
 			id = MEM_callocN(sizeof(MovieClip), "Movie Clip");
 			break;
+		case ID_MSK:
+			id = MEM_callocN(sizeof(Mask), "Mask");
+			break;
 	}
 	return id;
 }
@@ -888,6 +896,9 @@ void BKE_libblock_free(ListBase *lb, void *idv)
 		case ID_MC:
 			BKE_movieclip_free((MovieClip *)id);
 			break;
+		case ID_MSK:
+			BKE_mask_free((Mask *)id);
+			break;
 	}
 
 	if (id->properties) {
@@ -1032,7 +1043,7 @@ static void IDnames_to_dyn_pupstring(DynStr *pupds, ListBase *lb, ID *link, shor
 
 
 /* used by headerbuttons.c buttons.c editobject.c editseq.c */
-/* if nr==NULL no MAX_IDPUP, this for non-header browsing */
+/* if (nr == NULL) no MAX_IDPUP, this for non-header browsing */
 void IDnames_to_pupstring(const char **str, const char *title, const char *extraops, ListBase *lb, ID *link, short *nr)
 {
 	DynStr *pupds = BLI_dynstr_new();
@@ -1131,7 +1142,7 @@ static ID *is_dupid(ListBase *lb, ID *id, const char *name)
  * Normally the ID that's being check is already in the ListBase, so ID *id
  * points at the new entry.  The Python Library module needs to know what
  * the name of a datablock will be before it is appended; in this case ID *id
- * id is NULL;
+ * id is NULL
  */
 
 static int check_for_dupid(ListBase *lb, ID *id, char *name)
@@ -1310,7 +1321,7 @@ void clear_id_newpoins(void)
 	}
 }
 
-#define LIBTAG(a)   if (a && a->id.lib) {a->id.flag &= ~LIB_INDIRECT; a->id.flag |= LIB_EXTERN; }
+#define LIBTAG(a)   if (a && a->id.lib) {a->id.flag &= ~LIB_INDIRECT; a->id.flag |= LIB_EXTERN; } (void)0
 
 static void lib_indirect_test_id(ID *id, Library *lib)
 {
diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c
new file mode 100644
index 00000000000..48db916b4ba
--- /dev/null
+++ b/source/blender/blenkernel/intern/mask.c
@@ -0,0 +1,2216 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2012 Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): Blender Foundation,
+ *                 Sergey Sharybin
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/blenkernel/intern/mask.c
+ *  \ingroup bke
+ */
+
+#include <stddef.h>
+#include <string.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_utildefines.h"
+#include "BLI_path_util.h"
+#include "BLI_string.h"
+#include "BLI_listbase.h"
+#include "BLI_math.h"
+
+#include "DNA_mask_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_object_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_space_types.h"
+#include "DNA_movieclip_types.h"
+#include "DNA_tracking_types.h"
+
+#include "BKE_curve.h"
+#include "BKE_global.h"
+#include "BKE_library.h"
+#include "BKE_main.h"
+#include "BKE_mask.h"
+#include "BKE_tracking.h"
+#include "BKE_movieclip.h"
+#include "BKE_utildefines.h"
+
+#include "raskter.h"
+
+static MaskSplinePoint *mask_spline_point_next(MaskSpline *spline, MaskSplinePoint *points_array, MaskSplinePoint *point)
+{
+	if (point == &points_array[spline->tot_point - 1]) {
+		if (spline->flag & MASK_SPLINE_CYCLIC) {
+			return &points_array[0];
+		}
+		else  {
+			return NULL;
+		}
+	}
+	else {
+		return point + 1;
+	}
+}
+
+static MaskSplinePoint *mask_spline_point_prev(MaskSpline *spline, MaskSplinePoint *points_array, MaskSplinePoint *point)
+{
+	if (point == points_array) {
+		if (spline->flag & MASK_SPLINE_CYCLIC) {
+			return &points_array[spline->tot_point - 1];
+		}
+		else  {
+			return NULL;
+		}
+	}
+	else {
+		return point - 1;
+	}
+}
+
+static BezTriple *mask_spline_point_next_bezt(MaskSpline *spline, MaskSplinePoint *points_array, MaskSplinePoint *point)
+{
+	if (point == &points_array[spline->tot_point - 1]) {
+		if (spline->flag & MASK_SPLINE_CYCLIC) {
+			return &(points_array[0].bezt);
+		}
+		else  {
+			return NULL;
+		}
+	}
+	else {
+		return &((point + 1))->bezt;
+	}
+}
+
+#if 0
+static BezTriple *mask_spline_point_prev_bezt(MaskSpline *spline, MaskSplinePoint *points_array, MaskSplinePoint *point)
+{
+	if (point == points_array) {
+		if (spline->flag & MASK_SPLINE_CYCLIC) {
+			return &(points_array[0].bezt);
+		}
+		else  {
+			return NULL;
+		}
+	}
+	else {
+		return &((point - 1))->bezt;
+	}
+}
+#endif
+
+MaskSplinePoint *BKE_mask_spline_point_array(MaskSpline *spline)
+{
+	return spline->points_deform ? spline->points_deform : spline->points;
+}
+
+MaskSplinePoint *BKE_mask_spline_point_array_from_point(MaskSpline *spline, MaskSplinePoint *point_ref)
+{
+	if ((point_ref >= spline->points) && (point_ref < &spline->points[spline->tot_point])) {
+		return spline->points;
+	}
+
+	if ((point_ref >= spline->points_deform) && (point_ref < &spline->points_deform[spline->tot_point])) {
+		return spline->points_deform;
+	}
+
+	BLI_assert(!"wrong array");
+	return NULL;
+}
+
+/* mask layers */
+
+MaskLayer *BKE_mask_layer_new(Mask *mask, const char *name)
+{
+	MaskLayer *masklay = MEM_callocN(sizeof(MaskLayer), __func__);
+
+	if (name && name[0])
+		BLI_strncpy(masklay->name, name, sizeof(masklay->name));
+	else
+		strcpy(masklay->name, "MaskLayer");
+
+	BLI_addtail(&mask->masklayers, masklay);
+
+	BKE_mask_layer_unique_name(mask, masklay);
+
+	mask->masklay_tot++;
+
+	masklay->alpha = 1.0f;
+
+	return masklay;
+}
+
+/* note: may still be hidden, caller needs to check */
+MaskLayer *BKE_mask_layer_active(Mask *mask)
+{
+	return BLI_findlink(&mask->masklayers, mask->masklay_act);
+}
+
+void BKE_mask_layer_active_set(Mask *mask, MaskLayer *masklay)
+{
+	mask->masklay_act = BLI_findindex(&mask->masklayers, masklay);
+}
+
+void BKE_mask_layer_remove(Mask *mask, MaskLayer *masklay)
+{
+	BLI_remlink(&mask->masklayers, masklay);
+	BKE_mask_layer_free(masklay);
+
+	mask->masklay_tot--;
+
+	if (mask->masklay_act >= mask->masklay_tot)
+		mask->masklay_act = mask->masklay_tot - 1;
+}
+
+void BKE_mask_layer_unique_name(Mask *mask, MaskLayer *masklay)
+{
+	BLI_uniquename(&mask->masklayers, masklay, "MaskLayer", '.', offsetof(MaskLayer, name), sizeof(masklay->name));
+}
+
+/* splines */
+
+MaskSpline *BKE_mask_spline_add(MaskLayer *masklay)
+{
+	MaskSpline *spline;
+
+	spline = MEM_callocN(sizeof(MaskSpline), "new mask spline");
+	BLI_addtail(&masklay->splines, spline);
+
+	/* spline shall have one point at least */
+	spline->points = MEM_callocN(sizeof(MaskSplinePoint), "new mask spline point");
+	spline->tot_point = 1;
+
+	/* cyclic shapes are more usually used */
+	// spline->flag |= MASK_SPLINE_CYCLIC; // disable because its not so nice for drawing. could be done differently
+
+	spline->weight_interp = MASK_SPLINE_INTERP_LINEAR;
+
+	BKE_mask_parent_init(&spline->parent);
+
+	return spline;
+}
+
+static int BKE_mask_spline_resolution(MaskSpline *spline, int width, int height)
+{
+	float max_segment = 0.01f;
+	int i, resol = 1;
+
+	if (width != 0 && height != 0) {
+		if (width >= height)
+			max_segment = 1.0f / (float) width;
+		else
+			max_segment = 1.0f / (float) height;
+	}
+
+	for (i = 0; i < spline->tot_point; i++) {
+		MaskSplinePoint *point = &spline->points[i];
+		BezTriple *bezt, *bezt_next;
+		float a, b, c, len;
+		int cur_resol;
+
+		bezt = &point->bezt;
+		bezt_next = mask_spline_point_next_bezt(spline, spline->points, point);
+
+		if (bezt_next == NULL) {
+			break;
+		}
+
+		a = len_v3v3(bezt->vec[1], bezt->vec[2]);
+		b = len_v3v3(bezt->vec[2], bezt_next->vec[0]);
+		c = len_v3v3(bezt_next->vec[0], bezt_next->vec[1]);
+
+		len = a + b + c;
+		cur_resol = len / max_segment;
+
+		resol = MAX2(resol, cur_resol);
+	}
+
+	return resol;
+}
+
+static int BKE_mask_spline_feather_resolution(MaskSpline *spline, int width, int height)
+{
+	const float max_segment = 0.005;
+	int resol = BKE_mask_spline_resolution(spline, width, height);
+	float max_jump = 0.0f;
+	int i;
+
+	for (i = 0; i < spline->tot_point; i++) {
+		MaskSplinePoint *point = &spline->points[i];
+		float prev_u, prev_w;
+		int j;
+
+		prev_u = 0.0f;
+		prev_w = point->bezt.weight;
+
+		for (j = 0; j < point->tot_uw; j++) {
+			float jump = fabsf((point->uw[j].w - prev_w) / (point->uw[j].u - prev_u));
+
+			max_jump = MAX2(max_jump, jump);
+
+			prev_u = point->uw[j].u;
+			prev_w = point->uw[j].w;
+		}
+	}
+
+	resol += max_jump / max_segment;
+
+	return resol;
+}
+
+float (*BKE_mask_spline_differentiate_with_resolution(MaskSpline *spline, int width, int height,
+                                                      int *tot_diff_point))[2]
+{
+	MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline);
+
+	MaskSplinePoint *point, *prev;
+	float (*diff_points)[2], (*fp)[2];
+	int a, len, resol = BKE_mask_spline_resolution(spline, width, height);
+
+	if (spline->tot_point <= 1) {
+		/* nothing to differentiate */
+		*tot_diff_point = 0;
+		return NULL;
+	}
+
+	/* count */
+	len = (spline->tot_point - 1) * resol;
+
+	if (spline->flag & MASK_SPLINE_CYCLIC)
+		len += resol;
+	else
+		len++;
+
+	/* len+1 because of 'forward_diff_bezier' function */
+	*tot_diff_point = len;
+	diff_points = fp = MEM_mallocN((len + 1) * sizeof(*diff_points), "mask spline vets");
+
+	a = spline->tot_point - 1;
+	if (spline->flag & MASK_SPLINE_CYCLIC)
+		a++;
+
+	prev = points_array;
+	point = prev + 1;
+
+	while (a--) {
+		BezTriple *prevbezt;
+		BezTriple *bezt;
+		int j;
+
+		if (a == 0 && (spline->flag & MASK_SPLINE_CYCLIC))
+			point = points_array;
+
+		prevbezt = &prev->bezt;
+		bezt = &point->bezt;
+
+		for (j = 0; j < 2; j++) {
+			BKE_curve_forward_diff_bezier(prevbezt->vec[1][j], prevbezt->vec[2][j],
+			                              bezt->vec[0][j], bezt->vec[1][j],
+			                              &(*fp)[j], resol, 2 * sizeof(float));
+		}
+
+		fp += resol;
+
+		if (a == 0 && (spline->flag & MASK_SPLINE_CYCLIC) == 0) {
+			copy_v2_v2(*fp, bezt->vec[1]);
+		}
+
+		prev = point;
+		point++;
+	}
+
+	return diff_points;
+}
+
+float (*BKE_mask_spline_differentiate(MaskSpline *spline, int *tot_diff_point))[2]
+{
+	return BKE_mask_spline_differentiate_with_resolution(spline, 0, 0, tot_diff_point);
+}
+
+float (*BKE_mask_spline_feather_differentiated_points_with_resolution(MaskSpline *spline, int width, int height,
+                                                                      int *tot_feather_point))[2]
+{
+	MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline);
+
+	float (*feather)[2], (*fp)[2];
+	int i, j, tot, resol = BKE_mask_spline_feather_resolution(spline, width, height);
+
+	tot = resol * spline->tot_point;
+	feather = fp = MEM_mallocN(tot * sizeof(*feather), "mask spline feather diff points");
+
+	for (i = 0; i < spline->tot_point; i++) {
+		MaskSplinePoint *point = &points_array[i];
+
+		for (j = 0; j < resol; j++, fp++) {
+			float u = (float) j / resol, weight;
+			float co[2], n[2];
+
+			/* TODO - these calls all calculate similar things
+			 * could be unified for some speed */
+			BKE_mask_point_segment_co(spline, point, u, co);
+			BKE_mask_point_normal(spline, point, u, n);
+			weight = BKE_mask_point_weight(spline, point, u);
+
+			madd_v2_v2v2fl(*fp, co, n, weight);
+		}
+	}
+
+	*tot_feather_point = tot;
+
+	return feather;
+}
+
+float (*BKE_mask_spline_feather_differentiated_points(MaskSpline *spline, int *tot_feather_point))[2]
+{
+	return BKE_mask_spline_feather_differentiated_points_with_resolution(spline, 0, 0, tot_feather_point);
+}
+
+float (*BKE_mask_spline_feather_points(MaskSpline *spline, int *tot_feather_point))[2]
+{
+	MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline);
+
+	int i, tot = 0;
+	float (*feather)[2], (*fp)[2];
+
+	/* count */
+	for (i = 0; i < spline->tot_point; i++) {
+		MaskSplinePoint *point = &points_array[i];
+
+		tot += point->tot_uw + 1;
+	}
+
+	/* create data */
+	feather = fp = MEM_mallocN(tot * sizeof(*feather), "mask spline feather points");
+
+	for (i = 0; i < spline->tot_point; i++) {
+		MaskSplinePoint *point = &points_array[i];
+		BezTriple *bezt = &point->bezt;
+		float weight, n[2];
+		int j;
+
+		BKE_mask_point_normal(spline, point, 0.0f, n);
+		weight = BKE_mask_point_weight(spline, point, 0.0f);
+
+		madd_v2_v2v2fl(*fp, bezt->vec[1], n, weight);
+		fp++;
+
+		for (j = 0; j < point->tot_uw; j++) {
+			float u = point->uw[j].u;
+			float co[2];
+
+			BKE_mask_point_segment_co(spline, point, u, co);
+			BKE_mask_point_normal(spline, point, u, n);
+			weight = BKE_mask_point_weight(spline, point, u);
+
+			madd_v2_v2v2fl(*fp, co, n, weight);
+			fp++;
+		}
+	}
+
+	*tot_feather_point = tot;
+
+	return feather;
+}
+
+void BKE_mask_point_direction_switch(MaskSplinePoint *point)
+{
+	const int tot_uw = point->tot_uw;
+	const int tot_uw_half = tot_uw / 2;
+	int i;
+
+	float co_tmp[2];
+
+	/* swap handles */
+	copy_v2_v2(co_tmp, point->bezt.vec[0]);
+	copy_v2_v2(point->bezt.vec[0], point->bezt.vec[2]);
+	copy_v2_v2(point->bezt.vec[2], co_tmp);
+	/* in this case the flags are unlikely to be different but swap anyway */
+	SWAP(char, point->bezt.f1, point->bezt.f3);
+	SWAP(char, point->bezt.h1, point->bezt.h2);
+
+
+	/* swap UW's */
+	if (tot_uw > 1) {
+		/* count */
+		for (i = 0; i < tot_uw_half; i++) {
+			MaskSplinePointUW *uw_a = &point->uw[i];
+			MaskSplinePointUW *uw_b = &point->uw[tot_uw - (i + 1)];
+			SWAP(MaskSplinePointUW, *uw_a, *uw_b);
+		}
+	}
+
+	for (i = 0; i < tot_uw; i++) {
+		MaskSplinePointUW *uw = &point->uw[i];
+		uw->u = 1.0f - uw->u;
+	}
+}
+
+void BKE_mask_spline_direction_switch(MaskLayer *masklay, MaskSpline *spline)
+{
+	const int tot_point = spline->tot_point;
+	const int tot_point_half = tot_point / 2;
+	int i, i_prev;
+
+	if (tot_point < 2) {
+		return;
+	}
+
+	/* count */
+	for (i = 0; i < tot_point_half; i++) {
+		MaskSplinePoint *point_a = &spline->points[i];
+		MaskSplinePoint *point_b = &spline->points[tot_point - (i + 1)];
+		SWAP(MaskSplinePoint, *point_a, *point_b);
+	}
+
+	/* correct UW's */
+	i_prev = tot_point - 1;
+	for (i = 0; i < tot_point; i++) {
+
+		BKE_mask_point_direction_switch(&spline->points[i]);
+
+		SWAP(MaskSplinePointUW *, spline->points[i].uw,     spline->points[i_prev].uw);
+		SWAP(int,                 spline->points[i].tot_uw, spline->points[i_prev].tot_uw);
+
+		i_prev = i;
+	}
+
+	/* correct animation */
+	if (masklay->splines_shapes.first) {
+		MaskLayerShape *masklay_shape;
+
+		const int spline_index = BKE_mask_layer_shape_spline_to_index(masklay, spline);
+
+		for (masklay_shape = masklay->splines_shapes.first;
+		     masklay_shape;
+		     masklay_shape = masklay_shape->next)
+		{
+			MaskLayerShapeElem *fp_arr = (MaskLayerShapeElem *)masklay_shape->data;
+
+			for (i = 0; i < tot_point_half; i++) {
+				MaskLayerShapeElem *fp_a = &fp_arr[spline_index +              (i)     ];
+				MaskLayerShapeElem *fp_b = &fp_arr[spline_index + (tot_point - (i + 1))];
+				SWAP(MaskLayerShapeElem, *fp_a, *fp_b);
+			}
+		}
+	}
+}
+
+
+float BKE_mask_spline_project_co(MaskSpline *spline, MaskSplinePoint *point,
+                                 float start_u, const float co[2], const eMaskSign sign)
+{
+	const float proj_eps         = 1e-3;
+	const float proj_eps_squared = proj_eps * proj_eps;
+	const int N = 1000;
+	float u = -1.0f, du = 1.0f / N, u1 = start_u, u2 = start_u;
+	float ang = -1.0f;
+
+	BLI_assert(ABS(sign) <= 1); /* (-1, 0, 1) */
+
+	while (u1 > 0.0f || u2 < 1.0f) {
+		float n1[2], n2[2], co1[2], co2[2];
+		float v1[2], v2[2];
+		float ang1, ang2;
+
+		if (u1 >= 0.0f) {
+			BKE_mask_point_segment_co(spline, point, u1, co1);
+			BKE_mask_point_normal(spline, point, u1, n1);
+			sub_v2_v2v2(v1, co, co1);
+
+			if ((sign == MASK_PROJ_ANY) ||
+			    ((sign == MASK_PROJ_NEG) && (dot_v2v2(v1, n1) <= 0.0f)) ||
+			    ((sign == MASK_PROJ_POS) && (dot_v2v2(v1, n1) >= 0.0f)))
+			{
+
+				if (len_squared_v2(v1) > proj_eps_squared) {
+					ang1 = angle_v2v2(v1, n1);
+					if (ang1 > M_PI / 2.0f)
+						ang1 = M_PI  - ang1;
+
+					if (ang < 0.0f || ang1 < ang) {
+						ang = ang1;
+						u = u1;
+					}
+				}
+				else {
+					u = u1;
+					break;
+				}
+			}
+		}
+
+		if (u2 <= 1.0f) {
+			BKE_mask_point_segment_co(spline, point, u2, co2);
+			BKE_mask_point_normal(spline, point, u2, n2);
+			sub_v2_v2v2(v2, co, co2);
+
+			if ((sign == MASK_PROJ_ANY) ||
+			    ((sign == MASK_PROJ_NEG) && (dot_v2v2(v2, n2) <= 0.0f)) ||
+			    ((sign == MASK_PROJ_POS) && (dot_v2v2(v2, n2) >= 0.0f)))
+			{
+
+				if (len_squared_v2(v2) > proj_eps_squared) {
+					ang2 = angle_v2v2(v2, n2);
+					if (ang2 > M_PI / 2.0f)
+						ang2 = M_PI  - ang2;
+
+					if (ang2 < ang) {
+						ang = ang2;
+						u = u2;
+					}
+				}
+				else {
+					u = u2;
+					break;
+				}
+			}
+		}
+
+		u1 -= du;
+		u2 += du;
+	}
+
+	return u;
+}
+
+/* point */
+
+int BKE_mask_point_has_handle(MaskSplinePoint *point)
+{
+	BezTriple *bezt = &point->bezt;
+
+	return bezt->h1 == HD_ALIGN;
+}
+
+void BKE_mask_point_handle(MaskSplinePoint *point, float handle[2])
+{
+	float vec[2];
+
+	sub_v2_v2v2(vec, point->bezt.vec[0], point->bezt.vec[1]);
+
+	handle[0] = (point->bezt.vec[1][0] + vec[1]);
+	handle[1] = (point->bezt.vec[1][1] - vec[0]);
+}
+
+void BKE_mask_point_set_handle(MaskSplinePoint *point, float loc[2], int keep_direction,
+                               float orig_handle[2], float orig_vec[3][3])
+{
+	BezTriple *bezt = &point->bezt;
+	float v1[2], v2[2], vec[2];
+
+	if (keep_direction) {
+		sub_v2_v2v2(v1, loc, orig_vec[1]);
+		sub_v2_v2v2(v2, orig_handle, orig_vec[1]);
+
+		project_v2_v2v2(vec, v1, v2);
+
+		if (dot_v2v2(v2, vec) > 0) {
+			float len = len_v2(vec);
+
+			sub_v2_v2v2(v1, orig_vec[0], orig_vec[1]);
+
+			mul_v2_fl(v1, len / len_v2(v1));
+
+			add_v2_v2v2(bezt->vec[0], bezt->vec[1], v1);
+			sub_v2_v2v2(bezt->vec[2], bezt->vec[1], v1);
+		}
+		else {
+			copy_v3_v3(bezt->vec[0], bezt->vec[1]);
+			copy_v3_v3(bezt->vec[2], bezt->vec[1]);
+		}
+	}
+	else {
+		sub_v2_v2v2(v1, loc, bezt->vec[1]);
+
+		v2[0] = -v1[1];
+		v2[1] =  v1[0];
+
+		add_v2_v2v2(bezt->vec[0], bezt->vec[1], v2);
+		sub_v2_v2v2(bezt->vec[2], bezt->vec[1], v2);
+	}
+}
+
+float *BKE_mask_point_segment_feather_diff_with_resolution(MaskSpline *spline, MaskSplinePoint *point,
+                                                           int width, int height,
+                                                           int *tot_feather_point)
+{
+	float *feather, *fp;
+	int i, resol = BKE_mask_spline_feather_resolution(spline, width, height);
+
+	feather = fp = MEM_callocN(2 * resol * sizeof(float), "mask point spline feather diff points");
+
+	for (i = 0; i < resol; i++, fp += 2) {
+		float u = (float)(i % resol) / resol, weight;
+		float co[2], n[2];
+
+		BKE_mask_point_segment_co(spline, point, u, co);
+		BKE_mask_point_normal(spline, point, u, n);
+		weight = BKE_mask_point_weight(spline, point, u);
+
+		fp[0] = co[0] + n[0] * weight;
+		fp[1] = co[1] + n[1] * weight;
+	}
+
+	*tot_feather_point = resol;
+
+	return feather;
+}
+
+float *BKE_mask_point_segment_feather_diff(MaskSpline *spline, MaskSplinePoint *point, int *tot_feather_point)
+{
+	return BKE_mask_point_segment_feather_diff_with_resolution(spline, point, 0, 0, tot_feather_point);
+}
+
+float *BKE_mask_point_segment_diff_with_resolution(MaskSpline *spline, MaskSplinePoint *point,
+                                                   int width, int height, int *tot_diff_point)
+{
+	MaskSplinePoint *points_array = BKE_mask_spline_point_array_from_point(spline, point);
+
+	BezTriple *bezt, *bezt_next;
+	float *diff_points, *fp;
+	int j, resol = BKE_mask_spline_resolution(spline, width, height);
+
+	bezt = &point->bezt;
+	bezt_next = mask_spline_point_next_bezt(spline, points_array, point);
+
+	if (!bezt_next)
+		return NULL;
+
+	/* resol+1 because of 'forward_diff_bezier' function */
+	*tot_diff_point = resol + 1;
+	diff_points = fp = MEM_callocN((resol + 1) * 2 * sizeof(float), "mask segment vets");
+
+	for (j = 0; j < 2; j++) {
+		BKE_curve_forward_diff_bezier(bezt->vec[1][j], bezt->vec[2][j],
+		                              bezt_next->vec[0][j], bezt_next->vec[1][j],
+		                              fp + j, resol, 2 * sizeof(float));
+	}
+
+	copy_v2_v2(fp + 2 * resol, bezt_next->vec[1]);
+
+	return diff_points;
+}
+
+float *BKE_mask_point_segment_diff(MaskSpline *spline, MaskSplinePoint *point, int *tot_diff_point)
+{
+	return BKE_mask_point_segment_diff_with_resolution(spline, point, 0, 0, tot_diff_point);
+}
+
+void BKE_mask_point_segment_co(MaskSpline *spline, MaskSplinePoint *point, float u, float co[2])
+{
+	MaskSplinePoint *points_array = BKE_mask_spline_point_array_from_point(spline, point);
+
+	BezTriple *bezt = &point->bezt, *bezt_next;
+	float q0[2], q1[2], q2[2], r0[2], r1[2];
+
+	bezt_next = mask_spline_point_next_bezt(spline, points_array, point);
+
+	if (!bezt_next) {
+		copy_v2_v2(co, bezt->vec[1]);
+		return;
+	}
+
+	interp_v2_v2v2(q0, bezt->vec[1], bezt->vec[2], u);
+	interp_v2_v2v2(q1, bezt->vec[2], bezt_next->vec[0], u);
+	interp_v2_v2v2(q2, bezt_next->vec[0], bezt_next->vec[1], u);
+
+	interp_v2_v2v2(r0, q0, q1, u);
+	interp_v2_v2v2(r1, q1, q2, u);
+
+	interp_v2_v2v2(co, r0, r1, u);
+}
+
+void BKE_mask_point_normal(MaskSpline *spline, MaskSplinePoint *point, float u, float n[2])
+{
+	MaskSplinePoint *points_array = BKE_mask_spline_point_array_from_point(spline, point);
+
+	BezTriple *bezt = &point->bezt, *bezt_next;
+	float q0[2], q1[2], q2[2], r0[2], r1[2], vec[2];
+
+	bezt_next = mask_spline_point_next_bezt(spline, points_array, point);
+
+	if (!bezt_next) {
+		BKE_mask_point_handle(point, vec);
+
+		sub_v2_v2v2(n, vec, bezt->vec[1]);
+		normalize_v2(n);
+		return;
+	}
+
+	interp_v2_v2v2(q0, bezt->vec[1], bezt->vec[2], u);
+	interp_v2_v2v2(q1, bezt->vec[2], bezt_next->vec[0], u);
+	interp_v2_v2v2(q2, bezt_next->vec[0], bezt_next->vec[1], u);
+
+	interp_v2_v2v2(r0, q0, q1, u);
+	interp_v2_v2v2(r1, q1, q2, u);
+
+	sub_v2_v2v2(vec, r1, r0);
+
+	n[0] = -vec[1];
+	n[1] =  vec[0];
+
+	normalize_v2(n);
+}
+
+static float mask_point_interp_weight(BezTriple *bezt, BezTriple *bezt_next, const float u)
+{
+	return (bezt->weight * (1.0f - u)) + (bezt_next->weight * u);
+}
+
+float BKE_mask_point_weight_scalar(MaskSpline *spline, MaskSplinePoint *point, const float u)
+{
+	MaskSplinePoint *points_array = BKE_mask_spline_point_array_from_point(spline, point);
+	BezTriple *bezt = &point->bezt, *bezt_next;
+
+	bezt_next = mask_spline_point_next_bezt(spline, points_array, point);
+
+	if (!bezt_next) {
+		return bezt->weight;
+	}
+	else if (u <= 0.0) {
+		return bezt->weight;
+	}
+	else if (u >= 1.0f) {
+		return bezt_next->weight;
+	}
+	else {
+		return mask_point_interp_weight(bezt, bezt_next, u);
+	}
+}
+
+float BKE_mask_point_weight(MaskSpline *spline, MaskSplinePoint *point, const float u)
+{
+	MaskSplinePoint *points_array = BKE_mask_spline_point_array_from_point(spline, point);
+	BezTriple *bezt = &point->bezt, *bezt_next;
+
+	bezt_next = mask_spline_point_next_bezt(spline, points_array, point);
+
+	if (!bezt_next) {
+		return bezt->weight;
+	}
+	else if (u <= 0.0) {
+		return bezt->weight;
+	}
+	else if (u >= 1.0f) {
+		return bezt_next->weight;
+	}
+	else {
+		float cur_u = 0.0f, cur_w = 0.0f, next_u = 0.0f, next_w = 0.0f, fac; /* Quite warnings */
+		int i;
+
+		for (i = 0; i < point->tot_uw + 1; i++) {
+
+			if (i == 0) {
+				cur_u = 0.0f;
+				cur_w = 1.0f; /* mask_point_interp_weight will scale it */
+			}
+			else {
+				cur_u = point->uw[i - 1].u;
+				cur_w = point->uw[i - 1].w;
+			}
+
+			if (i == point->tot_uw) {
+				next_u = 1.0f;
+				next_w = 1.0f; /* mask_point_interp_weight will scale it */
+			}
+			else {
+				next_u = point->uw[i].u;
+				next_w = point->uw[i].w;
+			}
+
+			if (u >= cur_u && u <= next_u) {
+				break;
+			}
+		}
+
+		fac = (u - cur_u) / (next_u - cur_u);
+
+		cur_w  *= mask_point_interp_weight(bezt, bezt_next, cur_u);
+		next_w *= mask_point_interp_weight(bezt, bezt_next, next_u);
+
+		if (spline->weight_interp == MASK_SPLINE_INTERP_EASE) {
+			return cur_w + (next_w - cur_w) * (3.0f * fac * fac - 2.0f * fac * fac * fac);
+		}
+		else {
+			return (1.0f - fac) * cur_w + fac * next_w;
+		}
+	}
+}
+
+MaskSplinePointUW *BKE_mask_point_sort_uw(MaskSplinePoint *point, MaskSplinePointUW *uw)
+{
+	if (point->tot_uw > 1) {
+		int idx = uw - point->uw;
+
+		if (idx > 0 && point->uw[idx - 1].u > uw->u) {
+			while (idx > 0 && point->uw[idx - 1].u > point->uw[idx].u) {
+				SWAP(MaskSplinePointUW, point->uw[idx - 1], point->uw[idx]);
+				idx--;
+			}
+		}
+
+		if (idx < point->tot_uw - 1 && point->uw[idx + 1].u < uw->u) {
+			while (idx < point->tot_uw - 1 && point->uw[idx + 1].u < point->uw[idx].u) {
+				SWAP(MaskSplinePointUW, point->uw[idx + 1], point->uw[idx]);
+				idx++;
+			}
+		}
+
+		return &point->uw[idx];
+	}
+
+	return uw;
+}
+
+void BKE_mask_point_add_uw(MaskSplinePoint *point, float u, float w)
+{
+	if (!point->uw)
+		point->uw = MEM_callocN(sizeof(*point->uw), "mask point uw");
+	else
+		point->uw = MEM_reallocN(point->uw, (point->tot_uw + 1) * sizeof(*point->uw));
+
+	point->uw[point->tot_uw].u = u;
+	point->uw[point->tot_uw].w = w;
+
+	point->tot_uw++;
+
+	BKE_mask_point_sort_uw(point, &point->uw[point->tot_uw - 1]);
+}
+
+void BKE_mask_point_select_set(MaskSplinePoint *point, const short do_select)
+{
+	int i;
+
+	if (do_select) {
+		MASKPOINT_SEL_ALL(point);
+	}
+	else {
+		MASKPOINT_DESEL_ALL(point);
+	}
+
+	for (i = 0; i < point->tot_uw; i++) {
+		if (do_select) {
+			point->uw[i].flag |= SELECT;
+		}
+		else {
+			point->uw[i].flag &= ~SELECT;
+		}
+	}
+}
+
+void BKE_mask_point_select_set_handle(MaskSplinePoint *point, const short do_select)
+{
+	if (do_select) {
+		MASKPOINT_SEL_HANDLE(point);
+	}
+	else {
+		MASKPOINT_DESEL_HANDLE(point);
+	}
+}
+
+/* only mask block itself */
+static Mask *mask_alloc(const char *name)
+{
+	Mask *mask;
+
+	mask = BKE_libblock_alloc(&G.main->mask, ID_MSK, name);
+
+	return mask;
+}
+
+Mask *BKE_mask_new(const char *name)
+{
+	Mask *mask;
+	char mask_name[MAX_ID_NAME - 2];
+
+	if (name && name[0])
+		BLI_strncpy(mask_name, name, sizeof(mask_name));
+	else
+		strcpy(mask_name, "Mask");
+
+	mask = mask_alloc(mask_name);
+
+	/* arbitrary defaults */
+	mask->sfra = 1;
+	mask->efra = 100;
+
+	return mask;
+}
+
+void BKE_mask_point_free(MaskSplinePoint *point)
+{
+	if (point->uw)
+		MEM_freeN(point->uw);
+}
+
+void BKE_mask_spline_free(MaskSpline *spline)
+{
+	int i = 0;
+
+	for (i = 0; i < spline->tot_point; i++) {
+		MaskSplinePoint *point;
+		point = &spline->points[i];
+		BKE_mask_point_free(point);
+
+		if (spline->points_deform) {
+			point = &spline->points_deform[i];
+			BKE_mask_point_free(point);
+		}
+	}
+
+	MEM_freeN(spline->points);
+
+	if (spline->points_deform) {
+		MEM_freeN(spline->points_deform);
+	}
+
+	MEM_freeN(spline);
+}
+
+MaskSpline *BKE_mask_spline_copy(MaskSpline *spline)
+{
+	MaskSpline *nspline = MEM_callocN(sizeof(MaskSpline), "new spline");
+	int i;
+
+	*nspline = *spline;
+
+	nspline->points_deform = NULL;
+	nspline->points = MEM_dupallocN(nspline->points);
+
+	for (i = 0; i < nspline->tot_point; i++) {
+		MaskSplinePoint *point = &nspline->points[i];
+
+		if (point->uw)
+			point->uw = MEM_dupallocN(point->uw);
+	}
+
+	return nspline;
+}
+
+/* note: does NOT add to the list */
+MaskLayerShape *BKE_mask_layer_shape_alloc(MaskLayer *masklay, const int frame)
+{
+	MaskLayerShape *masklay_shape;
+	int tot_vert = BKE_mask_layer_shape_totvert(masklay);
+
+	masklay_shape = MEM_mallocN(sizeof(MaskLayerShape), __func__);
+	masklay_shape->frame = frame;
+	masklay_shape->tot_vert = tot_vert;
+	masklay_shape->data = MEM_mallocN(tot_vert * sizeof(float) * MASK_OBJECT_SHAPE_ELEM_SIZE, __func__);
+
+	return masklay_shape;
+}
+
+void BKE_mask_layer_shape_free(MaskLayerShape *masklay_shape)
+{
+	MEM_freeN(masklay_shape->data);
+
+	MEM_freeN(masklay_shape);
+}
+
+/** \brief Free all animation keys for a mask layer
+ */
+void BKE_mask_layer_free_shapes(MaskLayer *masklay)
+{
+	MaskLayerShape *masklay_shape;
+
+	/* free animation data */
+	masklay_shape = masklay->splines_shapes.first;
+	while (masklay_shape) {
+		MaskLayerShape *next_masklay_shape = masklay_shape->next;
+
+		BLI_remlink(&masklay->splines_shapes, masklay_shape);
+		BKE_mask_layer_shape_free(masklay_shape);
+
+		masklay_shape = next_masklay_shape;
+	}
+}
+
+void BKE_mask_layer_free(MaskLayer *masklay)
+{
+	MaskSpline *spline;
+
+	/* free splines */
+	spline = masklay->splines.first;
+	while (spline) {
+		MaskSpline *next_spline = spline->next;
+
+		BLI_remlink(&masklay->splines, spline);
+		BKE_mask_spline_free(spline);
+
+		spline = next_spline;
+	}
+
+	/* free animation data */
+	BKE_mask_layer_free_shapes(masklay);
+
+	MEM_freeN(masklay);
+}
+
+void BKE_mask_free(Mask *mask)
+{
+	MaskLayer *masklay = mask->masklayers.first;
+
+	while (masklay) {
+		MaskLayer *next_masklay = masklay->next;
+
+		BLI_remlink(&mask->masklayers, masklay);
+		BKE_mask_layer_free(masklay);
+
+		masklay = next_masklay;
+	}
+}
+
+void BKE_mask_unlink(Main *bmain, Mask *mask)
+{
+	bScreen *scr;
+	ScrArea *area;
+	SpaceLink *sl;
+
+	for (scr = bmain->screen.first; scr; scr = scr->id.next) {
+		for (area = scr->areabase.first; area; area = area->next) {
+			for (sl = area->spacedata.first; sl; sl = sl->next) {
+				if (sl->spacetype == SPACE_CLIP) {
+					SpaceClip *sc = (SpaceClip *) sl;
+
+					if (sc->mask == mask)
+						sc->mask = NULL;
+				}
+			}
+		}
+	}
+
+	mask->id.us = 0;
+}
+
+void BKE_mask_coord_from_movieclip(MovieClip *clip, MovieClipUser *user, float r_co[2], const float co[2])
+{
+	int width, height;
+
+	/* scaling for the clip */
+	BKE_movieclip_get_size(clip, user, &width, &height);
+
+	if (width == height) {
+		r_co[0] = co[0];
+		r_co[1] = co[1];
+	}
+	else if (width < height) {
+		r_co[0] = ((co[0] - 0.5f) * ((float)width / (float)height)) + 0.5f;
+		r_co[1] = co[1];
+	}
+	else { /* (width > height) */
+		r_co[0] = co[0];
+		r_co[1] = ((co[1] - 0.5f) * ((float)height / (float)width)) + 0.5f;
+	}
+}
+
+/* as above but divide */
+void BKE_mask_coord_to_movieclip(MovieClip *clip, MovieClipUser *user, float r_co[2], const float co[2])
+{
+	int width, height;
+
+	/* scaling for the clip */
+	BKE_movieclip_get_size(clip, user, &width, &height);
+
+	if (width == height) {
+		r_co[0] = co[0];
+		r_co[1] = co[1];
+	}
+	else if (width < height) {
+		r_co[0] = ((co[0] - 0.5f) / ((float)width / (float)height)) + 0.5f;
+		r_co[1] = co[1];
+	}
+	else { /* (width > height) */
+		r_co[0] = co[0];
+		r_co[1] = ((co[1] - 0.5f) / ((float)height / (float)width)) + 0.5f;
+	}
+}
+
+static int BKE_mask_evaluate_parent(MaskParent *parent, float ctime, float r_co[2])
+{
+	if (!parent)
+		return FALSE;
+
+	if (parent->id_type == ID_MC) {
+		if (parent->id) {
+			MovieClip *clip = (MovieClip *) parent->id;
+			MovieTracking *tracking = (MovieTracking *) &clip->tracking;
+			MovieTrackingObject *ob = BKE_tracking_object_get_named(tracking, parent->parent);
+
+			if (ob) {
+				MovieTrackingTrack *track = BKE_tracking_track_get_named(tracking, ob, parent->sub_parent);
+
+				MovieClipUser user = {0};
+				user.framenr = ctime;
+
+				if (track) {
+					MovieTrackingMarker *marker = BKE_tracking_marker_get(track, ctime);
+					float marker_pos_ofs[2];
+					add_v2_v2v2(marker_pos_ofs, marker->pos, track->offset);
+					BKE_mask_coord_from_movieclip(clip, &user, r_co, marker_pos_ofs);
+
+					return TRUE;
+				}
+			}
+		}
+	}
+
+	return FALSE;
+}
+
+int BKE_mask_evaluate_parent_delta(MaskParent *parent, float ctime, float r_delta[2])
+{
+	float parent_co[2];
+
+	if (BKE_mask_evaluate_parent(parent, ctime, parent_co)) {
+		sub_v2_v2v2(r_delta, parent_co, parent->parent_orig);
+		return TRUE;
+	}
+	else {
+		return FALSE;
+	}
+}
+
+static void mask_calc_point_handle(MaskSplinePoint *point, MaskSplinePoint *point_prev, MaskSplinePoint *point_next)
+{
+	BezTriple *bezt = &point->bezt;
+	BezTriple *bezt_prev = NULL, *bezt_next = NULL;
+	//int handle_type = bezt->h1;
+
+	if (point_prev)
+		bezt_prev = &point_prev->bezt;
+
+	if (point_next)
+		bezt_next = &point_next->bezt;
+
+#if 1
+	if (bezt_prev || bezt_next) {
+		BKE_nurb_handle_calc(bezt, bezt_prev, bezt_next, 0);
+	}
+#else
+	if (handle_type == HD_VECT) {
+		BKE_nurb_handle_calc(bezt, bezt_prev, bezt_next, 0);
+	}
+	else if (handle_type == HD_AUTO) {
+		BKE_nurb_handle_calc(bezt, bezt_prev, bezt_next, 0);
+	}
+	else if (handle_type == HD_ALIGN) {
+		float v1[3], v2[3];
+		float vec[3], h[3];
+
+		sub_v3_v3v3(v1, bezt->vec[0], bezt->vec[1]);
+		sub_v3_v3v3(v2, bezt->vec[2], bezt->vec[1]);
+		add_v3_v3v3(vec, v1, v2);
+
+		if (len_v3(vec) > 1e-3) {
+			h[0] = vec[1];
+			h[1] = -vec[0];
+			h[2] = 0.0f;
+		}
+		else {
+			copy_v3_v3(h, v1);
+		}
+
+		add_v3_v3v3(bezt->vec[0], bezt->vec[1], h);
+		sub_v3_v3v3(bezt->vec[2], bezt->vec[1], h);
+	}
+#endif
+}
+
+void BKE_mask_get_handle_point_adjacent(MaskSpline *spline, MaskSplinePoint *point,
+                                        MaskSplinePoint **r_point_prev, MaskSplinePoint **r_point_next)
+{
+	/* TODO, could avoid calling this at such low level */
+	MaskSplinePoint *points_array = BKE_mask_spline_point_array_from_point(spline, point);
+
+	*r_point_prev = mask_spline_point_prev(spline, points_array, point);
+	*r_point_next = mask_spline_point_next(spline, points_array, point);
+}
+
+/* calculates the tanget of a point by its previous and next
+ * (ignoring handles - as if its a poly line) */
+void BKE_mask_calc_tangent_polyline(MaskSpline *spline, MaskSplinePoint *point, float t[2])
+{
+	float tvec_a[2], tvec_b[2];
+
+	MaskSplinePoint *point_prev, *point_next;
+
+	BKE_mask_get_handle_point_adjacent(spline, point,
+	                                   &point_prev, &point_next);
+
+	if (point_prev) {
+		sub_v2_v2v2(tvec_a, point->bezt.vec[1], point_prev->bezt.vec[1]);
+		normalize_v2(tvec_a);
+	}
+	else {
+		zero_v2(tvec_a);
+	}
+
+	if (point_next) {
+		sub_v2_v2v2(tvec_b, point_next->bezt.vec[1], point->bezt.vec[1]);
+		normalize_v2(tvec_b);
+	}
+	else {
+		zero_v2(tvec_b);
+	}
+
+	add_v2_v2v2(t, tvec_a, tvec_b);
+	normalize_v2(t);
+}
+
+void BKE_mask_calc_handle_point(MaskSpline *spline, MaskSplinePoint *point)
+{
+	MaskSplinePoint *point_prev, *point_next;
+
+	BKE_mask_get_handle_point_adjacent(spline, point,
+	                                   &point_prev, &point_next);
+
+	mask_calc_point_handle(point, point_prev, point_next);
+}
+
+static void enforce_dist_v2_v2fl(float v1[2], const float v2[2], const float dist)
+{
+	if (!equals_v2v2(v2, v1)) {
+		float nor[2];
+
+		sub_v2_v2v2(nor, v1, v2);
+		normalize_v2(nor);
+		madd_v2_v2v2fl(v1, v2, nor, dist);
+	}
+}
+
+void BKE_mask_calc_handle_adjacent_interp(MaskSpline *spline, MaskSplinePoint *point, const float u)
+{
+	/* TODO! - make this interpolate between siblings - not always midpoint! */
+	int length_tot = 0;
+	float length_average = 0.0f;
+	float weight_average = 0.0f;
+
+
+	MaskSplinePoint *point_prev, *point_next;
+
+	BLI_assert(u >= 0.0f && u <= 1.0f);
+
+	BKE_mask_get_handle_point_adjacent(spline, point,
+	                                   &point_prev, &point_next);
+
+	if (point_prev && point_next) {
+		length_average = ((len_v2v2(point_prev->bezt.vec[0], point_prev->bezt.vec[1]) * (1.0f - u)) +
+		                  (len_v2v2(point_next->bezt.vec[2], point_next->bezt.vec[1]) * u));
+
+		weight_average = (point_prev->bezt.weight * (1.0f - u) +
+		                  point_next->bezt.weight * u);
+		length_tot = 1;
+	}
+	else {
+		if (point_prev) {
+			length_average += len_v2v2(point_prev->bezt.vec[0], point_prev->bezt.vec[1]);
+			weight_average += point_prev->bezt.weight;
+			length_tot++;
+		}
+
+		if (point_next) {
+			length_average += len_v2v2(point_next->bezt.vec[2], point_next->bezt.vec[1]);
+			weight_average += point_next->bezt.weight;
+			length_tot++;
+		}
+	}
+
+	if (length_tot) {
+		length_average /= (float)length_tot;
+		weight_average /= (float)length_tot;
+
+		enforce_dist_v2_v2fl(point->bezt.vec[0], point->bezt.vec[1], length_average);
+		enforce_dist_v2_v2fl(point->bezt.vec[2], point->bezt.vec[1], length_average);
+		point->bezt.weight = weight_average;
+	}
+}
+
+
+/**
+ * \brief Resets auto handles even for non-auto bezier points
+ *
+ * Useful for giving sane defaults.
+ */
+void BKE_mask_calc_handle_point_auto(MaskSpline *spline, MaskSplinePoint *point,
+                                     const short do_recalc_length)
+{
+	MaskSplinePoint *point_prev, *point_next;
+	const char h_back[2] = {point->bezt.h1, point->bezt.h2};
+	const float length_average = (do_recalc_length) ? 0.0f /* dummy value */ :
+	                             (len_v3v3(point->bezt.vec[0], point->bezt.vec[1]) +
+	                              len_v3v3(point->bezt.vec[1], point->bezt.vec[2])) / 2.0f;
+
+	BKE_mask_get_handle_point_adjacent(spline, point,
+	                                   &point_prev, &point_next);
+
+	point->bezt.h1 = HD_AUTO;
+	point->bezt.h2 = HD_AUTO;
+	mask_calc_point_handle(point, point_prev, point_next);
+
+	point->bezt.h1 = h_back[0];
+	point->bezt.h2 = h_back[1];
+
+	/* preserve length by applying it back */
+	if (do_recalc_length == FALSE) {
+		enforce_dist_v2_v2fl(point->bezt.vec[0], point->bezt.vec[1], length_average);
+		enforce_dist_v2_v2fl(point->bezt.vec[2], point->bezt.vec[1], length_average);
+	}
+}
+
+void BKE_mask_layer_calc_handles(MaskLayer *masklay)
+{
+	MaskSpline *spline;
+	for (spline = masklay->splines.first; spline; spline = spline->next) {
+		int i;
+		for (i = 0; i < spline->tot_point; i++) {
+			BKE_mask_calc_handle_point(spline, &spline->points[i]);
+		}
+	}
+}
+
+void BKE_mask_layer_calc_handles_deform(MaskLayer *masklay)
+{
+	MaskSpline *spline;
+	for (spline = masklay->splines.first; spline; spline = spline->next) {
+		int i;
+		for (i = 0; i < spline->tot_point; i++) {
+			BKE_mask_calc_handle_point(spline, &spline->points_deform[i]);
+		}
+	}
+}
+
+void BKE_mask_calc_handles(Mask *mask)
+{
+	MaskLayer *masklay;
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		BKE_mask_layer_calc_handles(masklay);
+	}
+}
+
+void BKE_mask_update_deform(Mask *mask)
+{
+	MaskLayer *masklay;
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskSpline *spline;
+
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			int i;
+
+			for (i = 0; i < spline->tot_point; i++) {
+				const int i_prev = (i - 1) % spline->tot_point;
+				const int i_next = (i + 1) % spline->tot_point;
+
+				BezTriple *bezt_prev = &spline->points[i_prev].bezt;
+				BezTriple *bezt      = &spline->points[i].bezt;
+				BezTriple *bezt_next = &spline->points[i_next].bezt;
+
+				BezTriple *bezt_def_prev = &spline->points_deform[i_prev].bezt;
+				BezTriple *bezt_def      = &spline->points_deform[i].bezt;
+				BezTriple *bezt_def_next = &spline->points_deform[i_next].bezt;
+
+				float w_src[4];
+				int j;
+
+				for (j = 0; j <= 2; j += 2) { /* (0, 2) */
+					printf("--- %d %d, %d, %d\n", i, j, i_prev, i_next);
+					barycentric_weights_v2(bezt_prev->vec[1], bezt->vec[1], bezt_next->vec[1],
+					                       bezt->vec[j], w_src);
+					interp_v3_v3v3v3(bezt_def->vec[j],
+					                 bezt_def_prev->vec[1], bezt_def->vec[1], bezt_def_next->vec[1], w_src);
+				}
+			}
+		}
+	}
+}
+
+void BKE_mask_spline_ensure_deform(MaskSpline *spline)
+{
+	int allocated_points = (MEM_allocN_len(spline->points_deform) / sizeof(*spline->points_deform));
+	// printf("SPLINE ALLOC %p %d\n", spline->points_deform, allocated_points);
+
+	if (spline->points_deform == NULL || allocated_points != spline->tot_point) {
+		printf("alloc new deform spline\n");
+
+		if (spline->points_deform) {
+			int i;
+
+			for (i = 0; i < allocated_points; i++) {
+				MaskSplinePoint *point = &spline->points_deform[i];
+				BKE_mask_point_free(point);
+			}
+
+			MEM_freeN(spline->points_deform);
+		}
+
+		spline->points_deform = MEM_callocN(sizeof(*spline->points_deform) * spline->tot_point, __func__);
+	}
+	else {
+		// printf("alloc spline done\n");
+	}
+}
+
+void BKE_mask_evaluate(Mask *mask, const float ctime, const int do_newframe)
+{
+	MaskLayer *masklay;
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+
+		/* animation if available */
+		if (do_newframe) {
+			MaskLayerShape *masklay_shape_a;
+			MaskLayerShape *masklay_shape_b;
+			int found;
+
+			if ((found = BKE_mask_layer_shape_find_frame_range(masklay, ctime,
+			                                                   &masklay_shape_a, &masklay_shape_b)))
+			{
+				if (found == 1) {
+#if 0
+					printf("%s: exact %d %d (%d)\n", __func__, (int)ctime, BLI_countlist(&masklay->splines_shapes),
+					       masklay_shape_a->frame);
+#endif
+
+					BKE_mask_layer_shape_to_mask(masklay, masklay_shape_a);
+				}
+				else if (found == 2) {
+					float w = masklay_shape_b->frame - masklay_shape_a->frame;
+#if 0
+					printf("%s: tween %d %d (%d %d)\n", __func__, (int)ctime, BLI_countlist(&masklay->splines_shapes),
+					       masklay_shape_a->frame, masklay_shape_b->frame);
+#endif
+					BKE_mask_layer_shape_to_mask_interp(masklay, masklay_shape_a, masklay_shape_b,
+					                                    (ctime - masklay_shape_a->frame) / w);
+				}
+				else {
+					/* always fail, should never happen */
+					BLI_assert(found == 2);
+				}
+			}
+		}
+		/* animation done... */
+	}
+
+	BKE_mask_calc_handles(mask);
+
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskSpline *spline;
+
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			int i;
+			int has_auto = FALSE;
+
+			BKE_mask_spline_ensure_deform(spline);
+
+			for (i = 0; i < spline->tot_point; i++) {
+				MaskSplinePoint *point = &spline->points[i];
+				MaskSplinePoint *point_deform = &spline->points_deform[i];
+				float delta[2];
+
+				BKE_mask_point_free(point_deform);
+
+				*point_deform = *point;
+				point_deform->uw = point->uw ? MEM_dupallocN(point->uw) : NULL;
+
+				if (BKE_mask_evaluate_parent_delta(&point->parent, ctime, delta)) {
+					add_v2_v2(point_deform->bezt.vec[0], delta);
+					add_v2_v2(point_deform->bezt.vec[1], delta);
+					add_v2_v2(point_deform->bezt.vec[2], delta);
+				}
+
+				if (point->bezt.h1 == HD_AUTO) {
+					has_auto = TRUE;
+				}
+			}
+
+			/* if the spline has auto handles, these need to be recalculated after deformation */
+			if (has_auto) {
+				for (i = 0; i < spline->tot_point; i++) {
+					MaskSplinePoint *point_deform = &spline->points_deform[i];
+					if (point_deform->bezt.h1 == HD_AUTO) {
+						BKE_mask_calc_handle_point(spline, point_deform);
+					}
+				}
+			}
+			/* end extra calc handles loop */
+		}
+	}
+}
+
+/* the purpose of this function is to ensure spline->points_deform is never out of date.
+ * for now re-evaluate all. eventually this might work differently */
+void BKE_mask_update_display(Mask *mask, float ctime)
+{
+#if 0
+	MaskLayer *masklay;
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskSpline *spline;
+
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			if (spline->points_deform) {
+				int i = 0;
+
+				for (i = 0; i < spline->tot_point; i++) {
+					MaskSplinePoint *point;
+
+					if (spline->points_deform) {
+						point = &spline->points_deform[i];
+						BKE_mask_point_free(point);
+					}
+				}
+				if (spline->points_deform) {
+					MEM_freeN(spline->points_deform);
+				}
+
+				spline->points_deform = NULL;
+			}
+		}
+	}
+#endif
+
+	BKE_mask_evaluate(mask, ctime, FALSE);
+}
+
+void BKE_mask_evaluate_all_masks(Main *bmain, float ctime, const int do_newframe)
+{
+	Mask *mask;
+
+	for (mask = bmain->mask.first; mask; mask = mask->id.next) {
+		BKE_mask_evaluate(mask, ctime, do_newframe);
+	}
+}
+
+void BKE_mask_update_scene(Main *bmain, Scene *scene, const int do_newframe)
+{
+	Mask *mask;
+
+	for (mask = bmain->mask.first; mask; mask = mask->id.next) {
+		if (mask->id.flag & LIB_ID_RECALC) {
+			BKE_mask_evaluate_all_masks(bmain, CFRA, do_newframe);
+		}
+	}
+}
+
+void BKE_mask_parent_init(MaskParent *parent)
+{
+	parent->id_type = ID_MC;
+}
+
+
+/* *** own animation/shapekey implimentation ***
+ * BKE_mask_layer_shape_XXX */
+
+int BKE_mask_layer_shape_totvert(MaskLayer *masklay)
+{
+	int tot = 0;
+	MaskSpline *spline;
+
+	for (spline = masklay->splines.first; spline; spline = spline->next) {
+		tot += spline->tot_point;
+	}
+
+	return tot;
+}
+
+static void mask_layer_shape_from_mask_point(BezTriple *bezt, float fp[MASK_OBJECT_SHAPE_ELEM_SIZE])
+{
+	copy_v2_v2(&fp[0], bezt->vec[0]);
+	copy_v2_v2(&fp[2], bezt->vec[1]);
+	copy_v2_v2(&fp[4], bezt->vec[2]);
+	fp[6] = bezt->weight;
+	fp[7] = bezt->radius;
+}
+
+static void mask_layer_shape_to_mask_point(BezTriple *bezt, float fp[MASK_OBJECT_SHAPE_ELEM_SIZE])
+{
+	copy_v2_v2(bezt->vec[0], &fp[0]);
+	copy_v2_v2(bezt->vec[1], &fp[2]);
+	copy_v2_v2(bezt->vec[2], &fp[4]);
+	bezt->weight = fp[6];
+	bezt->radius = fp[7];
+}
+
+/* these functions match. copy is swapped */
+void BKE_mask_layer_shape_from_mask(MaskLayer *masklay, MaskLayerShape *masklay_shape)
+{
+	int tot = BKE_mask_layer_shape_totvert(masklay);
+
+	if (masklay_shape->tot_vert == tot) {
+		float *fp = masklay_shape->data;
+
+		MaskSpline *spline;
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			int i;
+			for (i = 0; i < spline->tot_point; i++) {
+				mask_layer_shape_from_mask_point(&spline->points[i].bezt, fp);
+				fp += MASK_OBJECT_SHAPE_ELEM_SIZE;
+			}
+		}
+	}
+	else {
+		printf("%s: vert mismatch %d != %d (frame %d)\n",
+		       __func__, masklay_shape->tot_vert, tot, masklay_shape->frame);
+	}
+}
+
+void BKE_mask_layer_shape_to_mask(MaskLayer *masklay, MaskLayerShape *masklay_shape)
+{
+	int tot = BKE_mask_layer_shape_totvert(masklay);
+
+	if (masklay_shape->tot_vert == tot) {
+		float *fp = masklay_shape->data;
+
+		MaskSpline *spline;
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			int i;
+			for (i = 0; i < spline->tot_point; i++) {
+				mask_layer_shape_to_mask_point(&spline->points[i].bezt, fp);
+				fp += MASK_OBJECT_SHAPE_ELEM_SIZE;
+			}
+		}
+	}
+	else {
+		printf("%s: vert mismatch %d != %d (frame %d)\n",
+		       __func__, masklay_shape->tot_vert, tot, masklay_shape->frame);
+	}
+}
+
+BLI_INLINE void interp_v2_v2v2_flfl(float target[2], const float a[2], const float b[2],
+                                    const float t, const float s)
+{
+	target[0] = s * a[0] + t * b[0];
+	target[1] = s * a[1] + t * b[1];
+}
+
+/* linear interpolation only */
+void BKE_mask_layer_shape_to_mask_interp(MaskLayer *masklay,
+                                         MaskLayerShape *masklay_shape_a,
+                                         MaskLayerShape *masklay_shape_b,
+                                         const float fac)
+{
+	int tot = BKE_mask_layer_shape_totvert(masklay);
+	if (masklay_shape_a->tot_vert == tot && masklay_shape_b->tot_vert == tot) {
+		float *fp_a = masklay_shape_a->data;
+		float *fp_b = masklay_shape_b->data;
+		const float ifac = 1.0f - fac;
+
+		MaskSpline *spline;
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			int i;
+			for (i = 0; i < spline->tot_point; i++) {
+				BezTriple *bezt = &spline->points[i].bezt;
+				/* *** BKE_mask_layer_shape_from_mask - swapped *** */
+				interp_v2_v2v2_flfl(bezt->vec[0], fp_a, fp_b, fac, ifac); fp_a += 2; fp_b += 2;
+				interp_v2_v2v2_flfl(bezt->vec[1], fp_a, fp_b, fac, ifac); fp_a += 2; fp_b += 2;
+				interp_v2_v2v2_flfl(bezt->vec[2], fp_a, fp_b, fac, ifac); fp_a += 2; fp_b += 2;
+				bezt->weight = (fp_a[0] * ifac) + (fp_b[0] * fac);
+				bezt->radius = (fp_a[1] * ifac) + (fp_b[1] * fac); fp_a += 2; fp_b += 2;
+			}
+		}
+	}
+	else {
+		printf("%s: vert mismatch %d != %d != %d (frame %d - %d)\n",
+		       __func__, masklay_shape_a->tot_vert, masklay_shape_b->tot_vert, tot,
+		       masklay_shape_a->frame, masklay_shape_b->frame);
+	}
+}
+
+MaskLayerShape *BKE_mask_layer_shape_find_frame(MaskLayer *masklay, const int frame)
+{
+	MaskLayerShape *masklay_shape;
+
+	for (masklay_shape = masklay->splines_shapes.first;
+	     masklay_shape;
+	     masklay_shape = masklay_shape->next)
+	{
+		if (frame == masklay_shape->frame) {
+			return masklay_shape;
+		}
+		else if (frame < masklay_shape->frame) {
+			break;
+		}
+	}
+
+	return NULL;
+}
+
+/* when returning 2 - the frame isnt found but before/after frames are */
+int BKE_mask_layer_shape_find_frame_range(MaskLayer *masklay, const float frame,
+                                          MaskLayerShape **r_masklay_shape_a,
+                                          MaskLayerShape **r_masklay_shape_b)
+{
+	MaskLayerShape *masklay_shape;
+
+	for (masklay_shape = masklay->splines_shapes.first;
+	     masklay_shape;
+	     masklay_shape = masklay_shape->next)
+	{
+		if (frame == masklay_shape->frame) {
+			*r_masklay_shape_a = masklay_shape;
+			*r_masklay_shape_b = NULL;
+			return 1;
+		}
+		else if (frame < masklay_shape->frame) {
+			if (masklay_shape->prev) {
+				*r_masklay_shape_a = masklay_shape->prev;
+				*r_masklay_shape_b = masklay_shape;
+				return 2;
+			}
+			else {
+				*r_masklay_shape_a = masklay_shape;
+				*r_masklay_shape_b = NULL;
+				return 1;
+			}
+		}
+	}
+
+	if ((masklay_shape = masklay->splines_shapes.last)) {
+		*r_masklay_shape_a = masklay_shape;
+		*r_masklay_shape_b = NULL;
+		return 1;
+	}
+	else {
+		*r_masklay_shape_a = NULL;
+		*r_masklay_shape_b = NULL;
+
+		return 0;
+	}
+}
+
+MaskLayerShape *BKE_mask_layer_shape_varify_frame(MaskLayer *masklay, const int frame)
+{
+	MaskLayerShape *masklay_shape;
+
+	masklay_shape = BKE_mask_layer_shape_find_frame(masklay, frame);
+
+	if (masklay_shape == NULL) {
+		masklay_shape = BKE_mask_layer_shape_alloc(masklay, frame);
+		BLI_addtail(&masklay->splines_shapes, masklay_shape);
+		BKE_mask_layer_shape_sort(masklay);
+	}
+
+#if 0
+	{
+		MaskLayerShape *masklay_shape;
+		int i = 0;
+		for (masklay_shape = masklay->splines_shapes.first;
+		     masklay_shape;
+		     masklay_shape = masklay_shape->next)
+		{
+			printf("mask %d, %d\n", i++, masklay_shape->frame);
+		}
+	}
+#endif
+
+	return masklay_shape;
+}
+
+MaskLayerShape *BKE_mask_layer_shape_duplicate(MaskLayerShape *masklay_shape)
+{
+	MaskLayerShape *masklay_shape_copy;
+
+	masklay_shape_copy = MEM_dupallocN(masklay_shape);
+
+	if (LIKELY(masklay_shape_copy->data)) {
+		masklay_shape_copy->data = MEM_dupallocN(masklay_shape_copy->data);
+	}
+
+	return masklay_shape_copy;
+}
+
+void BKE_mask_layer_shape_unlink(MaskLayer *masklay, MaskLayerShape *masklay_shape)
+{
+	BLI_remlink(&masklay->splines_shapes, masklay_shape);
+
+	BKE_mask_layer_shape_free(masklay_shape);
+}
+
+static int mask_layer_shape_sort_cb(void *masklay_shape_a_ptr, void *masklay_shape_b_ptr)
+{
+	MaskLayerShape *masklay_shape_a = (MaskLayerShape *)masklay_shape_a_ptr;
+	MaskLayerShape *masklay_shape_b = (MaskLayerShape *)masklay_shape_b_ptr;
+
+	if      (masklay_shape_a->frame < masklay_shape_b->frame)  return -1;
+	else if (masklay_shape_a->frame > masklay_shape_b->frame)  return  1;
+	else                                                       return  0;
+}
+
+void BKE_mask_layer_shape_sort(MaskLayer *masklay)
+{
+	BLI_sortlist(&masklay->splines_shapes, mask_layer_shape_sort_cb);
+}
+
+int BKE_mask_layer_shape_spline_from_index(MaskLayer *masklay, int index,
+                                           MaskSpline **r_masklay_shape, int *r_index)
+{
+	MaskSpline *spline;
+
+	for (spline = masklay->splines.first; spline; spline = spline->next) {
+		if (index < spline->tot_point) {
+			*r_masklay_shape = spline;
+			*r_index = index;
+			return TRUE;
+		}
+		index -= spline->tot_point;
+	}
+
+	return FALSE;
+}
+
+int BKE_mask_layer_shape_spline_to_index(MaskLayer *masklay, MaskSpline *spline)
+{
+	MaskSpline *spline_iter;
+	int i_abs = 0;
+	for (spline_iter = masklay->splines.first;
+	     spline_iter && spline_iter != spline;
+	     i_abs += spline_iter->tot_point, spline_iter = spline_iter->next)
+	{
+		/* pass */
+	}
+
+	return i_abs;
+}
+
+/* basic 2D interpolation functions, could make more comprehensive later */
+static void interp_weights_uv_v2_calc(float r_uv[2], const float pt[2], const float pt_a[2], const float pt_b[2])
+{
+	float pt_on_line[2];
+	r_uv[0] = closest_to_line_v2(pt_on_line, pt, pt_a, pt_b);
+	r_uv[1] = (len_v2v2(pt_on_line, pt) / len_v2v2(pt_a, pt_b)) *
+	          ((line_point_side_v2(pt_a, pt_b, pt) < 0.0f) ? -1.0 : 1.0);  /* this line only sets the sign */
+}
+
+
+static void interp_weights_uv_v2_apply(const float uv[2], float r_pt[2], const float pt_a[2], const float pt_b[2])
+{
+	const float dvec[2] = {pt_b[0] - pt_a[0],
+	                       pt_b[1] - pt_a[1]};
+
+	/* u */
+	madd_v2_v2v2fl(r_pt, pt_a, dvec, uv[0]);
+
+	/* v */
+	r_pt[0] += -dvec[1] * uv[1];
+	r_pt[1] +=  dvec[0] * uv[1];
+}
+
+/* when a now points added - resize all shapekey array  */
+void BKE_mask_layer_shape_changed_add(MaskLayer *masklay, int index,
+                                      int do_init, int do_init_interpolate)
+{
+	MaskLayerShape *masklay_shape;
+
+	/* spline index from masklay */
+	MaskSpline *spline;
+	int spline_point_index;
+
+	if (BKE_mask_layer_shape_spline_from_index(masklay, index,
+	                                           &spline, &spline_point_index))
+	{
+		/* sanity check */
+		/* the point has already been removed in this array so subtract one when comparing with the shapes */
+		int tot = BKE_mask_layer_shape_totvert(masklay) - 1;
+
+		/* for interpolation */
+		/* TODO - assumes closed curve for now */
+		float uv[3][2]; /* 3x 2D handles */
+		const int pi_curr =   spline_point_index;
+		const int pi_prev = ((spline_point_index - 1) + spline->tot_point) % spline->tot_point;
+		const int pi_next =  (spline_point_index + 1)                      % spline->tot_point;
+
+		const int index_offset = index - spline_point_index;
+		/* const int pi_curr_abs = index; */
+		const int pi_prev_abs = pi_prev + index_offset;
+		const int pi_next_abs = pi_next + index_offset;
+
+		int i;
+		if (do_init_interpolate) {
+			for (i = 0; i < 3; i++) {
+				interp_weights_uv_v2_calc(uv[i],
+				                          spline->points[pi_curr].bezt.vec[i],
+				                          spline->points[pi_prev].bezt.vec[i],
+				                          spline->points[pi_next].bezt.vec[i]);
+			}
+		}
+
+		for (masklay_shape = masklay->splines_shapes.first;
+		     masklay_shape;
+		     masklay_shape = masklay_shape->next)
+		{
+			if (tot == masklay_shape->tot_vert) {
+				float *data_resized;
+
+				masklay_shape->tot_vert++;
+				data_resized = MEM_mallocN(masklay_shape->tot_vert * sizeof(float) * MASK_OBJECT_SHAPE_ELEM_SIZE, __func__);
+				if (index > 0) {
+					memcpy(data_resized,
+					       masklay_shape->data,
+					       index * sizeof(float) * MASK_OBJECT_SHAPE_ELEM_SIZE);
+				}
+
+				if (index != masklay_shape->tot_vert - 1) {
+					memcpy(&data_resized[(index + 1) * MASK_OBJECT_SHAPE_ELEM_SIZE],
+					       masklay_shape->data + (index * MASK_OBJECT_SHAPE_ELEM_SIZE),
+					       (masklay_shape->tot_vert - (index + 1)) * sizeof(float) * MASK_OBJECT_SHAPE_ELEM_SIZE);
+				}
+
+				if (do_init) {
+					float *fp = &data_resized[index * MASK_OBJECT_SHAPE_ELEM_SIZE];
+
+					mask_layer_shape_from_mask_point(&spline->points[spline_point_index].bezt, fp);
+
+					if (do_init_interpolate && spline->tot_point > 2) {
+						for (i = 0; i < 3; i++) {
+							interp_weights_uv_v2_apply(uv[i],
+							                           &fp[i * 2],
+							                           &data_resized[(pi_prev_abs * MASK_OBJECT_SHAPE_ELEM_SIZE) + (i * 2)],
+							                           &data_resized[(pi_next_abs * MASK_OBJECT_SHAPE_ELEM_SIZE) + (i * 2)]);
+						}
+					}
+				}
+				else {
+					memset(&data_resized[index * MASK_OBJECT_SHAPE_ELEM_SIZE],
+					       0,
+					       sizeof(float) * MASK_OBJECT_SHAPE_ELEM_SIZE);
+				}
+
+				MEM_freeN(masklay_shape->data);
+				masklay_shape->data = data_resized;
+			}
+			else {
+				printf("%s: vert mismatch %d != %d (frame %d)\n",
+				       __func__, masklay_shape->tot_vert, tot, masklay_shape->frame);
+			}
+		}
+	}
+}
+
+
+/* move array to account for removed point */
+void BKE_mask_layer_shape_changed_remove(MaskLayer *masklay, int index, int count)
+{
+	MaskLayerShape *masklay_shape;
+
+	/* the point has already been removed in this array so add one when comparing with the shapes */
+	int tot = BKE_mask_layer_shape_totvert(masklay);
+
+	for (masklay_shape = masklay->splines_shapes.first;
+	     masklay_shape;
+	     masklay_shape = masklay_shape->next)
+	{
+		if (tot == masklay_shape->tot_vert - count) {
+			float *data_resized;
+
+			masklay_shape->tot_vert -= count;
+			data_resized = MEM_mallocN(masklay_shape->tot_vert * sizeof(float) * MASK_OBJECT_SHAPE_ELEM_SIZE, __func__);
+			if (index > 0) {
+				memcpy(data_resized,
+				       masklay_shape->data,
+				       index * sizeof(float) * MASK_OBJECT_SHAPE_ELEM_SIZE);
+			}
+
+			if (index != masklay_shape->tot_vert) {
+				memcpy(&data_resized[index * MASK_OBJECT_SHAPE_ELEM_SIZE],
+				       masklay_shape->data + ((index + count) * MASK_OBJECT_SHAPE_ELEM_SIZE),
+				       (masklay_shape->tot_vert - index) * sizeof(float) * MASK_OBJECT_SHAPE_ELEM_SIZE);
+			}
+
+			MEM_freeN(masklay_shape->data);
+			masklay_shape->data = data_resized;
+		}
+		else {
+			printf("%s: vert mismatch %d != %d (frame %d)\n",
+			       __func__, masklay_shape->tot_vert - count, tot, masklay_shape->frame);
+		}
+	}
+}
+
+/* local functions */
+static void invert_vn_vn(float *array, const int size)
+{
+	float *arr = array + (size - 1);
+	int i = size;
+	while (i--) {
+		*(arr) = 1.0f - *(arr);
+		arr--;
+	}
+}
+
+static void m_invert_vn_vn(float *array, const float f, const int size)
+{
+	float *arr = array + (size - 1);
+	int i = size;
+	while (i--) {
+		*(arr) = 1.0f - (*(arr) * f);
+		arr--;
+	}
+}
+
+static void clamp_vn_vn(float *array, const int size)
+{
+	float *arr = array + (size - 1);
+
+	int i = size;
+	while (i--) {
+		if      (*arr < 0.0f) *arr = 0.0f;
+		else if (*arr > 1.0f) *arr = 1.0f;
+		arr--;
+	}
+}
+
+int BKE_mask_get_duration(Mask *mask)
+{
+	return MAX2(1, mask->efra - mask->sfra);
+}
+
+/* rasterization */
+void BKE_mask_rasterize(Mask *mask, int width, int height, float *buffer,
+                        const short do_aspect_correct, int do_mask_aa)
+{
+	MaskLayer *masklay;
+
+	/* temp blending buffer */
+	const int buffer_size = width * height;
+	float *buffer_tmp = MEM_mallocN(sizeof(float) * buffer_size, __func__);
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskSpline *spline;
+		float alpha;
+
+		if (masklay->restrictflag & MASK_RESTRICT_RENDER) {
+			continue;
+		}
+
+		memset(buffer_tmp, 0, sizeof(float) * buffer_size);
+
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			float (*diff_points)[2];
+			int tot_diff_point;
+
+			float (*diff_feather_points)[2];
+			int tot_diff_feather_points;
+
+			diff_points = BKE_mask_spline_differentiate_with_resolution(spline, width, height,
+			                                                            &tot_diff_point);
+
+			if (tot_diff_point) {
+				diff_feather_points =
+				        BKE_mask_spline_feather_differentiated_points_with_resolution(spline, width, height,
+				                                                                      &tot_diff_feather_points);
+
+				if (do_aspect_correct) {
+					if (width != height) {
+						float *fp;
+						float *ffp;
+						int i;
+						float asp;
+
+						if (width < height) {
+							fp = &diff_points[0][0];
+							ffp = tot_diff_feather_points ? &diff_feather_points[0][0] : NULL;
+							asp = (float)width / (float)height;
+						}
+						else {
+							fp = &diff_points[0][1];
+							ffp = tot_diff_feather_points ? &diff_feather_points[0][1] : NULL;
+							asp = (float)height / (float)width;
+						}
+
+						for (i = 0; i < tot_diff_point; i++, fp += 2) {
+							(*fp) = (((*fp) - 0.5f) / asp) + 0.5f;
+						}
+
+						if (tot_diff_feather_points) {
+							for (i = 0; i < tot_diff_feather_points; i++, ffp += 2) {
+								(*ffp) = (((*ffp) - 0.5f) / asp) + 0.5f;
+							}
+						}
+					}
+				}
+
+				if (tot_diff_point) {
+					PLX_raskterize(diff_points, tot_diff_point,
+					               buffer_tmp, width, height, do_mask_aa);
+
+					if (tot_diff_feather_points) {
+						PLX_raskterize_feather(diff_points, tot_diff_point,
+						                       diff_feather_points, tot_diff_feather_points,
+						                       buffer_tmp, width, height);
+						MEM_freeN(diff_feather_points);
+					}
+
+					MEM_freeN(diff_points);
+				}
+			}
+		}
+
+		/* blend with original */
+		if (masklay->blend_flag & MASK_BLENDFLAG_INVERT) {
+			/* apply alpha multiply before inverting */
+			if (masklay->alpha != 1.0f) {
+				m_invert_vn_vn(buffer_tmp, masklay->alpha, buffer_size);
+			}
+			else {
+				invert_vn_vn(buffer_tmp, buffer_size);
+			}
+
+			alpha = 1.0f;
+		}
+		else {
+			alpha = masklay->alpha;
+		}
+
+		switch (masklay->blend) {
+			case MASK_BLEND_SUBTRACT:
+			{
+				if (alpha == 1.0f) {
+					sub_vn_vn(buffer, buffer_tmp, buffer_size);
+				}
+				else {
+					msub_vn_vn(buffer, buffer_tmp, alpha, buffer_size);
+				}
+				break;
+			}
+			case MASK_BLEND_ADD:
+			default:
+			{
+				if (alpha == 1.0f) {
+					add_vn_vn(buffer, buffer_tmp, buffer_size);
+				}
+				else {
+					madd_vn_vn(buffer, buffer_tmp, alpha, buffer_size);
+				}
+				break;
+			}
+		}
+
+		/* clamp at the end */
+		clamp_vn_vn(buffer, buffer_size);
+	}
+
+	MEM_freeN(buffer_tmp);
+}
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 0eeb16be699..48d629a2944 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -607,7 +607,7 @@ Material *give_current_material(Object *ob, short act)
 	
 	if (ob == NULL) return NULL;
 	
-	/* if object cannot have material, totcolp==NULL */
+	/* if object cannot have material, (totcolp == NULL) */
 	totcolp = give_totcolp(ob);
 	if (totcolp == NULL || ob->totcol == 0) return NULL;
 	
@@ -840,7 +840,7 @@ void assign_matarar(struct Object *ob, struct Material ***matar, short totcol)
 	int actcol_orig = ob->actcol;
 	short i;
 
-	while (object_remove_material_slot(ob)) {};
+	while (object_remove_material_slot(ob)) {}
 
 	/* now we have the right number of slots */
 	for (i = 0; i < totcol; i++)
@@ -903,7 +903,7 @@ static void do_init_render_material(Material *ma, int r_mode, float *amb)
 			ma->mapto |= mtex->mapto;
 
 			/* always get derivatives for these textures */
-			if (ELEM3(mtex->tex->type, TEX_IMAGE, TEX_PLUGIN, TEX_ENVMAP)) ma->texco |= TEXCO_OSA;
+			if (ELEM(mtex->tex->type, TEX_IMAGE, TEX_ENVMAP)) ma->texco |= TEXCO_OSA;
 			else if (mtex->texflag & (MTEX_COMPAT_BUMP | MTEX_3TAP_BUMP | MTEX_5TAP_BUMP | MTEX_BICUBIC_BUMP)) ma->texco |= TEXCO_OSA;
 			
 			if (ma->texco & (TEXCO_ORCO | TEXCO_REFL | TEXCO_NORM | TEXCO_STRAND | TEXCO_STRESS)) needuv = 1;
@@ -1179,7 +1179,7 @@ int object_remove_material_slot(Object *ob)
 }
 
 
-/* r_col = current value, col = new value, fac==0 is no change */
+/* r_col = current value, col = new value, (fac == 0) is no change */
 void ramp_blend(int type, float r_col[3], const float fac, const float col[3])
 {
 	float tmp, facm = 1.0f - fac;
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index bef5f2e18a3..b5b03a8924f 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -816,7 +816,7 @@ static int totindex, curindex;
 static void accum_mballfaces(int i1, int i2, int i3, int i4)
 {
 	int *newi, *cur;
-	/* static int i=0; I would like to delete altogether, but I don't dare to, yet */
+	/* static int i = 0; I would like to delete altogether, but I don't dare to, yet */
 
 	if (totindex == curindex) {
 		totindex += 256;
@@ -1701,7 +1701,7 @@ static float init_meta(Scene *scene, Object *ob)    /* return totsize */
 	MetaBall *mb;
 	MetaElem *ml;
 	float size, totsize, obinv[4][4], obmat[4][4], vec[3];
-	//float max=0.0;
+	//float max = 0.0f;
 	int a, obnr, zero_size = 0;
 	char obname[MAX_ID_NAME];
 	
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index 9eb74986b29..d0b9e73e295 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -1823,7 +1823,7 @@ void BKE_mesh_calc_normals_mapping_ex(MVert *mverts, int numVerts,
 	}
 
 	if (origIndexFace &&
-	    /* fnors==faceNors_r */ /* NO NEED TO ALLOC YET */
+	    /* fnors == faceNors_r */ /* NO NEED TO ALLOC YET */
 	    fnors != NULL &&
 	    numFaces)
 	{
@@ -1946,8 +1946,8 @@ void BKE_mesh_calc_normals_tessface(MVert *mverts, int numVerts, MFace *mfaces,
 		MEM_freeN(fnors);
 }
 
-
-static void bm_corners_to_loops(Mesh *me, int findex, int loopstart, int numTex, int numCol)
+static void bm_corners_to_loops_ex(ID *id, CustomData *fdata, CustomData *ldata, CustomData *pdata,
+                                   MFace *mface, int totloop, int findex, int loopstart, int numTex, int numCol)
 {
 	MTFace *texface;
 	MTexPoly *texpoly;
@@ -1957,15 +1957,15 @@ static void bm_corners_to_loops(Mesh *me, int findex, int loopstart, int numTex,
 	MFace *mf;
 	int i;
 
-	mf = me->mface + findex;
+	mf = mface + findex;
 
 	for (i = 0; i < numTex; i++) {
-		texface = CustomData_get_n(&me->fdata, CD_MTFACE, findex, i);
-		texpoly = CustomData_get_n(&me->pdata, CD_MTEXPOLY, findex, i); 
-		
+		texface = CustomData_get_n(fdata, CD_MTFACE, findex, i);
+		texpoly = CustomData_get_n(pdata, CD_MTEXPOLY, findex, i);
+
 		ME_MTEXFACE_CPY(texpoly, texface);
-	
-		mloopuv = CustomData_get_n(&me->ldata, CD_MLOOPUV, loopstart, i);
+
+		mloopuv = CustomData_get_n(ldata, CD_MLOOPUV, loopstart, i);
 		copy_v2_v2(mloopuv->uv, texface->uv[0]); mloopuv++;
 		copy_v2_v2(mloopuv->uv, texface->uv[1]); mloopuv++;
 		copy_v2_v2(mloopuv->uv, texface->uv[2]); mloopuv++;
@@ -1976,8 +1976,8 @@ static void bm_corners_to_loops(Mesh *me, int findex, int loopstart, int numTex,
 	}
 
 	for (i = 0; i < numCol; i++) {
-		mloopcol = CustomData_get_n(&me->ldata, CD_MLOOPCOL, loopstart, i);
-		mcol = CustomData_get_n(&me->fdata, CD_MCOL, findex, i);
+		mloopcol = CustomData_get_n(ldata, CD_MLOOPCOL, loopstart, i);
+		mcol = CustomData_get_n(fdata, CD_MCOL, findex, i);
 
 		MESH_MLOOPCOL_FROM_MCOL(mloopcol, &mcol[0]); mloopcol++;
 		MESH_MLOOPCOL_FROM_MCOL(mloopcol, &mcol[1]); mloopcol++;
@@ -1986,37 +1986,39 @@ static void bm_corners_to_loops(Mesh *me, int findex, int loopstart, int numTex,
 			MESH_MLOOPCOL_FROM_MCOL(mloopcol, &mcol[3]); mloopcol++;
 		}
 	}
-	
-	if (CustomData_has_layer(&me->fdata, CD_MDISPS)) {
-		MDisps *ld = CustomData_get(&me->ldata, loopstart, CD_MDISPS);
-		MDisps *fd = CustomData_get(&me->fdata, findex, CD_MDISPS);
+
+	if (CustomData_has_layer(fdata, CD_MDISPS)) {
+		MDisps *ld = CustomData_get(ldata, loopstart, CD_MDISPS);
+		MDisps *fd = CustomData_get(fdata, findex, CD_MDISPS);
 		float (*disps)[3] = fd->disps;
 		int i, tot = mf->v4 ? 4 : 3;
 		int side, corners;
 
-		if (CustomData_external_test(&me->fdata, CD_MDISPS)) {
-			CustomData_external_add(&me->ldata, &me->id, CD_MDISPS,
-			                        me->totloop, me->fdata.external->filename);
+		if (CustomData_external_test(fdata, CD_MDISPS)) {
+			if (id) {
+				CustomData_external_add(ldata, id, CD_MDISPS,
+				                        totloop, fdata->external->filename);
+			}
 		}
-		
+
 		corners = multires_mdisp_corners(fd);
-		
+
 		if (corners == 0) {
 			/* Empty MDisp layers appear in at least one of the sintel.blend files.
 			 * Not sure why this happens, but it seems fine to just ignore them here.
-			 * If corners==0 for a non-empty layer though, something went wrong. */
+			 * If (corners == 0) for a non-empty layer though, something went wrong. */
 			BLI_assert(fd->totdisp == 0);
 		}
 		else {
 			side = sqrt(fd->totdisp / corners);
-		
+
 			for (i = 0; i < tot; i++, disps += side * side, ld++) {
 				ld->totdisp = side * side;
 				ld->level = (int)(logf(side - 1.0f) / (float)M_LN2) + 1;
-			
+
 				if (ld->disps)
 					MEM_freeN(ld->disps);
-			
+
 				ld->disps = MEM_callocN(sizeof(float) * 3 * side * side, "converted loop mdisps");
 				if (fd->disps) {
 					memcpy(ld->disps, disps, sizeof(float) * 3 * side * side);
@@ -2028,70 +2030,109 @@ static void bm_corners_to_loops(Mesh *me, int findex, int loopstart, int numTex,
 
 void BKE_mesh_convert_mfaces_to_mpolys(Mesh *mesh)
 {
+	BKE_mesh_convert_mfaces_to_mpolys_ex(&mesh->id, &mesh->fdata, &mesh->ldata, &mesh->pdata,
+	                                     mesh->totedge, mesh->totface, mesh->totloop, mesh->totpoly,
+	                                     mesh->medge, mesh->mface,
+	                                     &mesh->totloop, &mesh->totpoly, &mesh->mloop, &mesh->mpoly);
+
+	mesh_update_customdata_pointers(mesh, TRUE);
+}
+
+/* the same as BKE_mesh_convert_mfaces_to_mpolys but oriented to be used in do_versions from readfile.c
+ * the difference is how active/render/clone/stencil indices are handled here
+ *
+ * normally thay're being set from pdata which totally makes sense for meshes which are already
+ * converted to bmesh structures, but when loading older files indices shall be updated in other
+ * way around, so newly added pdata and ldata would have this indices set based on fdata layer
+ *
+ * this is normally only needed when reading older files, in all other cases BKE_mesh_convert_mfaces_to_mpolys
+ * shall be always used
+ */
+void BKE_mesh_do_versions_convert_mfaces_to_mpolys(Mesh *mesh)
+{
+	BKE_mesh_convert_mfaces_to_mpolys_ex(&mesh->id, &mesh->fdata, &mesh->ldata, &mesh->pdata,
+	                                     mesh->totedge, mesh->totface, mesh->totloop, mesh->totpoly,
+	                                     mesh->medge, mesh->mface,
+	                                     &mesh->totloop, &mesh->totpoly, &mesh->mloop, &mesh->mpoly);
+
+	CustomData_bmesh_do_versions_update_active_layers(&mesh->fdata, &mesh->pdata, &mesh->ldata);
+
+	mesh_update_customdata_pointers(mesh, TRUE);
+}
+
+void BKE_mesh_convert_mfaces_to_mpolys_ex(ID *id, CustomData *fdata, CustomData *ldata, CustomData *pdata,
+                                          int totedge_i, int totface_i, int totloop_i, int totpoly_i,
+                                          MEdge *medge, MFace *mface,
+                                          int *totloop_r, int *totpoly_r,
+                                          MLoop **mloop_r, MPoly **mpoly_r)
+{
 	MFace *mf;
-	MLoop *ml;
-	MPoly *mp;
+	MLoop *ml, *mloop;
+	MPoly *mp, *mpoly;
 	MEdge *me;
 	EdgeHash *eh;
 	int numTex, numCol;
-	int i, j, totloop;
+	int i, j, totloop, totpoly, *polyindex;
 
 	/* just in case some of these layers are filled in (can happen with python created meshes) */
-	CustomData_free(&mesh->ldata, mesh->totloop);
-	CustomData_free(&mesh->pdata, mesh->totpoly);
-	memset(&mesh->ldata, 0, sizeof(mesh->ldata));
-	memset(&mesh->pdata, 0, sizeof(mesh->pdata));
+	CustomData_free(ldata, totloop_i);
+	CustomData_free(pdata, totpoly_i);
+	memset(ldata, 0, sizeof(*ldata));
+	memset(pdata, 0, sizeof(*pdata));
 
-	mesh->totpoly = mesh->totface;
-	mesh->mpoly = MEM_callocN(sizeof(MPoly) * mesh->totpoly, "mpoly converted");
-	CustomData_add_layer(&mesh->pdata, CD_MPOLY, CD_ASSIGN, mesh->mpoly, mesh->totpoly);
+	totpoly = totface_i;
+	mpoly = MEM_callocN(sizeof(MPoly) * totpoly, "mpoly converted");
+	CustomData_add_layer(pdata, CD_MPOLY, CD_ASSIGN, mpoly, totpoly);
+
+	numTex = CustomData_number_of_layers(fdata, CD_MTFACE);
+	numCol = CustomData_number_of_layers(fdata, CD_MCOL);
 
-	numTex = CustomData_number_of_layers(&mesh->fdata, CD_MTFACE);
-	numCol = CustomData_number_of_layers(&mesh->fdata, CD_MCOL);
-	
 	totloop = 0;
-	mf = mesh->mface;
-	for (i = 0; i < mesh->totface; i++, mf++) {
+	mf = mface;
+	for (i = 0; i < totface_i; i++, mf++) {
 		totloop += mf->v4 ? 4 : 3;
 	}
-	
-	mesh->totloop = totloop;
-	mesh->mloop = MEM_callocN(sizeof(MLoop) * mesh->totloop, "mloop converted");
 
-	CustomData_add_layer(&mesh->ldata, CD_MLOOP, CD_ASSIGN, mesh->mloop, totloop);
-	CustomData_to_bmeshpoly(&mesh->fdata, &mesh->pdata, &mesh->ldata,
-	                        mesh->totloop, mesh->totpoly);
+	mloop = MEM_callocN(sizeof(MLoop) * totloop, "mloop converted");
+
+	CustomData_add_layer(ldata, CD_MLOOP, CD_ASSIGN, mloop, totloop);
 
-	/* ensure external data is transferred */
-	CustomData_external_read(&mesh->fdata, &mesh->id, CD_MASK_MDISPS, mesh->totface);
+	CustomData_to_bmeshpoly(fdata, pdata, ldata, totloop, totpoly);
+
+	if (id) {
+		/* ensure external data is transferred */
+		CustomData_external_read(fdata, id, CD_MASK_MDISPS, totface_i);
+	}
 
 	eh = BLI_edgehash_new();
 
-	/*build edge hash*/
-	me = mesh->medge;
-	for (i = 0; i < mesh->totedge; i++, me++) {
+	/* build edge hash */
+	me = medge;
+	for (i = 0; i < totedge_i; i++, me++) {
 		BLI_edgehash_insert(eh, me->v1, me->v2, SET_INT_IN_POINTER(i));
 
 		/* unrelated but avoid having the FGON flag enabled, so we can reuse it later for something else */
 		me->flag &= ~ME_FGON;
 	}
 
-	j = 0; /*current loop index*/
-	ml = mesh->mloop;
-	mf = mesh->mface;
-	mp = mesh->mpoly;
-	for (i = 0; i < mesh->totface; i++, mf++, mp++) {
+	polyindex = CustomData_get_layer(fdata, CD_POLYINDEX);
+
+	j = 0; /* current loop index */
+	ml = mloop;
+	mf = mface;
+	mp = mpoly;
+	for (i = 0; i < totface_i; i++, mf++, mp++) {
 		mp->loopstart = j;
-		
+
 		mp->totloop = mf->v4 ? 4 : 3;
 
 		mp->mat_nr = mf->mat_nr;
 		mp->flag = mf->flag;
-		
+
 #       define ML(v1, v2) { \
 			ml->v = mf->v1; ml->e = GET_INT_FROM_POINTER(BLI_edgehash_lookup(eh, mf->v1, mf->v2)); ml++; j++; \
 		} (void)0
-		
+
 		ML(v1, v2);
 		ML(v2, v3);
 		if (mf->v4) {
@@ -2101,18 +2142,26 @@ void BKE_mesh_convert_mfaces_to_mpolys(Mesh *mesh)
 		else {
 			ML(v3, v1);
 		}
-		
+
 #       undef ML
 
-		bm_corners_to_loops(mesh, i, mp->loopstart, numTex, numCol);
+		bm_corners_to_loops_ex(id, fdata, ldata, pdata, mface, totloop, i, mp->loopstart, numTex, numCol);
+
+		if (polyindex) {
+			*polyindex = i;
+			polyindex++;
+		}
 	}
 
 	/* note, we don't convert FGons at all, these are not even real ngons,
 	 * they have their own UV's, colors etc - its more an editing feature. */
 
-	mesh_update_customdata_pointers(mesh, TRUE);
-
 	BLI_edgehash_free(eh, NULL);
+
+	*totpoly_r = totpoly;
+	*totloop_r = totloop;
+	*mpoly_r = mpoly;
+	*mloop_r = mloop;
 }
 
 float (*mesh_getVertexCos(Mesh * me, int *numVerts_r))[3]
diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c
index a60bb98ac18..669ae4f198a 100644
--- a/source/blender/blenkernel/intern/mesh_validate.c
+++ b/source/blender/blenkernel/intern/mesh_validate.c
@@ -103,11 +103,11 @@ int BKE_mesh_validate_arrays(Mesh *mesh,
                              MDeformVert *dverts, /* assume totvert length */
                              const short do_verbose, const short do_fixes)
 {
-#   define REMOVE_EDGE_TAG(_me) { _me->v2 = _me->v1; do_edge_free = TRUE; }
+#   define REMOVE_EDGE_TAG(_me) { _me->v2 = _me->v1; do_edge_free = TRUE; } (void)0
 #   define IS_REMOVED_EDGE(_me) (_me->v2 == _me->v1)
 
-#   define REMOVE_LOOP_TAG(_ml) { _ml->e = INVALID_LOOP_EDGE_MARKER; do_polyloop_free = TRUE; }
-#   define REMOVE_POLY_TAG(_mp) { _mp->totloop *= -1; do_polyloop_free = TRUE; }
+#   define REMOVE_LOOP_TAG(_ml) { _ml->e = INVALID_LOOP_EDGE_MARKER; do_polyloop_free = TRUE; } (void)0
+#   define REMOVE_POLY_TAG(_mp) { _mp->totloop *= -1; do_polyloop_free = TRUE; } (void)0
 
 	MVert *mv = mverts;
 	MEdge *me;
diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c
index ccf64639967..68adb599c6c 100644
--- a/source/blender/blenkernel/intern/movieclip.c
+++ b/source/blender/blenkernel/intern/movieclip.c
@@ -154,11 +154,12 @@ static void get_sequence_fname(MovieClip *clip, int framenr, char *name)
 	BLI_stringdec(name, head, tail, &numlen);
 
 	/* movieclips always points to first image from sequence,
-	 * autoguess offset for now. could be something smarter in the future */
+	 * autoguess offset for now. could be something smarter in the future
+	 */
 	offset = sequence_guess_offset(clip->name, strlen(head), numlen);
 
 	if (numlen)
-		BLI_stringenc(name, head, tail, numlen, offset + framenr - 1);
+		BLI_stringenc(name, head, tail, numlen, offset + framenr - clip->start_frame + clip->frame_offset);
 	else
 		BLI_strncpy(name, clip->name, sizeof(clip->name));
 
@@ -170,6 +171,7 @@ static void get_proxy_fname(MovieClip *clip, int proxy_render_size, int undistor
 {
 	int size = rendersize_to_number(proxy_render_size);
 	char dir[FILE_MAX], clipdir[FILE_MAX], clipfile[FILE_MAX];
+	int proxynr = framenr - clip->start_frame + 1 + clip->frame_offset;
 
 	BLI_split_dirfile(clip->name, clipdir, clipfile, FILE_MAX, FILE_MAX);
 
@@ -181,9 +183,9 @@ static void get_proxy_fname(MovieClip *clip, int proxy_render_size, int undistor
 	}
 
 	if (undistorted)
-		BLI_snprintf(name, FILE_MAX, "%s/%s/proxy_%d_undistorted/%08d", dir, clipfile, size, framenr);
+		BLI_snprintf(name, FILE_MAX, "%s/%s/proxy_%d_undistorted/%08d", dir, clipfile, size, proxynr);
 	else
-		BLI_snprintf(name, FILE_MAX, "%s/%s/proxy_%d/%08d", dir, clipfile, size, framenr);
+		BLI_snprintf(name, FILE_MAX, "%s/%s/proxy_%d/%08d", dir, clipfile, size, proxynr);
 
 	BLI_path_abs(name, G.main->name);
 	BLI_path_frame(name, 1, 0);
@@ -248,7 +250,7 @@ static ImBuf *movieclip_load_movie_file(MovieClip *clip, MovieClipUser *user, in
 		int fra;
 
 		dur = IMB_anim_get_duration(clip->anim, tc);
-		fra = framenr - 1;
+		fra = framenr - clip->start_frame + clip->frame_offset;
 
 		if (fra < 0)
 			fra = 0;
@@ -312,7 +314,7 @@ typedef struct MovieClipCache {
 		/* cache for undistorted shot */
 		float principal[2];
 		float k1, k2, k3;
-		short undistoriton_used;
+		short undistortion_used;
 
 		int proxy;
 		short render_flag;
@@ -434,7 +436,7 @@ static MovieClip *movieclip_alloc(const char *name)
 
 	clip->aspx = clip->aspy = 1.0f;
 
-	BKE_tracking_init_settings(&clip->tracking);
+	BKE_tracking_settings_init(&clip->tracking);
 
 	clip->proxy.build_size_flag = IMB_PROXY_25;
 	clip->proxy.build_tc_flag = IMB_TC_RECORD_RUN |
@@ -443,6 +445,9 @@ static MovieClip *movieclip_alloc(const char *name)
 	                            IMB_TC_RECORD_RUN_NO_GAPS;
 	clip->proxy.quality = 90;
 
+	clip->start_frame = 1;
+	clip->frame_offset = 0;
+
 	return clip;
 }
 
@@ -543,7 +548,7 @@ static ImBuf *get_undistorted_ibuf(MovieClip *clip, struct MovieDistortion *dist
 	if (distortion)
 		undistibuf = BKE_tracking_distortion_exec(distortion, &clip->tracking, ibuf, ibuf->x, ibuf->y, 0.0f, 1);
 	else
-		undistibuf = BKE_tracking_undistort(&clip->tracking, ibuf, ibuf->x, ibuf->y, 0.0f);
+		undistibuf = BKE_tracking_undistort_frame(&clip->tracking, ibuf, ibuf->x, ibuf->y, 0.0f);
 
 	if (undistibuf->userflags & IB_RECT_INVALID) {
 		ibuf->userflags &= ~IB_RECT_INVALID;
@@ -623,7 +628,7 @@ static ImBuf *get_postprocessed_cached_frame(MovieClip *clip, MovieClipUser *use
 		if (!check_undistortion_cache_flags(clip))
 			return NULL;
 	}
-	else if (cache->postprocessed.undistoriton_used)
+	else if (cache->postprocessed.undistortion_used)
 		return NULL;
 
 	IMB_refImBuf(cache->postprocessed.ibuf);
@@ -656,11 +661,11 @@ static ImBuf *put_postprocessed_frame_to_cache(MovieClip *clip, MovieClipUser *u
 	if (need_undistortion_postprocess(user, flag)) {
 		copy_v2_v2(cache->postprocessed.principal, camera->principal);
 		copy_v3_v3(&cache->postprocessed.k1, &camera->k1);
-		cache->postprocessed.undistoriton_used = TRUE;
+		cache->postprocessed.undistortion_used = TRUE;
 		postproc_ibuf = get_undistorted_ibuf(clip, NULL, ibuf);
 	}
 	else {
-		cache->postprocessed.undistoriton_used = FALSE;
+		cache->postprocessed.undistortion_used = FALSE;
 	}
 
 	if (postprocess_flag) {
@@ -673,7 +678,7 @@ static ImBuf *put_postprocessed_frame_to_cache(MovieClip *clip, MovieClipUser *u
 			postproc_ibuf = IMB_dupImBuf(ibuf);
 
 		if (disable_red || disable_green || disable_blue || grayscale)
-			BKE_tracking_disable_imbuf_channels(postproc_ibuf, disable_red, disable_green, disable_blue, 1);
+			BKE_tracking_disable_channels(postproc_ibuf, disable_red, disable_green, disable_blue, 1);
 	}
 
 	IMB_refImBuf(postproc_ibuf);
@@ -768,6 +773,7 @@ static ImBuf *get_stable_cached_frame(MovieClip *clip, MovieClipUser *user, int
 	float tloc[2], tscale, tangle;
 	short proxy = IMB_PROXY_NONE;
 	int render_flag = 0;
+	int clip_framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, framenr);
 
 	if (clip->flag & MCLIP_USE_PROXY) {
 		proxy = rendersize_to_proxy(user, clip->flag);
@@ -794,7 +800,7 @@ static ImBuf *get_stable_cached_frame(MovieClip *clip, MovieClipUser *user, int
 
 	stableibuf = cache->stabilized.ibuf;
 
-	BKE_tracking_stabilization_data(&clip->tracking, framenr, stableibuf->x, stableibuf->y, tloc, &tscale, &tangle);
+	BKE_tracking_stabilization_data_get(&clip->tracking, clip_framenr, stableibuf->x, stableibuf->y, tloc, &tscale, &tangle);
 
 	/* check for stabilization parameters */
 	if (tscale != cache->stabilized.scale ||
@@ -816,11 +822,12 @@ static ImBuf *put_stabilized_frame_to_cache(MovieClip *clip, MovieClipUser *user
 	MovieTracking *tracking = &clip->tracking;
 	ImBuf *stableibuf;
 	float tloc[2], tscale, tangle;
+	int clip_framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, framenr);
 
 	if (cache->stabilized.ibuf)
 		IMB_freeImBuf(cache->stabilized.ibuf);
 
-	stableibuf = BKE_tracking_stabilize(&clip->tracking, framenr, ibuf, tloc, &tscale, &tangle);
+	stableibuf = BKE_tracking_stabilize_frame(&clip->tracking, clip_framenr, ibuf, tloc, &tscale, &tangle);
 
 	cache->stabilized.ibuf = stableibuf;
 
@@ -912,7 +919,17 @@ int BKE_movieclip_has_frame(MovieClip *clip, MovieClipUser *user)
 
 void BKE_movieclip_get_size(MovieClip *clip, MovieClipUser *user, int *width, int *height)
 {
+#if 0
+	/* originally was needed to support image sequences with different image dimensions,
+	 * which might be useful for such things as reconstruction of unordered image sequence,
+	 * or painting/rotoscoping of non-equal-sized images, but this ended up in unneeded
+	 * cache lookups and even unwanted non-proxied files loading when doing mask parenting,
+	 * so let's disable this for now and assume image sequence consists of images with
+	 * equal sizes (sergey)
+	 */
 	if (user->framenr == clip->lastframe) {
+#endif
+	if (clip->lastsize[0] != 0 && clip->lastsize[1] != 0) {
 		*width = clip->lastsize[0];
 		*height = clip->lastsize[1];
 	}
@@ -1018,15 +1035,22 @@ void BKE_movieclip_update_scopes(MovieClip *clip, MovieClipUser *user, MovieClip
 		scopes->track_preview = NULL;
 	}
 
+	if (scopes->track_search) {
+		IMB_freeImBuf(scopes->track_search);
+		scopes->track_search = NULL;
+	}
+
 	scopes->marker = NULL;
 	scopes->track = NULL;
+	scopes->track_locked = TRUE;
 
 	if (clip) {
-		MovieTrackingTrack *act_track = BKE_tracking_active_track(&clip->tracking);
+		MovieTrackingTrack *act_track = BKE_tracking_track_get_active(&clip->tracking);
 
 		if (act_track) {
 			MovieTrackingTrack *track = act_track;
-			MovieTrackingMarker *marker = BKE_tracking_get_marker(track, user->framenr);
+			int framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, user->framenr);
+			MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
 
 			if (marker->flag & MARKER_DISABLED) {
 				scopes->track_disabled = TRUE;
@@ -1035,9 +1059,11 @@ void BKE_movieclip_update_scopes(MovieClip *clip, MovieClipUser *user, MovieClip
 				ImBuf *ibuf = BKE_movieclip_get_ibuf(clip, user);
 
 				scopes->track_disabled = FALSE;
+				scopes->marker = marker;
+				scopes->track = track;
 
 				if (ibuf && (ibuf->rect || ibuf->rect_float)) {
-					ImBuf *tmpibuf;
+					ImBuf *search_ibuf;
 					MovieTrackingMarker undist_marker = *marker;
 
 					if (user->render_flag & MCLIP_PROXY_RENDER_UNDISTORT) {
@@ -1049,33 +1075,43 @@ void BKE_movieclip_update_scopes(MovieClip *clip, MovieClipUser *user, MovieClip
 						undist_marker.pos[0] *= width;
 						undist_marker.pos[1] *= height * aspy;
 
-						BKE_tracking_invert_intrinsics(&clip->tracking, undist_marker.pos, undist_marker.pos);
+						BKE_tracking_undistort_v2(&clip->tracking, undist_marker.pos, undist_marker.pos);
 
 						undist_marker.pos[0] /= width;
 						undist_marker.pos[1] /= height * aspy;
 					}
 
-					/* NOTE: margin should be kept in sync with value from ui_draw_but_TRACKPREVIEW */
-					tmpibuf = BKE_tracking_get_pattern_imbuf(ibuf, track, &undist_marker, 3 /* margin */,
-					                                         1 /* anchor */, scopes->track_pos, NULL);
+					search_ibuf = BKE_tracking_get_search_imbuf(ibuf, track, &undist_marker, TRUE, TRUE);
+
+					if (!search_ibuf->rect_float) {
+						/* sampling happens in float buffer */
+						IMB_float_from_rect(search_ibuf);
+					}
 
-					if (tmpibuf->rect_float)
-						IMB_rect_from_float(tmpibuf);
+					scopes->undist_marker = undist_marker;
+					scopes->track_search = search_ibuf;
 
-					if (tmpibuf->rect)
-						scopes->track_preview = tmpibuf;
-					else
-						IMB_freeImBuf(tmpibuf);
+					scopes->frame_width = ibuf->x;
+					scopes->frame_height = ibuf->y;
+
+					scopes->use_track_mask = track->flag & TRACK_PREVIEW_ALPHA;
 				}
 
 				IMB_freeImBuf(ibuf);
 			}
 
 			if ((track->flag & TRACK_LOCKED) == 0) {
-				scopes->marker = marker;
-				scopes->track = track;
-				scopes->slide_scale[0] = track->pat_max[0] - track->pat_min[0];
-				scopes->slide_scale[1] = track->pat_max[1] - track->pat_min[1];
+				float pat_min[2], pat_max[2];
+
+				scopes->track_locked = FALSE;
+
+				/* XXX: would work fine with non-transformed patterns, but would likely fail
+				 *      with transformed patterns, but that would be easier to debug when
+				 *      we'll have real pattern sampling (at least to test) */
+				BKE_tracking_marker_pattern_minmax(marker, pat_min, pat_max);
+
+				scopes->slide_scale[0] = pat_max[0] - pat_min[0];
+				scopes->slide_scale[1] = pat_max[1] - pat_min[1];
 			}
 		}
 	}
@@ -1218,3 +1254,13 @@ void BKE_movieclip_unlink(Main *bmain, MovieClip *clip)
 
 	clip->id.us = 0;
 }
+
+int BKE_movieclip_remap_scene_to_clip_frame(MovieClip *clip, int framenr)
+{
+	return framenr - clip->start_frame + 1;
+}
+
+int BKE_movieclip_remap_clip_to_scene_frame(MovieClip *clip, int framenr)
+{
+	return framenr + clip->start_frame - 1;
+}
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index 4e8b67bd55b..cb6f6823f48 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -548,13 +548,6 @@ static void multires_reallocate_mdisps(int totloop, MDisps *mdisps, int lvl)
 	}
 }
 
-static void column_vectors_to_mat3(float mat[][3], float v1[3], float v2[3], float v3[3])
-{
-	copy_v3_v3(mat[0], v1);
-	copy_v3_v3(mat[1], v2);
-	copy_v3_v3(mat[2], v3);
-}
-
 static void multires_copy_grid(float (*gridA)[3], float (*gridB)[3], int sizeA, int sizeB)
 {
 	int x, y, j, skip;
@@ -685,7 +678,7 @@ static void multires_del_higher(MultiresModifierData *mmd, Object *ob, int lvl)
 	multires_set_tot_level(ob, mmd, lvl);
 }
 
-/* direction=1 for delete higher, direction=0 for lower (not implemented yet) */
+/* (direction = 1) for delete higher, (direction = 0) for lower (not implemented yet) */
 void multiresModifier_del_levels(MultiresModifierData *mmd, Object *ob, int direction)
 {
 	Mesh *me = BKE_mesh_from_object(ob);
@@ -962,7 +955,7 @@ void multiresModifier_subdivide(MultiresModifierData *mmd, Object *ob, int updat
 	multires_subdivide(mmd, ob, mmd->totlvl + 1, updateblock, simple);
 }
 
-void grid_tangent(const CCGKey *key, int x, int y, int axis, CCGElem *grid, float t[3])
+static void grid_tangent(const CCGKey *key, int x, int y, int axis, CCGElem *grid, float t[3])
 {
 	if (axis == 0) {
 		if (x == key->grid_size - 1) {
@@ -986,6 +979,19 @@ void grid_tangent(const CCGKey *key, int x, int y, int axis, CCGElem *grid, floa
 	}
 }
 
+/* Construct 3x3 tangent-space matrix in 'mat' */
+static void grid_tangent_matrix(float mat[3][3], const CCGKey *key,
+								int x, int y, CCGElem *grid)
+{
+	grid_tangent(key, x, y, 0, grid, mat[0]);
+	normalize_v3(mat[0]);
+
+	grid_tangent(key, x, y, 1, grid, mat[1]);
+	normalize_v3(mat[1]);
+
+	copy_v3_v3(mat[2], CCG_grid_elem_no(key, grid, x, y));
+}
+
 static void multiresModifier_disp_run(DerivedMesh *dm, Mesh *me, DerivedMesh *dm2, DispOp op, CCGElem **oldGridData, int totlvl)
 {
 	CCGDerivedMesh *ccgdm = (CCGDerivedMesh *)dm;
@@ -1058,7 +1064,8 @@ static void multiresModifier_disp_run(DerivedMesh *dm, Mesh *me, DerivedMesh *dm
 			/* if needed, reallocate multires paint mask */
 			if (gpm && gpm->level < key.level) {
 				gpm->level = key.level;
-				MEM_freeN(gpm->data);
+				if (gpm->data)
+					MEM_freeN(gpm->data);
 				gpm->data = MEM_callocN(sizeof(float) * key.grid_area, "gpm.data");
 			}
 
@@ -1066,22 +1073,11 @@ static void multiresModifier_disp_run(DerivedMesh *dm, Mesh *me, DerivedMesh *dm
 				for (x = 0; x < gridSize; x++) {
 					float *co = CCG_grid_elem_co(&key, grid, x, y);
 					float *sco = CCG_grid_elem_co(&key, subgrid, x, y);
-					float *no = CCG_grid_elem_no(&key, subgrid, x, y);
 					float *data = dispgrid[dGridSize * y * dSkip + x * dSkip];
-					float mat[3][3], tx[3], ty[3], disp[3], d[3], mask;
+					float mat[3][3], disp[3], d[3], mask;
 
 					/* construct tangent space matrix */
-					grid_tangent(&key, x, y, 0, subGridData[gIndex], tx);
-					normalize_v3(tx);
-
-					grid_tangent(&key, x, y, 1, subGridData[gIndex], ty);
-					normalize_v3(ty);
-
-					//mul_v3_fl(tx, 1.0f/(gridSize-1));
-					//mul_v3_fl(ty, 1.0f/(gridSize-1));
-					//cross_v3_v3v3(no, tx, ty);
-
-					column_vectors_to_mat3(mat, tx, ty, no);
+					grid_tangent_matrix(mat, &key, x, y, subgrid);
 
 					switch (op) {
 						case APPLY_DISPLACEMENTS:
@@ -1343,17 +1339,11 @@ void multires_set_space(DerivedMesh *dm, Object *ob, int from, int to)
 			for (y = 0; y < gridSize; y++) {
 				for (x = 0; x < gridSize; x++) {
 					float *data = dispgrid[dGridSize * y * dSkip + x * dSkip];
-					float *no = CCG_grid_elem_no(&key, subgrid, x, y);
 					float *co = CCG_grid_elem_co(&key, subgrid, x, y);
-					float mat[3][3], tx[3], ty[3], dco[3];
+					float mat[3][3], dco[3];
 					
 					/* construct tangent space matrix */
-					grid_tangent(&key, x, y, 0, subGridData[gIndex], tx);
-					normalize_v3(tx);
-
-					grid_tangent(&key, x, y, 1, subGridData[gIndex], ty);
-					normalize_v3(ty);
-					column_vectors_to_mat3(mat, tx, ty, no);
+					grid_tangent_matrix(mat, &key, x, y, subgrid);
 
 					/* convert to absolute coordinates in space */
 					if (from == MULTIRES_SPACE_TANGENT) {
@@ -1367,8 +1357,6 @@ void multires_set_space(DerivedMesh *dm, Object *ob, int from, int to)
 						copy_v3_v3(dco, data);
 					}
 					
-					column_vectors_to_mat3(mat, tx, ty, no);
-
 					/*now, convert to desired displacement type*/
 					if (to == MULTIRES_SPACE_TANGENT) {
 						invert_m3(mat);
@@ -2141,7 +2129,7 @@ static void multires_apply_smat(Scene *scene, Object *ob, float smat[3][3])
 {
 	DerivedMesh *dm = NULL, *cddm = NULL, *subdm = NULL;
 	CCGElem **gridData, **subGridData;
-	CCGKey key;
+	CCGKey dm_key, subdm_key;
 	Mesh *me = (Mesh *)ob->data;
 	MPoly *mpoly = me->mpoly;
 	/* MLoop *mloop = me->mloop; */ /* UNUSED */
@@ -2179,12 +2167,12 @@ static void multires_apply_smat(Scene *scene, Object *ob, float smat[3][3])
 	dm = subsurf_dm_create_local(ob, cddm, high_mmd.totlvl, high_mmd.simple, 0, mmd->flags & eMultiresModifierFlag_PlainUv, 0);
 	cddm->release(cddm);
 
-	/*numGrids = dm->getNumGrids(dm);*/ /*UNUSED*/
 	gridSize = dm->getGridSize(dm);
 	gridData = dm->getGridData(dm);
 	gridOffset = dm->getGridOffset(dm);
-	dm->getGridKey(dm, &key);
+	dm->getGridKey(dm, &dm_key);
 	subGridData = subdm->getGridData(subdm);
+	subdm->getGridKey(subdm, &subdm_key);
 
 	dGridSize = multires_side_tot[high_mmd.totlvl];
 	dSkip = (dGridSize - 1) / (gridSize - 1);
@@ -2202,20 +2190,13 @@ static void multires_apply_smat(Scene *scene, Object *ob, float smat[3][3])
 
 			for (y = 0; y < gridSize; y++) {
 				for (x = 0; x < gridSize; x++) {
-					float *co = CCG_grid_elem_co(&key, grid, x, y);
-					float *sco = CCG_grid_elem_co(&key, subgrid, x, y);
-					float *no = CCG_grid_elem_no(&key, grid, x, y);
+					float *co = CCG_grid_elem_co(&dm_key, grid, x, y);
+					float *sco = CCG_grid_elem_co(&subdm_key, subgrid, x, y);
 					float *data = dispgrid[dGridSize * y * dSkip + x * dSkip];
-					float mat[3][3], tx[3], ty[3], disp[3];
+					float mat[3][3], disp[3];
 
 					/* construct tangent space matrix */
-					grid_tangent(&key, x, y, 0, gridData[gIndex], tx);
-					normalize_v3(tx);
-
-					grid_tangent(&key, x, y, 1, gridData[gIndex], ty);
-					normalize_v3(ty);
-
-					column_vectors_to_mat3(mat, tx, ty, no);
+					grid_tangent_matrix(mat, &dm_key, x, y, grid);
 
 					/* scale subgrid coord and calculate displacement */
 					mul_m3_v3(smat, sco);
diff --git a/source/blender/blenkernel/intern/navmesh_conversion.c b/source/blender/blenkernel/intern/navmesh_conversion.c
index 24382b3bf91..a21878d1d7d 100644
--- a/source/blender/blenkernel/intern/navmesh_conversion.c
+++ b/source/blender/blenkernel/intern/navmesh_conversion.c
@@ -307,15 +307,15 @@ struct SortContext
 static int compareByData(void *ctx, const void * a, const void * b)
 {
 	return (((struct SortContext *)ctx)->recastData[((struct SortContext *)ctx)->trisToFacesMap[*(int*)a]] -
-			((struct SortContext *)ctx)->recastData[((struct SortContext *)ctx)->trisToFacesMap[*(int*)b]] );
+	        ((struct SortContext *)ctx)->recastData[((struct SortContext *)ctx)->trisToFacesMap[*(int*)b]] );
 }
 
 int buildNavMeshData(const int nverts, const float* verts, 
-							 const int ntris, const unsigned short *tris, 
-							 const int* recastData, const int* trisToFacesMap,
-							 int *ndtris_r, unsigned short **dtris_r,
-							 int *npolys_r, unsigned short **dmeshes_r, unsigned short **polys_r,
-							 int *vertsPerPoly_r, int **dtrisToPolysMap_r, int **dtrisToTrisMap_r)
+                     const int ntris, const unsigned short *tris,
+                     const int* recastData, const int* trisToFacesMap,
+                     int *ndtris_r, unsigned short **dtris_r,
+                     int *npolys_r, unsigned short **dmeshes_r, unsigned short **polys_r,
+                     int *vertsPerPoly_r, int **dtrisToPolysMap_r, int **dtrisToTrisMap_r)
 
 {
 	int *trisMapping;
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 445105d254a..a5e081d122d 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -29,13 +29,6 @@
  *  \ingroup bke
  */
 
-
-#if 0 /* pynodes commented for now */
-#  ifdef WITH_PYTHON
-#    include <Python.h>
-#  endif
-#endif
-
 #include "MEM_guardedalloc.h"
 
 #include <stdlib.h>
@@ -135,20 +128,9 @@ void ntreeInitTypes(bNodeTree *ntree)
 	for (node= ntree->nodes.first; node; node= next) {
 		next= node->next;
 		
-		node->typeinfo= node_get_type(ntree, node->type);
-		
-		if (node->type==NODE_DYNAMIC) {
-			/* needed info if the pynode script fails now: */
-			node->storage= ntree;
-			if (node->id!=NULL) { /* not an empty script node */
-				node->custom1 = 0;
-				node->custom1 = BSET(node->custom1, NODE_DYNAMIC_ADDEXIST);
-			}
-//			if (node->typeinfo)
-//				node->typeinfo->initfunc(node);
-		}
+		node->typeinfo = node_get_type(ntree, node->type);
 
-		if (node->typeinfo==NULL) {
+		if (node->typeinfo == NULL) {
 			printf("Error: Node type %s doesn't exist anymore, removed\n", node->name);
 			nodeFreeNode(ntree, node);
 		}
@@ -354,26 +336,6 @@ bNode *nodeAddNode(bNodeTree *ntree, struct bNodeTemplate *ntemp)
 	return node;
 }
 
-void nodeMakeDynamicType(bNode *node)
-{
-	/* find SH_DYNAMIC_NODE ntype */
-	bNodeType *ntype= ntreeGetType(NTREE_SHADER)->node_types.first;
-	while (ntype) {
-		if (ntype->type==NODE_DYNAMIC)
-			break;
-		ntype= ntype->next;
-	}
-
-	/* make own type struct to fill */
-	if (ntype) {
-		/*node->typeinfo= MEM_dupallocN(ntype);*/
-		bNodeType *newtype= MEM_callocN(sizeof(bNodeType), "dynamic bNodeType");
-		*newtype= *ntype;
-		BLI_strncpy(newtype->name, ntype->name, sizeof(newtype->name));
-		node->typeinfo= newtype;
-	}
-}
-
 /* keep socket listorder identical, for copying links */
 /* ntree is the target tree */
 bNode *nodeCopyNode(struct bNodeTree *ntree, struct bNode *node)
@@ -840,7 +802,7 @@ void ntreeClearPreview(bNodeTree *ntree)
 /* hack warning! this function is only used for shader previews, and 
  * since it gets called multiple times per pixel for Ztransp we only
  * add the color once. Preview gets cleared before it starts render though */
-void nodeAddToPreview(bNode *node, float *col, int x, int y, int do_manage)
+void nodeAddToPreview(bNode *node, float col[4], int x, int y, int do_manage)
 {
 	bNodePreview *preview= node->preview;
 	if (preview) {
@@ -1351,6 +1313,17 @@ void nodeClearActiveID(bNodeTree *ntree, short idtype)
 			node->flag &= ~NODE_ACTIVE_ID;
 }
 
+void nodeClearActive(bNodeTree *ntree)
+{
+	bNode *node;
+
+	if (ntree==NULL) return;
+
+	for (node= ntree->nodes.first; node; node= node->next)
+		node->flag &= ~(NODE_ACTIVE | NODE_ACTIVE_ID);
+}
+
+
 /* two active flags, ID nodes have special flag for buttons display */
 void nodeSetActive(bNodeTree *ntree, bNode *node)
 {
@@ -1860,6 +1833,7 @@ void nodeRegisterType(bNodeTreeType *ttype, bNodeType *ntype)
 static void registerCompositNodes(bNodeTreeType *ttype)
 {
 	register_node_type_frame(ttype);
+	register_node_type_reroute(ttype);
 	
 	register_node_type_cmp_group(ttype);
 //	register_node_type_cmp_forloop(ttype);
@@ -1926,6 +1900,8 @@ static void registerCompositNodes(bNodeTreeType *ttype)
 	register_node_type_cmp_color_spill(ttype);
 	register_node_type_cmp_luma_matte(ttype);
 	register_node_type_cmp_doubleedgemask(ttype);
+	register_node_type_cmp_keyingscreen(ttype);
+	register_node_type_cmp_keying(ttype);
 
 	register_node_type_cmp_translate(ttype);
 	register_node_type_cmp_rotate(ttype);
@@ -1947,11 +1923,14 @@ static void registerCompositNodes(bNodeTreeType *ttype)
 	register_node_type_cmp_bokehimage(ttype);
 	register_node_type_cmp_bokehblur(ttype);
 	register_node_type_cmp_switch(ttype);
+
+	register_node_type_cmp_mask(ttype);
 }
 
 static void registerShaderNodes(bNodeTreeType *ttype) 
 {
 	register_node_type_frame(ttype);
+	register_node_type_reroute(ttype);
 	
 	register_node_type_sh_group(ttype);
 	//register_node_type_sh_forloop(ttype);
@@ -1976,7 +1955,6 @@ static void registerShaderNodes(bNodeTreeType *ttype)
 	register_node_type_sh_math(ttype);
 	register_node_type_sh_vect_math(ttype);
 	register_node_type_sh_squeeze(ttype);
-	//register_node_type_sh_dynamic(ttype);
 	register_node_type_sh_material_ext(ttype);
 	register_node_type_sh_invert(ttype);
 	register_node_type_sh_seprgb(ttype);
@@ -1991,6 +1969,7 @@ static void registerShaderNodes(bNodeTreeType *ttype)
 	register_node_type_sh_fresnel(ttype);
 	register_node_type_sh_layer_weight(ttype);
 	register_node_type_sh_tex_coord(ttype);
+	register_node_type_sh_particle_info(ttype);
 
 	register_node_type_sh_background(ttype);
 	register_node_type_sh_bsdf_diffuse(ttype);
@@ -2025,6 +2004,7 @@ static void registerShaderNodes(bNodeTreeType *ttype)
 static void registerTextureNodes(bNodeTreeType *ttype)
 {
 	register_node_type_frame(ttype);
+	register_node_type_reroute(ttype);
 	
 	register_node_type_tex_group(ttype);
 //	register_node_type_tex_forloop(ttype);
@@ -2069,30 +2049,12 @@ static void registerTextureNodes(bNodeTreeType *ttype)
 	register_node_type_tex_proc_distnoise(ttype);
 }
 
-static void free_dynamic_typeinfo(bNodeType *ntype)
-{
-	if (ntype->type==NODE_DYNAMIC) {
-		if (ntype->inputs) {
-			MEM_freeN(ntype->inputs);
-		}
-		if (ntype->outputs) {
-			MEM_freeN(ntype->outputs);
-		}
-		if (ntype->name) {
-			MEM_freeN((void *)ntype->name);
-		}
-	}
-}
-
 static void free_typeinfos(ListBase *list)
 {
 	bNodeType *ntype, *next;
 	for (ntype=list->first; ntype; ntype=next) {
 		next = ntype->next;
-		
-		if (ntype->type==NODE_DYNAMIC)
-			free_dynamic_typeinfo(ntype);
-		
+
 		if (ntype->needs_free)
 			MEM_freeN(ntype);
 	}
@@ -2136,4 +2098,3 @@ void clear_scene_in_nodes(Main *bmain, Scene *sce)
 		}
 	}
 }
-
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 098d702a7e2..1f5ba8ae305 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -63,6 +63,7 @@
 #include "BLI_math.h"
 #include "BLI_pbvh.h"
 #include "BLI_utildefines.h"
+#include "BLI_linklist.h"
 
 #include "BKE_main.h"
 #include "BKE_global.h"
@@ -115,8 +116,6 @@
 #include "GPU_material.h"
 
 /* Local function protos */
-static void solve_parenting(Scene *scene, Object *ob, Object *par, float obmat[][4], float slowmat[][4], int simul);
-
 float originmat[3][3];  /* after BKE_object_where_is_calc(), can be used in other functions (bad!) */
 
 void BKE_object_workob_clear(Object *workob)
@@ -835,6 +834,9 @@ Object *BKE_object_add_only_object(int type, const char *name)
 	/* ob->pad3 == Contact Processing Threshold */
 	ob->m_contactProcessingThreshold = 1.0f;
 	ob->obstacleRad = 1.0f;
+	ob->step_height = 0.15f;
+	ob->jump_speed = 10.0f;
+	ob->fall_speed = 55.0f;
 	
 	/* NT fluid sim defaults */
 	ob->fluidsimSettings = NULL;
@@ -1901,109 +1903,6 @@ static void ob_parvert3(Object *ob, Object *par, float mat[][4])
 	}
 }
 
-static int where_is_object_parslow(Object *ob, float obmat[4][4], float slowmat[4][4])
-{
-	float *fp1, *fp2;
-	float fac1, fac2;
-	int a;
-
-	// include framerate
-	fac1 = (1.0f / (1.0f + fabsf(ob->sf)) );
-	if (fac1 >= 1.0f) return 0;
-	fac2 = 1.0f - fac1;
-
-	fp1 = obmat[0];
-	fp2 = slowmat[0];
-	for (a = 0; a < 16; a++, fp1++, fp2++) {
-		fp1[0] = fac1 * fp1[0] + fac2 * fp2[0];
-	}
-
-	return 1;
-}
-
-void BKE_object_where_is_calc_time(Scene *scene, Object *ob, float ctime)
-{
-	float slowmat[4][4] = MAT4_UNITY;
-	float stime = ctime;
-	
-	/* new version: correct parent+vertexparent and track+parent */
-	/* this one only calculates direct attached parent and track */
-	/* is faster, but should keep track of timeoffs */
-	
-	if (ob == NULL) return;
-	
-	/* execute drivers only, as animation has already been done */
-	BKE_animsys_evaluate_animdata(scene, &ob->id, ob->adt, ctime, ADT_RECALC_DRIVERS);
-	
-	if (ob->parent) {
-		Object *par = ob->parent;
-		
-		/* hurms, code below conflicts with depgraph... (ton) */
-		/* and even worse, it gives bad effects for NLA stride too (try ctime != par->ctime, with MBlur) */
-		if (stime != par->ctime) {
-			// only for ipo systems? 
-			Object tmp = *par;
-			
-			if (par->proxy_from) ;  // was a copied matrix, no where_is! bad...
-			else BKE_object_where_is_calc_time(scene, par, ctime);
-			
-			solve_parenting(scene, ob, par, ob->obmat, slowmat, 0);
-			
-			*par = tmp;
-		}
-		else
-			solve_parenting(scene, ob, par, ob->obmat, slowmat, 0);
-		
-		/* "slow parent" is definitely not threadsafe, and may also give bad results jumping around 
-		 * An old-fashioned hack which probably doesn't really cut it anymore
-		 */
-		if (ob->partype & PARSLOW) {
-			if (!where_is_object_parslow(ob, ob->obmat, slowmat))
-				return;
-		}
-	}
-	else {
-		BKE_object_to_mat4(ob, ob->obmat);
-	}
-
-	/* solve constraints */
-	if (ob->constraints.first && !(ob->transflag & OB_NO_CONSTRAINTS)) {
-		bConstraintOb *cob;
-		
-		cob = constraints_make_evalob(scene, ob, NULL, CONSTRAINT_OBTYPE_OBJECT);
-		
-		/* constraints need ctime, not stime. Some call BKE_object_where_is_calc_time and bsystem_time */
-		solve_constraints(&ob->constraints, cob, ctime);
-		
-		constraints_clear_evalob(cob);
-	}
-	
-	/* set negative scale flag in object */
-	if (is_negative_m4(ob->obmat)) ob->transflag |= OB_NEG_SCALE;
-	else ob->transflag &= ~OB_NEG_SCALE;
-}
-
-/* get object transformation matrix without recalculating dependencies and
- * constraints -- assume dependencies are already solved by depsgraph.
- * no changes to object and it's parent would be done.
- * used for bundles orientation in 3d space relative to parented blender camera */
-void BKE_object_where_is_calc_mat4(Scene *scene, Object *ob, float obmat[4][4])
-{
-	float slowmat[4][4] = MAT4_UNITY;
-
-	if (ob->parent) {
-		Object *par = ob->parent;
-
-		solve_parenting(scene, ob, par, obmat, slowmat, 1);
-
-		if (ob->partype & PARSLOW)
-			where_is_object_parslow(ob, obmat, slowmat);
-	}
-	else {
-		BKE_object_to_mat4(ob, obmat);
-	}
-}
-
 static void solve_parenting(Scene *scene, Object *ob, Object *par, float obmat[][4], float slowmat[][4], int simul)
 {
 	float totmat[4][4];
@@ -2025,11 +1924,11 @@ static void solve_parenting(Scene *scene, Object *ob, Object *par, float obmat[]
 					ok = 1;
 				}
 			}
-		
+			
 			if (ok) mul_serie_m4(totmat, par->obmat, tmat,
 				                 NULL, NULL, NULL, NULL, NULL, NULL);
 			else copy_m4_m4(totmat, par->obmat);
-		
+			
 			break;
 		case PARBONE:
 			ob_parbone(ob, par, tmat);
@@ -2049,7 +1948,7 @@ static void solve_parenting(Scene *scene, Object *ob, Object *par, float obmat[]
 			break;
 		case PARVERT3:
 			ob_parvert3(ob, par, tmat);
-		
+			
 			mul_serie_m4(totmat, par->obmat, tmat,
 			             NULL, NULL, NULL, NULL, NULL, NULL);
 			break;
@@ -2080,7 +1979,87 @@ static void solve_parenting(Scene *scene, Object *ob, Object *par, float obmat[]
 			copy_v3_v3(ob->orig, totmat[3]);
 		}
 	}
+}
 
+static int where_is_object_parslow(Object *ob, float obmat[4][4], float slowmat[4][4])
+{
+	float *fp1, *fp2;
+	float fac1, fac2;
+	int a;
+
+	// include framerate
+	fac1 = (1.0f / (1.0f + fabsf(ob->sf)) );
+	if (fac1 >= 1.0f) return 0;
+	fac2 = 1.0f - fac1;
+
+	fp1 = obmat[0];
+	fp2 = slowmat[0];
+	for (a = 0; a < 16; a++, fp1++, fp2++) {
+		fp1[0] = fac1 * fp1[0] + fac2 * fp2[0];
+	}
+
+	return 1;
+}
+
+void BKE_object_where_is_calc_time(Scene *scene, Object *ob, float ctime)
+{
+	if (ob == NULL) return;
+	
+	/* execute drivers only, as animation has already been done */
+	BKE_animsys_evaluate_animdata(scene, &ob->id, ob->adt, ctime, ADT_RECALC_DRIVERS);
+	
+	if (ob->parent) {
+		Object *par = ob->parent;
+		float slowmat[4][4] = MAT4_UNITY;
+		
+		/* calculate parent matrix */
+		solve_parenting(scene, ob, par, ob->obmat, slowmat, 0);
+		
+		/* "slow parent" is definitely not threadsafe, and may also give bad results jumping around 
+		 * An old-fashioned hack which probably doesn't really cut it anymore
+		 */
+		if (ob->partype & PARSLOW) {
+			if (!where_is_object_parslow(ob, ob->obmat, slowmat))
+				return;
+		}
+	}
+	else {
+		BKE_object_to_mat4(ob, ob->obmat);
+	}
+	
+	/* solve constraints */
+	if (ob->constraints.first && !(ob->transflag & OB_NO_CONSTRAINTS)) {
+		bConstraintOb *cob;
+		
+		cob = constraints_make_evalob(scene, ob, NULL, CONSTRAINT_OBTYPE_OBJECT);
+		solve_constraints(&ob->constraints, cob, ctime);
+		constraints_clear_evalob(cob);
+	}
+	
+	/* set negative scale flag in object */
+	if (is_negative_m4(ob->obmat)) ob->transflag |= OB_NEG_SCALE;
+	else ob->transflag &= ~OB_NEG_SCALE;
+}
+
+/* get object transformation matrix without recalculating dependencies and
+ * constraints -- assume dependencies are already solved by depsgraph.
+ * no changes to object and it's parent would be done.
+ * used for bundles orientation in 3d space relative to parented blender camera */
+void BKE_object_where_is_calc_mat4(Scene *scene, Object *ob, float obmat[4][4])
+{
+	float slowmat[4][4] = MAT4_UNITY;
+
+	if (ob->parent) {
+		Object *par = ob->parent;
+		
+		solve_parenting(scene, ob, par, obmat, slowmat, 1);
+		
+		if (ob->partype & PARSLOW)
+			where_is_object_parslow(ob, obmat, slowmat);
+	}
+	else {
+		BKE_object_to_mat4(ob, obmat);
+	}
 }
 
 void BKE_object_where_is_calc(struct Scene *scene, Object *ob)
@@ -2088,7 +2067,6 @@ void BKE_object_where_is_calc(struct Scene *scene, Object *ob)
 	BKE_object_where_is_calc_time(scene, ob, (float)scene->r.cfra);
 }
 
-
 void BKE_object_where_is_calc_simul(Scene *scene, Object *ob)
 /* was written for the old game engine (until 2.04) */
 /* It seems that this function is only called
@@ -3099,3 +3077,135 @@ MovieClip *BKE_object_movieclip_get(Scene *scene, Object *ob, int use_default)
 
 	return clip;
 }
+
+
+/*
+ * Find an associated Armature object
+ */
+static Object *obrel_armature_find(Object *ob)
+{
+	Object *ob_arm = NULL;
+
+	if (ob->parent && ob->partype == PARSKEL && ob->parent->type == OB_ARMATURE) {
+		ob_arm = ob->parent;
+	}
+	else {
+		ModifierData *mod;
+		for (mod = (ModifierData *)ob->modifiers.first; mod; mod = mod->next) {
+			if (mod->type == eModifierType_Armature) {
+				ob_arm = ((ArmatureModifierData *)mod)->object;
+			}
+		}
+	}
+
+	return ob_arm;
+}
+
+static int obrel_is_recursive_child(Object *ob, Object *child) {
+	Object *par;
+	for (par = child->parent; par; par = par->parent) {
+		if (par == ob) {
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+
+static int obrel_list_test(Object *ob)
+{
+	return ob && !(ob->id.flag & LIB_DOIT);
+}
+
+static void obrel_list_add(LinkNode **links, Object *ob)
+{
+	BLI_linklist_prepend(links, ob);
+	ob->id.flag |= LIB_DOIT;
+}
+
+/*
+ * Iterates over all objects of the given scene.
+ * Depending on the eObjectSet flag:
+ * collect either OB_SET_ALL, OB_SET_VISIBLE or OB_SET_SELECTED objects.
+ * If OB_SET_VISIBLE or OB_SET_SELECTED are collected, 
+ * then also add related objects according to the given includeFilters.
+ */
+struct LinkNode *BKE_object_relational_superset(struct Scene *scene, eObjectSet objectSet, eObRelationTypes includeFilter)
+{
+	LinkNode *links = NULL;
+
+	Base *base;
+
+	/* Remove markers from all objects */
+	for (base = scene->base.first; base; base = base->next) {
+		base->object->id.flag &= ~LIB_DOIT;
+	}
+
+	/* iterate over all selected and visible objects */
+	for (base = scene->base.first; base; base = base->next) {
+		if (objectSet == OB_SET_ALL) {
+			// as we get all anyways just add it
+			Object *ob = base->object;
+			obrel_list_add(&links, ob);
+		}
+		else {
+			if ((objectSet == OB_SET_SELECTED && TESTBASELIB_BGMODE(((View3D *)NULL), scene, base)) ||
+			    (objectSet == OB_SET_VISIBLE  && BASE_EDITABLE_BGMODE(((View3D *)NULL), scene, base)))
+			{
+				Object *ob = base->object;
+
+				if (obrel_list_test(ob))
+					obrel_list_add(&links, ob);
+
+				/* parent relationship */
+				if (includeFilter & (OB_REL_PARENT | OB_REL_PARENT_RECURSIVE)) {
+					Object *parent = ob->parent;
+					if (obrel_list_test(parent)) {
+
+						obrel_list_add(&links, parent);
+
+						/* recursive parent relationship */
+						if (includeFilter & OB_REL_PARENT_RECURSIVE) {
+							parent = parent->parent;
+							while (obrel_list_test(parent)) {
+
+								obrel_list_add(&links, parent);
+								parent = parent->parent;
+							}
+						}
+					}
+				}
+
+				/* child relationship */
+				if (includeFilter & (OB_REL_CHILDREN | OB_REL_CHILDREN_RECURSIVE)) {
+					Base *local_base;
+					for (local_base = scene->base.first; local_base; local_base = local_base->next) {
+						if (BASE_EDITABLE_BGMODE(((View3D *)NULL), scene, local_base)) {
+
+							Object *child = local_base->object;
+							if (obrel_list_test(child)) {
+								if ((includeFilter & OB_REL_CHILDREN_RECURSIVE && obrel_is_recursive_child(ob, child)) ||
+								    (includeFilter & OB_REL_CHILDREN && child->parent && child->parent == ob))
+								{
+									obrel_list_add(&links, child);
+								}
+							}
+						}
+					}
+				}
+
+
+				/* include related armatures */
+				if (includeFilter & OB_REL_MOD_ARMATURE) {
+					Object *arm = obrel_armature_find(ob);
+					if (obrel_list_test(arm)) {
+						obrel_list_add(&links, arm);
+					}
+				}
+
+			}
+		}
+	}
+
+	return links;
+}
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index c7f904755d9..f7e3e103e99 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -41,6 +41,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_brush.h"
+#include "BKE_context.h"
 #include "BKE_library.h"
 #include "BKE_paint.h"
 #include "BKE_subsurf.h"
@@ -83,6 +84,54 @@ Paint *paint_get_active(Scene *sce)
 	return NULL;
 }
 
+Paint *paint_get_active_from_context(const bContext *C)
+{
+	Scene *sce = CTX_data_scene(C);
+
+	if (sce) {
+		ToolSettings *ts = sce->toolsettings;
+		Object *obact = NULL;
+
+		if (sce->basact && sce->basact->object)
+			obact = sce->basact->object;
+
+		if (CTX_wm_space_image(C) != NULL) {
+			if (obact->mode == OB_MODE_EDIT) {
+				if (ts->use_uv_sculpt)
+					return &ts->uvsculpt->paint;
+				else
+					return &ts->imapaint.paint;
+			}
+			else {
+				return &ts->imapaint.paint;
+			}
+		}
+		else if (obact) {
+			switch (obact->mode) {
+				case OB_MODE_SCULPT:
+					return &ts->sculpt->paint;
+				case OB_MODE_VERTEX_PAINT:
+					return &ts->vpaint->paint;
+				case OB_MODE_WEIGHT_PAINT:
+					return &ts->wpaint->paint;
+				case OB_MODE_TEXTURE_PAINT:
+					return &ts->imapaint.paint;
+				case OB_MODE_EDIT:
+					if (ts->use_uv_sculpt)
+						return &ts->uvsculpt->paint;
+					else
+						return &ts->imapaint.paint;
+			}
+		}
+		else {
+			/* default to image paint */
+			return &ts->imapaint.paint;
+		}
+	}
+
+	return NULL;
+}
+
 Brush *paint_brush(Paint *p)
 {
 	return p ? p->brush : NULL;
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 66dd23e76b9..9537a31838c 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -2411,7 +2411,7 @@ static void get_strand_normal(Material *ma, const float surfnor[3], float surfdi
 static int psys_threads_init_path(ParticleThread *threads, Scene *scene, float cfra, int editupdate)
 {
 	ParticleThreadContext *ctx = threads[0].ctx;
-/*	Object *ob= ctx->sim.ob; */
+/*	Object *ob = ctx->sim.ob; */
 	ParticleSystem *psys = ctx->sim.psys;
 	ParticleSettings *part = psys->part;
 /*	ParticleEditSettings *pset = &scene->toolsettings->particle; */
@@ -3751,9 +3751,14 @@ static int get_particle_uv(DerivedMesh *dm, ParticleData *pa, int face_index, co
 	return 1;
 }
 
-#define SET_PARTICLE_TEXTURE(type, pvalue, texfac) if ((event & mtex->mapto) & type) {pvalue = texture_value_blend(def, pvalue, value, texfac, blend); }
-#define CLAMP_PARTICLE_TEXTURE_POS(type, pvalue) if (event & type) { if (pvalue < 0.f) pvalue = 1.f + pvalue; CLAMP(pvalue, 0.0f, 1.0f); }
-#define CLAMP_PARTICLE_TEXTURE_POSNEG(type, pvalue) if (event & type) { CLAMP(pvalue, -1.0f, 1.0f); }
+#define SET_PARTICLE_TEXTURE(type, pvalue, texfac)  \
+	if ((event & mtex->mapto) & type) {pvalue = texture_value_blend(def, pvalue, value, texfac, blend); } (void)0
+
+#define CLAMP_PARTICLE_TEXTURE_POS(type, pvalue)  \
+	if (event & type) { if (pvalue < 0.0f) pvalue = 1.0f + pvalue; CLAMP(pvalue, 0.0f, 1.0f); } (void)0
+
+#define CLAMP_PARTICLE_TEXTURE_POSNEG(type, pvalue)  \
+	if (event & type) { CLAMP(pvalue, -1.0f, 1.0f); } (void)0
 
 static void get_cpa_texture(DerivedMesh *dm, ParticleSystem *psys, ParticleSettings *part, ParticleData *par, int child_index, int face_index, const float fw[4], float *orco, ParticleTexture *ptex, int event, float cfra)
 {
@@ -3884,26 +3889,26 @@ void psys_get_texture(ParticleSimulationData *sim, ParticleData *pa, ParticleTex
 				else
 					ptex->time = texture_value_blend(def, ptex->time, value, mtex->timefac, blend);
 			}
-			SET_PARTICLE_TEXTURE(PAMAP_LIFE, ptex->life, mtex->lifefac)
-			SET_PARTICLE_TEXTURE(PAMAP_DENS, ptex->exist, mtex->padensfac)
-			SET_PARTICLE_TEXTURE(PAMAP_SIZE, ptex->size, mtex->sizefac)
-			SET_PARTICLE_TEXTURE(PAMAP_IVEL, ptex->ivel, mtex->ivelfac)
-			SET_PARTICLE_TEXTURE(PAMAP_FIELD, ptex->field, mtex->fieldfac)
-			SET_PARTICLE_TEXTURE(PAMAP_GRAVITY, ptex->gravity, mtex->gravityfac)
-			SET_PARTICLE_TEXTURE(PAMAP_DAMP, ptex->damp, mtex->dampfac)
-			SET_PARTICLE_TEXTURE(PAMAP_LENGTH, ptex->length, mtex->lengthfac)
+			SET_PARTICLE_TEXTURE(PAMAP_LIFE, ptex->life, mtex->lifefac);
+			SET_PARTICLE_TEXTURE(PAMAP_DENS, ptex->exist, mtex->padensfac);
+			SET_PARTICLE_TEXTURE(PAMAP_SIZE, ptex->size, mtex->sizefac);
+			SET_PARTICLE_TEXTURE(PAMAP_IVEL, ptex->ivel, mtex->ivelfac);
+			SET_PARTICLE_TEXTURE(PAMAP_FIELD, ptex->field, mtex->fieldfac);
+			SET_PARTICLE_TEXTURE(PAMAP_GRAVITY, ptex->gravity, mtex->gravityfac);
+			SET_PARTICLE_TEXTURE(PAMAP_DAMP, ptex->damp, mtex->dampfac);
+			SET_PARTICLE_TEXTURE(PAMAP_LENGTH, ptex->length, mtex->lengthfac);
 		}
 	}
 
-	CLAMP_PARTICLE_TEXTURE_POS(PAMAP_TIME, ptex->time)
-	CLAMP_PARTICLE_TEXTURE_POS(PAMAP_LIFE, ptex->life)
-	CLAMP_PARTICLE_TEXTURE_POS(PAMAP_DENS, ptex->exist)
-	CLAMP_PARTICLE_TEXTURE_POS(PAMAP_SIZE, ptex->size)
-	CLAMP_PARTICLE_TEXTURE_POSNEG(PAMAP_IVEL, ptex->ivel)
-	CLAMP_PARTICLE_TEXTURE_POSNEG(PAMAP_FIELD, ptex->field)
-	CLAMP_PARTICLE_TEXTURE_POSNEG(PAMAP_GRAVITY, ptex->gravity)
-	CLAMP_PARTICLE_TEXTURE_POS(PAMAP_DAMP, ptex->damp)
-	CLAMP_PARTICLE_TEXTURE_POS(PAMAP_LENGTH, ptex->length)
+	CLAMP_PARTICLE_TEXTURE_POS(PAMAP_TIME, ptex->time);
+	CLAMP_PARTICLE_TEXTURE_POS(PAMAP_LIFE, ptex->life);
+	CLAMP_PARTICLE_TEXTURE_POS(PAMAP_DENS, ptex->exist);
+	CLAMP_PARTICLE_TEXTURE_POS(PAMAP_SIZE, ptex->size);
+	CLAMP_PARTICLE_TEXTURE_POSNEG(PAMAP_IVEL, ptex->ivel);
+	CLAMP_PARTICLE_TEXTURE_POSNEG(PAMAP_FIELD, ptex->field);
+	CLAMP_PARTICLE_TEXTURE_POSNEG(PAMAP_GRAVITY, ptex->gravity);
+	CLAMP_PARTICLE_TEXTURE_POS(PAMAP_DAMP, ptex->damp);
+	CLAMP_PARTICLE_TEXTURE_POS(PAMAP_LENGTH, ptex->length);
 }
 /************************************************/
 /*			Particle State						*/
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index fa47600deb2..6c7336958b5 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -2363,13 +2363,12 @@ static EdgeHash *sph_springhash_build(ParticleSystem *psys)
 }
 
 #define SPH_NEIGHBORS 512
-typedef struct SPHNeighbor
-{
+typedef struct SPHNeighbor {
 	ParticleSystem *psys;
 	int index;
 } SPHNeighbor;
-typedef struct SPHRangeData
-{
+
+typedef struct SPHRangeData {
 	SPHNeighbor neighbors[SPH_NEIGHBORS];
 	int tot_neighbors;
 
@@ -2641,8 +2640,7 @@ static void sph_integrate(ParticleSimulationData *sim, ParticleData *pa, float d
 /************************************************/
 /*			Basic physics						*/
 /************************************************/
-typedef struct EfData
-{
+typedef struct EfData {
 	ParticleTexture ptex;
 	ParticleSimulationData *sim;
 	ParticleData *pa;
@@ -2673,6 +2671,9 @@ static void basic_force_cb(void *efdata_v, ParticleKey *state, float *force, flo
 		force[1] += (BLI_frand()-0.5f) * part->brownfac;
 		force[2] += (BLI_frand()-0.5f) * part->brownfac;
 	}
+
+	if (part->flag & PART_ROT_DYN && epoint.ave)
+		copy_v3_v3(pa->state.ave, epoint.ave);
 }
 /* gathers all forces that effect particles and calculates a new state for the particle */
 static void basic_integrate(ParticleSimulationData *sim, int p, float dfra, float cfra)
@@ -2730,7 +2731,7 @@ static void basic_integrate(ParticleSimulationData *sim, int p, float dfra, floa
 }
 static void basic_rotate(ParticleSettings *part, ParticleData *pa, float dfra, float timestep)
 {
-	float rotfac, rot1[4], rot2[4]={1.0,0.0,0.0,0.0}, dtime=dfra*timestep;
+	float rotfac, rot1[4], rot2[4]={1.0,0.0,0.0,0.0}, dtime=dfra*timestep, extrotfac;
 
 	if ((part->flag & PART_ROTATIONS)==0) {
 		pa->state.rot[0]=1.0f;
@@ -2738,7 +2739,9 @@ static void basic_rotate(ParticleSettings *part, ParticleData *pa, float dfra, f
 		return;
 	}
 
-	if ((part->flag & PART_ROT_DYN)==0 && ELEM3(part->avemode, PART_AVE_VELOCITY, PART_AVE_HORIZONTAL, PART_AVE_VERTICAL)) {
+	extrotfac = len_v3(pa->state.ave);
+
+	if ((part->flag & PART_ROT_DYN) && ELEM3(part->avemode, PART_AVE_VELOCITY, PART_AVE_HORIZONTAL, PART_AVE_VERTICAL)) {
 		float angle;
 		float len1 = len_v3(pa->prev_state.vel);
 		float len2 = len_v3(pa->state.vel);
@@ -2758,7 +2761,7 @@ static void basic_rotate(ParticleSettings *part, ParticleData *pa, float dfra, f
 	}
 
 	rotfac = len_v3(pa->state.ave);
-	if (rotfac == 0.0f) { /* unit_qt(in VecRotToQuat) doesn't give unit quat [1,0,0,0]?? */
+	if (rotfac == 0.0f || (part->flag & PART_ROT_DYN)==0 || extrotfac == 0.0f) { /* unit_qt(in VecRotToQuat) doesn't give unit quat [1,0,0,0]?? */
 		rot1[0]=1.0f;
 		rot1[1]=rot1[2]=rot1[3]=0;
 	}
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 90d17e53349..91023513d4d 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -99,8 +99,15 @@
 #  include "BLI_winstuff.h"
 #endif
 
-#define PTCACHE_DATA_FROM(data, type, from)		if (data[type]) { memcpy(data[type], from, ptcache_data_size[type]); }
-#define PTCACHE_DATA_TO(data, type, index, to)	if (data[type]) { memcpy(to, (char*)data[type] + (index ? index * ptcache_data_size[type] : 0), ptcache_data_size[type]); }
+#define PTCACHE_DATA_FROM(data, type, from)  \
+	if (data[type]) { \
+		memcpy(data[type], from, ptcache_data_size[type]); \
+	} (void)0
+
+#define PTCACHE_DATA_TO(data, type, index, to)  \
+	if (data[type]) { \
+		memcpy(to, (char *)(data)[type] + ((index) ? (index) * ptcache_data_size[type] : 0), ptcache_data_size[type]); \
+	} (void)0
 
 /* could be made into a pointcache option */
 #define DURIAN_POINTCACHE_LIB_OK 1
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index f2b963a7edb..1113555e3bf 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -63,6 +63,7 @@
 #include "BKE_idprop.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
+#include "BKE_mask.h"
 #include "BKE_node.h"
 #include "BKE_object.h"
 #include "BKE_paint.h"
@@ -516,6 +517,9 @@ Scene *BKE_scene_add(const char *name)
 	sce->gm.maxlogicstep = 5;
 	sce->gm.physubstep = 1;
 	sce->gm.maxphystep = 5;
+	sce->gm.lineardeactthreshold = 0.8f;
+	sce->gm.angulardeactthreshold = 1.0f;
+	sce->gm.deactivationtime = 0.0f;
 
 	sce->gm.flag = GAME_DISPLAY_LISTS;
 	sce->gm.matmode = GAME_MAT_MULTITEX;
@@ -604,10 +608,8 @@ void BKE_scene_set_background(Main *bmain, Scene *scene)
 		base->flag |= flag;
 		
 		/* not too nice... for recovering objects with lost data */
-		//if (ob->pose==NULL) base->flag &= ~OB_POSEMODE;
+		//if (ob->pose == NULL) base->flag &= ~OB_POSEMODE;
 		ob->flag = base->flag;
-		
-		ob->ctime = -1234567.0;  /* force ipo to be calculated later */
 	}
 	/* no full animation update, this to enable render code to work (render code calls own animation updates) */
 }
@@ -1001,6 +1003,9 @@ static void scene_update_tagged_recursive(Main *bmain, Scene *scene, Scene *scen
 
 	/* update sound system animation */
 	sound_update_scene(scene);
+
+	/* update masking curves */
+	BKE_mask_update_scene(bmain, scene, FALSE);
 }
 
 /* this is called in main loop, doing tagged updates before redraw */
@@ -1071,6 +1076,8 @@ void BKE_scene_update_for_newframe(Main *bmain, Scene *sce, unsigned int lay)
 	 * so don't call within 'scene_update_tagged_recursive' */
 	DAG_scene_update_flags(bmain, sce, lay, TRUE);   // only stuff that moves or needs display still
 
+	BKE_mask_evaluate_all_masks(bmain, ctime, TRUE);
+
 	/* All 'standard' (i.e. without any dependencies) animation is handled here,
 	 * with an 'local' to 'macro' order of evaluation. This should ensure that
 	 * settings stored nestled within a hierarchy (i.e. settings in a Texture block
diff --git a/source/blender/blenkernel/intern/seqcache.c b/source/blender/blenkernel/intern/seqcache.c
index f1f3dd47d8b..582034ae623 100644
--- a/source/blender/blenkernel/intern/seqcache.c
+++ b/source/blender/blenkernel/intern/seqcache.c
@@ -29,7 +29,7 @@
 
 #include <stddef.h>
 
-#include "BLO_sys_types.h"	/* for intptr_t */
+#include "BLO_sys_types.h"  /* for intptr_t */
 
 #include "MEM_guardedalloc.h"
 
@@ -38,22 +38,21 @@
 
 #include "IMB_moviecache.h"
 
-typedef struct seqCacheKey 
-{
-	struct Sequence * seq;
+typedef struct SeqCacheKey {
+	struct Sequence *seq;
 	SeqRenderData context;
 	float cfra;
 	seq_stripelem_ibuf_t type;
-} seqCacheKey;
+} SeqCacheKey;
 
 static struct MovieCache *moviecache = NULL;
 
 static unsigned int seqcache_hashhash(const void *key_)
 {
-	const seqCacheKey *key = (seqCacheKey*) key_;
+	const SeqCacheKey *key = (SeqCacheKey *) key_;
 	unsigned int rval = seq_hash_render_data(&key->context);
 
-	rval ^= *(unsigned int*) &key->cfra;
+	rval ^= *(unsigned int *) &key->cfra;
 	rval += key->type;
 	rval ^= ((intptr_t) key->seq) << 6;
 
@@ -62,11 +61,11 @@ static unsigned int seqcache_hashhash(const void *key_)
 
 static int seqcache_hashcmp(const void *a_, const void *b_)
 {
-	const seqCacheKey * a = (seqCacheKey*) a_;
-	const seqCacheKey * b = (seqCacheKey*) b_;
+	const SeqCacheKey *a = (SeqCacheKey *) a_;
+	const SeqCacheKey *b = (SeqCacheKey *) b_;
 
 	if (a->seq < b->seq) {
-		return -1;		
+		return -1;
 	}
 	if (a->seq > b->seq) {
 		return 1;
@@ -99,18 +98,18 @@ void seq_stripelem_cache_cleanup(void)
 {
 	if (moviecache) {
 		IMB_moviecache_free(moviecache);
-		moviecache = IMB_moviecache_create(sizeof(seqCacheKey), seqcache_hashhash,
-				seqcache_hashcmp, NULL);
+		moviecache = IMB_moviecache_create(sizeof(SeqCacheKey), seqcache_hashhash,
+		                                   seqcache_hashcmp, NULL);
 	}
 }
 
-struct ImBuf * seq_stripelem_cache_get(
-	SeqRenderData context, struct Sequence * seq, 
-	float cfra, seq_stripelem_ibuf_t type)
+struct ImBuf *seq_stripelem_cache_get(
+        SeqRenderData context, struct Sequence *seq,
+        float cfra, seq_stripelem_ibuf_t type)
 {
 
 	if (moviecache && seq) {
-		seqCacheKey key;
+		SeqCacheKey key;
 
 		key.seq = seq;
 		key.context = context;
@@ -124,18 +123,18 @@ struct ImBuf * seq_stripelem_cache_get(
 }
 
 void seq_stripelem_cache_put(
-	SeqRenderData context, struct Sequence * seq, 
-	float cfra, seq_stripelem_ibuf_t type, struct ImBuf * i)
+        SeqRenderData context, struct Sequence *seq,
+        float cfra, seq_stripelem_ibuf_t type, struct ImBuf *i)
 {
-	seqCacheKey key;
+	SeqCacheKey key;
 
 	if (!i) {
 		return;
 	}
 
 	if (!moviecache) {
-		moviecache = IMB_moviecache_create(sizeof(seqCacheKey), seqcache_hashhash,
-				seqcache_hashcmp, NULL);
+		moviecache = IMB_moviecache_create(sizeof(SeqCacheKey), seqcache_hashhash,
+		                                   seqcache_hashcmp, NULL);
 	}
 
 	key.seq = seq;
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c
index fac74d27e0d..6e5149d7924 100644
--- a/source/blender/blenkernel/intern/seqeffects.c
+++ b/source/blender/blenkernel/intern/seqeffects.c
@@ -47,7 +47,6 @@
 
 #include "BKE_fcurve.h"
 #include "BKE_main.h"
-#include "BKE_plugin_types.h"
 #include "BKE_sequencer.h"
 #include "BKE_texture.h"
 #include "BKE_utildefines.h"
@@ -58,13 +57,6 @@
 #include "RNA_access.h"
 
 /* **** XXX **** */
-static void error(const char *UNUSED(error), ...) {
-}
-
-#define INT 96
-#define FLO 128
-
-/* **** XXX **** */
 
 /* Glow effect */
 enum {
@@ -85,7 +77,7 @@ static ImBuf *prepare_effect_imbufs(
 
 	if (!ibuf1 && !ibuf2 && !ibuf3) {
 		/* hmmm, global float option ? */
-		out = IMB_allocImBuf((short)x, (short)y, 32, IB_rect);
+		out = IMB_allocImBuf(x, y, 32, IB_rect);
 	}
 	else if ((ibuf1 && ibuf1->rect_float) ||
 	         (ibuf2 && ibuf2->rect_float) ||
@@ -93,10 +85,10 @@ static ImBuf *prepare_effect_imbufs(
 	{
 		/* if any inputs are rectfloat, output is float too */
 
-		out = IMB_allocImBuf((short)x, (short)y, 32, IB_rectfloat);
+		out = IMB_allocImBuf(x, y, 32, IB_rectfloat);
 	}
 	else {
-		out = IMB_allocImBuf((short)x, (short)y, 32, IB_rect);
+		out = IMB_allocImBuf(x, y, 32, IB_rect);
 	}
 	
 	if (ibuf1 && !ibuf1->rect_float && out->rect_float) {
@@ -123,281 +115,6 @@ static ImBuf *prepare_effect_imbufs(
 }
 
 /* **********************************************************************
- * PLUGINS
- * ********************************************************************** */
-
-static void open_plugin_seq(PluginSeq *pis, const char *seqname)
-{
-	int (*version)(void);
-	void * (*alloc_private)(void);
-	char *cp;
-
-	/* to be sure: (is tested for) */
-	pis->doit = NULL;
-	pis->pname = NULL;
-	pis->varstr = NULL;
-	pis->cfra = NULL;
-	pis->version = 0;
-	pis->instance_private_data = NULL;
-
-	/* clear the error list */
-	BLI_dynlib_get_error_as_string(NULL);
-
-	/* if (pis->handle) BLI_dynlib_close(pis->handle); */
-	/* pis->handle= 0; */
-
-	/* open the needed object */
-	pis->handle = BLI_dynlib_open(pis->name);
-	if (test_dlerr(pis->name, pis->name)) return;
-
-	if (pis->handle != NULL) {
-		/* find the address of the version function */
-		version = (int (*)(void))BLI_dynlib_find_symbol(pis->handle, "plugin_seq_getversion");
-		if (test_dlerr(pis->name, "plugin_seq_getversion")) return;
-
-		if (version != NULL) {
-			pis->version = version();
-			if (pis->version >= 2 && pis->version <= 6) {
-				int (*info_func)(PluginInfo *);
-				PluginInfo *info = (PluginInfo *) MEM_mallocN(sizeof(PluginInfo), "plugin_info");
-
-				info_func = (int (*)(PluginInfo *))BLI_dynlib_find_symbol(pis->handle, "plugin_getinfo");
-
-				if (info_func == NULL) error("No info func");
-				else {
-					info_func(info);
-
-					pis->pname = info->name;
-					pis->vars = info->nvars;
-					pis->cfra = info->cfra;
-
-					pis->varstr = info->varstr;
-
-					pis->doit = (void (*)(void))info->seq_doit;
-					if (info->init)
-						info->init();
-				}
-				MEM_freeN(info);
-
-				cp = BLI_dynlib_find_symbol(pis->handle, "seqname");
-				if (cp) BLI_strncpy(cp, seqname, SEQ_NAME_MAXSTR);
-			}
-			else {
-				printf("Plugin returned unrecognized version number\n");
-				return;
-			}
-		}
-		alloc_private = (void * (*)(void))BLI_dynlib_find_symbol(
-		    pis->handle, "plugin_seq_alloc_private_data");
-		if (alloc_private) {
-			pis->instance_private_data = alloc_private();
-		}
-		
-		pis->current_private_data = (void **)
-		        BLI_dynlib_find_symbol(pis->handle, "plugin_private_data");
-	}
-}
-
-static PluginSeq *add_plugin_seq(const char *str, const char *seqname)
-{
-	PluginSeq *pis;
-	VarStruct *varstr;
-	int a;
-
-	pis = MEM_callocN(sizeof(PluginSeq), "PluginSeq");
-
-	BLI_strncpy(pis->name, str, FILE_MAX);
-	open_plugin_seq(pis, seqname);
-
-	if (pis->doit == NULL) {
-		if (pis->handle == NULL) error("no plugin: %s", str);
-		else error("in plugin: %s", str);
-		MEM_freeN(pis);
-		return NULL;
-	}
-
-	/* default values */
-	varstr = pis->varstr;
-	for (a = 0; a < pis->vars; a++, varstr++) {
-		if ( (varstr->type & FLO) == FLO)
-			pis->data[a] = varstr->def;
-		else if ( (varstr->type & INT) == INT)
-			*((int *)(pis->data + a)) = (int) varstr->def;
-	}
-
-	return pis;
-}
-
-static void free_plugin_seq(PluginSeq *pis)
-{
-	if (pis == NULL) return;
-
-	/* no BLI_dynlib_close: same plugin can be opened multiple times with 1 handle */
-
-	if (pis->instance_private_data) {
-		void (*free_private)(void *);
-
-		free_private = (void (*)(void *))BLI_dynlib_find_symbol(
-		    pis->handle, "plugin_seq_free_private_data");
-		if (free_private) {
-			free_private(pis->instance_private_data);
-		}
-	}
-
-	MEM_freeN(pis);
-}
-
-static void init_plugin(Sequence *seq, const char *fname)
-{
-	seq->plugin = (PluginSeq *)add_plugin_seq(fname, seq->name + 2);
-}
-
-/* 
- * FIXME: should query plugin! Could be generator, that needs zero inputs...
- */
-static int num_inputs_plugin(void)
-{
-	return 1;
-}
-
-static void load_plugin(Sequence *seq)
-{
-	if (seq) {
-		open_plugin_seq(seq->plugin, seq->name + 2);
-	}
-}
-
-static void copy_plugin(Sequence *dst, Sequence *src)
-{
-	if (src->plugin) {
-		dst->plugin = MEM_dupallocN(src->plugin);
-		open_plugin_seq(dst->plugin, dst->name + 2);
-	}
-}
-
-static ImBuf *IMB_cast_away_list(ImBuf *i)
-{
-	if (!i) {
-		return NULL;
-	}
-	return (ImBuf *) (((void **) i) + 2);
-}
-
-static ImBuf *do_plugin_effect(
-        SeqRenderData context, Sequence *seq, float cfra,
-        float facf0, float facf1,
-        struct ImBuf *ibuf1, struct ImBuf *ibuf2,
-        struct ImBuf *ibuf3)
-{
-	char *cp;
-	int float_rendering;
-	int use_temp_bufs = FALSE; /* Are needed since blur.c (and maybe some other
-	                            * old plugins) do very bad stuff
-	                            * with imbuf-internals */
-
-	struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
-	int x = context.rectx;
-	int y = context.recty;
-
-	if (seq->plugin && seq->plugin->doit) {
-		
-		if (seq->plugin->cfra) 
-			*(seq->plugin->cfra) = cfra;
-		
-		cp = BLI_dynlib_find_symbol(
-		    seq->plugin->handle, "seqname");
-
-		/* XXX: it's crappy to limit copying buffer by it's lemgth,
-		 *      but assuming plugin stuff is using correct buffer size
-		 *      it should be fine */
-		if (cp) strncpy(cp, seq->name + 2, sizeof(seq->name) - 2);
-
-		if (seq->plugin->current_private_data) {
-			*seq->plugin->current_private_data = seq->plugin->instance_private_data;
-		}
-
-		float_rendering = (out->rect_float != NULL);
-
-		if (seq->plugin->version <= 3 && float_rendering) {
-			use_temp_bufs = TRUE;
-
-			if (ibuf1) {
-				ibuf1 = IMB_dupImBuf(ibuf1);
-				IMB_rect_from_float(ibuf1);
-				imb_freerectfloatImBuf(ibuf1);
-				ibuf1->flags &= ~IB_rectfloat;
-			}
-			if (ibuf2) {
-				ibuf2 = IMB_dupImBuf(ibuf2);
-				IMB_rect_from_float(ibuf2);
-				imb_freerectfloatImBuf(ibuf2);
-				ibuf2->flags &= ~IB_rectfloat;
-			} 
-			if (ibuf3) {
-				ibuf3 = IMB_dupImBuf(ibuf3);
-				IMB_rect_from_float(ibuf3);
-				imb_freerectfloatImBuf(ibuf3);
-				ibuf3->flags &= ~IB_rectfloat;
-			} 
-			if (!out->rect) imb_addrectImBuf(out);
-			imb_freerectfloatImBuf(out);
-			out->flags &= ~IB_rectfloat;
-		}
-
-		if (seq->plugin->version <= 2) {
-			if (ibuf1) IMB_convert_rgba_to_abgr(ibuf1);
-			if (ibuf2) IMB_convert_rgba_to_abgr(ibuf2);
-			if (ibuf3) IMB_convert_rgba_to_abgr(ibuf3);
-		}
-
-		if (seq->plugin->version <= 4) {
-			((SeqDoit)seq->plugin->doit)(
-			        seq->plugin->data, facf0, facf1, x, y,
-			        IMB_cast_away_list(ibuf1),
-			        IMB_cast_away_list(ibuf2),
-			        IMB_cast_away_list(out),
-			        IMB_cast_away_list(ibuf3));
-		}
-		else {
-			((SeqDoit)seq->plugin->doit)(
-			        seq->plugin->data, facf0, facf1, x, y,
-			        ibuf1, ibuf2, out, ibuf3);
-		}
-
-		if (seq->plugin->version <= 2) {
-			if (!use_temp_bufs) {
-				if (ibuf1) IMB_convert_rgba_to_abgr(ibuf1);
-				if (ibuf2) IMB_convert_rgba_to_abgr(ibuf2);
-				if (ibuf3) IMB_convert_rgba_to_abgr(ibuf3);
-			}
-			IMB_convert_rgba_to_abgr(out);
-		}
-		if (seq->plugin->version <= 3 && float_rendering) {
-			IMB_float_from_rect_simple(out);
-		}
-
-		if (use_temp_bufs) {
-			if (ibuf1) IMB_freeImBuf(ibuf1);
-			if (ibuf2) IMB_freeImBuf(ibuf2);
-			if (ibuf3) IMB_freeImBuf(ibuf3);
-		}
-	}
-	return out;
-}
-
-static int do_plugin_early_out(struct Sequence *UNUSED(seq),
-                               float UNUSED(facf0), float UNUSED(facf1))
-{
-	return 0;
-}
-
-static void free_plugin(struct Sequence *seq)
-{
-	free_plugin_seq(seq->plugin);
-	seq->plugin = NULL;
-}
-
-/* **********************************************************************
  * ALPHA OVER
  * ********************************************************************** */
 
@@ -1481,8 +1198,8 @@ static void do_mul_effect_byte(float facf0, float facf1, int x, int y,
 	fac3 = (int)(256.0f * facf1);
 
 	/* formula:
-	 *		fac*(a*b) + (1-fac)*a  => fac*a*(b-1)+axaux= c*px + py*s ;//+centx
-	 *		yaux= -s*px + c*py;//+centy
+	 *		fac * (a * b) + (1-fac)*a  => fac * a * (b - 1) + axaux = c * px + py * s; //+centx
+	 *		yaux = -s * px + c * py; //+centy
 	 */
 
 	while (y--) {
@@ -2340,7 +2057,7 @@ static void RVBlurBitmap2_byte(unsigned char *map, int width, int height,
 
 
 	/*	Swap buffers */
-	swap = temp; temp = map; /* map=swap; */ /* UNUSED */
+	swap = temp; temp = map; /* map = swap; */ /* UNUSED */
 
 	/*	Tidy up	 */
 	MEM_freeN(filter);
@@ -2510,7 +2227,7 @@ static void RVBlurBitmap2_float(float *map, int width, int height,
 
 
 	/*	Swap buffers */
-	swap = temp; temp = map; /* map=swap; */ /* UNUSED */
+	swap = temp; temp = map; /* map = swap; */ /* UNUSED */
 
 	/*	Tidy up	 */
 	MEM_freeN(filter);
@@ -3159,11 +2876,6 @@ static void load_noop(struct Sequence *UNUSED(seq))
 
 }
 
-static void init_plugin_noop(struct Sequence *UNUSED(seq), const char *UNUSED(fname))
-{
-
-}
-
 static void free_noop(struct Sequence *UNUSED(seq))
 {
 
@@ -3265,7 +2977,6 @@ static struct SeqEffectHandle get_sequence_effect_impl(int seq_type)
 	int sequence_type = seq_type;
 
 	rval.init = init_noop;
-	rval.init_plugin = init_plugin_noop;
 	rval.num_inputs = num_inputs_default;
 	rval.load = load_noop;
 	rval.free = free_noop;
@@ -3276,12 +2987,12 @@ static struct SeqEffectHandle get_sequence_effect_impl(int seq_type)
 	rval.copy = NULL;
 
 	switch (sequence_type) {
-		case SEQ_CROSS:
+		case SEQ_TYPE_CROSS:
 			rval.execute = do_cross_effect;
 			rval.early_out = early_out_fade;
 			rval.get_default_fac = get_default_fac_fade;
 			break;
-		case SEQ_GAMCROSS:
+		case SEQ_TYPE_GAMCROSS:
 			rval.init = init_gammacross;
 			rval.load = load_gammacross;
 			rval.free = free_gammacross;
@@ -3289,30 +3000,30 @@ static struct SeqEffectHandle get_sequence_effect_impl(int seq_type)
 			rval.get_default_fac = get_default_fac_fade;
 			rval.execute = do_gammacross_effect;
 			break;
-		case SEQ_ADD:
+		case SEQ_TYPE_ADD:
 			rval.execute = do_add_effect;
 			rval.early_out = early_out_mul_input2;
 			break;
-		case SEQ_SUB:
+		case SEQ_TYPE_SUB:
 			rval.execute = do_sub_effect;
 			rval.early_out = early_out_mul_input2;
 			break;
-		case SEQ_MUL:
+		case SEQ_TYPE_MUL:
 			rval.execute = do_mul_effect;
 			rval.early_out = early_out_mul_input2;
 			break;
-		case SEQ_ALPHAOVER:
+		case SEQ_TYPE_ALPHAOVER:
 			rval.init = init_alpha_over_or_under;
 			rval.execute = do_alphaover_effect;
 			break;
-		case SEQ_OVERDROP:
+		case SEQ_TYPE_OVERDROP:
 			rval.execute = do_overdrop_effect;
 			break;
-		case SEQ_ALPHAUNDER:
+		case SEQ_TYPE_ALPHAUNDER:
 			rval.init = init_alpha_over_or_under;
 			rval.execute = do_alphaunder_effect;
 			break;
-		case SEQ_WIPE:
+		case SEQ_TYPE_WIPE:
 			rval.init = init_wipe_effect;
 			rval.num_inputs = num_inputs_wipe;
 			rval.free = free_wipe_effect;
@@ -3321,21 +3032,21 @@ static struct SeqEffectHandle get_sequence_effect_impl(int seq_type)
 			rval.get_default_fac = get_default_fac_fade;
 			rval.execute = do_wipe_effect;
 			break;
-		case SEQ_GLOW:
+		case SEQ_TYPE_GLOW:
 			rval.init = init_glow_effect;
 			rval.num_inputs = num_inputs_glow;
 			rval.free = free_glow_effect;
 			rval.copy = copy_glow_effect;
 			rval.execute = do_glow_effect;
 			break;
-		case SEQ_TRANSFORM:
+		case SEQ_TYPE_TRANSFORM:
 			rval.init = init_transform_effect;
 			rval.num_inputs = num_inputs_transform;
 			rval.free = free_transform_effect;
 			rval.copy = copy_transform_effect;
 			rval.execute = do_transform_effect;
 			break;
-		case SEQ_SPEED:
+		case SEQ_TYPE_SPEED:
 			rval.init = init_speed_effect;
 			rval.num_inputs = num_inputs_speed;
 			rval.load = load_speed_effect;
@@ -3345,7 +3056,7 @@ static struct SeqEffectHandle get_sequence_effect_impl(int seq_type)
 			rval.early_out = early_out_speed;
 			rval.store_icu_yrange = store_icu_yrange_speed;
 			break;
-		case SEQ_COLOR:
+		case SEQ_TYPE_COLOR:
 			rval.init = init_solid_color;
 			rval.num_inputs = num_inputs_color;
 			rval.early_out = early_out_color;
@@ -3353,22 +3064,12 @@ static struct SeqEffectHandle get_sequence_effect_impl(int seq_type)
 			rval.copy = copy_solid_color;
 			rval.execute = do_solid_color;
 			break;
-		case SEQ_PLUGIN:
-			rval.init_plugin = init_plugin;
-			rval.num_inputs = num_inputs_plugin;
-			rval.load = load_plugin;
-			rval.free = free_plugin;
-			rval.copy = copy_plugin;
-			rval.execute = do_plugin_effect;
-			rval.early_out = do_plugin_early_out;
-			rval.get_default_fac = get_default_fac_fade;
-			break;
-		case SEQ_MULTICAM:
+		case SEQ_TYPE_MULTICAM:
 			rval.num_inputs = num_inputs_multicam;
 			rval.early_out = early_out_multicam;
 			rval.execute = do_multicam;
 			break;
-		case SEQ_ADJUSTMENT:
+		case SEQ_TYPE_ADJUSTMENT:
 			rval.num_inputs = num_inputs_adjustment;
 			rval.early_out = early_out_adjustment;
 			rval.execute = do_adjustment;
@@ -3383,7 +3084,7 @@ struct SeqEffectHandle get_sequence_effect(Sequence *seq)
 {
 	struct SeqEffectHandle rval = {NULL};
 
-	if (seq->type & SEQ_EFFECT) {
+	if (seq->type & SEQ_TYPE_EFFECT) {
 		rval = get_sequence_effect_impl(seq->type);
 		if ((seq->flag & SEQ_EFFECT_NOT_LOADED) != 0) {
 			rval.load(seq);
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 8fbb3ee9800..ddf30ecfa81 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -29,7 +29,6 @@
  *  \ingroup bke
  */
 
-
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
@@ -40,6 +39,7 @@
 
 #include "DNA_sequence_types.h"
 #include "DNA_movieclip_types.h"
+#include "DNA_mask_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_anim_types.h"
 #include "DNA_object_types.h"
@@ -61,6 +61,7 @@
 #include "BKE_movieclip.h"
 #include "BKE_fcurve.h"
 #include "BKE_scene.h"
+#include "BKE_mask.h"
 #include "BKE_utildefines.h"
 
 #include "RNA_access.h"
@@ -178,7 +179,7 @@ void seq_free_sequence(Scene *scene, Sequence *seq)
 
 	if (seq->anim) IMB_free_anim(seq->anim);
 
-	if (seq->type & SEQ_EFFECT) {
+	if (seq->type & SEQ_TYPE_EFFECT) {
 		struct SeqEffectHandle sh = get_sequence_effect(seq);
 
 		sh.free(seq);
@@ -195,7 +196,7 @@ void seq_free_sequence(Scene *scene, Sequence *seq)
 		if (ed->act_seq == seq)
 			ed->act_seq = NULL;
 
-		if (seq->scene_sound && ELEM(seq->type, SEQ_SOUND, SEQ_SCENE))
+		if (seq->scene_sound && ELEM(seq->type, SEQ_TYPE_SOUND_RAM, SEQ_TYPE_SCENE))
 			sound_remove_scene_sound(scene, seq->scene_sound);
 
 		seq_free_animdata(scene, seq);
@@ -543,10 +544,10 @@ static void seq_update_sound_bounds_recursive_rec(Scene *scene, Sequence *metase
 	/* for sound we go over full meta tree to update bounds of the sound strips,
 	 * since sound is played outside of evaluating the imbufs, */
 	for (seq = metaseq->seqbase.first; seq; seq = seq->next) {
-		if (seq->type == SEQ_META) {
+		if (seq->type == SEQ_TYPE_META) {
 			seq_update_sound_bounds_recursive_rec(scene, seq, MAX2(start, metaseq_start(seq)), MIN2(end, metaseq_end(seq)));
 		}
-		else if (ELEM(seq->type, SEQ_SOUND, SEQ_SCENE)) {
+		else if (ELEM(seq->type, SEQ_TYPE_SOUND_RAM, SEQ_TYPE_SCENE)) {
 			if (seq->scene_sound) {
 				int startofs = seq->startofs;
 				int endofs = seq->endofs;
@@ -582,10 +583,10 @@ void calc_sequence_disp(Scene *scene, Sequence *seq)
 		seq->handsize = (float)((seq->enddisp - seq->startdisp) / 25);
 	}
 
-	if (ELEM(seq->type, SEQ_SOUND, SEQ_SCENE)) {
+	if (ELEM(seq->type, SEQ_TYPE_SOUND_RAM, SEQ_TYPE_SCENE)) {
 		seq_update_sound_bounds(scene, seq);
 	}
-	else if (seq->type == SEQ_META)
+	else if (seq->type == SEQ_TYPE_META)
 		seq_update_sound_bounds_recursive(scene, seq);
 }
 
@@ -603,7 +604,7 @@ void calc_sequence(Scene *scene, Sequence *seq)
 
 	/* effects and meta: automatic start and end */
 
-	if (seq->type & SEQ_EFFECT) {
+	if (seq->type & SEQ_TYPE_EFFECT) {
 		/* pointers */
 		if (seq->seq2 == NULL) seq->seq2 = seq->seq1;
 		if (seq->seq3 == NULL) seq->seq3 = seq->seq1;
@@ -612,8 +613,8 @@ void calc_sequence(Scene *scene, Sequence *seq)
 
 		/* we take the largest start and smallest end */
 
-		// seq->start= seq->startdisp= MAX2(seq->seq1->startdisp, seq->seq2->startdisp);
-		// seq->enddisp= MIN2(seq->seq1->enddisp, seq->seq2->enddisp);
+		// seq->start = seq->startdisp = MAX2(seq->seq1->startdisp, seq->seq2->startdisp);
+		// seq->enddisp = MIN2(seq->seq1->enddisp, seq->seq2->enddisp);
 
 		if (seq->seq1) {
 			/* XXX These resets should not be necessary, but users used to be able to
@@ -641,7 +642,7 @@ void calc_sequence(Scene *scene, Sequence *seq)
 		}
 	}
 	else {
-		if (seq->type == SEQ_META) {
+		if (seq->type == SEQ_TYPE_META) {
 			seqm = seq->seqbase.first;
 			if (seqm) {
 				min =  MAXFRAME * 2;
@@ -669,7 +670,10 @@ void reload_sequence_new_file(Scene *scene, Sequence *seq, int lock_range)
 	int prev_startdisp = 0, prev_enddisp = 0;
 	/* note: don't rename the strip, will break animation curves */
 
-	if (ELEM6(seq->type, SEQ_MOVIE, SEQ_IMAGE, SEQ_SOUND, SEQ_SCENE, SEQ_META, SEQ_MOVIECLIP) == 0) {
+	if (ELEM7(seq->type,
+	          SEQ_TYPE_MOVIE, SEQ_TYPE_IMAGE, SEQ_TYPE_SOUND_RAM,
+	          SEQ_TYPE_SCENE, SEQ_TYPE_META, SEQ_TYPE_MOVIECLIP, SEQ_TYPE_MASK) == 0)
+	{
 		return;
 	}
 
@@ -681,7 +685,7 @@ void reload_sequence_new_file(Scene *scene, Sequence *seq, int lock_range)
 	}
 
 	switch (seq->type) {
-		case SEQ_IMAGE:
+		case SEQ_TYPE_IMAGE:
 		{
 			/* Hack? */
 			size_t olen = MEM_allocN_len(seq->strip->stripdata) / sizeof(struct StripElem);
@@ -694,7 +698,7 @@ void reload_sequence_new_file(Scene *scene, Sequence *seq, int lock_range)
 			}
 			break;
 		}
-		case SEQ_MOVIE:
+		case SEQ_TYPE_MOVIE:
 			BLI_join_dirfile(str, sizeof(str), seq->strip->dir,
 			                 seq->strip->stripdata->name);
 			BLI_path_abs(str, G.main->name);
@@ -719,7 +723,7 @@ void reload_sequence_new_file(Scene *scene, Sequence *seq, int lock_range)
 				seq->len = 0;
 			}
 			break;
-		case SEQ_MOVIECLIP:
+		case SEQ_TYPE_MOVIECLIP:
 			seq->len = BKE_movieclip_get_duration(seq->clip);
 
 			seq->len -= seq->anim_startofs;
@@ -728,7 +732,16 @@ void reload_sequence_new_file(Scene *scene, Sequence *seq, int lock_range)
 				seq->len = 0;
 			}
 			break;
-		case SEQ_SOUND:
+		case SEQ_TYPE_MASK:
+			seq->len = BKE_mask_get_duration(seq->mask);
+
+			seq->len -= seq->anim_startofs;
+			seq->len -= seq->anim_endofs;
+			if (seq->len < 0) {
+				seq->len = 0;
+			}
+			break;
+		case SEQ_TYPE_SOUND_RAM:
 #ifdef WITH_AUDASPACE
 			if (!seq->sound)
 				return;
@@ -742,7 +755,7 @@ void reload_sequence_new_file(Scene *scene, Sequence *seq, int lock_range)
 			return;
 #endif
 			break;
-		case SEQ_SCENE:
+		case SEQ_TYPE_SCENE:
 		{
 			seq->len = (seq->scene) ? seq->scene->r.efra - seq->scene->r.sfra + 1 : 0;
 			seq->len -= seq->anim_startofs;
@@ -781,7 +794,7 @@ void BKE_sequencer_sort(Scene *scene)
 	while ( (seq = ed->seqbasep->first) ) {
 		BLI_remlink(ed->seqbasep, seq);
 
-		if (seq->type & SEQ_EFFECT) {
+		if (seq->type & SEQ_TYPE_EFFECT) {
 			seqt = effbase.first;
 			while (seqt) {
 				if (seqt->machine >= seq->machine) {
@@ -895,27 +908,28 @@ void seqbase_unique_name_recursive(ListBase *seqbasep, struct Sequence *seq)
 static const char *give_seqname_by_type(int type)
 {
 	switch (type) {
-		case SEQ_META:       return "Meta";
-		case SEQ_IMAGE:      return "Image";
-		case SEQ_SCENE:      return "Scene";
-		case SEQ_MOVIE:      return "Movie";
-		case SEQ_MOVIECLIP:  return "Clip";
-		case SEQ_SOUND:      return "Audio";
-		case SEQ_CROSS:      return "Cross";
-		case SEQ_GAMCROSS:   return "Gamma Cross";
-		case SEQ_ADD:        return "Add";
-		case SEQ_SUB:        return "Sub";
-		case SEQ_MUL:        return "Mul";
-		case SEQ_ALPHAOVER:  return "Alpha Over";
-		case SEQ_ALPHAUNDER: return "Alpha Under";
-		case SEQ_OVERDROP:   return "Over Drop";
-		case SEQ_WIPE:       return "Wipe";
-		case SEQ_GLOW:       return "Glow";
-		case SEQ_TRANSFORM:  return "Transform";
-		case SEQ_COLOR:      return "Color";
-		case SEQ_MULTICAM:   return "Multicam";
-		case SEQ_ADJUSTMENT: return "Adjustment";
-		case SEQ_SPEED:      return "Speed";
+		case SEQ_TYPE_META:       return "Meta";
+		case SEQ_TYPE_IMAGE:      return "Image";
+		case SEQ_TYPE_SCENE:      return "Scene";
+		case SEQ_TYPE_MOVIE:      return "Movie";
+		case SEQ_TYPE_MOVIECLIP:  return "Clip";
+		case SEQ_TYPE_MASK:       return "Mask";
+		case SEQ_TYPE_SOUND_RAM:  return "Audio";
+		case SEQ_TYPE_CROSS:      return "Cross";
+		case SEQ_TYPE_GAMCROSS:   return "Gamma Cross";
+		case SEQ_TYPE_ADD:        return "Add";
+		case SEQ_TYPE_SUB:        return "Sub";
+		case SEQ_TYPE_MUL:        return "Mul";
+		case SEQ_TYPE_ALPHAOVER:  return "Alpha Over";
+		case SEQ_TYPE_ALPHAUNDER: return "Alpha Under";
+		case SEQ_TYPE_OVERDROP:   return "Over Drop";
+		case SEQ_TYPE_WIPE:       return "Wipe";
+		case SEQ_TYPE_GLOW:       return "Glow";
+		case SEQ_TYPE_TRANSFORM:  return "Transform";
+		case SEQ_TYPE_COLOR:      return "Color";
+		case SEQ_TYPE_MULTICAM:   return "Multicam";
+		case SEQ_TYPE_ADJUSTMENT: return "Adjustment";
+		case SEQ_TYPE_SPEED:      return "Speed";
 		default:
 			return NULL;
 	}
@@ -926,19 +940,9 @@ const char *give_seqname(Sequence *seq)
 	const char *name = give_seqname_by_type(seq->type);
 
 	if (!name) {
-		if (seq->type < SEQ_EFFECT) {
+		if (seq->type < SEQ_TYPE_EFFECT) {
 			return seq->strip->dir;
 		}
-		else if (seq->type == SEQ_PLUGIN) {
-			if (!(seq->flag & SEQ_EFFECT_NOT_LOADED) &&
-			    seq->plugin && seq->plugin->doit)
-			{
-				return seq->plugin->pname;
-			}
-			else {
-				return "Plugin";
-			}
-		}
 		else {
 			return "Effect";
 		}
@@ -1018,7 +1022,7 @@ static float give_stripelem_index(Sequence *seq, float cfra)
 	int sta = seq->start;
 	int end = seq->start + seq->len - 1;
 
-	if (seq->type & SEQ_EFFECT) {
+	if (seq->type & SEQ_TYPE_EFFECT) {
 		end = seq->enddisp;
 	} 
 
@@ -1051,7 +1055,7 @@ StripElem *give_stripelem(Sequence *seq, int cfra)
 {
 	StripElem *se = seq->strip->stripdata;
 
-	if (seq->type == SEQ_IMAGE) { /* only
+	if (seq->type == SEQ_TYPE_IMAGE) { /* only
 		                           * IMAGE strips use the whole array,
 		                           * MOVIE strips use only
 		                           * the first element, all other strips
@@ -1095,7 +1099,7 @@ int evaluate_seq_frame(Scene *scene, int cfra)
 
 static int video_seq_is_rendered(Sequence *seq)
 {
-	return (seq && !(seq->flag & SEQ_MUTE) && seq->type != SEQ_SOUND);
+	return (seq && !(seq->flag & SEQ_MUTE) && seq->type != SEQ_TYPE_SOUND_RAM);
 }
 
 static int get_shown_sequences(ListBase *seqbasep, int cfra, int chanshown, Sequence **seq_arr_out)
@@ -1241,7 +1245,7 @@ static int seq_proxy_get_fname(Sequence *seq, int cfra, int render_size, char *n
 	if (seq->flag & (SEQ_USE_PROXY_CUSTOM_DIR | SEQ_USE_PROXY_CUSTOM_FILE)) {
 		BLI_strncpy(dir, seq->strip->proxy->dir, sizeof(dir));
 	}
-	else if (seq->type == SEQ_IMAGE) {
+	else if (seq->type == SEQ_TYPE_IMAGE) {
 		BLI_snprintf(dir, PROXY_MAXFILE, "%s/BL_proxy", seq->strip->dir);
 	}
 	else {
@@ -1258,7 +1262,7 @@ static int seq_proxy_get_fname(Sequence *seq, int cfra, int render_size, char *n
 
 	/* generate a separate proxy directory for each preview size */
 
-	if (seq->type == SEQ_IMAGE) {
+	if (seq->type == SEQ_TYPE_IMAGE) {
 		BLI_snprintf(name, PROXY_MAXFILE, "%s/images/%d/%s_proxy", dir,
 		             render_size,
 		             give_stripelem(seq, cfra)->name);
@@ -1403,7 +1407,7 @@ struct SeqIndexBuildContext *seq_proxy_rebuild_context(Main *bmain, Scene *scene
 	context->orig_seq = seq;
 	context->seq = nseq;
 
-	if (nseq->type == SEQ_MOVIE) {
+	if (nseq->type == SEQ_TYPE_MOVIE) {
 		seq_open_anim_file(nseq);
 
 		if (nseq->anim) {
@@ -1422,7 +1426,7 @@ void seq_proxy_rebuild(SeqIndexBuildContext *context, short *stop, short *do_upd
 	Scene *scene = context->scene;
 	int cfra;
 
-	if (seq->type == SEQ_MOVIE) {
+	if (seq->type == SEQ_TYPE_MOVIE) {
 		if (context->index_context) {
 			IMB_anim_index_rebuild(context->index_context, stop, do_update, progress);
 		}
@@ -1552,8 +1556,7 @@ static void make_cb_table_byte(float lift, float gain, float gamma,
 
 	for (y = 0; y < 256; y++) {
 		float v = color_balance_fl((float)y * (1.0f / 255.0f), lift, gain, gamma, mul);
-		CLAMP(v, 0.0f, 1.0f);
-		table[y] = v * 255;
+		table[y] = FTOCHAR(v);
 	}
 }
 
@@ -1653,7 +1656,7 @@ static void color_balance(Sequence *seq, ImBuf *ibuf, float mul)
 }
 
 /*
- *  input preprocessing for SEQ_IMAGE, SEQ_MOVIE, SEQ_MOVIECLIP and SEQ_SCENE
+ *  input preprocessing for SEQ_TYPE_IMAGE, SEQ_TYPE_MOVIE, SEQ_TYPE_MOVIECLIP and SEQ_TYPE_SCENE
  *
  *  Do all the things you can't really do afterwards using sequence effects
  *  (read: before rescaling to render resolution has been done)
@@ -1707,7 +1710,7 @@ static ImBuf *input_preprocess(
 	ibuf = IMB_makeSingleUser(ibuf);
 
 	if ((seq->flag & SEQ_FILTERY) &&
-	    !ELEM(seq->type, SEQ_MOVIE, SEQ_MOVIECLIP))
+	    !ELEM(seq->type, SEQ_TYPE_MOVIE, SEQ_TYPE_MOVIECLIP))
 	{
 		IMB_filtery(ibuf);
 	}
@@ -1916,8 +1919,7 @@ static ImBuf *seq_render_effect_strip_impl(
 	input[0] = seq->seq1; input[1] = seq->seq2; input[2] = seq->seq3;
 
 	if (!sh.execute) { /* effect not supported in this version... */
-		out = IMB_allocImBuf((short)context.rectx, 
-		                     (short)context.recty, 32, IB_rect);
+		out = IMB_allocImBuf(context.rectx, context.recty, 32, IB_rect);
 		return out;
 	}
 
@@ -1994,7 +1996,7 @@ static ImBuf *seq_render_effect_strip_impl(
 	}
 
 	if (out == NULL) {
-		out = IMB_allocImBuf((short)context.rectx, (short)context.recty, 32, IB_rect);
+		out = IMB_allocImBuf(context.rectx, context.recty, 32, IB_rect);
 	}
 
 	return out;
@@ -2052,6 +2054,77 @@ static ImBuf *seq_render_movieclip_strip(
 	return ibuf;
 }
 
+
+static ImBuf *seq_render_mask_strip(
+        SeqRenderData context, Sequence *seq, float nr)
+{
+	/* TODO - add option to rasterize to alpha imbuf? */
+	ImBuf *ibuf = NULL;
+	float *maskbuf;
+	int i;
+
+	if (!seq->mask) {
+		return NULL;
+	}
+
+	BKE_mask_evaluate(seq->mask, seq->mask->sfra + nr, TRUE);
+
+	maskbuf = MEM_callocN(sizeof(float) * context.rectx * context.recty, __func__);
+
+	if (seq->flag & SEQ_MAKE_FLOAT) {
+		/* pixels */
+		float *fp_src;
+		float *fp_dst;
+
+		ibuf = IMB_allocImBuf(context.rectx, context.recty, 32, IB_rectfloat);
+
+		BKE_mask_rasterize(seq->mask,
+		                   context.rectx, context.recty,
+		                   maskbuf,
+		                   TRUE,
+				   FALSE /*XXX- TODO: make on/off for anti-aliasing*/);
+
+		fp_src = maskbuf;
+		fp_dst = ibuf->rect_float;
+		i = context.rectx * context.recty;
+		while(--i) {
+			fp_dst[0] = fp_dst[1] = fp_dst[2] = *fp_src;
+			fp_dst[3] = 1.0f;
+
+			fp_src += 1;
+			fp_dst += 4;
+		}
+	}
+	else {
+		/* pixels */
+		float *fp_src;
+		unsigned char *ub_dst;
+
+		ibuf = IMB_allocImBuf(context.rectx, context.recty, 32, IB_rect);
+
+		BKE_mask_rasterize(seq->mask,
+		                   context.rectx, context.recty,
+		                   maskbuf,
+		                   TRUE,
+				   FALSE /*XXX- TODO: mask on/off for anti-aliasing*/);
+
+		fp_src = maskbuf;
+		ub_dst = (unsigned char *)ibuf->rect;
+		i = context.rectx * context.recty;
+		while(--i) {
+			ub_dst[0] = ub_dst[1] = ub_dst[2] = (unsigned char)(*fp_src * 255.0f); /* already clamped */
+			ub_dst[3] = 255;
+
+			fp_src += 1;
+			ub_dst += 4;
+		}
+	}
+
+	MEM_freeN(maskbuf);
+
+	return ibuf;
+}
+
 static ImBuf *seq_render_scene_strip(
         SeqRenderData context, Sequence *seq, float nr)
 {
@@ -2137,7 +2210,8 @@ static ImBuf *seq_render_scene_strip(
 	
 	if (sequencer_view3d_cb && BLI_thread_is_main() && doseq_gl && (scene == context.scene || have_seq == 0) && camera) {
 		char err_out[256] = "unknown";
-		/* for old scened this can be uninitialized, should probably be added to do_versions at some point if the functionality stays */
+		/* for old scened this can be uninitialized,
+		 * should probably be added to do_versions at some point if the functionality stays */
 		if (context.scene->r.seq_prev_type == 0)
 			context.scene->r.seq_prev_type = 3 /* ==OB_SOLID */; 
 
@@ -2215,8 +2289,8 @@ static ImBuf *seq_render_strip(SeqRenderData context, Sequence *seq, float cfra)
 	int is_proxy_image = FALSE;
 	float nr = give_stripelem_index(seq, cfra);
 	/* all effects are handled similarly with the exception of speed effect */
-	int type = (seq->type & SEQ_EFFECT && seq->type != SEQ_SPEED) ? SEQ_EFFECT : seq->type;
-	int is_preprocessed = !ELEM3(type, SEQ_IMAGE, SEQ_MOVIE, SEQ_SCENE);
+	int type = (seq->type & SEQ_TYPE_EFFECT && seq->type != SEQ_TYPE_SPEED) ? SEQ_TYPE_EFFECT : seq->type;
+	int is_preprocessed = !ELEM3(type, SEQ_TYPE_IMAGE, SEQ_TYPE_MOVIE, SEQ_TYPE_SCENE);
 
 	ibuf = seq_stripelem_cache_get(context, seq, cfra, SEQ_STRIPELEM_IBUF);
 
@@ -2229,13 +2303,13 @@ static ImBuf *seq_render_strip(SeqRenderData context, Sequence *seq, float cfra)
 		ibuf = copy_from_ibuf_still(context, seq, nr);
 	
 	/* MOVIECLIPs have their own proxy management */
-	if (ibuf == NULL && seq->type != SEQ_MOVIECLIP) {
+	if (ibuf == NULL && seq->type != SEQ_TYPE_MOVIECLIP) {
 		ibuf = seq_proxy_fetch(context, seq, cfra);
 		is_proxy_image = (ibuf != NULL);
 	}
 
 	if (ibuf == NULL) switch (type) {
-			case SEQ_META:
+			case SEQ_TYPE_META:
 			{
 				ImBuf *meta_ibuf = NULL;
 
@@ -2257,7 +2331,7 @@ static ImBuf *seq_render_strip(SeqRenderData context, Sequence *seq, float cfra)
 
 				break;
 			}
-			case SEQ_SPEED:
+			case SEQ_TYPE_SPEED:
 			{
 				ImBuf *child_ibuf = NULL;
 
@@ -2283,13 +2357,13 @@ static ImBuf *seq_render_strip(SeqRenderData context, Sequence *seq, float cfra)
 				}
 				break;
 			}
-			case SEQ_EFFECT:
+			case SEQ_TYPE_EFFECT:
 			{
 				ibuf = seq_render_effect_strip_impl(
 				        context, seq, seq->start + nr);
 				break;
 			}
-			case SEQ_IMAGE:
+			case SEQ_TYPE_IMAGE:
 			{
 				StripElem *s_elem = give_stripelem(seq, cfra);
 
@@ -2314,7 +2388,7 @@ static ImBuf *seq_render_strip(SeqRenderData context, Sequence *seq, float cfra)
 				}
 				break;
 			}
-			case SEQ_MOVIE:
+			case SEQ_TYPE_MOVIE:
 			{
 				seq_open_anim_file(seq);
 
@@ -2341,7 +2415,7 @@ static ImBuf *seq_render_strip(SeqRenderData context, Sequence *seq, float cfra)
 				copy_to_ibuf_still(context, seq, nr, ibuf);
 				break;
 			}
-			case SEQ_SCENE:
+			case SEQ_TYPE_SCENE:
 			{ // scene can be NULL after deletions
 				ibuf = seq_render_scene_strip(context, seq, nr);
 
@@ -2351,7 +2425,7 @@ static ImBuf *seq_render_strip(SeqRenderData context, Sequence *seq, float cfra)
 				copy_to_ibuf_still(context, seq, nr, ibuf);
 				break;
 			}
-			case SEQ_MOVIECLIP:
+			case SEQ_TYPE_MOVIECLIP:
 			{
 				ibuf = seq_render_movieclip_strip(context, seq, nr);
 
@@ -2366,10 +2440,18 @@ static ImBuf *seq_render_strip(SeqRenderData context, Sequence *seq, float cfra)
 				copy_to_ibuf_still(context, seq, nr, ibuf);
 				break;
 			}
+		case SEQ_TYPE_MASK:
+		{
+			/* ibuf is alwats new */
+			ibuf = seq_render_mask_strip(context, seq, nr);
+
+			copy_to_ibuf_still(context, seq, nr, ibuf);
+			break;
+		}
 		}
 
 	if (ibuf == NULL)
-		ibuf = IMB_allocImBuf((short)context.rectx, (short)context.recty, 32, IB_rect);
+		ibuf = IMB_allocImBuf(context.rectx, context.recty, 32, IB_rect);
 
 	if (ibuf->x != context.rectx || ibuf->y != context.recty)
 		use_preprocess = TRUE;
@@ -2394,7 +2476,7 @@ static int seq_must_swap_input_in_blend_mode(Sequence *seq)
 	/* bad hack, to fix crazy input ordering of 
 	 * those two effects */
 
-	if (ELEM3(seq->blend_mode, SEQ_ALPHAOVER, SEQ_ALPHAUNDER, SEQ_OVERDROP)) {
+	if (ELEM3(seq->blend_mode, SEQ_TYPE_ALPHAOVER, SEQ_TYPE_ALPHAUNDER, SEQ_TYPE_OVERDROP)) {
 		swap_input = TRUE;
 	}
 	
@@ -2484,7 +2566,7 @@ static ImBuf *seq_render_strip_stack(
 				break;
 			case EARLY_USE_INPUT_1:
 				if (i == 0) {
-					out = IMB_allocImBuf((short)context.rectx, (short)context.recty, 32, IB_rect);
+					out = IMB_allocImBuf(context.rectx, context.recty, 32, IB_rect);
 				}
 				break;
 			case EARLY_DO_EFFECT:
@@ -2578,7 +2660,7 @@ ImBuf *give_ibuf_seq_direct(SeqRenderData context, float cfra, Sequence *seq)
 /* check used when we need to change seq->blend_mode but not to effect or audio strips */
 static int seq_can_blend(Sequence *seq)
 {
-	if (ELEM4(seq->type, SEQ_IMAGE, SEQ_META, SEQ_SCENE, SEQ_MOVIE)) {
+	if (ELEM4(seq->type, SEQ_TYPE_IMAGE, SEQ_TYPE_META, SEQ_TYPE_SCENE, SEQ_TYPE_MOVIE)) {
 		return 1;
 	}
 	else {
@@ -2960,16 +3042,16 @@ void free_imbuf_seq(Scene *scene, ListBase *seqbase, int check_mem_usage,
 	
 	for (seq = seqbase->first; seq; seq = seq->next) {
 		if (seq->strip) {
-			if (seq->type == SEQ_MOVIE && !keep_file_handles)
+			if (seq->type == SEQ_TYPE_MOVIE && !keep_file_handles)
 				free_anim_seq(seq);
-			if (seq->type == SEQ_SPEED) {
+			if (seq->type == SEQ_TYPE_SPEED) {
 				sequence_effect_speed_rebuild_map(scene, seq, 1);
 			}
 		}
-		if (seq->type == SEQ_META) {
+		if (seq->type == SEQ_TYPE_META) {
 			free_imbuf_seq(scene, &seq->seqbase, FALSE, keep_file_handles);
 		}
-		if (seq->type == SEQ_SCENE) {
+		if (seq->type == SEQ_TYPE_SCENE) {
 			/* FIXME: recurs downwards, 
 			 * but do recurs protection somehow! */
 		}
@@ -3006,9 +3088,9 @@ static int update_changed_seq_recurs(Scene *scene, Sequence *seq, Sequence *chan
 	
 	if (free_imbuf) {
 		if (ibuf_change) {
-			if (seq->type == SEQ_MOVIE)
+			if (seq->type == SEQ_TYPE_MOVIE)
 				free_anim_seq(seq);
-			if (seq->type == SEQ_SPEED) {
+			if (seq->type == SEQ_TYPE_SPEED) {
 				sequence_effect_speed_rebuild_map(scene, seq, 1);
 			}
 		}
@@ -3097,8 +3179,8 @@ void seq_tx_set_final_right(Sequence *seq, int val)
 int seq_single_check(Sequence *seq)
 {
 	return ((seq->len == 1) &&
-	        (seq->type == SEQ_IMAGE ||
-	         ((seq->type & SEQ_EFFECT) &&
+	        (seq->type == SEQ_TYPE_IMAGE ||
+	         ((seq->type & SEQ_TYPE_EFFECT) &&
 	          get_sequence_effect_num_inputs(seq->type) == 0)));
 }
 
@@ -3121,7 +3203,7 @@ int seqbase_isolated_sel_check(ListBase *seqbase)
 
 	/* test relationships */
 	for (seq = seqbase->first; seq; seq = seq->next) {
-		if ((seq->type & SEQ_EFFECT) == 0)
+		if ((seq->type & SEQ_TYPE_EFFECT) == 0)
 			continue;
 
 		if (seq->flag & SELECT) {
@@ -3184,7 +3266,7 @@ void seq_tx_handle_xlimits(Sequence *seq, int leftflag, int rightflag)
 	}
 
 	/* sounds cannot be extended past their endpoints */
-	if (seq->type == SEQ_SOUND) {
+	if (seq->type == SEQ_TYPE_SOUND_RAM) {
 		seq->startstill = 0;
 		seq->endstill = 0;
 	}
@@ -3210,7 +3292,7 @@ void seq_single_fix(Sequence *seq)
 
 int seq_tx_test(Sequence *seq)
 {
-	return (seq->type < SEQ_EFFECT) || (get_sequence_effect_num_inputs(seq->type) == 0);
+	return (seq->type < SEQ_TYPE_EFFECT) || (get_sequence_effect_num_inputs(seq->type) == 0);
 }
 
 static int seq_overlap(Sequence *seq1, Sequence *seq2)
@@ -3239,7 +3321,7 @@ void seq_translate(Scene *evil_scene, Sequence *seq, int delta)
 	seq_offset_animdata(evil_scene, seq, delta);
 	seq->start += delta;
 
-	if (seq->type == SEQ_META) {
+	if (seq->type == SEQ_TYPE_META) {
 		Sequence *seq_child;
 		for (seq_child = seq->seqbase.first; seq_child; seq_child = seq_child->next) {
 			seq_translate(evil_scene, seq_child, delta);
@@ -3251,7 +3333,7 @@ void seq_translate(Scene *evil_scene, Sequence *seq, int delta)
 
 void seq_sound_init(Scene *scene, Sequence *seq)
 {
-	if (seq->type == SEQ_META) {
+	if (seq->type == SEQ_TYPE_META) {
 		Sequence *seq_child;
 		for (seq_child = seq->seqbase.first; seq_child; seq_child = seq_child->next) {
 			seq_sound_init(scene, seq_child);
@@ -3279,7 +3361,7 @@ Sequence *seq_foreground_frame_get(Scene *scene, int frame)
 		if (seq->flag & SEQ_MUTE || seq->startdisp > frame || seq->enddisp <= frame)
 			continue;
 		/* only use elements you can see - not */
-		if (ELEM5(seq->type, SEQ_IMAGE, SEQ_META, SEQ_SCENE, SEQ_MOVIE, SEQ_COLOR)) {
+		if (ELEM5(seq->type, SEQ_TYPE_IMAGE, SEQ_TYPE_META, SEQ_TYPE_SCENE, SEQ_TYPE_MOVIE, SEQ_TYPE_COLOR)) {
 			if (seq->machine > best_machine) {
 				best_seq = seq;
 				best_machine = seq->machine;
@@ -3405,10 +3487,10 @@ void seq_update_sound_bounds_all(Scene *scene)
 		Sequence *seq;
 
 		for (seq = ed->seqbase.first; seq; seq = seq->next) {
-			if (seq->type == SEQ_META) {
+			if (seq->type == SEQ_TYPE_META) {
 				seq_update_sound_bounds_recursive(scene, seq);
 			}
-			else if (ELEM(seq->type, SEQ_SOUND, SEQ_SCENE)) {
+			else if (ELEM(seq->type, SEQ_TYPE_SOUND_RAM, SEQ_TYPE_SCENE)) {
 				seq_update_sound_bounds(scene, seq);
 			}
 		}
@@ -3431,7 +3513,7 @@ static void seq_update_muting_recursive(ListBase *seqbasep, Sequence *metaseq, i
 	for (seq = seqbasep->first; seq; seq = seq->next) {
 		seqmute = (mute || (seq->flag & SEQ_MUTE));
 
-		if (seq->type == SEQ_META) {
+		if (seq->type == SEQ_TYPE_META) {
 			/* if this is the current meta sequence, unmute because
 			 * all sequences above this were set to mute */
 			if (seq == metaseq)
@@ -3439,7 +3521,7 @@ static void seq_update_muting_recursive(ListBase *seqbasep, Sequence *metaseq, i
 
 			seq_update_muting_recursive(&seq->seqbase, metaseq, seqmute);
 		}
-		else if (ELEM(seq->type, SEQ_SOUND, SEQ_SCENE)) {
+		else if (ELEM(seq->type, SEQ_TYPE_SOUND_RAM, SEQ_TYPE_SCENE)) {
 			if (seq->scene_sound) {
 				sound_mute_scene_sound(seq->scene_sound, seqmute);
 			}
@@ -3465,10 +3547,10 @@ static void seq_update_sound_recursive(Scene *scene, ListBase *seqbasep, bSound
 	Sequence *seq;
 
 	for (seq = seqbasep->first; seq; seq = seq->next) {
-		if (seq->type == SEQ_META) {
+		if (seq->type == SEQ_TYPE_META) {
 			seq_update_sound_recursive(scene, &seq->seqbase, sound);
 		}
-		else if (seq->type == SEQ_SOUND) {
+		else if (seq->type == SEQ_TYPE_SOUND_RAM) {
 			if (seq->scene_sound && sound == seq->sound) {
 				sound_update_scene_sound(seq->scene_sound, sound);
 			}
@@ -3532,18 +3614,18 @@ int seq_swap(Sequence *seq_a, Sequence *seq_b, const char **error_str)
 
 	/* type checking, could be more advanced but disalow sound vs non-sound copy */
 	if (seq_a->type != seq_b->type) {
-		if (seq_a->type == SEQ_SOUND || seq_b->type == SEQ_SOUND) {
+		if (seq_a->type == SEQ_TYPE_SOUND_RAM || seq_b->type == SEQ_TYPE_SOUND_RAM) {
 			*error_str = "Strips were not compatible";
 			return 0;
 		}
 
 		/* disallow effects to swap with non-effects strips */
-		if ((seq_a->type & SEQ_EFFECT) != (seq_b->type & SEQ_EFFECT)) {
+		if ((seq_a->type & SEQ_TYPE_EFFECT) != (seq_b->type & SEQ_TYPE_EFFECT)) {
 			*error_str = "Strips were not compatible";
 			return 0;
 		}
 
-		if ((seq_a->type & SEQ_EFFECT) && (seq_b->type & SEQ_EFFECT)) {
+		if ((seq_a->type & SEQ_TYPE_EFFECT) && (seq_b->type & SEQ_TYPE_EFFECT)) {
 			if (get_sequence_effect_num_inputs(seq_a->type) != get_sequence_effect_num_inputs(seq_b->type)) {
 				*error_str = "Strips must have the same number of inputs";
 				return 0;
@@ -3780,8 +3862,8 @@ Sequence *sequencer_add_image_strip(bContext *C, ListBase *seqbasep, SeqLoadInfo
 	Strip *strip;
 
 	seq = alloc_sequence(seqbasep, seq_load->start_frame, seq_load->channel);
-	seq->type = SEQ_IMAGE;
-	seq->blend_mode = SEQ_CROSS; /* so alpha adjustment fade to the strip below */
+	seq->type = SEQ_TYPE_IMAGE;
+	seq->blend_mode = SEQ_TYPE_CROSS; /* so alpha adjustment fade to the strip below */
 	
 	/* basic defaults */
 	seq->strip = strip = MEM_callocN(sizeof(Strip), "strip");
@@ -3829,7 +3911,7 @@ Sequence *sequencer_add_sound_strip(bContext *C, ListBase *seqbasep, SeqLoadInfo
 
 	seq = alloc_sequence(seqbasep, seq_load->start_frame, seq_load->channel);
 
-	seq->type = SEQ_SOUND;
+	seq->type = SEQ_TYPE_SOUND_RAM;
 	seq->sound = sound;
 	BLI_strncpy(seq->name + 2, "Sound", SEQ_NAME_MAXSTR - 2);
 	seqbase_unique_name_recursive(&scene->ed->seqbase, seq);
@@ -3885,8 +3967,8 @@ Sequence *sequencer_add_movie_strip(bContext *C, ListBase *seqbasep, SeqLoadInfo
 		return NULL;
 
 	seq = alloc_sequence(seqbasep, seq_load->start_frame, seq_load->channel);
-	seq->type = SEQ_MOVIE;
-	seq->blend_mode = SEQ_CROSS; /* so alpha adjustment fade to the strip below */
+	seq->type = SEQ_TYPE_MOVIE;
+	seq->blend_mode = SEQ_TYPE_CROSS; /* so alpha adjustment fade to the strip below */
 
 	seq->anim = an;
 	seq->anim_preseek = IMB_anim_get_preseek(an);
@@ -3953,24 +4035,24 @@ static Sequence *seq_dupli(struct Scene *scene, struct Scene *scene_to, Sequence
 		seqn->strip->color_balance = MEM_dupallocN(seq->strip->color_balance);
 	}
 
-	if (seq->type == SEQ_META) {
+	if (seq->type == SEQ_TYPE_META) {
 		seqn->strip->stripdata = NULL;
 
 		seqn->seqbase.first = seqn->seqbase.last = NULL;
 		/* WATCH OUT!!! - This metastrip is not recursively duplicated here - do this after!!! */
 		/* - seq_dupli_recursive(&seq->seqbase,&seqn->seqbase);*/
 	}
-	else if (seq->type == SEQ_SCENE) {
+	else if (seq->type == SEQ_TYPE_SCENE) {
 		seqn->strip->stripdata = NULL;
 		if (seq->scene_sound)
 			seqn->scene_sound = sound_scene_add_scene_sound_defaults(sce_audio, seqn);
 	}
-	else if (seq->type == SEQ_MOVIE) {
+	else if (seq->type == SEQ_TYPE_MOVIE) {
 		seqn->strip->stripdata =
 		        MEM_dupallocN(seq->strip->stripdata);
 		seqn->anim = NULL;
 	}
-	else if (seq->type == SEQ_SOUND) {
+	else if (seq->type == SEQ_TYPE_SOUND_RAM) {
 		seqn->strip->stripdata =
 		        MEM_dupallocN(seq->strip->stripdata);
 		if (seq->scene_sound)
@@ -3978,16 +4060,16 @@ static Sequence *seq_dupli(struct Scene *scene, struct Scene *scene_to, Sequence
 
 		seqn->sound->id.us++;
 	}
-	else if (seq->type == SEQ_IMAGE) {
+	else if (seq->type == SEQ_TYPE_IMAGE) {
 		seqn->strip->stripdata =
 		        MEM_dupallocN(seq->strip->stripdata);
 	}
-	else if (seq->type >= SEQ_EFFECT) {
+	else if (seq->type >= SEQ_TYPE_EFFECT) {
 		if (seq->seq1 && seq->seq1->tmp) seqn->seq1 = seq->seq1->tmp;
 		if (seq->seq2 && seq->seq2->tmp) seqn->seq2 = seq->seq2->tmp;
 		if (seq->seq3 && seq->seq3->tmp) seqn->seq3 = seq->seq3->tmp;
 
-		if (seq->type & SEQ_EFFECT) {
+		if (seq->type & SEQ_TYPE_EFFECT) {
 			struct SeqEffectHandle sh;
 			sh = get_sequence_effect(seq);
 			if (sh.copy)
@@ -4015,7 +4097,7 @@ static Sequence *seq_dupli(struct Scene *scene, struct Scene *scene_to, Sequence
 Sequence *seq_dupli_recursive(struct Scene *scene, struct Scene *scene_to, Sequence *seq, int dupe_flag)
 {
 	Sequence *seqn = seq_dupli(scene, scene_to, seq, dupe_flag);
-	if (seq->type == SEQ_META) {
+	if (seq->type == SEQ_TYPE_META) {
 		Sequence *s;
 		for (s = seq->seqbase.first; s; s = s->next) {
 			Sequence *n = seq_dupli_recursive(scene, scene_to, s, dupe_flag);
@@ -4044,7 +4126,7 @@ void seqbase_dupli_recursive(Scene *scene, Scene *scene_to, ListBase *nseqbase,
 				}
 
 				BLI_addtail(nseqbase, seqn);
-				if (seq->type == SEQ_META)
+				if (seq->type == SEQ_TYPE_META)
 					seqbase_dupli_recursive(scene, scene_to, &seqn->seqbase, &seq->seqbase, dupe_flag);
 
 				if (dupe_flag & SEQ_DUPE_CONTEXT) {
diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c
index 6c1c18c7cf8..464b7fda51d 100644
--- a/source/blender/blenkernel/intern/shrinkwrap.c
+++ b/source/blender/blenkernel/intern/shrinkwrap.c
@@ -83,8 +83,6 @@
 
 #endif
 
-typedef void (*Shrinkwrap_ForeachVertexCallback)(DerivedMesh *target, float *co, float *normal);
-
 /* get derived mesh */
 //TODO is anyfunction that does this? returning the derivedFinal without we caring if its in edit mode or not?
 DerivedMesh *object_get_derived_final(Object *ob)
@@ -109,23 +107,23 @@ void space_transform_from_matrixs(SpaceTransform *data, float local[4][4], float
 	invert_m4_m4(data->target2local, data->local2target);
 }
 
-void space_transform_apply(const SpaceTransform *data, float *co)
+void space_transform_apply(const SpaceTransform *data, float co[3])
 {
 	mul_v3_m4v3(co, ((SpaceTransform *)data)->local2target, co);
 }
 
-void space_transform_invert(const SpaceTransform *data, float *co)
+void space_transform_invert(const SpaceTransform *data, float co[3])
 {
 	mul_v3_m4v3(co, ((SpaceTransform *)data)->target2local, co);
 }
 
-static void space_transform_apply_normal(const SpaceTransform *data, float *no)
+static void space_transform_apply_normal(const SpaceTransform *data, float no[3])
 {
 	mul_mat3_m4_v3(((SpaceTransform *)data)->local2target, no);
 	normalize_v3(no); // TODO: could we just determine de scale value from the matrix?
 }
 
-static void space_transform_invert_normal(const SpaceTransform *data, float *no)
+static void space_transform_invert_normal(const SpaceTransform *data, float no[3])
 {
 	mul_mat3_m4_v3(((SpaceTransform *)data)->target2local, no);
 	normalize_v3(no); // TODO: could we just determine de scale value from the matrix?
@@ -211,7 +209,7 @@ static void shrinkwrap_calc_nearest_vertex(ShrinkwrapCalcData *calc)
  *	MOD_SHRINKWRAP_CULL_TARGET_FRONTFACE (front faces hits are ignored)
  *	MOD_SHRINKWRAP_CULL_TARGET_BACKFACE (back faces hits are ignored)
  */
-int normal_projection_project_vertex(char options, const float *vert, const float *dir, const SpaceTransform *transf, BVHTree *tree, BVHTreeRayHit *hit, BVHTree_RayCastCallback callback, void *userdata)
+int normal_projection_project_vertex(char options, const float vert[3], const float dir[3], const SpaceTransform *transf, BVHTree *tree, BVHTreeRayHit *hit, BVHTree_RayCastCallback callback, void *userdata)
 {
 	float tmp_co[3], tmp_no[3];
 	const float *co, *no;
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index edb4348dc5a..ebc31517524 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -150,6 +150,7 @@ static void fill_scs_points(Object *ob, DerivedMesh *dm, SmokeCollSettings *scs)
 struct WTURBULENCE *smoke_turbulence_init(int *UNUSED(res), int UNUSED(amplify), int UNUSED(noisetype)) { return NULL; }
 struct FLUID_3D *smoke_init(int *UNUSED(res), float *UNUSED(p0)) { return NULL; }
 void smoke_free(struct FLUID_3D *UNUSED(fluid)) {}
+float *smoke_get_density(struct FLUID_3D *UNUSED(fluid)) { return NULL; }
 void smoke_turbulence_free(struct WTURBULENCE *UNUSED(wt)) {}
 void smoke_initWaveletBlenderRNA(struct WTURBULENCE *UNUSED(wt), float *UNUSED(strength)) {}
 void smoke_initBlenderRNA(struct FLUID_3D *UNUSED(fluid), float *UNUSED(alpha), float *UNUSED(beta), float *UNUSED(dt_factor), float *UNUSED(vorticity), int *UNUSED(border_colli)) {}
@@ -1172,7 +1173,7 @@ static void update_obstacles(Scene *scene, Object *ob, SmokeDomainSettings *sds,
 
 				sub_v3_v3v3(vel, pos, oldpos);
 				/* Scale velocity to incorperate the object movement during this step */
-				mul_v3_fl(vel, 1.0 / (totalsteps * dt));
+				mul_v3_fl(vel, 1.0 / (totalsteps * dt * sds->scale));
 				// mul_v3_fl(vel, 1.0 / dt);
 
 				// DG TODO: cap velocity to maxVelMag (or maxvel)
@@ -1592,8 +1593,8 @@ static void step(Scene *scene, Object *ob, SmokeModifierData *smd, float fps)
 	/* adapt timestep for different framerates, dt = 0.1 is at 25fps */
 	dt *= (25.0f / fps);
 
-	// maximum timestep/"CFL" constraint: dt < dx * maxVel
-	maxVel = (sds->dx * 1.0);
+	// maximum timestep/"CFL" constraint: dt < 5.0 *dx / maxVel
+	maxVel = (sds->dx * 5.0);
 
 	for(i = 0; i < size; i++)
 	{
@@ -1607,7 +1608,8 @@ static void step(Scene *scene, Object *ob, SmokeModifierData *smd, float fps)
 	totalSubsteps = (totalSubsteps < 1) ? 1 : totalSubsteps;
 	totalSubsteps = (totalSubsteps > maxSubSteps) ? maxSubSteps : totalSubsteps;
 
-	// totalSubsteps = 2.0f; // DEBUG
+	/* Disable substeps for now, since it results in numerical instability */
+	totalSubsteps = 1.0f; 
 
 	dtSubdiv = (float)dt / (float)totalSubsteps;
 
@@ -1867,7 +1869,7 @@ static float calc_voxel_transp(float *result, float *input, int res[3], int *pix
 	
 	if(result[index] < 0.0f)	
 	{
-#pragma omp critical		
+// #pragma omp critical		
 		result[index] = *tRay;	
 	}	
 
@@ -2011,7 +2013,7 @@ static void smoke_calc_transparency(float *result, float *input, float *p0, floa
 	bv[4] = p0[2];
 	bv[5] = p1[2];
 
-#pragma omp parallel for schedule(static,1)
+// #pragma omp parallel for schedule(static,1)
 	for(z = 0; z < res[2]; z++)
 	{
 		size_t index = z*slabsize;
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 5abc4bc3830..63f0a29821f 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -3514,7 +3514,9 @@ static void lattice_to_softbody(Scene *scene, Object *ob)
 {
 	Lattice *lt= ob->data;
 	SoftBody *sb;
-	int totvert, totspring = 0;
+	int totvert, totspring = 0, a;
+	BodyPoint *bp;
+	BPoint *bpnt = lt->def;
 
 	totvert= lt->pntsu*lt->pntsv*lt->pntsw;
 
@@ -3531,18 +3533,17 @@ static void lattice_to_softbody(Scene *scene, Object *ob)
 	/* renew ends with ob->soft with points and edges, also checks & makes ob->soft */
 	renew_softbody(scene, ob, totvert, totspring);
 	sb= ob->soft;	/* can be created in renew_softbody() */
+	bp = sb->bpoint;
 
-	/* weights from bpoints, same code used as for mesh vertices */
-	/* if ((ob->softflag & OB_SB_GOAL) && sb->vertgroup) { 2.4x one*/
-	/* new! take the weights from lattice vertex anyhow */
-	if (ob->softflag & OB_SB_GOAL) {
-		BodyPoint *bp= sb->bpoint;
-		BPoint *bpnt= lt->def;
-		/* jow_go_for2_5 */
-		int a;
-
-		for (a=0; a<totvert; a++, bp++, bpnt++) {
-			bp->goal= bpnt->weight;
+	/* same code used as for mesh vertices */
+	for (a = 0; a < totvert; a++, bp++, bpnt++) {
+		if ((ob->softflag & OB_SB_GOAL) && sb->vertgroup) {
+			get_scalar_from_vertexgroup(ob, a, (short) (sb->vertgroup - 1), &bp->goal);
+		}
+		else {
+			if (ob->softflag & OB_SB_GOAL) {
+				bp->goal = sb->defgoal;
+			}
 		}
 	}
 
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 22e702d5930..5c387e8cee0 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -125,7 +125,7 @@ static CCGSubSurf *_getSubSurf(CCGSubSurf *prevSS, int subdivLevels,
 	int useArena = flags & CCG_USE_ARENA;
 	int normalOffset = 0;
 
-	/* subdivLevels==0 is not allowed */
+	/* (subdivLevels == 0) is not allowed */
 	subdivLevels = MAX2(subdivLevels, 1);
 
 	if (prevSS) {
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 7bfd4189cc3..7de5f97588b 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -570,9 +570,6 @@ void BKE_text_unlink(Main *bmain, Text *text)
 		if (update)
 			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	}
-
-	/* pynodes */
-	// XXX nodeDynamicUnlinkText(&text->id);
 	
 	/* text space */
 	for (scr = bmain->screen.first; scr; scr = scr->id.next) {
@@ -813,7 +810,7 @@ void txt_move_up(Text *text, short sel)
 	if (sel) txt_curs_sel(text, &linep, &charp);
 	else { txt_pop_first(text); txt_curs_cur(text, &linep, &charp); }
 	if (!*linep) return;
-	/* old= *charp; */ /* UNUSED */
+	/* old = *charp; */ /* UNUSED */
 
 	if ((*linep)->prev) {
 		int index = txt_utf8_offset_to_index((*linep)->line, *charp);
@@ -841,7 +838,7 @@ void txt_move_down(Text *text, short sel)
 	if (sel) txt_curs_sel(text, &linep, &charp);
 	else { txt_pop_last(text); txt_curs_cur(text, &linep, &charp); }
 	if (!*linep) return;
-	/* old= *charp; */ /* UNUSED */
+	/* old = *charp; */ /* UNUSED */
 
 	if ((*linep)->next) {
 		int index = txt_utf8_offset_to_index((*linep)->line, *charp);
@@ -3226,8 +3223,8 @@ short txt_clear_marker_region(Text *text, TextLine *line, int start, int end, in
 }
 
 /* Clears all markers in the specified group (if given) with at least the
- * specified flags set. Useful for clearing temporary markers (group=0,
- * flags=TMARK_TEMP) */
+ * specified flags set. Useful for clearing temporary markers (group = 0,
+ * flags = TMARK_TEMP) */
 short txt_clear_markers(Text *text, int group, int flags)
 {
 	TextMarker *marker, *next;
@@ -3276,7 +3273,7 @@ TextMarker *txt_prev_marker(Text *text, TextMarker *marker)
 		if (tmp->group == marker->group)
 			return tmp;
 	}
-	return NULL; /* Only if marker==NULL */
+	return NULL; /* Only if (marker == NULL) */
 }
 
 /* Finds the next marker in the same group. If no other is found, the same
@@ -3290,7 +3287,7 @@ TextMarker *txt_next_marker(Text *text, TextMarker *marker)
 		if (tmp->group == marker->group)
 			return tmp;
 	}
-	return NULL; /* Only if marker==NULL */
+	return NULL; /* Only if (marker == NULL) */
 }
 
 
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 2ec42b47e5c..7081a642b8a 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -56,7 +56,6 @@
 
 #include "IMB_imbuf.h"
 
-#include "BKE_plugin_types.h"
 #include "BKE_utildefines.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
@@ -72,137 +71,6 @@
 #include "BKE_animsys.h"
 #include "BKE_colortools.h"
 
-
-/* ------------------------------------------------------------------------- */
-
-/* All support for plugin textures: */
-int test_dlerr(const char *name, const char *symbol)
-{
-	char *err;
-	
-	err = BLI_dynlib_get_error_as_string(NULL);
-	if (err) {
-		printf("var1: %s, var2: %s, var3: %s\n", name, symbol, err);
-		return 1;
-	}
-	
-	return 0;
-}
-
-/* ------------------------------------------------------------------------- */
-
-void open_plugin_tex(PluginTex *pit)
-{
-	int (*version)(void);
-	
-	/* init all the happy variables */
-	pit->doit = NULL;
-	pit->pname = NULL;
-	pit->stnames = NULL;
-	pit->varstr = NULL;
-	pit->result = NULL;
-	pit->cfra = NULL;
-	pit->version = 0;
-	pit->instance_init = NULL;
-	
-	/* clear the error list */
-	BLI_dynlib_get_error_as_string(NULL);
-
-	/* no BLI_dynlib_close! multiple opened plugins... */
-	/* if (pit->handle) BLI_dynlib_close(pit->handle); */
-	/* pit->handle= 0; */
-
-	/* open the needed object */
-	pit->handle = BLI_dynlib_open(pit->name);
-	if (test_dlerr(pit->name, pit->name)) return;
-
-	if (pit->handle != NULL) {
-		/* find the address of the version function */
-		version = (int (*)(void))BLI_dynlib_find_symbol(pit->handle, "plugin_tex_getversion");
-		if (test_dlerr(pit->name, "plugin_tex_getversion")) return;
-		
-		if (version != NULL) {
-			pit->version = version();
-			if (pit->version >= 2 && pit->version <= 6) {
-				int (*info_func)(PluginInfo *);
-				PluginInfo *info = (PluginInfo *) MEM_mallocN(sizeof(PluginInfo), "plugin_info");
-
-				info_func = (int (*)(PluginInfo *))BLI_dynlib_find_symbol(pit->handle, "plugin_getinfo");
-				if (!test_dlerr(pit->name, "plugin_getinfo")) {
-					info->instance_init = NULL;
-
-					info_func(info);
-
-					pit->doit = (int (*)(void))info->tex_doit;
-					pit->callback = (void (*)(unsigned short))info->callback;
-					pit->stypes = info->stypes;
-					pit->vars = info->nvars;
-					pit->pname = info->name;
-					pit->stnames = info->snames;
-					pit->varstr = info->varstr;
-					pit->result = info->result;
-					pit->cfra = info->cfra;
-					pit->instance_init = info->instance_init;
-					if (info->init) info->init();
-				}
-				MEM_freeN(info);
-			}
-			else {
-				printf("Plugin returned unrecognized version number\n");
-				return;
-			}
-		}
-	}
-}
-
-/* ------------------------------------------------------------------------- */
-
-/* very badlevel define to bypass linking with BIF_interface.h */
-#define INT 96
-#define FLO 128
-
-PluginTex *add_plugin_tex(char *str)
-{
-	PluginTex *pit;
-	VarStruct *varstr;
-	int a;
-	
-	pit = MEM_callocN(sizeof(PluginTex), "plugintex");
-	
-	BLI_strncpy(pit->name, str, sizeof(pit->name));
-	open_plugin_tex(pit);
-	
-	if (pit->doit == NULL) {
-		if (pit->handle == NULL) {; } //XXX error("no plugin: %s", str);
-		else {; } //XXX error("in plugin: %s", str);
-		MEM_freeN(pit);
-		return NULL;
-	}
-	
-	varstr = pit->varstr;
-	for (a = 0; a < pit->vars; a++, varstr++) {
-		if ( (varstr->type & FLO) == FLO)
-			pit->data[a] = varstr->def;
-		else if ( (varstr->type & INT) == INT)
-			*((int *)(pit->data + a)) = (int) varstr->def;
-	}
-
-	if (pit->instance_init)
-		pit->instance_init((void *) pit->data);
-
-	return pit;
-}
-
-/* ------------------------------------------------------------------------- */
-
-void free_plugin_tex(PluginTex *pit)
-{
-	if (pit == NULL) return;
-		
-	/* no BLI_dynlib_close: same plugin can be opened multiple times, 1 handle */
-	MEM_freeN(pit);	
-}
-
 /* ****************** Mapping ******************* */
 
 TexMapping *add_tex_mapping(void)
@@ -550,8 +418,6 @@ int colorband_element_remove(struct ColorBand *coba, int index)
 
 void BKE_texture_free(Tex *tex)
 {
-	free_plugin_tex(tex->plugin);
-	
 	if (tex->coba) MEM_freeN(tex->coba);
 	if (tex->env) BKE_free_envmap(tex->env);
 	if (tex->pd) BKE_free_pointdensity(tex->pd);
@@ -573,10 +439,6 @@ void BKE_texture_free(Tex *tex)
 
 void default_tex(Tex *tex)
 {
-	PluginTex *pit;
-	VarStruct *varstr;
-	int a;
-
 	tex->type = TEX_CLOUDS;
 	tex->stype = 0;
 	tex->flag = TEX_CHECKER_ODD;
@@ -644,15 +506,6 @@ void default_tex(Tex *tex)
 		tex->ot->output = TEX_OCN_DISPLACEMENT;
 		tex->ot->object = NULL;
 	}
-	pit = tex->plugin;
-	if (pit) {
-		varstr = pit->varstr;
-		if (varstr) {
-			for (a = 0; a < pit->vars; a++, varstr++) {
-				pit->data[a] = varstr->def;
-			}
-		}
-	}
 	
 	tex->iuser.fie_ima = 2;
 	tex->iuser.ok = 1;
@@ -833,11 +686,6 @@ Tex *BKE_texture_copy(Tex *tex)
 	if (texn->type == TEX_IMAGE) id_us_plus((ID *)texn->ima);
 	else texn->ima = NULL;
 	
-	if (texn->plugin) {
-		texn->plugin = MEM_dupallocN(texn->plugin);
-		open_plugin_tex(texn->plugin);
-	}
-	
 	if (texn->coba) texn->coba = MEM_dupallocN(texn->coba);
 	if (texn->env) texn->env = BKE_copy_envmap(texn->env);
 	if (texn->pd) texn->pd = BKE_copy_pointdensity(texn->pd);
@@ -865,11 +713,6 @@ Tex *localize_texture(Tex *tex)
 	
 	/* image texture: BKE_texture_free also doesn't decrease */
 	
-	if (texn->plugin) {
-		texn->plugin = MEM_dupallocN(texn->plugin);
-		open_plugin_tex(texn->plugin);
-	}
-	
 	if (texn->coba) texn->coba = MEM_dupallocN(texn->coba);
 	if (texn->env) {
 		texn->env = BKE_copy_envmap(texn->env);
@@ -1058,7 +901,7 @@ void autotexname(Tex *tex)
 {
 	Main *bmain = G.main;
 	char texstr[20][15] = {"None", "Clouds", "Wood", "Marble", "Magic", "Blend",
-		                   "Stucci", "Noise", "Image", "Plugin", "EnvMap", "Musgrave",
+		                   "Stucci", "Noise", "Image", "EnvMap", "Musgrave",
 		                   "Voronoi", "DistNoise", "Point Density", "Voxel Data", "Ocean", "", "", ""};
 	Image *ima;
 	char di[FILE_MAXDIR], fi[FILE_MAXFILE];
@@ -1079,7 +922,6 @@ void autotexname(Tex *tex)
 			}
 			else new_id(&bmain->tex, (ID *)tex, texstr[tex->type]);
 		}
-		else if (tex->type == TEX_PLUGIN && tex->plugin) new_id(&bmain->tex, (ID *)tex, tex->plugin->pname);
 		else new_id(&bmain->tex, (ID *)tex, texstr[tex->type]);
 	}
 }
@@ -1565,11 +1407,7 @@ void BKE_free_oceantex(struct OceanTex *ot)
 /* ------------------------------------------------------------------------- */
 int BKE_texture_dependsOnTime(const struct Tex *texture)
 {
-	if (texture->plugin) {
-		// assume all plugins depend on time
-		return 1;
-	} 
-	else if (texture->ima &&
+	if (texture->ima &&
 	         ELEM(texture->ima->source, IMA_SRC_SEQUENCE, IMA_SRC_MOVIE))
 	{
 		return 1;
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c
index b0745ebf1c8..3992f2be052 100644
--- a/source/blender/blenkernel/intern/tracking.c
+++ b/source/blender/blenkernel/intern/tracking.c
@@ -20,6 +20,7 @@
  *
  * Contributor(s): Blender Foundation,
  *                 Sergey Sharybin
+ *                 Keir Mierle
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -38,7 +39,7 @@
 #include "DNA_gpencil_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_movieclip_types.h"
-#include "DNA_object_types.h"	/* SELECT */
+#include "DNA_object_types.h"   /* SELECT */
 #include "DNA_scene_types.h"
 
 #include "BLI_utildefines.h"
@@ -59,6 +60,8 @@
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
 
+#include "raskter.h"
+
 #ifdef WITH_LIBMV
 #  include "libmv-capi.h"
 #else
@@ -73,19 +76,99 @@ static struct {
 	ListBase tracks;
 } tracking_clipboard;
 
-/*********************** common functions *************************/
+/*********************** Common functions  *************************/
+
+static MovieTrackingTrack *tracking_track_duplicate(MovieTrackingTrack *track)
+{
+	MovieTrackingTrack *new_track;
+
+	new_track = MEM_callocN(sizeof(MovieTrackingTrack), "tracksMapMerge new_track");
+
+	*new_track = *track;
+	new_track->next = new_track->prev = NULL;
+
+	new_track->markers = MEM_dupallocN(new_track->markers);
+
+	return new_track;
+}
+
+static void tracking_tracks_free(ListBase *tracks)
+{
+	MovieTrackingTrack *track;
+
+	for (track = tracks->first; track; track = track->next) {
+		BKE_tracking_track_free(track);
+	}
+
+	BLI_freelistN(tracks);
+}
+
+static void tracking_reconstruction_free(MovieTrackingReconstruction *reconstruction)
+{
+	if (reconstruction->cameras)
+		MEM_freeN(reconstruction->cameras);
+}
+
+static void tracking_object_free(MovieTrackingObject *object)
+{
+	tracking_tracks_free(&object->tracks);
+	tracking_reconstruction_free(&object->reconstruction);
+}
+
+static void tracking_objects_free(ListBase *objects)
+{
+	MovieTrackingObject *object;
+
+	for (object = objects->first; object; object = object->next)
+		tracking_object_free(object);
+
+	BLI_freelistN(objects);
+}
+
+static void tracking_dopesheet_free(MovieTrackingDopesheet *dopesheet)
+{
+	MovieTrackingDopesheetChannel *channel;
+
+	channel = dopesheet->channels.first;
+	while (channel) {
+		if (channel->segments) {
+			MEM_freeN(channel->segments);
+		}
+
+		channel = channel->next;
+	}
+
+	BLI_freelistN(&dopesheet->channels);
+
+	dopesheet->channels.first = dopesheet->channels.last = NULL;
+	dopesheet->tot_channel = 0;
+}
+
+void BKE_tracking_free(MovieTracking *tracking)
+{
+	tracking_tracks_free(&tracking->tracks);
+	tracking_reconstruction_free(&tracking->reconstruction);
+	tracking_objects_free(&tracking->objects);
+
+	if (tracking->stabilization.scaleibuf)
+		IMB_freeImBuf(tracking->stabilization.scaleibuf);
+
+	if (tracking->camera.intrinsics)
+		BKE_tracking_distortion_free(tracking->camera.intrinsics);
 
-void BKE_tracking_init_settings(MovieTracking *tracking)
+	tracking_dopesheet_free(&tracking->dopesheet);
+}
+
+void BKE_tracking_settings_init(MovieTracking *tracking)
 {
 	tracking->camera.sensor_width = 35.0f;
 	tracking->camera.pixel_aspect = 1.0f;
 	tracking->camera.units = CAMERA_UNITS_MM;
 
-	tracking->settings.default_tracker = TRACKER_HYBRID;
+	tracking->settings.default_motion_model = TRACK_MOTION_MODEL_TRANSLATION;
 	tracking->settings.default_minimum_correlation = 0.75;
 	tracking->settings.default_pattern_size = 11;
 	tracking->settings.default_search_size = 61;
-	tracking->settings.default_pyramid_levels = 2;
 	tracking->settings.keyframe1 = 1;
 	tracking->settings.keyframe2 = 30;
 	tracking->settings.dist = 1;
@@ -96,136 +179,299 @@ void BKE_tracking_init_settings(MovieTracking *tracking)
 	tracking->stabilization.rotinf = 1.0f;
 	tracking->stabilization.maxscale = 2.0f;
 
-	BKE_tracking_new_object(tracking, "Camera");
+	BKE_tracking_object_add(tracking, "Camera");
 }
 
-void BKE_tracking_clamp_track(MovieTrackingTrack *track, int event)
+ListBase *BKE_tracking_get_active_tracks(MovieTracking *tracking)
 {
-	int a;
-	float pat_min[2];
-	float pat_max[2];
-	float max_pyramid_level_factor = 1.0;
+	MovieTrackingObject *object = BKE_tracking_object_get_active(tracking);
 
-	if (track->tracker == TRACKER_KLT) {
-		max_pyramid_level_factor = 1 << (track->pyramid_levels - 1);
+	if (object && (object->flag & TRACKING_OBJECT_CAMERA) == 0) {
+		return &object->tracks;
 	}
 
-	/* sort */
-	for (a = 0; a < 2; a++) {
-		if (track->pat_min[a] > track->pat_max[a])
-			SWAP(float, track->pat_min[a], track->pat_max[a]);
+	return &tracking->tracks;
+}
+
+MovieTrackingReconstruction *BKE_tracking_get_active_reconstruction(MovieTracking *tracking)
+{
+	MovieTrackingObject *object = BKE_tracking_object_get_active(tracking);
 
-		if (track->search_min[a] > track->search_max[a])
-			SWAP(float, track->search_min[a], track->search_max[a]);
-	}
+	return BKE_tracking_object_get_reconstruction(tracking, object);
+}
 
-	/* compute the effective pattern size, which differs from the fine resolution
-	 * pattern size for the pyramid KLT tracker */
-	for (a = 0; a < 2; a++) {
-		pat_min[a] = max_pyramid_level_factor * track->pat_min[a];
-		pat_max[a] = max_pyramid_level_factor * track->pat_max[a];
+void BKE_tracking_get_camera_object_matrix(Scene *scene, Object *ob, float mat[4][4])
+{
+	if (!ob) {
+		if (scene->camera)
+			ob = scene->camera;
+		else
+			ob = BKE_scene_camera_find(scene);
 	}
 
-	if (event == CLAMP_PAT_DIM) {
-		for (a = 0; a < 2; a++) {
-			/* search shouldn't be resized smaller than pattern */
-			track->search_min[a] = MIN2(pat_min[a], track->search_min[a]);
-			track->search_max[a] = MAX2(pat_max[a], track->search_max[a]);
-		}
+	if (ob)
+		BKE_object_where_is_calc_mat4(scene, ob, mat);
+	else
+		unit_m4(mat);
+}
+
+void BKE_tracking_get_projection_matrix(MovieTracking *tracking, MovieTrackingObject *object,
+                                        int framenr, int winx, int winy, float mat[4][4])
+{
+	MovieReconstructedCamera *camera;
+	float lens = tracking->camera.focal * tracking->camera.sensor_width / (float)winx;
+	float viewfac, pixsize, left, right, bottom, top, clipsta, clipend;
+	float winmat[4][4];
+	float ycor =  1.0f / tracking->camera.pixel_aspect;
+	float shiftx, shifty, winside = MAX2(winx, winy);
+
+	BKE_tracking_camera_shift_get(tracking, winx, winy, &shiftx, &shifty);
+
+	clipsta = 0.1f;
+	clipend = 1000.0f;
+
+	if (winx >= winy)
+		viewfac = (lens * winx) / tracking->camera.sensor_width;
+	else
+		viewfac = (ycor * lens * winy) / tracking->camera.sensor_width;
+
+	pixsize = clipsta / viewfac;
+
+	left = -0.5f * (float)winx + shiftx * winside;
+	bottom = -0.5f * (ycor) * (float)winy + shifty * winside;
+	right =  0.5f * (float)winx + shiftx * winside;
+	top =  0.5f * (ycor) * (float)winy + shifty * winside;
+
+	left *= pixsize;
+	right *= pixsize;
+	bottom *= pixsize;
+	top *= pixsize;
+
+	perspective_m4(winmat, left, right, bottom, top, clipsta, clipend);
+
+	camera = BKE_tracking_camera_get_reconstructed(tracking, object, framenr);
+
+	if (camera) {
+		float imat[4][4];
+
+		invert_m4_m4(imat, camera->mat);
+		mult_m4_m4m4(mat, winmat, imat);
 	}
-	else if (event == CLAMP_PAT_POS) {
-		float dim[2];
+	else copy_m4_m4(mat, winmat);
+}
 
-		sub_v2_v2v2(dim, track->pat_max, track->pat_min);
+/* **** space transformation functions  **** */
 
-		for (a = 0; a < 2; a++) {
-			/* pattern shouldn't be moved outside of search */
-			if (pat_min[a] < track->search_min[a]) {
-				track->pat_min[a] = track->search_min[a] - (pat_min[a] - track->pat_min[a]);
-				track->pat_max[a] = track->pat_min[a] + dim[a];
-			}
-			if (track->pat_max[a] > track->search_max[a]) {
-				track->pat_max[a] = track->search_max[a] - (pat_max[a] - track->pat_max[a]);
-				track->pat_min[a] = track->pat_max[a] - dim[a];
-			}
-		}
+/* Three coordinate frames: Frame, Search, and Marker
+ * Two units: Pixels, Unified
+ * Notation: {coordinate frame}_{unit}; for example, "search_pixel" are search
+ * window relative coordinates in pixels, and "frame_unified" are unified 0..1
+ * coordinates relative to the entire frame.
+ */
+static void unified_to_pixel(int frame_width, int frame_height,
+                             const float unified_coords[2], float pixel_coords[2])
+{
+	pixel_coords[0] = unified_coords[0] * frame_width;
+	pixel_coords[1] = unified_coords[1] * frame_height;
+}
+
+static void marker_to_frame_unified(const MovieTrackingMarker *marker, const float marker_unified_coords[2],
+                                    float frame_unified_coords[2])
+{
+	frame_unified_coords[0] = marker_unified_coords[0] + marker->pos[0];
+	frame_unified_coords[1] = marker_unified_coords[1] + marker->pos[1];
+}
+
+static void marker_unified_to_frame_pixel_coordinates(int frame_width, int frame_height,
+                                                      const MovieTrackingMarker *marker,
+                                                      const float marker_unified_coords[2],
+                                                      float frame_pixel_coords[2])
+{
+	marker_to_frame_unified(marker, marker_unified_coords, frame_pixel_coords);
+	unified_to_pixel(frame_width, frame_height, frame_pixel_coords, frame_pixel_coords);
+}
+
+static void get_search_origin_frame_pixel(int frame_width, int frame_height,
+                                          const MovieTrackingMarker *marker, float frame_pixel[2])
+{
+	/* Get the lower left coordinate of the search window and snap to pixel coordinates */
+	marker_unified_to_frame_pixel_coordinates(frame_width, frame_height, marker, marker->search_min, frame_pixel);
+	frame_pixel[0] = (int)frame_pixel[0];
+	frame_pixel[1] = (int)frame_pixel[1];
+}
+
+#ifdef WITH_LIBMV
+static void pixel_to_unified(int frame_width, int frame_height, const float pixel_coords[2], float unified_coords[2])
+{
+	unified_coords[0] = pixel_coords[0] / frame_width;
+	unified_coords[1] = pixel_coords[1] / frame_height;
+}
+
+static void marker_unified_to_search_pixel(int frame_width, int frame_height,
+                                           const MovieTrackingMarker *marker,
+                                           const float marker_unified[2], float search_pixel[2])
+{
+	float frame_pixel[2];
+	float search_origin_frame_pixel[2];
+
+	marker_unified_to_frame_pixel_coordinates(frame_width, frame_height, marker, marker_unified, frame_pixel);
+	get_search_origin_frame_pixel(frame_width, frame_height, marker, search_origin_frame_pixel);
+	sub_v2_v2v2(search_pixel, frame_pixel, search_origin_frame_pixel);
+}
+
+static void search_pixel_to_marker_unified(int frame_width, int frame_height,
+                                           const MovieTrackingMarker *marker,
+                                           const float search_pixel[2], float marker_unified[2])
+{
+	float frame_unified[2];
+	float search_origin_frame_pixel[2];
+
+	get_search_origin_frame_pixel(frame_width, frame_height, marker, search_origin_frame_pixel);
+	add_v2_v2v2(frame_unified, search_pixel, search_origin_frame_pixel);
+	pixel_to_unified(frame_width, frame_height, frame_unified, frame_unified);
+
+	/* marker pos is in frame unified */
+	sub_v2_v2v2(marker_unified, frame_unified, marker->pos);
+}
+
+/* Each marker has 5 coordinates associated with it that get warped with
+ * tracking: the four corners ("pattern_corners"), and the cernter ("pos").
+ * This function puts those 5 points into the appropriate frame for tracking
+ * (the "search" coordinate frame).
+ */
+static void get_marker_coords_for_tracking(int frame_width, int frame_height,
+                                           const MovieTrackingMarker *marker,
+                                           double search_pixel_x[5], double search_pixel_y[5])
+{
+	int i;
+	float unified_coords[2];
+	float pixel_coords[2];
+
+	/* Convert the corners into search space coordinates. */
+	for (i = 0; i < 4; i++) {
+		marker_unified_to_search_pixel(frame_width, frame_height, marker, marker->pattern_corners[i], pixel_coords);
+		search_pixel_x[i] = pixel_coords[0];
+		search_pixel_y[i] = pixel_coords[1];
 	}
-	else if (event == CLAMP_SEARCH_DIM) {
-		for (a = 0; a < 2; a++) {
-			/* search shouldn't be resized smaller than pattern */
-			track->search_min[a] = MIN2(pat_min[a], track->search_min[a]);
-			track->search_max[a] = MAX2(pat_max[a], track->search_max[a]);
-		}
+
+	/* Convert the center position (aka "pos"); this is the origin */
+	unified_coords[0] = 0.0;
+	unified_coords[1] = 0.0;
+	marker_unified_to_search_pixel(frame_width, frame_height, marker, unified_coords, pixel_coords);
+
+	search_pixel_x[4] = pixel_coords[0];
+	search_pixel_y[4] = pixel_coords[1];
+}
+
+/* Inverse of above. */
+static void set_marker_coords_from_tracking(int frame_width, int frame_height, MovieTrackingMarker *marker,
+                                            const double search_pixel_x[5], const double search_pixel_y[5])
+{
+	int i;
+	float marker_unified[2];
+	float search_pixel[2];
+
+	/* Convert the corners into search space coordinates. */
+	for (i = 0; i < 4; i++) {
+		search_pixel[0] = search_pixel_x[i];
+		search_pixel[1] = search_pixel_y[i];
+		search_pixel_to_marker_unified(frame_width, frame_height, marker, search_pixel, marker->pattern_corners[i]);
 	}
-	else if (event == CLAMP_SEARCH_POS) {
-		float dim[2];
 
-		sub_v2_v2v2(dim, track->search_max, track->search_min);
+	/* Convert the center position (aka "pos"); this is the origin */
+	search_pixel[0] = search_pixel_x[4];
+	search_pixel[1] = search_pixel_y[4];
+	search_pixel_to_marker_unified(frame_width, frame_height, marker, search_pixel, marker_unified);
 
-		for (a = 0; a < 2; a++) {
-			/* search shouldn't be moved inside pattern */
-			if (track->search_min[a] > pat_min[a]) {
-				track->search_min[a] = pat_min[a];
-				track->search_max[a] = track->search_min[a] + dim[a];
-			}
-			if (track->search_max[a] < pat_max[a]) {
-				track->search_max[a] = pat_max[a];
-				track->search_min[a] = track->search_max[a] - dim[a];
-			}
-		}
+	/* If the tracker tracked nothing, then "marker_unified" would be zero.
+	 * Otherwise, the entire patch shifted, and that delta should be applied to
+	 * all the coordinates.
+	 */
+	for (i = 0; i < 4; i++) {
+		marker->pattern_corners[i][0] -= marker_unified[0];
+		marker->pattern_corners[i][1] -= marker_unified[1];
 	}
-	else if (event == CLAMP_PYRAMID_LEVELS || (event == CLAMP_SEARCH_DIM && track->tracker == TRACKER_KLT)) {
-		float dim[2];
-		sub_v2_v2v2(dim, track->pat_max, track->pat_min);
-		{
-			float search_ratio = 2.3f * max_pyramid_level_factor;
 
-			/* resize the search area to something sensible based
-			 * on the number of pyramid levels */
-			for (a = 0; a < 2; a++) {
-				track->search_min[a] = search_ratio * track->pat_min[a];
-				track->search_max[a] = search_ratio * track->pat_max[a];
-			}
-		}
+	marker->pos[0] += marker_unified[0];
+	marker->pos[1] += marker_unified[1];
+}
+#endif
+
+/*********************** clipboard *************************/
+
+void BKE_tracking_clipboard_free(void)
+{
+	MovieTrackingTrack *track = tracking_clipboard.tracks.first, *next_track;
+
+	while (track) {
+		next_track = track->next;
+
+		BKE_tracking_track_free(track);
+		MEM_freeN(track);
+
+		track = next_track;
 	}
+}
 
-	/* marker's center should be in center of pattern */
-	if (event == CLAMP_PAT_DIM || event == CLAMP_PAT_POS) {
-		float dim[2];
+void BKE_tracking_clipboard_copy_tracks(MovieTracking *tracking, MovieTrackingObject *object)
+{
+	ListBase *tracksbase = BKE_tracking_object_get_tracks(tracking, object);
+	MovieTrackingTrack *track = tracksbase->first;
 
-		sub_v2_v2v2(dim, track->pat_max, track->pat_min);
+	BKE_tracking_clipboard_free();
 
-		for (a = 0; a < 2; a++) {
-			track->pat_min[a] = -dim[a] / 2.0f;
-			track->pat_max[a] = dim[a] / 2.0f;
+	while (track) {
+		if (TRACK_SELECTED(track) && (track->flag & TRACK_HIDDEN) == 0) {
+			MovieTrackingTrack *new_track = tracking_track_duplicate(track);
+
+			BLI_addtail(&tracking_clipboard.tracks, new_track);
 		}
+
+		track = track->next;
 	}
 }
 
-void BKE_tracking_track_flag(MovieTrackingTrack *track, int area, int flag, int clear)
+int BKE_tracking_clipboard_has_tracks(void)
 {
-	if (area == TRACK_AREA_NONE)
-		return;
+	return tracking_clipboard.tracks.first != NULL;
+}
 
-	if (clear) {
-		if (area & TRACK_AREA_POINT)
-			track->flag &= ~flag;
-		if (area & TRACK_AREA_PAT)
-			track->pat_flag &= ~flag;
-		if (area & TRACK_AREA_SEARCH)
-			track->search_flag &= ~flag;
-	}
-	else {
-		if (area & TRACK_AREA_POINT)
-			track->flag |= flag;
-		if (area & TRACK_AREA_PAT)
-			track->pat_flag |= flag;
-		if (area & TRACK_AREA_SEARCH)
-			track->search_flag |= flag;
+void BKE_tracking_clipboard_paste_tracks(MovieTracking *tracking, MovieTrackingObject *object)
+{
+	ListBase *tracksbase = BKE_tracking_object_get_tracks(tracking, object);
+	MovieTrackingTrack *track = tracking_clipboard.tracks.first;
+
+	while (track) {
+		MovieTrackingTrack *new_track = tracking_track_duplicate(track);
+
+		BLI_addtail(tracksbase, new_track);
+		BKE_tracking_track_unique_name(tracksbase, new_track);
+
+		track = track->next;
 	}
 }
 
-MovieTrackingTrack *BKE_tracking_add_track(MovieTracking *tracking, ListBase *tracksbase, float x, float y,
+/*********************** Tracks  *************************/
+
+static void tracking_marker_insert_disabled(MovieTrackingTrack *track, MovieTrackingMarker *ref_marker,
+                                            int before, int overwrite)
+{
+	MovieTrackingMarker marker_new;
+
+	marker_new = *ref_marker;
+	marker_new.flag &= ~MARKER_TRACKED;
+	marker_new.flag |= MARKER_DISABLED;
+
+	if (before)
+		marker_new.framenr--;
+	else
+		marker_new.framenr++;
+
+	if (overwrite || !BKE_tracking_track_has_marker_at_frame(track, marker_new.framenr))
+		BKE_tracking_marker_insert(track, &marker_new);
+}
+
+MovieTrackingTrack *BKE_tracking_track_add(MovieTracking *tracking, ListBase *tracksbase, float x, float y,
                                            int framenr, int width, int height)
 {
 	MovieTrackingTrack *track;
@@ -245,44 +491,442 @@ MovieTrackingTrack *BKE_tracking_add_track(MovieTracking *tracking, ListBase *tr
 	track = MEM_callocN(sizeof(MovieTrackingTrack), "add_marker_exec track");
 	strcpy(track->name, "Track");
 
-	track->tracker = settings->default_tracker;
-	track->pyramid_levels = settings->default_pyramid_levels;
+	/* fill track's settings from default settings */
+	track->motion_model = settings->default_motion_model;
 	track->minimum_correlation = settings->default_minimum_correlation;
 	track->margin = settings->default_margin;
 	track->pattern_match = settings->default_pattern_match;
 	track->frames_limit = settings->default_frames_limit;
 	track->flag = settings->default_flag;
+	track->algorithm_flag = settings->default_algorithm_flag;
 
 	memset(&marker, 0, sizeof(marker));
 	marker.pos[0] = x;
 	marker.pos[1] = y;
 	marker.framenr = framenr;
 
-	copy_v2_v2(track->pat_max, pat);
-	negate_v2_v2(track->pat_min, pat);
+	marker.pattern_corners[0][0] = -pat[0];
+	marker.pattern_corners[0][1] = -pat[1];
 
-	copy_v2_v2(track->search_max, search);
-	negate_v2_v2(track->search_min, search);
+	marker.pattern_corners[1][0] = pat[0];
+	marker.pattern_corners[1][1] = -pat[1];
 
-	BKE_tracking_insert_marker(track, &marker);
+	negate_v2_v2(marker.pattern_corners[2], marker.pattern_corners[0]);
+	negate_v2_v2(marker.pattern_corners[3], marker.pattern_corners[1]);
 
-	if (track->tracker == TRACKER_KLT)
-		BKE_tracking_clamp_track(track, CLAMP_PYRAMID_LEVELS);
+	copy_v2_v2(marker.search_max, search);
+	negate_v2_v2(marker.search_min, search);
+
+	BKE_tracking_marker_insert(track, &marker);
 
 	BLI_addtail(tracksbase, track);
-	BKE_track_unique_name(tracksbase, track);
+	BKE_tracking_track_unique_name(tracksbase, track);
 
 	return track;
 }
 
-MovieTrackingMarker *BKE_tracking_insert_marker(MovieTrackingTrack *track, MovieTrackingMarker *marker)
+void BKE_tracking_track_unique_name(ListBase *tracksbase, MovieTrackingTrack *track)
+{
+	BLI_uniquename(tracksbase, track, "Track", '.', offsetof(MovieTrackingTrack, name), sizeof(track->name));
+}
+
+void BKE_tracking_track_free(MovieTrackingTrack *track)
+{
+	if (track->markers)
+		MEM_freeN(track->markers);
+}
+
+void BKE_tracking_track_flag_set(MovieTrackingTrack *track, int area, int flag)
+{
+	if (area == TRACK_AREA_NONE)
+		return;
+
+	if (area & TRACK_AREA_POINT)
+		track->flag |= flag;
+	if (area & TRACK_AREA_PAT)
+		track->pat_flag |= flag;
+	if (area & TRACK_AREA_SEARCH)
+		track->search_flag |= flag;
+}
+
+void BKE_tracking_track_flag_clear(MovieTrackingTrack *track, int area, int flag)
+{
+	if (area == TRACK_AREA_NONE)
+		return;
+
+	if (area & TRACK_AREA_POINT)
+		track->flag &= ~flag;
+	if (area & TRACK_AREA_PAT)
+		track->pat_flag &= ~flag;
+	if (area & TRACK_AREA_SEARCH)
+		track->search_flag &= ~flag;
+}
+
+int BKE_tracking_track_has_marker_at_frame(MovieTrackingTrack *track, int framenr)
+{
+	return BKE_tracking_marker_get_exact(track, framenr) != 0;
+}
+
+int BKE_tracking_track_has_enabled_marker_at_frame(MovieTrackingTrack *track, int framenr)
+{
+	MovieTrackingMarker *marker = BKE_tracking_marker_get_exact(track, framenr);
+
+	return marker && (marker->flag & MARKER_DISABLED) == 0;
+}
+
+void BKE_tracking_track_path_clear(MovieTrackingTrack *track, int ref_frame, int action)
+{
+	int a;
+
+	if (action == TRACK_CLEAR_REMAINED) {
+		a = 1;
+
+		while (a < track->markersnr) {
+			if (track->markers[a].framenr > ref_frame) {
+				track->markersnr = a;
+				track->markers = MEM_reallocN(track->markers, sizeof(MovieTrackingMarker) * track->markersnr);
+
+				break;
+			}
+
+			a++;
+		}
+
+		if (track->markersnr)
+			tracking_marker_insert_disabled(track, &track->markers[track->markersnr - 1], FALSE, TRUE);
+	}
+	else if (action == TRACK_CLEAR_UPTO) {
+		a = track->markersnr - 1;
+
+		while (a >= 0) {
+			if (track->markers[a].framenr <= ref_frame) {
+				memmove(track->markers, track->markers + a, (track->markersnr - a) * sizeof(MovieTrackingMarker));
+
+				track->markersnr = track->markersnr - a;
+				track->markers = MEM_reallocN(track->markers, sizeof(MovieTrackingMarker) * track->markersnr);
+
+				break;
+			}
+
+			a--;
+		}
+
+		if (track->markersnr)
+			tracking_marker_insert_disabled(track, &track->markers[0], TRUE, TRUE);
+	}
+	else if (action == TRACK_CLEAR_ALL) {
+		MovieTrackingMarker *marker, marker_new;
+
+		marker = BKE_tracking_marker_get(track, ref_frame);
+		marker_new = *marker;
+
+		MEM_freeN(track->markers);
+		track->markers = NULL;
+		track->markersnr = 0;
+
+		BKE_tracking_marker_insert(track, &marker_new);
+
+		tracking_marker_insert_disabled(track, &marker_new, TRUE, TRUE);
+		tracking_marker_insert_disabled(track, &marker_new, FALSE, TRUE);
+	}
+}
+
+void BKE_tracking_tracks_join(MovieTrackingTrack *dst_track, MovieTrackingTrack *src_track)
+{
+	int i = 0, a = 0, b = 0, tot;
+	MovieTrackingMarker *markers;
+
+	tot = dst_track->markersnr + src_track->markersnr;
+	markers = MEM_callocN(tot * sizeof(MovieTrackingMarker), "tmp tracking joined tracks");
+
+	while (a < src_track->markersnr || b < dst_track->markersnr) {
+		if (b >= dst_track->markersnr) {
+			markers[i] = src_track->markers[a++];
+		}
+		else if (a >= src_track->markersnr) {
+			markers[i] = dst_track->markers[b++];
+		}
+		else if (src_track->markers[a].framenr < dst_track->markers[b].framenr) {
+			markers[i] = src_track->markers[a++];
+		}
+		else if (src_track->markers[a].framenr > dst_track->markers[b].framenr) {
+			markers[i] = dst_track->markers[b++];
+		}
+		else {
+			if ((src_track->markers[a].flag & MARKER_DISABLED) == 0) {
+				if ((dst_track->markers[b].flag & MARKER_DISABLED) == 0) {
+					/* both tracks are enabled on this frame, so find the whole segment
+					 * on which tracks are intersecting and blend tracks using linear
+					 * interpolation to prevent jumps
+					 */
+
+					MovieTrackingMarker *marker_a, *marker_b;
+					int start_a = a, start_b = b, len = 0, frame = src_track->markers[a].framenr;
+					int j, inverse = 0;
+
+					inverse = (b == 0) ||
+					          (dst_track->markers[b - 1].flag & MARKER_DISABLED) ||
+					          (dst_track->markers[b - 1].framenr != frame - 1);
+
+					/* find length of intersection */
+					while (a < src_track->markersnr && b < dst_track->markersnr) {
+						marker_a = &src_track->markers[a];
+						marker_b = &dst_track->markers[b];
+
+						if (marker_a->flag & MARKER_DISABLED || marker_b->flag & MARKER_DISABLED)
+							break;
+
+						if (marker_a->framenr != frame || marker_b->framenr != frame)
+							break;
+
+						frame++;
+						len++;
+						a++;
+						b++;
+					}
+
+					a = start_a;
+					b = start_b;
+
+					/* linear interpolation for intersecting frames */
+					for (j = 0; j < len; j++) {
+						float fac = 0.5f;
+
+						if (len > 1)
+							fac = 1.0f / (len - 1) * j;
+
+						if (inverse)
+							fac = 1.0f - fac;
+
+						marker_a = &src_track->markers[a];
+						marker_b = &dst_track->markers[b];
+
+						markers[i] = dst_track->markers[b];
+						interp_v2_v2v2(markers[i].pos, marker_b->pos, marker_a->pos, fac);
+						a++;
+						b++;
+						i++;
+					}
+
+					/* this values will be incremented at the end of the loop cycle */
+					a--; b--; i--;
+				}
+				else {
+					markers[i] = src_track->markers[a];
+				}
+			}
+			else {
+				markers[i] = dst_track->markers[b];
+			}
+
+			a++;
+			b++;
+		}
+
+		i++;
+	}
+
+	MEM_freeN(dst_track->markers);
+
+	dst_track->markers = MEM_callocN(i * sizeof(MovieTrackingMarker), "tracking joined tracks");
+	memcpy(dst_track->markers, markers, i * sizeof(MovieTrackingMarker));
+
+	dst_track->markersnr = i;
+
+	MEM_freeN(markers);
+}
+
+MovieTrackingTrack *BKE_tracking_track_get_named(MovieTracking *tracking, MovieTrackingObject *object, const char *name)
+{
+	ListBase *tracksbase = BKE_tracking_object_get_tracks(tracking, object);
+	MovieTrackingTrack *track = tracksbase->first;
+
+	while (track) {
+		if (!strcmp(track->name, name))
+			return track;
+
+		track = track->next;
+	}
+
+	return NULL;
+}
+
+MovieTrackingTrack *BKE_tracking_track_get_indexed(MovieTracking *tracking, int tracknr, ListBase **tracksbase_r)
+{
+	MovieTrackingObject *object;
+	int cur = 1;
+
+	object = tracking->objects.first;
+	while (object) {
+		ListBase *tracksbase = BKE_tracking_object_get_tracks(tracking, object);
+		MovieTrackingTrack *track = tracksbase->first;
+
+		while (track) {
+			if (track->flag & TRACK_HAS_BUNDLE) {
+				if (cur == tracknr) {
+					*tracksbase_r = tracksbase;
+					return track;
+				}
+
+				cur++;
+			}
+
+			track = track->next;
+		}
+
+		object = object->next;
+	}
+
+	*tracksbase_r = NULL;
+
+	return NULL;
+}
+
+MovieTrackingTrack *BKE_tracking_track_get_active(MovieTracking *tracking)
+{
+	ListBase *tracksbase;
+
+	if (!tracking->act_track)
+		return NULL;
+
+	tracksbase = BKE_tracking_get_active_tracks(tracking);
+
+	/* check that active track is in current tracks list */
+	if (BLI_findindex(tracksbase, tracking->act_track) >= 0)
+		return tracking->act_track;
+
+	return NULL;
+}
+
+static bGPDlayer *track_mask_gpencil_layer_get(MovieTrackingTrack *track)
+{
+	bGPDlayer *layer;
+
+	if (!track->gpd)
+		return NULL;
+
+	layer = track->gpd->layers.first;
+
+	while (layer) {
+		if (layer->flag & GP_LAYER_ACTIVE) {
+			bGPDframe *frame = layer->frames.first;
+			int ok = FALSE;
+
+			while (frame) {
+				if (frame->strokes.first) {
+					ok = TRUE;
+				}
+
+				frame = frame->next;
+			}
+
+			if (ok)
+				return layer;
+		}
+
+		layer = layer->next;
+	}
+
+	return NULL;
+}
+
+static void track_mask_gpencil_layer_rasterize(int frame_width, int frame_height,
+                                               MovieTrackingMarker *marker, bGPDlayer *layer,
+                                               float *mask, int mask_width, int mask_height)
+{
+	bGPDframe *frame = layer->frames.first;
+
+	while (frame) {
+		bGPDstroke *stroke = frame->strokes.first;
+
+		while (stroke) {
+			bGPDspoint *stroke_points = stroke->points;
+			float *mask_points, *fp;
+			int i;
+
+			if (stroke->flag & GP_STROKE_2DSPACE) {
+				fp = mask_points = MEM_callocN(2 * stroke->totpoints * sizeof(float),
+				                               "track mask rasterization points");
+
+				for (i = 0; i < stroke->totpoints; i++, fp += 2) {
+					fp[0] = (stroke_points[i].x - marker->search_min[0]) * frame_width / mask_width;
+					fp[1] = (stroke_points[i].y - marker->search_min[1]) * frame_height / mask_height;
+				}
+
+				/* TODO: add an option to control wether AA is enabled or not */
+				PLX_raskterize((float (*)[2])mask_points, stroke->totpoints, mask, mask_width, mask_height, FALSE);
+
+				MEM_freeN(mask_points);
+			}
+
+			stroke = stroke->next;
+		}
+
+		frame = frame->next;
+	}
+}
+
+float *BKE_tracking_track_get_mask(int frame_width, int frame_height,
+                                   MovieTrackingTrack *track, MovieTrackingMarker *marker)
+{
+	float *mask = NULL;
+	bGPDlayer *layer = track_mask_gpencil_layer_get(track);
+	int mask_width, mask_height;
+
+	mask_width = (marker->search_max[0] - marker->search_min[0]) * frame_width;
+	mask_height = (marker->search_max[1] - marker->search_min[1]) * frame_height;
+
+	if (layer) {
+		mask = MEM_callocN(mask_width * mask_height * sizeof(float), "track mask");
+
+		track_mask_gpencil_layer_rasterize(frame_width, frame_height, marker, layer,
+		                                   mask, mask_width, mask_height);
+	}
+
+	return mask;
+}
+
+/* area - which part of marker should be selected. see TRACK_AREA_* constants */
+void BKE_tracking_track_select(ListBase *tracksbase, MovieTrackingTrack *track, int area, int extend)
+{
+	if (extend) {
+		BKE_tracking_track_flag_set(track, area, SELECT);
+	}
+	else {
+		MovieTrackingTrack *cur = tracksbase->first;
+
+		while (cur) {
+			if ((cur->flag & TRACK_HIDDEN) == 0) {
+				if (cur == track) {
+					BKE_tracking_track_flag_clear(cur, TRACK_AREA_ALL, SELECT);
+					BKE_tracking_track_flag_set(cur, area, SELECT);
+				}
+				else {
+					BKE_tracking_track_flag_clear(cur, TRACK_AREA_ALL, SELECT);
+				}
+			}
+
+			cur = cur->next;
+		}
+	}
+}
+
+void BKE_tracking_track_deselect(MovieTrackingTrack *track, int area)
+{
+	BKE_tracking_track_flag_clear(track, area, SELECT);
+}
+
+/*********************** Marker  *************************/
+
+MovieTrackingMarker *BKE_tracking_marker_insert(MovieTrackingTrack *track, MovieTrackingMarker *marker)
 {
 	MovieTrackingMarker *old_marker = NULL;
 
 	if (track->markersnr)
-		old_marker = BKE_tracking_exact_marker(track, marker->framenr);
+		old_marker = BKE_tracking_marker_get_exact(track, marker->framenr);
 
 	if (old_marker) {
+		/* simply replace settings for already allocated marker */
 		*old_marker = *marker;
 
 		return old_marker;
@@ -290,6 +934,7 @@ MovieTrackingMarker *BKE_tracking_insert_marker(MovieTrackingTrack *track, Movie
 	else {
 		int a = track->markersnr;
 
+		/* find position in array where to add new marker */
 		while (a--) {
 			if (track->markers[a].framenr < marker->framenr)
 				break;
@@ -298,12 +943,15 @@ MovieTrackingMarker *BKE_tracking_insert_marker(MovieTrackingTrack *track, Movie
 		track->markersnr++;
 
 		if (track->markers)
-			track->markers = MEM_reallocN(track->markers, sizeof(MovieTrackingMarker)*track->markersnr);
+			track->markers = MEM_reallocN(track->markers, sizeof(MovieTrackingMarker) * track->markersnr);
 		else
 			track->markers = MEM_callocN(sizeof(MovieTrackingMarker), "MovieTracking markers");
 
+		/* shift array to "free" space for new marker */
 		memmove(track->markers + a + 2, track->markers + a + 1,
 		        (track->markersnr - a - 2) * sizeof(MovieTrackingMarker));
+
+		/* put new marker */
 		track->markers[a + 1] = *marker;
 
 		track->last_marker = a + 1;
@@ -312,7 +960,7 @@ MovieTrackingMarker *BKE_tracking_insert_marker(MovieTrackingTrack *track, Movie
 	}
 }
 
-void BKE_tracking_delete_marker(MovieTrackingTrack *track, int framenr)
+void BKE_tracking_marker_delete(MovieTrackingTrack *track, int framenr)
 {
 	int a = 0;
 
@@ -337,7 +985,73 @@ void BKE_tracking_delete_marker(MovieTrackingTrack *track, int framenr)
 	}
 }
 
-MovieTrackingMarker *BKE_tracking_get_marker(MovieTrackingTrack *track, int framenr)
+void BKE_tracking_marker_clamp(MovieTrackingMarker *marker, int event)
+{
+	int a;
+	float pat_min[2], pat_max[2];
+
+	BKE_tracking_marker_pattern_minmax(marker, pat_min, pat_max);
+
+	if (event == CLAMP_PAT_DIM) {
+		for (a = 0; a < 2; a++) {
+			/* search shouldn't be resized smaller than pattern */
+			marker->search_min[a] = MIN2(pat_min[a], marker->search_min[a]);
+			marker->search_max[a] = MAX2(pat_max[a], marker->search_max[a]);
+		}
+	}
+	else if (event == CLAMP_PAT_POS) {
+		float dim[2];
+
+		sub_v2_v2v2(dim, pat_max, pat_min);
+
+		for (a = 0; a < 2; a++) {
+			int b;
+			/* pattern shouldn't be moved outside of search */
+			if (pat_min[a] < marker->search_min[a]) {
+				for (b = 0; b < 4; b++)
+					marker->pattern_corners[b][a] += marker->search_min[a] - pat_min[a];
+			}
+			if (pat_max[a] > marker->search_max[a]) {
+				for (b = 0; b < 4; b++)
+					marker->pattern_corners[b][a] -= pat_max[a] - marker->search_max[a];
+			}
+		}
+	}
+	else if (event == CLAMP_SEARCH_DIM) {
+		for (a = 0; a < 2; a++) {
+			/* search shouldn't be resized smaller than pattern */
+			marker->search_min[a] = MIN2(pat_min[a], marker->search_min[a]);
+			marker->search_max[a] = MAX2(pat_max[a], marker->search_max[a]);
+		}
+	}
+	else if (event == CLAMP_SEARCH_POS) {
+		float dim[2];
+
+		sub_v2_v2v2(dim, marker->search_max, marker->search_min);
+
+		for (a = 0; a < 2; a++) {
+			/* search shouldn't be moved inside pattern */
+			if (marker->search_min[a] > pat_min[a]) {
+				marker->search_min[a] = pat_min[a];
+				marker->search_max[a] = marker->search_min[a] + dim[a];
+			}
+			if (marker->search_max[a] < pat_max[a]) {
+				marker->search_max[a] = pat_max[a];
+				marker->search_min[a] = marker->search_max[a] - dim[a];
+			}
+		}
+	}
+	else if (event == CLAMP_SEARCH_DIM) {
+		float dim[2];
+		sub_v2_v2v2(dim, pat_max, pat_min);
+		for (a = 0; a < 2; a++) {
+			marker->search_min[a] = pat_min[a];
+			marker->search_max[a] = pat_max[a];
+		}
+	}
+}
+
+MovieTrackingMarker *BKE_tracking_marker_get(MovieTrackingTrack *track, int framenr)
 {
 	int a = track->markersnr - 1;
 
@@ -382,9 +1096,19 @@ MovieTrackingMarker *BKE_tracking_get_marker(MovieTrackingTrack *track, int fram
 	return NULL;
 }
 
-MovieTrackingMarker *BKE_tracking_ensure_marker(MovieTrackingTrack *track, int framenr)
+MovieTrackingMarker *BKE_tracking_marker_get_exact(MovieTrackingTrack *track, int framenr)
 {
-	MovieTrackingMarker *marker = BKE_tracking_get_marker(track, framenr);
+	MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
+
+	if (marker->framenr != framenr)
+		return NULL;
+
+	return marker;
+}
+
+MovieTrackingMarker *BKE_tracking_marker_ensure(MovieTrackingTrack *track, int framenr)
+{
+	MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
 
 	if (marker->framenr != framenr) {
 		MovieTrackingMarker marker_new;
@@ -392,351 +1116,663 @@ MovieTrackingMarker *BKE_tracking_ensure_marker(MovieTrackingTrack *track, int f
 		marker_new = *marker;
 		marker_new.framenr = framenr;
 
-		BKE_tracking_insert_marker(track, &marker_new);
-		marker = BKE_tracking_get_marker(track, framenr);
+		BKE_tracking_marker_insert(track, &marker_new);
+		marker = BKE_tracking_marker_get(track, framenr);
 	}
 
 	return marker;
 }
 
-MovieTrackingMarker *BKE_tracking_exact_marker(MovieTrackingTrack *track, int framenr)
+void BKE_tracking_marker_pattern_minmax(const MovieTrackingMarker *marker, float min[2], float max[2])
 {
-	MovieTrackingMarker *marker = BKE_tracking_get_marker(track, framenr);
-
-	if (marker->framenr != framenr)
-		return NULL;
+	INIT_MINMAX2(min, max);
 
-	return marker;
+	DO_MINMAX2(marker->pattern_corners[0], min, max);
+	DO_MINMAX2(marker->pattern_corners[1], min, max);
+	DO_MINMAX2(marker->pattern_corners[2], min, max);
+	DO_MINMAX2(marker->pattern_corners[3], min, max);
 }
 
-int BKE_tracking_has_marker(MovieTrackingTrack *track, int framenr)
+/*********************** Object *************************/
+
+MovieTrackingObject *BKE_tracking_object_add(MovieTracking *tracking, const char *name)
 {
-	return BKE_tracking_exact_marker(track, framenr) != 0;
+	MovieTrackingObject *object = MEM_callocN(sizeof(MovieTrackingObject), "tracking object");
+
+	if (tracking->tot_object == 0) {
+		/* first object is always camera */
+		BLI_strncpy(object->name, "Camera", sizeof(object->name));
+
+		object->flag |= TRACKING_OBJECT_CAMERA;
+	}
+	else {
+		BLI_strncpy(object->name, name, sizeof(object->name));
+	}
+
+	BLI_addtail(&tracking->objects, object);
+
+	tracking->tot_object++;
+	tracking->objectnr = BLI_countlist(&tracking->objects) - 1;
+
+	object->scale = 1.0f;
+
+	BKE_tracking_object_unique_name(tracking, object);
+
+	return object;
 }
 
-int BKE_tracking_has_enabled_marker(MovieTrackingTrack *track, int framenr)
+void BKE_tracking_object_delete(MovieTracking *tracking, MovieTrackingObject *object)
 {
-	MovieTrackingMarker *marker = BKE_tracking_exact_marker(track, framenr);
+	MovieTrackingTrack *track;
+	int index = BLI_findindex(&tracking->objects, object);
 
-	return marker && (marker->flag & MARKER_DISABLED) == 0;
+	if (index < 0)
+		return;
+
+	if (object->flag & TRACKING_OBJECT_CAMERA) {
+		/* object used for camera solving can't be deleted */
+		return;
+	}
+
+	track = object->tracks.first;
+	while (track) {
+		if (track == tracking->act_track)
+			tracking->act_track = NULL;
+
+		track = track->next;
+	}
+
+	tracking_object_free(object);
+	BLI_freelinkN(&tracking->objects, object);
+
+	tracking->tot_object--;
+
+	if (index > 0)
+		tracking->objectnr = index - 1;
+	else
+		tracking->objectnr = 0;
 }
 
-void BKE_tracking_free_track(MovieTrackingTrack *track)
+void BKE_tracking_object_unique_name(MovieTracking *tracking, MovieTrackingObject *object)
 {
-	if (track->markers)
-		MEM_freeN(track->markers);
+	BLI_uniquename(&tracking->objects, object, "Object", '.',
+	               offsetof(MovieTrackingObject, name), sizeof(object->name));
 }
 
-static void put_disabled_marker(MovieTrackingTrack *track, MovieTrackingMarker *ref_marker, int before, int overwrite)
+MovieTrackingObject *BKE_tracking_object_get_named(MovieTracking *tracking, const char *name)
 {
-	MovieTrackingMarker marker_new;
+	MovieTrackingObject *object = tracking->objects.first;
 
-	marker_new = *ref_marker;
-	marker_new.flag &= ~MARKER_TRACKED;
-	marker_new.flag |= MARKER_DISABLED;
+	while (object) {
+		if (!strcmp(object->name, name))
+			return object;
 
-	if (before)
-		marker_new.framenr--;
-	else
-		marker_new.framenr++;
+		object = object->next;
+	}
 
-	if (!BKE_tracking_has_marker(track, marker_new.framenr) || overwrite)
-		BKE_tracking_insert_marker(track, &marker_new);
+	return NULL;
 }
 
-void BKE_tracking_clear_path(MovieTrackingTrack *track, int ref_frame, int action)
+MovieTrackingObject *BKE_tracking_object_get_active(MovieTracking *tracking)
 {
-	int a;
+	return BLI_findlink(&tracking->objects, tracking->objectnr);
+}
 
-	if (action == TRACK_CLEAR_REMAINED) {
-		a = 1;
+MovieTrackingObject *BKE_tracking_object_get_camera(MovieTracking *tracking)
+{
+	MovieTrackingObject *object = tracking->objects.first;
 
-		while (a < track->markersnr) {
-			if (track->markers[a].framenr > ref_frame) {
-				track->markersnr = a;
-				track->markers = MEM_reallocN(track->markers, sizeof(MovieTrackingMarker)*track->markersnr);
+	while (object) {
+		if (object->flag & TRACKING_OBJECT_CAMERA)
+			return object;
 
-				break;
-			}
+		object = object->next;
+	}
 
-			a++;
-		}
+	return NULL;
+}
 
-		if (track->markersnr)
-			put_disabled_marker(track, &track->markers[track->markersnr - 1], 0, 1);
+ListBase *BKE_tracking_object_get_tracks(MovieTracking *tracking, MovieTrackingObject *object)
+{
+	if (object->flag & TRACKING_OBJECT_CAMERA) {
+		return &tracking->tracks;
 	}
-	else if (action == TRACK_CLEAR_UPTO) {
-		a = track->markersnr - 1;
 
-		while (a >= 0) {
-			if (track->markers[a].framenr <= ref_frame) {
-				memmove(track->markers, track->markers + a, (track->markersnr - a) * sizeof(MovieTrackingMarker));
+	return &object->tracks;
+}
 
-				track->markersnr = track->markersnr - a;
-				track->markers = MEM_reallocN(track->markers, sizeof(MovieTrackingMarker)*track->markersnr);
+MovieTrackingReconstruction *BKE_tracking_object_get_reconstruction(MovieTracking *tracking,
+                                                                    MovieTrackingObject *object)
+{
+	if (object->flag & TRACKING_OBJECT_CAMERA) {
+		return &tracking->reconstruction;
+	}
 
-				break;
-			}
+	return &object->reconstruction;
+}
 
-			a--;
-		}
+/*********************** Camera *************************/
 
-		if (track->markersnr)
-			put_disabled_marker(track, &track->markers[0], 1, 1);
-	}
-	else if (action == TRACK_CLEAR_ALL) {
-		MovieTrackingMarker *marker, marker_new;
-
-		marker = BKE_tracking_get_marker(track, ref_frame);
-		marker_new = *marker;
+static int reconstructed_camera_index_get(MovieTrackingReconstruction *reconstruction, int framenr, int nearest)
+{
+	MovieReconstructedCamera *cameras = reconstruction->cameras;
+	int a = 0, d = 1;
 
-		MEM_freeN(track->markers);
-		track->markers = NULL;
-		track->markersnr = 0;
+	if (!reconstruction->camnr)
+		return -1;
 
-		BKE_tracking_insert_marker(track, &marker_new);
+	if (framenr < cameras[0].framenr) {
+		if (nearest)
+			return 0;
+		else
+			return -1;
+	}
 
-		put_disabled_marker(track, &marker_new, 1, 1);
-		put_disabled_marker(track, &marker_new, 0, 1);
+	if (framenr > cameras[reconstruction->camnr - 1].framenr) {
+		if (nearest)
+			return reconstruction->camnr - 1;
+		else
+			return -1;
 	}
-}
 
-void BKE_tracking_join_tracks(MovieTrackingTrack *dst_track, MovieTrackingTrack *src_track)
-{
-	int i = 0, a = 0, b = 0, tot;
-	MovieTrackingMarker *markers;
+	if (reconstruction->last_camera < reconstruction->camnr)
+		a = reconstruction->last_camera;
 
-	tot = dst_track->markersnr + src_track->markersnr;
-	markers = MEM_callocN(tot * sizeof(MovieTrackingMarker), "tmp tracking joined tracks");
+	if (cameras[a].framenr >= framenr)
+		d = -1;
 
-	while (a < src_track->markersnr || b < dst_track->markersnr) {
-		if (b >= dst_track->markersnr) {
-			markers[i] = src_track->markers[a++];
-		}
-		else if (a >= src_track->markersnr) {
-			markers[i] = dst_track->markers[b++];
+	while (a >= 0 && a < reconstruction->camnr) {
+		int cfra = cameras[a].framenr;
+
+		/* check if needed framenr was "skipped" -- no data for requested frame */
+
+		if (d > 0 && cfra > framenr) {
+			/* interpolate with previous position */
+			if (nearest)
+				return a - 1;
+			else
+				break;
 		}
-		else if (src_track->markers[a].framenr < dst_track->markers[b].framenr) {
-			markers[i] = src_track->markers[a++];
+
+		if (d < 0 && cfra < framenr) {
+			/* interpolate with next position */
+			if (nearest)
+				return a;
+			else
+				break;
 		}
-		else if (src_track->markers[a].framenr > dst_track->markers[b].framenr) {
-			markers[i] = dst_track->markers[b++];
+
+		if (cfra == framenr) {
+			reconstruction->last_camera = a;
+
+			return a;
 		}
-		else {
-			if ((src_track->markers[a].flag & MARKER_DISABLED) == 0) {
-				if ((dst_track->markers[b].flag & MARKER_DISABLED) == 0) {
-					/* both tracks are enabled on this frame, so find the whole segment
-					 * on which tracks are intersecting and blend tracks using linear
-					 * interpolation to prevent jumps */
 
-					MovieTrackingMarker *marker_a, *marker_b;
-					int start_a = a, start_b = b, len = 0, frame = src_track->markers[a].framenr;
-					int j, inverse = 0;
+		a += d;
+	}
 
-					inverse = (b == 0) ||
-					          (dst_track->markers[b - 1].flag & MARKER_DISABLED) ||
-					          (dst_track->markers[b - 1].framenr != frame - 1);
+	return -1;
+}
 
-					/* find length of intersection */
-					while (a < src_track->markersnr && b < dst_track->markersnr) {
-						marker_a = &src_track->markers[a];
-						marker_b = &dst_track->markers[b];
+static void reconstructed_camera_scale_set(MovieTrackingObject *object, float mat[4][4])
+{
+	if ((object->flag & TRACKING_OBJECT_CAMERA) == 0) {
+		float smat[4][4];
 
-						if (marker_a->flag & MARKER_DISABLED || marker_b->flag & MARKER_DISABLED)
-							break;
+		scale_m4_fl(smat, 1.0f / object->scale);
+		mult_m4_m4m4(mat, mat, smat);
+	}
+}
 
-						if (marker_a->framenr != frame || marker_b->framenr != frame)
-							break;
 
-						frame++;
-						len++;
-						a++;
-						b++;
-					}
+/* converts principal offset from center to offset of blender's camera */
+void BKE_tracking_camera_shift_get(MovieTracking *tracking, int winx, int winy, float *shiftx, float *shifty)
+{
+	/* indeed in both of cases it should be winx -- it's just how camera shift works for blender's camera */
+	*shiftx = (0.5f * winx - tracking->camera.principal[0]) / winx;
+	*shifty = (0.5f * winy - tracking->camera.principal[1]) / winx;
+}
 
-					a = start_a;
-					b = start_b;
+void BKE_tracking_camera_to_blender(MovieTracking *tracking, Scene *scene, Camera *camera, int width, int height)
+{
+	float focal = tracking->camera.focal;
 
-					/* linear interpolation for intersecting frames */
-					for (j = 0; j < len; j++) {
-						float fac = 0.5f;
+	camera->sensor_x = tracking->camera.sensor_width;
+	camera->sensor_fit = CAMERA_SENSOR_FIT_AUTO;
+	camera->lens = focal * camera->sensor_x / width;
 
-						if (len > 1)
-							fac = 1.0f / (len - 1) * j;
+	scene->r.xsch = width * tracking->camera.pixel_aspect;
+	scene->r.ysch = height;
 
-						if (inverse)
-							fac = 1.0f - fac;
+	scene->r.xasp = 1.0f;
+	scene->r.yasp = 1.0f;
 
-						marker_a = &src_track->markers[a];
-						marker_b = &dst_track->markers[b];
+	BKE_tracking_camera_shift_get(tracking, width, height, &camera->shiftx, &camera->shifty);
+}
 
-						markers[i] = dst_track->markers[b];
-						interp_v2_v2v2(markers[i].pos, marker_b->pos, marker_a->pos, fac);
-						a++;
-						b++;
-						i++;
-					}
+MovieReconstructedCamera *BKE_tracking_camera_get_reconstructed(MovieTracking *tracking,
+                                                                MovieTrackingObject *object, int framenr)
+{
+	MovieTrackingReconstruction *reconstruction;
+	int a;
 
-					/* this values will be incremented at the end of the loop cycle */
-					a--; b--; i--;
-				}
-				else markers[i] = src_track->markers[a];
-			}
-			else markers[i] = dst_track->markers[b];
+	reconstruction = BKE_tracking_object_get_reconstruction(tracking, object);
+	a = reconstructed_camera_index_get(reconstruction, framenr, FALSE);
 
-			a++;
-			b++;
-		}
+	if (a == -1)
+		return NULL;
 
-		i++;
-	}
+	return &reconstruction->cameras[a];
+}
 
-	MEM_freeN(dst_track->markers);
+void BKE_tracking_camera_get_reconstructed_interpolate(MovieTracking *tracking, MovieTrackingObject *object,
+                                                       int framenr, float mat[4][4])
+{
+	MovieTrackingReconstruction *reconstruction;
+	MovieReconstructedCamera *cameras;
+	int a;
 
-	dst_track->markers = MEM_callocN(i*sizeof(MovieTrackingMarker), "tracking joined tracks");
-	memcpy(dst_track->markers, markers, i*sizeof(MovieTrackingMarker));
+	reconstruction = BKE_tracking_object_get_reconstruction(tracking, object);
+	cameras = reconstruction->cameras;
+	a = reconstructed_camera_index_get(reconstruction, framenr, 1);
 
-	dst_track->markersnr = i;
+	if (a == -1) {
+		unit_m4(mat);
 
-	MEM_freeN(markers);
-}
+		return;
+	}
 
-static void tracking_tracks_free(ListBase *tracks)
-{
-	MovieTrackingTrack *track;
+	if (cameras[a].framenr != framenr && a > 0 && a < reconstruction->camnr - 1) {
+		float t = ((float)framenr - cameras[a].framenr) / (cameras[a + 1].framenr - cameras[a].framenr);
 
-	for (track = tracks->first; track; track = track->next) {
-		BKE_tracking_free_track(track);
+		blend_m4_m4m4(mat, cameras[a].mat, cameras[a + 1].mat, t);
+	}
+	else {
+		copy_m4_m4(mat, cameras[a].mat);
 	}
 
-	BLI_freelistN(tracks);
+	reconstructed_camera_scale_set(object, mat);
 }
 
-static void tracking_reconstruction_free(MovieTrackingReconstruction *reconstruction)
+/*********************** Distortion/Undistortion *************************/
+
+MovieDistortion *BKE_tracking_distortion_new(void)
 {
-	if (reconstruction->cameras)
-		MEM_freeN(reconstruction->cameras);
+	MovieDistortion *distortion;
+
+	distortion = MEM_callocN(sizeof(MovieDistortion), "BKE_tracking_distortion_create");
+
+	return distortion;
 }
 
-static void tracking_object_free(MovieTrackingObject *object)
+void BKE_tracking_distortion_update(MovieDistortion *distortion, MovieTracking *tracking,
+                                    int calibration_width, int calibration_height)
 {
-	tracking_tracks_free(&object->tracks);
-	tracking_reconstruction_free(&object->reconstruction);
+	MovieTrackingCamera *camera = &tracking->camera;
+	float aspy = 1.0f / tracking->camera.pixel_aspect;
+
+#ifdef WITH_LIBMV
+	if (!distortion->intrinsics) {
+		distortion->intrinsics = libmv_CameraIntrinsicsNew(camera->focal,
+		                                                   camera->principal[0], camera->principal[1] * aspy,
+		                                                   camera->k1, camera->k2, camera->k3,
+		                                                   calibration_width, calibration_height * aspy);
+	}
+	else {
+		libmv_CameraIntrinsicsUpdate(distortion->intrinsics, camera->focal,
+		                             camera->principal[0], camera->principal[1] * aspy,
+		                             camera->k1, camera->k2, camera->k3,
+		                             calibration_width, calibration_height * aspy);
+	}
+#else
+	(void) distortion;
+	(void) calibration_width;
+	(void) calibration_height;
+	(void) camera;
+	(void) aspy;
+#endif
 }
 
-static void tracking_objects_free(ListBase *objects)
+MovieDistortion *BKE_tracking_distortion_copy(MovieDistortion *distortion)
 {
-	MovieTrackingObject *object;
+	MovieDistortion *new_distortion;
 
-	for (object = objects->first; object; object = object->next)
-		tracking_object_free(object);
+	new_distortion = MEM_callocN(sizeof(MovieDistortion), "BKE_tracking_distortion_create");
 
-	BLI_freelistN(objects);
+#ifdef WITH_LIBMV
+	new_distortion->intrinsics = libmv_CameraIntrinsicsCopy(distortion->intrinsics);
+#else
+	(void) distortion;
+#endif
+
+	return new_distortion;
 }
 
-static void tracking_dopesheet_free(MovieTrackingDopesheet *dopesheet)
+ImBuf *BKE_tracking_distortion_exec(MovieDistortion *distortion, MovieTracking *tracking, ImBuf *ibuf,
+                                    int calibration_width, int calibration_height, float overscan, int undistort)
 {
-	MovieTrackingDopesheetChannel *channel;
+	ImBuf *resibuf;
 
-	channel = dopesheet->channels.first;
-	while (channel) {
-		if (channel->segments) {
-			MEM_freeN(channel->segments);
+	BKE_tracking_distortion_update(distortion, tracking, calibration_width, calibration_height);
+
+	resibuf = IMB_dupImBuf(ibuf);
+
+#ifdef WITH_LIBMV
+	if (ibuf->rect_float) {
+		if (undistort) {
+			libmv_CameraIntrinsicsUndistortFloat(distortion->intrinsics,
+			                                     ibuf->rect_float, resibuf->rect_float,
+			                                     ibuf->x, ibuf->y, overscan, ibuf->channels);
+		}
+		else {
+			libmv_CameraIntrinsicsDistortFloat(distortion->intrinsics,
+			                                   ibuf->rect_float, resibuf->rect_float,
+			                                   ibuf->x, ibuf->y, overscan, ibuf->channels);
 		}
 
-		channel = channel->next;
+		resibuf->userflags |= IB_RECT_INVALID;
+	}
+	else {
+		if (undistort) {
+			libmv_CameraIntrinsicsUndistortByte(distortion->intrinsics,
+			                                    (unsigned char *)ibuf->rect, (unsigned char *)resibuf->rect,
+			                                    ibuf->x, ibuf->y, overscan, ibuf->channels);
+		}
+		else {
+			libmv_CameraIntrinsicsDistortByte(distortion->intrinsics,
+			                                  (unsigned char *)ibuf->rect, (unsigned char *)resibuf->rect,
+			                                  ibuf->x, ibuf->y, overscan, ibuf->channels);
+		}
 	}
+#else
+	(void) overscan;
+	(void) undistort;
 
-	BLI_freelistN(&dopesheet->channels);
+	if (ibuf->rect_float) {
+		resibuf->userflags |= IB_RECT_INVALID;
+	}
+#endif
 
-	dopesheet->channels.first = dopesheet->channels.last = NULL;
-	dopesheet->tot_channel = 0;
+	return resibuf;
 }
 
-void BKE_tracking_free(MovieTracking *tracking)
+void BKE_tracking_distortion_free(MovieDistortion *distortion)
 {
-	tracking_tracks_free(&tracking->tracks);
-	tracking_reconstruction_free(&tracking->reconstruction);
-	tracking_objects_free(&tracking->objects);
+#ifdef WITH_LIBMV
+	libmv_CameraIntrinsicsDestroy(distortion->intrinsics);
+#endif
 
-	if (tracking->stabilization.scaleibuf)
-		IMB_freeImBuf(tracking->stabilization.scaleibuf);
+	MEM_freeN(distortion);
+}
 
-	if (tracking->camera.intrinsics)
-		BKE_tracking_distortion_destroy(tracking->camera.intrinsics);
+void BKE_tracking_distort_v2(MovieTracking *tracking, float co[2], float nco[2])
+{
+	MovieTrackingCamera *camera = &tracking->camera;
 
-	tracking_dopesheet_free(&tracking->dopesheet);
+#ifdef WITH_LIBMV
+	double x, y;
+	float aspy = 1.0f / tracking->camera.pixel_aspect;
+
+	/* normalize coords */
+	x = (co[0] - camera->principal[0]) / camera->focal;
+	y = (co[1] - camera->principal[1] * aspy) / camera->focal;
+
+	libmv_applyCameraIntrinsics(camera->focal, camera->principal[0], camera->principal[1] * aspy,
+	                            camera->k1, camera->k2, camera->k3, x, y, &x, &y);
+
+	/* result is in image coords already */
+	nco[0] = x;
+	nco[1] = y;
+#else
+	(void) camera;
+	(void) co;
+	(void) nco;
+#endif
 }
 
-static MovieTrackingTrack *duplicate_track(MovieTrackingTrack *track)
+void BKE_tracking_undistort_v2(MovieTracking *tracking, float co[2], float nco[2])
 {
-	MovieTrackingTrack *new_track;
+	MovieTrackingCamera *camera = &tracking->camera;
 
-	new_track = MEM_callocN(sizeof(MovieTrackingTrack), "tracksMapMerge new_track");
+#ifdef WITH_LIBMV
+	double x = co[0], y = co[1];
+	float aspy = 1.0f / tracking->camera.pixel_aspect;
 
-	*new_track = *track;
-	new_track->next = new_track->prev = NULL;
+	libmv_InvertIntrinsics(camera->focal, camera->principal[0], camera->principal[1] * aspy,
+	                       camera->k1, camera->k2, camera->k3, x, y, &x, &y);
 
-	new_track->markers = MEM_dupallocN(new_track->markers);
+	nco[0] = x * camera->focal + camera->principal[0];
+	nco[1] = y * camera->focal + camera->principal[1] * aspy;
+#else
+	(void) camera;
+	(void) co;
+	(void) nco;
+#endif
+}
 
-	return new_track;
+ImBuf *BKE_tracking_undistort_frame(MovieTracking *tracking, ImBuf *ibuf, int calibration_width,
+                                    int calibration_height, float overscan)
+{
+	MovieTrackingCamera *camera = &tracking->camera;
+
+	if (camera->intrinsics == NULL)
+		camera->intrinsics = BKE_tracking_distortion_new();
+
+	return BKE_tracking_distortion_exec(camera->intrinsics, tracking, ibuf, calibration_width,
+	                                    calibration_height, overscan, TRUE);
 }
 
-/*********************** clipboard *************************/
+ImBuf *BKE_tracking_distort_frame(MovieTracking *tracking, ImBuf *ibuf, int calibration_width,
+                                  int calibration_height, float overscan)
+{
+	MovieTrackingCamera *camera = &tracking->camera;
+
+	if (camera->intrinsics == NULL)
+		camera->intrinsics = BKE_tracking_distortion_new();
+
+	return BKE_tracking_distortion_exec(camera->intrinsics, tracking, ibuf, calibration_width,
+	                                    calibration_height, overscan, FALSE);
+}
+
+/*********************** Image sampling *************************/
 
-void BKE_tracking_free_clipboard(void)
+static void disable_imbuf_channels(ImBuf *ibuf, MovieTrackingTrack *track, int grayscale)
 {
-	MovieTrackingTrack *track = tracking_clipboard.tracks.first, *next_track;
+	BKE_tracking_disable_channels(ibuf, track->flag & TRACK_DISABLE_RED,
+	                              track->flag & TRACK_DISABLE_GREEN,
+	                              track->flag & TRACK_DISABLE_BLUE, grayscale);
+}
 
-	while (track) {
-		next_track = track->next;
+ImBuf *BKE_tracking_sample_pattern(int frame_width, int frame_height, ImBuf *search_ibuf,
+                                   MovieTrackingTrack *track, MovieTrackingMarker *marker,
+                                   int use_mask, int num_samples_x, int num_samples_y,
+                                   float pos[2])
+{
+#ifdef WITH_LIBMV
+	ImBuf *pattern_ibuf;
+	double src_pixel_x[5], src_pixel_y[5];
+	double warped_position_x, warped_position_y;
+	float *mask = NULL;
 
-		BKE_tracking_free_track(track);
-		MEM_freeN(track);
+	pattern_ibuf = IMB_allocImBuf(num_samples_x, num_samples_y, 32, IB_rectfloat);
+	pattern_ibuf->profile = IB_PROFILE_LINEAR_RGB;
 
-		track = next_track;
+	if (!search_ibuf->rect_float) {
+		IMB_float_from_rect(search_ibuf);
+	}
+
+	get_marker_coords_for_tracking(frame_width, frame_height, marker, src_pixel_x, src_pixel_y);
+
+	if (use_mask) {
+		mask = BKE_tracking_track_get_mask(frame_width, frame_height, track, marker);
 	}
+
+	libmv_samplePlanarPatch(search_ibuf->rect_float, search_ibuf->x, search_ibuf->y, 4,
+	                        src_pixel_x, src_pixel_y, num_samples_x,
+	                        num_samples_y, mask, pattern_ibuf->rect_float,
+	                        &warped_position_x, &warped_position_y);
+
+	if (pos) {
+		pos[0] = warped_position_x;
+		pos[1] = warped_position_y;
+	}
+
+	if (mask) {
+		MEM_freeN(mask);
+	}
+
+	return pattern_ibuf;
+#else
+	ImBuf *pattern_ibuf;
+
+	/* real sampling requires libmv, but areas are supposing pattern would be
+	 * sampled if search area does exists, so we'll need to create empty
+	 * pattern area here to prevent adding NULL-checks all over just to deal
+	 * with situation when lubmv is disabled
+	 */
+
+	(void) frame_width;
+	(void) frame_height;
+	(void) search_ibuf;
+	(void) marker;
+	(void) track;
+	(void) use_mask;
+
+	pattern_ibuf = IMB_allocImBuf(num_samples_x, num_samples_y, 32, IB_rectfloat);
+
+	pos[0] = num_samples_x / 2.0f;
+	pos[1] = num_samples_y / 2.0f;
+
+	return pattern_ibuf;
+#endif
 }
 
-void BKE_tracking_clipboard_copy_tracks(MovieTracking *tracking, MovieTrackingObject *object)
+ImBuf *BKE_tracking_get_pattern_imbuf(ImBuf *ibuf, MovieTrackingTrack *track, MovieTrackingMarker *marker,
+                                      int anchored, int disable_channels)
 {
-	ListBase *tracksbase = BKE_tracking_object_tracks(tracking, object);
-	MovieTrackingTrack *track = tracksbase->first;
+	ImBuf *pattern_ibuf, *search_ibuf;
+	float pat_min[2], pat_max[2];
+	int num_samples_x, num_samples_y;
 
-	BKE_tracking_free_clipboard();
+	BKE_tracking_marker_pattern_minmax(marker, pat_min, pat_max);
 
-	while (track) {
-		if (TRACK_SELECTED(track) && (track->flag & TRACK_HIDDEN) == 0) {
-			MovieTrackingTrack *new_track = duplicate_track(track);
+	num_samples_x = (pat_max[0] - pat_min[0]) * ibuf->x;
+	num_samples_y = (pat_max[1] - pat_min[1]) * ibuf->y;
 
-			BLI_addtail(&tracking_clipboard.tracks, new_track);
-		}
+	search_ibuf = BKE_tracking_get_search_imbuf(ibuf, track, marker, anchored, disable_channels);
 
-		track = track->next;
-	}
+	pattern_ibuf = BKE_tracking_sample_pattern(ibuf->x, ibuf->y, search_ibuf, track, marker,
+	                                           FALSE, num_samples_x, num_samples_y, NULL);
+
+	IMB_freeImBuf(search_ibuf);
+
+	return pattern_ibuf;
 }
 
-int BKE_tracking_clipboard_has_tracks(void)
+ImBuf *BKE_tracking_get_search_imbuf(ImBuf *ibuf, MovieTrackingTrack *track, MovieTrackingMarker *marker,
+                                     int anchored, int disable_channels)
 {
-	return tracking_clipboard.tracks.first != NULL;
+	ImBuf *searchibuf;
+	int x, y, w, h;
+	float search_origin[2];
+
+	get_search_origin_frame_pixel(ibuf->x, ibuf->y, marker, search_origin);
+
+	x = search_origin[0];
+	y = search_origin[1];
+
+	if (anchored) {
+		x += track->offset[0] * ibuf->x;
+		y += track->offset[1] * ibuf->y;
+	}
+
+	w = (marker->search_max[0] - marker->search_min[0]) * ibuf->x;
+	h = (marker->search_max[1] - marker->search_min[1]) * ibuf->y;
+
+	searchibuf = IMB_allocImBuf(w, h, 32, ibuf->rect_float ? IB_rectfloat : IB_rect);
+	searchibuf->profile = ibuf->profile;
+
+	IMB_rectcpy(searchibuf, ibuf, 0, 0, x, y, w, h);
+
+	if (disable_channels) {
+		if ((track->flag & TRACK_PREVIEW_GRAYSCALE) ||
+		    (track->flag & TRACK_DISABLE_RED)       ||
+		    (track->flag & TRACK_DISABLE_GREEN)     ||
+		    (track->flag & TRACK_DISABLE_BLUE))
+		{
+			disable_imbuf_channels(searchibuf, track, TRUE);
+		}
+	}
+
+	return searchibuf;
 }
 
-void BKE_tracking_clipboard_paste_tracks(MovieTracking *tracking, MovieTrackingObject *object)
+/* zap channels from the imbuf that are disabled by the user. this can lead to
+ * better tracks sometimes. however, instead of simply zeroing the channels
+ * out, do a partial grayscale conversion so the display is better.
+ */
+void BKE_tracking_disable_channels(ImBuf *ibuf, int disable_red, int disable_green, int disable_blue,
+                                   int grayscale)
 {
-	ListBase *tracksbase = BKE_tracking_object_tracks(tracking, object);
-	MovieTrackingTrack *track = tracking_clipboard.tracks.first;
+	int x, y;
+	float scale;
 
-	while (track) {
-		MovieTrackingTrack *new_track = duplicate_track(track);
+	if (!disable_red && !disable_green && !disable_blue && !grayscale)
+		return;
 
-		BLI_addtail(tracksbase, new_track);
-		BKE_track_unique_name(tracksbase, new_track);
+	/* if only some components are selected, it's important to rescale the result
+	 * appropriately so that e.g. if only blue is selected, it's not zeroed out.
+	 */
+	scale = (disable_red   ? 0.0f : 0.2126f) +
+	        (disable_green ? 0.0f : 0.7152f) +
+	        (disable_blue  ? 0.0f : 0.0722f);
 
-		track = track->next;
+	for (y = 0; y < ibuf->y; y++) {
+		for (x = 0; x < ibuf->x; x++) {
+			int pixel = ibuf->x * y + x;
+
+			if (ibuf->rect_float) {
+				float *rrgbf = ibuf->rect_float + pixel * 4;
+				float r = disable_red   ? 0.0f : rrgbf[0];
+				float g = disable_green ? 0.0f : rrgbf[1];
+				float b = disable_blue  ? 0.0f : rrgbf[2];
+
+				if (grayscale) {
+					float gray = (0.2126f * r + 0.7152f * g + 0.0722f * b) / scale;
+
+					rrgbf[0] = rrgbf[1] = rrgbf[2] = gray;
+				}
+				else {
+					rrgbf[0] = r;
+					rrgbf[1] = g;
+					rrgbf[2] = b;
+				}
+			}
+			else {
+				char *rrgb = (char *)ibuf->rect + pixel * 4;
+				char r = disable_red   ? 0 : rrgb[0];
+				char g = disable_green ? 0 : rrgb[1];
+				char b = disable_blue  ? 0 : rrgb[2];
+
+				if (grayscale) {
+					float gray = (0.2126f * r + 0.7152f * g + 0.0722f * b) / scale;
+
+					rrgb[0] = rrgb[1] = rrgb[2] = gray;
+				}
+				else {
+					rrgb[0] = r;
+					rrgb[1] = g;
+					rrgb[2] = b;
+				}
+			}
+		}
 	}
+
+	if (ibuf->rect_float)
+		ibuf->userflags |= IB_RECT_INVALID;
 }
 
-/*********************** tracks map *************************/
+/*********************** Tracks map *************************/
 
 typedef struct TracksMap {
 	char object_name[MAX_NAME];
@@ -763,27 +1799,27 @@ static TracksMap *tracks_map_new(const char *object_name, int is_camera, int num
 	map->num_tracks = num_tracks;
 	map->customdata_size = customdata_size;
 
-	map->tracks = MEM_callocN(sizeof(MovieTrackingTrack)*num_tracks, "TrackingsMap tracks");
+	map->tracks = MEM_callocN(sizeof(MovieTrackingTrack) * num_tracks, "TrackingsMap tracks");
 
 	if (customdata_size)
-		map->customdata = MEM_callocN(customdata_size*num_tracks, "TracksMap customdata");
+		map->customdata = MEM_callocN(customdata_size * num_tracks, "TracksMap customdata");
 
 	map->hash = BLI_ghash_ptr_new("TracksMap hash");
 
 	return map;
 }
 
-static int tracks_map_size(TracksMap *map)
+static int tracks_map_get_size(TracksMap *map)
 {
 	return map->num_tracks;
 }
 
-static void tracks_map_get(TracksMap *map, int index, MovieTrackingTrack **track, void **customdata)
+static void tracks_map_get_indexed_element(TracksMap *map, int index, MovieTrackingTrack **track, void **customdata)
 {
 	*track = &map->tracks[index];
 
 	if (map->customdata)
-		*customdata = &map->customdata[index*map->customdata_size];
+		*customdata = &map->customdata[index * map->customdata_size];
 }
 
 static void tracks_map_insert(TracksMap *map, MovieTrackingTrack *track, void *customdata)
@@ -795,7 +1831,7 @@ static void tracks_map_insert(TracksMap *map, MovieTrackingTrack *track, void *c
 	map->tracks[map->ptr] = new_track;
 
 	if (customdata)
-		memcpy(&map->customdata[map->ptr*map->customdata_size], customdata, map->customdata_size);
+		memcpy(&map->customdata[map->ptr * map->customdata_size], customdata, map->customdata_size);
 
 	BLI_ghash_insert(map->hash, &map->tracks[map->ptr], track);
 
@@ -805,7 +1841,7 @@ static void tracks_map_insert(TracksMap *map, MovieTrackingTrack *track, void *c
 static void tracks_map_merge(TracksMap *map, MovieTracking *tracking)
 {
 	MovieTrackingTrack *track;
-	MovieTrackingTrack *act_track = BKE_tracking_active_track(tracking);
+	MovieTrackingTrack *act_track = BKE_tracking_track_get_active(tracking);
 	MovieTrackingTrack *rot_track = tracking->stabilization.rot_track;
 	ListBase tracks = {NULL, NULL}, new_tracks = {NULL, NULL};
 	ListBase *old_tracks;
@@ -815,11 +1851,11 @@ static void tracks_map_merge(TracksMap *map, MovieTracking *tracking)
 		old_tracks = &tracking->tracks;
 	}
 	else {
-		MovieTrackingObject *object = BKE_tracking_named_object(tracking, map->object_name);
+		MovieTrackingObject *object = BKE_tracking_object_get_named(tracking, map->object_name);
 
 		if (!object) {
 			/* object was deleted by user, create new one */
-			object = BKE_tracking_new_object(tracking, map->object_name);
+			object = BKE_tracking_object_add(tracking, map->object_name);
 		}
 
 		old_tracks = &object->tracks;
@@ -827,7 +1863,8 @@ static void tracks_map_merge(TracksMap *map, MovieTracking *tracking)
 
 	/* duplicate currently operating tracks to temporary list.
 	 * this is needed to keep names in unique state and it's faster to change names
-	 * of currently operating tracks (if needed) */
+	 * of currently operating tracks (if needed)
+	 */
 	for (a = 0; a < map->num_tracks; a++) {
 		int replace_sel = 0, replace_rot = 0;
 		MovieTrackingTrack *new_track, *old;
@@ -857,20 +1894,20 @@ static void tracks_map_merge(TracksMap *map, MovieTracking *tracking)
 				track->pat_flag = cur->pat_flag;
 				track->search_flag = cur->search_flag;
 
-				BKE_tracking_free_track(cur);
+				BKE_tracking_track_free(cur);
 				BLI_freelinkN(old_tracks, cur);
 			}
 		}
 
-		new_track = duplicate_track(track);
+		new_track = tracking_track_duplicate(track);
 
 		BLI_ghash_remove(map->hash, track, NULL, NULL); /* XXX: are we actually need this */
 		BLI_ghash_insert(map->hash, track, new_track);
 
-		if (replace_sel)		/* update current selection in clip */
+		if (replace_sel)  /* update current selection in clip */
 			tracking->act_track = new_track;
 
-		if (replace_rot)		/* update track used for rotation stabilization */
+		if (replace_rot)  /* update track used for rotation stabilization */
 			tracking->stabilization.rot_track = new_track;
 
 		BLI_addtail(&tracks, new_track);
@@ -905,7 +1942,7 @@ static void tracks_map_merge(TracksMap *map, MovieTracking *tracking)
 	*old_tracks = new_tracks;
 }
 
-static void tracks_map_free(TracksMap *map, void (*customdata_free) (void *customdata))
+static void tracks_map_free(TracksMap *map, void (*customdata_free)(void *customdata))
 {
 	int i = 0;
 
@@ -913,9 +1950,9 @@ static void tracks_map_free(TracksMap *map, void (*customdata_free) (void *custo
 
 	for (i = 0; i < map->num_tracks; i++) {
 		if (map->customdata && customdata_free)
-			customdata_free(&map->customdata[i*map->customdata_size]);
+			customdata_free(&map->customdata[i * map->customdata_size]);
 
-		BKE_tracking_free_track(&map->tracks[i]);
+		BKE_tracking_track_free(&map->tracks[i]);
 	}
 
 	if (map->customdata)
@@ -925,14 +1962,20 @@ static void tracks_map_free(TracksMap *map, void (*customdata_free) (void *custo
 	MEM_freeN(map);
 }
 
-/*********************** tracking *************************/
+/*********************** 2D tracking *************************/
 
 typedef struct TrackContext {
 #ifdef WITH_LIBMV
-	float keyframed_pos[2];
+	/* the reference marker and cutout search area */
+	MovieTrackingMarker marker;
+
+	/* keyframed patch. This is the search area */
+	float *search_area;
+	int search_area_height;
+	int search_area_width;
+	int framenr;
 
-	struct libmv_RegionTracker *region_tracker;
-	float *patch;			/* keyframed patch */
+	float *mask;
 #else
 	int pad;
 #endif
@@ -952,16 +1995,33 @@ typedef struct MovieTrackingContext {
 	int sync_frame;
 } MovieTrackingContext;
 
+static void track_context_free(void *customdata)
+{
+	TrackContext *track_context = (TrackContext *)customdata;
+
+#if WITH_LIBMV
+	if (track_context->search_area)
+		MEM_freeN(track_context->search_area);
+
+	if (track_context->mask)
+		MEM_freeN(track_context->mask);
+
+#else
+	(void)track_context;
+#endif
+}
+
 MovieTrackingContext *BKE_tracking_context_new(MovieClip *clip, MovieClipUser *user, short backwards, short sequence)
 {
 	MovieTrackingContext *context = MEM_callocN(sizeof(MovieTrackingContext), "trackingContext");
 	MovieTracking *tracking = &clip->tracking;
 	MovieTrackingSettings *settings = &tracking->settings;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
 	MovieTrackingTrack *track;
-	MovieTrackingObject *object = BKE_tracking_active_object(tracking);
+	MovieTrackingObject *object = BKE_tracking_object_get_active(tracking);
 	int num_tracks = 0;
 
+	context->clip = clip;
 	context->settings = *settings;
 	context->backwards = backwards;
 	context->sync_frame = user->framenr;
@@ -972,7 +2032,8 @@ MovieTrackingContext *BKE_tracking_context_new(MovieClip *clip, MovieClipUser *u
 	track = tracksbase->first;
 	while (track) {
 		if (TRACK_SELECTED(track) && (track->flag & (TRACK_LOCKED | TRACK_HIDDEN)) == 0) {
-			MovieTrackingMarker *marker = BKE_tracking_get_marker(track, user->framenr);
+			int framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, user->framenr);
+			MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
 
 			if ((marker->flag & MARKER_DISABLED) == 0)
 				num_tracks++;
@@ -981,6 +2042,7 @@ MovieTrackingContext *BKE_tracking_context_new(MovieClip *clip, MovieClipUser *u
 		track = track->next;
 	}
 
+	/* create tracking contextx for all tracks which would be tracked */
 	if (num_tracks) {
 		int width, height;
 
@@ -993,53 +2055,12 @@ MovieTrackingContext *BKE_tracking_context_new(MovieClip *clip, MovieClipUser *u
 		track = tracksbase->first;
 		while (track) {
 			if (TRACK_SELECTED(track) && (track->flag & (TRACK_HIDDEN | TRACK_LOCKED)) == 0) {
-				MovieTrackingMarker *marker = BKE_tracking_get_marker(track, user->framenr);
+				int framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, user->framenr);
+				MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
 
 				if ((marker->flag & MARKER_DISABLED) == 0) {
 					TrackContext track_context;
-
 					memset(&track_context, 0, sizeof(TrackContext));
-
-#ifdef WITH_LIBMV
-					{
-						float patx = (int)((track->pat_max[0] - track->pat_min[0]) * width),
-						      paty = (int)((track->pat_max[1] - track->pat_min[1]) * height);
-
-						float search_size_x = (track->search_max[0] - track->search_min[0]) * width;
-						float search_size_y = (track->search_max[1] - track->search_min[1]) * height;
-						float pattern_size_x = (track->pat_max[0] - track->pat_min[0]) * width;
-						float pattern_size_y = (track->pat_max[1] - track->pat_min[1]) * height;
-						int wndx = (int)patx / 2, wndy = (int)paty / 2;
-						int half_wnd = MAX2(wndx, wndy);
-
-							/* compute the maximum pyramid size */
-						float search_to_pattern_ratio = MIN2(search_size_x,  search_size_y)
-							/ MAX2(pattern_size_x, pattern_size_y);
-						float log2_search_to_pattern_ratio = log(floor(search_to_pattern_ratio)) / M_LN2;
-						int max_pyramid_levels = floor(log2_search_to_pattern_ratio + 1);
-
-						/* try to accommodate the user's choice of pyramid level in a way
-						 * that doesn't cause the coarsest pyramid pattern to be larger
-						 * than the search size */
-						int level = MIN2(track->pyramid_levels, max_pyramid_levels);
-
-						struct libmv_RegionTracker *region_tracker;
-
-						if (track->tracker == TRACKER_KLT) {
-							region_tracker = libmv_pyramidRegionTrackerNew(100, level, half_wnd,
-							                                               track->minimum_correlation);
-						}
-						else if (track->tracker == TRACKER_HYBRID) {
-							region_tracker = libmv_hybridRegionTrackerNew(100, half_wnd, track->minimum_correlation);
-						}
-						else if (track->tracker == TRACKER_SAD) {
-							region_tracker = libmv_bruteRegionTrackerNew(MAX2(wndx, wndy), track->minimum_correlation);
-						}
-
-						track_context.region_tracker = region_tracker;
-					}
-#endif
-
 					tracks_map_insert(context->tracks_map, track, &track_context);
 				}
 			}
@@ -1048,8 +2069,6 @@ MovieTrackingContext *BKE_tracking_context_new(MovieClip *clip, MovieClipUser *u
 		}
 	}
 
-	context->clip = clip;
-
 	/* store needed clip flags passing to get_buffer functions
 	 * - MCLIP_USE_PROXY is needed to because timecode affects on movie clip
 	 *   only in case Proxy/Timecode flag is set, so store this flag to use
@@ -1057,7 +2076,8 @@ MovieTrackingContext *BKE_tracking_context_new(MovieClip *clip, MovieClipUser *u
 	 *   would be used for images
 	 * - MCLIP_USE_PROXY_CUSTOM_DIR is needed because proxy/timecode files might
 	 *   be stored in a different location
-	 * ignore all the rest possible flags for now */
+	 * ignore all the rest possible flags for now
+	 */
 	context->clip_flag = clip->flag & MCLIP_TIMECODE_FLAGS;
 
 	context->user = *user;
@@ -1070,22 +2090,6 @@ MovieTrackingContext *BKE_tracking_context_new(MovieClip *clip, MovieClipUser *u
 	return context;
 }
 
-static void track_context_free(void *customdata)
-{
-	TrackContext *track_context = (TrackContext *)customdata;
-
-#if WITH_LIBMV
-	if (track_context->region_tracker)
-		libmv_regionTrackerDestroy(track_context->region_tracker);
-
-	if (track_context->patch)
-		MEM_freeN(track_context->patch);
-
-#else
-		(void) track_context;
-#endif
-}
-
 void BKE_tracking_context_free(MovieTrackingContext *context)
 {
 	if (!context->sequence)
@@ -1096,235 +2100,104 @@ void BKE_tracking_context_free(MovieTrackingContext *context)
 	MEM_freeN(context);
 }
 
-/* zap channels from the imbuf that are disabled by the user. this can lead to
- * better tracks sometimes. however, instead of simply zeroing the channels
- * out, do a partial grayscale conversion so the display is better. */
-void BKE_tracking_disable_imbuf_channels(ImBuf *ibuf, int disable_red, int disable_green, int disable_blue,
-                                         int grayscale)
+void BKE_tracking_context_sync(MovieTrackingContext *context)
 {
-	int x, y;
-	float scale;
-
-	if (!disable_red && !disable_green && !disable_blue && !grayscale)
-		return;
-
-	/* If only some components are selected, it's important to rescale the result
-	 * appropriately so that e.g. if only blue is selected, it's not zeroed out. */
-	scale = (disable_red   ? 0.0f : 0.2126f) +
-	        (disable_green ? 0.0f : 0.7152f) +
-	        (disable_blue  ? 0.0f : 0.0722f);
-
-	for (y = 0; y < ibuf->y; y++) {
-		for (x = 0; x < ibuf->x; x++) {
-			int pixel = ibuf->x*y + x;
-
-			if (ibuf->rect_float) {
-				float *rrgbf = ibuf->rect_float + pixel*4;
-				float r = disable_red   ? 0.0f : rrgbf[0];
-				float g = disable_green ? 0.0f : rrgbf[1];
-				float b = disable_blue  ? 0.0f : rrgbf[2];
-
-				if (grayscale) {
-					float gray = (0.2126f*r + 0.7152f*g + 0.0722f*b) / scale;
+	MovieTracking *tracking = &context->clip->tracking;
+	int newframe;
 
-					rrgbf[0] = rrgbf[1] = rrgbf[2] = gray;
-				}
-				else {
-					rrgbf[0] = r;
-					rrgbf[1] = g;
-					rrgbf[2] = b;
-				}
-			}
-			else {
-				char *rrgb = (char*)ibuf->rect + pixel*4;
-				char r = disable_red   ? 0 : rrgb[0];
-				char g = disable_green ? 0 : rrgb[1];
-				char b = disable_blue  ? 0 : rrgb[2];
+	tracks_map_merge(context->tracks_map, tracking);
 
-				if (grayscale) {
-					float gray = (0.2126f*r + 0.7152f*g + 0.0722f*b) / scale;
+	if (context->backwards)
+		newframe = context->user.framenr + 1;
+	else
+		newframe = context->user.framenr - 1;
 
-					rrgb[0] = rrgb[1] = rrgb[2] = gray;
-				}
-				else {
-					rrgb[0] = r;
-					rrgb[1] = g;
-					rrgb[2] = b;
-				}
-			}
-		}
-	}
+	context->sync_frame = newframe;
 
-	if (ibuf->rect_float)
-		ibuf->userflags |= IB_RECT_INVALID;
+	tracking->dopesheet.ok = FALSE;
 }
 
-static void disable_imbuf_channels(ImBuf *ibuf, MovieTrackingTrack *track, int grayscale)
+void BKE_tracking_context_sync_user(const MovieTrackingContext *context, MovieClipUser *user)
 {
-	BKE_tracking_disable_imbuf_channels(ibuf, track->flag & TRACK_DISABLE_RED,
-			track->flag & TRACK_DISABLE_GREEN, track->flag & TRACK_DISABLE_BLUE, grayscale);
+	user->framenr = context->sync_frame;
 }
 
-static ImBuf *get_area_imbuf(ImBuf *ibuf, MovieTrackingTrack *track, MovieTrackingMarker *marker,
-                             float min[2], float max[2], int margin, int anchored, float pos[2], int origin[2])
-{
-	ImBuf *tmpibuf;
-	int x, y;
-	int x1, y1, w, h;
-	float mpos[2];
-
-	copy_v2_v2(mpos, marker->pos);
-	if (anchored)
-		add_v2_v2(mpos, track->offset);
-
-	if (pos)
-		zero_v2(pos);
-
-	x = mpos[0]*ibuf->x;
-	y = mpos[1]*ibuf->y;
-
-	w = (max[0] - min[0]) * ibuf->x;
-	h = (max[1] - min[1]) * ibuf->y;
-
-	/* dimensions should be odd */
-	w = w | 1;
-	h = h | 1;
-
-	x1 = x - (int)(w * (-min[0] / (max[0] - min[0])));
-	y1 = y - (int)(h * (-min[1] / (max[1] - min[1])));
-
-	if (ibuf->rect_float)
-		tmpibuf = IMB_allocImBuf(w + margin * 2, h + margin * 2, 32, IB_rectfloat);
-	else
-		tmpibuf = IMB_allocImBuf(w + margin * 2, h + margin * 2, 32, IB_rect);
-
-	tmpibuf->profile = ibuf->profile;
-
-	IMB_rectcpy(tmpibuf, ibuf, 0, 0, x1 - margin, y1 - margin, w + margin * 2, h + margin * 2);
+#ifdef WITH_LIBMV
+/* **** utility functions for tracking **** */
 
-	if (pos != NULL) {
-		pos[0] = mpos[0] * ibuf->x - x1 + margin;
-		pos[1] = mpos[1] * ibuf->y - y1 + margin;
-	}
+/* convert from float and byte RGBA to grayscale. Supports different coefficients for RGB. */
+static void float_rgba_to_gray(const float *rgba, float *gray, int num_pixels,
+                               float weight_red, float weight_green, float weight_blue)
+{
+	int i;
 
-	if (origin != NULL) {
-		origin[0] = x1 - margin;
-		origin[1] = y1 - margin;
-	}
+	for (i = 0; i < num_pixels; i++) {
+		const float *pixel = rgba + 4 * i;
 
-	if ((track->flag & TRACK_PREVIEW_GRAYSCALE) ||
-	   (track->flag & TRACK_DISABLE_RED)       ||
-	   (track->flag & TRACK_DISABLE_GREEN)     ||
-	   (track->flag & TRACK_DISABLE_BLUE))
-	{
-		disable_imbuf_channels(tmpibuf, track, TRUE /* grayscale */);
+		gray[i] = weight_red * pixel[0] + weight_green * pixel[1] + weight_blue * pixel[2];
 	}
-
-	return tmpibuf;
 }
 
-ImBuf *BKE_tracking_get_pattern_imbuf(ImBuf *ibuf, MovieTrackingTrack *track, MovieTrackingMarker *marker,
-                                      int margin, int anchored, float pos[2], int origin[2])
-{
-	return get_area_imbuf(ibuf, track, marker, track->pat_min, track->pat_max, margin, anchored, pos, origin);
-}
-
-ImBuf *BKE_tracking_get_search_imbuf(ImBuf *ibuf, MovieTrackingTrack *track, MovieTrackingMarker *marker,
-                                     int margin, int anchored, float pos[2], int origin[2])
-{
-	return get_area_imbuf(ibuf, track, marker, track->search_min, track->search_max, margin, anchored, pos, origin);
-}
-
-#ifdef WITH_LIBMV
-static float *get_search_floatbuf(ImBuf *ibuf, MovieTrackingTrack *track, MovieTrackingMarker *marker,
-                                  int *width_r, int *height_r, float pos[2], int origin[2])
+static void uint8_rgba_to_float_gray(const unsigned char *rgba, float *gray, int num_pixels,
+                                     float weight_red, float weight_green, float weight_blue)
 {
-	ImBuf *tmpibuf;
-	float *pixels, *fp;
-	int x, y, width, height;
-
-	width = (track->search_max[0] - track->search_min[0]) * ibuf->x;
-	height = (track->search_max[1] - track->search_min[1]) * ibuf->y;
-
-	tmpibuf = BKE_tracking_get_search_imbuf(ibuf, track, marker, 0, 0, pos, origin);
-	disable_imbuf_channels(tmpibuf, track, FALSE /* don't grayscale */);
-
-	*width_r = width;
-	*height_r = height;
-
-	fp = pixels = MEM_callocN(width * height * sizeof(float), "tracking floatBuf");
-	for (y = 0; y < (int)height; y++) {
-		for (x = 0; x < (int)width; x++) {
-			int pixel = tmpibuf->x * y + x;
+	int i;
 
-			if (tmpibuf->rect_float) {
-				float *rrgbf = tmpibuf->rect_float + pixel * 4;
+	for (i = 0; i < num_pixels; i++) {
+		const unsigned char *pixel = rgba + i * 4;
 
-				*fp = 0.2126 * rrgbf[0] + 0.7152 * rrgbf[1] + 0.0722 * rrgbf[2];
-			}
-			else {
-				unsigned char *rrgb = (unsigned char*)tmpibuf->rect + pixel * 4;
-
-				*fp = (0.2126 * rrgb[0] + 0.7152 * rrgb[1] + 0.0722 * rrgb[2]) / 255.0f;
-			}
-
-			fp++;
-		}
+		gray[i] = (weight_red * pixel[0] + weight_green * pixel[1] + weight_blue * pixel[2]) / 255.0f;
 	}
-
-	IMB_freeImBuf(tmpibuf);
-
-	return pixels;
 }
 
-static unsigned char *get_ucharbuf(ImBuf *ibuf)
+static float *track_get_search_floatbuf(ImBuf *ibuf, MovieTrackingTrack *track, MovieTrackingMarker *marker,
+                                        int *width_r, int *height_r)
 {
-	int x, y;
-	unsigned char *pixels, *cp;
-
-	cp = pixels = MEM_callocN(ibuf->x * ibuf->y * sizeof(unsigned char), "tracking ucharBuf");
-	for (y = 0; y < ibuf->y; y++) {
-		for (x = 0; x < ibuf->x; x++) {
-			int pixel = ibuf->x * y + x;
+	ImBuf *searchibuf;
+	float *gray_pixels;
+	int width, height;
 
-			if (ibuf->rect_float) {
-				const float *rrgbf = ibuf->rect_float + pixel*4;
-				const float grey_f = 0.2126f * rrgbf[0] + 0.7152f * rrgbf[1] + 0.0722f * rrgbf[2];
+	searchibuf = BKE_tracking_get_search_imbuf(ibuf, track, marker, FALSE, TRUE);
 
-				*cp = FTOCHAR(grey_f);
-			}
-			else {
-				const unsigned char *rrgb = (unsigned char*)ibuf->rect + pixel * 4;
+	width = searchibuf->x;
+	height = searchibuf->y;
 
-				*cp = 0.2126f * rrgb[0] + 0.7152f * rrgb[1] + 0.0722f * rrgb[2];
-			}
+	gray_pixels = MEM_callocN(width * height * sizeof(float), "tracking floatBuf");
 
-			cp++;
-		}
+	if (searchibuf->rect_float) {
+		float_rgba_to_gray(searchibuf->rect_float, gray_pixels, width * height,
+		                   0.2126f, 0.7152f, 0.0722f);
+	}
+	else {
+		uint8_rgba_to_float_gray((unsigned char *)searchibuf->rect, gray_pixels, width * height,
+		                         0.2126f, 0.7152f, 0.0722f);
 	}
 
-	return pixels;
+	IMB_freeImBuf(searchibuf);
+
+	*width_r = width;
+	*height_r = height;
+
+	return gray_pixels;
 }
 
-static ImBuf *get_frame_ibuf(MovieTrackingContext *context, int framenr)
+static ImBuf *tracking_context_get_frame_ibuf(MovieTrackingContext *context, int framenr)
 {
 	ImBuf *ibuf;
 	MovieClipUser user = context->user;
 
-	user.framenr = framenr;
+	user.framenr = BKE_movieclip_remap_clip_to_scene_frame(context->clip, framenr);
 
 	ibuf = BKE_movieclip_get_ibuf_flag(context->clip, &user, context->clip_flag, MOVIECLIP_CACHE_SKIP);
 
 	return ibuf;
 }
 
-static ImBuf *get_keyframed_ibuf(MovieTrackingContext *context, MovieTrackingTrack *track,
-                                 MovieTrackingMarker *marker, MovieTrackingMarker **marker_keyed)
+MovieTrackingMarker *tracking_context_get_keyframed_marker(MovieTrackingContext *context, MovieTrackingTrack *track,
+                                                           MovieTrackingMarker *marker)
 {
-	int framenr = marker->framenr;
 	int a = marker - track->markers;
-
-	*marker_keyed = marker;
+	MovieTrackingMarker *marker_keyed = marker;
 
 	while (a >= 0 && a < track->markersnr) {
 		int next = (context->backwards) ? a + 1 : a - 1;
@@ -1342,8 +2215,7 @@ static ImBuf *get_keyframed_ibuf(MovieTrackingContext *context, MovieTrackingTra
 		is_keyframed |= (cur_marker->flag & MARKER_TRACKED) == 0;
 
 		if (is_keyframed) {
-			framenr = cur_marker->framenr;
-			*marker_keyed = cur_marker;
+			marker_keyed = cur_marker;
 
 			break;
 		}
@@ -1351,19 +2223,34 @@ static ImBuf *get_keyframed_ibuf(MovieTrackingContext *context, MovieTrackingTra
 		a = next;
 	}
 
-	return get_frame_ibuf(context, framenr);
+	return marker_keyed;
+}
+
+static ImBuf *tracking_context_get_keyframed_ibuf(MovieTrackingContext *context, MovieTrackingTrack *track,
+                                                  MovieTrackingMarker *marker, MovieTrackingMarker **marker_keyed_r)
+{
+	MovieTrackingMarker *marker_keyed;
+	int keyed_framenr;
+
+	marker_keyed = tracking_context_get_keyframed_marker(context, track, marker);
+	keyed_framenr = marker_keyed->framenr;
+
+	*marker_keyed_r = marker_keyed;
+
+	return tracking_context_get_frame_ibuf(context, keyed_framenr);
 }
 
-static ImBuf *get_adjust_ibuf(MovieTrackingContext *context, MovieTrackingTrack *track, MovieTrackingMarker *marker,
-                              int curfra, MovieTrackingMarker **marker_keyed)
+static ImBuf *tracking_context_get_reference_ibuf(MovieTrackingContext *context, MovieTrackingTrack *track,
+                                                  MovieTrackingMarker *marker, int curfra,
+                                                  MovieTrackingMarker **marker_keyed)
 {
 	ImBuf *ibuf = NULL;
 
 	if (track->pattern_match == TRACK_MATCH_KEYFRAME) {
-		ibuf = get_keyframed_ibuf(context, track, marker, marker_keyed);
+		ibuf = tracking_context_get_keyframed_ibuf(context, track, marker, marker_keyed);
 	}
 	else {
-		ibuf = get_frame_ibuf(context, curfra);
+		ibuf = tracking_context_get_frame_ibuf(context, curfra);
 
 		/* use current marker as keyframed position */
 		*marker_keyed = marker;
@@ -1372,175 +2259,242 @@ static ImBuf *get_adjust_ibuf(MovieTrackingContext *context, MovieTrackingTrack
 	return ibuf;
 }
 
-#endif
+static void track_context_update_reference(MovieTrackingContext *context, TrackContext *track_context,
+                                           MovieTrackingTrack *track, MovieTrackingMarker *marker, int curfra,
+                                           int frame_width, int frame_height)
+{
+	MovieTrackingMarker *marker_keyed = NULL;
+	ImBuf *reference_ibuf = NULL;
+	int width, height;
+
+	/* calculate patch for keyframed position */
+	reference_ibuf = tracking_context_get_reference_ibuf(context, track, marker, curfra, &marker_keyed);
+	track_context->marker = *marker_keyed;
+
+	if (track_context->search_area) {
+		MEM_freeN(track_context->search_area);
+	}
+
+	track_context->search_area = track_get_search_floatbuf(reference_ibuf, track, marker_keyed, &width, &height);
+	track_context->search_area_height = height;
+	track_context->search_area_width = width;
+
+	if ((track->algorithm_flag & TRACK_ALGORITHM_FLAG_USE_MASK) != 0) {
+		if (track_context->mask)
+			MEM_freeN(track_context->mask);
 
-void BKE_tracking_sync(MovieTrackingContext *context)
+		track_context->mask = BKE_tracking_track_get_mask(frame_width, frame_height, track, marker);
+	}
+
+	IMB_freeImBuf(reference_ibuf);
+}
+
+static void tracking_configure_tracker(TrackContext *track_context, MovieTrackingTrack *track,
+                                       struct libmv_trackRegionOptions *options)
 {
-	MovieTracking *tracking = &context->clip->tracking;
-	int newframe;
+	options->motion_model = track->motion_model;
 
-	tracks_map_merge(context->tracks_map, tracking);
+	options->use_brute = ((track->algorithm_flag & TRACK_ALGORITHM_FLAG_USE_BRUTE) != 0);
 
-	if (context->backwards)
-		newframe = context->user.framenr + 1;
-	else
-		newframe = context->user.framenr - 1;
+	options->use_normalization = ((track->algorithm_flag & TRACK_ALGORITHM_FLAG_USE_NORMALIZATION) != 0);
 
-	context->sync_frame = newframe;
+	options->num_iterations = 50;
+	options->minimum_correlation = track->minimum_correlation;
+	options->sigma = 0.9;
 
-	tracking->dopesheet.ok = FALSE;
+	if ((track->algorithm_flag & TRACK_ALGORITHM_FLAG_USE_MASK) != 0)
+		options->image1_mask = track_context->mask;
 }
 
-void BKE_tracking_sync_user(MovieClipUser *user, MovieTrackingContext *context)
+/* returns FALSE if marker crossed margin area from frame bounds */
+static int tracking_check_marker_margin(MovieTrackingTrack *track, MovieTrackingMarker *marker,
+                                        int frame_width, int frame_height)
 {
-	user->framenr = context->sync_frame;
+	float pat_min[2], pat_max[2], dim[2], margin[2];
+
+	/* margin from frame boundaries */
+	BKE_tracking_marker_pattern_minmax(marker, pat_min, pat_max);
+	sub_v2_v2v2(dim, pat_max, pat_min);
+	margin[0] = margin[1] = MAX2(dim[0], dim[1]) / 2.0f;
+
+	margin[0] = MAX2(margin[0], (float)track->margin / frame_width);
+	margin[1] = MAX2(margin[1], (float)track->margin / frame_height);
+
+	/* do not track markers which are too close to boundary */
+	if (marker->pos[0] < margin[0] || marker->pos[0] > 1.0f - margin[0] ||
+	    marker->pos[1] < margin[1] || marker->pos[1] > 1.0f - margin[1])
+	{
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+static void tracking_scale_marker_search(const MovieTrackingMarker *old_marker, MovieTrackingMarker *new_marker)
+{
+	float old_pat_min[2], old_pat_max[2];
+	float new_pat_min[2], new_pat_max[2];
+	float scale_x, scale_y;
+
+	BKE_tracking_marker_pattern_minmax(old_marker, old_pat_min, old_pat_max);
+	BKE_tracking_marker_pattern_minmax(new_marker, new_pat_min, new_pat_max);
+
+	scale_x = (new_pat_max[0] - new_pat_min[0]) / (old_pat_max[0] - old_pat_min[0]);
+	scale_y = (new_pat_max[1] - new_pat_min[1]) / (old_pat_max[1] - old_pat_min[1]);
+
+	new_marker->search_min[0] *= scale_x;
+	new_marker->search_min[1] *= scale_y;
+
+	new_marker->search_max[0] *= scale_x;
+	new_marker->search_max[1] *= scale_y;
 }
 
-int BKE_tracking_next(MovieTrackingContext *context)
+static void tracking_insert_new_marker(MovieTrackingContext *context, MovieTrackingTrack *track,
+                                       const MovieTrackingMarker *old_marker, int curfra, int tracked,
+                                       int frame_width, int frame_height,
+                                       double dst_pixel_x[5], double dst_pixel_y[5])
 {
-	ImBuf *ibuf_new;
-	int curfra = context->user.framenr;
+	MovieTrackingMarker new_marker;
+	int frame_delta = context->backwards ? -1 : 1;
+	int nextfra = curfra + frame_delta;
+
+	new_marker = *old_marker;
+
+	if (tracked) {
+		set_marker_coords_from_tracking(frame_width, frame_height, &new_marker, dst_pixel_x, dst_pixel_y);
+		new_marker.flag |= MARKER_TRACKED;
+		new_marker.framenr = nextfra;
+
+		tracking_scale_marker_search(old_marker, &new_marker);
+
+		if (context->first_time) {
+			/* check if there's no keyframe/tracked markers before tracking marker.
+			 * if so -- create disabled marker before currently tracking "segment"
+			 */
+
+			tracking_marker_insert_disabled(track, &new_marker, !context->backwards, FALSE);
+		}
+
+		/* insert currently tracked marker */
+		BKE_tracking_marker_insert(track, &new_marker);
+
+		/* make currently tracked segment be finished with disabled marker */
+		tracking_marker_insert_disabled(track, &new_marker, context->backwards, FALSE);
+	}
+	else {
+		new_marker.framenr = nextfra;
+		new_marker.flag |= MARKER_DISABLED;
+
+		BKE_tracking_marker_insert(track, &new_marker);
+	}
+}
+
+#endif
+
+int BKE_tracking_context_step(MovieTrackingContext *context)
+{
+	ImBuf *destination_ibuf;
+	int frame_delta = context->backwards ? -1 : 1;
+	int curfra =  BKE_movieclip_remap_scene_to_clip_frame(context->clip, context->user.framenr);
+	int nextfra;
 	int a, ok = FALSE, map_size;
 
-	map_size = tracks_map_size(context->tracks_map);
+	int frame_width, frame_height;
+
+	map_size = tracks_map_get_size(context->tracks_map);
 
 	/* nothing to track, avoid unneeded frames reading to save time and memory */
 	if (!map_size)
 		return FALSE;
 
-	if (context->backwards)
-		context->user.framenr--;
-	else
-		context->user.framenr++;
+	context->user.framenr += frame_delta;
 
-	ibuf_new = BKE_movieclip_get_ibuf_flag(context->clip, &context->user, context->clip_flag, MOVIECLIP_CACHE_SKIP);
-	if (!ibuf_new)
+	destination_ibuf = BKE_movieclip_get_ibuf_flag(context->clip, &context->user,
+	                                               context->clip_flag, MOVIECLIP_CACHE_SKIP);
+	if (!destination_ibuf)
 		return FALSE;
 
-	#pragma omp parallel for private(a) shared(ibuf_new, ok) if (map_size>1)
+	nextfra = curfra + frame_delta;
+
+	frame_width = destination_ibuf->x;
+	frame_height = destination_ibuf->y;
+
+	#pragma omp parallel for private(a) shared(destination_ibuf, ok) if (map_size>1)
 	for (a = 0; a < map_size; a++) {
 		TrackContext *track_context = NULL;
 		MovieTrackingTrack *track;
 		MovieTrackingMarker *marker;
 
-		tracks_map_get(context->tracks_map, a, &track, (void**)&track_context);
+		tracks_map_get_indexed_element(context->tracks_map, a, &track, (void **)&track_context);
 
-		marker = BKE_tracking_exact_marker(track, curfra);
+		marker = BKE_tracking_marker_get_exact(track, curfra);
 
 		if (marker && (marker->flag & MARKER_DISABLED) == 0) {
 #ifdef WITH_LIBMV
-			int width, height, origin[2], tracked = 0, need_readjust = 0;
-			float pos[2], margin[2], dim[2];
-			double x1, y1, x2, y2;
-			ImBuf *ibuf = NULL;
-			MovieTrackingMarker marker_new, *marker_keyed;
-			int onbound = FALSE, nextfra;
+			int width, height, tracked = FALSE, need_readjust;
+			double dst_pixel_x[5], dst_pixel_y[5];
 
 			if (track->pattern_match == TRACK_MATCH_KEYFRAME)
 				need_readjust = context->first_time;
 			else
 				need_readjust = TRUE;
 
-			if (context->backwards)
-				nextfra = curfra - 1;
-			else
-				nextfra = curfra + 1;
-
-			/* margin from frame boundaries */
-			sub_v2_v2v2(dim, track->pat_max, track->pat_min);
-			margin[0] = margin[1] = MAX2(dim[0], dim[1]) / 2.0f;
+			/* do not track markers which are too close to boundary */
+			if (tracking_check_marker_margin(track, marker, frame_width, frame_height)) {
+				/* to convert to the x/y split array format for libmv. */
+				double src_pixel_x[5], src_pixel_y[5];
 
-			margin[0] = MAX2(margin[0], (float)track->margin / ibuf_new->x);
-			margin[1] = MAX2(margin[1], (float)track->margin / ibuf_new->y);
+				/* settings for the tracker */
+				struct libmv_trackRegionOptions options = {0};
+				struct libmv_trackRegionResult result;
 
-			/* do not track markers which are too close to boundary */
-			if (marker->pos[0] < margin[0] || marker->pos[0] > 1.0f - margin[0] ||
-			    marker->pos[1] < margin[1] || marker->pos[1] > 1.0f - margin[1])
-			{
-				onbound = TRUE;
-			}
-			else {
 				float *patch_new;
 
 				if (need_readjust) {
-					/* calculate patch for keyframed position */
-					ibuf = get_adjust_ibuf(context, track, marker, curfra, &marker_keyed);
-
-					if (track_context->patch)
-						MEM_freeN(track_context->patch);
-
-					track_context->patch = get_search_floatbuf(ibuf, track, marker_keyed, &width, &height,
-					                                           track_context->keyframed_pos, origin);
-
-					IMB_freeImBuf(ibuf);
+					track_context_update_reference(context, track_context, track, marker,
+					                               curfra, frame_width, frame_height);
 				}
 
-				patch_new = get_search_floatbuf(ibuf_new, track, marker, &width, &height, pos, origin);
-
-				x1 = track_context->keyframed_pos[0];
-				y1 = track_context->keyframed_pos[1];
-
-				x2 = pos[0];
-				y2 = pos[1];
-
-				tracked = libmv_regionTrackerTrack(track_context->region_tracker, track_context->patch, patch_new,
-							width, height, x1, y1, &x2, &y2);
-
+				/* for now track to the same search area dimension as marker has got for current frame
+				 * will make all tracked markers in currently tracked segment have the same search area
+				 * size, but it's quite close to what is actually needed
+				 */
+				patch_new = track_get_search_floatbuf(destination_ibuf, track, marker, &width, &height);
+
+				/* configure the tracker */
+				tracking_configure_tracker(track_context, track, &options);
+
+				/* convert the marker corners and center into pixel coordinates in the search/destination images. */
+				get_marker_coords_for_tracking(frame_width, frame_height, &track_context->marker, src_pixel_x, src_pixel_y);
+				get_marker_coords_for_tracking(frame_width, frame_height, marker, dst_pixel_x, dst_pixel_y);
+
+				/* run the tracker! */
+				tracked = libmv_trackRegion(&options,
+				                            track_context->search_area,
+				                            track_context->search_area_width,
+				                            track_context->search_area_height,
+				                            patch_new, width, height,
+				                            src_pixel_x, src_pixel_y,
+				                            &result,
+				                            dst_pixel_x, dst_pixel_y);
 				MEM_freeN(patch_new);
 			}
 
-			if (tracked && !onbound && finite(x2) && finite(y2)) {
-				if (context->first_time) {
-					#pragma omp critical
-					{
-						/* check if there's no keyframe/tracked markers before tracking marker.
-						 * if so -- create disabled marker before currently tracking "segment" */
-						put_disabled_marker(track, marker, !context->backwards, 0);
-					}
-				}
-
-				memset(&marker_new, 0, sizeof(marker_new));
-
-				if (!onbound) {
-					marker_new.pos[0] = (origin[0] + x2) / ibuf_new->x;
-					marker_new.pos[1] = (origin[1] + y2) / ibuf_new->y;
-				}
-				else {
-					copy_v2_v2(marker_new.pos, marker->pos);
-				}
-
-				marker_new.flag |= MARKER_TRACKED;
-				marker_new.framenr = nextfra;
-
-				#pragma omp critical
-				{
-					BKE_tracking_insert_marker(track, &marker_new);
-				}
-
-				/* make currently tracked segment be finished with disabled marker */
-				#pragma omp critical
-				{
-					put_disabled_marker(track, &marker_new, context->backwards, 0);
-				}
-			}
-			else {
-				marker_new = *marker;
-
-				marker_new.framenr = nextfra;
-				marker_new.flag |= MARKER_DISABLED;
-
-				#pragma omp critical
-				{
-					BKE_tracking_insert_marker(track, &marker_new);
-				}
+			#pragma omp critical
+			{
+				tracking_insert_new_marker(context, track, marker, curfra, tracked,
+				                           frame_width, frame_height, dst_pixel_x, dst_pixel_y);
 			}
 
 			ok = TRUE;
+#else
+			(void)frame_height;
+			(void)frame_width;
 #endif
 		}
 	}
 
-	IMB_freeImBuf(ibuf_new);
+	IMB_freeImBuf(destination_ibuf);
 
 	context->first_time = FALSE;
 	context->frames++;
@@ -1548,7 +2502,7 @@ int BKE_tracking_next(MovieTrackingContext *context)
 	return ok;
 }
 
-/*********************** camera solving *************************/
+/*********************** Camera solving *************************/
 
 typedef struct MovieReconstructContext {
 #ifdef WITH_LIBMV
@@ -1581,8 +2535,8 @@ typedef struct ReconstructProgressData {
 	int message_size;
 } ReconstructProgressData;
 
-#if WITH_LIBMV
-static struct libmv_Tracks *create_libmv_tracks(ListBase *tracksbase, int width, int height)
+#ifdef WITH_LIBMV
+static struct libmv_Tracks *libmv_tracks_new(ListBase *tracksbase, int width, int height)
 {
 	int tracknr = 0;
 	MovieTrackingTrack *track;
@@ -1597,7 +2551,7 @@ static struct libmv_Tracks *create_libmv_tracks(ListBase *tracksbase, int width,
 
 			if ((marker->flag & MARKER_DISABLED) == 0) {
 				libmv_tracksInsert(tracks, marker->framenr, tracknr,
-							marker->pos[0] * width, marker->pos[1] * height);
+				                   marker->pos[0] * width, marker->pos[1] * height);
 			}
 		}
 
@@ -1608,7 +2562,7 @@ static struct libmv_Tracks *create_libmv_tracks(ListBase *tracksbase, int width,
 	return tracks;
 }
 
-static void retrieve_libmv_reconstruct_intrinscis(MovieReconstructContext *context, MovieTracking *tracking)
+static void reconstruct_retrieve_libmv_intrinscis(MovieReconstructContext *context, MovieTracking *tracking)
 {
 	struct libmv_Reconstruction *libmv_reconstruction = context->reconstruction;
 	struct libmv_CameraIntrinsics *libmv_intrinsics = libmv_ReconstructionExtractIntrinsics(libmv_reconstruction);
@@ -1629,7 +2583,7 @@ static void retrieve_libmv_reconstruct_intrinscis(MovieReconstructContext *conte
 	tracking->camera.k2 = k2;
 }
 
-static int retrieve_libmv_reconstruct_tracks(MovieReconstructContext *context, MovieTracking *tracking)
+static int reconstruct_retrieve_libmv_tracks(MovieReconstructContext *context, MovieTracking *tracking)
 {
 	struct libmv_Reconstruction *libmv_reconstruction = context->reconstruction;
 	MovieTrackingReconstruction *reconstruction = NULL;
@@ -1645,7 +2599,7 @@ static int retrieve_libmv_reconstruct_tracks(MovieReconstructContext *context, M
 		reconstruction = &tracking->reconstruction;
 	}
 	else {
-		MovieTrackingObject *object = BKE_tracking_named_object(tracking, context->object_name);
+		MovieTrackingObject *object = BKE_tracking_object_get_named(tracking, context->object_name);
 
 		tracksbase = &object->tracks;
 		reconstruction = &object->reconstruction;
@@ -1737,15 +2691,15 @@ static int retrieve_libmv_reconstruct_tracks(MovieReconstructContext *context, M
 	return ok;
 }
 
-static int retrieve_libmv_reconstruct(MovieReconstructContext *context, MovieTracking *tracking)
+static int reconstruct_retrieve_libmv(MovieReconstructContext *context, MovieTracking *tracking)
 {
 	/* take the intrinscis back from libmv */
-	retrieve_libmv_reconstruct_intrinscis(context, tracking);
+	reconstruct_retrieve_libmv_intrinscis(context, tracking);
 
-	return retrieve_libmv_reconstruct_tracks(context, tracking);
+	return reconstruct_retrieve_libmv_tracks(context, tracking);
 }
 
-static int get_refine_intrinsics_flags(MovieTracking *tracking, MovieTrackingObject *object)
+static int reconstruct_refine_intrinsics_get_flags(MovieTracking *tracking, MovieTrackingObject *object)
 {
 	int refine = tracking->settings.refine_camera_intrinsics;
 	int flags = 0;
@@ -1768,7 +2722,7 @@ static int get_refine_intrinsics_flags(MovieTracking *tracking, MovieTrackingObj
 	return flags;
 }
 
-static int count_tracks_on_both_keyframes(MovieTracking *tracking, ListBase *tracksbase)
+static int reconstruct_count_tracks_on_both_keyframes(MovieTracking *tracking, ListBase *tracksbase)
 {
 	int tot = 0;
 	int frame1 = tracking->settings.keyframe1, frame2 = tracking->settings.keyframe2;
@@ -1776,9 +2730,11 @@ static int count_tracks_on_both_keyframes(MovieTracking *tracking, ListBase *tra
 
 	track = tracksbase->first;
 	while (track) {
-		if (BKE_tracking_has_enabled_marker(track, frame1))
-			if (BKE_tracking_has_enabled_marker(track, frame2))
+		if (BKE_tracking_track_has_enabled_marker_at_frame(track, frame1)) {
+			if (BKE_tracking_track_has_enabled_marker_at_frame(track, frame2)) {
 				tot++;
+			}
+		}
 
 		track = track->next;
 	}
@@ -1787,16 +2743,16 @@ static int count_tracks_on_both_keyframes(MovieTracking *tracking, ListBase *tra
 }
 #endif
 
-int BKE_tracking_can_reconstruct(MovieTracking *tracking, MovieTrackingObject *object, char *error_msg, int error_size)
+int BKE_tracking_reconstruction_check(MovieTracking *tracking, MovieTrackingObject *object, char *error_msg, int error_size)
 {
 #if WITH_LIBMV
-	ListBase *tracksbase = BKE_tracking_object_tracks(tracking, object);
+	ListBase *tracksbase = BKE_tracking_object_get_tracks(tracking, object);
 
 	if (tracking->settings.motion_flag & TRACKING_MOTION_MODAL) {
 		/* TODO: check for number of tracks? */
 		return TRUE;
 	}
-	else if (count_tracks_on_both_keyframes(tracking, tracksbase) < 8) {
+	else if (reconstruct_count_tracks_on_both_keyframes(tracking, tracksbase) < 8) {
 		BLI_strncpy(error_msg, "At least 8 common tracks on both of keyframes are needed for reconstruction",
 		            error_size);
 
@@ -1814,12 +2770,12 @@ int BKE_tracking_can_reconstruct(MovieTracking *tracking, MovieTrackingObject *o
 #endif
 }
 
-MovieReconstructContext* BKE_tracking_reconstruction_context_new(MovieTracking *tracking, MovieTrackingObject *object,
+MovieReconstructContext *BKE_tracking_reconstruction_context_new(MovieTracking *tracking, MovieTrackingObject *object,
                                                                  int keyframe1, int keyframe2, int width, int height)
 {
 	MovieReconstructContext *context = MEM_callocN(sizeof(MovieReconstructContext), "MovieReconstructContext data");
 	MovieTrackingCamera *camera = &tracking->camera;
-	ListBase *tracksbase = BKE_tracking_object_tracks(tracking, object);
+	ListBase *tracksbase = BKE_tracking_object_get_tracks(tracking, object);
 	float aspy = 1.0f / tracking->camera.pixel_aspect;
 	int num_tracks = BLI_countlist(tracksbase);
 	int sfra = INT_MAX, efra = INT_MIN;
@@ -1829,6 +2785,14 @@ MovieReconstructContext* BKE_tracking_reconstruction_context_new(MovieTracking *
 	context->is_camera = object->flag & TRACKING_OBJECT_CAMERA;
 	context->motion_flag = tracking->settings.motion_flag;
 
+	context->focal_length = camera->focal;
+	context->principal_point[0] = camera->principal[0];
+	context->principal_point[1] = camera->principal[1] * aspy;
+
+	context->k1 = camera->k1;
+	context->k2 = camera->k2;
+	context->k3 = camera->k3;
+
 	context->tracks_map = tracks_map_new(context->object_name, context->is_camera, num_tracks, 0);
 
 	track = tracksbase->first;
@@ -1864,10 +2828,10 @@ MovieReconstructContext* BKE_tracking_reconstruction_context_new(MovieTracking *
 	context->efra = efra;
 
 #ifdef WITH_LIBMV
-	context->tracks = create_libmv_tracks(tracksbase, width, height*aspy);
+	context->tracks = libmv_tracks_new(tracksbase, width, height * aspy);
 	context->keyframe1 = keyframe1;
 	context->keyframe2 = keyframe2;
-	context->refine_flags = get_refine_intrinsics_flags(tracking, object);
+	context->refine_flags = reconstruct_refine_intrinsics_get_flags(tracking, object);
 #else
 	(void) width;
 	(void) height;
@@ -1875,14 +2839,6 @@ MovieReconstructContext* BKE_tracking_reconstruction_context_new(MovieTracking *
 	(void) keyframe2;
 #endif
 
-	context->focal_length = camera->focal;
-	context->principal_point[0] = camera->principal[0];
-	context->principal_point[1] = camera->principal[1] * aspy;
-
-	context->k1 = camera->k1;
-	context->k2 = camera->k2;
-	context->k3 = camera->k3;
-
 	return context;
 }
 
@@ -1890,7 +2846,7 @@ void BKE_tracking_reconstruction_context_free(MovieReconstructContext *context)
 {
 #ifdef WITH_LIBMV
 	if (context->reconstruction)
-			libmv_destroyReconstruction(context->reconstruction);
+		libmv_destroyReconstruction(context->reconstruction);
 
 	libmv_tracksDestroy(context->tracks);
 #endif
@@ -1901,7 +2857,7 @@ void BKE_tracking_reconstruction_context_free(MovieReconstructContext *context)
 }
 
 #ifdef WITH_LIBMV
-static void solve_reconstruction_update_cb(void *customdata, double progress, const char *message)
+static void reconstruct_update_solve_cb(void *customdata, double progress, const char *message)
 {
 	ReconstructProgressData *progressdata = customdata;
 
@@ -1914,19 +2870,7 @@ static void solve_reconstruction_update_cb(void *customdata, double progress, co
 }
 #endif
 
-#if 0
-static int solve_reconstruction_testbreak_cb(void *customdata)
-{
-	ReconstructProgressData *progressdata = customdata;
-
-	if (progressdata->stop && *progressdata->stop)
-		return TRUE;
-
-	return G.afbreek;
-}
-#endif
-
-void BKE_tracking_solve_reconstruction(MovieReconstructContext *context, short *stop, short *do_update,
+void BKE_tracking_reconstruction_solve(MovieReconstructContext *context, short *stop, short *do_update,
                                        float *progress, char *stats_message, int message_size)
 {
 #ifdef WITH_LIBMV
@@ -1942,19 +2886,19 @@ void BKE_tracking_solve_reconstruction(MovieReconstructContext *context, short *
 
 	if (context->motion_flag & TRACKING_MOTION_MODAL) {
 		context->reconstruction = libmv_solveModal(context->tracks,
-			context->focal_length,
-			context->principal_point[0], context->principal_point[1],
-			context->k1, context->k2, context->k3,
-			solve_reconstruction_update_cb, &progressdata);
+		                                           context->focal_length,
+		                                           context->principal_point[0], context->principal_point[1],
+		                                           context->k1, context->k2, context->k3,
+		                                           reconstruct_update_solve_cb, &progressdata);
 	}
 	else {
 		context->reconstruction = libmv_solveReconstruction(context->tracks,
-			context->keyframe1, context->keyframe2,
-			context->refine_flags,
-			context->focal_length,
-			context->principal_point[0], context->principal_point[1],
-			context->k1, context->k2, context->k3,
-			solve_reconstruction_update_cb, &progressdata);
+		                                                    context->keyframe1, context->keyframe2,
+		                                                    context->refine_flags,
+		                                                    context->focal_length,
+		                                                    context->principal_point[0], context->principal_point[1],
+		                                                    context->k1, context->k2, context->k3,
+		                                                    reconstruct_update_solve_cb, &progressdata);
 	}
 
 	error = libmv_reprojectionError(context->reconstruction);
@@ -1970,7 +2914,7 @@ void BKE_tracking_solve_reconstruction(MovieReconstructContext *context, short *
 #endif
 }
 
-int BKE_tracking_finish_reconstruction(MovieReconstructContext *context, MovieTracking *tracking)
+int BKE_tracking_reconstruction_finish(MovieReconstructContext *context, MovieTracking *tracking)
 {
 	MovieTrackingReconstruction *reconstruction;
 
@@ -1982,7 +2926,7 @@ int BKE_tracking_finish_reconstruction(MovieReconstructContext *context, MovieTr
 	else {
 		MovieTrackingObject *object;
 
-		object = BKE_tracking_named_object(tracking, context->object_name);
+		object = BKE_tracking_object_get_named(tracking, context->object_name);
 		reconstruction = &object->reconstruction;
 	}
 
@@ -1990,350 +2934,17 @@ int BKE_tracking_finish_reconstruction(MovieReconstructContext *context, MovieTr
 	reconstruction->flag |= TRACKING_RECONSTRUCTED;
 
 #ifdef WITH_LIBMV
-	if (!retrieve_libmv_reconstruct(context, tracking))
+	if (!reconstruct_retrieve_libmv(context, tracking))
 		return FALSE;
 #endif
 
 	return TRUE;
 }
 
-void BKE_track_unique_name(ListBase *tracksbase, MovieTrackingTrack *track)
-{
-	BLI_uniquename(tracksbase, track, "Track", '.', offsetof(MovieTrackingTrack, name), sizeof(track->name));
-}
-
-MovieTrackingTrack *BKE_tracking_named_track(MovieTracking *tracking, MovieTrackingObject *object, const char *name)
-{
-	ListBase *tracksbase = BKE_tracking_object_tracks(tracking, object);
-	MovieTrackingTrack *track = tracksbase->first;
-
-	while (track) {
-		if (!strcmp(track->name, name))
-			return track;
-
-		track = track->next;
-	}
-
-	return NULL;
-}
-
-static int reconstruction_camera_index(MovieTrackingReconstruction *reconstruction, int framenr, int nearest)
-{
-	MovieReconstructedCamera *cameras = reconstruction->cameras;
-	int a = 0, d = 1;
-
-	if (!reconstruction->camnr)
-		return -1;
-
-	if (framenr < cameras[0].framenr) {
-		if (nearest)
-			return 0;
-		else
-			return -1;
-	}
-
-	if (framenr > cameras[reconstruction->camnr - 1].framenr) {
-		if (nearest)
-			return reconstruction->camnr - 1;
-		else
-			return -1;
-	}
-
-	if (reconstruction->last_camera < reconstruction->camnr)
-		a = reconstruction->last_camera;
-
-	if (cameras[a].framenr >= framenr)
-		d = -1;
-
-	while (a >= 0 && a < reconstruction->camnr) {
-		int cfra = cameras[a].framenr;
-
-		/* check if needed framenr was "skipped" -- no data for requested frame */
-
-		if (d > 0 && cfra > framenr) {
-			/* interpolate with previous position */
-			if (nearest)
-				return a - 1;
-			else
-				break;
-		}
-
-		if (d < 0 && cfra < framenr) {
-			/* interpolate with next position */
-			if (nearest)
-				return a;
-			else
-				break;
-		}
-
-		if (cfra == framenr) {
-			reconstruction->last_camera = a;
-
-			return a;
-		}
-
-		a += d;
-	}
-
-	return -1;
-}
-
-static void scale_reconstructed_camera(MovieTrackingObject *object, float mat[4][4])
-{
-	if ((object->flag & TRACKING_OBJECT_CAMERA) == 0) {
-		float smat[4][4];
-
-		scale_m4_fl(smat, 1.0f / object->scale);
-		mult_m4_m4m4(mat, mat, smat);
-	}
-}
-
-MovieReconstructedCamera *BKE_tracking_get_reconstructed_camera(MovieTracking *tracking,
-                                                                MovieTrackingObject *object, int framenr)
-{
-	MovieTrackingReconstruction *reconstruction;
-	int a;
-
-	reconstruction = BKE_tracking_object_reconstruction(tracking, object);
-	a = reconstruction_camera_index(reconstruction, framenr, FALSE);
-
-	if (a ==-1)
-		return NULL;
-
-	return &reconstruction->cameras[a];
-}
-
-void BKE_tracking_get_interpolated_camera(MovieTracking *tracking, MovieTrackingObject *object,
-                                          int framenr, float mat[4][4])
-{
-	MovieTrackingReconstruction *reconstruction;
-	MovieReconstructedCamera *cameras;
-	int a;
-
-	reconstruction = BKE_tracking_object_reconstruction(tracking, object);
-	cameras = reconstruction->cameras;
-	a = reconstruction_camera_index(reconstruction, framenr, 1);
-
-	if (a == -1) {
-		unit_m4(mat);
-
-		return;
-	}
-
-	if (cameras[a].framenr != framenr && a > 0 && a < reconstruction->camnr - 1) {
-		float t = ((float)framenr - cameras[a].framenr) / (cameras[a + 1].framenr - cameras[a].framenr);
-
-		blend_m4_m4m4(mat, cameras[a].mat, cameras[a + 1].mat, t);
-	}
-	else {
-		copy_m4_m4(mat, cameras[a].mat);
-	}
-
-	scale_reconstructed_camera(object, mat);
-}
-
-void BKE_get_tracking_mat(Scene *scene, Object *ob, float mat[4][4])
-{
-	if (!ob) {
-		if (scene->camera)
-			ob = scene->camera;
-		else
-			ob = BKE_scene_camera_find(scene);
-	}
-
-	if (ob)
-		BKE_object_where_is_calc_mat4(scene, ob, mat);
-	else
-		unit_m4(mat);
-}
-
-void BKE_tracking_camera_shift(MovieTracking *tracking, int winx, int winy, float *shiftx, float *shifty)
-{
-	/* indeed in both of cases it should be winx -- it's just how camera shift works for blender's camera */
-	*shiftx = (0.5f * winx - tracking->camera.principal[0]) / winx;
-	*shifty = (0.5f * winy - tracking->camera.principal[1]) / winx;
-}
-
-void BKE_tracking_camera_to_blender(MovieTracking *tracking, Scene *scene, Camera *camera, int width, int height)
-{
-	float focal = tracking->camera.focal;
-
-	camera->sensor_x = tracking->camera.sensor_width;
-	camera->sensor_fit = CAMERA_SENSOR_FIT_AUTO;
-	camera->lens = focal * camera->sensor_x / width;
-
-	scene->r.xsch = width * tracking->camera.pixel_aspect;
-	scene->r.ysch = height;
-
-	scene->r.xasp = 1.0f;
-	scene->r.yasp = 1.0f;
-
-	BKE_tracking_camera_shift(tracking, width, height, &camera->shiftx, &camera->shifty);
-}
-
-void BKE_tracking_projection_matrix(MovieTracking *tracking, MovieTrackingObject *object,
-                                    int framenr, int winx, int winy, float mat[4][4])
-{
-	MovieReconstructedCamera *camera;
-	float lens = tracking->camera.focal * tracking->camera.sensor_width / (float)winx;
-	float viewfac, pixsize, left, right, bottom, top, clipsta, clipend;
-	float winmat[4][4];
-	float ycor =  1.0f / tracking->camera.pixel_aspect;
-	float shiftx, shifty, winside = MAX2(winx, winy);
-
-	BKE_tracking_camera_shift(tracking, winx, winy, &shiftx, &shifty);
-
-	clipsta = 0.1f;
-	clipend = 1000.0f;
-
-	if (winx >= winy)
-		viewfac = (lens * winx) / tracking->camera.sensor_width;
-	else
-		viewfac = (ycor * lens * winy) / tracking->camera.sensor_width;
-
-	pixsize = clipsta / viewfac;
-
-	left = -0.5f * (float)winx + shiftx * winside;
-	bottom = -0.5f * (ycor) * (float)winy + shifty * winside;
-	right =  0.5f * (float)winx + shiftx * winside;
-	top =  0.5f * (ycor) * (float)winy + shifty * winside;
-
-	left *= pixsize;
-	right *= pixsize;
-	bottom *= pixsize;
-	top *= pixsize;
-
-	perspective_m4(winmat, left, right, bottom, top, clipsta, clipend);
-
-	camera = BKE_tracking_get_reconstructed_camera(tracking, object, framenr);
-
-	if (camera) {
-		float imat[4][4];
-
-		invert_m4_m4(imat, camera->mat);
-		mult_m4_m4m4(mat, winmat, imat);
-	}
-	else copy_m4_m4(mat, winmat);
-}
-
-ListBase *BKE_tracking_get_tracks(MovieTracking *tracking)
-{
-	MovieTrackingObject *object = BKE_tracking_active_object(tracking);
-
-	if (object && (object->flag & TRACKING_OBJECT_CAMERA) == 0) {
-		return &object->tracks;
-	}
-
-	return &tracking->tracks;
-}
-
-MovieTrackingTrack *BKE_tracking_active_track(MovieTracking *tracking)
-{
-	ListBase *tracksbase;
-
-	if (!tracking->act_track)
-		return NULL;
-
-	tracksbase = BKE_tracking_get_tracks(tracking);
-
-	/* check that active track is in current tracks list */
-	if (BLI_findindex(tracksbase, tracking->act_track) >= 0)
-		return tracking->act_track;
-
-	return NULL;
-}
-
-MovieTrackingObject *BKE_tracking_active_object(MovieTracking *tracking)
-{
-	return BLI_findlink(&tracking->objects, tracking->objectnr);
-}
-
-MovieTrackingObject *BKE_tracking_get_camera_object(MovieTracking *tracking)
-{
-	MovieTrackingObject *object = tracking->objects.first;
-
-	while (object) {
-		if (object->flag & TRACKING_OBJECT_CAMERA)
-			return object;
-
-		object = object->next;
-	}
-
-	return NULL;
-}
-
-ListBase *BKE_tracking_object_tracks(MovieTracking *tracking, MovieTrackingObject *object)
-{
-	if (object->flag & TRACKING_OBJECT_CAMERA) {
-		return &tracking->tracks;
-	}
-
-	return &object->tracks;
-}
-
-MovieTrackingReconstruction *BKE_tracking_object_reconstruction(MovieTracking *tracking, MovieTrackingObject *object)
-{
-	if (object->flag & TRACKING_OBJECT_CAMERA) {
-		return &tracking->reconstruction;
-	}
-
-	return &object->reconstruction;
-}
-
-MovieTrackingReconstruction *BKE_tracking_get_reconstruction(MovieTracking *tracking)
-{
-	MovieTrackingObject *object = BKE_tracking_active_object(tracking);
-
-	return BKE_tracking_object_reconstruction(tracking, object);
-}
-
-void BKE_tracking_apply_intrinsics(MovieTracking *tracking, float co[2], float nco[2])
-{
-	MovieTrackingCamera *camera = &tracking->camera;
+/*********************** Feature detection *************************/
 
 #ifdef WITH_LIBMV
-	double x, y;
-	float aspy = 1.0f / tracking->camera.pixel_aspect;
-
-	/* normalize coords */
-	x = (co[0] - camera->principal[0]) / camera->focal;
-	y = (co[1] - camera->principal[1] * aspy) / camera->focal;
-
-	libmv_applyCameraIntrinsics(camera->focal, camera->principal[0], camera->principal[1] * aspy,
-	                            camera->k1, camera->k2, camera->k3, x, y, &x, &y);
-
-	/* result is in image coords already */
-	nco[0] = x;
-	nco[1] = y;
-#else
-	(void) camera;
-	(void) co;
-	(void) nco;
-#endif
-}
-
-void BKE_tracking_invert_intrinsics(MovieTracking *tracking, float co[2], float nco[2])
-{
-	MovieTrackingCamera *camera = &tracking->camera;
-
-#ifdef WITH_LIBMV
-	double x = co[0], y = co[1];
-	float aspy = 1.0f / tracking->camera.pixel_aspect;
-
-	libmv_InvertIntrinsics(camera->focal, camera->principal[0], camera->principal[1] * aspy,
-	                       camera->k1, camera->k2, camera->k3, x, y, &x, &y);
-
-	nco[0] = x * camera->focal + camera->principal[0];
-	nco[1] = y * camera->focal + camera->principal[1] * aspy;
-#else
-	(void) camera;
-	(void) co;
-	(void) nco;
-#endif
-}
-
-#ifdef WITH_LIBMV
-static int point_in_stroke(bGPDstroke *stroke, float x, float y)
+static int check_point_in_stroke(bGPDstroke *stroke, float x, float y)
 {
 	int i, prev;
 	int count = 0;
@@ -2355,7 +2966,7 @@ static int point_in_stroke(bGPDstroke *stroke, float x, float y)
 	return count % 2;
 }
 
-static int point_in_layer(bGPDlayer *layer, float x, float y)
+static int check_point_in_layer(bGPDlayer *layer, float x, float y)
 {
 	bGPDframe *frame = layer->frames.first;
 
@@ -2363,7 +2974,7 @@ static int point_in_layer(bGPDlayer *layer, float x, float y)
 		bGPDstroke *stroke = frame->strokes.first;
 
 		while (stroke) {
-			if (point_in_stroke(stroke, x, y))
+			if (check_point_in_stroke(stroke, x, y))
 				return TRUE;
 
 			stroke = stroke->next;
@@ -2374,9 +2985,9 @@ static int point_in_layer(bGPDlayer *layer, float x, float y)
 	return FALSE;
 }
 
-static void retrieve_libmv_features(MovieTracking *tracking, ListBase *tracksbase,
-                                    struct libmv_Features *features, int framenr, int width, int height,
-                                    bGPDlayer *layer, int place_outside_layer)
+static void detect_retrieve_libmv_features(MovieTracking *tracking, ListBase *tracksbase,
+                                           struct libmv_Features *features, int framenr, int width, int height,
+                                           bGPDlayer *layer, int place_outside_layer)
 {
 	int a;
 
@@ -2393,16 +3004,45 @@ static void retrieve_libmv_features(MovieTracking *tracking, ListBase *tracksbas
 		yu = y / height;
 
 		if (layer)
-			ok = point_in_layer(layer, xu, yu) != place_outside_layer;
+			ok = check_point_in_layer(layer, xu, yu) != place_outside_layer;
 
 		if (ok) {
-			track = BKE_tracking_add_track(tracking, tracksbase, xu, yu, framenr, width, height);
+			track = BKE_tracking_track_add(tracking, tracksbase, xu, yu, framenr, width, height);
 			track->flag |= SELECT;
 			track->pat_flag |= SELECT;
 			track->search_flag |= SELECT;
 		}
 	}
 }
+
+static unsigned char *detect_get_frame_ucharbuf(ImBuf *ibuf)
+{
+	int x, y;
+	unsigned char *pixels, *cp;
+
+	cp = pixels = MEM_callocN(ibuf->x * ibuf->y * sizeof(unsigned char), "tracking ucharBuf");
+	for (y = 0; y < ibuf->y; y++) {
+		for (x = 0; x < ibuf->x; x++) {
+			int pixel = ibuf->x * y + x;
+
+			if (ibuf->rect_float) {
+				const float *rrgbf = ibuf->rect_float + pixel * 4;
+				const float grey_f = 0.2126f * rrgbf[0] + 0.7152f * rrgbf[1] + 0.0722f * rrgbf[2];
+
+				*cp = FTOCHAR(grey_f);
+			}
+			else {
+				const unsigned char *rrgb = (unsigned char *)ibuf->rect + pixel * 4;
+
+				*cp = 0.2126f * rrgb[0] + 0.7152f * rrgb[1] + 0.0722f * rrgb[2];
+			}
+
+			cp++;
+		}
+	}
+
+	return pixels;
+}
 #endif
 
 void BKE_tracking_detect_fast(MovieTracking *tracking, ListBase *tracksbase, ImBuf *ibuf,
@@ -2411,15 +3051,15 @@ void BKE_tracking_detect_fast(MovieTracking *tracking, ListBase *tracksbase, ImB
 {
 #ifdef WITH_LIBMV
 	struct libmv_Features *features;
-	unsigned char *pixels = get_ucharbuf(ibuf);
+	unsigned char *pixels = detect_get_frame_ucharbuf(ibuf);
 
 	features = libmv_detectFeaturesFAST(pixels, ibuf->x, ibuf->y, ibuf->x,
 	                                    margin, min_trackness, min_distance);
 
 	MEM_freeN(pixels);
 
-	retrieve_libmv_features(tracking, tracksbase, features, framenr,
-	                        ibuf->x, ibuf->y, layer, place_outside_layer);
+	detect_retrieve_libmv_features(tracking, tracksbase, features, framenr,
+	                               ibuf->x, ibuf->y, layer, place_outside_layer);
 
 	libmv_destroyFeatures(features);
 #else
@@ -2435,38 +3075,9 @@ void BKE_tracking_detect_fast(MovieTracking *tracking, ListBase *tracksbase, ImB
 #endif
 }
 
-MovieTrackingTrack *BKE_tracking_indexed_track(MovieTracking *tracking, int tracknr, ListBase **tracksbase_r)
-{
-	MovieTrackingObject *object;
-	int cur = 1;
-
-	object = tracking->objects.first;
-	while (object) {
-		ListBase *tracksbase = BKE_tracking_object_tracks(tracking, object);
-		MovieTrackingTrack *track = tracksbase->first;
-
-		while (track) {
-			if (track->flag & TRACK_HAS_BUNDLE) {
-				if (cur == tracknr) {
-					*tracksbase_r = tracksbase;
-					return track;
-				}
-
-				cur++;
-			}
-
-			track = track->next;
-		}
-
-		object = object->next;
-	}
-
-	*tracksbase_r = NULL;
-
-	return NULL;
-}
+/*********************** 2D stabilization *************************/
 
-static int stabilization_median_point(MovieTracking *tracking, int framenr, float median[2])
+static int stabilization_median_point_get(MovieTracking *tracking, int framenr, float median[2])
 {
 	int ok = FALSE;
 	float min[2], max[2];
@@ -2477,7 +3088,7 @@ static int stabilization_median_point(MovieTracking *tracking, int framenr, floa
 	track = tracking->tracks.first;
 	while (track) {
 		if (track->flag & TRACK_USE_2D_STAB) {
-			MovieTrackingMarker *marker = BKE_tracking_get_marker(track, framenr);
+			MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
 
 			DO_MINMAX2(marker->pos, min, max);
 
@@ -2493,16 +3104,17 @@ static int stabilization_median_point(MovieTracking *tracking, int framenr, floa
 	return ok;
 }
 
-static void calculate_stabdata(MovieTracking *tracking, int framenr, float width, float height,
-                               float firstmedian[2], float median[2], float loc[2], float *scale, float *angle)
+static void stabilization_calculate_data(MovieTracking *tracking, int framenr, float width, float height,
+                                         float firstmedian[2], float median[2], float loc[2],
+                                         float *scale, float *angle)
 {
 	MovieTrackingStabilization *stab = &tracking->stabilization;
 
 	*scale = (stab->scale - 1.0f) * stab->scaleinf + 1.0f;
 	*angle = 0.0f;
 
-	loc[0] = (firstmedian[0] - median[0]) *width * (*scale);
-	loc[1] = (firstmedian[1] - median[1]) *height * (*scale);
+	loc[0] = (firstmedian[0] - median[0]) * width * (*scale);
+	loc[1] = (firstmedian[1] - median[1]) * height * (*scale);
 
 	mul_v2_fl(loc, stab->locinf);
 
@@ -2512,12 +3124,12 @@ static void calculate_stabdata(MovieTracking *tracking, int framenr, float width
 		float x0 = (float)width / 2.0f, y0 = (float)height / 2.0f;
 		float x = median[0] * width, y = median[1] * height;
 
-		marker = BKE_tracking_get_marker(stab->rot_track, 1);
+		marker = BKE_tracking_marker_get(stab->rot_track, 1);
 		sub_v2_v2v2(a, marker->pos, firstmedian);
 		a[0] *= width;
 		a[1] *= height;
 
-		marker = BKE_tracking_get_marker(stab->rot_track, framenr);
+		marker = BKE_tracking_marker_get(stab->rot_track, framenr);
 		sub_v2_v2v2(b, marker->pos, median);
 		b[0] *= width;
 		b[1] *= height;
@@ -2531,7 +3143,7 @@ static void calculate_stabdata(MovieTracking *tracking, int framenr, float width
 	}
 }
 
-static float stabilization_auto_scale_factor(MovieTracking *tracking, int width, int height)
+static float stabilization_calculate_autoscale_factor(MovieTracking *tracking, int width, int height)
 {
 	float firstmedian[2];
 	MovieTrackingStabilization *stab = &tracking->stabilization;
@@ -2540,7 +3152,7 @@ static float stabilization_auto_scale_factor(MovieTracking *tracking, int width,
 	if (stab->ok)
 		return stab->scale;
 
-	if (stabilization_median_point(tracking, 1, firstmedian)) {
+	if (stabilization_median_point_get(tracking, 1, firstmedian)) {
 		int sfra = INT_MAX, efra = INT_MIN, cfra;
 		float scale = 1.0f;
 		MovieTrackingTrack *track;
@@ -2550,7 +3162,7 @@ static float stabilization_auto_scale_factor(MovieTracking *tracking, int width,
 		track = tracking->tracks.first;
 		while (track) {
 			if (track->flag & TRACK_USE_2D_STAB ||
-			   ((stab->flag & TRACKING_STABILIZE_ROTATION) && track == stab->rot_track))
+			    ((stab->flag & TRACKING_STABILIZE_ROTATION) && track == stab->rot_track))
 			{
 				sfra = MIN2(sfra, track->markers[0].framenr);
 				efra = MAX2(efra, track->markers[track->markersnr - 1].framenr);
@@ -2567,11 +3179,11 @@ static float stabilization_auto_scale_factor(MovieTracking *tracking, int width,
 			float points[4][2] = {{0.0f, 0.0f}, {0.0f, height}, {width, height}, {width, 0.0f}};
 			float si, co;
 
-			stabilization_median_point(tracking, cfra, median);
+			stabilization_median_point_get(tracking, cfra, median);
 
-			calculate_stabdata(tracking, cfra, width, height, firstmedian, median, loc, &tmp_scale, &angle);
+			stabilization_calculate_data(tracking, cfra, width, height, firstmedian, median, loc, &tmp_scale, &angle);
 
-			BKE_tracking_stabdata_to_mat4(width, height, aspect, loc, 1.0f, angle, mat);
+			BKE_tracking_stabilization_data_to_mat4(width, height, aspect, loc, 1.0f, angle, mat);
 
 			si = sin(angle);
 			co = cos(angle);
@@ -2611,23 +3223,23 @@ static float stabilization_auto_scale_factor(MovieTracking *tracking, int width,
 							h = (float)height / 2.0f;
 						}
 
-						E = -w*co + h*si;
-						F = -h*co - w*si;
+						E = -w * co + h * si;
+						F = -h * co - w * si;
 
 						if ((i % 2) == (j % 2)) {
-							G = -w*co - h*si;
-							H = h*co - w*si;
+							G = -w * co - h * si;
+							H = h * co - w * si;
 						}
 						else {
-							G = w*co + h*si;
-							H = -h*co + w*si;
+							G = w * co + h * si;
+							H = -h * co + w * si;
 						}
 
 						I = F - H;
 						J = G - E;
-						K = G*F - E*H;
+						K = G * F - E * H;
 
-						S = (-w*I - h*J) / (dx*I + dy*J + K);
+						S = (-w * I - h * J) / (dx * I + dy * J + K);
 
 						scale = MAX2(scale, S);
 					}
@@ -2649,7 +3261,7 @@ static float stabilization_auto_scale_factor(MovieTracking *tracking, int width,
 	return stab->scale;
 }
 
-static ImBuf* stabilize_alloc_ibuf(ImBuf *cacheibuf, ImBuf *srcibuf, int fill)
+static ImBuf *stabilization_allocate_ibuf(ImBuf *cacheibuf, ImBuf *srcibuf, int fill)
 {
 	int flags;
 
@@ -2678,8 +3290,9 @@ static ImBuf* stabilize_alloc_ibuf(ImBuf *cacheibuf, ImBuf *srcibuf, int fill)
 	return cacheibuf;
 }
 
-void BKE_tracking_stabilization_data(MovieTracking *tracking, int framenr, int width, int height,
-                                     float loc[2], float *scale, float *angle)
+/* NOTE: frame number should be in clip space, not scene space */
+void BKE_tracking_stabilization_data_get(MovieTracking *tracking, int framenr, int width, int height,
+                                         float loc[2], float *scale, float *angle)
 {
 	float firstmedian[2], median[2];
 	MovieTrackingStabilization *stab = &tracking->stabilization;
@@ -2692,22 +3305,22 @@ void BKE_tracking_stabilization_data(MovieTracking *tracking, int framenr, int w
 		return;
 	}
 
-	if (stabilization_median_point(tracking, 1, firstmedian)) {
-		stabilization_median_point(tracking, framenr, median);
+	if (stabilization_median_point_get(tracking, 1, firstmedian)) {
+		stabilization_median_point_get(tracking, framenr, median);
 
 		if ((stab->flag & TRACKING_AUTOSCALE) == 0)
 			stab->scale = 1.0f;
 
 		if (!stab->ok) {
 			if (stab->flag & TRACKING_AUTOSCALE)
-				stabilization_auto_scale_factor(tracking, width, height);
+				stabilization_calculate_autoscale_factor(tracking, width, height);
 
-			calculate_stabdata(tracking, framenr, width, height, firstmedian, median, loc, scale, angle);
+			stabilization_calculate_data(tracking, framenr, width, height, firstmedian, median, loc, scale, angle);
 
 			stab->ok = TRUE;
 		}
 		else {
-			calculate_stabdata(tracking, framenr, width, height, firstmedian, median, loc, scale, angle);
+			stabilization_calculate_data(tracking, framenr, width, height, firstmedian, median, loc, scale, angle);
 		}
 	}
 	else {
@@ -2717,8 +3330,9 @@ void BKE_tracking_stabilization_data(MovieTracking *tracking, int framenr, int w
 	}
 }
 
-ImBuf *BKE_tracking_stabilize(MovieTracking *tracking, int framenr, ImBuf *ibuf,
-                              float loc[2], float *scale, float *angle)
+/* NOTE: frame number should be in clip space, not scene space */
+ImBuf *BKE_tracking_stabilize_frame(MovieTracking *tracking, int framenr, ImBuf *ibuf,
+                                    float loc[2], float *scale, float *angle)
 {
 	float tloc[2], tscale, tangle;
 	MovieTrackingStabilization *stab = &tracking->stabilization;
@@ -2742,28 +3356,29 @@ ImBuf *BKE_tracking_stabilize(MovieTracking *tracking, int framenr, ImBuf *ibuf,
 		return ibuf;
 	}
 
-	BKE_tracking_stabilization_data(tracking, framenr, width, height, tloc, &tscale, &tangle);
+	BKE_tracking_stabilization_data_get(tracking, framenr, width, height, tloc, &tscale, &tangle);
 
-	tmpibuf = stabilize_alloc_ibuf(NULL, ibuf, TRUE);
+	tmpibuf = stabilization_allocate_ibuf(NULL, ibuf, TRUE);
 
 	/* scale would be handled by matrix transformation when angle is non-zero */
 	if (tscale != 1.0f && tangle == 0.0f) {
 		ImBuf *scaleibuf;
 
-		stabilization_auto_scale_factor(tracking, width, height);
+		stabilization_calculate_autoscale_factor(tracking, width, height);
 
-		scaleibuf = stabilize_alloc_ibuf(stab->scaleibuf, ibuf, 0);
+		scaleibuf = stabilization_allocate_ibuf(stab->scaleibuf, ibuf, 0);
 		stab->scaleibuf = scaleibuf;
 
 		IMB_rectcpy(scaleibuf, ibuf, 0, 0, 0, 0, ibuf->x, ibuf->y);
-		IMB_scalefastImBuf(scaleibuf, ibuf->x*tscale, ibuf->y*tscale);
+		IMB_scalefastImBuf(scaleibuf, ibuf->x * tscale, ibuf->y * tscale);
 
 		ibuf = scaleibuf;
 	}
 
 	if (tangle == 0.0f) {
 		/* if angle is zero, then it's much faster to use rect copy
-		 * but could be issues with subpixel precisions */
+		 * but could be issues with subpixel precisions
+		 */
 		IMB_rectcpy(tmpibuf, ibuf,
 		            tloc[0] - (tscale - 1.0f) * width / 2.0f,
 		            tloc[1] - (tscale - 1.0f) * height / 2.0f,
@@ -2772,9 +3387,9 @@ ImBuf *BKE_tracking_stabilize(MovieTracking *tracking, int framenr, ImBuf *ibuf,
 	else {
 		float mat[4][4];
 		int i, j, filter = tracking->stabilization.filter;
-		void (*interpolation) (struct ImBuf*, struct ImBuf*, float, float, int, int) = NULL;
+		void (*interpolation)(struct ImBuf *, struct ImBuf *, float, float, int, int) = NULL;
 
-		BKE_tracking_stabdata_to_mat4(ibuf->x, ibuf->y, aspect, tloc, tscale, tangle, mat);
+		BKE_tracking_stabilization_data_to_mat4(ibuf->x, ibuf->y, aspect, tloc, tscale, tangle, mat);
 		invert_m4(mat);
 
 		if (filter == TRACKING_FILTER_NEAREAST)
@@ -2788,7 +3403,7 @@ ImBuf *BKE_tracking_stabilize(MovieTracking *tracking, int framenr, ImBuf *ibuf,
 			interpolation = neareast_interpolation;
 
 		for (j = 0; j < tmpibuf->y; j++) {
-			for (i = 0; i < tmpibuf->x;i++) {
+			for (i = 0; i < tmpibuf->x; i++) {
 				float vec[3] = {i, j, 0};
 
 				mul_v3_m4v3(vec, mat, vec);
@@ -2815,8 +3430,8 @@ ImBuf *BKE_tracking_stabilize(MovieTracking *tracking, int framenr, ImBuf *ibuf,
 	return tmpibuf;
 }
 
-void BKE_tracking_stabdata_to_mat4(int width, int height, float aspect,
-                                   float loc[2], float scale, float angle, float mat[4][4])
+void BKE_tracking_stabilization_data_to_mat4(int width, int height, float aspect, float loc[2],
+                                             float scale, float angle, float mat[4][4])
 {
 	float lmat[4][4], rmat[4][4], smat[4][4], cmat[4][4], icmat[4][4], amat[4][4], iamat[4][4];
 	float svec[3] = {scale, scale, scale};
@@ -2836,249 +3451,15 @@ void BKE_tracking_stabdata_to_mat4(int width, int height, float aspect,
 	cmat[3][1] = (float)height / 2.0f;
 	invert_m4_m4(icmat, cmat);
 
-	size_to_mat4(smat, svec);		/* scale matrix */
-	add_v2_v2(lmat[3], loc);		/* translation matrix */
-	rotate_m4(rmat, 'Z', angle);	/* rotation matrix */
+	size_to_mat4(smat, svec);       /* scale matrix */
+	add_v2_v2(lmat[3], loc);        /* translation matrix */
+	rotate_m4(rmat, 'Z', angle);    /* rotation matrix */
 
 	/* compose transformation matrix */
 	mul_serie_m4(mat, lmat, cmat, amat, rmat, iamat, smat, icmat, NULL);
 }
 
-MovieDistortion *BKE_tracking_distortion_create(void)
-{
-	MovieDistortion *distortion;
-
-	distortion = MEM_callocN(sizeof(MovieDistortion), "BKE_tracking_distortion_create");
-
-	return distortion;
-}
-
-MovieDistortion *BKE_tracking_distortion_copy(MovieDistortion *distortion)
-{
-	MovieDistortion *new_distortion;
-
-	new_distortion = MEM_callocN(sizeof(MovieDistortion), "BKE_tracking_distortion_create");
-
-#ifdef WITH_LIBMV
-	new_distortion->intrinsics = libmv_CameraIntrinsicsCopy(distortion->intrinsics);
-#else
-	(void) distortion;
-#endif
-
-	return new_distortion;
-}
-
-void BKE_tracking_distortion_update(MovieDistortion *distortion, MovieTracking *tracking, int width, int height)
-{
-	MovieTrackingCamera *camera = &tracking->camera;
-	float aspy = 1.0f / tracking->camera.pixel_aspect;
-
-#ifdef WITH_LIBMV
-	if (!distortion->intrinsics) {
-		distortion->intrinsics = libmv_CameraIntrinsicsNew(camera->focal,
-				camera->principal[0], camera->principal[1] * aspy,
-				camera->k1, camera->k2, camera->k3, width, height * aspy);
-	}
-	else {
-		libmv_CameraIntrinsicsUpdate(distortion->intrinsics, camera->focal,
-				camera->principal[0], camera->principal[1] * aspy,
-				camera->k1, camera->k2, camera->k3, width, height * aspy);
-	}
-#else
-	(void) distortion;
-	(void) width;
-	(void) height;
-	(void) camera;
-	(void) aspy;
-#endif
-}
-
-ImBuf *BKE_tracking_distortion_exec(MovieDistortion *distortion, MovieTracking *tracking,
-                                    ImBuf *ibuf, int width, int height, float overscan, int undistort)
-{
-	ImBuf *resibuf;
-
-	BKE_tracking_distortion_update(distortion, tracking, width, height);
-
-	resibuf = IMB_dupImBuf(ibuf);
-
-	if (ibuf->rect_float) {
-#ifdef WITH_LIBMV
-		if (undistort) {
-			libmv_CameraIntrinsicsUndistortFloat(distortion->intrinsics,
-						ibuf->rect_float, resibuf->rect_float,
-						ibuf->x, ibuf->y, overscan, ibuf->channels);
-		}
-		else {
-			libmv_CameraIntrinsicsDistortFloat(distortion->intrinsics,
-						ibuf->rect_float, resibuf->rect_float,
-						ibuf->x, ibuf->y, overscan, ibuf->channels);
-		}
-#endif
-
-		resibuf->userflags |= IB_RECT_INVALID;
-	}
-	else {
-#ifdef WITH_LIBMV
-		if (undistort) {
-				libmv_CameraIntrinsicsUndistortByte(distortion->intrinsics,
-							(unsigned char*)ibuf->rect, (unsigned char*)resibuf->rect,
-							ibuf->x, ibuf->y, overscan, ibuf->channels);
-		}
-		else {
-			libmv_CameraIntrinsicsDistortByte(distortion->intrinsics,
-						(unsigned char*)ibuf->rect, (unsigned char*)resibuf->rect,
-						ibuf->x, ibuf->y, overscan, ibuf->channels);
-		}
-#endif
-	}
-
-#ifndef WITH_LIBMV
-	(void) overscan;
-	(void) undistort;
-#endif
-
-	return resibuf;
-}
-
-void BKE_tracking_distortion_destroy(MovieDistortion *distortion)
-{
-#ifdef WITH_LIBMV
-	libmv_CameraIntrinsicsDestroy(distortion->intrinsics);
-#endif
-
-	MEM_freeN(distortion);
-}
-
-ImBuf *BKE_tracking_undistort(MovieTracking *tracking, ImBuf *ibuf, int width, int height, float overscan)
-{
-	MovieTrackingCamera *camera = &tracking->camera;
-
-	if (camera->intrinsics == NULL)
-		camera->intrinsics = BKE_tracking_distortion_create();
-
-	return BKE_tracking_distortion_exec(camera->intrinsics, tracking, ibuf, width, height, overscan, 1);
-}
-
-ImBuf *BKE_tracking_distort(MovieTracking *tracking, ImBuf *ibuf, int width, int height, float overscan)
-{
-	MovieTrackingCamera *camera = &tracking->camera;
-
-	if (camera->intrinsics == NULL)
-		camera->intrinsics = BKE_tracking_distortion_create();
-
-	return BKE_tracking_distortion_exec(camera->intrinsics, tracking, ibuf, width, height, overscan, 0);
-}
-
-/* area - which part of marker should be selected. see TRACK_AREA_* constants */
-void BKE_tracking_select_track(ListBase *tracksbase, MovieTrackingTrack *track, int area, int extend)
-{
-	if (extend) {
-		BKE_tracking_track_flag(track, area, SELECT, 0);
-	}
-	else {
-		MovieTrackingTrack *cur = tracksbase->first;
-
-		while (cur) {
-			if ((cur->flag & TRACK_HIDDEN) == 0) {
-				if (cur == track) {
-					BKE_tracking_track_flag(cur, TRACK_AREA_ALL, SELECT, 1);
-					BKE_tracking_track_flag(cur, area, SELECT, 0);
-				}
-				else {
-					BKE_tracking_track_flag(cur, TRACK_AREA_ALL, SELECT, 1);
-				}
-			}
-
-			cur = cur->next;
-		}
-	}
-}
-
-void BKE_tracking_deselect_track(MovieTrackingTrack *track, int area)
-{
-	BKE_tracking_track_flag(track, area, SELECT, 1);
-}
-
-MovieTrackingObject *BKE_tracking_new_object(MovieTracking *tracking, const char *name)
-{
-	MovieTrackingObject *object = MEM_callocN(sizeof(MovieTrackingObject), "tracking object");
-
-	if (tracking->tot_object == 0) {
-		/* first object is always camera */
-		BLI_strncpy(object->name, "Camera", sizeof(object->name));
-
-		object->flag |= TRACKING_OBJECT_CAMERA;
-	}
-	else {
-		BLI_strncpy(object->name, name, sizeof(object->name));
-	}
-
-	BLI_addtail(&tracking->objects, object);
-
-	tracking->tot_object++;
-	tracking->objectnr = BLI_countlist(&tracking->objects) - 1;
-
-	object->scale = 1.0f;
-
-	BKE_tracking_object_unique_name(tracking, object);
-
-	return object;
-}
-
-void BKE_tracking_remove_object(MovieTracking *tracking, MovieTrackingObject *object)
-{
-	MovieTrackingTrack *track;
-	int index = BLI_findindex(&tracking->objects, object);
-
-	if (index < 0)
-		return;
-
-	if (object->flag & TRACKING_OBJECT_CAMERA) {
-		/* object used for camera solving can't be deleted */
-		return;
-	}
-
-	track = object->tracks.first;
-	while (track) {
-		if (track == tracking->act_track)
-			tracking->act_track = NULL;
-
-		track = track->next;
-	}
-
-	tracking_object_free(object);
-	BLI_freelinkN(&tracking->objects, object);
-
-	tracking->tot_object--;
-
-	if (index > 0)
-		tracking->objectnr = index - 1;
-	else
-		tracking->objectnr = 0;
-}
-
-void BKE_tracking_object_unique_name(MovieTracking *tracking, MovieTrackingObject *object)
-{
-	BLI_uniquename(&tracking->objects, object, "Object", '.',
-	               offsetof(MovieTrackingObject, name), sizeof(object->name));
-}
-
-MovieTrackingObject *BKE_tracking_named_object(MovieTracking *tracking, const char *name)
-{
-	MovieTrackingObject *object = tracking->objects.first;
-
-	while (object) {
-		if (!strcmp(object->name, name))
-			return object;
-
-		object = object->next;
-	}
-
-	return NULL;
-}
-
-/*********************** dopesheet functions *************************/
+/*********************** Dopesheet functions *************************/
 
 static int channels_alpha_sort(void *a, void *b)
 {
@@ -3113,6 +3494,17 @@ static int channels_longest_segment_sort(void *a, void *b)
 		return 0;
 }
 
+static int channels_average_error_sort(void *a, void *b)
+{
+	MovieTrackingDopesheetChannel *channel_a = a;
+	MovieTrackingDopesheetChannel *channel_b = b;
+
+	if (channel_a->track->error > channel_b->track->error)
+		return 1;
+	else
+		return 0;
+}
+
 static int channels_alpha_inverse_sort(void *a, void *b)
 {
 	if (channels_alpha_sort(a, b))
@@ -3137,6 +3529,17 @@ static int channels_longest_segment_inverse_sort(void *a, void *b)
 		return 1;
 }
 
+static int channels_average_error_inverse_sort(void *a, void *b)
+{
+	MovieTrackingDopesheetChannel *channel_a = a;
+	MovieTrackingDopesheetChannel *channel_b = b;
+
+	if (channel_a->track->error < channel_b->track->error)
+		return 1;
+	else
+		return 0;
+}
+
 static void channels_segments_calc(MovieTrackingDopesheetChannel *channel)
 {
 	MovieTrackingTrack *track = channel->track;
@@ -3219,34 +3622,34 @@ static void  tracking_dopesheet_sort(MovieTracking *tracking, int sort_method, i
 {
 	MovieTrackingDopesheet *dopesheet = &tracking->dopesheet;
 
-	if (dopesheet->sort_method == sort_method && dopesheet->sort_inverse == inverse)
-		return;
-
 	if (inverse) {
-		if (sort_method == TRACK_SORT_NAME) {
+		if (sort_method == TRACKING_DOPE_SORT_NAME) {
 			BLI_sortlist(&dopesheet->channels, channels_alpha_inverse_sort);
 		}
-		else if (sort_method == TRACK_SORT_LONGEST) {
+		else if (sort_method == TRACKING_DOPE_SORT_LONGEST) {
 			BLI_sortlist(&dopesheet->channels, channels_longest_segment_inverse_sort);
 		}
-		else if (sort_method == TRACK_SORT_TOTAL) {
+		else if (sort_method == TRACKING_DOPE_SORT_TOTAL) {
 			BLI_sortlist(&dopesheet->channels, channels_total_track_inverse_sort);
 		}
+		else if (sort_method == TRACKING_DOPE_SORT_AVERAGE_ERROR) {
+			BLI_sortlist(&dopesheet->channels, channels_average_error_inverse_sort);
+		}
 	}
 	else {
-		if (sort_method == TRACK_SORT_NAME) {
+		if (sort_method == TRACKING_DOPE_SORT_NAME) {
 			BLI_sortlist(&dopesheet->channels, channels_alpha_sort);
 		}
-		else if (sort_method == TRACK_SORT_LONGEST) {
+		else if (sort_method == TRACKING_DOPE_SORT_LONGEST) {
 			BLI_sortlist(&dopesheet->channels, channels_longest_segment_sort);
 		}
-		else if (sort_method == TRACK_SORT_TOTAL) {
+		else if (sort_method == TRACKING_DOPE_SORT_TOTAL) {
 			BLI_sortlist(&dopesheet->channels, channels_total_track_sort);
 		}
+		else if (sort_method == TRACKING_DOPE_SORT_AVERAGE_ERROR) {
+			BLI_sortlist(&dopesheet->channels, channels_average_error_sort);
+		}
 	}
-
-	dopesheet->sort_method = sort_method;
-	dopesheet->sort_inverse = inverse;
 }
 
 void BKE_tracking_dopesheet_tag_update(MovieTracking *tracking)
@@ -3256,35 +3659,50 @@ void BKE_tracking_dopesheet_tag_update(MovieTracking *tracking)
 	dopesheet->ok = FALSE;
 }
 
-void BKE_tracking_dopesheet_update(MovieTracking *tracking, int sort_method, int inverse)
+void BKE_tracking_dopesheet_update(MovieTracking *tracking)
 {
-	MovieTrackingObject *object = BKE_tracking_active_object(tracking);
+	MovieTrackingObject *object = BKE_tracking_object_get_active(tracking);
 	MovieTrackingDopesheet *dopesheet = &tracking->dopesheet;
 	MovieTrackingTrack *track;
-	ListBase *tracksbase = BKE_tracking_object_tracks(tracking, object);
+	MovieTrackingReconstruction *reconstruction;
+	ListBase *tracksbase = BKE_tracking_object_get_tracks(tracking, object);
+
+	short sort_method = dopesheet->sort_method;
+	short inverse = dopesheet->flag & TRACKING_DOPE_SORT_INVERSE;
+	short sel_only = dopesheet->flag & TRACKING_DOPE_SELECTED_ONLY;
+	short show_hidden = dopesheet->flag & TRACKING_DOPE_SHOW_HIDDEN;
 
-	if (dopesheet->ok) {
-		tracking_dopesheet_sort(tracking, sort_method, inverse);
+	if (dopesheet->ok)
 		return;
-	}
 
 	tracking_dopesheet_free(dopesheet);
 
+	reconstruction = BKE_tracking_object_get_reconstruction(tracking, object);
+
 	for (track = tracksbase->first; track; track = track->next) {
-		if (TRACK_SELECTED(track) && (track->flag & TRACK_HIDDEN) == 0) {
-			MovieTrackingDopesheetChannel *channel;
+		MovieTrackingDopesheetChannel *channel;
+
+		if (!show_hidden && (track->flag & TRACK_HIDDEN) != 0)
+			continue;
 
-			channel = MEM_callocN(sizeof(MovieTrackingDopesheetChannel), "tracking dopesheet channel");
-			channel->track = track;
+		if (sel_only && !TRACK_SELECTED(track))
+			continue;
 
-			channels_segments_calc(channel);
+		channel = MEM_callocN(sizeof(MovieTrackingDopesheetChannel), "tracking dopesheet channel");
+		channel->track = track;
 
-			BLI_addtail(&dopesheet->channels, channel);
-			dopesheet->tot_channel++;
+		if (reconstruction->flag & TRACKING_RECONSTRUCTED) {
+			BLI_snprintf(channel->name, sizeof(channel->name), "%s (%.4f)", track->name, track->error);
 		}
-	}
+		else {
+			BLI_strncpy(channel->name, track->name, sizeof(channel->name));
+		}
+
+		channels_segments_calc(channel);
 
-	dopesheet->sort_method = TRACK_SORT_NONE;
+		BLI_addtail(&dopesheet->channels, channel);
+		dopesheet->tot_channel++;
+	}
 
 	tracking_dopesheet_sort(tracking, sort_method, inverse);
 
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index 91e93bbd05d..40471514b48 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -1003,9 +1003,11 @@ void BKE_ffmpeg_end(void)
 	
 	fprintf(stderr, "Closing ffmpeg...\n");
 
-/*	if (audio_stream) { SEE UPPER
-        write_audio_frames();
-    }*/
+#if 0
+	if (audio_stream) { /* SEE UPPER */
+		write_audio_frames();
+	}
+#endif
 
 #ifdef WITH_AUDASPACE
 	if (audio_mixdown_device) {
diff --git a/source/blender/blenlib/BLI_boxpack2d.h b/source/blender/blenlib/BLI_boxpack2d.h
index 77e937d7b6f..3bc486054f5 100644
--- a/source/blender/blenlib/BLI_boxpack2d.h
+++ b/source/blender/blenlib/BLI_boxpack2d.h
@@ -43,7 +43,7 @@ typedef struct BoxPack {
 	
 	/* Verts this box uses
 	 * (BL,TR,TL,BR) / 0,1,2,3 */
-	struct boxVert *v[4];
+	struct BoxVert *v[4];
 } BoxPack;
 
 void BLI_box_pack_2D(BoxPack *boxarray, const int len, float *tot_width, float *tot_height);
diff --git a/source/blender/blenlib/BLI_ghash.h b/source/blender/blenlib/BLI_ghash.h
index 9034e8e51d9..c26e6cd15b3 100644
--- a/source/blender/blenlib/BLI_ghash.h
+++ b/source/blender/blenlib/BLI_ghash.h
@@ -70,6 +70,7 @@ void   BLI_ghash_free(GHash *gh, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfre
 void   BLI_ghash_insert(GHash *gh, void *key, void *val);
 void  *BLI_ghash_lookup(GHash *gh, const void *key);
 int    BLI_ghash_remove(GHash *gh, void *key, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfreefp);
+void  *BLI_ghash_pop(GHash *gh, void *key, GHashKeyFreeFP keyfreefp);
 int    BLI_ghash_haskey(GHash *gh, void *key);
 int    BLI_ghash_size(GHash *gh);
 
diff --git a/source/blender/blenlib/BLI_kdopbvh.h b/source/blender/blenlib/BLI_kdopbvh.h
index 7041c122ff9..5ec8247c03a 100644
--- a/source/blender/blenlib/BLI_kdopbvh.h
+++ b/source/blender/blenlib/BLI_kdopbvh.h
@@ -49,11 +49,15 @@ typedef struct BVHTreeOverlap {
 	int indexB;
 } BVHTreeOverlap;
 
+/* flags */
+#define BVH_ONQUAD (1<<0)
+
 typedef struct BVHTreeNearest {
 	int index;          /* the index of the nearest found (untouched if none is found within a dist radius from the given coordinates) */
 	float co[3];        /* nearest coordinates (untouched it none is found within a dist radius from the given coordinates) */
 	float no[3];        /* normal at nearest coordinates (untouched it none is found within a dist radius from the given coordinates) */
 	float dist;         /* squared distance to search arround */
+	int flags;
 } BVHTreeNearest;
 
 typedef struct BVHTreeRay {
@@ -67,6 +71,7 @@ typedef struct BVHTreeRayHit {
 	float co[3];        /* coordinates of the hit point */
 	float no[3];        /* normal on hit point */
 	float dist;         /* distance to the hit point */
+	int flags;
 } BVHTreeRayHit;
 
 /* callback must update nearest in case it finds a nearest result */
diff --git a/source/blender/blenlib/BLI_kdtree.h b/source/blender/blenlib/BLI_kdtree.h
index ae5e32d73eb..e90566408d4 100644
--- a/source/blender/blenlib/BLI_kdtree.h
+++ b/source/blender/blenlib/BLI_kdtree.h
@@ -50,17 +50,17 @@ KDTree *BLI_kdtree_new(int maxsize);
 void BLI_kdtree_free(KDTree *tree);
 
 /* Construction: first insert points, then call balance. Normal is optional. */
-void BLI_kdtree_insert(KDTree *tree, int index, float *co, float *nor);
+void BLI_kdtree_insert(KDTree *tree, int index, const float co[3], const float nor[3]);
 void BLI_kdtree_balance(KDTree *tree);
 
 /* Find nearest returns index, and -1 if no node is found.
  * Find n nearest returns number of points found, with results in nearest.
  * Normal is optional, but if given will limit results to points in normal direction from co. */
 int BLI_kdtree_find_nearest(KDTree *tree, float *co, float *nor, KDTreeNearest *nearest);
-int BLI_kdtree_find_n_nearest(KDTree *tree, int n, float *co, float *nor, KDTreeNearest *nearest);
+int BLI_kdtree_find_n_nearest(KDTree *tree, int n, const float co[3], const float nor[3], KDTreeNearest *nearest);
 
 /* Range search returns number of points found, with results in nearest */
 /* Normal is optional, but if given will limit results to points in normal direction from co. */
 /* Remember to free nearest after use! */
-int BLI_kdtree_range_search(KDTree *tree, float range, float *co, float *nor, KDTreeNearest **nearest);
+int BLI_kdtree_range_search(KDTree *tree, float range, const float co[3], const float nor[3], KDTreeNearest **nearest);
 #endif
diff --git a/source/blender/blenlib/BLI_lasso.h b/source/blender/blenlib/BLI_lasso.h
index 2360173c3b8..85a000b000c 100644
--- a/source/blender/blenlib/BLI_lasso.h
+++ b/source/blender/blenlib/BLI_lasso.h
@@ -35,7 +35,7 @@
 struct rcti;
 
 void BLI_lasso_boundbox(struct rcti *rect, int mcords[][2], short moves);
-int  BLI_lasso_is_point_inside(int mcords[][2], short moves, int sx, int sy, const int error_value);
+int  BLI_lasso_is_point_inside(int mcords[][2], short moves, const int sx, const int sy, const int error_value);
 int  BLI_lasso_is_edge_inside(int mcords[][2], short moves, int x0, int y0, int x1, int y1, const int error_value);
 
 #endif
diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h
index 02065c4b86f..b0e0d3cbf19 100644
--- a/source/blender/blenlib/BLI_math_base.h
+++ b/source/blender/blenlib/BLI_math_base.h
@@ -53,6 +53,9 @@
 #ifndef M_SQRT1_2
 #define M_SQRT1_2   0.70710678118654752440
 #endif
+#ifndef M_SQRT3
+#define M_SQRT3   1.7320508075688772
+#endif
 #ifndef M_1_PI
 #define M_1_PI      0.318309886183790671538
 #endif
@@ -135,7 +138,7 @@
 #endif
 
 #ifndef SWAP
-#  define SWAP(type, a, b)  { type sw_ap; sw_ap = (a); (a) = (b); (b) = sw_ap; }
+#  define SWAP(type, a, b)  { type sw_ap; sw_ap = (a); (a) = (b); (b) = sw_ap; } (void)0
 #endif
 
 #ifndef CLAMP
diff --git a/source/blender/blenlib/BLI_math_color.h b/source/blender/blenlib/BLI_math_color.h
index afdb5d40bd5..7520f09fe95 100644
--- a/source/blender/blenlib/BLI_math_color.h
+++ b/source/blender/blenlib/BLI_math_color.h
@@ -54,6 +54,7 @@ extern "C" {
 /******************* Conversion to RGB ********************/
 
 void hsv_to_rgb(float h, float s, float v, float *r, float *g, float *b);
+void hsv_to_rgb_v(const float hsv[3], float r_rgb[3]);
 void hex_to_rgb(char *hexcol, float *r, float *g, float *b);
 void yuv_to_rgb(float y, float u, float v, float *lr, float *lg, float *lb);
 void ycc_to_rgb(float y, float cb, float cr, float *lr, float *lg, float *lb, int colorspace);
@@ -65,14 +66,15 @@ void cpack_to_rgb(unsigned int col, float *r, float *g, float *b);
 void rgb_to_yuv(float r, float g, float b, float *ly, float *lu, float *lv);
 void rgb_to_ycc(float r, float g, float b, float *ly, float *lcb, float *lcr, int colorspace);
 void rgb_to_hsv(float r, float g, float b, float *lh, float *ls, float *lv);
+void rgb_to_hsv_v(const float rgb[3], float r_hsv[3]);
 void rgb_to_hsv_compat(float r, float g, float b, float *lh, float *ls, float *lv);
+void rgb_to_hsv_compat_v(const float rgb[3], float r_hsv[3]);
+void rgb_to_lab(float r, float g, float b, float *ll, float *la, float *lb);
+void rgb_to_xyz(float r, float g, float b, float *x, float *y, float *z);
 unsigned int rgb_to_cpack(float r, float g, float b);
 unsigned int hsv_to_cpack(float h, float s, float v);
 
-float rgb_to_grayscale(const float rgb[3]);
-unsigned char rgb_to_grayscale_byte(const unsigned char rgb[3]);
-float rgb_to_luma(const float rgb[3]);
-unsigned char rgb_to_luma_byte(const unsigned char rgb[3]);
+/* rgb_to_grayscale & rgb_to_luma functions moved to math_color_inline.c */
 
 /**************** Profile Transformations *****************/
 
@@ -109,6 +111,8 @@ void rgba_uchar_to_float(float col_r[4], const unsigned char col_ub[4]);
 void rgb_float_to_uchar(unsigned char col_r[3], const float col_f[3]);
 void rgba_float_to_uchar(unsigned char col_r[4], const float col_f[4]);
 
+void xyz_to_lab(float x, float y, float z, float *l, float *a, float *b);
+
 /***************** lift/gamma/gain / ASC-CDL conversion *****************/
 
 void lift_gamma_gain_to_asc_cdl(float *lift, float *gamma, float *gain, float *offset, float *slope, float *power);
diff --git a/source/blender/blenlib/BLI_math_geom.h b/source/blender/blenlib/BLI_math_geom.h
index 0560a3f6e64..93599dee63d 100644
--- a/source/blender/blenlib/BLI_math_geom.h
+++ b/source/blender/blenlib/BLI_math_geom.h
@@ -191,6 +191,9 @@ void barycentric_transform(float pt_tar[3], float const pt_src[3],
 void barycentric_weights_v2(const float v1[2], const float v2[2], const float v3[2],
                             const float co[2], float w[3]);
 
+int barycentric_coords_v2(const float v1[2], const float v2[2], const float v3[2], const float co[2], float w[3]);
+int barycentric_inside_triangle_v2(const float w[3]);
+
 void resolve_tri_uv(float r_uv[2], const float st[2], const float st0[2], const float st1[2], const float st2[2]);
 void resolve_quad_uv(float uv[2], const float st[2], const float st0[2], const float st1[2], const float st2[2], const float st3[2]);
 
diff --git a/source/blender/blenlib/BLI_math_vector.h b/source/blender/blenlib/BLI_math_vector.h
index 374da46a686..be492fb6fdd 100644
--- a/source/blender/blenlib/BLI_math_vector.h
+++ b/source/blender/blenlib/BLI_math_vector.h
@@ -87,6 +87,8 @@ MINLINE void add_v2_v2(float r[2], const float a[2]);
 MINLINE void add_v2_v2v2(float r[2], const float a[2], const float b[2]);
 MINLINE void add_v3_v3(float r[3], const float a[3]);
 MINLINE void add_v3_v3v3(float r[3], const float a[3], const float b[3]);
+MINLINE void add_v4_v4(float r[4], const float a[4]);
+MINLINE void add_v4_v4v4(float r[4], const float a[4], const float b[4]);
 
 MINLINE void sub_v2_v2(float r[2], const float a[2]);
 MINLINE void sub_v2_v2v2(float r[2], const float a[2], const float b[2]);
@@ -103,6 +105,7 @@ MINLINE void mul_v2_v2(float r[2], const float a[2]);
 MINLINE void mul_v3_v3(float r[3], const float a[3]);
 MINLINE void mul_v3_v3v3(float r[3], const float a[3], const float b[3]);
 MINLINE void mul_v4_fl(float r[4], float f);
+MINLINE void mul_v4_v4fl(float r[3], const float a[3], float f);
 
 MINLINE void madd_v3_v3fl(float r[3], const float a[3], float f);
 MINLINE void madd_v3_v3v3(float r[3], const float a[3], const float b[3]);
@@ -110,6 +113,7 @@ MINLINE void madd_v2_v2v2fl(float r[2], const float a[2], const float b[2], floa
 MINLINE void madd_v3_v3v3fl(float r[3], const float a[3], const float b[3], float f);
 MINLINE void madd_v3_v3v3v3(float r[3], const float a[3], const float b[3], const float c[3]);
 MINLINE void madd_v4_v4fl(float r[4], const float a[4], float f);
+MINLINE void madd_v4_v4v4(float r[4], const float a[4], const float b[4]);
 
 MINLINE void negate_v2(float r[2]);
 MINLINE void negate_v2_v2(float r[2], const float a[2]);
@@ -228,8 +232,12 @@ void mul_vn_fl(float *array_tar, const int size, const float f);
 void mul_vn_vn_fl(float *array_tar, const float *array_src, const int size, const float f);
 void add_vn_vn(float *array_tar, const float *array_src, const int size);
 void add_vn_vnvn(float *array_tar, const float *array_src_a, const float *array_src_b, const int size);
+void madd_vn_vn(float *array_tar, const float *array_src, const float f, const int size);
+void madd_vn_vnvn(float *array_tar, const float *array_src_a, const float *array_src_b, const float f, const int size);
 void sub_vn_vn(float *array_tar, const float *array_src, const int size);
 void sub_vn_vnvn(float *array_tar, const float *array_src_a, const float *array_src_b, const int size);
+void msub_vn_vn(float *array_tar, const float *array_src, const float f, const int size);
+void msub_vn_vnvn(float *array_tar, const float *array_src_a, const float *array_src_b, const float f, const int size);
 void fill_vn_i(int *array_tar, const int size, const int val);
 void fill_vn_ushort(unsigned short *array_tar, const int size, const unsigned short val);
 void fill_vn_fl(float *array_tar, const int size, const float val);
diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h
index 3664d7bcd77..74f5e7fc2bd 100644
--- a/source/blender/blenlib/BLI_path_util.h
+++ b/source/blender/blenlib/BLI_path_util.h
@@ -54,13 +54,11 @@ char *BLI_get_folder_version(const int id, const int ver, const int do_check);
 #define BLENDER_USER_CONFIG         31
 #define BLENDER_USER_DATAFILES      32
 #define BLENDER_USER_SCRIPTS        33
-#define BLENDER_USER_PLUGINS        34
-#define BLENDER_USER_AUTOSAVE       35
+#define BLENDER_USER_AUTOSAVE       34
 
 /* system */
 #define BLENDER_SYSTEM_DATAFILES    52
 #define BLENDER_SYSTEM_SCRIPTS      53
-#define BLENDER_SYSTEM_PLUGINS      54
 #define BLENDER_SYSTEM_PYTHON       54
 
 /* for BLI_get_folder_version only */
diff --git a/source/blender/blenlib/BLI_pbvh.h b/source/blender/blenlib/BLI_pbvh.h
index 8806721c044..6c0d547fe6f 100644
--- a/source/blender/blenlib/BLI_pbvh.h
+++ b/source/blender/blenlib/BLI_pbvh.h
@@ -82,10 +82,13 @@ void BLI_pbvh_search_gather(PBVH *bvh,
  * it's up to the callback to find the primitive within the leaves that is
  * hit first */
 
-void BLI_pbvh_raycast(PBVH * bvh, BLI_pbvh_HitOccludedCallback cb, void *data,
-                      float ray_start[3], float ray_normal[3], int original);
-int BLI_pbvh_node_raycast(PBVH * bvh, PBVHNode * node, float (*origco)[3],
-                          float ray_start[3], float ray_normal[3], float *dist);
+void BLI_pbvh_raycast(PBVH *bvh, BLI_pbvh_HitOccludedCallback cb, void *data,
+                      const float ray_start[3], const float ray_normal[3],
+                      int original);
+
+int BLI_pbvh_node_raycast(PBVH *bvh, PBVHNode *node, float (*origco)[3],
+                          const float ray_start[3], const float ray_normal[3],
+                          float *dist);
 
 /* Drawing */
 
@@ -211,7 +214,7 @@ void pbvh_vertex_iter_init(PBVH *bvh, PBVHNode *node,
 
 #define BLI_pbvh_vertex_iter_begin(bvh, node, vi, mode) \
 	pbvh_vertex_iter_init(bvh, node, &vi, mode); \
-	\
+	 \
 	for (vi.i = 0, vi.g = 0; vi.g < vi.totgrid; vi.g++) { \
 		if (vi.grids) { \
 			vi.width = vi.gridsize; \
diff --git a/source/blender/blenlib/BLI_string_cursor_utf8.h b/source/blender/blenlib/BLI_string_cursor_utf8.h
index 11c91aac6ac..3c38c0380e0 100644
--- a/source/blender/blenlib/BLI_string_cursor_utf8.h
+++ b/source/blender/blenlib/BLI_string_cursor_utf8.h
@@ -26,7 +26,7 @@
 #ifndef __BLI_STRING_CURSOR_UTF8_H__
 #define __BLI_STRING_CURSOR_UTF8_H__
 
-/** \file BLI_string_utf8.h
+/** \file BLI_string_cursor_utf8.h
  *  \ingroup bli
  */
 
diff --git a/source/blender/blenlib/BLI_threads.h b/source/blender/blenlib/BLI_threads.h
index b13da9f0dd4..fb8771722c1 100644
--- a/source/blender/blenlib/BLI_threads.h
+++ b/source/blender/blenlib/BLI_threads.h
@@ -136,6 +136,7 @@ void *BLI_thread_queue_pop(ThreadQueue *queue);
 void *BLI_thread_queue_pop_timeout(ThreadQueue *queue, int ms);
 int BLI_thread_queue_size(ThreadQueue *queue);
 
+void BLI_thread_queue_wait_finish(ThreadQueue *queue);
 void BLI_thread_queue_nowait(ThreadQueue *queue);
 
 #endif
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h
index d027a3da2ef..f761f2edcba 100644
--- a/source/blender/blenlib/BLI_utildefines.h
+++ b/source/blender/blenlib/BLI_utildefines.h
@@ -114,7 +114,7 @@
 /* some math and copy defines */
 
 #ifndef SWAP
-#  define SWAP(type, a, b)       { type sw_ap; sw_ap = (a); (a) = (b); (b) = sw_ap; }
+#  define SWAP(type, a, b)       { type sw_ap; sw_ap = (a); (a) = (b); (b) = sw_ap; } (void)0
 #endif
 
 #define ABS(a)          ( (a) < 0 ? (-(a)) : (a) )
@@ -148,29 +148,29 @@
 		*(v1) =   *(v2);                                                      \
 		*(v1 + 1) = *(v2 + 1);                                                \
 } (void)0
-#define VECADD(v1, v2, v3) {                                                   \
-		*(v1) =   *(v2)   + *(v3);                                             \
-		*(v1 + 1) = *(v2 + 1) + *(v3 + 1);                                     \
-		*(v1 + 2) = *(v2 + 2) + *(v3 + 2);                                     \
+#define VECADD(v1, v2, v3) {                                                  \
+		*(v1) =   *(v2)   + *(v3);                                            \
+		*(v1 + 1) = *(v2 + 1) + *(v3 + 1);                                    \
+		*(v1 + 2) = *(v2 + 2) + *(v3 + 2);                                    \
 } (void)0
-#define VECSUB(v1, v2, v3) {                                                   \
-		*(v1) =   *(v2)   - *(v3);                                             \
-		*(v1 + 1) = *(v2 + 1) - *(v3 + 1);                                     \
-		*(v1 + 2) = *(v2 + 2) - *(v3 + 2);                                     \
+#define VECSUB(v1, v2, v3) {                                                  \
+		*(v1) =   *(v2)   - *(v3);                                            \
+		*(v1 + 1) = *(v2 + 1) - *(v3 + 1);                                    \
+		*(v1 + 2) = *(v2 + 2) - *(v3 + 2);                                    \
 } (void)0
-#define VECSUB2D(v1, v2, v3)     {                                             \
-		*(v1) =   *(v2)   - *(v3);                                             \
-		*(v1 + 1) = *(v2 + 1) - *(v3 + 1);                                     \
+#define VECSUB2D(v1, v2, v3)     {                                            \
+		*(v1) =   *(v2)   - *(v3);                                            \
+		*(v1 + 1) = *(v2 + 1) - *(v3 + 1);                                    \
 } (void)0
-#define VECADDFAC(v1, v2, v3, fac) {                                           \
-		*(v1) =   *(v2)   + *(v3) * (fac);                                     \
-		*(v1 + 1) = *(v2 + 1) + *(v3 + 1) * (fac);                             \
-		*(v1 + 2) = *(v2 + 2) + *(v3 + 2) * (fac);                             \
+#define VECADDFAC(v1, v2, v3, fac) {                                          \
+		*(v1) =   *(v2)   + *(v3) * (fac);                                    \
+		*(v1 + 1) = *(v2 + 1) + *(v3 + 1) * (fac);                            \
+		*(v1 + 2) = *(v2 + 2) + *(v3 + 2) * (fac);                            \
 } (void)0
-#define VECSUBFAC(v1, v2, v3, fac) {                                           \
-		*(v1) =   *(v2)   - *(v3) * (fac);                                     \
-		*(v1 + 1) = *(v2 + 1) - *(v3 + 1) * (fac);                             \
-		*(v1 + 2) = *(v2 + 2) - *(v3 + 2) * (fac);                             \
+#define VECSUBFAC(v1, v2, v3, fac) {                                          \
+		*(v1) =   *(v2)   - *(v3) * (fac);                                    \
+		*(v1 + 1) = *(v2 + 1) - *(v3 + 1) * (fac);                            \
+		*(v1 + 2) = *(v2 + 2) - *(v3 + 2) * (fac);                            \
 } (void)0
 
 #define INPR(v1, v2) ( (v1)[0] * (v2)[0] + (v1)[1] * (v2)[1] + (v1)[2] * (v2)[2])
@@ -223,7 +223,7 @@
 #define SWITCH_SHORT(a) {                                                     \
 		char s_i, *p_i;                                                       \
 		p_i = (char *)&(a);                                                   \
-		s_i = p_i[0]; p_i[0] = p_i[1]; p_i[1] = s_i;                           \
+		s_i = p_i[0]; p_i[0] = p_i[1]; p_i[1] = s_i;                          \
 	} (void)0
 
 
diff --git a/source/blender/blenlib/BLI_voronoi.h b/source/blender/blenlib/BLI_voronoi.h
new file mode 100644
index 00000000000..a67b01c5175
--- /dev/null
+++ b/source/blender/blenlib/BLI_voronoi.h
@@ -0,0 +1,70 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2012 Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): Sergey Sharybin
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef __BLI_VORONOI_H__
+#define __BLI_VORONOI_H__
+
+struct ListBase;
+
+/** \file BLI_voronoi.h
+ *  \ingroup bli
+ */
+
+typedef struct VoronoiSite {
+	float co[2];
+	float color[3];
+} VoronoiSite;
+
+typedef struct VoronoiEdge {
+	struct VoronoiEdge *next, *prev;
+
+	float start[2], end[2];	/* start and end points */
+
+	/* this fields are used during diagram computation only */
+
+	float direction[2];		/* directional vector, from "start", points to "end", normal of |left, right| */
+
+	float left[2];			/* point on Voronoi place on the left side of edge */
+	float right[2];			/* point on Voronoi place on the right side of edge */
+
+	float f, g;				/* directional coeffitients satisfying equation y = f*x + g (edge lies on this line) */
+
+	/* some edges consist of two parts, so we add the pointer to another part to connect them at the end of an algorithm */
+	struct VoronoiEdge *neighbour;
+} VoronoiEdge;
+
+typedef struct VoronoiTriangulationPoint {
+	float co[2];
+	float color[3];
+	int power;
+} VoronoiTriangulationPoint;
+
+void BLI_voronoi_compute(const VoronoiSite *sites, int sites_total, int width, int height, struct ListBase *edges);
+
+void BLI_voronoi_triangulate(const VoronoiSite *sites, int sites_total, struct ListBase *edges, int width, int height,
+                             VoronoiTriangulationPoint **triangulated_points_r, int *triangulated_points_total_r,
+                             int (**triangles_r)[3], int *triangles_total_r);
+
+#endif /* __BLI_VORONOI_H__ */
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index d535e190314..ac7681e3be7 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -89,6 +89,7 @@ set(SRC
 	intern/time.c
 	intern/uvproject.c
 	intern/voxel.c
+	intern/voronoi.c
 	intern/winstuff.c
 
 	BLI_args.h
diff --git a/source/blender/blenlib/PIL_time.h b/source/blender/blenlib/PIL_time.h
index 6153007be80..288d2fe78e5 100644
--- a/source/blender/blenlib/PIL_time.h
+++ b/source/blender/blenlib/PIL_time.h
@@ -61,7 +61,7 @@ void    PIL_sleep_ms(int ms);
 		double _timeit_##var = PIL_check_seconds_timer();                     \
 		printf("time start (" #var "):  " AT "\n");                           \
 		fflush(stdout);                                                       \
-		{ (void)                                                              \
+		{ (void)0                                                             \
 
 
 #define TIMEIT_VALUE(var) (float)(PIL_check_seconds_timer() - _timeit_##var)
@@ -71,7 +71,7 @@ void    PIL_sleep_ms(int ms);
 	}                                                                         \
 	printf("time end   (" #var "): %.6f" "  " AT "\n",  TIMEIT_VALUE(var));   \
 	fflush(stdout);                                                           \
-} (void)                                                                      \
+} (void)0                                                                     \
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c
index 5cfde3dfb77..4bcedb06fb0 100644
--- a/source/blender/blenlib/intern/BLI_ghash.c
+++ b/source/blender/blenlib/intern/BLI_ghash.c
@@ -132,18 +132,14 @@ int BLI_ghash_remove(GHash *gh, void *key, GHashKeyFreeFP keyfreefp, GHashValFre
 		if (gh->cmpfp(key, e->key) == 0) {
 			Entry *n = e->next;
 
-			if (keyfreefp)
-				keyfreefp(e->key);
-			if (valfreefp)
-				valfreefp(e->val);
+			if (keyfreefp) keyfreefp(e->key);
+			if (valfreefp) valfreefp(e->val);
 			BLI_mempool_free(gh->entrypool, e);
 
 			/* correct but 'e' isn't used before return */
 			/* e= n; *//*UNUSED*/
-			if (p)
-				p->next = n;
-			else
-				gh->buckets[hash] = n;
+			if (p) p->next = n;
+			else   gh->buckets[hash] = n;
 
 			gh->nentries--;
 			return 1;
@@ -154,6 +150,36 @@ int BLI_ghash_remove(GHash *gh, void *key, GHashKeyFreeFP keyfreefp, GHashValFre
 	return 0;
 }
 
+/* same as above but return the value,
+ * no free value argument since it will be returned */
+void *BLI_ghash_pop(GHash *gh, void *key, GHashKeyFreeFP keyfreefp)
+{
+	unsigned int hash = gh->hashfp(key) % gh->nbuckets;
+	Entry *e;
+	Entry *p = NULL;
+
+	for (e = gh->buckets[hash]; e; e = e->next) {
+		if (gh->cmpfp(key, e->key) == 0) {
+			Entry *n = e->next;
+			void *value = e->val;
+
+			if (keyfreefp) keyfreefp(e->key);
+			BLI_mempool_free(gh->entrypool, e);
+
+			/* correct but 'e' isn't used before return */
+			/* e= n; *//*UNUSED*/
+			if (p) p->next = n;
+			else   gh->buckets[hash] = n;
+
+			gh->nentries--;
+			return value;
+		}
+		p = e;
+	}
+
+	return NULL;
+}
+
 int BLI_ghash_haskey(GHash *gh, void *key)
 {
 	unsigned int hash = gh->hashfp(key) % gh->nbuckets;
diff --git a/source/blender/blenlib/intern/BLI_heap.c b/source/blender/blenlib/intern/BLI_heap.c
index 0a281786100..c1175192434 100644
--- a/source/blender/blenlib/intern/BLI_heap.c
+++ b/source/blender/blenlib/intern/BLI_heap.c
@@ -63,7 +63,7 @@ struct Heap {
 	{                                                                            \
 		SWAP(int, heap->tree[i]->index, heap->tree[j]->index);                   \
 		SWAP(HeapNode *, heap->tree[i], heap->tree[j]);                          \
-	}
+	} (void)0
 
 /***/
 
diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c
index e9ee91505de..6a4ee64ebcd 100644
--- a/source/blender/blenlib/intern/BLI_kdopbvh.c
+++ b/source/blender/blenlib/intern/BLI_kdopbvh.c
@@ -139,7 +139,7 @@ static float KDOP_AXES[13][3] = {
 			else break;                                                       \
 		}                                                                     \
 		heap[child] = element;                                                \
-	}
+	} (void)0
 
 #define POP_HEAP_BODY(HEAP_TYPE, PRIORITY, heap, heap_size)                   \
 	{                                                                         \
@@ -158,7 +158,7 @@ static float KDOP_AXES[13][3] = {
 			parent = child2;                                                  \
 		}                                                                     \
 		heap[parent] = element;                                               \
-	}
+	} (void)0
 
 #if 0
 static int ADJUST_MEMORY(void *local_memblock, void **memblock, int new_size, int *max_size, int size_per_item)
diff --git a/source/blender/blenlib/intern/BLI_kdtree.c b/source/blender/blenlib/intern/BLI_kdtree.c
index 4878c0f05a6..a265505cc8f 100644
--- a/source/blender/blenlib/intern/BLI_kdtree.c
+++ b/source/blender/blenlib/intern/BLI_kdtree.c
@@ -38,7 +38,7 @@
 #include "BLI_kdtree.h"
 
 #ifndef SWAP
-#  define SWAP(type, a, b) { type sw_ap; sw_ap = (a); (a) = (b); (b) = sw_ap; }
+#  define SWAP(type, a, b) { type sw_ap; sw_ap = (a); (a) = (b); (b) = sw_ap; } (void)0
 #endif
 
 typedef struct KDTreeNode {
@@ -73,7 +73,7 @@ void BLI_kdtree_free(KDTree *tree)
 	}
 }
 
-void BLI_kdtree_insert(KDTree *tree, int index, float *co, float *nor)
+void BLI_kdtree_insert(KDTree *tree, int index, const float co[3], const float nor[3])
 {
 	KDTreeNode *node = &tree->nodes[tree->totnode++];
 
@@ -132,7 +132,7 @@ void BLI_kdtree_balance(KDTree *tree)
 	tree->root = kdtree_balance(tree->nodes, tree->totnode, 0);
 }
 
-static float squared_distance(const float v2[3], const float v1[3], float *UNUSED(n1), float *n2)
+static float squared_distance(const float v2[3], const float v1[3], const float *UNUSED(n1), const float *n2)
 {
 	float d[3], dist;
 
@@ -258,7 +258,7 @@ static void add_nearest(KDTreeNearest *ptn, int *found, int n, int index, float
 }
 
 /* finds the nearest n entries in tree to specified coordinates */
-int BLI_kdtree_find_n_nearest(KDTree *tree, int n, float *co, float *nor, KDTreeNearest *nearest)
+int BLI_kdtree_find_n_nearest(KDTree *tree, int n, const float co[3], const float nor[3], KDTreeNearest *nearest)
 {
 	KDTreeNode *root, *node = NULL;
 	KDTreeNode **stack, *defaultstack[100];
@@ -373,7 +373,7 @@ static void add_in_range(KDTreeNearest **ptn, int found, int *totfoundstack, int
 	to->dist = sqrt(dist);
 	copy_v3_v3(to->co, co);
 }
-int BLI_kdtree_range_search(KDTree *tree, float range, float *co, float *nor, KDTreeNearest **nearest)
+int BLI_kdtree_range_search(KDTree *tree, float range, const float co[3], const float nor[3], KDTreeNearest **nearest)
 {
 	KDTreeNode *root, *node = NULL;
 	KDTreeNode **stack, *defaultstack[100];
diff --git a/source/blender/blenlib/intern/boxpack2d.c b/source/blender/blenlib/intern/boxpack2d.c
index bf63517a4c2..feaa60b40b2 100644
--- a/source/blender/blenlib/intern/boxpack2d.c
+++ b/source/blender/blenlib/intern/boxpack2d.c
@@ -33,7 +33,7 @@
  * 
  * The defined Below are for internal use only */
 
-typedef struct boxVert {
+typedef struct BoxVert {
 	float x;
 	float y;
 	short free;
@@ -48,7 +48,7 @@ typedef struct boxVert {
 	struct BoxPack *isect_cache[4];
 
 	int index;
-} boxVert;
+} BoxVert;
 
 /* free vert flags */
 #define EPSILON 0.0000001f
@@ -121,11 +121,11 @@ static int box_areasort(const void *p1, const void *p2)
  * */
 static float box_width;
 static float box_height;
-static boxVert *vertarray;
+static BoxVert *vertarray;
 
 static int vertex_sort(const void *p1, const void *p2)
 {
-	boxVert *v1, *v2;
+	BoxVert *v1, *v2;
 	float a1, a2;
 
 	v1 = vertarray + ((int *)p1)[0];
@@ -154,7 +154,7 @@ static int vertex_sort(const void *p1, const void *p2)
  *  */
 void BLI_box_pack_2D(BoxPack *boxarray, const int len, float *tot_width, float *tot_height)
 {
-	boxVert *vert; /* the current vert */
+	BoxVert *vert; /* the current vert */
 	int box_index, verts_pack_len, i, j, k, isect;
 	int quad_flags[4] = {BLF, TRF, TLF, BRF}; /* use for looping */
 	BoxPack *box, *box_test; /*current box and another for intersection tests*/
@@ -170,38 +170,38 @@ void BLI_box_pack_2D(BoxPack *boxarray, const int len, float *tot_width, float *
 	qsort(boxarray, len, sizeof(BoxPack), box_areasort);
 
 	/* add verts to the boxes, these are only used internally  */
-	vert = vertarray = MEM_mallocN(len * 4 * sizeof(boxVert), "BoxPack Verts");
+	vert = vertarray = MEM_mallocN(len * 4 * sizeof(BoxVert), "BoxPack Verts");
 	vertex_pack_indices = MEM_mallocN(len * 3 * sizeof(int), "BoxPack Indices");
 
 	for (box = boxarray, box_index = 0, i = 0; box_index < len; box_index++, box++) {
 
 		vert->blb = vert->brb = vert->tlb =
-		        vert->isect_cache[0] = vert->isect_cache[1] =
-		        vert->isect_cache[2] = vert->isect_cache[3] = NULL;
+		            vert->isect_cache[0] = vert->isect_cache[1] =
+		            vert->isect_cache[2] = vert->isect_cache[3] = NULL;
 		vert->free = CORNERFLAGS & ~TRF;
 		vert->trb = box;
 		vert->index = i; i++;
 		box->v[BL] = vert; vert++;
 		
 		vert->trb = vert->brb = vert->tlb =
-		        vert->isect_cache[0] = vert->isect_cache[1] =
-		        vert->isect_cache[2] = vert->isect_cache[3] = NULL;
+		            vert->isect_cache[0] = vert->isect_cache[1] =
+		            vert->isect_cache[2] = vert->isect_cache[3] = NULL;
 		vert->free = CORNERFLAGS & ~BLF;
 		vert->blb = box;
 		vert->index = i; i++;
 		box->v[TR] = vert; vert++;
 		
 		vert->trb = vert->blb = vert->tlb =
-		        vert->isect_cache[0] = vert->isect_cache[1] =
-		        vert->isect_cache[2] = vert->isect_cache[3] = NULL;
+		            vert->isect_cache[0] = vert->isect_cache[1] =
+		            vert->isect_cache[2] = vert->isect_cache[3] = NULL;
 		vert->free = CORNERFLAGS & ~BRF;
 		vert->brb = box;
 		vert->index = i; i++;
 		box->v[TL] = vert; vert++;
 		
 		vert->trb = vert->blb = vert->brb =
-		        vert->isect_cache[0] = vert->isect_cache[1] =
-		        vert->isect_cache[2] = vert->isect_cache[3] = NULL;
+		            vert->isect_cache[0] = vert->isect_cache[1] =
+		            vert->isect_cache[2] = vert->isect_cache[3] = NULL;
 		vert->free = CORNERFLAGS & ~TLF;
 		vert->tlb = box; 
 		vert->index = i; i++;
diff --git a/source/blender/blenlib/intern/bpath.c b/source/blender/blenlib/intern/bpath.c
index 1aba8bbeaf2..f458c158fb2 100644
--- a/source/blender/blenlib/intern/bpath.c
+++ b/source/blender/blenlib/intern/bpath.c
@@ -417,7 +417,7 @@ void BLI_bpath_traverse_id(Main *bmain, ID *id, BPathVisitor visit_cb, const int
 				                   bpath_user_data);                           \
 			}                                                                  \
 		}                                                                      \
-	}                                                                          \
+	} (void)0
 
 
 			{
@@ -493,11 +493,6 @@ void BLI_bpath_traverse_id(Main *bmain, ID *id, BPathVisitor visit_cb, const int
 		case ID_TE:
 		{
 			Tex *tex = (Tex *)id;
-			if (tex->plugin) {
-				/* FIXME: rewrite_path assumes path length of FILE_MAX, but
-				 * tex->plugin->name is 160. ... is this field even a path? */
-				//rewrite_path(tex->plugin->name, visit_cb, bpath_user_data);
-			}
 			if (tex->type == TEX_VOXELDATA && TEX_VD_IS_SOURCE_PATH(tex->vd->file_format)) {
 				rewrite_path_fixed(tex->vd->source_path, visit_cb, absbase, bpath_user_data);
 			}
@@ -513,11 +508,11 @@ void BLI_bpath_traverse_id(Main *bmain, ID *id, BPathVisitor visit_cb, const int
 				SEQ_BEGIN(scene->ed, seq)
 				{
 					if (SEQ_HAS_PATH(seq)) {
-						if (ELEM(seq->type, SEQ_MOVIE, SEQ_SOUND)) {
+						if (ELEM(seq->type, SEQ_TYPE_MOVIE, SEQ_TYPE_SOUND_RAM)) {
 							rewrite_path_fixed_dirfile(seq->strip->dir, seq->strip->stripdata->name,
 							                           visit_cb, absbase, bpath_user_data);
 						}
-						else if (seq->type == SEQ_IMAGE) {
+						else if (seq->type == SEQ_TYPE_IMAGE) {
 							/* might want an option not to loop over all strips */
 							StripElem *se = seq->strip->stripdata;
 							int len = MEM_allocN_len(se) / sizeof(*se);
@@ -538,9 +533,6 @@ void BLI_bpath_traverse_id(Main *bmain, ID *id, BPathVisitor visit_cb, const int
 							rewrite_path_fixed(seq->strip->dir, visit_cb, absbase, bpath_user_data);
 						}
 					}
-					else if (seq->plugin) {
-						rewrite_path_fixed(seq->plugin->name, visit_cb, absbase, bpath_user_data);
-					}
 
 				}
 				SEQ_END
diff --git a/source/blender/blenlib/intern/edgehash.c b/source/blender/blenlib/intern/edgehash.c
index cdaf270adcb..d58ccbbd48e 100644
--- a/source/blender/blenlib/intern/edgehash.c
+++ b/source/blender/blenlib/intern/edgehash.c
@@ -56,7 +56,7 @@ static unsigned int _ehash_hashsizes[] = {
 		v0 ^= v1;        \
 		v1 ^= v0;        \
 		v0 ^= v1;        \
-	}
+	} (void)0
 
 /***/
 
diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c
index e6d06484e74..ec7b59702bd 100644
--- a/source/blender/blenlib/intern/fileops.c
+++ b/source/blender/blenlib/intern/fileops.c
@@ -385,16 +385,16 @@ int BLI_rename(const char *from, const char *to)
 
 enum {
 	/* operation succeeded succeeded */
-	recursiveOp_Callback_OK = 0,
+	RecursiveOp_Callback_OK = 0,
 
 	/* operation requested not to perform recursive digging for current path */
-	recursiveOp_Callback_StopRecurs = 1,
+	RecursiveOp_Callback_StopRecurs = 1,
 
 	/* error occured in callback and recursive walking should stop immediately */
-	recursiveOp_Callback_Error = 2
+	RecursiveOp_Callback_Error = 2
 } recuresiveOp_Callback_Result;
 
-typedef int (*recursiveOp_Callback)(const char *from, const char *to);
+typedef int (*RecursiveOp_Callback)(const char *from, const char *to);
 
 /* appending of filename to dir (ensures for buffer size before appending) */
 static void join_dirfile_alloc(char **dst, size_t *alloc_len, const char *dir, const char *file)
@@ -419,8 +419,8 @@ static char *strip_last_slash(const char *dir)
 	return result;
 }
 
-static int recursive_operation(const char *startfrom, const char *startto, recursiveOp_Callback callback_dir_pre,
-                               recursiveOp_Callback callback_file, recursiveOp_Callback callback_dir_post)
+static int recursive_operation(const char *startfrom, const char *startto, RecursiveOp_Callback callback_dir_pre,
+                               RecursiveOp_Callback callback_file, RecursiveOp_Callback callback_dir_post)
 {
 	struct dirent **dirlist;
 	struct stat st;
@@ -446,7 +446,7 @@ static int recursive_operation(const char *startfrom, const char *startto, recur
 		if (callback_file) {
 			ret = callback_file(from, to);
 
-			if (ret != recursiveOp_Callback_OK)
+			if (ret != RecursiveOp_Callback_OK)
 				ret = -1;
 		}
 
@@ -472,11 +472,11 @@ static int recursive_operation(const char *startfrom, const char *startto, recur
 		/* call pre-recursive walking directory callback */
 		ret = callback_dir_pre(from, to);
 
-		if (ret != recursiveOp_Callback_OK) {
+		if (ret != RecursiveOp_Callback_OK) {
 			MEM_freeN(from);
 			if (to) free(to);
 
-			if (ret == recursiveOp_Callback_StopRecurs) {
+			if (ret == RecursiveOp_Callback_StopRecurs) {
 				/* callback requested not to perform recursive walking, not an error */
 				return 0;
 			}
@@ -505,7 +505,7 @@ static int recursive_operation(const char *startfrom, const char *startto, recur
 		else if (callback_file) {
 			/* call file callback for current path */
 			ret = callback_file(from_path, to_path);
-			if (ret != recursiveOp_Callback_OK)
+			if (ret != RecursiveOp_Callback_OK)
 				ret = -1;
 		}
 
@@ -522,7 +522,7 @@ static int recursive_operation(const char *startfrom, const char *startto, recur
 		if (callback_dir_post) {
 			/* call post-recursive directory callback */
 			ret = callback_dir_post(from, to);
-			if (ret != recursiveOp_Callback_OK)
+			if (ret != RecursiveOp_Callback_OK)
 				ret = -1;
 		}
 	}
@@ -541,10 +541,10 @@ static int delete_callback_post(const char *from, const char *UNUSED(to))
 	if (rmdir(from)) {
 		perror("rmdir");
 
-		return recursiveOp_Callback_Error;
+		return RecursiveOp_Callback_Error;
 	}
 
-	return recursiveOp_Callback_OK;
+	return RecursiveOp_Callback_OK;
 }
 
 static int delete_single_file(const char *from, const char *UNUSED(to))
@@ -552,10 +552,10 @@ static int delete_single_file(const char *from, const char *UNUSED(to))
 	if (unlink(from)) {
 		perror("unlink");
 
-		return recursiveOp_Callback_Error;
+		return RecursiveOp_Callback_Error;
 	}
 
-	return recursiveOp_Callback_OK;
+	return RecursiveOp_Callback_OK;
 }
 
 FILE *BLI_fopen(const char *filename, const char *mode)
@@ -628,27 +628,27 @@ static int copy_callback_pre(const char *from, const char *to)
 
 	if (check_the_same(from, to)) {
 		fprintf(stderr, "%s: '%s' is the same as '%s'\n", __func__, from, to);
-		return recursiveOp_Callback_Error;
+		return RecursiveOp_Callback_Error;
 	}
 
 	if (lstat(from, &st)) {
 		perror("stat");
-		return recursiveOp_Callback_Error;
+		return RecursiveOp_Callback_Error;
 	}
 
 	/* create a directory */
 	if (mkdir(to, st.st_mode)) {
 		perror("mkdir");
-		return recursiveOp_Callback_Error;
+		return RecursiveOp_Callback_Error;
 	}
 
 	/* set proper owner and group on new directory */
 	if (chown(to, st.st_uid, st.st_gid)) {
 		perror("chown");
-		return recursiveOp_Callback_Error;
+		return RecursiveOp_Callback_Error;
 	}
 
-	return recursiveOp_Callback_OK;
+	return RecursiveOp_Callback_OK;
 }
 
 static int copy_single_file(const char *from, const char *to)
@@ -660,12 +660,12 @@ static int copy_single_file(const char *from, const char *to)
 
 	if (check_the_same(from, to)) {
 		fprintf(stderr, "%s: '%s' is the same as '%s'\n", __func__, from, to);
-		return recursiveOp_Callback_Error;
+		return RecursiveOp_Callback_Error;
 	}
 
 	if (lstat(from, &st)) {
 		perror("lstat");
-		return recursiveOp_Callback_Error;
+		return RecursiveOp_Callback_Error;
 	}
 
 	if (S_ISLNK(st.st_mode)) {
@@ -690,7 +690,7 @@ static int copy_single_file(const char *from, const char *to)
 
 			if (need_free) MEM_freeN(link_buffer);
 
-			return recursiveOp_Callback_Error;
+			return RecursiveOp_Callback_Error;
 		}
 
 		link_buffer[link_len] = 0;
@@ -698,13 +698,13 @@ static int copy_single_file(const char *from, const char *to)
 		if (symlink(link_buffer, to)) {
 			perror("symlink");
 			if (need_free) MEM_freeN(link_buffer);
-			return recursiveOp_Callback_Error;
+			return RecursiveOp_Callback_Error;
 		}
 
 		if (need_free)
 			MEM_freeN(link_buffer);
 
-		return recursiveOp_Callback_OK;
+		return RecursiveOp_Callback_OK;
 	}
 	else if (S_ISCHR(st.st_mode) ||
 	         S_ISBLK(st.st_mode) ||
@@ -714,30 +714,30 @@ static int copy_single_file(const char *from, const char *to)
 		/* copy special type of file */
 		if (mknod(to, st.st_mode, st.st_rdev)) {
 			perror("mknod");
-			return recursiveOp_Callback_Error;
+			return RecursiveOp_Callback_Error;
 		}
 
 		if (set_permissions(to, &st))
-			return recursiveOp_Callback_Error;
+			return RecursiveOp_Callback_Error;
 
-		return recursiveOp_Callback_OK;
+		return RecursiveOp_Callback_OK;
 	}
 	else if (!S_ISREG(st.st_mode)) {
 		fprintf(stderr, "Copying of this kind of files isn't supported yet\n");
-		return recursiveOp_Callback_Error;
+		return RecursiveOp_Callback_Error;
 	}
 
 	from_stream = fopen(from, "rb");
 	if (!from_stream) {
 		perror("fopen");
-		return recursiveOp_Callback_Error;
+		return RecursiveOp_Callback_Error;
 	}
 
 	to_stream = fopen(to, "wb");
 	if (!to_stream) {
 		perror("fopen");
 		fclose(from_stream);
-		return recursiveOp_Callback_Error;
+		return RecursiveOp_Callback_Error;
 	}
 
 	while ((len = fread(buf, 1, sizeof(buf), from_stream)) > 0) {
@@ -748,9 +748,9 @@ static int copy_single_file(const char *from, const char *to)
 	fclose(from_stream);
 
 	if (set_permissions(to, &st))
-		return recursiveOp_Callback_Error;
+		return RecursiveOp_Callback_Error;
 
-	return recursiveOp_Callback_OK;
+	return RecursiveOp_Callback_OK;
 }
 
 static int move_callback_pre(const char *from, const char *to)
@@ -760,7 +760,7 @@ static int move_callback_pre(const char *from, const char *to)
 	if (ret)
 		return copy_callback_pre(from, to);
 
-	return recursiveOp_Callback_StopRecurs;
+	return RecursiveOp_Callback_StopRecurs;
 }
 
 static int move_single_file(const char *from, const char *to)
@@ -770,7 +770,7 @@ static int move_single_file(const char *from, const char *to)
 	if (ret)
 		return copy_single_file(from, to);
 
-	return recursiveOp_Callback_OK;
+	return RecursiveOp_Callback_OK;
 }
 
 int BLI_move(const char *file, const char *to)
diff --git a/source/blender/blenlib/intern/fnmatch.c b/source/blender/blenlib/intern/fnmatch.c
index e29f31897c0..60e898a3f19 100644
--- a/source/blender/blenlib/intern/fnmatch.c
+++ b/source/blender/blenlib/intern/fnmatch.c
@@ -25,8 +25,8 @@
 #endif
 
 #include <errno.h>
-#include <BLI_fnmatch.h>
 #include <ctype.h>
+#include "BLI_fnmatch.h"
 
 
 /* Comment out all this code if we are using the GNU C Library, and are not
diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c
index da07bb156d7..ef2eb25a891 100644
--- a/source/blender/blenlib/intern/freetypefont.c
+++ b/source/blender/blenlib/intern/freetypefont.c
@@ -614,7 +614,7 @@ font driver produces such outlines.
    #               \
 					#
 
-	 Two "on" points
+     Two "on" points
    and two "cubic" point
 	  between them
 
diff --git a/source/blender/blenlib/intern/math_color.c b/source/blender/blenlib/intern/math_color.c
index abd9c1ea5b8..b93597bf107 100644
--- a/source/blender/blenlib/intern/math_color.c
+++ b/source/blender/blenlib/intern/math_color.c
@@ -90,6 +90,12 @@ void hsv_to_rgb(float h, float s, float v, float *r, float *g, float *b)
 	}
 }
 
+/* convenience function for now */
+void hsv_to_rgb_v(const float hsv[3], float r_rgb[3])
+{
+	hsv_to_rgb(hsv[0], hsv[1], hsv[2], &r_rgb[0], &r_rgb[1], &r_rgb[2]);
+}
+
 void rgb_to_yuv(float r, float g, float b, float *ly, float *lu, float *lv)
 {
 	float y, u, v;
@@ -252,6 +258,41 @@ void rgb_to_hsv(float r, float g, float b, float *lh, float *ls, float *lv)
 	*lv = v;
 }
 
+/* convenience function for now */
+void rgb_to_hsv_v(const float rgb[3], float r_hsv[3])
+{
+	rgb_to_hsv(rgb[0], rgb[1], rgb[2], &r_hsv[0], &r_hsv[1], &r_hsv[2]);
+}
+
+void rgb_to_hsl(float r, float g, float b, float *lh, float *ls, float *ll)
+{
+	float cmax = MAX3(r, g, b);
+	float cmin = MIN3(r, g, b);
+	float h, s, l = (cmax + cmin) / 2.0f;
+
+	if (cmax == cmin) {
+		h = s = 0.0f; // achromatic
+	}
+	else {
+		float d = cmax - cmin;
+		s = l > 0.5f ? d / (2.0f - cmax - cmin) : d / (cmax + cmin);
+		if (cmax == r) {
+			h = (g - b) / d + (g < b ? 6.0f : 0.0f);
+		}
+		else if (cmax == g) {
+			h = (b - r) / d + 2.0f;
+		}
+		else {
+			h = (r - g) / d + 4.0f;
+		}
+	}
+	h /= 6.0f;
+
+	*lh = h;
+	*ls = s;
+	*ll = l;
+}
+
 void rgb_to_hsv_compat(float r, float g, float b, float *lh, float *ls, float *lv)
 {
 	float orig_h = *lh;
@@ -272,6 +313,12 @@ void rgb_to_hsv_compat(float r, float g, float b, float *lh, float *ls, float *l
 	}
 }
 
+/* convenience function for now */
+void rgb_to_hsv_compat_v(const float rgb[3], float r_hsv[3])
+{
+	rgb_to_hsv_compat(rgb[0], rgb[1], rgb[2], &r_hsv[0], &r_hsv[1], &r_hsv[2]);
+}
+
 /*http://brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html */
 
 void xyz_to_rgb(float xc, float yc, float zc, float *r, float *g, float *b, int colorspace)
@@ -334,15 +381,9 @@ unsigned int rgb_to_cpack(float r, float g, float b)
 
 void cpack_to_rgb(unsigned int col, float *r, float *g, float *b)
 {
-
-	*r = (float)((col) & 0xFF);
-	*r /= 255.0f;
-
-	*g = (float)(((col) >> 8) & 0xFF);
-	*g /= 255.0f;
-
-	*b = (float)(((col) >> 16) & 0xFF);
-	*b /= 255.0f;
+	*r = ((float)(((col)      ) & 0xFF)) * (1.0f / 255.0f);
+	*g = ((float)(((col) >>  8) & 0xFF)) * (1.0f / 255.0f);
+	*b = ((float)(((col) >> 16) & 0xFF)) * (1.0f / 255.0f);
 }
 
 void rgb_uchar_to_float(float col_r[3], const unsigned char col_ub[3])
@@ -449,26 +490,6 @@ int constrain_rgb(float *r, float *g, float *b)
 	return 0; /* Color within RGB gamut */
 }
 
-float rgb_to_grayscale(const float rgb[3])
-{
-	return 0.3f * rgb[0] + 0.58f * rgb[1] + 0.12f * rgb[2];
-}
-
-unsigned char rgb_to_grayscale_byte(const unsigned char rgb[3])
-{
-	return (76 * (unsigned short) rgb[0] + 148 * (unsigned short) rgb[1] + 31 * (unsigned short) rgb[2]) / 255;
-}
-
-float rgb_to_luma(const float rgb[3])
-{
-	return 0.299f * rgb[0] + 0.587f * rgb[1] + 0.114f * rgb[2];
-}
-
-unsigned char rgb_to_luma_byte(const unsigned char rgb[3])
-{
-	return (76 * (unsigned short) rgb[0] + 150 * (unsigned short) rgb[1] + 29 * (unsigned short) rgb[2]) / 255;
-}
-
 /* ********************************* lift/gamma/gain / ASC-CDL conversion ********************************* */
 
 void lift_gamma_gain_to_asc_cdl(float *lift, float *gamma, float *gain, float *offset, float *slope, float *power)
@@ -585,3 +606,58 @@ void BLI_init_srgb_conversion(void)
 		BLI_color_to_srgb_table[i] = b * 0x100;
 	}
 }
+static float inverse_srgb_companding(float v)
+{
+	if (v > 0.04045f) {
+		return powf((v + 0.055f) / 1.055f, 2.4);
+	}
+	else {
+		return v / 12.92f;
+	}
+}
+
+void rgb_to_xyz(float r, float g, float b, float *x, float *y, float *z)
+{
+	r = inverse_srgb_companding(r) * 100.0f;
+	g = inverse_srgb_companding(g) * 100.0f;
+	b = inverse_srgb_companding(b) * 100.0f;
+
+	*x = r * 0.412453f + g * 0.357580f + b * 0.180423f;
+	*y = r * 0.212671f + g * 0.715160f + b * 0.072169f;
+	*z = r * 0.019334f + g * 0.119193f + b * 0.950227f;
+}
+
+static float xyz_to_lab_component(float v)
+{
+	const float eps = 0.008856f;
+	const float k = 903.3f;
+
+	if (v > eps) {
+		return pow(v, 1.0f / 3.0f);
+	}
+	else {
+		return (k * v + 16.0f) / 116.0f;
+	}
+}
+
+void xyz_to_lab(float x, float y, float z, float *l, float *a, float *b)
+{
+	float xr = x / 95.047f;
+	float yr = y / 100.0f;
+	float zr = z / 108.883f;
+
+	float fx = xyz_to_lab_component(xr);
+	float fy = xyz_to_lab_component(yr);
+	float fz = xyz_to_lab_component(zr);
+
+	*l = 116.0f * fy - 16.0f;
+	*a = 500.0f * (fx - fy);
+	*b = 200.0f * (fy - fz);
+}
+
+void rgb_to_lab(float r, float g, float b, float *ll, float *la, float *lb)
+{
+	float x, y, z;
+	rgb_to_xyz(r, g, b, &x, &y, &z);
+	xyz_to_lab(x, y, z, ll, la, lb);
+}
diff --git a/source/blender/blenlib/intern/math_color_inline.c b/source/blender/blenlib/intern/math_color_inline.c
index 243e9fc8a57..417c557af8a 100644
--- a/source/blender/blenlib/intern/math_color_inline.c
+++ b/source/blender/blenlib/intern/math_color_inline.c
@@ -215,4 +215,44 @@ MINLINE void rgba_char_args_test_set(char col[4], const char r, const char g, co
 	}
 }
 
+MINLINE void cpack_cpy_3ub(unsigned char r_col[3], const unsigned int pack)
+{
+	r_col[0] = ((pack) >>  0) & 0xFF;
+	r_col[1] = ((pack) >>  8) & 0xFF;
+	r_col[2] = ((pack) >> 16) & 0xFF;
+}
+
+
+MINLINE float rgb_to_grayscale(const float rgb[3])
+{
+	return 0.3f * rgb[0] + 0.58f * rgb[1] + 0.12f * rgb[2];
+}
+
+MINLINE unsigned char rgb_to_grayscale_byte(const unsigned char rgb[3])
+{
+	return (76 * (unsigned short) rgb[0] + 148 * (unsigned short) rgb[1] + 31 * (unsigned short) rgb[2]) / 255;
+}
+
+MINLINE float rgb_to_luma(const float rgb[3])
+{
+	return 0.299f * rgb[0] + 0.587f * rgb[1] + 0.114f * rgb[2];
+}
+
+MINLINE unsigned char rgb_to_luma_byte(const unsigned char rgb[3])
+{
+	return (76 * (unsigned short) rgb[0] + 150 * (unsigned short) rgb[1] + 29 * (unsigned short) rgb[2]) / 255;
+}
+
+/* gamma-corrected RGB --> CIE XYZ
+ * for this function we only get the Y component
+ * see: http://software.intel.com/sites/products/documentation/hpc/ipp/ippi/ippi_ch6/ch6_color_models.html
+ *
+ * also known as:
+ * luminance rec. 709 */
+MINLINE float rgb_to_luma_y(const float rgb[3])
+{
+	return 0.212671f * rgb[0] + 0.71516f * rgb[1] + 0.072169f * rgb[2];
+}
+
+
 #endif /* __MATH_COLOR_INLINE_C__ */
diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c
index 3962f53862d..d35624e84d2 100644
--- a/source/blender/blenlib/intern/math_geom.c
+++ b/source/blender/blenlib/intern/math_geom.c
@@ -1825,6 +1825,45 @@ void interp_weights_face_v3(float w[4], const float v1[3], const float v2[3], co
 	}
 }
 
+/* return 1 of point is inside triangle, 2 if it's on the edge, 0 if point is outside of triangle */
+int barycentric_inside_triangle_v2(const float w[3])
+{
+	if (IN_RANGE(w[0], 0.0f, 1.0f) &&
+	    IN_RANGE(w[1], 0.0f, 1.0f) &&
+	    IN_RANGE(w[2], 0.0f, 1.0f))
+	{
+		return 1;
+	}
+	else if (IN_RANGE_INCL(w[0], 0.0f, 1.0f) &&
+	         IN_RANGE_INCL(w[1], 0.0f, 1.0f) &&
+	         IN_RANGE_INCL(w[2], 0.0f, 1.0f))
+	{
+		return 2;
+	}
+
+	return 0;
+}
+
+/* returns 0 for degenerated triangles */
+int barycentric_coords_v2(const float v1[2], const float v2[2], const float v3[2], const float co[2], float w[3])
+{
+	float x = co[0], y = co[1];
+	float x1 = v1[0], y1 = v1[1];
+	float x2 = v2[0], y2 = v2[1];
+	float x3 = v3[0], y3 = v3[1];
+	float det = (y2 - y3) * (x1 - x3) + (x3 - x2) * (y1 - y3);
+
+	if (fabsf(det) > FLT_EPSILON) {
+		w[0] = ((y2 - y3) * (x - x3) + (x3 - x2) * (y - y3)) / det;
+		w[1] = ((y3 - y1) * (x - x3) + (x1 - x3) * (y - y3)) / det;
+		w[2] = 1.0f - w[0] - w[1];
+
+	return 1;
+	}
+
+	return 0;
+}
+
 /* used by projection painting
  * note: using area_tri_signed_v2 means locations outside the triangle are correctly weighted */
 void barycentric_weights_v2(const float v1[2], const float v2[2], const float v3[2], const float co[2], float w[3])
diff --git a/source/blender/blenlib/intern/math_vector.c b/source/blender/blenlib/intern/math_vector.c
index 90e6a4cb945..d939576904e 100644
--- a/source/blender/blenlib/intern/math_vector.c
+++ b/source/blender/blenlib/intern/math_vector.c
@@ -550,6 +550,27 @@ void add_vn_vnvn(float *array_tar, const float *array_src_a, const float *array_
 	}
 }
 
+void madd_vn_vn(float *array_tar, const float *array_src, const float f, const int size)
+{
+	float *tar = array_tar + (size - 1);
+	const float *src = array_src + (size - 1);
+	int i = size;
+	while (i--) {
+		*(tar--) += *(src--) * f;
+	}
+}
+
+void madd_vn_vnvn(float *array_tar, const float *array_src_a, const float *array_src_b, const float f, const int size)
+{
+	float *tar = array_tar + (size - 1);
+	const float *src_a = array_src_a + (size - 1);
+	const float *src_b = array_src_b + (size - 1);
+	int i = size;
+	while (i--) {
+		*(tar--) = *(src_a--) + (*(src_b--) * f);
+	}
+}
+
 void sub_vn_vn(float *array_tar, const float *array_src, const int size)
 {
 	float *tar = array_tar + (size - 1);
@@ -571,6 +592,27 @@ void sub_vn_vnvn(float *array_tar, const float *array_src_a, const float *array_
 	}
 }
 
+void msub_vn_vn(float *array_tar, const float *array_src, const float f, const int size)
+{
+	float *tar = array_tar + (size - 1);
+	const float *src = array_src + (size - 1);
+	int i = size;
+	while (i--) {
+		*(tar--) -= *(src--) * f;
+	}
+}
+
+void msub_vn_vnvn(float *array_tar, const float *array_src_a, const float *array_src_b, const float f, const int size)
+{
+	float *tar = array_tar + (size - 1);
+	const float *src_a = array_src_a + (size - 1);
+	const float *src_b = array_src_b + (size - 1);
+	int i = size;
+	while (i--) {
+		*(tar--) = *(src_a--) - (*(src_b--) * f);
+	}
+}
+
 void fill_vn_i(int *array_tar, const int size, const int val)
 {
 	int *tar = array_tar + (size - 1);
diff --git a/source/blender/blenlib/intern/math_vector_inline.c b/source/blender/blenlib/intern/math_vector_inline.c
index 56188048c02..e89b2ece467 100644
--- a/source/blender/blenlib/intern/math_vector_inline.c
+++ b/source/blender/blenlib/intern/math_vector_inline.c
@@ -272,6 +272,22 @@ MINLINE void add_v3_v3v3(float r[3], const float a[3], const float b[3])
 	r[2] = a[2] + b[2];
 }
 
+MINLINE void add_v4_v4(float r[4], const float a[4])
+{
+	r[0] += a[0];
+	r[1] += a[1];
+	r[2] += a[2];
+	r[3] += a[3];
+}
+
+MINLINE void add_v4_v4v4(float r[4], const float a[4], const float b[4])
+{
+	r[0] = a[0] + b[0];
+	r[1] = a[1] + b[1];
+	r[2] = a[2] + b[2];
+	r[3] = a[3] + b[3];
+}
+
 MINLINE void sub_v2_v2(float r[2], const float a[2])
 {
 	r[0] -= a[0];
@@ -361,6 +377,14 @@ MINLINE void mul_v4_fl(float r[4], float f)
 	r[3] *= f;
 }
 
+MINLINE void mul_v4_v4fl(float r[4], const float a[4], float f)
+{
+	r[0] = a[0] * f;
+	r[1] = a[1] * f;
+	r[2] = a[2] * f;
+	r[3] = a[3] * f;
+}
+
 MINLINE void madd_v2_v2fl(float r[2], const float a[2], float f)
 {
 	r[0] += a[0] * f;
@@ -409,6 +433,14 @@ MINLINE void madd_v4_v4fl(float r[4], const float a[4], float f)
 	r[3] += a[3] * f;
 }
 
+MINLINE void madd_v4_v4v4(float r[4], const float a[4], const float b[4])
+{
+	r[0] += a[0] * b[0];
+	r[1] += a[1] * b[1];
+	r[2] += a[2] * b[2];
+	r[3] += a[3] * b[3];
+}
+
 MINLINE void mul_v3_v3v3(float r[3], const float v1[3], const float v2[3])
 {
 	r[0] = v1[0] * v2[0];
diff --git a/source/blender/blenlib/intern/noise.c b/source/blender/blenlib/intern/noise.c
index cad4addc87b..2ff0b564592 100644
--- a/source/blender/blenlib/intern/noise.c
+++ b/source/blender/blenlib/intern/noise.c
@@ -992,7 +992,7 @@ static float g[512 + 2][3] = {
 		b1 = (b0 + 1) & 255;                                                  \
 		r0 = t - floorf(t);                                                   \
 		r1 = r0 - 1.0f;                                                       \
-	}
+	} (void)0
 
 
 static float noise3_perlin(float vec[3])
@@ -1134,15 +1134,18 @@ static float turbulencep(float noisesize, float x, float y, float z, int nr)
 /* Camberra omitted, didn't seem useful */
 
 /* distance squared */
-static float dist_Squared(float x, float y, float z, float e) {
+static float dist_Squared(float x, float y, float z, float e)
+{
 	(void)e; return (x * x + y * y + z * z);
 }
 /* real distance */
-static float dist_Real(float x, float y, float z, float e) {
+static float dist_Real(float x, float y, float z, float e)
+{
 	(void)e; return sqrtf(x * x + y * y + z * z);
 }
 /* manhattan/taxicab/cityblock distance */
-static float dist_Manhattan(float x, float y, float z, float e) {
+static float dist_Manhattan(float x, float y, float z, float e)
+{
 	(void)e; return (fabsf(x) + fabsf(y) + fabsf(z));
 }
 /* Chebychev */
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index 3c7e66f280a..1bda7b5ee7e 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -98,7 +98,7 @@ int BLI_stringdec(const char *string, char *head, char *tail, unsigned short *nu
 	if (lslash)
 		lenlslash = (int)(lslash - string);
 
-	while (len > lenlslash && string[--len] != '.') {};
+	while (len > lenlslash && string[--len] != '.') {}
 	if (len == lenlslash && string[len] != '.') len = len2;
 
 	for (i = len - 1; i >= lenlslash; i--) {
diff --git a/source/blender/blenlib/intern/pbvh.c b/source/blender/blenlib/intern/pbvh.c
index f4b57857173..409a9f88f39 100644
--- a/source/blender/blenlib/intern/pbvh.c
+++ b/source/blender/blenlib/intern/pbvh.c
@@ -1137,17 +1137,21 @@ static void pbvh_update_draw_buffers(PBVH *bvh, PBVHNode **nodes, int totnode)
 
 		if (node->flag & PBVH_RebuildDrawBuffers) {
 			GPU_free_buffers(node->draw_buffers);
-			if (bvh->grids) {
-				node->draw_buffers =
-				    GPU_build_grid_buffers(node->prim_indices,
-				                           node->totprim, bvh->grid_hidden, bvh->gridkey.grid_size);
-			}
-			else {
-				node->draw_buffers =
-				    GPU_build_mesh_buffers(node->face_vert_indices,
-				                           bvh->faces, bvh->verts,
-				                           node->prim_indices,
-				                           node->totprim);
+			switch (bvh->type) {
+				case PBVH_GRIDS:
+					node->draw_buffers =
+					    GPU_build_grid_buffers(node->prim_indices,
+					                           node->totprim,
+					                           bvh->grid_hidden,
+					                           bvh->gridkey.grid_size);
+					break;
+				case PBVH_FACES:
+					node->draw_buffers =
+					    GPU_build_mesh_buffers(node->face_vert_indices,
+					                           bvh->faces, bvh->verts,
+					                           node->prim_indices,
+					                           node->totprim);
+					break;
 			}
  
 			node->flag &= ~PBVH_RebuildDrawBuffers;
@@ -1473,7 +1477,8 @@ static int ray_aabb_intersect(PBVHNode *node, void *data_v)
 }
 
 void BLI_pbvh_raycast(PBVH *bvh, BLI_pbvh_HitOccludedCallback cb, void *data,
-                      float ray_start[3], float ray_normal[3], int original)
+                      const float ray_start[3], const float ray_normal[3],
+                      int original)
 {
 	RaycastData rcd;
 
@@ -1489,8 +1494,10 @@ void BLI_pbvh_raycast(PBVH *bvh, BLI_pbvh_HitOccludedCallback cb, void *data,
 	BLI_pbvh_search_callback_occluded(bvh, ray_aabb_intersect, &rcd, cb, data);
 }
 
-static int ray_face_intersection(float ray_start[3], float ray_normal[3],
-                                 float *t0, float *t1, float *t2, float *t3,
+static int ray_face_intersection(const float ray_start[3],
+                                 const float ray_normal[3],
+                                 const float *t0, const float *t1,
+                                 const float *t2, const float *t3,
                                  float *fdist)
 {
 	float dist;
@@ -1506,91 +1513,114 @@ static int ray_face_intersection(float ray_start[3], float ray_normal[3],
 	}
 }
 
-int BLI_pbvh_node_raycast(PBVH *bvh, PBVHNode *node, float (*origco)[3],
-                          float ray_start[3], float ray_normal[3], float *dist)
+static int pbvh_faces_node_raycast(PBVH *bvh, const PBVHNode *node,
+                                   float (*origco)[3],
+                                   const float ray_start[3],
+                                   const float ray_normal[3], float *dist)
 {
-	MVert *vert;
-	BLI_bitmap gh;
-	int *faces, totface, gridsize, totgrid;
+	const MVert *vert = bvh->verts;
+	const int *faces = node->prim_indices;
+	int i, hit = 0, totface = node->totprim;
+
+	for (i = 0; i < totface; ++i) {
+		const MFace *f = bvh->faces + faces[i];
+		const int *face_verts = node->face_vert_indices[i];
+
+		if (paint_is_face_hidden(f, vert))
+			continue;
+
+		if (origco) {
+			/* intersect with backuped original coordinates */
+			hit |= ray_face_intersection(ray_start, ray_normal,
+			                             origco[face_verts[0]],
+			                             origco[face_verts[1]],
+			                             origco[face_verts[2]],
+			                             f->v4 ? origco[face_verts[3]] : NULL,
+			                             dist);
+		}
+		else {
+			/* intersect with current coordinates */
+			hit |= ray_face_intersection(ray_start, ray_normal,
+			                             vert[f->v1].co,
+			                             vert[f->v2].co,
+			                             vert[f->v3].co,
+			                             f->v4 ? vert[f->v4].co : NULL,
+			                             dist);
+		}
+	}
+
+	return hit;
+}
+
+static int pbvh_grids_node_raycast(PBVH *bvh, PBVHNode *node,
+                                   float (*origco)[3],
+                                   const float ray_start[3],
+                                   const float ray_normal[3], float *dist)
+{
+	int totgrid = node->totprim;
+	int gridsize = bvh->gridkey.grid_size;
 	int i, x, y, hit = 0;
 
-	if (node->flag & PBVH_FullyHidden)
-		return 0;
+	for (i = 0; i < totgrid; ++i) {
+		CCGElem *grid = bvh->grids[node->prim_indices[i]];
+		BLI_bitmap gh;
 
-	switch (bvh->type) {
-		case PBVH_FACES:
-			vert = bvh->verts;
-			faces = node->prim_indices;
-			totface = node->totprim;
+		if (!grid)
+			continue;
 
-			for (i = 0; i < totface; ++i) {
-				const MFace *f = bvh->faces + faces[i];
-				int *face_verts = node->face_vert_indices[i];
+		gh = bvh->grid_hidden[node->prim_indices[i]];
 
-				if (paint_is_face_hidden(f, vert))
-					continue;
+		for (y = 0; y < gridsize - 1; ++y) {
+			for (x = 0; x < gridsize - 1; ++x) {
+				/* check if grid face is hidden */
+				if (gh) {
+					if (paint_is_grid_face_hidden(gh, gridsize, x, y))
+						continue;
+				}
 
 				if (origco) {
-					/* intersect with backuped original coordinates */
 					hit |= ray_face_intersection(ray_start, ray_normal,
-					                             origco[face_verts[0]],
-					                             origco[face_verts[1]],
-					                             origco[face_verts[2]],
-					                             f->v4 ? origco[face_verts[3]] : NULL,
+					                             origco[y * gridsize + x],
+					                             origco[y * gridsize + x + 1],
+					                             origco[(y + 1) * gridsize + x + 1],
+					                             origco[(y + 1) * gridsize + x],
 					                             dist);
 				}
 				else {
-					/* intersect with current coordinates */
 					hit |= ray_face_intersection(ray_start, ray_normal,
-					                             vert[f->v1].co,
-					                             vert[f->v2].co,
-					                             vert[f->v3].co,
-					                             f->v4 ? vert[f->v4].co : NULL,
+					                             CCG_grid_elem_co(&bvh->gridkey, grid, x, y),
+					                             CCG_grid_elem_co(&bvh->gridkey, grid, x + 1, y),
+					                             CCG_grid_elem_co(&bvh->gridkey, grid, x + 1, y + 1),
+					                             CCG_grid_elem_co(&bvh->gridkey, grid, x, y + 1),
 					                             dist);
 				}
 			}
+		}
+
+		if (origco)
+			origco += gridsize * gridsize;
+	}
+
+	return hit;
+}
+
+int BLI_pbvh_node_raycast(PBVH *bvh, PBVHNode *node, float (*origco)[3],
+                          const float ray_start[3], const float ray_normal[3],
+                          float *dist)
+{
+	int hit = 0;
+
+	if (node->flag & PBVH_FullyHidden)
+		return 0;
+
+	switch (bvh->type) {
+		case PBVH_FACES:
+			hit |= pbvh_faces_node_raycast(bvh, node, origco,
+			                               ray_start, ray_normal, dist);
 			break;
 		case PBVH_GRIDS:
-			totgrid = node->totprim;
-			gridsize = bvh->gridkey.grid_size;
-
-			for (i = 0; i < totgrid; ++i) {
-				CCGElem *grid = bvh->grids[node->prim_indices[i]];
-				if (!grid)
-					continue;
-
-				gh = bvh->grid_hidden[node->prim_indices[i]];
-
-				for (y = 0; y < gridsize - 1; ++y) {
-					for (x = 0; x < gridsize - 1; ++x) {
-						/* check if grid face is hidden */
-						if (gh) {
-							if (paint_is_grid_face_hidden(gh, gridsize, x, y))
-								continue;
-						}
-
-						if (origco) {
-							hit |= ray_face_intersection(ray_start, ray_normal,
-							                             origco[y * gridsize + x],
-							                             origco[y * gridsize + x + 1],
-							                             origco[(y + 1) * gridsize + x + 1],
-							                             origco[(y + 1) * gridsize + x],
-							                             dist);
-						}
-						else {
-							hit |= ray_face_intersection(ray_start, ray_normal,
-							                             CCG_grid_elem_co(&bvh->gridkey, grid, x, y),
-							                             CCG_grid_elem_co(&bvh->gridkey, grid, x + 1, y),
-							                             CCG_grid_elem_co(&bvh->gridkey, grid, x + 1, y + 1),
-							                             CCG_grid_elem_co(&bvh->gridkey, grid, x, y + 1),
-							                             dist);
-						}
-					}
-				}
-
-				if (origco)
-					origco += gridsize * gridsize;
-			}
+			hit |= pbvh_grids_node_raycast(bvh, node, origco,
+			                               ray_start, ray_normal, dist);
 			break;
 	}
 
@@ -1787,11 +1817,7 @@ PBVHProxyNode *BLI_pbvh_node_add_proxy(PBVH *bvh, PBVHNode *node)
 		else
 			node->proxies = MEM_mallocN(sizeof(PBVHProxyNode), "PBVHNodeProxy");
 
-		if (bvh->grids)
-			totverts = node->totprim * bvh->gridkey.grid_area;
-		else
-			totverts = node->uniq_verts;
-
+		BLI_pbvh_node_num_verts(bvh, node, &totverts, NULL);
 		node->proxies[index].co = MEM_callocN(sizeof(float[3]) * totverts, "PBVHNodeProxy.co");
 	}
 
diff --git a/source/blender/blenlib/intern/string_utf8.c b/source/blender/blenlib/intern/string_utf8.c
index 77bebfaf2e8..9795d4dea2d 100644
--- a/source/blender/blenlib/intern/string_utf8.c
+++ b/source/blender/blenlib/intern/string_utf8.c
@@ -178,14 +178,14 @@ static const size_t utf8_skip_data[256] = {
 			}                                                                 \
 		}                                                                     \
 		*dst= '\0';                                                           \
-	}
+	} (void)0
 
 char *BLI_strncpy_utf8(char *dst, const char *src, size_t maxncpy)
 {
 	char *dst_r= dst;
 
 	/* note: currently we don't attempt to deal with invalid utf8 chars */
-	BLI_STR_UTF8_CPY(dst, src, maxncpy)
+	BLI_STR_UTF8_CPY(dst, src, maxncpy);
 
 	return dst_r;
 }
@@ -197,7 +197,7 @@ char *BLI_strncat_utf8(char *dst, const char *src, size_t maxncpy)
 		maxncpy--;
 	}
 
-	BLI_STR_UTF8_CPY(dst, src, maxncpy)
+	BLI_STR_UTF8_CPY(dst, src, maxncpy);
 
 	return dst;
 }
@@ -315,7 +315,7 @@ size_t BLI_strncpy_wchar_from_utf8(wchar_t *dst_w, const char *src_c, const size
 	}                                                                         \
 	else {                                                                    \
 		Len = -1;                                                             \
-	}
+	} (void)0
 
 /* same as glib define but added an 'Err' arg */
 #define UTF8_GET(Result, Chars, Count, Mask, Len, Err)                        \
@@ -327,7 +327,7 @@ size_t BLI_strncpy_wchar_from_utf8(wchar_t *dst_w, const char *src_c, const size
 		}                                                                     \
 		(Result) <<= 6;                                                       \
 		(Result) |= ((Chars)[(Count)] & 0x3f);                                \
-	}
+	} (void)0
 
 
 /* uses glib functions but not from glib */
@@ -335,9 +335,9 @@ size_t BLI_strncpy_wchar_from_utf8(wchar_t *dst_w, const char *src_c, const size
 int BLI_str_utf8_size(const char *p)
 {
 	int mask = 0, len;
-    unsigned char c = (unsigned char) *p;
+	unsigned char c = (unsigned char) *p;
 
-    UTF8_COMPUTE (c, mask, len);
+	UTF8_COMPUTE (c, mask, len);
 
 	(void)mask; /* quiet warning */
 
diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c
index 4f5ea0b23bd..201417b65d6 100644
--- a/source/blender/blenlib/intern/threads.c
+++ b/source/blender/blenlib/intern/threads.c
@@ -44,14 +44,14 @@
 
 /* for checking system threads - BLI_system_thread_count */
 #ifdef WIN32
-#include "windows.h"
-#include <sys/timeb.h>
+#  include <windows.h>
+#  include <sys/timeb.h>
 #elif defined(__APPLE__)
-#include <sys/types.h>
-#include <sys/sysctl.h>
+#  include <sys/types.h>
+#  include <sys/sysctl.h>
 #else
-#include <unistd.h> 
-#include <sys/time.h>
+#  include <unistd.h>
+#  include <sys/time.h>
 #endif
 
 #if defined(__APPLE__) && (PARALLEL == 1) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 2)
@@ -71,8 +71,8 @@ static void *thread_tls_data;
  * A sample loop can look like this (pseudo c);
  *
  *     ListBase lb;
- *     int maxthreads= 2;
- *     int cont= 1;
+ *     int maxthreads = 2;
+ *     int cont = 1;
  * 
  *     BLI_init_threads(&lb, do_something_func, maxthreads);
  * 
@@ -85,14 +85,14 @@ static void *thread_tls_data;
  *         else PIL_sleep_ms(50);
  *         
  *         // find if a job is ready, this the do_something_func() should write in job somewhere
- *         cont= 0;
+ *         cont = 0;
  *         for (go over all jobs)
  *             if (job is ready) {
  *                 if (job was not removed) {
  *                     BLI_remove_thread(&lb, job);
  *                 }
  *             }
- *             else cont= 1;
+ *             else cont = 1;
  *         }
  *         // conditions to exit loop 
  *         if (if escape loop event) {
@@ -520,8 +520,10 @@ void BLI_insert_work(ThreadedWorker *worker, void *param)
 struct ThreadQueue {
 	GSQueue *queue;
 	pthread_mutex_t mutex;
-	pthread_cond_t cond;
-	int nowait;
+	pthread_cond_t push_cond;
+	pthread_cond_t finish_cond;
+	volatile int nowait;
+	volatile int cancelled;
 };
 
 ThreadQueue *BLI_thread_queue_init(void)
@@ -532,14 +534,17 @@ ThreadQueue *BLI_thread_queue_init(void)
 	queue->queue = BLI_gsqueue_new(sizeof(void *));
 
 	pthread_mutex_init(&queue->mutex, NULL);
-	pthread_cond_init(&queue->cond, NULL);
+	pthread_cond_init(&queue->push_cond, NULL);
+	pthread_cond_init(&queue->finish_cond, NULL);
 
 	return queue;
 }
 
 void BLI_thread_queue_free(ThreadQueue *queue)
 {
-	pthread_cond_destroy(&queue->cond);
+	/* destroy everything, assumes no one is using queue anymore */
+	pthread_cond_destroy(&queue->finish_cond);
+	pthread_cond_destroy(&queue->push_cond);
 	pthread_mutex_destroy(&queue->mutex);
 
 	BLI_gsqueue_free(queue->queue);
@@ -554,7 +559,7 @@ void BLI_thread_queue_push(ThreadQueue *queue, void *work)
 	BLI_gsqueue_push(queue->queue, &work);
 
 	/* signal threads waiting to pop */
-	pthread_cond_signal(&queue->cond);
+	pthread_cond_signal(&queue->push_cond);
 	pthread_mutex_unlock(&queue->mutex);
 }
 
@@ -565,11 +570,15 @@ void *BLI_thread_queue_pop(ThreadQueue *queue)
 	/* wait until there is work */
 	pthread_mutex_lock(&queue->mutex);
 	while (BLI_gsqueue_is_empty(queue->queue) && !queue->nowait)
-		pthread_cond_wait(&queue->cond, &queue->mutex);
-
+		pthread_cond_wait(&queue->push_cond, &queue->mutex);
+	
 	/* if we have something, pop it */
-	if (!BLI_gsqueue_is_empty(queue->queue))
+	if (!BLI_gsqueue_is_empty(queue->queue)) {
 		BLI_gsqueue_pop(queue->queue, &work);
+		
+		if(BLI_gsqueue_is_empty(queue->queue))
+			pthread_cond_broadcast(&queue->finish_cond);
+	}
 
 	pthread_mutex_unlock(&queue->mutex);
 
@@ -623,16 +632,20 @@ void *BLI_thread_queue_pop_timeout(ThreadQueue *queue, int ms)
 	/* wait until there is work */
 	pthread_mutex_lock(&queue->mutex);
 	while (BLI_gsqueue_is_empty(queue->queue) && !queue->nowait) {
-		if (pthread_cond_timedwait(&queue->cond, &queue->mutex, &timeout) == ETIMEDOUT)
+		if (pthread_cond_timedwait(&queue->push_cond, &queue->mutex, &timeout) == ETIMEDOUT)
 			break;
 		else if (PIL_check_seconds_timer() - t >= ms * 0.001)
 			break;
 	}
 
 	/* if we have something, pop it */
-	if (!BLI_gsqueue_is_empty(queue->queue))
+	if (!BLI_gsqueue_is_empty(queue->queue)) {
 		BLI_gsqueue_pop(queue->queue, &work);
-
+		
+		if(BLI_gsqueue_is_empty(queue->queue))
+			pthread_cond_broadcast(&queue->finish_cond);
+	}
+	
 	pthread_mutex_unlock(&queue->mutex);
 
 	return work;
@@ -656,10 +669,23 @@ void BLI_thread_queue_nowait(ThreadQueue *queue)
 	queue->nowait = 1;
 
 	/* signal threads waiting to pop */
-	pthread_cond_signal(&queue->cond);
+	pthread_cond_broadcast(&queue->push_cond);
+	pthread_mutex_unlock(&queue->mutex);
+}
+
+void BLI_thread_queue_wait_finish(ThreadQueue *queue)
+{
+	/* wait for finish condition */
+	pthread_mutex_lock(&queue->mutex);
+
+    while(!BLI_gsqueue_is_empty(queue->queue))
+		pthread_cond_wait(&queue->finish_cond, &queue->mutex);
+
 	pthread_mutex_unlock(&queue->mutex);
 }
 
+/* ************************************************ */
+
 void BLI_begin_threaded_malloc(void)
 {
 	if (thread_levels == 0) {
@@ -674,3 +700,4 @@ void BLI_end_threaded_malloc(void)
 	if (thread_levels == 0)
 		MEM_set_lock_callback(NULL, NULL);
 }
+
diff --git a/source/blender/blenlib/intern/voronoi.c b/source/blender/blenlib/intern/voronoi.c
new file mode 100644
index 00000000000..0088d24d741
--- /dev/null
+++ b/source/blender/blenlib/intern/voronoi.c
@@ -0,0 +1,833 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2012 Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): Sergey Sharybin
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/*
+ * Fortune's algorithm implemented using explanation and some code snippets from
+ * http://blog.ivank.net/fortunes-algorithm-and-implementation.html
+ */
+
+/** \file blender/blenkernel/intern/tracking.c
+ *  \ingroup bli
+ */
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_listbase.h"
+#include "BLI_math.h"
+#include "BLI_voronoi.h"
+#include "BLI_utildefines.h"
+
+#define VORONOI_EPS 1e-3
+
+enum {
+	voronoiEventType_Site = 0,
+	voronoiEventType_Circle = 1
+} voronoiEventType;
+
+typedef struct VoronoiEvent {
+	struct VoronoiEvent *next, *prev;
+
+	int type;		/* type of event (site or circle) */
+	float site[2];	/* site for which event was generated */
+
+	struct VoronoiParabola *parabola;	/* parabola for which event was generated */
+} VoronoiEvent;
+
+typedef struct VoronoiParabola {
+	struct VoronoiParabola *left, *right, *parent;
+	VoronoiEvent *event;
+	int is_leaf;
+	float site[2];
+	VoronoiEdge *edge;
+} VoronoiParabola;
+
+typedef struct VoronoiProcess {
+	ListBase queue, edges;
+	VoronoiParabola *root;
+	int width, height;
+	float current_y;
+} VoronoiProcess;
+
+/* event */
+
+static void voronoi_insertEvent(VoronoiProcess *process, VoronoiEvent *event)
+{
+	VoronoiEvent *current_event = process->queue.first;
+
+	while (current_event) {
+		if (current_event->site[1] < event->site[1]) {
+			break;
+		}
+		if (current_event->site[1] == event->site[1]) {
+			event->site[1] -= VORONOI_EPS;
+		}
+
+		current_event = current_event->next;
+	}
+
+	BLI_insertlinkbefore(&process->queue, current_event, event);
+}
+
+/* edge */
+static VoronoiEdge *voronoiEdge_new(float start[2], float left[2], float right[2])
+{
+	VoronoiEdge *edge = MEM_callocN(sizeof(VoronoiEdge), "voronoi edge");
+
+	copy_v2_v2(edge->start, start);
+	copy_v2_v2(edge->left, left);
+	copy_v2_v2(edge->right, right);
+
+	edge->neighbour = NULL;
+	edge->end[0] = 0;
+	edge->end[1] = 0;
+
+	edge->f = (right[0] - left[0]) / (left[1] - right[1]);
+	edge->g = start[1] - edge->f * start[0];
+
+	edge->direction[0] = right[1] - left[1];
+	edge->direction[1] = -(right[0] - left[0]);
+
+	return edge;
+}
+
+/* parabola */
+
+static VoronoiParabola *voronoiParabola_new(void)
+{
+	VoronoiParabola *parabola = MEM_callocN(sizeof(VoronoiParabola), "voronoi parabola");
+
+	parabola->is_leaf = FALSE;
+	parabola->event = NULL;
+	parabola->edge = NULL;
+	parabola->parent = 0;
+
+	return parabola;
+}
+
+static VoronoiParabola *voronoiParabola_newSite(float site[2])
+{
+	VoronoiParabola *parabola = MEM_callocN(sizeof(VoronoiParabola), "voronoi parabola site");
+
+	copy_v2_v2(parabola->site, site);
+	parabola->is_leaf = TRUE;
+	parabola->event = NULL;
+	parabola->edge = NULL;
+	parabola->parent = 0;
+
+	return parabola;
+}
+
+/* returns the closest leave which is on the left of current node */
+static VoronoiParabola *voronoiParabola_getLeftChild(VoronoiParabola *parabola)
+{
+	VoronoiParabola *current_parabola;
+
+	if (!parabola)
+		return NULL;
+
+	current_parabola = parabola->left;
+	while (!current_parabola->is_leaf) {
+		current_parabola = current_parabola->right;
+	}
+
+	return current_parabola;
+}
+
+/* returns the closest leave which is on the right of current node */
+static VoronoiParabola *voronoiParabola_getRightChild(VoronoiParabola *parabola)
+{
+	VoronoiParabola *current_parabola;
+
+	if (!parabola)
+		return NULL;
+
+	current_parabola = parabola->right;
+	while (!current_parabola->is_leaf) {
+		current_parabola = current_parabola->left;
+	}
+
+	return current_parabola;
+}
+
+/* returns the closest parent which is on the left */
+static VoronoiParabola *voronoiParabola_getLeftParent(VoronoiParabola *parabola)
+{
+	VoronoiParabola *current_par = parabola->parent;
+	VoronoiParabola *last_parabola = parabola;
+
+	while (current_par->left == last_parabola) {
+		if (!current_par->parent)
+			return NULL;
+
+		last_parabola = current_par;
+		current_par = current_par->parent;
+	}
+
+	return current_par;
+}
+
+/* returns the closest parent which is on the right */
+static VoronoiParabola *voronoiParabola_getRightParent(VoronoiParabola *parabola)
+{
+	VoronoiParabola *current_parabola = parabola->parent;
+	VoronoiParabola *last_parabola = parabola;
+
+	while (current_parabola->right == last_parabola) {
+		if (!current_parabola->parent)
+			return NULL;
+
+		last_parabola = current_parabola;
+		current_parabola = current_parabola->parent;
+	}
+
+	return current_parabola;
+}
+
+static void voronoiParabola_setLeft(VoronoiParabola *parabola, VoronoiParabola *left)
+{
+	parabola->left = left;
+	left->parent = parabola;
+}
+
+static void voronoiParabola_setRight(VoronoiParabola *parabola, VoronoiParabola *right)
+{
+	parabola->right = right;
+	right->parent = parabola;
+}
+
+static float voronoi_getY(VoronoiProcess *process, float p[2], float x)
+{
+	float ly = process->current_y;
+
+	float dp = 2 * (p[1] - ly);
+	float a1 = 1 / dp;
+	float b1 = -2 * p[0] / dp;
+	float c1 = ly + dp / 4 + p[0] * p[0] / dp;
+
+	return a1 * x * x + b1 * x + c1;
+}
+
+static float voronoi_getXOfEdge(VoronoiProcess *process, VoronoiParabola *par, float y)
+{
+	VoronoiParabola *left = voronoiParabola_getLeftChild(par);
+	VoronoiParabola *right = voronoiParabola_getRightChild(par);
+	float p[2], r[2];
+	float dp, a1, b1, c1, a2, b2, c2, a, b, c, disc, ry, x1, x2;
+	float ly = process->current_y;
+
+	copy_v2_v2(p, left->site);
+	copy_v2_v2(r, right->site);
+
+	dp = 2.0f * (p[1] - y);
+	a1 = 1.0f / dp;
+	b1 = -2.0f * p[0] / dp;
+	c1 = y + dp / 4 + p[0] * p[0] / dp;
+
+	dp = 2.0f * (r[1] - y);
+	a2 = 1.0f / dp;
+	b2 = -2.0f * r[0] / dp;
+	c2 = ly + dp / 4 + r[0] * r[0] / dp;
+
+	a = a1 - a2;
+	b = b1 - b2;
+	c = c1 - c2;
+
+	disc = b*b - 4 * a * c;
+	x1 = (-b + sqrtf(disc)) / (2*a);
+	x2 = (-b - sqrtf(disc)) / (2*a);
+
+	if (p[1] < r[1])
+		ry = MAX2(x1, x2);
+	else
+		ry = MIN2(x1, x2);
+
+	return ry;
+}
+
+static VoronoiParabola *voronoi_getParabolaByX(VoronoiProcess *process, float xx)
+{
+	VoronoiParabola * par = process->root;
+	float x = 0.0f;
+	float ly = process->current_y;
+
+	while (!par->is_leaf) {
+		x = voronoi_getXOfEdge(process, par, ly);
+
+		if (x > xx)
+			par = par->left;
+		else
+			par = par->right;
+	}
+
+	return par;
+}
+
+static int voronoi_getEdgeIntersection(VoronoiEdge *a, VoronoiEdge *b, float p[2])
+{
+	float x = (b->g - a->g) / (a->f - b->f);
+	float y = a->f * x + a->g;
+
+	if ((x - a->start[0]) / a->direction[0] < 0)
+		return 0;
+
+	if ((y - a->start[1]) / a->direction[1] < 0)
+		return 0;
+
+	if ((x - b->start[0]) / b->direction[0] < 0)
+		return 0;
+
+	if ((y - b->start[1]) / b->direction[1] < 0)
+		return 0;
+
+	p[0] = x;
+	p[1] = y;
+
+	return 1;
+}
+
+static void voronoi_checkCircle(VoronoiProcess *process, VoronoiParabola *b)
+{
+	VoronoiParabola *lp = voronoiParabola_getLeftParent(b);
+	VoronoiParabola *rp = voronoiParabola_getRightParent(b);
+
+	VoronoiParabola *a  = voronoiParabola_getLeftChild(lp);
+	VoronoiParabola *c  = voronoiParabola_getRightChild(rp);
+
+	VoronoiEvent *event;
+
+	float ly = process->current_y;
+	float s[2], dx, dy, d;
+
+	if (!a || !c || len_squared_v2v2(a->site, c->site) < VORONOI_EPS)
+		return;
+
+	if (!voronoi_getEdgeIntersection(lp->edge, rp->edge, s))
+		return;
+
+	dx = a->site[0] - s[0];
+	dy = a->site[1] - s[1];
+
+	d = sqrtf((dx * dx) + (dy * dy));
+
+	if (s[1] - d >= ly)
+		return;
+
+	event = MEM_callocN(sizeof(VoronoiEvent), "voronoi circle event");
+
+	event->type = voronoiEventType_Circle;
+
+	event->site[0] = s[0];
+	event->site[1] = s[1] - d;
+
+	b->event = event;
+	event->parabola = b;
+
+	voronoi_insertEvent(process, event);
+}
+
+static void voronoi_addParabola(VoronoiProcess *process, float site[2])
+{
+	VoronoiParabola *root = process->root;
+	VoronoiParabola *par, *p0, *p1, *p2;
+	VoronoiEdge *el, *er;
+	float start[2];
+
+	if (!process->root) {
+		process->root = voronoiParabola_newSite(site);
+
+		return;
+	}
+
+	if (root->is_leaf && root->site[1] - site[1] < 0) {
+		float *fp = root->site;
+		float s[2];
+
+		root->is_leaf = FALSE;
+		voronoiParabola_setLeft(root, voronoiParabola_newSite(fp));
+		voronoiParabola_setRight(root, voronoiParabola_newSite(site));
+
+		s[0] = (site[0] + fp[0]) / 2.0f;
+		s[1] = process->height;
+
+		if(site[0] > fp[0])
+			root->edge = voronoiEdge_new(s, fp, site);
+		else
+			root->edge = voronoiEdge_new(s, site, fp);
+
+		BLI_addtail(&process->edges, root->edge);
+
+		return;
+	}
+
+	par = voronoi_getParabolaByX(process, site[0]);
+
+	if (par->event) {
+		BLI_freelinkN(&process->queue, par->event);
+
+		par->event = NULL;
+	}
+
+	start[0] = site[0];
+	start[1] = voronoi_getY(process, par->site, site[0]);
+
+	el = voronoiEdge_new(start, par->site, site);
+	er = voronoiEdge_new(start, site, par->site);
+
+	el->neighbour = er;
+	BLI_addtail(&process->edges, el);
+
+	par->edge = er;
+	par->is_leaf = FALSE;
+
+	p0 = voronoiParabola_newSite(par->site);
+	p1 = voronoiParabola_newSite(site);
+	p2 = voronoiParabola_newSite(par->site);
+
+	voronoiParabola_setRight(par, p2);
+	voronoiParabola_setLeft(par, voronoiParabola_new());
+	par->left->edge = el;
+
+	voronoiParabola_setLeft(par->left, p0);
+	voronoiParabola_setRight(par->left, p1);
+
+	voronoi_checkCircle(process, p0);
+	voronoi_checkCircle(process, p2);
+}
+
+static void voronoi_removeParabola(VoronoiProcess *process, VoronoiEvent *event)
+{
+	VoronoiParabola *p1 = event->parabola;
+
+	VoronoiParabola *xl = voronoiParabola_getLeftParent(p1);
+	VoronoiParabola *xr = voronoiParabola_getRightParent(p1);
+
+	VoronoiParabola *p0 = voronoiParabola_getLeftChild(xl);
+	VoronoiParabola *p2 = voronoiParabola_getRightChild(xr);
+
+	VoronoiParabola *higher = NULL, *par, *gparent;
+
+	float p[2];
+
+	if (p0->event) {
+		BLI_freelinkN(&process->queue, p0->event);
+		p0->event = NULL;
+	}
+
+	if (p2->event) {
+		BLI_freelinkN(&process->queue, p2->event);
+		p2->event = NULL;
+	}
+
+	p[0] = event->site[0];
+	p[1] = voronoi_getY(process, p1->site, event->site[0]);
+
+	copy_v2_v2(xl->edge->end, p);
+	copy_v2_v2(xr->edge->end, p);
+
+	par = p1;
+	while (par != process->root) {
+		par = par->parent;
+
+		if (par == xl)
+			higher = xl;
+		if (par == xr)
+			higher = xr;
+	}
+
+	higher->edge = voronoiEdge_new(p, p0->site, p2->site);
+	BLI_addtail(&process->edges, higher->edge);
+
+	gparent = p1->parent->parent;
+	if (p1->parent->left == p1) {
+		if (gparent->left == p1->parent)
+			voronoiParabola_setLeft(gparent, p1->parent->right);
+		if (gparent->right == p1->parent)
+			voronoiParabola_setRight(gparent, p1->parent->right);
+	}
+	else {
+		if (gparent->left == p1->parent)
+			voronoiParabola_setLeft(gparent, p1->parent->left);
+		if (gparent->right == p1->parent)
+			voronoiParabola_setRight(gparent, p1->parent->left);
+	}
+
+	MEM_freeN(p1->parent);
+	MEM_freeN(p1);
+
+	voronoi_checkCircle(process, p0);
+	voronoi_checkCircle(process, p2);
+}
+
+void voronoi_finishEdge(VoronoiProcess *process, VoronoiParabola *parabola)
+{
+	float mx;
+
+	if (parabola->is_leaf) {
+		MEM_freeN(parabola);
+		return;
+	}
+
+	if (parabola->edge->direction[0] > 0.0f)
+		mx = MAX2(process->width, parabola->edge->start[0] + 10);
+	else
+		mx = MIN2(0.0, parabola->edge->start[0] - 10);
+
+	parabola->edge->end[0] = mx;
+	parabola->edge->end[1] = mx * parabola->edge->f + parabola->edge->g;
+
+	voronoi_finishEdge(process, parabola->left);
+	voronoi_finishEdge(process, parabola->right);
+
+	MEM_freeN(parabola);
+}
+
+void voronoi_clampEdgeVertex(int width, int height, float *coord, float *other_coord)
+{
+	const float corners[4][2] = {{0.0f, 0.0f},
+	                             {width - 1, 0.0f},
+	                             {width - 1, height - 1},
+	                             {0.0f, height - 1}};
+	int i;
+
+	if (IN_RANGE_INCL(coord[0], 0, width-1) && IN_RANGE_INCL(coord[1], 0, height-1)) {
+		return;
+	}
+
+	for (i = 0; i < 4; i++) {
+		float v1[2], v2[2];
+		float p[2];
+
+		copy_v2_v2(v1, corners[i]);
+
+		if (i == 3)
+			copy_v2_v2(v2, corners[0]);
+		else
+			copy_v2_v2(v2, corners[i + 1]);
+
+		if (isect_seg_seg_v2_point(v1, v2, coord, other_coord, p) == 1) {
+			if (i == 0 && coord[1] > p[1])
+				continue;
+			if (i == 1 && coord[0] < p[0])
+				continue;
+			if (i == 2 && coord[1] < p[1])
+				continue;
+			if (i == 3 && coord[0] > p[0])
+				continue;
+
+			copy_v2_v2(coord, p);
+		}
+	}
+}
+
+void voronoi_clampEdges(ListBase *edges, int width, int height, ListBase *clamped_edges)
+{
+	VoronoiEdge *edge;
+
+	edge = edges->first;
+	while (edge) {
+		VoronoiEdge *new_edge = MEM_callocN(sizeof(VoronoiEdge), "clamped edge");
+
+		*new_edge = *edge;
+		BLI_addtail(clamped_edges, new_edge);
+
+		voronoi_clampEdgeVertex(width, height, new_edge->start, new_edge->end);
+		voronoi_clampEdgeVertex(width, height, new_edge->end, new_edge->start);
+
+		edge = edge->next;
+	}
+}
+
+static int voronoi_getNextSideCoord(ListBase *edges, float coord[2], int dim, int dir, float next_coord[2])
+{
+	VoronoiEdge *edge = edges->first;
+	float distance = FLT_MAX;
+	int other_dim = dim ? 0 : 1;
+
+	while (edge) {
+		int ok = FALSE;
+		float co[2], cur_distance;
+
+		if (fabsf(edge->start[other_dim] - coord[other_dim]) < VORONOI_EPS &&
+		    len_squared_v2v2(coord, edge->start) > VORONOI_EPS)
+		{
+			copy_v2_v2(co, edge->start);
+			ok = TRUE;
+		}
+
+		if (fabsf(edge->end[other_dim] - coord[other_dim]) < VORONOI_EPS &&
+		    len_squared_v2v2(coord, edge->end) > VORONOI_EPS)
+		{
+			copy_v2_v2(co, edge->end);
+			ok = TRUE;
+		}
+
+		if (ok) {
+			if (dir > 0 && coord[dim] > co[dim]) {
+				ok = FALSE;
+			}
+			else if (dir < 0 && coord[dim] < co[dim]) {
+				ok = FALSE;
+			}
+		}
+
+		if (ok) {
+			cur_distance = len_squared_v2v2(coord, co);
+			if (cur_distance < distance) {
+				copy_v2_v2(next_coord, co);
+				distance = cur_distance;
+			}
+		}
+
+		edge = edge->next;
+	}
+
+	return distance < FLT_MAX;
+}
+
+static void voronoi_createBoundaryEdges(ListBase *edges, int width, int height)
+{
+	const float corners[4][2] = {{width - 1, 0.0f},
+	                             {width - 1, height - 1},
+	                             {0.0f, height - 1},
+	                             {0.0f, 0.0f}};
+	int i, dim = 0, dir = 1;
+
+	float coord[2] = {0.0f, 0.0f};
+	float next_coord[2] = {0.0f, 0.0f};
+
+	for (i = 0; i < 4; i++) {
+		while (voronoi_getNextSideCoord(edges, coord, dim, dir, next_coord)) {
+			VoronoiEdge *edge = MEM_callocN(sizeof(VoronoiEdge), "boundary edge");
+
+			copy_v2_v2(edge->start, coord);
+			copy_v2_v2(edge->end, next_coord);
+			BLI_addtail(edges, edge);
+
+			copy_v2_v2(coord, next_coord);
+		}
+
+		if (len_squared_v2v2(coord, corners[i]) > VORONOI_EPS) {
+			VoronoiEdge *edge = MEM_callocN(sizeof(VoronoiEdge), "boundary edge");
+
+			copy_v2_v2(edge->start, coord);
+			copy_v2_v2(edge->end, corners[i]);
+			BLI_addtail(edges, edge);
+			copy_v2_v2(coord, corners[i]);
+		}
+
+		dim = dim ? 0 : 1;
+		if (i == 1)
+			dir = -1;
+	}
+}
+
+void BLI_voronoi_compute(const VoronoiSite *sites, int sites_total, int width, int height, ListBase *edges)
+{
+	VoronoiProcess process;
+	VoronoiEdge *edge;
+	int i;
+
+	memset(&process, 0, sizeof(VoronoiProcess));
+
+	process.width = width;
+	process.height = height;
+
+	for (i = 0; i < sites_total; i++) {
+		VoronoiEvent *event = MEM_callocN(sizeof(VoronoiEvent), "voronoi site event");
+
+		event->type = voronoiEventType_Site;
+		copy_v2_v2(event->site, sites[i].co);
+
+		voronoi_insertEvent(&process, event);
+	}
+
+	while (process.queue.first) {
+		VoronoiEvent *event = process.queue.first;
+
+		process.current_y = event->site[1];
+
+		if (event->type == voronoiEventType_Site) {
+			voronoi_addParabola(&process, event->site);
+		}
+		else {
+			voronoi_removeParabola(&process, event);
+		}
+
+		BLI_freelinkN(&process.queue, event);
+	}
+
+	voronoi_finishEdge(&process, process.root);
+
+	edge = process.edges.first;
+	while (edge) {
+		if (edge->neighbour) {
+			copy_v2_v2(edge->start, edge->neighbour->end);
+			MEM_freeN(edge->neighbour);
+		}
+
+		edge = edge->next;
+	}
+
+	BLI_movelisttolist(edges, &process.edges);
+}
+
+static int testVoronoiEdge(const float site[2], const float point[2], const VoronoiEdge *edge)
+{
+	float p[2];
+
+	if (isect_seg_seg_v2_point(site, point, edge->start, edge->end, p) == 1) {
+		if (len_squared_v2v2(p, edge->start) > VORONOI_EPS &&
+		    len_squared_v2v2(p, edge->end) > VORONOI_EPS)
+		{
+			return FALSE;
+		}
+	}
+
+	return TRUE;
+}
+
+static int voronoi_addTriangulationPoint(const float coord[2], const float color[3],
+                                         VoronoiTriangulationPoint **triangulated_points,
+                                         int *triangulated_points_total)
+{
+	VoronoiTriangulationPoint *triangulation_point;
+	int i;
+
+	for (i = 0; i < *triangulated_points_total; i++) {
+		if (equals_v2v2(coord, (*triangulated_points)[i].co)) {
+			triangulation_point = &(*triangulated_points)[i];
+
+			add_v3_v3(triangulation_point->color, color);
+			triangulation_point->power++;
+
+			return i;
+		}
+	}
+
+	if (*triangulated_points) {
+		*triangulated_points = MEM_reallocN(*triangulated_points,
+		                                    sizeof(VoronoiTriangulationPoint) * (*triangulated_points_total + 1));
+	}
+	else {
+		*triangulated_points = MEM_callocN(sizeof(VoronoiTriangulationPoint), "triangulation points");
+	}
+
+	triangulation_point = &(*triangulated_points)[(*triangulated_points_total)];
+	copy_v2_v2(triangulation_point->co, coord);
+	copy_v3_v3(triangulation_point->color, color);
+
+	triangulation_point->power = 1;
+
+	(*triangulated_points_total)++;
+
+	return (*triangulated_points_total) - 1;
+}
+
+static void voronoi_addTriangle(int v1, int v2, int v3, int (**triangles)[3], int *triangles_total)
+{
+	int *triangle;
+
+	if (*triangles) {
+		*triangles = MEM_reallocN(*triangles, sizeof(int[3]) * (*triangles_total + 1));
+	}
+	else {
+		*triangles = MEM_callocN(sizeof(int[3]), "trianglulation triangles");
+	}
+
+	triangle = (int*)&(*triangles)[(*triangles_total)];
+
+	triangle[0] = v1;
+	triangle[1] = v2;
+	triangle[2] = v3;
+
+	(*triangles_total)++;
+}
+
+void BLI_voronoi_triangulate(const VoronoiSite *sites, int sites_total, ListBase *edges, int width, int height,
+                             VoronoiTriangulationPoint **triangulated_points_r, int *triangulated_points_total_r,
+                             int (**triangles_r)[3], int *triangles_total_r)
+{
+	VoronoiTriangulationPoint *triangulated_points = NULL;
+	int (*triangles)[3] = NULL;
+	int triangulated_points_total = 0, triangles_total = 0;
+	int i;
+	ListBase boundary_edges = {NULL, NULL};
+
+	voronoi_clampEdges(edges, width, height, &boundary_edges);
+	voronoi_createBoundaryEdges(&boundary_edges, width, height);
+
+	for (i = 0; i < sites_total; i++) {
+		VoronoiEdge *edge;
+		int v1;
+
+		v1 = voronoi_addTriangulationPoint(sites[i].co, sites[i].color, &triangulated_points, &triangulated_points_total);
+
+		edge = boundary_edges.first;
+		while (edge) {
+			VoronoiEdge *test_edge = boundary_edges.first;
+			int ok_start = TRUE, ok_end = TRUE;
+
+			while (test_edge) {
+				float v1[2], v2[2];
+
+				sub_v2_v2v2(v1, edge->start, sites[i].co);
+				sub_v2_v2v2(v2, edge->end, sites[i].co);
+
+				if (ok_start && !testVoronoiEdge(sites[i].co, edge->start, test_edge))
+					ok_start = FALSE;
+
+				if (ok_end && !testVoronoiEdge(sites[i].co, edge->end, test_edge))
+					ok_end = FALSE;
+
+				test_edge = test_edge->next;
+			}
+
+			if (ok_start && ok_end) {
+				int v2, v3;
+
+				v2 = voronoi_addTriangulationPoint(edge->start, sites[i].color, &triangulated_points, &triangulated_points_total);
+				v3 = voronoi_addTriangulationPoint(edge->end, sites[i].color, &triangulated_points, &triangulated_points_total);
+
+				voronoi_addTriangle(v1, v2, v3, &triangles, &triangles_total);
+			}
+
+			edge = edge->next;
+		}
+	}
+
+	for (i = 0; i < triangulated_points_total; i++) {
+		VoronoiTriangulationPoint *triangulation_point = &triangulated_points[i];
+
+		mul_v3_fl(triangulation_point->color, 1.0f / triangulation_point->power);
+	}
+
+	*triangulated_points_r = triangulated_points;
+	*triangulated_points_total_r = triangulated_points_total;
+
+	*triangles_r = triangles;
+	*triangles_total_r = triangles_total;
+
+	BLI_freelistN(&boundary_edges);
+}
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 8d41b54501a..48f9d1df687 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -95,6 +95,7 @@
 #include "DNA_vfont_types.h"
 #include "DNA_world_types.h"
 #include "DNA_movieclip_types.h"
+#include "DNA_mask_types.h"
 
 #include "MEM_guardedalloc.h"
 
@@ -138,7 +139,6 @@
 #include "BKE_screen.h"
 #include "BKE_sequencer.h"
 #include "BKE_text.h" // for txt_extended_ascii_as_utf8
-#include "BKE_texture.h" // for open_plugin_tex
 #include "BKE_tracking.h"
 #include "BKE_utildefines.h" // SWITCH_INT DATA ENDB DNA1 O_BINARY GLOB USER TEST REND
 #include "BKE_sound.h"
@@ -1210,7 +1210,6 @@ static void change_idid_adr_fd(FileData *fd, void *old, void *new)
 		if (old==entry->newp && entry->nr==ID_ID) {
 			entry->newp = new;
 			if (new) entry->nr = GS( ((ID *)new)->name );
-			break;
 		}
 	}
 }
@@ -2397,11 +2396,6 @@ static void direct_link_nodetree(FileData *fd, bNodeTree *ntree)
 	
 	link_list(fd, &ntree->nodes);
 	for (node = ntree->nodes.first; node; node = node->next) {
-		if (node->type == NODE_DYNAMIC) {
-			node->custom1 = 0;
-			node->custom1 = BSET(node->custom1, NODE_DYNAMIC_LOADED);
-		}
-		
 		node->typeinfo = NULL;
 		
 		link_list(fd, &node->inputs);
@@ -3169,17 +3163,7 @@ static void direct_link_texture(FileData *fd, Tex *tex)
 {
 	tex->adt = newdataadr(fd, tex->adt);
 	direct_link_animdata(fd, tex->adt);
-	
-	tex->plugin = newdataadr(fd, tex->plugin);
-	if (tex->plugin) {
-		tex->plugin->handle = NULL;
-		open_plugin_tex(tex->plugin);
-		/* initialize data for this instance, if an initialization
-		 * function exists.
-		 */
-		if (tex->plugin->instance_init)
-			tex->plugin->instance_init((void *)tex->plugin->data);
-	}
+
 	tex->coba = newdataadr(fd, tex->coba);
 	tex->env = newdataadr(fd, tex->env);
 	if (tex->env) {
@@ -3700,7 +3684,7 @@ static void lib_link_mesh(FileData *fd, Main *main)
 				Main *gmain = G.main;
 				G.main = main;
 				
-				BKE_mesh_convert_mfaces_to_mpolys(me);
+				BKE_mesh_do_versions_convert_mfaces_to_mpolys(me);
 				
 				G.main = gmain;
 			}
@@ -3994,7 +3978,7 @@ static void direct_link_latt(FileData *fd, Lattice *lt)
 /* ************ READ OBJECT ***************** */
 
 static void lib_link_modifiers__linkModifiers(void *userData, Object *ob,
-											  ID **idpoin)
+                                              ID **idpoin)
 {
 	FileData *fd = userData;
 
@@ -4067,7 +4051,16 @@ static void lib_link_object(FileData *fd, Main *main)
 				warn = 1;
 				
 				if (ob->pose) {
+					/* we can't call #BKE_pose_free() here because of library linking
+					 * freeing will recurse down into every pose constraints ID pointers
+					 * which are not always valid, so for now free directly and suffer
+					 * some leaked memory rather then crashing immediately
+					 * while bad this _is_ an exceptional case - campbell */
+#if 0
 					BKE_pose_free(ob->pose);
+#else
+					MEM_freeN(ob->pose);
+#endif
 					ob->pose= NULL;
 					ob->mode &= ~OB_MODE_POSE;
 				}
@@ -4835,11 +4828,15 @@ static void lib_link_scene(FileData *fd, Main *main)
 					seq->clip = newlibadr(fd, sce->id.lib, seq->clip);
 					seq->clip->id.us++;
 				}
+				if (seq->mask) {
+					seq->mask = newlibadr(fd, sce->id.lib, seq->mask);
+					seq->mask->id.us++;
+				}
 				if (seq->scene_camera) seq->scene_camera = newlibadr(fd, sce->id.lib, seq->scene_camera);
 				if (seq->sound) {
 					seq->scene_sound = NULL;
-					if (seq->type == SEQ_HD_SOUND)
-						seq->type = SEQ_SOUND;
+					if (seq->type == SEQ_TYPE_SOUND_HD)
+						seq->type = SEQ_TYPE_SOUND_RAM;
 					else
 						seq->sound = newlibadr(fd, sce->id.lib, seq->sound);
 					if (seq->sound) {
@@ -4962,13 +4959,12 @@ static void direct_link_scene(FileData *fd, Scene *sce)
 			/* a patch: after introduction of effects with 3 input strips */
 			if (seq->seq3 == NULL) seq->seq3 = seq->seq2;
 			
-			seq->plugin = newdataadr(fd, seq->plugin);
 			seq->effectdata = newdataadr(fd, seq->effectdata);
 			
-			if (seq->type & SEQ_EFFECT)
+			if (seq->type & SEQ_TYPE_EFFECT)
 				seq->flag |= SEQ_EFFECT_NOT_LOADED;
 			
-			if (seq->type == SEQ_SPEED) {
+			if (seq->type == SEQ_TYPE_SPEED) {
 				SpeedControlVars *s = seq->effectdata;
 				s->frameMap = NULL;
 			}
@@ -4977,7 +4973,7 @@ static void direct_link_scene(FileData *fd, Scene *sce)
 			if (seq->strip && seq->strip->done==0) {
 				seq->strip->done = TRUE;
 				
-				if (ELEM4(seq->type, SEQ_IMAGE, SEQ_MOVIE, SEQ_RAM_SOUND, SEQ_HD_SOUND)) {
+				if (ELEM4(seq->type, SEQ_TYPE_IMAGE, SEQ_TYPE_MOVIE, SEQ_TYPE_SOUND_RAM, SEQ_TYPE_SOUND_HD)) {
 					seq->strip->stripdata = newdataadr(fd, seq->strip->stripdata);
 				}
 				else {
@@ -5292,6 +5288,14 @@ static void lib_link_screen(FileData *fd, Main *main)
 						 */
 						sima->gpd = newlibadr_us(fd, sc->id.lib, sima->gpd);
 					}
+					else if (sl->spacetype == SPACE_SEQ) {
+						SpaceSeq *sseq = (SpaceSeq *)sl;
+						
+						/* NOTE: pre-2.5, this was local data not lib data, but now we need this as lib data
+						 * so fingers crossed this works fine!
+						 */
+						sseq->gpd = newlibadr_us(fd, sc->id.lib, sseq->gpd);
+					}
 					else if (sl->spacetype == SPACE_NLA) {
 						SpaceNla *snla= (SpaceNla *)sl;
 						bDopeSheet *ads= snla->ads;
@@ -5364,11 +5368,18 @@ static void lib_link_screen(FileData *fd, Main *main)
 						SpaceClip *sclip = (SpaceClip *)sl;
 						
 						sclip->clip = newlibadr_us(fd, sc->id.lib, sclip->clip);
+						sclip->mask = newlibadr_us(fd, sc->id.lib, sclip->mask);
 						
+						sclip->scopes.track_search = NULL;
 						sclip->scopes.track_preview = NULL;
 						sclip->draw_context = NULL;
 						sclip->scopes.ok = 0;
 					}
+					else if (sl->spacetype == SPACE_LOGIC) {
+						SpaceLogic *slogic = (SpaceLogic *)sl;
+						
+						slogic->gpd = newlibadr_us(fd, sc->id.lib, slogic->gpd);
+					}
 				}
 			}
 			sc->id.flag -= LIB_NEEDLINK;
@@ -5540,6 +5551,12 @@ void lib_link_screen_restore(Main *newmain, bScreen *curscreen, Scene *curscene)
 					
 					if (saction->ads.filter_grp)
 						saction->ads.filter_grp= restore_pointer_by_name(newmain, (ID *)saction->ads.filter_grp, 0);
+						
+					
+					/* force recalc of list of channels, potentially updating the active action 
+					 * while we're at it (as it can only be updated that way) [#28962] 
+					 */
+					saction->flag |= SACTION_TEMP_NEEDCHANSYNC;
 				}
 				else if (sl->spacetype == SPACE_IMAGE) {
 					SpaceImage *sima = (SpaceImage *)sl;
@@ -5561,6 +5578,14 @@ void lib_link_screen_restore(Main *newmain, bScreen *curscreen, Scene *curscene)
 					 */
 					sima->gpd = restore_pointer_by_name(newmain, (ID *)sima->gpd, 1);
 				}
+				else if (sl->spacetype == SPACE_SEQ) {
+					SpaceSeq *sseq = (SpaceSeq *)sl;
+					
+					/* NOTE: pre-2.5, this was local data not lib data, but now we need this as lib data
+					 * so assume that here we're doing for undo only...
+					 */
+					sseq->gpd = restore_pointer_by_name(newmain, (ID *)sseq->gpd, 1);
+				}
 				else if (sl->spacetype == SPACE_NLA) {
 					SpaceNla *snla = (SpaceNla *)sl;
 					bDopeSheet *ads = snla->ads;
@@ -5627,9 +5652,15 @@ void lib_link_screen_restore(Main *newmain, bScreen *curscreen, Scene *curscene)
 					SpaceClip *sclip = (SpaceClip *)sl;
 					
 					sclip->clip = restore_pointer_by_name(newmain, (ID *)sclip->clip, 1);
+					sclip->mask = restore_pointer_by_name(newmain, (ID *)sclip->mask, 1);
 					
 					sclip->scopes.ok = 0;
 				}
+				else if (sl->spacetype == SPACE_LOGIC) {
+					SpaceLogic *slogic = (SpaceLogic *)sl;
+					
+					slogic->gpd = restore_pointer_by_name(newmain, (ID *)slogic->gpd, 1);
+				}
 			}
 		}
 	}
@@ -5870,7 +5901,8 @@ static void direct_link_screen(FileData *fd, bScreen *sc)
 			}
 			else if (sl->spacetype == SPACE_LOGIC) {
 				SpaceLogic *slogic = (SpaceLogic *)sl;
-					
+				
+				/* XXX: this is new stuff, which shouldn't be directly linking to gpd... */
 				if (slogic->gpd) {
 					slogic->gpd = newdataadr(fd, slogic->gpd);
 					direct_link_gpencil(fd, slogic->gpd);
@@ -6166,22 +6198,122 @@ static void direct_link_movieclip(FileData *fd, MovieClip *clip)
 	}
 }
 
+static void lib_link_movieTracks(FileData *fd, MovieClip *clip, ListBase *tracksbase)
+{
+	MovieTrackingTrack *track;
+
+	for (track = tracksbase->first; track; track = track->next) {
+		track->gpd = newlibadr_us(fd, clip->id.lib, track->gpd);
+	}
+}
+
 static void lib_link_movieclip(FileData *fd, Main *main)
 {
 	MovieClip *clip;
 	
 	for (clip = main->movieclip.first; clip; clip = clip->id.next) {
 		if (clip->id.flag & LIB_NEEDLINK) {
+			MovieTracking *tracking = &clip->tracking;
+			MovieTrackingObject *object;
+
 			if (clip->adt)
 				lib_link_animdata(fd, &clip->id, clip->adt);
 			
 			clip->gpd = newlibadr_us(fd, clip->id.lib, clip->gpd);
 			
+			lib_link_movieTracks(fd, clip, &tracking->tracks);
+
+			for (object = tracking->objects.first; object; object = object->next) {
+				lib_link_movieTracks(fd, clip, &object->tracks);
+			}
+
 			clip->id.flag -= LIB_NEEDLINK;
 		}
 	}
 }
 
+/* ***************** READ MOVIECLIP *************** */
+
+static void direct_link_mask(FileData *fd, Mask *mask)
+{
+	MaskLayer *masklay;
+
+	mask->adt = newdataadr(fd, mask->adt);
+
+	link_list(fd, &mask->masklayers);
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskSpline *spline;
+		MaskLayerShape *masklay_shape;
+
+		link_list(fd, &masklay->splines);
+
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			int i;
+
+			spline->points = newdataadr(fd, spline->points);
+
+			for (i = 0; i < spline->tot_point; i++) {
+				MaskSplinePoint *point = &spline->points[i];
+
+				if (point->tot_uw)
+					point->uw = newdataadr(fd, point->uw);
+			}
+		}
+
+		link_list(fd, &masklay->splines_shapes);
+
+		for (masklay_shape = masklay->splines_shapes.first; masklay_shape; masklay_shape = masklay_shape->next) {
+			masklay_shape->data = newdataadr(fd, masklay_shape->data);
+		}
+
+		masklay->act_spline = newdataadr(fd, masklay->act_spline);
+		masklay->act_point = newdataadr(fd, masklay->act_point);
+	}
+}
+
+static void lib_link_mask_parent(FileData *fd, Mask *mask, MaskParent *parent)
+{
+	parent->id = newlibadr_us(fd, mask->id.lib, parent->id);
+}
+
+static void lib_link_mask(FileData *fd, Main *main)
+{
+	Mask *mask;
+
+	mask = main->mask.first;
+	while (mask) {
+		if (mask->id.flag & LIB_NEEDLINK) {
+			MaskLayer *masklay;
+
+			if (mask->adt)
+				lib_link_animdata(fd, &mask->id, mask->adt);
+
+			for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+				MaskSpline *spline;
+
+				spline = masklay->splines.first;
+				while (spline) {
+					int i;
+
+					for (i = 0; i < spline->tot_point; i++) {
+						MaskSplinePoint *point = &spline->points[i];
+
+						lib_link_mask_parent(fd, mask, &point->parent);
+					}
+
+					lib_link_mask_parent(fd, mask, &spline->parent);
+
+					spline = spline->next;
+				}
+			}
+
+			mask->id.flag -= LIB_NEEDLINK;
+		}
+		mask = mask->id.next;
+	}
+}
+
 /* ************** GENERAL & MAIN ******************** */
 
 
@@ -6387,6 +6519,9 @@ static BHead *read_libblock(FileData *fd, Main *main, BHead *bhead, int flag, ID
 		case ID_MC:
 			direct_link_movieclip(fd, (MovieClip *)id);
 			break;
+		case ID_MSK:
+			direct_link_mask(fd, (Mask *)id);
+			break;
 	}
 	
 	/*link direct data of ID properties*/
@@ -6645,6 +6780,11 @@ static void do_versions_nodetree_multi_file_output_format_2_62_1(Scene *sce, bNo
 			char basepath[FILE_MAXDIR];
 			char filename[FILE_MAXFILE];
 			
+			/* ugly, need to remove the old inputs list to avoid bad pointer checks when adding new sockets.
+			 * sock->storage is expected to contain path info in ntreeCompositOutputFileAddSocket.
+			 */
+			node->inputs.first = node->inputs.last = NULL;
+			
 			node->storage = nimf;
 			
 			/* split off filename from the old path, to be used as socket sub-path */
@@ -6736,7 +6876,7 @@ static void do_versions_mesh_mloopcol_swap_2_62_1(Mesh *me)
 	}
 }
 
-static void do_versions_nodetree_multi_file_output_path_2_64_0(bNodeTree *ntree)
+static void do_versions_nodetree_multi_file_output_path_2_63_1(bNodeTree *ntree)
 {
 	bNode *node;
 	
@@ -6747,7 +6887,6 @@ static void do_versions_nodetree_multi_file_output_path_2_64_0(bNodeTree *ntree)
 				NodeImageMultiFileSocket *input = sock->storage;
 				/* input file path is stored in dedicated struct now instead socket name */
 				BLI_strncpy(input->path, sock->name, sizeof(input->path));
-				sock->name[0] = '\0';	/* unused */
 			}
 		}
 	}
@@ -6819,6 +6958,22 @@ static void do_versions_nodetree_frame_2_64_6(bNodeTree *ntree)
 	}
 }
 
+static void do_version_ntree_image_user_264(void *UNUSED(data), ID *UNUSED(id), bNodeTree *ntree)
+{
+	bNode *node;
+
+	for (node = ntree->nodes.first; node; node = node->next) {
+		if (ELEM(node->type, SH_NODE_TEX_IMAGE, SH_NODE_TEX_ENVIRONMENT)) {
+			NodeTexImage *tex = node->storage;
+
+			tex->iuser.frames= 1;
+			tex->iuser.sfra= 1;
+			tex->iuser.fie_ima= 2;
+			tex->iuser.ok= 1;
+		}
+	}
+}
+
 static void do_versions(FileData *fd, Library *lib, Main *main)
 {
 	/* WATCH IT!!!: pointers from libdata have not been converted */
@@ -6963,12 +7118,9 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 					
 				track = clip->tracking.tracks.first;
 				while (track) {
-					if (track->pyramid_levels == 0)
-						track->pyramid_levels = 2;
-					
 					if (track->minimum_correlation == 0.0f)
 						track->minimum_correlation = 0.75f;
-					
+
 					track = track->next;
 				}
 			}
@@ -6986,10 +7138,9 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 		
 		for (clip= main->movieclip.first; clip; clip= clip->id.next) {
 			MovieTrackingSettings *settings= &clip->tracking.settings;
-			
-			if (settings->default_pyramid_levels == 0) {
-				settings->default_tracker= TRACKER_KLT;
-				settings->default_pyramid_levels = 2;
+
+			if (settings->default_pattern_size == 0.0f) {
+				settings->default_motion_model = TRACK_MOTION_MODEL_TRANSLATION;
 				settings->default_minimum_correlation = 0.75;
 				settings->default_pattern_size = 11;
 				settings->default_search_size = 51;
@@ -7109,7 +7260,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 					tracking->settings.object_distance = 1.0f;
 				
 				if (tracking->objects.first == NULL)
-					BKE_tracking_new_object(tracking, "Camera");
+					BKE_tracking_object_add(tracking, "Camera");
 				
 				while (tracking_object) {
 					if (!tracking_object->scale)
@@ -7247,9 +7398,9 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 
 	if (main->versionfile < 263) {
 		/* set fluidsim rate. the version patch for this in 2.62 was wrong, so
-		 * try to correct it, if rate is 0.0 that's likely not intentional */
+		try to correct it, if rate is 0.0 that's likely not intentional */
 		Object *ob;
-		
+
 		for (ob = main->object.first; ob; ob = ob->id.next) {
 			ModifierData *md;
 			for (md = ob->modifiers.first; md; md = md->next) {
@@ -7348,20 +7499,18 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 			for (part = main->particle.first; part; part = part->id.next)
 				part->flag |= PART_ROTATIONS;
 		}
-		{
-			/* file output node paths are now stored in the file info struct instead socket name */
-			Scene *sce;
-			bNodeTree *ntree;
-			
-			for (sce = main->scene.first; sce; sce=sce->id.next)
-				if (sce->nodetree)
-					do_versions_nodetree_multi_file_output_path_2_64_0(sce->nodetree);
-			for (ntree = main->nodetree.first; ntree; ntree=ntree->id.next)
-				do_versions_nodetree_multi_file_output_path_2_64_0(ntree);
-		}
-
-
+	}
 
+	if (main->versionfile < 263 || (main->versionfile == 263 && main->subversionfile < 1)) {
+		/* file output node paths are now stored in the file info struct instead socket name */
+		Scene *sce;
+		bNodeTree *ntree;
+		
+		for (sce = main->scene.first; sce; sce=sce->id.next)
+			if (sce->nodetree)
+				do_versions_nodetree_multi_file_output_path_2_63_1(sce->nodetree);
+		for (ntree = main->nodetree.first; ntree; ntree=ntree->id.next)
+			do_versions_nodetree_multi_file_output_path_2_63_1(ntree);
 	}
 
 	if (main->versionfile < 263 || (main->versionfile == 263 && main->subversionfile < 3)) {
@@ -7518,21 +7667,115 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 			}
 		}
 	}
-	
-	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
-	/* WATCH IT 2!: Userdef struct init has to be in editors/interface/resources.c! */
+
+
+	if (main->versionfile < 263 || (main->versionfile == 263 && main->subversionfile < 8))
 	{
-		Scene *scene;
-		// composite redesign
-		for (scene=main->scene.first; scene; scene=scene->id.next) {
-			if (scene->nodetree) {
-				if (scene->nodetree->chunksize == 0) {
-					scene->nodetree->chunksize = 256;
+		/* set new deactivation values for game settings */
+		Scene *sce;
+
+		for (sce = main->scene.first; sce; sce = sce->id.next) {
+			/* Game Settings */
+			sce->gm.lineardeactthreshold = 0.8f;
+			sce->gm.angulardeactthreshold = 1.0f;
+			sce->gm.deactivationtime = 2.0f;
+		}
+	}
+
+	if (main->versionfile < 263 || (main->versionfile == 263 && main->subversionfile < 9)) {
+		bNodeTreeType *ntreetype = ntreeGetType(NTREE_SHADER);
+		
+		if (ntreetype && ntreetype->foreach_nodetree)
+			ntreetype->foreach_nodetree(main, NULL, do_version_ntree_image_user_264);
+	}
+
+	if (main->versionfile < 263 || (main->versionfile == 263 && main->subversionfile < 10)) {
+		{
+			Scene *scene;
+			// composite redesign
+			for (scene=main->scene.first; scene; scene=scene->id.next) {
+				if (scene->nodetree) {
+					if (scene->nodetree->chunksize == 0) {
+						scene->nodetree->chunksize = 256;
+					}
+				}
+			}
+		}
+
+		{
+			bScreen *sc;
+
+			for (sc = main->screen.first; sc; sc = sc->id.next) {
+				ScrArea *sa;
+
+				for (sa = sc->areabase.first; sa; sa = sa->next) {
+					SpaceLink *sl;
+
+					for (sl = sa->spacedata.first; sl; sl = sl->next) {
+						if (sl->spacetype == SPACE_CLIP) {
+							SpaceClip *sclip = (SpaceClip *)sl;
+
+							if (sclip->around == 0) {
+								sclip->around = V3D_CENTROID;
+							}
+						}
+					}
 				}
 			}
 		}
+
+		{
+			MovieClip *clip;
+
+			for (clip = main->movieclip.first; clip; clip = clip->id.next) {
+				clip->start_frame = 1;
+			}
+		}
 	}
-	
+
+	if (main->versionfile < 263 || (main->versionfile == 263 && main->subversionfile < 11)) {
+		MovieClip *clip;
+
+		for (clip = main->movieclip.first; clip; clip = clip->id.next) {
+			MovieTrackingTrack *track;
+
+			track = clip->tracking.tracks.first;
+			while (track) {
+				int i;
+
+				for (i = 0; i < track->markersnr; i++) {
+					MovieTrackingMarker *marker = &track->markers[i];
+
+					if (is_zero_v2(marker->pattern_corners[0]) && is_zero_v2(marker->pattern_corners[1]) &&
+					    is_zero_v2(marker->pattern_corners[3]) && is_zero_v2(marker->pattern_corners[3]))
+					{
+						marker->pattern_corners[0][0] = track->pat_min[0];
+						marker->pattern_corners[0][1] = track->pat_min[1];
+
+						marker->pattern_corners[1][0] = track->pat_max[0];
+						marker->pattern_corners[1][1] = track->pat_min[1];
+
+						marker->pattern_corners[2][0] = track->pat_max[0];
+						marker->pattern_corners[2][1] = track->pat_max[1];
+
+						marker->pattern_corners[3][0] = track->pat_min[0];
+						marker->pattern_corners[3][1] = track->pat_max[1];
+					}
+
+					if (is_zero_v2(marker->search_min) && is_zero_v2(marker->search_max)) {
+						copy_v2_v2(marker->search_min, track->search_min);
+						copy_v2_v2(marker->search_max, track->search_max);
+					}
+				}
+
+				track = track->next;
+			}
+		}
+	}
+
+	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
+	/* WATCH IT 2!: Userdef struct init has to be in editors/interface/resources.c! */
+
 	/* don't forget to set version number in blender.c! */
 }
 
@@ -7575,7 +7818,8 @@ static void lib_link_all(FileData *fd, Main *main)
 	lib_link_brush(fd, main);
 	lib_link_particlesettings(fd, main);
 	lib_link_movieclip(fd, main);
-	
+	lib_link_mask(fd, main);
+
 	lib_link_mesh(fd, main);		/* as last: tpage images with users at zero */
 	
 	lib_link_library(fd, main);		/* only init users */
@@ -7857,10 +8101,17 @@ static void expand_doit(FileData *fd, Main *mainvar, void *old)
 					
 					/* Update: the issue is that in file reading, the oldnewmap is OK, but for existing data, it has to be
 					 * inserted in the map to be found! */
-					if (id->flag & LIB_PRE_EXISTING)
-						oldnewmap_insert(fd->libmap, bhead->old, id, 1);
 					
+					/* Update: previously it was checking for id->flag & LIB_PRE_EXISTING, however that does not affect file
+					 * reading. For file reading we may need to insert it into the libmap as well, because you might have
+					 * two files indirectly linking the same datablock, and in that case we need this in the libmap for the
+					 * fd of both those files.
+					 *
+					 * The crash that this check avoided earlier was because bhead->code wasn't properly passed in, making
+					 * change_idid_adr not detect the mapping was for an ID_ID datablock. */
+					oldnewmap_insert(fd->libmap, bhead->old, id, bhead->code);
 					change_idid_adr_fd(fd, bhead->old, id);
+					
 					// commented because this can print way too much
 					// if (G.debug & G_DEBUG) printf("expand_doit: already linked: %s lib: %s\n", id->name, lib->name);
 				}
@@ -7876,7 +8127,7 @@ static void expand_doit(FileData *fd, Main *mainvar, void *old)
 			else {
 				/* this is actually only needed on UI call? when ID was already read before, and another append
 				 * happens which invokes same ID... in that case the lookup table needs this entry */
-				oldnewmap_insert(fd->libmap, bhead->old, id, 1);
+				oldnewmap_insert(fd->libmap, bhead->old, id, bhead->code);
 				// commented because this can print way too much
 				// if (G.debug & G_DEBUG) printf("expand: already read %s\n", id->name);
 			}
@@ -8259,6 +8510,7 @@ static void expand_constraints(FileData *fd, Main *mainvar, ListBase *lb)
 	}
 }
 
+#if 0 /* Disabled as it doesn't actually do anything except recurse... */
 static void expand_bones(FileData *fd, Main *mainvar, Bone *bone)
 {
 	Bone *curBone;
@@ -8267,6 +8519,7 @@ static void expand_bones(FileData *fd, Main *mainvar, Bone *bone)
 		expand_bones(fd, mainvar, curBone);
 	}
 }
+#endif
 
 static void expand_pose(FileData *fd, Main *mainvar, bPose *pose)
 {
@@ -8282,19 +8535,23 @@ static void expand_pose(FileData *fd, Main *mainvar, bPose *pose)
 }
 
 static void expand_armature(FileData *fd, Main *mainvar, bArmature *arm)
-{
-	Bone *curBone;
-	
+{	
 	if (arm->adt)
 		expand_animdata(fd, mainvar, arm->adt);
 	
-	for (curBone = arm->bonebase.first; curBone; curBone=curBone->next) {
-		expand_bones(fd, mainvar, curBone);
+#if 0 /* Disabled as this currently only recurses down the chain doing nothing */
+	{
+		Bone *curBone;
+		
+		for (curBone = arm->bonebase.first; curBone; curBone=curBone->next) {
+			expand_bones(fd, mainvar, curBone);
+		}
 	}
+#endif
 }
 
 static void expand_object_expandModifiers(void *userData, Object *UNUSED(ob),
-											  ID **idpoin)
+                                          ID **idpoin)
 {
 	struct { FileData *fd; Main *mainvar; } *data= userData;
 	
@@ -8500,7 +8757,7 @@ static void expand_scene(FileData *fd, Main *mainvar, Scene *sce)
 #ifdef DURIAN_CAMERA_SWITCH
 	{
 		TimeMarker *marker;
-
+		
 		for (marker = sce->markers.first; marker; marker = marker->next) {
 			if (marker->camera) {
 				expand_doit(fd, mainvar, marker->camera);
@@ -8761,7 +9018,7 @@ static ID *append_named_part(Main *mainl, FileData *fd, const char *idname, cons
 				else {
 					/* already linked */
 					printf("append: already linked\n");
-					oldnewmap_insert(fd->libmap, bhead->old, id, 1);
+					oldnewmap_insert(fd->libmap, bhead->old, id, bhead->code);
 					if (id->flag & LIB_INDIRECT) {
 						id->flag -= LIB_INDIRECT;
 						id->flag |= LIB_EXTERN;
@@ -9002,12 +9259,6 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
 					
 					fd = blo_openblenderfile(mainptr->curlib->filepath, basefd->reports);
 
-					/* share the mainlist, so all libraries are added immediately in a
-					 * single list. it used to be that all FileData's had their own list,
-					 * but with indirectly linking this meant we didn't catch duplicate
-					 * libraries properly */
-					fd->mainlist = mainlist;
-					
 					/* allow typing in a new lib path */
 					if (G.rt == -666) {
 						while (fd == NULL) {
@@ -9034,6 +9285,12 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
 					}
 					
 					if (fd) {
+						/* share the mainlist, so all libraries are added immediately in a
+						 * single list. it used to be that all FileData's had their own list,
+						 * but with indirectly linking this meant we didn't catch duplicate
+						 * libraries properly */
+						fd->mainlist = mainlist;
+
 						fd->reports = basefd->reports;
 						
 						if (fd->libmap)
diff --git a/source/blender/blenloader/intern/runtime.c b/source/blender/blenloader/intern/runtime.c
index 2f86c810da0..a7dae22cda2 100644
--- a/source/blender/blenloader/intern/runtime.c
+++ b/source/blender/blenloader/intern/runtime.c
@@ -39,10 +39,10 @@
 #include <errno.h>
 
 #ifdef WIN32
-#  include <io.h>		// read, open
+#  include <io.h>       // read, open
 #  include "BLI_winstuff.h"
 #else // ! WIN32
-#  include <unistd.h>		// read
+#  include <unistd.h>       // read
 #endif
 
 #include "BLO_readfile.h"
@@ -63,33 +63,33 @@ static int handle_read_msb_int(int handle)
 	if (read(handle, buf, 4) != 4)
 		return -1;
 
-	return (buf[0]<<24) + (buf[1]<<16) + (buf[2]<<8) + (buf[3]<<0);
+	return (buf[0] << 24) + (buf[1] << 16) + (buf[2] << 8) + (buf[3] << 0);
 }
 
 int BLO_is_a_runtime(const char *path)
 {
-	int res= 0, fd= BLI_open(path, O_BINARY|O_RDONLY, 0);
+	int res = 0, fd = BLI_open(path, O_BINARY | O_RDONLY, 0);
 	int datastart;
 	char buf[8];
 
-	if (fd==-1)
+	if (fd == -1)
 		goto cleanup;
 	
 	lseek(fd, -12, SEEK_END);
 	
-	datastart= handle_read_msb_int(fd);
+	datastart = handle_read_msb_int(fd);
 
-	if (datastart==-1)
+	if (datastart == -1)
 		goto cleanup;
-	else if (read(fd, buf, 8)!=8)
+	else if (read(fd, buf, 8) != 8)
 		goto cleanup;
-	else if (memcmp(buf, "BRUNTIME", 8)!=0)
+	else if (memcmp(buf, "BRUNTIME", 8) != 0)
 		goto cleanup;
 	else
-		res= 1;
+		res = 1;
 
 cleanup:
-	if (fd!=-1)
+	if (fd != -1)
 		close(fd);
 
 	return res;	
@@ -97,45 +97,45 @@ cleanup:
 
 BlendFileData *BLO_read_runtime(const char *path, ReportList *reports)
 {
-	BlendFileData *bfd= NULL;
+	BlendFileData *bfd = NULL;
 	size_t actualsize;
 	int fd, datastart;
 	char buf[8];
 
-	fd= BLI_open(path, O_BINARY|O_RDONLY, 0);
+	fd = BLI_open(path, O_BINARY | O_RDONLY, 0);
 
-	if (fd==-1) {
+	if (fd == -1) {
 		BKE_reportf(reports, RPT_ERROR, "Unable to open \"%s\": %s.", path, strerror(errno));
 		goto cleanup;
 	}
 	
-	actualsize= BLI_file_descriptor_size(fd);
+	actualsize = BLI_file_descriptor_size(fd);
 
 	lseek(fd, -12, SEEK_END);
 
-	datastart= handle_read_msb_int(fd);
+	datastart = handle_read_msb_int(fd);
 
-	if (datastart==-1) {
+	if (datastart == -1) {
 		BKE_reportf(reports, RPT_ERROR, "Unable to read  \"%s\" (problem seeking)", path);
 		goto cleanup;
 	}
-	else if (read(fd, buf, 8)!=8) {
+	else if (read(fd, buf, 8) != 8) {
 		BKE_reportf(reports, RPT_ERROR, "Unable to read  \"%s\" (truncated header)", path);
 		goto cleanup;
 	}
-	else if (memcmp(buf, "BRUNTIME", 8)!=0) {
+	else if (memcmp(buf, "BRUNTIME", 8) != 0) {
 		BKE_reportf(reports, RPT_ERROR, "Unable to read  \"%s\" (not a blend file)", path);
 		goto cleanup;
 	}
 	else {	
 		//printf("starting to read runtime from %s at datastart %d\n", path, datastart);
 		lseek(fd, datastart, SEEK_SET);
-		bfd = blo_read_blendafterruntime(fd, path, actualsize-datastart, reports);
-		fd= -1;	// file was closed in blo_read_blendafterruntime()
+		bfd = blo_read_blendafterruntime(fd, path, actualsize - datastart, reports);
+		fd = -1; // file was closed in blo_read_blendafterruntime()
 	}
 	
 cleanup:
-	if (fd!=-1)
+	if (fd != -1)
 		close(fd);
 	
 	return bfd;
diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c
index 4a69c37ae1b..5ed39ad5307 100644
--- a/source/blender/blenloader/intern/versioning_250.c
+++ b/source/blender/blenloader/intern/versioning_250.c
@@ -88,7 +88,7 @@
 #include "BKE_pointcache.h"
 #include "BKE_screen.h"
 #include "BKE_sequencer.h"
-#include "BKE_texture.h" // for open_plugin_tex
+#include "BKE_texture.h"
 #include "BKE_utildefines.h" // SWITCH_INT DATA ENDB DNA1 O_BINARY GLOB USER TEST REND
 #include "BKE_sound.h"
 
@@ -744,7 +744,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main)
 			if (scene->ed && scene->ed->seqbasep) {
 				SEQ_BEGIN (scene->ed, seq)
 				{
-					if (seq->type == SEQ_HD_SOUND) {
+					if (seq->type == SEQ_TYPE_SOUND_HD) {
 						char str[FILE_MAX];
 						BLI_join_dirfile(str, sizeof(str), seq->strip->dir, seq->strip->stripdata->name);
 						BLI_path_abs(str, main->name);
diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c
index 7b314c31488..46ef2716ade 100644
--- a/source/blender/blenloader/intern/versioning_legacy.c
+++ b/source/blender/blenloader/intern/versioning_legacy.c
@@ -1842,7 +1842,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main)
 			if (ed) {
 				SEQ_BEGIN (sce->ed, seq)
 				{
-					if (seq->type == SEQ_IMAGE || seq->type == SEQ_MOVIE)
+					if (seq->type == SEQ_TYPE_IMAGE || seq->type == SEQ_TYPE_MOVIE)
 						seq->flag |= SEQ_MAKE_PREMUL;
 				}
 				SEQ_END
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index f14837f096e..f257994bc1c 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -133,6 +133,7 @@ Any case: direct data is ALWAYS after the lib block
 #include "DNA_world_types.h"
 #include "DNA_windowmanager_types.h"
 #include "DNA_movieclip_types.h"
+#include "DNA_mask_types.h"
 
 #include "MEM_guardedalloc.h" // MEM_freeN
 #include "BLI_bitmap.h"
@@ -715,7 +716,7 @@ static void write_nodetree(WriteData *wd, bNodeTree *ntree)
 			write_node_socket(wd, sock);
 
 		
-		if (node->storage && node->type!=NODE_DYNAMIC) {
+		if (node->storage) {
 			/* could be handlerized at some point, now only 1 exception still */
 			if (ntree->type==NTREE_SHADER && (node->type==SH_NODE_CURVE_VEC || node->type==SH_NODE_CURVE_RGB))
 				write_curvemapping(wd, node->storage);
@@ -1957,7 +1958,6 @@ static void write_textures(WriteData *wd, ListBase *idbase)
 			if (tex->adt) write_animdata(wd, tex->adt);
 
 			/* direct data */
-			if (tex->type == TEX_PLUGIN && tex->plugin) writestruct(wd, DATA, "PluginTex", 1, tex->plugin);
 			if (tex->coba) writestruct(wd, DATA, "ColorBand", 1, tex->coba);
 			if (tex->type == TEX_ENVMAP && tex->env) writestruct(wd, DATA, "EnvMap", 1, tex->env);
 			if (tex->type == TEX_POINTDENSITY && tex->pd) {
@@ -2151,22 +2151,21 @@ static void write_scenes(WriteData *wd, ListBase *scebase)
 				if (seq->strip && seq->strip->done==0) {
 					/* write strip with 'done' at 0 because readfile */
 					
-					if (seq->plugin) writestruct(wd, DATA, "PluginSeq", 1, seq->plugin);
 					if (seq->effectdata) {
 						switch (seq->type) {
-						case SEQ_COLOR:
+						case SEQ_TYPE_COLOR:
 							writestruct(wd, DATA, "SolidColorVars", 1, seq->effectdata);
 							break;
-						case SEQ_SPEED:
+						case SEQ_TYPE_SPEED:
 							writestruct(wd, DATA, "SpeedControlVars", 1, seq->effectdata);
 							break;
-						case SEQ_WIPE:
+						case SEQ_TYPE_WIPE:
 							writestruct(wd, DATA, "WipeVars", 1, seq->effectdata);
 							break;
-						case SEQ_GLOW:
+						case SEQ_TYPE_GLOW:
 							writestruct(wd, DATA, "GlowVars", 1, seq->effectdata);
 							break;
-						case SEQ_TRANSFORM:
+						case SEQ_TYPE_TRANSFORM:
 							writestruct(wd, DATA, "TransformVars", 1, seq->effectdata);
 							break;
 						}
@@ -2186,9 +2185,9 @@ static void write_scenes(WriteData *wd, ListBase *scebase)
 					if (seq->flag & SEQ_USE_COLOR_BALANCE && strip->color_balance) {
 						writestruct(wd, DATA, "StripColorBalance", 1, strip->color_balance);
 					}
-					if (seq->type==SEQ_IMAGE)
+					if (seq->type==SEQ_TYPE_IMAGE)
 						writestruct(wd, DATA, "StripElem", MEM_allocN_len(strip->stripdata) / sizeof(struct StripElem), strip->stripdata);
-					else if (seq->type==SEQ_MOVIE || seq->type==SEQ_RAM_SOUND || seq->type == SEQ_HD_SOUND)
+					else if (seq->type==SEQ_TYPE_MOVIE || seq->type==SEQ_TYPE_SOUND_RAM || seq->type == SEQ_TYPE_SOUND_HD)
 						writestruct(wd, DATA, "StripElem", 1, strip->stripdata);
 					
 					strip->done = TRUE;
@@ -2754,6 +2753,59 @@ static void write_movieclips(WriteData *wd, ListBase *idbase)
 	mywrite(wd, MYWRITE_FLUSH, 0);
 }
 
+static void write_masks(WriteData *wd, ListBase *idbase)
+{
+	Mask *mask;
+
+	mask = idbase->first;
+	while (mask) {
+		if (mask->id.us > 0 || wd->current) {
+			MaskLayer *masklay;
+
+			writestruct(wd, ID_MSK, "Mask", 1, mask);
+
+			if (mask->adt)
+				write_animdata(wd, mask->adt);
+
+			for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+				MaskSpline *spline;
+				MaskLayerShape *masklay_shape;
+
+				writestruct(wd, DATA, "MaskLayer", 1, masklay);
+
+				for (spline = masklay->splines.first; spline; spline = spline->next) {
+					int i;
+
+					void *points_deform = spline->points_deform;
+					spline->points_deform = NULL;
+
+					writestruct(wd, DATA, "MaskSpline", 1, spline);
+					writestruct(wd, DATA, "MaskSplinePoint", spline->tot_point, spline->points);
+
+					spline->points_deform = points_deform;
+
+					for (i = 0; i < spline->tot_point; i++) {
+						MaskSplinePoint *point = &spline->points[i];
+
+						if (point->tot_uw)
+							writestruct(wd, DATA, "MaskSplinePointUW", point->tot_uw, point->uw);
+					}
+				}
+
+				for (masklay_shape = masklay->splines_shapes.first; masklay_shape; masklay_shape = masklay_shape->next) {
+					writestruct(wd, DATA, "MaskLayerShape", 1, masklay_shape);
+					writedata(wd, DATA, masklay_shape->tot_vert * sizeof(float) * MASK_OBJECT_SHAPE_ELEM_SIZE, masklay_shape->data);
+				}
+			}
+		}
+
+		mask = mask->id.next;
+	}
+
+	/* flush helps the compression for undo-save */
+	mywrite(wd, MYWRITE_FLUSH, 0);
+}
+
 /* context is usually defined by WM, two cases where no WM is available:
  * - for forward compatibility, curscreen has to be saved
  * - for undofile, curscene needs to be saved */
@@ -2838,6 +2890,7 @@ static int write_file_handle(Main *mainvar, int handle, MemFile *compare, MemFil
 		write_screens  (wd, &mainvar->screen);
 	}
 	write_movieclips (wd, &mainvar->movieclip);
+	write_masks    (wd, &mainvar->mask);
 	write_scenes   (wd, &mainvar->scene);
 	write_curves   (wd, &mainvar->curve);
 	write_mballs   (wd, &mainvar->mball);
diff --git a/source/blender/blenpluginapi/SConscript b/source/blender/blenpluginapi/SConscript
deleted file mode 100644
index fe37091bb95..00000000000
--- a/source/blender/blenpluginapi/SConscript
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/python
-Import ('env')
-
-sources = env.Glob('intern/*.c')
-
-incs = '. .. #/intern/guardedalloc ../blenlib ../imbuf ../makesdna ../blenloader'
-
-defs = []
-
-incs += ' ' + env["BF_PTHREADS_INC"]
-
-if env['WITH_BF_QUICKTIME']:
-    defs.append('WITH_QUICKTIME')
-    incs += ' ' + env['BF_QUICKTIME_INC']
-
-if env['OURPLATFORM'] == 'linux':
-    cflags='-pthread'
-    incs += ' ../../../extern/binreloc/include'
-
-if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
-    incs += ' ' + env['BF_PTHREADS_INC']
-
-env.BlenderLib ( libname = 'bf_blenpluginapi', sources = sources, includes = Split(incs), defines = defs, libtype=['core'], priority = [170] )
diff --git a/source/blender/blenpluginapi/documentation.h b/source/blender/blenpluginapi/documentation.h
deleted file mode 100644
index 8a15109428f..00000000000
--- a/source/blender/blenpluginapi/documentation.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/**
- * \file blender/blenpluginapi/documentation.h
- * \ingroup blpluginapi
- *
- * \mainpage plugin API - the access point for texture and sequence
- * plugins
- *
- * \section about About the plugin API
- *
- * This API wraps functions that are used by texture and sequence
- * plugins. They are explicitly wrapped in order to make the
- * dependencies to the rest of the system clear.
- *
- * \section issues Known issues with the plugin API
- *
- * - It can be difficult at times to get access to the API functions
- * linked into the final executable. On gcc, the -fpic and -shared
- * flags take care of this. On Irix, -shared is needed, but you also
- * need a reference to the function to get the handle. This has
- * momentarily been taken care of by pluginapi_force_ref().
- *
- * - Plugins need to define three functions that are needed for
- * version bookkeeping and information. The plugin loading code
- * explicitly checks for these functions. The nanes depend on whether
- * it is a texture or sequence plugin.
- *
- * - The plugin loading occurs in sequence.c and texture.c. The
- * following functions are involved:
- *   - open_plugin_seq() (used in readfile.c, editseq.c, sequence.c)
- *   - add_plugin_seq()  (used in editseq.c, sequence.c)
- *   - free_plugin_seq() (used in editseq.c, sequence.c)
- *   - open_plugin_tex() (used in texture.c, readfile.c)
- *   - add_plugin_tex()  (used in texture.c, buttons.c)
- *   - free_plugin_tex() (used in texture.c, buttons.c)
- *   - test_dlerr()      (used in texture.c, sequence.c)
- * Since the plugins are about to phase out, we will not sanitize this
- * code. It will be removed as soon as the replacing system is in
- * place.
- * 
- * \section dependencies Dependencies
- *
- * The plugins wraps functions from IMB and BLI. In addition, they
- * define some useful variables.
- */
diff --git a/source/blender/blenpluginapi/externdef.h b/source/blender/blenpluginapi/externdef.h
deleted file mode 100644
index 154b276c851..00000000000
--- a/source/blender/blenpluginapi/externdef.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright (c) 1999, Not a Number / NeoGeo b.v. 
- * 
- * All rights reserved.
- * 
- * Contact:      info@blender.org   
- * Information:  http://www.blender.org
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef __EXTERNDEF_H__
-#define __EXTERNDEF_H__
-
-/** \file blender/blenpluginapi/externdef.h
- *  \ingroup blpluginapi
- */
-
-#ifdef WIN32
- #ifdef PLUGIN_INTERN
-  #define LIBEXPORT	__declspec(dllexport)
-  #define LIBIMPORT	__declspec(dllexport)
- #else 
-  #define LIBEXPORT	__declspec(dllexport)
-  #define LIBIMPORT	extern __declspec(dllimport)
- #endif
-#elif !defined(WIN32)
-	#define LIBEXPORT extern
-	#define LIBIMPORT extern
-#endif
-
-#endif /* __EXTERNDEF_H__ */
diff --git a/source/blender/blenpluginapi/floatpatch.h b/source/blender/blenpluginapi/floatpatch.h
deleted file mode 100644
index d1c7edcc307..00000000000
--- a/source/blender/blenpluginapi/floatpatch.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Copyright (c) 1999, Not a Number / NeoGeo b.v. 
- *
- * All rights reserved.
- * 
- * Contact:      info@blender.org   
- * Information:  http://www.blender.org
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef __FLOATPATCH_H__
-#define __FLOATPATCH_H__
-
-/** \file blender/blenpluginapi/floatpatch.h
- *  \ingroup blpluginapi
- */
-
-/* floating point libs differ at systems... with these defines it comilies at all! */
-
-#ifdef MIPS1
-#else
-
-#define fabsf(a)	fabs((double)(a))
-
-#define facos		acosf
-#define acosf(a)	acos((double)(a))
-
-#define fasin		asinf
-#define asinf(a)	asin((double)(a))
-
-#define fatan		atanf
-#define atanf(a)	atan((double)(a))
-
-#define fatan2			atan2f
-#define atan2f(a, b)	atan2((double)(a), (double)(b))
-
-#define fmodf(a, b)		fmod((double)(a), (double)(b))
-
-#define fcos		cosf
-#define cosf(a)		cos((double)(a))
-
-#define fsin		sinf
-#define sinf(a)		sin((double)(a))
-
-#define ftan		tanf
-#define tanf(a)		tan((double)(a))
-
-#define fexp		expf
-#define expf(a)		exp((double)(a))
-
-#define flog		logf
-#define logf(a)		log((double)(a))
-
-#define flog10		log10f
-#define log10f(a)	log10((double)(a))
-
-#define fsqrt		sqrtf
-#define sqrtf(a)	sqrt((double)(a))
-
-#define fceil		ceilf
-#define ceilf(a)	ceil((double)(a))
-
-#define ffloor		floorf
-#define floorf(a)	floor((double)(a))
-
-#define fpow		powf
-#define powf(a, b)	pow((double)(a), (double)(b))
-
-/* #endif  */
-
-#endif
-
-#endif /* __FLOATPATCH_H__ */
-
diff --git a/source/blender/blenpluginapi/iff.h b/source/blender/blenpluginapi/iff.h
deleted file mode 100644
index 98382aca889..00000000000
--- a/source/blender/blenpluginapi/iff.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Copyright (c) 1999, Not a Number / NeoGeo b.v. 
- * 
- * All rights reserved.
- * 
- * Contact:      info@blender.org   
- * Information:  http://www.blender.org
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef __IFF_H__
-#define __IFF_H__
-
-/** \file blender/blenpluginapi/iff.h
- *  \ingroup blpluginapi
- */
-
-#include <sys/types.h>
-#include "util.h"
-#include "externdef.h"
-
-struct ImMetaData;
-
-#define IB_MIPMAP_LEVELS	20
-#define IB_FILENAME_SIZE	1023
-
-typedef struct ImBuf {
-	struct ImBuf *next, *prev;	/**< allow lists of ImBufs, for caches or flipbooks */
-	short	x, y;				/**< width and Height of our image buffer */
-	unsigned char	depth;		/**< Active amount of bits/bitplanes */
-	unsigned int	*rect;		/**< pixel values stored here */
-	unsigned int	*crect;		/**< color corrected pixel values stored here */
-	int	flags;				/**< Controls which components should exist. */
-	int	mall;				/**< what is malloced internal, and can be freed */
-	int	*zbuf;				/**< z buffer data, original zbuffer */
-	float *zbuf_float;		/**< z buffer data, camera coordinates */
-	void *userdata;			/**< temporary storage, only used by baking at the moment */
-	unsigned char *encodedbuffer;     /**< Compressed image only used with png currently */
-	unsigned int   encodedsize;       /**< Size of data written to encodedbuffer */
-	unsigned int   encodedbuffersize; /**< Size of encodedbuffer */
-
-	float *rect_float;		/** < floating point Rect equivalent
-							 * Linear RGB color space - may need gamma correction to
-							 * sRGB when generating 8bit representations */
-	int channels;			/**< amount of channels in rect_float (0 = 4 channel default) */
-	float dither;			/**< random dither value, for conversion from float -> byte rect */
-	short profile;			/** color space/profile preset that the byte rect buffer represents */
-	char profile_filename[1024];		/** to be implemented properly, specific filename for custom profiles */
-
-	/* mipmapping */
-	struct ImBuf *mipmap[IB_MIPMAP_LEVELS]; /**< MipMap levels, a series of halved images */
-	int miplevels;
-
-	/* externally used flags */
-	int index;				/* reference index for ImBuf lists */
-	int	userflags;			/* used to set imbuf to dirty and other stuff */
-	struct ImMetaData *metadata;
-
-	/* file information */
-	int	ftype;						/* file type we are going to save as */
-	char name[IB_FILENAME_SIZE];	/* filename associated with this image */
-
-	/* memory cache limiter */
-	struct MEM_CacheLimiterHandle_s *c_handle; /* handle for cache limiter */
-	int refcounter; /* reference counter for multiple users */
-} ImBuf;
-
-LIBIMPORT struct ImBuf *allocImBuf(short, short, uchar, uint);
-LIBIMPORT struct ImBuf *dupImBuf(struct ImBuf *);
-LIBIMPORT void freeImBuf(struct ImBuf*);
-
-LIBIMPORT short saveiff(struct ImBuf *, char *, int);
-
-LIBIMPORT struct ImBuf *loadifffile(int, int);
-LIBIMPORT struct ImBuf *loadiffname(char *, int);
-LIBIMPORT struct ImBuf *testiffname(char *, int);
-
-LIBIMPORT struct ImBuf *onehalf(struct ImBuf *);
-LIBIMPORT struct ImBuf *half_x(struct ImBuf *);
-LIBIMPORT struct ImBuf *half_y(struct ImBuf *);
-LIBIMPORT struct ImBuf *double_x(struct ImBuf *);
-LIBIMPORT struct ImBuf *double_y(struct ImBuf *);
-LIBIMPORT struct ImBuf *double_fast_x(struct ImBuf *);
-LIBIMPORT struct ImBuf *double_fast_y(struct ImBuf *);
-
-LIBIMPORT int ispic(char *);
-
-LIBIMPORT struct ImBuf *scaleImBuf(struct ImBuf *, short, short);
-LIBIMPORT struct ImBuf *scalefastImBuf(struct ImBuf *, short, short);
-
-LIBIMPORT void de_interlace(struct ImBuf *ib);
-LIBIMPORT void interlace(struct ImBuf *ib);
-
-LIBIMPORT void IMB_rectcpy(struct ImBuf *dbuf, struct ImBuf *sbuf, 
-	int destx, int desty, int srcx, int srcy, int width, int height);
-
-LIBIMPORT void IMB_rectfill(struct ImBuf *drect, const float col[4]);
-LIBIMPORT void IMB_rectfill_area(struct ImBuf *ibuf, float *col, int x1, int y1, int x2, int y2);
-LIBIMPORT void buf_rectfill_area(unsigned char *rect, float *rectf, int width, int height, const float col[4], int x1, int y1, int x2, int y2);
-LIBIMPORT void IMB_rectfill_alpha(struct ImBuf *drect, const float value);
-
-#endif /* __IFF_H__ */
-
diff --git a/source/blender/blenpluginapi/intern/pluginapi.c b/source/blender/blenpluginapi/intern/pluginapi.c
deleted file mode 100644
index efdd11352c6..00000000000
--- a/source/blender/blenpluginapi/intern/pluginapi.c
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- * Wrappers for the plugin api. This api is up for removal.
- */
-
-/** \file blender/blenpluginapi/intern/pluginapi.c
- *  \ingroup blenpluginapi
- */
-
-
-/* There are four headers making up the plugin api:
- * - floatpatch.h : Wraps math functions for mips platforms, no code
- *                  required.
- * - iff.h        : Defines, macros and functions for dealing
- *                  with image buffer things.
- * - plugin.h     : Wraps some plugin handling types, accesses noise
- *                  functions.
- * - util.h       : Useful defines, memory management.
- */
-
-#define PLUGIN_INTERN /* This tells the LIBEXPORT macro to compile with
-                       * dll export set on windows */
-
-#ifdef WIN32
-#include "blenpluginapi/util.h"
-#else
-#include "blenpluginapi/util.h"
-#endif
-#include "iff.h"
-#include "plugin.h"
-#include "MEM_guardedalloc.h"
-
-#include "BLO_sys_types.h" // needed for intptr_t
-
-#include "BLI_blenlib.h"  /* util and noise functions */
-#include "BLI_threads.h"  /* For threadsfe guardedalloc malloc/calloc/free */
-#include "IMB_imbuf.h"    /* image buffer stuff       */
-#define GET_INT_FROM_POINTER(i) ((int)(intptr_t)(i)) /* should use BKE_utildefines.h */
-
-/* -------------------------------------------------------------------------- */
-/* stuff from util.h                                                          */ 
-/* -------------------------------------------------------------------------- */
-
-LIBEXPORT void *mallocN(int len, char *str)
-{
-	return MEM_mallocN(len, str);
-}
-
-LIBEXPORT void *callocN(int len, char *str)
-{
-	return MEM_callocN(len, str);
-}
-
-LIBEXPORT short freeN(void *vmemh)
-{
-	return MEM_freeN(vmemh);
-}
-
-/* these are not needed anymore, mallocN/callocN/freeN is now threadsafe */
-LIBEXPORT void *mallocT(int len, char *str)
-{
-	return MEM_mallocN(len, str);
-}
-
-LIBEXPORT void *callocT(int len, char *str)
-{
-	return MEM_callocN(len, str);
-}
-
-LIBEXPORT void freeT(void *vmemh)
-{
-	MEM_freeN(vmemh);
-	return;
-}
-
-
-/* -------------------------------------------------------------------------- */
-/* stuff from iff.h                                                           */ 
-/* -------------------------------------------------------------------------- */
-
-LIBEXPORT struct ImBuf *allocImBuf(short x,
-						 short y,
-						 uchar d,
-						 uint flags)
-{
-	return IMB_allocImBuf(x, y, d, flags);
-}
-
-
-LIBEXPORT struct ImBuf *dupImBuf(struct ImBuf *ib)
-{
-	return IMB_dupImBuf(ib);
-}
-	
-LIBEXPORT void freeImBuf(struct ImBuf* ib)
-{
-	IMB_freeImBuf(ib);
-}
-
-LIBEXPORT short saveiff(struct ImBuf *ib,
-			  char *c,
-			  int i)
-{
-	return IMB_saveiff(ib, c, i);
-}
-
-LIBEXPORT struct ImBuf *loadifffile(int a,
-						  int b)
-{
-	return IMB_loadifffile(a, b, "loadifffile");
-}
-
-LIBEXPORT struct ImBuf *loadiffname(char *n,
-						  int flags)
-{
-	return IMB_loadiffname(n, flags);
-}
-	
-LIBEXPORT struct ImBuf *testiffname(char *n,
-						  int flags)
-{
-	return IMB_testiffname(n, flags);
-}
-
-LIBEXPORT struct ImBuf *onehalf(struct ImBuf *ib)
-{
-	return IMB_onehalf(ib);
-}
-
-LIBEXPORT struct ImBuf *half_x(struct ImBuf *ib)
-{
-	return IMB_half_x(ib);
-}
-
-LIBEXPORT struct ImBuf *half_y(struct ImBuf *ib)
-{
-	return IMB_half_y(ib);
-}
-
-LIBEXPORT struct ImBuf *double_x(struct ImBuf *ib)
-{
-	return IMB_double_x(ib);
-}
-
-LIBEXPORT struct ImBuf *double_y(struct ImBuf *ib)
-{
-	return IMB_double_y(ib);
-}
-
-LIBEXPORT struct ImBuf *double_fast_x(struct ImBuf *ib)
-{
-	return IMB_double_fast_x(ib);
-}
-
-LIBEXPORT struct ImBuf *double_fast_y(struct ImBuf *ib)
-{
-	return IMB_double_fast_y(ib);
-}
-
-LIBEXPORT int ispic(char * name)
-{
-	return IMB_ispic(name);
-}
-
-/* still the same name */
-/*  void (*ditherfunc)(struct ImBuf *, short, short) {} */
-
-LIBEXPORT struct ImBuf *scaleImBuf(struct ImBuf *ib,
-						 short nx,
-						 short ny)
-{
-	return IMB_scaleImBuf(ib, nx, ny);
-}
-
-LIBEXPORT struct ImBuf *scalefastImBuf(struct ImBuf *ib,
-							 short x,
-							 short y)
-{
-	return IMB_scalefastImBuf(ib, x, y);
-}
-
-	/* Extra ones that some NaN (read Ton) plugins use,
-	 * even though they aren't in the header
-	 */
-
-LIBEXPORT void interlace(struct ImBuf *ibuf)
-{
-	IMB_interlace(ibuf);
-}
-
-LIBEXPORT void de_interlace(struct ImBuf *ib)
-{
-	IMB_de_interlace(ib);
-}
-
-/* -------------------------------------------------------------------------- */
-/* stuff from plugin.h                                                        */ 
-/* -------------------------------------------------------------------------- */
-
-/* These three need to be defined in the plugin itself. The plugin
- * loader looks for these functions to check whether it can use the
- * plugin. For sequences, something similar exists. */
-/*  int plugin_tex_getversion(void); */
-/*  int plugin_seq_getversion(void); */
-/*  void plugin_getinfo(PluginInfo *); */
-
-LIBEXPORT float hnoise(float noisesize,
-			 float x,
-			 float y,
-			 float z)
-{
-	return BLI_hnoise(noisesize, x, y, z);
-}
-
-LIBEXPORT float hnoisep(float noisesize,
-			  float x,
-			  float y,
-			  float z)
-{
-	return BLI_hnoisep(noisesize, x, y, z);
-}
-
-LIBEXPORT float turbulence(float noisesize,
-				 float x,
-				 float y,
-				 float z,
-				 int depth)
-{
-	return BLI_turbulence(noisesize, x, y, z, depth);
-}
-
-LIBEXPORT float turbulence1(float noisesize,
-				  float x,
-				  float y,
-				  float z,
-				  int depth)
-{
-	return BLI_turbulence1(noisesize, x, y, z, depth);
-}
-
-/* -------------------------------------------------------------------------- */
-
-	/* Stupid hack - force the inclusion of all of the
-	 * above functions in the binary by 'using' each one...
-	 * Otherwise they will not be imported from the archive
-	 * library on Unix. -zr
-	 */
-int pluginapi_force_ref(void);
-
-int pluginapi_force_ref(void)
-{
-	return 
-		GET_INT_FROM_POINTER(mallocN) +
-		GET_INT_FROM_POINTER(callocN) +
-		GET_INT_FROM_POINTER(freeN) +
-		GET_INT_FROM_POINTER(mallocT) +
-		GET_INT_FROM_POINTER(callocT) +
-		GET_INT_FROM_POINTER(freeT) +
-		GET_INT_FROM_POINTER(allocImBuf) +
-		GET_INT_FROM_POINTER(dupImBuf) +
-		GET_INT_FROM_POINTER(freeImBuf) +
-		GET_INT_FROM_POINTER(saveiff) +
-		GET_INT_FROM_POINTER(loadifffile) +
-		GET_INT_FROM_POINTER(loadiffname) +
-		GET_INT_FROM_POINTER(testiffname) +
-		GET_INT_FROM_POINTER(onehalf) +
-		GET_INT_FROM_POINTER(half_x) +
-		GET_INT_FROM_POINTER(half_y) +
-		GET_INT_FROM_POINTER(double_x) +
-		GET_INT_FROM_POINTER(double_y) +
-		GET_INT_FROM_POINTER(double_fast_x) +
-		GET_INT_FROM_POINTER(double_fast_y) +
-		GET_INT_FROM_POINTER(ispic) +
-		GET_INT_FROM_POINTER(scaleImBuf) +
-		GET_INT_FROM_POINTER(scalefastImBuf) +
-		GET_INT_FROM_POINTER(hnoise) +
-		GET_INT_FROM_POINTER(hnoisep) +
-		GET_INT_FROM_POINTER(turbulence) +
-		GET_INT_FROM_POINTER(turbulence1) +
-		GET_INT_FROM_POINTER(de_interlace) +
-		GET_INT_FROM_POINTER(interlace);
-}
diff --git a/source/blender/blenpluginapi/plugin.DEF b/source/blender/blenpluginapi/plugin.DEF
deleted file mode 100644
index ae2692c7cff..00000000000
--- a/source/blender/blenpluginapi/plugin.DEF
+++ /dev/null
@@ -1,40 +0,0 @@
-LIBRARY
-EXPORTS
-mallocN
-callocN
-freeN
-mallocT
-callocT
-freeT
-hnoise
-hnoisep
-turbulence
-turbulence1
-allocImBuf
-dupImBuf
-freeImBuf
-converttocmap
-saveiff
-loadiffmem
-loadifffile
-loadiffname
-testiffname
-onehalf
-onethird
-halflace
-half_x
-half_y
-double_x
-double_y
-double_fast_x
-double_fast_y
-ispic
-dit2
-dit0
-scaleImBuf
-scalefastImBuf
-scalefieldImBuf
-scalefastfieldImBuf
-de_interlace
-interlace
-gamwarp
diff --git a/source/blender/blenpluginapi/plugin.h b/source/blender/blenpluginapi/plugin.h
deleted file mode 100644
index d7acb988ccd..00000000000
--- a/source/blender/blenpluginapi/plugin.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Copyright (c) 1999, Not a Number / NeoGeo b.v. 
- * 
- * All rights reserved.
- * 
- * Contact:      info@blender.org   
- * Information:  http://www.blender.org
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef __PLUGIN_H__
-#define __PLUGIN_H__
-
-/** \file blender/blenpluginapi/plugin.h
- *  \ingroup blpluginapi
- */
-
-#include "externdef.h"
-#include "iff.h"
-#include "util.h"
-#include "floatpatch.h"
-
-#define B_PLUGIN_VERSION	6
-
-typedef	int (*TexDoit)(int, void*, float*, float*, float*, float*);
-typedef	int (*TexDoitold)(int, void*, float*, float*, float*);
-typedef void (*SeqDoit)(void*, float, float, int, int, ImBuf*, ImBuf*, ImBuf*, ImBuf*);
-
-typedef struct VarStruct {
-	int type;
-	char name[16];
-	float def, min, max;
-	char tip[80];
-} VarStruct;
-
-typedef struct _PluginInfo {
-	char *name;
-	char *snames;
-
-	int stypes;
-	int nvars;
-	VarStruct *varstr;
-	float *result;
-	float *cfra;
-
-	void (*init)(void);
-	void (*callback)(int);
-	TexDoit tex_doit;
-	SeqDoit seq_doit;
-
-	void (*instance_init)(void *);
-} PluginInfo;
-
-LIBEXPORT int plugin_tex_getversion(void);
-LIBEXPORT int plugin_seq_getversion(void);
-LIBEXPORT void plugin_getinfo(PluginInfo *);
-
-/* *************** defines for button types ************** */
-
-#define CHA	32
-#define INT	96
-#define FLO	128
-
-#define TOG	(3<<9)
-#define	NUM	(5<<9)
-#define LABEL	(10<<9)
-#define NUMSLI	(14<<9)
-#define COL	(15<<9)
-
-/* return values (bitfield like) for textures (DNA_texture_types.h) */
-#define TEX_INT         0
-#define TEX_RGB         1
-#define TEX_NOR         2
-
-/* *************** API functions ******************** */
-
-	/* derived from the famous Perlin noise */
-LIBIMPORT float hnoise(float noisesize, float x, float y, float z);
-	/* the original Perlin noise */
-LIBIMPORT float hnoisep(float noisesize, float x, float y, float z);
-
-	/* soft turbulence */
-LIBIMPORT float turbulence(float noisesize, float x, float y, float z, int depth);
-	/* hard turbulence */
-LIBIMPORT float turbulence1(float noisesize, float x, float y, float z, int depth);
-
-#endif /* __PLUGIN_H__ */
-
diff --git a/source/blender/blenpluginapi/util.h b/source/blender/blenpluginapi/util.h
deleted file mode 100644
index 8a049350bc6..00000000000
--- a/source/blender/blenpluginapi/util.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Copyright (c) 1999, Not a Number / NeoGeo b.v. 
- * 
- * All rights reserved.
- * 
- * Contact:      info@blender.org   
- * Information:  http://www.blender.org
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/** \file blender/blenpluginapi/util.h
- *  \ingroup blpluginapi
- */
-
-#ifndef __UTIL_H__
-#define __UTIL_H__
-
-#include <sys/types.h>
-#include <stdlib.h>
-#include <string.h>
-#include "externdef.h"
-
-#ifndef	NULL
-#define NULL			0
-#endif
-
-#ifndef	FALSE
-#define FALSE			0
-#endif
-
-#ifndef	TRUE
-#define TRUE			1
-#endif
-
-#ifndef ulong
-#define ulong unsigned long
-#endif
-
-#ifndef ushort
-#define ushort unsigned short
-#endif
-
-#ifndef uchar
-#define uchar unsigned char
-#endif
-
-#ifndef uint
-#define uint unsigned int
-#endif
-
-#define MIN2(x,y)		( (x)<(y) ? (x) : (y) )
-#define MIN3(x,y,z)		MIN2( MIN2((x),(y)) , (z) )
-#define MIN4(x,y,z,a)		MIN2( MIN2((x),(y)) , MIN2((z),(a)) )
-
-#define MAX2(x,y)		( (x)>(y) ? (x) : (y) )
-#define MAX3(x,y,z)		MAX2( MAX2((x),(y)) , (z) )
-#define MAX4(x,y,z,a)		MAX2( MAX2((x),(y)) , MAX2((z),(a)) )
-
-#define SWAP(type, a, b)	{ type sw_ap; sw_ap=(a); (a)=(b); (b)=sw_ap; }
-
-#define ABS(x)	((x) < 0 ? -(x) : (x))
-#define FLOOR(x) ((int)(x) - ((x) < 0 && (x) != (int)(x)))
-#define CEIL(x) ((int)(x) + ((x) > 0 && (x) != (int)(x)))
-#define STEP(a,b)	( (a)>(b) ? (1) : (0) )
-#define CLAMP(val, low, high) ((val>high)?high:((val<low)?low:val))
-#define LERP(t,x0,x1) ((x0) + (t)*((x1)-(x0)))
-#define PULSE(a,b,x) (STEP((a),(x)) - STEP((b),(x)))
-#define BOXSTEP(a,b,x) CLAMP(((x)-(a))/((b)-(a)),0,1)
-
-#define PRINT(d, var1)	printf(# var1 ":%" # d "\n", var1)
-#define PRINT2(d, e, var1, var2)	printf(# var1 ":%" # d " " # var2 ":%" # e "\n", var1, var2)
-#define PRINT3(d, e, f, var1, var2, var3)	printf(# var1 ":%" # d " " # var2 ":%" # e " " # var3 ":%" # f "\n", var1, var2, var3)
-#define PRINT4(d, e, f, g, var1, var2, var3, var4)	printf(# var1 ":%" # d " " # var2 ":%" # e " " # var3 ":%" # f " " # var4 ":%" # g "\n", var1, var2, var3, var4)
-
-LIBEXPORT          void *mallocN(int len, char *str);
-LIBEXPORT          void *callocN(int len, char *str);
-LIBEXPORT          short freeN(void *vmemh);   
-
-LIBEXPORT          void *mallocT(int len, char *str);
-LIBEXPORT          void *callocT(int len, char *str);
-LIBEXPORT          void freeT(void *vmemh);   
-
-#endif /* __UTIL_H__ */
-
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c
index 736a43e1676..a14d602c586 100644
--- a/source/blender/bmesh/intern/bmesh_core.c
+++ b/source/blender/bmesh/intern/bmesh_core.c
@@ -42,11 +42,11 @@
 // #define USE_DEBUG_INDEX_MEMCHECK
 
 #ifdef USE_DEBUG_INDEX_MEMCHECK
-#define DEBUG_MEMCHECK_INDEX_INVALIDATE(ele)               \
-	{                                                      \
-		int undef_idx;                                     \
-		BM_elem_index_set(ele, undef_idx); /* set_ok_invalid */  \
-	}                                                      \
+#define DEBUG_MEMCHECK_INDEX_INVALIDATE(ele)                                  \
+	{                                                                         \
+		int undef_idx;                                                        \
+		BM_elem_index_set(ele, undef_idx); /* set_ok_invalid */               \
+	} (void)0
 
 #endif
 
@@ -92,7 +92,7 @@ BMVert *BM_vert_create(BMesh *bm, const float co[3], const BMVert *example)
  * \brief Main function for creating a new edge.
  *
  * \note Duplicate edges are supported by the API however users should _never_ see them.
- * so unless you need a unique edge or know the edge won't exist, you should call wih \a nodouble=TRUE
+ * so unless you need a unique edge or know the edge won't exist, you should call wih \a nodouble = TRUE
  */
 BMEdge *BM_edge_create(BMesh *bm, BMVert *v1, BMVert *v2, const BMEdge *example, int nodouble)
 {
diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c
index 1720ee4f55a..59817043eed 100644
--- a/source/blender/bmesh/intern/bmesh_marking.c
+++ b/source/blender/bmesh/intern/bmesh_marking.c
@@ -458,7 +458,7 @@ static int bm_mesh_flag_count(BMesh *bm, const char htype, const char hflag,
 	BMIter iter;
 	int tot = 0;
 
-	BLI_assert(ELEM(TRUE, FALSE, test_for_enabled));
+	BLI_assert(ELEM(test_for_enabled, TRUE, FALSE));
 
 	if (htype & BM_VERT) {
 		for (ele = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, NULL); ele; ele = BM_iter_step(&iter)) {
diff --git a/source/blender/bmesh/intern/bmesh_marking.h b/source/blender/bmesh/intern/bmesh_marking.h
index 12ebaedac60..406971652dc 100644
--- a/source/blender/bmesh/intern/bmesh_marking.h
+++ b/source/blender/bmesh/intern/bmesh_marking.h
@@ -27,8 +27,7 @@
  *  \ingroup bmesh
  */
 
-typedef struct BMEditSelection
-{
+typedef struct BMEditSelection {
 	struct BMEditSelection *next, *prev;
 	BMElem *ele;
 	char htype;
@@ -82,7 +81,7 @@ void    BM_editselection_plane(BMEditSelection *ese,  float r_plane[3]);
 #define BM_select_history_store_notest(bm, ele) _bm_select_history_store_notest(bm, &(ele)->head)
 #define BM_select_history_store(bm, ele)        _bm_select_history_store(bm,        &(ele)->head)
 
-int  _bm_select_history_check(BMesh *bm, const  BMHeader *ele);
+int  _bm_select_history_check(BMesh *bm,  const BMHeader *ele);
 int  _bm_select_history_remove(BMesh *bm,       BMHeader *ele);
 void _bm_select_history_store_notest(BMesh *bm, BMHeader *ele);
 void _bm_select_history_store(BMesh *bm,        BMHeader *ele);
diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c
index 82ad5c1805b..65288522b3b 100644
--- a/source/blender/bmesh/intern/bmesh_operators.c
+++ b/source/blender/bmesh/intern/bmesh_operators.c
@@ -698,7 +698,7 @@ static void bmo_slot_buffer_from_hflag(BMesh *bm, BMOperator *op, const char *sl
 	BMOpSlot *output = BMO_slot_get(op, slotname);
 	int totelement = 0, i = 0;
 
-	BLI_assert(ELEM(TRUE, FALSE, test_for_enabled));
+	BLI_assert(ELEM(test_for_enabled, TRUE, FALSE));
 
 	if (test_for_enabled)
 		totelement = BM_mesh_elem_hflag_count_enabled(bm, htype, hflag, TRUE);
diff --git a/source/blender/bmesh/intern/bmesh_operators.h b/source/blender/bmesh/intern/bmesh_operators.h
index 3c6c3004e3a..b1da8ecb275 100644
--- a/source/blender/bmesh/intern/bmesh_operators.h
+++ b/source/blender/bmesh/intern/bmesh_operators.h
@@ -72,7 +72,8 @@ enum {
 enum {
 	SIMVERT_NORMAL = 0,
 	SIMVERT_FACE,
-	SIMVERT_VGROUP
+	SIMVERT_VGROUP,
+	SIMVERT_EDGE
 };
 
 enum {
diff --git a/source/blender/bmesh/intern/bmesh_queries.c b/source/blender/bmesh/intern/bmesh_queries.c
index 94b221797b4..3ec4c51bcb1 100644
--- a/source/blender/bmesh/intern/bmesh_queries.c
+++ b/source/blender/bmesh/intern/bmesh_queries.c
@@ -754,6 +754,7 @@ void BM_edge_ordered_verts_ex(BMEdge *edge, BMVert **r_v1, BMVert **r_v2,
                               BMLoop *edge_loop)
 {
 	BLI_assert(edge_loop->e == edge);
+	(void)edge; /* quiet warning in release build */
 	*r_v1 = edge_loop->v;
 	*r_v2 = edge_loop->next->v;
 }
@@ -952,7 +953,7 @@ float BM_vert_calc_mean_tagged_edge_length(BMVert *v)
 
 
 /**
- * Returns the shortest edge in f.
+ * Returns the loop of the shortest edge in f.
  */
 BMLoop *BM_face_find_shortest_loop(BMFace *f)
 {
@@ -976,7 +977,7 @@ BMLoop *BM_face_find_shortest_loop(BMFace *f)
 }
 
 /**
- * Returns the longest edge in f.
+ * Returns the loop of the longest edge in f.
  */
 BMLoop *BM_face_find_longest_loop(BMFace *f)
 {
@@ -999,16 +1000,6 @@ BMLoop *BM_face_find_longest_loop(BMFace *f)
 	return longest_loop;
 }
 
-BMEdge *BM_face_find_shortest_edge(BMFace *f)
-{
-	return BM_face_find_shortest_loop(f)->e;
-}
-
-BMEdge *BM_face_find_longest_edge(BMFace *f)
-{
-	return BM_face_find_longest_loop(f)->e;
-}
-
 /**
  * Returns the edge existing between v1 and v2, or NULL if there isn't one.
  *
diff --git a/source/blender/bmesh/intern/bmesh_queries.h b/source/blender/bmesh/intern/bmesh_queries.h
index 697990046be..2df5adcfae3 100644
--- a/source/blender/bmesh/intern/bmesh_queries.h
+++ b/source/blender/bmesh/intern/bmesh_queries.h
@@ -67,9 +67,6 @@ float   BM_vert_calc_edge_angle(BMVert *v);
 float   BM_vert_calc_shell_factor(BMVert *v);
 float   BM_vert_calc_mean_tagged_edge_length(BMVert *v);
 
-BMEdge *BM_face_find_shortest_edge(BMFace *f);
-BMEdge *BM_face_find_longest_edge(BMFace *f);
-
 BMLoop *BM_face_find_shortest_loop(BMFace *f);
 BMLoop *BM_face_find_longest_loop(BMFace *f);
 
diff --git a/source/blender/bmesh/operators/bmo_connect.c b/source/blender/bmesh/operators/bmo_connect.c
index 2d4c15dbaa5..653bbaf8602 100644
--- a/source/blender/bmesh/operators/bmo_connect.c
+++ b/source/blender/bmesh/operators/bmo_connect.c
@@ -178,7 +178,7 @@ static int clamp_index(const int x, const int len)
 			BLI_array_append(arr2, arr_tmp[i]);                               \
 		}                                                                     \
 		BLI_array_free(arr_tmp);                                              \
-	}
+	} (void)0
 
 /* get the 2 loops matching 2 verts.
  * first attempt to get the face corners that use the edge defined by v1 & v2,
diff --git a/source/blender/bmesh/operators/bmo_create.c b/source/blender/bmesh/operators/bmo_create.c
index ebdff8bf7aa..f1063d1ca42 100644
--- a/source/blender/bmesh/operators/bmo_create.c
+++ b/source/blender/bmesh/operators/bmo_create.c
@@ -1403,9 +1403,11 @@ void bmo_contextual_create_exec(BMesh *bm, BMOperator *op)
 	BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
 		if (BMO_elem_flag_test(bm, v, ELE_NEW)) {
 			verts[amount] = v;
+			if (amount == 3) {
+				break;
+			}
 			amount++;
 
-			if (amount > 4) break;
 		}
 	}
 
diff --git a/source/blender/bmesh/operators/bmo_dupe.c b/source/blender/bmesh/operators/bmo_dupe.c
index ae001b2baf6..6e6037239b9 100644
--- a/source/blender/bmesh/operators/bmo_dupe.c
+++ b/source/blender/bmesh/operators/bmo_dupe.c
@@ -504,7 +504,9 @@ void bmo_spin_exec(BMesh *bm, BMOperator *op)
 			BMO_op_finish(bm, &extop);
 		}
 
-		if (usedvec)
+		if (usedvec) {
+			mul_m3_v3(rmat, dvec);
 			BMO_op_callf(bm, "translate vec=%v verts=%s", dvec, op, "lastout");
+		}
 	}
 }
diff --git a/source/blender/bmesh/operators/bmo_mesh_conv.c b/source/blender/bmesh/operators/bmo_mesh_conv.c
index 4578270d571..c550a17e696 100644
--- a/source/blender/bmesh/operators/bmo_mesh_conv.c
+++ b/source/blender/bmesh/operators/bmo_mesh_conv.c
@@ -20,7 +20,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/bmesh/operators/bmesh_mesh_conv.c
+/** \file blender/bmesh/operators/bmo_mesh_conv.c
  *  \ingroup bmesh
  *
  * This file contains functions
diff --git a/source/blender/bmesh/operators/bmo_triangulate.c b/source/blender/bmesh/operators/bmo_triangulate.c
index e53144bd597..0903620f9a0 100644
--- a/source/blender/bmesh/operators/bmo_triangulate.c
+++ b/source/blender/bmesh/operators/bmo_triangulate.c
@@ -20,7 +20,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/bmesh/operators/bmo_subdivide.c
+/** \file blender/bmesh/operators/bmo_triangulate.c
  *  \ingroup bmesh
  */
 
diff --git a/source/blender/bmesh/operators/bmo_utils.c b/source/blender/bmesh/operators/bmo_utils.c
index 4377eb3e883..e0cd3e2ba90 100644
--- a/source/blender/bmesh/operators/bmo_utils.c
+++ b/source/blender/bmesh/operators/bmo_utils.c
@@ -20,7 +20,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/bmesh/operators/bmo_subdivide.c
+/** \file blender/bmesh/operators/bmo_utils.c
  *  \ingroup bmesh
  *
  * utility bmesh operators, e.g. transform,
@@ -873,6 +873,7 @@ typedef struct SimSel_VertExt {
 	BMVert *v;
 	union {
 		int num_faces; /* adjacent faces */
+		int num_edges; /* adjacent edges */
 		MDeformVert *dvert; /* deform vertex */
 	};
 } SimSel_VertExt;
@@ -928,6 +929,9 @@ void bmo_similarverts_exec(BMesh *bm, BMOperator *op)
 					v_ext[i].dvert = NULL;
 				}
 				break;
+			case SIMVERT_EDGE:
+				v_ext[i].num_edges = BM_vert_edge_count(v);
+				break;
 		}
 
 		i++;
@@ -970,6 +974,13 @@ void bmo_similarverts_exec(BMesh *bm, BMOperator *op)
 							}
 						}
 						break;
+					case SIMVERT_EDGE:
+						/* number of adjacent edges */
+						if (v_ext[i].num_edges == v_ext[indices[idx]].num_edges) {
+							BMO_elem_flag_enable(bm, v, VERT_MARK);
+							cont = FALSE;
+						}
+						break;
 				}
 			}
 		}
diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp
index 5898d5da670..9582da4fe5c 100644
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@ -25,16 +25,12 @@
 #include "MaterialExporter.h"
 
 template<class Functor>
-void forEachObjectInScene(Scene *sce, Functor &f)
+void forEachObjectInExportSet(Scene *sce, Functor &f, LinkNode *export_set)
 {
-	Base *base= (Base*) sce->base.first;
-
-	while (base) {
-		Object *ob = base->object;
-
+	LinkNode *node;
+	for (node = export_set; node; node = node->next) {
+		Object *ob = (Object *)node->link;
 		f(ob);
-
-		base= base->next;
 	}
 }
 
@@ -45,14 +41,14 @@ void AnimationExporter::exportAnimations(Scene *sce)
 
 		openLibrary();
 
-		forEachObjectInScene(sce, *this);
+		forEachObjectInExportSet(sce, *this, this->export_settings->export_set);
 
 		closeLibrary();
 	}
 }
 
 // called for each exported object
-void AnimationExporter::operator() (Object *ob) 
+void AnimationExporter::operator()(Object *ob)
 {
 	FCurve *fcu;
 	char *transformName;
@@ -60,24 +56,24 @@ void AnimationExporter::operator() (Object *ob)
 
 	//Export transform animations
 	if (ob->adt && ob->adt->action) {
-		fcu = (FCurve*)ob->adt->action->curves.first;
+		fcu = (FCurve *)ob->adt->action->curves.first;
 
 		//transform matrix export for bones are temporarily disabled here.
-		if ( ob->type == OB_ARMATURE ) {
-			bArmature *arm = (bArmature*)ob->data;
-			for (Bone *bone = (Bone*)arm->bonebase.first; bone; bone = bone->next)
+		if (ob->type == OB_ARMATURE) {
+			bArmature *arm = (bArmature *)ob->data;
+			for (Bone *bone = (Bone *)arm->bonebase.first; bone; bone = bone->next)
 				write_bone_animation_matrix(ob, bone);
 		}
 
 		while (fcu) {
 			//for armature animations as objects
-			if ( ob->type == OB_ARMATURE )
+			if (ob->type == OB_ARMATURE)
 				transformName =  fcu->rna_path;
 			else 
-				transformName = extract_transform_name( fcu->rna_path );
+				transformName = extract_transform_name(fcu->rna_path);
 
 			if ((!strcmp(transformName, "location") || !strcmp(transformName, "scale")) ||
-			    (!strcmp(transformName, "rotation_euler") && ob->rotmode == ROT_MODE_EUL)||
+			    (!strcmp(transformName, "rotation_euler") && ob->rotmode == ROT_MODE_EUL) ||
 			    (!strcmp(transformName, "rotation_quaternion")))
 			{
 				dae_animation(ob, fcu, transformName, false);
@@ -88,12 +84,12 @@ void AnimationExporter::operator() (Object *ob)
 	}
 
 	//Export Lamp parameter animations
-	if ( (ob->type == OB_LAMP ) && ((Lamp*)ob ->data)->adt && ((Lamp*)ob ->data)->adt->action ) {
-		fcu = (FCurve*)(((Lamp*)ob ->data)->adt->action->curves.first);
+	if ( (ob->type == OB_LAMP) && ((Lamp *)ob->data)->adt && ((Lamp *)ob->data)->adt->action) {
+		fcu = (FCurve *)(((Lamp *)ob->data)->adt->action->curves.first);
 		while (fcu) {
-			transformName = extract_transform_name( fcu->rna_path );
+			transformName = extract_transform_name(fcu->rna_path);
 
-			if ((!strcmp(transformName, "color")) || (!strcmp(transformName, "spot_size"))||
+			if ((!strcmp(transformName, "color")) || (!strcmp(transformName, "spot_size")) ||
 			    (!strcmp(transformName, "spot_blend")) || (!strcmp(transformName, "distance")))
 			{
 				dae_animation(ob, fcu, transformName, true);
@@ -103,14 +99,14 @@ void AnimationExporter::operator() (Object *ob)
 	}
 
 	//Export Camera parameter animations
-	if ( (ob->type == OB_CAMERA ) && ((Camera*)ob ->data)->adt && ((Camera*)ob ->data)->adt->action ) {
-		fcu = (FCurve*)(((Camera*)ob ->data)->adt->action->curves.first);
+	if ( (ob->type == OB_CAMERA) && ((Camera *)ob->data)->adt && ((Camera *)ob->data)->adt->action) {
+		fcu = (FCurve *)(((Camera *)ob->data)->adt->action->curves.first);
 		while (fcu) {
-			transformName = extract_transform_name( fcu->rna_path );
+			transformName = extract_transform_name(fcu->rna_path);
 
-			if ((!strcmp(transformName, "lens"))||
-			    (!strcmp(transformName, "ortho_scale"))||
-			    (!strcmp(transformName, "clip_end"))||(!strcmp(transformName, "clip_start")))
+			if ((!strcmp(transformName, "lens")) ||
+			    (!strcmp(transformName, "ortho_scale")) ||
+			    (!strcmp(transformName, "clip_end")) || (!strcmp(transformName, "clip_start")))
 			{
 				dae_animation(ob, fcu, transformName, true);
 			}
@@ -120,19 +116,19 @@ void AnimationExporter::operator() (Object *ob)
 
 	//Export Material parameter animations.
 	for (int a = 0; a < ob->totcol; a++) {
-		Material *ma = give_current_material(ob, a+1);
+		Material *ma = give_current_material(ob, a + 1);
 		if (!ma) continue;
 		if (ma->adt && ma->adt->action) {
 			/* isMatAnim = true; */
-			fcu = (FCurve*)ma->adt->action->curves.first;
+			fcu = (FCurve *)ma->adt->action->curves.first;
 			while (fcu) {
-				transformName = extract_transform_name( fcu->rna_path );
+				transformName = extract_transform_name(fcu->rna_path);
 
-				if ((!strcmp(transformName, "specular_hardness"))||(!strcmp(transformName, "specular_color")) ||
-				    (!strcmp(transformName, "diffuse_color"))||(!strcmp(transformName, "alpha")) ||
-					(!strcmp(transformName, "ior")))
+				if ((!strcmp(transformName, "specular_hardness")) || (!strcmp(transformName, "specular_color")) ||
+				    (!strcmp(transformName, "diffuse_color")) || (!strcmp(transformName, "alpha")) ||
+				    (!strcmp(transformName, "ior")))
 				{
-					dae_animation(ob, fcu, transformName, true, ma );
+					dae_animation(ob, fcu, transformName, true, ma);
 				}
 				fcu = fcu->next;
 			}
@@ -142,33 +138,33 @@ void AnimationExporter::operator() (Object *ob)
 }
 
 //euler sources from quternion sources
-float * AnimationExporter::get_eul_source_for_quat(Object *ob )
+float *AnimationExporter::get_eul_source_for_quat(Object *ob)
 {
-	FCurve *fcu = (FCurve*)ob->adt->action->curves.first;
+	FCurve *fcu = (FCurve *)ob->adt->action->curves.first;
 	const int keys = fcu->totvert;  
-	float *quat = (float*)MEM_callocN(sizeof(float) * fcu->totvert * 4, "quat output source values");  
-	float *eul = (float*)MEM_callocN(sizeof(float) * fcu->totvert * 3, "quat output source values");
+	float *quat = (float *)MEM_callocN(sizeof(float) * fcu->totvert * 4, "quat output source values");
+	float *eul = (float *)MEM_callocN(sizeof(float) * fcu->totvert * 3, "quat output source values");
 	float temp_quat[4];
 	float temp_eul[3];
 	while (fcu) {
-		char * transformName = extract_transform_name( fcu->rna_path );
+		char *transformName = extract_transform_name(fcu->rna_path);
 
-		if ( !strcmp(transformName, "rotation_quaternion") )	{ 
-			for ( int i = 0 ; i < fcu->totvert ; i++) {
-				*(quat + ( i * 4 ) + fcu->array_index) = fcu->bezt[i].vec[1][1];
+		if (!strcmp(transformName, "rotation_quaternion") ) {
+			for (int i = 0; i < fcu->totvert; i++) {
+				*(quat + (i * 4) + fcu->array_index) = fcu->bezt[i].vec[1][1];
 			}
 		}
 		fcu = fcu->next;
 	}
 
-	for ( int i = 0 ; i < keys ; i++) {
-		for ( int j = 0;j<4;j++)
-			temp_quat[j] = quat[(i*4)+j];
+	for (int i = 0; i < keys; i++) {
+		for (int j = 0; j < 4; j++)
+			temp_quat[j] = quat[(i * 4) + j];
 
 		quat_to_eul(temp_eul, temp_quat);
 
-		for (int k = 0;k<3;k++)
-			eul[i*3 + k] = temp_eul[k];
+		for (int k = 0; k < 3; k++)
+			eul[i * 3 + k] = temp_eul[k];
 
 	}
 	MEM_freeN(quat);
@@ -177,22 +173,22 @@ float * AnimationExporter::get_eul_source_for_quat(Object *ob )
 }
 
 //Get proper name for bones
-std::string AnimationExporter::getObjectBoneName( Object* ob, const FCurve* fcu ) 
+std::string AnimationExporter::getObjectBoneName(Object *ob, const FCurve *fcu)
 {
 	//hard-way to derive the bone name from rna_path. Must find more compact method
 	std::string rna_path = std::string(fcu->rna_path);
 
-	char* boneName = strtok((char *)rna_path.c_str(), "\"");
+	char *boneName = strtok((char *)rna_path.c_str(), "\"");
 	boneName = strtok(NULL, "\"");
 
-	if ( boneName != NULL )
+	if (boneName != NULL)
 		return /*id_name(ob) + "_" +*/ std::string(boneName);
 	else		
 		return id_name(ob);
 }
 
 //convert f-curves to animation curves and write
-void AnimationExporter::dae_animation(Object* ob, FCurve *fcu, char* transformName, bool is_param, Material * ma )
+void AnimationExporter::dae_animation(Object *ob, FCurve *fcu, char *transformName, bool is_param, Material *ma)
 {
 	const char *axis_name = NULL;
 	char anim_id[200];
@@ -200,15 +196,15 @@ void AnimationExporter::dae_animation(Object* ob, FCurve *fcu, char* transformNa
 	bool has_tangents = false;
 	bool quatRotation = false;
 
-	if ( !strcmp(transformName, "rotation_quaternion") ) {
+	if (!strcmp(transformName, "rotation_quaternion") ) {
 		fprintf(stderr, "quaternion rotation curves are not supported. rotation curve will not be exported\n");
 		quatRotation = true;
 		return;
 	}
 
 	//axis names for colors
-	else if ( !strcmp(transformName, "color")||!strcmp(transformName, "specular_color")||!strcmp(transformName, "diffuse_color")||
-		(!strcmp(transformName, "alpha")))
+	else if (!strcmp(transformName, "color") || !strcmp(transformName, "specular_color") || !strcmp(transformName, "diffuse_color") ||
+	         (!strcmp(transformName, "alpha")))
 	{
 		const char *axis_names[] = {"R", "G", "B"};
 		if (fcu->array_index < 3)
@@ -217,7 +213,7 @@ void AnimationExporter::dae_animation(Object* ob, FCurve *fcu, char* transformNa
 
 	//axis names for transforms
 	else if ((!strcmp(transformName, "location") || !strcmp(transformName, "scale")) ||
-		(!strcmp(transformName, "rotation_euler"))||(!strcmp(transformName, "rotation_quaternion")))
+	         (!strcmp(transformName, "rotation_euler")) || (!strcmp(transformName, "rotation_quaternion")))
 	{
 		const char *axis_names[] = {"X", "Y", "Z"};
 		if (fcu->array_index < 3)
@@ -233,16 +229,16 @@ void AnimationExporter::dae_animation(Object* ob, FCurve *fcu, char* transformNa
 	//Create anim Id
 	if (ob->type == OB_ARMATURE) {
 		ob_name =  getObjectBoneName(ob, fcu);
-		BLI_snprintf(anim_id, sizeof(anim_id), "%s_%s.%s", (char*)translate_id(ob_name).c_str(),
-			transformName, axis_name);
+		BLI_snprintf(anim_id, sizeof(anim_id), "%s_%s.%s", (char *)translate_id(ob_name).c_str(),
+		             transformName, axis_name);
 	}
 	else {
 		if (ma)
 			ob_name = id_name(ob) + "_material";
 		else
 			ob_name = id_name(ob);
-		BLI_snprintf(anim_id, sizeof(anim_id), "%s_%s_%s", (char*)translate_id(ob_name).c_str(),
-			fcu->rna_path, axis_name);
+		BLI_snprintf(anim_id, sizeof(anim_id), "%s_%s_%s", (char *)translate_id(ob_name).c_str(),
+		             fcu->rna_path, axis_name);
 	}
 
 	openAnimation(anim_id, COLLADABU::Utils::EMPTY_STRING);
@@ -256,16 +252,16 @@ void AnimationExporter::dae_animation(Object* ob, FCurve *fcu, char* transformNa
 	//quat rotations are skipped for now, because of complications with determining axis.
 	if (quatRotation) {
 		float *eul  = get_eul_source_for_quat(ob);
-		float *eul_axis = (float*)MEM_callocN(sizeof(float) * fcu->totvert, "quat output source values");
-		for (int i = 0 ; i< fcu->totvert ; i++) {
-			eul_axis[i] = eul[i*3 + fcu->array_index];
+		float *eul_axis = (float *)MEM_callocN(sizeof(float) * fcu->totvert, "quat output source values");
+		for (int i = 0; i < fcu->totvert; i++) {
+			eul_axis[i] = eul[i * 3 + fcu->array_index];
 		}
-		output_id= create_source_from_array(COLLADASW::InputSemantic::OUTPUT, eul_axis, fcu->totvert, quatRotation, anim_id, axis_name);
+		output_id = create_source_from_array(COLLADASW::InputSemantic::OUTPUT, eul_axis, fcu->totvert, quatRotation, anim_id, axis_name);
 		MEM_freeN(eul);
 		MEM_freeN(eul_axis);
 	}
 	else {
-		output_id= create_source_from_fcurve(COLLADASW::InputSemantic::OUTPUT, fcu, anim_id, axis_name);
+		output_id = create_source_from_fcurve(COLLADASW::InputSemantic::OUTPUT, fcu, anim_id, axis_name);
 	}
 	// create interpolations source
 	std::string interpolation_id = create_interpolation_source(fcu, anim_id, axis_name, &has_tangents);
@@ -300,21 +296,21 @@ void AnimationExporter::dae_animation(Object* ob, FCurve *fcu, char* transformNa
 
 	std::string target;
 
-	if ( !is_param )
+	if (!is_param)
 		target = translate_id(ob_name) +
 		         "/" + get_transform_sid(fcu->rna_path, -1, axis_name, true);
 	else {
-		if ( ob->type == OB_LAMP )
+		if (ob->type == OB_LAMP)
 			target = get_light_id(ob) +
 			         "/" + get_light_param_sid(fcu->rna_path, -1, axis_name, true);
 
-		if ( ob->type == OB_CAMERA )
+		if (ob->type == OB_CAMERA)
 			target = get_camera_id(ob) +
 			         "/" + get_camera_param_sid(fcu->rna_path, -1, axis_name, true);
 
-		if ( ma ) 
+		if (ma)
 			target = translate_id(id_name(ma)) + "-effect" +
-			"/common/" /*profile common is only supported */ + get_transform_sid(fcu->rna_path, -1, axis_name, true);
+			         "/common/" /*profile common is only supported */ + get_transform_sid(fcu->rna_path, -1, axis_name, true);
 	}
 	addChannel(COLLADABU::URI(empty, sampler_id), target);
 
@@ -334,18 +330,18 @@ void AnimationExporter::write_bone_animation_matrix(Object *ob_arm, Bone *bone)
 
 	sample_and_write_bone_animation_matrix(ob_arm, bone);
 
-	for (Bone *child = (Bone*)bone->childbase.first; child; child = child->next)
+	for (Bone *child = (Bone *)bone->childbase.first; child; child = child->next)
 		write_bone_animation_matrix(ob_arm, child);
 }
 
-bool AnimationExporter::is_bone_deform_group(Bone * bone)
+bool AnimationExporter::is_bone_deform_group(Bone *bone)
 {   
 	bool is_def;
 	//Check if current bone is deform
-	if ((bone->flag & BONE_NO_DEFORM) == 0 ) return true;
+	if ((bone->flag & BONE_NO_DEFORM) == 0) return true;
 	//Check child bones
 	else {
-		for (Bone *child = (Bone*)bone->childbase.first; child; child = child->next) {
+		for (Bone *child = (Bone *)bone->childbase.first; child; child = child->next) {
 			//loop through all the children until deform bone is found, and then return
 			is_def = is_bone_deform_group(child);
 			if (is_def) return true;
@@ -357,16 +353,16 @@ bool AnimationExporter::is_bone_deform_group(Bone * bone)
 
 void AnimationExporter::sample_and_write_bone_animation_matrix(Object *ob_arm, Bone *bone)
 {
-	bArmature *arm = (bArmature*)ob_arm->data;
+	bArmature *arm = (bArmature *)ob_arm->data;
 	int flag = arm->flag;
 	std::vector<float> fra;
 	//char prefix[256];
 
-	FCurve* fcu = (FCurve*)ob_arm->adt->action->curves.first;
+	FCurve *fcu = (FCurve *)ob_arm->adt->action->curves.first;
 	while (fcu) {
 		std::string bone_name = getObjectBoneName(ob_arm, fcu);
-		int val = BLI_strcasecmp((char*)bone_name.c_str(), bone->name);
-		if (val==0) break;
+		int val = BLI_strcasecmp((char *)bone_name.c_str(), bone->name);
+		if (val == 0) break;
 		fcu = fcu->next;
 	}
 
@@ -383,7 +379,7 @@ void AnimationExporter::sample_and_write_bone_animation_matrix(Object *ob_arm, B
 	}
 
 	if (fra.size()) {
-		dae_baked_animation(fra, ob_arm, bone );
+		dae_baked_animation(fra, ob_arm, bone);
 	}
 
 	if (flag & ARM_RESTPOS) 
@@ -400,8 +396,8 @@ void AnimationExporter::dae_baked_animation(std::vector<float> &fra, Object *ob_
 	if (!fra.size())
 		return;
 
-	BLI_snprintf(anim_id, sizeof(anim_id), "%s_%s_%s", (char*)translate_id(ob_name).c_str(),
-		(char*)translate_id(bone_name).c_str(), "pose_matrix");
+	BLI_snprintf(anim_id, sizeof(anim_id), "%s_%s_%s", (char *)translate_id(ob_name).c_str(),
+	             (char *)translate_id(bone_name).c_str(), "pose_matrix");
 
 	openAnimation(anim_id, COLLADABU::Utils::EMPTY_STRING);
 
@@ -410,7 +406,7 @@ void AnimationExporter::dae_baked_animation(std::vector<float> &fra, Object *ob_
 
 	// create output source
 	std::string output_id;
-	output_id = create_4x4_source( fra, ob_arm, bone,  anim_id);
+	output_id = create_4x4_source(fra, ob_arm, bone,  anim_id);
 
 	// create interpolations source
 	std::string interpolation_id = fake_interpolation_source(fra.size(), anim_id, "");
@@ -448,15 +444,15 @@ void AnimationExporter::dae_bone_animation(std::vector<float> &fra, float *value
 
 	char rna_path[200];
 	BLI_snprintf(rna_path, sizeof(rna_path), "pose.bones[\"%s\"].%s", bone_name.c_str(),
-		tm_type == 0 ? "rotation_quaternion" : (tm_type == 1 ? "scale" : "location"));
+	             tm_type == 0 ? "rotation_quaternion" : (tm_type == 1 ? "scale" : "location"));
 
 	if (axis > -1)
 		axis_name = axis_names[axis];
 
 	std::string transform_sid = get_transform_sid(NULL, tm_type, axis_name, false);
 
-	BLI_snprintf(anim_id, sizeof(anim_id), "%s_%s_%s", (char*)translate_id(ob_name).c_str(),
-		(char*)translate_id(bone_name).c_str(), (char*)transform_sid.c_str());
+	BLI_snprintf(anim_id, sizeof(anim_id), "%s_%s_%s", (char *)translate_id(ob_name).c_str(),
+	             (char *)translate_id(bone_name).c_str(), (char *)transform_sid.c_str());
 
 	openAnimation(anim_id, COLLADABU::Utils::EMPTY_STRING);
 
@@ -522,7 +518,7 @@ std::string AnimationExporter::get_semantic_suffix(COLLADASW::InputSemantic::Sem
 }
 
 void AnimationExporter::add_source_parameters(COLLADASW::SourceBase::ParameterNameList& param,
-											  COLLADASW::InputSemantic::Semantics semantic, bool is_rot, const char *axis, bool transform)
+                                              COLLADASW::InputSemantic::Semantics semantic, bool is_rot, const char *axis, bool transform)
 {
 	switch (semantic) {
 		case COLLADASW::InputSemantic::INPUT:
@@ -537,14 +533,14 @@ void AnimationExporter::add_source_parameters(COLLADASW::SourceBase::ParameterNa
 					param.push_back(axis);
 				}
 				else 
-					if ( transform ) {
-						param.push_back("TRANSFORM");  
-					}
-					else { //assumes if axis isn't specified all axises are added
-						param.push_back("X");
-						param.push_back("Y");
-						param.push_back("Z");
-					}
+				if (transform) {
+					param.push_back("TRANSFORM");
+				}
+				else {     //assumes if axis isn't specified all axises are added
+					param.push_back("X");
+					param.push_back("Y");
+					param.push_back("Z");
+				}
 			}
 			break;
 		case COLLADASW::InputSemantic::IN_TANGENT:
@@ -710,7 +706,7 @@ std::string AnimationExporter::create_source_from_vector(COLLADASW::InputSemanti
 		//if (semantic == COLLADASW::InputSemantic::INPUT)
 		val = convert_time(val);
 		/*else if (is_rot)
-		val = convert_angle(val);*/
+		   val = convert_angle(val);*/
 		source.appendValues(val);
 	}
 
@@ -719,7 +715,7 @@ std::string AnimationExporter::create_source_from_vector(COLLADASW::InputSemanti
 	return source_id;
 }
 
-std::string AnimationExporter::create_4x4_source(std::vector<float> &frames, Object * ob_arm, Bone *bone, const std::string& anim_id)
+std::string AnimationExporter::create_4x4_source(std::vector<float> &frames, Object *ob_arm, Bone *bone, const std::string& anim_id)
 {
 	COLLADASW::InputSemantic::Semantics semantic = COLLADASW::InputSemantic::OUTPUT;
 	std::string source_id = anim_id + get_semantic_suffix(semantic);
@@ -847,11 +843,11 @@ std::string AnimationExporter::create_interpolation_source(FCurve *fcu, const st
 	*has_tangents = false;
 
 	for (unsigned int i = 0; i < fcu->totvert; i++) {
-		if (fcu->bezt[i].ipo==BEZT_IPO_BEZ) {
+		if (fcu->bezt[i].ipo == BEZT_IPO_BEZ) {
 			source.appendValues(BEZIER_NAME);
 			*has_tangents = true;
 		}
-		else if (fcu->bezt[i].ipo==BEZT_IPO_CONST) {
+		else if (fcu->bezt[i].ipo == BEZT_IPO_CONST) {
 			source.appendValues(STEP_NAME);
 		}
 		else { // BEZT_IPO_LIN
@@ -991,7 +987,7 @@ std::string AnimationExporter::get_camera_param_sid(char *rna_path, int tm_type,
 std::string AnimationExporter::get_transform_sid(char *rna_path, int tm_type, const char *axis_name, bool append_axis)
 {
 	std::string tm_name;
-	bool is_rotation =false;
+	bool is_rotation = false;
 	// when given rna_path, determine tm_type from it
 	if (rna_path) {
 		char *name = extract_transform_name(rna_path);
@@ -1056,16 +1052,16 @@ std::string AnimationExporter::get_transform_sid(char *rna_path, int tm_type, co
 		if (is_rotation)
 			return tm_name + std::string(axis_name) + ".ANGLE";
 		else
-			if (axis_name[0])
-				return tm_name + "." + std::string(axis_name);
-			else 
-				return tm_name;
+		if (axis_name[0])
+			return tm_name + "." + std::string(axis_name);
+		else
+			return tm_name;
 	}
 
 	return std::string("");
 }
 
-char* AnimationExporter::extract_transform_name(char *rna_path)
+char *AnimationExporter::extract_transform_name(char *rna_path)
 {
 	char *dot = strrchr(rna_path, '.');
 	return dot ? (dot + 1) : rna_path;
@@ -1074,7 +1070,7 @@ char* AnimationExporter::extract_transform_name(char *rna_path)
 //find keyframes of all the objects animations
 void AnimationExporter::find_frames(Object *ob, std::vector<float> &fra)
 {
-	FCurve *fcu= (FCurve*)ob->adt->action->curves.first;
+	FCurve *fcu = (FCurve *)ob->adt->action->curves.first;
 
 	for (; fcu; fcu = fcu->next) {
 
@@ -1101,7 +1097,7 @@ void AnimationExporter::enable_fcurves(bAction *act, char *bone_name)
 	if (bone_name)
 		BLI_snprintf(prefix, sizeof(prefix), "pose.bones[\"%s\"]", bone_name);
 
-	for (fcu = (FCurve*)act->curves.first; fcu; fcu = fcu->next) {
+	for (fcu = (FCurve *)act->curves.first; fcu; fcu = fcu->next) {
 		if (bone_name) {
 			if (!strncmp(fcu->rna_path, prefix, strlen(prefix)))
 				fcu->flag &= ~FCURVE_DISABLED;
@@ -1116,34 +1112,33 @@ void AnimationExporter::enable_fcurves(bAction *act, char *bone_name)
 
 bool AnimationExporter::hasAnimations(Scene *sce)
 {
-	Base *base= (Base*) sce->base.first;
+	LinkNode *node;
 
-	while (base) {
-		Object *ob = base->object;
+	for(node=this->export_settings->export_set; node; node=node->next) {
+		Object *ob = (Object *)node->link;
 
 		FCurve *fcu = 0;
 		//Check for object transform animations
 		if (ob->adt && ob->adt->action)
-			fcu = (FCurve*)ob->adt->action->curves.first;
+			fcu = (FCurve *)ob->adt->action->curves.first;
 		//Check for Lamp parameter animations
-		else if ( (ob->type == OB_LAMP ) && ((Lamp*)ob ->data)->adt && ((Lamp*)ob ->data)->adt->action )
-			fcu = (FCurve*)(((Lamp*)ob ->data)->adt->action->curves.first);
+		else if ( (ob->type == OB_LAMP) && ((Lamp *)ob->data)->adt && ((Lamp *)ob->data)->adt->action)
+			fcu = (FCurve *)(((Lamp *)ob->data)->adt->action->curves.first);
 		//Check for Camera parameter animations
-		else if ( (ob->type == OB_CAMERA ) && ((Camera*)ob ->data)->adt && ((Camera*)ob ->data)->adt->action )
-			fcu = (FCurve*)(((Camera*)ob ->data)->adt->action->curves.first);
+		else if ( (ob->type == OB_CAMERA) && ((Camera *)ob->data)->adt && ((Camera *)ob->data)->adt->action)
+			fcu = (FCurve *)(((Camera *)ob->data)->adt->action->curves.first);
 
 		//Check Material Effect parameter animations.
 		for (int a = 0; a < ob->totcol; a++) {
-			Material *ma = give_current_material(ob, a+1);
+			Material *ma = give_current_material(ob, a + 1);
 			if (!ma) continue;
 			if (ma->adt && ma->adt->action) {
-				fcu = (FCurve*)ma->adt->action->curves.first;	
+				fcu = (FCurve *)ma->adt->action->curves.first;
 			}
 		}
 
-		if ( fcu) 
+		if (fcu)
 			return true;
-		base= base->next;
 	}
 	return false;
 }
@@ -1156,12 +1151,12 @@ void AnimationExporter::find_rotation_frames(Object *ob, std::vector<float> &fra
 	else if (rotmode == ROT_MODE_QUAT)
 		find_frames(ob, fra, prefix, "rotation_quaternion");
 	/*else if (rotmode == ROT_MODE_AXISANGLE)
-	;*/
+	   ;*/
 }
 
 void AnimationExporter::find_frames(Object *ob, std::vector<float> &fra, const char *prefix, const char *tm_name)
 {
-	FCurve *fcu= (FCurve*)ob->adt->action->curves.first;
+	FCurve *fcu = (FCurve *)ob->adt->action->curves.first;
 
 	for (; fcu; fcu = fcu->next) {
 		if (prefix && strncmp(prefix, fcu->rna_path, strlen(prefix)))
@@ -1193,13 +1188,13 @@ void AnimationExporter::write_bone_animation(Object *ob_arm, Bone *bone)
 	for (int i = 0; i < 3; i++)
 		sample_and_write_bone_animation(ob_arm, bone, i);
 
-	for (Bone *child = (Bone*)bone->childbase.first; child; child = child->next)
+	for (Bone *child = (Bone *)bone->childbase.first; child; child = child->next)
 		write_bone_animation(ob_arm, child);
 }
 
 void AnimationExporter::sample_and_write_bone_animation(Object *ob_arm, Bone *bone, int transform_type)
 {
-	bArmature *arm = (bArmature*)ob_arm->data;
+	bArmature *arm = (bArmature *)ob_arm->data;
 	int flag = arm->flag;
 	std::vector<float> fra;
 	char prefix[256];
@@ -1231,12 +1226,12 @@ void AnimationExporter::sample_and_write_bone_animation(Object *ob_arm, Bone *bo
 	}
 	//v array will hold all values which will be exported. 
 	if (fra.size()) {
-		float *values = (float*)MEM_callocN(sizeof(float) * 3 * fra.size(), "temp. anim frames");
+		float *values = (float *)MEM_callocN(sizeof(float) * 3 * fra.size(), "temp. anim frames");
 		sample_animation(values, fra, transform_type, bone, ob_arm, pchan);
 
 		if (transform_type == 0) {
 			// write x, y, z curves separately if it is rotation
-			float *axisValues = (float*)MEM_callocN(sizeof(float) * fra.size(), "temp. anim frames");   
+			float *axisValues = (float *)MEM_callocN(sizeof(float) * fra.size(), "temp. anim frames");
 
 			for (int i = 0; i < 3; i++) {
 				for (unsigned int j = 0; j < fra.size(); j++)
diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp
index 195057817dd..625804e4ecd 100644
--- a/source/blender/collada/AnimationImporter.cpp
+++ b/source/blender/collada/AnimationImporter.cpp
@@ -62,8 +62,8 @@ static const char *bc_get_joint_name(T *node)
 
 FCurve *AnimationImporter::create_fcurve(int array_index, const char *rna_path)
 {
-	FCurve *fcu = (FCurve*)MEM_callocN(sizeof(FCurve), "FCurve");
-	fcu->flag = (FCURVE_VISIBLE|FCURVE_AUTO_HANDLES|FCURVE_SELECTED);
+	FCurve *fcu = (FCurve *)MEM_callocN(sizeof(FCurve), "FCurve");
+	fcu->flag = (FCURVE_VISIBLE | FCURVE_AUTO_HANDLES | FCURVE_SELECTED);
 	fcu->rna_path = BLI_strdupn(rna_path, strlen(rna_path));
 	fcu->array_index = array_index;
 	return fcu;
@@ -92,18 +92,18 @@ void AnimationImporter::animation_to_fcurves(COLLADAFW::AnimationCurve *curve)
 	size_t dim = curve->getOutDimension();
 	unsigned int i;
 
-	std::vector<FCurve*>& fcurves = curve_map[curve->getUniqueId()];
+	std::vector<FCurve *>& fcurves = curve_map[curve->getUniqueId()];
 
 	switch (dim) {
-	case 1: // X, Y, Z or angle
-	case 3: // XYZ
-	case 4:
-	case 16: // matrix
+		case 1: // X, Y, Z or angle
+		case 3: // XYZ
+		case 4:
+		case 16: // matrix
 		{
-			for (i = 0; i < dim; i++ ) {
-				FCurve *fcu = (FCurve*)MEM_callocN(sizeof(FCurve), "FCurve");
+			for (i = 0; i < dim; i++) {
+				FCurve *fcu = (FCurve *)MEM_callocN(sizeof(FCurve), "FCurve");
 
-				fcu->flag = (FCURVE_VISIBLE|FCURVE_AUTO_HANDLES|FCURVE_SELECTED);
+				fcu->flag = (FCURVE_VISIBLE | FCURVE_AUTO_HANDLES | FCURVE_SELECTED);
 				// fcu->rna_path = BLI_strdupn(path, strlen(path));
 				fcu->array_index = 0;
 				fcu->totvert = curve->getKeyCount();
@@ -119,19 +119,19 @@ void AnimationImporter::animation_to_fcurves(COLLADAFW::AnimationCurve *curve)
 					bez.vec[1][1] = bc_get_float_value(output, j * dim + i);
 
 
-					if ( curve->getInterpolationType() == COLLADAFW::AnimationCurve::INTERPOLATION_BEZIER ||
-						curve->getInterpolationType() == COLLADAFW::AnimationCurve::INTERPOLATION_STEP) 
+					if (curve->getInterpolationType() == COLLADAFW::AnimationCurve::INTERPOLATION_BEZIER ||
+					    curve->getInterpolationType() == COLLADAFW::AnimationCurve::INTERPOLATION_STEP)
 					{
 						COLLADAFW::FloatOrDoubleArray& intan = curve->getInTangentValues();
 						COLLADAFW::FloatOrDoubleArray& outtan = curve->getOutTangentValues();
 
 						// intangent
-						bez.vec[0][0] = bc_get_float_value(intan, (j * 2 * dim ) + (2 * i)) * fps;
-						bez.vec[0][1] = bc_get_float_value(intan, (j * 2 * dim )+ (2 * i) + 1);
+						bez.vec[0][0] = bc_get_float_value(intan, (j * 2 * dim) + (2 * i)) * fps;
+						bez.vec[0][1] = bc_get_float_value(intan, (j * 2 * dim) + (2 * i) + 1);
 
 						// outtangent
-						bez.vec[2][0] = bc_get_float_value(outtan, (j * 2 * dim ) + (2 * i)) * fps;
-						bez.vec[2][1] = bc_get_float_value(outtan, (j * 2 * dim )+ (2 * i) + 1);
+						bez.vec[2][0] = bc_get_float_value(outtan, (j * 2 * dim) + (2 * i)) * fps;
+						bez.vec[2][1] = bc_get_float_value(outtan, (j * 2 * dim) + (2 * i) + 1);
 						if (curve->getInterpolationType() == COLLADAFW::AnimationCurve::INTERPOLATION_BEZIER) 
 							bez.ipo = BEZT_IPO_BEZ;
 						else 
@@ -154,11 +154,11 @@ void AnimationImporter::animation_to_fcurves(COLLADAFW::AnimationCurve *curve)
 			}
 		}
 		break;
-	default:
-		fprintf(stderr, "Output dimension of %d is not yet supported (animation id = %s)\n", (int)dim, curve->getOriginalId().c_str());
+		default:
+			fprintf(stderr, "Output dimension of %d is not yet supported (animation id = %s)\n", (int)dim, curve->getOriginalId().c_str());
 	}
 
-	for (std::vector<FCurve*>::iterator it = fcurves.begin(); it != fcurves.end(); it++)
+	for (std::vector<FCurve *>::iterator it = fcurves.begin(); it != fcurves.end(); it++)
 		unused_curves.push_back(*it);
 }
 
@@ -174,14 +174,14 @@ void AnimationImporter::fcurve_deg_to_rad(FCurve *cu)
 }
 
 
-void AnimationImporter::add_fcurves_to_object(Object *ob, std::vector<FCurve*>& curves, char *rna_path, int array_index, Animation *animated)
+void AnimationImporter::add_fcurves_to_object(Object *ob, std::vector<FCurve *>& curves, char *rna_path, int array_index, Animation *animated)
 {
 	bAction *act;
 	
-	if (!ob->adt || !ob->adt->action) act = verify_adt_action((ID*)&ob->id, 1);
+	if (!ob->adt || !ob->adt->action) act = verify_adt_action((ID *)&ob->id, 1);
 	else act = ob->adt->action;
 	
-	std::vector<FCurve*>::iterator it;
+	std::vector<FCurve *>::iterator it;
 	int i;
 
 #if 0
@@ -211,7 +211,7 @@ void AnimationImporter::add_fcurves_to_object(Object *ob, std::vector<FCurve*>&
 				/* no matching groups, so add one */
 				if (grp == NULL) {
 					/* Add a new group, and make it active */
-					grp = (bActionGroup*)MEM_callocN(sizeof(bActionGroup), "bActionGroup");
+					grp = (bActionGroup *)MEM_callocN(sizeof(bActionGroup), "bActionGroup");
 					
 					grp->flag = AGRP_SELECTED;
 					BLI_strncpy(grp->name, bone_name, sizeof(grp->name));
@@ -240,22 +240,23 @@ void AnimationImporter::add_fcurves_to_object(Object *ob, std::vector<FCurve*>&
 }
 
 AnimationImporter::AnimationImporter(UnitConverter *conv, ArmatureImporter *arm, Scene *scene) :
-		TransformReader(conv), armature_importer(arm), scene(scene) { }
+	TransformReader(conv), armature_importer(arm), scene(scene) {
+}
 
 AnimationImporter::~AnimationImporter()
 {
 	// free unused FCurves
-	for (std::vector<FCurve*>::iterator it = unused_curves.begin(); it != unused_curves.end(); it++)
+	for (std::vector<FCurve *>::iterator it = unused_curves.begin(); it != unused_curves.end(); it++)
 		free_fcurve(*it);
 
 	if (unused_curves.size())
 		fprintf(stderr, "removed %d unused curves\n", (int)unused_curves.size());
 }
 
-bool AnimationImporter::write_animation(const COLLADAFW::Animation* anim) 
+bool AnimationImporter::write_animation(const COLLADAFW::Animation *anim)
 {
 	if (anim->getAnimationType() == COLLADAFW::Animation::ANIMATION_CURVE) {
-		COLLADAFW::AnimationCurve *curve = (COLLADAFW::AnimationCurve*)anim;
+		COLLADAFW::AnimationCurve *curve = (COLLADAFW::AnimationCurve *)anim;
 		
 		// XXX Don't know if it's necessary
 		// Should we check outPhysicalDimension?
@@ -270,15 +271,15 @@ bool AnimationImporter::write_animation(const COLLADAFW::Animation* anim)
 
 		if (interp != COLLADAFW::AnimationCurve::INTERPOLATION_MIXED) {
 			switch (interp) {
-			case COLLADAFW::AnimationCurve::INTERPOLATION_LINEAR:
-			case COLLADAFW::AnimationCurve::INTERPOLATION_BEZIER:
-			case COLLADAFW::AnimationCurve::INTERPOLATION_STEP:
-				animation_to_fcurves(curve);
-				break;
-			default:
-				// TODO there're also CARDINAL, HERMITE, BSPLINE and STEP types
-				fprintf(stderr, "CARDINAL, HERMITE and BSPLINE anim interpolation types not supported yet.\n");
-				break;
+				case COLLADAFW::AnimationCurve::INTERPOLATION_LINEAR:
+				case COLLADAFW::AnimationCurve::INTERPOLATION_BEZIER:
+				case COLLADAFW::AnimationCurve::INTERPOLATION_STEP:
+					animation_to_fcurves(curve);
+					break;
+				default:
+					// TODO there're also CARDINAL, HERMITE, BSPLINE and STEP types
+					fprintf(stderr, "CARDINAL, HERMITE and BSPLINE anim interpolation types not supported yet.\n");
+					break;
 			}
 		}
 		else {
@@ -294,7 +295,7 @@ bool AnimationImporter::write_animation(const COLLADAFW::Animation* anim)
 }
 	
 // called on post-process stage after writeVisualScenes
-bool AnimationImporter::write_animation_list(const COLLADAFW::AnimationList* animlist) 
+bool AnimationImporter::write_animation_list(const COLLADAFW::AnimationList *animlist)
 {
 	const COLLADAFW::UniqueId& animlist_id = animlist->getUniqueId();
 
@@ -334,14 +335,14 @@ virtual void AnimationImporter::change_eul_to_quat(Object *ob, bAction *act)
 	bActionGroup *grp;
 	int i;
 	
-	for (grp = (bActionGroup*)act->groups.first; grp; grp = grp->next) {
+	for (grp = (bActionGroup *)act->groups.first; grp; grp = grp->next) {
 
 		FCurve *eulcu[3] = {NULL, NULL, NULL};
 		
 		if (fcurves_actionGroup_map.find(grp) == fcurves_actionGroup_map.end())
 			continue;
 
-		std::vector<FCurve*> &rot_fcurves = fcurves_actionGroup_map[grp];
+		std::vector<FCurve *> &rot_fcurves = fcurves_actionGroup_map[grp];
 		
 		if (rot_fcurves.size() > 3) continue;
 
@@ -387,10 +388,10 @@ virtual void AnimationImporter::change_eul_to_quat(Object *ob, bAction *act)
 
 				/*eul_to_mat3(rot, eul);
 
-				mul_m3_m3m3(rel, irest, rot);
+				   mul_m3_m3m3(rel, irest, rot);
 
-				mat3_to_quat(quat, rel);
-				*/
+				   mat3_to_quat(quat, rel);
+				 */
 
 				eul_to_quat(quat, eul);
 
@@ -415,7 +416,7 @@ virtual void AnimationImporter::change_eul_to_quat(Object *ob, bAction *act)
 	}
 
 	bPoseChannel *pchan;
-	for (pchan = (bPoseChannel*)ob->pose->chanbase.first; pchan; pchan = pchan->next) {
+	for (pchan = (bPoseChannel *)ob->pose->chanbase.first; pchan; pchan = pchan->next) {
 		pchan->rotmode = ROT_MODE_QUAT;
 	}
 }
@@ -423,9 +424,9 @@ virtual void AnimationImporter::change_eul_to_quat(Object *ob, bAction *act)
 
 
 //sets the rna_path and array index to curve
-void AnimationImporter::modify_fcurve(std::vector<FCurve*>* curves, const char* rna_path, int array_index )
+void AnimationImporter::modify_fcurve(std::vector<FCurve *> *curves, const char *rna_path, int array_index)
 {
-	std::vector<FCurve*>::iterator it;
+	std::vector<FCurve *>::iterator it;
 	int i;
 	for (it = curves->begin(), i = 0; it != curves->end(); it++, i++) {
 		FCurve *fcu = *it;
@@ -438,19 +439,19 @@ void AnimationImporter::modify_fcurve(std::vector<FCurve*>* curves, const char*
 	}
 }
 
-void AnimationImporter::unused_fcurve(std::vector<FCurve*>* curves)
+void AnimationImporter::unused_fcurve(std::vector<FCurve *> *curves)
 {
 	// when an error happens and we can't actually use curve remove it from unused_curves
-	std::vector<FCurve*>::iterator it;
+	std::vector<FCurve *>::iterator it;
 	for (it = curves->begin(); it != curves->end(); it++) {
 		FCurve *fcu = *it;
 		unused_curves.erase(std::remove(unused_curves.begin(), unused_curves.end(), fcu), unused_curves.end());
 	}
 }
 
-void AnimationImporter::find_frames( std::vector<float>* frames, std::vector<FCurve*>* curves)
+void AnimationImporter::find_frames(std::vector<float> *frames, std::vector<FCurve *> *curves)
 {
-	std::vector<FCurve*>::iterator iter;
+	std::vector<FCurve *>::iterator iter;
 	for (iter = curves->begin(); iter != curves->end(); iter++) {
 		FCurve *fcu = *iter;
 
@@ -466,16 +467,16 @@ void AnimationImporter::find_frames( std::vector<float>* frames, std::vector<FCu
 }
 
 //creates the rna_paths and array indices of fcurves from animations using transformation and bound animation class of each animation.
-void AnimationImporter:: Assign_transform_animations(COLLADAFW::Transformation * transform,
-													 const COLLADAFW::AnimationList::AnimationBinding * binding,
-													 std::vector<FCurve*>* curves, bool is_joint, char * joint_path)
+void AnimationImporter:: Assign_transform_animations(COLLADAFW::Transformation *transform,
+                                                     const COLLADAFW::AnimationList::AnimationBinding *binding,
+                                                     std::vector<FCurve *> *curves, bool is_joint, char *joint_path)
 {
 	COLLADAFW::Transformation::TransformationType tm_type = transform->getTransformationType();
 	bool is_matrix = tm_type == COLLADAFW::Transformation::MATRIX;
 	bool is_rotation = tm_type  == COLLADAFW::Transformation::ROTATE;
 
 	//to check if the no of curves are valid
-	bool xyz = ((tm_type == COLLADAFW::Transformation::TRANSLATE ||tm_type  == COLLADAFW::Transformation::SCALE) && binding->animationClass == COLLADAFW::AnimationList::POSITION_XYZ);
+	bool xyz = ((tm_type == COLLADAFW::Transformation::TRANSLATE || tm_type  == COLLADAFW::Transformation::SCALE) && binding->animationClass == COLLADAFW::AnimationList::POSITION_XYZ);
 
 
 	if (!((!xyz && curves->size() == 1) || (xyz && curves->size() == 3) || is_matrix)) {
@@ -488,85 +489,85 @@ void AnimationImporter:: Assign_transform_animations(COLLADAFW::Transformation *
 	switch (tm_type) {
 		case COLLADAFW::Transformation::TRANSLATE:
 		case COLLADAFW::Transformation::SCALE:
-			{
-				bool loc = tm_type == COLLADAFW::Transformation::TRANSLATE;
-				if (is_joint)
-					BLI_snprintf(rna_path, sizeof(rna_path), "%s.%s", joint_path, loc ? "location" : "scale");
-				else
-					BLI_strncpy(rna_path, loc ? "location" : "scale", sizeof(rna_path));
+		{
+			bool loc = tm_type == COLLADAFW::Transformation::TRANSLATE;
+			if (is_joint)
+				BLI_snprintf(rna_path, sizeof(rna_path), "%s.%s", joint_path, loc ? "location" : "scale");
+			else
+				BLI_strncpy(rna_path, loc ? "location" : "scale", sizeof(rna_path));
 
-				switch (binding->animationClass) {
-		case COLLADAFW::AnimationList::POSITION_X:
-			modify_fcurve(curves, rna_path, 0 );
-			break;
-		case COLLADAFW::AnimationList::POSITION_Y:
-			modify_fcurve(curves, rna_path, 1 );
-			break;
-		case COLLADAFW::AnimationList::POSITION_Z:
-			modify_fcurve(curves, rna_path, 2 );
-			break;
-		case COLLADAFW::AnimationList::POSITION_XYZ:
-			modify_fcurve(curves, rna_path, -1 );
-			break;
-		default:
-			unused_fcurve(curves);
-			fprintf(stderr, "AnimationClass %d is not supported for %s.\n",
-				binding->animationClass, loc ? "TRANSLATE" : "SCALE");
-				}
-				break;
+			switch (binding->animationClass) {
+				case COLLADAFW::AnimationList::POSITION_X:
+					modify_fcurve(curves, rna_path, 0);
+					break;
+				case COLLADAFW::AnimationList::POSITION_Y:
+					modify_fcurve(curves, rna_path, 1);
+					break;
+				case COLLADAFW::AnimationList::POSITION_Z:
+					modify_fcurve(curves, rna_path, 2);
+					break;
+				case COLLADAFW::AnimationList::POSITION_XYZ:
+					modify_fcurve(curves, rna_path, -1);
+					break;
+				default:
+					unused_fcurve(curves);
+					fprintf(stderr, "AnimationClass %d is not supported for %s.\n",
+					        binding->animationClass, loc ? "TRANSLATE" : "SCALE");
 			}
+			break;
+		}
 
 
 		case COLLADAFW::Transformation::ROTATE:
-			{
-				if (is_joint)
-					BLI_snprintf(rna_path, sizeof(rna_path), "%s.rotation_euler", joint_path);
-				else
-					BLI_strncpy(rna_path, "rotation_euler", sizeof(rna_path));
-				std::vector<FCurve*>::iterator iter;
-				for (iter = curves->begin(); iter != curves->end(); iter++) {
-					FCurve* fcu = *iter;
-
-					//if transform is rotation the fcurves values must be turned in to radian.
-					if (is_rotation)
-						fcurve_deg_to_rad(fcu);		 
-				}					
-				COLLADAFW::Rotate* rot = (COLLADAFW::Rotate*)transform;
-				COLLADABU::Math::Vector3& axis = rot->getRotationAxis();
-
-				switch (binding->animationClass) {
-		case COLLADAFW::AnimationList::ANGLE:
-			if (COLLADABU::Math::Vector3::UNIT_X == axis) {
-				modify_fcurve(curves, rna_path, 0 );
-			}
-			else if (COLLADABU::Math::Vector3::UNIT_Y == axis) {
-				modify_fcurve(curves, rna_path, 1 );
+		{
+			if (is_joint)
+				BLI_snprintf(rna_path, sizeof(rna_path), "%s.rotation_euler", joint_path);
+			else
+				BLI_strncpy(rna_path, "rotation_euler", sizeof(rna_path));
+			std::vector<FCurve *>::iterator iter;
+			for (iter = curves->begin(); iter != curves->end(); iter++) {
+				FCurve *fcu = *iter;
+
+				//if transform is rotation the fcurves values must be turned in to radian.
+				if (is_rotation)
+					fcurve_deg_to_rad(fcu);
 			}
-			else if (COLLADABU::Math::Vector3::UNIT_Z == axis) {
-				modify_fcurve(curves, rna_path, 2 );
+			COLLADAFW::Rotate *rot = (COLLADAFW::Rotate *)transform;
+			COLLADABU::Math::Vector3& axis = rot->getRotationAxis();
+
+			switch (binding->animationClass) {
+				case COLLADAFW::AnimationList::ANGLE:
+					if (COLLADABU::Math::Vector3::UNIT_X == axis) {
+						modify_fcurve(curves, rna_path, 0);
+					}
+					else if (COLLADABU::Math::Vector3::UNIT_Y == axis) {
+						modify_fcurve(curves, rna_path, 1);
+					}
+					else if (COLLADABU::Math::Vector3::UNIT_Z == axis) {
+						modify_fcurve(curves, rna_path, 2);
+					}
+					else
+						unused_fcurve(curves);
+					break;
+				case COLLADAFW::AnimationList::AXISANGLE:
+				// TODO convert axis-angle to quat? or XYZ?
+				default:
+					unused_fcurve(curves);
+					fprintf(stderr, "AnimationClass %d is not supported for ROTATE transformation.\n",
+					        binding->animationClass);
 			}
-			else
-				unused_fcurve(curves);
 			break;
-		case COLLADAFW::AnimationList::AXISANGLE:
-			// TODO convert axis-angle to quat? or XYZ?
-		default:
-			unused_fcurve(curves);
-			fprintf(stderr, "AnimationClass %d is not supported for ROTATE transformation.\n",
-				binding->animationClass);
-				}
-				break;
-			}
+		}
 
 		case COLLADAFW::Transformation::MATRIX:
 			/*{
-			COLLADAFW::Matrix* mat = (COLLADAFW::Matrix*)transform;
-			COLLADABU::Math::Matrix4 mat4 = mat->getMatrix();
-			switch (binding->animationClass) {
-			case COLLADAFW::AnimationList::TRANSFORM:
+			   COLLADAFW::Matrix* mat = (COLLADAFW::Matrix*)transform;
+			   COLLADABU::Math::Matrix4 mat4 = mat->getMatrix();
+			   switch (binding->animationClass) {
+			   case COLLADAFW::AnimationList::TRANSFORM:
 
-			}
-			}*/
+			   }
+			   }*/
 			unused_fcurve(curves);
 			break;
 		case COLLADAFW::Transformation::SKEW:
@@ -579,7 +580,7 @@ void AnimationImporter:: Assign_transform_animations(COLLADAFW::Transformation *
 }
 
 //creates the rna_paths and array indices of fcurves from animations using color and bound animation class of each animation.
-void AnimationImporter:: Assign_color_animations(const COLLADAFW::UniqueId& listid, ListBase *AnimCurves, const char * anim_type)
+void AnimationImporter:: Assign_color_animations(const COLLADAFW::UniqueId& listid, ListBase *AnimCurves, const char *anim_type)
 {
 	char rna_path[100];
 	BLI_strncpy(rna_path, anim_type, sizeof(rna_path));
@@ -587,35 +588,35 @@ void AnimationImporter:: Assign_color_animations(const COLLADAFW::UniqueId& list
 	const COLLADAFW::AnimationList *animlist = animlist_map[listid];
 	const COLLADAFW::AnimationList::AnimationBindings& bindings = animlist->getAnimationBindings();
 	//all the curves belonging to the current binding
-	std::vector<FCurve*> animcurves;
+	std::vector<FCurve *> animcurves;
 	for (unsigned int j = 0; j < bindings.getCount(); j++) {
 		animcurves = curve_map[bindings[j].animation];
 
 		switch (bindings[j].animationClass) {
-		case COLLADAFW::AnimationList::COLOR_R:
-			modify_fcurve(&animcurves, rna_path, 0 );
-			break;
-		case COLLADAFW::AnimationList::COLOR_G:
-			modify_fcurve(&animcurves, rna_path, 1 );
-			break;
-		case COLLADAFW::AnimationList::COLOR_B:
-			modify_fcurve(&animcurves, rna_path, 2 );
-			break;
-		case COLLADAFW::AnimationList::COLOR_RGB:
-		case COLLADAFW::AnimationList::COLOR_RGBA: // to do-> set intensity
-			modify_fcurve(&animcurves, rna_path, -1 );
-			break;
+			case COLLADAFW::AnimationList::COLOR_R:
+				modify_fcurve(&animcurves, rna_path, 0);
+				break;
+			case COLLADAFW::AnimationList::COLOR_G:
+				modify_fcurve(&animcurves, rna_path, 1);
+				break;
+			case COLLADAFW::AnimationList::COLOR_B:
+				modify_fcurve(&animcurves, rna_path, 2);
+				break;
+			case COLLADAFW::AnimationList::COLOR_RGB:
+			case COLLADAFW::AnimationList::COLOR_RGBA: // to do-> set intensity
+				modify_fcurve(&animcurves, rna_path, -1);
+				break;
 
-		default:
-			unused_fcurve(&animcurves);
-			fprintf(stderr, "AnimationClass %d is not supported for %s.\n",
-				bindings[j].animationClass, "COLOR" );
+			default:
+				unused_fcurve(&animcurves);
+				fprintf(stderr, "AnimationClass %d is not supported for %s.\n",
+				        bindings[j].animationClass, "COLOR");
 		}
 
-		std::vector<FCurve*>::iterator iter;
+		std::vector<FCurve *>::iterator iter;
 		//Add the curves of the current animation to the object
 		for (iter = animcurves.begin(); iter != animcurves.end(); iter++) {
-			FCurve * fcu = *iter;
+			FCurve *fcu = *iter;
 			BLI_addtail(AnimCurves, fcu);	
 		}
 	}
@@ -623,7 +624,7 @@ void AnimationImporter:: Assign_color_animations(const COLLADAFW::UniqueId& list
 
 }
 
-void AnimationImporter:: Assign_float_animations(const COLLADAFW::UniqueId& listid, ListBase *AnimCurves, const char * anim_type)
+void AnimationImporter:: Assign_float_animations(const COLLADAFW::UniqueId& listid, ListBase *AnimCurves, const char *anim_type)
 {
 	char rna_path[100];
 	if (animlist_map.find(listid) == animlist_map.end()) {
@@ -634,16 +635,16 @@ void AnimationImporter:: Assign_float_animations(const COLLADAFW::UniqueId& list
 		const COLLADAFW::AnimationList *animlist = animlist_map[listid];
 		const COLLADAFW::AnimationList::AnimationBindings& bindings = animlist->getAnimationBindings();
 		//all the curves belonging to the current binding
-		std::vector<FCurve*> animcurves;
+		std::vector<FCurve *> animcurves;
 		for (unsigned int j = 0; j < bindings.getCount(); j++) {
 			animcurves = curve_map[bindings[j].animation];
 
 			BLI_strncpy(rna_path, anim_type, sizeof(rna_path));
-			modify_fcurve(&animcurves, rna_path, 0 );
-			std::vector<FCurve*>::iterator iter;
+			modify_fcurve(&animcurves, rna_path, 0);
+			std::vector<FCurve *>::iterator iter;
 			//Add the curves of the current animation to the object
 			for (iter = animcurves.begin(); iter != animcurves.end(); iter++) {
-				FCurve * fcu = *iter;
+				FCurve *fcu = *iter;
 				BLI_addtail(AnimCurves, fcu);
 			}
 		}
@@ -651,13 +652,13 @@ void AnimationImporter:: Assign_float_animations(const COLLADAFW::UniqueId& list
 	
 }
 
-void AnimationImporter::apply_matrix_curves( Object * ob, std::vector<FCurve*>& animcurves, COLLADAFW::Node* root, COLLADAFW::Node* node,
-													COLLADAFW::Transformation * tm )
+void AnimationImporter::apply_matrix_curves(Object *ob, std::vector<FCurve *>& animcurves, COLLADAFW::Node *root, COLLADAFW::Node *node,
+                                            COLLADAFW::Transformation *tm)
 {
 	bool is_joint = node->getType() == COLLADAFW::Node::JOINT;
 	const char *bone_name = is_joint ? bc_get_joint_name(node) : NULL;
 	char joint_path[200];
-	if ( is_joint ) 
+	if (is_joint)
 		armature_importer->get_rna_path_for_joint(node, joint_path, sizeof(joint_path));
 
 	std::vector<float> frames;
@@ -670,7 +671,7 @@ void AnimationImporter::apply_matrix_curves( Object * ob, std::vector<FCurve*>&
 		get_joint_rest_mat(irest_dae, root, node);
 		invert_m4(irest_dae);
 
-		Bone *bone = BKE_armature_find_bone_name((bArmature*)ob->data, bone_name);
+		Bone *bone = BKE_armature_find_bone_name((bArmature *)ob->data, bone_name);
 		if (!bone) {
 			fprintf(stderr, "cannot find bone \"%s\"\n", bone_name);
 			return;
@@ -751,13 +752,13 @@ void AnimationImporter::apply_matrix_curves( Object * ob, std::vector<FCurve*>&
 			copy_m4_m4(mat, matfra);
 		}
 
-		float  rot[4], loc[3], scale[3];
+		float rot[4], loc[3], scale[3];
 
 		mat4_to_quat(rot, mat);
 		/*for ( int i = 0 ; i < 4  ;  i ++ )
-		{
-		rot[i] = RAD2DEGF(rot[i]);
-		}*/
+		   {
+		   rot[i] = RAD2DEGF(rot[i]);
+		   }*/
 		copy_v3_v3(loc, mat[3]);
 		mat4_to_size(scale, mat);
 
@@ -771,12 +772,12 @@ void AnimationImporter::apply_matrix_curves( Object * ob, std::vector<FCurve*>&
 				add_bezt(newcu[i], fra, scale[i - 7]);
 		}
 	}
-	verify_adt_action((ID*)&ob->id, 1);
+	verify_adt_action((ID *)&ob->id, 1);
 
 	ListBase *curves = &ob->adt->action->curves;
 
 	// add curves
-	for (int i= 0; i < totcu; i++) {
+	for (int i = 0; i < totcu; i++) {
 		if (is_joint)
 			add_bone_fcurve(ob, node, newcu[i]);
 		else
@@ -795,32 +796,32 @@ void AnimationImporter::apply_matrix_curves( Object * ob, std::vector<FCurve*>&
 
 }
 
-void AnimationImporter::translate_Animations ( COLLADAFW::Node * node,
-												std::map<COLLADAFW::UniqueId, COLLADAFW::Node*>& root_map,
-												std::multimap<COLLADAFW::UniqueId, Object*>& object_map,
-												std::map<COLLADAFW::UniqueId, const COLLADAFW::Object*> FW_object_map)
+void AnimationImporter::translate_Animations(COLLADAFW::Node *node,
+                                             std::map<COLLADAFW::UniqueId, COLLADAFW::Node *>& root_map,
+                                             std::multimap<COLLADAFW::UniqueId, Object *>& object_map,
+                                             std::map<COLLADAFW::UniqueId, const COLLADAFW::Object *> FW_object_map)
 {
-	AnimationImporter::AnimMix* animType = get_animation_type(node, FW_object_map );
+	AnimationImporter::AnimMix *animType = get_animation_type(node, FW_object_map);
 
 	bool is_joint = node->getType() == COLLADAFW::Node::JOINT;
 	COLLADAFW::Node *root = root_map.find(node->getUniqueId()) == root_map.end() ? node : root_map[node->getUniqueId()];
-    Object *ob = is_joint ? armature_importer->get_armature_for_joint(root) : object_map.find(node->getUniqueId())->second;
+	Object *ob = is_joint ? armature_importer->get_armature_for_joint(root) : object_map.find(node->getUniqueId())->second;
 	if (!ob) {
 		fprintf(stderr, "cannot find Object for Node with id=\"%s\"\n", node->getOriginalId().c_str());
 		return;
 	}
 
-	bAction * act;
+	bAction *act;
 
-	if ( (animType->transform) != 0 ) {
+	if ( (animType->transform) != 0) {
 		/* const char *bone_name = is_joint ? bc_get_joint_name(node) : NULL; */ /* UNUSED */
 		char joint_path[200];
 
-		if ( is_joint ) 
+		if (is_joint)
 			armature_importer->get_rna_path_for_joint(node, joint_path, sizeof(joint_path));
 
 
-		if (!ob->adt || !ob->adt->action) act = verify_adt_action((ID*)&ob->id, 1);
+		if (!ob->adt || !ob->adt->action) act = verify_adt_action((ID *)&ob->id, 1);
 		else act = ob->adt->action;
 
 		//Get the list of animation curves of the object
@@ -847,11 +848,11 @@ void AnimationImporter::translate_Animations ( COLLADAFW::Node * node,
 				const COLLADAFW::AnimationList *animlist = animlist_map[listid];
 				const COLLADAFW::AnimationList::AnimationBindings& bindings = animlist->getAnimationBindings();
 				//all the curves belonging to the current binding
-				std::vector<FCurve*> animcurves;
+				std::vector<FCurve *> animcurves;
 				for (unsigned int j = 0; j < bindings.getCount(); j++) {
 					animcurves = curve_map[bindings[j].animation];
-					if ( is_matrix ) {
-						apply_matrix_curves(ob, animcurves, root, node,  transform  );
+					if (is_matrix) {
+						apply_matrix_curves(ob, animcurves, root, node,  transform);
 					}
 					else {				
 
@@ -861,12 +862,12 @@ void AnimationImporter::translate_Animations ( COLLADAFW::Node * node,
 						}
 						else {
 							//calculate rnapaths and array index of fcurves according to transformation and animation class
-							Assign_transform_animations(transform, &bindings[j], &animcurves, is_joint, joint_path ); 
+							Assign_transform_animations(transform, &bindings[j], &animcurves, is_joint, joint_path);
 
-							std::vector<FCurve*>::iterator iter;
+							std::vector<FCurve *>::iterator iter;
 							//Add the curves of the current animation to the object
 							for (iter = animcurves.begin(); iter != animcurves.end(); iter++) {
-								FCurve * fcu = *iter;
+								FCurve *fcu = *iter;
 							
 								BLI_addtail(AnimCurves, fcu);
 							}
@@ -882,9 +883,9 @@ void AnimationImporter::translate_Animations ( COLLADAFW::Node * node,
 	}
 
 	if ((animType->light) != 0) {
-		Lamp * lamp  = (Lamp*) ob->data;
+		Lamp *lamp  = (Lamp *) ob->data;
 
-		if (!lamp->adt || !lamp->adt->action) act = verify_adt_action((ID*)&lamp->id, 1);
+		if (!lamp->adt || !lamp->adt->action) act = verify_adt_action((ID *)&lamp->id, 1);
 		else act = lamp->adt->action;
 
 		ListBase *AnimCurves = &(act->curves);
@@ -899,63 +900,63 @@ void AnimationImporter::translate_Animations ( COLLADAFW::Node * node,
 
 				Assign_color_animations(listid, AnimCurves, "color"); 
 			}
-			if ((animType->light & LIGHT_FOA) != 0 ) {
+			if ((animType->light & LIGHT_FOA) != 0) {
 				const COLLADAFW::AnimatableFloat *foa =  &(light->getFallOffAngle());
 				const COLLADAFW::UniqueId& listid = foa->getAnimationList();
 
-				Assign_float_animations( listid, AnimCurves, "spot_size");
+				Assign_float_animations(listid, AnimCurves, "spot_size");
 			}
-			if ( (animType->light & LIGHT_FOE) != 0 ) {
+			if ( (animType->light & LIGHT_FOE) != 0) {
 				const COLLADAFW::AnimatableFloat *foe =  &(light->getFallOffExponent());
 				const COLLADAFW::UniqueId& listid = foe->getAnimationList();
 
-				Assign_float_animations( listid, AnimCurves, "spot_blend");
+				Assign_float_animations(listid, AnimCurves, "spot_blend");
 
 			}
 		}
 	}
 
 	if ( (animType->camera) != 0)  {
-		Camera * camera  = (Camera*) ob->data;
+		Camera *camera  = (Camera *) ob->data;
 
-		if (!camera->adt || !camera->adt->action) act = verify_adt_action((ID*)&camera->id, 1);
+		if (!camera->adt || !camera->adt->action) act = verify_adt_action((ID *)&camera->id, 1);
 		else act = camera->adt->action;
 
 		ListBase *AnimCurves = &(act->curves);
-		const COLLADAFW::InstanceCameraPointerArray& nodeCameras= node->getInstanceCameras();
+		const COLLADAFW::InstanceCameraPointerArray& nodeCameras = node->getInstanceCameras();
 
 		for (unsigned int i = 0; i < nodeCameras.getCount(); i++) {
 			const COLLADAFW::Camera *camera = (COLLADAFW::Camera *) FW_object_map[nodeCameras[i]->getInstanciatedObjectId()];
 
-			if ((animType->camera & CAMERA_XFOV) != 0 ) {
+			if ((animType->camera & CAMERA_XFOV) != 0) {
 				const COLLADAFW::AnimatableFloat *xfov =  &(camera->getXFov());
 				const COLLADAFW::UniqueId& listid = xfov->getAnimationList();
-				Assign_float_animations( listid, AnimCurves, "lens");
+				Assign_float_animations(listid, AnimCurves, "lens");
 			}
 
-			else if ((animType->camera & CAMERA_XMAG) != 0 ) {
+			else if ((animType->camera & CAMERA_XMAG) != 0) {
 				const COLLADAFW::AnimatableFloat *xmag =  &(camera->getXMag());
 				const COLLADAFW::UniqueId& listid = xmag->getAnimationList();
-				Assign_float_animations( listid, AnimCurves, "ortho_scale");
+				Assign_float_animations(listid, AnimCurves, "ortho_scale");
 			}
 
-			if ((animType->camera & CAMERA_ZFAR) != 0 ) {
+			if ((animType->camera & CAMERA_ZFAR) != 0) {
 				const COLLADAFW::AnimatableFloat *zfar =  &(camera->getFarClippingPlane());
 				const COLLADAFW::UniqueId& listid = zfar->getAnimationList();
-				Assign_float_animations( listid, AnimCurves, "clip_end");
+				Assign_float_animations(listid, AnimCurves, "clip_end");
 			}
 
-			if ((animType->camera & CAMERA_ZNEAR) != 0 ) {
+			if ((animType->camera & CAMERA_ZNEAR) != 0) {
 				const COLLADAFW::AnimatableFloat *znear =  &(camera->getNearClippingPlane());
 				const COLLADAFW::UniqueId& listid = znear->getAnimationList();
-				Assign_float_animations( listid, AnimCurves, "clip_start");
+				Assign_float_animations(listid, AnimCurves, "clip_start");
 			}
 
 		}
 	}
-	if ( animType->material != 0) {
+	if (animType->material != 0) {
 		Material *ma = give_current_material(ob, 1);
-		if (!ma->adt || !ma->adt->action) act = verify_adt_action((ID*)&ma->id, 1);
+		if (!ma->adt || !ma->adt->action) act = verify_adt_action((ID *)&ma->id, 1);
 		else act = ma->adt->action;
 
 		ListBase *AnimCurves = &(act->curves);
@@ -972,25 +973,25 @@ void AnimationImporter::translate_Animations ( COLLADAFW::Node * node,
 					if ((animType->material & MATERIAL_SHININESS) != 0) {
 						const COLLADAFW::FloatOrParam *shin = &(efc->getShininess());
 						const COLLADAFW::UniqueId& listid =  shin->getAnimationList();
-						Assign_float_animations( listid, AnimCurves, "specular_hardness" );
+						Assign_float_animations(listid, AnimCurves, "specular_hardness");
 					}
 
 					if ((animType->material & MATERIAL_IOR) != 0) {
 						const COLLADAFW::FloatOrParam *ior = &(efc->getIndexOfRefraction());
 						const COLLADAFW::UniqueId& listid =  ior->getAnimationList();
-						Assign_float_animations( listid, AnimCurves, "raytrace_transparency.ior" );
+						Assign_float_animations(listid, AnimCurves, "raytrace_transparency.ior");
 					}
 
 					if ((animType->material & MATERIAL_SPEC_COLOR) != 0) {
 						const COLLADAFW::ColorOrTexture *cot = &(efc->getSpecular());
 						const COLLADAFW::UniqueId& listid =  cot->getColor().getAnimationList();
-						Assign_color_animations( listid, AnimCurves, "specular_color" );
+						Assign_color_animations(listid, AnimCurves, "specular_color");
 					}
 
 					if ((animType->material & MATERIAL_DIFF_COLOR) != 0) {
 						const COLLADAFW::ColorOrTexture *cot = &(efc->getDiffuse());
 						const COLLADAFW::UniqueId& listid =  cot->getColor().getAnimationList();
-						Assign_color_animations( listid, AnimCurves, "diffuse_color" );
+						Assign_color_animations(listid, AnimCurves, "diffuse_color");
 					}
 				}
 			}
@@ -998,7 +999,7 @@ void AnimationImporter::translate_Animations ( COLLADAFW::Node * node,
 	}
 }
 
-void AnimationImporter::add_bone_animation_sampled(Object * ob, std::vector<FCurve*>& animcurves, COLLADAFW::Node* root, COLLADAFW::Node* node, COLLADAFW::Transformation * tm)
+void AnimationImporter::add_bone_animation_sampled(Object *ob, std::vector<FCurve *>& animcurves, COLLADAFW::Node *root, COLLADAFW::Node *node, COLLADAFW::Transformation *tm)
 {
 	const char *bone_name = bc_get_joint_name(node);
 	char joint_path[200];
@@ -1010,9 +1011,9 @@ void AnimationImporter::add_bone_animation_sampled(Object * ob, std::vector<FCur
 	// convert degrees to radians
 	if (tm->getTransformationType() == COLLADAFW::Transformation::ROTATE) {
 
-		std::vector<FCurve*>::iterator iter;
+		std::vector<FCurve *>::iterator iter;
 		for (iter = animcurves.begin(); iter != animcurves.end(); iter++) {
-			FCurve* fcu = *iter;
+			FCurve *fcu = *iter;
 
 			fcurve_deg_to_rad(fcu);		 
 		}					
@@ -1025,7 +1026,7 @@ void AnimationImporter::add_bone_animation_sampled(Object * ob, std::vector<FCur
 	get_joint_rest_mat(irest_dae, root, node);
 	invert_m4(irest_dae);
 
-	Bone *bone = BKE_armature_find_bone_name((bArmature*)ob->data, bone_name);
+	Bone *bone = BKE_armature_find_bone_name((bArmature *)ob->data, bone_name);
 	if (!bone) {
 		fprintf(stderr, "cannot find bone \"%s\"\n", bone_name);
 		return;
@@ -1100,7 +1101,7 @@ void AnimationImporter::add_bone_animation_sampled(Object * ob, std::vector<FCur
 		// calc special matrix
 		mul_serie_m4(mat, irest, temp, irest_dae, rest, NULL, NULL, NULL, NULL);
 
-		float  rot[4], loc[3], scale[3];
+		float rot[4], loc[3], scale[3];
 
 		mat4_to_quat(rot, mat);
 		copy_v3_v3(loc, mat[3]);
@@ -1116,10 +1117,10 @@ void AnimationImporter::add_bone_animation_sampled(Object * ob, std::vector<FCur
 				add_bezt(newcu[i], fra, scale[i - 7]);
 		}
 	}
-	verify_adt_action((ID*)&ob->id, 1);
+	verify_adt_action((ID *)&ob->id, 1);
 
 	// add curves
-	for (int i= 0; i < totcu; i++) {
+	for (int i = 0; i < totcu; i++) {
 		add_bone_fcurve(ob, node, newcu[i]);
 	}
 
@@ -1130,8 +1131,8 @@ void AnimationImporter::add_bone_animation_sampled(Object * ob, std::vector<FCur
 
 
 //Check if object is animated by checking if animlist_map holds the animlist_id of node transforms
-AnimationImporter::AnimMix* AnimationImporter::get_animation_type ( const COLLADAFW::Node * node,
-											std::map<COLLADAFW::UniqueId, const COLLADAFW::Object*> FW_object_map) 
+AnimationImporter::AnimMix *AnimationImporter::get_animation_type(const COLLADAFW::Node *node,
+                                                                  std::map<COLLADAFW::UniqueId, const COLLADAFW::Object *> FW_object_map)
 {
 	AnimMix *types = new AnimMix();
 
@@ -1147,7 +1148,7 @@ AnimationImporter::AnimMix* AnimationImporter::get_animation_type ( const COLLAD
 			continue;
 		}
 		else {
-			types->transform = types->transform|NODE_TRANSFORM;
+			types->transform = types->transform | NODE_TRANSFORM;
 			break;
 		}
 	}
@@ -1159,7 +1160,7 @@ AnimationImporter::AnimMix* AnimationImporter::get_animation_type ( const COLLAD
 		types->light = setAnimType(&(light->getFallOffAngle()), (types->light), LIGHT_FOA);
 		types->light = setAnimType(&(light->getFallOffExponent()), (types->light), LIGHT_FOE);
 
-		if ( types->light != 0) break;
+		if (types->light != 0) break;
 
 	}
 
@@ -1167,7 +1168,7 @@ AnimationImporter::AnimMix* AnimationImporter::get_animation_type ( const COLLAD
 	for (unsigned int i = 0; i < nodeCameras.getCount(); i++) {
 		const COLLADAFW::Camera *camera = (COLLADAFW::Camera *) FW_object_map[nodeCameras[i]->getInstanciatedObjectId()];
 
-		if ( camera->getCameraType() == COLLADAFW::Camera::PERSPECTIVE ) {
+		if (camera->getCameraType() == COLLADAFW::Camera::PERSPECTIVE) {
 			types->camera = setAnimType(&(camera->getXMag()), (types->camera), CAMERA_XFOV);
 		}
 		else {
@@ -1176,7 +1177,7 @@ AnimationImporter::AnimMix* AnimationImporter::get_animation_type ( const COLLAD
 		types->camera = setAnimType(&(camera->getFarClippingPlane()), (types->camera), CAMERA_ZFAR);
 		types->camera = setAnimType(&(camera->getNearClippingPlane()), (types->camera), CAMERA_ZNEAR);
 
-		if ( types->camera != 0) break;
+		if (types->camera != 0) break;
 
 	}
 
@@ -1202,16 +1203,16 @@ AnimationImporter::AnimMix* AnimationImporter::get_animation_type ( const COLLAD
 	return types;
 }
 
-int AnimationImporter::setAnimType ( const COLLADAFW::Animatable * prop, int types, int addition)
+int AnimationImporter::setAnimType(const COLLADAFW::Animatable *prop, int types, int addition)
 {
 	const COLLADAFW::UniqueId& listid =  prop->getAnimationList();
 	if (animlist_map.find(listid) != animlist_map.end())
-		return types|addition;
+		return types | addition;
 	else return types;
 }		
 
 // Is not used anymore.
-void AnimationImporter::find_frames_old(std::vector<float> * frames, COLLADAFW::Node * node, COLLADAFW::Transformation::TransformationType tm_type)
+void AnimationImporter::find_frames_old(std::vector<float> *frames, COLLADAFW::Node *node, COLLADAFW::Transformation::TransformationType tm_type)
 {
 	bool is_matrix = tm_type == COLLADAFW::Transformation::MATRIX;
 	bool is_rotation = tm_type == COLLADAFW::Transformation::ROTATE;
@@ -1237,11 +1238,11 @@ void AnimationImporter::find_frames_old(std::vector<float> * frames, COLLADAFW::
 				if (bindings.getCount()) {
 					//for each AnimationBinding get the fcurves which animate the transform
 					for (unsigned int j = 0; j < bindings.getCount(); j++) {
-						std::vector<FCurve*>& curves = curve_map[bindings[j].animation];
+						std::vector<FCurve *>& curves = curve_map[bindings[j].animation];
 						bool xyz = ((nodeTmType == COLLADAFW::Transformation::TRANSLATE || nodeTmType == COLLADAFW::Transformation::SCALE) && bindings[j].animationClass == COLLADAFW::AnimationList::POSITION_XYZ);
 
 						if ((!xyz && curves.size() == 1) || (xyz && curves.size() == 3) || is_matrix) {
-							std::vector<FCurve*>::iterator iter;
+							std::vector<FCurve *>::iterator iter;
 
 							for (iter = curves.begin(); iter != curves.end(); iter++) {
 								FCurve *fcu = *iter;
@@ -1275,10 +1276,10 @@ void AnimationImporter::find_frames_old(std::vector<float> * frames, COLLADAFW::
 // animlist_map - map animlist id -> animlist
 // curve_map - map anim id -> curve(s)
 Object *AnimationImporter::translate_animation_OLD(COLLADAFW::Node *node,
-							std::map<COLLADAFW::UniqueId, Object*>& object_map,
-							std::map<COLLADAFW::UniqueId, COLLADAFW::Node*>& root_map,
-							COLLADAFW::Transformation::TransformationType tm_type,
-							Object *par_job)
+                                                   std::map<COLLADAFW::UniqueId, Object *>& object_map,
+                                                   std::map<COLLADAFW::UniqueId, COLLADAFW::Node *>& root_map,
+                                                   COLLADAFW::Transformation::TransformationType tm_type,
+                                                   Object *par_job)
 {
 	
 	bool is_rotation = tm_type == COLLADAFW::Transformation::ROTATE;
@@ -1307,7 +1308,7 @@ Object *AnimationImporter::translate_animation_OLD(COLLADAFW::Node *node,
 		get_joint_rest_mat(irest_dae, root, node);
 		invert_m4(irest_dae);
 
-		Bone *bone = BKE_armature_find_bone_name((bArmature*)ob->data, bone_name);
+		Bone *bone = BKE_armature_find_bone_name((bArmature *)ob->data, bone_name);
 		if (!bone) {
 			fprintf(stderr, "cannot find bone \"%s\"\n", bone_name);
 			return NULL;
@@ -1332,19 +1333,19 @@ Object *AnimationImporter::translate_animation_OLD(COLLADAFW::Node *node,
 
 	const char *tm_str = NULL;
 	switch (tm_type) {
-	case COLLADAFW::Transformation::ROTATE:
-		tm_str = "rotation_quaternion";
-		break;
-	case COLLADAFW::Transformation::SCALE:
-		tm_str = "scale";
-		break;
-	case COLLADAFW::Transformation::TRANSLATE:
-		tm_str = "location";
-		break;
-	case COLLADAFW::Transformation::MATRIX:
-		break;
-	default:
-		return job;
+		case COLLADAFW::Transformation::ROTATE:
+			tm_str = "rotation_quaternion";
+			break;
+		case COLLADAFW::Transformation::SCALE:
+			tm_str = "scale";
+			break;
+		case COLLADAFW::Transformation::TRANSLATE:
+			tm_str = "location";
+			break;
+		case COLLADAFW::Transformation::MATRIX:
+			break;
+		default:
+			return job;
 	}
 
 	char rna_path[200];
@@ -1425,22 +1426,22 @@ Object *AnimationImporter::translate_animation_OLD(COLLADAFW::Node *node,
 		float val[4], rot[4], loc[3], scale[3];
 
 		switch (tm_type) {
-		case COLLADAFW::Transformation::ROTATE:
-			mat4_to_quat(val, mat);
-			break;
-		case COLLADAFW::Transformation::SCALE:
-			mat4_to_size(val, mat);
-			break;
-		case COLLADAFW::Transformation::TRANSLATE:
-			copy_v3_v3(val, mat[3]);
-			break;
-		case COLLADAFW::Transformation::MATRIX:
-			mat4_to_quat(rot, mat);
-			copy_v3_v3(loc, mat[3]);
-			mat4_to_size(scale, mat);
-			break;
-		default:
-			break;
+			case COLLADAFW::Transformation::ROTATE:
+				mat4_to_quat(val, mat);
+				break;
+			case COLLADAFW::Transformation::SCALE:
+				mat4_to_size(val, mat);
+				break;
+			case COLLADAFW::Transformation::TRANSLATE:
+				copy_v3_v3(val, mat[3]);
+				break;
+			case COLLADAFW::Transformation::MATRIX:
+				mat4_to_quat(rot, mat);
+				copy_v3_v3(loc, mat[3]);
+				mat4_to_size(scale, mat);
+				break;
+			default:
+				break;
 		}
 
 		// add keys
@@ -1461,22 +1462,22 @@ Object *AnimationImporter::translate_animation_OLD(COLLADAFW::Node *node,
 #ifdef ARMATURE_TEST
 		if (is_joint) {
 			switch (tm_type) {
-			case COLLADAFW::Transformation::ROTATE:
-				mat4_to_quat(val, matfra);
-				break;
-			case COLLADAFW::Transformation::SCALE:
-				mat4_to_size(val, matfra);
-				break;
-			case COLLADAFW::Transformation::TRANSLATE:
-				copy_v3_v3(val, matfra[3]);
-				break;
-			case MATRIX:
-				mat4_to_quat(rot, matfra);
-				copy_v3_v3(loc, matfra[3]);
-				mat4_to_size(scale, matfra);
-				break;
-			default:
-				break;
+				case COLLADAFW::Transformation::ROTATE:
+					mat4_to_quat(val, matfra);
+					break;
+				case COLLADAFW::Transformation::SCALE:
+					mat4_to_size(val, matfra);
+					break;
+				case COLLADAFW::Transformation::TRANSLATE:
+					copy_v3_v3(val, matfra[3]);
+					break;
+				case MATRIX:
+					mat4_to_quat(rot, matfra);
+					copy_v3_v3(loc, matfra[3]);
+					mat4_to_size(scale, matfra);
+					break;
+				default:
+					break;
 			}
 
 			for (i = 0; i < totcu; i++) {
@@ -1496,7 +1497,7 @@ Object *AnimationImporter::translate_animation_OLD(COLLADAFW::Node *node,
 #endif
 	}
 
-	verify_adt_action((ID*)&ob->id, 1);
+	verify_adt_action((ID *)&ob->id, 1);
 
 	ListBase *curves = &ob->adt->action->curves;
 
@@ -1545,20 +1546,20 @@ void AnimationImporter::evaluate_transform_at_frame(float mat[4][4], COLLADAFW::
 		std::string nodename = node->getName().size() ? node->getName() : node->getOriginalId();
 		if (!evaluate_animation(tm, m, fra, nodename.c_str())) {
 			switch (type) {
-			case COLLADAFW::Transformation::ROTATE:
-				dae_rotate_to_mat4(tm, m);
-				break;
-			case COLLADAFW::Transformation::TRANSLATE:
-				dae_translate_to_mat4(tm, m);
-				break;
-			case COLLADAFW::Transformation::SCALE:
-				dae_scale_to_mat4(tm, m);
-				break;
-			case COLLADAFW::Transformation::MATRIX:
-				dae_matrix_to_mat4(tm, m);
-				break;
-			default:
-				fprintf(stderr, "unsupported transformation type %d\n", type);
+				case COLLADAFW::Transformation::ROTATE:
+					dae_rotate_to_mat4(tm, m);
+					break;
+				case COLLADAFW::Transformation::TRANSLATE:
+					dae_translate_to_mat4(tm, m);
+					break;
+				case COLLADAFW::Transformation::SCALE:
+					dae_scale_to_mat4(tm, m);
+					break;
+				case COLLADAFW::Transformation::MATRIX:
+					dae_matrix_to_mat4(tm, m);
+					break;
+				default:
+					fprintf(stderr, "unsupported transformation type %d\n", type);
 			}
 			// dae_matrix_to_mat4(tm, m);
 			
@@ -1578,9 +1579,9 @@ bool AnimationImporter::evaluate_animation(COLLADAFW::Transformation *tm, float
 	COLLADAFW::Transformation::TransformationType type = tm->getTransformationType();
 
 	if (type != COLLADAFW::Transformation::ROTATE &&
-		type != COLLADAFW::Transformation::SCALE &&
-		type != COLLADAFW::Transformation::TRANSLATE &&
-		type != COLLADAFW::Transformation::MATRIX) {
+	    type != COLLADAFW::Transformation::SCALE &&
+	    type != COLLADAFW::Transformation::TRANSLATE &&
+	    type != COLLADAFW::Transformation::MATRIX) {
 		fprintf(stderr, "animation of transformation %d is not supported yet\n", type);
 		return false;
 	}
@@ -1604,25 +1605,25 @@ bool AnimationImporter::evaluate_animation(COLLADAFW::Transformation *tm, float
 
 		for (unsigned int j = 0; j < bindings.getCount(); j++) {
 			const COLLADAFW::AnimationList::AnimationBinding& binding = bindings[j];
-			std::vector<FCurve*>& curves = curve_map[binding.animation];
+			std::vector<FCurve *>& curves = curve_map[binding.animation];
 			COLLADAFW::AnimationList::AnimationClass animclass = binding.animationClass;
 			char path[100];
 
 			switch (type) {
-			case COLLADAFW::Transformation::ROTATE:
-				BLI_snprintf(path, sizeof(path), "%s.rotate (binding %u)", node_id, j);
-				break;
-			case COLLADAFW::Transformation::SCALE:
-				BLI_snprintf(path, sizeof(path), "%s.scale (binding %u)", node_id, j);
-				break;
-			case COLLADAFW::Transformation::TRANSLATE:
-				BLI_snprintf(path, sizeof(path), "%s.translate (binding %u)", node_id, j);
-				break;
-			case COLLADAFW::Transformation::MATRIX:
-				BLI_snprintf(path, sizeof(path), "%s.matrix (binding %u)", node_id, j);
-				break;
-			default:
-				break;
+				case COLLADAFW::Transformation::ROTATE:
+					BLI_snprintf(path, sizeof(path), "%s.rotate (binding %u)", node_id, j);
+					break;
+				case COLLADAFW::Transformation::SCALE:
+					BLI_snprintf(path, sizeof(path), "%s.scale (binding %u)", node_id, j);
+					break;
+				case COLLADAFW::Transformation::TRANSLATE:
+					BLI_snprintf(path, sizeof(path), "%s.translate (binding %u)", node_id, j);
+					break;
+				case COLLADAFW::Transformation::MATRIX:
+					BLI_snprintf(path, sizeof(path), "%s.matrix (binding %u)", node_id, j);
+					break;
+				default:
+					break;
 			}
 
 			if (animclass == COLLADAFW::AnimationList::UNKNOWN_CLASS) {
@@ -1642,7 +1643,7 @@ bool AnimationImporter::evaluate_animation(COLLADAFW::Transformation *tm, float
 					return false;
 				}
 
-				COLLADABU::Math::Vector3& axis = ((COLLADAFW::Rotate*)tm)->getRotationAxis();
+				COLLADABU::Math::Vector3& axis = ((COLLADAFW::Rotate *)tm)->getRotationAxis();
 
 				float ax[3] = {(float)axis[0], (float)axis[1], (float)axis[2]};
 				float angle = evaluate_fcurve(curves[0], fra);
@@ -1662,23 +1663,23 @@ bool AnimationImporter::evaluate_animation(COLLADAFW::Transformation *tm, float
 				}
 				
 				switch (animclass) {
-				case COLLADAFW::AnimationList::POSITION_X:
-					vec[0] = evaluate_fcurve(curves[0], fra);
-					break;
-				case COLLADAFW::AnimationList::POSITION_Y:
-					vec[1] = evaluate_fcurve(curves[0], fra);
-					break;
-				case COLLADAFW::AnimationList::POSITION_Z:
-					vec[2] = evaluate_fcurve(curves[0], fra);
-					break;
-				case COLLADAFW::AnimationList::POSITION_XYZ:
-					vec[0] = evaluate_fcurve(curves[0], fra);
-					vec[1] = evaluate_fcurve(curves[1], fra);
-					vec[2] = evaluate_fcurve(curves[2], fra);
-					break;
-				default:
-					fprintf(stderr, "%s: animation class %d is not supported yet\n", path, animclass);
-					break;
+					case COLLADAFW::AnimationList::POSITION_X:
+						vec[0] = evaluate_fcurve(curves[0], fra);
+						break;
+					case COLLADAFW::AnimationList::POSITION_Y:
+						vec[1] = evaluate_fcurve(curves[0], fra);
+						break;
+					case COLLADAFW::AnimationList::POSITION_Z:
+						vec[2] = evaluate_fcurve(curves[0], fra);
+						break;
+					case COLLADAFW::AnimationList::POSITION_XYZ:
+						vec[0] = evaluate_fcurve(curves[0], fra);
+						vec[1] = evaluate_fcurve(curves[1], fra);
+						vec[2] = evaluate_fcurve(curves[2], fra);
+						break;
+					default:
+						fprintf(stderr, "%s: animation class %d is not supported yet\n", path, animclass);
+						break;
 				}
 			}
 			else if (type == COLLADAFW::Transformation::MATRIX) {
@@ -1691,7 +1692,7 @@ bool AnimationImporter::evaluate_animation(COLLADAFW::Transformation *tm, float
 				COLLADABU::Math::Matrix4 matrix;
 				int i = 0, j = 0;
 
-				for (std::vector<FCurve*>::iterator it = curves.begin(); it != curves.end(); it++) {
+				for (std::vector<FCurve *>::iterator it = curves.begin(); it != curves.end(); it++) {
 					matrix.setElement(i, j, evaluate_fcurve(*it, fra));
 					j++;
 					if (j == 4) {
@@ -1704,7 +1705,7 @@ bool AnimationImporter::evaluate_animation(COLLADAFW::Transformation *tm, float
 				COLLADAFW::Matrix tm(matrix);
 				dae_matrix_to_mat4(&tm, mat);
 
-				std::vector<FCurve*>::iterator it;
+				std::vector<FCurve *>::iterator it;
 
 				return true;
 			}
@@ -1770,14 +1771,14 @@ bool AnimationImporter::calc_joint_parent_mat_rest(float mat[4][4], float par[4]
 Object *AnimationImporter::get_joint_object(COLLADAFW::Node *root, COLLADAFW::Node *node, Object *par_job)
 {
 	if (joint_objects.find(node->getUniqueId()) == joint_objects.end()) {
-		Object *job = bc_add_object(scene, OB_EMPTY, (char*)get_joint_name(node));
+		Object *job = bc_add_object(scene, OB_EMPTY, (char *)get_joint_name(node));
 
 		job->lay = BKE_scene_base_find(scene, job)->lay = 2;
 
 		mul_v3_fl(job->size, 0.5f);
 		job->recalc |= OB_RECALC_OB;
 
-		verify_adt_action((ID*)&job->id, 1);
+		verify_adt_action((ID *)&job->id, 1);
 
 		job->rotmode = ROT_MODE_QUAT;
 
@@ -1854,7 +1855,7 @@ void AnimationImporter::add_bone_fcurve(Object *ob, COLLADAFW::Node *node, FCurv
 	/* no matching groups, so add one */
 	if (grp == NULL) {
 		/* Add a new group, and make it active */
-		grp = (bActionGroup*)MEM_callocN(sizeof(bActionGroup), "bActionGroup");
+		grp = (bActionGroup *)MEM_callocN(sizeof(bActionGroup), "bActionGroup");
 					
 		grp->flag = AGRP_SELECTED;
 		BLI_strncpy(grp->name, bone_name, sizeof(grp->name));
@@ -1874,7 +1875,7 @@ void AnimationImporter::add_bezt(FCurve *fcu, float fra, float value)
 	memset(&bez, 0, sizeof(BezTriple));
 	bez.vec[1][0] = fra;
 	bez.vec[1][1] = value;
-	bez.ipo = BEZT_IPO_LIN ;/* use default interpolation mode here... */
+	bez.ipo = BEZT_IPO_LIN; /* use default interpolation mode here... */
 	bez.f1 = bez.f2 = bez.f3 = SELECT;
 	bez.h1 = bez.h2 = HD_AUTO;
 	insert_bezt_fcurve(fcu, &bez, 0);
diff --git a/source/blender/collada/AnimationImporter.h b/source/blender/collada/AnimationImporter.h
index 6324853d91c..d6a93a36c6e 100644
--- a/source/blender/collada/AnimationImporter.h
+++ b/source/blender/collada/AnimationImporter.h
@@ -41,11 +41,13 @@
 #include "COLLADAFWEffect.h"
 #include "COLLADAFWInstanceGeometry.h"
 
+extern "C" {
 #include "DNA_anim_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_lamp_types.h"
 #include "DNA_camera_types.h"
+}
 
 //#include "ArmatureImporter.h"
 #include "TransformReader.h"
diff --git a/source/blender/collada/ArmatureExporter.cpp b/source/blender/collada/ArmatureExporter.cpp
index 38a5e9b5df4..9ac943f369c 100644
--- a/source/blender/collada/ArmatureExporter.cpp
+++ b/source/blender/collada/ArmatureExporter.cpp
@@ -37,6 +37,14 @@
 
 #include "BKE_action.h"
 #include "BKE_armature.h"
+
+extern "C" {
+#include "BKE_main.h"
+#include "BKE_mesh.h"
+#include "BKE_global.h"
+#include "BKE_library.h"
+}
+
 #include "ED_armature.h"
 
 #include "BLI_listbase.h"
@@ -45,19 +53,22 @@
 #include "ArmatureExporter.h"
 #include "SceneExporter.h"
 
+#include "collada_utils.h"
+
 // XXX exporter writes wrong data for shared armatures.  A separate
 // controller should be written for each armature-mesh binding how do
 // we make controller ids then?
-ArmatureExporter::ArmatureExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : COLLADASW::LibraryControllers(sw), export_settings(export_settings) {}
+ArmatureExporter::ArmatureExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : COLLADASW::LibraryControllers(sw), export_settings(export_settings) {
+}
 
 // write bone nodes
-void ArmatureExporter::add_armature_bones(Object *ob_arm, Scene* sce,
-										  SceneExporter* se,
-										  std::list<Object*>& child_objects)
+void ArmatureExporter::add_armature_bones(Object *ob_arm, Scene *sce,
+                                          SceneExporter *se,
+                                          std::list<Object *>& child_objects)
 {
 	// write bone nodes
-	bArmature *arm = (bArmature*)ob_arm->data;
-	for (Bone *bone = (Bone*)arm->bonebase.first; bone; bone = bone->next) {
+	bArmature *arm = (bArmature *)ob_arm->data;
+	for (Bone *bone = (Bone *)arm->bonebase.first; bone; bone = bone->next) {
 		// start from root bones
 		if (!bone->parent)
 			add_bone_node(bone, ob_arm, sce, se, child_objects);
@@ -66,29 +77,44 @@ void ArmatureExporter::add_armature_bones(Object *ob_arm, Scene* sce,
 
 bool ArmatureExporter::is_skinned_mesh(Object *ob)
 {
-	return get_assigned_armature(ob) != NULL;
+	return bc_get_assigned_armature(ob) != NULL;
 }
 
-void ArmatureExporter::add_instance_controller(Object *ob)
+
+void ArmatureExporter::write_bone_URLs(COLLADASW::InstanceController &ins, Object *ob_arm, Bone *bone)
 {
-	Object *ob_arm = get_assigned_armature(ob);
-	bArmature *arm = (bArmature*)ob_arm->data;
+	if (bc_is_root_bone(bone, this->export_settings->deform_bones_only))
+		ins.addSkeleton(COLLADABU::URI(COLLADABU::Utils::EMPTY_STRING, get_joint_id(bone, ob_arm)));
+	else {
+		for (Bone *child = (Bone *)bone->childbase.first; child; child = child->next) {
+			write_bone_URLs(ins, ob_arm, child);
+		}
+	}
+}
+
+bool ArmatureExporter::add_instance_controller(Object *ob)
+{
+	Object *ob_arm = bc_get_assigned_armature(ob);
+	bArmature *arm = (bArmature *)ob_arm->data;
 
 	const std::string& controller_id = get_controller_id(ob_arm, ob);
 
 	COLLADASW::InstanceController ins(mSW);
 	ins.setUrl(COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, controller_id));
 
+	Mesh *me = (Mesh *)ob->data;
+	if (!me->dvert) return false;
+
 	// write root bone URLs
 	Bone *bone;
-	for (bone = (Bone*)arm->bonebase.first; bone; bone = bone->next) {
-		if (!bone->parent)
-			ins.addSkeleton(COLLADABU::URI(COLLADABU::Utils::EMPTY_STRING, get_joint_id(bone, ob_arm)));
+	for (bone = (Bone *)arm->bonebase.first; bone; bone = bone->next) {
+		write_bone_URLs(ins, ob_arm, bone);
 	}
 
 	InstanceWriter::add_material_bindings(ins.getBindMaterial(), ob);
 		
 	ins.add();
+	return true;
 }
 
 void ArmatureExporter::export_controllers(Scene *sce)
@@ -98,14 +124,14 @@ void ArmatureExporter::export_controllers(Scene *sce)
 	openLibrary();
 
 	GeometryFunctor gf;
-	gf.forEachMeshObjectInScene<ArmatureExporter>(sce, *this, this->export_settings->selected);
+	gf.forEachMeshObjectInExportSet<ArmatureExporter>(sce, *this, this->export_settings->export_set);
 
 	closeLibrary();
 }
 
 void ArmatureExporter::operator()(Object *ob)
 {
-	Object *ob_arm = get_assigned_armature(ob);
+	Object *ob_arm = bc_get_assigned_armature(ob);
 
 	if (ob_arm /*&& !already_written(ob_arm)*/)
 		export_controller(ob, ob_arm);
@@ -126,7 +152,7 @@ void ArmatureExporter::find_objects_using_armature(Object *ob_arm, std::vector<O
 {
 	objects.clear();
 
-	Base *base= (Base*) sce->base.first;
+	Base *base = (Base *) sce->base.first;
 	while (base) {
 		Object *ob = base->object;
 		
@@ -134,121 +160,112 @@ void ArmatureExporter::find_objects_using_armature(Object *ob_arm, std::vector<O
 			objects.push_back(ob);
 		}
 
-		base= base->next;
+		base = base->next;
 	}
 }
 #endif
 
-Object *ArmatureExporter::get_assigned_armature(Object *ob)
-{
-	Object *ob_arm = NULL;
-
-	if (ob->parent && ob->partype == PARSKEL && ob->parent->type == OB_ARMATURE) {
-		ob_arm = ob->parent;
-	}
-	else {
-		ModifierData *mod = (ModifierData*)ob->modifiers.first;
-		while (mod) {
-			if (mod->type == eModifierType_Armature) {
-				ob_arm = ((ArmatureModifierData*)mod)->object;
-			}
-
-			mod = mod->next;
-		}
-	}
-
-	return ob_arm;
-}
-
 std::string ArmatureExporter::get_joint_sid(Bone *bone, Object *ob_arm)
 {
 	return get_joint_id(bone, ob_arm);
 }
 
 // parent_mat is armature-space
-void ArmatureExporter::add_bone_node(Bone *bone, Object *ob_arm, Scene* sce,
-									 SceneExporter* se,
-									 std::list<Object*>& child_objects)
+void ArmatureExporter::add_bone_node(Bone *bone, Object *ob_arm, Scene *sce,
+                                     SceneExporter *se,
+                                     std::list<Object *>& child_objects)
 {
-	std::string node_id = get_joint_id(bone, ob_arm);
-	std::string node_name = std::string(bone->name);
-	std::string node_sid = get_joint_sid(bone, ob_arm);
+	if (!(this->export_settings->deform_bones_only && bone->flag & BONE_NO_DEFORM)) {
+		std::string node_id = get_joint_id(bone, ob_arm);
+		std::string node_name = std::string(bone->name);
+		std::string node_sid = get_joint_sid(bone, ob_arm);
 
-	COLLADASW::Node node(mSW);
+		COLLADASW::Node node(mSW);
 
-	node.setType(COLLADASW::Node::JOINT);
-	node.setNodeId(node_id);
-	node.setNodeName(node_name);
-	node.setNodeSid(node_sid);
+		node.setType(COLLADASW::Node::JOINT);
+		node.setNodeId(node_id);
+		node.setNodeName(node_name);
+		node.setNodeSid(node_sid);
 
-	/*if ( bone->childbase.first == NULL || BLI_countlist(&(bone->childbase))>=2)
-		add_blender_leaf_bone( bone, ob_arm , node );
-	else{*/
-	node.start();
+#if 0
+		if (bone->childbase.first == NULL || BLI_countlist(&(bone->childbase)) >= 2) {
+			add_blender_leaf_bone( bone, ob_arm , node );
+		}
+		else {
+#endif
+		node.start();
 
-	add_bone_transform(ob_arm, bone, node);
+		add_bone_transform(ob_arm, bone, node);
 
-	// Write nodes of childobjects, remove written objects from list
-	std::list<Object*>::iterator i = child_objects.begin();
+		// Write nodes of childobjects, remove written objects from list
+		std::list<Object *>::iterator i = child_objects.begin();
 
-	while (i != child_objects.end()) {
-		if ((*i)->partype == PARBONE && (0 == strcmp((*i)->parsubstr, bone->name))) {
-			float backup_parinv[4][4];
-			copy_m4_m4(backup_parinv, (*i)->parentinv);
+		while (i != child_objects.end()) {
+			if ((*i)->partype == PARBONE && (0 == strcmp((*i)->parsubstr, bone->name))) {
+				float backup_parinv[4][4];
+				copy_m4_m4(backup_parinv, (*i)->parentinv);
 
-			// crude, temporary change to parentinv
-			// so transform gets exported correctly.
+				// crude, temporary change to parentinv
+				// so transform gets exported correctly.
 
-			// Add bone tail- translation... don't know why
-			// bone parenting is against the tail of a bone
-			// and not it's head, seems arbitrary.
-			(*i)->parentinv[3][1] += bone->length;
+				// Add bone tail- translation... don't know why
+				// bone parenting is against the tail of a bone
+				// and not it's head, seems arbitrary.
+				(*i)->parentinv[3][1] += bone->length;
 
-			// SECOND_LIFE_COMPATIBILITY
-			// TODO: when such objects are animated as
-			// single matrix the tweak must be applied
-			// to the result.
-			if (export_settings->second_life) {
-				// tweak objects parentinverse to match compatibility
-				float temp[4][4];
+				// SECOND_LIFE_COMPATIBILITY
+				// TODO: when such objects are animated as
+				// single matrix the tweak must be applied
+				// to the result.
+				if (export_settings->second_life) {
+					// tweak objects parentinverse to match compatibility
+					float temp[4][4];
 
-				copy_m4_m4(temp, bone->arm_mat);
-				temp[3][0] = temp[3][1] = temp[3][2] = 0.0f;
+					copy_m4_m4(temp, bone->arm_mat);
+					temp[3][0] = temp[3][1] = temp[3][2] = 0.0f;
 
-				mult_m4_m4m4((*i)->parentinv, temp, (*i)->parentinv);
-			}
+					mult_m4_m4m4((*i)->parentinv, temp, (*i)->parentinv);
+				}
+
+				se->writeNodes(*i, sce);
 
-			se->writeNodes(*i, sce);
+				copy_m4_m4((*i)->parentinv, backup_parinv);
+				child_objects.erase(i++);
+			}
+			else i++;
+		}
 
-			copy_m4_m4((*i)->parentinv, backup_parinv);
-			child_objects.erase(i++);
+		for (Bone *child = (Bone *)bone->childbase.first; child; child = child->next) {
+			add_bone_node(child, ob_arm, sce, se, child_objects);
 		}
-		else i++;
+		node.end();
 	}
-
-	for (Bone *child = (Bone*)bone->childbase.first; child; child = child->next) {
-		add_bone_node(child, ob_arm, sce, se, child_objects);
+	else {
+		for (Bone *child = (Bone *)bone->childbase.first; child; child = child->next) {
+			add_bone_node(child, ob_arm, sce, se, child_objects);
+		}
 	}
-	node.end();
-	//}
 }
 
-/*void ArmatureExporter::add_blender_leaf_bone(Bone *bone, Object *ob_arm, COLLADASW::Node& node)
+#if 0
+void ArmatureExporter::add_blender_leaf_bone(Bone *bone, Object *ob_arm, COLLADASW::Node& node)
 {
 	node.start();
 	
 	add_bone_transform(ob_arm, bone, node);
 	
-	node.addExtraTechniqueParameter("blender", "tip_x", bone->tail[0] );
-	node.addExtraTechniqueParameter("blender", "tip_y", bone->tail[1] );
-	node.addExtraTechniqueParameter("blender", "tip_z", bone->tail[2] );
+	node.addExtraTechniqueParameter("blender", "tip_x", bone->tail[0]);
+	node.addExtraTechniqueParameter("blender", "tip_y", bone->tail[1]);
+	node.addExtraTechniqueParameter("blender", "tip_z", bone->tail[2]);
 	
-	for (Bone *child = (Bone*)bone->childbase.first; child; child = child->next) {
+	for (Bone *child = (Bone *)bone->childbase.first; child; child = child->next) {
 		add_bone_node(child, ob_arm, sce, se, child_objects);
 	}
 	node.end();
 	
-}*/
+}
+#endif
+
 void ArmatureExporter::add_bone_transform(Object *ob_arm, Bone *bone, COLLADASW::Node& node)
 {
 	bPoseChannel *pchan = BKE_pose_channel_find_name(ob_arm->pose, bone->name);
@@ -299,7 +316,7 @@ std::string ArmatureExporter::get_controller_id(Object *ob_arm, Object *ob)
 
 // ob should be of type OB_MESH
 // both args are required
-void ArmatureExporter::export_controller(Object* ob, Object *ob_arm)
+void ArmatureExporter::export_controller(Object *ob, Object *ob_arm)
 {
 	// joint names
 	// joint inverse bind matrices
@@ -309,29 +326,39 @@ void ArmatureExporter::export_controller(Object* ob, Object *ob_arm)
 	// joint names: ob -> vertex group names
 	// vertex group weights: me->dvert -> groups -> index, weight
 
-	/*
-	me->dvert:
+#if 0
+	me->dvert :
 
 	typedef struct MDeformVert {
 		struct MDeformWeight *dw;
 		int totweight;
-		int flag;	// flag only in use for weightpaint now
+		int flag;   // flag only in use for weightpaint now
 	} MDeformVert;
 
 	typedef struct MDeformWeight {
-		int				def_nr;
-		float			weight;
+		int def_nr;
+		float weight;
 	} MDeformWeight;
-	*/
+#endif
+
+	bool use_instantiation = this->export_settings->use_object_instantiation;
+	Mesh *me;
+
+	if (this->export_settings->apply_modifiers) {
+		me = bc_to_mesh_apply_modifiers(scene, ob, this->export_settings->export_mesh_type);
+	} 
+	else {
+		me = (Mesh *)ob->data;
+	}
+	BKE_mesh_tessface_ensure(me);
 
-	Mesh *me = (Mesh*)ob->data;
 	if (!me->dvert) return;
 
 	std::string controller_name = id_name(ob_arm);
 	std::string controller_id = get_controller_id(ob_arm, ob);
 
 	openSkin(controller_id, controller_name,
-	         COLLADABU::URI(COLLADABU::Utils::EMPTY_STRING, get_geometry_id(ob)));
+	         COLLADABU::URI(COLLADABU::Utils::EMPTY_STRING, get_geometry_id(ob, use_instantiation)));
 
 	add_bind_shape_mat(ob);
 
@@ -349,7 +376,7 @@ void ArmatureExporter::export_controller(Object* ob, Object *ob_arm)
 		std::vector<int> joint_index_by_def_index;
 		bDeformGroup *def;
 
-		for (def = (bDeformGroup*)ob->defbase.first, i = 0, j = 0; def; def = def->next, i++) {
+		for (def = (bDeformGroup *)ob->defbase.first, i = 0, j = 0; def; def = def->next, i++) {
 			if (is_bone_defgroup(ob_arm, def))
 				joint_index_by_def_index.push_back(j++);
 			else
@@ -372,18 +399,20 @@ void ArmatureExporter::export_controller(Object* ob, Object *ob_arm)
 			}
 
 			if (sumw > 0.0f) {
-				float invsumw = 1.0f/sumw;
+				float invsumw = 1.0f / sumw;
 				vcounts.push_back(jw.size());
 				for (std::map<int, float>::iterator m = jw.begin(); m != jw.end(); ++m) {
 					joints.push_back((*m).first);
-					weights.push_back(invsumw*(*m).second);
+					weights.push_back(invsumw * (*m).second);
 				}
 			}
 			else {
 				vcounts.push_back(0);
-				/*vcounts.push_back(1);
+#if 0
+				vcounts.push_back(1);
 				joints.push_back(-1);
-				weights.push_back(1.0f);*/
+				weights.push_back(1.0f);
+#endif
 			}
 		}
 	}
@@ -392,20 +421,24 @@ void ArmatureExporter::export_controller(Object* ob, Object *ob_arm)
 	add_joints_element(&ob->defbase, joints_source_id, inv_bind_mat_source_id);
 	add_vertex_weights_element(weights_source_id, joints_source_id, vcounts, joints);
 
+	if (this->export_settings->apply_modifiers)
+	{
+		BKE_libblock_free_us(&(G.main->mesh), me);
+	}
 	closeSkin();
 	closeController();
 }
 
 void ArmatureExporter::add_joints_element(ListBase *defbase,
-						const std::string& joints_source_id, const std::string& inv_bind_mat_source_id)
+                                          const std::string& joints_source_id, const std::string& inv_bind_mat_source_id)
 {
 	COLLADASW::JointsElement joints(mSW);
 	COLLADASW::InputList &input = joints.getInputList();
 
 	input.push_back(COLLADASW::Input(COLLADASW::InputSemantic::JOINT, // constant declared in COLLADASWInputList.h
-							   COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, joints_source_id)));
+	                                 COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, joints_source_id)));
 	input.push_back(COLLADASW::Input(COLLADASW::InputSemantic::BINDMATRIX,
-							   COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, inv_bind_mat_source_id)));
+	                                 COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, inv_bind_mat_source_id)));
 	joints.add();
 }
 
@@ -424,7 +457,7 @@ std::string ArmatureExporter::add_joints_source(Object *ob_arm, ListBase *defbas
 
 	int totjoint = 0;
 	bDeformGroup *def;
-	for (def = (bDeformGroup*)defbase->first; def; def = def->next) {
+	for (def = (bDeformGroup *)defbase->first; def; def = def->next) {
 		if (is_bone_defgroup(ob_arm, def))
 			totjoint++;
 	}
@@ -440,7 +473,7 @@ std::string ArmatureExporter::add_joints_source(Object *ob_arm, ListBase *defbas
 
 	source.prepareToAppendValues();
 
-	for (def = (bDeformGroup*)defbase->first; def; def = def->next) {
+	for (def = (bDeformGroup *)defbase->first; def; def = def->next) {
 		Bone *bone = get_bone_from_defgroup(ob_arm, def);
 		if (bone)
 			source.appendValues(get_joint_sid(bone, ob_arm));
@@ -456,7 +489,7 @@ std::string ArmatureExporter::add_inv_bind_mats_source(Object *ob_arm, ListBase
 	std::string source_id = controller_id + BIND_POSES_SOURCE_ID_SUFFIX;
 
 	int totjoint = 0;
-	for (bDeformGroup *def = (bDeformGroup*)defbase->first; def; def = def->next) {
+	for (bDeformGroup *def = (bDeformGroup *)defbase->first; def; def = def->next) {
 		if (is_bone_defgroup(ob_arm, def))
 			totjoint++;
 	}
@@ -474,7 +507,7 @@ std::string ArmatureExporter::add_inv_bind_mats_source(Object *ob_arm, ListBase
 	source.prepareToAppendValues();
 
 	bPose *pose = ob_arm->pose;
-	bArmature *arm = (bArmature*)ob_arm->data;
+	bArmature *arm = (bArmature *)ob_arm->data;
 
 	int flag = arm->flag;
 
@@ -484,7 +517,7 @@ std::string ArmatureExporter::add_inv_bind_mats_source(Object *ob_arm, ListBase
 		BKE_pose_where_is(scene, ob_arm);
 	}
 
-	for (bDeformGroup *def = (bDeformGroup*)defbase->first; def; def = def->next) {
+	for (bDeformGroup *def = (bDeformGroup *)defbase->first; def; def = def->next) {
 		if (is_bone_defgroup(ob_arm, def)) {
 			bPoseChannel *pchan = BKE_pose_channel_find_name(pose, def->name);
 
@@ -523,13 +556,13 @@ std::string ArmatureExporter::add_inv_bind_mats_source(Object *ob_arm, ListBase
 	return source_id;
 }
 
-Bone *ArmatureExporter::get_bone_from_defgroup(Object *ob_arm, bDeformGroup* def)
+Bone *ArmatureExporter::get_bone_from_defgroup(Object *ob_arm, bDeformGroup *def)
 {
 	bPoseChannel *pchan = BKE_pose_channel_find_name(ob_arm->pose, def->name);
 	return pchan ? pchan->bone : NULL;
 }
 
-bool ArmatureExporter::is_bone_defgroup(Object *ob_arm, bDeformGroup* def)
+bool ArmatureExporter::is_bone_defgroup(Object *ob_arm, bDeformGroup *def)
 {
 	return get_bone_from_defgroup(ob_arm, def) != NULL;
 }
@@ -559,17 +592,17 @@ std::string ArmatureExporter::add_weights_source(Mesh *me, const std::string& co
 }
 
 void ArmatureExporter::add_vertex_weights_element(const std::string& weights_source_id, const std::string& joints_source_id,
-												  const std::list<int>& vcounts,
-												  const std::list<int>& joints)
+                                                  const std::list<int>& vcounts,
+                                                  const std::list<int>& joints)
 {
 	COLLADASW::VertexWeightsElement weightselem(mSW);
 	COLLADASW::InputList &input = weightselem.getInputList();
 
 	int offset = 0;
 	input.push_back(COLLADASW::Input(COLLADASW::InputSemantic::JOINT, // constant declared in COLLADASWInputList.h
-									 COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, joints_source_id), offset++));
+	                                 COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, joints_source_id), offset++));
 	input.push_back(COLLADASW::Input(COLLADASW::InputSemantic::WEIGHT,
-									 COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, weights_source_id), offset++));
+	                                 COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, weights_source_id), offset++));
 
 	weightselem.setCount(vcounts.size());
 
diff --git a/source/blender/collada/ArmatureExporter.h b/source/blender/collada/ArmatureExporter.h
index e9ee38d36cf..086c16f0cd5 100644
--- a/source/blender/collada/ArmatureExporter.h
+++ b/source/blender/collada/ArmatureExporter.h
@@ -53,18 +53,18 @@ class SceneExporter;
 // XXX exporter writes wrong data for shared armatures.  A separate
 // controller should be written for each armature-mesh binding how do
 // we make controller ids then?
-class ArmatureExporter: public COLLADASW::LibraryControllers, protected TransformWriter, protected InstanceWriter
+class ArmatureExporter : public COLLADASW::LibraryControllers, protected TransformWriter, protected InstanceWriter
 {
 public:
 	ArmatureExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings);
 
 	// write bone nodes
-	void add_armature_bones(Object *ob_arm, Scene* sce, SceneExporter* se,
-							std::list<Object*>& child_objects);
+	void add_armature_bones(Object *ob_arm, Scene *sce, SceneExporter *se,
+	                        std::list<Object *>& child_objects);
 
 	bool is_skinned_mesh(Object *ob);
 
-	void add_instance_controller(Object *ob);
+	bool add_instance_controller(Object *ob);
 
 	void export_controllers(Scene *sce);
 
@@ -76,7 +76,7 @@ private:
 	const ExportSettings *export_settings;
 
 #if 0
-	std::vector<Object*> written_armatures;
+	std::vector<Object *> written_armatures;
 
 	bool already_written(Object *ob_arm);
 
@@ -85,14 +85,12 @@ private:
 	void find_objects_using_armature(Object *ob_arm, std::vector<Object *>& objects, Scene *sce);
 #endif
 
-	Object *get_assigned_armature(Object *ob);
-
 	std::string get_joint_sid(Bone *bone, Object *ob_arm);
 
 	// Scene, SceneExporter and the list of child_objects
 	// are required for writing bone parented objects
-	void add_bone_node(Bone *bone, Object *ob_arm, Scene* sce, SceneExporter* se,
-					   std::list<Object*>& child_objects);
+	void add_bone_node(Bone *bone, Object *ob_arm, Scene *sce, SceneExporter *se,
+	                   std::list<Object *>& child_objects);
 
 	void add_bone_transform(Object *ob_arm, Bone *bone, COLLADASW::Node& node);
 
@@ -102,10 +100,10 @@ private:
 
 	// ob should be of type OB_MESH
 	// both args are required
-	void export_controller(Object* ob, Object *ob_arm);
+	void export_controller(Object *ob, Object *ob_arm);
 
 	void add_joints_element(ListBase *defbase,
-							const std::string& joints_source_id, const std::string& inv_bind_mat_source_id);
+	                        const std::string& joints_source_id, const std::string& inv_bind_mat_source_id);
 
 	void add_bind_shape_mat(Object *ob);
 
@@ -113,15 +111,17 @@ private:
 
 	std::string add_inv_bind_mats_source(Object *ob_arm, ListBase *defbase, const std::string& controller_id);
 
-	Bone *get_bone_from_defgroup(Object *ob_arm, bDeformGroup* def);
+	Bone *get_bone_from_defgroup(Object *ob_arm, bDeformGroup *def);
 
-	bool is_bone_defgroup(Object *ob_arm, bDeformGroup* def);
+	bool is_bone_defgroup(Object *ob_arm, bDeformGroup *def);
 
 	std::string add_weights_source(Mesh *me, const std::string& controller_id,
-								   const std::list<float>& weights);
+	                               const std::list<float>& weights);
 
 	void add_vertex_weights_element(const std::string& weights_source_id, const std::string& joints_source_id,
-									const std::list<int>& vcount, const std::list<int>& joints);
+	                                const std::list<int>& vcount, const std::list<int>& joints);
+
+	void write_bone_URLs(COLLADASW::InstanceController &ins, Object *ob_arm, Bone *bone);
 };
 
 #endif
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp
index f23b2bf4b02..115f129cb88 100644
--- a/source/blender/collada/ArmatureImporter.cpp
+++ b/source/blender/collada/ArmatureImporter.cpp
@@ -50,7 +50,8 @@ static const char *bc_get_joint_name(T *node)
 }
 
 ArmatureImporter::ArmatureImporter(UnitConverter *conv, MeshImporterBase *mesh, AnimationImporterBase *anim, Scene *sce) :
-	TransformReader(conv), scene(sce), empty(NULL), mesh_importer(mesh), anim_importer(anim) {}
+	TransformReader(conv), scene(sce), empty(NULL), mesh_importer(mesh), anim_importer(anim) {
+}
 
 ArmatureImporter::~ArmatureImporter()
 {
@@ -68,7 +69,7 @@ JointData *ArmatureImporter::get_joint_data(COLLADAFW::Node *node);
 
 	if (joint_id_to_joint_index_map.find(joint_id) == joint_id_to_joint_index_map.end()) {
 		fprintf(stderr, "Cannot find a joint index by joint id for %s.\n",
-				node->getOriginalId().c_str());
+		        node->getOriginalId().c_str());
 		return NULL;
 	}
 
@@ -77,12 +78,12 @@ JointData *ArmatureImporter::get_joint_data(COLLADAFW::Node *node);
 	return &joint_index_to_joint_info_map[joint_index];
 }
 #endif
-void ArmatureImporter::create_unskinned_bone( COLLADAFW::Node *node, EditBone *parent, int totchild,
-				 float parent_mat[][4], Object * ob_arm)
+void ArmatureImporter::create_unskinned_bone(COLLADAFW::Node *node, EditBone *parent, int totchild,
+                                             float parent_mat[][4], Object *ob_arm)
 {
-	std::vector<COLLADAFW::Node*>::iterator it;
+	std::vector<COLLADAFW::Node *>::iterator it;
 	it = std::find(finished_joints.begin(), finished_joints.end(), node);
-	if ( it != finished_joints.end()) return; 
+	if (it != finished_joints.end()) return;
 
 	float mat[4][4];
 	float obmat[4][4];
@@ -90,7 +91,7 @@ void ArmatureImporter::create_unskinned_bone( COLLADAFW::Node *node, EditBone *p
 	// object-space
 	get_node_mat(obmat, node, NULL, NULL);
 
-	EditBone *bone = ED_armature_edit_bone_add((bArmature*)ob_arm->data, (char*)bc_get_joint_name(node));
+	EditBone *bone = ED_armature_edit_bone_add((bArmature *)ob_arm->data, (char *)bc_get_joint_name(node));
 	totbone++;
 	
 	if (parent) bone->parent = parent;
@@ -107,9 +108,9 @@ void ArmatureImporter::create_unskinned_bone( COLLADAFW::Node *node, EditBone *p
 
 	}
 	float loc[3], size[3], rot[3][3];
-	mat4_to_loc_rot_size( loc, rot, size, obmat);
-	mat3_to_vec_roll(rot, NULL, &angle );
-	bone->roll=angle;
+	mat4_to_loc_rot_size(loc, rot, size, obmat);
+	mat3_to_vec_roll(rot, NULL, &angle);
+	bone->roll = angle;
 	// set head
 	copy_v3_v3(bone->head, mat[3]);
 
@@ -142,7 +143,7 @@ void ArmatureImporter::create_unskinned_bone( COLLADAFW::Node *node, EditBone *p
 
 	COLLADAFW::NodePointerArray& children = node->getChildNodes();
 	for (unsigned int i = 0; i < children.getCount(); i++) {
-		create_unskinned_bone( children[i], bone, children.getCount(), mat, ob_arm);
+		create_unskinned_bone(children[i], bone, children.getCount(), mat, ob_arm);
 	}
 
 	// in second case it's not a leaf bone, but we handle it the same way
@@ -155,12 +156,12 @@ void ArmatureImporter::create_unskinned_bone( COLLADAFW::Node *node, EditBone *p
 }
 
 void ArmatureImporter::create_bone(SkinInfo& skin, COLLADAFW::Node *node, EditBone *parent, int totchild,
-				 float parent_mat[][4], bArmature *arm)
+                                   float parent_mat[][4], bArmature *arm)
 {
 	//Checking if bone is already made.
-	std::vector<COLLADAFW::Node*>::iterator it;
+	std::vector<COLLADAFW::Node *>::iterator it;
 	it = std::find(finished_joints.begin(), finished_joints.end(), node);
-	if ( it != finished_joints.end()) return; 
+	if (it != finished_joints.end()) return;
 
 	float joint_inv_bind_mat[4][4];
 
@@ -169,7 +170,7 @@ void ArmatureImporter::create_bone(SkinInfo& skin, COLLADAFW::Node *node, EditBo
 	float mat[4][4];
 
 	// TODO rename from Node "name" attrs later
-	EditBone *bone = ED_armature_edit_bone_add(arm, (char*)bc_get_joint_name(node));
+	EditBone *bone = ED_armature_edit_bone_add(arm, (char *)bc_get_joint_name(node));
 	totbone++;
 
 	if (skin.get_joint_inv_bind_matrix(joint_inv_bind_mat, node)) {
@@ -190,9 +191,9 @@ void ArmatureImporter::create_bone(SkinInfo& skin, COLLADAFW::Node *node, EditBo
 			copy_m4_m4(mat, obmat);
 
 		float loc[3], size[3], rot[3][3], angle;
-		mat4_to_loc_rot_size( loc, rot, size, obmat);
-		mat3_to_vec_roll(rot, NULL, &angle );
-		bone->roll=angle;
+		mat4_to_loc_rot_size(loc, rot, size, obmat);
+		mat3_to_vec_roll(rot, NULL, &angle);
+		bone->roll = angle;
 	}
 
 	
@@ -267,7 +268,7 @@ void ArmatureImporter::create_bone(SkinInfo& skin, COLLADAFW::Node *node, EditBo
 	finished_joints.push_back(node);
 }
 
-void ArmatureImporter::add_leaf_bone(float mat[][4], EditBone *bone,  COLLADAFW::Node * node)
+void ArmatureImporter::add_leaf_bone(float mat[][4], EditBone *bone,  COLLADAFW::Node *node)
 {
 	LeafBone leaf;
 
@@ -337,7 +338,7 @@ void ArmatureImporter::set_euler_rotmode()
 {
 	// just set rotmode = ROT_MODE_EUL on pose channel for each joint
 
-	std::map<COLLADAFW::UniqueId, COLLADAFW::Node*>::iterator it;
+	std::map<COLLADAFW::UniqueId, COLLADAFW::Node *>::iterator it;
 
 	for (it = joint_by_uid.begin(); it != joint_by_uid.end(); it++) {
 
@@ -378,7 +379,7 @@ Object *ArmatureImporter::get_empty_for_leaves()
 #if 0
 Object *ArmatureImporter::find_armature(COLLADAFW::Node *node)
 {
-	JointData* jd = get_joint_data(node);
+	JointData *jd = get_joint_data(node);
 	if (jd) return jd->ob_arm;
 
 	COLLADAFW::NodePointerArray& children = node->getChildNodes();
@@ -408,10 +409,10 @@ ArmatureJoints& ArmatureImporter::get_armature_joints(Object *ob_arm)
 #endif
 void ArmatureImporter::create_armature_bones( )
 {
-	std::vector<COLLADAFW::Node*>::iterator ri;
+	std::vector<COLLADAFW::Node *>::iterator ri;
 	//if there is an armature created for root_joint next root_joint
 	for (ri = root_joints.begin(); ri != root_joints.end(); ri++) {
-		if ( get_armature_for_joint(*ri) != NULL ) continue;
+		if (get_armature_for_joint(*ri) != NULL) continue;
 		
 		//add armature object for current joint
 		//Object *ob_arm = bc_add_object(scene, OB_ARMATURE, NULL);
@@ -428,9 +429,9 @@ void ArmatureImporter::create_armature_bones( )
 
 		// create unskinned bones
 		/*
-		  TODO:
-		  check if bones have already been created for a given joint
-		*/
+		 * TODO:
+		 * check if bones have already been created for a given joint
+		 */
 		leaf_bone_length = FLT_MAX;
 		create_unskinned_bone(*ri, NULL, (*ri)->getChildNodes().getCount(), NULL, ob_arm);
 
@@ -442,10 +443,10 @@ void ArmatureImporter::create_armature_bones( )
 
 		ED_armature_from_edit(ob_arm);
 
-		set_pose(ob_arm, *ri, NULL, NULL );
+		set_pose(ob_arm, *ri, NULL, NULL);
 
 		ED_armature_edit_free(ob_arm);
-		DAG_id_tag_update(&ob_arm->id, OB_RECALC_OB|OB_RECALC_DATA);
+		DAG_id_tag_update(&ob_arm->id, OB_RECALC_OB | OB_RECALC_DATA);
 	}
 
 	
@@ -496,7 +497,7 @@ void ArmatureImporter::create_armature_bones(SkinInfo& skin)
 
 	SkinInfo *a = &skin;
 	Object *shared = NULL;
-	std::vector<COLLADAFW::Node*> skin_root_joints;
+	std::vector<COLLADAFW::Node *> skin_root_joints;
 
 	std::map<COLLADAFW::UniqueId, SkinInfo>::iterator it;
 	for (it = skin_by_data_uid.begin(); it != skin_by_data_uid.end(); it++) {
@@ -508,7 +509,7 @@ void ArmatureImporter::create_armature_bones(SkinInfo& skin)
 
 		b->find_root_joints(root_joints, joint_by_uid, skin_root_joints);
 
-		std::vector<COLLADAFW::Node*>::iterator ri;
+		std::vector<COLLADAFW::Node *>::iterator ri;
 		for (ri = skin_root_joints.begin(); ri != skin_root_joints.end(); ri++) {
 			if (a->uses_joint_or_descendant(*ri)) {
 				shared = b->BKE_armature_from_object();
@@ -523,7 +524,7 @@ void ArmatureImporter::create_armature_bones(SkinInfo& skin)
 	if (shared)
 		ob_arm = skin.set_armature(shared);
 	else
-		ob_arm = skin.create_armature(scene); //once for every armature
+		ob_arm = skin.create_armature(scene);  //once for every armature
 
 	// enter armature edit mode
 	ED_armature_to_edit(ob_arm);
@@ -538,9 +539,9 @@ void ArmatureImporter::create_armature_bones(SkinInfo& skin)
 	/*
 	   TODO:
 	   check if bones have already been created for a given joint
-	*/
+	 */
 
-	std::vector<COLLADAFW::Node*>::iterator ri;
+	std::vector<COLLADAFW::Node *>::iterator ri;
 	for (ri = root_joints.begin(); ri != root_joints.end(); ri++) {
 		// for shared armature check if bone tree is already created
 		if (shared && std::find(skin_root_joints.begin(), skin_root_joints.end(), *ri) != skin_root_joints.end())
@@ -548,7 +549,7 @@ void ArmatureImporter::create_armature_bones(SkinInfo& skin)
 
 		// since root_joints may contain joints for multiple controllers, we need to filter
 		if (skin.uses_joint_or_descendant(*ri)) {
-			create_bone(skin, *ri, NULL, (*ri)->getChildNodes().getCount(), NULL, (bArmature*)ob_arm->data);
+			create_bone(skin, *ri, NULL, (*ri)->getChildNodes().getCount(), NULL, (bArmature *)ob_arm->data);
 
 			if (joint_parent_map.find((*ri)->getUniqueId()) != joint_parent_map.end() && !skin.get_parent())
 				skin.set_parent(joint_parent_map[(*ri)->getUniqueId()]);
@@ -560,7 +561,7 @@ void ArmatureImporter::create_armature_bones(SkinInfo& skin)
 	// exit armature edit mode
 	ED_armature_from_edit(ob_arm);
 	ED_armature_edit_free(ob_arm);
-	DAG_id_tag_update(&ob_arm->id, OB_RECALC_OB|OB_RECALC_DATA);
+	DAG_id_tag_update(&ob_arm->id, OB_RECALC_OB | OB_RECALC_DATA);
 
 	// set_leaf_bone_shapes(ob_arm);
 	// set_euler_rotmode();
@@ -571,9 +572,9 @@ void ArmatureImporter::create_armature_bones(SkinInfo& skin)
 // is a child of a node (not joint), root should be true since
 // this is where we build armature bones from
 
-void ArmatureImporter::set_pose(Object * ob_arm,  COLLADAFW::Node * root_node, const char *parentname, float parent_mat[][4])
+void ArmatureImporter::set_pose(Object *ob_arm,  COLLADAFW::Node *root_node, const char *parentname, float parent_mat[][4])
 { 
-	char * bone_name = (char *) bc_get_joint_name ( root_node);
+	char *bone_name = (char *) bc_get_joint_name(root_node);
 	float mat[4][4];
 	float obmat[4][4];
 
@@ -584,7 +585,7 @@ void ArmatureImporter::set_pose(Object * ob_arm,  COLLADAFW::Node * root_node, c
 	get_node_mat(obmat, root_node, NULL, NULL);
 
 	//if (*edbone)
-	bPoseChannel * pchan  = BKE_pose_channel_find_name(ob_arm -> pose, bone_name);
+	bPoseChannel *pchan  = BKE_pose_channel_find_name(ob_arm->pose, bone_name);
 	//else fprintf ( "",
 
 	// get world-space
@@ -592,7 +593,7 @@ void ArmatureImporter::set_pose(Object * ob_arm,  COLLADAFW::Node * root_node, c
 		mult_m4_m4m4(mat, parent_mat, obmat);
 		bPoseChannel *parchan = BKE_pose_channel_find_name(ob_arm->pose, parentname);
 
-		mult_m4_m4m4(pchan->pose_mat, parchan->pose_mat, mat );
+		mult_m4_m4m4(pchan->pose_mat, parchan->pose_mat, mat);
 
 	}
 	else {
@@ -631,7 +632,7 @@ void ArmatureImporter::add_root_joint(COLLADAFW::Node *node)
 {
 	// root_joints.push_back(node);
 	Object *ob_arm = find_armature(node);
-	if (ob_arm)	{
+	if (ob_arm) {
 		get_armature_joints(ob_arm).root_joints.push_back(node);
 	}
 #ifdef COLLADA_DEBUG
@@ -653,11 +654,17 @@ void ArmatureImporter::make_armatures(bContext *C)
 		create_armature_bones(skin);
 
 		// link armature with a mesh object
-		Object *ob = mesh_importer->get_object_by_geom_uid(*get_geometry_uid(skin.get_controller_uid()));
-		if (ob)
-			skin.link_armature(C, ob, joint_by_uid, this);
+		const COLLADAFW::UniqueId &uid = skin.get_controller_uid();
+		const COLLADAFW::UniqueId *guid = get_geometry_uid(uid);
+		if (guid != NULL) {
+			Object *ob = mesh_importer->get_object_by_geom_uid(*guid);
+			if (ob)
+				skin.link_armature(C, ob, joint_by_uid, this);
+			else
+				fprintf(stderr, "Cannot find object to link armature with.\n");
+		}
 		else
-			fprintf(stderr, "Cannot find object to link armature with.\n");
+			fprintf(stderr, "Cannot find geometry to link armature with.\n");
 
 		// set armature parent if any
 		Object *par = skin.get_parent();
@@ -694,7 +701,7 @@ void ArmatureImporter::link_armature(Object *ob_arm, const COLLADAFW::UniqueId&
 }
 #endif
 
-bool ArmatureImporter::write_skin_controller_data(const COLLADAFW::SkinControllerData* data)
+bool ArmatureImporter::write_skin_controller_data(const COLLADAFW::SkinControllerData *data)
 {
 	// at this stage we get vertex influence info that should go into me->verts and ob->defbase
 	// there's no info to which object this should be long so we associate it with skin controller data UID
@@ -719,14 +726,14 @@ bool ArmatureImporter::write_skin_controller_data(const COLLADAFW::SkinControlle
 	return true;
 }
 
-bool ArmatureImporter::write_controller(const COLLADAFW::Controller* controller)
+bool ArmatureImporter::write_controller(const COLLADAFW::Controller *controller)
 {
 	// - create and store armature object
 
 	const COLLADAFW::UniqueId& skin_id = controller->getUniqueId();
 
 	if (controller->getControllerType() == COLLADAFW::Controller::CONTROLLER_TYPE_SKIN) {
-		COLLADAFW::SkinController *co = (COLLADAFW::SkinController*)controller;
+		COLLADAFW::SkinController *co = (COLLADAFW::SkinController *)controller;
 		// to be able to find geom id by controller id
 		geom_uid_by_controller_uid[skin_id] = co->getSource();
 
@@ -766,7 +773,7 @@ Object *ArmatureImporter::get_armature_for_joint(COLLADAFW::Node *node)
 			return skin.BKE_armature_from_object();
 	}
 
-	std::map<COLLADAFW::UniqueId, Object*>::iterator arm;
+	std::map<COLLADAFW::UniqueId, Object *>::iterator arm;
 	for (arm = unskinned_armature_map.begin(); arm != unskinned_armature_map.end(); arm++) {
 		if (arm->first == node->getUniqueId() )
 			return arm->second;
@@ -799,6 +806,3 @@ bool ArmatureImporter::get_joint_bind_mat(float m[][4], COLLADAFW::Node *joint)
 
 	return found;
 }
-
-
-
diff --git a/source/blender/collada/CameraExporter.cpp b/source/blender/collada/CameraExporter.cpp
index ce46c681c8c..be424fbbb4d 100644
--- a/source/blender/collada/CameraExporter.cpp
+++ b/source/blender/collada/CameraExporter.cpp
@@ -29,27 +29,27 @@
 #include <string>
 
 #include "COLLADASWCamera.h"
-#include "COLLADASWCameraOptic.h"
 
+extern "C" {
 #include "DNA_camera_types.h"
-
+}
 #include "CameraExporter.h"
 
 #include "collada_internal.h"
 
-CamerasExporter::CamerasExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings): COLLADASW::LibraryCameras(sw), export_settings(export_settings) {}
+CamerasExporter::CamerasExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : COLLADASW::LibraryCameras(sw), export_settings(export_settings) {
+}
 
 template<class Functor>
-void forEachCameraObjectInScene(Scene *sce, Functor &f, bool export_selected)
+void forEachCameraObjectInExportSet(Scene *sce, Functor &f, LinkNode *export_set)
 {
-	Base *base = (Base*) sce->base.first;
-	while (base) {
-		Object *ob = base->object;
+	LinkNode *node;
+	for (node = export_set; node; node = node->next) {
+		Object *ob = (Object *)node->link;
 
-		if (ob->type == OB_CAMERA && ob->data && !(export_selected && !(ob->flag & SELECT))) {
+		if (ob->type == OB_CAMERA && ob->data) {
 			f(ob, sce);
 		}
-		base = base->next;
 	}
 }
 
@@ -57,39 +57,40 @@ void CamerasExporter::exportCameras(Scene *sce)
 {
 	openLibrary();
 	
-	forEachCameraObjectInScene(sce, *this, this->export_settings->selected);
+	forEachCameraObjectInExportSet(sce, *this, this->export_settings->export_set);
 	
 	closeLibrary();
 }
 void CamerasExporter::operator()(Object *ob, Scene *sce)
 {
 	// TODO: shiftx, shifty, YF_dofdist
-	Camera *cam = (Camera*)ob->data;
+	Camera *cam = (Camera *)ob->data;
 	std::string cam_id(get_camera_id(ob));
 	std::string cam_name(id_name(cam));
 
 	switch (cam->type) {
-	case CAM_PANO:	
-	case CAM_PERSP: {
-		COLLADASW::PerspectiveOptic persp(mSW);
-		persp.setXFov(RAD2DEGF(focallength_to_fov(cam->lens, cam->sensor_x)), "xfov");
-		persp.setAspectRatio((float)(sce->r.xsch)/(float)(sce->r.ysch), false, "aspect_ratio");
-		persp.setZFar(cam->clipend, false, "zfar");
-		persp.setZNear(cam->clipsta, false, "znear");
-		COLLADASW::Camera ccam(mSW, &persp, cam_id, cam_name);
-		addCamera(ccam);
-		break;
+		case CAM_PANO:
+		case CAM_PERSP: {
+			COLLADASW::PerspectiveOptic persp(mSW);
+			persp.setXFov(RAD2DEGF(focallength_to_fov(cam->lens, cam->sensor_x)), "xfov");
+			persp.setAspectRatio((float)(sce->r.xsch) / (float)(sce->r.ysch), false, "aspect_ratio");
+			persp.setZFar(cam->clipend, false, "zfar");
+			persp.setZNear(cam->clipsta, false, "znear");
+			COLLADASW::Camera ccam(mSW, &persp, cam_id, cam_name);
+			addCamera(ccam);
+			break;
+		}
+		case CAM_ORTHO:
+		default:
+		{
+			COLLADASW::OrthographicOptic ortho(mSW);
+			ortho.setXMag(cam->ortho_scale, "xmag");
+			ortho.setAspectRatio((float)(sce->r.xsch) / (float)(sce->r.ysch), false, "aspect_ratio");
+			ortho.setZFar(cam->clipend, false, "zfar");
+			ortho.setZNear(cam->clipsta, false, "znear");
+			COLLADASW::Camera ccam(mSW, &ortho, cam_id, cam_name);
+			addCamera(ccam);
+			break;
+		}
 	}
-	case CAM_ORTHO:
-	default:
-	{
-		COLLADASW::OrthographicOptic ortho(mSW);
-		ortho.setXMag(cam->ortho_scale, "xmag");
-		ortho.setAspectRatio((float)(sce->r.xsch)/(float)(sce->r.ysch), false, "aspect_ratio");
-		ortho.setZFar(cam->clipend, false, "zfar");
-		ortho.setZNear(cam->clipsta, false, "znear");
-		COLLADASW::Camera ccam(mSW, &ortho, cam_id, cam_name);
-		addCamera(ccam);
-		break;
-	}}
 }
diff --git a/source/blender/collada/CameraExporter.h b/source/blender/collada/CameraExporter.h
index 1b5898984ba..5405df8ab9e 100644
--- a/source/blender/collada/CameraExporter.h
+++ b/source/blender/collada/CameraExporter.h
@@ -31,8 +31,10 @@
 #include "COLLADASWStreamWriter.h"
 #include "COLLADASWLibraryCameras.h"
 
+extern "C" {
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
+}
 
 #include "ExportSettings.h"
 
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp
index 19fc30a2790..c47798ee804 100644
--- a/source/blender/collada/DocumentExporter.cpp
+++ b/source/blender/collada/DocumentExporter.cpp
@@ -27,6 +27,40 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
+#include <vector>
+#include <algorithm> // std::find
+
+#include "COLLADASWCamera.h"
+#include "COLLADASWAsset.h"
+#include "COLLADASWLibraryVisualScenes.h"
+#include "COLLADASWNode.h"
+#include "COLLADASWSource.h"
+#include "COLLADASWInstanceGeometry.h"
+#include "COLLADASWInputList.h"
+#include "COLLADASWPrimitves.h"
+#include "COLLADASWVertices.h"
+#include "COLLADASWLibraryAnimations.h"
+#include "COLLADASWLibraryImages.h"
+#include "COLLADASWLibraryEffects.h"
+#include "COLLADASWImage.h"
+#include "COLLADASWEffectProfile.h"
+#include "COLLADASWColorOrTexture.h"
+#include "COLLADASWParamTemplate.h"
+#include "COLLADASWParamBase.h"
+#include "COLLADASWSurfaceInitOption.h"
+#include "COLLADASWSampler.h"
+#include "COLLADASWScene.h"
+#include "COLLADASWTechnique.h"
+#include "COLLADASWTexture.h"
+#include "COLLADASWLibraryMaterials.h"
+#include "COLLADASWBindMaterial.h"
+#include "COLLADASWInstanceCamera.h"
+#include "COLLADASWInstanceLight.h"
+#include "COLLADASWConstants.h"
+#include "COLLADASWLibraryControllers.h"
+#include "COLLADASWInstanceController.h"
+#include "COLLADASWInstanceNode.h"
+#include "COLLADASWBaseInputElement.h"
 
 extern "C" 
 {
@@ -54,7 +88,6 @@ extern "C"
 #ifdef WITH_BUILDINFO
 extern char build_rev[];
 #endif
-}
 
 #include "MEM_guardedalloc.h"
 
@@ -74,41 +107,12 @@ extern char build_rev[];
 #include "BLI_listbase.h"
 
 #include "RNA_access.h"
-
-#include "COLLADASWAsset.h"
-#include "COLLADASWLibraryVisualScenes.h"
-#include "COLLADASWNode.h"
-#include "COLLADASWSource.h"
-#include "COLLADASWInstanceGeometry.h"
-#include "COLLADASWInputList.h"
-#include "COLLADASWPrimitves.h"
-#include "COLLADASWVertices.h"
-#include "COLLADASWLibraryAnimations.h"
-#include "COLLADASWLibraryImages.h"
-#include "COLLADASWLibraryEffects.h"
-#include "COLLADASWImage.h"
-#include "COLLADASWEffectProfile.h"
-#include "COLLADASWColorOrTexture.h"
-#include "COLLADASWParamTemplate.h"
-#include "COLLADASWParamBase.h"
-#include "COLLADASWSurfaceInitOption.h"
-#include "COLLADASWSampler.h"
-#include "COLLADASWScene.h"
-#include "COLLADASWTechnique.h"
-#include "COLLADASWTexture.h"
-#include "COLLADASWLibraryMaterials.h"
-#include "COLLADASWBindMaterial.h"
-#include "COLLADASWInstanceCamera.h"
-#include "COLLADASWInstanceLight.h"
-#include "COLLADASWConstants.h"
-#include "COLLADASWLibraryControllers.h"
-#include "COLLADASWInstanceController.h"
-#include "COLLADASWInstanceNode.h"
-#include "COLLADASWBaseInputElement.h"
+}
 
 #include "collada_internal.h"
 #include "DocumentExporter.h"
-#include "ExportSettings.h"
+
+extern bool bc_has_object_type(LinkNode *export_set, short obtype);
 
 // can probably go after refactor is complete
 #include "InstanceWriter.h"
@@ -124,15 +128,13 @@ extern char build_rev[];
 #include "LightExporter.h"
 #include "MaterialExporter.h"
 
-#include <vector>
-#include <algorithm> // std::find
 
 char *bc_CustomData_get_layer_name(const struct CustomData *data, int type, int n)
 {
 	int layer_index = CustomData_get_layer_index(data, type);
 	if (layer_index < 0) return NULL;
 
-	return data->layers[layer_index+n].name;
+	return data->layers[layer_index + n].name;
 }
 
 char *bc_CustomData_get_active_layer_name(const CustomData *data, int type)
@@ -144,7 +146,8 @@ char *bc_CustomData_get_active_layer_name(const CustomData *data, int type)
 	return data->layers[layer_index].name;
 }
 
-DocumentExporter::DocumentExporter(const ExportSettings *export_settings) : export_settings(export_settings) {}
+DocumentExporter::DocumentExporter(const ExportSettings *export_settings) : export_settings(export_settings) {
+}
 
 // TODO: it would be better to instantiate animations rather than create a new one per object
 // COLLADA allows this through multiple <channel>s in <animation>.
@@ -158,7 +161,7 @@ void DocumentExporter::exportCurrentScene(Scene *sce)
 	clear_global_id_map();
 	
 	COLLADABU::NativeString native_filename =
-		COLLADABU::NativeString(std::string(this->export_settings->filepath));
+	    COLLADABU::NativeString(std::string(this->export_settings->filepath));
 	COLLADASW::StreamWriter sw(native_filename);
 
 	// open <collada>
@@ -219,21 +222,22 @@ void DocumentExporter::exportCurrentScene(Scene *sce)
 	}
 	char version_buf[128];
 #ifdef WITH_BUILDINFO
-	sprintf(version_buf, "Blender %d.%02d.%d r%s", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION, build_rev);
+	sprintf(version_buf, "Blender %d.%02d.%d r%s", BLENDER_VERSION / 100, BLENDER_VERSION % 100, BLENDER_SUBVERSION, build_rev);
 #else
-	sprintf(version_buf, "Blender %d.%02d.%d", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION);
+	sprintf(version_buf, "Blender %d.%02d.%d", BLENDER_VERSION / 100, BLENDER_VERSION % 100, BLENDER_SUBVERSION);
 #endif
 	asset.getContributor().mAuthoringTool = version_buf;
 	asset.add();
 	
+	LinkNode *export_set = this->export_settings->export_set;
 	// <library_cameras>
-	if (has_object_type(sce, OB_CAMERA)) {
+	if (bc_has_object_type(export_set, OB_CAMERA)) {
 		CamerasExporter ce(&sw, this->export_settings);
 		ce.exportCameras(sce);
 	}
 	
 	// <library_lights>
-	if (has_object_type(sce, OB_LAMP)) {
+	if (bc_has_object_type(export_set, OB_LAMP)) {
 		LightsExporter le(&sw, this->export_settings);
 		le.exportLights(sce);
 	}
@@ -251,7 +255,7 @@ void DocumentExporter::exportCurrentScene(Scene *sce)
 	me.exportMaterials(sce);
 
 	// <library_geometries>
-	if (has_object_type(sce, OB_MESH)) {
+	if (bc_has_object_type(export_set, OB_MESH)) {
 		GeometryExporter ge(&sw, this->export_settings);
 		ge.exportGeom(sce);
 	}
@@ -262,7 +266,7 @@ void DocumentExporter::exportCurrentScene(Scene *sce)
 
 	// <library_controllers>
 	ArmatureExporter arm_exporter(&sw, this->export_settings);
-	if (has_object_type(sce, OB_ARMATURE)) {
+	if (bc_has_object_type(export_set, OB_ARMATURE)) {
 		arm_exporter.export_controllers(sce);
 	}
 
@@ -273,7 +277,7 @@ void DocumentExporter::exportCurrentScene(Scene *sce)
 	// <scene>
 	std::string scene_name(translate_id(id_name(sce)));
 	COLLADASW::Scene scene(&sw, COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING,
-											   scene_name));
+	                                           scene_name));
 	scene.add();
 	
 	// close <Collada>
@@ -281,14 +285,13 @@ void DocumentExporter::exportCurrentScene(Scene *sce)
 
 }
 
-void DocumentExporter::exportScenes(const char* filename)
+void DocumentExporter::exportScenes(const char *filename)
 {
 }
 
 /*
-
-NOTES:
-
-* AnimationExporter::sample_animation enables all curves on armature, this is undesirable for a user
-
+ * NOTES:
+ *
+ * AnimationExporter::sample_animation enables all curves on armature, this is undesirable for a user
+ *
  */
diff --git a/source/blender/collada/DocumentExporter.h b/source/blender/collada/DocumentExporter.h
index 314ba2868e5..05620087d76 100644
--- a/source/blender/collada/DocumentExporter.h
+++ b/source/blender/collada/DocumentExporter.h
@@ -29,6 +29,10 @@
 
 #include "ExportSettings.h"
 
+extern "C" {
+#include "DNA_customdata_types.h"
+}
+
 struct Scene;
 
 class DocumentExporter
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp
index 6dca7828cc2..ca07512f439 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -49,6 +49,7 @@
 #include "COLLADASaxFWLLoader.h"
 #include "COLLADASaxFWLIExtraDataCallbackHandler.h"
 
+extern "C" {
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_string.h"
@@ -75,6 +76,8 @@
 
 #include "MEM_guardedalloc.h"
 
+}
+
 #include "ExtraHandler.h"
 #include "ErrorHandler.h"
 #include "DocumentImporter.h"
@@ -85,8 +88,8 @@
 
 
 /*
-  COLLADA Importer limitations:
-  - no multiple scene import, all objects are added to active scene
+   COLLADA Importer limitations:
+   - no multiple scene import, all objects are added to active scene
  */
 
 // #define COLLADA_DEBUG
@@ -100,13 +103,14 @@ DocumentImporter::DocumentImporter(bContext *C, const char *filename) :
 	armature_importer(&unit_converter, &mesh_importer, &anim_importer, CTX_data_scene(C)),
 	mesh_importer(&unit_converter, &armature_importer, CTX_data_scene(C)),
 	anim_importer(&unit_converter, &armature_importer, CTX_data_scene(C))
-{}
+{
+}
 
 DocumentImporter::~DocumentImporter()
 {
 	TagsMap::iterator etit;
 	etit = uid_tags_map.begin();
-	while (etit!=uid_tags_map.end()) {
+	while (etit != uid_tags_map.end()) {
 		delete etit->second;
 		etit++;
 	}
@@ -168,11 +172,11 @@ void DocumentImporter::start()
 
 void DocumentImporter::finish()
 {
-	if (mImportStage!=General)
+	if (mImportStage != General)
 		return;
 		
 	/** TODO Break up and put into 2-pass parsing of DAE */
-	std::vector<const COLLADAFW::VisualScene*>::iterator it;
+	std::vector<const COLLADAFW::VisualScene *>::iterator it;
 	for (it = vscenes.begin(); it != vscenes.end(); it++) {
 		PointerRNA sceneptr, unit_settings;
 		PropertyRNA *system, *scale;
@@ -211,7 +215,7 @@ void DocumentImporter::finish()
 	armature_importer.fix_animation();
 #endif
 
-	for (std::vector<const COLLADAFW::VisualScene*>::iterator it = vscenes.begin(); it != vscenes.end(); it++) {
+	for (std::vector<const COLLADAFW::VisualScene *>::iterator it = vscenes.begin(); it != vscenes.end(); it++) {
 		const COLLADAFW::NodePointerArray& roots = (*it)->getRootNodes();
 
 		for (unsigned int i = 0; i < roots.getCount(); i++)
@@ -223,7 +227,7 @@ void DocumentImporter::finish()
 
 		fprintf(stderr, "got %d library nodes to free\n", (int)libnode_ob.size());
 		// free all library_nodes
-		std::vector<Object*>::iterator it;
+		std::vector<Object *>::iterator it;
 		for (it = libnode_ob.begin(); it != libnode_ob.end(); it++) {
 			Object *ob = *it;
 
@@ -231,8 +235,8 @@ void DocumentImporter::finish()
 			if (base) {
 				BLI_remlink(&sce->base, base);
 				BKE_libblock_free_us(&G.main->object, base->object);
-				if (sce->basact==base)
-					sce->basact= NULL;
+				if (sce->basact == base)
+					sce->basact = NULL;
 				MEM_freeN(base);
 			}
 		}
@@ -262,18 +266,20 @@ void DocumentImporter::translate_anim_recursive(COLLADAFW::Node *node, COLLADAFW
 			root_map[node->getUniqueId()] = root_map[par->getUniqueId()];
 	}
 
-	/*COLLADAFW::Transformation::TransformationType types[] = {
+#if 0
+	COLLADAFW::Transformation::TransformationType types[] = {
 		COLLADAFW::Transformation::ROTATE,
 		COLLADAFW::Transformation::SCALE,
 		COLLADAFW::Transformation::TRANSLATE,
 		COLLADAFW::Transformation::MATRIX
 	};
 
-	Object *ob;*/
+	Object *ob;
+#endif
 	unsigned int i;
 
 	//for (i = 0; i < 4; i++)
-		//ob = 
+	//    ob =
 	anim_importer.translate_Animations(node, root_map, object_map, FW_object_map);
 
 	COLLADAFW::NodePointerArray &children = node->getChildNodes();
@@ -283,8 +289,8 @@ void DocumentImporter::translate_anim_recursive(COLLADAFW::Node *node, COLLADAFW
 }
 
 /** When this method is called, the writer must write the global document asset.
-	\return The writer should return true, if writing succeeded, false otherwise.*/
-bool DocumentImporter::writeGlobalAsset ( const COLLADAFW::FileInfo* asset ) 
+ * \return The writer should return true, if writing succeeded, false otherwise.*/
+bool DocumentImporter::writeGlobalAsset(const COLLADAFW::FileInfo *asset)
 {
 	unit_converter.read_asset(asset);
 
@@ -292,13 +298,13 @@ bool DocumentImporter::writeGlobalAsset ( const COLLADAFW::FileInfo* asset )
 }
 
 /** When this method is called, the writer must write the scene.
-	\return The writer should return true, if writing succeeded, false otherwise.*/
-bool DocumentImporter::writeScene ( const COLLADAFW::Scene* scene ) 
+ * \return The writer should return true, if writing succeeded, false otherwise.*/
+bool DocumentImporter::writeScene(const COLLADAFW::Scene *scene)
 {
 	// XXX could store the scene id, but do nothing for now
 	return true;
 }
-Object* DocumentImporter::create_camera_object(COLLADAFW::InstanceCamera *camera, Scene *sce)
+Object *DocumentImporter::create_camera_object(COLLADAFW::InstanceCamera *camera, Scene *sce)
 {
 	const COLLADAFW::UniqueId& cam_uid = camera->getInstanciatedObjectId();
 	if (uid_camera_map.find(cam_uid) == uid_camera_map.end()) {	
@@ -308,7 +314,7 @@ Object* DocumentImporter::create_camera_object(COLLADAFW::InstanceCamera *camera
 
 	Object *ob = bc_add_object(sce, OB_CAMERA, NULL);
 	Camera *cam = uid_camera_map[cam_uid];
-	Camera *old_cam = (Camera*)ob->data;
+	Camera *old_cam = (Camera *)ob->data;
 	ob->data = cam;
 	old_cam->id.us--;
 	if (old_cam->id.us == 0)
@@ -316,7 +322,7 @@ Object* DocumentImporter::create_camera_object(COLLADAFW::InstanceCamera *camera
 	return ob;
 }
 
-Object* DocumentImporter::create_lamp_object(COLLADAFW::InstanceLight *lamp, Scene *sce)
+Object *DocumentImporter::create_lamp_object(COLLADAFW::InstanceLight *lamp, Scene *sce)
 {
 	const COLLADAFW::UniqueId& lamp_uid = lamp->getInstanciatedObjectId();
 	if (uid_lamp_map.find(lamp_uid) == uid_lamp_map.end()) {	
@@ -326,7 +332,7 @@ Object* DocumentImporter::create_lamp_object(COLLADAFW::InstanceLight *lamp, Sce
 
 	Object *ob = bc_add_object(sce, OB_LAMP, NULL);
 	Lamp *la = uid_lamp_map[lamp_uid];
-	Lamp *old_lamp = (Lamp*)ob->data;
+	Lamp *old_lamp = (Lamp *)ob->data;
 	ob->data = la;
 	old_lamp->id.us--;
 	if (old_lamp->id.us == 0)
@@ -334,12 +340,12 @@ Object* DocumentImporter::create_lamp_object(COLLADAFW::InstanceLight *lamp, Sce
 	return ob;
 }
 
-Object* DocumentImporter::create_instance_node(Object *source_ob, COLLADAFW::Node *source_node, COLLADAFW::Node *instance_node, Scene *sce, bool is_library_node)
+Object *DocumentImporter::create_instance_node(Object *source_ob, COLLADAFW::Node *source_node, COLLADAFW::Node *instance_node, Scene *sce, bool is_library_node)
 {
 	fprintf(stderr, "create <instance_node> under node id=%s from node id=%s\n", instance_node ? instance_node->getOriginalId().c_str() : NULL, source_node ? source_node->getOriginalId().c_str() : NULL);
 
 	Object *obn = BKE_object_copy(source_ob);
-	obn->recalc |= OB_RECALC_OB|OB_RECALC_DATA|OB_RECALC_TIME;
+	obn->recalc |= OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME;
 	BKE_scene_base_add(sce, obn);
 
 	if (instance_node) {
@@ -380,7 +386,7 @@ Object* DocumentImporter::create_instance_node(Object *source_ob, COLLADAFW::Nod
 			Object *new_child = NULL;
 			if (inodes.getCount()) { // \todo loop through instance nodes
 				const COLLADAFW::UniqueId& id = inodes[0]->getInstanciatedObjectId();
-				fprintf(stderr, "Doing %d child nodes\n", node_map.count(id));
+				fprintf(stderr, "Doing %d child nodes\n", (int)node_map.count(id));
 				new_child = create_instance_node(object_map.find(id)->second, node_map[id], child_node, sce, is_library_node);
 			}
 			else {
@@ -396,21 +402,21 @@ Object* DocumentImporter::create_instance_node(Object *source_ob, COLLADAFW::Nod
 	return obn;
 }
 
-void DocumentImporter::write_node (COLLADAFW::Node *node, COLLADAFW::Node *parent_node, Scene *sce, Object *par, bool is_library_node)
+void DocumentImporter::write_node(COLLADAFW::Node *node, COLLADAFW::Node *parent_node, Scene *sce, Object *par, bool is_library_node)
 {
 	Object *ob = NULL;
 	bool is_joint = node->getType() == COLLADAFW::Node::JOINT;
 	bool read_transform = true;
 
-	std::vector<Object*> * objects_done = new std::vector<Object *>();
+	std::vector<Object *> *objects_done = new std::vector<Object *>();
 
 	if (is_joint) {
-		if ( par ) {
-		Object * empty = par;
-		par = bc_add_object(sce, OB_ARMATURE, NULL);
-		bc_set_parent(par, empty->parent, mContext);
-		//remove empty : todo
-		object_map.insert(std::make_pair<COLLADAFW::UniqueId, Object *>(parent_node->getUniqueId(), par));
+		if (par) {
+			Object *empty = par;
+			par = bc_add_object(sce, OB_ARMATURE, NULL);
+			bc_set_parent(par, empty->parent, mContext);
+			//remove empty : todo
+			object_map.insert(std::make_pair<COLLADAFW::UniqueId, Object *>(parent_node->getUniqueId(), par));
 		}
 		armature_importer.add_joint(node, parent_node == NULL || parent_node->getType() != COLLADAFW::Node::JOINT, par, sce);
 	}
@@ -431,7 +437,7 @@ void DocumentImporter::write_node (COLLADAFW::Node *node, COLLADAFW::Node *paren
 		// <instance_geometry>
 		while (geom_done < geom.getCount()) {
 			ob = mesh_importer.create_mesh_object(node, geom[geom_done], false, uid_material_map,
-												  material_texture_mapping_map);
+			                                      material_texture_mapping_map);
 			objects_done->push_back(ob);
 			++geom_done;
 		}
@@ -446,7 +452,7 @@ void DocumentImporter::write_node (COLLADAFW::Node *node, COLLADAFW::Node *paren
 			++lamp_done;
 		}
 		while (controller_done < controller.getCount()) {
-			COLLADAFW::InstanceGeometry *geom = (COLLADAFW::InstanceGeometry*)controller[controller_done];
+			COLLADAFW::InstanceGeometry *geom = (COLLADAFW::InstanceGeometry *)controller[controller_done];
 			ob = mesh_importer.create_mesh_object(node, geom, true, uid_material_map, material_texture_mapping_map);
 			objects_done->push_back(ob);
 			++controller_done;
@@ -484,7 +490,7 @@ void DocumentImporter::write_node (COLLADAFW::Node *node, COLLADAFW::Node *paren
 		for (std::vector<Object *>::iterator it = objects_done->begin(); it != objects_done->end(); ++it) {
 			ob = *it;
 			std::string nodename = node->getName().size() ? node->getName() : node->getOriginalId();
-			rename_id(&ob->id, (char*)nodename.c_str());
+			rename_id(&ob->id, (char *)nodename.c_str());
 			object_map.insert(std::make_pair<COLLADAFW::UniqueId, Object *>(node->getUniqueId(), ob));
 			node_map[node->getUniqueId()] = node;
 
@@ -495,10 +501,10 @@ void DocumentImporter::write_node (COLLADAFW::Node *node, COLLADAFW::Node *paren
 	}
 
 	for (std::vector<Object *>::iterator it = objects_done->begin(); it != objects_done->end(); ++it) {
-		ob =*it;
+		ob = *it;
 
 		if (read_transform)
-			anim_importer.read_node_transform(node, ob); // overwrites location set earlier
+			anim_importer.read_node_transform(node, ob);  // overwrites location set earlier
 
 		if (!is_joint) {
 			// if par was given make this object child of the previous
@@ -514,10 +520,10 @@ void DocumentImporter::write_node (COLLADAFW::Node *node, COLLADAFW::Node *paren
 }
 
 /** When this method is called, the writer must write the entire visual scene.
-	\return The writer should return true, if writing succeeded, false otherwise.*/
-bool DocumentImporter::writeVisualScene ( const COLLADAFW::VisualScene* visualScene ) 
+ * \return The writer should return true, if writing succeeded, false otherwise.*/
+bool DocumentImporter::writeVisualScene(const COLLADAFW::VisualScene *visualScene)
 {
-	if (mImportStage!=General)
+	if (mImportStage != General)
 		return true;
 		
 	// this method called on post process after writeGeometry, writeMaterial, etc.
@@ -536,11 +542,11 @@ bool DocumentImporter::writeVisualScene ( const COLLADAFW::VisualScene* visualSc
 }
 
 /** When this method is called, the writer must handle all nodes contained in the 
-	library nodes.
-	\return The writer should return true, if writing succeeded, false otherwise.*/
-bool DocumentImporter::writeLibraryNodes ( const COLLADAFW::LibraryNodes* libraryNodes ) 
+* library nodes.
+* \return The writer should return true, if writing succeeded, false otherwise.*/
+bool DocumentImporter::writeLibraryNodes(const COLLADAFW::LibraryNodes *libraryNodes)
 {
-	if (mImportStage!=General)
+	if (mImportStage != General)
 		return true;
 		
 	Scene *sce = CTX_data_scene(mContext);
@@ -555,24 +561,24 @@ bool DocumentImporter::writeLibraryNodes ( const COLLADAFW::LibraryNodes* librar
 }
 
 /** When this method is called, the writer must write the geometry.
-	\return The writer should return true, if writing succeeded, false otherwise.*/
-bool DocumentImporter::writeGeometry ( const COLLADAFW::Geometry* geom ) 
+ * \return The writer should return true, if writing succeeded, false otherwise.*/
+bool DocumentImporter::writeGeometry(const COLLADAFW::Geometry *geom)
 {
-	if (mImportStage!=General)
+	if (mImportStage != General)
 		return true;
 		
 	return mesh_importer.write_geometry(geom);
 }
 
 /** When this method is called, the writer must write the material.
-	\return The writer should return true, if writing succeeded, false otherwise.*/
-bool DocumentImporter::writeMaterial( const COLLADAFW::Material* cmat ) 
+ * \return The writer should return true, if writing succeeded, false otherwise.*/
+bool DocumentImporter::writeMaterial(const COLLADAFW::Material *cmat)
 {
-	if (mImportStage!=General)
+	if (mImportStage != General)
 		return true;
 		
 	const std::string& str_mat_id = cmat->getName().size() ? cmat->getName() : cmat->getOriginalId();
-	Material *ma = BKE_material_add((char*)str_mat_id.c_str());
+	Material *ma = BKE_material_add((char *)str_mat_id.c_str());
 	
 	this->uid_effect_map[cmat->getInstantiatedEffect()] = ma;
 	this->uid_material_map[cmat->getUniqueId()] = ma;
@@ -581,8 +587,8 @@ bool DocumentImporter::writeMaterial( const COLLADAFW::Material* cmat )
 }
 
 // create mtex, create texture, set texture image
-MTex* DocumentImporter::create_texture(COLLADAFW::EffectCommon *ef, COLLADAFW::Texture &ctex, Material *ma,
-					 int i, TexIndexTextureArrayMap &texindex_texarray_map)
+MTex *DocumentImporter::create_texture(COLLADAFW::EffectCommon *ef, COLLADAFW::Texture &ctex, Material *ma,
+                                       int i, TexIndexTextureArrayMap &texindex_texarray_map)
 {
 	COLLADAFW::SamplerPointerArray& samp_array = ef->getSamplerPointerArray();
 	COLLADAFW::Sampler *sampler = samp_array[ctex.getSamplerId()];
@@ -732,32 +738,34 @@ void DocumentImporter::write_profile_COMMON(COLLADAFW::EffectCommon *ef, Materia
 			mtex->tex->imaflag |= TEX_USEALPHA;
 			i++;
 			ma->spectra = ma->alpha = 0;
-			ma->mode |= MA_ZTRANSP|MA_TRANSP;
+			ma->mode |= MA_ZTRANSP | MA_TRANSP;
 		}
 	}
 	// TRANSPARENT
 	// color
-// 	if (ef->getOpacity().isColor()) {
-// 			// XXX don't know what to do here
-// 		}
-// 		// texture
-// 		else if (ef->getOpacity().isTexture()) {
-// 			ctex = ef->getOpacity().getTexture();
-// 			if (mtex != NULL) mtex->mapto &= MAP_ALPHA;
-// 			else {
-// 				mtex = create_texture(ef, ctex, ma, i, texindex_texarray_map);
-// 				if (mtex != NULL) mtex->mapto = MAP_ALPHA;
-// 			}
-// 		}
+#if 0
+	if (ef->getOpacity().isColor()) {
+		// XXX don't know what to do here
+	}
+	// texture
+	else if (ef->getOpacity().isTexture()) {
+		ctex = ef->getOpacity().getTexture();
+		if (mtex != NULL) mtex->mapto &= MAP_ALPHA;
+		else {
+			mtex = create_texture(ef, ctex, ma, i, texindex_texarray_map);
+			if (mtex != NULL) mtex->mapto = MAP_ALPHA;
+		}
+	}
+#endif
 	material_texture_mapping_map[ma] = texindex_texarray_map;
 }
 
 /** When this method is called, the writer must write the effect.
-	\return The writer should return true, if writing succeeded, false otherwise.*/
+ * \return The writer should return true, if writing succeeded, false otherwise.*/
 
-bool DocumentImporter::writeEffect( const COLLADAFW::Effect* effect ) 
+bool DocumentImporter::writeEffect(const COLLADAFW::Effect *effect)
 {
-	if (mImportStage!=General)
+	if (mImportStage != General)
 		return true;
 	
 	const COLLADAFW::UniqueId& uid = effect->getUniqueId();
@@ -768,9 +776,9 @@ bool DocumentImporter::writeEffect( const COLLADAFW::Effect* effect )
 	}
 	
 	Material *ma = uid_effect_map[uid];
-	std::map<COLLADAFW::UniqueId, Material*>::iterator  iter;
-	for (iter = uid_material_map.begin(); iter != uid_material_map.end() ; iter++ ) {
-		if ( iter->second == ma ) {
+	std::map<COLLADAFW::UniqueId, Material *>::iterator iter;
+	for (iter = uid_material_map.begin(); iter != uid_material_map.end(); iter++) {
+		if (iter->second == ma) {
 			this->FW_object_map[iter->first] = effect;
 			break;
 		}
@@ -791,10 +799,10 @@ bool DocumentImporter::writeEffect( const COLLADAFW::Effect* effect )
 
 
 /** When this method is called, the writer must write the camera.
-	\return The writer should return true, if writing succeeded, false otherwise.*/
-bool DocumentImporter::writeCamera( const COLLADAFW::Camera* camera ) 
+ * \return The writer should return true, if writing succeeded, false otherwise.*/
+bool DocumentImporter::writeCamera(const COLLADAFW::Camera *camera)
 {
-	if (mImportStage!=General)
+	if (mImportStage != General)
 		return true;
 		
 	Camera *cam = NULL;
@@ -802,8 +810,8 @@ bool DocumentImporter::writeCamera( const COLLADAFW::Camera* camera )
 	
 	cam_id = camera->getOriginalId();
 	cam_name = camera->getName();
-	if (cam_name.size()) cam = (Camera *)BKE_camera_add((char*)cam_name.c_str());
-	else cam = (Camera *)BKE_camera_add((char*)cam_id.c_str());
+	if (cam_name.size()) cam = (Camera *)BKE_camera_add((char *)cam_name.c_str());
+	else cam = (Camera *)BKE_camera_add((char *)cam_id.c_str());
 	
 	if (!cam) {
 		fprintf(stderr, "Cannot create camera.\n");
@@ -814,17 +822,17 @@ bool DocumentImporter::writeCamera( const COLLADAFW::Camera* camera )
 	
 	COLLADAFW::Camera::CameraType type = camera->getCameraType();
 	switch (type) {
-	case COLLADAFW::Camera::ORTHOGRAPHIC:
+		case COLLADAFW::Camera::ORTHOGRAPHIC:
 		{
 			cam->type = CAM_ORTHO;
 		}
 		break;
-	case COLLADAFW::Camera::PERSPECTIVE:
+		case COLLADAFW::Camera::PERSPECTIVE:
 		{
 			cam->type = CAM_PERSP;
 		}
 		break;
-	case COLLADAFW::Camera::UNDEFINED_CAMERATYPE:
+		case COLLADAFW::Camera::UNDEFINED_CAMERATYPE:
 		{
 			fprintf(stderr, "Current camera type is not supported.\n");
 			cam->type = CAM_PERSP;
@@ -833,35 +841,35 @@ bool DocumentImporter::writeCamera( const COLLADAFW::Camera* camera )
 	}
 	
 	switch (camera->getDescriptionType()) {
-	case COLLADAFW::Camera::ASPECTRATIO_AND_Y:
+		case COLLADAFW::Camera::ASPECTRATIO_AND_Y:
 		{
 			switch (cam->type) {
 				case CAM_ORTHO:
-					{
-						double ymag = camera->getYMag().getValue();
-						double aspect = camera->getAspectRatio().getValue();
-						double xmag = aspect*ymag;
-						cam->ortho_scale = (float)xmag;
-					}
-					break;
+				{
+					double ymag = camera->getYMag().getValue();
+					double aspect = camera->getAspectRatio().getValue();
+					double xmag = aspect * ymag;
+					cam->ortho_scale = (float)xmag;
+				}
+				break;
 				case CAM_PERSP:
 				default:
-					{
-						double yfov = camera->getYFov().getValue();
-						double aspect = camera->getAspectRatio().getValue();
-						double xfov = aspect*yfov;
-						// xfov is in degrees, cam->lens is in millimiters
-						cam->lens = fov_to_focallength(DEG2RADF(xfov), cam->sensor_x);
-					}
-					break;
+				{
+					double yfov = camera->getYFov().getValue();
+					double aspect = camera->getAspectRatio().getValue();
+					double xfov = aspect * yfov;
+					// xfov is in degrees, cam->lens is in millimiters
+					cam->lens = fov_to_focallength(DEG2RADF(xfov), cam->sensor_x);
+				}
+				break;
 			}
 		}
 		break;
-	/* XXX correct way to do following four is probably to get also render
-	   size and determine proper settings from that somehow */
-	case COLLADAFW::Camera::ASPECTRATIO_AND_X:
-	case COLLADAFW::Camera::SINGLE_X:
-	case COLLADAFW::Camera::X_AND_Y:
+		/* XXX correct way to do following four is probably to get also render
+		   size and determine proper settings from that somehow */
+		case COLLADAFW::Camera::ASPECTRATIO_AND_X:
+		case COLLADAFW::Camera::SINGLE_X:
+		case COLLADAFW::Camera::X_AND_Y:
 		{
 			switch (cam->type) {
 				case CAM_ORTHO:
@@ -869,16 +877,16 @@ bool DocumentImporter::writeCamera( const COLLADAFW::Camera* camera )
 					break;
 				case CAM_PERSP:
 				default:
-					{
-						double x = camera->getXFov().getValue();
-						// x is in degrees, cam->lens is in millimiters
-						cam->lens = fov_to_focallength(DEG2RADF(x), cam->sensor_x);
-					}
-					break;
+				{
+					double x = camera->getXFov().getValue();
+					// x is in degrees, cam->lens is in millimiters
+					cam->lens = fov_to_focallength(DEG2RADF(x), cam->sensor_x);
+				}
+				break;
 			}
 		}
 		break;
-	case COLLADAFW::Camera::SINGLE_Y:
+		case COLLADAFW::Camera::SINGLE_Y:
 		{
 			switch (cam->type) {
 				case CAM_ORTHO:
@@ -886,18 +894,18 @@ bool DocumentImporter::writeCamera( const COLLADAFW::Camera* camera )
 					break;
 				case CAM_PERSP:
 				default:
-					{
+				{
 					double yfov = camera->getYFov().getValue();
 					// yfov is in degrees, cam->lens is in millimiters
 					cam->lens = fov_to_focallength(DEG2RADF(yfov), cam->sensor_x);
-					}
-					break;
+				}
+				break;
 			}
 		}
 		break;
-	case COLLADAFW::Camera::UNDEFINED:
-		// read nothing, use blender defaults.
-		break;
+		case COLLADAFW::Camera::UNDEFINED:
+			// read nothing, use blender defaults.
+			break;
 	}
 	
 	this->uid_camera_map[camera->getUniqueId()] = cam;
@@ -907,15 +915,15 @@ bool DocumentImporter::writeCamera( const COLLADAFW::Camera* camera )
 }
 
 /** When this method is called, the writer must write the image.
-	\return The writer should return true, if writing succeeded, false otherwise.*/
-bool DocumentImporter::writeImage( const COLLADAFW::Image* image ) 
+ * \return The writer should return true, if writing succeeded, false otherwise.*/
+bool DocumentImporter::writeImage(const COLLADAFW::Image *image)
 {
-	if (mImportStage!=General)
+	if (mImportStage != General)
 		return true;
 		
 	// XXX maybe it is necessary to check if the path is absolute or relative
 	const std::string& filepath = image->getImageURI().toNativePath();
-	const char *filename = (const char*)mFilename.c_str();
+	const char *filename = (const char *)mFilename.c_str();
 	char dir[FILE_MAX];
 	char full_path[FILE_MAX];
 	
@@ -932,10 +940,10 @@ bool DocumentImporter::writeImage( const COLLADAFW::Image* image )
 }
 
 /** When this method is called, the writer must write the light.
-	\return The writer should return true, if writing succeeded, false otherwise.*/
-bool DocumentImporter::writeLight( const COLLADAFW::Light* light ) 
+ * \return The writer should return true, if writing succeeded, false otherwise.*/
+bool DocumentImporter::writeLight(const COLLADAFW::Light *light)
 {
-	if (mImportStage!=General)
+	if (mImportStage != General)
 		return true;
 
 	Lamp *lamp = NULL;
@@ -949,8 +957,8 @@ bool DocumentImporter::writeLight( const COLLADAFW::Light* light )
 
 	la_id = light->getOriginalId();
 	la_name = light->getName();
-	if (la_name.size()) lamp = (Lamp*)BKE_lamp_add((char*)la_name.c_str());
-	else lamp = (Lamp*)BKE_lamp_add((char*)la_id.c_str());
+	if (la_name.size()) lamp = (Lamp *)BKE_lamp_add((char *)la_name.c_str());
+	else lamp = (Lamp *)BKE_lamp_add((char *)la_id.c_str());
 
 	if (!lamp) {
 		fprintf(stderr, "Cannot create lamp.\n");
@@ -1033,12 +1041,12 @@ bool DocumentImporter::writeLight( const COLLADAFW::Light* light )
 
 		if (IS_EQ(linatt, 0.0f) && quadatt > 0.0f) {
 			att2 = quadatt;
-			d = sqrt(1.0f/quadatt);
+			d = sqrt(1.0f / quadatt);
 		}
 		// linear light
 		else if (IS_EQ(quadatt, 0.0f) && linatt > 0.0f) {
 			att1 = linatt;
-			d = (1.0f/linatt);
+			d = (1.0f / linatt);
 		}
 		else if (IS_EQ(constatt, 1.0f)) {
 			att1 = 1.0f;
@@ -1048,7 +1056,7 @@ bool DocumentImporter::writeLight( const COLLADAFW::Light* light )
 			att1 = 1.0f;
 		}
 		
-		d *= ( 1.0f / unit_converter.getLinearMeter());
+		d *= (1.0f / unit_converter.getLinearMeter());
 
 		lamp->energy = e;
 		lamp->dist = d;
@@ -1056,47 +1064,47 @@ bool DocumentImporter::writeLight( const COLLADAFW::Light* light )
 		COLLADAFW::Light::LightType type = light->getLightType();
 		switch (type) {
 			case COLLADAFW::Light::AMBIENT_LIGHT:
-				{
-					lamp->type = LA_HEMI;
-				}
-				break;
+			{
+				lamp->type = LA_HEMI;
+			}
+			break;
 			case COLLADAFW::Light::SPOT_LIGHT:
-				{
-					lamp->type = LA_SPOT;
-					lamp->att1 = att1;
-					lamp->att2 = att2;
-					if (IS_EQ(att1, 0.0f) && att2 > 0)
-						lamp->falloff_type = LA_FALLOFF_INVSQUARE;
-					if (IS_EQ(att2, 0.0f) && att1 > 0)
-						lamp->falloff_type = LA_FALLOFF_INVLINEAR;
-					lamp->spotsize = light->getFallOffAngle().getValue();
-					lamp->spotblend = light->getFallOffExponent().getValue();
-				}
-				break;
+			{
+				lamp->type = LA_SPOT;
+				lamp->att1 = att1;
+				lamp->att2 = att2;
+				if (IS_EQ(att1, 0.0f) && att2 > 0)
+					lamp->falloff_type = LA_FALLOFF_INVSQUARE;
+				if (IS_EQ(att2, 0.0f) && att1 > 0)
+					lamp->falloff_type = LA_FALLOFF_INVLINEAR;
+				lamp->spotsize = light->getFallOffAngle().getValue();
+				lamp->spotblend = light->getFallOffExponent().getValue();
+			}
+			break;
 			case COLLADAFW::Light::DIRECTIONAL_LIGHT:
-				{
-					/* our sun is very strong, so pick a smaller energy level */
-					lamp->type = LA_SUN;
-					lamp->mode |= LA_NO_SPEC;
-				}
-				break;
+			{
+				/* our sun is very strong, so pick a smaller energy level */
+				lamp->type = LA_SUN;
+				lamp->mode |= LA_NO_SPEC;
+			}
+			break;
 			case COLLADAFW::Light::POINT_LIGHT:
-				{
-					lamp->type = LA_LOCAL;
-					lamp->att1 = att1;
-					lamp->att2 = att2;
-					if (IS_EQ(att1, 0.0f) && att2 > 0)
-						lamp->falloff_type = LA_FALLOFF_INVSQUARE;
-					if (IS_EQ(att2, 0.0f) && att1 > 0)
-						lamp->falloff_type = LA_FALLOFF_INVLINEAR;
-				}
-				break;
+			{
+				lamp->type = LA_LOCAL;
+				lamp->att1 = att1;
+				lamp->att2 = att2;
+				if (IS_EQ(att1, 0.0f) && att2 > 0)
+					lamp->falloff_type = LA_FALLOFF_INVSQUARE;
+				if (IS_EQ(att2, 0.0f) && att1 > 0)
+					lamp->falloff_type = LA_FALLOFF_INVLINEAR;
+			}
+			break;
 			case COLLADAFW::Light::UNDEFINED:
-				{
-					fprintf(stderr, "Current lamp type is not supported.\n");
-					lamp->type = LA_LOCAL;
-				}
-				break;
+			{
+				fprintf(stderr, "Current lamp type is not supported.\n");
+				lamp->type = LA_LOCAL;
+			}
+			break;
 		}
 	}
 
@@ -1106,9 +1114,9 @@ bool DocumentImporter::writeLight( const COLLADAFW::Light* light )
 }
 
 // this function is called only for animations that pass COLLADAFW::validate
-bool DocumentImporter::writeAnimation( const COLLADAFW::Animation* anim ) 
+bool DocumentImporter::writeAnimation(const COLLADAFW::Animation *anim)
 {
-	if (mImportStage!=General)
+	if (mImportStage != General)
 		return true;
 		
 	// return true;
@@ -1116,9 +1124,9 @@ bool DocumentImporter::writeAnimation( const COLLADAFW::Animation* anim )
 }
 
 // called on post-process stage after writeVisualScenes
-bool DocumentImporter::writeAnimationList( const COLLADAFW::AnimationList* animationList ) 
+bool DocumentImporter::writeAnimationList(const COLLADAFW::AnimationList *animationList)
 {
-	if (mImportStage!=General)
+	if (mImportStage != General)
 		return true;
 		
 	// return true;
@@ -1126,40 +1134,40 @@ bool DocumentImporter::writeAnimationList( const COLLADAFW::AnimationList* anima
 }
 
 /** When this method is called, the writer must write the skin controller data.
-	\return The writer should return true, if writing succeeded, false otherwise.*/
-bool DocumentImporter::writeSkinControllerData( const COLLADAFW::SkinControllerData* skin ) 
+ * \return The writer should return true, if writing succeeded, false otherwise.*/
+bool DocumentImporter::writeSkinControllerData(const COLLADAFW::SkinControllerData *skin)
 {
 	return armature_importer.write_skin_controller_data(skin);
 }
 
 // this is called on postprocess, before writeVisualScenes
-bool DocumentImporter::writeController( const COLLADAFW::Controller* controller ) 
+bool DocumentImporter::writeController(const COLLADAFW::Controller *controller)
 {
-	if (mImportStage!=General)
+	if (mImportStage != General)
 		return true;
 		
 	return armature_importer.write_controller(controller);
 }
 
-bool DocumentImporter::writeFormulas( const COLLADAFW::Formulas* formulas )
+bool DocumentImporter::writeFormulas(const COLLADAFW::Formulas *formulas)
 {
 	return true;
 }
 
-bool DocumentImporter::writeKinematicsScene( const COLLADAFW::KinematicsScene* kinematicsScene )
+bool DocumentImporter::writeKinematicsScene(const COLLADAFW::KinematicsScene *kinematicsScene)
 {
 	return true;
 }
 
-ExtraTags* DocumentImporter::getExtraTags(const COLLADAFW::UniqueId &uid)
+ExtraTags *DocumentImporter::getExtraTags(const COLLADAFW::UniqueId &uid)
 {
-	if (uid_tags_map.find(uid.toAscii())==uid_tags_map.end()) {
+	if (uid_tags_map.find(uid.toAscii()) == uid_tags_map.end()) {
 		return NULL;
 	}
 	return uid_tags_map[uid.toAscii()];
 }
 
-bool DocumentImporter::addExtraTags( const COLLADAFW::UniqueId &uid, ExtraTags *extra_tags)
+bool DocumentImporter::addExtraTags(const COLLADAFW::UniqueId &uid, ExtraTags *extra_tags)
 {
 	uid_tags_map[uid.toAscii()] = extra_tags;
 	return true;
diff --git a/source/blender/collada/EffectExporter.cpp b/source/blender/collada/EffectExporter.cpp
index 36ed6867525..3ed689628f7 100644
--- a/source/blender/collada/EffectExporter.cpp
+++ b/source/blender/collada/EffectExporter.cpp
@@ -31,6 +31,7 @@
 #include "COLLADASWEffectProfile.h"
 
 #include "EffectExporter.h"
+#include "DocumentExporter.h"
 #include "MaterialExporter.h"
 
 #include "DNA_mesh_types.h"
@@ -45,7 +46,7 @@
 // OB_MESH is assumed
 static std::string getActiveUVLayerName(Object *ob)
 {
-	Mesh *me = (Mesh*)ob->data;
+	Mesh *me = (Mesh *)ob->data;
 
 	int num_layers = CustomData_number_of_layers(&me->fdata, CD_MTFACE);
 	if (num_layers)
@@ -54,24 +55,25 @@ static std::string getActiveUVLayerName(Object *ob)
 	return "";
 }
 
-EffectsExporter::EffectsExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : COLLADASW::LibraryEffects(sw), export_settings(export_settings) {}
+EffectsExporter::EffectsExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : COLLADASW::LibraryEffects(sw), export_settings(export_settings) {
+}
 
 bool EffectsExporter::hasEffects(Scene *sce)
 {
 	Base *base = (Base *)sce->base.first;
 	
 	while (base) {
-		Object *ob= base->object;
+		Object *ob = base->object;
 		int a;
 		for (a = 0; a < ob->totcol; a++) {
-			Material *ma = give_current_material(ob, a+1);
+			Material *ma = give_current_material(ob, a + 1);
 
 			// no material, but check all of the slots
 			if (!ma) continue;
 
 			return true;
 		}
-		base= base->next;
+		base = base->next;
 	}
 	return false;
 }
@@ -82,7 +84,7 @@ void EffectsExporter::exportEffects(Scene *sce)
 		this->scene = sce;
 		openLibrary();
 		MaterialFunctor mf;
-		mf.forEachMaterialInScene<EffectsExporter>(sce, *this, this->export_settings->selected);
+		mf.forEachMaterialInExportSet<EffectsExporter>(sce, *this, this->export_settings->export_set);
 
 		closeLibrary();
 	}
@@ -96,7 +98,7 @@ void EffectsExporter::writeBlinn(COLLADASW::EffectProfile &ep, Material *ma)
 	ep.setShininess(ma->har, false, "shininess");
 	// specular
 	cot = getcol(ma->specr, ma->specg, ma->specb, 1.0f);
-	ep.setSpecular(cot, false, "specular" );
+	ep.setSpecular(cot, false, "specular");
 }
 
 void EffectsExporter::writeLambert(COLLADASW::EffectProfile &ep, Material *ma)
@@ -110,10 +112,10 @@ void EffectsExporter::writePhong(COLLADASW::EffectProfile &ep, Material *ma)
 	COLLADASW::ColorOrTexture cot;
 	ep.setShaderType(COLLADASW::EffectProfile::PHONG);
 	// shininess
-	ep.setShininess(ma->har, false, "shininess" );
+	ep.setShininess(ma->har, false, "shininess");
 	// specular
 	cot = getcol(ma->specr, ma->specg, ma->specb, 1.0f);
-	ep.setSpecular(cot, false, "specular" );
+	ep.setSpecular(cot, false, "specular");
 }
 
 void EffectsExporter::operator()(Material *ma, Object *ob)
@@ -128,7 +130,7 @@ void EffectsExporter::operator()(Material *ma, Object *ob)
 	ep.setProfileType(COLLADASW::EffectProfile::COMMON);
 	ep.openProfile();
 	// set shader type - one of three blinn, phong or lambert
-	if (ma->spec>0.0f) {
+	if (ma->spec > 0.0f) {
 		if (ma->spec_shader == MA_SPEC_BLINN) {
 			writeBlinn(ep, ma);
 		}
@@ -143,8 +145,8 @@ void EffectsExporter::operator()(Material *ma, Object *ob)
 			writeLambert(ep, ma);
 		}
 		else {
-		// \todo figure out handling of all spec+diff shader combos blender has, for now write phong
-		writePhong(ep, ma);
+			// \todo figure out handling of all spec+diff shader combos blender has, for now write phong
+			writePhong(ep, ma);
 		}
 	}
 	
@@ -167,7 +169,7 @@ void EffectsExporter::operator()(Material *ma, Object *ob)
 	}
 
 	// emission
-	cot=getcol(ma->emit, ma->emit, ma->emit, 1.0f);
+	cot = getcol(ma->emit, ma->emit, ma->emit, 1.0f);
 	ep.setEmission(cot, false, "emission");
 
 	// diffuse multiplied by diffuse intensity
@@ -177,7 +179,7 @@ void EffectsExporter::operator()(Material *ma, Object *ob)
 	// ambient
 	/* ma->ambX is calculated only on render, so lets do it here manually and not rely on ma->ambX. */
 	if (this->scene->world)
-		cot = getcol(this->scene->world->ambr*ma->amb, this->scene->world->ambg*ma->amb, this->scene->world->ambb*ma->amb, 1.0f);
+		cot = getcol(this->scene->world->ambr * ma->amb, this->scene->world->ambg * ma->amb, this->scene->world->ambb * ma->amb, 1.0f);
 	else
 		cot = getcol(ma->amb, ma->amb, ma->amb, 1.0f);
 
@@ -190,9 +192,9 @@ void EffectsExporter::operator()(Material *ma, Object *ob)
 		ep.setReflectivity(ma->ray_mirror);
 	}
 	// else {
-	// 	cot = getcol(ma->specr, ma->specg, ma->specb, 1.0f);
-	// 	ep.setReflective(cot);
-	// 	ep.setReflectivity(ma->spec);
+	//  cot = getcol(ma->specr, ma->specg, ma->specb, 1.0f);
+	//  ep.setReflective(cot);
+	//  ep.setReflectivity(ma->spec);
 	// }
 
 	// specular
@@ -228,7 +230,7 @@ void EffectsExporter::operator()(Material *ma, Object *ob)
 		if (im_samp_map.find(key) == im_samp_map.end()) {
 			// //<newparam> <surface> <init_from>
 			// COLLADASW::Surface surface(COLLADASW::Surface::SURFACE_TYPE_2D,
-			// 						   key + COLLADASW::Surface::SURFACE_SID_SUFFIX);
+			//                         key + COLLADASW::Surface::SURFACE_SID_SUFFIX);
 			// COLLADASW::SurfaceInitOption sio(COLLADASW::SurfaceInitOption::INIT_FROM);
 			// sio.setImageReference(key);
 			// surface.setInitOption(sio);
@@ -238,8 +240,8 @@ void EffectsExporter::operator()(Material *ma, Object *ob)
 			
 			//<newparam> <sampler> <source>
 			COLLADASW::Sampler sampler(COLLADASW::Sampler::SAMPLER_TYPE_2D,
-									   key + COLLADASW::Sampler::SAMPLER_SID_SUFFIX,
-									   key + COLLADASW::Sampler::SURFACE_SID_SUFFIX);
+			                           key + COLLADASW::Sampler::SAMPLER_SID_SUFFIX,
+			                           key + COLLADASW::Sampler::SURFACE_SID_SUFFIX);
 			sampler.setImageId(key);
 			// copy values to arrays since they will live longer
 			samplers[a] = sampler;
@@ -272,7 +274,7 @@ void EffectsExporter::operator()(Material *ma, Object *ob)
 		std::string key(id_name(ima));
 		key = translate_id(key);
 		int i = im_samp_map[key];
-		COLLADASW::Sampler *sampler = (COLLADASW::Sampler*)samp_surf[i][0];
+		COLLADASW::Sampler *sampler = (COLLADASW::Sampler *)samp_surf[i][0];
 		//COLLADASW::Surface *surface = (COLLADASW::Surface*)samp_surf[i][1];
 
 		std::string uvname = strlen(t->uvname) ? t->uvname : active_uv;
@@ -319,7 +321,7 @@ void EffectsExporter::operator()(Material *ma, Object *ob)
 	ep.addProfileElements();
 	bool twoSided = false;
 	if (ob->type == OB_MESH && ob->data) {
-		Mesh *me = (Mesh*)ob->data;
+		Mesh *me = (Mesh *)ob->data;
 		if (me->flag & ME_TWOSIDED)
 			twoSided = true;
 	}
@@ -334,9 +336,9 @@ void EffectsExporter::operator()(Material *ma, Object *ob)
 }
 
 COLLADASW::ColorOrTexture EffectsExporter::createTexture(Image *ima,
-										std::string& uv_layer_name,
-										COLLADASW::Sampler *sampler
-										/*COLLADASW::Surface *surface*/)
+                                                         std::string& uv_layer_name,
+                                                         COLLADASW::Sampler *sampler
+                                                         /*COLLADASW::Surface *surface*/)
 {
 	
 	COLLADASW::Texture texture(translate_id(id_name(ima)));
diff --git a/source/blender/collada/ErrorHandler.cpp b/source/blender/collada/ErrorHandler.cpp
index 530158ed418..7ac138ac807 100644
--- a/source/blender/collada/ErrorHandler.cpp
+++ b/source/blender/collada/ErrorHandler.cpp
@@ -45,36 +45,36 @@ ErrorHandler::~ErrorHandler()
 }
 
 //--------------------------------------------------------------------
-bool ErrorHandler::handleError( const COLLADASaxFWL::IError* error )
+bool ErrorHandler::handleError(const COLLADASaxFWL::IError *error)
 {
 	mError = true;
 	
-	if ( error->getErrorClass() == COLLADASaxFWL::IError::ERROR_SAXPARSER ) {
-		COLLADASaxFWL::SaxParserError* saxParserError = (COLLADASaxFWL::SaxParserError*) error;
+	if (error->getErrorClass() == COLLADASaxFWL::IError::ERROR_SAXPARSER) {
+		COLLADASaxFWL::SaxParserError *saxParserError = (COLLADASaxFWL::SaxParserError *) error;
 		const GeneratedSaxParser::ParserError& parserError = saxParserError->getError();
 
 		// Workaround to avoid wrong error
-		if ( parserError.getErrorType() == GeneratedSaxParser::ParserError::ERROR_VALIDATION_MIN_OCCURS_UNMATCHED) {
-			if ( strcmp(parserError.getElement(), "effect") == 0 ) {
+		if (parserError.getErrorType() == GeneratedSaxParser::ParserError::ERROR_VALIDATION_MIN_OCCURS_UNMATCHED) {
+			if (strcmp(parserError.getElement(), "effect") == 0) {
 				mError = false;
 			}
 		}
-		if ( parserError.getErrorType() == GeneratedSaxParser::ParserError::ERROR_VALIDATION_SEQUENCE_PREVIOUS_SIBLING_NOT_PRESENT) {
-			if ( !((strcmp(parserError.getElement(), "extra") == 0) &&
-			       (strcmp(parserError.getAdditionalText().c_str(), "sibling: fx_profile_abstract") == 0)))
+		if (parserError.getErrorType() == GeneratedSaxParser::ParserError::ERROR_VALIDATION_SEQUENCE_PREVIOUS_SIBLING_NOT_PRESENT) {
+			if (!((strcmp(parserError.getElement(), "extra") == 0) &&
+			      (strcmp(parserError.getAdditionalText().c_str(), "sibling: fx_profile_abstract") == 0)))
 			{
 				mError = false;
 			}
 		}
 
-		if ( parserError.getErrorType() == GeneratedSaxParser::ParserError::ERROR_COULD_NOT_OPEN_FILE) {
+		if (parserError.getErrorType() == GeneratedSaxParser::ParserError::ERROR_COULD_NOT_OPEN_FILE) {
 			std::cout << "Couldn't open file" << std::endl;
 		}
 
 		std::cout << "Schema validation error: " << parserError.getErrorMessage() << std::endl;
 	}
-	else if ( error->getErrorClass() == COLLADASaxFWL::IError::ERROR_SAXFWL ) {
-		COLLADASaxFWL::SaxFWLError* saxFWLError = (COLLADASaxFWL::SaxFWLError*) error;
+	else if (error->getErrorClass() == COLLADASaxFWL::IError::ERROR_SAXFWL) {
+		COLLADASaxFWL::SaxFWLError *saxFWLError = (COLLADASaxFWL::SaxFWLError *) error;
 		std::cout << "Sax FWL Error: " << saxFWLError->getErrorMessage() << std::endl;
 	}
 	else {
diff --git a/source/blender/collada/ExportSettings.h b/source/blender/collada/ExportSettings.h
index b875282ac33..1b2dfde641b 100644
--- a/source/blender/collada/ExportSettings.h
+++ b/source/blender/collada/ExportSettings.h
@@ -27,14 +27,21 @@
 #ifndef __EXPORTSETTINGS_H__
 #define __EXPORTSETTINGS_H__
 
-struct ExportSettings
-{
- public:
- bool selected;
- bool apply_modifiers;
- bool include_bone_children;
- bool second_life;
- char *filepath;
+#include "collada.h"
+
+struct ExportSettings {
+public:
+	bool apply_modifiers;
+	BC_export_mesh_type export_mesh_type;
+	bool selected;
+	bool include_children;
+	bool include_armatures;
+	bool deform_bones_only;
+	bool use_object_instantiation;
+	bool sort_by_name;
+	bool second_life;
+	char *filepath;
+	LinkNode *export_set;
 };
 
 #endif
diff --git a/source/blender/collada/ExtraHandler.cpp b/source/blender/collada/ExtraHandler.cpp
index 6606fe1a27b..df49b4fe8b4 100644
--- a/source/blender/collada/ExtraHandler.cpp
+++ b/source/blender/collada/ExtraHandler.cpp
@@ -35,9 +35,10 @@ ExtraHandler::ExtraHandler(DocumentImporter *dimp, AnimationImporter *aimp) : cu
 	this->aimp = aimp;
 }
 
-ExtraHandler::~ExtraHandler() {}
+ExtraHandler::~ExtraHandler() {
+}
 
-bool ExtraHandler::elementBegin( const char* elementName, const char** attributes)
+bool ExtraHandler::elementBegin(const char *elementName, const char **attributes)
 {
 	// \todo attribute handling for profile tags
 	currentElement = std::string(elementName);
@@ -45,37 +46,38 @@ bool ExtraHandler::elementBegin( const char* elementName, const char** attribute
 	return true;
 }
 
-bool ExtraHandler::elementEnd(const char* elementName )
+bool ExtraHandler::elementEnd(const char *elementName)
 {
 	return true;
 }
 
-bool ExtraHandler::textData(const char* text, size_t textLength)
+bool ExtraHandler::textData(const char *text, size_t textLength)
 {
 	char buf[1024];
 	
 	if (currentElement.length() == 0 || currentExtraTags == 0) return false;
 	
-	BLI_snprintf(buf, textLength+1, "%s", text);
+	BLI_snprintf(buf, textLength + 1, "%s", text);
 	currentExtraTags->addTag(currentElement, std::string(buf));
 	return true;
 }
 
-bool ExtraHandler::parseElement ( 
-	const char* profileName, 
-	const unsigned long& elementHash, 
-	const COLLADAFW::UniqueId& uniqueId ) {
-		if (BLI_strcaseeq(profileName, "blender")) {
-			//printf("In parseElement for supported profile %s for id %s\n", profileName, uniqueId.toAscii().c_str());
-			currentUid = uniqueId;
-			ExtraTags *et = dimp->getExtraTags(uniqueId);
-			if (!et) {
-				et = new ExtraTags(std::string(profileName));
-				dimp->addExtraTags(uniqueId, et);
-			}
-			currentExtraTags = et;
-			return true;
+bool ExtraHandler::parseElement(
+        const char *profileName,
+        const unsigned long& elementHash,
+        const COLLADAFW::UniqueId& uniqueId)
+{
+	if (BLI_strcaseeq(profileName, "blender")) {
+		//printf("In parseElement for supported profile %s for id %s\n", profileName, uniqueId.toAscii().c_str());
+		currentUid = uniqueId;
+		ExtraTags *et = dimp->getExtraTags(uniqueId);
+		if (!et) {
+			et = new ExtraTags(std::string(profileName));
+			dimp->addExtraTags(uniqueId, et);
 		}
-		//printf("In parseElement for unsupported profile %s for id %s\n", profileName, uniqueId.toAscii().c_str());
-		return false;
+		currentExtraTags = et;
+		return true;
+	}
+	//printf("In parseElement for unsupported profile %s for id %s\n", profileName, uniqueId.toAscii().c_str());
+	return false;
 }
diff --git a/source/blender/collada/ExtraTags.cpp b/source/blender/collada/ExtraTags.cpp
index c5a126894cb..6af61432fda 100644
--- a/source/blender/collada/ExtraTags.cpp
+++ b/source/blender/collada/ExtraTags.cpp
@@ -32,7 +32,7 @@
 
 #include "ExtraTags.h"
 
-ExtraTags::ExtraTags( std::string profile)
+ExtraTags::ExtraTags(std::string profile)
 {
 	this->profile = profile;
 	this->tags = std::map<std::string, std::string>();
@@ -42,19 +42,19 @@ ExtraTags::~ExtraTags()
 {
 }
 
-bool ExtraTags::isProfile( std::string profile)
+bool ExtraTags::isProfile(std::string profile)
 {
 	return this->profile == profile;
 }
 
-bool ExtraTags::addTag( std::string tag,  std::string data)
+bool ExtraTags::addTag(std::string tag,  std::string data)
 {
 	tags[tag] = data;
 	
 	return true;
 }
 
-int ExtraTags::asInt( std::string tag, bool *ok)
+int ExtraTags::asInt(std::string tag, bool *ok)
 {
 	if (tags.find(tag) == tags.end()) {
 		*ok = false;
@@ -64,7 +64,7 @@ int ExtraTags::asInt( std::string tag, bool *ok)
 	return atoi(tags[tag].c_str());
 }
 
-float ExtraTags::asFloat( std::string tag, bool *ok)
+float ExtraTags::asFloat(std::string tag, bool *ok)
 {
 	if (tags.find(tag) == tags.end()) {
 		*ok = false;
@@ -74,7 +74,7 @@ float ExtraTags::asFloat( std::string tag, bool *ok)
 	return (float)atof(tags[tag].c_str());
 }
 
-std::string ExtraTags::asString( std::string tag, bool *ok)
+std::string ExtraTags::asString(std::string tag, bool *ok)
 {
 	if (tags.find(tag) == tags.end()) {
 		*ok = false;
diff --git a/source/blender/collada/GeometryExporter.cpp b/source/blender/collada/GeometryExporter.cpp
index f92ee1a2b79..baa20ab07b7 100644
--- a/source/blender/collada/GeometryExporter.cpp
+++ b/source/blender/collada/GeometryExporter.cpp
@@ -38,7 +38,7 @@
 #include "DNA_meshdata_types.h"
 
 extern "C" {
-    #include "BKE_DerivedMesh.h"
+	#include "BKE_DerivedMesh.h"
 	#include "BKE_main.h"
 	#include "BKE_global.h"
 	#include "BKE_library.h"
@@ -49,9 +49,11 @@ extern "C" {
 #include "BKE_material.h"
 #include "BKE_mesh.h"
 #include "collada_internal.h"
+#include "collada_utils.h"
 
 // TODO: optimize UV sets by making indexed list with duplicates removed
-GeometryExporter::GeometryExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : COLLADASW::LibraryGeometries(sw), export_settings(export_settings) {}
+GeometryExporter::GeometryExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : COLLADASW::LibraryGeometries(sw), export_settings(export_settings) {
+}
 
 
 void GeometryExporter::exportGeom(Scene *sce)
@@ -60,30 +62,11 @@ void GeometryExporter::exportGeom(Scene *sce)
 
 	mScene = sce;
 	GeometryFunctor gf;
-	gf.forEachMeshObjectInScene<GeometryExporter>(sce, *this, this->export_settings->selected);
+	gf.forEachMeshObjectInExportSet<GeometryExporter>(sce, *this, this->export_settings->export_set);
 
 	closeLibrary();
 }
 
-Mesh * GeometryExporter::get_mesh(Object *ob, int apply_modifiers)
-{
-	Mesh *tmpmesh;
-	if (!apply_modifiers)
-	{
-		tmpmesh = (Mesh*)ob->data;
-	}
-	else
-	{
-		CustomDataMask mask = CD_MASK_MESH;
-		DerivedMesh *dm     = mesh_create_derived_view(mScene, ob, mask);
-		tmpmesh             = BKE_mesh_add("ColladaMesh"); // name is not important here
-		DM_to_mesh(dm, tmpmesh, ob);
-		dm->release(dm);
-	}
-	BKE_mesh_tessface_ensure(tmpmesh);
-	return tmpmesh;
-}
-
 void GeometryExporter::operator()(Object *ob)
 {
 	// XXX don't use DerivedMesh, Mesh instead?
@@ -92,16 +75,29 @@ void GeometryExporter::operator()(Object *ob)
 	DerivedMesh *dm = mesh_get_derived_final(mScene, ob, CD_MASK_BAREMESH);
 #endif
 
-	Mesh *me = get_mesh(ob, this->export_settings->apply_modifiers);
+	bool use_instantiation = this->export_settings->use_object_instantiation;
+	Mesh *me;
+	if (this->export_settings->apply_modifiers) {
+		me = bc_to_mesh_apply_modifiers(mScene, ob, this->export_settings->export_mesh_type);
+	} 
+	else {
+		me = (Mesh *)ob->data;
+	}
+	BKE_mesh_tessface_ensure(me);
 
-	std::string geom_id = get_geometry_id(ob);
-	std::string geom_name = id_name(ob->data);
+	std::string geom_id = get_geometry_id(ob, use_instantiation);
 	std::vector<Normal> nor;
 	std::vector<Face> norind;
 
 	// Skip if linked geometry was already exported from another reference
-	if (exportedGeometry.find(geom_id) != exportedGeometry.end())
+	if (use_instantiation && 
+	    exportedGeometry.find(geom_id) != exportedGeometry.end())
+	{
 		return;
+	}
+
+	std::string geom_name = (use_instantiation) ? id_name(ob->data) : id_name(ob);
+
 	exportedGeometry.insert(geom_id);
 
 	bool has_color = (bool)CustomData_has_layer(&me->fdata, CD_MCOL);
@@ -139,7 +135,7 @@ void GeometryExporter::operator()(Object *ob)
 
 	// XXX slow		
 	if (ob->totcol) {
-		for (int a = 0; a < ob->totcol; a++)	{
+		for (int a = 0; a < ob->totcol; a++)    {
 			createPolylist(a, has_uvs, has_color, ob, me, geom_id, norind);
 		}
 	}
@@ -168,9 +164,9 @@ void GeometryExporter::operator()(Object *ob)
 
 
 void GeometryExporter::createLooseEdgeList(Object *ob,
-					     Mesh   *me,
-					     std::string& geom_id,
-					     std::vector<Face>& norind)
+                                           Mesh   *me,
+                                           std::string& geom_id,
+                                           std::vector<Face>& norind)
 {
 
 	MEdge *medges = me->medge;
@@ -211,8 +207,8 @@ void GeometryExporter::createLooseEdgeList(Object *ob,
 
 		for (index = 0; index < edges_in_linelist; index++) 
 		{
-			lines.appendValues(edge_list[2*index+1]);
-			lines.appendValues(edge_list[2*index]);
+			lines.appendValues(edge_list[2 * index + 1]);
+			lines.appendValues(edge_list[2 * index]);
 		}
 		lines.finish();
 	}
@@ -221,12 +217,12 @@ void GeometryExporter::createLooseEdgeList(Object *ob,
 
 // powerful because it handles both cases when there is material and when there's not
 void GeometryExporter::createPolylist(short material_index,
-					bool has_uvs,
-					bool has_color,
-					Object *ob,
-					Mesh *me,
-					std::string& geom_id,
-					std::vector<Face>& norind)
+                                      bool has_uvs,
+                                      bool has_color,
+                                      Object *ob,
+                                      Mesh *me,
+                                      std::string& geom_id,
+                                      std::vector<Face>& norind)
 {
 	MFace *mfaces = me->mface;
 	int totfaces = me->totface;
@@ -287,10 +283,10 @@ void GeometryExporter::createPolylist(short material_index,
 	for (i = 0; i < num_layers; i++) {
 		// char *name = CustomData_get_layer_name(&me->fdata, CD_MTFACE, i);
 		COLLADASW::Input input3(COLLADASW::InputSemantic::TEXCOORD,
-								makeUrl(makeTexcoordSourceId(geom_id, i)),
-								2, // offset always 2, this is only until we have optimized UV sets
-								i  // set number equals UV map index
-								);
+		                        makeUrl(makeTexcoordSourceId(geom_id, i)),
+		                        2, // offset always 2, this is only until we have optimized UV sets
+		                        i  // set number equals UV map index
+		                        );
 		til.push_back(input3);
 	}
 
@@ -349,7 +345,7 @@ void GeometryExporter::createVertsSource(std::string geom_id, Mesh *me)
 	COLLADASW::FloatSourceF source(mSW);
 	source.setId(getIdBySemantics(geom_id, COLLADASW::InputSemantic::POSITION));
 	source.setArrayId(getIdBySemantics(geom_id, COLLADASW::InputSemantic::POSITION) +
-					  ARRAY_ID_SUFFIX);
+	                  ARRAY_ID_SUFFIX);
 	source.setAccessorCount(totverts);
 	source.setAccessorStride(3);
 	COLLADASW::SourceBase::ParameterNameList &param = source.getParameterNameList();
@@ -357,7 +353,7 @@ void GeometryExporter::createVertsSource(std::string geom_id, Mesh *me)
 	param.push_back("Y");
 	param.push_back("Z");
 	/*main function, it creates <source id = "">, <float_array id = ""
-	  count = ""> */
+	   count = ""> */
 	source.prepareToAppendValues();
 	//appends data to <float_array>
 	int i = 0;
@@ -395,7 +391,7 @@ void GeometryExporter::createVertexColorSource(std::string geom_id, Mesh *me)
 
 	int index = CustomData_get_active_layer_index(&me->fdata, CD_MCOL);
 
-	MCol *mcol = (MCol*)me->fdata.layers[index].data;
+	MCol *mcol = (MCol *)me->fdata.layers[index].data;
 	MCol *c = mcol;
 
 	for (i = 0, f = me->mface; i < me->totface; i++, c += 4, f++)
@@ -429,10 +425,10 @@ void GeometryExporter::createTexcoordsSource(std::string geom_id, Mesh *me)
 	for (i = 0; i < totfaces; i++) {
 		MFace *f = &mfaces[i];
 		if (f->v4 == 0) {
-			totuv+=3;
+			totuv += 3;
 		}
 		else {
-			totuv+=4;
+			totuv += 4;
 		}
 	}
 
@@ -441,7 +437,7 @@ void GeometryExporter::createTexcoordsSource(std::string geom_id, Mesh *me)
 	// write <source> for each layer
 	// each <source> will get id like meshName + "map-channel-1"
 	for (int a = 0; a < num_layers; a++) {
-		MTFace *tface = (MTFace*)CustomData_get_layer_n(&me->fdata, CD_MTFACE, a);
+		MTFace *tface = (MTFace *)CustomData_get_layer_n(&me->fdata, CD_MTFACE, a);
 		// char *name = CustomData_get_layer_name(&me->fdata, CD_MTFACE, a);
 		
 		COLLADASW::FloatSourceF source(mSW);
@@ -462,7 +458,7 @@ void GeometryExporter::createTexcoordsSource(std::string geom_id, Mesh *me)
 			
 			for (int j = 0; j < (f->v4 == 0 ? 3 : 4); j++) {
 				source.appendValues(tface[i].uv[j][0],
-									tface[i].uv[j][1]);
+				                    tface[i].uv[j][1]);
 			}
 		}
 		
@@ -482,7 +478,7 @@ void GeometryExporter::createNormalsSource(std::string geom_id, Mesh *me, std::v
 	COLLADASW::FloatSourceF source(mSW);
 	source.setId(getIdBySemantics(geom_id, COLLADASW::InputSemantic::NORMAL));
 	source.setArrayId(getIdBySemantics(geom_id, COLLADASW::InputSemantic::NORMAL) +
-					  ARRAY_ID_SUFFIX);
+	                  ARRAY_ID_SUFFIX);
 	source.setAccessorCount((unsigned long)nor.size());
 	source.setAccessorStride(3);
 	COLLADASW::SourceBase::ParameterNameList &param = source.getParameterNameList();
@@ -570,8 +566,9 @@ COLLADASW::URI GeometryExporter::makeUrl(std::string id)
 	return COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, id);
 }
 
-
-/* int GeometryExporter::getTriCount(MFace *faces, int totface) {
+#if 0
+int GeometryExporter::getTriCount(MFace *faces, int totface)
+{
 	int i;
 	int tris = 0;
 	for (i = 0; i < totface; i++) {
@@ -583,4 +580,5 @@ COLLADASW::URI GeometryExporter::makeUrl(std::string id)
 	}
 
 	return tris;
-	}*/
+}
+#endif
diff --git a/source/blender/collada/GeometryExporter.h b/source/blender/collada/GeometryExporter.h
index aae095e819e..f14775b9f44 100644
--- a/source/blender/collada/GeometryExporter.h
+++ b/source/blender/collada/GeometryExporter.h
@@ -42,6 +42,8 @@
 
 #include "ExportSettings.h"
 
+extern Object *bc_get_highest_selected_ancestor_or_self(Object *ob);
+
 // TODO: optimize UV sets by making indexed list with duplicates removed
 class GeometryExporter : COLLADASW::LibraryGeometries
 {
@@ -105,28 +107,22 @@ private:
 	
 	const ExportSettings *export_settings;
 
-	Mesh * get_mesh(Object *ob, int apply_modifiers);
+	Mesh * get_mesh(Scene *sce, Object *ob, int apply_modifiers);
 };
 
 struct GeometryFunctor {
 	// f should have
 	// void operator()(Object* ob)
 	template<class Functor>
-	void forEachMeshObjectInScene(Scene *sce, Functor &f, bool export_selected)
+	void forEachMeshObjectInExportSet(Scene *sce, Functor &f, LinkNode *export_set)
 	{
-		
-		Base *base= (Base*) sce->base.first;
-		while (base) {
-			Object *ob = base->object;
-			
-			if (ob->type == OB_MESH && ob->data &&
-			    !(export_selected && !(ob->flag & SELECT)) &&
-			    ((sce->lay & ob->lay)!=0))
+		LinkNode *node;
+		for (node=export_set; node; node = node->next) {
+			Object *ob = (Object *)node->link;
+			if (ob->type == OB_MESH)
 			{
 				f(ob);
 			}
-			base= base->next;
-			
 		}
 	}
 };
diff --git a/source/blender/collada/ImageExporter.cpp b/source/blender/collada/ImageExporter.cpp
index 4d7c56ab419..c777a7d1fab 100644
--- a/source/blender/collada/ImageExporter.cpp
+++ b/source/blender/collada/ImageExporter.cpp
@@ -42,17 +42,18 @@
 #include "BLI_string.h"
 
 ImagesExporter::ImagesExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : COLLADASW::LibraryImages(sw), export_settings(export_settings)
-{}
+{
+}
 
 bool ImagesExporter::hasImages(Scene *sce)
 {
-	Base *base = (Base *)sce->base.first;
+	LinkNode *node;
 	
-	while (base) {
-		Object *ob= base->object;
+	for (node=this->export_settings->export_set; node; node=node->next) {
+		Object *ob = (Object *)node->link;
 		int a;
 		for (a = 0; a < ob->totcol; a++) {
-			Material *ma = give_current_material(ob, a+1);
+			Material *ma = give_current_material(ob, a + 1);
 
 			// no material, but check all of the slots
 			if (!ma) continue;
@@ -63,7 +64,6 @@ bool ImagesExporter::hasImages(Scene *sce)
 			}
 
 		}
-		base= base->next;
 	}
 	return false;
 }
@@ -73,7 +73,7 @@ void ImagesExporter::exportImages(Scene *sce)
 	if (hasImages(sce)) {
 		openLibrary();
 		MaterialFunctor mf;
-		mf.forEachMaterialInScene<ImagesExporter>(sce, *this, this->export_settings->selected);
+		mf.forEachMaterialInExportSet<ImagesExporter>(sce, *this, this->export_settings->export_set);
 
 		closeLibrary();
 	}
diff --git a/source/blender/collada/InstanceWriter.cpp b/source/blender/collada/InstanceWriter.cpp
index f83289ff5f5..788bd2a98b7 100644
--- a/source/blender/collada/InstanceWriter.cpp
+++ b/source/blender/collada/InstanceWriter.cpp
@@ -43,8 +43,8 @@
 
 void InstanceWriter::add_material_bindings(COLLADASW::BindMaterial& bind_material, Object *ob)
 {
-	for (int a = 0; a < ob->totcol; a++)	{
-		Material *ma = give_current_material(ob, a+1);
+	for (int a = 0; a < ob->totcol; a++) {
+		Material *ma = give_current_material(ob, a + 1);
 			
 		COLLADASW::InstanceMaterialList& iml = bind_material.getInstanceMaterialList();
 
@@ -56,7 +56,7 @@ void InstanceWriter::add_material_bindings(COLLADASW::BindMaterial& bind_materia
 			COLLADASW::InstanceMaterial im(ostr.str(), COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, matid));
 			
 			// create <bind_vertex_input> for each uv map
-			Mesh *me = (Mesh*)ob->data;
+			Mesh *me = (Mesh *)ob->data;
 			int totlayer = CustomData_number_of_layers(&me->fdata, CD_MTFACE);
 			
 			for (int b = 0; b < totlayer; b++) {
diff --git a/source/blender/collada/LightExporter.cpp b/source/blender/collada/LightExporter.cpp
index 6d276cd782f..af13d61a368 100644
--- a/source/blender/collada/LightExporter.cpp
+++ b/source/blender/collada/LightExporter.cpp
@@ -36,33 +36,33 @@
 #include "collada_internal.h"
 
 template<class Functor>
-void forEachLampObjectInScene(Scene *sce, Functor &f, bool export_selected)
+void forEachLampObjectInExportSet(Scene *sce, Functor &f, LinkNode *export_set)
 {
-	Base *base= (Base*) sce->base.first;
-	while (base) {
-		Object *ob = base->object;
+	LinkNode *node;
+	for (node = export_set; node; node = node->next) {
+		Object *ob = (Object *)node->link;
 
-		if (ob->type == OB_LAMP && ob->data && !(export_selected && !(ob->flag & SELECT))) {
+		if (ob->type == OB_LAMP && ob->data) {
 			f(ob);
 		}
-		base= base->next;
 	}
 }
 
-LightsExporter::LightsExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings): COLLADASW::LibraryLights(sw), export_settings(export_settings) {}
+LightsExporter::LightsExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : COLLADASW::LibraryLights(sw), export_settings(export_settings) {
+}
 
 void LightsExporter::exportLights(Scene *sce)
 {
 	openLibrary();
 	
-	forEachLampObjectInScene(sce, *this, this->export_settings->selected);
+	forEachLampObjectInExportSet(sce, *this, this->export_settings->export_set);
 	
 	closeLibrary();
 }
 
 void LightsExporter::operator()(Object *ob)
 {
-	Lamp *la = (Lamp*)ob->data;
+	Lamp *la = (Lamp *)ob->data;
 	std::string la_id(get_light_id(ob));
 	std::string la_name(id_name(la));
 	COLLADASW::Color col(la->r * la->energy, la->g * la->energy, la->b * la->energy);
@@ -72,7 +72,7 @@ void LightsExporter::operator()(Object *ob)
 	
 	constatt = 1.0f;
 	
-	if (la->falloff_type==LA_FALLOFF_INVLINEAR) {
+	if (la->falloff_type == LA_FALLOFF_INVLINEAR) {
 		linatt = 1.0f / d;
 		quadatt = 0.0f;
 	}
diff --git a/source/blender/collada/MaterialExporter.cpp b/source/blender/collada/MaterialExporter.cpp
index 48fa5b690be..ef22a76d28e 100644
--- a/source/blender/collada/MaterialExporter.cpp
+++ b/source/blender/collada/MaterialExporter.cpp
@@ -31,7 +31,8 @@
 #include "COLLADABUUtils.h"
 #include "collada_internal.h"
 
-MaterialsExporter::MaterialsExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings): COLLADASW::LibraryMaterials(sw), export_settings(export_settings) {}
+MaterialsExporter::MaterialsExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : COLLADASW::LibraryMaterials(sw), export_settings(export_settings) {
+}
 
 void MaterialsExporter::exportMaterials(Scene *sce)
 {
@@ -39,29 +40,26 @@ void MaterialsExporter::exportMaterials(Scene *sce)
 		openLibrary();
 
 		MaterialFunctor mf;
-		mf.forEachMaterialInScene<MaterialsExporter>(sce, *this, this->export_settings->selected);
+		mf.forEachMaterialInExportSet<MaterialsExporter>(sce, *this, this->export_settings->export_set);
 
 		closeLibrary();
 	}
 }
 
-
 bool MaterialsExporter::hasMaterials(Scene *sce)
 {
-	Base *base = (Base *)sce->base.first;
-	
-	while (base) {
-		Object *ob= base->object;
+	LinkNode *node;
+	for(node=this->export_settings->export_set; node; node = node->next) {
+		Object *ob = (Object *)node->link;
 		int a;
 		for (a = 0; a < ob->totcol; a++) {
-			Material *ma = give_current_material(ob, a+1);
+			Material *ma = give_current_material(ob, a + 1);
 
 			// no material, but check all of the slots
 			if (!ma) continue;
 
 			return true;
 		}
-		base= base->next;
 	}
 	return false;
 }
diff --git a/source/blender/collada/MaterialExporter.h b/source/blender/collada/MaterialExporter.h
index 4a5422184d4..f65c8849c84 100644
--- a/source/blender/collada/MaterialExporter.h
+++ b/source/blender/collada/MaterialExporter.h
@@ -89,11 +89,11 @@ struct MaterialFunctor {
 	// f should have
 	// void operator()(Material* ma)
 	template<class Functor>
-	void forEachMaterialInScene(Scene *sce, Functor &f, bool export_selected)
+	void forEachMaterialInExportSet(Scene *sce, Functor &f, LinkNode *export_set)
 	{
 		ForEachMaterialFunctor<Functor> matfunc(&f);
 		GeometryFunctor gf;
-		gf.forEachMeshObjectInScene<ForEachMaterialFunctor<Functor> >(sce, matfunc, export_selected);
+		gf.forEachMeshObjectInExportSet<ForEachMaterialFunctor<Functor> >(sce, matfunc, export_set);
 	}
 };
 
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp
index bcfec7a8056..59927e961bf 100644
--- a/source/blender/collada/MeshImporter.cpp
+++ b/source/blender/collada/MeshImporter.cpp
@@ -72,24 +72,24 @@ static const char *bc_get_dae_name(T *node)
 static const char *bc_primTypeToStr(COLLADAFW::MeshPrimitive::PrimitiveType type)
 {
 	switch (type) {
-	case COLLADAFW::MeshPrimitive::LINES:
-		return "LINES";
-	case COLLADAFW::MeshPrimitive::LINE_STRIPS:
-		return "LINESTRIPS";
-	case COLLADAFW::MeshPrimitive::POLYGONS:
-		return "POLYGONS";
-	case COLLADAFW::MeshPrimitive::POLYLIST:
-		return "POLYLIST";
-	case COLLADAFW::MeshPrimitive::TRIANGLES:
-		return "TRIANGLES";
-	case COLLADAFW::MeshPrimitive::TRIANGLE_FANS:
-		return "TRIANGLE_FANS";
-	case COLLADAFW::MeshPrimitive::TRIANGLE_STRIPS:
-		return "TRIANGLE_FANS";
-	case COLLADAFW::MeshPrimitive::POINTS:
-		return "POINTS";
-	case COLLADAFW::MeshPrimitive::UNDEFINED_PRIMITIVE_TYPE:
-		return "UNDEFINED_PRIMITIVE_TYPE";
+		case COLLADAFW::MeshPrimitive::LINES:
+			return "LINES";
+		case COLLADAFW::MeshPrimitive::LINE_STRIPS:
+			return "LINESTRIPS";
+		case COLLADAFW::MeshPrimitive::POLYGONS:
+			return "POLYGONS";
+		case COLLADAFW::MeshPrimitive::POLYLIST:
+			return "POLYLIST";
+		case COLLADAFW::MeshPrimitive::TRIANGLES:
+			return "TRIANGLES";
+		case COLLADAFW::MeshPrimitive::TRIANGLE_FANS:
+			return "TRIANGLE_FANS";
+		case COLLADAFW::MeshPrimitive::TRIANGLE_STRIPS:
+			return "TRIANGLE_FANS";
+		case COLLADAFW::MeshPrimitive::POINTS:
+			return "POINTS";
+		case COLLADAFW::MeshPrimitive::UNDEFINED_PRIMITIVE_TYPE:
+			return "UNDEFINED_PRIMITIVE_TYPE";
 	}
 	return "UNKNOWN";
 }
@@ -97,43 +97,44 @@ static const char *bc_primTypeToStr(COLLADAFW::MeshPrimitive::PrimitiveType type
 static const char *bc_geomTypeToStr(COLLADAFW::Geometry::GeometryType type)
 {
 	switch (type) {
-	case COLLADAFW::Geometry::GEO_TYPE_MESH:
-		return "MESH";
-	case COLLADAFW::Geometry::GEO_TYPE_SPLINE:
-		return "SPLINE";
-	case COLLADAFW::Geometry::GEO_TYPE_CONVEX_MESH:
-		return "CONVEX_MESH";
-	case COLLADAFW::Geometry::GEO_TYPE_UNKNOWN:
-	default:
-		return "UNKNOWN";
+		case COLLADAFW::Geometry::GEO_TYPE_MESH:
+			return "MESH";
+		case COLLADAFW::Geometry::GEO_TYPE_SPLINE:
+			return "SPLINE";
+		case COLLADAFW::Geometry::GEO_TYPE_CONVEX_MESH:
+			return "CONVEX_MESH";
+		case COLLADAFW::Geometry::GEO_TYPE_UNKNOWN:
+		default:
+			return "UNKNOWN";
 	}
 }
 
 
 UVDataWrapper::UVDataWrapper(COLLADAFW::MeshVertexData& vdata) : mVData(&vdata)
-{}
+{
+}
 
 #ifdef COLLADA_DEBUG
 void WVDataWrapper::print()
 {
 	fprintf(stderr, "UVs:\n");
 	switch (mVData->getType()) {
-	case COLLADAFW::MeshVertexData::DATA_TYPE_FLOAT:
+		case COLLADAFW::MeshVertexData::DATA_TYPE_FLOAT:
 		{
-			COLLADAFW::ArrayPrimitiveType<float>* values = mVData->getFloatValues();
+			COLLADAFW::ArrayPrimitiveType<float> *values = mVData->getFloatValues();
 			if (values->getCount()) {
 				for (int i = 0; i < values->getCount(); i += 2) {
-					fprintf(stderr, "%.1f, %.1f\n", (*values)[i], (*values)[i+1]);
+					fprintf(stderr, "%.1f, %.1f\n", (*values)[i], (*values)[i + 1]);
 				}
 			}
 		}
 		break;
-	case COLLADAFW::MeshVertexData::DATA_TYPE_DOUBLE:
+		case COLLADAFW::MeshVertexData::DATA_TYPE_DOUBLE:
 		{
-			COLLADAFW::ArrayPrimitiveType<double>* values = mVData->getDoubleValues();
+			COLLADAFW::ArrayPrimitiveType<double> *values = mVData->getDoubleValues();
 			if (values->getCount()) {
 				for (int i = 0; i < values->getCount(); i += 2) {
-					fprintf(stderr, "%.1f, %.1f\n", (float)(*values)[i], (float)(*values)[i+1]);
+					fprintf(stderr, "%.1f, %.1f\n", (float)(*values)[i], (float)(*values)[i + 1]);
 				}
 			}
 		}
@@ -146,30 +147,30 @@ void WVDataWrapper::print()
 void UVDataWrapper::getUV(int uv_index, float *uv)
 {
 	int stride = mVData->getStride(0);
-	if (stride==0) stride = 2;
+	if (stride == 0) stride = 2;
 
 	switch (mVData->getType()) {
-	case COLLADAFW::MeshVertexData::DATA_TYPE_FLOAT:
+		case COLLADAFW::MeshVertexData::DATA_TYPE_FLOAT:
 		{
-			COLLADAFW::ArrayPrimitiveType<float>* values = mVData->getFloatValues();
+			COLLADAFW::ArrayPrimitiveType<float> *values = mVData->getFloatValues();
 			if (values->empty()) return;
-			uv[0] = (*values)[uv_index*stride];
-			uv[1] = (*values)[uv_index*stride + 1];
+			uv[0] = (*values)[uv_index * stride];
+			uv[1] = (*values)[uv_index * stride + 1];
 			
 		}
 		break;
-	case COLLADAFW::MeshVertexData::DATA_TYPE_DOUBLE:
+		case COLLADAFW::MeshVertexData::DATA_TYPE_DOUBLE:
 		{
-			COLLADAFW::ArrayPrimitiveType<double>* values = mVData->getDoubleValues();
+			COLLADAFW::ArrayPrimitiveType<double> *values = mVData->getDoubleValues();
 			if (values->empty()) return;
-			uv[0] = (float)(*values)[uv_index*stride];
-			uv[1] = (float)(*values)[uv_index*stride + 1];
+			uv[0] = (float)(*values)[uv_index * stride];
+			uv[1] = (float)(*values)[uv_index * stride + 1];
 			
 		}
 		break;
-	case COLLADAFW::MeshVertexData::DATA_TYPE_UNKNOWN:
-	default:
-		fprintf(stderr, "MeshImporter.getUV(): unknown data type\n");
+		case COLLADAFW::MeshVertexData::DATA_TYPE_UNKNOWN:
+		default:
+			fprintf(stderr, "MeshImporter.getUV(): unknown data type\n");
 	}
 }
 
@@ -198,7 +199,7 @@ void MeshImporter::rotate_face_indices(MFace *mface)
 #endif
 
 void MeshImporter::set_face_uv(MTFace *mtface, UVDataWrapper &uvs,
-				 COLLADAFW::IndexList& index_list, unsigned int *tris_indices)
+                               COLLADAFW::IndexList& index_list, unsigned int *tris_indices)
 {
 	// per face vertex indices, this means for quad we have 4 indices, not 8
 	COLLADAFW::UIntValuesArray& indices = index_list.getIndices();
@@ -209,7 +210,7 @@ void MeshImporter::set_face_uv(MTFace *mtface, UVDataWrapper &uvs,
 }
 
 void MeshImporter::set_face_uv(MTFace *mtface, UVDataWrapper &uvs,
-				COLLADAFW::IndexList& index_list, int index, bool quad)
+                               COLLADAFW::IndexList& index_list, int index, bool quad)
 {
 	// per face vertex indices, this means for quad we have 4 indices, not 8
 	COLLADAFW::UIntValuesArray& indices = index_list.getIndices();
@@ -223,31 +224,31 @@ void MeshImporter::set_face_uv(MTFace *mtface, UVDataWrapper &uvs,
 #ifdef COLLADA_DEBUG
 	if (quad) {
 		fprintf(stderr, "face uv:\n"
-				"((%d, %d, %d, %d))\n"
-				"((%.1f, %.1f), (%.1f, %.1f), (%.1f, %.1f), (%.1f, %.1f))\n",
-
-				indices[index + 0],
-				indices[index + 1],
-				indices[index + 2],
-				indices[index + 3],
-
-				mtface->uv[0][0], mtface->uv[0][1],
-				mtface->uv[1][0], mtface->uv[1][1],
-				mtface->uv[2][0], mtface->uv[2][1],
-				mtface->uv[3][0], mtface->uv[3][1]);
+		        "((%d, %d, %d, %d))\n"
+		        "((%.1f, %.1f), (%.1f, %.1f), (%.1f, %.1f), (%.1f, %.1f))\n",
+
+		        indices[index + 0],
+		        indices[index + 1],
+		        indices[index + 2],
+		        indices[index + 3],
+
+		        mtface->uv[0][0], mtface->uv[0][1],
+		        mtface->uv[1][0], mtface->uv[1][1],
+		        mtface->uv[2][0], mtface->uv[2][1],
+		        mtface->uv[3][0], mtface->uv[3][1]);
 	}
 	else {
 		fprintf(stderr, "face uv:\n"
-				"((%d, %d, %d))\n"
-				"((%.1f, %.1f), (%.1f, %.1f), (%.1f, %.1f))\n",
+		        "((%d, %d, %d))\n"
+		        "((%.1f, %.1f), (%.1f, %.1f), (%.1f, %.1f))\n",
 
-				indices[index + 0],
-				indices[index + 1],
-				indices[index + 2],
+		        indices[index + 0],
+		        indices[index + 1],
+		        indices[index + 2],
 
-				mtface->uv[0][0], mtface->uv[0][1],
-				mtface->uv[1][0], mtface->uv[1][1],
-				mtface->uv[2][0], mtface->uv[2][1]);
+		        mtface->uv[0][0], mtface->uv[0][1],
+		        mtface->uv[1][0], mtface->uv[1][1],
+		        mtface->uv[2][0], mtface->uv[2][1]);
 	}
 #endif
 }
@@ -263,7 +264,7 @@ void MeshImporter::print_index_list(COLLADAFW::IndexList& index_list)
 }
 #endif
 
-bool MeshImporter::is_nice_mesh(COLLADAFW::Mesh *mesh)	// checks if mesh has supported primitive types: lines, polylist, triangles, triangle_fans
+bool MeshImporter::is_nice_mesh(COLLADAFW::Mesh *mesh)  // checks if mesh has supported primitive types: lines, polylist, triangles, triangle_fans
 {
 	COLLADAFW::MeshPrimitiveArray& prim_arr = mesh->getMeshPrimitives();
 
@@ -279,26 +280,26 @@ bool MeshImporter::is_nice_mesh(COLLADAFW::Mesh *mesh)	// checks if mesh has sup
 		// OpenCollada passes POLYGONS type for <polylist>
 		if (type == COLLADAFW::MeshPrimitive::POLYLIST || type == COLLADAFW::MeshPrimitive::POLYGONS) {
 
-			COLLADAFW::Polygons *mpvc = (COLLADAFW::Polygons*)mp;
+			COLLADAFW::Polygons *mpvc = (COLLADAFW::Polygons *)mp;
 			COLLADAFW::Polygons::VertexCountArray& vca = mpvc->getGroupedVerticesVertexCountArray();
 			
 			for (unsigned int j = 0; j < vca.getCount(); j++) {
 				int count = vca[j];
 				if (count < 3) {
 					fprintf(stderr, "Primitive %s in %s has at least one face with vertex count < 3\n",
-							type_str, name);
+					        type_str, name);
 					return false;
 				}
 			}
 				
 		}
 
-		else if ( type == COLLADAFW::MeshPrimitive::LINES )
+		else if (type == COLLADAFW::MeshPrimitive::LINES)
 		{
 			// TODO: Add Checker for line syntax here
 		}
 
-		else if (type != COLLADAFW::MeshPrimitive::TRIANGLES && type!= COLLADAFW::MeshPrimitive::TRIANGLE_FANS) {
+		else if (type != COLLADAFW::MeshPrimitive::TRIANGLES && type != COLLADAFW::MeshPrimitive::TRIANGLE_FANS) {
 			fprintf(stderr, "Primitive type %s is not supported.\n", type_str);
 			return false;
 		}
@@ -317,10 +318,10 @@ void MeshImporter::read_vertices(COLLADAFW::Mesh *mesh, Mesh *me)
 	// vertices
 	COLLADAFW::MeshVertexData& pos = mesh->getPositions();
 	int stride = pos.getStride(0);
-	if (stride==0) stride = 3;
+	if (stride == 0) stride = 3;
 	
 	me->totvert = mesh->getPositions().getFloatValues()->getCount() / stride;
-	me->mvert = (MVert*)CustomData_add_layer(&me->vdata, CD_MVERT, CD_CALLOC, NULL, me->totvert);
+	me->mvert = (MVert *)CustomData_add_layer(&me->vdata, CD_MVERT, CD_CALLOC, NULL, me->totvert);
 
 	MVert *mvert;
 	int i;
@@ -339,12 +340,12 @@ int MeshImporter::triangulate_poly(unsigned int *indices, int totvert, MVert *ve
 	
 	dispbase.first = dispbase.last = NULL;
 	
-	dl = (DispList*)MEM_callocN(sizeof(DispList), "poly disp");
+	dl = (DispList *)MEM_callocN(sizeof(DispList), "poly disp");
 	dl->nr = totvert;
 	dl->type = DL_POLY;
 	dl->parts = 1;
-	dl->verts = vert = (float*)MEM_callocN(totvert * 3 * sizeof(float), "poly verts");
-	dl->index = (int*)MEM_callocN(sizeof(int) * 3 * totvert, "dl index");
+	dl->verts = vert = (float *)MEM_callocN(totvert * 3 * sizeof(float), "poly verts");
+	dl->index = (int *)MEM_callocN(sizeof(int) * 3 * totvert, "dl index");
 
 	BLI_addtail(&dispbase, dl);
 	
@@ -356,14 +357,14 @@ int MeshImporter::triangulate_poly(unsigned int *indices, int totvert, MVert *ve
 	BKE_displist_fill(&dispbase, &dispbase, 0);
 
 	int tottri = 0;
-	dl= (DispList*)dispbase.first;
+	dl = (DispList *)dispbase.first;
 
 	if (dl->type == DL_INDEX3) {
 		tottri = dl->parts;
 
 		int *index = dl->index;
-		for (i= 0; i < tottri; i++) {
-			int t[3]= {*index, *(index + 1), *(index + 2)};
+		for (i = 0; i < tottri; i++) {
+			int t[3] = {*index, *(index + 1), *(index + 2)};
 
 			std::sort(t, t + 3);
 
@@ -394,9 +395,9 @@ int MeshImporter::count_new_tris(COLLADAFW::Mesh *mesh, Mesh *me)
 		unsigned int *indices = mp->getPositionIndices().getData();
 		
 		if (type == COLLADAFW::MeshPrimitive::POLYLIST ||
-			type == COLLADAFW::MeshPrimitive::POLYGONS) {
-			
-			COLLADAFW::Polygons *mpvc =	(COLLADAFW::Polygons*)mp;
+		    type == COLLADAFW::MeshPrimitive::POLYGONS)
+		{
+			COLLADAFW::Polygons *mpvc = (COLLADAFW::Polygons *)mp;
 			COLLADAFW::Polygons::VertexCountArray& vcounta = mpvc->getGroupedVerticesVertexCountArray();
 			
 			for (unsigned int j = 0; j < prim_totface; j++) {
@@ -433,8 +434,8 @@ bool MeshImporter::primitive_has_useable_normals(COLLADAFW::MeshPrimitive *mp) {
 			has_useable_normals = true;
 		else {
 			fprintf(stderr,
-				"Warning: Number of normals %d is different from the number of vertices %d, skipping normals\n",
-				normals_count, index_count );	
+			        "Warning: Number of normals %d is different from the number of vertices %d, skipping normals\n",
+			        normals_count, index_count);
 		}
 	}
 
@@ -496,7 +497,7 @@ void MeshImporter::allocate_face_data(COLLADAFW::Mesh *mesh, Mesh *me, int new_t
 	// allocate space for faces
 	if (total_facecount > 0) {
 		me->totface = total_facecount + new_tris;
-		me->mface   = (MFace*)CustomData_add_layer(&me->fdata, CD_MFACE, CD_CALLOC, NULL, me->totface);
+		me->mface   = (MFace *)CustomData_add_layer(&me->fdata, CD_MFACE, CD_CALLOC, NULL, me->totface);
 	}
 }
 
@@ -566,7 +567,7 @@ void MeshImporter::mesh_add_edges(Mesh *mesh, int len)
 void MeshImporter::read_lines(COLLADAFW::Mesh *mesh, Mesh *me)
 {
 	unsigned int loose_edge_count = get_loose_edge_count(mesh);
-	if(loose_edge_count > 0) {
+	if (loose_edge_count > 0) {
 
 		unsigned int face_edge_count  = me->totedge;
 		unsigned int total_edge_count = loose_edge_count + face_edge_count;
@@ -587,11 +588,11 @@ void MeshImporter::read_lines(COLLADAFW::Mesh *mesh, Mesh *me)
 				unsigned int *indices    = mp->getPositionIndices().getData();
 				
 				for (int i = 0; i < edge_count; i++, med++) {
-					med->bweight= 0;
-					med->crease = 0;
-					med->flag   = 0;
-					med->v1     = indices[ 2*i ];
-					med->v2     = indices[ 2*i + 1];
+					med->bweight = 0;
+					med->crease  = 0;
+					med->flag    = 0;
+					med->v1      = indices[2 * i];
+					med->v2      = indices[2 * i + 1];
 				}
 			}
 		}
@@ -630,7 +631,7 @@ void MeshImporter::read_faces(COLLADAFW::Mesh *mesh, Mesh *me, int new_tris) //T
 	}
 
 	// activate the first uv map
-	if (totuvset) me->mtface = (MTFace*)CustomData_get_layer_n(&me->fdata, CD_MTFACE, 0);
+	if (totuvset) me->mtface = (MTFace *)CustomData_get_layer_n(&me->fdata, CD_MTFACE, 0);
 
 	UVDataWrapper uvs(mesh->getUVCoords());
 
@@ -669,11 +670,11 @@ void MeshImporter::read_faces(COLLADAFW::Mesh *mesh, Mesh *me, int new_tris) //T
 
 #ifdef COLLADA_DEBUG
 		/*
-		fprintf(stderr, "Primitive %d:\n", i);
-		for (unsigned int j = 0; j < totuvset; j++) {
-			print_index_list(*index_list_array[j]);
-		}
-		*/
+		   fprintf(stderr, "Primitive %d:\n", i);
+		   for (unsigned int j = 0; j < totuvset; j++) {
+		    print_index_list(*index_list_array[j]);
+		   }
+		 */
 #endif
 		
 		if (type == COLLADAFW::MeshPrimitive::TRIANGLES) {
@@ -686,14 +687,14 @@ void MeshImporter::read_faces(COLLADAFW::Mesh *mesh, Mesh *me, int new_tris) //T
 				for (unsigned int k = 0; k < totuvset; k++) {
 					if (!index_list_array.empty() && index_list_array[k]) {
 						// get mtface by face index and uv set index
-						MTFace *mtface = (MTFace*)CustomData_get_layer_n(&me->fdata, CD_MTFACE, k);
+						MTFace *mtface = (MTFace *)CustomData_get_layer_n(&me->fdata, CD_MTFACE, k);
 						set_face_uv(&mtface[face_index], uvs, k, *index_list_array[k], index, false);
 					}
 				}
 #else
 				for (unsigned int k = 0; k < index_list_array.getCount(); k++) {
 					// get mtface by face index and uv set index
-					MTFace *mtface = (MTFace*)CustomData_get_layer_n(&me->fdata, CD_MTFACE, k);
+					MTFace *mtface = (MTFace *)CustomData_get_layer_n(&me->fdata, CD_MTFACE, k);
 					set_face_uv(&mtface[face_index], uvs, *index_list_array[k], index, false);
 				}
 #endif
@@ -725,24 +726,24 @@ void MeshImporter::read_faces(COLLADAFW::Mesh *mesh, Mesh *me, int new_tris) //T
 
 				for (unsigned int vertex_index = 0; vertex_index < vertex_count - 2; vertex_index++) {
 					// For each triangle store indeces of its 3 vertices
-					unsigned int triangle_vertex_indices[3]={first_vertex, indices[1], indices[2]};
+					unsigned int triangle_vertex_indices[3] = {first_vertex, indices[1], indices[2]};
 					set_face_indices(mface, triangle_vertex_indices, false);
 					test_index_face(mface, &me->fdata, face_index, 3);
 
 					if (mp_has_normals) {  // vertex normals, same inplementation as for the triangles
 						// the same for vertces normals
-						unsigned int vertex_normal_indices[3]={first_normal, nind[1], nind[2]};
+						unsigned int vertex_normal_indices[3] = {first_normal, nind[1], nind[2]};
 						if (!flat_face(vertex_normal_indices, nor, 3))
 							mface->flag |= ME_SMOOTH;
-							nind++;
-						}
-
-						mface++;	// same inplementation as for the triangles
-						indices++;
-						face_index++;
-						prim.totface++;
+						nind++;
 					}
 				
+					mface++;  // same inplementation as for the triangles
+					indices++;
+					face_index++;
+					prim.totface++;
+				}
+
 				// Moving cursor  to the next triangle fan.
 				if (mp_has_normals)
 					nind += 2;
@@ -751,7 +752,7 @@ void MeshImporter::read_faces(COLLADAFW::Mesh *mesh, Mesh *me, int new_tris) //T
 			}
 		}
 		else if (type == COLLADAFW::MeshPrimitive::POLYLIST || type == COLLADAFW::MeshPrimitive::POLYGONS) {
-			COLLADAFW::Polygons *mpvc =	(COLLADAFW::Polygons*)mp;
+			COLLADAFW::Polygons *mpvc = (COLLADAFW::Polygons *)mp;
 			COLLADAFW::Polygons::VertexCountArray& vcounta = mpvc->getGroupedVerticesVertexCountArray();
 
 			for (unsigned int j = 0; j < prim_totface; j++) {
@@ -769,14 +770,14 @@ void MeshImporter::read_faces(COLLADAFW::Mesh *mesh, Mesh *me, int new_tris) //T
 					for (unsigned int k = 0; k < totuvset; k++) {
 						if (!index_list_array.empty() && index_list_array[k]) {
 							// get mtface by face index and uv set index
-							MTFace *mtface = (MTFace*)CustomData_get_layer_n(&me->fdata, CD_MTFACE, k);
+							MTFace *mtface = (MTFace *)CustomData_get_layer_n(&me->fdata, CD_MTFACE, k);
 							set_face_uv(&mtface[face_index], uvs, k, *index_list_array[k], index, mface->v4 != 0);
 						}
 					}
 #else
 					for (unsigned int k = 0; k < index_list_array.getCount(); k++) {
 						// get mtface by face index and uv set index
-						MTFace *mtface = (MTFace*)CustomData_get_layer_n(&me->fdata, CD_MTFACE, k);
+						MTFace *mtface = (MTFace *)CustomData_get_layer_n(&me->fdata, CD_MTFACE, k);
 						set_face_uv(&mtface[face_index], uvs, *index_list_array[k], index, vcount == 4);
 					}
 #endif
@@ -819,7 +820,7 @@ void MeshImporter::read_faces(COLLADAFW::Mesh *mesh, Mesh *me, int new_tris) //T
 						for (unsigned int l = 0; l < totuvset; l++) {
 							if (!index_list_array.empty() && index_list_array[l]) {
 								// get mtface by face index and uv set index
-								MTFace *mtface = (MTFace*)CustomData_get_layer_n(&me->fdata, CD_MTFACE, l);
+								MTFace *mtface = (MTFace *)CustomData_get_layer_n(&me->fdata, CD_MTFACE, l);
 								set_face_uv(&mtface[face_index], uvs, l, *index_list_array[l], uv_indices);
 							}
 						}
@@ -828,7 +829,7 @@ void MeshImporter::read_faces(COLLADAFW::Mesh *mesh, Mesh *me, int new_tris) //T
 							int uvset_index = index_list_array[l]->getSetIndex();
 
 							// get mtface by face index and uv set index
-							MTFace *mtface = (MTFace*)CustomData_get_layer_n(&me->fdata, CD_MTFACE, uvset_index);
+							MTFace *mtface = (MTFace *)CustomData_get_layer_n(&me->fdata, CD_MTFACE, uvset_index);
 							set_face_uv(&mtface[face_index], uvs, *index_list_array[l], uv_indices);
 						}
 #endif
@@ -873,9 +874,9 @@ void MeshImporter::get_vector(float v[3], COLLADAFW::MeshVertexData& arr, int i,
 	i *= stride;
 	
 	switch (arr.getType()) {
-	case COLLADAFW::MeshVertexData::DATA_TYPE_FLOAT:
+		case COLLADAFW::MeshVertexData::DATA_TYPE_FLOAT:
 		{
-			COLLADAFW::ArrayPrimitiveType<float>* values = arr.getFloatValues();
+			COLLADAFW::ArrayPrimitiveType<float> *values = arr.getFloatValues();
 			if (values->empty()) return;
 
 			v[0] = (*values)[i++];
@@ -884,9 +885,9 @@ void MeshImporter::get_vector(float v[3], COLLADAFW::MeshVertexData& arr, int i,
 
 		}
 		break;
-	case COLLADAFW::MeshVertexData::DATA_TYPE_DOUBLE:
+		case COLLADAFW::MeshVertexData::DATA_TYPE_DOUBLE:
 		{
-			COLLADAFW::ArrayPrimitiveType<double>* values = arr.getDoubleValues();
+			COLLADAFW::ArrayPrimitiveType<double> *values = arr.getDoubleValues();
 			if (values->empty()) return;
 
 			v[0] = (float)(*values)[i++];
@@ -894,8 +895,8 @@ void MeshImporter::get_vector(float v[3], COLLADAFW::MeshVertexData& arr, int i,
 			v[2] = (float)(*values)[i];
 		}
 		break;
-	default:
-		break;
+		default:
+			break;
 	}
 }
 
@@ -921,12 +922,13 @@ bool MeshImporter::flat_face(unsigned int *nind, COLLADAFW::MeshVertexData& nor,
 	return true;
 }
 
-MeshImporter::MeshImporter(UnitConverter *unitconv, ArmatureImporter *arm, Scene *sce) : unitconverter(unitconv), scene(sce), armature_importer(arm) {}
+MeshImporter::MeshImporter(UnitConverter *unitconv, ArmatureImporter *arm, Scene *sce) : unitconverter(unitconv), scene(sce), armature_importer(arm) {
+}
 
 void MeshImporter::bmeshConversion()
 {
-	for (std::map<COLLADAFW::UniqueId, Mesh*>::iterator m = uid_mesh_map.begin();
-			m != uid_mesh_map.end(); ++m)
+	for (std::map<COLLADAFW::UniqueId, Mesh *>::iterator m = uid_mesh_map.begin();
+	     m != uid_mesh_map.end(); ++m)
 	{
 		if ((*m).second) {
 			Mesh *me = (*m).second;
@@ -947,21 +949,21 @@ Object *MeshImporter::get_object_by_geom_uid(const COLLADAFW::UniqueId& geom_uid
 }
 
 MTex *MeshImporter::assign_textures_to_uvlayer(COLLADAFW::TextureCoordinateBinding &ctexture,
-								 Mesh *me, TexIndexTextureArrayMap& texindex_texarray_map,
-								 MTex *color_texture)
+                                               Mesh *me, TexIndexTextureArrayMap& texindex_texarray_map,
+                                               MTex *color_texture)
 {
 	const COLLADAFW::TextureMapId texture_index = ctexture.getTextureMapId();
 	size_t setindex = ctexture.getSetIndex();
 	std::string uvname = ctexture.getSemantic();
 	
-	if (setindex==-1) return NULL;
+	if (setindex == -1) return NULL;
 	
 	const CustomData *data = &me->fdata;
 	int layer_index = CustomData_get_layer_index(data, CD_MTFACE);
 
 	if (layer_index == -1) return NULL;
 
-	CustomDataLayer *cdl = &data->layers[layer_index+setindex];
+	CustomDataLayer *cdl = &data->layers[layer_index + setindex];
 	
 	/* set uvname to bind_vertex_input semantic */
 	BLI_strncpy(cdl->name, uvname.c_str(), sizeof(cdl->name));
@@ -972,9 +974,9 @@ MTex *MeshImporter::assign_textures_to_uvlayer(COLLADAFW::TextureCoordinateBindi
 		return color_texture;
 	}
 	
-	std::vector<MTex*> textures = texindex_texarray_map[texture_index];
+	std::vector<MTex *> textures = texindex_texarray_map[texture_index];
 	
-	std::vector<MTex*>::iterator it;
+	std::vector<MTex *>::iterator it;
 	
 	for (it = textures.begin(); it != textures.end(); it++) {
 		
@@ -989,12 +991,12 @@ MTex *MeshImporter::assign_textures_to_uvlayer(COLLADAFW::TextureCoordinateBindi
 }
 
 MTFace *MeshImporter::assign_material_to_geom(COLLADAFW::MaterialBinding cmaterial,
-								std::map<COLLADAFW::UniqueId, Material*>& uid_material_map,
-								Object *ob, const COLLADAFW::UniqueId *geom_uid, 
-								MTex **color_texture, char *layername, MTFace *texture_face,
-								std::map<Material*, TexIndexTextureArrayMap>& material_texture_mapping_map, short mat_index)
+                                              std::map<COLLADAFW::UniqueId, Material *>& uid_material_map,
+                                              Object *ob, const COLLADAFW::UniqueId *geom_uid,
+                                              MTex **color_texture, char *layername, MTFace *texture_face,
+                                              std::map<Material *, TexIndexTextureArrayMap>& material_texture_mapping_map, short mat_index)
 {
-	Mesh *me = (Mesh*)ob->data;
+	Mesh *me = (Mesh *)ob->data;
 	const COLLADAFW::UniqueId& ma_uid = cmaterial.getReferencedMaterial();
 	
 	// do we know this material?
@@ -1008,9 +1010,9 @@ MTFace *MeshImporter::assign_material_to_geom(COLLADAFW::MaterialBinding cmateri
 	// again. Make sure we don't overwrite them on the next occurrences, so keep list of
 	// what we already have handled.
 	std::multimap<COLLADAFW::UniqueId, COLLADAFW::UniqueId>::iterator it;
-	it=materials_mapped_to_geom.find(*geom_uid);
-	while (it!=materials_mapped_to_geom.end()) {
-		if (it->second == ma_uid && it->first == *geom_uid) return NULL; // do nothing if already found
+	it = materials_mapped_to_geom.find(*geom_uid);
+	while (it != materials_mapped_to_geom.end()) {
+		if (it->second == ma_uid && it->first == *geom_uid) return NULL;  // do nothing if already found
 		it++;
 	}
 	// first time we get geom_uid, ma_uid pair. Save for later check.
@@ -1020,22 +1022,22 @@ MTFace *MeshImporter::assign_material_to_geom(COLLADAFW::MaterialBinding cmateri
 	assign_material(ob, ma, ob->totcol + 1);
 	
 	COLLADAFW::TextureCoordinateBindingArray& tex_array = 
-		cmaterial.getTextureCoordinateBindingArray();
+	    cmaterial.getTextureCoordinateBindingArray();
 	TexIndexTextureArrayMap texindex_texarray_map = material_texture_mapping_map[ma];
 	unsigned int i;
 	// loop through <bind_vertex_inputs>
 	for (i = 0; i < tex_array.getCount(); i++) {
 		
 		*color_texture = assign_textures_to_uvlayer(tex_array[i], me, texindex_texarray_map,
-													*color_texture);
+		                                            *color_texture);
 	}
 	
 	// set texture face
 	if (*color_texture &&
-		strlen((*color_texture)->uvname) &&
-		strcmp(layername, (*color_texture)->uvname) != 0) {
-		texture_face = (MTFace*)CustomData_get_layer_named(&me->fdata, CD_MTFACE,
-														   (*color_texture)->uvname);
+	    strlen((*color_texture)->uvname) &&
+	    strcmp(layername, (*color_texture)->uvname) != 0) {
+		texture_face = (MTFace *)CustomData_get_layer_named(&me->fdata, CD_MTFACE,
+		                                                    (*color_texture)->uvname);
 		strcpy(layername, (*color_texture)->uvname);
 	}
 	
@@ -1057,7 +1059,7 @@ MTFace *MeshImporter::assign_material_to_geom(COLLADAFW::MaterialBinding cmateri
 				mface->mat_nr = mat_index;
 				// bind texture images to faces
 				if (texture_face && (*color_texture)) {
-					texture_face->tpage = (Image*)(*color_texture)->tex->ima;
+					texture_face->tpage = (Image *)(*color_texture)->tex->ima;
 					texture_face++;
 				}
 			}
@@ -1068,9 +1070,9 @@ MTFace *MeshImporter::assign_material_to_geom(COLLADAFW::MaterialBinding cmateri
 }
 
 Object *MeshImporter::create_mesh_object(COLLADAFW::Node *node, COLLADAFW::InstanceGeometry *geom,
-						   bool isController,
-						   std::map<COLLADAFW::UniqueId, Material*>& uid_material_map,
-						   std::map<Material*, TexIndexTextureArrayMap>& material_texture_mapping_map)
+                                         bool isController,
+                                         std::map<COLLADAFW::UniqueId, Material *>& uid_material_map,
+                                         std::map<Material *, TexIndexTextureArrayMap>& material_texture_mapping_map)
 {
 	const COLLADAFW::UniqueId *geom_uid = &geom->getInstanciatedObjectId();
 	
@@ -1097,7 +1099,7 @@ Object *MeshImporter::create_mesh_object(COLLADAFW::Node *node, COLLADAFW::Insta
 	
 	// name Object
 	const std::string& id = node->getName().size() ? node->getName() : node->getOriginalId();
-	const char *name = (id.length())? id.c_str(): NULL;
+	const char *name = (id.length()) ? id.c_str() : NULL;
 	
 	// add object
 	Object *ob = bc_add_object(scene, OB_MESH, name);
@@ -1106,7 +1108,7 @@ Object *MeshImporter::create_mesh_object(COLLADAFW::Node *node, COLLADAFW::Insta
 	uid_object_map[*geom_uid] = ob;
 	
 	// replace ob->data freeing the old one
-	Mesh *old_mesh = (Mesh*)ob->data;
+	Mesh *old_mesh = (Mesh *)ob->data;
 
 	set_mesh(ob, uid_mesh_map[*geom_uid]);
 	
@@ -1118,15 +1120,15 @@ Object *MeshImporter::create_mesh_object(COLLADAFW::Node *node, COLLADAFW::Insta
 	MTex *color_texture = NULL;
 	
 	COLLADAFW::MaterialBindingArray& mat_array =
-		geom->getMaterialBindings();
+	    geom->getMaterialBindings();
 	
 	// loop through geom's materials
-	for (unsigned int i = 0; i < mat_array.getCount(); i++)	{
+	for (unsigned int i = 0; i < mat_array.getCount(); i++) {
 		
 		if (mat_array[i].getReferencedMaterial().isValid()) {
 			texture_face = assign_material_to_geom(mat_array[i], uid_material_map, ob, geom_uid,
-												   &color_texture, layername, texture_face,
-												   material_texture_mapping_map, i);
+			                                       &color_texture, layername, texture_face,
+			                                       material_texture_mapping_map, i);
 		}
 		else {
 			fprintf(stderr, "invalid referenced material for %s\n", mat_array[i].getName().c_str());
@@ -1137,7 +1139,7 @@ Object *MeshImporter::create_mesh_object(COLLADAFW::Node *node, COLLADAFW::Insta
 }
 
 // create a mesh storing a pointer in a map so it can be retrieved later by geometry UID
-bool MeshImporter::write_geometry(const COLLADAFW::Geometry* geom) 
+bool MeshImporter::write_geometry(const COLLADAFW::Geometry *geom)
 {
 	// TODO: import also uvs, normals
 	// XXX what to do with normal indices?
@@ -1150,7 +1152,7 @@ bool MeshImporter::write_geometry(const COLLADAFW::Geometry* geom)
 		return true;
 	}
 	
-	COLLADAFW::Mesh *mesh = (COLLADAFW::Mesh*)geom;
+	COLLADAFW::Mesh *mesh = (COLLADAFW::Mesh *)geom;
 	
 	if (!is_nice_mesh(mesh)) {
 		fprintf(stderr, "Ignoring mesh %s\n", bc_get_dae_name(mesh));
@@ -1158,7 +1160,7 @@ bool MeshImporter::write_geometry(const COLLADAFW::Geometry* geom)
 	}
 	
 	const std::string& str_geom_id = mesh->getName().size() ? mesh->getName() : mesh->getOriginalId();
-	Mesh *me = BKE_mesh_add((char*)str_geom_id.c_str());
+	Mesh *me = BKE_mesh_add((char *)str_geom_id.c_str());
 	me->id.us--; // is already 1 here, but will be set later in set_mesh
 
 	// store the Mesh pointer to link it later with an Object
diff --git a/source/blender/collada/SceneExporter.cpp b/source/blender/collada/SceneExporter.cpp
index f79ae2b52a9..bd746e241ca 100644
--- a/source/blender/collada/SceneExporter.cpp
+++ b/source/blender/collada/SceneExporter.cpp
@@ -25,10 +25,13 @@
  */
 
 #include "SceneExporter.h"
+#include "collada_utils.h"
+#include "BKE_object.h"
 
 SceneExporter::SceneExporter(COLLADASW::StreamWriter *sw, ArmatureExporter *arm, const ExportSettings *export_settings)
 	: COLLADASW::LibraryVisualScenes(sw), arm_exporter(arm), export_settings(export_settings)
-{}
+{
+}
 	
 void SceneExporter::exportScene(Scene *sce)
 {
@@ -41,83 +44,102 @@ void SceneExporter::exportScene(Scene *sce)
 }
 
 void SceneExporter::exportHierarchy(Scene *sce)
-{
-	Base *base= (Base*) sce->base.first;
-	while (base) {
-		Object *ob = base->object;
-
-		if (!ob->parent) {
-			if (sce->lay & ob->lay) {
-				switch (ob->type) {
-					case OB_MESH:
-					case OB_CAMERA:
-					case OB_LAMP:
-					case OB_ARMATURE:
-					case OB_EMPTY:
-						if (this->export_settings->selected && !(ob->flag & SELECT)) {
-							break;
-						}
-						// write nodes....
-						writeNodes(ob, sce);
-						break;
-				}
+{	
+	LinkNode *node;
+	std::vector<Object *> base_objects;
+
+	// Ensure all objects in the export_set are marked
+	for (node = this->export_settings->export_set; node; node = node->next) {
+		Object *ob = (Object *) node->link;
+		ob->id.flag |= LIB_DOIT;
+	}
+	
+	// Now find all exportable base ojects (highest in export hierarchy)
+	for (node = this->export_settings->export_set; node; node = node->next) {
+		Object *ob = (Object *) node->link;
+		if (bc_is_base_node(this->export_settings->export_set, ob)) 
+		{
+			switch (ob->type) {
+				case OB_MESH:
+				case OB_CAMERA:
+				case OB_LAMP:
+				case OB_EMPTY:
+				case OB_ARMATURE:
+					base_objects.push_back(ob);
+					break;
 			}
 		}
+	}
 
-		base= base->next;
+	// And now export the base objects:
+	for (int index = 0; index < base_objects.size(); index++) {
+		Object *ob = base_objects[index];
+		if (bc_is_marked(ob)) {
+			bc_remove_mark(ob);
+			writeNodes(ob, sce);
+		}
 	}
 }
 
 void SceneExporter::writeNodes(Object *ob, Scene *sce)
 {
-	COLLADASW::Node node(mSW);
-	node.setNodeId(translate_id(id_name(ob)));
-	node.setType(COLLADASW::Node::NODE);
-
-	node.start();
-
-	bool is_skinned_mesh = arm_exporter->is_skinned_mesh(ob);
-	std::list<Object*> child_objects;
-
-
-	if (this->export_settings->include_bone_children) {
-		// list child objects
-		Base *b = (Base*) sce->base.first;
-		while (b) {
-			// cob - child object
-			Object *cob = b->object;
-
-			if (cob->parent == ob) {
-				switch (cob->type) {
-					case OB_MESH:
-					case OB_CAMERA:
-					case OB_LAMP:
-					case OB_EMPTY:
-					case OB_ARMATURE:
+	// Add associated armature first if available
+	bool armature_exported = false;
+	Object *ob_arm = bc_get_assigned_armature(ob);
+	if (ob_arm != NULL)
+	{
+		armature_exported = bc_is_in_Export_set(this->export_settings->export_set, ob_arm);
+		if (armature_exported && bc_is_marked(ob_arm)) {
+			bc_remove_mark(ob_arm);
+			writeNodes(ob_arm, sce);
+			armature_exported = true;
+		}
+	}
+
+	COLLADASW::Node colladaNode(mSW);
+	colladaNode.setNodeId(translate_id(id_name(ob)));
+	colladaNode.setNodeName(translate_id(id_name(ob)));
+	colladaNode.setType(COLLADASW::Node::NODE);
+
+	colladaNode.start();
+
+	std::list<Object *> child_objects;
+
+	// list child objects
+	LinkNode *node;
+	for (node=this->export_settings->export_set; node; node=node->next) {
+		// cob - child object
+		Object *cob = (Object *)node->link;
+
+		if (cob->parent == ob) {
+			switch (cob->type) {
+				case OB_MESH:
+				case OB_CAMERA:
+				case OB_LAMP:
+				case OB_EMPTY:
+				case OB_ARMATURE:
+					if (bc_is_marked(cob))
 						child_objects.push_back(cob);
-						break;
-				}
+					break;
 			}
-
-			b = b->next;
 		}
 	}
 
-
-	if (ob->type == OB_MESH && is_skinned_mesh)
+	if (ob->type == OB_MESH && armature_exported)
 		// for skinned mesh we write obmat in <bind_shape_matrix>
-		TransformWriter::add_node_transform_identity(node);
+		TransformWriter::add_node_transform_identity(colladaNode);
 	else
-		TransformWriter::add_node_transform_ob(node, ob);
+		TransformWriter::add_node_transform_ob(colladaNode, ob);
 
 	// <instance_geometry>
 	if (ob->type == OB_MESH) {
-		if (is_skinned_mesh) {
-			arm_exporter->add_instance_controller(ob);
+		bool instance_controller_created = false;
+		if (armature_exported) {
+			instance_controller_created = arm_exporter->add_instance_controller(ob);
 		}
-		else {
+		if (!instance_controller_created) {
 			COLLADASW::InstanceGeometry instGeom(mSW);
-			instGeom.setUrl(COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, get_geometry_id(ob)));
+			instGeom.setUrl(COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, get_geometry_id(ob, this->export_settings->use_object_instantiation)));
 
 			InstanceWriter::add_material_bindings(instGeom.getBindMaterial(), ob);
 
@@ -128,9 +150,6 @@ void SceneExporter::writeNodes(Object *ob, Scene *sce)
 	// <instance_controller>
 	else if (ob->type == OB_ARMATURE) {
 		arm_exporter->add_armature_bones(ob, sce, this, child_objects);
-
-		// XXX this looks unstable...
-		node.end();
 	}
 
 	// <instance_camera>
@@ -151,18 +170,25 @@ void SceneExporter::writeNodes(Object *ob, Scene *sce)
 			GroupObject *go = NULL;
 			Group *gr = ob->dup_group;
 			/* printf("group detected '%s'\n", gr->id.name+2); */
-			for (go = (GroupObject*)(gr->gobject.first); go; go=go->next) {
+			for (go = (GroupObject *)(gr->gobject.first); go; go = go->next) {
 				printf("\t%s\n", go->ob->id.name);
 			}
 		}
 	}
 
-	for (std::list<Object*>::iterator i= child_objects.begin(); i != child_objects.end(); ++i) {
-		writeNodes(*i, sce);
+	if (ob->type == OB_ARMATURE) {
+		colladaNode.end();
 	}
 
+	for (std::list<Object *>::iterator i = child_objects.begin(); i != child_objects.end(); ++i) {
+		if (bc_is_marked(*i)) {
+			bc_remove_mark(*i);
+			writeNodes(*i, sce);
+		}
+	}
 
-	if (ob->type != OB_ARMATURE)
-		node.end();
+	if (ob->type != OB_ARMATURE) {
+		colladaNode.end();
+	}
 }
 
diff --git a/source/blender/collada/SkinInfo.cpp b/source/blender/collada/SkinInfo.cpp
index edc8981deab..0116f89361b 100644
--- a/source/blender/collada/SkinInfo.cpp
+++ b/source/blender/collada/SkinInfo.cpp
@@ -57,14 +57,15 @@ static const char *bc_get_joint_name(T *node)
 // This is used to store data passed in write_controller_data.
 // Arrays from COLLADAFW::SkinControllerData lose ownership, so do this class members
 // so that arrays don't get freed until we free them explicitly.
-SkinInfo::SkinInfo() {}
+SkinInfo::SkinInfo() {
+}
 
 SkinInfo::SkinInfo(const SkinInfo& skin) : weights(skin.weights),
-								 joint_data(skin.joint_data),
-								 unit_converter(skin.unit_converter),
-								 ob_arm(skin.ob_arm),
-								 controller_uid(skin.controller_uid),
-								 parent(skin.parent)
+	joint_data(skin.joint_data),
+	unit_converter(skin.unit_converter),
+	ob_arm(skin.ob_arm),
+	controller_uid(skin.controller_uid),
+	parent(skin.parent)
 {
 	copy_m4_m4(bind_shape_matrix, (float (*)[4])skin.bind_shape_matrix);
 
@@ -73,7 +74,8 @@ SkinInfo::SkinInfo(const SkinInfo& skin) : weights(skin.weights),
 	transfer_int_array_data_const(skin.joint_indices, joint_indices);
 }
 
-SkinInfo::SkinInfo(UnitConverter *conv) : unit_converter(conv), ob_arm(NULL), parent(NULL) {}
+SkinInfo::SkinInfo(UnitConverter *conv) : unit_converter(conv), ob_arm(NULL), parent(NULL) {
+}
 
 // nobody owns the data after this, so it should be freed manually with releaseMemory
 template <class T>
@@ -87,21 +89,21 @@ void SkinInfo::transfer_array_data(T& src, T& dest)
 // when src is const we cannot src.yieldOwnerShip, this is used by copy constructor
 void SkinInfo::transfer_int_array_data_const(const COLLADAFW::IntValuesArray& src, COLLADAFW::IntValuesArray& dest)
 {
-	dest.setData((int*)src.getData(), src.getCount());
+	dest.setData((int *)src.getData(), src.getCount());
 	dest.yieldOwnerShip();
 }
 
 void SkinInfo::transfer_uint_array_data_const(const COLLADAFW::UIntValuesArray& src, COLLADAFW::UIntValuesArray& dest)
 {
-	dest.setData((unsigned int*)src.getData(), src.getCount());
+	dest.setData((unsigned int *)src.getData(), src.getCount());
 	dest.yieldOwnerShip();
 }
 
-void SkinInfo::borrow_skin_controller_data(const COLLADAFW::SkinControllerData* skin)
+void SkinInfo::borrow_skin_controller_data(const COLLADAFW::SkinControllerData *skin)
 {
-	transfer_array_data((COLLADAFW::UIntValuesArray&)skin->getJointsPerVertex(), joints_per_vertex);
-	transfer_array_data((COLLADAFW::UIntValuesArray&)skin->getWeightIndices(), weight_indices);
-	transfer_array_data((COLLADAFW::IntValuesArray&)skin->getJointIndices(), joint_indices);
+	transfer_array_data((COLLADAFW::UIntValuesArray &)skin->getJointsPerVertex(), joints_per_vertex);
+	transfer_array_data((COLLADAFW::UIntValuesArray &)skin->getWeightIndices(), weight_indices);
+	transfer_array_data((COLLADAFW::IntValuesArray &)skin->getJointIndices(), joint_indices);
 	// transfer_array_data(skin->getWeights(), weights);
 
 	// cannot transfer data for FloatOrDoubleArray, copy values manually
@@ -130,7 +132,7 @@ void SkinInfo::add_joint(const COLLADABU::Math::Matrix4& matrix)
 	joint_data.push_back(jd);
 }
 
-void SkinInfo::set_controller(const COLLADAFW::SkinController* co)
+void SkinInfo::set_controller(const COLLADAFW::SkinController *co)
 {
 	controller_uid = co->getUniqueId();
 
@@ -155,7 +157,7 @@ Object *SkinInfo::create_armature(Scene *scene)
 	return ob_arm;
 }
 
-Object* SkinInfo::set_armature(Object *ob_arm)
+Object *SkinInfo::set_armature(Object *ob_arm)
 {
 	if (this->ob_arm)
 		return this->ob_arm;
@@ -211,8 +213,8 @@ bool SkinInfo::uses_joint_or_descendant(COLLADAFW::Node *node)
 	return false;
 }
 
-void SkinInfo::link_armature(bContext *C, Object *ob, std::map<COLLADAFW::UniqueId, COLLADAFW::Node*>& joint_by_uid,
-				   TransformReader *tm)
+void SkinInfo::link_armature(bContext *C, Object *ob, std::map<COLLADAFW::UniqueId, COLLADAFW::Node *>& joint_by_uid,
+                             TransformReader *tm)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
@@ -233,11 +235,11 @@ void SkinInfo::link_armature(bContext *C, Object *ob, std::map<COLLADAFW::Unique
 	BKE_object_workob_calc_parent(scene, ob, &workob);
 	invert_m4_m4(ob->parentinv, workob.obmat);
 
-	ob->recalc |= OB_RECALC_OB|OB_RECALC_DATA;
+	ob->recalc |= OB_RECALC_OB | OB_RECALC_DATA;
 
 	DAG_scene_sort(bmain, scene);
 	DAG_ids_flush_update(bmain, 0);
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
+	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 #endif
 
 	amd->deformflag = ARM_DEF_VGROUP;
@@ -257,7 +259,7 @@ void SkinInfo::link_armature(bContext *C, Object *ob, std::map<COLLADAFW::Unique
 			name = bc_get_joint_name(joint_by_uid[(*it).joint_uid]);
 		}
 
-		ED_vgroup_add_name(ob, (char*)name);
+		ED_vgroup_add_name(ob, (char *)name);
 	}
 
 	// <vcount> - number of joints per vertex - joints_per_vertex
@@ -274,12 +276,12 @@ void SkinInfo::link_armature(bContext *C, Object *ob, std::map<COLLADAFW::Unique
 	for (unsigned int vertex = 0, weight = 0; vertex < joints_per_vertex.getCount(); vertex++) {
 
 		unsigned int limit = weight + joints_per_vertex[vertex];
-		for ( ; weight < limit; weight++) {
+		for (; weight < limit; weight++) {
 			int joint = joint_indices[weight], joint_weight = weight_indices[weight];
 
 			// -1 means "weight towards the bind shape", we just don't assign it to any group
 			if (joint != -1) {
-				bDeformGroup *def = (bDeformGroup*)BLI_findlink(&ob->defbase, joint);
+				bDeformGroup *def = (bDeformGroup *)BLI_findlink(&ob->defbase, joint);
 
 				ED_vgroup_vert_add(ob, def, vertex, weights[joint_weight], WEIGHT_REPLACE);
 			}
@@ -297,16 +299,16 @@ void SkinInfo::set_parent(Object *_parent)
 	parent = _parent;
 }
 
-Object* SkinInfo::get_parent()
+Object *SkinInfo::get_parent()
 {
 	return parent;
 }
 
-void SkinInfo::find_root_joints(const std::vector<COLLADAFW::Node*> &root_joints,
-					  std::map<COLLADAFW::UniqueId, COLLADAFW::Node*>& joint_by_uid,
-					  std::vector<COLLADAFW::Node*>& result)
+void SkinInfo::find_root_joints(const std::vector<COLLADAFW::Node *> &root_joints,
+                                std::map<COLLADAFW::UniqueId, COLLADAFW::Node *>& joint_by_uid,
+                                std::vector<COLLADAFW::Node *>& result)
 {
-	std::vector<COLLADAFW::Node*>::const_iterator it;
+	std::vector<COLLADAFW::Node *>::const_iterator it;
 	// for each root_joint
 	for (it = root_joints.begin(); it != root_joints.end(); it++) {
 		COLLADAFW::Node *root = *it;
diff --git a/source/blender/collada/TransformReader.cpp b/source/blender/collada/TransformReader.cpp
index 4c7fde8ef17..be615f83787 100644
--- a/source/blender/collada/TransformReader.cpp
+++ b/source/blender/collada/TransformReader.cpp
@@ -29,7 +29,8 @@
 
 #include "TransformReader.h"
 
-TransformReader::TransformReader(UnitConverter* conv) : unit_converter(conv) {}
+TransformReader::TransformReader(UnitConverter *conv) : unit_converter(conv) {
+}
 
 void TransformReader::get_node_mat(float mat[][4], COLLADAFW::Node *node, std::map<COLLADAFW::UniqueId, Animation> *animation_map, Object *ob)
 {
@@ -43,7 +44,7 @@ void TransformReader::get_node_mat(float mat[][4], COLLADAFW::Node *node, std::m
 		COLLADAFW::Transformation *tm = node->getTransformations()[i];
 		COLLADAFW::Transformation::TransformationType type = tm->getTransformationType();
 
-			switch (type) {
+		switch (type) {
 			case COLLADAFW::Transformation::TRANSLATE:
 				dae_translate_to_mat4(tm, cur);
 				break;
@@ -60,7 +61,7 @@ void TransformReader::get_node_mat(float mat[][4], COLLADAFW::Node *node, std::m
 			case COLLADAFW::Transformation::SKEW:
 				fprintf(stderr, "LOOKAT and SKEW transformations are not supported yet.\n");
 				break;
-			}
+		}
 
 		copy_m4_m4(copy, mat);
 		mult_m4_m4m4(mat, copy, cur);
@@ -78,7 +79,7 @@ void TransformReader::get_node_mat(float mat[][4], COLLADAFW::Node *node, std::m
 
 void TransformReader::dae_rotate_to_mat4(COLLADAFW::Transformation *tm, float m[][4])
 {
-	COLLADAFW::Rotate *ro = (COLLADAFW::Rotate*)tm;
+	COLLADAFW::Rotate *ro = (COLLADAFW::Rotate *)tm;
 	COLLADABU::Math::Vector3& axis = ro->getRotationAxis();
 	const float angle = (float)DEG2RAD(ro->getRotationAngle());
 	const float ax[] = {axis[0], axis[1], axis[2]};
@@ -90,7 +91,7 @@ void TransformReader::dae_rotate_to_mat4(COLLADAFW::Transformation *tm, float m[
 
 void TransformReader::dae_translate_to_mat4(COLLADAFW::Transformation *tm, float m[][4])
 {
-	COLLADAFW::Translate *tra = (COLLADAFW::Translate*)tm;
+	COLLADAFW::Translate *tra = (COLLADAFW::Translate *)tm;
 	COLLADABU::Math::Vector3& t = tra->getTranslation();
 
 	unit_m4(m);
@@ -102,24 +103,24 @@ void TransformReader::dae_translate_to_mat4(COLLADAFW::Transformation *tm, float
 
 void TransformReader::dae_scale_to_mat4(COLLADAFW::Transformation *tm, float m[][4])
 {
-	COLLADABU::Math::Vector3& s = ((COLLADAFW::Scale*)tm)->getScale();
+	COLLADABU::Math::Vector3& s = ((COLLADAFW::Scale *)tm)->getScale();
 	float size[3] = {(float)s[0], (float)s[1], (float)s[2]};
 	size_to_mat4(m, size);
 }
 
 void TransformReader::dae_matrix_to_mat4(COLLADAFW::Transformation *tm, float m[][4])
 {
-	unit_converter->dae_matrix_to_mat4_(m, ((COLLADAFW::Matrix*)tm)->getMatrix());
+	unit_converter->dae_matrix_to_mat4_(m, ((COLLADAFW::Matrix *)tm)->getMatrix());
 }
 
 void TransformReader::dae_translate_to_v3(COLLADAFW::Transformation *tm, float v[3])
 {
-	dae_vector3_to_v3(((COLLADAFW::Translate*)tm)->getTranslation(), v);
+	dae_vector3_to_v3(((COLLADAFW::Translate *)tm)->getTranslation(), v);
 }
 
 void TransformReader::dae_scale_to_v3(COLLADAFW::Transformation *tm, float v[3])
 {
-	dae_vector3_to_v3(((COLLADAFW::Scale*)tm)->getScale(), v);
+	dae_vector3_to_v3(((COLLADAFW::Scale *)tm)->getScale(), v);
 }
 
 void TransformReader::dae_vector3_to_v3(const COLLADABU::Math::Vector3 &v3, float v[3])
diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/collada/TransformWriter.cpp
index fbd36cd6613..0d6e3831637 100644
--- a/source/blender/collada/TransformWriter.cpp
+++ b/source/blender/collada/TransformWriter.cpp
@@ -47,11 +47,11 @@ void TransformWriter::add_node_transform(COLLADASW::Node& node, float mat[][4],
 	}
 
 	double dmat[4][4];
-	UnitConverter* converter = new UnitConverter();
+	UnitConverter *converter = new UnitConverter();
 	converter->mat4_to_dae_double(dmat, local);
 
 	TransformBase::decompose(local, loc, rot, NULL, scale);
-	if ( node.getType() == COLLADASW::Node::JOINT)
+	if (node.getType() == COLLADASW::Node::JOINT)
 		node.addMatrix("transform", dmat);
 	else
 		add_transform(node, loc, rot, scale);
@@ -59,7 +59,7 @@ void TransformWriter::add_node_transform(COLLADASW::Node& node, float mat[][4],
 
 void TransformWriter::add_node_transform_ob(COLLADASW::Node& node, Object *ob)
 {
-	/*
+#if 0
 	float rot[3], loc[3], scale[3];
 
 	if (ob->parent) {
@@ -92,7 +92,7 @@ void TransformWriter::add_node_transform_ob(COLLADASW::Node& node, Object *ob)
 	}
 
 	add_transform(node, loc, rot, scale);
-	*/
+#endif
 
 	/* Using parentinv should allow use of existing curves */
 	if (ob->parent) {
@@ -124,9 +124,11 @@ void TransformWriter::add_node_transform_identity(COLLADASW::Node& node)
 void TransformWriter::add_transform(COLLADASW::Node& node, float loc[3], float rot[3], float scale[3])
 {
 	node.addTranslate("location", loc[0], loc[1], loc[2]);
-	/*node.addRotateZ("rotationZ", COLLADABU::Math::Utils::radToDegF(rot[2]));
+#if 0
+	node.addRotateZ("rotationZ", COLLADABU::Math::Utils::radToDegF(rot[2]));
 	node.addRotateY("rotationY", COLLADABU::Math::Utils::radToDegF(rot[1]));
-	node.addRotateX("rotationX", COLLADABU::Math::Utils::radToDegF(rot[0]));*/
+	node.addRotateX("rotationX", COLLADABU::Math::Utils::radToDegF(rot[0]));
+#endif
 	node.addRotateZ("rotationZ", RAD2DEGF(rot[2]));
 	node.addRotateY("rotationY", RAD2DEGF(rot[1]));
 	node.addRotateX("rotationX", RAD2DEGF(rot[0]));
diff --git a/source/blender/collada/collada.cpp b/source/blender/collada/collada.cpp
index c947144412a..da1ca6c30c8 100644
--- a/source/blender/collada/collada.cpp
+++ b/source/blender/collada/collada.cpp
@@ -28,9 +28,9 @@
 /* COLLADABU_ASSERT, may be able to remove later */
 #include "COLLADABUPlatform.h"
 
-#include "ExportSettings.h"
 #include "DocumentExporter.h"
 #include "DocumentImporter.h"
+#include "ExportSettings.h"
 
 extern "C"
 {
@@ -40,43 +40,73 @@ extern "C"
 /* make dummy file */
 #include "BLI_fileops.h"
 #include "BLI_path_util.h"
+#include "BLI_linklist.h"
 
-	int collada_import(bContext *C, const char *filepath)
-	{
-		DocumentImporter imp (C, filepath);
-		if (imp.import()) return 1;
+int collada_import(bContext *C, const char *filepath)
+{
+	DocumentImporter imp(C, filepath);
+	if (imp.import()) return 1;
 
-		return 0;
-	}
+	return 0;
+}
 
-	int collada_export(
-		Scene *sce, 
-		const char *filepath,
-		int selected,
-		int apply_modifiers,
-		int include_bone_children,
-		int second_life)
-	{
-		ExportSettings export_settings;
-		
-		export_settings.selected                 = selected != 0;
-		export_settings.apply_modifiers          = apply_modifiers != 0;
-		export_settings.include_bone_children    = include_bone_children != 0;
-		export_settings.second_life              = second_life != 0;
-		export_settings.filepath                 = (char *)filepath;
-
-		/* annoying, collada crashes if file cant be created! [#27162] */
-		if (!BLI_exists(filepath)) {
-			BLI_make_existing_file(filepath); /* makes the dir if its not there */
-			if (BLI_file_touch(filepath) == 0) {
-				return 0;
-			}
-		}
-		/* end! */
+int collada_export(Scene *sce,
+                   const char *filepath,
 
-		DocumentExporter exporter(&export_settings);
-		exporter.exportCurrentScene(sce);
+                   int apply_modifiers,
+				   BC_export_mesh_type export_mesh_type,
 
-		return 1;
+                   int selected,
+                   int include_children,
+                   int include_armatures,
+                   int deform_bones_only,
+
+                   int use_object_instantiation,
+                   int sort_by_name,
+                   int second_life)
+{
+	ExportSettings export_settings;
+
+	/* annoying, collada crashes if file cant be created! [#27162] */
+	if (!BLI_exists(filepath)) {
+		BLI_make_existing_file(filepath);     /* makes the dir if its not there */
+		if (BLI_file_touch(filepath) == 0) {
+			return 0;
+		}
 	}
+	/* end! */
+
+	export_settings.filepath                 = (char *)filepath;
+
+	export_settings.apply_modifiers          = apply_modifiers != 0;
+	export_settings.export_mesh_type        = export_mesh_type;
+	export_settings.selected                 = selected          != 0;
+	export_settings.include_children         = include_children  != 0;
+	export_settings.include_armatures        = include_armatures != 0;
+	export_settings.deform_bones_only        = deform_bones_only != 0;
+
+	export_settings.use_object_instantiation = use_object_instantiation != 0;
+	export_settings.sort_by_name             = sort_by_name != 0;
+	export_settings.second_life              = second_life != 0;
+
+
+	int includeFilter = OB_REL_NONE;
+	if (export_settings.include_armatures) includeFilter |= OB_REL_MOD_ARMATURE;
+	if (export_settings.include_children) includeFilter |= OB_REL_CHILDREN_RECURSIVE;
+
+	eObjectSet objectSet = (export_settings.selected) ? OB_SET_SELECTED : OB_SET_ALL;
+	export_settings.export_set = BKE_object_relational_superset(sce, objectSet, (eObRelationTypes)includeFilter);
+
+	if (export_settings.sort_by_name)
+		bc_bubble_sort_by_Object_name(export_settings.export_set);
+
+	DocumentExporter exporter(&export_settings);
+	exporter.exportCurrentScene(sce);
+
+	BLI_linklist_free(export_settings.export_set, NULL);
+
+	return 1;
+}
+
+/* end extern C */
 }
diff --git a/source/blender/collada/collada.h b/source/blender/collada/collada.h
index d5c26bb402c..4261e31c413 100644
--- a/source/blender/collada/collada.h
+++ b/source/blender/collada/collada.h
@@ -27,23 +27,48 @@
 #ifndef __COLLADA_H__
 #define __COLLADA_H__
 
-struct bContext;
-struct Scene;
-
+#include <stdlib.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
-	/*
-	 * both return 1 on success, 0 on error
-	 */
-	int collada_import(bContext *C, const char *filepath);
-	int collada_export(
-		Scene *sce,
-		const char *filepath,
-		int selected,
-		int apply_modifiers,
-		int include_bone_children,
-		int second_life);
+
+#include "BLI_linklist.h"
+#include "RNA_types.h"
+
+typedef enum BC_export_mesh_type {
+	BC_MESH_TYPE_VIEW,
+	BC_MESH_TYPE_RENDER,
+} BC_export_mesh_type;
+
+static EnumPropertyItem prop_bc_export_mesh_type[] = {
+	{BC_MESH_TYPE_VIEW, "view", 0, "View", "Apply modifier's view settings"},
+	{BC_MESH_TYPE_RENDER, "render", 0, "Render", "Apply modifier's render settings"},
+	{0, NULL, 0, NULL, NULL}
+};
+
+struct bContext;
+struct Scene;
+
+/*
+ * both return 1 on success, 0 on error
+ */
+int collada_import(bContext *C, const char *filepath);
+int collada_export(Scene *sce,
+                   const char *filepath,
+                   int apply_modifiers,
+				   BC_export_mesh_type export_mesh_type,
+
+                   int selected,
+                   int include_children,
+                   int include_armatures,
+                   int deform_bones_only,
+
+                   int use_object_instantiation,
+                   int sort_by_name,
+                   int second_life);
+
+
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/collada/collada_internal.cpp b/source/blender/collada/collada_internal.cpp
index fa99d460184..0ee8419eda7 100644
--- a/source/blender/collada/collada_internal.cpp
+++ b/source/blender/collada/collada_internal.cpp
@@ -27,12 +27,14 @@
 
 /* COLLADABU_ASSERT, may be able to remove later */
 #include "COLLADABUPlatform.h"
-
 #include "collada_internal.h"
 
-UnitConverter::UnitConverter() : unit(), up_axis(COLLADAFW::FileInfo::Z_UP) {}
+#include "BLI_linklist.h"
+
+UnitConverter::UnitConverter() : unit(), up_axis(COLLADAFW::FileInfo::Z_UP) {
+}
 
-void UnitConverter::read_asset(const COLLADAFW::FileInfo* asset)
+void UnitConverter::read_asset(const COLLADAFW::FileInfo *asset)
 {
 	unit = asset->getUnit();
 	up_axis = asset->getUpAxisType();
@@ -120,72 +122,74 @@ void TransformBase::decompose(float mat[][4], float *loc, float eul[3], float qu
  * must obviously be removed too, otherwise they would be heavily misinterpreted.
  */
 const unsigned char translate_start_name_map[256] = {
-95,  95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-65,  66,  67,  68,  69,  70,  71,  72,
-73,  74,  75,  76,  77,  78,  79,  80,
-81,  82,  83,  84,  85,  86,  87,  88,
-89,  90,  95,  95,  95,  95,  95,  95,
-97,  98,  99,  100,  101,  102,  103,  104,
-105,  106,  107,  108,  109,  110,  111,  112,
-113,  114,  115,  116,  117,  118,  119,  120,
-121,  122,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  192,
-193,  194,  195,  196,  197,  198,  199,  200,
-201,  202,  203,  204,  205,  206,  207,  208,
-209,  210,  211,  212,  213,  214,  95,  216,
-217,  218,  219,  220,  221,  222,  223,  224,
-225,  226,  227,  228,  229,  230,  231,  232,
-233,  234,  235,  236,  237,  238,  239,  240,
-241,  242,  243,  244,  245,  246,  95,  248,
-249,  250,  251,  252,  253,  254,  255};
+	95,  95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	65,  66,  67,  68,  69,  70,  71,  72,
+	73,  74,  75,  76,  77,  78,  79,  80,
+	81,  82,  83,  84,  85,  86,  87,  88,
+	89,  90,  95,  95,  95,  95,  95,  95,
+	97,  98,  99,  100,  101,  102,  103,  104,
+	105,  106,  107,  108,  109,  110,  111,  112,
+	113,  114,  115,  116,  117,  118,  119,  120,
+	121,  122,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  192,
+	193,  194,  195,  196,  197,  198,  199,  200,
+	201,  202,  203,  204,  205,  206,  207,  208,
+	209,  210,  211,  212,  213,  214,  95,  216,
+	217,  218,  219,  220,  221,  222,  223,  224,
+	225,  226,  227,  228,  229,  230,  231,  232,
+	233,  234,  235,  236,  237,  238,  239,  240,
+	241,  242,  243,  244,  245,  246,  95,  248,
+	249,  250,  251,  252,  253,  254,  255
+};
 
 const unsigned char translate_name_map[256] = {
-95,  95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  45,  95,  95,  48,
-49,  50,  51,  52,  53,  54,  55,  56,
-57,  95,  95,  95,  95,  95,  95,  95,
-65,  66,  67,  68,  69,  70,  71,  72,
-73,  74,  75,  76,  77,  78,  79,  80,
-81,  82,  83,  84,  85,  86,  87,  88,
-89,  90,  95,  95,  95,  95,  95,  95,
-97,  98,  99,  100,  101,  102,  103,  104,
-105,  106,  107,  108,  109,  110,  111,  112,
-113,  114,  115,  116,  117,  118,  119,  120,
-121,  122,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  95,  95,
-95,  95,  95,  95,  95,  95,  183,  95,
-95,  95,  95,  95,  95,  95,  95,  192,
-193,  194,  195,  196,  197,  198,  199,  200,
-201,  202,  203,  204,  205,  206,  207,  208,
-209,  210,  211,  212,  213,  214,  95,  216,
-217,  218,  219,  220,  221,  222,  223,  224,
-225,  226,  227,  228,  229,  230,  231,  232,
-233,  234,  235,  236,  237,  238,  239,  240,
-241,  242,  243,  244,  245,  246,  95,  248,
-249,  250,  251,  252,  253,  254,  255};
+	95,  95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  45,  95,  95,  48,
+	49,  50,  51,  52,  53,  54,  55,  56,
+	57,  95,  95,  95,  95,  95,  95,  95,
+	65,  66,  67,  68,  69,  70,  71,  72,
+	73,  74,  75,  76,  77,  78,  79,  80,
+	81,  82,  83,  84,  85,  86,  87,  88,
+	89,  90,  95,  95,  95,  95,  95,  95,
+	97,  98,  99,  100,  101,  102,  103,  104,
+	105,  106,  107,  108,  109,  110,  111,  112,
+	113,  114,  115,  116,  117,  118,  119,  120,
+	121,  122,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  95,  95,
+	95,  95,  95,  95,  95,  95,  183,  95,
+	95,  95,  95,  95,  95,  95,  95,  192,
+	193,  194,  195,  196,  197,  198,  199,  200,
+	201,  202,  203,  204,  205,  206,  207,  208,
+	209,  210,  211,  212,  213,  214,  95,  216,
+	217,  218,  219,  220,  221,  222,  223,  224,
+	225,  226,  227,  228,  229,  230,  231,  232,
+	233,  234,  235,  236,  237,  238,  239,  240,
+	241,  242,  243,  244,  245,  246,  95,  248,
+	249,  250,  251,  252,  253,  254,  255
+};
 
 typedef std::map< std::string, std::vector<std::string> > map_string_list;
 map_string_list global_id_map;
@@ -204,7 +208,7 @@ std::string translate_id(const std::string &id)
 
 	std::string id_translated = id;
 	id_translated[0] = translate_start_name_map[(unsigned int)id_translated[0]];
-	for (unsigned int i=1; i < id_translated.size(); i++) {
+	for (unsigned int i = 1; i < id_translated.size(); i++) {
 		id_translated[i] = translate_name_map[(unsigned int)id_translated[i]];
 	}
 	// It's so much workload now, the if () should speed up things.
@@ -214,7 +218,7 @@ std::string translate_id(const std::string &id)
 		if (iter != global_id_map.end()) {
 			unsigned int i = 0;
 			bool found = false;
-			for (i=0; i < iter->second.size(); i++) {
+			for (i = 0; i < iter->second.size(); i++) {
 				if (id == iter->second[i]) {
 					found = true;
 					break;
@@ -222,9 +226,9 @@ std::string translate_id(const std::string &id)
 			}
 			bool convert = false;
 			if (found) {
-			  if (i > 0) {
-				  convert = true;
-			  }
+				if (i > 0) {
+					convert = true;
+				}
 			}
 			else {
 				convert = true;
@@ -243,7 +247,7 @@ std::string translate_id(const std::string &id)
 
 std::string id_name(void *id)
 {
-	return ((ID*)id)->name + 2;
+	return ((ID *)id)->name + 2;
 }
 
 std::string get_geometry_id(Object *ob)
@@ -251,6 +255,13 @@ std::string get_geometry_id(Object *ob)
 	return translate_id(id_name(ob->data)) + "-mesh";
 }
 
+std::string get_geometry_id(Object *ob, bool use_instantiation)
+{
+	std::string geom_name = (use_instantiation) ? id_name(ob->data) : id_name(ob);
+
+	return translate_id(geom_name) + "-mesh";
+}
+
 std::string get_light_id(Object *ob)
 {
 	return translate_id(id_name(ob)) + "-light";
@@ -270,17 +281,3 @@ std::string get_material_id(Material *mat)
 {
 	return translate_id(id_name(mat)) + "-material";
 }
-
-bool has_object_type(Scene *sce, short obtype)
-{
-	Base *base= (Base*) sce->base.first;
-	while (base) {
-		Object *ob = base->object;
-			
-		if (ob->type == obtype && ob->data) {
-			return true;
-		}
-		base= base->next;
-	}
-	return false;
-}
diff --git a/source/blender/collada/collada_internal.h b/source/blender/collada/collada_internal.h
index 4f555acb882..b64c75e7960 100644
--- a/source/blender/collada/collada_internal.h
+++ b/source/blender/collada/collada_internal.h
@@ -39,6 +39,8 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "BLI_math.h"
+#include "BLI_math.h"
+#include "BLI_linklist.h"
 
 class UnitConverter
 {
@@ -86,7 +88,7 @@ extern std::string translate_id(const std::string &id);
 
 extern std::string id_name(void *id);
 
-extern std::string get_geometry_id(Object *ob);
+extern std::string get_geometry_id(Object *ob, bool use_instantiation);
 
 extern std::string get_light_id(Object *ob);
 
@@ -96,6 +98,4 @@ extern std::string get_camera_id(Object *ob);
 
 extern std::string get_material_id(Material *mat);
 
-extern bool has_object_type(Scene* sce, short obtype);
-
 #endif /* __COLLADA_INTERNAL_H__ */
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp
index 8b7a28e5fbe..cf7c9e49b63 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -32,9 +32,16 @@
 #include "COLLADAFWMeshPrimitive.h"
 #include "COLLADAFWMeshVertexData.h"
 
+#include "collada_utils.h"
+
+extern "C" {
+
+#include "DNA_modifier_types.h"
 #include "DNA_customdata_types.h"
 #include "DNA_object_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_armature_types.h"
 
 #include "BLI_math.h"
 
@@ -42,10 +49,16 @@
 #include "BKE_customdata.h"
 #include "BKE_depsgraph.h"
 #include "BKE_object.h"
+#include "BKE_mesh.h"
 #include "BKE_scene.h"
 
+#include "BKE_DerivedMesh.h"
+#include "BLI_linklist.h"
+
+
 #include "WM_api.h" // XXX hrm, see if we can do without this
 #include "WM_types.h"
+}
 
 float bc_get_float_value(const COLLADAFW::FloatOrDoubleArray& array, unsigned int index)
 {
@@ -107,7 +120,7 @@ int bc_set_parent(Object *ob, Object *par, bContext *C, bool is_parent_space)
 
 	DAG_scene_sort(bmain, sce);
 	DAG_ids_flush_update(bmain, 0);
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
+	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 
 	return true;
 }
@@ -116,12 +129,148 @@ Object *bc_add_object(Scene *scene, int type, const char *name)
 {
 	Object *ob = BKE_object_add_only_object(type, name);
 
-	ob->data= BKE_object_obdata_add_from_type(type);
-	ob->lay= scene->lay;
-	ob->recalc |= OB_RECALC_OB|OB_RECALC_DATA|OB_RECALC_TIME;
+	ob->data = BKE_object_obdata_add_from_type(type);
+	ob->lay = scene->lay;
+	ob->recalc |= OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME;
 
 	BKE_scene_base_select(scene, BKE_scene_base_add(scene, ob));
 
 	return ob;
 }
 
+Mesh *bc_to_mesh_apply_modifiers(Scene *scene, Object *ob, BC_export_mesh_type export_mesh_type)
+{
+	Mesh *tmpmesh;
+	CustomDataMask mask = CD_MASK_MESH;
+	DerivedMesh *dm;
+	switch (export_mesh_type) {
+		case BC_MESH_TYPE_VIEW: {
+			dm = mesh_create_derived_view(scene, ob, mask);
+			break;
+		}
+		case BC_MESH_TYPE_RENDER: {
+			dm = mesh_create_derived_render(scene, ob, mask);
+			break;
+		}
+	}
+
+	tmpmesh             = BKE_mesh_add("ColladaMesh"); // name is not important here
+	DM_to_mesh(dm, tmpmesh, ob);
+	dm->release(dm);
+	return tmpmesh;
+}
+
+Object *bc_get_assigned_armature(Object *ob)
+{
+	Object *ob_arm = NULL;
+
+	if (ob->parent && ob->partype == PARSKEL && ob->parent->type == OB_ARMATURE) {
+		ob_arm = ob->parent;
+	}
+	else {
+		ModifierData *mod;
+		for (mod = (ModifierData *)ob->modifiers.first; mod; mod = mod->next) {
+			if (mod->type == eModifierType_Armature) {
+				ob_arm = ((ArmatureModifierData *)mod)->object;
+			}
+		}
+	}
+
+	return ob_arm;
+}
+
+// Returns the highest selected ancestor
+// returns NULL if no ancestor is selected
+// IMPORTANT: This function expects that
+// all exported objects have set:
+// ob->id.flag & LIB_DOIT
+Object *bc_get_highest_selected_ancestor_or_self(LinkNode *export_set, Object *ob) 
+{
+	Object *ancestor = ob;
+	while (ob->parent && bc_is_marked(ob->parent))
+	{
+		ob = ob->parent;
+		ancestor = ob;
+	}
+	return ancestor;
+}
+
+
+bool bc_is_base_node(LinkNode *export_set, Object *ob)
+{
+	Object *root = bc_get_highest_selected_ancestor_or_self(export_set, ob);
+	return (root == ob);
+}
+
+bool bc_is_in_Export_set(LinkNode *export_set, Object *ob)
+{
+	return (BLI_linklist_index(export_set, ob) != -1);
+}
+
+bool bc_has_object_type(LinkNode *export_set, short obtype)
+{
+	LinkNode *node;
+	
+	for (node = export_set; node; node = node->next) {
+		Object *ob = (Object *)node->link;
+		/* XXX - why is this checking for ob->data? - we could be looking for empties */
+		if (ob->type == obtype && ob->data) {
+			return true;
+		}
+	}
+	return false;
+}
+
+int bc_is_marked(Object *ob)
+{
+	return ob && (ob->id.flag & LIB_DOIT);
+}
+
+void bc_remove_mark(Object *ob)
+{
+	ob->id.flag &= ~LIB_DOIT;
+}
+
+// Use bubble sort algorithm for sorting the export set
+void bc_bubble_sort_by_Object_name(LinkNode *export_set)
+{
+	bool sorted = false;
+	LinkNode *node;
+	for (node = export_set; node->next && !sorted; node = node->next) {
+
+		sorted = true;
+		
+		LinkNode *current;
+		for (current = export_set; current->next; current = current->next) {
+			Object *a = (Object *)current->link;
+			Object *b = (Object *)current->next->link;
+
+			if (strcmp(a->id.name, b->id.name) > 0) {
+				current->link       = b;
+				current->next->link = a;
+				sorted = false;
+			}
+			
+		}
+	}
+}
+
+/* Check if a bone is the top most exportable bone in the bone hierarchy. 
+ * When deform_bones_only == false, then only bones with NO parent 
+ * can be root bones. Otherwise the top most deform bones in the hierarchy
+ * are root bones.
+ */
+bool bc_is_root_bone(Bone *aBone, bool deform_bones_only) {
+	if (deform_bones_only) {
+		Bone *root = NULL;
+		Bone *bone = aBone;
+		while (bone) {
+			if (!(bone->flag & BONE_NO_DEFORM))
+				root = bone;
+			bone = bone->parent;
+		}
+		return (aBone == root);
+	}
+	else
+		return !(aBone->parent);
+}
diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h
index 1f5d2b1d8da..ab0b7421aa1 100644
--- a/source/blender/collada/collada_utils.h
+++ b/source/blender/collada/collada_utils.h
@@ -36,19 +36,42 @@
 #include <map>
 
 #include "DNA_object_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_customdata_types.h"
 #include "DNA_texture_types.h"
 #include "BKE_context.h"
+#include "BKE_object.h"
+
 #include "DNA_scene_types.h"
 
-typedef std::map<COLLADAFW::TextureMapId, std::vector<MTex*> > TexIndexTextureArrayMap;
+extern "C" {
+#include "BKE_DerivedMesh.h"
+#include "BLI_linklist.h"
+}
 
-extern float bc_get_float_value(const COLLADAFW::FloatOrDoubleArray& array, unsigned int index);
+#include "ExportSettings.h"
+
+typedef std::map<COLLADAFW::TextureMapId, std::vector<MTex *> > TexIndexTextureArrayMap;
 
+extern float bc_get_float_value(const COLLADAFW::FloatOrDoubleArray& array, unsigned int index);
 extern int bc_test_parent_loop(Object *par, Object *ob);
-extern int bc_set_parent(Object *ob, Object *par, bContext *C, bool is_parent_space=true);
+extern int bc_set_parent(Object *ob, Object *par, bContext *C, bool is_parent_space = true);
+extern Object *bc_add_object(Scene *scene, int type, const char *name);
+extern Mesh *bc_to_mesh_apply_modifiers(Scene *scene, Object *ob, BC_export_mesh_type export_mesh_type);
+
+extern Object *bc_get_assigned_armature(Object *ob);
+extern Object *bc_get_highest_selected_ancestor_or_self(LinkNode *export_set, Object *ob);
+extern bool bc_is_base_node(LinkNode *export_set, Object *ob);
+extern bool bc_is_in_Export_set(LinkNode *export_set, Object *ob);
+extern bool bc_has_object_type(LinkNode *export_set, short obtype);
+
+extern int bc_is_marked(Object *ob);
+extern void bc_remove_mark(Object *ob);
+
 extern char *bc_CustomData_get_layer_name(const CustomData *data, int type, int n);
 extern char *bc_CustomData_get_active_layer_name(const CustomData *data, int type);
-extern Object *bc_add_object(Scene *scene, int type, const char *name);
+
+extern void bc_bubble_sort_by_Object_name(LinkNode *export_set);
+extern bool bc_is_root_bone(Bone *aBone, bool deform_bones_only);
 
 #endif
diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt
index 3230c0ec33d..d0093c58d23 100644
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -26,24 +26,24 @@
 
 set(INC
 	.
+	intern
+	nodes
+	operations
 	../blenkernel
 	../blenlib
+	../blenlib
+	../blenloader
+	../imbuf
 	../makesdna
-	../render/extern/include
-	../render/intern/include
 	../makesrna
-	../blenloader
-	../blenlib
+	../opencl
 	../windowmanager
-	../imbuf
-	../../../intern/guardedalloc
-	nodes
-	../nodes/
+	../nodes
 	../nodes/composite
 	../nodes/intern
-	intern
-	operations
-	../opencl
+	../render/extern/include
+	../render/intern/include
+	../../../intern/guardedalloc
 )
 
 set(SRC
@@ -65,7 +65,6 @@ set(SRC
 	intern/COM_NodeBase.h
 	intern/COM_NodeOperation.cpp
 	intern/COM_NodeOperation.h
-	intern/COM_NodeProgram.h
 	intern/COM_Socket.cpp
 	intern/COM_Socket.h
 	intern/COM_SocketReader.cpp
@@ -80,10 +79,6 @@ set(SRC
 	intern/COM_MemoryProxy.h
 	intern/COM_MemoryBuffer.cpp
 	intern/COM_MemoryBuffer.h
-	intern/COM_MemoryManager.cpp
-	intern/COM_MemoryManager.h
-	intern/COM_MemoryManagerState.cpp
-	intern/COM_MemoryManagerState.h
 	intern/COM_WorkScheduler.cpp
 	intern/COM_WorkScheduler.h
 	intern/COM_WorkPackage.cpp
@@ -102,10 +97,13 @@ set(SRC
 	intern/COM_CompositorContext.h
 	intern/COM_ChannelInfo.cpp
 	intern/COM_ChannelInfo.h
+	intern/COM_SingleThreadedNodeOperation.cpp
+	intern/COM_SingleThreadedNodeOperation.h
+
 	operations/COM_QualityStepHelper.h
 	operations/COM_QualityStepHelper.cpp
 
-# Internal nodes
+	# Internal nodes
 	nodes/COM_MuteNode.cpp
 	nodes/COM_MuteNode.h
 	nodes/COM_GroupNode.cpp
@@ -113,7 +111,7 @@ set(SRC
 	nodes/COM_SocketProxyNode.cpp
 	nodes/COM_SocketProxyNode.h
 
-# input nodes
+	# input nodes
 	nodes/COM_RenderLayersNode.cpp
 	nodes/COM_RenderLayersNode.h
 	nodes/COM_ImageNode.cpp
@@ -134,8 +132,10 @@ set(SRC
 	nodes/COM_MovieClipNode.h
 	nodes/COM_OutputFileNode.cpp
 	nodes/COM_OutputFileNode.h
+	nodes/COM_MaskNode.cpp
+	nodes/COM_MaskNode.h
 
-# output nodes
+	# output nodes
 	nodes/COM_CompositorNode.cpp
 	nodes/COM_CompositorNode.h
 	nodes/COM_ViewerNode.cpp
@@ -149,7 +149,7 @@ set(SRC
 	operations/COM_CalculateMeanOperation.cpp
 	operations/COM_CalculateMeanOperation.h
 
-# distort nodes
+	# distort nodes
 	nodes/COM_TranslateNode.cpp
 	nodes/COM_TranslateNode.h
 	nodes/COM_ScaleNode.cpp
@@ -187,10 +187,6 @@ set(SRC
 	operations/COM_CropOperation.cpp
 	operations/COM_CropOperation.h
 
-	operations/COM_LensGlowOperation.cpp
-	operations/COM_LensGlowOperation.h
-	operations/COM_LensGhostOperation.cpp
-	operations/COM_LensGhostOperation.h
 	nodes/COM_TransformNode.cpp
 	nodes/COM_TransformNode.h
 	nodes/COM_Stabilize2dNode.cpp
@@ -200,27 +196,27 @@ set(SRC
 	nodes/COM_DefocusNode.cpp
 	nodes/COM_DefocusNode.h
 
-# color nodes
-		nodes/COM_VectorCurveNode.cpp
-		nodes/COM_VectorCurveNode.h
-		nodes/COM_ColorCurveNode.cpp
-		nodes/COM_ColorCurveNode.h
-		nodes/COM_ColorToBWNode.cpp
-		nodes/COM_ColorToBWNode.h
-		nodes/COM_ColorRampNode.cpp
-		nodes/COM_ColorRampNode.h
-		nodes/COM_MixNode.cpp
-		nodes/COM_MixNode.h
-		nodes/COM_AlphaOverNode.cpp
-		nodes/COM_AlphaOverNode.h
-		nodes/COM_ZCombineNode.cpp
-		nodes/COM_ZCombineNode.h
-		nodes/COM_BrightnessNode.cpp
-		nodes/COM_BrightnessNode.h
-		nodes/COM_ColorBalanceNode.cpp
-		nodes/COM_ColorBalanceNode.h
-		nodes/COM_InvertNode.cpp
-		nodes/COM_InvertNode.h
+	# color nodes
+	nodes/COM_VectorCurveNode.cpp
+	nodes/COM_VectorCurveNode.h
+	nodes/COM_ColorCurveNode.cpp
+	nodes/COM_ColorCurveNode.h
+	nodes/COM_ColorToBWNode.cpp
+	nodes/COM_ColorToBWNode.h
+	nodes/COM_ColorRampNode.cpp
+	nodes/COM_ColorRampNode.h
+	nodes/COM_MixNode.cpp
+	nodes/COM_MixNode.h
+	nodes/COM_AlphaOverNode.cpp
+	nodes/COM_AlphaOverNode.h
+	nodes/COM_ZCombineNode.cpp
+	nodes/COM_ZCombineNode.h
+	nodes/COM_BrightnessNode.cpp
+	nodes/COM_BrightnessNode.h
+	nodes/COM_ColorBalanceNode.cpp
+	nodes/COM_ColorBalanceNode.h
+	nodes/COM_InvertNode.cpp
+	nodes/COM_InvertNode.h
 	nodes/COM_GammaNode.cpp
 	nodes/COM_GammaNode.h
 	nodes/COM_SetAlphaNode.cpp
@@ -240,25 +236,25 @@ set(SRC
 	operations/COM_TonemapOperation.cpp
 	operations/COM_TonemapOperation.h
 
-# converter nodes
-		nodes/COM_IDMaskNode.cpp
-		nodes/COM_IDMaskNode.h
-		nodes/COM_SeparateRGBANode.cpp
-		nodes/COM_SeparateRGBANode.h
-		nodes/COM_CombineRGBANode.cpp
-		nodes/COM_CombineRGBANode.h
-		nodes/COM_SeparateHSVANode.cpp
-		nodes/COM_SeparateHSVANode.h
-		nodes/COM_CombineHSVANode.cpp
-		nodes/COM_CombineHSVANode.h
-		nodes/COM_SeparateYUVANode.cpp
-		nodes/COM_SeparateYUVANode.h
-		nodes/COM_CombineYUVANode.cpp
-		nodes/COM_CombineYUVANode.h
-		nodes/COM_SeparateYCCANode.cpp
-		nodes/COM_SeparateYCCANode.h
-		nodes/COM_CombineYCCANode.cpp
-		nodes/COM_CombineYCCANode.h
+	# converter nodes
+	nodes/COM_IDMaskNode.cpp
+	nodes/COM_IDMaskNode.h
+	nodes/COM_SeparateRGBANode.cpp
+	nodes/COM_SeparateRGBANode.h
+	nodes/COM_CombineRGBANode.cpp
+	nodes/COM_CombineRGBANode.h
+	nodes/COM_SeparateHSVANode.cpp
+	nodes/COM_SeparateHSVANode.h
+	nodes/COM_CombineHSVANode.cpp
+	nodes/COM_CombineHSVANode.h
+	nodes/COM_SeparateYUVANode.cpp
+	nodes/COM_SeparateYUVANode.h
+	nodes/COM_CombineYUVANode.cpp
+	nodes/COM_CombineYUVANode.h
+	nodes/COM_SeparateYCCANode.cpp
+	nodes/COM_SeparateYCCANode.h
+	nodes/COM_CombineYCCANode.cpp
+	nodes/COM_CombineYCCANode.h
 
 	nodes/COM_NormalNode.cpp
 	nodes/COM_NormalNode.h
@@ -272,7 +268,7 @@ set(SRC
 	operations/COM_NormalizeOperation.cpp
 	operations/COM_NormalizeOperation.h
 
-# Filter nodes
+	# Filter nodes
 	nodes/COM_BilateralBlurNode.cpp
 	nodes/COM_BilateralBlurNode.h
 	operations/COM_BilateralBlurOperation.cpp
@@ -282,18 +278,20 @@ set(SRC
 	operations/COM_VectorBlurOperation.cpp
 	operations/COM_VectorBlurOperation.h
 
-
-
-		nodes/COM_FilterNode.cpp
-		nodes/COM_FilterNode.h
-		nodes/COM_DilateErodeNode.cpp
-		nodes/COM_DilateErodeNode.h
+	nodes/COM_FilterNode.cpp
+	nodes/COM_FilterNode.h
+	nodes/COM_DilateErodeNode.cpp
+	nodes/COM_DilateErodeNode.h
 	nodes/COM_BlurNode.cpp
 	nodes/COM_BlurNode.h
 	nodes/COM_BokehBlurNode.cpp
 	nodes/COM_BokehBlurNode.h
 	nodes/COM_DirectionalBlurNode.cpp
 	nodes/COM_DirectionalBlurNode.h
+	operations/COM_GaussianAlphaXBlurOperation.cpp
+	operations/COM_GaussianAlphaXBlurOperation.h
+	operations/COM_GaussianAlphaYBlurOperation.cpp
+	operations/COM_GaussianAlphaYBlurOperation.h
 	operations/COM_GaussianXBlurOperation.cpp
 	operations/COM_GaussianXBlurOperation.h
 	operations/COM_GaussianYBlurOperation.cpp
@@ -317,7 +315,7 @@ set(SRC
 	operations/COM_GammaCorrectOperation.h
 	operations/COM_GammaCorrectOperation.cpp
 
-# Matte nodes
+	# Matte nodes
 	nodes/COM_BoxMaskNode.cpp
 	nodes/COM_BoxMaskNode.h
 	nodes/COM_EllipseMaskNode.cpp
@@ -329,96 +327,112 @@ set(SRC
 
 	operations/COM_DoubleEdgeMaskOperation.cpp
 	operations/COM_DoubleEdgeMaskOperation.h
-operations/COM_ColorSpillOperation.cpp
-operations/COM_ColorSpillOperation.h
-		operations/COM_RenderLayersBaseProg.cpp
-		operations/COM_RenderLayersBaseProg.h
-		operations/COM_RenderLayersImageProg.cpp
-		operations/COM_RenderLayersImageProg.h
-		operations/COM_RenderLayersAlphaProg.cpp
-		operations/COM_RenderLayersAlphaProg.h
-		operations/COM_RenderLayersDepthProg.cpp
-		operations/COM_RenderLayersDepthProg.h
-		operations/COM_RenderLayersNormalOperation.cpp
-		operations/COM_RenderLayersNormalOperation.h
-		operations/COM_RenderLayersSpeedOperation.cpp
-		operations/COM_RenderLayersSpeedOperation.h
-		operations/COM_RenderLayersColorOperation.cpp
-		operations/COM_RenderLayersColorOperation.h
-		operations/COM_RenderLayersUVOperation.cpp
-		operations/COM_RenderLayersUVOperation.h
-		operations/COM_RenderLayersMistOperation.cpp
-		operations/COM_RenderLayersMistOperation.h
-		operations/COM_RenderLayersObjectIndexOperation.cpp
-		operations/COM_RenderLayersObjectIndexOperation.h
-		operations/COM_RenderLayersMaterialIndexOperation.cpp
-		operations/COM_RenderLayersMaterialIndexOperation.h
-		operations/COM_RenderLayersDiffuseOperation.cpp
-		operations/COM_RenderLayersDiffuseOperation.h
-		operations/COM_RenderLayersSpecularOperation.cpp
-		operations/COM_RenderLayersSpecularOperation.h
-		operations/COM_RenderLayersShadowOperation.cpp
-		operations/COM_RenderLayersShadowOperation.h
-		operations/COM_RenderLayersAOOperation.cpp
-		operations/COM_RenderLayersAOOperation.h
-		operations/COM_RenderLayersEmitOperation.cpp
-		operations/COM_RenderLayersEmitOperation.h
-		operations/COM_RenderLayersReflectionOperation.cpp
-		operations/COM_RenderLayersReflectionOperation.h
-		operations/COM_RenderLayersRefractionOperation.cpp
-		operations/COM_RenderLayersRefractionOperation.h
-		operations/COM_RenderLayersEnvironmentOperation.cpp
-		operations/COM_RenderLayersEnvironmentOperation.h
-		operations/COM_RenderLayersIndirectOperation.cpp
-		operations/COM_RenderLayersIndirectOperation.h
-		operations/COM_RenderLayersCyclesOperation.cpp
-		operations/COM_RenderLayersCyclesOperation.h
-
-operations/COM_ImageOperation.cpp
-operations/COM_ImageOperation.h
-operations/COM_MultilayerImageOperation.cpp
-operations/COM_MultilayerImageOperation.h
-operations/COM_TextureOperation.cpp
-operations/COM_TextureOperation.h
-operations/COM_BokehImageOperation.cpp
-operations/COM_BokehImageOperation.h
-operations/COM_LensGlowImageOperation.cpp
-operations/COM_LensGlowImageOperation.h
-
-
-		operations/COM_SocketProxyOperation.h
-		operations/COM_SocketProxyOperation.cpp
-
-		operations/COM_CompositorOperation.h
-		operations/COM_CompositorOperation.cpp
+
+
+	nodes/COM_KeyingScreenNode.cpp
+	nodes/COM_KeyingScreenNode.h
+	operations/COM_KeyingScreenOperation.cpp
+	operations/COM_KeyingScreenOperation.h
+
+	nodes/COM_KeyingNode.cpp
+	nodes/COM_KeyingNode.h
+	operations/COM_KeyingOperation.cpp
+	operations/COM_KeyingOperation.h
+	operations/COM_KeyingBlurOperation.cpp
+	operations/COM_KeyingBlurOperation.h
+	operations/COM_KeyingDespillOperation.cpp
+	operations/COM_KeyingDespillOperation.h
+	operations/COM_KeyingClipOperation.cpp
+	operations/COM_KeyingClipOperation.h
+
+	operations/COM_ColorSpillOperation.cpp
+	operations/COM_ColorSpillOperation.h
+	operations/COM_RenderLayersBaseProg.cpp
+	operations/COM_RenderLayersBaseProg.h
+	operations/COM_RenderLayersImageProg.cpp
+	operations/COM_RenderLayersImageProg.h
+	operations/COM_RenderLayersAlphaProg.cpp
+	operations/COM_RenderLayersAlphaProg.h
+	operations/COM_RenderLayersDepthProg.cpp
+	operations/COM_RenderLayersDepthProg.h
+	operations/COM_RenderLayersNormalOperation.cpp
+	operations/COM_RenderLayersNormalOperation.h
+	operations/COM_RenderLayersSpeedOperation.cpp
+	operations/COM_RenderLayersSpeedOperation.h
+	operations/COM_RenderLayersColorOperation.cpp
+	operations/COM_RenderLayersColorOperation.h
+	operations/COM_RenderLayersUVOperation.cpp
+	operations/COM_RenderLayersUVOperation.h
+	operations/COM_RenderLayersMistOperation.cpp
+	operations/COM_RenderLayersMistOperation.h
+	operations/COM_RenderLayersObjectIndexOperation.cpp
+	operations/COM_RenderLayersObjectIndexOperation.h
+	operations/COM_RenderLayersMaterialIndexOperation.cpp
+	operations/COM_RenderLayersMaterialIndexOperation.h
+	operations/COM_RenderLayersDiffuseOperation.cpp
+	operations/COM_RenderLayersDiffuseOperation.h
+	operations/COM_RenderLayersSpecularOperation.cpp
+	operations/COM_RenderLayersSpecularOperation.h
+	operations/COM_RenderLayersShadowOperation.cpp
+	operations/COM_RenderLayersShadowOperation.h
+	operations/COM_RenderLayersAOOperation.cpp
+	operations/COM_RenderLayersAOOperation.h
+	operations/COM_RenderLayersEmitOperation.cpp
+	operations/COM_RenderLayersEmitOperation.h
+	operations/COM_RenderLayersReflectionOperation.cpp
+	operations/COM_RenderLayersReflectionOperation.h
+	operations/COM_RenderLayersRefractionOperation.cpp
+	operations/COM_RenderLayersRefractionOperation.h
+	operations/COM_RenderLayersEnvironmentOperation.cpp
+	operations/COM_RenderLayersEnvironmentOperation.h
+	operations/COM_RenderLayersIndirectOperation.cpp
+	operations/COM_RenderLayersIndirectOperation.h
+	operations/COM_RenderLayersCyclesOperation.cpp
+	operations/COM_RenderLayersCyclesOperation.h
+
+	operations/COM_ImageOperation.cpp
+	operations/COM_ImageOperation.h
+	operations/COM_MultilayerImageOperation.cpp
+	operations/COM_MultilayerImageOperation.h
+	operations/COM_TextureOperation.cpp
+	operations/COM_TextureOperation.h
+	operations/COM_BokehImageOperation.cpp
+	operations/COM_BokehImageOperation.h
+
+
+	operations/COM_SocketProxyOperation.h
+	operations/COM_SocketProxyOperation.cpp
+
+	operations/COM_CompositorOperation.h
+	operations/COM_CompositorOperation.cpp
 	operations/COM_OutputFileOperation.h
 	operations/COM_OutputFileOperation.cpp
-		operations/COM_ViewerBaseOperation.h
-		operations/COM_ViewerBaseOperation.cpp
-		operations/COM_ViewerOperation.h
-		operations/COM_ViewerOperation.cpp
-		operations/COM_PreviewOperation.h
-		operations/COM_PreviewOperation.cpp
-		operations/COM_SplitViewerOperation.h
-		operations/COM_SplitViewerOperation.cpp
-		operations/COM_ConvertValueToColourProg.h
-		operations/COM_ConvertValueToColourProg.cpp
-		operations/COM_ConvertColourToValueProg.h
-		operations/COM_ConvertColourToValueProg.cpp
-		operations/COM_ConvertColorToBWOperation.h
-		operations/COM_ConvertColorToBWOperation.cpp
-		operations/COM_ConvertColorToVectorOperation.h
-		operations/COM_ConvertColorToVectorOperation.cpp
-		operations/COM_ConvertValueToVectorOperation.h
-		operations/COM_ConvertValueToVectorOperation.cpp
-		operations/COM_ConvertVectorToColorOperation.h
-		operations/COM_ConvertVectorToColorOperation.cpp
-		operations/COM_ConvertVectorToValueOperation.h
-		operations/COM_ConvertVectorToValueOperation.cpp
-operations/COM_ConvertDepthToRadiusOperation.h
-operations/COM_ConvertDepthToRadiusOperation.cpp
-		operations/COM_ZCombineOperation.cpp
-		operations/COM_ZCombineOperation.h
+	operations/COM_ViewerBaseOperation.h
+	operations/COM_ViewerBaseOperation.cpp
+	operations/COM_ViewerOperation.h
+	operations/COM_ViewerOperation.cpp
+	operations/COM_PreviewOperation.h
+	operations/COM_PreviewOperation.cpp
+	operations/COM_SplitViewerOperation.h
+	operations/COM_SplitViewerOperation.cpp
+	operations/COM_ConvertValueToColourProg.h
+	operations/COM_ConvertValueToColourProg.cpp
+	operations/COM_ConvertColourToValueProg.h
+	operations/COM_ConvertColourToValueProg.cpp
+	operations/COM_ConvertColorToBWOperation.h
+	operations/COM_ConvertColorToBWOperation.cpp
+	operations/COM_ConvertColorToVectorOperation.h
+	operations/COM_ConvertColorToVectorOperation.cpp
+	operations/COM_ConvertValueToVectorOperation.h
+	operations/COM_ConvertValueToVectorOperation.cpp
+	operations/COM_ConvertVectorToColorOperation.h
+	operations/COM_ConvertVectorToColorOperation.cpp
+	operations/COM_ConvertVectorToValueOperation.h
+	operations/COM_ConvertVectorToValueOperation.cpp
+	operations/COM_ConvertDepthToRadiusOperation.h
+	operations/COM_ConvertDepthToRadiusOperation.cpp
+	operations/COM_ZCombineOperation.cpp
+	operations/COM_ZCombineOperation.h
 
 	operations/COM_ConvertRGBToYCCOperation.h
 	operations/COM_ConvertRGBToYCCOperation.cpp
@@ -469,6 +483,8 @@ operations/COM_ConvertDepthToRadiusOperation.cpp
 	operations/COM_MixBaseOperation.cpp
 	operations/COM_MixBlendOperation.cpp
 	operations/COM_MixBlendOperation.h
+	operations/COM_MixGlareOperation.cpp
+	operations/COM_MixGlareOperation.h
 	operations/COM_MixAddOperation.h
 	operations/COM_MixAddOperation.cpp
 	operations/COM_MixMultiplyOperation.h
@@ -479,94 +495,92 @@ operations/COM_ConvertDepthToRadiusOperation.cpp
 	operations/COM_GammaOperation.h
 	operations/COM_ColorCorrectionOperation.cpp
 	operations/COM_ColorCorrectionOperation.h
-		operations/COM_SetValueOperation.h
-		operations/COM_SetValueOperation.cpp
-		operations/COM_SetColorOperation.h
-		operations/COM_SetColorOperation.cpp
-		operations/COM_SetVectorOperation.h
-		operations/COM_SetVectorOperation.cpp
-
-		operations/COM_MixBurnOperation.h
-		operations/COM_MixBurnOperation.cpp
-		operations/COM_MixColorOperation.h
-		operations/COM_MixColorOperation.cpp
-		operations/COM_MixDarkenOperation.h
-		operations/COM_MixDarkenOperation.cpp
-		operations/COM_MixDodgeOperation.h
-		operations/COM_MixDodgeOperation.cpp
-		operations/COM_MixDifferenceOperation.h
-		operations/COM_MixDifferenceOperation.cpp
-		operations/COM_MixDivideOperation.h
-		operations/COM_MixDivideOperation.cpp
-		operations/COM_MixHueOperation.h
-		operations/COM_MixHueOperation.cpp
-		operations/COM_MixLightenOperation.h
-		operations/COM_MixLightenOperation.cpp
-		operations/COM_MixLinearLightOperation.h
-		operations/COM_MixLinearLightOperation.cpp
-		operations/COM_MixOverlayOperation.h
-		operations/COM_MixOverlayOperation.cpp
-		operations/COM_MixSaturationOperation.h
-		operations/COM_MixSaturationOperation.cpp
-		operations/COM_MixScreenOperation.h
-		operations/COM_MixScreenOperation.cpp
-		operations/COM_MixSoftLightOperation.h
-		operations/COM_MixSoftLightOperation.cpp
-		operations/COM_MixValueOperation.h
-		operations/COM_MixValueOperation.cpp
-		operations/COM_MixSubtractOperation.h
-		operations/COM_MixSubtractOperation.cpp
+	operations/COM_SetValueOperation.h
+	operations/COM_SetValueOperation.cpp
+	operations/COM_SetColorOperation.h
+	operations/COM_SetColorOperation.cpp
+	operations/COM_SetVectorOperation.h
+	operations/COM_SetVectorOperation.cpp
+
+	operations/COM_MixBurnOperation.h
+	operations/COM_MixBurnOperation.cpp
+	operations/COM_MixColorOperation.h
+	operations/COM_MixColorOperation.cpp
+	operations/COM_MixDarkenOperation.h
+	operations/COM_MixDarkenOperation.cpp
+	operations/COM_MixDodgeOperation.h
+	operations/COM_MixDodgeOperation.cpp
+	operations/COM_MixDifferenceOperation.h
+	operations/COM_MixDifferenceOperation.cpp
+	operations/COM_MixDivideOperation.h
+	operations/COM_MixDivideOperation.cpp
+	operations/COM_MixHueOperation.h
+	operations/COM_MixHueOperation.cpp
+	operations/COM_MixLightenOperation.h
+	operations/COM_MixLightenOperation.cpp
+	operations/COM_MixLinearLightOperation.h
+	operations/COM_MixLinearLightOperation.cpp
+	operations/COM_MixOverlayOperation.h
+	operations/COM_MixOverlayOperation.cpp
+	operations/COM_MixSaturationOperation.h
+	operations/COM_MixSaturationOperation.cpp
+	operations/COM_MixScreenOperation.h
+	operations/COM_MixScreenOperation.cpp
+	operations/COM_MixSoftLightOperation.h
+	operations/COM_MixSoftLightOperation.cpp
+	operations/COM_MixValueOperation.h
+	operations/COM_MixValueOperation.cpp
+	operations/COM_MixSubtractOperation.h
+	operations/COM_MixSubtractOperation.cpp
 
 	operations/COM_MathBaseOperation.h
 	operations/COM_MathBaseOperation.cpp
 
-		operations/COM_AlphaOverMixedOperation.h
-		operations/COM_AlphaOverMixedOperation.cpp
-		operations/COM_AlphaOverPremultiplyOperation.h
-		operations/COM_AlphaOverPremultiplyOperation.cpp
-		operations/COM_AlphaOverKeyOperation.h
-		operations/COM_AlphaOverKeyOperation.cpp
-
-		operations/COM_ColorBalanceLGGOperation.h
-		operations/COM_ColorBalanceLGGOperation.cpp
-		operations/COM_ColorBalanceASCCDLOperation.h
-		operations/COM_ColorBalanceASCCDLOperation.cpp
-		operations/COM_InvertOperation.cpp
-		operations/COM_InvertOperation.h
+	operations/COM_AlphaOverMixedOperation.h
+	operations/COM_AlphaOverMixedOperation.cpp
+	operations/COM_AlphaOverPremultiplyOperation.h
+	operations/COM_AlphaOverPremultiplyOperation.cpp
+	operations/COM_AlphaOverKeyOperation.h
+	operations/COM_AlphaOverKeyOperation.cpp
+
+	operations/COM_ColorBalanceLGGOperation.h
+	operations/COM_ColorBalanceLGGOperation.cpp
+	operations/COM_ColorBalanceASCCDLOperation.h
+	operations/COM_ColorBalanceASCCDLOperation.cpp
+	operations/COM_InvertOperation.cpp
+	operations/COM_InvertOperation.h
 	operations/COM_SetAlphaOperation.cpp
 	operations/COM_SetAlphaOperation.h
 	operations/COM_MapValueOperation.cpp
 	operations/COM_MapValueOperation.h
 
-# Distort operation
-		operations/COM_TranslateOperation.h
-		operations/COM_TranslateOperation.cpp
-		operations/COM_RotateOperation.h
-		operations/COM_RotateOperation.cpp
-		operations/COM_ScaleOperation.h
-		operations/COM_ScaleOperation.cpp
-		operations/COM_MapUVOperation.h
-		operations/COM_MapUVOperation.cpp
-		operations/COM_DisplaceOperation.h
-		operations/COM_DisplaceOperation.cpp
-		operations/COM_DisplaceSimpleOperation.h
-		operations/COM_DisplaceSimpleOperation.cpp
-		operations/COM_FlipOperation.h
-		operations/COM_FlipOperation.cpp
-		operations/COM_ProjectorLensDistortionOperation.cpp
-		operations/COM_ProjectorLensDistortionOperation.h
-		operations/COM_ScreenLensDistortionOperation.cpp
-		operations/COM_ScreenLensDistortionOperation.h
-
-#Filter operations
+	# Distort operation
+	operations/COM_TranslateOperation.h
+	operations/COM_TranslateOperation.cpp
+	operations/COM_RotateOperation.h
+	operations/COM_RotateOperation.cpp
+	operations/COM_ScaleOperation.h
+	operations/COM_ScaleOperation.cpp
+	operations/COM_MapUVOperation.h
+	operations/COM_MapUVOperation.cpp
+	operations/COM_DisplaceOperation.h
+	operations/COM_DisplaceOperation.cpp
+	operations/COM_DisplaceSimpleOperation.h
+	operations/COM_DisplaceSimpleOperation.cpp
+	operations/COM_FlipOperation.h
+	operations/COM_FlipOperation.cpp
+	operations/COM_ProjectorLensDistortionOperation.cpp
+	operations/COM_ProjectorLensDistortionOperation.h
+	operations/COM_ScreenLensDistortionOperation.cpp
+	operations/COM_ScreenLensDistortionOperation.h
+
+	#Filter operations
 	operations/COM_ConvolutionFilterOperation.h
 	operations/COM_ConvolutionFilterOperation.cpp
 	operations/COM_ConvolutionEdgeFilterOperation.h
 	operations/COM_ConvolutionEdgeFilterOperation.cpp
 	operations/COM_DilateErodeOperation.cpp
 	operations/COM_DilateErodeOperation.h
-	operations/COM_FogGlowImageOperation.cpp
-	operations/COM_FogGlowImageOperation.h
 	operations/COM_GlareThresholdOperation.cpp
 	operations/COM_GlareThresholdOperation.h
 	operations/COM_GlareBaseOperation.cpp
@@ -575,11 +589,15 @@ operations/COM_ConvertDepthToRadiusOperation.cpp
 	operations/COM_GlareSimpleStarOperation.h
 	operations/COM_GlareStreaksOperation.cpp
 	operations/COM_GlareStreaksOperation.h
+	operations/COM_GlareGhostOperation.cpp
+	operations/COM_GlareGhostOperation.h
+	operations/COM_GlareFogGlowOperation.cpp
+	operations/COM_GlareFogGlowOperation.h
 	operations/COM_SetSamplerOperation.cpp
 	operations/COM_SetSamplerOperation.h
 
 
-#Convert operations
+	#Convert operations
 	operations/COM_IDMaskOperation.cpp
 	operations/COM_IDMaskOperation.h
 
@@ -590,7 +608,8 @@ operations/COM_ConvertDepthToRadiusOperation.cpp
 
 	operations/COM_DotproductOperation.cpp
 	operations/COM_DotproductOperation.h
-# Matte operation
+
+	# Matte operation
 	operations/COM_BoxMaskOperation.h
 	operations/COM_BoxMaskOperation.cpp
 	operations/COM_EllipseMaskOperation.h
@@ -603,6 +622,9 @@ operations/COM_ConvertDepthToRadiusOperation.cpp
 
 	operations/COM_AntiAliasOperation.cpp
 	operations/COM_AntiAliasOperation.h
+
+	operations/COM_MaskOperation.cpp
+	operations/COM_MaskOperation.h
 )
 
 blender_add_lib(bf_compositor "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/compositor/COM_compositor.h b/source/blender/compositor/COM_compositor.h
index b33a48464e1..4789fed2efd 100644
--- a/source/blender/compositor/COM_compositor.h
+++ b/source/blender/compositor/COM_compositor.h
@@ -21,256 +21,256 @@
  */
 
  #ifdef __cplusplus
- extern "C" {
+extern "C" {
  #endif
 
 #include "DNA_node_types.h"
 
 /**
-  * @defgroup Model The data model of the compositor
-  * @defgroup Memory The memory management stuff
-  * @defgroup Execution The execution logic
-  * @defgroup Conversion Conversion logic
-  * @defgroup Node All nodes of the compositor
-  * @defgroup Operation All operations of the compositor
-  *
-  * @mainpage Introduction of the Blender Compositor
-  *
-  * @section bcomp Blender compositor
-  * This project redesigns the interals of Blender's compositor. The project has been executed in 2011 by At Mind.
-  * At Mind is a technology company located in Amsterdam, The Netherlands.
-  * The project has been crowdfunded. This code has been released under GPL2 to be used in Blender.
-  *
-  * @section goals The goals of the project
-  * the new compositor has 2 goals.
-  *   - Make a faster compositor (speed of calculation)
-  *   - Make the compositor work faster for you (workflow)
-  *
-  * @section speed Faster compositor
-  * The speedup has been done by making better use of the hardware Blenders is working on. The previous compositor only
-  * used a single threaded model to calculate a node. The only exception to this is the Defocus node.
-  * Only when it is possible to calculate two full nodes in parallel a second thread was used.
-  * Current workstations have 8-16 threads available, and most of the time these are idle.
-  *
-  * In the new compositor we want to use as much of threads as possible. Even new OpenCL capable GPU-hardware can be
-  * used for calculation.
-  *
-  * @section workflow Work faster
-  * The previous compositor only showed the final image. The compositor could wait a long time before seeing the result
-  * of his work. The new compositor will work in a way that it will focus on getting information back to the user.
-  * It will prioritise its work to get earlier user feedback.
-  *
-  * @page memory Memory model
-  * The main issue is the type of memory model to use. Blender is used by consumers and professionals.
-  * Ranging from low-end machines to very high-end machines.
-  * The system should work on high-end machines and on low-end machines.
-  *
-  *
-  * @page executing Executing
-  * @section prepare Prepare execution
-  *
-  * during the preparation of the execution All ReadBufferOperation will receive an offset.
-  * This offset is used during execution as an optimization trick
-  * Next all operations will be initialized for execution @see NodeOperation.initExecution
-  * Next all ExecutionGroup's will be initialized for execution @see ExecutionGroup.initExecution
-  * this all is controlled from @see ExecutionSystem.execute
-  *
-  * @section priority Render priority
-  * Render priority is an priority of an output node. A user has a different need of Render priorities of output nodes
-  * than during editing.
-  * for example. the Active ViewerNode has top priority during editing, but during rendering a CompositeNode has.
-  * All NodeOperation has a setting for their renderpriority, but only for output NodeOperation these have effect.
-  * In ExecutionSystem.execute all priorities are checked. For every priority the ExecutionGroup's are check if the
-  * priority do match.
-  * When match the ExecutionGroup will be executed (this happens in serial)
-  *
-  * @see ExecutionSystem.execute control of the Render priority
-  * @see NodeOperation.getRenderPriority receive the render priority
-  * @see ExecutionGroup.execute the main loop to execute a whole ExecutionGroup
-  *
-  * @section order Chunk order
-  *
-  * When a ExecutionGroup is executed, first the order of chunks are determined.
-  * The settings are stored in the ViewerNode inside the ExecutionGroup. ExecutionGroups that have no viewernode,
-  * will use a default one.
-  * There are several possible chunk orders
-  *  - [@ref OrderOfChunks.COM_TO_CENTER_OUT]: Start calculating from a configurable point and order by nearest chunk
-  *  - [@ref OrderOfChunks.COM_TO_RANDOM]: Randomize all chunks.
-  *  - [@ref OrderOfChunks.COM_TO_TOP_DOWN]: Start calculation from the bottom to the top of the image
-  *  - [@ref OrderOfChunks.COM_TO_RULE_OF_THIRDS]: Experimental order based on 9 hotspots in the image
-  *
-  * When the chunkorder is determined, the first few chunks will be checked if they can be scheduled.
-  * Chunks can have three states:
-  *  - [@ref ChunkExecutionState.COM_ES_NOT_SCHEDULED]: Chunk is not yet scheduled, or dependacies are not met
-  *  - [@ref ChunkExecutionState.COM_ES_SCHEDULED]: All dependacies are met, chunk is scheduled, but not finished
-  *  - [@ref ChunkExecutionState.COM_ES_EXECUTED]: Chunk is finished
-  *
-  * @see ExecutionGroup.execute
-  * @see ViewerBaseOperation.getChunkOrder
-  * @see OrderOfChunks
-  *
-  * @section interest Area of interest
-  * An ExecutionGroup can have dependancies to other ExecutionGroup's. Data passing from one ExecutionGroup to another
-  * one are stored in 'chunks'.
-  * If not all input chunks are available the chunk execution will not be scheduled.
-  * <pre>
-  * +-------------------------------------+              +--------------------------------------+
-  * | ExecutionGroup A                    |              | ExecutionGroup B                     |
-  * | +----------------+  +-------------+ |              | +------------+   +-----------------+ |
-  * | | NodeOperation a|  | WriteBuffer | |              | | ReadBuffer |   | ViewerOperation | |
-  * | |                *==* Operation   | |              | | Operation  *===*                 | |
-  * | |                |  |             | |              | |            |   |                 | |
-  * | +----------------+  +-------------+ |              | +------------+   +-----------------+ |
-  * |                                |    |              |   |                                  |
-  * +--------------------------------|----+              +---|----------------------------------+
-  *                                  |                       |
-  *                                  |                       |
-  *                                +---------------------------+
-  *                                | MemoryProxy               |
-  *                                | +----------+  +---------+ |
-  *                                | | Chunk a  |  | Chunk b | |
-  *                                | |          |  |         | |
-  *                                | +----------+  +---------+ |
-  *                                |                           |
-  *                                +---------------------------+
-  * </pre>
-  *
-  * In the above example ExecutionGroup B has an outputoperation (ViewerOperation) and is being executed.
-  * The first chunk is evaluated [@ref ExecutionGroup.scheduleChunkWhenPossible],
-  * but not all input chunks are available. The relevant ExecutionGroup (that can calculate the missing chunks;
-  * ExecutionGroup A) is asked to calculate the area ExecutionGroup B is missing.
-  * [@ref ExecutionGroup.scheduleAreaWhenPossible]
-  * ExecutionGroup B checks what chunks the area spans, and tries to schedule these chunks.
-  * If all input data is available these chunks are scheduled [@ref ExecutionGroup.scheduleChunk]
-  *
-  * <pre>
-  *
-  * +-------------------------+        +----------------+                           +----------------+
-  * | ExecutionSystem.execute |        | ExecutionGroup |                           | ExecutionGroup |
-  * +-------------------------+        | (B)            |                           | (A)            |
-  *            O                       +----------------+                           +----------------+
-  *            O                                |                                            |
-  *            O       ExecutionGroup.execute   |                                            |
-  *            O------------------------------->O                                            |
-  *            .                                O                                            |
-  *            .                                O-------\                                    |
-  *            .                                .       | ExecutionGroup.scheduleChunkWhenPossible
-  *            .                                .  O----/ (*)                                |
-  *            .                                .  O                                         |
-  *            .                                .  O                                         |
-  *            .                                .  O  ExecutionGroup.scheduleAreaWhenPossible|
-  *            .                                .  O---------------------------------------->O
-  *            .                                .  .                                         O----------\ ExecutionGroup.scheduleChunkWhenPossible
-  *            .                                .  .                                         .          | (*)
-  *            .                                .  .                                         .  O-------/
-  *            .                                .  .                                         .  O
-  *            .                                .  .                                         .  O
-  *            .                                .  .                                         .  O-------\ ExecutionGroup.scheduleChunk
-  *            .                                .  .                                         .  .       |
-  *            .                                .  .                                         .  .  O----/
-  *            .                                .  .                                         .  O<=O
-  *            .                                .  .                                         O<=O
-  *            .                                .  .                                         O
-  *            .                                .  O<========================================O
-  *            .                                .  O                                         |
-  *            .                                O<=O                                         |
-  *            .                                O                                            |
-  *            .                                O                                            |
-  * </pre>
-  *
-  * This happens until all chunks of (ExecutionGroup B) are finished executing or the user break's the process.
-  *
-  * NodeOperation like the ScaleOperation can influence the area of interest by reimplementing the
-  * [@ref NodeOperation.determineAreaOfInterest] method
-  *
-  * <pre>
-  *
-  * +--------------------------+                             +---------------------------------+
-  * | ExecutionGroup A         |                             | ExecutionGroup B                |
-  * |                          |                             |                                 |
-  * +--------------------------+                             +---------------------------------+
-  *           Needed chunks from ExecutionGroup A               |   Chunk of ExecutionGroup B (to be evaluated)
-  *            +-------+ +-------+                              |                  +--------+
-  *            |Chunk 1| |Chunk 2|               +----------------+                |Chunk 1 |
-  *            |       | |       |               | ScaleOperation |                |        |
-  *            +-------+ +-------+               +----------------+                +--------+
-  *
-  *            +-------+ +-------+
-  *            |Chunk 3| |Chunk 4|
-  *            |       | |       |
-  *            +-------+ +-------+
-  *
-  * </pre>
-  *
-  * @see ExecutionGroup.execute Execute a complete ExecutionGroup. Halts until finished or breaked by user
-  * @see ExecutionGroup.scheduleChunkWhenPossible Tries to schedule a single chunk,
-  * checks if all input data is available. Can trigger dependant chunks to be calculated
-  * @see ExecutionGroup.scheduleAreaWhenPossible Tries to schedule an area. This can be multiple chunks
-  * (is called from [@ref ExecutionGroup.scheduleChunkWhenPossible])
-  * @see ExecutionGroup.scheduleChunk Schedule a chunk on the WorkScheduler
-  * @see NodeOperation.determineDependingAreaOfInterest Influence the area of interest of a chunk.
-  * @see WriteBufferOperation NodeOperation to write to a MemoryProxy/MemoryBuffer
-  * @see ReadBufferOperation NodeOperation to read from a MemoryProxy/MemoryBuffer
-  * @see MemoryProxy proxy for information about memory image (a image consist out of multiple chunks)
-  * @see MemoryBuffer Allocated memory for a single chunk
-  *
-  * @section workscheduler WorkScheduler
-  * the WorkScheduler is implemented as a static class. the responsibility of the WorkScheduler is to balance
-  * WorkPackages to the available and free devices.
-  * the workscheduler can work in 2 states. For witching these between the state you need to recompile blender
-  *
-  * @subsection multithread Multi threaded
-  * Default the workscheduler will place all work as WorkPackage in a queue.
-  * For every CPUcore a working thread is created. These working threads will ask the WorkScheduler if there is work
-  * for a specific Device.
-  * the workscheduler will find work for the device and the device will be asked to execute the WorkPackage
+ * @defgroup Model The data model of the compositor
+ * @defgroup Memory The memory management stuff
+ * @defgroup Execution The execution logic
+ * @defgroup Conversion Conversion logic
+ * @defgroup Node All nodes of the compositor
+ * @defgroup Operation All operations of the compositor
+ *
+ * @mainpage Introduction of the Blender Compositor
+ *
+ * @section bcomp Blender compositor
+ * This project redesigns the interals of Blender's compositor. The project has been executed in 2011 by At Mind.
+ * At Mind is a technology company located in Amsterdam, The Netherlands.
+ * The project has been crowdfunded. This code has been released under GPL2 to be used in Blender.
+ *
+ * @section goals The goals of the project
+ * the new compositor has 2 goals.
+ *   - Make a faster compositor (speed of calculation)
+ *   - Make the compositor work faster for you (workflow)
+ *
+ * @section speed Faster compositor
+ * The speedup has been done by making better use of the hardware Blenders is working on. The previous compositor only
+ * used a single threaded model to calculate a node. The only exception to this is the Defocus node.
+ * Only when it is possible to calculate two full nodes in parallel a second thread was used.
+ * Current workstations have 8-16 threads available, and most of the time these are idle.
+ *
+ * In the new compositor we want to use as much of threads as possible. Even new OpenCL capable GPU-hardware can be
+ * used for calculation.
+ *
+ * @section workflow Work faster
+ * The previous compositor only showed the final image. The compositor could wait a long time before seeing the result
+ * of his work. The new compositor will work in a way that it will focus on getting information back to the user.
+ * It will prioritise its work to get earlier user feedback.
+ *
+ * @page memory Memory model
+ * The main issue is the type of memory model to use. Blender is used by consumers and professionals.
+ * Ranging from low-end machines to very high-end machines.
+ * The system should work on high-end machines and on low-end machines.
+ *
+ *
+ * @page executing Executing
+ * @section prepare Prepare execution
+ *
+ * during the preparation of the execution All ReadBufferOperation will receive an offset.
+ * This offset is used during execution as an optimization trick
+ * Next all operations will be initialized for execution @see NodeOperation.initExecution
+ * Next all ExecutionGroup's will be initialized for execution @see ExecutionGroup.initExecution
+ * this all is controlled from @see ExecutionSystem.execute
+ *
+ * @section priority Render priority
+ * Render priority is an priority of an output node. A user has a different need of Render priorities of output nodes
+ * than during editing.
+ * for example. the Active ViewerNode has top priority during editing, but during rendering a CompositeNode has.
+ * All NodeOperation has a setting for their renderpriority, but only for output NodeOperation these have effect.
+ * In ExecutionSystem.execute all priorities are checked. For every priority the ExecutionGroup's are check if the
+ * priority do match.
+ * When match the ExecutionGroup will be executed (this happens in serial)
+ *
+ * @see ExecutionSystem.execute control of the Render priority
+ * @see NodeOperation.getRenderPriority receive the render priority
+ * @see ExecutionGroup.execute the main loop to execute a whole ExecutionGroup
+ *
+ * @section order Chunk order
+ *
+ * When a ExecutionGroup is executed, first the order of chunks are determined.
+ * The settings are stored in the ViewerNode inside the ExecutionGroup. ExecutionGroups that have no viewernode,
+ * will use a default one.
+ * There are several possible chunk orders
+ *  - [@ref OrderOfChunks.COM_TO_CENTER_OUT]: Start calculating from a configurable point and order by nearest chunk
+ *  - [@ref OrderOfChunks.COM_TO_RANDOM]: Randomize all chunks.
+ *  - [@ref OrderOfChunks.COM_TO_TOP_DOWN]: Start calculation from the bottom to the top of the image
+ *  - [@ref OrderOfChunks.COM_TO_RULE_OF_THIRDS]: Experimental order based on 9 hotspots in the image
+ *
+ * When the chunkorder is determined, the first few chunks will be checked if they can be scheduled.
+ * Chunks can have three states:
+ *  - [@ref ChunkExecutionState.COM_ES_NOT_SCHEDULED]: Chunk is not yet scheduled, or dependacies are not met
+ *  - [@ref ChunkExecutionState.COM_ES_SCHEDULED]: All dependacies are met, chunk is scheduled, but not finished
+ *  - [@ref ChunkExecutionState.COM_ES_EXECUTED]: Chunk is finished
+ *
+ * @see ExecutionGroup.execute
+ * @see ViewerBaseOperation.getChunkOrder
+ * @see OrderOfChunks
+ *
+ * @section interest Area of interest
+ * An ExecutionGroup can have dependancies to other ExecutionGroup's. Data passing from one ExecutionGroup to another
+ * one are stored in 'chunks'.
+ * If not all input chunks are available the chunk execution will not be scheduled.
+ * <pre>
+ * +-------------------------------------+              +--------------------------------------+
+ * | ExecutionGroup A                    |              | ExecutionGroup B                     |
+ * | +----------------+  +-------------+ |              | +------------+   +-----------------+ |
+ * | | NodeOperation a|  | WriteBuffer | |              | | ReadBuffer |   | ViewerOperation | |
+ * | |                *==* Operation   | |              | | Operation  *===*                 | |
+ * | |                |  |             | |              | |            |   |                 | |
+ * | +----------------+  +-------------+ |              | +------------+   +-----------------+ |
+ * |                                |    |              |   |                                  |
+ * +--------------------------------|----+              +---|----------------------------------+
+ *                                  |                       |
+ *                                  |                       |
+ *                                +---------------------------+
+ *                                | MemoryProxy               |
+ *                                | +----------+  +---------+ |
+ *                                | | Chunk a  |  | Chunk b | |
+ *                                | |          |  |         | |
+ *                                | +----------+  +---------+ |
+ *                                |                           |
+ *                                +---------------------------+
+ * </pre>
+ *
+ * In the above example ExecutionGroup B has an outputoperation (ViewerOperation) and is being executed.
+ * The first chunk is evaluated [@ref ExecutionGroup.scheduleChunkWhenPossible],
+ * but not all input chunks are available. The relevant ExecutionGroup (that can calculate the missing chunks;
+ * ExecutionGroup A) is asked to calculate the area ExecutionGroup B is missing.
+ * [@ref ExecutionGroup.scheduleAreaWhenPossible]
+ * ExecutionGroup B checks what chunks the area spans, and tries to schedule these chunks.
+ * If all input data is available these chunks are scheduled [@ref ExecutionGroup.scheduleChunk]
+ *
+ * <pre>
+ *
+ * +-------------------------+        +----------------+                           +----------------+
+ * | ExecutionSystem.execute |        | ExecutionGroup |                           | ExecutionGroup |
+ * +-------------------------+        | (B)            |                           | (A)            |
+ *            O                       +----------------+                           +----------------+
+ *            O                                |                                            |
+ *            O       ExecutionGroup.execute   |                                            |
+ *            O------------------------------->O                                            |
+ *            .                                O                                            |
+ *            .                                O-------\                                    |
+ *            .                                .       | ExecutionGroup.scheduleChunkWhenPossible
+ *            .                                .  O----/ (*)                                |
+ *            .                                .  O                                         |
+ *            .                                .  O                                         |
+ *            .                                .  O  ExecutionGroup.scheduleAreaWhenPossible|
+ *            .                                .  O---------------------------------------->O
+ *            .                                .  .                                         O----------\ ExecutionGroup.scheduleChunkWhenPossible
+ *            .                                .  .                                         .          | (*)
+ *            .                                .  .                                         .  O-------/
+ *            .                                .  .                                         .  O
+ *            .                                .  .                                         .  O
+ *            .                                .  .                                         .  O-------\ ExecutionGroup.scheduleChunk
+ *            .                                .  .                                         .  .       |
+ *            .                                .  .                                         .  .  O----/
+ *            .                                .  .                                         .  O<=O
+ *            .                                .  .                                         O<=O
+ *            .                                .  .                                         O
+ *            .                                .  O<========================================O
+ *            .                                .  O                                         |
+ *            .                                O<=O                                         |
+ *            .                                O                                            |
+ *            .                                O                                            |
+ * </pre>
+ *
+ * This happens until all chunks of (ExecutionGroup B) are finished executing or the user break's the process.
+ *
+ * NodeOperation like the ScaleOperation can influence the area of interest by reimplementing the
+ * [@ref NodeOperation.determineAreaOfInterest] method
+ *
+ * <pre>
+ *
+ * +--------------------------+                             +---------------------------------+
+ * | ExecutionGroup A         |                             | ExecutionGroup B                |
+ * |                          |                             |                                 |
+ * +--------------------------+                             +---------------------------------+
+ *           Needed chunks from ExecutionGroup A               |   Chunk of ExecutionGroup B (to be evaluated)
+ *            +-------+ +-------+                              |                  +--------+
+ *            |Chunk 1| |Chunk 2|               +----------------+                |Chunk 1 |
+ *            |       | |       |               | ScaleOperation |                |        |
+ *            +-------+ +-------+               +----------------+                +--------+
+ *
+ *            +-------+ +-------+
+ *            |Chunk 3| |Chunk 4|
+ *            |       | |       |
+ *            +-------+ +-------+
+ *
+ * </pre>
+ *
+ * @see ExecutionGroup.execute Execute a complete ExecutionGroup. Halts until finished or breaked by user
+ * @see ExecutionGroup.scheduleChunkWhenPossible Tries to schedule a single chunk,
+ * checks if all input data is available. Can trigger dependant chunks to be calculated
+ * @see ExecutionGroup.scheduleAreaWhenPossible Tries to schedule an area. This can be multiple chunks
+ * (is called from [@ref ExecutionGroup.scheduleChunkWhenPossible])
+ * @see ExecutionGroup.scheduleChunk Schedule a chunk on the WorkScheduler
+ * @see NodeOperation.determineDependingAreaOfInterest Influence the area of interest of a chunk.
+ * @see WriteBufferOperation NodeOperation to write to a MemoryProxy/MemoryBuffer
+ * @see ReadBufferOperation NodeOperation to read from a MemoryProxy/MemoryBuffer
+ * @see MemoryProxy proxy for information about memory image (a image consist out of multiple chunks)
+ * @see MemoryBuffer Allocated memory for a single chunk
+ *
+ * @section workscheduler WorkScheduler
+ * the WorkScheduler is implemented as a static class. the responsibility of the WorkScheduler is to balance
+ * WorkPackages to the available and free devices.
+ * the workscheduler can work in 2 states. For witching these between the state you need to recompile blender
+ *
+ * @subsection multithread Multi threaded
+ * Default the workscheduler will place all work as WorkPackage in a queue.
+ * For every CPUcore a working thread is created. These working threads will ask the WorkScheduler if there is work
+ * for a specific Device.
+ * the workscheduler will find work for the device and the device will be asked to execute the WorkPackage
 
-  * @subsection singlethread Single threaded
-  * For debugging reasons the multi-threading can be disabled. This is done by changing the COM_CURRENT_THREADING_MODEL
-  * to COM_TM_NOTHREAD. When compiling the workscheduler
-  * will be changes to support no threading and run everything on the CPU.
-  *
-  * @section devices Devices
-  * A Device within the compositor context is a Hardware component that can used to calculate chunks.
-  * This chunk is encapseled in a WorkPackage.
-  * the WorkScheduler controls the devices and selects the device where a WorkPackage will be calculated.
-  *
-  * @subsection WS_Devices Workscheduler
-  * The WorkScheduler controls all Devices. When initializing the compositor the WorkScheduler selects
-  * all devices that will be used during compositor.
-  * There are two types of Devices, CPUDevice and OpenCLDevice.
-  * When an ExecutionGroup schedules a Chunk the schedule method of the WorkScheduler
-  * The Workscheduler determines if the chunk can be run on an OpenCLDevice
-  * (and that there are available OpenCLDevice). If this is the case the chunk will be added to the worklist for
-  * OpenCLDevice's
-  * otherwise the chunk will be added to the worklist of CPUDevices.
-  * 
-  * A thread will read the work-list and sends a workpackage to its device.
-  *
-  * @see WorkScheduler.schedule method that is called to schedule a chunk
-  * @see Device.execute method called to execute a chunk
-  *
-  * @subsection CPUDevice CPUDevice
-  * When a CPUDevice gets a WorkPackage the Device will get the inputbuffer that is needed to calculate the chunk.
-  * Allocation is already done by the ExecutionGroup.
-  * The outputbuffer of the chunk is being created.
-  * The OutputOperation of the ExecutionGroup is called to execute the area of the outputbuffer.
-  *
-  * @see ExecutionGroup 
-  * @see NodeOperation.executeRegion executes a single chunk of a NodeOperation
-  * @see CPUDevice.execute 
-  *
-  * @subsection GPUDevice OpenCLDevice
-  * 
-  * To be completed!
-  * @see NodeOperation.executeOpenCLRegion 
-  * @see OpenCLDevice.execute
-  *
-  * @section executePixel executing a pixel
-  * Finally the last step, the node functionality :)
+ * @subsection singlethread Single threaded
+ * For debugging reasons the multi-threading can be disabled. This is done by changing the COM_CURRENT_THREADING_MODEL
+ * to COM_TM_NOTHREAD. When compiling the workscheduler
+ * will be changes to support no threading and run everything on the CPU.
+ *
+ * @section devices Devices
+ * A Device within the compositor context is a Hardware component that can used to calculate chunks.
+ * This chunk is encapseled in a WorkPackage.
+ * the WorkScheduler controls the devices and selects the device where a WorkPackage will be calculated.
+ *
+ * @subsection WS_Devices Workscheduler
+ * The WorkScheduler controls all Devices. When initializing the compositor the WorkScheduler selects
+ * all devices that will be used during compositor.
+ * There are two types of Devices, CPUDevice and OpenCLDevice.
+ * When an ExecutionGroup schedules a Chunk the schedule method of the WorkScheduler
+ * The Workscheduler determines if the chunk can be run on an OpenCLDevice
+ * (and that there are available OpenCLDevice). If this is the case the chunk will be added to the worklist for
+ * OpenCLDevice's
+ * otherwise the chunk will be added to the worklist of CPUDevices.
+ *
+ * A thread will read the work-list and sends a workpackage to its device.
+ *
+ * @see WorkScheduler.schedule method that is called to schedule a chunk
+ * @see Device.execute method called to execute a chunk
+ *
+ * @subsection CPUDevice CPUDevice
+ * When a CPUDevice gets a WorkPackage the Device will get the inputbuffer that is needed to calculate the chunk.
+ * Allocation is already done by the ExecutionGroup.
+ * The outputbuffer of the chunk is being created.
+ * The OutputOperation of the ExecutionGroup is called to execute the area of the outputbuffer.
+ *
+ * @see ExecutionGroup
+ * @see NodeOperation.executeRegion executes a single chunk of a NodeOperation
+ * @see CPUDevice.execute
+ *
+ * @subsection GPUDevice OpenCLDevice
+ *
+ * To be completed!
+ * @see NodeOperation.executeOpenCLRegion
+ * @see OpenCLDevice.execute
+ *
+ * @section executePixel executing a pixel
+ * Finally the last step, the node functionality :)
 
-  * @page newnode Creating new nodes
-  */
+ * @page newnode Creating new nodes
+ */
 
 /**
  * @brief The main method that is used to execute the compositor tree.
diff --git a/source/blender/compositor/COM_defines.h b/source/blender/compositor/COM_defines.h
index df807091cb8..57b73c836df 100644
--- a/source/blender/compositor/COM_defines.h
+++ b/source/blender/compositor/COM_defines.h
@@ -24,12 +24,10 @@
 #define _COM_defines_h_
 
 /**
-  * @brief possible data types for SocketConnection
-  * @ingroup Model
-  */
+ * @brief possible data types for SocketConnection
+ * @ingroup Model
+ */
 typedef enum DataType {
-	/** @brief Unknown data type (or not yet known) */
-	COM_DT_UNKNOWN = 0,
 	/** @brief Value data type */
 	COM_DT_VALUE   = 1,
 	/** @brief Vector data type */
@@ -39,45 +37,59 @@ typedef enum DataType {
 } DataType;
 
 /**
-  * @brief Possible quality settings
-  * @see CompositorContext.quality
-  * @ingroup Execution
-  */
+ * @brief Possible quality settings
+ * @see CompositorContext.quality
+ * @ingroup Execution
+ */
 typedef enum CompositorQuality {
 	/** @brief High quality setting */
-	COM_QUALITY_HIGH   = 0 ,
+	COM_QUALITY_HIGH   = 0,
 	/** @brief Medium quality setting */
 	COM_QUALITY_MEDIUM = 1,
 	/** @brief Low quality setting */
 	COM_QUALITY_LOW    = 2
 } CompositorQuality;
 
+/**
+ * @brief Possible priority settings
+ * @ingroup Execution
+ */
+typedef enum CompositorPriority {
+	/** @brief High quality setting */
+	COM_PRIORITY_HIGH   = 2,
+	/** @brief Medium quality setting */
+	COM_PRIORITY_MEDIUM = 1,
+	/** @brief Low quality setting */
+	COM_PRIORITY_LOW    = 0
+} CompositorPriority;
+
 // configurable items
 
 // chunk size determination
 #define COM_PREVIEW_SIZE 140.0f
-#define COM_OPENCL_ENABLED
-#define COM_PREVIEW_ENABLED
+//#define COM_OPENCL_ENABLED
+//#define COM_DEBUG
+
 // workscheduler threading models
 /**
-  * COM_TM_QUEUE is a multithreaded model, which uses the BLI_thread_queue pattern. This is the default option.
-  */
+ * COM_TM_QUEUE is a multithreaded model, which uses the BLI_thread_queue pattern. This is the default option.
+ */
 #define COM_TM_QUEUE 1
 
 /**
-  * COM_TM_NOTHREAD is a single threading model, everything is executed in the caller thread. easy for debugging
-  */
+ * COM_TM_NOTHREAD is a single threading model, everything is executed in the caller thread. easy for debugging
+ */
 #define COM_TM_NOTHREAD 0
 
 /**
-  * COM_CURRENT_THREADING_MODEL can be one of the above, COM_TM_QUEUE is currently default.
-  */
+ * COM_CURRENT_THREADING_MODEL can be one of the above, COM_TM_QUEUE is currently default.
+ */
 #define COM_CURRENT_THREADING_MODEL COM_TM_QUEUE
 // chunk order
 /**
-  * @brief The order of chunks to be scheduled
-  * @ingroup Execution
-  */
+ * @brief The order of chunks to be scheduled
+ * @ingroup Execution
+ */
 typedef enum OrderOfChunks {
 	/** @brief order from a distance to centerX/centerY */
 	COM_TO_CENTER_OUT = 0,
@@ -89,11 +101,10 @@ typedef enum OrderOfChunks {
 	COM_TO_RULE_OF_THIRDS = 3
 } OrderOfChunks;
 
+#define COM_ORDER_OF_CHUNKS_DEFAULT COM_TO_CENTER_OUT
+
 #define COM_RULE_OF_THIRDS_DIVIDER 100.0f
 
 #define COM_NUMBER_OF_CHANNELS 4
 
-#define COM_DEFAULT_RESOLUTION_WIDTH 640
-#define COM_DEFAULT_RESOLUTION_HEIGHT 480
-
 #endif
diff --git a/source/blender/compositor/intern/COM_CPUDevice.cpp b/source/blender/compositor/intern/COM_CPUDevice.cpp
index 43ec892985a..95462b3c384 100644
--- a/source/blender/compositor/intern/COM_CPUDevice.cpp
+++ b/source/blender/compositor/intern/COM_CPUDevice.cpp
@@ -25,18 +25,14 @@
 void CPUDevice::execute(WorkPackage *work)
 {
 	const unsigned int chunkNumber = work->getChunkNumber();
-	ExecutionGroup * executionGroup = work->getExecutionGroup();
+	ExecutionGroup *executionGroup = work->getExecutionGroup();
 	rcti rect;
 
 	executionGroup->determineChunkRect(&rect, chunkNumber);
-	MemoryBuffer ** inputBuffers = executionGroup->getInputBuffers(chunkNumber);
-	MemoryBuffer * outputBuffer = executionGroup->allocateOutputBuffer(chunkNumber, &rect);
+	MemoryBuffer **inputBuffers = executionGroup->getInputBuffersCPU();
 
 	executionGroup->getOutputNodeOperation()->executeRegion(&rect, chunkNumber, inputBuffers);
 
 	executionGroup->finalizeChunkExecution(chunkNumber, inputBuffers);
-	if (outputBuffer != NULL) {
-		outputBuffer->setCreatedState();
-	}
 }
 
diff --git a/source/blender/compositor/intern/COM_CPUDevice.h b/source/blender/compositor/intern/COM_CPUDevice.h
index f577e2b8926..3dc8fff66a3 100644
--- a/source/blender/compositor/intern/COM_CPUDevice.h
+++ b/source/blender/compositor/intern/COM_CPUDevice.h
@@ -26,15 +26,15 @@
 #include "COM_Device.h"
 
 /**
-  * @brief class representing a CPU device. 
-  * @note for every hardware thread in the system a CPUDevice instance will exist in the workscheduler
-  */
-class CPUDevice: public Device {
+ * @brief class representing a CPU device.
+ * @note for every hardware thread in the system a CPUDevice instance will exist in the workscheduler
+ */
+class CPUDevice : public Device {
 public:
 	/**
-	  * @brief execute a WorkPackage
-	  * @param work the WorkPackage to execute
-	  */
+	 * @brief execute a WorkPackage
+	 * @param work the WorkPackage to execute
+	 */
 	void execute(WorkPackage *work);
 };
 
diff --git a/source/blender/compositor/intern/COM_ChannelInfo.cpp b/source/blender/compositor/intern/COM_ChannelInfo.cpp
index 7dafee5f955..f2fa62006d5 100644
--- a/source/blender/compositor/intern/COM_ChannelInfo.cpp
+++ b/source/blender/compositor/intern/COM_ChannelInfo.cpp
@@ -25,8 +25,8 @@
 #include <stdio.h>
 
 /**
-  * @brief create new ChannelInfo instance and sets the defaults.
-  */
+ * @brief create new ChannelInfo instance and sets the defaults.
+ */
 ChannelInfo::ChannelInfo()
 {
 	this->number = 0;
diff --git a/source/blender/compositor/intern/COM_ChannelInfo.h b/source/blender/compositor/intern/COM_ChannelInfo.h
index 40933bce6f5..399fdc62fa2 100644
--- a/source/blender/compositor/intern/COM_ChannelInfo.h
+++ b/source/blender/compositor/intern/COM_ChannelInfo.h
@@ -32,9 +32,9 @@
 using namespace std;
 
 /**
-  * @brief List of possible channel types
-  * @ingroup Model
-  */
+ * @brief List of possible channel types
+ * @ingroup Model
+ */
 typedef enum ChannelType {
 	COM_CT_ColorComponent /** @brief this channel is contains color information. Specific used is determined by channelnumber, and in the future color space */,
 	COM_CT_Alpha /** @brief this channel is contains transparency value */,
@@ -47,31 +47,31 @@ typedef enum ChannelType {
 } ChannelType;
 
 /**
-  * @brief ChannelInfo holds information about a channel.
-  *
-  * Channels are transported from node to node via a SocketConnection.
-  * ChannelInfo holds specific setting of these channels in order that the to-node of the connection
-  * Can handle specific logic per channel setting.
-  *
-  * @note currently this is not used, but a future place to implement color spacing and other things.
-  * @ingroup Model
-  */
+ * @brief ChannelInfo holds information about a channel.
+ *
+ * Channels are transported from node to node via a SocketConnection.
+ * ChannelInfo holds specific setting of these channels in order that the to-node of the connection
+ * Can handle specific logic per channel setting.
+ *
+ * @note currently this is not used, but a future place to implement color spacing and other things.
+ * @ingroup Model
+ */
 class ChannelInfo {
 private:
 	/**
-	  * @brief the channel number, in the connection. [0-3]
-	  */
+	 * @brief the channel number, in the connection. [0-3]
+	 */
 	int number;
 
 	/**
-	  * @brief type of channel
-	  */
+	 * @brief type of channel
+	 */
 	ChannelType type;
 
 	/**
-	  * @brieg Is this value in this channel premultiplied with its alpha
-	  * @note only valid if type = ColorComponent;
-	  */
+	 * @brieg Is this value in this channel premultiplied with its alpha
+	 * @note only valid if type = ColorComponent;
+	 */
 	bool premultiplied;
 
 //	/**
@@ -82,39 +82,39 @@ private:
 
 public:
 	/**
-	  * @brief creates a new ChannelInfo and set default values
-	  */
+	 * @brief creates a new ChannelInfo and set default values
+	 */
 	ChannelInfo();
 
 	/**
-	  * @brief set the index of this channel in the SocketConnection
-	  */
+	 * @brief set the index of this channel in the SocketConnection
+	 */
 	void setNumber(const int number) { this->number = number; }
 
 	/**
-	  * @brief get the index of this channel in the SocketConnection
-	  */
-	const int getNumber() const {return this->number; }
+	 * @brief get the index of this channel in the SocketConnection
+	 */
+	const int getNumber() const { return this->number; }
 
 	/**
-	  * @brief set the type of channel
-	  */
+	 * @brief set the type of channel
+	 */
 	void setType(const ChannelType type) { this->type = type; }
 
 	/**
-	  * @brief get the type of channel
-	  */
-	const ChannelType getType() const {return this->type; }
+	 * @brief get the type of channel
+	 */
+	const ChannelType getType() const { return this->type; }
 
 	/**
-	  * @brief set the premultiplicatioin of this channel
-	  */
+	 * @brief set the premultiplicatioin of this channel
+	 */
 	void setPremultiplied(const bool premultiplied) { this->premultiplied = premultiplied; }
 
 	/**
-	  * @brief is this channel premultiplied
-	  */
-	const bool isPremultiplied() const {return this->premultiplied;}
+	 * @brief is this channel premultiplied
+	 */
+	const bool isPremultiplied() const { return this->premultiplied; }
 };
 
 
diff --git a/source/blender/compositor/intern/COM_ChunkOrder.cpp b/source/blender/compositor/intern/COM_ChunkOrder.cpp
index 387e4a6ba70..02c28a1997a 100644
--- a/source/blender/compositor/intern/COM_ChunkOrder.cpp
+++ b/source/blender/compositor/intern/COM_ChunkOrder.cpp
@@ -35,7 +35,7 @@ void ChunkOrder::determineDistance(ChunkOrderHotspot **hotspots, unsigned int nu
 {
 	unsigned int index;
 	double distance = MAXFLOAT;
-	for (index = 0 ; index < numberOfHotspots ; index ++) {
+	for (index = 0; index < numberOfHotspots; index++) {
 		ChunkOrderHotspot *hotspot = hotspots[index];
 		double ndistance = hotspot->determineDistance(this->x, this->y);
 		if (ndistance < distance) {
diff --git a/source/blender/compositor/intern/COM_ChunkOrder.h b/source/blender/compositor/intern/COM_ChunkOrder.h
index 3dbb4ae8080..f096ebeebfe 100644
--- a/source/blender/compositor/intern/COM_ChunkOrder.h
+++ b/source/blender/compositor/intern/COM_ChunkOrder.h
@@ -35,11 +35,11 @@ public:
 	void determineDistance(ChunkOrderHotspot **hotspots, unsigned int numberOfHotspots);
 	friend bool operator<(const ChunkOrder& a, const ChunkOrder& b);
 	
-	void setChunkNumber(unsigned int chunknumber) {this->number = chunknumber;}
-	void setX(int x) {this->x = x;}
-	void setY(int y) {this->y = y;}
-	unsigned int getChunkNumber() {return this->number;}
-	double getDistance() {return this->distance;}
+	void setChunkNumber(unsigned int chunknumber) { this->number = chunknumber; }
+	void setX(int x) { this->x = x; }
+	void setY(int y) { this->y = y; }
+	unsigned int getChunkNumber() { return this->number; }
+	double getDistance() { return this->distance; }
 };
 
 #endif
diff --git a/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp b/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp
index 94110f0bcfe..96568092b72 100644
--- a/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp
+++ b/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp
@@ -32,9 +32,9 @@ ChunkOrderHotspot::ChunkOrderHotspot(int x, int y, float addition)
 
 double ChunkOrderHotspot::determineDistance(int x, int y)
 {
-	int dx = x-this->x;
-	int dy = y-this->y;
-	double result = sqrt((double)(dx*dx+dy*dy));
-	result += this->addition;
+	int dx = x - this->x;
+	int dy = y - this->y;
+	double result = sqrt((double)(dx * dx + dy * dy));
+	result += (double)this->addition;
 	return result;
 }
diff --git a/source/blender/compositor/intern/COM_CompositorContext.cpp b/source/blender/compositor/intern/COM_CompositorContext.cpp
index 911de822f80..bb8e7d9606d 100644
--- a/source/blender/compositor/intern/COM_CompositorContext.cpp
+++ b/source/blender/compositor/intern/COM_CompositorContext.cpp
@@ -29,6 +29,7 @@ CompositorContext::CompositorContext()
 	this->scene = NULL;
 	this->quality = COM_QUALITY_HIGH;
 	this->hasActiveOpenCLDevices = false;
+	this->activegNode = NULL;
 }
 
 const int CompositorContext::getFramenumber() const
diff --git a/source/blender/compositor/intern/COM_CompositorContext.h b/source/blender/compositor/intern/COM_CompositorContext.h
index 2889f43290e..93872f4839f 100644
--- a/source/blender/compositor/intern/COM_CompositorContext.h
+++ b/source/blender/compositor/intern/COM_CompositorContext.h
@@ -32,113 +32,128 @@
 #include "COM_defines.h"
 
 /**
-  * @brief Overall context of the compositor
-  */
+ * @brief Overall context of the compositor
+ */
 class CompositorContext {
 private:
 	/**
-	  * @brief The rendering field describes if we are rendering (F12) or if we are editing (Node editor)
-	  * This field is initialized in ExecutionSystem and must only be read from that point on.
-	  * @see ExecutionSystem
-	  */
+	 * @brief The rendering field describes if we are rendering (F12) or if we are editing (Node editor)
+	 * This field is initialized in ExecutionSystem and must only be read from that point on.
+	 * @see ExecutionSystem
+	 */
 	bool rendering;
 
 	/**
-	  * @brief The quality of the composite.
-	  * This field is initialized in ExecutionSystem and must only be read from that point on.
-	  * @see ExecutionSystem
-	  */
+	 * @brief The quality of the composite.
+	 * This field is initialized in ExecutionSystem and must only be read from that point on.
+	 * @see ExecutionSystem
+	 */
 	CompositorQuality quality;
 
 	/**
-	  * @brief Reference to the scene that is being composited.
-	  * This field is initialized in ExecutionSystem and must only be read from that point on.
-	  * @see ExecutionSystem
-	  */
+	 * @brief Reference to the scene that is being composited.
+	 * This field is initialized in ExecutionSystem and must only be read from that point on.
+	 * @see ExecutionSystem
+	 */
 	Scene *scene;
 
 	/**
-	  * @brief reference to the bNodeTree
-	  * This field is initialized in ExecutionSystem and must only be read from that point on.
-	  * @see ExecutionSystem
-	  */
+	 * @brief reference to the bNodeTree
+	 * This field is initialized in ExecutionSystem and must only be read from that point on.
+	 * @see ExecutionSystem
+	 */
 	bNodeTree *bnodetree;
+	
+	/**
+	 * @brief activegNode the group node that is currently being edited.
+	 */
+	bNode *activegNode;
 
 	/**
-	  * @brief does this system have active opencl devices?
-	  */
+	 * @brief does this system have active opencl devices?
+	 */
 	bool hasActiveOpenCLDevices;
 
 public:
 	/**
-	  * @brief constructor initializes the context with default values.
-	  */
+	 * @brief constructor initializes the context with default values.
+	 */
 	CompositorContext();
 
 	/**
-	  * @brief set the rendering field of the context
-	  */
+	 * @brief set the rendering field of the context
+	 */
 	void setRendering(bool rendering) { this->rendering = rendering; }
 
 	/**
-	  * @brief get the rendering field of the context
-	  */
-	bool isRendering() const {return this->rendering;}
+	 * @brief get the rendering field of the context
+	 */
+	bool isRendering() const { return this->rendering; }
+
+	/**
+	 * @brief set the scene of the context
+	 */
+	void setScene(Scene *scene) { this->scene = scene; }
+
+	/**
+	 * @brief set the bnodetree of the context
+	 */
+	void setbNodeTree(bNodeTree *bnodetree) { this->bnodetree = bnodetree; }
 
 	/**
-	  * @brief set the scene of the context
-	  */
-	void setScene(Scene *scene) {this->scene = scene;}
+	 * @brief get the bnodetree of the context
+	 */
+	const bNodeTree *getbNodeTree() const { return this->bnodetree; }
 
 	/**
-	  * @brief set the bnodetree of the context
-	  */
-	void setbNodeTree(bNodeTree *bnodetree) {this->bnodetree = bnodetree;}
+	 * @brief set the active groupnode of the context
+	 */
+	void setActivegNode(bNode *gnode) { this->activegNode = gnode; }
 
 	/**
-	  * @brief get the bnodetree of the context
-	  */
-	const bNodeTree * getbNodeTree() const {return this->bnodetree;}
+	 * @brief get the active groupnode of the context
+	 */
+	const bNode *getActivegNode() const { return this->activegNode; }
 
 	/**
-	  * @brief get the scene of the context
-	  */
-	const Scene *getScene() const {return this->scene;}
+	 * @brief get the scene of the context
+	 */
+	const Scene *getScene() const { return this->scene; }
 
 	/**
-	  * @brief set the quality
-	  */
+	 * @brief set the quality
+	 */
 	void setQuality(CompositorQuality quality) {
 		this->quality = quality;
 	}
 
 	/**
-	  * @brief get the quality
-	  */
+	 * @brief get the quality
+	 */
 	const CompositorQuality getQuality() const {
 		return quality;
 	}
 
 	/**
-	  * @brief get the current framenumber of the scene in this context
-	  */
+	 * @brief get the current framenumber of the scene in this context
+	 */
 	const int getFramenumber() const;
 
 	/**
-	  * @brief has this system active openclDevices?
-	  */
+	 * @brief has this system active openclDevices?
+	 */
 	const bool getHasActiveOpenCLDevices() const {
 		return this->hasActiveOpenCLDevices;
 	}
 
 	/**
-	  * @brief set has this system active openclDevices?
-	  */
+	 * @brief set has this system active openclDevices?
+	 */
 	void setHasActiveOpenCLDevices(bool hasAvtiveOpenCLDevices) {
 		this->hasActiveOpenCLDevices = hasAvtiveOpenCLDevices;
 	}
 	
-	int getChunksize() {return this->getbNodeTree()->chunksize;}
+	int getChunksize() { return this->getbNodeTree()->chunksize; }
 	
 	const int isColorManaged() const;
 };
diff --git a/source/blender/compositor/intern/COM_Converter.cpp b/source/blender/compositor/intern/COM_Converter.cpp
index 3cb297801ca..0a8862e4017 100644
--- a/source/blender/compositor/intern/COM_Converter.cpp
+++ b/source/blender/compositor/intern/COM_Converter.cpp
@@ -20,101 +20,106 @@
  *		Monique Dewanchand
  */
 
-#include "COM_Converter.h"
+#include <string.h>
+
 #include "BKE_node.h"
-#include "COM_CompositorNode.h"
-#include "COM_RenderLayersNode.h"
+
+#include "COM_AlphaOverNode.h"
+#include "COM_BilateralBlurNode.h"
+#include "COM_BlurNode.h"
+#include "COM_BokehBlurNode.h"
+#include "COM_BokehImageNode.h"
+#include "COM_BoxMaskNode.h"
+#include "COM_BrightnessNode.h"
+#include "COM_ChannelMatteNode.h"
+#include "COM_ChromaMatteNode.h"
+#include "COM_ColorBalanceNode.h"
+#include "COM_ColorCorrectionNode.h"
+#include "COM_ColorCurveNode.h"
+#include "COM_ColorMatteNode.h"
+#include "COM_ColorNode.h"
+#include "COM_ColorRampNode.h"
+#include "COM_ColorSpillNode.h"
 #include "COM_ColorToBWNode.h"
-#include "string.h"
-#include "COM_SocketConnection.h"
+#include "COM_CombineHSVANode.h"
+#include "COM_CombineRGBANode.h"
+#include "COM_CombineYCCANode.h"
+#include "COM_CombineYUVANode.h"
+#include "COM_CompositorNode.h"
+#include "COM_ConvertAlphaNode.h"
+#include "COM_ConvertColorToVectorOperation.h"
 #include "COM_ConvertColourToValueProg.h"
 #include "COM_ConvertValueToColourProg.h"
-#include "COM_ConvertColorToVectorOperation.h"
 #include "COM_ConvertValueToVectorOperation.h"
 #include "COM_ConvertVectorToColorOperation.h"
 #include "COM_ConvertVectorToValueOperation.h"
+#include "COM_Converter.h"
+#include "COM_CropNode.h"
+#include "COM_DefocusNode.h"
+#include "COM_DifferenceMatteNode.h"
+#include "COM_DilateErodeNode.h"
+#include "COM_DirectionalBlurNode.h"
+#include "COM_DisplaceNode.h"
+#include "COM_DistanceMatteNode.h"
+#include "COM_DoubleEdgeMaskNode.h"
+#include "COM_EllipseMaskNode.h"
 #include "COM_ExecutionSystem.h"
+#include "COM_ExecutionSystemHelper.h"
+#include "COM_FilterNode.h"
+#include "COM_FlipNode.h"
+#include "COM_GammaNode.h"
+#include "COM_GlareNode.h"
+#include "COM_GroupNode.h"
+#include "COM_HueSaturationValueCorrectNode.h"
+#include "COM_HueSaturationValueNode.h"
+#include "COM_IDMaskNode.h"
+#include "COM_ImageNode.h"
+#include "COM_InvertNode.h"
+#include "COM_KeyingNode.h"
+#include "COM_KeyingScreenNode.h"
+#include "COM_LensDistortionNode.h"
+#include "COM_LuminanceMatteNode.h"
+#include "COM_MapUVNode.h"
+#include "COM_MapValueNode.h"
+#include "COM_MaskNode.h"
+#include "COM_MathNode.h"
 #include "COM_MixNode.h"
+#include "COM_MovieClipNode.h"
+#include "COM_MovieDistortionNode.h"
 #include "COM_MuteNode.h"
-#include "COM_TranslateNode.h"
+#include "COM_NormalNode.h"
+#include "COM_NormalizeNode.h"
+#include "COM_OutputFileNode.h"
+#include "COM_RenderLayersNode.h"
 #include "COM_RotateNode.h"
 #include "COM_ScaleNode.h"
-#include "COM_FlipNode.h"
-#include "COM_IDMaskNode.h"
-#include "COM_FilterNode.h"
-#include "COM_BrightnessNode.h"
-#include "COM_SeparateRGBANode.h"
-#include "COM_CombineRGBANode.h"
+#include "COM_ScaleOperation.h"
 #include "COM_SeparateHSVANode.h"
-#include "COM_CombineHSVANode.h"
-#include "COM_SeparateYUVANode.h"
-#include "COM_CombineYUVANode.h"
+#include "COM_SeparateRGBANode.h"
 #include "COM_SeparateYCCANode.h"
-#include "COM_CombineYCCANode.h"
-#include "COM_AlphaOverNode.h"
-#include "COM_ColorBalanceNode.h"
-#include "COM_ViewerNode.h"
-#include "COM_SplitViewerNode.h"
-#include "COM_InvertNode.h"
-#include "COM_GroupNode.h"
-#include "COM_NormalNode.h"
-#include "COM_NormalizeNode.h"
-#include "COM_ImageNode.h"
-#include "COM_BokehImageNode.h"
-#include "COM_ColorCurveNode.h"
-#include "COM_VectorCurveNode.h"
+#include "COM_SeparateYUVANode.h"
 #include "COM_SetAlphaNode.h"
-#include "COM_ConvertAlphaNode.h"
-#include "COM_MapUVNode.h"
-#include "COM_DisplaceNode.h"
-#include "COM_MathNode.h"
-#include "COM_HueSaturationValueNode.h"
-#include "COM_HueSaturationValueCorrectNode.h"
-#include "COM_ColorCorrectionNode.h"
-#include "COM_BoxMaskNode.h"
-#include "COM_EllipseMaskNode.h"
-#include "COM_GammaNode.h"
-#include "COM_ColorRampNode.h"
-#include "COM_DifferenceMatteNode.h"
-#include "COM_LuminanceMatteNode.h"
-#include "COM_DistanceMatteNode.h"
-#include "COM_ChromaMatteNode.h"
-#include "COM_ColorMatteNode.h"
-#include "COM_ChannelMatteNode.h"
-#include "COM_BlurNode.h"
-#include "COM_BokehBlurNode.h"
-#include "COM_DilateErodeNode.h"
-#include "COM_TranslateOperation.h"
-#include "COM_LensDistortionNode.h"
+#include "COM_SetValueOperation.h"
+#include "COM_SocketConnection.h"
+#include "COM_SplitViewerNode.h"
+#include "COM_Stabilize2dNode.h"
+#include "COM_SwitchNode.h"
 #include "COM_TextureNode.h"
-#include "COM_ColorNode.h"
-#include "COM_ValueNode.h"
 #include "COM_TimeNode.h"
-#include "COM_DirectionalBlurNode.h"
-#include "COM_ZCombineNode.h"
-#include "COM_SetValueOperation.h"
-#include "COM_ScaleOperation.h"
-#include "COM_ExecutionSystemHelper.h"
 #include "COM_TonemapNode.h"
-#include "COM_SwitchNode.h"
-#include "COM_GlareNode.h"
-#include "COM_MovieClipNode.h"
-#include "COM_ColorSpillNode.h"
-#include "COM_OutputFileNode.h"
-#include "COM_MapValueNode.h"
 #include "COM_TransformNode.h"
-#include "COM_Stabilize2dNode.h"
-#include "COM_BilateralBlurNode.h"
+#include "COM_TranslateNode.h"
+#include "COM_TranslateOperation.h"
+#include "COM_ValueNode.h"
 #include "COM_VectorBlurNode.h"
-#include "COM_MovieDistortionNode.h"
+#include "COM_VectorCurveNode.h"
 #include "COM_ViewLevelsNode.h"
-#include "COM_DefocusNode.h"
-#include "COM_DoubleEdgeMaskNode.h"
-#include "COM_CropNode.h"
+#include "COM_ViewerNode.h"
+#include "COM_ZCombineNode.h"
 
 Node *Converter::convert(bNode *bNode)
 {
-	Node * node;
+	Node *node;
 
 	if (bNode->flag & NODE_MUTED) {
 		node = new MuteNode(bNode);
@@ -122,235 +127,244 @@ Node *Converter::convert(bNode *bNode)
 	}
 
 	switch (bNode->type) {
-	case CMP_NODE_COMPOSITE:
-		node = new CompositorNode(bNode);
-		break;
-	case CMP_NODE_R_LAYERS:
-		node = new RenderLayersNode(bNode);
-		break;
-	case CMP_NODE_TEXTURE:
-		node = new TextureNode(bNode);
-		break;
-	case CMP_NODE_RGBTOBW:
-		node = new ColourToBWNode(bNode);
-		break;
-	case CMP_NODE_MIX_RGB:
-		node = new MixNode(bNode);
-		break;
-	case CMP_NODE_TRANSLATE:
-		node = new TranslateNode(bNode);
-		break;
-	case CMP_NODE_SCALE:
-		node = new ScaleNode(bNode);
-		break;
-	case CMP_NODE_ROTATE:
-		node = new RotateNode(bNode);
-		break;
-	case CMP_NODE_FLIP:
-		node = new FlipNode(bNode);
-		break;
-	case CMP_NODE_FILTER:
-		node = new FilterNode(bNode);
-		break;
-	case CMP_NODE_ID_MASK:
-		node = new IDMaskNode(bNode);
-		break;
-	case CMP_NODE_BRIGHTCONTRAST:
-		node = new BrightnessNode(bNode);
-		break;
-	case CMP_NODE_SEPRGBA:
-		node = new SeparateRGBANode(bNode);
-		break;
-	case CMP_NODE_COMBRGBA:
-		node = new CombineRGBANode(bNode);
-		break;
-	case CMP_NODE_SEPHSVA:
-		node = new SeparateHSVANode(bNode);
-		break;
-	case CMP_NODE_COMBHSVA:
-		node = new CombineHSVANode(bNode);
-		break;
-	case CMP_NODE_SEPYUVA:
-		node = new SeparateYUVANode(bNode);
-		break;
-	case CMP_NODE_COMBYUVA:
-		node = new CombineYUVANode(bNode);
-		break;
-	case CMP_NODE_SEPYCCA:
-		node = new SeparateYCCANode(bNode);
-		break;
-	case CMP_NODE_COMBYCCA:
-		node = new CombineYCCANode(bNode);
-		break;
-	case CMP_NODE_ALPHAOVER:
-		node = new AlphaOverNode(bNode);
-		break;
-	case CMP_NODE_COLORBALANCE:
-		node = new ColorBalanceNode(bNode);
-		break;
-	case CMP_NODE_VIEWER:
-		node = new ViewerNode(bNode);
-		break;
-	case CMP_NODE_SPLITVIEWER:
-		node = new SplitViewerNode(bNode);
-		break;
-	case CMP_NODE_INVERT:
-		node = new InvertNode(bNode);
-		break;
-	case NODE_GROUP:
-		node = new GroupNode(bNode);
-		break;
-	case CMP_NODE_NORMAL:
-		node = new NormalNode(bNode);
-		break;
-	case CMP_NODE_NORMALIZE:
-		node = new NormalizeNode(bNode);
-		break;
-	case CMP_NODE_IMAGE:
-		node = new ImageNode(bNode);
-		break;
-	case CMP_NODE_SETALPHA:
-		node = new SetAlphaNode(bNode);
-		break;
-	case CMP_NODE_PREMULKEY:
-		node = new ConvertAlphaNode(bNode);
-		break;
-	case CMP_NODE_MATH:
-		node = new MathNode(bNode);
-		break;
-	case CMP_NODE_HUE_SAT:
-		node = new HueSaturationValueNode(bNode);
-		break;
-	case CMP_NODE_COLORCORRECTION:
-		node = new ColorCorrectionNode(bNode);
-		break;
-	case CMP_NODE_MASK_BOX:
-		node = new BoxMaskNode(bNode);
-		break;
-	case CMP_NODE_MASK_ELLIPSE:
-		node = new EllipseMaskNode(bNode);
-		break;
-	case CMP_NODE_GAMMA:
-		node = new GammaNode(bNode);
-		break;
-	case CMP_NODE_CURVE_RGB:
-		node = new ColorCurveNode(bNode);
-		break;
-	case CMP_NODE_CURVE_VEC:
-		node = new VectorCurveNode(bNode);
-		break;
-	case CMP_NODE_HUECORRECT:
-		node = new HueSaturationValueCorrectNode(bNode);
-		break;
-	case CMP_NODE_MAP_UV:
-		node = new MapUVNode(bNode);
-		break;
-	case CMP_NODE_DISPLACE:
-		node = new DisplaceNode(bNode);
-		break;
-	case CMP_NODE_VALTORGB:
-		node = new ColorRampNode(bNode);
-		break;
-	case CMP_NODE_DIFF_MATTE:
-		node = new DifferenceMatteNode(bNode);
-		break;
-	case CMP_NODE_LUMA_MATTE:
-		node = new LuminanceMatteNode(bNode);
-		break;
-	case CMP_NODE_DIST_MATTE:
-		node = new DistanceMatteNode(bNode);
-		break;
-	case CMP_NODE_CHROMA_MATTE:
-		node = new ChromaMatteNode(bNode);
-		break;
-	case CMP_NODE_COLOR_MATTE:
-		node = new ColorMatteNode(bNode);
-		break;
-	case CMP_NODE_CHANNEL_MATTE:
-		node = new ChannelMatteNode(bNode);
-		break;
-	case CMP_NODE_BLUR:
-		node = new BlurNode(bNode);
-		break;
-	case CMP_NODE_BOKEHIMAGE:
-		node = new BokehImageNode(bNode);
-		break;
-	case CMP_NODE_BOKEHBLUR:
-		node = new BokehBlurNode(bNode);
-		break;
-	case CMP_NODE_DILATEERODE:
-		node = new DilateErodeNode(bNode);
-		break;
-	case CMP_NODE_LENSDIST:
-		node = new LensDistortionNode(bNode);
-		break;
-	case CMP_NODE_RGB:
-		node = new ColorNode(bNode);
-		break;
-	case CMP_NODE_VALUE:
-		node = new ValueNode(bNode);
-		break;
-	case CMP_NODE_TIME:
-		node = new TimeNode(bNode);
-		break;
-	case CMP_NODE_DBLUR:
-		node = new DirectionalBlurNode(bNode);
-		break;
-	case CMP_NODE_ZCOMBINE:
-		node = new ZCombineNode(bNode);
-		break;
-	case CMP_NODE_TONEMAP:
-		node = new TonemapNode(bNode);
-		break;
-	case CMP_NODE_SWITCH:
-		node = new SwitchNode(bNode);
-		break;
-	case CMP_NODE_GLARE:
-		node = new GlareNode(bNode);
-		break;
-	case CMP_NODE_MOVIECLIP:
-		node = new MovieClipNode(bNode);
-		break;
-	case CMP_NODE_COLOR_SPILL:
-		node = new ColorSpillNode(bNode);
-		break;
-case CMP_NODE_OUTPUT_FILE:
-		node = new OutputFileNode(bNode);
-		break;
-	case CMP_NODE_MAP_VALUE:
-		node = new MapValueNode(bNode);
-		break;
-	case CMP_NODE_TRANSFORM:
-		node = new TransformNode(bNode);
-		break;
-	case CMP_NODE_STABILIZE2D:
-		node = new Stabilize2dNode(bNode);
-		break;
-	case CMP_NODE_BILATERALBLUR:
-		node = new BilateralBlurNode(bNode);
-		break;
-	case CMP_NODE_VECBLUR:
-		node = new VectorBlurNode(bNode);
-		break;
-	case CMP_NODE_MOVIEDISTORTION:
-		node = new MovieDistortionNode(bNode);
-		break;
-	case CMP_NODE_VIEW_LEVELS:
-		node = new ViewLevelsNode(bNode);
-		break;
-	case CMP_NODE_DEFOCUS:
-		node = new DefocusNode(bNode);
-		break;
-	case CMP_NODE_DOUBLEEDGEMASK:
-		node = new DoubleEdgeMaskNode(bNode);
-		break;
-	case CMP_NODE_CROP:
-		node = new CropNode(bNode);
-		break;
-	/* not inplemented yet */
-	default:
-		node = new MuteNode(bNode);
-		break;
+		case CMP_NODE_COMPOSITE:
+			node = new CompositorNode(bNode);
+			break;
+		case CMP_NODE_R_LAYERS:
+			node = new RenderLayersNode(bNode);
+			break;
+		case CMP_NODE_TEXTURE:
+			node = new TextureNode(bNode);
+			break;
+		case CMP_NODE_RGBTOBW:
+			node = new ColourToBWNode(bNode);
+			break;
+		case CMP_NODE_MIX_RGB:
+			node = new MixNode(bNode);
+			break;
+		case CMP_NODE_TRANSLATE:
+			node = new TranslateNode(bNode);
+			break;
+		case CMP_NODE_SCALE:
+			node = new ScaleNode(bNode);
+			break;
+		case CMP_NODE_ROTATE:
+			node = new RotateNode(bNode);
+			break;
+		case CMP_NODE_FLIP:
+			node = new FlipNode(bNode);
+			break;
+		case CMP_NODE_FILTER:
+			node = new FilterNode(bNode);
+			break;
+		case CMP_NODE_ID_MASK:
+			node = new IDMaskNode(bNode);
+			break;
+		case CMP_NODE_BRIGHTCONTRAST:
+			node = new BrightnessNode(bNode);
+			break;
+		case CMP_NODE_SEPRGBA:
+			node = new SeparateRGBANode(bNode);
+			break;
+		case CMP_NODE_COMBRGBA:
+			node = new CombineRGBANode(bNode);
+			break;
+		case CMP_NODE_SEPHSVA:
+			node = new SeparateHSVANode(bNode);
+			break;
+		case CMP_NODE_COMBHSVA:
+			node = new CombineHSVANode(bNode);
+			break;
+		case CMP_NODE_SEPYUVA:
+			node = new SeparateYUVANode(bNode);
+			break;
+		case CMP_NODE_COMBYUVA:
+			node = new CombineYUVANode(bNode);
+			break;
+		case CMP_NODE_SEPYCCA:
+			node = new SeparateYCCANode(bNode);
+			break;
+		case CMP_NODE_COMBYCCA:
+			node = new CombineYCCANode(bNode);
+			break;
+		case CMP_NODE_ALPHAOVER:
+			node = new AlphaOverNode(bNode);
+			break;
+		case CMP_NODE_COLORBALANCE:
+			node = new ColorBalanceNode(bNode);
+			break;
+		case CMP_NODE_VIEWER:
+			node = new ViewerNode(bNode);
+			break;
+		case CMP_NODE_SPLITVIEWER:
+			node = new SplitViewerNode(bNode);
+			break;
+		case CMP_NODE_INVERT:
+			node = new InvertNode(bNode);
+			break;
+		case NODE_GROUP:
+			node = new GroupNode(bNode);
+			break;
+		case CMP_NODE_NORMAL:
+			node = new NormalNode(bNode);
+			break;
+		case CMP_NODE_NORMALIZE:
+			node = new NormalizeNode(bNode);
+			break;
+		case CMP_NODE_IMAGE:
+			node = new ImageNode(bNode);
+			break;
+		case CMP_NODE_SETALPHA:
+			node = new SetAlphaNode(bNode);
+			break;
+		case CMP_NODE_PREMULKEY:
+			node = new ConvertAlphaNode(bNode);
+			break;
+		case CMP_NODE_MATH:
+			node = new MathNode(bNode);
+			break;
+		case CMP_NODE_HUE_SAT:
+			node = new HueSaturationValueNode(bNode);
+			break;
+		case CMP_NODE_COLORCORRECTION:
+			node = new ColorCorrectionNode(bNode);
+			break;
+		case CMP_NODE_MASK_BOX:
+			node = new BoxMaskNode(bNode);
+			break;
+		case CMP_NODE_MASK_ELLIPSE:
+			node = new EllipseMaskNode(bNode);
+			break;
+		case CMP_NODE_GAMMA:
+			node = new GammaNode(bNode);
+			break;
+		case CMP_NODE_CURVE_RGB:
+			node = new ColorCurveNode(bNode);
+			break;
+		case CMP_NODE_CURVE_VEC:
+			node = new VectorCurveNode(bNode);
+			break;
+		case CMP_NODE_HUECORRECT:
+			node = new HueSaturationValueCorrectNode(bNode);
+			break;
+		case CMP_NODE_MAP_UV:
+			node = new MapUVNode(bNode);
+			break;
+		case CMP_NODE_DISPLACE:
+			node = new DisplaceNode(bNode);
+			break;
+		case CMP_NODE_VALTORGB:
+			node = new ColorRampNode(bNode);
+			break;
+		case CMP_NODE_DIFF_MATTE:
+			node = new DifferenceMatteNode(bNode);
+			break;
+		case CMP_NODE_LUMA_MATTE:
+			node = new LuminanceMatteNode(bNode);
+			break;
+		case CMP_NODE_DIST_MATTE:
+			node = new DistanceMatteNode(bNode);
+			break;
+		case CMP_NODE_CHROMA_MATTE:
+			node = new ChromaMatteNode(bNode);
+			break;
+		case CMP_NODE_COLOR_MATTE:
+			node = new ColorMatteNode(bNode);
+			break;
+		case CMP_NODE_CHANNEL_MATTE:
+			node = new ChannelMatteNode(bNode);
+			break;
+		case CMP_NODE_BLUR:
+			node = new BlurNode(bNode);
+			break;
+		case CMP_NODE_BOKEHIMAGE:
+			node = new BokehImageNode(bNode);
+			break;
+		case CMP_NODE_BOKEHBLUR:
+			node = new BokehBlurNode(bNode);
+			break;
+		case CMP_NODE_DILATEERODE:
+			node = new DilateErodeNode(bNode);
+			break;
+		case CMP_NODE_LENSDIST:
+			node = new LensDistortionNode(bNode);
+			break;
+		case CMP_NODE_RGB:
+			node = new ColorNode(bNode);
+			break;
+		case CMP_NODE_VALUE:
+			node = new ValueNode(bNode);
+			break;
+		case CMP_NODE_TIME:
+			node = new TimeNode(bNode);
+			break;
+		case CMP_NODE_DBLUR:
+			node = new DirectionalBlurNode(bNode);
+			break;
+		case CMP_NODE_ZCOMBINE:
+			node = new ZCombineNode(bNode);
+			break;
+		case CMP_NODE_TONEMAP:
+			node = new TonemapNode(bNode);
+			break;
+		case CMP_NODE_SWITCH:
+			node = new SwitchNode(bNode);
+			break;
+		case CMP_NODE_GLARE:
+			node = new GlareNode(bNode);
+			break;
+		case CMP_NODE_MOVIECLIP:
+			node = new MovieClipNode(bNode);
+			break;
+		case CMP_NODE_COLOR_SPILL:
+			node = new ColorSpillNode(bNode);
+			break;
+		case CMP_NODE_OUTPUT_FILE:
+			node = new OutputFileNode(bNode);
+			break;
+		case CMP_NODE_MAP_VALUE:
+			node = new MapValueNode(bNode);
+			break;
+		case CMP_NODE_TRANSFORM:
+			node = new TransformNode(bNode);
+			break;
+		case CMP_NODE_STABILIZE2D:
+			node = new Stabilize2dNode(bNode);
+			break;
+		case CMP_NODE_BILATERALBLUR:
+			node = new BilateralBlurNode(bNode);
+			break;
+		case CMP_NODE_VECBLUR:
+			node = new VectorBlurNode(bNode);
+			break;
+		case CMP_NODE_MOVIEDISTORTION:
+			node = new MovieDistortionNode(bNode);
+			break;
+		case CMP_NODE_VIEW_LEVELS:
+			node = new ViewLevelsNode(bNode);
+			break;
+		case CMP_NODE_DEFOCUS:
+			node = new DefocusNode(bNode);
+			break;
+		case CMP_NODE_DOUBLEEDGEMASK:
+			node = new DoubleEdgeMaskNode(bNode);
+			break;
+		case CMP_NODE_CROP:
+			node = new CropNode(bNode);
+			break;
+		case CMP_NODE_MASK:
+			node = new MaskNode(bNode);
+			break;
+		case CMP_NODE_KEYINGSCREEN:
+			node = new KeyingScreenNode(bNode);
+			break;
+		case CMP_NODE_KEYING:
+			node = new KeyingNode(bNode);
+			break;
+		/* not inplemented yet */
+		default:
+			node = new MuteNode(bNode);
+			break;
 	}
 	return node;
 }
@@ -358,9 +372,9 @@ void Converter::convertDataType(SocketConnection *connection, ExecutionSystem *s
 {
 	OutputSocket *outputSocket = connection->getFromSocket();
 	InputSocket *inputSocket = connection->getToSocket();
-	DataType fromDatatype = outputSocket->getActualDataType();
-	DataType toDatatype = inputSocket->getActualDataType();
-	NodeOperation * converter = NULL;
+	DataType fromDatatype = outputSocket->getDataType();
+	DataType toDatatype = inputSocket->getDataType();
+	NodeOperation *converter = NULL;
 	if (fromDatatype == COM_DT_VALUE && toDatatype == COM_DT_COLOR) {
 		converter = new ConvertValueToColourProg();
 	}
@@ -390,68 +404,68 @@ void Converter::convertResolution(SocketConnection *connection, ExecutionSystem
 {
 	InputSocketResizeMode mode = connection->getToSocket()->getResizeMode();
 
-	NodeOperation * toOperation = (NodeOperation*)connection->getToNode();
+	NodeOperation *toOperation = (NodeOperation *)connection->getToNode();
 	const float toWidth = toOperation->getWidth();
 	const float toHeight = toOperation->getHeight();
-	NodeOperation * fromOperation = (NodeOperation*)connection->getFromNode();
+	NodeOperation *fromOperation = (NodeOperation *)connection->getFromNode();
 	const float fromWidth = fromOperation->getWidth();
 	const float fromHeight = fromOperation->getHeight();
 	bool doCenter = false;
 	bool doScale = false;
-	float addX=	(toWidth-fromWidth)/2.0f;
-	float addY = (toHeight-fromHeight)/2.0f;
-	float scaleX=0;
-	float scaleY=0;
+	float addX = (toWidth - fromWidth) / 2.0f;
+	float addY = (toHeight - fromHeight) / 2.0f;
+	float scaleX = 0;
+	float scaleY = 0;
 
 	switch (mode) {
-	case COM_SC_NO_RESIZE:
-		break;
-	case COM_SC_CENTER:
-		doCenter = true;
-		break;
-	case COM_SC_FIT_WIDTH:
-		doCenter = true;
-		doScale = true;
-		scaleX = scaleY = toWidth/fromWidth;
-		break;
-	case COM_SC_FIT_HEIGHT:
-		doCenter = true;
-		doScale = true;
-		scaleX = scaleY = toHeight/fromHeight;
-		break;
-	case COM_SC_FIT:
-		doCenter = true;
-		doScale = true;
-		scaleX = toWidth/fromWidth;
-		scaleY = toHeight/fromHeight;
-		if (scaleX < scaleY) {
-			scaleX = scaleY;
-		}
-		else {
-			scaleY = scaleX;
-		}
-		break;
-	case COM_SC_STRETCH:
-		doCenter = true;
-		doScale = true;
-		scaleX = toWidth/fromWidth;
-		scaleY = toHeight/fromHeight;
-		break;
+		case COM_SC_NO_RESIZE:
+			break;
+		case COM_SC_CENTER:
+			doCenter = true;
+			break;
+		case COM_SC_FIT_WIDTH:
+			doCenter = true;
+			doScale = true;
+			scaleX = scaleY = toWidth / fromWidth;
+			break;
+		case COM_SC_FIT_HEIGHT:
+			doCenter = true;
+			doScale = true;
+			scaleX = scaleY = toHeight / fromHeight;
+			break;
+		case COM_SC_FIT:
+			doCenter = true;
+			doScale = true;
+			scaleX = toWidth / fromWidth;
+			scaleY = toHeight / fromHeight;
+			if (scaleX < scaleY) {
+				scaleX = scaleY;
+			}
+			else {
+				scaleY = scaleX;
+			}
+			break;
+		case COM_SC_STRETCH:
+			doCenter = true;
+			doScale = true;
+			scaleX = toWidth / fromWidth;
+			scaleY = toHeight / fromHeight;
+			break;
 
 	}
 
 	if (doCenter) {
 		NodeOperation *first = NULL;
 		SocketConnection *c;
-		ScaleOperation * scaleOperation = NULL;
+		ScaleOperation *scaleOperation = NULL;
 		if (doScale) {
 			scaleOperation = new ScaleOperation();
 			first = scaleOperation;
-			SetValueOperation * sxop = new SetValueOperation();
+			SetValueOperation *sxop = new SetValueOperation();
 			sxop->setValue(scaleX);
 			c = ExecutionSystemHelper::addLink(system->getConnections(), sxop->getOutputSocket(), scaleOperation->getInputSocket(1));
 			c->setIgnoreResizeCheck(true);
-			SetValueOperation * syop = new SetValueOperation();
+			SetValueOperation *syop = new SetValueOperation();
 			syop->setValue(scaleY);
 			c = ExecutionSystemHelper::addLink(system->getConnections(), syop->getOutputSocket(), scaleOperation->getInputSocket(2));
 			c->setIgnoreResizeCheck(true);
@@ -467,13 +481,13 @@ void Converter::convertResolution(SocketConnection *connection, ExecutionSystem
 			c->setIgnoreResizeCheck(true);
 		}
 
-		TranslateOperation * translateOperation = new TranslateOperation();
+		TranslateOperation *translateOperation = new TranslateOperation();
 		if (!first) first = translateOperation;
-		SetValueOperation * xop = new SetValueOperation();
+		SetValueOperation *xop = new SetValueOperation();
 		xop->setValue(addX);
 		c = ExecutionSystemHelper::addLink(system->getConnections(), xop->getOutputSocket(), translateOperation->getInputSocket(1));
 		c->setIgnoreResizeCheck(true);
-		SetValueOperation * yop = new SetValueOperation();
+		SetValueOperation *yop = new SetValueOperation();
 		yop->setValue(addY);
 		c = ExecutionSystemHelper::addLink(system->getConnections(), yop->getOutputSocket(), translateOperation->getInputSocket(2));
 		c->setIgnoreResizeCheck(true);
@@ -491,7 +505,7 @@ void Converter::convertResolution(SocketConnection *connection, ExecutionSystem
 			c->setIgnoreResizeCheck(true);
 		}
 
-		InputSocket * inputSocket = connection->getToSocket();
+		InputSocket *inputSocket = connection->getToSocket();
 		inputSocket->relinkConnections(first->getInputSocket(0));
 		c = ExecutionSystemHelper::addLink(system->getConnections(), translateOperation->getOutputSocket(), inputSocket);
 		c->setIgnoreResizeCheck(true);
diff --git a/source/blender/compositor/intern/COM_Converter.h b/source/blender/compositor/intern/COM_Converter.h
index fa12be4e79a..d01556cc79c 100644
--- a/source/blender/compositor/intern/COM_Converter.h
+++ b/source/blender/compositor/intern/COM_Converter.h
@@ -32,39 +32,39 @@
 class Converter {
 public:
 	/**
-	  * @brief Convert/wraps a bNode in its Node instance.
-	  *
-	  * For all nodetypes a wrapper class is created.
-	  * Muted nodes are wrapped with MuteNode.
-	  *
-	  * @note When adding a new node to blender, this method needs to be changed to return the correct Node instance.
-	  *
-	  * @see Node
-	  * @see MuteNode
-	  */
+	 * @brief Convert/wraps a bNode in its Node instance.
+	 *
+	 * For all nodetypes a wrapper class is created.
+	 * Muted nodes are wrapped with MuteNode.
+	 *
+	 * @note When adding a new node to blender, this method needs to be changed to return the correct Node instance.
+	 *
+	 * @see Node
+	 * @see MuteNode
+	 */
 	static Node *convert(bNode *bNode);
 	
 	/**
-	  * @brief This method will add a datetype conversion rule when the to-socket does not support the from-socket actual data type.
-	  *
-	  * @note this method is called when conversion is needed.
-	  *
-	  * @param connection the SocketConnection what needs conversion
-	  * @param system the ExecutionSystem to add the conversion to.
-	  * @see SocketConnection - a link between two sockets
-	  */
+	 * @brief This method will add a datetype conversion rule when the to-socket does not support the from-socket actual data type.
+	 *
+	 * @note this method is called when conversion is needed.
+	 *
+	 * @param connection the SocketConnection what needs conversion
+	 * @param system the ExecutionSystem to add the conversion to.
+	 * @see SocketConnection - a link between two sockets
+	 */
 	static void convertDataType(SocketConnection *connection, ExecutionSystem *system);
 	
 	/**
-	  * @brief This method will add a resolution rule based on the settings of the InputSocket.
-	  *
-	  * @note Conversion logic is implemented in this method
-	  * @see InputSocketResizeMode for the possible conversions.
-	
-	  * @param connection the SocketConnection what needs conversion
-	  * @param system the ExecutionSystem to add the conversion to.
-	  * @see SocketConnection - a link between two sockets
-	  */
+	 * @brief This method will add a resolution rule based on the settings of the InputSocket.
+	 *
+	 * @note Conversion logic is implemented in this method
+	 * @see InputSocketResizeMode for the possible conversions.
+
+	 * @param connection the SocketConnection what needs conversion
+	 * @param system the ExecutionSystem to add the conversion to.
+	 * @see SocketConnection - a link between two sockets
+	 */
 	static void convertResolution(SocketConnection *connection, ExecutionSystem *system);
 };
 #endif
diff --git a/source/blender/compositor/intern/COM_Device.h b/source/blender/compositor/intern/COM_Device.h
index 74a9400f8f3..08fdb5bb578 100644
--- a/source/blender/compositor/intern/COM_Device.h
+++ b/source/blender/compositor/intern/COM_Device.h
@@ -30,26 +30,26 @@
 #include "COM_MemoryBuffer.h"
 
 /**
-  * @brief Abstract class for device implementations to be used by the Compositor.
-  * devices are queried, initialized and used by the WorkScheduler.
-  * work are packaged as a WorkPackage instance.
-  */
+ * @brief Abstract class for device implementations to be used by the Compositor.
+ * devices are queried, initialized and used by the WorkScheduler.
+ * work are packaged as a WorkPackage instance.
+ */
 class Device {
 public:
 	/**
-	  * @brief initialize the device
-	  */
-	virtual bool initialize() {return true;}
+	 * @brief initialize the device
+	 */
+	virtual bool initialize() { return true; }
 
 	/**
-	  * @brief deinitialize the device
-	  */
+	 * @brief deinitialize the device
+	 */
 	virtual void deinitialize() {}
 
 	/**
-	  * @brief execute a WorkPackage
-	  * @param work the WorkPackage to execute
-	  */
+	 * @brief execute a WorkPackage
+	 * @param work the WorkPackage to execute
+	 */
 	virtual void execute(WorkPackage *work) = 0;
 
 };
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
index e4fefa6a904..4dfb9c7d26c 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
@@ -20,25 +20,25 @@
  *		Monique Dewanchand
  */
 
+#include <algorithm>
+#include <math.h>
+#include <sstream>
+#include <stdlib.h>
+
+#include "BLI_math.h"
+#include "PIL_time.h"
+
 #include "COM_ExecutionGroup.h"
 #include "COM_InputSocket.h"
 #include "COM_SocketConnection.h"
 #include "COM_defines.h"
-#include "math.h"
 #include "COM_ExecutionSystem.h"
-#include <sstream>
 #include "COM_ReadBufferOperation.h"
 #include "COM_WriteBufferOperation.h"
 #include "COM_ReadBufferOperation.h"
 #include "COM_WorkScheduler.h"
 #include "COM_ViewerOperation.h"
-#include <stdlib.h>
-#include "BLI_math.h"
-#include "COM_MemoryManager.h"
-#include "PIL_time.h"
 #include "COM_ChunkOrder.h"
-#include <algorithm>
-#include "BLI_math.h"
 #include "COM_ExecutionSystemHelper.h"
 
 ExecutionGroup::ExecutionGroup()
@@ -55,17 +55,18 @@ ExecutionGroup::ExecutionGroup()
 	this->numberOfChunks = 0;
 	this->initialized = false;
 	this->openCL = false;
+	this->singleThreaded = false;
 	this->chunksFinished = 0;
 }
 
-int ExecutionGroup::getRenderPriotrity()
+CompositorPriority ExecutionGroup::getRenderPriotrity()
 {
 	return this->getOutputNodeOperation()->getRenderPriority();
 }
 
 bool ExecutionGroup::containsOperation(NodeOperation *operation)
 {
-	for (vector<NodeOperation*>::const_iterator iterator = this->operations.begin() ; iterator != this->operations.end() ; ++iterator) {
+	for (vector<NodeOperation *>::const_iterator iterator = this->operations.begin(); iterator != this->operations.end(); ++iterator) {
 		NodeOperation *inListOperation = *iterator;
 		if (inListOperation == operation) {
 			return true;
@@ -81,10 +82,10 @@ const bool ExecutionGroup::isComplex() const
 
 bool ExecutionGroup::canContainOperation(NodeOperation *operation)
 {
-	if (!this->initialized) {return true;}
-	if (operation->isReadBufferOperation()) {return true;}
-	if (operation->isWriteBufferOperation()) {return false;}
-	if (operation->isSetOperation()) {return true;}
+	if (!this->initialized) { return true; }
+	if (operation->isReadBufferOperation()) { return true; }
+	if (operation->isWriteBufferOperation()) { return false; }
+	if (operation->isSetOperation()) { return true; }
 
 	if (!this->isComplex()) {
 		return (!operation->isComplex());
@@ -101,20 +102,21 @@ void ExecutionGroup::addOperation(ExecutionSystem *system, NodeOperation *operat
 		if (!operation->isBufferOperation()) {
 			this->complex = operation->isComplex();
 			this->openCL = operation->isOpenCL();
+			this->singleThreaded = operation->isSingleThreaded();
 			this->initialized = true;
 		}
 		this->operations.push_back(operation);
 		if (operation->isReadBufferOperation()) {
-			ReadBufferOperation *readOperation = (ReadBufferOperation*)operation;
+			ReadBufferOperation *readOperation = (ReadBufferOperation *)operation;
 			WriteBufferOperation *writeOperation = readOperation->getMemoryProxy()->getWriteBufferOperation();
 			this->addOperation(system, writeOperation);
 		}
 		else {
 			unsigned int index;
-			for (index = 0 ; index < operation->getNumberOfInputSockets(); index ++) {
-				InputSocket * inputSocket = operation->getInputSocket(index);
+			for (index = 0; index < operation->getNumberOfInputSockets(); index++) {
+				InputSocket *inputSocket = operation->getInputSocket(index);
 				if (inputSocket->isConnected()) {
-					NodeOperation *node = (NodeOperation*)inputSocket->getConnection()->getFromNode();
+					NodeOperation *node = (NodeOperation *)inputSocket->getConnection()->getFromNode();
 					this->addOperation(system, node);
 				}
 			}
@@ -122,7 +124,7 @@ void ExecutionGroup::addOperation(ExecutionSystem *system, NodeOperation *operat
 	}
 	else {
 		if (operation->isWriteBufferOperation()) {
-			WriteBufferOperation * writeoperation = (WriteBufferOperation*)operation;
+			WriteBufferOperation *writeoperation = (WriteBufferOperation *)operation;
 			if (writeoperation->getMemoryProxy()->getExecutor() == NULL) {
 				ExecutionGroup *newGroup = new ExecutionGroup();
 				writeoperation->getMemoryProxy()->setExecutor(newGroup);
@@ -149,7 +151,7 @@ void ExecutionGroup::initExecution()
 	this->chunkExecutionStates = NULL;
 	if (this->numberOfChunks != 0) {
 		this->chunkExecutionStates = new ChunkExecutionState[numberOfChunks];
-		for (index = 0 ; index < numberOfChunks ; index ++) {
+		for (index = 0; index < numberOfChunks; index++) {
 			this->chunkExecutionStates[index] = COM_ES_NOT_SCHEDULED;
 		}
 	}
@@ -157,10 +159,10 @@ void ExecutionGroup::initExecution()
 
 	unsigned int maxNumber = 0;
 
-	for (index = 0 ; index < this->operations.size(); index ++) {
+	for (index = 0; index < this->operations.size(); index++) {
 		NodeOperation *operation = this->operations[index];
 		if (operation->isReadBufferOperation()) {
-			ReadBufferOperation *readOperation = (ReadBufferOperation*)operation;
+			ReadBufferOperation *readOperation = (ReadBufferOperation *)operation;
 			this->cachedReadOperations.push_back(readOperation);
 			maxNumber = max(maxNumber, readOperation->getOffset());
 		}
@@ -185,32 +187,36 @@ void ExecutionGroup::deinitExecution()
 void ExecutionGroup::determineResolution(unsigned int resolution[])
 {
 	NodeOperation *operation = this->getOutputNodeOperation();
-	unsigned int preferredResolution[2];
-	preferredResolution[0] = 0;
-	preferredResolution[1] = 0;
-	operation->determineResolution(resolution, preferredResolution);
-	operation->setResolution(resolution);
+	resolution[0] = operation->getWidth();
+	resolution[1] = operation->getHeight();
 	this->setResolution(resolution);
 }
 
 void ExecutionGroup::determineNumberOfChunks()
 {
-	const float chunkSizef = this->chunkSize;
-	this->numberOfXChunks = ceil(this->width / chunkSizef);
-	this->numberOfYChunks = ceil(this->height / chunkSizef);
-	this->numberOfChunks = this->numberOfXChunks * this->numberOfYChunks;
+	if (singleThreaded) {
+		this->numberOfXChunks = 1;
+		this->numberOfYChunks = 1;
+		this->numberOfChunks = 1;
+	} 
+	else {
+		const float chunkSizef = this->chunkSize;
+		this->numberOfXChunks = ceil(this->width / chunkSizef);
+		this->numberOfYChunks = ceil(this->height / chunkSizef);
+		this->numberOfChunks = this->numberOfXChunks * this->numberOfYChunks;
+	}
 }
 
 /**
-  * this method is called for the top execution groups. containing the compositor node or the preview node or the viewer node)
-  */
+ * this method is called for the top execution groups. containing the compositor node or the preview node or the viewer node)
+ */
 void ExecutionGroup::execute(ExecutionSystem *graph)
 {
 	CompositorContext& context = graph->getContext();
 	const bNodeTree *bTree = context.getbNodeTree();
-	if (this->width == 0 || this->height == 0) {return;} /// @note: break out... no pixels to calculate.
-	if (bTree->test_break && bTree->test_break(bTree->tbh)) {return;} /// @note: early break out for blur and preview nodes
-	if (this->numberOfChunks == 0) {return;} /// @note: early break out
+	if (this->width == 0 || this->height == 0) {return; } /// @note: break out... no pixels to calculate.
+	if (bTree->test_break && bTree->test_break(bTree->tbh)) {return; } /// @note: early break out for blur and preview nodes
+	if (this->numberOfChunks == 0) {return; } /// @note: early break out
 	unsigned int chunkNumber;
 
 	this->chunksFinished = 0;
@@ -218,38 +224,38 @@ void ExecutionGroup::execute(ExecutionSystem *graph)
 	unsigned int index;
 	unsigned int *chunkOrder = new unsigned int[this->numberOfChunks];
 
-	for (chunkNumber = 0 ; chunkNumber<this->numberOfChunks ; chunkNumber++) {
+	for (chunkNumber = 0; chunkNumber < this->numberOfChunks; chunkNumber++) {
 		chunkOrder[chunkNumber] = chunkNumber;
 	}
 	NodeOperation *operation = this->getOutputNodeOperation();
 	float centerX = 0.5;
 	float centerY = 0.5;
-	int chunkorder = COM_TO_CENTER_OUT;
+	OrderOfChunks chunkorder = COM_ORDER_OF_CHUNKS_DEFAULT;
 
 	if (operation->isViewerOperation()) {
-		ViewerBaseOperation *viewer = (ViewerBaseOperation*)operation;
+		ViewerBaseOperation *viewer = (ViewerBaseOperation *)operation;
 		centerX = viewer->getCenterX();
 		centerY = viewer->getCenterY();
 		chunkorder = viewer->getChunkOrder();
 	}
 
 	switch (chunkorder) {
-	case COM_TO_RANDOM:
-		for (index = 0 ; index < 2 * numberOfChunks ; index ++) {
-			int index1 = rand()%numberOfChunks;
-			int index2 = rand()%numberOfChunks;
-			int s = chunkOrder[index1];
-			chunkOrder[index1] = chunkOrder[index2];
-			chunkOrder[index2] = s;
-		}
-		break;
-	case COM_TO_CENTER_OUT:
+		case COM_TO_RANDOM:
+			for (index = 0; index < 2 * numberOfChunks; index++) {
+				int index1 = rand() % numberOfChunks;
+				int index2 = rand() % numberOfChunks;
+				int s = chunkOrder[index1];
+				chunkOrder[index1] = chunkOrder[index2];
+				chunkOrder[index2] = s;
+			}
+			break;
+		case COM_TO_CENTER_OUT:
 		{
-			ChunkOrderHotspot **hotspots = new ChunkOrderHotspot*[1];
-			hotspots[0] = new ChunkOrderHotspot(this->width*centerX, this->height*centerY, 0.0f);
+			ChunkOrderHotspot **hotspots = new ChunkOrderHotspot *[1];
+			hotspots[0] = new ChunkOrderHotspot(this->width * centerX, this->height * centerY, 0.0f);
 			rcti rect;
 			ChunkOrder *chunkOrders = new ChunkOrder[this->numberOfChunks];
-			for (index = 0 ; index < this->numberOfChunks; index ++) {
+			for (index = 0; index < this->numberOfChunks; index++) {
 				determineChunkRect(&rect, index);
 				chunkOrders[index].setChunkNumber(index);
 				chunkOrders[index].setX(rect.xmin);
@@ -257,8 +263,8 @@ void ExecutionGroup::execute(ExecutionSystem *graph)
 				chunkOrders[index].determineDistance(hotspots, 1);
 			}
 
-			sort(&chunkOrders[0], &chunkOrders[numberOfChunks-1]);
-			for (index = 0 ; index < numberOfChunks; index ++) {
+			sort(&chunkOrders[0], &chunkOrders[numberOfChunks - 1]);
+			for (index = 0; index < numberOfChunks; index++) {
 				chunkOrder[index] = chunkOrders[index].getChunkNumber();
 			}
 
@@ -267,29 +273,29 @@ void ExecutionGroup::execute(ExecutionSystem *graph)
 			delete[] chunkOrders;
 		}
 		break;
-	case COM_TO_RULE_OF_THIRDS:
+		case COM_TO_RULE_OF_THIRDS:
 		{
-			ChunkOrderHotspot **hotspots = new ChunkOrderHotspot*[9];
-			unsigned int tx = this->width/6;
-			unsigned int ty = this->height/6;
-			unsigned int mx = this->width/2;
-			unsigned int my = this->height/2;
-			unsigned int bx = mx+2*tx;
-			unsigned int by = my+2*ty;
-
-			float addition = numberOfChunks/COM_RULE_OF_THIRDS_DIVIDER;
-			hotspots[0] = new ChunkOrderHotspot(mx, my, addition*0);
-			hotspots[1] = new ChunkOrderHotspot(tx, my, addition*1);
-			hotspots[2] = new ChunkOrderHotspot(bx, my, addition*2);
-			hotspots[3] = new ChunkOrderHotspot(bx, by, addition*3);
-			hotspots[4] = new ChunkOrderHotspot(tx, ty, addition*4);
-			hotspots[5] = new ChunkOrderHotspot(bx, ty, addition*5);
-			hotspots[6] = new ChunkOrderHotspot(tx, by, addition*6);
-			hotspots[7] = new ChunkOrderHotspot(mx, ty, addition*7);
-			hotspots[8] = new ChunkOrderHotspot(mx, by, addition*8);
+			ChunkOrderHotspot **hotspots = new ChunkOrderHotspot *[9];
+			unsigned int tx = this->width / 6;
+			unsigned int ty = this->height / 6;
+			unsigned int mx = this->width / 2;
+			unsigned int my = this->height / 2;
+			unsigned int bx = mx + 2 * tx;
+			unsigned int by = my + 2 * ty;
+
+			float addition = numberOfChunks / COM_RULE_OF_THIRDS_DIVIDER;
+			hotspots[0] = new ChunkOrderHotspot(mx, my, addition * 0);
+			hotspots[1] = new ChunkOrderHotspot(tx, my, addition * 1);
+			hotspots[2] = new ChunkOrderHotspot(bx, my, addition * 2);
+			hotspots[3] = new ChunkOrderHotspot(bx, by, addition * 3);
+			hotspots[4] = new ChunkOrderHotspot(tx, ty, addition * 4);
+			hotspots[5] = new ChunkOrderHotspot(bx, ty, addition * 5);
+			hotspots[6] = new ChunkOrderHotspot(tx, by, addition * 6);
+			hotspots[7] = new ChunkOrderHotspot(mx, ty, addition * 7);
+			hotspots[8] = new ChunkOrderHotspot(mx, by, addition * 8);
 			rcti rect;
 			ChunkOrder *chunkOrders = new ChunkOrder[this->numberOfChunks];
-			for (index = 0 ; index < this->numberOfChunks; index ++) {
+			for (index = 0; index < this->numberOfChunks; index++) {
 				determineChunkRect(&rect, index);
 				chunkOrders[index].setChunkNumber(index);
 				chunkOrders[index].setX(rect.xmin);
@@ -299,7 +305,7 @@ void ExecutionGroup::execute(ExecutionSystem *graph)
 
 			sort(&chunkOrders[0], &chunkOrders[numberOfChunks]);
 
-			for (index = 0 ; index < numberOfChunks; index ++) {
+			for (index = 0; index < numberOfChunks; index++) {
 				chunkOrder[index] = chunkOrders[index].getChunkNumber();
 			}
 
@@ -316,43 +322,44 @@ void ExecutionGroup::execute(ExecutionSystem *graph)
 			delete[] chunkOrders;
 		}
 		break;
-	case COM_TO_TOP_DOWN:
-	default:
-		break;
+		case COM_TO_TOP_DOWN:
+		default:
+			break;
 	}
 
 	bool breaked = false;
 	bool finished = false;
 	unsigned int startIndex = 0;
-	const int maxNumberEvaluated = BLI_system_thread_count()*2;
+	const int maxNumberEvaluated = BLI_system_thread_count() * 2;
 
 	while (!finished && !breaked) {
-				unsigned int index;
+		unsigned int index;
 		bool startEvaluated = false;
 		finished = true;
 		int numberEvaluated = 0;
 
-		for (index = startIndex ; index < numberOfChunks && numberEvaluated < maxNumberEvaluated; index ++) {
+		for (index = startIndex; index < numberOfChunks && numberEvaluated < maxNumberEvaluated; index++) {
 			int chunkNumber = chunkOrder[index];
-			int yChunk = chunkNumber/this->numberOfXChunks;
-			int xChunk = chunkNumber - (yChunk*this->numberOfXChunks);
+			int yChunk = chunkNumber / this->numberOfXChunks;
+			int xChunk = chunkNumber - (yChunk * this->numberOfXChunks);
 			const ChunkExecutionState state = this->chunkExecutionStates[chunkNumber];
 			if (state == COM_ES_NOT_SCHEDULED) {
 				scheduleChunkWhenPossible(graph, xChunk, yChunk);
-				finished=false;
+				finished = false;
 				startEvaluated = true;
 				numberEvaluated++;
 			}
 			else if (state == COM_ES_SCHEDULED) {
-				finished=false;
+				finished = false;
 				startEvaluated = true;
 				numberEvaluated++;
 			}
 			else if (state == COM_ES_EXECUTED && !startEvaluated) {
-				startIndex = index+1;
+				startIndex = index + 1;
 			}
 		}
-		PIL_sleep_ms(10);
+
+		WorkScheduler::finish();
 
 		if (bTree->test_break && bTree->test_break(bTree->tbh)) {
 			breaked = true;
@@ -362,22 +369,39 @@ void ExecutionGroup::execute(ExecutionSystem *graph)
 	delete[] chunkOrder;
 }
 
-MemoryBuffer** ExecutionGroup::getInputBuffers(int chunkNumber)
+MemoryBuffer **ExecutionGroup::getInputBuffersCPU()
+{
+	vector<MemoryProxy *> memoryproxies;
+	unsigned int index;
+
+	this->determineDependingMemoryProxies(&memoryproxies);
+	MemoryBuffer **memoryBuffers = new MemoryBuffer *[this->cachedMaxReadBufferOffset];
+	for (index = 0; index < this->cachedMaxReadBufferOffset; index++) {
+		memoryBuffers[index] = NULL;
+	}
+	for (index = 0; index < this->cachedReadOperations.size(); index++) {
+		ReadBufferOperation *readOperation = (ReadBufferOperation *)this->cachedReadOperations[index];
+		memoryBuffers[readOperation->getOffset()] = readOperation->getMemoryProxy()->getBuffer();
+	}
+	return memoryBuffers;
+}
+
+MemoryBuffer **ExecutionGroup::getInputBuffersOpenCL(int chunkNumber)
 {
 	rcti rect;
-	vector<MemoryProxy*> memoryproxies;
+	vector<MemoryProxy *> memoryproxies;
 	unsigned int index;
 	determineChunkRect(&rect, chunkNumber);
 
 	this->determineDependingMemoryProxies(&memoryproxies);
-	MemoryBuffer **memoryBuffers = new MemoryBuffer*[this->cachedMaxReadBufferOffset];
-	for (index = 0 ; index < this->cachedMaxReadBufferOffset ; index ++) {
+	MemoryBuffer **memoryBuffers = new MemoryBuffer *[this->cachedMaxReadBufferOffset];
+	for (index = 0; index < this->cachedMaxReadBufferOffset; index++) {
 		memoryBuffers[index] = NULL;
 	}
 	rcti output;
-	for (index = 0 ; index < this->cachedReadOperations.size(); index ++) {
-		ReadBufferOperation *readOperation = (ReadBufferOperation*)this->cachedReadOperations[index];
-		MemoryProxy * memoryProxy = readOperation->getMemoryProxy();
+	for (index = 0; index < this->cachedReadOperations.size(); index++) {
+		ReadBufferOperation *readOperation = (ReadBufferOperation *)this->cachedReadOperations[index];
+		MemoryProxy *memoryProxy = readOperation->getMemoryProxy();
 		this->determineDependingAreaOfInterest(&rect, readOperation, &output);
 		MemoryBuffer *memoryBuffer = memoryProxy->getExecutor()->constructConsolidatedMemoryBuffer(memoryProxy, &output);
 		memoryBuffers[readOperation->getOffset()] = memoryBuffer;
@@ -387,58 +411,21 @@ MemoryBuffer** ExecutionGroup::getInputBuffers(int chunkNumber)
 
 MemoryBuffer *ExecutionGroup::constructConsolidatedMemoryBuffer(MemoryProxy *memoryProxy, rcti *rect)
 {
-	// find all chunks inside the rect
-	// determine minxchunk, minychunk, maxxchunk, maxychunk where x and y are chunknumbers
-	float chunkSizef = this->chunkSize;
-
-	int indexx, indexy;
-
-	const int minxchunk = floor(rect->xmin/chunkSizef);
-	const int maxxchunk = ceil((rect->xmax-1)/chunkSizef);
-	const int minychunk = floor(rect->ymin/chunkSizef);
-	const int maxychunk = ceil((rect->ymax-1)/chunkSizef);
-
-	if (maxxchunk== minxchunk+1 && maxychunk == minychunk+1) {
-		const int chunkNumber = minxchunk+minychunk*numberOfXChunks;
-		MemoryBuffer *result = MemoryManager::getMemoryBuffer(memoryProxy, chunkNumber);
-		return result;
-	}
-
-	rcti chunkRect;
-	chunkRect.xmin = minxchunk*this->chunkSize;
-	chunkRect.xmax = maxxchunk*this->chunkSize;
-	chunkRect.ymin = minychunk*this->chunkSize;
-	chunkRect.ymax = maxychunk*this->chunkSize;
-
-	CLAMP(chunkRect.xmin, 0, (int)this->width);
-	CLAMP(chunkRect.xmax, 0, (int)this->width);
-	CLAMP(chunkRect.ymin, 0, (int)this->height);
-	CLAMP(chunkRect.ymax, 0, (int)this->height);
-
-	MemoryBuffer *result = new MemoryBuffer(memoryProxy, &chunkRect);
-
-	for (indexx = max(minxchunk, 0); indexx<min((int)this->numberOfXChunks, maxxchunk) ; indexx++) {
-		for (indexy = max(minychunk, 0); indexy<min((int)this->numberOfYChunks, maxychunk) ; indexy++) {
-			int chunkNumber = indexx+indexy*this->numberOfXChunks;
-			MemoryBuffer *chunkBuffer = MemoryManager::getMemoryBuffer(memoryProxy, chunkNumber);
-			result->copyContentFrom(chunkBuffer);
-		}
-	}
-
+	MemoryBuffer *imageBuffer = memoryProxy->getBuffer();
+	MemoryBuffer *result = new MemoryBuffer(memoryProxy, rect);
+	result->copyContentFrom(imageBuffer);
 	return result;
 }
 
-void ExecutionGroup::finalizeChunkExecution(int chunkNumber, MemoryBuffer** memoryBuffers)
+void ExecutionGroup::finalizeChunkExecution(int chunkNumber, MemoryBuffer **memoryBuffers)
 {
 	if (this->chunkExecutionStates[chunkNumber] == COM_ES_SCHEDULED)
 		this->chunkExecutionStates[chunkNumber] = COM_ES_EXECUTED;
-	else 
-		throw "Threading inconsistency";
 	
 	this->chunksFinished++;
 	if (memoryBuffers) {
-		for (unsigned int index = 0 ; index < this->cachedMaxReadBufferOffset; index ++) {
-			MemoryBuffer * buffer = memoryBuffers[index];
+		for (unsigned int index = 0; index < this->cachedMaxReadBufferOffset; index++) {
+			MemoryBuffer *buffer = memoryBuffers[index];
 			if (buffer) {
 				if (buffer->isTemporarily()) {
 					memoryBuffers[index] = NULL;
@@ -451,16 +438,21 @@ void ExecutionGroup::finalizeChunkExecution(int chunkNumber, MemoryBuffer** memo
 	if (bTree) {
 		// status report is only performed for top level Execution Groups.
 		float progress = chunksFinished;
-		progress/=numberOfChunks;
+		progress /= numberOfChunks;
 		bTree->progress(bTree->prh, progress);
 	}
 }
 
-inline void ExecutionGroup::determineChunkRect(rcti *rect, const unsigned int xChunk, const unsigned int yChunk ) const
+inline void ExecutionGroup::determineChunkRect(rcti *rect, const unsigned int xChunk, const unsigned int yChunk) const
 {
-	const unsigned int minx = xChunk * chunkSize;
-	const unsigned int miny = yChunk * chunkSize;
-	BLI_init_rcti(rect, minx, min(minx + this->chunkSize, this->width), miny, min(miny + this->chunkSize, this->height));
+	if (singleThreaded) {
+		BLI_init_rcti(rect, 0, this->width, 0, this->height);
+	}
+	else {
+		const unsigned int minx = xChunk * chunkSize;
+		const unsigned int miny = yChunk * chunkSize;
+		BLI_init_rcti(rect, minx, min(minx + this->chunkSize, this->width), miny, min(miny + this->chunkSize, this->height));
+	}
 }
 
 void ExecutionGroup::determineChunkRect(rcti *rect, const unsigned int chunkNumber) const
@@ -472,33 +464,36 @@ void ExecutionGroup::determineChunkRect(rcti *rect, const unsigned int chunkNumb
 
 MemoryBuffer *ExecutionGroup::allocateOutputBuffer(int chunkNumber, rcti *rect)
 {
-	MemoryBuffer *outputBuffer = NULL;
-	// output allocation is only valid when our outputoperation is a memorywriter
-	NodeOperation * operation = this->getOutputNodeOperation();
+	// we asume that this method is only called from complex execution groups.
+	NodeOperation *operation = this->getOutputNodeOperation();
 	if (operation->isWriteBufferOperation()) {
-		WriteBufferOperation *writeOperation = (WriteBufferOperation*)operation;
-		outputBuffer = MemoryManager::allocateMemoryBuffer(writeOperation->getMemoryProxy(), chunkNumber, rect);
+		WriteBufferOperation *writeOperation = (WriteBufferOperation *)operation;
+		MemoryBuffer *buffer = new MemoryBuffer(writeOperation->getMemoryProxy(), rect);
+		return buffer;
 	}
-	return outputBuffer;
+	return NULL;
 }
 
 
-bool ExecutionGroup::scheduleAreaWhenPossible(ExecutionSystem * graph, rcti *area)
+bool ExecutionGroup::scheduleAreaWhenPossible(ExecutionSystem *graph, rcti *area)
 {
+	if (singleThreaded) {
+		return scheduleChunkWhenPossible(graph, 0, 0);
+	}
 	// find all chunks inside the rect
 	// determine minxchunk, minychunk, maxxchunk, maxychunk where x and y are chunknumbers
 
 	float chunkSizef = this->chunkSize;
 
 	int indexx, indexy;
-	const int minxchunk = floor(area->xmin/chunkSizef);
-	const int maxxchunk = ceil((area->xmax-1)/chunkSizef);
-	const int minychunk = floor(area->ymin/chunkSizef);
-	const int maxychunk = ceil((area->ymax-1)/chunkSizef);
+	const int minxchunk = floor(area->xmin / chunkSizef);
+	const int maxxchunk = ceil((area->xmax - 1) / chunkSizef);
+	const int minychunk = floor(area->ymin / chunkSizef);
+	const int maxychunk = ceil((area->ymax - 1) / chunkSizef);
 
 	bool result = true;
-	for (indexx = max(minxchunk, 0); indexx<maxxchunk ; indexx++) {
-		for (indexy = max(minychunk, 0); indexy<maxychunk ; indexy++) {
+	for (indexx = max(minxchunk, 0); indexx < maxxchunk; indexx++) {
+		for (indexy = max(minychunk, 0); indexy < maxychunk; indexy++) {
 			if (!scheduleChunkWhenPossible(graph, indexx, indexy)) {
 				result = false;
 			}
@@ -518,7 +513,7 @@ bool ExecutionGroup::scheduleChunk(unsigned int chunkNumber)
 	return false;
 }
 
-bool ExecutionGroup::scheduleChunkWhenPossible(ExecutionSystem * graph, int xChunk, int yChunk)
+bool ExecutionGroup::scheduleChunkWhenPossible(ExecutionSystem *graph, int xChunk, int yChunk)
 {
 	if (xChunk < 0 || xChunk >= (int)this->numberOfXChunks) {
 		return true;
@@ -526,7 +521,7 @@ bool ExecutionGroup::scheduleChunkWhenPossible(ExecutionSystem * graph, int xChu
 	if (yChunk < 0 || yChunk >= (int)this->numberOfYChunks) {
 		return true;
 	}
-	int chunkNumber = yChunk*this->numberOfXChunks + xChunk;
+	int chunkNumber = yChunk * this->numberOfXChunks + xChunk;
 	// chunk is already executed
 	if (this->chunkExecutionStates[chunkNumber] == COM_ES_EXECUTED) {
 		return true;
@@ -538,7 +533,7 @@ bool ExecutionGroup::scheduleChunkWhenPossible(ExecutionSystem * graph, int xChu
 	}
 
 	// chunk is nor executed nor scheduled.
-	vector<MemoryProxy*> memoryProxies;
+	vector<MemoryProxy *> memoryProxies;
 	this->determineDependingMemoryProxies(&memoryProxies);
 
 	rcti rect;
@@ -547,10 +542,10 @@ bool ExecutionGroup::scheduleChunkWhenPossible(ExecutionSystem * graph, int xChu
 	bool canBeExecuted = true;
 	rcti area;
 
-	for (index = 0 ; index < cachedReadOperations.size() ; index ++) {
-		ReadBufferOperation * readOperation = (ReadBufferOperation*)cachedReadOperations[index];
+	for (index = 0; index < cachedReadOperations.size(); index++) {
+		ReadBufferOperation *readOperation = (ReadBufferOperation *)cachedReadOperations[index];
 		BLI_init_rcti(&area, 0, 0, 0, 0);
-		MemoryProxy * memoryProxy = memoryProxies[index];
+		MemoryProxy *memoryProxy = memoryProxies[index];
 		determineDependingAreaOfInterest(&rect, readOperation, &area);
 		ExecutionGroup *group = memoryProxy->getExecutor();
 
@@ -571,25 +566,20 @@ bool ExecutionGroup::scheduleChunkWhenPossible(ExecutionSystem * graph, int xChu
 	return false;
 }
 
-void ExecutionGroup::determineDependingAreaOfInterest(rcti * input, ReadBufferOperation *readOperation, rcti *output)
+void ExecutionGroup::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
 {
 	this->getOutputNodeOperation()->determineDependingAreaOfInterest(input, readOperation, output);
 }
 
-void ExecutionGroup::determineDependingMemoryProxies(vector<MemoryProxy*> *memoryProxies)
+void ExecutionGroup::determineDependingMemoryProxies(vector<MemoryProxy *> *memoryProxies)
 {
 	unsigned int index;
-	for (index = 0 ; index < this->cachedReadOperations.size() ; index ++) {
-		ReadBufferOperation * readOperation = (ReadBufferOperation*) this->cachedReadOperations[index];
+	for (index = 0; index < this->cachedReadOperations.size(); index++) {
+		ReadBufferOperation *readOperation = (ReadBufferOperation *) this->cachedReadOperations[index];
 		memoryProxies->push_back(readOperation->getMemoryProxy());
 	}
 }
 
-bool ExecutionGroup::operator ==(const ExecutionGroup & executionGroup) const
-{
-	return this->getOutputNodeOperation() == executionGroup.getOutputNodeOperation();
-}
-
 bool ExecutionGroup::isOpenCL()
 {
 	return this->openCL;
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.h b/source/blender/compositor/intern/COM_ExecutionGroup.h
index adab7df4690..541b3e4866d 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.h
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.h
@@ -33,21 +33,21 @@
 
 
 /**
-  * @brief the execution state of a chunk in an ExecutionGroup
-  * @ingroup Execution
-  */
+ * @brief the execution state of a chunk in an ExecutionGroup
+ * @ingroup Execution
+ */
 typedef enum ChunkExecutionState {
 	/**
-	  * @brief chunk is not yet scheduled
-	  */
+	 * @brief chunk is not yet scheduled
+	 */
 	COM_ES_NOT_SCHEDULED = 0,
 	/**
-	  * @brief chunk is scheduled, but not yet executed
-	  */
+	 * @brief chunk is scheduled, but not yet executed
+	 */
 	COM_ES_SCHEDULED = 1,
 	/**
-	  * @brief chunk is executed.
-	  */
+	 * @brief chunk is executed.
+	 */
 	COM_ES_EXECUTED = 2
 } ChunkExecutionState;
 
@@ -56,349 +56,345 @@ class ReadBufferOperation;
 class Device;
 
 /**
-  * @brief Class ExecutionGroup is a group of NodeOperations that are executed as one.
-  * This grouping is used to combine Operations that can be executed as one whole when multi-processing.
-  * @ingroup Execution
-  */
+ * @brief Class ExecutionGroup is a group of NodeOperations that are executed as one.
+ * This grouping is used to combine Operations that can be executed as one whole when multi-processing.
+ * @ingroup Execution
+ */
 class ExecutionGroup {
 private:
 	// fields
-	/**
-	  * @brief unique identifier of this node.
-	  */
-	string id;
 	
 	/**
-	  * @brief list of operations in this ExecutionGroup
-	  */
-	vector<NodeOperation*> operations;
+	 * @brief list of operations in this ExecutionGroup
+	 */
+	vector<NodeOperation *> operations;
 	
 	/**
-	  * @brief is this ExecutionGroup an input ExecutionGroup
-	  * an input execution group is a group that is at the end of the calculation (the output is important for the user)
-	  */
+	 * @brief is this ExecutionGroup an input ExecutionGroup
+	 * an input execution group is a group that is at the end of the calculation (the output is important for the user)
+	 */
 	int isOutput;
 	
 	/**
-	  * @brief Width of the output
-	  */
+	 * @brief Width of the output
+	 */
 	unsigned int width;
 	
 	/**
-	  * @brief Height of the output
-	  */
+	 * @brief Height of the output
+	 */
 	unsigned int height;
 	
 	/**
-	  * @brief size of a single chunk, being Width or of height
-	  * a chunk is always a square, except at the edges of the MemoryBuffer
-	  */
+	 * @brief size of a single chunk, being Width or of height
+	 * a chunk is always a square, except at the edges of the MemoryBuffer
+	 */
 	unsigned int chunkSize;
 	
 	/**
-	  * @brief number of chunks in the x-axis
-	  */
+	 * @brief number of chunks in the x-axis
+	 */
 	unsigned int numberOfXChunks;
 	
 	/**
-	  * @brief number of chunks in the y-axis
-	  */
+	 * @brief number of chunks in the y-axis
+	 */
 	unsigned int numberOfYChunks;
 	
 	/**
-	  * @brief total number of chunks
-	  */
+	 * @brief total number of chunks
+	 */
 	unsigned int numberOfChunks;
 	
 	/**
-	  * @brief contains this ExecutionGroup a complex NodeOperation.
-	  */
+	 * @brief contains this ExecutionGroup a complex NodeOperation.
+	 */
 	bool complex;
 	
 	/**
-	  * @brief can this ExecutionGroup be scheduled on an OpenCLDevice
-	  */
+	 * @brief can this ExecutionGroup be scheduled on an OpenCLDevice
+	 */
 	bool openCL;
 	
 	/**
-	  * @brief what is the maximum number field of all ReadBufferOperation in this ExecutionGroup.
-	  * @note this is used to construct the MemoryBuffers that will be passed during execution.
-	  */
+	 * @brief Is this Execution group SingleThreaded
+	 */
+	bool singleThreaded;
+	
+	/**
+	 * @brief what is the maximum number field of all ReadBufferOperation in this ExecutionGroup.
+	 * @note this is used to construct the MemoryBuffers that will be passed during execution.
+	 */
 	unsigned int cachedMaxReadBufferOffset;
 	
 	/**
-	  * @brief a cached vector of all read operations in the execution group.
-	  */
-	vector<NodeOperation*> cachedReadOperations;
+	 * @brief a cached vector of all read operations in the execution group.
+	 */
+	vector<NodeOperation *> cachedReadOperations;
 	
 	/**
-	  * @brief reference to the original bNodeTree, this field is only set for the 'top' execution group.
-	  * @note can only be used to call the callbacks for progress, status and break
-	  */
-	const bNodeTree * bTree;
+	 * @brief reference to the original bNodeTree, this field is only set for the 'top' execution group.
+	 * @note can only be used to call the callbacks for progress, status and break
+	 */
+	const bNodeTree *bTree;
 	
 	/**
-	  * @brief total number of chunks that have been calculated for this ExecutionGroup
-	  */
+	 * @brief total number of chunks that have been calculated for this ExecutionGroup
+	 */
 	unsigned int chunksFinished;
 	
 	/**
-	  * @brief the chunkExecutionStates holds per chunk the execution state. this state can be
-	  *   - COM_ES_NOT_SCHEDULED: not scheduled
-	  *   - COM_ES_SCHEDULED: scheduled
-	  *   - COM_ES_EXECUTED: executed
-	  */
+	 * @brief the chunkExecutionStates holds per chunk the execution state. this state can be
+	 *   - COM_ES_NOT_SCHEDULED: not scheduled
+	 *   - COM_ES_SCHEDULED: scheduled
+	 *   - COM_ES_EXECUTED: executed
+	 */
 	ChunkExecutionState *chunkExecutionStates;
 	
 	/**
-	  * @brief indicator when this ExecutionGroup has valid NodeOperations in its vector for Execution
-	  * @note When building the ExecutionGroup NodeOperations are added via recursion. First a WriteBufferOperations is added, then the
-	  * @note Operation containing the settings that is important for the ExecutiongGroup is added,
-	  * @note When this occurs, these settings are copied over from the node to the ExecutionGroup
-	  * @note and the Initialized flag is set to true.
+	 * @brief indicator when this ExecutionGroup has valid NodeOperations in its vector for Execution
+	 * @note When building the ExecutionGroup NodeOperations are added via recursion. First a WriteBufferOperations is added, then the
+	 * @note Operation containing the settings that is important for the ExecutiongGroup is added,
+	 * @note When this occurs, these settings are copied over from the node to the ExecutionGroup
+	 * @note and the Initialized flag is set to true.
 	 * @see complex
-	* @see openCL
-	  */
+	 * @see openCL
+	 */
 	bool initialized;
 	
 	// methods
 	/**
-	  * @brief check whether parameter operation can be added to the execution group
-	  * @param operation the operation to be added
-	  */
+	 * @brief check whether parameter operation can be added to the execution group
+	 * @param operation the operation to be added
+	 */
 	bool canContainOperation(NodeOperation *operation);
-	
-	/**
-	  * @brief get the Render priority of this ExecutionGroup
-	  * @see ExecutionSystem.execute
-	  */
-	int getRenderPriotrity();
-	
+		
 	/**
-	  * @brief calculate the actual chunk size of this execution group.
-	  * @note A chunk size is an unsigned int that is both the height and width of a chunk.
-	  * @note The chunk size will not be stored in the chunkSize field. This needs to be done
-	  * @note by the calling method.
-	  */
+	 * @brief calculate the actual chunk size of this execution group.
+	 * @note A chunk size is an unsigned int that is both the height and width of a chunk.
+	 * @note The chunk size will not be stored in the chunkSize field. This needs to be done
+	 * @note by the calling method.
+	 */
 	unsigned int determineChunkSize();
 	
 	
 	/**
-	  * @brief Determine the rect (minx, maxx, miny, maxy) of a chunk at a position.
-	  * @note Only gives usefull results ater the determination of the chunksize
-	  * @see determineChunkSize()
-	  */
+	 * @brief Determine the rect (minx, maxx, miny, maxy) of a chunk at a position.
+	 * @note Only gives usefull results ater the determination of the chunksize
+	 * @see determineChunkSize()
+	 */
 	void determineChunkRect(rcti *rect, const unsigned int xChunk, const unsigned int yChunk) const;
 	
 	/**
-	  * @brief determine the number of chunks, based on the chunkSize, width and height.
-	  * @note The result are stored in the fields numberOfChunks, numberOfXChunks, numberOfYChunks
-	  */
+	 * @brief determine the number of chunks, based on the chunkSize, width and height.
+	 * @note The result are stored in the fields numberOfChunks, numberOfXChunks, numberOfYChunks
+	 */
 	void determineNumberOfChunks();
 	
 	/**
-	  * @brief try to schedule a specific chunk.
-	  * @note scheduling succeeds when all input requirements are met and the chunks hasen't been scheduled yet.
-	  * @param graph
-	  * @param xChunk
-	  * @param yChunk
-	  * @return [true:false]
-	  * true: package(s) are scheduled
-	  * false: scheduling is deferred (depending workpackages are scheduled)
-	  */
-	bool scheduleChunkWhenPossible(ExecutionSystem * graph, int xChunk, int yChunk);
-	
-	/**
-	  * @brief try to schedule a specific area.
-	  * @note Check if a certain area is available, when not available this are will be checked.
-	  * @note This method is called from other ExecutionGroup's.
-	  * @param graph
-	  * @param rect
-	  * @return [true:false]
-	  * true: package(s) are scheduled
-	  * false: scheduling is deferred (depending workpackages are scheduled)
-	  */
-	bool scheduleAreaWhenPossible(ExecutionSystem * graph, rcti * rect);
-	
-	/**
-	  * @brief add a chunk to the WorkScheduler.
-	  * @param chunknumber
-	  */
+	 * @brief try to schedule a specific chunk.
+	 * @note scheduling succeeds when all input requirements are met and the chunks hasen't been scheduled yet.
+	 * @param graph
+	 * @param xChunk
+	 * @param yChunk
+	 * @return [true:false]
+	 * true: package(s) are scheduled
+	 * false: scheduling is deferred (depending workpackages are scheduled)
+	 */
+	bool scheduleChunkWhenPossible(ExecutionSystem *graph, int xChunk, int yChunk);
+
+	/**
+	 * @brief try to schedule a specific area.
+	 * @note Check if a certain area is available, when not available this are will be checked.
+	 * @note This method is called from other ExecutionGroup's.
+	 * @param graph
+	 * @param rect
+	 * @return [true:false]
+	 * true: package(s) are scheduled
+	 * false: scheduling is deferred (depending workpackages are scheduled)
+	 */
+	bool scheduleAreaWhenPossible(ExecutionSystem *graph, rcti *rect);
+
+	/**
+	 * @brief add a chunk to the WorkScheduler.
+	 * @param chunknumber
+	 */
 	bool scheduleChunk(unsigned int chunkNumber);
 	
 	/**
-	  * @brief determine the area of interest of a certain input area
-	  * @note This method only evaluates a single ReadBufferOperation
-	  * @param input the input area
-	  * @param readOperation The ReadBufferOperation where the area needs to be evaluated
-	  * @param output the area needed of the ReadBufferOperation. Result
-	  */
-	void determineDependingAreaOfInterest(rcti * input, ReadBufferOperation *readOperation, rcti *output);
+	 * @brief determine the area of interest of a certain input area
+	 * @note This method only evaluates a single ReadBufferOperation
+	 * @param input the input area
+	 * @param readOperation The ReadBufferOperation where the area needs to be evaluated
+	 * @param output the area needed of the ReadBufferOperation. Result
+	 */
+	void determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
 
 
 public:
 	// constructors
 	ExecutionGroup();
-	
-	/**
-	  * @brief set the id of this ExecutionGroup
-	  * @param id
-	  */
-	void setId(string id) {this->id = id;}
-	
-	/**
-	  * @brief return the id of this ExecutionGroup
-	  */
-	const string getId() const {return this->id;}
-	
+		
 	// methods
 	/**
-	  * @brief check to see if a NodeOperation is already inside this execution group
-	  * @param operation the NodeOperation to check
-	  * @return [true,false]
-	  */
+	 * @brief check to see if a NodeOperation is already inside this execution group
+	 * @param operation the NodeOperation to check
+	 * @return [true,false]
+	 */
 	bool containsOperation(NodeOperation *operation);
 	
 	/**
-	  * @brief add an operation to this ExecutionGroup
-	  * @note this method will add input of the operations recursivly
-	  * @note this method can create multiple ExecutionGroup's
-	  * @param system
-	  * @param operation
-	  */
+	 * @brief add an operation to this ExecutionGroup
+	 * @note this method will add input of the operations recursivly
+	 * @note this method can create multiple ExecutionGroup's
+	 * @param system
+	 * @param operation
+	 */
 	void addOperation(ExecutionSystem *system, NodeOperation *operation);
 	
 	/**
-	  * @brief is this ExecutionGroup an output ExecutionGroup
-	  * @note An OutputExecution group are groups containing a
-	  * @note ViewerOperation, CompositeOperation, PreviewOperation.
-	  * @see NodeOperation.isOutputOperation
-	  */
-	const int isOutputExecutionGroup() const {return this->isOutput;}
-	
+	 * @brief is this ExecutionGroup an output ExecutionGroup
+	 * @note An OutputExecution group are groups containing a
+	 * @note ViewerOperation, CompositeOperation, PreviewOperation.
+	 * @see NodeOperation.isOutputOperation
+	 */
+	const int isOutputExecutionGroup() const { return this->isOutput; }
+
 	/**
-	  * @brief set whether this ExecutionGroup is an output
-	  * @param isOutput
-	  */
-	void setOutputExecutionGroup(int isOutput) {this->isOutput = isOutput;}
-	
+	 * @brief set whether this ExecutionGroup is an output
+	 * @param isOutput
+	 */
+	void setOutputExecutionGroup(int isOutput) { this->isOutput = isOutput; }
+
 	/**
-	  * @brief determine the resolution of this ExecutionGroup
-	  * @param resolution
-	  */
+	 * @brief determine the resolution of this ExecutionGroup
+	 * @param resolution
+	 */
 	void determineResolution(unsigned int resolution[]);
 	
 	/**
-	  * @brief set the resolution of this executiongroup
-	  * @param resolution
-	  */
-	void setResolution(unsigned int resolution[]) {this->width = resolution[0];this->height = resolution[1];}
+	 * @brief set the resolution of this executiongroup
+	 * @param resolution
+	 */
+	void setResolution(unsigned int resolution[]) { this->width = resolution[0]; this->height = resolution[1]; }
 	
 	/**
-	  * @brief get the width of this execution group
-	  */
-	const unsigned int getWidth() {return this->width;}
+	 * @brief get the width of this execution group
+	 */
+	const unsigned int getWidth() { return this->width; }
 	
 	/**
-	  * @brief get the height of this execution group
-	  */
-	const unsigned int getHeight() {return this->height;}
+	 * @brief get the height of this execution group
+	 */
+	const unsigned int getHeight() { return this->height; }
 	
 	/**
-	  * @brief does this ExecutionGroup contains a complex NodeOperation
-	  */
+	 * @brief does this ExecutionGroup contains a complex NodeOperation
+	 */
 	const bool isComplex() const;
 	
 	
 	/**
-	  * @brief get the output operation of this ExecutionGroup
-	  * @return NodeOperation *output operation
-	  */
-		NodeOperation *getOutputNodeOperation() const;
+	 * @brief get the output operation of this ExecutionGroup
+	 * @return NodeOperation *output operation
+	 */
+	NodeOperation *getOutputNodeOperation() const;
 	
 	/**
-	  * @brief compose multiple chunks into a single chunk
-	  * @return Memorybuffer *consolidated chunk
-	  */
+	 * @brief compose multiple chunks into a single chunk
+	 * @return Memorybuffer *consolidated chunk
+	 */
 	MemoryBuffer *constructConsolidatedMemoryBuffer(MemoryProxy *memoryProxy, rcti *output);
 	
 	/**
-	  * @brief initExecution is called just before the execution of the whole graph will be done.
-	  * @note The implementation will calculate the chunkSize of this execution group.
-	  */
+	 * @brief initExecution is called just before the execution of the whole graph will be done.
+	 * @note The implementation will calculate the chunkSize of this execution group.
+	 */
 	void initExecution();
 	
 	/**
-	  * @brief get all inputbuffers needed to calculate an chunk
-	  * @note all inputbuffers must be executed
-	  * @param chunkNumber the chunk to be calculated
-	  * @return MemoryBuffer** the inputbuffers
-	  */
-	MemoryBuffer** getInputBuffers(int chunkNumber);
-	
+	 * @brief get all inputbuffers needed to calculate an chunk
+	 * @note all inputbuffers must be executed
+	 * @param chunkNumber the chunk to be calculated
+	 * @return MemoryBuffer** the inputbuffers
+	 */
+	MemoryBuffer **getInputBuffersCPU();
+
+	/**
+	 * @brief get all inputbuffers needed to calculate an chunk
+	 * @note all inputbuffers must be executed
+	 * @param chunkNumber the chunk to be calculated
+	 * @return MemoryBuffer** the inputbuffers
+	 */
+	MemoryBuffer **getInputBuffersOpenCL(int chunkNumber);
+
 	/**
-	  * @brief allocate the outputbuffer of a chunk
-	  * @param chunkNumber the number of the chunk in the ExecutionGroup
-	  * @param rect the rect of that chunk
-	  * @see determineChunkRect
-	  */
+	 * @brief allocate the outputbuffer of a chunk
+	 * @param chunkNumber the number of the chunk in the ExecutionGroup
+	 * @param rect the rect of that chunk
+	 * @see determineChunkRect
+	 */
 	MemoryBuffer *allocateOutputBuffer(int chunkNumber, rcti *rect);
 	
 	/**
-	  * @brief after a chunk is executed the needed resources can be freed or unlocked.
-	  * @param chunknumber
-	  * @param memorybuffers
-	  */
-	void finalizeChunkExecution(int chunkNumber, MemoryBuffer** memoryBuffers);
+	 * @brief after a chunk is executed the needed resources can be freed or unlocked.
+	 * @param chunknumber
+	 * @param memorybuffers
+	 */
+	void finalizeChunkExecution(int chunkNumber, MemoryBuffer **memoryBuffers);
 	
 	/**
-	  * @brief deinitExecution is called just after execution the whole graph.
-	  * @note It will release all needed resources
-	  */
+	 * @brief deinitExecution is called just after execution the whole graph.
+	 * @note It will release all needed resources
+	 */
 	void deinitExecution();
 	
 	
 	/**
-	  * @brief schedule an ExecutionGroup
-	  * @note this method will return when all chunks have been calculated, or the execution has breaked (by user)
-	  *
-	  * first the order of the chunks will be determined. This is determined by finding the ViewerOperation and get the relevant information from it.
-	  *   - ChunkOrdering
-	  *   - CenterX
-	  *   - CenterY
-	  *
-	  * After determining the order of the chunks the chunks will be scheduled
-	  *
-	  * @see ViewerOperation
-	  * @param system
-	  */
+	 * @brief schedule an ExecutionGroup
+	 * @note this method will return when all chunks have been calculated, or the execution has breaked (by user)
+	 *
+	 * first the order of the chunks will be determined. This is determined by finding the ViewerOperation and get the relevant information from it.
+	 *   - ChunkOrdering
+	 *   - CenterX
+	 *   - CenterY
+	 *
+	 * After determining the order of the chunks the chunks will be scheduled
+	 *
+	 * @see ViewerOperation
+	 * @param system
+	 */
 	void execute(ExecutionSystem *system);
 	
 	/**
-	  * @brief this method determines the MemoryProxy's where this execution group depends on.
-	  * @note After this method determineDependingAreaOfInterest can be called to determine
-	  * @note the area of the MemoryProxy.creator thas has to be executed.
-	  * @param memoryProxies result
-	  */
-	void determineDependingMemoryProxies(vector<MemoryProxy*> *memoryProxies);
+	 * @brief this method determines the MemoryProxy's where this execution group depends on.
+	 * @note After this method determineDependingAreaOfInterest can be called to determine
+	 * @note the area of the MemoryProxy.creator thas has to be executed.
+	 * @param memoryProxies result
+	 */
+	void determineDependingMemoryProxies(vector<MemoryProxy *> *memoryProxies);
 	
 	/**
-	  * @brief Determine the rect (minx, maxx, miny, maxy) of a chunk.
-	  * @note Only gives usefull results ater the determination of the chunksize
-	  * @see determineChunkSize()
-	  */
+	 * @brief Determine the rect (minx, maxx, miny, maxy) of a chunk.
+	 * @note Only gives usefull results ater the determination of the chunksize
+	 * @see determineChunkSize()
+	 */
 	void determineChunkRect(rcti *rect, const unsigned int chunkNumber) const;
-	
-	
-		bool operator ==(const ExecutionGroup &executionGroup) const;
-	
-		/**
-	  * @brief can this ExecutionGroup be scheduled on an OpenCLDevice
-	  * @see WorkScheduler.schedule
-	  */
+
+	/**
+	 * @brief can this ExecutionGroup be scheduled on an OpenCLDevice
+	 * @see WorkScheduler.schedule
+	 */
 	bool isOpenCL();
+
+	void setChunksize(int chunksize) { this->chunkSize = chunksize; }
+
+	/**
+	 * @brief get the Render priority of this ExecutionGroup
+	 * @see ExecutionSystem.execute
+	 */
+	CompositorPriority getRenderPriotrity();
 	
-	void setChunksize(int chunksize) {this->chunkSize = chunksize;}
 };
 
 #endif
diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.cpp b/source/blender/compositor/intern/COM_ExecutionSystem.cpp
index 0d4c7cde68f..b644f405f00 100644
--- a/source/blender/compositor/intern/COM_ExecutionSystem.cpp
+++ b/source/blender/compositor/intern/COM_ExecutionSystem.cpp
@@ -22,17 +22,18 @@
 
 #include "COM_ExecutionSystem.h"
 
+#include <sstream>
+#include <stdio.h>
+
 #include "PIL_time.h"
 #include "BKE_node.h"
+
 #include "COM_Converter.h"
-#include <sstream>
 #include "COM_NodeOperation.h"
 #include "COM_ExecutionGroup.h"
 #include "COM_NodeBase.h"
 #include "COM_WorkScheduler.h"
 #include "COM_ReadBufferOperation.h"
-#include "COM_MemoryManager.h"
-#include "stdio.h"
 #include "COM_GroupNode.h"
 #include "COM_WriteBufferOperation.h"
 #include "COM_ReadBufferOperation.h"
@@ -42,7 +43,14 @@
 
 ExecutionSystem::ExecutionSystem(bNodeTree *editingtree, bool rendering)
 {
-	this->context.setbNodeTree(editingtree);
+	context.setbNodeTree(editingtree);
+	bNode *gnode;
+	for (gnode = (bNode *)editingtree->nodes.first; gnode; gnode = (bNode *)gnode->next) {
+		if (gnode->type == NODE_GROUP && gnode->typeinfo->group_edit_get(gnode)) {
+			context.setActivegNode(gnode);
+			break;
+		}
+	}
 
 	/* initialize the CompositorContext */
 	if (rendering) {
@@ -54,27 +62,27 @@ ExecutionSystem::ExecutionSystem(bNodeTree *editingtree, bool rendering)
 	context.setRendering(rendering);
 	context.setHasActiveOpenCLDevices(WorkScheduler::hasGPUDevices() && (editingtree->flag & NTREE_COM_OPENCL));
 
-	Node *mainOutputNode=NULL;
+	Node *mainOutputNode = NULL;
 
-	mainOutputNode = ExecutionSystemHelper::addbNodeTree(*this, 0, editingtree);
+	mainOutputNode = ExecutionSystemHelper::addbNodeTree(*this, 0, editingtree, NULL);
 
 	if (mainOutputNode) {
-		context.setScene((Scene*)mainOutputNode->getbNode()->id);
+		context.setScene((Scene *)mainOutputNode->getbNode()->id);
 		this->convertToOperations();
 		this->groupOperations(); /* group operations in ExecutionGroups */
-		vector<ExecutionGroup*> executionGroups;
-		this->findOutputExecutionGroup(&executionGroups);
 		unsigned int index;
 		unsigned int resolution[2];
-		for (index = 0 ; index < executionGroups.size(); index ++) {
-			resolution[0]=0;
-			resolution[1]=0;
-			ExecutionGroup *executionGroup = executionGroups[index];
+		for (index = 0; index < this->groups.size(); index++) {
+			resolution[0] = 0;
+			resolution[1] = 0;
+			ExecutionGroup *executionGroup = groups[index];
 			executionGroup->determineResolution(resolution);
 		}
 	}
 
-	if (G.f & G_DEBUG) ExecutionSystemHelper::debugDump(this);
+#ifdef COM_DEBUG
+	ExecutionSystemHelper::debugDump(this);
+#endif
 }
 
 ExecutionSystem::~ExecutionSystem()
@@ -105,63 +113,63 @@ ExecutionSystem::~ExecutionSystem()
 void ExecutionSystem::execute()
 {
 	unsigned int order = 0;
-	for (vector<NodeOperation*>::iterator iter = this->operations.begin(); iter != operations.end(); ++iter) {
+	for (vector<NodeOperation *>::iterator iter = this->operations.begin(); iter != operations.end(); ++iter) {
 		NodeBase *node = *iter;
-		NodeOperation *operation = (NodeOperation*) node;
+		NodeOperation *operation = (NodeOperation *) node;
 		if (operation->isReadBufferOperation()) {
-			ReadBufferOperation * readOperation = (ReadBufferOperation*)operation;
+			ReadBufferOperation *readOperation = (ReadBufferOperation *)operation;
 			readOperation->setOffset(order);
-			order ++;
+			order++;
 		}
 	}
-
-	MemoryManager::initialize();
 	unsigned int index;
 
-	for (index = 0 ; index < this->operations.size() ; index ++) {
-		NodeOperation * operation = this->operations[index];
+	for (index = 0; index < this->operations.size(); index++) {
+		NodeOperation *operation = this->operations[index];
+		operation->setbNodeTree(this->context.getbNodeTree());
 		operation->initExecution();
 	}
-	for (index = 0 ; index < this->groups.size() ; index ++) {
-		ExecutionGroup * executionGroup = this->groups[index];
+	for (index = 0; index < this->groups.size(); index++) {
+		ExecutionGroup *executionGroup = this->groups[index];
 		executionGroup->setChunksize(context.getChunksize());
 		executionGroup->initExecution();
 	}
 
 	WorkScheduler::start(this->context);
 
-
-	vector<ExecutionGroup*> executionGroups;
-	this->findOutputExecutionGroup(&executionGroups);
-
-	/* start execution of the ExecutionGroups based on priority of their output node */
-	for (int priority = 9 ; priority>=0 ; priority--) {
-		for (index = 0 ; index < executionGroups.size(); index ++) {
-			ExecutionGroup *group = executionGroups[index];
-			NodeOperation *output = group->getOutputNodeOperation();
-			if (output->getRenderPriority() == priority) {
-				group->execute(this);
-			}
-		}
-	}
+	executeGroups(COM_PRIORITY_HIGH);
+	executeGroups(COM_PRIORITY_MEDIUM);
+	executeGroups(COM_PRIORITY_LOW);
 
 	WorkScheduler::finish();
 	WorkScheduler::stop();
 
-	for (index = 0 ; index < this->operations.size() ; index ++) {
-		NodeOperation * operation = this->operations[index];
+	for (index = 0; index < this->operations.size(); index++) {
+		NodeOperation *operation = this->operations[index];
 		operation->deinitExecution();
 	}
-	for (index = 0 ; index < this->groups.size() ; index ++) {
-		ExecutionGroup * executionGroup = this->groups[index];
+	for (index = 0; index < this->groups.size(); index++) {
+		ExecutionGroup *executionGroup = this->groups[index];
 		executionGroup->deinitExecution();
 	}
-	MemoryManager::clear();
+}
+
+void ExecutionSystem::executeGroups(CompositorPriority priority)
+{
+	unsigned int index;
+	vector<ExecutionGroup *> executionGroups;
+	this->findOutputExecutionGroup(&executionGroups, priority);
+
+	for (index = 0; index < executionGroups.size(); index++) {
+		ExecutionGroup *group = executionGroups[index];
+		group->execute(this);
+	}
 }
 
 void ExecutionSystem::addOperation(NodeOperation *operation)
 {
 	ExecutionSystemHelper::addOperation(this->operations, operation);
+//	operation->setBTree
 }
 
 void ExecutionSystem::addReadWriteBufferOperations(NodeOperation *operation)
@@ -169,87 +177,96 @@ void ExecutionSystem::addReadWriteBufferOperations(NodeOperation *operation)
 	// for every input add write and read operation if input is not a read operation
 	// only add read operation to other links when they are attached to buffered operations.
 	unsigned int index;
-	for (index = 0 ; index < operation->getNumberOfInputSockets();index++) {
+	for (index = 0; index < operation->getNumberOfInputSockets(); index++) {
 		InputSocket *inputsocket = operation->getInputSocket(index);
 		if (inputsocket->isConnected()) {
 			SocketConnection *connection = inputsocket->getConnection();
-			NodeOperation *otherEnd = (NodeOperation*)connection->getFromNode();
+			NodeOperation *otherEnd = (NodeOperation *)connection->getFromNode();
 			if (!otherEnd->isReadBufferOperation()) {
 				// check of other end already has write operation
 				OutputSocket *fromsocket = connection->getFromSocket();
-				WriteBufferOperation * writeoperation = fromsocket->findAttachedWriteBufferOperation();
+				WriteBufferOperation *writeoperation = fromsocket->findAttachedWriteBufferOperation();
 				if (writeoperation == NULL) {
 					writeoperation = new WriteBufferOperation();
 					writeoperation->setbNodeTree(this->getContext().getbNodeTree());
 					this->addOperation(writeoperation);
 					ExecutionSystemHelper::addLink(this->getConnections(), fromsocket, writeoperation->getInputSocket(0));
+					writeoperation->readResolutionFromInputSocket();
 				}
 				ReadBufferOperation *readoperation = new ReadBufferOperation();
 				readoperation->setMemoryProxy(writeoperation->getMemoryProxy());
 				connection->setFromSocket(readoperation->getOutputSocket());
 				readoperation->getOutputSocket()->addConnection(connection);
+				readoperation->readResolutionFromWriteBuffer();
 				this->addOperation(readoperation);
 			}
 		}
 	}
 	/*
-		link the outputsocket to a write operation
-		link the writeoperation to a read operation
-		link the read operation to the next node.
-	*/
-	OutputSocket * outputsocket = operation->getOutputSocket();
+	 * link the outputsocket to a write operation
+	 * link the writeoperation to a read operation
+	 * link the read operation to the next node.
+	 */
+	OutputSocket *outputsocket = operation->getOutputSocket();
 	if (outputsocket->isConnected()) {
 		int index;
 		WriteBufferOperation *writeOperation;
 		writeOperation = new WriteBufferOperation();
 		writeOperation->setbNodeTree(this->getContext().getbNodeTree());
 		this->addOperation(writeOperation);
-		for (index = 0 ; index < outputsocket->getNumberOfConnections();index ++) {
-			SocketConnection * connection = outputsocket->getConnection(index);
+		ExecutionSystemHelper::addLink(this->getConnections(), outputsocket, writeOperation->getInputSocket(0));
+		writeOperation->readResolutionFromInputSocket();
+		for (index = 0; index < outputsocket->getNumberOfConnections() - 1; index++) {
+			SocketConnection *connection = outputsocket->getConnection(index);
 			ReadBufferOperation *readoperation = new ReadBufferOperation();
 			readoperation->setMemoryProxy(writeOperation->getMemoryProxy());
 			connection->setFromSocket(readoperation->getOutputSocket());
 			readoperation->getOutputSocket()->addConnection(connection);
+			readoperation->readResolutionFromWriteBuffer();
 			this->addOperation(readoperation);
 		}
-		ExecutionSystemHelper::addLink(this->getConnections(), outputsocket, writeOperation->getInputSocket(0));
 	}
 }
 
 void ExecutionSystem::convertToOperations()
 {
 	unsigned int index;
-	// first determine data types of the nodes, this can be used by the node to convert to a different operation system
-	this->determineActualSocketDataTypes((vector<NodeBase*>&)this->nodes);
 	for (index = 0; index < this->nodes.size(); index++) {
-		Node *node = (Node*)this->nodes[index];
+		Node *node = (Node *)this->nodes[index];
 		node->convertToOperations(this, &this->context);
 	}
 
-	// update the socket types of the operations. this will be used to add conversion operations in the system
-	this->determineActualSocketDataTypes((vector<NodeBase*>&)this->operations);
-	for (index = 0 ; index < this->connections.size(); index ++) {
+	for (index = 0; index < this->connections.size(); index++) {
 		SocketConnection *connection = this->connections[index];
 		if (connection->isValid()) {
-			if (connection->getFromSocket()->getActualDataType() != connection->getToSocket()->getActualDataType()) {
+			if (connection->getFromSocket()->getDataType() != connection->getToSocket()->getDataType()) {
 				Converter::convertDataType(connection, this);
 			}
 		}
 	}
 
 	// determine all resolutions of the operations (Width/Height)
-	for (index = 0 ; index < this->operations.size(); index ++) {
+	for (index = 0; index < this->operations.size(); index++) {
 		NodeOperation *operation = this->operations[index];
-		if (operation->isOutputOperation(context.isRendering())) {
-			unsigned int resolution[2] = {0,0};
-			unsigned int preferredResolution[2] = {0,0};
+		if (operation->isOutputOperation(context.isRendering()) && !operation->isPreviewOperation()) {
+			unsigned int resolution[2] = {0, 0};
+			unsigned int preferredResolution[2] = {0, 0};
+			operation->determineResolution(resolution, preferredResolution);
+			operation->setResolution(resolution);
+		}
+	}
+	for (index = 0; index < this->operations.size(); index++) {
+		NodeOperation *operation = this->operations[index];
+		if (operation->isOutputOperation(context.isRendering()) && operation->isPreviewOperation()) {
+			unsigned int resolution[2] = {0, 0};
+			unsigned int preferredResolution[2] = {0, 0};
 			operation->determineResolution(resolution, preferredResolution);
 			operation->setResolution(resolution);
 		}
 	}
 
 	// add convert resolution operations when needed.
-	for (index = 0 ; index < this->connections.size(); index ++) {
+	for (index = 0; index < this->connections.size(); index++) {
 		SocketConnection *connection = this->connections[index];
 		if (connection->isValid()) {
 			if (connection->needsResolutionConversion()) {
@@ -257,13 +274,12 @@ void ExecutionSystem::convertToOperations()
 			}
 		}
 	}
-
 }
 
 void ExecutionSystem::groupOperations()
 {
-	vector<NodeOperation*> outputOperations;
-	NodeOperation * operation;
+	vector<NodeOperation *> outputOperations;
+	NodeOperation *operation;
 	unsigned int index;
 	// surround complex operations with ReadBufferOperation and WriteBufferOperation
 	for (index = 0; index < this->operations.size(); index++) {
@@ -273,7 +289,7 @@ void ExecutionSystem::groupOperations()
 		}
 	}
 	ExecutionSystemHelper::findOutputNodeOperations(&outputOperations, this->getOperations(), this->context.isRendering());
-	for (vector<NodeOperation*>::iterator iter = outputOperations.begin(); iter != outputOperations.end(); ++iter) {
+	for (vector<NodeOperation *>::iterator iter = outputOperations.begin(); iter != outputOperations.end(); ++iter) {
 		operation = *iter;
 		ExecutionGroup *group = new ExecutionGroup();
 		group->addOperation(this, operation);
@@ -288,30 +304,21 @@ void ExecutionSystem::addSocketConnection(SocketConnection *connection)
 }
 
 
-void ExecutionSystem::determineActualSocketDataTypes(vector<NodeBase*> &nodes)
+void ExecutionSystem::findOutputExecutionGroup(vector<ExecutionGroup *> *result, CompositorPriority priority) const
 {
 	unsigned int index;
-	/* first do all input nodes */
-	for (index = 0; index < nodes.size(); index++) {
-		NodeBase *node = nodes[index];
-		if (node->isInputNode()) {
-			node->determineActualSocketDataTypes();
-		}
-	}
-
-	/* then all other nodes */
-	for (index = 0; index < nodes.size(); index++) {
-		NodeBase *node = nodes[index];
-		if (!node->isInputNode()) {
-			node->determineActualSocketDataTypes();
+	for (index = 0; index < this->groups.size(); index++) {
+		ExecutionGroup *group = this->groups[index];
+		if (group->isOutputExecutionGroup() && group->getRenderPriotrity() == priority) {
+			result->push_back(group);
 		}
 	}
 }
 
-void ExecutionSystem::findOutputExecutionGroup(vector<ExecutionGroup*> *result) const
+void ExecutionSystem::findOutputExecutionGroup(vector<ExecutionGroup *> *result) const
 {
 	unsigned int index;
-	for (index = 0 ; index < this->groups.size() ; index ++) {
+	for (index = 0; index < this->groups.size(); index++) {
 		ExecutionGroup *group = this->groups[index];
 		if (group->isOutputExecutionGroup()) {
 			result->push_back(group);
diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.h b/source/blender/compositor/intern/COM_ExecutionSystem.h
index 85fec8b6145..70fd94ca57f 100644
--- a/source/blender/compositor/intern/COM_ExecutionSystem.h
+++ b/source/blender/compositor/intern/COM_ExecutionSystem.h
@@ -36,69 +36,69 @@ class ExecutionGroup;
 using namespace std;
 
 /**
-  * @page execution Execution model
-  * In order to get to an efficient model for execution, serveral steps are being done. these steps are explained below.
-  *
-  * @section EM_Step1 Step 1: translating blender node system to the new compsitor system
-  * Blenders node structure is based on C structs (DNA). These structs are not efficient in the new architecture. We want to use classes in order to simplify the system.
-  * during this step the blender node_tree is evaluated and converted to a CPP node system.
-  *
-  * @see ExecutionSystem
-  * @see Converter.convert
-  * @see Node
-  *
-  * @section EM_Step2 Step2: translating nodes to operations
-  * Ungrouping the GroupNodes. Group nodes are node_tree's in node_tree's. The new system only supports a single level of node_tree. We will 'flatten' the system in a single level.
-  * @see GroupNode
-  * @see ExecutionSystemHelper.ungroup
-  *
-  * Every node has the ability to convert itself to operations. The node itself is responsible to create a correct NodeOperation setup based on its internal settings.
-  * Most Node only need to convert it to its NodeOperation. Like a ColorToBWNode doesn't check anything, but replaces itself with a ConvertColorToBWOperation.
-  * More complex nodes can use different NodeOperation based on settings; like MixNode. based on the selected Mixtype a different operation will be used.
-  * for more information see the page about creating new Nodes. [@subpage newnode]
-  *
-  * @see ExecutionSystem.convertToOperations
-  * @see Node.convertToOperations
-  * @see NodeOperation base class for all operations in the system
-  *
-  * @section EM_Step3 Step3: add additional conversions to the operation system
-  *   - Data type conversions: the system has 3 data types COM_DT_VALUE, COM_DT_VECTOR, COM_DT_COLOR. The user can connect a Value socket to a color socket. As values are ordered differently than colors a conversion happens.
-  *
-  *   - Image size conversions: the system can automatically convert when resolutions do not match. An InputSocket has a resize mode. This can be any of the folowing settings.
-  *     - [@ref InputSocketResizeMode.COM_SC_CENTER]: The center of both images are aligned
-  *     - [@ref InputSocketResizeMode.COM_SC_FIT_WIDTH]: The width of both images are aligned
-  *     - [@ref InputSocketResizeMode.COM_SC_FIT_HEIGHT]: the height of both images are aligned
-  *     - [@ref InputSocketResizeMode.COM_SC_FIT]: The width, or the height of both images are aligned to make sure that it fits.
-  *     - [@ref InputSocketResizeMode.COM_SC_STRETCH]: The width and the height of both images are aligned
-  *     - [@ref InputSocketResizeMode.COM_SC_NO_RESIZE]: bottom left of the images are aligned.
-  *
-  * @see Converter.convertDataType Datatype conversions
-  * @see Converter.convertResolution Image size conversions
-  *
-  * @section EM_Step4 Step4: group operations in executions groups
-  * ExecutionGroup are groups of operations that are calculated as being one bigger operation. All operations will be part of an ExecutionGroup.
-  * Complex nodes will be added to separate groups. Between ExecutionGroup's the data will be stored in MemoryBuffers. ReadBufferOperations and WriteBufferOperations are added where needed.
-  *
-  * <pre>
-  *
-  *        +------------------------------+      +----------------+
-  *        | ExecutionGroup A             |      |ExecutionGroup B|   ExecutionGroup
-  *        | +----------+     +----------+|      |+----------+    |
-  *   /----->| Operation|---->| Operation|-\ /--->| Operation|-\  |   NodeOperation
-  *   |    | | A        |     | B        ||| |   || C        | |  |
-  *   |    | | cFFA     |  /->| cFFA     ||| |   || cFFA     | |  |
-  *   |    | +----------+  |  +----------+|| |   |+----------+ |  |
-  *   |    +---------------|--------------+v |   +-------------v--+
-  * +-*----+           +---*--+         +--*-*--+           +--*----+
-  * |inputA|           |inputB|         |outputA|           |outputB| MemoryBuffer
-  * |cFAA  |           |cFAA  |         |cFAA   |           |cFAA   |
-  * +------+           +------+         +-------+           +-------+
-  * </pre>
-  * @see ExecutionSystem.groupOperations method doing this step
-  * @see ExecutionSystem.addReadWriteBufferOperations
-  * @see NodeOperation.isComplex
-  * @see ExecutionGroup class representing the ExecutionGroup
-  */
+ * @page execution Execution model
+ * In order to get to an efficient model for execution, serveral steps are being done. these steps are explained below.
+ *
+ * @section EM_Step1 Step 1: translating blender node system to the new compsitor system
+ * Blenders node structure is based on C structs (DNA). These structs are not efficient in the new architecture. We want to use classes in order to simplify the system.
+ * during this step the blender node_tree is evaluated and converted to a CPP node system.
+ *
+ * @see ExecutionSystem
+ * @see Converter.convert
+ * @see Node
+ *
+ * @section EM_Step2 Step2: translating nodes to operations
+ * Ungrouping the GroupNodes. Group nodes are node_tree's in node_tree's. The new system only supports a single level of node_tree. We will 'flatten' the system in a single level.
+ * @see GroupNode
+ * @see ExecutionSystemHelper.ungroup
+ *
+ * Every node has the ability to convert itself to operations. The node itself is responsible to create a correct NodeOperation setup based on its internal settings.
+ * Most Node only need to convert it to its NodeOperation. Like a ColorToBWNode doesn't check anything, but replaces itself with a ConvertColorToBWOperation.
+ * More complex nodes can use different NodeOperation based on settings; like MixNode. based on the selected Mixtype a different operation will be used.
+ * for more information see the page about creating new Nodes. [@subpage newnode]
+ *
+ * @see ExecutionSystem.convertToOperations
+ * @see Node.convertToOperations
+ * @see NodeOperation base class for all operations in the system
+ *
+ * @section EM_Step3 Step3: add additional conversions to the operation system
+ *   - Data type conversions: the system has 3 data types COM_DT_VALUE, COM_DT_VECTOR, COM_DT_COLOR. The user can connect a Value socket to a color socket. As values are ordered differently than colors a conversion happens.
+ *
+ *   - Image size conversions: the system can automatically convert when resolutions do not match. An InputSocket has a resize mode. This can be any of the folowing settings.
+ *     - [@ref InputSocketResizeMode.COM_SC_CENTER]: The center of both images are aligned
+ *     - [@ref InputSocketResizeMode.COM_SC_FIT_WIDTH]: The width of both images are aligned
+ *     - [@ref InputSocketResizeMode.COM_SC_FIT_HEIGHT]: the height of both images are aligned
+ *     - [@ref InputSocketResizeMode.COM_SC_FIT]: The width, or the height of both images are aligned to make sure that it fits.
+ *     - [@ref InputSocketResizeMode.COM_SC_STRETCH]: The width and the height of both images are aligned
+ *     - [@ref InputSocketResizeMode.COM_SC_NO_RESIZE]: bottom left of the images are aligned.
+ *
+ * @see Converter.convertDataType Datatype conversions
+ * @see Converter.convertResolution Image size conversions
+ *
+ * @section EM_Step4 Step4: group operations in executions groups
+ * ExecutionGroup are groups of operations that are calculated as being one bigger operation. All operations will be part of an ExecutionGroup.
+ * Complex nodes will be added to separate groups. Between ExecutionGroup's the data will be stored in MemoryBuffers. ReadBufferOperations and WriteBufferOperations are added where needed.
+ *
+ * <pre>
+ *
+ *        +------------------------------+      +----------------+
+ *        | ExecutionGroup A             |      |ExecutionGroup B|   ExecutionGroup
+ *        | +----------+     +----------+|      |+----------+    |
+ *   /----->| Operation|---->| Operation|-\ /--->| Operation|-\  |   NodeOperation
+ *   |    | | A        |     | B        ||| |   || C        | |  |
+ *   |    | | cFFA     |  /->| cFFA     ||| |   || cFFA     | |  |
+ *   |    | +----------+  |  +----------+|| |   |+----------+ |  |
+ *   |    +---------------|--------------+v |   +-------------v--+
+ * +-*----+           +---*--+         +--*-*--+           +--*----+
+ * |inputA|           |inputB|         |outputA|           |outputB| MemoryBuffer
+ * |cFAA  |           |cFAA  |         |cFAA   |           |cFAA   |
+ * +------+           +------+         +-------+           +-------+
+ * </pre>
+ * @see ExecutionSystem.groupOperations method doing this step
+ * @see ExecutionSystem.addReadWriteBufferOperations
+ * @see NodeOperation.isComplex
+ * @see ExecutionGroup class representing the ExecutionGroup
+ */
 
 /**
  * @brief the ExecutionSystem contains the whole compositor tree.
@@ -106,124 +106,131 @@ using namespace std;
 class ExecutionSystem {
 private:
 	/**
-	  * @brief the context used during execution
-	  */
+	 * @brief the context used during execution
+	 */
 	CompositorContext context;
 
 	/**
-	  * @brief vector of nodes
-	  */
-	vector<Node*> nodes;
+	 * @brief vector of nodes
+	 */
+	vector<Node *> nodes;
 
 	/**
-	  * @brief vector of operations
-	  */
-	vector<NodeOperation*> operations;
+	 * @brief vector of operations
+	 */
+	vector<NodeOperation *> operations;
 
 	/**
-	  * @brief vector of groups
-	  */
-	vector<ExecutionGroup*> groups
+	 * @brief vector of groups
+	 */
+	vector<ExecutionGroup *> groups
 
 	/**
-	  * @brief vector of connections
-	  */;
-	vector<SocketConnection*> connections;
+	 * @brief vector of connections
+	 */;
+	vector<SocketConnection *> connections;
 
 private: //methods
 	/**
-	  * @brief add ReadBufferOperation and WriteBufferOperation around an operation
-	  * @param operation the operation to add the bufferoperations around.
-	  */
+	 * @brief add ReadBufferOperation and WriteBufferOperation around an operation
+	 * @param operation the operation to add the bufferoperations around.
+	 */
 	void addReadWriteBufferOperations(NodeOperation *operation);
 
 
 	/**
-	  * find all execution group with output nodes
-	  */
-	void findOutputExecutionGroup(vector<ExecutionGroup*> *result) const;
+	 * find all execution group with output nodes
+	 */
+	void findOutputExecutionGroup(vector<ExecutionGroup *> *result, CompositorPriority priority) const;
+	
+	/**
+	 * find all execution group with output nodes
+	 */
+	void findOutputExecutionGroup(vector<ExecutionGroup *> *result) const;
 
 public:
 	/**
-	  * @brief Create a new ExecutionSystem and initialize it with the
-	  * editingtree.
-	  *
-	  * @param editingtree [bNodeTree*]
-	  * @param rendering [true false]
-	  */
+	 * @brief Create a new ExecutionSystem and initialize it with the
+	 * editingtree.
+	 *
+	 * @param editingtree [bNodeTree*]
+	 * @param rendering [true false]
+	 */
 	ExecutionSystem(bNodeTree *editingtree, bool rendering);
 
 	/**
-	  * Destructor
-	  */
+	 * Destructor
+	 */
 	~ExecutionSystem();
 
 
 	/**
-	  * @brief execute this system
-	  *  - initialize the NodeOperation's and ExecutionGroup's
-	  *  - schedule the output ExecutionGroup's based on their priority
-	  *  - deinitialize the ExecutionGroup's and NodeOperation's
-	  */
+	 * @brief execute this system
+	 *  - initialize the NodeOperation's and ExecutionGroup's
+	 *  - schedule the output ExecutionGroup's based on their priority
+	 *  - deinitialize the ExecutionGroup's and NodeOperation's
+	 */
 	void execute();
 
 	/**
-	  * @brief Add an operation to the operation list
-	  *
-	  * @param operation the operation to add
-	  */
+	 * @brief Add an operation to the operation list
+	 *
+	 * @param operation the operation to add
+	 */
 	void addOperation(NodeOperation *operation);
 
 	/**
-	  * Add an editor link to the system. convert it to an socketconnection (CPP-representative)
-	  * this converted socket is returned.
-	  */
+	 * Add an editor link to the system. convert it to an socketconnection (CPP-representative)
+	 * this converted socket is returned.
+	 */
 	SocketConnection *addNodeLink(bNodeLink *bNodeLink);
 	void addSocketConnection(SocketConnection *connection);
 
 	/**
-	  * @brief Convert all nodes to operations
-	  */
+	 * @brief Convert all nodes to operations
+	 */
 	void convertToOperations();
 
 	/**
-	  * @brief group operations in ExecutionGroup's
-	  * @see ExecutionGroup
-	  */
+	 * @brief group operations in ExecutionGroup's
+	 * @see ExecutionGroup
+	 */
 	void groupOperations();
 
 	/**
-	  * @brief get the reference to the compositor context
-	  */
-	CompositorContext& getContext() {return this->context;}
+	 * @brief get the reference to the compositor context
+	 */
+	CompositorContext& getContext() { return this->context; }
 
 	/**
-	  * @brief get the reference to the compositor nodes
-	  */
-	vector<Node*>& getNodes() {return this->nodes;}
+	 * @brief get the reference to the compositor nodes
+	 */
+	vector<Node *>& getNodes() { return this->nodes; }
 
 	/**
-	  * @brief get the reference to the compositor connections
-	  */
-	vector<SocketConnection*>& getConnections() {return this->connections;}
+	 * @brief get the reference to the compositor connections
+	 */
+	vector<SocketConnection *>& getConnections() { return this->connections; }
 
 	/**
-	  * @brief get the reference to the list of execution groups
-	  */
-	vector<ExecutionGroup*>& getExecutionGroups() {return this->groups;}
+	 * @brief get the reference to the list of execution groups
+	 */
+	vector<ExecutionGroup *>& getExecutionGroups() { return this->groups; }
 
 	/**
-	  * @brief get the reference to the list of operations
-	  */
-	vector<NodeOperation*>& getOperations() {return this->operations;}
+	 * @brief get the reference to the list of operations
+	 */
+	vector<NodeOperation *>& getOperations() { return this->operations; }
 
 private:
 
 	/**
-	  * @brief determine the actual data types of all sockets
-	  * @param nodes list of nodes or operations to do the data type determination
-	  */
-	void determineActualSocketDataTypes(vector<NodeBase*> &nodes);
+	 * @brief determine the actual data types of all sockets
+	 * @param nodes list of nodes or operations to do the data type determination
+	 */
+	void determineActualSocketDataTypes(vector<NodeBase *> &nodes);
+	
+	void executeGroups(CompositorPriority priority);
 
 };
 #endif
diff --git a/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp b/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
index 94376f73de9..b7d75732a84 100644
--- a/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
+++ b/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
@@ -22,50 +22,55 @@
 
 #include "COM_ExecutionSystemHelper.h"
 
+#include <sstream>
+#include <stdio.h>
+
 #include "PIL_time.h"
 #include "BKE_node.h"
+
 #include "COM_Converter.h"
-#include <sstream>
 #include "COM_NodeOperation.h"
 #include "COM_ExecutionGroup.h"
 #include "COM_NodeBase.h"
 #include "COM_WorkScheduler.h"
 #include "COM_ReadBufferOperation.h"
-#include "COM_MemoryManager.h"
-#include "stdio.h"
 #include "COM_GroupNode.h"
 #include "COM_WriteBufferOperation.h"
 #include "COM_ReadBufferOperation.h"
+#include "COM_ViewerBaseOperation.h"
 
-Node *ExecutionSystemHelper::addbNodeTree(ExecutionSystem &system, int nodes_start, bNodeTree *tree)
+Node *ExecutionSystemHelper::addbNodeTree(ExecutionSystem &system, int nodes_start, bNodeTree *tree, bNode *groupnode)
 {
-	vector<Node*>& nodes = system.getNodes();
-	vector<SocketConnection*>& links = system.getConnections();
+	vector<Node *>& nodes = system.getNodes();
+	vector<SocketConnection *>& links = system.getConnections();
 	Node *mainnode = NULL;
+	const bNode *activeGroupNode = system.getContext().getActivegNode();
+	bool isActiveGroup = activeGroupNode == groupnode;
+	
 	/* add all nodes of the tree to the node list */
-	bNode *node = (bNode*)tree->nodes.first;
+	bNode *node = (bNode *)tree->nodes.first;
 	while (node != NULL) {
-		Node *execnode = addNode(nodes, node);
+		Node *execnode = addNode(nodes, node, isActiveGroup);
 		if (node->type == CMP_NODE_COMPOSITE) {
 			mainnode = execnode;
 		}
-		node = (bNode*)node->next;
+		node = (bNode *)node->next;
 	}
 
-	NodeRange node_range(nodes.begin()+nodes_start, nodes.end());
+	NodeRange node_range(nodes.begin() + nodes_start, nodes.end());
 
 	/* add all nodelinks of the tree to the link list */
-	bNodeLink *nodelink = (bNodeLink*)tree->links.first;
+	bNodeLink *nodelink = (bNodeLink *)tree->links.first;
 	while (nodelink != NULL) {
 		addNodeLink(node_range, links, nodelink);
-		nodelink = (bNodeLink*)nodelink->next;
+		nodelink = (bNodeLink *)nodelink->next;
 	}
 
 	/* Expand group nodes */
-	for (int i=nodes_start; i < nodes.size(); ++i) {
+	for (unsigned int i = nodes_start; i < nodes.size(); ++i) {
 		Node *execnode = nodes[i];
 		if (execnode->isGroupNode()) {
-			GroupNode * groupNode = (GroupNode*)execnode;
+			GroupNode *groupNode = (GroupNode *)execnode;
 			groupNode->ungroup(system);
 		}
 	}
@@ -73,37 +78,38 @@ Node *ExecutionSystemHelper::addbNodeTree(ExecutionSystem &system, int nodes_sta
 	return mainnode;
 }
 
-void ExecutionSystemHelper::addNode(vector<Node*>& nodes, Node *node)
+void ExecutionSystemHelper::addNode(vector<Node *>& nodes, Node *node)
 {
 	nodes.push_back(node);
 }
 
-Node *ExecutionSystemHelper::addNode(vector<Node*>& nodes, bNode *bNode)
+Node *ExecutionSystemHelper::addNode(vector<Node *>& nodes, bNode *bNode, bool inActiveGroup)
 {
 	Converter converter;
-	Node * node;
+	Node *node;
 	node = converter.convert(bNode);
+	node->setIsInActiveGroup(inActiveGroup);
 	if (node != NULL) {
 		addNode(nodes, node);
 		return node;
 	}
 	return NULL;
 }
-void ExecutionSystemHelper::addOperation(vector<NodeOperation*>& operations, NodeOperation *operation)
+void ExecutionSystemHelper::addOperation(vector<NodeOperation *>& operations, NodeOperation *operation)
 {
 	operations.push_back(operation);
 }
 
-void ExecutionSystemHelper::addExecutionGroup(vector<ExecutionGroup*>& executionGroups, ExecutionGroup *executionGroup)
+void ExecutionSystemHelper::addExecutionGroup(vector<ExecutionGroup *>& executionGroups, ExecutionGroup *executionGroup)
 {
 	executionGroups.push_back(executionGroup);
 }
 
-void ExecutionSystemHelper::findOutputNodeOperations(vector<NodeOperation*>* result, vector<NodeOperation*>& operations, bool rendering)
+void ExecutionSystemHelper::findOutputNodeOperations(vector<NodeOperation *> *result, vector<NodeOperation *>& operations, bool rendering)
 {
 	unsigned int index;
 
-	for (index = 0 ; index < operations.size() ; index ++) {
+	for (index = 0; index < operations.size(); index++) {
 		NodeOperation *operation = operations[index];
 		if (operation->isOutputOperation(rendering)) {
 			result->push_back(operation);
@@ -114,18 +120,18 @@ void ExecutionSystemHelper::findOutputNodeOperations(vector<NodeOperation*>* res
 static InputSocket *find_input(NodeRange &node_range, bNode *bnode, bNodeSocket *bsocket)
 {
 	if (bnode != NULL) {
-		for (NodeIterator it=node_range.first; it!=node_range.second; ++it) {
+		for (NodeIterator it = node_range.first; it != node_range.second; ++it) {
 			Node *node = *it;
 			if (node->getbNode() == bnode)
 				return node->findInputSocketBybNodeSocket(bsocket);
 		}
 	}
 	else {
-		for (NodeIterator it=node_range.first; it!=node_range.second; ++it) {
+		for (NodeIterator it = node_range.first; it != node_range.second; ++it) {
 			Node *node = *it;
 			if (node->isProxyNode()) {
 				InputSocket *proxySocket = node->getInputSocket(0);
-				if (proxySocket->getbNodeSocket()==bsocket)
+				if (proxySocket->getbNodeSocket() == bsocket)
 					return proxySocket;
 			}
 		}
@@ -135,29 +141,29 @@ static InputSocket *find_input(NodeRange &node_range, bNode *bnode, bNodeSocket
 static OutputSocket *find_output(NodeRange &node_range, bNode *bnode, bNodeSocket *bsocket)
 {
 	if (bnode != NULL) {
-		for (NodeIterator it=node_range.first; it!=node_range.second; ++it) {
+		for (NodeIterator it = node_range.first; it != node_range.second; ++it) {
 			Node *node = *it;
 			if (node->getbNode() == bnode)
 				return node->findOutputSocketBybNodeSocket(bsocket);
 		}
 	}
 	else {
-		for (NodeIterator it=node_range.first; it!=node_range.second; ++it) {
+		for (NodeIterator it = node_range.first; it != node_range.second; ++it) {
 			Node *node = *it;
 			if (node->isProxyNode()) {
 				OutputSocket *proxySocket = node->getOutputSocket(0);
-				if (proxySocket->getbNodeSocket()==bsocket)
+				if (proxySocket->getbNodeSocket() == bsocket)
 					return proxySocket;
 			}
 		}
 	}
 	return NULL;
 }
-SocketConnection *ExecutionSystemHelper::addNodeLink(NodeRange &node_range, vector<SocketConnection*>& links, bNodeLink *bNodeLink)
+SocketConnection *ExecutionSystemHelper::addNodeLink(NodeRange &node_range, vector<SocketConnection *>& links, bNodeLink *bNodeLink)
 {
 	/// @note: cyclic lines will be ignored. This has been copied from node.c
 	if (bNodeLink->tonode != 0 && bNodeLink->fromnode != 0) {
-		if (!(bNodeLink->fromnode->level >= bNodeLink->tonode->level && bNodeLink->tonode->level!=0xFFF)) { // only add non cyclic lines! so execution will procede
+		if (!(bNodeLink->fromnode->level >= bNodeLink->tonode->level && bNodeLink->tonode->level != 0xFFF)) { // only add non cyclic lines! so execution will procede
 			return NULL;
 		}
 	}
@@ -174,9 +180,9 @@ SocketConnection *ExecutionSystemHelper::addNodeLink(NodeRange &node_range, vect
 	return connection;
 }
 
-SocketConnection *ExecutionSystemHelper::addLink(vector<SocketConnection*>& links, OutputSocket *fromSocket, InputSocket *toSocket)
+SocketConnection *ExecutionSystemHelper::addLink(vector<SocketConnection *>& links, OutputSocket *fromSocket, InputSocket *toSocket)
 {
-	SocketConnection * newconnection = new SocketConnection();
+	SocketConnection *newconnection = new SocketConnection();
 	newconnection->setFromSocket(fromSocket);
 	newconnection->setToSocket(toSocket);
 	fromSocket->addConnection(newconnection);
@@ -195,12 +201,12 @@ void ExecutionSystemHelper::debugDump(ExecutionSystem *system)
 	printf("-- BEGIN COMPOSITOR DUMP --\r\n");
 	printf("digraph compositorexecution {\r\n");
 	tot = system->getNodes().size();
-	for (int i = 0 ; i < tot ; i ++) {
+	for (int i = 0; i < tot; i++) {
 		node = system->getNodes()[i];
 		printf("// NODE: %s\r\n", node->getbNode()->typeinfo->name);
 	}
 	tot = system->getOperations().size();
-	for (int i = 0 ; i < tot ; i ++) {
+	for (int i = 0; i < tot; i++) {
 		operation = system->getOperations()[i];
 		printf("// OPERATION: %p\r\n", operation);
 		printf("\t\"O_%p\"", operation);
@@ -208,32 +214,35 @@ void ExecutionSystemHelper::debugDump(ExecutionSystem *system)
 		tot2 = operation->getNumberOfInputSockets();
 		if (tot2 != 0) {
 			printf("{");
-			for (int j = 0 ; j < tot2 ; j ++) {
+			for (int j = 0; j < tot2; j++) {
 				InputSocket *socket = operation->getInputSocket(j);
 				if (j != 0) {
 					printf("|");
 				}
 				printf("<IN_%p>", socket);
-				switch (socket->getActualDataType()) {
-				case COM_DT_VALUE:
-					printf("Value");
-					break;
-				case COM_DT_VECTOR:
-					printf("Vector");
-					break;
-				case COM_DT_COLOR:
-					printf("Color");
-					break;
-				case COM_DT_UNKNOWN:
-					printf("Unknown");
-					break;
+				switch (socket->getDataType()) {
+					case COM_DT_VALUE:
+						printf("Value");
+						break;
+					case COM_DT_VECTOR:
+						printf("Vector");
+						break;
+					case COM_DT_COLOR:
+						printf("Color");
+						break;
 				}
 			}
 			printf("}");
 			printf("|");
 		}
 		if (operation->isViewerOperation()) {
-			printf("Viewer");
+			ViewerBaseOperation *viewer = (ViewerBaseOperation *)operation;
+			if (viewer->isActiveViewerOutput()) {
+				printf("Active viewer");
+			}
+			else {
+				printf("Viewer");
+			}
 		}
 		else if (operation->isOutputOperation(system->getContext().isRendering())) {
 			printf("Output");
@@ -250,29 +259,27 @@ void ExecutionSystemHelper::debugDump(ExecutionSystem *system)
 		else {
 			printf("O_%p", operation);
 		}
+		printf(" (%d,%d)", operation->getWidth(), operation->getHeight());
 		tot2 = operation->getNumberOfOutputSockets();
 		if (tot2 != 0) {
 			printf("|");
 			printf("{");
-			for (int j = 0 ; j < tot2 ; j ++) {
+			for (int j = 0; j < tot2; j++) {
 				OutputSocket *socket = operation->getOutputSocket(j);
 				if (j != 0) {
 					printf("|");
 				}
 				printf("<OUT_%p>", socket);
-				switch (socket->getActualDataType()) {
-				case COM_DT_VALUE:
-					printf("Value");
-					break;
-				case COM_DT_VECTOR:
-					printf("Vector");
-					break;
-				case COM_DT_COLOR:
-					printf("Color");
-					break;
-				case COM_DT_UNKNOWN:
-					printf("Unknown");
-					break;
+				switch (socket->getDataType()) {
+					case COM_DT_VALUE:
+						printf("Value");
+						break;
+					case COM_DT_VECTOR:
+						printf("Vector");
+						break;
+					case COM_DT_COLOR:
+						printf("Color");
+						break;
 				}
 			}
 			printf("}");
@@ -281,7 +288,7 @@ void ExecutionSystemHelper::debugDump(ExecutionSystem *system)
 		printf("\r\n");
 	}
 	tot = system->getExecutionGroups().size();
-	for (int i = 0 ; i < tot ; i ++) {
+	for (int i = 0; i < tot; i++) {
 		group = system->getExecutionGroups()[i];
 		printf("// GROUP: %d\r\n", i);
 		printf("subgraph {\r\n");
@@ -290,16 +297,16 @@ void ExecutionSystemHelper::debugDump(ExecutionSystem *system)
 		printf("}\r\n");
 	}
 	tot = system->getOperations().size();
-	for (int i = 0 ; i < tot ; i ++) {
+	for (int i = 0; i < tot; i++) {
 		operation = system->getOperations()[i];
 		if (operation->isReadBufferOperation()) {
-			ReadBufferOperation * read = (ReadBufferOperation*)operation;
-			WriteBufferOperation * write = read->getMemoryProxy()->getWriteBufferOperation();
+			ReadBufferOperation *read = (ReadBufferOperation *)operation;
+			WriteBufferOperation *write = read->getMemoryProxy()->getWriteBufferOperation();
 			printf("\t\"O_%p\" -> \"O_%p\" [style=dotted]\r\n", write, read);
 		}
 	}
 	tot = system->getConnections().size();
-	for (int i = 0 ; i < tot ; i ++) {
+	for (int i = 0; i < tot; i++) {
 		connection = system->getConnections()[i];
 		printf("// CONNECTION: %p.%p -> %p.%p\r\n", connection->getFromNode(), connection->getFromSocket(), connection->getToNode(), connection->getToSocket());
 		printf("\t\"O_%p\":\"OUT_%p\" -> \"O_%p\":\"IN_%p\"", connection->getFromNode(), connection->getFromSocket(), connection->getToNode(), connection->getToSocket());
@@ -307,19 +314,16 @@ void ExecutionSystemHelper::debugDump(ExecutionSystem *system)
 			printf(" [color=red]");
 		}
 		else {
-			switch (connection->getFromSocket()->getActualDataType()) {
-			case COM_DT_VALUE:
-				printf(" [color=grey]");
-				break;
-			case COM_DT_VECTOR:
-				printf(" [color=blue]");
-				break;
-			case COM_DT_COLOR:
-				printf(" [color=orange]");
-				break;
-			case COM_DT_UNKNOWN:
-				printf(" [color=black]");
-				break;
+			switch (connection->getFromSocket()->getDataType()) {
+				case COM_DT_VALUE:
+					printf(" [color=grey]");
+					break;
+				case COM_DT_VECTOR:
+					printf(" [color=blue]");
+					break;
+				case COM_DT_COLOR:
+					printf(" [color=orange]");
+					break;
 			}
 		}
 		printf("\r\n");
diff --git a/source/blender/compositor/intern/COM_ExecutionSystemHelper.h b/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
index a72e269115e..99a05472075 100644
--- a/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
+++ b/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
@@ -42,86 +42,86 @@ class ExecutionSystemHelper {
 public:
 
 	/**
-	  * @brief add an bNodeTree to the nodes list and connections
-	  * @param system Execution system
-	  * @param nodes_start Starting index in the system's nodes list for nodes in this tree.
-	  * @param tree bNodeTree to add
-	  * @return Node representing the "Compositor node" of the maintree. or NULL when a subtree is added
-	  */
-	static Node *addbNodeTree(ExecutionSystem &system, int nodes_start, bNodeTree * tree);
-	
+	 * @brief add an bNodeTree to the nodes list and connections
+	 * @param system Execution system
+	 * @param nodes_start Starting index in the system's nodes list for nodes in this tree.
+	 * @param tree bNodeTree to add
+	 * @return Node representing the "Compositor node" of the maintree. or NULL when a subtree is added
+	 */
+	static Node *addbNodeTree(ExecutionSystem &system, int nodes_start, bNodeTree *tree, bNode *groupnode);
+
 	/**
-	  * @brief add an editor node to the system.
-	  * this node is converted to a Node instance.
-	  * and the converted node is returned
-	  *
-	  * @param bNode node to add
-	  * @return Node that represents the bNode or null when not able to convert.
-	  */
-	static Node *addNode(vector<Node*>& nodes, bNode *bNode);
-	
+	 * @brief add an editor node to the system.
+	 * this node is converted to a Node instance.
+	 * and the converted node is returned
+	 *
+	 * @param bNode node to add
+	 * @return Node that represents the bNode or null when not able to convert.
+	 */
+	static Node *addNode(vector<Node *>& nodes, bNode *bNode, bool isInActiveGroup);
+
 	/**
-	  * @brief Add a Node to a list
-	  *
-	  * @param nodes the list where the node needs to be added to
-	  * @param node the node to be added
-	  */
-	static void addNode(vector<Node*>& nodes, Node *node);
-	
+	 * @brief Add a Node to a list
+	 *
+	 * @param nodes the list where the node needs to be added to
+	 * @param node the node to be added
+	 */
+	static void addNode(vector<Node *>& nodes, Node *node);
+
 	/**
-	  * @brief Add an operation to the operation list
-	  *
-	  * The id of the operation is updated.
-	  *
-	  * @param operations the list where the operation need to be added to
-	  * @param operation the operation to add
-	  */
-	static void addOperation(vector<NodeOperation*> &operations, NodeOperation *operation);
-	
+	 * @brief Add an operation to the operation list
+	 *
+	 * The id of the operation is updated.
+	 *
+	 * @param operations the list where the operation need to be added to
+	 * @param operation the operation to add
+	 */
+	static void addOperation(vector<NodeOperation *> &operations, NodeOperation *operation);
+
 	/**
-	  * @brief Add an ExecutionGroup to a list
-	  *
-	  * The id of the ExecutionGroup is updated.
-	  *
-	  * @param executionGroups the list where the executionGroup need to be added to
-	  * @param executionGroup the ExecutionGroup to add
-	  */
-	static void addExecutionGroup(vector<ExecutionGroup*>& executionGroups, ExecutionGroup *executionGroup);
-	
+	 * @brief Add an ExecutionGroup to a list
+	 *
+	 * The id of the ExecutionGroup is updated.
+	 *
+	 * @param executionGroups the list where the executionGroup need to be added to
+	 * @param executionGroup the ExecutionGroup to add
+	 */
+	static void addExecutionGroup(vector<ExecutionGroup *>& executionGroups, ExecutionGroup *executionGroup);
+
 	/**
-	  * Find all Node Operations that needs to be executed.
-	  * @param rendering
-	  * the rendering parameter will tell what type of execution we are doing
-	  * FALSE is editing, TRUE is rendering
-	  */
-	static void findOutputNodeOperations(vector<NodeOperation*>* result, vector<NodeOperation*>& operations , bool rendering);
-	
+	 * Find all Node Operations that needs to be executed.
+	 * @param rendering
+	 * the rendering parameter will tell what type of execution we are doing
+	 * FALSE is editing, TRUE is rendering
+	 */
+	static void findOutputNodeOperations(vector<NodeOperation *> *result, vector<NodeOperation *>& operations, bool rendering);
+
 	/**
-	  * @brief add a bNodeLink to the list of links
-	  * the bNodeLink will be wrapped in a SocketConnection
-	  *
-	  * @note Cyclic links will be ignored
-	  *
-	  * @param node_range list of possible nodes for lookup.
-	  * @param links list of links to add the bNodeLink to
-	  * @param bNodeLink the link to be added
-	  * @return the created SocketConnection or NULL
-	  */
-	static SocketConnection *addNodeLink(NodeRange &node_range, vector<SocketConnection*>& links, bNodeLink *bNodeLink);
-	
+	 * @brief add a bNodeLink to the list of links
+	 * the bNodeLink will be wrapped in a SocketConnection
+	 *
+	 * @note Cyclic links will be ignored
+	 *
+	 * @param node_range list of possible nodes for lookup.
+	 * @param links list of links to add the bNodeLink to
+	 * @param bNodeLink the link to be added
+	 * @return the created SocketConnection or NULL
+	 */
+	static SocketConnection *addNodeLink(NodeRange &node_range, vector<SocketConnection *>& links, bNodeLink *bNodeLink);
+
 	/**
-	  * @brief create a new SocketConnection and add to a vector of links
-	  * @param links the vector of links
-	  * @param fromSocket the startpoint of the connection
-	  * @param toSocket the endpoint of the connection
-	  * @return the new created SocketConnection
-	  */
-	static SocketConnection *addLink(vector<SocketConnection*>& links, OutputSocket *fromSocket, InputSocket *toSocket);
-	
+	 * @brief create a new SocketConnection and add to a vector of links
+	 * @param links the vector of links
+	 * @param fromSocket the startpoint of the connection
+	 * @param toSocket the endpoint of the connection
+	 * @return the new created SocketConnection
+	 */
+	static SocketConnection *addLink(vector<SocketConnection *>& links, OutputSocket *fromSocket, InputSocket *toSocket);
+
 	/**
-	  * @brief dumps the content of the execution system to standard out
-	  * @param system the execution system to dump
-	  */
+	 * @brief dumps the content of the execution system to standard out
+	 * @param system the execution system to dump
+	 */
 	static void debugDump(ExecutionSystem *system);
 };
 #endif
diff --git a/source/blender/compositor/intern/COM_InputSocket.cpp b/source/blender/compositor/intern/COM_InputSocket.cpp
index 4d96d077901..3ca74f157b4 100644
--- a/source/blender/compositor/intern/COM_InputSocket.cpp
+++ b/source/blender/compositor/intern/COM_InputSocket.cpp
@@ -25,18 +25,18 @@
 #include "COM_SocketConnection.h"
 #include "COM_ExecutionSystem.h"
 
-InputSocket::InputSocket(DataType datatype) :Socket(datatype)
+InputSocket::InputSocket(DataType datatype) : Socket(datatype)
 {
 	this->connection = NULL;
 	this->resizeMode = COM_SC_CENTER;
 }
-InputSocket::InputSocket(DataType datatype, InputSocketResizeMode resizeMode) :Socket(datatype)
+InputSocket::InputSocket(DataType datatype, InputSocketResizeMode resizeMode) : Socket(datatype)
 {
 	this->connection = NULL;
 	this->resizeMode = resizeMode;
 }
 
-InputSocket::InputSocket(InputSocket *from) :Socket(from->getDataType())
+InputSocket::InputSocket(InputSocket *from) : Socket(from->getDataType())
 {
 	this->connection = NULL;
 	this->resizeMode = from->getResizeMode();
@@ -54,7 +54,7 @@ SocketConnection *InputSocket::getConnection()
 	return this->connection;
 }
 
-void InputSocket::determineResolution(unsigned int resolution[],unsigned int preferredResolution[])
+void InputSocket::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
 {
 	if (this->isConnected()) {
 		this->connection->getFromSocket()->determineResolution(resolution, preferredResolution);
@@ -64,68 +64,6 @@ void InputSocket::determineResolution(unsigned int resolution[],unsigned int pre
 	}
 }
 
-DataType InputSocket::convertToSupportedDataType(DataType datatype)
-{
-	int supportedDataTypes = getDataType();
-	if (supportedDataTypes&datatype) {
-		return datatype;
-	}
-	bool candoValue = supportedDataTypes&COM_DT_VALUE;
-	bool candoVector = supportedDataTypes&COM_DT_VECTOR;
-	bool candoColor = supportedDataTypes&COM_DT_COLOR;
-	
-	if (datatype == COM_DT_VALUE) {
-		if (candoColor) {
-			return COM_DT_COLOR;
-		}
-		else if (candoVector) {
-			return COM_DT_VECTOR;
-		}
-	}
-	else if (datatype == COM_DT_VECTOR) {
-		if (candoColor) {
-			return COM_DT_COLOR;
-		}
-		else if (candoValue) {
-			return COM_DT_VALUE;
-		}
-	}
-	else if (datatype == COM_DT_COLOR) {
-		if (candoVector) {
-			return COM_DT_VECTOR;
-		}
-		else if (candoValue) {
-			return COM_DT_VALUE;
-		}
-	}
-	return this->getDataType();
-}
-
-void InputSocket::determineActualDataType()
-{
-	/// @note: this method is only called for inputsocket that are not connected.
-	/// @note: passes COM_DT_COLOR, the convertToSupportedDataType converts this to a capable DataType
-	this->setActualDataType(this->convertToSupportedDataType(COM_DT_COLOR));
-	#if 0	// XXX TODO check for proxy node and use output data type?
-	if (this->getGroupOutputSocket()) {
-		if (!this->isInsideOfGroupNode()) {
-			this->getGroupOutputSocket()->determineActualDataType();
-		}
-	}
-	#endif
-}
-
-void InputSocket::notifyActualInputType(DataType datatype)
-{
-	DataType supportedDataType = convertToSupportedDataType(datatype);
-	this->setActualDataType(supportedDataType);
-	this->fireActualDataTypeSet();
-}
-
-void InputSocket::fireActualDataTypeSet()
-{
-	this->getNode()->notifyActualDataTypeSet(this, this->getActualDataType());
-}
 void InputSocket::relinkConnections(InputSocket *relinkToSocket)
 {
 	if (!isConnected()) {
@@ -140,23 +78,22 @@ void InputSocket::relinkConnections(InputSocket *relinkToSocket)
 void InputSocket::relinkConnectionsDuplicate(InputSocket *relinkToSocket, int editorNodeInputSocketIndex, ExecutionSystem *graph)
 {
 	if (!this->isConnected()) {
-		Node *node = (Node*)this->getNode();
-		switch (this->getActualDataType()) {
-		case COM_DT_UNKNOWN:
-		case COM_DT_COLOR:
-			node->addSetColorOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
-			break;
-		case COM_DT_VECTOR:
-			node->addSetVectorOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
-			break;
-		case COM_DT_VALUE:
-			node->addSetValueOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
-			break;
+		Node *node = (Node *)this->getNode();
+		switch (this->getDataType()) {
+			case COM_DT_COLOR:
+				node->addSetColorOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
+				break;
+			case COM_DT_VECTOR:
+				node->addSetVectorOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
+				break;
+			case COM_DT_VALUE:
+				node->addSetValueOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
+				break;
 		}
 		return;
 	}
-	SocketConnection * newConnection = new SocketConnection();
-	OutputSocket * fromSocket = this->getConnection()->getFromSocket();
+	SocketConnection *newConnection = new SocketConnection();
+	OutputSocket *fromSocket = this->getConnection()->getFromSocket();
 	newConnection->setToSocket(relinkToSocket);
 	newConnection->setFromSocket(fromSocket);
 	relinkToSocket->setConnection(newConnection);
@@ -170,32 +107,21 @@ void InputSocket::relinkConnections(InputSocket *relinkToSocket,  int editorNode
 		relinkConnections(relinkToSocket);
 	}
 	else {
-		Node *node = (Node*)this->getNode();
-		switch (this->getActualDataType()) {
-		case COM_DT_UNKNOWN:
-		case COM_DT_COLOR:
-			node->addSetColorOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
-			break;
-		case COM_DT_VECTOR:
-			node->addSetVectorOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
-			break;
-		case COM_DT_VALUE:
-			node->addSetValueOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
-			break;
+		Node *node = (Node *)this->getNode();
+		switch (this->getDataType()) {
+			case COM_DT_COLOR:
+				node->addSetColorOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
+				break;
+			case COM_DT_VECTOR:
+				node->addSetVectorOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
+				break;
+			case COM_DT_VALUE:
+				node->addSetValueOperation(graph, relinkToSocket, editorNodeInputSocketIndex);
+				break;
 		}
 	}
 }
 
-const ChannelInfo *InputSocket::getChannelInfo(const int channelnumber)
-{
-	if (this->isConnected() && this->connection->getFromSocket()) {
-		return this->connection->getFromSocket()->getChannelInfo(channelnumber);
-	}
-	else {
-		return NULL;
-	}
-}
-
 bool InputSocket::isStatic()
 {
 	if (isConnected()) {
@@ -214,7 +140,7 @@ SocketReader *InputSocket::getReader()
 NodeOperation *InputSocket::getOperation() const
 {
 	if (isConnected()) {
-		return (NodeOperation*)this->connection->getFromSocket()->getNode();
+		return (NodeOperation *)this->connection->getFromSocket()->getNode();
 	}
 	else {
 		return NULL;
@@ -230,14 +156,14 @@ float *InputSocket::getStaticValues()
 	static float default_null = 0.0f;
 	
 	switch (this->getDataType()) {
-	case COM_DT_VALUE:
-		return &((bNodeSocketValueFloat*)b_socket->default_value)->value;
-	case COM_DT_COLOR:
-		return ((bNodeSocketValueRGBA*)b_socket->default_value)->value;
-	case COM_DT_VECTOR:
-		return ((bNodeSocketValueVector*)b_socket->default_value)->value;
-	default:
-		/* XXX this should never happen, just added to please the compiler */
-		return &default_null;
+		case COM_DT_VALUE:
+			return &((bNodeSocketValueFloat *)b_socket->default_value)->value;
+		case COM_DT_COLOR:
+			return ((bNodeSocketValueRGBA *)b_socket->default_value)->value;
+		case COM_DT_VECTOR:
+			return ((bNodeSocketValueVector *)b_socket->default_value)->value;
+		default:
+			/* XXX this should never happen, just added to please the compiler */
+			return &default_null;
 	}
 }
diff --git a/source/blender/compositor/intern/COM_InputSocket.h b/source/blender/compositor/intern/COM_InputSocket.h
index b1c75e34844..c066b5d8303 100644
--- a/source/blender/compositor/intern/COM_InputSocket.h
+++ b/source/blender/compositor/intern/COM_InputSocket.h
@@ -36,10 +36,10 @@ class ChannelInfo;
 class NodeOperation;
 
 /**
-  * @brief Resize modes of inputsockets
-  * How are the input and working resolutions matched
-  * @ingroup Model
-  */
+ * @brief Resize modes of inputsockets
+ * How are the input and working resolutions matched
+ * @ingroup Model
+ */
 typedef enum InputSocketResizeMode {
 	/** @brief Center the input image to the center of the working area of the node, no resizing occurs */
 	COM_SC_CENTER = NS_CR_CENTER,
@@ -56,36 +56,23 @@ typedef enum InputSocketResizeMode {
 } InputSocketResizeMode;
 
 /**
-  * @brief InputSocket are sockets that can receive data/input
-  * @ingroup Model
-  */
+ * @brief InputSocket are sockets that can receive data/input
+ * @ingroup Model
+ */
 class InputSocket : public Socket {
 private:
 	/**
-	  * @brief connection connected to this InputSocket.
-	  * An input socket can only have a single connection
-	  */
+	 * @brief connection connected to this InputSocket.
+	 * An input socket can only have a single connection
+	 */
 	SocketConnection *connection;
 	
 	/**
-	  * @brief resize mode of this socket
-	  */
+	 * @brief resize mode of this socket
+	 */
 	InputSocketResizeMode resizeMode;
 	
 	
-	/**
-	  * @brief convert a data type to a by the socket supported data type.
-	  *
-	  * @param datatype the datatype that needs to be checked
-	  * @section data-conversion
-	  */
-	DataType convertToSupportedDataType(DataType datatype);
-	
-	/**
-	  * @brief called when the ActualDataType is set. notifies other parties
-	  */
-	void fireActualDataTypeSet();
-
 public:
 	InputSocket(DataType datatype);
 	InputSocket(DataType datatype, InputSocketResizeMode resizeMode);
@@ -98,55 +85,57 @@ public:
 	int isInputSocket() const;
 	
 	/**
-	  * @brief determine the resolution of this data going through this socket
-	  * @param resolution the result of this operation
-	  * @param preferredResolution the preferrable resolution as no resolution could be determined
-	  */
-	void determineResolution(unsigned int resolution[],unsigned int preferredResolution[]);
-	
-	void determineActualDataType();
+	 * @brief determine the resolution of this data going through this socket
+	 * @param resolution the result of this operation
+	 * @param preferredResolution the preferrable resolution as no resolution could be determined
+	 */
+	void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
 	
 	/**
-	  * @brief Notifies the Input of the data type (via a SocketConnection)
-	  * @param datatype the datatype to evaluate
-	  */
+	 * @brief Notifies the Input of the data type (via a SocketConnection)
+	 * @param datatype the datatype to evaluate
+	 */
 	void notifyActualInputType(DataType datatype);
 	
 	/**
-	  * @brief move all connections of this input socket to another socket
-	  * only use this method when already checked the availability of a SocketConnection
-	  * @param relinkToSocket the socket to move to connections to
-	  */
+	 * @brief move all connections of this input socket to another socket
+	 * only use this method when already checked the availability of a SocketConnection
+	 * @param relinkToSocket the socket to move to connections to
+	 */
 	void relinkConnections(InputSocket *relinkToSocket);
 	
 	/**
-	  * @brief move all connections of this input socket to another socket
-	  * @param relinkToSocket the socket to move to connections to
-	  * @param autoconnect will a set operation be added when no connections exist
-	  * @param editorNodeInputSocketIndex index of the socket number of the bNode (used to retrieve the value for autoconnection)
-	  * @param system ExecutionSystem to update to
-	  */
+	 * @brief move all connections of this input socket to another socket
+	 * @param relinkToSocket the socket to move to connections to
+	 * @param autoconnect will a set operation be added when no connections exist
+	 * @param editorNodeInputSocketIndex index of the socket number of the bNode (used to retrieve the value for autoconnection)
+	 * @param system ExecutionSystem to update to
+	 */
 	void relinkConnections(InputSocket *relinkToSocket, int editorNodeInputSocketIndex, ExecutionSystem *system);
 	
 	/**
-	  * @brief move all connections of this input socket to another socket
-	  * @param relinkToSocket the socket to move to connections to
-	  * @param editorNodeInputSocketIndex index of the socket number of the bNode (used to retrieve the value for autoconnection)
-	  * @param system ExecutionSystem to update to
-	  */
+	 * @brief move all connections of this input socket to another socket
+	 * @param relinkToSocket the socket to move to connections to
+	 * @param editorNodeInputSocketIndex index of the socket number of the bNode (used to retrieve the value for autoconnection)
+	 * @param system ExecutionSystem to update to
+	 */
 	void relinkConnectionsDuplicate(InputSocket *relinkToSocket, int editorNodeInputSocketIndex, ExecutionSystem *system);
 	
 	/**
-	  * @brief set the resize mode
-	  * @param resizeMode the new resize mode.
-	  */
-	void setResizeMode(InputSocketResizeMode resizeMode) {this->resizeMode = resizeMode;}
+	 * @brief set the resize mode
+	 * @param resizeMode the new resize mode.
+	 */
+	void setResizeMode(InputSocketResizeMode resizeMode) {
+		this->resizeMode = resizeMode;
+	}
 	
 	/**
-	  * @brief get the resize mode of this socket
-	  * @return InputSocketResizeMode
-	  */
-	InputSocketResizeMode getResizeMode() const {return this->resizeMode;}
+	 * @brief get the resize mode of this socket
+	 * @return InputSocketResizeMode
+	 */
+	InputSocketResizeMode getResizeMode() const {
+		return this->resizeMode;
+	}
 	
 	const ChannelInfo *getChannelInfo(const int channelnumber);
 	
diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.cpp b/source/blender/compositor/intern/COM_MemoryBuffer.cpp
index 19c2c96a8f2..ceed53c4c0d 100644
--- a/source/blender/compositor/intern/COM_MemoryBuffer.cpp
+++ b/source/blender/compositor/intern/COM_MemoryBuffer.cpp
@@ -32,30 +32,30 @@ unsigned int MemoryBuffer::determineBufferSize()
 
 int MemoryBuffer::getWidth() const
 {
-	return  this->rect.xmax-this->rect.xmin;
+	return this->rect.xmax - this->rect.xmin;
 }
 int MemoryBuffer::getHeight() const
 {
-	return  this->rect.ymax-this->rect.ymin;
+	return this->rect.ymax - this->rect.ymin;
 }
 
-MemoryBuffer::MemoryBuffer(MemoryProxy * memoryProxy, unsigned int chunkNumber, rcti *rect)
+MemoryBuffer::MemoryBuffer(MemoryProxy *memoryProxy, unsigned int chunkNumber, rcti *rect)
 {
 	BLI_init_rcti(&this->rect, rect->xmin, rect->xmax, rect->ymin, rect->ymax);
 	this->memoryProxy = memoryProxy;
 	this->chunkNumber = chunkNumber;
-	this->buffer = (float*)MEM_mallocN(sizeof(float)*determineBufferSize()*4, "COM_MemoryBuffer");
+	this->buffer = (float *)MEM_mallocN(sizeof(float) * determineBufferSize() * COM_NUMBER_OF_CHANNELS, "COM_MemoryBuffer");
 	this->state = COM_MB_ALLOCATED;
 	this->datatype = COM_DT_COLOR;
 	this->chunkWidth = this->rect.xmax - this->rect.xmin;
 }
 
-MemoryBuffer::MemoryBuffer(MemoryProxy * memoryProxy, rcti *rect)
+MemoryBuffer::MemoryBuffer(MemoryProxy *memoryProxy, rcti *rect)
 {
 	BLI_init_rcti(&this->rect, rect->xmin, rect->xmax, rect->ymin, rect->ymax);
 	this->memoryProxy = memoryProxy;
 	this->chunkNumber = -1;
-	this->buffer = (float*)MEM_mallocN(sizeof(float)*determineBufferSize()*4, "COM_MemoryBuffer");
+	this->buffer = (float *)MEM_mallocN(sizeof(float) * determineBufferSize() * COM_NUMBER_OF_CHANNELS, "COM_MemoryBuffer");
 	this->state = COM_MB_TEMPORARILY;
 	this->datatype = COM_DT_COLOR;
 	this->chunkWidth = this->rect.xmax - this->rect.xmin;
@@ -63,22 +63,26 @@ MemoryBuffer::MemoryBuffer(MemoryProxy * memoryProxy, rcti *rect)
 MemoryBuffer *MemoryBuffer::duplicate()
 {
 	MemoryBuffer *result = new MemoryBuffer(this->memoryProxy, &this->rect);
-	memcpy(result->buffer, this->buffer, this->determineBufferSize()*4*sizeof(float));
+	memcpy(result->buffer, this->buffer, this->determineBufferSize() * COM_NUMBER_OF_CHANNELS * sizeof(float));
 	return result;
 }
 void MemoryBuffer::clear()
 {
-	memset(this->buffer, 0, this->determineBufferSize()*4*sizeof(float));
+	memset(this->buffer, 0, this->determineBufferSize() * COM_NUMBER_OF_CHANNELS * sizeof(float));
 }
 
 float *MemoryBuffer::convertToValueBuffer()
 {
-	int size = this->determineBufferSize();
-	int i;
-	int offset4;
+	const unsigned int size = this->determineBufferSize();
+	unsigned int i;
+
 	float *result = new float[size];
-	for (i = 0, offset4 = 0 ; i < size ; i ++, offset4 +=4) {
-		result[i] = this->buffer[offset4];
+
+	const float *fp_src = this->buffer;
+	float       *fp_dst = result;
+
+	for (i = 0; i < size; i++, fp_dst++, fp_src += COM_NUMBER_OF_CHANNELS) {
+		*fp_dst = *fp_src;
 	}
 
 	return result;
@@ -106,45 +110,48 @@ void MemoryBuffer::copyContentFrom(MemoryBuffer *otherBuffer)
 	int otherOffset;
 
 
-	for (otherY = minY ; otherY<maxY ; otherY ++) {
-		otherOffset = ((otherY-otherBuffer->rect.ymin) * otherBuffer->chunkWidth + minX-otherBuffer->rect.xmin)*4;
-		offset = ((otherY - this->rect.ymin) * this->chunkWidth + minX-this->rect.xmin)*4;
-		memcpy(&this->buffer[offset], &otherBuffer->buffer[otherOffset], (maxX-minX) * 4*sizeof(float));
+	for (otherY = minY; otherY < maxY; otherY++) {
+		otherOffset = ((otherY - otherBuffer->rect.ymin) * otherBuffer->chunkWidth + minX - otherBuffer->rect.xmin) * COM_NUMBER_OF_CHANNELS;
+		offset = ((otherY - this->rect.ymin) * this->chunkWidth + minX - this->rect.xmin) * COM_NUMBER_OF_CHANNELS;
+		memcpy(&this->buffer[offset], &otherBuffer->buffer[otherOffset], (maxX - minX) * COM_NUMBER_OF_CHANNELS * sizeof(float));
 	}
 }
 
-void MemoryBuffer::read(float *result, int x, int y)
+void MemoryBuffer::read(float result[4], int x, int y)
 {
-	if (x>=this->rect.xmin && x < this->rect.xmax &&
-			y>=this->rect.ymin && y < this->rect.ymax) {
-		int dx = x-this->rect.xmin;
-		int dy = y-this->rect.ymin;
-		int offset = (this->chunkWidth*dy+dx)*4;
-		result[0] = this->buffer[offset];
-		result[1] = this->buffer[offset+1];
-		result[2] = this->buffer[offset+2];
-		result[3] = this->buffer[offset+3];
+	if (x >= this->rect.xmin && x < this->rect.xmax &&
+	    y >= this->rect.ymin && y < this->rect.ymax)
+	{
+		const int dx = x - this->rect.xmin;
+		const int dy = y - this->rect.ymin;
+		const int offset = (this->chunkWidth * dy + dx) * COM_NUMBER_OF_CHANNELS;
+		copy_v4_v4(result, &this->buffer[offset]);
 	}
 	else {
-		result[0] = 0.0f;
-		result[1] = 0.0f;
-		result[2] = 0.0f;
-		result[3] = 0.0f;
+		zero_v4(result);
 	}
 }
-void MemoryBuffer::writePixel(int x, int y, float color[4])
+void MemoryBuffer::writePixel(int x, int y, const float color[4])
 {
-	if (x>=this->rect.xmin && x < this->rect.xmax &&
-			y>=this->rect.ymin && y < this->rect.ymax) {
-		int offset = (this->chunkWidth*y+x)*4;
-		this->buffer[offset] = color[0];
-		this->buffer[offset+1] = color[1];
-		this->buffer[offset+2] = color[2];
-		this->buffer[offset+3] = color[3];
+	if (x >= this->rect.xmin && x < this->rect.xmax &&
+	    y >= this->rect.ymin && y < this->rect.ymax)
+	{
+		const int offset = (this->chunkWidth * y + x) * COM_NUMBER_OF_CHANNELS;
+		copy_v4_v4(&this->buffer[offset], color);
 	}
 }
 
-void MemoryBuffer::readCubic(float *result, float x, float y)
+void MemoryBuffer::addPixel(int x, int y, const float color[4])
+{
+	if (x >= this->rect.xmin && x < this->rect.xmax &&
+	    y >= this->rect.ymin && y < this->rect.ymax)
+	{
+		const int offset = (this->chunkWidth * y + x) * COM_NUMBER_OF_CHANNELS;
+		add_v4_v4(&this->buffer[offset], color);
+	}
+}
+
+void MemoryBuffer::readCubic(float result[4], float x, float y)
 {
 	int x1 = floor(x);
 	int x2 = x1 + 1;
@@ -153,8 +160,8 @@ void MemoryBuffer::readCubic(float *result, float x, float y)
 	
 	float valuex = x - x1;
 	float valuey = y - y1;
-	float mvaluex = 1.0 - valuex;
-	float mvaluey = 1.0 - valuey;
+	float mvaluex = 1.0f - valuex;
+	float mvaluey = 1.0f - valuey;
 	
 	float color1[4];
 	float color2[4];
@@ -166,84 +173,84 @@ void MemoryBuffer::readCubic(float *result, float x, float y)
 	read(color3, x2, y1);
 	read(color4, x2, y2);
 	
-	color1[0] = color1[0]*mvaluey + color2[0]*valuey;
-	color1[1] = color1[1]*mvaluey + color2[1]*valuey;
-	color1[2] = color1[2]*mvaluey + color2[2]*valuey;
-	color1[3] = color1[3]*mvaluey + color2[3]*valuey;
-	
-	color3[0] = color3[0]*mvaluey + color4[0]*valuey;
-	color3[1] = color3[1]*mvaluey + color4[1]*valuey;
-	color3[2] = color3[2]*mvaluey + color4[2]*valuey;
-	color3[3] = color3[3]*mvaluey + color4[3]*valuey;
-	
-	result[0] = color1[0]*mvaluex + color3[0]*valuex;
-	result[1] = color1[1]*mvaluex + color3[1]*valuex;
-	result[2] = color1[2]*mvaluex + color3[2]*valuex;
-	result[3] = color1[3]*mvaluex + color3[3]*valuex;
+	color1[0] = color1[0] * mvaluey + color2[0] * valuey;
+	color1[1] = color1[1] * mvaluey + color2[1] * valuey;
+	color1[2] = color1[2] * mvaluey + color2[2] * valuey;
+	color1[3] = color1[3] * mvaluey + color2[3] * valuey;
+
+	color3[0] = color3[0] * mvaluey + color4[0] * valuey;
+	color3[1] = color3[1] * mvaluey + color4[1] * valuey;
+	color3[2] = color3[2] * mvaluey + color4[2] * valuey;
+	color3[3] = color3[3] * mvaluey + color4[3] * valuey;
+
+	result[0] = color1[0] * mvaluex + color3[0] * valuex;
+	result[1] = color1[1] * mvaluex + color3[1] * valuex;
+	result[2] = color1[2] * mvaluex + color3[2] * valuex;
+	result[3] = color1[3] * mvaluex + color3[3] * valuex;
 }
 
 
 // table of (exp(ar) - exp(a)) / (1 - exp(a)) for r in range [0, 1] and a = -2
 // used instead of actual gaussian, otherwise at high texture magnifications circular artifacts are visible
 #define EWA_MAXIDX 255
-static float EWA_WTS[EWA_MAXIDX + 1] =
-{ 1.f, 0.990965f, 0.982f, 0.973105f, 0.96428f, 0.955524f, 0.946836f, 0.938216f, 0.929664f,
- 0.921178f, 0.912759f, 0.904405f, 0.896117f, 0.887893f, 0.879734f, 0.871638f, 0.863605f,
- 0.855636f, 0.847728f, 0.839883f, 0.832098f, 0.824375f, 0.816712f, 0.809108f, 0.801564f,
- 0.794079f, 0.786653f, 0.779284f, 0.771974f, 0.76472f, 0.757523f, 0.750382f, 0.743297f,
- 0.736267f, 0.729292f, 0.722372f, 0.715505f, 0.708693f, 0.701933f, 0.695227f, 0.688572f,
- 0.68197f, 0.67542f, 0.66892f, 0.662471f, 0.656073f, 0.649725f, 0.643426f, 0.637176f,
- 0.630976f, 0.624824f, 0.618719f, 0.612663f, 0.606654f, 0.600691f, 0.594776f, 0.588906f,
- 0.583083f, 0.577305f, 0.571572f, 0.565883f, 0.56024f, 0.55464f, 0.549084f, 0.543572f,
- 0.538102f, 0.532676f, 0.527291f, 0.521949f, 0.516649f, 0.511389f, 0.506171f, 0.500994f,
- 0.495857f, 0.490761f, 0.485704f, 0.480687f, 0.475709f, 0.470769f, 0.465869f, 0.461006f,
- 0.456182f, 0.451395f, 0.446646f, 0.441934f, 0.437258f, 0.432619f, 0.428017f, 0.42345f,
- 0.418919f, 0.414424f, 0.409963f, 0.405538f, 0.401147f, 0.39679f, 0.392467f, 0.388178f,
- 0.383923f, 0.379701f, 0.375511f, 0.371355f, 0.367231f, 0.363139f, 0.359079f, 0.355051f,
- 0.351055f, 0.347089f, 0.343155f, 0.339251f, 0.335378f, 0.331535f, 0.327722f, 0.323939f,
- 0.320186f, 0.316461f, 0.312766f, 0.3091f, 0.305462f, 0.301853f, 0.298272f, 0.294719f,
- 0.291194f, 0.287696f, 0.284226f, 0.280782f, 0.277366f, 0.273976f, 0.270613f, 0.267276f,
- 0.263965f, 0.26068f, 0.257421f, 0.254187f, 0.250979f, 0.247795f, 0.244636f, 0.241502f,
- 0.238393f, 0.235308f, 0.232246f, 0.229209f, 0.226196f, 0.223206f, 0.220239f, 0.217296f,
- 0.214375f, 0.211478f, 0.208603f, 0.20575f, 0.20292f, 0.200112f, 0.197326f, 0.194562f,
- 0.191819f, 0.189097f, 0.186397f, 0.183718f, 0.18106f, 0.178423f, 0.175806f, 0.17321f,
- 0.170634f, 0.168078f, 0.165542f, 0.163026f, 0.16053f, 0.158053f, 0.155595f, 0.153157f,
- 0.150738f, 0.148337f, 0.145955f, 0.143592f, 0.141248f, 0.138921f, 0.136613f, 0.134323f,
- 0.132051f, 0.129797f, 0.12756f, 0.125341f, 0.123139f, 0.120954f, 0.118786f, 0.116635f,
- 0.114501f, 0.112384f, 0.110283f, 0.108199f, 0.106131f, 0.104079f, 0.102043f, 0.100023f,
- 0.0980186f, 0.09603f, 0.094057f, 0.0920994f, 0.0901571f, 0.08823f, 0.0863179f, 0.0844208f,
- 0.0825384f, 0.0806708f, 0.0788178f, 0.0769792f, 0.0751551f, 0.0733451f, 0.0715493f, 0.0697676f,
- 0.0679997f, 0.0662457f, 0.0645054f, 0.0627786f, 0.0610654f, 0.0593655f, 0.0576789f, 0.0560055f,
- 0.0543452f, 0.0526979f, 0.0510634f, 0.0494416f, 0.0478326f, 0.0462361f, 0.0446521f, 0.0430805f,
- 0.0415211f, 0.039974f, 0.0384389f, 0.0369158f, 0.0354046f, 0.0339052f, 0.0324175f, 0.0309415f,
- 0.029477f, 0.0280239f, 0.0265822f, 0.0251517f, 0.0237324f, 0.0223242f, 0.020927f, 0.0195408f,
- 0.0181653f, 0.0168006f, 0.0154466f, 0.0141031f, 0.0127701f, 0.0114476f, 0.0101354f, 0.00883339f,
- 0.00754159f, 0.00625989f, 0.00498819f, 0.00372644f, 0.00247454f, 0.00123242f, 0.f
+static float EWA_WTS[EWA_MAXIDX + 1] = {
+	1.f, 0.990965f, 0.982f, 0.973105f, 0.96428f, 0.955524f, 0.946836f, 0.938216f, 0.929664f,
+	0.921178f, 0.912759f, 0.904405f, 0.896117f, 0.887893f, 0.879734f, 0.871638f, 0.863605f,
+	0.855636f, 0.847728f, 0.839883f, 0.832098f, 0.824375f, 0.816712f, 0.809108f, 0.801564f,
+	0.794079f, 0.786653f, 0.779284f, 0.771974f, 0.76472f, 0.757523f, 0.750382f, 0.743297f,
+	0.736267f, 0.729292f, 0.722372f, 0.715505f, 0.708693f, 0.701933f, 0.695227f, 0.688572f,
+	0.68197f, 0.67542f, 0.66892f, 0.662471f, 0.656073f, 0.649725f, 0.643426f, 0.637176f,
+	0.630976f, 0.624824f, 0.618719f, 0.612663f, 0.606654f, 0.600691f, 0.594776f, 0.588906f,
+	0.583083f, 0.577305f, 0.571572f, 0.565883f, 0.56024f, 0.55464f, 0.549084f, 0.543572f,
+	0.538102f, 0.532676f, 0.527291f, 0.521949f, 0.516649f, 0.511389f, 0.506171f, 0.500994f,
+	0.495857f, 0.490761f, 0.485704f, 0.480687f, 0.475709f, 0.470769f, 0.465869f, 0.461006f,
+	0.456182f, 0.451395f, 0.446646f, 0.441934f, 0.437258f, 0.432619f, 0.428017f, 0.42345f,
+	0.418919f, 0.414424f, 0.409963f, 0.405538f, 0.401147f, 0.39679f, 0.392467f, 0.388178f,
+	0.383923f, 0.379701f, 0.375511f, 0.371355f, 0.367231f, 0.363139f, 0.359079f, 0.355051f,
+	0.351055f, 0.347089f, 0.343155f, 0.339251f, 0.335378f, 0.331535f, 0.327722f, 0.323939f,
+	0.320186f, 0.316461f, 0.312766f, 0.3091f, 0.305462f, 0.301853f, 0.298272f, 0.294719f,
+	0.291194f, 0.287696f, 0.284226f, 0.280782f, 0.277366f, 0.273976f, 0.270613f, 0.267276f,
+	0.263965f, 0.26068f, 0.257421f, 0.254187f, 0.250979f, 0.247795f, 0.244636f, 0.241502f,
+	0.238393f, 0.235308f, 0.232246f, 0.229209f, 0.226196f, 0.223206f, 0.220239f, 0.217296f,
+	0.214375f, 0.211478f, 0.208603f, 0.20575f, 0.20292f, 0.200112f, 0.197326f, 0.194562f,
+	0.191819f, 0.189097f, 0.186397f, 0.183718f, 0.18106f, 0.178423f, 0.175806f, 0.17321f,
+	0.170634f, 0.168078f, 0.165542f, 0.163026f, 0.16053f, 0.158053f, 0.155595f, 0.153157f,
+	0.150738f, 0.148337f, 0.145955f, 0.143592f, 0.141248f, 0.138921f, 0.136613f, 0.134323f,
+	0.132051f, 0.129797f, 0.12756f, 0.125341f, 0.123139f, 0.120954f, 0.118786f, 0.116635f,
+	0.114501f, 0.112384f, 0.110283f, 0.108199f, 0.106131f, 0.104079f, 0.102043f, 0.100023f,
+	0.0980186f, 0.09603f, 0.094057f, 0.0920994f, 0.0901571f, 0.08823f, 0.0863179f, 0.0844208f,
+	0.0825384f, 0.0806708f, 0.0788178f, 0.0769792f, 0.0751551f, 0.0733451f, 0.0715493f, 0.0697676f,
+	0.0679997f, 0.0662457f, 0.0645054f, 0.0627786f, 0.0610654f, 0.0593655f, 0.0576789f, 0.0560055f,
+	0.0543452f, 0.0526979f, 0.0510634f, 0.0494416f, 0.0478326f, 0.0462361f, 0.0446521f, 0.0430805f,
+	0.0415211f, 0.039974f, 0.0384389f, 0.0369158f, 0.0354046f, 0.0339052f, 0.0324175f, 0.0309415f,
+	0.029477f, 0.0280239f, 0.0265822f, 0.0251517f, 0.0237324f, 0.0223242f, 0.020927f, 0.0195408f,
+	0.0181653f, 0.0168006f, 0.0154466f, 0.0141031f, 0.0127701f, 0.0114476f, 0.0101354f, 0.00883339f,
+	0.00754159f, 0.00625989f, 0.00498819f, 0.00372644f, 0.00247454f, 0.00123242f, 0.f
 };
 
 static void radangle2imp(float a2, float b2, float th, float *A, float *B, float *C, float *F)
 {
 	float ct2 = cosf(th);
-	const float st2 = 1.f - ct2*ct2;	// <- sin(th)^2
+	const float st2 = 1.f - ct2 * ct2;    // <- sin(th)^2
 	ct2 *= ct2;
-	*A = a2*st2 + b2*ct2;
-	*B = (b2 - a2)*sinf(2.f*th);
-	*C = a2*ct2 + b2*st2;
-	*F = a2*b2;
+	*A = a2 * st2 + b2 * ct2;
+	*B = (b2 - a2) * sinf(2.f * th);
+	*C = a2 * ct2 + b2 * st2;
+	*F = a2 * b2;
 }
 
 // all tests here are done to make sure possible overflows are hopefully minimized
 static void imp2radangle(float A, float B, float C, float F, float *a, float *b, float *th, float *ecc)
 {
-	if (F <= 1e-5f) {	// use arbitrary major radius, zero minor, infinite eccentricity
+	if (F <= 1e-5f) {   // use arbitrary major radius, zero minor, infinite eccentricity
 		*a = sqrtf(A > C ? A : C);
 		*b = 0.f;
 		*ecc = 1e10f;
-		*th = 0.5f*(atan2f(B, A - C) + (float)M_PI);
+		*th = 0.5f * (atan2f(B, A - C) + (float)M_PI);
 	}
 	else {
-		const float AmC = A - C, ApC = A + C, F2 = F*2.f;
-		const float r = sqrtf(AmC*AmC + B*B);
+		const float AmC = A - C, ApC = A + C, F2 = F * 2.f;
+		const float r = sqrtf(AmC * AmC + B * B);
 		float d = ApC - r;
 		*a = (d <= 0.f) ? sqrtf(A > C ? A : C) : sqrtf(F2 / d);
 		d = ApC + r;
@@ -256,7 +263,7 @@ static void imp2radangle(float A, float B, float C, float F, float *a, float *b,
 			*ecc = *a / *b;
 		}
 		// incr theta by 0.5*pi (angle of major axis)
-		*th = 0.5f*(atan2f(B, AmC) + (float)M_PI);
+		*th = 0.5f * (atan2f(B, AmC) + (float)M_PI);
 	}
 }
 
@@ -266,18 +273,18 @@ float clipuv(float x, float limit)
 	return x;
 }
 
-void MemoryBuffer::readEWA(float *result, float fx, float fy, float dx, float dy)
+void MemoryBuffer::readEWA(float result[4], float fx, float fy, float dx, float dy)
 {
-	int width = this->getWidth(), height = this->getHeight();
+	const int width = this->getWidth(), height = this->getHeight();
 	
 	// scaling dxt/dyt by full resolution can cause overflow because of huge A/B/C and esp. F values,
 	// scaling by aspect ratio alone does the opposite, so try something in between instead...
 	const float ff2 = width, ff = sqrtf(ff2), q = height / ff;
-	const float Ux = dx*ff, Vx = dx*q, Uy = dy*ff, Vy = dy*q;
-	float A = Vx*Vx + Vy*Vy;
-	float B = -2.f*(Ux*Vx + Uy*Vy);
-	float C = Ux*Ux + Uy*Uy;
-	float F = A*C - B*B*0.25f;
+	const float Ux = dx * ff, Vx = dx * q, Uy = dy * ff, Vy = dy * q;
+	float A = Vx * Vx + Vy * Vy;
+	float B = -2.f * (Ux * Vx + Uy * Vy);
+	float C = Ux * Ux + Uy * Uy;
+	float F = A * C - B * B * 0.25f;
 	float a, b, th, ecc, a2, b2, ue, ve, U0, V0, DDQ, U, ac1, ac2, BU, d;
 	int u, v, u1, u2, v1, v2;
 	// The so-called 'high' quality ewa method simply adds a constant of 1 to both A & C,
@@ -287,13 +294,13 @@ void MemoryBuffer::readEWA(float *result, float fx, float fy, float dx, float dy
 	// Use a different radius based on interpolation switch, just enough to anti-alias when interpolation is off,
 	// and slightly larger to make result a bit smoother than bilinear interpolation when interpolation is on
 	// (minimum values: const float rmin = intpol ? 1.f : 0.5f;)
-	const float rmin = 1.5625f/ff2;
+	const float rmin = 1.5625f / ff2;
 	imp2radangle(A, B, C, F, &a, &b, &th, &ecc);
-	if ((b2 = b*b) < rmin) {
-		if ((a2 = a*a) < rmin) {
+	if ((b2 = b * b) < rmin) {
+		if ((a2 = a * a) < rmin) {
 			B = 0.f;
 			A = C = rmin;
-			F = A*C;
+			F = A * C;
 		}
 		else {
 			b2 = rmin;
@@ -301,9 +308,9 @@ void MemoryBuffer::readEWA(float *result, float fx, float fy, float dx, float dy
 		}
 	}
 
-	ue = ff*sqrtf(C);
-	ve = ff*sqrtf(A);
-	d = (float)(EWA_MAXIDX + 1) / (F*ff2);
+	ue = ff * sqrtf(C);
+	ve = ff * sqrtf(A);
+	d = (float)(EWA_MAXIDX + 1) / (F * ff2);
 	A *= d;
 	B *= d;
 	C *= d;
@@ -316,26 +323,24 @@ void MemoryBuffer::readEWA(float *result, float fx, float fy, float dx, float dy
 	v2 = (int)(ceilf(V0 + ve));
 	U0 -= 0.5f;
 	V0 -= 0.5f;
-	DDQ = 2.f*A;
+	DDQ = 2.f * A;
 	U = u1 - U0;
-	ac1 = A*(2.f*U + 1.f);
-	ac2 = A*U*U;
-	BU = B*U;
+	ac1 = A * (2.f * U + 1.f);
+	ac2 = A * U * U;
+	BU = B * U;
 
 	d = result[0] = result[1] = result[2] = result[3] = 0.f;
-	for (v=v1; v<=v2; ++v) {
+	for (v = v1; v <= v2; ++v) {
 		const float V = v - V0;
-		float DQ = ac1 + B*V;
-		float Q = (C*V + BU)*V + ac2;
-		for (u=u1; u<=u2; ++u) {
+		float DQ = ac1 + B * V;
+		float Q = (C * V + BU) * V + ac2;
+		for (u = u1; u <= u2; ++u) {
 			if (Q < (float)(EWA_MAXIDX + 1)) {
 				float tc[4];
 				const float wt = EWA_WTS[(Q < 0.f) ? 0 : (unsigned int)Q];
 				read(tc, clipuv(u, width), clipuv(v, height));
-				result[0] += tc[0]*wt;
-				result[1] += tc[1]*wt;
-				result[2] += tc[2]*wt;
-				result[3] += result[3] ? tc[3]*wt : 0.f;
+				madd_v3_v3fl(result, tc, wt);
+				result[3] += result[3] ? tc[3] * wt : 0.f;
 				d += wt;
 			}
 			Q += DQ;
@@ -344,10 +349,10 @@ void MemoryBuffer::readEWA(float *result, float fx, float fy, float dx, float dy
 	}
 	
 	// d should hopefully never be zero anymore
-	d = 1.f/d;
+	d = 1.f / d;
 	result[0] *= d;
 	result[1] *= d;
 	result[2] *= d;
 	// clipping can be ignored if alpha used, texr->ta already includes filtered edge
-	result[3] = result[3] ? result[3] *d : 1.f;
+	result[3] = result[3] ? result[3] * d : 1.f;
 }
diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h b/source/blender/compositor/intern/COM_MemoryBuffer.h
index bfc18424570..dd24a30e85e 100644
--- a/source/blender/compositor/intern/COM_MemoryBuffer.h
+++ b/source/blender/compositor/intern/COM_MemoryBuffer.h
@@ -34,9 +34,9 @@ extern "C" {
 #include <vector>
 
 /**
-  * @brief state of a memory buffer
-  * @ingroup Memory
-  */
+ * @brief state of a memory buffer
+ * @ingroup Memory
+ */
 typedef enum MemoryBufferState {
 	/** @brief memory has been allocated on creator device and CPU machine, but kernel has not been executed */
 	COM_MB_ALLOCATED = 1,
@@ -49,115 +49,116 @@ typedef enum MemoryBufferState {
 class MemoryProxy;
 
 /**
-  * @brief a MemoryBuffer contains access to the data of a chunk
-  */
+ * @brief a MemoryBuffer contains access to the data of a chunk
+ */
 class MemoryBuffer {
 private:
 	/**
-	  * @brief proxy of the memory (same for all chunks in the same buffer)
-	  */
-	MemoryProxy * memoryProxy;
+	 * @brief proxy of the memory (same for all chunks in the same buffer)
+	 */
+	MemoryProxy *memoryProxy;
 	
 	/**
-	  * @brief the type of buffer COM_DT_VALUE, COM_DT_VECTOR, COM_DT_COLOR
-	  */
+	 * @brief the type of buffer COM_DT_VALUE, COM_DT_VECTOR, COM_DT_COLOR
+	 */
 	DataType datatype;
 	
 	
 	/**
-	  * @brief region of this buffer inside reative to the MemoryProxy
-	  */
+	 * @brief region of this buffer inside reative to the MemoryProxy
+	 */
 	rcti rect;
 	
 	/**
-	  * brief refers to the chunknumber within the executiongroup where related to the MemoryProxy
-	  * @see memoryProxy
-	  */
+	 * brief refers to the chunknumber within the executiongroup where related to the MemoryProxy
+	 * @see memoryProxy
+	 */
 	unsigned int chunkNumber;
 	
 	/**
-	  * @brief width of the chunk
-	  */
+	 * @brief width of the chunk
+	 */
 	unsigned int chunkWidth;
 	
 	/**
-	  * @brief state of the buffer
-	  */
+	 * @brief state of the buffer
+	 */
 	MemoryBufferState state;
 	
 	/**
-	  * @brief the actual float buffer/data
-	  */
+	 * @brief the actual float buffer/data
+	 */
 	float *buffer;
 
 public:
 	/**
-	  * @brief construct new MemoryBuffer for a chunk
-	  */
+	 * @brief construct new MemoryBuffer for a chunk
+	 */
 	MemoryBuffer(MemoryProxy *memoryProxy, unsigned int chunkNumber, rcti *rect);
 	
 	/**
-	  * @brief construct new temporarily MemoryBuffer for an area
-	  */
+	 * @brief construct new temporarily MemoryBuffer for an area
+	 */
 	MemoryBuffer(MemoryProxy *memoryProxy, rcti *rect);
 	
 	/**
-	  * @brief destructor
-	  */
+	 * @brief destructor
+	 */
 	~MemoryBuffer();
 	
 	/**
-	  * @brief read the ChunkNumber of this MemoryBuffer
-	  */
-	unsigned int getChunkNumber() {return this->chunkNumber;}
+	 * @brief read the ChunkNumber of this MemoryBuffer
+	 */
+	unsigned int getChunkNumber() { return this->chunkNumber; }
 	
 	/**
-	  * @brief get the data of this MemoryBuffer
-	  * @note buffer should already be available in memory
-	  */
-	float *getBuffer() {return this->buffer;}
+	 * @brief get the data of this MemoryBuffer
+	 * @note buffer should already be available in memory
+	 */
+	float *getBuffer() { return this->buffer; }
 	
 	/**
-	  * @brief after execution the state will be set to available by calling this method
-	  */
+	 * @brief after execution the state will be set to available by calling this method
+	 */
 	void setCreatedState() {
 		this->state = COM_MB_AVAILABLE;
 	}
 	
-	void read(float *result, int x, int y);
-	void writePixel(int x, int y, float color[4]);
-	void readCubic(float *result, float x, float y);
-	void readEWA(float *result, float fx, float fy, float dx, float dy);
+	void read(float result[4], int x, int y);
+	void writePixel(int x, int y, const float color[4]);
+	void addPixel(int x, int y, const float color[4]);
+	void readCubic(float result[4], float x, float y);
+	void readEWA(float result[4], float fx, float fy, float dx, float dy);
 	
 	/**
-	  * @brief is this MemoryBuffer a temporarily buffer (based on an area, not on a chunk)
-	  */
-	inline const bool isTemporarily() const {return this->state == COM_MB_TEMPORARILY;}
+	 * @brief is this MemoryBuffer a temporarily buffer (based on an area, not on a chunk)
+	 */
+	inline const bool isTemporarily() const { return this->state == COM_MB_TEMPORARILY; }
 	
 	/**
-	  * @brief add the content from otherBuffer to this MemoryBuffer
-	  * @param otherBuffer source buffer
-	  */
+	 * @brief add the content from otherBuffer to this MemoryBuffer
+	 * @param otherBuffer source buffer
+	 */
 	void copyContentFrom(MemoryBuffer *otherBuffer);
 	
 	/**
-	  * @brief get the rect of this MemoryBuffer
-	  */
-	rcti *getRect() {return &this->rect;}
+	 * @brief get the rect of this MemoryBuffer
+	 */
+	rcti *getRect() { return &this->rect; }
 	
 	/**
-	  * @brief get the width of this MemoryBuffer
-	  */
+	 * @brief get the width of this MemoryBuffer
+	 */
 	int getWidth() const;
 	
 	/**
-	  * @brief get the height of this MemoryBuffer
-	  */
+	 * @brief get the height of this MemoryBuffer
+	 */
 	int getHeight() const;
 	
 	/**
-	  * @brief clear the buffer. Make all pixels black transparant.
-	  */
+	 * @brief clear the buffer. Make all pixels black transparant.
+	 */
 	void clear();
 	
 	MemoryBuffer *duplicate();
diff --git a/source/blender/compositor/intern/COM_MemoryManager.cpp b/source/blender/compositor/intern/COM_MemoryManager.cpp
deleted file mode 100644
index 4f97b0b1e80..00000000000
--- a/source/blender/compositor/intern/COM_MemoryManager.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2011, Blender Foundation.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contributor: 
- *		Jeroen Bakker 
- *		Monique Dewanchand
- */
-
-#include "COM_MemoryManager.h"
-#include "BLI_threads.h"
-#include <stdio.h>
-#include "COM_defines.h"
-
-vector<MemoryBuffer*> buffers;
-
-ThreadMutex mutex;
-
-MemoryBuffer *MemoryManager::allocateMemoryBuffer(MemoryProxy *id, unsigned int chunkNumber, rcti *rect)
-{
-	MemoryBuffer *result = new MemoryBuffer(id, chunkNumber, rect);
-	MemoryManagerState * state = MemoryManager::getState(id);
-	state->addMemoryBuffer(result);
-	BLI_mutex_lock(&mutex);
-	buffers.push_back(result);
-	BLI_mutex_unlock(&mutex);
-	return result;
-}
-
-void MemoryManager::addMemoryProxy(MemoryProxy *memoryProxy)
-{
-	MemoryManagerState * state = MemoryManager::getState(memoryProxy);
-	if (!state) {
-		state = new MemoryManagerState(memoryProxy);
-		memoryProxy->setState(state);
-	}
-}
-MemoryBuffer *MemoryManager::getMemoryBuffer(MemoryProxy *id, unsigned int chunkNumber)
-{
-	MemoryManagerState * state = MemoryManager::getState(id);
-	if (!state) {
-		return NULL;
-	}
-	MemoryBuffer *buffer = state->getMemoryBuffer(chunkNumber);
-	if (!buffer) return NULL;
-	return buffer;
-}
-
-MemoryManagerState *MemoryManager::getState(MemoryProxy *memoryProxy)
-{
-	return memoryProxy->getState();
-}
-void MemoryManager::initialize()
-{
-	BLI_mutex_init(&mutex);
-}
-void MemoryManager::clear()
-{
-	buffers.clear();
-	BLI_mutex_end(&mutex);
-}
diff --git a/source/blender/compositor/intern/COM_MemoryManager.h b/source/blender/compositor/intern/COM_MemoryManager.h
deleted file mode 100644
index 6194d40d9a5..00000000000
--- a/source/blender/compositor/intern/COM_MemoryManager.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright 2011, Blender Foundation.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contributor: 
- *		Jeroen Bakker 
- *		Monique Dewanchand
- */
-
-#ifndef _COM_MemoryManager_h_
-#define _COM_MemoryManager_h_
-
-#include "COM_MemoryBuffer.h"
-#include "COM_MemoryProxy.h"
-#include "COM_ExecutionGroup.h"
-#include "COM_MemoryManagerState.h"
-
-/**
-  * @page memorymanager The Memory Manager
-  * The compositor has its own MemoryManager. The goal of the MemoryManager is to manage the memory allocated by chunks.
-  * During execution new chunks will be created [MemoryManager.allocateMemoryBuffer] When calculation is finished the MemoryBuffer will get the state [MemoryBufferState.COM_MB_AVAILABLE].
-  * From now on other ExecutionGroup and NodeOperations may read from the MemoryBuffer.
-  * The MemoryManager also has the capability to save MemoryBuffer's to disk in order to free some memory.
-  *
-  * @section S_MEM Memory manager
-  * The memory manager synchronize and optimize data across devices.
-  * Only one NodeOperation running on a device is able to write to a MemoryBuffer. This MemoryBuffer is only allocated on the main-device memory (CPU).
-  * The MemoryBuffer.state will be [MemoryBufferState.COM_MB_ALLOCATED]. As soon as the chunk has been executed the state changes to [MemoryBufferState.COM_MB_AVAILABLE]. This MemoryBuffer can now be used as inputBuffer of ExecutionGroup's.
-  * When needed the MemoryBuffer will be stored to a file. This will save memory that can be used by other tiles.
-  * @subsection S_MEM_1 Step one
-  * When a chunk of an ExecutionGroup is being executed by a device, the MemoryBuffer is allocated on the CPU.
-  * <pre>
-  * Allocation of the output MemoryBuffer
-  *  +----------------------------------------+
-  *  | Main device (CPU)                      |
-  *  | +----------------+   +--------------+  |
-  *  | | ExecutionGroup |   | MemoryBuffer |  |
-  *  | |                |   | Chunk a      |  |
-  *  | +----------------+   +--------------+  |
-  *  |                                        |
-  *  +----------------------------------------+
-  * </pre>
-  * @see MemoryManager.allocateMemoryBuffer
-  *
-  * @subsection S_MEM_2 Step two
-  * The Device will execute the ExecutionGroup. This differs per type of Device. CPUDevice will call the NodeOperation.executeRegion method of the outputnode of the ExecutionGroup.
-  * The [NodeOperation.executeRegion] writes the result to the allocated MemoryBuffer. When finished the state of the MemoryBuffer will be set to [MemoryBufferState.COM_MB_AVAILABLE].
-  * <pre>
-  * Execute a chunk and store result to the MemoryBuffer
-  *  +----------------------------------------+
-  *  | Main device (CPU)                      |
-  *  | +----------------+   +--------------+  |
-  *  | | ExecutionGroup |   | MemoryBuffer |  |
-  *  | |                |   | Chunk a      |  |
-  *  | +----------------+   +--------------+  |
-  *  |         |                 ^            |
-  *  | +----------------+        |            |
-  *  | | NodeOperation  |--------+            |
-  *  | |                |     Write result    |
-  *  | +----------------+                     |
-  *  |                                        |
-  *  +----------------------------------------+
-  * </pre>
-  * @subsection S_MEM_3 Step 3
-  * Other Chunks that depend on the MemoryBuffer can now use it.
-  * When a MemoryBuffer is being used its number of users are increased. When a 'user' is finished the number of users are decreased, If a MemoryBuffer has no users, the system can decide to store the data to disk and free some memory.
-  * @see MemoryBuffer.numberOfUsers
-  * @see MemoryBuffer.saveToDisk
-  *
-  * @subsection S_MEM_CON Temporarily MemoryBuffers
-  * Nodes like blur nodes can depend on multiple MemoryBuffer of the same MemoryProxy. These multiple buffers will be consolidated temporarily to a new MemoryBuffer.
-  * When execution is finished this temporarily memory buffer is deallicated.
-  * <pre>
-  *  Original MemoryBuffer's  Temporarily
-  *  +-------+ +-------+      MemoryBuffer
-  *  | MB A  | | MB B  |      +-------+-------+
-  *  +-------+ +-------+      | MB A  | MB B  |
-  *                       ==> +-------+-------+
-  *  +-------+ +-------+      | MB C  | MB D  |
-  *  | MB C  | | MB D  |      +-------+-------+
-  *  +-------+ +-------+
-  * </pre>
-  * @see ExecutionGroup.constructConsolidatedMemoryBuffer constructs the temporarily MemoryBuffer
-  * @see MemoryBuffer.state state is MemoryManagerState.COM_MB_TEMPORARILY
-  * @see ExecutionGroup.finalizeChunkExecution deallocate the temporarily MemoryBuffer
-  * @note this MemoryBuffer is not managed by the MemoryManager
-  */
-
-/**
-  * @brief the memory manager for the compostor
-  * @ingroup Memory
-  */
-class MemoryManager {
-private:
-	/**
-	  * @brief retrieve the state of a certain MemoryProxy;
-	  * @param memoryProxy the MemoryProxy to retrieve the state from
-	  */
-	static MemoryManagerState *getState(MemoryProxy *memoryProxy);
-public:
-	/**
-	  * @brief allocate a memory buffer
-	  * @param memoryProxy the MemoryProxy to get a chunk from
-	   * @param chunkNumber number of the chunk to receive
-	   * @param rect size + position of the chunk
-	  */
-	static MemoryBuffer *allocateMemoryBuffer(MemoryProxy *memoryProxy, unsigned int chunkNumber, rcti *rect);
-
-	/**
-	  * @brief get a memory buffer
-	  * @param memoryProxy the MemoryProxy to get a chunk from
-	  * @param chunkNumber number of the chunk to receive
-	  * @param addUser must we add a user to the chunk.
-	  */
-	static MemoryBuffer *getMemoryBuffer(MemoryProxy *memoryProxy, unsigned int chunkNumber);
-
-	/**
-	  * @brief add a MemoryProxy to the scope of the memory manager
-	  * @param memoryProxy the MemoryProxy to add
-	  */
-	static void addMemoryProxy(MemoryProxy *memoryProxy);
-
-	/**
-	  * @brief clear the memory manager
-	  */
-	static void clear();
-
-	/**
-	  * @brief initialize the memory manager.
-	  */
-	static void initialize();
-};
-#endif
diff --git a/source/blender/compositor/intern/COM_MemoryManagerState.cpp b/source/blender/compositor/intern/COM_MemoryManagerState.cpp
deleted file mode 100644
index b40ae146f9e..00000000000
--- a/source/blender/compositor/intern/COM_MemoryManagerState.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright 2011, Blender Foundation.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contributor: 
- *		Jeroen Bakker 
- *		Monique Dewanchand
- */
-
-#include "COM_MemoryManagerState.h"
-
-MemoryManagerState::MemoryManagerState(MemoryProxy *memoryProxy)
-{
-	this->memoryProxy = memoryProxy;
-	this->currentSize = 0;
-	this->chunkBuffers = NULL;
-	BLI_mutex_init(&this->mutex);
-}
-
-MemoryProxy * MemoryManagerState::getMemoryProxy()
-{
-	return this->memoryProxy;
-}
-
-MemoryManagerState::~MemoryManagerState()
-{
-	this->memoryProxy = NULL;
-	unsigned int index;
-	for (index = 0 ; index < this->currentSize; index ++) {
-		MemoryBuffer *buffer = this->chunkBuffers[index];
-		if (buffer) {
-			delete buffer;
-		}
-	}
-	delete this->chunkBuffers;
-	BLI_mutex_end(&this->mutex);
-}
-
-void MemoryManagerState::addMemoryBuffer(MemoryBuffer *buffer)
-{
-	BLI_mutex_lock(&this->mutex);
-	unsigned int chunkNumber = buffer->getChunkNumber();
-	unsigned int index;
-	while (this->currentSize <= chunkNumber) {
-		unsigned int newSize = this->currentSize + 1000;
-		MemoryBuffer** newbuffer = new MemoryBuffer*[newSize];
-		MemoryBuffer** oldbuffer = this->chunkBuffers;
-	
-		for (index = 0 ; index < this->currentSize ; index++) {
-			newbuffer[index] = oldbuffer[index];
-		}
-		for (index = currentSize ; index < newSize; index++) {
-			newbuffer[index] = NULL;
-		}
-	
-		this->chunkBuffers = newbuffer;
-		this->currentSize = newSize;
-		if (oldbuffer) delete oldbuffer;
-	}
-	
-	if (this->chunkBuffers[chunkNumber] == NULL) {
-		this->chunkBuffers[chunkNumber] = buffer;
-	}
-	else {
-		throw "ALREADY ALLOCATED!";
-	}
-	BLI_mutex_unlock(&this->mutex);
-}
-
-MemoryBuffer *MemoryManagerState::getMemoryBuffer(unsigned int chunkNumber)
-{
-	MemoryBuffer *result = NULL;
-	if (chunkNumber< this->currentSize) {
-		result = this->chunkBuffers[chunkNumber];
-		if (result) {
-			return result;
-		}
-	}
-	
-	BLI_mutex_lock(&this->mutex);
-	if (chunkNumber< this->currentSize) {
-		result = this->chunkBuffers[chunkNumber];
-	}
-	
-	BLI_mutex_unlock(&this->mutex);
-	return result;
-}
diff --git a/source/blender/compositor/intern/COM_MemoryManagerState.h b/source/blender/compositor/intern/COM_MemoryManagerState.h
deleted file mode 100644
index 8e8cb484d1a..00000000000
--- a/source/blender/compositor/intern/COM_MemoryManagerState.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2011, Blender Foundation.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contributor: 
- *		Jeroen Bakker 
- *		Monique Dewanchand
- */
-
-class MemoryManagerState;
-
-#ifndef _COM_MemoryManagerState_h_
-#define _COM_MemoryManagerState_h_
-
-#include "COM_MemoryProxy.h"
-#include "COM_MemoryBuffer.h"
-#include <vector>
-extern "C" {
-	#include "BLI_threads.h"
-}
-
-/**
-  * @brief State of a MemoryProxy in the MemoryManager.
-  * @ingroup Memory
-  */
-class MemoryManagerState {
-private:
-	/**
-	  * @brief reference to the MemoryProxy of this state
-	  */
-	MemoryProxy *memoryProxy;
-	
-	/**
-	  * @brief list of all chunkbuffers
-	  */
-	MemoryBuffer** chunkBuffers;
-	
-	/**
-	  * @brief size of the chunkBuffers
-	  */
-	unsigned int currentSize;
-	
-	/**
-	  * @brief lock to this memory for multithreading
-	  */
-	ThreadMutex mutex;
-public:
-	/**
-	  * @brief creates a new MemoryManagerState for a certain MemoryProxy.
-	  */
-	MemoryManagerState(MemoryProxy * memoryProxy);
-	/**
-	  * @brief destructor
-	  */
-	~MemoryManagerState();
-	
-	/**
-	  * @brief get the reference to the MemoryProxy this state belongs to.
-	  */
-	MemoryProxy *getMemoryProxy();
-	
-	/**
-	  * @brief add a new memorybuffer to the state
-	  */
-	void addMemoryBuffer(MemoryBuffer *buffer);
-	
-	/**
-	  * @brief get the MemoryBuffer assiciated to a chunk.
-	  * @param chunkNumber the chunknumber
-	  */
-	MemoryBuffer *getMemoryBuffer(unsigned int chunkNumber);
-};
-
-#endif
diff --git a/source/blender/compositor/intern/COM_MemoryProxy.cpp b/source/blender/compositor/intern/COM_MemoryProxy.cpp
index 7ff4f4949f0..3a2c690d7de 100644
--- a/source/blender/compositor/intern/COM_MemoryProxy.cpp
+++ b/source/blender/compositor/intern/COM_MemoryProxy.cpp
@@ -25,15 +25,26 @@
 
 MemoryProxy::MemoryProxy()
 {
-	this->state = NULL;
 	this->writeBufferOperation = NULL;
 	this->executor = NULL;
 }
 
-MemoryProxy::~MemoryProxy()
+void MemoryProxy::allocate(unsigned int width, unsigned int height)
 {
-	if (this->state) {
-		delete this->state;
-		this->state = NULL;
+	rcti result;
+	result.xmin = 0;
+	result.xmax = width;
+	result.ymin = 0;
+	result.ymax = height;
+
+	buffer = new MemoryBuffer(this, 1, &result);
+}
+
+void MemoryProxy::free()
+{
+	if (buffer) {
+		delete buffer;
+		buffer = NULL;
 	}
 }
+
diff --git a/source/blender/compositor/intern/COM_MemoryProxy.h b/source/blender/compositor/intern/COM_MemoryProxy.h
index 276ebeed1e2..e7e7f1cf3a0 100644
--- a/source/blender/compositor/intern/COM_MemoryProxy.h
+++ b/source/blender/compositor/intern/COM_MemoryProxy.h
@@ -26,81 +26,82 @@ class MemoryProxy;
 #ifndef _COM_MemoryProxy_h
 #define _COM_MemoryProxy_h
 #include "COM_ExecutionGroup.h"
-#include "COM_MemoryManagerState.h"
 
 class ExecutionGroup;
 
 /**
-  * @brief A MemoryProxy is a unique identifier for a memory buffer.
-  * A single MemoryProxy is used among all chunks of the same buffer,
-  * the MemoryBuffer only stores the data of a single chunk.
-  * @ingroup Memory
-  */
+ * @brief A MemoryProxy is a unique identifier for a memory buffer.
+ * A single MemoryProxy is used among all chunks of the same buffer,
+ * the MemoryBuffer only stores the data of a single chunk.
+ * @ingroup Memory
+ */
 class MemoryProxy {
 private:
 	/**
-	  * @brief reference to the ouput operation of the executiongroup
-	  */
+	 * @brief reference to the ouput operation of the executiongroup
+	 */
 	WriteBufferOperation *writeBufferOperation;
 	
 	/**
-	  * @brief reference to the executor. the Execution group that can fill a chunk
-	  */
+	 * @brief reference to the executor. the Execution group that can fill a chunk
+	 */
 	ExecutionGroup *executor;
 	
 	/**
-	  * @brief data of the different chunks.
-	  * @note state is part of this class due to optimization in the MemoryManager
-	  */
-	MemoryManagerState * state;
-	
-	/**
-	  * @brief datatype of this MemoryProxy
-	  */
+	 * @brief datatype of this MemoryProxy
+	 */
 	DataType datatype;
 	
 	/**
-	  * @brief channel information of this buffer
-	  */
+	 * @brief channel information of this buffer
+	 */
 	ChannelInfo channelInfo[COM_NUMBER_OF_CHANNELS];
+
+	/**
+	 * @brief the allocated memory
+	 */
+	MemoryBuffer *buffer;
+
 public:
 	MemoryProxy();
-	~MemoryProxy();
 	
 	/**
-	  * @brief set the ExecutionGroup that can be scheduled to calculate a certain chunk.
-	  * @param group the ExecutionGroup to set
-	  */
-	void setExecutor(ExecutionGroup *executor) {this->executor = executor;}
-	
+	 * @brief set the ExecutionGroup that can be scheduled to calculate a certain chunk.
+	 * @param group the ExecutionGroup to set
+	 */
+	void setExecutor(ExecutionGroup *executor) { this->executor = executor; }
+
 	/**
-	  * @brief get the ExecutionGroup that can be scheduled to calculate a certain chunk.
-	  */
-	ExecutionGroup *getExecutor() {return this->executor;}
-	
+	 * @brief get the ExecutionGroup that can be scheduled to calculate a certain chunk.
+	 */
+	ExecutionGroup *getExecutor() { return this->executor; }
+
 	/**
-	  * @brief set the WriteBufferOperation that is responsible for writing to this MemoryProxy
-	  * @param operation
-	  */
-	void setWriteBufferOperation(WriteBufferOperation *operation) {this->writeBufferOperation = operation;}
-	
+	 * @brief set the WriteBufferOperation that is responsible for writing to this MemoryProxy
+	 * @param operation
+	 */
+	void setWriteBufferOperation(WriteBufferOperation *operation) { this->writeBufferOperation = operation; }
+
 	/**
-	  * @brief get the WriteBufferOperation that is responsible for writing to this MemoryProxy
-	  * @return WriteBufferOperation
-	  */
-	WriteBufferOperation *getWriteBufferOperation() {return this->writeBufferOperation;}
-	
+	 * @brief get the WriteBufferOperation that is responsible for writing to this MemoryProxy
+	 * @return WriteBufferOperation
+	 */
+	WriteBufferOperation *getWriteBufferOperation() { return this->writeBufferOperation; }
+
 	/**
-	  * @brief set the memorymanager state of this MemoryProxy, this is set from the MemoryManager
-	  * @param state the state to set
-	  */
-	void setState(MemoryManagerState *state) {this->state = state;}
-	
+	 * @brief allocate memory of size widht x height
+	 */
+	void allocate(unsigned int width, unsigned int height);
+
+	/**
+	 * @brief free the allocated memory
+	 */
+	void free();
+
 	/**
-	  * @brief get the state of this MemoryProxy
-	  * @return MemoryManagerState reference to the state of this MemoryProxy.
-	  */
-	MemoryManagerState *getState() {return this->state;}
+	 * @brief get the allocated memory
+	 */
+	inline MemoryBuffer *getBuffer() { return this->buffer; }
 };
 
 #endif
diff --git a/source/blender/compositor/intern/COM_Node.cpp b/source/blender/compositor/intern/COM_Node.cpp
index ba5e21d53ae..a65849901ed 100644
--- a/source/blender/compositor/intern/COM_Node.cpp
+++ b/source/blender/compositor/intern/COM_Node.cpp
@@ -20,11 +20,12 @@
  *		Monique Dewanchand
  */
 
-#include "COM_Node.h"
-#include "string.h"
+#include <string.h>
 
-#include "COM_NodeOperation.h"
 #include "BKE_node.h"
+
+#include "COM_Node.h"
+#include "COM_NodeOperation.h"
 #include "COM_SetValueOperation.h"
 #include "COM_SetVectorOperation.h"
 #include "COM_SetColorOperation.h"
@@ -35,7 +36,7 @@
 
 #include "COM_SocketProxyNode.h"
 
-//#include "stdio.h"
+//#include <stdio.h>
 #include "COM_defines.h"
 
 Node::Node(bNode *editorNode, bool create_sockets)
@@ -43,23 +44,23 @@ Node::Node(bNode *editorNode, bool create_sockets)
 	this->editorNode = editorNode;
 	
 	if (create_sockets) {
-		bNodeSocket * input = (bNodeSocket*)editorNode->inputs.first;
+		bNodeSocket *input = (bNodeSocket *)editorNode->inputs.first;
 		while (input != NULL) {
 			DataType dt = COM_DT_VALUE;
 			if (input->type == SOCK_RGBA) dt = COM_DT_COLOR;
 			if (input->type == SOCK_VECTOR) dt = COM_DT_VECTOR;
 			
 			this->addInputSocket(dt, (InputSocketResizeMode)input->resizemode, input);
-			input = (bNodeSocket*)input->next;
+			input = (bNodeSocket *)input->next;
 		}
-		bNodeSocket *output = (bNodeSocket*)editorNode->outputs.first;
+		bNodeSocket *output = (bNodeSocket *)editorNode->outputs.first;
 		while (output != NULL) {
 			DataType dt = COM_DT_VALUE;
 			if (output->type == SOCK_RGBA) dt = COM_DT_COLOR;
 			if (output->type == SOCK_VECTOR) dt = COM_DT_VECTOR;
 			
 			this->addOutputSocket(dt, output);
-			output = (bNodeSocket*)output->next;
+			output = (bNodeSocket *)output->next;
 		}
 	}
 }
@@ -75,31 +76,30 @@ bNode *Node::getbNode()
 
 void Node::addSetValueOperation(ExecutionSystem *graph, InputSocket *inputsocket, int editorNodeInputSocketIndex)
 {
-	bNodeSocket *bSock = (bNodeSocket*)this->getEditorInputSocket(editorNodeInputSocketIndex);
+	bNodeSocket *bSock = (bNodeSocket *)this->getEditorInputSocket(editorNodeInputSocketIndex);
 	SetValueOperation *operation = new SetValueOperation();
-	bNodeSocketValueFloat *val = (bNodeSocketValueFloat*)bSock->default_value;
+	bNodeSocketValueFloat *val = (bNodeSocketValueFloat *)bSock->default_value;
 	operation->setValue(val->value);
 	this->addLink(graph, operation->getOutputSocket(), inputsocket);
 	graph->addOperation(operation);
 }
 
-void Node::addPreviewOperation(ExecutionSystem *system, OutputSocket *outputSocket, int priority)
+void Node::addPreviewOperation(ExecutionSystem *system, OutputSocket *outputSocket)
 {
-#ifdef COM_PREVIEW_ENABLED
-	PreviewOperation *operation = new PreviewOperation();
-	system->addOperation(operation);
-	operation->setbNode(this->getbNode());
-	operation->setbNodeTree(system->getContext().getbNodeTree());
-	operation->setPriority(priority);
-	this->addLink(system, outputSocket, operation->getInputSocket(0));
-#endif
+	if (this->isInActiveGroup()) {
+		PreviewOperation *operation = new PreviewOperation();
+		system->addOperation(operation);
+		operation->setbNode(this->getbNode());
+		operation->setbNodeTree(system->getContext().getbNodeTree());
+		this->addLink(system, outputSocket, operation->getInputSocket(0));
+	}
 }
 
-void Node::addPreviewOperation(ExecutionSystem *system, InputSocket *inputSocket, int priority)
+void Node::addPreviewOperation(ExecutionSystem *system, InputSocket *inputSocket)
 {
-	if (inputSocket->isConnected()) {
+	if (inputSocket->isConnected() && this->isInActiveGroup()) {
 		OutputSocket *outputsocket = inputSocket->getConnection()->getFromSocket();
-		this->addPreviewOperation(system, outputsocket, priority);
+		this->addPreviewOperation(system, outputsocket);
 	}
 }
 
@@ -119,9 +119,9 @@ SocketConnection *Node::addLink(ExecutionSystem *graph, OutputSocket *outputSock
 
 void Node::addSetColorOperation(ExecutionSystem *graph, InputSocket *inputsocket, int editorNodeInputSocketIndex)
 {
-	bNodeSocket *bSock = (bNodeSocket*)this->getEditorInputSocket(editorNodeInputSocketIndex);
+	bNodeSocket *bSock = (bNodeSocket *)this->getEditorInputSocket(editorNodeInputSocketIndex);
 	SetColorOperation *operation = new SetColorOperation();
-	bNodeSocketValueRGBA *val = (bNodeSocketValueRGBA*)bSock->default_value;
+	bNodeSocketValueRGBA *val = (bNodeSocketValueRGBA *)bSock->default_value;
 	operation->setChannel1(val->value[0]);
 	operation->setChannel2(val->value[1]);
 	operation->setChannel3(val->value[2]);
@@ -132,8 +132,8 @@ void Node::addSetColorOperation(ExecutionSystem *graph, InputSocket *inputsocket
 
 void Node::addSetVectorOperation(ExecutionSystem *graph, InputSocket *inputsocket, int editorNodeInputSocketIndex)
 {
-	bNodeSocket *bSock = (bNodeSocket*)this->getEditorInputSocket(editorNodeInputSocketIndex);
-	bNodeSocketValueVector *val = (bNodeSocketValueVector*)bSock->default_value;
+	bNodeSocket *bSock = (bNodeSocket *)this->getEditorInputSocket(editorNodeInputSocketIndex);
+	bNodeSocketValueVector *val = (bNodeSocketValueVector *)bSock->default_value;
 	SetVectorOperation *operation = new SetVectorOperation();
 	operation->setX(val->value[0]);
 	operation->setY(val->value[1]);
@@ -144,7 +144,7 @@ void Node::addSetVectorOperation(ExecutionSystem *graph, InputSocket *inputsocke
 
 bNodeSocket *Node::getEditorInputSocket(int editorNodeInputSocketIndex)
 {
-	bNodeSocket *bSock = (bNodeSocket*)this->getbNode()->inputs.first;
+	bNodeSocket *bSock = (bNodeSocket *)this->getbNode()->inputs.first;
 	int index = 0;
 	while (bSock != NULL) {
 		if (index == editorNodeInputSocketIndex) {
@@ -157,7 +157,7 @@ bNodeSocket *Node::getEditorInputSocket(int editorNodeInputSocketIndex)
 }
 bNodeSocket *Node::getEditorOutputSocket(int editorNodeInputSocketIndex)
 {
-	bNodeSocket *bSock = (bNodeSocket*)this->getbNode()->outputs.first;
+	bNodeSocket *bSock = (bNodeSocket *)this->getbNode()->outputs.first;
 	int index = 0;
 	while (bSock != NULL) {
 		if (index == editorNodeInputSocketIndex) {
@@ -171,9 +171,9 @@ bNodeSocket *Node::getEditorOutputSocket(int editorNodeInputSocketIndex)
 
 InputSocket *Node::findInputSocketBybNodeSocket(bNodeSocket *socket)
 {
-	vector<InputSocket*> &inputsockets = this->getInputSockets();
+	vector<InputSocket *> &inputsockets = this->getInputSockets();
 	unsigned int index;
-	for (index = 0 ; index < inputsockets.size(); index ++) {
+	for (index = 0; index < inputsockets.size(); index++) {
 		InputSocket *input = inputsockets[index];
 		if (input->getbNodeSocket() == socket) {
 			return input;
@@ -184,9 +184,9 @@ InputSocket *Node::findInputSocketBybNodeSocket(bNodeSocket *socket)
 
 OutputSocket *Node::findOutputSocketBybNodeSocket(bNodeSocket *socket)
 {
-	vector<OutputSocket*> &outputsockets = this->getOutputSockets();
+	vector<OutputSocket *> &outputsockets = this->getOutputSockets();
 	unsigned int index;
-	for (index = 0 ; index < outputsockets.size(); index ++) {
+	for (index = 0; index < outputsockets.size(); index++) {
 		OutputSocket *output = outputsockets[index];
 		if (output->getbNodeSocket() == socket) {
 			return output;
diff --git a/source/blender/compositor/intern/COM_Node.h b/source/blender/compositor/intern/COM_Node.h
index 2666d0a6980..12baa26cd6e 100644
--- a/source/blender/compositor/intern/COM_Node.h
+++ b/source/blender/compositor/intern/COM_Node.h
@@ -38,90 +38,109 @@ class Node;
 class NodeOperation;
 class ExecutionSystem;
 
-typedef vector<Node*> NodeList;
+typedef vector<Node *> NodeList;
 typedef NodeList::iterator NodeIterator;
 typedef pair<NodeIterator, NodeIterator> NodeRange;
 
 /**
-  * My node documentation.
-  */
-class Node:public NodeBase {
+ * My node documentation.
+ */
+class Node : public NodeBase {
 private:
 	/**
-	  * @brief stores the reference to the SDNA bNode struct
-	  */
+	 * @brief stores the reference to the SDNA bNode struct
+	 */
 	bNode *editorNode;
 
+	/**
+	 * @brief Is this node part of the active group
+	 */
+	bool inActiveGroup;
+
 public:
-	Node(bNode *editorNode, bool create_sockets=true);
+	Node(bNode *editorNode, bool create_sockets = true);
 	
 	/**
-	  * @brief get the reference to the SDNA bNode struct
-	  */
+	 * @brief get the reference to the SDNA bNode struct
+	 */
 	bNode *getbNode();
 	
 	/**
-	  * @brief convert node to operation
-	  *
-	  * @todo this must be described furter
-	  *
-	  * @param system the ExecutionSystem where the operations need to be added
-	  * @param context reference to the CompositorContext
-	  */
-	virtual void convertToOperations(ExecutionSystem *system, CompositorContext * context) =0;
+	 * @brief Is this node in the active group (the group that is being edited)
+	 * @param isInActiveGroup
+	 */
+	void setIsInActiveGroup(bool isInActiveGroup) { this->inActiveGroup = isInActiveGroup; }
+	
+	/**
+	 * @brief Is this node part of the active group
+	 * the active group is the group that is currently being edited. When no group is edited, 
+	 * the active group will be the main tree (all nodes that are not part of a group will be active)
+	 * @return bool [false:true]
+	 */
+	inline bool isInActiveGroup() { return this->inActiveGroup; }
+
+	/**
+	 * @brief convert node to operation
+	 *
+	 * @todo this must be described furter
+	 *
+	 * @param system the ExecutionSystem where the operations need to be added
+	 * @param context reference to the CompositorContext
+	 */
+	virtual void convertToOperations(ExecutionSystem *system, CompositorContext *context) = 0;
 	
 	/**
-	  * this method adds a SetValueOperation as input of the input socket.
-	  * This can only be used from the convertToOperation method. all other usages are not allowed
-	  */
+	 * this method adds a SetValueOperation as input of the input socket.
+	 * This can only be used from the convertToOperation method. all other usages are not allowed
+	 */
 	void addSetValueOperation(ExecutionSystem *graph, InputSocket *inputsocket, int editorNodeInputSocketIndex);
 	
 	/**
-	  * this method adds a SetColorOperation as input of the input socket.
-	  * This can only be used from the convertToOperation method. all other usages are not allowed
-	  */
+	 * this method adds a SetColorOperation as input of the input socket.
+	 * This can only be used from the convertToOperation method. all other usages are not allowed
+	 */
 	void addSetColorOperation(ExecutionSystem *graph, InputSocket *inputsocket, int editorNodeInputSocketIndex);
 	
 	/**
-	  * this method adds a SetVectorOperation as input of the input socket.
-	  * This can only be used from the convertToOperation method. all other usages are not allowed
-	  */
+	 * this method adds a SetVectorOperation as input of the input socket.
+	 * This can only be used from the convertToOperation method. all other usages are not allowed
+	 */
 	void addSetVectorOperation(ExecutionSystem *graph, InputSocket *inputsocket, int editorNodeInputSocketIndex);
 	
 	/**
-	  * Creates a new link between an outputSocket and inputSocket and registrates the link to the graph
-	  * @return the new created link
-	  */
+	 * Creates a new link between an outputSocket and inputSocket and registrates the link to the graph
+	 * @return the new created link
+	 */
 	SocketConnection *addLink(ExecutionSystem *graph, OutputSocket *outputSocket, InputSocket *inputsocket);
 	
 	/**
-	  * is this node a group node.
-	  */
+	 * is this node a group node.
+	 */
 	virtual bool isGroupNode() const { return false; }
 	/**
-	  * is this node a proxy node.
-	  */
+	 * is this node a proxy node.
+	 */
 	virtual bool isProxyNode() const { return false; }
 	
 	/**
-	  * @brief find the InputSocket by bNodeSocket
-	  *
-	  * @param socket
-	  */
+	 * @brief find the InputSocket by bNodeSocket
+	 *
+	 * @param socket
+	 */
 	InputSocket *findInputSocketBybNodeSocket(bNodeSocket *socket);
 	
 	/**
-	  * @brief find the OutputSocket by bNodeSocket
-	  *
-	  * @param socket
-	  */
+	 * @brief find the OutputSocket by bNodeSocket
+	 *
+	 * @param socket
+	 */
 	OutputSocket *findOutputSocketBybNodeSocket(bNodeSocket *socket);
 protected:
 	
 	Node();
 	
-	void addPreviewOperation(ExecutionSystem *system, InputSocket *inputSocket, int priority);
-	void addPreviewOperation(ExecutionSystem *system, OutputSocket *inputSocket, int priority);
+	void addPreviewOperation(ExecutionSystem *system, InputSocket *inputSocket);
+	void addPreviewOperation(ExecutionSystem *system, OutputSocket *outputSocket);
 	
 	bNodeSocket *getEditorInputSocket(int editorNodeInputSocketIndex);
 	bNodeSocket *getEditorOutputSocket(int editorNodeOutputSocketIndex);
diff --git a/source/blender/compositor/intern/COM_NodeBase.cpp b/source/blender/compositor/intern/COM_NodeBase.cpp
index 17a623c9c81..1a895cf93b1 100644
--- a/source/blender/compositor/intern/COM_NodeBase.cpp
+++ b/source/blender/compositor/intern/COM_NodeBase.cpp
@@ -20,10 +20,12 @@
  *		Monique Dewanchand
  */
 
+#include <string.h>
+
+#include "BKE_node.h"
+
 #include "COM_NodeBase.h"
-#include "string.h"
 #include "COM_NodeOperation.h"
-#include "BKE_node.h"
 #include "COM_SetValueOperation.h"
 #include "COM_SetColorOperation.h"
 #include "COM_SocketConnection.h"
@@ -31,6 +33,7 @@
 
 NodeBase::NodeBase()
 {
+	/* pass */
 }
 
 
@@ -80,64 +83,14 @@ const bool NodeBase::isInputNode() const
 	return this->inputsockets.size() == 0;
 }
 
-OutputSocket *NodeBase::getOutputSocket(int index)
+OutputSocket *NodeBase::getOutputSocket(unsigned int index)
 {
+	BLI_assert(index < this->outputsockets.size());
 	return this->outputsockets[index];
 }
 
-InputSocket *NodeBase::getInputSocket(int index)
+InputSocket *NodeBase::getInputSocket(unsigned int index)
 {
+	BLI_assert(index < this->inputsockets.size());
 	return this->inputsockets[index];
 }
-
-
-void NodeBase::determineActualSocketDataTypes()
-{
-	unsigned int index;
-	for (index = 0 ; index < this->outputsockets.size() ; index ++) {
-		OutputSocket *socket = this->outputsockets[index];
-		if (socket->getActualDataType() ==COM_DT_UNKNOWN && socket->isConnected()) {
-			socket->determineActualDataType();
-		}
-	}
-	for (index = 0 ; index < this->inputsockets.size() ; index ++) {
-		InputSocket *socket = this->inputsockets[index];
-		if (socket->getActualDataType() ==COM_DT_UNKNOWN) {
-			socket->determineActualDataType();
-		}
-	}
-}
-
-DataType NodeBase::determineActualDataType(OutputSocket *outputsocket)
-{
-	const int inputIndex = outputsocket->getInputSocketDataTypeDeterminatorIndex();
-	if (inputIndex != -1) {
-		return this->getInputSocket(inputIndex)->getActualDataType();
-	}
-	else {
-		return outputsocket->getDataType();
-	}
-}
-
-void NodeBase::notifyActualDataTypeSet(InputSocket *socket, DataType actualType)
-{
-	unsigned int index;
-	int socketIndex = -1;
-	for (index = 0 ; index < this->inputsockets.size() ; index ++) {
-		if (this->inputsockets[index] == socket) {
-			socketIndex = (int)index;
-			break;
-		}
-	}
-	if (socketIndex == -1) return;
-	
-	for (index = 0 ; index < this->outputsockets.size() ; index ++) {
-		OutputSocket *socket = this->outputsockets[index];
-		if (socket->isActualDataTypeDeterminedByInputSocket() &&
-		    socket->getInputSocketDataTypeDeterminatorIndex() == socketIndex)
-		{
-			socket->setActualDataType(actualType);
-			socket->fireActualDataType();
-		}
-	}
-}
diff --git a/source/blender/compositor/intern/COM_NodeBase.h b/source/blender/compositor/intern/COM_NodeBase.h
index 123797c780a..54f80926b84 100644
--- a/source/blender/compositor/intern/COM_NodeBase.h
+++ b/source/blender/compositor/intern/COM_NodeBase.h
@@ -37,136 +37,108 @@ class NodeOperation;
 class ExecutionSystem;
 
 /**
-  * @brief The NodeBase class is the super-class of all node related objects like @see Node @see NodeOperation
-  * the reason for the existence of this class is to support graph-nodes when using ExecutionSystem
-  * the NodeBase also contains the reference to InputSocket and OutputSocket.
-  * @ingroup Model
-  */
+ * @brief The NodeBase class is the super-class of all node related objects like @see Node @see NodeOperation
+ * the reason for the existence of this class is to support graph-nodes when using ExecutionSystem
+ * the NodeBase also contains the reference to InputSocket and OutputSocket.
+ * @ingroup Model
+ */
 class NodeBase {
 private:
 	/**
-	  * @brief the list of actual inputsockets @see InputSocket
-	  */
-	vector<InputSocket*> inputsockets;
+	 * @brief the list of actual inputsockets @see InputSocket
+	 */
+	vector<InputSocket *> inputsockets;
 
 	/**
-	  * @brief the list of actual outputsockets @see OutputSocket
-	  */
-	vector<OutputSocket*> outputsockets;
+	 * @brief the list of actual outputsockets @see OutputSocket
+	 */
+	vector<OutputSocket *> outputsockets;
 
 protected:
 	/**
-	  * @brief get access to the vector of input sockets
-	  */
-	inline vector<InputSocket*>& getInputSockets() {return this->inputsockets;}
+	 * @brief get access to the vector of input sockets
+	 */
+	inline vector<InputSocket *>& getInputSockets() { return this->inputsockets; }
 	
 	/**
-	  * @brief get access to the vector of input sockets
-	  */
-	inline vector<OutputSocket*>& getOutputSockets() {return this->outputsockets;}
+	 * @brief get access to the vector of input sockets
+	 */
+	inline vector<OutputSocket *>& getOutputSockets() { return this->outputsockets; }
 
 
 public:
 	/**
-	  * @brief destructor
-	  * clean up memory related to this NodeBase.
-	  */
+	 * @brief destructor
+	 * clean up memory related to this NodeBase.
+	 */
 	virtual ~NodeBase();
 	
 	/**
-	  * @brief determine the actual socket data types that will go through the system
-	  */
-	virtual void determineActualSocketDataTypes();
-	
-	/**
-	  * @brief determine the actual socket data types of a specific outputsocket
-	  *
-	  * @param outputsocket
-	  * a reference to the actual outputsocket where the datatype must be determined from
-	  *
-	  * @return
-	  * COM_DT_VALUE if it is a value (1 float buffer)
-	  * COM_DT_COLOR if it is a value (4 float buffer)
-	  * COM_DT_VECTOR if it is a value (3 float buffer)
-	  */
-	virtual DataType determineActualDataType(OutputSocket *outputsocket);
+	 * @brief is this node an operation?
+	 * This is true when the instance is of the subclass NodeOperation.
+	 * @return [true:false]
+	 * @see NodeOperation
+	 */
+	virtual const int isOperation() const { return false; }
 	
 	/**
-	  * @brief is this node an operation?
-	  * This is true when the instance is of the subclass NodeOperation.
-	  * @return [true:false]
-	  * @see NodeOperation
-	  */
-	virtual const int isOperation() const {return false;}
-	
-	/**
-	  * @brief check if this is an input node
-	  * An input node is a node that only has output sockets and no input sockets
-	  * @return [false..true]
-	  */
+	 * @brief check if this is an input node
+	 * An input node is a node that only has output sockets and no input sockets
+	 * @return [false..true]
+	 */
 	const bool isInputNode() const;
 	
 	/**
-	  * @brief Return the number of input sockets of this node.
-	  */
-		const unsigned int getNumberOfInputSockets() const {return this->inputsockets.size();}
-	
-	/**
-	  * @brief Return the number of output sockets of this node.
-	  */
-		const unsigned int getNumberOfOutputSockets() const {return this->outputsockets.size();}
-	
+	 * @brief Return the number of input sockets of this node.
+	 */
+	const unsigned int getNumberOfInputSockets() const { return this->inputsockets.size(); }
+
 	/**
-	  * after the data has been determined of an outputsocket that has a connection with an inputsocket this method is called on the
-	  * node that contains the inputsocket.
-	  * @param socket
-	  * the reference of the inputsocket where connected data type is found
-	  * @param actualType [COM_DT_VALUE, COM_DT_VECTOR, COM_DT_COLOR]
-	  * the actual data type that is coming from the connected output socket
-	  */
-	virtual void notifyActualDataTypeSet(InputSocket *socket, const DataType actualType);
-	
+	 * @brief Return the number of output sockets of this node.
+	 */
+	const unsigned int getNumberOfOutputSockets() const { return this->outputsockets.size(); }
+
 	/**
-	  * get the reference to a certain outputsocket
-	  * @param index
-	  * the index of the needed outputsocket
-	  */
-	OutputSocket *getOutputSocket(const int index);
+	 * get the reference to a certain outputsocket
+	 * @param index
+	 * the index of the needed outputsocket
+	 */
+	OutputSocket *getOutputSocket(const unsigned int index);
 	
 	/**
-	  * get the reference to the first outputsocket
-	  * @param index
-	  * the index of the needed outputsocket
-	  */
-	inline OutputSocket *getOutputSocket() {return getOutputSocket(0);}
+	 * get the reference to the first outputsocket
+	 * @param index
+	 * the index of the needed outputsocket
+	 */
+	inline OutputSocket *getOutputSocket() { return getOutputSocket(0); }
 	
 	/**
-	  * get the reference to a certain inputsocket
-	  * @param index
-	  * the index of the needed inputsocket
-	  */
-	InputSocket *getInputSocket(const int index);
+	 * get the reference to a certain inputsocket
+	 * @param index
+	 * the index of the needed inputsocket
+	 */
+	InputSocket *getInputSocket(const unsigned int index);
 	
 	
-	virtual bool isStatic() const {return false;}
-	void getStaticValues(float *result) const {}
+	virtual bool isStatic() const { return false; }
+	void getStaticValues(float *result) const { }
 protected:
 	NodeBase();
 	
 	/**
-	  * @brief add an InputSocket to the collection of inputsockets
-	  * @note may only be called in an constructor
-	  * @param socket the InputSocket to add
-	  */
+	 * @brief add an InputSocket to the collection of inputsockets
+	 * @note may only be called in an constructor
+	 * @param socket the InputSocket to add
+	 */
 	void addInputSocket(DataType datatype);
 	void addInputSocket(DataType datatype, InputSocketResizeMode resizeMode);
 	void addInputSocket(DataType datatype, InputSocketResizeMode resizeMode, bNodeSocket *socket);
 	
 	/**
-	  * @brief add an OutputSocket to the collection of outputsockets
-	  * @note may only be called in an constructor
-	  * @param socket the OutputSocket to add
-	  */
+	 * @brief add an OutputSocket to the collection of outputsockets
+	 * @note may only be called in an constructor
+	 * @param socket the OutputSocket to add
+	 */
 	void addOutputSocket(DataType datatype);
 	void addOutputSocket(DataType datatype, bNodeSocket *socket);
 };
diff --git a/source/blender/compositor/intern/COM_NodeOperation.cpp b/source/blender/compositor/intern/COM_NodeOperation.cpp
index fae652e39d7..ac0f206846c 100644
--- a/source/blender/compositor/intern/COM_NodeOperation.cpp
+++ b/source/blender/compositor/intern/COM_NodeOperation.cpp
@@ -20,12 +20,13 @@
  *		Monique Dewanchand
  */
 
-#include "COM_NodeOperation.h"
 #include <typeinfo>
+#include <stdio.h>
+
+#include "COM_NodeOperation.h"
 #include "COM_InputSocket.h"
 #include "COM_SocketConnection.h"
 #include "COM_defines.h"
-#include "stdio.h"
 
 NodeOperation::NodeOperation()
 {
@@ -34,15 +35,16 @@ NodeOperation::NodeOperation()
 	this->width = 0;
 	this->height = 0;
 	this->openCL = false;
+	this->btree = NULL;
 }
 
 void NodeOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
 {
 	unsigned int temp[2];
 	unsigned int temp2[2];
-	vector<InputSocket*> &inputsockets = this->getInputSockets();
+	vector<InputSocket *> &inputsockets = this->getInputSockets();
 	
-	for (unsigned int index = 0 ; index < inputsockets.size();index++) {
+	for (unsigned int index = 0; index < inputsockets.size(); index++) {
 		InputSocket *inputSocket = inputsockets[index];
 		if (inputSocket->isConnected()) {
 			if (index == this->resolutionInputSocketIndex) {
@@ -53,7 +55,7 @@ void NodeOperation::determineResolution(unsigned int resolution[], unsigned int
 			}
 		}
 	}
-	for (unsigned int index = 0 ; index < inputsockets.size();index++) {
+	for (unsigned int index = 0; index < inputsockets.size(); index++) {
 		InputSocket *inputSocket = inputsockets[index];
 		if (inputSocket->isConnected()) {
 			if (index != resolutionInputSocketIndex) {
@@ -68,18 +70,32 @@ void NodeOperation::setResolutionInputSocketIndex(unsigned int index)
 }
 void NodeOperation::initExecution()
 {
+	/* pass */
 }
 
 void NodeOperation::initMutex()
 {
 	BLI_mutex_init(&mutex);
 }
+
+void NodeOperation::lockMutex()
+{
+	BLI_mutex_lock(&mutex);
+}
+
+void NodeOperation::unlockMutex()
+{
+	BLI_mutex_unlock(&mutex);
+}
+
 void NodeOperation::deinitMutex()
 {
 	BLI_mutex_end(&mutex);
 }
+
 void NodeOperation::deinitExecution()
 {
+	/* pass */
 }
 SocketReader *NodeOperation::getInputSocketReader(unsigned int inputSocketIndex)
 {
@@ -90,10 +106,10 @@ NodeOperation *NodeOperation::getInputOperation(unsigned int inputSocketIndex)
 	return this->getInputSocket(inputSocketIndex)->getOperation();
 }
 
-void NodeOperation::getConnectedInputSockets(vector<InputSocket*> *sockets)
+void NodeOperation::getConnectedInputSockets(vector<InputSocket *> *sockets)
 {
-	vector<InputSocket*> &inputsockets = this->getInputSockets();
-	for (vector<InputSocket*>::iterator iterator = inputsockets.begin() ; iterator!= inputsockets.end() ; iterator++) {
+	vector<InputSocket *> &inputsockets = this->getInputSockets();
+	for (vector<InputSocket *>::iterator iterator = inputsockets.begin(); iterator != inputsockets.end(); iterator++) {
 		InputSocket *socket = *iterator;
 		if (socket->isConnected()) {
 			sockets->push_back(socket);
@@ -101,7 +117,7 @@ void NodeOperation::getConnectedInputSockets(vector<InputSocket*> *sockets)
 	}
 }
 
-bool NodeOperation::determineDependingAreaOfInterest(rcti * input, ReadBufferOperation *readOperation, rcti *output)
+bool NodeOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
 {
 	if (this->isInputNode()) {
 		BLI_init_rcti(output, input->xmin, input->xmax, input->ymin, input->ymax);
@@ -109,12 +125,12 @@ bool NodeOperation::determineDependingAreaOfInterest(rcti * input, ReadBufferOpe
 	}
 	else {
 		unsigned int index;
-		vector<InputSocket*> &inputsockets = this->getInputSockets();
+		vector<InputSocket *> &inputsockets = this->getInputSockets();
 	
-		for (index = 0 ; index < inputsockets.size() ; index++) {
+		for (index = 0; index < inputsockets.size(); index++) {
 			InputSocket *inputsocket = inputsockets[index];
 			if (inputsocket->isConnected()) {
-				NodeOperation *inputoperation = (NodeOperation*)inputsocket->getConnection()->getFromNode();
+				NodeOperation *inputoperation = (NodeOperation *)inputsocket->getConnection()->getFromNode();
 				bool result = inputoperation->determineDependingAreaOfInterest(input, readOperation, output);
 				if (result) {
 					return true;
@@ -124,3 +140,116 @@ bool NodeOperation::determineDependingAreaOfInterest(rcti * input, ReadBufferOpe
 		return false;
 	}
 }
+
+cl_mem NodeOperation::COM_clAttachMemoryBufferToKernelParameter(cl_context context, cl_kernel kernel, int parameterIndex, int offsetIndex, list<cl_mem> *cleanup, MemoryBuffer **inputMemoryBuffers, SocketReader *reader)
+{
+	cl_int error;
+	MemoryBuffer *result = (MemoryBuffer *)reader->initializeTileData(NULL, inputMemoryBuffers);
+
+	const cl_image_format imageFormat = {
+		CL_RGBA,
+		CL_FLOAT
+	};
+
+	cl_mem clBuffer = clCreateImage2D(context, CL_MEM_READ_ONLY | CL_MEM_USE_HOST_PTR, &imageFormat, result->getWidth(),
+	                                  result->getHeight(), 0, result->getBuffer(), &error);
+	
+	if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));  }
+	if (error == CL_SUCCESS) cleanup->push_back(clBuffer);
+
+	error = clSetKernelArg(kernel, parameterIndex, sizeof(cl_mem), &clBuffer);
+	if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));  }
+	
+	COM_clAttachMemoryBufferOffsetToKernelParameter(kernel, offsetIndex, result);
+	return clBuffer;
+}
+	
+void NodeOperation::COM_clAttachMemoryBufferOffsetToKernelParameter(cl_kernel kernel, int offsetIndex, MemoryBuffer *memoryBuffer) 
+{
+	if (offsetIndex != -1) {
+		cl_int error;
+		rcti *rect = memoryBuffer->getRect();
+		cl_int2 offset = {rect->xmin, rect->ymin};
+
+		error = clSetKernelArg(kernel, offsetIndex, sizeof(cl_int2), &offset);
+		if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));  }
+	}
+}
+
+void NodeOperation::COM_clAttachSizeToKernelParameter(cl_kernel kernel, int offsetIndex) 
+{
+	if (offsetIndex != -1) {
+		cl_int error;
+		cl_int2 offset = {this->getWidth(), this->getHeight()};
+
+		error = clSetKernelArg(kernel, offsetIndex, sizeof(cl_int2), &offset);
+		if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));  }
+	}
+}
+
+void NodeOperation::COM_clAttachOutputMemoryBufferToKernelParameter(cl_kernel kernel, int parameterIndex, cl_mem clOutputMemoryBuffer) 
+{
+	cl_int error;
+	error = clSetKernelArg(kernel, parameterIndex, sizeof(cl_mem), &clOutputMemoryBuffer);
+	if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error)); }
+}
+
+void NodeOperation::COM_clEnqueueRange(cl_command_queue queue, cl_kernel kernel, MemoryBuffer *outputMemoryBuffer) {
+	cl_int error;
+	const size_t size[] = {outputMemoryBuffer->getWidth(), outputMemoryBuffer->getHeight()};
+	
+	error = clEnqueueNDRangeKernel(queue, kernel, 2, NULL, size, 0, 0, 0, NULL);
+	if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));  }
+}
+
+void NodeOperation::COM_clEnqueueRange(cl_command_queue queue, cl_kernel kernel, MemoryBuffer *outputMemoryBuffer, int offsetIndex) {
+	cl_int error;
+	const int width = outputMemoryBuffer->getWidth();
+	const int height = outputMemoryBuffer->getHeight();
+	int offsetx;
+	int offsety;
+	const int localSize = 32;
+	size_t size[2];
+	cl_int2 offset;
+	
+	bool breaked = false;
+	for (offsety = 0; offsety < height && (!breaked); offsety += localSize) {
+		offset[1] = offsety;
+		if (offsety + localSize < height) {
+			size[1] = localSize;
+		}
+		else {
+			size[1] = height - offsety;
+		}
+		for (offsetx = 0; offsetx < width && (!breaked); offsetx += localSize) {
+			if (offsetx + localSize < width) {
+				size[0] = localSize;
+			}
+			else {
+				size[0] = width - offsetx;
+			}
+			offset[0] = offsetx;
+
+			error = clSetKernelArg(kernel, offsetIndex, sizeof(cl_int2), &offset);
+			if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error)); }
+			error = clEnqueueNDRangeKernel(queue, kernel, 2, NULL, size, 0, 0, 0, NULL);
+			if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));  }
+			clFlush(queue);
+			if (isBreaked()) {
+				breaked = false;
+			}
+		}
+	}
+}
+
+cl_kernel NodeOperation::COM_clCreateKernel(cl_program program, const char *kernelname, list<cl_kernel> *clKernelsToCleanUp) 
+{
+	cl_int error;
+	cl_kernel kernel = clCreateKernel(program, kernelname, &error);
+	if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error)); }
+	else {
+		if (clKernelsToCleanUp) clKernelsToCleanUp->push_back(kernel);
+	}
+	return kernel;
+	
+}
diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h
index bba3de2ec98..30731572712 100644
--- a/source/blender/compositor/intern/COM_NodeOperation.h
+++ b/source/blender/compositor/intern/COM_NodeOperation.h
@@ -20,8 +20,8 @@
  *		Monique Dewanchand
  */
 
-#ifndef _COM_NodeProgram_h
-#define _COM_NodeProgram_h
+#ifndef _COM_NodeOperation_h
+#define _COM_NodeOperation_h
 
 class NodeOperation;
 
@@ -33,214 +33,253 @@ class NodeOperation;
 #include "COM_SocketReader.h"
 #include "OCL_opencl.h"
 #include "list"
+#include "BLI_threads.h"
+
+#include "BLI_math_color.h"
+#include "BLI_math_vector.h"
 
 class ReadBufferOperation;
 
 /**
-  * @brief NodeOperation are contains calculation logic
-  *
-  * Subclasses needs to implement the execution method (defined in SocketReader) to implement logic.
-  * @ingroup Model
-  */
+ * @brief NodeOperation are contains calculation logic
+ *
+ * Subclasses needs to implement the execution method (defined in SocketReader) to implement logic.
+ * @ingroup Model
+ */
 class NodeOperation : public NodeBase, public SocketReader {
 private:
 	/**
-	  * @brief the index of the input socket that will be used to determine the resolution
-	  */
+	 * @brief the index of the input socket that will be used to determine the resolution
+	 */
 	unsigned int resolutionInputSocketIndex;
 
 	/**
-	  * @brief is this operation a complex one.
-	  *
-	  * Complex operations are typically doing many reads to calculate the output of a single pixel.
-	  * Mostly Filter types (Blurs, Convolution, Defocus etc) need this to be set to true.
-	  */
+	 * @brief is this operation a complex one.
+	 *
+	 * Complex operations are typically doing many reads to calculate the output of a single pixel.
+	 * Mostly Filter types (Blurs, Convolution, Defocus etc) need this to be set to true.
+	 */
 	bool complex;
 
 	/**
-	  * @brief can this operation be scheduled on an OpenCL device.
-	  * @note Only applicable if complex is True
-	  */
+	 * @brief can this operation be scheduled on an OpenCL device.
+	 * @note Only applicable if complex is True
+	 */
 	bool openCL;
 
 	/**
-	  * @brief mutex reference for very special node initializations
-	  * @note only use when you really know what you are doing.
-	  * this mutex is used to share data among chunks in the same operation
-	  * @see TonemapOperation for an example of usage
-	  * @see NodeOperation.initMutex initializes this mutex
-	  * @see NodeOperation.deinitMutex deinitializes this mutex
-	  * @see NodeOperation.getMutex retrieve a pointer to this mutex.
-	  */
+	 * @brief mutex reference for very special node initializations
+	 * @note only use when you really know what you are doing.
+	 * this mutex is used to share data among chunks in the same operation
+	 * @see TonemapOperation for an example of usage
+	 * @see NodeOperation.initMutex initializes this mutex
+	 * @see NodeOperation.deinitMutex deinitializes this mutex
+	 * @see NodeOperation.getMutex retrieve a pointer to this mutex.
+	 */
 	ThreadMutex mutex;
+	
+	/**
+	 * @brief reference to the editing bNodeTree only used for break callback
+	 */
+	const bNodeTree *btree;
 
 public:
 	/**
-	  * @brief is this node an operation?
-	  * This is true when the instance is of the subclass NodeOperation.
-	  * @return [true:false]
-	  * @see NodeBase
-	  */
-	const int isOperation() const {return true;}
+	 * @brief is this node an operation?
+	 * This is true when the instance is of the subclass NodeOperation.
+	 * @return [true:false]
+	 * @see NodeBase
+	 */
+	const int isOperation() const { return true; }
 
 	/**
-	  * @brief determine the resolution of this node
-	  * @note this method will not set the resolution, this is the responsibility of the caller
-	  * @param resolution the result of this operation
-	  * @param preferredResolution the preferrable resolution as no resolution could be determined
-	  */
+	 * @brief determine the resolution of this node
+	 * @note this method will not set the resolution, this is the responsibility of the caller
+	 * @param resolution the result of this operation
+	 * @param preferredResolution the preferrable resolution as no resolution could be determined
+	 */
 	virtual void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
 
 	/**
-	  * @brief isOutputOperation determines whether this operation is an output of the ExecutionSystem during rendering or editing.
-	  *
-	  * Default behaviour if not overriden, this operation will not be evaluated as being an output of the ExecutionSystem.
-	  *
-	  * @see ExecutionSystem
-	  * @group check
-	  * @param rendering [true false]
-	  *  true: rendering
-	  *  false: editing
-	  *
-	  * @return bool the result of this method
-	  */
-	virtual bool isOutputOperation(bool rendering) const {return false;}
-
-	/**
-	  * isBufferOperation returns if this is an operation that work directly on buffers.
-	  *
-	  * there are only 2 implementation where this is true:
-	  * @see ReadBufferOperation
-	  * @see WriteBufferOperation
-	  * for all other operations this will result in false.
-	  */
-	virtual int isBufferOperation() {return false;}
+	 * @brief isOutputOperation determines whether this operation is an output of the ExecutionSystem during rendering or editing.
+	 *
+	 * Default behaviour if not overriden, this operation will not be evaluated as being an output of the ExecutionSystem.
+	 *
+	 * @see ExecutionSystem
+	 * @group check
+	 * @param rendering [true false]
+	 *  true: rendering
+	 *  false: editing
+	 *
+	 * @return bool the result of this method
+	 */
+	virtual bool isOutputOperation(bool rendering) const { return false; }
 
+	/**
+	 * isBufferOperation returns if this is an operation that work directly on buffers.
+	 *
+	 * there are only 2 implementation where this is true:
+	 * @see ReadBufferOperation
+	 * @see WriteBufferOperation
+	 * for all other operations this will result in false.
+	 */
+	virtual int isBufferOperation() { return false; }
+	virtual int isSingleThreaded() { return false; }
+
+	void setbNodeTree(const bNodeTree *tree) { this->btree = tree; }
 	virtual void initExecution();
-	void initMutex();
 	
 	/**
-	  * @brief when a chunk is executed by a CPUDevice, this method is called
-	  * @ingroup execution
-	  * @param rect the rectangle of the chunk (location and size)
-	  * @param chunkNumber the chunkNumber to be calculated
-	  * @param memoryBuffers all input MemoryBuffer's needed
-	  */
-	virtual void executeRegion(rcti *rect, unsigned int chunkNumber, MemoryBuffer** memoryBuffers) {}
-
-	/**
-	  * @brief when a chunk is executed by an OpenCLDevice, this method is called
-	  * @ingroup execution
-	  * @note this method is only implemented in WriteBufferOperation
-	  * @param context the OpenCL context
-	  * @param program the OpenCL program containing all compositor kernels
-	  * @param queue the OpenCL command queue of the device the chunk is executed on
-	  * @param rect the rectangle of the chunk (location and size)
-	  * @param chunkNumber the chunkNumber to be calculated
-	  * @param memoryBuffers all input MemoryBuffer's needed
-	  */
-	virtual void executeOpenCLRegion(cl_context context, cl_program program, cl_command_queue queue, rcti *rect, unsigned int chunkNumber, MemoryBuffer** memoryBuffers) {}
-
-	/**
-	  * @brief custom handle to add new tasks to the OpenCL command queue in order to execute a chunk on an GPUDevice
-	  * @ingroup execution
-	  * @param context the OpenCL context
-	  * @param program the OpenCL program containing all compositor kernels
-	  * @param queue the OpenCL command queue of the device the chunk is executed on
-	  * @param outputMemoryBuffer the allocated memory buffer in main CPU memory
-	  * @param clOutputBuffer the allocated memory buffer in OpenCLDevice memory
-	  * @param inputMemoryBuffers all input MemoryBuffer's needed
-	  * @param clMemToCleanUp all created cl_mem references must be added to this list. Framework will clean this after execution
-	  * @param clKernelsToCleanUp all created cl_kernel references must be added to this list. Framework will clean this after execution
-	  */
-	virtual void executeOpenCL(cl_context context,cl_program program, cl_command_queue queue, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, MemoryBuffer** inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, list<cl_kernel> *clKernelsToCleanUp) {}
+	 * @brief when a chunk is executed by a CPUDevice, this method is called
+	 * @ingroup execution
+	 * @param rect the rectangle of the chunk (location and size)
+	 * @param chunkNumber the chunkNumber to be calculated
+	 * @param memoryBuffers all input MemoryBuffer's needed
+	 */
+	virtual void executeRegion(rcti *rect, unsigned int chunkNumber, MemoryBuffer **memoryBuffers) {}
+
+	/**
+	 * @brief when a chunk is executed by an OpenCLDevice, this method is called
+	 * @ingroup execution
+	 * @note this method is only implemented in WriteBufferOperation
+	 * @param context the OpenCL context
+	 * @param program the OpenCL program containing all compositor kernels
+	 * @param queue the OpenCL command queue of the device the chunk is executed on
+	 * @param rect the rectangle of the chunk (location and size)
+	 * @param chunkNumber the chunkNumber to be calculated
+	 * @param memoryBuffers all input MemoryBuffer's needed
+	 * @param outputBuffer the outputbuffer to write to
+	 */
+	virtual void executeOpenCLRegion(cl_context context, cl_program program, cl_command_queue queue, rcti *rect, 
+	                                 unsigned int chunkNumber, MemoryBuffer **memoryBuffers, MemoryBuffer *outputBuffer) {}
+
+	/**
+	 * @brief custom handle to add new tasks to the OpenCL command queue in order to execute a chunk on an GPUDevice
+	 * @ingroup execution
+	 * @param context the OpenCL context
+	 * @param program the OpenCL program containing all compositor kernels
+	 * @param queue the OpenCL command queue of the device the chunk is executed on
+	 * @param outputMemoryBuffer the allocated memory buffer in main CPU memory
+	 * @param clOutputBuffer the allocated memory buffer in OpenCLDevice memory
+	 * @param inputMemoryBuffers all input MemoryBuffer's needed
+	 * @param clMemToCleanUp all created cl_mem references must be added to this list. Framework will clean this after execution
+	 * @param clKernelsToCleanUp all created cl_kernel references must be added to this list. Framework will clean this after execution
+	 */
+	virtual void executeOpenCL(cl_context context, cl_program program, cl_command_queue queue, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, list<cl_kernel> *clKernelsToCleanUp) {}
 	virtual void deinitExecution();
-	void deinitMutex();
+
+	bool isResolutionSet() {
+		return this->width != 0 && height != 0;
+	}
 
 	/**
-	  * @brief set the resolution
-	  * @param resolution the resolution to set
-	  */
-	void setResolution(unsigned int resolution[]) {this->width = resolution[0];this->height = resolution[1];}
-	void getConnectedInputSockets(vector<InputSocket*> *sockets);
+	 * @brief set the resolution
+	 * @param resolution the resolution to set
+	 */
+	void setResolution(unsigned int resolution[]) {
+		if (!isResolutionSet()) {
+			this->width = resolution[0];
+			this->height = resolution[1];
+		}
+	}
+	
+
+	void getConnectedInputSockets(vector<InputSocket *> *sockets);
 
 	/**
-	  * @brief is this operation complex
-	  *
-	  * Complex operations are typically doing many reads to calculate the output of a single pixel.
-	  * Mostly Filter types (Blurs, Convolution, Defocus etc) need this to be set to true.
-	  */
-	const bool isComplex() const {return this->complex;}
-	virtual const bool isSetOperation() const {return false;}
+	 * @brief is this operation complex
+	 *
+	 * Complex operations are typically doing many reads to calculate the output of a single pixel.
+	 * Mostly Filter types (Blurs, Convolution, Defocus etc) need this to be set to true.
+	 */
+	const bool isComplex() const { return this->complex; }
+	virtual const bool isSetOperation() const { return false; }
 
 	/**
-	  * @brief is this operation of type ReadBufferOperation
-	  * @return [true:false]
-	  * @see ReadBufferOperation
-	  */
-	virtual const bool isReadBufferOperation() const {return false;}
+	 * @brief is this operation of type ReadBufferOperation
+	 * @return [true:false]
+	 * @see ReadBufferOperation
+	 */
+	virtual const bool isReadBufferOperation() const { return false; }
 
 	/**
-	  * @brief is this operation of type WriteBufferOperation
-	  * @return [true:false]
-	  * @see WriteBufferOperation
-	  */
-	virtual const bool isWriteBufferOperation() const {return false;}
+	 * @brief is this operation of type WriteBufferOperation
+	 * @return [true:false]
+	 * @see WriteBufferOperation
+	 */
+	virtual const bool isWriteBufferOperation() const { return false; }
 
 	/**
-	  * @brief is this operation the active viewer output
-	  * user can select an ViewerNode to be active (the result of this node will be drawn on the backdrop)
-	  * @return [true:false]
-	  * @see BaseViewerOperation
-	  */
-	virtual const bool isActiveViewerOutput() const {return false;}
+	 * @brief is this operation the active viewer output
+	 * user can select an ViewerNode to be active (the result of this node will be drawn on the backdrop)
+	 * @return [true:false]
+	 * @see BaseViewerOperation
+	 */
+	virtual const bool isActiveViewerOutput() const { return false; }
 
-	virtual bool determineDependingAreaOfInterest(rcti * input, ReadBufferOperation *readOperation, rcti *output);
+	virtual bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
 
 	/**
-	  * @brief set the index of the input socket that will determine the resolution of this operation
-	  * @param index the index to set
-	  */
+	 * @brief set the index of the input socket that will determine the resolution of this operation
+	 * @param index the index to set
+	 */
 	void setResolutionInputSocketIndex(unsigned int index);
 
 	/**
-	  * @brief get the render priority of this node.
-	  * @note only applicable for output operations like ViewerOperation
-	  * @return [0:9] 9 is highest priority
-	  */
-	virtual const int getRenderPriority() const {return 0;}
+	 * @brief get the render priority of this node.
+	 * @note only applicable for output operations like ViewerOperation
+	 * @return CompositorPriority
+	 */
+	virtual const CompositorPriority getRenderPriority() const { return COM_PRIORITY_LOW; }
 
 	/**
-	  * @brief can this NodeOperation be scheduled on an OpenCLDevice
-	  * @see WorkScheduler.schedule
-	  * @see ExecutionGroup.addOperation
-	  */
+	 * @brief can this NodeOperation be scheduled on an OpenCLDevice
+	 * @see WorkScheduler.schedule
+	 * @see ExecutionGroup.addOperation
+	 */
 	bool isOpenCL() { return this->openCL; }
 	
-	virtual bool isViewerOperation() {return false;}
+	virtual bool isViewerOperation() { return false; }
+	virtual bool isPreviewOperation() { return false; }
+	
+	inline bool isBreaked() {
+		return btree->test_break(btree->tbh);
+	}
+
 protected:
 	NodeOperation();
 
-	void setWidth(unsigned int width) {this->width = width;}
-	void setHeight(unsigned int height) {this->height = height;}
+	void setWidth(unsigned int width) { this->width = width; }
+	void setHeight(unsigned int height) { this->height = height; }
 	SocketReader *getInputSocketReader(unsigned int inputSocketindex);
 	NodeOperation *getInputOperation(unsigned int inputSocketindex);
 
-	inline ThreadMutex *getMutex() {return &this->mutex;}
+	void deinitMutex();
+	void initMutex();
+	void lockMutex();
+	void unlockMutex();
+	
 
 	/**
-	  * @brief set whether this operation is complex
-	  *
-	  * Complex operations are typically doing many reads to calculate the output of a single pixel.
-	  * Mostly Filter types (Blurs, Convolution, Defocus etc) need this to be set to true.
-	  */
-	void setComplex(bool complex) {this->complex = complex;}
+	 * @brief set whether this operation is complex
+	 *
+	 * Complex operations are typically doing many reads to calculate the output of a single pixel.
+	 * Mostly Filter types (Blurs, Convolution, Defocus etc) need this to be set to true.
+	 */
+	void setComplex(bool complex) { this->complex = complex; }
 
 	/**
-	  * @brief set if this NodeOperation can be scheduled on a OpenCLDevice
-	  */
-	void setOpenCL(bool openCL) {this->openCL = openCL;}
+	 * @brief set if this NodeOperation can be scheduled on a OpenCLDevice
+	 */
+	void setOpenCL(bool openCL) { this->openCL = openCL; }
 
+	static cl_mem COM_clAttachMemoryBufferToKernelParameter(cl_context context, cl_kernel kernel, int parameterIndex, int offsetIndex, list<cl_mem> *cleanup, MemoryBuffer **inputMemoryBuffers, SocketReader *reader);
+	static void COM_clAttachMemoryBufferOffsetToKernelParameter(cl_kernel kernel, int offsetIndex, MemoryBuffer *memoryBuffers);
+	static void COM_clAttachOutputMemoryBufferToKernelParameter(cl_kernel kernel, int parameterIndex, cl_mem clOutputMemoryBuffer);
+	void COM_clAttachSizeToKernelParameter(cl_kernel kernel, int offsetIndex);
+	static void COM_clEnqueueRange(cl_command_queue queue, cl_kernel kernel, MemoryBuffer *outputMemoryBuffer);
+	void COM_clEnqueueRange(cl_command_queue queue, cl_kernel kernel, MemoryBuffer *outputMemoryBuffer, int offsetIndex);
+	cl_kernel COM_clCreateKernel(cl_program program, const char *kernelname, list<cl_kernel> *clKernelsToCleanUp);
 
 };
 
diff --git a/source/blender/compositor/intern/COM_NodeProgram.cpp b/source/blender/compositor/intern/COM_NodeProgram.cpp
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/source/blender/compositor/intern/COM_NodeProgram.cpp
+++ /dev/null
diff --git a/source/blender/compositor/intern/COM_NodeProgram.h b/source/blender/compositor/intern/COM_NodeProgram.h
deleted file mode 100644
index a71fa2b676f..00000000000
--- a/source/blender/compositor/intern/COM_NodeProgram.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _COM_NodeProgram_h
-#define _COM_NodeProgram_h
-
-class NodeProgram{
-};
-
-#endif
diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.cpp b/source/blender/compositor/intern/COM_OpenCLDevice.cpp
index 0945b426a4e..9d005804098 100644
--- a/source/blender/compositor/intern/COM_OpenCLDevice.cpp
+++ b/source/blender/compositor/intern/COM_OpenCLDevice.cpp
@@ -49,17 +49,17 @@ void OpenCLDevice::deinitialize()
 void OpenCLDevice::execute(WorkPackage *work)
 {
 	const unsigned int chunkNumber = work->getChunkNumber();
-	ExecutionGroup * executionGroup = work->getExecutionGroup();
+	ExecutionGroup *executionGroup = work->getExecutionGroup();
 	rcti rect;
 
 	executionGroup->determineChunkRect(&rect, chunkNumber);
-	MemoryBuffer ** inputBuffers = executionGroup->getInputBuffers(chunkNumber);
-	MemoryBuffer * outputBuffer = executionGroup->allocateOutputBuffer(chunkNumber, &rect);
+	MemoryBuffer **inputBuffers = executionGroup->getInputBuffersOpenCL(chunkNumber);
+	MemoryBuffer *outputBuffer = executionGroup->allocateOutputBuffer(chunkNumber, &rect);
 
-	executionGroup->getOutputNodeOperation()->executeOpenCLRegion(this->context, this->program, this->queue, &rect, chunkNumber, inputBuffers);
+	executionGroup->getOutputNodeOperation()->executeOpenCLRegion(this->context, this->program, this->queue, &rect, 
+	                                                              chunkNumber, inputBuffers, outputBuffer);
+
+	delete outputBuffer;
 	
 	executionGroup->finalizeChunkExecution(chunkNumber, inputBuffers);
-	if (outputBuffer != NULL) {
-		outputBuffer->setCreatedState();
-	}
 }
diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.h b/source/blender/compositor/intern/COM_OpenCLDevice.h
index f61c555558d..83ce8cec811 100644
--- a/source/blender/compositor/intern/COM_OpenCLDevice.h
+++ b/source/blender/compositor/intern/COM_OpenCLDevice.h
@@ -31,57 +31,57 @@ class OpenCLDevice;
 
 
 /**
-  * @brief device representing an GPU OpenCL device.
-  * an instance of this class represents a single cl_device
-  */
-class OpenCLDevice: public Device {
+ * @brief device representing an GPU OpenCL device.
+ * an instance of this class represents a single cl_device
+ */
+class OpenCLDevice : public Device {
 private:
 	/**
-	  *@brief opencl context
-	  */
+	 * @brief opencl context
+	 */
 	cl_context context;
 	
 	/**
-	  *@brief opencl device
-	  */
+	 * @brief opencl device
+	 */
 	cl_device_id device;
 	
 	/**
-	  *@brief opencl program
-	  */
+	 * @brief opencl program
+	 */
 	cl_program program;
 	
 	/**
-	  *@brief opencl command queue
-	  */
+	 * @brief opencl command queue
+	 */
 	cl_command_queue queue;
 public:
 	/**
-	  *@brief constructor with opencl device
-	  *@param context
-	  *@param device
-	  */
+	 * @brief constructor with opencl device
+	 * @param context
+	 * @param device
+	 */
 	OpenCLDevice(cl_context context, cl_device_id device, cl_program program);
 	
 	
 	/**
-	  * @brief initialize the device
-	  * During initialization the OpenCL cl_command_queue is created
-	  * the command queue is stored in the field queue.
-	  * @see queue 
-	  */
+	 * @brief initialize the device
+	 * During initialization the OpenCL cl_command_queue is created
+	 * the command queue is stored in the field queue.
+	 * @see queue
+	 */
 	bool initialize();
 	
 	/**
-	  * @brief deinitialize the device
-	  * During deintiialization the command queue is cleared
-	  */
+	 * @brief deinitialize the device
+	 * During deintiialization the command queue is cleared
+	 */
 	void deinitialize();
 	
 	/**
-	  * @brief execute a WorkPackage
-	  * @param work the WorkPackage to execute
-	  */
+	 * @brief execute a WorkPackage
+	 * @param work the WorkPackage to execute
+	 */
 	void execute(WorkPackage *work);
 };
 
diff --git a/source/blender/compositor/intern/COM_OutputSocket.cpp b/source/blender/compositor/intern/COM_OutputSocket.cpp
index 00d3518cd15..484254fe6de 100644
--- a/source/blender/compositor/intern/COM_OutputSocket.cpp
+++ b/source/blender/compositor/intern/COM_OutputSocket.cpp
@@ -25,63 +25,28 @@
 #include "COM_SocketConnection.h"
 #include "COM_NodeOperation.h"
 
-OutputSocket::OutputSocket(DataType datatype) :Socket(datatype)
+OutputSocket::OutputSocket(DataType datatype) : Socket(datatype)
 {
-	this->inputSocketDataTypeDeterminatorIndex = -1;
-}
-OutputSocket::OutputSocket(DataType datatype, int inputSocketDataTypeDeterminatorIndex) :Socket(datatype)
-{
-	this->inputSocketDataTypeDeterminatorIndex = inputSocketDataTypeDeterminatorIndex;
-}
-
-OutputSocket::OutputSocket(OutputSocket *from): Socket(from->getDataType())
-{
-	this->inputSocketDataTypeDeterminatorIndex = from->getInputSocketDataTypeDeterminatorIndex();	
+	/* pass */
 }
 
 int OutputSocket::isOutputSocket() const { return true; }
-const int OutputSocket::isConnected() const { return this->connections.size()!=0; }
+const int OutputSocket::isConnected() const { return this->connections.size() != 0; }
 
 void OutputSocket::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
 {
 	NodeBase *node = this->getNode();
 	if (node->isOperation()) {
-		NodeOperation *operation = (NodeOperation*)node;
-		operation->determineResolution(resolution, preferredResolution);
-		operation->setResolution(resolution);
-	}
-}
-
-void OutputSocket::determineActualDataType()
-{
-	DataType actualDatatype = this->getNode()->determineActualDataType(this);
-
-	/** @todo: set the channel info needs to be moved after integration with OCIO */
-	this->channelinfo[0].setNumber(0);
-	this->channelinfo[1].setNumber(1);
-	this->channelinfo[2].setNumber(2);
-	this->channelinfo[3].setNumber(3);
-	switch (actualDatatype) {
-	case COM_DT_VALUE:
-		this->channelinfo[0].setType(COM_CT_Value);
-		break;
-	case COM_DT_VECTOR:
-		this->channelinfo[0].setType(COM_CT_X);
-		this->channelinfo[1].setType(COM_CT_Y);
-		this->channelinfo[2].setType(COM_CT_Z);
-		break;
-	case COM_DT_COLOR:
-		this->channelinfo[0].setType(COM_CT_ColorComponent);
-		this->channelinfo[1].setType(COM_CT_ColorComponent);
-		this->channelinfo[2].setType(COM_CT_ColorComponent);
-		this->channelinfo[3].setType(COM_CT_Alpha);
-		break;
-	default:
-		break;
+		NodeOperation *operation = (NodeOperation *)node;
+		if (operation->isResolutionSet()) {
+			resolution[0] = operation->getWidth();
+			resolution[1] = operation->getHeight();
+		}
+		else {
+			operation->determineResolution(resolution, preferredResolution);
+			operation->setResolution(resolution);
+		}
 	}
-
-	this->setActualDataType(actualDatatype);
-	this->fireActualDataType();
 }
 
 void OutputSocket::addConnection(SocketConnection *connection)
@@ -89,14 +54,6 @@ void OutputSocket::addConnection(SocketConnection *connection)
 	this->connections.push_back(connection);
 }
 
-void OutputSocket::fireActualDataType()
-{
-	unsigned int index;
-	for (index = 0 ; index < this->connections.size();index ++) {
-		SocketConnection *connection = this->connections[index];
-		connection->getToSocket()->notifyActualInputType(this->getActualDataType());
-	}
-}
 void OutputSocket::relinkConnections(OutputSocket *relinkToSocket, bool single)
 {
 	if (isConnected()) {
@@ -104,17 +61,15 @@ void OutputSocket::relinkConnections(OutputSocket *relinkToSocket, bool single)
 			SocketConnection *connection = this->connections[0];
 			connection->setFromSocket(relinkToSocket);
 			relinkToSocket->addConnection(connection);
-//			relinkToSocket->setActualDataType(this->getActualDataType());
 			this->connections.erase(this->connections.begin());
 		}
 		else {
 			unsigned int index;
-			for (index = 0 ; index < this->connections.size();index ++) {
+			for (index = 0; index < this->connections.size(); index++) {
 				SocketConnection *connection = this->connections[index];
 				connection->setFromSocket(relinkToSocket);
 				relinkToSocket->addConnection(connection);
 			}
-//			relinkToSocket->setActualDataType(this->getActualDataType());
 			this->connections.clear();
 		}
 	}
@@ -139,21 +94,16 @@ void OutputSocket::clearConnections()
 WriteBufferOperation *OutputSocket::findAttachedWriteBufferOperation() const
 {
 	unsigned int index;
-	for (index = 0 ; index < this->connections.size();index++) {
+	for (index = 0; index < this->connections.size(); index++) {
 		SocketConnection *connection = this->connections[index];
 		NodeBase *node = connection->getToNode();
 		if (node->isOperation()) {
-			NodeOperation *operation = (NodeOperation*)node;
+			NodeOperation *operation = (NodeOperation *)node;
 			if (operation->isWriteBufferOperation()) {
-				return (WriteBufferOperation*)operation;
+				return (WriteBufferOperation *)operation;
 			}
 		}
 	}
 	return NULL;
 }
 
-ChannelInfo *OutputSocket::getChannelInfo(const int channelnumber)
-{
-	return &this->channelinfo[channelnumber];
-}
-
diff --git a/source/blender/compositor/intern/COM_OutputSocket.h b/source/blender/compositor/intern/COM_OutputSocket.h
index 640588417b4..c073703c423 100644
--- a/source/blender/compositor/intern/COM_OutputSocket.h
+++ b/source/blender/compositor/intern/COM_OutputSocket.h
@@ -37,68 +37,46 @@ class WriteBufferOperation;
 //#define COM_ST_OUTPUT 1
 
 /**
-  * @brief OutputSocket are sockets that can send data/input
-  * @ingroup Model
-  */
+ * @brief OutputSocket are sockets that can send data/input
+ * @ingroup Model
+ */
 class OutputSocket : public Socket {
 private:
-	vector<SocketConnection*> connections;
-	
-	/**
-	  * @brief index of the inputsocket that determines the datatype of this outputsocket
-	  * -1 will not use any inputsocket to determine the datatype, but use the outputsocket
-	  * default datatype.
-	  */
-	int inputSocketDataTypeDeterminatorIndex;
-	
-	ChannelInfo channelinfo[4];
+	vector<SocketConnection *> connections;
+		
 	void removeFirstConnection();
 public:
 	OutputSocket(DataType datatype);
 	OutputSocket(DataType datatype, int inputSocketDataTypeDeterminatorIndex);
-	OutputSocket(OutputSocket * from);
+	OutputSocket(OutputSocket *from);
 	void addConnection(SocketConnection *connection);
-	SocketConnection *getConnection(unsigned int index) {return this->connections[index];}
+	SocketConnection *getConnection(unsigned int index) { return this->connections[index]; }
 	const int isConnected() const;
 	int isOutputSocket() const;
 	
 	/**
-	  * @brief determine the resolution of this socket
-	  * @param resolution the result of this operation
-	  * @param preferredResolution the preferrable resolution as no resolution could be determined
-	  */
+	 * @brief determine the resolution of this socket
+	 * @param resolution the result of this operation
+	 * @param preferredResolution the preferrable resolution as no resolution could be determined
+	 */
 	void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
 	
 	/**
-	  * @brief determine the actual data type and channel info.
-	  */
-	void determineActualDataType();
-	void relinkConnections(OutputSocket *relinkToSocket) {this->relinkConnections(relinkToSocket, false);};
+	 * @brief determine the actual data type and channel info.
+	 */
+	void relinkConnections(OutputSocket *relinkToSocket) { this->relinkConnections(relinkToSocket, false); };
 	void relinkConnections(OutputSocket *relinkToSocket, bool single);
-	bool isActualDataTypeDeterminedByInputSocket() {
-		return this->inputSocketDataTypeDeterminatorIndex>-1;
-	}
-	const int getNumberOfConnections() {return connections.size();}
+	const int getNumberOfConnections() { return connections.size(); }
 	
-	/**
-	  * @brief get the index of the inputsocket that determines the datatype of this outputsocket
-	  */
-	int getInputSocketDataTypeDeterminatorIndex() {return this->inputSocketDataTypeDeterminatorIndex;}
 	void clearConnections();
 	
 	/**
-	  * @brief find a connected write buffer operation to this OutputSocket
-	  * @return WriteBufferOperation or NULL
-	  */
+	 * @brief find a connected write buffer operation to this OutputSocket
+	 * @return WriteBufferOperation or NULL
+	 */
 	WriteBufferOperation *findAttachedWriteBufferOperation() const;
 	ChannelInfo *getChannelInfo(const int channelnumber);
 	
-	/**
-	  * @brief trigger determine actual data type to all connected sockets
-	  * @note will only be triggered just after the actual data type is set.
-	  */
-	void fireActualDataType();
-
 private:
 
 };
diff --git a/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp b/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp
new file mode 100644
index 00000000000..01043664412
--- /dev/null
+++ b/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2011, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor: 
+ *		Jeroen Bakker 
+ *		Monique Dewanchand
+ */
+
+#include "COM_SingleThreadedNodeOperation.h"
+
+SingleThreadedNodeOperation::SingleThreadedNodeOperation() : NodeOperation()
+{
+	this->cachedInstance = NULL;
+	setComplex(true);
+}
+
+void SingleThreadedNodeOperation::initExecution()
+{
+	initMutex();
+}
+
+void SingleThreadedNodeOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
+{
+	this->cachedInstance->read(color, x, y);
+}
+
+void SingleThreadedNodeOperation::deinitExecution()
+{
+	deinitMutex();
+	if (this->cachedInstance) {
+		delete cachedInstance;
+		this->cachedInstance = NULL;
+	}
+}
+void *SingleThreadedNodeOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
+{
+	if (this->cachedInstance) return this->cachedInstance;
+	
+	lockMutex();
+	if (this->cachedInstance == NULL) {
+		//
+		this->cachedInstance = createMemoryBuffer(rect, memoryBuffers);
+	}
+	unlockMutex();
+	return this->cachedInstance;
+}
diff --git a/source/blender/compositor/operations/COM_FogGlowImageOperation.cpp b/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h
index 600bfde64d9..b1bf28c9c07 100644
--- a/source/blender/compositor/operations/COM_FogGlowImageOperation.cpp
+++ b/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h
@@ -20,32 +20,41 @@
  *		Monique Dewanchand
  */
 
-#include "COM_FogGlowImageOperation.h"
-#include "BLI_math.h"
+#ifndef _COM_SingleThreadedNodeOperation_h
+#define _COM_SingleThreadedNodeOperation_h
+#include "COM_NodeOperation.h"
 
-FogGlowImageOperation::FogGlowImageOperation(): NodeOperation()
-{
-	this->addOutputSocket(COM_DT_COLOR);
-}
-void FogGlowImageOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
-{
-	const float cs_r = 1.f, cs_g = 1.f, cs_b = 1.f;
+class SingleThreadedNodeOperation : public NodeOperation {
+private:
+	MemoryBuffer *cachedInstance;
+	
+protected:
+	inline bool isCached() {
+		return cachedInstance != NULL;
+	}
 
-	float u, v, w, d, r;
+public:
+	SingleThreadedNodeOperation();
+	
+	/**
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
+	
+	/**
+	 * Initialize the execution
+	 */
+	void initExecution();
 	
-	v = 2.f*(y / (float)512) - 1.f;
-	u = 2.f*(x / (float)512) - 1.f;
-	r = (u*u + v*v)*256;
-	d = -sqrtf(sqrtf(sqrtf(r)));
-	w = (0.5f + 0.5f*cos((double)u*M_PI))*(0.5f + 0.5f*cos((double)v*M_PI));
-	color[0] = expf(d*cs_r) * w;
-	color[1] = expf(d*cs_g) * w;
-	color[2] = expf(d*cs_b) * w;
-	color[3] = 1.0f;
-}
+	/**
+	 * Deinitialize the execution
+	 */
+	void deinitExecution();
 
-void FogGlowImageOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
-{
-	resolution[0] = 512;
-	resolution[1] = 512;
-}
+	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
+
+	virtual MemoryBuffer *createMemoryBuffer(rcti *rect, MemoryBuffer **memoryBuffers) = 0;
+	
+	int isSingleThreaded() { return true; }
+};
+#endif
diff --git a/source/blender/compositor/intern/COM_Socket.cpp b/source/blender/compositor/intern/COM_Socket.cpp
index a5336ac1202..11739a4e9c5 100644
--- a/source/blender/compositor/intern/COM_Socket.cpp
+++ b/source/blender/compositor/intern/COM_Socket.cpp
@@ -27,7 +27,6 @@
 Socket::Socket(DataType datatype)
 {
 	this->datatype = datatype;
-	this->actualType = COM_DT_UNKNOWN;
 	this->editorSocket = NULL;
 	this->node = NULL;
 }
@@ -39,12 +38,6 @@ DataType Socket::getDataType() const
 
 int Socket::isInputSocket() const { return false; }
 int Socket::isOutputSocket() const { return false; }
-const int Socket::isConnected() const {return false;}
-void Socket::setNode(NodeBase *node) {this->node = node;}
-NodeBase *Socket::getNode() const {return this->node;}
-
-DataType Socket::getActualDataType() const {return this->actualType;}
-void Socket::setActualDataType(DataType actualType)
-{
-	this->actualType = actualType;
-}
+const int Socket::isConnected() const { return false; }
+void Socket::setNode(NodeBase *node) { this->node = node; }
+NodeBase *Socket::getNode() const { return this->node; }
diff --git a/source/blender/compositor/intern/COM_Socket.h b/source/blender/compositor/intern/COM_Socket.h
index 8ad7a5c7fde..7c5c2198a16 100644
--- a/source/blender/compositor/intern/COM_Socket.h
+++ b/source/blender/compositor/intern/COM_Socket.h
@@ -34,35 +34,29 @@ class SocketConnection;
 class NodeBase;
 
 /**
-  * @brief Base class for InputSocket and OutputSocket.
-  *
-  * A socket are the points on an node where the user can make a connection between.
-  * Sockets are always part of a node or an operation.
-  *
-  * @see InputSocket
-  * @see OutputSocket
-  * @see SocketConnection - a connection between an InputSocket and an OutputSocket
-  * @ingroup Model
-  */
+ * @brief Base class for InputSocket and OutputSocket.
+ *
+ * A socket are the points on an node where the user can make a connection between.
+ * Sockets are always part of a node or an operation.
+ *
+ * @see InputSocket
+ * @see OutputSocket
+ * @see SocketConnection - a connection between an InputSocket and an OutputSocket
+ * @ingroup Model
+ */
 class Socket {
 private:
 	/**
-	  * Reference to the node where this Socket belongs to
-	  */
+	 * Reference to the node where this Socket belongs to
+	 */
 	NodeBase *node;
 	
 	/**
-	  * the datatype of this socket. Is used for automatically data transformation.
-	  * @section data-conversion
-	  */
+	 * the datatype of this socket. Is used for automatically data transformation.
+	 * @section data-conversion
+	 */
 	DataType datatype;
 	
-	/**
-	  * the actual data type during execution. This can be different than the field datatype, based on the conversion rules of the node
-	  * @section data-conversion
-	  */
-	DataType actualType;
-	
 	bNodeSocket *editorSocket;
 public:
 	Socket(DataType datatype);
@@ -71,28 +65,14 @@ public:
 	void setNode(NodeBase *node);
 	NodeBase *getNode() const;
 	
-	/**
-	  * @brief get the actual data type
-	  *
-	  * @note The actual data type can differ from the data type this socket expects.
-	  * @return actual DataType
-	  */
-	DataType getActualDataType() const;
-	
-	/**
-	  * @brief set the actual data type
-	  * @param actualType the new actual type
-	  */
-	void setActualDataType(DataType actualType);
-	
+
 	const virtual int isConnected() const;
 	int isInputSocket() const;
 	int isOutputSocket() const;
 	virtual void determineResolution(int resolution[], unsigned int preferredResolution[]) {}
-	virtual void determineActualDataType() {}
-	
-	void setEditorSocket(bNodeSocket *editorSocket) {this->editorSocket = editorSocket;}
-	bNodeSocket *getbNodeSocket() const {return this->editorSocket;}
+
+	void setEditorSocket(bNodeSocket *editorSocket) { this->editorSocket = editorSocket; }
+	bNodeSocket *getbNodeSocket() const { return this->editorSocket; }
 	
 };
 
diff --git a/source/blender/compositor/intern/COM_SocketConnection.cpp b/source/blender/compositor/intern/COM_SocketConnection.cpp
index 9f0c736392a..1edeb6158b9 100644
--- a/source/blender/compositor/intern/COM_SocketConnection.cpp
+++ b/source/blender/compositor/intern/COM_SocketConnection.cpp
@@ -38,7 +38,7 @@ void SocketConnection::setFromSocket(OutputSocket *fromsocket)
 	this->fromSocket = fromsocket;
 }
 
-OutputSocket *SocketConnection::getFromSocket() const {return this->fromSocket;}
+OutputSocket *SocketConnection::getFromSocket() const { return this->fromSocket; }
 void SocketConnection::setToSocket(InputSocket *tosocket)
 {
 	if (tosocket == NULL) {
@@ -47,7 +47,7 @@ void SocketConnection::setToSocket(InputSocket *tosocket)
 	this->toSocket = tosocket;
 }
 
-InputSocket *SocketConnection::getToSocket() const {return this->toSocket;}
+InputSocket *SocketConnection::getToSocket() const { return this->toSocket; }
 
 NodeBase *SocketConnection::getFromNode() const
 {
@@ -79,10 +79,10 @@ bool SocketConnection::isValid() const
 
 bool SocketConnection::needsResolutionConversion() const
 {
-	if (this->ignoreResizeCheck) {return false;}
-	NodeOperation *fromOperation = (NodeOperation*)this->getFromNode();
-	NodeOperation *toOperation = (NodeOperation*)this->getToNode();
-	if (this->toSocket->getResizeMode() == COM_SC_NO_RESIZE) {return false;}
+	if (this->ignoreResizeCheck) { return false; }
+	NodeOperation *fromOperation = (NodeOperation *)this->getFromNode();
+	NodeOperation *toOperation = (NodeOperation *)this->getToNode();
+	if (this->toSocket->getResizeMode() == COM_SC_NO_RESIZE) { return false; }
 	const unsigned int fromWidth = fromOperation->getWidth();
 	const unsigned int fromHeight = fromOperation->getHeight();
 	const unsigned int toWidth = toOperation->getWidth();
diff --git a/source/blender/compositor/intern/COM_SocketConnection.h b/source/blender/compositor/intern/COM_SocketConnection.h
index 1c4dcebfe07..5385c5be49b 100644
--- a/source/blender/compositor/intern/COM_SocketConnection.h
+++ b/source/blender/compositor/intern/COM_SocketConnection.h
@@ -29,94 +29,94 @@
 #include "COM_ChannelInfo.h"
 
 /**
-  * @brief An SocketConnection is an connection between an InputSocket and an OutputSocket.
-  *
-  * <pre>
-  * +----------+     To InputSocket +----------+
-  * | From     |  SocketConnection \| To Node  |
-  * | Node     *====================*          |
-  * |          |\                   |          |
-  * |          | From OutputSocket  +----------+
-  * +----------+
-  * </pre>
-  * @ingroup Model
-  * @see InputSocket
-  * @see OutputSocket
-  */
+ * @brief An SocketConnection is an connection between an InputSocket and an OutputSocket.
+ *
+ * <pre>
+ * +----------+     To InputSocket +----------+
+ * | From     |  SocketConnection \| To Node  |
+ * | Node     *====================*          |
+ * |          |\                   |          |
+ * |          | From OutputSocket  +----------+
+ * +----------+
+ * </pre>
+ * @ingroup Model
+ * @see InputSocket
+ * @see OutputSocket
+ */
 class SocketConnection {
 private:
 	/**
-	  * @brief Startpoint of the connection
-	  */
+	 * @brief Startpoint of the connection
+	 */
 	OutputSocket *fromSocket;
 	
 	/**
-	  * @brief Endpoint of the connection
-	  */
+	 * @brief Endpoint of the connection
+	 */
 	InputSocket *toSocket;
 	
 	/**
-	  * @brief has the resize already been done for this connection
-	  */
+	 * @brief has the resize already been done for this connection
+	 */
 	bool ignoreResizeCheck;
 public:
 	SocketConnection();
 	
 	/**
-	  * @brief set the startpoint of the connection
-	  * @param fromsocket
-	  */
+	 * @brief set the startpoint of the connection
+	 * @param fromsocket
+	 */
 	void setFromSocket(OutputSocket *fromsocket);
 	
 	/**
-	  * @brief get the startpoint of the connection
-	  * @return from OutputSocket
-	  */
+	 * @brief get the startpoint of the connection
+	 * @return from OutputSocket
+	 */
 	OutputSocket *getFromSocket() const;
 	
 	/**
-	  * @brief set the endpoint of the connection
-	  * @param tosocket
-	  */
+	 * @brief set the endpoint of the connection
+	 * @param tosocket
+	 */
 	void setToSocket(InputSocket *tosocket);
 	
 	/**
-	  * @brief get the endpoint of the connection
-	  * @return to InputSocket
-	  */
+	 * @brief get the endpoint of the connection
+	 * @return to InputSocket
+	 */
 	InputSocket *getToSocket() const;
 	
 	/**
-	  * @brief check if this connection is valid
-	  */
+	 * @brief check if this connection is valid
+	 */
 	bool isValid() const;
 	
 	/**
-	  * @brief return the Node where this connection is connected from
-	  */
-	NodeBase * getFromNode() const;
+	 * @brief return the Node where this connection is connected from
+	 */
+	NodeBase *getFromNode() const;
 	
 	/**
-	  * @brief return the Node where this connection is connected to
-	  */
-	NodeBase * getToNode() const;
+	 * @brief return the Node where this connection is connected to
+	 */
+	NodeBase *getToNode() const;
 	
 	/**
-	  * @brief set, whether the resize has already been done for this SocketConnection
-	  */
-	void setIgnoreResizeCheck(bool check) {this->ignoreResizeCheck = check;}
+	 * @brief set, whether the resize has already been done for this SocketConnection
+	 */
+	void setIgnoreResizeCheck(bool check) { this->ignoreResizeCheck = check; }
 	
 	/**
-	  * @brief has the resize already been done for this SocketConnection
-	  */
-	bool isIgnoreResizeCheck() const { return this->ignoreResizeCheck;}
+	 * @brief has the resize already been done for this SocketConnection
+	 */
+	bool isIgnoreResizeCheck() const { return this->ignoreResizeCheck; }
 	
 	/**
-	  * @brief does this SocketConnection need resolution conversion
-	  * @note PreviewOperation's will be ignored
-	  * @note Already converted SocketConnection's will be ignored
-	  * @return needs conversion [true:false]
-	  */
+	 * @brief does this SocketConnection need resolution conversion
+	 * @note PreviewOperation's will be ignored
+	 * @note Already converted SocketConnection's will be ignored
+	 * @return needs conversion [true:false]
+	 */
 	bool needsResolutionConversion() const;
 };
 
diff --git a/source/blender/compositor/intern/COM_SocketReader.h b/source/blender/compositor/intern/COM_SocketReader.h
index 24322847517..3eb39e4bf02 100644
--- a/source/blender/compositor/intern/COM_SocketReader.h
+++ b/source/blender/compositor/intern/COM_SocketReader.h
@@ -33,43 +33,43 @@ typedef enum PixelSampler {
 
 class MemoryBuffer;
 /**
-  * @brief Helper class for reading socket data.
-  * Only use this class for dispatching (un-ary and n-ary) executions.
-  * @ingroup Execution
-  */
+ * @brief Helper class for reading socket data.
+ * Only use this class for dispatching (un-ary and n-ary) executions.
+ * @ingroup Execution
+ */
 class SocketReader {
 private:
 protected:
 	/**
-	  * @brief Holds the width of the output of this operation.
-	  */
+	 * @brief Holds the width of the output of this operation.
+	 */
 	unsigned int width;
 
 	/**
-	  * @brief Holds the height of the output of this operation.
-	  */
+	 * @brief Holds the height of the output of this operation.
+	 */
 	unsigned int height;
 
 
 	/**
-	  * @brief calculate a single pixel
-	  * @note this method is called for non-complex
-	  * @param result is a float[4] array to store the result
-	   * @param x the x-coordinate of the pixel to calculate in image space
-	   * @param y the y-coordinate of the pixel to calculate in image space
-	   * @param inputBuffers chunks that can be read by their ReadBufferOperation.
-	  */
+	 * @brief calculate a single pixel
+	 * @note this method is called for non-complex
+	 * @param result is a float[4] array to store the result
+	 * @param x the x-coordinate of the pixel to calculate in image space
+	 * @param y the y-coordinate of the pixel to calculate in image space
+	 * @param inputBuffers chunks that can be read by their ReadBufferOperation.
+	 */
 	virtual void executePixel(float *result, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) {}
 
 	/**
-	  * @brief calculate a single pixel
-	  * @note this method is called for complex
-	  * @param result is a float[4] array to store the result
-	   * @param x the x-coordinate of the pixel to calculate in image space
-	   * @param y the y-coordinate of the pixel to calculate in image space
-	* @param inputBuffers chunks that can be read by their ReadBufferOperation.
-	* @param chunkData chunk specific data a during execution time.
-	  */
+	 * @brief calculate a single pixel
+	 * @note this method is called for complex
+	 * @param result is a float[4] array to store the result
+	 * @param x the x-coordinate of the pixel to calculate in image space
+	 * @param y the y-coordinate of the pixel to calculate in image space
+	 * @param inputBuffers chunks that can be read by their ReadBufferOperation.
+	 * @param chunkData chunk specific data a during execution time.
+	 */
 	virtual void executePixel(float *result, int x, int y, MemoryBuffer *inputBuffers[], void *chunkData) {
 		executePixel(result, x, y, COM_PS_NEAREST, inputBuffers);
 	}
@@ -97,17 +97,15 @@ public:
 		executePixel(result, x, y, dx, dy, inputBuffers);
 	}
 
-	virtual void *initializeTileData(rcti *rect, MemoryBuffer** memoryBuffers) {
-		return 0;
-	}
-	virtual void deinitializeTileData(rcti *rect, MemoryBuffer** memoryBuffers, void *data) {
+	virtual void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers) { return 0; }
+	virtual void deinitializeTileData(rcti *rect, MemoryBuffer **memoryBuffers, void *data) {
 	}
 	
-	virtual MemoryBuffer *getInputMemoryBuffer(MemoryBuffer** memoryBuffers) {return 0;}
+	virtual MemoryBuffer *getInputMemoryBuffer(MemoryBuffer **memoryBuffers) { return 0; }
 
 
-	inline const unsigned int getWidth() const {return this->width;}
-	inline const unsigned int getHeight() const {return this->height;}
+	inline const unsigned int getWidth() const { return this->width; }
+	inline const unsigned int getHeight() const { return this->height; }
 };
 
 #endif
diff --git a/source/blender/compositor/intern/COM_WorkPackage.h b/source/blender/compositor/intern/COM_WorkPackage.h
index 8bdf21499cf..18d83cc151c 100644
--- a/source/blender/compositor/intern/COM_WorkPackage.h
+++ b/source/blender/compositor/intern/COM_WorkPackage.h
@@ -28,37 +28,37 @@ class WorkPackage;
 #include "COM_ExecutionGroup.h"
 
 /**
-  * @brief contains data about work that can be scheduled
-  * @see WorkScheduler
-  */
+ * @brief contains data about work that can be scheduled
+ * @see WorkScheduler
+ */
 class WorkPackage {
 private:
 	/**
-	  * @brief executionGroup with the operations-setup to be evaluated
-	  */
+	 * @brief executionGroup with the operations-setup to be evaluated
+	 */
 	ExecutionGroup *executionGroup;
 
 	/**
-	  * @brief number of the chunk to be executed
-	  */
+	 * @brief number of the chunk to be executed
+	 */
 	unsigned int chunkNumber;
 public:
 	/**
-	  * @constructor
-	  * @param group the ExecutionGroup
-	  * @param chunkNumber the number of the chunk
-	  */
+	 * @constructor
+	 * @param group the ExecutionGroup
+	 * @param chunkNumber the number of the chunk
+	 */
 	WorkPackage(ExecutionGroup *group, unsigned int chunkNumber);
 
 	/**
-	  * @brief get the ExecutionGroup
-	  */
-	ExecutionGroup *getExecutionGroup() const {return this->executionGroup;}
+	 * @brief get the ExecutionGroup
+	 */
+	ExecutionGroup *getExecutionGroup() const { return this->executionGroup; }
 
 	/**
-	  * @brief get the number of the chunk
-	  */
-	unsigned int getChunkNumber() const {return this->chunkNumber;}
+	 * @brief get the number of the chunk
+	 */
+	unsigned int getChunkNumber() const { return this->chunkNumber; }
 };
 
 #endif
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp
index 406f0acf724..80396af895d 100644
--- a/source/blender/compositor/intern/COM_WorkScheduler.cpp
+++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp
@@ -21,15 +21,18 @@
  */
 
 #include <list>
+#include <stdio.h>
+
+#include "BKE_global.h"
+
 #include "COM_WorkScheduler.h"
-#include "PIL_time.h"
-#include "BLI_threads.h"
 #include "COM_CPUDevice.h"
 #include "COM_OpenCLDevice.h"
+#include "COM_OpenCLKernels.cl.h"
 #include "OCL_opencl.h"
-#include "stdio.h"
-#include "COM_OpenCLKernels.cl.cpp"
-#include "BKE_global.h"
+
+#include "PIL_time.h"
+#include "BLI_threads.h"
 
 #if COM_CURRENT_THREADING_MODEL == COM_TM_NOTHREAD
 #warning COM_CURRENT_THREADING_MODEL COM_TM_NOTHREAD is activated. Use only for debugging.
@@ -39,22 +42,20 @@
 #endif
 
 
-/// @brief global state of the WorkScheduler.
-static WorkSchedulerState state;
 /// @brief list of all CPUDevices. for every hardware thread an instance of CPUDevice is created
-static vector<CPUDevice*> cpudevices;
+static vector<CPUDevice *> cpudevices;
 
 #if COM_CURRENT_THREADING_MODEL == COM_TM_QUEUE
 /// @brief list of all thread for every CPUDevice in cpudevices a thread exists
 static ListBase cputhreads;
 /// @brief all scheduled work for the cpu
-static ThreadQueue * cpuqueue;
-static ThreadQueue * gpuqueue;
+static ThreadQueue *cpuqueue;
+static ThreadQueue *gpuqueue;
 #ifdef COM_OPENCL_ENABLED
 static cl_context context;
 static cl_program program;
 /// @brief list of all OpenCLDevices. for every OpenCL GPU device an instance of OpenCLDevice is created
-static vector<OpenCLDevice*> gpudevices;
+static vector<OpenCLDevice *> gpudevices;
 /// @brief list of all thread for every GPUDevice in cpudevices a thread exists
 static ListBase gputhreads;
 /// @brief all scheduled work for the gpu
@@ -68,43 +69,29 @@ static bool openclActive = false;
 #if COM_CURRENT_THREADING_MODEL == COM_TM_QUEUE
 void *WorkScheduler::thread_execute_cpu(void *data)
 {
-	bool continueLoop = true;
-	Device *device = (Device*)data;
-	while (continueLoop) {
-		WorkPackage *work = (WorkPackage*)BLI_thread_queue_pop(cpuqueue);
-		if (work) {
-			device->execute(work);
-			delete work;
-		}
-		PIL_sleep_ms(10);
-
-		if (WorkScheduler::isStopping()) {
-			continueLoop = false;
-		}
+	Device *device = (Device *)data;
+	WorkPackage *work;
+	
+	while ((work = (WorkPackage *)BLI_thread_queue_pop(cpuqueue))) {
+		device->execute(work);
+		delete work;
 	}
+	
 	return NULL;
 }
 
 void *WorkScheduler::thread_execute_gpu(void *data)
 {
-	bool continueLoop = true;
-	Device *device = (Device*)data;
-	while (continueLoop) {
-		WorkPackage *work = (WorkPackage*)BLI_thread_queue_pop(gpuqueue);
-		if (work) {
-			device->execute(work);
-			delete work;
-		}
-		PIL_sleep_ms(10);
-
-		if (WorkScheduler::isStopping()) {
-			continueLoop = false;
-		}
+	Device *device = (Device *)data;
+	WorkPackage *work;
+	
+	while ((work = (WorkPackage *)BLI_thread_queue_pop(gpuqueue))) {
+		device->execute(work);
+		delete work;
 	}
+	
 	return NULL;
 }
-
-bool WorkScheduler::isStopping() {return state == COM_WSS_STOPPING;}
 #endif
 
 
@@ -135,18 +122,16 @@ void WorkScheduler::start(CompositorContext &context)
 #if COM_CURRENT_THREADING_MODEL == COM_TM_QUEUE
 	unsigned int index;
 	cpuqueue = BLI_thread_queue_init();
-	BLI_thread_queue_nowait(cpuqueue);
 	BLI_init_threads(&cputhreads, thread_execute_cpu, cpudevices.size());
-	for (index = 0 ; index < cpudevices.size() ; index ++) {
+	for (index = 0; index < cpudevices.size(); index++) {
 		Device *device = cpudevices[index];
 		BLI_insert_thread(&cputhreads, device);
 	}
 #ifdef COM_OPENCL_ENABLED
 	if (context.getHasActiveOpenCLDevices()) {
 		gpuqueue = BLI_thread_queue_init();
-		BLI_thread_queue_nowait(gpuqueue);
 		BLI_init_threads(&gputhreads, thread_execute_gpu, gpudevices.size());
-		for (index = 0 ; index < gpudevices.size() ; index ++) {
+		for (index = 0; index < gpudevices.size(); index++) {
 			Device *device = gpudevices[index];
 			BLI_insert_thread(&gputhreads, device);
 		}
@@ -157,52 +142,46 @@ void WorkScheduler::start(CompositorContext &context)
 	}
 #endif
 #endif
-	state = COM_WSS_STARTED;
 }
 void WorkScheduler::finish()
 {
 #if COM_CURRENT_THREADING_MODEL == COM_TM_QUEUE
 #ifdef COM_OPENCL_ENABLED
 	if (openclActive) {
-		while (BLI_thread_queue_size(gpuqueue) + BLI_thread_queue_size(cpuqueue) > 0) {
-			PIL_sleep_ms(10);
-		}
+		BLI_thread_queue_wait_finish(gpuqueue);
+		BLI_thread_queue_wait_finish(cpuqueue);
 	}
 	else {
-		while (BLI_thread_queue_size(cpuqueue) > 0) {
-			PIL_sleep_ms(10);
-		}
+		BLI_thread_queue_wait_finish(cpuqueue);
 	}
 #else
-	while (BLI_thread_queue_size(cpuqueue) > 0) {
-		PIL_sleep_ms(10);
-	}
+	BLI_thread_queue_wait_finish(cpuqueue);
 #endif
 #endif
 }
 void WorkScheduler::stop()
 {
-	state = COM_WSS_STOPPING;
 #if COM_CURRENT_THREADING_MODEL == COM_TM_QUEUE
+	BLI_thread_queue_nowait(cpuqueue);
 	BLI_end_threads(&cputhreads);
 	BLI_thread_queue_free(cpuqueue);
 	cpuqueue = NULL;
 #ifdef COM_OPENCL_ENABLED
 	if (openclActive) {
+		BLI_thread_queue_nowait(gpuqueue);
 		BLI_end_threads(&gputhreads);
 		BLI_thread_queue_free(gpuqueue);
 		gpuqueue = NULL;
 	}
 #endif
 #endif
-	state = COM_WSS_STOPPED;
 }
 
 bool WorkScheduler::hasGPUDevices()
 {
 #if COM_CURRENT_THREADING_MODEL == COM_TM_QUEUE
 #ifdef COM_OPENCL_ENABLED
-	return gpudevices.size()>0;
+	return gpudevices.size() > 0;
 #else
 	return 0;
 #endif
@@ -218,12 +197,10 @@ extern void clContextError(const char *errinfo, const void *private_info, size_t
 
 void WorkScheduler::initialize()
 {
-	state = COM_WSS_UNKNOWN;
-
 #if COM_CURRENT_THREADING_MODEL == COM_TM_QUEUE
 	int numberOfCPUThreads = BLI_system_thread_count();
 
-	for (int index = 0 ; index < numberOfCPUThreads ; index ++) {
+	for (int index = 0; index < numberOfCPUThreads; index++) {
 		CPUDevice *device = new CPUDevice();
 		device->initialize();
 		cpudevices.push_back(device);
@@ -232,16 +209,16 @@ void WorkScheduler::initialize()
 	context = NULL;
 	program = NULL;
 	if (clCreateContextFromType) {
-		cl_uint numberOfPlatforms;
+		cl_uint numberOfPlatforms = 0;
 		cl_int error;
 		error = clGetPlatformIDs(0, 0, &numberOfPlatforms);
-		if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));	}
+		if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));  }
 		if (G.f & G_DEBUG) printf("%d number of platforms\n", numberOfPlatforms);
 		cl_platform_id *platforms = new cl_platform_id[numberOfPlatforms];
 		error = clGetPlatformIDs(numberOfPlatforms, platforms, 0);
 		unsigned int indexPlatform;
 		cl_uint totalNumberOfDevices = 0;
-		for (indexPlatform = 0 ; indexPlatform < numberOfPlatforms ; indexPlatform ++) {
+		for (indexPlatform = 0; indexPlatform < numberOfPlatforms; indexPlatform++) {
 			cl_platform_id platform = platforms[indexPlatform];
 			cl_uint numberOfDevices;
 			clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 0, 0, &numberOfDevices);
@@ -250,66 +227,68 @@ void WorkScheduler::initialize()
 
 		cl_device_id *cldevices = new cl_device_id[totalNumberOfDevices];
 		unsigned int numberOfDevicesReceived = 0;
-		for (indexPlatform = 0 ; indexPlatform < numberOfPlatforms ; indexPlatform ++) {
+		for (indexPlatform = 0; indexPlatform < numberOfPlatforms; indexPlatform++) {
 			cl_platform_id platform = platforms[indexPlatform];
 			cl_uint numberOfDevices;
 			clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 0, 0, &numberOfDevices);
-			clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, numberOfDevices, cldevices+numberOfDevicesReceived*sizeof (cl_device_id), 0);
+			clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, numberOfDevices, cldevices + numberOfDevicesReceived * sizeof (cl_device_id), 0);
 			numberOfDevicesReceived += numberOfDevices;
 		}
-		context = clCreateContext(NULL, totalNumberOfDevices, cldevices, clContextError, NULL, &error);
-		if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));	}
-		program = clCreateProgramWithSource(context, 1, &sourcecode, 0, &error);
-		error = clBuildProgram(program, totalNumberOfDevices, cldevices, 0, 0, 0);
-		if (error != CL_SUCCESS) { 
-			cl_int error2;
-			size_t ret_val_size;
-			printf("CLERROR[%d]: %s\n", error, clewErrorString(error));	
-			error2 = clGetProgramBuildInfo(program, cldevices[0], CL_PROGRAM_BUILD_LOG, 0, NULL, &ret_val_size);
-			if (error2 != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));	}
-			char *build_log =  new char[ret_val_size+1];
-			error2 = clGetProgramBuildInfo(program, cldevices[0], CL_PROGRAM_BUILD_LOG, ret_val_size, build_log, NULL);
-			if (error2 != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));	}
-			build_log[ret_val_size] = '\0';
-			printf("%s", build_log);
-			delete build_log;
-			
-		}
-		unsigned int indexDevices;
-		for (indexDevices = 0 ; indexDevices < totalNumberOfDevices ; indexDevices ++) {
-			cl_device_id device = cldevices[indexDevices];
-			OpenCLDevice *clDevice = new OpenCLDevice(context, device, program);
-			clDevice->initialize(),
-			gpudevices.push_back(clDevice);
-			if (G.f & G_DEBUG) {
-				char resultString[32];
-				error = clGetDeviceInfo(device, CL_DEVICE_NAME, 32, resultString, 0);
-				printf("OPENCL_DEVICE: %s, ", resultString);
-				error = clGetDeviceInfo(device, CL_DEVICE_VENDOR, 32, resultString, 0);
-				printf("%s\n", resultString);
+		if (totalNumberOfDevices > 0) {
+			context = clCreateContext(NULL, totalNumberOfDevices, cldevices, clContextError, NULL, &error);
+			if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));  }
+			program = clCreateProgramWithSource(context, 1, &clkernelstoh_COM_OpenCLKernels_cl, 0, &error);
+			error = clBuildProgram(program, totalNumberOfDevices, cldevices, 0, 0, 0);
+			if (error != CL_SUCCESS) { 
+				cl_int error2;
+				size_t ret_val_size = 0;
+				printf("CLERROR[%d]: %s\n", error, clewErrorString(error));	
+				error2 = clGetProgramBuildInfo(program, cldevices[0], CL_PROGRAM_BUILD_LOG, 0, NULL, &ret_val_size);
+				if (error2 != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error)); }
+				char *build_log =  new char[ret_val_size + 1];
+				error2 = clGetProgramBuildInfo(program, cldevices[0], CL_PROGRAM_BUILD_LOG, ret_val_size, build_log, NULL);
+				if (error2 != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error)); }
+				build_log[ret_val_size] = '\0';
+				printf("%s", build_log);
+				delete build_log;
+				
+			}
+			else {
+				unsigned int indexDevices;
+				for (indexDevices = 0; indexDevices < totalNumberOfDevices; indexDevices++) {
+					cl_device_id device = cldevices[indexDevices];
+					OpenCLDevice *clDevice = new OpenCLDevice(context, device, program);
+					clDevice->initialize(),
+					    gpudevices.push_back(clDevice);
+					if (G.f & G_DEBUG) {
+						char resultString[32];
+						error = clGetDeviceInfo(device, CL_DEVICE_NAME, 32, resultString, 0);
+						printf("OPENCL_DEVICE: %s, ", resultString);
+						error = clGetDeviceInfo(device, CL_DEVICE_VENDOR, 32, resultString, 0);
+						printf("%s\n", resultString);
+					}
+				}
 			}
 		}
-		delete cldevices;
-		delete platforms;
+		delete[] cldevices;
+		delete[] platforms;
 	}
 #endif
 #endif
-
-	state = COM_WSS_INITIALIZED;
 }
 
 void WorkScheduler::deinitialize()
 {
 #if COM_CURRENT_THREADING_MODEL == COM_TM_QUEUE
 	Device *device;
-	while (cpudevices.size()>0) {
+	while (cpudevices.size() > 0) {
 		device = cpudevices.back();
 		cpudevices.pop_back();
 		device->deinitialize();
 		delete device;
 	}
 #ifdef COM_OPENCL_ENABLED
-	while (gpudevices.size()>0) {
+	while (gpudevices.size() > 0) {
 		device = gpudevices.back();
 		gpudevices.pop_back();
 		device->deinitialize();
@@ -325,5 +304,4 @@ void WorkScheduler::deinitialize()
 	}
 #endif
 #endif
-	state = COM_WSS_DEINITIALIZED;
 }
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.h b/source/blender/compositor/intern/COM_WorkScheduler.h
index 0de1763749e..e52e0295607 100644
--- a/source/blender/compositor/intern/COM_WorkScheduler.h
+++ b/source/blender/compositor/intern/COM_WorkScheduler.h
@@ -31,97 +31,84 @@ extern "C" {
 #include "COM_defines.h"
 #include "COM_Device.h"
 
-// STATES
-/** @brief states of the WorkScheduler
-  * @ingroup execution
-  */
-typedef enum WorkSchedulerState {
-	COM_WSS_UNKNOWN = -1,
-	COM_WSS_INITIALIZED = 0,
-	COM_WSS_STARTED = 1,
-	COM_WSS_STOPPING = 2,
-	COM_WSS_STOPPED = 3,
-	COM_WSS_DEINITIALIZED = 4
-} WorkSchedulerState;
-
 /** @brief the workscheduler
-  * @ingroup execution
-  */
+ * @ingroup execution
+ */
 class WorkScheduler {
 
 #if COM_CURRENT_THREADING_MODEL == COM_TM_QUEUE
 	/**
-	  * @brief are we being stopped.
-	  */
+	 * @brief are we being stopped.
+	 */
 	static bool isStopping();
 
 	/**
-	  * @brief main thread loop for cpudevices
-	  * inside this loop new work is queried and being executed
-	  */
+	 * @brief main thread loop for cpudevices
+	 * inside this loop new work is queried and being executed
+	 */
 	static void *thread_execute_cpu(void *data);
 
 	/**
-	  * @brief main thread loop for gpudevices
-	  * inside this loop new work is queried and being executed
-	  */
+	 * @brief main thread loop for gpudevices
+	 * inside this loop new work is queried and being executed
+	 */
 	static void *thread_execute_gpu(void *data);
 #endif	
 public:
 	/**
-	  * @brief schedule a chunk of a group to be calculated.
-	  * An execution group schedules a chunk in the WorkScheduler
-	  * when ExecutionGroup.isOpenCL is set the work will be handled by a OpenCLDevice
-	  * otherwide the work is scheduled for an CPUDevice
-	  * @see ExecutionGroup.execute 
-	  * @param group the execution group
-	  * @param chunkNumber the number of the chunk in the group to be executed
-	  */
+	 * @brief schedule a chunk of a group to be calculated.
+	 * An execution group schedules a chunk in the WorkScheduler
+	 * when ExecutionGroup.isOpenCL is set the work will be handled by a OpenCLDevice
+	 * otherwide the work is scheduled for an CPUDevice
+	 * @see ExecutionGroup.execute
+	 * @param group the execution group
+	 * @param chunkNumber the number of the chunk in the group to be executed
+	 */
 	static void schedule(ExecutionGroup *group, int chunkNumber);
 
 	/**
-	  * @brief initialize the WorkScheduler
-	  *
-	  * during initialization the mutexes are initialized.
-	  * there are two mutexes (for every device type one)
-	  * After mutex initialization the system is queried in order to count the number of CPUDevices and GPUDevices to be created.
-	  * For every hardware thread a CPUDevice and for every OpenCL GPU device a OpenCLDevice is created.
-	  * these devices are stored in a separate list (cpudevices & gpudevices)
-	  */
+	 * @brief initialize the WorkScheduler
+	 *
+	 * during initialization the mutexes are initialized.
+	 * there are two mutexes (for every device type one)
+	 * After mutex initialization the system is queried in order to count the number of CPUDevices and GPUDevices to be created.
+	 * For every hardware thread a CPUDevice and for every OpenCL GPU device a OpenCLDevice is created.
+	 * these devices are stored in a separate list (cpudevices & gpudevices)
+	 */
 	static void initialize();
 
 	/**
-	  * @brief deinitialize the WorkScheduler
-	  * free all allocated resources
-	  */
+	 * @brief deinitialize the WorkScheduler
+	 * free all allocated resources
+	 */
 	static void deinitialize();
 
 	/**
-	  * @brief Start the execution
-	  * this methods will start the WorkScheduler. Inside this method all threads are initialized.
-	  * for every device a thread is created.
-	  * @see initialize Initialization and query of the number of devices
-	  */
+	 * @brief Start the execution
+	 * this methods will start the WorkScheduler. Inside this method all threads are initialized.
+	 * for every device a thread is created.
+	 * @see initialize Initialization and query of the number of devices
+	 */
 	static void start(CompositorContext &context);
 
 	/**
-	  * @brief stop the execution
-	  * All created thread by the start method are destroyed.
-	  * @see start
-	  */
+	 * @brief stop the execution
+	 * All created thread by the start method are destroyed.
+	 * @see start
+	 */
 	static void stop();
 
 	/**
-	  * @brief wait for all work to be completed.
-	  */
+	 * @brief wait for all work to be completed.
+	 */
 	static void finish();
 
 	/**
-	  * @brief Are there OpenCL capable GPU devices initialized?
-	  * the result of this method is stored in the CompositorContext
-	  * A node can generate a different operation tree when OpenCLDevices exists.
-	  * @see CompositorContext.getHasActiveOpenCLDevices
-	  */
+	 * @brief Are there OpenCL capable GPU devices initialized?
+	 * the result of this method is stored in the CompositorContext
+	 * A node can generate a different operation tree when OpenCLDevices exists.
+	 * @see CompositorContext.getHasActiveOpenCLDevices
+	 */
 	static bool hasGPUDevices();
 };
 #endif
diff --git a/source/blender/compositor/intern/COM_compositor.cpp b/source/blender/compositor/intern/COM_compositor.cpp
index e27bff4401e..2bbfd18e7c5 100644
--- a/source/blender/compositor/intern/COM_compositor.cpp
+++ b/source/blender/compositor/intern/COM_compositor.cpp
@@ -51,7 +51,6 @@ void COM_execute(bNodeTree *editingtree, int rendering)
 
 	/* set progress bar to 0% and status to init compositing*/
 	editingtree->progress(editingtree->prh, 0.0);
-	editingtree->stats_draw(editingtree->sdh, (char*)"Compositing");
 
 	/* initialize execution system */
 	ExecutionSystem *system = new ExecutionSystem(editingtree, rendering);
diff --git a/source/blender/compositor/nodes/COM_AlphaOverNode.cpp b/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
index eb3cd821172..4f3ed36aadb 100644
--- a/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
+++ b/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
@@ -31,7 +31,7 @@
 #include "COM_SetValueOperation.h"
 #include "DNA_material_types.h" // the ramp types
 
-void AlphaOverNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void AlphaOverNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *valueSocket = this->getInputSocket(0);
 	InputSocket *color1Socket = this->getInputSocket(1);
@@ -40,8 +40,8 @@ void AlphaOverNode::convertToOperations(ExecutionSystem *graph, CompositorContex
 	bNode *editorNode = this->getbNode();
 	
 	MixBaseOperation *convertProg;
-	NodeTwoFloats *ntf = (NodeTwoFloats*)editorNode->storage;
-	if (ntf->x!= 0.0f) {
+	NodeTwoFloats *ntf = (NodeTwoFloats *)editorNode->storage;
+	if (ntf->x != 0.0f) {
 		AlphaOverMixedOperation *mixOperation  = new AlphaOverMixedOperation();
 		mixOperation->setX(ntf->x);
 		convertProg = mixOperation;
diff --git a/source/blender/compositor/nodes/COM_AlphaOverNode.h b/source/blender/compositor/nodes/COM_AlphaOverNode.h
index 64f78e76837..f7375d9a7c5 100644
--- a/source/blender/compositor/nodes/COM_AlphaOverNode.h
+++ b/source/blender/compositor/nodes/COM_AlphaOverNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief AlphaOverNode
-  * @ingroup Node
-  */
-class AlphaOverNode: public Node {
+ * @brief AlphaOverNode
+ * @ingroup Node
+ */
+class AlphaOverNode : public Node {
 public:
-	AlphaOverNode(bNode *editorNode) :Node(editorNode) {}
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	AlphaOverNode(bNode *editorNode) : Node(editorNode) {}
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp b/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
index fa654d35785..f96a92068f4 100644
--- a/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
+++ b/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
@@ -26,13 +26,14 @@
 #include "COM_ExecutionSystem.h"
 #include "COM_BilateralBlurOperation.h"
 
-BilateralBlurNode::BilateralBlurNode(bNode *editorNode): Node(editorNode)
+BilateralBlurNode::BilateralBlurNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void BilateralBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void BilateralBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
-	NodeBilateralBlurData *data = (NodeBilateralBlurData*)this->getbNode()->storage;
+	NodeBilateralBlurData *data = (NodeBilateralBlurData *)this->getbNode()->storage;
 	BilateralBlurOperation *operation = new BilateralBlurOperation();
 	operation->setQuality(context->getQuality());
 	operation->setData(data);
diff --git a/source/blender/compositor/nodes/COM_BilateralBlurNode.h b/source/blender/compositor/nodes/COM_BilateralBlurNode.h
index a92de0eaa62..e6f9242fa32 100644
--- a/source/blender/compositor/nodes/COM_BilateralBlurNode.h
+++ b/source/blender/compositor/nodes/COM_BilateralBlurNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief BilateralBlurNode
-  * @ingroup Node
-  */
-class BilateralBlurNode: public Node {
+ * @brief BilateralBlurNode
+ * @ingroup Node
+ */
+class BilateralBlurNode : public Node {
 public:
 	BilateralBlurNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_BlurNode.cpp b/source/blender/compositor/nodes/COM_BlurNode.cpp
index 90b2481cc7d..1b541d81c33 100644
--- a/source/blender/compositor/nodes/COM_BlurNode.cpp
+++ b/source/blender/compositor/nodes/COM_BlurNode.cpp
@@ -29,24 +29,23 @@
 #include "COM_GaussianBokehBlurOperation.h"
 #include "COM_FastGaussianBlurOperation.h"
 
-BlurNode::BlurNode(bNode *editorNode): Node(editorNode)
+BlurNode::BlurNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void BlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void BlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	bNode *editorNode = this->getbNode();
-	NodeBlurData * data = (NodeBlurData*)editorNode->storage;
-#if 0
+	NodeBlurData *data = (NodeBlurData *)editorNode->storage;
+	InputSocket *inputSizeSocket = this->getInputSocket(1);
+	bool connectedSizeSocket = inputSizeSocket->isConnected();
+
 	const bNodeSocket *sock = this->getInputSocket(1)->getbNodeSocket();
-	const float size = ((const bNodeSocketValueFloat*)sock->default_value)->value;
-#endif
+	const float size = ((const bNodeSocketValueFloat *)sock->default_value)->value;
 	
 	CompositorQuality quality = context->getQuality();
 	
-	if (data->filtertype == R_FILTER_MITCH || data->filtertype == R_FILTER_CATROM) {
-		quality = COM_QUALITY_HIGH;
-	}
 	if (data->filtertype == R_FILTER_FAST_GAUSS) {
 		FastGaussianBlurOperation *operationfgb = new FastGaussianBlurOperation();
 		operationfgb->setData(data);
@@ -54,7 +53,7 @@ void BlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext * c
 		this->getInputSocket(1)->relinkConnections(operationfgb->getInputSocket(1), 1, graph);
 		this->getOutputSocket(0)->relinkConnections(operationfgb->getOutputSocket(0));
 		graph->addOperation(operationfgb);
-		addPreviewOperation(graph, operationfgb->getOutputSocket(), 5);
+		addPreviewOperation(graph, operationfgb->getOutputSocket());
 	}
 	else if (!data->bokeh) {
 		GaussianXBlurOperation *operationx = new GaussianXBlurOperation();
@@ -70,7 +69,12 @@ void BlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext * c
 		graph->addOperation(operationy);
 		addLink(graph, operationx->getOutputSocket(), operationy->getInputSocket(0));
 		addLink(graph, operationx->getInputSocket(1)->getConnection()->getFromSocket(), operationy->getInputSocket(1));
-		addPreviewOperation(graph, operationy->getOutputSocket(), 5);
+		addPreviewOperation(graph, operationy->getOutputSocket());
+
+		if (!connectedSizeSocket) {
+			operationx->setSize(size);
+			operationy->setSize(size);
+		}
 	}
 	else {
 		GaussianBokehBlurOperation *operation = new GaussianBokehBlurOperation();
@@ -80,6 +84,10 @@ void BlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext * c
 		operation->setQuality(quality);
 		graph->addOperation(operation);
 		this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
-		addPreviewOperation(graph, operation->getOutputSocket(), 5);
+		addPreviewOperation(graph, operation->getOutputSocket());
+
+		if (!connectedSizeSocket) {
+			operation->setSize(size);
+		}
 	}
 }
diff --git a/source/blender/compositor/nodes/COM_BlurNode.h b/source/blender/compositor/nodes/COM_BlurNode.h
index 04a680c32cf..e7daff1c414 100644
--- a/source/blender/compositor/nodes/COM_BlurNode.h
+++ b/source/blender/compositor/nodes/COM_BlurNode.h
@@ -26,14 +26,14 @@
 #include "COM_Node.h"
 
 /**
-  * @brief BlurNode
-  * @ingroup Node
-  */
+ * @brief BlurNode
+ * @ingroup Node
+ */
 
-class BlurNode: public Node {
+class BlurNode : public Node {
 public:
 	BlurNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_BokehBlurNode.cpp b/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
index d6f4f58fe70..296056b6c48 100644
--- a/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
+++ b/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
@@ -30,20 +30,21 @@
 #include "COM_VariableSizeBokehBlurOperation.h"
 #include "COM_ConvertDepthToRadiusOperation.h"
 
-BokehBlurNode::BokehBlurNode(bNode *editorNode): Node(editorNode)
+BokehBlurNode::BokehBlurNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void BokehBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void BokehBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	Object *camob = context->getScene()->camera;
 
 	if (this->getInputSocket(2)->isConnected()) {
 		VariableSizeBokehBlurOperation *operation = new VariableSizeBokehBlurOperation();
 		ConvertDepthToRadiusOperation *converter = new ConvertDepthToRadiusOperation();
-		converter->setfStop(4.0f);
+		converter->setfStop(this->getbNode()->custom3);
 		converter->setCameraObject(camob);
-		operation->setMaxBlur(16);
+		operation->setMaxBlur((int)this->getbNode()->custom4);
 		operation->setQuality(context->getQuality());
 		this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
 		this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
@@ -58,7 +59,7 @@ void BokehBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContex
 		this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
 		this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
 		this->getInputSocket(3)->relinkConnections(operation->getInputSocket(2), 3, graph);
-		operation->setSize(((bNodeSocketValueFloat*)this->getInputSocket(2)->getbNodeSocket()->default_value)->value);
+		operation->setSize(((bNodeSocketValueFloat *)this->getInputSocket(2)->getbNodeSocket()->default_value)->value);
 		operation->setQuality(context->getQuality());
 		graph->addOperation(operation);
 		this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
diff --git a/source/blender/compositor/nodes/COM_BokehBlurNode.h b/source/blender/compositor/nodes/COM_BokehBlurNode.h
index eb9fada5112..5ce75a7d42b 100644
--- a/source/blender/compositor/nodes/COM_BokehBlurNode.h
+++ b/source/blender/compositor/nodes/COM_BokehBlurNode.h
@@ -26,14 +26,14 @@
 #include "COM_Node.h"
 
 /**
-  * @brief BokehBlurNode
-  * @ingroup Node
-  */
+ * @brief BokehBlurNode
+ * @ingroup Node
+ */
 
-class BokehBlurNode: public Node {
+class BokehBlurNode : public Node {
 public:
 	BokehBlurNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_BokehImageNode.cpp b/source/blender/compositor/nodes/COM_BokehImageNode.cpp
index 35511d213f5..75f5e07d552 100644
--- a/source/blender/compositor/nodes/COM_BokehImageNode.cpp
+++ b/source/blender/compositor/nodes/COM_BokehImageNode.cpp
@@ -25,15 +25,16 @@
 #include "COM_BokehImageOperation.h"
 #include "COM_ExecutionSystem.h"
 
-BokehImageNode::BokehImageNode(bNode *editorNode): Node(editorNode)
+BokehImageNode::BokehImageNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void BokehImageNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void BokehImageNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	BokehImageOperation *operation = new BokehImageOperation();
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
 	graph->addOperation(operation);
-	operation->setData((NodeBokehImage*)this->getbNode()->storage);
-	addPreviewOperation(graph, operation->getOutputSocket(0), 9);
+	operation->setData((NodeBokehImage *)this->getbNode()->storage);
+	addPreviewOperation(graph, operation->getOutputSocket(0));
 }
diff --git a/source/blender/compositor/nodes/COM_BokehImageNode.h b/source/blender/compositor/nodes/COM_BokehImageNode.h
index d4fabf0e516..a4bfe2bedc0 100644
--- a/source/blender/compositor/nodes/COM_BokehImageNode.h
+++ b/source/blender/compositor/nodes/COM_BokehImageNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief BokehImageNode
-  * @ingroup Node
-  */
-class BokehImageNode: public Node {
+ * @brief BokehImageNode
+ * @ingroup Node
+ */
+class BokehImageNode : public Node {
 public:
 	BokehImageNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_BoxMaskNode.cpp b/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
index e99252663d0..789ff265a5c 100644
--- a/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
+++ b/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
@@ -25,15 +25,16 @@
 #include "COM_BoxMaskOperation.h"
 #include "COM_ExecutionSystem.h"
 
-BoxMaskNode::BoxMaskNode(bNode *editorNode): Node(editorNode)
+BoxMaskNode::BoxMaskNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void BoxMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void BoxMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	BoxMaskOperation *operation;
 	operation = new BoxMaskOperation();
-	operation->setData((NodeBoxMask*)this->getbNode()->storage);
+	operation->setData((NodeBoxMask *)this->getbNode()->storage);
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
 	this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
diff --git a/source/blender/compositor/nodes/COM_BoxMaskNode.h b/source/blender/compositor/nodes/COM_BoxMaskNode.h
index c71c6a18388..9ebe2cc755a 100644
--- a/source/blender/compositor/nodes/COM_BoxMaskNode.h
+++ b/source/blender/compositor/nodes/COM_BoxMaskNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief BoxMaskNode
-  * @ingroup Node
-  */
-class BoxMaskNode: public Node {
+ * @brief BoxMaskNode
+ * @ingroup Node
+ */
+class BoxMaskNode : public Node {
 public:
 	BoxMaskNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_BrightnessNode.cpp b/source/blender/compositor/nodes/COM_BrightnessNode.cpp
index 9ccb58a45de..1e1fbdbc301 100644
--- a/source/blender/compositor/nodes/COM_BrightnessNode.cpp
+++ b/source/blender/compositor/nodes/COM_BrightnessNode.cpp
@@ -25,11 +25,12 @@
 #include "COM_BrightnessOperation.h"
 #include "COM_ExecutionSystem.h"
 
-BrightnessNode::BrightnessNode(bNode *editorNode): Node(editorNode)
+BrightnessNode::BrightnessNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void BrightnessNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void BrightnessNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	BrightnessOperation *operation = new BrightnessOperation();
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
diff --git a/source/blender/compositor/nodes/COM_BrightnessNode.h b/source/blender/compositor/nodes/COM_BrightnessNode.h
index 4c3b6421322..a10372049f0 100644
--- a/source/blender/compositor/nodes/COM_BrightnessNode.h
+++ b/source/blender/compositor/nodes/COM_BrightnessNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief BrightnessNode
-  * @ingroup Node
-  */
-class BrightnessNode: public Node {
+ * @brief BrightnessNode
+ * @ingroup Node
+ */
+class BrightnessNode : public Node {
 public:
 	BrightnessNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp b/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
index dbe5b9936dc..69f39639660 100644
--- a/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
@@ -27,8 +27,10 @@
 #include "COM_ConvertRGBToYUVOperation.h"
 #include "COM_SetAlphaOperation.h"
 
-ChannelMatteNode::ChannelMatteNode(bNode *editorNode): Node(editorNode)
-{}
+ChannelMatteNode::ChannelMatteNode(bNode *editorNode) : Node(editorNode)
+{
+	/* pass */
+}
 
 void ChannelMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
@@ -36,30 +38,30 @@ void ChannelMatteNode::convertToOperations(ExecutionSystem *graph, CompositorCon
 	OutputSocket *outputSocketImage = this->getOutputSocket(0);
 	OutputSocket *outputSocketMatte = this->getOutputSocket(1);
 
-	NodeOperation *convert=NULL;
+	NodeOperation *convert = NULL;
 	bNode *node = this->getbNode();
 
 	/* colorspace */
 	switch (node->custom1) {
-	case CMP_NODE_CHANNEL_MATTE_CS_RGB:
-		break;
-	case CMP_NODE_CHANNEL_MATTE_CS_HSV: /*HSV*/
-		convert = new ConvertRGBToHSVOperation();
-		break;
-	case CMP_NODE_CHANNEL_MATTE_CS_YUV: /*YUV*/
-		convert = new ConvertRGBToYUVOperation();
-		break;
-	case CMP_NODE_CHANNEL_MATTE_CS_YCC: /*YCC*/
-		convert = new ConvertRGBToYCCOperation();
-		((ConvertRGBToYCCOperation *)convert)->setMode(0); /* BLI_YCC_ITU_BT601 */
-		break;
-	default:
-		break;
+		case CMP_NODE_CHANNEL_MATTE_CS_RGB:
+			break;
+		case CMP_NODE_CHANNEL_MATTE_CS_HSV: /*HSV*/
+			convert = new ConvertRGBToHSVOperation();
+			break;
+		case CMP_NODE_CHANNEL_MATTE_CS_YUV: /*YUV*/
+			convert = new ConvertRGBToYUVOperation();
+			break;
+		case CMP_NODE_CHANNEL_MATTE_CS_YCC: /*YCC*/
+			convert = new ConvertRGBToYCCOperation();
+			((ConvertRGBToYCCOperation *)convert)->setMode(0); /* BLI_YCC_ITU_BT601 */
+			break;
+		default:
+			break;
 	}
 
 	ChannelMatteOperation *operation = new ChannelMatteOperation();
 	/* pass the ui properties to the operation */
-	operation->setSettings((NodeChroma*)node->storage, node->custom2);
+	operation->setSettings((NodeChroma *)node->storage, node->custom2);
 
 	SetAlphaOperation *operationAlpha = new SetAlphaOperation();
 
@@ -82,7 +84,7 @@ void ChannelMatteNode::convertToOperations(ExecutionSystem *graph, CompositorCon
 	graph->addOperation(operationAlpha);
 
 	addLink(graph, operation->getOutputSocket(), operationAlpha->getInputSocket(1));
-	addPreviewOperation(graph, operationAlpha->getOutputSocket(), 9);
+	addPreviewOperation(graph, operationAlpha->getOutputSocket());
 
 	if (outputSocketImage->isConnected()) {
 		outputSocketImage->relinkConnections(operationAlpha->getOutputSocket());
diff --git a/source/blender/compositor/nodes/COM_ChannelMatteNode.h b/source/blender/compositor/nodes/COM_ChannelMatteNode.h
index cb67ac604b2..45d03e18a6a 100644
--- a/source/blender/compositor/nodes/COM_ChannelMatteNode.h
+++ b/source/blender/compositor/nodes/COM_ChannelMatteNode.h
@@ -25,9 +25,9 @@
 #include "COM_Node.h"
 
 /**
-  * @brief ChannelMatteNode
-  * @ingroup Node
-  */
+ * @brief ChannelMatteNode
+ * @ingroup Node
+ */
 class ChannelMatteNode : public Node
 {
 public:
diff --git a/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp b/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
index dd3b3855e3f..0fb09157351 100644
--- a/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
@@ -25,8 +25,10 @@
 #include "COM_ConvertRGBToYCCOperation.h"
 #include "COM_SetAlphaOperation.h"
 
-ChromaMatteNode::ChromaMatteNode(bNode *editorNode): Node(editorNode)
-{}
+ChromaMatteNode::ChromaMatteNode(bNode *editorNode) : Node(editorNode)
+{
+	/* pass */
+}
 
 void ChromaMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
@@ -42,7 +44,7 @@ void ChromaMatteNode::convertToOperations(ExecutionSystem *graph, CompositorCont
 
 	ChromaMatteOperation *operation = new ChromaMatteOperation();
 	bNode *editorsnode = getbNode();
-	operation->setSettings((NodeChroma*)editorsnode->storage);
+	operation->setSettings((NodeChroma *)editorsnode->storage);
 
 	inputSocketImage->relinkConnections(operationRGBToYCC_Image->getInputSocket(0), 0, graph);
 	inputSocketKey->relinkConnections(operationRGBToYCC_Key->getInputSocket(0), 0, graph);
@@ -63,7 +65,7 @@ void ChromaMatteNode::convertToOperations(ExecutionSystem *graph, CompositorCont
 	addLink(graph, operation->getOutputSocket(), operationAlpha->getInputSocket(1));
 
 	graph->addOperation(operationAlpha);
-	addPreviewOperation(graph, operationAlpha->getOutputSocket(), 9);
+	addPreviewOperation(graph, operationAlpha->getOutputSocket());
 
 	if (outputSocketImage->isConnected()) {
 		outputSocketImage->relinkConnections(operationAlpha->getOutputSocket());
diff --git a/source/blender/compositor/nodes/COM_ChromaMatteNode.h b/source/blender/compositor/nodes/COM_ChromaMatteNode.h
index 6008137b4a7..ed8250b0329 100644
--- a/source/blender/compositor/nodes/COM_ChromaMatteNode.h
+++ b/source/blender/compositor/nodes/COM_ChromaMatteNode.h
@@ -25,9 +25,9 @@
 #include "COM_Node.h"
 
 /**
-  * @brief ChromaMatteNode
-  * @ingroup Node
-  */
+ * @brief ChromaMatteNode
+ * @ingroup Node
+ */
 class ChromaMatteNode : public Node
 {
 public:
diff --git a/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp b/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
index 7b852678191..d85b1ec1de1 100644
--- a/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
@@ -27,10 +27,12 @@
 #include "BKE_node.h"
 #include "COM_MixBlendOperation.h"
 
-ColorBalanceNode::ColorBalanceNode(bNode *editorNode): Node(editorNode)
+ColorBalanceNode::ColorBalanceNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
-void ColorBalanceNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+
+void ColorBalanceNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *inputSocket = this->getInputSocket(0);
 	InputSocket *inputImageSocket = this->getInputSocket(1);
@@ -38,16 +40,16 @@ void ColorBalanceNode::convertToOperations(ExecutionSystem *graph, CompositorCon
 	
 	bNode *node = this->getbNode();
 	NodeColorBalance *n = (NodeColorBalance *)node->storage;
-	NodeOperation*operation;
+	NodeOperation *operation;
 	if (node->custom1 == 0) {
 		ColorBalanceLGGOperation *operationLGG = new ColorBalanceLGGOperation();
 		{
-				int c;
+			int c;
 	
-				for (c = 0; c < 3; c++) {
-						n->lift_lgg[c] = 2.0f - n->lift[c];
-						n->gamma_inv[c] = (n->gamma[c] != 0.0f) ? 1.0f/n->gamma[c] : 1000000.0f;
-				}
+			for (c = 0; c < 3; c++) {
+				n->lift_lgg[c] = 2.0f - n->lift[c];
+				n->gamma_inv[c] = (n->gamma[c] != 0.0f) ? 1.0f / n->gamma[c] : 1000000.0f;
+			}
 		}
 	
 		operationLGG->setGain(n->gain);
diff --git a/source/blender/compositor/nodes/COM_ColorBalanceNode.h b/source/blender/compositor/nodes/COM_ColorBalanceNode.h
index 61a09d28c01..c2bdc306e20 100644
--- a/source/blender/compositor/nodes/COM_ColorBalanceNode.h
+++ b/source/blender/compositor/nodes/COM_ColorBalanceNode.h
@@ -26,9 +26,9 @@
 #include "COM_Node.h"
 
 /**
-  * @brief ColorBalanceNode
-  * @ingroup Node
-  */
+ * @brief ColorBalanceNode
+ * @ingroup Node
+ */
 class ColorBalanceNode : public Node
 {
 public:
diff --git a/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp b/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
index 4909f1b9895..41b3bebbd7b 100644
--- a/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
@@ -25,20 +25,21 @@
 #include "COM_ColorCorrectionOperation.h"
 #include "COM_ExecutionSystem.h"
 
-ColorCorrectionNode::ColorCorrectionNode(bNode *editorNode): Node(editorNode)
+ColorCorrectionNode::ColorCorrectionNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void ColorCorrectionNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void ColorCorrectionNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	ColorCorrectionOperation *operation = new ColorCorrectionOperation();
 	bNode *editorNode = getbNode();
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
 	this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
-	operation->setData((NodeColorCorrection*)editorNode->storage);
-	operation->setRedChannelEnabled((editorNode->custom1&1)>0);
-	operation->setGreenChannelEnabled((editorNode->custom1&2)>0);
-	operation->setBlueChannelEnabled((editorNode->custom1&4)>0);
+	operation->setData((NodeColorCorrection *)editorNode->storage);
+	operation->setRedChannelEnabled((editorNode->custom1 & 1) > 0);
+	operation->setGreenChannelEnabled((editorNode->custom1 & 2) > 0);
+	operation->setBlueChannelEnabled((editorNode->custom1 & 4) > 0);
 	graph->addOperation(operation);
 }
diff --git a/source/blender/compositor/nodes/COM_ColorCorrectionNode.h b/source/blender/compositor/nodes/COM_ColorCorrectionNode.h
index 46b7fe5e0bc..f1b0f69bec5 100644
--- a/source/blender/compositor/nodes/COM_ColorCorrectionNode.h
+++ b/source/blender/compositor/nodes/COM_ColorCorrectionNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief ColorCorrectionNode
-  * @ingroup Node
-  */
-class ColorCorrectionNode: public Node {
+ * @brief ColorCorrectionNode
+ * @ingroup Node
+ */
+class ColorCorrectionNode : public Node {
 public:
 	ColorCorrectionNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_ColorCurveNode.cpp b/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
index d7cde21a984..9ae11c22b6a 100644
--- a/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
@@ -25,22 +25,40 @@
 #include "COM_ColorCurveOperation.h"
 #include "COM_ExecutionSystem.h"
 
-ColorCurveNode::ColorCurveNode(bNode *editorNode): Node(editorNode)
+ColorCurveNode::ColorCurveNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void ColorCurveNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void ColorCurveNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
-	ColorCurveOperation *operation = new ColorCurveOperation();
-
-	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
-	this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
-	this->getInputSocket(2)->relinkConnections(operation->getInputSocket(2), 2, graph);
-	this->getInputSocket(3)->relinkConnections(operation->getInputSocket(3), 3, graph);
-
-	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
-
-	operation->setCurveMapping((CurveMapping*)this->getbNode()->storage);
-
-	graph->addOperation(operation);
+	if (this->getInputSocket(2)->isConnected() || this->getInputSocket(3)->isConnected()) {
+		ColorCurveOperation *operation = new ColorCurveOperation();
+	
+		this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
+		this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
+		this->getInputSocket(2)->relinkConnections(operation->getInputSocket(2), 2, graph);
+		this->getInputSocket(3)->relinkConnections(operation->getInputSocket(3), 3, graph);
+	
+		this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
+	
+		operation->setCurveMapping((CurveMapping *)this->getbNode()->storage);
+	
+		graph->addOperation(operation);
+	}
+	else {
+		ConstantLevelColorCurveOperation *operation = new ConstantLevelColorCurveOperation();
+	
+		this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
+		this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
+		bNodeSocketValueRGBA *val = (bNodeSocketValueRGBA *)this->getInputSocket(2)->getbNodeSocket()->default_value;
+		operation->setBlackLevel(val->value);
+		val = (bNodeSocketValueRGBA *)this->getInputSocket(3)->getbNodeSocket()->default_value;
+		operation->setWhiteLevel(val->value);
+		this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
+	
+		operation->setCurveMapping((CurveMapping *)this->getbNode()->storage);
+	
+		graph->addOperation(operation);
+	}
 }
diff --git a/source/blender/compositor/nodes/COM_ColorCurveNode.h b/source/blender/compositor/nodes/COM_ColorCurveNode.h
index 264e2691566..ecfae1f86f8 100644
--- a/source/blender/compositor/nodes/COM_ColorCurveNode.h
+++ b/source/blender/compositor/nodes/COM_ColorCurveNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief ColorCurveNode
-  * @ingroup Node
-  */
-class ColorCurveNode: public Node {
+ * @brief ColorCurveNode
+ * @ingroup Node
+ */
+class ColorCurveNode : public Node {
 public:
 	ColorCurveNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_ColorMatteNode.cpp b/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
index 860d1a01194..38ab6ba8da2 100644
--- a/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
@@ -25,8 +25,10 @@
 #include "COM_ConvertRGBToHSVOperation.h"
 #include "COM_SetAlphaOperation.h"
 
-ColorMatteNode::ColorMatteNode(bNode *editorNode): Node(editorNode)
-{}
+ColorMatteNode::ColorMatteNode(bNode *editorNode) : Node(editorNode)
+{
+	/* pass */
+}
 
 void ColorMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
@@ -40,7 +42,7 @@ void ColorMatteNode::convertToOperations(ExecutionSystem *graph, CompositorConte
 
 	ColorMatteOperation *operation = new ColorMatteOperation();
 	bNode *editorsnode = getbNode();
-	operation->setSettings((NodeChroma*)editorsnode->storage);
+	operation->setSettings((NodeChroma *)editorsnode->storage);
 
 	inputSocketImage->relinkConnections(operationRGBToHSV_Image->getInputSocket(0), 0, graph);
 	inputSocketKey->relinkConnections(operationRGBToHSV_Key->getInputSocket(0), 1, graph);
@@ -60,7 +62,7 @@ void ColorMatteNode::convertToOperations(ExecutionSystem *graph, CompositorConte
 	addLink(graph, operationRGBToHSV_Image->getInputSocket(0)->getConnection()->getFromSocket(), operationAlpha->getInputSocket(0));
 	addLink(graph, operation->getOutputSocket(), operationAlpha->getInputSocket(1));
 	graph->addOperation(operationAlpha);
-	addPreviewOperation(graph, operationAlpha->getOutputSocket(), 9);
+	addPreviewOperation(graph, operationAlpha->getOutputSocket());
 
 	if (outputSocketImage->isConnected()) {
 		outputSocketImage->relinkConnections(operationAlpha->getOutputSocket());
diff --git a/source/blender/compositor/nodes/COM_ColorMatteNode.h b/source/blender/compositor/nodes/COM_ColorMatteNode.h
index af64616d054..375c914a122 100644
--- a/source/blender/compositor/nodes/COM_ColorMatteNode.h
+++ b/source/blender/compositor/nodes/COM_ColorMatteNode.h
@@ -25,9 +25,9 @@
 #include "COM_Node.h"
 
 /**
-  * @brief ColorMatteNode
-  * @ingroup Node
-  */
+ * @brief ColorMatteNode
+ * @ingroup Node
+ */
 class ColorMatteNode : public Node
 {
 public:
diff --git a/source/blender/compositor/nodes/COM_ColorNode.cpp b/source/blender/compositor/nodes/COM_ColorNode.cpp
index f5fcb0177f7..65480c7aeb2 100644
--- a/source/blender/compositor/nodes/COM_ColorNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorNode.cpp
@@ -25,15 +25,16 @@
 #include "COM_SetColorOperation.h"
 #include "COM_ExecutionSystem.h"
 
-ColorNode::ColorNode(bNode *editorNode): Node(editorNode)
+ColorNode::ColorNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void ColorNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void ColorNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	SetColorOperation *operation = new SetColorOperation();
 	bNodeSocket *socket = this->getEditorOutputSocket(0);
-	bNodeSocketValueRGBA *dval = (bNodeSocketValueRGBA*)socket->default_value;
+	bNodeSocketValueRGBA *dval = (bNodeSocketValueRGBA *)socket->default_value;
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
 	operation->setChannels(dval->value);
 	graph->addOperation(operation);
diff --git a/source/blender/compositor/nodes/COM_ColorNode.h b/source/blender/compositor/nodes/COM_ColorNode.h
index 937979dd961..3e3df63e90a 100644
--- a/source/blender/compositor/nodes/COM_ColorNode.h
+++ b/source/blender/compositor/nodes/COM_ColorNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief ColorNode
-  * @ingroup Node
-  */
-class ColorNode: public Node {
+ * @brief ColorNode
+ * @ingroup Node
+ */
+class ColorNode : public Node {
 public:
 	ColorNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_ColorRampNode.cpp b/source/blender/compositor/nodes/COM_ColorRampNode.cpp
index c6090120467..a79c7885ae4 100644
--- a/source/blender/compositor/nodes/COM_ColorRampNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorRampNode.cpp
@@ -27,10 +27,12 @@
 #include "COM_SeparateChannelOperation.h"
 #include "DNA_texture_types.h"
 
-ColorRampNode::ColorRampNode(bNode *editorNode): Node(editorNode)
-{}
+ColorRampNode::ColorRampNode(bNode *editorNode) : Node(editorNode)
+{
+	/* pass */
+}
 
-void ColorRampNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void ColorRampNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *inputSocket = this->getInputSocket(0);
 	OutputSocket *outputSocket = this->getOutputSocket(0);
@@ -46,7 +48,7 @@ void ColorRampNode::convertToOperations(ExecutionSystem *graph, CompositorContex
 		operation2->setChannel(3);
 		graph->addOperation(operation2);
 	}
-	operation->setColorBand((ColorBand*)editorNode->storage);
+	operation->setColorBand((ColorBand *)editorNode->storage);
 	inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
 	graph->addOperation(operation);
 }
diff --git a/source/blender/compositor/nodes/COM_ColorRampNode.h b/source/blender/compositor/nodes/COM_ColorRampNode.h
index 53fff2b0d98..4d706e126e1 100644
--- a/source/blender/compositor/nodes/COM_ColorRampNode.h
+++ b/source/blender/compositor/nodes/COM_ColorRampNode.h
@@ -26,14 +26,14 @@
 #include "COM_Node.h"
 
 /**
-  * @brief ColorRampNode
-  * @ingroup Node
-  */
+ * @brief ColorRampNode
+ * @ingroup Node
+ */
 class ColorRampNode : public Node
 {
 public:
 	ColorRampNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif // COM_ColorRampNODE_H
diff --git a/source/blender/compositor/nodes/COM_ColorSpillNode.cpp b/source/blender/compositor/nodes/COM_ColorSpillNode.cpp
index 503ca3c8bd3..0e586955ff8 100644
--- a/source/blender/compositor/nodes/COM_ColorSpillNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorSpillNode.cpp
@@ -24,8 +24,10 @@
 #include "BKE_node.h"
 #include "COM_ColorSpillOperation.h"
 
-ColorSpillNode::ColorSpillNode(bNode *editorNode): Node(editorNode)
-{}
+ColorSpillNode::ColorSpillNode(bNode *editorNode) : Node(editorNode)
+{
+	/* pass */
+}
 
 void ColorSpillNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
@@ -45,8 +47,8 @@ void ColorSpillNode::convertToOperations(ExecutionSystem *graph, CompositorConte
 		// Average color spill
 		operation = new ColorSpillAverageOperation();
 	}
-	operation->setSettings((NodeColorspill*)editorsnode->storage);
-	operation->setSpillChannel(editorsnode->custom1-1); // Channel for spilling
+	operation->setSettings((NodeColorspill *)editorsnode->storage);
+	operation->setSpillChannel(editorsnode->custom1 - 1); // Channel for spilling
 	
 
 	inputSocketImage->relinkConnections(operation->getInputSocket(0), 0, graph);
diff --git a/source/blender/compositor/nodes/COM_ColorSpillNode.h b/source/blender/compositor/nodes/COM_ColorSpillNode.h
index ed0e33b0742..d8ce6878fa0 100644
--- a/source/blender/compositor/nodes/COM_ColorSpillNode.h
+++ b/source/blender/compositor/nodes/COM_ColorSpillNode.h
@@ -26,9 +26,9 @@
 #include "COM_Node.h"
 
 /**
-  * @brief ColorSpillNode
-  * @ingroup Node
-  */
+ * @brief ColorSpillNode
+ * @ingroup Node
+ */
 class ColorSpillNode : public Node
 {
 public:
diff --git a/source/blender/compositor/nodes/COM_ColorToBWNode.cpp b/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
index ed2869d35f2..430f317eae2 100644
--- a/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
@@ -25,11 +25,12 @@
 #include "COM_ConvertColorToBWOperation.h"
 #include "COM_ExecutionSystem.h"
 
-ColourToBWNode::ColourToBWNode(bNode *editorNode): Node(editorNode)
+ColourToBWNode::ColourToBWNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void ColourToBWNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void ColourToBWNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *colourSocket = this->getInputSocket(0);
 	OutputSocket *valueSocket = this->getOutputSocket(0);
diff --git a/source/blender/compositor/nodes/COM_ColorToBWNode.h b/source/blender/compositor/nodes/COM_ColorToBWNode.h
index e2badd1b104..34a157c73d8 100644
--- a/source/blender/compositor/nodes/COM_ColorToBWNode.h
+++ b/source/blender/compositor/nodes/COM_ColorToBWNode.h
@@ -26,12 +26,12 @@
 #include "COM_Node.h"
 #include "DNA_node_types.h"
 /**
-  * @brief ColourToBWNode
-  * @ingroup Node
-  */
+ * @brief ColourToBWNode
+ * @ingroup Node
+ */
 class ColourToBWNode : public Node {
 public:
 	ColourToBWNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 #endif
diff --git a/source/blender/compositor/nodes/COM_CombineHSVANode.cpp b/source/blender/compositor/nodes/COM_CombineHSVANode.cpp
index a0f46ad6b6c..beba41fade9 100644
--- a/source/blender/compositor/nodes/COM_CombineHSVANode.cpp
+++ b/source/blender/compositor/nodes/COM_CombineHSVANode.cpp
@@ -28,11 +28,12 @@
 #include "COM_SetValueOperation.h"
 #include "COM_ConvertHSVToRGBOperation.h"
 
-CombineHSVANode::CombineHSVANode(bNode *editorNode): CombineRGBANode(editorNode)
+CombineHSVANode::CombineHSVANode(bNode *editorNode) : CombineRGBANode(editorNode)
 {
+	/* pass */
 }
 
-void CombineHSVANode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void CombineHSVANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	ConvertHSVToRGBOperation *operation = new ConvertHSVToRGBOperation();
 	OutputSocket *outputSocket = this->getOutputSocket(0);
diff --git a/source/blender/compositor/nodes/COM_CombineHSVANode.h b/source/blender/compositor/nodes/COM_CombineHSVANode.h
index fabd6f91f7e..d8aba71d456 100644
--- a/source/blender/compositor/nodes/COM_CombineHSVANode.h
+++ b/source/blender/compositor/nodes/COM_CombineHSVANode.h
@@ -27,12 +27,12 @@
 #include "DNA_node_types.h"
 #include "COM_CombineRGBANode.h"
 /**
-  * @brief CombineHSVANode
-  * @ingroup Node
-  */
+ * @brief CombineHSVANode
+ * @ingroup Node
+ */
 class CombineHSVANode : public CombineRGBANode {
 public:
 	CombineHSVANode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 #endif
diff --git a/source/blender/compositor/nodes/COM_CombineRGBANode.cpp b/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
index e6fcc48ac5b..a8cdd8c2950 100644
--- a/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
+++ b/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
@@ -29,12 +29,12 @@
 #include "DNA_material_types.h" // the ramp types
 
 
-CombineRGBANode::CombineRGBANode(bNode *editorNode): Node(editorNode)
+CombineRGBANode::CombineRGBANode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-
-void CombineRGBANode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void CombineRGBANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *inputRSocket = this->getInputSocket(0);
 	InputSocket *inputGSocket = this->getInputSocket(1);
diff --git a/source/blender/compositor/nodes/COM_CombineRGBANode.h b/source/blender/compositor/nodes/COM_CombineRGBANode.h
index 182bfece6d3..1f25d8deed9 100644
--- a/source/blender/compositor/nodes/COM_CombineRGBANode.h
+++ b/source/blender/compositor/nodes/COM_CombineRGBANode.h
@@ -26,12 +26,12 @@
 #include "COM_Node.h"
 #include "DNA_node_types.h"
 /**
-  * @brief CombineRGBANode
-  * @ingroup Node
-  */
+ * @brief CombineRGBANode
+ * @ingroup Node
+ */
 class CombineRGBANode : public Node {
 public:
 	CombineRGBANode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 #endif
diff --git a/source/blender/compositor/nodes/COM_CombineYCCANode.cpp b/source/blender/compositor/nodes/COM_CombineYCCANode.cpp
index ad6203ea85a..5319eb84184 100644
--- a/source/blender/compositor/nodes/COM_CombineYCCANode.cpp
+++ b/source/blender/compositor/nodes/COM_CombineYCCANode.cpp
@@ -22,8 +22,9 @@
 #include "COM_CombineYCCANode.h"
 #include "COM_ConvertYCCToRGBOperation.h"
 
-CombineYCCANode::CombineYCCANode(bNode *editorNode): CombineRGBANode(editorNode)
+CombineYCCANode::CombineYCCANode(bNode *editorNode) : CombineRGBANode(editorNode)
 {
+	/* pass */
 }
 
 void CombineYCCANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
diff --git a/source/blender/compositor/nodes/COM_CombineYCCANode.h b/source/blender/compositor/nodes/COM_CombineYCCANode.h
index 86e2d50e950..3b143aabc7f 100644
--- a/source/blender/compositor/nodes/COM_CombineYCCANode.h
+++ b/source/blender/compositor/nodes/COM_CombineYCCANode.h
@@ -26,9 +26,9 @@
 #include "DNA_node_types.h"
 #include "COM_CombineRGBANode.h"
 /**
-  * @brief CombineYCCANode
-  * @ingroup Node
-  */
+ * @brief CombineYCCANode
+ * @ingroup Node
+ */
 class CombineYCCANode : public CombineRGBANode {
 public:
 	CombineYCCANode(bNode *editorNode);
diff --git a/source/blender/compositor/nodes/COM_CombineYUVANode.cpp b/source/blender/compositor/nodes/COM_CombineYUVANode.cpp
index ea92a40f803..48c2c6ca649 100644
--- a/source/blender/compositor/nodes/COM_CombineYUVANode.cpp
+++ b/source/blender/compositor/nodes/COM_CombineYUVANode.cpp
@@ -22,8 +22,9 @@
 #include "COM_CombineYUVANode.h"
 #include "COM_ConvertYUVToRGBOperation.h"
 
-CombineYUVANode::CombineYUVANode(bNode *editorNode): CombineRGBANode(editorNode)
+CombineYUVANode::CombineYUVANode(bNode *editorNode) : CombineRGBANode(editorNode)
 {
+	/* pass */
 }
 
 void CombineYUVANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
diff --git a/source/blender/compositor/nodes/COM_CombineYUVANode.h b/source/blender/compositor/nodes/COM_CombineYUVANode.h
index 7d2f9cddf7e..1eae44c83a5 100644
--- a/source/blender/compositor/nodes/COM_CombineYUVANode.h
+++ b/source/blender/compositor/nodes/COM_CombineYUVANode.h
@@ -26,9 +26,9 @@
 #include "DNA_node_types.h"
 #include "COM_CombineRGBANode.h"
 /**
-  * @brief CombineYUVANode
-  * @ingroup Node
-  */
+ * @brief CombineYUVANode
+ * @ingroup Node
+ */
 class CombineYUVANode : public CombineRGBANode {
 public:
 	CombineYUVANode(bNode *editorNode);
diff --git a/source/blender/compositor/nodes/COM_CompositorNode.cpp b/source/blender/compositor/nodes/COM_CompositorNode.cpp
index 57821e7fe27..fccb92ddd8b 100644
--- a/source/blender/compositor/nodes/COM_CompositorNode.cpp
+++ b/source/blender/compositor/nodes/COM_CompositorNode.cpp
@@ -24,11 +24,12 @@
 #include "COM_CompositorOperation.h"
 #include "COM_ExecutionSystem.h"
 
-CompositorNode::CompositorNode(bNode *editorNode): Node(editorNode)
+CompositorNode::CompositorNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void CompositorNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void CompositorNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *imageSocket = this->getInputSocket(0);
 	InputSocket *alphaSocket = this->getInputSocket(1);
@@ -39,6 +40,6 @@ void CompositorNode::convertToOperations(ExecutionSystem *graph, CompositorConte
 		imageSocket->relinkConnections(colourAlphaProg->getInputSocket(0));
 		alphaSocket->relinkConnections(colourAlphaProg->getInputSocket(1));
 		graph->addOperation(colourAlphaProg);
-		addPreviewOperation(graph, colourAlphaProg->getInputSocket(0), 5);
+		addPreviewOperation(graph, colourAlphaProg->getInputSocket(0));
 	}
 }
diff --git a/source/blender/compositor/nodes/COM_CompositorNode.h b/source/blender/compositor/nodes/COM_CompositorNode.h
index e77d1d2f225..585dae7761e 100644
--- a/source/blender/compositor/nodes/COM_CompositorNode.h
+++ b/source/blender/compositor/nodes/COM_CompositorNode.h
@@ -26,12 +26,12 @@
 #include "COM_Node.h"
 #include "DNA_node_types.h"
 /**
-  * @brief CompositorNode
-  * @ingroup Node
-  */
+ * @brief CompositorNode
+ * @ingroup Node
+ */
 class CompositorNode : public Node {
 public:
 	CompositorNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 #endif
diff --git a/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp b/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
index 0b4326a17ca..70aeee8fc27 100644
--- a/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
+++ b/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
@@ -24,7 +24,7 @@
 #include "COM_ConvertKeyToPremulOperation.h"
 #include "COM_ExecutionSystem.h"
 
-void ConvertAlphaNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void ConvertAlphaNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	NodeOperation *operation = NULL;
 	bNode *node = this->getbNode();
diff --git a/source/blender/compositor/nodes/COM_ConvertAlphaNode.h b/source/blender/compositor/nodes/COM_ConvertAlphaNode.h
index 2e3fe743f4e..d9077c23a02 100644
--- a/source/blender/compositor/nodes/COM_ConvertAlphaNode.h
+++ b/source/blender/compositor/nodes/COM_ConvertAlphaNode.h
@@ -25,13 +25,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief ConvertAlphaNode
-  * @ingroup Node
-  */
-class ConvertAlphaNode: public Node {
+ * @brief ConvertAlphaNode
+ * @ingroup Node
+ */
+class ConvertAlphaNode : public Node {
 public:
-	ConvertAlphaNode(bNode *editorNode) :Node(editorNode) {}
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	ConvertAlphaNode(bNode *editorNode) : Node(editorNode) {}
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_CropNode.cpp b/source/blender/compositor/nodes/COM_CropNode.cpp
index c58fcc874cb..b80a3e088f2 100644
--- a/source/blender/compositor/nodes/COM_CropNode.cpp
+++ b/source/blender/compositor/nodes/COM_CropNode.cpp
@@ -26,12 +26,13 @@
 
 CropNode::CropNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void CropNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void CropNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	bNode *node = getbNode();
-	NodeTwoXYs *cropSettings = (NodeTwoXYs*)node->storage;
+	NodeTwoXYs *cropSettings = (NodeTwoXYs *)node->storage;
 	bool relative = (bool)node->custom2;
 	bool cropImage = (bool)node->custom1;
 	CropBaseOperation *operation;
diff --git a/source/blender/compositor/nodes/COM_CropNode.h b/source/blender/compositor/nodes/COM_CropNode.h
index 0bdfffc8fec..44fdeecc180 100644
--- a/source/blender/compositor/nodes/COM_CropNode.h
+++ b/source/blender/compositor/nodes/COM_CropNode.h
@@ -25,10 +25,10 @@
 
 #include "COM_Node.h"
 
-class CropNode: public Node {
+class CropNode : public Node {
 public:
 	CropNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_DefocusNode.cpp b/source/blender/compositor/nodes/COM_DefocusNode.cpp
index e4e19fdbe27..d1f90b490ad 100644
--- a/source/blender/compositor/nodes/COM_DefocusNode.cpp
+++ b/source/blender/compositor/nodes/COM_DefocusNode.cpp
@@ -33,16 +33,17 @@
 #include "COM_SetValueOperation.h"
 #include "COM_GammaCorrectOperation.h"
 
-DefocusNode::DefocusNode(bNode *editorNode): Node(editorNode)
+DefocusNode::DefocusNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void DefocusNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void DefocusNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	bNode *node = this->getbNode();
-	Scene *scene = (Scene*)node->id;
-	Object *camob = (scene)? scene->camera: NULL;
-	NodeDefocus *data = (NodeDefocus*)node->storage;
+	Scene *scene = (Scene *)node->id;
+	Object *camob = (scene) ? scene->camera : NULL;
+	NodeDefocus *data = (NodeDefocus *)node->storage;
 
 	NodeOperation *radiusOperation;
 	if (data->no_zbuf) {
@@ -74,11 +75,11 @@ void DefocusNode::convertToOperations(ExecutionSystem *graph, CompositorContext
 	}
 	
 	BokehImageOperation *bokeh = new BokehImageOperation();
-	NodeBokehImage * bokehdata = new NodeBokehImage();
+	NodeBokehImage *bokehdata = new NodeBokehImage();
 	bokehdata->angle = data->rotation;
 	bokehdata->rounding = 0.0f;
 	bokehdata->flaps = data->bktype;
-	if (data->bktype<3) {
+	if (data->bktype < 3) {
 		bokehdata->flaps = 5;
 		bokehdata->rounding = 1.0f;
 	}
@@ -96,8 +97,8 @@ void DefocusNode::convertToOperations(ExecutionSystem *graph, CompositorContext
 	addLink(graph, bokeh->getOutputSocket(), operation->getInputSocket(1));
 	addLink(graph, radiusOperation->getOutputSocket(), operation->getInputSocket(2));
 	if (data->gamco) {
-		GammaCorrectOperation * correct = new GammaCorrectOperation();
-		GammaUncorrectOperation * inverse = new GammaUncorrectOperation();
+		GammaCorrectOperation *correct = new GammaCorrectOperation();
+		GammaUncorrectOperation *inverse = new GammaUncorrectOperation();
 		this->getInputSocket(0)->relinkConnections(correct->getInputSocket(0), 0, graph);
 		addLink(graph, correct->getOutputSocket(), operation->getInputSocket(0));
 		addLink(graph, operation->getOutputSocket(), inverse->getInputSocket(0));
diff --git a/source/blender/compositor/nodes/COM_DefocusNode.h b/source/blender/compositor/nodes/COM_DefocusNode.h
index d52ee3da77b..a3cffbd98c4 100644
--- a/source/blender/compositor/nodes/COM_DefocusNode.h
+++ b/source/blender/compositor/nodes/COM_DefocusNode.h
@@ -26,14 +26,14 @@
 #include "COM_Node.h"
 
 /**
-  * @brief DefocusNode
-  * @ingroup Node
-  */
+ * @brief DefocusNode
+ * @ingroup Node
+ */
 
-class DefocusNode: public Node {
+class DefocusNode : public Node {
 public:
 	DefocusNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp b/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
index c26fb4e5c5d..6dca049a6ae 100644
--- a/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
@@ -25,10 +25,12 @@
 #include "COM_DifferenceMatteOperation.h"
 #include "COM_SetAlphaOperation.h"
 
-DifferenceMatteNode::DifferenceMatteNode(bNode *editorNode): Node(editorNode)
-{}
+DifferenceMatteNode::DifferenceMatteNode(bNode *editorNode) : Node(editorNode)
+{
+	/* pass */
+}
 
-void DifferenceMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void DifferenceMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *inputSocket = this->getInputSocket(0);
 	InputSocket *inputSocket2 = this->getInputSocket(1);
@@ -36,18 +38,18 @@ void DifferenceMatteNode::convertToOperations(ExecutionSystem *graph, Compositor
 	OutputSocket *outputSocketMatte = this->getOutputSocket(1);
 	bNode *editorNode = this->getbNode();
 
-	DifferenceMatteOperation * operationSet = new DifferenceMatteOperation();
-	operationSet->setSettings((NodeChroma*)editorNode->storage);
+	DifferenceMatteOperation *operationSet = new DifferenceMatteOperation();
+	operationSet->setSettings((NodeChroma *)editorNode->storage);
 	inputSocket->relinkConnections(operationSet->getInputSocket(0), 0, graph);
 	inputSocket2->relinkConnections(operationSet->getInputSocket(1), 1, graph);
 
 	outputSocketMatte->relinkConnections(operationSet->getOutputSocket(0));
 	graph->addOperation(operationSet);
 
-	SetAlphaOperation * operation = new SetAlphaOperation();
+	SetAlphaOperation *operation = new SetAlphaOperation();
 	addLink(graph, operationSet->getInputSocket(0)->getConnection()->getFromSocket(), operation->getInputSocket(0));
 	addLink(graph, operationSet->getOutputSocket(), operation->getInputSocket(1));
 	outputSocketImage->relinkConnections(operation->getOutputSocket());
 	graph->addOperation(operation);
-	addPreviewOperation(graph, operation->getOutputSocket(), 5);
+	addPreviewOperation(graph, operation->getOutputSocket());
 }
diff --git a/source/blender/compositor/nodes/COM_DifferenceMatteNode.h b/source/blender/compositor/nodes/COM_DifferenceMatteNode.h
index 3b270ebc3b7..faaf235bf34 100644
--- a/source/blender/compositor/nodes/COM_DifferenceMatteNode.h
+++ b/source/blender/compositor/nodes/COM_DifferenceMatteNode.h
@@ -26,14 +26,14 @@
 #include "COM_Node.h"
 
 /**
-  * @brief DifferenceMatteNode
-  * @ingroup Node
-  */
+ * @brief DifferenceMatteNode
+ * @ingroup Node
+ */
 class DifferenceMatteNode : public Node
 {
 public:
 	DifferenceMatteNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif // COM_DifferenceMatteNODE_H
diff --git a/source/blender/compositor/nodes/COM_DilateErodeNode.cpp b/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
index cc96f672ebd..fbec1522e27 100644
--- a/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
+++ b/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
@@ -25,25 +25,28 @@
 #include "COM_ExecutionSystem.h"
 #include "COM_DilateErodeOperation.h"
 #include "COM_AntiAliasOperation.h"
+#include "COM_GaussianAlphaXBlurOperation.h"
+#include "COM_GaussianAlphaYBlurOperation.h"
 #include "BLI_math.h"
 
-DilateErodeNode::DilateErodeNode(bNode *editorNode): Node(editorNode)
+DilateErodeNode::DilateErodeNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void DilateErodeNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void DilateErodeNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	
 	bNode *editorNode = this->getbNode();
-	if (editorNode->custom1 == CMP_NODE_DILATEERODE_DISTANCE) {
-		DilateErodeDistanceOperation *operation = new DilateErodeDistanceOperation();
+	if (editorNode->custom1 == CMP_NODE_DILATEERODE_DISTANCE_THRESH) {
+		DilateErodeThresholdOperation *operation = new DilateErodeThresholdOperation();
 		operation->setDistance(editorNode->custom2);
 		operation->setInset(editorNode->custom3);
 		
 		this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
 	
 		if (editorNode->custom3 < 2.0f) {
-			AntiAliasOperation * antiAlias = new AntiAliasOperation();
+			AntiAliasOperation *antiAlias = new AntiAliasOperation();
 			addLink(graph, operation->getOutputSocket(), antiAlias->getInputSocket(0));
 			this->getOutputSocket(0)->relinkConnections(antiAlias->getOutputSocket(0));
 			graph->addOperation(antiAlias);
@@ -53,16 +56,78 @@ void DilateErodeNode::convertToOperations(ExecutionSystem *graph, CompositorCont
 		}
 		graph->addOperation(operation);
 	}
+	else if (editorNode->custom1 == CMP_NODE_DILATEERODE_DISTANCE) {
+		if (editorNode->custom2 > 0) {
+			DilateDistanceOperation *operation = new DilateDistanceOperation();
+			operation->setDistance(editorNode->custom2);
+			this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
+			this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
+			graph->addOperation(operation);
+		}
+		else {
+			ErodeDistanceOperation *operation = new ErodeDistanceOperation();
+			operation->setDistance(-editorNode->custom2);
+			this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
+			this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
+			graph->addOperation(operation);
+		}
+	}
+	else if (editorNode->custom1 == CMP_NODE_DILATEERODE_DISTANCE_FEATHER) {
+		/* this uses a modified gaussian blur function otherwise its far too slow */
+		CompositorQuality quality = context->getQuality();
+
+		/* initialize node data */
+		NodeBlurData *data = (NodeBlurData *)&this->alpha_blur;
+		memset(data, 0, sizeof(*data));
+		data->filtertype = R_FILTER_GAUSS;
+
+		if (editorNode->custom2 > 0) {
+			data->sizex = data->sizey = editorNode->custom2;
+		}
+		else {
+			data->sizex = data->sizey = -editorNode->custom2;
+
+		}
+
+		GaussianAlphaXBlurOperation *operationx = new GaussianAlphaXBlurOperation();
+		operationx->setData(data);
+		operationx->setQuality(quality);
+		this->getInputSocket(0)->relinkConnections(operationx->getInputSocket(0), 0, graph);
+		// this->getInputSocket(1)->relinkConnections(operationx->getInputSocket(1), 1, graph); // no size input yet
+		graph->addOperation(operationx);
+		GaussianAlphaYBlurOperation *operationy = new GaussianAlphaYBlurOperation();
+		operationy->setData(data);
+		operationy->setQuality(quality);
+		this->getOutputSocket(0)->relinkConnections(operationy->getOutputSocket());
+		graph->addOperation(operationy);
+		addLink(graph, operationx->getOutputSocket(), operationy->getInputSocket(0));
+		// addLink(graph, operationx->getInputSocket(1)->getConnection()->getFromSocket(), operationy->getInputSocket(1)); // no size input yet
+		addPreviewOperation(graph, operationy->getOutputSocket());
+
+		/* TODO? */
+		/* see gaussian blue node for original usage */
+#if 0
+		if (!connectedSizeSocket) {
+			operationx->setSize(size);
+			operationy->setSize(size);
+		}
+#else
+		operationx->setSize(1.0f);
+		operationy->setSize(1.0f);
+#endif
+		operationx->setSubtract(editorNode->custom2 < 0);
+		operationy->setSubtract(editorNode->custom2 < 0);
+	}
 	else {
 		if (editorNode->custom2 > 0) {
-			DilateStepOperation * operation = new DilateStepOperation();
+			DilateStepOperation *operation = new DilateStepOperation();
 			operation->setIterations(editorNode->custom2);
 			this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
 			this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
 			graph->addOperation(operation);
 		}
 		else {
-			ErodeStepOperation * operation = new ErodeStepOperation();
+			ErodeStepOperation *operation = new ErodeStepOperation();
 			operation->setIterations(-editorNode->custom2);
 			this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
 			this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
diff --git a/source/blender/compositor/nodes/COM_DilateErodeNode.h b/source/blender/compositor/nodes/COM_DilateErodeNode.h
index 496bd0203dd..ac374d7375b 100644
--- a/source/blender/compositor/nodes/COM_DilateErodeNode.h
+++ b/source/blender/compositor/nodes/COM_DilateErodeNode.h
@@ -26,13 +26,14 @@
 #include "COM_Node.h"
 
 /**
-  * @brief DilateErodeNode
-  * @ingroup Node
-  */
-class DilateErodeNode: public Node {
+ * @brief DilateErodeNode
+ * @ingroup Node
+ */
+class DilateErodeNode : public Node {
+	NodeBlurData alpha_blur; /* only used for blurring alpha, since the dilate/erode node doesnt have this */
 public:
 	DilateErodeNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp b/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
index d63fbbdb092..dee0e6a88da 100644
--- a/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
+++ b/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
@@ -26,13 +26,14 @@
 #include "COM_ExecutionSystem.h"
 #include "COM_DirectionalBlurOperation.h"
 
-DirectionalBlurNode::DirectionalBlurNode(bNode *editorNode): Node(editorNode)
+DirectionalBlurNode::DirectionalBlurNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void DirectionalBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void DirectionalBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
-	NodeDBlurData *data = (NodeDBlurData*)this->getbNode()->storage;
+	NodeDBlurData *data = (NodeDBlurData *)this->getbNode()->storage;
 	DirectionalBlurOperation *operation = new DirectionalBlurOperation();
 	operation->setQuality(context->getQuality());
 	operation->setData(data);
diff --git a/source/blender/compositor/nodes/COM_DirectionalBlurNode.h b/source/blender/compositor/nodes/COM_DirectionalBlurNode.h
index 1cf36fdeae7..d387ecf81dc 100644
--- a/source/blender/compositor/nodes/COM_DirectionalBlurNode.h
+++ b/source/blender/compositor/nodes/COM_DirectionalBlurNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief DirectionalBlurNode
-  * @ingroup Node
-  */
-class DirectionalBlurNode: public Node {
+ * @brief DirectionalBlurNode
+ * @ingroup Node
+ */
+class DirectionalBlurNode : public Node {
 public:
 	DirectionalBlurNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_DisplaceNode.cpp b/source/blender/compositor/nodes/COM_DisplaceNode.cpp
index 9604db378bc..41fbfd61981 100644
--- a/source/blender/compositor/nodes/COM_DisplaceNode.cpp
+++ b/source/blender/compositor/nodes/COM_DisplaceNode.cpp
@@ -24,11 +24,12 @@
 #include "COM_DisplaceSimpleOperation.h"
 #include "COM_ExecutionSystem.h"
 
-DisplaceNode::DisplaceNode(bNode *editorNode): Node(editorNode)
+DisplaceNode::DisplaceNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void DisplaceNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void DisplaceNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	NodeOperation *operation;
 	if (context->getQuality() == COM_QUALITY_LOW)
diff --git a/source/blender/compositor/nodes/COM_DisplaceNode.h b/source/blender/compositor/nodes/COM_DisplaceNode.h
index 3451f05dd1f..ecbe07b06b9 100644
--- a/source/blender/compositor/nodes/COM_DisplaceNode.h
+++ b/source/blender/compositor/nodes/COM_DisplaceNode.h
@@ -31,6 +31,6 @@
 class DisplaceNode : public Node {
 public:
 	DisplaceNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 #endif
diff --git a/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp b/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
index d7b4e481ec2..d6730ef6a00 100644
--- a/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
@@ -24,8 +24,10 @@
 #include "COM_DistanceMatteOperation.h"
 #include "COM_SetAlphaOperation.h"
 
-DistanceMatteNode::DistanceMatteNode(bNode *editorNode): Node(editorNode)
-{}
+DistanceMatteNode::DistanceMatteNode(bNode *editorNode) : Node(editorNode)
+{
+	/* pass */
+}
 
 void DistanceMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
@@ -36,7 +38,7 @@ void DistanceMatteNode::convertToOperations(ExecutionSystem *graph, CompositorCo
 
 	DistanceMatteOperation *operation = new DistanceMatteOperation();
 	bNode *editorsnode = getbNode();
-	operation->setSettings((NodeChroma*)editorsnode->storage);
+	operation->setSettings((NodeChroma *)editorsnode->storage);
 
 	inputSocketImage->relinkConnections(operation->getInputSocket(0), 0, graph);
 	inputSocketKey->relinkConnections(operation->getInputSocket(1), 1, graph);
@@ -52,7 +54,7 @@ void DistanceMatteNode::convertToOperations(ExecutionSystem *graph, CompositorCo
 	addLink(graph, operation->getOutputSocket(), operationAlpha->getInputSocket(1));
 
 	graph->addOperation(operationAlpha);
-	addPreviewOperation(graph, operationAlpha->getOutputSocket(), 9);
+	addPreviewOperation(graph, operationAlpha->getOutputSocket());
 
 	if (outputSocketImage->isConnected()) {
 		outputSocketImage->relinkConnections(operationAlpha->getOutputSocket());
diff --git a/source/blender/compositor/nodes/COM_DistanceMatteNode.h b/source/blender/compositor/nodes/COM_DistanceMatteNode.h
index 740eb767a71..42582ef10a0 100644
--- a/source/blender/compositor/nodes/COM_DistanceMatteNode.h
+++ b/source/blender/compositor/nodes/COM_DistanceMatteNode.h
@@ -25,9 +25,9 @@
 #include "COM_Node.h"
 
 /**
-  * @brief DistanceMatteNode
-  * @ingroup Node
-  */
+ * @brief DistanceMatteNode
+ * @ingroup Node
+ */
 class DistanceMatteNode : public Node
 {
 public:
diff --git a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp b/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
index ab9e101dad8..57c319e7630 100644
--- a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
+++ b/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
@@ -25,11 +25,12 @@
 #include "DNA_scene_types.h"
 #include "COM_ExecutionSystem.h"
 
-DoubleEdgeMaskNode::DoubleEdgeMaskNode(bNode *editorNode): Node(editorNode)
+DoubleEdgeMaskNode::DoubleEdgeMaskNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void DoubleEdgeMaskNode::convertToOperations(ExecutionSystem *system, CompositorContext * context)
+void DoubleEdgeMaskNode::convertToOperations(ExecutionSystem *system, CompositorContext *context)
 {
 	DoubleEdgeMaskOperation *operation;
 	bNode *bnode = this->getbNode();
diff --git a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h b/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h
index 2c52e988946..ebcddc06b05 100644
--- a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h
+++ b/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief DoubleEdgeMaskNode
-  * @ingroup Node
-  */
-class DoubleEdgeMaskNode: public Node {
+ * @brief DoubleEdgeMaskNode
+ * @ingroup Node
+ */
+class DoubleEdgeMaskNode : public Node {
 public:
 	DoubleEdgeMaskNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp b/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
index f5003c4be94..23410c6a115 100644
--- a/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
+++ b/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
@@ -25,15 +25,16 @@
 #include "COM_EllipseMaskOperation.h"
 #include "COM_ExecutionSystem.h"
 
-EllipseMaskNode::EllipseMaskNode(bNode *editorNode): Node(editorNode)
+EllipseMaskNode::EllipseMaskNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void EllipseMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void EllipseMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	EllipseMaskOperation *operation;
 	operation = new EllipseMaskOperation();
-	operation->setData((NodeEllipseMask*)this->getbNode()->storage);
+	operation->setData((NodeEllipseMask *)this->getbNode()->storage);
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
 	this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
diff --git a/source/blender/compositor/nodes/COM_EllipseMaskNode.h b/source/blender/compositor/nodes/COM_EllipseMaskNode.h
index be6956e30b5..3e534451b13 100644
--- a/source/blender/compositor/nodes/COM_EllipseMaskNode.h
+++ b/source/blender/compositor/nodes/COM_EllipseMaskNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief EllipseMaskNode
-  * @ingroup Node
-  */
-class EllipseMaskNode: public Node {
+ * @brief EllipseMaskNode
+ * @ingroup Node
+ */
+class EllipseMaskNode : public Node {
 public:
 	EllipseMaskNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_FilterNode.cpp b/source/blender/compositor/nodes/COM_FilterNode.cpp
index bdba69dc47d..23f87805821 100644
--- a/source/blender/compositor/nodes/COM_FilterNode.cpp
+++ b/source/blender/compositor/nodes/COM_FilterNode.cpp
@@ -27,11 +27,12 @@
 #include "BKE_node.h"
 #include "COM_MixBlendOperation.h"
 
-FilterNode::FilterNode(bNode *editorNode): Node(editorNode)
+FilterNode::FilterNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void FilterNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void FilterNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *inputSocket = this->getInputSocket(0);
 	InputSocket *inputImageSocket = this->getInputSocket(1);
@@ -39,44 +40,44 @@ void FilterNode::convertToOperations(ExecutionSystem *graph, CompositorContext *
 	ConvolutionFilterOperation *operation = NULL;
 	
 	switch (this->getbNode()->custom1) {
-	case CMP_FILT_SOFT:
-		operation = new ConvolutionFilterOperation();
-		operation->set3x3Filter(1/16.0f, 2/16.0f, 1/16.0f, 2/16.0f, 4/16.0f, 2/16.0f, 1/16.0f, 2/16.0f, 1/16.0f);
-		break;
-	case CMP_FILT_SHARP:
-		operation = new ConvolutionFilterOperation();
-		operation->set3x3Filter(-1,-1,-1,-1,9,-1,-1,-1,-1);
-		break;
-	case CMP_FILT_LAPLACE:
-		operation = new ConvolutionFilterOperation();
-		operation->set3x3Filter(-1/8.0f, -1/8.0f, -1/8.0f, -1/8.0f, 1.0f, -1/8.0f, -1/8.0f, -1/8.0f, -1/8.0f);
-		break;
-	case CMP_FILT_SOBEL:
-		operation = new ConvolutionEdgeFilterOperation();
-		operation->set3x3Filter(1,2,1,0,0,0,-1,-2,-1);
-		break;
-	case CMP_FILT_PREWITT:
-		operation = new ConvolutionEdgeFilterOperation();
-		operation->set3x3Filter(1,1,1,0,0,0,-1,-1,-1);
-		break;
-	case CMP_FILT_KIRSCH:
-		operation = new ConvolutionEdgeFilterOperation();
-		operation->set3x3Filter(5,5,5,-3,-3,-3,-2,-2,-2);
-		break;
-	case CMP_FILT_SHADOW:
-		operation = new ConvolutionFilterOperation();
-		operation->set3x3Filter(1,2,1,0,1,0,-1,-2,-1);
-		break;
-	default:
-		operation = new ConvolutionFilterOperation();
-		operation->set3x3Filter(0,0,0,0,1,0,0,0,0);
-		break;
+		case CMP_FILT_SOFT:
+			operation = new ConvolutionFilterOperation();
+			operation->set3x3Filter(1 / 16.0f, 2 / 16.0f, 1 / 16.0f, 2 / 16.0f, 4 / 16.0f, 2 / 16.0f, 1 / 16.0f, 2 / 16.0f, 1 / 16.0f);
+			break;
+		case CMP_FILT_SHARP:
+			operation = new ConvolutionFilterOperation();
+			operation->set3x3Filter(-1, -1, -1, -1, 9, -1, -1, -1, -1);
+			break;
+		case CMP_FILT_LAPLACE:
+			operation = new ConvolutionFilterOperation();
+			operation->set3x3Filter(-1 / 8.0f, -1 / 8.0f, -1 / 8.0f, -1 / 8.0f, 1.0f, -1 / 8.0f, -1 / 8.0f, -1 / 8.0f, -1 / 8.0f);
+			break;
+		case CMP_FILT_SOBEL:
+			operation = new ConvolutionEdgeFilterOperation();
+			operation->set3x3Filter(1, 2, 1, 0, 0, 0, -1, -2, -1);
+			break;
+		case CMP_FILT_PREWITT:
+			operation = new ConvolutionEdgeFilterOperation();
+			operation->set3x3Filter(1, 1, 1, 0, 0, 0, -1, -1, -1);
+			break;
+		case CMP_FILT_KIRSCH:
+			operation = new ConvolutionEdgeFilterOperation();
+			operation->set3x3Filter(5, 5, 5, -3, -3, -3, -2, -2, -2);
+			break;
+		case CMP_FILT_SHADOW:
+			operation = new ConvolutionFilterOperation();
+			operation->set3x3Filter(1, 2, 1, 0, 1, 0, -1, -2, -1);
+			break;
+		default:
+			operation = new ConvolutionFilterOperation();
+			operation->set3x3Filter(0, 0, 0, 0, 1, 0, 0, 0, 0);
+			break;
 	}
 	
 	inputImageSocket->relinkConnections(operation->getInputSocket(0), 1, graph);
 	inputSocket->relinkConnections(operation->getInputSocket(1), 0, graph);
 	outputSocket->relinkConnections(operation->getOutputSocket());
-	addPreviewOperation(graph, operation->getOutputSocket(0), 5);
+	addPreviewOperation(graph, operation->getOutputSocket(0));
 	
 	graph->addOperation(operation);
 }
diff --git a/source/blender/compositor/nodes/COM_FilterNode.h b/source/blender/compositor/nodes/COM_FilterNode.h
index 080682dcefe..17f590b9cfc 100644
--- a/source/blender/compositor/nodes/COM_FilterNode.h
+++ b/source/blender/compositor/nodes/COM_FilterNode.h
@@ -26,14 +26,14 @@
 #include "COM_Node.h"
 
 /**
-  * @brief FilterNode
-  * @ingroup Node
-  */
+ * @brief FilterNode
+ * @ingroup Node
+ */
 class FilterNode : public Node
 {
 public:
 	FilterNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif // COM_FILTERNODE_H
diff --git a/source/blender/compositor/nodes/COM_FlipNode.cpp b/source/blender/compositor/nodes/COM_FlipNode.cpp
index 0830c757833..a50297aae1a 100644
--- a/source/blender/compositor/nodes/COM_FlipNode.cpp
+++ b/source/blender/compositor/nodes/COM_FlipNode.cpp
@@ -27,26 +27,27 @@
 
 FlipNode::FlipNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void FlipNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void FlipNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *inputSocket = this->getInputSocket(0);
 	OutputSocket *outputSocket = this->getOutputSocket(0);
 	FlipOperation *operation = new FlipOperation();
 	switch (this->getbNode()->custom1) {
-	case 0: /// @TODO: I didn't find any constants in the old implementation, should I introduce them.
-		operation->setFlipX(true);
-		operation->setFlipY(false);
-		break;
-	case 1:
-		operation->setFlipX(false);
-		operation->setFlipY(true);
-		break;
-	case 2:
-		operation->setFlipX(true);
-		operation->setFlipY(true);
-		break;
+		case 0: /// @TODO: I didn't find any constants in the old implementation, should I introduce them.
+			operation->setFlipX(true);
+			operation->setFlipY(false);
+			break;
+		case 1:
+			operation->setFlipX(false);
+			operation->setFlipY(true);
+			break;
+		case 2:
+			operation->setFlipX(true);
+			operation->setFlipY(true);
+			break;
 	}
 	
 	inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
diff --git a/source/blender/compositor/nodes/COM_FlipNode.h b/source/blender/compositor/nodes/COM_FlipNode.h
index 53bcc504f80..1e372a80b57 100644
--- a/source/blender/compositor/nodes/COM_FlipNode.h
+++ b/source/blender/compositor/nodes/COM_FlipNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief FlipNode
-  * @ingroup Node
-  */
-class FlipNode: public Node {
+ * @brief FlipNode
+ * @ingroup Node
+ */
+class FlipNode : public Node {
 public:
 	FlipNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_GammaNode.cpp b/source/blender/compositor/nodes/COM_GammaNode.cpp
index 58b05607618..52699c83bf9 100644
--- a/source/blender/compositor/nodes/COM_GammaNode.cpp
+++ b/source/blender/compositor/nodes/COM_GammaNode.cpp
@@ -25,11 +25,12 @@
 #include "COM_GammaOperation.h"
 #include "COM_ExecutionSystem.h"
 
-GammaNode::GammaNode(bNode *editorNode): Node(editorNode)
+GammaNode::GammaNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void GammaNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void GammaNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	GammaOperation *operation = new GammaOperation();
 	
diff --git a/source/blender/compositor/nodes/COM_GammaNode.h b/source/blender/compositor/nodes/COM_GammaNode.h
index 121d99cbd57..d4e1f0abd5a 100644
--- a/source/blender/compositor/nodes/COM_GammaNode.h
+++ b/source/blender/compositor/nodes/COM_GammaNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief GammaNode
-  * @ingroup Node
-  */
-class GammaNode: public Node {
+ * @brief GammaNode
+ * @ingroup Node
+ */
+class GammaNode : public Node {
 public:
 	GammaNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_GlareNode.cpp b/source/blender/compositor/nodes/COM_GlareNode.cpp
index 9382e726d76..7b34fa4d286 100644
--- a/source/blender/compositor/nodes/COM_GlareNode.cpp
+++ b/source/blender/compositor/nodes/COM_GlareNode.cpp
@@ -22,111 +22,63 @@
 
 #include "COM_GlareNode.h"
 #include "DNA_node_types.h"
-#include "COM_FogGlowImageOperation.h"
 #include "COM_GlareThresholdOperation.h"
 #include "COM_GlareSimpleStarOperation.h"
 #include "COM_GlareStreaksOperation.h"
 #include "COM_SetValueOperation.h"
-#include "COM_MixBlendOperation.h"
+#include "COM_MixGlareOperation.h"
 #include "COM_FastGaussianBlurOperation.h"
+#include "COM_GlareGhostOperation.h"
+#include "COM_GlareFogGlowOperation.h"
 
-GlareNode::GlareNode(bNode *editorNode): Node(editorNode)
+GlareNode::GlareNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void GlareNode::convertToOperations(ExecutionSystem *system, CompositorContext * context)\
-{
+void GlareNode::convertToOperations(ExecutionSystem *system, CompositorContext *context) \
+	{
 	bNode *node = this->getbNode();
-	NodeGlare *glare = (NodeGlare*)node->storage;
-	
-	switch (glare->type) {
-	
-	default:
-	case 2: // streaks
-		{
-			GlareThresholdOperation *thresholdOperation = new GlareThresholdOperation();
-			GlareStreaksOperation * glareoperation = new GlareStreaksOperation();
-			SetValueOperation * mixvalueoperation = new SetValueOperation();
-			MixBlendOperation * mixoperation = new MixBlendOperation();
-	
-			this->getInputSocket(0)->relinkConnections(thresholdOperation->getInputSocket(0), 0, system);
-			addLink(system, thresholdOperation->getOutputSocket(), glareoperation->getInputSocket(0));
-			addLink(system, mixvalueoperation->getOutputSocket(), mixoperation->getInputSocket(0));
-			addLink(system, glareoperation->getOutputSocket(), mixoperation->getInputSocket(2));
-			addLink(system, thresholdOperation->getInputSocket(0)->getConnection()->getFromSocket(), mixoperation->getInputSocket(1));
-			this->getOutputSocket()->relinkConnections(mixoperation->getOutputSocket());
-	
-			thresholdOperation->setThreshold(glare->threshold);
-			glareoperation->setGlareSettings(glare);
-			mixvalueoperation->setValue(0.5f+glare->mix*0.5f);
-			mixoperation->setResolutionInputSocketIndex(1);
+	NodeGlare *glare = (NodeGlare *)node->storage;
 	
-			system->addOperation(glareoperation);
-			system->addOperation(thresholdOperation);
-			system->addOperation(mixvalueoperation);
-			system->addOperation(mixoperation);
-		}	
-		break;
-	case 1: // fog glow
-		{
-			GlareThresholdOperation *thresholdOperation = new GlareThresholdOperation();
-			FastGaussianBlurOperation* bluroperation = new FastGaussianBlurOperation();
-			SetValueOperation * valueoperation = new SetValueOperation();
-			SetValueOperation * mixvalueoperation = new SetValueOperation();
-			MixBlendOperation * mixoperation = new MixBlendOperation();
-			mixoperation->setResolutionInputSocketIndex(1);
-			this->getInputSocket(0)->relinkConnections(thresholdOperation->getInputSocket(0), 0, system);
-			addLink(system, thresholdOperation->getOutputSocket(), bluroperation->getInputSocket(0));
-			addLink(system, valueoperation->getOutputSocket(), bluroperation->getInputSocket(1));
-			addLink(system, mixvalueoperation->getOutputSocket(), mixoperation->getInputSocket(0));
-			addLink(system, bluroperation->getOutputSocket(), mixoperation->getInputSocket(2));
-			addLink(system, thresholdOperation->getInputSocket(0)->getConnection()->getFromSocket(), mixoperation->getInputSocket(1));
+	GlareBaseOperation *glareoperation = NULL;
 	
-			thresholdOperation->setThreshold(glare->threshold);
-			NodeBlurData * data = new NodeBlurData();
-			data->relative = 0;
-			data->sizex = glare->size;
-			data->sizey = glare->size;
-			bluroperation->setData(data);
-			bluroperation->deleteDataWhenFinished();
-			bluroperation->setQuality(context->getQuality());
-			valueoperation->setValue(1.0f);
-			mixvalueoperation->setValue(0.5f+glare->mix*0.5f);
-			this->getOutputSocket()->relinkConnections(mixoperation->getOutputSocket());
+	switch (glare->type) {
 	
-			system->addOperation(bluroperation);
-			system->addOperation(thresholdOperation);
-			system->addOperation(mixvalueoperation);
-			system->addOperation(valueoperation);
-			system->addOperation(mixoperation);
-		}
-		break;
-		
-	case 0: // simple star
-		{
-			GlareThresholdOperation *thresholdOperation = new GlareThresholdOperation();
-			GlareSimpleStarOperation * glareoperation = new GlareSimpleStarOperation();
-			SetValueOperation * mixvalueoperation = new SetValueOperation();
-			MixBlendOperation * mixoperation = new MixBlendOperation();
-
-			this->getInputSocket(0)->relinkConnections(thresholdOperation->getInputSocket(0), 0, system);
-			addLink(system, thresholdOperation->getOutputSocket(), glareoperation->getInputSocket(0));
-			addLink(system, mixvalueoperation->getOutputSocket(), mixoperation->getInputSocket(0));
-			addLink(system, glareoperation->getOutputSocket(), mixoperation->getInputSocket(2));
-			addLink(system, thresholdOperation->getInputSocket(0)->getConnection()->getFromSocket(), mixoperation->getInputSocket(1));
-			this->getOutputSocket()->relinkConnections(mixoperation->getOutputSocket());
+		default:
+		case 3:
+			glareoperation = new GlareGhostOperation();
+			break;
+		case 2: // streaks
+			glareoperation = new GlareStreaksOperation();
+			break;
+		case 1: // fog glow
+			glareoperation = new GlareFogGlowOperation();
+			break;
+		case 0: // simple star
+			glareoperation = new GlareSimpleStarOperation();
+			break;
+	}
+	GlareThresholdOperation *thresholdOperation = new GlareThresholdOperation();
+	SetValueOperation *mixvalueoperation = new SetValueOperation();
+	MixGlareOperation *mixoperation = new MixGlareOperation();
+	mixoperation->getInputSocket(2)->setResizeMode(COM_SC_FIT);
 
-			thresholdOperation->setThreshold(glare->threshold);
-			glareoperation->setGlareSettings(glare);
-			mixvalueoperation->setValue(0.5f+glare->mix*0.5f);
-			mixoperation->setResolutionInputSocketIndex(1);
+	this->getInputSocket(0)->relinkConnections(thresholdOperation->getInputSocket(0), 0, system);
+	addLink(system, thresholdOperation->getOutputSocket(), glareoperation->getInputSocket(0));
+	addLink(system, mixvalueoperation->getOutputSocket(), mixoperation->getInputSocket(0));
+	addLink(system, glareoperation->getOutputSocket(), mixoperation->getInputSocket(2));
+	addLink(system, thresholdOperation->getInputSocket(0)->getConnection()->getFromSocket(), mixoperation->getInputSocket(1));
+	this->getOutputSocket()->relinkConnections(mixoperation->getOutputSocket());
 
+	thresholdOperation->setGlareSettings(glare);
+	glareoperation->setGlareSettings(glare);
+	mixvalueoperation->setValue(0.5f + glare->mix * 0.5f);
+	mixoperation->setResolutionInputSocketIndex(1);
 
-			system->addOperation(glareoperation);
-			system->addOperation(thresholdOperation);
-			system->addOperation(mixvalueoperation);
-			system->addOperation(mixoperation);
-		}
-		break;
+	system->addOperation(glareoperation);
+	system->addOperation(thresholdOperation);
+	system->addOperation(mixvalueoperation);
+	system->addOperation(mixoperation);
+	
 	}
-}
diff --git a/source/blender/compositor/nodes/COM_GlareNode.h b/source/blender/compositor/nodes/COM_GlareNode.h
index 97a75445db7..beb01db733a 100644
--- a/source/blender/compositor/nodes/COM_GlareNode.h
+++ b/source/blender/compositor/nodes/COM_GlareNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief GlareNode
-  * @ingroup Node
-  */
-class GlareNode: public Node {
+ * @brief GlareNode
+ * @ingroup Node
+ */
+class GlareNode : public Node {
 public:
 	GlareNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_GroupNode.cpp b/source/blender/compositor/nodes/COM_GroupNode.cpp
index 076d4f1501a..e5255b6bb87 100644
--- a/source/blender/compositor/nodes/COM_GroupNode.cpp
+++ b/source/blender/compositor/nodes/COM_GroupNode.cpp
@@ -24,50 +24,46 @@
 #include "COM_SocketProxyNode.h"
 #include "COM_ExecutionSystemHelper.h"
 
-GroupNode::GroupNode(bNode *editorNode): Node(editorNode)
+GroupNode::GroupNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void GroupNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void GroupNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
+	/* pass */
 }
 
 void GroupNode::ungroup(ExecutionSystem &system)
 {
-	vector<InputSocket*> &inputsockets = this->getInputSockets();
-	vector<OutputSocket*> &outputsockets = this->getOutputSockets();
+	bNode *bnode = this->getbNode();
+	vector<InputSocket *> &inputsockets = this->getInputSockets();
+	vector<OutputSocket *> &outputsockets = this->getOutputSockets();
 	unsigned int index;
 
 	/* get the node list size _before_ adding proxy nodes, so they are available for linking */
 	int nodes_start = system.getNodes().size();
 
-	for (index = 0 ; index < inputsockets.size();index ++) {
-		InputSocket * inputSocket = inputsockets[index];
+	for (index = 0; index < inputsockets.size(); index++) {
+		InputSocket *inputSocket = inputsockets[index];
 		bNodeSocket *editorInput = inputSocket->getbNodeSocket();
 		if (editorInput->groupsock) {
-			if (inputSocket->isConnected()) {
-				SocketProxyNode * proxy = new SocketProxyNode(this->getbNode(), editorInput, editorInput->groupsock);
-				inputSocket->relinkConnections(proxy->getInputSocket(0), index, &system);
-				ExecutionSystemHelper::addNode(system.getNodes(), proxy);
-			}
-			else {
-				OutputSocketProxyNode * proxy = new OutputSocketProxyNode(this->getbNode(), editorInput, editorInput->groupsock);
-				inputSocket->relinkConnections(proxy->getInputSocket(0), index, &system);
-				ExecutionSystemHelper::addNode(system.getNodes(), proxy);
-			}
+			SocketProxyNode *proxy = new SocketProxyNode(bnode, editorInput, editorInput->groupsock);
+			inputSocket->relinkConnections(proxy->getInputSocket(0), index, &system);
+			ExecutionSystemHelper::addNode(system.getNodes(), proxy);
 		}
 	}
 
-	for (index = 0 ; index < outputsockets.size();index ++) {
-		OutputSocket * outputSocket = outputsockets[index];
+	for (index = 0; index < outputsockets.size(); index++) {
+		OutputSocket *outputSocket = outputsockets[index];
 		bNodeSocket *editorOutput = outputSocket->getbNodeSocket();
-		if (outputSocket->isConnected() && editorOutput->groupsock) {
-			SocketProxyNode * proxy = new SocketProxyNode(this->getbNode(), editorOutput->groupsock, editorOutput);
+		if (editorOutput->groupsock) {
+			SocketProxyNode *proxy = new SocketProxyNode(bnode, editorOutput->groupsock, editorOutput);
 			outputSocket->relinkConnections(proxy->getOutputSocket(0));
 			ExecutionSystemHelper::addNode(system.getNodes(), proxy);
 		}
 	}
 
-	bNodeTree *subtree = (bNodeTree*)this->getbNode()->id;
-	ExecutionSystemHelper::addbNodeTree(system, nodes_start, subtree);
+	bNodeTree *subtree = (bNodeTree *)bnode->id;
+	ExecutionSystemHelper::addbNodeTree(system, nodes_start, subtree, bnode);
 }
diff --git a/source/blender/compositor/nodes/COM_GroupNode.h b/source/blender/compositor/nodes/COM_GroupNode.h
index e35c9cbce33..ba270eaf16c 100644
--- a/source/blender/compositor/nodes/COM_GroupNode.h
+++ b/source/blender/compositor/nodes/COM_GroupNode.h
@@ -27,30 +27,30 @@
 #include "COM_ExecutionSystem.h"
 
 /**
-  * @brief Represents a group node
-  * @ingroup Node
-  */
-class GroupNode: public Node {
+ * @brief Represents a group node
+ * @ingroup Node
+ */
+class GroupNode : public Node {
 public:
 	GroupNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 
 	/**
-	  * @brief check if this node a group node.
-	  * @returns true
-	  */
+	 * @brief check if this node a group node.
+	 * @returns true
+	 */
 	bool isGroupNode() const { return true; }
 
 	/**
-	  * @brief ungroup this group node.
-	  * during ungroup the subtree (internal nodes and links) of the group node
-	  * are added to the ExecutionSystem.
-	  *
-	  * Between the main tree and the subtree proxy nodes will be added
-	  * to translate between InputSocket and OutputSocket
-	  *
-	  * @param system the ExecutionSystem where to add the subtree
-	  */
+	 * @brief ungroup this group node.
+	 * during ungroup the subtree (internal nodes and links) of the group node
+	 * are added to the ExecutionSystem.
+	 *
+	 * Between the main tree and the subtree proxy nodes will be added
+	 * to translate between InputSocket and OutputSocket
+	 *
+	 * @param system the ExecutionSystem where to add the subtree
+	 */
 	void ungroup(ExecutionSystem &system);
 };
 
diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
index ae96a8c9fb8..6057a7f0e6c 100644
--- a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
+++ b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
@@ -33,23 +33,24 @@
 #include "DNA_node_types.h"
 #include "COM_HueSaturationValueCorrectOperation.h"
 
-HueSaturationValueCorrectNode::HueSaturationValueCorrectNode(bNode *editorNode): Node(editorNode)
+HueSaturationValueCorrectNode::HueSaturationValueCorrectNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void HueSaturationValueCorrectNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void HueSaturationValueCorrectNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *valueSocket = this->getInputSocket(0);
 	InputSocket *colourSocket = this->getInputSocket(1);
 	OutputSocket *outputSocket = this->getOutputSocket(0);
 	bNode *editorsnode = getbNode();
-	CurveMapping *storage = (CurveMapping*)editorsnode->storage;
+	CurveMapping *storage = (CurveMapping *)editorsnode->storage;
 	
 	if (colourSocket->isConnected() && outputSocket->isConnected()) {
-		ConvertRGBToHSVOperation * rgbToHSV = new ConvertRGBToHSVOperation();
-		ConvertHSVToRGBOperation * hsvToRGB = new ConvertHSVToRGBOperation();
+		ConvertRGBToHSVOperation *rgbToHSV = new ConvertRGBToHSVOperation();
+		ConvertHSVToRGBOperation *hsvToRGB = new ConvertHSVToRGBOperation();
 		HueSaturationValueCorrectOperation *changeHSV = new HueSaturationValueCorrectOperation();
-		MixBlendOperation * blend = new MixBlendOperation();
+		MixBlendOperation *blend = new MixBlendOperation();
 	
 		colourSocket->relinkConnections(rgbToHSV->getInputSocket(0), 1, graph);
 		addLink(graph, rgbToHSV->getOutputSocket(), changeHSV->getInputSocket(0));
diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h
index d69990f712c..ed5f2b51ce3 100644
--- a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h
+++ b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h
@@ -26,12 +26,12 @@
 #include "COM_Node.h"
 
 /**
-  * @brief HueSaturationValueCorrectNode
-  * @ingroup Node
-  */
+ * @brief HueSaturationValueCorrectNode
+ * @ingroup Node
+ */
 class HueSaturationValueCorrectNode : public Node {
 public:
 	HueSaturationValueCorrectNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 #endif
diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp b/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
index 32c7d4719a4..ef501317e48 100644
--- a/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
+++ b/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
@@ -32,22 +32,23 @@
 #include "COM_ChangeHSVOperation.h"
 #include "DNA_node_types.h"
 
-HueSaturationValueNode::HueSaturationValueNode(bNode *editorNode): Node(editorNode)
+HueSaturationValueNode::HueSaturationValueNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void HueSaturationValueNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void HueSaturationValueNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *valueSocket = this->getInputSocket(0);
 	InputSocket *colourSocket = this->getInputSocket(1);
 	OutputSocket *outputSocket = this->getOutputSocket(0);
 	bNode *editorsnode = getbNode();
-	NodeHueSat *storage = (NodeHueSat*)editorsnode->storage;
+	NodeHueSat *storage = (NodeHueSat *)editorsnode->storage;
 
-	ConvertRGBToHSVOperation * rgbToHSV = new ConvertRGBToHSVOperation();
-	ConvertHSVToRGBOperation * hsvToRGB = new ConvertHSVToRGBOperation();
+	ConvertRGBToHSVOperation *rgbToHSV = new ConvertRGBToHSVOperation();
+	ConvertHSVToRGBOperation *hsvToRGB = new ConvertHSVToRGBOperation();
 	ChangeHSVOperation *changeHSV = new ChangeHSVOperation();
-	MixBlendOperation * blend = new MixBlendOperation();
+	MixBlendOperation *blend = new MixBlendOperation();
 
 	colourSocket->relinkConnections(rgbToHSV->getInputSocket(0), 0, graph);
 	addLink(graph, rgbToHSV->getOutputSocket(), changeHSV->getInputSocket(0));
diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueNode.h b/source/blender/compositor/nodes/COM_HueSaturationValueNode.h
index 4fa1a4f547c..92c18019196 100644
--- a/source/blender/compositor/nodes/COM_HueSaturationValueNode.h
+++ b/source/blender/compositor/nodes/COM_HueSaturationValueNode.h
@@ -26,12 +26,12 @@
 #include "COM_Node.h"
 
 /**
-  * @brief HueSaturationValueNode
-  * @ingroup Node
-  */
+ * @brief HueSaturationValueNode
+ * @ingroup Node
+ */
 class HueSaturationValueNode : public Node {
 public:
 	HueSaturationValueNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 #endif
diff --git a/source/blender/compositor/nodes/COM_IDMaskNode.cpp b/source/blender/compositor/nodes/COM_IDMaskNode.cpp
index 82d3ae8ca29..4005e5d2900 100644
--- a/source/blender/compositor/nodes/COM_IDMaskNode.cpp
+++ b/source/blender/compositor/nodes/COM_IDMaskNode.cpp
@@ -26,10 +26,11 @@
 #include "COM_ExecutionSystem.h"
 #include "COM_AntiAliasOperation.h"
 
-IDMaskNode::IDMaskNode(bNode *editorNode): Node(editorNode)
+IDMaskNode::IDMaskNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
-void IDMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void IDMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	bNode *bnode = this->getbNode();
 	IDMaskOperation *operation;
@@ -37,11 +38,11 @@ void IDMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext *
 	operation->setObjectIndex(bnode->custom1);
 	
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
-	if (bnode->custom2==0 || context->getScene()->r.scemode & R_FULL_SAMPLE) {
+	if (bnode->custom2 == 0 || context->getScene()->r.scemode & R_FULL_SAMPLE) {
 		this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
 	}
 	else {
-		AntiAliasOperation * antiAliasOperation = new AntiAliasOperation();
+		AntiAliasOperation *antiAliasOperation = new AntiAliasOperation();
 		addLink(graph, operation->getOutputSocket(), antiAliasOperation->getInputSocket(0));
 		this->getOutputSocket(0)->relinkConnections(antiAliasOperation->getOutputSocket(0));
 		graph->addOperation(antiAliasOperation);
diff --git a/source/blender/compositor/nodes/COM_IDMaskNode.h b/source/blender/compositor/nodes/COM_IDMaskNode.h
index 2ccbbc08f9a..9fd52be2120 100644
--- a/source/blender/compositor/nodes/COM_IDMaskNode.h
+++ b/source/blender/compositor/nodes/COM_IDMaskNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief IDMaskNode
-  * @ingroup Node
-  */
-class IDMaskNode: public Node {
+ * @brief IDMaskNode
+ * @ingroup Node
+ */
+class IDMaskNode : public Node {
 public:
 	IDMaskNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_ImageNode.cpp b/source/blender/compositor/nodes/COM_ImageNode.cpp
index 5300d2deffc..addde140b9f 100644
--- a/source/blender/compositor/nodes/COM_ImageNode.cpp
+++ b/source/blender/compositor/nodes/COM_ImageNode.cpp
@@ -28,25 +28,27 @@
 #include "BKE_node.h"
 #include "BLI_utildefines.h"
 
-ImageNode::ImageNode(bNode *editorNode): Node(editorNode)
+ImageNode::ImageNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
+
 }
 NodeOperation *ImageNode::doMultilayerCheck(ExecutionSystem *system, RenderLayer *rl, Image *image, ImageUser *user, int framenumber, int outputsocketIndex, int pass, DataType datatype)
 {
 	OutputSocket *outputSocket = this->getOutputSocket(outputsocketIndex);
-	MultilayerBaseOperation * operation = NULL;
+	MultilayerBaseOperation *operation = NULL;
 	switch (datatype) {
-	case COM_DT_VALUE:
-		operation = new MultilayerValueOperation(pass);
-		break;
-	case COM_DT_VECTOR:
-		operation = new MultilayerVectorOperation(pass);
-		break;
-	case COM_DT_COLOR:
-		operation = new MultilayerColorOperation(pass);
-		break;
-	default:
-		break;
+		case COM_DT_VALUE:
+			operation = new MultilayerValueOperation(pass);
+			break;
+		case COM_DT_VECTOR:
+			operation = new MultilayerVectorOperation(pass);
+			break;
+		case COM_DT_COLOR:
+			operation = new MultilayerColorOperation(pass);
+			break;
+		default:
+			break;
 	}
 	operation->setImage(image);
 	operation->setRenderLayer(rl);
@@ -57,54 +59,55 @@ NodeOperation *ImageNode::doMultilayerCheck(ExecutionSystem *system, RenderLayer
 	return operation;
 }
 
-void ImageNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void ImageNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	/// Image output
 	OutputSocket *outputImage = this->getOutputSocket(0);
 	bNode *editorNode = this->getbNode();
-	Image *image = (Image*)editorNode->id;
-	ImageUser *imageuser = (ImageUser*)editorNode->storage;
+	Image *image = (Image *)editorNode->id;
+	ImageUser *imageuser = (ImageUser *)editorNode->storage;
 	int framenumber = context->getFramenumber();
 	int numberOfOutputs = this->getNumberOfOutputSockets();
+	BKE_image_user_frame_calc(imageuser, context->getFramenumber(), 0);
 
 	/* force a load, we assume iuser index will be set OK anyway */
-	if (image && image->type==IMA_TYPE_MULTILAYER) {
+	if (image && image->type == IMA_TYPE_MULTILAYER) {
 		BKE_image_get_ibuf(image, imageuser);
 		if (image->rr) {
-			RenderLayer *rl = (RenderLayer*)BLI_findlink(&image->rr->layers, imageuser->layer);
+			RenderLayer *rl = (RenderLayer *)BLI_findlink(&image->rr->layers, imageuser->layer);
 			if (rl) {
-				OutputSocket * socket;
+				OutputSocket *socket;
 				int index;
-				for (index = 0 ; index < numberOfOutputs ; index ++) {
+				for (index = 0; index < numberOfOutputs; index++) {
 					socket = this->getOutputSocket(index);
 					if (socket->isConnected() || index == 0) {
 						bNodeSocket *bnodeSocket = socket->getbNodeSocket();
-						NodeImageLayer *storage = (NodeImageLayer*)bnodeSocket->storage;
+						NodeImageLayer *storage = (NodeImageLayer *)bnodeSocket->storage;
 						int passindex = storage->pass_index;
 						
 						RenderPass *rpass = (RenderPass *)BLI_findlink(&rl->passes, passindex);
 						if (rpass) {
-							NodeOperation * operation = NULL;
+							NodeOperation *operation = NULL;
 							imageuser->pass = passindex;
 							switch (rpass->channels) {
-							case 1:
-								operation = doMultilayerCheck(graph, rl, image, imageuser, framenumber, index, passindex, COM_DT_VALUE);
-								break;
-							/* using image operations for both 3 and 4 channels (RGB and RGBA respectively) */
-							/* XXX any way to detect actual vector images? */
-							case 3:
-								operation = doMultilayerCheck(graph, rl, image, imageuser, framenumber, index, passindex, COM_DT_VECTOR);
-								break;
-							case 4:
-								operation = doMultilayerCheck(graph, rl, image, imageuser, framenumber, index, passindex, COM_DT_COLOR);
-								break;
-							
-							default:
-							/* XXX add a dummy operation? */
-							break;
+								case 1:
+									operation = doMultilayerCheck(graph, rl, image, imageuser, framenumber, index, passindex, COM_DT_VALUE);
+									break;
+								/* using image operations for both 3 and 4 channels (RGB and RGBA respectively) */
+								/* XXX any way to detect actual vector images? */
+								case 3:
+									operation = doMultilayerCheck(graph, rl, image, imageuser, framenumber, index, passindex, COM_DT_VECTOR);
+									break;
+								case 4:
+									operation = doMultilayerCheck(graph, rl, image, imageuser, framenumber, index, passindex, COM_DT_COLOR);
+									break;
+
+								default:
+									/* XXX add a dummy operation? */
+									break;
 							}
 							if (index == 0 && operation) {
-								addPreviewOperation(graph, operation->getOutputSocket(), 9);
+								addPreviewOperation(graph, operation->getOutputSocket());
 							}
 						}
 					}
@@ -122,7 +125,7 @@ void ImageNode::convertToOperations(ExecutionSystem *graph, CompositorContext *
 			operation->setImageUser(imageuser);
 			operation->setFramenumber(framenumber);
 			graph->addOperation(operation);
-			addPreviewOperation(graph, operation->getOutputSocket(), 9);
+			addPreviewOperation(graph, operation->getOutputSocket());
 		}
 		
 		if (numberOfOutputs > 1) {
diff --git a/source/blender/compositor/nodes/COM_ImageNode.h b/source/blender/compositor/nodes/COM_ImageNode.h
index 70c3ab7f4b0..384dd6c09ff 100644
--- a/source/blender/compositor/nodes/COM_ImageNode.h
+++ b/source/blender/compositor/nodes/COM_ImageNode.h
@@ -30,15 +30,15 @@ extern "C" {
 }
 
 /**
-  * @brief ImageNode
-  * @ingroup Node
-  */
+ * @brief ImageNode
+ * @ingroup Node
+ */
 class ImageNode : public Node {
 
 private:
 	NodeOperation *doMultilayerCheck(ExecutionSystem *system, RenderLayer *rl, Image *image, ImageUser *user, int framenumber, int outputsocketIndex, int pass, DataType datatype);
 public:
 	ImageNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 
 };
diff --git a/source/blender/compositor/nodes/COM_InvertNode.cpp b/source/blender/compositor/nodes/COM_InvertNode.cpp
index 5d039239fbe..c468bda1b67 100644
--- a/source/blender/compositor/nodes/COM_InvertNode.cpp
+++ b/source/blender/compositor/nodes/COM_InvertNode.cpp
@@ -26,11 +26,12 @@
 #include "COM_ExecutionSystem.h"
 #include "BKE_node.h"
 
-InvertNode::InvertNode(bNode *editorNode): Node(editorNode)
+InvertNode::InvertNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void InvertNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void InvertNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InvertOperation *operation = new InvertOperation();
 	bNode *node = this->getbNode();
diff --git a/source/blender/compositor/nodes/COM_InvertNode.h b/source/blender/compositor/nodes/COM_InvertNode.h
index 570e86445e6..d061f1c12bd 100644
--- a/source/blender/compositor/nodes/COM_InvertNode.h
+++ b/source/blender/compositor/nodes/COM_InvertNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief InvertNode
-  * @ingroup Node
-  */
-class InvertNode: public Node {
+ * @brief InvertNode
+ * @ingroup Node
+ */
+class InvertNode : public Node {
 public:
 	InvertNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_KeyingNode.cpp b/source/blender/compositor/nodes/COM_KeyingNode.cpp
new file mode 100644
index 00000000000..50c1903982e
--- /dev/null
+++ b/source/blender/compositor/nodes/COM_KeyingNode.cpp
@@ -0,0 +1,232 @@
+/*
+ * Copyright 2012, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor:
+ *		Jeroen Bakker
+ *		Monique Dewanchand
+ *		Sergey Sharybin
+ */
+
+#include "COM_KeyingNode.h"
+
+#include "COM_ExecutionSystem.h"
+
+#include "COM_KeyingOperation.h"
+#include "COM_KeyingBlurOperation.h"
+#include "COM_KeyingDespillOperation.h"
+#include "COM_KeyingClipOperation.h"
+
+#include "COM_SeparateChannelOperation.h"
+#include "COM_CombineChannelsOperation.h"
+#include "COM_ConvertRGBToYCCOperation.h"
+#include "COM_ConvertYCCToRGBOperation.h"
+#include "COM_GaussianBokehBlurOperation.h"
+#include "COM_SetValueOperation.h"
+
+#include "COM_DilateErodeOperation.h"
+
+#include "COM_SetAlphaOperation.h"
+
+KeyingNode::KeyingNode(bNode *editorNode) : Node(editorNode)
+{
+	/* pass */
+}
+
+OutputSocket *KeyingNode::setupPreBlur(ExecutionSystem *graph, InputSocket *inputImage, int size, OutputSocket **originalImage)
+{
+	ConvertRGBToYCCOperation *convertRGBToYCCOperation = new ConvertRGBToYCCOperation();
+	convertRGBToYCCOperation->setMode(0);  /* ITU 601 */
+
+	inputImage->relinkConnections(convertRGBToYCCOperation->getInputSocket(0), 0, graph);
+	graph->addOperation(convertRGBToYCCOperation);
+
+	CombineChannelsOperation *combineOperation = new CombineChannelsOperation();
+	graph->addOperation(combineOperation);
+
+	for (int channel = 0; channel < 4; channel++) {
+		SeparateChannelOperation *separateOperation = new SeparateChannelOperation();
+		separateOperation->setChannel(channel);
+		addLink(graph, convertRGBToYCCOperation->getOutputSocket(0), separateOperation->getInputSocket(0));
+		graph->addOperation(separateOperation);
+
+		if (channel == 0 || channel == 3) {
+			addLink(graph, separateOperation->getOutputSocket(0), combineOperation->getInputSocket(channel));
+		}
+		else {
+			KeyingBlurOperation *blurOperation = new KeyingBlurOperation();
+
+			blurOperation->setSize(size);
+
+			addLink(graph, separateOperation->getOutputSocket(0), blurOperation->getInputSocket(0));
+			addLink(graph, blurOperation->getOutputSocket(0), combineOperation->getInputSocket(channel));
+			graph->addOperation(blurOperation);
+		}
+	}
+
+	ConvertYCCToRGBOperation *convertYCCToRGBOperation = new ConvertYCCToRGBOperation();
+	convertYCCToRGBOperation->setMode(0);  /* ITU 601 */
+	addLink(graph, combineOperation->getOutputSocket(0), convertYCCToRGBOperation->getInputSocket(0));
+	graph->addOperation(convertYCCToRGBOperation);
+
+	*originalImage = convertRGBToYCCOperation->getInputSocket(0)->getConnection()->getFromSocket();
+
+	return convertYCCToRGBOperation->getOutputSocket(0);
+}
+
+OutputSocket *KeyingNode::setupPostBlur(ExecutionSystem *graph, OutputSocket *postBLurInput, int size)
+{
+	KeyingBlurOperation *blurOperation = new KeyingBlurOperation();
+
+	blurOperation->setSize(size);
+
+	addLink(graph, postBLurInput, blurOperation->getInputSocket(0));
+
+	graph->addOperation(blurOperation);
+
+	return blurOperation->getOutputSocket();
+}
+
+OutputSocket *KeyingNode::setupDilateErode(ExecutionSystem *graph, OutputSocket *dilateErodeInput, int distance)
+{
+	DilateStepOperation *dilateErodeOperation;
+
+	if (distance > 0) {
+		dilateErodeOperation = new DilateStepOperation();
+		dilateErodeOperation->setIterations(distance);
+	}
+	else {
+		dilateErodeOperation = new ErodeStepOperation();
+		dilateErodeOperation->setIterations(-distance);
+	}
+
+	addLink(graph, dilateErodeInput, dilateErodeOperation->getInputSocket(0));
+
+	graph->addOperation(dilateErodeOperation);
+
+	return dilateErodeOperation->getOutputSocket(0);
+}
+
+OutputSocket *KeyingNode::setupDespill(ExecutionSystem *graph, OutputSocket *despillInput, OutputSocket *inputScreen, float factor)
+{
+	KeyingDespillOperation *despillOperation = new KeyingDespillOperation();
+
+	despillOperation->setDespillFactor(factor);
+
+	addLink(graph, despillInput, despillOperation->getInputSocket(0));
+	addLink(graph, inputScreen, despillOperation->getInputSocket(1));
+
+	graph->addOperation(despillOperation);
+
+	return despillOperation->getOutputSocket(0);
+}
+
+OutputSocket *KeyingNode::setupClip(ExecutionSystem *graph, OutputSocket *clipInput, int kernelRadius, float kernelTolerance,
+                                    float clipBlack, float clipWhite, bool edgeMatte)
+{
+	KeyingClipOperation *clipOperation = new KeyingClipOperation();
+
+	clipOperation->setKernelRadius(kernelRadius);
+	clipOperation->setKernelTolerance(kernelTolerance);
+
+	clipOperation->setClipBlack(clipBlack);
+	clipOperation->setClipWhite(clipWhite);
+	clipOperation->setIsEdgeMatte(edgeMatte);
+
+	addLink(graph, clipInput, clipOperation->getInputSocket(0));
+
+	graph->addOperation(clipOperation);
+
+	return clipOperation->getOutputSocket(0);
+}
+
+void KeyingNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
+{
+	InputSocket *inputImage = this->getInputSocket(0);
+	InputSocket *inputScreen = this->getInputSocket(1);
+	InputSocket *inputGarbageMatte = this->getInputSocket(2);
+	InputSocket *inputCoreMatte = this->getInputSocket(3);
+	OutputSocket *outputImage = this->getOutputSocket(0);
+	OutputSocket *outputMatte = this->getOutputSocket(1);
+	OutputSocket *outputEdges = this->getOutputSocket(2);
+	OutputSocket *postprocessedMatte, *postprocessedImage, *originalImage, *edgesMatte;
+
+	bNode *editorNode = this->getbNode();
+	NodeKeyingData *keying_data = (NodeKeyingData *) editorNode->storage;
+
+	/* keying operation */
+	KeyingOperation *keyingOperation = new KeyingOperation();
+
+	keyingOperation->setScreenBalance(keying_data->screen_balance);
+
+	inputScreen->relinkConnections(keyingOperation->getInputSocket(1), 1, graph);
+	inputGarbageMatte->relinkConnections(keyingOperation->getInputSocket(2), 2, graph);
+	inputCoreMatte->relinkConnections(keyingOperation->getInputSocket(3), 3, graph);
+
+	if (keying_data->blur_pre) {
+		/* chroma preblur operation for input of keying operation  */
+		OutputSocket *preBluredImage = setupPreBlur(graph, inputImage, keying_data->blur_pre, &originalImage);
+		addLink(graph, preBluredImage, keyingOperation->getInputSocket(0));
+	}
+	else {
+		inputImage->relinkConnections(keyingOperation->getInputSocket(0), 0, graph);
+		originalImage = keyingOperation->getInputSocket(0)->getConnection()->getFromSocket();
+	}
+
+	graph->addOperation(keyingOperation);
+
+	postprocessedMatte = keyingOperation->getOutputSocket();
+
+	if (keying_data->clip_black > 0.0f || keying_data->clip_white < 1.0f) {
+		postprocessedMatte = setupClip(graph, postprocessedMatte,
+		                               keying_data->edge_kernel_radius, keying_data->edge_kernel_tolerance,
+		                               keying_data->clip_black, keying_data->clip_white, false);
+	}
+
+	edgesMatte = setupClip(graph, postprocessedMatte,
+	                       keying_data->edge_kernel_radius, keying_data->edge_kernel_tolerance,
+	                       keying_data->clip_black, keying_data->clip_white, true);
+
+	/* apply blur on matte if needed */
+	if (keying_data->blur_post)
+		postprocessedMatte = setupPostBlur(graph, postprocessedMatte, keying_data->blur_post);
+
+	/* matte dilate/erode */
+	if (keying_data->dilate_distance != 0) {
+		postprocessedMatte = setupDilateErode(graph, postprocessedMatte, keying_data->dilate_distance);
+	}
+
+	/* set alpha channel to output image */
+	SetAlphaOperation *alphaOperation = new SetAlphaOperation();
+	addLink(graph, originalImage, alphaOperation->getInputSocket(0));
+	addLink(graph, postprocessedMatte, alphaOperation->getInputSocket(1));
+
+	postprocessedImage = alphaOperation->getOutputSocket();
+
+	/* despill output image */
+	if (keying_data->despill_factor > 0.0f) {
+		postprocessedImage = setupDespill(graph, postprocessedImage,
+		                                  keyingOperation->getInputSocket(1)->getConnection()->getFromSocket(),
+		                                  keying_data->despill_factor);
+	}
+
+	/* connect result to output sockets */
+	outputImage->relinkConnections(postprocessedImage);
+	outputMatte->relinkConnections(postprocessedMatte);
+	outputEdges->relinkConnections(edgesMatte);
+
+	graph->addOperation(alphaOperation);
+}
diff --git a/source/blender/compositor/nodes/COM_KeyingNode.h b/source/blender/compositor/nodes/COM_KeyingNode.h
new file mode 100644
index 00000000000..cc1d447c66e
--- /dev/null
+++ b/source/blender/compositor/nodes/COM_KeyingNode.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2012, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor:
+ *		Jeroen Bakker
+ *		Monique Dewanchand
+ *		Sergey Sharybin
+ */
+
+#include "COM_Node.h"
+
+/**
+  * @brief KeyingNode
+  * @ingroup Node
+  */
+class KeyingNode : public Node {
+protected:
+	OutputSocket *setupPreBlur(ExecutionSystem *graph, InputSocket *inputImage, int size, OutputSocket **originalImage);
+	OutputSocket *setupPostBlur(ExecutionSystem *graph, OutputSocket *postBLurInput, int size);
+	OutputSocket *setupDilateErode(ExecutionSystem *graph, OutputSocket *dilateErodeInput, int distance);
+	OutputSocket *setupDespill(ExecutionSystem *graph, OutputSocket *despillInput, OutputSocket *inputSrceen, float factor);
+	OutputSocket *setupClip(ExecutionSystem *graph, OutputSocket *clipInput, int kernelRadius, float kernelTolerance,
+	                        float clipBlack, float clipWhite, bool edgeMatte);
+public:
+	KeyingNode(bNode *editorNode);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
+
+};
diff --git a/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp b/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp
new file mode 100644
index 00000000000..0fb8d45d066
--- /dev/null
+++ b/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2012, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor:
+ *		Jeroen Bakker
+ *		Monique Dewanchand
+ *		Sergey Sharybin
+ */
+
+#include "COM_KeyingScreenNode.h"
+#include "COM_ExecutionSystem.h"
+#include "COM_KeyingScreenOperation.h"
+
+extern "C" {
+	#include "DNA_movieclip_types.h"
+}
+
+KeyingScreenNode::KeyingScreenNode(bNode *editorNode) : Node(editorNode)
+{
+	/* pass */
+}
+
+void KeyingScreenNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
+{
+	OutputSocket *outputScreen = this->getOutputSocket(0);
+
+	bNode *editorNode = this->getbNode();
+	MovieClip *clip = (MovieClip *) editorNode->id;
+
+	NodeKeyingScreenData *keyingscreen_data = (NodeKeyingScreenData *) editorNode->storage;
+
+	// always connect the output image
+	KeyingScreenOperation *operation = new KeyingScreenOperation();
+
+	if (outputScreen->isConnected()) {
+		outputScreen->relinkConnections(operation->getOutputSocket());
+	}
+
+	operation->setMovieClip(clip);
+	operation->setTrackingObject(keyingscreen_data->tracking_object);
+	operation->setFramenumber(context->getFramenumber());
+
+	graph->addOperation(operation);
+}
diff --git a/source/blender/compositor/nodes/COM_KeyingScreenNode.h b/source/blender/compositor/nodes/COM_KeyingScreenNode.h
new file mode 100644
index 00000000000..7c87219ef6e
--- /dev/null
+++ b/source/blender/compositor/nodes/COM_KeyingScreenNode.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2012, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor:
+ *		Jeroen Bakker
+ *		Monique Dewanchand
+ *		Sergey Sharybin
+ */
+
+#include "COM_Node.h"
+#include "DNA_node_types.h"
+
+/**
+  * @brief KeyingScreenNode
+  * @ingroup Node
+  */
+class KeyingScreenNode : public Node {
+public:
+	KeyingScreenNode(bNode *editorNode);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
+
+};
diff --git a/source/blender/compositor/nodes/COM_LensDistortionNode.cpp b/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
index e55dd5e64d8..03034e34eb7 100644
--- a/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
+++ b/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
@@ -26,14 +26,15 @@
 #include "COM_ProjectorLensDistortionOperation.h"
 #include "COM_ScreenLensDistortionOperation.h"
 
-LensDistortionNode::LensDistortionNode(bNode *editorNode): Node(editorNode)
+LensDistortionNode::LensDistortionNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void LensDistortionNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void LensDistortionNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	bNode *editorNode = this->getbNode();
-	NodeLensDist * data = (NodeLensDist*)editorNode->storage;
+	NodeLensDist *data = (NodeLensDist *)editorNode->storage;
 	if (data->proj) {
 		ProjectorLensDistortionOperation *operation = new ProjectorLensDistortionOperation();
 
diff --git a/source/blender/compositor/nodes/COM_LensDistortionNode.h b/source/blender/compositor/nodes/COM_LensDistortionNode.h
index 64de740fde8..52529823441 100644
--- a/source/blender/compositor/nodes/COM_LensDistortionNode.h
+++ b/source/blender/compositor/nodes/COM_LensDistortionNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief LensDistortionNode
-  * @ingroup Node
-  */
-class LensDistortionNode: public Node {
+ * @brief LensDistortionNode
+ * @ingroup Node
+ */
+class LensDistortionNode : public Node {
 public:
 	LensDistortionNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp b/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
index eb78657f3c4..be949e2cacb 100644
--- a/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
@@ -25,8 +25,10 @@
 #include "COM_ConvertRGBToYUVOperation.h"
 #include "COM_SetAlphaOperation.h"
 
-LuminanceMatteNode::LuminanceMatteNode(bNode *editorNode): Node(editorNode)
-{}
+LuminanceMatteNode::LuminanceMatteNode(bNode *editorNode) : Node(editorNode)
+{
+	/* pass */
+}
 
 void LuminanceMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
@@ -37,7 +39,7 @@ void LuminanceMatteNode::convertToOperations(ExecutionSystem *graph, CompositorC
 	ConvertRGBToYUVOperation *rgbToYUV = new ConvertRGBToYUVOperation();
 	LuminanceMatteOperation *operationSet = new LuminanceMatteOperation();
 	bNode *editorsnode = getbNode();
-	operationSet->setSettings((NodeChroma*)editorsnode->storage);
+	operationSet->setSettings((NodeChroma *)editorsnode->storage);
 
 	inputSocket->relinkConnections(rgbToYUV->getInputSocket(0), 0, graph);
 	addLink(graph, rgbToYUV->getOutputSocket(), operationSet->getInputSocket(0));
@@ -53,7 +55,7 @@ void LuminanceMatteNode::convertToOperations(ExecutionSystem *graph, CompositorC
 	addLink(graph, rgbToYUV->getInputSocket(0)->getConnection()->getFromSocket(), operation->getInputSocket(0));
 	addLink(graph, operationSet->getOutputSocket(), operation->getInputSocket(1));
 	graph->addOperation(operation);
-	addPreviewOperation(graph, operation->getOutputSocket(), 9);
+	addPreviewOperation(graph, operation->getOutputSocket());
 
 	if (outputSocketImage->isConnected()) {
 		outputSocketImage->relinkConnections(operation->getOutputSocket());
diff --git a/source/blender/compositor/nodes/COM_LuminanceMatteNode.h b/source/blender/compositor/nodes/COM_LuminanceMatteNode.h
index e2dd8b47833..c699a0d1168 100644
--- a/source/blender/compositor/nodes/COM_LuminanceMatteNode.h
+++ b/source/blender/compositor/nodes/COM_LuminanceMatteNode.h
@@ -25,9 +25,9 @@
 #include "COM_Node.h"
 
 /**
-  * @brief LuminanceMatteNode
-  * @ingroup Node
-  */
+ * @brief LuminanceMatteNode
+ * @ingroup Node
+ */
 class LuminanceMatteNode : public Node
 {
 public:
diff --git a/source/blender/compositor/nodes/COM_MapUVNode.cpp b/source/blender/compositor/nodes/COM_MapUVNode.cpp
index e0e7e2594ed..447b8239a93 100644
--- a/source/blender/compositor/nodes/COM_MapUVNode.cpp
+++ b/source/blender/compositor/nodes/COM_MapUVNode.cpp
@@ -23,11 +23,12 @@
 #include "COM_MapUVOperation.h"
 #include "COM_ExecutionSystem.h"
 
-MapUVNode::MapUVNode(bNode *editorNode): Node(editorNode)
+MapUVNode::MapUVNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void MapUVNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void MapUVNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	MapUVOperation *operation = new MapUVOperation();
 
diff --git a/source/blender/compositor/nodes/COM_MapUVNode.h b/source/blender/compositor/nodes/COM_MapUVNode.h
index 3092e84990f..a1df790f192 100644
--- a/source/blender/compositor/nodes/COM_MapUVNode.h
+++ b/source/blender/compositor/nodes/COM_MapUVNode.h
@@ -31,6 +31,6 @@
 class MapUVNode : public Node {
 public:
 	MapUVNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 #endif
diff --git a/source/blender/compositor/nodes/COM_MapValueNode.cpp b/source/blender/compositor/nodes/COM_MapValueNode.cpp
index f56662b1d64..ba2fc804f42 100644
--- a/source/blender/compositor/nodes/COM_MapValueNode.cpp
+++ b/source/blender/compositor/nodes/COM_MapValueNode.cpp
@@ -25,15 +25,16 @@
 #include "COM_MapValueOperation.h"
 #include "COM_ExecutionSystem.h"
 
-MapValueNode::MapValueNode(bNode *editorNode): Node(editorNode)
+MapValueNode::MapValueNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void MapValueNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void MapValueNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *colourSocket = this->getInputSocket(0);
 	OutputSocket *valueSocket = this->getOutputSocket(0);
-	TexMapping *storage =  (TexMapping*)this->getbNode()->storage;
+	TexMapping *storage =  (TexMapping *)this->getbNode()->storage;
 	MapValueOperation *convertProg = new MapValueOperation();
 	convertProg->setSettings(storage);
 	colourSocket->relinkConnections(convertProg->getInputSocket(0), 0, graph);
diff --git a/source/blender/compositor/nodes/COM_MapValueNode.h b/source/blender/compositor/nodes/COM_MapValueNode.h
index 47a6ea6adce..c7a842dff95 100644
--- a/source/blender/compositor/nodes/COM_MapValueNode.h
+++ b/source/blender/compositor/nodes/COM_MapValueNode.h
@@ -26,12 +26,12 @@
 #include "COM_Node.h"
 #include "DNA_node_types.h"
 /**
-  * @brief MapValueNode
-  * @ingroup Node
-  */
+ * @brief MapValueNode
+ * @ingroup Node
+ */
 class MapValueNode : public Node {
 public:
 	MapValueNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 #endif
diff --git a/source/blender/compositor/nodes/COM_MaskNode.cpp b/source/blender/compositor/nodes/COM_MaskNode.cpp
new file mode 100644
index 00000000000..ed07e41a649
--- /dev/null
+++ b/source/blender/compositor/nodes/COM_MaskNode.cpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2012, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor:
+ *		Jeroen Bakker
+ *		Monique Dewanchand
+ *		Sergey Sharybin
+ */
+
+#include "COM_MaskNode.h"
+#include "COM_ExecutionSystem.h"
+#include "COM_MaskOperation.h"
+
+extern "C" {
+	#include "DNA_mask_types.h"
+}
+
+MaskNode::MaskNode(bNode *editorNode) : Node(editorNode)
+{
+	/* pass */
+}
+
+void MaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
+{
+	const RenderData *data = &context->getScene()->r;
+
+	OutputSocket *outputMask = this->getOutputSocket(0);
+
+	bNode *editorNode = this->getbNode();
+	Mask *mask = (Mask *)editorNode->id;
+
+	// always connect the output image
+	MaskOperation *operation = new MaskOperation();
+
+	operation->setMaskWidth(data->xsch * data->size / 100.0f);
+	operation->setMaskHeight(data->ysch * data->size / 100.0f);
+
+	if (outputMask->isConnected()) {
+		outputMask->relinkConnections(operation->getOutputSocket());
+	}
+
+	operation->setMask(mask);
+	operation->setFramenumber(context->getFramenumber());
+	operation->setSmooth((bool)editorNode->custom1);
+
+	graph->addOperation(operation);
+}
diff --git a/source/blender/editors/space_api/space.c b/source/blender/compositor/nodes/COM_MaskNode.h
index e677014decf..8a9bc50eac7 100644
--- a/source/blender/editors/space_api/space.c
+++ b/source/blender/compositor/nodes/COM_MaskNode.h
@@ -1,10 +1,10 @@
 /*
- * ***** BEGIN GPL LICENSE BLOCK *****
+ * Copyright 2012, Blender Foundation.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. 
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,30 +15,24 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * The Original Code is Copyright (C) 2007 Blender Foundation.
- * All rights reserved.
- *
- * 
- * Contributor(s): Blender Foundation
- *
- * ***** END GPL LICENSE BLOCK *****
+ * Contributor:
+ *		Jeroen Bakker
+ *		Monique Dewanchand
+ *		Sergey Sharybin
  */
 
-/** \file blender/editors/space_api/space.c
- *  \ingroup spapi
- */
-
-
-#include <string.h>
-#include <stdio.h>
+#include "COM_Node.h"
+#include "DNA_node_types.h"
 
-
-#include "BLI_blenlib.h"
-#include "BLI_math.h"
-
-
-
-/* */
+/**
+ * @brief MaskNode
+ * @ingroup Node
+ */
+class MaskNode : public Node {
 
 
+public:
+	MaskNode(bNode *editorNode);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 
+};
diff --git a/source/blender/compositor/nodes/COM_MathNode.cpp b/source/blender/compositor/nodes/COM_MathNode.cpp
index eabd0481e38..6e9b49253e7 100644
--- a/source/blender/compositor/nodes/COM_MathNode.cpp
+++ b/source/blender/compositor/nodes/COM_MathNode.cpp
@@ -24,61 +24,61 @@
 #include "COM_MathBaseOperation.h"
 #include "COM_ExecutionSystem.h"
 
-void MathNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void MathNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
-	MathBaseOperation *operation=NULL;
+	MathBaseOperation *operation = NULL;
 	
 	switch (this->getbNode()->custom1)
 	{
-	case 0: /* Add */
+		case 0: /* Add */
 			operation = new MathAddOperation();
 			break;
-	case 1: /* Subtract */
+		case 1: /* Subtract */
 			operation = new MathSubtractOperation();
 			break;
-	case 2: /* Multiply */
+		case 2: /* Multiply */
 			operation = new MathMultiplyOperation();
 			break;
-	case 3: /* Divide */
+		case 3: /* Divide */
 			operation = new MathDivideOperation();
 			break;
-	case 4: /* Sine */
+		case 4: /* Sine */
 			operation = new MathSineOperation();
 			break;
-	case 5: /* Cosine */
+		case 5: /* Cosine */
 			operation = new MathCosineOperation();
 			break;
-	case 6: /* Tangent */
+		case 6: /* Tangent */
 			operation = new MathTangentOperation();
 			break;
-	case 7: /* Arc-Sine */
+		case 7: /* Arc-Sine */
 			operation = new MathArcSineOperation();
 			break;
-	case 8: /* Arc-Cosine */
+		case 8: /* Arc-Cosine */
 			operation = new MathArcCosineOperation();
 			break;
-	case 9: /* Arc-Tangent */
+		case 9: /* Arc-Tangent */
 			operation = new MathArcTangentOperation();
 			break;
-	case 10: /* Power */
+		case 10: /* Power */
 			operation = new MathPowerOperation();
 			break;
-	case 11: /* Logarithm */
+		case 11: /* Logarithm */
 			operation = new MathLogarithmOperation();
 			break;
-	case 12: /* Minimum */
+		case 12: /* Minimum */
 			operation = new MathMinimumOperation();
 			break;
-	case 13: /* Maximum */
+		case 13: /* Maximum */
 			operation = new MathMaximumOperation();
 			break;
-	case 14: /* Round */
+		case 14: /* Round */
 			operation = new MathRoundOperation();
 			break;
-	case 15: /* Less Than */
+		case 15: /* Less Than */
 			operation = new MathLessThanOperation();
 			break;
-	case 16: /* Greater Than */
+		case 16: /* Greater Than */
 			operation = new MathGreaterThanOperation();
 			break;
 	}
diff --git a/source/blender/compositor/nodes/COM_MathNode.h b/source/blender/compositor/nodes/COM_MathNode.h
index 1e2cccda396..16d65843b0d 100644
--- a/source/blender/compositor/nodes/COM_MathNode.h
+++ b/source/blender/compositor/nodes/COM_MathNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief MathNode
-  * @ingroup Node
-  */
-class MathNode: public Node {
+ * @brief MathNode
+ * @ingroup Node
+ */
+class MathNode : public Node {
 public:
-	MathNode(bNode *editorNode) :Node(editorNode) {}
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	MathNode(bNode *editorNode) : Node(editorNode) {}
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_MixNode.cpp b/source/blender/compositor/nodes/COM_MixNode.cpp
index 86ca5ebc237..eb62ebd2635 100644
--- a/source/blender/compositor/nodes/COM_MixNode.cpp
+++ b/source/blender/compositor/nodes/COM_MixNode.cpp
@@ -46,12 +46,12 @@
 #include "DNA_material_types.h" // the ramp types
 
 
-MixNode::MixNode(bNode *editorNode): Node(editorNode)
+MixNode::MixNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-
-void MixNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void MixNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *valueSocket = this->getInputSocket(0);
 	InputSocket *color1Socket = this->getInputSocket(1);
@@ -62,62 +62,62 @@ void MixNode::convertToOperations(ExecutionSystem *graph, CompositorContext * co
 	MixBaseOperation *convertProg;
 	
 	switch (editorNode->custom1) {
-	case MA_RAMP_ADD:
-		convertProg = new MixAddOperation();
-		break;
-	case MA_RAMP_MULT:
-		convertProg = new MixMultiplyOperation();
-		break;
-	case MA_RAMP_LIGHT:
-		convertProg = new MixLightenOperation();
-		break;
-	case MA_RAMP_BURN:
-		convertProg = new MixBurnOperation();
-		break;
-	case MA_RAMP_HUE:
-		convertProg = new MixHueOperation();
-		break;
-	case MA_RAMP_COLOR:
-		convertProg = new MixColorOperation();
-		break;
-	case MA_RAMP_SOFT:
-		convertProg = new MixSoftLightOperation();
-		break;
-	case MA_RAMP_SCREEN:
-		convertProg = new MixScreenOperation();
-		break;
-	case MA_RAMP_LINEAR:
-		convertProg = new MixLinearLightOperation();
-		break;
-	case MA_RAMP_DIFF:
-		convertProg = new MixDifferenceOperation();
-		break;
-	case MA_RAMP_SAT:
-		convertProg = new MixSaturationOperation();
-		break;
-	case MA_RAMP_DIV:
-		convertProg = new MixDivideOperation();
-		break;
-	case MA_RAMP_SUB:
-		convertProg = new MixSubtractOperation();
-		break;
-	case MA_RAMP_DARK:
-		convertProg = new MixDarkenOperation();
-		break;
-	case MA_RAMP_OVERLAY:
-		convertProg = new MixOverlayOperation();
-		break;
-	case MA_RAMP_VAL:
-		convertProg = new MixValueOperation();
-		break;
-	case MA_RAMP_DODGE:
-		convertProg = new MixDodgeOperation();
-		break;
-	
-	case MA_RAMP_BLEND:
-	default:
-		convertProg = new MixBlendOperation();
-		break;
+		case MA_RAMP_ADD:
+			convertProg = new MixAddOperation();
+			break;
+		case MA_RAMP_MULT:
+			convertProg = new MixMultiplyOperation();
+			break;
+		case MA_RAMP_LIGHT:
+			convertProg = new MixLightenOperation();
+			break;
+		case MA_RAMP_BURN:
+			convertProg = new MixBurnOperation();
+			break;
+		case MA_RAMP_HUE:
+			convertProg = new MixHueOperation();
+			break;
+		case MA_RAMP_COLOR:
+			convertProg = new MixColorOperation();
+			break;
+		case MA_RAMP_SOFT:
+			convertProg = new MixSoftLightOperation();
+			break;
+		case MA_RAMP_SCREEN:
+			convertProg = new MixScreenOperation();
+			break;
+		case MA_RAMP_LINEAR:
+			convertProg = new MixLinearLightOperation();
+			break;
+		case MA_RAMP_DIFF:
+			convertProg = new MixDifferenceOperation();
+			break;
+		case MA_RAMP_SAT:
+			convertProg = new MixSaturationOperation();
+			break;
+		case MA_RAMP_DIV:
+			convertProg = new MixDivideOperation();
+			break;
+		case MA_RAMP_SUB:
+			convertProg = new MixSubtractOperation();
+			break;
+		case MA_RAMP_DARK:
+			convertProg = new MixDarkenOperation();
+			break;
+		case MA_RAMP_OVERLAY:
+			convertProg = new MixOverlayOperation();
+			break;
+		case MA_RAMP_VAL:
+			convertProg = new MixValueOperation();
+			break;
+		case MA_RAMP_DODGE:
+			convertProg = new MixDodgeOperation();
+			break;
+
+		case MA_RAMP_BLEND:
+		default:
+			convertProg = new MixBlendOperation();
+			break;
 	}
 	convertProg->setUseValueAlphaMultiply(this->getbNode()->custom2);
 
@@ -125,7 +125,7 @@ void MixNode::convertToOperations(ExecutionSystem *graph, CompositorContext * co
 	color1Socket->relinkConnections(convertProg->getInputSocket(1), 1, graph);
 	color2Socket->relinkConnections(convertProg->getInputSocket(2), 2, graph);
 	outputSocket->relinkConnections(convertProg->getOutputSocket(0));
-	addPreviewOperation(graph, convertProg->getOutputSocket(0), 5);
+	addPreviewOperation(graph, convertProg->getOutputSocket(0));
 	
 	convertProg->getInputSocket(2)->setResizeMode(color2Socket->getResizeMode());
 	
diff --git a/source/blender/compositor/nodes/COM_MixNode.h b/source/blender/compositor/nodes/COM_MixNode.h
index 4b57bdbc02a..99e8b4d48f0 100644
--- a/source/blender/compositor/nodes/COM_MixNode.h
+++ b/source/blender/compositor/nodes/COM_MixNode.h
@@ -26,12 +26,12 @@
 #include "COM_Node.h"
 #include "DNA_node_types.h"
 /**
-  * @brief MixNode
-  * @ingroup Node
-  */
+ * @brief MixNode
+ * @ingroup Node
+ */
 class MixNode : public Node {
 public:
 	MixNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 #endif
diff --git a/source/blender/compositor/nodes/COM_MovieClipNode.cpp b/source/blender/compositor/nodes/COM_MovieClipNode.cpp
index 75831130936..89bd0e8549e 100644
--- a/source/blender/compositor/nodes/COM_MovieClipNode.cpp
+++ b/source/blender/compositor/nodes/COM_MovieClipNode.cpp
@@ -33,11 +33,12 @@ extern "C" {
 	#include "IMB_imbuf.h"
 }
 
-MovieClipNode::MovieClipNode(bNode *editorNode): Node(editorNode)
+MovieClipNode::MovieClipNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void MovieClipNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void MovieClipNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	OutputSocket *outputMovieClip = this->getOutputSocket(0);
 	OutputSocket *offsetXMovieClip = this->getOutputSocket(1);
@@ -46,10 +47,10 @@ void MovieClipNode::convertToOperations(ExecutionSystem *graph, CompositorContex
 	OutputSocket *angleMovieClip = this->getOutputSocket(4);
 	
 	bNode *editorNode = this->getbNode();
-	MovieClip *movieClip = (MovieClip*)editorNode->id;
-	MovieClipUser *movieClipUser = (MovieClipUser*)editorNode->storage;
+	MovieClip *movieClip = (MovieClip *)editorNode->id;
+	MovieClipUser *movieClipUser = (MovieClipUser *)editorNode->storage;
 	
-	ImBuf * ibuf = NULL;
+	ImBuf *ibuf = NULL;
 	if (movieClip) {
 		ibuf = BKE_movieclip_get_ibuf(movieClip, movieClipUser);
 	}
@@ -62,7 +63,7 @@ void MovieClipNode::convertToOperations(ExecutionSystem *graph, CompositorContex
 		converter->setFromColorProfile(IB_PROFILE_LINEAR_RGB);
 		converter->setToColorProfile(IB_PROFILE_SRGB);
 		addLink(graph, operation->getOutputSocket(), converter->getInputSocket(0));
-		addPreviewOperation(graph, converter->getOutputSocket(), 9);
+		addPreviewOperation(graph, converter->getOutputSocket());
 		if (outputMovieClip->isConnected()) {
 			outputMovieClip->relinkConnections(converter->getOutputSocket());
 		}
@@ -72,7 +73,7 @@ void MovieClipNode::convertToOperations(ExecutionSystem *graph, CompositorContex
 		}
 	}
 	else {
-		addPreviewOperation(graph, operation->getOutputSocket(), 9);
+		addPreviewOperation(graph, operation->getOutputSocket());
 		if (outputMovieClip->isConnected()) {
 			outputMovieClip->relinkConnections(operation->getOutputSocket());
 		}
@@ -90,31 +91,33 @@ void MovieClipNode::convertToOperations(ExecutionSystem *graph, CompositorContex
 	angle = 0.0f;
 
 	if (ibuf) {
-		if (stab->flag&TRACKING_2D_STABILIZATION) {
-			BKE_tracking_stabilization_data(&movieClip->tracking, context->getFramenumber(), ibuf->x, ibuf->y, loc, &scale, &angle);
+		if (stab->flag & TRACKING_2D_STABILIZATION) {
+			int clip_framenr = BKE_movieclip_remap_scene_to_clip_frame(movieClip, context->getFramenumber());
+
+			BKE_tracking_stabilization_data_get(&movieClip->tracking, clip_framenr, ibuf->x, ibuf->y, loc, &scale, &angle);
 		}
 	}
 	
 	if (offsetXMovieClip->isConnected()) {
-		SetValueOperation * operationSetValue = new SetValueOperation();
+		SetValueOperation *operationSetValue = new SetValueOperation();
 		operationSetValue->setValue(loc[0]);
 		offsetXMovieClip->relinkConnections(operationSetValue->getOutputSocket());
 		graph->addOperation(operationSetValue);
 	}
 	if (offsetYMovieClip->isConnected()) {
-		SetValueOperation * operationSetValue = new SetValueOperation();
+		SetValueOperation *operationSetValue = new SetValueOperation();
 		operationSetValue->setValue(loc[1]);
 		offsetYMovieClip->relinkConnections(operationSetValue->getOutputSocket());
 		graph->addOperation(operationSetValue);
 	}
 	if (scaleMovieClip->isConnected()) {
-		SetValueOperation * operationSetValue = new SetValueOperation();
+		SetValueOperation *operationSetValue = new SetValueOperation();
 		operationSetValue->setValue(scale);
 		scaleMovieClip->relinkConnections(operationSetValue->getOutputSocket());
 		graph->addOperation(operationSetValue);
 	}
 	if (angleMovieClip->isConnected()) {
-		SetValueOperation * operationSetValue = new SetValueOperation();
+		SetValueOperation *operationSetValue = new SetValueOperation();
 		operationSetValue->setValue(angle);
 		angleMovieClip->relinkConnections(operationSetValue->getOutputSocket());
 		graph->addOperation(operationSetValue);
diff --git a/source/blender/compositor/nodes/COM_MovieClipNode.h b/source/blender/compositor/nodes/COM_MovieClipNode.h
index 8ad2fa8cbb0..d70881a6725 100644
--- a/source/blender/compositor/nodes/COM_MovieClipNode.h
+++ b/source/blender/compositor/nodes/COM_MovieClipNode.h
@@ -24,14 +24,14 @@
 #include "DNA_node_types.h"
 
 /**
-  * @brief MovieClipNode
-  * @ingroup Node
-  */
+ * @brief MovieClipNode
+ * @ingroup Node
+ */
 class MovieClipNode : public Node {
 
 
 public:
 	MovieClipNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 
 };
diff --git a/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp b/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp
index bdf4c53fa72..c29bc27cd80 100644
--- a/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp
+++ b/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp
@@ -28,16 +28,17 @@
 
 MovieDistortionNode::MovieDistortionNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void MovieDistortionNode::convertToOperations(ExecutionSystem *system, CompositorContext * context)
+void MovieDistortionNode::convertToOperations(ExecutionSystem *system, CompositorContext *context)
 {
 	InputSocket *inputSocket = this->getInputSocket(0);
 	OutputSocket *outputSocket = this->getOutputSocket(0);
 	bNode *bnode = this->getbNode();
-	MovieClip * clip = (MovieClip*)bnode->id;
+	MovieClip *clip = (MovieClip *)bnode->id;
 	
-	MovieDistortionOperation * operation = new MovieDistortionOperation(bnode->custom1 == 1);
+	MovieDistortionOperation *operation = new MovieDistortionOperation(bnode->custom1 == 1);
 	operation->setMovieClip(clip);
 	operation->setFramenumber(context->getFramenumber());
 
diff --git a/source/blender/compositor/nodes/COM_MovieDistortionNode.h b/source/blender/compositor/nodes/COM_MovieDistortionNode.h
index 5ee328c9df3..b97600bb64e 100644
--- a/source/blender/compositor/nodes/COM_MovieDistortionNode.h
+++ b/source/blender/compositor/nodes/COM_MovieDistortionNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief MovieDistortionNode
-  * @ingroup Node
-  */
-class MovieDistortionNode: public Node {
+ * @brief MovieDistortionNode
+ * @ingroup Node
+ */
+class MovieDistortionNode : public Node {
 public:
 	MovieDistortionNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_MuteNode.cpp b/source/blender/compositor/nodes/COM_MuteNode.cpp
index 72303a4d6ee..f52b7216cca 100644
--- a/source/blender/compositor/nodes/COM_MuteNode.cpp
+++ b/source/blender/compositor/nodes/COM_MuteNode.cpp
@@ -20,21 +20,23 @@
  *		Monique Dewanchand
  */
 
+#include <stdio.h>
+
 #include "COM_MuteNode.h"
 #include "COM_SocketConnection.h"
-#include "stdio.h"
 #include "COM_SetValueOperation.h"
 #include "COM_SetVectorOperation.h"
 #include "COM_SetColorOperation.h"
 
-MuteNode::MuteNode(bNode *editorNode): Node(editorNode)
+MuteNode::MuteNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void MuteNode::reconnect(ExecutionSystem * graph, OutputSocket * output)
+void MuteNode::reconnect(ExecutionSystem *graph, OutputSocket *output)
 {
-	vector<InputSocket*> &inputsockets = this->getInputSockets();
-	for (unsigned int index = 0; index < inputsockets.size() ; index ++) {
+	vector<InputSocket *> &inputsockets = this->getInputSockets();
+	for (unsigned int index = 0; index < inputsockets.size(); index++) {
 		InputSocket *input = inputsockets[index];
 		if (input->getDataType() == output->getDataType()) {
 			if (input->isConnected()) {
@@ -44,37 +46,34 @@ void MuteNode::reconnect(ExecutionSystem * graph, OutputSocket * output)
 		}
 	}
 	
-	NodeOperation * operation;
+	NodeOperation *operation = NULL;
 	switch (output->getDataType()) {
-	case COM_DT_VALUE:
-	{
-		SetValueOperation *valueoperation = new SetValueOperation();
-		valueoperation->setValue(0.0f);
-		operation = valueoperation;
-		break;
-	}
-	case COM_DT_VECTOR:
-	{
-		SetVectorOperation *vectoroperation = new SetVectorOperation();
-		vectoroperation->setX(0.0f);
-		vectoroperation->setY(0.0f);
-		vectoroperation->setW(0.0f);
-		operation = vectoroperation;
-		break;
-	}
-	case COM_DT_COLOR:
-	{
-		SetColorOperation *coloroperation = new SetColorOperation();
-		coloroperation->setChannel1(0.0f);
-		coloroperation->setChannel2(0.0f);
-		coloroperation->setChannel3(0.0f);
-		coloroperation->setChannel4(0.0f);
-		operation = coloroperation;
-		break;
-	}
-		/* quiet warnings */
-	case COM_DT_UNKNOWN:
-		break;
+		case COM_DT_VALUE:
+		{
+			SetValueOperation *valueoperation = new SetValueOperation();
+			valueoperation->setValue(0.0f);
+			operation = valueoperation;
+			break;
+		}
+		case COM_DT_VECTOR:
+		{
+			SetVectorOperation *vectoroperation = new SetVectorOperation();
+			vectoroperation->setX(0.0f);
+			vectoroperation->setY(0.0f);
+			vectoroperation->setW(0.0f);
+			operation = vectoroperation;
+			break;
+		}
+		case COM_DT_COLOR:
+		{
+			SetColorOperation *coloroperation = new SetColorOperation();
+			coloroperation->setChannel1(0.0f);
+			coloroperation->setChannel2(0.0f);
+			coloroperation->setChannel3(0.0f);
+			coloroperation->setChannel4(0.0f);
+			operation = coloroperation;
+			break;
+		}
 	}
 
 	if (operation) {
@@ -85,12 +84,12 @@ void MuteNode::reconnect(ExecutionSystem * graph, OutputSocket * output)
 	output->clearConnections();
 }
 
-void MuteNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void MuteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
-	vector<OutputSocket*> &outputsockets = this->getOutputSockets();
+	vector<OutputSocket *> &outputsockets = this->getOutputSockets();
 
-	for (unsigned int index = 0 ; index < outputsockets.size() ; index ++) {
-		OutputSocket * output = outputsockets[index];
+	for (unsigned int index = 0; index < outputsockets.size(); index++) {
+		OutputSocket *output = outputsockets[index];
 		if (output->isConnected()) {
 			reconnect(graph, output);
 		}
diff --git a/source/blender/compositor/nodes/COM_MuteNode.h b/source/blender/compositor/nodes/COM_MuteNode.h
index 2dfc786ef2b..aab37e5f888 100644
--- a/source/blender/compositor/nodes/COM_MuteNode.h
+++ b/source/blender/compositor/nodes/COM_MuteNode.h
@@ -26,15 +26,15 @@
 #include "COM_Node.h"
 
 /**
-  * @brief MuteNode
-  * @ingroup Node
-  */
-class MuteNode: public Node {
+ * @brief MuteNode
+ * @ingroup Node
+ */
+class MuteNode : public Node {
 public:
 	MuteNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 private:
-	void reconnect(ExecutionSystem *graph, OutputSocket * output);
+	void reconnect(ExecutionSystem *graph, OutputSocket *output);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_NormalNode.cpp b/source/blender/compositor/nodes/COM_NormalNode.cpp
index 0b1faafe302..e00e71e50e9 100644
--- a/source/blender/compositor/nodes/COM_NormalNode.cpp
+++ b/source/blender/compositor/nodes/COM_NormalNode.cpp
@@ -26,19 +26,21 @@
 #include "COM_DotproductOperation.h"
 #include "COM_SetVectorOperation.h"
 
-NormalNode::NormalNode(bNode *editorNode): Node(editorNode)
-{}
+NormalNode::NormalNode(bNode *editorNode) : Node(editorNode)
+{
+	/* pass */
+}
 
-void NormalNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void NormalNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *inputSocket = this->getInputSocket(0);
 	OutputSocket *outputSocket = this->getOutputSocket(0);
 	OutputSocket *outputSocketDotproduct = this->getOutputSocket(1);
 	bNode *editorNode = this->getbNode();
 	
-	SetVectorOperation * operationSet = new SetVectorOperation();
-	bNodeSocket * insock = (bNodeSocket*)editorNode->outputs.first;
-	bNodeSocketValueVector *dval = (bNodeSocketValueVector*)insock->default_value;
+	SetVectorOperation *operationSet = new SetVectorOperation();
+	bNodeSocket *insock = (bNodeSocket *)editorNode->outputs.first;
+	bNodeSocketValueVector *dval = (bNodeSocketValueVector *)insock->default_value;
 	operationSet->setX(dval->value[0]);
 	operationSet->setY(dval->value[1]);
 	operationSet->setZ(dval->value[2]);
diff --git a/source/blender/compositor/nodes/COM_NormalNode.h b/source/blender/compositor/nodes/COM_NormalNode.h
index 1e7c7c584c3..bf684298e65 100644
--- a/source/blender/compositor/nodes/COM_NormalNode.h
+++ b/source/blender/compositor/nodes/COM_NormalNode.h
@@ -26,14 +26,14 @@
 #include "COM_Node.h"
 
 /**
-  * @brief NormalNode
-  * @ingroup Node
-  */
+ * @brief NormalNode
+ * @ingroup Node
+ */
 class NormalNode : public Node
 {
 public:
 	NormalNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif // COM_NormalNODE_H
diff --git a/source/blender/compositor/nodes/COM_NormalizeNode.cpp b/source/blender/compositor/nodes/COM_NormalizeNode.cpp
index 11173b3a73f..7c1c695f8b6 100644
--- a/source/blender/compositor/nodes/COM_NormalizeNode.cpp
+++ b/source/blender/compositor/nodes/COM_NormalizeNode.cpp
@@ -23,11 +23,12 @@
 #include "COM_NormalizeOperation.h"
 #include "COM_ExecutionSystem.h"
 
-NormalizeNode::NormalizeNode(bNode *editorNode): Node(editorNode)
+NormalizeNode::NormalizeNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void NormalizeNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void NormalizeNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	NormalizeOperation *operation = new NormalizeOperation();
 
diff --git a/source/blender/compositor/nodes/COM_NormalizeNode.h b/source/blender/compositor/nodes/COM_NormalizeNode.h
index ce7a6e1f7ab..ea1497efdc6 100644
--- a/source/blender/compositor/nodes/COM_NormalizeNode.h
+++ b/source/blender/compositor/nodes/COM_NormalizeNode.h
@@ -25,13 +25,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief NormalizeNode
-  * @ingroup Node
-  */
-class NormalizeNode: public Node {
+ * @brief NormalizeNode
+ * @ingroup Node
+ */
+class NormalizeNode : public Node {
 public:
 	NormalizeNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_OutputFileNode.cpp b/source/blender/compositor/nodes/COM_OutputFileNode.cpp
index cc060e9f7cd..402529b9186 100644
--- a/source/blender/compositor/nodes/COM_OutputFileNode.cpp
+++ b/source/blender/compositor/nodes/COM_OutputFileNode.cpp
@@ -27,13 +27,14 @@
 #include "BLI_path_util.h"
 #include "BKE_utildefines.h"
 
-OutputFileNode::OutputFileNode(bNode *editorNode): Node(editorNode)
+OutputFileNode::OutputFileNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void OutputFileNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void OutputFileNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
-	NodeImageMultiFile *storage = (NodeImageMultiFile*)this->getbNode()->storage;
+	NodeImageMultiFile *storage = (NodeImageMultiFile *)this->getbNode()->storage;
 	
 	if (!context->isRendering()) {
 		/* XXX TODO as in previous implementation?
@@ -41,14 +42,14 @@ void OutputFileNode::convertToOperations(ExecutionSystem *graph, CompositorConte
 		 */
 	}
 	
-	if (storage->format.imtype==R_IMF_IMTYPE_MULTILAYER) {
+	if (storage->format.imtype == R_IMF_IMTYPE_MULTILAYER) {
 		/* single output operation for the multilayer file */
 		OutputOpenExrMultiLayerOperation *outputOperation = new OutputOpenExrMultiLayerOperation(
-				context->getScene(), context->getbNodeTree(), storage->base_path, storage->format.exr_codec);
+		        context->getScene(), context->getbNodeTree(), storage->base_path, storage->format.exr_codec);
 		
 		int num_inputs = getNumberOfInputSockets();
 		bool hasConnections = false;
-		for (int i=0; i < num_inputs; ++i) {
+		for (int i = 0; i < num_inputs; ++i) {
 			InputSocket *input = getInputSocket(i);
 			if (input->isConnected()) {
 				hasConnections = true;
@@ -59,14 +60,14 @@ void OutputFileNode::convertToOperations(ExecutionSystem *graph, CompositorConte
 				input->relinkConnections(outputOperation->getInputSocket(i));
 			}
 		}
-		if (hasConnections) addPreviewOperation(graph, outputOperation->getInputSocket(0), 5);
+		if (hasConnections) addPreviewOperation(graph, outputOperation->getInputSocket(0));
 		
 		graph->addOperation(outputOperation);
 	}
-	else {	/* single layer format */
+	else {  /* single layer format */
 		int num_inputs = getNumberOfInputSockets();
 		bool previewAdded = false;
-		for (int i=0; i < num_inputs; ++i) {
+		for (int i = 0; i < num_inputs; ++i) {
 			InputSocket *input = getInputSocket(i);
 			if (input->isConnected()) {
 				NodeImageMultiFileSocket *sockdata = (NodeImageMultiFileSocket *)input->getbNodeSocket()->storage;
@@ -77,11 +78,11 @@ void OutputFileNode::convertToOperations(ExecutionSystem *graph, CompositorConte
 				BLI_join_dirfile(path, FILE_MAX, storage->base_path, sockdata->path);
 				
 				OutputSingleLayerOperation *outputOperation = new OutputSingleLayerOperation(
-						context->getScene(), context->getbNodeTree(), input->getActualDataType(), format, path);
+				        context->getScene(), context->getbNodeTree(), input->getDataType(), format, path);
 				input->relinkConnections(outputOperation->getInputSocket(0));
 				graph->addOperation(outputOperation);
 				if (!previewAdded) {
-					addPreviewOperation(graph, outputOperation->getInputSocket(0), 5);
+					addPreviewOperation(graph, outputOperation->getInputSocket(0));
 					previewAdded = true;
 				}
 			}
diff --git a/source/blender/compositor/nodes/COM_OutputFileNode.h b/source/blender/compositor/nodes/COM_OutputFileNode.h
index 10cbba7d50f..79c9b577643 100644
--- a/source/blender/compositor/nodes/COM_OutputFileNode.h
+++ b/source/blender/compositor/nodes/COM_OutputFileNode.h
@@ -28,13 +28,13 @@
 #include "DNA_node_types.h"
 
 /**
-  * @brief OutputFileNode
-  * @ingroup Node
-  */
+ * @brief OutputFileNode
+ * @ingroup Node
+ */
 class OutputFileNode : public Node {
 public:
 	OutputFileNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
index 4e99db090e1..95e759fde24 100644
--- a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
+++ b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
@@ -47,14 +47,15 @@
 #include "COM_ScaleOperation.h"
 #include "COM_SetValueOperation.h"
 
-RenderLayersNode::RenderLayersNode(bNode *editorNode): Node(editorNode)
+RenderLayersNode::RenderLayersNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void RenderLayersNode::testSocketConnection(ExecutionSystem *system, int outputSocketNumber, RenderLayersBaseProg * operation)
+void RenderLayersNode::testSocketConnection(ExecutionSystem *system, int outputSocketNumber, RenderLayersBaseProg *operation)
 {
 	OutputSocket *outputSocket = this->getOutputSocket(outputSocketNumber);
-	Scene *scene = (Scene*)this->getbNode()->id;
+	Scene *scene = (Scene *)this->getbNode()->id;
 	short layerId = this->getbNode()->custom1;
 
 	if (outputSocket->isConnected()) {
@@ -63,7 +64,7 @@ void RenderLayersNode::testSocketConnection(ExecutionSystem *system, int outputS
 		outputSocket->relinkConnections(operation->getOutputSocket());
 		system->addOperation(operation);
 		if (outputSocketNumber == 0) { // only do for image socket if connected
-			addPreviewOperation(system, operation->getOutputSocket(), 9);
+			addPreviewOperation(system, operation->getOutputSocket());
 		}
 	}
 	else {
@@ -71,7 +72,7 @@ void RenderLayersNode::testSocketConnection(ExecutionSystem *system, int outputS
 			system->addOperation(operation);
 			operation->setScene(scene);
 			operation->setLayerId(layerId);
-			addPreviewOperation(system, operation->getOutputSocket(), 9);
+			addPreviewOperation(system, operation->getOutputSocket());
 		}
 		else {
 			delete operation;
@@ -79,7 +80,7 @@ void RenderLayersNode::testSocketConnection(ExecutionSystem *system, int outputS
 	}
 }
 
-void RenderLayersNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void RenderLayersNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	testSocketConnection(graph, 0, new RenderLayersColourProg());
 	testSocketConnection(graph, 1, new RenderLayersAlphaProg());
diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.h b/source/blender/compositor/nodes/COM_RenderLayersNode.h
index f796a7147d9..32672c8ba2d 100644
--- a/source/blender/compositor/nodes/COM_RenderLayersNode.h
+++ b/source/blender/compositor/nodes/COM_RenderLayersNode.h
@@ -25,13 +25,13 @@
 #include "COM_RenderLayersBaseProg.h"
 
 /**
-  * @brief RenderLayersNode
-  * @ingroup Node
-  */
+ * @brief RenderLayersNode
+ * @ingroup Node
+ */
 class RenderLayersNode : public Node {
 public:
 	RenderLayersNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 private:
-	void testSocketConnection(ExecutionSystem *graph, int outputSocketNumber, RenderLayersBaseProg * operation);
+	void testSocketConnection(ExecutionSystem *graph, int outputSocketNumber, RenderLayersBaseProg *operation);
 };
diff --git a/source/blender/compositor/nodes/COM_RotateNode.cpp b/source/blender/compositor/nodes/COM_RotateNode.cpp
index 48acc567739..bb058d18b80 100644
--- a/source/blender/compositor/nodes/COM_RotateNode.cpp
+++ b/source/blender/compositor/nodes/COM_RotateNode.cpp
@@ -28,9 +28,10 @@
 
 RotateNode::RotateNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void RotateNode::convertToOperations(ExecutionSystem *system, CompositorContext * context)
+void RotateNode::convertToOperations(ExecutionSystem *system, CompositorContext *context)
 {
 	InputSocket *inputSocket = this->getInputSocket(0);
 	InputSocket *inputDegreeSocket = this->getInputSocket(1);
@@ -39,15 +40,15 @@ void RotateNode::convertToOperations(ExecutionSystem *system, CompositorContext
 	SetSamplerOperation *sampler = new SetSamplerOperation();
 
 	switch (this->getbNode()->custom1) {
-	case 0:
-		sampler->setSampler(COM_PS_NEAREST);
-		break ;
-	case 1:
-		sampler->setSampler(COM_PS_BILINEAR);
-		break;
-	case 2:
-		sampler->setSampler(COM_PS_BICUBIC);
-		break;
+		case 0:
+			sampler->setSampler(COM_PS_NEAREST);
+			break;
+		case 1:
+			sampler->setSampler(COM_PS_BILINEAR);
+			break;
+		case 2:
+			sampler->setSampler(COM_PS_BICUBIC);
+			break;
 	
 	}
 
diff --git a/source/blender/compositor/nodes/COM_RotateNode.h b/source/blender/compositor/nodes/COM_RotateNode.h
index 9b471742aab..6e3801e5353 100644
--- a/source/blender/compositor/nodes/COM_RotateNode.h
+++ b/source/blender/compositor/nodes/COM_RotateNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief RotateNode
-  * @ingroup Node
-  */
-class RotateNode: public Node {
+ * @brief RotateNode
+ * @ingroup Node
+ */
+class RotateNode : public Node {
 public:
 	RotateNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_ScaleNode.cpp b/source/blender/compositor/nodes/COM_ScaleNode.cpp
index d709781299f..17b521c589d 100644
--- a/source/blender/compositor/nodes/COM_ScaleNode.cpp
+++ b/source/blender/compositor/nodes/COM_ScaleNode.cpp
@@ -15,8 +15,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributor: 
- *		Jeroen Bakker 
+ * Contributor:
+ *		Jeroen Bakker
  *		Monique Dewanchand
  */
 
@@ -29,9 +29,10 @@
 
 ScaleNode::ScaleNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *inputSocket = this->getInputSocket(0);
 	InputSocket *inputXSocket = this->getInputSocket(1);
@@ -39,50 +40,56 @@ void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext *
 	OutputSocket *outputSocket = this->getOutputSocket(0);
 	bNode *bnode = this->getbNode();
 	switch (bnode->custom1) {
-	case CMP_SCALE_RELATIVE: {
-		ScaleOperation *operation = new ScaleOperation();
-	
-		inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
-		inputXSocket->relinkConnections(operation->getInputSocket(1), 1, graph);
-		inputYSocket->relinkConnections(operation->getInputSocket(2), 2, graph);
-		outputSocket->relinkConnections(operation->getOutputSocket(0));
-		graph->addOperation(operation);
-	}
+		case CMP_SCALE_RELATIVE: {
+			ScaleOperation *operation = new ScaleOperation();
+
+			inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
+			inputXSocket->relinkConnections(operation->getInputSocket(1), 1, graph);
+			inputYSocket->relinkConnections(operation->getInputSocket(2), 2, graph);
+			outputSocket->relinkConnections(operation->getOutputSocket(0));
+			graph->addOperation(operation);
+		}
 		break;
-	case CMP_SCALE_SCENEPERCENT: {
-		SetValueOperation * scaleFactorOperation = new SetValueOperation();
-		scaleFactorOperation->setValue(context->getScene()->r.size/100.0f);
-		ScaleOperation * operation = new ScaleOperation();
-		inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
-		addLink(graph, scaleFactorOperation->getOutputSocket(), operation->getInputSocket(1));
-		addLink(graph, scaleFactorOperation->getOutputSocket(), operation->getInputSocket(2));
-		outputSocket->relinkConnections(operation->getOutputSocket(0));
-		graph->addOperation(scaleFactorOperation);
-		graph->addOperation(operation);
-	}
+		case CMP_SCALE_SCENEPERCENT: {
+			SetValueOperation *scaleFactorOperation = new SetValueOperation();
+			scaleFactorOperation->setValue(context->getScene()->r.size / 100.0f);
+			ScaleOperation *operation = new ScaleOperation();
+			inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
+			addLink(graph, scaleFactorOperation->getOutputSocket(), operation->getInputSocket(1));
+			addLink(graph, scaleFactorOperation->getOutputSocket(), operation->getInputSocket(2));
+			outputSocket->relinkConnections(operation->getOutputSocket(0));
+			graph->addOperation(scaleFactorOperation);
+			graph->addOperation(operation);
+		}
 		break;
-		
-	case CMP_SCALE_RENDERPERCENT: {
-		const RenderData *data = &context->getScene()->r;
-		ScaleFixedSizeOperation * operation = new ScaleFixedSizeOperation();
-		operation->setNewWidth(data->xsch*data->size/100.0f);
-		operation->setNewHeight(data->ysch*data->size/100.0f);
-		inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
-		outputSocket->relinkConnections(operation->getOutputSocket(0));
-		operation->getInputSocket(0)->getConnection()->setIgnoreResizeCheck(true);
-		graph->addOperation(operation);
-	}
+
+		case CMP_SCALE_RENDERPERCENT: {
+			const RenderData *data = &context->getScene()->r;
+			ScaleFixedSizeOperation *operation = new ScaleFixedSizeOperation();
+
+			/* framing options */
+			operation->setIsAspect((bnode->custom2 & CMP_SCALE_RENDERSIZE_FRAME_ASPECT) != 0);
+			operation->setIsCrop((bnode->custom2 & CMP_SCALE_RENDERSIZE_FRAME_CROP) != 0);
+			operation->setOffset(bnode->custom3, bnode->custom4);
+
+			operation->setNewWidth(data->xsch * data->size / 100.0f);
+			operation->setNewHeight(data->ysch * data->size / 100.0f);
+			inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
+			outputSocket->relinkConnections(operation->getOutputSocket(0));
+			operation->getInputSocket(0)->getConnection()->setIgnoreResizeCheck(true);
+			graph->addOperation(operation);
+		}
 		break;
-		
-	case CMP_SCALE_ABSOLUTE: {
-		ScaleAbsoluteOperation *operation = new ScaleAbsoluteOperation(); // TODO: what is the use of this one.... perhaps some issues when the ui was updated....
-	
-		inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
-		inputXSocket->relinkConnections(operation->getInputSocket(1), 1, graph);
-		inputYSocket->relinkConnections(operation->getInputSocket(2), 2, graph);
-		outputSocket->relinkConnections(operation->getOutputSocket(0));
-		graph->addOperation(operation);
-	}
+
+		case CMP_SCALE_ABSOLUTE: {
+			ScaleAbsoluteOperation *operation = new ScaleAbsoluteOperation(); // TODO: what is the use of this one.... perhaps some issues when the ui was updated....
+
+			inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
+			inputXSocket->relinkConnections(operation->getInputSocket(1), 1, graph);
+			inputYSocket->relinkConnections(operation->getInputSocket(2), 2, graph);
+			outputSocket->relinkConnections(operation->getOutputSocket(0));
+			graph->addOperation(operation);
+		}
 		break;
 	}
 }
diff --git a/source/blender/compositor/nodes/COM_ScaleNode.h b/source/blender/compositor/nodes/COM_ScaleNode.h
index 310ae96a65e..17c7b672a59 100644
--- a/source/blender/compositor/nodes/COM_ScaleNode.h
+++ b/source/blender/compositor/nodes/COM_ScaleNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief ScaleNode
-  * @ingroup Node
-  */
-class ScaleNode: public Node {
+ * @brief ScaleNode
+ * @ingroup Node
+ */
+class ScaleNode : public Node {
 public:
 	ScaleNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp b/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp
index cfce56a080a..4f93b226fa1 100644
--- a/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp
+++ b/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp
@@ -27,11 +27,12 @@
 #include "COM_SetValueOperation.h"
 #include "COM_ConvertRGBToHSVOperation.h"
 
-SeparateHSVANode::SeparateHSVANode(bNode *editorNode): SeparateRGBANode(editorNode)
+SeparateHSVANode::SeparateHSVANode(bNode *editorNode) : SeparateRGBANode(editorNode)
 {
+	/* pass */
 }
 
-void SeparateHSVANode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void SeparateHSVANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	ConvertRGBToHSVOperation *operation = new ConvertRGBToHSVOperation();
 	InputSocket *inputSocket = this->getInputSocket(0);
diff --git a/source/blender/compositor/nodes/COM_SeparateHSVANode.h b/source/blender/compositor/nodes/COM_SeparateHSVANode.h
index 9fbd0212509..4a7e86849dc 100644
--- a/source/blender/compositor/nodes/COM_SeparateHSVANode.h
+++ b/source/blender/compositor/nodes/COM_SeparateHSVANode.h
@@ -28,12 +28,12 @@
 #include "COM_SeparateRGBANode.h"
 
 /**
-  * @brief SeparateHSVANode
-  * @ingroup Node
-  */
+ * @brief SeparateHSVANode
+ * @ingroup Node
+ */
 class SeparateHSVANode : public SeparateRGBANode {
 public:
 	SeparateHSVANode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 #endif
diff --git a/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp b/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
index dd154fe604d..67ac6ffc388 100644
--- a/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
+++ b/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
@@ -28,12 +28,13 @@
 #include "DNA_material_types.h" // the ramp types
 
 
-SeparateRGBANode::SeparateRGBANode(bNode *editorNode): Node(editorNode)
+SeparateRGBANode::SeparateRGBANode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
 
-void SeparateRGBANode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void SeparateRGBANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *imageSocket = this->getInputSocket(0);
 	OutputSocket *outputRSocket = this->getOutputSocket(0);
diff --git a/source/blender/compositor/nodes/COM_SeparateRGBANode.h b/source/blender/compositor/nodes/COM_SeparateRGBANode.h
index 5fb00600790..c1be02753da 100644
--- a/source/blender/compositor/nodes/COM_SeparateRGBANode.h
+++ b/source/blender/compositor/nodes/COM_SeparateRGBANode.h
@@ -26,12 +26,12 @@
 #include "COM_Node.h"
 #include "DNA_node_types.h"
 /**
-  * @brief SeparateRGBANode
-  * @ingroup Node
-  */
+ * @brief SeparateRGBANode
+ * @ingroup Node
+ */
 class SeparateRGBANode : public Node {
 public:
 	SeparateRGBANode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 #endif
diff --git a/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp b/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp
index 68d20235de7..154e2bcd550 100644
--- a/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp
+++ b/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp
@@ -25,8 +25,9 @@
 #include "COM_SetValueOperation.h"
 #include "COM_ConvertRGBToYCCOperation.h"
 
-SeparateYCCANode::SeparateYCCANode(bNode *editorNode): SeparateRGBANode(editorNode)
+SeparateYCCANode::SeparateYCCANode(bNode *editorNode) : SeparateRGBANode(editorNode)
 {
+	/* pass */
 }
 
 void SeparateYCCANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
diff --git a/source/blender/compositor/nodes/COM_SeparateYCCANode.h b/source/blender/compositor/nodes/COM_SeparateYCCANode.h
index 441eba9bc93..4b216841e2a 100644
--- a/source/blender/compositor/nodes/COM_SeparateYCCANode.h
+++ b/source/blender/compositor/nodes/COM_SeparateYCCANode.h
@@ -27,9 +27,9 @@
 #include "COM_SeparateRGBANode.h"
 
 /**
-  * @brief SeparateYCCANode
-  * @ingroup Node
-  */
+ * @brief SeparateYCCANode
+ * @ingroup Node
+ */
 class SeparateYCCANode : public SeparateRGBANode {
 public:
 	SeparateYCCANode(bNode *editorNode);
diff --git a/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp b/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp
index 650e5d1340b..8a647b7f849 100644
--- a/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp
+++ b/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp
@@ -25,8 +25,9 @@
 #include "COM_SetValueOperation.h"
 #include "COM_ConvertRGBToYUVOperation.h"
 
-SeparateYUVANode::SeparateYUVANode(bNode *editorNode): SeparateRGBANode(editorNode)
+SeparateYUVANode::SeparateYUVANode(bNode *editorNode) : SeparateRGBANode(editorNode)
 {
+	/* pass */
 }
 
 void SeparateYUVANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
diff --git a/source/blender/compositor/nodes/COM_SeparateYUVANode.h b/source/blender/compositor/nodes/COM_SeparateYUVANode.h
index 136ce1b4f20..e1763e37dff 100644
--- a/source/blender/compositor/nodes/COM_SeparateYUVANode.h
+++ b/source/blender/compositor/nodes/COM_SeparateYUVANode.h
@@ -27,9 +27,9 @@
 #include "COM_SeparateRGBANode.h"
 
 /**
-  * @brief SeparateYUVANode
-  * @ingroup Node
-  */
+ * @brief SeparateYUVANode
+ * @ingroup Node
+ */
 class SeparateYUVANode : public SeparateRGBANode {
 public:
 	SeparateYUVANode(bNode *editorNode);
diff --git a/source/blender/compositor/nodes/COM_SetAlphaNode.cpp b/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
index 1d09b81c4d2..709dc75b502 100644
--- a/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
+++ b/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
@@ -24,7 +24,7 @@
 #include "COM_SetAlphaOperation.h"
 #include "COM_ExecutionSystem.h"
 
-void SetAlphaNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void SetAlphaNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	SetAlphaOperation *operation = new SetAlphaOperation();
 	
diff --git a/source/blender/compositor/nodes/COM_SetAlphaNode.h b/source/blender/compositor/nodes/COM_SetAlphaNode.h
index c6b603049c5..0707cf5dac1 100644
--- a/source/blender/compositor/nodes/COM_SetAlphaNode.h
+++ b/source/blender/compositor/nodes/COM_SetAlphaNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief SetAlphaNode
-  * @ingroup Node
-  */
-class SetAlphaNode: public Node {
+ * @brief SetAlphaNode
+ * @ingroup Node
+ */
+class SetAlphaNode : public Node {
 public:
-	SetAlphaNode(bNode *editorNode) :Node(editorNode) {}
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	SetAlphaNode(bNode *editorNode) : Node(editorNode) {}
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_SocketProxyNode.cpp b/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
index 42dd49bd1da..bfb32a96156 100644
--- a/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
+++ b/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
@@ -28,7 +28,7 @@
 #include "COM_SetVectorOperation.h"
 #include "COM_SetColorOperation.h"
 
-SocketProxyNode::SocketProxyNode(bNode *editorNode, bNodeSocket *editorInput, bNodeSocket *editorOutput): Node(editorNode, false)
+SocketProxyNode::SocketProxyNode(bNode *editorNode, bNodeSocket *editorInput, bNodeSocket *editorOutput) : Node(editorNode, false)
 {
 	DataType dt;
 	
@@ -43,53 +43,48 @@ SocketProxyNode::SocketProxyNode(bNode *editorNode, bNodeSocket *editorInput, bN
 	this->addOutputSocket(dt, editorOutput);
 }
 
-void SocketProxyNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void SocketProxyNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
-	OutputSocket * outputsocket = this->getOutputSocket(0);
+	OutputSocket *outputsocket = this->getOutputSocket(0);
+	InputSocket *inputsocket = this->getInputSocket(0);
 	if (outputsocket->isConnected()) {
-		SocketProxyOperation *operation = new SocketProxyOperation();
-		this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0));
-		this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
-		graph->addOperation(operation);
-	}
-}
-
-void OutputSocketProxyNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
-{
-	OutputSocket * outputsocket = this->getOutputSocket(0);
-	InputSocket * inputsocket = this->getInputSocket(0);
-	if (outputsocket->isConnected()) {
-		switch (outputsocket->getActualDataType()) {
-		case COM_DT_VALUE:
-		{
-			SetValueOperation *operation = new SetValueOperation();
-			bNodeSocketValueFloat *dval = (bNodeSocketValueFloat*)inputsocket->getbNodeSocket()->default_value;
-			operation->setValue(dval->value);
-			this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
-			graph->addOperation(operation);
-			break;
-		}
-		case COM_DT_COLOR:
-		{
-			SetColorOperation *operation = new SetColorOperation();
-			bNodeSocketValueRGBA *dval = (bNodeSocketValueRGBA*)inputsocket->getbNodeSocket()->default_value;
-			operation->setChannels(dval->value);
-			this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
-			graph->addOperation(operation);
-			break;
-		}
-		case COM_DT_VECTOR:
-		{
-			SetVectorOperation *operation = new SetVectorOperation();
-			bNodeSocketValueVector *dval = (bNodeSocketValueVector*)inputsocket->getbNodeSocket()->default_value;
-			operation->setVector(dval->value);
-			this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
+		if (inputsocket->isConnected()) {
+			SocketProxyOperation *operation = new SocketProxyOperation(this->getOutputSocket()->getDataType());
+			inputsocket->relinkConnections(operation->getInputSocket(0));
+			outputsocket->relinkConnections(operation->getOutputSocket(0));
 			graph->addOperation(operation);
-			break;
 		}
-			/* quiet warnings */
-		case COM_DT_UNKNOWN:
-			break;
+		else {
+			/* If input is not connected, add a constant value operation instead */
+			switch (outputsocket->getDataType()) {
+				case COM_DT_VALUE:
+				{
+					SetValueOperation *operation = new SetValueOperation();
+					bNodeSocketValueFloat *dval = (bNodeSocketValueFloat *)inputsocket->getbNodeSocket()->default_value;
+					operation->setValue(dval->value);
+					outputsocket->relinkConnections(operation->getOutputSocket(0));
+					graph->addOperation(operation);
+					break;
+				}
+				case COM_DT_COLOR:
+				{
+					SetColorOperation *operation = new SetColorOperation();
+					bNodeSocketValueRGBA *dval = (bNodeSocketValueRGBA *)inputsocket->getbNodeSocket()->default_value;
+					operation->setChannels(dval->value);
+					outputsocket->relinkConnections(operation->getOutputSocket(0));
+					graph->addOperation(operation);
+					break;
+				}
+				case COM_DT_VECTOR:
+				{
+					SetVectorOperation *operation = new SetVectorOperation();
+					bNodeSocketValueVector *dval = (bNodeSocketValueVector *)inputsocket->getbNodeSocket()->default_value;
+					operation->setVector(dval->value);
+					outputsocket->relinkConnections(operation->getOutputSocket(0));
+					graph->addOperation(operation);
+					break;
+				}
+			}
 		}
 	}
 }
diff --git a/source/blender/compositor/nodes/COM_SocketProxyNode.h b/source/blender/compositor/nodes/COM_SocketProxyNode.h
index 1b5ee699211..ea50be418e2 100644
--- a/source/blender/compositor/nodes/COM_SocketProxyNode.h
+++ b/source/blender/compositor/nodes/COM_SocketProxyNode.h
@@ -26,21 +26,15 @@
 #include "COM_Node.h"
 
 /**
-  * @brief SocketProxyNode
-  * @ingroup Node
-  */
-class SocketProxyNode: public Node {
+ * @brief SocketProxyNode
+ * @ingroup Node
+ */
+class SocketProxyNode : public Node {
 public:
 	SocketProxyNode(bNode *editorNode, bNodeSocket *editorInput, bNodeSocket *editorOutput);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 
 	virtual bool isProxyNode() const { return true; }
 };
 
-class OutputSocketProxyNode: public SocketProxyNode {
-public:
-	OutputSocketProxyNode(bNode *editorNode, bNodeSocket *editorInput, bNodeSocket *editorOutput): SocketProxyNode(editorNode, editorInput, editorOutput) {}
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
-};
-
 #endif
diff --git a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
index 9f9efbd8fe5..22a00410384 100644
--- a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
+++ b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
@@ -26,26 +26,36 @@
 #include "COM_SplitViewerOperation.h"
 #include "COM_ExecutionSystem.h"
 
-SplitViewerNode::SplitViewerNode(bNode *editorNode): Node(editorNode)
+SplitViewerNode::SplitViewerNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void SplitViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void SplitViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *image1Socket = this->getInputSocket(0);
 	InputSocket *image2Socket = this->getInputSocket(1);
-	Image *image = (Image*)this->getbNode()->id;
-	ImageUser * imageUser = (ImageUser*) this->getbNode()->storage;
+	Image *image = (Image *)this->getbNode()->id;
+	ImageUser *imageUser = (ImageUser *) this->getbNode()->storage;
 	if (image1Socket->isConnected() && image2Socket->isConnected()) {
 		SplitViewerOperation *splitViewerOperation = new SplitViewerOperation();
+		splitViewerOperation->setColorManagement(context->getScene()->r.color_mgt_flag & R_COLOR_MANAGEMENT);
+		splitViewerOperation->setColorPredivide(context->getScene()->r.color_mgt_flag & R_COLOR_MANAGEMENT_PREDIVIDE);
 		splitViewerOperation->setImage(image);
 		splitViewerOperation->setImageUser(imageUser);
-		splitViewerOperation->setActive(this->getbNode()->flag & NODE_DO_OUTPUT);
+		splitViewerOperation->setActive((this->getbNode()->flag & NODE_DO_OUTPUT) && this->isInActiveGroup());
 		splitViewerOperation->setSplitPercentage(this->getbNode()->custom1);
+
+		/* defaults - the viewer node has these options but not exposed for split view
+		 * we could use the split to define an area of interest on one axis at least */
+		splitViewerOperation->setChunkOrder(COM_ORDER_OF_CHUNKS_DEFAULT);
+		splitViewerOperation->setCenterX(0.5f);
+		splitViewerOperation->setCenterY(0.5f);
+
 		splitViewerOperation->setXSplit(!this->getbNode()->custom2);
 		image1Socket->relinkConnections(splitViewerOperation->getInputSocket(0), 0, graph);
 		image2Socket->relinkConnections(splitViewerOperation->getInputSocket(1), 1, graph);
-		addPreviewOperation(graph, splitViewerOperation->getInputSocket(0), 0);
+		addPreviewOperation(graph, splitViewerOperation->getInputSocket(0));
 		graph->addOperation(splitViewerOperation);
 	}
 }
diff --git a/source/blender/compositor/nodes/COM_SplitViewerNode.h b/source/blender/compositor/nodes/COM_SplitViewerNode.h
index e2d7a8c0dc9..6c532d4e813 100644
--- a/source/blender/compositor/nodes/COM_SplitViewerNode.h
+++ b/source/blender/compositor/nodes/COM_SplitViewerNode.h
@@ -26,12 +26,12 @@
 #include "COM_Node.h"
 #include "DNA_node_types.h"
 /**
-  * @brief SplitViewerNode
-  * @ingroup Node
-  */
+ * @brief SplitViewerNode
+ * @ingroup Node
+ */
 class SplitViewerNode : public Node {
 public:
 	SplitViewerNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 #endif
diff --git a/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp b/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
index 7234e71a43c..85b8695263f 100644
--- a/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
+++ b/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
@@ -32,18 +32,19 @@ extern "C" {
 	#include "BKE_tracking.h"
 }
 
-Stabilize2dNode::Stabilize2dNode(bNode *editorNode): Node(editorNode)
+Stabilize2dNode::Stabilize2dNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void Stabilize2dNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void Stabilize2dNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *imageInput = this->getInputSocket(0);
 	MovieClip *clip = (MovieClip *)getbNode()->id;
 	
-	ScaleOperation * scaleOperation = new ScaleOperation();
-	RotateOperation * rotateOperation = new RotateOperation();
-	TranslateOperation * translateOperation = new TranslateOperation();
+	ScaleOperation *scaleOperation = new ScaleOperation();
+	RotateOperation *rotateOperation = new RotateOperation();
+	TranslateOperation *translateOperation = new TranslateOperation();
 	MovieClipAttributeOperation *scaleAttribute = new MovieClipAttributeOperation();
 	MovieClipAttributeOperation *angleAttribute = new MovieClipAttributeOperation();
 	MovieClipAttributeOperation *xAttribute = new MovieClipAttributeOperation();
diff --git a/source/blender/compositor/nodes/COM_Stabilize2dNode.h b/source/blender/compositor/nodes/COM_Stabilize2dNode.h
index 63bf50b4d69..589e090b48c 100644
--- a/source/blender/compositor/nodes/COM_Stabilize2dNode.h
+++ b/source/blender/compositor/nodes/COM_Stabilize2dNode.h
@@ -24,11 +24,11 @@
 #include "DNA_node_types.h"
 
 /**
-  * @brief Stabilize2dNode
-  * @ingroup Node
-  */
+ * @brief Stabilize2dNode
+ * @ingroup Node
+ */
 class Stabilize2dNode : public Node {
 public:
 	Stabilize2dNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
diff --git a/source/blender/compositor/nodes/COM_SwitchNode.cpp b/source/blender/compositor/nodes/COM_SwitchNode.cpp
index 58c60a96de8..2a4616fcd3e 100644
--- a/source/blender/compositor/nodes/COM_SwitchNode.cpp
+++ b/source/blender/compositor/nodes/COM_SwitchNode.cpp
@@ -24,14 +24,15 @@
 #include "COM_ExecutionSystem.h"
 #include "COM_SocketProxyOperation.h"
 
-SwitchNode::SwitchNode(bNode *editorNode): Node(editorNode)
+SwitchNode::SwitchNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
 
-void SwitchNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void SwitchNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
-	SocketProxyOperation * operation = new SocketProxyOperation();
+	SocketProxyOperation *operation = new SocketProxyOperation(COM_DT_COLOR);
 	int switchFrame = this->getbNode()->custom1;
 
 	if (!switchFrame) {
diff --git a/source/blender/compositor/nodes/COM_SwitchNode.h b/source/blender/compositor/nodes/COM_SwitchNode.h
index da93af42489..be3d54c3000 100644
--- a/source/blender/compositor/nodes/COM_SwitchNode.h
+++ b/source/blender/compositor/nodes/COM_SwitchNode.h
@@ -27,12 +27,12 @@
 #include "COM_NodeOperation.h"
 #include "DNA_node_types.h"
 /**
-  * @brief SwitchNode
-  * @ingroup Node
-  */
+ * @brief SwitchNode
+ * @ingroup Node
+ */
 class SwitchNode : public Node {
 public:
 	SwitchNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 #endif
diff --git a/source/blender/compositor/nodes/COM_TextureNode.cpp b/source/blender/compositor/nodes/COM_TextureNode.cpp
index be8bb623f4c..a3526e3c1a1 100644
--- a/source/blender/compositor/nodes/COM_TextureNode.cpp
+++ b/source/blender/compositor/nodes/COM_TextureNode.cpp
@@ -24,14 +24,15 @@
 #include "COM_ExecutionSystem.h"
 #include "COM_TextureOperation.h"
 
-TextureNode::TextureNode(bNode *editorNode): Node(editorNode)
+TextureNode::TextureNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void TextureNode::convertToOperations(ExecutionSystem *system, CompositorContext * context)
+void TextureNode::convertToOperations(ExecutionSystem *system, CompositorContext *context)
 {
 	bNode *editorNode = this->getbNode();
-	Tex *texture = (Tex*)editorNode->id;
+	Tex *texture = (Tex *)editorNode->id;
 	TextureOperation *operation = new TextureOperation();
 	this->getOutputSocket(1)->relinkConnections(operation->getOutputSocket());
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, system);
@@ -39,7 +40,7 @@ void TextureNode::convertToOperations(ExecutionSystem *system, CompositorContext
 	operation->setTexture(texture);
 	operation->setScene(context->getScene());
 	system->addOperation(operation);
-	addPreviewOperation(system, operation->getOutputSocket(), 9);
+	addPreviewOperation(system, operation->getOutputSocket());
 
 	if (this->getOutputSocket(0)->isConnected()) {
 		TextureAlphaOperation *alphaOperation = new TextureAlphaOperation();
diff --git a/source/blender/compositor/nodes/COM_TextureNode.h b/source/blender/compositor/nodes/COM_TextureNode.h
index 15c39db9077..e0d931c65da 100644
--- a/source/blender/compositor/nodes/COM_TextureNode.h
+++ b/source/blender/compositor/nodes/COM_TextureNode.h
@@ -24,11 +24,11 @@
 #include "DNA_node_types.h"
 
 /**
-  * @brief TextureNode
-  * @ingroup Node
-  */
+ * @brief TextureNode
+ * @ingroup Node
+ */
 class TextureNode : public Node {
 public:
 	TextureNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
diff --git a/source/blender/compositor/nodes/COM_TimeNode.cpp b/source/blender/compositor/nodes/COM_TimeNode.cpp
index b3ce27a3829..8e155e375e1 100644
--- a/source/blender/compositor/nodes/COM_TimeNode.cpp
+++ b/source/blender/compositor/nodes/COM_TimeNode.cpp
@@ -29,11 +29,12 @@ extern "C" {
 }
 #include "BLI_utildefines.h"
 
-TimeNode::TimeNode(bNode *editorNode): Node(editorNode)
+TimeNode::TimeNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void TimeNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void TimeNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	SetValueOperation *operation = new SetValueOperation();
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
@@ -50,10 +51,10 @@ void TimeNode::convertToOperations(ExecutionSystem *graph, CompositorContext * c
 		fac = 1.0f;
 	}
 	else if (node->custom1 < node->custom2) {
-		fac = (context->getFramenumber() - node->custom1)/(float)(node->custom2-node->custom1);
+		fac = (context->getFramenumber() - node->custom1) / (float)(node->custom2 - node->custom1);
 	}
 
-	fac = curvemapping_evaluateF((CurveMapping*)node->storage, 0, fac);
+	fac = curvemapping_evaluateF((CurveMapping *)node->storage, 0, fac);
 	operation->setValue(CLAMPIS(fac, 0.0f, 1.0f));
 	graph->addOperation(operation);
 }
diff --git a/source/blender/compositor/nodes/COM_TimeNode.h b/source/blender/compositor/nodes/COM_TimeNode.h
index 26751f6f104..df3cf024714 100644
--- a/source/blender/compositor/nodes/COM_TimeNode.h
+++ b/source/blender/compositor/nodes/COM_TimeNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief TimeNode
-  * @ingroup Node
-  */
-class TimeNode: public Node {
+ * @brief TimeNode
+ * @ingroup Node
+ */
+class TimeNode : public Node {
 public:
 	TimeNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_TonemapNode.cpp b/source/blender/compositor/nodes/COM_TonemapNode.cpp
index 80f02f3edbb..a1f33ed464b 100644
--- a/source/blender/compositor/nodes/COM_TonemapNode.cpp
+++ b/source/blender/compositor/nodes/COM_TonemapNode.cpp
@@ -25,14 +25,15 @@
 #include "COM_TonemapOperation.h"
 #include "COM_ExecutionSystem.h"
 
-TonemapNode::TonemapNode(bNode *editorNode): Node(editorNode)
+TonemapNode::TonemapNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void TonemapNode::convertToOperations(ExecutionSystem *system, CompositorContext * context)
+void TonemapNode::convertToOperations(ExecutionSystem *system, CompositorContext *context)
 {
-	NodeTonemap *data = (NodeTonemap*)this->getbNode()->storage;
-	TonemapOperation *operation = data->type==1?new PhotoreceptorTonemapOperation():new TonemapOperation();
+	NodeTonemap *data = (NodeTonemap *)this->getbNode()->storage;
+	TonemapOperation *operation = data->type == 1 ? new PhotoreceptorTonemapOperation() : new TonemapOperation();
 
 	operation->setData(data);
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, system);
diff --git a/source/blender/compositor/nodes/COM_TonemapNode.h b/source/blender/compositor/nodes/COM_TonemapNode.h
index d6dd8474afa..ad0d218826a 100644
--- a/source/blender/compositor/nodes/COM_TonemapNode.h
+++ b/source/blender/compositor/nodes/COM_TonemapNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief TonemapNode
-  * @ingroup Node
-  */
-class TonemapNode: public Node {
+ * @brief TonemapNode
+ * @ingroup Node
+ */
+class TonemapNode : public Node {
 public:
 	TonemapNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_TransformNode.cpp b/source/blender/compositor/nodes/COM_TransformNode.cpp
index da3e85036a5..ff6e276d1ac 100644
--- a/source/blender/compositor/nodes/COM_TransformNode.cpp
+++ b/source/blender/compositor/nodes/COM_TransformNode.cpp
@@ -28,11 +28,12 @@
 #include "COM_SetValueOperation.h"
 #include "COM_SetSamplerOperation.h"
 
-TransformNode::TransformNode(bNode *editorNode): Node(editorNode)
+TransformNode::TransformNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void TransformNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void TransformNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *imageInput = this->getInputSocket(0);
 	InputSocket *xInput = this->getInputSocket(1);
@@ -40,21 +41,21 @@ void TransformNode::convertToOperations(ExecutionSystem *graph, CompositorContex
 	InputSocket *angleInput = this->getInputSocket(3);
 	InputSocket *scaleInput = this->getInputSocket(4);
 	
-	ScaleOperation * scaleOperation = new ScaleOperation();
-	RotateOperation * rotateOperation = new RotateOperation();
-	TranslateOperation * translateOperation = new TranslateOperation();
+	ScaleOperation *scaleOperation = new ScaleOperation();
+	RotateOperation *rotateOperation = new RotateOperation();
+	TranslateOperation *translateOperation = new TranslateOperation();
 	SetSamplerOperation *sampler = new SetSamplerOperation();
 
 	switch (this->getbNode()->custom1) {
-	case 0:
-		sampler->setSampler(COM_PS_NEAREST);
-		break ;
-	case 1:
-		sampler->setSampler(COM_PS_BILINEAR);
-		break;
-	case 2:
-		sampler->setSampler(COM_PS_BICUBIC);
-		break;
+		case 0:
+			sampler->setSampler(COM_PS_NEAREST);
+			break;
+		case 1:
+			sampler->setSampler(COM_PS_BILINEAR);
+			break;
+		case 2:
+			sampler->setSampler(COM_PS_BICUBIC);
+			break;
 	}
 	
 	imageInput->relinkConnections(sampler->getInputSocket(0), 0, graph);
diff --git a/source/blender/compositor/nodes/COM_TransformNode.h b/source/blender/compositor/nodes/COM_TransformNode.h
index 237da44afd9..da40b655f29 100644
--- a/source/blender/compositor/nodes/COM_TransformNode.h
+++ b/source/blender/compositor/nodes/COM_TransformNode.h
@@ -24,11 +24,11 @@
 #include "DNA_node_types.h"
 
 /**
-  * @brief TransformNode
-  * @ingroup Node
-  */
+ * @brief TransformNode
+ * @ingroup Node
+ */
 class TransformNode : public Node {
 public:
 	TransformNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
diff --git a/source/blender/compositor/nodes/COM_TranslateNode.cpp b/source/blender/compositor/nodes/COM_TranslateNode.cpp
index 407c6da4e4d..c805f8f8baa 100644
--- a/source/blender/compositor/nodes/COM_TranslateNode.cpp
+++ b/source/blender/compositor/nodes/COM_TranslateNode.cpp
@@ -27,9 +27,10 @@
 
 TranslateNode::TranslateNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void TranslateNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void TranslateNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *inputSocket = this->getInputSocket(0);
 	InputSocket *inputXSocket = this->getInputSocket(1);
diff --git a/source/blender/compositor/nodes/COM_TranslateNode.h b/source/blender/compositor/nodes/COM_TranslateNode.h
index 295024d6beb..8c350e9cfb3 100644
--- a/source/blender/compositor/nodes/COM_TranslateNode.h
+++ b/source/blender/compositor/nodes/COM_TranslateNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief TranslateNode
-  * @ingroup Node
-  */
-class TranslateNode: public Node {
+ * @brief TranslateNode
+ * @ingroup Node
+ */
+class TranslateNode : public Node {
 public:
 	TranslateNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_ValueNode.cpp b/source/blender/compositor/nodes/COM_ValueNode.cpp
index 39245e75a2f..89b0602f8b0 100644
--- a/source/blender/compositor/nodes/COM_ValueNode.cpp
+++ b/source/blender/compositor/nodes/COM_ValueNode.cpp
@@ -25,15 +25,16 @@
 #include "COM_SetValueOperation.h"
 #include "COM_ExecutionSystem.h"
 
-ValueNode::ValueNode(bNode *editorNode): Node(editorNode)
+ValueNode::ValueNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void ValueNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void ValueNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	SetValueOperation *operation = new SetValueOperation();
 	bNodeSocket *socket = this->getEditorOutputSocket(0);
-	bNodeSocketValueFloat *dval = (bNodeSocketValueFloat*)socket->default_value;
+	bNodeSocketValueFloat *dval = (bNodeSocketValueFloat *)socket->default_value;
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
 	operation->setValue(dval->value);
 	graph->addOperation(operation);
diff --git a/source/blender/compositor/nodes/COM_ValueNode.h b/source/blender/compositor/nodes/COM_ValueNode.h
index 4faf193fc8e..4f478ae93af 100644
--- a/source/blender/compositor/nodes/COM_ValueNode.h
+++ b/source/blender/compositor/nodes/COM_ValueNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief ValueNode
-  * @ingroup Node
-  */
-class ValueNode: public Node {
+ * @brief ValueNode
+ * @ingroup Node
+ */
+class ValueNode : public Node {
 public:
 	ValueNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_VectorBlurNode.cpp b/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
index 596256eb6af..5ef384a9984 100644
--- a/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
+++ b/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
@@ -22,20 +22,17 @@
 
 #include "COM_VectorBlurNode.h"
 #include "DNA_node_types.h"
-#include "COM_FogGlowImageOperation.h"
-#include "COM_BokehBlurOperation.h"
 #include "COM_VectorBlurOperation.h"
-#include "COM_SetValueOperation.h"
-#include "COM_MixBlendOperation.h"
 
-VectorBlurNode::VectorBlurNode(bNode *editorNode): Node(editorNode)
+VectorBlurNode::VectorBlurNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void VectorBlurNode::convertToOperations(ExecutionSystem *system, CompositorContext * context)
+void VectorBlurNode::convertToOperations(ExecutionSystem *system, CompositorContext *context)
 {
 	bNode *node = this->getbNode();
-	NodeBlurData *vectorBlurSettings = (NodeBlurData*)node->storage;
+	NodeBlurData *vectorBlurSettings = (NodeBlurData *)node->storage;
 	VectorBlurOperation *operation = new VectorBlurOperation();
 	operation->setVectorBlurSettings(vectorBlurSettings);
 	operation->setQuality(context->getQuality());
diff --git a/source/blender/compositor/nodes/COM_VectorBlurNode.h b/source/blender/compositor/nodes/COM_VectorBlurNode.h
index 1df945731ce..6b5d277a54b 100644
--- a/source/blender/compositor/nodes/COM_VectorBlurNode.h
+++ b/source/blender/compositor/nodes/COM_VectorBlurNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief VectorBlurNode
-  * @ingroup Node
-  */
-class VectorBlurNode: public Node {
+ * @brief VectorBlurNode
+ * @ingroup Node
+ */
+class VectorBlurNode : public Node {
 public:
 	VectorBlurNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_VectorCurveNode.cpp b/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
index 908e1a19f16..ee32c3b77a3 100644
--- a/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
+++ b/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
@@ -25,18 +25,19 @@
 #include "COM_VectorCurveOperation.h"
 #include "COM_ExecutionSystem.h"
 
-VectorCurveNode::VectorCurveNode(bNode *editorNode): Node(editorNode)
+VectorCurveNode::VectorCurveNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void VectorCurveNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void VectorCurveNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	VectorCurveOperation *operation = new VectorCurveOperation();
 
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
 
-	operation->setCurveMapping((CurveMapping*)this->getbNode()->storage);
+	operation->setCurveMapping((CurveMapping *)this->getbNode()->storage);
 
 	graph->addOperation(operation);
 }
diff --git a/source/blender/compositor/nodes/COM_VectorCurveNode.h b/source/blender/compositor/nodes/COM_VectorCurveNode.h
index 9fbcfd50156..3201090df14 100644
--- a/source/blender/compositor/nodes/COM_VectorCurveNode.h
+++ b/source/blender/compositor/nodes/COM_VectorCurveNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief VectorCurveNode
-  * @ingroup Node
-  */
-class VectorCurveNode: public Node {
+ * @brief VectorCurveNode
+ * @ingroup Node
+ */
+class VectorCurveNode : public Node {
 public:
 	VectorCurveNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp b/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
index cedf81e3f2a..309568c3aec 100644
--- a/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
+++ b/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
@@ -26,21 +26,23 @@
 #include "COM_CalculateMeanOperation.h"
 #include "COM_CalculateStandardDeviationOperation.h"
 
-ViewLevelsNode::ViewLevelsNode(bNode *editorNode): Node(editorNode)
+ViewLevelsNode::ViewLevelsNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
-void ViewLevelsNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+
+void ViewLevelsNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
-	InputSocket * input = this->getInputSocket(0);
+	InputSocket *input = this->getInputSocket(0);
 	bool firstOperationConnected = false;
 	if (input->isConnected()) {
 		OutputSocket *inputSocket = input->getConnection()->getFromSocket();
 		// add preview to inputSocket;
 		
-		OutputSocket * socket = this->getOutputSocket(0);
+		OutputSocket *socket = this->getOutputSocket(0);
 		if (socket->isConnected()) {
 			// calculate mean operation
-			CalculateMeanOperation * operation = new CalculateMeanOperation();
+			CalculateMeanOperation *operation = new CalculateMeanOperation();
 			input->relinkConnections(operation->getInputSocket(0), 0, graph);
 			firstOperationConnected = true;
 			operation->setSetting(this->getbNode()->custom1);
@@ -51,7 +53,7 @@ void ViewLevelsNode::convertToOperations(ExecutionSystem *graph, CompositorConte
 		socket = this->getOutputSocket(1);
 		if (socket->isConnected()) {
 			// calculate standard deviation operation
-			CalculateStandardDeviationOperation * operation = new CalculateStandardDeviationOperation();
+			CalculateStandardDeviationOperation *operation = new CalculateStandardDeviationOperation();
 			if (firstOperationConnected) {
 				addLink(graph, inputSocket, operation->getInputSocket(0));
 			}
diff --git a/source/blender/compositor/nodes/COM_ViewLevelsNode.h b/source/blender/compositor/nodes/COM_ViewLevelsNode.h
index 11be6216cba..2ac84fad22f 100644
--- a/source/blender/compositor/nodes/COM_ViewLevelsNode.h
+++ b/source/blender/compositor/nodes/COM_ViewLevelsNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief ViewLevelsNode
-  * @ingroup Node
-  */
-class ViewLevelsNode: public Node {
+ * @brief ViewLevelsNode
+ * @ingroup Node
+ */
+class ViewLevelsNode : public Node {
 public:
 	ViewLevelsNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_ViewerNode.cpp b/source/blender/compositor/nodes/COM_ViewerNode.cpp
index 3282929af52..9228fdbef85 100644
--- a/source/blender/compositor/nodes/COM_ViewerNode.cpp
+++ b/source/blender/compositor/nodes/COM_ViewerNode.cpp
@@ -26,31 +26,32 @@
 #include "COM_ViewerOperation.h"
 #include "COM_ExecutionSystem.h"
 
-ViewerNode::ViewerNode(bNode *editorNode): Node(editorNode)
+ViewerNode::ViewerNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void ViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)\
+void ViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *imageSocket = this->getInputSocket(0);
 	InputSocket *alphaSocket = this->getInputSocket(1);
-	Image *image = (Image*)this->getbNode()->id;
-	ImageUser * imageUser = (ImageUser*) this->getbNode()->storage;
+	Image *image = (Image *)this->getbNode()->id;
+	ImageUser *imageUser = (ImageUser *) this->getbNode()->storage;
+	bNode *editorNode = this->getbNode();
 	if (imageSocket->isConnected()) {
-		bNode *editorNode = this->getbNode();
 		ViewerOperation *viewerOperation = new ViewerOperation();
 		viewerOperation->setColorManagement(context->getScene()->r.color_mgt_flag & R_COLOR_MANAGEMENT);
 		viewerOperation->setColorPredivide(context->getScene()->r.color_mgt_flag & R_COLOR_MANAGEMENT_PREDIVIDE);
 		viewerOperation->setbNodeTree(context->getbNodeTree());
 		viewerOperation->setImage(image);
 		viewerOperation->setImageUser(imageUser);
-		viewerOperation->setActive(editorNode->flag & NODE_DO_OUTPUT);
+		viewerOperation->setActive((editorNode->flag & NODE_DO_OUTPUT) && this->isInActiveGroup());
 		viewerOperation->setChunkOrder((OrderOfChunks)editorNode->custom1);
 		viewerOperation->setCenterX(editorNode->custom3);
 		viewerOperation->setCenterY(editorNode->custom4);
 		imageSocket->relinkConnections(viewerOperation->getInputSocket(0), 0, graph);
 		alphaSocket->relinkConnections(viewerOperation->getInputSocket(1));
 		graph->addOperation(viewerOperation);
-		addPreviewOperation(graph, viewerOperation->getInputSocket(0), 0);
+		addPreviewOperation(graph, viewerOperation->getInputSocket(0));
 	}
 }
diff --git a/source/blender/compositor/nodes/COM_ViewerNode.h b/source/blender/compositor/nodes/COM_ViewerNode.h
index 59371f04e87..e1f1226f1f1 100644
--- a/source/blender/compositor/nodes/COM_ViewerNode.h
+++ b/source/blender/compositor/nodes/COM_ViewerNode.h
@@ -26,12 +26,12 @@
 #include "COM_Node.h"
 #include "DNA_node_types.h"
 /**
-  * @brief ViewerNode
-  * @ingroup Node
-  */
+ * @brief ViewerNode
+ * @ingroup Node
+ */
 class ViewerNode : public Node {
 public:
 	ViewerNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 #endif
diff --git a/source/blender/compositor/nodes/COM_ZCombineNode.cpp b/source/blender/compositor/nodes/COM_ZCombineNode.cpp
index 2495d1a5ab2..f48fca72c05 100644
--- a/source/blender/compositor/nodes/COM_ZCombineNode.cpp
+++ b/source/blender/compositor/nodes/COM_ZCombineNode.cpp
@@ -30,10 +30,10 @@
 
 #include "DNA_material_types.h" // the ramp types
 
-void ZCombineNode::convertToOperations(ExecutionSystem *system, CompositorContext * context)
+void ZCombineNode::convertToOperations(ExecutionSystem *system, CompositorContext *context)
 {
 	if (this->getOutputSocket(0)->isConnected()) {
-		ZCombineOperation * operation = NULL;
+		ZCombineOperation *operation = NULL;
 		if (this->getbNode()->custom1) {
 			operation = new ZCombineAlphaOperation();
 		}
@@ -48,7 +48,7 @@ void ZCombineNode::convertToOperations(ExecutionSystem *system, CompositorContex
 		this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
 		system->addOperation(operation);
 		if (this->getOutputSocket(1)->isConnected()) {
-			MathMinimumOperation * zoperation = new MathMinimumOperation();
+			MathMinimumOperation *zoperation = new MathMinimumOperation();
 			addLink(system, operation->getInputSocket(1)->getConnection()->getFromSocket(), zoperation->getInputSocket(0));
 			addLink(system, operation->getInputSocket(3)->getConnection()->getFromSocket(), zoperation->getInputSocket(1));
 			this->getOutputSocket(1)->relinkConnections(zoperation->getOutputSocket());
@@ -57,7 +57,7 @@ void ZCombineNode::convertToOperations(ExecutionSystem *system, CompositorContex
 	}
 	else {
 		if (this->getOutputSocket(1)->isConnected()) {
-			MathMinimumOperation * zoperation = new MathMinimumOperation();
+			MathMinimumOperation *zoperation = new MathMinimumOperation();
 			this->getInputSocket(1)->relinkConnections(zoperation->getInputSocket(0), 1, system);
 			this->getInputSocket(3)->relinkConnections(zoperation->getInputSocket(1), 3, system);
 			this->getOutputSocket(1)->relinkConnections(zoperation->getOutputSocket());
diff --git a/source/blender/compositor/nodes/COM_ZCombineNode.h b/source/blender/compositor/nodes/COM_ZCombineNode.h
index e9ce2f27469..a2ceedfc2cd 100644
--- a/source/blender/compositor/nodes/COM_ZCombineNode.h
+++ b/source/blender/compositor/nodes/COM_ZCombineNode.h
@@ -26,13 +26,13 @@
 #include "COM_Node.h"
 
 /**
-  * @brief ZCombineNode
-  * @ingroup Node
-  */
-class ZCombineNode: public Node {
+ * @brief ZCombineNode
+ * @ingroup Node
+ */
+class ZCombineNode : public Node {
 public:
-	ZCombineNode(bNode *editorNode) :Node(editorNode) {}
-	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
+	ZCombineNode(bNode *editorNode) : Node(editorNode) {}
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif
diff --git a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
index c891142b808..e614e1fa15a 100644
--- a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
+++ b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
@@ -22,8 +22,9 @@
 
 #include "COM_AlphaOverKeyOperation.h"
 
-AlphaOverKeyOperation::AlphaOverKeyOperation(): MixBaseOperation()
+AlphaOverKeyOperation::AlphaOverKeyOperation() : MixBaseOperation()
 {
+	/* pass */
 }
 
 void AlphaOverKeyOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -37,24 +38,18 @@ void AlphaOverKeyOperation::executePixel(float *outputValue, float x, float y, P
 	inputColor2Operation->read(inputOverColor, x, y, sampler, inputBuffers);
 	
 	if (inputOverColor[3] <= 0.0f) {
-		outputValue[0] = inputColor1[0];
-		outputValue[1] = inputColor1[1];
-		outputValue[2] = inputColor1[2];
-		outputValue[3] = inputColor1[3];
+		copy_v4_v4(outputValue, inputColor1);
 	}
 	else if (value[0] == 1.0f && inputOverColor[3] >= 1.0f) {
-		outputValue[0] = inputOverColor[0];
-		outputValue[1] = inputOverColor[1];
-		outputValue[2] = inputOverColor[2];
-		outputValue[3] = inputOverColor[3];
+		copy_v4_v4(outputValue, inputOverColor);
 	}
 	else {
-		float premul = value[0]*inputOverColor[3];
+		float premul = value[0] * inputOverColor[3];
 		float mul = 1.0f - premul;
 	
-		outputValue[0] = (mul*inputColor1[0]) + premul*inputOverColor[0];
-		outputValue[1] = (mul*inputColor1[1]) + premul*inputOverColor[1];
-		outputValue[2] = (mul*inputColor1[2]) + premul*inputOverColor[2];
-		outputValue[3] = (mul*inputColor1[3]) + value[0]*inputOverColor[3];
+		outputValue[0] = (mul * inputColor1[0]) + premul * inputOverColor[0];
+		outputValue[1] = (mul * inputColor1[1]) + premul * inputOverColor[1];
+		outputValue[2] = (mul * inputColor1[2]) + premul * inputOverColor[2];
+		outputValue[3] = (mul * inputColor1[3]) + value[0] * inputOverColor[3];
 	}
 }
diff --git a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
index d3077a05706..e5b1f56f06c 100644
--- a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
+++ b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
@@ -26,19 +26,19 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class AlphaOverKeyOperation : public MixBaseOperation {
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	AlphaOverKeyOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
index aedf6ec5e9e..81c1e4d2587 100644
--- a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
+++ b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
@@ -22,12 +22,12 @@
 
 #include "COM_AlphaOverMixedOperation.h"
 
-AlphaOverMixedOperation::AlphaOverMixedOperation(): MixBaseOperation()
+AlphaOverMixedOperation::AlphaOverMixedOperation() : MixBaseOperation()
 {
 	this->x = 0.0f;
 }
 
-void AlphaOverMixedOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
+void AlphaOverMixedOperation::executePixel(float outputValue[4], float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
 {
 	float inputColor1[4];
 	float inputOverColor[4];
@@ -38,26 +38,20 @@ void AlphaOverMixedOperation::executePixel(float *outputValue, float x, float y,
 	inputColor2Operation->read(inputOverColor, x, y, sampler, inputBuffers);
 	
 	if (inputOverColor[3] <= 0.0f) {
-		outputValue[0] = inputColor1[0];
-		outputValue[1] = inputColor1[1];
-		outputValue[2] = inputColor1[2];
-		outputValue[3] = inputColor1[3];
+		copy_v4_v4(outputValue, inputColor1);
 	}
 	else if (value[0] == 1.0f && inputOverColor[3] >= 1.0f) {
-		outputValue[0] = inputOverColor[0];
-		outputValue[1] = inputOverColor[1];
-		outputValue[2] = inputOverColor[2];
-		outputValue[3] = inputOverColor[3];
+		copy_v4_v4(outputValue, inputOverColor);
 	}
 	else {
-		float addfac = 1.0f - this->x + inputOverColor[3]*this->x;
-		float premul = value[0]*addfac;
-		float mul = 1.0f - value[0]*inputOverColor[3];
-	
-		outputValue[0] = (mul*inputColor1[0]) + premul*inputOverColor[0];
-		outputValue[1] = (mul*inputColor1[1]) + premul*inputOverColor[1];
-		outputValue[2] = (mul*inputColor1[2]) + premul*inputOverColor[2];
-		outputValue[3] = (mul*inputColor1[3]) + value[0]*inputOverColor[3];
+		float addfac = 1.0f - this->x + inputOverColor[3] * this->x;
+		float premul = value[0] * addfac;
+		float mul = 1.0f - value[0] * inputOverColor[3];
+
+		outputValue[0] = (mul * inputColor1[0]) + premul * inputOverColor[0];
+		outputValue[1] = (mul * inputColor1[1]) + premul * inputOverColor[1];
+		outputValue[2] = (mul * inputColor1[2]) + premul * inputOverColor[2];
+		outputValue[3] = (mul * inputColor1[3]) + value[0] * inputOverColor[3];
 	}
 }
 
diff --git a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
index 92936a20b79..2807b3b489a 100644
--- a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
+++ b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
@@ -26,23 +26,23 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class AlphaOverMixedOperation : public MixBaseOperation {
 private:
 	float x;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	AlphaOverMixedOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
-	void setX(float x) {this->x = x;}
+	void setX(float x) { this->x = x; }
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp b/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
index 6cc33387917..a6bf8b8834c 100644
--- a/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
+++ b/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
@@ -22,8 +22,9 @@
 
 #include "COM_AlphaOverPremultiplyOperation.h"
 
-AlphaOverPremultiplyOperation::AlphaOverPremultiplyOperation(): MixBaseOperation()
+AlphaOverPremultiplyOperation::AlphaOverPremultiplyOperation() : MixBaseOperation()
 {
+	/* pass */
 }
 
 void AlphaOverPremultiplyOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -37,25 +38,19 @@ void AlphaOverPremultiplyOperation::executePixel(float *outputValue, float x, fl
 	inputColor2Operation->read(inputOverColor, x, y, sampler, inputBuffers);
 	
 	/* Zero alpha values should still permit an add of RGB data */
-	if (inputOverColor[3]<0.0f) {
-		outputValue[0] = inputColor1[0];
-		outputValue[1] = inputColor1[1];
-		outputValue[2] = inputColor1[2];
-		outputValue[3] = inputColor1[3];
+	if (inputOverColor[3] < 0.0f) {
+		copy_v4_v4(outputValue, inputColor1);
 	}
 	else if (value[0] == 1.0f && inputOverColor[3] >= 1.0f) {
-		outputValue[0] = inputOverColor[0];
-		outputValue[1] = inputOverColor[1];
-		outputValue[2] = inputOverColor[2];
-		outputValue[3] = inputOverColor[3];
+		copy_v4_v4(outputValue, inputOverColor);
 	}
 	else {
-		float mul = 1.0f - value[0]*inputOverColor[3];
+		float mul = 1.0f - value[0] * inputOverColor[3];
 	
-		outputValue[0] = (mul*inputColor1[0]) + value[0]*inputOverColor[0];
-		outputValue[1] = (mul*inputColor1[1]) + value[0]*inputOverColor[1];
-		outputValue[2] = (mul*inputColor1[2]) + value[0]*inputOverColor[2];
-		outputValue[3] = (mul*inputColor1[3]) + value[0]*inputOverColor[3];
+		outputValue[0] = (mul * inputColor1[0]) + value[0] * inputOverColor[0];
+		outputValue[1] = (mul * inputColor1[1]) + value[0] * inputOverColor[1];
+		outputValue[2] = (mul * inputColor1[2]) + value[0] * inputOverColor[2];
+		outputValue[3] = (mul * inputColor1[3]) + value[0] * inputOverColor[3];
 	}
 }
 
diff --git a/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h b/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
index 2fe4422d03e..bba3b714f6b 100644
--- a/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
+++ b/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
@@ -26,20 +26,20 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class AlphaOverPremultiplyOperation : public MixBaseOperation {
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	AlphaOverPremultiplyOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_AntiAliasOperation.cpp b/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
index 62639eeb24a..458d11f2616 100644
--- a/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
+++ b/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
@@ -28,7 +28,7 @@ extern "C" {
 }
 
 
-AntiAliasOperation::AntiAliasOperation(): NodeOperation()
+AntiAliasOperation::AntiAliasOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_VALUE);
 	this->addOutputSocket(COM_DT_VALUE);
@@ -42,14 +42,14 @@ void AntiAliasOperation::initExecution()
 	NodeOperation::initMutex();
 }
 
-void AntiAliasOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data)
+void AntiAliasOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
 {
-	if (y < 0 || y >= this->height || x < 0 || x >= this->width) {
+	if (y < 0 || (unsigned int)y >= this->height || x < 0 || (unsigned int)x >= this->width) {
 		color[0] = 0.0f;
 	}
 	else {
-		int offset = y*this->width + x;
-		color[0] = buffer[offset]/255.0f;
+		int offset = y * this->width + x;
+		color[0] = buffer[offset] / 255.0f;
 	}
 	
 }
@@ -84,22 +84,22 @@ bool AntiAliasOperation::determineDependingAreaOfInterest(rcti *input, ReadBuffe
 
 void *AntiAliasOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
 {
-	if (this->buffer) {return buffer;}
-	BLI_mutex_lock(getMutex());
+	if (this->buffer) {return buffer; }
+	lockMutex();
 	if (this->buffer == NULL) {
-		MemoryBuffer *tile = (MemoryBuffer*)valueReader->initializeTileData(rect, memoryBuffers);
-		int size = tile->getHeight()*tile->getWidth();
-		float * input = tile->getBuffer();
+		MemoryBuffer *tile = (MemoryBuffer *)valueReader->initializeTileData(rect, memoryBuffers);
+		int size = tile->getHeight() * tile->getWidth();
+		float *input = tile->getBuffer();
 		char *valuebuffer = new char[size];
-		for (int i = 0 ; i < size ; i ++) {
+		for (int i = 0; i < size; i++) {
 			float in = input[i * COM_NUMBER_OF_CHANNELS];
-			if (in < 0.0f) { in = 0.0f;}
-			if (in > 1.0f) {in = 1.0f;}
+			if (in < 0.0f) { in = 0.0f; }
+			if (in > 1.0f) {in = 1.0f; }
 			valuebuffer[i] = in * 255;
 		}
 		antialias_tagbuf(tile->getWidth(), tile->getHeight(), valuebuffer);
 		this->buffer = valuebuffer;
 	}
-	BLI_mutex_unlock(getMutex());
+	unlockMutex();
 	return this->buffer;
 }
diff --git a/source/blender/compositor/operations/COM_AntiAliasOperation.h b/source/blender/compositor/operations/COM_AntiAliasOperation.h
index fe160763828..906da598da1 100644
--- a/source/blender/compositor/operations/COM_AntiAliasOperation.h
+++ b/source/blender/compositor/operations/COM_AntiAliasOperation.h
@@ -26,35 +26,35 @@
 #include "DNA_node_types.h"
 
 /**
-  * @brief AntiAlias operations
-  * it only supports anti aliasing on BW buffers.
-  * @ingroup operation
-  */
+ * @brief AntiAlias operations
+ * it only supports anti aliasing on BW buffers.
+ * @ingroup operation
+ */
 class AntiAliasOperation : public NodeOperation {
 protected:
 	/**
-	  * @brief Cached reference to the reader
-	  */
-	SocketReader * valueReader;
+	 * @brief Cached reference to the reader
+	 */
+	SocketReader *valueReader;
 	char *buffer;
 public:
 	AntiAliasOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
 };
diff --git a/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp b/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
index 88fe17f633e..3628c399581 100644
--- a/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
@@ -62,36 +62,27 @@ void BilateralBlurOperation::executePixel(float *color, int x, int y, MemoryBuff
 	int maxy = ceil(y + space);
 	float deltaColor;
 	this->inputDeterminatorProgram->read(determinatorReferenceColor, x, y, inputBuffers, data);
-	
-	blurColor[0] = 0.0f;
-	blurColor[1] = 0.0f;
-	blurColor[2] = 0.0f;
-	blurColor[3] = 0.0f;
+
+	zero_v4(blurColor);
 	blurDivider = 0.0f;
-	for (int yi = miny ; yi < maxy ; yi+=QualityStepHelper::getStep()) {
-		for (int xi = minx ; xi < maxx ; xi+=QualityStepHelper::getStep()) {
+	for (int yi = miny; yi < maxy; yi += QualityStepHelper::getStep()) {
+		for (int xi = minx; xi < maxx; xi += QualityStepHelper::getStep()) {
 			// read determinator
 			this->inputDeterminatorProgram->read(determinator, xi, yi, inputBuffers, data);
-			deltaColor = fabsf(determinatorReferenceColor[0] - determinator[0])+
-				fabsf(determinatorReferenceColor[1] - determinator[1])+
-				fabsf(determinatorReferenceColor[2] - determinator[2]); // do not take the alpha channel into account
-			if (deltaColor< sigmacolor) {
+			deltaColor = (fabsf(determinatorReferenceColor[0] - determinator[0]) +
+			              fabsf(determinatorReferenceColor[1] - determinator[1]) +
+			              fabsf(determinatorReferenceColor[2] - determinator[2])); // do not take the alpha channel into account
+			if (deltaColor < sigmacolor) {
 				// add this to the blur
 				this->inputColorProgram->read(tempColor, xi, yi, inputBuffers, data);
-				blurColor[0]+=tempColor[0];
-				blurColor[1]+=tempColor[1];
-				blurColor[2]+=tempColor[2];
-				blurColor[3]+=tempColor[3];
+				add_v4_v4(blurColor, tempColor);
 				blurDivider += 1.0f;
 			}
 		}
 	}
 	
 	if (blurDivider > 0.0f) {
-		color[0] = blurColor[0]/blurDivider;
-		color[1] = blurColor[1]/blurDivider;
-		color[2] = blurColor[2]/blurDivider;
-		color[3] = blurColor[3]/blurDivider;
+		mul_v4_v4fl(color, blurColor, 1.0f / blurDivider);
 	}
 	else {
 		color[0] = 0.0f;
@@ -110,7 +101,7 @@ void BilateralBlurOperation::deinitExecution()
 bool BilateralBlurOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
 {
 	rcti newInput;
-	int add = ceil(this->space)+1;
+	int add = ceil(this->space) + 1;
 
 	newInput.xmax = input->xmax + (add);
 	newInput.xmin = input->xmin - (add);
diff --git a/source/blender/compositor/operations/COM_BilateralBlurOperation.h b/source/blender/compositor/operations/COM_BilateralBlurOperation.h
index 8ec1ba8df99..08b379dc4ea 100644
--- a/source/blender/compositor/operations/COM_BilateralBlurOperation.h
+++ b/source/blender/compositor/operations/COM_BilateralBlurOperation.h
@@ -36,22 +36,22 @@ public:
 	BilateralBlurOperation();
 
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
 	
-	void setData(NodeBilateralBlurData *data) {this->data = data;}
+	void setData(NodeBilateralBlurData *data) { this->data = data; }
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_BlurBaseOperation.cpp b/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
index 6e1a7e2a908..a233c7a50ae 100644
--- a/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
+++ b/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
@@ -27,16 +27,17 @@ extern "C" {
 	#include "RE_pipeline.h"
 }
 
-BlurBaseOperation::BlurBaseOperation(): NodeOperation()
+BlurBaseOperation::BlurBaseOperation(DataType data_type=COM_DT_COLOR) : NodeOperation()
 {
-	this->addInputSocket(COM_DT_COLOR);
+	this->addInputSocket(data_type);
 	this->addInputSocket(COM_DT_VALUE);
-	this->addOutputSocket(COM_DT_COLOR);
+	this->addOutputSocket(data_type);
 	this->setComplex(true);
 	this->inputProgram = NULL;
 	this->data = NULL;
 	this->size = 1.0f;
 	this->deleteData = false;
+	this->sizeavailable = false;
 }
 void BlurBaseOperation::initExecution()
 {
@@ -46,18 +47,18 @@ void BlurBaseOperation::initExecution()
 	this->data->image_in_height = this->getHeight();
 	if (this->data->relative) {
 		switch (this->data->aspect) {
-		case CMP_NODE_BLUR_ASPECT_NONE:
-			this->data->sizex = (int)(this->data->percentx*0.01f*this->data->image_in_width);
-			this->data->sizey = (int)(this->data->percenty*0.01f*this->data->image_in_height);
-			break;
-		case CMP_NODE_BLUR_ASPECT_Y:
-			this->data->sizex = (int)(this->data->percentx*0.01f*this->data->image_in_width);
-			this->data->sizey = (int)(this->data->percenty*0.01f*this->data->image_in_width);
-			break;
-		case CMP_NODE_BLUR_ASPECT_X:
-			this->data->sizex = (int)(this->data->percentx*0.01f*this->data->image_in_height);
-			this->data->sizey = (int)(this->data->percenty*0.01f*this->data->image_in_height);
-			break;
+			case CMP_NODE_BLUR_ASPECT_NONE:
+				this->data->sizex = (int)(this->data->percentx * 0.01f * this->data->image_in_width);
+				this->data->sizey = (int)(this->data->percenty * 0.01f * this->data->image_in_height);
+				break;
+			case CMP_NODE_BLUR_ASPECT_Y:
+				this->data->sizex = (int)(this->data->percentx * 0.01f * this->data->image_in_width);
+				this->data->sizey = (int)(this->data->percenty * 0.01f * this->data->image_in_width);
+				break;
+			case CMP_NODE_BLUR_ASPECT_X:
+				this->data->sizex = (int)(this->data->percentx * 0.01f * this->data->image_in_height);
+				this->data->sizey = (int)(this->data->percenty * 0.01f * this->data->image_in_height);
+				break;
 		}
 	}
 
@@ -76,18 +77,41 @@ float *BlurBaseOperation::make_gausstab(int rad)
 
 	sum = 0.0f;
 	for (i = -rad; i <= rad; i++) {
-		val = RE_filter_value(this->data->filtertype, (float)i/(float)rad);
+		val = RE_filter_value(this->data->filtertype, (float)i / (float)rad);
 		sum += val;
-		gausstab[i+rad] = val;
+		gausstab[i + rad] = val;
 	}
 
-	sum = 1.0f/sum;
-	for (i=0; i<n; i++)
-		gausstab[i]*= sum;
+	sum = 1.0f / sum;
+	for (i = 0; i < n; i++)
+		gausstab[i] *= sum;
 
 	return gausstab;
 }
 
+/* normalized distance from the current (inverted so 1.0 is close and 0.0 is far)
+ * 'ease' is applied after, looks nicer */
+float *BlurBaseOperation::make_dist_fac_inverse(int rad)
+{
+	float *dist_fac_invert, val;
+	int i, n;
+
+	n = 2 * rad + 1;
+
+	dist_fac_invert = new float[n];
+
+	for (i = -rad; i <= rad; i++) {
+		val = 1.0f - fabsf(((float)i / (float)rad));
+
+		/* ease - gives less hard lines for dilate/erode feather */
+		val = (3.0f * val * val - 2.0f * val * val * val);
+
+		dist_fac_invert[i + rad] = val;
+	}
+
+	return dist_fac_invert;
+}
+
 void BlurBaseOperation::deinitExecution()
 {
 	this->inputProgram = NULL;
@@ -100,7 +124,10 @@ void BlurBaseOperation::deinitExecution()
 
 void BlurBaseOperation::updateSize(MemoryBuffer **memoryBuffers)
 {
-	float result[4];
-	this->getInputSocketReader(1)->read(result, 0, 0, COM_PS_NEAREST, memoryBuffers);
-	this->size = result[0];
+	if (!this->sizeavailable) {
+		float result[4];
+		this->getInputSocketReader(1)->read(result, 0, 0, COM_PS_NEAREST, memoryBuffers);
+		this->size = result[0];
+		this->sizeavailable = true;
+	}
 }
diff --git a/source/blender/compositor/operations/COM_BlurBaseOperation.h b/source/blender/compositor/operations/COM_BlurBaseOperation.h
index 13e7eb52b77..33c07abbb36 100644
--- a/source/blender/compositor/operations/COM_BlurBaseOperation.h
+++ b/source/blender/compositor/operations/COM_BlurBaseOperation.h
@@ -30,29 +30,33 @@ private:
 
 protected:
 	/**
-	  * Cached reference to the inputProgram
-	  */
+	 * Cached reference to the inputProgram
+	 */
 	SocketReader *inputProgram;
 	SocketReader *inputSize;
-	NodeBlurData * data;
-	BlurBaseOperation();
+	NodeBlurData *data;
+	BlurBaseOperation(DataType data_type);
 	float *make_gausstab(int rad);
+	float *make_dist_fac_inverse(int rad);
 	float size;
 	bool deleteData;
+	bool sizeavailable;
 	void updateSize(MemoryBuffer **memoryBuffers);
 public:
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
-	void setData(NodeBlurData *data) {this->data = data;}
-	
-	void deleteDataWhenFinished() {this->deleteData = true;}
+	void setData(NodeBlurData *data) { this->data = data; }
+
+	void deleteDataWhenFinished() { this->deleteData = true; }
+
+	void setSize(float size) { this->size = size; sizeavailable = true; }
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_BokehBlurOperation.cpp b/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
index 1050fc57194..e2fce504791 100644
--- a/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
@@ -34,8 +34,9 @@ BokehBlurOperation::BokehBlurOperation() : NodeOperation()
 	this->addInputSocket(COM_DT_VALUE);
 	this->addOutputSocket(COM_DT_COLOR);
 	this->setComplex(true);
+	this->setOpenCL(true);
 
-	this->size = .01;
+	this->size = 1.0f;
 
 	this->inputProgram = NULL;
 	this->inputBokehProgram = NULL;
@@ -58,39 +59,33 @@ void BokehBlurOperation::initExecution()
 	int height = inputBokehProgram->getHeight();
 
 	float dimension;
-	if (width<height) {
+	if (width < height) {
 		dimension = width;
 	}
 	else {
 		dimension = height;
 	}
-	this->bokehMidX = width/2.0f;
-	this->bokehMidY = height/2.0f;
-	this->bokehDimension = dimension/2.0f;
+	this->bokehMidX = width / 2.0f;
+	this->bokehMidY = height / 2.0f;
+	this->bokehDimension = dimension / 2.0f;
 	QualityStepHelper::initExecution(COM_QH_INCREASE);
 }
 
 void BokehBlurOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
 {
-	float tempColor[4];
+	float color_accum[4];
 	float tempBoundingBox[4];
 	float bokeh[4];
 
 	inputBoundingBoxReader->read(tempBoundingBox, x, y, COM_PS_NEAREST, inputBuffers);
-	if (tempBoundingBox[0] >0.0f) {
-		tempColor[0] = 0;
-		tempColor[1] = 0;
-		tempColor[2] = 0;
-		tempColor[3] = 0;
-		float overallmultiplyerr = 0;
-		float overallmultiplyerg = 0;
-		float overallmultiplyerb = 0;
-		MemoryBuffer *inputBuffer = (MemoryBuffer*)data;
+	if (tempBoundingBox[0] > 0.0f) {
+		float multiplier_accum[4] = {0.0f, 0.0f, 0.0f, 0.0f};
+		MemoryBuffer *inputBuffer = (MemoryBuffer *)data;
 		float *buffer = inputBuffer->getBuffer();
 		int bufferwidth = inputBuffer->getWidth();
 		int bufferstartx = inputBuffer->getRect()->xmin;
 		int bufferstarty = inputBuffer->getRect()->ymin;
-		int pixelSize = this->size*this->getWidth();
+		int pixelSize = this->size * this->getWidth() / 100.0f;
 
 		int miny = y - pixelSize;
 		int maxy = y + pixelSize;
@@ -101,29 +96,27 @@ void BokehBlurOperation::executePixel(float *color, int x, int y, MemoryBuffer *
 		maxy = min(maxy, inputBuffer->getRect()->ymax);
 		maxx = min(maxx, inputBuffer->getRect()->xmax);
 
+		zero_v4(color_accum);
+
 		int step = getStep();
 		int offsetadd = getOffsetAdd();
 
-		float m = this->bokehDimension/pixelSize;
-		for (int ny = miny ; ny < maxy ; ny +=step) {
-			int bufferindex = ((minx - bufferstartx)*4)+((ny-bufferstarty)*4*bufferwidth);
-			for (int nx = minx ; nx < maxx ; nx +=step) {
-				float u = this->bokehMidX - (nx-x) *m;
-				float v = this->bokehMidY - (ny-y) *m;
+		float m = this->bokehDimension / pixelSize;
+		for (int ny = miny; ny < maxy; ny += step) {
+			int bufferindex = ((minx - bufferstartx) * 4) + ((ny - bufferstarty) * 4 * bufferwidth);
+			for (int nx = minx; nx < maxx; nx += step) {
+				float u = this->bokehMidX - (nx - x) * m;
+				float v = this->bokehMidY - (ny - y) * m;
 				inputBokehProgram->read(bokeh, u, v, COM_PS_NEAREST, inputBuffers);
-				tempColor[0] += bokeh[0] * buffer[bufferindex];
-				tempColor[1] += bokeh[1] * buffer[bufferindex+1];
-				tempColor[2] += bokeh[2]* buffer[bufferindex+2];
-				overallmultiplyerr += bokeh[0];
-				overallmultiplyerg += bokeh[1];
-				overallmultiplyerb += bokeh[2];
-				bufferindex +=offsetadd;
+				madd_v4_v4v4(color_accum, bokeh, &buffer[bufferindex]);
+				add_v4_v4(multiplier_accum, bokeh);
+				bufferindex += offsetadd;
 			}
 		}
-		color[0] = tempColor[0]*(1.0/overallmultiplyerr);
-		color[1] = tempColor[1]*(1.0/overallmultiplyerg);
-		color[2] = tempColor[2]*(1.0/overallmultiplyerb);
-		color[3] = 1.0f;
+		color[0] = color_accum[0] * (1.0f / multiplier_accum[0]);
+		color[1] = color_accum[1] * (1.0f / multiplier_accum[1]);
+		color[2] = color_accum[2] * (1.0f / multiplier_accum[2]);
+		color[3] = color_accum[3] * (1.0f / multiplier_accum[3]);
 	}
 	else {
 		inputProgram->read(color, x, y, COM_PS_NEAREST, inputBuffers);
@@ -142,10 +135,10 @@ bool BokehBlurOperation::determineDependingAreaOfInterest(rcti *input, ReadBuffe
 	rcti newInput;
 	rcti bokehInput;
 
-	newInput.xmax = input->xmax + (size*this->getWidth());
-	newInput.xmin = input->xmin - (size*this->getWidth());
-	newInput.ymax = input->ymax + (size*this->getWidth());
-	newInput.ymin = input->ymin - (size*this->getWidth());
+	newInput.xmax = input->xmax + (size * this->getWidth() / 100.0f);
+	newInput.xmin = input->xmin - (size * this->getWidth() / 100.0f);
+	newInput.ymax = input->ymax + (size * this->getWidth() / 100.0f);
+	newInput.ymin = input->ymin - (size * this->getWidth() / 100.0f);
 
 	NodeOperation *operation = getInputOperation(1);
 	bokehInput.xmax = operation->getWidth();
@@ -165,3 +158,27 @@ bool BokehBlurOperation::determineDependingAreaOfInterest(rcti *input, ReadBuffe
 	}
 	return false;
 }
+
+static cl_kernel kernel = 0;
+void BokehBlurOperation::executeOpenCL(cl_context context, cl_program program, cl_command_queue queue, 
+                                       MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, 
+                                       MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, 
+                                       list<cl_kernel> *clKernelsToCleanUp) 
+{
+	if (!kernel) {
+		kernel = COM_clCreateKernel(program, "bokehBlurKernel", NULL);
+	}
+	cl_int radius = this->getWidth() * this->size / 100.0f;
+	cl_int step = this->getStep();
+	
+	COM_clAttachMemoryBufferToKernelParameter(context, kernel, 0, -1, clMemToCleanUp, inputMemoryBuffers, this->inputBoundingBoxReader);
+	COM_clAttachMemoryBufferToKernelParameter(context, kernel, 1,  4, clMemToCleanUp, inputMemoryBuffers, this->inputProgram);
+	COM_clAttachMemoryBufferToKernelParameter(context, kernel, 2,  -1, clMemToCleanUp, inputMemoryBuffers, this->inputBokehProgram);
+	COM_clAttachOutputMemoryBufferToKernelParameter(kernel, 3, clOutputBuffer);
+	COM_clAttachMemoryBufferOffsetToKernelParameter(kernel, 5, outputMemoryBuffer);
+	clSetKernelArg(kernel, 6, sizeof(cl_int), &radius);
+	clSetKernelArg(kernel, 7, sizeof(cl_int), &step);
+	COM_clAttachSizeToKernelParameter(kernel, 8);
+	
+	COM_clEnqueueRange(queue, kernel, outputMemoryBuffer, 9);	
+}
diff --git a/source/blender/compositor/operations/COM_BokehBlurOperation.h b/source/blender/compositor/operations/COM_BokehBlurOperation.h
index ce14faa8596..3ec61c5ce01 100644
--- a/source/blender/compositor/operations/COM_BokehBlurOperation.h
+++ b/source/blender/compositor/operations/COM_BokehBlurOperation.h
@@ -39,22 +39,24 @@ public:
 
 	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
 
-	void setSize(float size) {this->size = size;}
+	void setSize(float size) { this->size = size; }
+	
+	void executeOpenCL(cl_context context, cl_program program, cl_command_queue queue, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, list<cl_kernel> *clKernelsToCleanUp);
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_BokehImageOperation.cpp b/source/blender/compositor/operations/COM_BokehImageOperation.cpp
index 0279b9a5bdf..abb378e2adb 100644
--- a/source/blender/compositor/operations/COM_BokehImageOperation.cpp
+++ b/source/blender/compositor/operations/COM_BokehImageOperation.cpp
@@ -23,7 +23,7 @@
 #include "COM_BokehImageOperation.h"
 #include "BLI_math.h"
 
-BokehImageOperation::BokehImageOperation(): NodeOperation()
+BokehImageOperation::BokehImageOperation() : NodeOperation()
 {
 	this->addOutputSocket(COM_DT_COLOR);
 	this->deleteData = false;
@@ -34,25 +34,25 @@ void BokehImageOperation::initExecution()
 	this->centerY = getHeight() / 2;
 	this->center[0] = this->centerX;
 	this->center[1] = this->centerY;
-	this->inverseRounding = 1.0-this->data->rounding;
-	this->circularDistance = getWidth()/2;
-	this->flapRad = (M_PI*2)/this->data->flaps;
-	this->flapRadAdd = (this->data->angle/360.0)*M_PI*2;
-	while (this->flapRadAdd<0.0f) {
-		this->flapRadAdd+=M_PI*2;
+	this->inverseRounding = 1.0f - this->data->rounding;
+	this->circularDistance = getWidth() / 2;
+	this->flapRad = (float)(M_PI * 2) / this->data->flaps;
+	this->flapRadAdd = (this->data->angle / 360.0f) * (float)(M_PI * 2.0);
+	while (this->flapRadAdd < 0.0f) {
+		this->flapRadAdd += (float)(M_PI * 2.0);
 	}
-	while (this->flapRadAdd>M_PI) {
-		this->flapRadAdd-=M_PI*2;
+	while (this->flapRadAdd > (float)M_PI) {
+		this->flapRadAdd -= (float)(M_PI * 2.0);
 	}
 }
 void BokehImageOperation::detemineStartPointOfFlap(float r[2], int flapNumber, float distance)
 {
-	r[0] = sin(flapRad*flapNumber + flapRadAdd)*distance+centerX;
-	r[1] = cos(flapRad*flapNumber + flapRadAdd)*distance+centerY;
+	r[0] = sinf(flapRad * flapNumber + flapRadAdd) * distance + centerX;
+	r[1] = cosf(flapRad * flapNumber + flapRadAdd) * distance + centerY;
 }
 float BokehImageOperation::isInsideBokeh(float distance, float x, float y)
 {
-	float insideBokeh = 0.0;
+	float insideBokeh = 0.0f;
 	const float deltaX = x - centerX;
 	const float deltaY = y - centerY;
 	float closestPoint[2];
@@ -63,26 +63,26 @@ float BokehImageOperation::isInsideBokeh(float distance, float x, float y)
 	point[1] = y;
 
 	const float distanceToCenter = len_v2v2(point, center);
-	const float bearing = (atan2f(deltaX, deltaY) + (M_PI*2));
-	int flapNumber = (int)((bearing-flapRadAdd)/flapRad);
+	const float bearing = (atan2f(deltaX, deltaY) + (float)(M_PI * 2.0));
+	int flapNumber = (int)((bearing - flapRadAdd) / flapRad);
 
 	detemineStartPointOfFlap(lineP1, flapNumber, distance);
-	detemineStartPointOfFlap(lineP2, flapNumber+1, distance);
+	detemineStartPointOfFlap(lineP2, flapNumber + 1, distance);
 	closest_to_line_v2(closestPoint, point, lineP1, lineP2);
 
 	const float distanceLineToCenter = len_v2v2(center, closestPoint);
-	const float distanceRoundingToCenter = inverseRounding*distanceLineToCenter+this->data->rounding*distance;
+	const float distanceRoundingToCenter = inverseRounding * distanceLineToCenter + this->data->rounding * distance;
 
-	const float catadioptricDistanceToCenter = distanceRoundingToCenter*this->data->catadioptric;
-	if (distanceRoundingToCenter>=distanceToCenter && catadioptricDistanceToCenter<=distanceToCenter) {
-		if (distanceRoundingToCenter-distanceToCenter<1.0) {
-			insideBokeh = (distanceRoundingToCenter-distanceToCenter);
+	const float catadioptricDistanceToCenter = distanceRoundingToCenter * this->data->catadioptric;
+	if (distanceRoundingToCenter >= distanceToCenter && catadioptricDistanceToCenter <= distanceToCenter) {
+		if (distanceRoundingToCenter - distanceToCenter < 1.0f) {
+			insideBokeh = (distanceRoundingToCenter - distanceToCenter);
 		}
-		else if (this->data->catadioptric != 0.0 && distanceToCenter-catadioptricDistanceToCenter<1.0) {
-			insideBokeh = (distanceToCenter-catadioptricDistanceToCenter);
+		else if (this->data->catadioptric != 0.0f && distanceToCenter - catadioptricDistanceToCenter < 1.0f) {
+			insideBokeh = (distanceToCenter - catadioptricDistanceToCenter);
 		}
 		else {
-			insideBokeh = 1.0;
+			insideBokeh = 1.0f;
 		}
 	}
 	return insideBokeh;
@@ -90,12 +90,12 @@ float BokehImageOperation::isInsideBokeh(float distance, float x, float y)
 void BokehImageOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
 {
 	float shift = this->data->lensshift;
-	float shift2 = shift/2.0f;
+	float shift2 = shift / 2.0f;
 	float distance = this->circularDistance;
 	float insideBokehMax = isInsideBokeh(distance, x, y);
-	float insideBokehMed = isInsideBokeh(distance-fabs(shift2*distance), x, y);
-	float insideBokehMin = isInsideBokeh(distance-fabs(shift*distance), x, y);
-	if (shift<0) {
+	float insideBokehMed = isInsideBokeh(distance - fabsf(shift2 * distance), x, y);
+	float insideBokehMin = isInsideBokeh(distance - fabsf(shift * distance), x, y);
+	if (shift < 0) {
 		color[0] = insideBokehMax;
 		color[1] = insideBokehMed;
 		color[2] = insideBokehMin;
@@ -105,7 +105,7 @@ void BokehImageOperation::executePixel(float *color, float x, float y, PixelSamp
 		color[1] = insideBokehMed;
 		color[2] = insideBokehMax;
 	}
-	color[3] = 1.0f;
+	color[3] = (insideBokehMax + insideBokehMed + insideBokehMin) / 3.0f;
 }
 
 void BokehImageOperation::deinitExecution()
diff --git a/source/blender/compositor/operations/COM_BokehImageOperation.h b/source/blender/compositor/operations/COM_BokehImageOperation.h
index 516cc1da4f0..8edd32a4f77 100644
--- a/source/blender/compositor/operations/COM_BokehImageOperation.h
+++ b/source/blender/compositor/operations/COM_BokehImageOperation.h
@@ -45,23 +45,23 @@ public:
 	BokehImageOperation();
 
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
 	void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
 
-	void setData(NodeBokehImage *data) {this->data = data;}
-	void deleteDataOnFinish() {this->deleteData = true;}
+	void setData(NodeBokehImage *data) { this->data = data; }
+	void deleteDataOnFinish() { this->deleteData = true; }
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_BoxMaskOperation.cpp b/source/blender/compositor/operations/COM_BoxMaskOperation.cpp
index 0244be4cad3..3b99fc9a2a0 100644
--- a/source/blender/compositor/operations/COM_BoxMaskOperation.cpp
+++ b/source/blender/compositor/operations/COM_BoxMaskOperation.cpp
@@ -24,7 +24,7 @@
 #include "BLI_math.h"
 #include "DNA_node_types.h"
 
-BoxMaskOperation::BoxMaskOperation(): NodeOperation()
+BoxMaskOperation::BoxMaskOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_VALUE);
 	this->addInputSocket(COM_DT_VALUE);
@@ -38,10 +38,10 @@ void BoxMaskOperation::initExecution()
 {
 	this->inputMask = this->getInputSocketReader(0);
 	this->inputValue = this->getInputSocketReader(1);
-	const double rad = DEG2RAD(this->data->rotation);
+	const double rad = DEG2RAD((double)this->data->rotation);
 	this->cosine = cos(rad);
 	this->sine = sin(rad);
-	this->aspectRatio = ((float)this->getWidth())/this->getHeight();
+	this->aspectRatio = ((float)this->getWidth()) / this->getHeight();
 }
 
 void BoxMaskOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -49,28 +49,28 @@ void BoxMaskOperation::executePixel(float *color, float x, float y, PixelSampler
 	float inputMask[4];
 	float inputValue[4];
 	
-	float rx = x/this->getWidth();
-	float ry = y/this->getHeight();
+	float rx = x / this->getWidth();
+	float ry = y / this->getHeight();
 	
-	const float dy = (ry - this->data->y)/this->aspectRatio;
+	const float dy = (ry - this->data->y) / this->aspectRatio;
 	const float dx = rx - this->data->x;
-	rx = this->data->x+(this->cosine*dx + this->sine*dy);
-	ry = this->data->y+(-this->sine*dx + this->cosine*dy);
+	rx = this->data->x + (this->cosine * dx + this->sine * dy);
+	ry = this->data->y + (-this->sine * dx + this->cosine * dy);
 	
 	this->inputMask->read(inputMask, x, y, sampler, inputBuffers);
 	this->inputValue->read(inputValue, x, y, sampler, inputBuffers);
 	
-	float halfHeight = (this->data->height)/2.0f;
-	float halfWidth = this->data->width/2.0f;
-	bool inside = rx > this->data->x-halfWidth
-			&& rx < this->data->x+halfWidth
-			&& ry > this->data->y-halfHeight
-			&& ry < this->data->y+halfHeight;
+	float halfHeight = this->data->height / 2.0f;
+	float halfWidth = this->data->width / 2.0f;
+	bool inside = (rx > this->data->x - halfWidth &&
+	               rx < this->data->x + halfWidth &&
+	               ry > this->data->y - halfHeight &&
+	               ry < this->data->y + halfHeight);
 	
 	switch (this->maskType) {
 		case CMP_NODE_MASKTYPE_ADD:
 			if (inside) {
-				color[0] = max(inputMask[0],inputValue[0]);
+				color[0] = max(inputMask[0], inputValue[0]);
 			}
 			else {
 				color[0] = inputMask[0];
@@ -78,7 +78,7 @@ void BoxMaskOperation::executePixel(float *color, float x, float y, PixelSampler
 			break;
 		case CMP_NODE_MASKTYPE_SUBTRACT:
 			if (inside) {
-				color[0] = inputMask[0]-inputValue[0];
+				color[0] = inputMask[0] - inputValue[0];
 				CLAMP(color[0], 0, 1);
 			}
 			else {
@@ -87,24 +87,24 @@ void BoxMaskOperation::executePixel(float *color, float x, float y, PixelSampler
 			break;
 		case CMP_NODE_MASKTYPE_MULTIPLY:
 			if (inside) {
-				color[0] = inputMask[0]*inputValue[0];
+				color[0] = inputMask[0] * inputValue[0];
 			}
 			else {
 				color[0] = 0;
 			}
 			break;
 		case CMP_NODE_MASKTYPE_NOT:
-		if (inside) {
-			if (inputMask[0]>0.0f) {
-				color[0] = 0;
+			if (inside) {
+				if (inputMask[0] > 0.0f) {
+					color[0] = 0;
+				}
+				else {
+					color[0] = inputValue[0];
+				}
 			}
 			else {
-				color[0] = inputValue[0];
+				color[0] = inputMask[0];
 			}
-		}
-		else {
-			color[0] = inputMask[0];
-		}
 			break;
 	}
 
diff --git a/source/blender/compositor/operations/COM_BoxMaskOperation.h b/source/blender/compositor/operations/COM_BoxMaskOperation.h
index c3af95578d4..65327abc9a6 100644
--- a/source/blender/compositor/operations/COM_BoxMaskOperation.h
+++ b/source/blender/compositor/operations/COM_BoxMaskOperation.h
@@ -28,10 +28,10 @@
 class BoxMaskOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputMask;
-	SocketReader * inputValue;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputMask;
+	SocketReader *inputValue;
 	
 	float sine;
 	float cosine;
@@ -43,23 +43,23 @@ public:
 	BoxMaskOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
-	void setData(NodeBoxMask *data) {this->data = data;}
-	
-	void setMaskType(int maskType) {this->maskType = maskType;}
+	void setData(NodeBoxMask *data) { this->data = data; }
+
+	void setMaskType(int maskType) { this->maskType = maskType; }
 
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_BrightnessOperation.cpp b/source/blender/compositor/operations/COM_BrightnessOperation.cpp
index a4396a43cf7..95862a1fd83 100644
--- a/source/blender/compositor/operations/COM_BrightnessOperation.cpp
+++ b/source/blender/compositor/operations/COM_BrightnessOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_BrightnessOperation.h"
 
-BrightnessOperation::BrightnessOperation(): NodeOperation()
+BrightnessOperation::BrightnessOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addInputSocket(COM_DT_VALUE);
@@ -52,10 +52,10 @@ void BrightnessOperation::executePixel(float *color, float x, float y, PixelSamp
 	float delta = contrast / 200.0f;
 	a = 1.0f - delta * 2.0f;
 	/*
-	* The algorithm is by Werner D. Streidt
-	* (http://visca.com/ffactory/archives/5-99/msg00021.html)
-	* Extracted of OpenCV demhist.c
-	*/
+	 * The algorithm is by Werner D. Streidt
+	 * (http://visca.com/ffactory/archives/5-99/msg00021.html)
+	 * Extracted of OpenCV demhist.c
+	 */
 	if (contrast > 0) {
 		a = 1.0f / a;
 		b = a * (brightness - delta);
@@ -65,9 +65,9 @@ void BrightnessOperation::executePixel(float *color, float x, float y, PixelSamp
 		b = a * (brightness + delta);
 	}
 	
-	color[0] = a*inputValue[0]+b;
-	color[1] = a*inputValue[1]+b;
-	color[2] = a*inputValue[2]+b;
+	color[0] = a * inputValue[0] + b;
+	color[1] = a * inputValue[1] + b;
+	color[2] = a * inputValue[2] + b;
 	color[3] = inputValue[3];
 }
 
diff --git a/source/blender/compositor/operations/COM_BrightnessOperation.h b/source/blender/compositor/operations/COM_BrightnessOperation.h
index 0c718a8b131..74c648fd8fb 100644
--- a/source/blender/compositor/operations/COM_BrightnessOperation.h
+++ b/source/blender/compositor/operations/COM_BrightnessOperation.h
@@ -28,8 +28,8 @@
 class BrightnessOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
+	 * Cached reference to the inputProgram
+	 */
 	SocketReader *inputProgram;
 	SocketReader *inputBrightnessProgram;
 	SocketReader *inputContrastProgram;
@@ -38,18 +38,18 @@ public:
 	BrightnessOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 
 };
diff --git a/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp b/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
index a3438cea27b..3f9003b8c48 100644
--- a/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
+++ b/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
@@ -26,7 +26,7 @@
 
 
 
-CalculateMeanOperation::CalculateMeanOperation(): NodeOperation()
+CalculateMeanOperation::CalculateMeanOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR, COM_SC_NO_RESIZE);
 	this->addOutputSocket(COM_DT_VALUE);
@@ -42,7 +42,7 @@ void CalculateMeanOperation::initExecution()
 	NodeOperation::initMutex();
 }
 
-void CalculateMeanOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data)
+void CalculateMeanOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
 {
 	color[0] = this->result;
 }
@@ -72,54 +72,54 @@ bool CalculateMeanOperation::determineDependingAreaOfInterest(rcti *input, ReadB
 
 void *CalculateMeanOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
 {
-	BLI_mutex_lock(getMutex());
+	lockMutex();
 	if (!this->iscalculated) {
-		MemoryBuffer *tile = (MemoryBuffer*)imageReader->initializeTileData(rect, memoryBuffers);
+		MemoryBuffer *tile = (MemoryBuffer *)imageReader->initializeTileData(rect, memoryBuffers);
 		calculateMean(tile);
 		this->iscalculated = true;
 	}
-	BLI_mutex_unlock(getMutex());
+	unlockMutex();
 	return NULL;
 }
 
-void CalculateMeanOperation::calculateMean(MemoryBuffer * tile)
+void CalculateMeanOperation::calculateMean(MemoryBuffer *tile)
 {
 	this->result = 0.0f;
 	float *buffer = tile->getBuffer();
-	int size = tile->getWidth()*tile->getHeight();
+	int size = tile->getWidth() * tile->getHeight();
 	int pixels = 0;
 	float sum;
-	for (int i = 0, offset = 0 ; i < size ; i ++, offset +=4) {
-		if (buffer[offset+3] > 0) {
-			pixels ++;
+	for (int i = 0, offset = 0; i < size; i++, offset += 4) {
+		if (buffer[offset + 3] > 0) {
+			pixels++;
 	
 			switch (this->setting)
 			{
-			case 1:
+				case 1:
 				{
-					sum += buffer[offset]*0.35f + buffer[offset+1]*0.45f + buffer[offset+2]*0.2f;
+					sum += buffer[offset] * 0.35f + buffer[offset + 1] * 0.45f + buffer[offset + 2] * 0.2f;
 					break;
 				}
-			case 2:
+				case 2:
 				{
-				sum+= buffer[offset];
+					sum += buffer[offset];
 					break;
 				}
-			case 3:
+				case 3:
 				{
-				sum+= buffer[offset+1];
+					sum += buffer[offset + 1];
 					break;
 				}
-			case 4:
+				case 4:
 				{
-				sum+= buffer[offset+2];
+					sum += buffer[offset + 2];
 					break;
 				}
-			case 5:
+				case 5:
 				{
 					float yuv[3];
-					rgb_to_yuv(buffer[offset], buffer[offset+1], buffer[offset+2], &yuv[0], &yuv[1], &yuv[2]);
-					sum+=yuv[0];
+					rgb_to_yuv(buffer[offset], buffer[offset + 1], buffer[offset + 2], &yuv[0], &yuv[1], &yuv[2]);
+					sum += yuv[0];
 					break;
 				}
 			}
diff --git a/source/blender/compositor/operations/COM_CalculateMeanOperation.h b/source/blender/compositor/operations/COM_CalculateMeanOperation.h
index b21743aa8bc..7a28eb3774a 100644
--- a/source/blender/compositor/operations/COM_CalculateMeanOperation.h
+++ b/source/blender/compositor/operations/COM_CalculateMeanOperation.h
@@ -26,15 +26,15 @@
 #include "DNA_node_types.h"
 
 /**
-  * @brief base class of CalculateMean, implementing the simple CalculateMean
-  * @ingroup operation
-  */
+ * @brief base class of CalculateMean, implementing the simple CalculateMean
+ * @ingroup operation
+ */
 class CalculateMeanOperation : public NodeOperation {
 protected:
 	/**
-	  * @brief Cached reference to the reader
-	  */
-	SocketReader * imageReader;
+	 * @brief Cached reference to the reader
+	 */
+	SocketReader *imageReader;
 	
 	bool iscalculated;
 	float result;
@@ -44,24 +44,24 @@ public:
 	CalculateMeanOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
-	void setSetting(int setting) {this->setting = setting;}
+	void setSetting(int setting) { this->setting = setting; }
 	
 protected:
 	void calculateMean(MemoryBuffer *tile);
diff --git a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
index 651c6674fdb..b0739cd7567 100644
--- a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
+++ b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
@@ -26,72 +26,73 @@
 
 
 
-CalculateStandardDeviationOperation::CalculateStandardDeviationOperation(): CalculateMeanOperation()
+CalculateStandardDeviationOperation::CalculateStandardDeviationOperation() : CalculateMeanOperation()
 {
+	/* pass */
 }
 
-void CalculateStandardDeviationOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data)
+void CalculateStandardDeviationOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
 {
 	color[0] = this->standardDeviation;
 }
 
 void *CalculateStandardDeviationOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
 {
-	BLI_mutex_lock(getMutex());
+	lockMutex();
 	if (!this->iscalculated) {
-		MemoryBuffer *tile = (MemoryBuffer*)imageReader->initializeTileData(rect, memoryBuffers);
+		MemoryBuffer *tile = (MemoryBuffer *)imageReader->initializeTileData(rect, memoryBuffers);
 		CalculateMeanOperation::calculateMean(tile);
 		this->standardDeviation = 0.0f;
 		float *buffer = tile->getBuffer();
-		int size = tile->getWidth()*tile->getHeight();
+		int size = tile->getWidth() * tile->getHeight();
 		int pixels = 0;
 		float sum;
 		float mean = this->result;
-		for (int i = 0, offset = 0 ; i < size ; i ++, offset +=4) {
-			if (buffer[offset+3] > 0) {
-				pixels ++;
+		for (int i = 0, offset = 0; i < size; i++, offset += 4) {
+			if (buffer[offset + 3] > 0) {
+				pixels++;
 		
 				switch (this->setting)
 				{
-				case 1:
+					case 1:
 					{
-						float value = buffer[offset]*0.35f + buffer[offset+1]*0.45f + buffer[offset+2]*0.2f;
-						sum+=(value-mean)*(value-mean);
+						float value = buffer[offset] * 0.35f + buffer[offset + 1] * 0.45f + buffer[offset + 2] * 0.2f;
+						sum += (value - mean) * (value - mean);
 						break;
 					}
-				case 2:
+					case 2:
 					{
 						float value = buffer[offset];
-						sum+=value;
-						sum+=(value-mean)*(value-mean);
+						sum += value;
+						sum += (value - mean) * (value - mean);
 						break;
 					}
-				case 3:
+					case 3:
 					{
-						float value = buffer[offset+1];
-						sum+=value;
-						sum+=(value-mean)*(value-mean);
+						float value = buffer[offset + 1];
+						sum += value;
+						sum += (value - mean) * (value - mean);
 						break;
 					}
-				case 4:
+					case 4:
 					{
-						float value = buffer[offset+2];
-						sum+=value;
-						sum+=(value-mean)*(value-mean);
+						float value = buffer[offset + 2];
+						sum += value;
+						sum += (value - mean) * (value - mean);
 					}
-				case 5:
+					case 5:
 					{
 						float yuv[3];
-						rgb_to_yuv(buffer[offset], buffer[offset+1], buffer[offset+2], &yuv[0], &yuv[1], &yuv[2]);
-						sum+=(yuv[0]-mean)*(yuv[0]-mean);
+						rgb_to_yuv(buffer[offset], buffer[offset + 1], buffer[offset + 2], &yuv[0], &yuv[1], &yuv[2]);
+						sum += (yuv[0] - mean) * (yuv[0] - mean);
 						break;
 					}
 				}
 			}
 		}
-		this->standardDeviation = sqrt(sum / (float)(pixels-1));
+		this->standardDeviation = sqrt(sum / (float)(pixels - 1));
 		this->iscalculated = true;
 	}
-	BLI_mutex_unlock(getMutex());
+	unlockMutex();
 	return NULL;
 }
diff --git a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
index 05c94401c86..d3163d4cc32 100644
--- a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
+++ b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
@@ -26,9 +26,9 @@
 #include "DNA_node_types.h"
 #include "COM_CalculateMeanOperation.h"
 /**
-  * @brief base class of CalculateStandardDeviation, implementing the simple CalculateStandardDeviation
-  * @ingroup operation
-  */
+ * @brief base class of CalculateStandardDeviation, implementing the simple CalculateStandardDeviation
+ * @ingroup operation
+ */
 class CalculateStandardDeviationOperation : public CalculateMeanOperation {
 protected:
 	float standardDeviation;
@@ -37,9 +37,9 @@ public:
 	CalculateStandardDeviationOperation();
 
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
 
 	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
 
diff --git a/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp b/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp
index 9b7f87e38bc..487c1869782 100644
--- a/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp
+++ b/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_ChangeHSVOperation.h"
 
-ChangeHSVOperation::ChangeHSVOperation(): NodeOperation()
+ChangeHSVOperation::ChangeHSVOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addOutputSocket(COM_DT_COLOR);
@@ -46,7 +46,8 @@ void ChangeHSVOperation::executePixel(float *outputValue, float x, float y, Pixe
 	inputOperation->read(inputColor1, x, y, sampler, inputBuffers);
 	
 	outputValue[0] = inputColor1[0] + (this->hue - 0.5f);
-	if (outputValue[0]>1.0f) outputValue[0]-=1.0; else if (outputValue[0]<0.0) outputValue[0]+= 1.0;
+	if      (outputValue[0] > 1.0f) outputValue[0] -= 1.0f;
+	else if (outputValue[0] < 0.0f) outputValue[0] += 1.0f;
 	outputValue[1] = inputColor1[1] * this->saturation;
 	outputValue[2] = inputColor1[2] * this->value;
 	outputValue[3] = inputColor1[3];
diff --git a/source/blender/compositor/operations/COM_ChangeHSVOperation.h b/source/blender/compositor/operations/COM_ChangeHSVOperation.h
index a89487f9d7b..a2a6c034a82 100644
--- a/source/blender/compositor/operations/COM_ChangeHSVOperation.h
+++ b/source/blender/compositor/operations/COM_ChangeHSVOperation.h
@@ -26,12 +26,12 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ChangeHSVOperation : public NodeOperation {
 private:
-	SocketReader * inputOperation;
+	SocketReader *inputOperation;
 
 	float hue;
 	float saturation;
@@ -39,21 +39,21 @@ private:
 
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ChangeHSVOperation();
 	
 	void initExecution();
 	void deinitExecution();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
-	
-	void setHue(float hue) {this->hue = hue;}
-	void setSaturation(float saturation) {this->saturation = saturation;}
-	void setValue(float value) {this->value = value;}
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
+
+	void setHue(float hue) { this->hue = hue; }
+	void setSaturation(float saturation) { this->saturation = saturation; }
+	void setValue(float value) { this->value = value; }
 
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp b/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
index 70bfc8f8cfa..24af1a3aa53 100644
--- a/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
+++ b/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
@@ -22,7 +22,7 @@
 #include "COM_ChannelMatteOperation.h"
 #include "BLI_math.h"
 
-ChannelMatteOperation::ChannelMatteOperation(): NodeOperation()
+ChannelMatteOperation::ChannelMatteOperation() : NodeOperation()
 {
 	addInputSocket(COM_DT_COLOR);
 	addOutputSocket(COM_DT_VALUE);
@@ -39,9 +39,9 @@ void ChannelMatteOperation::initExecution()
 	switch (this->limit_method) {
 		/* SINGLE */
 		case 0: {
-		/* 123 / RGB / HSV / YUV / YCC */
-			const int matte_channel=this->matte_channel-1;
-			const int limit_channel=this->limit_channel-1;
+			/* 123 / RGB / HSV / YUV / YCC */
+			const int matte_channel = this->matte_channel - 1;
+			const int limit_channel = this->limit_channel - 1;
 			this->ids[0] = matte_channel;
 			this->ids[1] = limit_channel;
 			this->ids[2] = limit_channel;
@@ -107,7 +107,7 @@ void ChannelMatteOperation::executePixel(float *outputValue, float x, float y, P
 	else if (alpha < limit_min) {
 		alpha = 0.f;
 	}
-	else {/*blend */
+	else { /*blend */
 		alpha = (alpha - limit_min) / limit_range;
 	}
 
diff --git a/source/blender/compositor/operations/COM_ChannelMatteOperation.h b/source/blender/compositor/operations/COM_ChannelMatteOperation.h
index a4b5f454f92..17db0f9ffe2 100644
--- a/source/blender/compositor/operations/COM_ChannelMatteOperation.h
+++ b/source/blender/compositor/operations/COM_ChannelMatteOperation.h
@@ -25,9 +25,9 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ChannelMatteOperation : public NodeOperation {
 private:
 	SocketReader *inputImageProgram;
@@ -42,24 +42,24 @@ private:
 	float limit_range;
 
 	/** ids to use for the operations (max and simple)
-	  * alpha = in[ids[0]] - max(in[ids[1]], in[ids[2]])
-	  * the simple operation is using:
-	  * alpha = in[ids[0]] - in[ids[1]]
-	  * but to use the same formula and operation for both we do:
-		* ids[2] = ids[1]
-	  * alpha = in[ids[0]] - max(in[ids[1]], in[ids[2]])
-	  */
+	 * alpha = in[ids[0]] - max(in[ids[1]], in[ids[2]])
+	 * the simple operation is using:
+	 * alpha = in[ids[0]] - in[ids[1]]
+	 * but to use the same formula and operation for both we do:
+	 * ids[2] = ids[1]
+	 * alpha = in[ids[0]] - max(in[ids[1]], in[ids[2]])
+	 */
 	int ids[3];
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ChannelMatteOperation();
 
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 	void initExecution();
 	void deinitExecution();
diff --git a/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp b/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp
index e082ffed2b6..0ce1a585598 100644
--- a/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp
+++ b/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp
@@ -22,7 +22,7 @@
 #include "COM_ChromaMatteOperation.h"
 #include "BLI_math.h"
 
-ChromaMatteOperation::ChromaMatteOperation(): NodeOperation()
+ChromaMatteOperation::ChromaMatteOperation() : NodeOperation()
 {
 	addInputSocket(COM_DT_COLOR);
 	addInputSocket(COM_DT_COLOR);
@@ -66,36 +66,36 @@ void ChromaMatteOperation::executePixel(float *outputValue, float x, float y, Pi
 
 	/* Algorithm from book "Video Demistified," does not include the spill reduction part */
 	/* find theta, the angle that the color space should be rotated based on key*/
-	theta=atan2(inKey[2], inKey[1]);
+	theta = atan2(inKey[2], inKey[1]);
 
 	/*rotate the cb and cr into x/z space */
-	x_angle=inImage[1]*cosf(theta)+inImage[2]*sinf(theta);
-	z_angle=inImage[2]*cosf(theta)-inImage[1]*sinf(theta);
+	x_angle = inImage[1] * cosf(theta) + inImage[2] * sinf(theta);
+	z_angle = inImage[2] * cosf(theta) - inImage[1] * sinf(theta);
 
 	/*if within the acceptance angle */
 	/* if kfg is <0 then the pixel is outside of the key color */
-	kfg = x_angle-(fabsf(z_angle)/tanf(acceptance/2.f));
+	kfg = x_angle - (fabsf(z_angle) / tanf(acceptance / 2.f));
 
-	if (kfg>0.f) {  /* found a pixel that is within key color */
-		alpha=(1.f-kfg)*(gain);
+	if (kfg > 0.f) {  /* found a pixel that is within key color */
+		alpha = (1.f - kfg) * (gain);
 
-		beta=atan2(z_angle,x_angle);
+		beta = atan2(z_angle, x_angle);
 
 		/* if beta is within the cutoff angle */
-		if (fabsf(beta) < (cutoff/2.f)) {
-			alpha=0.f;
+		if (fabsf(beta) < (cutoff / 2.f)) {
+			alpha = 0.f;
 		}
 
 		/* don't make something that was more transparent less transparent */
-		if (alpha<inImage[3]) {
-			outputValue[0]=alpha;
+		if (alpha < inImage[3]) {
+			outputValue[0] = alpha;
 		}
 		else {
-			outputValue[0]=inImage[3];
+			outputValue[0] = inImage[3];
 		}
 	}
 	else { /*pixel is outside key color */
-		outputValue[0]=inImage[3]; /* make pixel just as transparent as it was before */
+		outputValue[0] = inImage[3]; /* make pixel just as transparent as it was before */
 	}
 }
 
diff --git a/source/blender/compositor/operations/COM_ChromaMatteOperation.h b/source/blender/compositor/operations/COM_ChromaMatteOperation.h
index 9c5a5ff997b..a09203f29b3 100644
--- a/source/blender/compositor/operations/COM_ChromaMatteOperation.h
+++ b/source/blender/compositor/operations/COM_ChromaMatteOperation.h
@@ -25,9 +25,9 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ChromaMatteOperation : public NodeOperation {
 private:
 	NodeChroma *settings;
@@ -35,18 +35,18 @@ private:
 	SocketReader *inputKeyProgram;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ChromaMatteOperation();
 
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 	void initExecution();
 	void deinitExecution();
 
-	void setSettings(NodeChroma *nodeChroma) {this->settings = nodeChroma;}
+	void setSettings(NodeChroma *nodeChroma) { this->settings = nodeChroma; }
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp b/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
index cc535cd95df..a48fe169fd7 100644
--- a/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
+++ b/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
@@ -28,12 +28,12 @@ inline float colorbalance_cdl(float in, float offset, float power, float slope)
 	float x = in * slope + offset;
 
 	/* prevent NaN */
-	CLAMP(x, 0.0, 1.0);
+	CLAMP(x, 0.0f, 1.0f);
 
 	return powf(x, power);
 }
 
-ColorBalanceASCCDLOperation::ColorBalanceASCCDLOperation(): NodeOperation()
+ColorBalanceASCCDLOperation::ColorBalanceASCCDLOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_VALUE);
 	this->addInputSocket(COM_DT_COLOR);
@@ -61,9 +61,9 @@ void ColorBalanceASCCDLOperation::executePixel(float *outputColor, float x, floa
 	fac = min(1.0f, fac);
 	const float mfac = 1.0f - fac;
 	
-	outputColor[0] = mfac*inputColor[0] + fac * colorbalance_cdl(inputColor[0], this->lift[0], this->gamma[0], this->gain[0]);
-	outputColor[1] = mfac*inputColor[1] + fac * colorbalance_cdl(inputColor[1], this->lift[1], this->gamma[1], this->gain[1]);
-	outputColor[2] = mfac*inputColor[2] + fac * colorbalance_cdl(inputColor[2], this->lift[2], this->gamma[2], this->gain[2]);
+	outputColor[0] = mfac * inputColor[0] + fac *colorbalance_cdl(inputColor[0], this->lift[0], this->gamma[0], this->gain[0]);
+	outputColor[1] = mfac * inputColor[1] + fac *colorbalance_cdl(inputColor[1], this->lift[1], this->gamma[1], this->gain[1]);
+	outputColor[2] = mfac * inputColor[2] + fac *colorbalance_cdl(inputColor[2], this->lift[2], this->gamma[2], this->gain[2]);
 	outputColor[3] = inputColor[3];
 
 }
diff --git a/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h b/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
index fb973e75c15..9e7db59d99d 100644
--- a/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
+++ b/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
@@ -24,18 +24,17 @@
 #define _COM_ColorBalanceASCCDLOperation_h
 #include "COM_NodeOperation.h"
 
-
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ColorBalanceASCCDLOperation : public NodeOperation {
 protected:
 	/**
-	  * Prefetched reference to the inputProgram
-	  */
-	SocketReader * inputValueOperation;
-	SocketReader * inputColorOperation;
+	 * Prefetched reference to the inputProgram
+	 */
+	SocketReader *inputValueOperation;
+	SocketReader *inputColorOperation;
 	
 	float gain[3];
 	float lift[3];
@@ -43,39 +42,27 @@ protected:
 
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ColorBalanceASCCDLOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
-	void setGain(float gain[3]) {
-		this->gain[0] = gain[0];
-		this->gain[1] = gain[1];
-		this->gain[2] = gain[2];
-	}
-	void setLift(float lift[3]) {
-		this->lift[0] = lift[0];
-		this->lift[1] = lift[1];
-		this->lift[2] = lift[2];
-	}
-	void setGamma(float gamma[3]) {
-		this->gamma[0] = gamma[0];
-		this->gamma[1] = gamma[1];
-		this->gamma[2] = gamma[2];
-	}
+	void setGain(float gain[3]) { copy_v3_v3(this->gain, gain); }
+	void setLift(float lift[3]) { copy_v3_v3(this->lift, lift); }
+	void setGamma(float gamma[3]) { copy_v3_v3(this->gamma, gamma); }
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp b/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
index 82958a7086e..7a8d62dfe21 100644
--- a/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
+++ b/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
@@ -38,7 +38,7 @@ inline float colorbalance_lgg(float in, float lift_lgg, float gamma_inv, float g
 	return powf(srgb_to_linearrgb(x), gamma_inv);
 }
 
-ColorBalanceLGGOperation::ColorBalanceLGGOperation(): NodeOperation()
+ColorBalanceLGGOperation::ColorBalanceLGGOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_VALUE);
 	this->addInputSocket(COM_DT_COLOR);
@@ -66,9 +66,9 @@ void ColorBalanceLGGOperation::executePixel(float *outputColor, float x, float y
 	fac = min(1.0f, fac);
 	const float mfac = 1.0f - fac;
 	
-	outputColor[0] = mfac*inputColor[0] + fac * colorbalance_lgg(inputColor[0], this->lift[0], this->gamma_inv[0], this->gain[0]);
-	outputColor[1] = mfac*inputColor[1] + fac * colorbalance_lgg(inputColor[1], this->lift[1], this->gamma_inv[1], this->gain[1]);
-	outputColor[2] = mfac*inputColor[2] + fac * colorbalance_lgg(inputColor[2], this->lift[2], this->gamma_inv[2], this->gain[2]);
+	outputColor[0] = mfac * inputColor[0] + fac *colorbalance_lgg(inputColor[0], this->lift[0], this->gamma_inv[0], this->gain[0]);
+	outputColor[1] = mfac * inputColor[1] + fac *colorbalance_lgg(inputColor[1], this->lift[1], this->gamma_inv[1], this->gain[1]);
+	outputColor[2] = mfac * inputColor[2] + fac *colorbalance_lgg(inputColor[2], this->lift[2], this->gamma_inv[2], this->gain[2]);
 	outputColor[3] = inputColor[3];
 
 }
diff --git a/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h b/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
index e0df76cf2c5..54cfb49327f 100644
--- a/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
+++ b/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
@@ -26,16 +26,16 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ColorBalanceLGGOperation : public NodeOperation {
 protected:
 	/**
-	  * Prefetched reference to the inputProgram
-	  */
-	SocketReader * inputValueOperation;
-	SocketReader * inputColorOperation;
+	 * Prefetched reference to the inputProgram
+	 */
+	SocketReader *inputValueOperation;
+	SocketReader *inputColorOperation;
 	
 	float gain[3];
 	float lift[3];
@@ -43,23 +43,23 @@ protected:
 
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ColorBalanceLGGOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
 	void setGain(float gain[3]) {
diff --git a/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp b/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
index af28b776892..5f62f9ec403 100644
--- a/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
+++ b/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
@@ -23,7 +23,7 @@
 #include "COM_ColorCorrectionOperation.h"
 #include "BLI_math.h"
 
-ColorCorrectionOperation::ColorCorrectionOperation(): NodeOperation()
+ColorCorrectionOperation::ColorCorrectionOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addInputSocket(COM_DT_VALUE);
@@ -47,7 +47,7 @@ void ColorCorrectionOperation::executePixel(float *output, float x, float y, Pix
 	this->inputImage->read(inputImageColor, x, y, sampler, inputBuffers);
 	this->inputMask->read(inputMask, x, y, sampler, inputBuffers);
 	
-	float level = (inputImageColor[0] + inputImageColor[1] + inputImageColor[2])/3.0f;
+	float level = (inputImageColor[0] + inputImageColor[1] + inputImageColor[2]) / 3.0f;
 	float contrast = this->data->master.contrast;
 	float saturation = this->data->master.saturation;
 	float gamma = this->data->master.gamma;
@@ -62,56 +62,57 @@ void ColorCorrectionOperation::executePixel(float *output, float x, float y, Pix
 	float levelShadows = 0.0;
 	float levelMidtones = 0.0;
 	float levelHighlights = 0.0;
-#define MARGIN 0.10
-#define MARGIN_DIV (0.5/MARGIN)
-	if (level < this->data->startmidtones-MARGIN) {
+#define MARGIN 0.10f
+#define MARGIN_DIV (0.5f / MARGIN)
+	if (level < this->data->startmidtones - MARGIN) {
 		levelShadows = 1.0f;
 	}
-	else if (level < this->data->startmidtones+MARGIN) {
-		levelMidtones = ((level-this->data->startmidtones)*MARGIN_DIV)+0.5;
-		levelShadows = 1.0 - levelMidtones;
+	else if (level < this->data->startmidtones + MARGIN) {
+		levelMidtones = ((level - this->data->startmidtones) * MARGIN_DIV) + 0.5f;
+		levelShadows = 1.0f - levelMidtones;
 	}
-	else if (level < this->data->endmidtones-MARGIN) {
+	else if (level < this->data->endmidtones - MARGIN) {
 		levelMidtones = 1.0f;
 	}
-	else if (level < this->data->endmidtones+MARGIN) {
-		levelHighlights = ((level-this->data->endmidtones)*MARGIN_DIV)+0.5;
-		levelMidtones = 1.0 - levelHighlights;
+	else if (level < this->data->endmidtones + MARGIN) {
+		levelHighlights = ((level - this->data->endmidtones) * MARGIN_DIV) + 0.5f;
+		levelMidtones = 1.0f - levelHighlights;
 	}
 	else {
 		levelHighlights = 1.0f;
 	}
 #undef MARGIN
 #undef MARGIN_DIV
-	contrast *= (levelShadows*this->data->shadows.contrast)+(levelMidtones*this->data->midtones.contrast)+(levelHighlights*this->data->highlights.contrast);
-	saturation *= (levelShadows*this->data->shadows.saturation)+(levelMidtones*this->data->midtones.saturation)+(levelHighlights*this->data->highlights.saturation);
-	gamma *= (levelShadows*this->data->shadows.gamma)+(levelMidtones*this->data->midtones.gamma)+(levelHighlights*this->data->highlights.gamma);
-	gain *= (levelShadows*this->data->shadows.gain)+(levelMidtones*this->data->midtones.gain)+(levelHighlights*this->data->highlights.gain);
-	lift += (levelShadows*this->data->shadows.lift)+(levelMidtones*this->data->midtones.lift)+(levelHighlights*this->data->highlights.lift);
+	contrast *= (levelShadows * this->data->shadows.contrast) + (levelMidtones * this->data->midtones.contrast) + (levelHighlights * this->data->highlights.contrast);
+	saturation *= (levelShadows * this->data->shadows.saturation) + (levelMidtones * this->data->midtones.saturation) + (levelHighlights * this->data->highlights.saturation);
+	gamma *= (levelShadows * this->data->shadows.gamma) + (levelMidtones * this->data->midtones.gamma) + (levelHighlights * this->data->highlights.gamma);
+	gain *= (levelShadows * this->data->shadows.gain) + (levelMidtones * this->data->midtones.gain) + (levelHighlights * this->data->highlights.gain);
+	lift += (levelShadows * this->data->shadows.lift) + (levelMidtones * this->data->midtones.lift) + (levelHighlights * this->data->highlights.lift);
 	
+	float invgamma = 1.0f / gamma;
+	float luma = rgb_to_luma_y(inputImageColor);
+
 	r = inputImageColor[0];
 	g = inputImageColor[1];
 	b = inputImageColor[2];
-	
-	float invgamma = 1.0f/gamma;
-	float luma = 0.2126 * r + 0.7152 * g + 0.0722 * b;
+
 	r = (luma + saturation * (r - luma));
 	g = (luma + saturation * (g - luma));
 	b = (luma + saturation * (b - luma));
 	
-	r = 0.5+((r-0.5)*contrast);
-	g = 0.5+((g-0.5)*contrast);
-	b = 0.5+((b-0.5)*contrast);
+	r = 0.5f + ((r - 0.5f) * contrast);
+	g = 0.5f + ((g - 0.5f) * contrast);
+	b = 0.5f + ((b - 0.5f) * contrast);
 	
-	r = powf(r*gain+lift, invgamma);
-	g = powf(g*gain+lift, invgamma);
-	b = powf(b*gain+lift, invgamma);
+	r = powf(r * gain + lift, invgamma);
+	g = powf(g * gain + lift, invgamma);
+	b = powf(b * gain + lift, invgamma);
 	
 	
 	// mix with mask
-	r = mvalue*inputImageColor[0] + value * r;
-	g = mvalue*inputImageColor[1] + value * g;
-	b = mvalue*inputImageColor[2] + value * b;
+	r = mvalue * inputImageColor[0] + value * r;
+	g = mvalue * inputImageColor[1] + value * g;
+	b = mvalue * inputImageColor[2] + value * b;
 	
 	if (this->redChannelEnabled) {
 		output[0] = r;
diff --git a/source/blender/compositor/operations/COM_ColorCorrectionOperation.h b/source/blender/compositor/operations/COM_ColorCorrectionOperation.h
index 89107150ebd..c0c33f7f2fa 100644
--- a/source/blender/compositor/operations/COM_ColorCorrectionOperation.h
+++ b/source/blender/compositor/operations/COM_ColorCorrectionOperation.h
@@ -28,8 +28,8 @@
 class ColorCorrectionOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
+	 * Cached reference to the inputProgram
+	 */
 	SocketReader *inputImage;
 	SocketReader *inputMask;
 	NodeColorCorrection *data;
@@ -42,23 +42,23 @@ public:
 	ColorCorrectionOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
-	void setData(NodeColorCorrection * data) {this->data = data;}
-	void setRedChannelEnabled(bool enabled) {this->redChannelEnabled = enabled;}
-	void setGreenChannelEnabled(bool enabled) {this->greenChannelEnabled = enabled;}
-	void setBlueChannelEnabled(bool enabled) {this->blueChannelEnabled = enabled;}
+	void setData(NodeColorCorrection *data) { this->data = data; }
+	void setRedChannelEnabled(bool enabled) { this->redChannelEnabled = enabled; }
+	void setGreenChannelEnabled(bool enabled) { this->greenChannelEnabled = enabled; }
+	void setBlueChannelEnabled(bool enabled) { this->blueChannelEnabled = enabled; }
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_ColorCurveOperation.cpp b/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
index 8aee54013b1..4feac3e7273 100644
--- a/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
+++ b/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
@@ -28,9 +28,10 @@ extern "C" {
 	#include "BKE_colortools.h"
 #ifdef __cplusplus
 }
+#include "MEM_guardedalloc.h"
 #endif
 
-ColorCurveOperation::ColorCurveOperation(): CurveBaseOperation()
+ColorCurveOperation::ColorCurveOperation() : CurveBaseOperation()
 {
 	this->addInputSocket(COM_DT_VALUE);
 	this->addInputSocket(COM_DT_COLOR);
@@ -59,6 +60,9 @@ void ColorCurveOperation::initExecution()
 
 void ColorCurveOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
 {
+	CurveMapping *cumap = this->curveMapping;
+	CurveMapping *workingCopy = (CurveMapping *)MEM_dupallocN(cumap);
+	
 	float black[4];
 	float white[4];
 	float fac[4];
@@ -67,26 +71,25 @@ void ColorCurveOperation::executePixel(float *color, float x, float y, PixelSamp
 	this->inputBlackProgram->read(black, x, y, sampler, inputBuffers);
 	this->inputWhiteProgram->read(white, x, y, sampler, inputBuffers);
 
-	curvemapping_set_black_white(this->curveMapping, black, white);
+	curvemapping_set_black_white(workingCopy, black, white);
 
 	this->inputFacProgram->read(fac, x, y, sampler, inputBuffers);
 	this->inputImageProgram->read(image, x, y, sampler, inputBuffers);
 
-	if (fac[0] >= 1.0)
-		curvemapping_evaluate_premulRGBF(this->curveMapping, color, image);
-	else if (*fac<=0.0) {
-		color[0] = image[0];
-		color[1] = image[1];
-		color[2] = image[2];
+	if (*fac >= 1.0f)
+		curvemapping_evaluate_premulRGBF(workingCopy, color, image);
+	else if (*fac <= 0.0f) {
+		copy_v3_v3(color, image);
 	}
 	else {
-		float col[4], mfac = 1.0f-*fac;
-		curvemapping_evaluate_premulRGBF(this->curveMapping, col, image);
-		color[0] = mfac*image[0] + *fac*col[0];
-		color[1] = mfac*image[1] + *fac*col[1];
-		color[2] = mfac*image[2] + *fac*col[2];
+		float col[4], mfac = 1.0f - *fac;
+		curvemapping_evaluate_premulRGBF(workingCopy, col, image);
+		color[0] = mfac * image[0] + *fac * col[0];
+		color[1] = mfac * image[1] + *fac * col[1];
+		color[2] = mfac * image[2] + *fac * col[2];
 	}
 	color[3] = image[3];
+	MEM_freeN(workingCopy);
 }
 
 void ColorCurveOperation::deinitExecution()
@@ -97,3 +100,59 @@ void ColorCurveOperation::deinitExecution()
 	this->inputWhiteProgram = NULL;
 	curvemapping_premultiply(this->curveMapping, 1);
 }
+
+
+// Constant level curve mapping
+
+ConstantLevelColorCurveOperation::ConstantLevelColorCurveOperation() : CurveBaseOperation()
+{
+	this->addInputSocket(COM_DT_VALUE);
+	this->addInputSocket(COM_DT_COLOR);
+	this->addOutputSocket(COM_DT_COLOR);
+
+	this->inputFacProgram = NULL;
+	this->inputImageProgram = NULL;
+
+	this->setResolutionInputSocketIndex(1);
+}
+void ConstantLevelColorCurveOperation::initExecution()
+{
+	CurveBaseOperation::initExecution();
+	this->inputFacProgram = this->getInputSocketReader(0);
+	this->inputImageProgram = this->getInputSocketReader(1);
+
+	curvemapping_premultiply(this->curveMapping, 0);
+
+	curvemapping_set_black_white(this->curveMapping, this->black, this->white);
+}
+
+void ConstantLevelColorCurveOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
+{
+	float fac[4];
+	float image[4];
+
+
+	this->inputFacProgram->read(fac, x, y, sampler, inputBuffers);
+	this->inputImageProgram->read(image, x, y, sampler, inputBuffers);
+
+	if (*fac >= 1.0f)
+		curvemapping_evaluate_premulRGBF(this->curveMapping, color, image);
+	else if (*fac <= 0.0f) {
+		copy_v3_v3(color, image);
+	}
+	else {
+		float col[4], mfac = 1.0f - *fac;
+		curvemapping_evaluate_premulRGBF(this->curveMapping, col, image);
+		color[0] = mfac * image[0] + *fac * col[0];
+		color[1] = mfac * image[1] + *fac * col[1];
+		color[2] = mfac * image[2] + *fac * col[2];
+	}
+	color[3] = image[3];
+}
+
+void ConstantLevelColorCurveOperation::deinitExecution()
+{
+	this->inputFacProgram = NULL;
+	this->inputImageProgram = NULL;
+	curvemapping_premultiply(this->curveMapping, 1);
+}
diff --git a/source/blender/compositor/operations/COM_ColorCurveOperation.h b/source/blender/compositor/operations/COM_ColorCurveOperation.h
index 15f9fd25e81..fcd78be8372 100644
--- a/source/blender/compositor/operations/COM_ColorCurveOperation.h
+++ b/source/blender/compositor/operations/COM_ColorCurveOperation.h
@@ -29,28 +29,61 @@
 class ColorCurveOperation : public CurveBaseOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputFacProgram;
-	SocketReader * inputImageProgram;
-	SocketReader * inputBlackProgram;
-	SocketReader * inputWhiteProgram;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputFacProgram;
+	SocketReader *inputImageProgram;
+	SocketReader *inputBlackProgram;
+	SocketReader *inputWhiteProgram;
 public:
 	ColorCurveOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 };
+
+class ConstantLevelColorCurveOperation : public CurveBaseOperation {
+private:
+	/**
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputFacProgram;
+	SocketReader *inputImageProgram;
+	float black[3];
+	float white[3];
+	
+public:
+	ConstantLevelColorCurveOperation();
+	
+	/**
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
+	
+	/**
+	 * Initialize the execution
+	 */
+	void initExecution();
+	
+	/**
+	 * Deinitialize the execution
+	 */
+	void deinitExecution();
+	
+	void setBlackLevel(float black[3]) { this->black[0] = black[0]; this->black[1] = black[1]; this->black[2] = black[2]; }
+	void setWhiteLevel(float white[3]) { this->white[0] = white[0]; this->white[1] = white[1]; this->white[2] = white[2]; }
+};
+
 #endif
diff --git a/source/blender/compositor/operations/COM_ColorMatteOperation.cpp b/source/blender/compositor/operations/COM_ColorMatteOperation.cpp
index 7706559be00..afb362dbdcd 100644
--- a/source/blender/compositor/operations/COM_ColorMatteOperation.cpp
+++ b/source/blender/compositor/operations/COM_ColorMatteOperation.cpp
@@ -22,7 +22,7 @@
 #include "COM_ColorMatteOperation.h"
 #include "BLI_math.h"
 
-ColorMatteOperation::ColorMatteOperation(): NodeOperation()
+ColorMatteOperation::ColorMatteOperation() : NodeOperation()
 {
 	addInputSocket(COM_DT_COLOR);
 	addInputSocket(COM_DT_COLOR);
@@ -64,16 +64,17 @@ void ColorMatteOperation::executePixel(float *outputValue, float x, float y, Pix
 	 */
 
 	if (
-	/* do hue last because it needs to wrap, and does some more checks  */
+	    /* do hue last because it needs to wrap, and does some more checks  */
 
-	/* sat */	(fabsf(inColor[1] - inKey[1]) < sat) &&
-	/* val */	(fabsf(inColor[2] - inKey[2]) < val) &&
+	    /* sat */ (fabsf(inColor[1] - inKey[1]) < sat) &&
+	    /* val */ (fabsf(inColor[2] - inKey[2]) < val) &&
 
-	/* multiply by 2 because it wraps on both sides of the hue,
-	 * otherwise 0.5 would key all hue's */
+	    /* multiply by 2 because it wraps on both sides of the hue,
+	     * otherwise 0.5 would key all hue's */
 
-	/* hue */	((h_wrap = 2.f * fabsf(inColor[0]-inKey[0])) < hue || (2.f - h_wrap) < hue)
-	) {
+	    /* hue */ ((h_wrap = 2.f * fabsf(inColor[0] - inKey[0])) < hue || (2.f - h_wrap) < hue)
+	    )
+	{
 		outputValue[0] = 0.0f; /*make transparent*/
 	}
 
diff --git a/source/blender/compositor/operations/COM_ColorMatteOperation.h b/source/blender/compositor/operations/COM_ColorMatteOperation.h
index 904a51128c8..e5dd9efd820 100644
--- a/source/blender/compositor/operations/COM_ColorMatteOperation.h
+++ b/source/blender/compositor/operations/COM_ColorMatteOperation.h
@@ -25,9 +25,9 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ColorMatteOperation : public NodeOperation {
 private:
 	NodeChroma *settings;
@@ -35,18 +35,18 @@ private:
 	SocketReader *inputKeyProgram;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ColorMatteOperation();
 
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 	void initExecution();
 	void deinitExecution();
 
-	void setSettings(NodeChroma *nodeChroma) {this->settings = nodeChroma;}
+	void setSettings(NodeChroma *nodeChroma) { this->settings = nodeChroma; }
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_ColorRampOperation.cpp b/source/blender/compositor/operations/COM_ColorRampOperation.cpp
index 992bf3b9d1d..9af70ddc5a7 100644
--- a/source/blender/compositor/operations/COM_ColorRampOperation.cpp
+++ b/source/blender/compositor/operations/COM_ColorRampOperation.cpp
@@ -30,7 +30,7 @@ extern "C" {
 }
 #endif
 
-ColorRampOperation::ColorRampOperation(): NodeOperation()
+ColorRampOperation::ColorRampOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_VALUE);
 	this->addOutputSocket(COM_DT_COLOR);
diff --git a/source/blender/compositor/operations/COM_ColorRampOperation.h b/source/blender/compositor/operations/COM_ColorRampOperation.h
index 8b8635cc5cd..eef5321eb19 100644
--- a/source/blender/compositor/operations/COM_ColorRampOperation.h
+++ b/source/blender/compositor/operations/COM_ColorRampOperation.h
@@ -28,29 +28,31 @@
 class ColorRampOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputProgram;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputProgram;
 	ColorBand *colorBand;
 public:
 	ColorRampOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
-	void setColorBand(ColorBand *colorBand) {this->colorBand = colorBand;}
+	void setColorBand(ColorBand *colorBand) {
+		this->colorBand = colorBand;
+	}
 
 
 };
diff --git a/source/blender/compositor/operations/COM_ColorSpillOperation.cpp b/source/blender/compositor/operations/COM_ColorSpillOperation.cpp
index 56141efe681..1a534d778c0 100644
--- a/source/blender/compositor/operations/COM_ColorSpillOperation.cpp
+++ b/source/blender/compositor/operations/COM_ColorSpillOperation.cpp
@@ -22,9 +22,9 @@
 
 #include "COM_ColorSpillOperation.h"
 #include "BLI_math.h"
-#define avg(a,b) ((a+b)/2)
+#define AVG(a, b) ((a + b) / 2)
 
-ColorSpillOperation::ColorSpillOperation(): NodeOperation()
+ColorSpillOperation::ColorSpillOperation() : NodeOperation()
 {
 	addInputSocket(COM_DT_COLOR);
 	addInputSocket(COM_DT_VALUE);
@@ -40,40 +40,40 @@ void ColorSpillOperation::initExecution()
 	this->inputImageReader = this->getInputSocketReader(0);
 	this->inputFacReader = this->getInputSocketReader(1);
 	if (spillChannel == 0) {
-		rmut = -1.0f;
-		gmut = 1.0f;
-		bmut = 1.0f;
+		this->rmut = -1.0f;
+		this->gmut = 1.0f;
+		this->bmut = 1.0f;
 		this->channel2 = 1;
 		this->channel3 = 2;
-		if (settings->unspill == 0) {
-			settings->uspillr = 1.0f;
-			settings->uspillg = 0.0f;
-			settings->uspillb = 0.0f;
+		if (this->settings->unspill == 0) {
+			this->settings->uspillr = 1.0f;
+			this->settings->uspillg = 0.0f;
+			this->settings->uspillb = 0.0f;
 		}
 	}
 	else if (spillChannel == 1) {
-		rmut = 1.0f;
-		gmut = -1.0f;
-		bmut = 1.0f;
+		this->rmut = 1.0f;
+		this->gmut = -1.0f;
+		this->bmut = 1.0f;
 		this->channel2 = 0;
 		this->channel3 = 2;
-		if (settings->unspill == 0) {
-			settings->uspillr = 0.0f;
-			settings->uspillg = 1.0f;
-			settings->uspillb = 0.0f;
+		if (this->settings->unspill == 0) {
+			this->settings->uspillr = 0.0f;
+			this->settings->uspillg = 1.0f;
+			this->settings->uspillb = 0.0f;
 		}
 	}
 	else {
-		rmut = 1.0f;
-		gmut = 1.0f;
-		bmut = -1.0f;
+		this->rmut = 1.0f;
+		this->gmut = 1.0f;
+		this->bmut = -1.0f;
 		
 		this->channel2 = 0;
 		this->channel3 = 1;
-		if (settings->unspill == 0) {
-			settings->uspillr = 0.0f;
-			settings->uspillg = 0.0f;
-			settings->uspillb = 1.0f;
+		if (this->settings->unspill == 0) {
+			this->settings->uspillr = 0.0f;
+			this->settings->uspillg = 0.0f;
+			this->settings->uspillb = 1.0f;
 		}
 	}
 }
@@ -88,31 +88,27 @@ void ColorSpillOperation::executePixel(float *outputValue, float x, float y, Pix
 {
 	float fac[4];
 	float input[4];
-	float map;	
 	this->inputFacReader->read(fac, x, y, sampler, inputBuffers);
 	this->inputImageReader->read(input, x, y, sampler, inputBuffers);
 	float rfac = min(1.0f, fac[0]);
-	map = calculateMapValue(rfac, input);
-	if (map>0) {
-		outputValue[0]=input[0]+rmut*(settings->uspillr*map);
-		outputValue[1]=input[1]+gmut*(settings->uspillg*map);
-		outputValue[2]=input[2]+bmut*(settings->uspillb*map);
-		outputValue[3]=input[3];
+	float map = calculateMapValue(rfac, input);
+	if (map > 0.0f) {
+		outputValue[0] = input[0] + this->rmut * (this->settings->uspillr * map);
+		outputValue[1] = input[1] + this->gmut * (this->settings->uspillg * map);
+		outputValue[2] = input[2] + this->bmut * (this->settings->uspillb * map);
+		outputValue[3] = input[3];
 	}
 	else {
-		outputValue[0]=input[0];
-		outputValue[1]=input[1];
-		outputValue[2]=input[2];
-		outputValue[3]=input[3];
+		copy_v4_v4(outputValue, input);
 	}	
 }
 float ColorSpillOperation::calculateMapValue(float fac, float *input)
 {
-	return fac * (input[this->spillChannel]-(this->settings->limscale*input[settings->limchan]));
+	return fac * (input[this->spillChannel] - (this->settings->limscale * input[this->settings->limchan]));
 }
 
 
 float ColorSpillAverageOperation::calculateMapValue(float fac, float *input)
 {
-	return fac * (input[this->spillChannel]-(this->settings->limscale*avg(input[this->channel2], input[this->channel3])));
+	return fac * (input[this->spillChannel] - (this->settings->limscale * AVG(input[this->channel2], input[this->channel3])));
 }
diff --git a/source/blender/compositor/operations/COM_ColorSpillOperation.h b/source/blender/compositor/operations/COM_ColorSpillOperation.h
index 69f51882496..e890a1e1564 100644
--- a/source/blender/compositor/operations/COM_ColorSpillOperation.h
+++ b/source/blender/compositor/operations/COM_ColorSpillOperation.h
@@ -25,9 +25,9 @@
 #include "COM_NodeOperation.h"
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ColorSpillOperation : public NodeOperation {
 protected:
 	NodeColorspill *settings;
@@ -39,25 +39,25 @@ protected:
 	float rmut, gmut, bmut;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ColorSpillOperation();
 
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 	void initExecution();
 	void deinitExecution();
 
-	void setSettings(NodeColorspill *nodeColorSpill) {this->settings = nodeColorSpill;}
-	void setSpillChannel(int channel) {this->spillChannel = channel;}
+	void setSettings(NodeColorspill *nodeColorSpill) { this->settings = nodeColorSpill; }
+	void setSpillChannel(int channel) { this->spillChannel = channel; }
 	
 	float calculateMapValue(float fac, float *input);
 };
 
-class ColorSpillAverageOperation: public ColorSpillOperation {
+class ColorSpillAverageOperation : public ColorSpillOperation {
 public:
 	float calculateMapValue(float fac, float *input);
 };
diff --git a/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp b/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
index 6b64934f0b8..dff8ccf7e73 100644
--- a/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
+++ b/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
@@ -53,7 +53,7 @@ void CombineChannelsOperation::deinitExecution()
 }
 
 
-void CombineChannelsOperation::executePixel(float *color,float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
+void CombineChannelsOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
 {
 	float input[4];
 	/// @todo: remove if statements
diff --git a/source/blender/compositor/operations/COM_CombineChannelsOperation.h b/source/blender/compositor/operations/COM_CombineChannelsOperation.h
index 18dd1fd2ec9..d2977155e14 100644
--- a/source/blender/compositor/operations/COM_CombineChannelsOperation.h
+++ b/source/blender/compositor/operations/COM_CombineChannelsOperation.h
@@ -25,7 +25,7 @@
 
 #include "COM_NodeOperation.h"
 
-class CombineChannelsOperation: public NodeOperation {
+class CombineChannelsOperation : public NodeOperation {
 private:
 	SocketReader *inputChannel1Operation;
 	SocketReader *inputChannel2Operation;
@@ -33,7 +33,7 @@ private:
 	SocketReader *inputChannel4Operation;
 public:
 	CombineChannelsOperation();
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	void initExecution();
 	void deinitExecution();
diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cpp b/source/blender/compositor/operations/COM_CompositorOperation.cpp
index 5a919965ede..2b1a804b432 100644
--- a/source/blender/compositor/operations/COM_CompositorOperation.cpp
+++ b/source/blender/compositor/operations/COM_CompositorOperation.cpp
@@ -15,8 +15,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributor: 
- *		Jeroen Bakker 
+ * Contributor:
+ *		Jeroen Bakker
  *		Monique Dewanchand
  */
 
@@ -53,14 +53,14 @@ void CompositorOperation::initExecution()
 	this->imageInput = getInputSocketReader(0);
 	this->alphaInput = getInputSocketReader(1);
 	if (this->getWidth() * this->getHeight() != 0) {
-		this->outputBuffer=(float*) MEM_callocN(this->getWidth()*this->getHeight()*4*sizeof(float), "CompositorOperation");
+		this->outputBuffer = (float *) MEM_callocN(this->getWidth() * this->getHeight() * 4 * sizeof(float), "CompositorOperation");
 	}
 }
 
 void CompositorOperation::deinitExecution()
 {
-	if (tree->test_break && !tree->test_break(tree->tbh)) {
-		const Scene * scene = this->scene;
+	if (!isBreaked()) {
+		const Scene *scene = this->scene;
 		Render *re = RE_GetRender(scene->id.name);
 		RenderResult *rr = RE_AcquireResultWrite(re);
 		if (rr) {
@@ -69,25 +69,32 @@ void CompositorOperation::deinitExecution()
 			}
 			rr->rectf = outputBuffer;
 		}
+		else {
+			if (this->outputBuffer) {
+				MEM_freeN(this->outputBuffer);
+			}
+		}
+
+		BKE_image_signal(BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result"), NULL, IMA_SIGNAL_FREE);
+
 		if (re) {
 			RE_ReleaseResult(re);
 			re = NULL;
 		}
-		BKE_image_signal(BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result"), NULL, IMA_SIGNAL_FREE);
 	}
 	else {
 		if (this->outputBuffer) {
 			MEM_freeN(this->outputBuffer);
 		}
 	}
-	
+
 	this->outputBuffer = NULL;
 	this->imageInput = NULL;
 	this->alphaInput = NULL;
 }
 
 
-void CompositorOperation::executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers)
+void CompositorOperation::executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers)
 {
 	float color[8]; // 7 is enough
 	float *buffer = this->outputBuffer;
@@ -97,37 +104,47 @@ void CompositorOperation::executeRegion(rcti *rect, unsigned int tileNumber, Mem
 	int y1 = rect->ymin;
 	int x2 = rect->xmax;
 	int y2 = rect->ymax;
-	int offset = (y1*this->getWidth() + x1 ) * 4;
+	int offset = (y1 * this->getWidth() + x1) * COM_NUMBER_OF_CHANNELS;
 	int x;
 	int y;
 	bool breaked = false;
 
-	for (y = y1 ; y < y2 && (!breaked); y++) {
-		for (x = x1 ; x < x2 && (!breaked) ; x++) {
+	for (y = y1; y < y2 && (!breaked); y++) {
+		for (x = x1; x < x2 && (!breaked); x++) {
 			imageInput->read(color, x, y, COM_PS_NEAREST, memoryBuffers);
 			if (alphaInput != NULL) {
 				alphaInput->read(&(color[3]), x, y, COM_PS_NEAREST, memoryBuffers);
 			}
-			buffer[offset] = color[0];
-			buffer[offset+1] = color[1];
-			buffer[offset+2] = color[2];
-			buffer[offset+3] = color[3];
-			offset +=4;
-			if (tree->test_break && tree->test_break(tree->tbh)) {
+			copy_v4_v4(buffer + offset, color);
+			offset += COM_NUMBER_OF_CHANNELS;
+			if (isBreaked()) {
 				breaked = true;
 			}
 		}
-		offset += (this->getWidth()-(x2-x1))*4;
+		offset += (this->getWidth() - (x2 - x1)) * COM_NUMBER_OF_CHANNELS;
 	}
 }
 
 void CompositorOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
 {
-	int width = this->scene->r.xsch*this->scene->r.size/100;
-	int height = this->scene->r.ysch*this->scene->r.size/100;
+	int width = this->scene->r.xsch * this->scene->r.size / 100;
+	int height = this->scene->r.ysch * this->scene->r.size / 100;
+
+	// check actual render resolution with cropping it may differ with cropped border.rendering
+	// FIX for: [31777] Border Crop gives black (easy)
+	Render *re = RE_GetRender(this->scene->id.name);
+	if (re) {
+		RenderResult *rr = RE_AcquireResultRead(re);
+		if (rr) {
+			width = rr->rectx;
+			height = rr->recty;
+		}
+		RE_ReleaseResult(re);
+	}
+
 	preferredResolution[0] = width;
 	preferredResolution[1] = height;
-	
+
 	NodeOperation::determineResolution(resolution, preferredResolution);
 
 	resolution[0] = width;
diff --git a/source/blender/compositor/operations/COM_CompositorOperation.h b/source/blender/compositor/operations/COM_CompositorOperation.h
index 41d43f896bb..0129c953946 100644
--- a/source/blender/compositor/operations/COM_CompositorOperation.h
+++ b/source/blender/compositor/operations/COM_CompositorOperation.h
@@ -15,8 +15,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributor: 
- *		Jeroen Bakker 
+ * Contributor:
+ *		Jeroen Bakker
  *		Monique Dewanchand
  */
 
@@ -27,43 +27,37 @@
 #include "BLI_rect.h"
 
 /**
-  * @brief Compositor output operation
-  */
+ * @brief Compositor output operation
+ */
 class CompositorOperation : public NodeOperation {
 private:
 	/**
-	  * @brief local reference to the scene
-	  */
+	 * @brief local reference to the scene
+	 */
 	const Scene *scene;
-	
-	/**
-	  * @brief local reference to the node tree
-	  */
-	const bNodeTree *tree;
-	
+
 	/**
-	  * @brief reference to the output float buffer
-	  */
+	 * @brief reference to the output float buffer
+	 */
 	float *outputBuffer;
-	
+
 	/**
-	  * @brief local reference to the input image operation
-	  */
+	 * @brief local reference to the input image operation
+	 */
 	SocketReader *imageInput;
 
 	/**
-	  * @brief local reference to the input alpha operation
-	  */
+	 * @brief local reference to the input alpha operation
+	 */
 	SocketReader *alphaInput;
 public:
 	CompositorOperation();
-	void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers);
-	void setScene(const Scene *scene) {this->scene = scene;}
-	void setbNodeTree(const bNodeTree *tree) {this->tree = tree;}
-	bool isOutputOperation(bool rendering) const {return true;}
+	void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers);
+	void setScene(const Scene *scene) { this->scene = scene; }
+	bool isOutputOperation(bool rendering) const { return true; }
 	void initExecution();
 	void deinitExecution();
-	const int getRenderPriority() const {return 7;}
+	const CompositorPriority getRenderPriority() const { return COM_PRIORITY_MEDIUM; }
 	void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp b/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
index df12a7d6b49..2e8fc9005b8 100644
--- a/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
+++ b/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
@@ -25,7 +25,7 @@
 extern "C" {
 	#include "IMB_imbuf.h"
 }
-ConvertColorProfileOperation::ConvertColorProfileOperation(): NodeOperation()
+ConvertColorProfileOperation::ConvertColorProfileOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addOutputSocket(COM_DT_COLOR);
diff --git a/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h b/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
index 1868de6d815..b11a06f7749 100644
--- a/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
+++ b/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
@@ -26,53 +26,53 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ConvertColorProfileOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputOperation;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputOperation;
 	
 	/**
-	  * @brief color profile where to convert from
-	  */
+	 * @brief color profile where to convert from
+	 */
 	int fromProfile;
 	
 	/**
-	  * @brief color profile where to convert to
-	  */
+	 * @brief color profile where to convert to
+	 */
 	int toProfile;
 	
 	/**
-	  * @brief is color predivided
-	  */
+	 * @brief is color predivided
+	 */
 	bool predivided;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ConvertColorProfileOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
-	void setFromColorProfile(int colorProfile) {this->fromProfile = colorProfile;}
-	void setToColorProfile(int colorProfile) {this->toProfile = colorProfile;}
-	void setPredivided(bool predivided) {this->predivided = predivided;}
+	void setFromColorProfile(int colorProfile) { this->fromProfile = colorProfile; }
+	void setToColorProfile(int colorProfile) { this->toProfile = colorProfile; }
+	void setPredivided(bool predivided) { this->predivided = predivided; }
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp b/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
index f4be7d2e65b..c66cb8df9be 100644
--- a/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
+++ b/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_ConvertColorToBWOperation.h"
 
-ConvertColorToBWOperation::ConvertColorToBWOperation(): NodeOperation()
+ConvertColorToBWOperation::ConvertColorToBWOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addOutputSocket(COM_DT_VALUE);
@@ -38,7 +38,7 @@ void ConvertColorToBWOperation::executePixel(float *outputValue, float x, float
 {
 	float inputColor[4];
 	inputOperation->read(&inputColor[0], x, y, sampler, inputBuffers);
-	outputValue[0] = inputColor[0]*0.35f + inputColor[1]*0.45f + inputColor[2]*0.2f;
+	outputValue[0] = inputColor[0] * 0.35f + inputColor[1] * 0.45f + inputColor[2] * 0.2f;
 }
 
 void ConvertColorToBWOperation::deinitExecution()
diff --git a/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h b/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
index 616cf0f2d01..814c0c2e808 100644
--- a/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
+++ b/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
@@ -26,34 +26,34 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ConvertColorToBWOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputOperation;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputOperation;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ConvertColorToBWOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 
 };
diff --git a/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp b/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
index ce45266ace0..613bfe68fbb 100644
--- a/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
+++ b/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_ConvertColorToVectorOperation.h"
 
-ConvertColorToVectorOperation::ConvertColorToVectorOperation(): NodeOperation()
+ConvertColorToVectorOperation::ConvertColorToVectorOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addOutputSocket(COM_DT_VECTOR);
diff --git a/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h b/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
index 11a1bf30a07..1167b565a8e 100644
--- a/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
+++ b/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
@@ -26,34 +26,34 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ConvertColorToVectorOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputOperation;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputOperation;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ConvertColorToVectorOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp b/source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp
index 0d4f2df22d8..2c8caec6f61 100644
--- a/source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp
+++ b/source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_ConvertColourToValueProg.h"
 
-ConvertColourToValueProg::ConvertColourToValueProg(): NodeOperation()
+ConvertColourToValueProg::ConvertColourToValueProg() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addOutputSocket(COM_DT_VALUE);
@@ -38,7 +38,7 @@ void ConvertColourToValueProg::executePixel(float *outputValue, float x, float y
 {
 	float inputColor[4];
 	inputOperation->read(&inputColor[0], x, y, sampler, inputBuffers);
-	outputValue[0] = (inputColor[0] + inputColor[1] + inputColor[2])/3.0f;
+	outputValue[0] = (inputColor[0] + inputColor[1] + inputColor[2]) / 3.0f;
 }
 
 void ConvertColourToValueProg::deinitExecution()
diff --git a/source/blender/compositor/operations/COM_ConvertColourToValueProg.h b/source/blender/compositor/operations/COM_ConvertColourToValueProg.h
index 7aa07dd46f2..9c43ec47604 100644
--- a/source/blender/compositor/operations/COM_ConvertColourToValueProg.h
+++ b/source/blender/compositor/operations/COM_ConvertColourToValueProg.h
@@ -26,34 +26,34 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ConvertColourToValueProg : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputOperation;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputOperation;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ConvertColourToValueProg();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
index f64f0c054b1..1746afea713 100644
--- a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
+++ b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
@@ -24,7 +24,7 @@
 #include "BLI_math.h"
 #include "DNA_camera_types.h"
 
-ConvertDepthToRadiusOperation::ConvertDepthToRadiusOperation(): NodeOperation()
+ConvertDepthToRadiusOperation::ConvertDepthToRadiusOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_VALUE);
 	this->addOutputSocket(COM_DT_VALUE);
@@ -41,7 +41,7 @@ float ConvertDepthToRadiusOperation::determineFocalDistance()
 		return 10.0f;
 	}
 	else {
-		Camera *camera = (Camera*)this->cameraObject->data;
+		Camera *camera = (Camera *)this->cameraObject->data;
 		cam_lens = camera->lens;
 		if (camera->dof_ob) {
 			/* too simple, better to return the distance on the view axis only
@@ -62,12 +62,12 @@ void ConvertDepthToRadiusOperation::initExecution()
 {
 	this->inputOperation = this->getInputSocketReader(0);
 	float focalDistance = determineFocalDistance();
-	if (focalDistance == 0.0f) focalDistance = 1e10f; /* if the dof is 0.0 then set it be be far away */
-	inverseFocalDistance = 1.f/focalDistance;
+	if (focalDistance == 0.0f) focalDistance = 1e10f;  /* if the dof is 0.0 then set it be be far away */
+	inverseFocalDistance = 1.f / focalDistance;
 	this->aspect = (this->getWidth() > this->getHeight()) ? (this->getHeight() / (float)this->getWidth()) : (this->getWidth() / (float)this->getHeight());
-	this->aperture = 0.5f*(this->cam_lens / (this->aspect*32.f)) / this->fStop;
+	this->aperture = 0.5f * (this->cam_lens / (this->aspect * 32.f)) / this->fStop;
 	float minsz = MIN2(getWidth(), getHeight());
-	this->dof_sp = (float)minsz / (16.f / cam_lens);	// <- == aspect * MIN2(img->x, img->y) / tan(0.5f * fov);
+	this->dof_sp = (float)minsz / (16.f / cam_lens);    // <- == aspect * MIN2(img->x, img->y) / tan(0.5f * fov);
 }
 
 void ConvertDepthToRadiusOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -77,16 +77,16 @@ void ConvertDepthToRadiusOperation::executePixel(float *outputValue, float x, fl
 	float radius;
 	inputOperation->read(inputValue, x, y, sampler, inputBuffers);
 	z = inputValue[0];
-	if (z!=0.f) {
-		float iZ = (1.f/z);
+	if (z != 0.f) {
+		float iZ = (1.f / z);
 		
 		// bug #6656 part 2b, do not rescale
-		/*
+#if 0
 		bcrad = 0.5f*fabs(aperture*(dof_sp*(cam_invfdist - iZ) - 1.f));
 		// scale crad back to original maximum and blend
 		crad->rect[px] = bcrad + wts->rect[px]*(scf*crad->rect[px] - bcrad);
-		*/
-		radius = 0.5f*fabsf(this->aperture*(dof_sp*(inverseFocalDistance - iZ) - 1.f));
+#endif
+		radius = 0.5f * fabsf(this->aperture * (dof_sp * (inverseFocalDistance - iZ) - 1.f));
 		// 'bug' #6615, limit minimum radius to 1 pixel, not really a solution, but somewhat mitigates the problem
 		if (radius < 0.5f) radius = 0.5f;
 		if (radius > maxRadius) {
diff --git a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
index c199ea87fe3..c6da6bc94a9 100644
--- a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
+++ b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
@@ -26,15 +26,15 @@
 #include "DNA_object_types.h"
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ConvertDepthToRadiusOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputOperation;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputOperation;
 	float fStop;
 	float aspect;
 	float maxRadius;
@@ -45,28 +45,28 @@ private:
 	Object *cameraObject;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ConvertDepthToRadiusOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
-	void setfStop(float fStop) {this->fStop = fStop;}
-	void setMaxRadius(float maxRadius) {this->maxRadius = maxRadius;}
-	void setCameraObject(Object *camera) {this->cameraObject = camera;}
+	void setfStop(float fStop) { this->fStop = fStop; }
+	void setMaxRadius(float maxRadius) { this->maxRadius = maxRadius; }
+	void setCameraObject(Object *camera) { this->cameraObject = camera; }
 	float determineFocalDistance();
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp b/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
index 97dd7e69092..e8c0061319c 100644
--- a/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
+++ b/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
@@ -23,7 +23,7 @@
 #include "COM_ConvertHSVToRGBOperation.h"
 #include "BLI_math_color.h"
 
-ConvertHSVToRGBOperation::ConvertHSVToRGBOperation(): NodeOperation()
+ConvertHSVToRGBOperation::ConvertHSVToRGBOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addOutputSocket(COM_DT_COLOR);
diff --git a/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h b/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
index 327b4089934..29c82361d12 100644
--- a/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
+++ b/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
@@ -26,34 +26,34 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ConvertHSVToRGBOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputOperation;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputOperation;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ConvertHSVToRGBOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.cpp b/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.cpp
index 547915f58c9..842546a2755 100644
--- a/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.cpp
+++ b/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.cpp
@@ -22,7 +22,7 @@
 #include "COM_ConvertKeyToPremulOperation.h"
 #include "BLI_math.h"
 
-ConvertKeyToPremulOperation::ConvertKeyToPremulOperation(): NodeOperation()
+ConvertKeyToPremulOperation::ConvertKeyToPremulOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addOutputSocket(COM_DT_COLOR);
@@ -43,9 +43,7 @@ void ConvertKeyToPremulOperation::executePixel(float *outputValue, float x, floa
 	this->inputColor->read(inputValue, x, y, sampler, inputBuffers);
 	alpha = inputValue[3];
 
-	outputValue[0] = inputValue[0] * alpha;
-	outputValue[1] = inputValue[1] * alpha;
-	outputValue[2] = inputValue[2] * alpha;
+	mul_v3_v3fl(outputValue, inputValue, alpha);
 
 	/* never touches the alpha */
 	outputValue[3] = alpha;
diff --git a/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h b/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h
index 1d5a1c1c4a6..fe0586f7a88 100644
--- a/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h
+++ b/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h
@@ -25,22 +25,22 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ConvertKeyToPremulOperation : public NodeOperation {
 private:
 	SocketReader *inputColor;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ConvertKeyToPremulOperation();
 
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 	void initExecution();
 	void deinitExecution();
diff --git a/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.cpp b/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.cpp
index 16636ee2afc..3554be53e3f 100644
--- a/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.cpp
+++ b/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.cpp
@@ -22,7 +22,7 @@
 #include "COM_ConvertPremulToKeyOperation.h"
 #include "BLI_math.h"
 
-ConvertPremulToKeyOperation::ConvertPremulToKeyOperation(): NodeOperation()
+ConvertPremulToKeyOperation::ConvertPremulToKeyOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addOutputSocket(COM_DT_COLOR);
@@ -44,14 +44,10 @@ void ConvertPremulToKeyOperation::executePixel(float *outputValue, float x, floa
 	alpha = inputValue[3];
 
 	if (fabsf(alpha) < 1e-5f) {
-		outputValue[0] = 0.f;
-		outputValue[1] = 0.f;
-		outputValue[2] = 0.f;
+		zero_v3(outputValue);
 	}
 	else {
-		outputValue[0] = inputValue[0] / alpha;
-		outputValue[1] = inputValue[1] / alpha;
-		outputValue[2] = inputValue[2] / alpha;
+		mul_v3_v3fl(outputValue, inputValue, 1.0f / alpha);
 	}
 
 	/* never touches the alpha */
diff --git a/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h b/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h
index 17597fa8f15..093f28df3e5 100644
--- a/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h
+++ b/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h
@@ -25,22 +25,22 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ConvertPremulToKeyOperation : public NodeOperation {
 private:
 	SocketReader *inputColor;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ConvertPremulToKeyOperation();
 
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 	void initExecution();
 	void deinitExecution();
diff --git a/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp b/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
index 99054efc267..051d9d2b8f9 100644
--- a/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
+++ b/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
@@ -23,7 +23,7 @@
 #include "COM_ConvertRGBToHSVOperation.h"
 #include "BLI_math_color.h"
 
-ConvertRGBToHSVOperation::ConvertRGBToHSVOperation(): NodeOperation()
+ConvertRGBToHSVOperation::ConvertRGBToHSVOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addOutputSocket(COM_DT_COLOR);
diff --git a/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h b/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
index 5064bd06993..61270539e70 100644
--- a/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
+++ b/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
@@ -26,34 +26,34 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ConvertRGBToHSVOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputOperation;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputOperation;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ConvertRGBToHSVOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 
 };
diff --git a/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp b/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
index c626dc03000..d984a1ab943 100644
--- a/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
+++ b/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
@@ -22,7 +22,7 @@
 #include "COM_ConvertRGBToYCCOperation.h"
 #include "BLI_math_color.h"
 
-ConvertRGBToYCCOperation::ConvertRGBToYCCOperation(): NodeOperation()
+ConvertRGBToYCCOperation::ConvertRGBToYCCOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addOutputSocket(COM_DT_COLOR);
@@ -38,16 +38,16 @@ void ConvertRGBToYCCOperation::setMode(int mode)
 {
 	switch (mode)
 	{
-	case 1:
-		this->mode = BLI_YCC_ITU_BT709;
-		break;
-	case 2:
-		this->mode = BLI_YCC_JFIF_0_255;
-		break;
-	case 0:
-	default:
-		this->mode = BLI_YCC_ITU_BT601;
-		break;
+		case 1:
+			this->mode = BLI_YCC_ITU_BT709;
+			break;
+		case 2:
+			this->mode = BLI_YCC_JFIF_0_255;
+			break;
+		case 0:
+		default:
+			this->mode = BLI_YCC_ITU_BT601;
+			break;
 	}
 }
 
@@ -60,9 +60,8 @@ void ConvertRGBToYCCOperation::executePixel(float *outputValue, float x, float y
 	rgb_to_ycc(inputColor[0], inputColor[1], inputColor[2], &color[0], &color[1], &color[2], this->mode);
 
 	/* divided by 255 to normalize for viewing in */
-	outputValue[0] = color[0]/255.f; /* Y */
-	outputValue[1] = color[1]/255.f; /* Cb*/
-	outputValue[2] = color[2]/255.f; /* Cr*/
+	/* R,G,B --> Y,Cb,Cr */
+	mul_v3_v3fl(outputValue, color, 1.0f / 255.0f);
 	outputValue[3] = inputColor[3];
 }
 
diff --git a/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h b/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
index a952627893b..33075cda509 100644
--- a/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
+++ b/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
@@ -25,44 +25,44 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ConvertRGBToYCCOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputOperation;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputOperation;
 
 	/**
-	  * YCbCr mode (Jpeg, ITU601, ITU709)
-	  */
+	 * YCbCr mode (Jpeg, ITU601, ITU709)
+	 */
 	int mode;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ConvertRGBToYCCOperation();
 
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 
 	/**
-	  * Set the YCC mode
-	  */
+	 * Set the YCC mode
+	 */
 	void setMode(int mode);
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp b/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp
index c4b870d6ad5..e5a8e7de1bb 100644
--- a/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp
+++ b/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp
@@ -22,7 +22,7 @@
 #include "COM_ConvertRGBToYUVOperation.h"
 #include "BLI_math_color.h"
 
-ConvertRGBToYUVOperation::ConvertRGBToYUVOperation(): NodeOperation()
+ConvertRGBToYUVOperation::ConvertRGBToYUVOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addOutputSocket(COM_DT_COLOR);
diff --git a/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h b/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
index 5bc763dde00..4fc525456f8 100644
--- a/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
+++ b/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
@@ -25,34 +25,34 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ConvertRGBToYUVOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputOperation;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputOperation;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ConvertRGBToYUVOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 
 };
diff --git a/source/blender/compositor/operations/COM_ConvertValueToColourProg.cpp b/source/blender/compositor/operations/COM_ConvertValueToColourProg.cpp
index dce554efbac..9d95c51a546 100644
--- a/source/blender/compositor/operations/COM_ConvertValueToColourProg.cpp
+++ b/source/blender/compositor/operations/COM_ConvertValueToColourProg.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_ConvertValueToColourProg.h"
 
-ConvertValueToColourProg::ConvertValueToColourProg(): NodeOperation()
+ConvertValueToColourProg::ConvertValueToColourProg() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_VALUE);
 	this->addOutputSocket(COM_DT_COLOR);
diff --git a/source/blender/compositor/operations/COM_ConvertValueToColourProg.h b/source/blender/compositor/operations/COM_ConvertValueToColourProg.h
index 4956f7196f5..ff1d1aaeae7 100644
--- a/source/blender/compositor/operations/COM_ConvertValueToColourProg.h
+++ b/source/blender/compositor/operations/COM_ConvertValueToColourProg.h
@@ -28,25 +28,25 @@
 class ConvertValueToColourProg : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
+	 * Cached reference to the inputProgram
+	 */
 	SocketReader *inputProgram;
 public:
 	ConvertValueToColourProg();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 
 };
diff --git a/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp b/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
index ba7913d24ee..5ba3f6ef4a9 100644
--- a/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
+++ b/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_ConvertValueToVectorOperation.h"
 
-ConvertValueToVectorOperation::ConvertValueToVectorOperation(): NodeOperation()
+ConvertValueToVectorOperation::ConvertValueToVectorOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_VALUE);
 	this->addOutputSocket(COM_DT_VECTOR);
diff --git a/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h b/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
index 1e6a7d4b3e7..fbb294d6a26 100644
--- a/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
+++ b/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
@@ -26,34 +26,34 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ConvertValueToVectorOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputOperation;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputOperation;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ConvertValueToVectorOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp b/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
index 5a4cc4d3549..f6a2072932c 100644
--- a/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
+++ b/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_ConvertVectorToColorOperation.h"
 
-ConvertVectorToColorOperation::ConvertVectorToColorOperation(): NodeOperation()
+ConvertVectorToColorOperation::ConvertVectorToColorOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_VECTOR);
 	this->addOutputSocket(COM_DT_COLOR);
diff --git a/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h b/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
index 45ffd0675bd..c26adc5a6b1 100644
--- a/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
+++ b/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
@@ -26,34 +26,34 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ConvertVectorToColorOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputOperation;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputOperation;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ConvertVectorToColorOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp b/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
index 67cc42ac8fc..ef2d45eea03 100644
--- a/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
+++ b/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_ConvertVectorToValueOperation.h"
 
-ConvertVectorToValueOperation::ConvertVectorToValueOperation(): NodeOperation()
+ConvertVectorToValueOperation::ConvertVectorToValueOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_VECTOR);
 	this->addOutputSocket(COM_DT_VALUE);
@@ -38,7 +38,7 @@ void ConvertVectorToValueOperation::executePixel(float *outputValue, float x, fl
 {
 	float input[4];
 	inputOperation->read(input, x, y, sampler, inputBuffers);
-	outputValue[0] = (input[0]+input[1]+input[2])/3.0f;
+	outputValue[0] = (input[0] + input[1] + input[2]) / 3.0f;
 }
 
 void ConvertVectorToValueOperation::deinitExecution()
diff --git a/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h b/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
index 59bae18ed26..dd29d1bb9a9 100644
--- a/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
+++ b/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
@@ -26,34 +26,34 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ConvertVectorToValueOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputOperation;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputOperation;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ConvertVectorToValueOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp b/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
index d3048c131e4..373de25a276 100644
--- a/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
+++ b/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
@@ -22,7 +22,7 @@
 #include "COM_ConvertYCCToRGBOperation.h"
 #include "BLI_math_color.h"
 
-ConvertYCCToRGBOperation::ConvertYCCToRGBOperation(): NodeOperation()
+ConvertYCCToRGBOperation::ConvertYCCToRGBOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addOutputSocket(COM_DT_COLOR);
@@ -38,16 +38,16 @@ void ConvertYCCToRGBOperation::setMode(int mode)
 {
 	switch (mode)
 	{
-	case 1:
-		this->mode = BLI_YCC_ITU_BT709;
-		break;
-	case 2:
-		this->mode = BLI_YCC_JFIF_0_255;
-		break;
-	case 0:
-	default:
-		this->mode = BLI_YCC_ITU_BT601;
-		break;
+		case 1:
+			this->mode = BLI_YCC_ITU_BT709;
+			break;
+		case 2:
+			this->mode = BLI_YCC_JFIF_0_255;
+			break;
+		case 0:
+		default:
+			this->mode = BLI_YCC_ITU_BT601;
+			break;
 	}
 }
 
@@ -57,9 +57,8 @@ void ConvertYCCToRGBOperation::executePixel(float *outputValue, float x, float y
 	inputOperation->read(inputColor, x, y, sampler, inputBuffers);
 
 	/* need to un-normalize the data */
-	inputColor[0] *= 255.f; /* Y */
-	inputColor[1] *= 255.f; /* Cb*/
-	inputColor[2] *= 255.f; /* Cr*/
+	/* R,G,B --> Y,Cb,Cr */
+	mul_v3_fl(inputColor, 255.0f);
 
 	ycc_to_rgb(inputColor[0], inputColor[1], inputColor[2], &outputValue[0], &outputValue[1], &outputValue[2], this->mode);
 	outputValue[3] = inputColor[3];
diff --git a/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h b/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
index a13c2826a79..d7ddd910ed7 100644
--- a/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
+++ b/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
@@ -25,44 +25,44 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ConvertYCCToRGBOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputOperation;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputOperation;
 
 	/**
-	  * YCbCr mode (Jpeg, ITU601, ITU709)
-	  */
+	 * YCbCr mode (Jpeg, ITU601, ITU709)
+	 */
 	int mode;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ConvertYCCToRGBOperation();
 
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 
 	/**
-	  * Set the YCC mode
-	  */
+	 * Set the YCC mode
+	 */
 	void setMode(int mode);
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp b/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp
index d7037a2c2d1..a77806d16d0 100644
--- a/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp
+++ b/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp
@@ -22,7 +22,7 @@
 #include "COM_ConvertYUVToRGBOperation.h"
 #include "BLI_math_color.h"
 
-ConvertYUVToRGBOperation::ConvertYUVToRGBOperation(): NodeOperation()
+ConvertYUVToRGBOperation::ConvertYUVToRGBOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addOutputSocket(COM_DT_COLOR);
diff --git a/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h b/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
index 380510d0100..f77954606cf 100644
--- a/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
+++ b/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
@@ -25,34 +25,34 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ConvertYUVToRGBOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputOperation;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputOperation;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ConvertYUVToRGBOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
index 0daa2b9c08a..5ac8c2254dc 100644
--- a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
+++ b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
@@ -25,20 +25,28 @@
 
 ConvolutionEdgeFilterOperation::ConvolutionEdgeFilterOperation() : ConvolutionFilterOperation()
 {
-}
-inline void addFilter(float *result, float*input, float value)
-{
-	result[0] += input[0] * value;
-	result[1] += input[1] * value;
-	result[2] += input[2] * value;
+	/* pass */
 }
 
-void ConvolutionEdgeFilterOperation::executePixel(float *color,int x, int y, MemoryBuffer *inputBuffers[], void *data)
+void ConvolutionEdgeFilterOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
 {
-	float in1[4],in2[4], res1[4], res2[4];
+	float in1[4], in2[4], res1[4], res2[4];
+
+	int x1 = x - 1;
+	int x2 = x;
+	int x3 = x + 1;
+	int y1 = y - 1;
+	int y2 = y;
+	int y3 = y + 1;
+	CLAMP(x1, 0, getWidth() - 1);
+	CLAMP(x2, 0, getWidth() - 1);
+	CLAMP(x3, 0, getWidth() - 1);
+	CLAMP(y1, 0, getHeight() - 1);
+	CLAMP(y2, 0, getHeight() - 1);
+	CLAMP(y3, 0, getHeight() - 1);
 	
 	float value[4];
-	this->inputValueOperation->read(value, x, y, inputBuffers, NULL);
+	this->inputValueOperation->read(value, x2, y2, inputBuffers, NULL);
 	float mval = 1.0f - value[0];
 	
 	res1[0] = 0.0f;
@@ -50,49 +58,49 @@ void ConvolutionEdgeFilterOperation::executePixel(float *color,int x, int y, Mem
 	res2[2] = 0.0f;
 	res2[3] = 0.0f;
 	
-	this->inputOperation->read(in1, x-1, y-1, inputBuffers, NULL);
-	addFilter(res1, in1, this->filter[0]);
-	addFilter(res2, in1, this->filter[0]);
+	this->inputOperation->read(in1, x1, y1, inputBuffers, NULL);
+	madd_v3_v3fl(res1, in1, this->filter[0]);
+	madd_v3_v3fl(res2, in1, this->filter[0]);
 	
-	this->inputOperation->read(in1, x, y-1, inputBuffers, NULL);
-	addFilter(res1, in1, this->filter[1]);
-	addFilter(res2, in1, this->filter[3]);
+	this->inputOperation->read(in1, x2, y1, inputBuffers, NULL);
+	madd_v3_v3fl(res1, in1, this->filter[1]);
+	madd_v3_v3fl(res2, in1, this->filter[3]);
 	
-	this->inputOperation->read(in1, x+1, y-1, inputBuffers, NULL);
-	addFilter(res1, in1, this->filter[2]);
-	addFilter(res2, in1, this->filter[6]);
+	this->inputOperation->read(in1, x3, y1, inputBuffers, NULL);
+	madd_v3_v3fl(res1, in1, this->filter[2]);
+	madd_v3_v3fl(res2, in1, this->filter[6]);
 	
-	this->inputOperation->read(in1, x-1, y, inputBuffers, NULL);
-	addFilter(res1, in1, this->filter[3]);
-	addFilter(res2, in1, this->filter[1]);
+	this->inputOperation->read(in1, x1, y2, inputBuffers, NULL);
+	madd_v3_v3fl(res1, in1, this->filter[3]);
+	madd_v3_v3fl(res2, in1, this->filter[1]);
 	
-	this->inputOperation->read(in2, x, y, inputBuffers, NULL);
-	addFilter(res1, in2, this->filter[4]);
-	addFilter(res2, in2, this->filter[4]);
+	this->inputOperation->read(in2, x2, y2, inputBuffers, NULL);
+	madd_v3_v3fl(res1, in2, this->filter[4]);
+	madd_v3_v3fl(res2, in2, this->filter[4]);
 	
-	this->inputOperation->read(in1, x+1, y, inputBuffers, NULL);
-	addFilter(res1, in1, this->filter[5]);
-	addFilter(res2, in1, this->filter[7]);
+	this->inputOperation->read(in1, x3, y2, inputBuffers, NULL);
+	madd_v3_v3fl(res1, in1, this->filter[5]);
+	madd_v3_v3fl(res2, in1, this->filter[7]);
 	
-	this->inputOperation->read(in1, x-1, y+1, inputBuffers, NULL);
-	addFilter(res1, in1, this->filter[6]);
-	addFilter(res2, in1, this->filter[2]);
+	this->inputOperation->read(in1, x1, y3, inputBuffers, NULL);
+	madd_v3_v3fl(res1, in1, this->filter[6]);
+	madd_v3_v3fl(res2, in1, this->filter[2]);
 	
-	this->inputOperation->read(in1, x, y+1, inputBuffers, NULL);
-	addFilter(res1, in1, this->filter[7]);
-	addFilter(res2, in1, this->filter[5]);
+	this->inputOperation->read(in1, x2, y3, inputBuffers, NULL);
+	madd_v3_v3fl(res1, in1, this->filter[7]);
+	madd_v3_v3fl(res2, in1, this->filter[5]);
 	
-	this->inputOperation->read(in1, x+1, y+1, inputBuffers, NULL);
-	addFilter(res1, in1, this->filter[8]);
-	addFilter(res2, in1, this->filter[8]);
+	this->inputOperation->read(in1, x3, y3, inputBuffers, NULL);
+	madd_v3_v3fl(res1, in1, this->filter[8]);
+	madd_v3_v3fl(res2, in1, this->filter[8]);
 	
-	color[0] = sqrt(res1[0]*res1[0]+res2[0]*res2[0]);
-	color[1] = sqrt(res1[1]*res1[1]+res2[1]*res2[1]);
-	color[2] = sqrt(res1[2]*res1[2]+res2[2]*res2[2]);
+	color[0] = sqrt(res1[0] * res1[0] + res2[0] * res2[0]);
+	color[1] = sqrt(res1[1] * res1[1] + res2[1] * res2[1]);
+	color[2] = sqrt(res1[2] * res1[2] + res2[2] * res2[2]);
 	
-	color[0] = color[0]*value[0] + in2[0] * mval;
-	color[1] = color[1]*value[0] + in2[1] * mval;
-	color[2] = color[2]*value[0] + in2[2] * mval;
+	color[0] = color[0] * value[0] + in2[0] * mval;
+	color[1] = color[1] * value[0] + in2[1] * mval;
+	color[2] = color[2] * value[0] + in2[2] * mval;
 	
 	color[3] = in2[3];
 }
diff --git a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h
index a0f9c1b3452..92e45c7104f 100644
--- a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h
+++ b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h
@@ -25,10 +25,10 @@
 
 #include "COM_ConvolutionFilterOperation.h"
 
-class ConvolutionEdgeFilterOperation: public ConvolutionFilterOperation {
+class ConvolutionEdgeFilterOperation : public ConvolutionFilterOperation {
 public:
 	ConvolutionEdgeFilterOperation();
-	void executePixel(float *color,int x, int y, MemoryBuffer *inputBuffers[], void *data);
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
 };
 
 #endif
diff --git a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
index 05cd570feaa..b4f2714360e 100644
--- a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
+++ b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
@@ -22,6 +22,8 @@
 
 #include "COM_ConvolutionFilterOperation.h"
 
+#include "BLI_utildefines.h"
+
 ConvolutionFilterOperation::ConvolutionFilterOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
@@ -59,80 +61,63 @@ void ConvolutionFilterOperation::deinitExecution()
 	this->inputOperation = NULL;
 	this->inputValueOperation = NULL;
 	if (this->filter) {
-		delete this->filter;
+		delete[] this->filter;
 		this->filter = NULL;
 	}
 }
 
 
-void ConvolutionFilterOperation::executePixel(float *color,int x, int y, MemoryBuffer *inputBuffers[], void *data)
+void ConvolutionFilterOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
 {
-	color[0] = 0.0;
-	color[1] = 0.0;
-	color[2] = 0.0;
-	color[3] = 0.0;
 	float in1[4];
 	float in2[4];
+	int x1 = x - 1;
+	int x2 = x;
+	int x3 = x + 1;
+	int y1 = y - 1;
+	int y2 = y;
+	int y3 = y + 1;
+	CLAMP(x1, 0, getWidth() - 1);
+	CLAMP(x2, 0, getWidth() - 1);
+	CLAMP(x3, 0, getWidth() - 1);
+	CLAMP(y1, 0, getHeight() - 1);
+	CLAMP(y2, 0, getHeight() - 1);
+	CLAMP(y3, 0, getHeight() - 1);
 	float value[4];
-	this->inputValueOperation->read(value, x, y, inputBuffers, NULL);
-	float mval = 1.0f - value[0];
-	
-	this->inputOperation->read(in1, x-1, y-1, inputBuffers, NULL);
-	color[0] += in1[0] * this->filter[0];
-	color[1] += in1[1] * this->filter[0];
-	color[2] += in1[2] * this->filter[0];
-	color[3] += in1[3] * this->filter[0];
-	this->inputOperation->read(in1, x, y-1, inputBuffers, NULL);
-	color[0] += in1[0] * this->filter[1];
-	color[1] += in1[1] * this->filter[1];
-	color[2] += in1[2] * this->filter[1];
-	color[3] += in1[3] * this->filter[1];
-	this->inputOperation->read(in1, x+1, y-1, inputBuffers, NULL);
-	color[0] += in1[0] * this->filter[2];
-	color[1] += in1[1] * this->filter[2];
-	color[2] += in1[2] * this->filter[2];
-	color[3] += in1[3] * this->filter[2];
-	this->inputOperation->read(in1, x-1, y, inputBuffers, NULL);
-	color[0] += in1[0] * this->filter[3];
-	color[1] += in1[1] * this->filter[3];
-	color[2] += in1[2] * this->filter[3];
-	color[3] += in1[3] * this->filter[3];
-	this->inputOperation->read(in2, x, y, inputBuffers, NULL);
-	color[0] += in2[0] * this->filter[4];
-	color[1] += in2[1] * this->filter[4];
-	color[2] += in2[2] * this->filter[4];
-	color[3] += in2[3] * this->filter[4];
-	this->inputOperation->read(in1, x+1, y, inputBuffers, NULL);
-	color[0] += in1[0] * this->filter[5];
-	color[1] += in1[1] * this->filter[5];
-	color[2] += in1[2] * this->filter[5];
-	color[3] += in1[3] * this->filter[5];
-	this->inputOperation->read(in1, x-1, y+1, inputBuffers, NULL);
-	color[0] += in1[0] * this->filter[6];
-	color[1] += in1[1] * this->filter[6];
-	color[2] += in1[2] * this->filter[6];
-	color[3] += in1[3] * this->filter[6];
-	this->inputOperation->read(in1, x, y+1, inputBuffers, NULL);
-	color[0] += in1[0] * this->filter[7];
-	color[1] += in1[1] * this->filter[7];
-	color[2] += in1[2] * this->filter[7];
-	color[3] += in1[3] * this->filter[7];
-	this->inputOperation->read(in1, x+1, y+1, inputBuffers, NULL);
-	color[0] += in1[0] * this->filter[8];
-	color[1] += in1[1] * this->filter[8];
-	color[2] += in1[2] * this->filter[8];
-	color[3] += in1[3] * this->filter[8];
+	this->inputValueOperation->read(value, x2, y2, inputBuffers, NULL);
+	const float mval = 1.0f - value[0];
+
+	zero_v4(color);
+	this->inputOperation->read(in1, x1, y1, inputBuffers, NULL);
+	madd_v4_v4fl(color, in1, this->filter[0]);
+	this->inputOperation->read(in1, x2, y1, inputBuffers, NULL);
+	madd_v4_v4fl(color, in1, this->filter[1]);
+	this->inputOperation->read(in1, x3, y1, inputBuffers, NULL);
+	madd_v4_v4fl(color, in1, this->filter[2]);
+	this->inputOperation->read(in1, x1, y2, inputBuffers, NULL);
+	madd_v4_v4fl(color, in1, this->filter[3]);
+	this->inputOperation->read(in2, x2, y2, inputBuffers, NULL);
+	madd_v4_v4fl(color, in2, this->filter[4]);
+	this->inputOperation->read(in1, x3, y2, inputBuffers, NULL);
+	madd_v4_v4fl(color, in1, this->filter[5]);
+	this->inputOperation->read(in1, x1, y3, inputBuffers, NULL);
+	madd_v4_v4fl(color, in1, this->filter[6]);
+	this->inputOperation->read(in1, x2, y3, inputBuffers, NULL);
+	madd_v4_v4fl(color, in1, this->filter[7]);
+	this->inputOperation->read(in1, x3, y3, inputBuffers, NULL);
+	madd_v4_v4fl(color, in1, this->filter[8]);
 	
-	color[0] = color[0]*value[0] + in2[0] * mval;
-	color[1] = color[1]*value[0] + in2[1] * mval;
-	color[2] = color[2]*value[0] + in2[2] * mval;
+	color[0] = color[0] * value[0] + in2[0] * mval;
+	color[1] = color[1] * value[0] + in2[1] * mval;
+	color[2] = color[2] * value[0] + in2[2] * mval;
+	color[3] = color[3] * value[0] + in2[3] * mval;
 }
 
 bool ConvolutionFilterOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
 {
 	rcti newInput;
-	int addx = (this->filterWidth-1)/2+1;
-	int addy = (this->filterHeight-1)/2+1;
+	int addx = (this->filterWidth - 1) / 2 + 1;
+	int addy = (this->filterHeight - 1) / 2 + 1;
 	newInput.xmax = input->xmax + addx;
 	newInput.xmin = input->xmin - addx;
 	newInput.ymax = input->ymax + addy;
diff --git a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
index 3276038726b..f3347eb583a 100644
--- a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
+++ b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
@@ -25,7 +25,7 @@
 
 #include "COM_NodeOperation.h"
 
-class ConvolutionFilterOperation: public NodeOperation {
+class ConvolutionFilterOperation : public NodeOperation {
 private:
 	int filterWidth;
 	int filterHeight;
@@ -39,7 +39,7 @@ public:
 	ConvolutionFilterOperation();
 	void set3x3Filter(float f1, float f2, float f3, float f4, float f5, float f6, float f7, float f8, float f9);
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
-	void executePixel(float *color,int x, int y, MemoryBuffer *inputBuffers[], void *data);
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
 	
 	void initExecution();
 	void deinitExecution();
diff --git a/source/blender/compositor/operations/COM_CropOperation.cpp b/source/blender/compositor/operations/COM_CropOperation.cpp
index 192ad8d0bda..0bdd2cfcb51 100644
--- a/source/blender/compositor/operations/COM_CropOperation.cpp
+++ b/source/blender/compositor/operations/COM_CropOperation.cpp
@@ -23,7 +23,7 @@
 #include "COM_CropOperation.h"
 #include "BLI_math.h"
 
-CropBaseOperation::CropBaseOperation() :NodeOperation()
+CropBaseOperation::CropBaseOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR, COM_SC_NO_RESIZE);
 	this->addOutputSocket(COM_DT_COLOR);
@@ -33,7 +33,7 @@ CropBaseOperation::CropBaseOperation() :NodeOperation()
 
 void CropBaseOperation::updateArea()
 {
-	SocketReader * inputReference = this->getInputSocketReader(0);
+	SocketReader *inputReference = this->getInputSocketReader(0);
 	float width = inputReference->getWidth();
 	float height = inputReference->getHeight();
 	if (this->relative) {
@@ -68,8 +68,9 @@ void CropBaseOperation::deinitExecution()
 	this->inputOperation = NULL;
 }
 
-CropOperation::CropOperation() :CropBaseOperation()
+CropOperation::CropOperation() : CropBaseOperation()
 {
+	/* pass */
 }
 
 void CropOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -85,8 +86,9 @@ void CropOperation::executePixel(float *color, float x, float y, PixelSampler sa
 	}
 }
 
-CropImageOperation::CropImageOperation() :CropBaseOperation()
+CropImageOperation::CropImageOperation() : CropBaseOperation()
 {
+	/* pass */
 }
 
 bool CropImageOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
diff --git a/source/blender/compositor/operations/COM_CropOperation.h b/source/blender/compositor/operations/COM_CropOperation.h
index e8edabf08ed..48e5ab7f75b 100644
--- a/source/blender/compositor/operations/COM_CropOperation.h
+++ b/source/blender/compositor/operations/COM_CropOperation.h
@@ -25,7 +25,7 @@
 
 #include "COM_NodeOperation.h"
 
-class CropBaseOperation: public NodeOperation {
+class CropBaseOperation : public NodeOperation {
 protected:
 	SocketReader *inputOperation;
 	NodeTwoXYs *settings;
@@ -40,24 +40,24 @@ public:
 	CropBaseOperation();	
 	void initExecution();
 	void deinitExecution();
-	void setCropSettings(NodeTwoXYs *settings) {this->settings = settings;}
-	void setRelative(bool rel) {this->relative = rel;}
+	void setCropSettings(NodeTwoXYs *settings) { this->settings = settings; }
+	void setRelative(bool rel) { this->relative = rel; }
 };
 
-class CropOperation: public CropBaseOperation {
+class CropOperation : public CropBaseOperation {
 private:
 public:
 	CropOperation();
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
 
-class CropImageOperation: public CropBaseOperation {
+class CropImageOperation : public CropBaseOperation {
 private:
 public:
 	CropImageOperation();
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
 	void determineResolution(unsigned int resolution[], unsigned int preferedResolution[]);
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_CurveBaseOperation.cpp b/source/blender/compositor/operations/COM_CurveBaseOperation.cpp
index fda5b00e2a0..6aa8bc2a0df 100644
--- a/source/blender/compositor/operations/COM_CurveBaseOperation.cpp
+++ b/source/blender/compositor/operations/COM_CurveBaseOperation.cpp
@@ -30,7 +30,7 @@ extern "C" {
 }
 #endif
 
-CurveBaseOperation::CurveBaseOperation(): NodeOperation()
+CurveBaseOperation::CurveBaseOperation() : NodeOperation()
 {
 	this->curveMapping = NULL;
 }
diff --git a/source/blender/compositor/operations/COM_CurveBaseOperation.h b/source/blender/compositor/operations/COM_CurveBaseOperation.h
index 366af5b07cb..9cddb3be46b 100644
--- a/source/blender/compositor/operations/COM_CurveBaseOperation.h
+++ b/source/blender/compositor/operations/COM_CurveBaseOperation.h
@@ -28,8 +28,8 @@
 class CurveBaseOperation : public NodeOperation {
 protected:
 	/**
-	  * Cached reference to the inputProgram
-	  */
+	 * Cached reference to the inputProgram
+	 */
 	CurveMapping *curveMapping;
 public:
 	CurveBaseOperation();
@@ -39,6 +39,6 @@ public:
 	 */
 	void initExecution();
 	
-	void setCurveMapping(CurveMapping *mapping) {this->curveMapping = mapping;}
+	void setCurveMapping(CurveMapping *mapping) { this->curveMapping = mapping; }
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp b/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
index 628daa7c775..c27e699f627 100644
--- a/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
+++ b/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
@@ -23,7 +23,7 @@
 #include "COM_DifferenceMatteOperation.h"
 #include "BLI_math.h"
 
-DifferenceMatteOperation::DifferenceMatteOperation(): NodeOperation()
+DifferenceMatteOperation::DifferenceMatteOperation() : NodeOperation()
 {
 	addInputSocket(COM_DT_COLOR);
 	addInputSocket(COM_DT_COLOR);
@@ -49,35 +49,35 @@ void DifferenceMatteOperation::executePixel(float *outputValue, float x, float y
 	float inColor1[4];
 	float inColor2[4];
 
-	const float tolerence=this->settings->t1;
-	const float falloff=this->settings->t2;
+	const float tolerence = this->settings->t1;
+	const float falloff = this->settings->t2;
 	float difference;
 	float alpha;
 
 	this->inputImage1Program->read(inColor1, x, y, sampler, inputBuffers);
 	this->inputImage2Program->read(inColor2, x, y, sampler, inputBuffers);
 
-	difference = (fabs(inColor2[0] - inColor1[0]) +
-	              fabs(inColor2[1] - inColor1[1]) +
-	              fabs(inColor2[2] - inColor1[2]));
+	difference = (fabsf(inColor2[0] - inColor1[0]) +
+	              fabsf(inColor2[1] - inColor1[1]) +
+	              fabsf(inColor2[2] - inColor1[2]));
 
-	/*average together the distances*/
-	difference=difference/3.0;
+	/* average together the distances */
+	difference = difference / 3.0f;
 
 	/*make 100% transparent*/
 	if (difference < tolerence) {
-		outputValue[0]=0.0;
+		outputValue[0] = 0.0f;
 	}
 	/*in the falloff region, make partially transparent */
-	else if (difference < falloff+tolerence) {
-		difference=difference-tolerence;
-		alpha=difference/falloff;
+	else if (difference < falloff + tolerence) {
+		difference = difference - tolerence;
+		alpha = difference / falloff;
 		/*only change if more transparent than before */
 		if (alpha < inColor1[3]) {
-			outputValue[0]=alpha;
+			outputValue[0] = alpha;
 		}
 		else { /* leave as before */
-			outputValue[0]=inColor1[3];
+			outputValue[0] = inColor1[3];
 		}
 	}
 	else {
diff --git a/source/blender/compositor/operations/COM_DifferenceMatteOperation.h b/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
index 95ebed6f63d..3bdc3384556 100644
--- a/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
+++ b/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
@@ -26,28 +26,28 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class DifferenceMatteOperation : public NodeOperation {
 private:
 	NodeChroma *settings;
-	SocketReader * inputImage1Program;
+	SocketReader *inputImage1Program;
 	SocketReader *inputImage2Program;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	DifferenceMatteOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	void initExecution();
 	void deinitExecution();
 	
-	void setSettings(NodeChroma *nodeChroma) {this->settings = nodeChroma;}
+	void setSettings(NodeChroma *nodeChroma) { this->settings = nodeChroma; }
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_DilateErodeOperation.cpp b/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
index a73f76030ab..306a2d96985 100644
--- a/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
+++ b/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
@@ -23,7 +23,8 @@
 #include "COM_DilateErodeOperation.h"
 #include "BLI_math.h"
 
-DilateErodeDistanceOperation::DilateErodeDistanceOperation(): NodeOperation()
+// DilateErode Distance Threshold
+DilateErodeThresholdOperation::DilateErodeThresholdOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_VALUE);
 	this->addOutputSocket(COM_DT_VALUE);
@@ -33,15 +34,15 @@ DilateErodeDistanceOperation::DilateErodeDistanceOperation(): NodeOperation()
 	this->_switch = 0.5f;
 	this->distance = 0.0f;
 }
-void DilateErodeDistanceOperation::initExecution()
+void DilateErodeThresholdOperation::initExecution()
 {
 	this->inputProgram = this->getInputSocketReader(0);
 	if (this->distance < 0.0f) {
-		this->scope = - this->distance + this->inset;
+		this->scope = -this->distance + this->inset;
 	}
 	else {
-		if (this->inset*2 > this->distance) {
-			this->scope = max(this->inset*2 - this->distance, this->distance);
+		if (this->inset * 2 > this->distance) {
+			this->scope = max(this->inset * 2 - this->distance, this->distance);
 		}
 		else {
 			this->scope = distance;
@@ -52,13 +53,13 @@ void DilateErodeDistanceOperation::initExecution()
 	}
 }
 
-void *DilateErodeDistanceOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
+void *DilateErodeThresholdOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
 {
 	void *buffer = inputProgram->initializeTileData(NULL, memoryBuffers);
 	return buffer;
 }
 
-void DilateErodeDistanceOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
+void DilateErodeThresholdOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
 {
 	float inputValue[4];
 	const float sw = this->_switch;
@@ -66,45 +67,45 @@ void DilateErodeDistanceOperation::executePixel(float *color, int x, int y, Memo
 	float pixelvalue;
 	const float rd = scope * scope;
 	const float inset = this->inset;
-	float mindist = rd*2;
+	float mindist = rd * 2;
 
-	MemoryBuffer *inputBuffer = (MemoryBuffer*)data;
+	MemoryBuffer *inputBuffer = (MemoryBuffer *)data;
 	float *buffer = inputBuffer->getBuffer();
 	rcti *rect = inputBuffer->getRect();
 	const int minx = max(x - scope, rect->xmin);
 	const int miny = max(y - scope, rect->ymin);
 	const int maxx = min(x + scope, rect->xmax);
 	const int maxy = min(y + scope, rect->ymax);
-	const int bufferWidth = rect->xmax-rect->xmin;
+	const int bufferWidth = rect->xmax - rect->xmin;
 	int offset;
 
 	this->inputProgram->read(inputValue, x, y, inputBuffers, NULL);
-	if (inputValue[0]>sw) {
-		for (int yi = miny ; yi<maxy;yi++) {
-			offset = ((yi-rect->ymin)*bufferWidth+(minx-rect->xmin))*4;
-			for (int xi = minx ; xi<maxx;xi++) {
-				if (buffer[offset]<sw) {
-					const float dx = xi-x;
-					const float dy = yi-y;
-					const float dis = dx*dx+dy*dy;
+	if (inputValue[0] > sw) {
+		for (int yi = miny; yi < maxy; yi++) {
+			const float dy = yi - y;
+			offset = ((yi - rect->ymin) * bufferWidth + (minx - rect->xmin)) * 4;
+			for (int xi = minx; xi < maxx; xi++) {
+				if (buffer[offset] < sw) {
+					const float dx = xi - x;
+					const float dis = dx * dx + dy * dy;
 					mindist = min(mindist, dis);
 				}
-				offset +=4;
+				offset += 4;
 			}
 		}
 		pixelvalue = -sqrtf(mindist);
 	}
 	else {
-		for (int yi = miny ; yi<maxy;yi++) {
-			offset = ((yi-rect->ymin)*bufferWidth+(minx-rect->xmin))*4;
-			for (int xi = minx ; xi<maxx;xi++) {
-				if (buffer[offset]>sw) {
-					const float dx = xi-x;
-					const float dy = yi-y;
-					const float dis = dx*dx+dy*dy;
+		for (int yi = miny; yi < maxy; yi++) {
+			const float dy = yi - y;
+			offset = ((yi - rect->ymin) * bufferWidth + (minx - rect->xmin)) * 4;
+			for (int xi = minx; xi < maxx; xi++) {
+				if (buffer[offset] > sw) {
+					const float dx = xi - x;
+					const float dis = dx * dx + dy * dy;
 					mindist = min(mindist, dis);
 				}
-				offset +=4;
+				offset += 4;
 
 			}
 		}
@@ -118,7 +119,7 @@ void DilateErodeDistanceOperation::executePixel(float *color, int x, int y, Memo
 				color[0] = 1.0f;
 			}
 			else {
-				color[0] = delta/inset;
+				color[0] = delta / inset;
 			}
 		}
 		else {
@@ -126,13 +127,13 @@ void DilateErodeDistanceOperation::executePixel(float *color, int x, int y, Memo
 		}
 	}
 	else {
-		const float delta = -distance+pixelvalue;
+		const float delta = -distance + pixelvalue;
 		if (delta < 0.0f) {
 			if (delta < -inset) {
 				color[0] = 1.0f;
 			}
 			else {
-				color[0] = (-delta)/inset;
+				color[0] = (-delta) / inset;
 			}
 		}
 		else {
@@ -141,12 +142,12 @@ void DilateErodeDistanceOperation::executePixel(float *color, int x, int y, Memo
 	}
 }
 
-void DilateErodeDistanceOperation::deinitExecution()
+void DilateErodeThresholdOperation::deinitExecution()
 {
 	this->inputProgram = NULL;
 }
 
-bool DilateErodeDistanceOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
+bool DilateErodeThresholdOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
 {
 	rcti newInput;
 
@@ -158,8 +159,162 @@ bool DilateErodeDistanceOperation::determineDependingAreaOfInterest(rcti *input,
 	return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
 }
 
+// Dilate Distance
+DilateDistanceOperation::DilateDistanceOperation() : NodeOperation()
+{
+	this->addInputSocket(COM_DT_VALUE);
+	this->addOutputSocket(COM_DT_VALUE);
+	this->setComplex(true);
+	this->inputProgram = NULL;
+	this->distance = 0.0f;
+	this->setOpenCL(true);
+}
+void DilateDistanceOperation::initExecution()
+{
+	this->inputProgram = this->getInputSocketReader(0);
+	this->scope = distance;
+	if (scope < 3) {
+		scope = 3;
+	}
+}
+
+void *DilateDistanceOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
+{
+	void *buffer = inputProgram->initializeTileData(NULL, memoryBuffers);
+	return buffer;
+}
+
+void DilateDistanceOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
+{
+	const float distance = this->distance;
+	const float mindist = distance * distance;
+
+	MemoryBuffer *inputBuffer = (MemoryBuffer *)data;
+	float *buffer = inputBuffer->getBuffer();
+	rcti *rect = inputBuffer->getRect();
+	const int minx = max(x - scope, rect->xmin);
+	const int miny = max(y - scope, rect->ymin);
+	const int maxx = min(x + scope, rect->xmax);
+	const int maxy = min(y + scope, rect->ymax);
+	const int bufferWidth = rect->xmax - rect->xmin;
+	int offset;
+	
+	float value = 0.0f;
+
+	for (int yi = miny; yi < maxy; yi++) {
+		const float dy = yi - y;
+		offset = ((yi - rect->ymin) * bufferWidth + (minx - rect->xmin)) * 4;
+		for (int xi = minx; xi < maxx; xi++) {
+			const float dx = xi - x;
+			const float dis = dx * dx + dy * dy;
+			if (dis <= mindist) {
+				value = max(buffer[offset], value);
+			}
+			offset += 4;
+		}
+	}
+	color[0] = value;
+}
+
+void DilateDistanceOperation::deinitExecution()
+{
+	this->inputProgram = NULL;
+}
+
+bool DilateDistanceOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
+{
+	rcti newInput;
+
+	newInput.xmax = input->xmax + scope;
+	newInput.xmin = input->xmin - scope;
+	newInput.ymax = input->ymax + scope;
+	newInput.ymin = input->ymin - scope;
+
+	return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
+}
+
+static cl_kernel dilateKernel = 0;
+void DilateDistanceOperation::executeOpenCL(cl_context context, cl_program program, cl_command_queue queue, 
+                                            MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer,
+                                            MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp,
+                                            list<cl_kernel> *clKernelsToCleanUp)
+{
+	if (!dilateKernel) {
+		dilateKernel = COM_clCreateKernel(program, "dilateKernel", NULL);
+	}
+	cl_int distanceSquared = this->distance * this->distance;
+	cl_int scope = this->scope;
+	
+	COM_clAttachMemoryBufferToKernelParameter(context, dilateKernel, 0,  2, clMemToCleanUp, inputMemoryBuffers, this->inputProgram);
+	COM_clAttachOutputMemoryBufferToKernelParameter(dilateKernel, 1, clOutputBuffer);
+	COM_clAttachMemoryBufferOffsetToKernelParameter(dilateKernel, 3, outputMemoryBuffer);
+	clSetKernelArg(dilateKernel, 4, sizeof(cl_int), &scope);
+	clSetKernelArg(dilateKernel, 5, sizeof(cl_int), &distanceSquared);
+	COM_clAttachSizeToKernelParameter(dilateKernel, 6);
+	COM_clEnqueueRange(queue, dilateKernel, outputMemoryBuffer, 7);
+}
+
+// Erode Distance
+ErodeDistanceOperation::ErodeDistanceOperation() : DilateDistanceOperation() 
+{
+	/* pass */
+}
+
+void ErodeDistanceOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
+{
+	const float distance = this->distance;
+	const float mindist = distance * distance;
+
+	MemoryBuffer *inputBuffer = (MemoryBuffer *)data;
+	float *buffer = inputBuffer->getBuffer();
+	rcti *rect = inputBuffer->getRect();
+	const int minx = max(x - scope, rect->xmin);
+	const int miny = max(y - scope, rect->ymin);
+	const int maxx = min(x + scope, rect->xmax);
+	const int maxy = min(y + scope, rect->ymax);
+	const int bufferWidth = rect->xmax - rect->xmin;
+	int offset;
+	
+	float value = 1.0f;
+
+	for (int yi = miny; yi < maxy; yi++) {
+		const float dy = yi - y;
+		offset = ((yi - rect->ymin) * bufferWidth + (minx - rect->xmin)) * 4;
+		for (int xi = minx; xi < maxx; xi++) {
+			const float dx = xi - x;
+			const float dis = dx * dx + dy * dy;
+			if (dis <= mindist) {
+				value = min(buffer[offset], value);
+			}
+			offset += 4;
+		}
+	}
+	color[0] = value;
+}
+
+static cl_kernel erodeKernel = 0;
+void ErodeDistanceOperation::executeOpenCL(cl_context context, cl_program program, cl_command_queue queue, 
+                                           MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer,
+                                           MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp,
+                                           list<cl_kernel> *clKernelsToCleanUp)
+{
+	if (!erodeKernel) {
+		erodeKernel = COM_clCreateKernel(program, "erodeKernel", NULL);
+	}
+	cl_int distanceSquared = this->distance * this->distance;
+	cl_int scope = this->scope;
+	
+	COM_clAttachMemoryBufferToKernelParameter(context, erodeKernel, 0,  2, clMemToCleanUp, inputMemoryBuffers, this->inputProgram);
+	COM_clAttachOutputMemoryBufferToKernelParameter(erodeKernel, 1, clOutputBuffer);
+	COM_clAttachMemoryBufferOffsetToKernelParameter(erodeKernel, 3, outputMemoryBuffer);
+	clSetKernelArg(erodeKernel, 4, sizeof(cl_int), &scope);
+	clSetKernelArg(erodeKernel, 5, sizeof(cl_int), &distanceSquared);
+	COM_clAttachSizeToKernelParameter(erodeKernel, 6);
+	COM_clEnqueueRange(queue, erodeKernel, outputMemoryBuffer, 7);
+}
+
 // Dilate step
-DilateStepOperation::DilateStepOperation(): NodeOperation()
+DilateStepOperation::DilateStepOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_VALUE);
 	this->addOutputSocket(COM_DT_VALUE);
@@ -178,53 +333,53 @@ void *DilateStepOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryB
 	if (this->cached_buffer != NULL) {
 		return this->cached_buffer;
 	}
-	BLI_mutex_lock(getMutex());
+	lockMutex();
 	if (this->cached_buffer == NULL) {
-		MemoryBuffer *buffer = (MemoryBuffer*)inputProgram->initializeTileData(NULL, memoryBuffers);
+		MemoryBuffer *buffer = (MemoryBuffer *)inputProgram->initializeTileData(NULL, memoryBuffers);
 		float *rectf = buffer->convertToValueBuffer();
 		int x, y, i;
 		float *p;
 		int bwidth = buffer->getWidth();
 		int bheight = buffer->getHeight();
-		for (i = 0 ; i < this->iterations ; i ++) {
-			for (y=0; y < bheight; y++) {
-				for (x=0; x < bwidth-1; x++) {
-					p = rectf + (bwidth*y + x);
+		for (i = 0; i < this->iterations; i++) {
+			for (y = 0; y < bheight; y++) {
+				for (x = 0; x < bwidth - 1; x++) {
+					p = rectf + (bwidth * y + x);
 					*p = MAX2(*p, *(p + 1));
 				}
 			}
 		
-			for (y=0; y < bheight; y++) {
-				for (x=bwidth-1; x >= 1; x--) {
-					p = rectf + (bwidth*y + x);
+			for (y = 0; y < bheight; y++) {
+				for (x = bwidth - 1; x >= 1; x--) {
+					p = rectf + (bwidth * y + x);
 					*p = MAX2(*p, *(p - 1));
 				}
 			}
 		
-			for (x=0; x < bwidth; x++) {
-				for (y=0; y < bheight-1; y++) {
-					p = rectf + (bwidth*y + x);
+			for (x = 0; x < bwidth; x++) {
+				for (y = 0; y < bheight - 1; y++) {
+					p = rectf + (bwidth * y + x);
 					*p = MAX2(*p, *(p + bwidth));
 				}
 			}
 		
-			for (x=0; x < bwidth; x++) {
-				for (y=bheight-1; y >= 1; y--) {
-					p = rectf + (bwidth*y + x);
+			for (x = 0; x < bwidth; x++) {
+				for (y = bheight - 1; y >= 1; y--) {
+					p = rectf + (bwidth * y + x);
 					*p = MAX2(*p, *(p - bwidth));
 				}
 			}
 		}
 		this->cached_buffer = rectf;
 	}
-	BLI_mutex_unlock(getMutex());
+	unlockMutex();
 	return this->cached_buffer;
 }
 
 
 void DilateStepOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
 {
-	color[0] = this->cached_buffer[y*this->getWidth()+x];
+	color[0] = this->cached_buffer[y * this->getWidth() + x];
 }
 
 void DilateStepOperation::deinitExecution()
@@ -255,8 +410,9 @@ bool DilateStepOperation::determineDependingAreaOfInterest(rcti *input, ReadBuff
 }
 
 // Erode step
-ErodeStepOperation::ErodeStepOperation(): DilateStepOperation()
+ErodeStepOperation::ErodeStepOperation() : DilateStepOperation()
 {
+	/* pass */
 }
 
 void *ErodeStepOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
@@ -264,45 +420,45 @@ void *ErodeStepOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBu
 	if (this->cached_buffer != NULL) {
 		return this->cached_buffer;
 	}
-	BLI_mutex_lock(getMutex());
+	lockMutex();
 	if (this->cached_buffer == NULL) {
-		MemoryBuffer *buffer = (MemoryBuffer*)inputProgram->initializeTileData(NULL, memoryBuffers);
+		MemoryBuffer *buffer = (MemoryBuffer *)inputProgram->initializeTileData(NULL, memoryBuffers);
 		float *rectf = buffer->convertToValueBuffer();
 		int x, y, i;
 		float *p;
 		int bwidth = buffer->getWidth();
 		int bheight = buffer->getHeight();
-		for (i = 0 ; i < this->iterations ; i ++) {
-			for (y=0; y < bheight; y++) {
-				for (x=0; x < bwidth-1; x++) {
-					p = rectf + (bwidth*y + x);
+		for (i = 0; i < this->iterations; i++) {
+			for (y = 0; y < bheight; y++) {
+				for (x = 0; x < bwidth - 1; x++) {
+					p = rectf + (bwidth * y + x);
 					*p = MIN2(*p, *(p + 1));
 				}
 			}
 		
-			for (y=0; y < bheight; y++) {
-				for (x=bwidth-1; x >= 1; x--) {
-					p = rectf + (bwidth*y + x);
+			for (y = 0; y < bheight; y++) {
+				for (x = bwidth - 1; x >= 1; x--) {
+					p = rectf + (bwidth * y + x);
 					*p = MIN2(*p, *(p - 1));
 				}
 			}
 		
-			for (x=0; x < bwidth; x++) {
-				for (y=0; y < bheight-1; y++) {
-					p = rectf + (bwidth*y + x);
+			for (x = 0; x < bwidth; x++) {
+				for (y = 0; y < bheight - 1; y++) {
+					p = rectf + (bwidth * y + x);
 					*p = MIN2(*p, *(p + bwidth));
 				}
 			}
 		
-			for (x=0; x < bwidth; x++) {
-				for (y=bheight-1; y >= 1; y--) {
-					p = rectf + (bwidth*y + x);
+			for (x = 0; x < bwidth; x++) {
+				for (y = bheight - 1; y >= 1; y--) {
+					p = rectf + (bwidth * y + x);
 					*p = MIN2(*p, *(p - bwidth));
 				}
 			}
 		}
 		this->cached_buffer = rectf;
 	}
-	BLI_mutex_unlock(getMutex());
+	unlockMutex();
 	return this->cached_buffer;
 }
diff --git a/source/blender/compositor/operations/COM_DilateErodeOperation.h b/source/blender/compositor/operations/COM_DilateErodeOperation.h
index 7f01ea94494..b11356129b4 100644
--- a/source/blender/compositor/operations/COM_DilateErodeOperation.h
+++ b/source/blender/compositor/operations/COM_DilateErodeOperation.h
@@ -25,55 +25,106 @@
 #include "COM_NodeOperation.h"
 
 
-class DilateErodeDistanceOperation : public NodeOperation {
+class DilateErodeThresholdOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputProgram;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputProgram;
 	
 	float distance;
 	float _switch;
 	float inset;
 	
 	/**
-	  * determines the area of interest to track pixels
-	  * keep this one as small as possible for speed gain.
-	  */
+	 * determines the area of interest to track pixels
+	 * keep this one as small as possible for speed gain.
+	 */
 	int scope;
 public:
-	DilateErodeDistanceOperation();
+	DilateErodeThresholdOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
-	void setDistance(float distance) {this->distance = distance;}
-	void setSwitch(float sw) {this->_switch = sw;}
-	void setInset(float inset) {this->inset = inset;}
+	void setDistance(float distance) { this->distance = distance; }
+	void setSwitch(float sw) { this->_switch = sw; }
+	void setInset(float inset) { this->inset = inset; }
 	
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
 
 };
 
+class DilateDistanceOperation : public NodeOperation {
+private:
+protected:
+	/**
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputProgram;
+	float distance;
+	int scope;
+public:
+	DilateDistanceOperation();
+	
+	/**
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
+	
+	/**
+	 * Initialize the execution
+	 */
+	void initExecution();
+	
+	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
+	/**
+	 * Deinitialize the execution
+	 */
+	void deinitExecution();
+	
+	void setDistance(float distance) { this->distance = distance; }
+	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
+	
+	void executeOpenCL(cl_context context, cl_program program, cl_command_queue queue, 
+	                   MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, 
+	                   MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp,
+	                   list<cl_kernel> *clKernelsToCleanUp);
+};
+class ErodeDistanceOperation : public DilateDistanceOperation {
+public:
+	ErodeDistanceOperation();
+	
+	/**
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
+
+	void executeOpenCL(cl_context context, cl_program program, cl_command_queue queue, 
+	                   MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, 
+	                   MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, 
+	                   list<cl_kernel> *clKernelsToCleanUp);
+};
+
 class DilateStepOperation : public NodeOperation {
 protected:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputProgram;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputProgram;
 	
 	int iterations;
 	
@@ -82,22 +133,22 @@ public:
 	DilateStepOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
-	void setIterations(int iterations) {this->iterations = iterations;}
+	void setIterations(int iterations) { this->iterations = iterations; }
 	
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
 };
diff --git a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
index 30a09a45ade..271a165f0ff 100644
--- a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
@@ -51,25 +51,25 @@ void DirectionalBlurOperation::initExecution()
 	const float height = getHeight();
 
 	const float a = angle;
-	const float itsc = 1.f / pow(2.f, (float)iterations);
+	const float itsc = 1.0f / powf(2.0f, (float)iterations);
 	float D;
 
-	D = distance * sqrtf(width*width + height*height);
+	D = distance * sqrtf(width * width + height * height);
 	center_x_pix = center_x * width;
 	center_y_pix = center_y * height;
 
-	tx=  itsc * D * cos(a);
-	ty= -itsc * D * sin(a);
-	sc=  itsc * zoom;
-	rot = itsc * spin;
+	tx  =  itsc * D * cosf(a);
+	ty  = -itsc *D *sinf(a);
+	sc  =  itsc * zoom;
+	rot =  itsc * spin;
 
 }
 
 void DirectionalBlurOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
 {
 	const int iterations = pow(2.f, this->data->iter);
-	float col[4] = {0,0,0,0};
-	float col2[4] = {0,0,0,0};
+	float col[4] = {0, 0, 0, 0};
+	float col2[4] = {0, 0, 0, 0};
 	this->inputProgram->read(col2, x, y, COM_PS_NEAREST, inputBuffers);
 	float ltx = tx;
 	float lty = ty;
@@ -85,10 +85,7 @@ void DirectionalBlurOperation::executePixel(float *color, int x, int y, MemoryBu
 
 		this->inputProgram->read(col, cs * u + ss * v + center_x_pix, cs * v - ss * u + center_y_pix, COM_PS_NEAREST, inputBuffers);
 
-		col2[0] += col[0];
-		col2[1] += col[1];
-		col2[2] += col[2];
-		col2[3] += col[3];
+		add_v4_v4(col2, col);
 
 		/* double transformations */
 		ltx += tx;
@@ -96,10 +93,8 @@ void DirectionalBlurOperation::executePixel(float *color, int x, int y, MemoryBu
 		lrot += rot;
 		lsc += sc;
 	}
-	color[0] = col2[0]/iterations;
-	color[1] = col2[1]/iterations;
-	color[2] = col2[2]/iterations;
-	color[3] = col2[3]/iterations;
+
+	mul_v4_v4fl(color, col2, 1.0f / iterations);
 }
 
 void DirectionalBlurOperation::deinitExecution()
diff --git a/source/blender/compositor/operations/COM_DirectionalBlurOperation.h b/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
index 280e9247c1b..9cc0a4361f1 100644
--- a/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
+++ b/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
@@ -38,22 +38,22 @@ public:
 	DirectionalBlurOperation();
 
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
 	
-	void setData(NodeDBlurData *data) {this->data = data;}
+	void setData(NodeDBlurData *data) { this->data = data; }
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_DisplaceOperation.cpp b/source/blender/compositor/operations/COM_DisplaceOperation.cpp
index 2add367f39e..be50641a125 100644
--- a/source/blender/compositor/operations/COM_DisplaceOperation.cpp
+++ b/source/blender/compositor/operations/COM_DisplaceOperation.cpp
@@ -23,7 +23,7 @@
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 
-DisplaceOperation::DisplaceOperation(): NodeOperation()
+DisplaceOperation::DisplaceOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addInputSocket(COM_DT_VECTOR);
@@ -52,14 +52,14 @@ void DisplaceOperation::initExecution()
 
 /* minimum distance (in pixels) a pixel has to be displaced
  * in order to take effect */
-#define DISPLACE_EPSILON	0.01f
+#define DISPLACE_EPSILON    0.01f
 
 void DisplaceOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
 {
 	float inVector[4];
 	float inScale[4];
 
-	float p_dx, p_dy;	/* main displacement in pixel space */
+	float p_dx, p_dy;   /* main displacement in pixel space */
 	float d_dx, d_dy;
 	float dxt, dyt;
 	float u, v;
@@ -83,17 +83,17 @@ void DisplaceOperation::executePixel(float *color, int x, int y, MemoryBuffer *i
 	v = y - p_dy + 0.5f;
 
 	/* calc derivatives */
-	this->inputVectorProgram->read(inVector, x+1, y, COM_PS_NEAREST, inputBuffers);
+	this->inputVectorProgram->read(inVector, x + 1, y, COM_PS_NEAREST, inputBuffers);
 	d_dx = inVector[0] * xs;
-	this->inputVectorProgram->read(inVector, x, y+1, COM_PS_NEAREST, inputBuffers);
+	this->inputVectorProgram->read(inVector, x, y + 1, COM_PS_NEAREST, inputBuffers);
 	d_dy = inVector[0] * ys;
 
 	/* clamp derivatives to minimum displacement distance in UV space */
 	dxt = p_dx - d_dx;
 	dyt = p_dy - d_dy;
 
-	dxt = signf(dxt)*maxf(fabsf(dxt), DISPLACE_EPSILON)/this->getWidth();
-	dyt = signf(dyt)*maxf(fabsf(dyt), DISPLACE_EPSILON)/this->getHeight();
+	dxt = signf(dxt) * maxf(fabsf(dxt), DISPLACE_EPSILON) / this->getWidth();
+	dyt = signf(dyt) * maxf(fabsf(dyt), DISPLACE_EPSILON) / this->getHeight();
 
 	/* EWA filtering */
 	this->inputColorProgram->read(color, u, v, dxt, dyt, inputBuffers);
@@ -111,7 +111,7 @@ bool DisplaceOperation::determineDependingAreaOfInterest(rcti *input, ReadBuffer
 {
 	rcti colorInput;
 	rcti vectorInput;
-	NodeOperation *operation=NULL;
+	NodeOperation *operation = NULL;
 
 	/* the vector buffer only needs a 2x2 buffer. The image needs whole buffer */
 	/* image */
diff --git a/source/blender/compositor/operations/COM_DisplaceOperation.h b/source/blender/compositor/operations/COM_DisplaceOperation.h
index 9c59c928854..82788e37e3a 100644
--- a/source/blender/compositor/operations/COM_DisplaceOperation.h
+++ b/source/blender/compositor/operations/COM_DisplaceOperation.h
@@ -41,14 +41,14 @@ public:
 	DisplaceOperation();
 
 	/**
-	* we need a 2x2 differential filter for Vector Input and full buffer for the image
-	*/	
+	 * we need a 2x2 differential filter for Vector Input and full buffer for the image
+	 */
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
 
 	/**
 	 * the inner loop of this program
 	 */
-	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
 	
 	/**
 	 * Initialize the execution
diff --git a/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp b/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp
index 8675caca1e2..716646e9c36 100644
--- a/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp
+++ b/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp
@@ -23,7 +23,7 @@
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 
-DisplaceSimpleOperation::DisplaceSimpleOperation(): NodeOperation()
+DisplaceSimpleOperation::DisplaceSimpleOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addInputSocket(COM_DT_VECTOR);
@@ -51,14 +51,14 @@ void DisplaceSimpleOperation::initExecution()
 
 /* minimum distance (in pixels) a pixel has to be displaced
  * in order to take effect */
-#define DISPLACE_EPSILON	0.01f
+#define DISPLACE_EPSILON    0.01f
 
 void DisplaceSimpleOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
 {
 	float inVector[4];
 	float inScale[4];
 
-	float p_dx, p_dy;	/* main displacement in pixel space */
+	float p_dx, p_dy;   /* main displacement in pixel space */
 	float u, v;
 
 	this->inputScaleXProgram->read(inScale, x, y, sampler, inputBuffers);
@@ -79,8 +79,8 @@ void DisplaceSimpleOperation::executePixel(float *color, float x, float y, Pixel
 	/* clamp nodes to avoid glitches */
 	u = x - p_dx + 0.5f;
 	v = y - p_dy + 0.5f;
-	CLAMP(u, 0.f, this->getWidth()-1.f);
-	CLAMP(v, 0.f, this->getHeight()-1.f);
+	CLAMP(u, 0.f, this->getWidth() - 1.f);
+	CLAMP(v, 0.f, this->getHeight() - 1.f);
 
 	this->inputColorProgram->read(color, u, v, sampler, inputBuffers);
 }
@@ -96,7 +96,7 @@ void DisplaceSimpleOperation::deinitExecution()
 bool DisplaceSimpleOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
 {
 	rcti colorInput;
-	NodeOperation *operation=NULL;
+	NodeOperation *operation = NULL;
 
 	/* the vector buffer only needs a 2x2 buffer. The image needs whole buffer */
 	/* image */
diff --git a/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h b/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h
index 0e3bcc1b1f0..1ebb238855b 100644
--- a/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h
+++ b/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h
@@ -41,14 +41,14 @@ public:
 	DisplaceSimpleOperation();
 
 	/**
-	* we need a full buffer for the image
-	*/	
+	 * we need a full buffer for the image
+	 */
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
 
 	/**
 	 * the inner loop of this program
 	 */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
 	 * Initialize the execution
diff --git a/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp b/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
index 304f7fa5066..ec01ba922b5 100644
--- a/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
+++ b/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
@@ -22,7 +22,7 @@
 #include "COM_DistanceMatteOperation.h"
 #include "BLI_math.h"
 
-DistanceMatteOperation::DistanceMatteOperation(): NodeOperation()
+DistanceMatteOperation::DistanceMatteOperation() : NodeOperation()
 {
 	addInputSocket(COM_DT_COLOR);
 	addInputSocket(COM_DT_COLOR);
@@ -49,8 +49,8 @@ void DistanceMatteOperation::executePixel(float *outputValue, float x, float y,
 	float inKey[4];
 	float inImage[4];
 
-	const float tolerence=this->settings->t1;
-	const float falloff=this->settings->t2;
+	const float tolerence = this->settings->t1;
+	const float falloff = this->settings->t2;
 
 	float distance;
 	float alpha;
@@ -58,9 +58,9 @@ void DistanceMatteOperation::executePixel(float *outputValue, float x, float y,
 	this->inputKeyProgram->read(inKey, x, y, sampler, inputBuffers);
 	this->inputImageProgram->read(inImage, x, y, sampler, inputBuffers);
 	
-	distance = sqrt(pow((inKey[0]-inImage[0]),2)+
-		pow((inKey[1]-inImage[1]),2)+
-		pow((inKey[2]-inImage[2]),2));
+	distance = sqrt(pow((inKey[0] - inImage[0]), 2) +
+	                pow((inKey[1] - inImage[1]), 2) +
+	                pow((inKey[2] - inImage[2]), 2));
 
 	/* store matte(alpha) value in [0] to go with
 	 * COM_SetAlphaOperation and the Value output
@@ -68,23 +68,23 @@ void DistanceMatteOperation::executePixel(float *outputValue, float x, float y,
  
 	/*make 100% transparent */
 	if (distance < tolerence) {
-		outputValue[0]=0.f;
+		outputValue[0] = 0.f;
 	}
 	/*in the falloff region, make partially transparent */
-	else if (distance < falloff+tolerence) {
-		distance=distance-tolerence;
-		alpha=distance/falloff;
+	else if (distance < falloff + tolerence) {
+		distance = distance - tolerence;
+		alpha = distance / falloff;
 		/*only change if more transparent than before */
 		if (alpha < inImage[3]) {
-			outputValue[0]=alpha;
+			outputValue[0] = alpha;
 		}
 		else { /* leave as before */
-			outputValue[0]=inImage[3];
+			outputValue[0] = inImage[3];
 		}
 	}
 	else {
-	/* leave as before */
-		outputValue[0]=inImage[3];
+		/* leave as before */
+		outputValue[0] = inImage[3];
 	}
 }
 
diff --git a/source/blender/compositor/operations/COM_DistanceMatteOperation.h b/source/blender/compositor/operations/COM_DistanceMatteOperation.h
index 2a668f31f8f..cf1172a8c11 100644
--- a/source/blender/compositor/operations/COM_DistanceMatteOperation.h
+++ b/source/blender/compositor/operations/COM_DistanceMatteOperation.h
@@ -25,9 +25,9 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class DistanceMatteOperation : public NodeOperation {
 private:
 	NodeChroma *settings;
@@ -35,18 +35,18 @@ private:
 	SocketReader *inputKeyProgram;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	DistanceMatteOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	void initExecution();
 	void deinitExecution();
 	
-	void setSettings(NodeChroma *nodeChroma) {this->settings = nodeChroma;}
+	void setSettings(NodeChroma *nodeChroma) { this->settings = nodeChroma; }
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_DotproductOperation.cpp b/source/blender/compositor/operations/COM_DotproductOperation.cpp
index b03b176f08a..e225a677989 100644
--- a/source/blender/compositor/operations/COM_DotproductOperation.cpp
+++ b/source/blender/compositor/operations/COM_DotproductOperation.cpp
@@ -44,12 +44,12 @@ void DotproductOperation::deinitExecution()
 }
 
 /** @todo: current implementation is the inverse of a dotproduct. not 'logically' correct
-  */
-void DotproductOperation::executePixel(float *color,float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
+ */
+void DotproductOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
 {
 	float input1[4];
 	float input2[4];
 	this->input1Operation->read(input1, x, y, sampler, inputBuffers);
 	this->input2Operation->read(input2, x, y, sampler, inputBuffers);
-	color[0] = -(input1[0]*input2[0]+input1[1]*input2[1]+input1[2]*input2[2]);
+	color[0] = -(input1[0] * input2[0] + input1[1] * input2[1] + input1[2] * input2[2]);
 }
diff --git a/source/blender/compositor/operations/COM_DotproductOperation.h b/source/blender/compositor/operations/COM_DotproductOperation.h
index 0244fffa110..849dc83a9cd 100644
--- a/source/blender/compositor/operations/COM_DotproductOperation.h
+++ b/source/blender/compositor/operations/COM_DotproductOperation.h
@@ -25,13 +25,13 @@
 
 #include "COM_NodeOperation.h"
 
-class DotproductOperation: public NodeOperation {
+class DotproductOperation : public NodeOperation {
 private:
 	SocketReader *input1Operation;
 	SocketReader *input2Operation;
 public:
 	DotproductOperation();
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	void initExecution();
 	void deinitExecution();
diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
index 9e911e7ba40..ba54c8ad9d6 100644
--- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
+++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
@@ -23,741 +23,742 @@
 #include "COM_DoubleEdgeMaskOperation.h"
 #include "BLI_math.h"
 #include "DNA_node_types.h"
+#include "MEM_guardedalloc.h"
 
 // this part has been copied from the double edge mask
 // Contributor(s): Peter Larabell.
 static void do_adjacentKeepBorders(unsigned int t, unsigned int rw, unsigned int *limask, unsigned int *lomask, unsigned int *lres, float *res, unsigned int *rsize)
 {
 	int x;
-	unsigned int isz=0; // inner edge size
-	unsigned int osz=0; // outer edge size
-	unsigned int gsz=0; // gradient fill area size
+	unsigned int isz = 0; // inner edge size
+	unsigned int osz = 0; // outer edge size
+	unsigned int gsz = 0; // gradient fill area size
 	/* Test the four corners */
 	/* upper left corner */
-	x=t-rw+1;
+	x = t - rw + 1;
 	// test if inner mask is filled
 	if (limask[x]) {
 		// test if pixel underneath, or to the right, are empty in the inner mask,
 		// but filled in the outer mask
-		if ((!limask[x-rw] && lomask[x-rw]) || (!limask[x+1] && lomask[x+1])) {
+		if ((!limask[x - rw] && lomask[x - rw]) || (!limask[x + 1] && lomask[x + 1])) {
 			isz++;                               // increment inner edge size
-			lres[x]=4;                           // flag pixel as inner edge
+			lres[x] = 4;                         // flag pixel as inner edge
 		}
 		else {
 			res[x] = 1.0f;                       // pixel is just part of inner mask, and it's not an edge
 		}
 	}
-	else if (lomask[x]) {                         // inner mask was empty, test if outer mask is filled
+	else if (lomask[x]) {                        // inner mask was empty, test if outer mask is filled
 		osz++;                                   // increment outer edge size
 		lres[x] = 3;                             // flag pixel as outer edge
 	}
 	/* upper right corner */
-	x=t;
+	x = t;
 	// test if inner mask is filled
 	if (limask[x]) {
 		// test if pixel underneath, or to the left, are empty in the inner mask,
 		// but filled in the outer mask
-		if ((!limask[x-rw] && lomask[x-rw]) || (!limask[x-1] && lomask[x-1])) {
+		if ((!limask[x - rw] && lomask[x - rw]) || (!limask[x - 1] && lomask[x - 1])) {
 			isz++;                               // increment inner edge size
-			lres[x]=4;                           // flag pixel as inner edge
+			lres[x] = 4;                         // flag pixel as inner edge
 		}
 		else {
-			res[x]=1.0f;                         // pixel is just part of inner mask, and it's not an edge
+			res[x] = 1.0f;                         // pixel is just part of inner mask, and it's not an edge
 		}
 	}
 	else if (lomask[x]) {                        // inner mask was empty, test if outer mask is filled
 		osz++;                                   // increment outer edge size
-		lres[x]=3;                               // flag pixel as outer edge
+		lres[x] = 3;                             // flag pixel as outer edge
 	}
 	/* lower left corner */
-	x=0;
+	x = 0;
 	// test if inner mask is filled
 	if (limask[x]) {
 		// test if pixel above, or to the right, are empty in the inner mask,
 		// but filled in the outer mask
-		if ((!limask[x+rw] && lomask[x+rw]) || (!limask[x+1] && lomask[x+1])) {
+		if ((!limask[x + rw] && lomask[x + rw]) || (!limask[x + 1] && lomask[x + 1])) {
 			isz++;                               // increment inner edge size
-			lres[x]=4;                           // flag pixel as inner edge
+			lres[x] = 4;                         // flag pixel as inner edge
 		}
 		else {
-			res[x]=1.0f;                         // pixel is just part of inner mask, and it's not an edge
+			res[x] = 1.0f;                       // pixel is just part of inner mask, and it's not an edge
 		}
 	}
 	else if (lomask[x]) {                        // inner mask was empty, test if outer mask is filled
 		osz++;                                   // increment outer edge size
-		lres[x]=3;                               // flag pixel as outer edge
+		lres[x] = 3;                             // flag pixel as outer edge
 	}
 	/* lower right corner */
-	x=rw-1;
+	x = rw - 1;
 	// test if inner mask is filled
 	if (limask[x]) {
 		// test if pixel above, or to the left, are empty in the inner mask,
 		// but filled in the outer mask
-		if ((!limask[x+rw] && lomask[x+rw]) || (!limask[x-1] && lomask[x-1])) {
+		if ((!limask[x + rw] && lomask[x + rw]) || (!limask[x - 1] && lomask[x - 1])) {
 			isz++;                               // increment inner edge size
-			lres[x]=4;                           // flag pixel as inner edge
+			lres[x] = 4;                         // flag pixel as inner edge
 		}
 		else {
-			res[x]=1.0f;                         // pixel is just part of inner mask, and it's not an edge
+			res[x] = 1.0f;                       // pixel is just part of inner mask, and it's not an edge
 		}
 	}
 	else if (lomask[x]) {                        // inner mask was empty, test if outer mask is filled
 		osz++;                                   // increment outer edge size
-		lres[x]=3;                               // flag pixel as outer edge
+		lres[x] = 3;                             // flag pixel as outer edge
 	}
 	
 	/* Test the TOP row of pixels in buffer, except corners */
-	for (x = t-1; x>=(t-rw)+2; x--) {
+	for (x = t - 1; x >= (t - rw) + 2; x--) {
 		// test if inner mask is filled
 		if (limask[x]) {
 			// test if pixel to the right, or to the left, are empty in the inner mask,
 			// but filled in the outer mask
-			if ((!limask[x-1] && lomask[x-1]) || (!limask[x+1] && lomask[x+1])) {
+			if ((!limask[x - 1] && lomask[x - 1]) || (!limask[x + 1] && lomask[x + 1])) {
 				isz++;                           // increment inner edge size
-				lres[x]=4;                       // flag pixel as inner edge
+				lres[x] = 4;                     // flag pixel as inner edge
 			}
 			else {
-				res[x]=1.0f;                     // pixel is just part of inner mask, and it's not an edge
+				res[x] = 1.0f;                   // pixel is just part of inner mask, and it's not an edge
 			}
 		}
 		else if (lomask[x]) {                    // inner mask was empty, test if outer mask is filled
 			osz++;                               // increment outer edge size
-			lres[x]=3;                           // flag pixel as outer edge
+			lres[x] = 3;                         // flag pixel as outer edge
 		}
 	}
 	
 	/* Test the BOTTOM row of pixels in buffer, except corners */
-	for (x = rw-2; x; x--) {
+	for (x = rw - 2; x; x--) {
 		// test if inner mask is filled
 		if (limask[x]) {
 			// test if pixel to the right, or to the left, are empty in the inner mask,
 			// but filled in the outer mask
-			if ((!limask[x-1] && lomask[x-1]) || (!limask[x+1] && lomask[x+1])) {
+			if ((!limask[x - 1] && lomask[x - 1]) || (!limask[x + 1] && lomask[x + 1])) {
 				isz++;                           // increment inner edge size
-				lres[x]=4;                       // flag pixel as inner edge
+				lres[x] = 4;                     // flag pixel as inner edge
 			}
 			else {
-				res[x]=1.0f;                     // pixel is just part of inner mask, and it's not an edge
+				res[x] = 1.0f;                   // pixel is just part of inner mask, and it's not an edge
 			}
 		}
 		else if (lomask[x]) {                    // inner mask was empty, test if outer mask is filled
 			osz++;                               // increment outer edge size
-			lres[x]=3;                           // flag pixel as outer edge
+			lres[x] = 3;                         // flag pixel as outer edge
 		}
 	}
 	/* Test the LEFT edge of pixels in buffer, except corners */
-	for (x = t-(rw<<1)+1; x>=rw; x-=rw) {
+	for (x = t - (rw << 1) + 1; x >= rw; x -= rw) {
 		// test if inner mask is filled
 		if (limask[x]) {
 			// test if pixel underneath, or above, are empty in the inner mask,
 			// but filled in the outer mask
-			if ((!limask[x-rw] && lomask[x-rw]) || (!limask[x+rw] && lomask[x+rw])) {
+			if ((!limask[x - rw] && lomask[x - rw]) || (!limask[x + rw] && lomask[x + rw])) {
 				isz++;                           // increment inner edge size
-				lres[x]=4;                       // flag pixel as inner edge
+				lres[x] = 4;                     // flag pixel as inner edge
 			}
 			else {
-				res[x]=1.0f;                     // pixel is just part of inner mask, and it's not an edge
+				res[x] = 1.0f;                   // pixel is just part of inner mask, and it's not an edge
 			}
 		}
-		else if (lomask[x]) {                   // inner mask was empty, test if outer mask is filled
+		else if (lomask[x]) {                    // inner mask was empty, test if outer mask is filled
 			osz++;                               // increment outer edge size
-			lres[x]=3;                           // flag pixel as outer edge
+			lres[x] = 3;                         // flag pixel as outer edge
 		}
 	}
 	
 	/* Test the RIGHT edge of pixels in buffer, except corners */
-	for (x = t-rw; x>rw; x-=rw) {
+	for (x = t - rw; x > rw; x -= rw) {
 		// test if inner mask is filled
 		if (limask[x]) {
 			// test if pixel underneath, or above, are empty in the inner mask,
 			// but filled in the outer mask
-			if ((!limask[x-rw] && lomask[x-rw]) || (!limask[x+rw] && lomask[x+rw])) {
+			if ((!limask[x - rw] && lomask[x - rw]) || (!limask[x + rw] && lomask[x + rw])) {
 				isz++;                           // increment inner edge size
-				lres[x]=4;                       // flag pixel as inner edge
+				lres[x] = 4;                     // flag pixel as inner edge
 			}
 			else {
-				res[x]=1.0f;                     // pixel is just part of inner mask, and it's not an edge
+				res[x] = 1.0f;                   // pixel is just part of inner mask, and it's not an edge
 			}
 		}
-		else if (lomask[x]) {                   // inner mask was empty, test if outer mask is filled
+		else if (lomask[x]) {                    // inner mask was empty, test if outer mask is filled
 			osz++;                               // increment outer edge size
-			lres[x]=3;                           // flag pixel as outer edge
+			lres[x] = 3;                         // flag pixel as outer edge
 		}
 	}
 	
-	rsize[0]=isz;  // fill in our return sizes for edges + fill
-	rsize[1]=osz;
-	rsize[2]=gsz;
+	rsize[0] = isz;  // fill in our return sizes for edges + fill
+	rsize[1] = osz;
+	rsize[2] = gsz;
 }
 
 static void do_adjacentBleedBorders(unsigned int t, unsigned int rw, unsigned int *limask, unsigned int *lomask, unsigned int *lres, float *res, unsigned int *rsize)
 {
 	int x;
-	unsigned int isz=0; // inner edge size
-	unsigned int osz=0; // outer edge size
-	unsigned int gsz=0; // gradient fill area size
+	unsigned int isz = 0; // inner edge size
+	unsigned int osz = 0; // outer edge size
+	unsigned int gsz = 0; // gradient fill area size
 	/* Test the four corners */
 	/* upper left corner */
-	x=t-rw+1;
+	x = t - rw + 1;
 	// test if inner mask is filled
 	if (limask[x]) {
 		// test if pixel underneath, or to the right, are empty in the inner mask,
 		// but filled in the outer mask
-		if ((!limask[x-rw] && lomask[x-rw]) || (!limask[x+1] && lomask[x+1])) {
+		if ((!limask[x - rw] && lomask[x - rw]) || (!limask[x + 1] && lomask[x + 1])) {
 			isz++;                               // increment inner edge size
-			lres[x]=4;                           // flag pixel as inner edge
+			lres[x] = 4;                         // flag pixel as inner edge
 		}
 		else {
-			res[x]=1.0f;                         // pixel is just part of inner mask, and it's not an edge
+			res[x] = 1.0f;                       // pixel is just part of inner mask, and it's not an edge
 		}
 	}
 	else if (lomask[x]) {                        // inner mask was empty, test if outer mask is filled
-		if (!lomask[x-rw] || !lomask[x+1]) {      // test if outer mask is empty underneath or to the right
+		if (!lomask[x - rw] || !lomask[x + 1]) { // test if outer mask is empty underneath or to the right
 			osz++;                               // increment outer edge size
-			lres[x]=3;                           // flag pixel as outer edge
+			lres[x] = 3;                         // flag pixel as outer edge
 		}
 		else {
 			gsz++;                               // increment the gradient pixel count
-			lres[x]=2;                           // flag pixel as gradient
+			lres[x] = 2;                         // flag pixel as gradient
 		}
 	}
 	/* upper right corner */
-	x=t;
+	x = t;
 	// test if inner mask is filled
 	if (limask[x]) {
 		// test if pixel underneath, or to the left, are empty in the inner mask,
 		// but filled in the outer mask
-		if ((!limask[x-rw] && lomask[x-rw]) || (!limask[x-1] && lomask[x-1])) {
+		if ((!limask[x - rw] && lomask[x - rw]) || (!limask[x - 1] && lomask[x - 1])) {
 			isz++;                               // increment inner edge size
-			lres[x]=4;                           // flag pixel as inner edge
+			lres[x] = 4;                         // flag pixel as inner edge
 		}
 		else {
-			res[x]=1.0f;                         // pixel is just part of inner mask, and it's not an edge
+			res[x] = 1.0f;                       // pixel is just part of inner mask, and it's not an edge
 		}
 	}
 	else if (lomask[x]) {                        // inner mask was empty, test if outer mask is filled
-		if (!lomask[x-rw] || !lomask[x-1]) {      // test if outer mask is empty underneath or to the left
+		if (!lomask[x - rw] || !lomask[x - 1]) { // test if outer mask is empty underneath or to the left
 			osz++;                               // increment outer edge size
-			lres[x]=3;                           // flag pixel as outer edge
+			lres[x] = 3;                         // flag pixel as outer edge
 		}
 		else {
 			gsz++;                               // increment the gradient pixel count
-			lres[x]=2;                           // flag pixel as gradient
+			lres[x] = 2;                         // flag pixel as gradient
 		}
 	}
 	/* lower left corner */
-	x=0;
+	x = 0;
 	// test if inner mask is filled
 	if (limask[x]) {
 		// test if pixel above, or to the right, are empty in the inner mask,
 		// but filled in the outer mask
-		if ((!limask[x+rw] && lomask[x+rw]) || (!limask[x+1] && lomask[x+1])) {
+		if ((!limask[x + rw] && lomask[x + rw]) || (!limask[x + 1] && lomask[x + 1])) {
 			isz++;                               // increment inner edge size
-			lres[x]=4;                           // flag pixel as inner edge
+			lres[x] = 4;                         // flag pixel as inner edge
 		}
 		else {
-			res[x]=1.0f;                         // pixel is just part of inner mask, and it's not an edge
+			res[x] = 1.0f;                       // pixel is just part of inner mask, and it's not an edge
 		}
 	}
 	else if (lomask[x]) {                        // inner mask was empty, test if outer mask is filled
-		if (!lomask[x+rw] || !lomask[x+1]) {      // test if outer mask is empty above or to the right
+		if (!lomask[x + rw] || !lomask[x + 1]) { // test if outer mask is empty above or to the right
 			osz++;                               // increment outer edge size
-			lres[x]=3;                           // flag pixel as outer edge
+			lres[x] = 3;                         // flag pixel as outer edge
 		}
 		else {
 			gsz++;                               // increment the gradient pixel count
-			lres[x]=2;                           // flag pixel as gradient
+			lres[x] = 2;                         // flag pixel as gradient
 		}
 	}
 	/* lower right corner */
-	x=rw-1;
+	x = rw - 1;
 	// test if inner mask is filled
 	if (limask[x]) {
 		// test if pixel above, or to the left, are empty in the inner mask,
 		// but filled in the outer mask
-		if ((!limask[x+rw] && lomask[x+rw]) || (!limask[x-1] && lomask[x-1])) {
+		if ((!limask[x + rw] && lomask[x + rw]) || (!limask[x - 1] && lomask[x - 1])) {
 			isz++;                               // increment inner edge size
-			lres[x]=4;                           // flag pixel as inner edge
+			lres[x] = 4;                         // flag pixel as inner edge
 		}
 		else {
-			res[x]=1.0f;                         // pixel is just part of inner mask, and it's not an edge
+			res[x] = 1.0f;                       // pixel is just part of inner mask, and it's not an edge
 		}
 	}
 	else if (lomask[x]) {                        // inner mask was empty, test if outer mask is filled
-		if (!lomask[x+rw] || !lomask[x-1]) {      // test if outer mask is empty above or to the left
+		if (!lomask[x + rw] || !lomask[x - 1]) { // test if outer mask is empty above or to the left
 			osz++;                               // increment outer edge size
-			lres[x]=3;                           // flag pixel as outer edge
+			lres[x] = 3;                         // flag pixel as outer edge
 		}
 		else {
 			gsz++;                               // increment the gradient pixel count
-			lres[x]=2;                           // flag pixel as gradient
+			lres[x] = 2;                         // flag pixel as gradient
 		}
 	}
 	/* Test the TOP row of pixels in buffer, except corners */
-	for (x = t-1; x>=(t-rw)+2; x--) {
+	for (x = t - 1; x >= (t - rw) + 2; x--) {
 		// test if inner mask is filled
 		if (limask[x]) {
 			// test if pixel to the left, or to the right, are empty in the inner mask,
 			// but filled in the outer mask
-			if ((!limask[x-1] && lomask[x-1]) || (!limask[x+1] && lomask[x+1])) {
+			if ((!limask[x - 1] && lomask[x - 1]) || (!limask[x + 1] && lomask[x + 1])) {
 				isz++;                           // increment inner edge size
-				lres[x]=4;                       // flag pixel as inner edge
+				lres[x] = 4;                     // flag pixel as inner edge
 			}
 			else {
-				res[x]=1.0f;                     // pixel is just part of inner mask, and it's not an edge
+				res[x] = 1.0f;                   // pixel is just part of inner mask, and it's not an edge
 			}
 		}
-		else if (lomask[x]) {                   // inner mask was empty, test if outer mask is filled
-			if (!lomask[x-1] || !lomask[x+1]) {   // test if outer mask is empty to the left or to the right
+		else if (lomask[x]) {                    // inner mask was empty, test if outer mask is filled
+			if (!lomask[x - 1] || !lomask[x + 1]) {   // test if outer mask is empty to the left or to the right
 				osz++;                           // increment outer edge size
-				lres[x]=3;                       // flag pixel as outer edge
+				lres[x] = 3;                     // flag pixel as outer edge
 			}
 			else {
 				gsz++;                           // increment the gradient pixel count
-				lres[x]=2;                       // flag pixel as gradient
+				lres[x] = 2;                     // flag pixel as gradient
 			}
 		}
 	}
 	
 	/* Test the BOTTOM row of pixels in buffer, except corners */
-	for (x = rw-2; x; x--) {
+	for (x = rw - 2; x; x--) {
 		// test if inner mask is filled
 		if (limask[x]) {
 			// test if pixel to the left, or to the right, are empty in the inner mask,
 			// but filled in the outer mask
-			if ((!limask[x-1] && lomask[x-1]) || (!limask[x+1] && lomask[x+1])) {
+			if ((!limask[x - 1] && lomask[x - 1]) || (!limask[x + 1] && lomask[x + 1])) {
 				isz++;                           // increment inner edge size
-				lres[x]=4;                       // flag pixel as inner edge
+				lres[x] = 4;                     // flag pixel as inner edge
 			}
 			else {
-				res[x]=1.0f;                     // pixel is just part of inner mask, and it's not an edge
+				res[x] = 1.0f;                     // pixel is just part of inner mask, and it's not an edge
 			}
 		}
-		else if (lomask[x]) {                   // inner mask was empty, test if outer mask is filled
-			if (!lomask[x-1] || !lomask[x+1]) {   // test if outer mask is empty to the left or to the right
+		else if (lomask[x]) {                    // inner mask was empty, test if outer mask is filled
+			if (!lomask[x - 1] || !lomask[x + 1]) { // test if outer mask is empty to the left or to the right
 				osz++;                           // increment outer edge size
-				lres[x]=3;                       // flag pixel as outer edge
+				lres[x] = 3;                     // flag pixel as outer edge
 			}
 			else {
 				gsz++;                           // increment the gradient pixel count
-				lres[x]=2;                       // flag pixel as gradient
+				lres[x] = 2;                     // flag pixel as gradient
 			}
 		}
 	}
 	/* Test the LEFT edge of pixels in buffer, except corners */
-	for (x = t-(rw<<1)+1; x>=rw; x-=rw) {
+	for (x = t - (rw << 1) + 1; x >= rw; x -= rw) {
 		// test if inner mask is filled
 		if (limask[x]) {
 			// test if pixel underneath, or above, are empty in the inner mask,
 			// but filled in the outer mask
-			if ((!limask[x-rw] && lomask[x-rw]) || (!limask[x+rw] && lomask[x+rw])) {
+			if ((!limask[x - rw] && lomask[x - rw]) || (!limask[x + rw] && lomask[x + rw])) {
 				isz++;                           // increment inner edge size
-				lres[x]=4;                       // flag pixel as inner edge
+				lres[x] = 4;                     // flag pixel as inner edge
 			}
 			else {
-				res[x]=1.0f;                     // pixel is just part of inner mask, and it's not an edge
+				res[x] = 1.0f;                   // pixel is just part of inner mask, and it's not an edge
 			}
 		}
-		else if (lomask[x]) {                   // inner mask was empty, test if outer mask is filled
-			if (!lomask[x-rw] || !lomask[x+rw]) { // test if outer mask is empty underneath or above
+		else if (lomask[x]) {                    // inner mask was empty, test if outer mask is filled
+			if (!lomask[x - rw] || !lomask[x + rw]) { // test if outer mask is empty underneath or above
 				osz++;                           // increment outer edge size
-				lres[x]=3;                       // flag pixel as outer edge
+				lres[x] = 3;                     // flag pixel as outer edge
 			}
 			else {
 				gsz++;                           // increment the gradient pixel count
-				lres[x]=2;                       // flag pixel as gradient
+				lres[x] = 2;                     // flag pixel as gradient
 			}
 		}
 	}
 	
 	/* Test the RIGHT edge of pixels in buffer, except corners */
-	for (x = t-rw; x>rw; x-=rw) {
+	for (x = t - rw; x > rw; x -= rw) {
 		// test if inner mask is filled
 		if (limask[x]) {
 			// test if pixel underneath, or above, are empty in the inner mask,
 			// but filled in the outer mask
-			if ((!limask[x-rw] && lomask[x-rw]) || (!limask[x+rw] && lomask[x+rw])) {
+			if ((!limask[x - rw] && lomask[x - rw]) || (!limask[x + rw] && lomask[x + rw])) {
 				isz++;                           // increment inner edge size
-				lres[x]=4;                       // flag pixel as inner edge
+				lres[x] = 4;                     // flag pixel as inner edge
 			}
 			else {
-				res[x]=1.0f;                     // pixel is just part of inner mask, and it's not an edge
+				res[x] = 1.0f;                   // pixel is just part of inner mask, and it's not an edge
 			}
 		}
-		else if (lomask[x]) {                   // inner mask was empty, test if outer mask is filled
-			if (!lomask[x-rw] || !lomask[x+rw]) { // test if outer mask is empty underneath or above
+		else if (lomask[x]) {                    // inner mask was empty, test if outer mask is filled
+			if (!lomask[x - rw] || !lomask[x + rw]) { // test if outer mask is empty underneath or above
 				osz++;                           // increment outer edge size
-				lres[x]=3;                       // flag pixel as outer edge
+				lres[x] = 3;                     // flag pixel as outer edge
 			}
 			else {
 				gsz++;                           // increment the gradient pixel count
-				lres[x]=2;                       // flag pixel as gradient
+				lres[x] = 2;                     // flag pixel as gradient
 			}
 		}
 	}
 	
-	rsize[0]=isz;  // fill in our return sizes for edges + fill
-	rsize[1]=osz;
-	rsize[2]=gsz;
+	rsize[0] = isz;  // fill in our return sizes for edges + fill
+	rsize[1] = osz;
+	rsize[2] = gsz;
 }
 
 static void do_allKeepBorders(unsigned int t, unsigned int rw, unsigned int *limask, unsigned int *lomask, unsigned int *lres, float *res, unsigned int *rsize)
 {
 	int x;
-	unsigned int isz=0; // inner edge size
-	unsigned int osz=0; // outer edge size
-	unsigned int gsz=0; // gradient fill area size
+	unsigned int isz = 0; // inner edge size
+	unsigned int osz = 0; // outer edge size
+	unsigned int gsz = 0; // gradient fill area size
 	/* Test the four corners */
 	/* upper left corner */
-	x=t-rw+1;
+	x = t - rw + 1;
 	// test if inner mask is filled
 	if (limask[x]) {
 		// test if the inner mask is empty underneath or to the right
-		if (!limask[x-rw] || !limask[x+1]) {
+		if (!limask[x - rw] || !limask[x + 1]) {
 			isz++;                               // increment inner edge size
-			lres[x]=4;                           // flag pixel as inner edge
+			lres[x] = 4;                         // flag pixel as inner edge
 		}
 		else {
-			res[x]=1.0f;                         // pixel is just part of inner mask, and it's not an edge
+			res[x] = 1.0f;                       // pixel is just part of inner mask, and it's not an edge
 		}
 	}
 	else if (lomask[x]) {                        // inner mask was empty, test if outer mask is filled
 		osz++;                                   // increment outer edge size
-		lres[x]=3;                               // flag pixel as outer edge
+		lres[x] = 3;                             // flag pixel as outer edge
 	}
 	/* upper right corner */
-	x=t;
+	x = t;
 	// test if inner mask is filled
 	if (limask[x]) {
 		// test if the inner mask is empty underneath or to the left
-		if (!limask[x-rw] || !limask[x-1]) {
+		if (!limask[x - rw] || !limask[x - 1]) {
 			isz++;                               // increment inner edge size
-			lres[x]=4;                           // flag pixel as inner edge
+			lres[x] = 4;                         // flag pixel as inner edge
 		}
 		else {
-			res[x]=1.0f;                         // pixel is just part of inner mask, and it's not an edge
+			res[x] = 1.0f;                       // pixel is just part of inner mask, and it's not an edge
 		}
 	}
 	else if (lomask[x]) {                        // inner mask was empty, test if outer mask is filled
 		osz++;                                   // increment outer edge size
-		lres[x]=3;                               // flag pixel as outer edge
+		lres[x] = 3;                             // flag pixel as outer edge
 	}
 	/* lower left corner */
-	x=0;
+	x = 0;
 	// test if inner mask is filled
 	if (limask[x]) {
 		// test if inner mask is empty above or to the right
-		if (!limask[x+rw] || !limask[x+1]) {
+		if (!limask[x + rw] || !limask[x + 1]) {
 			isz++;                               // increment inner edge size
-			lres[x]=4;                           // flag pixel as inner edge
+			lres[x] = 4;                         // flag pixel as inner edge
 		}
 		else {
-			res[x]=1.0f;                         // pixel is just part of inner mask, and it's not an edge
+			res[x] = 1.0f;                       // pixel is just part of inner mask, and it's not an edge
 		}
 	}
 	else if (lomask[x]) {                        // inner mask was empty, test if outer mask is filled
 		osz++;                                   // increment outer edge size
-		lres[x]=3;                               // flag pixel as outer edge
+		lres[x] = 3;                             // flag pixel as outer edge
 	}
 	/* lower right corner */
-	x=rw-1;
+	x = rw - 1;
 	// test if inner mask is filled
 	if (limask[x]) {
 		// test if inner mask is empty above or to the left
-		if (!limask[x+rw] || !limask[x-1]) {
+		if (!limask[x + rw] || !limask[x - 1]) {
 			isz++;                               // increment inner edge size
-			lres[x]=4;                           // flag pixel as inner edge
+			lres[x] = 4;                         // flag pixel as inner edge
 		}
 		else {
-			res[x]=1.0f;                         // pixel is just part of inner mask, and it's not an edge
+			res[x] = 1.0f;                       // pixel is just part of inner mask, and it's not an edge
 		}
 	}
 	else if (lomask[x]) {                        // inner mask was empty, test if outer mask is filled
 		osz++;                                   // increment outer edge size
-		lres[x]=3;                               // flag pixel as outer edge
+		lres[x] = 3;                             // flag pixel as outer edge
 	}
 	
 	/* Test the TOP row of pixels in buffer, except corners */
-	for (x = t-1; x>=(t-rw)+2; x--) {
+	for (x = t - 1; x >= (t - rw) + 2; x--) {
 		// test if inner mask is filled
 		if (limask[x]) {
 			// test if inner mask is empty to the left or to the right
-			if (!limask[x-1] || !limask[x+1]) {
+			if (!limask[x - 1] || !limask[x + 1]) {
 				isz++;                           // increment inner edge size
-				lres[x]=4;                       // flag pixel as inner edge
+				lres[x] = 4;                     // flag pixel as inner edge
 			}
 			else {
-				res[x]=1.0f;                     // pixel is just part of inner mask, and it's not an edge
+				res[x] = 1.0f;                   // pixel is just part of inner mask, and it's not an edge
 			}
 		}
-		else if (lomask[x]) {                   // inner mask was empty, test if outer mask is filled
+		else if (lomask[x]) {                    // inner mask was empty, test if outer mask is filled
 			osz++;                               // increment outer edge size
-			lres[x]=3;                           // flag pixel as outer edge
+			lres[x] = 3;                         // flag pixel as outer edge
 		}
 	}
 	
 	/* Test the BOTTOM row of pixels in buffer, except corners */
-	for (x = rw-2; x; x--) {
+	for (x = rw - 2; x; x--) {
 		// test if inner mask is filled
 		if (limask[x]) {
 			// test if inner mask is empty to the left or to the right
-			if (!limask[x-1] || !limask[x+1]) {
+			if (!limask[x - 1] || !limask[x + 1]) {
 				isz++;                           // increment inner edge size
-				lres[x]=4;                       // flag pixel as inner edge
+				lres[x] = 4;                     // flag pixel as inner edge
 			}
 			else {
-				res[x]=1.0f;                     // pixel is just part of inner mask, and it's not an edge
+				res[x] = 1.0f;                   // pixel is just part of inner mask, and it's not an edge
 			}
 		}
-		else if (lomask[x]) {                   // inner mask was empty, test if outer mask is filled
+		else if (lomask[x]) {                    // inner mask was empty, test if outer mask is filled
 			osz++;                               // increment outer edge size
-			lres[x]=3;                           // flag pixel as outer edge
+			lres[x] = 3;                         // flag pixel as outer edge
 		}
 	}
 	/* Test the LEFT edge of pixels in buffer, except corners */
-	for (x = t-(rw<<1)+1; x>=rw; x-=rw) {
+	for (x = t - (rw << 1) + 1; x >= rw; x -= rw) {
 		// test if inner mask is filled
 		if (limask[x]) {
 			// test if inner mask is empty underneath or above
-			if (!limask[x-rw] || !limask[x+rw]) {
+			if (!limask[x - rw] || !limask[x + rw]) {
 				isz++;                           // increment inner edge size
-				lres[x]=4;                       // flag pixel as inner edge
+				lres[x] = 4;                     // flag pixel as inner edge
 			}
 			else {
-				res[x]=1.0f;                     // pixel is just part of inner mask, and it's not an edge
+				res[x] = 1.0f;                   // pixel is just part of inner mask, and it's not an edge
 			}
 		}
-		else if (lomask[x]) {                   // inner mask was empty, test if outer mask is filled
+		else if (lomask[x]) {                    // inner mask was empty, test if outer mask is filled
 			osz++;                               // increment outer edge size
-			lres[x]=3;                           // flag pixel as outer edge
+			lres[x] = 3;                         // flag pixel as outer edge
 		}
 	}
 	
 	/* Test the RIGHT edge of pixels in buffer, except corners */
-	for (x = t-rw; x>rw; x-=rw) {
+	for (x = t - rw; x > rw; x -= rw) {
 		// test if inner mask is filled
 		if (limask[x]) {
 			// test if inner mask is empty underneath or above
-			if (!limask[x-rw] || !limask[x+rw]) {
+			if (!limask[x - rw] || !limask[x + rw]) {
 				isz++;                           // increment inner edge size
-				lres[x]=4;                       // flag pixel as inner edge
+				lres[x] = 4;                     // flag pixel as inner edge
 			}
 			else {
-				res[x]=1.0f;                     // pixel is just part of inner mask, and it's not an edge
+				res[x] = 1.0f;                   // pixel is just part of inner mask, and it's not an edge
 			}
 		}
-		else if (lomask[x]) {                   // inner mask was empty, test if outer mask is filled
+		else if (lomask[x]) {                    // inner mask was empty, test if outer mask is filled
 			osz++;                               // increment outer edge size
-			lres[x]=3;                           // flag pixel as outer edge
+			lres[x] = 3;                         // flag pixel as outer edge
 		}
 	}
 	
-	rsize[0]=isz;  // fill in our return sizes for edges + fill
-	rsize[1]=osz;
-	rsize[2]=gsz;
+	rsize[0] = isz;  // fill in our return sizes for edges + fill
+	rsize[1] = osz;
+	rsize[2] = gsz;
 }
 
 static void do_allBleedBorders(unsigned int t, unsigned int rw, unsigned int *limask, unsigned int *lomask, unsigned int *lres, float *res, unsigned int *rsize)
 {
 	int x;
-	unsigned int isz=0; // inner edge size
-	unsigned int osz=0; // outer edge size
-	unsigned int gsz=0; // gradient fill area size
+	unsigned int isz = 0; // inner edge size
+	unsigned int osz = 0; // outer edge size
+	unsigned int gsz = 0; // gradient fill area size
 	/* Test the four corners */
 	/* upper left corner */
-	x=t-rw+1;
+	x = t - rw + 1;
 	// test if inner mask is filled
 	if (limask[x]) {
 		// test if the inner mask is empty underneath or to the right
-		if (!limask[x-rw] || !limask[x+1]) {
+		if (!limask[x - rw] || !limask[x + 1]) {
 			isz++;                               // increment inner edge size
-			lres[x]=4;                           // flag pixel as inner edge
+			lres[x] = 4;                         // flag pixel as inner edge
 		}
 		else {
-			res[x]=1.0f;                         // pixel is just part of inner mask, and it's not an edge
+			res[x] = 1.0f;                       // pixel is just part of inner mask, and it's not an edge
 		}
 	}
 	else if (lomask[x]) {                        // inner mask was empty, test if outer mask is filled
-		if (!lomask[x-rw] || !lomask[x+1]) {      // test if outer mask is empty underneath or to the right
+		if (!lomask[x - rw] || !lomask[x + 1]) { // test if outer mask is empty underneath or to the right
 			osz++;                               // increment outer edge size
-			lres[x]=3;                           // flag pixel as outer edge
+			lres[x] = 3;                         // flag pixel as outer edge
 		}
 		else {
 			gsz++;                               // increment the gradient pixel count
-			lres[x]=2;                           // flag pixel as gradient
+			lres[x] = 2;                         // flag pixel as gradient
 		}
 	}
 	/* upper right corner */
-	x=t;
+	x = t;
 	// test if inner mask is filled
 	if (limask[x]) {
 		// test if the inner mask is empty underneath or to the left
-		if (!limask[x-rw] || !limask[x-1]) {
+		if (!limask[x - rw] || !limask[x - 1]) {
 			isz++;                               // increment inner edge size
-			lres[x]=4;                           // flag pixel as inner edge
+			lres[x] = 4;                         // flag pixel as inner edge
 		}
 		else {
-			res[x]=1.0f;                         // pixel is just part of inner mask, and it's not an edge
+			res[x] = 1.0f;                       // pixel is just part of inner mask, and it's not an edge
 		}
 	}
 	else if (lomask[x]) {                        // inner mask was empty, test if outer mask is filled
-		if (!lomask[x-rw] || !lomask[x-1]) {      // test if outer mask is empty above or to the left
+		if (!lomask[x - rw] || !lomask[x - 1]) { // test if outer mask is empty above or to the left
 			osz++;                               // increment outer edge size
-			lres[x]=3;                           // flag pixel as outer edge
+			lres[x] = 3;                           // flag pixel as outer edge
 		}
 		else {
 			gsz++;                               // increment the gradient pixel count
-			lres[x]=2;                           // flag pixel as gradient
+			lres[x] = 2;                         // flag pixel as gradient
 		}
 	}
 	/* lower left corner */
-	x=0;
+	x = 0;
 	// test if inner mask is filled
 	if (limask[x]) {
 		// test if inner mask is empty above or to the right
-		if (!limask[x+rw] || !limask[x+1]) {
+		if (!limask[x + rw] || !limask[x + 1]) {
 			isz++;                               // increment inner edge size
-			lres[x]=4;                           // flag pixel as inner edge
+			lres[x] = 4;                         // flag pixel as inner edge
 		}
 		else {
-			res[x]=1.0f;                         // pixel is just part of inner mask, and it's not an edge
+			res[x] = 1.0f;                       // pixel is just part of inner mask, and it's not an edge
 		}
 	}
 	else if (lomask[x]) {                        // inner mask was empty, test if outer mask is filled
-		if (!lomask[x+rw] || !lomask[x+1]) {      // test if outer mask is empty underneath or to the right
+		if (!lomask[x + rw] || !lomask[x + 1]) { // test if outer mask is empty underneath or to the right
 			osz++;                               // increment outer edge size
-			lres[x]=3;                           // flag pixel as outer edge
+			lres[x] = 3;                         // flag pixel as outer edge
 		}
 		else {
 			gsz++;                               // increment the gradient pixel count
-			lres[x]=2;                           // flag pixel as gradient
+			lres[x] = 2;                         // flag pixel as gradient
 		}
 	}
 	/* lower right corner */
-	x=rw-1;
+	x = rw - 1;
 	// test if inner mask is filled
 	if (limask[x]) {
 		// test if inner mask is empty above or to the left
-		if (!limask[x+rw] || !limask[x-1]) {
+		if (!limask[x + rw] || !limask[x - 1]) {
 			isz++;                               // increment inner edge size
-			lres[x]=4;                           // flag pixel as inner edge
+			lres[x] = 4;                         // flag pixel as inner edge
 		}
 		else {
-			res[x]=1.0f;                         // pixel is just part of inner mask, and it's not an edge
+			res[x] = 1.0f;                       // pixel is just part of inner mask, and it's not an edge
 		}
 	}
 	else if (lomask[x]) {                        // inner mask was empty, test if outer mask is filled
-		if (!lomask[x+rw] || !lomask[x-1]) {      // test if outer mask is empty underneath or to the left
+		if (!lomask[x + rw] || !lomask[x - 1]) { // test if outer mask is empty underneath or to the left
 			osz++;                               // increment outer edge size
-			lres[x]=3;                           // flag pixel as outer edge
+			lres[x] = 3;                         // flag pixel as outer edge
 		}
 		else {
 			gsz++;                               // increment the gradient pixel count
-			lres[x]=2;                           // flag pixel as gradient
+			lres[x] = 2;                         // flag pixel as gradient
 		}
 	}
 	/* Test the TOP row of pixels in buffer, except corners */
-	for (x = t-1; x>=(t-rw)+2; x--) {
+	for (x = t - 1; x >= (t - rw) + 2; x--) {
 		// test if inner mask is filled
 		if (limask[x]) {
 			// test if inner mask is empty to the left or to the right
-			if (!limask[x-1] || !limask[x+1]) {
+			if (!limask[x - 1] || !limask[x + 1]) {
 				isz++;                           // increment inner edge size
-				lres[x]=4;                       // flag pixel as inner edge
+				lres[x] = 4;                     // flag pixel as inner edge
 			}
 			else {
-				res[x]=1.0f;                     // pixel is just part of inner mask, and it's not an edge
+				res[x] = 1.0f;                   // pixel is just part of inner mask, and it's not an edge
 			}
 		}
-		else if (lomask[x]) {                   // inner mask was empty, test if outer mask is filled
-			if (!lomask[x-1] || !lomask[x+1]) {   // test if outer mask is empty to the left or to the right
+		else if (lomask[x]) {                    // inner mask was empty, test if outer mask is filled
+			if (!lomask[x - 1] || !lomask[x + 1]) { // test if outer mask is empty to the left or to the right
 				osz++;                           // increment outer edge size
-				lres[x]=3;                       // flag pixel as outer edge
+				lres[x] = 3;                     // flag pixel as outer edge
 			}
 			else {
 				gsz++;                           // increment the gradient pixel count
-				lres[x]=2;                       // flag pixel as gradient
+				lres[x] = 2;                     // flag pixel as gradient
 			}
 		}
 	}
 	
 	/* Test the BOTTOM row of pixels in buffer, except corners */
-	for (x = rw-2; x; x--) {
+	for (x = rw - 2; x; x--) {
 		// test if inner mask is filled
 		if (limask[x]) {
 			// test if inner mask is empty to the left or to the right
-			if (!limask[x-1] || !limask[x+1]) {
+			if (!limask[x - 1] || !limask[x + 1]) {
 				isz++;                           // increment inner edge size
-				lres[x]=4;                       // flag pixel as inner edge
+				lres[x] = 4;                     // flag pixel as inner edge
 			}
 			else {
-				res[x]=1.0f;                     // pixel is just part of inner mask, and it's not an edge
+				res[x] = 1.0f;                   // pixel is just part of inner mask, and it's not an edge
 			}
 		}
-		else if (lomask[x]) {                   // inner mask was empty, test if outer mask is filled
-			if (!lomask[x-1] || !lomask[x+1]) {   // test if outer mask is empty to the left or to the right
+		else if (lomask[x]) {                    // inner mask was empty, test if outer mask is filled
+			if (!lomask[x - 1] || !lomask[x + 1]) {   // test if outer mask is empty to the left or to the right
 				osz++;                           // increment outer edge size
-				lres[x]=3;                       // flag pixel as outer edge
+				lres[x] = 3;                     // flag pixel as outer edge
 			}
 			else {
 				gsz++;                           // increment the gradient pixel count
-				lres[x]=2;                       // flag pixel as gradient
+				lres[x] = 2;                     // flag pixel as gradient
 			}
 		}
 	}
 	/* Test the LEFT edge of pixels in buffer, except corners */
-	for (x = t-(rw<<1)+1; x>=rw; x-=rw) {
+	for (x = t - (rw << 1) + 1; x >= rw; x -= rw) {
 		// test if inner mask is filled
 		if (limask[x]) {
 			// test if inner mask is empty underneath or above
-			if (!limask[x-rw] || !limask[x+rw]) {
+			if (!limask[x - rw] || !limask[x + rw]) {
 				isz++;                           // increment inner edge size
-				lres[x]=4;                       // flag pixel as inner edge
+				lres[x] = 4;                     // flag pixel as inner edge
 			}
 			else {
-				res[x]=1.0f;                     // pixel is just part of inner mask, and it's not an edge
+				res[x] = 1.0f;                   // pixel is just part of inner mask, and it's not an edge
 			}
 		}
 		else if (lomask[x]) {                   // inner mask was empty, test if outer mask is filled
-			if (!lomask[x-rw] || !lomask[x+rw]) { // test if outer mask is empty underneath or above
+			if (!lomask[x - rw] || !lomask[x + rw]) { // test if outer mask is empty underneath or above
 				osz++;                           // increment outer edge size
-				lres[x]=3;                       // flag pixel as outer edge
+				lres[x] = 3;                     // flag pixel as outer edge
 			}
 			else {
 				gsz++;                           // increment the gradient pixel count
-				lres[x]=2;                       // flag pixel as gradient
+				lres[x] = 2;                     // flag pixel as gradient
 			}
 		}
 	}
 	
 	/* Test the RIGHT edge of pixels in buffer, except corners */
-	for (x = t-rw; x>rw; x-=rw) {
+	for (x = t - rw; x > rw; x -= rw) {
 		// test if inner mask is filled
 		if (limask[x]) {
 			// test if inner mask is empty underneath or above
-			if (!limask[x-rw] || !limask[x+rw]) {
+			if (!limask[x - rw] || !limask[x + rw]) {
 				isz++;                           // increment inner edge size
-				lres[x]=4;                       // flag pixel as inner edge
+				lres[x] = 4;                     // flag pixel as inner edge
 			}
 			else {
-				res[x]=1.0f;                     // pixel is just part of inner mask, and it's not an edge
+				res[x] = 1.0f;                   // pixel is just part of inner mask, and it's not an edge
 			}
 		}
-		else if (lomask[x]) {                   // inner mask was empty, test if outer mask is filled
-			if (!lomask[x-rw] || !lomask[x+rw]) { // test if outer mask is empty underneath or above
+		else if (lomask[x]) {                    // inner mask was empty, test if outer mask is filled
+			if (!lomask[x - rw] || !lomask[x + rw]) { // test if outer mask is empty underneath or above
 				osz++;                           // increment outer edge size
-				lres[x]=3;                       // flag pixel as outer edge
+				lres[x] = 3;                     // flag pixel as outer edge
 			}
 			else {
 				gsz++;                           // increment the gradient pixel count
-				lres[x]=2;                       // flag pixel as gradient
+				lres[x] = 2;                     // flag pixel as gradient
 			}
 		}
 	}
 	
-	rsize[0]=isz;  // fill in our return sizes for edges + fill
-	rsize[1]=osz;
-	rsize[2]=gsz;
+	rsize[0] = isz;  // fill in our return sizes for edges + fill
+	rsize[1] = osz;
+	rsize[2] = gsz;
 }
 
 static void do_allEdgeDetection(unsigned int t, unsigned int rw, unsigned int *limask, unsigned int *lomask, unsigned int *lres, float *res, unsigned int *rsize, unsigned int in_isz, unsigned int in_osz, unsigned int in_gsz)
@@ -770,43 +771,43 @@ static void do_allEdgeDetection(unsigned int t, unsigned int rw, unsigned int *l
 	int pix_prevCol;                   // pix_prevCol = pixel one column behind the one we are testing in a loop
 	int pix_nextCol;                   // pix_nextCol = pixel one column in front of the one we are testing in a loop
 	/* Test all rows between the FIRST and LAST rows, excluding left and right edges */
-	for (x = (t-rw)+1, dx=x-(rw-2); dx>rw; x-=rw,dx-=rw) {
-		a=x-2;
-		pix_prevRow=a+rw;
-		pix_nextRow=a-rw;
-		pix_prevCol=a+1;
-		pix_nextCol=a-1;
-		while (a>dx-2) {
+	for (x = (t - rw) + 1, dx = x - (rw - 2); dx > rw; x -= rw, dx -= rw) {
+		a = x - 2;
+		pix_prevRow = a + rw;
+		pix_nextRow = a - rw;
+		pix_prevCol = a + 1;
+		pix_nextCol = a - 1;
+		while (a > dx - 2) {
 			if (!limask[a]) {             // if the inner mask is empty
 				if (lomask[a]) {          // if the outer mask is full
 					/*
-	   Next we test all 4 directions around the current pixel: next/prev/up/down
-	   The test ensures that the outer mask is empty and that the inner mask
-	   is also empty. If both conditions are true for any one of the 4 adjacent pixels
-	   then the current pixel is counted as being a true outer edge pixel.
-	  */
+					   Next we test all 4 directions around the current pixel: next/prev/up/down
+					   The test ensures that the outer mask is empty and that the inner mask
+					   is also empty. If both conditions are true for any one of the 4 adjacent pixels
+					   then the current pixel is counted as being a true outer edge pixel.
+					 */
 					if ((!lomask[pix_nextCol] && !limask[pix_nextCol]) ||
 					    (!lomask[pix_prevCol] && !limask[pix_prevCol]) ||
 					    (!lomask[pix_nextRow] && !limask[pix_nextRow]) ||
 					    (!lomask[pix_prevRow] && !limask[pix_prevRow]))
 					{
-						in_osz++;           // increment the outer boundary pixel count
-						lres[a]=3;       // flag pixel as part of outer edge
+						in_osz++;                // increment the outer boundary pixel count
+						lres[a] = 3;             // flag pixel as part of outer edge
 					}
-					else {             // it's not a boundary pixel, but it is a gradient pixel
-						in_gsz++;           // increment the gradient pixel count
-						lres[a]=2;       // flag pixel as gradient
+					else {                       // it's not a boundary pixel, but it is a gradient pixel
+						in_gsz++;                // increment the gradient pixel count
+						lres[a] = 2;             // flag pixel as gradient
 					}
 				}
 				
 			}
 			else {
 				if (!limask[pix_nextCol] || !limask[pix_prevCol] || !limask[pix_nextRow] || !limask[pix_prevRow]) {
-					in_isz++;               // increment the inner boundary pixel count
-					lres[a]=4;           // flag pixel as part of inner edge
+					in_isz++;                    // increment the inner boundary pixel count
+					lres[a] = 4;                 // flag pixel as part of inner edge
 				}
 				else {
-					res[a]=1.0f;         // pixel is part of inner mask, but not at an edge
+					res[a] = 1.0f;               // pixel is part of inner mask, but not at an edge
 				}
 			}
 			a--;
@@ -817,9 +818,9 @@ static void do_allEdgeDetection(unsigned int t, unsigned int rw, unsigned int *l
 		}
 	}
 	
-	rsize[0]=in_isz;  // fill in our return sizes for edges + fill
-	rsize[1]=in_osz;
-	rsize[2]=in_gsz;
+	rsize[0] = in_isz;  // fill in our return sizes for edges + fill
+	rsize[1] = in_osz;
+	rsize[2] = in_gsz;
 }
 
 static void do_adjacentEdgeDetection(unsigned int t, unsigned int rw, unsigned int *limask, unsigned int *lomask, unsigned int *lres, float *res, unsigned int *rsize, unsigned int in_isz, unsigned int in_osz, unsigned int in_gsz)
@@ -832,32 +833,32 @@ static void do_adjacentEdgeDetection(unsigned int t, unsigned int rw, unsigned i
 	int pix_prevCol;                   // pix_prevCol = pixel one column behind the one we are testing in a loop
 	int pix_nextCol;                   // pix_nextCol = pixel one column in front of the one we are testing in a loop
 	/* Test all rows between the FIRST and LAST rows, excluding left and right edges */
-	for (x = (t-rw)+1, dx=x-(rw-2); dx>rw; x-=rw,dx-=rw) {
-		a=x-2;
-		pix_prevRow=a+rw;
-		pix_nextRow=a-rw;
-		pix_prevCol=a+1;
-		pix_nextCol=a-1;
-		while (a>dx-2) {
-			if (!limask[a]) {             // if the inner mask is empty
-				if (lomask[a]) {          // if the outer mask is full
+	for (x = (t - rw) + 1, dx = x - (rw - 2); dx > rw; x -= rw, dx -= rw) {
+		a = x - 2;
+		pix_prevRow = a + rw;
+		pix_nextRow = a - rw;
+		pix_prevCol = a + 1;
+		pix_nextCol = a - 1;
+		while (a > dx - 2) {
+			if (!limask[a]) {                    // if the inner mask is empty
+				if (lomask[a]) {                 // if the outer mask is full
 					/*
-	   Next we test all 4 directions around the current pixel: next/prev/up/down
-	   The test ensures that the outer mask is empty and that the inner mask
-	   is also empty. If both conditions are true for any one of the 4 adjacent pixels
-	   then the current pixel is counted as being a true outer edge pixel.
-	  */
+					   Next we test all 4 directions around the current pixel: next/prev/up/down
+					   The test ensures that the outer mask is empty and that the inner mask
+					   is also empty. If both conditions are true for any one of the 4 adjacent pixels
+					   then the current pixel is counted as being a true outer edge pixel.
+					 */
 					if ((!lomask[pix_nextCol] && !limask[pix_nextCol]) ||
 					    (!lomask[pix_prevCol] && !limask[pix_prevCol]) ||
 					    (!lomask[pix_nextRow] && !limask[pix_nextRow]) ||
 					    (!lomask[pix_prevRow] && !limask[pix_prevRow]))
 					{
-						in_osz++;           // increment the outer boundary pixel count
-						lres[a]=3;       // flag pixel as part of outer edge
+						in_osz++;                // increment the outer boundary pixel count
+						lres[a] = 3;             // flag pixel as part of outer edge
 					}
-					else {             // it's not a boundary pixel, but it is a gradient pixel
-						in_gsz++;           // increment the gradient pixel count
-						lres[a]=2;       // flag pixel as gradient
+					else {                       // it's not a boundary pixel, but it is a gradient pixel
+						in_gsz++;                // increment the gradient pixel count
+						lres[a] = 2;             // flag pixel as gradient
 					}
 				}
 				
@@ -868,24 +869,24 @@ static void do_adjacentEdgeDetection(unsigned int t, unsigned int rw, unsigned i
 				    (!limask[pix_nextRow] && lomask[pix_nextRow]) ||
 				    (!limask[pix_prevRow] && lomask[pix_prevRow]))
 				{
-					in_isz++;               // increment the inner boundary pixel count
-					lres[a]=4;           // flag pixel as part of inner edge
+					in_isz++;                    // increment the inner boundary pixel count
+					lres[a] = 4;                 // flag pixel as part of inner edge
 				}
 				else {
-					res[a]=1.0f;         // pixel is part of inner mask, but not at an edge
+					res[a] = 1.0f;               // pixel is part of inner mask, but not at an edge
 				}
 			}
 			a--;
-			pix_prevRow--;              // advance all four "surrounding" pixel pointers
+			pix_prevRow--;                       // advance all four "surrounding" pixel pointers
 			pix_nextRow--;
 			pix_prevCol--;
 			pix_nextCol--;
 		}
 	}
 	
-	rsize[0]=in_isz;  // fill in our return sizes for edges + fill
-	rsize[1]=in_osz;
-	rsize[2]=in_gsz;
+	rsize[0] = in_isz;  // fill in our return sizes for edges + fill
+	rsize[1] = in_osz;
+	rsize[2] = in_gsz;
 }
 
 static void do_createEdgeLocationBuffer(unsigned int t, unsigned int rw, unsigned int *lres, float *res, unsigned short *gbuf, unsigned int *innerEdgeOffset, unsigned int *outerEdgeOffset, unsigned int isz, unsigned int gsz)
@@ -897,102 +898,102 @@ static void do_createEdgeLocationBuffer(unsigned int t, unsigned int rw, unsigne
 	
 	unsigned int rsl;                  // long used for finding fast 1.0/sqrt
 	unsigned int gradientFillOffset;
-	unsigned int innerAccum=0;         // for looping inner edge pixel indexes, represents current position from offset
-	unsigned int outerAccum=0;         // for looping outer edge pixel indexes, represents current position from offset
-	unsigned int gradientAccum=0;      // for looping gradient pixel indexes, represents current position from offset
+	unsigned int innerAccum = 0;       // for looping inner edge pixel indexes, represents current position from offset
+	unsigned int outerAccum = 0;       // for looping outer edge pixel indexes, represents current position from offset
+	unsigned int gradientAccum = 0;    // for looping gradient pixel indexes, represents current position from offset
 	/*
- Here we compute the size of buffer needed to hold (row,col) coordinates
- for each pixel previously determined to be either gradient, inner edge,
- or outer edge.
- 
- Allocation is done by requesting 4 bytes "sizeof(int)" per pixel, even
- though gbuf[] is declared as unsigned short* (2 bytes) because we don't
- store the pixel indexes, we only store x,y location of pixel in buffer.
- 
- This does make the assumption that x and y can fit in 16 unsigned bits
- so if Blender starts doing renders greater than 65536 in either direction
- this will need to allocate gbuf[] as unsigned int *and allocate 8 bytes
- per flagged pixel.
- 
- In general, the buffer on-screen:
- 
- Example:  9 by 9 pixel block
- 
- . = pixel non-white in both outer and inner mask
- o = pixel white in outer, but not inner mask, adjacent to "." pixel
- g = pixel white in outer, but not inner mask, not adjacent to "." pixel
- i = pixel white in inner mask, adjacent to "g" or "." pixel
- F = pixel white in inner mask, only adjacent to other pixels white in the inner mask
- 
- 
-	  .........   <----- pixel #80
-	  ..oooo...
-	  .oggggo..
-	  .oggiggo.
-	  .ogiFigo.
-	  .oggiggo.
-	  .oggggo..
-	  ..oooo...
- pixel #00 -----> .........
- 
- gsz = 18   (18 "g" pixels above)
- isz = 4    (4 "i" pixels above)
- osz = 18   (18 "o" pixels above)
- 
- 
- The memory in gbuf[] after filling will look like this:
- 
-  gradientFillOffset (0 pixels)                   innerEdgeOffset (18 pixels)    outerEdgeOffset (22 pixels)
- /                                               /                              /
- /                                               /                              /
- |X   Y   X   Y   X   Y   X   Y   >     <X   Y   X   Y   >     <X   Y   X   Y   X   Y   >     <X   Y   X   Y   | <- (x,y)
- +-------------------------------->     <---------------->     <------------------------>     <----------------+
- |0   2   4   6   8   10  12  14  > ... <68  70  72  74  > ... <80  82  84  86  88  90  > ... <152 154 156 158 | <- bytes
- +-------------------------------->     <---------------->     <------------------------>     <----------------+
- |g0  g0  g1  g1  g2  g2  g3  g3  >     <g17 g17 i0  i0  >     <i2  i2  i3  i3  o0  o0  >     <o16 o16 o17 o17 | <- pixel
-			 /                              /                              /
-			/                              /                              /
-			  /                              /                              /
-   +---------- gradientAccum (18) ---------+      +--- innerAccum (22) ---+      +--- outerAccum (40) ---+
-   
-   
- Ultimately we do need the pixel's memory buffer index to set the output
- pixel color, but it's faster to reconstruct the memory buffer location
- each iteration of the final gradient calculation than it is to deconstruct
- a memory location into x,y pairs each round.
-*/
-	
-	
-	gradientFillOffset=0;                              // since there are likely "more" of these, put it first. :)
-	*innerEdgeOffset=gradientFillOffset+gsz;           // set start of inner edge indexes
-	*outerEdgeOffset=(*innerEdgeOffset)+isz;           // set start of outer edge indexes
+	   Here we compute the size of buffer needed to hold (row,col) coordinates
+	   for each pixel previously determined to be either gradient, inner edge,
+	   or outer edge.
+
+	   Allocation is done by requesting 4 bytes "sizeof(int)" per pixel, even
+	   though gbuf[] is declared as unsigned short* (2 bytes) because we don't
+	   store the pixel indexes, we only store x,y location of pixel in buffer.
+
+	   This does make the assumption that x and y can fit in 16 unsigned bits
+	   so if Blender starts doing renders greater than 65536 in either direction
+	   this will need to allocate gbuf[] as unsigned int *and allocate 8 bytes
+	   per flagged pixel.
+
+	   In general, the buffer on-screen:
+
+	   Example:  9 by 9 pixel block
+
+	   . = pixel non-white in both outer and inner mask
+	   o = pixel white in outer, but not inner mask, adjacent to "." pixel
+	   g = pixel white in outer, but not inner mask, not adjacent to "." pixel
+	   i = pixel white in inner mask, adjacent to "g" or "." pixel
+	   F = pixel white in inner mask, only adjacent to other pixels white in the inner mask
+
+
+	   .........   <----- pixel #80
+	   ..oooo...
+	   .oggggo..
+	   .oggiggo.
+	   .ogiFigo.
+	   .oggiggo.
+	   .oggggo..
+	   ..oooo...
+	   pixel #00 -----> .........
+
+	   gsz = 18   (18 "g" pixels above)
+	   isz = 4    (4 "i" pixels above)
+	   osz = 18   (18 "o" pixels above)
+
+
+	   The memory in gbuf[] after filling will look like this:
+
+	   gradientFillOffset (0 pixels)                   innerEdgeOffset (18 pixels)    outerEdgeOffset (22 pixels)
+	   /                                               /                              /
+	   /                                               /                              /
+	   |X   Y   X   Y   X   Y   X   Y   >     <X   Y   X   Y   >     <X   Y   X   Y   X   Y   >     <X   Y   X   Y   | <- (x,y)
+	   +-------------------------------->     <---------------->     <------------------------>     <----------------+
+	   |0   2   4   6   8   10  12  14  > ... <68  70  72  74  > ... <80  82  84  86  88  90  > ... <152 154 156 158 | <- bytes
+	   +-------------------------------->     <---------------->     <------------------------>     <----------------+
+	   |g0  g0  g1  g1  g2  g2  g3  g3  >     <g17 g17 i0  i0  >     <i2  i2  i3  i3  o0  o0  >     <o16 o16 o17 o17 | <- pixel
+	         /                              /                              /
+	        /                              /                              /
+	          /                              /                              /
+	   +---------- gradientAccum (18) ---------+      +--- innerAccum (22) ---+      +--- outerAccum (40) ---+
+
+
+	   Ultimately we do need the pixel's memory buffer index to set the output
+	   pixel color, but it's faster to reconstruct the memory buffer location
+	   each iteration of the final gradient calculation than it is to deconstruct
+	   a memory location into x,y pairs each round.
+	 */
+
+
+	gradientFillOffset = 0;                            // since there are likely "more" of these, put it first. :)
+	*innerEdgeOffset = gradientFillOffset + gsz;       // set start of inner edge indexes
+	*outerEdgeOffset = (*innerEdgeOffset) + isz;       // set start of outer edge indexes
 	/* set the accumulators to correct positions */    // set up some accumulator variables for loops
 	gradientAccum = gradientFillOffset;                // each accumulator variable starts at its respective
 	innerAccum = *innerEdgeOffset;                     // section's offset so when we start filling, each
 	outerAccum = *outerEdgeOffset;                     // section fills up it's allocated space in gbuf
 	//uses dmin=row, rsl=col
-	for (x=0,dmin=0; x<t; x+=rw,dmin++) {
-		for (rsl=0; rsl<rw; rsl++) {
-			a=x+rsl;
-			if (lres[a]==2) {           // it is a gradient pixel flagged by 2
-				ud=gradientAccum<<1;   // double the index to reach correct unsigned short location
-				gbuf[ud]=dmin;         // insert pixel's row into gradient pixel location buffer
-				gbuf[ud+1]=rsl;        // insert pixel's column into gradient pixel location buffer
-				gradientAccum++;       // increment gradient index buffer pointer
+	for (x = 0, dmin = 0; x < t; x += rw, dmin++) {
+		for (rsl = 0; rsl < rw; rsl++) {
+			a = x + rsl;
+			if (lres[a] == 2) {                  // it is a gradient pixel flagged by 2
+				ud = gradientAccum << 1;         // double the index to reach correct unsigned short location
+				gbuf[ud] = dmin;                 // insert pixel's row into gradient pixel location buffer
+				gbuf[ud + 1] = rsl;              // insert pixel's column into gradient pixel location buffer
+				gradientAccum++;                 // increment gradient index buffer pointer
 			}
-			else if (lres[a]==3) {    // it is an outer edge pixel flagged by 3
-				ud=outerAccum<<1;      // double the index to reach correct unsigned short location
-				gbuf[ud]=dmin;         // insert pixel's row into outer edge pixel location buffer
-				gbuf[ud+1]=rsl;        // insert pixel's column into outer edge pixel location buffer
-				outerAccum++;          // increment outer edge index buffer pointer
-				res[a]=0.0f;           // set output pixel intensity now since it won't change later
+			else if (lres[a] == 3) {             // it is an outer edge pixel flagged by 3
+				ud = outerAccum << 1;            // double the index to reach correct unsigned short location
+				gbuf[ud] = dmin;                 // insert pixel's row into outer edge pixel location buffer
+				gbuf[ud + 1] = rsl;              // insert pixel's column into outer edge pixel location buffer
+				outerAccum++;                    // increment outer edge index buffer pointer
+				res[a] = 0.0f;                   // set output pixel intensity now since it won't change later
 			}
-			else if (lres[a]==4) {    // it is an inner edge pixel flagged by 4
-				ud=innerAccum<<1;      // double int index to reach correct unsigned short location
-				gbuf[ud]=dmin;         // insert pixel's row into inner edge pixel location buffer
-				gbuf[ud+1]=rsl;        // insert pixel's column into inner edge pixel location buffer
-				innerAccum++;          // increment inner edge index buffer pointer
-				res[a]=1.0f;           // set output pixel intensity now since it won't change later
+			else if (lres[a] == 4) {             // it is an inner edge pixel flagged by 4
+				ud = innerAccum << 1;            // double int index to reach correct unsigned short location
+				gbuf[ud] = dmin;                 // insert pixel's row into inner edge pixel location buffer
+				gbuf[ud + 1] = rsl;              // insert pixel's column into inner edge pixel location buffer
+				innerAccum++;                    // increment inner edge index buffer pointer
+				res[a] = 1.0f;                   // set output pixel intensity now since it won't change later
 			}
 		}
 	}
@@ -1018,111 +1019,111 @@ static void do_fillGradientBuffer(unsigned int rw, float *res, unsigned short *g
 	int dy;                            // dy = Y-delta (used for distance proportion calculation)
 	
 	/*
-  The general algorithm used to color each gradient pixel is:
-  
-  1.) Loop through all gradient pixels.
-  A.) For each gradient pixel:
-   a.) Loop though all outside edge pixels, looking for closest one
-	to the gradient pixel we are in.
-   b.) Loop through all inside edge pixels, looking for closest one
-	to the gradient pixel we are in.
-   c.) Find proportion of distance from gradient pixel to inside edge
-	pixel compared to sum of distance to inside edge and distance to
-	outside edge.
-	
-	In an image where:
-	. = blank (black) pixels, not covered by inner mask or outer mask
-	+ = desired gradient pixels, covered only by outer mask
-	* = white full mask pixels, covered by at least inner mask
-	
-	...............................
-	...............+++++++++++.....
-	...+O++++++..++++++++++++++....
-	..+++\++++++++++++++++++++.....
-	.+++++G+++++++++*******+++.....
-	.+++++|+++++++*********+++.....
-	.++***I****************+++.....
-	.++*******************+++......
-	.+++*****************+++.......
-	..+++***************+++........
-	....+++**********+++...........
-	......++++++++++++.............
-	...............................
-	
-	 O = outside edge pixel
-	  \
-	   G = gradient pixel
-	   |
-	   I = inside edge pixel
-	   
-		 __
-	   *note that IO does not need to be a straight line, in fact
-		many cases can arise where straight lines do not work
-		correctly.
-		
-		   __       __     __
-   d.) Pixel color is assigned as |GO| / ( |GI| + |GO| )
-   
-  The implementation does not compute distance, but the reciprocal of the
-  distance. This is done to avoid having to compute a square root, as a
-  reciprocal square root can be computed faster. Therefore, the code computes
-  pixel color as |GI| / (|GI| + |GO|). Since these are reciprocals, GI serves the
-  purpose of GO for the proportion calculation.
-  
-  For the purposes of the minimun distance comparisons, we only check
-  the sums-of-squares against eachother, since they are in the same
-  mathematical sort-order as if we did go ahead and take square roots
-  
-  Loop through all gradient pixels.
-  */
-	
-	for (x = gsz-1; x>=0; x--) {
-		gradientFillOffset=x<<1;
-		t=gbuf[gradientFillOffset];         // calculate column of pixel indexed by gbuf[x]
-		fsz=gbuf[gradientFillOffset+1];     // calculate row of pixel indexed by gbuf[x]
-		dmin=0xffffffff;                    // reset min distance to edge pixel
-		for (a=outerEdgeOffset+osz-1; a>=outerEdgeOffset; a--) {   // loop through all outer edge buffer pixels
-			ud=a<<1;
-			dy=t-gbuf[ud];                  // set dx to gradient pixel column - outer edge pixel row
-			dx=fsz-gbuf[ud+1];              // set dy to gradient pixel row - outer edge pixel column
-			ud=dx*dx+dy*dy;                 // compute sum of squares
-			if (ud<dmin) {                   // if our new sum of squares is less than the current minimum
-				dmin=ud;                    // set a new minimum equal to the new lower value
+	 * The general algorithm used to color each gradient pixel is:
+	 *
+	 * 1.) Loop through all gradient pixels.
+	 * A.) For each gradient pixel:
+	 * a.) Loop though all outside edge pixels, looking for closest one
+	 * to the gradient pixel we are in.
+	 * b.) Loop through all inside edge pixels, looking for closest one
+	 * to the gradient pixel we are in.
+	 * c.) Find proportion of distance from gradient pixel to inside edge
+	 * pixel compared to sum of distance to inside edge and distance to
+	 * outside edge.
+	 *
+	 * In an image where:
+	 * . = blank (black) pixels, not covered by inner mask or outer mask
+	 * + = desired gradient pixels, covered only by outer mask
+	 * * = white full mask pixels, covered by at least inner mask
+	 *
+	 * ...............................
+	 * ...............+++++++++++.....
+	 * ...+O++++++..++++++++++++++....
+	 * ..+++\++++++++++++++++++++.....
+	 * .+++++G+++++++++*******+++.....
+	 * .+++++|+++++++*********+++.....
+	 * .++***I****************+++.....
+	 * .++*******************+++......
+	 * .+++*****************+++.......
+	 * ..+++***************+++........
+	 * ....+++**********+++...........
+	 * ......++++++++++++.............
+	 * ...............................
+	 *
+	 * O = outside edge pixel
+	 * \
+	 *  G = gradient pixel
+	 *  |
+	 *  I = inside edge pixel
+	 * 
+	 *   __
+	 *  *note that IO does not need to be a straight line, in fact
+	 *  many cases can arise where straight lines do not work
+	 *  correctly.
+	 *
+	 *     __       __     __
+	 * d.) Pixel color is assigned as |GO| / ( |GI| + |GO| )
+	 *
+	 * The implementation does not compute distance, but the reciprocal of the
+	 * distance. This is done to avoid having to compute a square root, as a
+	 * reciprocal square root can be computed faster. Therefore, the code computes
+	 * pixel color as |GI| / (|GI| + |GO|). Since these are reciprocals, GI serves the
+	 * purpose of GO for the proportion calculation.
+	 *
+	 * For the purposes of the minimun distance comparisons, we only check
+	 * the sums-of-squares against eachother, since they are in the same
+	 * mathematical sort-order as if we did go ahead and take square roots
+	 *
+	 * Loop through all gradient pixels.
+	 */
+
+	for (x = gsz - 1; x >= 0; x--) {
+		gradientFillOffset = x << 1;
+		t = gbuf[gradientFillOffset];            // calculate column of pixel indexed by gbuf[x]
+		fsz = gbuf[gradientFillOffset + 1];      // calculate row of pixel indexed by gbuf[x]
+		dmin = 0xffffffff;                       // reset min distance to edge pixel
+		for (a = outerEdgeOffset + osz - 1; a >= outerEdgeOffset; a--) {   // loop through all outer edge buffer pixels
+			ud = a << 1;
+			dy = t - gbuf[ud];                   // set dx to gradient pixel column - outer edge pixel row
+			dx = fsz - gbuf[ud + 1];             // set dy to gradient pixel row - outer edge pixel column
+			ud = dx * dx + dy * dy;              // compute sum of squares
+			if (ud < dmin) {                     // if our new sum of squares is less than the current minimum
+				dmin = ud;                       // set a new minimum equal to the new lower value
 			}
 		}
-		odist=(float)(dmin);                     // cast outer min to a float
-		rsf=odist*0.5f;                          //
-		rsl=*(unsigned int*)&odist;              // use some peculiar properties of the way bits are stored
-		rsl=0x5f3759df-(rsl>>1);                 // in floats vs. unsigned ints to compute an approximate
-		odist=*(float*)&rsl;                     // reciprocal square root
-		odist=odist*(rsopf-(rsf*odist*odist));   // -- ** this line can be iterated for more accuracy ** --
-		dmin=0xffffffff;                         // reset min distance to edge pixel
-		for (a = innerEdgeOffset+isz-1; a>=innerEdgeOffset; a--) {   // loop through all inside edge pixels
-			ud=a<<1;
-			dy=t-gbuf[ud];         // compute delta in Y from gradient pixel to inside edge pixel
-			dx=fsz-gbuf[ud+1];     // compute delta in X from gradient pixel to inside edge pixel
-			ud=dx*dx+dy*dy;        // compute sum of squares
-			if (ud<dmin) {          // if our new sum of squares is less than the current minimum we've found
-				dmin=ud;           // set a new minimum equal to the new lower value
+		odist = (float)(dmin);                   // cast outer min to a float
+		rsf = odist * 0.5f;                      //
+		rsl = *(unsigned int *)&odist;           // use some peculiar properties of the way bits are stored
+		rsl = 0x5f3759df - (rsl >> 1);           // in floats vs. unsigned ints to compute an approximate
+		odist = *(float *)&rsl;                  // reciprocal square root
+		odist = odist * (rsopf - (rsf * odist * odist));   // -- ** this line can be iterated for more accuracy ** --
+		dmin = 0xffffffff;                       // reset min distance to edge pixel
+		for (a = innerEdgeOffset + isz - 1; a >= innerEdgeOffset; a--) {   // loop through all inside edge pixels
+			ud = a << 1;
+			dy = t - gbuf[ud];         // compute delta in Y from gradient pixel to inside edge pixel
+			dx = fsz - gbuf[ud + 1];     // compute delta in X from gradient pixel to inside edge pixel
+			ud = dx * dx + dy * dy;        // compute sum of squares
+			if (ud < dmin) {          // if our new sum of squares is less than the current minimum we've found
+				dmin = ud;           // set a new minimum equal to the new lower value
 			}
 		}
-		idist=(float)(dmin);                     // cast inner min to a float
-		rsf=idist*0.5f;                          //
-		rsl=*(unsigned int*)&idist;              //
-		rsl=0x5f3759df-(rsl>>1);                 // see notes above
-		idist=*(float*)&rsl;                     //
-		idist=idist*(rsopf-(rsf*idist*idist));   //
+		idist = (float)(dmin);                   // cast inner min to a float
+		rsf = idist * 0.5f;                      //
+		rsl = *(unsigned int *)&idist;           //
+		rsl = 0x5f3759df - (rsl >> 1);           // see notes above
+		idist = *(float *)&rsl;                  //
+		idist = idist * (rsopf - (rsf * idist * idist));   //
 		/*
-   Note once again that since we are using reciprocals of distance values our
-   proportion is already the correct intensity, and does not need to be
-   subracted from 1.0 like it would have if we used real distances.
-   */
+		 * Note once again that since we are using reciprocals of distance values our
+		 * proportion is already the correct intensity, and does not need to be
+		 * subracted from 1.0 like it would have if we used real distances.
+		 */
 		
 		/*
-   Here we reconstruct the pixel's memory location in the CompBuf by
-   Pixel Index = Pixel Column + ( Pixel Row * Row Width )
-   */
-		res[gbuf[gradientFillOffset+1]+(gbuf[gradientFillOffset]*rw)]=(idist/(idist+odist));	//set intensity
+		 * Here we reconstruct the pixel's memory location in the CompBuf by
+		 * Pixel Index = Pixel Column + ( Pixel Row * Row Width )
+		 */
+		res[gbuf[gradientFillOffset + 1] + (gbuf[gradientFillOffset] * rw)] = (idist / (idist + odist));    //set intensity
 	}
 	
 }
@@ -1139,92 +1140,92 @@ void DoubleEdgeMaskOperation::doDoubleEdgeMask(float *imask, float *omask, float
 	int t;                             // t = total number of pixels in buffer - 1 (used for loop starts)
 	int fsz;                           // size of the frame
 	
-	unsigned int isz=0;                // size (in pixels) of inside edge pixel index buffer
-	unsigned int osz=0;                // size (in pixels) of outside edge pixel index buffer
-	unsigned int gsz=0;                // size (in pixels) of gradient pixel index buffer
-	unsigned int rsize[3];             // size storage to pass to helper functions
-	unsigned int innerEdgeOffset=0;    // offset into final buffer where inner edge pixel indexes start
-	unsigned int outerEdgeOffset=0;    // offset into final buffer where outer edge pixel indexes start
+	unsigned int isz = 0;                // size (in pixels) of inside edge pixel index buffer
+	unsigned int osz = 0;                // size (in pixels) of outside edge pixel index buffer
+	unsigned int gsz = 0;                // size (in pixels) of gradient pixel index buffer
+	unsigned int rsize[3];               // size storage to pass to helper functions
+	unsigned int innerEdgeOffset = 0;    // offset into final buffer where inner edge pixel indexes start
+	unsigned int outerEdgeOffset = 0;    // offset into final buffer where outer edge pixel indexes start
 	
 	unsigned short *gbuf;              // gradient/inner/outer pixel location index buffer
 	
 	if (true) {                    // if both input sockets have some data coming in...
 		
-		t=(this->getWidth()*this->getHeight())-1;                                // determine size of the frame
+		t = (this->getWidth() * this->getHeight()) - 1;                                // determine size of the frame
 		
-		lres = (unsigned int*)res;      // unsigned int pointer to output buffer (for bit level ops)
-		limask=(unsigned int*)imask;   // unsigned int pointer to input mask (for bit level ops)
-		lomask=(unsigned int*)omask;   // unsigned int pointer to output mask (for bit level ops)
+		lres = (unsigned int *)res;      // unsigned int pointer to output buffer (for bit level ops)
+		limask = (unsigned int *)imask;   // unsigned int pointer to input mask (for bit level ops)
+		lomask = (unsigned int *)omask;   // unsigned int pointer to output mask (for bit level ops)
 		rw = this->getWidth();                   // width of a row of pixels
 		
 		
 		/*
-		 The whole buffer is broken up into 4 parts. The four CORNERS, the FIRST and LAST rows, the
-		 LEFT and RIGHT edges (excluding the corner pixels), and all OTHER rows.
-		 This allows for quick computation of outer edge pixels where
-		 a screen edge pixel is marked to be gradient.
-		 
-		 The pixel type (gradient vs inner-edge vs outer-edge) tests change
-		 depending on the user selected "Inner Edge Mode" and the user selected
-		 "Buffer Edge Mode" on the node's GUI. There are 4 sets of basically the
-		 same algorithm:
-		 
-		 1.) Inner Edge -> Adjacent Only
-			 Buffer Edge -> Keep Inside
-			 
-		 2.) Inner Edge -> Adjacent Only
-			 Buffer Edge -> Bleed Out
-			 
-		 3.) Inner Edge -> All
-			 Buffer Edge -> Keep Inside
-			 
-		 4.) Inner Edge -> All
-			 Buffer Edge -> Bleed Out
-			 
-		 Each version has slightly different criteria for detecting an edge pixel.
+		 * The whole buffer is broken up into 4 parts. The four CORNERS, the FIRST and LAST rows, the
+		 * LEFT and RIGHT edges (excluding the corner pixels), and all OTHER rows.
+		 * This allows for quick computation of outer edge pixels where
+		 * a screen edge pixel is marked to be gradient.
+		 *
+		 * The pixel type (gradient vs inner-edge vs outer-edge) tests change
+		 * depending on the user selected "Inner Edge Mode" and the user selected
+		 * "Buffer Edge Mode" on the node's GUI. There are 4 sets of basically the
+		 * same algorithm:
+		 *
+		 * 1.) Inner Edge -> Adjacent Only
+		 *   Buffer Edge -> Keep Inside
+		 *
+		 * 2.) Inner Edge -> Adjacent Only
+		 *   Buffer Edge -> Bleed Out
+		 *
+		 * 3.) Inner Edge -> All
+		 *   Buffer Edge -> Keep Inside
+		 *
+		 * 4.) Inner Edge -> All
+		 *   Buffer Edge -> Bleed Out
+		 *
+		 * Each version has slightly different criteria for detecting an edge pixel.
 		 */
-		if (this->adjecentOnly) {            // if "adjacent only" inner edge mode is turned on
-			if (this->keepInside) {          // if "keep inside" buffer edge mode is turned on
-				do_adjacentKeepBorders(t,rw,limask,lomask,lres,res,rsize);
+		if (this->adjecentOnly) {                // if "adjacent only" inner edge mode is turned on
+			if (this->keepInside) {              // if "keep inside" buffer edge mode is turned on
+				do_adjacentKeepBorders(t, rw, limask, lomask, lres, res, rsize);
 			}
-			else {                     // "bleed out" buffer edge mode is turned on
-				do_adjacentBleedBorders(t,rw,limask,lomask,lres,res,rsize);
+			else {                               // "bleed out" buffer edge mode is turned on
+				do_adjacentBleedBorders(t, rw, limask, lomask, lres, res, rsize);
 			}
-			isz=rsize[0];              // set up inner edge, outer edge, and gradient buffer sizes after border pass
-			osz=rsize[1];
-			gsz=rsize[2];
+			isz = rsize[0];                      // set up inner edge, outer edge, and gradient buffer sizes after border pass
+			osz = rsize[1];
+			gsz = rsize[2];
 			// detect edges in all non-border pixels in the buffer
-			do_adjacentEdgeDetection(t,rw,limask,lomask,lres,res,rsize,isz,osz,gsz);
+			do_adjacentEdgeDetection(t, rw, limask, lomask, lres, res, rsize, isz, osz, gsz);
 		}
-		else {                            // "all" inner edge mode is turned on
-			if (this->keepInside) {        // if "keep inside" buffer edge mode is turned on
-				do_allKeepBorders(t,rw,limask,lomask,lres,res,rsize);
+		else {                                   // "all" inner edge mode is turned on
+			if (this->keepInside) {              // if "keep inside" buffer edge mode is turned on
+				do_allKeepBorders(t, rw, limask, lomask, lres, res, rsize);
 			}
-			else {                     // "bleed out" buffer edge mode is turned on
-				do_allBleedBorders(t,rw,limask,lomask,lres,res,rsize);
+			else {                               // "bleed out" buffer edge mode is turned on
+				do_allBleedBorders(t, rw, limask, lomask, lres, res, rsize);
 			}
-			isz=rsize[0];              // set up inner edge, outer edge, and gradient buffer sizes after border pass
-			osz=rsize[1];
-			gsz=rsize[2];
+			isz = rsize[0];                      // set up inner edge, outer edge, and gradient buffer sizes after border pass
+			osz = rsize[1];
+			gsz = rsize[2];
 			// detect edges in all non-border pixels in the buffer
-			do_allEdgeDetection(t,rw,limask,lomask,lres,res,rsize,isz,osz,gsz);
+			do_allEdgeDetection(t, rw, limask, lomask, lres, res, rsize, isz, osz, gsz);
 		}
 		
-		isz=rsize[0];                  // set edge and gradient buffer sizes once again...
-		osz=rsize[1];                  // the sizes in rsize[] may have been modified
-		gsz=rsize[2];                  // by the do_*EdgeDetection() function.
+		isz = rsize[0];                          // set edge and gradient buffer sizes once again...
+		osz = rsize[1];                          // the sizes in rsize[] may have been modified
+		gsz = rsize[2];                          // by the do_*EdgeDetection() function.
 		
-		fsz=gsz+isz+osz;                                   // calculate size of pixel index buffer needed
-		gbuf = new unsigned short[fsz*2];     // allocate edge/gradient pixel index buffer
+		fsz = gsz + isz + osz;                                   // calculate size of pixel index buffer needed
+		gbuf = (unsigned short *)MEM_callocN(sizeof (unsigned short) * fsz * 2, "DEM"); // allocate edge/gradient pixel index buffer
 		
-		do_createEdgeLocationBuffer(t,rw,lres,res,gbuf,&innerEdgeOffset,&outerEdgeOffset,isz,gsz);
-		do_fillGradientBuffer(rw,res,gbuf,isz,osz,gsz,innerEdgeOffset,outerEdgeOffset);
+		do_createEdgeLocationBuffer(t, rw, lres, res, gbuf, &innerEdgeOffset, &outerEdgeOffset, isz, gsz);
+		do_fillGradientBuffer(rw, res, gbuf, isz, osz, gsz, innerEdgeOffset, outerEdgeOffset);
 		
-		delete gbuf;          // free the gradient index buffer
+		MEM_freeN(gbuf);                         // free the gradient index buffer
 	}
 }
 
-DoubleEdgeMaskOperation::DoubleEdgeMaskOperation(): NodeOperation()
+DoubleEdgeMaskOperation::DoubleEdgeMaskOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_VALUE);
 	this->addInputSocket(COM_DT_VALUE);
@@ -1263,11 +1264,11 @@ void *DoubleEdgeMaskOperation::initializeTileData(rcti *rect, MemoryBuffer **mem
 {
 	if (this->cachedInstance) return this->cachedInstance;
 	
-	BLI_mutex_lock(getMutex());
+	lockMutex();
 	if (this->cachedInstance == NULL) {
-		MemoryBuffer *innerMask = (MemoryBuffer*)inputInnerMask->initializeTileData(rect, memoryBuffers);
-		MemoryBuffer *outerMask = (MemoryBuffer*)inputOuterMask->initializeTileData(rect, memoryBuffers);
-		float *data = new float[this->getWidth()*this->getHeight()];
+		MemoryBuffer *innerMask = (MemoryBuffer *)inputInnerMask->initializeTileData(rect, memoryBuffers);
+		MemoryBuffer *outerMask = (MemoryBuffer *)inputOuterMask->initializeTileData(rect, memoryBuffers);
+		float *data = new float[this->getWidth() * this->getHeight()];
 		float *imask = innerMask->convertToValueBuffer();
 		float *omask = outerMask->convertToValueBuffer();
 		doDoubleEdgeMask(imask, omask, data);
@@ -1275,17 +1276,17 @@ void *DoubleEdgeMaskOperation::initializeTileData(rcti *rect, MemoryBuffer **mem
 		delete omask;
 		this->cachedInstance = data;
 	}
-	BLI_mutex_unlock(getMutex());
+	unlockMutex();
 	return this->cachedInstance;
 }
 void DoubleEdgeMaskOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
 {
-	float *buffer = (float*) data;
-	int index = (y*this->getWidth() + x);
+	float *buffer = (float *) data;
+	int index = (y * this->getWidth() + x);
 	color[0] = buffer[index];
-	color[1] = buffer[index+1];
-	color[2] = buffer[index+2];
-	color[3] = buffer[index+3];
+	color[1] = buffer[index + 1];
+	color[2] = buffer[index + 2];
+	color[3] = buffer[index + 3];
 }
 
 void DoubleEdgeMaskOperation::deinitExecution()
diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
index 85c4fd9e5b7..a18d59ae5a2 100644
--- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
+++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
@@ -28,10 +28,10 @@
 class DoubleEdgeMaskOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputOuterMask;
-	SocketReader * inputInnerMask;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputOuterMask;
+	SocketReader *inputInnerMask;
 	bool adjecentOnly;
 	bool keepInside;
 	float *cachedInstance;
@@ -40,25 +40,25 @@ public:
 
 	void doDoubleEdgeMask(float *inner, float *outer, float *res);
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 
 	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
 
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
 	
-	void setAdjecentOnly(bool adjecentOnly) {this->adjecentOnly = adjecentOnly;}
-	void setKeepInside(bool keepInside) {this->keepInside = keepInside;}
+	void setAdjecentOnly(bool adjecentOnly) { this->adjecentOnly = adjecentOnly; }
+	void setKeepInside(bool keepInside) { this->keepInside = keepInside; }
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp b/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
index 85a629f7365..0beacd02738 100644
--- a/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
+++ b/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
@@ -24,7 +24,7 @@
 #include "BLI_math.h"
 #include "DNA_node_types.h"
 
-EllipseMaskOperation::EllipseMaskOperation(): NodeOperation()
+EllipseMaskOperation::EllipseMaskOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_VALUE);
 	this->addInputSocket(COM_DT_VALUE);
@@ -38,10 +38,10 @@ void EllipseMaskOperation::initExecution()
 {
 	this->inputMask = this->getInputSocketReader(0);
 	this->inputValue = this->getInputSocketReader(1);
-	const double rad = DEG2RAD(this->data->rotation);
+	const double rad = DEG2RAD((double)this->data->rotation);
 	this->cosine = cos(rad);
 	this->sine = sin(rad);
-	this->aspectRatio = ((float)this->getWidth())/this->getHeight();
+	this->aspectRatio = ((float)this->getWidth()) / this->getHeight();
 }
 
 void EllipseMaskOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -49,32 +49,32 @@ void EllipseMaskOperation::executePixel(float *color, float x, float y, PixelSam
 	float inputMask[4];
 	float inputValue[4];
 	
-	float rx = x/this->getWidth();
-	float ry = y/this->getHeight();
+	float rx = x / this->getWidth();
+	float ry = y / this->getHeight();
 	
-	const float dy = (ry - this->data->y)/this->aspectRatio;
+	const float dy = (ry - this->data->y) / this->aspectRatio;
 	const float dx = rx - this->data->x;
-	rx = this->data->x+(this->cosine*dx + this->sine*dy);
-	ry = this->data->y+(-this->sine*dx + this->cosine*dy);
+	rx = this->data->x + (this->cosine * dx + this->sine * dy);
+	ry = this->data->y + (-this->sine * dx + this->cosine * dy);
 	
 	this->inputMask->read(inputMask, x, y, sampler, inputBuffers);
 	this->inputValue->read(inputValue, x, y, sampler, inputBuffers);
 	
-	const float halfHeight = (this->data->height)/2.0f;
-	const float halfWidth = this->data->width/2.0f;
-	float sx = rx-this->data->x;
+	const float halfHeight = (this->data->height) / 2.0f;
+	const float halfWidth = this->data->width / 2.0f;
+	float sx = rx - this->data->x;
 	sx *= sx;
 	const float tx = halfWidth * halfWidth;
-	float sy = ry-this->data->y;
+	float sy = ry - this->data->y;
 	sy *= sy;
 	const float ty = halfHeight * halfHeight;
 	
-	bool inside = ((sx/tx)+(sy/ty))<1.0f;
+	bool inside = ((sx / tx) + (sy / ty)) < 1.0f;
 	
 	switch (this->maskType) {
 		case CMP_NODE_MASKTYPE_ADD:
 			if (inside) {
-				color[0] = max(inputMask[0],inputValue[0]);
+				color[0] = max(inputMask[0], inputValue[0]);
 			}
 			else {
 				color[0] = inputMask[0];
@@ -82,7 +82,7 @@ void EllipseMaskOperation::executePixel(float *color, float x, float y, PixelSam
 			break;
 		case CMP_NODE_MASKTYPE_SUBTRACT:
 			if (inside) {
-				color[0] = inputMask[0]-inputValue[0];
+				color[0] = inputMask[0] - inputValue[0];
 				CLAMP(color[0], 0, 1);
 			}
 			else {
@@ -91,24 +91,24 @@ void EllipseMaskOperation::executePixel(float *color, float x, float y, PixelSam
 			break;
 		case CMP_NODE_MASKTYPE_MULTIPLY:
 			if (inside) {
-				color[0] = inputMask[0]*inputValue[0];
+				color[0] = inputMask[0] * inputValue[0];
 			}
 			else {
 				color[0] = 0;
 			}
 			break;
 		case CMP_NODE_MASKTYPE_NOT:
-		if (inside) {
-			if (inputMask[0]>0.0f) {
-				color[0] = 0;
+			if (inside) {
+				if (inputMask[0] > 0.0f) {
+					color[0] = 0;
+				}
+				else {
+					color[0] = inputValue[0];
+				}
 			}
 			else {
-				color[0] = inputValue[0];
+				color[0] = inputMask[0];
 			}
-		}
-		else {
-			color[0] = inputMask[0];
-		}
 			break;
 	}
 
diff --git a/source/blender/compositor/operations/COM_EllipseMaskOperation.h b/source/blender/compositor/operations/COM_EllipseMaskOperation.h
index bff94941190..61d724c2f15 100644
--- a/source/blender/compositor/operations/COM_EllipseMaskOperation.h
+++ b/source/blender/compositor/operations/COM_EllipseMaskOperation.h
@@ -28,10 +28,10 @@
 class EllipseMaskOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputMask;
-	SocketReader * inputValue;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputMask;
+	SocketReader *inputValue;
 	
 	float sine;
 	float cosine;
@@ -43,23 +43,23 @@ public:
 	EllipseMaskOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
-	void setData(NodeEllipseMask *data) {this->data = data;}
-	
-	void setMaskType(int maskType) {this->maskType = maskType;}
+	void setData(NodeEllipseMask *data) { this->data = data; }
+
+	void setMaskType(int maskType) { this->maskType = maskType; }
 	
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
index ad8f3b12387..7491b0f30dd 100644
--- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
@@ -20,19 +20,20 @@
  *		Monique Dewanchand
  */
 
+#include <limits.h>
+
 #include "COM_FastGaussianBlurOperation.h"
 #include "MEM_guardedalloc.h"
 #include "BLI_utildefines.h"
 
-FastGaussianBlurOperation::FastGaussianBlurOperation(): BlurBaseOperation()
+FastGaussianBlurOperation::FastGaussianBlurOperation() : BlurBaseOperation(COM_DT_COLOR)
 {
-	this->iirgaus = false;
+	this->iirgaus = NULL;
 }
 
-void FastGaussianBlurOperation::executePixel(float *color,int x, int y, MemoryBuffer *inputBuffers[], void *data)
+void FastGaussianBlurOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
 {
-	MemoryBuffer *newData = (MemoryBuffer*)data;
-	
+	MemoryBuffer *newData = (MemoryBuffer *)data;
 	newData->read(color, x, y);	
 }
 
@@ -45,16 +46,13 @@ bool FastGaussianBlurOperation::determineDependingAreaOfInterest(rcti *input, Re
 	sizeInput.xmax = 5;
 	sizeInput.ymax = 5;
 	
-	NodeOperation * operation = this->getInputOperation(1);
+	NodeOperation *operation = this->getInputOperation(1);
 	if (operation->determineDependingAreaOfInterest(&sizeInput, readOperation, output)) {
 		return true;
 	}
 	else {
 		if (this->iirgaus) {
-			newInput.xmax = input->xmax + (sx);
-			newInput.xmin = input->xmin - (sx);
-			newInput.ymax = input->ymax + (sy);
-			newInput.ymin = input->ymin - (sy);
+			return false;
 		}
 		else {
 			newInput.xmin = 0;
@@ -66,45 +64,61 @@ bool FastGaussianBlurOperation::determineDependingAreaOfInterest(rcti *input, Re
 	}
 }
 
-void *FastGaussianBlurOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
+void FastGaussianBlurOperation::initExecution()
 {
-	MemoryBuffer *newBuf = (MemoryBuffer*)this->inputProgram->initializeTileData(rect, memoryBuffers);
-	MemoryBuffer *copy = newBuf->duplicate();
-	updateSize(memoryBuffers);
-	
-	int c;
-	sx = data->sizex * this->size/2.0f;
-	sy = data->sizey * this->size/2.0f;	
-	this->iirgaus = true;
-	
-	if ((sx == sy) && (sx > 0.f)) {
-		for (c=0; c<COM_NUMBER_OF_CHANNELS; ++c)
-			IIR_gauss(copy, sx, c, 3);
-	}
-	else {
-		if (sx > 0.f) {
-			for (c=0; c<COM_NUMBER_OF_CHANNELS; ++c)
-				IIR_gauss(copy, sx, c, 1);
-		}
-		if (sy > 0.f) {
-			for (c=0; c<COM_NUMBER_OF_CHANNELS; ++c)
-				IIR_gauss(copy, sy, c, 2);
-		}
+	BlurBaseOperation::initExecution();
+	BlurBaseOperation::initMutex();
+}
+
+void FastGaussianBlurOperation::deinitExecution() 
+{
+	if (this->iirgaus) {
+		delete this->iirgaus;
+		this->iirgaus = NULL;
 	}
-	return copy;
+	BlurBaseOperation::deinitMutex();
 }
 
-void FastGaussianBlurOperation::deinitializeTileData(rcti *rect, MemoryBuffer **memoryBuffers, void *data)
+void *FastGaussianBlurOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
 {
-	MemoryBuffer *newData = (MemoryBuffer*)data;
-	delete newData;
+	lockMutex();
+	if (!iirgaus) {
+		MemoryBuffer *newBuf = (MemoryBuffer *)this->inputProgram->initializeTileData(rect, memoryBuffers);
+		MemoryBuffer *copy = newBuf->duplicate();
+		updateSize(memoryBuffers);
+
+		int c;
+		sx = data->sizex * this->size / 2.0f;
+		sy = data->sizey * this->size / 2.0f;
+		
+		if ((sx == sy) && (sx > 0.f)) {
+			for (c = 0; c < COM_NUMBER_OF_CHANNELS; ++c)
+				IIR_gauss(copy, sx, c, 3);
+		}
+		else {
+			if (sx > 0.f) {
+				for (c = 0; c < COM_NUMBER_OF_CHANNELS; ++c)
+					IIR_gauss(copy, sx, c, 1);
+			}
+			if (sy > 0.f) {
+				for (c = 0; c < COM_NUMBER_OF_CHANNELS; ++c)
+					IIR_gauss(copy, sy, c, 2);
+			}
+		}
+		this->iirgaus = copy;
+	}
+	unlockMutex();
+	return iirgaus;
 }
 
-void FastGaussianBlurOperation::IIR_gauss(MemoryBuffer *src, float sigma, int chan, int xy)
+void FastGaussianBlurOperation::IIR_gauss(MemoryBuffer *src, float sigma, unsigned int chan, unsigned int xy)
 {
 	double q, q2, sc, cf[4], tsM[9], tsu[3], tsv[3];
 	double *X, *Y, *W;
-	int i, x, y, sz;
+	const unsigned int src_width = src->getWidth();
+	const unsigned int src_height = src->getHeight();
+	unsigned int x, y, sz;
+	unsigned int i;
 	float *buffer = src->getBuffer();
 	
 	// <0.5 not valid, though can have a possibly useful sort of sharpening effect
@@ -114,24 +128,24 @@ void FastGaussianBlurOperation::IIR_gauss(MemoryBuffer *src, float sigma, int ch
 	
 	// XXX The YVV macro defined below explicitly expects sources of at least 3x3 pixels,
 	//     so just skiping blur along faulty direction if src's def is below that limit!
-	if (src->getWidth() < 3) xy &= ~(int) 1;
-	if (src->getHeight() < 3) xy &= ~(int) 2;
+	if (src_width < 3) xy &= ~(int) 1;
+	if (src_height < 3) xy &= ~(int) 2;
 	if (xy < 1) return;
 	
 	// see "Recursive Gabor Filtering" by Young/VanVliet
 	// all factors here in double.prec. Required, because for single.prec it seems to blow up if sigma > ~200
 	if (sigma >= 3.556f)
-		q = 0.9804f*(sigma - 3.556f) + 2.5091f;
+		q = 0.9804f * (sigma - 3.556f) + 2.5091f;
 	else // sigma >= 0.5
-		q = (0.0561f*sigma + 0.5784f)*sigma - 0.2568f;
-	q2 = q*q;
-	sc = (1.1668 + q)*(3.203729649  + (2.21566 + q)*q);
+		q = (0.0561f * sigma + 0.5784f) * sigma - 0.2568f;
+	q2 = q * q;
+	sc = (1.1668 + q) * (3.203729649  + (2.21566 + q) * q);
 	// no gabor filtering here, so no complex multiplies, just the regular coefs.
 	// all negated here, so as not to have to recalc Triggs/Sdika matrix
-	cf[1] = q*(5.788961737 + (6.76492 + 3.0*q)*q)/ sc;
-	cf[2] = -q2*(3.38246 + 3.0*q)/sc;
+	cf[1] = q * (5.788961737 + (6.76492 + 3.0 * q) * q) / sc;
+	cf[2] = -q2 * (3.38246 + 3.0 * q) / sc;
 	// 0 & 3 unchanged
-	cf[3] = q2*q/sc;
+	cf[3] = q2 * q / sc;
 	cf[0] = 1.0 - cf[1] - cf[2] - cf[3];
 	
 	// Triggs/Sdika border corrections,
@@ -141,59 +155,62 @@ void FastGaussianBlurOperation::IIR_gauss(MemoryBuffer *src, float sigma, int ch
 	// but neither seem to be quite the same, result seems to be ok so far anyway.
 	// Extra scale factor here to not have to do it in filter,
 	// though maybe this had something to with the precision errors
-	sc = cf[0]/((1.0 + cf[1] - cf[2] + cf[3])*(1.0 - cf[1] - cf[2] - cf[3])*(1.0 + cf[2] + (cf[1] - cf[3])*cf[3]));
-	tsM[0] = sc*(-cf[3]*cf[1] + 1.0 - cf[3]*cf[3] - cf[2]);
-	tsM[1] = sc*((cf[3] + cf[1])*(cf[2] + cf[3]*cf[1]));
-	tsM[2] = sc*(cf[3]*(cf[1] + cf[3]*cf[2]));
-	tsM[3] = sc*(cf[1] + cf[3]*cf[2]);
-	tsM[4] = sc*(-(cf[2] - 1.0)*(cf[2] + cf[3]*cf[1]));
-	tsM[5] = sc*(-(cf[3]*cf[1] + cf[3]*cf[3] + cf[2] - 1.0)*cf[3]);
-	tsM[6] = sc*(cf[3]*cf[1] + cf[2] + cf[1]*cf[1] - cf[2]*cf[2]);
-	tsM[7] = sc*(cf[1]*cf[2] + cf[3]*cf[2]*cf[2] - cf[1]*cf[3]*cf[3] - cf[3]*cf[3]*cf[3] - cf[3]*cf[2] + cf[3]);
-	tsM[8] = sc*(cf[3]*(cf[1] + cf[3]*cf[2]));
+	sc = cf[0] / ((1.0 + cf[1] - cf[2] + cf[3]) * (1.0 - cf[1] - cf[2] - cf[3]) * (1.0 + cf[2] + (cf[1] - cf[3]) * cf[3]));
+	tsM[0] = sc * (-cf[3] * cf[1] + 1.0 - cf[3] * cf[3] - cf[2]);
+	tsM[1] = sc * ((cf[3] + cf[1]) * (cf[2] + cf[3] * cf[1]));
+	tsM[2] = sc * (cf[3] * (cf[1] + cf[3] * cf[2]));
+	tsM[3] = sc * (cf[1] + cf[3] * cf[2]);
+	tsM[4] = sc * (-(cf[2] - 1.0) * (cf[2] + cf[3] * cf[1]));
+	tsM[5] = sc * (-(cf[3] * cf[1] + cf[3] * cf[3] + cf[2] - 1.0) * cf[3]);
+	tsM[6] = sc * (cf[3] * cf[1] + cf[2] + cf[1] * cf[1] - cf[2] * cf[2]);
+	tsM[7] = sc * (cf[1] * cf[2] + cf[3] * cf[2] * cf[2] - cf[1] * cf[3] * cf[3] - cf[3] * cf[3] * cf[3] - cf[3] * cf[2] + cf[3]);
+	tsM[8] = sc * (cf[3] * (cf[1] + cf[3] * cf[2]));
 	
-#define YVV(L)                                                                \
-{                                                                             \
-W[0] = cf[0]*X[0] + cf[1]*X[0] + cf[2]*X[0] + cf[3]*X[0];                 \
-W[1] = cf[0]*X[1] + cf[1]*W[0] + cf[2]*X[0] + cf[3]*X[0];                 \
-W[2] = cf[0]*X[2] + cf[1]*W[1] + cf[2]*W[0] + cf[3]*X[0];                 \
-for (i=3; i<L; i++)                                                       \
-W[i] = cf[0]*X[i] + cf[1]*W[i-1] + cf[2]*W[i-2] + cf[3]*W[i-3];       \
-tsu[0] = W[L-1] - X[L-1];                                                 \
-tsu[1] = W[L-2] - X[L-1];                                                 \
-tsu[2] = W[L-3] - X[L-1];                                                 \
-tsv[0] = tsM[0]*tsu[0] + tsM[1]*tsu[1] + tsM[2]*tsu[2] + X[L-1];          \
-tsv[1] = tsM[3]*tsu[0] + tsM[4]*tsu[1] + tsM[5]*tsu[2] + X[L-1];          \
-tsv[2] = tsM[6]*tsu[0] + tsM[7]*tsu[1] + tsM[8]*tsu[2] + X[L-1];          \
-Y[L-1] = cf[0]*W[L-1] + cf[1]*tsv[0] + cf[2]*tsv[1] + cf[3]*tsv[2];       \
-Y[L-2] = cf[0]*W[L-2] + cf[1]*Y[L-1] + cf[2]*tsv[0] + cf[3]*tsv[1];       \
-Y[L-3] = cf[0]*W[L-3] + cf[1]*Y[L-2] + cf[2]*Y[L-1] + cf[3]*tsv[0];       \
-for (i=L-4; i>=0; i--)                                                    \
-Y[i] = cf[0]*W[i] + cf[1]*Y[i+1] + cf[2]*Y[i+2] + cf[3]*Y[i+3];       \
-}
+#define YVV(L)                                                                          \
+{                                                                                       \
+	W[0] = cf[0] * X[0] + cf[1] * X[0] + cf[2] * X[0] + cf[3] * X[0];                   \
+	W[1] = cf[0] * X[1] + cf[1] * W[0] + cf[2] * X[0] + cf[3] * X[0];                   \
+	W[2] = cf[0] * X[2] + cf[1] * W[1] + cf[2] * W[0] + cf[3] * X[0];                   \
+	for (i = 3; i < L; i++) {                                                           \
+		W[i] = cf[0] * X[i] + cf[1] * W[i - 1] + cf[2] * W[i - 2] + cf[3] * W[i - 3];   \
+	}                                                                                   \
+	tsu[0] = W[L - 1] - X[L - 1];                                                       \
+	tsu[1] = W[L - 2] - X[L - 1];                                                       \
+	tsu[2] = W[L - 3] - X[L - 1];                                                       \
+	tsv[0] = tsM[0] * tsu[0] + tsM[1] * tsu[1] + tsM[2] * tsu[2] + X[L - 1];            \
+	tsv[1] = tsM[3] * tsu[0] + tsM[4] * tsu[1] + tsM[5] * tsu[2] + X[L - 1];            \
+	tsv[2] = tsM[6] * tsu[0] + tsM[7] * tsu[1] + tsM[8] * tsu[2] + X[L - 1];            \
+	Y[L - 1] = cf[0] * W[L - 1] + cf[1] * tsv[0] + cf[2] * tsv[1] + cf[3] * tsv[2];     \
+	Y[L - 2] = cf[0] * W[L - 2] + cf[1] * Y[L - 1] + cf[2] * tsv[0] + cf[3] * tsv[1];   \
+	Y[L - 3] = cf[0] * W[L - 3] + cf[1] * Y[L - 2] + cf[2] * Y[L - 1] + cf[3] * tsv[0]; \
+	/* 'i != UINT_MAX' is really 'i >= 0', but necessary for unsigned int wrapping */   \
+	for (i = L - 4; i != UINT_MAX; i--) {                                               \
+		Y[i] = cf[0] * W[i] + cf[1] * Y[i + 1] + cf[2] * Y[i + 2] + cf[3] * Y[i + 3];   \
+	}                                                                                   \
+} (void)0
 	
 	// intermediate buffers
-	sz = MAX2(src->getWidth(), src->getHeight());
-	X = (double*)MEM_callocN(sz*sizeof(double), "IIR_gauss X buf");
-	Y = (double*)MEM_callocN(sz*sizeof(double), "IIR_gauss Y buf");
-	W = (double*)MEM_callocN(sz*sizeof(double), "IIR_gauss W buf");
-	if (xy & 1) {	// H
-		for (y=0; y<src->getHeight(); ++y) {
-			const int yx = y*src->getWidth();
-			for (x=0; x<src->getWidth(); ++x)
-				X[x] = buffer[(x + yx)*COM_NUMBER_OF_CHANNELS + chan];
-			YVV(src->getWidth());
-			for (x=0; x<src->getWidth(); ++x)
-				buffer[(x + yx)*COM_NUMBER_OF_CHANNELS + chan] = Y[x];
+	sz = MAX2(src_width, src_height);
+	X = (double *)MEM_callocN(sz * sizeof(double), "IIR_gauss X buf");
+	Y = (double *)MEM_callocN(sz * sizeof(double), "IIR_gauss Y buf");
+	W = (double *)MEM_callocN(sz * sizeof(double), "IIR_gauss W buf");
+	if (xy & 1) {   // H
+		for (y = 0; y < src_height; ++y) {
+			const int yx = y * src_width;
+			for (x = 0; x < src_width; ++x)
+				X[x] = buffer[(x + yx) * COM_NUMBER_OF_CHANNELS + chan];
+			YVV(src_width);
+			for (x = 0; x < src_width; ++x)
+				buffer[(x + yx) * COM_NUMBER_OF_CHANNELS + chan] = Y[x];
 		}
 	}
-	if (xy & 2) {	// V
-		for (x=0; x<src->getWidth(); ++x) {
-			for (y=0; y<src->getHeight(); ++y)
-				X[y] = buffer[(x + y*src->getWidth())*COM_NUMBER_OF_CHANNELS + chan];
-			YVV(src->getHeight());
-			for (y=0; y<src->getHeight(); ++y)
-				buffer[(x + y*src->getWidth())*COM_NUMBER_OF_CHANNELS + chan] = Y[y];
+	if (xy & 2) {   // V
+		for (x = 0; x < src_width; ++x) {
+			for (y = 0; y < src_height; ++y)
+				X[y] = buffer[(x + y * src_width) * COM_NUMBER_OF_CHANNELS + chan];
+			YVV(src_height);
+			for (y = 0; y < src_height; ++y)
+				buffer[(x + y * src_width) * COM_NUMBER_OF_CHANNELS + chan] = Y[y];
 		}
 	}
 	
diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
index cf36e7f6ebe..0f3929f052c 100644
--- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
+++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
@@ -26,19 +26,20 @@
 #include "COM_BlurBaseOperation.h"
 #include "DNA_node_types.h"
 
-class FastGaussianBlurOperation: public BlurBaseOperation {
+class FastGaussianBlurOperation : public BlurBaseOperation {
 private:
 	float sx;
 	float sy;
-	bool iirgaus;
+	MemoryBuffer *iirgaus;
 public:
 	FastGaussianBlurOperation();
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
-	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
 	
-	void IIR_gauss(MemoryBuffer *src, float sigma, int channel, int xy);
+	static void IIR_gauss(MemoryBuffer *src, float sigma, unsigned int channel, unsigned int xy);
 	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
-	void deinitializeTileData(rcti *rect, MemoryBuffer **memoryBuffers, void *data);
+	void deinitExecution();
+	void initExecution();
 	
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_FlipOperation.cpp b/source/blender/compositor/operations/COM_FlipOperation.cpp
index 38018ffc3f7..5023473f4aa 100644
--- a/source/blender/compositor/operations/COM_FlipOperation.cpp
+++ b/source/blender/compositor/operations/COM_FlipOperation.cpp
@@ -42,10 +42,10 @@ void FlipOperation::deinitExecution()
 }
 
 
-void FlipOperation::executePixel(float *color,float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
+void FlipOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
 {
-	float nx = this->flipX?this->getWidth()-1-x:x;
-	float ny = this->flipY?this->getHeight()-1-y:y;
+	float nx = this->flipX ? this->getWidth() - 1 - x : x;
+	float ny = this->flipY ? this->getHeight() - 1 - y : y;
 	
 	this->inputOperation->read(color, nx, ny, sampler, inputBuffers);
 }
@@ -55,16 +55,16 @@ bool FlipOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOper
 	rcti newInput;
 	
 	if (this->flipX) {
-		newInput.xmax = (this->getWidth()- 1 - input->xmin)+1;
-		newInput.xmin = (this->getWidth()- 1 - input->xmax)-1;
+		newInput.xmax = (this->getWidth() - 1 - input->xmin) + 1;
+		newInput.xmin = (this->getWidth() - 1 - input->xmax) - 1;
 	}
 	else {
 		newInput.xmin = input->xmin;
 		newInput.xmax = input->xmax;
 	}
 	if (this->flipY) {
-		newInput.ymax = (this->getHeight()- 1 - input->ymin)+1;
-		newInput.ymin = (this->getHeight()- 1 - input->ymax)-1;
+		newInput.ymax = (this->getHeight() - 1 - input->ymin) + 1;
+		newInput.ymin = (this->getHeight() - 1 - input->ymax) - 1;
 	}
 	else {
 		newInput.ymin = input->ymin;
diff --git a/source/blender/compositor/operations/COM_FlipOperation.h b/source/blender/compositor/operations/COM_FlipOperation.h
index 9774cfd7bcd..f83fa6ac3a8 100644
--- a/source/blender/compositor/operations/COM_FlipOperation.h
+++ b/source/blender/compositor/operations/COM_FlipOperation.h
@@ -25,7 +25,7 @@
 
 #include "COM_NodeOperation.h"
 
-class FlipOperation: public NodeOperation {
+class FlipOperation : public NodeOperation {
 private:
 	SocketReader *inputOperation;
 	bool flipX;
@@ -33,12 +33,12 @@ private:
 public:
 	FlipOperation();
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	void initExecution();
 	void deinitExecution();
-	void setFlipX(bool flipX) {this->flipX = flipX;}
-	void setFlipY(bool flipY) {this->flipY = flipY;}
+	void setFlipX(bool flipX) { this->flipX = flipX; }
+	void setFlipY(bool flipY) { this->flipY = flipY; }
 };
 
 #endif
diff --git a/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp b/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp
index a4fb20402a4..3e90b643604 100644
--- a/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp
+++ b/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp
@@ -23,7 +23,7 @@
 #include "COM_GammaCorrectOperation.h"
 #include "BLI_math.h"
 
-GammaCorrectOperation::GammaCorrectOperation(): NodeOperation()
+GammaCorrectOperation::GammaCorrectOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addOutputSocket(COM_DT_COLOR);
@@ -45,9 +45,9 @@ void GammaCorrectOperation::executePixel(float *color, float x, float y, PixelSa
 	}
 
 	/* check for negative to avoid nan's */
-	color[0] = inputColor[0]>0.0f?inputColor[0]*inputColor[0] :0.0f;
-	color[1] = inputColor[1]>0.0f?inputColor[1]*inputColor[1] :0.0f;
-	color[2] = inputColor[2]>0.0f?inputColor[2]*inputColor[2] :0.0f;
+	color[0] = inputColor[0] > 0.0f ? inputColor[0] * inputColor[0] : 0.0f;
+	color[1] = inputColor[1] > 0.0f ? inputColor[1] * inputColor[1] : 0.0f;
+	color[2] = inputColor[2] > 0.0f ? inputColor[2] * inputColor[2] : 0.0f;
 
 	inputColor[0] *= inputColor[3];
 	inputColor[1] *= inputColor[3];
@@ -64,7 +64,7 @@ void GammaCorrectOperation::deinitExecution()
 	this->inputProgram = NULL;
 }
 
-GammaUncorrectOperation::GammaUncorrectOperation(): NodeOperation()
+GammaUncorrectOperation::GammaUncorrectOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addOutputSocket(COM_DT_COLOR);
@@ -86,9 +86,9 @@ void GammaUncorrectOperation::executePixel(float *color, float x, float y, Pixel
 		inputColor[2] /= inputColor[3];
 	}
 
-	color[0] = inputColor[0]>0.0f?sqrtf(inputColor[0]) :0.0f;
-	color[1] = inputColor[1]>0.0f?sqrtf(inputColor[1]) :0.0f;
-	color[2] = inputColor[2]>0.0f?sqrtf(inputColor[2]) :0.0f;
+	color[0] = inputColor[0] > 0.0f ? sqrtf(inputColor[0]) : 0.0f;
+	color[1] = inputColor[1] > 0.0f ? sqrtf(inputColor[1]) : 0.0f;
+	color[2] = inputColor[2] > 0.0f ? sqrtf(inputColor[2]) : 0.0f;
 
 	inputColor[0] *= inputColor[3];
 	inputColor[1] *= inputColor[3];
diff --git a/source/blender/compositor/operations/COM_GammaCorrectOperation.h b/source/blender/compositor/operations/COM_GammaCorrectOperation.h
index 6132f04edba..4bf03eac0a1 100644
--- a/source/blender/compositor/operations/COM_GammaCorrectOperation.h
+++ b/source/blender/compositor/operations/COM_GammaCorrectOperation.h
@@ -28,52 +28,52 @@
 class GammaCorrectOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputProgram;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputProgram;
 
 public:
 	GammaCorrectOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 };
 
 class GammaUncorrectOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputProgram;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputProgram;
 
 public:
 	GammaUncorrectOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 };
 
diff --git a/source/blender/compositor/operations/COM_GammaOperation.cpp b/source/blender/compositor/operations/COM_GammaOperation.cpp
index f0887d4adee..2c3e78840ee 100644
--- a/source/blender/compositor/operations/COM_GammaOperation.cpp
+++ b/source/blender/compositor/operations/COM_GammaOperation.cpp
@@ -23,7 +23,7 @@
 #include "COM_GammaOperation.h"
 #include "BLI_math.h"
 
-GammaOperation::GammaOperation(): NodeOperation()
+GammaOperation::GammaOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addInputSocket(COM_DT_VALUE);
@@ -46,9 +46,9 @@ void GammaOperation::executePixel(float *color, float x, float y, PixelSampler s
 	this->inputGammaProgram->read(inputGamma, x, y, sampler, inputBuffers);
 	const float gamma = inputGamma[0];
 	/* check for negative to avoid nan's */
-	color[0] = inputValue[0]>0.0f?pow(inputValue[0], gamma):inputValue[0];
-	color[1] = inputValue[1]>0.0f?pow(inputValue[1], gamma):inputValue[1];
-	color[2] = inputValue[2]>0.0f?pow(inputValue[2], gamma):inputValue[2];
+	color[0] = inputValue[0] > 0.0f ? powf(inputValue[0], gamma) : inputValue[0];
+	color[1] = inputValue[1] > 0.0f ? powf(inputValue[1], gamma) : inputValue[1];
+	color[2] = inputValue[2] > 0.0f ? powf(inputValue[2], gamma) : inputValue[2];
 	
 	color[3] = inputValue[3];
 }
diff --git a/source/blender/compositor/operations/COM_GammaOperation.h b/source/blender/compositor/operations/COM_GammaOperation.h
index 2f3d8cdf9f7..8c007d27843 100644
--- a/source/blender/compositor/operations/COM_GammaOperation.h
+++ b/source/blender/compositor/operations/COM_GammaOperation.h
@@ -28,27 +28,27 @@
 class GammaOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputProgram;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputProgram;
 	SocketReader *inputGammaProgram;
 
 public:
 	GammaOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
new file mode 100644
index 00000000000..1283ac48923
--- /dev/null
+++ b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
@@ -0,0 +1,190 @@
+/*
+ * Copyright 2011, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor: 
+ *		Jeroen Bakker 
+ *		Monique Dewanchand
+ *		Campbell Barton
+ */
+
+#include "COM_GaussianAlphaXBlurOperation.h"
+#include "BLI_math.h"
+
+extern "C" {
+	#include "RE_pipeline.h"
+}
+
+GaussianAlphaXBlurOperation::GaussianAlphaXBlurOperation() : BlurBaseOperation(COM_DT_VALUE)
+{
+	this->gausstab = NULL;
+	this->rad = 0;
+}
+
+void *GaussianAlphaXBlurOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
+{
+	if (!this->sizeavailable) {
+		updateGauss(memoryBuffers);
+	}
+	void *buffer = getInputOperation(0)->initializeTileData(NULL, memoryBuffers);
+	return buffer;
+}
+
+void GaussianAlphaXBlurOperation::initExecution()
+{
+	/* BlurBaseOperation::initExecution(); */ /* until we suppoer size input - comment this */
+
+	if (this->sizeavailable) {
+		float rad = size * this->data->sizex;
+		if (rad < 1)
+			rad = 1;
+
+		this->rad = rad;
+		this->gausstab = BlurBaseOperation::make_gausstab(rad);
+		this->distbuf_inv = BlurBaseOperation::make_dist_fac_inverse(rad);
+	}
+}
+
+void GaussianAlphaXBlurOperation::updateGauss(MemoryBuffer **memoryBuffers)
+{
+	if (this->gausstab == NULL) {
+		updateSize(memoryBuffers);
+		float rad = size * this->data->sizex;
+		if (rad < 1)
+			rad = 1;
+
+		this->rad = rad;
+		this->gausstab = BlurBaseOperation::make_gausstab(rad);	
+	}
+
+	if (this->distbuf_inv == NULL) {
+		updateSize(memoryBuffers);
+		float rad = size * this->data->sizex;
+		if (rad < 1)
+			rad = 1;
+
+		this->rad = rad;
+		this->distbuf_inv = BlurBaseOperation::make_dist_fac_inverse(rad);
+	}
+}
+
+BLI_INLINE float finv_test(const float f, const bool test)
+{
+	return (LIKELY(test == false)) ? f : 1.0f - f;
+}
+
+void GaussianAlphaXBlurOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
+{
+	const bool do_invert = this->do_subtract;
+	MemoryBuffer *inputBuffer = (MemoryBuffer *)data;
+	float *buffer = inputBuffer->getBuffer();
+	int bufferwidth = inputBuffer->getWidth();
+	int bufferstartx = inputBuffer->getRect()->xmin;
+	int bufferstarty = inputBuffer->getRect()->ymin;
+
+	int miny = y;
+	int maxy = y;
+	int minx = x - this->rad;
+	int maxx = x + this->rad;
+	miny = max(miny, inputBuffer->getRect()->ymin);
+	minx = max(minx, inputBuffer->getRect()->xmin);
+	maxy = min(maxy, inputBuffer->getRect()->ymax);
+	maxx = min(maxx, inputBuffer->getRect()->xmax);
+
+	/* *** this is the main part which is different to 'GaussianXBlurOperation'  *** */
+	int step = getStep();
+	int offsetadd = getOffsetAdd();
+	int bufferindex = ((minx - bufferstartx) * 4) + ((miny - bufferstarty) * 4 * bufferwidth);
+
+	/* gauss */
+	float alpha_accum = 0.0f;
+	float multiplier_accum = 0.0f;
+
+	/* dilate */
+	float value_max = finv_test(buffer[(x * 4) + (y * 4 * bufferwidth)], do_invert); /* init with the current color to avoid unneeded lookups */
+	float distfacinv_max = 1.0f; /* 0 to 1 */
+
+	for (int nx = minx; nx < maxx; nx += step) {
+		const int index = (nx - x) + this->rad;
+		float value = finv_test(buffer[bufferindex], do_invert);
+		float multiplier;
+
+		/* gauss */
+		{
+			multiplier = gausstab[index];
+			alpha_accum += value * multiplier;
+			multiplier_accum += multiplier;
+		}
+
+		/* dilate - find most extreme color */
+		if (value > value_max) {
+			multiplier = distbuf_inv[index];
+			value *= multiplier;
+			if (value > value_max) {
+				value_max = value;
+				distfacinv_max = multiplier;
+			}
+		}
+		bufferindex += offsetadd;
+	}
+
+	/* blend between the max value and gauss blue - gives nice feather */
+	const float value_blur  = alpha_accum / multiplier_accum;
+	const float value_final = (value_max * distfacinv_max) + (value_blur * (1.0f - distfacinv_max));
+	color[0] = finv_test(value_final, do_invert);
+}
+
+void GaussianAlphaXBlurOperation::deinitExecution()
+{
+	BlurBaseOperation::deinitExecution();
+	delete [] this->gausstab;
+	this->gausstab = NULL;
+	delete [] this->distbuf_inv;
+	this->distbuf_inv = NULL;
+}
+
+bool GaussianAlphaXBlurOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
+{
+	rcti newInput;
+#if 0 /* until we add size input */
+	rcti sizeInput;
+	sizeInput.xmin = 0;
+	sizeInput.ymin = 0;
+	sizeInput.xmax = 5;
+	sizeInput.ymax = 5;
+
+	NodeOperation *operation = this->getInputOperation(1);
+	if (operation->determineDependingAreaOfInterest(&sizeInput, readOperation, output)) {
+		return true;
+	}
+	else
+#endif
+	{
+		if (this->sizeavailable && this->gausstab != NULL) {
+			newInput.xmax = input->xmax + rad;
+			newInput.xmin = input->xmin - rad;
+			newInput.ymax = input->ymax;
+			newInput.ymin = input->ymin;
+		}
+		else {
+			newInput.xmax = this->getWidth();
+			newInput.xmin = 0;
+			newInput.ymax = this->getHeight();
+			newInput.ymin = 0;
+		}
+		return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
+	}
+}
diff --git a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h
new file mode 100644
index 00000000000..3268e51be01
--- /dev/null
+++ b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2011, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor: 
+ *		Jeroen Bakker 
+ *		Monique Dewanchand
+ *		Campbell Barton
+ */
+
+#ifndef _COM_GaussianAlphaXBlurOperation_h
+#define _COM_GaussianAlphaXBlurOperation_h
+#include "COM_NodeOperation.h"
+#include "COM_BlurBaseOperation.h"
+
+class GaussianAlphaXBlurOperation : public BlurBaseOperation {
+private:
+	float *gausstab;
+	float *distbuf_inv;
+	bool do_subtract;
+	int rad;
+	void updateGauss(MemoryBuffer **memoryBuffers);
+public:
+	GaussianAlphaXBlurOperation();
+
+	/**
+	 * @brief the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
+	
+	/**
+	 * @brief initialize the execution
+	 */
+	void initExecution();
+
+	/**
+	 * @brief Deinitialize the execution
+	 */
+	void deinitExecution();
+	
+	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
+	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
+
+	/**
+	 * Set subtract for Dilate/Erode functionality
+	 */
+	void setSubtract(bool subtract) { this->do_subtract = subtract; }
+};
+#endif
diff --git a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
new file mode 100644
index 00000000000..1d67c23e41b
--- /dev/null
+++ b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
@@ -0,0 +1,190 @@
+/*
+ * Copyright 2011, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor: 
+ *		Jeroen Bakker 
+ *		Monique Dewanchand
+ *		Campbell Barton
+ */
+
+#include "COM_GaussianAlphaYBlurOperation.h"
+#include "BLI_math.h"
+
+extern "C" {
+	#include "RE_pipeline.h"
+}
+
+GaussianAlphaYBlurOperation::GaussianAlphaYBlurOperation() : BlurBaseOperation(COM_DT_VALUE)
+{
+	this->gausstab = NULL;
+	this->rad = 0;
+}
+
+void *GaussianAlphaYBlurOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
+{
+	if (!this->sizeavailable) {
+		updateGauss(memoryBuffers);
+	}
+	void *buffer = getInputOperation(0)->initializeTileData(NULL, memoryBuffers);
+	return buffer;
+}
+
+void GaussianAlphaYBlurOperation::initExecution()
+{
+	/* BlurBaseOperation::initExecution(); */ /* until we suppoer size input - comment this */
+
+	if (this->sizeavailable) {
+		float rad = size * this->data->sizey;
+		if (rad < 1)
+			rad = 1;
+
+		this->rad = rad;
+		this->gausstab = BlurBaseOperation::make_gausstab(rad);
+		this->distbuf_inv = BlurBaseOperation::make_dist_fac_inverse(rad);
+	}
+}
+
+void GaussianAlphaYBlurOperation::updateGauss(MemoryBuffer **memoryBuffers)
+{
+	if (this->gausstab == NULL) {
+		updateSize(memoryBuffers);
+		float rad = size * this->data->sizey;
+		if (rad < 1)
+			rad = 1;
+		
+		this->rad = rad;
+		this->gausstab = BlurBaseOperation::make_gausstab(rad);
+	}
+
+	if (this->distbuf_inv == NULL) {
+		updateSize(memoryBuffers);
+		float rad = size * this->data->sizex;
+		if (rad < 1)
+			rad = 1;
+
+		this->rad = rad;
+		this->distbuf_inv = BlurBaseOperation::make_dist_fac_inverse(rad);
+	}
+}
+
+BLI_INLINE float finv_test(const float f, const bool test)
+{
+	return (LIKELY(test == false)) ? f : 1.0f - f;
+}
+
+void GaussianAlphaYBlurOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
+{
+	const bool do_invert = this->do_subtract;
+	MemoryBuffer *inputBuffer = (MemoryBuffer *)data;
+	float *buffer = inputBuffer->getBuffer();
+	int bufferwidth = inputBuffer->getWidth();
+	int bufferstartx = inputBuffer->getRect()->xmin;
+	int bufferstarty = inputBuffer->getRect()->ymin;
+
+	int miny = y - this->rad;
+	int maxy = y + this->rad;
+	int minx = x;
+	int maxx = x;
+	miny = max(miny, inputBuffer->getRect()->ymin);
+	minx = max(minx, inputBuffer->getRect()->xmin);
+	maxy = min(maxy, inputBuffer->getRect()->ymax);
+	maxx = min(maxx, inputBuffer->getRect()->xmax);
+
+	/* *** this is the main part which is different to 'GaussianYBlurOperation'  *** */
+	int step = getStep();
+
+	/* gauss */
+	float alpha_accum = 0.0f;
+	float multiplier_accum = 0.0f;
+
+	/* dilate */
+	float value_max = finv_test(buffer[(x * 4) + (y * 4 * bufferwidth)], do_invert); /* init with the current color to avoid unneeded lookups */
+	float distfacinv_max = 1.0f; /* 0 to 1 */
+
+	for (int ny = miny; ny < maxy; ny += step) {
+		int bufferindex = ((minx - bufferstartx) * 4) + ((ny - bufferstarty) * 4 * bufferwidth);
+
+		const int index = (ny - y) + this->rad;
+		float value = finv_test(buffer[bufferindex], do_invert);
+		float multiplier;
+
+		/* gauss */
+		{
+			multiplier = gausstab[index];
+			alpha_accum += value * multiplier;
+			multiplier_accum += multiplier;
+		}
+
+		/* dilate - find most extreme color */
+		if (value > value_max) {
+			multiplier = distbuf_inv[index];
+			value *= multiplier;
+			if (value > value_max) {
+				value_max = value;
+				distfacinv_max = multiplier;
+			}
+		}
+
+	}
+
+	/* blend between the max value and gauss blue - gives nice feather */
+	const float value_blur  = alpha_accum / multiplier_accum;
+	const float value_final = (value_max * distfacinv_max) + (value_blur * (1.0f - distfacinv_max));
+	color[0] = finv_test(value_final, do_invert);
+}
+
+void GaussianAlphaYBlurOperation::deinitExecution()
+{
+	BlurBaseOperation::deinitExecution();
+	delete [] this->gausstab;
+	this->gausstab = NULL;
+	delete [] this->distbuf_inv;
+	this->distbuf_inv = NULL;
+}
+
+bool GaussianAlphaYBlurOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
+{
+	rcti newInput;
+#if 0 /* until we add size input */
+	rcti sizeInput;
+	sizeInput.xmin = 0;
+	sizeInput.ymin = 0;
+	sizeInput.xmax = 5;
+	sizeInput.ymax = 5;
+
+	NodeOperation *operation = this->getInputOperation(1);
+	if (operation->determineDependingAreaOfInterest(&sizeInput, readOperation, output)) {
+		return true;
+	}
+	else
+#endif
+	{
+		if (this->sizeavailable && this->gausstab != NULL) {
+			newInput.xmax = input->xmax;
+			newInput.xmin = input->xmin;
+			newInput.ymax = input->ymax + rad;
+			newInput.ymin = input->ymin - rad;
+		}
+		else {
+			newInput.xmax = this->getWidth();
+			newInput.xmin = 0;
+			newInput.ymax = this->getHeight();
+			newInput.ymin = 0;
+		}
+		return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
+	}
+}
diff --git a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h
new file mode 100644
index 00000000000..0ffc264ba98
--- /dev/null
+++ b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2011, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor: 
+ *		Jeroen Bakker 
+ *		Monique Dewanchand
+ *		Campbell Barton
+ */
+
+#ifndef _COM_GaussianAlphaYBlurOperation_h
+#define _COM_GaussianAlphaYBlurOperation_h
+#include "COM_NodeOperation.h"
+#include "COM_BlurBaseOperation.h"
+
+class GaussianAlphaYBlurOperation : public BlurBaseOperation {
+private:
+	float *gausstab;
+	float *distbuf_inv;
+	bool do_subtract;
+	int rad;
+	void updateGauss(MemoryBuffer **memoryBuffers);
+public:
+	GaussianAlphaYBlurOperation();
+	
+	/**
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
+	
+	/**
+	 * @brief initialize the execution
+	 */
+	void initExecution();
+
+	/**
+	 * Deinitialize the execution
+	 */
+	void deinitExecution();
+	
+	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
+	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
+
+	/**
+	 * Set subtract for Dilate/Erode functionality
+	 */
+	void setSubtract(bool subtract) { this->do_subtract = subtract; }
+};
+#endif
diff --git a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
index af10791590b..dc9e354b124 100644
--- a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
@@ -27,18 +27,29 @@ extern "C" {
 	#include "RE_pipeline.h"
 }
 
-GaussianBokehBlurOperation::GaussianBokehBlurOperation(): BlurBaseOperation()
+GaussianBokehBlurOperation::GaussianBokehBlurOperation() : BlurBaseOperation(COM_DT_COLOR)
 {
 	this->gausstab = NULL;
 }
 
 void *GaussianBokehBlurOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
 {
-	updateGauss(memoryBuffers);
+	if (!sizeavailable) {
+		updateGauss(memoryBuffers);
+	}
 	void *buffer = getInputOperation(0)->initializeTileData(NULL, memoryBuffers);
 	return buffer;
 }
 
+void GaussianBokehBlurOperation::initExecution()
+{
+	BlurBaseOperation::initExecution();
+
+	if (this->sizeavailable) {
+		updateGauss(NULL);
+	}
+}
+
 void GaussianBokehBlurOperation::updateGauss(MemoryBuffer **memoryBuffers)
 {
 	if (this->gausstab == NULL) {
@@ -51,44 +62,45 @@ void GaussianBokehBlurOperation::updateGauss(MemoryBuffer **memoryBuffers)
 		int j, i;
 		const float width = this->getWidth();
 		const float height = this->getHeight();
-		updateSize(memoryBuffers);
-		
-		radxf = size*(float)this->data->sizex;
-		if (radxf>width/2.0f)
-			radxf = width/2.0f;
-		else if (radxf<1.0f)
+		if (!sizeavailable) {
+			updateSize(memoryBuffers);
+		}
+		radxf = size * (float)this->data->sizex;
+		if (radxf > width / 2.0f)
+			radxf = width / 2.0f;
+		else if (radxf < 1.0f)
 			radxf = 1.0f;
 	
 		/* vertical */
-		radyf = size*(float)this->data->sizey;
-		if (radyf>height/2.0f)
-			radyf = height/2.0f;
-		else if (radyf<1.0f)
+		radyf = size * (float)this->data->sizey;
+		if (radyf > height / 2.0f)
+			radyf = height / 2.0f;
+		else if (radyf < 1.0f)
 			radyf = 1.0f;
 	
 		radx = ceil(radxf);
 		rady = ceil(radyf);
 	
-		n = (2*radx+1)*(2*rady+1);
+		n = (2 * radx + 1) * (2 * rady + 1);
 	
 		/* create a full filter image */
 		ddgauss = new float[n];
 		dgauss = ddgauss;
 		val = 0.0f;
-		for (j=-rady; j<=rady; j++) {
-			for (i=-radx; i<=radx; i++, dgauss++) {
+		for (j = -rady; j <= rady; j++) {
+			for (i = -radx; i <= radx; i++, dgauss++) {
 				float fj = (float)j / radyf;
 				float fi = (float)i / radxf;
 				float dist = sqrt(fj * fj + fi * fi);
 				*dgauss = RE_filter_value(this->data->filtertype, dist);
 				
-				val+= *dgauss;
+				val += *dgauss;
 			}
 		}
-		if (val!=0.0f) {
-			val = 1.0f/val;
-			for (j = n - 1; j>=0; j--)
-				ddgauss[j]*= val;
+		if (val != 0.0f) {
+			val = 1.0f / val;
+			for (j = n - 1; j >= 0; j--)
+				ddgauss[j] *= val;
 		}
 		else ddgauss[4] = 1.0f;
 		
@@ -103,8 +115,8 @@ void GaussianBokehBlurOperation::executePixel(float *color, int x, int y, Memory
 	tempColor[1] = 0;
 	tempColor[2] = 0;
 	tempColor[3] = 0;
-	float overallmultiplyer = 0;
-	MemoryBuffer *inputBuffer = (MemoryBuffer*)data;
+	float multiplier_accum = 0;
+	MemoryBuffer *inputBuffer = (MemoryBuffer *)data;
 	float *buffer = inputBuffer->getBuffer();
 	int bufferwidth = inputBuffer->getWidth();
 	int bufferstartx = inputBuffer->getRect()->xmin;
@@ -119,33 +131,28 @@ void GaussianBokehBlurOperation::executePixel(float *color, int x, int y, Memory
 	maxy = min(maxy, inputBuffer->getRect()->ymax);
 	maxx = min(maxx, inputBuffer->getRect()->xmax);
 
-	int index = 0;
+	int index;
 	int step = QualityStepHelper::getStep();
 	int offsetadd = QualityStepHelper::getOffsetAdd();
-	for (int ny = miny ; ny < maxy ; ny +=step) {
-		int bufferindex = ((minx - bufferstartx)*4)+((ny-bufferstarty)*4*bufferwidth);
-		for (int nx = minx ; nx < maxx ; nx +=step) {
-			float multiplyer = gausstab[index];
-			tempColor[0] += multiplyer * buffer[bufferindex];
-			tempColor[1] += multiplyer * buffer[bufferindex+1];
-			tempColor[2] += multiplyer * buffer[bufferindex+2];
-			tempColor[3] += multiplyer * buffer[bufferindex+3];
-			overallmultiplyer += multiplyer;
+	for (int ny = miny; ny < maxy; ny += step) {
+		index = ((ny - y) + this->rady) * (this->radx * 2 + 1) + (minx - x + this->radx);
+		int bufferindex = ((minx - bufferstartx) * 4) + ((ny - bufferstarty) * 4 * bufferwidth);
+		for (int nx = minx; nx < maxx; nx += step) {
+			const float multiplier = gausstab[index];
+			madd_v4_v4fl(tempColor, &buffer[bufferindex], multiplier);
+			multiplier_accum += multiplier;
 			index += step;
-			bufferindex +=offsetadd;
+			bufferindex += offsetadd;
 		}
 	}
-	float divider = 1.0/overallmultiplyer;
-	color[0] = tempColor[0]*divider;
-	color[1] = tempColor[1]*divider;
-	color[2] = tempColor[2]*divider;
-	color[3] = tempColor[3]*divider;
+
+	mul_v4_v4fl(color, tempColor, 1.0f / multiplier_accum);
 }
 
 void GaussianBokehBlurOperation::deinitExecution()
 {
 	BlurBaseOperation::deinitExecution();
-	delete this->gausstab;
+	delete [] this->gausstab;
 	this->gausstab = NULL;
 }
 
@@ -157,25 +164,26 @@ bool GaussianBokehBlurOperation::determineDependingAreaOfInterest(rcti *input, R
 	sizeInput.ymin = 0;
 	sizeInput.xmax = 5;
 	sizeInput.ymax = 5;
-	NodeOperation * operation = this->getInputOperation(1);
+	NodeOperation *operation = this->getInputOperation(1);
 	
 	if (operation->determineDependingAreaOfInterest(&sizeInput, readOperation, output)) {
 		return true;
 	}
 	else {
-		if (this->gausstab) {
+		if (this->sizeavailable && this->gausstab != NULL) {
+			newInput.xmin = 0;
+			newInput.ymin = 0;
+			newInput.xmax = this->getWidth();
+			newInput.ymax = this->getHeight();
+		}
+		else {
 			int addx = radx;
 			int addy = rady;
 			newInput.xmax = input->xmax + addx;
 			newInput.xmin = input->xmin - addx;
 			newInput.ymax = input->ymax + addy;
 			newInput.ymin = input->ymin - addy;
-		}
-		else {
-			newInput.xmin = 0;
-			newInput.ymin = 0;
-			newInput.xmax = this->getWidth();
-			newInput.ymax = this->getHeight();
+
 		}
 		return BlurBaseOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
 	}
diff --git a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
index a7a0ee74364..616a6539ad4 100644
--- a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
+++ b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
@@ -34,16 +34,16 @@ private:
 
 public:
 	GaussianBokehBlurOperation();
-
+	void initExecution();
 	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
diff --git a/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
index 276efd90740..7a1964a4a63 100644
--- a/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
@@ -27,7 +27,7 @@ extern "C" {
 	#include "RE_pipeline.h"
 }
 
-GaussianXBlurOperation::GaussianXBlurOperation(): BlurBaseOperation()
+GaussianXBlurOperation::GaussianXBlurOperation() : BlurBaseOperation(COM_DT_COLOR)
 {
 	this->gausstab = NULL;
 	this->rad = 0;
@@ -36,17 +36,33 @@ GaussianXBlurOperation::GaussianXBlurOperation(): BlurBaseOperation()
 
 void *GaussianXBlurOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
 {
-	updateGauss(memoryBuffers);
+	if (!this->sizeavailable) {
+		updateGauss(memoryBuffers);
+	}
 	void *buffer = getInputOperation(0)->initializeTileData(NULL, memoryBuffers);
 	return buffer;
 }
 
+void GaussianXBlurOperation::initExecution()
+{
+	BlurBaseOperation::initExecution();
+
+	if (this->sizeavailable) {
+		float rad = size * this->data->sizex;
+		if (rad < 1)
+			rad = 1;
+
+		this->rad = rad;
+		this->gausstab = BlurBaseOperation::make_gausstab(rad);
+	}
+}
+
 void GaussianXBlurOperation::updateGauss(MemoryBuffer **memoryBuffers)
 {
 	if (this->gausstab == NULL) {
 		updateSize(memoryBuffers);
-		float rad = size*this->data->sizex;
-		if (rad<1)
+		float rad = size * this->data->sizex;
+		if (rad < 1)
 			rad = 1;
 
 		this->rad = rad;
@@ -56,13 +72,9 @@ void GaussianXBlurOperation::updateGauss(MemoryBuffer **memoryBuffers)
 
 void GaussianXBlurOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
 {
-	float tempColor[4];
-	tempColor[0] = 0;
-	tempColor[1] = 0;
-	tempColor[2] = 0;
-	tempColor[3] = 0;
-	float overallmultiplyer = 0;
-	MemoryBuffer *inputBuffer = (MemoryBuffer*)data;
+	float color_accum[4] = {0.0f, 0.0f, 0.0f, 0.0f};
+	float multiplier_accum = 0.0f;
+	MemoryBuffer *inputBuffer = (MemoryBuffer *)data;
 	float *buffer = inputBuffer->getBuffer();
 	int bufferwidth = inputBuffer->getWidth();
 	int bufferstartx = inputBuffer->getRect()->xmin;
@@ -77,30 +89,24 @@ void GaussianXBlurOperation::executePixel(float *color, int x, int y, MemoryBuff
 	maxy = min(maxy, inputBuffer->getRect()->ymax);
 	maxx = min(maxx, inputBuffer->getRect()->xmax);
 
-	int index = 0;
+	int index;
 	int step = getStep();
 	int offsetadd = getOffsetAdd();
-	int bufferindex = ((minx - bufferstartx)*4)+((miny-bufferstarty)*4*bufferwidth);
-	for (int nx = minx ; nx < maxx ; nx +=step) {
-		float multiplyer = gausstab[index++];
-		tempColor[0] += multiplyer * buffer[bufferindex];
-		tempColor[1] += multiplyer * buffer[bufferindex+1];
-		tempColor[2] += multiplyer * buffer[bufferindex+2];
-		tempColor[3] += multiplyer * buffer[bufferindex+3];
-		overallmultiplyer += multiplyer;
-		bufferindex +=offsetadd;
+	int bufferindex = ((minx - bufferstartx) * 4) + ((miny - bufferstarty) * 4 * bufferwidth);
+	for (int nx = minx; nx < maxx; nx += step) {
+		index = (nx - x) + this->rad;
+		const float multiplier = gausstab[index];
+		madd_v4_v4fl(color_accum, &buffer[bufferindex], multiplier);
+		multiplier_accum += multiplier;
+		bufferindex += offsetadd;
 	}
-	float divider = 1.0/overallmultiplyer;
-	color[0] = tempColor[0]*divider;
-	color[1] = tempColor[1]*divider;
-	color[2] = tempColor[2]*divider;
-	color[3] = tempColor[3]*divider;
+	mul_v4_v4fl(color, color_accum, 1.0f / multiplier_accum);
 }
 
 void GaussianXBlurOperation::deinitExecution()
 {
 	BlurBaseOperation::deinitExecution();
-	delete this->gausstab;
+	delete [] this->gausstab;
 	this->gausstab = NULL;
 }
 
@@ -113,23 +119,23 @@ bool GaussianXBlurOperation::determineDependingAreaOfInterest(rcti *input, ReadB
 	sizeInput.xmax = 5;
 	sizeInput.ymax = 5;
 	
-	NodeOperation * operation = this->getInputOperation(1);
+	NodeOperation *operation = this->getInputOperation(1);
 	if (operation->determineDependingAreaOfInterest(&sizeInput, readOperation, output)) {
 		return true;
 	}
 	else {
-		if (this->gausstab == NULL) {
-			newInput.xmax = this->getWidth();
-			newInput.xmin = 0;
-			newInput.ymax = this->getHeight();
-			newInput.ymin = 0;
-		}
-		else {
+		if (this->sizeavailable && this->gausstab != NULL) {
 			newInput.xmax = input->xmax + rad;
 			newInput.xmin = input->xmin - rad;
 			newInput.ymax = input->ymax;
 			newInput.ymin = input->ymin;
 		}
+		else {
+			newInput.xmax = this->getWidth();
+			newInput.xmin = 0;
+			newInput.ymax = this->getHeight();
+			newInput.ymin = 0;
+		}
 		return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
 	}
 }
diff --git a/source/blender/compositor/operations/COM_GaussianXBlurOperation.h b/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
index 704d063d28f..10a8a538391 100644
--- a/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
+++ b/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
@@ -34,13 +34,18 @@ public:
 	GaussianXBlurOperation();
 
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
+	 * @brief the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * @brief initialize the execution
+	 */
+	void initExecution();
+
+	/**
+	 * @brief Deinitialize the execution
+	 */
 	void deinitExecution();
 	
 	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
diff --git a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
index faef152dc31..06c1c78d85a 100644
--- a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
@@ -27,7 +27,7 @@ extern "C" {
 	#include "RE_pipeline.h"
 }
 
-GaussianYBlurOperation::GaussianYBlurOperation(): BlurBaseOperation()
+GaussianYBlurOperation::GaussianYBlurOperation() : BlurBaseOperation(COM_DT_COLOR)
 {
 	this->gausstab = NULL;
 	this->rad = 0;
@@ -35,17 +35,31 @@ GaussianYBlurOperation::GaussianYBlurOperation(): BlurBaseOperation()
 
 void *GaussianYBlurOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
 {
-	updateGauss(memoryBuffers);
+	if (!this->sizeavailable) {
+		updateGauss(memoryBuffers);
+	}
 	void *buffer = getInputOperation(0)->initializeTileData(NULL, memoryBuffers);
 	return buffer;
 }
 
+void GaussianYBlurOperation::initExecution()
+{
+	if (this->sizeavailable) {
+		float rad = size * this->data->sizey;
+		if (rad < 1)
+			rad = 1;
+
+		this->rad = rad;
+		this->gausstab = BlurBaseOperation::make_gausstab(rad);
+	}
+}
+
 void GaussianYBlurOperation::updateGauss(MemoryBuffer **memoryBuffers)
 {
 	if (this->gausstab == NULL) {
 		updateSize(memoryBuffers);
-		float rad = size*this->data->sizey;
-		if (rad<1)
+		float rad = size * this->data->sizey;
+		if (rad < 1)
 			rad = 1;
 		
 		this->rad = rad;
@@ -55,13 +69,9 @@ void GaussianYBlurOperation::updateGauss(MemoryBuffer **memoryBuffers)
 
 void GaussianYBlurOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
 {
-	float tempColor[4];
-	tempColor[0] = 0;
-	tempColor[1] = 0;
-	tempColor[2] = 0;
-	tempColor[3] = 0;
-	float overallmultiplyer = 0;
-	MemoryBuffer *inputBuffer = (MemoryBuffer*)data;
+	float color_accum[4] = {0.0f, 0.0f, 0.0f, 0.0f};
+	float multiplier_accum = 0.0f;
+	MemoryBuffer *inputBuffer = (MemoryBuffer *)data;
 	float *buffer = inputBuffer->getBuffer();
 	int bufferwidth = inputBuffer->getWidth();
 	int bufferstartx = inputBuffer->getRect()->xmin;
@@ -77,27 +87,21 @@ void GaussianYBlurOperation::executePixel(float *color, int x, int y, MemoryBuff
 	maxx = min(maxx, inputBuffer->getRect()->xmax);
 
 	int step = getStep();
-	int index = 0;
-	for (int ny = miny ; ny < maxy ; ny +=step) {
-		int bufferindex = ((minx - bufferstartx)*4)+((ny-bufferstarty)*4*bufferwidth);
-		float multiplyer = gausstab[index++];
-		tempColor[0] += multiplyer * buffer[bufferindex];
-		tempColor[1] += multiplyer * buffer[bufferindex+1];
-		tempColor[2] += multiplyer * buffer[bufferindex+2];
-		tempColor[3] += multiplyer * buffer[bufferindex+3];
-		overallmultiplyer += multiplyer;
+	int index;
+	for (int ny = miny; ny < maxy; ny += step) {
+		index = (ny - y) + this->rad;
+		int bufferindex = ((minx - bufferstartx) * 4) + ((ny - bufferstarty) * 4 * bufferwidth);
+		const float multiplier = gausstab[index];
+		madd_v4_v4fl(color_accum, &buffer[bufferindex], multiplier);
+		multiplier_accum += multiplier;
 	}
-	float divider = 1.0/overallmultiplyer;
-	color[0] = tempColor[0]*divider;
-	color[1] = tempColor[1]*divider;
-	color[2] = tempColor[2]*divider;
-	color[3] = tempColor[3]*divider;
+	mul_v4_v4fl(color, color_accum, 1.0f / multiplier_accum);
 }
 
 void GaussianYBlurOperation::deinitExecution()
 {
 	BlurBaseOperation::deinitExecution();
-	delete this->gausstab;
+	delete [] this->gausstab;
 	this->gausstab = NULL;
 }
 
@@ -110,23 +114,23 @@ bool GaussianYBlurOperation::determineDependingAreaOfInterest(rcti *input, ReadB
 	sizeInput.xmax = 5;
 	sizeInput.ymax = 5;
 	
-	NodeOperation * operation = this->getInputOperation(1);
+	NodeOperation *operation = this->getInputOperation(1);
 	if (operation->determineDependingAreaOfInterest(&sizeInput, readOperation, output)) {
 		return true;
 	}
 	else {
-		if (this->gausstab == NULL) {
-			newInput.xmax = this->getWidth();
-			newInput.xmin = 0;
-			newInput.ymax = this->getHeight();
-			newInput.ymin = 0;
-		}
-		else {
+		if (this->sizeavailable && this->gausstab != NULL) {
 			newInput.xmax = input->xmax;
 			newInput.xmin = input->xmin;
 			newInput.ymax = input->ymax + rad;
 			newInput.ymin = input->ymin - rad;
 		}
+		else {
+			newInput.xmax = this->getWidth();
+			newInput.xmin = 0;
+			newInput.ymax = this->getHeight();
+			newInput.ymin = 0;
+		}
 		return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
 	}
 }
diff --git a/source/blender/compositor/operations/COM_GaussianYBlurOperation.h b/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
index c9baf27b1d6..e8d362e4c32 100644
--- a/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
+++ b/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
@@ -34,13 +34,18 @@ public:
 	GaussianYBlurOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * @brief initialize the execution
+	 */
+	void initExecution();
+
+	/**
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
 	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
diff --git a/source/blender/compositor/operations/COM_GlareBaseOperation.cpp b/source/blender/compositor/operations/COM_GlareBaseOperation.cpp
index fdfd19a10ae..90bdd705a7c 100644
--- a/source/blender/compositor/operations/COM_GlareBaseOperation.cpp
+++ b/source/blender/compositor/operations/COM_GlareBaseOperation.cpp
@@ -23,56 +23,41 @@
 #include "COM_GlareBaseOperation.h"
 #include "BLI_math.h"
 
-GlareBaseOperation::GlareBaseOperation(): NodeOperation()
+GlareBaseOperation::GlareBaseOperation() : SingleThreadedNodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addOutputSocket(COM_DT_COLOR);
 	this->settings = NULL;
-	this->cachedInstance = NULL;
-	setComplex(true);
 }
 void GlareBaseOperation::initExecution()
 {
-	initMutex();
+	SingleThreadedNodeOperation::initExecution();
 	this->inputProgram = getInputSocketReader(0);
-	this->cachedInstance = NULL;
-}
-
-void GlareBaseOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)\
-{
-	float *buffer = (float*) data;
-	int index = (y*this->getWidth() + x) * COM_NUMBER_OF_CHANNELS;
-	color[0] = buffer[index];
-	color[1] = buffer[index+1];
-	color[2] = buffer[index+2];
-	color[3] = buffer[index+3];
 }
 
 void GlareBaseOperation::deinitExecution()
 {
-	deinitMutex();
 	this->inputProgram = NULL;
-	if (this->cachedInstance) {
-		delete cachedInstance;
-		this->cachedInstance = NULL;
-	}
+	SingleThreadedNodeOperation::deinitExecution();
 }
-void *GlareBaseOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
+
+MemoryBuffer *GlareBaseOperation::createMemoryBuffer(rcti *rect2, MemoryBuffer **memoryBuffers)
 {
-	BLI_mutex_lock(getMutex());
-	if (this->cachedInstance == NULL) {
-		MemoryBuffer *tile = (MemoryBuffer*)inputProgram->initializeTileData(rect, memoryBuffers);
-		float *data = new float[this->getWidth()*this->getHeight()*COM_NUMBER_OF_CHANNELS];
-		this->generateGlare(data, tile, this->settings);
-		this->cachedInstance = data;
-	}
-	BLI_mutex_unlock(getMutex());
-	return this->cachedInstance;
+	MemoryBuffer *tile = (MemoryBuffer *)inputProgram->initializeTileData(rect2, memoryBuffers);
+	rcti rect;
+	rect.xmin = 0;
+	rect.ymin = 0;
+	rect.xmax = getWidth();
+	rect.ymax = getHeight();
+	MemoryBuffer *result = new MemoryBuffer(NULL, &rect);
+	float *data = result->getBuffer();
+	this->generateGlare(data, tile, this->settings);
+	return result;
 }
 
 bool GlareBaseOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
 {
-	if (this->cachedInstance != NULL) {
+	if (isCached()) {
 		return false;
 	}
 	else {
diff --git a/source/blender/compositor/operations/COM_GlareBaseOperation.h b/source/blender/compositor/operations/COM_GlareBaseOperation.h
index e06244d3cdd..ac67ac055e9 100644
--- a/source/blender/compositor/operations/COM_GlareBaseOperation.h
+++ b/source/blender/compositor/operations/COM_GlareBaseOperation.h
@@ -15,56 +15,60 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributor: 
- *		Jeroen Bakker 
+ * Contributor:
+ *		Jeroen Bakker
  *		Monique Dewanchand
  */
 
 #ifndef _COM_GlareBaseOperation_h
 #define _COM_GlareBaseOperation_h
-#include "COM_NodeOperation.h"
+
+#include "COM_SingleThreadedNodeOperation.h"
 #include "DNA_node_types.h"
 
-class GlareBaseOperation : public NodeOperation {
+
+/* utility functions used by glare, tonemap and lens distortion */
+/* soms macros for color handling */
+typedef float fRGB[4];
+
+/* TODO - replace with BLI_math_vector */
+/* multiply c2 by color rgb, rgb as separate arguments */
+#define fRGB_rgbmult(c, r, g, b) { c[0] *= (r);  c[1] *= (g);  c[2] *= (b); } (void)0
+
+
+class GlareBaseOperation : public SingleThreadedNodeOperation {
 private:
 	/**
-	  * @brief Cached reference to the inputProgram
-	  */
-	SocketReader * inputProgram;
-	
-	/**
-	  * @brief settings of the glare node.
-	  */
-	NodeGlare * settings;
-	
-	float *cachedInstance;
+	 * @brief Cached reference to the inputProgram
+	 */
+	SocketReader *inputProgram;
 
-public:
-	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
-	
+	 * @brief settings of the glare node.
+	 */
+	NodeGlare *settings;
+public:
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
-	
+
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 
-	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
-
-	void setGlareSettings(NodeGlare * settings) {this->settings = settings;}
+	void setGlareSettings(NodeGlare *settings) {
+		this->settings = settings;
+	}
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
+
 protected:
 	GlareBaseOperation();
-	
+
 	virtual void generateGlare(float *data, MemoryBuffer *inputTile, NodeGlare *settings) = 0;
-	
-	
+
+	MemoryBuffer *createMemoryBuffer(rcti *rect, MemoryBuffer **memoryBuffers);
+
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp b/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
new file mode 100644
index 00000000000..694aa26bcde
--- /dev/null
+++ b/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
@@ -0,0 +1,405 @@
+/*
+ * Copyright 2011, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor:
+ *		Jeroen Bakker
+ *		Monique Dewanchand
+ */
+
+#include "COM_GlareFogGlowOperation.h"
+#include "MEM_guardedalloc.h"
+
+/*
+ *  2D Fast Hartley Transform, used for convolution
+ */
+
+typedef float fREAL;
+
+// returns next highest power of 2 of x, as well it's log2 in L2
+static unsigned int nextPow2(unsigned int x, unsigned int *L2)
+{
+	unsigned int pw, x_notpow2 = x & (x - 1);
+	*L2 = 0;
+	while (x >>= 1) ++(*L2);
+	pw = 1 << (*L2);
+	if (x_notpow2) { (*L2)++;  pw <<= 1; }
+	return pw;
+}
+
+//------------------------------------------------------------------------------
+
+// from FXT library by Joerg Arndt, faster in order bitreversal
+// use: r = revbin_upd(r, h) where h = N>>1
+static unsigned int revbin_upd(unsigned int r, unsigned int h)
+{
+	while (!((r ^= h) & h)) h >>= 1;
+	return r;
+}
+//------------------------------------------------------------------------------
+static void FHT(fREAL *data, unsigned int M, unsigned int inverse)
+{
+	double tt, fc, dc, fs, ds, a = M_PI;
+	fREAL t1, t2;
+	int n2, bd, bl, istep, k, len = 1 << M, n = 1;
+
+	int i, j = 0;
+	unsigned int Nh = len >> 1;
+	for (i = 1; i < (len - 1); ++i) {
+		j = revbin_upd(j, Nh);
+		if (j > i) {
+			t1 = data[i];
+			data[i] = data[j];
+			data[j] = t1;
+		}
+	}
+
+	do {
+		fREAL *data_n = &data[n];
+
+		istep = n << 1;
+		for (k = 0; k < len; k += istep) {
+			t1 = data_n[k];
+			data_n[k] = data[k] - t1;
+			data[k] += t1;
+		}
+
+		n2 = n >> 1;
+		if (n > 2) {
+			fc = dc = cos(a);
+			fs = ds = sqrt(1.0 - fc * fc); //sin(a);
+			bd = n - 2;
+			for (bl = 1; bl < n2; bl++) {
+				fREAL *data_nbd = &data_n[bd];
+				fREAL *data_bd = &data[bd];
+				for (k = bl; k < len; k += istep) {
+					t1 = fc * data_n[k] + fs * data_nbd[k];
+					t2 = fs * data_n[k] - fc * data_nbd[k];
+					data_n[k] = data[k] - t1;
+					data_nbd[k] = data_bd[k] - t2;
+					data[k] += t1;
+					data_bd[k] += t2;
+				}
+				tt = fc * dc - fs * ds;
+				fs = fs * dc + fc * ds;
+				fc = tt;
+				bd -= 2;
+			}
+		}
+
+		if (n > 1) {
+			for (k = n2; k < len; k += istep) {
+				t1 = data_n[k];
+				data_n[k] = data[k] - t1;
+				data[k] += t1;
+			}
+		}
+
+		n = istep;
+		a *= 0.5;
+	} while (n < len);
+
+	if (inverse) {
+		fREAL sc = (fREAL)1 / (fREAL)len;
+		for (k = 0; k < len; ++k)
+			data[k] *= sc;
+	}
+}
+//------------------------------------------------------------------------------
+/* 2D Fast Hartley Transform, Mx/My -> log2 of width/height,
+    nzp -> the row where zero pad data starts,
+    inverse -> see above */
+static void FHT2D(fREAL *data, unsigned int Mx, unsigned int My,
+                  unsigned int nzp, unsigned int inverse)
+{
+	unsigned int i, j, Nx, Ny, maxy;
+	fREAL t;
+
+	Nx = 1 << Mx;
+	Ny = 1 << My;
+
+	// rows (forward transform skips 0 pad data)
+	maxy = inverse ? Ny : nzp;
+	for (j = 0; j < maxy; ++j)
+		FHT(&data[Nx * j], Mx, inverse);
+
+	// transpose data
+	if (Nx == Ny) {  // square
+		for (j = 0; j < Ny; ++j)
+			for (i = j + 1; i < Nx; ++i) {
+				unsigned int op = i + (j << Mx), np = j + (i << My);
+				t = data[op], data[op] = data[np], data[np] = t;
+			}
+	}
+	else {  // rectangular
+		unsigned int k, Nym = Ny - 1, stm = 1 << (Mx + My);
+		for (i = 0; stm > 0; i++) {
+			#define PRED(k) (((k & Nym) << Mx) + (k >> My))
+			for (j = PRED(i); j > i; j = PRED(j)) ;
+			if (j < i) continue;
+			for (k = i, j = PRED(i); j != i; k = j, j = PRED(j), stm--) {
+				t = data[j], data[j] = data[k], data[k] = t;
+			}
+			#undef PRED
+			stm--;
+		}
+	}
+	// swap Mx/My & Nx/Ny
+	i = Nx, Nx = Ny, Ny = i;
+	i = Mx, Mx = My, My = i;
+
+	// now columns == transposed rows
+	for (j = 0; j < Ny; ++j)
+		FHT(&data[Nx * j], Mx, inverse);
+
+	// finalize
+	for (j = 0; j <= (Ny >> 1); j++) {
+		unsigned int jm = (Ny - j) & (Ny - 1);
+		unsigned int ji = j << Mx;
+		unsigned int jmi = jm << Mx;
+		for (i = 0; i <= (Nx >> 1); i++) {
+			unsigned int im = (Nx - i) & (Nx - 1);
+			fREAL A = data[ji + i];
+			fREAL B = data[jmi + i];
+			fREAL C = data[ji + im];
+			fREAL D = data[jmi + im];
+			fREAL E = (fREAL)0.5 * ((A + D) - (B + C));
+			data[ji + i] = A - E;
+			data[jmi + i] = B + E;
+			data[ji + im] = C + E;
+			data[jmi + im] = D - E;
+		}
+	}
+
+}
+
+//------------------------------------------------------------------------------
+
+/* 2D convolution calc, d1 *= d2, M/N - > log2 of width/height */
+static void fht_convolve(fREAL *d1, fREAL *d2, unsigned int M, unsigned int N)
+{
+	fREAL a, b;
+	unsigned int i, j, k, L, mj, mL;
+	unsigned int m = 1 << M, n = 1 << N;
+	unsigned int m2 = 1 << (M - 1), n2 = 1 << (N - 1);
+	unsigned int mn2 = m << (N - 1);
+
+	d1[0] *= d2[0];
+	d1[mn2] *= d2[mn2];
+	d1[m2] *= d2[m2];
+	d1[m2 + mn2] *= d2[m2 + mn2];
+	for (i = 1; i < m2; i++) {
+		k = m - i;
+		a = d1[i] * d2[i] - d1[k] * d2[k];
+		b = d1[k] * d2[i] + d1[i] * d2[k];
+		d1[i] = (b + a) * (fREAL)0.5;
+		d1[k] = (b - a) * (fREAL)0.5;
+		a = d1[i + mn2] * d2[i + mn2] - d1[k + mn2] * d2[k + mn2];
+		b = d1[k + mn2] * d2[i + mn2] + d1[i + mn2] * d2[k + mn2];
+		d1[i + mn2] = (b + a) * (fREAL)0.5;
+		d1[k + mn2] = (b - a) * (fREAL)0.5;
+	}
+	for (j = 1; j < n2; j++) {
+		L = n - j;
+		mj = j << M;
+		mL = L << M;
+		a = d1[mj] * d2[mj] - d1[mL] * d2[mL];
+		b = d1[mL] * d2[mj] + d1[mj] * d2[mL];
+		d1[mj] = (b + a) * (fREAL)0.5;
+		d1[mL] = (b - a) * (fREAL)0.5;
+		a = d1[m2 + mj] * d2[m2 + mj] - d1[m2 + mL] * d2[m2 + mL];
+		b = d1[m2 + mL] * d2[m2 + mj] + d1[m2 + mj] * d2[m2 + mL];
+		d1[m2 + mj] = (b + a) * (fREAL)0.5;
+		d1[m2 + mL] = (b - a) * (fREAL)0.5;
+	}
+	for (i = 1; i < m2; i++) {
+		k = m - i;
+		for (j = 1; j < n2; j++) {
+			L = n - j;
+			mj = j << M;
+			mL = L << M;
+			a = d1[i + mj] * d2[i + mj] - d1[k + mL] * d2[k + mL];
+			b = d1[k + mL] * d2[i + mj] + d1[i + mj] * d2[k + mL];
+			d1[i + mj] = (b + a) * (fREAL)0.5;
+			d1[k + mL] = (b - a) * (fREAL)0.5;
+			a = d1[i + mL] * d2[i + mL] - d1[k + mj] * d2[k + mj];
+			b = d1[k + mj] * d2[i + mL] + d1[i + mL] * d2[k + mj];
+			d1[i + mL] = (b + a) * (fREAL)0.5;
+			d1[k + mj] = (b - a) * (fREAL)0.5;
+		}
+	}
+}
+//------------------------------------------------------------------------------
+
+void convolve(float *dst, MemoryBuffer *in1, MemoryBuffer *in2)
+{
+	fREAL *data1, *data2, *fp;
+	unsigned int w2, h2, hw, hh, log2_w, log2_h;
+	fRGB wt, *colp;
+	int x, y, ch;
+	int xbl, ybl, nxb, nyb, xbsz, ybsz;
+	int in2done = FALSE;
+	const unsigned int kernelWidth = in2->getWidth();
+	const unsigned int kernelHeight = in2->getHeight();
+	const unsigned int imageWidth = in1->getWidth();
+	const unsigned int imageHeight = in1->getHeight();
+	float *kernelBuffer = in2->getBuffer();
+	float *imageBuffer = in1->getBuffer();
+
+	MemoryBuffer *rdst = new MemoryBuffer(NULL, in1->getRect());
+
+	// convolution result width & height
+	w2 = 2 * kernelWidth - 1;
+	h2 = 2 * kernelHeight - 1;
+	// FFT pow2 required size & log2
+	w2 = nextPow2(w2, &log2_w);
+	h2 = nextPow2(h2, &log2_h);
+
+	// alloc space
+	data1 = (fREAL *)MEM_callocN(3 * w2 * h2 * sizeof(fREAL), "convolve_fast FHT data1");
+	data2 = (fREAL *)MEM_callocN(w2 * h2 * sizeof(fREAL), "convolve_fast FHT data2");
+
+	// normalize convolutor
+	wt[0] = wt[1] = wt[2] = 0.f;
+	for (y = 0; y < kernelHeight; y++) {
+		colp = (fRGB *)&kernelBuffer[y * kernelWidth * COM_NUMBER_OF_CHANNELS];
+		for (x = 0; x < kernelWidth; x++)
+			add_v3_v3(wt, colp[x]);
+	}
+	if (wt[0] != 0.f) wt[0] = 1.f / wt[0];
+	if (wt[1] != 0.f) wt[1] = 1.f / wt[1];
+	if (wt[2] != 0.f) wt[2] = 1.f / wt[2];
+	for (y = 0; y < kernelHeight; y++) {
+		colp = (fRGB *)&kernelBuffer[y * kernelWidth * COM_NUMBER_OF_CHANNELS];
+		for (x = 0; x < kernelWidth; x++)
+			mul_v3_v3(colp[x], wt);
+	}
+
+	// copy image data, unpacking interleaved RGBA into separate channels
+	// only need to calc data1 once
+
+	// block add-overlap
+	hw = kernelWidth >> 1;
+	hh = kernelHeight >> 1;
+	xbsz = (w2 + 1) - kernelWidth;
+	ybsz = (h2 + 1) - kernelHeight;
+	nxb = imageWidth / xbsz;
+	if (imageWidth % xbsz) nxb++;
+	nyb = imageHeight / ybsz;
+	if (imageHeight % ybsz) nyb++;
+	for (ybl = 0; ybl < nyb; ybl++) {
+		for (xbl = 0; xbl < nxb; xbl++) {
+
+			// each channel one by one
+			for (ch = 0; ch < 3; ch++) {
+				fREAL *data1ch = &data1[ch * w2 * h2];
+
+				// only need to calc fht data from in2 once, can re-use for every block
+				if (!in2done) {
+					// in2, channel ch -> data1
+					for (y = 0; y < kernelHeight; y++) {
+						fp = &data1ch[y * w2];
+						colp = (fRGB *)&kernelBuffer[y * kernelWidth * COM_NUMBER_OF_CHANNELS];
+						for (x = 0; x < kernelWidth; x++)
+							fp[x] = colp[x][ch];
+					}
+				}
+
+				// in1, channel ch -> data2
+				memset(data2, 0, w2 * h2 * sizeof(fREAL));
+				for (y = 0; y < ybsz; y++) {
+					int yy = ybl * ybsz + y;
+					if (yy >= imageHeight) continue;
+					fp = &data2[y * w2];
+					colp = (fRGB *)&imageBuffer[yy * imageWidth * COM_NUMBER_OF_CHANNELS];
+					for (x = 0; x < xbsz; x++) {
+						int xx = xbl * xbsz + x;
+						if (xx >= imageWidth) continue;
+						fp[x] = colp[xx][ch];
+					}
+				}
+
+				// forward FHT
+				// zero pad data start is different for each == height+1
+				if (!in2done) FHT2D(data1ch, log2_w, log2_h, kernelHeight + 1, 0);
+				FHT2D(data2, log2_w, log2_h, kernelHeight + 1, 0);
+
+				// FHT2D transposed data, row/col now swapped
+				// convolve & inverse FHT
+				fht_convolve(data2, data1ch, log2_h, log2_w);
+				FHT2D(data2, log2_h, log2_w, 0, 1);
+				// data again transposed, so in order again
+
+				// overlap-add result
+				for (y = 0; y < (int)h2; y++) {
+					const int yy = ybl * ybsz + y - hh;
+					if ((yy < 0) || (yy >= imageHeight)) continue;
+					fp = &data2[y * w2];
+					colp = (fRGB *)&rdst->getBuffer()[yy * imageWidth * COM_NUMBER_OF_CHANNELS];
+					for (x = 0; x < (int)w2; x++) {
+						const int xx = xbl * xbsz + x - hw;
+						if ((xx < 0) || (xx >= imageWidth)) continue;
+						colp[xx][ch] += fp[x];
+					}
+				}
+
+			}
+			in2done = TRUE;
+		}
+	}
+
+	MEM_freeN(data2);
+	MEM_freeN(data1);
+	memcpy(dst, rdst->getBuffer(), sizeof(float) * imageWidth * imageHeight * COM_NUMBER_OF_CHANNELS);
+	delete(rdst);
+}
+
+void GlareFogGlowOperation::generateGlare(float *data, MemoryBuffer *inputTile, NodeGlare *settings)
+{
+	int x, y;
+	float scale, u, v, r, w, d;
+	fRGB fcol;
+	MemoryBuffer *ckrn;
+	unsigned int sz = 1 << settings->size;
+	const float cs_r = 1.f, cs_g = 1.f, cs_b = 1.f;
+
+	// temp. src image
+	// make the convolution kernel
+	rcti kernelRect;
+	BLI_init_rcti(&kernelRect, 0, sz, 0, sz);
+	ckrn = new MemoryBuffer(NULL, &kernelRect);
+
+	scale = 0.25f * sqrtf((float)(sz * sz));
+
+	for (y = 0; y < sz; ++y) {
+		v = 2.f * (y / (float)sz) - 1.0f;
+		for (x = 0; x < sz; ++x) {
+			u = 2.f * (x / (float)sz) - 1.0f;
+			r = (u * u + v * v) * scale;
+			d = -sqrtf(sqrtf(sqrtf(r))) * 9.0f;
+			fcol[0] = expf(d * cs_r), fcol[1] = expf(d * cs_g), fcol[2] = expf(d * cs_b);
+			// linear window good enough here, visual result counts, not scientific analysis
+			//w = (1.f-fabs(u))*(1.f-fabs(v));
+			// actually, Hanning window is ok, cos^2 for some reason is slower
+			w = (0.5f + 0.5f * cos((double)u * M_PI)) * (0.5f + 0.5f * cos((double)v * M_PI));
+			mul_v3_fl(fcol, w);
+			ckrn->writePixel(x, y, fcol);
+		}
+	}
+
+	convolve(data, inputTile, ckrn);
+	delete ckrn;
+}
diff --git a/intern/cycles/kernel/osl/nodes/node_clouds_texture.osl b/source/blender/compositor/operations/COM_GlareFogGlowOperation.h
index 6d244d81e27..5737a6a1ff0 100644
--- a/intern/cycles/kernel/osl/nodes/node_clouds_texture.osl
+++ b/source/blender/compositor/operations/COM_GlareFogGlowOperation.h
@@ -14,29 +14,23 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor:
+ *		Jeroen Bakker
+ *		Monique Dewanchand
  */
 
-#include "stdosl.h"
-#include "node_texture.h"
-
-/* Turbulence */
-
-shader node_clouds_texture(
-	string Basis = "Perlin",
-	int Hard = 0,
-	int Depth = 2,
-	float Size = 0.25,
-	point Vector = P,
-	output float Fac = 0.0,
-	output color Color = color(0.0, 0.0, 0.0))
-{
-	float size = nonzero(Size, 1e-5);
-	point p = Vector/size;
-
-	Fac = noise_turbulence(p, Basis, Depth, Hard);
-
-	Color[0] = Fac;
-	Color[1] = noise_turbulence(point(p[1], p[0], p[2]), Basis, Depth, Hard);
-	Color[2] = noise_turbulence(point(p[1], p[2], p[0]), Basis, Depth, Hard);
-}
+#ifndef _COM_GlareFogGlowOperation_h
+#define _COM_GlareFogGlowOperation_h
+#include "COM_NodeOperation.h"
+#include "DNA_node_types.h"
+#include "COM_GlareBaseOperation.h"
 
+class GlareFogGlowOperation : public GlareBaseOperation {
+public:
+	GlareFogGlowOperation() : GlareBaseOperation() {
+	}
+protected:
+	void generateGlare(float *data, MemoryBuffer *inputTile, NodeGlare *settings);
+};
+#endif
diff --git a/source/blender/compositor/operations/COM_GlareGhostOperation.cpp b/source/blender/compositor/operations/COM_GlareGhostOperation.cpp
new file mode 100644
index 00000000000..39fffd6ac64
--- /dev/null
+++ b/source/blender/compositor/operations/COM_GlareGhostOperation.cpp
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2011, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor:
+ *		Jeroen Bakker
+ *		Monique Dewanchand
+ */
+
+#include "COM_GlareGhostOperation.h"
+#include "BLI_math.h"
+#include "COM_FastGaussianBlurOperation.h"
+
+static float smoothMask(float x, float y)
+{
+	float t;
+	x = 2.0f * x - 1.0f;
+	y = 2.0f * y - 1.0f;
+	if ((t = 1.0f - sqrtf(x * x + y * y)) > 0.0f) {
+		return t;
+	}
+	else {
+		return 0.0f;
+	}
+}
+
+void GlareGhostOperation::generateGlare(float *data, MemoryBuffer *inputTile, NodeGlare *settings)
+{
+	const int qt = 1 << settings->quality;
+	const float s1 = 4.f / (float)qt, s2 = 2.f * s1;
+	int x, y, n, p, np;
+	fRGB c, tc, cm[64];
+	float sc, isc, u, v, sm, s, t, ofs, scalef[64];
+	const float cmo = 1.f - settings->colmod;
+
+	MemoryBuffer *gbuf = inputTile->duplicate();
+	MemoryBuffer *tbuf1 = inputTile->duplicate();
+
+	bool breaked = false;
+
+	FastGaussianBlurOperation::IIR_gauss(tbuf1, s1, 0, 3);
+	if (!breaked) FastGaussianBlurOperation::IIR_gauss(tbuf1, s1, 1, 3);
+	if (isBreaked()) breaked = true;
+	if (!breaked) FastGaussianBlurOperation::IIR_gauss(tbuf1, s1, 2, 3);
+
+	MemoryBuffer *tbuf2 = tbuf1->duplicate();
+
+	if (isBreaked()) breaked = true;
+	if (!breaked) FastGaussianBlurOperation::IIR_gauss(tbuf2, s2, 0, 3);
+	if (isBreaked()) breaked = true;
+	if (!breaked) FastGaussianBlurOperation::IIR_gauss(tbuf2, s2, 1, 3);
+	if (isBreaked()) breaked = true;
+	if (!breaked) FastGaussianBlurOperation::IIR_gauss(tbuf2, s2, 2, 3);
+
+	if (settings->iter & 1) ofs = 0.5f; else ofs = 0.f;
+	for (x = 0; x < (settings->iter * 4); x++) {
+		y = x & 3;
+		cm[x][0] = cm[x][1] = cm[x][2] = 1;
+		if (y == 1) fRGB_rgbmult(cm[x], 1.f, cmo, cmo);
+		if (y == 2) fRGB_rgbmult(cm[x], cmo, cmo, 1.f);
+		if (y == 3) fRGB_rgbmult(cm[x], cmo, 1.f, cmo);
+		scalef[x] = 2.1f * (1.f - (x + ofs) / (float)(settings->iter * 4));
+		if (x & 1) scalef[x] = -0.99f / scalef[x];
+	}
+
+	sc = 2.13;
+	isc = -0.97;
+	for (y = 0; y < gbuf->getHeight() && (!breaked); y++) {
+		v = (float)(y + 0.5f) / (float)gbuf->getHeight();
+		for (x = 0; x < gbuf->getWidth(); x++) {
+			u = (float)(x + 0.5f) / (float)gbuf->getWidth();
+			s = (u - 0.5f) * sc + 0.5f, t = (v - 0.5f) * sc + 0.5f;
+			tbuf1->read(c, s * gbuf->getWidth(), t * gbuf->getHeight());
+			sm = smoothMask(s, t);
+			mul_v3_fl(c, sm);
+			s = (u - 0.5f) * isc + 0.5f, t = (v - 0.5f) * isc + 0.5f;
+			tbuf2->read(tc, s * gbuf->getWidth() - 0.5f, t * gbuf->getHeight() - 0.5f);
+			sm = smoothMask(s, t);
+			madd_v3_v3fl(c, tc, sm);
+
+			gbuf->writePixel(x, y, c);
+		}
+		if (isBreaked()) breaked = true;
+
+	}
+
+	memset(tbuf1->getBuffer(), 0, tbuf1->getWidth() * tbuf1->getHeight() * COM_NUMBER_OF_CHANNELS * sizeof(float));
+	for (n = 1; n < settings->iter && (!breaked); n++) {
+		for (y = 0; y < gbuf->getHeight() && (!breaked); y++) {
+			v = (float)(y + 0.5f) / (float)gbuf->getHeight();
+			for (x = 0; x < gbuf->getWidth(); x++) {
+				u = (float)(x + 0.5f) / (float)gbuf->getWidth();
+				tc[0] = tc[1] = tc[2] = 0.f;
+				for (p = 0; p < 4; p++) {
+					np = (n << 2) + p;
+					s = (u - 0.5f) * scalef[np] + 0.5f;
+					t = (v - 0.5f) * scalef[np] + 0.5f;
+					gbuf->read(c, s * gbuf->getWidth() - 0.5f, t * gbuf->getHeight() - 0.5f);
+					mul_v3_v3(c, cm[np]);
+					sm = smoothMask(s, t) * 0.25f;
+					madd_v3_v3fl(tc, c, sm);
+				}
+				tbuf1->addPixel(x, y, tc);
+			}
+			if (isBreaked()) breaked = true;
+		}
+		memcpy(gbuf->getBuffer(), tbuf1->getBuffer(), tbuf1->getWidth() * tbuf1->getHeight() * COM_NUMBER_OF_CHANNELS * sizeof(float));
+	}
+	memcpy(data, gbuf->getBuffer(), gbuf->getWidth() * gbuf->getHeight() * COM_NUMBER_OF_CHANNELS * sizeof(float));
+
+	delete gbuf;
+	delete tbuf1;
+	delete tbuf2;
+}
diff --git a/intern/cycles/kernel/osl/nodes/node_stucci_texture.osl b/source/blender/compositor/operations/COM_GlareGhostOperation.h
index f03e03d9a98..2ee85cc4543 100644
--- a/intern/cycles/kernel/osl/nodes/node_stucci_texture.osl
+++ b/source/blender/compositor/operations/COM_GlareGhostOperation.h
@@ -14,36 +14,23 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor:
+ *		Jeroen Bakker
+ *		Monique Dewanchand
  */
 
-#include "stdosl.h"
-#include "node_texture.h"
-
-/* Stucci */
-
-shader node_stucci_texture(
-	string Type = "Plastic",
-	string Basis = "Perlin",
-	int Hard = 0,
-	float Turbulence = 1.0,
-	float Size = 0.25,
-	point Vector = P,
-	output float Fac = 0.0)
-{
-	float size = nonzero(Size, 1e-5);
-	point p = Vector/size;
-
-	float b2 = noise_basis_hard(p, Basis, Hard);
-	float ofs = Turbulence/200.0;
-
-	if(Type != "Plastic")
-		ofs *= b2*b2;
-	
-	Fac = noise_basis_hard(point(p[0], p[1], p[2]+ofs), Basis, Hard);
-
-	if(Type == "Wall Out")
-		Fac = 1.0 - Fac;
-	
-	Fac = max(Fac, 0.0);
-}
+#ifndef _COM_GlareGhostOperation_h
+#define _COM_GlareGhostOperation_h
+#include "COM_NodeOperation.h"
+#include "DNA_node_types.h"
+#include "COM_GlareBaseOperation.h"
 
+class GlareGhostOperation : public GlareBaseOperation {
+public:
+	GlareGhostOperation() : GlareBaseOperation() {
+	}
+protected:
+	void generateGlare(float *data, MemoryBuffer *inputTile, NodeGlare *settings);
+};
+#endif
diff --git a/source/blender/compositor/operations/COM_GlareSimpleStarOperation.cpp b/source/blender/compositor/operations/COM_GlareSimpleStarOperation.cpp
index 602e18521ee..957ac5af748 100644
--- a/source/blender/compositor/operations/COM_GlareSimpleStarOperation.cpp
+++ b/source/blender/compositor/operations/COM_GlareSimpleStarOperation.cpp
@@ -15,8 +15,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributor: 
- *		Jeroen Bakker 
+ * Contributor:
+ *		Jeroen Bakker
  *		Monique Dewanchand
  */
 
@@ -25,87 +25,77 @@
 void GlareSimpleStarOperation::generateGlare(float *data, MemoryBuffer *inputTile, NodeGlare *settings)
 {
 	int i, x, y, ym, yp, xm, xp;
-	float c[4] = {0,0,0,0}, tc[4] = {0,0,0,0};
-	const float f1 = 1.f - settings->fade, f2 = (1.f - f1)*0.5f;
-
+	float c[4] = {0, 0, 0, 0}, tc[4] = {0, 0, 0, 0};
+	const float f1 = 1.0f - settings->fade;
+	const float f2 = (1.0f - f1) * 0.5f;
 
 	MemoryBuffer *tbuf1 = inputTile->duplicate();
 	MemoryBuffer *tbuf2 = inputTile->duplicate();
 
-	for (i=0; i<settings->iter; i++) {
+	bool breaked = false;
+	for (i = 0; i < settings->iter && (!breaked); i++) {
 //		// (x || x-1, y-1) to (x || x+1, y+1)
 //		// F
-		for (y=0; y<this->getHeight(); y++) {
+		for (y = 0; y < this->getHeight() && (!breaked); y++) {
 			ym = y - i;
 			yp = y + i;
-			for (x=0; x<this->getWidth(); x++) {
+			for (x = 0; x < this->getWidth(); x++) {
 				xm = x - i;
 				xp = x + i;
 				tbuf1->read(c, x, y);
-				c[0]*=f1; c[1]*=f1 ; c[2] *=f1;
+				mul_v3_fl(c, f1);
 				tbuf1->read(tc, (settings->angle ? xm : x), ym);
-				c[0]+=tc[0]*f2;
-				c[1]+=tc[1]*f2;
-				c[2]+=tc[2]*f2;
+				madd_v3_v3fl(c, tc, f2);
 				tbuf1->read(tc, (settings->angle ? xp : x), yp);
-				c[0]+=tc[0]*f2;
-				c[1]+=tc[1]*f2;
-				c[2]+=tc[2]*f2;
+				madd_v3_v3fl(c, tc, f2);
 				c[3] = 1.0f;
 				tbuf1->writePixel(x, y, c);
 
 				tbuf2->read(c, x, y);
-				c[0]*=f1; c[1]*=f1 ; c[2] *=f1;
+				mul_v3_fl(c, f1);
 				tbuf2->read(tc, xm, (settings->angle ? yp : y));
-				c[0]+=tc[0]*f2;
-				c[1]+=tc[1]*f2;
-				c[2]+=tc[2]*f2;
+				madd_v3_v3fl(c, tc, f2);
 				tbuf2->read(tc, xp, (settings->angle ? ym : y));
-				c[0]+=tc[0]*f2;
-				c[1]+=tc[1]*f2;
-				c[2]+=tc[2]*f2;
+				madd_v3_v3fl(c, tc, f2);
 				c[3] = 1.0f;
 				tbuf2->writePixel(x, y, c);
-
+			}
+			if (isBreaked()) {
+				breaked = true;
 			}
 		}
 //		// B
-		for (y=tbuf1->getHeight()-1; y>=0; y--) {
+		for (y = tbuf1->getHeight() - 1 && (!breaked); y >= 0; y--) {
 			ym = y - i;
 			yp = y + i;
-			for (x=tbuf1->getWidth()-1; x>=0; x--) {
+			for (x = tbuf1->getWidth() - 1; x >= 0; x--) {
 				xm = x - i;
 				xp = x + i;
 				tbuf1->read(c, x, y);
-				c[0]*=f1; c[1]*=f1 ; c[2] *=f1;
+				mul_v3_fl(c, f1);
 				tbuf1->read(tc, (settings->angle ? xm : x), ym);
-				c[0]+=tc[0]*f2;
-				c[1]+=tc[1]*f2;
-				c[2]+=tc[2]*f2;
+				madd_v3_v3fl(c, tc, f2);
 				tbuf1->read(tc, (settings->angle ? xp : x), yp);
-				c[0]+=tc[0]*f2;
-				c[1]+=tc[1]*f2;
-				c[2]+=tc[2]*f2;
+				madd_v3_v3fl(c, tc, f2);
 				c[3] = 1.0f;
 				tbuf1->writePixel(x, y, c);
 
 				tbuf2->read(c, x, y);
-				c[0]*=f1; c[1]*=f1 ; c[2] *=f1;
+				mul_v3_fl(c, f1);
 				tbuf2->read(tc, xm, (settings->angle ? yp : y));
-				c[0]+=tc[0]*f2;
-				c[1]+=tc[1]*f2;
-				c[2]+=tc[2]*f2;
+				madd_v3_v3fl(c, tc, f2);
 				tbuf2->read(tc, xp, (settings->angle ? ym : y));
-				c[0]+=tc[0]*f2;
-				c[1]+=tc[1]*f2;
-				c[2]+=tc[2]*f2;
+				madd_v3_v3fl(c, tc, f2);
 				c[3] = 1.0f;
 				tbuf2->writePixel(x, y, c);
 			}
+			if (isBreaked()) {
+				breaked = true;
+			}
 		}
 	}
 
-	for (i = 0 ; i < this->getWidth()*this->getHeight()*4 ; i++) {
+	for (i = 0; i < this->getWidth() * this->getHeight() * 4; i++) {
 		data[i] = tbuf1->getBuffer()[i] + tbuf2->getBuffer()[i];
 	}
 
diff --git a/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h b/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h
index 22040da9bc5..a12d1191a1a 100644
--- a/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h
+++ b/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h
@@ -15,8 +15,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributor: 
- *		Jeroen Bakker 
+ * Contributor:
+ *		Jeroen Bakker
  *		Monique Dewanchand
  */
 
@@ -28,7 +28,8 @@
 
 class GlareSimpleStarOperation : public GlareBaseOperation {
 public:
-	GlareSimpleStarOperation() : GlareBaseOperation() {}
+	GlareSimpleStarOperation() : GlareBaseOperation() {
+	}
 protected:
 	void generateGlare(float *data, MemoryBuffer *inputTile, NodeGlare *settings);
 };
diff --git a/source/blender/compositor/operations/COM_GlareStreaksOperation.cpp b/source/blender/compositor/operations/COM_GlareStreaksOperation.cpp
index 42b6a2b5e50..9125783c222 100644
--- a/source/blender/compositor/operations/COM_GlareStreaksOperation.cpp
+++ b/source/blender/compositor/operations/COM_GlareStreaksOperation.cpp
@@ -15,8 +15,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributor: 
- *		Jeroen Bakker 
+ * Contributor:
+ *		Jeroen Bakker
  *		Monique Dewanchand
  */
 
@@ -26,70 +26,73 @@
 void GlareStreaksOperation::generateGlare(float *data, MemoryBuffer *inputTile, NodeGlare *settings)
 {
 	int x, y, n;
-	unsigned int nump=0;
+	unsigned int nump = 0;
 	float c1[4], c2[4], c3[4], c4[4];
-	float a, ang = DEG2RADF(360.0f)/(float)settings->angle;
-	
-	int size = inputTile->getWidth()*inputTile->getHeight();
-	int size4 = size*4;
+	float a, ang = DEG2RADF(360.0f) / (float)settings->angle;
+
+	int size = inputTile->getWidth() * inputTile->getHeight();
+	int size4 = size * 4;
+
+	bool breaked = false;
 
-	
 	MemoryBuffer *tsrc = inputTile->duplicate();
 	MemoryBuffer *tdst = new MemoryBuffer(NULL, inputTile->getRect());
 	tdst->clear();
-	memset(data, 0, size4*sizeof(float));
-	
-	for (a=0.f; a<DEG2RADF(360.0f); a+=ang) {
+	memset(data, 0, size4 * sizeof(float));
+
+	for (a = 0.f; a < DEG2RADF(360.0f) && (!breaked); a += ang) {
 		const float an = a + settings->angle_ofs;
 		const float vx = cos((double)an), vy = sin((double)an);
-		for (n=0; n<settings->iter; ++n) {
+		for (n = 0; n < settings->iter && (!breaked); ++n) {
 			const float p4 = pow(4.0, (double)n);
-			const float vxp = vx*p4, vyp = vy*p4;
+			const float vxp = vx * p4, vyp = vy * p4;
 			const float wt = pow((double)settings->fade, (double)p4);
-			const float cmo = 1.f - (float)pow((double)settings->colmod, (double)n+1);	// colormodulation amount relative to current pass
+			const float cmo = 1.f - (float)pow((double)settings->colmod, (double)n + 1);  // colormodulation amount relative to current pass
 			float *tdstcol = tdst->getBuffer();
-			for (y=0; y<tsrc->getHeight(); ++y) {
-				for (x=0; x<tsrc->getWidth(); ++x, tdstcol+=4) {
+			for (y = 0; y < tsrc->getHeight() && (!breaked); ++y) {
+				for (x = 0; x < tsrc->getWidth(); ++x, tdstcol += 4) {
 					// first pass no offset, always same for every pass, exact copy,
 					// otherwise results in uneven brightness, only need once
-					if (n==0) tsrc->read(c1, x, y); else c1[0]=c1[1]=c1[2]=0;
+					if (n == 0) tsrc->read(c1, x, y); else c1[0] = c1[1] = c1[2] = 0;
 					tsrc->readCubic(c2, x + vxp, y + vyp);
-					tsrc->readCubic(c3, x + vxp*2.f, y + vyp*2.f);
-					tsrc->readCubic(c4, x + vxp*3.f, y + vyp*3.f);
+					tsrc->readCubic(c3, x + vxp * 2.f, y + vyp * 2.f);
+					tsrc->readCubic(c4, x + vxp * 3.f, y + vyp * 3.f);
 					// modulate color to look vaguely similar to a color spectrum
 					c2[1] *= cmo;
 					c2[2] *= cmo;
 
 					c3[0] *= cmo;
 					c3[1] *= cmo;
-					
+
 					c4[0] *= cmo;
 					c4[2] *= cmo;
 
-					tdstcol[0] = 0.5f*(tdstcol[0] + c1[0] + wt*(c2[0] + wt*(c3[0] + wt*c4[0])));
-					tdstcol[1] = 0.5f*(tdstcol[1] + c1[1] + wt*(c2[1] + wt*(c3[1] + wt*c4[1])));
-					tdstcol[2] = 0.5f*(tdstcol[2] + c1[2] + wt*(c2[2] + wt*(c3[2] + wt*c4[2])));
+					tdstcol[0] = 0.5f * (tdstcol[0] + c1[0] + wt * (c2[0] + wt * (c3[0] + wt * c4[0])));
+					tdstcol[1] = 0.5f * (tdstcol[1] + c1[1] + wt * (c2[1] + wt * (c3[1] + wt * c4[1])));
+					tdstcol[2] = 0.5f * (tdstcol[2] + c1[2] + wt * (c2[2] + wt * (c3[2] + wt * c4[2])));
 					tdstcol[3] = 1.0f;
 				}
+				if (isBreaked()) {
+					breaked = true;
+				}
 			}
-			memcpy(tsrc->getBuffer(), tdst->getBuffer(), sizeof(float)*size4);
+			memcpy(tsrc->getBuffer(), tdst->getBuffer(), sizeof(float) * size4);
 		}
 
-//		addImage(sbuf, tsrc, 1.f/(float)(6 - ndg->iter)); // add result to data @todo
 		float *sourcebuffer = tsrc->getBuffer();
-		float factor = 1.f/(float)(6 - settings->iter);
-		for (int i = 0 ; i < size4; i ++) {
+		float factor = 1.f / (float)(6 - settings->iter);
+		for (int i = 0; i < size4; i++) {
 			data[i] += sourcebuffer[i] * factor;
 		}
-		for (int i = 0 ; i < size; i ++) {
-			data[i*4+3] = 1.0f;
+		for (int i = 0; i < size; i++) {
+			data[i * 4 + 3] = 1.0f;
 		}
-		
+
 		tdst->clear();
-		memcpy(tsrc->getBuffer(), inputTile->getBuffer(), sizeof(float)*size4);
+		memcpy(tsrc->getBuffer(), inputTile->getBuffer(), sizeof(float) * size4);
 		nump++;
 	}
-	
+
 	delete tsrc;
 	delete tdst;
 }
diff --git a/source/blender/compositor/operations/COM_GlareStreaksOperation.h b/source/blender/compositor/operations/COM_GlareStreaksOperation.h
index 07155a4713a..6520a05b44f 100644
--- a/source/blender/compositor/operations/COM_GlareStreaksOperation.h
+++ b/source/blender/compositor/operations/COM_GlareStreaksOperation.h
@@ -15,8 +15,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributor: 
- *		Jeroen Bakker 
+ * Contributor:
+ *		Jeroen Bakker
  *		Monique Dewanchand
  */
 
@@ -28,7 +28,8 @@
 
 class GlareStreaksOperation : public GlareBaseOperation {
 public:
-	GlareStreaksOperation() : GlareBaseOperation() {}
+	GlareStreaksOperation() : GlareBaseOperation() {
+	}
 protected:
 	void generateGlare(float *data, MemoryBuffer *inputTile, NodeGlare *settings);
 };
diff --git a/source/blender/compositor/operations/COM_GlareThresholdOperation.cpp b/source/blender/compositor/operations/COM_GlareThresholdOperation.cpp
index e8def72b7da..f9b2ec2b32d 100644
--- a/source/blender/compositor/operations/COM_GlareThresholdOperation.cpp
+++ b/source/blender/compositor/operations/COM_GlareThresholdOperation.cpp
@@ -15,20 +15,28 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributor: 
- *		Jeroen Bakker 
+ * Contributor:
+ *		Jeroen Bakker
  *		Monique Dewanchand
  */
 
 #include "COM_GlareThresholdOperation.h"
 #include "BLI_math.h"
 
-GlareThresholdOperation::GlareThresholdOperation(): NodeOperation()
+GlareThresholdOperation::GlareThresholdOperation() : NodeOperation()
 {
-	this->addInputSocket(COM_DT_COLOR);
+	this->addInputSocket(COM_DT_COLOR, COM_SC_FIT);
 	this->addOutputSocket(COM_DT_COLOR);
 	this->inputProgram = NULL;
 }
+
+void GlareThresholdOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
+{
+	NodeOperation::determineResolution(resolution, preferredResolution);
+	resolution[0] = resolution[0] / (1 << settings->quality);
+	resolution[1] = resolution[1] / (1 << settings->quality);
+}
+
 void GlareThresholdOperation::initExecution()
 {
 	this->inputProgram = this->getInputSocketReader(0);
@@ -36,14 +44,18 @@ void GlareThresholdOperation::initExecution()
 
 void GlareThresholdOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
 {
+	const float threshold = settings->threshold;
+	
 	this->inputProgram->read(color, x, y, sampler, inputBuffers);
-	if ((0.212671f*color[0] + 0.71516f*color[1] + 0.072169f*color[2]) >= threshold) {
+	if (rgb_to_luma_y(color) >= threshold) {
 		color[0] -= threshold, color[1] -= threshold, color[2] -= threshold;
-		color[0] = MAX2(color[0], 0.f);
-		color[1] = MAX2(color[1], 0.f);
-		color[2] = MAX2(color[2], 0.f);
+		color[0] = MAX2(color[0], 0.0f);
+		color[1] = MAX2(color[1], 0.0f);
+		color[2] = MAX2(color[2], 0.0f);
+	}
+	else {
+		zero_v3(color);
 	}
-	else color[0] = color[1] = color[2] = 0.f;
 }
 
 void GlareThresholdOperation::deinitExecution()
diff --git a/source/blender/compositor/operations/COM_GlareThresholdOperation.h b/source/blender/compositor/operations/COM_GlareThresholdOperation.h
index 3dfa2f44339..70692565e27 100644
--- a/source/blender/compositor/operations/COM_GlareThresholdOperation.h
+++ b/source/blender/compositor/operations/COM_GlareThresholdOperation.h
@@ -15,8 +15,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributor: 
- *		Jeroen Bakker 
+ * Contributor:
+ *		Jeroen Bakker
  *		Monique Dewanchand
  */
 
@@ -28,30 +28,36 @@
 class GlareThresholdOperation : public NodeOperation {
 private:
 	/**
-	  * @brief Cached reference to the inputProgram
-	  */
-	SocketReader * inputProgram;
-	
-	float threshold;
+	 * @brief Cached reference to the inputProgram
+	 */
+	SocketReader *inputProgram;
 
+	/**
+	 * @brief settings of the glare node.
+	 */
+	NodeGlare *settings;
 public:
 	GlareThresholdOperation();
-	
+
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
-	
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
+
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
-	
+
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
+
+	void setGlareSettings(NodeGlare *settings) {
+		this->settings = settings;
+	}
 	
-	void setThreshold(float threshold) {this->threshold = threshold;}
+	void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
index 2970c396493..b8e46e2d0be 100644
--- a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
+++ b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
@@ -32,7 +32,7 @@ extern "C" {
 }
 #endif
 
-HueSaturationValueCorrectOperation::HueSaturationValueCorrectOperation(): CurveBaseOperation()
+HueSaturationValueCorrectOperation::HueSaturationValueCorrectOperation() : CurveBaseOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addOutputSocket(COM_DT_COLOR);
@@ -53,7 +53,7 @@ void HueSaturationValueCorrectOperation::executePixel(float *output, float x, fl
 
 	/* adjust hue, scaling returned default 0.5 up to 1 */
 	f = curvemapping_evaluateF(this->curveMapping, 0, hsv[0]);
-	hsv[0] += f-0.5f;
+	hsv[0] += f - 0.5f;
 
 	/* adjust saturation, scaling returned default 0.5 up to 1 */
 	f = curvemapping_evaluateF(this->curveMapping, 1, hsv[0]);
@@ -63,8 +63,8 @@ void HueSaturationValueCorrectOperation::executePixel(float *output, float x, fl
 	f = curvemapping_evaluateF(this->curveMapping, 2, hsv[0]);
 	hsv[2] *= (f * 2.f);
 
-	hsv[0] = hsv[0] - floor(hsv[0]);  /* mod 1.0 */
-	CLAMP(hsv[1], 0.f, 1.f);
+	hsv[0] = hsv[0] - floorf(hsv[0]);  /* mod 1.0 */
+	CLAMP(hsv[1], 0.0f, 1.0f);
 
 	output[0] = hsv[0];
 	output[1] = hsv[1];
diff --git a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
index 860bb71a0f1..5ede0491773 100644
--- a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
+++ b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
@@ -28,25 +28,25 @@
 class HueSaturationValueCorrectOperation : public CurveBaseOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputProgram;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputProgram;
 public:
 	HueSaturationValueCorrectOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *Vector, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *Vector, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 
 };
diff --git a/source/blender/compositor/operations/COM_IDMaskOperation.cpp b/source/blender/compositor/operations/COM_IDMaskOperation.cpp
index 834ca4fc5ed..d02367088d7 100644
--- a/source/blender/compositor/operations/COM_IDMaskOperation.cpp
+++ b/source/blender/compositor/operations/COM_IDMaskOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_IDMaskOperation.h"
 
-IDMaskOperation::IDMaskOperation(): NodeOperation()
+IDMaskOperation::IDMaskOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_VALUE);
 	this->addOutputSocket(COM_DT_VALUE);
@@ -38,7 +38,7 @@ void IDMaskOperation::executePixel(float *color, float x, float y, PixelSampler
 	float inputValue[4];
 	
 	this->inputProgram->read(inputValue, x, y, sampler, inputBuffers);
-	const float a = (inputValue[0] == this->objectIndex)?1.0f:0.0f;
+	const float a = (inputValue[0] == this->objectIndex) ? 1.0f : 0.0f;
 	color[0] = a;
 }
 
diff --git a/source/blender/compositor/operations/COM_IDMaskOperation.h b/source/blender/compositor/operations/COM_IDMaskOperation.h
index 9f897c53d18..229e1b2dd82 100644
--- a/source/blender/compositor/operations/COM_IDMaskOperation.h
+++ b/source/blender/compositor/operations/COM_IDMaskOperation.h
@@ -28,8 +28,8 @@
 class IDMaskOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
+	 * Cached reference to the inputProgram
+	 */
 	SocketReader *inputProgram;
 	
 	float objectIndex;
@@ -37,21 +37,21 @@ public:
 	IDMaskOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
-	void setObjectIndex(float objectIndex) {this->objectIndex = objectIndex;}
+	void setObjectIndex(float objectIndex) { this->objectIndex = objectIndex; }
 
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_ImageOperation.cpp b/source/blender/compositor/operations/COM_ImageOperation.cpp
index 020dfdbdc14..9dbe8419daa 100644
--- a/source/blender/compositor/operations/COM_ImageOperation.cpp
+++ b/source/blender/compositor/operations/COM_ImageOperation.cpp
@@ -36,7 +36,7 @@ extern "C" {
 	#include "IMB_imbuf_types.h"
 }
 
-BaseImageOperation::BaseImageOperation(): NodeOperation()
+BaseImageOperation::BaseImageOperation() : NodeOperation()
 {
 	this->image = NULL;
 	this->buffer = NULL;
@@ -48,15 +48,15 @@ BaseImageOperation::BaseImageOperation(): NodeOperation()
 	this->depthBuffer = NULL;
 	this->numberOfChannels = 0;
 }
-ImageOperation::ImageOperation(): BaseImageOperation()
+ImageOperation::ImageOperation() : BaseImageOperation()
 {
 	this->addOutputSocket(COM_DT_COLOR);
 }
-ImageAlphaOperation::ImageAlphaOperation(): BaseImageOperation()
+ImageAlphaOperation::ImageAlphaOperation() : BaseImageOperation()
 {
 	this->addOutputSocket(COM_DT_VALUE);
 }
-ImageDepthOperation::ImageDepthOperation(): BaseImageOperation()
+ImageDepthOperation::ImageDepthOperation() : BaseImageOperation()
 {
 	this->addOutputSocket(COM_DT_VALUE);
 }
@@ -66,12 +66,12 @@ ImBuf *BaseImageOperation::getImBuf()
 	ImBuf *ibuf;
 	
 	ibuf = BKE_image_get_ibuf(this->image, this->imageUser);
-	if (ibuf==NULL || (ibuf->rect==NULL && ibuf->rect_float==NULL)) {
-			return NULL;
+	if (ibuf == NULL || (ibuf->rect == NULL && ibuf->rect_float == NULL)) {
+		return NULL;
 	}
 	
 	if (ibuf->rect_float == NULL) {
-			IMB_float_from_rect(ibuf);
+		IMB_float_from_rect(ibuf);
 	}
 	return ibuf;
 }
@@ -99,8 +99,8 @@ void BaseImageOperation::determineResolution(unsigned int resolution[], unsigned
 {
 	ImBuf *stackbuf = getImBuf();
 
-        resolution[0] = 0;
-        resolution[1] = 0;
+	resolution[0] = 0;
+	resolution[1] = 0;
 
 	if (stackbuf) {
 		resolution[0] = stackbuf->x;
@@ -108,7 +108,7 @@ void BaseImageOperation::determineResolution(unsigned int resolution[], unsigned
 	}
 }
 
-void ImageOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])\
+void ImageOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
 {
 	if (this->imageBuffer == NULL || x < 0 || y < 0 || x >= this->getWidth() || y >= this->getHeight() ) {
 		color[0] = 0.0f;
@@ -118,15 +118,15 @@ void ImageOperation::executePixel(float *color, float x, float y, PixelSampler s
 	}
 	else {
 		switch (sampler) {
-		case COM_PS_NEAREST:
-			neareast_interpolation_color(this->buffer, NULL, color, x, y);
-			break;
-		case COM_PS_BILINEAR:
-			bilinear_interpolation_color(this->buffer, NULL, color, x, y);
-			break;
-		case COM_PS_BICUBIC:
-			bicubic_interpolation_color(this->buffer, NULL, color, x, y);
-			break;
+			case COM_PS_NEAREST:
+				neareast_interpolation_color(this->buffer, NULL, color, x, y);
+				break;
+			case COM_PS_BILINEAR:
+				bilinear_interpolation_color(this->buffer, NULL, color, x, y);
+				break;
+			case COM_PS_BICUBIC:
+				bicubic_interpolation_color(this->buffer, NULL, color, x, y);
+				break;
 		}
 	}
 }
@@ -141,15 +141,15 @@ void ImageAlphaOperation::executePixel(float *color, float x, float y, PixelSamp
 	else {
 		tempcolor[3] = 1.0f;
 		switch (sampler) {
-		case COM_PS_NEAREST:
-			neareast_interpolation_color(this->buffer, NULL, tempcolor, x, y);
-			break;
-		case COM_PS_BILINEAR:
-			bilinear_interpolation_color(this->buffer, NULL, tempcolor, x, y);
-			break;
-		case COM_PS_BICUBIC:
-			bicubic_interpolation_color(this->buffer, NULL, tempcolor, x, y);
-			break;
+			case COM_PS_NEAREST:
+				neareast_interpolation_color(this->buffer, NULL, tempcolor, x, y);
+				break;
+			case COM_PS_BILINEAR:
+				bilinear_interpolation_color(this->buffer, NULL, tempcolor, x, y);
+				break;
+			case COM_PS_BICUBIC:
+				bicubic_interpolation_color(this->buffer, NULL, tempcolor, x, y);
+				break;
 		}
 		color[0] = tempcolor[3];
 	}
diff --git a/source/blender/compositor/operations/COM_ImageOperation.h b/source/blender/compositor/operations/COM_ImageOperation.h
index 0bd112304a8..a4645c9d504 100644
--- a/source/blender/compositor/operations/COM_ImageOperation.h
+++ b/source/blender/compositor/operations/COM_ImageOperation.h
@@ -36,8 +36,8 @@ extern "C" {
 }
 
 /**
-  * @brief Base class for all image operations
-  */
+ * @brief Base class for all image operations
+ */
 class BaseImageOperation : public NodeOperation {
 protected:
 	ImBuf *buffer;
@@ -52,8 +52,8 @@ protected:
 	
 	BaseImageOperation();
 	/**
-	  * Determine the output resolution. The resolution is retrieved from the Renderer
-	  */
+	 * Determine the output resolution. The resolution is retrieved from the Renderer
+	 */
 	void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
 	
 	virtual ImBuf *getImBuf();
@@ -62,33 +62,33 @@ public:
 	
 	void initExecution();
 	void deinitExecution();
-	void setImage(Image *image) {this->image = image;}
-	void setImageUser(ImageUser *imageuser) {this->imageUser = imageuser;}
-	
-	void setFramenumber(int framenumber) {this->framenumber = framenumber;}
+	void setImage(Image *image) { this->image = image; }
+	void setImageUser(ImageUser *imageuser) { this->imageUser = imageuser; }
+
+	void setFramenumber(int framenumber) { this->framenumber = framenumber; }
 };
-class ImageOperation: public BaseImageOperation {
+class ImageOperation : public BaseImageOperation {
 public:
 	/**
-	  * Constructor
-	  */
+	 * Constructor
+	 */
 	ImageOperation();
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
-class ImageAlphaOperation: public BaseImageOperation {
+class ImageAlphaOperation : public BaseImageOperation {
 public:
 	/**
-	  * Constructor
-	  */
+	 * Constructor
+	 */
 	ImageAlphaOperation();
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
-class ImageDepthOperation: public BaseImageOperation {
+class ImageDepthOperation : public BaseImageOperation {
 public:
 	/**
-	  * Constructor
-	  */
+	 * Constructor
+	 */
 	ImageDepthOperation();
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_InvertOperation.cpp b/source/blender/compositor/operations/COM_InvertOperation.cpp
index 982fe1a5450..6142959a12e 100644
--- a/source/blender/compositor/operations/COM_InvertOperation.cpp
+++ b/source/blender/compositor/operations/COM_InvertOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_InvertOperation.h"
 
-InvertOperation::InvertOperation(): NodeOperation()
+InvertOperation::InvertOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_VALUE);
 	this->addInputSocket(COM_DT_COLOR);
@@ -50,18 +50,16 @@ void InvertOperation::executePixel(float *out, float x, float y, PixelSampler sa
 	const float invertedValue = 1.0f - value;
 	
 	if (color) {
-		out[0] = (1.0f - inputColor[0])*value + inputColor[0]*invertedValue;
-		out[1] = (1.0f - inputColor[1])*value + inputColor[1]*invertedValue;
-		out[2] = (1.0f - inputColor[2])*value + inputColor[2]*invertedValue;
+		out[0] = (1.0f - inputColor[0]) * value + inputColor[0] * invertedValue;
+		out[1] = (1.0f - inputColor[1]) * value + inputColor[1] * invertedValue;
+		out[2] = (1.0f - inputColor[2]) * value + inputColor[2] * invertedValue;
 	}
 	else {
-		out[0] = inputColor[0];
-		out[1] = inputColor[1];
-		out[2] = inputColor[2];
+		copy_v3_v3(out, inputColor);
 	}
 	
 	if (alpha)
-		out[3] = (1.0f - inputColor[3])*value + inputColor[3]*invertedValue;
+		out[3] = (1.0f - inputColor[3]) * value + inputColor[3] * invertedValue;
 	else
 		out[3] = inputColor[3];
 
diff --git a/source/blender/compositor/operations/COM_InvertOperation.h b/source/blender/compositor/operations/COM_InvertOperation.h
index 27a995238c7..48432aecdd0 100644
--- a/source/blender/compositor/operations/COM_InvertOperation.h
+++ b/source/blender/compositor/operations/COM_InvertOperation.h
@@ -28,10 +28,10 @@
 class InvertOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputValueProgram;
-	SocketReader * inputColorProgram;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputValueProgram;
+	SocketReader *inputColorProgram;
 	
 	bool alpha;
 	bool color;
@@ -40,21 +40,21 @@ public:
 	InvertOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
-	void setColor(bool color) {this->color = color;}
-	void setAlpha(bool alpha) {this->alpha = alpha;}
+	void setColor(bool color) { this->color = color; }
+	void setAlpha(bool alpha) { this->alpha = alpha; }
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp b/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp
new file mode 100644
index 00000000000..9c7a33c1327
--- /dev/null
+++ b/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2012, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor:
+ *		Jeroen Bakker
+ *		Monique Dewanchand
+ *		Sergey Sharybin
+ */
+
+#include "COM_KeyingBlurOperation.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_listbase.h"
+#include "BLI_math.h"
+
+KeyingBlurOperation::KeyingBlurOperation() : NodeOperation()
+{
+	this->addInputSocket(COM_DT_VALUE);
+	this->addOutputSocket(COM_DT_VALUE);
+
+	this->size = 0.0f;
+
+	this->setComplex(true);
+}
+
+void *KeyingBlurOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
+{
+	void *buffer = getInputOperation(0)->initializeTileData(rect, memoryBuffers);
+
+	return buffer;
+}
+
+void KeyingBlurOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
+{
+	MemoryBuffer *inputBuffer = (MemoryBuffer *)data;
+	float *buffer = inputBuffer->getBuffer();
+
+	int bufferWidth = inputBuffer->getWidth();
+	int bufferHeight = inputBuffer->getHeight();
+
+	int i, j, count = 0;
+
+	float average = 0.0f;
+
+	for (i = -this->size + 1; i < this->size; i++) {
+		for (j = -this->size + 1; j < this->size; j++) {
+			int cx = x + j, cy = y + i;
+
+			if (cx >= 0 && cx < bufferWidth && cy >= 0 && cy < bufferHeight) {
+				int bufferIndex = (cy * bufferWidth + cx) * 4;
+
+				average += buffer[bufferIndex];
+				count++;
+			}
+		}
+	}
+
+	average /= (float) count;
+
+	color[0] = average;
+}
+
+bool KeyingBlurOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
+{
+	rcti newInput;
+
+	newInput.xmin = 0;
+	newInput.ymin = 0;
+	newInput.xmax = this->getWidth();
+	newInput.ymax = this->getHeight();
+
+	return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
+}
diff --git a/source/blender/compositor/operations/COM_KeyingBlurOperation.h b/source/blender/compositor/operations/COM_KeyingBlurOperation.h
new file mode 100644
index 00000000000..2848f260cbd
--- /dev/null
+++ b/source/blender/compositor/operations/COM_KeyingBlurOperation.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2012, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor:
+ *		Jeroen Bakker
+ *		Monique Dewanchand
+ *		Sergey Sharybin
+ */
+
+#ifndef _COM_KeyingBlurOperation_h
+#define _COM_KeyingBlurOperation_h
+
+#include "COM_NodeOperation.h"
+
+/**
+ * Class with implementation of bluring for keying node
+ */
+class KeyingBlurOperation : public NodeOperation {
+protected:
+	int size;
+
+public:
+	KeyingBlurOperation();
+
+	void setSize(float value) {this->size = value;}
+
+	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
+
+	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
+
+	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
+};
+
+#endif
diff --git a/source/blender/compositor/operations/COM_KeyingClipOperation.cpp b/source/blender/compositor/operations/COM_KeyingClipOperation.cpp
new file mode 100644
index 00000000000..2c9949f2b4b
--- /dev/null
+++ b/source/blender/compositor/operations/COM_KeyingClipOperation.cpp
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2012, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor:
+ *		Jeroen Bakker
+ *		Monique Dewanchand
+ *		Sergey Sharybin
+ */
+
+#include "COM_KeyingClipOperation.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_listbase.h"
+#include "BLI_math.h"
+
+KeyingClipOperation::KeyingClipOperation() : NodeOperation()
+{
+	this->addInputSocket(COM_DT_VALUE);
+	this->addOutputSocket(COM_DT_VALUE);
+
+	this->kernelRadius = 3;
+	this->kernelTolerance = 0.1f;
+
+	this->clipBlack = 0.0f;
+	this->clipWhite = 1.0f;
+
+	this->isEdgeMatte = false;
+
+	this->setComplex(true);
+}
+
+void *KeyingClipOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
+{
+	void *buffer = getInputOperation(0)->initializeTileData(rect, memoryBuffers);
+
+	return buffer;
+}
+
+void KeyingClipOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
+{
+	const int delta = this->kernelRadius;
+	const float tolerance = this->kernelTolerance;
+
+	MemoryBuffer *inputBuffer = (MemoryBuffer *)data;
+	float *buffer = inputBuffer->getBuffer();
+
+	int bufferWidth = inputBuffer->getWidth();
+	int bufferHeight = inputBuffer->getHeight();
+
+	int i, j, count = 0, totalCount = 0;
+
+	float value = buffer[(y * bufferWidth + x) * 4];
+
+	bool ok = false;
+
+	for (i = -delta + 1; i < delta; i++) {
+		for (j = -delta + 1; j < delta; j++) {
+			int cx = x + j, cy = y + i;
+
+			if (i == 0 && j == 0)
+				continue;
+
+			if (cx >= 0 && cx < bufferWidth && cy >= 0 && cy < bufferHeight) {
+				int bufferIndex = (cy * bufferWidth + cx) * 4;
+				float currentValue = buffer[bufferIndex];
+
+				if (fabsf(currentValue - value) < tolerance) {
+					count++;
+				}
+
+				totalCount++;
+			}
+		}
+	}
+
+	ok = count >= (float) totalCount * 0.9f;
+
+	if (this->isEdgeMatte) {
+		if (ok)
+			color[0] = 0.0f;
+		else
+			color[0] = 1.0f;
+	}
+	else {
+		color[0] = value;
+
+		if (ok) {
+			if (color[0] < this->clipBlack)
+				color[0] = 0.0f;
+			else if (color[0] >= this->clipWhite)
+				color[0] = 1.0f;
+			else
+				color[0] = (color[0] - this->clipBlack) / (this->clipWhite - this->clipBlack);
+		}
+	}
+}
+
+bool KeyingClipOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
+{
+	rcti newInput;
+
+	newInput.xmin = 0;
+	newInput.ymin = 0;
+	newInput.xmax = this->getWidth();
+	newInput.ymax = this->getHeight();
+
+	return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
+}
diff --git a/source/blender/compositor/operations/COM_KeyingClipOperation.h b/source/blender/compositor/operations/COM_KeyingClipOperation.h
new file mode 100644
index 00000000000..9c7b23b0160
--- /dev/null
+++ b/source/blender/compositor/operations/COM_KeyingClipOperation.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2012, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor:
+ *		Jeroen Bakker
+ *		Monique Dewanchand
+ *		Sergey Sharybin
+ */
+
+#ifndef _COM_KeyingClipOperation_h
+#define _COM_KeyingClipOperation_h
+
+#include "COM_NodeOperation.h"
+
+/**
+  * Class with implementation of black/white clipping for keying node
+  */
+class KeyingClipOperation : public NodeOperation {
+protected:
+	float clipBlack;
+	float clipWhite;
+
+	int kernelRadius;
+	float kernelTolerance;
+
+	bool isEdgeMatte;
+public:
+	KeyingClipOperation();
+
+	void setClipBlack(float value) {this->clipBlack = value;}
+	void setClipWhite(float value) {this->clipWhite = value;}
+
+	void setKernelRadius(int value) {this->kernelRadius = value;}
+	void setKernelTolerance(float value) {this->kernelTolerance = value;}
+
+	void setIsEdgeMatte(bool value) {this->isEdgeMatte = value;}
+
+	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
+
+	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
+
+	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
+};
+
+#endif
diff --git a/source/blender/compositor/operations/COM_KeyingDespillOperation.cpp b/source/blender/compositor/operations/COM_KeyingDespillOperation.cpp
new file mode 100644
index 00000000000..04523384653
--- /dev/null
+++ b/source/blender/compositor/operations/COM_KeyingDespillOperation.cpp
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2012, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor:
+ *		Jeroen Bakker
+ *		Monique Dewanchand
+ *		Sergey Sharybin
+ */
+
+#include "COM_KeyingDespillOperation.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_listbase.h"
+#include "BLI_math.h"
+
+static int get_pixel_primary_channel(float *pixel)
+{
+	float max_value = MAX3(pixel[0], pixel[1], pixel[2]);
+
+	if (max_value == pixel[0])
+		return 0;
+	else if (max_value == pixel[1])
+		return 1;
+
+	return 2;
+}
+
+KeyingDespillOperation::KeyingDespillOperation() : NodeOperation()
+{
+	this->addInputSocket(COM_DT_COLOR);
+	this->addInputSocket(COM_DT_COLOR);
+	this->addOutputSocket(COM_DT_COLOR);
+
+	this->despillFactor = 0.5f;
+
+	this->pixelReader = NULL;
+	this->screenReader = NULL;
+}
+
+void KeyingDespillOperation::initExecution()
+{
+	this->pixelReader = this->getInputSocketReader(0);
+	this->screenReader = this->getInputSocketReader(1);
+}
+
+void KeyingDespillOperation::deinitExecution()
+{
+	this->pixelReader = NULL;
+	this->screenReader = NULL;
+}
+
+void KeyingDespillOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
+{
+	float pixelColor[4];
+	float screenColor[4];
+
+	this->pixelReader->read(pixelColor, x, y, sampler, inputBuffers);
+	this->screenReader->read(screenColor, x, y, sampler, inputBuffers);
+
+	int screen_primary_channel = get_pixel_primary_channel(screenColor);
+	float average_value, amount;
+
+	average_value = (pixelColor[0] + pixelColor[1] + pixelColor[2] - pixelColor[screen_primary_channel]) / 2.0f;
+	amount = pixelColor[screen_primary_channel] - average_value;
+
+	color[0] = pixelColor[0];
+	color[1] = pixelColor[1];
+	color[2] = pixelColor[2];
+	color[3] = pixelColor[3];
+	
+	if (this->despillFactor * amount > 0) {
+		color[screen_primary_channel] = pixelColor[screen_primary_channel] - this->despillFactor * amount;
+	}
+}
diff --git a/source/blender/compositor/operations/COM_LensGlowImageOperation.h b/source/blender/compositor/operations/COM_KeyingDespillOperation.h
index 424b4d4fc3d..92a1415a1f0 100644
--- a/source/blender/compositor/operations/COM_LensGlowImageOperation.h
+++ b/source/blender/compositor/operations/COM_KeyingDespillOperation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Blender Foundation.
+ * Copyright 2012, Blender Foundation.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -15,38 +15,35 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributor: 
- *		Jeroen Bakker 
+ * Contributor:
+ *		Jeroen Bakker
  *		Monique Dewanchand
+ *		Sergey Sharybin
  */
 
-#ifndef _COM_LensGlowImageOperation_h
-#define _COM_LensGlowImageOperation_h
-#include "COM_NodeOperation.h"
+#ifndef _COM_KeyingDespillOperation_h
+#define _COM_KeyingDespillOperation_h
 
+#include "COM_NodeOperation.h"
 
-class LensGlowImageOperation : public NodeOperation {
-private:
-	float scale;
+/**
+  * Class with implementation of keying despill node
+  */
+class KeyingDespillOperation : public NodeOperation {
+protected:
+	SocketReader *pixelReader;
+	SocketReader *screenReader;
+	float despillFactor;
 
 public:
-	LensGlowImageOperation();
+	KeyingDespillOperation();
 
-	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
-	
-	/**
-	  * Initialize the execution
-	  */
 	void initExecution();
-	
-	/**
-	  * Deinitialize the execution
-	  */
 	void deinitExecution();
-	
-	void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
+
+	void setDespillFactor(float value) {this->despillFactor = value;}
+
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
 };
+
 #endif
diff --git a/source/blender/compositor/operations/COM_KeyingOperation.cpp b/source/blender/compositor/operations/COM_KeyingOperation.cpp
new file mode 100644
index 00000000000..0a450cc3bf8
--- /dev/null
+++ b/source/blender/compositor/operations/COM_KeyingOperation.cpp
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2012, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor:
+ *		Jeroen Bakker
+ *		Monique Dewanchand
+ *		Sergey Sharybin
+ */
+
+#include "COM_KeyingOperation.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_listbase.h"
+#include "BLI_math.h"
+
+static int get_pixel_primary_channel(float pixelColor[4])
+{
+	float max_value = MAX3(pixelColor[0], pixelColor[1], pixelColor[2]);
+
+	if (max_value == pixelColor[0])
+		return 0;
+	else if (max_value == pixelColor[1])
+		return 1;
+
+	return 2;
+}
+
+static float get_pixel_saturation(float pixelColor[4], float screen_balance, int primary_channel)
+{
+	int other_1 = (primary_channel + 1) % 3;
+	int other_2 = (primary_channel + 2) % 3;
+
+	float min = MIN2(pixelColor[other_1], pixelColor[other_2]);
+	float max = MAX2(pixelColor[other_1], pixelColor[other_2]);
+	float val = screen_balance * min + (1.0f - screen_balance) * max;
+
+	return (pixelColor[primary_channel] - val) * fabsf(1.0f - val);
+}
+
+KeyingOperation::KeyingOperation() : NodeOperation()
+{
+	this->addInputSocket(COM_DT_COLOR);
+	this->addInputSocket(COM_DT_COLOR);
+	this->addInputSocket(COM_DT_VALUE);
+	this->addInputSocket(COM_DT_VALUE);
+	this->addOutputSocket(COM_DT_VALUE);
+
+	this->screenBalance = 0.5f;
+
+	this->pixelReader = NULL;
+	this->screenReader = NULL;
+	this->garbageReader = NULL;
+	this->coreReader = NULL;
+}
+
+void KeyingOperation::initExecution()
+{
+	this->pixelReader = this->getInputSocketReader(0);
+	this->screenReader = this->getInputSocketReader(1);
+	this->garbageReader = this->getInputSocketReader(2);
+	this->coreReader = this->getInputSocketReader(3);
+}
+
+void KeyingOperation::deinitExecution()
+{
+	this->pixelReader = NULL;
+	this->screenReader = NULL;
+	this->garbageReader = NULL;
+	this->coreReader = NULL;
+}
+
+void KeyingOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
+{
+	float pixelColor[4];
+	float screenColor[4];
+	float garbageValue[4];
+	float coreValue[4];
+
+	this->pixelReader->read(pixelColor, x, y, sampler, inputBuffers);
+	this->screenReader->read(screenColor, x, y, sampler, inputBuffers);
+	this->garbageReader->read(garbageValue, x, y, sampler, inputBuffers);
+	this->coreReader->read(coreValue, x, y, sampler, inputBuffers);
+
+	int primary_channel = get_pixel_primary_channel(screenColor);
+
+	float saturation = get_pixel_saturation(pixelColor, this->screenBalance, primary_channel);
+	float screen_saturation = get_pixel_saturation(screenColor, this->screenBalance, primary_channel);
+
+	if (saturation < 0) {
+		color[0] = 1.0f;
+	}
+	else if (saturation >= screen_saturation) {
+		color[0] = 0.0f;
+	}
+	else {
+		float distance = 1.0f - saturation / screen_saturation;
+
+		color[0] = distance;
+	}
+
+	color[0] *= (1.0f - garbageValue[0]);
+
+	color[0] = MAX2(color[0], coreValue[0]);
+}
+
+bool KeyingOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
+{
+	rcti newInput;
+
+	newInput.xmin = 0;
+	newInput.ymin = 0;
+	newInput.xmax = this->getWidth();
+	newInput.ymax = this->getHeight();
+
+	return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
+}
diff --git a/source/blender/compositor/operations/COM_LensGlowOperation.h b/source/blender/compositor/operations/COM_KeyingOperation.h
index 77e13e88418..8d0e7851ee5 100644
--- a/source/blender/compositor/operations/COM_LensGlowOperation.h
+++ b/source/blender/compositor/operations/COM_KeyingOperation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Blender Foundation.
+ * Copyright 2012, Blender Foundation.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -15,42 +15,45 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributor: 
- *		Jeroen Bakker 
+ * Contributor:
+ *		Jeroen Bakker
  *		Monique Dewanchand
+ *		Sergey Sharybin
  */
 
-#ifndef _COM_LensGlowOperation_h
-#define _COM_LensGlowOperation_h
+
+#ifndef _COM_KeyingOperation_h
+#define _COM_KeyingOperation_h
+
+#include <string.h>
+
 #include "COM_NodeOperation.h"
-#include "DNA_lamp_types.h"
 
-class LensGlowOperation : public NodeOperation {
-private:
-	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputProgram;
-	Lamp *lamp;
+#include "BLI_listbase.h"
+
+/**
+  * Class with implementation of keying node
+  */
+class KeyingOperation : public NodeOperation {
+protected:
+	SocketReader *pixelReader;
+	SocketReader *screenReader;
+	SocketReader *garbageReader;
+	SocketReader *coreReader;
+
+	float screenBalance;
 
 public:
-	LensGlowOperation();
-	
-	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
-	
-	/**
-	  * Initialize the execution
-	  */
+	KeyingOperation();
+
 	void initExecution();
-	
-	/**
-	  * Deinitialize the execution
-	  */
 	void deinitExecution();
-	
-	void setLamp(Lamp *lamp) {this->lamp = lamp;}
+
+	void setScreenBalance(float value) {this->screenBalance = value;}
+
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+
+	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
 };
+
 #endif
diff --git a/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp b/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
new file mode 100644
index 00000000000..b728f6c5cca
--- /dev/null
+++ b/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
@@ -0,0 +1,220 @@
+/*
+ * Copyright 2012, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor:
+ *		Jeroen Bakker
+ *		Monique Dewanchand
+ *		Sergey Sharybin
+ */
+
+#include "COM_KeyingScreenOperation.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_listbase.h"
+#include "BLI_math.h"
+#include "BLI_math_color.h"
+
+#include "DNA_scene_types.h"
+
+extern "C" {
+	#include "BKE_movieclip.h"
+	#include "BKE_tracking.h"
+
+	#include "IMB_imbuf.h"
+	#include "IMB_imbuf_types.h"
+}
+
+KeyingScreenOperation::KeyingScreenOperation() : NodeOperation()
+{
+	this->addOutputSocket(COM_DT_COLOR);
+	this->movieClip = NULL;
+	this->framenumber = 0;
+	this->trackingObject[0] = 0;
+	setComplex(true);
+}
+
+void KeyingScreenOperation::initExecution()
+{
+	initMutex();
+	this->cachedTriangulation = NULL;
+}
+
+void KeyingScreenOperation::deinitExecution()
+{
+	if (this->cachedTriangulation) {
+		TriangulationData *triangulation = cachedTriangulation;
+
+		if (triangulation->triangulated_points)
+			MEM_freeN(triangulation->triangulated_points);
+
+		if (triangulation->triangles)
+			MEM_freeN(triangulation->triangles);
+
+		MEM_freeN(this->cachedTriangulation);
+
+		this->cachedTriangulation = NULL;
+	}
+}
+
+KeyingScreenOperation::TriangulationData *KeyingScreenOperation::buildVoronoiTriangulation()
+{
+	MovieClipUser user = {0};
+	TriangulationData *triangulation;
+	MovieTracking *tracking = &movieClip->tracking;
+	MovieTrackingTrack *track;
+	VoronoiSite *sites;
+	ImBuf *ibuf;
+	ListBase *tracksbase;
+	ListBase edges = {NULL, NULL};
+	int sites_total;
+	int i;
+	int width = this->getWidth();
+	int height = this->getHeight();
+
+	if (this->trackingObject[0]) {
+		MovieTrackingObject *object = BKE_tracking_object_get_named(tracking, this->trackingObject);
+
+		if (!object)
+			return NULL;
+
+		tracksbase = BKE_tracking_object_get_tracks(tracking, object);
+	}
+	else
+		tracksbase = BKE_tracking_get_active_tracks(tracking);
+
+	sites_total = BLI_countlist(tracksbase);
+
+	if (!sites_total)
+		return NULL;
+
+	BKE_movieclip_user_set_frame(&user, framenumber);
+	ibuf = BKE_movieclip_get_ibuf(movieClip, &user);
+
+	if (!ibuf)
+		return NULL;
+
+	triangulation = (TriangulationData *) MEM_callocN(sizeof(TriangulationData), "keying screen triangulation data");
+
+	sites = (VoronoiSite *) MEM_callocN(sizeof(VoronoiSite) * sites_total, "keyingscreen voronoi sites");
+	track = (MovieTrackingTrack *) tracksbase->first;
+	i = 0;
+	while (track) {
+		VoronoiSite *site = &sites[i];
+		MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenumber);
+		ImBuf *pattern_ibuf = BKE_tracking_get_pattern_imbuf(ibuf, track, marker, TRUE, FALSE);
+		int j;
+
+		zero_v3(site->color);
+		for (j = 0; j < pattern_ibuf->x * pattern_ibuf->y; j++) {
+			if (pattern_ibuf->rect_float) {
+				add_v3_v3(site->color, &pattern_ibuf->rect_float[4 * j]);
+			}
+			else {
+				unsigned char *rrgb = (unsigned char *)pattern_ibuf->rect;
+
+				site->color[0] += srgb_to_linearrgb((float)rrgb[4 * j + 0] / 255.0f);
+				site->color[1] += srgb_to_linearrgb((float)rrgb[4 * j + 1] / 255.0f);
+				site->color[2] += srgb_to_linearrgb((float)rrgb[4 * j + 2] / 255.0f);
+			}
+		}
+
+		mul_v3_fl(site->color, 1.0f / (pattern_ibuf->x * pattern_ibuf->y));
+		IMB_freeImBuf(pattern_ibuf);
+
+		site->co[0] = marker->pos[0] * width;
+		site->co[1] = marker->pos[1] * height;
+
+		track = track->next;
+		i++;
+	}
+
+	IMB_freeImBuf(ibuf);
+
+	BLI_voronoi_compute(sites, sites_total, width, height, &edges);
+
+	BLI_voronoi_triangulate(sites, sites_total, &edges, width, height,
+	                        &triangulation->triangulated_points, &triangulation->triangulated_points_total,
+	                        &triangulation->triangles, &triangulation->triangles_total);
+
+	MEM_freeN(sites);
+	BLI_freelistN(&edges);
+
+	return triangulation;
+}
+
+void *KeyingScreenOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
+{
+	if (this->movieClip == NULL)
+		return NULL;
+
+	if (this->cachedTriangulation)
+		return this->cachedTriangulation;
+
+	lockMutex();
+	if (this->cachedTriangulation == NULL) {
+		this->cachedTriangulation = buildVoronoiTriangulation();
+	}
+	unlockMutex();
+
+	return this->cachedTriangulation;
+}
+
+void KeyingScreenOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
+{
+	resolution[0] = 0;
+	resolution[1] = 0;
+
+	if (this->movieClip) {
+		MovieClipUser user = {0};
+		int width, height;
+
+		BKE_movieclip_user_set_frame(&user, framenumber);
+		BKE_movieclip_get_size(this->movieClip, &user, &width, &height);
+
+		resolution[0] = width;
+		resolution[1] = height;
+	}
+}
+
+void KeyingScreenOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
+{
+	color[0] = 0.0f;
+	color[1] = 0.0f;
+	color[2] = 0.0f;
+	color[3] = 1.0f;
+
+	if (this->movieClip && data) {
+		TriangulationData *triangulation = (TriangulationData *) data;
+		int i;
+		for (i = 0; i < triangulation->triangles_total; i++) {
+			int *triangle = triangulation->triangles[i];
+			VoronoiTriangulationPoint *a = &triangulation->triangulated_points[triangle[0]],
+			*b = &triangulation->triangulated_points[triangle[1]],
+			*c = &triangulation->triangulated_points[triangle[2]];
+			float co[2] = {(float) x, (float) y}, w[3];
+
+			if (barycentric_coords_v2(a->co, b->co, c->co, co, w)) {
+				if (barycentric_inside_triangle_v2(w)) {
+					color[0] += a->color[0] * w[0] + b->color[0] * w[1] + c->color[0] * w[2];
+					color[1] += a->color[1] * w[0] + b->color[1] * w[1] + c->color[1] * w[2];
+					color[2] += a->color[2] * w[0] + b->color[2] * w[1] + c->color[2] * w[2];
+				}
+			}
+		}
+	}
+}
diff --git a/source/blender/compositor/operations/COM_KeyingScreenOperation.h b/source/blender/compositor/operations/COM_KeyingScreenOperation.h
new file mode 100644
index 00000000000..9d3f44f6be2
--- /dev/null
+++ b/source/blender/compositor/operations/COM_KeyingScreenOperation.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2012, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor:
+ *		Jeroen Bakker
+ *		Monique Dewanchand
+ *		Sergey Sharybin
+ */
+
+
+#ifndef _COM_KeyingScreenOperation_h
+#define _COM_KeyingScreenOperation_h
+
+#include <string.h>
+
+#include "COM_NodeOperation.h"
+
+#include "DNA_scene_types.h"
+#include "DNA_movieclip_types.h"
+
+#include "BLI_listbase.h"
+
+extern "C" {
+	#include "BLI_voronoi.h"
+}
+
+/**
+  * Class with implementation of green screen gradient rasterization
+  */
+class KeyingScreenOperation : public NodeOperation {
+protected:
+	typedef struct TriangulationData {
+		VoronoiTriangulationPoint *triangulated_points;
+		int (*triangles)[3];
+		int triangulated_points_total, triangles_total;
+	} TriangulationData;
+
+	MovieClip *movieClip;
+	int framenumber;
+	TriangulationData *cachedTriangulation;
+	char trackingObject[64];
+
+	/**
+	  * Determine the output resolution. The resolution is retrieved from the Renderer
+	  */
+	void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
+
+	TriangulationData *buildVoronoiTriangulation();
+
+ public:
+	KeyingScreenOperation();
+
+	void initExecution();
+	void deinitExecution();
+
+	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
+
+	void setMovieClip(MovieClip *clip) {this->movieClip = clip;}
+	void setTrackingObject(char *object) {strncpy(this->trackingObject, object, sizeof(this->trackingObject));}
+	void setFramenumber(int framenumber) {this->framenumber = framenumber;}
+
+	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
+};
+
+#endif
diff --git a/source/blender/compositor/operations/COM_LensGhostOperation.cpp b/source/blender/compositor/operations/COM_LensGhostOperation.cpp
deleted file mode 100644
index bbf6df6c1e5..00000000000
--- a/source/blender/compositor/operations/COM_LensGhostOperation.cpp
+++ /dev/null
@@ -1,815 +0,0 @@
-/*
- * Copyright 2011, Blender Foundation.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contributor: 
- *		Jeroen Bakker 
- *		Monique Dewanchand
- */
-
-#include "COM_LensGhostOperation.h"
-#include "BLI_math.h"
-#include "BLI_utildefines.h"
-
-#define MAX_STEP 256
-class Ray {
-public:
-	float position[3];
-	float direction[3];
-	float uv[2];
-	double wavelength;
-	float intensity;
-	bool valid;
-	void copyFrom(Ray *other) {
-		copy_v3_v3(position, other->position);
-		copy_v3_v3(direction, other->direction);
-		copy_v2_v2(uv, other->uv);
-		wavelength = other->wavelength;
-		intensity = other->intensity;
-		this->valid = other->valid;
-	}
-};
-
-class Intersection {
-public:
-	float position[3];
-	float normal[3];
-	double theta;
-	bool hit;
-	bool inverted;
-};
-
-class LensInterface {
-public:
-	float position[3];
-	float radius;
-	float nominalRadius;
-	double refraction1;
-	double refraction2;
-	double refraction3;
-	float thicknessCoathing;
-	virtual bool isFlat() = 0;
-	virtual void intersect(Intersection *result, Ray *ray) = 0;
-};
-
-class FlatInterface: public LensInterface {
-public:
-	bool isFlat() {return true;}
-	FlatInterface(float positionX, float positionY, float positionZ, float radius) {
-		this->position[0] = positionX;
-		this->position[1] = positionY;
-		this->position[2] = positionZ;
-		this->radius = radius;
-		this->nominalRadius = radius;
-		this->refraction1 = 1.0f;
-		this->refraction2 = 1.0f;
-		this->refraction3 = 1.0f;
-		this->thicknessCoathing = 0.0f;
-
-	}
-	void intersect(Intersection *result, Ray *ray) {
-		const float dz = this->position[2]-ray->position[2];
-		result->position[0] = ray->position[0] + ray->direction[0]*(dz)/ray->direction[2];
-		result->position[1] = ray->position[1] + ray->direction[1]*(dz)/ray->direction[2];
-		result->position[2] = ray->position[2] + ray->direction[2]*(dz)/ray->direction[2];
-		result->normal[0] = 0.0f;
-		result->normal[1] = 0.0f;
-		result->normal[2] = ray->direction[2]>0?-1.0f:1.0f;
-		result->theta = 0.0f;
-//		result->hit = this->nominalRadius>maxf(fabs(result->position[0]), fabs(result->position[1]));
-		result->hit = true;
-		result->inverted = false;
-	}
-};
-
-class SphereInterface: public LensInterface {
-public:
-	SphereInterface(float positionX, float positionY, float positionZ, float radius, float nominalRadius, float n0, float n2, float coatingPhase) {
-		this->position[0] = positionX;
-		this->position[1] = positionY;
-		this->position[2] = positionZ;
-		this->radius = radius;
-		this->nominalRadius = nominalRadius;
-		this->refraction1 = n0;
-		this->refraction3 = n2;
-		this->refraction2 = maxf(sqrtf(n0*n2), 1.38);
-
-		this->thicknessCoathing = coatingPhase/4/this->refraction2;
-	}
-	bool isFlat() {return false;}
-	void intersect(Intersection *result, Ray *ray) {
-		float delta[3] ={ray->position[0] - this->position[0],
-			ray->position[1] - this->position[1],
-			ray->position[2] - this->position[2]};
-		float b = dot_v3v3(delta, ray->direction);
-		float c = dot_v3v3(delta, delta) - this->radius*this->radius;
-		float b2c = b*b-c;
-		if (b2c < 0) {
-			result->hit = false;
-		}
-		else {
-			float sgn = (this->radius*ray->direction[2])>0?1.0f:-1.0f;
-			float t = sqrtf(b2c)*sgn-b;
-			result->position[0] = ray->direction[0]*t+ray->position[0];
-			result->position[1] = ray->direction[1]*t+ray->position[1];
-			result->position[2] = ray->direction[2]*t+ray->position[2];
-
-			float p[3] = {
-				result->position[0] - this->position[0],
-				result->position[1] - this->position[1],
-				result->position[2] - this->position[2]
-			};
-			normalize_v3(p);
-
-			if (dot_v3v3(p, ray->direction)> 0) {
-				result->normal[0] = -p[0];
-				result->normal[1] = -p[1];
-				result->normal[2] = -p[2];
-			}
-			else {
-				result->normal[0] = p[0];
-				result->normal[1] = p[1];
-				result->normal[2] = p[2];
-			}
-
-			float inverse[3] ={
-				-ray->direction[0],
-				-ray->direction[1],
-				-ray->direction[2]};
-
-			result->theta = acosf(dot_v3v3(inverse, result->normal));
-			result->hit = this->nominalRadius>sqrt(result->position[0]*result->position[0]+result->position[1]*result->position[1]);
-//			result->hit = this->nominalRadius>maxf(fabs(result->position[0]), fabs(result->position[1]));
-//			result->hit = true;
-			result->inverted = t < 0;
-		}
-	}
-};
-class RayResult {
-public:
-	float x;
-	float y;
-	float intensity[3];
-	float u;
-	float v;
-	float screenX;
-	float screenY;
-	bool valid;
-	bool hasIntensity;
-};
-class Bounce {
-public:
-	LensInterface *interface1;
-	LensInterface *interface2;
-	RayResult *raster;
-	int length; // number of interfaces to travel
-	int rasterLength;
-	Bounce(LensInterface *interface1, LensInterface *interface2, int length, int rasterStep) {
-		this->interface1 = interface1;
-		this->interface2 = interface2;
-		this->length = length;
-		this->rasterLength = rasterStep;
-		this->raster = new RayResult[rasterLength*rasterLength];
-		for (int i = 0 ; i < rasterLength*rasterLength ; i++) {
-			RayResult * res = &this->raster[i];
-			res->intensity[0] = 0.0f;
-			res->intensity[1] = 0.0f;
-			res->intensity[2] = 0.0f;
-			res->x = 0.0f;
-			res->y = 0.0f;
-			res->u = 0.0f;
-			res->v = 0.0f;
-			res->valid = false;
-		}
-	}
-	~Bounce() {
-		delete raster;
-
-	}
-
-	RayResult *getRayResult(int x, int y) {
-		return &(raster[x+y*rasterLength]);
-	}
-};
-class LensSystem {
-public:
-	vector<LensInterface*> interfaces;
-	vector<Bounce*> bounces;
-	int bokehIndex;
-	int lensIndex;
-
-	~LensSystem() {
-		for (int index = 0 ; index <bounces.size();index++) {delete bounces[index];}
-		for (int index = 0 ; index <interfaces.size();index++) {delete interfaces[index];}
-	}
-
-	void updateBounces(int step) {
-		for (int i = 0; i < interfaces.size()-1 ; i ++) {
-			if (!interfaces[i]->isFlat()) {
-				for (int j = i+1; j < interfaces.size()-1 ; j ++) {
-					if (!interfaces[j]->isFlat()) {
-						int length = interfaces.size()+2*(j-i);
-						Bounce *bounce = new Bounce(interfaces[j], interfaces[i], length, step);
-						bounces.push_back(bounce);
-					}
-				}
-			}
-		}
-
-	}
-
-	void addInterface(LensInterface *pinterface) {
-		this->interfaces.push_back(pinterface);
-		this->lensIndex = this->interfaces.size()-1;
-	}
-
-	static int refraction(float *refract, float *n, float *view, double index)
-	{
-
-                return 1;
-
-//                float dot, fac;
-
-//                VECCOPY(refract, view);
-
-//                dot = view[0]*n[0] + view[1]*n[1] + view[2]*n[2];
-
-//                if (dot>0.0f) {
-//                        index = 1.0f/index;
-//                        fac = 1.0f - (1.0f - dot*dot)*index*index;
-//                        if (fac<= 0.0f) return 0;
-//                        fac= -dot*index + sqrt(fac);
-//                }
-//                else {
-//                        fac = 1.0f - (1.0f - dot*dot)*index*index;
-//                        if (fac<= 0.0f) return 0;
-//                        fac= -dot*index - sqrt(fac);
-//                }
-
-//                refract[0] = index*view[0] + fac*n[0];
-//                refract[1] = index*view[1] + fac*n[1];
-//                refract[2] = index*view[2] + fac*n[2];
-
-//                normalize_v3(refract);
-//                return 1;
-		//---
-//		const double cosI = dot_v3v3(n, view);
-//		const double sinT2 = index * index * (1.0 - cosI * cosI);
-//		if (sinT2 >= 1.0f)
-//		{
-//			return 0;
-//		}
-//		refract[0] = index*view[0] - (index + sqrt(1.0-sinT2))*n[0];
-//		refract[1] = index*view[1] - (index + sqrt(1.0-sinT2))*n[1];
-//		refract[2] = index*view[2] - (index + sqrt(1.0-sinT2))*n[2];
-//		normalize_v3(refract);
-//		return 1;
-		//---
-
-//                double ni = -dot_v3v3(view, n);
-//                double test = 1.0f - index*index*(1.0f-ni*ni);
-//                if (test < 0) {
-//                        return 0;
-//                }
-//                else {
-//                        double mul = index*ni + sqrt(test);
-//                        refract[0] = index * view[0] - mul*n[0];
-//                        refract[1] = index * view[1] - mul*n[1];
-//                        refract[2] = index * view[2] - mul*n[2];
-//                        normalize_v3(refract);
-//                        return 1;
-//                }
-	}
-
-	/* orn = original face normal */
-	static void reflection(float *ref, float *n, float *view)
-	{
-		float f1;
-
-		f1= -2.0f*dot_v3v3(n, view);
-
-		ref[0] = (view[0]+f1*n[0]);
-		ref[1] = (view[1]+f1*n[1]);
-		ref[2] = (view[2]+f1*n[2]);
-		normalize_v3(ref);
-	}
-
-	static float fresnelAR(float theta0, float lambda, float d1, float n0, float n1, float n2) {
-		// refractionangles in coating and the 2nd medium
-		float theta1 = asin(sin(theta0)*n0/n1);
-		float theta2 = asin(sin(theta0)*n0/n2);
-
-		float rs01 = -sin(theta0-theta1)/sin(theta0+theta1);
-		float rp01 = tan( theta0-theta1)/tan(theta0+theta1);
-		float ts01 = 2 * sin( theta1 ) * cos( theta0 ) / sin( theta0+theta1 ) ;
-		float tp01 = ts01*cos(theta0-theta1);
-		// amplitude for inner reflection
-		float rs12 = -sin( theta1-theta2 ) / sin( theta1+theta2 ) ;
-		float rp12 = +tan( theta1-theta2 ) / tan( theta1+theta2 ) ;
-		// after passing through first surface twice :
-		// 2 transmissions and 1 reflection
-		float ris = ts01 * ts01 * rs12 ;
-		float rip = tp01 * tp01 * rp12 ;
-		// phase difference between outer and inner reflections
-		float dy = d1 * n1 ;
-		float dx = tan( theta1 ) * dy ;
-		float delay = sqrt( dx * dx+dy * dy ) ;
-		float relPhase = 4 * M_PI / lambda * ( delay-dx * sin( theta0 ) ) ;
-		// Add up sines of different phase and amplitude
-		float out_s2 = rs01 * rs01 + ris * ris + 2 * rs01 * ris * cos( relPhase ) ;
-		float out_p2 = rp01 * rp01 + rip * rip + 2 * rp01 * rip * cos( relPhase ) ;
-		return (out_s2 + out_p2) / 2 ;
-	}
-
-	void detectHit(Ray *result, Ray *inputRay, Bounce *bounce) {
-		int phase = 0;
-		int delta = 1;
-		int t = 1;
-		int k;
-		result->copyFrom(inputRay);
-		result->valid = false;
-		LensInterface *next = bounce->interface1;
-		LensInterface *f = NULL;
-		Intersection intersection;
-		for (k = 0 ; k < bounce->length-1;k++, t+=delta) {
-			f = this->interfaces[t];
-			bool breflect = next == f;
-			if (breflect) {
-				delta = -delta;
-				if (phase == 0) {
-					next = bounce->interface2;
-				}
-				else {
-					next = NULL;
-				}
-				phase ++;
-			}
-
-			f->intersect(&intersection, result);
-			if (!intersection.hit) {
-				break;
-			}
-			if (f->isFlat()) {
-				if (t == this->bokehIndex) {
-					result->uv[0] = intersection.position[0]/f->nominalRadius;
-					result->uv[1] = intersection.position[1]/f->nominalRadius;
-				}
-			}
-
-			float p[3] = {
-				intersection.position[0]-result->position[0],
-				intersection.position[1]-result->position[1],
-				intersection.position[2]-result->position[2]
-			};
-
-			float nfac = sqrt(p[0]*p[0]+p[1]*p[1]+p[2]*p[2]);
-
-			if (intersection.inverted) {
-				nfac *= -1;
-			}
-
-			result->direction[0] = p[0]/nfac;
-			result->direction[1] = p[1]/nfac;
-			result->direction[2] = p[2]/nfac;
-			result->position[0] = intersection.position[0];
-			result->position[1] = intersection.position[1];
-			result->position[2] = intersection.position[2];
-
-			if (!f->isFlat()) {
-				// do refraction and reflection
-				double n0 = result->direction[2]<0?f->refraction1:f->refraction3;
-				double n1 = f->refraction2;
-				double n2 = result->direction[2]<0?f->refraction3:f->refraction1;
-				if (!breflect) {
-					float view[3] ={
-						result->direction[0],
-						result->direction[1],
-						result->direction[2]
-					};
-					int ref = this->refraction(result->direction, intersection.normal, view, n0/n1);
-					if (ref == 0) {
-						break;
-					}
-				}
-				else {
-					this->reflection(result->direction, intersection.normal, result->direction);
-					float  fresnelMultiplyer = fresnelAR(intersection.theta, result->wavelength, f->thicknessCoathing, n0, n1, n2);
-					if (isnan(fresnelMultiplyer)) {
-						fresnelMultiplyer = 0.0f;
-					}
-					result->intensity *= fresnelMultiplyer;
-				}
-			}
-
-		}
-		if (k < bounce->length-1) {
-			result->intensity = 0;
-		}
-		else {
-			result->valid = true;
-		}
-	}
-};
-
-typedef struct LensFace {
-	RayResult *v1;
-	RayResult *v2;
-	RayResult *v3;
-} LensFace;
-
-LensGhostProjectionOperation::LensGhostProjectionOperation(): NodeOperation()
-{
-	this->addInputSocket(COM_DT_COLOR);
-	this->addInputSocket(COM_DT_COLOR, COM_SC_NO_RESIZE);
-	this->addOutputSocket(COM_DT_COLOR);
-	this->lampObject = NULL;
-	this->cameraObject = NULL;
-	this->system = NULL;
-	this->quality = COM_QUALITY_HIGH;
-	this->setComplex(false);
-}
-
-LensGhostOperation::LensGhostOperation(): LensGhostProjectionOperation()
-{
-	this->setComplex(true);
-
-}
-
-void LensGhostProjectionOperation::initExecution()
-{
-	if (this->cameraObject != NULL && this->lampObject != NULL) {
-		if (lampObject == NULL || cameraObject == NULL) {
-			visualLampPosition[0] = 0;
-			visualLampPosition[1] = 0;
-			visualLampPosition[2] = 0;
-		}
-		else {
-			/* too simple, better to return the distance on the view axis only
-			 * return len_v3v3(ob->obmat[3], cam->dof_ob->obmat[3]); */
-			float matt[4][4], imat[4][4], obmat[4][4];
-
-			copy_m4_m4(obmat, cameraObject->obmat);
-			normalize_m4(obmat);
-			invert_m4_m4(imat, obmat);
-			mult_m4_m4m4(matt, imat, lampObject->obmat);
-
-			visualLampPosition[0] = (float)(matt[3][0]);
-			visualLampPosition[1] = (float)(matt[3][1]);
-			visualLampPosition[2] = (float)fabs(matt[3][2]);
-		}
-	}
-	this->lamp = (Lamp*)lampObject->data;
-
-	this->step = this->quality==COM_QUALITY_LOW?64:this->quality==COM_QUALITY_MEDIUM?128:256;
-	this->bokehReader = this->getInputSocketReader(1);
-
-#define MM *0.001f
-#define CM *0.01f
-#define NM *0.000000001
-#define RED 650 NM
-#define GREEN 510 NM
-#define BLUE 475 NM
-#define AIR 1.000293f
-#define GLASS 1.5200f
-#define TEST 0.000002f
-	// determine interfaces
-	LensSystem *system = new LensSystem();
-	system->addInterface(new FlatInterface(0.0f,0.0f, 6.5 CM, 30 MM)); //ENTRANCE
-        system->addInterface(new SphereInterface(0.0f,0.0f, -3 CM, 8 CM, 3 CM, AIR, GLASS , 0.f));
-        system->addInterface(new SphereInterface(0.0f,0.0f, -4 CM, 8 CM, 3 CM, GLASS, AIR, GREEN));
-        system->addInterface(new FlatInterface(0.0f,0.0f, 3.0 CM, 15 MM)); // BOKEH
-        system->addInterface(new SphereInterface(0.0f,0.0f, 6 CM, 3 CM, 2 CM, AIR, GLASS, 0.0f));
-        system->addInterface(new SphereInterface(0.0f,0.0f, 5.5 CM, 3 CM, 2 CM, GLASS, AIR, 0.f));
-        system->addInterface(new FlatInterface(0.0f,0.0f,0 CM, 30 MM)); // SENSOR
-	system->bokehIndex = 3;
-
-	// determine interfaces
-//	LensSystem *system = new LensSystem();
-//	system->addInterface(new FlatInterface(0.0f,0.0f, 6.5 CM, 30 MM)); //ENTRANCE
-//	system->addInterface(new SphereInterface(0.0f,0.0f, 14 CM, 8 CM, 6 CM, AIR, GLASS , 0.0f));
-//	system->addInterface(new SphereInterface(0.0f,0.0f, 12 CM, 8 CM, 6 CM, GLASS, AIR, GREEN));
-//	system->addInterface(new FlatInterface(0.0f,0.0f, 3.0 CM, 30 MM)); // BOKEH
-//	system->addInterface(new SphereInterface(0.0f,0.0f, 1 CM, 3 CM, 2 CM, AIR, GLASS, GREEN));
-//	system->addInterface(new SphereInterface(0.0f,0.0f, -2 CM, 3 CM, 2 CM, GLASS, AIR, RED));
-//	system->addInterface(new FlatInterface(0.0f,0.0f,0 CM, 20 MM)); // SENSOR
-//	system->bokehIndex = 3;
-#undef CM
-#undef MM
-	// determine bounces
-	system->updateBounces(step);
-	this->system = system;
-}
-
-void LensGhostOperation::initExecution()
-{
-	LensGhostProjectionOperation::initExecution();
-	LensSystem *system = (LensSystem*)this->system;
-	LensInterface *interface1 = system->interfaces[0];
-
-	// for every herz
-	float HERZ[3]={650 NM,510 NM,475 NM}; /// @todo use 7 for high quality?
-	for (int iw = 0 ; iw < 3 ; iw ++) {
-		float wavelength = HERZ[iw];
-	// for every bounce
-		for (int ib = 0 ; ib < system->bounces.size() ; ib++) {
-			Bounce *bounce = system->bounces[ib];
-	// based on quality setting the number of iteration will be different (128^2, 64^2, 32^2)
-			for (int xi = 0 ; xi < step ; xi ++) {
-				float x = -interface1->radius+xi*(interface1->radius*2/step);
-				for (int yi = 0 ; yi < step ; yi ++) {
-					float y = -interface1->radius+yi*(interface1->radius*2/step);
-					Ray r;
-					Ray result;
-					r.wavelength = wavelength;
-					r.intensity = this->lamp->energy;
-					r.uv[0] = 0.0f;
-					r.uv[1] = 0.0f;
-					r.position[0] = visualLampPosition[0];
-					r.position[1] = visualLampPosition[1];
-					r.position[2] = visualLampPosition[2];
-					r.direction[0] = interface1->position[0]+x - r.position[0];
-					r.direction[1] = interface1->position[1]+y - r.position[1];
-					r.direction[2] = interface1->position[2] - r.position[2];
-					normalize_v3(r.direction);
-					system->detectHit(&result, &r, bounce);
-					RayResult *res = bounce->getRayResult(xi, yi);
-					if (iw == 0) {
-						res->x = result.position[0];
-						res->y = result.position[1];
-						res->u = result.uv[0];
-						res->v = result.uv[1];
-					}
-					res->intensity[iw] = result.intensity;
-					if (result.valid) {
-						res->valid = true;
-					}
-				}
-			}
-		}
-	}
-#undef NM
-	const int width = this->getWidth();
-	const int height = this->getHeight();
-	const float width2 = width/2.0f;
-	const float height2 = height/2.0f;
-	float *data = new float[width*height*4];
-	for (int i = 0 ; i < width*height ; i ++) {
-		data[i*4+0] = 0.0f;
-		data[i*4+1] = 0.0f;
-		data[i*4+2] = 0.0f;
-		data[i*4+3] = 1.0f;
-	}
-	/// @todo every bounce creates own image. these images are added together at the end
-//	LensSystem *system = (LensSystem*)this->system;
-	LensInterface * lens = system->interfaces[system->lensIndex];
-	for (int i = 0 ; i < system->bounces.size() ; i ++) {
-		Bounce *bounce = system->bounces[i];
-		for (int r = 0 ; r < bounce->rasterLength*bounce->rasterLength ; r ++) {
-			RayResult *result = &bounce->raster[r];
-//			if (result->valid) {
-				float ru = result->x/lens->nominalRadius*width2+width2;
-				float rv  = result->y/lens->nominalRadius*height2+height2;
-				result->screenX = ru;
-				result->screenY = rv;
-				result->hasIntensity = result->intensity[0]>0.0f &&result->intensity[1]>0.0f&& result->intensity[2]>0.0f;
-//			}
-		}
-	}
-}
-
-void *LensGhostOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
-{
-	vector<LensFace*>* result = new vector<LensFace*>();
-	LensSystem *system = (LensSystem*)this->system;
-	const float minx = rect->xmin;
-	const float miny = rect->ymin;
-	const float maxx = rect->xmax;
-	const float maxy = rect->ymax;
-	for (int i = 0 ; i < system->bounces.size() ; i ++) {
-		Bounce *bounce = system->bounces[i];
-		int faceX, faceY;
-		for (faceX = 0 ; faceX < bounce->rasterLength-1 ; faceX++) {
-			for (faceY = 0 ; faceY < bounce->rasterLength-1 ; faceY++) {
-				RayResult *vertex1 = bounce->getRayResult(faceX, faceY);
-				RayResult *vertex2 = bounce->getRayResult(faceX+1, faceY);
-				RayResult *vertex3 = bounce->getRayResult(faceX+1, faceY+1);
-				RayResult *vertex4 = bounce->getRayResult(faceX, faceY+1);
-				// early hit test
-				if (!((vertex1->screenX < minx && vertex2->screenX < minx && vertex3->screenX < minx && vertex4->screenX < minx) ||
-					(vertex1->screenX > maxx && vertex2->screenX > maxx && vertex3->screenX > maxx && vertex4->screenX > maxx) ||
-					(vertex1->screenY < miny && vertex2->screenY < miny && vertex3->screenY < miny && vertex4->screenY < miny) ||
-					(vertex1->screenY > maxy && vertex2->screenY > maxy && vertex3->screenY > maxy && vertex4->screenY > maxy))) {
-					int number = vertex1->hasIntensity + vertex2->hasIntensity + vertex3->hasIntensity + vertex4->hasIntensity;
-					if (number == 4) {
-						LensFace *face = new LensFace();
-						face->v1 = vertex1;
-						face->v2 = vertex2;
-						face->v3 = vertex3;
-						result->push_back(face);
-						face = new LensFace();
-						face->v1 = vertex3;
-						face->v2 = vertex4;
-						face->v3 = vertex1;
-						result->push_back(face);
-					}
-					else if (number == 3) {
-						LensFace *face = new LensFace();
-						if (!vertex1->hasIntensity) {
-							face->v1 = vertex2;
-							face->v2 = vertex3;
-							face->v3 = vertex4;
-						}
-						else if (!vertex2->hasIntensity) {
-							face->v1 = vertex1;
-							face->v2 = vertex3;
-							face->v3 = vertex4;
-						}
-						else if (!vertex3->hasIntensity) {
-							face->v1 = vertex1;
-							face->v2 = vertex2;
-							face->v3 = vertex4;
-						}
-						else {
-							face->v1 = vertex1;
-							face->v2 = vertex2;
-							face->v3 = vertex3;
-						}
-						result->push_back(face);
-					}
-				}
-			}
-		}
-	}
-
-	return result;
-}
-
-void LensGhostOperation::deinitializeTileData(rcti *rect, MemoryBuffer **memoryBuffers, void *data)
-{
-	if (data) {
-		vector<LensFace*>* faces = (vector<LensFace*>*)data;
-		while (faces->size() != 0) {
-			LensFace *face = faces->back();
-			faces->pop_back();
-			delete face;
-		}
-		delete faces;
-	}
-}
-
-
-void LensGhostProjectionOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
-{
-	float bokeh[4];
-	LensSystem *system = (LensSystem*)this->system;
-	LensInterface *interface1 = system->interfaces[0];
-	color[0] = 0.0f;
-	color[1] = 0.0f;
-	color[2] = 0.0f;
-	color[3] = 0.0f;
-	const float width = this->getWidth();
-	const float height = this->getHeight();
-	const float size = min(height, width);
-	const float width2 = width/2;
-	const float height2 = height/2;
-	const float size2 = size/2;
-
-#define NM *0.000000001
-	float HERZ[3]={650 NM,510 NM,475 NM}; /// @todo use 7 for high quality?
-	float rx = ((x-width2)/size2) * interface1->radius;
-	float ry = ((y-height2)/size2) * interface1->radius;
-
-	for (int iw = 0 ; iw < 3 ; iw ++) {
-		float intensity = 0.0f;
-		float wavelength = HERZ[iw];
-		float colorcomponent = 0.0f;
-		if (iw ==0 ) colorcomponent = lamp->r;
-		if (iw ==1 ) colorcomponent = lamp->g;
-		if (iw ==2 ) colorcomponent = lamp->b;
-
-
-	// for every bounce
-		for (int ib = 0 ; ib < system->bounces.size() ; ib++) {
-			Bounce *bounce = system->bounces[ib];
-	// based on quality setting the number of iteration will be different (128^2, 64^2, 32^2)
-
-			Ray r;
-			Ray result;
-			r.wavelength = wavelength;
-			r.intensity = this->lamp->energy;
-			r.uv[0] = 0.0f;
-			r.uv[1] = 0.0f;
-			r.position[0] = visualLampPosition[0];
-			r.position[1] = visualLampPosition[1];
-			r.position[2] = visualLampPosition[2];
-			r.direction[0] = interface1->position[0]+rx - r.position[0];
-			r.direction[1] = interface1->position[1]+ry - r.position[1];
-			r.direction[2] = interface1->position[2] - r.position[2];
-			normalize_v3(r.direction);
-			system->detectHit(&result, &r, bounce);
-			if (result.valid) {
-				float u = ((result.uv[0]+1.0f)/2)*bokehReader->getWidth();
-				float v = ((result.uv[1]+1.0f)/2)*bokehReader->getHeight();
-
-				bokehReader->read(bokeh, u, v, sampler, inputBuffers);
-
-				intensity += result.intensity *bokeh[iw];
-			}
-		}
-		intensity = maxf(0.0f, intensity);
-		color[iw] = intensity*colorcomponent;
-	}
-	color[3] = 1.0f;
-#undef NM
-
-}
-
-
-
-void LensGhostOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
-{
-	vector<LensFace*>* faces = (vector<LensFace*>*)data;
-#if 0 /* UNUSED */
-	const float bokehWidth = bokehReader->getWidth();
-	const float bokehHeight = bokehReader->getHeight();
-	float bokeh[4];
-#endif
-	color[0] = 0.0f;
-	color[1] = 0.0f;
-	color[2] = 0.0f;
-	color[3] = 1.0f;
-
-	unsigned int index;
-	for (index = 0 ; index < faces->size() ; index ++) {
-		LensFace * face = faces->operator [](index);
-		RayResult *vertex1 = face->v1;
-		RayResult *vertex2 = face->v2;
-		RayResult *vertex3 = face->v3;
-		if (!((vertex1->screenX < x && vertex2->screenX < x && vertex3->screenX < x) ||
-			(vertex1->screenX > x && vertex2->screenX > x && vertex3->screenX > x) ||
-			(vertex1->screenY < y && vertex2->screenY < y && vertex3->screenY < y) ||
-			(vertex1->screenY > y && vertex2->screenY > y && vertex3->screenY > y))) {
-
-			const float v1[2] = {vertex1->screenX, vertex1->screenY};
-			const float v2[2] = {vertex2->screenX, vertex2->screenY};
-			const float v3[2] = {vertex3->screenX, vertex3->screenY};
-			const float co[2] = {x, y};
-			float weights[3];
-
-			barycentric_weights_v2(v1, v2, v3, co, weights);
-			if (weights[0]>=0.0f && weights[0]<=1.0f &&
-					weights[1]>=0.0f && weights[1]<=1.0f &&
-					weights[2]>=0.0f && weights[2]<=1.0f) {
-//                            const float u = (vertex1->u*weights[0]+vertex2->u*weights[1]+vertex3->u*weights[2]);
-//                            const float v = (vertex1->v*weights[0]+vertex2->v*weights[1]+vertex3->v*weights[2]);
-//                            const float tu = ((u+1.0f)/2.0f)*bokehWidth;
-//                            const float tv = ((v+1.0f)/2.0f)*bokehHeight;
-//                            bokehReader->read(bokeh, tu, tv, inputBuffers);
-
-//							color[0] = max(color[0], bokeh[0]*(vertex1->intensity[0]*weights[0]+vertex2->intensity[0]*weights[1]+vertex3->intensity[0]*weights[2]));
-//                            color[1] = max(color[1], bokeh[1]*(vertex1->intensity[1]*weights[0]+vertex2->intensity[1]*weights[1]+vertex3->intensity[1]*weights[2]));
-//                            color[2] = max(color[2], bokeh[2]*(vertex1->intensity[2]*weights[0]+vertex2->intensity[2]*weights[1]+vertex3->intensity[2]*weights[2]));
-							color[0] = max(color[0], (vertex1->intensity[0]*weights[0]+vertex2->intensity[0]*weights[1]+vertex3->intensity[0]*weights[2]));
-                            color[1] = max(color[1], (vertex1->intensity[1]*weights[0]+vertex2->intensity[1]*weights[1]+vertex3->intensity[1]*weights[2]));
-                            color[2] = max(color[2], (vertex1->intensity[2]*weights[0]+vertex2->intensity[2]*weights[1]+vertex3->intensity[2]*weights[2]));
-			}
-		}
-	}
-}
-
-
-void LensGhostProjectionOperation::deinitExecution()
-{
-	if (this->system) delete (LensSystem*)this->system;
-	this->system = NULL;
-	this->bokehReader = NULL;
-}
-
-bool LensGhostProjectionOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
-{
-	rcti bokehInput;
-
-	NodeOperation *operation = this->getInputOperation(1);
-	bokehInput.xmax = operation->getWidth();
-	bokehInput.xmin = 0;
-	bokehInput.ymax = operation->getHeight();
-	bokehInput.ymin = 0;
-	if (operation->determineDependingAreaOfInterest(&bokehInput, readOperation, output) ) {
-		return true;
-	}
-
-	return NodeOperation::determineDependingAreaOfInterest(input, readOperation, output);
-}
diff --git a/source/blender/compositor/operations/COM_LensGhostOperation.h b/source/blender/compositor/operations/COM_LensGhostOperation.h
deleted file mode 100644
index 5546ce96fd1..00000000000
--- a/source/blender/compositor/operations/COM_LensGhostOperation.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2011, Blender Foundation.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contributor: 
- *		Jeroen Bakker 
- *		Monique Dewanchand
- */
-
-#ifndef _COM_LensGhostOperation_h
-#define _COM_LensGhostOperation_h
-#include "COM_NodeOperation.h"
-#include "DNA_lamp_types.h"
-#include "DNA_object_types.h"
-#include "DNA_camera_types.h"
-
-class LensGhostProjectionOperation : public NodeOperation {
-protected:
-	Object *lampObject;
-	Lamp *lamp;
-	Object *cameraObject;
-
-	void *system;
-	float visualLampPosition[3];
-	CompositorQuality quality;
-	int step;
-	SocketReader * bokehReader;
-
-public:
-	LensGhostProjectionOperation();
-
-	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
-
-	/**
-	  * Initialize the execution
-	  */
-	void initExecution();
-
-	/**
-	  * Deinitialize the execution
-	  */
-	void deinitExecution();
-	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
-
-	void setLampObject(Object *lampObject) {this->lampObject = lampObject;}
-	void setCameraObject(Object *cameraObject) {this->cameraObject = cameraObject;}
-
-	void setQuality(CompositorQuality quality) {this->quality = quality;}
-};
-
-class LensGhostOperation : public LensGhostProjectionOperation {
-public:
-	LensGhostOperation();
-
-	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
-	void deinitializeTileData(rcti *rect, MemoryBuffer **memoryBuffers, void *data);
-	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data);
-	/**
-	  * Initialize the execution
-	  */
-	void initExecution();
-};
-#endif
diff --git a/source/blender/compositor/operations/COM_LensGlowImageOperation.cpp b/source/blender/compositor/operations/COM_LensGlowImageOperation.cpp
deleted file mode 100644
index ee0a02e5fae..00000000000
--- a/source/blender/compositor/operations/COM_LensGlowImageOperation.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2011, Blender Foundation.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contributor: 
- *		Jeroen Bakker 
- *		Monique Dewanchand
- */
-
-#include "COM_LensGlowImageOperation.h"
-#include "BLI_math.h"
-
-LensGlowImageOperation::LensGlowImageOperation(): NodeOperation()
-{
-	this->addOutputSocket(COM_DT_COLOR);
-}
-void LensGlowImageOperation::initExecution()
-{
-	this->scale = 1/20000.0f;
-}
-void LensGlowImageOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
-{
-	const float cs_r = 1.f, cs_g = 1.f, cs_b = 1.f;
-	const float v = 2.f*(y / (float)512.0f) - 1.f;
-	const float u = 2.f*(x / (float)512.0f) - 1.f;
-	const float r = (u*u + v*v)*scale;
-	const float d = -sqrtf(sqrtf(sqrtf(r)))*9.f;
-	const float w = (0.5f + 0.5f*cos((double)u*M_PI))*(0.5f + 0.5f*cos((double)v*M_PI));
-	color[0] = expf(d*cs_r) * w;
-	color[1] = expf(d*cs_g) * w;
-	color[2] = expf(d*cs_b) * w;
-	color[3] = 1.0f;
-}
-
-void LensGlowImageOperation::deinitExecution()
-{
-}
-
-void LensGlowImageOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
-{
-	resolution[0] = 512;
-	resolution[1] = 512;
-}
diff --git a/source/blender/compositor/operations/COM_LensGlowOperation.cpp b/source/blender/compositor/operations/COM_LensGlowOperation.cpp
deleted file mode 100644
index 492dc715f10..00000000000
--- a/source/blender/compositor/operations/COM_LensGlowOperation.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2011, Blender Foundation.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contributor: 
- *		Jeroen Bakker 
- *		Monique Dewanchand
- */
-
-#include "COM_LensGlowOperation.h"
-#include "BLI_math.h"
-
-LensGlowOperation::LensGlowOperation(): NodeOperation()
-{
-	this->addInputSocket(COM_DT_COLOR);
-	this->addOutputSocket(COM_DT_COLOR);
-	this->inputProgram = NULL;
-	this->lamp = NULL;
-}
-void LensGlowOperation::initExecution()
-{
-	this->inputProgram = this->getInputSocketReader(0);
-}
-
-void LensGlowOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
-{
-//	const float emit100 = this->lamp->energy*100;
-//	const float emit200 = emit100*2;
-//	const float deltaX = 160-x;
-//	const float deltaY = 100-y;
-//	const float distance = deltaX * deltaX + deltaY*deltaY;
-
-//	float glow = (emit100-(distance))/(emit200);
-//	if (glow<0) glow=0;
-
-//	color[0] = glow*lamp->r;
-//	color[1] = glow*lamp->g;
-//	color[2] = glow*lamp->b;
-//	color[3] = 1.0f;
-}
-
-void LensGlowOperation::deinitExecution()
-{
-	this->inputProgram = NULL;
-}
diff --git a/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp b/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
index f206bf4df8e..6e8aa9461e6 100644
--- a/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
+++ b/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
@@ -22,7 +22,7 @@
 #include "COM_LuminanceMatteOperation.h"
 #include "BLI_math.h"
 
-LuminanceMatteOperation::LuminanceMatteOperation(): NodeOperation()
+LuminanceMatteOperation::LuminanceMatteOperation() : NodeOperation()
 {
 	addInputSocket(COM_DT_COLOR);
 	addOutputSocket(COM_DT_VALUE);
@@ -44,26 +44,26 @@ void LuminanceMatteOperation::executePixel(float *outputValue, float x, float y,
 {
 	float inColor[4];
 
-	const float high=this->settings->t1;
-	const float low=this->settings->t2;
+	const float high = this->settings->t1;
+	const float low = this->settings->t2;
 
 	float alpha;
 
 	this->inputImageProgram->read(inColor, x, y, sampler, inputBuffers);
 	
 	/* one line thread-friend algorithm:
-	outputValue[0] = max(inputValue[3], min(high, max(low, ((inColor[0]-low)/(high-low))))
-	*/
+	 * outputValue[0] = max(inputValue[3], min(high, max(low, ((inColor[0]-low)/(high-low))))
+	 */
 		
 	/* test range*/
 	if (inColor[0] > high) {
-		alpha=1.f;
+		alpha = 1.f;
 	}
 	else if (inColor[0] < low) {
-		alpha=0.f;
+		alpha = 0.f;
 	}
-	else {/*blend */
-		alpha=(inColor[0]-low)/(high-low);
+	else { /*blend */
+		alpha = (inColor[0] - low) / (high - low);
 	}
 
 
@@ -72,12 +72,12 @@ void LuminanceMatteOperation::executePixel(float *outputValue, float x, float y,
 	 */
 
 	/* don't make something that was more transparent less transparent */
-	if (alpha<inColor[3]) {
-		outputValue[0]=alpha;
+	if (alpha < inColor[3]) {
+		outputValue[0] = alpha;
 	}
 	else {
-	/* leave now it was before */
-		outputValue[0]=inColor[3];
+		/* leave now it was before */
+		outputValue[0] = inColor[3];
 	}
 }
 
diff --git a/source/blender/compositor/operations/COM_LuminanceMatteOperation.h b/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
index 1c2cd2dca51..f44e32396a3 100644
--- a/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
+++ b/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
@@ -25,27 +25,27 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class LuminanceMatteOperation : public NodeOperation {
 private:
 	NodeChroma *settings;
 	SocketReader *inputImageProgram;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	LuminanceMatteOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	void initExecution();
 	void deinitExecution();
 	
-	void setSettings(NodeChroma *nodeChroma) {this->settings = nodeChroma;}
+	void setSettings(NodeChroma *nodeChroma) { this->settings = nodeChroma; }
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_MapUVOperation.cpp b/source/blender/compositor/operations/COM_MapUVOperation.cpp
index 7b393cc04a8..b29dcfab194 100644
--- a/source/blender/compositor/operations/COM_MapUVOperation.cpp
+++ b/source/blender/compositor/operations/COM_MapUVOperation.cpp
@@ -22,7 +22,7 @@
 #include "COM_MapUVOperation.h"
 #include "BLI_math.h"
 
-MapUVOperation::MapUVOperation(): NodeOperation()
+MapUVOperation::MapUVOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addInputSocket(COM_DT_VECTOR);
@@ -44,7 +44,7 @@ void MapUVOperation::executePixel(float *color, float x, float y, PixelSampler s
 {
 	float inputUV[4];
 	float uv_a[4], uv_b[4];
-	float u,v;
+	float u, v;
 
 	float dx, dy;
 	float uv_l, uv_r;
@@ -52,48 +52,45 @@ void MapUVOperation::executePixel(float *color, float x, float y, PixelSampler s
 
 	this->inputUVProgram->read(inputUV, x, y, sampler, inputBuffers);
 	if (inputUV[2] == 0.f) {
-		color[0] = 0.f;
-		color[1] = 0.f;
-		color[2] = 0.f;
-		color[3] = 0.f;
-	 return;
+		zero_v4(color);
+		return;
 	}
 	/* adaptive sampling, red (U) channel */
-	this->inputUVProgram->read(uv_a, x-1, y, COM_PS_NEAREST, inputBuffers);
-	this->inputUVProgram->read(uv_b, x+1, y, COM_PS_NEAREST, inputBuffers);
-	uv_l = uv_a[2]!=0.f? fabs(inputUV[0] - uv_a[0]) : 0.f;
-	uv_r = uv_b[2]!=0.f? fabs(inputUV[0] - uv_b[0]) : 0.f;
+	this->inputUVProgram->read(uv_a, x - 1, y, COM_PS_NEAREST, inputBuffers);
+	this->inputUVProgram->read(uv_b, x + 1, y, COM_PS_NEAREST, inputBuffers);
+	uv_l = uv_a[2] != 0.f ? fabsf(inputUV[0] - uv_a[0]) : 0.f;
+	uv_r = uv_b[2] != 0.f ? fabsf(inputUV[0] - uv_b[0]) : 0.f;
 
 	dx = 0.5f * (uv_l + uv_r);
 
 	/* adaptive sampling, green (V) channel */
-	this->inputUVProgram->read(uv_a, x, y-1, COM_PS_NEAREST, inputBuffers);
-	this->inputUVProgram->read(uv_b, x, y+1, COM_PS_NEAREST, inputBuffers);
-	uv_u = uv_a[2]!=0.f? fabs(inputUV[1] - uv_a[1]) : 0.f;
-	uv_d = uv_b[2]!=0.f? fabs(inputUV[1] - uv_b[1]) : 0.f;
+	this->inputUVProgram->read(uv_a, x, y - 1, COM_PS_NEAREST, inputBuffers);
+	this->inputUVProgram->read(uv_b, x, y + 1, COM_PS_NEAREST, inputBuffers);
+	uv_u = uv_a[2] != 0.f ? fabsf(inputUV[1] - uv_a[1]) : 0.f;
+	uv_d = uv_b[2] != 0.f ? fabsf(inputUV[1] - uv_b[1]) : 0.f;
 
 	dy = 0.5f * (uv_u + uv_d);
 
 	/* more adaptive sampling, red and green (UV) channels */
-	this->inputUVProgram->read(uv_a, x-1, y-1, COM_PS_NEAREST, inputBuffers);
-	this->inputUVProgram->read(uv_b, x-1, y+1, COM_PS_NEAREST, inputBuffers);
-	uv_l = uv_a[2]!=0.f? fabsf(inputUV[0] - uv_a[0]) : 0.f;
-	uv_r = uv_b[2]!=0.f? fabsf(inputUV[0] - uv_b[0]) : 0.f;
-	uv_u = uv_a[2]!=0.f? fabsf(inputUV[1] - uv_a[1]) : 0.f;
-	uv_d = uv_b[2]!=0.f? fabsf(inputUV[1] - uv_b[1]) : 0.f;
-
-	dx+= 0.25f * (uv_l + uv_r);
-	dy+= 0.25f * (uv_u + uv_d);
-
-	this->inputUVProgram->read(uv_a, x+1, y-1, COM_PS_NEAREST, inputBuffers);
-	this->inputUVProgram->read(uv_b, x+1, y+1, COM_PS_NEAREST, inputBuffers);
-	uv_l = uv_a[2]!=0.f? fabsf(inputUV[0] - uv_a[0]) : 0.f;
-	uv_r = uv_b[2]!=0.f? fabsf(inputUV[0] - uv_b[0]) : 0.f;
-	uv_u = uv_a[2]!=0.f? fabsf(inputUV[1] - uv_a[1]) : 0.f;
-	uv_d = uv_b[2]!=0.f? fabsf(inputUV[1] - uv_b[1]) : 0.f;
-
-	dx+= 0.25f * (uv_l + uv_r);
-	dy+= 0.25f * (uv_u + uv_d);
+	this->inputUVProgram->read(uv_a, x - 1, y - 1, COM_PS_NEAREST, inputBuffers);
+	this->inputUVProgram->read(uv_b, x - 1, y + 1, COM_PS_NEAREST, inputBuffers);
+	uv_l = uv_a[2] != 0.f ? fabsf(inputUV[0] - uv_a[0]) : 0.f;
+	uv_r = uv_b[2] != 0.f ? fabsf(inputUV[0] - uv_b[0]) : 0.f;
+	uv_u = uv_a[2] != 0.f ? fabsf(inputUV[1] - uv_a[1]) : 0.f;
+	uv_d = uv_b[2] != 0.f ? fabsf(inputUV[1] - uv_b[1]) : 0.f;
+
+	dx += 0.25f * (uv_l + uv_r);
+	dy += 0.25f * (uv_u + uv_d);
+
+	this->inputUVProgram->read(uv_a, x + 1, y - 1, COM_PS_NEAREST, inputBuffers);
+	this->inputUVProgram->read(uv_b, x + 1, y + 1, COM_PS_NEAREST, inputBuffers);
+	uv_l = uv_a[2] != 0.f ? fabsf(inputUV[0] - uv_a[0]) : 0.f;
+	uv_r = uv_b[2] != 0.f ? fabsf(inputUV[0] - uv_b[0]) : 0.f;
+	uv_u = uv_a[2] != 0.f ? fabsf(inputUV[1] - uv_a[1]) : 0.f;
+	uv_d = uv_b[2] != 0.f ? fabsf(inputUV[1] - uv_b[1]) : 0.f;
+
+	dx += 0.25f * (uv_l + uv_r);
+	dy += 0.25f * (uv_u + uv_d);
 
 	/* UV to alpha threshold */
 	const float threshold = this->alpha * 0.05f;
@@ -114,10 +111,7 @@ void MapUVOperation::executePixel(float *color, float x, float y, PixelSampler s
 
 	/* "premul" */
 	if (alpha < 1.0f) {
-		color[0]*= alpha;
-		color[1]*= alpha;
-		color[2]*= alpha;
-		color[3]*= alpha;
+		mul_v4_fl(color, alpha);
 	}
 }
 
@@ -131,7 +125,7 @@ bool MapUVOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOpe
 {
 	rcti colorInput;
 	rcti uvInput;
-	NodeOperation *operation=NULL;
+	NodeOperation *operation = NULL;
 
 	/* the uv buffer only needs a 3x3 buffer. The image needs whole buffer */
 
diff --git a/source/blender/compositor/operations/COM_MapUVOperation.h b/source/blender/compositor/operations/COM_MapUVOperation.h
index 4d7bc814dc2..22e3531e838 100644
--- a/source/blender/compositor/operations/COM_MapUVOperation.h
+++ b/source/blender/compositor/operations/COM_MapUVOperation.h
@@ -38,14 +38,14 @@ public:
 	MapUVOperation();
 
 	/**
-	* we need a 3x3 differential filter for UV Input and full buffer for the image
-	*/	
+	 * we need a 3x3 differential filter for UV Input and full buffer for the image
+	 */
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
 
 	/**
 	 * the inner loop of this program
 	 */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
 	 * Initialize the execution
diff --git a/source/blender/compositor/operations/COM_MapValueOperation.cpp b/source/blender/compositor/operations/COM_MapValueOperation.cpp
index bf6d29c0456..6d7804dd6e3 100644
--- a/source/blender/compositor/operations/COM_MapValueOperation.cpp
+++ b/source/blender/compositor/operations/COM_MapValueOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_MapValueOperation.h"
 
-MapValueOperation::MapValueOperation(): NodeOperation()
+MapValueOperation::MapValueOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_VALUE);
 	this->addOutputSocket(COM_DT_VALUE);
@@ -39,12 +39,12 @@ void MapValueOperation::executePixel(float *outputValue, float x, float y, Pixel
 	float src[4];
 	inputOperation->read(src, x, y, sampler, inputBuffers);
 	TexMapping *texmap = this->settings;
-	float value = (src[0] + texmap->loc[0])*texmap->size[0];
+	float value = (src[0] + texmap->loc[0]) * texmap->size[0];
 	if (texmap->flag & TEXMAP_CLIP_MIN)
-		if (value<texmap->min[0])
+		if (value < texmap->min[0])
 			value = texmap->min[0];
 	if (texmap->flag & TEXMAP_CLIP_MAX)
-		if (value>texmap->max[0])
+		if (value > texmap->max[0])
 			value = texmap->max[0];
 	
 	outputValue[0] = value;
diff --git a/source/blender/compositor/operations/COM_MapValueOperation.h b/source/blender/compositor/operations/COM_MapValueOperation.h
index ac320256fe4..5fae74e0a6a 100644
--- a/source/blender/compositor/operations/COM_MapValueOperation.h
+++ b/source/blender/compositor/operations/COM_MapValueOperation.h
@@ -26,41 +26,41 @@
 #include "DNA_texture_types.h"
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class MapValueOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputOperation;
-	TexMapping * settings;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputOperation;
+	TexMapping *settings;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	MapValueOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
 	/**
-	  * @brief set the TexMapping settings
-	  */
-	void setSettings(TexMapping *settings) {this->settings = settings;}
+	 * @brief set the TexMapping settings
+	 */
+	void setSettings(TexMapping *settings) { this->settings = settings; }
 	
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_MaskOperation.cpp b/source/blender/compositor/operations/COM_MaskOperation.cpp
new file mode 100644
index 00000000000..0493bdee12c
--- /dev/null
+++ b/source/blender/compositor/operations/COM_MaskOperation.cpp
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2012, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor:
+ *		Jeroen Bakker
+ *		Monique Dewanchand
+ *		Sergey Sharybin
+ */
+
+#include "COM_MaskOperation.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_listbase.h"
+#include "BLI_math.h"
+
+#include "DNA_scene_types.h"
+
+extern "C" {
+	#include "BKE_mask.h"
+	#include "../../../../intern/raskter/raskter.h"
+}
+
+MaskOperation::MaskOperation() : NodeOperation()
+{
+	this->addOutputSocket(COM_DT_VALUE);
+	this->mask = NULL;
+	this->maskWidth = 0;
+	this->maskHeight = 0;
+	this->framenumber = 0;
+	this->rasterizedMask = NULL;
+	setComplex(true);
+}
+
+void MaskOperation::initExecution()
+{
+	initMutex();
+	this->rasterizedMask = NULL;
+}
+
+void MaskOperation::deinitExecution()
+{
+	if (this->rasterizedMask) {
+		MEM_freeN(rasterizedMask);
+		this->rasterizedMask = NULL;
+	}
+}
+
+void *MaskOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
+{
+	if (this->rasterizedMask)
+		return this->rasterizedMask;
+
+	if (!this->mask)
+		return NULL;
+
+	lockMutex();
+	if (this->rasterizedMask == NULL) {
+		int width = this->getWidth();
+		int height = this->getHeight();
+		float *buffer;
+
+		buffer = (float *)MEM_callocN(sizeof(float) * width * height, "rasterized mask");
+		BKE_mask_rasterize(mask, width, height, buffer, TRUE, this->smooth);
+		if (this->smooth) {
+			PLX_antialias_buffer(buffer, width, height);
+		}
+
+		this->rasterizedMask = buffer;
+	}
+	unlockMutex();
+	return this->rasterizedMask;
+}
+
+void MaskOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
+{
+	if (maskWidth == 0 || maskHeight == 0) {
+		NodeOperation::determineResolution(resolution, preferredResolution);
+	}
+	else {
+		unsigned int nr[2];
+
+		nr[0] = maskWidth;
+		nr[1] = maskHeight;
+
+		NodeOperation::determineResolution(resolution, nr);
+
+		resolution[0] = maskWidth;
+		resolution[1] = maskHeight;
+	}
+}
+
+void MaskOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
+{
+	if (!data) {
+		color[0] = 0.0f;
+	}
+	else {
+		float *buffer = (float *) data;
+		int index = (y * this->getWidth() + x);
+
+		color[0] = buffer[index];
+	}
+}
diff --git a/source/blender/compositor/operations/COM_MaskOperation.h b/source/blender/compositor/operations/COM_MaskOperation.h
new file mode 100644
index 00000000000..8507cb994c0
--- /dev/null
+++ b/source/blender/compositor/operations/COM_MaskOperation.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2012, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor:
+ *		Jeroen Bakker
+ *		Monique Dewanchand
+ *		Sergey Sharybin
+ */
+
+
+#ifndef _COM_MaskOperation_h
+#define _COM_MaskOperation_h
+
+#include "COM_NodeOperation.h"
+#include "DNA_scene_types.h"
+#include "DNA_mask_types.h"
+#include "BLI_listbase.h"
+#include "IMB_imbuf_types.h"
+
+/**
+ * Class with implementation of mask rasterization
+ */
+class MaskOperation : public NodeOperation {
+protected:
+	Mask *mask;
+	int maskWidth;
+	int maskHeight;
+	int framenumber;
+	bool smooth;
+	float *rasterizedMask;
+
+	/**
+	 * Determine the output resolution. The resolution is retrieved from the Renderer
+	 */
+	void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
+
+public:
+	MaskOperation();
+
+	void initExecution();
+	void deinitExecution();
+
+	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
+
+	void setMask(Mask *mask) { this->mask = mask; }
+	void setMaskWidth(int width) { this->maskWidth = width; }
+	void setMaskHeight(int height) { this->maskHeight = height; }
+	void setFramenumber(int framenumber) { this->framenumber = framenumber; }
+	void setSmooth(bool smooth) { this->smooth = smooth; }
+
+	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
+};
+
+#endif
diff --git a/source/blender/compositor/operations/COM_MathBaseOperation.cpp b/source/blender/compositor/operations/COM_MathBaseOperation.cpp
index 3a287cb7239..5e9fb70b206 100644
--- a/source/blender/compositor/operations/COM_MathBaseOperation.cpp
+++ b/source/blender/compositor/operations/COM_MathBaseOperation.cpp
@@ -25,7 +25,7 @@ extern "C" {
 #include "BLI_math.h"
 }
 
-MathBaseOperation::MathBaseOperation(): NodeOperation()
+MathBaseOperation::MathBaseOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_VALUE);
 	this->addInputSocket(COM_DT_VALUE);
@@ -47,6 +47,23 @@ void MathBaseOperation::deinitExecution()
 	this->inputValue2Operation = NULL;
 }
 
+void MathBaseOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
+{
+	InputSocket *socket;
+	unsigned int tempPreferredResolution[] = {0, 0};
+	unsigned int tempResolution[2];
+
+	socket = this->getInputSocket(0);
+	socket->determineResolution(tempResolution, tempPreferredResolution);
+	if ((tempResolution[0] != 0) && (tempResolution[1] != 0)) {
+		this->setResolutionInputSocketIndex(0);
+	}
+	else {
+		this->setResolutionInputSocketIndex(1);
+	}
+	NodeOperation::determineResolution(resolution, preferredResolution);
+}
+
 void MathAddOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
 {
 	float inputValue1[4];
@@ -88,7 +105,7 @@ void MathDivideOperation::executePixel(float *outputValue, float x, float y, Pix
 	inputValue1Operation->read(&inputValue1[0], x, y, sampler, inputBuffers);
 	inputValue2Operation->read(&inputValue2[0], x, y, sampler, inputBuffers);
 	
-	if (inputValue2[0]==0)	/* We don't want to divide by zero. */
+	if (inputValue2[0] == 0) /* We don't want to divide by zero. */
 		outputValue[0] = 0.0;
 	else
 		outputValue[0] = inputValue1[0] / inputValue2[0];
@@ -135,7 +152,7 @@ void MathArcSineOperation::executePixel(float *outputValue, float x, float y, Pi
 	inputValue1Operation->read(&inputValue1[0], x, y, sampler, inputBuffers);
 	inputValue2Operation->read(&inputValue2[0], x, y, sampler, inputBuffers);
 	
-	if (inputValue1[0] <= 1 && inputValue1[0] >= -1 )
+	if (inputValue1[0] <= 1 && inputValue1[0] >= -1)
 		outputValue[0] = asin(inputValue1[0]);
 	else
 		outputValue[0] = 0.0;
@@ -149,7 +166,7 @@ void MathArcCosineOperation::executePixel(float *outputValue, float x, float y,
 	inputValue1Operation->read(&inputValue1[0], x, y, sampler, inputBuffers);
 	inputValue2Operation->read(&inputValue2[0], x, y, sampler, inputBuffers);
 	
-	if (inputValue1[0] <= 1 && inputValue1[0] >= -1 )
+	if (inputValue1[0] <= 1 && inputValue1[0] >= -1)
 		outputValue[0] = acos(inputValue1[0]);
 	else
 		outputValue[0] = 0.0;
@@ -180,8 +197,8 @@ void MathPowerOperation::executePixel(float *outputValue, float x, float y, Pixe
 	else {
 		float y_mod_1 = fmod(inputValue2[0], 1);
 		/* if input value is not nearly an integer, fall back to zero, nicer than straight rounding */
-		if (y_mod_1 > 0.999 || y_mod_1 < 0.001) {
-			outputValue[0] = pow(inputValue1[0], (float)floor(inputValue2[0] + 0.5));
+		if (y_mod_1 > 0.999f || y_mod_1 < 0.001f) {
+			outputValue[0] = pow(inputValue1[0], floorf(inputValue2[0] + 0.5f));
 		}
 		else {
 			outputValue[0] = 0.0;
@@ -244,7 +261,7 @@ void MathLessThanOperation::executePixel(float *outputValue, float x, float y, P
 	inputValue1Operation->read(&inputValue1[0], x, y, sampler, inputBuffers);
 	inputValue2Operation->read(&inputValue2[0], x, y, sampler, inputBuffers);
 	
-	outputValue[0] = inputValue1[0]<inputValue2[0]?1.0f:0.0f;
+	outputValue[0] = inputValue1[0] < inputValue2[0] ? 1.0f : 0.0f;
 }
 
 void MathGreaterThanOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -255,7 +272,7 @@ void MathGreaterThanOperation::executePixel(float *outputValue, float x, float y
 	inputValue1Operation->read(&inputValue1[0], x, y, sampler, inputBuffers);
 	inputValue2Operation->read(&inputValue2[0], x, y, sampler, inputBuffers);
 	
-	outputValue[0] = inputValue1[0]>inputValue2[0]?1.0f:0.0f;
+	outputValue[0] = inputValue1[0] > inputValue2[0] ? 1.0f : 0.0f;
 }
 
 
diff --git a/source/blender/compositor/operations/COM_MathBaseOperation.h b/source/blender/compositor/operations/COM_MathBaseOperation.h
index 87f8a304158..12dc5fa36c7 100644
--- a/source/blender/compositor/operations/COM_MathBaseOperation.h
+++ b/source/blender/compositor/operations/COM_MathBaseOperation.h
@@ -26,125 +26,129 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class MathBaseOperation : public NodeOperation {
 protected:
 	/**
-	  * Prefetched reference to the inputProgram
-	  */
-	SocketReader * inputValue1Operation;
-	SocketReader * inputValue2Operation;
+	 * Prefetched reference to the inputProgram
+	 */
+	SocketReader *inputValue1Operation;
+	SocketReader *inputValue2Operation;
 
 protected:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	MathBaseOperation();
 public:
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) = 0;
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]) = 0;
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 
+	/**
+	 * Determine resolution
+	 */
+	void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
 };
 
-class MathAddOperation: public MathBaseOperation {
+class MathAddOperation : public MathBaseOperation {
 public:
 	MathAddOperation() : MathBaseOperation() {}
-	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
-class MathSubtractOperation: public MathBaseOperation {
+class MathSubtractOperation : public MathBaseOperation {
 public:
 	MathSubtractOperation() : MathBaseOperation() {}
-	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
-class MathMultiplyOperation: public MathBaseOperation {
+class MathMultiplyOperation : public MathBaseOperation {
 public:
 	MathMultiplyOperation() : MathBaseOperation() {}
-	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
-class MathDivideOperation: public MathBaseOperation {
+class MathDivideOperation : public MathBaseOperation {
 public:
 	MathDivideOperation() : MathBaseOperation() {}
-	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
-class MathSineOperation: public MathBaseOperation {
+class MathSineOperation : public MathBaseOperation {
 public:
 	MathSineOperation() : MathBaseOperation() {}
-	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
-class MathCosineOperation: public MathBaseOperation {
+class MathCosineOperation : public MathBaseOperation {
 public:
 	MathCosineOperation() : MathBaseOperation() {}
-	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
-class MathTangentOperation: public MathBaseOperation {
+class MathTangentOperation : public MathBaseOperation {
 public:
 	MathTangentOperation() : MathBaseOperation() {}
-	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
 
-class MathArcSineOperation: public MathBaseOperation {
+class MathArcSineOperation : public MathBaseOperation {
 public:
 	MathArcSineOperation() : MathBaseOperation() {}
-	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
-class MathArcCosineOperation: public MathBaseOperation {
+class MathArcCosineOperation : public MathBaseOperation {
 public:
 	MathArcCosineOperation() : MathBaseOperation() {}
-	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
-class MathArcTangentOperation: public MathBaseOperation {
+class MathArcTangentOperation : public MathBaseOperation {
 public:
 	MathArcTangentOperation() : MathBaseOperation() {}
-	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
-class MathPowerOperation: public MathBaseOperation {
+class MathPowerOperation : public MathBaseOperation {
 public:
 	MathPowerOperation() : MathBaseOperation() {}
-	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
-class MathLogarithmOperation: public MathBaseOperation {
+class MathLogarithmOperation : public MathBaseOperation {
 public:
 	MathLogarithmOperation() : MathBaseOperation() {}
-	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
-class MathMinimumOperation: public MathBaseOperation {
+class MathMinimumOperation : public MathBaseOperation {
 public:
 	MathMinimumOperation() : MathBaseOperation() {}
-	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
-class MathMaximumOperation: public MathBaseOperation {
+class MathMaximumOperation : public MathBaseOperation {
 public:
 	MathMaximumOperation() : MathBaseOperation() {}
-	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
-class MathRoundOperation: public MathBaseOperation {
+class MathRoundOperation : public MathBaseOperation {
 public:
 	MathRoundOperation() : MathBaseOperation() {}
-	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
-class MathLessThanOperation: public MathBaseOperation {
+class MathLessThanOperation : public MathBaseOperation {
 public:
 	MathLessThanOperation() : MathBaseOperation() {}
-	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
-class MathGreaterThanOperation: public MathBaseOperation {
+class MathGreaterThanOperation : public MathBaseOperation {
 public:
 	MathGreaterThanOperation() : MathBaseOperation() {}
-	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
 
 #endif
diff --git a/source/blender/compositor/operations/COM_MixAddOperation.cpp b/source/blender/compositor/operations/COM_MixAddOperation.cpp
index a4f601ae9e6..bd9538a5600 100644
--- a/source/blender/compositor/operations/COM_MixAddOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixAddOperation.cpp
@@ -22,8 +22,9 @@
 
 #include "COM_MixAddOperation.h"
 
-MixAddOperation::MixAddOperation(): MixBaseOperation()
+MixAddOperation::MixAddOperation() : MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixAddOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -41,9 +42,9 @@ void MixAddOperation::executePixel(float *outputValue, float x, float y, PixelSa
 	if (this->useValueAlphaMultiply()) {
 		value *= inputColor2[3];
 	}
-	outputValue[0] = inputColor1[0]+value*inputColor2[0];
-	outputValue[1] = inputColor1[1]+value*inputColor2[1];
-	outputValue[2] = inputColor1[2]+value*inputColor2[2];
+	outputValue[0] = inputColor1[0] + value * inputColor2[0];
+	outputValue[1] = inputColor1[1] + value * inputColor2[1];
+	outputValue[2] = inputColor1[2] + value * inputColor2[2];
 	outputValue[3] = inputColor1[3];
 }
 
diff --git a/source/blender/compositor/operations/COM_MixAddOperation.h b/source/blender/compositor/operations/COM_MixAddOperation.h
index 99a6af67d7d..7b03802cf7e 100644
--- a/source/blender/compositor/operations/COM_MixAddOperation.h
+++ b/source/blender/compositor/operations/COM_MixAddOperation.h
@@ -26,20 +26,20 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class MixAddOperation : public MixBaseOperation {
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	MixAddOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_MixBaseOperation.cpp b/source/blender/compositor/operations/COM_MixBaseOperation.cpp
index 49ae67a06f7..0efab2942b0 100644
--- a/source/blender/compositor/operations/COM_MixBaseOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixBaseOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_MixBaseOperation.h"
 
-MixBaseOperation::MixBaseOperation(): NodeOperation()
+MixBaseOperation::MixBaseOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_VALUE);
 	this->addInputSocket(COM_DT_COLOR);
@@ -55,9 +55,9 @@ void MixBaseOperation::executePixel(float *outputColor, float x, float y, PixelS
 		value *= inputColor2[3];
 	}
 	float valuem = 1.0f - value;
-	outputColor[0] = valuem*(inputColor1[0])+value*(inputColor2[0]);
-	outputColor[1] = valuem*(inputColor1[1])+value*(inputColor2[1]);
-	outputColor[2] = valuem*(inputColor1[2])+value*(inputColor2[2]);
+	outputColor[0] = valuem * (inputColor1[0]) + value * (inputColor2[0]);
+	outputColor[1] = valuem * (inputColor1[1]) + value * (inputColor2[1]);
+	outputColor[2] = valuem * (inputColor1[2]) + value * (inputColor2[2]);
 	outputColor[3] = inputColor1[3];
 }
 
@@ -71,7 +71,7 @@ void MixBaseOperation::deinitExecution()
 void MixBaseOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
 {
 	InputSocket *socket;
-	unsigned int tempPreferredResolution[] = {0,0};
+	unsigned int tempPreferredResolution[] = {0, 0};
 	unsigned int tempResolution[2];
 	
 	socket = this->getInputSocket(1);
diff --git a/source/blender/compositor/operations/COM_MixBaseOperation.h b/source/blender/compositor/operations/COM_MixBaseOperation.h
index b9bb94d58d8..3637cc9eacf 100644
--- a/source/blender/compositor/operations/COM_MixBaseOperation.h
+++ b/source/blender/compositor/operations/COM_MixBaseOperation.h
@@ -26,42 +26,42 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class MixBaseOperation : public NodeOperation {
 protected:
 	/**
-	  * Prefetched reference to the inputProgram
-	  */
+	 * Prefetched reference to the inputProgram
+	 */
 	SocketReader *inputValueOperation;
 	SocketReader *inputColor1Operation;
 	SocketReader *inputColor2Operation;
 	bool valueAlphaMultiply;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	MixBaseOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
 	void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
 	
-	void setUseValueAlphaMultiply(const bool value) {this->valueAlphaMultiply = value;}
-	bool useValueAlphaMultiply() {return this->valueAlphaMultiply;}
+	void setUseValueAlphaMultiply(const bool value) { this->valueAlphaMultiply = value; }
+	bool useValueAlphaMultiply() { return this->valueAlphaMultiply; }
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_MixBlendOperation.cpp b/source/blender/compositor/operations/COM_MixBlendOperation.cpp
index 579f15bcc27..f010d23ce60 100644
--- a/source/blender/compositor/operations/COM_MixBlendOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixBlendOperation.cpp
@@ -22,8 +22,9 @@
 
 #include "COM_MixBlendOperation.h"
 
-MixBlendOperation::MixBlendOperation(): MixBaseOperation()
+MixBlendOperation::MixBlendOperation() : MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixBlendOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -42,8 +43,8 @@ void MixBlendOperation::executePixel(float *outputValue, float x, float y, Pixel
 		value *= inputColor2[3];
 	}
 	float valuem = 1.0f - value;
-	outputValue[0] = valuem*(inputColor1[0])+value*(inputColor2[0]);
-	outputValue[1] = valuem*(inputColor1[1])+value*(inputColor2[1]);
-	outputValue[2] = valuem*(inputColor1[2])+value*(inputColor2[2]);
+	outputValue[0] = valuem * (inputColor1[0]) + value * (inputColor2[0]);
+	outputValue[1] = valuem * (inputColor1[1]) + value * (inputColor2[1]);
+	outputValue[2] = valuem * (inputColor1[2]) + value * (inputColor2[2]);
 	outputValue[3] = inputColor1[3];
 }
diff --git a/source/blender/compositor/operations/COM_MixBlendOperation.h b/source/blender/compositor/operations/COM_MixBlendOperation.h
index da3342c0e4a..b906134f5cb 100644
--- a/source/blender/compositor/operations/COM_MixBlendOperation.h
+++ b/source/blender/compositor/operations/COM_MixBlendOperation.h
@@ -26,20 +26,20 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class MixBlendOperation : public MixBaseOperation {
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	MixBlendOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_MixBurnOperation.cpp b/source/blender/compositor/operations/COM_MixBurnOperation.cpp
index 7cad107c5e9..e94834148e8 100644
--- a/source/blender/compositor/operations/COM_MixBurnOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixBurnOperation.cpp
@@ -22,8 +22,9 @@
 
 #include "COM_MixBurnOperation.h"
 
-MixBurnOperation::MixBurnOperation(): MixBaseOperation()
+MixBurnOperation::MixBurnOperation() : MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixBurnOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -42,7 +43,7 @@ void MixBurnOperation::executePixel(float *outputValue, float x, float y, PixelS
 	}
 	float valuem = 1.0f - value;
 	
-	tmp = valuem + value*inputColor2[0];
+	tmp = valuem + value * inputColor2[0];
 	if (tmp <= 0.0f)
 		outputValue[0] = 0.0f;
 	else {
@@ -55,7 +56,7 @@ void MixBurnOperation::executePixel(float *outputValue, float x, float y, PixelS
 			outputValue[0] = tmp;
 	}
 	
-	tmp = valuem + value*inputColor2[1];
+	tmp = valuem + value * inputColor2[1];
 	if (tmp <= 0.0f)
 		outputValue[1] = 0.0f;
 	else {
@@ -68,7 +69,7 @@ void MixBurnOperation::executePixel(float *outputValue, float x, float y, PixelS
 			outputValue[1] = tmp;
 	}
 	
-	tmp = valuem + value*inputColor2[2];
+	tmp = valuem + value * inputColor2[2];
 	if (tmp <= 0.0f)
 		outputValue[2] = 0.0f;
 	else {
diff --git a/source/blender/compositor/operations/COM_MixBurnOperation.h b/source/blender/compositor/operations/COM_MixBurnOperation.h
index ff7de119605..af09772edde 100644
--- a/source/blender/compositor/operations/COM_MixBurnOperation.h
+++ b/source/blender/compositor/operations/COM_MixBurnOperation.h
@@ -26,20 +26,20 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class MixBurnOperation : public MixBaseOperation {
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	MixBurnOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_MixColorOperation.cpp b/source/blender/compositor/operations/COM_MixColorOperation.cpp
index e14b10b305e..f3e893bc18f 100644
--- a/source/blender/compositor/operations/COM_MixColorOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixColorOperation.cpp
@@ -26,8 +26,9 @@ extern "C" {
 	#include "BLI_math.h"
 }
 
-MixColorOperation::MixColorOperation(): MixBaseOperation()
+MixColorOperation::MixColorOperation() : MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixColorOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -45,16 +46,16 @@ void MixColorOperation::executePixel(float *outputValue, float x, float y, Pixel
 	}
 	float valuem = 1.0f - value;
 	
-	float colH,colS,colV;
+	float colH, colS, colV;
 	rgb_to_hsv(inputColor2[0], inputColor2[1], inputColor2[2], &colH, &colS, &colV);
-	if (colS!=0.0f) {
-		float rH,rS,rV;
-		float tmpr,tmpg,tmpb;
+	if (colS != 0.0f) {
+		float rH, rS, rV;
+		float tmpr, tmpg, tmpb;
 		rgb_to_hsv(inputColor1[0], inputColor1[1], inputColor1[2], &rH, &rS, &rV);
-		hsv_to_rgb(colH , colS, rV, &tmpr, &tmpg, &tmpb);
-		outputValue[0] = valuem*(inputColor1[0]) + value*tmpr;
-		outputValue[1] = valuem*(inputColor1[1]) + value*tmpg;
-		outputValue[2] = valuem*(inputColor1[2]) + value*tmpb;
+		hsv_to_rgb(colH, colS, rV, &tmpr, &tmpg, &tmpb);
+		outputValue[0] = valuem * (inputColor1[0]) + value * tmpr;
+		outputValue[1] = valuem * (inputColor1[1]) + value * tmpg;
+		outputValue[2] = valuem * (inputColor1[2]) + value * tmpb;
 	}
 	outputValue[3] = inputColor1[3];
 }
diff --git a/source/blender/compositor/operations/COM_MixColorOperation.h b/source/blender/compositor/operations/COM_MixColorOperation.h
index 1a98e847ccd..9b0d93f934d 100644
--- a/source/blender/compositor/operations/COM_MixColorOperation.h
+++ b/source/blender/compositor/operations/COM_MixColorOperation.h
@@ -26,20 +26,20 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class MixColorOperation : public MixBaseOperation {
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	MixColorOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_MixDarkenOperation.cpp b/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
index 666db9d8f32..a36c663ddda 100644
--- a/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
@@ -22,8 +22,9 @@
 
 #include "COM_MixDarkenOperation.h"
 
-MixDarkenOperation::MixDarkenOperation(): MixBaseOperation()
+MixDarkenOperation::MixDarkenOperation() : MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixDarkenOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -41,13 +42,13 @@ void MixDarkenOperation::executePixel(float *outputValue, float x, float y, Pixe
 	}
 	float valuem = 1.0f - value;
 	float tmp;
-	tmp=inputColor2[0]+((1.0f-inputColor2[0])*valuem);
+	tmp = inputColor2[0] + ((1.0f - inputColor2[0]) * valuem);
 	if (tmp < inputColor1[0]) outputValue[0] = tmp;
 	else outputValue[0] = inputColor1[0];
-	tmp=inputColor2[1]+((1.0f-inputColor2[1])*valuem);
+	tmp = inputColor2[1] + ((1.0f - inputColor2[1]) * valuem);
 	if (tmp < inputColor1[1]) outputValue[1] = tmp;
 	else outputValue[1] = inputColor1[1];
-	tmp=inputColor2[2]+((1.0f-inputColor2[2])*valuem);
+	tmp = inputColor2[2] + ((1.0f - inputColor2[2]) * valuem);
 	if (tmp < inputColor1[2]) outputValue[2] = tmp;
 	else outputValue[2] = inputColor1[2];
 	
diff --git a/source/blender/compositor/operations/COM_MixDarkenOperation.h b/source/blender/compositor/operations/COM_MixDarkenOperation.h
index b1792d4930e..69fb4450458 100644
--- a/source/blender/compositor/operations/COM_MixDarkenOperation.h
+++ b/source/blender/compositor/operations/COM_MixDarkenOperation.h
@@ -26,20 +26,20 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class MixDarkenOperation : public MixBaseOperation {
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	MixDarkenOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp b/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
index 497bb9c2bb5..69886753480 100644
--- a/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
@@ -23,8 +23,9 @@
 #include "COM_MixDifferenceOperation.h"
 #include "BLI_math.h"
 
-MixDifferenceOperation::MixDifferenceOperation(): MixBaseOperation()
+MixDifferenceOperation::MixDifferenceOperation() : MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixDifferenceOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -41,9 +42,9 @@ void MixDifferenceOperation::executePixel(float *outputValue, float x, float y,
 		value *= inputColor2[3];
 	}
 	float valuem = 1.0f - value;
-	outputValue[0] = valuem*inputColor1[0] + value*fabsf(inputColor1[0]-inputColor2[0]);
-	outputValue[1] = valuem*inputColor1[1] + value*fabsf(inputColor1[1]-inputColor2[1]);
-	outputValue[2] = valuem*inputColor1[2] + value*fabsf(inputColor1[2]-inputColor2[2]);
+	outputValue[0] = valuem * inputColor1[0] + value *fabsf(inputColor1[0] - inputColor2[0]);
+	outputValue[1] = valuem * inputColor1[1] + value *fabsf(inputColor1[1] - inputColor2[1]);
+	outputValue[2] = valuem * inputColor1[2] + value *fabsf(inputColor1[2] - inputColor2[2]);
 	outputValue[3] = inputColor1[3];
 }
 
diff --git a/source/blender/compositor/operations/COM_MixDifferenceOperation.h b/source/blender/compositor/operations/COM_MixDifferenceOperation.h
index 554d7b2f1fe..c71b22214cc 100644
--- a/source/blender/compositor/operations/COM_MixDifferenceOperation.h
+++ b/source/blender/compositor/operations/COM_MixDifferenceOperation.h
@@ -26,20 +26,20 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class MixDifferenceOperation : public MixBaseOperation {
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	MixDifferenceOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_MixDivideOperation.cpp b/source/blender/compositor/operations/COM_MixDivideOperation.cpp
index c522fcf225a..8b6586c5336 100644
--- a/source/blender/compositor/operations/COM_MixDivideOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixDivideOperation.cpp
@@ -22,8 +22,9 @@
 
 #include "COM_MixDivideOperation.h"
 
-MixDivideOperation::MixDivideOperation(): MixBaseOperation()
+MixDivideOperation::MixDivideOperation() : MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixDivideOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -42,15 +43,15 @@ void MixDivideOperation::executePixel(float *outputValue, float x, float y, Pixe
 	float valuem = 1.0f - value;
 	
 	if (inputColor2[0] != 0.0f)
-		outputValue[0] = valuem*(inputColor1[0]) + value*(inputColor1[0])/inputColor2[0];
+		outputValue[0] = valuem * (inputColor1[0]) + value * (inputColor1[0]) / inputColor2[0];
 	else
 		outputValue[0] = 0.0f;
 	if (inputColor2[1] != 0.0f)
-		outputValue[1] = valuem*(inputColor1[1]) + value*(inputColor1[1])/inputColor2[1];
+		outputValue[1] = valuem * (inputColor1[1]) + value * (inputColor1[1]) / inputColor2[1];
 	else
 		outputValue[1] = 0.0f;
 	if (inputColor2[2] != 0.0f)
-		outputValue[2] = valuem*(inputColor1[2]) + value*(inputColor1[2])/inputColor2[2];
+		outputValue[2] = valuem * (inputColor1[2]) + value * (inputColor1[2]) / inputColor2[2];
 	else
 		outputValue[2] = 0.0f;
 	
diff --git a/source/blender/compositor/operations/COM_MixDivideOperation.h b/source/blender/compositor/operations/COM_MixDivideOperation.h
index e9c4cf81cd3..375e7129e8b 100644
--- a/source/blender/compositor/operations/COM_MixDivideOperation.h
+++ b/source/blender/compositor/operations/COM_MixDivideOperation.h
@@ -26,20 +26,20 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class MixDivideOperation : public MixBaseOperation {
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	MixDivideOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_MixDodgeOperation.cpp b/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
index 10c04ba376b..971ddd5b736 100644
--- a/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
@@ -22,8 +22,9 @@
 
 #include "COM_MixDodgeOperation.h"
 
-MixDodgeOperation::MixDodgeOperation(): MixBaseOperation()
+MixDodgeOperation::MixDodgeOperation() : MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixDodgeOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -42,7 +43,7 @@ void MixDodgeOperation::executePixel(float *outputValue, float x, float y, Pixel
 	}
 	
 	if (inputColor1[0] != 0.0f) {
-		tmp = 1.0f - value*inputColor2[0];
+		tmp = 1.0f - value * inputColor2[0];
 		if (tmp <= 0.0f)
 			outputValue[0] = 1.0f;
 		else {
@@ -57,7 +58,7 @@ void MixDodgeOperation::executePixel(float *outputValue, float x, float y, Pixel
 		outputValue[0] = 0.0f;
 	
 	if (inputColor1[1] != 0.0f) {
-		tmp = 1.0f - value*inputColor2[1];
+		tmp = 1.0f - value * inputColor2[1];
 		if (tmp <= 0.0f)
 			outputValue[1] = 1.0f;
 		else {
@@ -72,7 +73,7 @@ void MixDodgeOperation::executePixel(float *outputValue, float x, float y, Pixel
 		outputValue[1] = 0.0f;
 	
 	if (inputColor1[2] != 0.0f) {
-		tmp = 1.0f - value*inputColor2[2];
+		tmp = 1.0f - value * inputColor2[2];
 		if (tmp <= 0.0f)
 			outputValue[2] = 1.0f;
 		else {
diff --git a/source/blender/compositor/operations/COM_MixDodgeOperation.h b/source/blender/compositor/operations/COM_MixDodgeOperation.h
index 6baa73e8f6f..a4adf6fde47 100644
--- a/source/blender/compositor/operations/COM_MixDodgeOperation.h
+++ b/source/blender/compositor/operations/COM_MixDodgeOperation.h
@@ -26,20 +26,20 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class MixDodgeOperation : public MixBaseOperation {
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	MixDodgeOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_MixGlareOperation.cpp b/source/blender/compositor/operations/COM_MixGlareOperation.cpp
new file mode 100644
index 00000000000..bfb0efe692f
--- /dev/null
+++ b/source/blender/compositor/operations/COM_MixGlareOperation.cpp
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2011, Glareer Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor: 
+ *		Jeroen Bakker 
+ *		Monique Dewanchand
+ */
+
+#include "COM_MixGlareOperation.h"
+
+MixGlareOperation::MixGlareOperation() : MixBaseOperation()
+{
+	/* pass */
+}
+
+void MixGlareOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
+{
+	float inputColor1[4];
+	float inputColor2[4];
+	float inputValue[4];
+	float value;
+	
+	inputValueOperation->read(inputValue, x, y, sampler, inputBuffers);
+	inputColor1Operation->read(inputColor1, x, y, sampler, inputBuffers);
+	inputColor2Operation->read(inputColor2, x, y, sampler, inputBuffers);
+	value = inputValue[0];
+	float mf = 2.f - 2.f * fabsf(value - 0.5f);
+	
+	outputValue[0] = mf * ((inputColor1[0]) + value * (inputColor2[0] - inputColor1[0]));
+	outputValue[1] = mf * ((inputColor1[1]) + value * (inputColor2[1] - inputColor1[1]));
+	outputValue[2] = mf * ((inputColor1[2]) + value * (inputColor2[2] - inputColor1[2]));
+	outputValue[3] = inputColor1[3];
+}
diff --git a/source/blender/compositor/operations/COM_FogGlowImageOperation.h b/source/blender/compositor/operations/COM_MixGlareOperation.h
index d0fc107638e..1a025eb3edd 100644
--- a/source/blender/compositor/operations/COM_FogGlowImageOperation.h
+++ b/source/blender/compositor/operations/COM_MixGlareOperation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Blender Foundation.
+ * Copyright 2011, Glareer Foundation.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -20,20 +20,26 @@
  *		Monique Dewanchand
  */
 
-#ifndef _COM_FogGlowOperation_h
-#define _COM_FogGlowOperation_h
-#include "COM_NodeOperation.h"
-#include "DNA_lamp_types.h"
+#ifndef _COM_MixGlareOperation_h
+#define _COM_MixGlareOperation_h
+#include "COM_MixBaseOperation.h"
 
-class FogGlowImageOperation : public NodeOperation {
+
+/**
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
+class MixGlareOperation : public MixBaseOperation {
 public:
-	FogGlowImageOperation();
-	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * Default constructor
+	 */
+	MixGlareOperation();
 	
-	void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
+	/**
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
+
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_MixHueOperation.cpp b/source/blender/compositor/operations/COM_MixHueOperation.cpp
index de376f3500c..05d02805ebc 100644
--- a/source/blender/compositor/operations/COM_MixHueOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixHueOperation.cpp
@@ -26,8 +26,9 @@ extern "C" {
 	#include "BLI_math.h"
 }
 
-MixHueOperation::MixHueOperation(): MixBaseOperation()
+MixHueOperation::MixHueOperation() : MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixHueOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -45,16 +46,16 @@ void MixHueOperation::executePixel(float *outputValue, float x, float y, PixelSa
 	}
 	float valuem = 1.0f - value;
 	
-	float colH,colS,colV;
+	float colH, colS, colV;
 	rgb_to_hsv(inputColor2[0], inputColor2[1], inputColor2[2], &colH, &colS, &colV);
-	if (colS!=0.0f) {
-		float rH,rS,rV;
-		float tmpr,tmpg,tmpb;
+	if (colS != 0.0f) {
+		float rH, rS, rV;
+		float tmpr, tmpg, tmpb;
 		rgb_to_hsv(inputColor1[0], inputColor1[1], inputColor1[2], &rH, &rS, &rV);
-		hsv_to_rgb(colH , rS, rV, &tmpr, &tmpg, &tmpb);
-		outputValue[0] = valuem*(inputColor1[0]) + value*tmpr;
-		outputValue[1] = valuem*(inputColor1[1]) + value*tmpg;
-		outputValue[2] = valuem*(inputColor1[2]) + value*tmpb;
+		hsv_to_rgb(colH, rS, rV, &tmpr, &tmpg, &tmpb);
+		outputValue[0] = valuem * (inputColor1[0]) + value * tmpr;
+		outputValue[1] = valuem * (inputColor1[1]) + value * tmpg;
+		outputValue[2] = valuem * (inputColor1[2]) + value * tmpb;
 	}
 	outputValue[3] = inputColor1[3];
 }
diff --git a/source/blender/compositor/operations/COM_MixHueOperation.h b/source/blender/compositor/operations/COM_MixHueOperation.h
index d3d1717f448..56310e253c0 100644
--- a/source/blender/compositor/operations/COM_MixHueOperation.h
+++ b/source/blender/compositor/operations/COM_MixHueOperation.h
@@ -26,20 +26,20 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class MixHueOperation : public MixBaseOperation {
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	MixHueOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_MixLightenOperation.cpp b/source/blender/compositor/operations/COM_MixLightenOperation.cpp
index bc3e5090bd8..6e1af7a3c44 100644
--- a/source/blender/compositor/operations/COM_MixLightenOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixLightenOperation.cpp
@@ -22,8 +22,9 @@
 
 #include "COM_MixLightenOperation.h"
 
-MixLightenOperation::MixLightenOperation(): MixBaseOperation()
+MixLightenOperation::MixLightenOperation() : MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixLightenOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -40,13 +41,13 @@ void MixLightenOperation::executePixel(float *outputValue, float x, float y, Pix
 		value *= inputColor2[3];
 	}
 	float tmp;
-	tmp=value * inputColor2[0];
+	tmp = value * inputColor2[0];
 	if (tmp > inputColor1[0]) outputValue[0] = tmp;
 	else outputValue[0] = inputColor1[0];
-	tmp=value * inputColor2[1];
+	tmp = value * inputColor2[1];
 	if (tmp > inputColor1[1]) outputValue[1] = tmp;
 	else outputValue[1] = inputColor1[1];
-	tmp=value * inputColor2[2];
+	tmp = value * inputColor2[2];
 	if (tmp > inputColor1[2]) outputValue[2] = tmp;
 	else outputValue[2] = inputColor1[2];
 	outputValue[3] = inputColor1[3];
diff --git a/source/blender/compositor/operations/COM_MixLightenOperation.h b/source/blender/compositor/operations/COM_MixLightenOperation.h
index 73ac3e6e165..bb251a44653 100644
--- a/source/blender/compositor/operations/COM_MixLightenOperation.h
+++ b/source/blender/compositor/operations/COM_MixLightenOperation.h
@@ -26,19 +26,19 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class MixLightenOperation : public MixBaseOperation {
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	MixLightenOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp b/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
index b68064f0e47..bf1c181b566 100644
--- a/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
@@ -22,8 +22,9 @@
 
 #include "COM_MixLinearLightOperation.h"
 
-MixLinearLightOperation::MixLinearLightOperation(): MixBaseOperation()
+MixLinearLightOperation::MixLinearLightOperation() : MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixLinearLightOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -40,17 +41,17 @@ void MixLinearLightOperation::executePixel(float *outputValue, float x, float y,
 		value *= inputColor2[3];
 	}
 	if (inputColor2[0] > 0.5f)
-			outputValue[0] = inputColor1[0] + value*(2.0f*(inputColor2[0]-0.5f));
+		outputValue[0] = inputColor1[0] + value * (2.0f * (inputColor2[0] - 0.5f));
 	else
-			outputValue[0] = inputColor1[0] + value*(2.0f*(inputColor2[0]) - 1.0f);
+		outputValue[0] = inputColor1[0] + value * (2.0f * (inputColor2[0]) - 1.0f);
 	if (inputColor2[1] > 0.5f)
-			outputValue[1] = inputColor1[1] + value*(2.0f*(inputColor2[1]-0.5f));
+		outputValue[1] = inputColor1[1] + value * (2.0f * (inputColor2[1] - 0.5f));
 	else
-			outputValue[1] = inputColor1[1] + value*(2.0f*(inputColor2[1]) - 1.0f);
+		outputValue[1] = inputColor1[1] + value * (2.0f * (inputColor2[1]) - 1.0f);
 	if (inputColor2[2] > 0.5f)
-			outputValue[2] = inputColor1[2] + value*(2.0f*(inputColor2[2]-0.5f));
+		outputValue[2] = inputColor1[2] + value * (2.0f * (inputColor2[2] - 0.5f));
 	else
-			outputValue[2] = inputColor1[2] + value*(2.0f*(inputColor2[2]) - 1.0f);
+		outputValue[2] = inputColor1[2] + value * (2.0f * (inputColor2[2]) - 1.0f);
 	
 	outputValue[3] = inputColor1[3];
 }
diff --git a/source/blender/compositor/operations/COM_MixLinearLightOperation.h b/source/blender/compositor/operations/COM_MixLinearLightOperation.h
index 7e26b25e5c0..39d5b6495d1 100644
--- a/source/blender/compositor/operations/COM_MixLinearLightOperation.h
+++ b/source/blender/compositor/operations/COM_MixLinearLightOperation.h
@@ -26,20 +26,20 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class MixLinearLightOperation : public MixBaseOperation {
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	MixLinearLightOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp b/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
index fdf8c1ca51b..62018ed5698 100644
--- a/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
@@ -22,8 +22,9 @@
 
 #include "COM_MixMultiplyOperation.h"
 
-MixMultiplyOperation::MixMultiplyOperation(): MixBaseOperation()
+MixMultiplyOperation::MixMultiplyOperation() : MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixMultiplyOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -41,9 +42,9 @@ void MixMultiplyOperation::executePixel(float *outputValue, float x, float y, Pi
 		value *= inputColor2[3];
 	}
 	float valuem = 1.0f - value;
-	outputValue[0] = inputColor1[0] *(valuem+value*inputColor2[0]);
-	outputValue[1] = inputColor1[1] *(valuem+value*inputColor2[1]);
-	outputValue[2] = inputColor1[2] *(valuem+value*inputColor2[2]);
+	outputValue[0] = inputColor1[0] * (valuem + value * inputColor2[0]);
+	outputValue[1] = inputColor1[1] * (valuem + value * inputColor2[1]);
+	outputValue[2] = inputColor1[2] * (valuem + value * inputColor2[2]);
 	outputValue[3] = inputColor1[3];
 }
 
diff --git a/source/blender/compositor/operations/COM_MixMultiplyOperation.h b/source/blender/compositor/operations/COM_MixMultiplyOperation.h
index 5d4468e7271..2c12854bfa6 100644
--- a/source/blender/compositor/operations/COM_MixMultiplyOperation.h
+++ b/source/blender/compositor/operations/COM_MixMultiplyOperation.h
@@ -26,20 +26,20 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class MixMultiplyOperation : public MixBaseOperation {
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	MixMultiplyOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_MixOverlayOperation.cpp b/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
index 0025daeb3f5..a269045c598 100644
--- a/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
@@ -22,8 +22,9 @@
 
 #include "COM_MixOverlayOperation.h"
 
-MixOverlayOperation::MixOverlayOperation(): MixBaseOperation()
+MixOverlayOperation::MixOverlayOperation() : MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixOverlayOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -43,22 +44,22 @@ void MixOverlayOperation::executePixel(float *outputValue, float x, float y, Pix
 	float valuem = 1.0f - value;
 	
 	if (inputColor1[0] < 0.5f) {
-			outputValue[0] = inputColor1[0] * (valuem + 2.0f*value*inputColor2[0]);
+		outputValue[0] = inputColor1[0] * (valuem + 2.0f * value * inputColor2[0]);
 	}
 	else {
-			outputValue[0] = 1.0f - (valuem + 2.0f*value*(1.0f - inputColor2[0])) * (1.0f - inputColor1[0]);
+		outputValue[0] = 1.0f - (valuem + 2.0f * value * (1.0f - inputColor2[0])) * (1.0f - inputColor1[0]);
 	}
 	if (inputColor1[1] < 0.5f) {
-			outputValue[1] = inputColor1[1] * (valuem + 2.0f*value*inputColor2[1]);
+		outputValue[1] = inputColor1[1] * (valuem + 2.0f * value * inputColor2[1]);
 	}
 	else {
-			outputValue[1] = 1.0f - (valuem + 2.0f*value*(1.0f - inputColor2[1])) * (1.0f - inputColor1[1]);
+		outputValue[1] = 1.0f - (valuem + 2.0f * value * (1.0f - inputColor2[1])) * (1.0f - inputColor1[1]);
 	}
 	if (inputColor1[2] < 0.5f) {
-			outputValue[2] = inputColor1[2] * (valuem + 2.0f*value*inputColor2[2]);
+		outputValue[2] = inputColor1[2] * (valuem + 2.0f * value * inputColor2[2]);
 	}
 	else {
-			outputValue[2] = 1.0f - (valuem + 2.0f*value*(1.0f - inputColor2[2])) * (1.0f - inputColor1[2]);
+		outputValue[2] = 1.0f - (valuem + 2.0f * value * (1.0f - inputColor2[2])) * (1.0f - inputColor1[2]);
 	}
 	outputValue[3] = inputColor1[3];
 }
diff --git a/source/blender/compositor/operations/COM_MixOverlayOperation.h b/source/blender/compositor/operations/COM_MixOverlayOperation.h
index dd1d16a53d3..48d1d10a697 100644
--- a/source/blender/compositor/operations/COM_MixOverlayOperation.h
+++ b/source/blender/compositor/operations/COM_MixOverlayOperation.h
@@ -26,20 +26,20 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class MixOverlayOperation : public MixBaseOperation {
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	MixOverlayOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_MixSaturationOperation.cpp b/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
index f6f6ec73c6e..863a17a7f80 100644
--- a/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
@@ -26,8 +26,9 @@ extern "C" {
 	#include "BLI_math.h"
 }
 
-MixSaturationOperation::MixSaturationOperation(): MixBaseOperation()
+MixSaturationOperation::MixSaturationOperation() : MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixSaturationOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -45,12 +46,12 @@ void MixSaturationOperation::executePixel(float *outputValue, float x, float y,
 	}
 	float valuem = 1.0f - value;
 	
-	float rH,rS,rV;
+	float rH, rS, rV;
 	rgb_to_hsv(inputColor1[0], inputColor1[1], inputColor1[2], &rH, &rS, &rV);
-	if (rS!=0.0f) {
-		float colH,colS,colV;
+	if (rS != 0.0f) {
+		float colH, colS, colV;
 		rgb_to_hsv(inputColor2[0], inputColor2[1], inputColor2[2], &colH, &colS, &colV);
-		hsv_to_rgb(rH , (valuem*rS+value*colS), rV, &outputValue[0], &outputValue[1], &outputValue[2]);
+		hsv_to_rgb(rH, (valuem * rS + value * colS), rV, &outputValue[0], &outputValue[1], &outputValue[2]);
 	}
 	outputValue[3] = inputColor1[3];
 }
diff --git a/source/blender/compositor/operations/COM_MixSaturationOperation.h b/source/blender/compositor/operations/COM_MixSaturationOperation.h
index 7e746c02e09..ccb95e2f00f 100644
--- a/source/blender/compositor/operations/COM_MixSaturationOperation.h
+++ b/source/blender/compositor/operations/COM_MixSaturationOperation.h
@@ -26,20 +26,20 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class MixSaturationOperation : public MixBaseOperation {
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	MixSaturationOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_MixScreenOperation.cpp b/source/blender/compositor/operations/COM_MixScreenOperation.cpp
index a1a98bd82a2..6fb7befeba4 100644
--- a/source/blender/compositor/operations/COM_MixScreenOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixScreenOperation.cpp
@@ -22,8 +22,9 @@
 
 #include "COM_MixScreenOperation.h"
 
-MixScreenOperation::MixScreenOperation(): MixBaseOperation()
+MixScreenOperation::MixScreenOperation() : MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixScreenOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -42,9 +43,9 @@ void MixScreenOperation::executePixel(float *outputValue, float x, float y, Pixe
 	}
 	float valuem = 1.0f - value;
 
-	outputValue[0] = 1.0f - (valuem + value*(1.0f-inputColor2[0])) *(1.0f-inputColor1[0]);
-	outputValue[1] = 1.0f - (valuem + value*(1.0f-inputColor2[1])) *(1.0f-inputColor1[1]);
-	outputValue[2] = 1.0f - (valuem + value*(1.0f-inputColor2[2])) *(1.0f-inputColor1[2]);
+	outputValue[0] = 1.0f - (valuem + value * (1.0f - inputColor2[0])) * (1.0f - inputColor1[0]);
+	outputValue[1] = 1.0f - (valuem + value * (1.0f - inputColor2[1])) * (1.0f - inputColor1[1]);
+	outputValue[2] = 1.0f - (valuem + value * (1.0f - inputColor2[2])) * (1.0f - inputColor1[2]);
 	outputValue[3] = inputColor1[3];
 }
 
diff --git a/source/blender/compositor/operations/COM_MixScreenOperation.h b/source/blender/compositor/operations/COM_MixScreenOperation.h
index 6522907f295..6b9fa302325 100644
--- a/source/blender/compositor/operations/COM_MixScreenOperation.h
+++ b/source/blender/compositor/operations/COM_MixScreenOperation.h
@@ -26,19 +26,19 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class MixScreenOperation : public MixBaseOperation {
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	MixScreenOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp b/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
index ea6a3ddd498..9f7d0823473 100644
--- a/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
@@ -22,12 +22,13 @@
 
 #include "COM_MixSoftLightOperation.h"
 
-MixSoftLightOperation::MixSoftLightOperation(): MixBaseOperation()
+MixSoftLightOperation::MixSoftLightOperation() : MixBaseOperation()
 {
+	/* pass */
 }
 
-void MixSoftLightOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])\
-{
+void MixSoftLightOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) \
+	{
 	float inputColor1[4];
 	float inputColor2[4];
 	float value;
@@ -47,9 +48,9 @@ void MixSoftLightOperation::executePixel(float *outputValue, float x, float y, P
 	scg = 1.0f - (1.0f - inputColor2[1]) * (1.0f - inputColor1[1]);
 	scb = 1.0f - (1.0f - inputColor2[2]) * (1.0f - inputColor1[2]);
 	
-	outputValue[0] = valuem*(inputColor1[0]) + value*(((1.0f - inputColor1[0]) * inputColor2[0] * (inputColor1[0])) + (inputColor1[0] * scr));
-	outputValue[1] = valuem*(inputColor1[1]) + value*(((1.0f - inputColor1[1]) * inputColor2[1] * (inputColor1[1])) + (inputColor1[1] * scg));
-	outputValue[2] = valuem*(inputColor1[2]) + value*(((1.0f - inputColor1[2]) * inputColor2[2] * (inputColor1[2])) + (inputColor1[2] * scb));
+	outputValue[0] = valuem * (inputColor1[0]) + value * (((1.0f - inputColor1[0]) * inputColor2[0] * (inputColor1[0])) + (inputColor1[0] * scr));
+	outputValue[1] = valuem * (inputColor1[1]) + value * (((1.0f - inputColor1[1]) * inputColor2[1] * (inputColor1[1])) + (inputColor1[1] * scg));
+	outputValue[2] = valuem * (inputColor1[2]) + value * (((1.0f - inputColor1[2]) * inputColor2[2] * (inputColor1[2])) + (inputColor1[2] * scb));
 	outputValue[3] = inputColor1[3];
-}
+	}
 
diff --git a/source/blender/compositor/operations/COM_MixSoftLightOperation.h b/source/blender/compositor/operations/COM_MixSoftLightOperation.h
index fcbd8dab8b8..4189066de2c 100644
--- a/source/blender/compositor/operations/COM_MixSoftLightOperation.h
+++ b/source/blender/compositor/operations/COM_MixSoftLightOperation.h
@@ -26,20 +26,20 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class MixSoftLightOperation : public MixBaseOperation {
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	MixSoftLightOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_MixSubtractOperation.cpp b/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
index 57320dcd611..80086053872 100644
--- a/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
@@ -22,8 +22,9 @@
 
 #include "COM_MixSubtractOperation.h"
 
-MixSubtractOperation::MixSubtractOperation(): MixBaseOperation()
+MixSubtractOperation::MixSubtractOperation() : MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixSubtractOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -39,9 +40,9 @@ void MixSubtractOperation::executePixel(float *outputValue, float x, float y, Pi
 	if (this->useValueAlphaMultiply()) {
 		value *= inputColor2[3];
 	}
-	outputValue[0] = inputColor1[0]-value*(inputColor2[0]);
-	outputValue[1] = inputColor1[1]-value*(inputColor2[1]);
-	outputValue[2] = inputColor1[2]-value*(inputColor2[2]);
+	outputValue[0] = inputColor1[0] - value * (inputColor2[0]);
+	outputValue[1] = inputColor1[1] - value * (inputColor2[1]);
+	outputValue[2] = inputColor1[2] - value * (inputColor2[2]);
 	outputValue[3] = inputColor1[3];
 }
 
diff --git a/source/blender/compositor/operations/COM_MixSubtractOperation.h b/source/blender/compositor/operations/COM_MixSubtractOperation.h
index 441857a8aca..b820fb1e5e1 100644
--- a/source/blender/compositor/operations/COM_MixSubtractOperation.h
+++ b/source/blender/compositor/operations/COM_MixSubtractOperation.h
@@ -26,20 +26,20 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class MixSubtractOperation : public MixBaseOperation {
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	MixSubtractOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_MixValueOperation.cpp b/source/blender/compositor/operations/COM_MixValueOperation.cpp
index 8c43bb6af8c..cd79c54318d 100644
--- a/source/blender/compositor/operations/COM_MixValueOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixValueOperation.cpp
@@ -26,8 +26,9 @@ extern "C" {
 	#include "BLI_math.h"
 }
 
-MixValueOperation::MixValueOperation(): MixBaseOperation()
+MixValueOperation::MixValueOperation() : MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixValueOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -45,10 +46,10 @@ void MixValueOperation::executePixel(float *outputValue, float x, float y, Pixel
 	}
 	float valuem = 1.0f - value;
 	
-	float rH,rS,rV;
-	float colH,colS,colV;
+	float rH, rS, rV;
+	float colH, colS, colV;
 	rgb_to_hsv(inputColor1[0], inputColor1[1], inputColor1[2], &rH, &rS, &rV);
 	rgb_to_hsv(inputColor2[0], inputColor2[1], inputColor2[2], &colH, &colS, &colV);
-	hsv_to_rgb(rH , rS, (valuem*rV+value*colV), &outputValue[0], &outputValue[1], &outputValue[2]);
+	hsv_to_rgb(rH, rS, (valuem * rV + value * colV), &outputValue[0], &outputValue[1], &outputValue[2]);
 	outputValue[3] = inputColor1[3];
 }
diff --git a/source/blender/compositor/operations/COM_MixValueOperation.h b/source/blender/compositor/operations/COM_MixValueOperation.h
index 89461b3ba40..d12a2d2b3d6 100644
--- a/source/blender/compositor/operations/COM_MixValueOperation.h
+++ b/source/blender/compositor/operations/COM_MixValueOperation.h
@@ -26,19 +26,19 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class MixValueOperation : public MixBaseOperation {
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	MixValueOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
index a81288be3f7..662212567de 100644
--- a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
+++ b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
@@ -23,8 +23,9 @@
 #include "COM_MovieClipAttributeOperation.h"
 extern "C" {
 	#include "BKE_tracking.h"
+	#include "BKE_movieclip.h"
 }
-MovieClipAttributeOperation::MovieClipAttributeOperation(): NodeOperation()
+MovieClipAttributeOperation::MovieClipAttributeOperation() : NodeOperation()
 {
 	this->addOutputSocket(COM_DT_VALUE);
 	this->valueSet = false;
@@ -41,21 +42,22 @@ void MovieClipAttributeOperation::executePixel(float *outputValue, float x, floa
 		scale = 1.0f;
 		angle = 0.0f;
 		if (clip) {
-			BKE_tracking_stabilization_data(&clip->tracking, framenumber, getWidth(), getHeight(), loc, &scale, &angle);
+			int clip_framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, framenumber);
+			BKE_tracking_stabilization_data_get(&clip->tracking, clip_framenr, getWidth(), getHeight(), loc, &scale, &angle);
 		}
 		switch (this->attribute) {
-		case MCA_SCALE:
-			this->value = scale;
-			break;
-		case MCA_ANGLE:
-			this->value = angle;
-			break;
-		case MCA_X:
-			this->value = loc[0];
-			break;
-		case MCA_Y:
-			this->value = loc[1];
-			break;
+			case MCA_SCALE:
+				this->value = scale;
+				break;
+			case MCA_ANGLE:
+				this->value = angle;
+				break;
+			case MCA_X:
+				this->value = loc[0];
+				break;
+			case MCA_Y:
+				this->value = loc[1];
+				break;
 		}
 		valueSet = true;
 	}
diff --git a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
index aca2ec2eff7..b6e89fa345c 100644
--- a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
+++ b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
@@ -32,30 +32,30 @@ typedef enum MovieClipAttribute {
 	MCA_ANGLE
 } MovieClipAttribute;
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class MovieClipAttributeOperation : public NodeOperation {
 private:
-	MovieClip * clip;
+	MovieClip *clip;
 	float value;
 	bool valueSet;
 	int framenumber;
 	MovieClipAttribute attribute;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	MovieClipAttributeOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
 
-	void setMovieClip(MovieClip *clip) {this->clip = clip;}
-	void setFramenumber(int framenumber) {this->framenumber = framenumber;}
-	void setAttribute(MovieClipAttribute attribute) {this->attribute = attribute;}
+	void setMovieClip(MovieClip *clip) { this->clip = clip; }
+	void setFramenumber(int framenumber) { this->framenumber = framenumber; }
+	void setAttribute(MovieClipAttribute attribute) { this->attribute = attribute; }
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_MovieClipOperation.cpp b/source/blender/compositor/operations/COM_MovieClipOperation.cpp
index b565e48345c..b8bda12c626 100644
--- a/source/blender/compositor/operations/COM_MovieClipOperation.cpp
+++ b/source/blender/compositor/operations/COM_MovieClipOperation.cpp
@@ -31,7 +31,7 @@ extern "C" {
 }
 #include "BKE_image.h"
 
-MovieClipOperation::MovieClipOperation(): NodeOperation()
+MovieClipOperation::MovieClipOperation() : NodeOperation()
 {
 	this->addOutputSocket(COM_DT_COLOR);
 	this->movieClip = NULL;
@@ -51,9 +51,9 @@ void MovieClipOperation::initExecution()
 		ibuf = BKE_movieclip_get_ibuf(this->movieClip, this->movieClipUser);
 		if (ibuf) {
 			this->movieClipBuffer = ibuf;
-			if (ibuf->rect_float == NULL || ibuf->userflags&IB_RECT_INVALID) {
+			if (ibuf->rect_float == NULL || ibuf->userflags & IB_RECT_INVALID) {
 				IMB_float_from_rect(ibuf);
-				ibuf->userflags&= ~IB_RECT_INVALID;
+				ibuf->userflags &= ~IB_RECT_INVALID;
 			}
 		}
 	}
@@ -70,19 +70,16 @@ void MovieClipOperation::deinitExecution()
 
 void MovieClipOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
 {
-	ImBuf *ibuf;
-
 	resolution[0] = 0;
 	resolution[1] = 0;
 
 	if (this->movieClip) {
-		ibuf = BKE_movieclip_get_ibuf(this->movieClip, this->movieClipUser);
-		if (ibuf) {
-			resolution[0] = ibuf->x;
-			resolution[1] = ibuf->y;
+		int width, height;
 
-			IMB_freeImBuf(ibuf);
-		}
+		BKE_movieclip_get_size(this->movieClip, this->movieClipUser, &width, &height);
+
+		resolution[0] = width;
+		resolution[1] = height;
 	}
 }
 
@@ -96,15 +93,15 @@ void MovieClipOperation::executePixel(float *color, float x, float y, PixelSampl
 	}
 	else {
 		switch (sampler) {
-		case COM_PS_NEAREST:
-			neareast_interpolation_color(this->movieClipBuffer, NULL, color, x, y);
-			break;
-		case COM_PS_BILINEAR:
-			bilinear_interpolation_color(this->movieClipBuffer, NULL, color, x, y);
-			break;
-		case COM_PS_BICUBIC:
-			bicubic_interpolation_color(this->movieClipBuffer, NULL, color, x, y);
-			break;
+			case COM_PS_NEAREST:
+				neareast_interpolation_color(this->movieClipBuffer, NULL, color, x, y);
+				break;
+			case COM_PS_BILINEAR:
+				bilinear_interpolation_color(this->movieClipBuffer, NULL, color, x, y);
+				break;
+			case COM_PS_BICUBIC:
+				bicubic_interpolation_color(this->movieClipBuffer, NULL, color, x, y);
+				break;
 		}
 	}
 }
diff --git a/source/blender/compositor/operations/COM_MovieClipOperation.h b/source/blender/compositor/operations/COM_MovieClipOperation.h
index f52a9973fc5..454c442a167 100644
--- a/source/blender/compositor/operations/COM_MovieClipOperation.h
+++ b/source/blender/compositor/operations/COM_MovieClipOperation.h
@@ -31,10 +31,10 @@
 #include "IMB_imbuf_types.h"
 
 /**
-  * Base class for all renderlayeroperations
-  *
-  * @todo: rename to operation.
-  */
+ * Base class for all renderlayeroperations
+ *
+ * @todo: rename to operation.
+ */
 class MovieClipOperation : public NodeOperation {
 protected:
 	MovieClip *movieClip;
@@ -45,8 +45,8 @@ protected:
 	int framenumber;
 	
 	/**
-	  * Determine the output resolution. The resolution is retrieved from the Renderer
-	  */
+	 * Determine the output resolution. The resolution is retrieved from the Renderer
+	 */
 	void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
 
 public:
@@ -54,11 +54,11 @@ public:
 	
 	void initExecution();
 	void deinitExecution();
-	void setMovieClip(MovieClip *image) {this->movieClip = image;}
-	void setMovieClipUser(MovieClipUser *imageuser) {this->movieClipUser = imageuser;}
-	
-	void setFramenumber(int framenumber) {this->framenumber = framenumber;}
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void setMovieClip(MovieClip *image) { this->movieClip = image; }
+	void setMovieClipUser(MovieClipUser *imageuser) { this->movieClipUser = imageuser; }
+
+	void setFramenumber(int framenumber) { this->framenumber = framenumber; }
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
 
 #endif
diff --git a/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp b/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
index ebea9e8b4a2..5320f901747 100644
--- a/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
+++ b/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
@@ -29,7 +29,7 @@ extern "C" {
 }
 
 
-vector<DistortionCache*> s_cache;
+vector<DistortionCache *> s_cache;
 
 
 MovieDistortionOperation::MovieDistortionOperation(bool distortion) : NodeOperation()
@@ -52,8 +52,8 @@ void MovieDistortionOperation::initExecution()
 		BKE_movieclip_user_set_frame(&clipUser, this->framenumber);
 		BKE_movieclip_get_size(this->movieClip, &clipUser, &calibration_width, &calibration_height);
 
-		for (int i = 0 ; i < s_cache.size() ; i ++) {
-			DistortionCache *c = (DistortionCache*)s_cache[i];
+		for (unsigned int i = 0; i < s_cache.size(); i++) {
+			DistortionCache *c = (DistortionCache *)s_cache[i];
 			if (c->isCacheFor(this->movieClip, this->width, this->height,
 			                  calibration_width, calibration_height, this->distortion))
 			{
@@ -78,7 +78,7 @@ void MovieDistortionOperation::deinitExecution()
 }
 
 
-void MovieDistortionOperation::executePixel(float *color,float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
+void MovieDistortionOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
 {
 	
 	if (this->cache != NULL) {
diff --git a/source/blender/compositor/operations/COM_MovieDistortionOperation.h b/source/blender/compositor/operations/COM_MovieDistortionOperation.h
index f583493340b..c2ce04a78e1 100644
--- a/source/blender/compositor/operations/COM_MovieDistortionOperation.h
+++ b/source/blender/compositor/operations/COM_MovieDistortionOperation.h
@@ -57,38 +57,39 @@ public:
 		this->calibration_width = calibration_width;
 		this->calibration_height = calibration_height;
 		this->inverted = inverted;
-		this->bufferCalculated = new int[this->width*this->height];
-		this->buffer = new float[this->width*this->height*2];
-		for (int i = 0 ; i < this->width*this->height ; i ++) {
+		this->bufferCalculated = new int[this->width * this->height];
+		this->buffer = new float[this->width * this->height * 2];
+		for (int i = 0; i < this->width * this->height; i++) {
 			this->bufferCalculated[i] = 0;
 		}
 	}
 	bool isCacheFor(MovieClip *movieclip, int width, int height, int calibration_width, int claibration_height, bool inverted) {
 		return this->k1 == movieclip->tracking.camera.k1 &&
-			this->k2 == movieclip->tracking.camera.k2 &&
-			this->k3 == movieclip->tracking.camera.k3 &&
-			this->principal_x == movieclip->tracking.camera.principal[0] &&
-			this->principal_y == movieclip->tracking.camera.principal[1] &&
-			this->pixel_aspect == movieclip->tracking.camera.pixel_aspect &&
-			this->inverted == inverted &&
-			this->width == width &&
-			this->height == height &&
-			this->calibration_width == calibration_width &&
-			this->calibration_height == calibration_height;
+		       this->k2 == movieclip->tracking.camera.k2 &&
+		       this->k3 == movieclip->tracking.camera.k3 &&
+		       this->principal_x == movieclip->tracking.camera.principal[0] &&
+		       this->principal_y == movieclip->tracking.camera.principal[1] &&
+		       this->pixel_aspect == movieclip->tracking.camera.pixel_aspect &&
+		       this->inverted == inverted &&
+		       this->width == width &&
+		       this->height == height &&
+		       this->calibration_width == calibration_width &&
+		       this->calibration_height == calibration_height;
 	}
 	
-	void getUV(MovieTracking *trackingData, int x, int y, float *u, float*v) {
-		if (x<0 || x >= this->width || y <0 || y >= this->height) {
+	void getUV(MovieTracking *trackingData, int x, int y, float *u, float *v) {
+		if (x < 0 || x >= this->width || y < 0 || y >= this->height) {
 			*u = x;
 			*v = y;
-		} else {
-
+		}
+		else {
 			int offset = y * this->width + x;
-			int offset2 = offset*2;
+			int offset2 = offset * 2;
+
 			if (!bufferCalculated[offset]) {
 				//float overscan = 0.0f;
-				float w = (float)this->width/* / (1 + overscan) */;
-				float h = (float)this->height/* / (1 + overscan) */;
+				float w = (float)this->width /* / (1 + overscan) */;
+				float h = (float)this->height /* / (1 + overscan) */;
 				float aspx = (float)w / this->calibration_width;
 				float aspy = (float)h / this->calibration_height;
 				float in[2];
@@ -98,27 +99,28 @@ public:
 				in[1] = (y /* - 0.5 * overscan * h */) / aspy / this->pixel_aspect;
 
 				if (inverted) {
-					BKE_tracking_invert_intrinsics(trackingData, in, out);
-				} else {
-					BKE_tracking_apply_intrinsics(trackingData, in, out);
+					BKE_tracking_undistort_v2(trackingData, in, out);
+				}
+				else {
+					BKE_tracking_distort_v2(trackingData, in, out);
 				}
 
 				buffer[offset2] = out[0] * aspx /* + 0.5 * overscan * w */;
-				buffer[offset2+1] = (out[1] * aspy /* + 0.5 * overscan * h */) * this->pixel_aspect;
+				buffer[offset2 + 1] = (out[1] * aspy /* + 0.5 * overscan * h */) * this->pixel_aspect;
 
 				bufferCalculated[offset] = 1;
 			}
 			*u = buffer[offset2];
-			*v = buffer[offset2+1];
+			*v = buffer[offset2 + 1];
 		}
 	}
 };
 
-class MovieDistortionOperation: public NodeOperation {
+class MovieDistortionOperation : public NodeOperation {
 private:
 	DistortionCache *cache;
 	SocketReader *inputOperation;
-	MovieClip * movieClip;
+	MovieClip *movieClip;
 
 protected:
 	bool distortion;
@@ -127,13 +129,13 @@ protected:
 public:
 	MovieDistortionOperation(bool distortion);
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 	void initExecution();
 	void deinitExecution();
 	
-	void setMovieClip(MovieClip *clip) {this->movieClip = clip;}
-	void setFramenumber(int framenumber) {this->framenumber = framenumber;}
+	void setMovieClip(MovieClip *clip) { this->movieClip = clip; }
+	void setFramenumber(int framenumber) { this->framenumber = framenumber; }
 };
 
 #endif
diff --git a/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp b/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
index f95dd12a81a..1bd21f6e712 100644
--- a/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
+++ b/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
@@ -27,7 +27,7 @@ extern "C" {
 	#include "IMB_imbuf_types.h"
 }
 
-MultilayerBaseOperation::MultilayerBaseOperation(int pass): BaseImageOperation()
+MultilayerBaseOperation::MultilayerBaseOperation(int pass) : BaseImageOperation()
 {
 	this->passId = pass;
 }
@@ -47,7 +47,7 @@ void MultilayerColorOperation::executePixel(float *color, float x, float y, Pixe
 {
 	int yi = y;
 	int xi = x;
-	if (this->imageBuffer == NULL || xi < 0 || yi < 0 || xi >= this->getWidth() || yi >= this->getHeight() ) {
+	if (this->imageBuffer == NULL || xi < 0 || yi < 0 || (unsigned int)xi >= this->getWidth() || (unsigned int)yi >= this->getHeight() ) {
 		color[0] = 0.0f;
 		color[1] = 0.0f;
 		color[2] = 0.0f;
@@ -56,22 +56,22 @@ void MultilayerColorOperation::executePixel(float *color, float x, float y, Pixe
 	else {
 		if (this->numberOfChannels == 4) {
 			switch (sampler) {
-			case COM_PS_NEAREST:
-				neareast_interpolation_color(this->buffer, NULL, color, x, y);
-				break;
-			case COM_PS_BILINEAR:
-				bilinear_interpolation_color(this->buffer, NULL, color, x, y);
-				break;
-			case COM_PS_BICUBIC:
-				bicubic_interpolation_color(this->buffer, NULL, color, x, y);
-				break;
+				case COM_PS_NEAREST:
+					neareast_interpolation_color(this->buffer, NULL, color, x, y);
+					break;
+				case COM_PS_BILINEAR:
+					bilinear_interpolation_color(this->buffer, NULL, color, x, y);
+					break;
+				case COM_PS_BICUBIC:
+					bicubic_interpolation_color(this->buffer, NULL, color, x, y);
+					break;
 			}
 		}
 		else {
-			int offset = (yi*this->getWidth()+xi)*3;
+			int offset = (yi * this->getWidth() + xi) * 3;
 			color[0] = this->imageBuffer[offset];
-			color[1] = this->imageBuffer[offset+1];
-			color[2] = this->imageBuffer[offset+2];
+			color[1] = this->imageBuffer[offset + 1];
+			color[2] = this->imageBuffer[offset + 2];
 		}
 	}
 }
@@ -80,11 +80,11 @@ void MultilayerValueOperation::executePixel(float *color, float x, float y, Pixe
 {
 	int yi = y;
 	int xi = x;
-	if (this->imageBuffer == NULL || xi < 0 || yi < 0 || xi >= this->getWidth() || yi >= this->getHeight() ) {
+	if (this->imageBuffer == NULL || xi < 0 || yi < 0 || (unsigned int)xi >= this->getWidth() || (unsigned int)yi >= this->getHeight() ) {
 		color[0] = 0.0f;
 	}
 	else {
-		float result = this->imageBuffer[yi*this->getWidth()+xi];
+		float result = this->imageBuffer[yi * this->getWidth() + xi];
 		color[0] = result;
 	}
 }
@@ -93,13 +93,13 @@ void MultilayerVectorOperation::executePixel(float *color, float x, float y, Pix
 {
 	int yi = y;
 	int xi = x;
-	if (this->imageBuffer == NULL || xi < 0 || yi < 0 || xi >= this->getWidth() || yi >= this->getHeight() ) {
+	if (this->imageBuffer == NULL || xi < 0 || yi < 0 || (unsigned int)xi >= this->getWidth() || (unsigned int)yi >= this->getHeight() ) {
 		color[0] = 0.0f;
 	}
 	else {
-		int offset = (yi*this->getWidth()+xi)*3;
+		int offset = (yi * this->getWidth() + xi) * 3;
 		color[0] = this->imageBuffer[offset];
-		color[1] = this->imageBuffer[offset+1];
-		color[2] = this->imageBuffer[offset+2];
+		color[1] = this->imageBuffer[offset + 1];
+		color[2] = this->imageBuffer[offset + 2];
 	}
 }
diff --git a/source/blender/compositor/operations/COM_MultilayerImageOperation.h b/source/blender/compositor/operations/COM_MultilayerImageOperation.h
index 809253e532a..c33e65fc55b 100644
--- a/source/blender/compositor/operations/COM_MultilayerImageOperation.h
+++ b/source/blender/compositor/operations/COM_MultilayerImageOperation.h
@@ -27,7 +27,7 @@
 
 #include "COM_ImageOperation.h"
 
-class MultilayerBaseOperation: public BaseImageOperation {
+class MultilayerBaseOperation : public BaseImageOperation {
 private:
 	int passId;
 	RenderLayer *renderlayer;
@@ -35,34 +35,34 @@ protected:
 	ImBuf *getImBuf();
 public:
 	/**
-	  * Constructor
-	  */
+	 * Constructor
+	 */
 	MultilayerBaseOperation(int pass);
-	void setRenderLayer(RenderLayer *renderlayer) {this->renderlayer = renderlayer;}
+	void setRenderLayer(RenderLayer *renderlayer) { this->renderlayer = renderlayer; }
 };
 
-class MultilayerColorOperation: public MultilayerBaseOperation {
+class MultilayerColorOperation : public MultilayerBaseOperation {
 public:
-	MultilayerColorOperation(int pass): MultilayerBaseOperation(pass) {
+	MultilayerColorOperation(int pass) : MultilayerBaseOperation(pass) {
 		this->addOutputSocket(COM_DT_COLOR);
 	}
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
 
-class MultilayerValueOperation: public MultilayerBaseOperation {
+class MultilayerValueOperation : public MultilayerBaseOperation {
 public:
-	MultilayerValueOperation(int pass): MultilayerBaseOperation(pass) {
+	MultilayerValueOperation(int pass) : MultilayerBaseOperation(pass) {
 		this->addOutputSocket(COM_DT_VALUE);
 	}
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
 
-class MultilayerVectorOperation: public MultilayerBaseOperation {
+class MultilayerVectorOperation : public MultilayerBaseOperation {
 public:
-	MultilayerVectorOperation(int pass): MultilayerBaseOperation(pass) {
+	MultilayerVectorOperation(int pass) : MultilayerBaseOperation(pass) {
 		this->addOutputSocket(COM_DT_VECTOR);
 	}
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
 
 #endif
diff --git a/source/blender/compositor/operations/COM_NormalizeOperation.cpp b/source/blender/compositor/operations/COM_NormalizeOperation.cpp
index d144739f845..6d12141a455 100644
--- a/source/blender/compositor/operations/COM_NormalizeOperation.cpp
+++ b/source/blender/compositor/operations/COM_NormalizeOperation.cpp
@@ -21,7 +21,7 @@
 
 #include "COM_NormalizeOperation.h"
 
-NormalizeOperation::NormalizeOperation(): NodeOperation()
+NormalizeOperation::NormalizeOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_VALUE);
 	this->addOutputSocket(COM_DT_VALUE);
@@ -35,7 +35,7 @@ void NormalizeOperation::initExecution()
 	NodeOperation::initMutex();
 }
 
-void NormalizeOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data)
+void NormalizeOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
 {
 	/* using generic two floats struct to store x: min  y: mult */
 	NodeTwoFloats *minmult = (NodeTwoFloats *)data;
@@ -76,10 +76,9 @@ bool NormalizeOperation::determineDependingAreaOfInterest(rcti *input, ReadBuffe
 
 void *NormalizeOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
 {
-	BLI_mutex_lock(getMutex());
-
+	lockMutex();
 	if (this->cachedInstance == NULL) {
-		MemoryBuffer *tile = (MemoryBuffer*)imageReader->initializeTileData(rect, memoryBuffers);
+		MemoryBuffer *tile = (MemoryBuffer *)imageReader->initializeTileData(rect, memoryBuffers);
 		/* using generic two floats struct to store x: min  y: mult */
 		NodeTwoFloats *minmult = new NodeTwoFloats();
 
@@ -87,28 +86,29 @@ void *NormalizeOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBu
 		int p = tile->getWidth() * tile->getHeight();
 		float *bc = buffer;
 
-		float minv = 1.0f+BLENDER_ZMAX;
-		float maxv = -1.0f-BLENDER_ZMAX;
+		float minv = 1.0f + BLENDER_ZMAX;
+		float maxv = -1.0f - BLENDER_ZMAX;
 
 		float value;
 		while (p--) {
-			value=bc[0];
+			value = bc[0];
 			maxv = max(value, maxv);
 			minv = min(value, minv);
-			bc+=4;
+			bc += 4;
 		}
 
 		minmult->x = minv;
 		/* The rare case of flat buffer  would cause a divide by 0 */
-		minmult->y = ((maxv!=minv)? 1.0f/(maxv-minv):0.f);
+		minmult->y = ((maxv != minv) ? 1.0f / (maxv - minv) : 0.f);
 
 		this->cachedInstance = minmult;
 	}
 
-	BLI_mutex_unlock(getMutex());
+	unlockMutex();
 	return this->cachedInstance;
 }
 
 void NormalizeOperation::deinitializeTileData(rcti *rect, MemoryBuffer **memoryBuffers, void *data)
 {
+	/* pass */
 }
diff --git a/source/blender/compositor/operations/COM_NormalizeOperation.h b/source/blender/compositor/operations/COM_NormalizeOperation.h
index 765b8847384..de1c4d67bba 100644
--- a/source/blender/compositor/operations/COM_NormalizeOperation.h
+++ b/source/blender/compositor/operations/COM_NormalizeOperation.h
@@ -25,41 +25,41 @@
 #include "DNA_node_types.h"
 
 /**
-  * @brief base class of normalize, implementing the simple normalize
-  * @ingroup operation
-  */
+ * @brief base class of normalize, implementing the simple normalize
+ * @ingroup operation
+ */
 class NormalizeOperation : public NodeOperation {
 protected:
 	/**
-	  * @brief Cached reference to the reader
-	  */
-	SocketReader * imageReader;
+	 * @brief Cached reference to the reader
+	 */
+	SocketReader *imageReader;
 
 	/**
-	  * @brief temporarily cache of the execution storage
-	  * it stores x->min and y->mult
-	  */
-	NodeTwoFloats * cachedInstance;
+	 * @brief temporarily cache of the execution storage
+	 * it stores x->min and y->mult
+	 */
+	NodeTwoFloats *cachedInstance;
 
 public:
 	NormalizeOperation();
 
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
 
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 
 	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
 	void deinitializeTileData(rcti *rect, MemoryBuffer **memoryBuffers, void *data);
 
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
diff --git a/source/blender/compositor/operations/COM_OpenCLKernels.cl b/source/blender/compositor/operations/COM_OpenCLKernels.cl
index 40932e54bc7..0f8e543de7f 100644
--- a/source/blender/compositor/operations/COM_OpenCLKernels.cl
+++ b/source/blender/compositor/operations/COM_OpenCLKernels.cl
@@ -1,10 +1,114 @@
 /// This file contains all opencl kernels for node-operation implementations 
 
-__kernel void testKernel(__global __write_only image2d_t output)
+// Global SAMPLERS
+const sampler_t SAMPLER_NEAREST      = CLK_NORMALIZED_COORDS_FALSE | CLK_ADDRESS_CLAMP_TO_EDGE | CLK_FILTER_NEAREST;
+
+__constant const int2 zero = {0,0};
+
+// KERNEL --- BOKEH BLUR ---
+__kernel void bokehBlurKernel(__read_only image2d_t boundingBox, __read_only image2d_t inputImage, 
+                              __read_only image2d_t bokehImage, __write_only image2d_t output, 
+                              int2 offsetInput, int2 offsetOutput, int radius, int step, int2 dimension, int2 offset) 
+{
+	int2 coords = {get_global_id(0), get_global_id(1)}; 
+	coords += offset;
+	float tempBoundingBox;
+	float4 color = {0.0f,0.0f,0.0f,0.0f};
+	float4 multiplyer = {0.0f,0.0f,0.0f,0.0f};
+	float4 bokeh;
+	const float radius2 = radius*2.0f;
+	const int2 realCoordinate = coords + offsetOutput;
+
+	tempBoundingBox = read_imagef(boundingBox, SAMPLER_NEAREST, coords).s0;
+
+	if (tempBoundingBox > 0.0f) {
+		const int2 bokehImageDim = get_image_dim(bokehImage);
+		const int2 bokehImageCenter = bokehImageDim/2;
+		const int2 minXY = max(realCoordinate - radius, zero);
+		const int2 maxXY = min(realCoordinate + radius, dimension);
+		int nx, ny;
+		
+		float2 uv;
+		int2 inputXy;
+		
+		for (ny = minXY.y, inputXy.y = ny - offsetInput.y ; ny < maxXY.y ; ny +=step, inputXy.y+=step) {
+			uv.y = ((realCoordinate.y-ny)/radius2)*bokehImageDim.y+bokehImageCenter.y;
+			
+			for (nx = minXY.x, inputXy.x = nx - offsetInput.x; nx < maxXY.x ; nx +=step, inputXy.x+=step) {
+				uv.x = ((realCoordinate.x-nx)/radius2)*bokehImageDim.x+bokehImageCenter.x;
+				bokeh = read_imagef(bokehImage, SAMPLER_NEAREST, uv);
+				color += bokeh * read_imagef(inputImage, SAMPLER_NEAREST, inputXy);
+				multiplyer += bokeh;
+			}
+		}
+		color /= multiplyer;
+		
+	} else {
+		int2 imageCoordinates = realCoordinate - offsetInput;
+		color = read_imagef(inputImage, SAMPLER_NEAREST, imageCoordinates);
+	}
+	
+	write_imagef(output, coords, color);
+}
+
+// KERNEL --- DILATE ---
+__kernel void dilateKernel(__read_only image2d_t inputImage,  __write_only image2d_t output,
+                           int2 offsetInput, int2 offsetOutput, int scope, int distanceSquared, int2 dimension, 
+                           int2 offset)
 {
-	int x = get_global_id(0);
-	int y = get_global_id(1);
-	int2 coords = {x, y}; 
-	float4 color = {0.0f, 1.0f, 0.0f, 1.0f};
+	int2 coords = {get_global_id(0), get_global_id(1)}; 
+	coords += offset;
+	const int2 realCoordinate = coords + offsetOutput;
+
+	const int2 minXY = max(realCoordinate - scope, zero);
+	const int2 maxXY = min(realCoordinate + scope, dimension);
+	
+	float value = 0.0f;
+	int nx, ny;
+	int2 inputXy;
+	
+	for (ny = minXY.y, inputXy.y = ny - offsetInput.y ; ny < maxXY.y ; ny ++, inputXy.y++) {
+		const float deltaY = (realCoordinate.y - ny);
+		for (nx = minXY.x, inputXy.x = nx - offsetInput.x; nx < maxXY.x ; nx ++, inputXy.x++) {
+			const float deltaX = (realCoordinate.x - nx);
+			const float measuredDistance = deltaX*deltaX+deltaY*deltaY;
+			if (measuredDistance <= distanceSquared) {
+				value = max(value, read_imagef(inputImage, SAMPLER_NEAREST, inputXy).s0);
+			}
+		}
+	}
+
+	float4 color = {value,0.0f,0.0f,0.0f};
+	write_imagef(output, coords, color);
+}
+
+// KERNEL --- DILATE ---
+__kernel void erodeKernel(__read_only image2d_t inputImage,  __write_only image2d_t output,
+                           int2 offsetInput, int2 offsetOutput, int scope, int distanceSquared, int2 dimension, 
+                           int2 offset)
+{
+	int2 coords = {get_global_id(0), get_global_id(1)}; 
+	coords += offset;
+	const int2 realCoordinate = coords + offsetOutput;
+
+	const int2 minXY = max(realCoordinate - scope, zero);
+	const int2 maxXY = min(realCoordinate + scope, dimension);
+	
+	float value = 1.0f;
+	int nx, ny;
+	int2 inputXy;
+	
+	for (ny = minXY.y, inputXy.y = ny - offsetInput.y ; ny < maxXY.y ; ny ++, inputXy.y++) {
+		for (nx = minXY.x, inputXy.x = nx - offsetInput.x; nx < maxXY.x ; nx ++, inputXy.x++) {
+			const float deltaX = (realCoordinate.x - nx);
+			const float deltaY = (realCoordinate.y - ny);
+			const float measuredDistance = deltaX*deltaX+deltaY*deltaY;
+			if (measuredDistance <= distanceSquared) {
+				value = min(value, read_imagef(inputImage, SAMPLER_NEAREST, inputXy).s0);
+			}
+		}
+	}
+
+	float4 color = {value,0.0f,0.0f,0.0f};
 	write_imagef(output, coords, color);
 }
diff --git a/source/blender/compositor/operations/COM_OpenCLKernels.cl.cpp b/source/blender/compositor/operations/COM_OpenCLKernels.cl.cpp
deleted file mode 100644
index 1024d460044..00000000000
--- a/source/blender/compositor/operations/COM_OpenCLKernels.cl.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-/// @todo: this source needs to be generated from COM_OpenCLKernels.cl.
-/// not implemented yet. new data to h
-
-const char *sourcecode = "/// This file contains all opencl kernels for node-operation implementations \n" \
-"\n" \
-"__kernel void testKernel(__global __write_only image2d_t output)\n" \
-"{\n" \
-"	int x = get_global_id(0);\n" \
-"	int y = get_global_id(1);\n" \
-"	int2 coords = {x, y}; \n" \
-"	float4 color = {0.0f, 1.0f, 0.0f, 1.0f};\n" \
-"	write_imagef(output, coords, color);\n" \
-"}\n" \
-"\0\n";
-
diff --git a/source/blender/compositor/operations/COM_OpenCLKernels.cl.h b/source/blender/compositor/operations/COM_OpenCLKernels.cl.h
new file mode 100644
index 00000000000..e064b7511cb
--- /dev/null
+++ b/source/blender/compositor/operations/COM_OpenCLKernels.cl.h
@@ -0,0 +1,117 @@
+/* clkernelstoh output of file <COM_OpenCLKernels_cl> */
+
+const char * clkernelstoh_COM_OpenCLKernels_cl = "/// This file contains all opencl kernels for node-operation implementations\n" \
+"\n" \
+"// Global SAMPLERS\n" \
+"const sampler_t SAMPLER_NEAREST      = CLK_NORMALIZED_COORDS_FALSE | CLK_ADDRESS_CLAMP_TO_EDGE | CLK_FILTER_NEAREST;\n" \
+"\n" \
+"__constant const int2 zero = {0,0};\n" \
+"\n" \
+"// KERNEL --- BOKEH BLUR ---\n" \
+"__kernel void bokehBlurKernel(__read_only image2d_t boundingBox, __read_only image2d_t inputImage,\n" \
+"                              __read_only image2d_t bokehImage, __write_only image2d_t output,\n" \
+"                              int2 offsetInput, int2 offsetOutput, int radius, int step, int2 dimension, int2 offset)\n" \
+"{\n" \
+"	int2 coords = {get_global_id(0), get_global_id(1)};\n" \
+"	coords += offset;\n" \
+"	float tempBoundingBox;\n" \
+"	float4 color = {0.0f,0.0f,0.0f,0.0f};\n" \
+"	float4 multiplier = {0.0f,0.0f,0.0f,0.0f};\n" \
+"	float4 bokeh;\n" \
+"	const float radius2 = radius*2.0f;\n" \
+"	const int2 realCoordinate = coords + offsetOutput;\n" \
+"\n" \
+"	tempBoundingBox = read_imagef(boundingBox, SAMPLER_NEAREST, coords).s0;\n" \
+"\n" \
+"	if (tempBoundingBox > 0.0f) {\n" \
+"		const int2 bokehImageDim = get_image_dim(bokehImage);\n" \
+"		const int2 bokehImageCenter = bokehImageDim/2;\n" \
+"		const int2 minXY = max(realCoordinate - radius, zero);\n" \
+"		const int2 maxXY = min(realCoordinate + radius, dimension);\n" \
+"		int nx, ny;\n" \
+"\n" \
+"		float2 uv;\n" \
+"		int2 inputXy;\n" \
+"\n" \
+"		for (ny = minXY.y, inputXy.y = ny - offsetInput.y ; ny < maxXY.y ; ny +=step, inputXy.y+=step) {\n" \
+"			uv.y = ((realCoordinate.y-ny)/radius2)*bokehImageDim.y+bokehImageCenter.y;\n" \
+"\n" \
+"			for (nx = minXY.x, inputXy.x = nx - offsetInput.x; nx < maxXY.x ; nx +=step, inputXy.x+=step) {\n" \
+"				uv.x = ((realCoordinate.x-nx)/radius2)*bokehImageDim.x+bokehImageCenter.x;\n" \
+"				bokeh = read_imagef(bokehImage, SAMPLER_NEAREST, uv);\n" \
+"				color += bokeh * read_imagef(inputImage, SAMPLER_NEAREST, inputXy);\n" \
+"				multiplier += bokeh;\n" \
+"			}\n" \
+"		}\n" \
+"		color /= multiplier;\n" \
+"\n" \
+"	} else {\n" \
+"		int2 imageCoordinates = realCoordinate - offsetInput;\n" \
+"		color = read_imagef(inputImage, SAMPLER_NEAREST, imageCoordinates);\n" \
+"	}\n" \
+"\n" \
+"	write_imagef(output, coords, color);\n" \
+"}\n" \
+"\n" \
+"// KERNEL --- DILATE ---\n" \
+"__kernel void dilateKernel(__read_only image2d_t inputImage,  __write_only image2d_t output,\n" \
+"                           int2 offsetInput, int2 offsetOutput, int scope, int distanceSquared, int2 dimension,\n" \
+"                           int2 offset)\n" \
+"{\n" \
+"	int2 coords = {get_global_id(0), get_global_id(1)};\n" \
+"	coords += offset;\n" \
+"	const int2 realCoordinate = coords + offsetOutput;\n" \
+"\n" \
+"	const int2 minXY = max(realCoordinate - scope, zero);\n" \
+"	const int2 maxXY = min(realCoordinate + scope, dimension);\n" \
+"\n" \
+"	float value = 0.0f;\n" \
+"	int nx, ny;\n" \
+"	int2 inputXy;\n" \
+"\n" \
+"	for (ny = minXY.y, inputXy.y = ny - offsetInput.y ; ny < maxXY.y ; ny ++, inputXy.y++) {\n" \
+"		for (nx = minXY.x, inputXy.x = nx - offsetInput.x; nx < maxXY.x ; nx ++, inputXy.x++) {\n" \
+"			const float deltaX = (realCoordinate.x - nx);\n" \
+"			const float deltaY = (realCoordinate.y - ny);\n" \
+"			const float measuredDistance = deltaX*deltaX+deltaY*deltaY;\n" \
+"			if (measuredDistance <= distanceSquared) {\n" \
+"				value = max(value, read_imagef(inputImage, SAMPLER_NEAREST, inputXy).s0);\n" \
+"			}\n" \
+"		}\n" \
+"	}\n" \
+"\n" \
+"	float4 color = {value,0.0f,0.0f,0.0f};\n" \
+"	write_imagef(output, coords, color);\n" \
+"}\n" \
+"\n" \
+"// KERNEL --- DILATE ---\n" \
+"__kernel void erodeKernel(__read_only image2d_t inputImage,  __write_only image2d_t output,\n" \
+"                           int2 offsetInput, int2 offsetOutput, int scope, int distanceSquared, int2 dimension,\n" \
+"                           int2 offset)\n" \
+"{\n" \
+"	int2 coords = {get_global_id(0), get_global_id(1)};\n" \
+"	coords += offset;\n" \
+"	const int2 realCoordinate = coords + offsetOutput;\n" \
+"\n" \
+"	const int2 minXY = max(realCoordinate - scope, zero);\n" \
+"	const int2 maxXY = min(realCoordinate + scope, dimension);\n" \
+"\n" \
+"	float value = 1.0f;\n" \
+"	int nx, ny;\n" \
+"	int2 inputXy;\n" \
+"\n" \
+"	for (ny = minXY.y, inputXy.y = ny - offsetInput.y ; ny < maxXY.y ; ny ++, inputXy.y++) {\n" \
+"		for (nx = minXY.x, inputXy.x = nx - offsetInput.x; nx < maxXY.x ; nx ++, inputXy.x++) {\n" \
+"			const float deltaX = (realCoordinate.x - nx);\n" \
+"			const float deltaY = (realCoordinate.y - ny);\n" \
+"			const float measuredDistance = deltaX*deltaX+deltaY*deltaY;\n" \
+"			if (measuredDistance <= distanceSquared) {\n" \
+"				value = min(value, read_imagef(inputImage, SAMPLER_NEAREST, inputXy).s0);\n" \
+"			}\n" \
+"		}\n" \
+"	}\n" \
+"\n" \
+"	float4 color = {value,0.0f,0.0f,0.0f};\n" \
+"	write_imagef(output, coords, color);\n" \
+"}\n" \
+"\0";
diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.cpp b/source/blender/compositor/operations/COM_OutputFileOperation.cpp
index 8d39e987bd4..e71178a811d 100644
--- a/source/blender/compositor/operations/COM_OutputFileOperation.cpp
+++ b/source/blender/compositor/operations/COM_OutputFileOperation.cpp
@@ -41,10 +41,10 @@ extern "C" {
 static int get_datatype_size(DataType datatype)
 {
 	switch (datatype) {
-	case COM_DT_VALUE:	return 1;
-	case COM_DT_VECTOR:	return 3;
-	case COM_DT_COLOR:	return 4;
-	default:			return 0;
+		case COM_DT_VALUE:  return 1;
+		case COM_DT_VECTOR: return 3;
+		case COM_DT_COLOR:  return 4;
+		default:            return 0;
 	}
 }
 
@@ -53,13 +53,13 @@ static float *init_buffer(unsigned int width, unsigned int height, DataType data
 	// When initializing the tree during initial load the width and height can be zero.
 	if (width != 0 && height != 0) {
 		int size = get_datatype_size(datatype);
-		return (float *)MEM_callocN(width*height*size*sizeof(float), "OutputFile buffer");
+		return (float *)MEM_callocN(width * height * size * sizeof(float), "OutputFile buffer");
 	}
 	else
 		return NULL;
 }
 
-static void write_buffer_rect(rcti *rect, MemoryBuffer** memoryBuffers, const bNodeTree *tree, 
+static void write_buffer_rect(rcti *rect, MemoryBuffer **memoryBuffers, const bNodeTree *tree,
                               SocketReader *reader, float *buffer, unsigned int width, DataType datatype)
 {
 	float color[4];
@@ -70,29 +70,29 @@ static void write_buffer_rect(rcti *rect, MemoryBuffer** memoryBuffers, const bN
 	int y1 = rect->ymin;
 	int x2 = rect->xmax;
 	int y2 = rect->ymax;
-	int offset = (y1*width + x1 ) * size;
+	int offset = (y1 * width + x1) * size;
 	int x;
 	int y;
 	bool breaked = false;
 
-	for (y = y1 ; y < y2 && (!breaked); y++) {
-		for (x = x1 ; x < x2 && (!breaked) ; x++) {
+	for (y = y1; y < y2 && (!breaked); y++) {
+		for (x = x1; x < x2 && (!breaked); x++) {
 			reader->read(color, x, y, COM_PS_NEAREST, memoryBuffers);
 			
-			for (i=0; i < size; ++i)
-				buffer[offset+i] = color[i];
+			for (i = 0; i < size; ++i)
+				buffer[offset + i] = color[i];
 			offset += size;
 			
 			if (tree->test_break && tree->test_break(tree->tbh))
 				breaked = true;
 		}
-		offset += (width-(x2-x1)) * size;
+		offset += (width - (x2 - x1)) * size;
 	}
 }
 
 
 OutputSingleLayerOperation::OutputSingleLayerOperation(
-		const Scene *scene, const bNodeTree *tree, DataType datatype, ImageFormatData *format, const char *path)
+    const Scene *scene, const bNodeTree *tree, DataType datatype, ImageFormatData *format, const char *path)
 {
 	this->scene = scene;
 	this->tree = tree;
@@ -113,7 +113,7 @@ void OutputSingleLayerOperation::initExecution()
 	this->outputBuffer = init_buffer(this->getWidth(), this->getHeight(), this->datatype);
 }
 
-void OutputSingleLayerOperation::executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers)
+void OutputSingleLayerOperation::executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers)
 {
 	write_buffer_rect(rect, memoryBuffers, this->tree, imageInput, this->outputBuffer, this->getWidth(), this->datatype);
 }
@@ -123,7 +123,7 @@ void OutputSingleLayerOperation::deinitExecution()
 	if (this->getWidth() * this->getHeight() != 0) {
 		
 		int size = get_datatype_size(this->datatype);
-		ImBuf *ibuf = IMB_allocImBuf(this->getWidth(), this->getHeight(), size*8, 0);
+		ImBuf *ibuf = IMB_allocImBuf(this->getWidth(), this->getHeight(), size * 8, 0);
 		Main *bmain = G.main; /* TODO, have this passed along */
 		char filename[FILE_MAX];
 		
@@ -160,7 +160,7 @@ OutputOpenExrLayer::OutputOpenExrLayer(const char *name, DataType datatype)
 }
 
 OutputOpenExrMultiLayerOperation::OutputOpenExrMultiLayerOperation(
-		const Scene *scene, const bNodeTree *tree, const char *path, char exr_codec)
+    const Scene *scene, const bNodeTree *tree, const char *path, char exr_codec)
 {
 	this->scene = scene;
 	this->tree = tree;
@@ -177,15 +177,15 @@ void OutputOpenExrMultiLayerOperation::add_layer(const char *name, DataType data
 
 void OutputOpenExrMultiLayerOperation::initExecution()
 {
-	for (int i=0; i < layers.size(); ++i) {
+	for (unsigned int i = 0; i < layers.size(); ++i) {
 		layers[i].imageInput = getInputSocketReader(i);
 		layers[i].outputBuffer = init_buffer(this->getWidth(), this->getHeight(), layers[i].datatype);
 	}
 }
 
-void OutputOpenExrMultiLayerOperation::executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers)
+void OutputOpenExrMultiLayerOperation::executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers)
 {
-	for (int i=0; i < layers.size(); ++i) {
+	for (unsigned int i = 0; i < layers.size(); ++i) {
 		write_buffer_rect(rect, memoryBuffers, this->tree, layers[i].imageInput, layers[i].outputBuffer, this->getWidth(), layers[i].datatype);
 	}
 }
@@ -203,39 +203,39 @@ void OutputOpenExrMultiLayerOperation::deinitExecution()
 		                  (this->scene->r.scemode & R_EXTENSION), true);
 		BLI_make_existing_file(filename);
 		
-		for (int i=0; i < layers.size(); ++i) {
+		for (unsigned int i = 0; i < layers.size(); ++i) {
 			char channelname[EXR_TOT_MAXNAME];
-			BLI_strncpy(channelname, layers[i].name, sizeof(channelname)-2);
+			BLI_strncpy(channelname, layers[i].name, sizeof(channelname) - 2);
 			char *channelname_ext = channelname + strlen(channelname);
 			
 			float *buf = layers[i].outputBuffer;
 			
 			/* create channels */
 			switch (layers[i].datatype) {
-			case COM_DT_VALUE:
-				strcpy(channelname_ext, ".V");
-				IMB_exr_add_channel(exrhandle, 0, channelname, 1, width, buf);
-				break;
-			case COM_DT_VECTOR:
-				strcpy(channelname_ext, ".X");
-				IMB_exr_add_channel(exrhandle, 0, channelname, 3, 3*width, buf);
-				strcpy(channelname_ext, ".Y");
-				IMB_exr_add_channel(exrhandle, 0, channelname, 3, 3*width, buf+1);
-				strcpy(channelname_ext, ".Z");
-				IMB_exr_add_channel(exrhandle, 0, channelname, 3, 3*width, buf+2);
-				break;
-			case COM_DT_COLOR:
-				strcpy(channelname_ext, ".R");
-				IMB_exr_add_channel(exrhandle, 0, channelname, 4, 4*width, buf);
-				strcpy(channelname_ext, ".G");
-				IMB_exr_add_channel(exrhandle, 0, channelname, 4, 4*width, buf+1);
-				strcpy(channelname_ext, ".B");
-				IMB_exr_add_channel(exrhandle, 0, channelname, 4, 4*width, buf+2);
-				strcpy(channelname_ext, ".A");
-				IMB_exr_add_channel(exrhandle, 0, channelname, 4, 4*width, buf+3);
-				break;
-			default:
-				break;
+				case COM_DT_VALUE:
+					strcpy(channelname_ext, ".V");
+					IMB_exr_add_channel(exrhandle, 0, channelname, 1, width, buf);
+					break;
+				case COM_DT_VECTOR:
+					strcpy(channelname_ext, ".X");
+					IMB_exr_add_channel(exrhandle, 0, channelname, 3, 3 * width, buf);
+					strcpy(channelname_ext, ".Y");
+					IMB_exr_add_channel(exrhandle, 0, channelname, 3, 3 * width, buf + 1);
+					strcpy(channelname_ext, ".Z");
+					IMB_exr_add_channel(exrhandle, 0, channelname, 3, 3 * width, buf + 2);
+					break;
+				case COM_DT_COLOR:
+					strcpy(channelname_ext, ".R");
+					IMB_exr_add_channel(exrhandle, 0, channelname, 4, 4 * width, buf);
+					strcpy(channelname_ext, ".G");
+					IMB_exr_add_channel(exrhandle, 0, channelname, 4, 4 * width, buf + 1);
+					strcpy(channelname_ext, ".B");
+					IMB_exr_add_channel(exrhandle, 0, channelname, 4, 4 * width, buf + 2);
+					strcpy(channelname_ext, ".A");
+					IMB_exr_add_channel(exrhandle, 0, channelname, 4, 4 * width, buf + 3);
+					break;
+				default:
+					break;
 			}
 			
 		}
@@ -251,7 +251,7 @@ void OutputOpenExrMultiLayerOperation::deinitExecution()
 		}
 		
 		IMB_exr_close(exrhandle);
-		for (int i=0; i < layers.size(); ++i) {
+		for (unsigned int i = 0; i < layers.size(); ++i) {
 			if (layers[i].outputBuffer) {
 				MEM_freeN(layers[i].outputBuffer);
 				layers[i].outputBuffer = NULL;
diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.h b/source/blender/compositor/operations/COM_OutputFileOperation.h
index 0e37432ca5b..cfc5f7e41f2 100644
--- a/source/blender/compositor/operations/COM_OutputFileOperation.h
+++ b/source/blender/compositor/operations/COM_OutputFileOperation.h
@@ -45,18 +45,18 @@ private:
 public:
 	OutputSingleLayerOperation(const Scene *scene, const bNodeTree *tree, DataType datatype, ImageFormatData *format, const char *path);
 	
-	void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers);
-	bool isOutputOperation(bool rendering) const {return true;}
+	void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers);
+	bool isOutputOperation(bool rendering) const { return true; }
 	void initExecution();
 	void deinitExecution();
-	const int getRenderPriority() const {return 7;}
+	const CompositorPriority getRenderPriority() const { return COM_PRIORITY_LOW; }
 };
 
 /* extra info for OpenEXR layers */
 struct OutputOpenExrLayer {
 	OutputOpenExrLayer(const char *name, DataType datatype);
 	
-	char name[EXR_TOT_MAXNAME-2];
+	char name[EXR_TOT_MAXNAME - 2];
 	float *outputBuffer;
 	DataType datatype;
 	SocketReader *imageInput;
@@ -79,11 +79,11 @@ public:
 	
 	void add_layer(const char *name, DataType datatype);
 	
-	void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers);
-	bool isOutputOperation(bool rendering) const {return true;}
+	void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers);
+	bool isOutputOperation(bool rendering) const { return true; }
 	void initExecution();
 	void deinitExecution();
-	const int getRenderPriority() const {return 7;}
+	const CompositorPriority getRenderPriority() const { return COM_PRIORITY_LOW; }
 };
 
 #endif
diff --git a/source/blender/compositor/operations/COM_PreviewOperation.cpp b/source/blender/compositor/operations/COM_PreviewOperation.cpp
index a7b6fc93b25..54a95af33b9 100644
--- a/source/blender/compositor/operations/COM_PreviewOperation.cpp
+++ b/source/blender/compositor/operations/COM_PreviewOperation.cpp
@@ -46,14 +46,13 @@ PreviewOperation::PreviewOperation() : NodeOperation()
 	this->input = NULL;
 	this->divider = 1.0f;
 	this->node = NULL;
-	this->priority = 0;
 }
 
 void PreviewOperation::initExecution()
 {
 	this->input = getInputSocketReader(0);
 	if (!this->node->preview) {
-		this->node->preview = (bNodePreview*)MEM_callocN(sizeof(bNodePreview), "node preview");
+		this->node->preview = (bNodePreview *)MEM_callocN(sizeof(bNodePreview), "node preview");
 	}
 	else {
 		if (this->getWidth() == (unsigned int)this->node->preview->xsize && this->getHeight() == (unsigned int)this->node->preview->ysize) {
@@ -62,9 +61,9 @@ void PreviewOperation::initExecution()
 	}
 
 	if (this->outputBuffer == NULL) {
-		this->outputBuffer = (unsigned char*)MEM_callocN(sizeof(unsigned char)*4*getWidth()*getHeight(), "PreviewOperation");
+		this->outputBuffer = (unsigned char *)MEM_callocN(sizeof(unsigned char) * 4 * getWidth() * getHeight(), "PreviewOperation");
 		if (this->node->preview->rect) {
-				MEM_freeN(this->node->preview->rect);
+			MEM_freeN(this->node->preview->rect);
 		}
 		this->node->preview->xsize = getWidth();
 		this->node->preview->ysize = getHeight();
@@ -82,11 +81,11 @@ void PreviewOperation::executeRegion(rcti *rect, unsigned int tileNumber, Memory
 {
 	int offset;
 	float color[4];
-	for (int y = rect->ymin ; y < rect->ymax ; y++) {
-		offset = (y * getWidth() + rect->xmin)*4;
-		for (int x = rect->xmin ; x < rect->xmax ; x++) {
-			float rx = floor(x/divider);
-			float ry = floor(y/divider);
+	for (int y = rect->ymin; y < rect->ymax; y++) {
+		offset = (y * getWidth() + rect->xmin) * 4;
+		for (int x = rect->xmin; x < rect->xmax; x++) {
+			float rx = floor(x / divider);
+			float ry = floor(y / divider);
 	
 			color[0] = 0.0f;
 			color[1] = 0.0f;
@@ -94,8 +93,8 @@ void PreviewOperation::executeRegion(rcti *rect, unsigned int tileNumber, Memory
 			color[3] = 1.0f;
 			input->read(color, rx, ry, COM_PS_NEAREST, memoryBuffers);
 			linearrgb_to_srgb_v4(color, color);
-			F4TOCHAR4(color, outputBuffer+offset);
-			offset +=4;
+			F4TOCHAR4(color, outputBuffer + offset);
+			offset += 4;
 		}
 	}
 }
@@ -103,10 +102,10 @@ bool PreviewOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferO
 {
 	rcti newInput;
 
-	newInput.xmin = input->xmin/divider;
-	newInput.xmax = input->xmax/divider;
-	newInput.ymin = input->ymin/divider;
-	newInput.ymax = input->ymax/divider;
+	newInput.xmin = input->xmin / divider;
+	newInput.xmax = input->xmax / divider;
+	newInput.ymin = input->ymin / divider;
+	newInput.ymax = input->ymax / divider;
 
 	return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
 }
@@ -117,10 +116,10 @@ void PreviewOperation::determineResolution(unsigned int resolution[], unsigned i
 	int height = resolution[1];
 	this->divider = 0.0f;
 	if (width > height) {
-		divider = COM_PREVIEW_SIZE / (width-1);
+		divider = COM_PREVIEW_SIZE / (width - 1);
 	}
 	else {
-		divider = COM_PREVIEW_SIZE / (height-1);
+		divider = COM_PREVIEW_SIZE / (height - 1);
 	}
 	width = width * divider;
 	height = height * divider;
@@ -129,7 +128,7 @@ void PreviewOperation::determineResolution(unsigned int resolution[], unsigned i
 	resolution[1] = height;
 }
 
-const int PreviewOperation::getRenderPriority() const
+const CompositorPriority PreviewOperation::getRenderPriority() const
 {
-	return this->priority;
+	return COM_PRIORITY_LOW;
 }
diff --git a/source/blender/compositor/operations/COM_PreviewOperation.h b/source/blender/compositor/operations/COM_PreviewOperation.h
index 8450b7fc556..f9ce0c644a1 100644
--- a/source/blender/compositor/operations/COM_PreviewOperation.h
+++ b/source/blender/compositor/operations/COM_PreviewOperation.h
@@ -31,26 +31,24 @@ protected:
 	unsigned char *outputBuffer;
 
 	/**
-	  * @brief holds reference to the SDNA bNode, where this nodes will render the preview image for
-	  */
+	 * @brief holds reference to the SDNA bNode, where this nodes will render the preview image for
+	 */
 	bNode *node;
-	const bNodeTree *tree;
 	SocketReader *input;
 	float divider;
-	int priority;
 
 public:
 	PreviewOperation();
-	bool isOutputOperation(bool rendering) const {return true;}
+	bool isOutputOperation(bool rendering) const { return true; }
 	void initExecution();
 	void deinitExecution();
-	const int getRenderPriority() const;
+	const CompositorPriority getRenderPriority() const;
 	
 	void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers);
 	void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
-	void setbNode(bNode *node) { this->node = node;}
-	void setbNodeTree(const bNodeTree *tree) { this->tree = tree;}
+	void setbNode(bNode *node) { this->node = node; }
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
-	void setPriority(int priority) { this->priority = priority; }
+	bool isPreviewOperation() { return true; }
+	
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
index 7695e0f63c2..77f2a06b29b 100644
--- a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
+++ b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
@@ -24,7 +24,7 @@
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 
-ProjectorLensDistortionOperation::ProjectorLensDistortionOperation(): NodeOperation()
+ProjectorLensDistortionOperation::ProjectorLensDistortionOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addOutputSocket(COM_DT_COLOR);
@@ -34,7 +34,7 @@ ProjectorLensDistortionOperation::ProjectorLensDistortionOperation(): NodeOperat
 void ProjectorLensDistortionOperation::initExecution()
 {
 	this->inputProgram = this->getInputSocketReader(0);
-	kr = 0.25f*MAX2(MIN2(this->dispersion, 1.f), 0.f);
+	kr = 0.25f * MAX2(MIN2(this->dispersion, 1.f), 0.f);
 	kr2 = kr * 20;
 }
 
@@ -49,14 +49,14 @@ void ProjectorLensDistortionOperation::executePixel(float *color, int x, int y,
 	float inputValue[4];
 	const float height = this->getHeight();
 	const float width = this->getWidth();
-	const float v = (y + 0.5f)/height;
-	const float u = (x + 0.5f)/width;
-	MemoryBuffer * inputBuffer = (MemoryBuffer*)data;
-	inputBuffer->readCubic(inputValue, (u*width + kr2) - 0.5f, v*height - 0.5f);
+	const float v = (y + 0.5f) / height;
+	const float u = (x + 0.5f) / width;
+	MemoryBuffer *inputBuffer = (MemoryBuffer *)data;
+	inputBuffer->readCubic(inputValue, (u * width + kr2) - 0.5f, v * height - 0.5f);
 	color[0] = inputValue[0];
 	inputBuffer->read(inputValue, x, y);
 	color[1] = inputValue[1];
-	inputBuffer->readCubic(inputValue, (u*width - kr2) - 0.5f, v*height - 0.5f);
+	inputBuffer->readCubic(inputValue, (u * width - kr2) - 0.5f, v * height - 0.5f);
 	color[2] = inputValue[2];
 	color[3] = 1.0f;
 }
@@ -71,7 +71,7 @@ bool ProjectorLensDistortionOperation::determineDependingAreaOfInterest(rcti *in
 	rcti newInput;
 	newInput.ymax = input->ymax;
 	newInput.ymin = input->ymin;
-	newInput.xmin = input->xmin-kr2-2;
-	newInput.xmax = input->xmax+kr2+2;
+	newInput.xmin = input->xmin - kr2 - 2;
+	newInput.xmax = input->xmax + kr2 + 2;
 	return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
 }
diff --git a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
index c8788e100c8..2e188617ab5 100644
--- a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
+++ b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
@@ -28,11 +28,11 @@
 class ProjectorLensDistortionOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputProgram;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputProgram;
 	
-	NodeLensDist * data;
+	NodeLensDist *data;
 	
 	float dispersion;
 	float kr, kr2;
@@ -40,23 +40,23 @@ public:
 	ProjectorLensDistortionOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
-	void setData(NodeLensDist *data) {this->data = data;}
-	void setDispertion(float dispersion) {this->dispersion = dispersion;}
+	void setData(NodeLensDist *data) { this->data = data; }
+	void setDispertion(float dispersion) { this->dispersion = dispersion; }
 	
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
 
diff --git a/source/blender/compositor/operations/COM_QualityStepHelper.cpp b/source/blender/compositor/operations/COM_QualityStepHelper.cpp
index f2d700292a4..18b3b106138 100644
--- a/source/blender/compositor/operations/COM_QualityStepHelper.cpp
+++ b/source/blender/compositor/operations/COM_QualityStepHelper.cpp
@@ -32,40 +32,40 @@ QualityStepHelper::QualityStepHelper()
 void QualityStepHelper::initExecution(QualityHelper helper)
 {
 	switch (helper) {
-	case COM_QH_INCREASE:
-		switch (this->quality) {
-		case COM_QUALITY_HIGH:
-		default:
-			this->step = 1;
-			this->offsetadd = 4;
+		case COM_QH_INCREASE:
+			switch (this->quality) {
+				case COM_QUALITY_HIGH:
+				default:
+					this->step = 1;
+					this->offsetadd = 4;
+					break;
+				case COM_QUALITY_MEDIUM:
+					this->step = 2;
+					this->offsetadd = 8;
+					break;
+				case COM_QUALITY_LOW:
+					this->step = 3;
+					this->offsetadd = 12;
+					break;
+			}
 			break;
-		case COM_QUALITY_MEDIUM:
-			this->step = 2;
-			this->offsetadd = 8;
+		case COM_QH_MULTIPLY:
+			switch (this->quality) {
+				case COM_QUALITY_HIGH:
+				default:
+					this->step = 1;
+					this->offsetadd = 4;
+					break;
+				case COM_QUALITY_MEDIUM:
+					this->step = 2;
+					this->offsetadd = 8;
+					break;
+				case COM_QUALITY_LOW:
+					this->step = 4;
+					this->offsetadd = 16;
+					break;
+			}
 			break;
-		case COM_QUALITY_LOW:
-			this->step = 3;
-			this->offsetadd = 12;
-			break;
-		}
-		break;
-	case COM_QH_MULTIPLY:
-		switch (this->quality) {
-		case COM_QUALITY_HIGH:
-		default:
-			this->step = 1;
-			this->offsetadd = 4;
-			break;
-		case COM_QUALITY_MEDIUM:
-			this->step = 2;
-			this->offsetadd = 8;
-			break;
-		case COM_QUALITY_LOW:
-			this->step = 4;
-			this->offsetadd = 16;
-			break;
-		}
-		break;
 	}
 }
 
diff --git a/source/blender/compositor/operations/COM_QualityStepHelper.h b/source/blender/compositor/operations/COM_QualityStepHelper.h
index 80b25684c5e..aef80e22e38 100644
--- a/source/blender/compositor/operations/COM_QualityStepHelper.h
+++ b/source/blender/compositor/operations/COM_QualityStepHelper.h
@@ -37,17 +37,17 @@ private:
 
 protected:
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution(QualityHelper helper);
 
-	inline int getStep() const {return this->step;}
-	inline int getOffsetAdd() const {return this->offsetadd;}
+	inline int getStep() const { return this->step; }
+	inline int getOffsetAdd() const { return this->offsetadd; }
 
 public:
 	QualityStepHelper();
 
 
-	void setQuality(CompositorQuality quality) {this->quality = quality;}
+	void setQuality(CompositorQuality quality) { this->quality = quality; }
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_ReadBufferOperation.cpp b/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
index d7f95c10cfb..fa1f0280207 100644
--- a/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
+++ b/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
@@ -24,7 +24,7 @@
 #include "COM_WriteBufferOperation.h"
 #include "COM_defines.h"
 
-ReadBufferOperation::ReadBufferOperation():NodeOperation()
+ReadBufferOperation::ReadBufferOperation() : NodeOperation()
 {
 	this->addOutputSocket(COM_DT_COLOR);
 	this->offset = 0;
@@ -38,7 +38,7 @@ void *ReadBufferOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryB
 void ReadBufferOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
 {
 	if (this->memoryProxy != NULL) {
-		WriteBufferOperation * operation = memoryProxy->getWriteBufferOperation();
+		WriteBufferOperation *operation = memoryProxy->getWriteBufferOperation();
 		operation->determineResolution(resolution, preferredResolution);
 		operation->setResolution(resolution);
 
@@ -67,11 +67,19 @@ void ReadBufferOperation::executePixel(float *color, float x, float y, float dx,
 	}
 }
 
-bool ReadBufferOperation::determineDependingAreaOfInterest(rcti * input, ReadBufferOperation *readOperation, rcti *output)
+bool ReadBufferOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
 {
-	if (this==readOperation) {
+	if (this == readOperation) {
 		BLI_init_rcti(output, input->xmin, input->xmax, input->ymin, input->ymax);
 		return true;
 	}
 	return false;
 }
+
+void ReadBufferOperation::readResolutionFromWriteBuffer() {
+	if (this->memoryProxy != NULL) {
+		WriteBufferOperation *operation = memoryProxy->getWriteBufferOperation();
+		this->setWidth(operation->getWidth());
+		this->setHeight(operation->getHeight());
+	}
+}
diff --git a/source/blender/compositor/operations/COM_ReadBufferOperation.h b/source/blender/compositor/operations/COM_ReadBufferOperation.h
index d58d131264b..576aa194bc5 100644
--- a/source/blender/compositor/operations/COM_ReadBufferOperation.h
+++ b/source/blender/compositor/operations/COM_ReadBufferOperation.h
@@ -26,26 +26,26 @@
 #include "COM_NodeOperation.h"
 #include "COM_MemoryProxy.h"
 
-class ReadBufferOperation: public NodeOperation {
+class ReadBufferOperation : public NodeOperation {
 private:
 	MemoryProxy *memoryProxy;
 	unsigned int offset;
 public:
 	ReadBufferOperation();
-	int isBufferOperation() {return true;}
-	void setMemoryProxy(MemoryProxy *memoryProxy) {this->memoryProxy = memoryProxy;}
-	MemoryProxy *getMemoryProxy() {return this->memoryProxy;}
+	int isBufferOperation() { return true; }
+	void setMemoryProxy(MemoryProxy *memoryProxy) { this->memoryProxy = memoryProxy; }
+	MemoryProxy *getMemoryProxy() { return this->memoryProxy; }
 	void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
 	
 	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
-	void executePixel(float *color, float x, float y, float dx, float dy, MemoryBuffer *inputBuffers[]);
-	const bool isReadBufferOperation() const {return true;}
-	void setOffset(unsigned int offset) {this->offset = offset;}
-	unsigned int getOffset() {return this->offset;}
-	bool determineDependingAreaOfInterest(rcti * input, ReadBufferOperation *readOperation, rcti *output);
-	MemoryBuffer *getInputMemoryBuffer(MemoryBuffer** memoryBuffers) {return memoryBuffers[offset];}
-	
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
+	void executePixel(float *color, float x, float y, float dx, float dy, MemoryBuffer * inputBuffers[]);
+	const bool isReadBufferOperation() const { return true; }
+	void setOffset(unsigned int offset) { this->offset = offset; }
+	unsigned int getOffset() { return this->offset; }
+	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
+	MemoryBuffer *getInputMemoryBuffer(MemoryBuffer **memoryBuffers) { return memoryBuffers[offset]; }
+	void readResolutionFromWriteBuffer();
 };
 
 #endif
diff --git a/source/blender/compositor/operations/COM_RenderLayersAOOperation.cpp b/source/blender/compositor/operations/COM_RenderLayersAOOperation.cpp
index dad082cf0ca..bb165c2fe1c 100644
--- a/source/blender/compositor/operations/COM_RenderLayersAOOperation.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersAOOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_RenderLayersAOOperation.h"
 
-RenderLayersAOOperation::RenderLayersAOOperation() :RenderLayersBaseProg(SCE_PASS_AO, 3)
+RenderLayersAOOperation::RenderLayersAOOperation() : RenderLayersBaseProg(SCE_PASS_AO, 3)
 {
 	this->addOutputSocket(COM_DT_COLOR);
 }
diff --git a/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp b/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp
index ccb7dd91c04..35f787cb59f 100644
--- a/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_RenderLayersAlphaProg.h"
 
-RenderLayersAlphaProg::RenderLayersAlphaProg() :RenderLayersBaseProg(SCE_PASS_COMBINED, 4)
+RenderLayersAlphaProg::RenderLayersAlphaProg() : RenderLayersBaseProg(SCE_PASS_COMBINED, 4)
 {
 	this->addOutputSocket(COM_DT_VALUE);
 }
@@ -31,7 +31,7 @@ void RenderLayersAlphaProg::executePixel(float *output, float x, float y, PixelS
 {
 	int ix = x;
 	int iy = y;
-	float * inputBuffer = this->getInputBuffer();
+	float *inputBuffer = this->getInputBuffer();
 
 	if (inputBuffer == NULL || ix < 0 || iy < 0 || ix >= (int)this->getWidth() || iy >= (int)this->getHeight() ) {
 		output[0] = 0.0f;
@@ -40,8 +40,8 @@ void RenderLayersAlphaProg::executePixel(float *output, float x, float y, PixelS
 		output[3] = 0.0f;
 	}
 	else {
-		unsigned int offset = (iy*this->getWidth()+ix) * 4;
-		output[0] = inputBuffer[offset+3];
+		unsigned int offset = (iy * this->getWidth() + ix) * 4;
+		output[0] = inputBuffer[offset + 3];
 		output[1] = 0.0f;
 		output[2] = 0.0f;
 		output[3] = 0.0f;
diff --git a/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h b/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h
index da808f49fdf..846e337c572 100644
--- a/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h
+++ b/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h
@@ -28,7 +28,7 @@
 class RenderLayersAlphaProg : public RenderLayersBaseProg {
 public:
 	RenderLayersAlphaProg();
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 };
 
diff --git a/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp b/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
index 35c8753ded6..f27af3c25f5 100644
--- a/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
@@ -31,7 +31,7 @@ extern "C" {
 	#include "RE_render_ext.h"
 }
 
-RenderLayersBaseProg::RenderLayersBaseProg(int renderpass, int elementsize): NodeOperation()
+RenderLayersBaseProg::RenderLayersBaseProg(int renderpass, int elementsize) : NodeOperation()
 {
 	this->renderpass = renderpass;
 	this->setScene(NULL);
@@ -42,15 +42,15 @@ RenderLayersBaseProg::RenderLayersBaseProg(int renderpass, int elementsize): Nod
 
 void RenderLayersBaseProg::initExecution()
 {
-	Scene * scene = this->getScene();
-	Render *re = (scene)? RE_GetRender(scene->id.name): NULL;
+	Scene *scene = this->getScene();
+	Render *re = (scene) ? RE_GetRender(scene->id.name) : NULL;
 	RenderResult *rr = NULL;
 	
 	if (re)
 		rr = RE_AcquireResultRead(re);
 	
 	if (rr) {
-		SceneRenderLayer *srl = (SceneRenderLayer*)BLI_findlink(&scene->r.layers, getLayerId());
+		SceneRenderLayer *srl = (SceneRenderLayer *)BLI_findlink(&scene->r.layers, getLayerId());
 		if (srl) {
 
 			RenderLayer *rl = RE_GetRenderLayer(rr, srl->name);
@@ -81,7 +81,7 @@ void RenderLayersBaseProg::executePixel(float *output, float x, float y, PixelSa
 		output[3] = 0.0f;
 	}
 	else {
-		unsigned int offset = (iy*this->getWidth()+ix) * elementsize;
+		unsigned int offset = (iy * this->getWidth() + ix) * elementsize;
 		if (elementsize == 1) {
 			output[0] = inputBuffer[offset];
 			output[1] = 0.0f;
@@ -90,15 +90,15 @@ void RenderLayersBaseProg::executePixel(float *output, float x, float y, PixelSa
 		}
 		else if (elementsize == 3) {
 			output[0] = inputBuffer[offset];
-			output[1] = inputBuffer[offset+1];
-			output[2] = inputBuffer[offset+2];
+			output[1] = inputBuffer[offset + 1];
+			output[2] = inputBuffer[offset + 2];
 			output[3] = 1.0f;
 		}
 		else {
 			output[0] = inputBuffer[offset];
-			output[1] = inputBuffer[offset+1];
-			output[2] = inputBuffer[offset+2];
-			output[3] = inputBuffer[offset+3];
+			output[1] = inputBuffer[offset + 1];
+			output[2] = inputBuffer[offset + 2];
+			output[3] = inputBuffer[offset + 3];
 		}
 	}
 }
@@ -121,12 +121,12 @@ void RenderLayersBaseProg::determineResolution(unsigned int resolution[], unsign
 		rr = RE_AcquireResultRead(re);
 	
 	if (rr) {
-		SceneRenderLayer *srl	= (SceneRenderLayer*)BLI_findlink(&sce->r.layers, getLayerId());
+		SceneRenderLayer *srl   = (SceneRenderLayer *)BLI_findlink(&sce->r.layers, getLayerId());
 		if (srl) {
 			RenderLayer *rl = RE_GetRenderLayer(rr, srl->name);
 			if (rl && rl->rectf) {
-				resolution[0]=rl->rectx;
-				resolution[1]=rl->recty;
+				resolution[0] = rl->rectx;
+				resolution[1] = rl->recty;
 			}
 		}
 	}
diff --git a/source/blender/compositor/operations/COM_RenderLayersBaseProg.h b/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
index 64e2496621f..ce2b8f767b6 100644
--- a/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
+++ b/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
@@ -36,64 +36,63 @@ extern "C" {
 }
 
 /**
-  * Base class for all renderlayeroperations
-  *
-  * @todo: rename to operation.
-  */
+ * Base class for all renderlayeroperations
+ *
+ * @todo: rename to operation.
+ */
 class RenderLayersBaseProg : public NodeOperation {
 private:
 	/**
-	  * Reference to the scene object.
-	  */
+	 * Reference to the scene object.
+	 */
 	Scene *scene;
 	
 	/**
-	  * layerId of the layer where this operation needs to get its data from
-	  */
+	 * layerId of the layer where this operation needs to get its data from
+	 */
 	short layerId;
 	
 	/**
-	  * cached instance to the float buffer inside the layer
-	  */
+	 * cached instance to the float buffer inside the layer
+	 */
 	float *inputBuffer;
 	
 	/**
-	  * renderpass where this operation needs to get its data from
-	  */
+	 * renderpass where this operation needs to get its data from
+	 */
 	int renderpass;
 	
 	int elementsize;
 	
 protected:
 	/**
-	  * Constructor
-	  */
+	 * Constructor
+	 */
 	RenderLayersBaseProg(int renderpass, int elementsize);
 	
 	/**
-	  * Determine the output resolution. The resolution is retrieved from the Renderer
-	  */
+	 * Determine the output resolution. The resolution is retrieved from the Renderer
+	 */
 	void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
 	
 	/**
-	  * retrieve the reference to the float buffer of the renderer.
-	  */
-	inline float *getInputBuffer() {return this->inputBuffer;}
+	 * retrieve the reference to the float buffer of the renderer.
+	 */
+	inline float *getInputBuffer() { return this->inputBuffer; }
 
 public:
 	/**
-	  * setter for the scene field. Will be called from
-	  * @see RenderLayerNode to set the actual scene where
-	  * the data will be retrieved from.
-	  */
-	void setScene(Scene *scene) {this->scene = scene;}
-	Scene *getScene() {return this->scene;}
-	void setLayerId(short layerId) {this->layerId = layerId;}
-	short getLayerId() {return this->layerId;}
+	 * setter for the scene field. Will be called from
+	 * @see RenderLayerNode to set the actual scene where
+	 * the data will be retrieved from.
+	 */
+	void setScene(Scene *scene) { this->scene = scene; }
+	Scene *getScene() { return this->scene; }
+	void setLayerId(short layerId) { this->layerId = layerId; }
+	short getLayerId() { return this->layerId; }
 	void initExecution();
 	void deinitExecution();
 	void executePixel(float *output, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
-
 };
 
 #endif
diff --git a/source/blender/compositor/operations/COM_RenderLayersColorOperation.cpp b/source/blender/compositor/operations/COM_RenderLayersColorOperation.cpp
index aee68afe55d..3083c37c2bb 100644
--- a/source/blender/compositor/operations/COM_RenderLayersColorOperation.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersColorOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_RenderLayersColorOperation.h"
 
-RenderLayersColorOperation::RenderLayersColorOperation() :RenderLayersBaseProg(SCE_PASS_RGBA, 4)
+RenderLayersColorOperation::RenderLayersColorOperation() : RenderLayersBaseProg(SCE_PASS_RGBA, 4)
 {
 	this->addOutputSocket(COM_DT_COLOR);
 }
diff --git a/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.cpp b/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.cpp
index fc1df884181..b056896994e 100644
--- a/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_RenderLayersCyclesOperation.h"
 
-RenderLayersCyclesOperation::RenderLayersCyclesOperation(int pass) :RenderLayersBaseProg(pass, 3)
+RenderLayersCyclesOperation::RenderLayersCyclesOperation(int pass) : RenderLayersBaseProg(pass, 3)
 {
 	this->addOutputSocket(COM_DT_COLOR);
 }
diff --git a/source/blender/compositor/operations/COM_RenderLayersDepthProg.cpp b/source/blender/compositor/operations/COM_RenderLayersDepthProg.cpp
index 985b1c1bee8..ae5fc3b2254 100644
--- a/source/blender/compositor/operations/COM_RenderLayersDepthProg.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersDepthProg.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_RenderLayersDepthProg.h"
 
-RenderLayersDepthProg::RenderLayersDepthProg() :RenderLayersBaseProg(SCE_PASS_Z, 1)
+RenderLayersDepthProg::RenderLayersDepthProg() : RenderLayersBaseProg(SCE_PASS_Z, 1)
 {
 	this->addOutputSocket(COM_DT_VALUE);
 }
diff --git a/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.cpp b/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.cpp
index ad73490b92d..6baa25e5600 100644
--- a/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_RenderLayersDiffuseOperation.h"
 
-RenderLayersDiffuseOperation::RenderLayersDiffuseOperation() :RenderLayersBaseProg(SCE_PASS_DIFFUSE, 3)
+RenderLayersDiffuseOperation::RenderLayersDiffuseOperation() : RenderLayersBaseProg(SCE_PASS_DIFFUSE, 3)
 {
 	this->addOutputSocket(COM_DT_COLOR);
 }
diff --git a/source/blender/compositor/operations/COM_RenderLayersEmitOperation.cpp b/source/blender/compositor/operations/COM_RenderLayersEmitOperation.cpp
index 7537e2d10fc..1b03a4e169f 100644
--- a/source/blender/compositor/operations/COM_RenderLayersEmitOperation.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersEmitOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_RenderLayersEmitOperation.h"
 
-RenderLayersEmitOperation::RenderLayersEmitOperation() :RenderLayersBaseProg(SCE_PASS_EMIT, 3)
+RenderLayersEmitOperation::RenderLayersEmitOperation() : RenderLayersBaseProg(SCE_PASS_EMIT, 3)
 {
 	this->addOutputSocket(COM_DT_COLOR);
 }
diff --git a/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.cpp b/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.cpp
index 0ace9a7c58f..f4d6dc7353b 100644
--- a/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_RenderLayersEnvironmentOperation.h"
 
-RenderLayersEnvironmentOperation::RenderLayersEnvironmentOperation() :RenderLayersBaseProg(SCE_PASS_ENVIRONMENT, 3)
+RenderLayersEnvironmentOperation::RenderLayersEnvironmentOperation() : RenderLayersBaseProg(SCE_PASS_ENVIRONMENT, 3)
 {
 	this->addOutputSocket(COM_DT_COLOR);
 }
diff --git a/source/blender/compositor/operations/COM_RenderLayersImageProg.cpp b/source/blender/compositor/operations/COM_RenderLayersImageProg.cpp
index 264e2f0fd79..14c3d652c42 100644
--- a/source/blender/compositor/operations/COM_RenderLayersImageProg.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersImageProg.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_RenderLayersImageProg.h"
 
-RenderLayersColourProg::RenderLayersColourProg() :RenderLayersBaseProg(SCE_PASS_COMBINED, 4)
+RenderLayersColourProg::RenderLayersColourProg() : RenderLayersBaseProg(SCE_PASS_COMBINED, 4)
 {
 	this->addOutputSocket(COM_DT_COLOR);
 }
diff --git a/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.cpp b/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.cpp
index 645f9768eb2..4258cb94a26 100644
--- a/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_RenderLayersIndirectOperation.h"
 
-RenderLayersIndirectOperation::RenderLayersIndirectOperation() :RenderLayersBaseProg(SCE_PASS_INDIRECT, 3)
+RenderLayersIndirectOperation::RenderLayersIndirectOperation() : RenderLayersBaseProg(SCE_PASS_INDIRECT, 3)
 {
 	this->addOutputSocket(COM_DT_COLOR);
 }
diff --git a/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.cpp b/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.cpp
index e5cef7753f2..aab7e0089e4 100644
--- a/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_RenderLayersMaterialIndexOperation.h"
 
-RenderLayersMaterialIndexOperation::RenderLayersMaterialIndexOperation() :RenderLayersBaseProg(SCE_PASS_INDEXMA, 1)
+RenderLayersMaterialIndexOperation::RenderLayersMaterialIndexOperation() : RenderLayersBaseProg(SCE_PASS_INDEXMA, 1)
 {
 	this->addOutputSocket(COM_DT_VALUE);
 }
diff --git a/source/blender/compositor/operations/COM_RenderLayersMistOperation.cpp b/source/blender/compositor/operations/COM_RenderLayersMistOperation.cpp
index fae6c73f747..c64ddc6e9d8 100644
--- a/source/blender/compositor/operations/COM_RenderLayersMistOperation.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersMistOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_RenderLayersMistOperation.h"
 
-RenderLayersMistOperation::RenderLayersMistOperation() :RenderLayersBaseProg(SCE_PASS_MIST, 1)
+RenderLayersMistOperation::RenderLayersMistOperation() : RenderLayersBaseProg(SCE_PASS_MIST, 1)
 {
 	this->addOutputSocket(COM_DT_VALUE);
 }
diff --git a/source/blender/compositor/operations/COM_RenderLayersNormalOperation.cpp b/source/blender/compositor/operations/COM_RenderLayersNormalOperation.cpp
index 67ea4d68204..9d8e7d6272c 100644
--- a/source/blender/compositor/operations/COM_RenderLayersNormalOperation.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersNormalOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_RenderLayersNormalOperation.h"
 
-RenderLayersNormalOperation::RenderLayersNormalOperation() :RenderLayersBaseProg(SCE_PASS_NORMAL, 3)
+RenderLayersNormalOperation::RenderLayersNormalOperation() : RenderLayersBaseProg(SCE_PASS_NORMAL, 3)
 {
 	this->addOutputSocket(COM_DT_VECTOR);
 }
diff --git a/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.cpp b/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.cpp
index 821ff447112..430ea698263 100644
--- a/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_RenderLayersObjectIndexOperation.h"
 
-RenderLayersObjectIndexOperation::RenderLayersObjectIndexOperation() :RenderLayersBaseProg(SCE_PASS_INDEXOB, 1)
+RenderLayersObjectIndexOperation::RenderLayersObjectIndexOperation() : RenderLayersBaseProg(SCE_PASS_INDEXOB, 1)
 {
 	this->addOutputSocket(COM_DT_VALUE);
 }
diff --git a/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.cpp b/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.cpp
index e53144d3501..1fbd599235b 100644
--- a/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_RenderLayersReflectionOperation.h"
 
-RenderLayersReflectionOperation::RenderLayersReflectionOperation() :RenderLayersBaseProg(SCE_PASS_REFLECT, 3)
+RenderLayersReflectionOperation::RenderLayersReflectionOperation() : RenderLayersBaseProg(SCE_PASS_REFLECT, 3)
 {
 	this->addOutputSocket(COM_DT_COLOR);
 }
diff --git a/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.cpp b/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.cpp
index 6e333175220..2ec9be46059 100644
--- a/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_RenderLayersRefractionOperation.h"
 
-RenderLayersRefractionOperation::RenderLayersRefractionOperation() :RenderLayersBaseProg(SCE_PASS_REFRACT, 3)
+RenderLayersRefractionOperation::RenderLayersRefractionOperation() : RenderLayersBaseProg(SCE_PASS_REFRACT, 3)
 {
 	this->addOutputSocket(COM_DT_COLOR);
 }
diff --git a/source/blender/compositor/operations/COM_RenderLayersShadowOperation.cpp b/source/blender/compositor/operations/COM_RenderLayersShadowOperation.cpp
index ce492d54a79..7582e010e2c 100644
--- a/source/blender/compositor/operations/COM_RenderLayersShadowOperation.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersShadowOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_RenderLayersShadowOperation.h"
 
-RenderLayersShadowOperation::RenderLayersShadowOperation() :RenderLayersBaseProg(SCE_PASS_SHADOW, 3)
+RenderLayersShadowOperation::RenderLayersShadowOperation() : RenderLayersBaseProg(SCE_PASS_SHADOW, 3)
 {
 	this->addOutputSocket(COM_DT_COLOR);
 }
diff --git a/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.cpp b/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.cpp
index 7b7d223680c..60c1636dcda 100644
--- a/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_RenderLayersSpecularOperation.h"
 
-RenderLayersSpecularOperation::RenderLayersSpecularOperation() :RenderLayersBaseProg(SCE_PASS_SPEC, 3)
+RenderLayersSpecularOperation::RenderLayersSpecularOperation() : RenderLayersBaseProg(SCE_PASS_SPEC, 3)
 {
 	this->addOutputSocket(COM_DT_COLOR);
 }
diff --git a/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.cpp b/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.cpp
index 213d044a9bd..5a0662d13eb 100644
--- a/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_RenderLayersSpeedOperation.h"
 
-RenderLayersSpeedOperation::RenderLayersSpeedOperation() :RenderLayersBaseProg(SCE_PASS_VECTOR, 4)
+RenderLayersSpeedOperation::RenderLayersSpeedOperation() : RenderLayersBaseProg(SCE_PASS_VECTOR, 4)
 {
 	this->addOutputSocket(COM_DT_COLOR);
 }
diff --git a/source/blender/compositor/operations/COM_RenderLayersUVOperation.cpp b/source/blender/compositor/operations/COM_RenderLayersUVOperation.cpp
index e3917d7796b..b966f98632c 100644
--- a/source/blender/compositor/operations/COM_RenderLayersUVOperation.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersUVOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_RenderLayersUVOperation.h"
 
-RenderLayersUVOperation::RenderLayersUVOperation() :RenderLayersBaseProg(SCE_PASS_UV, 3)
+RenderLayersUVOperation::RenderLayersUVOperation() : RenderLayersBaseProg(SCE_PASS_UV, 3)
 {
 	this->addOutputSocket(COM_DT_VECTOR);
 }
diff --git a/source/blender/compositor/operations/COM_RotateOperation.cpp b/source/blender/compositor/operations/COM_RotateOperation.cpp
index 313e49d8609..ac06048faf3 100644
--- a/source/blender/compositor/operations/COM_RotateOperation.cpp
+++ b/source/blender/compositor/operations/COM_RotateOperation.cpp
@@ -32,24 +32,14 @@ RotateOperation::RotateOperation() : NodeOperation()
 	this->imageSocket = NULL;
 	this->degreeSocket =  NULL;
 	this->doDegree2RadConversion = false;
+	this->isDegreeSet = false;
 }
 void RotateOperation::initExecution()
 {
 	this->imageSocket = this->getInputSocketReader(0);
 	this->degreeSocket = this->getInputSocketReader(1);
-	this->centerX = this->getWidth()/2.0;
-	this->centerY = this->getHeight()/2.0;
-	float degree[4];
-	this->degreeSocket->read(degree, 0, 0, COM_PS_NEAREST, NULL);
-	double rad;
-	if (this->doDegree2RadConversion) {
-		rad = DEG2RAD(degree[0]);
-	}
-	else {
-		rad = degree[0];
-	}
-	this->cosine = cos(rad);
-	this->sine = sin(rad);
+	this->centerX = this->getWidth() / 2.0;
+	this->centerY = this->getHeight() / 2.0;
 }
 
 void RotateOperation::deinitExecution()
@@ -58,18 +48,38 @@ void RotateOperation::deinitExecution()
 	this->degreeSocket = NULL;
 }
 
+inline void RotateOperation::ensureDegree() {
+	if (!isDegreeSet) {
+		float degree[4];
+		this->degreeSocket->read(degree, 0, 0, COM_PS_NEAREST, NULL);
+		double rad;
+		if (this->doDegree2RadConversion) {
+			rad = DEG2RAD((double)degree[0]);
+		}
+		else {
+			rad = degree[0];
+		}
+		this->cosine = cos(rad);
+		this->sine = sin(rad);
+		
+		isDegreeSet = true;
+	}
+}
+
 
-void RotateOperation::executePixel(float *color,float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
+void RotateOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
 {
+	ensureDegree();
 	const float dy = y - this->centerY;
 	const float dx = x - this->centerX;
-	const float nx = this->centerX+(this->cosine*dx + this->sine*dy);
-	const float ny = this->centerY+(-this->sine*dx + this->cosine*dy);
+	const float nx = this->centerX + (this->cosine * dx + this->sine * dy);
+	const float ny = this->centerY + (-this->sine * dx + this->cosine * dy);
 	this->imageSocket->read(color, nx, ny, sampler, inputBuffers);
 }
 
 bool RotateOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
 {
+	ensureDegree();
 	rcti newInput;
 	
 	const float dxmin = input->xmin - this->centerX;
@@ -77,23 +87,23 @@ bool RotateOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOp
 	const float dxmax = input->xmax - this->centerX;
 	const float dymax = input->ymax - this->centerY;
 	
-	const float x1 = this->centerX+(this->cosine*dxmin + this->sine*dymin);
-	const float x2 = this->centerX+(this->cosine*dxmax + this->sine*dymin);
-	const float x3 = this->centerX+(this->cosine*dxmin + this->sine*dymax);
-	const float x4 = this->centerX+(this->cosine*dxmax + this->sine*dymax);
-	const float y1 = this->centerY+(-this->sine*dxmin + this->cosine*dymin);
-	const float y2 = this->centerY+(-this->sine*dxmax + this->cosine*dymin);
-	const float y3 = this->centerY+(-this->sine*dxmin + this->cosine*dymax);
-	const float y4 = this->centerY+(-this->sine*dxmax + this->cosine*dymax);
+	const float x1 = this->centerX + (this->cosine * dxmin + this->sine * dymin);
+	const float x2 = this->centerX + (this->cosine * dxmax + this->sine * dymin);
+	const float x3 = this->centerX + (this->cosine * dxmin + this->sine * dymax);
+	const float x4 = this->centerX + (this->cosine * dxmax + this->sine * dymax);
+	const float y1 = this->centerY + (-this->sine * dxmin + this->cosine * dymin);
+	const float y2 = this->centerY + (-this->sine * dxmax + this->cosine * dymin);
+	const float y3 = this->centerY + (-this->sine * dxmin + this->cosine * dymax);
+	const float y4 = this->centerY + (-this->sine * dxmax + this->cosine * dymax);
 	const float minx = min(x1, min(x2, min(x3, x4)));
 	const float maxx = max(x1, max(x2, max(x3, x4)));
 	const float miny = min(y1, min(y2, min(y3, y4)));
 	const float maxy = max(y1, max(y2, max(y3, y4)));
 	
-	newInput.xmax = ceil(maxx)+1;
-	newInput.xmin = floor(minx)-1;
-	newInput.ymax = ceil(maxy)+1;
-	newInput.ymin = floor(miny)-1;
+	newInput.xmax = ceil(maxx) + 1;
+	newInput.xmin = floor(minx) - 1;
+	newInput.ymax = ceil(maxy) + 1;
+	newInput.ymin = floor(miny) - 1;
 	
 	return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
 }
diff --git a/source/blender/compositor/operations/COM_RotateOperation.h b/source/blender/compositor/operations/COM_RotateOperation.h
index 9965d1021da..bf7355da80e 100644
--- a/source/blender/compositor/operations/COM_RotateOperation.h
+++ b/source/blender/compositor/operations/COM_RotateOperation.h
@@ -25,7 +25,7 @@
 
 #include "COM_NodeOperation.h"
 
-class RotateOperation: public NodeOperation {
+class RotateOperation : public NodeOperation {
 private:
 	SocketReader *imageSocket;
 	SocketReader *degreeSocket;
@@ -34,13 +34,16 @@ private:
 	float cosine;
 	float sine;
 	bool doDegree2RadConversion;
+	bool isDegreeSet;
 public:
 	RotateOperation();
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	void initExecution();
 	void deinitExecution();
-	void setDoDegree2RadConversion(bool abool) {this->doDegree2RadConversion = abool;}
+	void setDoDegree2RadConversion(bool abool) { this->doDegree2RadConversion = abool; }
+	
+	void ensureDegree();
 };
 
 #endif
diff --git a/source/blender/compositor/operations/COM_ScaleOperation.cpp b/source/blender/compositor/operations/COM_ScaleOperation.cpp
index ca2095c3170..2e23df73b67 100644
--- a/source/blender/compositor/operations/COM_ScaleOperation.cpp
+++ b/source/blender/compositor/operations/COM_ScaleOperation.cpp
@@ -15,13 +15,17 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributor: 
- *		Jeroen Bakker 
+ * Contributor:
+ *		Jeroen Bakker
  *		Monique Dewanchand
  */
 
 #include "COM_ScaleOperation.h"
 
+#define USE_FORCE_BICUBIC
+/* XXX - ignore input and use default from old compositor,
+ * could become an option like the transform node - campbell */
+
 ScaleOperation::ScaleOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
@@ -38,8 +42,8 @@ void ScaleOperation::initExecution()
 	this->inputOperation = this->getInputSocketReader(0);
 	this->inputXOperation = this->getInputSocketReader(1);
 	this->inputYOperation = this->getInputSocketReader(2);
-	this->centerX = this->getWidth()/2.0;
-	this->centerY = this->getHeight()/2.0;
+	this->centerX = this->getWidth() / 2.0;
+	this->centerY = this->getHeight() / 2.0;
 }
 
 void ScaleOperation::deinitExecution()
@@ -50,8 +54,12 @@ void ScaleOperation::deinitExecution()
 }
 
 
-void ScaleOperation::executePixel(float *color,float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
+void ScaleOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
 {
+#ifdef USE_FORCE_BICUBIC
+	sampler = COM_PS_BICUBIC;
+#endif
+
 	float scaleX[4];
 	float scaleY[4];
 
@@ -61,8 +69,8 @@ void ScaleOperation::executePixel(float *color,float x, float y, PixelSampler sa
 	const float scx = scaleX[0];
 	const float scy = scaleY[0];
 
-	float nx = this->centerX+ (x - this->centerX) / scx;
-	float ny = this->centerY+ (y - this->centerY) / scy;
+	float nx = this->centerX + (x - this->centerX) / scx;
+	float ny = this->centerY + (y - this->centerY) / scy;
 	this->inputOperation->read(color, nx, ny, sampler, inputBuffers);
 }
 
@@ -71,18 +79,18 @@ bool ScaleOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOpe
 	rcti newInput;
 	float scaleX[4];
 	float scaleY[4];
-	
+
 	this->inputXOperation->read(scaleX, 0, 0, COM_PS_NEAREST, NULL);
 	this->inputYOperation->read(scaleY, 0, 0, COM_PS_NEAREST, NULL);
-	
+
 	const float scx = scaleX[0];
 	const float scy = scaleY[0];
-	
-	newInput.xmax = this->centerX+ (input->xmax - this->centerX) / scx;
-	newInput.xmin = this->centerX+ (input->xmin - this->centerX) / scx;
-	newInput.ymax = this->centerY+ (input->ymax - this->centerY) / scy;
-	newInput.ymin = this->centerY+ (input->ymin - this->centerY) / scy;
-	
+
+	newInput.xmax = this->centerX + (input->xmax - this->centerX) / scx;
+	newInput.xmin = this->centerX + (input->xmin - this->centerX) / scx;
+	newInput.ymax = this->centerY + (input->ymax - this->centerY) / scy;
+	newInput.ymin = this->centerY + (input->ymin - this->centerY) / scy;
+
 	return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
 }
 
@@ -92,7 +100,7 @@ ScaleAbsoluteOperation::ScaleAbsoluteOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addInputSocket(COM_DT_VALUE);
-	this->addInputSocket(COM_DT_VALUE);	
+	this->addInputSocket(COM_DT_VALUE);
 	this->addOutputSocket(COM_DT_COLOR);
 	this->setResolutionInputSocketIndex(0);
 	this->inputOperation = NULL;
@@ -104,8 +112,8 @@ void ScaleAbsoluteOperation::initExecution()
 	this->inputOperation = this->getInputSocketReader(0);
 	this->inputXOperation = this->getInputSocketReader(1);
 	this->inputYOperation = this->getInputSocketReader(2);
-	this->centerX = this->getWidth()/2.0;
-	this->centerY = this->getHeight()/2.0;
+	this->centerX = this->getWidth() / 2.0;
+	this->centerY = this->getHeight() / 2.0;
 }
 
 void ScaleAbsoluteOperation::deinitExecution()
@@ -116,8 +124,12 @@ void ScaleAbsoluteOperation::deinitExecution()
 }
 
 
-void ScaleAbsoluteOperation::executePixel(float *color,float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
+void ScaleAbsoluteOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
 {
+#ifdef USE_FORCE_BICUBIC
+	sampler = COM_PS_BICUBIC;
+#endif
+
 	float scaleX[4];
 	float scaleY[4];
 
@@ -126,14 +138,16 @@ void ScaleAbsoluteOperation::executePixel(float *color,float x, float y, PixelSa
 
 	const float scx = scaleX[0]; // target absolute scale
 	const float scy = scaleY[0]; // target absolute scale
+
 	const float width = this->getWidth();
 	const float height = this->getHeight();
 	//div
-	float relativeXScale = scx/width;
-	float relativeYScale = scy/height;
+	float relativeXScale = scx / width;
+	float relativeYScale = scy / height;
+
+	float nx = this->centerX + (x - this->centerX) / relativeXScale;
+	float ny = this->centerY + (y - this->centerY) / relativeYScale;
 
-	float nx = this->centerX+ (x - this->centerX) / relativeXScale;
-	float ny = this->centerY+ (y - this->centerY) / relativeYScale;
 	this->inputOperation->read(color, nx, ny, sampler, inputBuffers);
 }
 
@@ -151,13 +165,13 @@ bool ScaleAbsoluteOperation::determineDependingAreaOfInterest(rcti *input, ReadB
 	const float width = this->getWidth();
 	const float height = this->getHeight();
 	//div
-	float relateveXScale = scx/width;
-	float relateveYScale = scy/height;
+	float relateveXScale = scx / width;
+	float relateveYScale = scy / height;
 
-	newInput.xmax = this->centerX+ (input->xmax - this->centerX) / relateveXScale;
-	newInput.xmin = this->centerX+ (input->xmin - this->centerX) / relateveXScale;
-	newInput.ymax = this->centerY+ (input->ymax - this->centerY) / relateveYScale;
-	newInput.ymin = this->centerY+ (input->ymin - this->centerY) / relateveYScale;
+	newInput.xmax = this->centerX + (input->xmax - this->centerX) / relateveXScale;
+	newInput.xmin = this->centerX + (input->xmin - this->centerX) / relateveXScale;
+	newInput.ymax = this->centerY + (input->ymax - this->centerY) / relateveYScale;
+	newInput.ymin = this->centerY + (input->ymin - this->centerY) / relateveYScale;
 
 	return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
 }
@@ -176,6 +190,52 @@ void ScaleFixedSizeOperation::initExecution()
 	this->inputOperation = this->getInputSocketReader(0);
 	this->relX = inputOperation->getWidth() / (float)this->newWidth;
 	this->relY = inputOperation->getHeight() / (float)this->newHeight;
+
+
+	/* *** all the options below are for a fairly special case - camera framing *** */
+	if (this->offsetX != 0.0f || this->offsetY != 0.0f) {
+		this->is_offset = true;
+
+		if (this->newWidth > this->newHeight) {
+			this->offsetX *= this->newWidth;
+			this->offsetY *= this->newWidth;
+		}
+		else {
+			this->offsetX *= this->newHeight;
+			this->offsetY *= this->newHeight;
+		}
+	}
+
+	if (this->is_aspect) {
+		/* apply aspect from clip */
+		const float w_src = inputOperation->getWidth();
+		const float h_src = inputOperation->getHeight();
+
+		/* destination aspect is already applied from the camera frame */
+		const float w_dst = this->newWidth;
+		const float h_dst = this->newHeight;
+
+		const float asp_src = w_src / h_src;
+		const float asp_dst = w_dst / h_dst;
+
+		if (fabsf(asp_src - asp_dst) >= FLT_EPSILON) {
+			if ((asp_src > asp_dst) == (this->is_crop == true)) {
+				/* fit X */
+				const float div = asp_src / asp_dst;
+				this->relX /= div;
+				this->offsetX += ((w_src - (w_src * div)) / (w_src / w_dst)) / 2.0f;
+			}
+			else {
+				/* fit Y */
+				const float div = asp_dst / asp_src;
+				this->relY /= div;
+				this->offsetY += ((h_src - (h_src * div)) / (h_src / h_dst)) / 2.0f;
+			}
+
+			this->is_offset = true;
+		}
+	}
+	/* *** end framing options *** */
 }
 
 void ScaleFixedSizeOperation::deinitExecution()
@@ -184,19 +244,30 @@ void ScaleFixedSizeOperation::deinitExecution()
 }
 
 
-void ScaleFixedSizeOperation::executePixel(float *color,float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
+void ScaleFixedSizeOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
 {
-	this->inputOperation->read(color, x*relX, y*relY, sampler, inputBuffers);
+#ifdef USE_FORCE_BICUBIC
+	sampler = COM_PS_BICUBIC;
+#endif
+
+	if (this->is_offset) {
+		float nx = ((x - this->offsetX) * relX);
+		float ny = ((y - this->offsetY) * relY);
+		this->inputOperation->read(color, nx, ny, sampler, inputBuffers);
+	}
+	else {
+		this->inputOperation->read(color, x * relX, y * relY, sampler, inputBuffers);
+	}
 }
 
 bool ScaleFixedSizeOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
 {
 	rcti newInput;
-	
-	newInput.xmax = input->xmax *relX;
-	newInput.xmin = input->xmin *relX;
-	newInput.ymax = input->ymax *relY;
-	newInput.ymin = input->ymin *relY;
+
+	newInput.xmax = input->xmax * relX;
+	newInput.xmin = input->xmin * relX;
+	newInput.ymax = input->ymax * relY;
+	newInput.ymin = input->ymin * relY;
 
 	return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
 }
diff --git a/source/blender/compositor/operations/COM_ScaleOperation.h b/source/blender/compositor/operations/COM_ScaleOperation.h
index 3e075249fa1..7089f6c10a4 100644
--- a/source/blender/compositor/operations/COM_ScaleOperation.h
+++ b/source/blender/compositor/operations/COM_ScaleOperation.h
@@ -25,7 +25,7 @@
 
 #include "COM_NodeOperation.h"
 
-class ScaleOperation: public NodeOperation {
+class ScaleOperation : public NodeOperation {
 private:
 	SocketReader *inputOperation;
 	SocketReader *inputXOperation;
@@ -35,43 +35,56 @@ private:
 public:
 	ScaleOperation();
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 	void initExecution();
 	void deinitExecution();
 };
 
-class ScaleAbsoluteOperation: public NodeOperation {
+class ScaleAbsoluteOperation : public NodeOperation {
 	SocketReader *inputOperation;
 	SocketReader *inputXOperation;
 	SocketReader *inputYOperation;
 	float centerX;
 	float centerY;
+
 public:
 	ScaleAbsoluteOperation();
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 	void initExecution();
 	void deinitExecution();
 };
 
-class ScaleFixedSizeOperation: public NodeOperation {
+class ScaleFixedSizeOperation : public NodeOperation {
 	SocketReader *inputOperation;
 	int newWidth;
 	int newHeight;
 	float relX;
 	float relY;
+
+	/* center is only used for aspect correction */
+	float offsetX;
+	float offsetY;
+	bool is_aspect;
+	bool is_crop;
+	/* set from other properties on initialization,
+	 * check if we need to apply offset */
+	bool is_offset;
 public:
 	ScaleFixedSizeOperation();
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
 	void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 	void initExecution();
 	void deinitExecution();
-	void setNewWidth(int width) {this->newWidth = width;}
-	void setNewHeight(int height) {this->newHeight = height;}
+	void setNewWidth(int width) { this->newWidth = width; }
+	void setNewHeight(int height) { this->newHeight = height; }
+	void setIsAspect(bool is_aspect) { this->is_aspect = is_aspect; }
+	void setIsCrop(bool is_crop) { this->is_crop = is_crop; }
+	void setOffset(float x, float y) { this->offsetX = x; this->offsetY = y; }
 };
 
 #endif
diff --git a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
index 4442fd9075e..3299434a02e 100644
--- a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
+++ b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
@@ -27,7 +27,7 @@ extern "C" {
 	#include "BLI_rand.h"
 }
 
-ScreenLensDistortionOperation::ScreenLensDistortionOperation(): NodeOperation()
+ScreenLensDistortionOperation::ScreenLensDistortionOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addOutputSocket(COM_DT_COLOR);
@@ -39,19 +39,19 @@ void ScreenLensDistortionOperation::initExecution()
 	this->inputProgram = this->getInputSocketReader(0);
 	kg = MAX2(MIN2(this->distortion, 1.f), -0.999f);
 	// smaller dispersion range for somewhat more control
-	const float d = 0.25f*MAX2(MIN2(this->dispersion, 1.f), 0.f);
-	kr = MAX2(MIN2((kg+d), 1.f), -0.999f);
-	kb = MAX2(MIN2((kg-d), 1.f), -0.999f);
+	const float d = 0.25f * MAX2(MIN2(this->dispersion, 1.f), 0.f);
+	kr = MAX2(MIN2((kg + d), 1.f), -0.999f);
+	kb = MAX2(MIN2((kg - d), 1.f), -0.999f);
 	maxk = MAX3(kr, kg, kb);
-	sc = (this->data->fit && (maxk > 0.f)) ? (1.f/(1.f + 2.f*maxk)) : (1.f/(1.f + maxk));
-	drg = 4.f*(kg - kr);
-	dgb = 4.f*(kb - kg);
+	sc = (this->data->fit && (maxk > 0.f)) ? (1.f / (1.f + 2.f * maxk)) : (1.f / (1.f + maxk));
+	drg = 4.f * (kg - kr);
+	dgb = 4.f * (kb - kg);
 
-	kr4 = kr*4;
-	kg4 = kg*4.f;
-	kb4 *= kb*4.f;
-	cx = 0.5f*(float)getWidth();
-	cy = 0.5f*(float)getHeight();
+	kr4 = kr * 4;
+	kg4 = kg * 4.f;
+	kb4 *= kb * 4.f;
+	cx = 0.5f * (float)getWidth();
+	cy = 0.5f * (float)getHeight();
 
 }
 
@@ -65,28 +65,28 @@ void ScreenLensDistortionOperation::executePixel(float *outputColor, int x, int
 {
 	const float height = this->getHeight();
 	const float width = this->getWidth();
-	MemoryBuffer *buffer = (MemoryBuffer*)data;
+	MemoryBuffer *buffer = (MemoryBuffer *)data;
 
 	int dr = 0, dg = 0, db = 0;
 	float d, t, ln[6] = {0, 0, 0, 0, 0, 0};
 	float tc[4] = {0, 0, 0, 0};
-	const float v = sc*((y + 0.5f) - cy)/cy;
-	const float u = sc*((x + 0.5f) - cx)/cx;
+	const float v = sc * ((y + 0.5f) - cy) / cy;
+	const float u = sc * ((x + 0.5f) - cx) / cx;
 	int sta = 0, mid = 0, end = 0;
 
-	if ((t = 1.f - kr4*(u*u + v*v)) >= 0.f) {
-		d = 1.f/(1.f + sqrtf(t));
-		ln[0] = (u*d + 0.5f)*width - 0.5f, ln[1] = (v*d + 0.5f)*height - 0.5f;
+	if ((t = 1.f - kr4 * (u * u + v * v)) >= 0.f) {
+		d = 1.f / (1.f + sqrtf(t));
+		ln[0] = (u * d + 0.5f) * width - 0.5f, ln[1] = (v * d + 0.5f) * height - 0.5f;
 		sta = 1;
 	}
-	if ((t = 1.f - kg4*(u*u + v*v)) >= 0.f) {
-		d = 1.f/(1.f + sqrtf(t));
-		ln[2] = (u*d + 0.5f)*width - 0.5f, ln[3] = (v*d + 0.5f)*height - 0.5f;
+	if ((t = 1.f - kg4 * (u * u + v * v)) >= 0.f) {
+		d = 1.f / (1.f + sqrtf(t));
+		ln[2] = (u * d + 0.5f) * width - 0.5f, ln[3] = (v * d + 0.5f) * height - 0.5f;
 		mid = 1;
 	}
-	if ((t = 1.f - kb4*(u*u + v*v)) >= 0.f) {
-		d = 1.f/(1.f + sqrtf(t));
-		ln[4] = (u*d + 0.5f)*width - 0.5f, ln[5] = (v*d + 0.5f)*height - 0.5f;
+	if ((t = 1.f - kb4 * (u * u + v * v)) >= 0.f) {
+		d = 1.f / (1.f + sqrtf(t));
+		ln[4] = (u * d + 0.5f) * width - 0.5f, ln[5] = (v * d + 0.5f) * height - 0.5f;
 		end = 1;
 	}
 
@@ -97,43 +97,43 @@ void ScreenLensDistortionOperation::executePixel(float *outputColor, int x, int
 		{
 			// RG
 			const int dx = ln[2] - ln[0], dy = ln[3] - ln[1];
-			const float dsf = sqrtf((float)dx*dx + dy*dy) + 1.f;
+			const float dsf = sqrtf((float)dx * dx + dy * dy) + 1.f;
 			const int ds = (int)(jit ? ((dsf < 4.f) ? 2.f : sqrtf(dsf)) : dsf);
-			const float sd = 1.f/(float)ds;
+			const float sd = 1.f / (float)ds;
 
-			for (z=0; z<ds; ++z) {
-				const float tz = ((float)z + (jit ? BLI_frand() : 0.5f))*sd;
-				t = 1.f - (kr4 + tz*drg)*(u*u + v*v);
+			for (z = 0; z < ds; ++z) {
+				const float tz = ((float)z + (jit ? BLI_frand() : 0.5f)) * sd;
+				t = 1.f - (kr4 + tz * drg) * (u * u + v * v);
 				d = 1.f / (1.f + sqrtf(t));
-				const float nx = (u*d + 0.5f)*getWidth() - 0.5f;
-				const float ny = (v*d + 0.5f)*getHeight() - 0.5f;
+				const float nx = (u * d + 0.5f) * getWidth() - 0.5f;
+				const float ny = (v * d + 0.5f) * getHeight() - 0.5f;
 				buffer->readCubic(color, nx, ny);
-				tc[0] += (1.f-tz)*color[0], tc[1] += tz*color[1];
+				tc[0] += (1.f - tz) * color[0], tc[1] += tz * color[1];
 				dr++, dg++;
 			}
 		}
 		{
 			// GB
 			const int dx = ln[4] - ln[2], dy = ln[5] - ln[3];
-			const float dsf = sqrtf((float)dx*dx + dy*dy) + 1.f;
+			const float dsf = sqrtf((float)dx * dx + dy * dy) + 1.f;
 			const int ds = (int)(jit ? ((dsf < 4.f) ? 2.f : sqrtf(dsf)) : dsf);
-			const float sd = 1.f/(float)ds;
+			const float sd = 1.f / (float)ds;
 
-			for (z=0; z<ds; ++z) {
-				const float tz = ((float)z + (jit ? BLI_frand() : 0.5f))*sd;
-				t = 1.f - (kg4 + tz*dgb)*(u*u + v*v);
+			for (z = 0; z < ds; ++z) {
+				const float tz = ((float)z + (jit ? BLI_frand() : 0.5f)) * sd;
+				t = 1.f - (kg4 + tz * dgb) * (u * u + v * v);
 				d = 1.f / (1.f + sqrtf(t));
-				const float nx = (u*d + 0.5f)*getWidth() - 0.5f;
-				const float ny = (v*d + 0.5f)*getHeight() - 0.5f;
+				const float nx = (u * d + 0.5f) * getWidth() - 0.5f;
+				const float ny = (v * d + 0.5f) * getHeight() - 0.5f;
 				buffer->readCubic(color, nx, ny);
-				tc[1] += (1.f-tz)*color[1], tc[2] += tz*color[2];
+				tc[1] += (1.f - tz) * color[1], tc[2] += tz * color[2];
 				dg++, db++;
 			}
 
 		}
-		if (dr) outputColor[0] = 2.f*tc[0] / (float)dr;
-		if (dg) outputColor[1] = 2.f*tc[1] / (float)dg;
-		if (db) outputColor[2] = 2.f*tc[2] / (float)db;
+		if (dr) outputColor[0] = 2.f * tc[0] / (float)dr;
+		if (dg) outputColor[1] = 2.f * tc[1] / (float)dg;
+		if (db) outputColor[2] = 2.f * tc[2] / (float)db;
 
 		/* set alpha */
 		outputColor[3] = 1.0f;
@@ -153,12 +153,12 @@ void ScreenLensDistortionOperation::deinitExecution()
 
 void ScreenLensDistortionOperation::determineUV(float result[2], float x, float y) const
 {
-	const float v = sc*((y + 0.5f) - cy)/cy;
-	const float u = sc*((x + 0.5f) - cx)/cx;
-	const float t = ABS(MIN3(kr, kg, kb)*4);
-	float d = 1.f/(1.f + sqrtf(t));
-	result[0] = (u*d + 0.5f)*getWidth() - 0.5f;
-	result[1] = (v*d + 0.5f)*getHeight() - 0.5f;
+	const float v = sc * ((y + 0.5f) - cy) / cy;
+	const float u = sc * ((x + 0.5f) - cx) / cx;
+	const float t = ABS(MIN3(kr, kg, kb) * 4);
+	float d = 1.f / (1.f + sqrtf(t));
+	result[0] = (u * d + 0.5f) * getWidth() - 0.5f;
+	result[1] = (v * d + 0.5f) * getHeight() - 0.5f;
 }
 
 bool ScreenLensDistortionOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
diff --git a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
index d2db55ea214..34656f38a09 100644
--- a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
+++ b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
@@ -28,11 +28,11 @@
 class ScreenLensDistortionOperation : public NodeOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
+	 * Cached reference to the inputProgram
+	 */
 	SocketReader *inputProgram;
 	
-	NodeLensDist * data;
+	NodeLensDist *data;
 	
 	float dispersion;
 	float distortion;
@@ -46,24 +46,24 @@ public:
 	ScreenLensDistortionOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
-	void setData(NodeLensDist *data) {this->data = data;}
-	void setDispertion(float dispersion) {this->dispersion = dispersion;}
-	void setDistortion(float distortion) {this->distortion = distortion;}
+	void setData(NodeLensDist *data) { this->data = data; }
+	void setDispertion(float dispersion) { this->dispersion = dispersion; }
+	void setDistortion(float distortion) { this->distortion = distortion; }
 	
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
 
diff --git a/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp b/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp
index 680e1648ebd..caa1387da2a 100644
--- a/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp
+++ b/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp
@@ -39,7 +39,7 @@ void SeparateChannelOperation::deinitExecution()
 }
 
 
-void SeparateChannelOperation::executePixel(float *color,float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
+void SeparateChannelOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
 {
 	float input[4];
 	this->inputOperation->read(input, x, y, sampler, inputBuffers);
diff --git a/source/blender/compositor/operations/COM_SeparateChannelOperation.h b/source/blender/compositor/operations/COM_SeparateChannelOperation.h
index 3c1eed4bdd9..b1a38fd8294 100644
--- a/source/blender/compositor/operations/COM_SeparateChannelOperation.h
+++ b/source/blender/compositor/operations/COM_SeparateChannelOperation.h
@@ -25,18 +25,18 @@
 
 #include "COM_NodeOperation.h"
 
-class SeparateChannelOperation: public NodeOperation {
+class SeparateChannelOperation : public NodeOperation {
 private:
 	SocketReader *inputOperation;
 	int channel;
 public:
 	SeparateChannelOperation();
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	void initExecution();
 	void deinitExecution();
 	
-	void setChannel(int channel) {this->channel = channel;}
+	void setChannel(int channel) { this->channel = channel; }
 };
 
 #endif
diff --git a/source/blender/compositor/operations/COM_SetAlphaOperation.cpp b/source/blender/compositor/operations/COM_SetAlphaOperation.cpp
index 0aefb075b64..5924108ed86 100644
--- a/source/blender/compositor/operations/COM_SetAlphaOperation.cpp
+++ b/source/blender/compositor/operations/COM_SetAlphaOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_SetAlphaOperation.h"
 
-SetAlphaOperation::SetAlphaOperation(): NodeOperation()
+SetAlphaOperation::SetAlphaOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addInputSocket(COM_DT_VALUE);
diff --git a/source/blender/compositor/operations/COM_SetAlphaOperation.h b/source/blender/compositor/operations/COM_SetAlphaOperation.h
index 3d9caabf880..231b41f1697 100644
--- a/source/blender/compositor/operations/COM_SetAlphaOperation.h
+++ b/source/blender/compositor/operations/COM_SetAlphaOperation.h
@@ -26,9 +26,9 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class SetAlphaOperation : public NodeOperation {
 private:
 	SocketReader *inputColor;
@@ -36,14 +36,14 @@ private:
 
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	SetAlphaOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	void initExecution();
 	void deinitExecution();
diff --git a/source/blender/compositor/operations/COM_SetColorOperation.cpp b/source/blender/compositor/operations/COM_SetColorOperation.cpp
index 50ff2a87a72..5307d7abc24 100644
--- a/source/blender/compositor/operations/COM_SetColorOperation.cpp
+++ b/source/blender/compositor/operations/COM_SetColorOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_SetColorOperation.h"
 
-SetColorOperation::SetColorOperation(): NodeOperation()
+SetColorOperation::SetColorOperation() : NodeOperation()
 {
 	this->addOutputSocket(COM_DT_COLOR);
 }
diff --git a/source/blender/compositor/operations/COM_SetColorOperation.h b/source/blender/compositor/operations/COM_SetColorOperation.h
index dad3cfd7fc9..9d28f1757db 100644
--- a/source/blender/compositor/operations/COM_SetColorOperation.h
+++ b/source/blender/compositor/operations/COM_SetColorOperation.h
@@ -26,9 +26,9 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class SetColorOperation : public NodeOperation {
 private:
 	float channel1;
@@ -38,8 +38,8 @@ private:
 
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	SetColorOperation();
 
 	const float getChannel1() {return this->channel1;}
@@ -53,12 +53,12 @@ public:
 	void setChannels(float value[4]) {this->channel1 = value[0];this->channel2 = value[1];this->channel3 = value[2];this->channel4 = value[3];}
 
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 	void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
-	const bool isSetOperation() const {return true;}
+	const bool isSetOperation() const { return true; }
 
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_SetSamplerOperation.cpp b/source/blender/compositor/operations/COM_SetSamplerOperation.cpp
index 8974554e700..dfe7fe91bf8 100644
--- a/source/blender/compositor/operations/COM_SetSamplerOperation.cpp
+++ b/source/blender/compositor/operations/COM_SetSamplerOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_SetSamplerOperation.h"
 
-SetSamplerOperation::SetSamplerOperation(): NodeOperation()
+SetSamplerOperation::SetSamplerOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addOutputSocket(COM_DT_COLOR);
diff --git a/source/blender/compositor/operations/COM_SetSamplerOperation.h b/source/blender/compositor/operations/COM_SetSamplerOperation.h
index 49bbae7e4ff..5dba0b3703f 100644
--- a/source/blender/compositor/operations/COM_SetSamplerOperation.h
+++ b/source/blender/compositor/operations/COM_SetSamplerOperation.h
@@ -26,25 +26,25 @@
 
 
 /**
-  * this program converts an input colour to an output Sampler.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output Sampler.
+ * it assumes we are in sRGB colour space.
+ */
 class SetSamplerOperation : public NodeOperation {
 private:
 	PixelSampler sampler;
 	SocketReader *reader;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	SetSamplerOperation();
 	
-	void setSampler(PixelSampler sampler) {this->sampler = sampler;}
+	void setSampler(PixelSampler sampler) { this->sampler = sampler; }
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	void initExecution();
 	void deinitExecution();
 };
diff --git a/source/blender/compositor/operations/COM_SetValueOperation.cpp b/source/blender/compositor/operations/COM_SetValueOperation.cpp
index abd4acafea6..483fcc97a1f 100644
--- a/source/blender/compositor/operations/COM_SetValueOperation.cpp
+++ b/source/blender/compositor/operations/COM_SetValueOperation.cpp
@@ -22,7 +22,7 @@
 
 #include "COM_SetValueOperation.h"
 
-SetValueOperation::SetValueOperation(): NodeOperation()
+SetValueOperation::SetValueOperation() : NodeOperation()
 {
 	this->addOutputSocket(COM_DT_VALUE);
 }
diff --git a/source/blender/compositor/operations/COM_SetValueOperation.h b/source/blender/compositor/operations/COM_SetValueOperation.h
index 25810cd7ee5..2f4a6ec0dc8 100644
--- a/source/blender/compositor/operations/COM_SetValueOperation.h
+++ b/source/blender/compositor/operations/COM_SetValueOperation.h
@@ -26,29 +26,29 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class SetValueOperation : public NodeOperation {
 private:
 	float value;
 
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	SetValueOperation();
 	
-	const float getValue() {return this->value;}
-	void setValue(float value) {this->value = value;}
+	const float getValue() { return this->value; }
+	void setValue(float value) { this->value = value; }
 	
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
 	
-	const bool isSetOperation() const {return true;}
+	const bool isSetOperation() const { return true; }
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_SetVectorOperation.cpp b/source/blender/compositor/operations/COM_SetVectorOperation.cpp
index 70477de0514..3d15a184c4e 100644
--- a/source/blender/compositor/operations/COM_SetVectorOperation.cpp
+++ b/source/blender/compositor/operations/COM_SetVectorOperation.cpp
@@ -23,7 +23,7 @@
 #include "COM_SetVectorOperation.h"
 #include "COM_defines.h"
 
-SetVectorOperation::SetVectorOperation(): NodeOperation()
+SetVectorOperation::SetVectorOperation() : NodeOperation()
 {
 	this->addOutputSocket(COM_DT_VECTOR);
 }
@@ -38,12 +38,6 @@ void SetVectorOperation::executePixel(float *outputValue, float x, float y, Pixe
 
 void SetVectorOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
 {
-	if (preferredResolution[0] == 0 ||preferredResolution[1]==0) {
-		resolution[0] = COM_DEFAULT_RESOLUTION_WIDTH;
-		resolution[1] = COM_DEFAULT_RESOLUTION_HEIGHT;
-	}
-	else {
-		resolution[0] = preferredResolution[0];
-		resolution[1] = preferredResolution[1];
-	}
+	resolution[0] = preferredResolution[0];
+	resolution[1] = preferredResolution[1];
 }
diff --git a/source/blender/compositor/operations/COM_SetVectorOperation.h b/source/blender/compositor/operations/COM_SetVectorOperation.h
index 9b5dd3ce674..49088027762 100644
--- a/source/blender/compositor/operations/COM_SetVectorOperation.h
+++ b/source/blender/compositor/operations/COM_SetVectorOperation.h
@@ -26,9 +26,9 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class SetVectorOperation : public NodeOperation {
 private:
 	float x;
@@ -38,26 +38,26 @@ private:
 
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	SetVectorOperation();
 	
-	const float getX() {return this->x;}
-	void setX(float value) {this->x = value;}
-	const float getY() {return this->y;}
-	void setY(float value) {this->y = value;}
-	const float getZ() {return this->z;}
-	void setZ(float value) {this->z = value;}
-	const float getW() {return this->w;}
-	void setW(float value) {this->w = value;}
+	const float getX() { return this->x; }
+	void setX(float value) { this->x = value; }
+	const float getY() { return this->y; }
+	void setY(float value) { this->y = value; }
+	const float getZ() { return this->z; }
+	void setZ(float value) { this->z = value; }
+	const float getW() { return this->w; }
+	void setW(float value) { this->w = value; }
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 	void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
-	const bool isSetOperation() const {return true;}
+	const bool isSetOperation() const { return true; }
 
 	void setVector(float vector[3]) {
 		setX(vector[0]);
diff --git a/source/blender/compositor/operations/COM_SocketProxyOperation.cpp b/source/blender/compositor/operations/COM_SocketProxyOperation.cpp
index 6ed877523d1..55c4b68ee57 100644
--- a/source/blender/compositor/operations/COM_SocketProxyOperation.cpp
+++ b/source/blender/compositor/operations/COM_SocketProxyOperation.cpp
@@ -22,10 +22,10 @@
 
 #include "COM_SocketProxyOperation.h"
 
-SocketProxyOperation::SocketProxyOperation() : NodeOperation()
+SocketProxyOperation::SocketProxyOperation(DataType type) : NodeOperation()
 {
-	this->addInputSocket(COM_DT_COLOR/*|COM_DT_VECTOR|COM_DT_VALUE*/);
-	this->addOutputSocket(COM_DT_COLOR);
+	this->addInputSocket(type);
+	this->addOutputSocket(type);
 	this->inputOperation = NULL;
 }
 
@@ -39,7 +39,9 @@ void SocketProxyOperation::deinitExecution()
 	this->inputOperation = NULL;
 }
 
-void SocketProxyOperation::executePixel(float *color,float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
+void SocketProxyOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
 {
-	this->inputOperation->read(color, x, y, sampler, inputBuffers);
+	if (this->inputOperation) {
+		this->inputOperation->read(color, x, y, sampler, inputBuffers);
+	}
 }
diff --git a/source/blender/compositor/operations/COM_SocketProxyOperation.h b/source/blender/compositor/operations/COM_SocketProxyOperation.h
index a86134c1ea9..5dc8f3d6f8f 100644
--- a/source/blender/compositor/operations/COM_SocketProxyOperation.h
+++ b/source/blender/compositor/operations/COM_SocketProxyOperation.h
@@ -25,12 +25,12 @@
 
 #include "COM_NodeOperation.h"
 
-class SocketProxyOperation: public NodeOperation {
+class SocketProxyOperation : public NodeOperation {
 private:
 	SocketReader *inputOperation;
 public:
-	SocketProxyOperation();
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	SocketProxyOperation(DataType type);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	void initExecution();
 	void deinitExecution();
diff --git a/source/blender/compositor/operations/COM_SplitViewerOperation.cpp b/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
index 4601bebb49f..2735f182406 100644
--- a/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
+++ b/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
@@ -60,7 +60,7 @@ void SplitViewerOperation::deinitExecution()
 }
 
 
-void SplitViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers)
+void SplitViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers)
 {
 	float *buffer = this->outputBuffer;
 	unsigned char *bufferDisplay = this->outputBufferDisplay;
@@ -70,15 +70,15 @@ void SplitViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber, Me
 	int y1 = rect->ymin;
 	int x2 = rect->xmax;
 	int y2 = rect->ymax;
-	int offset = (y1*this->getWidth() + x1 ) * 4;
+	int offset = (y1 * this->getWidth() + x1) * 4;
 	int x;
 	int y;
-	int perc = xSplit?this->splitPercentage*getWidth()/100.0f:this->splitPercentage*getHeight()/100.0f;
-	for (y = y1 ; y < y2 ; y++) {
-		for (x = x1 ; x < x2 ; x++) {
+	int perc = xSplit ? this->splitPercentage *getWidth() / 100.0f : this->splitPercentage *getHeight() / 100.0f;
+	for (y = y1; y < y2; y++) {
+		for (x = x1; x < x2; x++) {
 			bool image1;
 			float srgb[4];
-			image1 = xSplit?x>perc:y>perc;
+			image1 = xSplit ? x > perc : y > perc;
 			if (image1) {
 				image1Input->read(&(buffer[offset]), x, y, COM_PS_NEAREST, memoryBuffers);
 			}
@@ -88,21 +88,21 @@ void SplitViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber, Me
 			/// @todo: linear conversion only when scene color management is selected, also check predivide.
 			if (this->doColorManagement) {
 				if (this->doColorPredivide) {
-					linearrgb_to_srgb_predivide_v4(srgb, buffer+offset);
+					linearrgb_to_srgb_predivide_v4(srgb, buffer + offset);
 				}
 				else {
-					linearrgb_to_srgb_v4(srgb, buffer+offset);
+					linearrgb_to_srgb_v4(srgb, buffer + offset);
 				}
 			}
 			else {
-				copy_v4_v4(srgb, buffer+offset);
+				copy_v4_v4(srgb, buffer + offset);
 			}
 	
-			F4TOCHAR4(srgb, bufferDisplay+offset);
+			rgba_float_to_uchar(bufferDisplay + offset, srgb);
 	
-			offset +=4;
+			offset += 4;
 		}
-		offset += (this->getWidth()-(x2-x1))*4;
+		offset += (this->getWidth() - (x2 - x1)) * 4;
 	}
 	updateImage(rect);
 }
diff --git a/source/blender/compositor/operations/COM_SplitViewerOperation.h b/source/blender/compositor/operations/COM_SplitViewerOperation.h
index 2c3163f0b0a..aba63ff190b 100644
--- a/source/blender/compositor/operations/COM_SplitViewerOperation.h
+++ b/source/blender/compositor/operations/COM_SplitViewerOperation.h
@@ -35,10 +35,10 @@ private:
 	bool xSplit;
 public:
 	SplitViewerOperation();
-	void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers);
+	void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers);
 	void initExecution();
 	void deinitExecution();
-	void setSplitPercentage(float splitPercentage) {this->splitPercentage = splitPercentage;}
-	void setXSplit(bool xsplit) {this->xSplit = xsplit;}
+	void setSplitPercentage(float splitPercentage) { this->splitPercentage = splitPercentage; }
+	void setXSplit(bool xsplit) { this->xSplit = xsplit; }
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_TextureOperation.cpp b/source/blender/compositor/operations/COM_TextureOperation.cpp
index 0d85f71c691..072528f3fc6 100644
--- a/source/blender/compositor/operations/COM_TextureOperation.cpp
+++ b/source/blender/compositor/operations/COM_TextureOperation.cpp
@@ -25,10 +25,10 @@
 #include "BLI_listbase.h"
 #include "DNA_scene_types.h"
 
-TextureBaseOperation::TextureBaseOperation(): NodeOperation()
+TextureBaseOperation::TextureBaseOperation() : NodeOperation()
 {
-	this->addInputSocket(COM_DT_VECTOR);//offset
-	this->addInputSocket(COM_DT_VECTOR);//size
+	this->addInputSocket(COM_DT_VECTOR); //offset
+	this->addInputSocket(COM_DT_VECTOR); //size
 	this->texture = NULL;
 	this->inputSize = NULL;
 	this->inputOffset = NULL;
@@ -57,8 +57,8 @@ void TextureBaseOperation::deinitExecution()
 void TextureBaseOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
 {
 	if (preferredResolution[0] == 0 || preferredResolution[1] == 0) {
-		int width = this->scene->r.xsch*this->scene->r.size/100;
-		int height = this->scene->r.ysch*this->scene->r.size/100;
+		int width = this->scene->r.xsch * this->scene->r.size / 100;
+		int height = this->scene->r.ysch * this->scene->r.size / 100;
 		resolution[0] = width;
 		resolution[1] = height;
 	}
@@ -79,22 +79,22 @@ void TextureAlphaOperation::executePixel(float *color, float x, float y, PixelSa
 
 void TextureBaseOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
 {
-	TexResult texres= {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, NULL};
+	TexResult texres = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, NULL};
 	float textureSize[4];
 	float textureOffset[4];
 	float vec[3];
 	int retval;
-	const float cx = this->getWidth()/2;
-	const float cy = this->getHeight()/2;
-	const float u = (cx-x)/this->getWidth()*2;
-	const float v = (cy-y)/this->getHeight()*2;
+	const float cx = this->getWidth() / 2;
+	const float cy = this->getHeight() / 2;
+	const float u = (cx - x) / this->getWidth() * 2;
+	const float v = (cy - y) / this->getHeight() * 2;
 
 	this->inputSize->read(textureSize, x, y, sampler, inputBuffers);
 	this->inputOffset->read(textureOffset, x, y, sampler, inputBuffers);
 
-	vec[0] = textureSize[0]*(u + textureOffset[0]);
-	vec[1] = textureSize[1]*(v + textureOffset[1]);
-	vec[2] = textureSize[2]*textureOffset[2];
+	vec[0] = textureSize[0] * (u + textureOffset[0]);
+	vec[1] = textureSize[1] * (v + textureOffset[1]);
+	vec[2] = textureSize[2] * textureOffset[2];
 
 	retval = multitex_ext(this->texture, vec, NULL, NULL, 0, &texres);
 
diff --git a/source/blender/compositor/operations/COM_TextureOperation.h b/source/blender/compositor/operations/COM_TextureOperation.h
index de42b144730..e862a1f1910 100644
--- a/source/blender/compositor/operations/COM_TextureOperation.h
+++ b/source/blender/compositor/operations/COM_TextureOperation.h
@@ -36,10 +36,10 @@ extern "C" {
 }
 
 /**
-  * Base class for all renderlayeroperations
-  *
-  * @todo: rename to operation.
-  */
+ * Base class for all renderlayeroperations
+ *
+ * @todo: rename to operation.
+ */
 class TextureBaseOperation : public NodeOperation {
 private:
 	Tex *texture;
@@ -50,33 +50,33 @@ private:
 protected:
 
 	/**
-	  * Determine the output resolution. The resolution is retrieved from the Renderer
-	  */
+	 * Determine the output resolution. The resolution is retrieved from the Renderer
+	 */
 	void determineResolution(unsigned int resolution[], unsigned int preferredResolution[]);
 	
 	/**
-	  * Constructor
-	  */
+	 * Constructor
+	 */
 	TextureBaseOperation();
 
 public:
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
-	void setTexture(Tex *texture) {this->texture = texture;}
+	void setTexture(Tex *texture) { this->texture = texture; }
 	void initExecution();
 	void deinitExecution();
-	void setScene(const Scene *scene) {this->scene = scene;}
+	void setScene(const Scene *scene) { this->scene = scene; }
 };
 
-class TextureOperation:public TextureBaseOperation {
+class TextureOperation : public TextureBaseOperation {
 public:
 	TextureOperation();
 
 };
-class TextureAlphaOperation:public TextureBaseOperation {
+class TextureAlphaOperation : public TextureBaseOperation {
 public:
 	TextureAlphaOperation();
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 };
 
diff --git a/source/blender/compositor/operations/COM_TonemapOperation.cpp b/source/blender/compositor/operations/COM_TonemapOperation.cpp
index 56830f4970d..7b978e0f87c 100644
--- a/source/blender/compositor/operations/COM_TonemapOperation.cpp
+++ b/source/blender/compositor/operations/COM_TonemapOperation.cpp
@@ -26,7 +26,7 @@
 
 
 
-TonemapOperation::TonemapOperation(): NodeOperation()
+TonemapOperation::TonemapOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR, COM_SC_NO_RESIZE);
 	this->addOutputSocket(COM_DT_COLOR);
@@ -41,63 +41,55 @@ void TonemapOperation::initExecution()
 	NodeOperation::initMutex();
 }
 
-void TonemapOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data)
+void TonemapOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
 {
-	AvgLogLum * avg = (AvgLogLum*)data;
+	AvgLogLum *avg = (AvgLogLum *)data;
 
 	float output[4];
 	this->imageReader->read(output, x, y, inputBuffers, NULL);
-	output[0] *= avg->al;
-	output[1] *= avg->al;
-	output[2] *= avg->al;
+	mul_v3_fl(output, avg->al);
 	float dr = output[0] + this->data->offset;
 	float dg = output[1] + this->data->offset;
 	float db = output[2] + this->data->offset;
-	output[0] /= ((dr == 0.f) ? 1.f : dr);
-	output[1] /= ((dg == 0.f) ? 1.f : dg);
-	output[2] /= ((db == 0.f) ? 1.f : db);
+	output[0] /= ((dr == 0.f) ? 1.0f : dr);
+	output[1] /= ((dg == 0.f) ? 1.0f : dg);
+	output[2] /= ((db == 0.f) ? 1.0f : db);
 	const float igm = avg->igm;
-	if (igm != 0.f) {
-		output[0] = pow((double)MAX2(output[0], 0.), (double)igm);
-		output[1] = pow((double)MAX2(output[1], 0.), (double)igm);
-		output[2] = pow((double)MAX2(output[2], 0.), (double)igm);
+	if (igm != 0.0f) {
+		output[0] = powf(MAX2(output[0], 0.0f), igm);
+		output[1] = powf(MAX2(output[1], 0.0f), igm);
+		output[2] = powf(MAX2(output[2], 0.0f), igm);
 	}
 
-	color[0] = output[0];
-	color[1] = output[1];
-	color[2] = output[2];
-	color[3] = output[3];
+	copy_v4_v4(color, output);
 }
-void PhotoreceptorTonemapOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data)
+void PhotoreceptorTonemapOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
 {
-	AvgLogLum * avg = (AvgLogLum*)data;
+	AvgLogLum *avg = (AvgLogLum *)data;
 	NodeTonemap *ntm = this->data;
 
-	const float f = exp((double)-this->data->f);
-	const float m = (ntm->m > 0.f) ? ntm->m : (0.3f + 0.7f*pow((double)avg->auto_key, 1.4));
-	const float ic = 1.f - ntm->c, ia = 1.f - ntm->a;
+	const float f = expf(-this->data->f);
+	const float m = (ntm->m > 0.0f) ? ntm->m : (0.3f + 0.7f * powf(avg->auto_key, 1.4f));
+	const float ic = 1.0f - ntm->c, ia = 1.0f - ntm->a;
 
 	float output[4];
 	this->imageReader->read(output, x, y, inputBuffers, NULL);
 
-	const float L = 0.212671f*output[0] + 0.71516f*output[1] + 0.072169f*output[2];
-	float I_l = output[0] + ic*(L - output[0]);
-	float I_g = avg->cav[0] + ic*(avg->lav - avg->cav[0]);
-	float I_a = I_l + ia*(I_g - I_l);
-	output[0] /= (output[0] + pow((double)f*I_a, (double)m));
-	I_l = output[1] + ic*(L - output[1]);
-	I_g = avg->cav[1] + ic*(avg->lav - avg->cav[1]);
-	I_a = I_l + ia*(I_g - I_l);
-	output[1] /= (output[1] + pow((double)f*I_a,(double)m));
-	I_l = output[2] + ic*(L - output[2]);
-	I_g = avg->cav[2] + ic*(avg->lav - avg->cav[2]);
-	I_a = I_l + ia*(I_g - I_l);
-	output[2] /= (output[2] + pow((double)f*I_a, (double)m));
-
-	color[0] = output[0];
-	color[1] = output[1];
-	color[2] = output[2];
-	color[3] = output[3];
+	const float L = rgb_to_luma_y(output);
+	float I_l = output[0] + ic * (L - output[0]);
+	float I_g = avg->cav[0] + ic * (avg->lav - avg->cav[0]);
+	float I_a = I_l + ia * (I_g - I_l);
+	output[0] /= (output[0] + powf(f * I_a, m));
+	I_l = output[1] + ic * (L - output[1]);
+	I_g = avg->cav[1] + ic * (avg->lav - avg->cav[1]);
+	I_a = I_l + ia * (I_g - I_l);
+	output[1] /= (output[1] + powf(f * I_a, m));
+	I_l = output[2] + ic * (L - output[2]);
+	I_g = avg->cav[2] + ic * (avg->lav - avg->cav[2]);
+	I_a = I_l + ia * (I_g - I_l);
+	output[2] /= (output[2] + powf(f * I_a, m));
+
+	copy_v4_v4(color, output);
 }
 
 void TonemapOperation::deinitExecution()
@@ -126,46 +118,43 @@ bool TonemapOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferO
 
 void *TonemapOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
 {
-	BLI_mutex_lock(getMutex());
+	lockMutex();
 	if (this->cachedInstance == NULL) {
-		MemoryBuffer *tile = (MemoryBuffer*)imageReader->initializeTileData(rect, memoryBuffers);
+		MemoryBuffer *tile = (MemoryBuffer *)imageReader->initializeTileData(rect, memoryBuffers);
 		AvgLogLum *data = new AvgLogLum();
 
-		float * buffer = tile->getBuffer();
+		float *buffer = tile->getBuffer();
 
-		float lsum = 0;
+		float lsum = 0.0f;
 		int p = tile->getWidth() * tile->getHeight();
 		float *bc = buffer;
 		float avl, maxl = -1e10f, minl = 1e10f;
-		const float sc = 1.f/(p);
+		const float sc = 1.0f / p;
 		float Lav = 0.f;
-		float cav[4] = {0.0f,0.0f,0.0f,0.0f};
+		float cav[4] = {0.0f, 0.0f, 0.0f, 0.0f};
 		while (p--) {
-			float L = 0.212671f*bc[0] + 0.71516f*bc[1] + 0.072169f*bc[2];
+			float L = rgb_to_luma_y(bc);
 			Lav += L;
-			cav[0] += bc[0];
-			cav[1] += bc[1];
-			cav[2] += bc[2];
-			lsum += (float)log((double)MAX2(L, 0.0) + 1e-5);
+			add_v3_v3(cav, bc);
+			lsum += logf(MAX2(L, 0.0f) + 1e-5f);
 			maxl = (L > maxl) ? L : maxl;
 			minl = (L < minl) ? L : minl;
-			bc+=4;
+			bc += 4;
 		}
 		data->lav = Lav * sc;
-		data->cav[0] = cav[0]*sc;
-		data->cav[1] = cav[1]*sc;
-		data->cav[2] = cav[2]*sc;
-		maxl = log((double)maxl + 1e-5); minl = log((double)minl + 1e-5f); avl = lsum*sc;
+		mul_v3_v3fl(data->cav, cav, sc);
+		maxl = log((double)maxl + 1e-5); minl = log((double)minl + 1e-5); avl = lsum * sc;
 		data->auto_key = (maxl > minl) ? ((maxl - avl) / (maxl - minl)) : 1.f;
 		float al = exp((double)avl);
 		data->al = (al == 0.f) ? 0.f : (this->data->key / al);
-		data->igm = (this->data->gamma==0.f) ? 1 : (1.f / this->data->gamma);
+		data->igm = (this->data->gamma == 0.f) ? 1 : (1.f / this->data->gamma);
 		this->cachedInstance = data;
 	}
-	BLI_mutex_unlock(getMutex());
+	unlockMutex();
 	return this->cachedInstance;
 }
 
 void TonemapOperation::deinitializeTileData(rcti *rect, MemoryBuffer **memoryBuffers, void *data)
 {
+	/* pass */
 }
diff --git a/source/blender/compositor/operations/COM_TonemapOperation.h b/source/blender/compositor/operations/COM_TonemapOperation.h
index e7ea4f039f2..005f0862443 100644
--- a/source/blender/compositor/operations/COM_TonemapOperation.h
+++ b/source/blender/compositor/operations/COM_TonemapOperation.h
@@ -26,9 +26,9 @@
 #include "DNA_node_types.h"
 
 /**
-  * @brief temporarily storage during execution of Tonemap
-  * @ingroup operation
-  */
+ * @brief temporarily storage during execution of Tonemap
+ * @ingroup operation
+ */
 typedef struct AvgLogLum {
 	float al;
 	float auto_key;
@@ -38,48 +38,48 @@ typedef struct AvgLogLum {
 } AvgLogLum;
 
 /**
-  * @brief base class of tonemap, implementing the simple tonemap
-  * @ingroup operation
-  */
+ * @brief base class of tonemap, implementing the simple tonemap
+ * @ingroup operation
+ */
 class TonemapOperation : public NodeOperation {
 protected:
 	/**
-	  * @brief Cached reference to the reader
-	  */
-	SocketReader * imageReader;
+	 * @brief Cached reference to the reader
+	 */
+	SocketReader *imageReader;
 	
 	/**
-	  * @brief settings of the Tonemap
-	  */
-	NodeTonemap * data;
+	 * @brief settings of the Tonemap
+	 */
+	NodeTonemap *data;
 	
 	/**
-	  * @brief temporarily cache of the execution storage
-	  */
-	AvgLogLum * cachedInstance;
+	 * @brief temporarily cache of the execution storage
+	 */
+	AvgLogLum *cachedInstance;
 
 public:
 	TonemapOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
 	void deinitializeTileData(rcti *rect, MemoryBuffer **memoryBuffers, void *data);
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
-	void setData(NodeTonemap *data) {this->data = data;}
+	void setData(NodeTonemap *data) { this->data = data; }
 	
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
 
@@ -87,17 +87,17 @@ public:
 };
 
 /**
-  * @brief class of tonemap, implementing the photoreceptor tonemap
-  * most parts have already been done in TonemapOperation
-  * @ingroup operation
-  */
+ * @brief class of tonemap, implementing the photoreceptor tonemap
+ * most parts have already been done in TonemapOperation
+ * @ingroup operation
+ */
 
 class PhotoreceptorTonemapOperation : public TonemapOperation {
 public:
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
 };
 
 #endif
diff --git a/source/blender/compositor/operations/COM_TranslateOperation.cpp b/source/blender/compositor/operations/COM_TranslateOperation.cpp
index 6d2fdfc11d0..c41e2c7f156 100644
--- a/source/blender/compositor/operations/COM_TranslateOperation.cpp
+++ b/source/blender/compositor/operations/COM_TranslateOperation.cpp
@@ -32,6 +32,7 @@ TranslateOperation::TranslateOperation() : NodeOperation()
 	this->inputOperation = NULL;
 	this->inputXOperation = NULL;
 	this->inputYOperation = NULL;
+	this->isDeltaSet = false;
 }
 void TranslateOperation::initExecution()
 {
@@ -39,11 +40,6 @@ void TranslateOperation::initExecution()
 	this->inputXOperation = this->getInputSocketReader(1);
 	this->inputYOperation = this->getInputSocketReader(2);
 
-	float tempDelta[4];
-	this->inputXOperation->read(tempDelta, 0, 0, COM_PS_NEAREST, NULL);
-	this->deltaX = tempDelta[0];
-	this->inputYOperation->read(tempDelta, 0, 0, COM_PS_NEAREST, NULL);
-	this->deltaY = tempDelta[0];
 }
 
 void TranslateOperation::deinitExecution()
@@ -54,13 +50,15 @@ void TranslateOperation::deinitExecution()
 }
 
 
-void TranslateOperation::executePixel(float *color,float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
+void TranslateOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
 {
-	this->inputOperation->read(color, x-this->getDeltaX(), y-this->getDeltaY(), sampler, inputBuffers);
+	ensureDelta();
+	this->inputOperation->read(color, x - this->getDeltaX(), y - this->getDeltaY(), sampler, inputBuffers);
 }
 
 bool TranslateOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
 {
+	ensureDelta();
 	rcti newInput;
 	
 	newInput.xmax = input->xmax - this->getDeltaX();
diff --git a/source/blender/compositor/operations/COM_TranslateOperation.h b/source/blender/compositor/operations/COM_TranslateOperation.h
index eab3391041e..bf3121bec11 100644
--- a/source/blender/compositor/operations/COM_TranslateOperation.h
+++ b/source/blender/compositor/operations/COM_TranslateOperation.h
@@ -25,23 +25,35 @@
 
 #include "COM_NodeOperation.h"
 
-class TranslateOperation: public NodeOperation {
+class TranslateOperation : public NodeOperation {
 private:
 	SocketReader *inputOperation;
-	SocketReader*inputXOperation;
-	SocketReader*inputYOperation;
+	SocketReader *inputXOperation;
+	SocketReader *inputYOperation;
 	float deltaX;
 	float deltaY;
+	bool isDeltaSet;
 public:
 	TranslateOperation();
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 
 	void initExecution();
 	void deinitExecution();
 
-	float getDeltaX() {return this->deltaX;}
-	float getDeltaY() {return this->deltaY;}
+	float getDeltaX() { return this->deltaX; }
+	float getDeltaY() { return this->deltaY; }
+	
+	inline void ensureDelta() {
+		if (!isDeltaSet) {
+			float tempDelta[4];
+			this->inputXOperation->read(tempDelta, 0, 0, COM_PS_NEAREST, NULL);
+			this->deltaX = tempDelta[0];
+			this->inputYOperation->read(tempDelta, 0, 0, COM_PS_NEAREST, NULL);
+			this->deltaY = tempDelta[0];
+			this->isDeltaSet = true;
+		}
+	}
 };
 
 #endif
diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
index f14de097dfd..b3cc5ece3b8 100644
--- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
@@ -53,17 +53,11 @@ void VariableSizeBokehBlurOperation::initExecution()
 
 void VariableSizeBokehBlurOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
 {
-	float tempColor[4];
 	float readColor[4];
 	float bokeh[4];
-	tempColor[0] = 0;
-	tempColor[1] = 0;
-	tempColor[2] = 0;
-	tempColor[3] = 0;
 	float tempSize[4];
-	float overallmultiplyerr = 0;
-	float overallmultiplyerg = 0;
-	float overallmultiplyerb = 0;
+	float multiplier_accum[4] = {0.0f, 0.0f, 0.0f, 0.0f};
+	float color_accum[4]      = {0.0f, 0.0f, 0.0f, 0.0f};
 
 	int miny = y - maxBlur;
 	int maxy = y + maxBlur;
@@ -71,43 +65,40 @@ void VariableSizeBokehBlurOperation::executePixel(float *color, int x, int y, Me
 	int maxx = x + maxBlur;
 	{
 		inputProgram->read(readColor, x, y, COM_PS_NEAREST, inputBuffers);
-		tempColor[0] += readColor[0];
-		tempColor[1] += readColor[1];
-		tempColor[2] += readColor[2];
-		overallmultiplyerr += 1;
-		overallmultiplyerg += 1;
-		overallmultiplyerb += 1;
+		color_accum[0] += readColor[0];
+		color_accum[1] += readColor[1];
+		color_accum[2] += readColor[2];
+		color_accum[3] += readColor[3];
+		add_v4_v4(color_accum, readColor);
+		add_v3_fl(multiplier_accum, 1.0f);
 		
-		for (int ny = miny ; ny < maxy ; ny += QualityStepHelper::getStep()) {
-			for (int nx = minx ; nx < maxx ; nx += QualityStepHelper::getStep()) {
-				if (nx >=0 && nx < this->getWidth() && ny >= 0 && ny < getHeight()) {
+		for (int ny = miny; ny < maxy; ny += QualityStepHelper::getStep()) {
+			for (int nx = minx; nx < maxx; nx += QualityStepHelper::getStep()) {
+				if (nx >= 0 && nx < this->getWidth() && ny >= 0 && ny < getHeight()) {
 					inputSizeProgram->read(tempSize, nx, ny, COM_PS_NEAREST, inputBuffers);
 					float size = tempSize[0];
-					size += this->threshold;
+//					size += this->threshold;
 					float dx = nx - x;
 					float dy = ny - y;
 					if (nx == x && ny == y) {
 						/* pass */
 					}
-					else if (size>=  fabs(dx) && size >= fabs(dy)) {
-						float u = 256 + dx*256/size;
-						float v = 256 + dy*256/size;
+					else if (size >= fabsf(dx) && size >= fabsf(dy)) {
+						float u = 256 + dx * 256 / size;
+						float v = 256 + dy * 256 / size;
 						inputBokehProgram->read(bokeh, u, v, COM_PS_NEAREST, inputBuffers);
 						inputProgram->read(readColor, nx, ny, COM_PS_NEAREST, inputBuffers);
-						tempColor[0] += bokeh[0] * readColor[0];
-						tempColor[1] += bokeh[1] * readColor[1];
-						tempColor[2] += bokeh[2]* readColor[2];
-						overallmultiplyerr += bokeh[0];
-						overallmultiplyerg += bokeh[1];
-						overallmultiplyerb += bokeh[2];
+						madd_v4_v4v4(color_accum, bokeh, readColor);
+						add_v4_v4(multiplier_accum, bokeh);
 					}
 				}
 			}
 		}
-		color[0] = tempColor[0]*(1.0/overallmultiplyerr);
-		color[1] = tempColor[1]*(1.0/overallmultiplyerg);
-		color[2] = tempColor[2]*(1.0/overallmultiplyerb);
-		color[3] = 1.0f;
+
+		color[0] = color_accum[0] * (1.0f / multiplier_accum[0]);
+		color[1] = color_accum[1] * (1.0f / multiplier_accum[1]);
+		color[2] = color_accum[2] * (1.0f / multiplier_accum[2]);
+		color[3] = color_accum[3] * (1.0f / multiplier_accum[3]);
 	}
 
 }
@@ -124,10 +115,10 @@ bool VariableSizeBokehBlurOperation::determineDependingAreaOfInterest(rcti *inpu
 	rcti newInput;
 	rcti bokehInput;
 
-	newInput.xmax = input->xmax + maxBlur+2;
-	newInput.xmin = input->xmin - maxBlur+2;
-	newInput.ymax = input->ymax + maxBlur-2;
-	newInput.ymin = input->ymin - maxBlur-2;
+	newInput.xmax = input->xmax + maxBlur + 2;
+	newInput.xmin = input->xmin - maxBlur + 2;
+	newInput.ymax = input->ymax + maxBlur - 2;
+	newInput.ymin = input->ymin - maxBlur - 2;
 	bokehInput.xmax = 512;
 	bokehInput.xmin = 0;
 	bokehInput.ymax = 512;
diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
index 9c2c4b4bf68..ede8f0333b4 100644
--- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
+++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
@@ -37,25 +37,25 @@ public:
 	VariableSizeBokehBlurOperation();
 
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 	
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
 	
-	void setMaxBlur(int maxRadius) {this->maxBlur = maxRadius;}
-	
-	void setThreshold(float threshold) {this->threshold = threshold;}
+	void setMaxBlur(int maxRadius) { this->maxBlur = maxRadius; }
+
+	void setThreshold(float threshold) { this->threshold = threshold; }
 
 
 };
diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
index e6305dc26a2..3efae2c4e3d 100644
--- a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
@@ -28,7 +28,7 @@ extern "C" {
 	#include "RE_pipeline.h"
 }
 
-VectorBlurOperation::VectorBlurOperation(): NodeOperation()
+VectorBlurOperation::VectorBlurOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addInputSocket(COM_DT_VALUE); // ZBUF
@@ -54,12 +54,12 @@ void VectorBlurOperation::initExecution()
 
 void VectorBlurOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
 {
-	float *buffer = (float*) data;
-	int index = (y*this->getWidth() + x) * COM_NUMBER_OF_CHANNELS;
+	float *buffer = (float *) data;
+	int index = (y * this->getWidth() + x) * COM_NUMBER_OF_CHANNELS;
 	color[0] = buffer[index];
-	color[1] = buffer[index+1];
-	color[2] = buffer[index+2];
-	color[3] = buffer[index+3];
+	color[1] = buffer[index + 1];
+	color[2] = buffer[index + 2];
+	color[3] = buffer[index + 3];
 }
 
 void VectorBlurOperation::deinitExecution()
@@ -77,17 +77,17 @@ void *VectorBlurOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryB
 {
 	if (this->cachedInstance) return this->cachedInstance;
 	
-	BLI_mutex_lock(getMutex());
+	lockMutex();
 	if (this->cachedInstance == NULL) {
-		MemoryBuffer *tile = (MemoryBuffer*)inputImageProgram->initializeTileData(rect, memoryBuffers);
-		MemoryBuffer *speed = (MemoryBuffer*)inputSpeedProgram->initializeTileData(rect, memoryBuffers);
-		MemoryBuffer *z = (MemoryBuffer*)inputZProgram->initializeTileData(rect, memoryBuffers);
-		float *data = new float[this->getWidth()*this->getHeight()*COM_NUMBER_OF_CHANNELS];
-		memcpy(data, tile->getBuffer(),this->getWidth()*this->getHeight()*COM_NUMBER_OF_CHANNELS*sizeof(float));
+		MemoryBuffer *tile = (MemoryBuffer *)inputImageProgram->initializeTileData(rect, memoryBuffers);
+		MemoryBuffer *speed = (MemoryBuffer *)inputSpeedProgram->initializeTileData(rect, memoryBuffers);
+		MemoryBuffer *z = (MemoryBuffer *)inputZProgram->initializeTileData(rect, memoryBuffers);
+		float *data = new float[this->getWidth() * this->getHeight() * COM_NUMBER_OF_CHANNELS];
+		memcpy(data, tile->getBuffer(), this->getWidth() * this->getHeight() * COM_NUMBER_OF_CHANNELS * sizeof(float));
 		this->generateVectorBlur(data, tile, speed, z);
 		this->cachedInstance = data;
 	}
-	BLI_mutex_unlock(getMutex());
+	unlockMutex();
 	return this->cachedInstance;
 }
 
@@ -110,7 +110,7 @@ void VectorBlurOperation::generateVectorBlur(float *data, MemoryBuffer *inputIma
 {
 	float *zbuf = inputZ->convertToValueBuffer();
 	NodeBlurData blurdata;
-	blurdata.samples = this->settings->samples/QualityStepHelper::getStep();
+	blurdata.samples = this->settings->samples / QualityStepHelper::getStep();
 	blurdata.maxspeed = this->settings->maxspeed;
 	blurdata.minspeed = this->settings->minspeed;
 	blurdata.curved = this->settings->curved;
diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.h b/source/blender/compositor/operations/COM_VectorBlurOperation.h
index 2c45628726d..30821cdd8b2 100644
--- a/source/blender/compositor/operations/COM_VectorBlurOperation.h
+++ b/source/blender/compositor/operations/COM_VectorBlurOperation.h
@@ -29,16 +29,16 @@
 class VectorBlurOperation : public NodeOperation, public QualityStepHelper {
 private:
 	/**
-	  * @brief Cached reference to the inputProgram
-	  */
-	SocketReader * inputImageProgram;
-	SocketReader * inputSpeedProgram;
-	SocketReader * inputZProgram;
+	 * @brief Cached reference to the inputProgram
+	 */
+	SocketReader *inputImageProgram;
+	SocketReader *inputSpeedProgram;
+	SocketReader *inputZProgram;
 	
 	/**
-	  * @brief settings of the glare node.
-	  */
-	NodeBlurData * settings;
+	 * @brief settings of the glare node.
+	 */
+	NodeBlurData *settings;
 	
 	float *cachedInstance;
 
@@ -46,23 +46,23 @@ public:
 	VectorBlurOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, int x, int y, MemoryBuffer * inputBuffers[], void *data);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 
 	void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
 
-	void setVectorBlurSettings(NodeBlurData * settings) {this->settings = settings;}
+	void setVectorBlurSettings(NodeBlurData *settings) { this->settings = settings; }
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
 protected:
 	
diff --git a/source/blender/compositor/operations/COM_VectorCurveOperation.cpp b/source/blender/compositor/operations/COM_VectorCurveOperation.cpp
index e9045b126e2..3173599ece6 100644
--- a/source/blender/compositor/operations/COM_VectorCurveOperation.cpp
+++ b/source/blender/compositor/operations/COM_VectorCurveOperation.cpp
@@ -30,7 +30,7 @@ extern "C" {
 }
 #endif
 
-VectorCurveOperation::VectorCurveOperation(): CurveBaseOperation()
+VectorCurveOperation::VectorCurveOperation() : CurveBaseOperation()
 {
 	this->addInputSocket(COM_DT_VECTOR);
 	this->addOutputSocket(COM_DT_VECTOR);
diff --git a/source/blender/compositor/operations/COM_VectorCurveOperation.h b/source/blender/compositor/operations/COM_VectorCurveOperation.h
index 759e265220f..41faee7acf6 100644
--- a/source/blender/compositor/operations/COM_VectorCurveOperation.h
+++ b/source/blender/compositor/operations/COM_VectorCurveOperation.h
@@ -28,25 +28,25 @@
 class VectorCurveOperation : public CurveBaseOperation {
 private:
 	/**
-	  * Cached reference to the inputProgram
-	  */
-	SocketReader * inputProgram;
+	 * Cached reference to the inputProgram
+	 */
+	SocketReader *inputProgram;
 public:
 	VectorCurveOperation();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *Vector, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *Vector, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 	
 	/**
-	  * Initialize the execution
-	  */
+	 * Initialize the execution
+	 */
 	void initExecution();
 	
 	/**
-	  * Deinitialize the execution
-	  */
+	 * Deinitialize the execution
+	 */
 	void deinitExecution();
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp b/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
index 44b4c26fb64..a8aa84e84f9 100644
--- a/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
+++ b/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
@@ -50,8 +50,9 @@ ViewerBaseOperation::ViewerBaseOperation() : NodeOperation()
 
 void ViewerBaseOperation::initExecution()
 {
-	// When initializing the tree during initial load the width and height can be zero.
-	initImage();
+	if (isActiveViewerOutput()) {
+		initImage();
+	}
 }
 
 void ViewerBaseOperation::initImage()
@@ -73,14 +74,13 @@ void ViewerBaseOperation::initImage()
 	
 	/* now we combine the input with ibuf */
 	this->outputBuffer = ibuf->rect_float;
-	this->outputBufferDisplay = (unsigned char*)ibuf->rect;
+	this->outputBufferDisplay = (unsigned char *)ibuf->rect;
 	
 	BKE_image_release_ibuf(this->image, this->lock);
 }
 void ViewerBaseOperation:: updateImage(rcti *rect)
 {
-	/// @todo: introduce new event to update smaller area
-	WM_main_add_notifier(NC_WINDOW|ND_DRAW, NULL);
+	WM_main_add_notifier(NC_WINDOW | ND_DRAW, NULL);
 }
 
 void ViewerBaseOperation::deinitExecution()
@@ -88,12 +88,12 @@ void ViewerBaseOperation::deinitExecution()
 	this->outputBuffer = NULL;
 }
 
-const int ViewerBaseOperation::getRenderPriority() const
+const CompositorPriority ViewerBaseOperation::getRenderPriority() const
 {
 	if (this->isActiveViewerOutput()) {
-		return 8;
+		return COM_PRIORITY_HIGH;
 	}
 	else {
-		return 0;
+		return COM_PRIORITY_LOW;
 	}
 }
diff --git a/source/blender/compositor/operations/COM_ViewerBaseOperation.h b/source/blender/compositor/operations/COM_ViewerBaseOperation.h
index 58101911550..2aaa7d20966 100644
--- a/source/blender/compositor/operations/COM_ViewerBaseOperation.h
+++ b/source/blender/compositor/operations/COM_ViewerBaseOperation.h
@@ -30,11 +30,10 @@ class ViewerBaseOperation : public NodeOperation {
 protected:
 	float *outputBuffer;
 	unsigned char *outputBufferDisplay;
-	Image * image;
-	ImageUser * imageUser;
+	Image *image;
+	ImageUser *imageUser;
 	void *lock;
 	bool active;
-	const bNodeTree *tree;
 	float centerX;
 	float centerY;
 	OrderOfChunks chunkOrder;
@@ -42,28 +41,27 @@ protected:
 	bool doColorPredivide;
 
 public:
-	bool isOutputOperation(bool rendering) const {return true;}
+	bool isOutputOperation(bool rendering) const { return isActiveViewerOutput(); }
 	void initExecution();
 	void deinitExecution();
-	void setImage(Image *image) {this->image = image;}
-	void setImageUser(ImageUser *imageUser) {this->imageUser = imageUser;}
-	const bool isActiveViewerOutput() const {return active;}
-	void setActive(bool active) {this->active = active;}
-	void setbNodeTree(const bNodeTree *tree) {this->tree = tree;}
-	void setCenterX(float centerX) {this->centerX = centerX;}
-	void setCenterY(float centerY) {this->centerY = centerY;}
-	void setChunkOrder(OrderOfChunks tileOrder) {this->chunkOrder = tileOrder;}
+	void setImage(Image *image) { this->image = image; }
+	void setImageUser(ImageUser *imageUser) { this->imageUser = imageUser; }
+	const bool isActiveViewerOutput() const { return active; }
+	void setActive(bool active) { this->active = active; }
+	void setCenterX(float centerX) { this->centerX = centerX;}
+	void setCenterY(float centerY) { this->centerY = centerY;}
+	void setChunkOrder(OrderOfChunks tileOrder) { this->chunkOrder = tileOrder; }
 	float getCenterX() { return this->centerX; }
 	float getCenterY() { return this->centerY; }
 	OrderOfChunks getChunkOrder() { return this->chunkOrder; }
-	const int getRenderPriority() const;
-	void setColorManagement(bool doColorManagement) {this->doColorManagement = doColorManagement;}
-	void setColorPredivide(bool doColorPredivide) {this->doColorPredivide = doColorPredivide;}
-	bool isViewerOperation() {return true;}
+	const CompositorPriority getRenderPriority() const;
+	void setColorManagement(bool doColorManagement) { this->doColorManagement = doColorManagement; }
+	void setColorPredivide(bool doColorPredivide) { this->doColorPredivide = doColorPredivide; }
+	bool isViewerOperation() { return true; }
 		
 protected:
 	ViewerBaseOperation();
-	void updateImage(rcti*rect);
+	void updateImage(rcti *rect);
 
 private:
 	void initImage();
diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cpp b/source/blender/compositor/operations/COM_ViewerOperation.cpp
index 22e6511fbe7..cf7bf3fdc9d 100644
--- a/source/blender/compositor/operations/COM_ViewerOperation.cpp
+++ b/source/blender/compositor/operations/COM_ViewerOperation.cpp
@@ -64,7 +64,7 @@ void ViewerOperation::deinitExecution()
 }
 
 
-void ViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers)
+void ViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers)
 {
 	float *buffer = this->outputBuffer;
 	unsigned char *bufferDisplay = this->outputBufferDisplay;
@@ -73,38 +73,38 @@ void ViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber, MemoryB
 	const int y1 = rect->ymin;
 	const int x2 = rect->xmax;
 	const int y2 = rect->ymax;
-	const int offsetadd = (this->getWidth()-(x2-x1))*4;
-	int offset = (y1*this->getWidth() + x1 ) * 4;
+	const int offsetadd = (this->getWidth() - (x2 - x1)) * 4;
+	int offset = (y1 * this->getWidth() + x1) * 4;
 	float alpha[4], srgb[4];
 	int x;
 	int y;
 	bool breaked = false;
 
-	for (y = y1 ; y < y2 && (!breaked) ; y++) {
-		for (x = x1 ; x < x2; x++) {
+	for (y = y1; y < y2 && (!breaked); y++) {
+		for (x = x1; x < x2; x++) {
 			imageInput->read(&(buffer[offset]), x, y, COM_PS_NEAREST, memoryBuffers);
 			if (alphaInput != NULL) {
 				alphaInput->read(alpha, x, y, COM_PS_NEAREST, memoryBuffers);
-				buffer[offset+3] = alpha[0];
+				buffer[offset + 3] = alpha[0];
 			}
 			/// @todo: linear conversion only when scene color management is selected, also check predivide.
 			if (this->doColorManagement) {
 				if (this->doColorPredivide) {
-					linearrgb_to_srgb_predivide_v4(srgb, buffer+offset);
+					linearrgb_to_srgb_predivide_v4(srgb, buffer + offset);
 				}
 				else {
-					linearrgb_to_srgb_v4(srgb, buffer+offset);
+					linearrgb_to_srgb_v4(srgb, buffer + offset);
 				}
 			}
 			else {
-				copy_v4_v4(srgb, buffer+offset);
+				copy_v4_v4(srgb, buffer + offset);
 			}
 
-			F4TOCHAR4(srgb, bufferDisplay+offset);
+			rgba_float_to_uchar(bufferDisplay + offset, srgb);
 
-			offset +=4;
+			offset += 4;
 		}
-		if (tree->test_break && tree->test_break(tree->tbh)) {
+		if (isBreaked()) {
 			breaked = true;
 		}
 
diff --git a/source/blender/compositor/operations/COM_ViewerOperation.h b/source/blender/compositor/operations/COM_ViewerOperation.h
index 4ffae31c131..49ef5ad4bb7 100644
--- a/source/blender/compositor/operations/COM_ViewerOperation.h
+++ b/source/blender/compositor/operations/COM_ViewerOperation.h
@@ -34,7 +34,7 @@ private:
 
 public:
 	ViewerOperation();
-	void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers);
+	void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers);
 	void initExecution();
 	void deinitExecution();
 };
diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
index 3af914f8d0e..e1018e0d037 100644
--- a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
+++ b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
@@ -22,17 +22,14 @@
 
 #include "COM_WriteBufferOperation.h"
 #include "COM_defines.h"
-#include "COM_MemoryManager.h"
 #include <stdio.h>
 
-/// @TODO: writebuffers don't have an actual data type set.
-WriteBufferOperation::WriteBufferOperation() :NodeOperation()
+WriteBufferOperation::WriteBufferOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->memoryProxy = new MemoryProxy();
 	this->memoryProxy->setWriteBufferOperation(this);
 	this->memoryProxy->setExecutor(NULL);
-	this->tree = NULL;
 }
 WriteBufferOperation::~WriteBufferOperation()
 {
@@ -46,20 +43,23 @@ void WriteBufferOperation::executePixel(float *color, float x, float y, PixelSam
 {
 	input->read(color, x, y, sampler, inputBuffers);
 }
+
 void WriteBufferOperation::initExecution()
 {
-		this->input = this->getInputOperation(0);
-	MemoryManager::addMemoryProxy(this->memoryProxy);
+	this->input = this->getInputOperation(0);
+	this->memoryProxy->allocate(this->width, this->height);
 }
+
 void WriteBufferOperation::deinitExecution()
 {
 	this->input = NULL;
+	this->memoryProxy->free();
 }
 
-
-void WriteBufferOperation::executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers)
+void WriteBufferOperation::executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers)
 {
-	MemoryBuffer *memoryBuffer = MemoryManager::getMemoryBuffer(this->getMemoryProxy(), tileNumber);
+	//MemoryBuffer *memoryBuffer = MemoryManager::getMemoryBuffer(this->getMemoryProxy(), tileNumber);
+	MemoryBuffer *memoryBuffer = this->memoryProxy->getBuffer();
 	float *buffer = memoryBuffer->getBuffer();
 	if (this->input->isComplex()) {
 		void *data = this->input->initializeTileData(rect, memoryBuffers);
@@ -67,17 +67,17 @@ void WriteBufferOperation::executeRegion(rcti *rect, unsigned int tileNumber, Me
 		int y1 = rect->ymin;
 		int x2 = rect->xmax;
 		int y2 = rect->ymax;
-		int offset4 = 0;
 		int x;
 		int y;
 		bool breaked = false;
-		for (y = y1 ; y < y2 && (!breaked) ; y++) {
-			for (x = x1 ; x < x2; x++) {
+		for (y = y1; y < y2 && (!breaked); y++) {
+			int offset4 = (y * memoryBuffer->getWidth() + x1) * COM_NUMBER_OF_CHANNELS;
+			for (x = x1; x < x2; x++) {
 				input->read(&(buffer[offset4]), x, y, memoryBuffers, data);
-				offset4 +=4;
+				offset4 += COM_NUMBER_OF_CHANNELS;
 
 			}
-			if (tree->test_break && tree->test_break(tree->tbh)) {
+			if (isBreaked()) {
 				breaked = true;
 			}
 
@@ -92,16 +92,17 @@ void WriteBufferOperation::executeRegion(rcti *rect, unsigned int tileNumber, Me
 		int y1 = rect->ymin;
 		int x2 = rect->xmax;
 		int y2 = rect->ymax;
-		int offset4 = 0;
+
 		int x;
 		int y;
 		bool breaked = false;
-		for (y = y1 ; y < y2 && (!breaked) ; y++) {
-			for (x = x1 ; x < x2 ; x++) {
+		for (y = y1; y < y2 && (!breaked); y++) {
+			int offset4 = (y * memoryBuffer->getWidth() + x1) * COM_NUMBER_OF_CHANNELS;
+			for (x = x1; x < x2; x++) {
 				input->read(&(buffer[offset4]), x, y, COM_PS_NEAREST, memoryBuffers);
-				offset4 +=4;
+				offset4 += COM_NUMBER_OF_CHANNELS;
 			}
-			if (tree->test_break && tree->test_break(tree->tbh)) {
+			if (isBreaked()) {
 				breaked = true;
 			}
 		}
@@ -109,10 +110,9 @@ void WriteBufferOperation::executeRegion(rcti *rect, unsigned int tileNumber, Me
 	memoryBuffer->setCreatedState();
 }
 
-void WriteBufferOperation::executeOpenCLRegion(cl_context context, cl_program program, cl_command_queue queue, rcti *rect, unsigned int chunkNumber, MemoryBuffer** inputMemoryBuffers)
+void WriteBufferOperation::executeOpenCLRegion(cl_context context, cl_program program, cl_command_queue queue, rcti *rect, unsigned int chunkNumber, MemoryBuffer **inputMemoryBuffers, MemoryBuffer *outputBuffer)
 {
-	MemoryBuffer *outputMemoryBuffer = MemoryManager::getMemoryBuffer(this->getMemoryProxy(), chunkNumber);
-	float *outputFloatBuffer = outputMemoryBuffer->getBuffer();
+	float *outputFloatBuffer = outputBuffer->getBuffer();
 	cl_int error;
 	/*
 	 * 1. create cl_mem from outputbuffer
@@ -123,47 +123,60 @@ void WriteBufferOperation::executeOpenCLRegion(cl_context context, cl_program pr
 	 * note: list of cl_mem will be filled by 2, and needs to be cleaned up by 4
 	 */
 	// STEP 1
-	const unsigned int outputBufferWidth = outputMemoryBuffer->getWidth();
-	const unsigned int outputBufferHeight = outputMemoryBuffer->getHeight();
+	const unsigned int outputBufferWidth = outputBuffer->getWidth();
+	const unsigned int outputBufferHeight = outputBuffer->getHeight();
 
 	const cl_image_format imageFormat = {
 		CL_RGBA,
 		CL_FLOAT
 	};
 
-	cl_mem clOutputBuffer = clCreateImage2D(context, CL_MEM_WRITE_ONLY|CL_MEM_USE_HOST_PTR, &imageFormat, outputBufferWidth, outputBufferHeight, 0, outputFloatBuffer, &error);
-	if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));	}
+	cl_mem clOutputBuffer = clCreateImage2D(context, CL_MEM_WRITE_ONLY | CL_MEM_USE_HOST_PTR, &imageFormat, outputBufferWidth, outputBufferHeight, 0, outputFloatBuffer, &error);
+	if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));  }
 	
 	// STEP 2
-	list<cl_mem> * clMemToCleanUp = new list<cl_mem>();
+	list<cl_mem> *clMemToCleanUp = new list<cl_mem>();
 	clMemToCleanUp->push_back(clOutputBuffer);
 	list<cl_kernel> *clKernelsToCleanUp = new list<cl_kernel>();
 
-	this->input->executeOpenCL(context, program, queue, outputMemoryBuffer, clOutputBuffer, inputMemoryBuffers, clMemToCleanUp, clKernelsToCleanUp);
+	this->input->executeOpenCL(context, program, queue, outputBuffer, clOutputBuffer, inputMemoryBuffers, clMemToCleanUp, clKernelsToCleanUp);
 
 	// STEP 3
 
-	size_t origin[3] = {0,0,0};
-	size_t region[3] = {outputBufferWidth,outputBufferHeight,1};
+	size_t origin[3] = {0, 0, 0};
+	size_t region[3] = {outputBufferWidth, outputBufferHeight, 1};
+
+//	clFlush(queue);
+//	clFinish(queue);
 
 	error = clEnqueueBarrier(queue);
-	if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));	}
+	if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));  }
 	error = clEnqueueReadImage(queue, clOutputBuffer, CL_TRUE, origin, region, 0, 0, outputFloatBuffer, 0, NULL, NULL);
-	if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));	}
+	if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));  }
+	
+	this->getMemoryProxy()->getBuffer()->copyContentFrom(outputBuffer);
+	
 	// STEP 4
 
-	while (clMemToCleanUp->size()>0) {
+	
+	while (clMemToCleanUp->size() > 0) {
 		cl_mem mem = clMemToCleanUp->front();
 		error = clReleaseMemObject(mem);
-		if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));	}
+		if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));  }
 		clMemToCleanUp->pop_front();
 	}
 
-	while (clKernelsToCleanUp->size()>0) {
+	while (clKernelsToCleanUp->size() > 0) {
 		cl_kernel kernel = clKernelsToCleanUp->front();
 		error = clReleaseKernel(kernel);
-		if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));	}
+		if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));  }
 		clKernelsToCleanUp->pop_front();
 	}
 	delete clKernelsToCleanUp;
 }
+
+void WriteBufferOperation::readResolutionFromInputSocket() {
+	NodeOperation *inputOperation = this->getInputOperation(0);
+	this->setWidth(inputOperation->getWidth());
+	this->setHeight(inputOperation->getHeight());
+}
diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.h b/source/blender/compositor/operations/COM_WriteBufferOperation.h
index b17122d68f0..321eed7240a 100644
--- a/source/blender/compositor/operations/COM_WriteBufferOperation.h
+++ b/source/blender/compositor/operations/COM_WriteBufferOperation.h
@@ -27,26 +27,25 @@
 #include "COM_MemoryProxy.h"
 #include "COM_SocketReader.h"
 /**
-  * @brief Operation to write to a tile
-  * @ingroup Operation
-  */
-class WriteBufferOperation: public NodeOperation {
+ * @brief Operation to write to a tile
+ * @ingroup Operation
+ */
+class WriteBufferOperation : public NodeOperation {
 	MemoryProxy *memoryProxy;
 	NodeOperation *input;
-	const bNodeTree * tree;
 public:
 	WriteBufferOperation();
 	~WriteBufferOperation();
-	int isBufferOperation() {return true;}
-	MemoryProxy *getMemoryProxy() {return this->memoryProxy;}
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
-	const bool isWriteBufferOperation() const {return true;}
+	int isBufferOperation() { return true; }
+	MemoryProxy *getMemoryProxy() { return this->memoryProxy; }
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
+	const bool isWriteBufferOperation() const { return true; }
 	
-	void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers);
+	void executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers);
 	void initExecution();
 	void deinitExecution();
-	void setbNodeTree(const bNodeTree *tree) {this->tree = tree;}
-	void executeOpenCLRegion(cl_context context, cl_program program, cl_command_queue queue, rcti *rect, unsigned int chunkNumber, MemoryBuffer** memoryBuffers);
+	void executeOpenCLRegion(cl_context context, cl_program program, cl_command_queue queue, rcti *rect, unsigned int chunkNumber, MemoryBuffer **memoryBuffers, MemoryBuffer *outputBuffer);
+	void readResolutionFromInputSocket();
 
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_ZCombineOperation.cpp b/source/blender/compositor/operations/COM_ZCombineOperation.cpp
index 7f32bac2e64..eb02b150fa4 100644
--- a/source/blender/compositor/operations/COM_ZCombineOperation.cpp
+++ b/source/blender/compositor/operations/COM_ZCombineOperation.cpp
@@ -23,7 +23,7 @@
 #include "COM_ZCombineOperation.h"
 #include "BLI_utildefines.h"
 
-ZCombineOperation::ZCombineOperation(): NodeOperation()
+ZCombineOperation::ZCombineOperation() : NodeOperation()
 {
 	this->addInputSocket(COM_DT_COLOR);
 	this->addInputSocket(COM_DT_VALUE);
@@ -53,7 +53,7 @@ void ZCombineOperation::executePixel(float *color, float x, float y, PixelSample
 
 	this->depth1Reader->read(depth1, x, y, sampler, inputBuffers);
 	this->depth2Reader->read(depth2, x, y, sampler, inputBuffers);
-	if (depth1[0]<depth2[0]) {
+	if (depth1[0] < depth2[0]) {
 		this->image1Reader->read(color, x, y, sampler, inputBuffers);
 	}
 	else {
@@ -69,7 +69,7 @@ void ZCombineAlphaOperation::executePixel(float *color, float x, float y, PixelS
 
 	this->depth1Reader->read(depth1, x, y, sampler, inputBuffers);
 	this->depth2Reader->read(depth2, x, y, sampler, inputBuffers);
-	if (depth1[0]<depth2[0]) {
+	if (depth1[0] < depth2[0]) {
 		this->image1Reader->read(color1, x, y, sampler, inputBuffers);
 		this->image2Reader->read(color2, x, y, sampler, inputBuffers);
 	}
@@ -78,10 +78,10 @@ void ZCombineAlphaOperation::executePixel(float *color, float x, float y, PixelS
 		this->image2Reader->read(color1, x, y, sampler, inputBuffers);
 	}
 	float fac = color1[3];
-	float ifac = 1.0f-fac;
-	color[0] = color1[0]+ifac*color2[0];
-	color[1] = color1[1]+ifac*color2[1];
-	color[2] = color1[2]+ifac*color2[2];
+	float ifac = 1.0f - fac;
+	color[0] = color1[0] + ifac * color2[0];
+	color[1] = color1[1] + ifac * color2[1];
+	color[2] = color1[2] + ifac * color2[2];
 	color[3] = MAX2(color1[3], color2[3]);
 }
 
diff --git a/source/blender/compositor/operations/COM_ZCombineOperation.h b/source/blender/compositor/operations/COM_ZCombineOperation.h
index f9de916fce0..56ad950a3aa 100644
--- a/source/blender/compositor/operations/COM_ZCombineOperation.h
+++ b/source/blender/compositor/operations/COM_ZCombineOperation.h
@@ -26,9 +26,9 @@
 
 
 /**
-  * this program converts an input colour to an output value.
-  * it assumes we are in sRGB colour space.
-  */
+ * this program converts an input colour to an output value.
+ * it assumes we are in sRGB colour space.
+ */
 class ZCombineOperation : public NodeOperation {
 protected:
 	SocketReader *image1Reader;
@@ -37,21 +37,21 @@ protected:
 	SocketReader *depth2Reader;
 public:
 	/**
-	  * Default constructor
-	  */
+	 * Default constructor
+	 */
 	ZCombineOperation();
 	
 	void initExecution();
 	void deinitExecution();
 	
 	/**
-	  * the inner loop of this program
-	  */
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+	 * the inner loop of this program
+	 */
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
 
-class ZCombineAlphaOperation: public ZCombineOperation {
-	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]);
+class ZCombineAlphaOperation : public ZCombineOperation {
+	void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]);
 };
 
 #endif
diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt
index 088376b20ef..67ed77bcc4b 100644
--- a/source/blender/editors/CMakeLists.txt
+++ b/source/blender/editors/CMakeLists.txt
@@ -24,6 +24,7 @@ if(WITH_BLENDER)
 	add_subdirectory(curve)
 	add_subdirectory(gpencil)
 	add_subdirectory(interface)
+	add_subdirectory(mask)
 	add_subdirectory(mesh)
 	add_subdirectory(metaball)
 	add_subdirectory(object)
diff --git a/source/blender/editors/SConscript b/source/blender/editors/SConscript
index ed66a76a324..d08b496f0ef 100644
--- a/source/blender/editors/SConscript
+++ b/source/blender/editors/SConscript
@@ -8,6 +8,7 @@ SConscript(['datafiles/SConscript',
             'interface/SConscript',
             'animation/SConscript',
             'armature/SConscript',
+            'mask/SConscript',
             'mesh/SConscript',
             'metaball/SConscript',
             'object/SConscript',
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index c4fca2d4ea5..f6b301c4594 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -54,6 +54,7 @@
 #include "DNA_world_types.h"
 #include "DNA_gpencil_types.h"
 #include "DNA_speaker_types.h"
+#include "DNA_mask_types.h"
 
 #include "RNA_access.h"
 
@@ -395,11 +396,8 @@ static short acf_generic_dataexpand_setting_valid(bAnimContext *ac, bAnimListEle
 /* get backdrop color for summary widget */
 static void acf_summary_color(bAnimContext *UNUSED(ac), bAnimListElem *UNUSED(ale), float r_color[3])
 {
-	// FIXME: hardcoded color - same as the 'action' line in NLA
-	// reddish color
-	r_color[0] = 0.8f;
-	r_color[1] = 0.2f;
-	r_color[2] = 0.0f;
+	/* reddish color - same as the 'action' line in NLA */
+	UI_GetThemeColor3fv(TH_ANIM_ACTIVE, r_color);
 }
 
 /* backdrop for summary widget */
@@ -850,7 +848,7 @@ static int acf_group_setting_flag(bAnimContext *ac, int setting, short *neg)
 			return AGRP_MUTED;
 			
 		case ACHANNEL_SETTING_PROTECT: /* protected */
-			// *neg= 1; - if we change this to edtiability
+			// *neg = 1; - if we change this to edtiability
 			return AGRP_PROTECTED;
 			
 		case ACHANNEL_SETTING_VISIBLE: /* visiblity - graph editor */
@@ -938,7 +936,7 @@ static int acf_fcurve_setting_flag(bAnimContext *UNUSED(ac), int setting, short
 			return FCURVE_MUTED;
 			
 		case ACHANNEL_SETTING_PROTECT: /* protected */
-			// *neg= 1; - if we change this to edtiability
+			// *neg = 1; - if we change this to edtiability
 			return FCURVE_PROTECTED;
 			
 		case ACHANNEL_SETTING_VISIBLE: /* visiblity - graph editor */
@@ -2483,7 +2481,7 @@ static int acf_gpl_setting_flag(bAnimContext *UNUSED(ac), int setting, short *ne
 			return GP_LAYER_HIDE;
 			
 		case ACHANNEL_SETTING_PROTECT: /* protected */
-			// *neg= 1; - if we change this to edtiability
+			// *neg = 1; - if we change this to edtiability
 			return GP_LAYER_LOCKED;
 			
 		default: /* unsupported */
@@ -2519,6 +2517,172 @@ static bAnimChannelType ACF_GPL =
 	acf_gpl_setting_ptr             /* pointer for setting */
 };
 
+
+/* Mask Datablock ------------------------------------------- */
+
+/* get backdrop color for mask datablock widget */
+static void acf_mask_color(bAnimContext *UNUSED(ac), bAnimListElem *UNUSED(ale), float r_color[3])
+{
+	/* these are ID-blocks, but not exactly standalone... */
+	UI_GetThemeColorShade3fv(TH_DOPESHEET_CHANNELSUBOB, 20, r_color);
+}
+
+// TODO: just get this from RNA?
+static int acf_mask_icon(bAnimListElem *UNUSED(ale))
+{
+	return ICON_GREASEPENCIL; // MASK_TODO - need real icon
+}
+
+/* check if some setting exists for this channel */
+static short acf_mask_setting_valid(bAnimContext *UNUSED(ac), bAnimListElem *UNUSED(ale), int setting)
+{
+	switch (setting) {
+		/* only select and expand supported */
+		case ACHANNEL_SETTING_SELECT:
+		case ACHANNEL_SETTING_EXPAND:
+			return 1;
+
+		default:
+			return 0;
+	}
+}
+
+/* get the appropriate flag(s) for the setting when it is valid  */
+static int acf_mask_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
+{
+	/* clear extra return data first */
+	*neg = 0;
+
+	switch (setting) {
+		case ACHANNEL_SETTING_SELECT: /* selected */
+			return AGRP_SELECTED;
+
+		case ACHANNEL_SETTING_EXPAND: /* expanded */
+			return MASK_ANIMF_EXPAND;
+	}
+
+	/* this shouldn't happen */
+	return 0;
+}
+
+/* get pointer to the setting */
+static void *acf_mask_setting_ptr(bAnimListElem *ale, int UNUSED(setting), short *type)
+{
+	Mask *mask = (Mask *)ale->data;
+
+	/* all flags are just in mask->flag for now... */
+	return GET_ACF_FLAG_PTR(mask->flag, type);
+}
+
+/* mask datablock type define */
+static bAnimChannelType ACF_MASKDATA =
+{
+	"Mask Datablock",            /* type name */
+
+	acf_mask_color,                  /* backdrop color */
+	acf_group_backdrop,             /* backdrop */
+	acf_generic_indention_0,        /* indent level */
+	acf_generic_group_offset,       /* offset */
+
+	acf_generic_idblock_name,       /* name */
+	acf_generic_idfill_nameprop,    /* name prop */
+	acf_mask_icon,                   /* icon */
+
+	acf_mask_setting_valid,          /* has setting */
+	acf_mask_setting_flag,           /* flag for setting */
+	acf_mask_setting_ptr             /* pointer for setting */
+};
+
+/* Mask Layer ------------------------------------------- */
+
+/* name for grease pencil layer entries */
+static void acf_masklay_name(bAnimListElem *ale, char *name)
+{
+	MaskLayer *masklay = (MaskLayer *)ale->data;
+
+	if (masklay && name)
+		BLI_strncpy(name, masklay->name, ANIM_CHAN_NAME_SIZE);
+}
+
+/* name property for grease pencil layer entries */
+static short acf_masklay_name_prop(bAnimListElem *ale, PointerRNA *ptr, PropertyRNA **prop)
+{
+	if (ale->data) {
+		RNA_pointer_create(ale->id, &RNA_MaskLayer, ale->data, ptr);
+		*prop = RNA_struct_name_property(ptr->type);
+
+		return (*prop != NULL);
+	}
+
+	return 0;
+}
+
+/* check if some setting exists for this channel */
+static short acf_masklay_setting_valid(bAnimContext *UNUSED(ac), bAnimListElem *UNUSED(ale), int setting)
+{
+	switch (setting) {
+		/* unsupported */
+		case ACHANNEL_SETTING_EXPAND: /* mask layers are more like F-Curves than groups */
+		case ACHANNEL_SETTING_VISIBLE: /* graph editor only */
+			return 0;
+
+		/* always available */
+		default:
+			return 1;
+	}
+}
+
+/* get the appropriate flag(s) for the setting when it is valid  */
+static int acf_masklay_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg)
+{
+	/* clear extra return data first */
+	*neg = 0;
+
+	switch (setting) {
+		case ACHANNEL_SETTING_SELECT: /* selected */
+			return MASK_LAYERFLAG_SELECT;
+
+//		case ACHANNEL_SETTING_MUTE: /* muted */
+//			return GP_LAYER_HIDE;
+
+		case ACHANNEL_SETTING_PROTECT: /* protected */
+			// *neg = 1; - if we change this to edtiability
+			return MASK_LAYERFLAG_LOCKED;
+
+		default: /* unsupported */
+			return 0;
+	}
+}
+
+/* get pointer to the setting */
+static void *acf_masklay_setting_ptr(bAnimListElem *ale, int UNUSED(setting), short *type)
+{
+	MaskLayer *masklay = (MaskLayer *)ale->data;
+
+	/* all flags are just in agrp->flag for now... */
+	return GET_ACF_FLAG_PTR(masklay->flag, type);
+}
+
+/* grease pencil layer type define */
+static bAnimChannelType ACF_MASKLAYER =
+{
+	"Mask Layer",                /* type name */
+
+	acf_generic_channel_color,      /* backdrop color */
+	acf_generic_channel_backdrop,   /* backdrop */
+	acf_generic_indention_flexible, /* indent level */
+	acf_generic_group_offset,       /* offset */
+
+	acf_masklay_name,                   /* name */
+	acf_masklay_name_prop,              /* name prop */
+	NULL,                           /* icon */
+
+	acf_masklay_setting_valid,          /* has setting */
+	acf_masklay_setting_flag,           /* flag for setting */
+	acf_masklay_setting_ptr             /* pointer for setting */
+};
+
+
 /* *********************************************** */
 /* Type Registration and General Access */
 
@@ -2569,6 +2733,9 @@ static void ANIM_init_channel_typeinfo_data(void)
 		animchannelTypeInfo[type++] = &ACF_GPD;          /* Grease Pencil Datablock */
 		animchannelTypeInfo[type++] = &ACF_GPL;          /* Grease Pencil Layer */
 
+		animchannelTypeInfo[type++] = &ACF_MASKDATA;     /* Mask Datablock */
+		animchannelTypeInfo[type++] = &ACF_MASKLAYER;    /* Mask Layer */
+
 		// TODO: these types still need to be implemented!!!
 		// probably need a few extra flags for these special cases...
 		animchannelTypeInfo[type++] = NULL;              /* NLA Track */
@@ -2699,7 +2866,7 @@ short ANIM_channel_setting_get(bAnimContext *ac, bAnimListElem *ale, int setting
 			else if (smode == ACHANNEL_SETFLAG_ADD) (sval) |= (sflag); \
 			else (sval) &= ~(sflag); \
 		} \
-	}
+	} (void)0
 
 /* Change value of some setting for a channel 
  *	- setting: eAnimChannel_Settings
@@ -3060,7 +3227,7 @@ static void achannel_setting_slider_shapekey_cb(bContext *C, void *key_poin, voi
 		/* find or create new F-Curve */
 		// XXX is the group name for this ok?
 		bAction *act = verify_adt_action((ID *)key, 1);
-		FCurve *fcu = verify_fcurve(act, NULL, rna_path, 0, 1);
+		FCurve *fcu = verify_fcurve(act, NULL, &ptr, rna_path, 0, 1);
 		
 		/* set the special 'replace' flag if on a keyframe */
 		if (fcurve_frame_has_keyframe(fcu, cfra, 0))
@@ -3096,7 +3263,7 @@ static void draw_setting_widget(bAnimContext *ac, bAnimListElem *ale, bAnimChann
 	/* get the base icon for the setting */
 	switch (setting) {
 		case ACHANNEL_SETTING_VISIBLE:  /* visibility eyes */
-			//icon= ((enabled)? ICON_VISIBLE_IPO_ON : ICON_VISIBLE_IPO_OFF);
+			//icon = ((enabled) ? ICON_VISIBLE_IPO_ON : ICON_VISIBLE_IPO_OFF);
 			icon = ICON_VISIBLE_IPO_OFF;
 			
 			if (ale->type == ANIMTYPE_FCURVE)
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c
index 159c4681951..5c57407d14e 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -43,6 +43,7 @@
 #include "DNA_scene_types.h"
 #include "DNA_key_types.h"
 #include "DNA_gpencil_types.h"
+#include "DNA_mask_types.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
@@ -51,6 +52,7 @@
 #include "BKE_fcurve.h"
 #include "BKE_gpencil.h"
 #include "BKE_context.h"
+#include "BKE_mask.h"
 #include "BKE_global.h"
 
 #include "UI_view2d.h"
@@ -258,6 +260,10 @@ void ANIM_deselect_anim_channels(bAnimContext *ac, void *data, short datatype, s
 					if (ale->flag & GP_LAYER_SELECT)
 						sel = ACHANNEL_SETFLAG_CLEAR;
 					break;
+				case ANIMTYPE_MASKLAYER:
+					if (ale->flag & MASK_LAYERFLAG_SELECT)
+						sel = ACHANNEL_SETFLAG_CLEAR;
+					break;
 			}
 		}
 	}
@@ -354,6 +360,14 @@ void ANIM_deselect_anim_channels(bAnimContext *ac, void *data, short datatype, s
 				ACHANNEL_SET_FLAG(gpl, sel, GP_LAYER_SELECT);
 			}
 			break;
+
+			case ANIMTYPE_MASKLAYER:
+			{
+				MaskLayer *masklay = (MaskLayer *)ale->data;
+
+				ACHANNEL_SET_FLAG(masklay, sel, MASK_LAYERFLAG_SELECT);
+			}
+			break;
 		}
 	}
 	
@@ -496,7 +510,7 @@ void ANIM_flush_setting_anim_channels(bAnimContext *ac, ListBase *anim_data, bAn
 				break;
 			
 			/* store this level as the 'old' level now */
-			// prevLevel= level; // XXX: prevLevel is unused
+			// prevLevel = level; // XXX: prevLevel is unused
 		}
 	}
 }
@@ -1055,6 +1069,10 @@ static int animchannels_rearrange_exec(bContext *C, wmOperator *op)
 		/* Grease Pencil channels */
 		printf("Grease Pencil not supported for moving yet\n");
 	}
+	else if (ac.datatype == ANIMCONT_MASK) {
+		/* Grease Pencil channels */
+		printf("Mask does not supported for moving yet\n");
+	}
 	else if (ac.datatype == ANIMCONT_ACTION) {
 		/* Directly rearrange action's channels */
 		rearrange_action_channels(&ac, ac.data, mode);
@@ -1205,6 +1223,17 @@ static int animchannels_delete_exec(bContext *C, wmOperator *UNUSED(op))
 				BLI_freelinkN(&gpd->layers, gpl);
 			}
 			break;
+
+			case ANIMTYPE_MASKLAYER:
+			{
+				/* Grease Pencil layer */
+				Mask *mask = (Mask *)ale->id;
+				MaskLayer *masklay = (MaskLayer *)ale->data;
+
+				/* try to delete the layer's data and the layer itself */
+				BKE_mask_layer_remove(mask, masklay);
+			}
+			break;
 		}
 	}
 	
@@ -2017,7 +2046,7 @@ static int animchannels_rename_invoke(bContext *C, wmOperator *UNUSED(op), wmEve
 	v2d = &ar->v2d;
 	
 	/* figure out which channel user clicked in 
-	 * Note: although channels technically start at y= ACHANNEL_FIRST, we need to adjust by half a channel's height
+	 * Note: although channels technically start at (y = ACHANNEL_FIRST), we need to adjust by half a channel's height
 	 *		so that the tops of channels get caught ok. Since ACHANNEL_FIRST is really ACHANNEL_HEIGHT, we simply use
 	 *		ACHANNEL_HEIGHT_HALF.
 	 */
@@ -2287,6 +2316,36 @@ static int mouse_anim_channels(bAnimContext *ac, float UNUSED(x), int channel_in
 			notifierFlags |= (ND_ANIMCHAN | NA_EDITED);
 		}
 		break;
+		case ANIMTYPE_MASKDATABLOCK:
+		{
+			Mask *mask = (Mask *)ale->data;
+
+			/* toggle expand
+			 *	- although the triangle widget already allows this, the whole channel can also be used for this purpose
+			 */
+			mask->flag ^= MASK_ANIMF_EXPAND;
+
+			notifierFlags |= (ND_ANIMCHAN | NA_EDITED);
+		}
+		break;
+		case ANIMTYPE_MASKLAYER:
+		{
+			MaskLayer *masklay = (MaskLayer *)ale->data;
+
+			/* select/deselect */
+			if (selectmode == SELECT_INVERT) {
+				/* invert selection status of this layer only */
+				masklay->flag ^= MASK_LAYERFLAG_SELECT;
+			}
+			else {
+				/* select layer by itself */
+				ANIM_deselect_anim_channels(ac, ac->data, ac->datatype, 0, ACHANNEL_SETFLAG_CLEAR);
+				masklay->flag |= MASK_LAYERFLAG_SELECT;
+			}
+
+			notifierFlags |= (ND_ANIMCHAN | NA_EDITED);
+		}
+		break;
 		default:
 			if (G.debug & G_DEBUG)
 				printf("Error: Invalid channel type in mouse_anim_channels()\n");
@@ -2330,7 +2389,7 @@ static int animchannels_mouseclick_invoke(bContext *C, wmOperator *op, wmEvent *
 		selectmode = SELECT_REPLACE;
 	
 	/* figure out which channel user clicked in 
-	 * Note: although channels technically start at y= ACHANNEL_FIRST, we need to adjust by half a channel's height
+	 * Note: although channels technically start at (y = ACHANNEL_FIRST), we need to adjust by half a channel's height
 	 *		so that the tops of channels get caught ok. Since ACHANNEL_FIRST is really ACHANNEL_HEIGHT, we simply use
 	 *		ACHANNEL_HEIGHT_HALF.
 	 */
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index 160e6957513..46e1eb98dae 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -56,6 +56,7 @@
 #include "DNA_lamp_types.h"
 #include "DNA_lattice_types.h"
 #include "DNA_key_types.h"
+#include "DNA_mask_types.h"
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meta_types.h"
@@ -86,6 +87,7 @@
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_node.h"
+#include "BKE_mask.h"
 #include "BKE_sequencer.h"
 #include "BKE_utildefines.h"
 
@@ -173,6 +175,22 @@ static short actedit_get_context(bAnimContext *ac, SpaceAction *saction)
 			ac->mode = saction->mode;
 			return 1;
 			
+		case SACTCONT_MASK: /* Grease Pencil */ // XXX review how this mode is handled...
+			/* update scene-pointer (no need to check for pinning yet, as not implemented) */
+{
+			// TODO, other methods to get the mask
+			// Sequence *seq = BKE_sequencer_active_get(ac->scene);
+			//MovieClip *clip = ac->scene->clip;
+//			struct Mask *mask = seq ? seq->mask : NULL;
+
+			saction->ads.source = (ID *)ac->scene;
+
+			ac->datatype = ANIMCONT_MASK;
+			ac->data = &saction->ads;
+
+			ac->mode = saction->mode;
+			return 1;
+}
 		case SACTCONT_DOPESHEET: /* DopeSheet */
 			/* update scene-pointer (no need to check for pinning yet, as not implemented) */
 			saction->ads.source = (ID *)ac->scene;
@@ -807,7 +825,18 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
 				ale->datatype = ALE_GPFRAME;
 			}
 			break;
-				
+
+			case ANIMTYPE_MASKLAYER:
+			{
+				MaskLayer *masklay = (MaskLayer *)data;
+
+				ale->flag = masklay->flag;
+
+				ale->key_data = NULL;
+				ale->datatype = ALE_MASKLAY;
+			}
+			break;
+
 			case ANIMTYPE_NLATRACK:
 			{
 				NlaTrack *nlt = (NlaTrack *)data;
@@ -1353,6 +1382,83 @@ static size_t animdata_filter_gpencil(ListBase *anim_data, void *UNUSED(data), i
 	return items;
 }
 
+static size_t animdata_filter_mask_data(ListBase *anim_data, Mask *mask, const int filter_mode)
+{
+	MaskLayer *masklay_act = BKE_mask_layer_active(mask);
+	MaskLayer *masklay;
+	size_t items = 0;
+
+	/* loop over layers as the conditions are acceptable */
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		/* only if selected */
+		if (ANIMCHANNEL_SELOK(SEL_MASKLAY(masklay)) ) {
+			/* only if editable */
+//			if (!(filter_mode & ANIMFILTER_FOREDIT) || EDITABLE_GPL(gpl)) {
+				/* active... */
+				if (!(filter_mode & ANIMFILTER_ACTIVE) || (masklay_act == masklay)) {
+					/* add to list */
+					ANIMCHANNEL_NEW_CHANNEL(masklay, ANIMTYPE_MASKLAYER, mask);
+
+
+//					if (filter_mode & ANIMFILTER_TMP_PEEK)
+//						return 1;
+//					else {
+//						bAnimListElem *ale = make_new_animlistelem(masklay, channel_type, (ID *)owner_id);
+//						if (ale) {
+//							BLI_addtail(anim_data, ale);
+//							items ++;
+//						}
+//					}
+
+				}
+//			}
+		}
+	}
+
+	return items;
+}
+
+static size_t animdata_filter_mask(ListBase *anim_data, void *UNUSED(data), int filter_mode)
+{
+	Mask *mask;
+	size_t items = 0;
+
+	/* for now, grab grease pencil datablocks directly from main */
+	// XXX: this is not good...
+	for (mask = G.main->mask.first; mask; mask = mask->id.next) {
+		ListBase tmp_data = {NULL, NULL};
+		size_t tmp_items = 0;
+
+		/* only show if gpd is used by something... */
+		if (ID_REAL_USERS(mask) < 1)
+			continue;
+
+		/* add gpencil animation channels */
+		BEGIN_ANIMFILTER_SUBCHANNELS(EXPANDED_MASK(mask))
+		{
+			tmp_items += animdata_filter_mask_data(&tmp_data, mask, filter_mode);
+		}
+		END_ANIMFILTER_SUBCHANNELS;
+
+		/* did we find anything? */
+		if (tmp_items) {
+			/* include data-expand widget first */
+			if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
+				/* add gpd as channel too (if for drawing, and it has layers) */
+				ANIMCHANNEL_NEW_CHANNEL(mask, ANIMTYPE_MASKDATABLOCK, NULL);
+			}
+
+			/* now add the list of collected channels */
+			BLI_movelisttolist(anim_data, &tmp_data);
+			BLI_assert((tmp_data.first == tmp_data.last) && (tmp_data.first == NULL));
+			items += tmp_items;
+		}
+	}
+
+	/* return the number of items added to the list */
+	return items;
+}
+
 /* NOTE: owner_id is scene, material, or texture block, which is the direct owner of the node tree in question */
 // TODO: how to handle group nodes is still unclear...
 static size_t animdata_filter_ds_nodetree(bAnimContext *ac, ListBase *anim_data, bDopeSheet *ads, ID *owner_id, bNodeTree *ntree, int filter_mode)
@@ -2280,7 +2386,7 @@ size_t ANIM_animdata_filter(bAnimContext *ac, ListBase *anim_data, int filter_mo
 					items += animfilter_action(ac, anim_data, ads, data, filter_mode, (ID *)obact);
 			}
 			break;
-				
+
 			case ANIMCONT_SHAPEKEY: /* 'ShapeKey Editor' */
 			{
 				/* the check for the DopeSheet summary is included here since the summary works here too */
@@ -2294,7 +2400,13 @@ size_t ANIM_animdata_filter(bAnimContext *ac, ListBase *anim_data, int filter_mo
 				items = animdata_filter_gpencil(anim_data, data, filter_mode);
 			}
 			break;
-				
+
+			case ANIMCONT_MASK:
+			{
+				items = animdata_filter_mask(anim_data, data, filter_mode);
+			}
+			break;
+
 			case ANIMCONT_DOPESHEET: /* 'DopeSheet Editor' */
 			{
 				/* the DopeSheet editor is the primary place where the DopeSheet summaries are useful */
diff --git a/source/blender/editors/animation/anim_ipo_utils.c b/source/blender/editors/animation/anim_ipo_utils.c
index 593010fae09..a73651d7664 100644
--- a/source/blender/editors/animation/anim_ipo_utils.c
+++ b/source/blender/editors/animation/anim_ipo_utils.c
@@ -191,9 +191,9 @@ int getname_anim_fcurve(char *name, ID *id, FCurve *fcu)
 
 /* used to determine the color of F-Curves with FCURVE_COLOR_AUTO_RAINBOW set */
 //void fcurve_rainbow (unsigned int cur, unsigned int tot, float *out)
-void getcolor_fcurve_rainbow(int cur, int tot, float *out)
+void getcolor_fcurve_rainbow(int cur, int tot, float out[3])
 {
-	float hue, val, sat, fac;
+	float hsv[3], fac;
 	int grouping;
 	
 	/* we try to divide the color into groupings of n colors,
@@ -203,7 +203,7 @@ void getcolor_fcurve_rainbow(int cur, int tot, float *out)
 	 * so the base color is simply one of the three primary colors
 	 */
 	grouping = (4 - (tot % 2));
-	hue = HSV_BANDWIDTH * (float)(cur % grouping);
+	hsv[0] = HSV_BANDWIDTH * (float)(cur % grouping);
 	
 	/* 'Value' (i.e. darkness) needs to vary so that larger sets of three will be 
 	 * 'darker' (i.e. smaller value), so that they don't look that similar to previous ones.
@@ -213,16 +213,15 @@ void getcolor_fcurve_rainbow(int cur, int tot, float *out)
 	fac = ((float)cur / (float)tot) * 0.7f;
 	
 	/* the base color can get offset a bit so that the colors aren't so identical */
-	hue += fac * HSV_BANDWIDTH; 
-	if (hue > 1.0f) hue = fmod(hue, 1.0f);
+	hsv[0] += fac * HSV_BANDWIDTH;
+	if (hsv[0] > 1.0f) hsv[0] = fmod(hsv[0], 1.0f);
 	
 	/* saturation adjustments for more visible range */
-	if ((hue > 0.5f) && (hue < 0.8f)) sat = 0.5f;
-	else sat = 0.6f;
+	hsv[1] = ((hsv[0] > 0.5f) && (hsv[0] < 0.8f)) ? 0.5f : 0.6f;
 	
 	/* value is fixed at 1.0f, otherwise we cannot clearly see the curves... */
-	val = 1.0f;
+	hsv[2] = 1.0f;
 	
 	/* finally, conver this to RGB colors */
-	hsv_to_rgb(hue, sat, val, out, out + 1, out + 2);
+	hsv_to_rgb_v(hsv, out);
 }
diff --git a/source/blender/editors/animation/drivers.c b/source/blender/editors/animation/drivers.c
index 416df6bccba..4a5966948ae 100644
--- a/source/blender/editors/animation/drivers.c
+++ b/source/blender/editors/animation/drivers.c
@@ -521,7 +521,7 @@ void ANIM_OT_driver_button_add(wmOperatorType *ot)
 	
 	/* callbacks */
 	ot->exec = add_driver_button_exec; 
-	//op->poll= ??? // TODO: need to have some animatable property to do this
+	//op->poll = ??? // TODO: need to have some animatable property to do this
 	
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -573,7 +573,7 @@ void ANIM_OT_driver_button_remove(wmOperatorType *ot)
 	
 	/* callbacks */
 	ot->exec = remove_driver_button_exec; 
-	//op->poll= ??? // TODO: need to have some driver to be able to do this...
+	//op->poll = ??? // TODO: need to have some driver to be able to do this...
 	
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -620,7 +620,7 @@ void ANIM_OT_copy_driver_button(wmOperatorType *ot)
 	
 	/* callbacks */
 	ot->exec = copy_driver_button_exec; 
-	//op->poll= ??? // TODO: need to have some driver to be able to do this...
+	//op->poll = ??? // TODO: need to have some driver to be able to do this...
 	
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -664,7 +664,7 @@ void ANIM_OT_paste_driver_button(wmOperatorType *ot)
 	
 	/* callbacks */
 	ot->exec = paste_driver_button_exec; 
-	//op->poll= ??? // TODO: need to have some driver to be able to do this...
+	//op->poll = ??? // TODO: need to have some driver to be able to do this...
 	
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
diff --git a/source/blender/editors/animation/fmodifier_ui.c b/source/blender/editors/animation/fmodifier_ui.c
index 24cae5d8652..ea875567705 100644
--- a/source/blender/editors/animation/fmodifier_ui.c
+++ b/source/blender/editors/animation/fmodifier_ui.c
@@ -79,7 +79,7 @@
 #define DRAW_BACKDROP(height) \
 	{ \
 		uiDefBut(block, ROUNDBOX, B_REDR, "", -3, yco - height, width + 3, height - 1, NULL, 5.0, 0.0, 12.0, (float)rb_col, ""); \
-	}
+	} (void)0
 
 /* callback to verify modifier data */
 static void validate_fmodifier_cb(bContext *UNUSED(C), void *fcm_v, void *UNUSED(arg))
diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c
index cb7dc7ac206..e6fc4d5a168 100644
--- a/source/blender/editors/animation/keyframes_draw.c
+++ b/source/blender/editors/animation/keyframes_draw.c
@@ -60,6 +60,7 @@
 #include "DNA_speaker_types.h"
 #include "DNA_world_types.h"
 #include "DNA_gpencil_types.h"
+#include "DNA_mask_types.h"
 
 #include "BKE_key.h"
 #include "BKE_material.h"
@@ -184,6 +185,50 @@ static void nupdate_ak_gpframe(void *node, void *data)
 	ak->modified += 1;
 }
 
+/* ......... */
+
+/* Comparator callback used for ActKeyColumns and GPencil frame */
+static short compare_ak_masklayshape(void *node, void *data)
+{
+	ActKeyColumn *ak = (ActKeyColumn *)node;
+	MaskLayerShape *masklay_shape = (MaskLayerShape *)data;
+
+	if (masklay_shape->frame < ak->cfra)
+		return -1;
+	else if (masklay_shape->frame > ak->cfra)
+		return 1;
+	else
+		return 0;
+}
+
+/* New node callback used for building ActKeyColumns from GPencil frames */
+static DLRBT_Node *nalloc_ak_masklayshape(void *data)
+{
+	ActKeyColumn *ak = MEM_callocN(sizeof(ActKeyColumn), "ActKeyColumnGPF");
+	MaskLayerShape *masklay_shape = (MaskLayerShape *)data;
+
+	/* store settings based on state of BezTriple */
+	ak->cfra = masklay_shape->frame;
+	ak->sel = (masklay_shape->flag & MASK_SHAPE_SELECT) ? SELECT : 0;
+
+	/* set 'modified', since this is used to identify long keyframes */
+	ak->modified = 1;
+
+	return (DLRBT_Node *)ak;
+}
+
+/* Node updater callback used for building ActKeyColumns from GPencil frames */
+static void nupdate_ak_masklayshape(void *node, void *data)
+{
+	ActKeyColumn *ak = (ActKeyColumn *)node;
+	MaskLayerShape *masklay_shape = (MaskLayerShape *)data;
+
+	/* set selection status and 'touched' status */
+	if (masklay_shape->flag & MASK_SHAPE_SELECT) ak->sel = SELECT;
+	ak->modified += 1;
+}
+
+
 /* --------------- */
 
 /* Add the given BezTriple to the given 'list' of Keyframes */
@@ -204,6 +249,15 @@ static void add_gpframe_to_keycolumns_list(DLRBT_Tree *keys, bGPDframe *gpf)
 		BLI_dlrbTree_add(keys, compare_ak_gpframe, nalloc_ak_gpframe, nupdate_ak_gpframe, gpf);
 }
 
+/* Add the given MaskLayerShape Frame to the given 'list' of Keyframes */
+static void add_masklay_to_keycolumns_list(DLRBT_Tree *keys, MaskLayerShape *masklay_shape)
+{
+	if (ELEM(NULL, keys, masklay_shape))
+		return;
+	else
+		BLI_dlrbTree_add(keys, compare_ak_masklayshape, nalloc_ak_masklayshape, nupdate_ak_masklayshape, masklay_shape);
+}
+
 /* ActBeztColumns (Helpers for Long Keyframes) ------------------------------ */
 
 /* maximum size of default buffer for BezTriple columns */
@@ -764,6 +818,21 @@ void draw_gpl_channel(View2D *v2d, bDopeSheet *ads, bGPDlayer *gpl, float ypos)
 	BLI_dlrbTree_free(&keys);
 }
 
+void draw_masklay_channel(View2D *v2d, bDopeSheet *ads, MaskLayer *masklay, float ypos)
+{
+	DLRBT_Tree keys;
+
+	BLI_dlrbTree_init(&keys);
+
+	mask_to_keylist(ads, masklay, &keys);
+
+	BLI_dlrbTree_linkedlist_sync(&keys);
+
+	draw_keylist(v2d, &keys, NULL, ypos, (masklay->flag & MASK_LAYERFLAG_LOCKED));
+
+	BLI_dlrbTree_free(&keys);
+}
+
 /* *************************** Keyframe List Conversions *************************** */
 
 void summary_to_keylist(bAnimContext *ac, DLRBT_Tree *keys, DLRBT_Tree *blocks)
@@ -940,3 +1009,17 @@ void gpl_to_keylist(bDopeSheet *UNUSED(ads), bGPDlayer *gpl, DLRBT_Tree *keys)
 	}
 }
 
+void mask_to_keylist(bDopeSheet *UNUSED(ads), MaskLayer *masklay, DLRBT_Tree *keys)
+{
+	MaskLayerShape *masklay_shape;
+
+	if (masklay && keys) {
+		for (masklay_shape = masklay->splines_shapes.first;
+		     masklay_shape;
+		     masklay_shape = masklay_shape->next)
+		{
+			add_masklay_to_keycolumns_list(keys, masklay_shape);
+		}
+	}
+}
+
diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c
index b92d0fb345a..88627a6dabd 100644
--- a/source/blender/editors/animation/keyframes_edit.c
+++ b/source/blender/editors/animation/keyframes_edit.c
@@ -429,7 +429,7 @@ void ANIM_editkeyframes_refresh(bAnimContext *ac)
 			if (check(2)) \
 				ok |= KEYFRAME_OK_H2; \
 		} \
-	}	
+	} (void)0
  
 /* ------------------------ */
  
@@ -766,7 +766,7 @@ KeyframeEditFunc ANIM_editkeyframes_mirror(short type)
 			bezt->h1 = HD_FREE;                                               \
 		if (ELEM3(bezt->h2, HD_ALIGN, HD_AUTO, HD_AUTO_ANIM))                 \
 			bezt->h2 = HD_FREE;                                               \
-	}
+	} (void)0
 
 /* Sets the selected bezier handles to type 'auto' */
 static short set_bezier_auto(KeyframeEditData *UNUSED(ked), BezTriple *bezt) 
diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c
index 05c87e98f9b..a8f8d2974e5 100644
--- a/source/blender/editors/animation/keyframes_general.c
+++ b/source/blender/editors/animation/keyframes_general.c
@@ -184,10 +184,10 @@ void clean_fcurve(FCurve *fcu, float thresh)
 	int totCount, i;
 	
 	/* check if any points  */
-	if ((fcu == NULL) || (fcu->totvert <= 1)) 
+	if ((fcu == NULL) || (fcu->bezt == NULL) || (fcu->totvert <= 1))
 		return;
 	
-	/* make a copy of the old BezTriples, and clear IPO curve */
+	/* make a copy of the old BezTriples, and clear F-Curve */
 	old_bezts = fcu->bezt;
 	totCount = fcu->totvert;	
 	fcu->bezt = NULL;
@@ -286,7 +286,11 @@ void smooth_fcurve(FCurve *fcu)
 {
 	BezTriple *bezt;
 	int i, x, totSel = 0;
-	
+
+	if (fcu->bezt == NULL) {
+		return;
+	}
+
 	/* first loop through - count how many verts are selected */
 	bezt = fcu->bezt;
 	for (i = 0; i < fcu->totvert; i++, bezt++) {
@@ -374,16 +378,16 @@ void smooth_fcurve(FCurve *fcu)
 /* ---------------- */
 
 /* little cache for values... */
-typedef struct tempFrameValCache {
+typedef struct TempFrameValCache {
 	float frame, val;
-} tempFrameValCache;
+} TempFrameValCache;
 
 
 /* Evaluates the curves between each selected keyframe on each frame, and keys the value  */
 void sample_fcurve(FCurve *fcu)
 {
 	BezTriple *bezt, *start = NULL, *end = NULL;
-	tempFrameValCache *value_cache, *fp;
+	TempFrameValCache *value_cache, *fp;
 	int sfra, range;
 	int i, n, nIndex;
 
@@ -406,15 +410,15 @@ void sample_fcurve(FCurve *fcu)
 				sfra = (int)(floor(start->vec[1][0]) );
 				
 				if (range) {
-					value_cache = MEM_callocN(sizeof(tempFrameValCache) * range, "IcuFrameValCache");
+					value_cache = MEM_callocN(sizeof(TempFrameValCache) * range, "IcuFrameValCache");
 					
-					/*  sample values   */
+					/* sample values */
 					for (n = 1, fp = value_cache; n < range && fp; n++, fp++) {
 						fp->frame = (float)(sfra + n);
 						fp->val = evaluate_fcurve(fcu, fp->frame);
 					}
 					
-					/*  add keyframes with these, tagging as 'breakdowns'   */
+					/* add keyframes with these, tagging as 'breakdowns' */
 					for (n = 1, fp = value_cache; n < range && fp; n++, fp++) {
 						nIndex = insert_vert_fcurve(fcu, fp->frame, fp->val, 1);
 						BEZKEYTYPE(fcu->bezt + nIndex) = BEZT_KEYTYPE_BREAKDOWN;
@@ -671,7 +675,7 @@ static void paste_animedit_keys_fcurve(FCurve *fcu, tAnimCopybufItem *aci, float
 	BezTriple *bezt;
 	int i;
 
-	/* First de-select existing FCuvre */
+	/* First de-select existing FCurve's keyframes */
 	for (i = 0, bezt = fcu->bezt; i < fcu->totvert; i++, bezt++) {
 		bezt->f2 &= ~SELECT;
 	}
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index 2a68d32557a..6250424d655 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -150,9 +150,10 @@ bAction *verify_adt_action(ID *id, short add)
 /* Get (or add relevant data to be able to do so) F-Curve from the Active Action, 
  * for the given Animation Data block. This assumes that all the destinations are valid.
  */
-FCurve *verify_fcurve(bAction *act, const char group[], const char rna_path[], const int array_index, short add)
+FCurve *verify_fcurve(bAction *act, const char group[], PointerRNA *ptr, 
+                      const char rna_path[], const int array_index, short add)
 {
-	bActionGroup *grp;
+	bActionGroup *agrp;
 	FCurve *fcu;
 	
 	/* sanity checks */
@@ -183,14 +184,30 @@ FCurve *verify_fcurve(bAction *act, const char group[], const char rna_path[], c
 		/* if a group name has been provided, try to add or find a group, then add F-Curve to it */
 		if (group) {
 			/* try to find group */
-			grp = BKE_action_group_find_name(act, group);
+			agrp = BKE_action_group_find_name(act, group);
 			
 			/* no matching groups, so add one */
-			if (grp == NULL)
-				grp = action_groups_add_new(act, group);
+			if (agrp == NULL) {
+				agrp = action_groups_add_new(act, group);
+				
+				/* sync bone group colors if applicable */
+				if (ptr && (ptr->type == &RNA_PoseBone)) {
+					Object *ob = (Object *)ptr->id.data;
+					bPoseChannel *pchan = (bPoseChannel *)ptr->data;
+					bPose *pose = ob->pose;
+					bActionGroup *grp;
+					
+					/* find bone group (if present), and use the color from that */
+					grp = (bActionGroup *)BLI_findlink(&pose->agroups, (pchan->agrp_index - 1));
+					if (grp) {
+						agrp->customCol = grp->customCol;
+						action_group_colors_sync(agrp);
+					}
+				}
+			}
 			
 			/* add F-Curve to group */
-			action_groups_add_channel(act, grp, fcu);
+			action_groups_add_channel(act, agrp, fcu);
 		}
 		else {
 			/* just add F-Curve to end of Action's list */
@@ -542,7 +559,6 @@ static short visualkey_can_use(PointerRNA *ptr, PropertyRNA *prop)
 	const char *identifier = NULL;
 	
 	/* validate data */
-	// TODO: this check is probably not needed, but it won't hurt
 	if (ELEM3(NULL, ptr, ptr->data, prop))
 		return 0;
 		
@@ -618,6 +634,9 @@ static short visualkey_can_use(PointerRNA *ptr, PropertyRNA *prop)
 				case CONSTRAINT_TYPE_TRACKTO:
 					if (searchtype == VISUALKEY_ROT) return 1;
 					break;
+				case CONSTRAINT_TYPE_DAMPTRACK:
+					if (searchtype == VISUALKEY_ROT) return 1;
+					break;
 				case CONSTRAINT_TYPE_ROTLIMIT:
 					if (searchtype == VISUALKEY_ROT) return 1;
 					break;
@@ -939,7 +958,7 @@ short insert_keyframe(ReportList *reports, ID *id, bAction *act, const char grou
 		 *	- if we're replacing keyframes only, DO NOT create new F-Curves if they do not exist yet
 		 *	  but still try to get the F-Curve if it exists...
 		 */
-		fcu = verify_fcurve(act, group, rna_path, array_index, (flag & INSERTKEY_REPLACE) == 0);
+		fcu = verify_fcurve(act, group, &ptr, rna_path, array_index, (flag & INSERTKEY_REPLACE) == 0);
 		
 		/* we may not have a F-Curve when we're replacing only... */
 		if (fcu) {
@@ -1027,7 +1046,7 @@ short delete_keyframe(ReportList *reports, ID *id, bAction *act, const char grou
 	
 	/* will only loop once unless the array index was -1 */
 	for (; array_index < array_index_max; array_index++) {
-		FCurve *fcu = verify_fcurve(act, group, rna_path, array_index, 0);
+		FCurve *fcu = verify_fcurve(act, group, &ptr, rna_path, array_index, 0);
 		short found = -1;
 		int i;
 		
diff --git a/source/blender/editors/armature/BIF_generate.h b/source/blender/editors/armature/BIF_generate.h
index 583178dd2b7..06ee3fbb64c 100644
--- a/source/blender/editors/armature/BIF_generate.h
+++ b/source/blender/editors/armature/BIF_generate.h
@@ -42,7 +42,7 @@ int nextAdaptativeSubdivision(struct ToolSettings *toolsettings, struct BArcIter
 
 struct EditBone *subdivideArcBy(struct ToolSettings *toolsettings, struct bArmature *arm, ListBase *editbones, struct BArcIterator *iter, float invmat[][4], float tmat[][3], NextSubdivisionFunc next_subdividion);
 
-void setBoneRollFromNormal(struct EditBone *bone, float *no, float invmat[][4], float tmat[][3]);
+void setBoneRollFromNormal(struct EditBone *bone, const float no[3], float invmat[][4], float tmat[][3]);
  
 
 #endif /* __BIF_GENERATE_H__ */
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c
index 8ea66934a31..ea3c8685525 100644
--- a/source/blender/editors/armature/editarmature.c
+++ b/source/blender/editors/armature/editarmature.c
@@ -756,7 +756,7 @@ static int pose_visual_transform_apply_exec(bContext *C, wmOperator *UNUSED(op))
 	 *
 	 * TODO, loop over children before parents if multiple bones
 	 * at once are to be predictable*/
-	CTX_DATA_BEGIN (C, bPoseChannel *, pchan, selected_pose_bones)
+	CTX_DATA_BEGIN(C, bPoseChannel *, pchan, selected_pose_bones)
 	{
 		float delta_mat[4][4];
 		
@@ -923,7 +923,7 @@ int join_armature_exec(bContext *C, wmOperator *UNUSED(op))
 	pose = ob->pose;
 	ob->mode &= ~OB_MODE_POSE;
 
-	CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
+	CTX_DATA_BEGIN(C, Base *, base, selected_editable_bases)
 	{
 		if ((base->object->type == OB_ARMATURE) && (base->object != ob)) {
 			bArmature *curarm = base->object->data;
@@ -1195,7 +1195,7 @@ static int separate_armature_exec(bContext *C, wmOperator *UNUSED(op))
 	
 	/* 1) only edit-base selected */
 	// TODO: use context iterators for this?
-	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
+	CTX_DATA_BEGIN(C, Base *, base, visible_bases)
 	{
 		if (base->object == obedit) base->flag |= 1;
 		else base->flag &= ~1;
@@ -1418,7 +1418,8 @@ static void selectconnected_posebonechildren(Object *ob, Bone *bone, int extend)
 /* previously known as "selectconnected_posearmature" */
 static int pose_select_connected_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-	Object *ob = CTX_data_edit_object(C);
+	Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C));
+	bArmature *arm = (bArmature *)ob->data;
 	Bone *bone, *curBone, *next = NULL;
 	int extend = RNA_boolean_get(op->ptr, "extend");
 
@@ -1457,14 +1458,20 @@ static int pose_select_connected_invoke(bContext *C, wmOperator *op, wmEvent *ev
 	for (curBone = bone->childbase.first; curBone; curBone = next)
 		selectconnected_posebonechildren(ob, curBone, extend);
 	
+	/* updates */
 	WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, ob);
+	
+	if (arm->flag & ARM_HAS_VIZ_DEPS) {
+		/* mask modifier ('armature' mode), etc. */
+		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	}
 
 	return OPERATOR_FINISHED;
 }
 
 static int pose_select_linked_poll(bContext *C)
 {
-	return (ED_operator_view3d_active(C) && ED_operator_posemode(C) );
+	return (ED_operator_view3d_active(C) && ED_operator_posemode(C));
 }
 
 void POSE_OT_select_linked(wmOperatorType *ot)
@@ -2290,7 +2297,7 @@ void add_primitive_bone(Scene *scene, View3D *v3d, RegionView3D *rv3d)
 	
 	ED_armature_deselect_all(obedit, 0);
 	
-	/*	Create a bone	*/
+	/* Create a bone */
 	bone = ED_armature_edit_bone_add(arm, "Bone");
 
 	arm->act_edbone = bone;
@@ -2301,7 +2308,6 @@ void add_primitive_bone(Scene *scene, View3D *v3d, RegionView3D *rv3d)
 		add_v3_v3v3(bone->tail, bone->head, imat[1]);   // bone with unit length 1
 	else
 		add_v3_v3v3(bone->tail, bone->head, imat[2]);   // bone with unit length 1, pointing up Z
-	
 }
 
 
@@ -2842,7 +2848,7 @@ static int armature_fill_bones_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 
 	/* loop over all bones, and only consider if visible */
-	CTX_DATA_BEGIN (C, EditBone *, ebone, visible_bones)
+	CTX_DATA_BEGIN(C, EditBone *, ebone, visible_bones)
 	{
 		if (!(ebone->flag & BONE_CONNECTED) && (ebone->flag & BONE_ROOTSEL))
 			fill_add_joint(ebone, 0, &points);
@@ -3556,7 +3562,7 @@ static int armature_subdivide_exec(bContext *C, wmOperator *op)
 	
 	/* loop over all editable bones */
 	// XXX the old code did this in reverse order though!
-	CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones)
+	CTX_DATA_BEGIN(C, EditBone *, ebone, selected_editable_bones)
 	{
 		for (i = numcuts + 1; i > 1; i--) {
 			/* compute cut ratio first */
@@ -3845,7 +3851,7 @@ static int armature_parent_set_exec(bContext *C, wmOperator *op)
 		 */
 		
 		/* parent selected bones to the active one */
-		CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones)
+		CTX_DATA_BEGIN(C, EditBone *, ebone, selected_editable_bones)
 		{
 			if (ELEM(ebone, actbone, actmirb) == 0) {
 				if (ebone->flag & BONE_SELECTED) 
@@ -3871,7 +3877,7 @@ static int armature_parent_set_invoke(bContext *C, wmOperator *UNUSED(op), wmEve
 	uiLayout *layout = uiPupMenuLayout(pup);
 	int allchildbones = 0;
 	
-	CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones)
+	CTX_DATA_BEGIN(C, EditBone *, ebone, selected_editable_bones)
 	{
 		if (ebone != actbone) {
 			if (ebone->parent != actbone) allchildbones = 1;
@@ -3931,7 +3937,7 @@ static int armature_parent_clear_exec(bContext *C, wmOperator *op)
 	bArmature *arm = (bArmature *)ob->data;
 	int val = RNA_enum_get(op->ptr, "type");
 		
-	CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones)
+	CTX_DATA_BEGIN(C, EditBone *, ebone, selected_editable_bones)
 	{
 		editbone_clear_parent(ebone, val);
 	}
@@ -3968,7 +3974,7 @@ void ARMATURE_OT_parent_clear(wmOperatorType *ot)
 static int armature_select_inverse_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	/*	Set the flags */
-	CTX_DATA_BEGIN (C, EditBone *, ebone, visible_bones)
+	CTX_DATA_BEGIN(C, EditBone *, ebone, visible_bones)
 	{
 		/* ignore bone if selection can't change */
 		if ((ebone->flag & BONE_UNSELECTABLE) == 0) {
@@ -4011,7 +4017,7 @@ static int armature_de_select_all_exec(bContext *C, wmOperator *op)
 	}
 	
 	/*	Set the flags */
-	CTX_DATA_BEGIN (C, EditBone *, ebone, visible_bones)
+	CTX_DATA_BEGIN(C, EditBone *, ebone, visible_bones)
 	{
 		/* ignore bone if selection can't change */
 		if ((ebone->flag & BONE_UNSELECTABLE) == 0) {
@@ -4226,8 +4232,8 @@ static int armature_select_similar_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void ARMATURE_OT_select_similar(wmOperatorType *ot) {
-
+void ARMATURE_OT_select_similar(wmOperatorType *ot)
+{
 	/* identifiers */
 	ot->name = "Select Similar";
 	ot->idname = "ARMATURE_OT_select_similar";
@@ -4431,7 +4437,7 @@ static int armature_align_bones_exec(bContext *C, wmOperator *op)
 		 */
 		
 		/* align selected bones to the active one */
-		CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones)
+		CTX_DATA_BEGIN(C, EditBone *, ebone, selected_editable_bones)
 		{
 			if (ELEM(ebone, actbone, actmirb) == 0) {
 				if (ebone->flag & BONE_SELECTED)
@@ -4517,13 +4523,12 @@ int ED_do_pose_selectbuffer(Scene *scene, Base *base, unsigned int *buffer, shor
 		 * note, special exception for armature mode so we can do multi-select
 		 * we could check for multi-select explicitly but think its fine to
 		 * always give predictable behavior in weight paint mode - campbell */
-		if ((!extend && !deselect && !toggle)|| ((ob_act && (ob_act != ob) && (ob_act->mode & OB_MODE_WEIGHT_PAINT) == 0))) {
+		if ((!extend && !deselect && !toggle) ||
+		    ((ob_act && (ob_act != ob) && (ob_act->mode & OB_MODE_WEIGHT_PAINT) == 0)))
+		{
 			ED_pose_deselectall(ob, 0);
 			nearBone->flag |= (BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
 			arm->act_bone = nearBone;
-			
-			// XXX old cruft! use notifiers instead
-			//select_actionchannel_by_name(ob->action, nearBone->name, 1);
 		}
 		else {
 			if (extend) {
@@ -4541,29 +4546,30 @@ int ED_do_pose_selectbuffer(Scene *scene, Base *base, unsigned int *buffer, shor
 					}
 					else {
 						nearBone->flag &= ~(BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
-					
-						// XXX old cruft! use notifiers instead
-						//select_actionchannel_by_name(ob->action, nearBone->name, 0);
 					}
 				}
 				else {
 					nearBone->flag |= (BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
 					arm->act_bone = nearBone;
-				
-					// XXX old cruft! use notifiers instead
-					//select_actionchannel_by_name(ob->action, nearBone->name, 1);
 				}
 			}	
 		}
 		
-		/* in weightpaint we select the associated vertex group too */
-		if (ob_act && ob_act->mode & OB_MODE_WEIGHT_PAINT) {
-			if (nearBone == arm->act_bone) {
-				ED_vgroup_select_by_name(OBACT, nearBone->name);
-				DAG_id_tag_update(&OBACT->id, OB_RECALC_DATA);
+		if (ob_act) {
+			/* in weightpaint we select the associated vertex group too */
+			if (ob_act->mode & OB_MODE_WEIGHT_PAINT) {
+				if (nearBone == arm->act_bone) {
+					ED_vgroup_select_by_name(ob_act, nearBone->name);
+					DAG_id_tag_update(&ob_act->id, OB_RECALC_DATA);
+				}
+			}
+			/* if there are some dependencies for visualising armature state 
+			 * (e.g. Mask Modifier in 'Armature' mode), force update 
+			 */
+			else if (arm->flag & ARM_HAS_VIZ_DEPS) {
+				DAG_id_tag_update(&ob_act->id, OB_RECALC_DATA);
 			}
 		}
-		
 	}
 	
 	return nearBone != NULL;
@@ -5130,7 +5136,7 @@ static int pose_clear_transform_generic_exec(bContext *C, wmOperator *op,
 	}
 	
 	/* only clear relevant transforms for selected bones */
-	CTX_DATA_BEGIN (C, bPoseChannel *, pchan, selected_pose_bones)
+	CTX_DATA_BEGIN(C, bPoseChannel *, pchan, selected_pose_bones)
 	{
 		/* run provided clearing function */
 		clear_func(pchan);
@@ -5265,6 +5271,8 @@ static int pose_de_select_all_exec(bContext *C, wmOperator *op)
 	int action = RNA_enum_get(op->ptr, "action");
 	
 	Scene *scene = CTX_data_scene(C);
+	Object *ob = ED_object_context(C);
+	bArmature *arm = ob->data;
 	int multipaint = scene->toolsettings->multipaint;
 
 	if (action == SEL_TOGGLE) {
@@ -5272,7 +5280,7 @@ static int pose_de_select_all_exec(bContext *C, wmOperator *op)
 	}
 	
 	/*	Set the flags */
-	CTX_DATA_BEGIN (C, bPoseChannel *, pchan, visible_pose_bones)
+	CTX_DATA_BEGIN(C, bPoseChannel *, pchan, visible_pose_bones)
 	{
 		/* select pchan only if selectable, but deselect works always */
 		switch (action) {
@@ -5297,8 +5305,8 @@ static int pose_de_select_all_exec(bContext *C, wmOperator *op)
 
 	WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, NULL);
 	
-	if (multipaint) {
-		Object *ob = ED_object_context(C);
+	/* weightpaint or mask modifiers need depsgraph updates */
+	if (multipaint || (arm->flag & ARM_HAS_VIZ_DEPS)) {
 		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	}
 
@@ -5325,12 +5333,12 @@ void POSE_OT_select_all(wmOperatorType *ot)
 static int pose_select_parent_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C));
+	bArmature *arm = (bArmature *)ob->data;
 	bPoseChannel *pchan, *parent;
 
-	/*	Determine if there is an active bone */
+	/* Determine if there is an active bone */
 	pchan = CTX_data_active_pose_bone(C);
 	if (pchan) {
-		bArmature *arm = ob->data;
 		parent = pchan->parent;
 		if ((parent) && !(parent->bone->flag & (BONE_HIDDEN_P | BONE_UNSELECTABLE))) {
 			parent->bone->flag |= BONE_SELECTED;
@@ -5343,9 +5351,15 @@ static int pose_select_parent_exec(bContext *C, wmOperator *UNUSED(op))
 	else {
 		return OPERATOR_CANCELLED;
 	}
-
+	
+	/* updates */
 	WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, ob);
 	
+	if (arm->flag & ARM_HAS_VIZ_DEPS) {
+		/* mask modifier ('armature' mode), etc. */
+		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	}
+	
 	return OPERATOR_FINISHED;
 }
 
@@ -5662,7 +5676,7 @@ static int armature_flip_names_exec(bContext *C, wmOperator *UNUSED(op))
 	arm = ob->data;
 	
 	/* loop through selected bones, auto-naming them */
-	CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones)
+	CTX_DATA_BEGIN(C, EditBone *, ebone, selected_editable_bones)
 	{
 		flip_side_name(newname, ebone->name, TRUE); // 1 = do strip off number extensions
 		ED_armature_bone_rename(arm, ebone->name, newname);
@@ -5707,7 +5721,7 @@ static int armature_autoside_names_exec(bContext *C, wmOperator *op)
 	arm = ob->data;
 	
 	/* loop through selected bones, auto-naming them */
-	CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones)
+	CTX_DATA_BEGIN(C, EditBone *, ebone, selected_editable_bones)
 	{
 		BLI_strncpy(newname, ebone->name, sizeof(newname));
 		if (bone_autoside_name(newname, 1, axis, ebone->head[axis], ebone->tail[axis]))
@@ -5730,7 +5744,8 @@ void ARMATURE_OT_autoside_names(wmOperatorType *ot)
 		{0, "XAXIS", 0, "X-Axis", "Left/Right"},
 		{1, "YAXIS", 0, "Y-Axis", "Front/Back"},
 		{2, "ZAXIS", 0, "Z-Axis", "Top/Bottom"},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 	
 	/* identifiers */
 	ot->name = "AutoName by Axis";
diff --git a/source/blender/editors/armature/editarmature_generate.c b/source/blender/editors/armature/editarmature_generate.c
index 7f966dbc884..23dd3b15476 100644
--- a/source/blender/editors/armature/editarmature_generate.c
+++ b/source/blender/editors/armature/editarmature_generate.c
@@ -50,7 +50,7 @@
 #include "armature_intern.h"
 #include "BIF_generate.h"
 
-void setBoneRollFromNormal(EditBone *bone, float *no, float UNUSED(invmat[][4]), float tmat[][3])
+void setBoneRollFromNormal(EditBone *bone, const float no[3], float UNUSED(invmat[][4]), float tmat[][3])
 {
 	if (no != NULL && !is_zero_v3(no)) {
 		float normal[3];
diff --git a/source/blender/editors/armature/editarmature_retarget.c b/source/blender/editors/armature/editarmature_retarget.c
index d90bd96a6f1..91c342ec070 100644
--- a/source/blender/editors/armature/editarmature_retarget.c
+++ b/source/blender/editors/armature/editarmature_retarget.c
@@ -81,20 +81,17 @@ typedef struct RetargetParam {
 	bContext    *context;
 } RetargetParam;
 
-typedef enum 
-{
+typedef enum  {
 	RETARGET_LENGTH,
 	RETARGET_AGGRESSIVE
 } RetargetMode; 
 
-typedef enum
-{
+typedef enum {
 	METHOD_BRUTE_FORCE = 0,
 	METHOD_MEMOIZE = 1
 } RetargetMethod;
 
-typedef enum
-{
+typedef enum {
 	ARC_FREE = 0,
 	ARC_TAKEN = 1,
 	ARC_USED = 2
diff --git a/source/blender/editors/armature/poselib.c b/source/blender/editors/armature/poselib.c
index 36c15c50809..18e3d967835 100644
--- a/source/blender/editors/armature/poselib.c
+++ b/source/blender/editors/armature/poselib.c
@@ -1236,7 +1236,7 @@ static int poselib_preview_handle_event(bContext *UNUSED(C), wmOperator *op, wmE
 			case PAD5: case PAD6: case PAD7: case PAD8: case PAD9:
 			case PADPLUSKEY: case PADMINUS: 
 			case MIDDLEMOUSE: case MOUSEMOVE:
-				//pld->redraw= PL_PREVIEW_REDRAWHEADER;
+				//pld->redraw = PL_PREVIEW_REDRAWHEADER;
 				ret = OPERATOR_PASS_THROUGH;
 				break;
 				
@@ -1365,7 +1365,7 @@ static int poselib_preview_handle_event(bContext *UNUSED(C), wmOperator *op, wmE
 		 * even though we still maintain control (as RUNNING_MODAL flag is still set too)
 		 */
 		case MIDDLEMOUSE: case MOUSEMOVE:
-			//pld->redraw= PL_PREVIEW_REDRAWHEADER;
+			//pld->redraw = PL_PREVIEW_REDRAWHEADER;
 			ret = OPERATOR_PASS_THROUGH;
 			break;
 			
@@ -1379,7 +1379,7 @@ static int poselib_preview_handle_event(bContext *UNUSED(C), wmOperator *op, wmE
 			}
 			else {
 				/* view manipulation (see above) */
-				//pld->redraw= PL_PREVIEW_REDRAWHEADER;
+				//pld->redraw = PL_PREVIEW_REDRAWHEADER;
 				ret = OPERATOR_PASS_THROUGH;
 			}
 			break;
diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c
index df970171a54..9bcbf313f13 100644
--- a/source/blender/editors/armature/poseobject.c
+++ b/source/blender/editors/armature/poseobject.c
@@ -119,8 +119,8 @@ void ED_armature_exit_posemode(bContext *C, Base *base)
 	}	
 }
 
-/* if a selected or active bone is protected, throw error (oonly if warn==1) and return 1 */
-/* only_selected==1 : the active bone is allowed to be protected */
+/* if a selected or active bone is protected, throw error (oonly if warn == 1) and return 1 */
+/* only_selected == 1: the active bone is allowed to be protected */
 #if 0 /* UNUSED 2.5 */
 static short pose_has_protected_selected(Object *ob, short warn)
 {
@@ -391,6 +391,7 @@ void POSE_OT_paths_clear(wmOperatorType *ot)
 static int pose_select_constraint_target_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C));
+	bArmature *arm = (bArmature *)ob->data;
 	bConstraint *con;
 	int found = 0;
 	
@@ -422,12 +423,18 @@ static int pose_select_constraint_target_exec(bContext *C, wmOperator *UNUSED(op
 		}
 	}
 	CTX_DATA_END;
-
+	
 	if (!found)
 		return OPERATOR_CANCELLED;
-
+	
+	/* updates */
 	WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, ob);
-
+	
+	if (arm->flag & ARM_HAS_VIZ_DEPS) {
+		/* mask modifier ('armature' mode), etc. */
+		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	}
+	
 	return OPERATOR_FINISHED;
 }
 
@@ -477,7 +484,6 @@ static int pose_select_hierarchy_exec(bContext *C, wmOperator *op)
 					}
 				} 
 				else { /* direction == BONE_SELECT_CHILD */
-
 					/* the child member is only assigned to connected bones, see [#30340] */
 #if 0
 					if (pchan->child == NULL) continue;
@@ -518,9 +524,15 @@ static int pose_select_hierarchy_exec(bContext *C, wmOperator *op)
 
 	if (found == 0)
 		return OPERATOR_CANCELLED;
-
+	
+	/* updates */
 	WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, ob);
-
+	
+	if (arm->flag & ARM_HAS_VIZ_DEPS) {
+		/* mask modifier ('armature' mode), etc. */
+		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	}
+	
 	return OPERATOR_FINISHED;
 }
 
@@ -547,7 +559,6 @@ void POSE_OT_select_hierarchy(wmOperatorType *ot)
 	/* props */
 	ot->prop = RNA_def_enum(ot->srna, "direction", direction_items, BONE_SELECT_PARENT, "Direction", "");
 	RNA_def_boolean(ot->srna, "extend", 0, "Add to Selection", "");
-	
 }
 
 /* ******************* select grouped operator ************* */
@@ -571,7 +582,7 @@ static short pose_select_same_group(bContext *C, Object *ob, short extend)
 		
 	/* alloc a small array to keep track of the groups to use 
 	 *  - each cell stores on/off state for whether group should be used
-	 *	- size is numGroups + 1, since index=0 is used for no-group
+	 *	- size is (numGroups + 1), since (index = 0) is used for no-group
 	 */
 	group_flags = MEM_callocN(numGroups + 1, "pose_select_same_group");
 	
@@ -711,6 +722,7 @@ static int pose_select_same_keyingset(bContext *C, Object *ob, short extend)
 static int pose_select_grouped_exec(bContext *C, wmOperator *op)
 {
 	Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C));
+	bArmature *arm = (bArmature *)ob->data;
 	short extend = RNA_boolean_get(op->ptr, "extend");
 	short changed = 0;
 	
@@ -736,6 +748,11 @@ static int pose_select_grouped_exec(bContext *C, wmOperator *op)
 	/* notifiers for updates */
 	WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
 	
+	if (arm->flag & ARM_HAS_VIZ_DEPS) {
+		/* mask modifier ('armature' mode), etc. */
+		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	}
+	
 	/* report done status */
 	if (changed)
 		return OPERATOR_FINISHED;
diff --git a/source/blender/editors/armature/reeb.c b/source/blender/editors/armature/reeb.c
index a629312e732..20b95ea55d6 100644
--- a/source/blender/editors/armature/reeb.c
+++ b/source/blender/editors/armature/reeb.c
@@ -475,8 +475,8 @@ static void NodeDegreeIncrement(ReebGraph *UNUSED(rg), ReebNode *node)
 }
 
 #else
-#define NodeDegreeDecrement(rg, node) {node->degree--; }
-#define NodeDegreeIncrement(rg, node) {node->degree++; }
+#  define NodeDegreeDecrement(rg, node) {node->degree--; } (void)0
+#  define NodeDegreeIncrement(rg, node) {node->degree++; } (void)0
 #endif
 
 void repositionNodes(ReebGraph *rg)
diff --git a/source/blender/editors/curve/curve_ops.c b/source/blender/editors/curve/curve_ops.c
index dea7ccb161d..27c40095348 100644
--- a/source/blender/editors/curve/curve_ops.c
+++ b/source/blender/editors/curve/curve_ops.c
@@ -141,14 +141,14 @@ void ED_operatormacros_curve(void)
 	wmOperatorTypeMacro *otmacro;
 
 	ot = WM_operatortype_append_macro("CURVE_OT_duplicate_move", "Add Duplicate", "Duplicate curve and move",
-	                                  OPTYPE_UNDO|OPTYPE_REGISTER);
+	                                  OPTYPE_UNDO | OPTYPE_REGISTER);
 	WM_operatortype_macro_define(ot, "CURVE_OT_duplicate");
 	otmacro = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
 	RNA_enum_set(otmacro->ptr, "proportional", 0);
 	RNA_boolean_set(otmacro->ptr, "mirror", FALSE);
 
 	ot = WM_operatortype_append_macro("CURVE_OT_extrude_move", "Extrude Curve and Move",
-	                                  "Extrude curve and move result", OPTYPE_UNDO|OPTYPE_REGISTER);
+	                                  "Extrude curve and move result", OPTYPE_UNDO | OPTYPE_REGISTER);
 	WM_operatortype_macro_define(ot, "CURVE_OT_extrude");
 	otmacro = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
 	RNA_enum_set(otmacro->ptr, "proportional", 0);
@@ -189,8 +189,8 @@ void ED_keymap_curve(wmKeyConfig *keyconf)
 	RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_move_select", ENDKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", LINE_END);
 	RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_move_select", LEFTARROWKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", PREV_CHAR);
 	RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_move_select", RIGHTARROWKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", NEXT_CHAR);
-	RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_move_select", LEFTARROWKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0)->ptr, "type", PREV_WORD);
-	RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_move_select", RIGHTARROWKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0)->ptr, "type", NEXT_WORD);
+	RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_move_select", LEFTARROWKEY, KM_PRESS, KM_SHIFT | KM_CTRL, 0)->ptr, "type", PREV_WORD);
+	RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_move_select", RIGHTARROWKEY, KM_PRESS, KM_SHIFT | KM_CTRL, 0)->ptr, "type", NEXT_WORD);
 	RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_move_select", UPARROWKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", PREV_LINE);
 	RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_move_select", DOWNARROWKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", NEXT_LINE);
 	RNA_enum_set(WM_keymap_add_item(keymap, "FONT_OT_move_select", PAGEUPKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", PREV_PAGE);
@@ -224,9 +224,9 @@ void ED_keymap_curve(wmKeyConfig *keyconf)
 	WM_keymap_add_item(keymap, "CURVE_OT_vertex_add", LEFTMOUSE, KM_CLICK, KM_CTRL, 0);
 
 	kmi = WM_keymap_add_item(keymap, "CURVE_OT_select_all", AKEY, KM_PRESS, 0, 0);
-		RNA_enum_set(kmi->ptr, "action", SEL_TOGGLE);
+	RNA_enum_set(kmi->ptr, "action", SEL_TOGGLE);
 	kmi = WM_keymap_add_item(keymap, "CURVE_OT_select_all", IKEY, KM_PRESS, KM_CTRL, 0);
-		RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
+	RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
 
 	WM_keymap_add_item(keymap, "CURVE_OT_select_row", RKEY, KM_PRESS, KM_SHIFT, 0);
 	WM_keymap_add_item(keymap, "CURVE_OT_select_more", PADPLUSKEY, KM_PRESS, KM_CTRL, 0);
@@ -264,6 +264,7 @@ void ED_keymap_curve(wmKeyConfig *keyconf)
 	/* menus */
 	WM_keymap_add_menu(keymap, "VIEW3D_MT_hook", HKEY, KM_PRESS, KM_CTRL, 0);
 
-	ED_object_generic_keymap(keyconf, keymap, 3);
+	ED_keymap_proportional_cycle(keyconf, keymap);
+	ED_keymap_proportional_editmode(keyconf, keymap, TRUE);
 }
 
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index 431ce15a26d..2fa7b4b2126 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -356,6 +356,11 @@ static CVKeyIndex *getCVKeyIndex(EditNurb *editnurb, void *cv)
 	return BLI_ghash_lookup(editnurb->keyindex, cv);
 }
 
+static CVKeyIndex *popCVKeyIndex(EditNurb *editnurb, void *cv)
+{
+	return BLI_ghash_pop(editnurb->keyindex, cv, NULL);
+}
+
 static BezTriple *getKeyIndexOrig_bezt(EditNurb *editnurb, BezTriple *bezt)
 {
 	CVKeyIndex *index = getCVKeyIndex(editnurb, bezt);
@@ -459,9 +464,7 @@ static void keyIndex_updateCV(EditNurb *editnurb, char *cv,
 	}
 
 	for (i = 0; i < count; i++) {
-		index = getCVKeyIndex(editnurb, cv);
-
-		BLI_ghash_remove(editnurb->keyindex, cv, NULL, NULL);
+		index = popCVKeyIndex(editnurb, cv);
 
 		if (index) {
 			BLI_ghash_insert(editnurb->keyindex, newcv, index);
@@ -496,11 +499,8 @@ static void keyIndex_updateNurb(EditNurb *editnurb, Nurb *nu, Nurb *newnu)
 
 static void keyIndex_swap(EditNurb *editnurb, void *a, void *b)
 {
-	CVKeyIndex *index1 = getCVKeyIndex(editnurb, a);
-	CVKeyIndex *index2 = getCVKeyIndex(editnurb, b);
-
-	BLI_ghash_remove(editnurb->keyindex, a, NULL, NULL);
-	BLI_ghash_remove(editnurb->keyindex, b, NULL, NULL);
+	CVKeyIndex *index1 = popCVKeyIndex(editnurb, a);
+	CVKeyIndex *index2 = popCVKeyIndex(editnurb, b);
 
 	if (index2) BLI_ghash_insert(editnurb->keyindex, a, index2);
 	if (index1) BLI_ghash_insert(editnurb->keyindex, b, index1);
@@ -1448,7 +1448,7 @@ static short isNurbselUV(Nurb *nu, int *u, int *v, int flag)
 			if (*u == -1) *u = b;
 			else return 0;
 		}
-		else if (sel > 1) return 0;  /* because sel==1 is still ok */
+		else if (sel > 1) return 0;  /* because sel == 1 is still ok */
 	}
 
 	for (a = 0; a < nu->pntsu; a++) {
@@ -2965,7 +2965,7 @@ static void subdividenurb(Object *obedit, int number_cuts)
 					BKE_nurb_knot_calc_u(nu);
 				}
 			}
-		} /* End of 'else if (nu->pntsv==1)' */
+		} /* End of 'else if (nu->pntsv == 1)' */
 		else if (nu->type == CU_NURBS) {
 			/* This is a very strange test ... */
 			/**
@@ -3085,7 +3085,7 @@ static void subdividenurb(Object *obedit, int number_cuts)
 				nu->pntsv = (number_cuts + 1) * nu->pntsv - number_cuts;
 				BKE_nurb_knot_calc_u(nu);
 				BKE_nurb_knot_calc_v(nu);
-			} /* End of 'if (sel== nu->pntsu*nu->pntsv)' (subdivide entire NURB) */
+			} /* End of 'if (sel == nu->pntsu*nu->pntsv)' (subdivide entire NURB) */
 			else {
 				/* subdivide in v direction? */
 				sel = 0;
@@ -3258,7 +3258,7 @@ static void findnearestNurbvert__doClosest(void *userData, Nurb *nu, BPoint *bp,
 
 static short findnearestNurbvert(ViewContext *vc, short sel, const int mval[2], Nurb **nurb, BezTriple **bezt, BPoint **bp)
 {
-	/* sel==1: selected gets a disadvantage */
+	/* (sel == 1): selected gets a disadvantage */
 	/* in nurb and bezt or bp the nearest is written */
 	/* return 0 1 2: handlepunt */
 	struct { BPoint *bp; BezTriple *bezt; Nurb *nurb; int dist, hpoint, select, mval[2]; } data = {NULL};
@@ -3530,7 +3530,8 @@ void CURVE_OT_spline_type_set(wmOperatorType *ot)
 //		{CU_CARDINAL, "CARDINAL", 0, "Cardinal", ""},
 //		{CU_BSPLINE, "B_SPLINE", 0, "B-Spline", ""},
 		{CU_NURBS, "NURBS", 0, "NURBS", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	/* identifiers */
 	ot->name = "Set Spline Type";
@@ -3573,7 +3574,8 @@ void CURVE_OT_handle_type_set(wmOperatorType *ot)
 		{5, "ALIGNED", 0, "Aligned", ""},
 		{6, "FREE_ALIGN", 0, "Free", ""},
 		{3, "TOGGLE_FREE_ALIGN", 0, "Toggle Free/Align", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	/* identifiers */
 	ot->name = "Set Handle Type";
@@ -3765,8 +3767,8 @@ static void merge_2_nurb(wmOperator *op, ListBase *editnurb, Nurb *nu1, Nurb *nu
 	
 	if (is_u_selected(nu1, nu1->pntsu - 1) ) ;
 	else {
-		/* For 2D curves blender uses orderv=0. It doesn't make any sense mathematically. */
-		/* but after rotating orderu=0 will be confusing. */
+		/* For 2D curves blender uses (orderv = 0). It doesn't make any sense mathematically. */
+		/* but after rotating (orderu = 0) will be confusing. */
 		if (nu1->orderv == 0) nu1->orderv = 1;
 
 		rotate_direction_nurb(nu1);
@@ -4886,7 +4888,8 @@ void CURVE_OT_cyclic_toggle(wmOperatorType *ot)
 	static EnumPropertyItem direction_items[] = {
 		{0, "CYCLIC_U", 0, "Cyclic U", ""},
 		{1, "CYCLIC_V", 0, "Cyclic V", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	/* identifiers */
 	ot->name = "Toggle Cyclic";
@@ -6007,7 +6010,8 @@ void CURVE_OT_delete(wmOperatorType *ot)
 		{0, "SELECTED", 0, "Select", ""},
 		{1, "SEGMENT", 0, "Segment", ""},
 		{2, "ALL", 0, "All", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	/* identifiers */
 	ot->name = "Delete";
@@ -6101,7 +6105,7 @@ int join_curve_exec(bContext *C, wmOperator *UNUSED(op))
 	/* trasnform all selected curves inverse in obact */
 	invert_m4_m4(imat, ob->obmat);
 	
-	CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
+	CTX_DATA_BEGIN(C, Base *, base, selected_editable_bases)
 	{
 		if (base->object->type == ob->type) {
 			if (base->object != ob) {
diff --git a/source/blender/editors/curve/lorem.c b/source/blender/editors/curve/lorem.c
index 66b358e04e5..7823be3df6d 100644
--- a/source/blender/editors/curve/lorem.c
+++ b/source/blender/editors/curve/lorem.c
@@ -25,7 +25,7 @@
 
 #include "curve_intern.h"
 
-const char ED_lorem[]= {
+const char ED_lorem[] = {
 76, 111, 114, 101, 109,  32, 105, 112, 115, 117, 109,  32, 100, 111, 108, 111, 114,  32, 115, 105, 116,  32,  97, 109, 101, 116,  44,  32,  99,
 111, 110, 115, 101,  99, 116, 101, 116, 117, 101, 114,  32,  97, 100, 105, 112, 105, 115,  99, 105, 110, 103,  32, 101, 108, 105, 116,  46,  32,  65, 108, 105,
 113, 117,  97, 109,  32, 116, 114, 105, 115, 116, 105, 113, 117, 101,  32, 105, 110, 116, 101, 114, 100, 117, 109,  32, 115, 101, 109,  46,  32,  78, 117, 108,
diff --git a/source/blender/editors/datafiles/Bfont.c b/source/blender/editors/datafiles/Bfont.c
index 969bc5a844d..30126c97d34 100644
--- a/source/blender/editors/datafiles/Bfont.c
+++ b/source/blender/editors/datafiles/Bfont.c
@@ -30,8 +30,8 @@
  *  \brief DataToC output of file <Bfont>
  */
 
-int datatoc_Bfont_size= 25181;
-char datatoc_Bfont[25181]= {
+int datatoc_Bfont_size = 25181;
+char datatoc_Bfont[25181] = {
 128, 1, 228, 1, 0, 0, 37, 33, 80, 83, 45, 65, 100, 111, 98, 101,
 70, 111, 110, 116, 45, 49, 46, 48, 58, 32, 66, 102, 111, 110, 116, 32,
 48, 48, 49, 46, 48, 48, 49, 10, 49, 49, 32, 100, 105, 99, 116, 32,
diff --git a/source/blender/editors/datafiles/startup.blend.c b/source/blender/editors/datafiles/startup.blend.c
index 2a1d3a602d8..7337ab8c4e9 100644
--- a/source/blender/editors/datafiles/startup.blend.c
+++ b/source/blender/editors/datafiles/startup.blend.c
@@ -1,14 +1,13 @@
 /* DataToC output of file <startup_blend> */
 
-int datatoc_startup_blend_size = 375392;
+int datatoc_startup_blend_size = 379676;
 char datatoc_startup_blend[] = {
-
- 66, 76, 69, 78, 68, 69, 82, 45,118, 50, 54, 51, 82, 69, 78, 68, 72,  0,  0,  0,  0,201,255,255,255,127,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  0,  1,  0,  0,  0,250,  0,  0,  0, 83, 99,101,110,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 66, 76, 69, 78, 68, 69, 82, 45,118, 50, 54, 51, 82, 69, 78, 68, 72,  0,  0,  0,144,195,255,255,255,127,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,250,  0,  0,  0, 83, 99,101,110,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 71, 76, 79, 66, 48,  4,  0,  0, 16,197,255,255,255,127,  0,  0,217,  0,  0,  0,
-  1,  0,  0,  0, 32, 32, 32, 54,  6,  0,  0,  0,250,  0,  0,  0,  1,  0,  0,  1,104, 63,166,  5,  0,  0,  0,  0,120,184,168,  5,
-  0,  0,  0,  0,  0, 16,  0,  0,128, 32,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 71, 76, 79, 66, 48,  4,  0,  0,160,191,255,255,255,127,  0,  0,
+218,  0,  0,  0,  1,  0,  0,  0, 32, 32, 32, 56,  8,  0,  0,  0,250,  0,  0,  0,  1,  0,  0,  1,184,100,201,  4,  0,  0,  0,  0,
+ 40, 92,222,  4,  0,  0,  0,  0,  0, 16,  0,  0,128, 32,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -40,1149 +39,1158 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 87, 77,  0,  0, 88,  1,  0,  0, 40, 39,147,  5,
-  0,  0,  0,  0,154,  1,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 87, 77, 87,105,110, 77, 97,110,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 87, 77,  0,  0, 88,  1,  0,  0,
+248,149,200,  4,  0,  0,  0,  0,154,  1,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 87, 77, 87,105,110, 77, 97,110,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200, 40,147,  5,  0,  0,  0,  0,200, 40,147,  5,
-  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0,  0,  0,
-  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,216,151, 87,  4,  0,  0,  0,  0,184,153, 87,  4,  0,  0,  0,  0,216,151, 87,  4,  0,  0,  0,  0,200,152, 87,  4,
-  0,  0,  0,  0,184,153, 87,  4,  0,  0,  0,  0,216,227,132,  5,  0,  0,  0,  0,216,227,132,  5,  0,  0,  0,  0,216,227,132,  5,
-  0,  0,  0,  0, 68, 65, 84, 65,  0,  1,  0,  0,200, 40,147,  5,  0,  0,  0,  0,155,  1,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,155, 87,  4,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,104, 63,166,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,115, 99,114,101,101,110,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  7, 32,  4,  0,  0,  0,  0,  0,  0,238,  3,  0,  0,  0,  0,
-  0,  0,  0,  0,120,111,103,  4,  0,  0,  0,  0,104,117,132,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
-  0,  0,  0,  0,216, 88,117,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,104,125,123,  5,
-  0,  0,  0,  0,200,123,123,  5,  0,  0,  0,  0,152,124,123,  5,  0,  0,  0,  0,152,124,123,  5,  0,  0,  0,  0,104,117,132,  5,
-  0,  0,  0,  0, 40, 68,137,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 78,  0,  0,
-  8,  1,  0,  0, 24, 42,147,  5,  0,  0,  0,  0,211,  0,  0,  0,  1,  0,  0,  0,248,134,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 82, 65,110,105,109, 97,116,105,111,110,  0,
- 46, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,104,137, 95,  4,  0,  0,  0,  0,216, 43,147,  5,  0,  0,  0,  0, 72, 44,147,  5,
-  0,  0,  0,  0,136, 56,147,  5,  0,  0,  0,  0,248, 56,147,  5,  0,  0,  0,  0,184,125,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 32,  0,  0,  0,104,137, 95,  4,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,104, 44,140,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,104, 44,140,  5,
-  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0, 24, 48,137,  5,  0,  0,  0,  0,104,137, 95,  4,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,222,  2,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 24, 48,137,  5,  0,  0,  0,  0,212,  0,  0,  0,
-  1,  0,  0,  0,136,135,137,  5,  0,  0,  0,  0,104, 44,140,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  4,222,  2,
-  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,136,135,137,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,168,152,137,  5,
-  0,  0,  0,  0, 24, 48,137,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 32,  0,  0,  0,168,152,137,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0, 88, 56,135,  5,  0,  0,  0,  0,136,135,137,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,195,  2,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 88, 56,135,  5,
-  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,  8, 61,135,  5,  0,  0,  0,  0,168,152,137,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,240,  4,195,  2,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,  8, 61,135,  5,  0,  0,  0,  0,212,  0,  0,  0,
-  1,  0,  0,  0, 40, 76,135,  5,  0,  0,  0,  0, 88, 56,135,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,  4,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 40, 76,135,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,184, 88,135,  5,
-  0,  0,  0,  0,  8, 61,135,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,  4,195,  2,  1,  0,  0,  0, 68, 65, 84, 65,
- 32,  0,  0,  0,184, 88,135,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,248,104,133,  5,  0,  0,  0,  0, 40, 76,135,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,  4, 60,  1,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,248,104,133,  5,
-  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0, 72,225,140,  5,  0,  0,  0,  0,184, 88,135,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,240,  4, 60,  1,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 72,225,140,  5,  0,  0,  0,  0,212,  0,  0,  0,
-  1,  0,  0,  0,152, 68,137,  5,  0,  0,  0,  0,248,104,133,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,152, 68,137,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,248,164,137,  5,
-  0,  0,  0,  0, 72,225,140,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,  4, 88,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 32,  0,  0,  0,248,164,137,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,216,144,139,  5,  0,  0,  0,  0,152, 68,137,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,192,  1, 88,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,216,144,139,  5,
-  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,152,213,132,  5,  0,  0,  0,  0,248,164,137,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,192,  1,195,  2,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,152,213,132,  5,  0,  0,  0,  0,212,  0,  0,  0,
-  1,  0,  0,  0,168,134,139,  5,  0,  0,  0,  0,216,144,139,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  1,
-  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,168,134,139,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,104, 43,147,  5,
-  0,  0,  0,  0,152,213,132,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,192,  1,  4,  1,  0,  0,  0,  0, 68, 65, 84, 65,
- 32,  0,  0,  0,104, 43,147,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,216, 43,147,  5,  0,  0,  0,  0,168,134,139,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,  4, 60,  2,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,216, 43,147,  5,
-  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,104, 43,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,240,  4, 60,  2,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 72, 44,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0,184, 44,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24, 48,137,  5,  0,  0,  0,  0,104, 44,140,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,184, 44,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0, 40, 45,147,  5,  0,  0,  0,  0, 72, 44,147,  5,  0,  0,  0,  0,168,152,137,  5,  0,  0,  0,  0,104, 44,140,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 40, 45,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0,152, 45,147,  5,  0,  0,  0,  0,184, 44,147,  5,  0,  0,  0,  0, 88, 56,135,  5,  0,  0,  0,  0, 24, 48,137,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,152, 45,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0,  8, 46,147,  5,  0,  0,  0,  0, 40, 45,147,  5,  0,  0,  0,  0, 88, 56,135,  5,  0,  0,  0,  0,168,152,137,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,  8, 46,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0,120, 46,147,  5,  0,  0,  0,  0,152, 45,147,  5,  0,  0,  0,  0,104,137, 95,  4,  0,  0,  0,  0,  8, 61,135,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,120, 46,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0,232, 46,147,  5,  0,  0,  0,  0,  8, 46,147,  5,  0,  0,  0,  0,  8, 61,135,  5,  0,  0,  0,  0,136,135,137,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,232, 46,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0, 88, 47,147,  5,  0,  0,  0,  0,120, 46,147,  5,  0,  0,  0,  0, 88, 56,135,  5,  0,  0,  0,  0, 40, 76,135,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 88, 47,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0,200, 47,147,  5,  0,  0,  0,  0,232, 46,147,  5,  0,  0,  0,  0,  8, 61,135,  5,  0,  0,  0,  0,184, 88,135,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,200, 47,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0, 56, 48,147,  5,  0,  0,  0,  0, 88, 47,147,  5,  0,  0,  0,  0,248,104,133,  5,  0,  0,  0,  0,136,135,137,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 56, 48,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0,168, 48,147,  5,  0,  0,  0,  0,200, 47,147,  5,  0,  0,  0,  0,248,104,133,  5,  0,  0,  0,  0,184, 88,135,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,168, 48,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0, 24, 49,147,  5,  0,  0,  0,  0, 56, 48,147,  5,  0,  0,  0,  0,104,137, 95,  4,  0,  0,  0,  0, 72,225,140,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 24, 49,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0,136, 49,147,  5,  0,  0,  0,  0,168, 48,147,  5,  0,  0,  0,  0, 40, 76,135,  5,  0,  0,  0,  0,152, 68,137,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,136, 49,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0,248, 49,147,  5,  0,  0,  0,  0, 24, 49,147,  5,  0,  0,  0,  0,  8, 61,135,  5,  0,  0,  0,  0,152, 68,137,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,248, 49,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0,104, 50,147,  5,  0,  0,  0,  0,136, 49,147,  5,  0,  0,  0,  0,152, 68,137,  5,  0,  0,  0,  0, 72,225,140,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,104, 50,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0,216, 50,147,  5,  0,  0,  0,  0,248, 49,147,  5,  0,  0,  0,  0,248,164,137,  5,  0,  0,  0,  0, 72,225,140,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,216, 50,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0, 72, 51,147,  5,  0,  0,  0,  0,104, 50,147,  5,  0,  0,  0,  0,152, 68,137,  5,  0,  0,  0,  0,248,164,137,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 72, 51,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0,184, 51,147,  5,  0,  0,  0,  0,216, 50,147,  5,  0,  0,  0,  0,168,152,137,  5,  0,  0,  0,  0,216,144,139,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,184, 51,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0, 40, 52,147,  5,  0,  0,  0,  0, 72, 51,147,  5,  0,  0,  0,  0, 40, 76,135,  5,  0,  0,  0,  0,216,144,139,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 40, 52,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0,152, 52,147,  5,  0,  0,  0,  0,184, 51,147,  5,  0,  0,  0,  0,248,164,137,  5,  0,  0,  0,  0,216,144,139,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,152, 52,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0,  8, 53,147,  5,  0,  0,  0,  0, 40, 52,147,  5,  0,  0,  0,  0,152,213,132,  5,  0,  0,  0,  0, 72,225,140,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,  8, 53,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0,120, 53,147,  5,  0,  0,  0,  0,152, 52,147,  5,  0,  0,  0,  0,248,164,137,  5,  0,  0,  0,  0,168,134,139,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,120, 53,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0,232, 53,147,  5,  0,  0,  0,  0,  8, 53,147,  5,  0,  0,  0,  0,152,213,132,  5,  0,  0,  0,  0,168,134,139,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,232, 53,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0, 88, 54,147,  5,  0,  0,  0,  0,120, 53,147,  5,  0,  0,  0,  0,184, 88,135,  5,  0,  0,  0,  0,104, 43,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 88, 54,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0,200, 54,147,  5,  0,  0,  0,  0,232, 53,147,  5,  0,  0,  0,  0, 40, 76,135,  5,  0,  0,  0,  0,104, 43,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,200, 54,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0, 56, 55,147,  5,  0,  0,  0,  0, 88, 54,147,  5,  0,  0,  0,  0, 88, 56,135,  5,  0,  0,  0,  0,216, 43,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 56, 55,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0,168, 55,147,  5,  0,  0,  0,  0,200, 54,147,  5,  0,  0,  0,  0,248,104,133,  5,  0,  0,  0,  0,216, 43,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,168, 55,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0, 24, 56,147,  5,  0,  0,  0,  0, 56, 55,147,  5,  0,  0,  0,  0,104, 43,147,  5,  0,  0,  0,  0,216, 43,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 24, 56,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0,136, 56,147,  5,  0,  0,  0,  0,168, 55,147,  5,  0,  0,  0,  0,152,213,132,  5,  0,  0,  0,  0,168,152,137,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,136, 56,147,  5,  0,  0,  0,  0,213,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24, 56,147,  5,  0,  0,  0,  0,168,134,139,  5,  0,  0,  0,  0,216,144,139,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,248, 56,147,  5,  0,  0,  0,  0,215,  0,  0,  0,
-  1,  0,  0,  0,200, 60,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,168,152,137,  5,  0,  0,  0,  0,104, 44,140,  5,
-  0,  0,  0,  0, 24, 48,137,  5,  0,  0,  0,  0, 88, 56,135,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-240,  4,  0,  0,196,  2,  0,  0,222,  2,  0,  0,  7,  7,241,  4, 27,  0,  1,  0,  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 88, 33,140,  5,  0,  0,  0,  0, 88, 33,140,  5,  0,  0,  0,  0,232, 57,147,  5,  0,  0,  0,  0, 88, 59,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,232, 57,147,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0, 88, 59,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,148, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,
-  0, 32,158, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,158, 68,
-  0,  0,200, 65,  0,  0,158, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0,
- 10,  0,241,  4, 26,  0,241,  4, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-240,  4,  0,  0,196,  2,  0,  0,221,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,241,  4, 26,  0,
-  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,152,151,200,  4,  0,  0,  0,  0,152,151,200,  4,  0,  0,  0,  0,152,151,200,  4,  0,  0,  0,  0,
+152,151,200,  4,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 16,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  8,240,133,  3,  0,  0,  0,  0, 88,214,133,  3,  0,  0,  0,  0,  8,240,133,  3,  0,  0,  0,  0,
+136, 69,133,  3,  0,  0,  0,  0, 88,214,133,  3,  0,  0,  0,  0,216, 42,133,  3,  0,  0,  0,  0,216, 42,133,  3,  0,  0,  0,  0,
+216, 42,133,  3,  0,  0,  0,  0, 68, 65, 84, 65,  0,  1,  0,  0,152,151,200,  4,  0,  0,  0,  0,155,  1,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,  2,134,  3,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+184,100,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,115, 99,114,101,101,110,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,129,  7,  1,  0,126,  7,146,  4,  0,  0,  0,  0,  1,  0,238,  3,
+  0,  0,  0,  0,  1,  0,  0,  0, 40,135,149,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  3,  0,  0,  0,  0,  0,  0,  0,136,189,149,  3,  0,  0,  0,  0,248, 64,187,  4,  0,  0,  0,  0,248, 64,187,  4,  0,  0,  0,  0,
+  8,155,149,  3,  0,  0,  0,  0,104,153,149,  3,  0,  0,  0,  0, 56, 68,133,  3,  0,  0,  0,  0, 56,154,149,  3,  0,  0,  0,  0,
+ 88, 37,106,  3,  0,  0,  0,  0,  8,247,180,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 83, 78,  0,  0,  8,  1,  0,  0,232,152,200,  4,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0, 56,248,200,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 82, 65,110,105,109, 97,116,
+105,111,110,  0, 46, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,247,186,  4,  0,  0,  0,  0, 72,157,200,  4,  0,  0,  0,  0,
+184,157,200,  4,  0,  0,  0,  0,248,169,200,  4,  0,  0,  0,  0,104,170,200,  4,  0,  0,  0,  0,104,238,200,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0,  8,247,186,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,136, 44,186,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
+136, 44,186,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 56,112,149,  3,  0,  0,  0,  0,  8,247,186,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,222,  2,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 56,112,149,  3,  0,  0,  0,  0,
+213,  0,  0,  0,  1,  0,  0,  0,104, 25,189,  4,  0,  0,  0,  0,136, 44,186,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+240,  4,222,  2,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,104, 25,189,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+ 56, 84,186,  4,  0,  0,  0,  0, 56,112,149,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0, 56, 84,186,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  8, 87,187,  4,  0,  0,  0,  0,
+104, 25,189,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,195,  2,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
+  8, 87,187,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,232,164,188,  4,  0,  0,  0,  0, 56, 84,186,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,240,  4,195,  2,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,232,164,188,  4,  0,  0,  0,  0,
+213,  0,  0,  0,  1,  0,  0,  0,216,112,189,  4,  0,  0,  0,  0,  8, 87,187,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 24,  4,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,216,112,189,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+ 40,221,188,  4,  0,  0,  0,  0,232,164,188,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,  4,195,  2,  1,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0, 40,221,188,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  8,136,140,  3,  0,  0,  0,  0,
+216,112,189,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,  4, 60,  1,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
+  8,136,140,  3,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 56,154,200,  4,  0,  0,  0,  0, 40,221,188,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,240,  4, 60,  1,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 56,154,200,  4,  0,  0,  0,  0,
+213,  0,  0,  0,  1,  0,  0,  0,168,154,200,  4,  0,  0,  0,  0,  8,136,140,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 88,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,168,154,200,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+ 24,155,200,  4,  0,  0,  0,  0, 56,154,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,  4, 88,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0, 24,155,200,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,136,155,200,  4,  0,  0,  0,  0,
+168,154,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,192,  1, 88,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
+136,155,200,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,248,155,200,  4,  0,  0,  0,  0, 24,155,200,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,192,  1,195,  2,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,248,155,200,  4,  0,  0,  0,  0,
+213,  0,  0,  0,  1,  0,  0,  0,104,156,200,  4,  0,  0,  0,  0,136,155,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  4,  1,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,104,156,200,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+216,156,200,  4,  0,  0,  0,  0,248,155,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,192,  1,  4,  1,  0,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0,216,156,200,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 72,157,200,  4,  0,  0,  0,  0,
+104,156,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,  4, 60,  2,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
+ 72,157,200,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,156,200,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,240,  4, 60,  2,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,184,157,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0, 40,158,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 56,112,149,  3,  0,  0,  0,  0,
+136, 44,186,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 40,158,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0,152,158,200,  4,  0,  0,  0,  0,184,157,200,  4,  0,  0,  0,  0,136, 44,186,  4,  0,  0,  0,  0,
+ 56, 84,186,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,152,158,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0,  8,159,200,  4,  0,  0,  0,  0, 40,158,200,  4,  0,  0,  0,  0, 56,112,149,  3,  0,  0,  0,  0,
+  8, 87,187,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,  8,159,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0,120,159,200,  4,  0,  0,  0,  0,152,158,200,  4,  0,  0,  0,  0, 56, 84,186,  4,  0,  0,  0,  0,
+  8, 87,187,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,120,159,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0,232,159,200,  4,  0,  0,  0,  0,  8,159,200,  4,  0,  0,  0,  0,  8,247,186,  4,  0,  0,  0,  0,
+232,164,188,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,232,159,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0, 88,160,200,  4,  0,  0,  0,  0,120,159,200,  4,  0,  0,  0,  0,232,164,188,  4,  0,  0,  0,  0,
+104, 25,189,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 88,160,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0,200,160,200,  4,  0,  0,  0,  0,232,159,200,  4,  0,  0,  0,  0,  8, 87,187,  4,  0,  0,  0,  0,
+216,112,189,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,200,160,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0, 56,161,200,  4,  0,  0,  0,  0, 88,160,200,  4,  0,  0,  0,  0,232,164,188,  4,  0,  0,  0,  0,
+ 40,221,188,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 56,161,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0,168,161,200,  4,  0,  0,  0,  0,200,160,200,  4,  0,  0,  0,  0,  8,136,140,  3,  0,  0,  0,  0,
+104, 25,189,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,168,161,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0, 24,162,200,  4,  0,  0,  0,  0, 56,161,200,  4,  0,  0,  0,  0,  8,136,140,  3,  0,  0,  0,  0,
+ 40,221,188,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 24,162,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0,136,162,200,  4,  0,  0,  0,  0,168,161,200,  4,  0,  0,  0,  0,  8,247,186,  4,  0,  0,  0,  0,
+ 56,154,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,136,162,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0,248,162,200,  4,  0,  0,  0,  0, 24,162,200,  4,  0,  0,  0,  0,216,112,189,  4,  0,  0,  0,  0,
+168,154,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,248,162,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0,104,163,200,  4,  0,  0,  0,  0,136,162,200,  4,  0,  0,  0,  0,232,164,188,  4,  0,  0,  0,  0,
+168,154,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,104,163,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0,216,163,200,  4,  0,  0,  0,  0,248,162,200,  4,  0,  0,  0,  0, 56,154,200,  4,  0,  0,  0,  0,
+168,154,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,216,163,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0, 72,164,200,  4,  0,  0,  0,  0,104,163,200,  4,  0,  0,  0,  0, 56,154,200,  4,  0,  0,  0,  0,
+ 24,155,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 72,164,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0,184,164,200,  4,  0,  0,  0,  0,216,163,200,  4,  0,  0,  0,  0,168,154,200,  4,  0,  0,  0,  0,
+ 24,155,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,184,164,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0, 40,165,200,  4,  0,  0,  0,  0, 72,164,200,  4,  0,  0,  0,  0, 56, 84,186,  4,  0,  0,  0,  0,
+136,155,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 40,165,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0,152,165,200,  4,  0,  0,  0,  0,184,164,200,  4,  0,  0,  0,  0,216,112,189,  4,  0,  0,  0,  0,
+136,155,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,152,165,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0,  8,166,200,  4,  0,  0,  0,  0, 40,165,200,  4,  0,  0,  0,  0, 24,155,200,  4,  0,  0,  0,  0,
+136,155,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,  8,166,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0,120,166,200,  4,  0,  0,  0,  0,152,165,200,  4,  0,  0,  0,  0, 56,154,200,  4,  0,  0,  0,  0,
+248,155,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,120,166,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0,232,166,200,  4,  0,  0,  0,  0,  8,166,200,  4,  0,  0,  0,  0, 24,155,200,  4,  0,  0,  0,  0,
+104,156,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,232,166,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0, 88,167,200,  4,  0,  0,  0,  0,120,166,200,  4,  0,  0,  0,  0,248,155,200,  4,  0,  0,  0,  0,
+104,156,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 88,167,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0,200,167,200,  4,  0,  0,  0,  0,232,166,200,  4,  0,  0,  0,  0, 40,221,188,  4,  0,  0,  0,  0,
+216,156,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,200,167,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0, 56,168,200,  4,  0,  0,  0,  0, 88,167,200,  4,  0,  0,  0,  0,216,112,189,  4,  0,  0,  0,  0,
+216,156,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 56,168,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0,168,168,200,  4,  0,  0,  0,  0,200,167,200,  4,  0,  0,  0,  0,  8, 87,187,  4,  0,  0,  0,  0,
+ 72,157,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,168,168,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0, 24,169,200,  4,  0,  0,  0,  0, 56,168,200,  4,  0,  0,  0,  0,  8,136,140,  3,  0,  0,  0,  0,
+ 72,157,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 24,169,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0,136,169,200,  4,  0,  0,  0,  0,168,168,200,  4,  0,  0,  0,  0,216,156,200,  4,  0,  0,  0,  0,
+ 72,157,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,136,169,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0,248,169,200,  4,  0,  0,  0,  0, 24,169,200,  4,  0,  0,  0,  0, 56, 84,186,  4,  0,  0,  0,  0,
+248,155,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,248,169,200,  4,  0,  0,  0,  0,
+214,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136,169,200,  4,  0,  0,  0,  0,136,155,200,  4,  0,  0,  0,  0,
+104,156,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,104,170,200,  4,  0,  0,  0,  0,
+216,  0,  0,  0,  1,  0,  0,  0, 56,174,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 56, 84,186,  4,  0,  0,  0,  0,
+136, 44,186,  4,  0,  0,  0,  0, 56,112,149,  3,  0,  0,  0,  0,  8, 87,187,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,240,  4,  0,  0,196,  2,  0,  0,222,  2,  0,  0,  7,  7,241,  4, 27,  0,  1,  0,  0,  0,  0,  0,  7,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,168,247,200,  4,  0,  0,  0,  0,168,247,200,  4,  0,  0,  0,  0, 88,171,200,  4,  0,  0,  0,  0,
+200,172,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 88,171,200,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+200,172,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,148, 68,  0,  0,  0,  0,  0,  0,208, 65,
+  0,  0,  0,  0,  0, 32,158, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,
+  0,  0,158, 68,  0,  0,200, 65,  0,  0,158, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,
+  4,  0, 12,  0, 10,  0,241,  4, 26,  0,241,  4, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,240,  4,  0,  0,196,  2,  0,  0,221,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+241,  4, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 88, 59,147,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,232, 57,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,109, 69,  0,  0,128,192,  0,  0,  0,  0,  0,  0,  0,  0,
-255,255,109, 69,  0,  0,  0,192,  0,  0,  0,  0,112,  7,  0,  0,129,  7,  0,  0, 18,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-111,  7,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0, 18,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  2,  0,  0,  0,  1,  0,  3,  3,  2,  0,  0,  4,
- 10,  0,129,  7,  2,  0,112,  7,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,222,  2,  0,  0,222,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,
-  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,200,172,200,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 88,171,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,109, 69,  0,  0,128,192,  0,  0,  0,  0,
+  0,  0,  0,  0,255,255,109, 69,  0,  0,  0,192,  0,  0,  0,  0,112,  7,  0,  0,129,  7,  0,  0, 18,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,111,  7,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0, 18,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  2,  0,  0,  0,  1,  0,  3,  3,
+  2,  0,  0,  4, 10,  0,129,  7,  2,  0,112,  7,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,222,  2,  0,  0,222,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,200, 60,147,  5,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 88, 85,147,  5,
-  0,  0,  0,  0,248, 56,147,  5,  0,  0,  0,  0,  8, 61,135,  5,  0,  0,  0,  0,184, 88,135,  5,  0,  0,  0,  0,248,104,133,  5,
-  0,  0,  0,  0,136,135,137,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25,  4,  0,  0,240,  4,  0,  0,  0,  0,  0,  0,
- 59,  1,  0,  0,  4,  4,216,  0, 60,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24, 84,147,  5,
-  0,  0,  0,  0, 24, 84,147,  5,  0,  0,  0,  0,184, 61,147,  5,  0,  0,  0,  0, 40, 63,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  1,  0,  0,184, 61,147,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0, 40, 63,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,148, 67,  0,  0,  0,  0,  0,  0,208, 65, 98, 39, 38, 54,  0,  0, 88, 67,  0,  0,  0,  0,
-  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,215,  0,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0, 87, 67,  0,  0,200, 65,  0,  0, 87, 67,
-  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,216,  0, 26,  0,216,  0,
- 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25,  4,  0,  0,240,  4,  0,  0, 34,  1,  0,  0,
- 59,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,  0, 26,  0,  0,  0,  1,  0,  1,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0, 56,174,200,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,
+200,198,200,  4,  0,  0,  0,  0,104,170,200,  4,  0,  0,  0,  0,232,164,188,  4,  0,  0,  0,  0, 40,221,188,  4,  0,  0,  0,  0,
+  8,136,140,  3,  0,  0,  0,  0,104, 25,189,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25,  4,  0,  0,240,  4,  0,  0,
+  0,  0,  0,  0, 59,  1,  0,  0,  4,  4,216,  0, 60,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+136,197,200,  4,  0,  0,  0,  0,136,197,200,  4,  0,  0,  0,  0, 40,175,200,  4,  0,  0,  0,  0,152,176,200,  4,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  1,  0,  0, 40, 63,147,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,184, 61,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88, 67,  0,  0, 61,196,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0, 71, 67,  1,  0,145,195,
-  0,  0,  0,  0,199,  0,  0,  0,216,  0,  0,  0,  0,  0,  0,  0, 33,  1,  0,  0,  0,  0,  0,  0, 62,  1,  0,  0,  0,  0,  0,  0,
- 17,  0,  0,  0,  0,  0,  0,  0,198,  0,  0,  0,  0,  0,  0,  0, 33,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  1,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,216,  0, 34,  1,199,  0,
- 34,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25,  4,  0,  0,240,  4,  0,  0,  0,  0,  0,  0,
- 33,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,  0, 34,  1,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152, 64,147,  5,  0,  0,  0,  0,120, 82,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 88,  1,  0,  0,152, 64,147,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 56, 66,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 85, 84, 84, 79, 78, 83, 95, 80, 84, 95, 99,
-111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 85, 84, 84, 79, 78, 83, 95, 80, 84, 95, 99,
-111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67,111,110,116,101,120,116,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  1,  0,  0, 40,175,200,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,152,176,200,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,148, 67,  0,  0,  0,  0,  0,  0,208, 65, 98, 39, 38, 54,  0,  0, 88, 67,
+  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,215,  0,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0, 87, 67,  0,  0,200, 65,
+  0,  0, 87, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,216,  0,
+ 26,  0,216,  0, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25,  4,  0,  0,240,  4,  0,  0,
+ 34,  1,  0,  0, 59,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,  0, 26,  0,  0,  0,  1,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,220,255,199,  0, 36,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  1,  0,  0,152,176,200,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 40,175,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88, 67,  0,  0, 61,196,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0, 71, 67,
+  1,  0,145,195,  0,  0,  0,  0,199,  0,  0,  0,216,  0,  0,  0,  0,  0,  0,  0, 33,  1,  0,  0,  0,  0,  0,  0, 62,  1,  0,  0,
+  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,198,  0,  0,  0,  0,  0,  0,  0, 33,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  1,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,216,  0,
+ 34,  1,199,  0, 34,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25,  4,  0,  0,240,  4,  0,  0,
+  0,  0,  0,  0, 33,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,  0, 34,  1,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,178,200,  4,  0,  0,  0,  0,232,195,200,  4,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 56, 66,147,  5,  0,  0,  0,  0,214,  0,  0,  0,
-  1,  0,  0,  0,216, 67,147,  5,  0,  0,  0,  0,152, 64,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,114,101,110,100,101,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 88,  1,  0,  0,  8,178,200,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,168,179,200,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 85, 84, 84, 79, 78, 83, 95,
+ 80, 84, 95, 99,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 85, 84, 84, 79, 78, 83, 95,
+ 80, 84, 95, 99,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67,111,110,116,101,120,116,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,114,101,110,100,101,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,220,255,199,  0, 36,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 82,101,110,100,101,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,135,255,199,  0, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,168,179,200,  4,  0,  0,  0,  0,
+215,  0,  0,  0,  1,  0,  0,  0, 72,181,200,  4,  0,  0,  0,  0,  8,178,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,114,101,110,100,101,114,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 88,  1,  0,  0,216, 67,147,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,120, 69,147,  5,  0,  0,  0,  0, 56, 66,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,108, 97,
-121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,108, 97,
-121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 76, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,114,101,110,100,101,114,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,111,255,199,  0,  0,  0,  0,  0,  0,  0,
-  4,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 82,101,110,100,101,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,135,255,199,  0, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,120, 69,147,  5,  0,  0,  0,  0,214,  0,  0,  0,
-  1,  0,  0,  0, 24, 71,147,  5,  0,  0,  0,  0,216, 67,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,100,105,109,101,110,115,105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,100,105,109,101,110,115,105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68,105,109,101,110,115,105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 88,  1,  0,  0, 72,181,200,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,232,182,200,  4,  0,  0,  0,  0,
+168,179,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80,
+ 84, 95,108, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80,
+ 84, 95,108, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 76, 97,121,101,114,115,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,140,254,199,  0,203,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,111,255,199,  0,  0,  0,
+  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 88,  1,  0,  0, 24, 71,147,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,184, 72,147,  5,  0,  0,  0,  0,120, 69,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 97,110,
-116,105, 97,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 97,110,
-116,105, 97,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 65,110,116,105, 45, 65,108,105, 97,115,105,110,
-103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 58,254,199,  0, 58,  0, 20,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,232,182,200,  4,  0,  0,  0,  0,
+215,  0,  0,  0,  1,  0,  0,  0,136,184,200,  4,  0,  0,  0,  0, 72,181,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,100,105,109,101,110,115,105,111,110,115,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,100,105,109,101,110,115,105,111,110,115,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,184, 72,147,  5,  0,  0,  0,  0,214,  0,  0,  0,
-  1,  0,  0,  0, 88, 74,147,  5,  0,  0,  0,  0, 24, 71,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,109,111,116,105,111,110, 95, 98,108,117,114,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68,105,109,101,110,115,105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,109,111,116,105,111,110, 95, 98,108,117,114,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140,254,199,  0,203,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 83, 97,109,112,108,101,100, 32, 77,111,116,105,111,110, 32, 66,108,117,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0, 34,254,199,  0,  0,  0, 20,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  5,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 88,  1,  0,  0,136,184,200,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 40,186,200,  4,  0,  0,  0,  0,
+232,182,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80,
+ 84, 95, 97,110,116,105, 97,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80,
+ 84, 95, 97,110,116,105, 97,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 65,110,116,105, 45, 65,108,105,
+ 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 58,254,199,  0, 58,  0,
+ 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 88,  1,  0,  0, 88, 74,147,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,248, 75,147,  5,  0,  0,  0,  0,184, 72,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,104,
- 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,104,
- 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83,104, 97,100,105,110,103,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,254,199,  0,  0,  0,  0,  0,  0,  0,
-  4,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 40,186,200,  4,  0,  0,  0,  0,
+215,  0,  0,  0,  1,  0,  0,  0,200,187,200,  4,  0,  0,  0,  0,136,184,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,109,111,116,105,111,110, 95, 98,108,117,114,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,109,111,116,105,111,110, 95, 98,108,117,114,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,248, 75,147,  5,  0,  0,  0,  0,214,  0,  0,  0,
-  1,  0,  0,  0,152, 77,147,  5,  0,  0,  0,  0, 88, 74,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,101,114,102,111,114,109, 97,110, 99,101,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 83, 97,109,112,108,101,100, 32, 77,111,116,105,111,110, 32, 66,108,117,114,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,101,114,102,111,114,109, 97,110, 99,101,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 34,254,199,  0,  0,  0, 20,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  5,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 80,101,114,102,111,114,109, 97,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,242,253,199,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 88,  1,  0,  0,200,187,200,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,104,189,200,  4,  0,  0,  0,  0,
+ 40,186,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80,
+ 84, 95,115,104, 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80,
+ 84, 95,115,104, 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83,104, 97,100,105,110,103,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 88,  1,  0,  0,152, 77,147,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 56, 79,147,  5,  0,  0,  0,  0,248, 75,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,111,
-115,116, 95,112,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,111,
-115,116, 95,112,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,111,115,116, 32, 80,114,111, 99,101,115,115,
-105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,218,253,199,  0,  0,  0,  0,  0,  0,  0,
-  4,  0,  0,  0,  0,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,254,199,  0,  0,  0,
+  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 56, 79,147,  5,  0,  0,  0,  0,214,  0,  0,  0,
-  1,  0,  0,  0,216, 80,147,  5,  0,  0,  0,  0,152, 77,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,116, 97,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,104,189,200,  4,  0,  0,  0,  0,
+215,  0,  0,  0,  1,  0,  0,  0,  8,191,200,  4,  0,  0,  0,  0,200,187,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,101,114,102,111,114,109, 97,110, 99,101,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,116, 97,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,101,114,102,111,114,109, 97,110, 99,101,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 83,116, 97,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 80,101,114,102,111,114,109, 97,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,194,253,199,  0,  0,  0, 20,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,242,253,199,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  7,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 88,  1,  0,  0,216, 80,147,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,120, 82,147,  5,  0,  0,  0,  0, 56, 79,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,111,117,
-116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,111,117,
-116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79,117,116,112,117,116,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40,253,199,  0,130,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 88,  1,  0,  0,  8,191,200,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,168,192,200,  4,  0,  0,  0,  0,
+104,189,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80,
+ 84, 95,112,111,115,116, 95,112,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80,
+ 84, 95,112,111,115,116, 95,112,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,111,115,116, 32, 80,114,111,
+ 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,218,253,199,  0,  0,  0,
+  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,120, 82,147,  5,  0,  0,  0,  0,214,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216, 80,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 98, 97,107,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,168,192,200,  4,  0,  0,  0,  0,
+215,  0,  0,  0,  1,  0,  0,  0, 72,194,200,  4,  0,  0,  0,  0,  8,191,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,116, 97,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 98, 97,107,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,116, 97,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 66, 97,107,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 83,116, 97,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0, 16,253,199,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0, 11,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,194,253,199,  0,  0,  0, 20,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  9,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
-248,  0,  0,  0, 24, 84,147,  5,  0,  0,  0,  0,180,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 88,  1,  0,  0, 72,194,200,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,232,195,200,  4,  0,  0,  0,  0,
+168,192,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80,
+ 84, 95,111,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80,
+ 84, 95,111,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79,117,116,112,117,116,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40,253,199,  0,130,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,232,195,200,  4,  0,  0,  0,  0,
+215,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72,194,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 98, 97,107,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  2,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255, 21,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0, 88, 85,147,  5,  0,  0,  0,  0,215,  0,  0,  0,
-  1,  0,  0,  0, 72, 90,147,  5,  0,  0,  0,  0,200, 60,147,  5,  0,  0,  0,  0,104,137, 95,  4,  0,  0,  0,  0, 72,225,140,  5,
-  0,  0,  0,  0,152, 68,137,  5,  0,  0,  0,  0,  8, 61,135,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 23,  4,  0,  0,  0,  0,  0,  0, 87,  0,  0,  0, 15, 15, 24,  4, 88,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 40, 89,147,  5,  0,  0,  0,  0, 40, 89,147,  5,  0,  0,  0,  0, 72, 86,147,  5,  0,  0,  0,  0,184, 87,147,  5,
+  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 98, 97,107,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 72, 86,147,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,184, 87,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,140, 68,  0,  0,  0,  0,  0,  0,208, 65, 39,182,158, 55,
-  0,  0,131, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 23,  4,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,224,130, 68,
-  0,  0,200, 65,  0,224,130, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0,
- 10,  0, 24,  4, 26,  0, 24,  4, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 23,  4,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,  4, 26,  0,
-  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 66, 97,107,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,253,199,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0, 11,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,184, 87,147,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 72, 86,147,  5,  0,  0,  0,  0,  0,  0, 64,192,  0,  0,126, 67,  0,  0,  0,  0,  0,  0, 72, 66,112,189, 17,192,
-246, 70,125, 67,  0,  0,  0,  0,  0,  0, 72, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 23,  4,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0, 23,  4,  0,  0, 18,  0,  0,  0, 61,  0,  0,  0,  0,  0,128, 63,
-  0,  0, 72, 66,  0,124,146, 72,  0,  0, 72, 66,205,204,204, 61,  0,  0, 32, 65, 72,  0,  0,  0,  0,  0,  0,  2,  4,  0,  0,  4,
-  8,  0, 24,  4, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 23,  4,  0,  0, 26,  0,  0,  0, 87,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,  4, 62,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65,248,  0,  0,  0,136,197,200,  4,  0,  0,  0,  0,180,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65,208,  0,  0,  0, 40, 89,147,  5,  0,  0,  0,  0,191,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255, 21,  0,  0,160,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,200,198,200,  4,  0,  0,  0,  0,
+216,  0,  0,  0,  1,  0,  0,  0,184,203,200,  4,  0,  0,  0,  0, 56,174,200,  4,  0,  0,  0,  0,  8,247,186,  4,  0,  0,  0,  0,
+ 56,154,200,  4,  0,  0,  0,  0,168,154,200,  4,  0,  0,  0,  0,232,164,188,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 23,  4,  0,  0,  0,  0,  0,  0, 87,  0,  0,  0, 15, 15, 24,  4, 88,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,152,202,200,  4,  0,  0,  0,  0,152,202,200,  4,  0,  0,  0,  0,184,199,200,  4,  0,  0,  0,  0,
+ 40,201,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,184,199,200,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+ 40,201,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,140, 68,  0,  0,  0,  0,  0,  0,208, 65,
+ 39,182,158, 55,  0,  0,131, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 23,  4,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,
+  0,224,130, 68,  0,  0,200, 65,  0,224,130, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,
+  4,  0, 12,  0, 10,  0, 24,  4, 26,  0, 24,  4, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 23,  4,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 24,  4, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0, 72, 90,147,  5,  0,  0,  0,  0,215,  0,  0,  0,
-  1,  0,  0,  0,168, 96,147,  5,  0,  0,  0,  0, 88, 85,147,  5,  0,  0,  0,  0,184, 88,135,  5,  0,  0,  0,  0,104, 43,147,  5,
-  0,  0,  0,  0,216, 43,147,  5,  0,  0,  0,  0,248,104,133,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25,  4,  0,  0,
-240,  4,  0,  0, 61,  1,  0,  0, 59,  2,  0,  0,  3,  3,216,  0,255,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 24, 94,147,  5,  0,  0,  0,  0, 24, 94,147,  5,  0,  0,  0,  0, 56, 91,147,  5,  0,  0,  0,  0,168, 92,147,  5,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 56, 91,147,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,168, 92,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,244, 67,  0,  0,  0,  0,  0,  0,208, 65, 98, 39, 38, 54,
-  0,  0, 88, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,215,  0,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0, 87, 67,
-  0,  0,200, 65,  0,  0, 87, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0,
- 10,  0,216,  0, 26,  0,216,  0, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25,  4,  0,  0,
-240,  4,  0,  0, 34,  2,  0,  0, 59,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,  0, 26,  0,
-  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 40,201,200,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,184,199,200,  4,  0,  0,  0,  0,  0,  0, 64,192,  0,  0,126, 67,  0,  0,  0,  0,  0,  0, 72, 66,
+112,189, 17,192,246, 70,125, 67,  0,  0,  0,  0,  0,  0, 72, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 23,  4,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0, 23,  4,  0,  0, 18,  0,  0,  0, 61,  0,  0,  0,
+  0,  0,128, 63,  0,  0, 72, 66,  0,124,146, 72,  0,  0, 72, 66,205,204,204, 61,  0,  0, 32, 65, 72,  0,  0,  0,  0,  0,  0,  2,
+  4,  0,  0,  4,  8,  0, 24,  4, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 23,  4,  0,  0, 26,  0,  0,  0, 87,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 24,  4, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,168, 92,147,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 56, 91,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,141, 67,  0,  0,244,194,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 71, 67,  0,  0, 83,195,  0,  0,  0,  0,199,  0,  0,  0,216,  0,  0,  0, 18,  0,  0,  0,228,  0,  0,  0,  0,  0,  0,  0,
-198,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,198,  0,  0,  0, 18,  0,  0,  0,228,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63, 18,  2,  0,  0,  2,  0,  3,  3,  0,  0, 12,  4,
-  6,  0,216,  0,229,  0,199,  0,211,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25,  4,  0,  0,
-240,  4,  0,  0, 61,  1,  0,  0, 33,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,  0,229,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,208,  0,  0,  0,152,202,200,  4,  0,  0,  0,  0,185,  0,  0,  0,  1,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 24,  1,  0,  0, 24, 94,147,  5,  0,  0,  0,  0,184,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,184,203,200,  4,  0,  0,  0,  0,
+216,  0,  0,  0,  1,  0,  0,  0, 24,210,200,  4,  0,  0,  0,  0,200,198,200,  4,  0,  0,  0,  0, 40,221,188,  4,  0,  0,  0,  0,
+216,156,200,  4,  0,  0,  0,  0, 72,157,200,  4,  0,  0,  0,  0,  8,136,140,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 25,  4,  0,  0,240,  4,  0,  0, 61,  1,  0,  0, 59,  2,  0,  0,  3,  3,216,  0,255,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,136,207,200,  4,  0,  0,  0,  0,136,207,200,  4,  0,  0,  0,  0,168,204,200,  4,  0,  0,  0,  0,
+ 24,206,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,168,204,200,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+ 24,206,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,244, 67,  0,  0,  0,  0,  0,  0,208, 65,
+ 98, 39, 38, 54,  0,  0, 88, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,215,  0,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,
+  0,  0, 87, 67,  0,  0,200, 65,  0,  0, 87, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,
+  4,  0, 12,  0, 10,  0,216,  0, 26,  0,216,  0, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 25,  4,  0,  0,240,  4,  0,  0, 34,  2,  0,  0, 59,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+216,  0, 26,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 24,206,200,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,168,204,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,141, 67,  0,  0,244,194,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0, 71, 67,  0,  0, 83,195,  0,  0,  0,  0,199,  0,  0,  0,216,  0,  0,  0, 18,  0,  0,  0,228,  0,  0,  0,
+  0,  0,  0,  0,198,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,198,  0,  0,  0, 18,  0,  0,  0,228,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63, 18,  2,  0,  0,  2,  0,  3,  3,
+  0,  0, 12,  4,  6,  0,216,  0,229,  0,199,  0,211,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 25,  4,  0,  0,240,  4,  0,  0, 61,  1,  0,  0, 33,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+216,  0,229,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,168,114,137,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0, 68, 65, 84, 65, 16,  0,  0,  0,168,114,137,  5,
-  0,  0,  0,  0,238,  0,  0,  0,  1,  0,  0,  0, 14,  0,  0,  0, 14,  0,  0,  0,120, 95,147,  5,  0,  0,  0,  0, 68, 65, 84, 65,
-224,  0,  0,  0,120, 95,147,  5,  0,  0,  0,  0,237,  0,  0,  0, 14,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,120,184,168,  5,
-  0,  0,  0,  0, 19,  0,  0,  0,  1,  0,  1,  0,120,184,168,  5,  0,  0,  0,  0, 20,  0,  0,  0,  1,  0,  1,  0,120,184,168,  5,
-  0,  0,  0,  0, 21,  0,  1,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0, 72,210,168,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,184,219,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,184, 17,169,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,248,232,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  8,255,168,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0, 88,226,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,232,205,168,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0, 24,213,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,216,204,168,  5,
-  0,  0,  0,  0, 21,  0,  0,  0,  1,  0,  1,  0,120,184,168,  5,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,168, 96,147,  5,
-  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 56,110,147,  5,  0,  0,  0,  0, 72, 90,147,  5,  0,  0,  0,  0,248,164,137,  5,
-  0,  0,  0,  0,216,144,139,  5,  0,  0,  0,  0, 40, 76,135,  5,  0,  0,  0,  0,152, 68,137,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,193,  1,  0,  0, 23,  4,  0,  0, 89,  0,  0,  0,194,  2,  0,  0,  1,  1, 87,  2,106,  2,  1,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136,108,147,  5,  0,  0,  0,  0,136,108,147,  5,  0,  0,  0,  0,152, 97,147,  5,
-  0,  0,  0,  0, 88,103,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,152, 97,147,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,  8, 99,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64,113, 68,  0,  0,  0,  0,
-  0,  0,208, 65,  0,  0,  0,  0,  0,192, 21, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86,  2,  0,  0,  0,  0,  0,  0,
- 25,  0,  0,  0,  0,128, 21, 68,  0,  0,200, 65,  0,128, 21, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  2,  0,  3,  3,  4,  0, 12,  0, 10,  0, 87,  2, 26,  0, 87,  2, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,193,  1,  0,  0, 23,  4,  0,  0, 89,  0,  0,  0,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 87,  2, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,  8, 99,147,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,120,100,147,  5,  0,  0,  0,  0,152, 97,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0, 64, 70,196,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,255,127, 70,196,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0, 18,  0,  0,  0,
- 43,  3,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0, 18,  0,  0,  0,
- 43,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  0,  0,  0,
-  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,160,  0, 44,  3,143,  0, 26,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,193,  1,  0,  0,193,  1,  0,  0,115,  0,  0,  0,194,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0, 80,  2,  0,  0,  5,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,120,100,147,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,232,101,147,  5,  0,  0,  0,  0,  8, 99,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16, 67,  0,  0,206,194,
-  0,  0,  0,  0,  0,  0,  0,  0,231,102, 16, 67,  0,  0,206,194,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0, 18,  0,  0,  0,
-119,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0, 18,  0,  0,  0,
-119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  0,  0,  0,
-  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,160,  0,120,  0,143,  0,102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,193,  1,  0,  0,193,  1,  0,  0,115,  0,  0,  0,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  6,  0, 34,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,232,101,147,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0, 88,103,147,  5,  0,  0,  0,  0,120,100,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 35, 67,  0,128, 96,196,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 35, 67,  0,128, 96,196,  0,  0,  0,  0,163,  0,  0,  0,180,  0,  0,  0, 18,  0,  0,  0,
-147,  3,  0,  0,  0,  0,  0,  0,162,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,162,  0,  0,  0, 18,  0,  0,  0,
-147,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  0,  0,  0,
-  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,180,  0,148,  3,163,  0,130,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 23,  4,  0,  0, 23,  4,  0,  0,115,  0,  0,  0,194,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  4,  0,  4,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 24,  1,  0,  0,136,207,200,  4,  0,  0,  0,  0,181,  0,  0,  0,  1,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 88,103,147,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,232,101,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,193,  1,  0,  0, 23,  4,  0,  0,115,  0,  0,  0,194,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 87,  2, 80,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,184,217,190,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0, 68, 65, 84, 65, 16,  0,  0,  0,
+184,217,190,  4,  0,  0,  0,  0,238,  0,  0,  0,  1,  0,  0,  0, 14,  0,  0,  0, 14,  0,  0,  0,232,208,200,  4,  0,  0,  0,  0,
+ 68, 65, 84, 65,224,  0,  0,  0,232,208,200,  4,  0,  0,  0,  0,237,  0,  0,  0, 14,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,
+ 40, 92,222,  4,  0,  0,  0,  0, 19,  0,  0,  0,  1,  0,  1,  0, 40, 92,222,  4,  0,  0,  0,  0, 20,  0,  0,  0,  1,  0,  1,  0,
+ 40, 92,222,  4,  0,  0,  0,  0, 21,  0,  1,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,
+  8,118,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,136,127,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,
+168,181,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,232,140,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,
+248,162,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0, 56,134,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,
+168,113,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,216,120,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,
+152,112,222,  4,  0,  0,  0,  0, 21,  0,  0,  0,  1,  0,  1,  0, 40, 92,222,  4,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,
+ 24,210,200,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,168,223,200,  4,  0,  0,  0,  0,184,203,200,  4,  0,  0,  0,  0,
+ 24,155,200,  4,  0,  0,  0,  0,136,155,200,  4,  0,  0,  0,  0,216,112,189,  4,  0,  0,  0,  0,168,154,200,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,193,  1,  0,  0, 23,  4,  0,  0, 89,  0,  0,  0,194,  2,  0,  0,  1,  1, 87,  2,106,  2,  1,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248,221,200,  4,  0,  0,  0,  0,248,221,200,  4,  0,  0,  0,  0,
+  8,211,200,  4,  0,  0,  0,  0,200,216,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,  8,211,200,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,120,212,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64,113, 68,
+  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,192, 21, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86,  2,  0,  0,
+  0,  0,  0,  0, 25,  0,  0,  0,  0,128, 21, 68,  0,  0,200, 65,  0,128, 21, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0, 87,  2, 26,  0, 87,  2, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,193,  1,  0,  0, 23,  4,  0,  0, 89,  0,  0,  0,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 87,  2, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,120,212,200,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,232,213,200,  4,  0,  0,  0,  0,  8,211,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,
+  0, 64, 70,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,255,127, 70,196,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0,
+ 18,  0,  0,  0, 43,  3,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,
+ 18,  0,  0,  0, 43,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64,
+ 10,  0,  0,  0,  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,160,  0, 44,  3,143,  0, 26,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,193,  1,  0,  0,193,  1,  0,  0,115,  0,  0,  0,194,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0, 80,  2,  0,  0,  5,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,232,213,200,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0, 88,215,200,  4,  0,  0,  0,  0,120,212,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16, 67,
+  0,  0,206,194,  0,  0,  0,  0,  0,  0,  0,  0,231,102, 16, 67,  0,  0,206,194,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0,
+ 18,  0,  0,  0,119,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,
+ 18,  0,  0,  0,119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64,
+ 10,  0,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,160,  0,120,  0,143,  0,102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,193,  1,  0,  0,193,  1,  0,  0,115,  0,  0,  0,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  6,  0, 34,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 88,215,200,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,200,216,200,  4,  0,  0,  0,  0,232,213,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 35, 67,
+  0,128, 96,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 35, 67,  0,128, 96,196,  0,  0,  0,  0,163,  0,  0,  0,180,  0,  0,  0,
+ 18,  0,  0,  0,147,  3,  0,  0,  0,  0,  0,  0,162,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,162,  0,  0,  0,
+ 18,  0,  0,  0,147,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64,
+ 10,  0,  0,  0,  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,180,  0,148,  3,163,  0,130,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 23,  4,  0,  0, 23,  4,  0,  0,115,  0,  0,  0,194,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  4,  0,  4,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,200,104,147,  5,  0,  0,  0,  0, 68, 65, 84, 65,112,  3,  0,  0,200,104,147,  5,  0,  0,  0,  0,174,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,140, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200,167,141, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 28, 13,128,191,  0,  0,128,191,  0,  0,  0,  0,  0,  0,  0,  0, 74,215, 76,190,
-  0,  0,  0,  0, 68,239,209, 62, 51,177,205,190,184,158, 81, 63,  0,  0,  0,  0, 70,119,105, 63,143, 74, 70, 62, 35, 44,185,190,
-  0,  0,  0,  0,162, 84, 89,188,166, 33,101, 63, 42, 61,228, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,214,211,111,193,
-  0,  0,128, 63, 69,239,209, 62, 70,119,105, 63,176, 84, 89,188,  0,  0,  0,  0, 53,177,205,190,142, 74, 70, 62,166, 33,101, 63,
-  0,  0,  0,  0,185,158, 81, 63, 35, 44,185,190, 43, 61,228, 62,  0,  0,  0,  0,164, 96, 68, 65,111,121,173,192,248,209,213, 64,
-  0,  0,128, 63,178,157,229, 62,209,162,227,190, 48,180, 81,191,184,158, 81,191,117, 90,127, 63, 13,114, 91, 62, 26, 63,185, 62,
- 35, 44,185, 62,145,180,109,188,105,147,125, 63,138, 84,228,190, 42, 61,228,190,  0,  0,  0,  0,  0,  0,  0,  0,  9,185,108, 65,
-214,211,111, 65, 99,240,191, 62,110,116, 85, 63, 64,185, 70,188,  0,  0, 82,180, 48,221,185,190, 44, 45, 51, 62, 28, 11, 79, 63,
-  0,  0, 56,179, 67,108,117,194,183,204,216, 65,105,156,  5,194,212,247,159,192,235, 62,114, 66, 59,254,213,193,158,225,  3, 66,
- 55,  8,160, 64, 68,239,209, 62, 51,177,205,190,184,158, 81, 63,  0,  0,  0,  0, 70,119,105, 63,143, 74, 70, 62, 35, 44,185,190,
-  0,  0,  0,  0,162, 84, 89,188,166, 33,101, 63, 42, 61,228, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,214,211,111,193,
-  0,  0,128, 63,178,157,229, 62,209,162,227,190, 48,180, 81,191,184,158, 81,191,117, 90,127, 63, 13,114, 91, 62, 26, 63,185, 62,
- 35, 44,185, 62,145,180,109,188,105,147,125, 63,138, 84,228,190, 42, 61,228,190,  0,  0,  0,  0,  0,  0,  0,  0,  9,185,108, 65,
-214,211,111, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,200,216,200,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88,215,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,193,  1,  0,  0, 23,  4,  0,  0,115,  0,  0,  0,194,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 87,  2, 80,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 56,218,200,  4,  0,  0,  0,  0, 68, 65, 84, 65,112,  3,  0,  0, 56,218,200,  4,  0,  0,  0,  0,
+175,  0,  0,  0,  1,  0,  0,  0,  0,  0,140, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200,167,141, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 28, 13,128,191,  0,  0,128,191,  0,  0,  0,  0,  0,  0,  0,  0,
+ 74,215, 76,190,  0,  0,  0,  0, 68,239,209, 62, 51,177,205,190,184,158, 81, 63,  0,  0,  0,  0, 70,119,105, 63,143, 74, 70, 62,
+ 35, 44,185,190,  0,  0,  0,  0,162, 84, 89,188,166, 33,101, 63, 42, 61,228, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+214,211,111,193,  0,  0,128, 63, 69,239,209, 62, 70,119,105, 63,176, 84, 89,188,  0,  0,  0,  0, 53,177,205,190,142, 74, 70, 62,
+166, 33,101, 63,  0,  0,  0,  0,185,158, 81, 63, 35, 44,185,190, 43, 61,228, 62,  0,  0,  0,  0,164, 96, 68, 65,111,121,173,192,
+248,209,213, 64,  0,  0,128, 63,178,157,229, 62,209,162,227,190, 48,180, 81,191,184,158, 81,191,117, 90,127, 63, 13,114, 91, 62,
+ 26, 63,185, 62, 35, 44,185, 62,145,180,109,188,105,147,125, 63,138, 84,228,190, 42, 61,228,190,  0,  0,  0,  0,  0,  0,  0,  0,
+  9,185,108, 65,214,211,111, 65, 99,240,191, 62,110,116, 85, 63, 64,185, 70,188,  0,  0, 82,180, 48,221,185,190, 44, 45, 51, 62,
+ 28, 11, 79, 63,  0,  0, 56,179, 67,108,117,194,183,204,216, 65,105,156,  5,194,212,247,159,192,235, 62,114, 66, 59,254,213,193,
+158,225,  3, 66, 55,  8,160, 64, 68,239,209, 62, 51,177,205,190,184,158, 81, 63,  0,  0,  0,  0, 70,119,105, 63,143, 74, 70, 62,
+ 35, 44,185,190,  0,  0,  0,  0,162, 84, 89,188,166, 33,101, 63, 42, 61,228, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+214,211,111,193,  0,  0,128, 63,178,157,229, 62,209,162,227,190, 48,180, 81,191,184,158, 81,191,117, 90,127, 63, 13,114, 91, 62,
+ 26, 63,185, 62, 35, 44,185, 62,145,180,109,188,105,147,125, 63,138, 84,228,190, 42, 61,228,190,  0,  0,  0,  0,  0,  0,  0,  0,
+  9,185,108, 65,214,211,111, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 12,163, 91, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,163, 91, 64,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,163, 91, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63, 92, 62, 55, 63, 56,186,224,190,237,203,148,190,  3,236,234,190,214,211,111, 65,214,211,111, 65,  0,  0,  0,  0,
-  0,  0,  0,  0,236, 15, 72, 59,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  0,  0,255,255,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63, 32, 33, 12, 66, 86,152,137, 66,
-113, 27,126, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 96,  1,  0,  0,136,108,147,  5,
-  0,  0,  0,  0,175,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0, 51, 51, 51, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 65,205,204, 76, 62,  2,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  7,  0, 24,213,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
-  1,  0,  0,  0,  3,  0,  0,  0,  1,  0,  3,  0,  8,  8,128,  0,  0,  0, 12, 66,  0,  0,128, 63,205,204,204, 61,  0,  0,250, 67,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0, 10,  0,  7,  1,
-  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0, 56,110,147,  5,  0,  0,  0,  0,215,  0,  0,  0,
-  1,  0,  0,  0,232,118,147,  5,  0,  0,  0,  0,168, 96,147,  5,  0,  0,  0,  0, 72,225,140,  5,  0,  0,  0,  0,152,213,132,  5,
-  0,  0,  0,  0,168,134,139,  5,  0,  0,  0,  0,248,164,137,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-191,  1,  0,  0, 89,  0,  0,  0,  3,  1,  0,  0,  2,  2,192,  1,171,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,232,116,147,  5,  0,  0,  0,  0,232,116,147,  5,  0,  0,  0,  0, 40,111,147,  5,  0,  0,  0,  0,120,115,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 40,111,147,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,152,112,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64, 89, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,
-  0,  0,224, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,191,  1,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,128,223, 67,
-  0,  0,200, 65,  0,128,223, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0,
- 10,  0,192,  1, 26,  0,192,  1, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-191,  1,  0,  0, 89,  0,  0,  0,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,192,  1, 26,  0,
-  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,152,112,147,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  8,114,147,  5,
-  0,  0,  0,  0, 40,111,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72, 67,  0,  0,112,193,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 72, 67,  0,  0,254,194,  0,  0,  0,  0,200,  0,  0,  0,217,  0,  0,  0, 18,  0,  0,  0,144,  0,  0,  0,  0,  0,  0,  0,
-199,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,199,  0,  0,  0, 18,  0,  0,  0,144,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63, 10,  6,  0,  0,  2,  0,  3,  3,  0,  0,  0,  4,
-  6,  0,217,  0,145,  0,200,  0,127,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-216,  0,  0,  0,115,  0,  0,  0,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,217,  0,145,  0,
-  0,  0,  2,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,  8,114,147,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,120,115,147,  5,
-  0,  0,  0,  0,152,112,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 12,163, 91, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,163, 91, 64,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,163, 91, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63, 92, 62, 55, 63, 56,186,224,190,237,203,148,190,  3,236,234,190,214,211,111, 65,214,211,111, 65,
+  0,  0,  0,  0,  0,  0,  0,  0,236, 15, 72, 59,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  0,  0,
+255,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63, 32, 33, 12, 66,
+ 86,152,137, 66,113, 27,126, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 96,  1,  0,  0,
+248,221,200,  4,  0,  0,  0,  0,176,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0, 51, 51, 51, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 65,205,204, 76, 62,
+  2,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  7,  0,216,120,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  0,  0,  1,  0,  0,  0,  3,  0,  0,  0,  1,  0,  3,  0,  8,  8,128,  0,  0,  0, 12, 66,  0,  0,128, 63,205,204,204, 61,
+  0,  0,250, 67,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0,
+ 10,  0,  7,  1,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,168,223,200,  4,  0,  0,  0,  0,
+216,  0,  0,  0,  1,  0,  0,  0,152,231,200,  4,  0,  0,  0,  0, 24,210,200,  4,  0,  0,  0,  0, 56,154,200,  4,  0,  0,  0,  0,
+248,155,200,  4,  0,  0,  0,  0,104,156,200,  4,  0,  0,  0,  0, 24,155,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,191,  1,  0,  0, 89,  0,  0,  0,  3,  1,  0,  0,  2,  2,192,  1,171,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 88,230,200,  4,  0,  0,  0,  0, 88,230,200,  4,  0,  0,  0,  0,152,224,200,  4,  0,  0,  0,  0,
+232,228,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,152,224,200,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+  8,226,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64, 89, 68,  0,  0,  0,  0,  0,  0,208, 65,
+  0,  0,  0,  0,  0,  0,224, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,191,  1,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,
+  0,128,223, 67,  0,  0,200, 65,  0,128,223, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,
+  4,  0, 12,  0, 10,  0,192,  1, 26,  0,192,  1, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,191,  1,  0,  0, 89,  0,  0,  0,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+192,  1, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,  8,226,200,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+120,227,200,  4,  0,  0,  0,  0,152,224,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72, 67,  0,  0,112,193,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0, 72, 67,  0,  0,254,194,  0,  0,  0,  0,200,  0,  0,  0,217,  0,  0,  0, 18,  0,  0,  0,144,  0,  0,  0,
+  0,  0,  0,  0,199,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,199,  0,  0,  0, 18,  0,  0,  0,144,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63, 10,  6,  0,  0,  2,  0,  3,  3,
+  0,  0,  0,  4,  6,  0,217,  0,145,  0,200,  0,127,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,216,  0,  0,  0,115,  0,  0,  0,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+217,  0,145,  0,  0,  0,  2,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,120,227,200,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+232,228,200,  4,  0,  0,  0,  0,  8,226,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+191,  1,  0,  0,191,  1,  0,  0,115,  0,  0,  0,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  4,  0,  4,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,232,228,200,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,120,227,200,  4,  0,  0,  0,  0,  0,  0, 16,193,  0,  0,130, 67,  0,  0,160,192,  0,  0,160, 64,
+  0,  0,  0,  0,  0,  0,122, 67,  0,  0, 16,193,  0,  0, 32, 65,  0,  0,  0,  0, 17,  0,  0,  0, 18,  0,  0,  0,144,  0,  0,  0,
+ 18,  0,  0,  0,230,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0, 18,  0,  0,  0,230,  0,  0,  0, 18,  0,  0,  0,144,  0,  0,  0,
+111, 18,131, 58,111, 18,131, 58,  0,124,146, 72,  0, 80, 67, 71,  0,  0,  0,  0,  0,  0,  0,  0,105,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  4,  0,  0,231,  0,145,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+217,  0,  0,  0,191,  1,  0,  0,115,  0,  0,  0,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+231,  0,145,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,240,  0,  0,  0, 88,230,200,  4,  0,  0,  0,  0,182,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,152, 98,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  2,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,112,  0,  0,  0,152, 98,200,  4,  0,  0,  0,  0,
+ 38,  1,  0,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,
+152,231,200,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,104,238,200,  4,  0,  0,  0,  0,168,223,200,  4,  0,  0,  0,  0,
+248,155,200,  4,  0,  0,  0,  0, 56, 84,186,  4,  0,  0,  0,  0,136,155,200,  4,  0,  0,  0,  0,104,156,200,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,191,  1,  0,  0,  5,  1,  0,  0,194,  2,  0,  0, 12, 12,192,  1,190,  1,  1,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,236,200,  4,  0,  0,  0,  0,216,236,200,  4,  0,  0,  0,  0,
+136,232,200,  4,  0,  0,  0,  0,104,235,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,136,232,200,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,248,233,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,192, 94, 68,
+  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,224, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,191,  1,  0,  0,
-191,  1,  0,  0,115,  0,  0,  0,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,
-  0,  0,  4,  0,  4,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 25,  0,  0,  0,  0,128,223, 67,  0,  0,200, 65,  0,128,223, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,192,  1, 26,  0,192,  1, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,191,  1,  0,  0,  5,  1,  0,  0, 30,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,192,  1, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,120,115,147,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  8,114,147,  5,  0,  0,  0,  0,  0,  0, 16,193,  0,  0,130, 67,  0,  0,160,192,  0,  0,160, 64,  0,  0,  0,  0,
-  0,  0,122, 67,  0,  0, 16,193,  0,  0, 32, 65,  0,  0,  0,  0, 17,  0,  0,  0, 18,  0,  0,  0,144,  0,  0,  0, 18,  0,  0,  0,
-230,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0, 18,  0,  0,  0,230,  0,  0,  0, 18,  0,  0,  0,144,  0,  0,  0,111, 18,131, 58,
-111, 18,131, 58,  0,124,146, 72,  0, 80, 67, 71,  0,  0,  0,  0,  0,  0,  0,  0,105,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,
-  0,  0,231,  0,145,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,217,  0,  0,  0,
-191,  1,  0,  0,115,  0,  0,  0,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,231,  0,145,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,248,233,200,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,104,235,200,  4,  0,  0,  0,  0,136,232,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 55, 67,
+  0,  0,  0,194,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72, 67,  0,  0,201,195,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,199,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,199,  0,  0,  0,
+ 18,  0,  0,  0,163,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  8,  4,  0,  0,  2,  0,  3,  3,  0,  0,  2,  4,  6,  0,200,  0,164,  1,200,  0,146,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,199,  0,  0,  0, 31,  1,  0,  0,194,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,200,  0,164,  1,  0,  0,  2,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,104,235,200,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248,233,200,  4,  0,  0,  0,  0,  0,  0, 32,193,  0,  0,104, 68,
+  0,  0, 72,194,  0,  0,  0,  0,  0,  0, 32,193,  0,  0,104, 68,  0,  0,201,195,  0,  0,  0,  0,231,  0,  0,  0,248,  0,  0,  0,
+ 18,  0,  0,  0,163,  1,  0,  0,  0,  0,  0,  0,230,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,230,  0,  0,  0,
+ 18,  0,  0,  0,163,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,124,146, 72,  0, 64, 28, 70, 10,215, 35, 60,  0,  0, 72, 66,
+ 74,  0,  0,  0,  0,  0,  0,  2,  0,  0,  2,  4,  4,  0,248,  0,164,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,200,  0,  0,  0,191,  1,  0,  0, 31,  1,  0,  0,194,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,248,  0,164,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65,240,  0,  0,  0,232,116,147,  5,  0,  0,  0,  0,179,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 72,  1,  0,  0,216,236,200,  4,  0,  0,  0,  0,
+ 39,  1,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 40,118,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,
-  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,112,  0,  0,  0, 40,118,147,  5,  0,  0,  0,  0, 38,  1,  0,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,232,118,147,  5,
-  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,184,125,147,  5,  0,  0,  0,  0, 56,110,147,  5,  0,  0,  0,  0,152,213,132,  5,
-  0,  0,  0,  0,168,152,137,  5,  0,  0,  0,  0,216,144,139,  5,  0,  0,  0,  0,168,134,139,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,191,  1,  0,  0,  5,  1,  0,  0,194,  2,  0,  0, 12, 12,192,  1,190,  1,  1,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40,124,147,  5,  0,  0,  0,  0, 40,124,147,  5,  0,  0,  0,  0,216,119,147,  5,
-  0,  0,  0,  0,184,122,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,216,119,147,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0, 72,121,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,192, 94, 68,  0,  0,  0,  0,
-  0,  0,208, 65,  0,  0,  0,  0,  0,  0,224, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,191,  1,  0,  0,  0,  0,  0,  0,
- 25,  0,  0,  0,  0,128,223, 67,  0,  0,200, 65,  0,128,223, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,192,  1, 26,  0,192,  1, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,191,  1,  0,  0,  5,  1,  0,  0, 30,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,192,  1, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  3,  2,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,104,238,200,  4,  0,  0,  0,  0,
+216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152,231,200,  4,  0,  0,  0,  0,216,156,200,  4,  0,  0,  0,  0,
+216,112,189,  4,  0,  0,  0,  0,  8, 87,187,  4,  0,  0,  0,  0, 72,157,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 25,  4,  0,  0,240,  4,  0,  0, 61,  2,  0,  0,194,  2,  0,  0,  1,  1,216,  0,134,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,248,245,200,  4,  0,  0,  0,  0,248,245,200,  4,  0,  0,  0,  0, 88,239,200,  4,  0,  0,  0,  0,
+200,240,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 88,239,200,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+200,240,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,102, 68,  0,  0,  0,  0,  0,  0,208, 65,
+  0,  0,  0,  0,  0,  0,165, 67,  0,  0,  0, 64,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 73,  1,  0,  0,  0,  0,  0,  0, 23,  0,  0,  0,
+  0,128,164, 67,  0,  0,200, 65,  0,128,164, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,
+  4,  0, 12,  0, 10,  0, 74,  1, 24,  0, 74,  1, 24,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 25,  4,  0,  0,240,  4,  0,  0, 61,  2,  0,  0, 61,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  1,  0,  2,  0,  1,  0,  0,  0,  0,  0,  0,  0, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 72,121,147,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,184,122,147,  5,  0,  0,  0,  0,216,119,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 55, 67,  0,  0,  0,194,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72, 67,  0,  0,201,195,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,199,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,199,  0,  0,  0, 18,  0,  0,  0,
-163,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  8,  4,  0,  0,
-  2,  0,  3,  3,  0,  0,  2,  4,  6,  0,200,  0,164,  1,200,  0,146,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,199,  0,  0,  0, 31,  1,  0,  0,194,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,200,  0,164,  1,  0,  0,  2,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,200,240,200,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 88,239,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,184,122,147,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72,121,147,  5,  0,  0,  0,  0,  0,  0, 32,193,  0,  0,104, 68,  0,  0, 72,194,
-  0,  0,  0,  0,  0,  0, 32,193,  0,  0,104, 68,  0,  0,201,195,  0,  0,  0,  0,231,  0,  0,  0,248,  0,  0,  0, 18,  0,  0,  0,
-163,  1,  0,  0,  0,  0,  0,  0,230,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,230,  0,  0,  0, 18,  0,  0,  0,
-163,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,124,146, 72,  0, 64, 28, 70, 10,215, 35, 60,  0,  0, 72, 66, 74,  0,  0,  0,
-  0,  0,  0,  2,  0,  0,  2,  4,  4,  0,248,  0,164,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,200,  0,  0,  0,191,  1,  0,  0, 31,  1,  0,  0,194,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,248,  0,164,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 72,  1,  0,  0, 40,124,147,  5,  0,  0,  0,  0, 39,  1,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 25,  4,  0,  0,240,  4,  0,  0, 61,  2,  0,  0,194,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+216,  0,134,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 56,242,200,  4,  0,  0,  0,  0, 68, 65, 84, 65,112,  3,  0,  0, 56,242,200,  4,  0,  0,  0,  0,175,  0,  0,  0,  1,  0,  0,  0,
+ 56,255, 13, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,228,100, 64,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,154, 65,128,191,  0,  0,128,191,  0,  0,  0,  0,  0,  0,  0,  0, 72,  1, 77,190,  0,  0,  0,  0,
+221,149, 47, 63, 86,126,162,190,  8,165, 39, 63,  0,  0,  0,  0, 51, 70, 58, 63,225,251,159, 62,149, 84, 28,191,  0,  0,  0,  0,
+192, 56, 49,188, 55, 53,101, 63, 52,247,227, 62,  0,  0,  0,  0, 90, 38,173,190,  0,222,192,190,152,  9, 52,193,  0,  0,128, 63,
+223,149, 47, 63, 55, 70, 58, 63,160, 56, 49,188,  0,  0,  0,  0, 88,126,162,190,229,251,159, 62, 55, 53,101, 63,  0,  0,  0,  0,
+  7,165, 39, 63,150, 84, 28,191, 51,247,227, 62,  0,  0,  0,  0,110,101,239, 64,151, 62,208,192, 78,255,170, 64,  0,  0,128, 63,
+ 47,201,194, 63, 61, 73,145,191,244,250, 39,191,  8,165, 39,191,190,164,206, 63,209, 10,143, 63,180,164, 28, 63,149, 84, 28, 63,
+224,153,196,188,136,239, 76, 64, 10,108,228,190, 52,247,227,190,125, 21, 64,191,126,113,172,191,216, 49, 49, 65,152,  9, 52, 65,
+149, 70,158, 62, 24,234,167, 62,192,214,159,187,  0,  0,  6,181,196,188,181,189, 71,238,178, 61,127, 45,128, 62,  0,  0,226, 51,
+168,120, 21,194,107,  5,  2, 66,203,135,213,193,147,214,159,192,177, 38, 19, 66,124,173,255,193, 96,101,210, 65,128, 40,160, 64,
+221,149, 47, 63, 86,126,162,190,  8,165, 39, 63,  0,  0,  0,  0, 51, 70, 58, 63,225,251,159, 62,149, 84, 28,191,  0,  0,  0,  0,
+192, 56, 49,188, 55, 53,101, 63, 52,247,227, 62,  0,  0,  0,  0, 90, 38,173,190,  0,222,192,190,152,  9, 52,193,  0,  0,128, 63,
+ 47,201,194, 63, 61, 73,145,191,244,250, 39,191,  8,165, 39,191,190,164,206, 63,209, 10,143, 63,180,164, 28, 63,149, 84, 28, 63,
+224,153,196,188,136,239, 76, 64, 10,108,228,190, 52,247,227,190,125, 21, 64,191,126,113,172,191,216, 49, 49, 65,152,  9, 52, 65,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  3,  2,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,184,125,147,  5,  0,  0,  0,  0,215,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,232,118,147,  5,  0,  0,  0,  0,104, 43,147,  5,  0,  0,  0,  0, 40, 76,135,  5,
-  0,  0,  0,  0, 88, 56,135,  5,  0,  0,  0,  0,216, 43,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25,  4,  0,  0,
-240,  4,  0,  0, 61,  2,  0,  0,194,  2,  0,  0,  1,  1,216,  0,134,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 72,133,147,  5,  0,  0,  0,  0, 72,133,147,  5,  0,  0,  0,  0,168,126,147,  5,  0,  0,  0,  0, 24,128,147,  5,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,168,126,147,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0, 24,128,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,102, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,
-  0,  0,165, 67,  0,  0,  0, 64,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 73,  1,  0,  0,  0,  0,  0,  0, 23,  0,  0,  0,  0,128,164, 67,
-  0,  0,200, 65,  0,128,164, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0,
- 10,  0, 74,  1, 24,  0, 74,  1, 24,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25,  4,  0,  0,
-240,  4,  0,  0, 61,  2,  0,  0, 61,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,
-  0,  0,  1,  0,  2,  0,  1,  0,  0,  0,  0,  0,  0,  0, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 24,128,147,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,168,126,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+102,103, 97, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,102,103, 97, 64,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,102,103, 97, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+241, 22, 72, 63, 78,162,246,190, 43,  8, 90,190,  2, 35,171,190,  0,  0, 32, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+253,191,136, 59,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240, 65,  1,  2,  0,  0,255,255,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  7,  0,  0,  0,128, 63,190,133, 65, 66, 99,212, 90, 66, 27,183,118, 66,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 96,  1,  0,  0,248,245,200,  4,  0,  0,  0,  0,
+176,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0, 51, 51, 51, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 65,205,204, 76, 62,  2,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  0,  0,  1,  0,  7,  0,216,120,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25,  4,  0,  0,
-240,  4,  0,  0, 61,  2,  0,  0,194,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,  0,134,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,
+  2,  0,  0,  0,  1,  0,  3,  0,  8,  0,128,  0,  0,  0, 12, 66,  0,  0,128, 63, 10,215, 35, 60,  0,  0,250, 67,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0, 10,  0,  7,  1,  0,  3,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 83, 78,  0,  0,  8,  1,  0,  0, 56,248,200,  4,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,
+184,100,201,  4,  0,  0,  0,  0,232,152,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 83, 82, 67,111,109,112,111,115,105,116,105,110,103,  0,103, 46, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136,249,200,  4,  0,  0,  0,  0,
+ 56,255,200,  4,  0,  0,  0,  0,168,255,200,  4,  0,  0,  0,  0,216,  8,201,  4,  0,  0,  0,  0, 72,  9,201,  4,  0,  0,  0,  0,
+120, 61,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,136,249,200,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+248,249,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0,248,249,200,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,104,250,200,  4,  0,  0,  0,  0,
+136,249,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  5,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
+104,250,200,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,216,250,200,  4,  0,  0,  0,  0,248,249,200,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  5,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,216,250,200,  4,  0,  0,  0,  0,
+213,  0,  0,  0,  1,  0,  0,  0, 72,251,200,  4,  0,  0,  0,  0,104,250,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+126,  7,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 72,251,200,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+184,251,200,  4,  0,  0,  0,  0,216,250,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,234,  3,  1,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0,184,251,200,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 40,252,200,  4,  0,  0,  0,  0,
+ 72,251,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,234,  3,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
+ 40,252,200,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,152,252,200,  4,  0,  0,  0,  0,184,251,200,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 32,  6, 92,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,152,252,200,  4,  0,  0,  0,  0,
+213,  0,  0,  0,  1,  0,  0,  0,  8,253,200,  4,  0,  0,  0,  0, 40,252,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+126,  7, 92,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,  8,253,200,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+120,253,200,  4,  0,  0,  0,  0,152,252,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,  6,234,  3,  1,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0,120,253,200,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,232,253,200,  4,  0,  0,  0,  0,
+  8,253,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140,  1,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
+232,253,200,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 88,254,200,  4,  0,  0,  0,  0,120,253,200,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 32,  6,140,  1,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 88,254,200,  4,  0,  0,  0,  0,
+213,  0,  0,  0,  1,  0,  0,  0,200,254,200,  4,  0,  0,  0,  0,232,253,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  4,  3,140,  1,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,200,254,200,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+ 56,255,200,  4,  0,  0,  0,  0, 88,254,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  3,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0, 56,255,200,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+200,254,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,  6,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+168,255,200,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 24,  0,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+248,249,200,  4,  0,  0,  0,  0,104,250,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+ 24,  0,201,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,136,  0,201,  4,  0,  0,  0,  0,168,255,200,  4,  0,  0,  0,  0,
+248,249,200,  4,  0,  0,  0,  0, 72,251,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+136,  0,201,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,248,  0,201,  4,  0,  0,  0,  0, 24,  0,201,  4,  0,  0,  0,  0,
+104,250,200,  4,  0,  0,  0,  0,184,251,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+248,  0,201,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,104,  1,201,  4,  0,  0,  0,  0,136,  0,201,  4,  0,  0,  0,  0,
+ 72,251,200,  4,  0,  0,  0,  0,184,251,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+104,  1,201,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,216,  1,201,  4,  0,  0,  0,  0,248,  0,201,  4,  0,  0,  0,  0,
+216,250,200,  4,  0,  0,  0,  0,152,252,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+216,  1,201,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 72,  2,201,  4,  0,  0,  0,  0,104,  1,201,  4,  0,  0,  0,  0,
+ 40,252,200,  4,  0,  0,  0,  0,152,252,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+ 72,  2,201,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,184,  2,201,  4,  0,  0,  0,  0,216,  1,201,  4,  0,  0,  0,  0,
+184,251,200,  4,  0,  0,  0,  0,  8,253,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+184,  2,201,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 40,  3,201,  4,  0,  0,  0,  0, 72,  2,201,  4,  0,  0,  0,  0,
+ 72,251,200,  4,  0,  0,  0,  0,  8,253,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+ 40,  3,201,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,152,  3,201,  4,  0,  0,  0,  0,184,  2,201,  4,  0,  0,  0,  0,
+ 40,252,200,  4,  0,  0,  0,  0,  8,253,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+152,  3,201,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  8,  4,201,  4,  0,  0,  0,  0, 40,  3,201,  4,  0,  0,  0,  0,
+184,251,200,  4,  0,  0,  0,  0,152,252,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+  8,  4,201,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,120,  4,201,  4,  0,  0,  0,  0,152,  3,201,  4,  0,  0,  0,  0,
+ 72,251,200,  4,  0,  0,  0,  0,120,253,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+120,  4,201,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,232,  4,201,  4,  0,  0,  0,  0,  8,  4,201,  4,  0,  0,  0,  0,
+  8,253,200,  4,  0,  0,  0,  0,232,253,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+232,  4,201,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 88,  5,201,  4,  0,  0,  0,  0,120,  4,201,  4,  0,  0,  0,  0,
+120,253,200,  4,  0,  0,  0,  0,232,253,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+ 88,  5,201,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,200,  5,201,  4,  0,  0,  0,  0,232,  4,201,  4,  0,  0,  0,  0,
+120,253,200,  4,  0,  0,  0,  0, 88,254,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+200,  5,201,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 56,  6,201,  4,  0,  0,  0,  0, 88,  5,201,  4,  0,  0,  0,  0,
+232,253,200,  4,  0,  0,  0,  0, 88,254,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+ 56,  6,201,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,168,  6,201,  4,  0,  0,  0,  0,200,  5,201,  4,  0,  0,  0,  0,
+136,249,200,  4,  0,  0,  0,  0,200,254,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+168,  6,201,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 24,  7,201,  4,  0,  0,  0,  0, 56,  6,201,  4,  0,  0,  0,  0,
+200,254,200,  4,  0,  0,  0,  0, 56,255,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+ 24,  7,201,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,136,  7,201,  4,  0,  0,  0,  0,168,  6,201,  4,  0,  0,  0,  0,
+216,250,200,  4,  0,  0,  0,  0, 56,255,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+136,  7,201,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,248,  7,201,  4,  0,  0,  0,  0, 24,  7,201,  4,  0,  0,  0,  0,
+ 40,252,200,  4,  0,  0,  0,  0, 56,255,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+248,  7,201,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,104,  8,201,  4,  0,  0,  0,  0,136,  7,201,  4,  0,  0,  0,  0,
+ 88,254,200,  4,  0,  0,  0,  0,200,254,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+104,  8,201,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,216,  8,201,  4,  0,  0,  0,  0,248,  7,201,  4,  0,  0,  0,  0,
+232,253,200,  4,  0,  0,  0,  0, 56,255,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+216,  8,201,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,104,  8,201,  4,  0,  0,  0,  0,
+136,249,200,  4,  0,  0,  0,  0,120,253,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,
+ 72,  9,201,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0, 24, 13,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 72,251,200,  4,  0,  0,  0,  0,248,249,200,  4,  0,  0,  0,  0,104,250,200,  4,  0,  0,  0,  0,184,251,200,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,235,  3,  0,  0,  5,  4,  0,  0,  7,  7,127,  7, 27,  0,  1,  0,
+  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40,100,201,  4,  0,  0,  0,  0, 40,100,201,  4,  0,  0,  0,  0,
+ 56, 10,201,  4,  0,  0,  0,  0,168, 11,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 56, 10,201,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,168, 11,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,148, 68,
+  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,224,239, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,
+  0,  0,  0,  0, 25,  0,  0,  0,  0,192,239, 68,  0,  0,200, 65,  0,192,239, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,127,  7, 26,  0,127,  7, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,235,  3,  0,  0,  4,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,127,  7, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,168, 11,201,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 56, 10,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,109, 69,
+  0,  0,128,192,  0,  0,  0,  0,  0,  0,  0,  0,255,255,109, 69,  0,  0,  0,192,  0,  0,  0,  0,112,  7,  0,  0,129,  7,  0,  0,
+ 18,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0,
+ 18,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  2,  0,  0,  0,  1,  0,  3,  3,  2,  0,  0,  4, 10,  0,129,  7,  2,  0,112,  7,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  5,  4,  0,  0,  5,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136,129,147,  5,
-  0,  0,  0,  0, 68, 65, 84, 65,112,  3,  0,  0,136,129,147,  5,  0,  0,  0,  0,174,  0,  0,  0,  1,  0,  0,  0, 56,255, 13, 64,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,228,100, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,154, 65,128,191,  0,  0,128,191,  0,  0,  0,  0,  0,  0,  0,  0, 72,  1, 77,190,  0,  0,  0,  0,221,149, 47, 63,
- 86,126,162,190,  8,165, 39, 63,  0,  0,  0,  0, 51, 70, 58, 63,225,251,159, 62,149, 84, 28,191,  0,  0,  0,  0,192, 56, 49,188,
- 55, 53,101, 63, 52,247,227, 62,  0,  0,  0,  0, 90, 38,173,190,  0,222,192,190,152,  9, 52,193,  0,  0,128, 63,223,149, 47, 63,
- 55, 70, 58, 63,160, 56, 49,188,  0,  0,  0,  0, 88,126,162,190,229,251,159, 62, 55, 53,101, 63,  0,  0,  0,  0,  7,165, 39, 63,
-150, 84, 28,191, 51,247,227, 62,  0,  0,  0,  0,110,101,239, 64,151, 62,208,192, 78,255,170, 64,  0,  0,128, 63, 47,201,194, 63,
- 61, 73,145,191,244,250, 39,191,  8,165, 39,191,190,164,206, 63,209, 10,143, 63,180,164, 28, 63,149, 84, 28, 63,224,153,196,188,
-136,239, 76, 64, 10,108,228,190, 52,247,227,190,125, 21, 64,191,126,113,172,191,216, 49, 49, 65,152,  9, 52, 65,149, 70,158, 62,
- 24,234,167, 62,192,214,159,187,  0,  0,  6,181,196,188,181,189, 71,238,178, 61,127, 45,128, 62,  0,  0,226, 51,168,120, 21,194,
-107,  5,  2, 66,203,135,213,193,147,214,159,192,177, 38, 19, 66,124,173,255,193, 96,101,210, 65,128, 40,160, 64,221,149, 47, 63,
- 86,126,162,190,  8,165, 39, 63,  0,  0,  0,  0, 51, 70, 58, 63,225,251,159, 62,149, 84, 28,191,  0,  0,  0,  0,192, 56, 49,188,
- 55, 53,101, 63, 52,247,227, 62,  0,  0,  0,  0, 90, 38,173,190,  0,222,192,190,152,  9, 52,193,  0,  0,128, 63, 47,201,194, 63,
- 61, 73,145,191,244,250, 39,191,  8,165, 39,191,190,164,206, 63,209, 10,143, 63,180,164, 28, 63,149, 84, 28, 63,224,153,196,188,
-136,239, 76, 64, 10,108,228,190, 52,247,227,190,125, 21, 64,191,126,113,172,191,216, 49, 49, 65,152,  9, 52, 65,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0, 24, 13,201,  4,  0,  0,  0,  0,
+216,  0,  0,  0,  1,  0,  0,  0,  8, 18,201,  4,  0,  0,  0,  0, 72,  9,201,  4,  0,  0,  0,  0, 56,255,200,  4,  0,  0,  0,  0,
+ 40,252,200,  4,  0,  0,  0,  0,152,252,200,  4,  0,  0,  0,  0,216,250,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 33,  6,  0,  0,126,  7,  0,  0,  0,  0,  0,  0, 91,  0,  0,  0, 15, 15, 94,  1, 92,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,232, 16,201,  4,  0,  0,  0,  0,232, 16,201,  4,  0,  0,  0,  0,  8, 14,201,  4,  0,  0,  0,  0,
+120, 15,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,  8, 14,201,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+120, 15,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,115, 68,  0,  0,  0,  0,  0,  0,208, 65,
+  0,  0,  0,  0,  0,  0,175, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 93,  1,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,
+  0,128,174, 67,  0,  0,200, 65,  0,128,174, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,
+  4,  0, 12,  0, 10,  0, 94,  1, 26,  0, 94,  1, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 33,  6,  0,  0,126,  7,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 94,  1, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,120, 15,201,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  8, 14,201,  4,  0,  0,  0,  0,  0,  0, 64,192,  0,  0,126, 67,  0,  0,  0,  0,  0,  0, 72, 66,
+ 50, 51, 74,193,154,209,131, 67,  0,  0,  0,  0,  0,  0, 72, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 93,  1,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0, 93,  1,  0,  0, 18,  0,  0,  0, 65,  0,  0,  0,
+  0,  0,128, 63,  0,  0, 72, 66,  0,124,146, 72,  0,  0, 72, 66,205,204,204, 61,  0,  0, 32, 65, 72,  0,  0,  0,  0,  0,  0,  2,
+  4,  0,  0,  4,  8,  0, 94,  1, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 33,  6,  0,  0,126,  7,  0,  0, 26,  0,  0,  0, 91,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 94,  1, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,208,  0,  0,  0,232, 16,201,  4,  0,  0,  0,  0,185,  0,  0,  0,  1,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,102,103, 97, 64,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,102,103, 97, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,102,103, 97, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,241, 22, 72, 63,
- 78,162,246,190, 43,  8, 90,190,  2, 35,171,190,  0,  0, 32, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,253,191,136, 59,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240, 65,  1,  2,  0,  0,255,255,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  7,  0,  0,  0,128, 63,190,133, 65, 66, 99,212, 90, 66, 27,183,118, 66,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 96,  1,  0,  0, 72,133,147,  5,  0,  0,  0,  0,175,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  0,  0, 51, 51, 51, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 65,205,204, 76, 62,  2,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
-  1,  0,  7,  0, 24,213,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,  8, 18,201,  4,  0,  0,  0,  0,
+216,  0,  0,  0,  1,  0,  0,  0,152, 42,201,  4,  0,  0,  0,  0, 24, 13,201,  4,  0,  0,  0,  0, 40,252,200,  4,  0,  0,  0,  0,
+  8,253,200,  4,  0,  0,  0,  0,184,251,200,  4,  0,  0,  0,  0,152,252,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 33,  6,  0,  0,126,  7,  0,  0, 93,  0,  0,  0,233,  3,  0,  0,  4,  4, 94,  1,141,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 88, 41,201,  4,  0,  0,  0,  0, 88, 41,201,  4,  0,  0,  0,  0,248, 18,201,  4,  0,  0,  0,  0,
+104, 20,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,248, 18,201,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+104, 20,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,148, 67,  0,  0,  0,  0,  0,  0,208, 65,
+  0,  0,  0,  0,  0,  0,175, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 93,  1,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,
+  0,128,174, 67,  0,  0,200, 65,  0,128,174, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,
+  4,  0, 12,  0, 10,  0, 94,  1, 26,  0, 94,  1, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 33,  6,  0,  0,126,  7,  0,  0,208,  3,  0,  0,233,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 94,  1, 26,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  2,  0,  0,  0,
-  1,  0,  3,  0,  8,  0,128,  0,  0,  0, 12, 66,  0,  0,128, 63, 10,215, 35, 60,  0,  0,250, 67,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0, 10,  0,  7,  1,  0,  3,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,104, 20,201,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,248, 18,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,174, 67,  0,128, 92,196,  0,  0,  0,  0,
+  0,  0,  0,  0,255,127,166, 67,255,191, 92,196,  0,  0,  0,  0, 77,  1,  0,  0, 94,  1,  0,  0,  0,  0,  0,  0,114,  3,  0,  0,
+  0,  0,  0,  0, 82,  1,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0, 76,  1,  0,  0,  0,  0,  0,  0,114,  3,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0,
+ 18,  0,  0,  4,  6,  0, 94,  1,115,  3, 77,  1,115,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 33,  6,  0,  0,126,  7,  0,  0, 93,  0,  0,  0,207,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 94,  1,115,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216, 21,201,  4,  0,  0,  0,  0,
+184, 39,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,216, 21,201,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+120, 23,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 66, 85, 84, 84, 79, 78, 83, 95, 80, 84, 95, 99,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 66, 85, 84, 84, 79, 78, 83, 95, 80, 84, 95, 99,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 83, 78,  0,  0,  8,  1,  0,  0,248,134,147,  5,  0,  0,  0,  0,211,  0,  0,  0,  1,  0,  0,  0,104, 63,166,  5,
-  0,  0,  0,  0, 24, 42,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 82, 67,111,
-109,112,111,115,105,116,105,110,103,  0,103, 46, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 67,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72,136,147,  5,  0,  0,  0,  0,248,141,147,  5,
-  0,  0,  0,  0,104,142,147,  5,  0,  0,  0,  0,152,151,147,  5,  0,  0,  0,  0,  8,152,147,  5,  0,  0,  0,  0, 56,204,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,220,255, 76,  1, 36,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 72,136,147,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,184,136,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 32,  0,  0,  0,184,136,147,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0, 40,137,147,  5,  0,  0,  0,  0, 72,136,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  5,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 40,137,147,  5,
-  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,152,137,147,  5,  0,  0,  0,  0,184,136,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,126,  7,  5,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,152,137,147,  5,  0,  0,  0,  0,212,  0,  0,  0,
-  1,  0,  0,  0,  8,138,147,  5,  0,  0,  0,  0, 40,137,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,  8,138,147,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,120,138,147,  5,
-  0,  0,  0,  0,152,137,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,234,  3,  1,  0,  0,  0, 68, 65, 84, 65,
- 32,  0,  0,  0,120,138,147,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,232,138,147,  5,  0,  0,  0,  0,  8,138,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,234,  3,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,232,138,147,  5,
-  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0, 88,139,147,  5,  0,  0,  0,  0,120,138,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 32,  6, 92,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 88,139,147,  5,  0,  0,  0,  0,212,  0,  0,  0,
-  1,  0,  0,  0,200,139,147,  5,  0,  0,  0,  0,232,138,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7, 92,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,200,139,147,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0, 56,140,147,  5,
-  0,  0,  0,  0, 88,139,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,  6,234,  3,  1,  0,  0,  0, 68, 65, 84, 65,
- 32,  0,  0,  0, 56,140,147,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,168,140,147,  5,  0,  0,  0,  0,200,139,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140,  1,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,168,140,147,  5,
-  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0, 24,141,147,  5,  0,  0,  0,  0, 56,140,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 32,  6,140,  1,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 24,141,147,  5,  0,  0,  0,  0,212,  0,  0,  0,
-  1,  0,  0,  0,136,141,147,  5,  0,  0,  0,  0,168,140,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  3,140,  1,
-  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,136,141,147,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,248,141,147,  5,
-  0,  0,  0,  0, 24,141,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  3,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 32,  0,  0,  0,248,141,147,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136,141,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,  6,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,104,142,147,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,216,142,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,184,136,147,  5,
-  0,  0,  0,  0, 40,137,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,216,142,147,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 72,143,147,  5,  0,  0,  0,  0,104,142,147,  5,  0,  0,  0,  0,184,136,147,  5,
-  0,  0,  0,  0,  8,138,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 72,143,147,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,184,143,147,  5,  0,  0,  0,  0,216,142,147,  5,  0,  0,  0,  0, 40,137,147,  5,
-  0,  0,  0,  0,120,138,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,184,143,147,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 40,144,147,  5,  0,  0,  0,  0, 72,143,147,  5,  0,  0,  0,  0,  8,138,147,  5,
-  0,  0,  0,  0,120,138,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 40,144,147,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,152,144,147,  5,  0,  0,  0,  0,184,143,147,  5,  0,  0,  0,  0,152,137,147,  5,
-  0,  0,  0,  0, 88,139,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,152,144,147,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  8,145,147,  5,  0,  0,  0,  0, 40,144,147,  5,  0,  0,  0,  0,232,138,147,  5,
-  0,  0,  0,  0, 88,139,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,  8,145,147,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,120,145,147,  5,  0,  0,  0,  0,152,144,147,  5,  0,  0,  0,  0,120,138,147,  5,
-  0,  0,  0,  0,200,139,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,120,145,147,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,232,145,147,  5,  0,  0,  0,  0,  8,145,147,  5,  0,  0,  0,  0,  8,138,147,  5,
-  0,  0,  0,  0,200,139,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,232,145,147,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 88,146,147,  5,  0,  0,  0,  0,120,145,147,  5,  0,  0,  0,  0,232,138,147,  5,
-  0,  0,  0,  0,200,139,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 88,146,147,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,200,146,147,  5,  0,  0,  0,  0,232,145,147,  5,  0,  0,  0,  0,120,138,147,  5,
-  0,  0,  0,  0, 88,139,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,200,146,147,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 56,147,147,  5,  0,  0,  0,  0, 88,146,147,  5,  0,  0,  0,  0,  8,138,147,  5,
-  0,  0,  0,  0, 56,140,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 56,147,147,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,168,147,147,  5,  0,  0,  0,  0,200,146,147,  5,  0,  0,  0,  0,200,139,147,  5,
-  0,  0,  0,  0,168,140,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,168,147,147,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 24,148,147,  5,  0,  0,  0,  0, 56,147,147,  5,  0,  0,  0,  0, 56,140,147,  5,
-  0,  0,  0,  0,168,140,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 24,148,147,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,136,148,147,  5,  0,  0,  0,  0,168,147,147,  5,  0,  0,  0,  0, 56,140,147,  5,
-  0,  0,  0,  0, 24,141,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,136,148,147,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,248,148,147,  5,  0,  0,  0,  0, 24,148,147,  5,  0,  0,  0,  0,168,140,147,  5,
-  0,  0,  0,  0, 24,141,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,248,148,147,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,104,149,147,  5,  0,  0,  0,  0,136,148,147,  5,  0,  0,  0,  0, 72,136,147,  5,
-  0,  0,  0,  0,136,141,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,104,149,147,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,216,149,147,  5,  0,  0,  0,  0,248,148,147,  5,  0,  0,  0,  0,136,141,147,  5,
-  0,  0,  0,  0,248,141,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,216,149,147,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 72,150,147,  5,  0,  0,  0,  0,104,149,147,  5,  0,  0,  0,  0,152,137,147,  5,
-  0,  0,  0,  0,248,141,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 72,150,147,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,184,150,147,  5,  0,  0,  0,  0,216,149,147,  5,  0,  0,  0,  0,232,138,147,  5,
-  0,  0,  0,  0,248,141,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,184,150,147,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 40,151,147,  5,  0,  0,  0,  0, 72,150,147,  5,  0,  0,  0,  0, 24,141,147,  5,
-  0,  0,  0,  0,136,141,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 40,151,147,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,152,151,147,  5,  0,  0,  0,  0,184,150,147,  5,  0,  0,  0,  0,168,140,147,  5,
-  0,  0,  0,  0,248,141,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,152,151,147,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40,151,147,  5,  0,  0,  0,  0, 72,136,147,  5,
-  0,  0,  0,  0, 56,140,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,  8,152,147,  5,
-  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,216,155,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,138,147,  5,
-  0,  0,  0,  0,184,136,147,  5,  0,  0,  0,  0, 40,137,147,  5,  0,  0,  0,  0,120,138,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,235,  3,  0,  0,  5,  4,  0,  0,  7,  7,127,  7, 27,  0,  1,  0,  0,  0,  0,  0,
-  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,184,243,146,  5,  0,  0,  0,  0,184,243,146,  5,  0,  0,  0,  0,248,152,147,  5,
-  0,  0,  0,  0,104,154,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,248,152,147,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,104,154,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,148, 68,  0,  0,  0,  0,
-  0,  0,208, 65,  0,  0,  0,  0,  0,224,239, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,  0,  0,  0,  0,
- 25,  0,  0,  0,  0,192,239, 68,  0,  0,200, 65,  0,192,239, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,127,  7, 26,  0,127,  7, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,235,  3,  0,  0,  4,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,127,  7, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,104,154,147,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248,152,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,109, 69,  0,  0,128,192,
-  0,  0,  0,  0,  0,  0,  0,  0,255,255,109, 69,  0,  0,  0,192,  0,  0,  0,  0,112,  7,  0,  0,129,  7,  0,  0, 18,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0, 18,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  2,  0,  0,  0,
-  1,  0,  3,  3,  2,  0,  0,  4, 10,  0,129,  7,  2,  0,112,  7,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  5,  4,  0,  0,  5,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,216,155,147,  5,  0,  0,  0,  0,215,  0,  0,  0,
-  1,  0,  0,  0,200,160,147,  5,  0,  0,  0,  0,  8,152,147,  5,  0,  0,  0,  0,248,141,147,  5,  0,  0,  0,  0,232,138,147,  5,
-  0,  0,  0,  0, 88,139,147,  5,  0,  0,  0,  0,152,137,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 33,  6,  0,  0,
-126,  7,  0,  0,  0,  0,  0,  0, 91,  0,  0,  0, 15, 15, 94,  1, 92,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,168,159,147,  5,  0,  0,  0,  0,168,159,147,  5,  0,  0,  0,  0,200,156,147,  5,  0,  0,  0,  0, 56,158,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,200,156,147,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0, 56,158,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,115, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,
-  0,  0,175, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 93,  1,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,128,174, 67,
-  0,  0,200, 65,  0,128,174, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0,
- 10,  0, 94,  1, 26,  0, 94,  1, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 33,  6,  0,  0,
-126,  7,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 94,  1, 26,  0,
-  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+120, 23,201,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 24, 25,201,  4,  0,  0,  0,  0,216, 21,201,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,114,101,110,100,101,114,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 56,158,147,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,200,156,147,  5,  0,  0,  0,  0,  0,  0, 64,192,  0,  0,126, 67,  0,  0,  0,  0,  0,  0, 72, 66, 50, 51, 74,193,
-154,209,131, 67,  0,  0,  0,  0,  0,  0, 72, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 93,  1,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0, 93,  1,  0,  0, 18,  0,  0,  0, 65,  0,  0,  0,  0,  0,128, 63,
-  0,  0, 72, 66,  0,124,146, 72,  0,  0, 72, 66,205,204,204, 61,  0,  0, 32, 65, 72,  0,  0,  0,  0,  0,  0,  2,  4,  0,  0,  4,
-  8,  0, 94,  1, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 33,  6,  0,  0,
-126,  7,  0,  0, 26,  0,  0,  0, 91,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 94,  1, 66,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,114,101,110,100,101,114,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82,101,110,100,101,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,135,255, 76,  1, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65,208,  0,  0,  0,168,159,147,  5,  0,  0,  0,  0,191,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 24, 25,201,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+184, 26,201,  4,  0,  0,  0,  0,120, 23,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,108, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,108, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 76, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,111,255, 76,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,200,160,147,  5,  0,  0,  0,  0,215,  0,  0,  0,
-  1,  0,  0,  0, 88,185,147,  5,  0,  0,  0,  0,216,155,147,  5,  0,  0,  0,  0,232,138,147,  5,  0,  0,  0,  0,200,139,147,  5,
-  0,  0,  0,  0,120,138,147,  5,  0,  0,  0,  0, 88,139,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 33,  6,  0,  0,
-126,  7,  0,  0, 93,  0,  0,  0,233,  3,  0,  0,  4,  4, 94,  1,141,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 24,184,147,  5,  0,  0,  0,  0, 24,184,147,  5,  0,  0,  0,  0,184,161,147,  5,  0,  0,  0,  0, 40,163,147,  5,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,184,161,147,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0, 40,163,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,148, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,
-  0,  0,175, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 93,  1,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,128,174, 67,
-  0,  0,200, 65,  0,128,174, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0,
- 10,  0, 94,  1, 26,  0, 94,  1, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 33,  6,  0,  0,
-126,  7,  0,  0,208,  3,  0,  0,233,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 94,  1, 26,  0,
-  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+184, 26,201,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 88, 28,201,  4,  0,  0,  0,  0, 24, 25,201,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,100,105,109,101,110,115,
+105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,100,105,109,101,110,115,
+105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,105,109,101,110,115,105,111,110,115,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140,254, 76,  1,203,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 40,163,147,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,184,161,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,174, 67,  0,128, 92,196,  0,  0,  0,  0,  0,  0,  0,  0,
-255,127,166, 67,255,191, 92,196,  0,  0,  0,  0, 77,  1,  0,  0, 94,  1,  0,  0,  0,  0,  0,  0,114,  3,  0,  0,  0,  0,  0,  0,
- 82,  1,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0, 76,  1,  0,  0,  0,  0,  0,  0,114,  3,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,
-  6,  0, 94,  1,115,  3, 77,  1,115,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 33,  6,  0,  0,
-126,  7,  0,  0, 93,  0,  0,  0,207,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 94,  1,115,  3,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152,164,147,  5,  0,  0,  0,  0,120,182,147,  5,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 88, 28,201,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+248, 29,201,  4,  0,  0,  0,  0,184, 26,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 97,110,116,105, 97,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,152,164,147,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 56,166,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 85, 84, 84,
- 79, 78, 83, 95, 80, 84, 95, 99,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 85, 84, 84,
- 79, 78, 83, 95, 80, 84, 95, 99,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67,111,110,116,
-101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,220,255,
- 76,  1, 36,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 97,110,116,105, 97,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 65,110,116,105, 45, 65,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 56,166,147,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,216,167,147,  5,  0,  0,  0,  0,152,164,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,114,101,110,100,101,114,  0,  0,  0,  0,
+  0,  0, 58,254, 76,  1, 58,  0, 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,114,101,110,100,101,114,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82,101,110,100,101,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+248, 29,201,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,152, 31,201,  4,  0,  0,  0,  0, 88, 28,201,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,109,111,116,105,111,110,
+ 95, 98,108,117,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,109,111,116,105,111,110,
+ 95, 98,108,117,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 97,109,112,108,101,100, 32, 77,111,116,105,111,110, 32, 66,
+108,117,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 34,254, 76,  1,  0,  0, 20,  0,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,135,255, 76,  1, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,152, 31,201,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+ 56, 33,201,  4,  0,  0,  0,  0,248, 29,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,104, 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,216,167,147,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,120,169,147,  5,
-  0,  0,  0,  0, 56,166,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,108, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,108, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 76, 97,121,101,
-114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,111,255,
- 76,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,104, 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 83,104, 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,120,169,147,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 24,171,147,  5,  0,  0,  0,  0,216,167,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,100,105,109,101,110,115,105,111,110,115,
+  0,  0, 10,254, 76,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,100,105,109,101,110,115,105,111,110,115,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,105,109,101,110,115,105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+ 56, 33,201,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,216, 34,201,  4,  0,  0,  0,  0,152, 31,201,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,101,114,102,111,114,
+109, 97,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,101,114,102,111,114,
+109, 97,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,101,114,102,111,114,109, 97,110, 99,101,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140,254, 76,  1,203,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,242,253, 76,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 24,171,147,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,184,172,147,  5,
-  0,  0,  0,  0,120,169,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95, 97,110,116,105, 97,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95, 97,110,116,105, 97,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 65,110,116,105,
- 45, 65,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 58,254,
- 76,  1, 58,  0, 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,216, 34,201,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+120, 36,201,  4,  0,  0,  0,  0, 56, 33,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,111,115,116, 95,112,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,111,115,116, 95,112,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,184,172,147,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 88,174,147,  5,  0,  0,  0,  0, 24,171,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,109,111,116,105,111,110, 95, 98,108,117,
-114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,109,111,116,105,111,110, 95, 98,108,117,
-114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 97,109,112,108,101,100, 32, 77,111,116,105,111,110, 32, 66,108,117,114,  0,
+ 80,111,115,116, 32, 80,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 34,254, 76,  1,  0,  0, 20,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
-  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,218,253, 76,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 88,174,147,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,248,175,147,  5,
-  0,  0,  0,  0,184,172,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,115,104, 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,115,104, 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83,104, 97,100,
-105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,254,
- 76,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+120, 36,201,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 24, 38,201,  4,  0,  0,  0,  0,216, 34,201,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,116, 97,109,112,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,116, 97,109,112,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,248,175,147,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,152,177,147,  5,  0,  0,  0,  0, 88,174,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,101,114,102,111,114,109, 97,110, 99,
-101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,101,114,102,111,114,109, 97,110, 99,
-101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,101,114,102,111,114,109, 97,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83,116, 97,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,242,253, 76,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
-  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,194,253, 76,  1,  0,  0, 20,  0,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,152,177,147,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 56,179,147,  5,
-  0,  0,  0,  0,248,175,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,112,111,115,116, 95,112,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,112,111,115,116, 95,112,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,111,115,116,
- 32, 80,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,218,253,
- 76,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 24, 38,201,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+184, 39,201,  4,  0,  0,  0,  0,120, 36,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,111,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,111,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 56,179,147,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,216,180,147,  5,  0,  0,  0,  0,152,177,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,116, 97,109,112,  0,  0,  0,  0,  0,
+ 79,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,116, 97,109,112,  0,  0,  0,  0,  0,
+  0,  0, 40,253, 76,  1,130,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83,116, 97,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,194,253, 76,  1,  0,  0, 20,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
-  9,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+184, 39,201,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24, 38,201,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 98, 97,107,101,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 98, 97,107,101,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,216,180,147,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,120,182,147,  5,
-  0,  0,  0,  0, 56,179,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,111,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,111,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79,117,116,112,
-117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40,253,
- 76,  1,130,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 97,107,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,253, 76,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0, 11,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,120,182,147,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,180,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 98, 97,107,101,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 98, 97,107,101,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,248,  0,  0,  0, 88, 41,201,  4,  0,  0,  0,  0,180,  0,  0,  0,  1,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 97,107,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,253, 76,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
- 11,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65,248,  0,  0,  0, 24,184,147,  5,  0,  0,  0,  0,180,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+255, 21,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,
+152, 42,201,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0, 40, 56,201,  4,  0,  0,  0,  0,  8, 18,201,  4,  0,  0,  0,  0,
+200,254,200,  4,  0,  0,  0,  0, 88,254,200,  4,  0,  0,  0,  0,232,253,200,  4,  0,  0,  0,  0, 56,255,200,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  5,  3,  0,  0, 31,  6,  0,  0,  0,  0,  0,  0,139,  1,  0,  0,  1,  1, 27,  3,140,  1,  1,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120, 54,201,  4,  0,  0,  0,  0,120, 54,201,  4,  0,  0,  0,  0,
+136, 43,201,  4,  0,  0,  0,  0, 72, 49,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,136, 43,201,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,248, 44,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64,113, 68,
+  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,192, 70, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 26,  3,  0,  0,
+  0,  0,  0,  0, 25,  0,  0,  0,  0,128, 70, 68,  0,  0,200, 65,  0,128, 70, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0, 27,  3, 26,  0, 27,  3, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  5,  3,  0,  0, 31,  6,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 27,  3, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,248, 44,201,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,104, 46,201,  4,  0,  0,  0,  0,136, 43,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,
+  0, 64, 70,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,255,127, 70,196,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0,
+ 18,  0,  0,  0, 43,  3,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,
+ 18,  0,  0,  0, 43,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64,
+ 10,  0,  0,  0,  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,160,  0, 44,  3,143,  0, 26,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  5,  3,  0,  0,  5,  3,  0,  0, 26,  0,  0,  0,139,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,114,  1,  0,  0,  5,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,104, 46,201,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,216, 47,201,  4,  0,  0,  0,  0,248, 44,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16, 67,
+  0,  0,206,194,  0,  0,  0,  0,  0,  0,  0,  0,231,102, 16, 67,  0,  0,206,194,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0,
+ 18,  0,  0,  0,119,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,
+ 18,  0,  0,  0,119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64,
+ 10,  0,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,160,  0,120,  0,143,  0,102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  5,  3,  0,  0, 31,  6,  0,  0, 26,  0,  0,  0, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  6,  0, 34,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,216, 47,201,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0, 72, 49,201,  4,  0,  0,  0,  0,104, 46,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 35, 67,
+  0,192,108,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 35, 67,  0,  0,184,195,  0,  0,  0,  0,163,  0,  0,  0,180,  0,  0,  0,
+ 18,  0,  0,  0,129,  1,  0,  0,  0,  0,  0,  0,162,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,162,  0,  0,  0,
+ 18,  0,  0,  0,129,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64,
+ 10,  0,  0,  0,  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,180,  0,130,  1,163,  0,112,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 31,  6,  0,  0, 31,  6,  0,  0, 26,  0,  0,  0,139,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  4,  0,  4,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 72, 49,201,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216, 47,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255, 21,  0,  0,
-160,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0, 88,185,147,  5,
-  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,232,198,147,  5,  0,  0,  0,  0,200,160,147,  5,  0,  0,  0,  0,136,141,147,  5,
-  0,  0,  0,  0, 24,141,147,  5,  0,  0,  0,  0,168,140,147,  5,  0,  0,  0,  0,248,141,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  5,  3,  0,  0, 31,  6,  0,  0,  0,  0,  0,  0,139,  1,  0,  0,  1,  1, 27,  3,140,  1,  1,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 56,197,147,  5,  0,  0,  0,  0, 56,197,147,  5,  0,  0,  0,  0, 72,186,147,  5,
-  0,  0,  0,  0,  8,192,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 72,186,147,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,184,187,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64,113, 68,  0,  0,  0,  0,
-  0,  0,208, 65,  0,  0,  0,  0,  0,192, 70, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 26,  3,  0,  0,  0,  0,  0,  0,
- 25,  0,  0,  0,  0,128, 70, 68,  0,  0,200, 65,  0,128, 70, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  2,  0,  3,  3,  4,  0, 12,  0, 10,  0, 27,  3, 26,  0, 27,  3, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  5,  3,  0,  0, 31,  6,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 27,  3, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,184,187,147,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0, 40,189,147,  5,  0,  0,  0,  0, 72,186,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0, 64, 70,196,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,255,127, 70,196,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0, 18,  0,  0,  0,
- 43,  3,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0, 18,  0,  0,  0,
- 43,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  0,  0,  0,
-  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,160,  0, 44,  3,143,  0, 26,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  5,  3,  0,  0,  5,  3,  0,  0, 26,  0,  0,  0,139,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,114,  1,  0,  0,  5,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  5,  3,  0,  0, 31,  6,  0,  0, 26,  0,  0,  0,139,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 27,  3,114,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 40,189,147,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,152,190,147,  5,  0,  0,  0,  0,184,187,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16, 67,  0,  0,206,194,
-  0,  0,  0,  0,  0,  0,  0,  0,231,102, 16, 67,  0,  0,206,194,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0, 18,  0,  0,  0,
-119,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0, 18,  0,  0,  0,
-119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  0,  0,  0,
-  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,160,  0,120,  0,143,  0,102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  5,  3,  0,  0, 31,  6,  0,  0, 26,  0,  0,  0, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  6,  0, 34,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,184, 50,201,  4,  0,  0,  0,  0, 68, 65, 84, 65,112,  3,  0,  0,184, 50,201,  4,  0,  0,  0,  0,
+175,  0,  0,  0,  1,  0,  0,  0, 93,101,230, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 30,133,119, 64,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,154, 65,128,191,  0,  0,128,191,  0,  0,  0,  0,  0,  0,  0,  0,
+ 72,  1, 77,190,  0,  0,  0,  0,221,149, 47, 63, 85,126,162,190,  8,165, 39, 63,  0,  0,  0,  0, 51, 70, 58, 63,225,251,159, 62,
+149, 84, 28,191,  0,  0,  0,  0,191, 56, 49,188, 54, 53,101, 63, 50,247,227, 62,  0,  0,  0,  0, 90, 38,173,190,254,221,192,190,
+152,  9, 52,193,  0,  0,128, 63,223,149, 47, 63, 55, 70, 58, 63,192, 56, 49,188,  0,  0,  0,  0, 87,126,162,190,228,251,159, 62,
+ 56, 53,101, 63,  0,  0,  0,  0,  7,165, 39, 63,150, 84, 28,191, 50,247,227, 62,  0,  0,  0,  0,110,101,239, 64,151, 62,208,192,
+ 77,255,170, 64,  0,  0,128, 63, 42,  6,158, 63, 99, 28,157,191,244,250, 39,191,  8,165, 39,191,211,164,167, 63, 55,175,154, 63,
+180,164, 28, 63,149, 84, 28, 63, 39,127,159,188,135,157, 93, 64,  8,108,228,190, 50,247,227,190,  4,213, 27,191,122,122,186,191,
+216, 49, 49, 65,152,  9, 52, 65, 25, 25,195, 62,176,249,206, 62,128,238,196,187,  0,  0,192,179, 55, 15,168,189,201,118,165, 61,
+152, 15,109, 62,  0,  0,152, 51,211,120, 21,194,144,  5,  2, 66,  6,136,213,193,193,214,159,192,219, 38, 19, 66,196,173,255,193,
+154,101,210, 65,173, 40,160, 64,221,149, 47, 63, 85,126,162,190,  8,165, 39, 63,  0,  0,  0,  0, 51, 70, 58, 63,225,251,159, 62,
+149, 84, 28,191,  0,  0,  0,  0,191, 56, 49,188, 54, 53,101, 63, 50,247,227, 62,  0,  0,  0,  0, 90, 38,173,190,254,221,192,190,
+152,  9, 52,193,  0,  0,128, 63, 42,  6,158, 63, 99, 28,157,191,244,250, 39,191,  8,165, 39,191,211,164,167, 63, 55,175,154, 63,
+180,164, 28, 63,149, 84, 28, 63, 39,127,159,188,135,157, 93, 64,  8,108,228,190, 50,247,227,190,  4,213, 27,191,122,122,186,191,
+216, 49, 49, 65,152,  9, 52, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,152,190,147,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,  8,192,147,  5,  0,  0,  0,  0, 40,189,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 35, 67,  0,192,108,196,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 35, 67,  0,  0,184,195,  0,  0,  0,  0,163,  0,  0,  0,180,  0,  0,  0, 18,  0,  0,  0,
-129,  1,  0,  0,  0,  0,  0,  0,162,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,162,  0,  0,  0, 18,  0,  0,  0,
-129,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  0,  0,  0,
-  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,180,  0,130,  1,163,  0,112,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 31,  6,  0,  0, 31,  6,  0,  0, 26,  0,  0,  0,139,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  4,  0,  4,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,  8,192,147,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152,190,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 62,250,150, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,250,150, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,250,150, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,241, 22, 72, 63, 78,162,246,190, 44,  8, 90,190,  3, 35,171,190,214,211,111, 65,214,211,111, 65,
+  0,  0,  0,  0,  0,  0,  0,  0, 80, 49,183, 58,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160, 65,  1,  2,  0,  0,
+255,255,  0,  0, 92, 62, 55, 63, 56,186,224,190,237,203,148,190,  3,236,234,190,  1,  0,  0,  0,  0,  0,128, 63,190,133, 65, 66,
+100,212, 90, 66, 31,183,118, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 96,  1,  0,  0,
+120, 54,201,  4,  0,  0,  0,  0,176,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0, 51, 51, 51, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 65,205,204, 76, 62,
+  2,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  7,  0,216,120,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  5,  3,  0,  0, 31,  6,  0,  0, 26,  0,  0,  0,139,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 27,  3,114,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,120,193,147,  5,  0,  0,  0,  0, 68, 65, 84, 65,112,  3,  0,  0,120,193,147,  5,  0,  0,  0,  0,174,  0,  0,  0,
-  1,  0,  0,  0, 93,101,230, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 30,133,119, 64,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,154, 65,128,191,  0,  0,128,191,  0,  0,  0,  0,  0,  0,  0,  0, 72,  1, 77,190,
-  0,  0,  0,  0,221,149, 47, 63, 85,126,162,190,  8,165, 39, 63,  0,  0,  0,  0, 51, 70, 58, 63,225,251,159, 62,149, 84, 28,191,
-  0,  0,  0,  0,191, 56, 49,188, 54, 53,101, 63, 50,247,227, 62,  0,  0,  0,  0, 90, 38,173,190,254,221,192,190,152,  9, 52,193,
-  0,  0,128, 63,223,149, 47, 63, 55, 70, 58, 63,192, 56, 49,188,  0,  0,  0,  0, 87,126,162,190,228,251,159, 62, 56, 53,101, 63,
-  0,  0,  0,  0,  7,165, 39, 63,150, 84, 28,191, 50,247,227, 62,  0,  0,  0,  0,110,101,239, 64,151, 62,208,192, 77,255,170, 64,
-  0,  0,128, 63, 42,  6,158, 63, 99, 28,157,191,244,250, 39,191,  8,165, 39,191,211,164,167, 63, 55,175,154, 63,180,164, 28, 63,
-149, 84, 28, 63, 39,127,159,188,135,157, 93, 64,  8,108,228,190, 50,247,227,190,  4,213, 27,191,122,122,186,191,216, 49, 49, 65,
-152,  9, 52, 65, 25, 25,195, 62,176,249,206, 62,128,238,196,187,  0,  0,192,179, 55, 15,168,189,201,118,165, 61,152, 15,109, 62,
-  0,  0,152, 51,211,120, 21,194,144,  5,  2, 66,  6,136,213,193,193,214,159,192,219, 38, 19, 66,196,173,255,193,154,101,210, 65,
-173, 40,160, 64,221,149, 47, 63, 85,126,162,190,  8,165, 39, 63,  0,  0,  0,  0, 51, 70, 58, 63,225,251,159, 62,149, 84, 28,191,
-  0,  0,  0,  0,191, 56, 49,188, 54, 53,101, 63, 50,247,227, 62,  0,  0,  0,  0, 90, 38,173,190,254,221,192,190,152,  9, 52,193,
-  0,  0,128, 63, 42,  6,158, 63, 99, 28,157,191,244,250, 39,191,  8,165, 39,191,211,164,167, 63, 55,175,154, 63,180,164, 28, 63,
-149, 84, 28, 63, 39,127,159,188,135,157, 93, 64,  8,108,228,190, 50,247,227,190,  4,213, 27,191,122,122,186,191,216, 49, 49, 65,
-152,  9, 52, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  0,  0,  1,  0,  0,  0,  3,  0,  0,  0,  1,  0,  3,  0,  8,  8,128,  0,  0,  0, 12, 66,  0,  0,128, 63,205,204,204, 61,
+  0,  0,250, 67,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0,
+ 10,  0,  7,  1,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0, 40, 56,201,  4,  0,  0,  0,  0,
+216,  0,  0,  0,  1,  0,  0,  0,120, 61,201,  4,  0,  0,  0,  0,152, 42,201,  4,  0,  0,  0,  0,120,253,200,  4,  0,  0,  0,  0,
+ 72,251,200,  4,  0,  0,  0,  0,  8,253,200,  4,  0,  0,  0,  0,232,253,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 31,  6,  0,  0,141,  1,  0,  0,233,  3,  0,  0, 16, 16, 32,  6, 93,  2,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,248, 59,201,  4,  0,  0,  0,  0,248, 59,201,  4,  0,  0,  0,  0, 24, 57,201,  4,  0,  0,  0,  0,
+136, 58,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 24, 57,201,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+136, 58,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 66, 68,  0,  0,  0,  0,  0,  0,208, 65,
+  0,  0,  0,  0,  0,  0,196, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 31,  6,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,
+  0,224,195, 68,  0,  0,200, 65,  0,224,195, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,
+  4,  0, 12,  0, 10,  0, 32,  6, 26,  0, 32,  6, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 31,  6,  0,  0,141,  1,  0,  0,166,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 32,  6, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,136, 58,201,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 24, 57,201,  4,  0,  0,  0,  0,  0,  0, 32,193,  0,  0,  0, 68,  0,  0, 32,193,  0,  0,  0, 68,
+128,195,217,195,192,225,108, 68, 96,240,187, 64, 62, 16,253, 67, 15,  6,  0,  0, 32,  6,  0,  0, 18,  0,  0,  0, 66,  2,  0,  0,
+  0,  0,  0,  0, 14,  6,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0, 14,  6,  0,  0, 18,  0,  0,  0, 66,  2,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,250, 70,  0,  0,250, 70,236, 81,184, 61, 10,215, 19, 64, 10,  0,  0,  0,  0,  0,  3,  0,
+  0,  0,  0,  4,  0,  0, 32,  6, 67,  2, 15,  6, 49,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 31,  6,  0,  0,167,  1,  0,  0,233,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 32,  6, 67,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  1,  0,  0,248, 59,201,  4,  0,  0,  0,  0,193,  0,  0,  0,  1,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 62,250,150, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,250,150, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,250,150, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,241, 22, 72, 63, 78,162,246,190, 44,  8, 90,190,  3, 35,171,190,214,211,111, 65,214,211,111, 65,  0,  0,  0,  0,
-  0,  0,  0,  0, 80, 49,183, 58,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160, 65,  1,  2,  0,  0,255,255,  0,  0,
- 92, 62, 55, 63, 56,186,224,190,237,203,148,190,  3,236,234,190,  1,  0,  0,  0,  0,  0,128, 63,190,133, 65, 66,100,212, 90, 66,
- 31,183,118, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 96,  1,  0,  0, 56,197,147,  5,
-  0,  0,  0,  0,175,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0, 51, 51, 51, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 65,205,204, 76, 62,  2,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  7,  0, 24,213,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,215, 19, 64,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
-  1,  0,  0,  0,  3,  0,  0,  0,  1,  0,  3,  0,  8,  8,128,  0,  0,  0, 12, 66,  0,  0,128, 63,205,204,204, 61,  0,  0,250, 67,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0, 10,  0,  7,  1,
-  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,232,198,147,  5,  0,  0,  0,  0,215,  0,  0,  0,
-  1,  0,  0,  0, 56,204,147,  5,  0,  0,  0,  0, 88,185,147,  5,  0,  0,  0,  0, 56,140,147,  5,  0,  0,  0,  0,  8,138,147,  5,
-  0,  0,  0,  0,200,139,147,  5,  0,  0,  0,  0,168,140,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 31,  6,  0,  0,141,  1,  0,  0,233,  3,  0,  0, 16, 16, 32,  6, 93,  2,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,184,202,147,  5,  0,  0,  0,  0,184,202,147,  5,  0,  0,  0,  0,216,199,147,  5,  0,  0,  0,  0, 72,201,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,216,199,147,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0, 72,201,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 66, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,
-  0,  0,196, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 31,  6,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,224,195, 68,
-  0,  0,200, 65,  0,224,195, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0,
- 10,  0, 32,  6, 26,  0, 32,  6, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 31,  6,  0,  0,141,  1,  0,  0,166,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,  6, 26,  0,
-  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,206, 97, 63,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,120, 61,201,  4,  0,  0,  0,  0,
+216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40, 56,201,  4,  0,  0,  0,  0,136,249,200,  4,  0,  0,  0,  0,
+120,253,200,  4,  0,  0,  0,  0, 88,254,200,  4,  0,  0,  0,  0,200,254,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  3,  3,  0,  0,  0,  0,  0,  0,139,  1,  0,  0,  6,  6,  4,  3,140,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,184, 66,201,  4,  0,  0,  0,  0,184, 66,201,  4,  0,  0,  0,  0,104, 62,201,  4,  0,  0,  0,  0,
+ 72, 65,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,104, 62,201,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+216, 63,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,215, 67,  0,  0,  0,  0,  0,  0,208, 65,
+  0,  0,  0,  0,  0,  0, 65, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  3,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,
+  0,192, 64, 68,  0,  0,200, 65,  0,192, 64, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,
+  4,  0, 12,  0, 10,  0,  4,  3, 26,  0,  4,  3, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  3,  3,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  4,  3, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 72,201,147,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,216,199,147,  5,  0,  0,  0,  0,  0,  0, 32,193,  0,  0,  0, 68,  0,  0, 32,193,  0,  0,  0, 68,128,195,217,195,
-192,225,108, 68, 96,240,187, 64, 62, 16,253, 67, 15,  6,  0,  0, 32,  6,  0,  0, 18,  0,  0,  0, 66,  2,  0,  0,  0,  0,  0,  0,
- 14,  6,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0, 14,  6,  0,  0, 18,  0,  0,  0, 66,  2,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,250, 70,  0,  0,250, 70,236, 81,184, 61, 10,215, 19, 64, 10,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  4,
-  0,  0, 32,  6, 67,  2, 15,  6, 49,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 31,  6,  0,  0,167,  1,  0,  0,233,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,  6, 67,  2,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,216, 63,201,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+ 72, 65,201,  4,  0,  0,  0,  0,104, 62,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 48,  1,  0,  0,184,202,147,  5,  0,  0,  0,  0,192,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 26,  0,  0,  0,139,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  4,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,215, 19, 64,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,206, 97, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 72, 65,201,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,216, 63,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 67,
+  0,  0,129,191,  0,128,  0, 64,  0,  0,100,190,  0,128,156, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  3,  0,  0,  0,  0,  0,  0,114,  1,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0, 56,204,147,  5,  0,  0,  0,  0,215,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,232,198,147,  5,  0,  0,  0,  0, 72,136,147,  5,  0,  0,  0,  0, 56,140,147,  5,
-  0,  0,  0,  0, 24,141,147,  5,  0,  0,  0,  0,136,141,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  3,  0,  0,  0,  0,  0,  0,139,  1,  0,  0,  6,  6,  4,  3,140,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,248, 29,166,  5,  0,  0,  0,  0,248, 29,166,  5,  0,  0,  0,  0, 40,205,147,  5,  0,  0,  0,  0,136, 28,166,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 40,205,147,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,152,206,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,215, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,
-  0,  0, 65, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  3,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,192, 64, 68,
-  0,  0,200, 65,  0,192, 64, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0,
- 10,  0,  4,  3, 26,  0,  4,  3, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  3,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  3, 26,  0,
-  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  3,  3,  0,  0, 26,  0,  0,  0,139,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  4,  3,114,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,152,206,147,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,136, 28,166,  5,
-  0,  0,  0,  0, 40,205,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40, 33,  0,  0,184, 66,201,  4,  0,  0,  0,  0,189,  0,  0,  0,  1,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,100,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240, 65,  0,  0,  0,  0,154,153,153, 62,  0,  0,  0,  0,100,  0,  0,  0,
+154,153,153, 62,100,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 26,  0,  0,  0,139,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,
-  0,  0,  4,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,136, 28,166,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,152,206,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 67,  0,  0,129,191,
-  0,128,  0, 64,  0,  0,100,190,  0,128,156, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  3,  0,  0,  0,  0,  0,  0,114,  1,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  3,  0,  0, 26,  0,  0,  0,139,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  3,114,  1,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40, 33,  0,  0,248, 29,166,  5,  0,  0,  0,  0,185,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,100,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  2,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240, 65,  0,  0,  0,  0,154,153,153, 62,  0,  0,  0,  0,100,  0,  0,  0,154,153,153, 62,
-100,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -1302,6 +1310,7 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,100,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -1311,7 +1320,6 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,100,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -1432,3801 +1440,3564 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,100,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0, 83, 78,  0,  0,  8,  1,  0,  0,184,100,201,  4,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,
+104,254,220,  4,  0,  0,  0,  0, 56,248,200,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 83, 82, 68,101,102, 97,117,108,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,102,201,  4,  0,  0,  0,  0,
+184,107,201,  4,  0,  0,  0,  0, 40,108,201,  4,  0,  0,  0,  0,200,224,219,  4,  0,  0,  0,  0, 56,225,219,  4,  0,  0,  0,  0,
+232,215,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,184, 86,252,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,  8,102,201,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+120,102,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0,120,102,201,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,232,102,201,  4,  0,  0,  0,  0,
+  8,102,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,146,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
+232,102,201,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 88,103,201,  4,  0,  0,  0,  0,120,102,201,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,126,  7,146,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 88,103,201,  4,  0,  0,  0,  0,
+213,  0,  0,  0,  1,  0,  0,  0,200,103,201,  4,  0,  0,  0,  0,232,102,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+126,  7,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,200,103,201,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+ 56,104,201,  4,  0,  0,  0,  0, 88,103,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,100,  4,  1,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0, 56,104,201,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,168,104,201,  4,  0,  0,  0,  0,
+200,103,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,100,  4,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
+168,104,201,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 24,105,201,  4,  0,  0,  0,  0, 56,104,201,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,100,  6,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 24,105,201,  4,  0,  0,  0,  0,
+213,  0,  0,  0,  1,  0,  0,  0,136,105,201,  4,  0,  0,  0,  0,168,104,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+100,  6,100,  4,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,136,105,201,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+248,105,201,  4,  0,  0,  0,  0, 24,105,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,100,  6,204,  3,  0,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0,248,105,201,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,104,106,201,  4,  0,  0,  0,  0,
+136,105,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,204,  3,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
+104,106,201,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,216,106,201,  4,  0,  0,  0,  0,248,105,201,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,156,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,216,106,201,  4,  0,  0,  0,  0,
+213,  0,  0,  0,  1,  0,  0,  0, 72,107,201,  4,  0,  0,  0,  0,104,106,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+100,  6,156,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 72,107,201,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+184,107,201,  4,  0,  0,  0,  0,216,106,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,252,  3,  0,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0,184,107,201,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 72,107,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,100,  6,252,  3,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+ 40,108,201,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,200,217,219,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+120,102,201,  4,  0,  0,  0,  0,232,102,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+200,217,219,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 56,218,219,  4,  0,  0,  0,  0, 40,108,201,  4,  0,  0,  0,  0,
+120,102,201,  4,  0,  0,  0,  0,200,103,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+ 56,218,219,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,168,218,219,  4,  0,  0,  0,  0,200,217,219,  4,  0,  0,  0,  0,
+232,102,201,  4,  0,  0,  0,  0, 56,104,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+168,218,219,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 24,219,219,  4,  0,  0,  0,  0, 56,218,219,  4,  0,  0,  0,  0,
+200,103,201,  4,  0,  0,  0,  0, 56,104,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+ 24,219,219,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,136,219,219,  4,  0,  0,  0,  0,168,218,219,  4,  0,  0,  0,  0,
+  8,102,201,  4,  0,  0,  0,  0,168,104,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+136,219,219,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,248,219,219,  4,  0,  0,  0,  0, 24,219,219,  4,  0,  0,  0,  0,
+ 88,103,201,  4,  0,  0,  0,  0,168,104,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+248,219,219,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,104,220,219,  4,  0,  0,  0,  0,136,219,219,  4,  0,  0,  0,  0,
+200,103,201,  4,  0,  0,  0,  0, 24,105,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+104,220,219,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,216,220,219,  4,  0,  0,  0,  0,248,219,219,  4,  0,  0,  0,  0,
+ 56,104,201,  4,  0,  0,  0,  0, 24,105,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+216,220,219,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 72,221,219,  4,  0,  0,  0,  0,104,220,219,  4,  0,  0,  0,  0,
+168,104,201,  4,  0,  0,  0,  0,136,105,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+ 72,221,219,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,184,221,219,  4,  0,  0,  0,  0,216,220,219,  4,  0,  0,  0,  0,
+ 24,105,201,  4,  0,  0,  0,  0,136,105,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+184,221,219,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 40,222,219,  4,  0,  0,  0,  0, 72,221,219,  4,  0,  0,  0,  0,
+ 56,104,201,  4,  0,  0,  0,  0,248,105,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+ 40,222,219,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,152,222,219,  4,  0,  0,  0,  0,184,221,219,  4,  0,  0,  0,  0,
+ 88,103,201,  4,  0,  0,  0,  0,248,105,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+152,222,219,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  8,223,219,  4,  0,  0,  0,  0, 40,222,219,  4,  0,  0,  0,  0,
+136,105,201,  4,  0,  0,  0,  0,248,105,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+  8,223,219,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,120,223,219,  4,  0,  0,  0,  0,152,222,219,  4,  0,  0,  0,  0,
+  8,102,201,  4,  0,  0,  0,  0,104,106,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+120,223,219,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,232,223,219,  4,  0,  0,  0,  0,  8,223,219,  4,  0,  0,  0,  0,
+168,104,201,  4,  0,  0,  0,  0,216,106,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+232,223,219,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 88,224,219,  4,  0,  0,  0,  0,120,223,219,  4,  0,  0,  0,  0,
+104,106,201,  4,  0,  0,  0,  0,216,106,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+ 88,224,219,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,200,224,219,  4,  0,  0,  0,  0,232,223,219,  4,  0,  0,  0,  0,
+200,103,201,  4,  0,  0,  0,  0,104,106,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+200,224,219,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88,224,219,  4,  0,  0,  0,  0,
+ 24,105,201,  4,  0,  0,  0,  0,216,106,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,
+ 56,225,219,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  8,229,219,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+200,103,201,  4,  0,  0,  0,  0,120,102,201,  4,  0,  0,  0,  0,232,102,201,  4,  0,  0,  0,  0, 56,104,201,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,101,  4,  0,  0,146,  4,  0,  0,  7,  7,127,  7, 46,  0,  1,  0,
+  0,  0,  0,  0,  7,  0,  8,  0,  8,179,109,  3,  0,  0,  0,  0,216,253,220,  4,  0,  0,  0,  0,216,253,220,  4,  0,  0,  0,  0,
+ 40,226,219,  4,  0,  0,  0,  0,152,227,219,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+152,134,145,  3,  0,  0,  0,  0, 40,204,184,  4,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 40,226,219,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,152,227,219,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,171, 68,
+  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,224,239, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,
+  0,  0,  0,  0, 25,  0,  0,  0,  0,192,239, 68,  0,  0,200, 65,  0,192,239, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,127,  7, 26,  0,127,  7, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,101,  4,  0,  0,126,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,127,  7, 26,  0,  2,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0, 26,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 40,181,109,  3,  0,  0,  0,  0, 72, 13,189,  4,  0,  0,  0,  0, 72, 13,189,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40, 61,133,  3,  0,  0,  0,  0,152, 63,133,  3,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,152,227,219,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40,226,219,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,192,239, 68,
+  0,  0,  0,  0,  0,  0, 48, 65,  0,  0,  0,  0,255,191,237, 68,  0,  0,  0,  0,  0,  0,160, 65,110,  7,  0,  0,127,  7,  0,  0,
+  0,  0,  0,  0, 19,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,109,  7,  0,  0,
+  0,  0,  0,  0, 19,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  2,  2,  0,  0,  1,  0,  3,  3,  2,  0,  0,  4, 10,  0,127,  7, 20,  0,110,  7, 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,127,  4,  0,  0,146,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,127,  7, 20,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 40,180,109,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,104, 64,133,  3,  0,  0,  0,  0,  8, 66,133,  3,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,  8,229,219,  4,  0,  0,  0,  0,
+216,  0,  0,  0,  1,  0,  0,  0,216, 26,220,  4,  0,  0,  0,  0, 56,225,219,  4,  0,  0,  0,  0,168,104,201,  4,  0,  0,  0,  0,
+136,105,201,  4,  0,  0,  0,  0,248,105,201,  4,  0,  0,  0,  0, 88,103,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+101,  6,  0,  0,126,  7,  0,  0,  0,  0,  0,  0,203,  3,  0,  0,  4,  4, 26,  1,204,  3,  1,  0,  0,  0,  0,  0,  0,  0,  8,  0,
+136,174,109,  3,  0,  0,  0,  0,152, 25,220,  4,  0,  0,  0,  0,152, 25,220,  4,  0,  0,  0,  0,248,229,219,  4,  0,  0,  0,  0,
+104,231,219,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152,207,184,  4,  0,  0,  0,  0,
+232,217,184,  4,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,248,229,219,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+104,231,219,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,148, 67,  0,  0,  0,  0,  0,  0,208, 65,
+  0,  0,  0,  0,  0,  0,141, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25,  1,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,
+  0,128,140, 67,  0,  0,200, 65,  0,128,140, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,
+  4,  0, 12,  0, 10,  0, 26,  1, 26,  0, 26,  1, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+101,  6,  0,  0,126,  7,  0,  0,178,  3,  0,  0,203,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 26,  1, 26,  0,  4,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  8,178,109,  3,  0,  0,  0,  0,216,191,188,  4,  0,  0,  0,  0,216,191,188,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,136,209,186,  4,  0,  0,  0,  0, 56,  9,189,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,104,231,219,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,248,229,219,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,178, 67,  0,128,108,196,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,128,132, 67,  2,128,108,196,  0,  0,  0,  0,  9,  1,  0,  0, 26,  1,  0,  0,  0,  0,  0,  0,177,  3,  0,  0,
+  0,  0,  0,  0, 74,  1,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,  8,  1,  0,  0,  0,  0,  0,  0,177,  3,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0,
+ 18,  0,  0,  4,  6,  0, 26,  1,178,  3,  9,  1,178,  3,  0,  0,136, 89,189,  4,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+101,  6,  0,  0,126,  7,  0,  0,  0,  0,  0,  0,177,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 26,  1,178,  3,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+168,175,109,  3,  0,  0,  0,  0, 56, 69,145,  3,  0,  0,  0,  0,248, 62,194,  4,  0,  0,  0,  0,216,232,219,  4,  0,  0,  0,  0,
+248, 23,220,  4,  0,  0,  0,  0,  8, 10,189,  4,  0,  0,  0,  0,120, 12,189,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,216,232,219,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+120,234,219,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,168,176,109,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 66, 85, 84, 84, 79, 78, 83, 95, 80, 84, 95, 99,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 66, 85, 84, 84, 79, 78, 83, 95, 80, 84, 95, 99,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 67,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,220,255,  9,  1, 36,  0,  0,  0,  0,  0,  0,  0, 38,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+120,234,219,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 24,236,219,  4,  0,  0,  0,  0,216,232,219,  4,  0,  0,  0,  0,
+184,253, 25,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,114,101,110,100,101,114,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,114,101,110,100,101,114,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82,101,110,100,101,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,135,255,  9,  1, 61,  0,  0,  0,  0,  0,  0,  0,  6,  0,
+  0,  0,  0,  0, 19,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,100,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0, 83, 78,  0,  0,  8,  1,  0,  0,104, 63,166,  5,  0,  0,  0,  0,211,  0,  0,  0,  1,  0,  0,  0,184, 90,167,  5,
-  0,  0,  0,  0,248,134,147,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 82, 68,101,
-102, 97,117,108,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,184, 64,166,  5,  0,  0,  0,  0,104, 70,166,  5,
-  0,  0,  0,  0,216, 70,166,  5,  0,  0,  0,  0, 72, 78,166,  5,  0,  0,  0,  0,184, 78,166,  5,  0,  0,  0,  0,  8,208,147,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,
- 11,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 96, 22,114,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,184, 64,166,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0, 40, 65,166,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 32,  0,  0,  0, 40, 65,166,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,152, 65,166,  5,  0,  0,  0,  0,184, 64,166,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,152, 65,166,  5,
-  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,  8, 66,166,  5,  0,  0,  0,  0, 40, 65,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,128,  7, 32,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,  8, 66,166,  5,  0,  0,  0,  0,212,  0,  0,  0,
-  1,  0,  0,  0,120, 66,166,  5,  0,  0,  0,  0,152, 65,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  7,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,120, 66,166,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,232, 66,166,  5,
-  0,  0,  0,  0,  8, 66,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248,  3,  1,  0,  0,  0, 68, 65, 84, 65,
- 32,  0,  0,  0,232, 66,166,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0, 88, 67,166,  5,  0,  0,  0,  0,120, 66,166,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  7,248,  3,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 88, 67,166,  5,
-  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,200, 67,166,  5,  0,  0,  0,  0,232, 66,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 96,  6,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,200, 67,166,  5,  0,  0,  0,  0,212,  0,  0,  0,
-  1,  0,  0,  0, 56, 68,166,  5,  0,  0,  0,  0, 88, 67,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 96,  6,248,  3,
-  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 56, 68,166,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,168, 68,166,  5,
-  0,  0,  0,  0,200, 67,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 96,  6,108,  3,  0,  0,  0,  0, 68, 65, 84, 65,
- 32,  0,  0,  0,168, 68,166,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0, 24, 69,166,  5,  0,  0,  0,  0, 56, 68,166,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  7,108,  3,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 24, 69,166,  5,
-  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,136, 69,166,  5,  0,  0,  0,  0,168, 68,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,140,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,136, 69,166,  5,  0,  0,  0,  0,212,  0,  0,  0,
-  1,  0,  0,  0,248, 69,166,  5,  0,  0,  0,  0, 24, 69,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 96,  6,140,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,248, 69,166,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,104, 70,166,  5,
-  0,  0,  0,  0,136, 69,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,144,  3,  0,  0,  0,  0, 68, 65, 84, 65,
- 32,  0,  0,  0,104, 70,166,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248, 69,166,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 96,  6,144,  3,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,216, 70,166,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 72, 71,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40, 65,166,  5,
-  0,  0,  0,  0,152, 65,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 72, 71,166,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,184, 71,166,  5,  0,  0,  0,  0,216, 70,166,  5,  0,  0,  0,  0, 40, 65,166,  5,
-  0,  0,  0,  0,120, 66,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,184, 71,166,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 40, 72,166,  5,  0,  0,  0,  0, 72, 71,166,  5,  0,  0,  0,  0,152, 65,166,  5,
-  0,  0,  0,  0,232, 66,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 40, 72,166,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,152, 72,166,  5,  0,  0,  0,  0,184, 71,166,  5,  0,  0,  0,  0,120, 66,166,  5,
-  0,  0,  0,  0,232, 66,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,152, 72,166,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  8, 73,166,  5,  0,  0,  0,  0, 40, 72,166,  5,  0,  0,  0,  0,184, 64,166,  5,
-  0,  0,  0,  0, 88, 67,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,  8, 73,166,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,120, 73,166,  5,  0,  0,  0,  0,152, 72,166,  5,  0,  0,  0,  0,  8, 66,166,  5,
-  0,  0,  0,  0, 88, 67,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,120, 73,166,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,232, 73,166,  5,  0,  0,  0,  0,  8, 73,166,  5,  0,  0,  0,  0,120, 66,166,  5,
-  0,  0,  0,  0,200, 67,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,232, 73,166,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 88, 74,166,  5,  0,  0,  0,  0,120, 73,166,  5,  0,  0,  0,  0,232, 66,166,  5,
-  0,  0,  0,  0,200, 67,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 88, 74,166,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,200, 74,166,  5,  0,  0,  0,  0,232, 73,166,  5,  0,  0,  0,  0, 88, 67,166,  5,
-  0,  0,  0,  0, 56, 68,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,200, 74,166,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 56, 75,166,  5,  0,  0,  0,  0, 88, 74,166,  5,  0,  0,  0,  0,200, 67,166,  5,
-  0,  0,  0,  0, 56, 68,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 56, 75,166,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,168, 75,166,  5,  0,  0,  0,  0,200, 74,166,  5,  0,  0,  0,  0,232, 66,166,  5,
-  0,  0,  0,  0,168, 68,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,168, 75,166,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 24, 76,166,  5,  0,  0,  0,  0, 56, 75,166,  5,  0,  0,  0,  0,  8, 66,166,  5,
-  0,  0,  0,  0,168, 68,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 24, 76,166,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,136, 76,166,  5,  0,  0,  0,  0,168, 75,166,  5,  0,  0,  0,  0, 56, 68,166,  5,
-  0,  0,  0,  0,168, 68,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,136, 76,166,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,248, 76,166,  5,  0,  0,  0,  0, 24, 76,166,  5,  0,  0,  0,  0,184, 64,166,  5,
-  0,  0,  0,  0, 24, 69,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,248, 76,166,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,104, 77,166,  5,  0,  0,  0,  0,136, 76,166,  5,  0,  0,  0,  0, 88, 67,166,  5,
-  0,  0,  0,  0,136, 69,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,104, 77,166,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,216, 77,166,  5,  0,  0,  0,  0,248, 76,166,  5,  0,  0,  0,  0, 24, 69,166,  5,
-  0,  0,  0,  0,136, 69,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,216, 77,166,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 72, 78,166,  5,  0,  0,  0,  0,104, 77,166,  5,  0,  0,  0,  0,120, 66,166,  5,
-  0,  0,  0,  0, 24, 69,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 72, 78,166,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216, 77,166,  5,  0,  0,  0,  0,200, 67,166,  5,
-  0,  0,  0,  0,136, 69,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,184, 78,166,  5,
-  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,136, 82,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120, 66,166,  5,
-  0,  0,  0,  0, 40, 65,166,  5,  0,  0,  0,  0,152, 65,166,  5,  0,  0,  0,  0,232, 66,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,128,  7,  0,  0,249,  3,  0,  0, 32,  4,  0,  0,  7,  7,129,  7, 40,  0,  1,  0,  0,  0,  0,  0,
-  7,  0,  8,  0,248, 19, 64,  4,  0,  0,  0,  0, 40, 90,167,  5,  0,  0,  0,  0, 40, 90,167,  5,  0,  0,  0,  0,168, 79,166,  5,
-  0,  0,  0,  0, 24, 81,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136,127, 98,  4,
-  0,  0,  0,  0,184,193,117,  5,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,168, 79,166,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0, 24, 81,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,171, 68,  0,  0,  0,  0,
-  0,  0,208, 65,  0,  0,  0,  0,  0, 32,240, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  7,  0,  0,  0,  0,  0,  0,
- 25,  0,  0,  0,  0,  0,240, 68,  0,  0,200, 65,  0,  0,240, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,129,  7, 26,  0,129,  7, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,128,  7,  0,  0,249,  3,  0,  0, 18,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,129,  7, 26,  0,  2,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 24, 22, 64,  4,  0,  0,  0,  0,136,237,100,  4,  0,  0,  0,  0,136,237,100,  4,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,104,242,148,  5,  0,  0,  0,  0, 56,129,123,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 24, 81,166,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,168, 79,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,192,239, 68,  0,  0,  0,  0,
-  0,  0,200, 65,  0,  0,  0,  0,  0,  0,238, 68,  0,  0,128, 63,  0,  0,112, 65,112,  7,  0,  0,129,  7,  0,  0,  0,  0,  0,  0,
- 13,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0,  0,  0,  0,  0,
- 13,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  2,  0,  0,  0,
-  1,  0,  3,  3,  2,  0,  0,  4, 10,  0,129,  7, 14,  0,112,  7, 14,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,128,  7,  0,  0, 19,  4,  0,  0, 32,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,129,  7, 14,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 24, 21, 64,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200, 60,133,  5,  0,  0,  0,  0, 56,132,123,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,136, 82,166,  5,  0,  0,  0,  0,215,  0,  0,  0,
-  1,  0,  0,  0, 88,123,166,  5,  0,  0,  0,  0,184, 78,166,  5,  0,  0,  0,  0, 88, 67,166,  5,  0,  0,  0,  0, 56, 68,166,  5,
-  0,  0,  0,  0,168, 68,166,  5,  0,  0,  0,  0,  8, 66,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 97,  6,  0,  0,
-128,  7,  0,  0,  0,  0,  0,  0,107,  3,  0,  0,  4,  4, 32,  1,108,  3,  1,  0,  0,  0,  0,  0,  0,  0,  8,  0,120, 15, 64,  4,
-  0,  0,  0,  0, 24,122,166,  5,  0,  0,  0,  0, 24,122,166,  5,  0,  0,  0,  0,120, 83,166,  5,  0,  0,  0,  0,232, 84,166,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120, 75,118,  5,  0,  0,  0,  0,120, 60,135,  5,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,120, 83,166,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,232, 84,166,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,148, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,
-  0,  0,144, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 31,  1,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,128,143, 67,
-  0,  0,200, 65,  0,128,143, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0,
- 10,  0, 32,  1, 26,  0, 32,  1, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 97,  6,  0,  0,
-128,  7,  0,  0, 82,  3,  0,  0,107,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,  1, 26,  0,
-  4,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248, 18, 64,  4,
-  0,  0,  0,  0, 24,214,139,  5,  0,  0,  0,  0, 24,214,139,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,232, 93,137,  5,  0,  0,  0,  0,120,135,123,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,232, 84,166,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,120, 83,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,178, 67,  0,128, 84,196,  0,  0,  0,  0,  0,  0,  0,  0,
-  2,128,135, 67,  3,128, 84,196,  0,  0,  0,  0, 15,  1,  0,  0, 32,  1,  0,  0,  0,  0,  0,  0, 81,  3,  0,  0,  0,  0,  0,  0,
- 74,  1,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0, 14,  1,  0,  0,  0,  0,  0,  0, 81,  3,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,
-  6,  0, 32,  1, 82,  3, 15,  1, 82,  3,  0,  0,136, 69,115,  5,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0, 97,  6,  0,  0,
-128,  7,  0,  0,  0,  0,  0,  0, 81,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,  1, 82,  3,
-  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152, 16, 64,  4,
-  0,  0,  0,  0, 88,174,149,  5,  0,  0,  0,  0,152,144, 99,  4,  0,  0,  0,  0, 88, 86,166,  5,  0,  0,  0,  0,120,120,166,  5,
-  0,  0,  0,  0,200,126,123,  5,  0,  0,  0,  0, 72,139,123,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 88, 86,166,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,248, 87,166,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152, 17, 64,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 85, 84, 84,
- 79, 78, 83, 95, 80, 84, 95, 99,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 85, 84, 84,
- 79, 78, 83, 95, 80, 84, 95, 99,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67,111,110,116,
-101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,220,255,
- 15,  1, 36,  0,  0,  0,  0,  0,  0,  0, 38,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,248, 87,166,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,152, 89,166,  5,  0,  0,  0,  0, 88, 86,166,  5,  0,  0,  0,  0,136,175,227,  4,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,114,101,110,100,101,114,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,114,101,110,100,101,114,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82,101,110,100,101,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,135,255, 15,  1, 61,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,
- 11,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,152, 89,166,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 56, 91,166,  5,
-  0,  0,  0,  0,248, 87,166,  5,  0,  0,  0,  0,136,178,227,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,108, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,108, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 76, 97,121,101,
-114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,111,255,
- 15,  1,  0,  0,  0,  0,  0,  0,  4,  0,  6,  0,  0,  0,  0,  0, 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 56, 91,166,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,216, 92,166,  5,  0,  0,  0,  0,152, 89,166,  5,  0,  0,  0,  0,152,181,227,  4,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,100,105,109,101,110,115,105,111,110,115,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,100,105,109,101,110,115,105,111,110,115,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,105,109,101,110,115,105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140,254, 15,  1,203,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,
- 13,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,216, 92,166,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,120, 94,166,  5,
-  0,  0,  0,  0, 56, 91,166,  5,  0,  0,  0,  0,168,184,227,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95, 97,110,116,105, 97,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95, 97,110,116,105, 97,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 65,110,116,105,
- 45, 65,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 58,254,
- 15,  1, 58,  0, 20,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0, 14,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,120, 94,166,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 24, 96,166,  5,  0,  0,  0,  0,216, 92,166,  5,  0,  0,  0,  0,120,187,227,  4,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,109,111,116,105,111,110, 95, 98,108,117,
-114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,109,111,116,105,111,110, 95, 98,108,117,
-114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 97,109,112,108,101,100, 32, 77,111,116,105,111,110, 32, 66,108,117,114,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 34,254, 15,  1,  0,  0, 20,  0,  0,  0,  4,  0,  6,  0,  0,  0,  0,  0,
- 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 24,236,219,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+184,237,219,  4,  0,  0,  0,  0,120,234,219,  4,  0,  0,  0,  0, 40,  0, 26,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,108, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 24, 96,166,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,184, 97,166,  5,
-  0,  0,  0,  0,120, 94,166,  5,  0,  0,  0,  0,  8,204,185,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,115,104, 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,115,104, 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83,104, 97,100,
-105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,254,
- 15,  1,  0,  0,  0,  0,  0,  0,  4,  0,  6,  0,  0,  0,  0,  0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,108, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 76, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,184, 97,166,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 88, 99,166,  5,  0,  0,  0,  0, 24, 96,166,  5,  0,  0,  0,  0, 72,198,227,  4,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,101,114,102,111,114,109, 97,110, 99,
-101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,101,114,102,111,114,109, 97,110, 99,
-101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,101,114,102,111,114,109, 97,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,111,255,  9,  1,  0,  0,  0,  0,  0,  0,  4,  0,  6,  0,  0,  0,  0,  0, 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,242,253, 15,  1,  0,  0,  0,  0,  0,  0,  4,  0,  6,  0,  0,  0,  0,  0,
- 17,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+184,237,219,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 88,239,219,  4,  0,  0,  0,  0, 24,236,219,  4,  0,  0,  0,  0,
+152,  2, 26,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,100,105,109,101,110,115,
+105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,100,105,109,101,110,115,
+105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,105,109,101,110,115,105,111,110,115,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 88, 99,166,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,248,100,166,  5,
-  0,  0,  0,  0,184, 97,166,  5,  0,  0,  0,  0, 24,201,227,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,112,111,115,116, 95,112,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,112,111,115,116, 95,112,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,111,115,116,
- 32, 80,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,218,253,
- 15,  1,  0,  0,  0,  0,  0,  0,  4,  0,  6,  0,  0,  0,  0,  0, 18,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140,254,  9,  1,203,  0,  0,  0,  0,  0,  0,  0,  6,  0,
+  0,  0,  0,  0, 21,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,248,100,166,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,152,102,166,  5,  0,  0,  0,  0, 88, 99,166,  5,  0,  0,  0,  0, 40,204,227,  4,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,116, 97,109,112,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 88,239,219,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+248,240,219,  4,  0,  0,  0,  0,184,237,219,  4,  0,  0,  0,  0,  8,  5, 26,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 97,110,116,105, 97,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,116, 97,109,112,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 97,110,116,105, 97,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83,116, 97,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 65,110,116,105, 45, 65,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,194,253, 15,  1,  0,  0, 20,  0,  0,  0,  4,  0,  6,  0,  0,  0,  0,  0,
- 19,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 58,254,  9,  1, 58,  0, 20,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0, 22,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,152,102,166,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 56,104,166,  5,
-  0,  0,  0,  0,248,100,166,  5,  0,  0,  0,  0, 40,207,227,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,111,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,111,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79,117,116,112,
-117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 36,253,
- 15,  1,134,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0, 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+248,240,219,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,152,242,219,  4,  0,  0,  0,  0, 88,239,219,  4,  0,  0,  0,  0,
+120,  7, 26,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,109,111,116,105,111,110,
+ 95, 98,108,117,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,109,111,116,105,111,110,
+ 95, 98,108,117,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 97,109,112,108,101,100, 32, 77,111,116,105,111,110, 32, 66,
+108,117,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 34,254,  9,  1,  0,  0, 20,  0,  0,  0,  4,  0,  6,  0,
+  0,  0,  0,  0, 23,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 56,104,166,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,216,105,166,  5,  0,  0,  0,  0,152,102,166,  5,  0,  0,  0,  0, 56,213,227,  4,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 98, 97,107,101,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,152,242,219,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+ 56,244,219,  4,  0,  0,  0,  0,248,240,219,  4,  0,  0,  0,  0,152,140,238,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,104, 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 98, 97,107,101,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,104, 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 97,107,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 83,104, 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,253, 15,  1,  0,  0,  0,  0,  0,  0,  4,  0,  7,  0,  0,  0,  0,  0,
- 21,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 10,254,  9,  1,  0,  0,  0,  0,  0,  0,  4,  0,  6,  0,  0,  0,  0,  0, 24,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,216,105,166,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,120,107,166,  5,
-  0,  0,  0,  0, 56,104,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78,
- 69, 95, 80, 84, 95,115, 99,101,110,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78,
- 69, 95, 80, 84, 95,115, 99,101,110,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 99,101,110,
-101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,135,255,
- 41,  1, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+ 56,244,219,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,216,245,219,  4,  0,  0,  0,  0,152,242,219,  4,  0,  0,  0,  0,
+  8, 17, 26,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,101,114,102,111,114,
+109, 97,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,101,114,102,111,114,
+109, 97,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,101,114,102,111,114,109, 97,110, 99,101,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,242,253,  9,  1,  0,  0,  0,  0,  0,  0,  4,  0,  6,  0,
+  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,120,107,166,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 24,109,166,  5,  0,  0,  0,  0,216,105,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95,117,110,105,116,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95,117,110,105,116,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,216,245,219,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+120,247,219,  4,  0,  0,  0,  0, 56,244,219,  4,  0,  0,  0,  0,120, 19, 26,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,111,115,116, 95,112,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 85,110,105,116,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,111,115,116, 95,112,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 28,255, 41,  1, 83,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 80,111,115,116, 32, 80,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,218,253,  9,  1,  0,  0,  0,  0,  0,  0,  4,  0,  6,  0,  0,  0,  0,  0, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 24,109,166,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,184,110,166,  5,
-  0,  0,  0,  0,120,107,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78,
- 69, 95, 80, 84, 95,107,101,121,105,110,103, 95,115,101,116,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78,
- 69, 95, 80, 84, 95,107,101,121,105,110,103, 95,115,101,116,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 75,101,121,105,
-110,103, 32, 83,101,116,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,191,254,
- 41,  1, 69,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,184,110,166,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 88,112,166,  5,  0,  0,  0,  0, 24,109,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95,112,104,121,115,105, 99,115,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+120,247,219,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 24,249,219,  4,  0,  0,  0,  0,216,245,219,  4,  0,  0,  0,  0,
+232, 21, 26,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,116, 97,109,112,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95,112,104,121,115,105, 99,115,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,116, 97,109,112,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 71,114, 97,118,105,116,121,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83,116, 97,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,131,254, 41,  1, 36,  0, 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,194,253,  9,  1,  0,  0, 20,  0,  0,  0,  4,  0,  6,  0,
+  0,  0,  0,  0, 27,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 88,112,166,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,248,113,166,  5,
-  0,  0,  0,  0,184,110,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78,
- 69, 95, 80, 84, 95,115,105,109,112,108,105,102,121,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78,
- 69, 95, 80, 84, 95,115,105,109,112,108,105,102,121,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83,105,109,112,
-108,105,102,121,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 27,254,
- 41,  1, 80,  0, 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 24,249,219,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+184,250,219,  4,  0,  0,  0,  0,120,247,219,  4,  0,  0,  0,  0, 88, 24, 26,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,111,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,111,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,248,113,166,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,152,115,166,  5,  0,  0,  0,  0, 88,112,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95, 99,117,115,116,111,109, 95,112,114,111,112,
-115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95, 99,117,115,116,111,109, 95,112,114,111,112,
-115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67,117,115,116,111,109, 32, 80,114,111,112,101,114,116,105,101,115,  0,  0,  0,
+ 79,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,223,253, 41,  1, 36,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
- 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 36,253,  9,  1,134,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0, 28,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,152,115,166,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 56,117,166,  5,
-  0,  0,  0,  0,248,113,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 84, 69, 88, 84,
- 85, 82, 69, 95, 80, 84, 95, 99,111,110,116,101,120,116, 95,116,101,120,116,117,114,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 84, 69, 88, 84,
- 85, 82, 69, 95, 80, 84, 95, 99,111,110,116,101,120,116, 95,116,101,120,116,117,114,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+184,250,219,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 88,252,219,  4,  0,  0,  0,  0, 24,249,219,  4,  0,  0,  0,  0,
+ 56, 29, 26,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 98, 97,107,101,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 98, 97,107,101,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,255,
-187,  0,204,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  5,  0,  0,  0, 18,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 97,107,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 56,117,166,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,216,118,166,  5,  0,  0,  0,  0,152,115,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 84, 69, 88, 84, 85, 82, 69, 95, 80, 84, 95,109, 97,112,112,105,110,103,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,253,  9,  1,  0,  0,  0,  0,  0,  0,  4,  0,  7,  0,
+  0,  0,  0,  0, 29,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 84, 69, 88, 84, 85, 82, 69, 95, 80, 84, 95,109, 97,112,112,105,110,103,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 77, 97,112,112,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 88,252,219,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+248,253,219,  4,  0,  0,  0,  0,184,250,219,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 83, 67, 69, 78, 69, 95, 80, 84, 95,115, 99,101,110,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 77,254,187,  0,171,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 83, 67, 69, 78, 69, 95, 80, 84, 95,115, 99,101,110,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 83, 99,101,110,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,216,118,166,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,120,120,166,  5,
-  0,  0,  0,  0, 56,117,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 84, 69, 88, 84,
- 85, 82, 69, 95, 80, 84, 95,105,110,102,108,117,101,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 84, 69, 88, 84,
- 85, 82, 69, 95, 80, 84, 95,105,110,102,108,117,101,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 73,110,102,108,
-117,101,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,223,252,
-187,  0, 86,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,135,255, 41,  1, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 13,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,120,120,166,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,118,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79, 66, 74, 69, 67, 84, 95, 80, 84, 95, 99,111,110,115,116,114, 97,105,110,116,
-115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79, 66, 74, 69, 67, 84, 95, 80, 84, 95, 99,111,110,115,116,114, 97,105,110,116,
-115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79, 98,106,101, 99,116, 32, 67,111,110,115,116,114, 97,105,110,116,115,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+248,253,219,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,152,255,219,  4,  0,  0,  0,  0, 88,252,219,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95,117,110,105,116,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160,255,187,  0, 36,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95,117,110,105,116,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 85,110,105,116,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65,248,  0,  0,  0, 24,122,166,  5,  0,  0,  0,  0,180,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  1,  0,  0,  0,  0,  0, 40,235,139,  5,  0,  0,  0,  0,255, 21,  0,  0,
-160,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0, 88,123,166,  5,
-  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 72,128,166,  5,  0,  0,  0,  0,136, 82,166,  5,  0,  0,  0,  0,184, 64,166,  5,
-  0,  0,  0,  0, 24, 69,166,  5,  0,  0,  0,  0,136, 69,166,  5,  0,  0,  0,  0, 88, 67,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 95,  6,  0,  0,  0,  0,  0,  0,139,  0,  0,  0, 15, 15, 96,  6,140,  0,  1,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 40,226, 63,  4,  0,  0,  0,  0, 40,127,166,  5,  0,  0,  0,  0, 40,127,166,  5,  0,  0,  0,  0, 72,124,166,  5,
-  0,  0,  0,  0,184,125,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152, 75,135,  5,
-  0,  0,  0,  0,200,159,139,  5,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 72,124,166,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,184,125,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,224,143, 68,  0,  0,  0,  0,
-  0,  0,208, 65,  0,  0,  0,  0,  0,  0,204, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 95,  6,  0,  0,  0,  0,  0,  0,
- 25,  0,  0,  0,  0,224,203, 68,  0,  0,200, 65,  0,224,203, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  2,  0,  3,  3,  4,  0, 12,  0, 10,  0, 96,  6, 26,  0, 96,  6, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 95,  6,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 96,  6, 26,  0,  6,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 72,228, 63,  4,  0,  0,  0,  0,120, 14,135,  5,  0,  0,  0,  0,120, 14,135,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,130,123,  5,  0,  0,  0,  0,184,144,123,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,184,125,166,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72,124,166,  5,  0,  0,  0,  0,  0,  0, 64,192,  0,  0,126, 67,  0,  0,  0,  0,
-  0,  0, 72, 66, 88,218,103,194, 40,147,141, 67,  0,  0,  0,  0,  0,  0, 72, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 95,  6,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0, 95,  6,  0,  0, 18,  0,  0,  0,
-113,  0,  0,  0,  0,  0,128, 63,  0,  0, 72, 66,  0,124,146, 72,  0,  0, 72, 66,205,204,204, 61,  0,  0, 32, 65, 72,  0,  0,  0,
-  0,  0,  0,  2,  4,  0,  0,  4,  8,  0, 96,  6,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 95,  6,  0,  0, 26,  0,  0,  0,139,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 96,  6,114,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 72,227, 63,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136,145,123,  5,  0,  0,  0,  0,168,217,126,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,208,  0,  0,  0, 40,127,166,  5,  0,  0,  0,  0,191,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 28,255, 41,  1, 83,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 14,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,152,255,219,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+ 56,  1,220,  4,  0,  0,  0,  0,248,253,219,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 83, 67, 69, 78, 69, 95, 80, 84, 95,107,101,121,105,110,103, 95,115,101,116,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 83, 67, 69, 78, 69, 95, 80, 84, 95,107,101,121,105,110,103, 95,115,101,116,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  1,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0, 72,128,166,  5,
-  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,  8,208,147,  5,  0,  0,  0,  0, 88,123,166,  5,  0,  0,  0,  0, 56, 68,166,  5,
-  0,  0,  0,  0,200, 67,166,  5,  0,  0,  0,  0,232, 66,166,  5,  0,  0,  0,  0,168, 68,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 97,  6,  0,  0,128,  7,  0,  0,109,  3,  0,  0,247,  3,  0,  0,  3,  3, 32,  1,139,  0,  1,  0,  0,  0,  0,  0,
-  0,  0,  8,  0,  8,223, 63,  4,  0,  0,  0,  0, 24,132,166,  5,  0,  0,  0,  0, 24,132,166,  5,  0,  0,  0,  0, 56,129,166,  5,
-  0,  0,  0,  0,168,130,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40,148,118,  5,
-  0,  0,  0,  0,248,243,119,  5,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 56,129,166,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,168,130,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,244, 67,  0,  0,  0,  0,
-  0,  0,208, 65,  0,  0,  0,  0,  0,  0,144, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 31,  1,  0,  0,  0,  0,  0,  0,
- 25,  0,  0,  0,  0,128,143, 67,  0,  0,200, 65,  0,128,143, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  2,  0,  3,  3,  4,  0, 12,  0, 10,  0, 32,  1, 26,  0, 32,  1, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 97,  6,  0,  0,128,  7,  0,  0,222,  3,  0,  0,247,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 32,  1, 26,  0,  8,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 40,225, 63,  4,  0,  0,  0,  0, 40,236,141,  5,  0,  0,  0,  0, 40,236,141,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,133,123,  5,  0,  0,  0,  0, 24,223,126,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,168,130,166,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 56,129,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,141, 67,  0,  0,244,194,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,128,135, 67,  0,  0,190,194,  0,  0,  0,  0, 15,  1,  0,  0, 32,  1,  0,  0, 18,  0,  0,  0,
-112,  0,  0,  0,  0,  0,  0,  0, 14,  1,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0, 14,  1,  0,  0, 18,  0,  0,  0,
-112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63, 18,  0,  0,  0,
-  2,  0,  3,  3,  0,  0, 12,  4,  6,  0, 32,  1,113,  0, 15,  1, 95,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 97,  6,  0,  0,128,  7,  0,  0,109,  3,  0,  0,221,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 32,  1,113,  0,  9,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 40,224, 63,  4,  0,  0,  0,  0, 88, 20,140,  5,  0,  0,  0,  0, 88, 20,140,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72,136,123,  5,  0,  0,  0,  0,136,225,126,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 24,  1,  0,  0, 24,132,166,  5,  0,  0,  0,  0,184,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 75,101,121,105,110,103, 32, 83,101,116,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,191,254, 41,  1, 69,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+ 56,  1,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,216,  2,220,  4,  0,  0,  0,  0,152,255,219,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95,112,104,121,115,105, 99,115,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95,112,104,121,115,105, 99,115,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,168, 89,170,  5,  0,  0,  0,  0,168, 89,170,  5,  0,  0,  0,  0,232,209,134,  5,
-  0,  0,  0,  0,  0,115,101, 32, 83, 99,117,108,112,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0, 68, 65, 84, 65,
- 16,  0,  0,  0,232,209,134,  5,  0,  0,  0,  0,238,  0,  0,  0,  1,  0,  0,  0, 42, 11,  0,  0, 42, 11,  0,  0,120,133,166,  5,
-  0,  0,  0,  0, 68, 65, 84, 65,160,178,  0,  0,120,133,166,  5,  0,  0,  0,  0,237,  0,  0,  0, 42, 11,  0,  0,  0,  0,  0,  0,
-  2,  0,  1,  0,120,184,168,  5,  0,  0,  0,  0, 19,  0,  0,  0,  1,  0,  1,  0,120,184,168,  5,  0,  0,  0,  0, 20,  0,  0,  0,
-  1,  0,  1,  0,120,184,168,  5,  0,  0,  0,  0, 21,  0,  1,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  1,  0, 72,210,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,184,219,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  1,  0,184, 17,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,248,232,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  1,  0,  8,255,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0, 88,226,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  1,  0,232,205,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0, 24,213,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  1,  0,216,204,168,  5,  0,  0,  0,  0, 21,  0,  0,  0,  1,  0,  1,  0,120,184,168,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0,  0,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,
-  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,  1,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 30,  0,255,255,
-  3,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0, 24, 42,147,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0,248,134,147,  5,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,104, 63,166,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0,184, 90,167,  5,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0, 72,242,167,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0,  8, 65,168,  5,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0, 40,136,168,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0,  8,255,168,  5,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0, 40, 39,147,  5,  0,  0,  0,  0, 30,  0,255,255,
-  1,  0,  0,  0, 72,210,168,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0, 31,  0,  0,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0,  1,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0,  2,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0,  3,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0,  4,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0,  5,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0,  6,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0,  7,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0,  8,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0,  9,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 10,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 11,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 12,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 13,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 14,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 15,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 16,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 17,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 18,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 19,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 20,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 21,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 22,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 23,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 24,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 25,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 26,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 27,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 28,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 29,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 30,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 31,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 32,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 33,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 34,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 35,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 36,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 37,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 38,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 39,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 40,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 41,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 42,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 43,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 44,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 45,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 46,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 47,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 48,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 49,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 50,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 51,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 52,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 53,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 54,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 55,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 56,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 57,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 58,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 59,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 60,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 61,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 62,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 63,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 64,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 65,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 66,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 67,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 68,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 69,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 70,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 71,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 72,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 73,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 74,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 75,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 76,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 77,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 78,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 79,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 80,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 81,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 82,  0,
-  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0, 83,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 31,  0,  0,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0,  1,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0,  2,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0,  3,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0,  4,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0,  5,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0,  6,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0,  7,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0,  8,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0,  9,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 10,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 11,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 12,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 13,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 14,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 15,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 16,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 17,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 18,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 19,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 20,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 21,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 22,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 23,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 24,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 25,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 26,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 27,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 28,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 29,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 30,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 31,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 32,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 33,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 34,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 35,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 36,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 37,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 38,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 39,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 40,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 41,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 42,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 43,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 44,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 45,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 46,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 47,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 48,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 49,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 50,  0,
-  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0, 51,  0,  1,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0, 31,  0,  0,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0,  1,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0,  2,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0,  3,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0,  4,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0,  5,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0,  6,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0,  7,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0,  8,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0,  9,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 10,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 11,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 12,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 13,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 14,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 15,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 16,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 17,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 18,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 19,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 20,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 21,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 22,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 23,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 24,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 25,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 26,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 27,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 28,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 29,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 30,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 31,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 32,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 33,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 34,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 35,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 36,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 37,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 38,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 39,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 40,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 41,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 42,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 43,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 44,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 45,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 46,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 47,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 48,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 49,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 50,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 51,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 52,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 53,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 54,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 55,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 56,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 57,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 58,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 59,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 60,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 61,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 62,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 63,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 64,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 65,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 66,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 67,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 68,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 69,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 70,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 71,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 72,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 73,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 74,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 75,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 76,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 77,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 78,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 79,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 80,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 81,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 82,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 83,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 84,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 85,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 86,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 87,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 88,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 89,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 90,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 91,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 92,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 93,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 94,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 95,  0,  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0, 96,  0,
-  1,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 21,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 23,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 25,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 27,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 29,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 31,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 33,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 35,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 37,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 39,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 41,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 43,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 45,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 47,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 49,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 51,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 53,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 55,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 57,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 59,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 61,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 63,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 65,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 67,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 69,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 70,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 71,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 72,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 73,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 74,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 75,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 76,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 77,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 78,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 79,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 80,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 81,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 82,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 83,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 84,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 85,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 86,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 87,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 88,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 89,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 90,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 91,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 92,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 93,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 94,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 95,  0,
-  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0, 96,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0, 31,  0,  0,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0,  1,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0,  2,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0,  3,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0,  4,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0,  5,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0,  6,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0,  7,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0,  8,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0,  9,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 10,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 11,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 12,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 13,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 14,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 15,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 16,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 17,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 18,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 19,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 20,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 21,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 22,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 23,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 24,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 25,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 26,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 27,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 28,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 29,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 30,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 31,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 32,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 33,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 34,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 35,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 36,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 37,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 38,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 39,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 40,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 41,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 42,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 43,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 44,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 45,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 46,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 47,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 48,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 49,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 50,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 51,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 52,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 53,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 54,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 55,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 56,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 57,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 58,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 59,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 60,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 61,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 62,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 63,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 64,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 65,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 66,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 67,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 68,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 69,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 70,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 71,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 72,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 73,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 74,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 75,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 76,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 77,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 78,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 79,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 80,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 81,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 82,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 83,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 84,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 85,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 86,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 87,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 88,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 89,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 90,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 91,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 92,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 93,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 94,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 95,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0, 96,  0,
-  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 24, 42,147,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0, 24, 42,147,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0, 24, 42,147,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0, 24, 42,147,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0, 24, 42,147,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0, 24, 42,147,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0, 24, 42,147,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0, 24, 42,147,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0, 24, 42,147,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0, 24, 42,147,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,248,134,147,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,248,134,147,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,248,134,147,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,248,134,147,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,248,134,147,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,248,134,147,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,248,134,147,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,248,134,147,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,248,134,147,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,248,134,147,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,104, 63,166,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,104, 63,166,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,104, 63,166,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,104, 63,166,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,104, 63,166,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,104, 63,166,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,104, 63,166,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,104, 63,166,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,104, 63,166,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,104, 63,166,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,184, 90,167,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,184, 90,167,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,184, 90,167,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,184, 90,167,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,184, 90,167,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,184, 90,167,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,184, 90,167,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,184, 90,167,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,184, 90,167,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,184, 90,167,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 72,242,167,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0, 72,242,167,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0, 72,242,167,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0, 72,242,167,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0, 72,242,167,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0, 72,242,167,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0, 72,242,167,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0, 72,242,167,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0, 72,242,167,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0, 72,242,167,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,  8, 65,168,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,  8, 65,168,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,  8, 65,168,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,  8, 65,168,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,  8, 65,168,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,  8, 65,168,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,  8, 65,168,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,  8, 65,168,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,  8, 65,168,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,  8, 65,168,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 40,136,168,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0, 40,136,168,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0, 40,136,168,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0, 40,136,168,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0, 40,136,168,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0, 40,136,168,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0, 40,136,168,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0, 40,136,168,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0, 40,136,168,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0, 40,136,168,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,  8,255,168,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0,  8,255,168,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,  8,255,168,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0,  8,255,168,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,  8,255,168,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0,  8,255,168,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,  8,255,168,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0,  8,255,168,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,  8,255,168,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0,  8,255,168,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,  8,255,168,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0,  8,255,168,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,  8,255,168,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0,  8,255,168,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,  8,255,168,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0,  8,255,168,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,  8,255,168,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0,  8,255,168,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,  8,255,168,  5,  0,  0,  0,  0, 31,  0,  0,  0,
-  1,  0,  0,  0, 40, 39,147,  5,  0,  0,  0,  0, 31,  0,  1,  0,  1,  0,  0,  0, 40, 39,147,  5,  0,  0,  0,  0, 31,  0,  2,  0,
-  1,  0,  0,  0, 40, 39,147,  5,  0,  0,  0,  0, 31,  0,  3,  0,  1,  0,  0,  0, 40, 39,147,  5,  0,  0,  0,  0, 31,  0,  4,  0,
-  1,  0,  0,  0, 40, 39,147,  5,  0,  0,  0,  0, 31,  0,  5,  0,  1,  0,  0,  0, 40, 39,147,  5,  0,  0,  0,  0, 31,  0,  6,  0,
-  1,  0,  0,  0, 40, 39,147,  5,  0,  0,  0,  0, 31,  0,  7,  0,  1,  0,  0,  0, 40, 39,147,  5,  0,  0,  0,  0, 31,  0,  8,  0,
-  1,  0,  0,  0, 40, 39,147,  5,  0,  0,  0,  0, 31,  0,  9,  0,  1,  0,  0,  0, 40, 39,147,  5,  0,  0,  0,  0, 31,  0, 10,  0,
-  1,  0,  0,  0, 40, 39,147,  5,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 72,210,168,  5,  0,  0,  0,  0, 31,  0,  1,  0,
-  1,  0,  0,  0, 72,210,168,  5,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0, 72,210,168,  5,  0,  0,  0,  0, 31,  0,  3,  0,
-  1,  0,  0,  0, 72,210,168,  5,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0, 72,210,168,  5,  0,  0,  0,  0, 31,  0,  5,  0,
-  1,  0,  0,  0, 72,210,168,  5,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0, 72,210,168,  5,  0,  0,  0,  0, 31,  0,  7,  0,
-  1,  0,  0,  0, 72,210,168,  5,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0, 72,210,168,  5,  0,  0,  0,  0, 31,  0,  9,  0,
-  1,  0,  0,  0, 72,210,168,  5,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0, 72,210,168,  5,  0,  0,  0,  0, 31,  0, 11,  0,
-  1,  0,  0,  0, 72,210,168,  5,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0, 72,210,168,  5,  0,  0,  0,  0, 31,  0, 13,  0,
-  1,  0,  0,  0, 72,210,168,  5,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0, 72,210,168,  5,  0,  0,  0,  0, 31,  0, 15,  0,
-  1,  0,  0,  0, 72,210,168,  5,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0, 72,210,168,  5,  0,  0,  0,  0, 31,  0, 17,  0,
-  1,  0,  0,  0, 72,210,168,  5,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0, 72,210,168,  5,  0,  0,  0,  0, 31,  0, 19,  0,
-  1,  0,  0,  0, 72,210,168,  5,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0, 72,210,168,  5,  0,  0,  0,  0, 68, 65, 84, 65,
-160,  0,  0,  0,  8,208,147,  5,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72,128,166,  5,
-  0,  0,  0,  0, 24, 69,166,  5,  0,  0,  0,  0,120, 66,166,  5,  0,  0,  0,  0,200, 67,166,  5,  0,  0,  0,  0,136, 69,166,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 95,  6,  0,  0,141,  0,  0,  0,247,  3,  0,  0,  1,  1, 96,  6,
-107,  3,  1,  0,  0,  0,  0,  0,  0,  0,  8,  0, 72,229, 63,  4,  0,  0,  0,  0,120, 88,167,  5,  0,  0,  0,  0,120, 88,167,  5,
-  0,  0,  0,  0,104, 56,167,  5,  0,  0,  0,  0, 72, 83,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,232, 31,125,  5,  0,  0,  0,  0,184,167,126,  5,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,104, 56,167,  5,
-  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,216, 57,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,192,108, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,204, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 95,  6,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,224,203, 68,  0,  0,200, 65,  0,224,203, 68,  0,  0,200, 65,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0, 96,  6, 26,  0, 96,  6, 26,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 95,  6,  0,  0,141,  0,  0,  0,166,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 96,  6, 26,  0, 10,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0, 26,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,232,239, 63,  4,  0,  0,  0,  0,200,  6,182,  5,  0,  0,  0,  0,200,  6,182,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,232,223,126,  5,  0,  0,  0,  0, 24, 50,127,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,216, 57,167,  5,
-  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,200, 78,167,  5,  0,  0,  0,  0,104, 56,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,128,178, 67,  0, 64, 30,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0, 64, 30,196,  0,  0,  0,  0,143,  0,  0,  0,
-160,  0,  0,  0,  0,  0,  0,  0,120,  2,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,
-142,  0,  0,  0,  0,  0,  0,  0,120,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,160,  0,121,  2,143,  0,121,  2,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,159,  0,  0,  0,127,  1,  0,  0,247,  3,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160,  0,121,  2, 11,  0,  5,  0,  3,  0,  0,  0,  0,  0,  0,  0,160,  0, 50,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136,236, 63,  4,  0,  0,  0,  0,232, 30,140,  5,  0,  0,  0,  0,232, 30,140,  5,
-  0,  0,  0,  0, 72, 59,167,  5,  0,  0,  0,  0, 40, 77,167,  5,  0,  0,  0,  0,216, 46,127,  5,  0,  0,  0,  0,104,206,129,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 72, 59,167,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,232, 60,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136,165,231,  4,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,111, 98,106,101,
- 99,116,109,111,100,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,111, 98,106,101,
- 99,116,109,111,100,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79, 98,106,101, 99,116, 32, 84,111,111,108,115,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,233,253,143,  0,255,  1,  0,  0,  0,  0,  0,  0, 39,  0,  0,  0,  0,  0,
- 11,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,232, 60,167,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,136, 62,167,  5,
-  0,  0,  0,  0, 72, 59,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87,
- 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95, 98,114,117,115,104,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87,
- 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95, 98,114,117,115,104,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66,114,117,115,
-104,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,117,254,
-143,  0,115,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,136, 62,167,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 40, 64,167,  5,  0,  0,  0,  0,232, 60,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95, 98,114,117,115,
-104, 95,116,111,111,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95, 98,114,117,115,
-104, 95,116,111,111,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 84,111,111,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 74,254,143,  0, 61,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
-  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 71,114, 97,118,105,116,121,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,131,254, 41,  1, 36,  0, 20,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 40, 64,167,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,200, 65,167,  5,
-  0,  0,  0,  0,136, 62,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87,
- 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95, 98,114,117,115,104, 95,115,116,114,111,107,101,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87,
- 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95, 98,114,117,115,104, 95,115,116,114,111,107,101,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83,116,114,111,
-107,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 69,254,
-143,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,200, 65,167,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,104, 67,167,  5,  0,  0,  0,  0, 40, 64,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95, 98,114,117,115,
-104, 95, 99,117,114,118,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95, 98,114,117,115,
-104, 95, 99,117,114,118,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67,117,114,118,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 45,254,143,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
-  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,104, 67,167,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  8, 69,167,  5,
-  0,  0,  0,  0,200, 65,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87,
- 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95, 98,114,117,115,104, 95, 97,112,112,101, 97,114, 97,110, 99,101,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87,
- 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95, 98,114,117,115,104, 95, 97,112,112,101, 97,114, 97,110, 99,101,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 65,112,112,101,
- 97,114, 97,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,229,253,
-143,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,  8, 69,167,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,168, 70,167,  5,  0,  0,  0,  0,104, 67,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,118,101,114,116,
-101,120,112, 97,105,110,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,118,101,114,116,
-101,120,112, 97,105,110,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79,112,116,105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,149,253,143,  0,146,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,168, 70,167,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 72, 72,167,  5,
-  0,  0,  0,  0,  8, 69,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87,
- 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95, 98,114,117,115,104, 95,116,101,120,116,117,114,101,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87,
- 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95, 98,114,117,115,104, 95,116,101,120,116,117,114,101,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 84,101,120,116,
-117,114,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 93,254,
-143,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 72, 72,167,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,232, 73,167,  5,  0,  0,  0,  0,168, 70,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,115, 99,117,108,112,116, 95,111,112,116,
-105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,115, 99,117,108,112,116, 95,111,112,116,
-105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79,112,116,105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 21,254,143,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
-  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,216,  2,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+120,  4,220,  4,  0,  0,  0,  0, 56,  1,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 83, 67, 69, 78, 69, 95, 80, 84, 95,115,105,109,112,108,105,102,121,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 83, 67, 69, 78, 69, 95, 80, 84, 95,115,105,109,112,108,105,102,121,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,232, 73,167,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,136, 75,167,  5,
-  0,  0,  0,  0, 72, 72,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87,
- 51, 68, 95, 80, 84, 95,115, 99,117,108,112,116, 95,115,121,109,109,101,116,114,121,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87,
- 51, 68, 95, 80, 84, 95,115, 99,117,108,112,116, 95,115,121,109,109,101,116,114,121,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83,121,109,109,
-101,116,114,121,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,253,253,
-143,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 83,105,109,112,108,105,102,121,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 27,254, 41,  1, 80,  0, 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,136, 75,167,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 40, 77,167,  5,  0,  0,  0,  0,232, 73,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,109,101,115,104,
-101,100,105,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,109,101,115,104,
-101,100,105,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 77,101,115,104, 32, 84,111,111,108,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,164,252,143,  0, 68,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+120,  4,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 24,  6,220,  4,  0,  0,  0,  0,216,  2,220,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95, 99,117,115,116,111,109, 95,
+112,114,111,112,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 69, 78, 69, 95, 80, 84, 95, 99,117,115,116,111,109, 95,
+112,114,111,112,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67,117,115,116,111,109, 32, 80,114,111,112,101,114,116,105,101,
+115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,223,253, 41,  1, 36,  0,  0,  0,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0, 18,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 24,  6,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+184,  7,220,  4,  0,  0,  0,  0,120,  4,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 84, 69, 88, 84, 85, 82, 69, 95, 80, 84, 95, 99,111,110,116,101,120,116, 95,116,101,120,116,117,114,101,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 40, 77,167,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,136, 75,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87,
- 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,109,101,115,104,101,100,105,116, 95,111,112,116,105,111,110,115,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87,
- 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,109,101,115,104,101,100,105,116, 95,111,112,116,105,111,110,115,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 77,101,115,104,
- 32, 79,112,116,105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,235,251,
-143,  0,161,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 84, 69, 88, 84, 85, 82, 69, 95, 80, 84, 95, 99,111,110,116,101,120,116, 95,116,101,120,116,117,114,101,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,200, 78,167,  5,
-  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,216, 81,167,  5,  0,  0,  0,  0,216, 57,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,128,178, 67,  0,  0, 90,195,  0,  0,  0,  0,  0,  0,  0,  0,227,102, 16, 67, 24, 30, 90,195,  0,  0,  0,  0,143,  0,  0,  0,
-160,  0,  0,  0,  0,  0,  0,  0,215,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,
-142,  0,  0,  0,  0,  0,  0,  0,215,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,160,  0,216,  0,143,  0,216,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,159,  0,  0,  0,167,  0,  0,  0,126,  1,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160,  0,216,  0, 12,  0,  6,  0, 34,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136,237, 63,  4,  0,  0,  0,  0,200, 86,170,  5,  0,  0,  0,  0,200, 86,170,  5,
-  0,  0,  0,  0, 56, 80,167,  5,  0,  0,  0,  0, 56, 80,167,  5,  0,  0,  0,  0,232, 50,127,  5,  0,  0,  0,  0, 56,210,129,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 56, 80,167,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136,238, 63,  4,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,108, 97,115,116, 95,111,112,101,114, 97,
-116,111,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,108, 97,115,116, 95,111,112,101,114, 97,
-116,111,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79,112,101,114, 97,116,111,114,  0,105,116,109,111,100,101,  0,101,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,255,144,  0, 16,  0,  0,  0,  0,  0,  0,  0, 39,  0,  0,  0,  0,  0,
+  0,  0, 16,255,187,  0,204,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  5,  0,  0,  0, 18,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+184,  7,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 88,  9,220,  4,  0,  0,  0,  0, 24,  6,220,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 84, 69, 88, 84, 85, 82, 69, 95, 80, 84, 95,109, 97,112,112,105,
+110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 84, 69, 88, 84, 85, 82, 69, 95, 80, 84, 95,109, 97,112,112,105,
+110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 77, 97,112,112,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 77,254,187,  0,171,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 11,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,216, 81,167,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0, 72, 83,167,  5,
-  0,  0,  0,  0,200, 78,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 52, 67,  0, 96,158,196,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 35, 67,  0, 96,158,196,  0,128,142,195,163,  0,  0,  0,180,  0,  0,  0,  0,  0,  0,  0,213,  3,  0,  0,  0,  0,  0,  0,
-162,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,162,  0,  0,  0,  0,  0,  0,  0,213,  3,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  1,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,
-  6,  0,180,  0,214,  3,163,  0,214,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 95,  6,  0,  0,
- 95,  6,  0,  0,167,  0,  0,  0,247,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,
-  0,  0,  4,  0,  4,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,104,231, 63,  4,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 88,  9,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+248, 10,220,  4,  0,  0,  0,  0,184,  7,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 84, 69, 88, 84, 85, 82, 69, 95, 80, 84, 95,105,110,102,108,117,101,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 72, 83,167,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,216, 81,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 84, 69, 88, 84, 85, 82, 69, 95, 80, 84, 95,105,110,102,108,117,101,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 73,110,102,108,117,101,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,223,252,187,  0, 86,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160,  0,  0,  0,
- 95,  6,  0,  0,167,  0,  0,  0,247,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,192,  5, 81,  3,
- 13,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,104,230, 63,  4,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,200,229,129,  5,  0,  0,  0,  0,248,228,129,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,184, 84,167,  5,
-  0,  0,  0,  0, 68, 65, 84, 65,112,  3,  0,  0,184, 84,167,  5,  0,  0,  0,  0,174,  0,  0,  0,  1,  0,  0,  0,  0,  0,140, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,142,187,242, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,142,  6,128,191,  0,  0,128,191,  0,  0,  0,  0,  0,  0,  0,  0, 11,210, 76,190,  0,  0,  0,  0, 68,239,209, 62,
- 51,177,205,190,184,158, 81, 63,  0,  0,  0,  0, 70,119,105, 63,143, 74, 70, 62, 35, 44,185,190,  0,  0,  0,  0,162, 84, 89,188,
-166, 33,101, 63, 42, 61,228, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 33,210,111,193,  0,  0,128, 63, 68,239,209, 62,
- 70,119,105, 63,176, 84, 89,188,  0,  0,  0,  0, 52,177,205,190,142, 74, 70, 62,166, 33,101, 63,  0,  0,  0,  0,185,158, 81, 63,
- 35, 44,185,190, 43, 61,228, 62,  0,  0,  0,  0, 62, 95, 68, 65, 51,120,173,192,115,208,213, 64,  0,  0,128, 63,178,157,229, 62,
- 53,  8, 67,191,116,169, 81,191,184,158, 81,191,117, 90,127, 63,194,  3,188, 62,158, 53,185, 62, 35, 44,185, 62,145,180,109,188,
-174, 65,217, 63,218, 72,228,190, 42, 61,228,190,  0,  0,  0,  0,  0,  0,  0,  0, 33,171,108, 65, 33,210,111, 65,100,240,191, 62,
-110,116, 85, 63, 64,185, 70,188,  0,  0, 82,180, 51,239, 88,190,  2, 33,209, 61,210,167,241, 62,  0,  0, 88, 51,197,112,117,194,
-178,208,216, 65,220,158,  5,194,231,251,159,192,221, 54,114, 66, 29,247,213,193, 58,221,  3, 66, 25,  4,160, 64, 68,239,209, 62,
- 51,177,205,190,184,158, 81, 63,  0,  0,  0,  0, 70,119,105, 63,143, 74, 70, 62, 35, 44,185,190,  0,  0,  0,  0,162, 84, 89,188,
-166, 33,101, 63, 42, 61,228, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 33,210,111,193,  0,  0,128, 63,178,157,229, 62,
- 53,  8, 67,191,116,169, 81,191,184,158, 81,191,117, 90,127, 63,194,  3,188, 62,158, 53,185, 62, 35, 44,185, 62,145,180,109,188,
-174, 65,217, 63,218, 72,228,190, 42, 61,228,190,  0,  0,  0,  0,  0,  0,  0,  0, 33,171,108, 65, 33,210,111, 65,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+248, 10,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,152, 12,220,  4,  0,  0,  0,  0, 88,  9,220,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79, 66, 74, 69, 67, 84, 95, 80, 84, 95, 99,111,110,115,116,114,
+ 97,105,110,116,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79, 66, 74, 69, 67, 84, 95, 80, 84, 95, 99,111,110,115,116,114,
+ 97,105,110,116,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79, 98,106,101, 99,116, 32, 67,111,110,115,116,114, 97,105,110,
+116,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160,255,187,  0, 36,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,152, 12,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+ 56, 14,220,  4,  0,  0,  0,  0,248, 10,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 95, 80, 84, 95, 99,111,110,116,101,120,116, 95,109,101,115,104,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 95, 80, 84, 95, 99,111,110,116,101,120,116, 95,109,101,115,104,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,184,255,171,  0, 36,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,154,191,178, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,154,191,178, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,154,191,178, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63, 92, 62, 55, 63,
- 56,186,224,190,237,203,148,190,  3,236,234,190, 33,210,111, 65, 33,210,111, 65,  0,  0,  0,  0,  0,  0,  0,  0,134,210,162, 58,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  0,  0,255,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63, 32, 33, 12, 66, 85,152,137, 66,113, 27,126, 66,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 96,  1,  0,  0,120, 88,167,  5,  0,  0,  0,  0,175,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  0,  0, 51, 51, 51, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 65,205,204, 76, 62,  2,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
-  1,  0,  7,  0, 24,213,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+ 56, 14,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,216, 15,220,  4,  0,  0,  0,  0,152, 12,220,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 95, 80, 84, 95,110,111,114,109, 97,108,115,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  3,  0,  0,  0,
-  1,  0,  3,  0,  8, 24,128,  0,  0,  0, 12, 66,  0,  0,128, 63,205,204,204, 61,  0,  0,122, 68,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0, 10,  0,  7,  1,  0,  3,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 95, 80, 84, 95,110,111,114,109, 97,108,115,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 78,111,114,109, 97,108,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 83, 78,  0,  0,  8,  1,  0,  0,184, 90,167,  5,  0,  0,  0,  0,211,  0,  0,  0,  1,  0,  0,  0,104,170,167,  5,
-  0,  0,  0,  0,104, 63,166,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 82, 71, 97,
-109,101, 32, 76,111,103,105, 99,  0, 46, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,102,255,171,  0, 58,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8, 92,167,  5,  0,  0,  0,  0,184, 97,167,  5,
-  0,  0,  0,  0, 40, 98,167,  5,  0,  0,  0,  0,232,106,167,  5,  0,  0,  0,  0, 88,107,167,  5,  0,  0,  0,  0,120,163,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,  8, 92,167,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,120, 92,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 32,  0,  0,  0,120, 92,167,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,232, 92,167,  5,  0,  0,  0,  0,  8, 92,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  5,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,232, 92,167,  5,
-  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0, 88, 93,167,  5,  0,  0,  0,  0,120, 92,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,126,  7,  5,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 88, 93,167,  5,  0,  0,  0,  0,212,  0,  0,  0,
-  1,  0,  0,  0,200, 93,167,  5,  0,  0,  0,  0,232, 92,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,200, 93,167,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0, 56, 94,167,  5,
-  0,  0,  0,  0, 88, 93,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,234,  3,  1,  0,  0,  0, 68, 65, 84, 65,
- 32,  0,  0,  0, 56, 94,167,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,168, 94,167,  5,  0,  0,  0,  0,200, 93,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,234,  3,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,168, 94,167,  5,
-  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0, 24, 95,167,  5,  0,  0,  0,  0, 56, 94,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,140,  1,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 24, 95,167,  5,  0,  0,  0,  0,212,  0,  0,  0,
-  1,  0,  0,  0,136, 95,167,  5,  0,  0,  0,  0,168, 94,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,  6,140,  1,
-  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,136, 95,167,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,248, 95,167,  5,
-  0,  0,  0,  0, 24, 95,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,  6,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 32,  0,  0,  0,248, 95,167,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,104, 96,167,  5,  0,  0,  0,  0,136, 95,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,140,  1,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,104, 96,167,  5,
-  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,216, 96,167,  5,  0,  0,  0,  0,248, 95,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 64,  5,140,  1,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,216, 96,167,  5,  0,  0,  0,  0,212,  0,  0,  0,
-  1,  0,  0,  0, 72, 97,167,  5,  0,  0,  0,  0,104, 96,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64,  5,234,  3,
-  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 72, 97,167,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,184, 97,167,  5,
-  0,  0,  0,  0,216, 96,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,  1,140,  1,  0,  0,  0,  0, 68, 65, 84, 65,
- 32,  0,  0,  0,184, 97,167,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72, 97,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,  1,234,  3,  1,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 40, 98,167,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,152, 98,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120, 92,167,  5,
-  0,  0,  0,  0,232, 92,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,152, 98,167,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  8, 99,167,  5,  0,  0,  0,  0, 40, 98,167,  5,  0,  0,  0,  0,120, 92,167,  5,
-  0,  0,  0,  0,200, 93,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,  8, 99,167,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,120, 99,167,  5,  0,  0,  0,  0,152, 98,167,  5,  0,  0,  0,  0,232, 92,167,  5,
-  0,  0,  0,  0, 56, 94,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,120, 99,167,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,232, 99,167,  5,  0,  0,  0,  0,  8, 99,167,  5,  0,  0,  0,  0,200, 93,167,  5,
-  0,  0,  0,  0, 56, 94,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,232, 99,167,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 88,100,167,  5,  0,  0,  0,  0,120, 99,167,  5,  0,  0,  0,  0,200, 93,167,  5,
-  0,  0,  0,  0,168, 94,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 88,100,167,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,200,100,167,  5,  0,  0,  0,  0,232, 99,167,  5,  0,  0,  0,  0,168, 94,167,  5,
-  0,  0,  0,  0, 24, 95,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,200,100,167,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 56,101,167,  5,  0,  0,  0,  0, 88,100,167,  5,  0,  0,  0,  0, 88, 93,167,  5,
-  0,  0,  0,  0,136, 95,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 56,101,167,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,168,101,167,  5,  0,  0,  0,  0,200,100,167,  5,  0,  0,  0,  0, 24, 95,167,  5,
-  0,  0,  0,  0,136, 95,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,168,101,167,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 24,102,167,  5,  0,  0,  0,  0, 56,101,167,  5,  0,  0,  0,  0,  8, 92,167,  5,
-  0,  0,  0,  0,168, 94,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 24,102,167,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,136,102,167,  5,  0,  0,  0,  0,168,101,167,  5,  0,  0,  0,  0,  8, 92,167,  5,
-  0,  0,  0,  0,136, 95,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,136,102,167,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,248,102,167,  5,  0,  0,  0,  0, 24,102,167,  5,  0,  0,  0,  0, 56, 94,167,  5,
-  0,  0,  0,  0,248, 95,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,248,102,167,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,104,103,167,  5,  0,  0,  0,  0,136,102,167,  5,  0,  0,  0,  0, 88, 93,167,  5,
-  0,  0,  0,  0,248, 95,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,104,103,167,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,216,103,167,  5,  0,  0,  0,  0,248,102,167,  5,  0,  0,  0,  0, 24, 95,167,  5,
-  0,  0,  0,  0,248, 95,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,216,103,167,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 72,104,167,  5,  0,  0,  0,  0,104,103,167,  5,  0,  0,  0,  0,104, 96,167,  5,
-  0,  0,  0,  0,216, 96,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 72,104,167,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,184,104,167,  5,  0,  0,  0,  0,216,103,167,  5,  0,  0,  0,  0, 56, 94,167,  5,
-  0,  0,  0,  0,216, 96,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,184,104,167,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 40,105,167,  5,  0,  0,  0,  0, 72,104,167,  5,  0,  0,  0,  0,248, 95,167,  5,
-  0,  0,  0,  0,104, 96,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 40,105,167,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,152,105,167,  5,  0,  0,  0,  0,184,104,167,  5,  0,  0,  0,  0,168, 94,167,  5,
-  0,  0,  0,  0, 72, 97,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,152,105,167,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  8,106,167,  5,  0,  0,  0,  0, 40,105,167,  5,  0,  0,  0,  0,104, 96,167,  5,
-  0,  0,  0,  0, 72, 97,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,  8,106,167,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,120,106,167,  5,  0,  0,  0,  0,152,105,167,  5,  0,  0,  0,  0,200, 93,167,  5,
-  0,  0,  0,  0,184, 97,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,120,106,167,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,232,106,167,  5,  0,  0,  0,  0,  8,106,167,  5,  0,  0,  0,  0,216, 96,167,  5,
-  0,  0,  0,  0,184, 97,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,232,106,167,  5,
-  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,106,167,  5,  0,  0,  0,  0, 72, 97,167,  5,
-  0,  0,  0,  0,184, 97,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0, 88,107,167,  5,
-  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 40,111,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200, 93,167,  5,
-  0,  0,  0,  0,120, 92,167,  5,  0,  0,  0,  0,232, 92,167,  5,  0,  0,  0,  0, 56, 94,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,235,  3,  0,  0,  5,  4,  0,  0,  7,  7,127,  7, 27,  0,  1,  0,  0,  0,  0,  0,
-  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,169,167,  5,  0,  0,  0,  0,216,169,167,  5,  0,  0,  0,  0, 72,108,167,  5,
-  0,  0,  0,  0,184,109,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 72,108,167,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,184,109,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,148, 68,  0,  0,  0,  0,
-  0,  0,208, 65,  0,  0,  0,  0,  0,224,239, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,  0,  0,  0,  0,
- 25,  0,  0,  0,  0,192,239, 68,  0,  0,200, 65,  0,192,239, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,127,  7, 26,  0,127,  7, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,235,  3,  0,  0,  4,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,127,  7, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,184,109,167,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72,108,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,109, 69,  0,  0,128,192,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,238, 68,  0,  0,  0,  0,  0,  0,  0, 64,112,  7,  0,  0,129,  7,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  2,  0,  0,  0,
-  1,  0,  3,  3,  2,  0,  0,  4, 10,  0,129,  7,  2,  0,112,  7,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  5,  4,  0,  0,  5,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0, 40,111,167,  5,  0,  0,  0,  0,215,  0,  0,  0,
-  1,  0,  0,  0,184,135,167,  5,  0,  0,  0,  0, 88,107,167,  5,  0,  0,  0,  0,136, 95,167,  5,  0,  0,  0,  0, 24, 95,167,  5,
-  0,  0,  0,  0,248, 95,167,  5,  0,  0,  0,  0, 88, 93,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 33,  6,  0,  0,
-126,  7,  0,  0,  0,  0,  0,  0,139,  1,  0,  0,  4,  4, 94,  1,140,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,120,134,167,  5,  0,  0,  0,  0,120,134,167,  5,  0,  0,  0,  0, 24,112,167,  5,  0,  0,  0,  0,136,113,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 24,112,167,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,136,113,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,148, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,
-  0,  0,175, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 93,  1,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,128,174, 67,
-  0,  0,200, 65,  0,128,174, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0,
- 10,  0, 94,  1, 26,  0, 94,  1, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 33,  6,  0,  0,
-126,  7,  0,  0,114,  1,  0,  0,139,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 94,  1, 26,  0,
-  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,136,113,167,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 24,112,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,174, 67,  0,  0, 61,196,  0,  0,  0,  0,  0,  0,  0,  0,
-255,127,166, 67,255,255,184,195,  0,  0,  0,  0, 77,  1,  0,  0, 94,  1,  0,  0,  0,  0,  0,  0,113,  1,  0,  0,  0,  0,  0,  0,
- 78,  1,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0, 76,  1,  0,  0,  0,  0,  0,  0,113,  1,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  1,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,
-  6,  0, 94,  1,114,  1, 77,  1,114,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 33,  6,  0,  0,
-126,  7,  0,  0,  0,  0,  0,  0,113,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 94,  1,114,  1,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248,114,167,  5,  0,  0,  0,  0,216,132,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,248,114,167,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,152,116,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 85, 84, 84,
- 79, 78, 83, 95, 80, 84, 95, 99,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 85, 84, 84,
- 79, 78, 83, 95, 80, 84, 95, 99,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67,111,110,116,
-101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,220,255,
- 76,  1, 36,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,152,116,167,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 56,118,167,  5,  0,  0,  0,  0,248,114,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,114,101,110,100,101,114,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,114,101,110,100,101,114,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82,101,110,100,101,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,135,255, 76,  1, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,216, 15,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+120, 17,220,  4,  0,  0,  0,  0, 56, 14,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 95, 80, 84, 95,116,101,120,116,117,114,101, 95,115,112, 97, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 95, 80, 84, 95,116,101,120,116,117,114,101, 95,115,112, 97, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 56,118,167,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,216,119,167,  5,
-  0,  0,  0,  0,152,116,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,108, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,108, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 76, 97,121,101,
-114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,111,255,
- 76,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 84,101,120,116,117,114,101, 32, 83,112, 97, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 78,255,171,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,216,119,167,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,120,121,167,  5,  0,  0,  0,  0, 56,118,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,100,105,109,101,110,115,105,111,110,115,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,100,105,109,101,110,115,105,111,110,115,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+120, 17,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 24, 19,220,  4,  0,  0,  0,  0,216, 15,220,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 95, 80, 84, 95,118,101,114,116,101,120, 95,103,
+114,111,117,112,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 95, 80, 84, 95,118,101,114,116,101,120, 95,103,
+114,111,117,112,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86,101,114,116,101,120, 32, 71,114,111,117,112,115,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,105,109,101,110,115,105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,234,254,171,  0, 76,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140,254, 76,  1,203,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 24, 19,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+184, 20,220,  4,  0,  0,  0,  0,120, 17,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 95, 80, 84, 95,115,104, 97,112,101, 95,107,101,121,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,120,121,167,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 24,123,167,  5,
-  0,  0,  0,  0,216,119,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95, 97,110,116,105, 97,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95, 97,110,116,105, 97,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 65,110,116,105,
- 45, 65,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 58,254,
- 76,  1, 58,  0, 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 95, 80, 84, 95,115,104, 97,112,101, 95,107,101,121,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 83,104, 97,112,101, 32, 75,101,121,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 24,123,167,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,184,124,167,  5,  0,  0,  0,  0,120,121,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,109,111,116,105,111,110, 95, 98,108,117,
-114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,109,111,116,105,111,110, 95, 98,108,117,
-114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 97,109,112,108,101,100, 32, 77,111,116,105,111,110, 32, 66,108,117,114,  0,
+  0,  0,134,254,171,  0, 76,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 34,254, 76,  1,  0,  0, 20,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
-  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+184, 20,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 88, 22,220,  4,  0,  0,  0,  0, 24, 19,220,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 95, 80, 84, 95,117,118, 95,116,101,120,116,117,
+114,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 95, 80, 84, 95,117,118, 95,116,101,120,116,117,
+114,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 85, 86, 32, 77, 97,112,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 41,254,171,  0, 69,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,184,124,167,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 88,126,167,  5,
-  0,  0,  0,  0, 24,123,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,115,104, 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,115,104, 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83,104, 97,100,
-105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,254,
- 76,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 88, 22,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+248, 23,220,  4,  0,  0,  0,  0,184, 20,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 95, 80, 84, 95,118,101,114,116,101,120, 95, 99,111,108,111,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 88,126,167,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,248,127,167,  5,  0,  0,  0,  0,184,124,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,101,114,102,111,114,109, 97,110, 99,
-101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,101,114,102,111,114,109, 97,110, 99,
-101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,101,114,102,111,114,109, 97,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 95, 80, 84, 95,118,101,114,116,101,120, 95, 99,111,108,111,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,242,253, 76,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
-  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 86,101,114,116,101,120, 32, 67,111,108,111,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,204,253,171,  0, 69,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,248,127,167,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,152,129,167,  5,
-  0,  0,  0,  0, 88,126,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,112,111,115,116, 95,112,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,112,111,115,116, 95,112,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,111,115,116,
- 32, 80,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,218,253,
- 76,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+248, 23,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88, 22,220,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 95, 80, 84, 95, 99,117,115,116,111,109, 95,112,
+114,111,112,115, 95,109,101,115,104,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 95, 80, 84, 95, 99,117,115,116,111,109, 95,112,
+114,111,112,115, 95,109,101,115,104,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67,117,115,116,111,109, 32, 80,114,111,112,101,114,116,105,101,
+115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,180,253,171,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,152,129,167,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 56,131,167,  5,  0,  0,  0,  0,248,127,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,116, 97,109,112,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,248,  0,  0,  0,152, 25,220,  4,  0,  0,  0,  0,180,  0,  0,  0,  1,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,116, 97,109,112,  0,  0,  0,  0,  0,
+  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83,116, 97,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,194,253, 76,  1,  0,  0, 20,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
-  9,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 56,131,167,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,216,132,167,  5,
-  0,  0,  0,  0,152,129,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,111,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68,
- 69, 82, 95, 80, 84, 95,111,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79,117,116,112,
-117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40,253,
- 76,  1,130,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  1,  0,  0,  0,  0,  0,120, 98,186,  4,  0,  0,  0,  0,
+255, 13,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,
+216, 26,220,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,200, 31,220,  4,  0,  0,  0,  0,  8,229,219,  4,  0,  0,  0,  0,
+  8,102,201,  4,  0,  0,  0,  0,104,106,201,  4,  0,  0,  0,  0,216,106,201,  4,  0,  0,  0,  0,168,104,201,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 99,  6,  0,  0,  0,  0,  0,  0,155,  0,  0,  0, 15, 15,100,  6,156,  0,  1,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 56,129,109,  3,  0,  0,  0,  0,168, 30,220,  4,  0,  0,  0,  0,168, 30,220,  4,  0,  0,  0,  0,
+200, 27,220,  4,  0,  0,  0,  0, 56, 29,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 24,134,184,  4,  0,  0,  0,  0,184,229,184,  4,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,200, 27,220,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0, 56, 29,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,224,143, 68,
+  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,128,204, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 99,  6,  0,  0,
+  0,  0,  0,  0, 25,  0,  0,  0,  0, 96,204, 68,  0,  0,200, 65,  0, 96,204, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,100,  6, 26,  0,100,  6, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 99,  6,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,100,  6, 26,  0,  6,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 88,131,109,  3,  0,  0,  0,  0,168, 71,145,  3,  0,  0,  0,  0,168, 71,145,  3,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200,185,133,  3,  0,  0,  0,  0,248, 73,189,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 56, 29,220,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200, 27,220,  4,  0,  0,  0,  0,  0,  0, 64,192,  0,  0,126, 67,
+  0,  0,  0,  0,  0,  0, 72, 66, 88,218,103,194, 40,147,141, 67,  0,  0,  0,  0,  0,  0, 72, 66,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 99,  6,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0, 99,  6,  0,  0,
+ 18,  0,  0,  0,129,  0,  0,  0,  0,  0,128, 63,  0,  0, 72, 66,  0,124,146, 72,  0,  0, 72, 66,205,204,204, 61,  0,  0, 32, 65,
+ 72,  0,  0,  0,  0,  0,  0,  2,  4,  0,  0,  4,  8,  0,100,  6,130,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 99,  6,  0,  0, 26,  0,  0,  0,155,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,100,  6,130,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 88,130,109,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200, 74,189,  4,  0,  0,  0,  0,  8, 78,189,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,208,  0,  0,  0,168, 30,220,  4,  0,  0,  0,  0,
+185,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  1,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,
+200, 31,220,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,232,215,220,  4,  0,  0,  0,  0,216, 26,220,  4,  0,  0,  0,  0,
+136,105,201,  4,  0,  0,  0,  0, 24,105,201,  4,  0,  0,  0,  0, 56,104,201,  4,  0,  0,  0,  0,248,105,201,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,101,  6,  0,  0,126,  7,  0,  0,205,  3,  0,  0, 99,  4,  0,  0,  3,  3, 26,  1,151,  0,  1,  0,
+  0,  0,  0,  0,  0,  0,  8,  0, 24,126,109,  3,  0,  0,  0,  0,152, 35,220,  4,  0,  0,  0,  0,152, 35,220,  4,  0,  0,  0,  0,
+184, 32,220,  4,  0,  0,  0,  0, 40, 34,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 40,238,184,  4,  0,  0,  0,  0, 24,  7,168,  4,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,184, 32,220,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0, 40, 34,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,244, 67,
+  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,141, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25,  1,  0,  0,
+  0,  0,  0,  0, 25,  0,  0,  0,  0,128,140, 67,  0,  0,200, 65,  0,128,140, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0, 26,  1, 26,  0, 26,  1, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,101,  6,  0,  0,126,  7,  0,  0, 74,  4,  0,  0, 99,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 26,  1, 26,  0,  8,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 56,128,109,  3,  0,  0,  0,  0, 40, 20,194,  4,  0,  0,  0,  0, 40, 20,194,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 56, 91,187,  4,  0,  0,  0,  0,168, 93,187,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 40, 34,220,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,184, 32,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,141, 67,
+  0,  0,244,194,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,132, 67,  0,  0,214,194,  0,  0,  0,  0,  9,  1,  0,  0, 26,  1,  0,  0,
+ 18,  0,  0,  0,124,  0,  0,  0,  0,  0,  0,  0,  8,  1,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,  8,  1,  0,  0,
+ 18,  0,  0,  0,124,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+ 18,  0,  0,  0,  2,  0,  3,  3,  0,  0, 12,  4,  6,  0, 26,  1,125,  0,  9,  1,107,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,101,  6,  0,  0,126,  7,  0,  0,205,  3,  0,  0, 73,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 26,  1,125,  0,  9,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 56,127,109,  3,  0,  0,  0,  0,152,153,203,  4,  0,  0,  0,  0,152,153,203,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120, 94,187,  4,  0,  0,  0,  0, 24, 96,187,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 24,  1,  0,  0,152, 35,220,  4,  0,  0,  0,  0,
+181,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,216,132,167,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 56,131,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 98, 97,107,101,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 98, 97,107,101,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 97,107,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248, 21,177,  4,  0,  0,  0,  0,248, 21,177,  4,  0,  0,  0,  0,
+104,222,190,  4,  0,  0,  0,  0,  0,115,101, 32, 83, 99,117,108,112,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
+ 68, 65, 84, 65, 16,  0,  0,  0,104,222,190,  4,  0,  0,  0,  0,238,  0,  0,  0,  1,  0,  0,  0, 42, 11,  0,  0, 42, 11,  0,  0,
+248, 36,220,  4,  0,  0,  0,  0, 68, 65, 84, 65,160,178,  0,  0,248, 36,220,  4,  0,  0,  0,  0,237,  0,  0,  0, 42, 11,  0,  0,
+  0,  0,  0,  0,  2,  0,  1,  0, 40, 92,222,  4,  0,  0,  0,  0, 19,  0,  0,  0,  1,  0,  1,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 20,  0,  0,  0,  1,  0,  1,  0, 40, 92,222,  4,  0,  0,  0,  0, 21,  0,  1,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  1,  0,  8,118,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,136,127,222,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  1,  0,168,181,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,232,140,222,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  1,  0,248,162,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0, 56,134,222,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  1,  0,168,113,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,216,120,222,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  1,  0,152,112,222,  4,  0,  0,  0,  0, 21,  0,  0,  0,  1,  0,  1,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0,  0,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0,  1,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0,  2,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0,  3,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0,  4,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0,  5,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0,  6,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0,  7,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0,  8,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0,  9,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 10,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 11,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 12,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 13,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 14,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 15,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 16,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 17,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 18,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 19,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 20,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 21,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 22,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 23,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 24,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 25,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 26,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 27,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 28,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 29,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 30,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 31,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 32,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 33,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 34,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 35,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 36,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 37,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 38,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 39,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 40,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 41,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 42,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 43,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 44,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 45,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 46,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 47,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 48,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 49,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 50,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 51,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 52,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 53,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 54,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 55,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 56,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 57,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 58,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 59,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 60,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 61,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 62,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 63,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 64,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 65,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 66,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 67,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 31,  0, 68,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0, 31,  0, 69,  0,  1,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  3,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,232,152,200,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0, 56,248,200,  4,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,184,100,201,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0,104,254,220,  4,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,248,149,221,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0,184,228,221,  4,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,216, 43,222,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0,248,162,222,  4,  0,  0,  0,  0, 30,  0,255,255,  1,  0,  0,  0,248,149,200,  4,  0,  0,  0,  0,
+ 30,  0,255,255,  1,  0,  0,  0,  8,118,222,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0,
+ 31,  0,  0,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0,  1,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0,  2,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0,  3,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0,  4,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0,  5,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0,  6,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0,  7,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0,  8,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0,  9,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 10,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 11,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 12,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 13,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 14,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 15,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 16,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 17,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 18,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 19,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 20,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 21,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 22,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 23,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 24,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 25,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 26,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 27,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 28,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 29,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 30,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 31,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 32,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 33,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 34,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 35,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 36,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 37,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 38,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 39,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 40,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 41,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 42,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 43,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 44,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 45,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 46,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 47,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 48,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 49,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 50,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 51,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 52,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 53,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 54,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 55,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 56,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 57,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 58,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 59,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 60,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 61,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 62,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 63,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 64,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 65,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 66,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 67,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 68,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 69,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 70,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 71,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 72,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 73,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 74,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 75,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 76,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 77,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 78,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 79,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 80,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 81,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0, 82,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 31,  0, 83,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0,
+ 31,  0,  0,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0,  1,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0,  2,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0,  3,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0,  4,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0,  5,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0,  6,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0,  7,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0,  8,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0,  9,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0, 10,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0, 11,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0, 12,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0, 13,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0, 14,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0, 15,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0, 16,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0, 17,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0, 18,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0, 19,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0, 20,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0, 21,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0, 22,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0, 23,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0, 24,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0, 25,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0, 26,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0, 27,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0, 28,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0, 29,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0, 30,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0, 31,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0, 32,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0, 33,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0, 34,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0, 35,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0, 36,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0, 37,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0, 38,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0, 39,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0, 40,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0, 41,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0, 42,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0, 43,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0, 44,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0, 45,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0, 46,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0, 47,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0, 48,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0, 49,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0, 50,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0, 31,  0, 51,  0,  1,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 31,  0,  0,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0,  1,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0,  2,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0,  3,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0,  4,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0,  5,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0,  6,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0,  7,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0,  8,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0,  9,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 10,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 11,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 12,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 13,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 14,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 15,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 16,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 17,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 18,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 19,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 20,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 21,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 22,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 23,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 24,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 25,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 26,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 27,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 28,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 29,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 30,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 31,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 32,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 33,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 34,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 35,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 36,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 37,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 38,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 39,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 40,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 41,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 42,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 43,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 44,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 45,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 46,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 47,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 48,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 49,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 50,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 51,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 52,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 53,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 54,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 55,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 56,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 57,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 58,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 59,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 60,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 61,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 62,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 63,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 64,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 65,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 66,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 67,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 68,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 69,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 70,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 71,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 72,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 73,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 74,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 75,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 76,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 77,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 78,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 79,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 80,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 81,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 82,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 83,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 84,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 85,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 86,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 87,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 88,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 89,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 90,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 91,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 92,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 93,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 94,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0, 95,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,
+ 31,  0, 96,  0,  1,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 21,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 22,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 23,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 24,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 25,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 26,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 27,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 28,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 29,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 30,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 31,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 32,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 33,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 34,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 35,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 36,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 37,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 38,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 39,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 40,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 41,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 42,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 43,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 44,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 45,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 46,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 47,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 48,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 49,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 50,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 51,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 52,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 53,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 54,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 55,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 56,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 57,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 58,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 59,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 60,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 61,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 62,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 63,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 64,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 65,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 66,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 67,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 68,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 69,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 70,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 71,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 72,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 73,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 74,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 75,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 76,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 77,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 78,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 79,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 80,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 81,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 82,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 83,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 84,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 85,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 86,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 87,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 88,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 89,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 90,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 91,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 92,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 93,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 94,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0, 95,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0, 31,  0, 96,  0,  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+ 31,  0,  0,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0,  1,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0,  2,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0,  3,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0,  4,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0,  5,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0,  6,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0,  7,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0,  8,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0,  9,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 10,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 11,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 12,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 13,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 14,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 15,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 16,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 17,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 18,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 19,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 20,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 21,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 22,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 23,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 24,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 25,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 26,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 27,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 28,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 29,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 30,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 31,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 32,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 33,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 34,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 35,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 36,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 37,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 38,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 39,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 40,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 41,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 42,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 43,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 44,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 45,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 46,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 47,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 48,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 49,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 50,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 51,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 52,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 53,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 54,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 55,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 56,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 57,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 58,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 59,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 60,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 61,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 62,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 63,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 64,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 65,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 66,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 67,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 68,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 69,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 70,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 71,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 72,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 73,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 74,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 75,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 76,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 77,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 78,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 79,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 80,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 81,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 82,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 83,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 84,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 85,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 86,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 87,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 88,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 89,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 90,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 91,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 92,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 93,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 94,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0, 95,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,
+ 31,  0, 96,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,232,152,200,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,232,152,200,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,232,152,200,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,232,152,200,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,232,152,200,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,232,152,200,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,232,152,200,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,232,152,200,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,232,152,200,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,232,152,200,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 56,248,200,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0, 56,248,200,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0, 56,248,200,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0, 56,248,200,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0, 56,248,200,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0, 56,248,200,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0, 56,248,200,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0, 56,248,200,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0, 56,248,200,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0, 56,248,200,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,184,100,201,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,184,100,201,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,184,100,201,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,184,100,201,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,184,100,201,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,184,100,201,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,184,100,201,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,184,100,201,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,184,100,201,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,184,100,201,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,104,254,220,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,104,254,220,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,104,254,220,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,104,254,220,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,104,254,220,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,104,254,220,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,104,254,220,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,104,254,220,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,104,254,220,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,104,254,220,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,248,149,221,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,248,149,221,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,248,149,221,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,248,149,221,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,248,149,221,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,248,149,221,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,248,149,221,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,248,149,221,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,248,149,221,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,248,149,221,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,184,228,221,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,184,228,221,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,184,228,221,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,184,228,221,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,184,228,221,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,184,228,221,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,184,228,221,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,184,228,221,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,184,228,221,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,184,228,221,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,216, 43,222,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,216, 43,222,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,216, 43,222,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,216, 43,222,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,216, 43,222,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,216, 43,222,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,216, 43,222,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,216, 43,222,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,216, 43,222,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,216, 43,222,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,248,162,222,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,248,162,222,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,248,162,222,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,248,162,222,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,248,162,222,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,248,162,222,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,248,162,222,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,248,162,222,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,248,162,222,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,248,162,222,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,248,162,222,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,248,162,222,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,248,162,222,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,248,162,222,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,248,162,222,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,248,162,222,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,248,162,222,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,248,162,222,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,248,162,222,  4,  0,  0,  0,  0,
+ 31,  0,  0,  0,  1,  0,  0,  0,248,149,200,  4,  0,  0,  0,  0, 31,  0,  1,  0,  1,  0,  0,  0,248,149,200,  4,  0,  0,  0,  0,
+ 31,  0,  2,  0,  1,  0,  0,  0,248,149,200,  4,  0,  0,  0,  0, 31,  0,  3,  0,  1,  0,  0,  0,248,149,200,  4,  0,  0,  0,  0,
+ 31,  0,  4,  0,  1,  0,  0,  0,248,149,200,  4,  0,  0,  0,  0, 31,  0,  5,  0,  1,  0,  0,  0,248,149,200,  4,  0,  0,  0,  0,
+ 31,  0,  6,  0,  1,  0,  0,  0,248,149,200,  4,  0,  0,  0,  0, 31,  0,  7,  0,  1,  0,  0,  0,248,149,200,  4,  0,  0,  0,  0,
+ 31,  0,  8,  0,  1,  0,  0,  0,248,149,200,  4,  0,  0,  0,  0, 31,  0,  9,  0,  1,  0,  0,  0,248,149,200,  4,  0,  0,  0,  0,
+ 31,  0, 10,  0,  1,  0,  0,  0,248,149,200,  4,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0,  8,118,222,  4,  0,  0,  0,  0,
+ 31,  0,  1,  0,  1,  0,  0,  0,  8,118,222,  4,  0,  0,  0,  0, 31,  0,  2,  0,  1,  0,  0,  0,  8,118,222,  4,  0,  0,  0,  0,
+ 31,  0,  3,  0,  1,  0,  0,  0,  8,118,222,  4,  0,  0,  0,  0, 31,  0,  4,  0,  1,  0,  0,  0,  8,118,222,  4,  0,  0,  0,  0,
+ 31,  0,  5,  0,  1,  0,  0,  0,  8,118,222,  4,  0,  0,  0,  0, 31,  0,  6,  0,  1,  0,  0,  0,  8,118,222,  4,  0,  0,  0,  0,
+ 31,  0,  7,  0,  1,  0,  0,  0,  8,118,222,  4,  0,  0,  0,  0, 31,  0,  8,  0,  1,  0,  0,  0,  8,118,222,  4,  0,  0,  0,  0,
+ 31,  0,  9,  0,  1,  0,  0,  0,  8,118,222,  4,  0,  0,  0,  0, 31,  0, 10,  0,  1,  0,  0,  0,  8,118,222,  4,  0,  0,  0,  0,
+ 31,  0, 11,  0,  1,  0,  0,  0,  8,118,222,  4,  0,  0,  0,  0, 31,  0, 12,  0,  1,  0,  0,  0,  8,118,222,  4,  0,  0,  0,  0,
+ 31,  0, 13,  0,  1,  0,  0,  0,  8,118,222,  4,  0,  0,  0,  0, 31,  0, 14,  0,  1,  0,  0,  0,  8,118,222,  4,  0,  0,  0,  0,
+ 31,  0, 15,  0,  1,  0,  0,  0,  8,118,222,  4,  0,  0,  0,  0, 31,  0, 16,  0,  1,  0,  0,  0,  8,118,222,  4,  0,  0,  0,  0,
+ 31,  0, 17,  0,  1,  0,  0,  0,  8,118,222,  4,  0,  0,  0,  0, 31,  0, 18,  0,  1,  0,  0,  0,  8,118,222,  4,  0,  0,  0,  0,
+ 31,  0, 19,  0,  1,  0,  0,  0,  8,118,222,  4,  0,  0,  0,  0, 31,  0, 20,  0,  1,  0,  0,  0,  8,118,222,  4,  0,  0,  0,  0,
+ 68, 65, 84, 65,160,  0,  0,  0,232,215,220,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+200, 31,220,  4,  0,  0,  0,  0,104,106,201,  4,  0,  0,  0,  0,200,103,201,  4,  0,  0,  0,  0, 24,105,201,  4,  0,  0,  0,  0,
+216,106,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 99,  6,  0,  0,157,  0,  0,  0, 99,  4,  0,  0,
+  1,  1,100,  6,199,  3,  1,  0,  0,  0,  0,  0,  0,  0,  8,  0, 88,132,109,  3,  0,  0,  0,  0, 40,252,220,  4,  0,  0,  0,  0,
+ 40,252,220,  4,  0,  0,  0,  0,216,216,220,  4,  0,  0,  0,  0,248,246,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,168,  3,168,  4,  0,  0,  0,  0, 88, 79,171,  4,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
+216,216,220,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0, 72,218,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,192,108, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,128,204, 68,  0,  0,  0,  0,  0,  0,208, 65,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 99,  6,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0, 96,204, 68,  0,  0,200, 65,  0, 96,204, 68,  0,  0,200, 65,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,100,  6, 26,  0,100,  6, 26,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 99,  6,  0,  0,157,  0,  0,  0,182,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,100,  6, 26,  0, 10,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248,142,109,  3,  0,  0,  0,  0,184,213,193,  4,  0,  0,  0,  0,
+184,213,193,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,232,190,149,  3,  0,  0,  0,  0,
+ 40,194,149,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
+ 72,218,220,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,120,242,220,  4,  0,  0,  0,  0,216,216,220,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,128,178, 67,  0, 64, 53,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0, 64, 53,196,  0,  0,  0,  0,
+143,  0,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,212,  2,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,
+  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0,212,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,160,  0,213,  2,143,  0,213,  2,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,159,  0,  0,  0,143,  1,  0,  0, 99,  4,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160,  0,213,  2, 11,  0,  5,  0,  3,  0,  0,  0,  0,  0,  0,  0,
+160,  0, 50,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152,139,109,  3,  0,  0,  0,  0,168,192,202,  4,  0,  0,  0,  0,
+168,192,202,  4,  0,  0,  0,  0,184,219,220,  4,  0,  0,  0,  0,216,240,220,  4,  0,  0,  0,  0,248,194,149,  3,  0,  0,  0,  0,
+104,197,149,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+184,219,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 88,221,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+104, 72, 29,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,
+111, 98,106,101, 99,116,109,111,100,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,
+111, 98,106,101, 99,116,109,111,100,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79, 98,106,101, 99,116, 32, 84,111,111,108,115,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,253, 76,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
- 11,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,233,253,143,  0,255,  1,  0,  0,  0,  0,  0,  0, 39,  0,
+  0,  0,  0,  0, 13,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65,248,  0,  0,  0,120,134,167,  5,  0,  0,  0,  0,180,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 88,221,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+248,222,220,  4,  0,  0,  0,  0,184,219,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95, 98,114,117,115,104,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95, 98,114,117,115,104,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 66,114,117,115,104,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,189,254,143,  0, 43,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255, 21,  0,  0,
-160,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,184,135,167,  5,
-  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 40,143,167,  5,  0,  0,  0,  0, 40,111,167,  5,  0,  0,  0,  0,  8, 92,167,  5,
-  0,  0,  0,  0,168, 94,167,  5,  0,  0,  0,  0, 24, 95,167,  5,  0,  0,  0,  0,136, 95,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 31,  6,  0,  0,  0,  0,  0,  0,139,  1,  0,  0, 17, 17, 32,  6,140,  1,  1,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152,142,167,  5,  0,  0,  0,  0,152,142,167,  5,  0,  0,  0,  0,168,136,167,  5,
-  0,  0,  0,  0, 40,141,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,168,136,167,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0, 24,138,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 74, 67,  0,  0,  0,  0,
-  0,  0,208, 65,  0,  0,  0,  0,  0,  0,196, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 31,  6,  0,  0,  0,  0,  0,  0,
- 25,  0,  0,  0,  0,224,195, 68,  0,  0,200, 65,  0,224,195, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  2,  0,  3,  3,  4,  0, 12,  0, 10,  0, 32,  6, 26,  0, 32,  6, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 31,  6,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 32,  6, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+248,222,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,152,224,220,  4,  0,  0,  0,  0, 88,221,220,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,
+ 98,114,117,115,104, 95,116,111,111,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,
+ 98,114,117,115,104, 95,116,111,111,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 84,111,111,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 74,254,143,  0, 61,  0,  0,  0,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 24,138,167,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0, 40,141,167,  5,  0,  0,  0,  0,168,136,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 92, 67,  0,  0,185,195,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 75, 67,  0,  0,185,195,  0,  0,  0,  0,203,  0,  0,  0,220,  0,  0,  0,  0,  0,  0,  0,
-113,  1,  0,  0,  0,  0,  0,  0,202,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,202,  0,  0,  0,  0,  0,  0,  0,
-113,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,
-  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,220,  0,114,  1,203,  0,114,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,219,  0,  0,  0, 26,  0,  0,  0,139,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,220,  0,114,  1,  0,  0,  4,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136,139,167,  5,
-  0,  0,  0,  0,136,139,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,136,139,167,  5,  0,  0,  0,  0,214,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 76, 79, 71, 73, 67, 95, 80, 84, 95,112,114,111,112,101,114,116,105,101,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 76, 79, 71, 73, 67, 95, 80, 84, 95,112,114,111,112,101,114,116,105,101,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,152,224,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+ 56,226,220,  4,  0,  0,  0,  0,248,222,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95, 98,114,117,115,104, 95,115,116,114,111,107,101,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 80,114,111,112,101,114,116,105,101,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95, 98,114,117,115,104, 95,115,116,114,111,107,101,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,196,255,203,  0, 36,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 83,116,114,111,107,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,165,254,143,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  1,  0,  0, 40,141,167,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,138,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160, 68,  0,  0,  0,  0,  0,  0,112, 67,  0, 80, 31,195,  0,234,179, 68,224,198,182,194,
-184,177,165, 67, 51,  5,  0,  0, 68,  5,  0,  0, 18,  0,  0,  0,113,  1,  0,  0,  0,  0,  0,  0, 50,  5,  0,  0,  0,  0,  0,  0,
- 17,  0,  0,  0,  0,  0,  0,  0, 50,  5,  0,  0, 18,  0,  0,  0,113,  1,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,250, 70,
-  0,  0,250, 70,  0,  0,  0, 63, 72,225,154, 63, 10,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  4,  0,  0, 68,  5,114,  1, 51,  5,
- 96,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,220,  0,  0,  0, 31,  6,  0,  0, 26,  0,  0,  0,
-139,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,  5,114,  1,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+ 56,226,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,216,227,220,  4,  0,  0,  0,  0,152,224,220,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,
+ 98,114,117,115,104, 95, 99,117,114,118,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,
+ 98,114,117,115,104, 95, 99,117,114,118,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67,117,114,118,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 72,  0,  0,  0,152,142,167,  5,  0,  0,  0,  0,193,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
-160,  0,  0,  0, 40,143,167,  5,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,232,149,167,  5,  0,  0,  0,  0,184,135,167,  5,
-  0,  0,  0,  0,104, 96,167,  5,  0,  0,  0,  0,216, 96,167,  5,  0,  0,  0,  0, 56, 94,167,  5,  0,  0,  0,  0,248, 95,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 65,  5,  0,  0,126,  7,  0,  0,141,  1,  0,  0,233,  3,  0,  0,  9,  9, 62,  2,
- 93,  2,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248,146,167,  5,  0,  0,  0,  0,248,146,167,  5,
-  0,  0,  0,  0, 24,144,167,  5,  0,  0,  0,  0,136,145,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 24,144,167,  5,
-  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,136,145,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,230, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,128, 15, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,141,254,143,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 61,  2,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0, 64, 15, 68,  0,  0,200, 65,  0, 64, 15, 68,  0,  0,200, 65,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0, 62,  2, 26,  0, 62,  2, 26,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 65,  5,  0,  0,126,  7,  0,  0,141,  1,  0,  0,166,  1,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  2, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,216,227,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+120,229,220,  4,  0,  0,  0,  0, 56,226,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95, 98,114,117,115,104, 95, 97,112,112,101, 97,114, 97,110, 99,101,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,136,145,167,  5,
-  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,144,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,128,181, 67,  0,  0,  0,  0,  0,128,218, 67,  0,  0,  0,  0,131,248,  1, 68,  0,  0,  0,  0, 86, 26,  3, 68,  0,  0,  0,  0,
+ 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95, 98,114,117,115,104, 95, 97,112,112,101, 97,114, 97,110, 99,101,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 61,  2,  0,  0,  0,  0,  0,  0, 66,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,215, 35, 60,
-  0,  0,122, 68,  0,  0,  0,  0,  1,  0,  3,  0,  0,  0,  0,  4, 10,  0, 62,  2, 67,  2, 62,  2, 67,  2,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 65,  5,  0,  0,126,  7,  0,  0,167,  1,  0,  0,233,  3,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  2, 67,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 65,112,112,101, 97,114, 97,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,117,254,143,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  2,  0,  0,248,146,167,  5,
-  0,  0,  0,  0,187,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  0,  4,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+120,229,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 24,231,220,  4,  0,  0,  0,  0,216,227,220,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,
+118,101,114,116,101,120,112, 97,105,110,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,
+118,101,114,116,101,120,112, 97,105,110,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79,112,116,105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,149,253,143,  0,146,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 24,231,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+184,232,220,  4,  0,  0,  0,  0,120,229,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95, 98,114,117,115,104, 95,116,101,120,116,117,114,101,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95, 98,114,117,115,104, 95,116,101,120,116,117,114,101,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 84,101,120,116,117,114,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 93,254,143,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+184,232,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 88,234,220,  4,  0,  0,  0,  0, 24,231,220,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,115, 99,117,108,112,116,
+ 95,111,112,116,105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,115, 99,117,108,112,116,
+ 95,111,112,116,105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79,112,116,105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 21,254,143,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 88,234,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+248,235,220,  4,  0,  0,  0,  0,184,232,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,115, 99,117,108,112,116, 95,115,121,109,109,101,116,114,121,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,115, 99,117,108,112,116, 95,115,121,109,109,101,116,114,121,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 83,121,109,109,101,116,114,121,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,253,253,143,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,232,149,167,  5,  0,  0,  0,  0,215,  0,  0,  0,
-  1,  0,  0,  0,120,163,167,  5,  0,  0,  0,  0, 40,143,167,  5,  0,  0,  0,  0, 72, 97,167,  5,  0,  0,  0,  0,184, 97,167,  5,
-  0,  0,  0,  0,216, 96,167,  5,  0,  0,  0,  0,104, 96,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 69,  1,  0,  0,
- 63,  5,  0,  0,141,  1,  0,  0,233,  3,  0,  0,  1,  1,251,  3, 93,  2,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,200,161,167,  5,  0,  0,  0,  0,200,161,167,  5,  0,  0,  0,  0,216,150,167,  5,  0,  0,  0,  0,152,156,167,  5,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+248,235,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,152,237,220,  4,  0,  0,  0,  0, 88,234,220,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,
+109,101,115,104,101,100,105,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,
+109,101,115,104,101,100,105,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 77,101,115,104, 32, 84,111,111,108,115,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,216,150,167,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0, 72,152,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64,113, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,
-  0,192,126, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,250,  3,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,128,126, 68,
-  0,  0,200, 65,  0,128,126, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0,
- 10,  0,251,  3, 26,  0,251,  3, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 69,  1,  0,  0,
- 63,  5,  0,  0,141,  1,  0,  0,166,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,251,  3, 26,  0,
-  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,164,252,143,  0, 68,  3,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 72,152,167,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,184,153,167,  5,
-  0,  0,  0,  0,216,150,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0, 64, 70,196,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 15, 67,255,127, 70,196,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0, 18,  0,  0,  0, 43,  3,  0,  0,  0,  0,  0,  0,
-142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0, 18,  0,  0,  0, 43,  3,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  0,  0,  0,  1,  0,  7,  0, 18,  0,  0,  0,
-  6,  0,160,  0, 44,  3,143,  0, 26,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 69,  1,  0,  0,
- 69,  1,  0,  0,167,  1,  0,  0,233,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0, 67,  2,
-  0,  0,  5,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,152,237,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+ 56,239,220,  4,  0,  0,  0,  0,248,235,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,109,101,115,104,101,100,105,116, 95,111,112,116,105,111,110,115,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,184,153,167,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0, 40,155,167,  5,
-  0,  0,  0,  0, 72,152,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16, 67,  0,  0,206,194,  0,  0,  0,  0,  0,  0,  0,  0,
-231,102, 16, 67,  0,  0,206,194,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0, 18,  0,  0,  0,119,  0,  0,  0,  0,  0,  0,  0,
-142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0, 18,  0,  0,  0,119,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  0,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,
-  6,  0,160,  0,120,  0,143,  0,102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 69,  1,  0,  0,
- 63,  5,  0,  0,167,  1,  0,  0,167,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,
-  0,  0,  6,  0, 34,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,109,101,115,104,101,100,105,116, 95,111,112,116,105,111,110,115,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 77,101,115,104, 32, 79,112,116,105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 40,155,167,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,152,156,167,  5,
-  0,  0,  0,  0,184,153,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 52, 67,  0,  0,109,196,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 35, 67,  0,  0,109,196,  0,128,145,195,163,  0,  0,  0,180,  0,  0,  0,  0,  0,  0,  0,144,  2,  0,  0,  0,  0,  0,  0,
-162,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,162,  0,  0,  0,  0,  0,  0,  0,144,  2,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  1,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,
-  6,  0,180,  0,145,  2,163,  0,145,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  5,  0,  0,
- 63,  5,  0,  0,167,  1,  0,  0,233,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,
-  0,  0,  4,  0,  4,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,235,251,143,  0,161,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,152,156,167,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 40,155,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+ 56,239,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,216,240,220,  4,  0,  0,  0,  0,152,237,220,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,
+119,101,105,103,104,116,112, 97,105,110,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,
+119,101,105,103,104,116,112, 97,105,110,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 87,101,105,103,104,116, 32, 84,111,111,108,115,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,159,253,143,  0,190,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 69,  1,  0,  0,
- 63,  5,  0,  0,167,  1,  0,  0,233,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,251,  3, 67,  2,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,216,240,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 56,239,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,119,101,105,103,104,116,112, 97,105,110,116, 95,111,112,116,105,
+111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,119,101,105,103,104,116,112, 97,105,110,116, 95,111,112,116,105,
+111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 79,112,116,105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,157,252,143,  0,234,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 11,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,158,167,  5,
-  0,  0,  0,  0, 68, 65, 84, 65,112,  3,  0,  0,  8,158,167,  5,  0,  0,  0,  0,174,  0,  0,  0,  1,  0,  0,  0,190, 35, 30, 61,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 75, 40,139, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,111, 18,  3,187,  0,  0,  0,  0,  0,  0,  0,128,  0,  0,  0,128,  0,  0,  0,128,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,190, 35, 30, 61,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 75, 40,139, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,111, 18,  3,187,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,149, 53,207, 65,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,112,121,107, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,255,255,249,195,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,190, 35, 30, 61,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 75, 40,139, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,111, 18,  3,187,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
+120,242,220,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,136,245,220,  4,  0,  0,  0,  0, 72,218,220,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,128,178, 67,  0,  0, 90,195,  0,  0,  0,  0,  0,  0,  0,  0,227,102, 16, 67, 24, 30, 90,195,  0,  0,  0,  0,
+143,  0,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,215,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,
+  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0,215,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,160,  0,216,  0,143,  0,216,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,159,  0,  0,  0,183,  0,  0,  0,142,  1,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160,  0,216,  0, 12,  0,  6,  0, 34,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,216,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152,140,109,  3,  0,  0,  0,  0, 56,133,193,  4,  0,  0,  0,  0,
+ 56,133,193,  4,  0,  0,  0,  0,232,243,220,  4,  0,  0,  0,  0,232,243,220,  4,  0,  0,  0,  0, 56, 25,193,  4,  0,  0,  0,  0,
+  8,183,149,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+232,243,220,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+152,141,109,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,108, 97,115,116, 95,111,
+112,101,114, 97,116,111,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,108, 97,115,116, 95,111,
+112,101,114, 97,116,111,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79,112,101,114, 97,116,111,114,  0, 32, 77, 97,112,  0,111,100,
+101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,255,144,  0, 16,  0,  0,  0,  0,  0,  0,  0, 39,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,136,245,220,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+248,246,220,  4,  0,  0,  0,  0,120,242,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 52, 67,  0, 96,158,196,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0, 35, 67,  0, 96,158,196,  0,128,142,195,163,  0,  0,  0,180,  0,  0,  0,  0,  0,  0,  0,213,  3,  0,  0,
+  0,  0,  0,  0,162,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,162,  0,  0,  0,  0,  0,  0,  0,213,  3,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  1,  0,  0,  1,  0,  7,  0,
+ 18,  0,  0,  4,  6,  0,180,  0,214,  3,163,  0,214,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 99,  6,  0,  0, 99,  6,  0,  0,183,  0,  0,  0, 99,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  4,  0,  4,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+120,134,109,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,248,246,220,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,136,245,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,207,  3,116, 64,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,207,  3,116, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,207,  3,116, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,149, 53,207, 65,214,211,111, 65,  0,  0,  0,  0,  0,  0,  0,  0,221, 57, 80, 61,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160, 65,  0,  0,  5,  0,251,251,  0,  0, 92, 62, 55, 63, 56,186,224,190,
-237,203,148,190,  3,236,234,190,  1,  0,  0,  0,  0,  0,128, 63,  0,  0,180, 66,  0,  0,180, 66,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 96,  1,  0,  0,200,161,167,  5,  0,  0,  0,  0,175,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  0,  0, 51, 51, 51, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 65,205,204, 76, 62,  2,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
-  1,  0,  7,  0, 24,213,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  3,  0,  0,  0,
-  1,  0,  3,  0,  8,  8,128,  0,  0,  0, 12, 66,  0,  0,128, 63,205,204,204, 61,  0,  0,122, 68,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0, 10,  0,  7,  1,  0,  3,  0,  0,  0,  0,  0,  0,
+160,  0,  0,  0, 99,  6,  0,  0,183,  0,  0,  0, 99,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+196,  5,173,  3, 13,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+120,133,109,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 40,123,186,  4,  0,  0,  0,  0, 88,122,186,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+104,248,220,  4,  0,  0,  0,  0, 68, 65, 84, 65,112,  3,  0,  0,104,248,220,  4,  0,  0,  0,  0,175,  0,  0,  0,  1,  0,  0,  0,
+255,255,139, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,159,152,219, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,142,  6,128,191,  0,  0,128,191,  0,  0,  0,  0,  0,  0,  0,  0, 11,210, 76,190,  0,  0,  0,  0,
+ 68,239,209, 62, 51,177,205,190,184,158, 81, 63,  0,  0,  0,  0, 70,119,105, 63,143, 74, 70, 62, 35, 44,185,190,  0,  0,  0,  0,
+162, 84, 89,188,166, 33,101, 63, 42, 61,228, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 33,210,111,193,  0,  0,128, 63,
+ 68,239,209, 62, 70,119,105, 63,176, 84, 89,188,  0,  0,  0,  0, 52,177,205,190,142, 74, 70, 62,166, 33,101, 63,  0,  0,  0,  0,
+185,158, 81, 63, 35, 44,185,190, 43, 61,228, 62,  0,  0,  0,  0, 62, 95, 68, 65, 51,120,173,192,115,208,213, 64,  0,  0,128, 63,
+177,157,229, 62, 56,113, 48,191,116,169, 81,191,184,158, 81,191,115, 90,127, 63,  0, 24,170, 62,158, 53,185, 62, 35, 44,185, 62,
+143,180,109,188, 99,140,196, 63,218, 72,228,190, 42, 61,228,190,  0,  0,  0,  0,  0,  0,  0,  0, 33,171,108, 65, 33,210,111, 65,
+ 39,240,191, 62,126,116, 85, 63, 96,189, 70,188,  0,  0,186,180, 48,202,111,190,126, 41,231, 61,228,142,  5, 63,  0,  0,224, 51,
+197,112,117,194,178,208,216, 65,221,158,  5,194,231,251,159,192,221, 54,114, 66, 29,247,213,193, 59,221,  3, 66, 25,  4,160, 64,
+ 68,239,209, 62, 51,177,205,190,184,158, 81, 63,  0,  0,  0,  0, 70,119,105, 63,143, 74, 70, 62, 35, 44,185,190,  0,  0,  0,  0,
+162, 84, 89,188,166, 33,101, 63, 42, 61,228, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 33,210,111,193,  0,  0,128, 63,
+177,157,229, 62, 56,113, 48,191,116,169, 81,191,184,158, 81,191,115, 90,127, 63,  0, 24,170, 62,158, 53,185, 62, 35, 44,185, 62,
+143,180,109,188, 99,140,196, 63,218, 72,228,190, 42, 61,228,190,  0,  0,  0,  0,  0,  0,  0,  0, 33,171,108, 65, 33,210,111, 65,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,120,163,167,  5,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,232,149,167,  5,  0,  0,  0,  0,168, 94,167,  5,  0,  0,  0,  0,200, 93,167,  5,  0,  0,  0,  0,184, 97,167,  5,
-  0,  0,  0,  0, 72, 97,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67,  1,  0,  0,141,  1,  0,  0,
-233,  3,  0,  0,  3,  3, 68,  1, 93,  2,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72,167,167,  5,
-  0,  0,  0,  0, 72,167,167,  5,  0,  0,  0,  0,104,164,167,  5,  0,  0,  0,  0,216,165,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  1,  0,  0,104,164,167,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,216,165,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,128,244, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,162, 67,  0,  0,  0,  0,
-  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 67,  1,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,128,161, 67,  0,  0,200, 65,  0,128,161, 67,
-  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0, 68,  1, 26,  0, 68,  1,
- 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67,  1,  0,  0,141,  1,  0,  0,
-166,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,  1, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  1,  0,  0,216,165,167,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,104,164,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,128,141, 67,  0,  0,244,194,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,153, 67,  0, 64, 12,196,
-  0,  0,  0,  0, 51,  1,  0,  0, 68,  1,  0,  0, 18,  0,  0,  0, 66,  2,  0,  0,  0,  0,  0,  0, 50,  1,  0,  0,  0,  0,  0,  0,
- 17,  0,  0,  0,  0,  0,  0,  0, 50,  1,  0,  0, 18,  0,  0,  0, 66,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63, 18,  6,  0,  0,  2,  0,  3,  3,  0,  0, 12,  4,  6,  0, 68,  1, 67,  2, 51,  1,
- 49,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67,  1,  0,  0,167,  1,  0,  0,
-233,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,  1, 67,  2,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 24,  1,  0,  0, 72,167,167,  5,  0,  0,  0,  0,184,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120, 82,137,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0, 68, 65, 84, 65, 16,  0,  0,  0,120, 82,137,  5,  0,  0,  0,  0,238,  0,  0,  0,
-  1,  0,  0,  0, 14,  0,  0,  0, 14,  0,  0,  0,168,168,167,  5,  0,  0,  0,  0, 68, 65, 84, 65,224,  0,  0,  0,168,168,167,  5,
-  0,  0,  0,  0,237,  0,  0,  0, 14,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,120,184,168,  5,  0,  0,  0,  0, 19,  0,  0,  0,
-  1,  0,  1,  0,120,184,168,  5,  0,  0,  0,  0, 20,  0,  0,  0,  1,  0,  1,  0,120,184,168,  5,  0,  0,  0,  0, 21,  0,  1,  0,
-  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0, 72,210,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  1,  0,184,219,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,184, 17,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  1,  0,248,232,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  8,255,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  1,  0, 88,226,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,232,205,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  1,  0, 24,213,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,216,204,168,  5,  0,  0,  0,  0, 21,  0,  0,  0,
-  1,  0,  1,  0,120,184,168,  5,  0,  0,  0,  0, 83, 78,  0,  0,  8,  1,  0,  0,104,170,167,  5,  0,  0,  0,  0,211,  0,  0,  0,
-  1,  0,  0,  0, 72,242,167,  5,  0,  0,  0,  0,184, 90,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 83, 82, 77,111,116,105,111,110, 32, 84,114, 97, 99,107,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,184,171,167,  5,
-  0,  0,  0,  0,104,177,167,  5,  0,  0,  0,  0,216,177,167,  5,  0,  0,  0,  0, 72,185,167,  5,  0,  0,  0,  0,184,185,167,  5,
-  0,  0,  0,  0,248,225,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,184,168,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,184,171,167,  5,  0,  0,  0,  0,212,  0,  0,  0,
-  1,  0,  0,  0, 40,172,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 40,172,167,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,152,172,167,  5,
-  0,  0,  0,  0,184,171,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 98,  4,  0,  0,  0,  0, 68, 65, 84, 65,
- 32,  0,  0,  0,152,172,167,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,  8,173,167,  5,  0,  0,  0,  0, 40,172,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  6, 98,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,  8,173,167,  5,
-  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,120,173,167,  5,  0,  0,  0,  0,152,172,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 62,  6,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,120,173,167,  5,  0,  0,  0,  0,212,  0,  0,  0,
-  1,  0,  0,  0,232,173,167,  5,  0,  0,  0,  0,  8,173,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64,  4,
-  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,232,173,167,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0, 88,174,167,  5,
-  0,  0,  0,  0,120,173,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  6, 64,  4,  0,  0,  0,  0, 68, 65, 84, 65,
- 32,  0,  0,  0, 88,174,167,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,200,174,167,  5,  0,  0,  0,  0,232,173,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88,  5,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,200,174,167,  5,
-  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0, 56,175,167,  5,  0,  0,  0,  0, 88,174,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 88,  5, 64,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 56,175,167,  5,  0,  0,  0,  0,212,  0,  0,  0,
-  1,  0,  0,  0,168,175,167,  5,  0,  0,  0,  0,200,174,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,108,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,168,175,167,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0, 24,176,167,  5,
-  0,  0,  0,  0, 56,175,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,108,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 32,  0,  0,  0, 24,176,167,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,136,176,167,  5,  0,  0,  0,  0,168,175,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,  3,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,136,176,167,  5,
-  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,248,176,167,  5,  0,  0,  0,  0, 24,176,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 62,  6,120,  3,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,248,176,167,  5,  0,  0,  0,  0,212,  0,  0,  0,
-  1,  0,  0,  0,104,177,167,  5,  0,  0,  0,  0,136,176,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,208,  2,120,  3,
-  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,104,177,167,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,248,176,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,208,  2, 64,  4,  1,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,216,177,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 72,178,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 40,172,167,  5,  0,  0,  0,  0,152,172,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0, 72,178,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,184,178,167,  5,  0,  0,  0,  0,216,177,167,  5,
-  0,  0,  0,  0, 40,172,167,  5,  0,  0,  0,  0,120,173,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,184,178,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 40,179,167,  5,  0,  0,  0,  0, 72,178,167,  5,
-  0,  0,  0,  0,152,172,167,  5,  0,  0,  0,  0,232,173,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0, 40,179,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,152,179,167,  5,  0,  0,  0,  0,184,178,167,  5,
-  0,  0,  0,  0,120,173,167,  5,  0,  0,  0,  0,232,173,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,152,179,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  8,180,167,  5,  0,  0,  0,  0, 40,179,167,  5,
-  0,  0,  0,  0,184,171,167,  5,  0,  0,  0,  0,  8,173,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,  8,180,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,120,180,167,  5,  0,  0,  0,  0,152,179,167,  5,
-  0,  0,  0,  0,184,171,167,  5,  0,  0,  0,  0, 56,175,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,120,180,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,232,180,167,  5,  0,  0,  0,  0,  8,180,167,  5,
-  0,  0,  0,  0,  8,173,167,  5,  0,  0,  0,  0,168,175,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,232,180,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 88,181,167,  5,  0,  0,  0,  0,120,180,167,  5,
-  0,  0,  0,  0, 56,175,167,  5,  0,  0,  0,  0,168,175,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0, 88,181,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,200,181,167,  5,  0,  0,  0,  0,232,180,167,  5,
-  0,  0,  0,  0, 56,175,167,  5,  0,  0,  0,  0, 24,176,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,200,181,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 56,182,167,  5,  0,  0,  0,  0, 88,181,167,  5,
-  0,  0,  0,  0,120,173,167,  5,  0,  0,  0,  0, 24,176,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0, 56,182,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,168,182,167,  5,  0,  0,  0,  0,200,181,167,  5,
-  0,  0,  0,  0,232,173,167,  5,  0,  0,  0,  0,136,176,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,168,182,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 24,183,167,  5,  0,  0,  0,  0, 56,182,167,  5,
-  0,  0,  0,  0,168,175,167,  5,  0,  0,  0,  0,136,176,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0, 24,183,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,136,183,167,  5,  0,  0,  0,  0,168,182,167,  5,
-  0,  0,  0,  0, 24,176,167,  5,  0,  0,  0,  0,136,176,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,136,183,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,248,183,167,  5,  0,  0,  0,  0, 24,183,167,  5,
-  0,  0,  0,  0, 24,176,167,  5,  0,  0,  0,  0,248,176,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,248,183,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,104,184,167,  5,  0,  0,  0,  0,136,183,167,  5,
-  0,  0,  0,  0,136,176,167,  5,  0,  0,  0,  0,248,176,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,104,184,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,216,184,167,  5,  0,  0,  0,  0,248,183,167,  5,
-  0,  0,  0,  0,120,173,167,  5,  0,  0,  0,  0,104,177,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,216,184,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 72,185,167,  5,  0,  0,  0,  0,104,184,167,  5,
-  0,  0,  0,  0,232,173,167,  5,  0,  0,  0,  0,104,177,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0, 72,185,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,184,167,  5,
-  0,  0,  0,  0,248,176,167,  5,  0,  0,  0,  0,104,177,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
-160,  0,  0,  0,184,185,167,  5,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,136,189,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,120,173,167,  5,  0,  0,  0,  0, 40,172,167,  5,  0,  0,  0,  0,152,172,167,  5,  0,  0,  0,  0,232,173,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0, 65,  4,  0,  0, 98,  4,  0,  0,  7,  7, 63,  6,
- 34,  0,  1,  0,  0,  0,  0,  0,  7,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,184,241,167,  5,  0,  0,  0,  0,184,241,167,  5,
-  0,  0,  0,  0,168,186,167,  5,  0,  0,  0,  0, 24,188,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,168,186,167,  5,
-  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0, 24,188,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,163, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,224,199, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 62,  6,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,192,199, 68,  0,  0,200, 65,  0,192,199, 68,  0,  0,200, 65,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0, 63,  6, 26,  0, 63,  6, 26,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0, 65,  4,  0,  0, 90,  4,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  6, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0, 26,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 24,188,167,  5,
-  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,168,186,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,192,239, 68,  0,  0,  0,  0,  0,  0,200, 65,  0,  0,  0,  0,  0,192,197, 68,  0,  0,128, 64,  0,  0, 64, 65, 46,  6,  0,  0,
- 63,  6,  0,  0,  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,
- 45,  6,  0,  0,  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  2,  0,  0,  0,  1,  0,  3,  3,  2,  0,  0,  4, 10,  0, 63,  6,  8,  0, 46,  6,  8,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0, 91,  4,  0,  0, 98,  4,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  6,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,136,189,167,  5,
-  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,120,194,167,  5,  0,  0,  0,  0,184,185,167,  5,  0,  0,  0,  0,184,171,167,  5,
-  0,  0,  0,  0, 56,175,167,  5,  0,  0,  0,  0,168,175,167,  5,  0,  0,  0,  0,  8,173,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0,  0,  0,  0,  0,107,  0,  0,  0, 15, 15, 63,  6,108,  0,  1,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88,193,167,  5,  0,  0,  0,  0, 88,193,167,  5,  0,  0,  0,  0,120,190,167,  5,
-  0,  0,  0,  0,232,191,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,120,190,167,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,232,191,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,224,199, 68,  0,  0,  0,  0,
-  0,  0,208, 65,  0,  0,  0,  0,  0,224,199, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0,  0,  0,  0,  0,
- 25,  0,  0,  0,  0,192,199, 68,  0,  0,200, 65,  0,192,199, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  2,  0,  3,  3,  4,  0, 12,  0, 10,  0, 63,  6, 26,  0, 63,  6, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 63,  6, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,232,191,167,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,190,167,  5,  0,  0,  0,  0,  0,  0, 64,192,  0,  0,126, 67,  0,  0,  0,  0,
-  0,  0, 72, 66, 88,218,103,194, 40,147,141, 67,  0,  0,  0,  0,  0,  0, 72, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0, 18,  0,  0,  0,
- 81,  0,  0,  0,  0,  0,128, 63,  0,  0, 72, 66,  0,124,146, 72,  0,  0, 72, 66,205,204,204, 61,  0,  0, 32, 65, 72,  0,  0,  0,
-  0,  0,  0,  2,  4,  0,  0,  4,  8,  0, 63,  6, 82,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0, 26,  0,  0,  0,107,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 63,  6, 82,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,208,  0,  0,  0, 88,193,167,  5,  0,  0,  0,  0,191,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+152, 67,178, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152, 67,178, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,152, 67,178, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+ 92, 62, 55, 63, 56,186,224,190,237,203,148,190,  3,236,234,190, 33,210,111, 65,196, 18,107, 65,  0,  0,  0,  0,  0,  0,  0,  0,
+146, 97,162, 58,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  0,  0,255,255,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63, 30, 33, 12, 66, 85,152,137, 66,113, 27,126, 66,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 96,  1,  0,  0, 40,252,220,  4,  0,  0,  0,  0,
+176,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0, 51, 51, 51, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 65,205,204, 76, 62,  2,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  0,  0,  1,  0,  7,  0,216,120,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  1,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,120,194,167,  5,
-  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 56,210,167,  5,  0,  0,  0,  0,136,189,167,  5,  0,  0,  0,  0, 56,175,167,  5,
-  0,  0,  0,  0, 24,176,167,  5,  0,  0,  0,  0,136,176,167,  5,  0,  0,  0,  0,168,175,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0,109,  0,  0,  0,119,  3,  0,  0, 20, 20, 63,  6, 11,  3,  1,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,184,208,167,  5,  0,  0,  0,  0,184,208,167,  5,  0,  0,  0,  0,104,195,167,  5,
-  0,  0,  0,  0, 72,207,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,104,195,167,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,216,196,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 19, 68,  0,  0,  0,  0,
-  0,  0,208, 65,  0,  0,  0,  0,  0,224,199, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0,  0,  0,  0,  0,
- 25,  0,  0,  0,  0,192,199, 68,  0,  0,200, 65,  0,192,199, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  2,  0,  3,  3,  4,  0,  0,  0, 10,  0, 63,  6, 26,  0, 63,  6, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0,109,  0,  0,  0,134,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 63,  6, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,
+  3,  0,  0,  0,  1,  0,  3,  0,  8, 24,128,  0,  0,  0, 12, 66,  0,  0,128, 63,205,204,204, 61,  0,  0,122, 68,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0, 10,  0,  7,  1,  0,  3,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 83, 78,  0,  0,  8,  1,  0,  0,104,254,220,  4,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,
+ 24, 78,221,  4,  0,  0,  0,  0,184,100,201,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 83, 82, 71, 97,109,101, 32, 76,111,103,105, 99,  0, 46, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,184,255,220,  4,  0,  0,  0,  0,
+104,  5,221,  4,  0,  0,  0,  0,216,  5,221,  4,  0,  0,  0,  0,152, 14,221,  4,  0,  0,  0,  0,  8, 15,221,  4,  0,  0,  0,  0,
+ 40, 71,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,184,255,220,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+ 40,  0,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0, 40,  0,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,152,  0,221,  4,  0,  0,  0,  0,
+184,255,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  5,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
+152,  0,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  8,  1,221,  4,  0,  0,  0,  0, 40,  0,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  5,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,  8,  1,221,  4,  0,  0,  0,  0,
+213,  0,  0,  0,  1,  0,  0,  0,120,  1,221,  4,  0,  0,  0,  0,152,  0,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+126,  7,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,120,  1,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+232,  1,221,  4,  0,  0,  0,  0,  8,  1,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,234,  3,  1,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0,232,  1,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 88,  2,221,  4,  0,  0,  0,  0,
+120,  1,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,234,  3,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
+ 88,  2,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,200,  2,221,  4,  0,  0,  0,  0,232,  1,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140,  1,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,200,  2,221,  4,  0,  0,  0,  0,
+213,  0,  0,  0,  1,  0,  0,  0, 56,  3,221,  4,  0,  0,  0,  0, 88,  2,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 32,  6,140,  1,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 56,  3,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+168,  3,221,  4,  0,  0,  0,  0,200,  2,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,  6,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0,168,  3,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 24,  4,221,  4,  0,  0,  0,  0,
+ 56,  3,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,140,  1,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
+ 24,  4,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,136,  4,221,  4,  0,  0,  0,  0,168,  3,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 64,  5,140,  1,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,136,  4,221,  4,  0,  0,  0,  0,
+213,  0,  0,  0,  1,  0,  0,  0,248,  4,221,  4,  0,  0,  0,  0, 24,  4,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 64,  5,234,  3,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,248,  4,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+104,  5,221,  4,  0,  0,  0,  0,136,  4,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,  1,140,  1,  0,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0,104,  5,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+248,  4,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,  1,234,  3,  1,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+216,  5,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 72,  6,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 40,  0,221,  4,  0,  0,  0,  0,152,  0,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+ 72,  6,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,184,  6,221,  4,  0,  0,  0,  0,216,  5,221,  4,  0,  0,  0,  0,
+ 40,  0,221,  4,  0,  0,  0,  0,120,  1,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+184,  6,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 40,  7,221,  4,  0,  0,  0,  0, 72,  6,221,  4,  0,  0,  0,  0,
+152,  0,221,  4,  0,  0,  0,  0,232,  1,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+ 40,  7,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,152,  7,221,  4,  0,  0,  0,  0,184,  6,221,  4,  0,  0,  0,  0,
+120,  1,221,  4,  0,  0,  0,  0,232,  1,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+152,  7,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  8,  8,221,  4,  0,  0,  0,  0, 40,  7,221,  4,  0,  0,  0,  0,
+120,  1,221,  4,  0,  0,  0,  0, 88,  2,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+  8,  8,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,120,  8,221,  4,  0,  0,  0,  0,152,  7,221,  4,  0,  0,  0,  0,
+ 88,  2,221,  4,  0,  0,  0,  0,200,  2,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+120,  8,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,232,  8,221,  4,  0,  0,  0,  0,  8,  8,221,  4,  0,  0,  0,  0,
+  8,  1,221,  4,  0,  0,  0,  0, 56,  3,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+232,  8,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 88,  9,221,  4,  0,  0,  0,  0,120,  8,221,  4,  0,  0,  0,  0,
+200,  2,221,  4,  0,  0,  0,  0, 56,  3,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+ 88,  9,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,200,  9,221,  4,  0,  0,  0,  0,232,  8,221,  4,  0,  0,  0,  0,
+184,255,220,  4,  0,  0,  0,  0, 88,  2,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+200,  9,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 56, 10,221,  4,  0,  0,  0,  0, 88,  9,221,  4,  0,  0,  0,  0,
+184,255,220,  4,  0,  0,  0,  0, 56,  3,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+ 56, 10,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,168, 10,221,  4,  0,  0,  0,  0,200,  9,221,  4,  0,  0,  0,  0,
+232,  1,221,  4,  0,  0,  0,  0,168,  3,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+168, 10,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 24, 11,221,  4,  0,  0,  0,  0, 56, 10,221,  4,  0,  0,  0,  0,
+  8,  1,221,  4,  0,  0,  0,  0,168,  3,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+ 24, 11,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,136, 11,221,  4,  0,  0,  0,  0,168, 10,221,  4,  0,  0,  0,  0,
+200,  2,221,  4,  0,  0,  0,  0,168,  3,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+136, 11,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,248, 11,221,  4,  0,  0,  0,  0, 24, 11,221,  4,  0,  0,  0,  0,
+ 24,  4,221,  4,  0,  0,  0,  0,136,  4,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+248, 11,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,104, 12,221,  4,  0,  0,  0,  0,136, 11,221,  4,  0,  0,  0,  0,
+232,  1,221,  4,  0,  0,  0,  0,136,  4,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+104, 12,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,216, 12,221,  4,  0,  0,  0,  0,248, 11,221,  4,  0,  0,  0,  0,
+168,  3,221,  4,  0,  0,  0,  0, 24,  4,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+216, 12,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 72, 13,221,  4,  0,  0,  0,  0,104, 12,221,  4,  0,  0,  0,  0,
+ 88,  2,221,  4,  0,  0,  0,  0,248,  4,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+ 72, 13,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,184, 13,221,  4,  0,  0,  0,  0,216, 12,221,  4,  0,  0,  0,  0,
+ 24,  4,221,  4,  0,  0,  0,  0,248,  4,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+184, 13,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 40, 14,221,  4,  0,  0,  0,  0, 72, 13,221,  4,  0,  0,  0,  0,
+120,  1,221,  4,  0,  0,  0,  0,104,  5,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+ 40, 14,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,152, 14,221,  4,  0,  0,  0,  0,184, 13,221,  4,  0,  0,  0,  0,
+136,  4,221,  4,  0,  0,  0,  0,104,  5,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+152, 14,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40, 14,221,  4,  0,  0,  0,  0,
+248,  4,221,  4,  0,  0,  0,  0,104,  5,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,
+  8, 15,221,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,216, 18,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+120,  1,221,  4,  0,  0,  0,  0, 40,  0,221,  4,  0,  0,  0,  0,152,  0,221,  4,  0,  0,  0,  0,232,  1,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,235,  3,  0,  0,  5,  4,  0,  0,  7,  7,127,  7, 27,  0,  1,  0,
+  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136, 77,221,  4,  0,  0,  0,  0,136, 77,221,  4,  0,  0,  0,  0,
+248, 15,221,  4,  0,  0,  0,  0,104, 17,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,248, 15,221,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,104, 17,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,148, 68,
+  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,224,239, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,
+  0,  0,  0,  0, 25,  0,  0,  0,  0,192,239, 68,  0,  0,200, 65,  0,192,239, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,127,  7, 26,  0,127,  7, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,235,  3,  0,  0,  4,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,127,  7, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,104, 17,221,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248, 15,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,109, 69,
+  0,  0,128,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,238, 68,  0,  0,  0,  0,  0,  0,  0, 64,112,  7,  0,  0,129,  7,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  2,  0,  0,  0,  1,  0,  3,  3,  2,  0,  0,  4, 10,  0,129,  7,  2,  0,112,  7,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  5,  4,  0,  0,  5,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,216,196,167,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0, 72,198,167,  5,  0,  0,  0,  0,104,195,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,178, 67,  0, 64, 30,196,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0, 64, 30,196,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,
-120,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0,
-120,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,
-  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,160,  0,121,  2,143,  0,121,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,159,  0,  0,  0,255,  0,  0,  0,119,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,160,  0,121,  2,  0,  0,  5,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,216, 18,221,  4,  0,  0,  0,  0,
+216,  0,  0,  0,  1,  0,  0,  0,104, 43,221,  4,  0,  0,  0,  0,  8, 15,221,  4,  0,  0,  0,  0, 56,  3,221,  4,  0,  0,  0,  0,
+200,  2,221,  4,  0,  0,  0,  0,168,  3,221,  4,  0,  0,  0,  0,  8,  1,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 33,  6,  0,  0,126,  7,  0,  0,  0,  0,  0,  0,139,  1,  0,  0,  4,  4, 94,  1,140,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 40, 42,221,  4,  0,  0,  0,  0, 40, 42,221,  4,  0,  0,  0,  0,200, 19,221,  4,  0,  0,  0,  0,
+ 56, 21,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,200, 19,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+ 56, 21,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,148, 67,  0,  0,  0,  0,  0,  0,208, 65,
+  0,  0,  0,  0,  0,  0,175, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 93,  1,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,
+  0,128,174, 67,  0,  0,200, 65,  0,128,174, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,
+  4,  0, 12,  0, 10,  0, 94,  1, 26,  0, 94,  1, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 33,  6,  0,  0,126,  7,  0,  0,114,  1,  0,  0,139,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 94,  1, 26,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 72,198,167,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0, 88,201,167,  5,  0,  0,  0,  0,216,196,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,178, 67,  0,  0,240,194,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0,  0,240,194,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,
-119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0,
-119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,
-  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,160,  0,120,  0,143,  0,120,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,159,  0,  0,  0,135,  0,  0,  0,254,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,160,  0,120,  0,  0,  0,  6,  0, 34,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,184,199,167,  5,
-  0,  0,  0,  0,184,199,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,184,199,167,  5,  0,  0,  0,  0,214,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 67, 76, 73, 80, 95, 80, 84, 95,108, 97,115,116, 95,111,112,101,114, 97,116,111,114,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 56, 21,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,200, 19,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,174, 67,  0,  0, 61,196,  0,  0,  0,  0,
+  0,  0,  0,  0,255,127,166, 67,255,255,184,195,  0,  0,  0,  0, 77,  1,  0,  0, 94,  1,  0,  0,  0,  0,  0,  0,113,  1,  0,  0,
+  0,  0,  0,  0, 78,  1,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0, 76,  1,  0,  0,  0,  0,  0,  0,113,  1,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  1,  0,  0,  1,  0,  7,  0,
+ 18,  0,  0,  4,  6,  0, 94,  1,114,  1, 77,  1,114,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 33,  6,  0,  0,126,  7,  0,  0,  0,  0,  0,  0,113,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 94,  1,114,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,168, 22,221,  4,  0,  0,  0,  0,
+136, 40,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,168, 22,221,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+ 72, 24,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 66, 85, 84, 84, 79, 78, 83, 95, 80, 84, 95, 99,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 67, 76, 73, 80, 95, 80, 84, 95,108, 97,115,116, 95,111,112,101,114, 97,116,111,114,  0,  0,  0,  0,  0,  0,  0,
+ 66, 85, 84, 84, 79, 78, 83, 95, 80, 84, 95, 99,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 78,101,119, 32, 83, 99,114,101,101,110,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 67,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,216,255,143,  0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,220,255, 76,  1, 36,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  1,  0,  0, 88,201,167,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,104,204,167,  5,  0,  0,  0,  0, 72,198,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,128,178, 67,  0, 64, 60,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0, 64, 60,196,
-  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,240,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0,240,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,160,  0,241,  2,143,  0,
-241,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,159,  5,  0,  0, 62,  6,  0,  0,135,  0,  0,  0,
-119,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160,  0,241,  2,  0,  0,  4,  0,  4,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200,202,167,  5,  0,  0,  0,  0,200,202,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 88,  1,  0,  0,200,202,167,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67, 76, 73, 80, 95, 80, 84, 95,103,112,101,110,
- 99,105,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67, 76, 73, 80, 95, 80, 84, 95,103,112,101,110,
- 99,105,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 71,114,101, 97,115,101, 32, 80,101,110, 99,105,
-108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,232,255,143,  0,  0,  0,  0,  0,  0,  0,
-  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+ 72, 24,221,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,232, 25,221,  4,  0,  0,  0,  0,168, 22,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,114,101,110,100,101,114,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,114,101,110,100,101,114,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,104,204,167,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,216,205,167,  5,  0,  0,  0,  0, 88,201,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0, 64,110,196,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 67,  0,192,105,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,159,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,159,  0,  0,  0, 18,  0,  0,  0,
-184,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  8,  0,  0,  0,
-  2,  0,  3,  3,  0,  0,  2,  0,  6,  0,160,  0,185,  3,160,  0,167,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,160,  0,  0,  0,160,  0,  0,  0,135,  0,  0,  0,119,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  2,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82,101,110,100,101,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,135,255, 76,  1, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,216,205,167,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0, 72,207,167,  5,  0,  0,  0,  0,104,204,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,122, 67,  0,  0, 32,193,
-  0,  0, 32, 65,  0,  0,  0,  0,  0,  0,122, 67,  0,  0, 32,193,  0,  0, 32, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128,  0,  0,  0,128,  0,  0,124,146, 72,255,255,127,127,  0,  0,  0,  0,  0,  0,  0,  0,105,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,232, 25,221,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+136, 27,221,  4,  0,  0,  0,  0, 72, 24,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,108, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,160,  0,  0,  0,160,  0,  0,  0,135,  0,  0,  0,119,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  7,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,108, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 76, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 72,207,167,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,205,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128,255,  0,  0,128,127,  0,  0,128,255,  0,  0,128,127,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,  4,  0,  0,  0,  0,  0,  0,
-241,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,215, 35, 60,  0,  0,122, 68,  0,  0,  0,  0,
-  1,  0,  3,  0,  0,  0,  0,  4, 10,  0,255,  4,241,  2,255,  4,241,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,160,  0,  0,  0,158,  5,  0,  0,135,  0,  0,  0,119,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,255,  4,241,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,111,255, 76,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,184,208,167,  5,  0,  0,  0,  0,197,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  1,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 17,200,  0,  0,  0,  0,  0,  0, 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+136, 27,221,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 40, 29,221,  4,  0,  0,  0,  0,232, 25,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,100,105,109,101,110,115,
+105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,100,105,109,101,110,115,
+105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,105,109,101,110,115,105,111,110,115,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140,254, 76,  1,203,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 40, 29,221,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+200, 30,221,  4,  0,  0,  0,  0,136, 27,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 97,110,116,105, 97,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
-160,  0,  0,  0, 56,210,167,  5,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,248,225,167,  5,  0,  0,  0,  0,120,194,167,  5,
-  0,  0,  0,  0,248,176,167,  5,  0,  0,  0,  0,104,177,167,  5,  0,  0,  0,  0,232,173,167,  5,  0,  0,  0,  0,136,176,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,209,  2,  0,  0, 62,  6,  0,  0,121,  3,  0,  0, 63,  4,  0,  0, 20, 20,110,  3,
-199,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,224,167,  5,  0,  0,  0,  0,120,224,167,  5,
-  0,  0,  0,  0, 40,211,167,  5,  0,  0,  0,  0,  8,223,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 40,211,167,  5,
-  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,152,212,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,212, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,128, 91, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-109,  3,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0, 64, 91, 68,  0,  0,200, 65,  0, 64, 91, 68,  0,  0,200, 65,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0,  0,  0, 10,  0,110,  3, 26,  0,110,  3, 26,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,209,  2,  0,  0, 62,  6,  0,  0,121,  3,  0,  0,146,  3,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,110,  3, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,152,212,167,  5,
-  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  8,214,167,  5,  0,  0,  0,  0, 40,211,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,128,178, 67,  0,  0, 84,194,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0,  0, 84,194,  0,  0,  0,  0,143,  0,  0,  0,
-160,  0,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-142,  0,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,160,  0, 53,  0,143,  0, 53,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,209,  2,  0,  0,209,  2,  0,  0,147,  3,  0,  0, 63,  4,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  5,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,  8,214,167,  5,
-  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0, 24,217,167,  5,  0,  0,  0,  0,152,212,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,128,178, 67,  0,  0,240,194,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0,  0,240,194,  0,  0,  0,  0,143,  0,  0,  0,
-160,  0,  0,  0,  0,  0,  0,  0,119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-142,  0,  0,  0,  0,  0,  0,  0,119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,160,  0,120,  0,143,  0,120,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,209,  2,  0,  0,209,  2,  0,  0,147,  3,  0,  0, 63,  4,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  6,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,120,215,167,  5,  0,  0,  0,  0,120,215,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,120,215,167,  5,
-  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67, 76, 73, 80, 95, 80, 84, 95,108, 97,115,116, 95,111,112,101,114, 97,116,111,
-114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67, 76, 73, 80, 95, 80, 84, 95,108, 97,115,116, 95,111,112,101,114, 97,116,111,
-114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 78,101,119, 32, 83, 99,114,101,101,110,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,255,143,  0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 24,217,167,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0, 40,220,167,  5,
-  0,  0,  0,  0,  8,214,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,178, 67,  0,  0, 45,195,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 15, 67,  0,  0, 45,195,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,172,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0,172,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  0,
-  6,  0,160,  0,173,  0,143,  0,173,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,209,  2,  0,  0,
-209,  2,  0,  0,147,  3,  0,  0, 63,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,
-  0,  0,  4,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136,218,167,  5,  0,  0,  0,  0,136,218,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,136,218,167,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67, 76, 73, 80,
- 95, 80, 84, 95,103,112,101,110, 99,105,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67, 76, 73, 80,
- 95, 80, 84, 95,103,112,101,110, 99,105,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 71,114,101, 97,
-115,101, 32, 80,101,110, 99,105,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,232,255,
-143,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 40,220,167,  5,
-  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,152,221,167,  5,  0,  0,  0,  0, 24,217,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 15, 67,  0,  0, 45,195,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 67,  0,  0, 27,195,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,159,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,
-159,  0,  0,  0, 18,  0,  0,  0,172,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  8,  4,  0,  0,  2,  0,  3,  3,  0,  0,  2,  4,  6,  0,160,  0,173,  0,160,  0,155,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,209,  2,  0,  0,112,  3,  0,  0,147,  3,  0,  0, 63,  4,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160,  0,173,  0,  0,  0,  2,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,152,221,167,  5,
-  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  8,223,167,  5,  0,  0,  0,  0, 40,220,167,  5,  0,  0,  0,  0,  0,  0, 32,193,
-  0,128, 91, 68,171,170,132,194,  0,  0,  0,  0,  0,  0, 32,193,  0,128, 91, 68,  0,  0, 27,195,  0,  0,  0,  0,189,  2,  0,  0,
-206,  2,  0,  0, 18,  0,  0,  0,172,  0,  0,  0,  0,  0,  0,  0,188,  2,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,
-188,  2,  0,  0, 18,  0,  0,  0,172,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,124,146, 72,255,255,127,127, 10,215, 35, 60,
-  0,  0, 72, 66, 74,  0,  0,  0,  0,  0,  0,  2, 16,  0,  2,  4,  4,  0,206,  2,173,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,113,  3,  0,  0, 62,  6,  0,  0,147,  3,  0,  0, 63,  4,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,206,  2,173,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,  8,223,167,  5,
-  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152,221,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,255,  0,  0,128,127,  0,  0,128,255,  0,  0,128,127,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 46,  2,  0,  0,  0,  0,  0,  0,173,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,215, 35, 60,
-  0,  0,122, 68,  0,  0,  0,  0,  1,  0,  3,  0,  0,  0,  0,  0, 10,  0, 46,  2,173,  0, 46,  2,173,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 97,110,116,105, 97,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 65,110,116,105, 45, 65,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 58,254, 76,  1, 58,  0, 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,120,224,167,  5,
-  0,  0,  0,  0,197,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 17,200,  0,  0,  0,  0,  2,  0, 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+200, 30,221,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,104, 32,221,  4,  0,  0,  0,  0, 40, 29,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,109,111,116,105,111,110,
+ 95, 98,108,117,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,109,111,116,105,111,110,
+ 95, 98,108,117,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 97,109,112,108,101,100, 32, 77,111,116,105,111,110, 32, 66,
+108,117,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 34,254, 76,  1,  0,  0, 20,  0,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,104, 32,221,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+  8, 34,221,  4,  0,  0,  0,  0,200, 30,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,104, 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,104, 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,248,225,167,  5,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 56,210,167,  5,  0,  0,  0,  0, 24,176,167,  5,  0,  0,  0,  0,120,173,167,  5,  0,  0,  0,  0,104,177,167,  5,
-  0,  0,  0,  0,248,176,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,207,  2,  0,  0,121,  3,  0,  0,
- 63,  4,  0,  0, 20, 20,208,  2,199,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 56,240,167,  5,
-  0,  0,  0,  0, 56,240,167,  5,  0,  0,  0,  0,232,226,167,  5,  0,  0,  0,  0,200,238,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  1,  0,  0,232,226,167,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0, 88,228,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,212, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0, 52, 68,  0,  0,  0,  0,
-  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,207,  2,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,192, 51, 68,  0,  0,200, 65,  0,192, 51, 68,
-  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0,  0,  0, 10,  0,208,  2, 26,  0,208,  2,
- 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,207,  2,  0,  0,121,  3,  0,  0,
-146,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,208,  2, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,
+ 83,104, 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 10,254, 76,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  1,  0,  0, 88,228,167,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,200,229,167,  5,  0,  0,  0,  0,232,226,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,128,178, 67,  0,  0, 84,194,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0,  0, 84,194,
-  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,160,  0, 53,  0,143,  0,
- 53,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,147,  3,  0,  0,
- 63,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  5,  0,  0,  0,  1,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+  8, 34,221,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,168, 35,221,  4,  0,  0,  0,  0,104, 32,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,101,114,102,111,114,
+109, 97,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,101,114,102,111,114,
+109, 97,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,101,114,102,111,114,109, 97,110, 99,101,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  1,  0,  0,200,229,167,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,216,232,167,  5,  0,  0,  0,  0, 88,228,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,128,178, 67,  0,  0,240,194,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0,  0,240,194,
-  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0,119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,160,  0,120,  0,143,  0,
-120,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,147,  3,  0,  0,
- 63,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  6,  0,  0,  0,  1,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 56,231,167,  5,  0,  0,  0,  0, 56,231,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 88,  1,  0,  0, 56,231,167,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67, 76, 73, 80, 95, 80, 84, 95,108, 97,115,116,
- 95,111,112,101,114, 97,116,111,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67, 76, 73, 80, 95, 80, 84, 95,108, 97,115,116,
- 95,111,112,101,114, 97,116,111,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 78,101,119, 32, 83, 99,114,101,101,110,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,255,143,  0, 16,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,216,232,167,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,232,235,167,  5,  0,  0,  0,  0,200,229,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,178, 67,  0,  0, 45,195,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0,  0, 45,195,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,
-172,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0,
-172,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,
-  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,160,  0,173,  0,143,  0,173,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,147,  3,  0,  0, 63,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  4,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72,234,167,  5,
-  0,  0,  0,  0, 72,234,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 72,234,167,  5,  0,  0,  0,  0,214,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 67, 76, 73, 80, 95, 80, 84, 95,103,112,101,110, 99,105,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,242,253, 76,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 67, 76, 73, 80, 95, 80, 84, 95,103,112,101,110, 99,105,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 71,114,101, 97,115,101, 32, 80,101,110, 99,105,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,168, 35,221,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+ 72, 37,221,  4,  0,  0,  0,  0,  8, 34,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,111,115,116, 95,112,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,232,255,143,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,111,115,116, 95,112,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 80,111,115,116, 32, 80,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  1,  0,  0,232,235,167,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0, 88,237,167,  5,  0,  0,  0,  0,216,232,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0, 64,110,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 67,  0,192,105,196,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,159,  0,  0,  0,  0,  0,  0,  0,
- 17,  0,  0,  0,  0,  0,  0,  0,159,  0,  0,  0, 18,  0,  0,  0,184,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  8,  0,  0,  0,  2,  0,  3,  3,  0,  0,  2,  0,  6,  0,160,  0,185,  3,160,  0,
-167,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,147,  3,  0,  0,
- 63,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  2,  0,  0,  0,  1,  0,
+  0,  0,218,253, 76,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  1,  0,  0, 88,237,167,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,200,238,167,  5,  0,  0,  0,  0,232,235,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,122, 67,  0,  0, 32,193,  0,  0, 32, 65,  0,  0,  0,  0,  0,  0,122, 67,  0,  0, 32,193,
-  0,  0, 32, 65,  0,  0,  0,  0, 17,  0,  0,  0, 18,  0,  0,  0,172,  0,  0,  0, 18,  0,  0,  0,207,  2,  0,  0,  0,  0,  0,  0,
- 17,  0,  0,  0, 18,  0,  0,  0,207,  2,  0,  0, 18,  0,  0,  0,172,  0,  0,  0,  0,  0,128,  0,  0,  0,128,  0,  0,124,146, 72,
-255,255,127,127,  0,  0,  0,  0,  0,  0,  0,  0,105,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,208,  2,173,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,207,  2,  0,  0,147,  3,  0,  0,
- 63,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,208,  2,173,  0,  0,  0,  7,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+ 72, 37,221,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,232, 38,221,  4,  0,  0,  0,  0,168, 35,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,116, 97,109,112,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,116, 97,109,112,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  1,  0,  0,200,238,167,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88,237,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,255,  0,  0,128,127,  0,  0,128,255,
-  0,  0,128,127,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,144,  1,  0,  0,  0,  0,  0,  0,173,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 10,215, 35, 60,  0,  0,122, 68,  0,  0,  0,  0,  1,  0,  3,  0,  0,  0,  0,  0, 10,  0,144,  1,173,  0,144,  1,
-173,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83,116, 97,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,194,253, 76,  1,  0,  0, 20,  0,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 56,  1,  0,  0, 56,240,167,  5,  0,  0,  0,  0,197,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-120,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 17,200,  0,  0,  0,  0,  1,  0, 20,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 78,  0,  0,  8,  1,  0,  0, 72,242,167,  5,  0,  0,  0,  0,211,  0,  0,  0,
-  1,  0,  0,  0,  8, 65,168,  5,  0,  0,  0,  0,104,170,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 83, 82, 83, 99,114,105,112,116,105,110,103,  0,103, 46, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152,243,167,  5,
-  0,  0,  0,  0, 72,249,167,  5,  0,  0,  0,  0,184,249,167,  5,  0,  0,  0,  0,232,  2,168,  5,  0,  0,  0,  0, 88,  3,168,  5,
-  0,  0,  0,  0,184, 57,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,184,168,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,152,243,167,  5,  0,  0,  0,  0,212,  0,  0,  0,
-  1,  0,  0,  0,  8,244,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,  8,244,167,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,120,244,167,  5,
-  0,  0,  0,  0,152,243,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  5,  4,  0,  0,  0,  0, 68, 65, 84, 65,
- 32,  0,  0,  0,120,244,167,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,232,244,167,  5,  0,  0,  0,  0,  8,244,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  5,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,232,244,167,  5,
-  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0, 88,245,167,  5,  0,  0,  0,  0,120,244,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,126,  7,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 88,245,167,  5,  0,  0,  0,  0,212,  0,  0,  0,
-  1,  0,  0,  0,200,245,167,  5,  0,  0,  0,  0,232,244,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,168,  3,
-  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,200,245,167,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0, 56,246,167,  5,
-  0,  0,  0,  0, 88,245,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,168,  3,  0,  0,  0,  0, 68, 65, 84, 65,
- 32,  0,  0,  0, 56,246,167,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,168,246,167,  5,  0,  0,  0,  0,200,245,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  5,168,  3,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,168,246,167,  5,
-  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0, 24,247,167,  5,  0,  0,  0,  0, 56,246,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,240,  5,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 24,247,167,  5,  0,  0,  0,  0,212,  0,  0,  0,
-  1,  0,  0,  0,136,247,167,  5,  0,  0,  0,  0,168,246,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,104,  1,
-  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,136,247,167,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,248,247,167,  5,
-  0,  0,  0,  0, 24,247,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  5,104,  1,  1,  0,  0,  0, 68, 65, 84, 65,
- 32,  0,  0,  0,248,247,167,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,104,248,167,  5,  0,  0,  0,  0,136,247,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248,  2,104,  1,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,104,248,167,  5,
-  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,216,248,167,  5,  0,  0,  0,  0,248,247,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,240,  5,236,  2,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,216,248,167,  5,  0,  0,  0,  0,212,  0,  0,  0,
-  1,  0,  0,  0, 72,249,167,  5,  0,  0,  0,  0,104,248,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,236,  2,
-  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 72,249,167,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,216,248,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248,  2,168,  3,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,184,249,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 40,250,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  8,244,167,  5,  0,  0,  0,  0,120,244,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0, 40,250,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,152,250,167,  5,  0,  0,  0,  0,184,249,167,  5,
-  0,  0,  0,  0,  8,244,167,  5,  0,  0,  0,  0, 88,245,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,152,250,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  8,251,167,  5,  0,  0,  0,  0, 40,250,167,  5,
-  0,  0,  0,  0,120,244,167,  5,  0,  0,  0,  0,200,245,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,  8,251,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,120,251,167,  5,  0,  0,  0,  0,152,250,167,  5,
-  0,  0,  0,  0, 88,245,167,  5,  0,  0,  0,  0,200,245,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,120,251,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,232,251,167,  5,  0,  0,  0,  0,  8,251,167,  5,
-  0,  0,  0,  0,200,245,167,  5,  0,  0,  0,  0, 56,246,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,232,251,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 88,252,167,  5,  0,  0,  0,  0,120,251,167,  5,
-  0,  0,  0,  0,232,244,167,  5,  0,  0,  0,  0,168,246,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0, 88,252,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,200,252,167,  5,  0,  0,  0,  0,232,251,167,  5,
-  0,  0,  0,  0,152,243,167,  5,  0,  0,  0,  0, 24,247,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,200,252,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 56,253,167,  5,  0,  0,  0,  0, 88,252,167,  5,
-  0,  0,  0,  0, 88,245,167,  5,  0,  0,  0,  0, 24,247,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0, 56,253,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,168,253,167,  5,  0,  0,  0,  0,200,252,167,  5,
-  0,  0,  0,  0, 56,246,167,  5,  0,  0,  0,  0,136,247,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,168,253,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 24,254,167,  5,  0,  0,  0,  0, 56,253,167,  5,
-  0,  0,  0,  0,168,246,167,  5,  0,  0,  0,  0,136,247,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0, 24,254,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,136,254,167,  5,  0,  0,  0,  0,168,253,167,  5,
-  0,  0,  0,  0, 24,247,167,  5,  0,  0,  0,  0,248,247,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,136,254,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,248,254,167,  5,  0,  0,  0,  0, 24,254,167,  5,
-  0,  0,  0,  0,136,247,167,  5,  0,  0,  0,  0,248,247,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,248,254,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,104,255,167,  5,  0,  0,  0,  0,136,254,167,  5,
-  0,  0,  0,  0,168,246,167,  5,  0,  0,  0,  0,104,248,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,104,255,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,216,255,167,  5,  0,  0,  0,  0,248,254,167,  5,
-  0,  0,  0,  0, 56,246,167,  5,  0,  0,  0,  0,104,248,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,216,255,167,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 72,  0,168,  5,  0,  0,  0,  0,104,255,167,  5,
-  0,  0,  0,  0,200,245,167,  5,  0,  0,  0,  0,216,248,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0, 72,  0,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,184,  0,168,  5,  0,  0,  0,  0,216,255,167,  5,
-  0,  0,  0,  0,232,244,167,  5,  0,  0,  0,  0,216,248,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,184,  0,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 40,  1,168,  5,  0,  0,  0,  0, 72,  0,168,  5,
-  0,  0,  0,  0,104,248,167,  5,  0,  0,  0,  0,216,248,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0, 40,  1,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,152,  1,168,  5,  0,  0,  0,  0,184,  0,168,  5,
-  0,  0,  0,  0, 88,245,167,  5,  0,  0,  0,  0, 72,249,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,152,  1,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  8,  2,168,  5,  0,  0,  0,  0, 40,  1,168,  5,
-  0,  0,  0,  0, 56,246,167,  5,  0,  0,  0,  0, 72,249,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,  8,  2,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,120,  2,168,  5,  0,  0,  0,  0,152,  1,168,  5,
-  0,  0,  0,  0,248,247,167,  5,  0,  0,  0,  0, 72,249,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,120,  2,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,232,  2,168,  5,  0,  0,  0,  0,  8,  2,168,  5,
-  0,  0,  0,  0, 24,247,167,  5,  0,  0,  0,  0,136,247,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,232,  2,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,  2,168,  5,
-  0,  0,  0,  0,152,243,167,  5,  0,  0,  0,  0,168,246,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
-160,  0,  0,  0, 88,  3,168,  5,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 40,  7,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 88,245,167,  5,  0,  0,  0,  0,  8,244,167,  5,  0,  0,  0,  0,120,244,167,  5,  0,  0,  0,  0,200,245,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,169,  3,  0,  0,  5,  4,  0,  0,  7,  7,127,  7,
- 93,  0,  1,  0,  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120, 64,168,  5,  0,  0,  0,  0,120, 64,168,  5,
-  0,  0,  0,  0, 72,  4,168,  5,  0,  0,  0,  0,184,  5,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 72,  4,168,  5,
-  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,184,  5,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0, 32,148, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,224,239, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-126,  7,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,192,239, 68,  0,  0,200, 65,  0,192,239, 68,  0,  0,200, 65,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,127,  7, 26,  0,127,  7, 26,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,236,  3,  0,  0,  5,  4,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,127,  7, 26,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,184,  5,168,  5,
-  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72,  4,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,192,239, 68,  0,  0,  0,  0,  0,  0, 28, 66,  0,  0,  0,  0,  0,192,237, 68,  0,  0,  0,  0,  0,  0,134, 66,110,  7,  0,  0,
-127,  7,  0,  0,  0,  0,  0,  0, 66,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,
-109,  7,  0,  0,  0,  0,  0,  0, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  2,  2,  0,  0,  1,  0,  3,  3,  2,  0,  0,  4, 10,  0,127,  7, 67,  0,110,  7, 67,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,169,  3,  0,  0,235,  3,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,127,  7, 67,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0, 40,  7,168,  5,
-  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,184, 31,168,  5,  0,  0,  0,  0, 88,  3,168,  5,  0,  0,  0,  0,168,246,167,  5,
-  0,  0,  0,  0,104,248,167,  5,  0,  0,  0,  0,216,248,167,  5,  0,  0,  0,  0,232,244,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,241,  5,  0,  0,126,  7,  0,  0,  0,  0,  0,  0,235,  2,  0,  0,  4,  4,142,  1,236,  2,  1,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120, 30,168,  5,  0,  0,  0,  0,120, 30,168,  5,  0,  0,  0,  0, 24,  8,168,  5,
-  0,  0,  0,  0,136,  9,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 24,  8,168,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,136,  9,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,148, 67,  0,  0,  0,  0,
-  0,  0,208, 65,  0,  0,  0,  0,  0,  0,199, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,141,  1,  0,  0,  0,  0,  0,  0,
- 25,  0,  0,  0,  0,128,198, 67,  0,  0,200, 65,  0,128,198, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,142,  1, 26,  0,142,  1, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,241,  5,  0,  0,126,  7,  0,  0,210,  2,  0,  0,235,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,142,  1, 26,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,136,  9,168,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,  8,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,198, 67,  0,  0, 61,196,
-  0,  0,  0,  0,  0,  0,  0,  0,254,127,190, 67,254,127, 52,196,  0,  0,  0,  0,125,  1,  0,  0,142,  1,  0,  0,  0,  0,  0,  0,
-209,  2,  0,  0,  0,  0,  0,  0,126,  1,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,124,  1,  0,  0,  0,  0,  0,  0,
-209,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  1,  0,  0,
-  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,142,  1,210,  2,125,  1,210,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,241,  5,  0,  0,126,  7,  0,  0,  0,  0,  0,  0,209,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,142,  1,210,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248, 10,168,  5,
-  0,  0,  0,  0,216, 28,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,248, 10,168,  5,  0,  0,  0,  0,214,  0,  0,  0,
-  1,  0,  0,  0,152, 12,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 66, 85, 84, 84, 79, 78, 83, 95, 80, 84, 95, 99,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 66, 85, 84, 84, 79, 78, 83, 95, 80, 84, 95, 99,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 67,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,220,255,124,  1, 36,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,232, 38,221,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+136, 40,221,  4,  0,  0,  0,  0, 72, 37,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,111,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 88,  1,  0,  0,152, 12,168,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 56, 14,168,  5,  0,  0,  0,  0,248, 10,168,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,114,101,
-110,100,101,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,114,101,
-110,100,101,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82,101,110,100,101,114,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,135,255,124,  1, 61,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,111,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 79,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 56, 14,168,  5,  0,  0,  0,  0,214,  0,  0,  0,
-  1,  0,  0,  0,216, 15,168,  5,  0,  0,  0,  0,152, 12,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,108, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 40,253, 76,  1,130,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,108, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 76, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+136, 40,221,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,232, 38,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 98, 97,107,101,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,111,255,124,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 98, 97,107,101,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 97,107,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 88,  1,  0,  0,216, 15,168,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,120, 17,168,  5,  0,  0,  0,  0, 56, 14,168,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,100,105,
-109,101,110,115,105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,100,105,
-109,101,110,115,105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,105,109,101,110,115,105,111,110,115,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140,254,124,  1,203,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,253, 76,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0, 11,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,120, 17,168,  5,  0,  0,  0,  0,214,  0,  0,  0,
-  1,  0,  0,  0, 24, 19,168,  5,  0,  0,  0,  0,216, 15,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 97,110,116,105, 97,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,248,  0,  0,  0, 40, 42,221,  4,  0,  0,  0,  0,180,  0,  0,  0,  1,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 97,110,116,105, 97,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,
+  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 65,110,116,105, 45, 65,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0, 58,254,124,  1, 58,  0, 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 88,  1,  0,  0, 24, 19,168,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,184, 20,168,  5,  0,  0,  0,  0,120, 17,168,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,109,111,
-116,105,111,110, 95, 98,108,117,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,109,111,
-116,105,111,110, 95, 98,108,117,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 97,109,112,108,101,100, 32, 77,111,116,105,
-111,110, 32, 66,108,117,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 34,254,124,  1,  0,  0, 20,  0,  0,  0,
-  4,  0,  0,  0,  0,  0,  0,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+255, 21,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,
+104, 43,221,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,216, 50,221,  4,  0,  0,  0,  0,216, 18,221,  4,  0,  0,  0,  0,
+184,255,220,  4,  0,  0,  0,  0, 88,  2,221,  4,  0,  0,  0,  0,200,  2,221,  4,  0,  0,  0,  0, 56,  3,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 31,  6,  0,  0,  0,  0,  0,  0,139,  1,  0,  0, 17, 17, 32,  6,140,  1,  1,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72, 50,221,  4,  0,  0,  0,  0, 72, 50,221,  4,  0,  0,  0,  0,
+ 88, 44,221,  4,  0,  0,  0,  0,216, 48,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 88, 44,221,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,200, 45,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 74, 67,
+  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,196, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 31,  6,  0,  0,
+  0,  0,  0,  0, 25,  0,  0,  0,  0,224,195, 68,  0,  0,200, 65,  0,224,195, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0, 32,  6, 26,  0, 32,  6, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 31,  6,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 32,  6, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,184, 20,168,  5,  0,  0,  0,  0,214,  0,  0,  0,
-  1,  0,  0,  0, 88, 22,168,  5,  0,  0,  0,  0, 24, 19,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,104, 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,200, 45,221,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,216, 48,221,  4,  0,  0,  0,  0, 88, 44,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 92, 67,
+  0,  0,185,195,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 75, 67,  0,  0,185,195,  0,  0,  0,  0,203,  0,  0,  0,220,  0,  0,  0,
+  0,  0,  0,  0,113,  1,  0,  0,  0,  0,  0,  0,202,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,202,  0,  0,  0,
+  0,  0,  0,  0,113,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64,
+ 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,220,  0,114,  1,203,  0,114,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,219,  0,  0,  0, 26,  0,  0,  0,139,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,220,  0,114,  1,  0,  0,  4,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,104, 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 56, 47,221,  4,  0,  0,  0,  0, 56, 47,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 56, 47,221,  4,  0,  0,  0,  0,
+215,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 76, 79, 71, 73, 67, 95, 80, 84, 95,112,114,111,112,101,114,116,105,101,115,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 83,104, 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 76, 79, 71, 73, 67, 95, 80, 84, 95,112,114,111,112,101,114,116,105,101,115,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0, 10,254,124,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 80,114,111,112,101,114,116,105,101,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,196,255,203,  0, 36,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 88,  1,  0,  0, 88, 22,168,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,248, 23,168,  5,  0,  0,  0,  0,184, 20,168,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,101,
-114,102,111,114,109, 97,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,101,
-114,102,111,114,109, 97,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,101,114,102,111,114,109, 97,110, 99,101,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,242,253,124,  1,  0,  0,  0,  0,  0,  0,
-  4,  0,  0,  0,  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  1,  0,  0,216, 48,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+200, 45,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160, 68,  0,  0,  0,  0,  0,  0,112, 67,  0, 80, 31,195,  0,234,179, 68,
+224,198,182,194,184,177,165, 67, 51,  5,  0,  0, 68,  5,  0,  0, 18,  0,  0,  0,113,  1,  0,  0,  0,  0,  0,  0, 50,  5,  0,  0,
+  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0, 50,  5,  0,  0, 18,  0,  0,  0,113,  1,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,250, 70,  0,  0,250, 70,  0,  0,  0, 63, 72,225,154, 63, 10,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  4,  0,  0, 68,  5,
+114,  1, 51,  5, 96,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,220,  0,  0,  0, 31,  6,  0,  0,
+ 26,  0,  0,  0,139,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,  5,114,  1,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,248, 23,168,  5,  0,  0,  0,  0,214,  0,  0,  0,
-  1,  0,  0,  0,152, 25,168,  5,  0,  0,  0,  0, 88, 22,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,111,115,116, 95,112,114,111, 99,101,115,115,105,110,103,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,111,115,116, 95,112,114,111, 99,101,115,115,105,110,103,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 80,111,115,116, 32, 80,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 72,  0,  0,  0, 72, 50,221,  4,  0,  0,  0,  0,194,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65,160,  0,  0,  0,216, 50,221,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,152, 57,221,  4,  0,  0,  0,  0,
+104, 43,221,  4,  0,  0,  0,  0, 24,  4,221,  4,  0,  0,  0,  0,136,  4,221,  4,  0,  0,  0,  0,232,  1,221,  4,  0,  0,  0,  0,
+168,  3,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 65,  5,  0,  0,126,  7,  0,  0,141,  1,  0,  0,233,  3,  0,  0,
+  9,  9, 62,  2, 93,  2,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,168, 54,221,  4,  0,  0,  0,  0,
+168, 54,221,  4,  0,  0,  0,  0,200, 51,221,  4,  0,  0,  0,  0, 56, 53,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
+200, 51,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0, 56, 53,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,230, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,128, 15, 68,  0,  0,  0,  0,  0,  0,208, 65,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,218,253,124,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 61,  2,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0, 64, 15, 68,  0,  0,200, 65,  0, 64, 15, 68,  0,  0,200, 65,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0, 62,  2, 26,  0, 62,  2, 26,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 65,  5,  0,  0,126,  7,  0,  0,141,  1,  0,  0,166,  1,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  2, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 88,  1,  0,  0,152, 25,168,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 56, 27,168,  5,  0,  0,  0,  0,248, 23,168,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,116,
- 97,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,116,
- 97,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83,116, 97,109,112,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
+ 56, 53,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200, 51,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,128,181, 67,  0,  0,  0,  0,  0,128,218, 67,  0,  0,  0,  0,131,248,  1, 68,  0,  0,  0,  0, 86, 26,  3, 68,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,194,253,124,  1,  0,  0, 20,  0,  0,  0,
-  4,  0,  0,  0,  0,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 61,  2,  0,  0,  0,  0,  0,  0, 66,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 10,215, 35, 60,  0,  0,122, 68,  0,  0,  0,  0,  1,  0,  3,  0,  0,  0,  0,  4, 10,  0, 62,  2, 67,  2, 62,  2, 67,  2,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 65,  5,  0,  0,126,  7,  0,  0,167,  1,  0,  0,233,  3,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  2, 67,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 56, 27,168,  5,  0,  0,  0,  0,214,  0,  0,  0,
-  1,  0,  0,  0,216, 28,168,  5,  0,  0,  0,  0,152, 25,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,111,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  2,  0,  0,
+168, 54,221,  4,  0,  0,  0,  0,190,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,  4,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,111,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 79,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0, 40,253,124,  1,130,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 88,  1,  0,  0,216, 28,168,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 56, 27,168,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 98, 97,
-107,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 98, 97,
-107,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 97,107,101,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,253,124,  1,  0,  0,  0,  0,  0,  0,
-  4,  0,  0,  0,  0,  0,  0,  0, 11,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,248,  0,  0,  0,120, 30,168,  5,  0,  0,  0,  0,180,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,255, 21,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
-160,  0,  0,  0,184, 31,168,  5,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 72, 45,168,  5,  0,  0,  0,  0, 40,  7,168,  5,
-  0,  0,  0,  0,248,247,167,  5,  0,  0,  0,  0, 72,249,167,  5,  0,  0,  0,  0, 56,246,167,  5,  0,  0,  0,  0,136,247,167,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,249,  2,  0,  0,239,  5,  0,  0,105,  1,  0,  0,167,  3,  0,  0,  1,  1,247,  2,
- 63,  2,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152, 43,168,  5,  0,  0,  0,  0,152, 43,168,  5,
-  0,  0,  0,  0,168, 32,168,  5,  0,  0,  0,  0,104, 38,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,168, 32,168,  5,
-  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0, 24, 34,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0, 64,113, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,192, 61, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-246,  2,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,128, 61, 68,  0,  0,200, 65,  0,128, 61, 68,  0,  0,200, 65,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,247,  2, 26,  0,247,  2, 26,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,249,  2,  0,  0,239,  5,  0,  0,105,  1,  0,  0,130,  1,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,247,  2, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 24, 34,168,  5,
-  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,136, 35,168,  5,  0,  0,  0,  0,168, 32,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 15, 67,  0, 64, 70,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,255,127, 70,196,  0,  0,  0,  0,143,  0,  0,  0,
-160,  0,  0,  0, 18,  0,  0,  0, 43,  3,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,
-142,  0,  0,  0, 18,  0,  0,  0, 43,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0, 64, 10,  0,  0,  0,  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,160,  0, 44,  3,143,  0, 26,  3,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,249,  2,  0,  0,249,  2,  0,  0,131,  1,  0,  0,167,  3,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0, 37,  2,  0,  0,  5,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,136, 35,168,  5,
-  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,248, 36,168,  5,  0,  0,  0,  0, 24, 34,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 16, 67,  0,  0,206,194,  0,  0,  0,  0,  0,  0,  0,  0,231,102, 16, 67,  0,  0,206,194,  0,  0,  0,  0,143,  0,  0,  0,
-160,  0,  0,  0, 18,  0,  0,  0,119,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,
-142,  0,  0,  0, 18,  0,  0,  0,119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0, 64, 10,  0,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,160,  0,120,  0,143,  0,102,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,249,  2,  0,  0,239,  5,  0,  0,131,  1,  0,  0,131,  1,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  6,  0, 34,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,248, 36,168,  5,
-  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,104, 38,168,  5,  0,  0,  0,  0,136, 35,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 35, 67,  0,128,142,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 35, 67,  0,  0, 26,196,  0,  0,  0,  0,163,  0,  0,  0,
-180,  0,  0,  0, 18,  0,  0,  0,121,  2,  0,  0,  0,  0,  0,  0,162,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,
-162,  0,  0,  0, 18,  0,  0,  0,121,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0, 64, 10,  0,  0,  0,  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,180,  0,122,  2,163,  0,104,  2,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,239,  5,  0,  0,239,  5,  0,  0,131,  1,  0,  0,167,  3,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  4,  0,  4,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,104, 38,168,  5,
-  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248, 36,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,152, 57,221,  4,  0,  0,  0,  0,
+216,  0,  0,  0,  1,  0,  0,  0, 40, 71,221,  4,  0,  0,  0,  0,216, 50,221,  4,  0,  0,  0,  0,248,  4,221,  4,  0,  0,  0,  0,
+104,  5,221,  4,  0,  0,  0,  0,136,  4,221,  4,  0,  0,  0,  0, 24,  4,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 69,  1,  0,  0, 63,  5,  0,  0,141,  1,  0,  0,233,  3,  0,  0,  1,  1,251,  3, 93,  2,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,120, 69,221,  4,  0,  0,  0,  0,120, 69,221,  4,  0,  0,  0,  0,136, 58,221,  4,  0,  0,  0,  0,
+ 72, 64,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,136, 58,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+248, 59,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64,113, 68,  0,  0,  0,  0,  0,  0,208, 65,
+  0,  0,  0,  0,  0,192,126, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,250,  3,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,
+  0,128,126, 68,  0,  0,200, 65,  0,128,126, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,
+  4,  0, 12,  0, 10,  0,251,  3, 26,  0,251,  3, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 69,  1,  0,  0, 63,  5,  0,  0,141,  1,  0,  0,166,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+251,  3, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,249,  2,  0,  0,239,  5,  0,  0,131,  1,  0,  0,167,  3,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,247,  2, 37,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,248, 59,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+104, 61,221,  4,  0,  0,  0,  0,136, 58,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0, 64, 70,196,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0, 15, 67,255,127, 70,196,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0, 18,  0,  0,  0, 43,  3,  0,  0,
+  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0, 18,  0,  0,  0, 43,  3,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  0,  0,  0,  1,  0,  7,  0,
+ 18,  0,  0,  0,  6,  0,160,  0, 44,  3,143,  0, 26,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 69,  1,  0,  0, 69,  1,  0,  0,167,  1,  0,  0,233,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0, 67,  2,  0,  0,  5,  0,  3,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216, 39,168,  5,  0,  0,  0,  0, 68, 65, 84, 65,112,  3,  0,  0,216, 39,168,  5,
-  0,  0,  0,  0,174,  0,  0,  0,  1,  0,  0,  0,  0,  0,140, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 74,141,193, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,  1,128,191,  0,  0,128,191,  0,  0,  0,  0,
-  0,  0,  0,  0,225,215,163,188,  0,  0,  0,  0, 68,239,209, 62, 51,177,205,190,184,158, 81, 63,  0,  0,  0,  0, 70,119,105, 63,
-143, 74, 70, 62, 35, 44,185,190,  0,  0,  0,  0,162, 84, 89,188,166, 33,101, 63, 42, 61,228, 62,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,214,211,111,193,  0,  0,128, 63, 69,239,209, 62, 70,119,105, 63,176, 84, 89,188,  0,  0,  0,  0, 53,177,205,190,
-142, 74, 70, 62,166, 33,101, 63,  0,  0,  0,  0,185,158, 81, 63, 35, 44,185,190, 43, 61,228, 62,  0,  0,  0,  0,164, 96, 68, 65,
-111,121,173,192,248,209,213, 64,  0,  0,128, 63,178,157,229, 62, 30,132, 27,191,222,160, 81,191,184,158, 81,191,117, 90,127, 63,
-166,235,149, 62,  9, 46,185, 62, 35, 44,185, 62,145,180,109,188,212, 60,173, 63,129, 63,228,190, 42, 61,228,190,  0,  0,  0,  0,
-  0,  0,  0,  0, 96,132,111, 65,214,211,111, 65,217,236,191, 62, 54,117, 85, 63,224,246, 70,188,  0,160, 32,182,252,  5,136,190,
- 43, 33,  3, 62,235,135, 23, 63,  0,  0, 96, 53,215,104, 25,196,133,132,135, 67, 37,  9,167,195,136,252, 71,194,  3, 54, 25, 68,
-158, 87,135,195,205,209,166, 67,151,254, 71, 66, 68,239,209, 62, 51,177,205,190,184,158, 81, 63,  0,  0,  0,  0, 70,119,105, 63,
-143, 74, 70, 62, 35, 44,185,190,  0,  0,  0,  0,162, 84, 89,188,166, 33,101, 63, 42, 61,228, 62,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,214,211,111,193,  0,  0,128, 63,178,157,229, 62, 30,132, 27,191,222,160, 81,191,184,158, 81,191,117, 90,127, 63,
-166,235,149, 62,  9, 46,185, 62, 35, 44,185, 62,145,180,109,188,212, 60,173, 63,129, 63,228,190, 42, 61,228,190,  0,  0,  0,  0,
-  0,  0,  0,  0, 96,132,111, 65,214,211,111, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,104, 61,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+216, 62,221,  4,  0,  0,  0,  0,248, 59,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16, 67,  0,  0,206,194,  0,  0,  0,  0,
+  0,  0,  0,  0,231,102, 16, 67,  0,  0,206,194,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0, 18,  0,  0,  0,119,  0,  0,  0,
+  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0, 18,  0,  0,  0,119,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  0,  0,  0,  1,  0,  7,  0,
+ 18,  0,  0,  4,  6,  0,160,  0,120,  0,143,  0,102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 69,  1,  0,  0, 63,  5,  0,  0,167,  1,  0,  0,167,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  6,  0, 34,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,216, 62,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+ 72, 64,221,  4,  0,  0,  0,  0,104, 61,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 52, 67,  0,  0,109,196,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0, 35, 67,  0,  0,109,196,  0,128,145,195,163,  0,  0,  0,180,  0,  0,  0,  0,  0,  0,  0,144,  2,  0,  0,
+  0,  0,  0,  0,162,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,162,  0,  0,  0,  0,  0,  0,  0,144,  2,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  1,  0,  0,  1,  0,  7,  0,
+ 18,  0,  0,  4,  6,  0,180,  0,145,  2,163,  0,145,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 63,  5,  0,  0, 63,  5,  0,  0,167,  1,  0,  0,233,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  4,  0,  4,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 72, 64,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,216, 62,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 46, 86, 45, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 46, 86, 45, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 46, 86, 45, 64,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63, 92, 62, 55, 63, 56,186,224,190,237,203,148,190,  3,236,234,190,214,211,111, 65,
-214,211,111, 65,  0,  0,  0,  0,  0,  0,  0,  0,107,227, 29, 59,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  1,  0,  0,255,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
- 30, 33, 12, 66, 86,152,137, 66,116, 27,126, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 96,  1,  0,  0,152, 43,168,  5,  0,  0,  0,  0,175,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0, 51, 51, 51, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 65,
-205,204, 76, 62,  2,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  7,  0, 24,213,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 69,  1,  0,  0, 63,  5,  0,  0,167,  1,  0,  0,233,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+251,  3, 67,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  3,  0,  0,  0,  1,  0,  3,  0,  8,  8,128,  0,  0,  0, 12, 66,  0,  0,128, 63,
- 10,215, 35, 60,  0,  0,250, 67,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 16,  0, 10,  0,  7,  1,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0, 72, 45,168,  5,
-  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 88, 51,168,  5,  0,  0,  0,  0,184, 31,168,  5,  0,  0,  0,  0,152,243,167,  5,
-  0,  0,  0,  0, 24,247,167,  5,  0,  0,  0,  0,136,247,167,  5,  0,  0,  0,  0,168,246,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,239,  5,  0,  0,  0,  0,  0,  0,103,  1,  0,  0, 18, 18,240,  5,104,  1,  1,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136, 49,168,  5,  0,  0,  0,  0,136, 49,168,  5,  0,  0,  0,  0, 56, 46,168,  5,
-  0,  0,  0,  0,168, 47,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 56, 46,168,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,168, 47,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,160, 67,  0,  0,  0,  0,
-  0,  0,208, 65,  0,  0,  0,  0,  0,  0,190, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,239,  5,  0,  0,  0,  0,  0,  0,
- 25,  0,  0,  0,  0,224,189, 68,  0,  0,200, 65,  0,224,189, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,240,  5, 26,  0,240,  5, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,239,  5,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,240,  5, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+184, 65,221,  4,  0,  0,  0,  0, 68, 65, 84, 65,112,  3,  0,  0,184, 65,221,  4,  0,  0,  0,  0,175,  0,  0,  0,  1,  0,  0,  0,
+190, 35, 30, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 75, 40,139, 61,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,111, 18,  3,187,  0,  0,  0,  0,  0,  0,  0,128,  0,  0,  0,128,  0,  0,  0,128,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+190, 35, 30, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 75, 40,139, 61,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,111, 18,  3,187,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+149, 53,207, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,112,121,107, 65,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,255,255,249,195,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+190, 35, 30, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 75, 40,139, 61,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,111, 18,  3,187,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,168, 47,168,  5,  0,  0,  0,  0,216,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 56, 46,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,224,189, 68,  0,  0,  0,  0,
-  0,  0, 51, 67,  0,  0,  0,  0,  0,224,187, 68,  0,  0,  0,  0,  0,  0,167, 67,223,  5,  0,  0,240,  5,  0,  0,  0,  0,  0,  0,
- 77,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,222,  5,  0,  0,  0,  0,  0,  0,
- 77,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  2,  2,  0,  0,
-  1,  0,  3,  3,  2,  0,  0,  4, 10,  0,240,  5, 78,  1,223,  5, 78,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,239,  5,  0,  0, 26,  0,  0,  0,103,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,240,  5, 78,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 24, 49,168,  5,  0,  0,  0,  0,194,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0, 88,220,132,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,  4,  0,  0,  0, 88,220,132,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,136,  1,  0,  0,136, 49,168,  5,  0,  0,  0,  0,195,  0,  0,  0,  1,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 18,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 14,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24, 49,168,  5,  0,  0,  0,  0, 24, 49,168,  5,  0,  0,  0,  0,
- 62, 62, 62, 32,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+207,  3,116, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,207,  3,116, 64,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,207,  3,116, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,149, 53,207, 65,214,211,111, 65,  0,  0,  0,  0,  0,  0,  0,  0,
+221, 57, 80, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160, 65,  0,  0,  5,  0,251,251,  0,  0, 92, 62, 55, 63,
+ 56,186,224,190,237,203,148,190,  3,236,234,190,  1,  0,  0,  0,  0,  0,128, 63,  0,  0,180, 66,  0,  0,180, 66,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 96,  1,  0,  0,120, 69,221,  4,  0,  0,  0,  0,
+176,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0, 51, 51, 51, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 65,205,204, 76, 62,  2,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  0,  0,  1,  0,  7,  0,216,120,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,
+  3,  0,  0,  0,  1,  0,  3,  0,  8,  8,128,  0,  0,  0, 12, 66,  0,  0,128, 63,205,204,204, 61,  0,  0,122, 68,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0, 10,  0,  7,  1,  0,  3,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-112,121,116,104,111,110,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  8,  4,  0,  0,  8,  4,  0,  0, 68, 65, 84, 65,160,  0,  0,  0, 88, 51,168,  5,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
-184, 57,168,  5,  0,  0,  0,  0, 72, 45,168,  5,  0,  0,  0,  0,104,248,167,  5,  0,  0,  0,  0, 56,246,167,  5,  0,  0,  0,  0,
-200,245,167,  5,  0,  0,  0,  0,216,248,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,241,  5,  0,  0,126,  7,  0,  0,
-237,  2,  0,  0,167,  3,  0,  0,  3,  3,142,  1,187,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 40, 55,168,  5,  0,  0,  0,  0, 40, 55,168,  5,  0,  0,  0,  0, 72, 52,168,  5,  0,  0,  0,  0,184, 53,168,  5,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0, 40, 71,221,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,152, 57,221,  4,  0,  0,  0,  0, 88,  2,221,  4,  0,  0,  0,  0,120,  1,221,  4,  0,  0,  0,  0,
+104,  5,221,  4,  0,  0,  0,  0,248,  4,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67,  1,  0,  0,
+141,  1,  0,  0,233,  3,  0,  0,  3,  3, 68,  1, 93,  2,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+248, 74,221,  4,  0,  0,  0,  0,248, 74,221,  4,  0,  0,  0,  0, 24, 72,221,  4,  0,  0,  0,  0,136, 73,221,  4,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 40,  1,  0,  0, 72, 52,168,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,184, 53,168,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,244, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,199, 67,
+ 68, 65, 84, 65, 40,  1,  0,  0, 24, 72,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,136, 73,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,244, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,162, 67,
   0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,141,  1,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,128,198, 67,  0,  0,200, 65,
-  0,128,198, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,142,  1,
- 26,  0,142,  1, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,241,  5,  0,  0,126,  7,  0,  0,
-237,  2,  0,  0,  6,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,142,  1, 26,  0,  0,  0,  1,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67,  1,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,128,161, 67,  0,  0,200, 65,
+  0,128,161, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0, 68,  1,
+ 26,  0, 68,  1, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67,  1,  0,  0,
+141,  1,  0,  0,166,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,  1, 26,  0,  0,  0,  1,  0,
   2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 40,  1,  0,  0,184, 53,168,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 72, 52,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,141, 67,  0,  0,244,194,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,190, 67,
-  0,  0, 15,195,  0,  0,  0,  0,125,  1,  0,  0,142,  1,  0,  0, 18,  0,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,124,  1,  0,  0,
-  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,124,  1,  0,  0, 18,  0,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63, 18,  6,  0,  0,  2,  0,  3,  3,  0,  0, 12,  4,  6,  0,142,  1,
-161,  0,125,  1,143,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,241,  5,  0,  0,126,  7,  0,  0,
-  7,  3,  0,  0,167,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,142,  1,161,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  1,  0,  0,136, 73,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 24, 72,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,141, 67,  0,  0,244,194,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,153, 67,
+  0, 64, 12,196,  0,  0,  0,  0, 51,  1,  0,  0, 68,  1,  0,  0, 18,  0,  0,  0, 66,  2,  0,  0,  0,  0,  0,  0, 50,  1,  0,  0,
+  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0, 50,  1,  0,  0, 18,  0,  0,  0, 66,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63, 18,  6,  0,  0,  2,  0,  3,  3,  0,  0, 12,  4,  6,  0, 68,  1,
+ 67,  2, 51,  1, 49,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67,  1,  0,  0,
+167,  1,  0,  0,233,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,  1, 67,  2,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 24,  1,  0,  0, 40, 55,168,  5,  0,  0,  0,  0,184,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 24,  1,  0,  0,248, 74,221,  4,  0,  0,  0,  0,181,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216, 52,137,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200,241,190,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0, 68, 65, 84, 65, 16,  0,  0,  0,200,241,190,  4,  0,  0,  0,  0,
+238,  0,  0,  0,  1,  0,  0,  0, 14,  0,  0,  0, 14,  0,  0,  0, 88, 76,221,  4,  0,  0,  0,  0, 68, 65, 84, 65,224,  0,  0,  0,
+ 88, 76,221,  4,  0,  0,  0,  0,237,  0,  0,  0, 14,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 19,  0,  0,  0,  1,  0,  1,  0, 40, 92,222,  4,  0,  0,  0,  0, 20,  0,  0,  0,  1,  0,  1,  0, 40, 92,222,  4,  0,  0,  0,  0,
+ 21,  0,  1,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  8,118,222,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  1,  0,136,127,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,168,181,222,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  1,  0,232,140,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,248,162,222,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  1,  0, 56,134,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,168,113,222,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  1,  0,216,120,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,152,112,222,  4,  0,  0,  0,  0,
+ 21,  0,  0,  0,  1,  0,  1,  0, 40, 92,222,  4,  0,  0,  0,  0, 83, 78,  0,  0,  8,  1,  0,  0, 24, 78,221,  4,  0,  0,  0,  0,
+212,  0,  0,  0,  1,  0,  0,  0,248,149,221,  4,  0,  0,  0,  0,104,254,220,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 83, 82, 77,111,116,105,111,110, 32, 84,114, 97, 99,107,105,110,103,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+104, 79,221,  4,  0,  0,  0,  0, 24, 85,221,  4,  0,  0,  0,  0,136, 85,221,  4,  0,  0,  0,  0,248, 92,221,  4,  0,  0,  0,  0,
+104, 93,221,  4,  0,  0,  0,  0,168,133,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 40, 92,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,104, 79,221,  4,  0,  0,  0,  0,
+213,  0,  0,  0,  1,  0,  0,  0,216, 79,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,216, 79,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+ 72, 80,221,  4,  0,  0,  0,  0,104, 79,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 98,  4,  0,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0, 72, 80,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,184, 80,221,  4,  0,  0,  0,  0,
+216, 79,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  6, 98,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
+184, 80,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 40, 81,221,  4,  0,  0,  0,  0, 72, 80,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 40, 81,221,  4,  0,  0,  0,  0,
+213,  0,  0,  0,  1,  0,  0,  0,152, 81,221,  4,  0,  0,  0,  0,184, 80,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 64,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,152, 81,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+  8, 82,221,  4,  0,  0,  0,  0, 40, 81,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  6, 64,  4,  0,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0,  8, 82,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,120, 82,221,  4,  0,  0,  0,  0,
+152, 81,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88,  5,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
+120, 82,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,232, 82,221,  4,  0,  0,  0,  0,  8, 82,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 88,  5, 64,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,232, 82,221,  4,  0,  0,  0,  0,
+213,  0,  0,  0,  1,  0,  0,  0, 88, 83,221,  4,  0,  0,  0,  0,120, 82,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,108,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 88, 83,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+200, 83,221,  4,  0,  0,  0,  0,232, 82,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,108,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0,200, 83,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 56, 84,221,  4,  0,  0,  0,  0,
+ 88, 83,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,  3,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
+ 56, 84,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,168, 84,221,  4,  0,  0,  0,  0,200, 83,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,120,  3,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,168, 84,221,  4,  0,  0,  0,  0,
+213,  0,  0,  0,  1,  0,  0,  0, 24, 85,221,  4,  0,  0,  0,  0, 56, 84,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+208,  2,120,  3,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 24, 85,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,168, 84,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,208,  2, 64,  4,  1,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,136, 85,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,248, 85,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,216, 79,221,  4,  0,  0,  0,  0, 72, 80,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,248, 85,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,104, 86,221,  4,  0,  0,  0,  0,
+136, 85,221,  4,  0,  0,  0,  0,216, 79,221,  4,  0,  0,  0,  0, 40, 81,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,104, 86,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,216, 86,221,  4,  0,  0,  0,  0,
+248, 85,221,  4,  0,  0,  0,  0, 72, 80,221,  4,  0,  0,  0,  0,152, 81,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,216, 86,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 72, 87,221,  4,  0,  0,  0,  0,
+104, 86,221,  4,  0,  0,  0,  0, 40, 81,221,  4,  0,  0,  0,  0,152, 81,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0, 72, 87,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,184, 87,221,  4,  0,  0,  0,  0,
+216, 86,221,  4,  0,  0,  0,  0,104, 79,221,  4,  0,  0,  0,  0,184, 80,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,184, 87,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 40, 88,221,  4,  0,  0,  0,  0,
+ 72, 87,221,  4,  0,  0,  0,  0,104, 79,221,  4,  0,  0,  0,  0,232, 82,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0, 40, 88,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,152, 88,221,  4,  0,  0,  0,  0,
+184, 87,221,  4,  0,  0,  0,  0,184, 80,221,  4,  0,  0,  0,  0, 88, 83,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,152, 88,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  8, 89,221,  4,  0,  0,  0,  0,
+ 40, 88,221,  4,  0,  0,  0,  0,232, 82,221,  4,  0,  0,  0,  0, 88, 83,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,  8, 89,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,120, 89,221,  4,  0,  0,  0,  0,
+152, 88,221,  4,  0,  0,  0,  0,232, 82,221,  4,  0,  0,  0,  0,200, 83,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,120, 89,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,232, 89,221,  4,  0,  0,  0,  0,
+  8, 89,221,  4,  0,  0,  0,  0, 40, 81,221,  4,  0,  0,  0,  0,200, 83,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,232, 89,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 88, 90,221,  4,  0,  0,  0,  0,
+120, 89,221,  4,  0,  0,  0,  0,152, 81,221,  4,  0,  0,  0,  0, 56, 84,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0, 88, 90,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,200, 90,221,  4,  0,  0,  0,  0,
+232, 89,221,  4,  0,  0,  0,  0, 88, 83,221,  4,  0,  0,  0,  0, 56, 84,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,200, 90,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 56, 91,221,  4,  0,  0,  0,  0,
+ 88, 90,221,  4,  0,  0,  0,  0,200, 83,221,  4,  0,  0,  0,  0, 56, 84,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0, 56, 91,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,168, 91,221,  4,  0,  0,  0,  0,
+200, 90,221,  4,  0,  0,  0,  0,200, 83,221,  4,  0,  0,  0,  0,168, 84,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,168, 91,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 24, 92,221,  4,  0,  0,  0,  0,
+ 56, 91,221,  4,  0,  0,  0,  0, 56, 84,221,  4,  0,  0,  0,  0,168, 84,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0, 24, 92,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,136, 92,221,  4,  0,  0,  0,  0,
+168, 91,221,  4,  0,  0,  0,  0, 40, 81,221,  4,  0,  0,  0,  0, 24, 85,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,136, 92,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,248, 92,221,  4,  0,  0,  0,  0,
+ 24, 92,221,  4,  0,  0,  0,  0,152, 81,221,  4,  0,  0,  0,  0, 24, 85,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,248, 92,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+136, 92,221,  4,  0,  0,  0,  0,168, 84,221,  4,  0,  0,  0,  0, 24, 85,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65,160,  0,  0,  0,104, 93,221,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0, 56, 97,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 40, 81,221,  4,  0,  0,  0,  0,216, 79,221,  4,  0,  0,  0,  0, 72, 80,221,  4,  0,  0,  0,  0,
+152, 81,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0, 65,  4,  0,  0, 98,  4,  0,  0,
+  7,  7, 63,  6, 34,  0,  1,  0,  0,  0,  0,  0,  7,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,104,149,221,  4,  0,  0,  0,  0,
+104,149,221,  4,  0,  0,  0,  0, 88, 94,221,  4,  0,  0,  0,  0,200, 95,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
+ 88, 94,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,200, 95,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,163, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,224,199, 68,  0,  0,  0,  0,  0,  0,208, 65,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0, 68, 65, 84, 65, 16,  0,  0,  0,216, 52,137,  5,  0,  0,  0,  0,
-238,  0,  0,  0,  1,  0,  0,  0, 14,  0,  0,  0, 14,  0,  0,  0,136, 56,168,  5,  0,  0,  0,  0, 68, 65, 84, 65,224,  0,  0,  0,
-136, 56,168,  5,  0,  0,  0,  0,237,  0,  0,  0, 14,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,120,184,168,  5,  0,  0,  0,  0,
- 19,  0,  0,  0,  1,  0,  1,  0,120,184,168,  5,  0,  0,  0,  0, 20,  0,  0,  0,  1,  0,  1,  0,120,184,168,  5,  0,  0,  0,  0,
- 21,  0,  1,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0, 72,210,168,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  1,  0,184,219,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,184, 17,169,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  1,  0,248,232,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  8,255,168,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  1,  0, 88,226,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,232,205,168,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  1,  0, 24,213,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,216,204,168,  5,  0,  0,  0,  0,
- 21,  0,  0,  0,  1,  0,  1,  0,120,184,168,  5,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,184, 57,168,  5,  0,  0,  0,  0,
-215,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88, 51,168,  5,  0,  0,  0,  0, 24,247,167,  5,  0,  0,  0,  0,
- 88,245,167,  5,  0,  0,  0,  0, 72,249,167,  5,  0,  0,  0,  0,248,247,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,247,  2,  0,  0,105,  1,  0,  0,167,  3,  0,  0,  9,  9,248,  2, 63,  2,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,136, 61,168,  5,  0,  0,  0,  0,136, 61,168,  5,  0,  0,  0,  0,168, 58,168,  5,  0,  0,  0,  0,
- 24, 60,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,168, 58,168,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,
- 24, 60,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,230, 67,  0,  0,  0,  0,  0,  0,208, 65,
-  0,  0,  0,  0,  0,  0, 62, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,247,  2,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,
-  0,192, 61, 68,  0,  0,200, 65,  0,192, 61, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,
-  4,  0, 12,  0, 10,  0,248,  2, 26,  0,248,  2, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,247,  2,  0,  0,105,  1,  0,  0,130,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-248,  2, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 62,  6,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,192,199, 68,  0,  0,200, 65,  0,192,199, 68,  0,  0,200, 65,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0, 63,  6, 26,  0, 63,  6, 26,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0, 65,  4,  0,  0, 90,  4,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  6, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
+200, 95,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88, 94,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,192,239, 68,  0,  0,  0,  0,  0,  0,200, 65,  0,  0,  0,  0,  0,192,197, 68,  0,  0,128, 64,  0,  0, 64, 65,
+ 46,  6,  0,  0, 63,  6,  0,  0,  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,
+  0,  0,  0,  0, 45,  6,  0,  0,  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  2,  0,  0,  0,  1,  0,  3,  3,  2,  0,  0,  4, 10,  0, 63,  6,  8,  0, 46,  6,  8,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0, 91,  4,  0,  0, 98,  4,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  6,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 24, 60,168,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,168, 58,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,224,189, 68,  0,  0,  0,  0,  0,192, 22, 68,
-248,150, 23, 68,  8, 41,100, 68, 46,224, 62, 67,233, 15,206, 67,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,247,  2,  0,  0,  0,  0,  0,  0, 36,  2,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,215, 35, 60,  0,  0,122, 68,  0,  0,  0,  0,  1,  0,  3,  0,
-  0,  0,  0,  4, 10,  0,248,  2, 37,  2,248,  2, 37,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,247,  2,  0,  0,131,  1,  0,  0,167,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-248,  2, 37,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,
+ 56, 97,221,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0, 40,102,221,  4,  0,  0,  0,  0,104, 93,221,  4,  0,  0,  0,  0,
+104, 79,221,  4,  0,  0,  0,  0,232, 82,221,  4,  0,  0,  0,  0, 88, 83,221,  4,  0,  0,  0,  0,184, 80,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0,  0,  0,  0,  0,107,  0,  0,  0, 15, 15, 63,  6,108,  0,  1,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,101,221,  4,  0,  0,  0,  0,  8,101,221,  4,  0,  0,  0,  0,
+ 40, 98,221,  4,  0,  0,  0,  0,152, 99,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 40, 98,221,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,152, 99,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,224,199, 68,
+  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,224,199, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0,
+  0,  0,  0,  0, 25,  0,  0,  0,  0,192,199, 68,  0,  0,200, 65,  0,192,199, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0, 63,  6, 26,  0, 63,  6, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 63,  6, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,152, 99,221,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40, 98,221,  4,  0,  0,  0,  0,  0,  0, 64,192,  0,  0,126, 67,
+  0,  0,  0,  0,  0,  0, 72, 66, 88,218,103,194, 40,147,141, 67,  0,  0,  0,  0,  0,  0, 72, 66,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0,
+ 18,  0,  0,  0, 81,  0,  0,  0,  0,  0,128, 63,  0,  0, 72, 66,  0,124,146, 72,  0,  0, 72, 66,205,204,204, 61,  0,  0, 32, 65,
+ 72,  0,  0,  0,  0,  0,  0,  2,  4,  0,  0,  4,  8,  0, 63,  6, 82,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0, 26,  0,  0,  0,107,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 63,  6, 82,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,208,  0,  0,  0,  8,101,221,  4,  0,  0,  0,  0,
+185,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  1,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,
+ 40,102,221,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,232,117,221,  4,  0,  0,  0,  0, 56, 97,221,  4,  0,  0,  0,  0,
+232, 82,221,  4,  0,  0,  0,  0,200, 83,221,  4,  0,  0,  0,  0, 56, 84,221,  4,  0,  0,  0,  0, 88, 83,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0,109,  0,  0,  0,119,  3,  0,  0, 20, 20, 63,  6, 11,  3,  1,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,104,116,221,  4,  0,  0,  0,  0,104,116,221,  4,  0,  0,  0,  0,
+ 24,103,221,  4,  0,  0,  0,  0,248,114,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 24,103,221,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,136,104,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 19, 68,
+  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,224,199, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0,
+  0,  0,  0,  0, 25,  0,  0,  0,  0,192,199, 68,  0,  0,200, 65,  0,192,199, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  2,  0,  3,  3,  4,  0,  0,  0, 10,  0, 63,  6, 26,  0, 63,  6, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 62,  6,  0,  0,109,  0,  0,  0,134,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 63,  6, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,136,104,221,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,248,105,221,  4,  0,  0,  0,  0, 24,103,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,178, 67,
+  0, 64, 30,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0, 64, 30,196,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0,
+  0,  0,  0,  0,120,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,
+  0,  0,  0,  0,120,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64,
+ 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,160,  0,121,  2,143,  0,121,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,159,  0,  0,  0,255,  0,  0,  0,119,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,160,  0,121,  2,  0,  0,  5,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,248,105,221,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,  8,109,221,  4,  0,  0,  0,  0,136,104,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,178, 67,
+  0,  0,240,194,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0,  0,240,194,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0,
+  0,  0,  0,  0,119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,
+  0,  0,  0,  0,119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64,
+ 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,160,  0,120,  0,143,  0,120,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,159,  0,  0,  0,135,  0,  0,  0,254,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,160,  0,120,  0,  0,  0,  6,  0, 34,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+104,107,221,  4,  0,  0,  0,  0,104,107,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,104,107,221,  4,  0,  0,  0,  0,
+215,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 67, 76, 73, 80, 95, 80, 84, 95,108, 97,115,116, 95,111,112,101,114, 97,116,111,114,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 67, 76, 73, 80, 95, 80, 84, 95,108, 97,115,116, 95,111,112,101,114, 97,116,111,114,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 78,101,119, 32, 83, 99,114,101,101,110,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,255,143,  0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  1,  0,  0,  8,109,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0, 24,112,221,  4,  0,  0,  0,  0,
+248,105,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,178, 67,  0, 64, 60,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,
+  0, 64, 60,196,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,240,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0,240,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,160,  0,
+241,  2,143,  0,241,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,159,  5,  0,  0, 62,  6,  0,  0,
+135,  0,  0,  0,119,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160,  0,241,  2,  0,  0,  4,  0,
+  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,110,221,  4,  0,  0,  0,  0,120,110,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 88,  1,  0,  0,120,110,221,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67, 76, 73, 80, 95, 80, 84, 95,
+103,112,101,110, 99,105,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67, 76, 73, 80, 95, 80, 84, 95,
+103,112,101,110, 99,105,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 71,114,101, 97,115,101, 32, 80,
+101,110, 99,105,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,232,255,143,  0,  0,  0,
+  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  2,  0,  0,136, 61,168,  5,  0,  0,  0,  0,187,  0,  0,  0,  1,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  9,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 32,  0,  0,  0,  0,  0,  0,  0, 12,  0,  7,  0,  0,  0,  0,  0,  1,  0,  0,  0,  4,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0,205,204,204, 61,231,  1,  0,  0,243,  1,  0,  0,122,  1,  0,  0,124,  1,  0,  0,231,  1,  0,  0,243,  1,  0,  0,
-  4,  0,  0,  0,124,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 24,112,221,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,136,113,221,  4,  0,  0,  0,  0,  8,109,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,
+  0, 64,110,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 67,  0,192,105,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,159,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,159,  0,  0,  0,
+ 18,  0,  0,  0,184,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  8,  0,  0,  0,  2,  0,  3,  3,  0,  0,  2,  0,  6,  0,160,  0,185,  3,160,  0,167,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,160,  0,  0,  0,160,  0,  0,  0,135,  0,  0,  0,119,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  2,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,136,113,221,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,248,114,221,  4,  0,  0,  0,  0, 24,112,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,122, 67,
+  0,  0, 32,193,  0,  0, 32, 65,  0,  0,  0,  0,  0,  0,122, 67,  0,  0, 32,193,  0,  0, 32, 65,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  0,  0,  0,128,  0,  0,124,146, 72,255,255,127,127,  0,  0,  0,  0,  0,  0,  0,  0,
+105,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,160,  0,  0,  0,160,  0,  0,  0,135,  0,  0,  0,119,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  7,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,248,114,221,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136,113,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,255,  0,  0,128,127,  0,  0,128,255,  0,  0,128,127,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,  4,  0,  0,
+  0,  0,  0,  0,241,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,215, 35, 60,  0,  0,122, 68,
+  0,  0,  0,  0,  1,  0,  3,  0,  0,  0,  0,  4, 10,  0,255,  4,241,  2,255,  4,241,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,160,  0,  0,  0,158,  5,  0,  0,135,  0,  0,  0,119,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,255,  4,241,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,104,116,221,  4,  0,  0,  0,  0,
+198,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 17,200,  0,  0,  0,  0,  0,  0, 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65,160,  0,  0,  0,232,117,221,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,168,133,221,  4,  0,  0,  0,  0,
+ 40,102,221,  4,  0,  0,  0,  0,168, 84,221,  4,  0,  0,  0,  0, 24, 85,221,  4,  0,  0,  0,  0,152, 81,221,  4,  0,  0,  0,  0,
+ 56, 84,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,209,  2,  0,  0, 62,  6,  0,  0,121,  3,  0,  0, 63,  4,  0,  0,
+ 20, 20,110,  3,199,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40,132,221,  4,  0,  0,  0,  0,
+ 40,132,221,  4,  0,  0,  0,  0,216,118,221,  4,  0,  0,  0,  0,184,130,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
+216,118,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0, 72,120,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,212, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,128, 91, 68,  0,  0,  0,  0,  0,  0,208, 65,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,109,  3,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0, 64, 91, 68,  0,  0,200, 65,  0, 64, 91, 68,  0,  0,200, 65,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0,  0,  0, 10,  0,110,  3, 26,  0,110,  3, 26,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,209,  2,  0,  0, 62,  6,  0,  0,121,  3,  0,  0,146,  3,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,110,  3, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
+ 72,120,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,184,121,221,  4,  0,  0,  0,  0,216,118,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,128,178, 67,  0,  0, 84,194,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0,  0, 84,194,  0,  0,  0,  0,
+143,  0,  0,  0,160,  0,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,160,  0, 53,  0,143,  0, 53,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,209,  2,  0,  0,209,  2,  0,  0,147,  3,  0,  0, 63,  4,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  5,  0,  0,  0,  1,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
+184,121,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,200,124,221,  4,  0,  0,  0,  0, 72,120,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,128,178, 67,  0,  0,240,194,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0,  0,240,194,  0,  0,  0,  0,
+143,  0,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0,119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,160,  0,120,  0,143,  0,120,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,209,  2,  0,  0,209,  2,  0,  0,147,  3,  0,  0, 63,  4,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  6,  0,  0,  0,  1,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 40,123,221,  4,  0,  0,  0,  0, 40,123,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
+ 40,123,221,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67, 76, 73, 80, 95, 80, 84, 95,108, 97,115,116, 95,111,112,101,
+114, 97,116,111,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67, 76, 73, 80, 95, 80, 84, 95,108, 97,115,116, 95,111,112,101,
+114, 97,116,111,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 78,101,119, 32, 83, 99,114,101,101,110,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,255,143,  0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,200,124,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,
+216,127,221,  4,  0,  0,  0,  0,184,121,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,178, 67,  0,  0, 45,195,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0, 15, 67,  0,  0, 45,195,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,172,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0,172,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0,
+ 18,  0,  0,  0,  6,  0,160,  0,173,  0,143,  0,173,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+209,  2,  0,  0,209,  2,  0,  0,147,  3,  0,  0, 63,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  4,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 56,126,221,  4,  0,  0,  0,  0,
+ 56,126,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 56,126,221,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 67, 76, 73, 80, 95, 80, 84, 95,103,112,101,110, 99,105,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 67, 76, 73, 80, 95, 80, 84, 95,103,112,101,110, 99,105,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 71,114,101, 97,115,101, 32, 80,101,110, 99,105,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,232,255,143,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 83, 78,  0,  0,  8,  1,  0,  0,  8, 65,168,  5,  0,  0,  0,  0,211,  0,  0,  0,  1,  0,  0,  0, 40,136,168,  5,  0,  0,  0,  0,
- 72,242,167,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 82, 85, 86, 32, 69,100,105,
-116,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88, 66,168,  5,  0,  0,  0,  0,104, 69,168,  5,  0,  0,  0,  0,
-216, 69,168,  5,  0,  0,  0,  0, 56, 74,168,  5,  0,  0,  0,  0,168, 74,168,  5,  0,  0,  0,  0,200,118,168,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 32,  0,  0,  0, 88, 66,168,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,200, 66,168,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
-200, 66,168,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0, 56, 67,168,  5,  0,  0,  0,  0, 88, 66,168,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  5,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 56, 67,168,  5,  0,  0,  0,  0,
-212,  0,  0,  0,  1,  0,  0,  0,168, 67,168,  5,  0,  0,  0,  0,200, 66,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-126,  7,  5,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,168, 67,168,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,
- 24, 68,168,  5,  0,  0,  0,  0, 56, 67,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 32,  0,  0,  0, 24, 68,168,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,136, 68,168,  5,  0,  0,  0,  0,
-168, 67,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,234,  3,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
-136, 68,168,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,248, 68,168,  5,  0,  0,  0,  0, 24, 68,168,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,126,  7,234,  3,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,248, 68,168,  5,  0,  0,  0,  0,
-212,  0,  0,  0,  1,  0,  0,  0,104, 69,168,  5,  0,  0,  0,  0,136, 68,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-200,  3,234,  3,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,104, 69,168,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,248, 68,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200,  3,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 40,  0,  0,  0,216, 69,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 72, 70,168,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,200, 66,168,  5,  0,  0,  0,  0, 56, 67,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 40,  0,  0,  0, 72, 70,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,184, 70,168,  5,  0,  0,  0,  0,
-216, 69,168,  5,  0,  0,  0,  0,200, 66,168,  5,  0,  0,  0,  0, 24, 68,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 40,  0,  0,  0,184, 70,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 40, 71,168,  5,  0,  0,  0,  0,
- 72, 70,168,  5,  0,  0,  0,  0, 56, 67,168,  5,  0,  0,  0,  0,136, 68,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 40,  0,  0,  0, 40, 71,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,152, 71,168,  5,  0,  0,  0,  0,
-184, 70,168,  5,  0,  0,  0,  0, 24, 68,168,  5,  0,  0,  0,  0,136, 68,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 40,  0,  0,  0,152, 71,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  8, 72,168,  5,  0,  0,  0,  0,
- 40, 71,168,  5,  0,  0,  0,  0, 24, 68,168,  5,  0,  0,  0,  0,248, 68,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 40,  0,  0,  0,  8, 72,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,120, 72,168,  5,  0,  0,  0,  0,
-152, 71,168,  5,  0,  0,  0,  0, 88, 66,168,  5,  0,  0,  0,  0,104, 69,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 40,  0,  0,  0,120, 72,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,232, 72,168,  5,  0,  0,  0,  0,
-  8, 72,168,  5,  0,  0,  0,  0, 88, 66,168,  5,  0,  0,  0,  0, 24, 68,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 40,  0,  0,  0,232, 72,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 88, 73,168,  5,  0,  0,  0,  0,
-120, 72,168,  5,  0,  0,  0,  0,248, 68,168,  5,  0,  0,  0,  0,104, 69,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 40,  0,  0,  0, 88, 73,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,200, 73,168,  5,  0,  0,  0,  0,
-232, 72,168,  5,  0,  0,  0,  0,136, 68,168,  5,  0,  0,  0,  0,248, 68,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 40,  0,  0,  0,200, 73,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 56, 74,168,  5,  0,  0,  0,  0,
- 88, 73,168,  5,  0,  0,  0,  0,168, 67,168,  5,  0,  0,  0,  0,104, 69,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 40,  0,  0,  0, 56, 74,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-200, 73,168,  5,  0,  0,  0,  0,168, 67,168,  5,  0,  0,  0,  0,136, 68,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65,160,  0,  0,  0,168, 74,168,  5,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,120, 78,168,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 24, 68,168,  5,  0,  0,  0,  0,200, 66,168,  5,  0,  0,  0,  0, 56, 67,168,  5,  0,  0,  0,  0,
-136, 68,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,235,  3,  0,  0,  5,  4,  0,  0,
-  7,  7,127,  7, 27,  0,  1,  0,  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152,135,168,  5,  0,  0,  0,  0,
-152,135,168,  5,  0,  0,  0,  0,152, 75,168,  5,  0,  0,  0,  0,  8, 77,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
-152, 75,168,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  8, 77,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+216,127,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0, 72,129,221,  4,  0,  0,  0,  0,200,124,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0, 15, 67,  0,  0, 45,195,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 67,  0,  0, 27,195,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,159,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,
+  0,  0,  0,  0,159,  0,  0,  0, 18,  0,  0,  0,172,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  8,  4,  0,  0,  2,  0,  3,  3,  0,  0,  2,  4,  6,  0,160,  0,173,  0,160,  0,155,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,209,  2,  0,  0,112,  3,  0,  0,147,  3,  0,  0, 63,  4,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160,  0,173,  0,  0,  0,  2,  0,  3,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
+ 72,129,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,184,130,221,  4,  0,  0,  0,  0,216,127,221,  4,  0,  0,  0,  0,
+  0,  0, 32,193,  0,128, 91, 68,171,170,132,194,  0,  0,  0,  0,  0,  0, 32,193,  0,128, 91, 68,  0,  0, 27,195,  0,  0,  0,  0,
+189,  2,  0,  0,206,  2,  0,  0, 18,  0,  0,  0,172,  0,  0,  0,  0,  0,  0,  0,188,  2,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,
+  0,  0,  0,  0,188,  2,  0,  0, 18,  0,  0,  0,172,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,124,146, 72,255,255,127,127,
+ 10,215, 35, 60,  0,  0, 72, 66, 74,  0,  0,  0,  0,  0,  0,  2, 16,  0,  2,  4,  4,  0,206,  2,173,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,113,  3,  0,  0, 62,  6,  0,  0,147,  3,  0,  0, 63,  4,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,206,  2,173,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
+184,130,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72,129,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,255,  0,  0,128,127,  0,  0,128,255,  0,  0,128,127,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 46,  2,  0,  0,  0,  0,  0,  0,173,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 10,215, 35, 60,  0,  0,122, 68,  0,  0,  0,  0,  1,  0,  3,  0,  0,  0,  0,  0, 10,  0, 46,  2,173,  0, 46,  2,173,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,
+ 40,132,221,  4,  0,  0,  0,  0,198,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 17,200,  0,  0,  0,  0,  2,  0, 20,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,168,133,221,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,232,117,221,  4,  0,  0,  0,  0,200, 83,221,  4,  0,  0,  0,  0, 40, 81,221,  4,  0,  0,  0,  0,
+ 24, 85,221,  4,  0,  0,  0,  0,168, 84,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,207,  2,  0,  0,
+121,  3,  0,  0, 63,  4,  0,  0, 20, 20,208,  2,199,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+232,147,221,  4,  0,  0,  0,  0,232,147,221,  4,  0,  0,  0,  0,152,134,221,  4,  0,  0,  0,  0,120,146,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  1,  0,  0,152,134,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,  8,136,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,212, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0, 52, 68,
+  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,207,  2,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,192, 51, 68,  0,  0,200, 65,
+  0,192, 51, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0,  0,  0, 10,  0,208,  2,
+ 26,  0,208,  2, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,207,  2,  0,  0,
+121,  3,  0,  0,146,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,208,  2, 26,  0,  0,  0,  1,  0,
+  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  1,  0,  0,  8,136,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,120,137,221,  4,  0,  0,  0,  0,
+152,134,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,178, 67,  0,  0, 84,194,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,
+  0,  0, 84,194,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 52,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,160,  0,
+ 53,  0,143,  0, 53,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+147,  3,  0,  0, 63,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  5,  0,
+  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  1,  0,  0,120,137,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,136,140,221,  4,  0,  0,  0,  0,
+  8,136,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,178, 67,  0,  0,240,194,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,
+  0,  0,240,194,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0,119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,160,  0,
+120,  0,143,  0,120,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+147,  3,  0,  0, 63,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  6,  0,
+  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,232,138,221,  4,  0,  0,  0,  0,232,138,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 88,  1,  0,  0,232,138,221,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67, 76, 73, 80, 95, 80, 84, 95,
+108, 97,115,116, 95,111,112,101,114, 97,116,111,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67, 76, 73, 80, 95, 80, 84, 95,
+108, 97,115,116, 95,111,112,101,114, 97,116,111,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 78,101,119, 32, 83, 99,114,101,
+101,110,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,255,143,  0, 16,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,136,140,221,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,152,143,221,  4,  0,  0,  0,  0,120,137,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,178, 67,
+  0,  0, 45,195,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0,  0, 45,195,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0,
+  0,  0,  0,  0,172,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,
+  0,  0,  0,  0,172,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64,
+ 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,160,  0,173,  0,143,  0,173,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,147,  3,  0,  0, 63,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  4,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+248,141,221,  4,  0,  0,  0,  0,248,141,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,248,141,221,  4,  0,  0,  0,  0,
+215,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 67, 76, 73, 80, 95, 80, 84, 95,103,112,101,110, 99,105,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 67, 76, 73, 80, 95, 80, 84, 95,103,112,101,110, 99,105,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 71,114,101, 97,115,101, 32, 80,101,110, 99,105,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,232,255,143,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  1,  0,  0,152,143,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,  8,145,221,  4,  0,  0,  0,  0,
+136,140,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0, 64,110,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 67,
+  0,192,105,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,159,  0,  0,  0,
+  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,159,  0,  0,  0, 18,  0,  0,  0,184,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  8,  0,  0,  0,  2,  0,  3,  3,  0,  0,  2,  0,  6,  0,160,  0,
+185,  3,160,  0,167,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+147,  3,  0,  0, 63,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  2,  0,
+  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  1,  0,  0,  8,145,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,120,146,221,  4,  0,  0,  0,  0,
+152,143,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,122, 67,  0,  0, 32,193,  0,  0, 32, 65,  0,  0,  0,  0,  0,  0,122, 67,
+  0,  0, 32,193,  0,  0, 32, 65,  0,  0,  0,  0, 17,  0,  0,  0, 18,  0,  0,  0,172,  0,  0,  0, 18,  0,  0,  0,207,  2,  0,  0,
+  0,  0,  0,  0, 17,  0,  0,  0, 18,  0,  0,  0,207,  2,  0,  0, 18,  0,  0,  0,172,  0,  0,  0,  0,  0,128,  0,  0,  0,128,  0,
+  0,124,146, 72,255,255,127,127,  0,  0,  0,  0,  0,  0,  0,  0,105,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,208,  2,
+173,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,207,  2,  0,  0,
+147,  3,  0,  0, 63,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,208,  2,173,  0,  0,  0,  7,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  1,  0,  0,120,146,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  8,145,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,255,  0,  0,128,127,
+  0,  0,128,255,  0,  0,128,127,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,144,  1,  0,  0,  0,  0,  0,  0,173,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 10,215, 35, 60,  0,  0,122, 68,  0,  0,  0,  0,  1,  0,  3,  0,  0,  0,  0,  0, 10,  0,144,  1,
+173,  0,144,  1,173,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,
+  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 56,  1,  0,  0,232,147,221,  4,  0,  0,  0,  0,198,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 20,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,120,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 17,200,  0,  0,  0,  0,  1,  0,
+ 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 78,  0,  0,  8,  1,  0,  0,248,149,221,  4,  0,  0,  0,  0,
+212,  0,  0,  0,  1,  0,  0,  0,184,228,221,  4,  0,  0,  0,  0, 24, 78,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 83, 82, 83, 99,114,105,112,116,105,110,103,  0,103, 46, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 72,151,221,  4,  0,  0,  0,  0,248,156,221,  4,  0,  0,  0,  0,104,157,221,  4,  0,  0,  0,  0,152,166,221,  4,  0,  0,  0,  0,
+  8,167,221,  4,  0,  0,  0,  0,104,221,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 40, 92,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 72,151,221,  4,  0,  0,  0,  0,
+213,  0,  0,  0,  1,  0,  0,  0,184,151,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,184,151,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+ 40,152,221,  4,  0,  0,  0,  0, 72,151,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  5,  4,  0,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0, 40,152,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,152,152,221,  4,  0,  0,  0,  0,
+184,151,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  5,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
+152,152,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  8,153,221,  4,  0,  0,  0,  0, 40,152,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,  8,153,221,  4,  0,  0,  0,  0,
+213,  0,  0,  0,  1,  0,  0,  0,120,153,221,  4,  0,  0,  0,  0,152,152,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,168,  3,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,120,153,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+232,153,221,  4,  0,  0,  0,  0,  8,153,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,168,  3,  0,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0,232,153,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 88,154,221,  4,  0,  0,  0,  0,
+120,153,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  5,168,  3,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
+ 88,154,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,200,154,221,  4,  0,  0,  0,  0,232,153,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,240,  5,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,200,154,221,  4,  0,  0,  0,  0,
+213,  0,  0,  0,  1,  0,  0,  0, 56,155,221,  4,  0,  0,  0,  0, 88,154,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,104,  1,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 56,155,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+168,155,221,  4,  0,  0,  0,  0,200,154,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  5,104,  1,  1,  0,  0,  0,
+ 68, 65, 84, 65, 32,  0,  0,  0,168,155,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 24,156,221,  4,  0,  0,  0,  0,
+ 56,155,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248,  2,104,  1,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
+ 24,156,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,136,156,221,  4,  0,  0,  0,  0,168,155,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,240,  5,236,  2,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,136,156,221,  4,  0,  0,  0,  0,
+213,  0,  0,  0,  1,  0,  0,  0,248,156,221,  4,  0,  0,  0,  0, 24,156,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+126,  7,236,  2,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,248,156,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,136,156,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248,  2,168,  3,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,104,157,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,216,157,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,184,151,221,  4,  0,  0,  0,  0, 40,152,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,216,157,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 72,158,221,  4,  0,  0,  0,  0,
+104,157,221,  4,  0,  0,  0,  0,184,151,221,  4,  0,  0,  0,  0,  8,153,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0, 72,158,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,184,158,221,  4,  0,  0,  0,  0,
+216,157,221,  4,  0,  0,  0,  0, 40,152,221,  4,  0,  0,  0,  0,120,153,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,184,158,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 40,159,221,  4,  0,  0,  0,  0,
+ 72,158,221,  4,  0,  0,  0,  0,  8,153,221,  4,  0,  0,  0,  0,120,153,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0, 40,159,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,152,159,221,  4,  0,  0,  0,  0,
+184,158,221,  4,  0,  0,  0,  0,120,153,221,  4,  0,  0,  0,  0,232,153,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,152,159,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  8,160,221,  4,  0,  0,  0,  0,
+ 40,159,221,  4,  0,  0,  0,  0,152,152,221,  4,  0,  0,  0,  0, 88,154,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,  8,160,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,120,160,221,  4,  0,  0,  0,  0,
+152,159,221,  4,  0,  0,  0,  0, 72,151,221,  4,  0,  0,  0,  0,200,154,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,120,160,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,232,160,221,  4,  0,  0,  0,  0,
+  8,160,221,  4,  0,  0,  0,  0,  8,153,221,  4,  0,  0,  0,  0,200,154,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,232,160,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 88,161,221,  4,  0,  0,  0,  0,
+120,160,221,  4,  0,  0,  0,  0,232,153,221,  4,  0,  0,  0,  0, 56,155,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0, 88,161,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,200,161,221,  4,  0,  0,  0,  0,
+232,160,221,  4,  0,  0,  0,  0, 88,154,221,  4,  0,  0,  0,  0, 56,155,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,200,161,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 56,162,221,  4,  0,  0,  0,  0,
+ 88,161,221,  4,  0,  0,  0,  0,200,154,221,  4,  0,  0,  0,  0,168,155,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0, 56,162,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,168,162,221,  4,  0,  0,  0,  0,
+200,161,221,  4,  0,  0,  0,  0, 56,155,221,  4,  0,  0,  0,  0,168,155,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,168,162,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 24,163,221,  4,  0,  0,  0,  0,
+ 56,162,221,  4,  0,  0,  0,  0, 88,154,221,  4,  0,  0,  0,  0, 24,156,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0, 24,163,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,136,163,221,  4,  0,  0,  0,  0,
+168,162,221,  4,  0,  0,  0,  0,232,153,221,  4,  0,  0,  0,  0, 24,156,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,136,163,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,248,163,221,  4,  0,  0,  0,  0,
+ 24,163,221,  4,  0,  0,  0,  0,120,153,221,  4,  0,  0,  0,  0,136,156,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,248,163,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,104,164,221,  4,  0,  0,  0,  0,
+136,163,221,  4,  0,  0,  0,  0,152,152,221,  4,  0,  0,  0,  0,136,156,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,104,164,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,216,164,221,  4,  0,  0,  0,  0,
+248,163,221,  4,  0,  0,  0,  0, 24,156,221,  4,  0,  0,  0,  0,136,156,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,216,164,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 72,165,221,  4,  0,  0,  0,  0,
+104,164,221,  4,  0,  0,  0,  0,  8,153,221,  4,  0,  0,  0,  0,248,156,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0, 72,165,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,184,165,221,  4,  0,  0,  0,  0,
+216,164,221,  4,  0,  0,  0,  0,232,153,221,  4,  0,  0,  0,  0,248,156,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,184,165,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 40,166,221,  4,  0,  0,  0,  0,
+ 72,165,221,  4,  0,  0,  0,  0,168,155,221,  4,  0,  0,  0,  0,248,156,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0, 40,166,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,152,166,221,  4,  0,  0,  0,  0,
+184,165,221,  4,  0,  0,  0,  0,200,154,221,  4,  0,  0,  0,  0, 56,155,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 40,  0,  0,  0,152,166,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 40,166,221,  4,  0,  0,  0,  0, 72,151,221,  4,  0,  0,  0,  0, 88,154,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65,160,  0,  0,  0,  8,167,221,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,216,170,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  8,153,221,  4,  0,  0,  0,  0,184,151,221,  4,  0,  0,  0,  0, 40,152,221,  4,  0,  0,  0,  0,
+120,153,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,169,  3,  0,  0,  5,  4,  0,  0,
+  7,  7,127,  7, 93,  0,  1,  0,  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40,228,221,  4,  0,  0,  0,  0,
+ 40,228,221,  4,  0,  0,  0,  0,248,167,221,  4,  0,  0,  0,  0,104,169,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
+248,167,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,104,169,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0, 32,148, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,224,239, 68,  0,  0,  0,  0,  0,  0,208, 65,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,126,  7,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,192,239, 68,  0,  0,200, 65,  0,192,239, 68,  0,  0,200, 65,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,127,  7, 26,  0,127,  7, 26,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,235,  3,  0,  0,  4,  4,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,127,  7, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,236,  3,  0,  0,  5,  4,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,127,  7, 26,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
-  8, 77,168,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152, 75,168,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,240,109, 69,  0,  0,128,192,  0,  0,  0,  0,  0,  0,  0,  0,255,255,109, 69,  0,  0,  0,192,  0,  0,  0,  0,
-112,  7,  0,  0,129,  7,  0,  0, 18,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,
-  0,  0,  0,  0,111,  7,  0,  0, 18,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  2,  0,  0,  0,  1,  0,  3,  3,  2,  0,  0,  4, 10,  0,129,  7,  2,  0,112,  7,  1,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  5,  4,  0,  0,  5,  4,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,
+104,169,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248,167,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,192,239, 68,  0,  0,  0,  0,  0,  0, 28, 66,  0,  0,  0,  0,  0,192,237, 68,  0,  0,  0,  0,  0,  0,134, 66,
+110,  7,  0,  0,127,  7,  0,  0,  0,  0,  0,  0, 66,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,
+  0,  0,  0,  0,109,  7,  0,  0,  0,  0,  0,  0, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  2,  2,  0,  0,  1,  0,  3,  3,  2,  0,  0,  4, 10,  0,127,  7, 67,  0,110,  7, 67,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,169,  3,  0,  0,235,  3,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,127,  7, 67,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,
-120, 78,168,  5,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,200,118,168,  5,  0,  0,  0,  0,168, 74,168,  5,  0,  0,  0,  0,
- 88, 66,168,  5,  0,  0,  0,  0, 24, 68,168,  5,  0,  0,  0,  0,248, 68,168,  5,  0,  0,  0,  0,104, 69,168,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,199,  3,  0,  0,  0,  0,  0,  0,233,  3,  0,  0,  6,  6,200,  3,234,  3,  1,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88, 85,168,  5,  0,  0,  0,  0, 88, 85,168,  5,  0,  0,  0,  0,
-104, 79,168,  5,  0,  0,  0,  0,232, 83,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,104, 79,168,  5,  0,  0,  0,  0,
-216,  0,  0,  0,  1,  0,  0,  0,216, 80,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,215, 67,
-  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,114, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,199,  3,  0,  0,
-  0,  0,  0,  0, 25,  0,  0,  0,  0,192,113, 68,  0,  0,200, 65,  0,192,113, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,200,  3, 26,  0,200,  3, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,199,  3,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,200,  3, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,216, 80,168,  5,  0,  0,  0,  0,
-216,  0,  0,  0,  1,  0,  0,  0,232, 83,168,  5,  0,  0,  0,  0,104, 79,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 91, 67,
-  0,192,115,196,  0,  0,  0,  0,  0,  0,  0,  0,254,255, 74, 67,254,255,115,196,  0,  0,  0,  0,203,  0,  0,  0,220,  0,  0,  0,
-  0,  0,  0,  0,207,  3,  0,  0,  0,  0,  0,  0,202,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,202,  0,  0,  0,
-  0,  0,  0,  0,207,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64,
- 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,220,  0,208,  3,203,  0,208,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,219,  0,  0,  0, 26,  0,  0,  0,233,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,220,  0,208,  3,  0,  0,  4,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 72, 82,168,  5,  0,  0,  0,  0, 72, 82,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 72, 82,168,  5,  0,  0,  0,  0,
-214,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 73, 77, 65, 71, 69, 95, 80, 84, 95,103,112,101,110, 99,105,108,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 73, 77, 65, 71, 69, 95, 80, 84, 95,103,112,101,110, 99,105,108,  0,  0,  0,  0,  0,  0,  0,  0,
+216,170,221,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,104,195,221,  4,  0,  0,  0,  0,  8,167,221,  4,  0,  0,  0,  0,
+ 88,154,221,  4,  0,  0,  0,  0, 24,156,221,  4,  0,  0,  0,  0,136,156,221,  4,  0,  0,  0,  0,152,152,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,241,  5,  0,  0,126,  7,  0,  0,  0,  0,  0,  0,235,  2,  0,  0,  4,  4,142,  1,236,  2,  1,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40,194,221,  4,  0,  0,  0,  0, 40,194,221,  4,  0,  0,  0,  0,
+200,171,221,  4,  0,  0,  0,  0, 56,173,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,200,171,221,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0, 56,173,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,148, 67,
+  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,199, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,141,  1,  0,  0,
+  0,  0,  0,  0, 25,  0,  0,  0,  0,128,198, 67,  0,  0,200, 65,  0,128,198, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,142,  1, 26,  0,142,  1, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,241,  5,  0,  0,126,  7,  0,  0,210,  2,  0,  0,235,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,142,  1, 26,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 71,114,101, 97,115,101, 32, 80,101,110, 99,105,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152,255,202,  0, 80,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 56,173,221,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200,171,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,198, 67,
+  0,  0, 61,196,  0,  0,  0,  0,  0,  0,  0,  0,254,127,190, 67,254,127, 52,196,  0,  0,  0,  0,125,  1,  0,  0,142,  1,  0,  0,
+  0,  0,  0,  0,209,  2,  0,  0,  0,  0,  0,  0,126,  1,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,124,  1,  0,  0,
+  0,  0,  0,  0,209,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64,
+ 10,  1,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,142,  1,210,  2,125,  1,210,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,241,  5,  0,  0,126,  7,  0,  0,  0,  0,  0,  0,209,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,142,  1,210,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+168,174,221,  4,  0,  0,  0,  0,136,192,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,168,174,221,  4,  0,  0,  0,  0,
+215,  0,  0,  0,  1,  0,  0,  0, 72,176,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 66, 85, 84, 84, 79, 78, 83, 95, 80, 84, 95, 99,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 66, 85, 84, 84, 79, 78, 83, 95, 80, 84, 95, 99,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 40,  1,  0,  0,232, 83,168,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-216, 80,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 67, 51, 51, 43,191,154,153,213, 63,
- 51, 51,131,191,154,153,  1, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,236,  2,  0,  0,  0,  0,  0,  0,208,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 67,111,110,116,101,120,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,220,  0,  0,  0,199,  3,  0,  0,
- 26,  0,  0,  0,233,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,236,  2,208,  3,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,220,255,124,  1, 36,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 40, 33,  0,  0, 88, 85,168,  5,  0,  0,  0,  0,185,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,100,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  2,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,240, 65,  0,  0,  0,  0,154,153,153, 62,  0,  0,  0,  0,100,  0,  0,  0,154,153,153, 62,100,  0,  0,  0,
+ 68, 65, 84, 65, 88,  1,  0,  0, 72,176,221,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,232,177,221,  4,  0,  0,  0,  0,
+168,174,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80,
+ 84, 95,114,101,110,100,101,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80,
+ 84, 95,114,101,110,100,101,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82,101,110,100,101,114,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,135,255,124,  1, 61,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,232,177,221,  4,  0,  0,  0,  0,
+215,  0,  0,  0,  1,  0,  0,  0,136,179,221,  4,  0,  0,  0,  0, 72,176,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,108, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,108, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 76, 97,121,101,114,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,111,255,124,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 88,  1,  0,  0,136,179,221,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0, 40,181,221,  4,  0,  0,  0,  0,
+232,177,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80,
+ 84, 95,100,105,109,101,110,115,105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80,
+ 84, 95,100,105,109,101,110,115,105,111,110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,105,109,101,110,115,105,111,
+110,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140,254,124,  1,203,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 40,181,221,  4,  0,  0,  0,  0,
+215,  0,  0,  0,  1,  0,  0,  0,200,182,221,  4,  0,  0,  0,  0,136,179,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 97,110,116,105, 97,108,105, 97,115,105,110,103,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95, 97,110,116,105, 97,108,105, 97,115,105,110,103,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 65,110,116,105, 45, 65,108,105, 97,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 58,254,124,  1, 58,  0, 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 88,  1,  0,  0,200,182,221,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,104,184,221,  4,  0,  0,  0,  0,
+ 40,181,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80,
+ 84, 95,109,111,116,105,111,110, 95, 98,108,117,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80,
+ 84, 95,109,111,116,105,111,110, 95, 98,108,117,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 97,109,112,108,101,100, 32,
+ 77,111,116,105,111,110, 32, 66,108,117,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 34,254,124,  1,  0,  0,
+ 20,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,104,184,221,  4,  0,  0,  0,  0,
+215,  0,  0,  0,  1,  0,  0,  0,  8,186,221,  4,  0,  0,  0,  0,200,182,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,104, 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,115,104, 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 83,104, 97,100,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,254,124,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 88,  1,  0,  0,  8,186,221,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,168,187,221,  4,  0,  0,  0,  0,
+104,184,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80,
+ 84, 95,112,101,114,102,111,114,109, 97,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80,
+ 84, 95,112,101,114,102,111,114,109, 97,110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,101,114,102,111,114,109, 97,
+110, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,242,253,124,  1,  0,  0,
+  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,168,187,221,  4,  0,  0,  0,  0,
+215,  0,  0,  0,  1,  0,  0,  0, 72,189,221,  4,  0,  0,  0,  0,  8,186,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,111,115,116, 95,112,114,111, 99,101,115,115,105,110,
+103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,112,111,115,116, 95,112,114,111, 99,101,115,115,105,110,
+103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 80,111,115,116, 32, 80,114,111, 99,101,115,115,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,218,253,124,  1,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  8,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 88,  1,  0,  0, 72,189,221,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,232,190,221,  4,  0,  0,  0,  0,
+168,187,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80,
+ 84, 95,115,116, 97,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80,
+ 84, 95,115,116, 97,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83,116, 97,109,112,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,194,253,124,  1,  0,  0,
+ 20,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,232,190,221,  4,  0,  0,  0,  0,
+215,  0,  0,  0,  1,  0,  0,  0,136,192,221,  4,  0,  0,  0,  0, 72,189,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,111,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80, 84, 95,111,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 79,117,116,112,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40,253,124,  1,130,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 88,  1,  0,  0,136,192,221,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+232,190,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80,
+ 84, 95, 98, 97,107,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82, 69, 78, 68, 69, 82, 95, 80,
+ 84, 95, 98, 97,107,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 97,107,101,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,253,124,  1,  0,  0,
+  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0, 11,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,248,  0,  0,  0, 40,194,221,  4,  0,  0,  0,  0,
+180,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  1,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,255, 21,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65,160,  0,  0,  0,104,195,221,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,248,208,221,  4,  0,  0,  0,  0,
+216,170,221,  4,  0,  0,  0,  0,168,155,221,  4,  0,  0,  0,  0,248,156,221,  4,  0,  0,  0,  0,232,153,221,  4,  0,  0,  0,  0,
+ 56,155,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,249,  2,  0,  0,239,  5,  0,  0,105,  1,  0,  0,167,  3,  0,  0,
+  1,  1,247,  2, 63,  2,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72,207,221,  4,  0,  0,  0,  0,
+ 72,207,221,  4,  0,  0,  0,  0, 88,196,221,  4,  0,  0,  0,  0, 24,202,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
+ 88,196,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,200,197,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0, 64,113, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,192, 61, 68,  0,  0,  0,  0,  0,  0,208, 65,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,246,  2,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,128, 61, 68,  0,  0,200, 65,  0,128, 61, 68,  0,  0,200, 65,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,247,  2, 26,  0,247,  2, 26,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,249,  2,  0,  0,239,  5,  0,  0,105,  1,  0,  0,130,  1,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,247,  2, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
+200,197,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0, 56,199,221,  4,  0,  0,  0,  0, 88,196,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0, 15, 67,  0, 64, 70,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,255,127, 70,196,  0,  0,  0,  0,
+143,  0,  0,  0,160,  0,  0,  0, 18,  0,  0,  0, 43,  3,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,
+  0,  0,  0,  0,142,  0,  0,  0, 18,  0,  0,  0, 43,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0, 64, 10,  0,  0,  0,  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,160,  0, 44,  3,143,  0, 26,  3,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,249,  2,  0,  0,249,  2,  0,  0,131,  1,  0,  0,167,  3,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0, 37,  2,  0,  0,  5,  0,  3,  0,  1,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
+ 56,199,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,168,200,221,  4,  0,  0,  0,  0,200,197,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0, 16, 67,  0,  0,206,194,  0,  0,  0,  0,  0,  0,  0,  0,231,102, 16, 67,  0,  0,206,194,  0,  0,  0,  0,
+143,  0,  0,  0,160,  0,  0,  0, 18,  0,  0,  0,119,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,
+  0,  0,  0,  0,142,  0,  0,  0, 18,  0,  0,  0,119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0, 64, 10,  0,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,160,  0,120,  0,143,  0,102,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,249,  2,  0,  0,239,  5,  0,  0,131,  1,  0,  0,131,  1,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  6,  0, 34,  0,  2,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
+168,200,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0, 24,202,221,  4,  0,  0,  0,  0, 56,199,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0, 35, 67,  0,128,142,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 35, 67,  0,  0, 26,196,  0,  0,  0,  0,
+163,  0,  0,  0,180,  0,  0,  0, 18,  0,  0,  0,121,  2,  0,  0,  0,  0,  0,  0,162,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,
+  0,  0,  0,  0,162,  0,  0,  0, 18,  0,  0,  0,121,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0, 64, 10,  0,  0,  0,  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,180,  0,122,  2,163,  0,104,  2,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,239,  5,  0,  0,239,  5,  0,  0,131,  1,  0,  0,167,  3,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  4,  0,  4,  0,  1,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
+ 24,202,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,168,200,221,  4,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,249,  2,  0,  0,239,  5,  0,  0,131,  1,  0,  0,167,  3,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,247,  2, 37,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136,203,221,  4,  0,  0,  0,  0, 68, 65, 84, 65,112,  3,  0,  0,
+136,203,221,  4,  0,  0,  0,  0,175,  0,  0,  0,  1,  0,  0,  0,  0,  0,140, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 74,141,193, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80,  1,128,191,  0,  0,128,191,
+  0,  0,  0,  0,  0,  0,  0,  0,225,215,163,188,  0,  0,  0,  0, 68,239,209, 62, 51,177,205,190,184,158, 81, 63,  0,  0,  0,  0,
+ 70,119,105, 63,143, 74, 70, 62, 35, 44,185,190,  0,  0,  0,  0,162, 84, 89,188,166, 33,101, 63, 42, 61,228, 62,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,214,211,111,193,  0,  0,128, 63, 69,239,209, 62, 70,119,105, 63,176, 84, 89,188,  0,  0,  0,  0,
+ 53,177,205,190,142, 74, 70, 62,166, 33,101, 63,  0,  0,  0,  0,185,158, 81, 63, 35, 44,185,190, 43, 61,228, 62,  0,  0,  0,  0,
+164, 96, 68, 65,111,121,173,192,248,209,213, 64,  0,  0,128, 63,178,157,229, 62, 30,132, 27,191,222,160, 81,191,184,158, 81,191,
+117, 90,127, 63,166,235,149, 62,  9, 46,185, 62, 35, 44,185, 62,145,180,109,188,212, 60,173, 63,129, 63,228,190, 42, 61,228,190,
+  0,  0,  0,  0,  0,  0,  0,  0, 96,132,111, 65,214,211,111, 65,217,236,191, 62, 54,117, 85, 63,224,246, 70,188,  0,160, 32,182,
+252,  5,136,190, 43, 33,  3, 62,235,135, 23, 63,  0,  0, 96, 53,215,104, 25,196,133,132,135, 67, 37,  9,167,195,136,252, 71,194,
+  3, 54, 25, 68,158, 87,135,195,205,209,166, 67,151,254, 71, 66, 68,239,209, 62, 51,177,205,190,184,158, 81, 63,  0,  0,  0,  0,
+ 70,119,105, 63,143, 74, 70, 62, 35, 44,185,190,  0,  0,  0,  0,162, 84, 89,188,166, 33,101, 63, 42, 61,228, 62,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,214,211,111,193,  0,  0,128, 63,178,157,229, 62, 30,132, 27,191,222,160, 81,191,184,158, 81,191,
+117, 90,127, 63,166,235,149, 62,  9, 46,185, 62, 35, 44,185, 62,145,180,109,188,212, 60,173, 63,129, 63,228,190, 42, 61,228,190,
+  0,  0,  0,  0,  0,  0,  0,  0, 96,132,111, 65,214,211,111, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -5234,10 +5005,57 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 46, 86, 45, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 46, 86, 45, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 46, 86, 45, 64,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63, 92, 62, 55, 63, 56,186,224,190,237,203,148,190,  3,236,234,190,
+214,211,111, 65,214,211,111, 65,  0,  0,  0,  0,  0,  0,  0,  0,107,227, 29, 59,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  1,  0,  0,255,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63, 30, 33, 12, 66, 86,152,137, 66,116, 27,126, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 96,  1,  0,  0, 72,207,221,  4,  0,  0,  0,  0,176,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0, 51, 51, 51, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 32, 65,205,204, 76, 62,  2,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  7,  0,216,120,222,  4,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  3,  0,  0,  0,  1,  0,  3,  0,  8,  8,128,  0,  0,  0, 12, 66,
+  0,  0,128, 63, 10,215, 35, 60,  0,  0,250, 67,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0, 16,  0, 10,  0,  7,  1,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,
+248,208,221,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  8,215,221,  4,  0,  0,  0,  0,104,195,221,  4,  0,  0,  0,  0,
+ 72,151,221,  4,  0,  0,  0,  0,200,154,221,  4,  0,  0,  0,  0, 56,155,221,  4,  0,  0,  0,  0, 88,154,221,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,239,  5,  0,  0,  0,  0,  0,  0,103,  1,  0,  0, 18, 18,240,  5,104,  1,  1,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 56,213,221,  4,  0,  0,  0,  0, 56,213,221,  4,  0,  0,  0,  0,
+232,209,221,  4,  0,  0,  0,  0, 88,211,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,232,209,221,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0, 88,211,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,160, 67,
+  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,190, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,239,  5,  0,  0,
+  0,  0,  0,  0, 25,  0,  0,  0,  0,224,189, 68,  0,  0,200, 65,  0,224,189, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,240,  5, 26,  0,240,  5, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,239,  5,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,240,  5, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 88,211,221,  4,  0,  0,  0,  0,
+217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,232,209,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,224,189, 68,
+  0,  0,  0,  0,  0,  0, 51, 67,  0,  0,  0,  0,  0,224,187, 68,  0,  0,  0,  0,  0,  0,167, 67,223,  5,  0,  0,240,  5,  0,  0,
+  0,  0,  0,  0, 77,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,222,  5,  0,  0,
+  0,  0,  0,  0, 77,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  2,  2,  0,  0,  1,  0,  3,  3,  2,  0,  0,  4, 10,  0,240,  5, 78,  1,223,  5, 78,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,239,  5,  0,  0, 26,  0,  0,  0,103,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,240,  5, 78,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,200,212,221,  4,  0,  0,  0,  0,
+195,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+ 24,205,185,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,  4,  0,  0,  0, 24,205,185,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,136,  1,  0,  0, 56,213,221,  4,  0,  0,  0,  0,196,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 18,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 14,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200,212,221,  4,  0,  0,  0,  0,200,212,221,  4,
+  0,  0,  0,  0, 62, 62, 62, 32,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -5245,22 +5063,83 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,112,121,116,104,111,110,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  8,  4,  0,  0,  8,  4,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,  8,215,221,  4,  0,  0,  0,  0,216,  0,  0,  0,
+  1,  0,  0,  0,104,221,221,  4,  0,  0,  0,  0,248,208,221,  4,  0,  0,  0,  0, 24,156,221,  4,  0,  0,  0,  0,232,153,221,  4,
+  0,  0,  0,  0,120,153,221,  4,  0,  0,  0,  0,136,156,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,241,  5,  0,  0,
+126,  7,  0,  0,237,  2,  0,  0,167,  3,  0,  0,  3,  3,142,  1,187,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,216,218,221,  4,  0,  0,  0,  0,216,218,221,  4,  0,  0,  0,  0,248,215,221,  4,  0,  0,  0,  0,104,217,221,  4,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,248,215,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,104,217,221,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,244, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,
+  0,  0,199, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,141,  1,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,128,198, 67,
+  0,  0,200, 65,  0,128,198, 67,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0,
+ 10,  0,142,  1, 26,  0,142,  1, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,241,  5,  0,  0,
+126,  7,  0,  0,237,  2,  0,  0,  6,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,142,  1, 26,  0,
+  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,104,217,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,248,215,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,141, 67,  0,  0,244,194,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,128,190, 67,  0,  0, 15,195,  0,  0,  0,  0,125,  1,  0,  0,142,  1,  0,  0, 18,  0,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,
+124,  1,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,124,  1,  0,  0, 18,  0,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63, 18,  6,  0,  0,  2,  0,  3,  3,  0,  0, 12,  4,
+  6,  0,142,  1,161,  0,125,  1,143,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,241,  5,  0,  0,
+126,  7,  0,  0,  7,  3,  0,  0,167,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,142,  1,161,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 24,  1,  0,  0,216,218,221,  4,  0,  0,  0,  0,181,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200,251,190,  4,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0, 68, 65, 84, 65, 16,  0,  0,  0,200,251,190,  4,
+  0,  0,  0,  0,238,  0,  0,  0,  1,  0,  0,  0, 14,  0,  0,  0, 14,  0,  0,  0, 56,220,221,  4,  0,  0,  0,  0, 68, 65, 84, 65,
+224,  0,  0,  0, 56,220,221,  4,  0,  0,  0,  0,237,  0,  0,  0, 14,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0, 40, 92,222,  4,
+  0,  0,  0,  0, 19,  0,  0,  0,  1,  0,  1,  0, 40, 92,222,  4,  0,  0,  0,  0, 20,  0,  0,  0,  1,  0,  1,  0, 40, 92,222,  4,
+  0,  0,  0,  0, 21,  0,  1,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  8,118,222,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,136,127,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,168,181,222,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,232,140,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,248,162,222,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0, 56,134,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,168,113,222,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,216,120,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,152,112,222,  4,
+  0,  0,  0,  0, 21,  0,  0,  0,  1,  0,  1,  0, 40, 92,222,  4,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,104,221,221,  4,
+  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,215,221,  4,  0,  0,  0,  0,200,154,221,  4,
+  0,  0,  0,  0,  8,153,221,  4,  0,  0,  0,  0,248,156,221,  4,  0,  0,  0,  0,168,155,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,247,  2,  0,  0,105,  1,  0,  0,167,  3,  0,  0,  9,  9,248,  2, 63,  2,  1,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 56,225,221,  4,  0,  0,  0,  0, 56,225,221,  4,  0,  0,  0,  0, 88,222,221,  4,
+  0,  0,  0,  0,200,223,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 88,222,221,  4,  0,  0,  0,  0,217,  0,  0,  0,
+  1,  0,  0,  0,200,223,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,230, 67,  0,  0,  0,  0,
+  0,  0,208, 65,  0,  0,  0,  0,  0,  0, 62, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,247,  2,  0,  0,  0,  0,  0,  0,
+ 25,  0,  0,  0,  0,192, 61, 68,  0,  0,200, 65,  0,192, 61, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,248,  2, 26,  0,248,  2, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,247,  2,  0,  0,105,  1,  0,  0,130,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,248,  2, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,200,223,221,  4,  0,  0,  0,  0,217,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88,222,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,224,189, 68,  0,  0,  0,  0,
+  0,192, 22, 68,248,150, 23, 68,  8, 41,100, 68, 46,224, 62, 67,233, 15,206, 67,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,247,  2,  0,  0,  0,  0,  0,  0,
+ 36,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,215, 35, 60,  0,  0,122, 68,  0,  0,  0,  0,
+  1,  0,  3,  0,  0,  0,  0,  4, 10,  0,248,  2, 37,  2,248,  2, 37,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,247,  2,  0,  0,131,  1,  0,  0,167,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,248,  2, 37,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  2,  0,  0, 56,225,221,  4,  0,  0,  0,  0,190,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 32,  0,  0,  0,  0,  0,  0,  0, 12,  0,  7,  0,  0,  0,  0,  0,  1,  0,  0,  0,  4,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,205,204,204, 61,231,  1,  0,  0,243,  1,  0,  0,122,  1,  0,  0,124,  1,  0,  0,231,  1,  0,  0,
+243,  1,  0,  0,  4,  0,  0,  0,124,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -5277,27 +5156,130 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 83, 78,  0,  0,  8,  1,  0,  0,184,228,221,  4,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,216, 43,222,  4,
+  0,  0,  0,  0,248,149,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 82, 85, 86,
+ 32, 69,100,105,116,105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,230,221,  4,  0,  0,  0,  0, 24,233,221,  4,
+  0,  0,  0,  0,136,233,221,  4,  0,  0,  0,  0,232,237,221,  4,  0,  0,  0,  0, 88,238,221,  4,  0,  0,  0,  0,120, 26,222,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,  8,230,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,120,230,221,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 32,  0,  0,  0,120,230,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,232,230,221,  4,  0,  0,  0,  0,  8,230,221,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  5,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,232,230,221,  4,
+  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 88,231,221,  4,  0,  0,  0,  0,120,230,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,126,  7,  5,  4,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 88,231,221,  4,  0,  0,  0,  0,213,  0,  0,  0,
+  1,  0,  0,  0,200,231,221,  4,  0,  0,  0,  0,232,230,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,200,231,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 56,232,221,  4,
+  0,  0,  0,  0, 88,231,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,234,  3,  1,  0,  0,  0, 68, 65, 84, 65,
+ 32,  0,  0,  0, 56,232,221,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,168,232,221,  4,  0,  0,  0,  0,200,231,221,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,234,  3,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,168,232,221,  4,
+  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 24,233,221,  4,  0,  0,  0,  0, 56,232,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,200,  3,234,  3,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 24,233,221,  4,  0,  0,  0,  0,213,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,168,232,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200,  3,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,136,233,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,248,233,221,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,230,221,  4,  0,  0,  0,  0,232,230,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,248,233,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,104,234,221,  4,
+  0,  0,  0,  0,136,233,221,  4,  0,  0,  0,  0,120,230,221,  4,  0,  0,  0,  0,200,231,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,104,234,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,216,234,221,  4,
+  0,  0,  0,  0,248,233,221,  4,  0,  0,  0,  0,232,230,221,  4,  0,  0,  0,  0, 56,232,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,216,234,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 72,235,221,  4,
+  0,  0,  0,  0,104,234,221,  4,  0,  0,  0,  0,200,231,221,  4,  0,  0,  0,  0, 56,232,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 72,235,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,184,235,221,  4,
+  0,  0,  0,  0,216,234,221,  4,  0,  0,  0,  0,200,231,221,  4,  0,  0,  0,  0,168,232,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,184,235,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 40,236,221,  4,
+  0,  0,  0,  0, 72,235,221,  4,  0,  0,  0,  0,  8,230,221,  4,  0,  0,  0,  0, 24,233,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 40,236,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,152,236,221,  4,
+  0,  0,  0,  0,184,235,221,  4,  0,  0,  0,  0,  8,230,221,  4,  0,  0,  0,  0,200,231,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,152,236,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  8,237,221,  4,
+  0,  0,  0,  0, 40,236,221,  4,  0,  0,  0,  0,168,232,221,  4,  0,  0,  0,  0, 24,233,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,  8,237,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,120,237,221,  4,
+  0,  0,  0,  0,152,236,221,  4,  0,  0,  0,  0, 56,232,221,  4,  0,  0,  0,  0,168,232,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,120,237,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,232,237,221,  4,
+  0,  0,  0,  0,  8,237,221,  4,  0,  0,  0,  0, 88,231,221,  4,  0,  0,  0,  0, 24,233,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,232,237,221,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,120,237,221,  4,  0,  0,  0,  0, 88,231,221,  4,  0,  0,  0,  0, 56,232,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0, 88,238,221,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0, 40,242,221,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200,231,221,  4,  0,  0,  0,  0,120,230,221,  4,  0,  0,  0,  0,232,230,221,  4,
+  0,  0,  0,  0, 56,232,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,235,  3,  0,  0,
+  5,  4,  0,  0,  7,  7,127,  7, 27,  0,  1,  0,  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72, 43,222,  4,
+  0,  0,  0,  0, 72, 43,222,  4,  0,  0,  0,  0, 72,239,221,  4,  0,  0,  0,  0,184,240,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  1,  0,  0, 72,239,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,184,240,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,148, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,224,239, 68,  0,  0,  0,  0,
+  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,192,239, 68,  0,  0,200, 65,  0,192,239, 68,
+  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,127,  7, 26,  0,127,  7,
+ 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,235,  3,  0,  0,
+  4,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,127,  7, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  1,  0,  0,184,240,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72,239,221,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,240,109, 69,  0,  0,128,192,  0,  0,  0,  0,  0,  0,  0,  0,255,255,109, 69,  0,  0,  0,192,
+  0,  0,  0,  0,112,  7,  0,  0,129,  7,  0,  0, 18,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0,  0,  0,  0,  0,
+ 17,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0, 18,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  2,  0,  0,  0,  1,  0,  3,  3,  2,  0,  0,  4, 10,  0,129,  7,  2,  0,112,  7,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  5,  4,  0,  0,
+  5,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+160,  0,  0,  0, 40,242,221,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,120, 26,222,  4,  0,  0,  0,  0, 88,238,221,  4,
+  0,  0,  0,  0,  8,230,221,  4,  0,  0,  0,  0,200,231,221,  4,  0,  0,  0,  0,168,232,221,  4,  0,  0,  0,  0, 24,233,221,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,199,  3,  0,  0,  0,  0,  0,  0,233,  3,  0,  0,  6,  6,200,  3,
+234,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,249,221,  4,  0,  0,  0,  0,  8,249,221,  4,
+  0,  0,  0,  0, 24,243,221,  4,  0,  0,  0,  0,152,247,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 24,243,221,  4,
+  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,136,244,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,215, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,114, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+199,  3,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,192,113, 68,  0,  0,200, 65,  0,192,113, 68,  0,  0,200, 65,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,200,  3, 26,  0,200,  3, 26,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,199,  3,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200,  3, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,136,244,221,  4,
+  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,152,247,221,  4,  0,  0,  0,  0, 24,243,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 91, 67,  0,192,115,196,  0,  0,  0,  0,  0,  0,  0,  0,254,255, 74, 67,254,255,115,196,  0,  0,  0,  0,203,  0,  0,  0,
+220,  0,  0,  0,  0,  0,  0,  0,207,  3,  0,  0,  0,  0,  0,  0,202,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,
+202,  0,  0,  0,  0,  0,  0,  0,207,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
+  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,220,  0,208,  3,203,  0,208,  3,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,219,  0,  0,  0, 26,  0,  0,  0,233,  3,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,220,  0,208,  3,  0,  0,  4,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,248,245,221,  4,  0,  0,  0,  0,248,245,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,248,245,221,  4,
+  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 73, 77, 65, 71, 69, 95, 80, 84, 95,103,112,101,110, 99,105,108,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 73, 77, 65, 71, 69, 95, 80, 84, 95,103,112,101,110, 99,105,108,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 71,114,101, 97,115,101, 32, 80,101,110, 99,105,108,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152,255,202,  0, 80,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,152,247,221,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,136,244,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 67, 51, 51, 43,191,
+154,153,213, 63, 51, 51,131,191,154,153,  1, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,236,  2,  0,  0,  0,  0,  0,  0,208,  3,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,100,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,220,  0,  0,  0,
+199,  3,  0,  0, 26,  0,  0,  0,233,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,236,  2,208,  3,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 40, 33,  0,  0,  8,249,221,  4,  0,  0,  0,  0,189,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,100,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  2,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240, 65,  0,  0,  0,  0,154,153,153, 62,  0,  0,  0,  0,100,  0,  0,  0,154,153,153, 62,
+100,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -5424,102 +5406,42 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,100,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65,160,  0,  0,  0,200,118,168,  5,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-120, 78,168,  5,  0,  0,  0,  0,104, 69,168,  5,  0,  0,  0,  0,248, 68,168,  5,  0,  0,  0,  0,136, 68,168,  5,  0,  0,  0,  0,
-168, 67,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,201,  3,  0,  0,126,  7,  0,  0,  0,  0,  0,  0,233,  3,  0,  0,
-  1,  1,182,  3,234,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,232,133,168,  5,  0,  0,  0,  0,
-232,133,168,  5,  0,  0,  0,  0,184,119,168,  5,  0,  0,  0,  0,184,128,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
-184,119,168,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0, 40,121,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0, 64,113, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,128,109, 68,  0,  0,  0,  0,  0,  0,208, 65,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,181,  3,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0, 64,109, 68,  0,  0,200, 65,  0, 64,109, 68,  0,  0,200, 65,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,182,  3, 26,  0,182,  3, 26,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,201,  3,  0,  0,126,  7,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,182,  3, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,100,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
- 40,121,168,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0, 56,124,168,  5,  0,  0,  0,  0,184,119,168,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0, 32, 67,  0,  0, 86,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0,  0, 86,196,  0,  0,  0,  0,
-143,  0,  0,  0,160,  0,  0,  0,  0,  0,  0,  0, 87,  3,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,
-  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 87,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,160,  0, 88,  3,143,  0, 88,  3,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,201,  3,  0,  0,104,  4,  0,  0,146,  0,  0,  0,233,  3,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160,  0, 88,  3,  0,  0,  5,  0,  3,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,152,122,168,  5,  0,  0,  0,  0,152,122,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,
-152,122,168,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,
-111, 98,106,101, 99,116,109,111,100,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,111,108,115, 95,
-111, 98,106,101, 99,116,109,111,100,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79, 98,106,101, 99,116, 32, 84,111,111,108,115,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,233,253,143,  0,255,  1,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 56,124,168,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,
- 72,127,168,  5,  0,  0,  0,  0, 40,121,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 33, 67,  0,  0,242,194,  0,  0,  0,  0,
-  0,  0,  0,  0,231,102, 16, 67, 91, 90,242,194,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,119,  0,  0,  0,
-  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0,119,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0,
- 18,  0,  0,  4,  6,  0,160,  0,120,  0,143,  0,120,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-201,  3,  0,  0,104,  4,  0,  0, 26,  0,  0,  0,145,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-160,  0,120,  0,  0,  0,  6,  0, 34,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,168,125,168,  5,  0,  0,  0,  0,
-168,125,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0,168,125,168,  5,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,108, 97,115,116, 95,111,112,101,114, 97,116,111,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,108, 97,115,116, 95,111,112,101,114, 97,116,111,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 79,112,101,114, 97,116,111,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,216,255,144,  0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
- 72,127,168,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,184,128,168,  5,  0,  0,  0,  0, 56,124,168,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0, 35, 67,  0,128,126,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 35, 67,255,191,126,196,  0,  0,  0,  0,
-163,  0,  0,  0,180,  0,  0,  0, 18,  0,  0,  0, 12,  4,  0,  0,  0,  0,  0,  0,162,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,
-  0,  0,  0,  0,162,  0,  0,  0, 18,  0,  0,  0, 12,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0, 63,  0,  0,  0, 64, 10,  0,  0,  0,  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,180,  0, 13,  4,163,  0,251,  3,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,126,  7,  0,  0, 26,  0,  0,  0,233,  3,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  4,  0,  4,  0,  1,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,
-184,128,168,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72,127,168,  5,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,105,  4,  0,  0,126,  7,  0,  0, 26,  0,  0,  0,233,  3,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 22,  3,208,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40,130,168,  5,  0,  0,  0,  0, 68, 65, 84, 65,112,  3,  0,  0,
- 40,130,168,  5,  0,  0,  0,  0,174,  0,  0,  0,  1,  0,  0,  0, 72,246,172, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,140, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 28, 13,128,191,  0,  0,128,191,
-  0,  0,  0,  0,  0,  0,  0,  0, 74,215, 76,190,  0,  0,  0,  0, 68,239,209, 62, 51,177,205,190,184,158, 81, 63,  0,  0,  0,  0,
- 70,119,105, 63,143, 74, 70, 62, 35, 44,185,190,  0,  0,  0,  0,162, 84, 89,188,166, 33,101, 63, 42, 61,228, 62,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0, 25, 95,192,  0,  0,128, 63, 69,239,209, 62, 70,119,105, 63,160, 84, 89,188,  0,  0,  0,  0,
- 52,177,205,190,142, 74, 70, 62,166, 33,101, 63,  0,  0,  0,  0,185,158, 81, 63, 35, 44,185,190, 43, 61,228, 62,  0,  0,  0,  0,
-188,173, 54, 64,136, 95,161,191,147,231,198, 63,  0,  0,128, 63,185,214, 13, 63,208,249,224,190, 48,180, 81,191,184,158, 81,191,
-189,188,157, 63,140,225, 88, 62, 26, 63,185, 62, 35, 44,185, 62,241,213,146,188,206,156,122, 63,138, 84,228,190, 42, 61,228,190,
-  0,  0,  0,  0,  0,  0,  0,  0,100, 98, 82, 64,  0, 25, 95, 64,121, 92,155, 62,151,198, 44, 63,192,214, 32,188,  0,  0, 40,180,
-195, 15,188,190,132, 75, 53, 62,216,125, 81, 63,  0,  0,192,179,115, 77,100,193, 17,173,201, 64,181,148,248,192,203,247,159,192,
-233, 74, 87, 65,247, 46,190,192, 88,106,234, 64, 45,  8,160, 64, 68,239,209, 62, 51,177,205,190,184,158, 81, 63,  0,  0,  0,  0,
- 70,119,105, 63,143, 74, 70, 62, 35, 44,185,190,  0,  0,  0,  0,162, 84, 89,188,166, 33,101, 63, 42, 61,228, 62,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0, 25, 95,192,  0,  0,128, 63,185,214, 13, 63,208,249,224,190, 48,180, 81,191,184,158, 81,191,
-189,188,157, 63,140,225, 88, 62, 26, 63,185, 62, 35, 44,185, 62,241,213,146,188,206,156,122, 63,138, 84,228,190, 42, 61,228,190,
-  0,  0,  0,  0,  0,  0,  0,  0,100, 98, 82, 64,  0, 25, 95, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -5527,338 +5449,78 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248,201,250, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,248,201,250, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248,201,250, 62,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63, 92, 62, 55, 63, 56,186,224,190,237,203,148,190,  3,236,234,190,
-  0, 25, 95, 64,  0, 25, 95, 64,  0,  0,  0,  0,  0,  0,  0,  0,114,145,245, 58,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  1,  0,  0,255,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63, 30, 33, 12, 66, 85,152,137, 66,116, 27,126, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 96,  1,  0,  0,232,133,168,  5,  0,  0,  0,  0,175,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0, 51, 51, 51, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 32, 65,205,204, 76, 62,  2,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  7,  0, 24,213,168,  5,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  3,  0,  0,  0,  1,  0,  3,  0,  8,  8,128,  0,  0,  0, 12, 66,
-  0,  0,128, 63,205,204,204, 61,  0,  0,250, 67,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0, 16,  0, 10,  0,  7,  1,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 78,  0,  0,  8,  1,  0,  0,
- 40,136,168,  5,  0,  0,  0,  0,211,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8, 65,168,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 82, 86,105,100,101,111, 32, 69,100,105,116,105,110,103,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,120,137,168,  5,  0,  0,  0,  0, 72,142,168,  5,  0,  0,  0,  0,184,142,168,  5,  0,  0,  0,  0,
- 40,150,168,  5,  0,  0,  0,  0,152,150,168,  5,  0,  0,  0,  0,248,175,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
-120,137,168,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,232,137,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,232,137,168,  5,  0,  0,  0,  0,
-212,  0,  0,  0,  1,  0,  0,  0, 88,138,168,  5,  0,  0,  0,  0,120,137,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,222,  2,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 88,138,168,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,
-200,138,168,  5,  0,  0,  0,  0,232,137,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  4,222,  2,  0,  0,  0,  0,
- 68, 65, 84, 65, 32,  0,  0,  0,200,138,168,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0, 56,139,168,  5,  0,  0,  0,  0,
- 88,138,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
- 56,139,168,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,168,139,168,  5,  0,  0,  0,  0,200,138,168,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,195,  2,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,168,139,168,  5,  0,  0,  0,  0,
-212,  0,  0,  0,  1,  0,  0,  0, 24,140,168,  5,  0,  0,  0,  0, 56,139,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-240,  4,195,  2,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 24,140,168,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,
-136,140,168,  5,  0,  0,  0,  0,168,139,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  4, 92,  1,  0,  0,  0,  0,
- 68, 65, 84, 65, 32,  0,  0,  0,136,140,168,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,248,140,168,  5,  0,  0,  0,  0,
- 24,140,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,
-248,140,168,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,104,141,168,  5,  0,  0,  0,  0,136,140,168,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 48,  2,195,  2,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,104,141,168,  5,  0,  0,  0,  0,
-212,  0,  0,  0,  1,  0,  0,  0,216,141,168,  5,  0,  0,  0,  0,248,140,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 92,  1,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,216,141,168,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,
- 72,142,168,  5,  0,  0,  0,  0,104,141,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48,  2, 92,  1,  0,  0,  0,  0,
- 68, 65, 84, 65, 32,  0,  0,  0, 72,142,168,  5,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-216,141,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  4, 68,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
-184,142,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 40,143,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-232,137,168,  5,  0,  0,  0,  0, 88,138,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
- 40,143,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,152,143,168,  5,  0,  0,  0,  0,184,142,168,  5,  0,  0,  0,  0,
-232,137,168,  5,  0,  0,  0,  0, 56,139,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
-152,143,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  8,144,168,  5,  0,  0,  0,  0, 40,143,168,  5,  0,  0,  0,  0,
- 88,138,168,  5,  0,  0,  0,  0,168,139,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
-  8,144,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,120,144,168,  5,  0,  0,  0,  0,152,143,168,  5,  0,  0,  0,  0,
- 56,139,168,  5,  0,  0,  0,  0,168,139,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
-120,144,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,232,144,168,  5,  0,  0,  0,  0,  8,144,168,  5,  0,  0,  0,  0,
-168,139,168,  5,  0,  0,  0,  0, 24,140,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
-232,144,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 88,145,168,  5,  0,  0,  0,  0,120,144,168,  5,  0,  0,  0,  0,
-120,137,168,  5,  0,  0,  0,  0,136,140,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
- 88,145,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,200,145,168,  5,  0,  0,  0,  0,232,144,168,  5,  0,  0,  0,  0,
- 56,139,168,  5,  0,  0,  0,  0,248,140,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
-200,145,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 56,146,168,  5,  0,  0,  0,  0, 88,145,168,  5,  0,  0,  0,  0,
-136,140,168,  5,  0,  0,  0,  0,104,141,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
- 56,146,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,168,146,168,  5,  0,  0,  0,  0,200,145,168,  5,  0,  0,  0,  0,
-104,141,168,  5,  0,  0,  0,  0,216,141,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
-168,146,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 24,147,168,  5,  0,  0,  0,  0, 56,146,168,  5,  0,  0,  0,  0,
-248,140,168,  5,  0,  0,  0,  0,216,141,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
- 24,147,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,136,147,168,  5,  0,  0,  0,  0,168,146,168,  5,  0,  0,  0,  0,
- 24,140,168,  5,  0,  0,  0,  0, 72,142,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
-136,147,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,248,147,168,  5,  0,  0,  0,  0, 24,147,168,  5,  0,  0,  0,  0,
-200,138,168,  5,  0,  0,  0,  0, 72,142,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
-248,147,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,104,148,168,  5,  0,  0,  0,  0,136,147,168,  5,  0,  0,  0,  0,
-136,140,168,  5,  0,  0,  0,  0, 72,142,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
-104,148,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,216,148,168,  5,  0,  0,  0,  0,248,147,168,  5,  0,  0,  0,  0,
-120,137,168,  5,  0,  0,  0,  0,200,138,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
-216,148,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 72,149,168,  5,  0,  0,  0,  0,104,148,168,  5,  0,  0,  0,  0,
-168,139,168,  5,  0,  0,  0,  0,248,140,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
- 72,149,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,184,149,168,  5,  0,  0,  0,  0,216,148,168,  5,  0,  0,  0,  0,
- 24,140,168,  5,  0,  0,  0,  0,216,141,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
-184,149,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 40,150,168,  5,  0,  0,  0,  0, 72,149,168,  5,  0,  0,  0,  0,
- 56,139,168,  5,  0,  0,  0,  0,104,141,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
- 40,150,168,  5,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,184,149,168,  5,  0,  0,  0,  0,
- 24,140,168,  5,  0,  0,  0,  0,104,141,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,
-152,150,168,  5,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,104,154,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 56,139,168,  5,  0,  0,  0,  0,232,137,168,  5,  0,  0,  0,  0, 88,138,168,  5,  0,  0,  0,  0,168,139,168,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0,196,  2,  0,  0,222,  2,  0,  0,  7,  7,241,  4, 27,  0,  1,  0,
-  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,232,183,168,  5,  0,  0,  0,  0,232,183,168,  5,  0,  0,  0,  0,
-136,151,168,  5,  0,  0,  0,  0,248,152,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,136,151,168,  5,  0,  0,  0,  0,
-216,  0,  0,  0,  1,  0,  0,  0,248,152,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,148, 68,
-  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0, 32,158, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0,
-  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,158, 68,  0,  0,200, 65,  0,  0,158, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,241,  4, 26,  0,241,  4, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0,196,  2,  0,  0,221,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,241,  4, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,248,152,168,  5,  0,  0,  0,  0,
-216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136,151,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,109, 69,
-  0,  0,128,192,  0,  0,  0,  0,  0,  0,  0,  0,255,255,109, 69,  0,  0,  0,192,  0,  0,  0,  0,112,  7,  0,  0,129,  7,  0,  0,
- 18,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0,
- 18,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  2,  0,  0,  0,  1,  0,  3,  3,  2,  0,  0,  4, 10,  0,129,  7,  2,  0,112,  7,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,222,  2,  0,  0,222,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,104,154,168,  5,  0,  0,  0,  0,
-215,  0,  0,  0,  1,  0,  0,  0, 88,159,168,  5,  0,  0,  0,  0,152,150,168,  5,  0,  0,  0,  0,120,137,168,  5,  0,  0,  0,  0,
-136,140,168,  5,  0,  0,  0,  0, 72,142,168,  5,  0,  0,  0,  0,200,138,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,240,  4,  0,  0,  0,  0,  0,  0, 67,  0,  0,  0, 15, 15,241,  4, 68,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 56,158,168,  5,  0,  0,  0,  0, 56,158,168,  5,  0,  0,  0,  0, 88,155,168,  5,  0,  0,  0,  0,
-200,156,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 88,155,168,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,
-200,156,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,140, 68,  0,  0,  0,  0,  0,  0,208, 65,
-  0,  0,  0,  0,  0, 32,158, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,
-  0,  0,158, 68,  0,  0,200, 65,  0,  0,158, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,
-  4,  0, 12,  0, 10,  0,241,  4, 26,  0,241,  4, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,240,  4,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-241,  4, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,200,156,168,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 88,155,168,  5,  0,  0,  0,  0,  0,  0, 64,192,  0,  0,126, 67,  0,  0,  0,  0,  0,  0, 72, 66,
-112,189, 17,192,246, 70,125, 67,  0,  0,  0,  0,  0,  0, 72, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,240,  4,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0, 18,  0,  0,  0, 41,  0,  0,  0,
-  0,  0,128, 63,  0,  0, 72, 66,  0,124,146, 72,  0,  0, 72, 66,205,204,204, 61,  0,  0, 32, 65, 72,  0,  0,  0,  0,  0,  0,  2,
-  4,  0,  0,  4,  8,  0,241,  4, 42,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,240,  4,  0,  0, 26,  0,  0,  0, 67,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-241,  4, 42,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,208,  0,  0,  0, 56,158,168,  5,  0,  0,  0,  0,191,  0,  0,  0,  1,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0, 88,159,168,  5,  0,  0,  0,  0,
-215,  0,  0,  0,  1,  0,  0,  0, 72,167,168,  5,  0,  0,  0,  0,104,154,168,  5,  0,  0,  0,  0,136,140,168,  5,  0,  0,  0,  0,
-104,141,168,  5,  0,  0,  0,  0, 24,140,168,  5,  0,  0,  0,  0, 72,142,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,240,  4,  0,  0, 69,  0,  0,  0, 91,  1,  0,  0,  8,  8,241,  4, 23,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  8,166,168,  5,  0,  0,  0,  0,  8,166,168,  5,  0,  0,  0,  0, 72,160,168,  5,  0,  0,  0,  0,
-152,164,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 72,160,168,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,
-184,161,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 26, 68,  0,  0,  0,  0,  0,  0,208, 65,
-  0,  0,  0,  0,  0, 32,158, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,
-  0,  0,158, 68,  0,  0,200, 65,  0,  0,158, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,
-  4,  0, 12,  0, 10,  0,241,  4, 26,  0,241,  4, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,240,  4,  0,  0, 69,  0,  0,  0, 94,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-241,  4, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,184,161,168,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,
- 40,163,168,  5,  0,  0,  0,  0, 72,160,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 92, 67,  0,  0,125,195,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0, 75, 67,  1,  0,125,195,  0,  0,  0,  0,203,  0,  0,  0,220,  0,  0,  0,  0,  0,  0,  0,252,  0,  0,  0,
-  0,  0,  0,  0,202,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,202,  0,  0,  0,  0,  0,  0,  0,252,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0,
- 18,  0,  0,  4,  6,  0,220,  0,253,  0,203,  0,253,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 21,  4,  0,  0,240,  4,  0,  0, 95,  0,  0,  0, 91,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-220,  0,253,  0,  0,  0,  4,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 40,163,168,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,
-152,164,168,  5,  0,  0,  0,  0,184,161,168,  5,  0,  0,  0,  0,  0,  0,112,196,  0,  0,112, 68,  0,  0,  7,196,  0,  0,  7, 68,
-  0,  0,112,196,  0,  0,112, 68,  0,  0,  7,196,  0,  0,  7, 68,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 59, 70,  0,128, 59, 70,172,197, 39, 55,  0, 80,195, 71,  0,  0,  0,  0,  0,  0,  6,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 20,  4,  0,  0, 91,  1,  0,  0, 91,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  1,  0,  0,  0,  7,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,152,164,168,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 40,163,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,122, 67,  0,  0,  0,  0,  0,  0,  0, 65,
-  0,  0,  0,  0,  0,  0,122, 67,  0,  0,  0,  0,  0,  0,  0, 65,  0,  0,  0,  0, 17,  0,  0,  0, 18,  0,  0,  0,252,  0,  0,  0,
- 18,  0,  0,  0, 20,  4,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0, 18,  0,  0,  0, 20,  4,  0,  0, 18,  0,  0,  0,252,  0,  0,  0,
-  0,  0, 32, 65,  0,  0,  0, 63,  0,124,146, 72,  0,  0,  0, 66, 10,215, 35, 60,  0,  0,200, 66,105,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  4,  8,  0, 21,  4,253,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 20,  4,  0,  0, 95,  0,  0,  0, 91,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 21,  4,253,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,240,  0,  0,  0,  8,166,168,  5,  0,  0,  0,  0,181,  0,  0,  0,  1,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 64,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0, 72,167,168,  5,  0,  0,  0,  0,
-215,  0,  0,  0,  1,  0,  0,  0,248,175,168,  5,  0,  0,  0,  0, 88,159,168,  5,  0,  0,  0,  0,104,141,168,  5,  0,  0,  0,  0,
- 56,139,168,  5,  0,  0,  0,  0,248,140,168,  5,  0,  0,  0,  0,216,141,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 47,  2,  0,  0, 93,  1,  0,  0,194,  2,  0,  0,  2,  2, 48,  2,102,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,248,173,168,  5,  0,  0,  0,  0,248,173,168,  5,  0,  0,  0,  0, 56,168,168,  5,  0,  0,  0,  0,
-136,172,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 56,168,168,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,
-168,169,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64, 89, 68,  0,  0,  0,  0,  0,  0,208, 65,
-154,216, 65, 55,  0,  0, 12, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 47,  2,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,
-  0,192, 11, 68,  0,  0,200, 65,  0,192, 11, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,
-  4,  0, 12,  0, 10,  0, 48,  2, 26,  0, 48,  2, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 47,  2,  0,  0, 93,  1,  0,  0,118,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 48,  2, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,168,169,168,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,
- 24,171,168,  5,  0,  0,  0,  0, 56,168,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72, 67,  0,  0,112,193,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0, 72, 67,  0,  0,157,195,  0,  0,  0,  0,200,  0,  0,  0,217,  0,  0,  0, 18,  0,  0,  0, 75,  1,  0,  0,
-  0,  0,  0,  0,199,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,199,  0,  0,  0, 18,  0,  0,  0, 75,  1,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63, 10,  6,  0,  0,  2,  0,  3,  3,
-  0,  0,  0,  4,  6,  0,217,  0, 76,  1,200,  0, 58,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,216,  0,  0,  0,119,  1,  0,  0,194,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-217,  0, 76,  1,  0,  0,  2,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 24,171,168,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,
-136,172,168,  5,  0,  0,  0,  0,168,169,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 47,  2,  0,  0, 47,  2,  0,  0,119,  1,  0,  0,194,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  1,  0,  0,  0,  4,  0,  4,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,136,172,168,  5,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 24,171,168,  5,  0,  0,  0,  0,  0,  0, 16,193,  0,  0,130, 67,  0,  0,160,192,  0,  0,160, 64,
-  0,  0,  0,  0,  0,  0,122, 67,  0,  0, 16,193,  0,  0, 32, 65,  0,  0,  0,  0, 17,  0,  0,  0, 18,  0,  0,  0, 75,  1,  0,  0,
- 18,  0,  0,  0, 86,  1,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0, 18,  0,  0,  0, 86,  1,  0,  0, 18,  0,  0,  0, 75,  1,  0,  0,
-111, 18,131, 58,111, 18,131, 58,  0,124,146, 72,  0, 80, 67, 71,  0,  0,  0,  0,  0,  0,  0,  0,105,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  4,  0,  0, 87,  1, 76,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-217,  0,  0,  0, 47,  2,  0,  0,119,  1,  0,  0,194,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 87,  1, 76,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,240,  0,  0,  0,248,173,168,  5,  0,  0,  0,  0,179,  0,  0,  0,  1,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 56,175,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  2,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,112,  0,  0,  0, 56,175,168,  5,  0,  0,  0,  0,
- 38,  1,  0,  0,  1,  0,  0,  0,120,184,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,
-248,175,168,  5,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72,167,168,  5,  0,  0,  0,  0,
-216,141,168,  5,  0,  0,  0,  0,248,140,168,  5,  0,  0,  0,  0,168,139,168,  5,  0,  0,  0,  0, 24,140,168,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 49,  2,  0,  0,240,  4,  0,  0, 93,  1,  0,  0,194,  2,  0,  0,  8,  8,192,  2,102,  1,  1,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,168,182,168,  5,  0,  0,  0,  0,168,182,168,  5,  0,  0,  0,  0,
-232,176,168,  5,  0,  0,  0,  0, 56,181,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,232,176,168,  5,  0,  0,  0,  0,
-216,  0,  0,  0,  1,  0,  0,  0, 88,178,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,245, 67,
-  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0, 48, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,191,  2,  0,  0,
-  0,  0,  0,  0, 25,  0,  0,  0,  0,192, 47, 68,  0,  0,200, 65,  0,192, 47, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,192,  2, 26,  0,192,  2, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 49,  2,  0,  0,240,  4,  0,  0, 93,  1,  0,  0,118,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,192,  2, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0, 26,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 88,178,168,  5,  0,  0,  0,  0,
-216,  0,  0,  0,  1,  0,  0,  0,200,179,168,  5,  0,  0,  0,  0,232,176,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0,240,  4,  0,  0,119,  1,  0,  0,194,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  4,  0,  4,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,200,179,168,  5,  0,  0,  0,  0,
-216,  0,  0,  0,  1,  0,  0,  0, 56,181,168,  5,  0,  0,  0,  0, 88,178,168,  5,  0,  0,  0,  0,  0,  0,240,195,  0,  0,240, 67,
-  0,  0,135,195,  0,  0,135, 67,238, 33,143,196,238, 33,143, 68,  0,  0,  7,196,  0,  0,  7, 68,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,191,  2,  0,  0,
-  0,  0,  0,  0, 75,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 59, 70,  0,128, 59, 70,172,197, 39, 55,  0, 80,195, 71,
-  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  4,  0,  0,192,  2, 76,  1,192,  2, 76,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 49,  2,  0,  0,240,  4,  0,  0,119,  1,  0,  0,194,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,192,  2, 76,  1,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 56,181,168,  5,  0,  0,  0,  0,
-216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200,179,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,122, 67,
-  0,  0,  0,  0,  0,  0,  0, 65,  0,  0,  0,  0,  0,  0,122, 67,  0,  0,  0,  0,  0,  0,  0, 65,  0,  0,  0,  0, 17,  0,  0,  0,
- 18,  0,  0,  0, 75,  1,  0,  0, 18,  0,  0,  0,201,  2,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0, 18,  0,  0,  0,201,  2,  0,  0,
- 18,  0,  0,  0, 75,  1,  0,  0,  0,  0, 32, 65,  0,  0,  0, 63,  0,124,146, 72,  0,  0,  0, 66, 10,215, 35, 60,  0,  0,200, 66,
-105,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,  0,202,  2, 76,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,240,  0,  0,  0,168,182,168,  5,  0,  0,  0,  0,
-181,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 64,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67,  0,  0,216, 11,  0,  0,
-120,184,168,  5,  0,  0,  0,  0,172,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 83, 99,101,110,101,  0,116, 97,103,101,  0, 97,105,110,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-152,196,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0, 72,210,168,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,104,197,168,  5,  0,  0,  0,  0, 72,198,168,  5,  0,  0,  0,  0,104,197,168,  5,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,184,198,168,  5,  0,  0,  0,  0,
- 56,143,132,  5,  0,  0,  0,  0, 17,  2, 24,  0, 90, 90,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-192,  0,  0,  0, 68,172,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,
-250,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,100,  0,  0,  0,100,  0,  0,  0,  0,  0,  1,  0,  0,  0,128, 63,
-  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  2,224,  1, 60,  0, 32,  0,  0,  0,  1,  0,  0,  0,
-  1,  0,  0,  0,  6,  0, 50,  0,141,  0,128,  7, 56,  4,  8,  0,  8,  0, 24,  0, 17,  0,  0,  0, 90,  0,  1,  0, 81,  0,  0,  0,
- 23,  0, 33,  0,  2,  0,  0,  0,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  8,  0, 24,  0, 10,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,200,202,168,  5,  0,  0,  0,  0,200,202,168,  5,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  1,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  5,  0,  2,  0,  1,  0,  1,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 47,116,109,112, 47,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -5876,26 +5538,102 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,100,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,120, 26,222,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 40,242,221,  4,  0,  0,  0,  0, 24,233,221,  4,  0,  0,  0,  0,168,232,221,  4,  0,  0,  0,  0, 56,232,221,  4,
+  0,  0,  0,  0, 88,231,221,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,201,  3,  0,  0,126,  7,  0,  0,  0,  0,  0,  0,
+233,  3,  0,  0,  1,  1,182,  3,234,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152, 41,222,  4,
+  0,  0,  0,  0,152, 41,222,  4,  0,  0,  0,  0,104, 27,222,  4,  0,  0,  0,  0,104, 36,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  1,  0,  0,104, 27,222,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,216, 28,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0, 64,113, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,128,109, 68,  0,  0,  0,  0,
+  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,181,  3,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0, 64,109, 68,  0,  0,200, 65,  0, 64,109, 68,
+  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,182,  3, 26,  0,182,  3,
+ 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,201,  3,  0,  0,126,  7,  0,  0,  0,  0,  0,  0,
+ 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,182,  3, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  1,  0,  0,216, 28,222,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,232, 31,222,  4,  0,  0,  0,  0,104, 27,222,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 67,  0,  0, 86,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 67,  0,  0, 86,196,
+  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0,  0,  0,  0,  0, 87,  3,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0,
+ 17,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 87,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,160,  0, 88,  3,143,  0,
+ 88,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,201,  3,  0,  0,104,  4,  0,  0,146,  0,  0,  0,
+233,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160,  0, 88,  3,  0,  0,  5,  0,  3,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72, 30,222,  4,  0,  0,  0,  0, 72, 30,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 88,  1,  0,  0, 72, 30,222,  4,  0,  0,  0,  0,215,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,
+111,108,115, 95,111, 98,106,101, 99,116,109,111,100,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,116,111,
+111,108,115, 95,111, 98,106,101, 99,116,109,111,100,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79, 98,106,101, 99,116, 32, 84,111,111,108,115,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,233,253,143,  0,255,  1,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,232, 31,222,  4,  0,  0,  0,  0,217,  0,  0,  0,
+  1,  0,  0,  0,248, 34,222,  4,  0,  0,  0,  0,216, 28,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 33, 67,  0,  0,242,194,
+  0,  0,  0,  0,  0,  0,  0,  0,231,102, 16, 67, 91, 90,242,194,  0,  0,  0,  0,143,  0,  0,  0,160,  0,  0,  0,  0,  0,  0,  0,
+119,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,142,  0,  0,  0,  0,  0,  0,  0,
+119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,
+  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,160,  0,120,  0,143,  0,120,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,201,  3,  0,  0,104,  4,  0,  0, 26,  0,  0,  0,145,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,160,  0,120,  0,  0,  0,  6,  0, 34,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88, 33,222,  4,
+  0,  0,  0,  0, 88, 33,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 88,  1,  0,  0, 88, 33,222,  4,  0,  0,  0,  0,215,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,108, 97,115,116, 95,111,112,101,114, 97,116,111,114,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 86, 73, 69, 87, 51, 68, 95, 80, 84, 95,108, 97,115,116, 95,111,112,101,114, 97,116,111,114,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 79,112,101,114, 97,116,111,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,216,255,144,  0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  1,  0,  0,248, 34,222,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,104, 36,222,  4,  0,  0,  0,  0,232, 31,222,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 35, 67,  0,128,126,196,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 35, 67,255,191,126,196,
+  0,  0,  0,  0,163,  0,  0,  0,180,  0,  0,  0, 18,  0,  0,  0, 12,  4,  0,  0,  0,  0,  0,  0,162,  0,  0,  0,  0,  0,  0,  0,
+ 17,  0,  0,  0,  0,  0,  0,  0,162,  0,  0,  0, 18,  0,  0,  0, 12,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  0,  0,  0,  1,  0,  7,  0, 18,  0,  0,  0,  6,  0,180,  0, 13,  4,163,  0,
+251,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,126,  7,  0,  0,126,  7,  0,  0, 26,  0,  0,  0,
+233,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  4,  0,  4,  0,  1,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  1,  0,  0,104, 36,222,  4,  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248, 34,222,  4,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 31,  5,  0,  0, 12,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,105,  4,  0,  0,126,  7,  0,  0, 26,  0,  0,  0,
+233,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 22,  3,208,  3,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216, 37,222,  4,  0,  0,  0,  0, 68, 65, 84, 65,
+112,  3,  0,  0,216, 37,222,  4,  0,  0,  0,  0,175,  0,  0,  0,  1,  0,  0,  0, 72,246,172, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,140, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 28, 13,128,191,
+  0,  0,128,191,  0,  0,  0,  0,  0,  0,  0,  0, 74,215, 76,190,  0,  0,  0,  0, 68,239,209, 62, 51,177,205,190,184,158, 81, 63,
+  0,  0,  0,  0, 70,119,105, 63,143, 74, 70, 62, 35, 44,185,190,  0,  0,  0,  0,162, 84, 89,188,166, 33,101, 63, 42, 61,228, 62,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25, 95,192,  0,  0,128, 63, 69,239,209, 62, 70,119,105, 63,160, 84, 89,188,
+  0,  0,  0,  0, 52,177,205,190,142, 74, 70, 62,166, 33,101, 63,  0,  0,  0,  0,185,158, 81, 63, 35, 44,185,190, 43, 61,228, 62,
+  0,  0,  0,  0,188,173, 54, 64,136, 95,161,191,147,231,198, 63,  0,  0,128, 63,185,214, 13, 63,208,249,224,190, 48,180, 81,191,
+184,158, 81,191,189,188,157, 63,140,225, 88, 62, 26, 63,185, 62, 35, 44,185, 62,241,213,146,188,206,156,122, 63,138, 84,228,190,
+ 42, 61,228,190,  0,  0,  0,  0,  0,  0,  0,  0,100, 98, 82, 64,  0, 25, 95, 64,121, 92,155, 62,151,198, 44, 63,192,214, 32,188,
+  0,  0, 40,180,195, 15,188,190,132, 75, 53, 62,216,125, 81, 63,  0,  0,192,179,115, 77,100,193, 17,173,201, 64,181,148,248,192,
+203,247,159,192,233, 74, 87, 65,247, 46,190,192, 88,106,234, 64, 45,  8,160, 64, 68,239,209, 62, 51,177,205,190,184,158, 81, 63,
+  0,  0,  0,  0, 70,119,105, 63,143, 74, 70, 62, 35, 44,185,190,  0,  0,  0,  0,162, 84, 89,188,166, 33,101, 63, 42, 61,228, 62,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25, 95,192,  0,  0,128, 63,185,214, 13, 63,208,249,224,190, 48,180, 81,191,
+184,158, 81,191,189,188,157, 63,140,225, 88, 62, 26, 63,185, 62, 35, 44,185, 62,241,213,146,188,206,156,122, 63,138, 84,228,190,
+ 42, 61,228,190,  0,  0,  0,  0,  0,  0,  0,  0,100, 98, 82, 64,  0, 25, 95, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -5903,473 +5641,850 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248,201,250, 62,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,248,201,250, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248,201,250, 62,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63, 92, 62, 55, 63, 56,186,224,190,237,203,148,190,
+  3,236,234,190,  0, 25, 95, 64,  0, 25, 95, 64,  0,  0,  0,  0,  0,  0,  0,  0,114,145,245, 58,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  0,  0,255,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63, 30, 33, 12, 66, 85,152,137, 66,116, 27,126, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 96,  1,  0,  0,152, 41,222,  4,  0,  0,  0,  0,176,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
+ 51, 51, 51, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0, 32, 65,205,204, 76, 62,  2,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  7,  0,216,120,222,  4,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  3,  0,  0,  0,  1,  0,  3,  0,  8,  8,128,  0,
+  0,  0, 12, 66,  0,  0,128, 63,205,204,204, 61,  0,  0,250, 67,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0, 10,  0,  7,  1,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 78,  0,  0,
+  8,  1,  0,  0,216, 43,222,  4,  0,  0,  0,  0,212,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,184,228,221,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 82, 86,105,100,101,111, 32, 69,100,105,116,
+105,110,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40, 45,222,  4,  0,  0,  0,  0,248, 49,222,  4,  0,  0,  0,  0,104, 50,222,  4,
+  0,  0,  0,  0,216, 57,222,  4,  0,  0,  0,  0, 72, 58,222,  4,  0,  0,  0,  0,168, 83,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 32,  0,  0,  0, 40, 45,222,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,152, 45,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,152, 45,222,  4,
+  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  8, 46,222,  4,  0,  0,  0,  0, 40, 45,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,222,  2,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,  8, 46,222,  4,  0,  0,  0,  0,213,  0,  0,  0,
+  1,  0,  0,  0,120, 46,222,  4,  0,  0,  0,  0,152, 45,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  4,222,  2,
+  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,120, 46,222,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,232, 46,222,  4,
+  0,  0,  0,  0,  8, 46,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 32,  0,  0,  0,232, 46,222,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 88, 47,222,  4,  0,  0,  0,  0,120, 46,222,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,195,  2,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 88, 47,222,  4,
+  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,200, 47,222,  4,  0,  0,  0,  0,232, 46,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,240,  4,195,  2,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,200, 47,222,  4,  0,  0,  0,  0,213,  0,  0,  0,
+  1,  0,  0,  0, 56, 48,222,  4,  0,  0,  0,  0, 88, 47,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  4, 92,  1,
+  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 56, 48,222,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,168, 48,222,  4,
+  0,  0,  0,  0,200, 47,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 32,  0,  0,  0,168, 48,222,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0, 24, 49,222,  4,  0,  0,  0,  0, 56, 48,222,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48,  2,195,  2,  1,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0, 24, 49,222,  4,
+  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,136, 49,222,  4,  0,  0,  0,  0,168, 48,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0, 92,  1,  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,136, 49,222,  4,  0,  0,  0,  0,213,  0,  0,  0,
+  1,  0,  0,  0,248, 49,222,  4,  0,  0,  0,  0, 24, 49,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48,  2, 92,  1,
+  0,  0,  0,  0, 68, 65, 84, 65, 32,  0,  0,  0,248, 49,222,  4,  0,  0,  0,  0,213,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,136, 49,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  4, 68,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  0,  0,  0,104, 50,222,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,216, 50,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,152, 45,222,  4,  0,  0,  0,  0,  8, 46,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  0,  0,  0,216, 50,222,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 72, 51,222,  4,  0,  0,  0,  0,104, 50,222,  4,
+  0,  0,  0,  0,152, 45,222,  4,  0,  0,  0,  0,232, 46,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  0,  0,  0, 72, 51,222,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,184, 51,222,  4,  0,  0,  0,  0,216, 50,222,  4,
+  0,  0,  0,  0,  8, 46,222,  4,  0,  0,  0,  0, 88, 47,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  0,  0,  0,184, 51,222,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 40, 52,222,  4,  0,  0,  0,  0, 72, 51,222,  4,
+  0,  0,  0,  0,232, 46,222,  4,  0,  0,  0,  0, 88, 47,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  0,  0,  0, 40, 52,222,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,152, 52,222,  4,  0,  0,  0,  0,184, 51,222,  4,
+  0,  0,  0,  0, 88, 47,222,  4,  0,  0,  0,  0,200, 47,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  0,  0,  0,152, 52,222,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  8, 53,222,  4,  0,  0,  0,  0, 40, 52,222,  4,
+  0,  0,  0,  0, 40, 45,222,  4,  0,  0,  0,  0, 56, 48,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  0,  0,  0,  8, 53,222,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,120, 53,222,  4,  0,  0,  0,  0,152, 52,222,  4,
+  0,  0,  0,  0,232, 46,222,  4,  0,  0,  0,  0,168, 48,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  0,  0,  0,120, 53,222,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,232, 53,222,  4,  0,  0,  0,  0,  8, 53,222,  4,
+  0,  0,  0,  0, 56, 48,222,  4,  0,  0,  0,  0, 24, 49,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  0,  0,  0,232, 53,222,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 88, 54,222,  4,  0,  0,  0,  0,120, 53,222,  4,
+  0,  0,  0,  0, 24, 49,222,  4,  0,  0,  0,  0,136, 49,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  0,  0,  0, 88, 54,222,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,200, 54,222,  4,  0,  0,  0,  0,232, 53,222,  4,
+  0,  0,  0,  0,168, 48,222,  4,  0,  0,  0,  0,136, 49,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  0,  0,  0,200, 54,222,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 56, 55,222,  4,  0,  0,  0,  0, 88, 54,222,  4,
+  0,  0,  0,  0,200, 47,222,  4,  0,  0,  0,  0,248, 49,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  0,  0,  0, 56, 55,222,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,168, 55,222,  4,  0,  0,  0,  0,200, 54,222,  4,
+  0,  0,  0,  0,120, 46,222,  4,  0,  0,  0,  0,248, 49,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  0,  0,  0,168, 55,222,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0, 24, 56,222,  4,  0,  0,  0,  0, 56, 55,222,  4,
+  0,  0,  0,  0, 56, 48,222,  4,  0,  0,  0,  0,248, 49,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  0,  0,  0, 24, 56,222,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,136, 56,222,  4,  0,  0,  0,  0,168, 55,222,  4,
+  0,  0,  0,  0, 40, 45,222,  4,  0,  0,  0,  0,120, 46,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  0,  0,  0,136, 56,222,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,248, 56,222,  4,  0,  0,  0,  0, 24, 56,222,  4,
+  0,  0,  0,  0, 88, 47,222,  4,  0,  0,  0,  0,168, 48,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  0,  0,  0,248, 56,222,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,104, 57,222,  4,  0,  0,  0,  0,136, 56,222,  4,
+  0,  0,  0,  0,200, 47,222,  4,  0,  0,  0,  0,136, 49,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  0,  0,  0,104, 57,222,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,216, 57,222,  4,  0,  0,  0,  0,248, 56,222,  4,
+  0,  0,  0,  0,232, 46,222,  4,  0,  0,  0,  0, 24, 49,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  0,  0,  0,216, 57,222,  4,  0,  0,  0,  0,214,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,104, 57,222,  4,
+  0,  0,  0,  0,200, 47,222,  4,  0,  0,  0,  0, 24, 49,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+160,  0,  0,  0, 72, 58,222,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0, 24, 62,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,232, 46,222,  4,  0,  0,  0,  0,152, 45,222,  4,  0,  0,  0,  0,  8, 46,222,  4,  0,  0,  0,  0, 88, 47,222,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0,196,  2,  0,  0,222,  2,  0,  0,  7,  7,241,  4,
+ 27,  0,  1,  0,  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152, 91,222,  4,  0,  0,  0,  0,152, 91,222,  4,
+  0,  0,  0,  0, 56, 59,222,  4,  0,  0,  0,  0,168, 60,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 56, 59,222,  4,
+  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,168, 60,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,128,148, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0, 32,158, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+240,  4,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,158, 68,  0,  0,200, 65,  0,  0,158, 68,  0,  0,200, 65,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,241,  4, 26,  0,241,  4, 26,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0,196,  2,  0,  0,221,  2,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,241,  4, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,168, 60,222,  4,
+  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 56, 59,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,240,109, 69,  0,  0,128,192,  0,  0,  0,  0,  0,  0,  0,  0,255,255,109, 69,  0,  0,  0,192,  0,  0,  0,  0,112,  7,  0,  0,
+129,  7,  0,  0, 18,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,111,  7,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,
+111,  7,  0,  0, 18,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  2,  0,  0,  0,  1,  0,  3,  3,  2,  0,  0,  4, 10,  0,129,  7,  2,  0,112,  7,  1,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,222,  2,  0,  0,222,  2,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0, 24, 62,222,  4,
+  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  8, 67,222,  4,  0,  0,  0,  0, 72, 58,222,  4,  0,  0,  0,  0, 40, 45,222,  4,
+  0,  0,  0,  0, 56, 48,222,  4,  0,  0,  0,  0,248, 49,222,  4,  0,  0,  0,  0,120, 46,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0,  0,  0,  0,  0, 67,  0,  0,  0, 15, 15,241,  4, 68,  0,  1,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,232, 65,222,  4,  0,  0,  0,  0,232, 65,222,  4,  0,  0,  0,  0,  8, 63,222,  4,
+  0,  0,  0,  0,120, 64,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,  8, 63,222,  4,  0,  0,  0,  0,217,  0,  0,  0,
+  1,  0,  0,  0,120, 64,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,140, 68,  0,  0,  0,  0,
+  0,  0,208, 65,  0,  0,  0,  0,  0, 32,158, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0,  0,  0,  0,  0,
+ 25,  0,  0,  0,  0,  0,158, 68,  0,  0,200, 65,  0,  0,158, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,241,  4, 26,  0,241,  4, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,241,  4, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,120, 64,222,  4,  0,  0,  0,  0,217,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8, 63,222,  4,  0,  0,  0,  0,  0,  0, 64,192,  0,  0,126, 67,  0,  0,  0,  0,
+  0,  0, 72, 66,112,189, 17,192,246, 70,125, 67,  0,  0,  0,  0,  0,  0, 72, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0, 18,  0,  0,  0,
+ 41,  0,  0,  0,  0,  0,128, 63,  0,  0, 72, 66,  0,124,146, 72,  0,  0, 72, 66,205,204,204, 61,  0,  0, 32, 65, 72,  0,  0,  0,
+  0,  0,  0,  2,  4,  0,  0,  4,  8,  0,241,  4, 42,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0, 26,  0,  0,  0, 67,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,241,  4, 42,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,208,  0,  0,  0,232, 65,222,  4,  0,  0,  0,  0,185,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 31,  0,  0,  0,  1,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,  8, 67,222,  4,
+  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,248, 74,222,  4,  0,  0,  0,  0, 24, 62,222,  4,  0,  0,  0,  0, 56, 48,222,  4,
+  0,  0,  0,  0, 24, 49,222,  4,  0,  0,  0,  0,200, 47,222,  4,  0,  0,  0,  0,248, 49,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0, 69,  0,  0,  0, 91,  1,  0,  0,  8,  8,241,  4, 23,  1,  1,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,184, 73,222,  4,  0,  0,  0,  0,184, 73,222,  4,  0,  0,  0,  0,248, 67,222,  4,
+  0,  0,  0,  0, 72, 72,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,248, 67,222,  4,  0,  0,  0,  0,217,  0,  0,  0,
+  1,  0,  0,  0,104, 69,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 26, 68,  0,  0,  0,  0,
+  0,  0,208, 65,  0,  0,  0,  0,  0, 32,158, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0,  0,  0,  0,  0,
+ 25,  0,  0,  0,  0,  0,158, 68,  0,  0,200, 65,  0,  0,158, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,241,  4, 26,  0,241,  4, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0, 69,  0,  0,  0, 94,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,241,  4, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,104, 69,222,  4,  0,  0,  0,  0,217,  0,  0,  0,
+  1,  0,  0,  0,216, 70,222,  4,  0,  0,  0,  0,248, 67,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 92, 67,  0,  0,125,195,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 75, 67,  1,  0,125,195,  0,  0,  0,  0,203,  0,  0,  0,220,  0,  0,  0,  0,  0,  0,  0,
+252,  0,  0,  0,  0,  0,  0,  0,202,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,202,  0,  0,  0,  0,  0,  0,  0,
+252,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 64, 10,  3,  0,  0,
+  1,  0,  7,  0, 18,  0,  0,  4,  6,  0,220,  0,253,  0,203,  0,253,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 21,  4,  0,  0,240,  4,  0,  0, 95,  0,  0,  0, 91,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,220,  0,253,  0,  0,  0,  4,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-205,204, 76, 63,205,204, 76, 63,205,204, 76, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 62,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0, 16,  0,  0,  0,128, 63,  0,  0,128, 63,173,  2, 95,  0,154,153,217, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  1,  0,180,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 66, 76, 69, 78, 68, 69, 82, 95, 82, 69, 78, 68, 69, 82,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68,172,  0,  0,  0,  0,128, 63,102,166,171, 67,  0,  0,128, 63,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,216, 70,222,  4,  0,  0,  0,  0,217,  0,  0,  0,
+  1,  0,  0,  0, 72, 72,222,  4,  0,  0,  0,  0,104, 69,222,  4,  0,  0,  0,  0,  0,  0,112,196,  0,  0,112, 68,  0,  0,  7,196,
+  0,  0,  7, 68,  0,  0,112,196,  0,  0,112, 68,  0,  0,  7,196,  0,  0,  7, 68,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 48,194,132,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,192, 38,140,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,200,104, 99,  4,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 59, 70,  0,128, 59, 70,172,197, 39, 55,  0, 80,195, 71,  0,  0,  0,  0,
+  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 20,  4,  0,  0, 91,  1,  0,  0, 91,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  7,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  2,224,  1, 60,  0, 32,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  1,  0,180,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  5,  0,205,204,204, 61,154,153,153, 62,205,204, 76, 62,219, 15, 73, 63,102,102,102, 63,  0,  0,  0, 64,154,153, 25, 63,
-  0,  0, 64, 65,102,102,166, 63,  0,  0,  0, 65,  0,  0,160, 65,  6,  0,  0,  0,  0,  0,192, 64,  0,  0,128, 63,  0,  0,  0,  0,
-205,204, 28, 65,  0,  0,  0,  0, 32,  0,  0,  0, 32,  0,  1,  0,128,  0,  5,  0,218,  0,  0,  0, 60,  0,  5,  0,  1,  0,  5,  0,
-  0,  0,  0,  0,  0,  0,  0, 64,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-195,245, 28,193,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25,  0,  0, 38,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,128,  0,  0,  0,152,196,168,  5,  0,  0,  0,  0,  9,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 72, 72,222,  4,  0,  0,  0,  0,217,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216, 70,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,122, 67,  0,  0,  0,  0,
+  0,  0,  0, 65,  0,  0,  0,  0,  0,  0,122, 67,  0,  0,  0,  0,  0,  0,  0, 65,  0,  0,  0,  0, 17,  0,  0,  0, 18,  0,  0,  0,
+252,  0,  0,  0, 18,  0,  0,  0, 20,  4,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0, 18,  0,  0,  0, 20,  4,  0,  0, 18,  0,  0,  0,
+252,  0,  0,  0,  0,  0, 32, 65,  0,  0,  0, 63,  0,124,146, 72,  0,  0,  0, 66, 10,215, 35, 60,  0,  0,200, 66,105,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  4,  8,  0, 21,  4,253,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 20,  4,  0,  0, 95,  0,  0,  0, 91,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 21,  4,253,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 40,  0,  0,  0,104,197,168,  5,  0,  0,  0,  0,144,  0,  0,  0,  1,  0,  0,  0,216,197,168,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,224,  2,168,  1,184,219,168,  5,  0,  0,  0,  0,
- 68, 65, 84, 65, 40,  0,  0,  0,216,197,168,  5,  0,  0,  0,  0,144,  0,  0,  0,  1,  0,  0,  0, 72,198,168,  5,  0,  0,  0,  0,
-104,197,168,  5,  0,  0,  0,  0,  1,  0,  0,  0,  2,  0,  0,  0,  0,  4,  0,  0,183,  3,241,  2, 88,226,168,  5,  0,  0,  0,  0,
- 68, 65, 84, 65, 40,  0,  0,  0, 72,198,168,  5,  0,  0,  0,  0,144,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-216,197,168,  5,  0,  0,  0,  0,  1,  0,  0,  0,  3,  0,  0,  0,  0,  4,  0,  0,162,  0, 12,  2, 24,213,168,  5,  0,  0,  0,  0,
- 68, 65, 84, 65,248,  1,  0,  0,184,198,168,  5,  0,  0,  0,  0,168,  0,  0,  0,  1,  0,  0,  0,248,200,168,  5,  0,  0,  0,  0,
-136,201,168,  5,  0,  0,  0,  0, 24,202,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  1,  0,  0,  0,
-205,204, 76, 63,  0,  0,180, 66,  9,  0,  1,  0,  0,  0,128, 63,111, 18,131, 58,205,204,204, 61,  0,  0,  1,  0, 32,  0, 32,  0,
- 32,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  1,  0,  1,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,
-232, 25,170,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  2,  0, 80,  0,  0,  2,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  0,  5,  0,  5,  0,255,255,
- 50,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72, 66, 50,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200, 66,
- 50,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72, 66, 50,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72, 66,
- 50,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72, 66, 50,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72, 66,
- 50,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 62,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,240,  0,  0,  0,184, 73,222,  4,  0,  0,  0,  0,186,  0,  0,  0,
   1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63, 10,215, 35, 60,205,204,204, 61,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,250,  0,205,204,204, 61,205,204,204, 61,
-102,102,166, 63,  0,  0,192, 63,  0,  0,240, 65, 72,225,122, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
- 67,  2,  0,  3,  2,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0, 35,  0,  0,  0,204,197,121, 63,  0,  0,  0, 63, 35,  0,  0,  0,204,197,121, 63,
-  0,  0,  0, 63,  0,  0,128, 63, 49,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 64,  0,  0,  0,248,200,168,  5,  0,  0,  0,  0,
-165,  0,  0,  0,  1,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  1,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0, 18,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 64,  0,  0,  0,136,201,168,  5,  0,  0,  0,  0,165,  0,  0,  0,  1,  0,  0,  0,
-168,115,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200,200,255,128,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65,104,  0,  0,  0, 24,202,168,  5,  0,  0,  0,  0,163,  0,  0,  0,  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,255,100,100,128,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,128,  0,  0,  0,  1,  0,  0,  0,
-  1,  0,  0,  0,  1,  0,  0,  0,155,  9, 25, 67,190, 23,237, 64, 75,  1,147, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65,128,  0,  0,  0,200,202,168,  5,  0,  0,  0,  0,150,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 82,101,110,100,101,114, 76, 97,121,101,114,  0,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255, 15,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,255,127,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67, 65,  0,  0,200,  0,  0,  0,
-216,204,168,  5,  0,  0,  0,  0, 22,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67, 65, 67, 97,109,101,114, 97,  0, 97,109,101,114, 97, 46, 48,
- 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0, 63,205,204,204, 61,  0,  0,200, 66,
-  0,  0, 12, 66,161, 14,234, 64,  0,  0,  0, 63,  0,  0,  0, 66,  0,  0,144, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 76, 65,  0,  0, 16,  2,  0,  0,
-232,205,168,  5,  0,  0,  0,  0, 36,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 76, 65, 76, 97,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-247,255,239, 65,  0,  0,150, 66,154,153, 25, 62,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63, 72,208,168,  5,  0,  0,  0,  0,
-  2,  0,  0,  0, 46, 26,128, 63, 25,  4,240, 65,  0,  0, 52, 66,  0,  0,128, 63,  0,  0, 64, 64,205,204, 76, 61,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 64, 11,  3,  0,  1,  0,  0,  0,  0,  2,  1,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,111, 18,131, 58,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 64,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0, 32, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 64,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,248, 74,222,  4,
+  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,168, 83,222,  4,  0,  0,  0,  0,  8, 67,222,  4,  0,  0,  0,  0, 24, 49,222,  4,
+  0,  0,  0,  0,232, 46,222,  4,  0,  0,  0,  0,168, 48,222,  4,  0,  0,  0,  0,136, 49,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 47,  2,  0,  0, 93,  1,  0,  0,194,  2,  0,  0,  2,  2, 48,  2,102,  1,  1,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,168, 81,222,  4,  0,  0,  0,  0,168, 81,222,  4,  0,  0,  0,  0,232, 75,222,  4,
+  0,  0,  0,  0, 56, 80,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,232, 75,222,  4,  0,  0,  0,  0,217,  0,  0,  0,
+  1,  0,  0,  0, 88, 77,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64, 89, 68,  0,  0,  0,  0,
+  0,  0,208, 65,154,216, 65, 55,  0,  0, 12, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 47,  2,  0,  0,  0,  0,  0,  0,
+ 25,  0,  0,  0,  0,192, 11, 68,  0,  0,200, 65,  0,192, 11, 68,  0,  0,200, 65,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  2,  0,  3,  3,  4,  0, 12,  0, 10,  0, 48,  2, 26,  0, 48,  2, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 47,  2,  0,  0, 93,  1,  0,  0,118,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 48,  2, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 88, 77,222,  4,  0,  0,  0,  0,217,  0,  0,  0,
+  1,  0,  0,  0,200, 78,222,  4,  0,  0,  0,  0,232, 75,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72, 67,  0,  0,112,193,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72, 67,  0,  0,157,195,  0,  0,  0,  0,200,  0,  0,  0,217,  0,  0,  0, 18,  0,  0,  0,
+ 75,  1,  0,  0,  0,  0,  0,  0,199,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,199,  0,  0,  0, 18,  0,  0,  0,
+ 75,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63, 10,  6,  0,  0,
+  2,  0,  3,  3,  0,  0,  0,  4,  6,  0,217,  0, 76,  1,200,  0, 58,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,216,  0,  0,  0,119,  1,  0,  0,194,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,217,  0, 76,  1,  0,  0,  2,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,209,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65, 64,  1,  0,  0, 72,208,168,  5,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  2,  0,  1,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,243,  4, 53,191,242,  4, 53, 63,
-242,  4, 53,191,243,  4, 53, 63, 24, 73,137,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,200, 78,222,  4,  0,  0,  0,  0,217,  0,  0,  0,
+  1,  0,  0,  0, 56, 80,222,  4,  0,  0,  0,  0, 88, 77,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 47,  2,  0,  0, 47,  2,  0,  0,119,  1,  0,  0,194,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  4,  0,  4,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 24,  0,  0,  0,
- 24, 73,137,  5,  0,  0,  0,  0,125,  1,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,216,209,168,  5,  0,  0,  0,  0, 12,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 87, 79,  0,  0, 24,  2,  0,  0, 72,210,168,  5,  0,  0,  0,  0,143,  0,  0,  0,  1,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 87, 79, 87,111,114,108,100,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0, 56, 80,222,  4,  0,  0,  0,  0,217,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200, 78,222,  4,  0,  0,  0,  0,  0,  0, 16,193,  0,  0,130, 67,  0,  0,160,192,
+  0,  0,160, 64,  0,  0,  0,  0,  0,  0,122, 67,  0,  0, 16,193,  0,  0, 32, 65,  0,  0,  0,  0, 17,  0,  0,  0, 18,  0,  0,  0,
+ 75,  1,  0,  0, 18,  0,  0,  0, 86,  1,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0, 18,  0,  0,  0, 86,  1,  0,  0, 18,  0,  0,  0,
+ 75,  1,  0,  0,111, 18,131, 58,111, 18,131, 58,  0,124,146, 72,  0, 80, 67, 71,  0,  0,  0,  0,  0,  0,  0,  0,105,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  4,  0,  0, 87,  1, 76,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,217,  0,  0,  0, 47,  2,  0,  0,119,  1,  0,  0,194,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 87,  1, 76,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,114, 99, 80, 61,114, 99, 80, 61,114, 99, 80, 61,199, 54, 36, 60,199, 54, 36, 60,199, 54, 36, 60,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,205,204, 28, 65,  0,  0,  0,  0,  0,  0, 32,  0,128,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,160, 64,  0,  0,200, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0, 64,  0,  0,  0,  0,  0,  0,112, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 65,  0,  0,  0,  0,
-  0,  0,128, 63,205,204, 76, 61,  0,  0,  5,  0,  0,  0,  0,  0, 10,215,163, 59,  0,  0,  0,  0,  0,  0,128, 62,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  1,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,240,  0,  0,  0,168, 81,222,  4,  0,  0,  0,  0,182,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,168,212,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
-168,212,168,  5,  0,  0,  0,  0, 12,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79, 66,  0,  0,112,  5,  0,  0,
- 24,213,168,  5,  0,  0,  0,  0,130,  0,  0,  0,  1,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79, 66, 67, 97,109,101,114, 97,  0, 97,109,101,114, 97, 46, 48,
- 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 11,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,232, 82,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  2,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,112,  0,  0,  0,232, 82,222,  4,
+  0,  0,  0,  0, 38,  1,  0,  0,  1,  0,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+160,  0,  0,  0,168, 83,222,  4,  0,  0,  0,  0,216,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248, 74,222,  4,
+  0,  0,  0,  0,136, 49,222,  4,  0,  0,  0,  0,168, 48,222,  4,  0,  0,  0,  0, 88, 47,222,  4,  0,  0,  0,  0,200, 47,222,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 49,  2,  0,  0,240,  4,  0,  0, 93,  1,  0,  0,194,  2,  0,  0,  8,  8,192,  2,
+102,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88, 90,222,  4,  0,  0,  0,  0, 88, 90,222,  4,
+  0,  0,  0,  0,152, 84,222,  4,  0,  0,  0,  0,232, 88,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,152, 84,222,  4,
+  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,  8, 86,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,245, 67,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,  0,  0, 48, 68,  0,  0,  0,  0,  0,  0,208, 65,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+191,  2,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,192, 47, 68,  0,  0,200, 65,  0,192, 47, 68,  0,  0,200, 65,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  3,  3,  4,  0, 12,  0, 10,  0,192,  2, 26,  0,192,  2, 26,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 49,  2,  0,  0,240,  4,  0,  0, 93,  1,  0,  0,118,  1,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,192,  2, 26,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0, 26,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,204,168,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,250,  0,  0,  0, 10,  0,  0,  0, 10,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,
-  0,  0,  1,  0,  6,  0,  0,  0,  1,  0,  0,  0,250,  0,  0,  0, 10,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,  8, 86,222,  4,
+  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,120, 87,222,  4,  0,  0,  0,  0,152, 84,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,110,101,239, 64,150, 62,208,192, 78,255,170, 64,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 42,254,141, 63,192, 57, 49, 60,
- 34,159, 80, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,222,149, 47, 63, 53, 70, 58, 63,222, 56, 49,188,  0,  0,  0,  0,
- 86,126,162,190,227,251,159, 62, 55, 53,101, 63,  0,  0,  0,  0,  7,165, 39, 63,149, 84, 28,191, 51,247,227, 62,  0,  0,  0,  0,
-110,101,239, 64,150, 62,208,192, 78,255,170, 64,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  1,  0,128, 63,  1,  0,128, 51,  1,  0,  0,179,  0,  0,  0,  0,
-  0,  0,  0, 51,  0,  0,128, 63,  1,  0,128, 51,  0,  0,  0,  0,  2,  0,  0,179,  2,  0,  0,167,  1,  0,128, 63,  0,  0,  0,  0,
-  1,  0,  0, 53,  1,  0,  0, 41,  1,  0,128,168,  0,  0,128, 63,221,149, 47, 63, 86,126,162,190,  8,165, 39, 63,  0,  0,  0,  0,
- 51, 70, 58, 63,225,251,159, 62,149, 84, 28,191,  0,  0,  0,  0,192, 56, 49,188, 55, 53,101, 63, 52,247,227, 62,  0,  0,  0,  0,
- 90, 38,173,190,  0,222,192,190,152,  9, 52,193,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,
-  5,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,100,  0,  0,  0,  0,  0,  0,  0,
- 56,180,150,201,  0,  0,128, 63,187,225, 16, 63,  0,  0,128, 63,205,204,204, 62,237, 54, 32, 63,  0,  0,  0,  0,143,194,117, 61,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  2,  0,  1,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,240,  4,  0,  0,240,  4,  0,  0,119,  1,  0,  0,194,  2,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  4,  0,  4,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,120, 87,222,  4,
+  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,232, 88,222,  4,  0,  0,  0,  0,  8, 86,222,  4,  0,  0,  0,  0,  0,  0,240,195,
+  0,  0,240, 67,  0,  0,135,195,  0,  0,135, 67,238, 33,143,196,238, 33,143, 68,  0,  0,  7,196,  0,  0,  7, 68,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+191,  2,  0,  0,  0,  0,  0,  0, 75,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 59, 70,  0,128, 59, 70,172,197, 39, 55,
+  0, 80,195, 71,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  4,  0,  0,192,  2, 76,  1,192,  2, 76,  1,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 49,  2,  0,  0,240,  4,  0,  0,119,  1,  0,  0,194,  2,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,192,  2, 76,  1,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-216,218,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  1,  0,  0,232, 88,222,  4,
+  0,  0,  0,  0,217,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120, 87,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,122, 67,  0,  0,  0,  0,  0,  0,  0, 65,  0,  0,  0,  0,  0,  0,122, 67,  0,  0,  0,  0,  0,  0,  0, 65,  0,  0,  0,  0,
+ 17,  0,  0,  0, 18,  0,  0,  0, 75,  1,  0,  0, 18,  0,  0,  0,201,  2,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0, 18,  0,  0,  0,
+201,  2,  0,  0, 18,  0,  0,  0, 75,  1,  0,  0,  0,  0, 32, 65,  0,  0,  0, 63,  0,124,146, 72,  0,  0,  0, 66, 10,215, 35, 60,
+  0,  0,200, 66,105,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,  0,202,  2, 76,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 68, 65, 84, 65,152,  0,  0,  0,216,218,168,  5,  0,  0,  0,  0,133,  0,  0,  0,  1,  0,  0,  0,  0,192,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,205,204,204, 61,205,204, 76, 62, 10,215,163, 60,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0, 79, 66,  0,  0,112,  5,  0,  0,184,219,168,  5,  0,  0,  0,  0,
-130,  0,  0,  0,  1,  0,  0,  0, 88,226,168,  5,  0,  0,  0,  0, 24,213,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 79, 66, 67,117, 98,101,  0,112,104,101,114,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,240,  0,  0,  0, 88, 90,222,  4,
+  0,  0,  0,  0,186,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,171,100,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,184, 17,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  0,250,  0,  0,  0, 10,  0,  0,  0, 10,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  6,  0,  0,  0,
-  1,  0,  0,  0,250,  0,  0,  0, 10,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 64,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67,  0,  0,
+232, 11,  0,  0, 40, 92,222,  4,  0,  0,  0,  0,173,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 83, 67, 83, 99,101,110,101,  0,116, 97,103,101,
+  0, 97,105,110,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 88,104,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,  8,118,222,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40,105,222,  4,  0,  0,  0,  0,  8,106,222,  4,  0,  0,  0,  0, 40,105,222,  4,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
+  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,106,222,  4,
+  0,  0,  0,  0,216, 62,  2,224,255,127,  0,  0, 17,  2, 24,  0, 90, 90,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40,213,134,  5,  0,  0,  0,  0,136, 83,135,  5,  0,  0,  0,  0,
-  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  2,  0,  0,  0, 68,  0,
-  0,  0,  7,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,100,  0,  0,  0,  0,  0,  0,  0, 56,180,150,201,  0,  0,128, 63,
-169, 19,208, 60,  0,  0,128, 63,205,204,204, 62,229,208, 34, 62,  0,  0,  0,  0,143,194,117, 61,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  5,  0,  1,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,192,  0,  0,  0, 68,172,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
+  1,  0,  0,  0,250,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,100,  0,  0,  0,100,  0,  0,  0,  0,  0,  1,  0,
+  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  2,224,  1, 60,  0, 32,  0,  0,  0,
+  1,  0,  0,  0,  1,  0,  0,  0,  6,  0, 50,  0,141,  0,128,  7, 56,  4,  8,  0,  8,  0, 24,  0, 17,  0,  0,  0, 90,  0,  1,  0,
+ 81,  0,  0,  0, 23,  0, 33,  0,  2,  0,  0,  0,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  8,  0, 24,  0, 10,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136,110,222,  4,  0,  0,  0,  0,136,110,222,  4,  0,  0,  0,  0,  0,  0,  1,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  1,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  5,  0,  2,  0,  1,  0,  1,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 47,116,109,112,
+ 47,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 31,  5,  0,  0,
+ 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,205,204, 76, 63,205,204, 76, 63,205,204, 76, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0, 16,  0,  0,  0,128, 63,  0,  0,128, 63,173,  2, 95,  0,
+154,153,217, 63,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  1,  0,180,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 66, 76, 69, 78, 68, 69, 82, 95, 82, 69, 78, 68, 69, 82,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68,172,  0,  0,  0,  0,128, 63,102,166,171, 67,  0,  0,128, 63,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 96,164, 61,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,224, 48,190,  3,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,168, 91,145,  3,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,  2,224,  1, 60,  0, 32,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  1,  0,180,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  5,  0,205,204,204, 61,154,153,153, 62,205,204, 76, 62,219, 15, 73, 63,102,102,102, 63,  0,  0,  0, 64,
+154,153, 25, 63,  0,  0, 64, 65,102,102,166, 63,  0,  0,  0, 65,  0,  0,160, 65,  6,  0,  0,  0,  0,  0,192, 64,  0,  0,128, 63,
+  0,  0,  0,  0,205,204, 28, 65,  0,  0,  0,  0, 32,  0,  0,  0, 32,  0,  1,  0,128,  0,  5,  0,218,  0,  0,  0, 60,  0,  5,  0,
+  1,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0, 64,  0,  0,  0, 64,205,204, 76, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,195,245, 28,193,  1,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25,  0,  0, 38,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+128,  0,  0,  0, 88,104,222,  4,  0,  0,  0,  0,  9,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0, 64,  1,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,225,168,  5,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-120,247,139,  5,  0,  0,  0,  0, 24,149,132,  5,  0,  0,  0,  0, 25,  0,  0, 38,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0, 40,105,222,  4,
+  0,  0,  0,  0,145,  0,  0,  0,  1,  0,  0,  0,152,105,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
+  1,  0,  0,  0,  1,  0,  0,  0,226,  2,214,  1,136,127,222,  4,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,152,105,222,  4,
+  0,  0,  0,  0,145,  0,  0,  0,  1,  0,  0,  0,  8,106,222,  4,  0,  0,  0,  0, 40,105,222,  4,  0,  0,  0,  0,  1,  0,  0,  0,
+  2,  0,  0,  0,  0,  4,  0,  0,185,  3, 32,  3, 56,134,222,  4,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,  8,106,222,  4,
+  0,  0,  0,  0,145,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152,105,222,  4,  0,  0,  0,  0,  1,  0,  0,  0,
+  3,  0,  0,  0,  0,  4,  0,  0,163,  0, 59,  2,216,120,222,  4,  0,  0,  0,  0, 68, 65, 84, 65,248,  1,  0,  0,120,106,222,  4,
+  0,  0,  0,  0,169,  0,  0,  0,  1,  0,  0,  0,184,108,222,  4,  0,  0,  0,  0, 72,109,222,  4,  0,  0,  0,  0,216,109,222,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  1,  0,  0,  0,205,204, 76, 63,  0,  0,180, 66,  9,  0,  1,  0,
+  0,  0,128, 63,111, 18,131, 58,205,204,204, 61,  0,  0,  1,  0, 32,  0, 32,  0, 32,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  1,  0,  1,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,255,255,255,128,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0, 80,  0,  0,  2,  0,  2,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  0,  5,  0,  5,  0,255,255, 50,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 72, 66, 50,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200, 66, 50,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 72, 66, 50,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72, 66, 50,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 72, 66, 50,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72, 66, 50,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 72, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 62,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63, 10,215, 35, 60,205,204,204, 61,
+  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,250,  0,205,204,204, 61,205,204,204, 61,102,102,166, 63,  0,  0,192, 63,  0,  0,240, 65,
+ 72,225,122, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 67,  2,  0,  3,  2,  0,  1,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,
+ 35,  0,  0,  0,204,197,121, 63,  0,  0,  0, 63, 35,  0,  0,  0, 21,178,129, 63,  0,  0,  0, 63,  0,  0,128, 63, 49,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65, 64,  0,  0,  0,184,108,222,  4,  0,  0,  0,  0,166,  0,  0,  0,  1,  0,  0,  0,104, 24,223,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0, 18,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 64,  0,  0,  0, 72,109,222,  4,  0,  0,  0,  0,166,  0,  0,  0,  1,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,200,200,255,128,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,104,  0,  0,  0,216,109,222,  4,
+  0,  0,  0,  0,164,  0,  0,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,100,100,128,
+  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,128,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,190,110,250, 66,
+ 72,134,143, 65,216,  8, 42, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,128,  0,  0,  0,136,110,222,  4,
+  0,  0,  0,  0,151,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 82,101,110,100,
+101,114, 76, 97,121,101,114,  0,114,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,127,  0,  0,  3,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67, 65,  0,  0,200,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0, 22,  0,  0,  0,
   1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,  8,  0,  0,  0,
- 40,213,134,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,  4,  0,  0,  0,
-136, 83,135,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,152,  0,  0,  0,120,225,168,  5,
-  0,  0,  0,  0,133,  0,  0,  0,  1,  0,  0,  0,  0,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 67, 65, 67, 97,109,101,114, 97,  0, 97,109,101,114, 97, 46, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,205,204,204, 61,205,204, 76, 62, 10,215,163, 60,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0, 63,205,204,204, 61,  0,  0,200, 66,  0,  0, 12, 66,161, 14,234, 64,  0,  0,  0, 63,
+  0,  0,  0, 66,  0,  0,144, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 76, 65,  0,  0, 16,  2,  0,  0,168,113,222,  4,  0,  0,  0,  0, 35,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 76, 65, 76, 97,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 72,  0,  0,  0, 79, 66,  0,  0,112,  5,  0,  0, 88,226,168,  5,  0,  0,  0,  0,130,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,184,219,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79, 66, 76, 97,
-109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,247,255,239, 65,  0,  0,150, 66,154,153, 25, 62,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  8,116,222,  4,  0,  0,  0,  0,  2,  0,  0,  0, 46, 26,128, 63, 25,  4,240, 65,
+  0,  0, 52, 66,  0,  0,128, 63,  0,  0, 64, 64,205,204, 76, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64, 11,  3,  0,
+  1,  0,  0,  0,  0,  2,  1,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,111, 18,131, 58,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0, 64,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0, 32, 65,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,152,117,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 64,  1,  0,  0,  8,116,222,  4,
+  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  2,  0,  1,  0,
+  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,243,  4, 53,191,242,  4, 53, 63,242,  4, 53,191,243,  4, 53, 63, 40,  5,191,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 24,  0,  0,  0, 40,  5,191,  4,  0,  0,  0,  0,125,  1,  0,  0,
+  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
+ 40,  0,  0,  0,152,117,222,  4,  0,  0,  0,  0, 12,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 87, 79,  0,  0,
+ 24,  2,  0,  0,  8,118,222,  4,  0,  0,  0,  0,144,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 87, 79, 87,111,114,108,100,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,114, 99, 80, 61,
+114, 99, 80, 61,114, 99, 80, 61,199, 54, 36, 60,199, 54, 36, 60,199, 54, 36, 60,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,205,204, 28, 65,
+  0,  0,  0,  0,  0,  0, 32,  0,128,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,160, 64,  0,  0,200, 65,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64,  0,  0,  0,  0,  0,  0,112, 65,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 65,  0,  0,  0,  0,  0,  0,128, 63,205,204, 76, 61,  0,  0,  5,  0,
+  0,  0,  0,  0, 10,215,163, 59,  0,  0,  0,  0,  0,  0,128, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  1,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,104,120,222,  4,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,104,120,222,  4,  0,  0,  0,  0, 12,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79, 66,  0,  0,128,  5,  0,  0,216,120,222,  4,  0,  0,  0,  0,131,  0,  0,  0,
+  1,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 79, 66, 67, 97,109,101,114, 97,  0, 97,109,101,114, 97, 46, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 11,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152,112,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
+250,  0,  0,  0, 10,  0,  0,  0, 10,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  6,  0,  0,  0,  1,  0,  0,  0,
+250,  0,  0,  0, 10,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,232,205,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,250,  0,  0,  0, 10,  0,  0,  0,
- 10,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  6,  0,  0,  0,  1,  0,  0,  0,250,  0,  0,  0, 10,  0,  0,  0,
- 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,154,112,130, 64,
-183,178,128, 63,112,236,188, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,229,123, 38, 63, 87, 43, 98, 61,229,229,238, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,110,101,239, 64,150, 62,208,192, 78,255,170, 64,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 42,254,141, 63,192, 57, 49, 60, 34,159, 80, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,222,149, 47, 63, 53, 70, 58, 63,222, 56, 49,188,  0,  0,  0,  0, 86,126,162,190,227,251,159, 62, 55, 53,101, 63,
+  0,  0,  0,  0,  7,165, 39, 63,149, 84, 28,191, 51,247,227, 62,  0,  0,  0,  0,110,101,239, 64,150, 62,208,192, 78,255,170, 64,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 54,236,148,190,
- 25,134,116, 63,236, 13, 98,189,  0,  0,  0,  0,221,102, 69,191, 57,174, 76,190, 34,194, 26, 63,  0,  0,  0,  0, 37,255, 16, 63,
-241,161, 95, 62,164,111, 75, 63,  0,  0,  0,  0,154,112,130, 64,183,178,128, 63,112,236,188, 64,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  1,  0,128, 50,  0,  0,  0,179,  0,  0,  0,  0,  1,  0,128, 50,  1,  0,128, 63,  1,  0,  0, 51,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  1,  0,  0, 39,  1,  0,  0, 52,  1,  0,128, 39,  0,  0,128, 63, 54,236,148,190,
-221,102, 69,191, 38,255, 16, 63,  0,  0,  0,  0, 24,134,116, 63, 57,174, 76,190,239,161, 95, 62,  0,  0,  0,  0,237, 13, 98,189,
- 35,194, 26, 63,166,111, 75, 63,  0,  0,  0,  0,209, 19, 13, 63,241, 65,102,190, 10, 10,231,192,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  1,  0,128, 63,  1,  0,128, 51,  1,  0,  0,179,  0,  0,  0,  0,  0,  0,  0, 51,  0,  0,128, 63,  1,  0,128, 51,
+  0,  0,  0,  0,  2,  0,  0,179,  2,  0,  0,167,  1,  0,128, 63,  0,  0,  0,  0,  1,  0,  0, 53,  1,  0,  0, 41,  1,  0,128,168,
+  0,  0,128, 63,221,149, 47, 63, 86,126,162,190,  8,165, 39, 63,  0,  0,  0,  0, 51, 70, 58, 63,225,251,159, 62,149, 84, 28,191,
+  0,  0,  0,  0,192, 56, 49,188, 55, 53,101, 63, 52,247,227, 62,  0,  0,  0,  0, 90, 38,173,190,  0,222,192,190,152,  9, 52,193,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  5,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,100,  0,  0,  0,  0,  0,  0,  0, 56,180,150,201,  0,  0,128, 63,187,225, 16, 63,
+  0,  0,128, 63,205,204,204, 62,237, 54, 32, 63,  0,  0,  0,  0,143,194,117, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  2,  0,  1,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,168,126,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 68, 65, 84, 65,152,  0,  0,  0,168,126,222,  4,  0,  0,  0,  0,134,  0,  0,  0,  1,  0,  0,  0,  0,192,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,205,204,204, 61,205,204, 76, 62, 10,215,163, 60,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0, 79, 66,  0,  0,128,  5,  0,  0,136,127,222,  4,
+  0,  0,  0,  0,131,  0,  0,  0,  1,  0,  0,  0, 56,134,222,  4,  0,  0,  0,  0,216,120,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79, 66, 67,117, 98,101,  0,112,104,101,114,101,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40,136,133,  3,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,168,181,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,250,  0,  0,  0, 10,  0,  0,  0, 10,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,
+  6,  0,  0,  0,  1,  0,  0,  0,250,  0,  0,  0, 10,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248,105,149,  3,  0,  0,  0,  0, 88,106,186,  4,
+  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  2,  0,
+  0,  0, 68,  0,  0,  0,  7,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,100,  0,  0,  0,  0,  0,  0,  0, 56,180,150,201,
+  0,  0,128, 63,169, 19,208, 60,  0,  0,128, 63,205,204,204, 62,229,208, 34, 62,  0,  0,  0,  0,143,194,117, 61,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  5,  0,  1,  0,  0,  0, 68,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  0,100,  0,  0,  0,  0,  0,  0,  0, 56,180,150,201,  0,  0,128, 63,169, 19,208, 60,  0,  0,128, 63,205,204,204, 62,
-229,208, 34, 62,  0,  0,  0,  0,143,194,117, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
   0,  5,  0,  1,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0, 64,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24,232,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88,133,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136,222,186,  4,  0,  0,  0,  0,216,236,188,  4,
+  0,  0,  0,  0, 25,  0,  0, 38,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,  8,  0,  0,  0,248,105,149,  3,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,  4,  0,  0,  0, 88,106,186,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,152,  0,  0,  0, 88,133,222,  4,  0,  0,  0,  0,134,  0,  0,  0,  1,  0,  0,  0,
+  0,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,152,  0,  0,  0, 24,232,168,  5,  0,  0,  0,  0,133,  0,  0,  0,
-  1,  0,  0,  0,  0,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,205,204,204, 61,205,204, 76, 62,
+ 10,215,163, 60,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72,  0,  0,  0, 79, 66,  0,  0,128,  5,  0,  0,
+ 56,134,222,  4,  0,  0,  0,  0,131,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136,127,222,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79, 66, 76, 97,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,205,204,204, 61,
-205,204, 76, 62, 10,215,163, 60,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0, 77, 65,  0,  0,
-128,  3,  0,  0,248,232,168,  5,  0,  0,  0,  0, 39,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  4,  8, 90,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 77, 65, 77, 97,116,101,114,105, 97,108,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,205,204, 76, 63,205,204, 76, 63,
-205,204, 76, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-205,204, 76, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 10,215, 35, 60,  0,  0,  0,  0,  0,  0,  8,  0,  1,  0, 50,  0,205,204, 76, 62,
-  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,160, 63,  0,  0,  0,  0,  0,  0,160, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  2,  0,  2,  0, 50,  0,  0,  6,
-  0,  0,128, 63,  0,  0,128, 63, 18,  0, 18,  0, 10,215,163, 59, 10,215,163, 59,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  4,  0,
- 67,  0, 64,  3, 67,  0, 64,  3,  1,  0,  4,  0, 12,  0,  4,  0,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,128, 64,
-  0,  0,  0, 63,205,204,204, 61,  0,  0,  0, 63,205,204,204, 61,205,204,204, 61,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,200,236,168,  5,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,168,113,222,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,250,  0,  0,  0, 10,  0,  0,  0, 10,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,
+  0,  0,  1,  0,  6,  0,  0,  0,  1,  0,  0,  0,250,  0,  0,  0, 10,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,154,112,130, 64,183,178,128, 63,112,236,188, 64,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,229,123, 38, 63, 87, 43, 98, 61,
+229,229,238, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 54,236,148,190, 25,134,116, 63,236, 13, 98,189,  0,  0,  0,  0,
+221,102, 69,191, 57,174, 76,190, 34,194, 26, 63,  0,  0,  0,  0, 37,255, 16, 63,241,161, 95, 62,164,111, 75, 63,  0,  0,  0,  0,
+154,112,130, 64,183,178,128, 63,112,236,188, 64,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  1,  0,128, 50,  0,  0,  0,179,  0,  0,  0,  0,
+  1,  0,128, 50,  1,  0,128, 63,  1,  0,  0, 51,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
+  1,  0,  0, 39,  1,  0,  0, 52,  1,  0,128, 39,  0,  0,128, 63, 54,236,148,190,221,102, 69,191, 38,255, 16, 63,  0,  0,  0,  0,
+ 24,134,116, 63, 57,174, 76,190,239,161, 95, 62,  0,  0,  0,  0,237, 13, 98,189, 35,194, 26, 63,166,111, 75, 63,  0,  0,  0,  0,
+209, 19, 13, 63,241, 65,102,190, 10, 10,231,192,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,
+  5,  0,  1,  0,  0,  0, 68,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,100,  0,  0,  0,  0,  0,  0,  0,
+ 56,180,150,201,  0,  0,128, 63,169, 19,208, 60,  0,  0,128, 63,205,204,204, 62,229,208, 34, 62,  0,  0,  0,  0,143,194,117, 61,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  0,  0,  0,  5,  0,  1,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 64,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,140,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 72,238,168,  5,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,111,148, 26, 63,111,148, 26, 63,111,148, 26, 63,205,204, 76, 61,
-205,204,204, 61,102,102,166, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,200,236,168,  5,
-  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,255,168,  5,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,152,  0,  0,  0,  8,140,222,  4,  0,  0,  0,  0,
+134,  0,  0,  0,  1,  0,  0,  0,  0,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+205,204,204, 61,205,204, 76, 62, 10,215,163, 60,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
+ 77, 65,  0,  0,128,  3,  0,  0,232,140,222,  4,  0,  0,  0,  0, 38,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  4,  8, 90,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 77, 65, 77, 97,116,101,114,105,
+ 97,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,205,204, 76, 63,
+205,204, 76, 63,205,204, 76, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,205,204, 76, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 10,215, 35, 60,  0,  0,  0,  0,  0,  0,  8,  0,  1,  0, 50,  0,
+205,204, 76, 62,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,160, 63,  0,  0,  0,  0,  0,  0,160, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  2,  0,  2,  0,
+ 50,  0,  0,  6,  0,  0,128, 63,  0,  0,128, 63, 18,  0, 18,  0, 10,215,163, 59, 10,215,163, 59,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,  4,  0, 67,  0, 64,  3, 67,  0, 64,  3,  1,  0,  4,  0, 12,  0,  4,  0,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
+  0,  0,128, 64,  0,  0,  0, 63,205,204,204, 61,  0,  0,  0, 63,205,204,204, 61,205,204,204, 61,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+184,144,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 56,146,222,  4,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,111,148, 26, 63,111,148, 26, 63,111,148, 26, 63,
+205,204, 76, 61,205,204,204, 61,102,102,166, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,
+184,144,222,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+248,162,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
   0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63, 68, 65, 84, 65, 40,  0,  0,  0, 72,238,168,  5,  0,  0,  0,  0, 12,  0,  0,  0,  1,  0,  0,  0, 32,  0,  0,  0,
-  0,  0,  0,  0, 32,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0, 53,  0, 53,  0,184,238,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65,  0, 16,  0,  0,184,238,168,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  2,  2, 51,  2,  2,  2, 51,  6,  6,  6,153,  6,  6,  6,153,  6,  6,  6,153,
-  4,  4,  4,102,  3,  3,  3,102,  2,  2,  2, 51,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  3,  3, 51,  8,  8,  8,153, 11, 11, 11,204, 13, 13, 13,255, 12, 12, 12,255, 12, 12, 12,255, 11, 11, 11,255, 10, 10, 10,255,
- 10, 10, 10,255,  9,  9,  9,255,  9,  9,  9,255,  9,  9,  9,255,  4,  4,  4,102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  3,  3, 51, 10, 10, 10,153,
- 18, 18, 18,255, 20, 20, 20,255, 22, 22, 22,255, 23, 23, 23,255, 22, 22, 22,255, 20, 20, 20,255, 19, 19, 19,255, 16, 16, 16,255,
- 14, 14, 14,255, 11, 11, 11,255, 10, 10, 10,255,  9,  9,  9,255,  9,  9,  9,255,  9,  9,  9,255,  8,  8,  8,204,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  7,  7,102, 19, 19, 19,204, 27, 27, 27,255,
- 31, 31, 31,255, 32, 32, 32,255, 33, 33, 33,255, 33, 33, 33,255, 31, 31, 31,255, 30, 30, 30,255, 27, 27, 27,255, 25, 25, 25,255,
- 22, 22, 22,255, 19, 19, 19,255, 16, 16, 16,255, 12, 12, 12,255, 10, 10, 10,255, 10, 10, 10,255, 10, 10, 10,255, 10, 10, 10,255,
-  4,  4,  4,102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 13, 13, 13,153, 29, 29, 29,255, 37, 37, 37,255, 40, 40, 40,255,
- 42, 42, 42,255, 42, 42, 42,255, 43, 43, 43,255, 41, 41, 41,255, 40, 40, 40,255, 38, 38, 38,255, 36, 36, 36,255, 33, 33, 33,255,
- 30, 30, 30,255, 27, 27, 27,255, 24, 24, 24,255, 20, 20, 20,255, 16, 16, 16,255, 12, 12, 12,255, 10, 10, 10,255, 10, 10, 10,255,
- 10, 10, 10,255,  7,  7,  7,153,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 13, 13, 13,102, 37, 37, 37,255, 44, 44, 44,255, 48, 48, 48,255, 50, 50, 50,255,
- 51, 51, 51,255, 51, 51, 51,255, 50, 50, 50,255, 49, 49, 49,255, 48, 48, 48,255, 45, 45, 45,255, 43, 43, 43,255, 41, 41, 41,255,
- 37, 37, 37,255, 34, 34, 34,255, 31, 31, 31,255, 28, 28, 28,255, 24, 24, 24,255, 20, 20, 20,255, 15, 15, 15,255, 11, 11, 11,255,
- 10, 10, 10,255, 11, 11, 11,255,  7,  7,  7,153,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 13, 13, 13,102, 41, 41, 41,255, 50, 50, 50,255, 54, 54, 54,255, 57, 57, 57,255, 58, 58, 58,255,
- 59, 59, 59,255, 59, 59, 59,255, 58, 58, 58,255, 57, 57, 57,255, 55, 55, 55,255, 53, 53, 53,255, 51, 51, 51,255, 48, 48, 48,255,
- 45, 45, 45,255, 41, 41, 41,255, 38, 38, 38,255, 35, 35, 35,255, 31, 31, 31,255, 27, 27, 27,255, 23, 23, 23,255, 17, 17, 17,255,
- 12, 12, 12,255, 11, 11, 11,255, 11, 11, 11,255,  5,  5,  5,102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 36, 36, 36,204, 53, 53, 53,255, 59, 59, 59,255, 63, 63, 63,255, 65, 65, 65,255, 66, 66, 66,255,
- 66, 66, 66,255, 66, 66, 66,255, 65, 65, 65,255, 64, 64, 64,255, 62, 62, 62,255, 60, 60, 60,255, 57, 57, 57,255, 54, 54, 54,255,
- 51, 51, 51,255, 48, 48, 48,255, 44, 44, 44,255, 41, 41, 41,255, 37, 37, 37,255, 33, 33, 33,255, 29, 29, 29,255, 24, 24, 24,255,
- 19, 19, 19,255, 13, 13, 13,255, 11, 11, 11,255, 12, 12, 12,255,  3,  3,  3, 51,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 19, 19, 19,102, 56, 56, 56,255, 64, 64, 64,255, 68, 68, 68,255, 71, 71, 71,255, 73, 73, 73,255, 74, 74, 74,255,
- 74, 74, 74,255, 73, 73, 73,255, 72, 72, 72,255, 71, 71, 71,255, 69, 69, 69,255, 67, 67, 67,255, 64, 64, 64,255, 61, 61, 61,255,
- 58, 58, 58,255, 54, 54, 54,255, 50, 50, 50,255, 47, 47, 47,255, 43, 43, 43,255, 39, 39, 39,255, 34, 34, 34,255, 30, 30, 30,255,
- 25, 25, 25,255, 19, 19, 19,255, 13, 13, 13,255, 12, 12, 12,255, 10, 10, 10,204,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 54, 54, 54,255, 66, 66, 66,255, 72, 72, 72,255, 77, 77, 77,255, 79, 79, 79,255, 81, 81, 81,255, 81, 81, 81,255,
- 81, 81, 81,255, 80, 80, 80,255, 79, 79, 79,255, 77, 77, 77,255, 75, 75, 75,255, 73, 73, 73,255, 70, 70, 70,255, 67, 67, 67,255,
- 63, 63, 63,255, 60, 60, 60,255, 56, 56, 56,255, 52, 52, 52,255, 49, 49, 49,255, 44, 44, 44,255, 40, 40, 40,255, 35, 35, 35,255,
- 30, 30, 30,255, 24, 24, 24,255, 18, 18, 18,255, 12, 12, 12,255, 12, 12, 12,255,  6,  6,  6,102,  0,  0,  0,  0,  0,  0,  0,  0,
- 22, 22, 22,102, 67, 67, 67,255, 76, 76, 76,255, 81, 81, 81,255, 84, 84, 84,255, 87, 87, 87,255, 88, 88, 88,255, 88, 88, 88,255,
- 88, 88, 88,255, 87, 87, 87,255, 86, 86, 86,255, 84, 84, 84,255, 82, 82, 82,255, 79, 79, 79,255, 76, 76, 76,255, 73, 73, 73,255,
- 69, 69, 69,255, 65, 65, 65,255, 62, 62, 62,255, 58, 58, 58,255, 54, 54, 54,255, 49, 49, 49,255, 45, 45, 45,255, 40, 40, 40,255,
- 35, 35, 35,255, 29, 29, 29,255, 23, 23, 23,255, 16, 16, 16,255, 12, 12, 12,255, 12, 12, 12,204,  0,  0,  0,  0,  0,  0,  0,  0,
- 49, 49, 49,204, 76, 76, 76,255, 84, 84, 84,255, 89, 89, 89,255, 92, 92, 92,255, 94, 94, 94,255, 95, 95, 95,255, 95, 95, 95,255,
- 95, 95, 95,255, 94, 94, 94,255, 93, 93, 93,255, 91, 91, 91,255, 88, 88, 88,255, 85, 85, 85,255, 82, 82, 82,255, 79, 79, 79,255,
- 75, 75, 75,255, 71, 71, 71,255, 67, 67, 67,255, 63, 63, 63,255, 59, 59, 59,255, 55, 55, 55,255, 50, 50, 50,255, 45, 45, 45,255,
- 40, 40, 40,255, 34, 34, 34,255, 28, 28, 28,255, 21, 21, 21,255, 13, 13, 13,255, 14, 14, 14,255,  0,  0,  0,  0, 14, 14, 14,102,
- 70, 70, 70,255, 85, 85, 85,255, 92, 92, 92,255, 97, 97, 97,255,100,100,100,255,102,102,102,255,102,102,102,255,103,103,103,255,
-102,102,102,255,101,101,101,255, 99, 99, 99,255, 97, 97, 97,255, 94, 94, 94,255, 91, 91, 91,255, 88, 88, 88,255, 84, 84, 84,255,
- 81, 81, 81,255, 77, 77, 77,255, 72, 72, 72,255, 68, 68, 68,255, 64, 64, 64,255, 59, 59, 59,255, 55, 55, 55,255, 50, 50, 50,255,
- 44, 44, 44,255, 39, 39, 39,255, 32, 32, 32,255, 25, 25, 25,255, 17, 17, 17,255, 13, 13, 13,255,  7,  7,  7,102, 24, 24, 24,102,
- 80, 80, 80,255, 93, 93, 93,255,100,100,100,255,104,104,104,255,107,107,107,255,109,109,109,255,109,109,109,255,109,109,109,255,
-109,109,109,255,107,107,107,255,106,106,106,255,103,103,103,255,100,100,100,255, 97, 97, 97,255, 94, 94, 94,255, 90, 90, 90,255,
- 86, 86, 86,255, 82, 82, 82,255, 77, 77, 77,255, 73, 73, 73,255, 69, 69, 69,255, 64, 64, 64,255, 59, 59, 59,255, 54, 54, 54,255,
- 49, 49, 49,255, 43, 43, 43,255, 36, 36, 36,255, 29, 29, 29,255, 21, 21, 21,255, 14, 14, 14,255, 10, 10, 10,153, 29, 29, 29,102,
- 89, 89, 89,255,100,100,100,255,107,107,107,255,112,112,112,255,114,114,114,255,116,116,116,255,116,116,116,255,116,116,116,255,
-115,115,115,255,114,114,114,255,112,112,112,255,110,110,110,255,107,107,107,255,104,104,104,255,100,100,100,255, 96, 96, 96,255,
- 92, 92, 92,255, 87, 87, 87,255, 83, 83, 83,255, 78, 78, 78,255, 73, 73, 73,255, 68, 68, 68,255, 63, 63, 63,255, 58, 58, 58,255,
- 52, 52, 52,255, 46, 46, 46,255, 40, 40, 40,255, 33, 33, 33,255, 24, 24, 24,255, 17, 17, 17,255, 13, 13, 13,204, 46, 46, 46,153,
- 95, 95, 95,255,107,107,107,255,114,114,114,255,118,118,118,255,121,121,121,255,122,122,122,255,123,123,123,255,123,123,123,255,
-122,122,122,255,122,122,122,255,120,120,120,255,118,118,118,255,114,114,114,255,110,110,110,255,106,106,106,255,101,101,101,255,
- 97, 97, 97,255, 92, 92, 92,255, 87, 87, 87,255, 83, 83, 83,255, 78, 78, 78,255, 73, 73, 73,255, 68, 68, 68,255, 62, 62, 62,255,
- 56, 56, 56,255, 50, 50, 50,255, 44, 44, 44,255, 36, 36, 36,255, 28, 28, 28,255, 19, 19, 19,255, 12, 12, 12,204, 47, 47, 47,153,
-101,101,101,255,113,113,113,255,120,120,120,255,125,125,125,255,127,127,127,255,129,129,129,255,130,130,130,255,130,130,130,255,
-131,131,131,255,131,131,131,255,131,131,131,255,129,129,129,255,125,125,125,255,120,120,120,255,113,113,113,255,108,108,108,255,
-103,103,103,255, 97, 97, 97,255, 92, 92, 92,255, 87, 87, 87,255, 82, 82, 82,255, 77, 77, 77,255, 72, 72, 72,255, 66, 66, 66,255,
- 60, 60, 60,255, 54, 54, 54,255, 47, 47, 47,255, 39, 39, 39,255, 31, 31, 31,255, 22, 22, 22,255, 12, 12, 12,204, 48, 48, 48,153,
-106,106,106,255,118,118,118,255,126,126,126,255,131,131,131,255,134,134,134,255,135,135,135,255,137,137,137,255,138,138,138,255,
-142,142,142,255,147,147,147,255,149,149,149,255,148,148,148,255,142,142,142,255,133,133,133,255,124,124,124,255,115,115,115,255,
-108,108,108,255,102,102,102,255, 97, 97, 97,255, 92, 92, 92,255, 87, 87, 87,255, 81, 81, 81,255, 75, 75, 75,255, 69, 69, 69,255,
- 63, 63, 63,255, 57, 57, 57,255, 49, 49, 49,255, 42, 42, 42,255, 33, 33, 33,255, 24, 24, 24,255,  9,  9,  9,153, 32, 32, 32,102,
-109,109,109,255,123,123,123,255,131,131,131,255,136,136,136,255,140,140,140,255,142,142,142,255,144,144,144,255,148,148,148,255,
-156,156,156,255,168,168,168,255,176,176,176,255,177,177,177,255,168,168,168,255,153,153,153,255,137,137,137,255,124,124,124,255,
-114,114,114,255,107,107,107,255,101,101,101,255, 96, 96, 96,255, 90, 90, 90,255, 85, 85, 85,255, 79, 79, 79,255, 72, 72, 72,255,
- 66, 66, 66,255, 59, 59, 59,255, 52, 52, 52,255, 44, 44, 44,255, 35, 35, 35,255, 26, 26, 26,255, 10, 10, 10,153, 17, 17, 17, 51,
-110,110,110,255,127,127,127,255,136,136,136,255,142,142,142,255,145,145,145,255,148,148,148,255,151,151,151,255,159,159,159,255,
-174,174,174,255,195,195,195,255,212,212,212,255,216,216,216,255,204,204,204,255,179,179,179,255,154,154,154,255,135,135,135,255,
-121,121,121,255,112,112,112,255,106,106,106,255, 99, 99, 99,255, 94, 94, 94,255, 88, 88, 88,255, 82, 82, 82,255, 76, 76, 76,255,
- 69, 69, 69,255, 62, 62, 62,255, 54, 54, 54,255, 46, 46, 46,255, 37, 37, 37,255, 26, 26, 26,255,  6,  6,  6,102,  0,  0,  0,  0,
-107,107,107,255,130,130,130,255,140,140,140,255,146,146,146,255,150,150,150,255,153,153,153,255,158,158,158,255,169,169,169,255,
-191,191,191,255,219,219,219,255,246,246,246,255,254,254,254,255,237,237,237,255,204,204,204,255,170,170,170,255,145,145,145,255,
-127,127,127,255,117,117,117,255,110,110,110,255,103,103,103,255, 97, 97, 97,255, 91, 91, 91,255, 85, 85, 85,255, 78, 78, 78,255,
- 71, 71, 71,255, 64, 64, 64,255, 55, 55, 55,255, 47, 47, 47,255, 37, 37, 37,255, 25, 25, 25,255,  3,  3,  3, 51,  0,  0,  0,  0,
- 65, 65, 65,153,129,129,129,255,142,142,142,255,149,149,149,255,154,154,154,255,158,158,158,255,163,163,163,255,176,176,176,255,
-199,199,199,255,232,232,232,255,255,255,255,255,255,255,255,255,255,255,255,255,220,220,220,255,181,181,181,255,151,151,151,255,
-132,132,132,255,121,121,121,255,113,113,113,255,106,106,106,255,100,100,100,255, 94, 94, 94,255, 87, 87, 87,255, 80, 80, 80,255,
- 73, 73, 73,255, 65, 65, 65,255, 57, 57, 57,255, 48, 48, 48,255, 38, 38, 38,255, 16, 16, 16,153,  0,  0,  0,  0,  0,  0,  0,  0,
- 21, 21, 21, 51,127,127,127,255,143,143,143,255,152,152,152,255,157,157,157,255,161,161,161,255,165,165,165,255,177,177,177,255,
-198,198,198,255,227,227,227,255,253,253,253,255,255,255,255,255,250,250,250,255,217,217,217,255,181,181,181,255,153,153,153,255,
-135,135,135,255,124,124,124,255,117,117,117,255,110,110,110,255,103,103,103,255, 96, 96, 96,255, 89, 89, 89,255, 82, 82, 82,255,
- 74, 74, 74,255, 66, 66, 66,255, 57, 57, 57,255, 48, 48, 48,255, 35, 35, 35,255, 10, 10, 10,153,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 93, 93, 93,204,141,141,141,255,153,153,153,255,159,159,159,255,163,163,163,255,167,167,167,255,174,174,174,255,
-188,188,188,255,209,209,209,255,228,228,228,255,234,234,234,255,224,224,224,255,200,200,200,255,173,173,173,255,151,151,151,255,
-136,136,136,255,127,127,127,255,119,119,119,255,112,112,112,255,105,105,105,255, 98, 98, 98,255, 90, 90, 90,255, 83, 83, 83,255,
- 75, 75, 75,255, 66, 66, 66,255, 57, 57, 57,255, 46, 46, 46,255, 24, 24, 24,204,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 20, 20, 20, 51,134,134,134,255,151,151,151,255,160,160,160,255,164,164,164,255,167,167,167,255,171,171,171,255,
-178,178,178,255,189,189,189,255,200,200,200,255,202,202,202,255,195,195,195,255,180,180,180,255,163,163,163,255,148,148,148,255,
-137,137,137,255,129,129,129,255,121,121,121,255,114,114,114,255,107,107,107,255, 99, 99, 99,255, 91, 91, 91,255, 83, 83, 83,255,
- 74, 74, 74,255, 65, 65, 65,255, 55, 55, 55,255, 41, 41, 41,255,  7,  7,  7, 51,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 49, 49, 49,102,145,145,145,255,157,157,157,255,164,164,164,255,167,167,167,255,170,170,170,255,
-172,172,172,255,176,176,176,255,180,180,180,255,179,179,179,255,174,174,174,255,165,165,165,255,155,155,155,255,145,145,145,255,
-137,137,137,255,130,130,130,255,122,122,122,255,115,115,115,255,107,107,107,255, 99, 99, 99,255, 91, 91, 91,255, 82, 82, 82,255,
- 73, 73, 73,255, 63, 63, 63,255, 50, 50, 50,255, 22, 22, 22,153,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 78, 78, 78,153,149,149,149,255,160,160,160,255,166,166,166,255,168,168,168,255,
-169,169,169,255,170,170,170,255,169,169,169,255,167,167,167,255,164,164,164,255,158,158,158,255,151,151,151,255,144,144,144,255,
-137,137,137,255,130,130,130,255,123,123,123,255,115,115,115,255,106,106,106,255, 98, 98, 98,255, 89, 89, 89,255, 80, 80, 80,255,
- 70, 70, 70,255, 58, 58, 58,255, 27, 27, 27,153,  3,  3,  3, 51,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80, 80, 80,153,150,150,150,255,160,160,160,255,165,165,165,255,
-167,167,167,255,167,167,167,255,166,166,166,255,163,163,163,255,160,160,160,255,155,155,155,255,149,149,149,255,143,143,143,255,
-137,137,137,255,129,129,129,255,121,121,121,255,113,113,113,255,105,105,105,255, 96, 96, 96,255, 86, 86, 86,255, 76, 76, 76,255,
- 63, 63, 63,255, 38, 38, 38,204,  7,  7,  7, 51,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 78, 78, 78,153,147,147,147,255,157,157,157,255,
-161,161,161,255,163,163,163,255,162,162,162,255,160,160,160,255,157,157,157,255,152,152,152,255,147,147,147,255,141,141,141,255,
-135,135,135,255,127,127,127,255,119,119,119,255,110,110,110,255,101,101,101,255, 91, 91, 91,255, 80, 80, 80,255, 66, 66, 66,255,
- 32, 32, 32,153,  7,  7,  7, 51,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,134,134,134,255,
-148,148,148,255,154,154,154,255,155,155,155,255,154,154,154,255,152,152,152,255,147,147,147,255,142,142,142,255,136,136,136,255,
-130,130,130,255,122,122,122,255,114,114,114,255,104,104,104,255, 93, 93, 93,255, 81, 81, 81,255, 54, 54, 54,204, 22, 22, 22,102,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 73, 73, 73,153,103,103,103,204,137,137,137,255,140,140,140,255,140,140,140,255,137,137,137,255,133,133,133,255,127,127,127,255,
-120,120,120,255,113,113,113,255,102,102,102,255, 91, 91, 91,255, 64, 64, 64,204, 28, 28, 28,102,  6,  6,  6, 51,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 46, 46, 46,102, 72, 72, 72,153, 72, 72, 72,153, 92, 92, 92,204, 88, 88, 88,204,
- 81, 81, 81,204, 54, 54, 54,153, 35, 35, 35,102, 16, 16, 16, 51,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 84, 69,  0,  0,
-168,  1,  0,  0,  8,255,168,  5,  0,  0,  0,  0, 33,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 84, 69, 84,101,120,  0,  0,  0,  0,  0,  0,  0,
+205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 40,  0,  0,  0, 56,146,222,  4,  0,  0,  0,  0, 12,  0,  0,  0,  1,  0,  0,  0,
+ 32,  0,  0,  0,  0,  0,  0,  0, 32,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0, 53,  0, 53,  0,168,146,222,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,  0, 16,  0,  0,168,146,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  2,  2, 51,  2,  2,  2, 51,  6,  6,  6,153,  6,  6,  6,153,
+  6,  6,  6,153,  4,  4,  4,102,  3,  3,  3,102,  2,  2,  2, 51,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  3,  3,  3, 51,  8,  8,  8,153, 11, 11, 11,204, 13, 13, 13,255, 12, 12, 12,255, 12, 12, 12,255, 11, 11, 11,255,
+ 10, 10, 10,255, 10, 10, 10,255,  9,  9,  9,255,  9,  9,  9,255,  9,  9,  9,255,  4,  4,  4,102,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  3,  3, 51,
+ 10, 10, 10,153, 18, 18, 18,255, 20, 20, 20,255, 22, 22, 22,255, 23, 23, 23,255, 22, 22, 22,255, 20, 20, 20,255, 19, 19, 19,255,
+ 16, 16, 16,255, 14, 14, 14,255, 11, 11, 11,255, 10, 10, 10,255,  9,  9,  9,255,  9,  9,  9,255,  9,  9,  9,255,  8,  8,  8,204,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  7,  7,102, 19, 19, 19,204,
+ 27, 27, 27,255, 31, 31, 31,255, 32, 32, 32,255, 33, 33, 33,255, 33, 33, 33,255, 31, 31, 31,255, 30, 30, 30,255, 27, 27, 27,255,
+ 25, 25, 25,255, 22, 22, 22,255, 19, 19, 19,255, 16, 16, 16,255, 12, 12, 12,255, 10, 10, 10,255, 10, 10, 10,255, 10, 10, 10,255,
+ 10, 10, 10,255,  4,  4,  4,102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 13, 13, 13,153, 29, 29, 29,255, 37, 37, 37,255,
+ 40, 40, 40,255, 42, 42, 42,255, 42, 42, 42,255, 43, 43, 43,255, 41, 41, 41,255, 40, 40, 40,255, 38, 38, 38,255, 36, 36, 36,255,
+ 33, 33, 33,255, 30, 30, 30,255, 27, 27, 27,255, 24, 24, 24,255, 20, 20, 20,255, 16, 16, 16,255, 12, 12, 12,255, 10, 10, 10,255,
+ 10, 10, 10,255, 10, 10, 10,255,  7,  7,  7,153,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 13, 13, 13,102, 37, 37, 37,255, 44, 44, 44,255, 48, 48, 48,255,
+ 50, 50, 50,255, 51, 51, 51,255, 51, 51, 51,255, 50, 50, 50,255, 49, 49, 49,255, 48, 48, 48,255, 45, 45, 45,255, 43, 43, 43,255,
+ 41, 41, 41,255, 37, 37, 37,255, 34, 34, 34,255, 31, 31, 31,255, 28, 28, 28,255, 24, 24, 24,255, 20, 20, 20,255, 15, 15, 15,255,
+ 11, 11, 11,255, 10, 10, 10,255, 11, 11, 11,255,  7,  7,  7,153,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 13, 13, 13,102, 41, 41, 41,255, 50, 50, 50,255, 54, 54, 54,255, 57, 57, 57,255,
+ 58, 58, 58,255, 59, 59, 59,255, 59, 59, 59,255, 58, 58, 58,255, 57, 57, 57,255, 55, 55, 55,255, 53, 53, 53,255, 51, 51, 51,255,
+ 48, 48, 48,255, 45, 45, 45,255, 41, 41, 41,255, 38, 38, 38,255, 35, 35, 35,255, 31, 31, 31,255, 27, 27, 27,255, 23, 23, 23,255,
+ 17, 17, 17,255, 12, 12, 12,255, 11, 11, 11,255, 11, 11, 11,255,  5,  5,  5,102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 36, 36, 36,204, 53, 53, 53,255, 59, 59, 59,255, 63, 63, 63,255, 65, 65, 65,255,
+ 66, 66, 66,255, 66, 66, 66,255, 66, 66, 66,255, 65, 65, 65,255, 64, 64, 64,255, 62, 62, 62,255, 60, 60, 60,255, 57, 57, 57,255,
+ 54, 54, 54,255, 51, 51, 51,255, 48, 48, 48,255, 44, 44, 44,255, 41, 41, 41,255, 37, 37, 37,255, 33, 33, 33,255, 29, 29, 29,255,
+ 24, 24, 24,255, 19, 19, 19,255, 13, 13, 13,255, 11, 11, 11,255, 12, 12, 12,255,  3,  3,  3, 51,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 19, 19, 19,102, 56, 56, 56,255, 64, 64, 64,255, 68, 68, 68,255, 71, 71, 71,255, 73, 73, 73,255,
+ 74, 74, 74,255, 74, 74, 74,255, 73, 73, 73,255, 72, 72, 72,255, 71, 71, 71,255, 69, 69, 69,255, 67, 67, 67,255, 64, 64, 64,255,
+ 61, 61, 61,255, 58, 58, 58,255, 54, 54, 54,255, 50, 50, 50,255, 47, 47, 47,255, 43, 43, 43,255, 39, 39, 39,255, 34, 34, 34,255,
+ 30, 30, 30,255, 25, 25, 25,255, 19, 19, 19,255, 13, 13, 13,255, 12, 12, 12,255, 10, 10, 10,204,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 54, 54, 54,255, 66, 66, 66,255, 72, 72, 72,255, 77, 77, 77,255, 79, 79, 79,255, 81, 81, 81,255,
+ 81, 81, 81,255, 81, 81, 81,255, 80, 80, 80,255, 79, 79, 79,255, 77, 77, 77,255, 75, 75, 75,255, 73, 73, 73,255, 70, 70, 70,255,
+ 67, 67, 67,255, 63, 63, 63,255, 60, 60, 60,255, 56, 56, 56,255, 52, 52, 52,255, 49, 49, 49,255, 44, 44, 44,255, 40, 40, 40,255,
+ 35, 35, 35,255, 30, 30, 30,255, 24, 24, 24,255, 18, 18, 18,255, 12, 12, 12,255, 12, 12, 12,255,  6,  6,  6,102,  0,  0,  0,  0,
+  0,  0,  0,  0, 22, 22, 22,102, 67, 67, 67,255, 76, 76, 76,255, 81, 81, 81,255, 84, 84, 84,255, 87, 87, 87,255, 88, 88, 88,255,
+ 88, 88, 88,255, 88, 88, 88,255, 87, 87, 87,255, 86, 86, 86,255, 84, 84, 84,255, 82, 82, 82,255, 79, 79, 79,255, 76, 76, 76,255,
+ 73, 73, 73,255, 69, 69, 69,255, 65, 65, 65,255, 62, 62, 62,255, 58, 58, 58,255, 54, 54, 54,255, 49, 49, 49,255, 45, 45, 45,255,
+ 40, 40, 40,255, 35, 35, 35,255, 29, 29, 29,255, 23, 23, 23,255, 16, 16, 16,255, 12, 12, 12,255, 12, 12, 12,204,  0,  0,  0,  0,
+  0,  0,  0,  0, 49, 49, 49,204, 76, 76, 76,255, 84, 84, 84,255, 89, 89, 89,255, 92, 92, 92,255, 94, 94, 94,255, 95, 95, 95,255,
+ 95, 95, 95,255, 95, 95, 95,255, 94, 94, 94,255, 93, 93, 93,255, 91, 91, 91,255, 88, 88, 88,255, 85, 85, 85,255, 82, 82, 82,255,
+ 79, 79, 79,255, 75, 75, 75,255, 71, 71, 71,255, 67, 67, 67,255, 63, 63, 63,255, 59, 59, 59,255, 55, 55, 55,255, 50, 50, 50,255,
+ 45, 45, 45,255, 40, 40, 40,255, 34, 34, 34,255, 28, 28, 28,255, 21, 21, 21,255, 13, 13, 13,255, 14, 14, 14,255,  0,  0,  0,  0,
+ 14, 14, 14,102, 70, 70, 70,255, 85, 85, 85,255, 92, 92, 92,255, 97, 97, 97,255,100,100,100,255,102,102,102,255,102,102,102,255,
+103,103,103,255,102,102,102,255,101,101,101,255, 99, 99, 99,255, 97, 97, 97,255, 94, 94, 94,255, 91, 91, 91,255, 88, 88, 88,255,
+ 84, 84, 84,255, 81, 81, 81,255, 77, 77, 77,255, 72, 72, 72,255, 68, 68, 68,255, 64, 64, 64,255, 59, 59, 59,255, 55, 55, 55,255,
+ 50, 50, 50,255, 44, 44, 44,255, 39, 39, 39,255, 32, 32, 32,255, 25, 25, 25,255, 17, 17, 17,255, 13, 13, 13,255,  7,  7,  7,102,
+ 24, 24, 24,102, 80, 80, 80,255, 93, 93, 93,255,100,100,100,255,104,104,104,255,107,107,107,255,109,109,109,255,109,109,109,255,
+109,109,109,255,109,109,109,255,107,107,107,255,106,106,106,255,103,103,103,255,100,100,100,255, 97, 97, 97,255, 94, 94, 94,255,
+ 90, 90, 90,255, 86, 86, 86,255, 82, 82, 82,255, 77, 77, 77,255, 73, 73, 73,255, 69, 69, 69,255, 64, 64, 64,255, 59, 59, 59,255,
+ 54, 54, 54,255, 49, 49, 49,255, 43, 43, 43,255, 36, 36, 36,255, 29, 29, 29,255, 21, 21, 21,255, 14, 14, 14,255, 10, 10, 10,153,
+ 29, 29, 29,102, 89, 89, 89,255,100,100,100,255,107,107,107,255,112,112,112,255,114,114,114,255,116,116,116,255,116,116,116,255,
+116,116,116,255,115,115,115,255,114,114,114,255,112,112,112,255,110,110,110,255,107,107,107,255,104,104,104,255,100,100,100,255,
+ 96, 96, 96,255, 92, 92, 92,255, 87, 87, 87,255, 83, 83, 83,255, 78, 78, 78,255, 73, 73, 73,255, 68, 68, 68,255, 63, 63, 63,255,
+ 58, 58, 58,255, 52, 52, 52,255, 46, 46, 46,255, 40, 40, 40,255, 33, 33, 33,255, 24, 24, 24,255, 17, 17, 17,255, 13, 13, 13,204,
+ 46, 46, 46,153, 95, 95, 95,255,107,107,107,255,114,114,114,255,118,118,118,255,121,121,121,255,122,122,122,255,123,123,123,255,
+123,123,123,255,122,122,122,255,122,122,122,255,120,120,120,255,118,118,118,255,114,114,114,255,110,110,110,255,106,106,106,255,
+101,101,101,255, 97, 97, 97,255, 92, 92, 92,255, 87, 87, 87,255, 83, 83, 83,255, 78, 78, 78,255, 73, 73, 73,255, 68, 68, 68,255,
+ 62, 62, 62,255, 56, 56, 56,255, 50, 50, 50,255, 44, 44, 44,255, 36, 36, 36,255, 28, 28, 28,255, 19, 19, 19,255, 12, 12, 12,204,
+ 47, 47, 47,153,101,101,101,255,113,113,113,255,120,120,120,255,125,125,125,255,127,127,127,255,129,129,129,255,130,130,130,255,
+130,130,130,255,131,131,131,255,131,131,131,255,131,131,131,255,129,129,129,255,125,125,125,255,120,120,120,255,113,113,113,255,
+108,108,108,255,103,103,103,255, 97, 97, 97,255, 92, 92, 92,255, 87, 87, 87,255, 82, 82, 82,255, 77, 77, 77,255, 72, 72, 72,255,
+ 66, 66, 66,255, 60, 60, 60,255, 54, 54, 54,255, 47, 47, 47,255, 39, 39, 39,255, 31, 31, 31,255, 22, 22, 22,255, 12, 12, 12,204,
+ 48, 48, 48,153,106,106,106,255,118,118,118,255,126,126,126,255,131,131,131,255,134,134,134,255,135,135,135,255,137,137,137,255,
+138,138,138,255,142,142,142,255,147,147,147,255,149,149,149,255,148,148,148,255,142,142,142,255,133,133,133,255,124,124,124,255,
+115,115,115,255,108,108,108,255,102,102,102,255, 97, 97, 97,255, 92, 92, 92,255, 87, 87, 87,255, 81, 81, 81,255, 75, 75, 75,255,
+ 69, 69, 69,255, 63, 63, 63,255, 57, 57, 57,255, 49, 49, 49,255, 42, 42, 42,255, 33, 33, 33,255, 24, 24, 24,255,  9,  9,  9,153,
+ 32, 32, 32,102,109,109,109,255,123,123,123,255,131,131,131,255,136,136,136,255,140,140,140,255,142,142,142,255,144,144,144,255,
+148,148,148,255,156,156,156,255,168,168,168,255,176,176,176,255,177,177,177,255,168,168,168,255,153,153,153,255,137,137,137,255,
+124,124,124,255,114,114,114,255,107,107,107,255,101,101,101,255, 96, 96, 96,255, 90, 90, 90,255, 85, 85, 85,255, 79, 79, 79,255,
+ 72, 72, 72,255, 66, 66, 66,255, 59, 59, 59,255, 52, 52, 52,255, 44, 44, 44,255, 35, 35, 35,255, 26, 26, 26,255, 10, 10, 10,153,
+ 17, 17, 17, 51,110,110,110,255,127,127,127,255,136,136,136,255,142,142,142,255,145,145,145,255,148,148,148,255,151,151,151,255,
+159,159,159,255,174,174,174,255,195,195,195,255,212,212,212,255,216,216,216,255,204,204,204,255,179,179,179,255,154,154,154,255,
+135,135,135,255,121,121,121,255,112,112,112,255,106,106,106,255, 99, 99, 99,255, 94, 94, 94,255, 88, 88, 88,255, 82, 82, 82,255,
+ 76, 76, 76,255, 69, 69, 69,255, 62, 62, 62,255, 54, 54, 54,255, 46, 46, 46,255, 37, 37, 37,255, 26, 26, 26,255,  6,  6,  6,102,
+  0,  0,  0,  0,107,107,107,255,130,130,130,255,140,140,140,255,146,146,146,255,150,150,150,255,153,153,153,255,158,158,158,255,
+169,169,169,255,191,191,191,255,219,219,219,255,246,246,246,255,254,254,254,255,237,237,237,255,204,204,204,255,170,170,170,255,
+145,145,145,255,127,127,127,255,117,117,117,255,110,110,110,255,103,103,103,255, 97, 97, 97,255, 91, 91, 91,255, 85, 85, 85,255,
+ 78, 78, 78,255, 71, 71, 71,255, 64, 64, 64,255, 55, 55, 55,255, 47, 47, 47,255, 37, 37, 37,255, 25, 25, 25,255,  3,  3,  3, 51,
+  0,  0,  0,  0, 65, 65, 65,153,129,129,129,255,142,142,142,255,149,149,149,255,154,154,154,255,158,158,158,255,163,163,163,255,
+176,176,176,255,199,199,199,255,232,232,232,255,255,255,255,255,255,255,255,255,255,255,255,255,220,220,220,255,181,181,181,255,
+151,151,151,255,132,132,132,255,121,121,121,255,113,113,113,255,106,106,106,255,100,100,100,255, 94, 94, 94,255, 87, 87, 87,255,
+ 80, 80, 80,255, 73, 73, 73,255, 65, 65, 65,255, 57, 57, 57,255, 48, 48, 48,255, 38, 38, 38,255, 16, 16, 16,153,  0,  0,  0,  0,
+  0,  0,  0,  0, 21, 21, 21, 51,127,127,127,255,143,143,143,255,152,152,152,255,157,157,157,255,161,161,161,255,165,165,165,255,
+177,177,177,255,198,198,198,255,227,227,227,255,253,253,253,255,255,255,255,255,250,250,250,255,217,217,217,255,181,181,181,255,
+153,153,153,255,135,135,135,255,124,124,124,255,117,117,117,255,110,110,110,255,103,103,103,255, 96, 96, 96,255, 89, 89, 89,255,
+ 82, 82, 82,255, 74, 74, 74,255, 66, 66, 66,255, 57, 57, 57,255, 48, 48, 48,255, 35, 35, 35,255, 10, 10, 10,153,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 93, 93, 93,204,141,141,141,255,153,153,153,255,159,159,159,255,163,163,163,255,167,167,167,255,
+174,174,174,255,188,188,188,255,209,209,209,255,228,228,228,255,234,234,234,255,224,224,224,255,200,200,200,255,173,173,173,255,
+151,151,151,255,136,136,136,255,127,127,127,255,119,119,119,255,112,112,112,255,105,105,105,255, 98, 98, 98,255, 90, 90, 90,255,
+ 83, 83, 83,255, 75, 75, 75,255, 66, 66, 66,255, 57, 57, 57,255, 46, 46, 46,255, 24, 24, 24,204,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 20, 20, 20, 51,134,134,134,255,151,151,151,255,160,160,160,255,164,164,164,255,167,167,167,255,
+171,171,171,255,178,178,178,255,189,189,189,255,200,200,200,255,202,202,202,255,195,195,195,255,180,180,180,255,163,163,163,255,
+148,148,148,255,137,137,137,255,129,129,129,255,121,121,121,255,114,114,114,255,107,107,107,255, 99, 99, 99,255, 91, 91, 91,255,
+ 83, 83, 83,255, 74, 74, 74,255, 65, 65, 65,255, 55, 55, 55,255, 41, 41, 41,255,  7,  7,  7, 51,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 49, 49, 49,102,145,145,145,255,157,157,157,255,164,164,164,255,167,167,167,255,
+170,170,170,255,172,172,172,255,176,176,176,255,180,180,180,255,179,179,179,255,174,174,174,255,165,165,165,255,155,155,155,255,
+145,145,145,255,137,137,137,255,130,130,130,255,122,122,122,255,115,115,115,255,107,107,107,255, 99, 99, 99,255, 91, 91, 91,255,
+ 82, 82, 82,255, 73, 73, 73,255, 63, 63, 63,255, 50, 50, 50,255, 22, 22, 22,153,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 78, 78, 78,153,149,149,149,255,160,160,160,255,166,166,166,255,
+168,168,168,255,169,169,169,255,170,170,170,255,169,169,169,255,167,167,167,255,164,164,164,255,158,158,158,255,151,151,151,255,
+144,144,144,255,137,137,137,255,130,130,130,255,123,123,123,255,115,115,115,255,106,106,106,255, 98, 98, 98,255, 89, 89, 89,255,
+ 80, 80, 80,255, 70, 70, 70,255, 58, 58, 58,255, 27, 27, 27,153,  3,  3,  3, 51,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 80, 80, 80,153,150,150,150,255,160,160,160,255,
+165,165,165,255,167,167,167,255,167,167,167,255,166,166,166,255,163,163,163,255,160,160,160,255,155,155,155,255,149,149,149,255,
+143,143,143,255,137,137,137,255,129,129,129,255,121,121,121,255,113,113,113,255,105,105,105,255, 96, 96, 96,255, 86, 86, 86,255,
+ 76, 76, 76,255, 63, 63, 63,255, 38, 38, 38,204,  7,  7,  7, 51,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 78, 78, 78,153,147,147,147,255,
+157,157,157,255,161,161,161,255,163,163,163,255,162,162,162,255,160,160,160,255,157,157,157,255,152,152,152,255,147,147,147,255,
+141,141,141,255,135,135,135,255,127,127,127,255,119,119,119,255,110,110,110,255,101,101,101,255, 91, 91, 91,255, 80, 80, 80,255,
+ 66, 66, 66,255, 32, 32, 32,153,  7,  7,  7, 51,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+134,134,134,255,148,148,148,255,154,154,154,255,155,155,155,255,154,154,154,255,152,152,152,255,147,147,147,255,142,142,142,255,
+136,136,136,255,130,130,130,255,122,122,122,255,114,114,114,255,104,104,104,255, 93, 93, 93,255, 81, 81, 81,255, 54, 54, 54,204,
+ 22, 22, 22,102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 73, 73, 73,153,103,103,103,204,137,137,137,255,140,140,140,255,140,140,140,255,137,137,137,255,133,133,133,255,
+127,127,127,255,120,120,120,255,113,113,113,255,102,102,102,255, 91, 91, 91,255, 64, 64, 64,204, 28, 28, 28,102,  6,  6,  6, 51,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 46, 46, 46,102, 72, 72, 72,153, 72, 72, 72,153, 92, 92, 92,204,
+ 88, 88, 88,204, 81, 81, 81,204, 54, 54, 54,153, 35, 35, 35,102, 16, 16, 16, 51,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 84, 69,  0,  0,160,  1,  0,  0,248,162,222,  4,  0,  0,  0,  0, 32,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 84, 69, 84,101,120,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 62,  0,  0,160, 64,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0, 64,  0,  0,  0, 64,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 64,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  7,  0,  8,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  8,  0,  0,  0,  1,  0,  1,  0,  3,  0,  2,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,205,204,204, 60,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  2,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,248,  0,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 40,  0,  0,  0,248,  0,169,  5,  0,  0,  0,  0, 12,  0,  0,  0,  1,  0,  0,  0, 32,  0,  0,  0,  0,  0,  0,  0, 32,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  1,  0, 16,  0, 15,  0,104,  1,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
-  0, 16,  0,  0,104,  1,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 62,  0,  0,160, 64,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0, 64,  0,  0,  0, 64,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32, 64,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  7,  0,  8,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  8,  0,  0,  0,  1,  0,  1,  0,
+  3,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,205,204,204, 60,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  2,  0,  1,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,232,164,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 40,  0,  0,  0,
+232,164,222,  4,  0,  0,  0,  0, 12,  0,  0,  0,  1,  0,  0,  0, 32,  0,  0,  0,  0,  0,  0,  0, 32,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  1,  0, 16,  0, 15,  0, 88,165,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,  0, 16,  0,  0,
+ 88,165,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -6496,23 +6611,24 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 77, 69,  0,  0, 16,  5,  0,  0,184, 17,169,  5,
-  0,  0,  0,  0, 50,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 77, 69, 67,117, 98,101,  0,112,104,101,114,101,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 77, 69,  0,  0, 16,  5,  0,  0,168,181,222,  4,  0,  0,  0,  0,
+ 49,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 77, 69, 67,117, 98,101,  0,112,104,101,114,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,168,106,135,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88, 37,169,  5,  0,  0,  0,  0,168, 36,169,  5,
-  0,  0,  0,  0, 72, 33,169,  5,  0,  0,  0,  0,216, 31,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,104, 25,169,  5,  0,  0,  0,  0,168, 28,169,  5,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 24, 23,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+136,  0,191,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152,199,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 56,196,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88,189,222,  4,  0,  0,  0,  0,  8,193,222,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  8,187,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,255,255,255,255,255,255,255,
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,  1,  0,  0,  0,  5,  0,  0,  0, 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 88, 26,169,  5,  0,  0,  0,  0,255,255,255,255,255,255,255,255,255,255,255,255,  0,  0,  0,  0,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  1,  0,  0,  0,255,255,255,255,
+255,255,255,255,  2,  0,  0,  0,  5,  0,  0,  0, 24,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+184,190,222,  4,  0,  0,  0,  0,255,255,255,255,255,255,255,255,255,255,255,255,  0,  0,  0,  0,255,255,255,255,255,255,255,255,
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
@@ -6523,30 +6639,29 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88, 34,169,  5,  0,  0,  0,  0,255,255,255,255,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72,197,222,  4,  0,  0,  0,  0,255,255,255,255,255,255,255,255,
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  0,  0,  0,  0,255,255,255,255,
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-  1,  0,  0,  0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,  2,  0,  0,  0,  5,  0,  0,  0, 28,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136, 29,169,  5,  0,  0,  0,  0,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  0,  0,  0,  0,
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  0,  0,  0,  0,255,255,255,255,255,255,255,255,
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  1,  0,  0,  0,
+255,255,255,255,255,255,255,255,255,255,255,255,  1,  0,  0,  0,  5,  0,  0,  0, 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,232,193,222,  4,  0,  0,  0,  0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-255,255,255,255,  2,  0,  0,  0,  5,  0,  0,  0, 20,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  8,  0,  0,  0, 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0, 24,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 51,  0,  0,  0,180,  0,  0,  0,  0,  4,  0,128, 63,  4,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0, 67,  0, 30,  0,  6,  0,  1,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
-  8,  0,  0,  0,168,106,135,  5,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,248,232,168,  5,  0,  0,  0,  0, 68, 65, 84, 65,
-  8,  2,  0,  0, 24, 23,169,  5,  0,  0,  0,  0,132,  1,  0,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,104, 25,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  0,  0,  0,  0,255,255,255,255,
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+255,255,255,255,  1,  0,  0,  0,  5,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  8,  0,  0,  0, 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0, 24,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 51,
+  0,  0,  0,180,  0,  0,  0,  0,  4,  0,128, 63,  4,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0, 67,  0, 30,  0,  6,  0,  1,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,  8,  0,  0,  0,
+136,  0,191,  4,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,232,140,222,  4,  0,  0,  0,  0, 68, 65, 84, 65,  8,  2,  0,  0,
+  8,187,222,  4,  0,  0,  0,  0,132,  1,  0,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88,189,222,  4,  0,  0,  0,  0, 34,  0,  0,  0, 20,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72,190,222,  4,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -6555,18 +6670,20 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
-160,  0,  0,  0,104, 25,169,  5,  0,  0,  0,  0, 56,  0,  0,  0,  8,  0,  0,  0,  0,  0,128, 63,255,255,127, 63,  0,  0,128,191,
-230, 73,230, 73, 26,182,  1,  0,  0,  0,128, 63,  0,  0,128,191,  0,  0,128,191,230, 73, 26,182, 26,182,  1,  0,  1,  0,128,191,
-253,255,127,191,  0,  0,128,191, 26,182, 26,182, 26,182,  1,  0,250,255,127,191,  3,  0,128, 63,  0,  0,128,191, 26,182,230, 73,
- 26,182,  1,  0,  4,  0,128, 63,247,255,127, 63,  0,  0,128, 63,230, 73,230, 73,230, 73,  1,  0,245,255,127, 63,  5,  0,128,191,
-  0,  0,128, 63,230, 73, 26,182,230, 73,  1,  0,  3,  0,128,191,250,255,127,191,  0,  0,128, 63, 26,182, 26,182,230, 73,  1,  0,
-255,255,127,191,  0,  0,128, 63,  0,  0,128, 63, 26,182,230, 73,230, 73,  1,  0, 68, 65, 84, 65,  8,  2,  0,  0, 88, 26,169,  5,
-  0,  0,  0,  0,132,  1,  0,  0,  5,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,160,  0,  0,  0,
+ 88,189,222,  4,  0,  0,  0,  0, 55,  0,  0,  0,  8,  0,  0,  0,  0,  0,128, 63,255,255,127, 63,  0,  0,128,191,230, 73,230, 73,
+ 26,182,  1,  0,  0,  0,128, 63,  0,  0,128,191,  0,  0,128,191,230, 73, 26,182, 26,182,  1,  0,  1,  0,128,191,253,255,127,191,
+  0,  0,128,191, 26,182, 26,182, 26,182,  1,  0,250,255,127,191,  3,  0,128, 63,  0,  0,128,191, 26,182,230, 73, 26,182,  1,  0,
+  4,  0,128, 63,247,255,127, 63,  0,  0,128, 63,230, 73,230, 73,230, 73,  1,  0,245,255,127, 63,  5,  0,128,191,  0,  0,128, 63,
+230, 73, 26,182,230, 73,  1,  0,  3,  0,128,191,250,255,127,191,  0,  0,128, 63, 26,182, 26,182,230, 73,  1,  0,255,255,127,191,
+  0,  0,128, 63,  0,  0,128, 63, 26,182,230, 73,230, 73,  1,  0, 68, 65, 84, 65, 32,  0,  0,  0, 72,190,222,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,  8,  2,  0,  0,184,190,222,  4,  0,  0,  0,  0,132,  1,  0,  0,  5,  0,  0,  0,
+  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,168, 28,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  8,193,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -6578,21 +6695,20 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,144,  0,  0,  0,168, 28,169,  5,
-  0,  0,  0,  0, 53,  0,  0,  0, 12,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0, 35,  0,  0,  0,  0,  0,  3,  0,  0,  0,
-  0,  0, 35,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0, 35,  0,  1,  0,  0,  0,  2,  0,  0,  0,  0,  0, 35,  0,  1,  0,  0,  0,
-  5,  0,  0,  0,  0,  0, 35,  0,  2,  0,  0,  0,  3,  0,  0,  0,  0,  0, 35,  0,  2,  0,  0,  0,  6,  0,  0,  0,  0,  0, 35,  0,
-  3,  0,  0,  0,  7,  0,  0,  0,  0,  0, 35,  0,  4,  0,  0,  0,  5,  0,  0,  0,  0,  0, 35,  0,  4,  0,  0,  0,  7,  0,  0,  0,
-  0,  0, 35,  0,  5,  0,  0,  0,  6,  0,  0,  0,  0,  0, 35,  0,  6,  0,  0,  0,  7,  0,  0,  0,  0,  0, 35,  0, 68, 65, 84, 65,
-  8,  2,  0,  0,136, 29,169,  5,  0,  0,  0,  0,132,  1,  0,  0,  5,  0,  0,  0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 85, 86, 77, 97,112,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,216, 31,169,  5,  0,  0,  0,  0, 26,  0,  0,  0,
- 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 78, 71,111,110,
- 32, 70, 97, 99,101, 45, 86,101,114,116,101,120,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 72, 33,169,  5,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,144,  0,  0,  0,  8,193,222,  4,  0,  0,  0,  0, 52,  0,  0,  0, 12,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  0,  0,  0, 35,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0, 35,  0,  0,  0,  0,  0,  4,  0,  0,  0,
+  0,  0, 35,  0,  1,  0,  0,  0,  2,  0,  0,  0,  0,  0, 35,  0,  1,  0,  0,  0,  5,  0,  0,  0,  0,  0, 35,  0,  2,  0,  0,  0,
+  3,  0,  0,  0,  0,  0, 35,  0,  2,  0,  0,  0,  6,  0,  0,  0,  0,  0, 35,  0,  3,  0,  0,  0,  7,  0,  0,  0,  0,  0, 35,  0,
+  4,  0,  0,  0,  5,  0,  0,  0,  0,  0, 35,  0,  4,  0,  0,  0,  7,  0,  0,  0,  0,  0, 35,  0,  5,  0,  0,  0,  6,  0,  0,  0,
+  0,  0, 35,  0,  6,  0,  0,  0,  7,  0,  0,  0,  0,  0, 35,  0, 68, 65, 84, 65,  8,  2,  0,  0,232,193,222,  4,  0,  0,  0,  0,
+132,  1,  0,  0,  5,  0,  0,  0, 26,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 78, 71,111,110, 32, 70, 97, 99,101, 45, 86,101,114,116,101,120,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 56,196,222,  4,  0,  0,  0,  0, 26,  0,  0,  0, 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 78, 71,111,110, 32, 70, 97, 99,101, 45, 86,101,114,116,101,120,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,140, 98,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -6600,33 +6716,23 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 32,  1,  0,  0,216, 31,169,  5,  0,  0,  0,  0, 61,  0,  0,  0, 24,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  2,  0,  0,  0, 68, 65, 84, 65,192,  0,  0,  0, 72, 33,169,  5,
-  0,  0,  0,  0, 59,  0,  0,  0, 24,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  3,  0,  0,  0,  2,  0,  0,  0,
-  5,  0,  0,  0,  3,  0,  0,  0,  1,  0,  0,  0,  4,  0,  0,  0,  9,  0,  0,  0,  7,  0,  0,  0, 11,  0,  0,  0,  6,  0,  0,  0,
- 10,  0,  0,  0,  5,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  4,  0,  0,  0,  8,  0,  0,  0,  5,  0,  0,  0,
-  4,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  4,  0,  0,  0,  5,  0,  0,  0, 10,  0,  0,  0,  6,  0,  0,  0,
-  6,  0,  0,  0,  2,  0,  0,  0,  3,  0,  0,  0,  2,  0,  0,  0,  6,  0,  0,  0,  6,  0,  0,  0, 11,  0,  0,  0,  7,  0,  0,  0,
-  7,  0,  0,  0,  3,  0,  0,  0,  5,  0,  0,  0,  4,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  3,  0,  0,  0,
-  7,  0,  0,  0,  7,  0,  0,  0,  9,  0,  0,  0, 68, 65, 84, 65,  8,  2,  0,  0, 88, 34,169,  5,  0,  0,  0,  0,132,  1,  0,  0,
-  5,  0,  0,  0, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 85, 86, 77, 97,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,168, 36,169,  5,  0,  0,  0,  0, 25,  0,  0,  0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 78, 71,111,110, 32, 70, 97, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 88, 37,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,192,  0,  0,  0, 56,196,222,  4,  0,  0,  0,  0,
+ 58,  0,  0,  0, 24,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  3,  0,  0,  0,  2,  0,  0,  0,  5,  0,  0,  0,
+  3,  0,  0,  0,  1,  0,  0,  0,  4,  0,  0,  0,  9,  0,  0,  0,  7,  0,  0,  0, 11,  0,  0,  0,  6,  0,  0,  0, 10,  0,  0,  0,
+  5,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  4,  0,  0,  0,  8,  0,  0,  0,  5,  0,  0,  0,  4,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  4,  0,  0,  0,  5,  0,  0,  0, 10,  0,  0,  0,  6,  0,  0,  0,  6,  0,  0,  0,
+  2,  0,  0,  0,  3,  0,  0,  0,  2,  0,  0,  0,  6,  0,  0,  0,  6,  0,  0,  0, 11,  0,  0,  0,  7,  0,  0,  0,  7,  0,  0,  0,
+  3,  0,  0,  0,  5,  0,  0,  0,  4,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  3,  0,  0,  0,  7,  0,  0,  0,
+  7,  0,  0,  0,  9,  0,  0,  0, 68, 65, 84, 65,  8,  2,  0,  0, 72,197,222,  4,  0,  0,  0,  0,132,  1,  0,  0,  5,  0,  0,  0,
+ 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 78, 71,111,110, 32, 70, 97, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+152,199,222,  4,  0,  0,  0,  0, 25,  0,  0,  0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 78, 71,111,110, 32, 70, 97, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 24,144, 98,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -6634,29 +6740,27 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 96,  0,  0,  0,168, 36,169,  5,  0,  0,  0,  0, 60,  0,  0,  0,
-  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 72,  0,  0,  0, 88, 37,169,  5,  0,  0,  0,  0, 58,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,
-  4,  0,  0,  0,  0,  0,  2,  0,  4,  0,  0,  0,  4,  0,  0,  0,  0,  0,  2,  0,  8,  0,  0,  0,  4,  0,  0,  0,  0,  0,  2,  0,
- 12,  0,  0,  0,  4,  0,  0,  0,  0,  0,  2,  0, 16,  0,  0,  0,  4,  0,  0,  0,  0,  0,  2,  0, 20,  0,  0,  0,  4,  0,  0,  0,
-  0,  0,  2,  0, 66, 82,  0,  0, 96,  6,  0,  0,232, 37,169,  5,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,168, 47,169,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 65,100,
-100,  0,104, 46, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 72,  0,  0,  0,152,199,222,  4,  0,  0,  0,  0, 57,  0,  0,  0,  6,  0,  0,  0,
+  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  2,  0,  4,  0,  0,  0,  4,  0,  0,  0,  0,  0,  2,  0,  8,  0,  0,  0,  4,  0,  0,  0,
+  0,  0,  2,  0, 12,  0,  0,  0,  4,  0,  0,  0,  0,  0,  2,  0, 16,  0,  0,  0,  4,  0,  0,  0,  0,  0,  2,  0, 20,  0,  0,  0,
+  4,  0,  0,  0,  0,  0,  2,  0, 66, 82,  0,  0, 96,  6,  0,  0, 40,200,222,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,
+104,210,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 66, 82, 65,100,100,  0,104, 46, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 24, 46,169,  5,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 88,208,222,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -6689,50 +6793,49 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0,
- 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,
-  0,  0,  0, 62,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 56,  1,  0,  0,128, 38,169,  5,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  0,  0,  0,  0,  0,  0,
+ 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0,
+ 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 56,  1,  0,  0,192,200,222,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0, 24, 46,169,  5,  0,  0,  0,  0,127,  1,  0,  0,
-  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,
-  0,  0,128, 63, 14,215,126,191, 54,189,194, 61, 14,215,126,191, 46,189,194, 61,184,181,132,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0, 88,208,222,  4,  0,  0,  0,  0,
+127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,
+  0,  0,  0,  0,  0,  0,128, 63, 14,215,126,191, 54,189,194, 61, 14,215,126,191, 46,189,194, 61,232,209,222,  4,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,184,181,132,  5,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62, 31,133,107, 63,  0,  0,  0,  0,  0,  0, 64, 63, 10,215,163, 61,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,168, 47,169,  5,  0,  0,  0,  0,131,  1,  0,  0,
-  1,  0,  0,  0,232, 55,169,  5,  0,  0,  0,  0,232, 37,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 66, 82, 66,108,111, 98,  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 88, 54,169,  5,  0,  0,  0,  0,  1,  0,  1,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,232,209,222,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62, 31,133,107, 63,  0,  0,  0,  0,  0,  0, 64, 63, 10,215,163, 61,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+131,  1,  0,  0,  1,  0,  0,  0, 40,219,222,  4,  0,  0,  0,  0, 40,200,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 66,108,111, 98,  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 24,217,222,  4,  0,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,
+  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -6764,49 +6867,51 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  4,  0,
-  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,
-  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63, 20,174,199, 62, 20,174,199, 62, 20,174,199, 62, 20,174,199, 62,
-  0,  0,128, 63, 68, 65, 84, 65, 56,  1,  0,  0, 64, 48,169,  5,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63, 35,  0,  0,  0,
+  4,  4,  4,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0, 17,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,
+205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63, 20,174,199, 62, 20,174,199, 62, 20,174,199, 62,
+ 20,174,199, 62,  0,  0,128, 63, 68, 65, 84, 65, 56,  1,  0,  0,  0,211,222,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,
+  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0, 88, 54,169,  5,
-  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,
-  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186,200, 66,140,  5,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,
+ 24,217,222,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186,
+168,218,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,168,218,222,  4,  0,  0,  0,  0,
+125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,
+  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,
+ 40,219,222,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,104,210,222,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 66,108,117,114,  0, 46, 48, 48, 52,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,200, 66,140,  5,  0,  0,  0,  0,125,  1,  0,  0,
-  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,
-143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,232, 55,169,  5,
-  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0,168, 47,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 66,108,117,114,  0, 46, 48, 48, 52,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0,152, 62,169,  5,
-  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,
-  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0,
+216,225,222,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -6838,51 +6943,50 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  0,
+  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,  0,  0,  1,  4,  0,  0,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,192,219,222,  4,  0,  0,  0,  0,
+ 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  0,  0,  0,  0, 63,
- 35,  0,  0,  0,  4,  4,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,  0,  0,  1,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,128, 56,169,  5,  0,  0,  0,  0, 25,  0,  0,  0,
-  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,
-  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,
+  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65,
- 64,  1,  0,  0,152, 62,169,  5,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63, 14,215,126,191, 54,189,194, 61, 14,215,126,191,
- 46,189,194, 61,216,145,132,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+ 68, 65, 84, 65, 64,  1,  0,  0,216,225,222,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63, 14,215,126,191, 54,189,194, 61,
+ 14,215,126,191, 46,189,194, 61,104,227,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,216,145,132,  5,
-  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62, 31,133,107, 63,
-  0,  0,  0,  0,  0,  0, 64, 63, 10,215,163, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0,
- 96,  6,  0,  0, 40, 64,169,  5,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0,232, 55,169,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 66,114,117,115,104,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,
+104,227,222,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,
+ 31,133,107, 63,  0,  0,  0,  0,  0,  0, 64, 63, 10,215,163, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+ 66, 82,  0,  0, 96,  6,  0,  0,232,227,222,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,
+ 40,219,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 66,114,117,115,104,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0,  0,216, 70,169,  5,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  2,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0,  0,152,234,222,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
   0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -6915,49 +7019,49 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 30,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  4,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,
-205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
- 20,174,199, 62, 20,174,199, 62, 20,174,199, 62, 20,174,199, 62,  0,  0,128, 63, 68, 65, 84, 65, 56,  1,  0,  0,192, 64,169,  5,
-  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0, 30,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  4,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,
+102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63, 20,174,199, 62, 20,174,199, 62, 20,174,199, 62, 20,174,199, 62,  0,  0,128, 63, 68, 65, 84, 65, 56,  1,  0,  0,
+128,228,222,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
   0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,216, 70,169,  5,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0,  2,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191,
- 46, 95,255,186,224,255,127,191,114, 97,255,186,  8,  3,135,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,152,234,222,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,
+224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186, 40,236,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 48,  0,  0,  0,  8,  3,135,  5,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,104, 72,169,  5,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,168, 80,169,  5,
-  0,  0,  0,  0, 40, 64,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 67,108,
- 97,121,  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 48,  0,  0,  0, 40,236,222,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,168,236,222,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,
+104,245,222,  4,  0,  0,  0,  0,232,227,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 66, 82, 67,108, 97,121,  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 24, 79,169,  5,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 88,243,222,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -6990,50 +7094,49 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  4,  8,  0,  0,  0,  0, 10,  0,  0,  0,
- 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,
-  0,  0,  0, 62,  0,  0,128, 63, 20,174,199, 62, 20,174,199, 62, 20,174,199, 62, 20,174,199, 62,  0,  0,128, 63, 68, 65, 84, 65,
- 56,  1,  0,  0,  0, 73,169,  5,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  4,  8,  0,  0,  0,  0,
+ 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0,
+ 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63, 20,174,199, 62, 20,174,199, 62, 20,174,199, 62, 20,174,199, 62,  0,  0,128, 63,
+ 68, 65, 84, 65, 56,  1,  0,  0, 64,237,222,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0, 24, 79,169,  5,  0,  0,  0,  0,127,  1,  0,  0,
-  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,
-  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186, 56, 35,135,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0, 88,243,222,  4,  0,  0,  0,  0,
+127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,
+  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186,232,244,222,  4,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0, 56, 35,135,  5,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,168, 80,169,  5,  0,  0,  0,  0,131,  1,  0,  0,
-  1,  0,  0,  0,104, 89,169,  5,  0,  0,  0,  0,104, 72,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 66, 82, 67,108, 97,121, 32, 83,116,114,105,112,115,  0, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 88, 87,169,  5,  0,  0,  0,  0,  1,  0,  1,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,232,244,222,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,104,245,222,  4,  0,  0,  0,  0,
+131,  1,  0,  0,  1,  0,  0,  0, 40,254,222,  4,  0,  0,  0,  0,168,236,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 67,108, 97,121, 32, 83,116,114,105,112,115,  0, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 24,252,222,  4,  0,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,
+  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -7065,49 +7168,50 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  4,  0,
-  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0, 18,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,
-  0,  0,  0,  0, 33,  0,  0,  0,160,119, 78, 63,  0,  0,128, 63, 20,174,199, 62, 20,174,199, 62, 20,174,199, 62, 20,174,199, 62,
-  0,  0,128, 63, 68, 65, 84, 65, 56,  1,  0,  0, 64, 81,169,  5,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63, 35,  0,  0,  0,
+  4,  4,  4,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0, 18,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,
+205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,160,119, 78, 63,  0,  0,128, 63, 20,174,199, 62, 20,174,199, 62, 20,174,199, 62,
+ 20,174,199, 62,  0,  0,128, 63, 68, 65, 84, 65, 56,  1,  0,  0,  0,246,222,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,
+  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0, 88, 87,169,  5,
-  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,
-  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186,232, 88,169,  5,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,
+ 24,252,222,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  3,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186,
+168,253,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,168,253,222,  4,  0,  0,  0,  0,
+125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,
+  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,
+ 40,254,222,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,104,245,222,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 67,108,111,110,101,  0, 48, 48, 49,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,232, 88,169,  5,  0,  0,  0,  0,125,  1,  0,  0,
-  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,
-143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,104, 89,169,  5,
-  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0,168, 80,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 67,108,111,110,101,  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 24, 96,169,  5,
-  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,
-  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0,
+216,  4,223,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -7140,50 +7244,50 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0,  0,  0,  0, 63,
- 35,  0,  0,  0,  4,  4,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63, 51, 51, 51, 63,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,  0, 90,169,  5,  0,  0,  0,  0, 25,  0,  0,  0,
-  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0,
+  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 51, 51, 51, 63,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  3,  0,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,192,254,222,  4,  0,  0,  0,  0,
+ 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,
-  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65,
- 64,  1,  0,  0, 24, 96,169,  5,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63, 14,215,126,191, 54,189,194, 61, 14,215,126,191,
- 46,189,194, 61,168, 97,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+ 68, 65, 84, 65, 64,  1,  0,  0,216,  4,223,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63, 14,215,126,191, 54,189,194, 61,
+ 14,215,126,191, 46,189,194, 61,104,  6,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,168, 97,169,  5,
-  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62, 31,133,107, 63,
-  0,  0,  0,  0,  0,  0, 64, 63, 10,215,163, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0,
- 96,  6,  0,  0, 40, 98,169,  5,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0,104, 89,169,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 67,114,101, 97,115,101,  0, 48, 48, 49,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,
+104,  6,223,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,
+ 31,133,107, 63,  0,  0,  0,  0,  0,  0, 64, 63, 10,215,163, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+ 66, 82,  0,  0, 96,  6,  0,  0,232,  6,223,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,
+ 40,254,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 67,114,101, 97,115,101,
+  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0,  0,216,104,169,  5,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0,  0,152, 13,223,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
   0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -7216,49 +7320,49 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  2,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  6,  4,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,
-205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 62,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63,
- 20,174,199, 62, 20,174,199, 62, 20,174,199, 62, 20,174,199, 62,  0,  0,128, 63, 68, 65, 84, 65, 56,  1,  0,  0,192, 98,169,  5,
-  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  6,  4,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,
+102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 62,  0,  0,  0,  0,  0,  0,  0,  0,
+ 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,
+  0,  0,128, 63, 20,174,199, 62, 20,174,199, 62, 20,174,199, 62, 20,174,199, 62,  0,  0,128, 63, 68, 65, 84, 65, 56,  1,  0,  0,
+128,  7,223,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
   0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,216,104,169,  5,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,228, 97,175,190,
- 50,131,112, 63,218,243,127,191, 10,183,157,188,104,106,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,152, 13,223,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,
+228, 97,175,190, 50,131,112, 63,218,243,127,191, 10,183,157,188, 40, 15,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 48,  0,  0,  0,104,106,169,  5,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 62,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0, 64, 63, 10,215, 35, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,232,106,169,  5,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,168,115,169,  5,
-  0,  0,  0,  0, 40, 98,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 68, 97,
-114,107,101,110,  0, 48, 54,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 48,  0,  0,  0, 40, 15,223,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 62,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0, 64, 63, 10,215, 35, 61,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,168, 15,223,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,
+104, 24,223,  4,  0,  0,  0,  0,232,  6,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 66, 82, 68, 97,114,107,101,110,  0, 48, 54,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0,152,113,169,  5,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 88, 22,223,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -7291,50 +7395,49 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0,
- 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,
-  0,  0,  0, 62,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 56,  1,  0,  0,128,107,169,  5,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  0,  0,  0,  0,  0,  0,
+ 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0,
+ 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 56,  1,  0,  0, 64, 16,223,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,152,113,169,  5,  0,  0,  0,  0,127,  1,  0,  0,
-  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,
-  0,  0,128, 63, 14,215,126,191, 54,189,194, 61, 14,215,126,191, 46,189,194, 61, 40,115,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0, 88, 22,223,  4,  0,  0,  0,  0,
+127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,
+  0,  0,  0,  0,  0,  0,128, 63, 14,215,126,191, 54,189,194, 61, 14,215,126,191, 46,189,194, 61,232, 23,223,  4,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0, 40,115,169,  5,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62, 31,133,107, 63,  0,  0,  0,  0,  0,  0, 64, 63, 10,215,163, 61,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,168,115,169,  5,  0,  0,  0,  0,131,  1,  0,  0,
-  1,  0,  0,  0,104,124,169,  5,  0,  0,  0,  0,232,106,169,  5,  0,  0,  0,  0,  0, 20,  1,160,255,255,255,255,  0,  0,  0,  0,
-  0,  0,  0,  0, 66, 82, 68,114, 97,119,  0, 46, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 88,122,169,  5,  0,  0,  0,  0,  1,  0,  1,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,232, 23,223,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62, 31,133,107, 63,  0,  0,  0,  0,  0,  0, 64, 63, 10,215,163, 61,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+131,  1,  0,  0,  1,  0,  0,  0, 40, 33,223,  4,  0,  0,  0,  0,168, 15,223,  4,  0,  0,  0,  0,  0, 20,  1,160,255,255,255,255,
+  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 68,114, 97,119,  0, 46, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 24, 31,223,  4,  0,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,
+  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -7366,49 +7469,50 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 30,  0,  0,  0,  0, 63, 35,  0,  0,  0,  0,  4,  0,  8,
-  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,
-  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63, 20,174,199, 62, 20,174,199, 62, 20,174,199, 62, 20,174,199, 62,
-  0,  0,128, 63, 68, 65, 84, 65, 56,  1,  0,  0, 64,116,169,  5,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 28,  0,  0,  0,  0, 63, 35,  0,  0,  0,
+  0,  4,  0,  8,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,
+205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63, 20,174,199, 62, 20,174,199, 62, 20,174,199, 62,
+ 20,174,199, 62,  0,  0,128, 63, 68, 65, 84, 65, 56,  1,  0,  0,  0, 25,223,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,
+  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0, 88,122,169,  5,
-  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,
-  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186,232,123,169,  5,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,
+ 24, 31,223,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  3,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186,
+168, 32,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,168, 32,223,  4,  0,  0,  0,  0,
+125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,
+  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,
+ 40, 33,223,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,104, 24,223,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 70,105,108,108, 47, 68,101,101,112,101,110,  0, 48, 48,
+ 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0,
+216, 39,223,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,232,123,169,  5,  0,  0,  0,  0,125,  1,  0,  0,
-  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,
-143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,104,124,169,  5,
-  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0,168,115,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 70,105,108,108, 47, 68,101,101,112,101,110,  0, 48, 48, 49,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 24,131,169,  5,
-  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,
-  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -7441,50 +7545,50 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63,
- 35,  0,  0,  0,  4,  4,  4,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63,  0,  0,128, 63, 20,174,199, 62,
-  0,  0,128, 62,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 56,  1,  0,  0,  0,125,169,  5,  0,  0,  0,  0, 25,  0,  0,  0,
-  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,
+  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  4,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63,  0,  0,128, 63,
+ 20,174,199, 62,  0,  0,128, 62,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 56,  1,  0,  0,192, 33,223,  4,  0,  0,  0,  0,
+ 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,
-  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65,
- 64,  1,  0,  0, 24,131,169,  5,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
-  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,
-114, 97,255,186,168,132,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+ 68, 65, 84, 65, 64,  1,  0,  0,216, 39,223,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,
+224,255,127,191,114, 97,255,186,104, 41,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,168,132,169,  5,
-  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,
-  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0,
- 96,  6,  0,  0, 40,133,169,  5,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0,104,124,169,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 70,108, 97,116,116,101,110, 47, 67,111,
-110,116,114, 97,115,116,  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0,  0,216,139,169,  5,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,
+104, 41,223,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,
+215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+ 66, 82,  0,  0, 96,  6,  0,  0,232, 41,223,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,
+ 40, 33,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 70,108, 97,116,116,101,
+110, 47, 67,111,110,116,114, 97,115,116,  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0,  0,152, 48,223,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
   0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -7517,49 +7621,49 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  2,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  4,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,
-205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  7,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63,
-  0,  0,128, 63, 20,174,199, 62,  0,  0,128, 62,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 56,  1,  0,  0,192,133,169,  5,
-  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  4,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,
+102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,
+  0,  0,128, 63,  0,  0,128, 63, 20,174,199, 62,  0,  0,128, 62,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 56,  1,  0,  0,
+128, 42,223,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
   0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,216,139,169,  5,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191,
- 46, 95,255,186,224,255,127,191,114, 97,255,186,104,141,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,152, 48,223,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,
+224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186, 40, 50,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 48,  0,  0,  0,104,141,169,  5,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,232,141,169,  5,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,168,150,169,  5,
-  0,  0,  0,  0, 40,133,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 71,114,
- 97, 98,  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 48,  0,  0,  0, 40, 50,223,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,168, 50,223,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,
+104, 59,223,  4,  0,  0,  0,  0,232, 41,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 66, 82, 71,114, 97, 98,  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0,152,148,169,  5,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 88, 57,223,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -7592,50 +7696,49 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63, 75,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0,
- 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,
-  0,  0,  0,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,
-  0,  0,  0, 62,  0,  0,128, 62,  0,  0,128, 63,  0,  0,128, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 56,  1,  0,  0,128,142,169,  5,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63, 75,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,
+  0,  0,  0,  0,  0,  0,  0,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0,
+ 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 62,  0,  0,128, 63,  0,  0,128, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 56,  1,  0,  0, 64, 51,223,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,152,148,169,  5,  0,  0,  0,  0,127,  1,  0,  0,
-  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,
-  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186, 40,150,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0, 88, 57,223,  4,  0,  0,  0,  0,
+127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,
+  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186,232, 58,223,  4,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0, 40,150,169,  5,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,168,150,169,  5,  0,  0,  0,  0,131,  1,  0,  0,
-  1,  0,  0,  0,104,159,169,  5,  0,  0,  0,  0,232,141,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 66, 82, 73,110,102,108, 97,116,101, 47, 68,101,102,108, 97,116,101,  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 88,157,169,  5,  0,  0,  0,  0,  1,  0,  1,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,232, 58,223,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+131,  1,  0,  0,  1,  0,  0,  0, 40, 68,223,  4,  0,  0,  0,  0,168, 50,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 73,110,102,108, 97,116,101, 47, 68,101,102,108, 97,116,101,  0, 48, 48, 49,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 24, 66,223,  4,  0,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,
+  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -7667,49 +7770,50 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  4,  0,
-  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,
-  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0, 64, 63,  0,  0, 64, 63,  0,  0, 64, 63,  0,  0,128, 62,  0,  0,128, 62,
-  0,  0,128, 62, 68, 65, 84, 65, 56,  1,  0,  0, 64,151,169,  5,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63, 35,  0,  0,  0,
+  4,  4,  4,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,
+205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0, 64, 63,  0,  0, 64, 63,  0,  0, 64, 63,  0,  0,128, 62,
+  0,  0,128, 62,  0,  0,128, 62, 68, 65, 84, 65, 56,  1,  0,  0,  0, 60,223,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,
+  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0, 88,157,169,  5,
-  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,
-  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186,232,158,169,  5,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,
+ 24, 66,223,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186,
+168, 67,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,168, 67,223,  4,  0,  0,  0,  0,
+125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,
+  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,
+ 40, 68,223,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,104, 59,223,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 76, 97,121,101,114,  0, 48, 48, 49,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,232,158,169,  5,  0,  0,  0,  0,125,  1,  0,  0,
-  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,
-143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,104,159,169,  5,
-  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0,168,150,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 76, 97,121,101,114,  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 24,166,169,  5,
-  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,
-  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0,
+216, 74,223,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -7742,50 +7846,50 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63,
- 35,  0,  0,  0,  4,  4,  4,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63, 20,174,199, 62, 20,174,199, 62,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,  0,160,169,  5,  0,  0,  0,  0, 25,  0,  0,  0,
-  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,
+  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  4,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63, 20,174,199, 62,
+ 20,174,199, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,192, 68,223,  4,  0,  0,  0,  0,
+ 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,
-  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65,
- 64,  1,  0,  0, 24,166,169,  5,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
-  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,
-114, 97,255,186,168,167,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+ 68, 65, 84, 65, 64,  1,  0,  0,216, 74,223,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,
+224,255,127,191,114, 97,255,186,104, 76,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,168,167,169,  5,
-  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,
-  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0,
- 96,  6,  0,  0, 40,168,169,  5,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0,104,159,169,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 76,105,103,104,116,101,110,  0, 53,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,
+104, 76,223,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,
+215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+ 66, 82,  0,  0, 96,  6,  0,  0,232, 76,223,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,168, 85,223,  4,  0,  0,  0,  0,
+ 40, 68,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 76,105,103,104,116,101,
+110,  0, 53,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  2,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0,  0,216,174,169,  5,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0,  0,152, 83,223,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
   0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -7818,49 +7922,49 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 12,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,
-205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,  0,  0,  1,  5,  0,  0,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,192,168,169,  5,
-  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0, 12,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,
+102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,
+128, 77,223,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
   0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,216,174,169,  5,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63, 14,215,126,191,
- 54,189,194, 61, 14,215,126,191, 46,189,194, 61,104,176,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,152, 83,223,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,
+ 14,215,126,191, 54,189,194, 61, 14,215,126,191, 46,189,194, 61, 40, 85,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 48,  0,  0,  0,104,176,169,  5,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 62, 31,133,107, 63,  0,  0,  0,  0,  0,  0, 64, 63, 10,215,163, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,232,176,169,  5,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,168,185,169,  5,
-  0,  0,  0,  0, 40,168,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 77,105,
-120,  0,104,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 48,  0,  0,  0, 40, 85,223,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 62, 31,133,107, 63,  0,  0,  0,  0,  0,  0, 64, 63, 10,215,163, 61,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,168, 85,223,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,
+104, 94,223,  4,  0,  0,  0,  0,232, 76,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 66, 82, 77, 97,115,107,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0,152,183,169,  5,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 88, 92,223,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  5,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,168, 82, 99,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -7893,50 +7997,49 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0,
- 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 51, 51, 51, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,
-  0,  0,  0, 62,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 56,  1,  0,  0,128,177,169,  5,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,128, 63, 35,  0,  0,  0,  4,  4,  4,  0,  0,  0,  0,  0,
+ 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 63,
+  0,  0,  0,  0,  0,  0,  0,  0, 19,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+ 33,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63, 20,174,199, 62, 20,174,199, 62, 20,174,199, 62, 20,174,199, 62,  0,  0,128, 63,
+ 68, 65, 84, 65, 56,  1,  0,  0, 64, 86,223,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  5,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,152,183,169,  5,  0,  0,  0,  0,127,  1,  0,  0,
-  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,
-  0,  0,128, 63, 14,215,126,191, 54,189,194, 61, 14,215,126,191, 46,189,194, 61, 40,185,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0, 88, 92,223,  4,  0,  0,  0,  0,
+127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,
+  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 44, 95,255,186,224,255,127,191, 23, 97,255,186,232, 93,223,  4,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0, 40,185,169,  5,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62, 31,133,107, 63,  0,  0,  0,  0,  0,  0, 64, 63, 10,215,163, 61,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,168,185,169,  5,  0,  0,  0,  0,131,  1,  0,  0,
-  1,  0,  0,  0,104,194,169,  5,  0,  0,  0,  0,232,176,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 66, 82, 77,117,108,116,105,112,108,121,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 88,192,169,  5,  0,  0,  0,  0,  1,  0,  1,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,232, 93,223,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+131,  1,  0,  0,  1,  0,  0,  0, 40,103,223,  4,  0,  0,  0,  0,168, 85,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 77,105,120,  0,104,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 24,101,223,  4,  0,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,
+  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -7968,49 +8071,50 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  0,  0,
-  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-205,204, 76, 62,  0,  0,  0,  0,  0,  0,  0,  0,  1,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,
-  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0, 64,186,169,  5,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  0,  0,  0,  0, 63, 35,  0,  0,  0,
+  4,  4,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63, 51, 51, 51, 63,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,
+205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,  0, 95,223,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,
+  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0, 88,192,169,  5,
-  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,
-  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63, 14,215,126,191, 54,189,194, 61, 14,215,126,191, 46,189,194, 61,232,193,169,  5,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,
+ 24,101,223,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63, 14,215,126,191, 54,189,194, 61, 14,215,126,191, 46,189,194, 61,
+168,102,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,168,102,223,  4,  0,  0,  0,  0,
+125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62, 31,133,107, 63,  0,  0,  0,  0,
+  0,  0, 64, 63, 10,215,163, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,
+ 40,103,223,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,104, 94,223,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 77,117,108,116,105,112,108,121,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,232,193,169,  5,  0,  0,  0,  0,125,  1,  0,  0,
-  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62, 31,133,107, 63,  0,  0,  0,  0,  0,  0, 64, 63,
- 10,215,163, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,104,194,169,  5,
-  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0,168,185,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 78,117,100,103,101,  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 24,201,169,  5,
-  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,
-  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0,
+216,109,223,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -8043,50 +8147,50 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63,
- 35,  0,  0,  0,  4,  4,  4,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0, 11,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 62,  0,  0,128, 63,  0,  0,128, 62,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,  0,195,169,  5,  0,  0,  0,  0, 25,  0,  0,  0,
-  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  0,
+  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,  0,  0,  1,  3,  0,  0,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,192,103,223,  4,  0,  0,  0,  0,
+ 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,
-  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,
+  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65,
- 64,  1,  0,  0, 24,201,169,  5,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
-  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,
-114, 97,255,186,168,202,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+ 68, 65, 84, 65, 64,  1,  0,  0,216,109,223,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63, 14,215,126,191, 54,189,194, 61,
+ 14,215,126,191, 46,189,194, 61,104,111,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,168,202,169,  5,
-  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,
-  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0,
- 96,  6,  0,  0, 40,203,169,  5,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0,104,194,169,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 80,105,110, 99,104, 47, 77, 97,103,110,
-105,102,121,  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0,  0,216,209,169,  5,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,
+104,111,223,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,
+ 31,133,107, 63,  0,  0,  0,  0,  0,  0, 64, 63, 10,215,163, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+ 66, 82,  0,  0, 96,  6,  0,  0,232,111,223,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,
+ 40,103,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 78,117,100,103,101,  0,
+ 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0,  0,152,118,223,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
   0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -8119,49 +8223,49 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  2,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  4,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,
-205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0, 64, 63,
-  0,  0, 64, 63,  0,  0, 64, 63,  0,  0,128, 62,  0,  0,128, 62,  0,  0,128, 62, 68, 65, 84, 65, 56,  1,  0,  0,192,203,169,  5,
-  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  4,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,
+102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+ 11,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,
+  0,  0,128, 62,  0,  0,128, 63,  0,  0,128, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,
+128,112,223,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
   0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,216,209,169,  5,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191,
- 46, 95,255,186,224,255,127,191,114, 97,255,186,104,211,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,152,118,223,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,
+224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186, 40,120,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 48,  0,  0,  0,104,211,169,  5,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,232,211,169,  5,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,168,220,169,  5,
-  0,  0,  0,  0, 40,203,169,  5,  0,  0,  0,  0,253, 21,192, 32,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 80,111,
-108,105,115,104,  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 48,  0,  0,  0, 40,120,223,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,168,120,223,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,
+104,129,223,  4,  0,  0,  0,  0,232,111,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 66, 82, 80,105,110, 99,104, 47, 77, 97,103,110,105,102,121,  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0,152,218,169,  5,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 88,127,223,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -8194,50 +8298,49 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  4,  1,  0,  0,  0,  0, 10,  0,  0,  0,
- 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,
-  0,  0,  0, 62,  0,  0,128, 63,  0,  0,128, 63, 20,174,199, 62,  0,  0,128, 62,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65,
- 56,  1,  0,  0,128,212,169,  5,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  4,  0,  0,  0,  0,  0,
+ 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0,
+ 33,  0,  0,  0,  0,  0,  0, 62,  0,  0, 64, 63,  0,  0, 64, 63,  0,  0, 64, 63,  0,  0,128, 62,  0,  0,128, 62,  0,  0,128, 62,
+ 68, 65, 84, 65, 56,  1,  0,  0, 64,121,223,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,152,218,169,  5,  0,  0,  0,  0,127,  1,  0,  0,
-  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,
-  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186, 40,220,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0, 88,127,223,  4,  0,  0,  0,  0,
+127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,
+  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186,232,128,223,  4,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0, 40,220,169,  5,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,168,220,169,  5,  0,  0,  0,  0,131,  1,  0,  0,
-  1,  0,  0,  0,104,229,169,  5,  0,  0,  0,  0,232,211,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 66, 82, 83, 99,114, 97,112,101, 47, 80,101, 97,107,115,  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,232,128,223,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+131,  1,  0,  0,  1,  0,  0,  0, 40,138,223,  4,  0,  0,  0,  0,168,120,223,  4,  0,  0,  0,  0,253, 21,192, 32,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 80,111,108,105,115,104,  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 88,227,169,  5,  0,  0,  0,  0,  1,  0,  1,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 24,136,223,  4,  0,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,
+  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -8269,49 +8372,51 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  4,  0,
-  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,
-  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63,  0,  0,128, 63, 20,174,199, 62,  0,  0,128, 62,  0,  0,128, 63,
-  0,  0,128, 63, 68, 65, 84, 65, 56,  1,  0,  0, 64,221,169,  5,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63, 35,  0,  0,  0,
+  4,  4,  4,  1,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  7,  0,  0,  0,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0, 63,
+205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63,  0,  0,128, 63, 20,174,199, 62,  0,  0,128, 62,
+  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 56,  1,  0,  0,  0,130,223,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,
+  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0, 88,227,169,  5,
-  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,
-  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186,232,228,169,  5,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,
+ 24,136,223,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186,
+168,137,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,168,137,223,  4,  0,  0,  0,  0,
+125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,
+  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,
+ 40,138,223,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,104,129,223,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 83, 99,114, 97,112,101, 47, 80,101, 97,107,115,  0, 48,
+ 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0,
+216,144,223,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,232,228,169,  5,  0,  0,  0,  0,125,  1,  0,  0,
-  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,
-143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,104,229,169,  5,
-  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0,168,220,169,  5,  0,  0,  0,  0,168,205,210,  3,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 83, 99,117,108,112,116, 68,114, 97,119,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 24,236,169,  5,
-  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,
-  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -8343,51 +8448,50 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,
+  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  4,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63,  0,  0,128, 63,
+ 20,174,199, 62,  0,  0,128, 62,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 56,  1,  0,  0,192,138,223,  4,  0,  0,  0,  0,
+ 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63,
- 35,  0,  0,  0,  4,  4,  4,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,160,119, 78, 63,  0,  0,128, 63, 20,174,199, 62, 20,174,199, 62,
- 20,174,199, 62, 20,174,199, 62,  0,  0,128, 63, 68, 65, 84, 65, 56,  1,  0,  0,  0,230,169,  5,  0,  0,  0,  0, 25,  0,  0,  0,
-  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,
-  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,
+  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65,
- 64,  1,  0,  0, 24,236,169,  5,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
-  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,
-114, 97,255,186,168,237,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+ 68, 65, 84, 65, 64,  1,  0,  0,216,144,223,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,
+224,255,127,191,114, 97,255,186,104,146,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,168,237,169,  5,
-  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,
-  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0,
- 96,  6,  0,  0, 40,238,169,  5,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0,104,229,169,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 83,109,101, 97,114,  0, 48, 48, 49,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,
+104,146,223,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,
+215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+ 66, 82,  0,  0, 96,  6,  0,  0,232,146,223,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,
+ 40,138,223,  4,  0,  0,  0,  0,168,205,210,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 83, 99,117,108,112,116,
+ 68,114, 97,119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  3,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0,  0,216,244,169,  5,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0,  0,152,153,223,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
   0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  8, 92,154,177, 30,127,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -8420,49 +8524,49 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 16,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,
-205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  2,  0,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,192,238,169,  5,
-  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  4,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,
+102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,160,119, 78, 63,
+  0,  0,128, 63, 20,174,199, 62, 20,174,199, 62, 20,174,199, 62, 20,174,199, 62,  0,  0,128, 63, 68, 65, 84, 65, 56,  1,  0,  0,
+128,147,223,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
   0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,216,244,169,  5,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63, 14,215,126,191,
- 54,189,194, 61, 14,215,126,191, 46,189,194, 61,104,246,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,152,153,223,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,
+224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186, 40,155,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 48,  0,  0,  0,104,246,169,  5,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 62, 31,133,107, 63,  0,  0,  0,  0,  0,  0, 64, 63, 10,215,163, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,232,246,169,  5,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,168,255,169,  5,
-  0,  0,  0,  0, 40,238,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 83,109,
-111,111,116,104,  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 48,  0,  0,  0, 40,155,223,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,168,155,223,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,
+104,164,223,  4,  0,  0,  0,  0,232,146,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 66, 82, 83,109,101, 97,114,  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0,152,253,169,  5,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 88,162,223,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -8495,50 +8599,49 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  0,  0,  0,  0,  0,  0,  5,  0,  0,  0,
- 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,
-  0,  0,  0, 62,  0,  0, 64, 63,  0,  0, 64, 63,  0,  0, 64, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 56,  1,  0,  0,128,247,169,  5,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  0,  0,  0,  0,  0,  0,
+ 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0,
+ 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 56,  1,  0,  0, 64,156,223,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,152,253,169,  5,  0,  0,  0,  0,127,  1,  0,  0,
-  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,
-  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186, 40,255,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0, 88,162,223,  4,  0,  0,  0,  0,
+127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,
+  0,  0,  0,  0,  0,  0,128, 63, 14,215,126,191, 54,189,194, 61, 14,215,126,191, 46,189,194, 61,232,163,223,  4,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0, 40,255,169,  5,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,168,255,169,  5,  0,  0,  0,  0,131,  1,  0,  0,
-  1,  0,  0,  0,104,  8,170,  5,  0,  0,  0,  0,232,246,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 66, 82, 83,110, 97,107,101, 32, 72,111,111,107,  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,232,163,223,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62, 31,133,107, 63,  0,  0,  0,  0,  0,  0, 64, 63, 10,215,163, 61,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+131,  1,  0,  0,  1,  0,  0,  0, 40,173,223,  4,  0,  0,  0,  0,168,155,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 83,109,111,111,116,104,  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 88,  6,170,  5,  0,  0,  0,  0,  1,  0,  1,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 24,171,223,  4,  0,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,
+  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -8570,49 +8673,50 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63, 75,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0, 13,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,
-  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 62,  0,  0,128, 63,  0,  0,128, 62,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0, 64,  0,170,  5,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63, 35,  0,  0,  0,
+  4,  4,  0,  0,  0,  0,  0,  0,  5,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,
+205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0, 64, 63,  0,  0, 64, 63,  0,  0, 64, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,  0,165,223,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,
+  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0, 88,  6,170,  5,
-  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,
-  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186,232,  7,170,  5,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,
+ 24,171,223,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186,
+168,172,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,168,172,223,  4,  0,  0,  0,  0,
+125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,
+  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,
+ 40,173,223,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,104,164,223,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 83,110, 97,107,101, 32, 72,111,111,107,  0, 48, 48, 49,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,232,  7,170,  5,  0,  0,  0,  0,125,  1,  0,  0,
-  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,
-143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,104,  8,170,  5,
-  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0,168,255,169,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 83,111,102,116,101,110,  0, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 24, 15,170,  5,
-  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,
-  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0,
+216,179,223,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -8645,50 +8749,50 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0,  0,  0,  0, 63,
- 35,  0,  0,  0,  4,  4,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,  0,  9,170,  5,  0,  0,  0,  0, 25,  0,  0,  0,
-  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,
+  0,  0,  0, 63, 75,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0, 13,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 62,  0,  0,128, 63,
+  0,  0,128, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,192,173,223,  4,  0,  0,  0,  0,
+ 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,
-  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65,
- 64,  1,  0,  0, 24, 15,170,  5,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63, 14,215,126,191, 54,189,194, 61, 14,215,126,191,
- 46,189,194, 61,168, 16,170,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+ 68, 65, 84, 65, 64,  1,  0,  0,216,179,223,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,
+224,255,127,191,114, 97,255,186,104,181,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,168, 16,170,  5,
-  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62, 31,133,107, 63,
-  0,  0,  0,  0,  0,  0, 64, 63, 10,215,163, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0,
- 96,  6,  0,  0, 40, 17,170,  5,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0,104,  8,170,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 83,117, 98,116,114, 97, 99,116,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,
+104,181,223,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,
+215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+ 66, 82,  0,  0, 96,  6,  0,  0,232,181,223,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,
+ 40,173,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 83,111,102,116,101,110,
+  0, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  2,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  2,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0,  0,216, 23,170,  5,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0,  0,152,188,223,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
   0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -8721,49 +8825,49 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 12,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,
-205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  0,  0,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,192, 17,170,  5,
-  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0, 16,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,
+102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,
+128,182,223,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
   0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,216, 23,170,  5,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,
-  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63, 14,215,126,191,
- 54,189,194, 61, 14,215,126,191, 46,189,194, 61,104, 25,170,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,152,188,223,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,
+ 14,215,126,191, 54,189,194, 61, 14,215,126,191, 46,189,194, 61, 40,190,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 48,  0,  0,  0,104, 25,170,  5,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 62, 31,133,107, 63,  0,  0,  0,  0,  0,  0, 64, 63, 10,215,163, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,232, 25,170,  5,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,168, 34,170,  5,
-  0,  0,  0,  0, 40, 17,170,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 84,101,
-120, 68,114, 97,119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 48,  0,  0,  0, 40,190,223,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 62, 31,133,107, 63,  0,  0,  0,  0,  0,  0, 64, 63, 10,215,163, 61,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,168,190,223,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,
+104,199,223,  4,  0,  0,  0,  0,232,181,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 66, 82, 83,117, 98,116,114, 97, 99,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  2,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0,152, 32,170,  5,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  1,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 88,197,223,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -8796,50 +8900,49 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  0,  8,  0,  0,  0,  0, 10,  0,  0,  0,
- 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 51, 51, 51, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,
-  0,  0,  0, 62,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 20,174,199, 62, 20,174,199, 62,  0,  0,128, 63, 68, 65, 84, 65,
- 56,  1,  0,  0,128, 26,170,  5,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  0,  0,  0,  0, 63, 35,  0,  0,  0,  4,  4,  0,  0,  0,  0,  0,  0,
+ 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0,
+ 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 56,  1,  0,  0, 64,191,223,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,152, 32,170,  5,  0,  0,  0,  0,127,  1,  0,  0,
-  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,
-  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186, 40, 34,170,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0, 88,197,223,  4,  0,  0,  0,  0,
+127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,
+  0,  0,  0,  0,  0,  0,128, 63, 14,215,126,191, 54,189,194, 61, 14,215,126,191, 46,189,194, 61,232,198,223,  4,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0, 40, 34,170,  5,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,168, 34,170,  5,  0,  0,  0,  0,131,  1,  0,  0,
-  1,  0,  0,  0,104, 43,170,  5,  0,  0,  0,  0,232, 25,170,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 66, 82, 84,104,117,109, 98,  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 88, 41,170,  5,  0,  0,  0,  0,  1,  0,  1,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,232,198,223,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62, 31,133,107, 63,  0,  0,  0,  0,  0,  0, 64, 63, 10,215,163, 61,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+131,  1,  0,  0,  1,  0,  0,  0, 40,208,223,  4,  0,  0,  0,  0,168,190,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 84,101,120, 68,114, 97,119,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 24,206,223,  4,  0,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,
+  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -8871,49 +8974,51 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63, 75,  0,  0,  0,  4,  0,  0,  0,
-  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0, 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,
-  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 62,  0,  0,128, 63,  0,  0,128, 62,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0, 64, 35,170,  5,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0,  0,  0,  0, 63, 35,  0,  0,  0,
+  4,  4,  0,  8,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63, 51, 51, 51, 63,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,
+205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 20,174,199, 62,
+ 20,174,199, 62,  0,  0,128, 63, 68, 65, 84, 65, 56,  1,  0,  0,  0,200,223,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,
+  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,
+  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0, 88, 41,170,  5,
-  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,
-  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186,232, 42,170,  5,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,
+ 24,206,223,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  3,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186,
+168,207,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,168,207,223,  4,  0,  0,  0,  0,
+125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,
+  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,
+ 40,208,223,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,232,216,223,  4,  0,  0,  0,  0,104,199,223,  4,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 84,104,117,109, 98,  0, 48, 48, 49,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,232, 42,170,  5,  0,  0,  0,  0,125,  1,  0,  0,
-  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,
-143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82,  0,  0, 96,  6,  0,  0,104, 43,170,  5,
-  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,168, 34,170,  5,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 84,119,105,115,116,  0, 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0, 24, 50,170,  5,
-  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,
-  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0,
+216,214,223,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -8945,62 +9050,55 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,
+  0,  0,  0, 63, 75,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0, 12,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 62,  0,  0,128, 63,
+  0,  0,128, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,192,208,223,  4,  0,  0,  0,  0,
+ 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63,
- 75,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,102,102,102, 63,205,204,204, 61,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 14,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,  0,  0,128, 62,  0,  0,128, 63,  0,  0,128, 62,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,  0, 44,170,  5,  0,  0,  0,  0, 25,  0,  0,  0,
-  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,
-  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,
+  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,205,204, 76, 62,  0,  0,  0,  0,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
   0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65,
- 64,  1,  0,  0, 24, 50,170,  5,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
-  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,224,255,127,191,
-114, 97,255,186,168, 51,170,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
-  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,168, 51,170,  5,
-  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,
-  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0, 85, 83, 69, 82,
-112, 38,  0,  0,192,113, 10,  4,  0,  0,  0,  0,210,  0,  0,  0,  1,  0,  0,  0,  1,  8, 17,  1, 63,  6,  0,  0,  5,  0,  0,  0,
- 47,116,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0, 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+ 68, 65, 84, 65, 64,  1,  0,  0,216,214,223,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,224,255,127,191, 46, 95,255,186,
+224,255,127,191,114, 97,255,186,104,216,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 48,  0,  0,  0,
+104,216,223,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 62,
+215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+ 66, 82,  0,  0, 96,  6,  0,  0,232,216,223,  4,  0,  0,  0,  0,131,  1,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 40,208,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66, 82, 84,119,105,115,116,  0,
+ 48, 48, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  3,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0,  0,152,223,223,  4,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 47, 47,  0, 85,115,101,114,115, 47,116,111,110, 47, 68,101,115,107,116,111,112, 47,  0, 45,112,111,119,101,114,112, 99, 47, 98,
-105,110, 47, 98,108,101,110,100,101,114, 46, 97,112,112, 47, 67,111,110,116,101,110,116,115, 47, 82,101,115,111,117,114, 99,101,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -9023,19 +9121,41 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 47, 47,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0, 63, 75,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0, 10,  0,  0,  0, 75,  0,  0,  0,
+102,102,102, 63,205,204,204, 61,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,
+ 14,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,205,204,204, 62,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 62,
+  0,  0,128, 62,  0,  0,128, 63,  0,  0,128, 62,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 56,  1,  0,  0,
+128,217,223,  4,  0,  0,  0,  0, 25,  0,  0,  0,  1,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+205,204, 76, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63, 68, 65, 84, 65, 64,  1,  0,  0,152,223,223,  4,  0,  0,  0,  0,127,  1,  0,  0,  1,  0,  0,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,128, 63,  4,  0,  0,  0,  0,  0,128, 67,  0,  0,  0,  0,  0,  0,128, 63,
+224,255,127,191, 46, 95,255,186,224,255,127,191,114, 97,255,186, 40,225,223,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 48,  0,  0,  0, 40,225,223,  4,  0,  0,  0,  0,125,  1,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,128, 62,215,163,112, 63,  0,  0,  0,  0,  0,  0, 64, 63,143,194,117, 61,  0,  0,  0,  0,  0,  0,128, 63,
+  0,  0,  0,  0,  0,  0,  0,  0, 85, 83, 69, 82,112, 32,  0,  0, 96, 25, 56,  3,  0,  0,  0,  0,211,  0,  0,  0,  1,  0,  0,  0,
+  1,  8, 17,  1, 63,  6,  0,  0,  5,  0,  0,  0, 47,116,109,112,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -9055,10 +9175,12 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 47, 47,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 47, 47,  0, 85,115,101,114,115, 47,116,111,110, 47, 68,101,115,107,116,111,112,
+ 47,  0, 45,112,111,119,101,114,112, 99, 47, 98,105,110, 47, 98,108,101,110,100,101,114, 46, 97,112,112, 47, 67,111,110,116,101,
+110,116,115, 47, 82,101,115,111,117,114, 99,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -9080,6 +9202,7 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 47, 47,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -9111,6 +9234,7 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 47, 47,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -9151,7 +9275,6 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 47, 47,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -9159,6 +9282,7 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 47, 47,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -9239,2500 +9363,2509 @@ char datatoc_startup_blend[] = {
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  1,  0,  0,  0, 35,  0,  0,  0,  2,  0, 94,  1,  8,  0,  0,  0,  3,  0,  0,  0, 56, 52, 39,  0,  0,  0,  0,  0,  1,  0,  2,  0,
-  0,  8,  0,  0,  2,  0,  0,  0, 68,172,  0,  0, 36,  0,  0,  0,  2,  0,  0,  0,  0,  1,  0,  0, 72,  0,  0,  0,  0,  0, 64,  0,
-  5,  0,  2,  0,232, 90,170,  5,  0,  0,  0,  0,232, 90,170,  5,  0,  0,  0,  0,  8, 79,133,  5,  0,  0,  0,  0,  8, 79,133,  5,
-  0,  0,  0,  0,216,132,170,  5,  0,  0,  0,  0,216,132,170,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152, 44,169,  5,  0,  0,  0,  0, 56,132,170,  5,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 32,  0,  0,  0,  1,  0,  2,  0, 25,  0,  0,  0, 20,  0, 20,  0,  1,  0,  0,  0,  0,  0,  0,  0,205,204, 76, 63,
-205,204, 76, 63,205,204, 76, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63, 30, 90,100,191,
-154,153,153, 62,102,102,102, 63,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0, 31,250,254, 62,  9,  0,  0, 63,156,153, 25, 63,
-  0,  0,  0,  0,205,204, 76, 62,205,204, 76, 62,205,204, 76, 62,  0,  0,128, 63, 44,135, 22, 63, 32,133,235, 62,184,243,125, 62,
-  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,195, 73, 76, 63, 42,135, 86, 63,  0,  0,128, 63,  0,  0,  0,  0,  1, 43,135, 61,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63, 16, 47, 93, 62, 58,180,200,190, 24, 47, 93,190,  0,  0,  0,  0, 14,  0,  1,  0,
- 25,  0, 15,  0,120,  0, 60,  0,  3,  0,  5,  0,128,  0,  0,  0,  0,  0,  0,  0,144, 31, 15,  0,  6,  0, 25,  0,  8,  0, 10,  0,
-200,  0,  0,  0,  0,  0,  0,  0,  2,  0,  4,  0, 10,  0, 50,  0, 20,  0,  2,  0,  1,  0,  0,  0,  0,  0,128, 63, 60,  0,  0,  0,
-  0,  0,  2,  0,  2,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,
-  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,
-  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,
-  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,
-  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,
-  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,
-  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,
-  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,
-  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,
-  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,
-  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 62,
-  0,  0,  0,  0, 68, 65, 84, 65,168, 36,  0,  0,232, 90,170,  5,  0,  0,  0,  0,207,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,101,102, 97,117,108,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25, 25, 25,255,153,153,153,255,100,100,100,255, 25, 25, 25,255,  0,  0,  0,255,
-255,255,255,255,  0,  0,  0,  0,  0,  0,  0,  0, 25, 25, 25,255,153,153,153,255,100,100,100,255, 25, 25, 25,255,  0,  0,  0,255,
-255,255,255,255,  1,  0, 15,  0,241,255,  0,  0, 25, 25, 25,255,153,153,153,255,153,153,153,255, 90, 90, 90,255,  0,  0,  0,255,
-255,255,255,255,  1,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,255, 70, 70, 70,255, 86,128,194,255,255,255,255,255,255,255,255,255,
-  0,  0,  0,255,  1,  0, 15,  0,241,255,  0,  0,  0,  0,  0,255, 70, 70, 70,255, 70, 70, 70,255,255,255,255,255,  0,  0,  0,255,
-255,255,255,255,  1,  0, 15,  0,241,255,  0,  0, 25, 25, 25,255,153,153,153,255,100,100,100,255, 25, 25, 25,255,  0,  0,  0,255,
-255,255,255,255,  0,  0,  0,  0,  0,  0,  0,  0, 25, 25, 25,255,180,180,180,255,153,153,153,255, 90, 90, 90,255,  0,  0,  0,255,
-255,255,255,255,  1,  0,236,255,  0,  0,  0,  0, 25, 25, 25,255,180,180,180,255,153,153,153,255,128,128,128,255,  0,  0,  0,255,
-255,255,255,255,  1,  0,236,255,  0,  0,  0,  0,  0,  0,  0,255, 70, 70, 70,255, 70, 70, 70,255,255,255,255,255,255,255,255,255,
-204,204,204,255,  1,  0, 15,  0,241,255,  0,  0,  0,  0,  0,255, 63, 63, 63,255, 86,128,194,255,255,255,255,255,  0,  0,  0,255,
-  0,  0,  0,255,  0,  0, 25,  0,236,255,  0,  0,  0,  0,  0,255, 25, 25, 25,230, 45, 45, 45,230,100,100,100,255,160,160,160,255,
-255,255,255,255,  0,  0, 25,  0,236,255,  0,  0,  0,  0,  0,255,  0,  0,  0,  0, 86,128,194,255,172,172,172,128,255,255,255,255,
-  0,  0,  0,255,  1,  0, 38,  0,  0,  0,  0,  0,  0,  0,  0,255, 25, 25, 25,230, 45, 45, 45,230,100,100,100,255,255,255,255,255,
-255,255,255,255,  0,  0, 25,  0,236,255,  0,  0, 25, 25, 25,255,128,128,128,255,100,100,100,255, 25, 25, 25,255,  0,  0,  0,255,
-255,255,255,255,  0,  0,  0,  0,  0,  0,  0,  0, 50, 50, 50,180, 80, 80, 80,180,100,100,100,180,128,128,128,255,  0,  0,  0,255,
-255,255,255,255,  1,  0,  5,  0,251,255,  0,  0,  0,  0,  0,255,190,190,190,255,100,100,100,180, 68, 68, 68,255,  0,  0,  0,255,
-255,255,255,255,  0,  0,  5,  0,251,255,  0,  0,  0,  0,  0,255,  0,  0,  0,  0, 86,128,194,255,  0,  0,  0,255,  0,  0,  0,255,
-  0,  0,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,115,190, 76,255, 90,166, 51,255,240,235,100,255,215,211, 75,255,180,  0,255,255,
-153,  0,230,255,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0, 35,  0,  0,  0,  2,  0, 94,  1,  8,  0,  0,  0,  3,  0,  0,  0,
+ 56, 52, 39,  0,  0,  0,  0,  0,  1,  0,  2,  0,  0,  8,  0,  0,  2,  0,  0,  0, 68,172,  0,  0, 36,  0,  0,  0,  2,  0,  0,  0,
+  0,  1,  0,  0, 72,  0,  0,  0,  0,  0, 64,  0,  5,  0,  2,  0,104,  2,224,  4,  0,  0,  0,  0,104,  2,224,  4,  0,  0,  0,  0,
+104, 51,191,  4,  0,  0,  0,  0,104, 51,191,  4,  0,  0,  0,  0,232, 44,224,  4,  0,  0,  0,  0,232, 44,224,  4,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+216,206,222,  4,  0,  0,  0,  0, 72, 44,224,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 32,  0,  0,  0,  1,  0,  2,  0, 25,  0,  0,  0, 20,  0, 20,  0,
+  1,  0,  0,  0,  0,  0,  0,  0,205,204, 76, 63,205,204, 76, 63,205,204, 76, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,
+  0,  0,  0, 63,  0,  0,128, 63, 30, 90,100,191,154,153,153, 62,102,102,102, 63,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,
+ 31,250,254, 62,  9,  0,  0, 63,156,153, 25, 63,  0,  0,  0,  0,205,204, 76, 62,205,204, 76, 62,205,204, 76, 62,  0,  0,128, 63,
+ 44,135, 22, 63, 32,133,235, 62,184,243,125, 62,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,195, 73, 76, 63, 42,135, 86, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  1, 43,135, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63, 16, 47, 93, 62, 58,180,200,190,
+ 24, 47, 93,190,  0,  0,  0,  0, 14,  0,  1,  0, 25,  0, 15,  0,120,  0, 60,  0,  3,  0,  5,  0,128,  0,  0,  0,  0,  0,  0,  0,
+144, 31, 15,  0,  6,  0, 25,  0,  8,  0, 10,  0,200,  0,  0,  0,  0,  0,  0,  0,  2,  0,  4,  0, 10,  0, 50,  0, 20,  0,  2,  0,
+  1,  0,  0,  0,  0,  0,128, 63, 60,  0,  0,  0,  0,  0,  2,  0,  2,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,  0,  0,128, 63,
+  0,  0,128, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,
+  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,
+  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,
+  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,
+  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,
+  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,
+  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,
+  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,
+  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,
+  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,
+  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,
+  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,
+  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,
+  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,
+  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,
+  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,  0, 63,  0,  0,128, 63,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,114,114,114,255,
-  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,130,130,130,255,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,
-241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,140, 25,255,
-  8, 48,  8,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
-255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0,
- 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,
-144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 57, 57, 57,255,
-  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,
-241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,170, 64,255,
-  8, 48,  8,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
- 32,255,255,255, 75, 75, 75,255,204,  0,153,255,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 32,  0,  0,255,  0, 32,  0,255,
-  0,  0,128,255,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0,
- 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,255,255,255,255,  0,  0,  0,255,
-144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  1,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,200,200,200,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 76, 76, 76,255,
-  0,  0,  0,  0,250,250,250,255, 15, 15, 15,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,102,102,102,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,255,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,255,140, 25,255,250,250,250,255,  0,  0,  0,255,
-241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,130,130,130,255,
-  8, 48,  8,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
-255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0,
- 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,
-144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,250,250,250,255,  0,  0,  0,  0,
-250,250,250,255,250,250,250,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,
-  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,102,102,102,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,255,255,255,150,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,150,150,150,100,112,112,112,100, 96,192, 64,255, 94, 94, 94,255,  0,  0,  0,255,
-241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,140, 25,255,
- 79,101, 73,255,135,177,125,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
-255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0,
- 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,
-144,144,  0,255, 64,144, 48,255,128, 48, 96,255,153, 64, 48,255,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,
-240,175,144,255, 82, 96,110,255,124,137,150,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
-  0,  0,  0,255,255,133,  0,255,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,114,114,114,255,
-  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,
-241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,140, 25,255,
-  8, 48,  8,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
-255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0,
- 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,
-144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,
-  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,102,102,102,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,255,255,255,150,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,150,150,150,100,112,112,112,100, 96,192, 64,255, 94, 94, 94,255,  0,  0,  0,255,
-241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,140, 25,255,
- 79,101, 73,255,135,177,125,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
-255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80, 12, 10, 10,128,255,140,  0,255,
- 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,
-144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,
-  0,  0,  0,  0, 82, 96,110,255,124,137,150,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
-  0,  0,  0,255,255,133,  0,255,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,
-  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,102,102,102,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,255,255,255,150,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,150,150,150,100,112,112,112,100, 96,192, 64,255, 94, 94, 94,255,  0,  0,  0,255,
-241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,140, 25,255,
- 79,101, 73,255,135,177,125,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
-255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80, 12, 10, 10,128,255,140,  0,255,
- 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,
-144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,
-  0,  0,  0,  0, 82, 96,110,255,124,137,150,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
-  0,  0,  0,255,255,133,  0,255,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,116,116,116,255,
-  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,
-241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,140, 25,255,
-  8, 48,  8,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
-255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0,
- 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,
-144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 81,105,135,255, 32, 32,143,255,
-109, 88,129,255, 78,152, 62,255, 46,143,143,255,169, 84,124,255,126,126, 80,255,162, 95,111,255,109,145,131,255,255,255,255,128,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 53, 53, 53,255,
-  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,
-241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,140, 25,255,
-  8, 48,  8,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
-255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,255,255,255, 10,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0,
- 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,
-144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,114,114,114,255, 18, 66,176, 38,
-255,133,  0,178,255,133,  0,127,  0,255,  0,255,255,  0,  0,255,225,210,195, 35,  0,  0,  0,  0,  0,  0,  0,  0,153,153,153,255,
-  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,143,143,143,255,198,119,119,255,255,  0,  0,255, 64, 64, 64,255,  0,  0,  0,255,
-241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,140, 25,255,
-  8, 48,  8,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
-255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0,
- 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,
-144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  0,  4,  0,100,  0,  0,255,  0,  0,200,255,128,  0, 80,255, 95, 95,  0,255,  0,100, 50,255,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,114,114,114,255,
-  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,
-241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,140, 25,255,
-  8, 48,  8,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
-255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0,
- 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,
-144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 51,127, 51, 76,130,135,140, 76,114,114,114,255,
-  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,173,173,173,255,127,112,112,100,  0,  0,  0,  0, 91, 91, 91,255,  0,  0,  0,255,
-241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,140, 25,255,
-  8, 48,  8,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
-255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0,
- 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,
-144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 57, 57, 57,255,
-  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,
-255,255,255,255,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,
-  8, 48,  8,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,255,255,255,219, 37, 18,255,
-255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0,
- 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,
-144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  0,  4,  5,155,155,155,160,100,104,111,255,111,106,100,255,104,106,117,255,105,117,110,255,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,100,100,100,255,
-  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,
-241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,140, 25,255,
-  8, 48,  8,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
-255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0,
- 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,
-144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,114,114,114,255,
-  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,
-241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,140, 25,255,
-  8, 48,  8,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
-255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0,
- 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,
-144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,
-  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,
-241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,140, 25,255,
-  8, 48,  8,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
-255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0,
- 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,
-144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 96,128,255,255,255,255,255,255,  0,170,  0,255,220, 96, 96,255,220, 96, 96,255,
-  3,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 57, 57, 57,255,
-  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,102,102,102,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,
-  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 94, 94, 94,255,  0,  0,  0,255,
-241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,170, 64,255,
-  8, 48,  8,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,
- 32,255,255,255, 75, 75, 75,255,204,  0,153,255,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 32,  0,  0,255,  0, 32,  0,255,
-  0,  0,128,255,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80, 12, 10, 10,128,255,140,  0,255,
- 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,255,255,255,255,  0,  0,  0,255,
-144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  3,  1,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,
-  0,  0,  0,255,255,255,  0,255,  4,  0,  0,  0,255,127,127,  0,255,255,255,255,255,255,255,  0,255,127,  0,  0,255,127,127,127,
-255,200,200,200,255,255,  0,  0,255,  0,  0,255,255,  0,  0,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,154,  0,  0,255,
-189, 17, 17,255,247, 10, 10,255,  0,  0,  0,  0,247, 64, 24,255,246,105, 19,255,250,153,  0,255,  0,  0,  0,  0, 30,145,  9,255,
- 89,183, 11,255,131,239, 29,255,  0,  0,  0,  0, 10, 54,148,255, 54,103,223,255, 94,193,239,255,  0,  0,  0,  0,169, 41, 78,255,
-193, 65,106,255,240, 93,145,255,  0,  0,  0,  0, 67, 12,120,255, 84, 58,163,255,135,100,213,255,  0,  0,  0,  0, 36,120, 90,255,
- 60,149,121,255,111,182,171,255,  0,  0,  0,  0, 75,112,124,255,106,134,145,255,155,194,205,255,  0,  0,  0,  0,244,201, 12,255,
-238,194, 54,255,243,255,  0,255,  0,  0,  0,  0, 30, 32, 36,255, 72, 76, 86,255,255,255,255,255,  0,  0,  0,  0,111, 47,106,255,
-152, 69,190,255,211, 48,214,255,  0,  0,  0,  0,108,142, 34,255,127,176, 34,255,187,239, 91,255,  0,  0,  0,  0,141,141,141,255,
-176,176,176,255,222,222,222,255,  0,  0,  0,  0,131, 67, 38,255,139, 88, 17,255,189,106, 17,255,  0,  0,  0,  0,  8, 49, 14,255,
- 28, 67, 11,255, 52, 98, 43,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 80,  0,  0,  0,152, 44,169,  5,  0,  0,  0,  0,208,  0,  0,  0,  1,  0,  0,  0, 56, 45,169,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,105,111, 95,115, 99,101,110,101, 95, 51,100,115,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 62,  0,  0,  0,  0, 68, 65, 84, 65, 48, 37,  0,  0,104,  2,224,  4,  0,  0,  0,  0,
+208,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,101,102, 97,117,108,116,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 25, 25, 25,255,153,153,153,255,
+100,100,100,255, 25, 25, 25,255,  0,  0,  0,255,255,255,255,255,  0,  0,  0,  0,  0,  0,  0,  0, 25, 25, 25,255,153,153,153,255,
+100,100,100,255, 25, 25, 25,255,  0,  0,  0,255,255,255,255,255,  1,  0, 15,  0,241,255,  0,  0, 25, 25, 25,255,153,153,153,255,
+153,153,153,255, 90, 90, 90,255,  0,  0,  0,255,255,255,255,255,  1,  0,  0,  0, 25,  0,  0,  0,  0,  0,  0,255, 70, 70, 70,255,
+ 86,128,194,255,255,255,255,255,255,255,255,255,  0,  0,  0,255,  1,  0, 15,  0,241,255,  0,  0,  0,  0,  0,255, 70, 70, 70,255,
+ 70, 70, 70,255,255,255,255,255,  0,  0,  0,255,255,255,255,255,  1,  0, 15,  0,241,255,  0,  0, 25, 25, 25,255,153,153,153,255,
+100,100,100,255, 25, 25, 25,255,  0,  0,  0,255,255,255,255,255,  0,  0,  0,  0,  0,  0,  0,  0, 25, 25, 25,255,180,180,180,255,
+153,153,153,255, 90, 90, 90,255,  0,  0,  0,255,255,255,255,255,  1,  0,236,255,  0,  0,  0,  0, 25, 25, 25,255,180,180,180,255,
+153,153,153,255,128,128,128,255,  0,  0,  0,255,255,255,255,255,  1,  0,236,255,  0,  0,  0,  0,  0,  0,  0,255, 70, 70, 70,255,
+ 70, 70, 70,255,255,255,255,255,255,255,255,255,204,204,204,255,  1,  0, 15,  0,241,255,  0,  0,  0,  0,  0,255, 63, 63, 63,255,
+ 86,128,194,255,255,255,255,255,  0,  0,  0,255,  0,  0,  0,255,  0,  0, 25,  0,236,255,  0,  0,  0,  0,  0,255, 25, 25, 25,230,
+ 45, 45, 45,230,100,100,100,255,160,160,160,255,255,255,255,255,  0,  0, 25,  0,236,255,  0,  0,  0,  0,  0,255,  0,  0,  0,  0,
+ 86,128,194,255,172,172,172,128,255,255,255,255,  0,  0,  0,255,  1,  0, 38,  0,  0,  0,  0,  0,  0,  0,  0,255, 25, 25, 25,230,
+ 45, 45, 45,230,100,100,100,255,255,255,255,255,255,255,255,255,  0,  0, 25,  0,236,255,  0,  0, 25, 25, 25,255,128,128,128,255,
+100,100,100,255, 25, 25, 25,255,  0,  0,  0,255,255,255,255,255,  0,  0,  0,  0,  0,  0,  0,  0, 50, 50, 50,180, 80, 80, 80,180,
+100,100,100,180,128,128,128,255,  0,  0,  0,255,255,255,255,255,  1,  0,  5,  0,251,255,  0,  0,  0,  0,  0,255,190,190,190,255,
+100,100,100,180, 68, 68, 68,255,  0,  0,  0,255,255,255,255,255,  0,  0,  5,  0,251,255,  0,  0,  0,  0,  0,255,  0,  0,  0,  0,
+ 86,128,194,255,  0,  0,  0,255,  0,  0,  0,255,  0,  0,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,115,190, 76,255, 90,166, 51,255,
+240,235,100,255,215,211, 75,255,180,  0,255,255,153,  0,230,255,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0, 25,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 80,  0,  0,  0, 56, 45,169,  5,  0,  0,  0,  0,208,  0,  0,  0,
-  1,  0,  0,  0,216,127,170,  5,  0,  0,  0,  0,152, 44,169,  5,  0,  0,  0,  0,105,111, 95,115, 99,101,110,101, 95,102, 98,120,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 80,  0,  0,  0,216,127,170,  5,
-  0,  0,  0,  0,208,  0,  0,  0,  1,  0,  0,  0,120,128,170,  5,  0,  0,  0,  0, 56, 45,169,  5,  0,  0,  0,  0,105,111, 95, 97,
-110,105,109, 95, 98,118,104,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 80,  0,  0,  0,120,128,170,  5,  0,  0,  0,  0,208,  0,  0,  0,  1,  0,  0,  0, 24,129,170,  5,  0,  0,  0,  0,216,127,170,  5,
-  0,  0,  0,  0,105,111, 95,109,101,115,104, 95,112,108,121,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 80,  0,  0,  0, 24,129,170,  5,  0,  0,  0,  0,208,  0,  0,  0,  1,  0,  0,  0,184,129,170,  5,
-  0,  0,  0,  0,120,128,170,  5,  0,  0,  0,  0,105,111, 95,115, 99,101,110,101, 95,111, 98,106,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 80,  0,  0,  0,184,129,170,  5,  0,  0,  0,  0,208,  0,  0,  0,
-  1,  0,  0,  0, 88,130,170,  5,  0,  0,  0,  0, 24,129,170,  5,  0,  0,  0,  0,105,111, 95,115, 99,101,110,101, 95,120, 51,100,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 80,  0,  0,  0, 88,130,170,  5,
-  0,  0,  0,  0,208,  0,  0,  0,  1,  0,  0,  0,248,130,170,  5,  0,  0,  0,  0,184,129,170,  5,  0,  0,  0,  0,105,111, 95,109,
-101,115,104, 95,115,116,108,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,
- 80,  0,  0,  0,248,130,170,  5,  0,  0,  0,  0,208,  0,  0,  0,  1,  0,  0,  0,152,131,170,  5,  0,  0,  0,  0, 88,130,170,  5,
-  0,  0,  0,  0,105,111, 95,109,101,115,104, 95,117,118, 95,108, 97,121,111,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0, 68, 65, 84, 65, 80,  0,  0,  0,152,131,170,  5,  0,  0,  0,  0,208,  0,  0,  0,  1,  0,  0,  0, 56,132,170,  5,
-  0,  0,  0,  0,248,130,170,  5,  0,  0,  0,  0,105,111, 95, 99,117,114,118,101, 95,115,118,103,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 80,  0,  0,  0, 56,132,170,  5,  0,  0,  0,  0,208,  0,  0,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,152,131,170,  5,  0,  0,  0,  0, 99,121, 99,108,101,115,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,232,  0,  0,  0,216,132,170,  5,
-  0,  0,  0,  0,200,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,101,102, 97,
-117,108,116, 32, 83,116,121,108,101,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,255,255,  0,  0,154,153, 25, 62,  0,  0,128, 63,  0,  0, 12,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,255,255,  0,  0,  0,  0,128, 62,  0,  0,  0,  0,  0,  0, 11,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,255,255,  0,  0,154,153, 25, 62,  0,  0,128, 63,  0,  0, 11,  0,
-  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 62,  0,  0,  0,  0,  0,  0,128, 63,
-  0,  0,  0,  0,  8,  0,  5,  0,  5,  0,  8,  0,  2,  0,  8,  0,  4,  0,  0,  0, 68, 78, 65, 49,124,  8,  1,  0,120,177,144,  5,
-  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0, 83, 68, 78, 65, 78, 65, 77, 69, 99, 13,  0,  0, 42,110,101,120,116,  0, 42,112,
-114,101,118,  0, 42,100, 97,116, 97,  0, 42,102,105,114,115,116,  0, 42,108, 97,115,116,  0,120,  0,121,  0,122,  0,120,109,105,
-110,  0,120,109, 97,120,  0,121,109,105,110,  0,121,109, 97,120,  0, 42,112,111,105,110,116,101,114,  0,103,114,111,117,112,  0,
-118, 97,108,  0,118, 97,108, 50,  0,116,121,112,101,  0,115,117, 98,116,121,112,101,  0,102,108, 97,103,  0,110, 97,109,101, 91,
- 54, 52, 93,  0,115, 97,118,101,100,  0,100, 97,116, 97,  0,108,101,110,  0,116,111,116, 97,108,108,101,110,  0, 42,110,101,119,
-105,100,  0, 42,108,105, 98,  0,110, 97,109,101, 91, 54, 54, 93,  0,112, 97,100,  0,117,115,  0,105, 99,111,110, 95,105,100,  0,
-112, 97,100, 50,  0, 42,112,114,111,112,101,114,116,105,101,115,  0,105,100,  0, 42,105,100, 98,108,111, 99,107,  0, 42,102,105,
-108,101,100, 97,116, 97,  0,110, 97,109,101, 91, 49, 48, 50, 52, 93,  0,102,105,108,101,112, 97,116,104, 91, 49, 48, 50, 52, 93,
-  0, 42,112, 97,114,101,110,116,  0,119, 91, 50, 93,  0,104, 91, 50, 93,  0, 99,104, 97,110,103,101,100, 91, 50, 93,  0, 99,104,
- 97,110,103,101,100, 95,116,105,109,101,115,116, 97,109,112, 91, 50, 93,  0, 42,114,101, 99,116, 91, 50, 93,  0, 42,111, 98,  0,
- 98,108,111, 99,107,116,121,112,101,  0, 97,100,114, 99,111,100,101,  0,110, 97,109,101, 91, 49, 50, 56, 93,  0, 42, 98,112,  0,
- 42, 98,101,122,116,  0,109, 97,120,114, 99,116,  0,116,111,116,114, 99,116,  0,118, 97,114,116,121,112,101,  0,116,111,116,118,
-101,114,116,  0,105,112,111,  0,101,120,116,114, 97,112,  0,114,116,  0, 98,105,116,109, 97,115,107,  0,115,108,105,100,101, 95,
-109,105,110,  0,115,108,105,100,101, 95,109, 97,120,  0, 99,117,114,118, 97,108,  0, 42,100,114,105,118,101,114,  0, 99,117,114,
-118,101,  0, 99,117,114,  0,115,104,111,119,107,101,121,  0,109,117,116,101,105,112,111,  0,112,111,115,  0,112, 97,100, 49,  0,
-114,101,108, 97,116,105,118,101,  0,116,111,116,101,108,101,109,  0,117,105,100,  0, 42,119,101,105,103,104,116,115,  0,118,103,
-114,111,117,112, 91, 54, 52, 93,  0,115,108,105,100,101,114,109,105,110,  0,115,108,105,100,101,114,109, 97,120,  0, 42, 97,100,
-116,  0, 42,114,101,102,107,101,121,  0,101,108,101,109,115,116,114, 91, 51, 50, 93,  0,101,108,101,109,115,105,122,101,  0, 98,
-108,111, 99,107,  0, 42,105,112,111,  0, 42,102,114,111,109,  0,116,111,116,107,101,121,  0,115,108,117,114,112,104,  0, 99,116,
-105,109,101,  0,117,105,100,103,101,110,  0, 42,108,105,110,101,  0, 42,102,111,114,109, 97,116,  0, 98,108,101,110,  0,108,105,
-110,101,110,111,  0,115,116, 97,114,116,  0,101,110,100,  0,102,108, 97,103,115,  0, 99,111,108,111,114, 91, 52, 93,  0,112, 97,
-100, 91, 52, 93,  0, 42,110, 97,109,101,  0,110,108,105,110,101,115,  0,108,105,110,101,115,  0, 42, 99,117,114,108,  0, 42,115,
-101,108,108,  0, 99,117,114, 99,  0,115,101,108, 99,  0,109, 97,114,107,101,114,115,  0, 42,117,110,100,111, 95, 98,117,102,  0,
-117,110,100,111, 95,112,111,115,  0,117,110,100,111, 95,108,101,110,  0, 42, 99,111,109,112,105,108,101,100,  0,109,116,105,109,
-101,  0,115,105,122,101,  0,115,101,101,107,  0,100,116,120,  0,112, 97,115,115,101,112, 97,114,116, 97,108,112,104, 97,  0, 99,
-108,105,112,115,116, 97,  0, 99,108,105,112,101,110,100,  0,108,101,110,115,  0,111,114,116,104,111, 95,115, 99, 97,108,101,  0,
-100,114, 97,119,115,105,122,101,  0,115,101,110,115,111,114, 95,120,  0,115,101,110,115,111,114, 95,121,  0,115,104,105,102,116,
-120,  0,115,104,105,102,116,121,  0, 89, 70, 95,100,111,102,100,105,115,116,  0, 42,100,111,102, 95,111, 98,  0,115,101,110,115,
-111,114, 95,102,105,116,  0,112, 97,100, 91, 55, 93,  0, 42,115, 99,101,110,101,  0,102,114, 97,109,101,110,114,  0,102,114, 97,
-109,101,115,  0,111,102,102,115,101,116,  0,115,102,114, 97,  0,102,105,101, 95,105,109, 97,  0, 99,121, 99,108,  0,111,107,  0,
-109,117,108,116,105, 95,105,110,100,101,120,  0,108, 97,121,101,114,  0,112, 97,115,115,  0,105, 98,117,102,115,  0, 42,103,112,
-117,116,101,120,116,117,114,101,  0, 42, 97,110,105,109,  0, 42,114,114,  0, 42,114,101,110,100,101,114,115, 91, 56, 93,  0,114,
-101,110,100,101,114, 95,115,108,111,116,  0,108, 97,115,116, 95,114,101,110,100,101,114, 95,115,108,111,116,  0,115,111,117,114,
- 99,101,  0,108, 97,115,116,102,114, 97,109,101,  0,116,112, 97,103,101,102,108, 97,103,  0,116,111,116, 98,105,110,100,  0,120,
-114,101,112,  0,121,114,101,112,  0,116,119,115,116, 97,  0,116,119,101,110,100,  0, 98,105,110,100, 99,111,100,101,  0, 42,114,
-101,112, 98,105,110,100,  0, 42,112, 97, 99,107,101,100,102,105,108,101,  0, 42,112,114,101,118,105,101,119,  0,108, 97,115,116,
-117,112,100, 97,116,101,  0,108, 97,115,116,117,115,101,100,  0, 97,110,105,109,115,112,101,101,100,  0,103,101,110, 95,120,  0,
-103,101,110, 95,121,  0,103,101,110, 95,116,121,112,101,  0,103,101,110, 95,102,108, 97,103,  0, 97,115,112,120,  0, 97,115,112,
-121,  0,116,101,120, 99,111,  0,109, 97,112,116,111,  0,109, 97,112,116,111,110,101,103,  0, 98,108,101,110,100,116,121,112,101,
-  0, 42,111, 98,106,101, 99,116,  0, 42,116,101,120,  0,117,118,110, 97,109,101, 91, 54, 52, 93,  0,112,114,111,106,120,  0,112,
-114,111,106,121,  0,112,114,111,106,122,  0,109, 97,112,112,105,110,103,  0,111,102,115, 91, 51, 93,  0,115,105,122,101, 91, 51,
- 93,  0,114,111,116,  0,116,101,120,102,108, 97,103,  0, 99,111,108,111,114,109,111,100,101,108,  0,112,109, 97,112,116,111,  0,
-112,109, 97,112,116,111,110,101,103,  0,110,111,114,109, 97,112,115,112, 97, 99,101,  0,119,104,105, 99,104, 95,111,117,116,112,
-117,116,  0, 98,114,117,115,104, 95,109, 97,112, 95,109,111,100,101,  0,114,  0,103,  0, 98,  0,107,  0,100,101,102, 95,118, 97,
-114,  0, 99,111,108,102, 97, 99,  0,118, 97,114,102, 97, 99,  0,110,111,114,102, 97, 99,  0,100,105,115,112,102, 97, 99,  0,119,
- 97,114,112,102, 97, 99,  0, 99,111,108,115,112,101, 99,102, 97, 99,  0,109,105,114,114,102, 97, 99,  0, 97,108,112,104, 97,102,
- 97, 99,  0,100,105,102,102,102, 97, 99,  0,115,112,101, 99,102, 97, 99,  0,101,109,105,116,102, 97, 99,  0,104, 97,114,100,102,
- 97, 99,  0,114, 97,121,109,105,114,114,102, 97, 99,  0,116,114, 97,110,115,108,102, 97, 99,  0, 97,109, 98,102, 97, 99,  0, 99,
-111,108,101,109,105,116,102, 97, 99,  0, 99,111,108,114,101,102,108,102, 97, 99,  0, 99,111,108,116,114, 97,110,115,102, 97, 99,
-  0,100,101,110,115,102, 97, 99,  0,115, 99, 97,116,116,101,114,102, 97, 99,  0,114,101,102,108,102, 97, 99,  0,116,105,109,101,
-102, 97, 99,  0,108,101,110,103,116,104,102, 97, 99,  0, 99,108,117,109,112,102, 97, 99,  0,100, 97,109,112,102, 97, 99,  0,107,
-105,110,107,102, 97, 99,  0,114,111,117,103,104,102, 97, 99,  0,112, 97,100,101,110,115,102, 97, 99,  0,103,114, 97,118,105,116,
-121,102, 97, 99,  0,108,105,102,101,102, 97, 99,  0,115,105,122,101,102, 97, 99,  0,105,118,101,108,102, 97, 99,  0,102,105,101,
-108,100,102, 97, 99,  0,115,104, 97,100,111,119,102, 97, 99,  0,122,101,110,117,112,102, 97, 99,  0,122,101,110,100,111,119,110,
-102, 97, 99,  0, 98,108,101,110,100,102, 97, 99,  0, 42,104, 97,110,100,108,101,  0, 42,112,110, 97,109,101,  0, 42,115,116,110,
- 97,109,101,115,  0,115,116,121,112,101,115,  0,118, 97,114,115,  0, 42,118, 97,114,115,116,114,  0, 42,114,101,115,117,108,116,
-  0, 42, 99,102,114, 97,  0,100, 97,116, 97, 91, 51, 50, 93,  0, 40, 42,100,111,105,116, 41, 40, 41,  0, 40, 42,105,110,115,116,
- 97,110, 99,101, 95,105,110,105,116, 41, 40, 41,  0, 40, 42, 99, 97,108,108, 98, 97, 99,107, 41, 40, 41,  0,118,101,114,115,105,
-111,110,  0, 97,  0,116,111,116,  0,105,112,111,116,121,112,101,  0, 42,105,109, 97,  0, 42, 99,117, 98,101, 91, 54, 93,  0,105,
-109, 97,116, 91, 52, 93, 91, 52, 93,  0,111, 98,105,109, 97,116, 91, 51, 93, 91, 51, 93,  0,115,116,121,112,101,  0,118,105,101,
-119,115, 99, 97,108,101,  0,110,111,116,108, 97,121,  0, 99,117, 98,101,114,101,115,  0,100,101,112,116,104,  0,114,101, 99, 97,
-108, 99,  0,108, 97,115,116,115,105,122,101,  0,102, 97,108,108,111,102,102, 95,116,121,112,101,  0,102, 97,108,108,111,102,102,
- 95,115,111,102,116,110,101,115,115,  0,114, 97,100,105,117,115,  0, 99,111,108,111,114, 95,115,111,117,114, 99,101,  0,116,111,
-116,112,111,105,110,116,115,  0,112,100,112, 97,100,  0,112,115,121,115,  0,112,115,121,115, 95, 99, 97, 99,104,101, 95,115,112,
- 97, 99,101,  0,111, 98, 95, 99, 97, 99,104,101, 95,115,112, 97, 99,101,  0, 42,112,111,105,110,116, 95,116,114,101,101,  0, 42,
-112,111,105,110,116, 95,100, 97,116, 97,  0,110,111,105,115,101, 95,115,105,122,101,  0,110,111,105,115,101, 95,100,101,112,116,
-104,  0,110,111,105,115,101, 95,105,110,102,108,117,101,110, 99,101,  0,110,111,105,115,101, 95, 98, 97,115,105,115,  0,112,100,
-112, 97,100, 51, 91, 51, 93,  0,110,111,105,115,101, 95,102, 97, 99,  0,115,112,101,101,100, 95,115, 99, 97,108,101,  0,102, 97,
-108,108,111,102,102, 95,115,112,101,101,100, 95,115, 99, 97,108,101,  0,112,100,112, 97,100, 50,  0, 42, 99,111, 98, 97,  0, 42,
-102, 97,108,108,111,102,102, 95, 99,117,114,118,101,  0,114,101,115,111,108, 91, 51, 93,  0,105,110,116,101,114,112, 95,116,121,
-112,101,  0,102,105,108,101, 95,102,111,114,109, 97,116,  0,101,120,116,101,110,100,  0,115,109,111,107,101,100, 95,116,121,112,
-101,  0,105,110,116, 95,109,117,108,116,105,112,108,105,101,114,  0,115,116,105,108,108, 95,102,114, 97,109,101,  0,115,111,117,
-114, 99,101, 95,112, 97,116,104, 91, 49, 48, 50, 52, 93,  0, 42,100, 97,116, 97,115,101,116,  0, 99, 97, 99,104,101,100,102,114,
- 97,109,101,  0,111, 99,101, 97,110,109,111,100, 91, 54, 52, 93,  0,111,117,116,112,117,116,  0,110,111,105,115,101,115,105,122,
-101,  0,116,117,114, 98,117,108,  0, 98,114,105,103,104,116,  0, 99,111,110,116,114, 97,115,116,  0,115, 97,116,117,114, 97,116,
-105,111,110,  0,114,102, 97, 99,  0,103,102, 97, 99,  0, 98,102, 97, 99,  0,102,105,108,116,101,114,115,105,122,101,  0,109,103,
- 95, 72,  0,109,103, 95,108, 97, 99,117,110, 97,114,105,116,121,  0,109,103, 95,111, 99,116, 97,118,101,115,  0,109,103, 95,111,
-102,102,115,101,116,  0,109,103, 95,103, 97,105,110,  0,100,105,115,116, 95, 97,109,111,117,110,116,  0,110,115, 95,111,117,116,
-115, 99, 97,108,101,  0,118,110, 95,119, 49,  0,118,110, 95,119, 50,  0,118,110, 95,119, 51,  0,118,110, 95,119, 52,  0,118,110,
- 95,109,101,120,112,  0,118,110, 95,100,105,115,116,109,  0,118,110, 95, 99,111,108,116,121,112,101,  0,110,111,105,115,101,100,
-101,112,116,104,  0,110,111,105,115,101,116,121,112,101,  0,110,111,105,115,101, 98, 97,115,105,115,  0,110,111,105,115,101, 98,
- 97,115,105,115, 50,  0,105,109, 97,102,108, 97,103,  0, 99,114,111,112,120,109,105,110,  0, 99,114,111,112,121,109,105,110,  0,
- 99,114,111,112,120,109, 97,120,  0, 99,114,111,112,121,109, 97,120,  0,116,101,120,102,105,108,116,101,114,  0, 97,102,109, 97,
-120,  0,120,114,101,112,101, 97,116,  0,121,114,101,112,101, 97,116,  0, 99,104,101, 99,107,101,114,100,105,115,116,  0,110, 97,
- 98,108, 97,  0,105,117,115,101,114,  0, 42,110,111,100,101,116,114,101,101,  0, 42,112,108,117,103,105,110,  0, 42,101,110,118,
-  0, 42,112,100,  0, 42,118,100,  0, 42,111,116,  0,117,115,101, 95,110,111,100,101,115,  0,108,111, 99, 91, 51, 93,  0,114,111,
-116, 91, 51, 93,  0,109, 97,116, 91, 52, 93, 91, 52, 93,  0,109,105,110, 91, 51, 93,  0,109, 97,120, 91, 51, 93,  0, 99,111, 98,
- 97,  0, 98,108,101,110,100, 95, 99,111,108,111,114, 91, 51, 93,  0, 98,108,101,110,100, 95,102, 97, 99,116,111,114,  0, 98,108,
-101,110,100, 95,116,121,112,101,  0,112, 97,100, 91, 51, 93,  0,109,111,100,101,  0,116,111,116,101,120,  0,115,104,100,119,114,
-  0,115,104,100,119,103,  0,115,104,100,119, 98,  0,115,104,100,119,112, 97,100,  0,101,110,101,114,103,121,  0,100,105,115,116,
-  0,115,112,111,116,115,105,122,101,  0,115,112,111,116, 98,108,101,110,100,  0,104, 97,105,110,116,  0, 97,116,116, 49,  0, 97,
-116,116, 50,  0, 42, 99,117,114,102, 97,108,108,111,102,102,  0,115,104, 97,100,115,112,111,116,115,105,122,101,  0, 98,105, 97,
-115,  0,115,111,102,116,  0, 99,111,109,112,114,101,115,115,116,104,114,101,115,104,  0, 98,108,101,101,100, 98,105, 97,115,  0,
-112, 97,100, 53, 91, 50, 93,  0, 98,117,102,115,105,122,101,  0,115, 97,109,112,  0, 98,117,102,102,101,114,115,  0,102,105,108,
-116,101,114,116,121,112,101,  0, 98,117,102,102,108, 97,103,  0, 98,117,102,116,121,112,101,  0,114, 97,121, 95,115, 97,109,112,
-  0,114, 97,121, 95,115, 97,109,112,121,  0,114, 97,121, 95,115, 97,109,112,122,  0,114, 97,121, 95,115, 97,109,112, 95,116,121,
-112,101,  0, 97,114,101, 97, 95,115,104, 97,112,101,  0, 97,114,101, 97, 95,115,105,122,101,  0, 97,114,101, 97, 95,115,105,122,
-101,121,  0, 97,114,101, 97, 95,115,105,122,101,122,  0, 97,100, 97,112,116, 95,116,104,114,101,115,104,  0,114, 97,121, 95,115,
- 97,109,112, 95,109,101,116,104,111,100,  0,115,104, 97,100,111,119,109, 97,112, 95,116,121,112,101,  0,116,101,120, 97, 99,116,
-  0,115,104, 97,100,104, 97,108,111,115,116,101,112,  0,115,117,110, 95,101,102,102,101, 99,116, 95,116,121,112,101,  0,115,107,
-121, 98,108,101,110,100,116,121,112,101,  0,104,111,114,105,122,111,110, 95, 98,114,105,103,104,116,110,101,115,115,  0,115,112,
-114,101, 97,100,  0,115,117,110, 95, 98,114,105,103,104,116,110,101,115,115,  0,115,117,110, 95,115,105,122,101,  0, 98, 97, 99,
-107,115, 99, 97,116,116,101,114,101,100, 95,108,105,103,104,116,  0,115,117,110, 95,105,110,116,101,110,115,105,116,121,  0, 97,
-116,109, 95,116,117,114, 98,105,100,105,116,121,  0, 97,116,109, 95,105,110,115, 99, 97,116,116,101,114,105,110,103, 95,102, 97,
- 99,116,111,114,  0, 97,116,109, 95,101,120,116,105,110, 99,116,105,111,110, 95,102, 97, 99,116,111,114,  0, 97,116,109, 95,100,
-105,115,116, 97,110, 99,101, 95,102, 97, 99,116,111,114,  0,115,107,121, 98,108,101,110,100,102, 97, 99,  0,115,107,121, 95,101,
-120,112,111,115,117,114,101,  0,115,104, 97,100,111,119, 95,102,114,117,115,116,117,109, 95,115,105,122,101,  0,115,107,121, 95,
- 99,111,108,111,114,115,112, 97, 99,101,  0,112, 97,100, 52, 91, 50, 93,  0, 42,109,116,101,120, 91, 49, 56, 93,  0,112,114, 95,
-116,101,120,116,117,114,101,  0,112, 97,100, 54, 91, 52, 93,  0,100,101,110,115,105,116,121,  0,101,109,105,115,115,105,111,110,
-  0,115, 99, 97,116,116,101,114,105,110,103,  0,114,101,102,108,101, 99,116,105,111,110,  0,101,109,105,115,115,105,111,110, 95,
- 99,111,108, 91, 51, 93,  0,116,114, 97,110,115,109,105,115,115,105,111,110, 95, 99,111,108, 91, 51, 93,  0,114,101,102,108,101,
- 99,116,105,111,110, 95, 99,111,108, 91, 51, 93,  0,100,101,110,115,105,116,121, 95,115, 99, 97,108,101,  0,100,101,112,116,104,
- 95, 99,117,116,111,102,102,  0, 97,115,121,109,109,101,116,114,121,  0,115,116,101,112,115,105,122,101, 95,116,121,112,101,  0,
-115,104, 97,100,101,102,108, 97,103,  0,115,104, 97,100,101, 95,116,121,112,101,  0,112,114,101, 99, 97, 99,104,101, 95,114,101,
-115,111,108,117,116,105,111,110,  0,115,116,101,112,115,105,122,101,  0,109,115, 95,100,105,102,102,  0,109,115, 95,105,110,116,
-101,110,115,105,116,121,  0,109,115, 95,115,112,114,101, 97,100,  0, 97,108,112,104, 97, 95, 98,108,101,110,100,  0,102, 97, 99,
-101, 95,111,114,105,101,110,116, 97,116,105,111,110,  0,109, 97,116,101,114,105, 97,108, 95,116,121,112,101,  0,115,112,101, 99,
-114,  0,115,112,101, 99,103,  0,115,112,101, 99, 98,  0,109,105,114,114,  0,109,105,114,103,  0,109,105,114, 98,  0, 97,109, 98,
-114,  0, 97,109, 98, 98,  0, 97,109, 98,103,  0, 97,109, 98,  0,101,109,105,116,  0, 97,110,103,  0,115,112,101, 99,116,114, 97,
-  0,114, 97,121, 95,109,105,114,114,111,114,  0, 97,108,112,104, 97,  0,114,101,102,  0,115,112,101, 99,  0,122,111,102,102,115,
-  0, 97,100,100,  0,116,114, 97,110,115,108,117, 99,101,110, 99,121,  0,118,111,108,  0,103, 97,109,101,  0,102,114,101,115,110,
-101,108, 95,109,105,114,  0,102,114,101,115,110,101,108, 95,109,105,114, 95,105,  0,102,114,101,115,110,101,108, 95,116,114, 97,
-  0,102,114,101,115,110,101,108, 95,116,114, 97, 95,105,  0,102,105,108,116,101,114,  0,116,120, 95,108,105,109,105,116,  0,116,
-120, 95,102, 97,108,108,111,102,102,  0,114, 97,121, 95,100,101,112,116,104,  0,114, 97,121, 95,100,101,112,116,104, 95,116,114,
- 97,  0,104, 97,114,  0,115,101,101,100, 49,  0,115,101,101,100, 50,  0,103,108,111,115,115, 95,109,105,114,  0,103,108,111,115,
-115, 95,116,114, 97,  0,115, 97,109,112, 95,103,108,111,115,115, 95,109,105,114,  0,115, 97,109,112, 95,103,108,111,115,115, 95,
-116,114, 97,  0, 97,100, 97,112,116, 95,116,104,114,101,115,104, 95,109,105,114,  0, 97,100, 97,112,116, 95,116,104,114,101,115,
-104, 95,116,114, 97,  0, 97,110,105,115,111, 95,103,108,111,115,115, 95,109,105,114,  0,100,105,115,116, 95,109,105,114,  0,102,
- 97,100,101,116,111, 95,109,105,114,  0,115,104, 97,100,101, 95,102,108, 97,103,  0,109,111,100,101, 95,108,  0,102,108, 97,114,
-101, 99,  0,115,116, 97,114, 99,  0,108,105,110,101, 99,  0,114,105,110,103, 99,  0,104, 97,115,105,122,101,  0,102,108, 97,114,
-101,115,105,122,101,  0,115,117, 98,115,105,122,101,  0,102,108, 97,114,101, 98,111,111,115,116,  0,115,116,114, 97,110,100, 95,
-115,116, 97,  0,115,116,114, 97,110,100, 95,101,110,100,  0,115,116,114, 97,110,100, 95,101, 97,115,101,  0,115,116,114, 97,110,
-100, 95,115,117,114,102,110,111,114,  0,115,116,114, 97,110,100, 95,109,105,110,  0,115,116,114, 97,110,100, 95,119,105,100,116,
-104,102, 97,100,101,  0,115,116,114, 97,110,100, 95,117,118,110, 97,109,101, 91, 54, 52, 93,  0,115, 98,105, 97,115,  0,108, 98,
-105, 97,115,  0,115,104, 97,100, 95, 97,108,112,104, 97,  0,115,101,112,116,101,120,  0,114,103, 98,115,101,108,  0,112,114, 95,
-116,121,112,101,  0,112,114, 95, 98, 97, 99,107,  0,112,114, 95,108, 97,109,112,  0,109,108, 95,102,108, 97,103,  0,100,105,102,
-102, 95,115,104, 97,100,101,114,  0,115,112,101, 99, 95,115,104, 97,100,101,114,  0,114,111,117,103,104,110,101,115,115,  0,114,
-101,102,114, 97, 99,  0,112, 97,114, 97,109, 91, 52, 93,  0,114,109,115,  0,100, 97,114,107,110,101,115,115,  0, 42,114, 97,109,
-112, 95, 99,111,108,  0, 42,114, 97,109,112, 95,115,112,101, 99,  0,114, 97,109,112,105,110, 95, 99,111,108,  0,114, 97,109,112,
-105,110, 95,115,112,101, 99,  0,114, 97,109,112, 98,108,101,110,100, 95, 99,111,108,  0,114, 97,109,112, 98,108,101,110,100, 95,
-115,112,101, 99,  0,114, 97,109,112, 95,115,104,111,119,  0,112, 97,100, 51,  0,114, 97,109,112,102, 97, 99, 95, 99,111,108,  0,
-114, 97,109,112,102, 97, 99, 95,115,112,101, 99,  0, 42,103,114,111,117,112,  0,102,114,105, 99,116,105,111,110,  0,102,104,  0,
-114,101,102,108,101, 99,116,  0,102,104,100,105,115,116,  0,120,121,102,114,105, 99,116,  0,100,121,110, 97,109,111,100,101,  0,
-115,115,115, 95,114, 97,100,105,117,115, 91, 51, 93,  0,115,115,115, 95, 99,111,108, 91, 51, 93,  0,115,115,115, 95,101,114,114,
-111,114,  0,115,115,115, 95,115, 99, 97,108,101,  0,115,115,115, 95,105,111,114,  0,115,115,115, 95, 99,111,108,102, 97, 99,  0,
-115,115,115, 95,116,101,120,102, 97, 99,  0,115,115,115, 95,102,114,111,110,116,  0,115,115,115, 95, 98, 97, 99,107,  0,115,115,
-115, 95,102,108, 97,103,  0,115,115,115, 95,112,114,101,115,101,116,  0,109, 97,112,116,111, 95,116,101,120,116,117,114,101,100,
-  0,115,104, 97,100,111,119,111,110,108,121, 95,102,108, 97,103,  0,105,110,100,101,120,  0,103,112,117,109, 97,116,101,114,105,
- 97,108,  0, 42, 98, 98,  0,115,101,108, 99,111,108, 49,  0,115,101,108, 99,111,108, 50,  0,113,117, 97,116, 91, 52, 93,  0,101,
-120,112,120,  0,101,120,112,121,  0,101,120,112,122,  0,114, 97,100,  0,114, 97,100, 50,  0,115,  0, 42,109, 97,116,  0, 42,105,
-109, 97,116,  0,101,108,101,109,115,  0,100,105,115,112,  0, 42,101,100,105,116,101,108,101,109,115,  0, 42, 42,109, 97,116,  0,
-102,108, 97,103, 50,  0,116,111,116, 99,111,108,  0,119,105,114,101,115,105,122,101,  0,114,101,110,100,101,114,115,105,122,101,
-  0,116,104,114,101,115,104,  0, 42,108, 97,115,116,101,108,101,109,  0,118,101, 99, 91, 51, 93, 91, 51, 93,  0, 97,108,102, 97,
-  0,119,101,105,103,104,116,  0,104, 49,  0,104, 50,  0,102, 49,  0,102, 50,  0,102, 51,  0,104,105,100,101,  0,118,101, 99, 91,
- 52, 93,  0,109, 97,116, 95,110,114,  0,112,110,116,115,117,  0,112,110,116,115,118,  0,114,101,115,111,108,117,  0,114,101,115,
-111,108,118,  0,111,114,100,101,114,117,  0,111,114,100,101,114,118,  0,102,108, 97,103,117,  0,102,108, 97,103,118,  0, 42,107,
-110,111,116,115,117,  0, 42,107,110,111,116,115,118,  0,116,105,108,116, 95,105,110,116,101,114,112,  0,114, 97,100,105,117,115,
- 95,105,110,116,101,114,112,  0, 99,104, 97,114,105,100,120,  0,107,101,114,110,  0,119,  0,104,  0,110,117,114, 98,115,  0, 42,
-107,101,121,105,110,100,101,120,  0,115,104, 97,112,101,110,114,  0,110,117,114, 98,  0, 42,101,100,105,116,110,117,114, 98,  0,
- 42, 98,101,118,111, 98,106,  0, 42,116, 97,112,101,114,111, 98,106,  0, 42,116,101,120,116,111,110, 99,117,114,118,101,  0, 42,
-112, 97,116,104,  0, 42,107,101,121,  0, 98,101,118,  0,100,114, 97,119,102,108, 97,103,  0,116,119,105,115,116, 95,109,111,100,
-101,  0,116,119,105,115,116, 95,115,109,111,111,116,104,  0,115,109, 97,108,108, 99, 97,112,115, 95,115, 99, 97,108,101,  0,112,
- 97,116,104,108,101,110,  0, 98,101,118,114,101,115,111,108,  0,119,105,100,116,104,  0,101,120,116, 49,  0,101,120,116, 50,  0,
-114,101,115,111,108,117, 95,114,101,110,  0,114,101,115,111,108,118, 95,114,101,110,  0, 97, 99,116,110,117,  0, 42,108, 97,115,
-116,115,101,108,  0,115,112, 97, 99,101,109,111,100,101,  0,115,112, 97, 99,105,110,103,  0,108,105,110,101,100,105,115,116,  0,
-115,104,101, 97,114,  0,102,115,105,122,101,  0,119,111,114,100,115,112, 97, 99,101,  0,117,108,112,111,115,  0,117,108,104,101,
-105,103,104,116,  0,120,111,102,  0,121,111,102,  0,108,105,110,101,119,105,100,116,104,  0, 42,115,116,114,  0, 42,115,101,108,
- 98,111,120,101,115,  0, 42,101,100,105,116,102,111,110,116,  0,102, 97,109,105,108,121, 91, 50, 52, 93,  0, 42,118,102,111,110,
-116,  0, 42,118,102,111,110,116, 98,  0, 42,118,102,111,110,116,105,  0, 42,118,102,111,110,116, 98,105,  0,115,101,112, 99,104,
- 97,114,  0,116,111,116, 98,111,120,  0, 97, 99,116, 98,111,120,  0, 42,116, 98,  0,115,101,108,115,116, 97,114,116,  0,115,101,
-108,101,110,100,  0, 42,115,116,114,105,110,102,111,  0, 99,117,114,105,110,102,111,  0, 98,101,118,102, 97, 99, 49,  0, 98,101,
-118,102, 97, 99, 50,  0, 42,109,115,101,108,101, 99,116,  0, 42,109,112,111,108,121,  0, 42,109,116,112,111,108,121,  0, 42,109,
-108,111,111,112,  0, 42,109,108,111,111,112,117,118,  0, 42,109,108,111,111,112, 99,111,108,  0, 42,109,102, 97, 99,101,  0, 42,
-109,116,102, 97, 99,101,  0, 42,116,102, 97, 99,101,  0, 42,109,118,101,114,116,  0, 42,109,101,100,103,101,  0, 42,100,118,101,
-114,116,  0, 42,109, 99,111,108,  0, 42,109,115,116,105, 99,107,121,  0, 42,116,101,120, 99,111,109,101,115,104,  0, 42,101,100,
-105,116, 95, 98,116,109,101,115,104,  0,118,100, 97,116, 97,  0,101,100, 97,116, 97,  0,102,100, 97,116, 97,  0,112,100, 97,116,
- 97,  0,108,100, 97,116, 97,  0,116,111,116,101,100,103,101,  0,116,111,116,102, 97, 99,101,  0,116,111,116,115,101,108,101, 99,
-116,  0,116,111,116,112,111,108,121,  0,116,111,116,108,111,111,112,  0, 97, 99,116, 95,102, 97, 99,101,  0,115,109,111,111,116,
-104,114,101,115,104,  0,115,117, 98,100,105,118,  0,115,117, 98,100,105,118,114,  0,115,117, 98,115,117,114,102,116,121,112,101,
-  0,101,100,105,116,102,108, 97,103,  0, 42,109,114,  0, 42,116,112, 97,103,101,  0,117,118, 91, 52, 93, 91, 50, 93,  0, 99,111,
-108, 91, 52, 93,  0,116,114, 97,110,115,112,  0,116,105,108,101,  0,117,110,119,114, 97,112,  0,118, 49,  0,118, 50,  0,118, 51,
-  0,118, 52,  0,101,100, 99,111,100,101,  0, 99,114,101, 97,115,101,  0, 98,119,101,105,103,104,116,  0,100,101,102, 95,110,114,
-  0, 42,100,119,  0,116,111,116,119,101,105,103,104,116,  0, 99,111, 91, 51, 93,  0,110,111, 91, 51, 93,  0,108,111,111,112,115,
-116, 97,114,116,  0,118,  0,101,  0,117,118, 91, 50, 93,  0, 99,111, 91, 50, 93,  0,102,  0,105,  0,115, 91, 50, 53, 54, 93,  0,
-116,111,116,100,105,115,112,  0,108,101,118,101,108,  0, 40, 42,100,105,115,112,115, 41, 40, 41,  0, 42,104,105,100,100,101,110,
-  0,118, 91, 52, 93,  0,109,105,100,  0,112, 97,100, 91, 50, 93,  0,118, 91, 50, 93,  0, 42,102, 97, 99,101,115,  0, 42, 99,111,
-108,102, 97, 99,101,115,  0, 42,101,100,103,101,115,  0, 42,118,101,114,116,115,  0,108,101,118,101,108,115,  0,108,101,118,101,
-108, 95, 99,111,117,110,116,  0, 99,117,114,114,101,110,116,  0,110,101,119,108,118,108,  0,101,100,103,101,108,118,108,  0,112,
-105,110,108,118,108,  0,114,101,110,100,101,114,108,118,108,  0,117,115,101, 95, 99,111,108,  0, 42,101,100,103,101, 95,102,108,
- 97,103,115,  0, 42,101,100,103,101, 95, 99,114,101, 97,115,101,115,  0,115,116, 97, 99,107,105,110,100,101,120,  0, 42,101,114,
-114,111,114,  0,109,111,100,105,102,105,101,114,  0, 42,116,101,120,116,117,114,101,  0, 42,109, 97,112, 95,111, 98,106,101, 99,
-116,  0,117,118,108, 97,121,101,114, 95,110, 97,109,101, 91, 54, 52, 93,  0,117,118,108, 97,121,101,114, 95,116,109,112,  0,116,
-101,120,109, 97,112,112,105,110,103,  0,115,117, 98,100,105,118, 84,121,112,101,  0,114,101,110,100,101,114, 76,101,118,101,108,
-115,  0, 42,101,109, 67, 97, 99,104,101,  0, 42,109, 67, 97, 99,104,101,  0,115,116,114,101,110,103,116,104,  0,100,101,102, 97,
-120,105,115,  0,112, 97,100, 91, 54, 93,  0,108,101,110,103,116,104,  0,114, 97,110,100,111,109,105,122,101,  0,115,101,101,100,
-  0, 42,111, 98, 95, 97,114,109,  0, 42,115,116, 97,114,116, 95, 99, 97,112,  0, 42,101,110,100, 95, 99, 97,112,  0, 42, 99,117,
-114,118,101, 95,111, 98,  0, 42,111,102,102,115,101,116, 95,111, 98,  0,111,102,102,115,101,116, 91, 51, 93,  0,115, 99, 97,108,
-101, 91, 51, 93,  0,109,101,114,103,101, 95,100,105,115,116,  0,102,105,116, 95,116,121,112,101,  0,111,102,102,115,101,116, 95,
-116,121,112,101,  0, 99,111,117,110,116,  0, 97,120,105,115,  0,116,111,108,101,114, 97,110, 99,101,  0, 42,109,105,114,114,111,
-114, 95,111, 98,  0,115,112,108,105,116, 95, 97,110,103,108,101,  0,118, 97,108,117,101,  0,114,101,115,  0,118, 97,108, 95,102,
-108, 97,103,115,  0,108,105,109, 95,102,108, 97,103,115,  0,101, 95,102,108, 97,103,115,  0, 98,101,118,101,108, 95, 97,110,103,
-108,101,  0,100,101,102,103,114,112, 95,110, 97,109,101, 91, 54, 52, 93,  0, 42,100,111,109, 97,105,110,  0, 42,102,108,111,119,
-  0, 42, 99,111,108,108,  0,116,105,109,101,  0,100,105,114,101, 99,116,105,111,110,  0,109,105,100,108,101,118,101,108,  0, 42,
-112,114,111,106,101, 99,116,111,114,115, 91, 49, 48, 93,  0, 42,105,109, 97,103,101,  0,110,117,109, 95,112,114,111,106,101, 99,
-116,111,114,115,  0, 97,115,112,101, 99,116,120,  0, 97,115,112,101, 99,116,121,  0,115, 99, 97,108,101,120,  0,115, 99, 97,108,
-101,121,  0,112,101,114, 99,101,110,116,  0,102, 97, 99,101, 67,111,117,110,116,  0,102, 97, 99,  0,114,101,112,101, 97,116,  0,
- 42,111, 98,106,101, 99,116, 99,101,110,116,101,114,  0,115,116, 97,114,116,120,  0,115,116, 97,114,116,121,  0,104,101,105,103,
-104,116,  0,110, 97,114,114,111,119,  0,115,112,101,101,100,  0,100, 97,109,112,  0,102, 97,108,108,111,102,102,  0,116,105,109,
-101,111,102,102,115,  0,108,105,102,101,116,105,109,101,  0,100,101,102,111,114,109,102,108, 97,103,  0,109,117,108,116,105,  0,
- 42,112,114,101,118, 67,111,115,  0,115,117, 98,116, 97,114,103,101,116, 91, 54, 52, 93,  0,112, 97,114,101,110,116,105,110,118,
- 91, 52, 93, 91, 52, 93,  0, 99,101,110,116, 91, 51, 93,  0, 42,105,110,100,101,120, 97,114,  0,116,111,116,105,110,100,101,120,
-  0,102,111,114, 99,101,  0, 42, 99,108,111,116,104, 79, 98,106,101, 99,116,  0, 42,115,105,109, 95,112, 97,114,109,115,  0, 42,
- 99,111,108,108, 95,112, 97,114,109,115,  0, 42,112,111,105,110,116, 95, 99, 97, 99,104,101,  0,112,116, 99, 97, 99,104,101,115,
-  0, 42,120,  0, 42,120,110,101,119,  0, 42,120,111,108,100,  0, 42, 99,117,114,114,101,110,116, 95,120,110,101,119,  0, 42, 99,
-117,114,114,101,110,116, 95,120,  0, 42, 99,117,114,114,101,110,116, 95,118,  0, 42,109,102, 97, 99,101,115,  0,110,117,109,118,
-101,114,116,115,  0,110,117,109,102, 97, 99,101,115,  0,116,105,109,101, 95,120,  0,116,105,109,101, 95,120,110,101,119,  0, 42,
- 98,118,104,116,114,101,101,  0, 42,118,  0, 42,100,109,  0, 99,102,114, 97,  0,111,112,101,114, 97,116,105,111,110,  0,118,101,
-114,116,101,120,  0,116,111,116,105,110,102,108,117,101,110, 99,101,  0,103,114,105,100,115,105,122,101,  0, 42, 98,105,110,100,
-105,110,102,108,117,101,110, 99,101,115,  0, 42, 98,105,110,100,111,102,102,115,101,116,115,  0, 42, 98,105,110,100, 99, 97,103,
-101, 99,111,115,  0,116,111,116, 99, 97,103,101,118,101,114,116,  0, 42,100,121,110,103,114,105,100,  0, 42,100,121,110,105,110,
-102,108,117,101,110, 99,101,115,  0, 42,100,121,110,118,101,114,116,115,  0, 42,112, 97,100, 50,  0,100,121,110,103,114,105,100,
-115,105,122,101,  0,100,121,110, 99,101,108,108,109,105,110, 91, 51, 93,  0,100,121,110, 99,101,108,108,119,105,100,116,104,  0,
- 98,105,110,100,109, 97,116, 91, 52, 93, 91, 52, 93,  0, 42, 98,105,110,100,119,101,105,103,104,116,115,  0, 42, 98,105,110,100,
- 99,111,115,  0, 40, 42, 98,105,110,100,102,117,110, 99, 41, 40, 41,  0, 42,112,115,121,115,  0,116,111,116,100,109,118,101,114,
-116,  0,116,111,116,100,109,101,100,103,101,  0,116,111,116,100,109,102, 97, 99,101,  0,112,111,115,105,116,105,111,110,  0,114,
- 97,110,100,111,109, 95,112,111,115,105,116,105,111,110,  0, 42,102, 97, 99,101,112, 97,  0,118,103,114,111,117,112,  0,112,114,
-111,116,101, 99,116,  0,108,118,108,  0,115, 99,117,108,112,116,108,118,108,  0,116,111,116,108,118,108,  0,115,105,109,112,108,
-101,  0, 42,102,115,115,  0, 42,116, 97,114,103,101,116,  0, 42, 97,117,120, 84, 97,114,103,101,116,  0,118,103,114,111,117,112,
- 95,110, 97,109,101, 91, 54, 52, 93,  0,107,101,101,112, 68,105,115,116,  0,115,104,114,105,110,107, 84,121,112,101,  0,115,104,
-114,105,110,107, 79,112,116,115,  0,112,114,111,106, 65,120,105,115,  0,115,117, 98,115,117,114,102, 76,101,118,101,108,115,  0,
- 42,111,114,105,103,105,110,  0,102, 97, 99,116,111,114,  0,108,105,109,105,116, 91, 50, 93,  0,111,114,105,103,105,110, 79,112,
-116,115,  0,111,102,102,115,101,116, 95,102, 97, 99,  0,111,102,102,115,101,116, 95,102, 97, 99, 95,118,103,  0, 99,114,101, 97,
-115,101, 95,105,110,110,101,114,  0, 99,114,101, 97,115,101, 95,111,117,116,101,114,  0, 99,114,101, 97,115,101, 95,114,105,109,
-  0,109, 97,116, 95,111,102,115,  0,109, 97,116, 95,111,102,115, 95,114,105,109,  0, 42,111, 98, 95, 97,120,105,115,  0,115,116,
-101,112,115,  0,114,101,110,100,101,114, 95,115,116,101,112,115,  0,105,116,101,114,  0,115, 99,114,101,119, 95,111,102,115,  0,
- 97,110,103,108,101,  0, 42,111, 99,101, 97,110,  0, 42,111, 99,101, 97,110, 99, 97, 99,104,101,  0,114,101,115,111,108,117,116,
-105,111,110,  0,115,112, 97,116,105, 97,108, 95,115,105,122,101,  0,119,105,110,100, 95,118,101,108,111, 99,105,116,121,  0,115,
-109, 97,108,108,101,115,116, 95,119, 97,118,101,  0,119, 97,118,101, 95, 97,108,105,103,110,109,101,110,116,  0,119, 97,118,101,
- 95,100,105,114,101, 99,116,105,111,110,  0,119, 97,118,101, 95,115, 99, 97,108,101,  0, 99,104,111,112, 95, 97,109,111,117,110,
-116,  0,102,111, 97,109, 95, 99,111,118,101,114, 97,103,101,  0, 98, 97,107,101,115,116, 97,114,116,  0, 98, 97,107,101,101,110,
-100,  0, 99, 97, 99,104,101,112, 97,116,104, 91, 49, 48, 50, 52, 93,  0,102,111, 97,109,108, 97,121,101,114,110, 97,109,101, 91,
- 54, 52, 93,  0, 99, 97, 99,104,101,100,  0,103,101,111,109,101,116,114,121, 95,109,111,100,101,  0,114,101,102,114,101,115,104,
-  0,114,101,112,101, 97,116, 95,120,  0,114,101,112,101, 97,116, 95,121,  0,102,111, 97,109, 95,102, 97,100,101,  0, 42,111, 98,
-106,101, 99,116, 95,102,114,111,109,  0, 42,111, 98,106,101, 99,116, 95,116,111,  0,102, 97,108,108,111,102,102, 95,114, 97,100,
-105,117,115,  0,101,100,105,116, 95,102,108, 97,103,115,  0,100,101,102, 97,117,108,116, 95,119,101,105,103,104,116,  0, 42, 99,
-109, 97,112, 95, 99,117,114,118,101,  0, 97,100,100, 95,116,104,114,101,115,104,111,108,100,  0,114,101,109, 95,116,104,114,101,
-115,104,111,108,100,  0,109, 97,115,107, 95, 99,111,110,115,116, 97,110,116,  0,109, 97,115,107, 95,100,101,102,103,114,112, 95,
-110, 97,109,101, 91, 54, 52, 93,  0,109, 97,115,107, 95,116,101,120, 95,117,115,101, 95, 99,104, 97,110,110,101,108,  0, 42,109,
- 97,115,107, 95,116,101,120,116,117,114,101,  0, 42,109, 97,115,107, 95,116,101,120, 95,109, 97,112, 95,111, 98,106,  0,109, 97,
-115,107, 95,116,101,120, 95,109, 97,112,112,105,110,103,  0,109, 97,115,107, 95,116,101,120, 95,117,118,108, 97,121,101,114, 95,
-110, 97,109,101, 91, 54, 52, 93,  0,112, 97,100, 95,105, 49,  0,100,101,102,103,114,112, 95,110, 97,109,101, 95, 97, 91, 54, 52,
- 93,  0,100,101,102,103,114,112, 95,110, 97,109,101, 95, 98, 91, 54, 52, 93,  0,100,101,102, 97,117,108,116, 95,119,101,105,103,
-104,116, 95, 97,  0,100,101,102, 97,117,108,116, 95,119,101,105,103,104,116, 95, 98,  0,109,105,120, 95,109,111,100,101,  0,109,
-105,120, 95,115,101,116,  0,112, 97,100, 95, 99, 49, 91, 54, 93,  0,112,114,111,120,105,109,105,116,121, 95,109,111,100,101,  0,
-112,114,111,120,105,109,105,116,121, 95,102,108, 97,103,115,  0, 42,112,114,111,120,105,109,105,116,121, 95,111, 98, 95,116, 97,
-114,103,101,116,  0,109,105,110, 95,100,105,115,116,  0,109, 97,120, 95,100,105,115,116,  0,112, 97,100, 95,115, 49,  0, 42, 99,
- 97,110,118, 97,115,  0, 42, 98,114,117,115,104,  0,116,104,114,101,115,104,111,108,100,  0,115, 99, 97,108,101,  0,104,101,114,
-109,105,116,101, 95,110,117,109,  0, 42,108, 97,116,116,  0,112,110,116,115,119,  0,111,112,110,116,115,117,  0,111,112,110,116,
-115,118,  0,111,112,110,116,115,119,  0,116,121,112,101,117,  0,116,121,112,101,118,  0,116,121,112,101,119,  0,102,117,  0,102,
-118,  0,102,119,  0,100,117,  0,100,118,  0,100,119,  0, 42,100,101,102,  0, 42,108, 97,116,116,105, 99,101,100, 97,116, 97,  0,
-108, 97,116,109, 97,116, 91, 52, 93, 91, 52, 93,  0, 42,101,100,105,116,108, 97,116,116,  0,118,101, 99, 91, 56, 93, 91, 51, 93,
-  0, 42,115, 99,117,108,112,116,  0,112, 97,114,116,121,112,101,  0,112, 97,114, 49,  0,112, 97,114, 50,  0,112, 97,114, 51,  0,
-112, 97,114,115,117, 98,115,116,114, 91, 54, 52, 93,  0, 42,116,114, 97, 99,107,  0, 42,112,114,111,120,121,  0, 42,112,114,111,
-120,121, 95,103,114,111,117,112,  0, 42,112,114,111,120,121, 95,102,114,111,109,  0, 42, 97, 99,116,105,111,110,  0, 42,112,111,
-115,101,108,105, 98,  0, 42,112,111,115,101,  0, 42,103,112,100,  0, 97,118,115,  0, 42,109,112, 97,116,104,  0, 99,111,110,115,
-116,114, 97,105,110,116, 67,104, 97,110,110,101,108,115,  0,101,102,102,101, 99,116,  0,100,101,102, 98, 97,115,101,  0,109,111,
-100,105,102,105,101,114,115,  0,114,101,115,116,111,114,101, 95,109,111,100,101,  0, 42,109, 97,116, 98,105,116,115,  0, 97, 99,
-116, 99,111,108,  0,100,108,111, 99, 91, 51, 93,  0,111,114,105,103, 91, 51, 93,  0,100,115,105,122,101, 91, 51, 93,  0,100,115,
- 99, 97,108,101, 91, 51, 93,  0,100,114,111,116, 91, 51, 93,  0,100,113,117, 97,116, 91, 52, 93,  0,114,111,116, 65,120,105,115,
- 91, 51, 93,  0,100,114,111,116, 65,120,105,115, 91, 51, 93,  0,114,111,116, 65,110,103,108,101,  0,100,114,111,116, 65,110,103,
-108,101,  0,111, 98,109, 97,116, 91, 52, 93, 91, 52, 93,  0, 99,111,110,115,116,105,110,118, 91, 52, 93, 91, 52, 93,  0,105,109,
- 97,116, 95,114,101,110, 91, 52, 93, 91, 52, 93,  0,108, 97,121,  0,112, 97,100, 54,  0, 99,111,108, 98,105,116,115,  0,116,114,
- 97,110,115,102,108, 97,103,  0,112,114,111,116,101, 99,116,102,108, 97,103,  0,116,114, 97, 99,107,102,108, 97,103,  0,117,112,
-102,108, 97,103,  0,110,108, 97,102,108, 97,103,  0,105,112,111,102,108, 97,103,  0,115, 99, 97,102,108, 97,103,  0,115, 99, 97,
-118,105,115,102,108, 97,103,  0,112, 97,100, 53,  0,100,117,112,111,110,  0,100,117,112,111,102,102,  0,100,117,112,115,116, 97,
-  0,100,117,112,101,110,100,  0,115,102,  0,109, 97,115,115,  0,100, 97,109,112,105,110,103,  0,105,110,101,114,116,105, 97,  0,
-102,111,114,109,102, 97, 99,116,111,114,  0,114,100, 97,109,112,105,110,103,  0,109, 97,114,103,105,110,  0,109, 97,120, 95,118,
-101,108,  0,109,105,110, 95,118,101,108,  0,109, 95, 99,111,110,116, 97, 99,116, 80,114,111, 99,101,115,115,105,110,103, 84,104,
-114,101,115,104,111,108,100,  0,111, 98,115,116, 97, 99,108,101, 82, 97,100,  0,114,111,116,109,111,100,101,  0, 98,111,117,110,
-100,116,121,112,101,  0, 99,111,108,108,105,115,105,111,110, 95, 98,111,117,110,100,116,121,112,101,  0,114,101,115,116,114,105,
- 99,116,102,108, 97,103,  0,100,116,  0,101,109,112,116,121, 95,100,114, 97,119,116,121,112,101,  0,101,109,112,116,121, 95,100,
-114, 97,119,115,105,122,101,  0,100,117,112,102, 97, 99,101,115, 99, 97,  0,112,114,111,112,  0,115,101,110,115,111,114,115,  0,
- 99,111,110,116,114,111,108,108,101,114,115,  0, 97, 99,116,117, 97,116,111,114,115,  0, 98, 98,115,105,122,101, 91, 51, 93,  0,
- 97, 99,116,100,101,102,  0,103, 97,109,101,102,108, 97,103,  0,103, 97,109,101,102,108, 97,103, 50,  0, 42, 98,115,111,102,116,
-  0,115,111,102,116,102,108, 97,103,  0, 97,110,105,115,111,116,114,111,112,105, 99, 70,114,105, 99,116,105,111,110, 91, 51, 93,
-  0, 99,111,110,115,116,114, 97,105,110,116,115,  0,110,108, 97,115,116,114,105,112,115,  0,104,111,111,107,115,  0,112, 97,114,
-116,105, 99,108,101,115,121,115,116,101,109,  0, 42,115,111,102,116,  0, 42,100,117,112, 95,103,114,111,117,112,  0, 98,111,100,
-121, 95,116,121,112,101,  0,115,104, 97,112,101,102,108, 97,103,  0, 42,102,108,117,105,100,115,105,109, 83,101,116,116,105,110,
-103,115,  0, 42,100,101,114,105,118,101,100, 68,101,102,111,114,109,  0, 42,100,101,114,105,118,101,100, 70,105,110, 97,108,  0,
-108, 97,115,116, 68, 97,116, 97, 77, 97,115,107,  0, 99,117,115,116,111,109,100, 97,116, 97, 95,109, 97,115,107,  0,115,116, 97,
-116,101,  0,105,110,105,116, 95,115,116, 97,116,101,  0,103,112,117,108, 97,109,112,  0,112, 99, 95,105,100,115,  0, 42,100,117,
-112,108,105,108,105,115,116,  0,105,109, 97, 95,111,102,115, 91, 50, 93,  0, 99,117,114,105,110,100,101,120,  0, 97, 99,116,105,
-118,101,  0,111,114,105,103,108, 97,121,  0,111,109, 97,116, 91, 52, 93, 91, 52, 93,  0,111,114, 99,111, 91, 51, 93,  0,110,111,
- 95,100,114, 97,119,  0, 97,110,105,109, 97,116,101,100,  0,100,101,102,108,101, 99,116,  0,102,111,114, 99,101,102,105,101,108,
-100,  0,115,104, 97,112,101,  0,116,101,120, 95,109,111,100,101,  0,107,105,110,107,  0,107,105,110,107, 95, 97,120,105,115,  0,
-122,100,105,114,  0,102, 95,115,116,114,101,110,103,116,104,  0,102, 95,100, 97,109,112,  0,102, 95,102,108,111,119,  0,102, 95,
-115,105,122,101,  0,102, 95,112,111,119,101,114,  0,109, 97,120,100,105,115,116,  0,109,105,110,100,105,115,116,  0,102, 95,112,
-111,119,101,114, 95,114,  0,109, 97,120,114, 97,100,  0,109,105,110,114, 97,100,  0,112,100,101,102, 95,100, 97,109,112,  0,112,
-100,101,102, 95,114,100, 97,109,112,  0,112,100,101,102, 95,112,101,114,109,  0,112,100,101,102, 95,102,114,105, 99,116,  0,112,
-100,101,102, 95,114,102,114,105, 99,116,  0,112,100,101,102, 95,115,116,105, 99,107,110,101,115,115,  0, 97, 98,115,111,114,112,
-116,105,111,110,  0,112,100,101,102, 95,115, 98,100, 97,109,112,  0,112,100,101,102, 95,115, 98,105,102,116,  0,112,100,101,102,
- 95,115, 98,111,102,116,  0, 99,108,117,109,112, 95,102, 97, 99,  0, 99,108,117,109,112, 95,112,111,119,  0,107,105,110,107, 95,
-102,114,101,113,  0,107,105,110,107, 95,115,104, 97,112,101,  0,107,105,110,107, 95, 97,109,112,  0,102,114,101,101, 95,101,110,
-100,  0,116,101,120, 95,110, 97, 98,108, 97,  0, 42,114,110,103,  0,102, 95,110,111,105,115,101,  0,119,101,105,103,104,116, 91,
- 49, 51, 93,  0,103,108,111, 98, 97,108, 95,103,114, 97,118,105,116,121,  0,114,116, 91, 51, 93,  0,116,111,116,100, 97,116, 97,
-  0,102,114, 97,109,101,  0,116,111,116,112,111,105,110,116,  0,100, 97,116, 97, 95,116,121,112,101,115,  0, 42,100, 97,116, 97,
- 91, 56, 93,  0, 42, 99,117,114, 91, 56, 93,  0,101,120,116,114, 97,100, 97,116, 97,  0,115,116,101,112,  0,115,105,109,102,114,
- 97,109,101,  0,115,116, 97,114,116,102,114, 97,109,101,  0,101,110,100,102,114, 97,109,101,  0,101,100,105,116,102,114, 97,109,
-101,  0,108, 97,115,116, 95,101,120, 97, 99,116,  0,108, 97,115,116, 95,118, 97,108,105,100,  0, 99,111,109,112,114,101,115,115,
-105,111,110,  0,112,114,101,118, 95,110, 97,109,101, 91, 54, 52, 93,  0,105,110,102,111, 91, 54, 52, 93,  0,112, 97,116,104, 91,
- 49, 48, 50, 52, 93,  0, 42, 99, 97, 99,104,101,100, 95,102,114, 97,109,101,115,  0,109,101,109, 95, 99, 97, 99,104,101,  0, 42,
-101,100,105,116,  0, 40, 42,102,114,101,101, 95,101,100,105,116, 41, 40, 41,  0,108,105,110, 83,116,105,102,102,  0, 97,110,103,
- 83,116,105,102,102,  0,118,111,108,117,109,101,  0,118,105,116,101,114, 97,116,105,111,110,115,  0,112,105,116,101,114, 97,116,
-105,111,110,115,  0,100,105,116,101,114, 97,116,105,111,110,115,  0, 99,105,116,101,114, 97,116,105,111,110,115,  0,107, 83, 82,
- 72, 82, 95, 67, 76,  0,107, 83, 75, 72, 82, 95, 67, 76,  0,107, 83, 83, 72, 82, 95, 67, 76,  0,107, 83, 82, 95, 83, 80, 76, 84,
- 95, 67, 76,  0,107, 83, 75, 95, 83, 80, 76, 84, 95, 67, 76,  0,107, 83, 83, 95, 83, 80, 76, 84, 95, 67, 76,  0,107, 86, 67, 70,
-  0,107, 68, 80,  0,107, 68, 71,  0,107, 76, 70,  0,107, 80, 82,  0,107, 86, 67,  0,107, 68, 70,  0,107, 77, 84,  0,107, 67, 72,
- 82,  0,107, 75, 72, 82,  0,107, 83, 72, 82,  0,107, 65, 72, 82,  0, 99,111,108,108,105,115,105,111,110,102,108, 97,103,115,  0,
-110,117,109, 99,108,117,115,116,101,114,105,116,101,114, 97,116,105,111,110,115,  0,119,101,108,100,105,110,103,  0,116,111,116,
-115,112,114,105,110,103,  0, 42, 98,112,111,105,110,116,  0, 42, 98,115,112,114,105,110,103,  0,109,115,103, 95,108,111, 99,107,
-  0,109,115,103, 95,118, 97,108,117,101,  0,110,111,100,101,109, 97,115,115,  0,110, 97,109,101,100, 86, 71, 95, 77, 97,115,115,
- 91, 54, 52, 93,  0,103,114, 97,118,  0,109,101,100,105, 97,102,114,105, 99,116,  0,114,107,108,105,109,105,116,  0,112,104,121,
-115,105, 99,115, 95,115,112,101,101,100,  0,103,111, 97,108,115,112,114,105,110,103,  0,103,111, 97,108,102,114,105, 99,116,  0,
-109,105,110,103,111, 97,108,  0,109, 97,120,103,111, 97,108,  0,100,101,102,103,111, 97,108,  0,118,101,114,116,103,114,111,117,
-112,  0,110, 97,109,101,100, 86, 71, 95, 83,111,102,116,103,111, 97,108, 91, 54, 52, 93,  0,102,117,122,122,121,110,101,115,115,
-  0,105,110,115,112,114,105,110,103,  0,105,110,102,114,105, 99,116,  0,110, 97,109,101,100, 86, 71, 95, 83,112,114,105,110,103,
- 95, 75, 91, 54, 52, 93,  0,101,102,114, 97,  0,105,110,116,101,114,118, 97,108,  0,108,111, 99, 97,108,  0,115,111,108,118,101,
-114,102,108, 97,103,115,  0, 42, 42,107,101,121,115,  0,116,111,116,112,111,105,110,116,107,101,121,  0,115,101, 99,111,110,100,
-115,112,114,105,110,103,  0, 99,111,108, 98, 97,108,108,  0, 98, 97,108,108,100, 97,109,112,  0, 98, 97,108,108,115,116,105,102,
-102,  0,115, 98, 99, 95,109,111,100,101,  0, 97,101,114,111,101,100,103,101,  0,109,105,110,108,111,111,112,115,  0,109, 97,120,
-108,111,111,112,115,  0, 99,104,111,107,101,  0,115,111,108,118,101,114, 95, 73, 68,  0,112,108, 97,115,116,105, 99,  0,115,112,
-114,105,110,103,112,114,101,108,111, 97,100,  0, 42,115, 99,114, 97,116, 99,104,  0,115,104,101, 97,114,115,116,105,102,102,  0,
-105,110,112,117,115,104,  0, 42,112,111,105,110,116, 99, 97, 99,104,101,  0, 42,101,102,102,101, 99,116,111,114, 95,119,101,105,
-103,104,116,115,  0,108, 99,111,109, 91, 51, 93,  0,108,114,111,116, 91, 51, 93, 91, 51, 93,  0,108,115, 99, 97,108,101, 91, 51,
- 93, 91, 51, 93,  0,108, 97,115,116, 95,102,114, 97,109,101,  0,118,101,108, 91, 51, 93,  0, 42,102,109,100,  0,115,104,111,119,
- 95, 97,100,118, 97,110, 99,101,100,111,112,116,105,111,110,115,  0,114,101,115,111,108,117,116,105,111,110,120,121,122,  0,112,
-114,101,118,105,101,119,114,101,115,120,121,122,  0,114,101, 97,108,115,105,122,101,  0,103,117,105, 68,105,115,112,108, 97,121,
- 77,111,100,101,  0,114,101,110,100,101,114, 68,105,115,112,108, 97,121, 77,111,100,101,  0,118,105,115, 99,111,115,105,116,121,
- 86, 97,108,117,101,  0,118,105,115, 99,111,115,105,116,121, 77,111,100,101,  0,118,105,115, 99,111,115,105,116,121, 69,120,112,
-111,110,101,110,116,  0,103,114, 97,118, 91, 51, 93,  0, 97,110,105,109, 83,116, 97,114,116,  0, 97,110,105,109, 69,110,100,  0,
- 98, 97,107,101, 83,116, 97,114,116,  0, 98, 97,107,101, 69,110,100,  0,102,114, 97,109,101, 79,102,102,115,101,116,  0,103,115,
-116, 97,114,  0,109, 97,120, 82,101,102,105,110,101,  0,105,110,105, 86,101,108,120,  0,105,110,105, 86,101,108,121,  0,105,110,
-105, 86,101,108,122,  0, 42,111,114,103, 77,101,115,104,  0, 42,109,101,115,104, 66, 66,  0,115,117,114,102,100, 97,116, 97, 80,
- 97,116,104, 91, 49, 48, 50, 52, 93,  0, 98, 98, 83,116, 97,114,116, 91, 51, 93,  0, 98, 98, 83,105,122,101, 91, 51, 93,  0,116,
-121,112,101, 70,108, 97,103,115,  0,100,111,109, 97,105,110, 78,111,118,101, 99,103,101,110,  0,118,111,108,117,109,101, 73,110,
-105,116, 84,121,112,101,  0,112, 97,114,116, 83,108,105,112, 86, 97,108,117,101,  0,103,101,110,101,114, 97,116,101, 84,114, 97,
- 99,101,114,115,  0,103,101,110,101,114, 97,116,101, 80, 97,114,116,105, 99,108,101,115,  0,115,117,114,102, 97, 99,101, 83,109,
-111,111,116,104,105,110,103,  0,115,117,114,102, 97, 99,101, 83,117, 98,100,105,118,115,  0,112, 97,114,116,105, 99,108,101, 73,
-110,102, 83,105,122,101,  0,112, 97,114,116,105, 99,108,101, 73,110,102, 65,108,112,104, 97,  0,102, 97,114, 70,105,101,108,100,
- 83,105,122,101,  0, 42,109,101,115,104, 86,101,108,111, 99,105,116,105,101,115,  0, 99,112,115, 84,105,109,101, 83,116, 97,114,
-116,  0, 99,112,115, 84,105,109,101, 69,110,100,  0, 99,112,115, 81,117, 97,108,105,116,121,  0, 97,116,116,114, 97, 99,116,102,
-111,114, 99,101, 83,116,114,101,110,103,116,104,  0, 97,116,116,114, 97, 99,116,102,111,114, 99,101, 82, 97,100,105,117,115,  0,
-118,101,108,111, 99,105,116,121,102,111,114, 99,101, 83,116,114,101,110,103,116,104,  0,118,101,108,111, 99,105,116,121,102,111,
-114, 99,101, 82, 97,100,105,117,115,  0,108, 97,115,116,103,111,111,100,102,114, 97,109,101,  0, 97,110,105,109, 82, 97,116,101,
-  0,109,105,115,116,121,112,101,  0,104,111,114,114,  0,104,111,114,103,  0,104,111,114, 98,  0,122,101,110,114,  0,122,101,110,
-103,  0,122,101,110, 98,  0,102, 97,115,116, 99,111,108,  0,101,120,112,111,115,117,114,101,  0,101,120,112,  0,114, 97,110,103,
-101,  0,108,105,110,102, 97, 99,  0,108,111,103,102, 97, 99,  0,103,114, 97,118,105,116,121,  0, 97, 99,116,105,118,105,116,121,
- 66,111,120, 82, 97,100,105,117,115,  0,115,107,121,116,121,112,101,  0,111, 99, 99,108,117,115,105,111,110, 82,101,115,  0,112,
-104,121,115,105, 99,115, 69,110,103,105,110,101,  0,116,105, 99,114, 97,116,101,  0,109, 97,120,108,111,103,105, 99,115,116,101,
-112,  0,112,104,121,115,117, 98,115,116,101,112,  0,109, 97,120,112,104,121,115,116,101,112,  0,109,105,115,105,  0,109,105,115,
-116,115,116, 97,  0,109,105,115,116,100,105,115,116,  0,109,105,115,116,104,105,  0,115,116, 97,114,114,  0,115,116, 97,114,103,
-  0,115,116, 97,114, 98,  0,115,116, 97,114,107,  0,115,116, 97,114,115,105,122,101,  0,115,116, 97,114,109,105,110,100,105,115,
-116,  0,115,116, 97,114,100,105,115,116,  0,115,116, 97,114, 99,111,108,110,111,105,115,101,  0,100,111,102,115,116, 97,  0,100,
-111,102,101,110,100,  0,100,111,102,109,105,110,  0,100,111,102,109, 97,120,  0, 97,111,100,105,115,116,  0, 97,111,100,105,115,
-116,102, 97, 99,  0, 97,111,101,110,101,114,103,121,  0, 97,111, 98,105, 97,115,  0, 97,111,109,111,100,101,  0, 97,111,115, 97,
-109,112,  0, 97,111,109,105,120,  0, 97,111, 99,111,108,111,114,  0, 97,111, 95, 97,100, 97,112,116, 95,116,104,114,101,115,104,
-  0, 97,111, 95, 97,100, 97,112,116, 95,115,112,101,101,100, 95,102, 97, 99,  0, 97,111, 95, 97,112,112,114,111,120, 95,101,114,
-114,111,114,  0, 97,111, 95, 97,112,112,114,111,120, 95, 99,111,114,114,101, 99,116,105,111,110,  0, 97,111, 95,105,110,100,105,
-114,101, 99,116, 95,101,110,101,114,103,121,  0, 97,111, 95,101,110,118, 95,101,110,101,114,103,121,  0, 97,111, 95,112, 97,100,
- 50,  0, 97,111, 95,105,110,100,105,114,101, 99,116, 95, 98,111,117,110, 99,101,115,  0, 97,111, 95,112, 97,100,  0, 97,111, 95,
-115, 97,109,112, 95,109,101,116,104,111,100,  0, 97,111, 95,103, 97,116,104,101,114, 95,109,101,116,104,111,100,  0, 97,111, 95,
- 97,112,112,114,111,120, 95,112, 97,115,115,101,115,  0, 42, 97,111,115,112,104,101,114,101,  0, 42, 97,111,116, 97, 98,108,101,
-115,  0,115,101,108, 99,111,108,  0,115,120,  0,115,121,  0, 42,108,112, 70,111,114,109, 97,116,  0, 42,108,112, 80, 97,114,109,
-115,  0, 99, 98, 70,111,114,109, 97,116,  0, 99, 98, 80, 97,114,109,115,  0,102, 99, 99, 84,121,112,101,  0,102, 99, 99, 72, 97,
-110,100,108,101,114,  0,100,119, 75,101,121, 70,114, 97,109,101, 69,118,101,114,121,  0,100,119, 81,117, 97,108,105,116,121,  0,
-100,119, 66,121,116,101,115, 80,101,114, 83,101, 99,111,110,100,  0,100,119, 70,108, 97,103,115,  0,100,119, 73,110,116,101,114,
-108,101, 97,118,101, 69,118,101,114,121,  0, 97,118,105, 99,111,100,101, 99,110, 97,109,101, 91, 49, 50, 56, 93,  0, 42, 99,100,
- 80, 97,114,109,115,  0, 42,112, 97,100,  0, 99,100, 83,105,122,101,  0,113,116, 99,111,100,101, 99,110, 97,109,101, 91, 49, 50,
- 56, 93,  0, 99,111,100,101, 99, 84,121,112,101,  0, 99,111,100,101, 99, 83,112, 97,116,105, 97,108, 81,117, 97,108,105,116,121,
-  0, 99,111,100,101, 99,  0, 99,111,100,101, 99, 70,108, 97,103,115,  0, 99,111,108,111,114, 68,101,112,116,104,  0, 99,111,100,
-101, 99, 84,101,109,112,111,114, 97,108, 81,117, 97,108,105,116,121,  0,109,105,110, 83,112, 97,116,105, 97,108, 81,117, 97,108,
-105,116,121,  0,109,105,110, 84,101,109,112,111,114, 97,108, 81,117, 97,108,105,116,121,  0,107,101,121, 70,114, 97,109,101, 82,
- 97,116,101,  0, 98,105,116, 82, 97,116,101,  0, 97,117,100,105,111, 99,111,100,101, 99, 84,121,112,101,  0, 97,117,100,105,111,
- 83, 97,109,112,108,101, 82, 97,116,101,  0, 97,117,100,105,111, 66,105,116, 68,101,112,116,104,  0, 97,117,100,105,111, 67,104,
- 97,110,110,101,108,115,  0, 97,117,100,105,111, 67,111,100,101, 99, 70,108, 97,103,115,  0, 97,117,100,105,111, 66,105,116, 82,
- 97,116,101,  0, 97,117,100,105,111, 95, 99,111,100,101, 99,  0,118,105,100,101,111, 95, 98,105,116,114, 97,116,101,  0, 97,117,
-100,105,111, 95, 98,105,116,114, 97,116,101,  0, 97,117,100,105,111, 95,109,105,120,114, 97,116,101,  0, 97,117,100,105,111, 95,
- 99,104, 97,110,110,101,108,115,  0, 97,117,100,105,111, 95,112, 97,100,  0, 97,117,100,105,111, 95,118,111,108,117,109,101,  0,
-103,111,112, 95,115,105,122,101,  0,114, 99, 95,109,105,110, 95,114, 97,116,101,  0,114, 99, 95,109, 97,120, 95,114, 97,116,101,
-  0,114, 99, 95, 98,117,102,102,101,114, 95,115,105,122,101,  0,109,117,120, 95,112, 97, 99,107,101,116, 95,115,105,122,101,  0,
-109,117,120, 95,114, 97,116,101,  0,109,105,120,114, 97,116,101,  0,109, 97,105,110,  0,115,112,101,101,100, 95,111,102, 95,115,
-111,117,110,100,  0,100,111,112,112,108,101,114, 95,102, 97, 99,116,111,114,  0,100,105,115,116, 97,110, 99,101, 95,109,111,100,
-101,108,  0, 42,109, 97,116, 95,111,118,101,114,114,105,100,101,  0, 42,108,105,103,104,116, 95,111,118,101,114,114,105,100,101,
-  0,108, 97,121, 95,122,109, 97,115,107,  0,108, 97,121, 95,101,120, 99,108,117,100,101,  0,108, 97,121,102,108, 97,103,  0,112,
- 97,115,115,102,108, 97,103,  0,112, 97,115,115, 95,120,111,114,  0,115, 97,109,112,108,101,115,  0,105,109,116,121,112,101,  0,
-112,108, 97,110,101,115,  0,113,117, 97,108,105,116,121,  0, 99,111,109,112,114,101,115,115,  0,101,120,114, 95, 99,111,100,101,
- 99,  0, 99,105,110,101,111,110, 95,102,108, 97,103,  0, 99,105,110,101,111,110, 95,119,104,105,116,101,  0, 99,105,110,101,111,
-110, 95, 98,108, 97, 99,107,  0, 99,105,110,101,111,110, 95,103, 97,109,109, 97,  0,106,112, 50, 95,102,108, 97,103,  0,105,109,
- 95,102,111,114,109, 97,116,  0, 42, 97,118,105, 99,111,100,101, 99,100, 97,116, 97,  0, 42,113,116, 99,111,100,101, 99,100, 97,
-116, 97,  0,113,116, 99,111,100,101, 99,115,101,116,116,105,110,103,115,  0,102,102, 99,111,100,101, 99,100, 97,116, 97,  0,115,
-117, 98,102,114, 97,109,101,  0,112,115,102,114, 97,  0,112,101,102,114, 97,  0,105,109, 97,103,101,115,  0,102,114, 97,109, 97,
-112,116,111,  0,116,104,114,101, 97,100,115,  0,102,114, 97,109,101,108,101,110,  0, 98,108,117,114,102, 97, 99,  0,101,100,103,
-101, 82,  0,101,100,103,101, 71,  0,101,100,103,101, 66,  0,102,117,108,108,115, 99,114,101,101,110,  0,120,112,108, 97,121,  0,
-121,112,108, 97,121,  0,102,114,101,113,112,108, 97,121,  0, 97,116,116,114,105, 98,  0,102,114, 97,109,101, 95,115,116,101,112,
-  0,115,116,101,114,101,111,109,111,100,101,  0,100,105,109,101,110,115,105,111,110,115,112,114,101,115,101,116,  0,109, 97,120,
-105,109,115,105,122,101,  0,120,115, 99,104,  0,121,115, 99,104,  0,120,112, 97,114,116,115,  0,121,112, 97,114,116,115,  0,115,
-117, 98,105,109,116,121,112,101,  0,100,105,115,112,108, 97,121,109,111,100,101,  0,115, 99,101,109,111,100,101,  0,114, 97,121,
-116,114, 97, 99,101, 95,111,112,116,105,111,110,115,  0,114, 97,121,116,114, 97, 99,101, 95,115,116,114,117, 99,116,117,114,101,
-  0,111, 99,114,101,115,  0,112, 97,100, 52,  0, 97,108,112,104, 97,109,111,100,101,  0,111,115, 97,  0,102,114,115, 95,115,101,
- 99,  0,101,100,103,101,105,110,116,  0,115, 97,102,101,116,121,  0, 98,111,114,100,101,114,  0,100,105,115,112,114,101, 99,116,
-  0,108, 97,121,101,114,115,  0, 97, 99,116,108, 97,121,  0,109, 98,108,117,114, 95,115, 97,109,112,108,101,115,  0,120, 97,115,
-112,  0,121, 97,115,112,  0,102,114,115, 95,115,101, 99, 95, 98, 97,115,101,  0,103, 97,117,115,115,  0, 99,111,108,111,114, 95,
-109,103,116, 95,102,108, 97,103,  0,112,111,115,116,103, 97,109,109, 97,  0,112,111,115,116,104,117,101,  0,112,111,115,116,115,
- 97,116,  0,100,105,116,104,101,114, 95,105,110,116,101,110,115,105,116,121,  0, 98, 97,107,101, 95,111,115, 97,  0, 98, 97,107,
-101, 95,102,105,108,116,101,114,  0, 98, 97,107,101, 95,109,111,100,101,  0, 98, 97,107,101, 95,102,108, 97,103,  0, 98, 97,107,
-101, 95,110,111,114,109, 97,108, 95,115,112, 97, 99,101,  0, 98, 97,107,101, 95,113,117, 97,100, 95,115,112,108,105,116,  0, 98,
- 97,107,101, 95,109, 97,120,100,105,115,116,  0, 98, 97,107,101, 95, 98,105, 97,115,100,105,115,116,  0, 98, 97,107,101, 95,112,
- 97,100,  0,112,105, 99, 91, 49, 48, 50, 52, 93,  0,115,116, 97,109,112,  0,115,116, 97,109,112, 95,102,111,110,116, 95,105,100,
-  0,115,116, 97,109,112, 95,117,100, 97,116, 97, 91, 55, 54, 56, 93,  0,102,103, 95,115,116, 97,109,112, 91, 52, 93,  0, 98,103,
- 95,115,116, 97,109,112, 91, 52, 93,  0,115,101,113, 95,112,114,101,118, 95,116,121,112,101,  0,115,101,113, 95,114,101,110,100,
- 95,116,121,112,101,  0,115,101,113, 95,102,108, 97,103,  0,112, 97,100, 53, 91, 53, 93,  0,115,105,109,112,108,105,102,121, 95,
-102,108, 97,103,  0,115,105,109,112,108,105,102,121, 95,115,117, 98,115,117,114,102,  0,115,105,109,112,108,105,102,121, 95,115,
-104, 97,100,111,119,115, 97,109,112,108,101,115,  0,115,105,109,112,108,105,102,121, 95,112, 97,114,116,105, 99,108,101,115,  0,
-115,105,109,112,108,105,102,121, 95, 97,111,115,115,115,  0, 99,105,110,101,111,110,119,104,105,116,101,  0, 99,105,110,101,111,
-110, 98,108, 97, 99,107,  0, 99,105,110,101,111,110,103, 97,109,109, 97,  0,106,112, 50, 95,112,114,101,115,101,116,  0,106,112,
- 50, 95,100,101,112,116,104,  0,114,112, 97,100, 51,  0,100,111,109,101,114,101,115,  0,100,111,109,101,109,111,100,101,  0,100,
-111,109,101, 97,110,103,108,101,  0,100,111,109,101,116,105,108,116,  0,100,111,109,101,114,101,115, 98,117,102,  0, 42,100,111,
-109,101,116,101,120,116,  0,101,110,103,105,110,101, 91, 51, 50, 93,  0,110, 97,109,101, 91, 51, 50, 93,  0,112, 97,114,116,105,
- 99,108,101, 95,112,101,114, 99,  0,115,117, 98,115,117,114,102, 95,109, 97,120,  0,115,104, 97,100, 98,117,102,115, 97,109,112,
-108,101, 95,109, 97,120,  0, 97,111, 95,101,114,114,111,114,  0,116,105,108,116,  0,114,101,115, 98,117,102,  0, 42,119, 97,114,
-112,116,101,120,116,  0, 99,111,108, 91, 51, 93,  0, 99,101,108,108,115,105,122,101,  0, 99,101,108,108,104,101,105,103,104,116,
-  0, 97,103,101,110,116,109, 97,120,115,108,111,112,101,  0, 97,103,101,110,116,109, 97,120, 99,108,105,109, 98,  0, 97,103,101,
-110,116,104,101,105,103,104,116,  0, 97,103,101,110,116,114, 97,100,105,117,115,  0,101,100,103,101,109, 97,120,108,101,110,  0,
-101,100,103,101,109, 97,120,101,114,114,111,114,  0,114,101,103,105,111,110,109,105,110,115,105,122,101,  0,114,101,103,105,111,
-110,109,101,114,103,101,115,105,122,101,  0,118,101,114,116,115,112,101,114,112,111,108,121,  0,100,101,116, 97,105,108,115, 97,
-109,112,108,101,100,105,115,116,  0,100,101,116, 97,105,108,115, 97,109,112,108,101,109, 97,120,101,114,114,111,114,  0,102,114,
- 97,109,105,110,103,  0,112,108, 97,121,101,114,102,108, 97,103,  0,114,116, 49,  0,114,116, 50,  0, 97, 97,115, 97,109,112,108,
-101,115,  0,112, 97,100, 52, 91, 51, 93,  0,100,111,109,101,  0,115,116,101,114,101,111,102,108, 97,103,  0,101,121,101,115,101,
-112, 97,114, 97,116,105,111,110,  0,114,101, 99, 97,115,116, 68, 97,116, 97,  0,109, 97,116,109,111,100,101,  0,101,120,105,116,
-107,101,121,  0,111, 98,115,116, 97, 99,108,101, 83,105,109,117,108, 97,116,105,111,110,  0,108,101,118,101,108, 72,101,105,103,
-104,116,  0, 42, 99, 97,109,101,114, 97,  0, 42,112, 97,105,110,116, 95, 99,117,114,115,111,114,  0,112, 97,105,110,116, 95, 99,
-117,114,115,111,114, 95, 99,111,108, 91, 52, 93,  0,110,117,109, 95,105,110,112,117,116, 95,115, 97,109,112,108,101,115,  0,112,
- 97,105,110,116,  0,115,101, 97,109, 95, 98,108,101,101,100,  0,110,111,114,109, 97,108, 95, 97,110,103,108,101,  0,115, 99,114,
-101,101,110, 95,103,114, 97, 98, 95,115,105,122,101, 91, 50, 93,  0, 42,112, 97,105,110,116, 99,117,114,115,111,114,  0,105,110,
-118,101,114,116,  0,116,111,116,114,101,107,101,121,  0,116,111,116, 97,100,100,107,101,121,  0, 98,114,117,115,104,116,121,112,
-101,  0, 98,114,117,115,104, 91, 55, 93,  0,101,109,105,116,116,101,114,100,105,115,116,  0,115,101,108,101, 99,116,109,111,100,
-101,  0,101,100,105,116,116,121,112,101,  0,100,114, 97,119, 95,115,116,101,112,  0,102, 97,100,101, 95,102,114, 97,109,101,115,
-  0,114, 97,100,105, 97,108, 95,115,121,109,109, 91, 51, 93,  0,108, 97,115,116, 95,120,  0,108, 97,115,116, 95,121,  0,108, 97,
-115,116, 95, 97,110,103,108,101,  0,100,114, 97,119, 95, 97,110, 99,104,111,114,101,100,  0, 97,110, 99,104,111,114,101,100, 95,
-115,105,122,101,  0, 97,110, 99,104,111,114,101,100, 95,108,111, 99, 97,116,105,111,110, 91, 51, 93,  0, 97,110, 99,104,111,114,
-101,100, 95,105,110,105,116,105, 97,108, 95,109,111,117,115,101, 91, 50, 93,  0,100,114, 97,119, 95,112,114,101,115,115,117,114,
-101,  0,112,114,101,115,115,117,114,101, 95,118, 97,108,117,101,  0,115,112,101, 99,105, 97,108, 95,114,111,116, 97,116,105,111,
-110,  0, 42,118,112, 97,105,110,116, 95,112,114,101,118,  0, 42,119,112, 97,105,110,116, 95,112,114,101,118,  0,109, 97,116, 91,
- 51, 93, 91, 51, 93,  0,117,110,112,114,111,106,101, 99,116,101,100, 95,114, 97,100,105,117,115,  0, 42,118,112, 97,105,110,116,
-  0, 42,119,112, 97,105,110,116,  0, 42,117,118,115, 99,117,108,112,116,  0,118,103,114,111,117,112, 95,119,101,105,103,104,116,
-  0, 99,111,114,110,101,114,116,121,112,101,  0,106,111,105,110,116,114,105,108,105,109,105,116,  0,100,101,103,114,  0,116,117,
-114,110,  0,101,120,116,114, 95,111,102,102,115,  0,100,111,117, 98,108,105,109,105,116,  0,110,111,114,109, 97,108,115,105,122,
-101,  0, 97,117,116,111,109,101,114,103,101,  0,115,101,103,109,101,110,116,115,  0,114,105,110,103,115,  0,118,101,114,116,105,
- 99,101,115,  0,117,110,119,114, 97,112,112,101,114,  0,117,118, 99, 97,108, 99, 95,114, 97,100,105,117,115,  0,117,118, 99, 97,
-108, 99, 95, 99,117, 98,101,115,105,122,101,  0,117,118, 99, 97,108, 99, 95,109, 97,114,103,105,110,  0,117,118, 99, 97,108, 99,
- 95,109, 97,112,100,105,114,  0,117,118, 99, 97,108, 99, 95,109, 97,112, 97,108,105,103,110,  0,117,118, 99, 97,108, 99, 95,102,
-108, 97,103,  0,117,118, 95,102,108, 97,103,  0,117,118, 95,115,101,108,101, 99,116,109,111,100,101,  0,117,118, 95,115,117, 98,
-115,117,114,102, 95,108,101,118,101,108,  0,103,112,101,110, 99,105,108, 95,102,108, 97,103,115,  0, 97,117,116,111,105,107, 95,
- 99,104, 97,105,110,108,101,110,  0,105,109, 97,112, 97,105,110,116,  0,112, 97,114,116,105, 99,108,101,  0,112,114,111,112,111,
-114,116,105,111,110, 97,108, 95,115,105,122,101,  0,115,101,108,101, 99,116, 95,116,104,114,101,115,104,  0, 99,108,101, 97,110,
- 95,116,104,114,101,115,104,  0, 97,117,116,111,107,101,121, 95,109,111,100,101,  0, 97,117,116,111,107,101,121, 95,102,108, 97,
-103,  0,109,117,108,116,105,114,101,115, 95,115,117, 98,100,105,118, 95,116,121,112,101,  0,112, 97,100, 50, 91, 53, 93,  0,115,
-107,103,101,110, 95,114,101,115,111,108,117,116,105,111,110,  0,115,107,103,101,110, 95,116,104,114,101,115,104,111,108,100, 95,
-105,110,116,101,114,110, 97,108,  0,115,107,103,101,110, 95,116,104,114,101,115,104,111,108,100, 95,101,120,116,101,114,110, 97,
-108,  0,115,107,103,101,110, 95,108,101,110,103,116,104, 95,114, 97,116,105,111,  0,115,107,103,101,110, 95,108,101,110,103,116,
-104, 95,108,105,109,105,116,  0,115,107,103,101,110, 95, 97,110,103,108,101, 95,108,105,109,105,116,  0,115,107,103,101,110, 95,
- 99,111,114,114,101,108, 97,116,105,111,110, 95,108,105,109,105,116,  0,115,107,103,101,110, 95,115,121,109,109,101,116,114,121,
- 95,108,105,109,105,116,  0,115,107,103,101,110, 95,114,101,116, 97,114,103,101,116, 95, 97,110,103,108,101, 95,119,101,105,103,
-104,116,  0,115,107,103,101,110, 95,114,101,116, 97,114,103,101,116, 95,108,101,110,103,116,104, 95,119,101,105,103,104,116,  0,
-115,107,103,101,110, 95,114,101,116, 97,114,103,101,116, 95,100,105,115,116, 97,110, 99,101, 95,119,101,105,103,104,116,  0,115,
-107,103,101,110, 95,111,112,116,105,111,110,115,  0,115,107,103,101,110, 95,112,111,115,116,112,114,111,  0,115,107,103,101,110,
- 95,112,111,115,116,112,114,111, 95,112, 97,115,115,101,115,  0,115,107,103,101,110, 95,115,117, 98,100,105,118,105,115,105,111,
-110,115, 91, 51, 93,  0,115,107,103,101,110, 95,109,117,108,116,105, 95,108,101,118,101,108,  0, 42,115,107,103,101,110, 95,116,
-101,109,112,108, 97,116,101,  0, 98,111,110,101, 95,115,107,101,116, 99,104,105,110,103,  0, 98,111,110,101, 95,115,107,101,116,
- 99,104,105,110,103, 95, 99,111,110,118,101,114,116,  0,115,107,103,101,110, 95,115,117, 98,100,105,118,105,115,105,111,110, 95,
-110,117,109, 98,101,114,  0,115,107,103,101,110, 95,114,101,116, 97,114,103,101,116, 95,111,112,116,105,111,110,115,  0,115,107,
-103,101,110, 95,114,101,116, 97,114,103,101,116, 95,114,111,108,108,  0,115,107,103,101,110, 95,115,105,100,101, 95,115,116,114,
-105,110,103, 91, 56, 93,  0,115,107,103,101,110, 95,110,117,109, 95,115,116,114,105,110,103, 91, 56, 93,  0,101,100,103,101, 95,
-109,111,100,101,  0,101,100,103,101, 95,109,111,100,101, 95,108,105,118,101, 95,117,110,119,114, 97,112,  0,115,110, 97,112, 95,
-109,111,100,101,  0,115,110, 97,112, 95,102,108, 97,103,  0,115,110, 97,112, 95,116, 97,114,103,101,116,  0,112,114,111,112,111,
-114,116,105,111,110, 97,108,  0,112,114,111,112, 95,109,111,100,101,  0,112,114,111,112,111,114,116,105,111,110, 97,108, 95,111,
- 98,106,101, 99,116,115,  0,112, 97,100, 91, 53, 93,  0, 97,117,116,111, 95,110,111,114,109, 97,108,105,122,101,  0,109,117,108,
-116,105,112, 97,105,110,116,  0,117,115,101, 95,117,118, 95,115, 99,117,108,112,116,  0,117,118, 95,115, 99,117,108,112,116, 95,
-115,101,116,116,105,110,103,115,  0,117,118, 95,115, 99,117,108,112,116, 95,116,111,111,108,  0,117,118, 95,114,101,108, 97,120,
- 95,109,101,116,104,111,100,  0,115, 99,117,108,112,116, 95,112, 97,105,110,116, 95,115,101,116,116,105,110,103,115,  0,115, 99,
-117,108,112,116, 95,112, 97,105,110,116, 95,117,110,105,102,105,101,100, 95,115,105,122,101,  0,115, 99,117,108,112,116, 95,112,
- 97,105,110,116, 95,117,110,105,102,105,101,100, 95,117,110,112,114,111,106,101, 99,116,101,100, 95,114, 97,100,105,117,115,  0,
-115, 99,117,108,112,116, 95,112, 97,105,110,116, 95,117,110,105,102,105,101,100, 95, 97,108,112,104, 97,  0,117,110,105,102,105,
-101,100, 95,112, 97,105,110,116, 95,115,101,116,116,105,110,103,115,  0,116,111,116,111, 98,106,  0,116,111,116,108, 97,109,112,
-  0,116,111,116,111, 98,106,115,101,108,  0,116,111,116, 99,117,114,118,101,  0,116,111,116,109,101,115,104,  0,116,111,116, 97,
-114,109, 97,116,117,114,101,  0,115, 99, 97,108,101, 95,108,101,110,103,116,104,  0,115,121,115,116,101,109,  0,115,121,115,116,
-101,109, 95,114,111,116, 97,116,105,111,110,  0,103,114, 97,118,105,116,121, 91, 51, 93,  0,113,117,105, 99,107, 95, 99, 97, 99,
-104,101, 95,115,116,101,112,  0, 42,119,111,114,108,100,  0, 42,115,101,116,  0, 98, 97,115,101,  0, 42, 98, 97,115, 97, 99,116,
-  0, 42,111, 98,101,100,105,116,  0, 99,117,114,115,111,114, 91, 51, 93,  0,116,119, 99,101,110,116, 91, 51, 93,  0,116,119,109,
-105,110, 91, 51, 93,  0,116,119,109, 97,120, 91, 51, 93,  0,108, 97,121, 97, 99,116,  0,108, 97,121, 95,117,112,100, 97,116,101,
-100,  0, 42,101,100,  0, 42,116,111,111,108,115,101,116,116,105,110,103,115,  0, 42,115,116, 97,116,115,  0, 97,117,100,105,111,
-  0,116,114, 97,110,115,102,111,114,109, 95,115,112, 97, 99,101,115,  0, 42,115,111,117,110,100, 95,115, 99,101,110,101,  0, 42,
-115,111,117,110,100, 95,115, 99,101,110,101, 95,104, 97,110,100,108,101,  0, 42,115,111,117,110,100, 95,115, 99,114,117, 98, 95,
-104, 97,110,100,108,101,  0, 42,115,112,101, 97,107,101,114, 95,104, 97,110,100,108,101,115,  0, 42,102,112,115, 95,105,110,102,
-111,  0, 42,116,104,101, 68, 97,103,  0,100, 97,103,105,115,118, 97,108,105,100,  0,100, 97,103,102,108, 97,103,115,  0, 97, 99,
-116,105,118,101, 95,107,101,121,105,110,103,115,101,116,  0,107,101,121,105,110,103,115,101,116,115,  0,103,109,  0,117,110,105,
-116,  0,112,104,121,115,105, 99,115, 95,115,101,116,116,105,110,103,115,  0, 42, 99,108,105,112,  0, 99,117,115,116,111,109,100,
- 97,116, 97, 95,109, 97,115,107, 95,109,111,100, 97,108,  0, 99,117,115,101,114,  0, 98,108,101,110,100,  0,118,105,101,119,  0,
-119,105,110,109, 97,116, 91, 52, 93, 91, 52, 93,  0,118,105,101,119,109, 97,116, 91, 52, 93, 91, 52, 93,  0,118,105,101,119,105,
-110,118, 91, 52, 93, 91, 52, 93,  0,112,101,114,115,109, 97,116, 91, 52, 93, 91, 52, 93,  0,112,101,114,115,105,110,118, 91, 52,
- 93, 91, 52, 93,  0,118,105,101,119,109, 97,116,111, 98, 91, 52, 93, 91, 52, 93,  0,112,101,114,115,109, 97,116,111, 98, 91, 52,
- 93, 91, 52, 93,  0, 99,108,105,112, 91, 54, 93, 91, 52, 93,  0, 99,108,105,112, 95,108,111, 99, 97,108, 91, 54, 93, 91, 52, 93,
-  0, 42, 99,108,105,112, 98, 98,  0, 42,108,111, 99, 97,108,118,100,  0, 42,114,105,  0, 42,114,101,110,100,101,114, 95,101,110,
-103,105,110,101,  0, 42,100,101,112,116,104,115,  0, 42,115,109,115,  0, 42,115,109,111,111,116,104, 95,116,105,109,101,114,  0,
-116,119,109, 97,116, 91, 52, 93, 91, 52, 93,  0,118,105,101,119,113,117, 97,116, 91, 52, 93,  0,122,102, 97, 99,  0, 99, 97,109,
-100,120,  0, 99, 97,109,100,121,  0,112,105,120,115,105,122,101,  0, 99, 97,109,122,111,111,109,  0,105,115, 95,112,101,114,115,
-112,  0,112,101,114,115,112,  0,118,105,101,119,108,111, 99,107,  0,116,119,100,114, 97,119,102,108, 97,103,  0,114,102,108, 97,
-103,  0,108,118,105,101,119,113,117, 97,116, 91, 52, 93,  0,108,112,101,114,115,112,  0,108,118,105,101,119,  0,103,114,105,100,
-118,105,101,119,  0,116,119, 97,110,103,108,101, 91, 51, 93,  0,114,111,116, 95, 97,110,103,108,101,  0,114,111,116, 95, 97,120,
-105,115, 91, 51, 93,  0,114,101,103,105,111,110, 98, 97,115,101,  0,115,112, 97, 99,101,116,121,112,101,  0, 98,108,111, 99,107,
-115, 99, 97,108,101,  0, 98,108,111, 99,107,104, 97,110,100,108,101,114, 91, 56, 93,  0, 98,117,110,100,108,101, 95,115,105,122,
-101,  0, 98,117,110,100,108,101, 95,100,114, 97,119,116,121,112,101,  0,108, 97,121, 95,117,115,101,100,  0, 42,111, 98, 95, 99,
-101,110,116,114,101,  0, 98,103,112,105, 99, 98, 97,115,101,  0, 42, 98,103,112,105, 99,  0,111, 98, 95, 99,101,110,116,114,101,
- 95, 98,111,110,101, 91, 54, 52, 93,  0,100,114, 97,119,116,121,112,101,  0,111, 98, 95, 99,101,110,116,114,101, 95, 99,117,114,
-115,111,114,  0,115, 99,101,110,101,108,111, 99,107,  0, 97,114,111,117,110,100,  0,103,114,105,100,  0,110,101, 97,114,  0,102,
- 97,114,  0,109,111,100,101,115,101,108,101, 99,116,  0,103,114,105,100,108,105,110,101,115,  0,103,114,105,100,115,117, 98,100,
-105,118,  0,103,114,105,100,102,108, 97,103,  0,116,119,116,121,112,101,  0,116,119,109,111,100,101,  0,116,119,102,108, 97,103,
-  0,112, 97,100, 50, 91, 50, 93,  0, 97,102,116,101,114,100,114, 97,119, 95,116,114, 97,110,115,112,  0, 97,102,116,101,114,100,
-114, 97,119, 95,120,114, 97,121,  0, 97,102,116,101,114,100,114, 97,119, 95,120,114, 97,121,116,114, 97,110,115,112,  0,122, 98,
-117,102,  0,120,114, 97,121,  0,112, 97,100, 51, 91, 50, 93,  0, 42,112,114,111,112,101,114,116,105,101,115, 95,115,116,111,114,
- 97,103,101,  0,118,101,114,116,  0,104,111,114,  0,109, 97,115,107,  0,109,105,110, 91, 50, 93,  0,109, 97,120, 91, 50, 93,  0,
-109,105,110,122,111,111,109,  0,109, 97,120,122,111,111,109,  0,115, 99,114,111,108,108,  0,115, 99,114,111,108,108, 95,117,105,
-  0,107,101,101,112,116,111,116,  0,107,101,101,112,122,111,111,109,  0,107,101,101,112,111,102,115,  0, 97,108,105,103,110,  0,
-119,105,110,120,  0,119,105,110,121,  0,111,108,100,119,105,110,120,  0,111,108,100,119,105,110,121,  0, 42,116, 97, 98, 95,111,
-102,102,115,101,116,  0,116, 97, 98, 95,110,117,109,  0,116, 97, 98, 95, 99,117,114,  0,114,112,116, 95,109, 97,115,107,  0,118,
- 50,100,  0, 42, 97,100,115,  0,103,104,111,115,116, 67,117,114,118,101,115,  0, 97,117,116,111,115,110, 97,112,  0, 99,117,114,
-115,111,114, 86, 97,108,  0,109, 97,105,110, 98,  0,109, 97,105,110, 98,111,  0,109, 97,105,110, 98,117,115,101,114,  0,114,101,
- 95, 97,108,105,103,110,  0,112,114,101,118,105,101,119,  0,116,101,120,116,117,114,101, 95, 99,111,110,116,101,120,116,  0,112,
- 97,116,104,102,108, 97,103,  0,100, 97,116, 97,105, 99,111,110,  0, 42,112,105,110,105,100,  0, 42,116,101,120,117,115,101,114,
-  0,114,101,110,100,101,114, 95,115,105,122,101,  0, 99,104, 97,110,115,104,111,119,110,  0,122,101, 98,114, 97,  0,122,111,111,
-109,  0,116,105,116,108,101, 91, 51, 50, 93,  0,100,105,114, 91, 49, 48, 53, 54, 93,  0,102,105,108,101, 91, 50, 53, 54, 93,  0,
-114,101,110, 97,109,101,102,105,108,101, 91, 50, 53, 54, 93,  0,114,101,110, 97,109,101,101,100,105,116, 91, 50, 53, 54, 93,  0,
-102,105,108,116,101,114, 95,103,108,111, 98, 91, 54, 52, 93,  0, 97, 99,116,105,118,101, 95,102,105,108,101,  0,115,101,108, 95,
-102,105,114,115,116,  0,115,101,108, 95,108, 97,115,116,  0,115,111,114,116,  0,100,105,115,112,108, 97,121,  0,102, 95,102,112,
-  0,102,112, 95,115,116,114, 91, 56, 93,  0,115, 99,114,111,108,108, 95,111,102,102,115,101,116,  0, 42,112, 97,114, 97,109,115,
-  0, 42,102,105,108,101,115,  0, 42,102,111,108,100,101,114,115, 95,112,114,101,118,  0, 42,102,111,108,100,101,114,115, 95,110,
-101,120,116,  0, 42,111,112,  0, 42,115,109,111,111,116,104,115, 99,114,111,108,108, 95,116,105,109,101,114,  0, 42,108, 97,121,
-111,117,116,  0,114,101, 99,101,110,116,110,114,  0, 98,111,111,107,109, 97,114,107,110,114,  0,115,121,115,116,101,109,110,114,
-  0,116,114,101,101,  0, 42,116,114,101,101,115,116,111,114,101,  0,115,101, 97,114, 99,104, 95,115,116,114,105,110,103, 91, 51,
- 50, 93,  0,115,101, 97,114, 99,104, 95,116,115,101,  0,111,117,116,108,105,110,101,118,105,115,  0,115,116,111,114,101,102,108,
- 97,103,  0,115,101, 97,114, 99,104, 95,102,108, 97,103,115,  0, 42, 99,117,109, 97,112,  0,115, 99,111,112,101,115,  0,115, 97,
-109,112,108,101, 95,108,105,110,101, 95,104,105,115,116,  0, 99,117,114,115,111,114, 91, 50, 93,  0, 99,101,110,116,120,  0, 99,
-101,110,116,121,  0, 99,117,114,116,105,108,101,  0,108,111, 99,107,  0,112,105,110,  0,100,116, 95,117,118,  0,115,116,105, 99,
-107,121,  0,100,116, 95,117,118,115,116,114,101,116, 99,104,  0, 42,116,101,120,116,  0,116,111,112,  0,118,105,101,119,108,105,
-110,101,115,  0,109,101,110,117,110,114,  0,108,104,101,105,103,104,116,  0, 99,119,105,100,116,104,  0,108,105,110,101,110,114,
-115, 95,116,111,116,  0,108,101,102,116,  0,115,104,111,119,108,105,110,101,110,114,115,  0,116, 97, 98,110,117,109, 98,101,114,
-  0,115,104,111,119,115,121,110,116, 97,120,  0,108,105,110,101, 95,104,108,105,103,104,116,  0,111,118,101,114,119,114,105,116,
-101,  0,108,105,118,101, 95,101,100,105,116,  0,112,105,120, 95,112,101,114, 95,108,105,110,101,  0,116,120,116,115, 99,114,111,
-108,108,  0,116,120,116, 98, 97,114,  0,119,111,114,100,119,114, 97,112,  0,100,111,112,108,117,103,105,110,115,  0,102,105,110,
-100,115,116,114, 91, 50, 53, 54, 93,  0,114,101,112,108, 97, 99,101,115,116,114, 91, 50, 53, 54, 93,  0,109, 97,114,103,105,110,
- 95, 99,111,108,117,109,110,  0, 42,100,114, 97,119, 99, 97, 99,104,101,  0, 42,112,121, 95,100,114, 97,119,  0, 42,112,121, 95,
-101,118,101,110,116,  0, 42,112,121, 95, 98,117,116,116,111,110,  0, 42,112,121, 95, 98,114,111,119,115,101,114, 99, 97,108,108,
- 98, 97, 99,107,  0, 42,112,121, 95,103,108,111, 98, 97,108,100,105, 99,116,  0,108, 97,115,116,115,112, 97, 99,101,  0,115, 99,
-114,105,112,116,110, 97,109,101, 91, 49, 48, 50, 52, 93,  0,115, 99,114,105,112,116, 97,114,103, 91, 50, 53, 54, 93,  0, 42,115,
- 99,114,105,112,116,  0, 42, 98,117,116, 95,114,101,102,115,  0, 42, 97,114,114, 97,121,  0, 99, 97, 99,104,101,115,  0, 99, 97,
- 99,104,101, 95,100,105,115,112,108, 97,121,  0, 42,105,100,  0, 97,115,112,101, 99,116,  0,112, 97,100,102,  0,109,120,  0,109,
-121,  0, 42,101,100,105,116,116,114,101,101,  0,116,114,101,101,116,121,112,101,  0,116,101,120,102,114,111,109,  0,115,104, 97,
-100,101,114,102,114,111,109,  0,108,105,110,107,100,114, 97,103,  0,108,101,110, 95, 97,108,108,111, 99,  0, 99,117,114,115,111,
-114,  0,115, 99,114,111,108,108, 98, 97, 99,107,  0,104,105,115,116,111,114,121,  0,112,114,111,109,112,116, 91, 50, 53, 54, 93,
-  0,108, 97,110,103,117, 97,103,101, 91, 51, 50, 93,  0,115,101,108, 95,115,116, 97,114,116,  0,115,101,108, 95,101,110,100,  0,
-102,105,108,116,101,114, 91, 54, 52, 93,  0,120,108,111, 99,107,111,102,  0,121,108,111, 99,107,111,102,  0,117,115,101,114,  0,
-112, 97,116,104, 95,108,101,110,103,116,104,  0,108,111, 99, 91, 50, 93,  0,115,116, 97, 98,109, 97,116, 91, 52, 93, 91, 52, 93,
-  0,117,110,105,115,116, 97, 98,109, 97,116, 91, 52, 93, 91, 52, 93,  0,112,111,115,116,112,114,111, 99, 95,102,108, 97,103,  0,
- 42,100,114, 97,119, 95, 99,111,110,116,101,120,116,  0,100,111,112,101, 95,115,111,114,116,  0,100,111,112,101, 95,102,108, 97,
-103,  0,102,105,108,101,110, 97,109,101, 91, 49, 48, 50, 52, 93,  0, 98,108,102, 95,105,100,  0,117,105,102,111,110,116, 95,105,
-100,  0,114, 95,116,111, 95,108,  0,112,111,105,110,116,115,  0,107,101,114,110,105,110,103,  0,105,116, 97,108,105, 99,  0, 98,
-111,108,100,  0,115,104, 97,100,111,119,  0,115,104, 97,100,120,  0,115,104, 97,100,121,  0,115,104, 97,100,111,119, 97,108,112,
-104, 97,  0,115,104, 97,100,111,119, 99,111,108,111,114,  0,112, 97,110,101,108,116,105,116,108,101,  0,103,114,111,117,112,108,
- 97, 98,101,108,  0,119,105,100,103,101,116,108, 97, 98,101,108,  0,119,105,100,103,101,116,  0,112, 97,110,101,108,122,111,111,
-109,  0,109,105,110,108, 97, 98,101,108, 99,104, 97,114,115,  0,109,105,110,119,105,100,103,101,116, 99,104, 97,114,115,  0, 99,
-111,108,117,109,110,115,112, 97, 99,101,  0,116,101,109,112,108, 97,116,101,115,112, 97, 99,101,  0, 98,111,120,115,112, 97, 99,
-101,  0, 98,117,116,116,111,110,115,112, 97, 99,101,120,  0, 98,117,116,116,111,110,115,112, 97, 99,101,121,  0,112, 97,110,101,
-108,115,112, 97, 99,101,  0,112, 97,110,101,108,111,117,116,101,114,  0,111,117,116,108,105,110,101, 91, 52, 93,  0,105,110,110,
-101,114, 91, 52, 93,  0,105,110,110,101,114, 95,115,101,108, 91, 52, 93,  0,105,116,101,109, 91, 52, 93,  0,116,101,120,116, 91,
- 52, 93,  0,116,101,120,116, 95,115,101,108, 91, 52, 93,  0,115,104, 97,100,101,100,  0,115,104, 97,100,101,116,111,112,  0,115,
-104, 97,100,101,100,111,119,110,  0, 97,108,112,104, 97, 95, 99,104,101, 99,107,  0,105,110,110,101,114, 95, 97,110,105,109, 91,
- 52, 93,  0,105,110,110,101,114, 95, 97,110,105,109, 95,115,101,108, 91, 52, 93,  0,105,110,110,101,114, 95,107,101,121, 91, 52,
- 93,  0,105,110,110,101,114, 95,107,101,121, 95,115,101,108, 91, 52, 93,  0,105,110,110,101,114, 95,100,114,105,118,101,110, 91,
- 52, 93,  0,105,110,110,101,114, 95,100,114,105,118,101,110, 95,115,101,108, 91, 52, 93,  0,104,101, 97,100,101,114, 91, 52, 93,
-  0,115,104,111,119, 95,104,101, 97,100,101,114,  0,119, 99,111,108, 95,114,101,103,117,108, 97,114,  0,119, 99,111,108, 95,116,
-111,111,108,  0,119, 99,111,108, 95,116,101,120,116,  0,119, 99,111,108, 95,114, 97,100,105,111,  0,119, 99,111,108, 95,111,112,
-116,105,111,110,  0,119, 99,111,108, 95,116,111,103,103,108,101,  0,119, 99,111,108, 95,110,117,109,  0,119, 99,111,108, 95,110,
-117,109,115,108,105,100,101,114,  0,119, 99,111,108, 95,109,101,110,117,  0,119, 99,111,108, 95,112,117,108,108,100,111,119,110,
-  0,119, 99,111,108, 95,109,101,110,117, 95, 98, 97, 99,107,  0,119, 99,111,108, 95,109,101,110,117, 95,105,116,101,109,  0,119,
- 99,111,108, 95,116,111,111,108,116,105,112,  0,119, 99,111,108, 95, 98,111,120,  0,119, 99,111,108, 95,115, 99,114,111,108,108,
-  0,119, 99,111,108, 95,112,114,111,103,114,101,115,115,  0,119, 99,111,108, 95,108,105,115,116, 95,105,116,101,109,  0,119, 99,
-111,108, 95,115,116, 97,116,101,  0,112, 97,110,101,108,  0,105, 99,111,110,102,105,108,101, 91, 50, 53, 54, 93,  0,105, 99,111,
-110, 95, 97,108,112,104, 97,  0, 98, 97, 99,107, 91, 52, 93,  0,116,105,116,108,101, 91, 52, 93,  0,116,101,120,116, 95,104,105,
- 91, 52, 93,  0,104,101, 97,100,101,114, 95,116,105,116,108,101, 91, 52, 93,  0,104,101, 97,100,101,114, 95,116,101,120,116, 91,
- 52, 93,  0,104,101, 97,100,101,114, 95,116,101,120,116, 95,104,105, 91, 52, 93,  0, 98,117,116,116,111,110, 91, 52, 93,  0, 98,
-117,116,116,111,110, 95,116,105,116,108,101, 91, 52, 93,  0, 98,117,116,116,111,110, 95,116,101,120,116, 91, 52, 93,  0, 98,117,
-116,116,111,110, 95,116,101,120,116, 95,104,105, 91, 52, 93,  0,108,105,115,116, 91, 52, 93,  0,108,105,115,116, 95,116,105,116,
-108,101, 91, 52, 93,  0,108,105,115,116, 95,116,101,120,116, 91, 52, 93,  0,108,105,115,116, 95,116,101,120,116, 95,104,105, 91,
- 52, 93,  0,112, 97,110,101,108, 91, 52, 93,  0,112, 97,110,101,108, 95,116,105,116,108,101, 91, 52, 93,  0,112, 97,110,101,108,
- 95,116,101,120,116, 91, 52, 93,  0,112, 97,110,101,108, 95,116,101,120,116, 95,104,105, 91, 52, 93,  0,115,104, 97,100,101, 49,
- 91, 52, 93,  0,115,104, 97,100,101, 50, 91, 52, 93,  0,104,105,108,105,116,101, 91, 52, 93,  0,103,114,105,100, 91, 52, 93,  0,
-119,105,114,101, 91, 52, 93,  0,115,101,108,101, 99,116, 91, 52, 93,  0,108, 97,109,112, 91, 52, 93,  0,115,112,101, 97,107,101,
-114, 91, 52, 93,  0,101,109,112,116,121, 91, 52, 93,  0, 99, 97,109,101,114, 97, 91, 52, 93,  0,112, 97,100, 91, 56, 93,  0, 97,
- 99,116,105,118,101, 91, 52, 93,  0,103,114,111,117,112, 91, 52, 93,  0,103,114,111,117,112, 95, 97, 99,116,105,118,101, 91, 52,
- 93,  0,116,114, 97,110,115,102,111,114,109, 91, 52, 93,  0,118,101,114,116,101,120, 91, 52, 93,  0,118,101,114,116,101,120, 95,
-115,101,108,101, 99,116, 91, 52, 93,  0,101,100,103,101, 91, 52, 93,  0,101,100,103,101, 95,115,101,108,101, 99,116, 91, 52, 93,
-  0,101,100,103,101, 95,115,101, 97,109, 91, 52, 93,  0,101,100,103,101, 95,115,104, 97,114,112, 91, 52, 93,  0,101,100,103,101,
- 95,102, 97, 99,101,115,101,108, 91, 52, 93,  0,101,100,103,101, 95, 99,114,101, 97,115,101, 91, 52, 93,  0,102, 97, 99,101, 91,
- 52, 93,  0,102, 97, 99,101, 95,115,101,108,101, 99,116, 91, 52, 93,  0,102, 97, 99,101, 95,100,111,116, 91, 52, 93,  0,101,120,
-116,114, 97, 95,101,100,103,101, 95,108,101,110, 91, 52, 93,  0,101,120,116,114, 97, 95,102, 97, 99,101, 95, 97,110,103,108,101,
- 91, 52, 93,  0,101,120,116,114, 97, 95,102, 97, 99,101, 95, 97,114,101, 97, 91, 52, 93,  0,112, 97,100, 51, 91, 52, 93,  0,110,
-111,114,109, 97,108, 91, 52, 93,  0,118,101,114,116,101,120, 95,110,111,114,109, 97,108, 91, 52, 93,  0, 98,111,110,101, 95,115,
-111,108,105,100, 91, 52, 93,  0, 98,111,110,101, 95,112,111,115,101, 91, 52, 93,  0,115,116,114,105,112, 91, 52, 93,  0,115,116,
-114,105,112, 95,115,101,108,101, 99,116, 91, 52, 93,  0, 99,102,114, 97,109,101, 91, 52, 93,  0,110,117,114, 98, 95,117,108,105,
-110,101, 91, 52, 93,  0,110,117,114, 98, 95,118,108,105,110,101, 91, 52, 93,  0, 97, 99,116, 95,115,112,108,105,110,101, 91, 52,
- 93,  0,110,117,114, 98, 95,115,101,108, 95,117,108,105,110,101, 91, 52, 93,  0,110,117,114, 98, 95,115,101,108, 95,118,108,105,
-110,101, 91, 52, 93,  0,108, 97,115,116,115,101,108, 95,112,111,105,110,116, 91, 52, 93,  0,104, 97,110,100,108,101, 95,102,114,
-101,101, 91, 52, 93,  0,104, 97,110,100,108,101, 95, 97,117,116,111, 91, 52, 93,  0,104, 97,110,100,108,101, 95,118,101, 99,116,
- 91, 52, 93,  0,104, 97,110,100,108,101, 95, 97,108,105,103,110, 91, 52, 93,  0,104, 97,110,100,108,101, 95, 97,117,116,111, 95,
- 99,108, 97,109,112,101,100, 91, 52, 93,  0,104, 97,110,100,108,101, 95,115,101,108, 95,102,114,101,101, 91, 52, 93,  0,104, 97,
-110,100,108,101, 95,115,101,108, 95, 97,117,116,111, 91, 52, 93,  0,104, 97,110,100,108,101, 95,115,101,108, 95,118,101, 99,116,
- 91, 52, 93,  0,104, 97,110,100,108,101, 95,115,101,108, 95, 97,108,105,103,110, 91, 52, 93,  0,104, 97,110,100,108,101, 95,115,
-101,108, 95, 97,117,116,111, 95, 99,108, 97,109,112,101,100, 91, 52, 93,  0,100,115, 95, 99,104, 97,110,110,101,108, 91, 52, 93,
-  0,100,115, 95,115,117, 98, 99,104, 97,110,110,101,108, 91, 52, 93,  0, 99,111,110,115,111,108,101, 95,111,117,116,112,117,116,
- 91, 52, 93,  0, 99,111,110,115,111,108,101, 95,105,110,112,117,116, 91, 52, 93,  0, 99,111,110,115,111,108,101, 95,105,110,102,
-111, 91, 52, 93,  0, 99,111,110,115,111,108,101, 95,101,114,114,111,114, 91, 52, 93,  0, 99,111,110,115,111,108,101, 95, 99,117,
-114,115,111,114, 91, 52, 93,  0,118,101,114,116,101,120, 95,115,105,122,101,  0,111,117,116,108,105,110,101, 95,119,105,100,116,
-104,  0,102, 97, 99,101,100,111,116, 95,115,105,122,101,  0,110,111,111,100,108,101, 95, 99,117,114,118,105,110,103,  0,115,121,
-110,116, 97,120,108, 91, 52, 93,  0,115,121,110,116, 97,120,110, 91, 52, 93,  0,115,121,110,116, 97,120, 98, 91, 52, 93,  0,115,
-121,110,116, 97,120,118, 91, 52, 93,  0,115,121,110,116, 97,120, 99, 91, 52, 93,  0,109,111,118,105,101, 91, 52, 93,  0,109,111,
-118,105,101, 99,108,105,112, 91, 52, 93,  0,105,109, 97,103,101, 91, 52, 93,  0,115, 99,101,110,101, 91, 52, 93,  0, 97,117,100,
-105,111, 91, 52, 93,  0,101,102,102,101, 99,116, 91, 52, 93,  0,112,108,117,103,105,110, 91, 52, 93,  0,116,114, 97,110,115,105,
-116,105,111,110, 91, 52, 93,  0,109,101,116, 97, 91, 52, 93,  0,101,100,105,116,109,101,115,104, 95, 97, 99,116,105,118,101, 91,
- 52, 93,  0,104, 97,110,100,108,101, 95,118,101,114,116,101,120, 91, 52, 93,  0,104, 97,110,100,108,101, 95,118,101,114,116,101,
-120, 95,115,101,108,101, 99,116, 91, 52, 93,  0,104, 97,110,100,108,101, 95,118,101,114,116,101,120, 95,115,105,122,101,  0,109,
- 97,114,107,101,114, 95,111,117,116,108,105,110,101, 91, 52, 93,  0,109, 97,114,107,101,114, 91, 52, 93,  0, 97, 99,116, 95,109,
- 97,114,107,101,114, 91, 52, 93,  0,115,101,108, 95,109, 97,114,107,101,114, 91, 52, 93,  0,100,105,115, 95,109, 97,114,107,101,
-114, 91, 52, 93,  0,108,111, 99,107, 95,109, 97,114,107,101,114, 91, 52, 93,  0, 98,117,110,100,108,101, 95,115,111,108,105,100,
- 91, 52, 93,  0,112, 97,116,104, 95, 98,101,102,111,114,101, 91, 52, 93,  0,112, 97,116,104, 95, 97,102,116,101,114, 91, 52, 93,
-  0, 99, 97,109,101,114, 97, 95,112, 97,116,104, 91, 52, 93,  0,104,112, 97,100, 91, 55, 93,  0,112,114,101,118,105,101,119, 95,
- 98, 97, 99,107, 91, 52, 93,  0,112,114,101,118,105,101,119, 95,115,116,105,116, 99,104, 95,102, 97, 99,101, 91, 52, 93,  0,112,
-114,101,118,105,101,119, 95,115,116,105,116, 99,104, 95,101,100,103,101, 91, 52, 93,  0,112,114,101,118,105,101,119, 95,115,116,
-105,116, 99,104, 95,118,101,114,116, 91, 52, 93,  0,112,114,101,118,105,101,119, 95,115,116,105,116, 99,104, 95,115,116,105,116,
- 99,104, 97, 98,108,101, 91, 52, 93,  0,112,114,101,118,105,101,119, 95,115,116,105,116, 99,104, 95,117,110,115,116,105,116, 99,
-104, 97, 98,108,101, 91, 52, 93,  0,112,114,101,118,105,101,119, 95,115,116,105,116, 99,104, 95, 97, 99,116,105,118,101, 91, 52,
- 93,  0,109, 97,116, 99,104, 91, 52, 93,  0,115,101,108,101, 99,116,101,100, 95,104,105,103,104,108,105,103,104,116, 91, 52, 93,
-  0,115,111,108,105,100, 91, 52, 93,  0,116,117,105,  0,116, 98,117,116,115,  0,116,118, 51,100,  0,116,102,105,108,101,  0,116,
-105,112,111,  0,116,105,110,102,111,  0,116, 97, 99,116,  0,116,110,108, 97,  0,116,115,101,113,  0,116,105,109, 97,  0,116,101,
-120,116,  0,116,111,111,112,115,  0,116,116,105,109,101,  0,116,110,111,100,101,  0,116,108,111,103,105, 99,  0,116,117,115,101,
-114,112,114,101,102,  0,116, 99,111,110,115,111,108,101,  0,116, 99,108,105,112,  0,116, 97,114,109, 91, 50, 48, 93,  0, 97, 99,
-116,105,118,101, 95,116,104,101,109,101, 95, 97,114,101, 97,  0,109,111,100,117,108,101, 91, 54, 52, 93,  0,115,112,101, 99, 91,
- 52, 93,  0,100,117,112,102,108, 97,103,  0,115, 97,118,101,116,105,109,101,  0,116,101,109,112,100,105,114, 91, 55, 54, 56, 93,
-  0,102,111,110,116,100,105,114, 91, 55, 54, 56, 93,  0,114,101,110,100,101,114,100,105,114, 91, 49, 48, 50, 52, 93,  0,116,101,
-120,116,117,100,105,114, 91, 55, 54, 56, 93,  0,112,108,117,103,116,101,120,100,105,114, 91, 55, 54, 56, 93,  0,112,108,117,103,
-115,101,113,100,105,114, 91, 55, 54, 56, 93,  0,112,121,116,104,111,110,100,105,114, 91, 55, 54, 56, 93,  0,115,111,117,110,100,
-100,105,114, 91, 55, 54, 56, 93,  0,105,109, 97,103,101, 95,101,100,105,116,111,114, 91, 49, 48, 50, 52, 93,  0, 97,110,105,109,
- 95,112,108, 97,121,101,114, 91, 49, 48, 50, 52, 93,  0, 97,110,105,109, 95,112,108, 97,121,101,114, 95,112,114,101,115,101,116,
-  0,118, 50,100, 95,109,105,110, 95,103,114,105,100,115,105,122,101,  0,116,105,109,101, 99,111,100,101, 95,115,116,121,108,101,
-  0,118,101,114,115,105,111,110,115,  0,100, 98,108, 95, 99,108,105, 99,107, 95,116,105,109,101,  0,103, 97,109,101,102,108, 97,
-103,115,  0,119,104,101,101,108,108,105,110,101,115, 99,114,111,108,108,  0,117,105,102,108, 97,103,  0,108, 97,110,103,117, 97,
-103,101,  0,117,115,101,114,112,114,101,102,  0,118,105,101,119,122,111,111,109,  0,109,105,120, 98,117,102,115,105,122,101,  0,
- 97,117,100,105,111,100,101,118,105, 99,101,  0, 97,117,100,105,111,114, 97,116,101,  0, 97,117,100,105,111,102,111,114,109, 97,
-116,  0, 97,117,100,105,111, 99,104, 97,110,110,101,108,115,  0,100,112,105,  0,101,110, 99,111,100,105,110,103,  0,116,114, 97,
-110,115,111,112,116,115,  0,109,101,110,117,116,104,114,101,115,104,111,108,100, 49,  0,109,101,110,117,116,104,114,101,115,104,
-111,108,100, 50,  0,116,104,101,109,101,115,  0,117,105,102,111,110,116,115,  0,117,105,115,116,121,108,101,115,  0,107,101,121,
-109, 97,112,115,  0,117,115,101,114, 95,107,101,121,109, 97,112,115,  0, 97,100,100,111,110,115,  0,107,101,121, 99,111,110,102,
-105,103,115,116,114, 91, 54, 52, 93,  0,117,110,100,111,115,116,101,112,115,  0,117,110,100,111,109,101,109,111,114,121,  0,103,
-112, 95,109, 97,110,104, 97,116,116,101,110,100,105,115,116,  0,103,112, 95,101,117, 99,108,105,100,101, 97,110,100,105,115,116,
-  0,103,112, 95,101,114, 97,115,101,114,  0,103,112, 95,115,101,116,116,105,110,103,115,  0,116, 98, 95,108,101,102,116,109,111,
-117,115,101,  0,116, 98, 95,114,105,103,104,116,109,111,117,115,101,  0,108,105,103,104,116, 91, 51, 93,  0,116,119, 95,104,111,
-116,115,112,111,116,  0,116,119, 95,102,108, 97,103,  0,116,119, 95,104, 97,110,100,108,101,115,105,122,101,  0,116,119, 95,115,
-105,122,101,  0,116,101,120,116,105,109,101,111,117,116,  0,116,101,120, 99,111,108,108,101, 99,116,114, 97,116,101,  0,119,109,
-100,114, 97,119,109,101,116,104,111,100,  0,100,114, 97,103,116,104,114,101,115,104,111,108,100,  0,109,101,109, 99, 97, 99,104,
-101,108,105,109,105,116,  0,112,114,101,102,101,116, 99,104,102,114, 97,109,101,115,  0,102,114, 97,109,101,115,101,114,118,101,
-114,112,111,114,116,  0,112, 97,100, 95,114,111,116, 95, 97,110,103,108,101,  0,111, 98, 99,101,110,116,101,114, 95,100,105, 97,
-  0,114,118,105,115,105,122,101,  0,114,118,105, 98,114,105,103,104,116,  0,114,101, 99,101,110,116, 95,102,105,108,101,115,  0,
-115,109,111,111,116,104, 95,118,105,101,119,116,120,  0,103,108,114,101,115,108,105,109,105,116,  0, 99,117,114,115,115,105,122,
-101,  0, 99,111,108,111,114, 95,112,105, 99,107,101,114, 95,116,121,112,101,  0,105,112,111, 95,110,101,119,  0,107,101,121,104,
- 97,110,100,108,101,115, 95,110,101,119,  0,115, 99,114, 99, 97,115,116,102,112,115,  0,115, 99,114, 99, 97,115,116,119, 97,105,
-116,  0,119,105,100,103,101,116, 95,117,110,105,116,  0, 97,110,105,115,111,116,114,111,112,105, 99, 95,102,105,108,116,101,114,
-  0,117,115,101, 95, 49, 54, 98,105,116, 95,116,101,120,116,117,114,101,115,  0,112, 97,100, 56,  0,110,100,111,102, 95,115,101,
-110,115,105,116,105,118,105,116,121,  0,110,100,111,102, 95,102,108, 97,103,  0,103,108, 97,108,112,104, 97, 99,108,105,112,  0,
-116,101,120,116, 95,114,101,110,100,101,114,  0,112, 97,100, 57,  0, 99,111, 98, 97, 95,119,101,105,103,104,116,  0,115, 99,117,
-108,112,116, 95,112, 97,105,110,116, 95,111,118,101,114,108, 97,121, 95, 99,111,108, 91, 51, 93,  0,116,119,101, 97,107, 95,116,
-104,114,101,115,104,111,108,100,  0, 97,117,116,104,111,114, 91, 56, 48, 93,  0, 99,111,109,112,117,116,101, 95,100,101,118,105,
- 99,101, 95,116,121,112,101,  0, 99,111,109,112,117,116,101, 95,100,101,118,105, 99,101, 95,105,100,  0,102, 99,117, 95,105,110,
- 97, 99,116,105,118,101, 95, 97,108,112,104, 97,  0,118,101,114,116, 98, 97,115,101,  0,101,100,103,101, 98, 97,115,101,  0, 97,
-114,101, 97, 98, 97,115,101,  0, 42,110,101,119,115, 99,101,110,101,  0,114,101,100,114, 97,119,115, 95,102,108, 97,103,  0,102,
-117,108,108,  0,116,101,109,112,  0,119,105,110,105,100,  0,100,111, 95,100,114, 97,119,  0,100,111, 95,114,101,102,114,101,115,
-104,  0,100,111, 95,100,114, 97,119, 95,103,101,115,116,117,114,101,  0,100,111, 95,100,114, 97,119, 95,112, 97,105,110,116, 99,
-117,114,115,111,114,  0,100,111, 95,100,114, 97,119, 95,100,114, 97,103,  0,115,119, 97,112,  0,109, 97,105,110,119,105,110,  0,
-115,117, 98,119,105,110, 97, 99,116,105,118,101,  0, 42, 97,110,105,109,116,105,109,101,114,  0, 42, 99,111,110,116,101,120,116,
-  0,104, 97,110,100,108,101,114, 91, 56, 93,  0, 42,110,101,119,118,  0,118,101, 99,  0, 42,118, 49,  0, 42,118, 50,  0, 42,116,
-121,112,101,  0,112, 97,110,101,108,110, 97,109,101, 91, 54, 52, 93,  0,116, 97, 98,110, 97,109,101, 91, 54, 52, 93,  0,100,114,
- 97,119,110, 97,109,101, 91, 54, 52, 93,  0,111,102,115,120,  0,111,102,115,121,  0,115,105,122,101,120,  0,115,105,122,101,121,
-  0,108, 97, 98,101,108,111,102,115,  0,114,117,110,116,105,109,101, 95,102,108, 97,103,  0, 99,111,110,116,114,111,108,  0,115,
-110, 97,112,  0,115,111,114,116,111,114,100,101,114,  0, 42,112, 97,110,101,108,116, 97, 98,  0, 42, 97, 99,116,105,118,101,100,
- 97,116, 97,  0,108,105,115,116, 95,115, 99,114,111,108,108,  0,108,105,115,116, 95,115,105,122,101,  0,108,105,115,116, 95,108,
- 97,115,116, 95,108,101,110,  0,108,105,115,116, 95,103,114,105,112, 95,115,105,122,101,  0,108,105,115,116, 95,115,101, 97,114,
- 99,104, 91, 54, 52, 93,  0, 42,118, 51,  0, 42,118, 52,  0, 42,102,117,108,108,  0, 98,117,116,115,112, 97, 99,101,116,121,112,
-101,  0,104,101, 97,100,101,114,116,121,112,101,  0,115,112, 97, 99,101,100, 97,116, 97,  0,104, 97,110,100,108,101,114,115,  0,
- 97, 99,116,105,111,110,122,111,110,101,115,  0,119,105,110,114, 99,116,  0,100,114, 97,119,114, 99,116,  0,115,119,105,110,105,
-100,  0,114,101,103,105,111,110,116,121,112,101,  0, 97,108,105,103,110,109,101,110,116,  0,100,111, 95,100,114, 97,119, 95,111,
-118,101,114,108, 97,121,  0,117,105, 98,108,111, 99,107,115,  0,112, 97,110,101,108,115,  0, 42,104,101, 97,100,101,114,115,116,
-114,  0, 42,114,101,103,105,111,110,100, 97,116, 97,  0,115,117, 98,118,115,116,114, 91, 52, 93,  0,115,117, 98,118,101,114,115,
-105,111,110,  0,112, 97,100,115,  0,109,105,110,118,101,114,115,105,111,110,  0,109,105,110,115,117, 98,118,101,114,115,105,111,
-110,  0,119,105,110,112,111,115,  0, 42, 99,117,114,115, 99,114,101,101,110,  0, 42, 99,117,114,115, 99,101,110,101,  0,102,105,
-108,101,102,108, 97,103,115,  0,103,108,111, 98, 97,108,102,  0,114,101,118,105,115,105,111,110,  0,110, 97,109,101, 91, 50, 53,
- 54, 93,  0,111,114,105,103, 95,119,105,100,116,104,  0,111,114,105,103, 95,104,101,105,103,104,116,  0, 98,111,116,116,111,109,
-  0,114,105,103,104,116,  0,120,111,102,115,  0,121,111,102,115,  0,108,105,102,116, 91, 51, 93,  0,103, 97,109,109, 97, 91, 51,
- 93,  0,103, 97,105,110, 91, 51, 93,  0,100,105,114, 91, 55, 54, 56, 93,  0,116, 99,  0, 98,117,105,108,100, 95,115,105,122,101,
- 95,102,108, 97,103,115,  0, 98,117,105,108,100, 95,116, 99, 95,102,108, 97,103,115,  0,100,111,110,101,  0,115,116, 97,114,116,
-115,116,105,108,108,  0,101,110,100,115,116,105,108,108,  0, 42,115,116,114,105,112,100, 97,116, 97,  0, 42, 99,114,111,112,  0,
- 42,116,114, 97,110,115,102,111,114,109,  0, 42, 99,111,108,111,114, 95, 98, 97,108, 97,110, 99,101,  0, 42,105,110,115,116, 97,
-110, 99,101, 95,112,114,105,118, 97,116,101, 95,100, 97,116, 97,  0, 42, 42, 99,117,114,114,101,110,116, 95,112,114,105,118, 97,
-116,101, 95,100, 97,116, 97,  0, 42,116,109,112,  0,115,116, 97,114,116,111,102,115,  0,101,110,100,111,102,115,  0,109, 97, 99,
-104,105,110,101,  0,115,116, 97,114,116,100,105,115,112,  0,101,110,100,100,105,115,112,  0,115, 97,116,  0,109,117,108,  0,104,
- 97,110,100,115,105,122,101,  0, 97,110,105,109, 95,112,114,101,115,101,101,107,  0,115,116,114,101, 97,109,105,110,100,101,120,
-  0,109,117,108,116,105, 99, 97,109, 95,115,111,117,114, 99,101,  0, 99,108,105,112, 95,102,108, 97,103,  0, 42,115,116,114,105,
-112,  0, 42,115, 99,101,110,101, 95, 99, 97,109,101,114, 97,  0,101,102,102,101, 99,116, 95,102, 97,100,101,114,  0,115,112,101,
-101,100, 95,102, 97,100,101,114,  0, 42,115,101,113, 49,  0, 42,115,101,113, 50,  0, 42,115,101,113, 51,  0,115,101,113, 98, 97,
-115,101,  0, 42,115,111,117,110,100,  0, 42,115, 99,101,110,101, 95,115,111,117,110,100,  0,112,105,116, 99,104,  0,112, 97,110,
-  0,115,116,114,111, 98,101,  0, 42,101,102,102,101, 99,116,100, 97,116, 97,  0, 97,110,105,109, 95,115,116, 97,114,116,111,102,
-115,  0, 97,110,105,109, 95,101,110,100,111,102,115,  0, 98,108,101,110,100, 95,109,111,100,101,  0, 98,108,101,110,100, 95,111,
-112, 97, 99,105,116,121,  0, 42,111,108,100, 98, 97,115,101,112,  0, 42,112, 97,114,115,101,113,  0, 42,115,101,113, 98, 97,115,
-101,112,  0,109,101,116, 97,115,116, 97, 99,107,  0, 42, 97, 99,116, 95,115,101,113,  0, 97, 99,116, 95,105,109, 97,103,101,100,
-105,114, 91, 49, 48, 50, 52, 93,  0, 97, 99,116, 95,115,111,117,110,100,100,105,114, 91, 49, 48, 50, 52, 93,  0,111,118,101,114,
- 95,111,102,115,  0,111,118,101,114, 95, 99,102,114, 97,  0,111,118,101,114, 95,102,108, 97,103,  0,111,118,101,114, 95, 98,111,
-114,100,101,114,  0,101,100,103,101, 87,105,100,116,104,  0,102,111,114,119, 97,114,100,  0,119,105,112,101,116,121,112,101,  0,
-102, 77,105,110,105,  0,102, 67,108, 97,109,112,  0,102, 66,111,111,115,116,  0,100, 68,105,115,116,  0,100, 81,117, 97,108,105,
-116,121,  0, 98, 78,111, 67,111,109,112,  0, 83, 99, 97,108,101,120, 73,110,105,  0, 83, 99, 97,108,101,121, 73,110,105,  0,120,
- 73,110,105,  0,121, 73,110,105,  0,114,111,116, 73,110,105,  0,105,110,116,101,114,112,111,108, 97,116,105,111,110,  0,117,110,
-105,102,111,114,109, 95,115, 99, 97,108,101,  0, 42,102,114, 97,109,101, 77, 97,112,  0,103,108,111, 98, 97,108, 83,112,101,101,
-100,  0,108, 97,115,116, 86, 97,108,105,100, 70,114, 97,109,101,  0, 98,117,116,116,121,112,101,  0,117,115,101,114,106,105,116,
-  0,115,116, 97,  0,116,111,116,112, 97,114,116,  0,110,111,114,109,102, 97, 99,  0,111, 98,102, 97, 99,  0,114, 97,110,100,102,
- 97, 99,  0,116,101,120,102, 97, 99,  0,114, 97,110,100,108,105,102,101,  0,102,111,114, 99,101, 91, 51, 93,  0,118,101, 99,116,
-115,105,122,101,  0,109, 97,120,108,101,110,  0,100,101,102,118,101, 99, 91, 51, 93,  0,109,117,108,116, 91, 52, 93,  0,108,105,
-102,101, 91, 52, 93,  0, 99,104,105,108,100, 91, 52, 93,  0,109, 97,116, 91, 52, 93,  0,116,101,120,109, 97,112,  0, 99,117,114,
-109,117,108,116,  0,115,116, 97,116,105, 99,115,116,101,112,  0,111,109, 97,116,  0,116,105,109,101,116,101,120,  0,115,112,101,
-101,100,116,101,120,  0,102,108, 97,103, 50,110,101,103,  0,118,101,114,116,103,114,111,117,112, 95,118,  0,118,103,114,111,117,
-112,110, 97,109,101, 91, 54, 52, 93,  0,118,103,114,111,117,112,110, 97,109,101, 95,118, 91, 54, 52, 93,  0, 42,107,101,121,115,
-  0,109,105,110,102, 97, 99,  0,110,114,  0,117,115,101,100,  0,117,115,101,100,101,108,101,109,  0, 42,112,111,105,110,  0,114,
-101,115,101,116,100,105,115,116,  0,108, 97,115,116,118, 97,108,  0, 42,109, 97,  0,107,101,121,  0,113,117, 97,108,  0,113,117,
- 97,108, 50,  0,116, 97,114,103,101,116, 78, 97,109,101, 91, 54, 52, 93,  0,116,111,103,103,108,101, 78, 97,109,101, 91, 54, 52,
- 93,  0,118, 97,108,117,101, 91, 54, 52, 93,  0,109, 97,120,118, 97,108,117,101, 91, 54, 52, 93,  0,100,101,108, 97,121,  0,100,
-117,114, 97,116,105,111,110,  0,109, 97,116,101,114,105, 97,108, 78, 97,109,101, 91, 54, 52, 93,  0,100, 97,109,112,116,105,109,
-101,114,  0,112,114,111,112,110, 97,109,101, 91, 54, 52, 93,  0,109, 97,116,110, 97,109,101, 91, 54, 52, 93,  0, 97,120,105,115,
-102,108, 97,103,  0,112,111,115,101, 99,104, 97,110,110,101,108, 91, 54, 52, 93,  0, 99,111,110,115,116,114, 97,105,110,116, 91,
- 54, 52, 93,  0, 42,102,114,111,109, 79, 98,106,101, 99,116,  0,115,117, 98,106,101, 99,116, 91, 54, 52, 93,  0, 98,111,100,121,
- 91, 54, 52, 93,  0,111,116,121,112,101,  0,112,117,108,115,101,  0,102,114,101,113,  0,116,111,116,108,105,110,107,115,  0, 42,
- 42,108,105,110,107,115,  0,116, 97,112,  0,106,111,121,105,110,100,101,120,  0, 97,120,105,115, 95,115,105,110,103,108,101,  0,
- 97,120,105,115,102,  0, 98,117,116,116,111,110,  0,104, 97,116,  0,104, 97,116,102,  0,112,114,101, 99,105,115,105,111,110,  0,
-115,116,114, 91, 49, 50, 56, 93,  0, 42,109,121,110,101,119,  0,105,110,112,117,116,115,  0,116,111,116,115,108,105,110,107,115,
-  0, 42, 42,115,108,105,110,107,115,  0,118, 97,108,111,  0,115,116, 97,116,101, 95,109, 97,115,107,  0, 42, 97, 99,116,  0,102,
-114, 97,109,101, 80,114,111,112, 91, 54, 52, 93,  0, 98,108,101,110,100,105,110,  0,112,114,105,111,114,105,116,121,  0,101,110,
-100, 95,114,101,115,101,116,  0,115,116,114,105,100,101, 97,120,105,115,  0,115,116,114,105,100,101,108,101,110,103,116,104,  0,
-108, 97,121,101,114, 95,119,101,105,103,104,116,  0,109,105,110, 95,103, 97,105,110,  0,109, 97,120, 95,103, 97,105,110,  0,114,
-101,102,101,114,101,110, 99,101, 95,100,105,115,116, 97,110, 99,101,  0,109, 97,120, 95,100,105,115,116, 97,110, 99,101,  0,114,
-111,108,108,111,102,102, 95,102, 97, 99,116,111,114,  0, 99,111,110,101, 95,105,110,110,101,114, 95, 97,110,103,108,101,  0, 99,
-111,110,101, 95,111,117,116,101,114, 95, 97,110,103,108,101,  0, 99,111,110,101, 95,111,117,116,101,114, 95,103, 97,105,110,  0,
-115,110,100,110,114,  0,115,111,117,110,100, 51, 68,  0,112, 97,100, 54, 91, 49, 93,  0, 42,109,101,  0,108,105,110, 86,101,108,
-111, 99,105,116,121, 91, 51, 93,  0, 97,110,103, 86,101,108,111, 99,105,116,121, 91, 51, 93,  0,108,111, 99, 97,108,102,108, 97,
-103,  0,100,121,110, 95,111,112,101,114, 97,116,105,111,110,  0,102,111,114, 99,101,108,111, 99, 91, 51, 93,  0,102,111,114, 99,
-101,114,111,116, 91, 51, 93,  0,112, 97,100, 49, 91, 51, 93,  0,108,105,110,101, 97,114,118,101,108,111, 99,105,116,121, 91, 51,
- 93,  0, 97,110,103,117,108, 97,114,118,101,108,111, 99,105,116,121, 91, 51, 93,  0, 42,114,101,102,101,114,101,110, 99,101,  0,
-109,105,110,  0,109, 97,120,  0,114,111,116,100, 97,109,112,  0,109,105,110,108,111, 99, 91, 51, 93,  0,109, 97,120,108,111, 99,
- 91, 51, 93,  0,109,105,110,114,111,116, 91, 51, 93,  0,109, 97,120,114,111,116, 91, 51, 93,  0,109, 97,116,112,114,111,112, 91,
- 54, 52, 93,  0, 98,117,116,115,116, 97,  0, 98,117,116,101,110,100,  0,100,105,115,116,114,105, 98,117,116,105,111,110,  0,105,
-110,116, 95, 97,114,103, 95, 49,  0,105,110,116, 95, 97,114,103, 95, 50,  0,102,108,111, 97,116, 95, 97,114,103, 95, 49,  0,102,
-108,111, 97,116, 95, 97,114,103, 95, 50,  0,116,111, 80,114,111,112, 78, 97,109,101, 91, 54, 52, 93,  0, 42,116,111, 79, 98,106,
-101, 99,116,  0, 98,111,100,121, 84,121,112,101,  0,102,105,108,101,110, 97,109,101, 91, 54, 52, 93,  0,108,111, 97,100, 97,110,
-105,110, 97,109,101, 91, 54, 52, 93,  0,105,110,116, 95, 97,114,103,  0,102,108,111, 97,116, 95, 97,114,103,  0,105,110,102,108,
-117,101,110, 99,101,  0, 42,115,117, 98,116, 97,114,103,101,116,  0,102, 97, 99,105,110,103, 97,120,105,115,  0,118,101,108,111,
- 99,105,116,121,  0, 97, 99, 99,101,108,101,114, 97,116,105,111,110,  0,116,117,114,110,115,112,101,101,100,  0,117,112,100, 97,
-116,101, 84,105,109,101,  0, 42,110, 97,118,109,101,115,104,  0,103,111,  0, 42,110,101,119,112, 97, 99,107,101,100,102,105,108,
-101,  0, 97,116,116,101,110,117, 97,116,105,111,110,  0,100,105,115,116, 97,110, 99,101,  0, 42, 99, 97, 99,104,101,  0, 42,119,
- 97,118,101,102,111,114,109,  0, 42,112,108, 97,121, 98, 97, 99,107, 95,104, 97,110,100,108,101,  0, 42,108, 97,109,112,114,101,
-110,  0,103,111, 98,106,101, 99,116,  0,100,117,112,108,105, 95,111,102,115, 91, 51, 93,  0, 42,112,114,111,112,  0, 99,104,105,
-108,100, 98, 97,115,101,  0,114,111,108,108,  0,104,101, 97,100, 91, 51, 93,  0,116, 97,105,108, 91, 51, 93,  0, 98,111,110,101,
- 95,109, 97,116, 91, 51, 93, 91, 51, 93,  0, 97,114,109, 95,104,101, 97,100, 91, 51, 93,  0, 97,114,109, 95,116, 97,105,108, 91,
- 51, 93,  0, 97,114,109, 95,109, 97,116, 91, 52, 93, 91, 52, 93,  0, 97,114,109, 95,114,111,108,108,  0,120,119,105,100,116,104,
-  0,122,119,105,100,116,104,  0,101, 97,115,101, 49,  0,101, 97,115,101, 50,  0,114, 97,100, 95,104,101, 97,100,  0,114, 97,100,
- 95,116, 97,105,108,  0,112, 97,100, 91, 49, 93,  0, 98,111,110,101, 98, 97,115,101,  0, 99,104, 97,105,110, 98, 97,115,101,  0,
- 42,101,100, 98,111,  0, 42, 97, 99,116, 95, 98,111,110,101,  0, 42, 97, 99,116, 95,101,100, 98,111,110,101,  0, 42,115,107,101,
-116, 99,104,  0,103,101,118,101,114,116,100,101,102,111,114,109,101,114,  0,108, 97,121,101,114, 95,117,115,101,100,  0,108, 97,
-121,101,114, 95,112,114,111,116,101, 99,116,101,100,  0,103,104,111,115,116,101,112,  0,103,104,111,115,116,115,105,122,101,  0,
-103,104,111,115,116,116,121,112,101,  0,112, 97,116,104,115,105,122,101,  0,103,104,111,115,116,115,102,  0,103,104,111,115,116,
-101,102,  0,112, 97,116,104,115,102,  0,112, 97,116,104,101,102,  0,112, 97,116,104, 98, 99,  0,112, 97,116,104, 97, 99,  0, 42,
-112,111,105,110,116,115,  0,115,116, 97,114,116, 95,102,114, 97,109,101,  0,101,110,100, 95,102,114, 97,109,101,  0,103,104,111,
-115,116, 95,115,102,  0,103,104,111,115,116, 95,101,102,  0,103,104,111,115,116, 95, 98, 99,  0,103,104,111,115,116, 95, 97, 99,
-  0,103,104,111,115,116, 95,116,121,112,101,  0,103,104,111,115,116, 95,115,116,101,112,  0,103,104,111,115,116, 95,102,108, 97,
-103,  0,112, 97,116,104, 95,116,121,112,101,  0,112, 97,116,104, 95,115,116,101,112,  0,112, 97,116,104, 95,118,105,101,119,102,
-108, 97,103,  0,112, 97,116,104, 95, 98, 97,107,101,102,108, 97,103,  0,112, 97,116,104, 95,115,102,  0,112, 97,116,104, 95,101,
-102,  0,112, 97,116,104, 95, 98, 99,  0,112, 97,116,104, 95, 97, 99,  0,105,107,102,108, 97,103,  0, 97,103,114,112, 95,105,110,
-100,101,120,  0, 99,111,110,115,116,102,108, 97,103,  0,115,101,108,101, 99,116,102,108, 97,103,  0,112, 97,100, 48, 91, 54, 93,
-  0, 42, 98,111,110,101,  0, 42, 99,104,105,108,100,  0,105,107,116,114,101,101,  0,115,105,107,116,114,101,101,  0, 42, 99,117,
-115,116,111,109,  0, 42, 99,117,115,116,111,109, 95,116,120,  0,101,117,108, 91, 51, 93,  0, 99,104, 97,110, 95,109, 97,116, 91,
- 52, 93, 91, 52, 93,  0,112,111,115,101, 95,109, 97,116, 91, 52, 93, 91, 52, 93,  0,112,111,115,101, 95,104,101, 97,100, 91, 51,
- 93,  0,112,111,115,101, 95,116, 97,105,108, 91, 51, 93,  0,108,105,109,105,116,109,105,110, 91, 51, 93,  0,108,105,109,105,116,
-109, 97,120, 91, 51, 93,  0,115,116,105,102,102,110,101,115,115, 91, 51, 93,  0,105,107,115,116,114,101,116, 99,104,  0,105,107,
-114,111,116,119,101,105,103,104,116,  0,105,107,108,105,110,119,101,105,103,104,116,  0, 42,116,101,109,112,  0, 99,104, 97,110,
- 98, 97,115,101,  0, 42, 99,104, 97,110,104, 97,115,104,  0,112,114,111,120,121, 95,108, 97,121,101,114,  0,115,116,114,105,100,
-101, 95,111,102,102,115,101,116, 91, 51, 93,  0, 99,121, 99,108,105, 99, 95,111,102,102,115,101,116, 91, 51, 93,  0, 97,103,114,
-111,117,112,115,  0, 97, 99,116,105,118,101, 95,103,114,111,117,112,  0,105,107,115,111,108,118,101,114,  0, 42,105,107,100, 97,
-116, 97,  0, 42,105,107,112, 97,114, 97,109,  0,112,114,111,120,121, 95, 97, 99,116, 95, 98,111,110,101, 91, 54, 52, 93,  0,110,
-117,109,105,116,101,114,  0,110,117,109,115,116,101,112,  0,109,105,110,115,116,101,112,  0,109, 97,120,115,116,101,112,  0,115,
-111,108,118,101,114,  0,102,101,101,100, 98, 97, 99,107,  0,109, 97,120,118,101,108,  0,100, 97,109,112,109, 97,120,  0,100, 97,
-109,112,101,112,115,  0, 99,104, 97,110,110,101,108,115,  0, 99,117,115,116,111,109, 67,111,108,  0, 99,115,  0, 99,117,114,118,
-101,115,  0,103,114,111,117,112,115,  0, 97, 99,116,105,118,101, 95,109, 97,114,107,101,114,  0,105,100,114,111,111,116,  0, 42,
-115,111,117,114, 99,101,  0, 42,102,105,108,116,101,114, 95,103,114,112,  0,115,101, 97,114, 99,104,115,116,114, 91, 54, 52, 93,
-  0,102,105,108,116,101,114,102,108, 97,103,  0,114,101,110, 97,109,101, 73,110,100,101,120,  0, 97,100,115,  0,116,105,109,101,
-115,108,105,100,101,  0, 42,103,114,112,  0,110, 97,109,101, 91, 51, 48, 93,  0,111,119,110,115,112, 97, 99,101,  0,116, 97,114,
-115,112, 97, 99,101,  0,101,110,102,111,114, 99,101,  0,104,101, 97,100,116, 97,105,108,  0,108,105,110, 95,101,114,114,111,114,
-  0,114,111,116, 95,101,114,114,111,114,  0, 42,116, 97,114,  0,109, 97,116,114,105,120, 91, 52, 93, 91, 52, 93,  0,115,112, 97,
- 99,101,  0,114,111,116, 79,114,100,101,114,  0,116, 97,114,110,117,109,  0,116, 97,114,103,101,116,115,  0,105,116,101,114, 97,
-116,105,111,110,115,  0,114,111,111,116, 98,111,110,101,  0,109, 97,120, 95,114,111,111,116, 98,111,110,101,  0, 42,112,111,108,
-101,116, 97,114,  0,112,111,108,101,115,117, 98,116, 97,114,103,101,116, 91, 54, 52, 93,  0,112,111,108,101, 97,110,103,108,101,
-  0,111,114,105,101,110,116,119,101,105,103,104,116,  0,103,114, 97, 98,116, 97,114,103,101,116, 91, 51, 93,  0,110,117,109,112,
-111,105,110,116,115,  0, 99,104, 97,105,110,108,101,110,  0,120,122, 83, 99, 97,108,101, 77,111,100,101,  0,114,101,115,101,114,
-118,101,100, 49,  0,114,101,115,101,114,118,101,100, 50,  0,109,105,110,109, 97,120,102,108, 97,103,  0,115,116,117, 99,107,  0,
- 99, 97, 99,104,101, 91, 51, 93,  0,108,111, 99,107,102,108, 97,103,  0,102,111,108,108,111,119,102,108, 97,103,  0,118,111,108,
-109,111,100,101,  0,112,108, 97,110,101,  0,111,114,103,108,101,110,103,116,104,  0, 98,117,108,103,101,  0,112,105,118, 88,  0,
-112,105,118, 89,  0,112,105,118, 90,  0, 97,120, 88,  0, 97,120, 89,  0, 97,120, 90,  0,109,105,110, 76,105,109,105,116, 91, 54,
- 93,  0,109, 97,120, 76,105,109,105,116, 91, 54, 93,  0,101,120,116,114, 97, 70,122,  0,105,110,118,109, 97,116, 91, 52, 93, 91,
- 52, 93,  0,102,114,111,109,  0,116,111,  0,109, 97,112, 91, 51, 93,  0,101,120,112,111,  0,102,114,111,109, 95,109,105,110, 91,
- 51, 93,  0,102,114,111,109, 95,109, 97,120, 91, 51, 93,  0,116,111, 95,109,105,110, 91, 51, 93,  0,116,111, 95,109, 97,120, 91,
- 51, 93,  0,114,111,116, 65,120,105,115,  0,122,109,105,110,  0,122,109, 97,120,  0,112, 97,100, 91, 57, 93,  0,116,114, 97, 99,
-107, 91, 54, 52, 93,  0,111, 98,106,101, 99,116, 91, 54, 52, 93,  0, 42,100,101,112,116,104, 95,111, 98,  0, 99,104, 97,110,110,
-101,108, 91, 51, 50, 93,  0,110,111, 95,114,111,116, 95, 97,120,105,115,  0,115,116,114,105,100,101, 95, 97,120,105,115,  0, 99,
-117,114,109,111,100,  0, 97, 99,116,115,116, 97,114,116,  0, 97, 99,116,101,110,100,  0, 97, 99,116,111,102,102,115,  0,115,116,
-114,105,100,101,108,101,110,  0, 98,108,101,110,100,111,117,116,  0,115,116,114,105,100,101, 99,104, 97,110,110,101,108, 91, 51,
- 50, 93,  0,111,102,102,115, 95, 98,111,110,101, 91, 51, 50, 93,  0,104, 97,115,105,110,112,117,116,  0,104, 97,115,111,117,116,
-112,117,116,  0,100, 97,116, 97,116,121,112,101,  0,115,111, 99,107,101,116,116,121,112,101,  0,105,115, 95, 99,111,112,121,  0,
-101,120,116,101,114,110, 97,108,  0, 42,110,101,119, 95,115,111, 99,107,  0, 42,115,116,111,114, 97,103,101,  0,108,105,109,105,
-116,  0,108,111, 99,120,  0,108,111, 99,121,  0, 42,100,101,102, 97,117,108,116, 95,118, 97,108,117,101,  0,115,116, 97, 99,107,
- 95,105,110,100,101,120,  0,115,116, 97, 99,107, 95,116,121,112,101,  0,114,101,115,105,122,101,109,111,100,101,  0,111,119,110,
- 95,105,110,100,101,120,  0,116,111, 95,105,110,100,101,120,  0, 42,103,114,111,117,112,115,111, 99,107,  0, 42,108,105,110,107,
-  0,110,115,  0, 42,114,101, 99,116,  0,120,115,105,122,101,  0,121,115,105,122,101,  0, 42,110,101,119, 95,110,111,100,101,  0,
-108, 97,115,116,121,  0, 99,111,108,111,114, 91, 51, 93,  0,111,117,116,112,117,116,115,  0,109,105,110,105,119,105,100,116,104,
-  0,111,102,102,115,101,116,120,  0,111,102,102,115,101,116,121,  0,117,112,100, 97,116,101,  0,108, 97, 98,101,108, 91, 54, 52,
- 93,  0, 99,117,115,116,111,109, 49,  0, 99,117,115,116,111,109, 50,  0, 99,117,115,116,111,109, 51,  0, 99,117,115,116,111,109,
- 52,  0,110,101,101,100, 95,101,120,101, 99,  0,101,120,101, 99,  0, 42,116,104,114,101, 97,100,100, 97,116, 97,  0,116,111,116,
-114,  0, 98,117,116,114,  0,112,114,118,114,  0, 42, 98,108,111, 99,107,  0, 42,116,121,112,101,105,110,102,111,  0, 42,102,114,
-111,109,110,111,100,101,  0, 42,116,111,110,111,100,101,  0, 42,102,114,111,109,115,111, 99,107,  0, 42,116,111,115,111, 99,107,
-  0,110,111,100,101,115,  0,108,105,110,107,115,  0,105,110,105,116,  0, 99,117,114, 95,105,110,100,101,120,  0,110,111,100,101,
-116,121,112,101,  0,101,100,105,116, 95,113,117, 97,108,105,116,121,  0,114,101,110,100,101,114, 95,113,117, 97,108,105,116,121,
-  0, 99,104,117,110,107,115,105,122,101,  0, 42,101,120,101, 99,100, 97,116, 97,  0, 40, 42,112,114,111,103,114,101,115,115, 41,
- 40, 41,  0, 40, 42,115,116, 97,116,115, 95,100,114, 97,119, 41, 40, 41,  0, 40, 42,116,101,115,116, 95, 98,114,101, 97,107, 41,
- 40, 41,  0, 42,116, 98,104,  0, 42,112,114,104,  0, 42,115,100,104,  0,118, 97,108,117,101, 91, 51, 93,  0,118, 97,108,117,101,
- 91, 52, 93,  0,108, 97, 98,101,108, 95,115,105,122,101,  0, 99,121, 99,108,105, 99,  0,109,111,118,105,101,  0,103, 97,109,109,
- 97,  0,103, 97,105,110,  0,108,105,102,116,  0,109, 97,115,116,101,114,  0,115,104, 97,100,111,119,115,  0,109,105,100,116,111,
-110,101,115,  0,104,105,103,104,108,105,103,104,116,115,  0,115,116, 97,114,116,109,105,100,116,111,110,101,115,  0,101,110,100,
-109,105,100,116,111,110,101,115,  0,102,108, 97,112,115,  0,114,111,117,110,100,105,110,103,  0, 99, 97,116, 97,100,105,111,112,
-116,114,105, 99,  0,108,101,110,115,115,104,105,102,116,  0,114,111,116, 97,116,105,111,110,  0,112, 97,115,115, 95,105,110,100,
-101,120,  0,112, 97,115,115, 95,102,108, 97,103,  0,109, 97,120,115,112,101,101,100,  0,109,105,110,115,112,101,101,100,  0, 99,
-117,114,118,101,100,  0,112,101,114, 99,101,110,116,120,  0,112,101,114, 99,101,110,116,121,  0, 98,111,107,101,104,  0,105,109,
- 97,103,101, 95,105,110, 95,119,105,100,116,104,  0,105,109, 97,103,101, 95,105,110, 95,104,101,105,103,104,116,  0, 99,101,110,
-116,101,114, 95,120,  0, 99,101,110,116,101,114, 95,121,  0,115,112,105,110,  0,119,114, 97,112,  0,115,105,103,109, 97, 95, 99,
-111,108,111,114,  0,115,105,103,109, 97, 95,115,112, 97, 99,101,  0,104,117,101,  0, 98, 97,115,101, 95,112, 97,116,104, 91, 49,
- 48, 50, 52, 93,  0,102,111,114,109, 97,116,  0, 97, 99,116,105,118,101, 95,105,110,112,117,116,  0,117,115,101, 95,114,101,110,
-100,101,114, 95,102,111,114,109, 97,116,  0,117,115,101, 95,110,111,100,101, 95,102,111,114,109, 97,116,  0,108, 97,121,101,114,
- 91, 51, 48, 93,  0,116, 49,  0,116, 50,  0,116, 51,  0,102,115,116,114,101,110,103,116,104,  0,102, 97,108,112,104, 97,  0,107,
-101,121, 91, 52, 93,  0, 97,108,103,111,114,105,116,104,109,  0, 99,104, 97,110,110,101,108,  0,120, 49,  0,120, 50,  0,121, 49,
-  0,121, 50,  0,102, 97, 99, 95,120, 49,  0,102, 97, 99, 95,120, 50,  0,102, 97, 99, 95,121, 49,  0,102, 97, 99, 95,121, 50,  0,
- 99,111,108,110, 97,109,101, 91, 54, 52, 93,  0, 98,107,116,121,112,101,  0,112, 97,100, 95, 99, 49,  0,103, 97,109, 99,111,  0,
-110,111, 95,122, 98,117,102,  0,102,115,116,111,112,  0,109, 97,120, 98,108,117,114,  0, 98,116,104,114,101,115,104,  0,112, 97,
-100, 95,102, 49,  0, 42,100,105, 99,116,  0, 42,110,111,100,101,  0, 99,111,108,109,111,100,  0,109,105,120,  0,102, 97,100,101,
-  0, 97,110,103,108,101, 95,111,102,115,  0,109,  0, 99,  0,106,105,116,  0,112,114,111,106,  0,102,105,116,  0,115,108,111,112,
-101, 91, 51, 93,  0,112,111,119,101,114, 91, 51, 93,  0,108,105,102,116, 95,108,103,103, 91, 51, 93,  0,103, 97,109,109, 97, 95,
-105,110,118, 91, 51, 93,  0,108,105,109, 99,104, 97,110,  0,117,110,115,112,105,108,108,  0,108,105,109,115, 99, 97,108,101,  0,
-117,115,112,105,108,108,114,  0,117,115,112,105,108,108,103,  0,117,115,112,105,108,108, 98,  0,116,101,120, 95,109, 97,112,112,
-105,110,103,  0, 99,111,108,111,114, 95,109, 97,112,112,105,110,103,  0,115,117,110, 95,100,105,114,101, 99,116,105,111,110, 91,
- 51, 93,  0,116,117,114, 98,105,100,105,116,121,  0, 99,111,108,111,114, 95,115,112, 97, 99,101,  0,112,114,111,106,101, 99,116,
-105,111,110,  0,103,114, 97,100,105,101,110,116, 95,116,121,112,101,  0, 99,111,108,111,114,105,110,103,  0,109,117,115,103,114,
- 97,118,101, 95,116,121,112,101,  0,119, 97,118,101, 95,116,121,112,101,  0,115,104,111,114,116,121,  0,109,105,110,116, 97, 98,
-108,101,  0,109, 97,120,116, 97, 98,108,101,  0,101,120,116, 95,105,110, 91, 50, 93,  0,101,120,116, 95,111,117,116, 91, 50, 93,
-  0, 42, 99,117,114,118,101,  0, 42,116, 97, 98,108,101,  0, 42,112,114,101,109,117,108,116, 97, 98,108,101,  0,112,114,101,115,
-101,116,  0, 99,104, 97,110,103,101,100, 95,116,105,109,101,115,116, 97,109,112,  0, 99,117,114,114,  0, 99,108,105,112,114,  0,
- 99,109, 91, 52, 93,  0, 98,108, 97, 99,107, 91, 51, 93,  0,119,104,105,116,101, 91, 51, 93,  0, 98,119,109,117,108, 91, 51, 93,
-  0,115, 97,109,112,108,101, 91, 51, 93,  0,120, 95,114,101,115,111,108,117,116,105,111,110,  0,100, 97,116, 97, 95,114, 91, 50,
- 53, 54, 93,  0,100, 97,116, 97, 95,103, 91, 50, 53, 54, 93,  0,100, 97,116, 97, 95, 98, 91, 50, 53, 54, 93,  0,100, 97,116, 97,
- 95,108,117,109, 97, 91, 50, 53, 54, 93,  0,115, 97,109,112,108,101, 95,102,117,108,108,  0,115, 97,109,112,108,101, 95,108,105,
-110,101,115,  0, 97, 99, 99,117,114, 97, 99,121,  0,119, 97,118,101,102,114,109, 95,109,111,100,101,  0,119, 97,118,101,102,114,
-109, 95, 97,108,112,104, 97,  0,119, 97,118,101,102,114,109, 95,121,102, 97, 99,  0,119, 97,118,101,102,114,109, 95,104,101,105,
-103,104,116,  0,118,101, 99,115, 99,111,112,101, 95, 97,108,112,104, 97,  0,118,101, 99,115, 99,111,112,101, 95,104,101,105,103,
-104,116,  0,109,105,110,109, 97,120, 91, 51, 93, 91, 50, 93,  0,104,105,115,116,  0, 42,119, 97,118,101,102,111,114,109, 95, 49,
-  0, 42,119, 97,118,101,102,111,114,109, 95, 50,  0, 42,119, 97,118,101,102,111,114,109, 95, 51,  0, 42,118,101, 99,115, 99,111,
-112,101,  0,119, 97,118,101,102,111,114,109, 95,116,111,116,  0,111,102,102,115,101,116, 91, 50, 93,  0, 99,108,111,110,101,  0,
-109,116,101,120,  0, 42,116,111,103,103,108,101, 95, 98,114,117,115,104,  0, 42,105, 99,111,110, 95,105,109, 98,117,102,  0,105,
- 99,111,110, 95,102,105,108,101,112, 97,116,104, 91, 49, 48, 50, 52, 93,  0,110,111,114,109, 97,108, 95,119,101,105,103,104,116,
-  0,111, 98, 95,109,111,100,101,  0,106,105,116,116,101,114,  0,115,109,111,111,116,104, 95,115,116,114,111,107,101, 95,114, 97,
-100,105,117,115,  0,115,109,111,111,116,104, 95,115,116,114,111,107,101, 95,102, 97, 99,116,111,114,  0,114, 97,116,101,  0,114,
-103, 98, 91, 51, 93,  0,115, 99,117,108,112,116, 95,112,108, 97,110,101,  0,112,108, 97,110,101, 95,111,102,102,115,101,116,  0,
-115, 99,117,108,112,116, 95,116,111,111,108,  0,118,101,114,116,101,120,112, 97,105,110,116, 95,116,111,111,108,  0,105,109, 97,
-103,101,112, 97,105,110,116, 95,116,111,111,108,  0,109, 97,115,107, 95,116,111,111,108,  0, 97,117,116,111,115,109,111,111,116,
-104, 95,102, 97, 99,116,111,114,  0, 99,114,101, 97,115,101, 95,112,105,110, 99,104, 95,102, 97, 99,116,111,114,  0,112,108, 97,
-110,101, 95,116,114,105,109,  0,116,101,120,116,117,114,101, 95,115, 97,109,112,108,101, 95, 98,105, 97,115,  0,116,101,120,116,
-117,114,101, 95,111,118,101,114,108, 97,121, 95, 97,108,112,104, 97,  0, 97,100,100, 95, 99,111,108, 91, 51, 93,  0,115,117, 98,
- 95, 99,111,108, 91, 51, 93,  0, 97, 99,116,105,118,101, 95,114,110,100,  0, 97, 99,116,105,118,101, 95, 99,108,111,110,101,  0,
- 97, 99,116,105,118,101, 95,109, 97,115,107,  0, 42,108, 97,121,101,114,115,  0,116,121,112,101,109, 97,112, 91, 51, 54, 93,  0,
-116,111,116,108, 97,121,101,114,  0,109, 97,120,108, 97,121,101,114,  0,116,111,116,115,105,122,101,  0, 42,112,111,111,108,  0,
- 42,101,120,116,101,114,110, 97,108,  0,114,111,116, 91, 52, 93,  0, 97,118,101, 91, 51, 93,  0, 42,103,114,111,117,110,100,  0,
-119, 97,110,100,101,114, 91, 51, 93,  0,114,101,115,116, 95,108,101,110,103,116,104,  0,112, 97,114,116,105, 99,108,101, 95,105,
-110,100,101,120, 91, 50, 93,  0,100,101,108,101,116,101, 95,102,108, 97,103,  0,110,117,109,  0,112, 97,114,101,110,116,  0,112,
- 97, 91, 52, 93,  0,119, 91, 52, 93,  0,102,117,118, 91, 52, 93,  0,102,111,102,102,115,101,116,  0,112,114,101,118, 95,115,116,
- 97,116,101,  0, 42,104, 97,105,114,  0, 42, 98,111,105,100,  0,100,105,101,116,105,109,101,  0,110,117,109, 95,100,109, 99, 97,
- 99,104,101,  0,104, 97,105,114, 95,105,110,100,101,120,  0, 97,108,105,118,101,  0,115,112,114,105,110,103, 95,107,  0,112,108,
- 97,115,116,105, 99,105,116,121, 95, 99,111,110,115,116, 97,110,116,  0,121,105,101,108,100, 95,114, 97,116,105,111,  0,112,108,
- 97,115,116,105, 99,105,116,121, 95, 98, 97,108, 97,110, 99,101,  0,121,105,101,108,100, 95, 98, 97,108, 97,110, 99,101,  0,118,
-105,115, 99,111,115,105,116,121, 95,111,109,101,103, 97,  0,118,105,115, 99,111,115,105,116,121, 95, 98,101,116, 97,  0,115,116,
-105,102,102,110,101,115,115, 95,107,  0,115,116,105,102,102,110,101,115,115, 95,107,110,101, 97,114,  0,114,101,115,116, 95,100,
-101,110,115,105,116,121,  0, 98,117,111,121, 97,110, 99,121,  0,115,112,114,105,110,103, 95,102,114, 97,109,101,115,  0, 42, 98,
-111,105,100,115,  0, 42,102,108,117,105,100,  0,100,105,115,116,114,  0,112,104,121,115,116,121,112,101,  0, 97,118,101,109,111,
-100,101,  0,114,101, 97, 99,116,101,118,101,110,116,  0,100,114, 97,119,  0,100,114, 97,119, 95, 97,115,  0,100,114, 97,119, 95,
-115,105,122,101,  0, 99,104,105,108,100,116,121,112,101,  0,114,101,110, 95, 97,115,  0,115,117, 98,102,114, 97,109,101,115,  0,
-100,114, 97,119, 95, 99,111,108,  0,114,101,110, 95,115,116,101,112,  0,104, 97,105,114, 95,115,116,101,112,  0,107,101,121,115,
- 95,115,116,101,112,  0, 97,100, 97,112,116, 95, 97,110,103,108,101,  0, 97,100, 97,112,116, 95,112,105,120,  0,114,111,116,102,
-114,111,109,  0,105,110,116,101,103,114, 97,116,111,114,  0, 98, 98, 95, 97,108,105,103,110,  0, 98, 98, 95,117,118, 95,115,112,
-108,105,116,  0, 98, 98, 95, 97,110,105,109,  0, 98, 98, 95,115,112,108,105,116, 95,111,102,102,115,101,116,  0, 98, 98, 95,116,
-105,108,116,  0, 98, 98, 95,114, 97,110,100, 95,116,105,108,116,  0, 98, 98, 95,111,102,102,115,101,116, 91, 50, 93,  0, 98, 98,
- 95,115,105,122,101, 91, 50, 93,  0, 98, 98, 95,118,101,108, 95,104,101, 97,100,  0, 98, 98, 95,118,101,108, 95,116, 97,105,108,
-  0, 99,111,108,111,114, 95,118,101, 99, 95,109, 97,120,  0,115,105,109,112,108,105,102,121, 95,114,101,102,115,105,122,101,  0,
-115,105,109,112,108,105,102,121, 95,114, 97,116,101,  0,115,105,109,112,108,105,102,121, 95,116,114, 97,110,115,105,116,105,111,
-110,  0,115,105,109,112,108,105,102,121, 95,118,105,101,119,112,111,114,116,  0,116,105,109,101,116,119,101, 97,107,  0, 99,111,
-117,114, 97,110,116, 95,116, 97,114,103,101,116,  0,106,105,116,102, 97, 99,  0,101,102,102, 95,104, 97,105,114,  0,103,114,105,
-100, 95,114, 97,110,100,  0,112,115, 95,111,102,102,115,101,116, 91, 49, 93,  0,103,114,105,100, 95,114,101,115,  0,101,102,102,
-101, 99,116,111,114, 95, 97,109,111,117,110,116,  0,116,105,109,101, 95,102,108, 97,103,  0,116,105,109,101, 95,112, 97,100, 91,
- 51, 93,  0,112, 97,114,116,102, 97, 99,  0,116, 97,110,102, 97, 99,  0,116, 97,110,112,104, 97,115,101,  0,114,101, 97, 99,116,
-102, 97, 99,  0,111, 98, 95,118,101,108, 91, 51, 93,  0, 97,118,101,102, 97, 99,  0,112,104, 97,115,101,102, 97, 99,  0,114, 97,
-110,100,114,111,116,102, 97, 99,  0,114, 97,110,100,112,104, 97,115,101,102, 97, 99,  0,114, 97,110,100,115,105,122,101,  0, 97,
- 99, 99, 91, 51, 93,  0,100,114, 97,103,102, 97, 99,  0, 98,114,111,119,110,102, 97, 99,  0,114, 97,110,100,108,101,110,103,116,
-104,  0, 99,104,105,108,100, 95,110, 98,114,  0,114,101,110, 95, 99,104,105,108,100, 95,110, 98,114,  0,112, 97,114,101,110,116,
-115,  0, 99,104,105,108,100,115,105,122,101,  0, 99,104,105,108,100,114, 97,110,100,115,105,122,101,  0, 99,104,105,108,100,114,
- 97,100,  0, 99,104,105,108,100,102,108, 97,116,  0, 99,108,117,109,112,112,111,119,  0,107,105,110,107, 95,102,108, 97,116,  0,
-107,105,110,107, 95, 97,109,112, 95, 99,108,117,109,112,  0,114,111,117,103,104, 49,  0,114,111,117,103,104, 49, 95,115,105,122,
-101,  0,114,111,117,103,104, 50,  0,114,111,117,103,104, 50, 95,115,105,122,101,  0,114,111,117,103,104, 50, 95,116,104,114,101,
-115,  0,114,111,117,103,104, 95,101,110,100,  0,114,111,117,103,104, 95,101,110,100, 95,115,104, 97,112,101,  0, 99,108,101,110,
-103,116,104,  0, 99,108,101,110,103,116,104, 95,116,104,114,101,115,  0,112, 97,114,116,105,110,103, 95,102, 97, 99,  0,112, 97,
-114,116,105,110,103, 95,109,105,110,  0,112, 97,114,116,105,110,103, 95,109, 97,120,  0, 98,114, 97,110, 99,104, 95,116,104,114,
-101,115,  0,100,114, 97,119, 95,108,105,110,101, 91, 50, 93,  0,112, 97,116,104, 95,115,116, 97,114,116,  0,112, 97,116,104, 95,
-101,110,100,  0,116,114, 97,105,108, 95, 99,111,117,110,116,  0,107,101,121,101,100, 95,108,111,111,112,115,  0,100,117,112,108,
-105,119,101,105,103,104,116,115,  0, 42,101,102,102, 95,103,114,111,117,112,  0, 42,100,117,112, 95,111, 98,  0, 42, 98, 98, 95,
-111, 98,  0, 42,112,100, 50,  0, 42,112, 97,114,116,  0, 42,112, 97,114,116,105, 99,108,101,115,  0, 42, 42,112, 97,116,104, 99,
- 97, 99,104,101,  0, 42, 42, 99,104,105,108,100, 99, 97, 99,104,101,  0,112, 97,116,104, 99, 97, 99,104,101, 98,117,102,115,  0,
- 99,104,105,108,100, 99, 97, 99,104,101, 98,117,102,115,  0, 42, 99,108,109,100,  0, 42,104, 97,105,114, 95,105,110, 95,100,109,
-  0, 42,104, 97,105,114, 95,111,117,116, 95,100,109,  0, 42,116, 97,114,103,101,116, 95,111, 98,  0, 42,108, 97,116,116,105, 99,
-101,  0,116,114,101,101, 95,102,114, 97,109,101,  0, 98,118,104,116,114,101,101, 95,102,114, 97,109,101,  0, 99,104,105,108,100,
- 95,115,101,101,100,  0,116,111,116,117,110,101,120,105,115,116,  0,116,111,116, 99,104,105,108,100,  0,116,111,116, 99, 97, 99,
-104,101,100,  0,116,111,116, 99,104,105,108,100, 99, 97, 99,104,101,  0,116, 97,114,103,101,116, 95,112,115,121,115,  0,116,111,
-116,107,101,121,101,100,  0, 98, 97,107,101,115,112, 97, 99,101,  0, 98, 98, 95,117,118,110, 97,109,101, 91, 51, 93, 91, 54, 52,
- 93,  0,118,103,114,111,117,112, 91, 49, 50, 93,  0,118,103, 95,110,101,103,  0,114,116, 51,  0, 42,114,101,110,100,101,114,100,
- 97,116, 97,  0, 42,101,102,102,101, 99,116,111,114,115,  0, 42,102,108,117,105,100, 95,115,112,114,105,110,103,115,  0,116,111,
-116, 95,102,108,117,105,100,115,112,114,105,110,103,115,  0, 97,108,108,111, 99, 95,102,108,117,105,100,115,112,114,105,110,103,
-115,  0, 42,116,114,101,101,  0, 42,112,100,100,  0, 42,102,114, 97,110,100,  0,100,116, 95,102,114, 97, 99,  0, 95,112, 97,100,
-  0, 67,100,105,115,  0, 67,118,105,  0,115,116,114,117, 99,116,117,114, 97,108,  0, 98,101,110,100,105,110,103,  0,109, 97,120,
- 95, 98,101,110,100,  0,109, 97,120, 95,115,116,114,117, 99,116,  0,109, 97,120, 95,115,104,101, 97,114,  0, 97,118,103, 95,115,
-112,114,105,110,103, 95,108,101,110,  0,116,105,109,101,115, 99, 97,108,101,  0,101,102,102, 95,102,111,114, 99,101, 95,115, 99,
- 97,108,101,  0,101,102,102, 95,119,105,110,100, 95,115, 99, 97,108,101,  0,115,105,109, 95,116,105,109,101, 95,111,108,100,  0,
-118,101,108,111, 99,105,116,121, 95,115,109,111,111,116,104,  0, 99,111,108,108,105,100,101,114, 95,102,114,105, 99,116,105,111,
-110,  0,118,101,108, 95,100, 97,109,112,105,110,103,  0,115,116,101,112,115, 80,101,114, 70,114, 97,109,101,  0,112,114,101,114,
-111,108,108,  0,109, 97,120,115,112,114,105,110,103,108,101,110,  0,115,111,108,118,101,114, 95,116,121,112,101,  0,118,103,114,
-111,117,112, 95, 98,101,110,100,  0,118,103,114,111,117,112, 95,109, 97,115,115,  0,118,103,114,111,117,112, 95,115,116,114,117,
- 99,116,  0,115,104, 97,112,101,107,101,121, 95,114,101,115,116,  0,112,114,101,115,101,116,115,  0,114,101,115,101,116,  0, 42,
- 99,111,108,108,105,115,105,111,110, 95,108,105,115,116,  0,101,112,115,105,108,111,110,  0,115,101,108,102, 95,102,114,105, 99,
-116,105,111,110,  0,115,101,108,102,101,112,115,105,108,111,110,  0,114,101,112,101,108, 95,102,111,114, 99,101,  0,100,105,115,
-116, 97,110, 99,101, 95,114,101,112,101,108,  0,115,101,108,102, 95,108,111,111,112, 95, 99,111,117,110,116,  0,108,111,111,112,
- 95, 99,111,117,110,116,  0,112,114,101,115,115,117,114,101,  0,116,104,105, 99,107,110,101,115,115,  0,115,116,114,111,107,101,
-115,  0,102,114, 97,109,101,110,117,109,  0, 42, 97, 99,116,102,114, 97,109,101,  0,103,115,116,101,112,  0,105,110,102,111, 91,
- 49, 50, 56, 93,  0,115, 98,117,102,102,101,114, 95,115,105,122,101,  0,115, 98,117,102,102,101,114, 95,115,102,108, 97,103,  0,
- 42,115, 98,117,102,102,101,114,  0,108,105,115,116,  0,112,114,105,110,116,108,101,118,101,108,  0,115,116,111,114,101,108,101,
-118,101,108,  0, 42,114,101,112,111,114,116,116,105,109,101,114,  0, 42,119,105,110,100,114, 97,119, 97, 98,108,101,  0, 42,119,
-105,110, 97, 99,116,105,118,101,  0,119,105,110,100,111,119,115,  0,105,110,105,116,105, 97,108,105,122,101,100,  0,102,105,108,
-101, 95,115, 97,118,101,100,  0,111,112, 95,117,110,100,111, 95,100,101,112,116,104,  0,111,112,101,114, 97,116,111,114,115,  0,
-113,117,101,117,101,  0,114,101,112,111,114,116,115,  0,106,111, 98,115,  0,112, 97,105,110,116, 99,117,114,115,111,114,115,  0,
-100,114, 97,103,115,  0,107,101,121, 99,111,110,102,105,103,115,  0, 42,100,101,102, 97,117,108,116, 99,111,110,102,  0, 42, 97,
-100,100,111,110, 99,111,110,102,  0, 42,117,115,101,114, 99,111,110,102,  0,116,105,109,101,114,115,  0, 42, 97,117,116,111,115,
- 97,118,101,116,105,109,101,114,  0, 42,103,104,111,115,116,119,105,110,  0,103,114, 97, 98, 99,117,114,115,111,114,  0, 42,115,
- 99,114,101,101,110,  0, 42,110,101,119,115, 99,114,101,101,110,  0,115, 99,114,101,101,110,110, 97,109,101, 91, 54, 52, 93,  0,
-112,111,115,120,  0,112,111,115,121,  0,119,105,110,100,111,119,115,116, 97,116,101,  0,109,111,110,105,116,111,114,  0,108, 97,
-115,116, 99,117,114,115,111,114,  0,109,111,100, 97,108, 99,117,114,115,111,114,  0, 97,100,100,109,111,117,115,101,109,111,118,
-101,  0, 42,101,118,101,110,116,115,116, 97,116,101,  0, 42, 99,117,114,115,119,105,110,  0, 42,116,119,101, 97,107,  0,100,114,
- 97,119,109,101,116,104,111,100,  0,100,114, 97,119,102, 97,105,108,  0, 42,100,114, 97,119,100, 97,116, 97,  0,109,111,100, 97,
-108,104, 97,110,100,108,101,114,115,  0,115,117, 98,119,105,110,100,111,119,115,  0,103,101,115,116,117,114,101,  0,105,100,110,
- 97,109,101, 91, 54, 52, 93,  0,112,114,111,112,118, 97,108,117,101, 95,115,116,114, 91, 54, 52, 93,  0,112,114,111,112,118, 97,
-108,117,101,  0,115,104,105,102,116,  0, 99,116,114,108,  0, 97,108,116,  0,111,115,107,101,121,  0,107,101,121,109,111,100,105,
-102,105,101,114,  0,109, 97,112,116,121,112,101,  0, 42,112,116,114,  0, 42,114,101,109,111,118,101, 95,105,116,101,109,  0, 42,
- 97,100,100, 95,105,116,101,109,  0,105,116,101,109,115,  0,100,105,102,102, 95,105,116,101,109,115,  0,115,112, 97, 99,101,105,
-100,  0,114,101,103,105,111,110,105,100,  0,107,109,105, 95,105,100,  0, 40, 42,112,111,108,108, 41, 40, 41,  0, 42,109,111,100,
- 97,108, 95,105,116,101,109,115,  0, 98, 97,115,101,110, 97,109,101, 91, 54, 52, 93,  0, 97, 99,116,107,101,121,109, 97,112,  0,
- 42, 99,117,115,116,111,109,100, 97,116, 97,  0, 42,112,121, 95,105,110,115,116, 97,110, 99,101,  0, 42,114,101,112,111,114,116,
-115,  0,109, 97, 99,114,111,  0, 42,111,112,109,  0, 42,101,100, 97,116, 97,  0, 42, 99,111,101,102,102,105, 99,105,101,110,116,
-115,  0, 97,114,114, 97,121,115,105,122,101,  0,112,111,108,121, 95,111,114,100,101,114,  0, 97,109,112,108,105,116,117,100,101,
-  0,112,104, 97,115,101, 95,109,117,108,116,105,112,108,105,101,114,  0,112,104, 97,115,101, 95,111,102,102,115,101,116,  0,118,
- 97,108,117,101, 95,111,102,102,115,101,116,  0,109,105,100,118, 97,108,  0, 98,101,102,111,114,101, 95,109,111,100,101,  0, 97,
-102,116,101,114, 95,109,111,100,101,  0, 98,101,102,111,114,101, 95, 99,121, 99,108,101,115,  0, 97,102,116,101,114, 95, 99,121,
- 99,108,101,115,  0,114,101, 99,116,  0,112,104, 97,115,101,  0,109,111,100,105,102,105, 99, 97,116,105,111,110,  0,115,116,101,
-112, 95,115,105,122,101,  0, 42,114,110, 97, 95,112, 97,116,104,  0,112, 99,104, 97,110, 95,110, 97,109,101, 91, 51, 50, 93,  0,
-116,114, 97,110,115, 67,104, 97,110,  0,105,100,116,121,112,101,  0,116, 97,114,103,101,116,115, 91, 56, 93,  0,110,117,109, 95,
-116, 97,114,103,101,116,115,  0,118, 97,114,105, 97, 98,108,101,115,  0,101,120,112,114,101,115,115,105,111,110, 91, 50, 53, 54,
- 93,  0, 42,101,120,112,114, 95, 99,111,109,112,  0,118,101, 99, 91, 50, 93,  0, 42,102,112,116,  0, 97,114,114, 97,121, 95,105,
-110,100,101,120,  0, 99,111,108,111,114, 95,109,111,100,101,  0,102,114,111,109, 91, 49, 50, 56, 93,  0,116,111, 91, 49, 50, 56,
- 93,  0,109, 97,112,112,105,110,103,115,  0,115,116,114,105,112,115,  0, 42,114,101,109, 97,112,  0,102, 99,117,114,118,101,115,
-  0,115,116,114,105,112, 95,116,105,109,101,  0, 98,108,101,110,100,109,111,100,101,  0,101,120,116,101,110,100,109,111,100,101,
-  0, 42,115,112,101, 97,107,101,114, 95,104, 97,110,100,108,101,  0,103,114,111,117,112, 91, 54, 52, 93,  0,103,114,111,117,112,
-109,111,100,101,  0,107,101,121,105,110,103,102,108, 97,103,  0,112, 97,116,104,115,  0,100,101,115, 99,114,105,112,116,105,111,
-110, 91, 50, 52, 48, 93,  0,116,121,112,101,105,110,102,111, 91, 54, 52, 93,  0, 97, 99,116,105,118,101, 95,112, 97,116,104,  0,
- 42,116,109,112, 97, 99,116,  0,110,108, 97, 95,116,114, 97, 99,107,115,  0, 42, 97, 99,116,115,116,114,105,112,  0,100,114,105,
-118,101,114,115,  0,111,118,101,114,114,105,100,101,115,  0, 97, 99,116, 95, 98,108,101,110,100,109,111,100,101,  0, 97, 99,116,
- 95,101,120,116,101,110,100,109,111,100,101,  0, 97, 99,116, 95,105,110,102,108,117,101,110, 99,101,  0,114,117,108,101,  0,111,
-112,116,105,111,110,115,  0,102,101, 97,114, 95,102, 97, 99,116,111,114,  0,115,105,103,110, 97,108, 95,105,100,  0,108,111,111,
-107, 95, 97,104,101, 97,100,  0,111,108,111, 99, 91, 51, 93,  0,113,117,101,117,101, 95,115,105,122,101,  0,119, 97,110,100,101,
-114,  0,102,108,101,101, 95,100,105,115,116, 97,110, 99,101,  0,104,101, 97,108,116,104,  0,115,116, 97,116,101, 95,105,100,  0,
-114,117,108,101,115,  0, 99,111,110,100,105,116,105,111,110,115,  0, 97, 99,116,105,111,110,115,  0,114,117,108,101,115,101,116,
- 95,116,121,112,101,  0,114,117,108,101, 95,102,117,122,122,105,110,101,115,115,  0,108, 97,115,116, 95,115,116, 97,116,101, 95,
-105,100,  0,108, 97,110,100,105,110,103, 95,115,109,111,111,116,104,110,101,115,115,  0, 98, 97,110,107,105,110,103,  0, 97,103,
-103,114,101,115,115,105,111,110,  0, 97,105,114, 95,109,105,110, 95,115,112,101,101,100,  0, 97,105,114, 95,109, 97,120, 95,115,
-112,101,101,100,  0, 97,105,114, 95,109, 97,120, 95, 97, 99, 99,  0, 97,105,114, 95,109, 97,120, 95, 97,118,101,  0, 97,105,114,
- 95,112,101,114,115,111,110, 97,108, 95,115,112, 97, 99,101,  0,108, 97,110,100, 95,106,117,109,112, 95,115,112,101,101,100,  0,
-108, 97,110,100, 95,109, 97,120, 95,115,112,101,101,100,  0,108, 97,110,100, 95,109, 97,120, 95, 97, 99, 99,  0,108, 97,110,100,
- 95,109, 97,120, 95, 97,118,101,  0,108, 97,110,100, 95,112,101,114,115,111,110, 97,108, 95,115,112, 97, 99,101,  0,108, 97,110,
-100, 95,115,116,105, 99,107, 95,102,111,114, 99,101,  0,115,116, 97,116,101,115,  0, 42,115,109,100,  0, 42,102,108,117,105,100,
- 95,103,114,111,117,112,  0, 42, 99,111,108,108, 95,103,114,111,117,112,  0, 42,119,116,  0, 42,116,101,120, 95,119,116,  0, 42,
-116,101,120, 95,115,104, 97,100,111,119,  0, 42,115,104, 97,100,111,119,  0,112, 48, 91, 51, 93,  0,112, 49, 91, 51, 93,  0,100,
-120,  0,111,109,101,103, 97,  0,116,101,109,112, 65,109, 98,  0, 98,101,116, 97,  0,114,101,115, 91, 51, 93,  0, 97,109,112,108,
-105,102,121,  0,109, 97,120,114,101,115,  0,118,105,101,119,115,101,116,116,105,110,103,115,  0,110,111,105,115,101,  0,100,105,
-115,115, 95,112,101,114, 99,101,110,116,  0,100,105,115,115, 95,115,112,101,101,100,  0,114,101,115, 95,119,116, 91, 51, 93,  0,
-100,120, 95,119,116,  0,118, 51,100,110,117,109,  0, 99, 97, 99,104,101, 95, 99,111,109,112,  0, 99, 97, 99,104,101, 95,104,105,
-103,104, 95, 99,111,109,112,  0, 42,112,111,105,110,116, 95, 99, 97, 99,104,101, 91, 50, 93,  0,112,116, 99, 97, 99,104,101,115,
- 91, 50, 93,  0, 98,111,114,100,101,114, 95, 99,111,108,108,105,115,105,111,110,115,  0,116,105,109,101, 95,115, 99, 97,108,101,
-  0,118,111,114,116,105, 99,105,116,121,  0,118,101,108,111, 99,105,116,121, 91, 50, 93,  0,118,101,108, 95,109,117,108,116,105,
-  0,118,103,114,112, 95,104,101, 97,116, 95,115, 99, 97,108,101, 91, 50, 93,  0,118,103,114,111,117,112, 95,102,108,111,119,  0,
-118,103,114,111,117,112, 95,100,101,110,115,105,116,121,  0,118,103,114,111,117,112, 95,104,101, 97,116,  0, 42,112,111,105,110,
-116,115, 95,111,108,100,  0, 42,118,101,108,  0, 42,116,114,105,100,105,118,115,  0,109, 97,116, 95,111,108,100, 91, 52, 93, 91,
- 52, 93,  0,110,117,109,116,114,105,115,  0,118,111,108,117,109,101, 95,109, 97,120,  0,118,111,108,117,109,101, 95,109,105,110,
-  0,100,105,115,116, 97,110, 99,101, 95,109, 97,120,  0,100,105,115,116, 97,110, 99,101, 95,114,101,102,101,114,101,110, 99,101,
-  0, 99,111,110,101, 95, 97,110,103,108,101, 95,111,117,116,101,114,  0, 99,111,110,101, 95, 97,110,103,108,101, 95,105,110,110,
-101,114,  0, 99,111,110,101, 95,118,111,108,117,109,101, 95,111,117,116,101,114,  0,114,101,110,100,101,114, 95,102,108, 97,103,
-  0, 98,117,105,108,100, 95,115,105,122,101, 95,102,108, 97,103,  0, 98,117,105,108,100, 95,116, 99, 95,102,108, 97,103,  0,108,
- 97,115,116,115,105,122,101, 91, 50, 93,  0,116,114, 97, 99,107,105,110,103,  0, 42,116,114, 97, 99,107,105,110,103, 95, 99,111,
-110,116,101,120,116,  0,112,114,111,120,121,  0,116,114, 97, 99,107, 95,112,114,101,118,105,101,119, 95,104,101,105,103,104,116,
-  0, 42,116,114, 97, 99,107, 95,112,114,101,118,105,101,119,  0,116,114, 97, 99,107, 95,112,111,115, 91, 50, 93,  0,116,114, 97,
- 99,107, 95,100,105,115, 97, 98,108,101,100,  0, 42,109, 97,114,107,101,114,  0,115,108,105,100,101, 95,115, 99, 97,108,101, 91,
- 50, 93,  0,101,114,114,111,114,  0, 42,105,110,116,114,105,110,115,105, 99,115,  0,115,101,110,115,111,114, 95,119,105,100,116,
-104,  0,112,105,120,101,108, 95, 97,115,112,101, 99,116,  0,102,111, 99, 97,108,  0,117,110,105,116,115,  0,112,114,105,110, 99,
-105,112, 97,108, 91, 50, 93,  0,107, 49,  0,107, 50,  0,107, 51,  0,112,111,115, 91, 50, 93,  0,112, 97,116, 95,109,105,110, 91,
- 50, 93,  0,112, 97,116, 95,109, 97,120, 91, 50, 93,  0,115,101, 97,114, 99,104, 95,109,105,110, 91, 50, 93,  0,115,101, 97,114,
- 99,104, 95,109, 97,120, 91, 50, 93,  0,109, 97,114,107,101,114,115,110,114,  0,108, 97,115,116, 95,109, 97,114,107,101,114,  0,
- 42,109, 97,114,107,101,114,115,  0, 98,117,110,100,108,101, 95,112,111,115, 91, 51, 93,  0,112, 97,116, 95,102,108, 97,103,  0,
-115,101, 97,114, 99,104, 95,102,108, 97,103,  0,102,114, 97,109,101,115, 95,108,105,109,105,116,  0,112, 97,116,116,101,114,110,
- 95,109, 97,116, 99,104,  0,116,114, 97, 99,107,101,114,  0,112,121,114, 97,109,105,100, 95,108,101,118,101,108,115,  0,109,105,
-110,105,109,117,109, 95, 99,111,114,114,101,108, 97,116,105,111,110,  0,100,101,102, 97,117,108,116, 95,116,114, 97, 99,107,101,
-114,  0,100,101,102, 97,117,108,116, 95,112,121,114, 97,109,105,100, 95,108,101,118,101,108,115,  0,100,101,102, 97,117,108,116,
- 95,109,105,110,105,109,117,109, 95, 99,111,114,114,101,108, 97,116,105,111,110,  0,100,101,102, 97,117,108,116, 95,112, 97,116,
-116,101,114,110, 95,115,105,122,101,  0,100,101,102, 97,117,108,116, 95,115,101, 97,114, 99,104, 95,115,105,122,101,  0,100,101,
-102, 97,117,108,116, 95,102,114, 97,109,101,115, 95,108,105,109,105,116,  0,100,101,102, 97,117,108,116, 95,109, 97,114,103,105,
-110,  0,100,101,102, 97,117,108,116, 95,112, 97,116,116,101,114,110, 95,109, 97,116, 99,104,  0,100,101,102, 97,117,108,116, 95,
-102,108, 97,103,  0,109,111,116,105,111,110, 95,102,108, 97,103,  0,107,101,121,102,114, 97,109,101, 49,  0,107,101,121,102,114,
- 97,109,101, 50,  0,114,101,102,105,110,101, 95, 99, 97,109,101,114, 97, 95,105,110,116,114,105,110,115,105, 99,115,  0, 99,108,
-101, 97,110, 95,102,114, 97,109,101,115,  0, 99,108,101, 97,110, 95, 97, 99,116,105,111,110,  0, 99,108,101, 97,110, 95,101,114,
-114,111,114,  0,111, 98,106,101, 99,116, 95,100,105,115,116, 97,110, 99,101,  0,116,111,116, 95,116,114, 97, 99,107,  0, 97, 99,
-116, 95,116,114, 97, 99,107,  0,109, 97,120,115, 99, 97,108,101,  0, 42,114,111,116, 95,116,114, 97, 99,107,  0,108,111, 99,105,
-110,102,  0,115, 99, 97,108,101,105,110,102,  0,114,111,116,105,110,102,  0, 42,115, 99, 97,108,101,105, 98,117,102,  0,108, 97,
-115,116, 95, 99, 97,109,101,114, 97,  0, 99, 97,109,110,114,  0, 42, 99, 97,109,101,114, 97,115,  0,116,114, 97, 99,107,115,  0,
-114,101, 99,111,110,115,116,114,117, 99,116,105,111,110,  0,109,101,115,115, 97,103,101, 91, 50, 53, 54, 93,  0,116,111,116, 95,
-115,101,103,109,101,110,116,  0, 42,115,101,103,109,101,110,116,115,  0,109, 97,120, 95,115,101,103,109,101,110,116,  0,116,111,
-116, 97,108, 95,102,114, 97,109,101,115,  0,116,111,116, 95, 99,104, 97,110,110,101,108,  0,115,111,114,116, 95,109,101,116,104,
-111,100,  0,115,111,114,116, 95,105,110,118,101,114,115,101,  0,115,101,116,116,105,110,103,115,  0, 99, 97,109,101,114, 97,  0,
-115,116, 97, 98,105,108,105,122, 97,116,105,111,110,  0, 42, 97, 99,116, 95,116,114, 97, 99,107,  0,111, 98,106,101, 99,116,115,
-  0,111, 98,106,101, 99,116,110,114,  0,116,111,116, 95,111, 98,106,101, 99,116,  0,100,111,112,101,115,104,101,101,116,  0, 42,
- 98,114,117,115,104, 95,103,114,111,117,112,  0, 99,117,114,114,101,110,116, 95,102,114, 97,109,101,  0,100,105,115,112, 95,116,
-121,112,101,  0,105,109, 97,103,101, 95,102,105,108,101,102,111,114,109, 97,116,  0,101,102,102,101, 99,116, 95,117,105,  0,112,
-114,101,118,105,101,119, 95,105,100,  0,105,110,105,116, 95, 99,111,108,111,114, 95,116,121,112,101,  0,112, 97,100, 95,115,  0,
-105,109, 97,103,101, 95,114,101,115,111,108,117,116,105,111,110,  0,115,117, 98,115,116,101,112,115,  0,105,110,105,116, 95, 99,
-111,108,111,114, 91, 52, 93,  0, 42,105,110,105,116, 95,116,101,120,116,117,114,101,  0,105,110,105,116, 95,108, 97,121,101,114,
-110, 97,109,101, 91, 54, 52, 93,  0,100,114,121, 95,115,112,101,101,100,  0, 99,111,108,111,114, 95,100,114,121, 95,116,104,114,
-101,115,104,111,108,100,  0,100,101,112,116,104, 95, 99,108, 97,109,112,  0,100,105,115,112, 95,102, 97, 99,116,111,114,  0,115,
-112,114,101, 97,100, 95,115,112,101,101,100,  0, 99,111,108,111,114, 95,115,112,114,101, 97,100, 95,115,112,101,101,100,  0,115,
-104,114,105,110,107, 95,115,112,101,101,100,  0,100,114,105,112, 95,118,101,108,  0,100,114,105,112, 95, 97, 99, 99,  0,105,110,
-102,108,117,101,110, 99,101, 95,115, 99, 97,108,101,  0,114, 97,100,105,117,115, 95,115, 99, 97,108,101,  0,119, 97,118,101, 95,
-100, 97,109,112,105,110,103,  0,119, 97,118,101, 95,115,112,101,101,100,  0,119, 97,118,101, 95,116,105,109,101,115, 99, 97,108,
-101,  0,119, 97,118,101, 95,115,112,114,105,110,103,  0,105,109, 97,103,101, 95,111,117,116,112,117,116, 95,112, 97,116,104, 91,
- 49, 48, 50, 52, 93,  0,111,117,116,112,117,116, 95,110, 97,109,101, 91, 54, 52, 93,  0,111,117,116,112,117,116, 95,110, 97,109,
-101, 50, 91, 54, 52, 93,  0, 42,112,109,100,  0,115,117,114,102, 97, 99,101,115,  0, 97, 99,116,105,118,101, 95,115,117,114,  0,
-101,114,114,111,114, 91, 54, 52, 93,  0, 99,111,108,108,105,115,105,111,110,  0,119,101,116,110,101,115,115,  0,112, 97,114,116,
-105, 99,108,101, 95,114, 97,100,105,117,115,  0,112, 97,114,116,105, 99,108,101, 95,115,109,111,111,116,104,  0,112, 97,105,110,
-116, 95,100,105,115,116, 97,110, 99,101,  0, 42,112, 97,105,110,116, 95,114, 97,109,112,  0, 42,118,101,108, 95,114, 97,109,112,
-  0,112,114,111,120,105,109,105,116,121, 95,102, 97,108,108,111,102,102,  0,114, 97,121, 95,100,105,114,  0,119, 97,118,101, 95,
-102, 97, 99,116,111,114,  0,119, 97,118,101, 95, 99,108, 97,109,112,  0,109, 97,120, 95,118,101,108,111, 99,105,116,121,  0,115,
-109,117,100,103,101, 95,115,116,114,101,110,103,116,104,  0,  0, 84, 89, 80, 69, 26,  2,  0,  0, 99,104, 97,114,  0,117, 99,104,
- 97,114,  0,115,104,111,114,116,  0,117,115,104,111,114,116,  0,105,110,116,  0,108,111,110,103,  0,117,108,111,110,103,  0,102,
-108,111, 97,116,  0,100,111,117, 98,108,101,  0,105,110,116, 54, 52, 95,116,  0,117,105,110,116, 54, 52, 95,116,  0,118,111,105,
-100,  0, 76,105,110,107,  0, 76,105,110,107, 68, 97,116, 97,  0, 76,105,115,116, 66, 97,115,101,  0,118,101, 99, 50,115,  0,118,
-101, 99, 50,102,  0,118,101, 99, 51,102,  0,114, 99,116,105,  0,114, 99,116,102,  0, 73, 68, 80,114,111,112,101,114,116,121, 68,
- 97,116, 97,  0, 73, 68, 80,114,111,112,101,114,116,121,  0, 73, 68,  0, 76,105, 98,114, 97,114,121,  0, 70,105,108,101, 68, 97,
-116, 97,  0, 80,114,101,118,105,101,119, 73,109, 97,103,101,  0, 73,112,111, 68,114,105,118,101,114,  0, 79, 98,106,101, 99,116,
-  0, 73,112,111, 67,117,114,118,101,  0, 66, 80,111,105,110,116,  0, 66,101,122, 84,114,105,112,108,101,  0, 73,112,111,  0, 75,
-101,121, 66,108,111, 99,107,  0, 75,101,121,  0, 65,110,105,109, 68, 97,116, 97,  0, 84,101,120,116, 76,105,110,101,  0, 84,101,
-120,116, 77, 97,114,107,101,114,  0, 84,101,120,116,  0, 80, 97, 99,107,101,100, 70,105,108,101,  0, 67, 97,109,101,114, 97,  0,
- 73,109, 97,103,101, 85,115,101,114,  0, 83, 99,101,110,101,  0, 73,109, 97,103,101,  0, 71, 80, 85, 84,101,120,116,117,114,101,
-  0, 97,110,105,109,  0, 82,101,110,100,101,114, 82,101,115,117,108,116,  0, 77, 84,101,120,  0, 84,101,120,  0, 80,108,117,103,
-105,110, 84,101,120,  0, 67, 66, 68, 97,116, 97,  0, 67,111,108,111,114, 66, 97,110,100,  0, 69,110,118, 77, 97,112,  0, 73,109,
- 66,117,102,  0, 80,111,105,110,116, 68,101,110,115,105,116,121,  0, 67,117,114,118,101, 77, 97,112,112,105,110,103,  0, 86,111,
-120,101,108, 68, 97,116, 97,  0, 79, 99,101, 97,110, 84,101,120,  0, 98, 78,111,100,101, 84,114,101,101,  0, 84,101,120, 77, 97,
-112,112,105,110,103,  0, 67,111,108,111,114, 77, 97,112,112,105,110,103,  0, 76, 97,109,112,  0, 86,111,108,117,109,101, 83,101,
-116,116,105,110,103,115,  0, 71, 97,109,101, 83,101,116,116,105,110,103,115,  0, 77, 97,116,101,114,105, 97,108,  0, 71,114,111,
-117,112,  0, 86, 70,111,110,116,  0, 86, 70,111,110,116, 68, 97,116, 97,  0, 77,101,116, 97, 69,108,101,109,  0, 66,111,117,110,
-100, 66,111,120,  0, 77,101,116, 97, 66, 97,108,108,  0, 78,117,114, 98,  0, 67,104, 97,114, 73,110,102,111,  0, 84,101,120,116,
- 66,111,120,  0, 69,100,105,116, 78,117,114, 98,  0, 71, 72, 97,115,104,  0, 67,117,114,118,101,  0, 80, 97,116,104,  0, 83,101,
-108, 66,111,120,  0, 69,100,105,116, 70,111,110,116,  0, 77,101,115,104,  0, 77, 83,101,108,101, 99,116,  0, 77, 80,111,108,121,
-  0, 77, 84,101,120, 80,111,108,121,  0, 77, 76,111,111,112,  0, 77, 76,111,111,112, 85, 86,  0, 77, 76,111,111,112, 67,111,108,
-  0, 77, 70, 97, 99,101,  0, 77, 84, 70, 97, 99,101,  0, 84, 70, 97, 99,101,  0, 77, 86,101,114,116,  0, 77, 69,100,103,101,  0,
- 77, 68,101,102,111,114,109, 86,101,114,116,  0, 77, 67,111,108,  0, 77, 83,116,105, 99,107,121,  0, 66, 77, 69,100,105,116, 77,
-101,115,104,  0, 67,117,115,116,111,109, 68, 97,116, 97,  0, 77,117,108,116,105,114,101,115,  0, 77, 68,101,102,111,114,109, 87,
-101,105,103,104,116,  0, 77, 70,108,111, 97,116, 80,114,111,112,101,114,116,121,  0, 77, 73,110,116, 80,114,111,112,101,114,116,
-121,  0, 77, 83,116,114,105,110,103, 80,114,111,112,101,114,116,121,  0, 79,114,105,103, 83,112, 97, 99,101, 70, 97, 99,101,  0,
- 79,114,105,103, 83,112, 97, 99,101, 76,111,111,112,  0, 77, 68,105,115,112,115,  0, 77,117,108,116,105,114,101,115, 67,111,108,
-  0, 77,117,108,116,105,114,101,115, 67,111,108, 70, 97, 99,101,  0, 77,117,108,116,105,114,101,115, 70, 97, 99,101,  0, 77,117,
-108,116,105,114,101,115, 69,100,103,101,  0, 77,117,108,116,105,114,101,115, 76,101,118,101,108,  0, 77, 82,101, 99, 97,115,116,
-  0, 71,114,105,100, 80, 97,105,110,116, 77, 97,115,107,  0, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 77, 97,112,112,
-105,110,103, 73,110,102,111, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 83,117, 98,115,117,114,102, 77,111,100,105,102,
-105,101,114, 68, 97,116, 97,  0, 76, 97,116,116,105, 99,101, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 67,117,114,118,
-101, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 66,117,105,108,100, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0,
- 77, 97,115,107, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 65,114,114, 97,121, 77,111,100,105,102,105,101,114, 68, 97,
-116, 97,  0, 77,105,114,114,111,114, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 69,100,103,101, 83,112,108,105,116, 77,
-111,100,105,102,105,101,114, 68, 97,116, 97,  0, 66,101,118,101,108, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 66, 77,
-101,115,104, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 83,109,111,107,101, 77,111,100,105,102,105,101,114, 68, 97,116,
- 97,  0, 83,109,111,107,101, 68,111,109, 97,105,110, 83,101,116,116,105,110,103,115,  0, 83,109,111,107,101, 70,108,111,119, 83,
-101,116,116,105,110,103,115,  0, 83,109,111,107,101, 67,111,108,108, 83,101,116,116,105,110,103,115,  0, 68,105,115,112,108, 97,
- 99,101, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 85, 86, 80,114,111,106,101, 99,116, 77,111,100,105,102,105,101,114,
- 68, 97,116, 97,  0, 68,101, 99,105,109, 97,116,101, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 83,109,111,111,116,104,
- 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 67, 97,115,116, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 87, 97,
-118,101, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 65,114,109, 97,116,117,114,101, 77,111,100,105,102,105,101,114, 68,
- 97,116, 97,  0, 72,111,111,107, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 83,111,102,116, 98,111,100,121, 77,111,100,
-105,102,105,101,114, 68, 97,116, 97,  0, 67,108,111,116,104, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 67,108,111,116,
-104,  0, 67,108,111,116,104, 83,105,109, 83,101,116,116,105,110,103,115,  0, 67,108,111,116,104, 67,111,108,108, 83,101,116,116,
-105,110,103,115,  0, 80,111,105,110,116, 67, 97, 99,104,101,  0, 67,111,108,108,105,115,105,111,110, 77,111,100,105,102,105,101,
-114, 68, 97,116, 97,  0, 66, 86, 72, 84,114,101,101,  0, 83,117,114,102, 97, 99,101, 77,111,100,105,102,105,101,114, 68, 97,116,
- 97,  0, 68,101,114,105,118,101,100, 77,101,115,104,  0, 66, 86, 72, 84,114,101,101, 70,114,111,109, 77,101,115,104,  0, 66,111,
-111,108,101, 97,110, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 77, 68,101,102, 73,110,102,108,117,101,110, 99,101,  0,
- 77, 68,101,102, 67,101,108,108,  0, 77,101,115,104, 68,101,102,111,114,109, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0,
- 80, 97,114,116,105, 99,108,101, 83,121,115,116,101,109, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 80, 97,114,116,105,
- 99,108,101, 83,121,115,116,101,109,  0, 80, 97,114,116,105, 99,108,101, 73,110,115,116, 97,110, 99,101, 77,111,100,105,102,105,
-101,114, 68, 97,116, 97,  0, 69,120,112,108,111,100,101, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 77,117,108,116,105,
-114,101,115, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 70,108,117,105,100,115,105,109, 77,111,100,105,102,105,101,114,
- 68, 97,116, 97,  0, 70,108,117,105,100,115,105,109, 83,101,116,116,105,110,103,115,  0, 83,104,114,105,110,107,119,114, 97,112,
- 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 83,105,109,112,108,101, 68,101,102,111,114,109, 77,111,100,105,102,105,101,
-114, 68, 97,116, 97,  0, 83,104, 97,112,101, 75,101,121, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 83,111,108,105,100,
-105,102,121, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 83, 99,114,101,119, 77,111,100,105,102,105,101,114, 68, 97,116,
- 97,  0, 79, 99,101, 97,110, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 79, 99,101, 97,110,  0, 79, 99,101, 97,110, 67,
- 97, 99,104,101,  0, 87, 97,114,112, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 87,101,105,103,104,116, 86, 71, 69,100,
-105,116, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 87,101,105,103,104,116, 86, 71, 77,105,120, 77,111,100,105,102,105,
-101,114, 68, 97,116, 97,  0, 87,101,105,103,104,116, 86, 71, 80,114,111,120,105,109,105,116,121, 77,111,100,105,102,105,101,114,
- 68, 97,116, 97,  0, 68,121,110, 97,109,105, 99, 80, 97,105,110,116, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 68,121,
-110, 97,109,105, 99, 80, 97,105,110,116, 67, 97,110,118, 97,115, 83,101,116,116,105,110,103,115,  0, 68,121,110, 97,109,105, 99,
- 80, 97,105,110,116, 66,114,117,115,104, 83,101,116,116,105,110,103,115,  0, 82,101,109,101,115,104, 77,111,100,105,102,105,101,
-114, 68, 97,116, 97,  0, 69,100,105,116, 76, 97,116,116,  0, 76, 97,116,116,105, 99,101,  0, 98, 68,101,102,111,114,109, 71,114,
-111,117,112,  0, 83, 99,117,108,112,116, 83,101,115,115,105,111,110,  0, 98, 65, 99,116,105,111,110,  0, 98, 80,111,115,101,  0,
- 98, 71, 80,100, 97,116, 97,  0, 98, 65,110,105,109, 86,105,122, 83,101,116,116,105,110,103,115,  0, 98, 77,111,116,105,111,110,
- 80, 97,116,104,  0, 66,117,108,108,101,116, 83,111,102,116, 66,111,100,121,  0, 80, 97,114,116, 68,101,102,108,101, 99,116,  0,
- 83,111,102,116, 66,111,100,121,  0, 79, 98, 72,111,111,107,  0, 68,117,112,108,105, 79, 98,106,101, 99,116,  0, 82, 78, 71,  0,
- 69,102,102,101, 99,116,111,114, 87,101,105,103,104,116,115,  0, 80, 84, 67, 97, 99,104,101, 69,120,116,114, 97,  0, 80, 84, 67,
- 97, 99,104,101, 77,101,109,  0, 80, 84, 67, 97, 99,104,101, 69,100,105,116,  0, 83, 66, 86,101,114,116,101,120,  0, 66,111,100,
-121, 80,111,105,110,116,  0, 66,111,100,121, 83,112,114,105,110,103,  0, 83, 66, 83, 99,114, 97,116, 99,104,  0, 70,108,117,105,
-100, 86,101,114,116,101,120, 86,101,108,111, 99,105,116,121,  0, 87,111,114,108,100,  0, 66, 97,115,101,  0, 65,118,105, 67,111,
-100,101, 99, 68, 97,116, 97,  0, 81,117,105, 99,107,116,105,109,101, 67,111,100,101, 99, 68, 97,116, 97,  0, 81,117,105, 99,107,
-116,105,109,101, 67,111,100,101, 99, 83,101,116,116,105,110,103,115,  0, 70, 70, 77,112,101,103, 67,111,100,101, 99, 68, 97,116,
- 97,  0, 65,117,100,105,111, 68, 97,116, 97,  0, 83, 99,101,110,101, 82,101,110,100,101,114, 76, 97,121,101,114,  0, 73,109, 97,
-103,101, 70,111,114,109, 97,116, 68, 97,116, 97,  0, 82,101,110,100,101,114, 68, 97,116, 97,  0, 82,101,110,100,101,114, 80,114,
-111,102,105,108,101,  0, 71, 97,109,101, 68,111,109,101,  0, 71, 97,109,101, 70,114, 97,109,105,110,103,  0, 82,101, 99, 97,115,
-116, 68, 97,116, 97,  0, 71, 97,109,101, 68, 97,116, 97,  0, 84,105,109,101, 77, 97,114,107,101,114,  0, 80, 97,105,110,116,  0,
- 66,114,117,115,104,  0, 73,109, 97,103,101, 80, 97,105,110,116, 83,101,116,116,105,110,103,115,  0, 80, 97,114,116,105, 99,108,
-101, 66,114,117,115,104, 68, 97,116, 97,  0, 80, 97,114,116,105, 99,108,101, 69,100,105,116, 83,101,116,116,105,110,103,115,  0,
- 83, 99,117,108,112,116,  0, 85,118, 83, 99,117,108,112,116,  0, 86, 80, 97,105,110,116,  0, 84,114, 97,110,115,102,111,114,109,
- 79,114,105,101,110,116, 97,116,105,111,110,  0, 85,110,105,102,105,101,100, 80, 97,105,110,116, 83,101,116,116,105,110,103,115,
-  0, 84,111,111,108, 83,101,116,116,105,110,103,115,  0, 98, 83,116, 97,116,115,  0, 85,110,105,116, 83,101,116,116,105,110,103,
-115,  0, 80,104,121,115,105, 99,115, 83,101,116,116,105,110,103,115,  0, 69,100,105,116,105,110,103,  0, 83, 99,101,110,101, 83,
-116, 97,116,115,  0, 68, 97,103, 70,111,114,101,115,116,  0, 77,111,118,105,101, 67,108,105,112,  0, 66, 71,112,105, 99,  0, 77,
-111,118,105,101, 67,108,105,112, 85,115,101,114,  0, 82,101,103,105,111,110, 86,105,101,119, 51, 68,  0, 82,101,110,100,101,114,
- 73,110,102,111,  0, 82,101,110,100,101,114, 69,110,103,105,110,101,  0, 86,105,101,119, 68,101,112,116,104,115,  0, 83,109,111,
-111,116,104, 86,105,101,119, 83,116,111,114,101,  0,119,109, 84,105,109,101,114,  0, 86,105,101,119, 51, 68,  0, 83,112, 97, 99,
-101, 76,105,110,107,  0, 86,105,101,119, 50, 68,  0, 83,112, 97, 99,101, 73,110,102,111,  0, 83,112, 97, 99,101, 73,112,111,  0,
- 98, 68,111,112,101, 83,104,101,101,116,  0, 83,112, 97, 99,101, 66,117,116,115,  0, 83,112, 97, 99,101, 83,101,113,  0, 70,105,
-108,101, 83,101,108,101, 99,116, 80, 97,114, 97,109,115,  0, 83,112, 97, 99,101, 70,105,108,101,  0, 70,105,108,101, 76,105,115,
-116,  0,119,109, 79,112,101,114, 97,116,111,114,  0, 70,105,108,101, 76, 97,121,111,117,116,  0, 83,112, 97, 99,101, 79,111,112,
-115,  0, 84,114,101,101, 83,116,111,114,101,  0, 84,114,101,101, 83,116,111,114,101, 69,108,101,109,  0, 83,112, 97, 99,101, 73,
-109, 97,103,101,  0, 83, 99,111,112,101,115,  0, 72,105,115,116,111,103,114, 97,109,  0, 83,112, 97, 99,101, 78,108, 97,  0, 83,
-112, 97, 99,101, 84,101,120,116,  0, 83, 99,114,105,112,116,  0, 83,112, 97, 99,101, 83, 99,114,105,112,116,  0, 83,112, 97, 99,
-101, 84,105,109,101, 67, 97, 99,104,101,  0, 83,112, 97, 99,101, 84,105,109,101,  0, 83,112, 97, 99,101, 78,111,100,101,  0, 83,
-112, 97, 99,101, 76,111,103,105, 99,  0, 67,111,110,115,111,108,101, 76,105,110,101,  0, 83,112, 97, 99,101, 67,111,110,115,111,
-108,101,  0, 83,112, 97, 99,101, 85,115,101,114, 80,114,101,102,  0, 83,112, 97, 99,101, 67,108,105,112,  0, 77,111,118,105,101,
- 67,108,105,112, 83, 99,111,112,101,115,  0,117,105, 70,111,110,116,  0,117,105, 70,111,110,116, 83,116,121,108,101,  0,117,105,
- 83,116,121,108,101,  0,117,105, 87,105,100,103,101,116, 67,111,108,111,114,115,  0,117,105, 87,105,100,103,101,116, 83,116, 97,
-116,101, 67,111,108,111,114,115,  0,117,105, 80, 97,110,101,108, 67,111,108,111,114,115,  0, 84,104,101,109,101, 85, 73,  0, 84,
-104,101,109,101, 83,112, 97, 99,101,  0, 84,104,101,109,101, 87,105,114,101, 67,111,108,111,114,  0, 98, 84,104,101,109,101,  0,
- 98, 65,100,100,111,110,  0, 83,111,108,105,100, 76,105,103,104,116,  0, 85,115,101,114, 68,101,102,  0, 98, 83, 99,114,101,101,
-110,  0, 83, 99,114, 86,101,114,116,  0, 83, 99,114, 69,100,103,101,  0, 80, 97,110,101,108,  0, 80, 97,110,101,108, 84,121,112,
-101,  0,117,105, 76, 97,121,111,117,116,  0, 83, 99,114, 65,114,101, 97,  0, 83,112, 97, 99,101, 84,121,112,101,  0, 65, 82,101,
-103,105,111,110,  0, 65, 82,101,103,105,111,110, 84,121,112,101,  0, 70,105,108,101, 71,108,111, 98, 97,108,  0, 83,116,114,105,
-112, 69,108,101,109,  0, 83,116,114,105,112, 67,114,111,112,  0, 83,116,114,105,112, 84,114, 97,110,115,102,111,114,109,  0, 83,
-116,114,105,112, 67,111,108,111,114, 66, 97,108, 97,110, 99,101,  0, 83,116,114,105,112, 80,114,111,120,121,  0, 83,116,114,105,
-112,  0, 80,108,117,103,105,110, 83,101,113,  0, 83,101,113,117,101,110, 99,101,  0, 98, 83,111,117,110,100,  0, 77,101,116, 97,
- 83,116, 97, 99,107,  0, 87,105,112,101, 86, 97,114,115,  0, 71,108,111,119, 86, 97,114,115,  0, 84,114, 97,110,115,102,111,114,
-109, 86, 97,114,115,  0, 83,111,108,105,100, 67,111,108,111,114, 86, 97,114,115,  0, 83,112,101,101,100, 67,111,110,116,114,111,
-108, 86, 97,114,115,  0, 69,102,102,101, 99,116,  0, 66,117,105,108,100, 69,102,102,  0, 80, 97,114,116, 69,102,102,  0, 80, 97,
-114,116,105, 99,108,101,  0, 87, 97,118,101, 69,102,102,  0, 98, 80,114,111,112,101,114,116,121,  0, 98, 78,101, 97,114, 83,101,
-110,115,111,114,  0, 98, 77,111,117,115,101, 83,101,110,115,111,114,  0, 98, 84,111,117, 99,104, 83,101,110,115,111,114,  0, 98,
- 75,101,121, 98,111, 97,114,100, 83,101,110,115,111,114,  0, 98, 80,114,111,112,101,114,116,121, 83,101,110,115,111,114,  0, 98,
- 65, 99,116,117, 97,116,111,114, 83,101,110,115,111,114,  0, 98, 68,101,108, 97,121, 83,101,110,115,111,114,  0, 98, 67,111,108,
-108,105,115,105,111,110, 83,101,110,115,111,114,  0, 98, 82, 97,100, 97,114, 83,101,110,115,111,114,  0, 98, 82, 97,110,100,111,
-109, 83,101,110,115,111,114,  0, 98, 82, 97,121, 83,101,110,115,111,114,  0, 98, 65,114,109, 97,116,117,114,101, 83,101,110,115,
-111,114,  0, 98, 77,101,115,115, 97,103,101, 83,101,110,115,111,114,  0, 98, 83,101,110,115,111,114,  0, 98, 67,111,110,116,114,
-111,108,108,101,114,  0, 98, 74,111,121,115,116,105, 99,107, 83,101,110,115,111,114,  0, 98, 69,120,112,114,101,115,115,105,111,
-110, 67,111,110,116,  0, 98, 80,121,116,104,111,110, 67,111,110,116,  0, 98, 65, 99,116,117, 97,116,111,114,  0, 98, 65,100,100,
- 79, 98,106,101, 99,116, 65, 99,116,117, 97,116,111,114,  0, 98, 65, 99,116,105,111,110, 65, 99,116,117, 97,116,111,114,  0, 83,
-111,117,110,100, 51, 68,  0, 98, 83,111,117,110,100, 65, 99,116,117, 97,116,111,114,  0, 98, 69,100,105,116, 79, 98,106,101, 99,
-116, 65, 99,116,117, 97,116,111,114,  0, 98, 83, 99,101,110,101, 65, 99,116,117, 97,116,111,114,  0, 98, 80,114,111,112,101,114,
-116,121, 65, 99,116,117, 97,116,111,114,  0, 98, 79, 98,106,101, 99,116, 65, 99,116,117, 97,116,111,114,  0, 98, 73,112,111, 65,
- 99,116,117, 97,116,111,114,  0, 98, 67, 97,109,101,114, 97, 65, 99,116,117, 97,116,111,114,  0, 98, 67,111,110,115,116,114, 97,
-105,110,116, 65, 99,116,117, 97,116,111,114,  0, 98, 71,114,111,117,112, 65, 99,116,117, 97,116,111,114,  0, 98, 82, 97,110,100,
-111,109, 65, 99,116,117, 97,116,111,114,  0, 98, 77,101,115,115, 97,103,101, 65, 99,116,117, 97,116,111,114,  0, 98, 71, 97,109,
-101, 65, 99,116,117, 97,116,111,114,  0, 98, 86,105,115,105, 98,105,108,105,116,121, 65, 99,116,117, 97,116,111,114,  0, 98, 84,
-119,111, 68, 70,105,108,116,101,114, 65, 99,116,117, 97,116,111,114,  0, 98, 80, 97,114,101,110,116, 65, 99,116,117, 97,116,111,
-114,  0, 98, 83,116, 97,116,101, 65, 99,116,117, 97,116,111,114,  0, 98, 65,114,109, 97,116,117,114,101, 65, 99,116,117, 97,116,
-111,114,  0, 98, 83,116,101,101,114,105,110,103, 65, 99,116,117, 97,116,111,114,  0, 71,114,111,117,112, 79, 98,106,101, 99,116,
-  0, 66,111,110,101,  0, 98, 65,114,109, 97,116,117,114,101,  0, 98, 77,111,116,105,111,110, 80, 97,116,104, 86,101,114,116,  0,
- 98, 80,111,115,101, 67,104, 97,110,110,101,108,  0, 98, 73, 75, 80, 97,114, 97,109,  0, 98, 73,116, 97,115, 99,  0, 98, 65, 99,
-116,105,111,110, 71,114,111,117,112,  0, 83,112, 97, 99,101, 65, 99,116,105,111,110,  0, 98, 65, 99,116,105,111,110, 67,104, 97,
-110,110,101,108,  0, 98, 67,111,110,115,116,114, 97,105,110,116, 67,104, 97,110,110,101,108,  0, 98, 67,111,110,115,116,114, 97,
-105,110,116,  0, 98, 67,111,110,115,116,114, 97,105,110,116, 84, 97,114,103,101,116,  0, 98, 80,121,116,104,111,110, 67,111,110,
-115,116,114, 97,105,110,116,  0, 98, 75,105,110,101,109, 97,116,105, 99, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 83,112,
-108,105,110,101, 73, 75, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 84,114, 97, 99,107, 84,111, 67,111,110,115,116,114, 97,
-105,110,116,  0, 98, 82,111,116, 97,116,101, 76,105,107,101, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 76,111, 99, 97,116,
-101, 76,105,107,101, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 83,105,122,101, 76,105,107,101, 67,111,110,115,116,114, 97,
-105,110,116,  0, 98, 83, 97,109,101, 86,111,108,117,109,101, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 84,114, 97,110,115,
- 76,105,107,101, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 77,105,110, 77, 97,120, 67,111,110,115,116,114, 97,105,110,116,
-  0, 98, 65, 99,116,105,111,110, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 76,111, 99,107, 84,114, 97, 99,107, 67,111,110,
-115,116,114, 97,105,110,116,  0, 98, 68, 97,109,112, 84,114, 97, 99,107, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 70,111,
-108,108,111,119, 80, 97,116,104, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 83,116,114,101,116, 99,104, 84,111, 67,111,110,
-115,116,114, 97,105,110,116,  0, 98, 82,105,103,105,100, 66,111,100,121, 74,111,105,110,116, 67,111,110,115,116,114, 97,105,110,
-116,  0, 98, 67,108, 97,109,112, 84,111, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 67,104,105,108,100, 79,102, 67,111,110,
-115,116,114, 97,105,110,116,  0, 98, 84,114, 97,110,115,102,111,114,109, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 80,105,
-118,111,116, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 76,111, 99, 76,105,109,105,116, 67,111,110,115,116,114, 97,105,110,
-116,  0, 98, 82,111,116, 76,105,109,105,116, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 83,105,122,101, 76,105,109,105,116,
- 67,111,110,115,116,114, 97,105,110,116,  0, 98, 68,105,115,116, 76,105,109,105,116, 67,111,110,115,116,114, 97,105,110,116,  0,
- 98, 83,104,114,105,110,107,119,114, 97,112, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 70,111,108,108,111,119, 84,114, 97,
- 99,107, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 67, 97,109,101,114, 97, 83,111,108,118,101,114, 67,111,110,115,116,114,
- 97,105,110,116,  0, 98, 79, 98,106,101, 99,116, 83,111,108,118,101,114, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 65, 99,
-116,105,111,110, 77,111,100,105,102,105,101,114,  0, 98, 65, 99,116,105,111,110, 83,116,114,105,112,  0, 98, 78,111,100,101, 83,
-116, 97, 99,107,  0, 98, 78,111,100,101, 83,111, 99,107,101,116,  0, 98, 78,111,100,101, 76,105,110,107,  0, 98, 78,111,100,101,
- 80,114,101,118,105,101,119,  0, 98, 78,111,100,101,  0,117,105, 66,108,111, 99,107,  0, 98, 78,111,100,101, 84,121,112,101,  0,
- 98, 78,111,100,101, 84,114,101,101, 69,120,101, 99,  0, 98, 78,111,100,101, 83,111, 99,107,101,116, 86, 97,108,117,101, 73,110,
-116,  0, 98, 78,111,100,101, 83,111, 99,107,101,116, 86, 97,108,117,101, 70,108,111, 97,116,  0, 98, 78,111,100,101, 83,111, 99,
-107,101,116, 86, 97,108,117,101, 66,111,111,108,101, 97,110,  0, 98, 78,111,100,101, 83,111, 99,107,101,116, 86, 97,108,117,101,
- 86,101, 99,116,111,114,  0, 98, 78,111,100,101, 83,111, 99,107,101,116, 86, 97,108,117,101, 82, 71, 66, 65,  0, 78,111,100,101,
- 70,114, 97,109,101,  0, 78,111,100,101, 73,109, 97,103,101, 65,110,105,109,  0, 67,111,108,111,114, 67,111,114,114,101, 99,116,
-105,111,110, 68, 97,116, 97,  0, 78,111,100,101, 67,111,108,111,114, 67,111,114,114,101, 99,116,105,111,110,  0, 78,111,100,101,
- 66,111,107,101,104, 73,109, 97,103,101,  0, 78,111,100,101, 66,111,120, 77, 97,115,107,  0, 78,111,100,101, 69,108,108,105,112,
-115,101, 77, 97,115,107,  0, 78,111,100,101, 73,109, 97,103,101, 76, 97,121,101,114,  0, 78,111,100,101, 66,108,117,114, 68, 97,
-116, 97,  0, 78,111,100,101, 68, 66,108,117,114, 68, 97,116, 97,  0, 78,111,100,101, 66,105,108, 97,116,101,114, 97,108, 66,108,
-117,114, 68, 97,116, 97,  0, 78,111,100,101, 72,117,101, 83, 97,116,  0, 78,111,100,101, 73,109, 97,103,101, 70,105,108,101,  0,
- 78,111,100,101, 73,109, 97,103,101, 77,117,108,116,105, 70,105,108,101,  0, 78,111,100,101, 73,109, 97,103,101, 77,117,108,116,
-105, 70,105,108,101, 83,111, 99,107,101,116,  0, 78,111,100,101, 67,104,114,111,109, 97,  0, 78,111,100,101, 84,119,111, 88, 89,
-115,  0, 78,111,100,101, 84,119,111, 70,108,111, 97,116,115,  0, 78,111,100,101, 71,101,111,109,101,116,114,121,  0, 78,111,100,
-101, 86,101,114,116,101,120, 67,111,108,  0, 78,111,100,101, 68,101,102,111, 99,117,115,  0, 78,111,100,101, 83, 99,114,105,112,
-116, 68,105, 99,116,  0, 78,111,100,101, 71,108, 97,114,101,  0, 78,111,100,101, 84,111,110,101,109, 97,112,  0, 78,111,100,101,
- 76,101,110,115, 68,105,115,116,  0, 78,111,100,101, 67,111,108,111,114, 66, 97,108, 97,110, 99,101,  0, 78,111,100,101, 67,111,
-108,111,114,115,112,105,108,108,  0, 78,111,100,101, 84,101,120, 66, 97,115,101,  0, 78,111,100,101, 84,101,120, 83,107,121,  0,
- 78,111,100,101, 84,101,120, 73,109, 97,103,101,  0, 78,111,100,101, 84,101,120, 67,104,101, 99,107,101,114,  0, 78,111,100,101,
- 84,101,120, 69,110,118,105,114,111,110,109,101,110,116,  0, 78,111,100,101, 84,101,120, 71,114, 97,100,105,101,110,116,  0, 78,
-111,100,101, 84,101,120, 78,111,105,115,101,  0, 78,111,100,101, 84,101,120, 86,111,114,111,110,111,105,  0, 78,111,100,101, 84,
-101,120, 77,117,115,103,114, 97,118,101,  0, 78,111,100,101, 84,101,120, 87, 97,118,101,  0, 78,111,100,101, 84,101,120, 77, 97,
-103,105, 99,  0, 78,111,100,101, 83,104, 97,100,101,114, 65,116,116,114,105, 98,117,116,101,  0, 84,101,120, 78,111,100,101, 79,
-117,116,112,117,116,  0, 67,117,114,118,101, 77, 97,112, 80,111,105,110,116,  0, 67,117,114,118,101, 77, 97,112,  0, 66,114,117,
-115,104, 67,108,111,110,101,  0, 67,117,115,116,111,109, 68, 97,116, 97, 76, 97,121,101,114,  0, 67,117,115,116,111,109, 68, 97,
-116, 97, 69,120,116,101,114,110, 97,108,  0, 72, 97,105,114, 75,101,121,  0, 80, 97,114,116,105, 99,108,101, 75,101,121,  0, 66,
-111,105,100, 80, 97,114,116,105, 99,108,101,  0, 66,111,105,100, 68, 97,116, 97,  0, 80, 97,114,116,105, 99,108,101, 83,112,114,
-105,110,103,  0, 67,104,105,108,100, 80, 97,114,116,105, 99,108,101,  0, 80, 97,114,116,105, 99,108,101, 84, 97,114,103,101,116,
-  0, 80, 97,114,116,105, 99,108,101, 68,117,112,108,105, 87,101,105,103,104,116,  0, 80, 97,114,116,105, 99,108,101, 68, 97,116,
- 97,  0, 83, 80, 72, 70,108,117,105,100, 83,101,116,116,105,110,103,115,  0, 80, 97,114,116,105, 99,108,101, 83,101,116,116,105,
-110,103,115,  0, 66,111,105,100, 83,101,116,116,105,110,103,115,  0, 80, 97,114,116,105, 99,108,101, 67, 97, 99,104,101, 75,101,
-121,  0, 75, 68, 84,114,101,101,  0, 80, 97,114,116,105, 99,108,101, 68,114, 97,119, 68, 97,116, 97,  0, 76,105,110,107, 78,111,
-100,101,  0, 98, 71, 80, 68,115,112,111,105,110,116,  0, 98, 71, 80, 68,115,116,114,111,107,101,  0, 98, 71, 80, 68,102,114, 97,
-109,101,  0, 98, 71, 80, 68,108, 97,121,101,114,  0, 82,101,112,111,114,116, 76,105,115,116,  0,119,109, 87,105,110,100,111,119,
- 77, 97,110, 97,103,101,114,  0,119,109, 87,105,110,100,111,119,  0,119,109, 75,101,121, 67,111,110,102,105,103,  0,119,109, 69,
-118,101,110,116,  0,119,109, 83,117, 98, 87,105,110,100,111,119,  0,119,109, 71,101,115,116,117,114,101,  0,119,109, 75,101,121,
- 77, 97,112, 73,116,101,109,  0, 80,111,105,110,116,101,114, 82, 78, 65,  0,119,109, 75,101,121, 77, 97,112, 68,105,102,102, 73,
-116,101,109,  0,119,109, 75,101,121, 77, 97,112,  0,119,109, 79,112,101,114, 97,116,111,114, 84,121,112,101,  0, 70, 77,111,100,
-105,102,105,101,114,  0, 70, 77,111,100, 95, 71,101,110,101,114, 97,116,111,114,  0, 70, 77,111,100, 95, 70,117,110, 99,116,105,
-111,110, 71,101,110,101,114, 97,116,111,114,  0, 70, 67, 77, 95, 69,110,118,101,108,111,112,101, 68, 97,116, 97,  0, 70, 77,111,
-100, 95, 69,110,118,101,108,111,112,101,  0, 70, 77,111,100, 95, 67,121, 99,108,101,115,  0, 70, 77,111,100, 95, 80,121,116,104,
-111,110,  0, 70, 77,111,100, 95, 76,105,109,105,116,115,  0, 70, 77,111,100, 95, 78,111,105,115,101,  0, 70, 77,111,100, 95, 83,
-116,101,112,112,101,100,  0, 68,114,105,118,101,114, 84, 97,114,103,101,116,  0, 68,114,105,118,101,114, 86, 97,114,  0, 67,104,
- 97,110,110,101,108, 68,114,105,118,101,114,  0, 70, 80,111,105,110,116,  0, 70, 67,117,114,118,101,  0, 65,110,105,109, 77, 97,
-112, 80, 97,105,114,  0, 65,110,105,109, 77, 97,112,112,101,114,  0, 78,108, 97, 83,116,114,105,112,  0, 78,108, 97, 84,114, 97,
- 99,107,  0, 75, 83, 95, 80, 97,116,104,  0, 75,101,121,105,110,103, 83,101,116,  0, 65,110,105,109, 79,118,101,114,114,105,100,
-101,  0, 73,100, 65,100,116, 84,101,109,112,108, 97,116,101,  0, 66,111,105,100, 82,117,108,101,  0, 66,111,105,100, 82,117,108,
-101, 71,111, 97,108, 65,118,111,105,100,  0, 66,111,105,100, 82,117,108,101, 65,118,111,105,100, 67,111,108,108,105,115,105,111,
-110,  0, 66,111,105,100, 82,117,108,101, 70,111,108,108,111,119, 76,101, 97,100,101,114,  0, 66,111,105,100, 82,117,108,101, 65,
-118,101,114, 97,103,101, 83,112,101,101,100,  0, 66,111,105,100, 82,117,108,101, 70,105,103,104,116,  0, 66,111,105,100, 83,116,
- 97,116,101,  0, 70, 76, 85, 73, 68, 95, 51, 68,  0, 87, 84, 85, 82, 66, 85, 76, 69, 78, 67, 69,  0, 83,112,101, 97,107,101,114,
-  0, 77,111,118,105,101, 67,108,105,112, 80,114,111,120,121,  0, 77,111,118,105,101, 67,108,105,112, 67, 97, 99,104,101,  0, 77,
-111,118,105,101, 84,114, 97, 99,107,105,110,103,  0, 77,111,118,105,101, 84,114, 97, 99,107,105,110,103, 84,114, 97, 99,107,  0,
- 77,111,118,105,101, 84,114, 97, 99,107,105,110,103, 77, 97,114,107,101,114,  0, 77,111,118,105,101, 82,101, 99,111,110,115,116,
-114,117, 99,116,101,100, 67, 97,109,101,114, 97,  0, 77,111,118,105,101, 84,114, 97, 99,107,105,110,103, 67, 97,109,101,114, 97,
-  0, 77,111,118,105,101, 84,114, 97, 99,107,105,110,103, 83,101,116,116,105,110,103,115,  0, 77,111,118,105,101, 84,114, 97, 99,
-107,105,110,103, 83,116, 97, 98,105,108,105,122, 97,116,105,111,110,  0, 77,111,118,105,101, 84,114, 97, 99,107,105,110,103, 82,
-101, 99,111,110,115,116,114,117, 99,116,105,111,110,  0, 77,111,118,105,101, 84,114, 97, 99,107,105,110,103, 79, 98,106,101, 99,
-116,  0, 77,111,118,105,101, 84,114, 97, 99,107,105,110,103, 83,116, 97,116,115,  0, 77,111,118,105,101, 84,114, 97, 99,107,105,
-110,103, 68,111,112,101,115,104,101,101,116, 67,104, 97,110,110,101,108,  0, 77,111,118,105,101, 84,114, 97, 99,107,105,110,103,
- 68,111,112,101,115,104,101,101,116,  0, 68,121,110, 97,109,105, 99, 80, 97,105,110,116, 83,117,114,102, 97, 99,101,  0, 80, 97,
-105,110,116, 83,117,114,102, 97, 99,101, 68, 97,116, 97,  0,  0, 84, 76, 69, 78,  1,  0,  1,  0,  2,  0,  2,  0,  4,  0,  4,  0,
-  4,  0,  4,  0,  8,  0,  8,  0,  8,  0,  0,  0, 16,  0, 24,  0, 16,  0,  4,  0,  8,  0, 12,  0, 16,  0, 16,  0, 32,  0,128,  0,
-120,  0,144,  8,  0,  0, 40,  0,144,  0,112,  5,112,  0, 36,  0, 56,  0,160,  0,192,  0,224,  0, 96,  0, 40,  0, 48,  0,224,  0,
- 16,  0,200,  0, 40,  0,216, 11, 48,  5,  0,  0,  0,  0,  0,  0, 56,  1,168,  1,216,  4, 24,  0,  8,  3,200,  0,  0,  0,104,  0,
- 64,  1, 56,  4, 80,  0, 32,  1,144,  0, 56,  3, 16,  2, 88,  0, 16,  0,128,  3,152,  0,136,  4,  0,  0,104,  0,104,  0,  0,  1,
- 80,  0,  8,  0, 16,  0, 32,  0,  0,  0, 16,  2,  0,  0,  0,  0,  0,  0, 16,  5,  8,  0, 12,  0, 16,  0,  8,  0, 12,  0,  4,  0,
- 20,  0, 48,  0, 64,  0, 20,  0, 12,  0, 16,  0,  4,  0,  8,  0,  0,  0,184,  0,160,  1,  8,  0,  4,  0,  4,  0,  0,  1, 32,  0,
-  8,  0, 24,  0, 16,  0, 64,  0, 24,  0, 12,  0, 64,  0,  4,  0, 16,  0,112,  0,200,  0,136,  0,192,  0,192,  0,128,  0,192,  0,
-192,  0,128,  0,120,  0,200,  0,120,  0,144,  0, 16,  1, 56,  0,200,  0, 24,  1, 40,  1,120,  0,184,  0,200,  0, 64,  1,200,  0,
- 88,  1,112,  0,168,  0,  0,  0,152,  0, 48,  0, 40,  5,192,  0,  0,  0,152,  0,  0,  0,  0,  0,128,  0,  8,  0,  8,  0,112,  1,
-144,  0,152,  2,136,  0,192,  0,120,  0,128,  0,224,  4,208,  0,200,  0,112,  0,208,  0,144,  0, 16,  5,  0,  0,  0,  0, 48,  1,
-104,  1,160,  1,104,  1,136,  0,104,  0,112,  0,128,  0, 16,  0, 96,  1, 88,  0,  0,  0,200,  0,216,  0,152,  0, 48,  0, 24,  0,
-120,  0,152,  0,216,  1,  0,  1,184,  0,  0,  0, 72,  0, 32,  0,176,  0,  0,  0, 16,  0,  0,  0,  0,  0,  0,  0, 12,  0, 24,  2,
- 40,  0,184,  0,152,  0, 64,  0, 72,  0, 32,  0,128,  0, 24,  0, 56,  9, 64,  0, 24,  0, 16,  0, 56,  0,168,  0, 96,  0, 32,  0,
- 96,  6, 56,  0, 16,  0,168,  0,104,  0, 32,  0, 64,  0,120,  0, 24,  0,248,  1, 32,  0,  8,  0, 24,  0, 80,  8,  0,  0,  0,  0,
-224,  8,104,  0,  8,  0,112,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 96,  1, 56,  0,144,  0, 64,  0,240,  0,112,  0,248,  0,
-240,  0,160,  7,104,  0,  0,  0,168,  0,  0,  0, 24,  1, 16,  0, 16,  0, 40, 33,128, 16, 24, 16,216,  0,160,  2,168,  5, 64,  0,
- 24,  0,208,  0, 48,  1, 72,  0, 40,  0,136,  1,104,  0, 56,  1, 56,  0, 24,  4, 32,  0,232,  0, 32,  0, 32,  0,  8,  0, 80,  3,
-224,  1, 16,  0,168, 36, 80,  0, 56,  0,112, 38,  8,  1, 32,  0, 40,  0, 88,  1,  0,  0,  0,  0,160,  0,  0,  0, 40,  1,  0,  0,
- 48,  4,  8,  1, 16,  0,  8,  0, 44,  0, 16,  4, 72,  3,200,  4, 80,  1,208,  4, 32,  0, 12,  0, 24,  0, 32,  0, 16,  0, 24,  0,
- 24,  0, 32,  0,136,  1,  0,  0, 64,  0, 96,  0, 80,  0,  8,  0, 80,  0,136,  0,200,  0, 72,  0,  8,  0,136,  0, 76,  0, 72,  0,
-204,  0,136,  0,136,  0,128,  0,136,  0, 92,  0,128,  0, 80,  0,112,  0, 16,  0,168,  0, 32,  0, 72,  0,120,  0, 24,  0,144,  0,
-112,  0,148,  0, 32,  0,128,  0, 88,  0, 88,  0,208,  0,140,  0,  4,  0, 24,  0, 16,  0,  8,  0,160,  0, 48,  0, 40,  0, 72,  1,
-  0,  1, 16,  0, 32,  2,  4,  0, 40,  0,120,  0, 72,  1,120,  0, 56,  0,120,  0,160,  0,112,  0,184,  0, 24,  0, 88,  0, 80,  0,
- 80,  0, 80,  0,  8,  0, 72,  0,104,  0,104,  0, 80,  0, 80,  0, 24,  0, 88,  0,104,  0, 16,  0,144,  0,128,  0, 88,  0, 28,  0,
- 28,  0, 28,  0, 88,  0, 24,  0,160,  0, 16,  0,152,  0, 72,  0,168,  0, 48,  0,208,  0, 56,  0, 16,  0,112,  1,  0,  0,  0,  0,
-  0,  0, 16,  0, 16,  0,  4,  0, 24,  0, 16,  0,  4,  0, 16,  0, 24,  0,104,  0, 20,  0, 24,  0, 24,  0,  8,  0, 40,  0, 28,  0,
- 12,  0, 12,  0, 32,  4, 40,  4, 64,  4, 44,  0, 24,  0,  8,  0,128,  0, 64,  0, 32,  0, 16,  0, 32,  0, 32,  0,  8,  0, 96,  0,
- 20,  0,200,  3,216,  3,208,  3,200,  3,208,  3,208,  3,200,  3,208,  3,208,  3,208,  3,208,  3, 64,  0, 64,  0, 12,  0, 56,  0,
- 24,  0,104,  0,  0,  4, 24,  0, 56,  0, 56,  0, 20,  0, 16,  0, 64,  0, 40,  0, 32,  0,192,  0, 60,  0, 16,  3,104,  0,  0,  0,
-  0,  0,  0,  0,  0,  0, 16,  0, 32,  0, 40,  0,192,  0, 40,  0, 88,  1,  0,  1,168,  0,  0,  0,  0,  0,  0,  0,184,  0,  0,  0,
- 32,  0,136,  0,  0,  0,120,  0, 24,  0, 24,  0, 16,  0, 24,  0,  8,  0, 16,  0, 24,  0, 20,  0, 20,  0, 56,  0, 24,  2, 40,  1,
- 16,  0,104,  0,  0,  1, 40,  0,208,  0,104,  0,112,  0,216,  1, 32,  0,128,  0, 56,  0, 80,  0, 64,  0,104,  0, 72,  0, 64,  0,
-128,  0,  0,  0,  0,  0,184,  0,  8,  3,  0,  0, 24,  1,192,  0, 16,  0, 72,  0, 48,  0, 64,  0, 56,  0, 24,  0,128,  0,  0,  1,
- 48,  0, 32,  0, 16,  6,  0,  0, 83, 84, 82, 67,217,  1,  0,  0, 12,  0,  2,  0, 12,  0,  0,  0, 12,  0,  1,  0, 13,  0,  3,  0,
- 13,  0,  0,  0, 13,  0,  1,  0, 11,  0,  2,  0, 14,  0,  2,  0, 11,  0,  3,  0, 11,  0,  4,  0, 15,  0,  2,  0,  2,  0,  5,  0,
-  2,  0,  6,  0, 16,  0,  2,  0,  7,  0,  5,  0,  7,  0,  6,  0, 17,  0,  3,  0,  7,  0,  5,  0,  7,  0,  6,  0,  7,  0,  7,  0,
- 18,  0,  4,  0,  4,  0,  8,  0,  4,  0,  9,  0,  4,  0, 10,  0,  4,  0, 11,  0, 19,  0,  4,  0,  7,  0,  8,  0,  7,  0,  9,  0,
-  7,  0, 10,  0,  7,  0, 11,  0, 20,  0,  4,  0, 11,  0, 12,  0, 14,  0, 13,  0,  4,  0, 14,  0,  4,  0, 15,  0, 21,  0, 10,  0,
- 21,  0,  0,  0, 21,  0,  1,  0,  0,  0, 16,  0,  0,  0, 17,  0,  2,  0, 18,  0,  0,  0, 19,  0,  4,  0, 20,  0, 20,  0, 21,  0,
-  4,  0, 22,  0,  4,  0, 23,  0, 22,  0, 11,  0, 11,  0,  0,  0, 11,  0,  1,  0, 22,  0, 24,  0, 23,  0, 25,  0,  0,  0, 26,  0,
-  2,  0, 27,  0,  2,  0, 28,  0,  2,  0, 18,  0,  4,  0, 29,  0,  4,  0, 30,  0, 21,  0, 31,  0, 23,  0,  6,  0, 22,  0, 32,  0,
- 22,  0, 33,  0, 24,  0, 34,  0,  0,  0, 35,  0,  0,  0, 36,  0, 23,  0, 37,  0, 25,  0,  5,  0,  4,  0, 38,  0,  4,  0, 39,  0,
-  2,  0, 40,  0,  2,  0, 41,  0,  4,  0, 42,  0, 26,  0,  6,  0, 27,  0, 43,  0,  2,  0, 44,  0,  2,  0, 45,  0,  2,  0, 16,  0,
-  2,  0, 18,  0,  0,  0, 46,  0, 28,  0, 21,  0, 28,  0,  0,  0, 28,  0,  1,  0, 29,  0, 47,  0, 30,  0, 48,  0, 19,  0, 49,  0,
- 19,  0, 50,  0,  2,  0, 44,  0,  2,  0, 45,  0,  2,  0, 51,  0,  2,  0, 52,  0,  2,  0, 53,  0,  2,  0, 54,  0,  2,  0, 18,  0,
-  2,  0, 55,  0,  7,  0, 10,  0,  7,  0, 11,  0,  4,  0, 56,  0,  7,  0, 57,  0,  7,  0, 58,  0,  7,  0, 59,  0, 26,  0, 60,  0,
- 31,  0,  7,  0, 22,  0, 32,  0, 14,  0, 61,  0, 19,  0, 62,  0,  2,  0, 44,  0,  2,  0, 63,  0,  2,  0, 64,  0,  2,  0, 27,  0,
- 32,  0, 16,  0, 32,  0,  0,  0, 32,  0,  1,  0,  7,  0, 65,  0,  7,  0, 59,  0,  2,  0, 16,  0,  2,  0, 66,  0,  2,  0, 67,  0,
-  2,  0, 18,  0,  4,  0, 68,  0,  4,  0, 69,  0, 11,  0,  2,  0,  7,  0, 70,  0,  0,  0, 19,  0,  0,  0, 71,  0,  7,  0, 72,  0,
-  7,  0, 73,  0, 33,  0, 15,  0, 22,  0, 32,  0, 34,  0, 74,  0, 32,  0, 75,  0,  0,  0, 76,  0,  4,  0, 77,  0,  4,  0, 27,  0,
- 14,  0, 78,  0, 31,  0, 79,  0, 22,  0, 80,  0,  2,  0, 16,  0,  2,  0, 81,  0,  2,  0, 82,  0,  2,  0, 18,  0,  7,  0, 83,  0,
-  4,  0, 84,  0, 35,  0,  6,  0, 35,  0,  0,  0, 35,  0,  1,  0,  0,  0, 85,  0,  0,  0, 86,  0,  4,  0, 22,  0,  4,  0, 87,  0,
- 36,  0, 10,  0, 36,  0,  0,  0, 36,  0,  1,  0,  4,  0, 88,  0,  4,  0, 89,  0,  4,  0, 90,  0,  4,  0, 66,  0,  4,  0, 13,  0,
-  4,  0, 91,  0,  0,  0, 92,  0,  0,  0, 93,  0, 37,  0, 15,  0, 22,  0, 32,  0,  0,  0, 94,  0,  4,  0, 91,  0,  4,  0, 95,  0,
- 14,  0, 96,  0, 35,  0, 97,  0, 35,  0, 98,  0,  4,  0, 99,  0,  4,  0,100,  0, 14,  0,101,  0,  0,  0,102,  0,  4,  0,103,  0,
-  4,  0,104,  0, 11,  0,105,  0,  8,  0,106,  0, 38,  0,  3,  0,  4,  0,107,  0,  4,  0,108,  0, 11,  0,  2,  0, 39,  0, 20,  0,
- 22,  0, 32,  0, 34,  0, 74,  0,  0,  0, 16,  0,  0,  0,109,  0,  2,  0, 18,  0,  7,  0,110,  0,  7,  0,111,  0,  7,  0,112,  0,
-  7,  0,113,  0,  7,  0,114,  0,  7,  0,115,  0,  7,  0,116,  0,  7,  0,117,  0,  7,  0,118,  0,  7,  0,119,  0,  7,  0,120,  0,
- 31,  0, 79,  0, 27,  0,121,  0,  0,  0,122,  0,  0,  0,123,  0, 40,  0, 14,  0, 41,  0,124,  0,  4,  0,125,  0,  4,  0,126,  0,
-  4,  0,127,  0,  4,  0,128,  0,  0,  0,129,  0,  0,  0,130,  0,  0,  0,131,  0,  0,  0, 27,  0,  2,  0,132,  0,  2,  0,133,  0,
-  2,  0,134,  0,  2,  0, 18,  0,  4,  0, 30,  0, 42,  0, 33,  0, 22,  0, 32,  0,  0,  0, 35,  0, 14,  0,135,  0, 43,  0,136,  0,
- 44,  0,137,  0, 45,  0,138,  0, 45,  0,139,  0,  2,  0,140,  0,  2,  0,141,  0,  2,  0,131,  0,  2,  0, 18,  0,  2,  0,142,  0,
-  2,  0, 16,  0,  4,  0,143,  0,  2,  0,144,  0,  2,  0,145,  0,  2,  0,146,  0,  2,  0,147,  0,  2,  0,148,  0,  2,  0,149,  0,
-  4,  0,150,  0,  4,  0,151,  0, 38,  0,152,  0, 25,  0,153,  0,  7,  0,154,  0,  4,  0,155,  0,  2,  0,156,  0,  2,  0,157,  0,
-  2,  0,158,  0,  0,  0,159,  0,  0,  0,160,  0,  7,  0,161,  0,  7,  0,162,  0, 46,  0, 65,  0,  2,  0,163,  0,  2,  0,164,  0,
-  2,  0,165,  0,  2,  0,166,  0, 27,  0,167,  0, 47,  0,168,  0,  0,  0,169,  0,  0,  0,170,  0,  0,  0,171,  0,  0,  0,172,  0,
-  0,  0,173,  0,  7,  0,174,  0,  7,  0,175,  0,  7,  0,176,  0,  2,  0,177,  0,  2,  0,178,  0,  2,  0,179,  0,  2,  0,180,  0,
-  2,  0,181,  0,  2,  0,182,  0,  0,  0,183,  0,  0,  0,123,  0,  7,  0,184,  0,  7,  0,185,  0,  7,  0,186,  0,  7,  0,187,  0,
-  7,  0,188,  0,  7,  0, 55,  0,  7,  0,189,  0,  7,  0,190,  0,  7,  0,191,  0,  7,  0,192,  0,  7,  0,193,  0,  7,  0,194,  0,
-  7,  0,195,  0,  7,  0,196,  0,  7,  0,197,  0,  7,  0,198,  0,  7,  0,199,  0,  7,  0,200,  0,  7,  0,201,  0,  7,  0,202,  0,
-  7,  0,203,  0,  7,  0,204,  0,  7,  0,205,  0,  7,  0,206,  0,  7,  0,207,  0,  7,  0,208,  0,  7,  0,209,  0,  7,  0,210,  0,
-  7,  0,211,  0,  7,  0,212,  0,  7,  0,213,  0,  7,  0,214,  0,  7,  0,215,  0,  7,  0,216,  0,  7,  0,217,  0,  7,  0,218,  0,
-  7,  0,219,  0,  7,  0,220,  0,  7,  0,221,  0,  7,  0,222,  0,  7,  0,223,  0,  7,  0,224,  0,  7,  0,225,  0, 48,  0, 15,  0,
-  0,  0, 35,  0, 11,  0,226,  0,  0,  0,227,  0,  0,  0,228,  0,  4,  0,229,  0,  4,  0,230,  0, 11,  0,231,  0,  7,  0,232,  0,
-  7,  0,233,  0,  7,  0,234,  0,  4,  0,235,  0, 11,  0,236,  0, 11,  0,237,  0,  4,  0,238,  0,  4,  0, 27,  0, 49,  0,  6,  0,
-  7,  0,184,  0,  7,  0,185,  0,  7,  0,186,  0,  7,  0,239,  0,  7,  0, 65,  0,  4,  0, 62,  0, 50,  0,  5,  0,  2,  0, 18,  0,
-  2,  0,240,  0,  2,  0, 62,  0,  2,  0,241,  0, 49,  0,234,  0, 51,  0, 17,  0, 27,  0,167,  0, 42,  0,242,  0, 52,  0,243,  0,
-  7,  0,244,  0,  7,  0,245,  0,  2,  0, 16,  0,  2,  0,246,  0,  7,  0,111,  0,  7,  0,112,  0,  7,  0,247,  0,  4,  0,248,  0,
-  2,  0,249,  0,  2,  0,250,  0,  4,  0,131,  0,  4,  0,143,  0,  2,  0,251,  0,  2,  0,252,  0, 53,  0, 25,  0,  2,  0, 18,  0,
-  2,  0,253,  0,  7,  0,254,  0,  7,  0,255,  0,  2,  0,142,  0,  2,  0,  0,  1,  4,  0,  1,  1,  4,  0,  2,  1, 27,  0,167,  0,
-  4,  0,  3,  1,  2,  0,  4,  1,  2,  0,  5,  1, 11,  0,  6,  1,  7,  0,  7,  1,  7,  0,  8,  1,  2,  0,  9,  1,  2,  0, 10,  1,
-  2,  0, 11,  1,  2,  0, 12,  1,  7,  0, 13,  1,  7,  0, 14,  1,  7,  0, 15,  1,  7,  0, 16,  1, 50,  0, 17,  1, 54,  0, 18,  1,
- 55,  0, 13,  0,  4,  0, 19,  1,  4,  0, 20,  1,  2,  0, 21,  1,  2,  0, 18,  0,  2,  0, 22,  1,  2,  0, 23,  1, 27,  0,167,  0,
-  7,  0, 24,  1,  4,  0, 25,  1,  0,  0, 26,  1,  7,  0, 27,  1,  4,  0, 28,  1,  4,  0,131,  0, 56,  0,  4,  0, 27,  0,167,  0,
-  0,  0, 29,  1,  4,  0, 30,  1,  4,  0, 27,  0, 47,  0, 64,  0, 22,  0, 32,  0, 34,  0, 74,  0,  7,  0, 31,  1,  7,  0, 32,  1,
-  7,  0, 33,  1,  7,  0, 34,  1,  7,  0, 35,  1,  7,  0, 36,  1,  7,  0, 37,  1,  7,  0, 38,  1,  7,  0, 39,  1,  7,  0, 30,  0,
-  7,  0, 40,  1,  7,  0, 41,  1,  7,  0, 42,  1,  7,  0, 43,  1,  7,  0, 44,  1,  7,  0, 45,  1,  7,  0, 46,  1,  7,  0, 47,  1,
-  7,  0, 48,  1,  7,  0, 49,  1,  7,  0, 50,  1,  7,  0, 51,  1,  2,  0, 52,  1,  2,  0, 53,  1,  2,  0, 54,  1,  2,  0, 55,  1,
-  2,  0, 56,  1,  2,  0, 57,  1,  2,  0, 58,  1,  2,  0, 18,  0,  2,  0, 16,  0,  2,  0,246,  0,  7,  0, 59,  1,  7,  0, 60,  1,
-  7,  0, 61,  1,  7,  0, 62,  1,  4,  0, 63,  1,  4,  0, 64,  1,  2,  0, 65,  1,  2,  0, 66,  1,  2,  0, 22,  1,  2,  0,129,  0,
-  4,  0, 22,  0,  4,  0,126,  0,  4,  0,127,  0,  4,  0,128,  0,  7,  0, 67,  1,  7,  0, 68,  1,  7,  0, 66,  0, 40,  0, 69,  1,
- 57,  0, 70,  1, 31,  0, 79,  0, 42,  0,242,  0, 48,  0, 71,  1, 50,  0, 17,  1, 51,  0, 72,  1, 25,  0,153,  0, 53,  0, 73,  1,
- 55,  0, 74,  1, 56,  0, 75,  1,  0,  0, 76,  1,  0,  0,123,  0, 58,  0, 13,  0,  7,  0, 77,  1,  7,  0, 78,  1,  7,  0,175,  0,
-  4,  0, 18,  0,  0,  0,170,  0,  0,  0,171,  0,  0,  0,172,  0,  0,  0,173,  0,  4,  0, 27,  0,  7,  0, 79,  1,  7,  0, 80,  1,
-  7,  0, 81,  1, 27,  0, 43,  0, 59,  0,  9,  0, 50,  0, 82,  1,  7,  0, 33,  1,  7,  0, 34,  1,  7,  0, 35,  1,  4,  0, 18,  0,
-  7,  0, 83,  1,  7,  0, 84,  1,  4,  0, 85,  1,  4,  0, 86,  1, 60,  0, 76,  0, 22,  0, 32,  0, 34,  0, 74,  0,  2,  0, 16,  0,
-  2,  0, 18,  0,  4,  0, 87,  1,  2,  0,178,  0,  2,  0, 88,  1,  7,  0,184,  0,  7,  0,185,  0,  7,  0,186,  0,  7,  0,187,  0,
-  7,  0, 89,  1,  7,  0, 90,  1,  7,  0, 91,  1,  7,  0, 92,  1,  7,  0, 93,  1,  7,  0, 94,  1,  7,  0, 95,  1,  7,  0, 96,  1,
-  7,  0, 97,  1,  7,  0, 98,  1,  7,  0, 99,  1, 54,  0,100,  1,  2,  0,253,  0,  2,  0, 30,  0,  7,  0,111,  0,  7,  0,112,  0,
-  7,  0,101,  1,  7,  0,102,  1,  7,  0,103,  1,  7,  0,104,  1,  7,  0,105,  1,  7,  0,106,  1,  2,  0,107,  1,  2,  0,108,  1,
-  2,  0,109,  1,  2,  0,110,  1,  0,  0,111,  1,  0,  0,112,  1,  2,  0,113,  1,  2,  0,114,  1,  2,  0,115,  1,  2,  0,116,  1,
-  2,  0,117,  1,  7,  0,118,  1,  7,  0,119,  1,  7,  0,120,  1,  7,  0,121,  1,  2,  0,122,  1,  2,  0,123,  1,  2,  0,124,  1,
-  2,  0,125,  1,  2,  0,126,  1,  2,  0,127,  1,  7,  0,128,  1,  7,  0,129,  1,  7,  0,130,  1,  7,  0,131,  1,  7,  0,132,  1,
+  0,  0,128, 63,  0,  0,  0,  0,114,114,114,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,
+  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,
+  0,  0,  0,255,255,255,255,255,130,130,130,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,
+  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,255,140, 25,255,  8, 48,  8,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,
+  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,
+255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255,
+ 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,
+240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,
+240,255, 64,255, 64,192, 48,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 57, 57, 57,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,255,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,170, 64,255,  8, 48,  8,255, 85,187, 85,255,255,255,255,255,
+  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255, 32,255,255,255, 75, 75, 75,255,204,  0,153,255,
+  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255, 32,  0,  0,255,  0, 32,  0,255,  0,  0,128,255,  0,  0,  0,  0, 34,221,221,255,
+ 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,144,144,  0,255,128, 48, 96,255,
+219, 37, 18,255,240,255, 64,255,240,144,160,255,255,255,255,255,  0,  0,  0,255,144,144,  0,255, 64,144, 48,255,128, 48, 96,255,
+  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  1,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,200,200,200,255,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 76, 76, 76,255,  0,  0,  0,  0,
+250,250,250,255, 15, 15, 15,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,
+  0,  0,  0,255,255,255,255,255,102,102,102,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,145,145,145,255,  0,  0,  0,255,
+  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,255,140, 25,255,250,250,250,255,  0,  0,  0,255,241, 88,  0,255,
+  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,130,130,130,255,  8, 48,  8,255,
+ 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255,
+ 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,
+144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,144,144,  0,255,
+ 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  4,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,250,250,250,255,  0,  0,  0,  0,250,250,250,255,
+250,250,250,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+107,107,107,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,102,102,102,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+255,255,255,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,150,150,150,100,112,112,112,100, 96,192, 64,255, 94, 94, 94,255,
+  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+255,140, 25,255, 79,101, 73,255,135,177,125,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,
+219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,
+  0,  0,  0,  0, 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,
+  0,  0,  0,255,144,144,  0,255, 64,144, 48,255,128, 48, 96,255,153, 64, 48,255,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,
+240,144,160,255,240,175,144,255, 82, 96,110,255,124,137,150,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  3,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+255,255,255,128,  0,  0,  0,255,255,133,  0,255,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,114,114,114,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,
+  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,
+  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,
+  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,255,140, 25,255,  8, 48,  8,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,
+  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,
+255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255,
+ 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,
+240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,
+240,255, 64,255, 64,192, 48,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+102,102,102,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,255,255,255,150,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+150,150,150,100,112,112,112,100, 96,192, 64,255, 94, 94, 94,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,140, 25,255, 79,101, 73,255,135,177,125,255,255,255,255,255,
+  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,
+  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255,
+ 35, 97,221,255,200,200,200,255, 80,200,255, 80, 12, 10, 10,128,255,140,  0,255, 96,192, 64,255,144,144,  0,255,128, 48, 96,255,
+219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,144,144,  0,255, 64,144, 48,255,128, 48, 96,255,
+  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,  0,  0,  0,  0, 82, 96,110,255,124,137,150,255,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,255,255,133,  0,255,  3,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,107,107,107,255,  0,  0,  0,  0,
+  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,
+  0,  0,  0,255,255,255,255,255,102,102,102,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,255,255,255,150,  0,  0,  0,255,
+  0,  0,  0,255,255,255,255,255,150,150,150,100,112,112,112,100, 96,192, 64,255, 94, 94, 94,255,  0,  0,  0,255,241, 88,  0,255,
+  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,140, 25,255, 79,101, 73,255,
+135,177,125,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255,
+ 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80, 12, 10, 10,128,255,140,  0,255, 96,192, 64,255,
+144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,144,144,  0,255,
+ 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,  0,  0,  0,  0,
+ 82, 96,110,255,124,137,150,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  4,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,255,
+255,133,  0,255,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+116,116,116,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,
+  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+255,140, 25,255,  8, 48,  8,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,
+219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,
+  0,  0,  0,  0, 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,
+  0,  0,  0,255,144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,
+240,144,160,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  3,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 81,105,135,255,
+ 32, 32,143,255,109, 88,129,255, 78,152, 62,255, 46,143,143,255,169, 84,124,255,  0,  0,  0,  0,162, 95,111,255,109,145,131,255,
+255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 53, 53, 53,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,
+  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,
+  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,
+  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,255,140, 25,255,  8, 48,  8,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,
+  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,255,255,255, 10,255,133,  0, 60,
+255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255,
+ 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,
+240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,
+240,255, 64,255, 64,192, 48,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,114,114,114,255, 18, 66,176, 38,255,133,  0,178,255,133,  0,127,  0,255,  0,255,255,  0,  0,255,225,210,195, 35,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,153,153,153,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+143,143,143,255,198,119,119,255,255,  0,  0,255, 64, 64, 64,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,140, 25,255,  8, 48,  8,255, 85,187, 85,255,255,255,255,255,
+  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,
+  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255,
+ 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,144,144,  0,255,128, 48, 96,255,
+219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,144,144,  0,255, 64,144, 48,255,128, 48, 96,255,
+  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  4,  0,100,  0,  0,255,  0,  0,200,255,
+128,  0, 80,255, 95, 95,  0,255,  0,100, 50,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,114,114,114,255,  0,  0,  0,  0,
+  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,
+  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,
+  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,241, 88,  0,255,
+  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,140, 25,255,  8, 48,  8,255,
+ 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255,
+ 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,
+144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,144,144,  0,255,
+ 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  4,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 51,127, 51, 76,130,135,140, 76,  0,  0,  0,  0,  0,  0,  0,  0,
+114,114,114,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,173,173,173,255,127,112,112,100,  0,  0,  0,  0, 91, 91, 91,255,
+  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+255,140, 25,255,  8, 48,  8,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,
+219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,
+  0,  0,  0,  0, 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,
+  0,  0,  0,255,144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,
+240,144,160,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  3,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 57, 57, 57,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,
+  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,
+  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,
+  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,255,255,255,255,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,  8, 48,  8,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,
+  0,  0,  0,255,255,255,255,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,
+255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255,
+ 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,
+240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,
+240,255, 64,255, 64,192, 48,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  4,  5,155,155,155,160,100,104,111,255,111,106,100,255,104,106,117,255,
+105,117,110,255,154,155,155,160,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,100,100,100,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,140, 25,255,  8, 48,  8,255, 85,187, 85,255,255,255,255,255,
+  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,
+  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255,
+ 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,144,144,  0,255,128, 48, 96,255,
+219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,144,144,  0,255, 64,144, 48,255,128, 48, 96,255,
+  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,114,114,114,255,  0,  0,  0,  0,
+  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,
+  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,
+  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,  0,  0,  0,255,241, 88,  0,255,
+  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,140, 25,255,  8, 48,  8,255,
+ 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,219, 37, 18,255,255, 32, 32,255,
+ 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,  0,  0,  0,  0, 96,192, 64,255,
+144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,255,144,144,  0,255,
+ 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,240,144,160,255,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  4,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,165,165,165,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,
+165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,  0,  0,  0,  0, 64, 64, 64,255,
+  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+255,140, 25,255,  8, 48,  8,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,  0,  0,  0,255,255,160,  0,255,
+219, 37, 18,255,255, 32, 32,255, 75, 75, 75,255,  0,  0,  0,  0,  0,  0,  0, 18,255,133,  0, 60,255,133,  0,255,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255, 80,200,255, 80,  0,  0,  0,  0,
+  0,  0,  0,  0, 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,240,144,160,255,  0,  0,  0,  0,
+  0,  0,  0,255,144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,240,255, 64,255, 64,192, 48,255,
+240,144,160,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 96,128,255,255,255,255,255,255,  0,170,  0,255,220, 96, 96,255,
+220, 96, 96,255,  3,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+255,255,255,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 57, 57, 57,255,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,
+  0,  0,  0,255,255,255,255,255,114,114,114,255,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,102,102,102,255,  0,  0,  0,255,
+  0,  0,  0,255,255,255,255,255,165,165,165,127,  0,  0,  0,255,  0,  0,  0,255,255,255,255,255,160,160,160,100,127,112,112,100,
+  0,  0,  0,  0, 94, 94, 94,255,  0,  0,  0,255,241, 88,  0,255,  0,  0,  0, 40,  0,  0,  0,255,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,255,170, 64,255,  8, 48,  8,255, 85,187, 85,255,255,255,255,255,  0,  0,  0,255,255,133,  0,255,
+  0,  0,  0,255,255,160,  0,255,219, 37, 18,255, 32,255,255,255, 75, 75, 75,255,204,  0,153,255,  0,  0,  0, 18,255,133,  0, 60,
+255,133,  0,255, 32,  0,  0,255,  0, 32,  0,255,  0,  0,128,255,  0,  0,  0,  0, 34,221,221,255, 35, 97,221,255,200,200,200,255,
+ 80,200,255, 80, 12, 10, 10,128,255,140,  0,255, 96,192, 64,255,144,144,  0,255,128, 48, 96,255,219, 37, 18,255,240,255, 64,255,
+240,144,160,255,255,255,255,255,  0,  0,  0,255,144,144,  0,255, 64,144, 48,255,128, 48, 96,255,  0,  0,  0,  0,  0,  0,  0,255,
+240,255, 64,255, 64,192, 48,255,240,144,160,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  1,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,128,  0,  0,  0,255,255,255,  0,255,  4,  0,  0,  0,255,127,127,  0,255,255,255,255,
+255,255,255,  0,255,127,  0,  0,255,127,127,127,255,200,200,200,255,255,  0,  0,255,  0,  0,255,255,  0,  0,  0,255,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,154,  0,  0,255,189, 17, 17,255,247, 10, 10,255,  0,  0,  0,  0,
+247, 64, 24,255,246,105, 19,255,250,153,  0,255,  0,  0,  0,  0, 30,145,  9,255, 89,183, 11,255,131,239, 29,255,  0,  0,  0,  0,
+ 10, 54,148,255, 54,103,223,255, 94,193,239,255,  0,  0,  0,  0,169, 41, 78,255,193, 65,106,255,240, 93,145,255,  0,  0,  0,  0,
+ 67, 12,120,255, 84, 58,163,255,135,100,213,255,  0,  0,  0,  0, 36,120, 90,255, 60,149,121,255,111,182,171,255,  0,  0,  0,  0,
+ 75,112,124,255,106,134,145,255,155,194,205,255,  0,  0,  0,  0,244,201, 12,255,238,194, 54,255,243,255,  0,255,  0,  0,  0,  0,
+ 30, 32, 36,255, 72, 76, 86,255,255,255,255,255,  0,  0,  0,  0,111, 47,106,255,152, 69,190,255,211, 48,214,255,  0,  0,  0,  0,
+108,142, 34,255,127,176, 34,255,187,239, 91,255,  0,  0,  0,  0,141,141,141,255,176,176,176,255,222,222,222,255,  0,  0,  0,  0,
+131, 67, 38,255,139, 88, 17,255,189,106, 17,255,  0,  0,  0,  0,  8, 49, 14,255, 28, 67, 11,255, 52, 98, 43,255,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 80,  0,  0,  0,
+216,206,222,  4,  0,  0,  0,  0,209,  0,  0,  0,  1,  0,  0,  0,120,207,222,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+105,111, 95,115, 99,101,110,101, 95, 51,100,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 80,  0,  0,  0,120,207,222,  4,  0,  0,  0,  0,209,  0,  0,  0,  1,  0,  0,  0,232, 39,224,  4,  0,  0,  0,  0,
+216,206,222,  4,  0,  0,  0,  0,105,111, 95,115, 99,101,110,101, 95,102, 98,120,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 80,  0,  0,  0,232, 39,224,  4,  0,  0,  0,  0,209,  0,  0,  0,  1,  0,  0,  0,
+136, 40,224,  4,  0,  0,  0,  0,120,207,222,  4,  0,  0,  0,  0,105,111, 95, 97,110,105,109, 95, 98,118,104,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 80,  0,  0,  0,136, 40,224,  4,  0,  0,  0,  0,
+209,  0,  0,  0,  1,  0,  0,  0, 40, 41,224,  4,  0,  0,  0,  0,232, 39,224,  4,  0,  0,  0,  0,105,111, 95,109,101,115,104, 95,
+112,108,121,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 80,  0,  0,  0,
+ 40, 41,224,  4,  0,  0,  0,  0,209,  0,  0,  0,  1,  0,  0,  0,200, 41,224,  4,  0,  0,  0,  0,136, 40,224,  4,  0,  0,  0,  0,
+105,111, 95,115, 99,101,110,101, 95,111, 98,106,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 80,  0,  0,  0,200, 41,224,  4,  0,  0,  0,  0,209,  0,  0,  0,  1,  0,  0,  0,104, 42,224,  4,  0,  0,  0,  0,
+ 40, 41,224,  4,  0,  0,  0,  0,105,111, 95,115, 99,101,110,101, 95,120, 51,100,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 80,  0,  0,  0,104, 42,224,  4,  0,  0,  0,  0,209,  0,  0,  0,  1,  0,  0,  0,
+  8, 43,224,  4,  0,  0,  0,  0,200, 41,224,  4,  0,  0,  0,  0,105,111, 95,109,101,115,104, 95,115,116,108,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 80,  0,  0,  0,  8, 43,224,  4,  0,  0,  0,  0,
+209,  0,  0,  0,  1,  0,  0,  0,168, 43,224,  4,  0,  0,  0,  0,104, 42,224,  4,  0,  0,  0,  0,105,111, 95,109,101,115,104, 95,
+117,118, 95,108, 97,121,111,117,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65, 80,  0,  0,  0,
+168, 43,224,  4,  0,  0,  0,  0,209,  0,  0,  0,  1,  0,  0,  0, 72, 44,224,  4,  0,  0,  0,  0,  8, 43,224,  4,  0,  0,  0,  0,
+105,111, 95, 99,117,114,118,101, 95,115,118,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+ 68, 65, 84, 65, 80,  0,  0,  0, 72, 44,224,  4,  0,  0,  0,  0,209,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+168, 43,224,  4,  0,  0,  0,  0, 99,121, 99,108,101,115,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0, 68, 65, 84, 65,232,  0,  0,  0,232, 44,224,  4,  0,  0,  0,  0,201,  0,  0,  0,  1,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 68,101,102, 97,117,108,116, 32, 83,116,121,108,101,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  0,  0,  0,255,255,  0,  0,154,153, 25, 62,  0,  0,128, 63,  0,  0, 12,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  3,  0,  0,  0,255,255,  0,  0,  0,  0,128, 62,  0,  0,  0,  0,  0,  0, 11,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  3,  0,  0,  0,255,255,  0,  0,154,153, 25, 62,  0,  0,128, 63,  0,  0, 11,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128, 62,  0,  0,  0,  0,  0,  0,128, 63,  0,  0,  0,  0,  8,  0,  5,  0,  5,  0,  8,  0,
+  2,  0,  8,  0,  4,  0,  0,  0, 68, 78, 65, 49, 40,  8,  1,  0,232,232,142,  3,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,
+ 83, 68, 78, 65, 78, 65, 77, 69, 94, 13,  0,  0, 42,110,101,120,116,  0, 42,112,114,101,118,  0, 42,100, 97,116, 97,  0, 42,102,
+105,114,115,116,  0, 42,108, 97,115,116,  0,120,  0,121,  0,122,  0,120,109,105,110,  0,120,109, 97,120,  0,121,109,105,110,  0,
+121,109, 97,120,  0, 42,112,111,105,110,116,101,114,  0,103,114,111,117,112,  0,118, 97,108,  0,118, 97,108, 50,  0,116,121,112,
+101,  0,115,117, 98,116,121,112,101,  0,102,108, 97,103,  0,110, 97,109,101, 91, 54, 52, 93,  0,115, 97,118,101,100,  0,100, 97,
+116, 97,  0,108,101,110,  0,116,111,116, 97,108,108,101,110,  0, 42,110,101,119,105,100,  0, 42,108,105, 98,  0,110, 97,109,101,
+ 91, 54, 54, 93,  0,112, 97,100,  0,117,115,  0,105, 99,111,110, 95,105,100,  0,112, 97,100, 50,  0, 42,112,114,111,112,101,114,
+116,105,101,115,  0,105,100,  0, 42,105,100, 98,108,111, 99,107,  0, 42,102,105,108,101,100, 97,116, 97,  0,110, 97,109,101, 91,
+ 49, 48, 50, 52, 93,  0,102,105,108,101,112, 97,116,104, 91, 49, 48, 50, 52, 93,  0, 42,112, 97,114,101,110,116,  0,119, 91, 50,
+ 93,  0,104, 91, 50, 93,  0, 99,104, 97,110,103,101,100, 91, 50, 93,  0, 99,104, 97,110,103,101,100, 95,116,105,109,101,115,116,
+ 97,109,112, 91, 50, 93,  0, 42,114,101, 99,116, 91, 50, 93,  0, 42,111, 98,  0, 98,108,111, 99,107,116,121,112,101,  0, 97,100,
+114, 99,111,100,101,  0,110, 97,109,101, 91, 49, 50, 56, 93,  0, 42, 98,112,  0, 42, 98,101,122,116,  0,109, 97,120,114, 99,116,
+  0,116,111,116,114, 99,116,  0,118, 97,114,116,121,112,101,  0,116,111,116,118,101,114,116,  0,105,112,111,  0,101,120,116,114,
+ 97,112,  0,114,116,  0, 98,105,116,109, 97,115,107,  0,115,108,105,100,101, 95,109,105,110,  0,115,108,105,100,101, 95,109, 97,
+120,  0, 99,117,114,118, 97,108,  0, 42,100,114,105,118,101,114,  0, 99,117,114,118,101,  0, 99,117,114,  0,115,104,111,119,107,
+101,121,  0,109,117,116,101,105,112,111,  0,112,111,115,  0,112, 97,100, 49,  0,114,101,108, 97,116,105,118,101,  0,116,111,116,
+101,108,101,109,  0,117,105,100,  0, 42,119,101,105,103,104,116,115,  0,118,103,114,111,117,112, 91, 54, 52, 93,  0,115,108,105,
+100,101,114,109,105,110,  0,115,108,105,100,101,114,109, 97,120,  0, 42, 97,100,116,  0, 42,114,101,102,107,101,121,  0,101,108,
+101,109,115,116,114, 91, 51, 50, 93,  0,101,108,101,109,115,105,122,101,  0, 98,108,111, 99,107,  0, 42,105,112,111,  0, 42,102,
+114,111,109,  0,116,111,116,107,101,121,  0,115,108,117,114,112,104,  0, 99,116,105,109,101,  0,117,105,100,103,101,110,  0, 42,
+108,105,110,101,  0, 42,102,111,114,109, 97,116,  0, 98,108,101,110,  0,108,105,110,101,110,111,  0,115,116, 97,114,116,  0,101,
+110,100,  0,102,108, 97,103,115,  0, 99,111,108,111,114, 91, 52, 93,  0,112, 97,100, 91, 52, 93,  0, 42,110, 97,109,101,  0,110,
+108,105,110,101,115,  0,108,105,110,101,115,  0, 42, 99,117,114,108,  0, 42,115,101,108,108,  0, 99,117,114, 99,  0,115,101,108,
+ 99,  0,109, 97,114,107,101,114,115,  0, 42,117,110,100,111, 95, 98,117,102,  0,117,110,100,111, 95,112,111,115,  0,117,110,100,
+111, 95,108,101,110,  0, 42, 99,111,109,112,105,108,101,100,  0,109,116,105,109,101,  0,115,105,122,101,  0,115,101,101,107,  0,
+100,116,120,  0,112, 97,115,115,101,112, 97,114,116, 97,108,112,104, 97,  0, 99,108,105,112,115,116, 97,  0, 99,108,105,112,101,
+110,100,  0,108,101,110,115,  0,111,114,116,104,111, 95,115, 99, 97,108,101,  0,100,114, 97,119,115,105,122,101,  0,115,101,110,
+115,111,114, 95,120,  0,115,101,110,115,111,114, 95,121,  0,115,104,105,102,116,120,  0,115,104,105,102,116,121,  0, 89, 70, 95,
+100,111,102,100,105,115,116,  0, 42,100,111,102, 95,111, 98,  0,115,101,110,115,111,114, 95,102,105,116,  0,112, 97,100, 91, 55,
+ 93,  0, 42,115, 99,101,110,101,  0,102,114, 97,109,101,110,114,  0,102,114, 97,109,101,115,  0,111,102,102,115,101,116,  0,115,
+102,114, 97,  0,102,105,101, 95,105,109, 97,  0, 99,121, 99,108,  0,111,107,  0,109,117,108,116,105, 95,105,110,100,101,120,  0,
+108, 97,121,101,114,  0,112, 97,115,115,  0,105, 98,117,102,115,  0, 42,103,112,117,116,101,120,116,117,114,101,  0, 42, 97,110,
+105,109,  0, 42,114,114,  0, 42,114,101,110,100,101,114,115, 91, 56, 93,  0,114,101,110,100,101,114, 95,115,108,111,116,  0,108,
+ 97,115,116, 95,114,101,110,100,101,114, 95,115,108,111,116,  0,115,111,117,114, 99,101,  0,108, 97,115,116,102,114, 97,109,101,
+  0,116,112, 97,103,101,102,108, 97,103,  0,116,111,116, 98,105,110,100,  0,120,114,101,112,  0,121,114,101,112,  0,116,119,115,
+116, 97,  0,116,119,101,110,100,  0, 98,105,110,100, 99,111,100,101,  0, 42,114,101,112, 98,105,110,100,  0, 42,112, 97, 99,107,
+101,100,102,105,108,101,  0, 42,112,114,101,118,105,101,119,  0,108, 97,115,116,117,112,100, 97,116,101,  0,108, 97,115,116,117,
+115,101,100,  0, 97,110,105,109,115,112,101,101,100,  0,103,101,110, 95,120,  0,103,101,110, 95,121,  0,103,101,110, 95,116,121,
+112,101,  0,103,101,110, 95,102,108, 97,103,  0, 97,115,112,120,  0, 97,115,112,121,  0,116,101,120, 99,111,  0,109, 97,112,116,
+111,  0,109, 97,112,116,111,110,101,103,  0, 98,108,101,110,100,116,121,112,101,  0, 42,111, 98,106,101, 99,116,  0, 42,116,101,
+120,  0,117,118,110, 97,109,101, 91, 54, 52, 93,  0,112,114,111,106,120,  0,112,114,111,106,121,  0,112,114,111,106,122,  0,109,
+ 97,112,112,105,110,103,  0,111,102,115, 91, 51, 93,  0,115,105,122,101, 91, 51, 93,  0,114,111,116,  0,116,101,120,102,108, 97,
+103,  0, 99,111,108,111,114,109,111,100,101,108,  0,112,109, 97,112,116,111,  0,112,109, 97,112,116,111,110,101,103,  0,110,111,
+114,109, 97,112,115,112, 97, 99,101,  0,119,104,105, 99,104, 95,111,117,116,112,117,116,  0, 98,114,117,115,104, 95,109, 97,112,
+ 95,109,111,100,101,  0,114,  0,103,  0, 98,  0,107,  0,100,101,102, 95,118, 97,114,  0, 99,111,108,102, 97, 99,  0,118, 97,114,
+102, 97, 99,  0,110,111,114,102, 97, 99,  0,100,105,115,112,102, 97, 99,  0,119, 97,114,112,102, 97, 99,  0, 99,111,108,115,112,
+101, 99,102, 97, 99,  0,109,105,114,114,102, 97, 99,  0, 97,108,112,104, 97,102, 97, 99,  0,100,105,102,102,102, 97, 99,  0,115,
+112,101, 99,102, 97, 99,  0,101,109,105,116,102, 97, 99,  0,104, 97,114,100,102, 97, 99,  0,114, 97,121,109,105,114,114,102, 97,
+ 99,  0,116,114, 97,110,115,108,102, 97, 99,  0, 97,109, 98,102, 97, 99,  0, 99,111,108,101,109,105,116,102, 97, 99,  0, 99,111,
+108,114,101,102,108,102, 97, 99,  0, 99,111,108,116,114, 97,110,115,102, 97, 99,  0,100,101,110,115,102, 97, 99,  0,115, 99, 97,
+116,116,101,114,102, 97, 99,  0,114,101,102,108,102, 97, 99,  0,116,105,109,101,102, 97, 99,  0,108,101,110,103,116,104,102, 97,
+ 99,  0, 99,108,117,109,112,102, 97, 99,  0,100, 97,109,112,102, 97, 99,  0,107,105,110,107,102, 97, 99,  0,114,111,117,103,104,
+102, 97, 99,  0,112, 97,100,101,110,115,102, 97, 99,  0,103,114, 97,118,105,116,121,102, 97, 99,  0,108,105,102,101,102, 97, 99,
+  0,115,105,122,101,102, 97, 99,  0,105,118,101,108,102, 97, 99,  0,102,105,101,108,100,102, 97, 99,  0,115,104, 97,100,111,119,
+102, 97, 99,  0,122,101,110,117,112,102, 97, 99,  0,122,101,110,100,111,119,110,102, 97, 99,  0, 98,108,101,110,100,102, 97, 99,
+  0, 97,  0,116,111,116,  0,105,112,111,116,121,112,101,  0,100, 97,116, 97, 91, 51, 50, 93,  0, 42,105,109, 97,  0, 42, 99,117,
+ 98,101, 91, 54, 93,  0,105,109, 97,116, 91, 52, 93, 91, 52, 93,  0,111, 98,105,109, 97,116, 91, 51, 93, 91, 51, 93,  0,115,116,
+121,112,101,  0,118,105,101,119,115, 99, 97,108,101,  0,110,111,116,108, 97,121,  0, 99,117, 98,101,114,101,115,  0,100,101,112,
+116,104,  0,114,101, 99, 97,108, 99,  0,108, 97,115,116,115,105,122,101,  0,102, 97,108,108,111,102,102, 95,116,121,112,101,  0,
+102, 97,108,108,111,102,102, 95,115,111,102,116,110,101,115,115,  0,114, 97,100,105,117,115,  0, 99,111,108,111,114, 95,115,111,
+117,114, 99,101,  0,116,111,116,112,111,105,110,116,115,  0,112,100,112, 97,100,  0,112,115,121,115,  0,112,115,121,115, 95, 99,
+ 97, 99,104,101, 95,115,112, 97, 99,101,  0,111, 98, 95, 99, 97, 99,104,101, 95,115,112, 97, 99,101,  0, 42,112,111,105,110,116,
+ 95,116,114,101,101,  0, 42,112,111,105,110,116, 95,100, 97,116, 97,  0,110,111,105,115,101, 95,115,105,122,101,  0,110,111,105,
+115,101, 95,100,101,112,116,104,  0,110,111,105,115,101, 95,105,110,102,108,117,101,110, 99,101,  0,110,111,105,115,101, 95, 98,
+ 97,115,105,115,  0,112,100,112, 97,100, 51, 91, 51, 93,  0,110,111,105,115,101, 95,102, 97, 99,  0,115,112,101,101,100, 95,115,
+ 99, 97,108,101,  0,102, 97,108,108,111,102,102, 95,115,112,101,101,100, 95,115, 99, 97,108,101,  0,112,100,112, 97,100, 50,  0,
+ 42, 99,111, 98, 97,  0, 42,102, 97,108,108,111,102,102, 95, 99,117,114,118,101,  0,114,101,115,111,108, 91, 51, 93,  0,105,110,
+116,101,114,112, 95,116,121,112,101,  0,102,105,108,101, 95,102,111,114,109, 97,116,  0,101,120,116,101,110,100,  0,115,109,111,
+107,101,100, 95,116,121,112,101,  0,105,110,116, 95,109,117,108,116,105,112,108,105,101,114,  0,115,116,105,108,108, 95,102,114,
+ 97,109,101,  0,115,111,117,114, 99,101, 95,112, 97,116,104, 91, 49, 48, 50, 52, 93,  0, 42,100, 97,116, 97,115,101,116,  0, 99,
+ 97, 99,104,101,100,102,114, 97,109,101,  0,111, 99,101, 97,110,109,111,100, 91, 54, 52, 93,  0,111,117,116,112,117,116,  0,110,
+111,105,115,101,115,105,122,101,  0,116,117,114, 98,117,108,  0, 98,114,105,103,104,116,  0, 99,111,110,116,114, 97,115,116,  0,
+115, 97,116,117,114, 97,116,105,111,110,  0,114,102, 97, 99,  0,103,102, 97, 99,  0, 98,102, 97, 99,  0,102,105,108,116,101,114,
+115,105,122,101,  0,109,103, 95, 72,  0,109,103, 95,108, 97, 99,117,110, 97,114,105,116,121,  0,109,103, 95,111, 99,116, 97,118,
+101,115,  0,109,103, 95,111,102,102,115,101,116,  0,109,103, 95,103, 97,105,110,  0,100,105,115,116, 95, 97,109,111,117,110,116,
+  0,110,115, 95,111,117,116,115, 99, 97,108,101,  0,118,110, 95,119, 49,  0,118,110, 95,119, 50,  0,118,110, 95,119, 51,  0,118,
+110, 95,119, 52,  0,118,110, 95,109,101,120,112,  0,118,110, 95,100,105,115,116,109,  0,118,110, 95, 99,111,108,116,121,112,101,
+  0,110,111,105,115,101,100,101,112,116,104,  0,110,111,105,115,101,116,121,112,101,  0,110,111,105,115,101, 98, 97,115,105,115,
+  0,110,111,105,115,101, 98, 97,115,105,115, 50,  0,105,109, 97,102,108, 97,103,  0, 99,114,111,112,120,109,105,110,  0, 99,114,
+111,112,121,109,105,110,  0, 99,114,111,112,120,109, 97,120,  0, 99,114,111,112,121,109, 97,120,  0,116,101,120,102,105,108,116,
+101,114,  0, 97,102,109, 97,120,  0,120,114,101,112,101, 97,116,  0,121,114,101,112,101, 97,116,  0, 99,104,101, 99,107,101,114,
+100,105,115,116,  0,110, 97, 98,108, 97,  0,105,117,115,101,114,  0, 42,110,111,100,101,116,114,101,101,  0, 42,101,110,118,  0,
+ 42,112,100,  0, 42,118,100,  0, 42,111,116,  0,117,115,101, 95,110,111,100,101,115,  0,108,111, 99, 91, 51, 93,  0,114,111,116,
+ 91, 51, 93,  0,109, 97,116, 91, 52, 93, 91, 52, 93,  0,109,105,110, 91, 51, 93,  0,109, 97,120, 91, 51, 93,  0, 99,111, 98, 97,
+  0, 98,108,101,110,100, 95, 99,111,108,111,114, 91, 51, 93,  0, 98,108,101,110,100, 95,102, 97, 99,116,111,114,  0, 98,108,101,
+110,100, 95,116,121,112,101,  0,112, 97,100, 91, 51, 93,  0,109,111,100,101,  0,116,111,116,101,120,  0,115,104,100,119,114,  0,
+115,104,100,119,103,  0,115,104,100,119, 98,  0,115,104,100,119,112, 97,100,  0,101,110,101,114,103,121,  0,100,105,115,116,  0,
+115,112,111,116,115,105,122,101,  0,115,112,111,116, 98,108,101,110,100,  0,104, 97,105,110,116,  0, 97,116,116, 49,  0, 97,116,
+116, 50,  0, 42, 99,117,114,102, 97,108,108,111,102,102,  0,115,104, 97,100,115,112,111,116,115,105,122,101,  0, 98,105, 97,115,
+  0,115,111,102,116,  0, 99,111,109,112,114,101,115,115,116,104,114,101,115,104,  0, 98,108,101,101,100, 98,105, 97,115,  0,112,
+ 97,100, 53, 91, 50, 93,  0, 98,117,102,115,105,122,101,  0,115, 97,109,112,  0, 98,117,102,102,101,114,115,  0,102,105,108,116,
+101,114,116,121,112,101,  0, 98,117,102,102,108, 97,103,  0, 98,117,102,116,121,112,101,  0,114, 97,121, 95,115, 97,109,112,  0,
+114, 97,121, 95,115, 97,109,112,121,  0,114, 97,121, 95,115, 97,109,112,122,  0,114, 97,121, 95,115, 97,109,112, 95,116,121,112,
+101,  0, 97,114,101, 97, 95,115,104, 97,112,101,  0, 97,114,101, 97, 95,115,105,122,101,  0, 97,114,101, 97, 95,115,105,122,101,
+121,  0, 97,114,101, 97, 95,115,105,122,101,122,  0, 97,100, 97,112,116, 95,116,104,114,101,115,104,  0,114, 97,121, 95,115, 97,
+109,112, 95,109,101,116,104,111,100,  0,115,104, 97,100,111,119,109, 97,112, 95,116,121,112,101,  0,116,101,120, 97, 99,116,  0,
+115,104, 97,100,104, 97,108,111,115,116,101,112,  0,115,117,110, 95,101,102,102,101, 99,116, 95,116,121,112,101,  0,115,107,121,
+ 98,108,101,110,100,116,121,112,101,  0,104,111,114,105,122,111,110, 95, 98,114,105,103,104,116,110,101,115,115,  0,115,112,114,
+101, 97,100,  0,115,117,110, 95, 98,114,105,103,104,116,110,101,115,115,  0,115,117,110, 95,115,105,122,101,  0, 98, 97, 99,107,
+115, 99, 97,116,116,101,114,101,100, 95,108,105,103,104,116,  0,115,117,110, 95,105,110,116,101,110,115,105,116,121,  0, 97,116,
+109, 95,116,117,114, 98,105,100,105,116,121,  0, 97,116,109, 95,105,110,115, 99, 97,116,116,101,114,105,110,103, 95,102, 97, 99,
+116,111,114,  0, 97,116,109, 95,101,120,116,105,110, 99,116,105,111,110, 95,102, 97, 99,116,111,114,  0, 97,116,109, 95,100,105,
+115,116, 97,110, 99,101, 95,102, 97, 99,116,111,114,  0,115,107,121, 98,108,101,110,100,102, 97, 99,  0,115,107,121, 95,101,120,
+112,111,115,117,114,101,  0,115,104, 97,100,111,119, 95,102,114,117,115,116,117,109, 95,115,105,122,101,  0,115,107,121, 95, 99,
+111,108,111,114,115,112, 97, 99,101,  0,112, 97,100, 52, 91, 50, 93,  0, 42,109,116,101,120, 91, 49, 56, 93,  0,112,114, 95,116,
+101,120,116,117,114,101,  0,112, 97,100, 54, 91, 52, 93,  0,100,101,110,115,105,116,121,  0,101,109,105,115,115,105,111,110,  0,
+115, 99, 97,116,116,101,114,105,110,103,  0,114,101,102,108,101, 99,116,105,111,110,  0,101,109,105,115,115,105,111,110, 95, 99,
+111,108, 91, 51, 93,  0,116,114, 97,110,115,109,105,115,115,105,111,110, 95, 99,111,108, 91, 51, 93,  0,114,101,102,108,101, 99,
+116,105,111,110, 95, 99,111,108, 91, 51, 93,  0,100,101,110,115,105,116,121, 95,115, 99, 97,108,101,  0,100,101,112,116,104, 95,
+ 99,117,116,111,102,102,  0, 97,115,121,109,109,101,116,114,121,  0,115,116,101,112,115,105,122,101, 95,116,121,112,101,  0,115,
+104, 97,100,101,102,108, 97,103,  0,115,104, 97,100,101, 95,116,121,112,101,  0,112,114,101, 99, 97, 99,104,101, 95,114,101,115,
+111,108,117,116,105,111,110,  0,115,116,101,112,115,105,122,101,  0,109,115, 95,100,105,102,102,  0,109,115, 95,105,110,116,101,
+110,115,105,116,121,  0,109,115, 95,115,112,114,101, 97,100,  0, 97,108,112,104, 97, 95, 98,108,101,110,100,  0,102, 97, 99,101,
+ 95,111,114,105,101,110,116, 97,116,105,111,110,  0,109, 97,116,101,114,105, 97,108, 95,116,121,112,101,  0,115,112,101, 99,114,
+  0,115,112,101, 99,103,  0,115,112,101, 99, 98,  0,109,105,114,114,  0,109,105,114,103,  0,109,105,114, 98,  0, 97,109, 98,114,
+  0, 97,109, 98, 98,  0, 97,109, 98,103,  0, 97,109, 98,  0,101,109,105,116,  0, 97,110,103,  0,115,112,101, 99,116,114, 97,  0,
+114, 97,121, 95,109,105,114,114,111,114,  0, 97,108,112,104, 97,  0,114,101,102,  0,115,112,101, 99,  0,122,111,102,102,115,  0,
+ 97,100,100,  0,116,114, 97,110,115,108,117, 99,101,110, 99,121,  0,118,111,108,  0,103, 97,109,101,  0,102,114,101,115,110,101,
+108, 95,109,105,114,  0,102,114,101,115,110,101,108, 95,109,105,114, 95,105,  0,102,114,101,115,110,101,108, 95,116,114, 97,  0,
+102,114,101,115,110,101,108, 95,116,114, 97, 95,105,  0,102,105,108,116,101,114,  0,116,120, 95,108,105,109,105,116,  0,116,120,
+ 95,102, 97,108,108,111,102,102,  0,114, 97,121, 95,100,101,112,116,104,  0,114, 97,121, 95,100,101,112,116,104, 95,116,114, 97,
+  0,104, 97,114,  0,115,101,101,100, 49,  0,115,101,101,100, 50,  0,103,108,111,115,115, 95,109,105,114,  0,103,108,111,115,115,
+ 95,116,114, 97,  0,115, 97,109,112, 95,103,108,111,115,115, 95,109,105,114,  0,115, 97,109,112, 95,103,108,111,115,115, 95,116,
+114, 97,  0, 97,100, 97,112,116, 95,116,104,114,101,115,104, 95,109,105,114,  0, 97,100, 97,112,116, 95,116,104,114,101,115,104,
+ 95,116,114, 97,  0, 97,110,105,115,111, 95,103,108,111,115,115, 95,109,105,114,  0,100,105,115,116, 95,109,105,114,  0,102, 97,
+100,101,116,111, 95,109,105,114,  0,115,104, 97,100,101, 95,102,108, 97,103,  0,109,111,100,101, 95,108,  0,102,108, 97,114,101,
+ 99,  0,115,116, 97,114, 99,  0,108,105,110,101, 99,  0,114,105,110,103, 99,  0,104, 97,115,105,122,101,  0,102,108, 97,114,101,
+115,105,122,101,  0,115,117, 98,115,105,122,101,  0,102,108, 97,114,101, 98,111,111,115,116,  0,115,116,114, 97,110,100, 95,115,
+116, 97,  0,115,116,114, 97,110,100, 95,101,110,100,  0,115,116,114, 97,110,100, 95,101, 97,115,101,  0,115,116,114, 97,110,100,
+ 95,115,117,114,102,110,111,114,  0,115,116,114, 97,110,100, 95,109,105,110,  0,115,116,114, 97,110,100, 95,119,105,100,116,104,
+102, 97,100,101,  0,115,116,114, 97,110,100, 95,117,118,110, 97,109,101, 91, 54, 52, 93,  0,115, 98,105, 97,115,  0,108, 98,105,
+ 97,115,  0,115,104, 97,100, 95, 97,108,112,104, 97,  0,115,101,112,116,101,120,  0,114,103, 98,115,101,108,  0,112,114, 95,116,
+121,112,101,  0,112,114, 95, 98, 97, 99,107,  0,112,114, 95,108, 97,109,112,  0,109,108, 95,102,108, 97,103,  0,100,105,102,102,
+ 95,115,104, 97,100,101,114,  0,115,112,101, 99, 95,115,104, 97,100,101,114,  0,114,111,117,103,104,110,101,115,115,  0,114,101,
+102,114, 97, 99,  0,112, 97,114, 97,109, 91, 52, 93,  0,114,109,115,  0,100, 97,114,107,110,101,115,115,  0, 42,114, 97,109,112,
+ 95, 99,111,108,  0, 42,114, 97,109,112, 95,115,112,101, 99,  0,114, 97,109,112,105,110, 95, 99,111,108,  0,114, 97,109,112,105,
+110, 95,115,112,101, 99,  0,114, 97,109,112, 98,108,101,110,100, 95, 99,111,108,  0,114, 97,109,112, 98,108,101,110,100, 95,115,
+112,101, 99,  0,114, 97,109,112, 95,115,104,111,119,  0,112, 97,100, 51,  0,114, 97,109,112,102, 97, 99, 95, 99,111,108,  0,114,
+ 97,109,112,102, 97, 99, 95,115,112,101, 99,  0, 42,103,114,111,117,112,  0,102,114,105, 99,116,105,111,110,  0,102,104,  0,114,
+101,102,108,101, 99,116,  0,102,104,100,105,115,116,  0,120,121,102,114,105, 99,116,  0,100,121,110, 97,109,111,100,101,  0,115,
+115,115, 95,114, 97,100,105,117,115, 91, 51, 93,  0,115,115,115, 95, 99,111,108, 91, 51, 93,  0,115,115,115, 95,101,114,114,111,
+114,  0,115,115,115, 95,115, 99, 97,108,101,  0,115,115,115, 95,105,111,114,  0,115,115,115, 95, 99,111,108,102, 97, 99,  0,115,
+115,115, 95,116,101,120,102, 97, 99,  0,115,115,115, 95,102,114,111,110,116,  0,115,115,115, 95, 98, 97, 99,107,  0,115,115,115,
+ 95,102,108, 97,103,  0,115,115,115, 95,112,114,101,115,101,116,  0,109, 97,112,116,111, 95,116,101,120,116,117,114,101,100,  0,
+115,104, 97,100,111,119,111,110,108,121, 95,102,108, 97,103,  0,105,110,100,101,120,  0,103,112,117,109, 97,116,101,114,105, 97,
+108,  0, 42, 98, 98,  0,115,101,108, 99,111,108, 49,  0,115,101,108, 99,111,108, 50,  0,113,117, 97,116, 91, 52, 93,  0,101,120,
+112,120,  0,101,120,112,121,  0,101,120,112,122,  0,114, 97,100,  0,114, 97,100, 50,  0,115,  0, 42,109, 97,116,  0, 42,105,109,
+ 97,116,  0,101,108,101,109,115,  0,100,105,115,112,  0, 42,101,100,105,116,101,108,101,109,115,  0, 42, 42,109, 97,116,  0,102,
+108, 97,103, 50,  0,116,111,116, 99,111,108,  0,119,105,114,101,115,105,122,101,  0,114,101,110,100,101,114,115,105,122,101,  0,
+116,104,114,101,115,104,  0, 42,108, 97,115,116,101,108,101,109,  0,118,101, 99, 91, 51, 93, 91, 51, 93,  0, 97,108,102, 97,  0,
+119,101,105,103,104,116,  0,104, 49,  0,104, 50,  0,102, 49,  0,102, 50,  0,102, 51,  0,104,105,100,101,  0,118,101, 99, 91, 52,
+ 93,  0,109, 97,116, 95,110,114,  0,112,110,116,115,117,  0,112,110,116,115,118,  0,114,101,115,111,108,117,  0,114,101,115,111,
+108,118,  0,111,114,100,101,114,117,  0,111,114,100,101,114,118,  0,102,108, 97,103,117,  0,102,108, 97,103,118,  0, 42,107,110,
+111,116,115,117,  0, 42,107,110,111,116,115,118,  0,116,105,108,116, 95,105,110,116,101,114,112,  0,114, 97,100,105,117,115, 95,
+105,110,116,101,114,112,  0, 99,104, 97,114,105,100,120,  0,107,101,114,110,  0,119,  0,104,  0,110,117,114, 98,115,  0, 42,107,
+101,121,105,110,100,101,120,  0,115,104, 97,112,101,110,114,  0,110,117,114, 98,  0, 42,101,100,105,116,110,117,114, 98,  0, 42,
+ 98,101,118,111, 98,106,  0, 42,116, 97,112,101,114,111, 98,106,  0, 42,116,101,120,116,111,110, 99,117,114,118,101,  0, 42,112,
+ 97,116,104,  0, 42,107,101,121,  0, 98,101,118,  0,100,114, 97,119,102,108, 97,103,  0,116,119,105,115,116, 95,109,111,100,101,
+  0,116,119,105,115,116, 95,115,109,111,111,116,104,  0,115,109, 97,108,108, 99, 97,112,115, 95,115, 99, 97,108,101,  0,112, 97,
+116,104,108,101,110,  0, 98,101,118,114,101,115,111,108,  0,119,105,100,116,104,  0,101,120,116, 49,  0,101,120,116, 50,  0,114,
+101,115,111,108,117, 95,114,101,110,  0,114,101,115,111,108,118, 95,114,101,110,  0, 97, 99,116,110,117,  0, 42,108, 97,115,116,
+115,101,108,  0,115,112, 97, 99,101,109,111,100,101,  0,115,112, 97, 99,105,110,103,  0,108,105,110,101,100,105,115,116,  0,115,
+104,101, 97,114,  0,102,115,105,122,101,  0,119,111,114,100,115,112, 97, 99,101,  0,117,108,112,111,115,  0,117,108,104,101,105,
+103,104,116,  0,120,111,102,  0,121,111,102,  0,108,105,110,101,119,105,100,116,104,  0, 42,115,116,114,  0, 42,115,101,108, 98,
+111,120,101,115,  0, 42,101,100,105,116,102,111,110,116,  0,102, 97,109,105,108,121, 91, 50, 52, 93,  0, 42,118,102,111,110,116,
+  0, 42,118,102,111,110,116, 98,  0, 42,118,102,111,110,116,105,  0, 42,118,102,111,110,116, 98,105,  0,115,101,112, 99,104, 97,
+114,  0,116,111,116, 98,111,120,  0, 97, 99,116, 98,111,120,  0, 42,116, 98,  0,115,101,108,115,116, 97,114,116,  0,115,101,108,
+101,110,100,  0, 42,115,116,114,105,110,102,111,  0, 99,117,114,105,110,102,111,  0, 98,101,118,102, 97, 99, 49,  0, 98,101,118,
+102, 97, 99, 50,  0, 42,109,115,101,108,101, 99,116,  0, 42,109,112,111,108,121,  0, 42,109,116,112,111,108,121,  0, 42,109,108,
+111,111,112,  0, 42,109,108,111,111,112,117,118,  0, 42,109,108,111,111,112, 99,111,108,  0, 42,109,102, 97, 99,101,  0, 42,109,
+116,102, 97, 99,101,  0, 42,116,102, 97, 99,101,  0, 42,109,118,101,114,116,  0, 42,109,101,100,103,101,  0, 42,100,118,101,114,
+116,  0, 42,109, 99,111,108,  0, 42,109,115,116,105, 99,107,121,  0, 42,116,101,120, 99,111,109,101,115,104,  0, 42,101,100,105,
+116, 95, 98,116,109,101,115,104,  0,118,100, 97,116, 97,  0,101,100, 97,116, 97,  0,102,100, 97,116, 97,  0,112,100, 97,116, 97,
+  0,108,100, 97,116, 97,  0,116,111,116,101,100,103,101,  0,116,111,116,102, 97, 99,101,  0,116,111,116,115,101,108,101, 99,116,
+  0,116,111,116,112,111,108,121,  0,116,111,116,108,111,111,112,  0, 97, 99,116, 95,102, 97, 99,101,  0,115,109,111,111,116,104,
+114,101,115,104,  0,115,117, 98,100,105,118,  0,115,117, 98,100,105,118,114,  0,115,117, 98,115,117,114,102,116,121,112,101,  0,
+101,100,105,116,102,108, 97,103,  0, 42,109,114,  0, 42,116,112, 97,103,101,  0,117,118, 91, 52, 93, 91, 50, 93,  0, 99,111,108,
+ 91, 52, 93,  0,116,114, 97,110,115,112,  0,116,105,108,101,  0,117,110,119,114, 97,112,  0,118, 49,  0,118, 50,  0,118, 51,  0,
+118, 52,  0,101,100, 99,111,100,101,  0, 99,114,101, 97,115,101,  0, 98,119,101,105,103,104,116,  0,100,101,102, 95,110,114,  0,
+ 42,100,119,  0,116,111,116,119,101,105,103,104,116,  0, 99,111, 91, 51, 93,  0,110,111, 91, 51, 93,  0,108,111,111,112,115,116,
+ 97,114,116,  0,118,  0,101,  0,117,118, 91, 50, 93,  0, 99,111, 91, 50, 93,  0,102,  0,105,  0,115, 91, 50, 53, 54, 93,  0,116,
+111,116,100,105,115,112,  0,108,101,118,101,108,  0, 40, 42,100,105,115,112,115, 41, 40, 41,  0, 42,104,105,100,100,101,110,  0,
+118, 91, 52, 93,  0,109,105,100,  0,112, 97,100, 91, 50, 93,  0,118, 91, 50, 93,  0, 42,102, 97, 99,101,115,  0, 42, 99,111,108,
+102, 97, 99,101,115,  0, 42,101,100,103,101,115,  0, 42,118,101,114,116,115,  0,108,101,118,101,108,115,  0,108,101,118,101,108,
+ 95, 99,111,117,110,116,  0, 99,117,114,114,101,110,116,  0,110,101,119,108,118,108,  0,101,100,103,101,108,118,108,  0,112,105,
+110,108,118,108,  0,114,101,110,100,101,114,108,118,108,  0,117,115,101, 95, 99,111,108,  0, 42,101,100,103,101, 95,102,108, 97,
+103,115,  0, 42,101,100,103,101, 95, 99,114,101, 97,115,101,115,  0,114, 97,100,105,117,115, 91, 51, 93,  0,115,116, 97, 99,107,
+105,110,100,101,120,  0, 42,101,114,114,111,114,  0,109,111,100,105,102,105,101,114,  0, 42,116,101,120,116,117,114,101,  0, 42,
+109, 97,112, 95,111, 98,106,101, 99,116,  0,117,118,108, 97,121,101,114, 95,110, 97,109,101, 91, 54, 52, 93,  0,117,118,108, 97,
+121,101,114, 95,116,109,112,  0,116,101,120,109, 97,112,112,105,110,103,  0,115,117, 98,100,105,118, 84,121,112,101,  0,114,101,
+110,100,101,114, 76,101,118,101,108,115,  0, 42,101,109, 67, 97, 99,104,101,  0, 42,109, 67, 97, 99,104,101,  0,115,116,114,101,
+110,103,116,104,  0,100,101,102, 97,120,105,115,  0,112, 97,100, 91, 54, 93,  0,108,101,110,103,116,104,  0,114, 97,110,100,111,
+109,105,122,101,  0,115,101,101,100,  0, 42,111, 98, 95, 97,114,109,  0, 42,115,116, 97,114,116, 95, 99, 97,112,  0, 42,101,110,
+100, 95, 99, 97,112,  0, 42, 99,117,114,118,101, 95,111, 98,  0, 42,111,102,102,115,101,116, 95,111, 98,  0,111,102,102,115,101,
+116, 91, 51, 93,  0,115, 99, 97,108,101, 91, 51, 93,  0,109,101,114,103,101, 95,100,105,115,116,  0,102,105,116, 95,116,121,112,
+101,  0,111,102,102,115,101,116, 95,116,121,112,101,  0, 99,111,117,110,116,  0, 97,120,105,115,  0,116,111,108,101,114, 97,110,
+ 99,101,  0, 42,109,105,114,114,111,114, 95,111, 98,  0,115,112,108,105,116, 95, 97,110,103,108,101,  0,118, 97,108,117,101,  0,
+114,101,115,  0,118, 97,108, 95,102,108, 97,103,115,  0,108,105,109, 95,102,108, 97,103,115,  0,101, 95,102,108, 97,103,115,  0,
+ 98,101,118,101,108, 95, 97,110,103,108,101,  0,100,101,102,103,114,112, 95,110, 97,109,101, 91, 54, 52, 93,  0, 42,100,111,109,
+ 97,105,110,  0, 42,102,108,111,119,  0, 42, 99,111,108,108,  0,116,105,109,101,  0,100,105,114,101, 99,116,105,111,110,  0,109,
+105,100,108,101,118,101,108,  0, 42,112,114,111,106,101, 99,116,111,114,115, 91, 49, 48, 93,  0, 42,105,109, 97,103,101,  0,110,
+117,109, 95,112,114,111,106,101, 99,116,111,114,115,  0, 97,115,112,101, 99,116,120,  0, 97,115,112,101, 99,116,121,  0,115, 99,
+ 97,108,101,120,  0,115, 99, 97,108,101,121,  0,112,101,114, 99,101,110,116,  0,102, 97, 99,101, 67,111,117,110,116,  0,102, 97,
+ 99,  0,114,101,112,101, 97,116,  0, 42,111, 98,106,101, 99,116, 99,101,110,116,101,114,  0,115,116, 97,114,116,120,  0,115,116,
+ 97,114,116,121,  0,104,101,105,103,104,116,  0,110, 97,114,114,111,119,  0,115,112,101,101,100,  0,100, 97,109,112,  0,102, 97,
+108,108,111,102,102,  0,116,105,109,101,111,102,102,115,  0,108,105,102,101,116,105,109,101,  0,100,101,102,111,114,109,102,108,
+ 97,103,  0,109,117,108,116,105,  0, 42,112,114,101,118, 67,111,115,  0,115,117, 98,116, 97,114,103,101,116, 91, 54, 52, 93,  0,
+112, 97,114,101,110,116,105,110,118, 91, 52, 93, 91, 52, 93,  0, 99,101,110,116, 91, 51, 93,  0, 42,105,110,100,101,120, 97,114,
+  0,116,111,116,105,110,100,101,120,  0,102,111,114, 99,101,  0, 42, 99,108,111,116,104, 79, 98,106,101, 99,116,  0, 42,115,105,
+109, 95,112, 97,114,109,115,  0, 42, 99,111,108,108, 95,112, 97,114,109,115,  0, 42,112,111,105,110,116, 95, 99, 97, 99,104,101,
+  0,112,116, 99, 97, 99,104,101,115,  0, 42,120,  0, 42,120,110,101,119,  0, 42,120,111,108,100,  0, 42, 99,117,114,114,101,110,
+116, 95,120,110,101,119,  0, 42, 99,117,114,114,101,110,116, 95,120,  0, 42, 99,117,114,114,101,110,116, 95,118,  0, 42,109,102,
+ 97, 99,101,115,  0,110,117,109,118,101,114,116,115,  0,110,117,109,102, 97, 99,101,115,  0,116,105,109,101, 95,120,  0,116,105,
+109,101, 95,120,110,101,119,  0, 42, 98,118,104,116,114,101,101,  0, 42,118,  0, 42,100,109,  0, 99,102,114, 97,  0,111,112,101,
+114, 97,116,105,111,110,  0,118,101,114,116,101,120,  0,116,111,116,105,110,102,108,117,101,110, 99,101,  0,103,114,105,100,115,
+105,122,101,  0, 42, 98,105,110,100,105,110,102,108,117,101,110, 99,101,115,  0, 42, 98,105,110,100,111,102,102,115,101,116,115,
+  0, 42, 98,105,110,100, 99, 97,103,101, 99,111,115,  0,116,111,116, 99, 97,103,101,118,101,114,116,  0, 42,100,121,110,103,114,
+105,100,  0, 42,100,121,110,105,110,102,108,117,101,110, 99,101,115,  0, 42,100,121,110,118,101,114,116,115,  0, 42,112, 97,100,
+ 50,  0,100,121,110,103,114,105,100,115,105,122,101,  0,100,121,110, 99,101,108,108,109,105,110, 91, 51, 93,  0,100,121,110, 99,
+101,108,108,119,105,100,116,104,  0, 98,105,110,100,109, 97,116, 91, 52, 93, 91, 52, 93,  0, 42, 98,105,110,100,119,101,105,103,
+104,116,115,  0, 42, 98,105,110,100, 99,111,115,  0, 40, 42, 98,105,110,100,102,117,110, 99, 41, 40, 41,  0, 42,112,115,121,115,
+  0,116,111,116,100,109,118,101,114,116,  0,116,111,116,100,109,101,100,103,101,  0,116,111,116,100,109,102, 97, 99,101,  0,112,
+111,115,105,116,105,111,110,  0,114, 97,110,100,111,109, 95,112,111,115,105,116,105,111,110,  0, 42,102, 97, 99,101,112, 97,  0,
+118,103,114,111,117,112,  0,112,114,111,116,101, 99,116,  0,108,118,108,  0,115, 99,117,108,112,116,108,118,108,  0,116,111,116,
+108,118,108,  0,115,105,109,112,108,101,  0, 42,102,115,115,  0, 42,116, 97,114,103,101,116,  0, 42, 97,117,120, 84, 97,114,103,
+101,116,  0,118,103,114,111,117,112, 95,110, 97,109,101, 91, 54, 52, 93,  0,107,101,101,112, 68,105,115,116,  0,115,104,114,105,
+110,107, 84,121,112,101,  0,115,104,114,105,110,107, 79,112,116,115,  0,112,114,111,106, 65,120,105,115,  0,115,117, 98,115,117,
+114,102, 76,101,118,101,108,115,  0, 42,111,114,105,103,105,110,  0,102, 97, 99,116,111,114,  0,108,105,109,105,116, 91, 50, 93,
+  0,111,114,105,103,105,110, 79,112,116,115,  0,111,102,102,115,101,116, 95,102, 97, 99,  0,111,102,102,115,101,116, 95,102, 97,
+ 99, 95,118,103,  0, 99,114,101, 97,115,101, 95,105,110,110,101,114,  0, 99,114,101, 97,115,101, 95,111,117,116,101,114,  0, 99,
+114,101, 97,115,101, 95,114,105,109,  0,109, 97,116, 95,111,102,115,  0,109, 97,116, 95,111,102,115, 95,114,105,109,  0, 42,111,
+ 98, 95, 97,120,105,115,  0,115,116,101,112,115,  0,114,101,110,100,101,114, 95,115,116,101,112,115,  0,105,116,101,114,  0,115,
+ 99,114,101,119, 95,111,102,115,  0, 97,110,103,108,101,  0, 42,111, 99,101, 97,110,  0, 42,111, 99,101, 97,110, 99, 97, 99,104,
+101,  0,114,101,115,111,108,117,116,105,111,110,  0,115,112, 97,116,105, 97,108, 95,115,105,122,101,  0,119,105,110,100, 95,118,
+101,108,111, 99,105,116,121,  0,115,109, 97,108,108,101,115,116, 95,119, 97,118,101,  0,119, 97,118,101, 95, 97,108,105,103,110,
+109,101,110,116,  0,119, 97,118,101, 95,100,105,114,101, 99,116,105,111,110,  0,119, 97,118,101, 95,115, 99, 97,108,101,  0, 99,
+104,111,112, 95, 97,109,111,117,110,116,  0,102,111, 97,109, 95, 99,111,118,101,114, 97,103,101,  0, 98, 97,107,101,115,116, 97,
+114,116,  0, 98, 97,107,101,101,110,100,  0, 99, 97, 99,104,101,112, 97,116,104, 91, 49, 48, 50, 52, 93,  0,102,111, 97,109,108,
+ 97,121,101,114,110, 97,109,101, 91, 54, 52, 93,  0, 99, 97, 99,104,101,100,  0,103,101,111,109,101,116,114,121, 95,109,111,100,
+101,  0,114,101,102,114,101,115,104,  0,114,101,112,101, 97,116, 95,120,  0,114,101,112,101, 97,116, 95,121,  0,102,111, 97,109,
+ 95,102, 97,100,101,  0, 42,111, 98,106,101, 99,116, 95,102,114,111,109,  0, 42,111, 98,106,101, 99,116, 95,116,111,  0,102, 97,
+108,108,111,102,102, 95,114, 97,100,105,117,115,  0,101,100,105,116, 95,102,108, 97,103,115,  0,100,101,102, 97,117,108,116, 95,
+119,101,105,103,104,116,  0, 42, 99,109, 97,112, 95, 99,117,114,118,101,  0, 97,100,100, 95,116,104,114,101,115,104,111,108,100,
+  0,114,101,109, 95,116,104,114,101,115,104,111,108,100,  0,109, 97,115,107, 95, 99,111,110,115,116, 97,110,116,  0,109, 97,115,
+107, 95,100,101,102,103,114,112, 95,110, 97,109,101, 91, 54, 52, 93,  0,109, 97,115,107, 95,116,101,120, 95,117,115,101, 95, 99,
+104, 97,110,110,101,108,  0, 42,109, 97,115,107, 95,116,101,120,116,117,114,101,  0, 42,109, 97,115,107, 95,116,101,120, 95,109,
+ 97,112, 95,111, 98,106,  0,109, 97,115,107, 95,116,101,120, 95,109, 97,112,112,105,110,103,  0,109, 97,115,107, 95,116,101,120,
+ 95,117,118,108, 97,121,101,114, 95,110, 97,109,101, 91, 54, 52, 93,  0,112, 97,100, 95,105, 49,  0,100,101,102,103,114,112, 95,
+110, 97,109,101, 95, 97, 91, 54, 52, 93,  0,100,101,102,103,114,112, 95,110, 97,109,101, 95, 98, 91, 54, 52, 93,  0,100,101,102,
+ 97,117,108,116, 95,119,101,105,103,104,116, 95, 97,  0,100,101,102, 97,117,108,116, 95,119,101,105,103,104,116, 95, 98,  0,109,
+105,120, 95,109,111,100,101,  0,109,105,120, 95,115,101,116,  0,112, 97,100, 95, 99, 49, 91, 54, 93,  0,112,114,111,120,105,109,
+105,116,121, 95,109,111,100,101,  0,112,114,111,120,105,109,105,116,121, 95,102,108, 97,103,115,  0, 42,112,114,111,120,105,109,
+105,116,121, 95,111, 98, 95,116, 97,114,103,101,116,  0,109,105,110, 95,100,105,115,116,  0,109, 97,120, 95,100,105,115,116,  0,
+112, 97,100, 95,115, 49,  0, 42, 99, 97,110,118, 97,115,  0, 42, 98,114,117,115,104,  0,116,104,114,101,115,104,111,108,100,  0,
+115, 99, 97,108,101,  0,104,101,114,109,105,116,101, 95,110,117,109,  0, 98,114, 97,110, 99,104, 95,115,109,111,111,116,104,105,
+110,103,  0,115,121,109,109,101,116,114,121, 95, 97,120,101,115,  0, 42,108, 97,116,116,  0,112,110,116,115,119,  0,111,112,110,
+116,115,117,  0,111,112,110,116,115,118,  0,111,112,110,116,115,119,  0,116,121,112,101,117,  0,116,121,112,101,118,  0,116,121,
+112,101,119,  0,102,117,  0,102,118,  0,102,119,  0,100,117,  0,100,118,  0,100,119,  0, 42,100,101,102,  0, 42,108, 97,116,116,
+105, 99,101,100, 97,116, 97,  0,108, 97,116,109, 97,116, 91, 52, 93, 91, 52, 93,  0, 42,101,100,105,116,108, 97,116,116,  0,118,
+101, 99, 91, 56, 93, 91, 51, 93,  0, 42,115, 99,117,108,112,116,  0,112, 97,114,116,121,112,101,  0,112, 97,114, 49,  0,112, 97,
+114, 50,  0,112, 97,114, 51,  0,112, 97,114,115,117, 98,115,116,114, 91, 54, 52, 93,  0, 42,116,114, 97, 99,107,  0, 42,112,114,
+111,120,121,  0, 42,112,114,111,120,121, 95,103,114,111,117,112,  0, 42,112,114,111,120,121, 95,102,114,111,109,  0, 42, 97, 99,
+116,105,111,110,  0, 42,112,111,115,101,108,105, 98,  0, 42,112,111,115,101,  0, 42,103,112,100,  0, 97,118,115,  0, 42,109,112,
+ 97,116,104,  0, 99,111,110,115,116,114, 97,105,110,116, 67,104, 97,110,110,101,108,115,  0,101,102,102,101, 99,116,  0,100,101,
+102, 98, 97,115,101,  0,109,111,100,105,102,105,101,114,115,  0,114,101,115,116,111,114,101, 95,109,111,100,101,  0, 42,109, 97,
+116, 98,105,116,115,  0, 97, 99,116, 99,111,108,  0,100,108,111, 99, 91, 51, 93,  0,111,114,105,103, 91, 51, 93,  0,100,115,105,
+122,101, 91, 51, 93,  0,100,115, 99, 97,108,101, 91, 51, 93,  0,100,114,111,116, 91, 51, 93,  0,100,113,117, 97,116, 91, 52, 93,
+  0,114,111,116, 65,120,105,115, 91, 51, 93,  0,100,114,111,116, 65,120,105,115, 91, 51, 93,  0,114,111,116, 65,110,103,108,101,
+  0,100,114,111,116, 65,110,103,108,101,  0,111, 98,109, 97,116, 91, 52, 93, 91, 52, 93,  0, 99,111,110,115,116,105,110,118, 91,
+ 52, 93, 91, 52, 93,  0,105,109, 97,116, 95,114,101,110, 91, 52, 93, 91, 52, 93,  0,108, 97,121,  0,112, 97,100, 54,  0, 99,111,
+108, 98,105,116,115,  0,116,114, 97,110,115,102,108, 97,103,  0,112,114,111,116,101, 99,116,102,108, 97,103,  0,116,114, 97, 99,
+107,102,108, 97,103,  0,117,112,102,108, 97,103,  0,110,108, 97,102,108, 97,103,  0,105,112,111,102,108, 97,103,  0,115, 99, 97,
+102,108, 97,103,  0,115, 99, 97,118,105,115,102,108, 97,103,  0,112, 97,100, 53,  0,100,117,112,111,110,  0,100,117,112,111,102,
+102,  0,100,117,112,115,116, 97,  0,100,117,112,101,110,100,  0,115,102,  0,109, 97,115,115,  0,100, 97,109,112,105,110,103,  0,
+105,110,101,114,116,105, 97,  0,102,111,114,109,102, 97, 99,116,111,114,  0,114,100, 97,109,112,105,110,103,  0,109, 97,114,103,
+105,110,  0,109, 97,120, 95,118,101,108,  0,109,105,110, 95,118,101,108,  0,109, 95, 99,111,110,116, 97, 99,116, 80,114,111, 99,
+101,115,115,105,110,103, 84,104,114,101,115,104,111,108,100,  0,111, 98,115,116, 97, 99,108,101, 82, 97,100,  0,115,116,101,112,
+ 95,104,101,105,103,104,116,  0,106,117,109,112, 95,115,112,101,101,100,  0,102, 97,108,108, 95,115,112,101,101,100,  0,112, 97,
+100, 49, 91, 52, 93,  0,114,111,116,109,111,100,101,  0, 98,111,117,110,100,116,121,112,101,  0, 99,111,108,108,105,115,105,111,
+110, 95, 98,111,117,110,100,116,121,112,101,  0,114,101,115,116,114,105, 99,116,102,108, 97,103,  0,100,116,  0,101,109,112,116,
+121, 95,100,114, 97,119,116,121,112,101,  0,101,109,112,116,121, 95,100,114, 97,119,115,105,122,101,  0,100,117,112,102, 97, 99,
+101,115, 99, 97,  0,112,114,111,112,  0,115,101,110,115,111,114,115,  0, 99,111,110,116,114,111,108,108,101,114,115,  0, 97, 99,
+116,117, 97,116,111,114,115,  0, 98, 98,115,105,122,101, 91, 51, 93,  0, 97, 99,116,100,101,102,  0,103, 97,109,101,102,108, 97,
+103,  0,103, 97,109,101,102,108, 97,103, 50,  0, 42, 98,115,111,102,116,  0,115,111,102,116,102,108, 97,103,  0, 97,110,105,115,
+111,116,114,111,112,105, 99, 70,114,105, 99,116,105,111,110, 91, 51, 93,  0, 99,111,110,115,116,114, 97,105,110,116,115,  0,110,
+108, 97,115,116,114,105,112,115,  0,104,111,111,107,115,  0,112, 97,114,116,105, 99,108,101,115,121,115,116,101,109,  0, 42,115,
+111,102,116,  0, 42,100,117,112, 95,103,114,111,117,112,  0, 98,111,100,121, 95,116,121,112,101,  0,115,104, 97,112,101,102,108,
+ 97,103,  0, 42,102,108,117,105,100,115,105,109, 83,101,116,116,105,110,103,115,  0, 42,100,101,114,105,118,101,100, 68,101,102,
+111,114,109,  0, 42,100,101,114,105,118,101,100, 70,105,110, 97,108,  0,108, 97,115,116, 68, 97,116, 97, 77, 97,115,107,  0, 99,
+117,115,116,111,109,100, 97,116, 97, 95,109, 97,115,107,  0,115,116, 97,116,101,  0,105,110,105,116, 95,115,116, 97,116,101,  0,
+103,112,117,108, 97,109,112,  0,112, 99, 95,105,100,115,  0, 42,100,117,112,108,105,108,105,115,116,  0,105,109, 97, 95,111,102,
+115, 91, 50, 93,  0, 99,117,114,105,110,100,101,120,  0, 97, 99,116,105,118,101,  0,111,114,105,103,108, 97,121,  0,111,109, 97,
+116, 91, 52, 93, 91, 52, 93,  0,111,114, 99,111, 91, 51, 93,  0,110,111, 95,100,114, 97,119,  0, 97,110,105,109, 97,116,101,100,
+  0,100,101,102,108,101, 99,116,  0,102,111,114, 99,101,102,105,101,108,100,  0,115,104, 97,112,101,  0,116,101,120, 95,109,111,
+100,101,  0,107,105,110,107,  0,107,105,110,107, 95, 97,120,105,115,  0,122,100,105,114,  0,102, 95,115,116,114,101,110,103,116,
+104,  0,102, 95,100, 97,109,112,  0,102, 95,102,108,111,119,  0,102, 95,115,105,122,101,  0,102, 95,112,111,119,101,114,  0,109,
+ 97,120,100,105,115,116,  0,109,105,110,100,105,115,116,  0,102, 95,112,111,119,101,114, 95,114,  0,109, 97,120,114, 97,100,  0,
+109,105,110,114, 97,100,  0,112,100,101,102, 95,100, 97,109,112,  0,112,100,101,102, 95,114,100, 97,109,112,  0,112,100,101,102,
+ 95,112,101,114,109,  0,112,100,101,102, 95,102,114,105, 99,116,  0,112,100,101,102, 95,114,102,114,105, 99,116,  0,112,100,101,
+102, 95,115,116,105, 99,107,110,101,115,115,  0, 97, 98,115,111,114,112,116,105,111,110,  0,112,100,101,102, 95,115, 98,100, 97,
+109,112,  0,112,100,101,102, 95,115, 98,105,102,116,  0,112,100,101,102, 95,115, 98,111,102,116,  0, 99,108,117,109,112, 95,102,
+ 97, 99,  0, 99,108,117,109,112, 95,112,111,119,  0,107,105,110,107, 95,102,114,101,113,  0,107,105,110,107, 95,115,104, 97,112,
+101,  0,107,105,110,107, 95, 97,109,112,  0,102,114,101,101, 95,101,110,100,  0,116,101,120, 95,110, 97, 98,108, 97,  0, 42,114,
+110,103,  0,102, 95,110,111,105,115,101,  0,119,101,105,103,104,116, 91, 49, 51, 93,  0,103,108,111, 98, 97,108, 95,103,114, 97,
+118,105,116,121,  0,114,116, 91, 51, 93,  0,116,111,116,100, 97,116, 97,  0,102,114, 97,109,101,  0,116,111,116,112,111,105,110,
+116,  0,100, 97,116, 97, 95,116,121,112,101,115,  0, 42,100, 97,116, 97, 91, 56, 93,  0, 42, 99,117,114, 91, 56, 93,  0,101,120,
+116,114, 97,100, 97,116, 97,  0,115,116,101,112,  0,115,105,109,102,114, 97,109,101,  0,115,116, 97,114,116,102,114, 97,109,101,
+  0,101,110,100,102,114, 97,109,101,  0,101,100,105,116,102,114, 97,109,101,  0,108, 97,115,116, 95,101,120, 97, 99,116,  0,108,
+ 97,115,116, 95,118, 97,108,105,100,  0, 99,111,109,112,114,101,115,115,105,111,110,  0,112,114,101,118, 95,110, 97,109,101, 91,
+ 54, 52, 93,  0,105,110,102,111, 91, 54, 52, 93,  0,112, 97,116,104, 91, 49, 48, 50, 52, 93,  0, 42, 99, 97, 99,104,101,100, 95,
+102,114, 97,109,101,115,  0,109,101,109, 95, 99, 97, 99,104,101,  0, 42,101,100,105,116,  0, 40, 42,102,114,101,101, 95,101,100,
+105,116, 41, 40, 41,  0,108,105,110, 83,116,105,102,102,  0, 97,110,103, 83,116,105,102,102,  0,118,111,108,117,109,101,  0,118,
+105,116,101,114, 97,116,105,111,110,115,  0,112,105,116,101,114, 97,116,105,111,110,115,  0,100,105,116,101,114, 97,116,105,111,
+110,115,  0, 99,105,116,101,114, 97,116,105,111,110,115,  0,107, 83, 82, 72, 82, 95, 67, 76,  0,107, 83, 75, 72, 82, 95, 67, 76,
+  0,107, 83, 83, 72, 82, 95, 67, 76,  0,107, 83, 82, 95, 83, 80, 76, 84, 95, 67, 76,  0,107, 83, 75, 95, 83, 80, 76, 84, 95, 67,
+ 76,  0,107, 83, 83, 95, 83, 80, 76, 84, 95, 67, 76,  0,107, 86, 67, 70,  0,107, 68, 80,  0,107, 68, 71,  0,107, 76, 70,  0,107,
+ 80, 82,  0,107, 86, 67,  0,107, 68, 70,  0,107, 77, 84,  0,107, 67, 72, 82,  0,107, 75, 72, 82,  0,107, 83, 72, 82,  0,107, 65,
+ 72, 82,  0, 99,111,108,108,105,115,105,111,110,102,108, 97,103,115,  0,110,117,109, 99,108,117,115,116,101,114,105,116,101,114,
+ 97,116,105,111,110,115,  0,119,101,108,100,105,110,103,  0,116,111,116,115,112,114,105,110,103,  0, 42, 98,112,111,105,110,116,
+  0, 42, 98,115,112,114,105,110,103,  0,109,115,103, 95,108,111, 99,107,  0,109,115,103, 95,118, 97,108,117,101,  0,110,111,100,
+101,109, 97,115,115,  0,110, 97,109,101,100, 86, 71, 95, 77, 97,115,115, 91, 54, 52, 93,  0,103,114, 97,118,  0,109,101,100,105,
+ 97,102,114,105, 99,116,  0,114,107,108,105,109,105,116,  0,112,104,121,115,105, 99,115, 95,115,112,101,101,100,  0,103,111, 97,
+108,115,112,114,105,110,103,  0,103,111, 97,108,102,114,105, 99,116,  0,109,105,110,103,111, 97,108,  0,109, 97,120,103,111, 97,
+108,  0,100,101,102,103,111, 97,108,  0,118,101,114,116,103,114,111,117,112,  0,110, 97,109,101,100, 86, 71, 95, 83,111,102,116,
+103,111, 97,108, 91, 54, 52, 93,  0,102,117,122,122,121,110,101,115,115,  0,105,110,115,112,114,105,110,103,  0,105,110,102,114,
+105, 99,116,  0,110, 97,109,101,100, 86, 71, 95, 83,112,114,105,110,103, 95, 75, 91, 54, 52, 93,  0,101,102,114, 97,  0,105,110,
+116,101,114,118, 97,108,  0,108,111, 99, 97,108,  0,115,111,108,118,101,114,102,108, 97,103,115,  0, 42, 42,107,101,121,115,  0,
+116,111,116,112,111,105,110,116,107,101,121,  0,115,101, 99,111,110,100,115,112,114,105,110,103,  0, 99,111,108, 98, 97,108,108,
+  0, 98, 97,108,108,100, 97,109,112,  0, 98, 97,108,108,115,116,105,102,102,  0,115, 98, 99, 95,109,111,100,101,  0, 97,101,114,
+111,101,100,103,101,  0,109,105,110,108,111,111,112,115,  0,109, 97,120,108,111,111,112,115,  0, 99,104,111,107,101,  0,115,111,
+108,118,101,114, 95, 73, 68,  0,112,108, 97,115,116,105, 99,  0,115,112,114,105,110,103,112,114,101,108,111, 97,100,  0, 42,115,
+ 99,114, 97,116, 99,104,  0,115,104,101, 97,114,115,116,105,102,102,  0,105,110,112,117,115,104,  0, 42,112,111,105,110,116, 99,
+ 97, 99,104,101,  0, 42,101,102,102,101, 99,116,111,114, 95,119,101,105,103,104,116,115,  0,108, 99,111,109, 91, 51, 93,  0,108,
+114,111,116, 91, 51, 93, 91, 51, 93,  0,108,115, 99, 97,108,101, 91, 51, 93, 91, 51, 93,  0,108, 97,115,116, 95,102,114, 97,109,
+101,  0,118,101,108, 91, 51, 93,  0, 42,102,109,100,  0,115,104,111,119, 95, 97,100,118, 97,110, 99,101,100,111,112,116,105,111,
+110,115,  0,114,101,115,111,108,117,116,105,111,110,120,121,122,  0,112,114,101,118,105,101,119,114,101,115,120,121,122,  0,114,
+101, 97,108,115,105,122,101,  0,103,117,105, 68,105,115,112,108, 97,121, 77,111,100,101,  0,114,101,110,100,101,114, 68,105,115,
+112,108, 97,121, 77,111,100,101,  0,118,105,115, 99,111,115,105,116,121, 86, 97,108,117,101,  0,118,105,115, 99,111,115,105,116,
+121, 77,111,100,101,  0,118,105,115, 99,111,115,105,116,121, 69,120,112,111,110,101,110,116,  0,103,114, 97,118, 91, 51, 93,  0,
+ 97,110,105,109, 83,116, 97,114,116,  0, 97,110,105,109, 69,110,100,  0, 98, 97,107,101, 83,116, 97,114,116,  0, 98, 97,107,101,
+ 69,110,100,  0,102,114, 97,109,101, 79,102,102,115,101,116,  0,103,115,116, 97,114,  0,109, 97,120, 82,101,102,105,110,101,  0,
+105,110,105, 86,101,108,120,  0,105,110,105, 86,101,108,121,  0,105,110,105, 86,101,108,122,  0, 42,111,114,103, 77,101,115,104,
+  0, 42,109,101,115,104, 66, 66,  0,115,117,114,102,100, 97,116, 97, 80, 97,116,104, 91, 49, 48, 50, 52, 93,  0, 98, 98, 83,116,
+ 97,114,116, 91, 51, 93,  0, 98, 98, 83,105,122,101, 91, 51, 93,  0,116,121,112,101, 70,108, 97,103,115,  0,100,111,109, 97,105,
+110, 78,111,118,101, 99,103,101,110,  0,118,111,108,117,109,101, 73,110,105,116, 84,121,112,101,  0,112, 97,114,116, 83,108,105,
+112, 86, 97,108,117,101,  0,103,101,110,101,114, 97,116,101, 84,114, 97, 99,101,114,115,  0,103,101,110,101,114, 97,116,101, 80,
+ 97,114,116,105, 99,108,101,115,  0,115,117,114,102, 97, 99,101, 83,109,111,111,116,104,105,110,103,  0,115,117,114,102, 97, 99,
+101, 83,117, 98,100,105,118,115,  0,112, 97,114,116,105, 99,108,101, 73,110,102, 83,105,122,101,  0,112, 97,114,116,105, 99,108,
+101, 73,110,102, 65,108,112,104, 97,  0,102, 97,114, 70,105,101,108,100, 83,105,122,101,  0, 42,109,101,115,104, 86,101,108,111,
+ 99,105,116,105,101,115,  0, 99,112,115, 84,105,109,101, 83,116, 97,114,116,  0, 99,112,115, 84,105,109,101, 69,110,100,  0, 99,
+112,115, 81,117, 97,108,105,116,121,  0, 97,116,116,114, 97, 99,116,102,111,114, 99,101, 83,116,114,101,110,103,116,104,  0, 97,
+116,116,114, 97, 99,116,102,111,114, 99,101, 82, 97,100,105,117,115,  0,118,101,108,111, 99,105,116,121,102,111,114, 99,101, 83,
+116,114,101,110,103,116,104,  0,118,101,108,111, 99,105,116,121,102,111,114, 99,101, 82, 97,100,105,117,115,  0,108, 97,115,116,
+103,111,111,100,102,114, 97,109,101,  0, 97,110,105,109, 82, 97,116,101,  0,109,105,115,116,121,112,101,  0,104,111,114,114,  0,
+104,111,114,103,  0,104,111,114, 98,  0,122,101,110,114,  0,122,101,110,103,  0,122,101,110, 98,  0,102, 97,115,116, 99,111,108,
+  0,101,120,112,111,115,117,114,101,  0,101,120,112,  0,114, 97,110,103,101,  0,108,105,110,102, 97, 99,  0,108,111,103,102, 97,
+ 99,  0,103,114, 97,118,105,116,121,  0, 97, 99,116,105,118,105,116,121, 66,111,120, 82, 97,100,105,117,115,  0,115,107,121,116,
+121,112,101,  0,111, 99, 99,108,117,115,105,111,110, 82,101,115,  0,112,104,121,115,105, 99,115, 69,110,103,105,110,101,  0,116,
+105, 99,114, 97,116,101,  0,109, 97,120,108,111,103,105, 99,115,116,101,112,  0,112,104,121,115,117, 98,115,116,101,112,  0,109,
+ 97,120,112,104,121,115,116,101,112,  0,109,105,115,105,  0,109,105,115,116,115,116, 97,  0,109,105,115,116,100,105,115,116,  0,
+109,105,115,116,104,105,  0,115,116, 97,114,114,  0,115,116, 97,114,103,  0,115,116, 97,114, 98,  0,115,116, 97,114,107,  0,115,
+116, 97,114,115,105,122,101,  0,115,116, 97,114,109,105,110,100,105,115,116,  0,115,116, 97,114,100,105,115,116,  0,115,116, 97,
+114, 99,111,108,110,111,105,115,101,  0,100,111,102,115,116, 97,  0,100,111,102,101,110,100,  0,100,111,102,109,105,110,  0,100,
+111,102,109, 97,120,  0, 97,111,100,105,115,116,  0, 97,111,100,105,115,116,102, 97, 99,  0, 97,111,101,110,101,114,103,121,  0,
+ 97,111, 98,105, 97,115,  0, 97,111,109,111,100,101,  0, 97,111,115, 97,109,112,  0, 97,111,109,105,120,  0, 97,111, 99,111,108,
+111,114,  0, 97,111, 95, 97,100, 97,112,116, 95,116,104,114,101,115,104,  0, 97,111, 95, 97,100, 97,112,116, 95,115,112,101,101,
+100, 95,102, 97, 99,  0, 97,111, 95, 97,112,112,114,111,120, 95,101,114,114,111,114,  0, 97,111, 95, 97,112,112,114,111,120, 95,
+ 99,111,114,114,101, 99,116,105,111,110,  0, 97,111, 95,105,110,100,105,114,101, 99,116, 95,101,110,101,114,103,121,  0, 97,111,
+ 95,101,110,118, 95,101,110,101,114,103,121,  0, 97,111, 95,112, 97,100, 50,  0, 97,111, 95,105,110,100,105,114,101, 99,116, 95,
+ 98,111,117,110, 99,101,115,  0, 97,111, 95,112, 97,100,  0, 97,111, 95,115, 97,109,112, 95,109,101,116,104,111,100,  0, 97,111,
+ 95,103, 97,116,104,101,114, 95,109,101,116,104,111,100,  0, 97,111, 95, 97,112,112,114,111,120, 95,112, 97,115,115,101,115,  0,
+ 42, 97,111,115,112,104,101,114,101,  0, 42, 97,111,116, 97, 98,108,101,115,  0,115,101,108, 99,111,108,  0,115,120,  0,115,121,
+  0, 42,108,112, 70,111,114,109, 97,116,  0, 42,108,112, 80, 97,114,109,115,  0, 99, 98, 70,111,114,109, 97,116,  0, 99, 98, 80,
+ 97,114,109,115,  0,102, 99, 99, 84,121,112,101,  0,102, 99, 99, 72, 97,110,100,108,101,114,  0,100,119, 75,101,121, 70,114, 97,
+109,101, 69,118,101,114,121,  0,100,119, 81,117, 97,108,105,116,121,  0,100,119, 66,121,116,101,115, 80,101,114, 83,101, 99,111,
+110,100,  0,100,119, 70,108, 97,103,115,  0,100,119, 73,110,116,101,114,108,101, 97,118,101, 69,118,101,114,121,  0, 97,118,105,
+ 99,111,100,101, 99,110, 97,109,101, 91, 49, 50, 56, 93,  0, 42, 99,100, 80, 97,114,109,115,  0, 42,112, 97,100,  0, 99,100, 83,
+105,122,101,  0,113,116, 99,111,100,101, 99,110, 97,109,101, 91, 49, 50, 56, 93,  0, 99,111,100,101, 99, 84,121,112,101,  0, 99,
+111,100,101, 99, 83,112, 97,116,105, 97,108, 81,117, 97,108,105,116,121,  0, 99,111,100,101, 99,  0, 99,111,100,101, 99, 70,108,
+ 97,103,115,  0, 99,111,108,111,114, 68,101,112,116,104,  0, 99,111,100,101, 99, 84,101,109,112,111,114, 97,108, 81,117, 97,108,
+105,116,121,  0,109,105,110, 83,112, 97,116,105, 97,108, 81,117, 97,108,105,116,121,  0,109,105,110, 84,101,109,112,111,114, 97,
+108, 81,117, 97,108,105,116,121,  0,107,101,121, 70,114, 97,109,101, 82, 97,116,101,  0, 98,105,116, 82, 97,116,101,  0, 97,117,
+100,105,111, 99,111,100,101, 99, 84,121,112,101,  0, 97,117,100,105,111, 83, 97,109,112,108,101, 82, 97,116,101,  0, 97,117,100,
+105,111, 66,105,116, 68,101,112,116,104,  0, 97,117,100,105,111, 67,104, 97,110,110,101,108,115,  0, 97,117,100,105,111, 67,111,
+100,101, 99, 70,108, 97,103,115,  0, 97,117,100,105,111, 66,105,116, 82, 97,116,101,  0, 97,117,100,105,111, 95, 99,111,100,101,
+ 99,  0,118,105,100,101,111, 95, 98,105,116,114, 97,116,101,  0, 97,117,100,105,111, 95, 98,105,116,114, 97,116,101,  0, 97,117,
+100,105,111, 95,109,105,120,114, 97,116,101,  0, 97,117,100,105,111, 95, 99,104, 97,110,110,101,108,115,  0, 97,117,100,105,111,
+ 95,112, 97,100,  0, 97,117,100,105,111, 95,118,111,108,117,109,101,  0,103,111,112, 95,115,105,122,101,  0,114, 99, 95,109,105,
+110, 95,114, 97,116,101,  0,114, 99, 95,109, 97,120, 95,114, 97,116,101,  0,114, 99, 95, 98,117,102,102,101,114, 95,115,105,122,
+101,  0,109,117,120, 95,112, 97, 99,107,101,116, 95,115,105,122,101,  0,109,117,120, 95,114, 97,116,101,  0,109,105,120,114, 97,
+116,101,  0,109, 97,105,110,  0,115,112,101,101,100, 95,111,102, 95,115,111,117,110,100,  0,100,111,112,112,108,101,114, 95,102,
+ 97, 99,116,111,114,  0,100,105,115,116, 97,110, 99,101, 95,109,111,100,101,108,  0, 42,109, 97,116, 95,111,118,101,114,114,105,
+100,101,  0, 42,108,105,103,104,116, 95,111,118,101,114,114,105,100,101,  0,108, 97,121, 95,122,109, 97,115,107,  0,108, 97,121,
+ 95,101,120, 99,108,117,100,101,  0,108, 97,121,102,108, 97,103,  0,112, 97,115,115,102,108, 97,103,  0,112, 97,115,115, 95,120,
+111,114,  0,115, 97,109,112,108,101,115,  0,105,109,116,121,112,101,  0,112,108, 97,110,101,115,  0,113,117, 97,108,105,116,121,
+  0, 99,111,109,112,114,101,115,115,  0,101,120,114, 95, 99,111,100,101, 99,  0, 99,105,110,101,111,110, 95,102,108, 97,103,  0,
+ 99,105,110,101,111,110, 95,119,104,105,116,101,  0, 99,105,110,101,111,110, 95, 98,108, 97, 99,107,  0, 99,105,110,101,111,110,
+ 95,103, 97,109,109, 97,  0,106,112, 50, 95,102,108, 97,103,  0,105,109, 95,102,111,114,109, 97,116,  0, 42, 97,118,105, 99,111,
+100,101, 99,100, 97,116, 97,  0, 42,113,116, 99,111,100,101, 99,100, 97,116, 97,  0,113,116, 99,111,100,101, 99,115,101,116,116,
+105,110,103,115,  0,102,102, 99,111,100,101, 99,100, 97,116, 97,  0,115,117, 98,102,114, 97,109,101,  0,112,115,102,114, 97,  0,
+112,101,102,114, 97,  0,105,109, 97,103,101,115,  0,102,114, 97,109, 97,112,116,111,  0,116,104,114,101, 97,100,115,  0,102,114,
+ 97,109,101,108,101,110,  0, 98,108,117,114,102, 97, 99,  0,101,100,103,101, 82,  0,101,100,103,101, 71,  0,101,100,103,101, 66,
+  0,102,117,108,108,115, 99,114,101,101,110,  0,120,112,108, 97,121,  0,121,112,108, 97,121,  0,102,114,101,113,112,108, 97,121,
+  0, 97,116,116,114,105, 98,  0,102,114, 97,109,101, 95,115,116,101,112,  0,115,116,101,114,101,111,109,111,100,101,  0,100,105,
+109,101,110,115,105,111,110,115,112,114,101,115,101,116,  0,109, 97,120,105,109,115,105,122,101,  0,120,115, 99,104,  0,121,115,
+ 99,104,  0,120,112, 97,114,116,115,  0,121,112, 97,114,116,115,  0,115,117, 98,105,109,116,121,112,101,  0,100,105,115,112,108,
+ 97,121,109,111,100,101,  0,115, 99,101,109,111,100,101,  0,114, 97,121,116,114, 97, 99,101, 95,111,112,116,105,111,110,115,  0,
+114, 97,121,116,114, 97, 99,101, 95,115,116,114,117, 99,116,117,114,101,  0,111, 99,114,101,115,  0,112, 97,100, 52,  0, 97,108,
+112,104, 97,109,111,100,101,  0,111,115, 97,  0,102,114,115, 95,115,101, 99,  0,101,100,103,101,105,110,116,  0,115, 97,102,101,
+116,121,  0, 98,111,114,100,101,114,  0,100,105,115,112,114,101, 99,116,  0,108, 97,121,101,114,115,  0, 97, 99,116,108, 97,121,
+  0,109, 98,108,117,114, 95,115, 97,109,112,108,101,115,  0,120, 97,115,112,  0,121, 97,115,112,  0,102,114,115, 95,115,101, 99,
+ 95, 98, 97,115,101,  0,103, 97,117,115,115,  0, 99,111,108,111,114, 95,109,103,116, 95,102,108, 97,103,  0,112,111,115,116,103,
+ 97,109,109, 97,  0,112,111,115,116,104,117,101,  0,112,111,115,116,115, 97,116,  0,100,105,116,104,101,114, 95,105,110,116,101,
+110,115,105,116,121,  0, 98, 97,107,101, 95,111,115, 97,  0, 98, 97,107,101, 95,102,105,108,116,101,114,  0, 98, 97,107,101, 95,
+109,111,100,101,  0, 98, 97,107,101, 95,102,108, 97,103,  0, 98, 97,107,101, 95,110,111,114,109, 97,108, 95,115,112, 97, 99,101,
+  0, 98, 97,107,101, 95,113,117, 97,100, 95,115,112,108,105,116,  0, 98, 97,107,101, 95,109, 97,120,100,105,115,116,  0, 98, 97,
+107,101, 95, 98,105, 97,115,100,105,115,116,  0, 98, 97,107,101, 95,112, 97,100,  0,112,105, 99, 91, 49, 48, 50, 52, 93,  0,115,
+116, 97,109,112,  0,115,116, 97,109,112, 95,102,111,110,116, 95,105,100,  0,115,116, 97,109,112, 95,117,100, 97,116, 97, 91, 55,
+ 54, 56, 93,  0,102,103, 95,115,116, 97,109,112, 91, 52, 93,  0, 98,103, 95,115,116, 97,109,112, 91, 52, 93,  0,115,101,113, 95,
+112,114,101,118, 95,116,121,112,101,  0,115,101,113, 95,114,101,110,100, 95,116,121,112,101,  0,115,101,113, 95,102,108, 97,103,
+  0,112, 97,100, 53, 91, 53, 93,  0,115,105,109,112,108,105,102,121, 95,102,108, 97,103,  0,115,105,109,112,108,105,102,121, 95,
+115,117, 98,115,117,114,102,  0,115,105,109,112,108,105,102,121, 95,115,104, 97,100,111,119,115, 97,109,112,108,101,115,  0,115,
+105,109,112,108,105,102,121, 95,112, 97,114,116,105, 99,108,101,115,  0,115,105,109,112,108,105,102,121, 95, 97,111,115,115,115,
+  0, 99,105,110,101,111,110,119,104,105,116,101,  0, 99,105,110,101,111,110, 98,108, 97, 99,107,  0, 99,105,110,101,111,110,103,
+ 97,109,109, 97,  0,106,112, 50, 95,112,114,101,115,101,116,  0,106,112, 50, 95,100,101,112,116,104,  0,114,112, 97,100, 51,  0,
+100,111,109,101,114,101,115,  0,100,111,109,101,109,111,100,101,  0,100,111,109,101, 97,110,103,108,101,  0,100,111,109,101,116,
+105,108,116,  0,100,111,109,101,114,101,115, 98,117,102,  0, 42,100,111,109,101,116,101,120,116,  0,101,110,103,105,110,101, 91,
+ 51, 50, 93,  0,110, 97,109,101, 91, 51, 50, 93,  0,112, 97,114,116,105, 99,108,101, 95,112,101,114, 99,  0,115,117, 98,115,117,
+114,102, 95,109, 97,120,  0,115,104, 97,100, 98,117,102,115, 97,109,112,108,101, 95,109, 97,120,  0, 97,111, 95,101,114,114,111,
+114,  0,116,105,108,116,  0,114,101,115, 98,117,102,  0, 42,119, 97,114,112,116,101,120,116,  0, 99,111,108, 91, 51, 93,  0, 99,
+101,108,108,115,105,122,101,  0, 99,101,108,108,104,101,105,103,104,116,  0, 97,103,101,110,116,109, 97,120,115,108,111,112,101,
+  0, 97,103,101,110,116,109, 97,120, 99,108,105,109, 98,  0, 97,103,101,110,116,104,101,105,103,104,116,  0, 97,103,101,110,116,
+114, 97,100,105,117,115,  0,101,100,103,101,109, 97,120,108,101,110,  0,101,100,103,101,109, 97,120,101,114,114,111,114,  0,114,
+101,103,105,111,110,109,105,110,115,105,122,101,  0,114,101,103,105,111,110,109,101,114,103,101,115,105,122,101,  0,118,101,114,
+116,115,112,101,114,112,111,108,121,  0,100,101,116, 97,105,108,115, 97,109,112,108,101,100,105,115,116,  0,100,101,116, 97,105,
+108,115, 97,109,112,108,101,109, 97,120,101,114,114,111,114,  0,102,114, 97,109,105,110,103,  0,112,108, 97,121,101,114,102,108,
+ 97,103,  0,114,116, 49,  0,114,116, 50,  0, 97, 97,115, 97,109,112,108,101,115,  0,112, 97,100, 52, 91, 51, 93,  0,100,111,109,
+101,  0,115,116,101,114,101,111,102,108, 97,103,  0,101,121,101,115,101,112, 97,114, 97,116,105,111,110,  0,114,101, 99, 97,115,
+116, 68, 97,116, 97,  0,109, 97,116,109,111,100,101,  0,101,120,105,116,107,101,121,  0,111, 98,115,116, 97, 99,108,101, 83,105,
+109,117,108, 97,116,105,111,110,  0,108,101,118,101,108, 72,101,105,103,104,116,  0,100,101, 97, 99,116,105,118, 97,116,105,111,
+110,116,105,109,101,  0,108,105,110,101, 97,114,100,101, 97, 99,116,116,104,114,101,115,104,111,108,100,  0, 97,110,103,117,108,
+ 97,114,100,101, 97, 99,116,116,104,114,101,115,104,111,108,100,  0, 42, 99, 97,109,101,114, 97,  0, 42,112, 97,105,110,116, 95,
+ 99,117,114,115,111,114,  0,112, 97,105,110,116, 95, 99,117,114,115,111,114, 95, 99,111,108, 91, 52, 93,  0,110,117,109, 95,105,
+110,112,117,116, 95,115, 97,109,112,108,101,115,  0,112, 97,105,110,116,  0,115,101, 97,109, 95, 98,108,101,101,100,  0,110,111,
+114,109, 97,108, 95, 97,110,103,108,101,  0,115, 99,114,101,101,110, 95,103,114, 97, 98, 95,115,105,122,101, 91, 50, 93,  0, 42,
+112, 97,105,110,116, 99,117,114,115,111,114,  0,105,110,118,101,114,116,  0,116,111,116,114,101,107,101,121,  0,116,111,116, 97,
+100,100,107,101,121,  0, 98,114,117,115,104,116,121,112,101,  0, 98,114,117,115,104, 91, 55, 93,  0,101,109,105,116,116,101,114,
+100,105,115,116,  0,115,101,108,101, 99,116,109,111,100,101,  0,101,100,105,116,116,121,112,101,  0,100,114, 97,119, 95,115,116,
+101,112,  0,102, 97,100,101, 95,102,114, 97,109,101,115,  0,114, 97,100,105, 97,108, 95,115,121,109,109, 91, 51, 93,  0,108, 97,
+115,116, 95,120,  0,108, 97,115,116, 95,121,  0,108, 97,115,116, 95, 97,110,103,108,101,  0,100,114, 97,119, 95, 97,110, 99,104,
+111,114,101,100,  0, 97,110, 99,104,111,114,101,100, 95,115,105,122,101,  0, 97,110, 99,104,111,114,101,100, 95,108,111, 99, 97,
+116,105,111,110, 91, 51, 93,  0, 97,110, 99,104,111,114,101,100, 95,105,110,105,116,105, 97,108, 95,109,111,117,115,101, 91, 50,
+ 93,  0,100,114, 97,119, 95,112,114,101,115,115,117,114,101,  0,112,114,101,115,115,117,114,101, 95,118, 97,108,117,101,  0,115,
+112,101, 99,105, 97,108, 95,114,111,116, 97,116,105,111,110,  0, 42,118,112, 97,105,110,116, 95,112,114,101,118,  0, 42,119,112,
+ 97,105,110,116, 95,112,114,101,118,  0,109, 97,116, 91, 51, 93, 91, 51, 93,  0,117,110,112,114,111,106,101, 99,116,101,100, 95,
+114, 97,100,105,117,115,  0, 42,118,112, 97,105,110,116,  0, 42,119,112, 97,105,110,116,  0, 42,117,118,115, 99,117,108,112,116,
+  0,118,103,114,111,117,112, 95,119,101,105,103,104,116,  0, 99,111,114,110,101,114,116,121,112,101,  0,106,111,105,110,116,114,
+105,108,105,109,105,116,  0,100,101,103,114,  0,116,117,114,110,  0,101,120,116,114, 95,111,102,102,115,  0,100,111,117, 98,108,
+105,109,105,116,  0,110,111,114,109, 97,108,115,105,122,101,  0, 97,117,116,111,109,101,114,103,101,  0,115,101,103,109,101,110,
+116,115,  0,114,105,110,103,115,  0,118,101,114,116,105, 99,101,115,  0,117,110,119,114, 97,112,112,101,114,  0,117,118, 99, 97,
+108, 99, 95,114, 97,100,105,117,115,  0,117,118, 99, 97,108, 99, 95, 99,117, 98,101,115,105,122,101,  0,117,118, 99, 97,108, 99,
+ 95,109, 97,114,103,105,110,  0,117,118, 99, 97,108, 99, 95,109, 97,112,100,105,114,  0,117,118, 99, 97,108, 99, 95,109, 97,112,
+ 97,108,105,103,110,  0,117,118, 99, 97,108, 99, 95,102,108, 97,103,  0,117,118, 95,102,108, 97,103,  0,117,118, 95,115,101,108,
+101, 99,116,109,111,100,101,  0,117,118, 95,115,117, 98,115,117,114,102, 95,108,101,118,101,108,  0,103,112,101,110, 99,105,108,
+ 95,102,108, 97,103,115,  0, 97,117,116,111,105,107, 95, 99,104, 97,105,110,108,101,110,  0,105,109, 97,112, 97,105,110,116,  0,
+112, 97,114,116,105, 99,108,101,  0,112,114,111,112,111,114,116,105,111,110, 97,108, 95,115,105,122,101,  0,115,101,108,101, 99,
+116, 95,116,104,114,101,115,104,  0, 99,108,101, 97,110, 95,116,104,114,101,115,104,  0, 97,117,116,111,107,101,121, 95,109,111,
+100,101,  0, 97,117,116,111,107,101,121, 95,102,108, 97,103,  0,109,117,108,116,105,114,101,115, 95,115,117, 98,100,105,118, 95,
+116,121,112,101,  0,112, 97,100, 50, 91, 53, 93,  0,115,107,103,101,110, 95,114,101,115,111,108,117,116,105,111,110,  0,115,107,
+103,101,110, 95,116,104,114,101,115,104,111,108,100, 95,105,110,116,101,114,110, 97,108,  0,115,107,103,101,110, 95,116,104,114,
+101,115,104,111,108,100, 95,101,120,116,101,114,110, 97,108,  0,115,107,103,101,110, 95,108,101,110,103,116,104, 95,114, 97,116,
+105,111,  0,115,107,103,101,110, 95,108,101,110,103,116,104, 95,108,105,109,105,116,  0,115,107,103,101,110, 95, 97,110,103,108,
+101, 95,108,105,109,105,116,  0,115,107,103,101,110, 95, 99,111,114,114,101,108, 97,116,105,111,110, 95,108,105,109,105,116,  0,
+115,107,103,101,110, 95,115,121,109,109,101,116,114,121, 95,108,105,109,105,116,  0,115,107,103,101,110, 95,114,101,116, 97,114,
+103,101,116, 95, 97,110,103,108,101, 95,119,101,105,103,104,116,  0,115,107,103,101,110, 95,114,101,116, 97,114,103,101,116, 95,
+108,101,110,103,116,104, 95,119,101,105,103,104,116,  0,115,107,103,101,110, 95,114,101,116, 97,114,103,101,116, 95,100,105,115,
+116, 97,110, 99,101, 95,119,101,105,103,104,116,  0,115,107,103,101,110, 95,111,112,116,105,111,110,115,  0,115,107,103,101,110,
+ 95,112,111,115,116,112,114,111,  0,115,107,103,101,110, 95,112,111,115,116,112,114,111, 95,112, 97,115,115,101,115,  0,115,107,
+103,101,110, 95,115,117, 98,100,105,118,105,115,105,111,110,115, 91, 51, 93,  0,115,107,103,101,110, 95,109,117,108,116,105, 95,
+108,101,118,101,108,  0, 42,115,107,103,101,110, 95,116,101,109,112,108, 97,116,101,  0, 98,111,110,101, 95,115,107,101,116, 99,
+104,105,110,103,  0, 98,111,110,101, 95,115,107,101,116, 99,104,105,110,103, 95, 99,111,110,118,101,114,116,  0,115,107,103,101,
+110, 95,115,117, 98,100,105,118,105,115,105,111,110, 95,110,117,109, 98,101,114,  0,115,107,103,101,110, 95,114,101,116, 97,114,
+103,101,116, 95,111,112,116,105,111,110,115,  0,115,107,103,101,110, 95,114,101,116, 97,114,103,101,116, 95,114,111,108,108,  0,
+115,107,103,101,110, 95,115,105,100,101, 95,115,116,114,105,110,103, 91, 56, 93,  0,115,107,103,101,110, 95,110,117,109, 95,115,
+116,114,105,110,103, 91, 56, 93,  0,101,100,103,101, 95,109,111,100,101,  0,101,100,103,101, 95,109,111,100,101, 95,108,105,118,
+101, 95,117,110,119,114, 97,112,  0,115,110, 97,112, 95,109,111,100,101,  0,115,110, 97,112, 95,102,108, 97,103,  0,115,110, 97,
+112, 95,116, 97,114,103,101,116,  0,112,114,111,112,111,114,116,105,111,110, 97,108,  0,112,114,111,112, 95,109,111,100,101,  0,
+112,114,111,112,111,114,116,105,111,110, 97,108, 95,111, 98,106,101, 99,116,115,  0,112, 97,100, 91, 53, 93,  0, 97,117,116,111,
+ 95,110,111,114,109, 97,108,105,122,101,  0,109,117,108,116,105,112, 97,105,110,116,  0,117,115,101, 95,117,118, 95,115, 99,117,
+108,112,116,  0,117,118, 95,115, 99,117,108,112,116, 95,115,101,116,116,105,110,103,115,  0,117,118, 95,115, 99,117,108,112,116,
+ 95,116,111,111,108,  0,117,118, 95,114,101,108, 97,120, 95,109,101,116,104,111,100,  0,115, 99,117,108,112,116, 95,112, 97,105,
+110,116, 95,115,101,116,116,105,110,103,115,  0,115, 99,117,108,112,116, 95,112, 97,105,110,116, 95,117,110,105,102,105,101,100,
+ 95,115,105,122,101,  0,115, 99,117,108,112,116, 95,112, 97,105,110,116, 95,117,110,105,102,105,101,100, 95,117,110,112,114,111,
+106,101, 99,116,101,100, 95,114, 97,100,105,117,115,  0,115, 99,117,108,112,116, 95,112, 97,105,110,116, 95,117,110,105,102,105,
+101,100, 95, 97,108,112,104, 97,  0,117,110,105,102,105,101,100, 95,112, 97,105,110,116, 95,115,101,116,116,105,110,103,115,  0,
+116,111,116,111, 98,106,  0,116,111,116,108, 97,109,112,  0,116,111,116,111, 98,106,115,101,108,  0,116,111,116, 99,117,114,118,
+101,  0,116,111,116,109,101,115,104,  0,116,111,116, 97,114,109, 97,116,117,114,101,  0,115, 99, 97,108,101, 95,108,101,110,103,
+116,104,  0,115,121,115,116,101,109,  0,115,121,115,116,101,109, 95,114,111,116, 97,116,105,111,110,  0,103,114, 97,118,105,116,
+121, 91, 51, 93,  0,113,117,105, 99,107, 95, 99, 97, 99,104,101, 95,115,116,101,112,  0, 42,119,111,114,108,100,  0, 42,115,101,
+116,  0, 98, 97,115,101,  0, 42, 98, 97,115, 97, 99,116,  0, 42,111, 98,101,100,105,116,  0, 99,117,114,115,111,114, 91, 51, 93,
+  0,116,119, 99,101,110,116, 91, 51, 93,  0,116,119,109,105,110, 91, 51, 93,  0,116,119,109, 97,120, 91, 51, 93,  0,108, 97,121,
+ 97, 99,116,  0,108, 97,121, 95,117,112,100, 97,116,101,100,  0, 42,101,100,  0, 42,116,111,111,108,115,101,116,116,105,110,103,
+115,  0, 42,115,116, 97,116,115,  0, 97,117,100,105,111,  0,116,114, 97,110,115,102,111,114,109, 95,115,112, 97, 99,101,115,  0,
+ 42,115,111,117,110,100, 95,115, 99,101,110,101,  0, 42,115,111,117,110,100, 95,115, 99,101,110,101, 95,104, 97,110,100,108,101,
+  0, 42,115,111,117,110,100, 95,115, 99,114,117, 98, 95,104, 97,110,100,108,101,  0, 42,115,112,101, 97,107,101,114, 95,104, 97,
+110,100,108,101,115,  0, 42,102,112,115, 95,105,110,102,111,  0, 42,116,104,101, 68, 97,103,  0,100, 97,103,105,115,118, 97,108,
+105,100,  0,100, 97,103,102,108, 97,103,115,  0, 97, 99,116,105,118,101, 95,107,101,121,105,110,103,115,101,116,  0,107,101,121,
+105,110,103,115,101,116,115,  0,103,109,  0,117,110,105,116,  0,112,104,121,115,105, 99,115, 95,115,101,116,116,105,110,103,115,
+  0, 42, 99,108,105,112,  0, 99,117,115,116,111,109,100, 97,116, 97, 95,109, 97,115,107, 95,109,111,100, 97,108,  0, 99,117,115,
+101,114,  0, 98,108,101,110,100,  0,118,105,101,119,  0,119,105,110,109, 97,116, 91, 52, 93, 91, 52, 93,  0,118,105,101,119,109,
+ 97,116, 91, 52, 93, 91, 52, 93,  0,118,105,101,119,105,110,118, 91, 52, 93, 91, 52, 93,  0,112,101,114,115,109, 97,116, 91, 52,
+ 93, 91, 52, 93,  0,112,101,114,115,105,110,118, 91, 52, 93, 91, 52, 93,  0,118,105,101,119,109, 97,116,111, 98, 91, 52, 93, 91,
+ 52, 93,  0,112,101,114,115,109, 97,116,111, 98, 91, 52, 93, 91, 52, 93,  0, 99,108,105,112, 91, 54, 93, 91, 52, 93,  0, 99,108,
+105,112, 95,108,111, 99, 97,108, 91, 54, 93, 91, 52, 93,  0, 42, 99,108,105,112, 98, 98,  0, 42,108,111, 99, 97,108,118,100,  0,
+ 42,114,105,  0, 42,114,101,110,100,101,114, 95,101,110,103,105,110,101,  0, 42,100,101,112,116,104,115,  0, 42,115,109,115,  0,
+ 42,115,109,111,111,116,104, 95,116,105,109,101,114,  0,116,119,109, 97,116, 91, 52, 93, 91, 52, 93,  0,118,105,101,119,113,117,
+ 97,116, 91, 52, 93,  0,122,102, 97, 99,  0, 99, 97,109,100,120,  0, 99, 97,109,100,121,  0,112,105,120,115,105,122,101,  0, 99,
+ 97,109,122,111,111,109,  0,105,115, 95,112,101,114,115,112,  0,112,101,114,115,112,  0,118,105,101,119,108,111, 99,107,  0,116,
+119,100,114, 97,119,102,108, 97,103,  0,114,102,108, 97,103,  0,108,118,105,101,119,113,117, 97,116, 91, 52, 93,  0,108,112,101,
+114,115,112,  0,108,118,105,101,119,  0,103,114,105,100,118,105,101,119,  0,116,119, 97,110,103,108,101, 91, 51, 93,  0,114,111,
+116, 95, 97,110,103,108,101,  0,114,111,116, 95, 97,120,105,115, 91, 51, 93,  0,114,101,103,105,111,110, 98, 97,115,101,  0,115,
+112, 97, 99,101,116,121,112,101,  0, 98,108,111, 99,107,115, 99, 97,108,101,  0, 98,108,111, 99,107,104, 97,110,100,108,101,114,
+ 91, 56, 93,  0, 98,117,110,100,108,101, 95,115,105,122,101,  0, 98,117,110,100,108,101, 95,100,114, 97,119,116,121,112,101,  0,
+108, 97,121, 95,117,115,101,100,  0, 42,111, 98, 95, 99,101,110,116,114,101,  0, 98,103,112,105, 99, 98, 97,115,101,  0, 42, 98,
+103,112,105, 99,  0,111, 98, 95, 99,101,110,116,114,101, 95, 98,111,110,101, 91, 54, 52, 93,  0,100,114, 97,119,116,121,112,101,
+  0,111, 98, 95, 99,101,110,116,114,101, 95, 99,117,114,115,111,114,  0,115, 99,101,110,101,108,111, 99,107,  0, 97,114,111,117,
+110,100,  0,103,114,105,100,  0,110,101, 97,114,  0,102, 97,114,  0,109,111,100,101,115,101,108,101, 99,116,  0,103,114,105,100,
+108,105,110,101,115,  0,103,114,105,100,115,117, 98,100,105,118,  0,103,114,105,100,102,108, 97,103,  0,116,119,116,121,112,101,
+  0,116,119,109,111,100,101,  0,116,119,102,108, 97,103,  0,112, 97,100, 50, 91, 50, 93,  0, 97,102,116,101,114,100,114, 97,119,
+ 95,116,114, 97,110,115,112,  0, 97,102,116,101,114,100,114, 97,119, 95,120,114, 97,121,  0, 97,102,116,101,114,100,114, 97,119,
+ 95,120,114, 97,121,116,114, 97,110,115,112,  0,122, 98,117,102,  0,120,114, 97,121,  0,112, 97,100, 51, 91, 50, 93,  0, 42,112,
+114,111,112,101,114,116,105,101,115, 95,115,116,111,114, 97,103,101,  0,118,101,114,116,  0,104,111,114,  0,109, 97,115,107,  0,
+109,105,110, 91, 50, 93,  0,109, 97,120, 91, 50, 93,  0,109,105,110,122,111,111,109,  0,109, 97,120,122,111,111,109,  0,115, 99,
+114,111,108,108,  0,115, 99,114,111,108,108, 95,117,105,  0,107,101,101,112,116,111,116,  0,107,101,101,112,122,111,111,109,  0,
+107,101,101,112,111,102,115,  0, 97,108,105,103,110,  0,119,105,110,120,  0,119,105,110,121,  0,111,108,100,119,105,110,120,  0,
+111,108,100,119,105,110,121,  0, 42,116, 97, 98, 95,111,102,102,115,101,116,  0,116, 97, 98, 95,110,117,109,  0,116, 97, 98, 95,
+ 99,117,114,  0,114,112,116, 95,109, 97,115,107,  0,118, 50,100,  0,109, 97,105,110, 98,  0,109, 97,105,110, 98,111,  0,109, 97,
+105,110, 98,117,115,101,114,  0,114,101, 95, 97,108,105,103,110,  0,112,114,101,118,105,101,119,  0,116,101,120,116,117,114,101,
+ 95, 99,111,110,116,101,120,116,  0,112, 97,116,104,102,108, 97,103,  0,100, 97,116, 97,105, 99,111,110,  0, 42,112,105,110,105,
+100,  0, 42,116,101,120,117,115,101,114,  0,116,114,101,101,  0, 42,116,114,101,101,115,116,111,114,101,  0,115,101, 97,114, 99,
+104, 95,115,116,114,105,110,103, 91, 51, 50, 93,  0,115,101, 97,114, 99,104, 95,116,115,101,  0,111,117,116,108,105,110,101,118,
+105,115,  0,115,116,111,114,101,102,108, 97,103,  0,115,101, 97,114, 99,104, 95,102,108, 97,103,115,  0, 42, 97,100,115,  0,103,
+104,111,115,116, 67,117,114,118,101,115,  0, 97,117,116,111,115,110, 97,112,  0, 99,117,114,115,111,114, 86, 97,108,  0, 42, 97,
+114,114, 97,121,  0, 99, 97, 99,104,101,115,  0, 99, 97, 99,104,101, 95,100,105,115,112,108, 97,121,  0,114,101,110,100,101,114,
+ 95,115,105,122,101,  0, 99,104, 97,110,115,104,111,119,110,  0,122,101, 98,114, 97,  0,122,111,111,109,  0,116,105,116,108,101,
+ 91, 51, 50, 93,  0,100,105,114, 91, 49, 48, 53, 54, 93,  0,102,105,108,101, 91, 50, 53, 54, 93,  0,114,101,110, 97,109,101,102,
+105,108,101, 91, 50, 53, 54, 93,  0,114,101,110, 97,109,101,101,100,105,116, 91, 50, 53, 54, 93,  0,102,105,108,116,101,114, 95,
+103,108,111, 98, 91, 54, 52, 93,  0, 97, 99,116,105,118,101, 95,102,105,108,101,  0,115,101,108, 95,102,105,114,115,116,  0,115,
+101,108, 95,108, 97,115,116,  0,115,111,114,116,  0,100,105,115,112,108, 97,121,  0,102, 95,102,112,  0,102,112, 95,115,116,114,
+ 91, 56, 93,  0,115, 99,114,111,108,108, 95,111,102,102,115,101,116,  0, 42,112, 97,114, 97,109,115,  0, 42,102,105,108,101,115,
+  0, 42,102,111,108,100,101,114,115, 95,112,114,101,118,  0, 42,102,111,108,100,101,114,115, 95,110,101,120,116,  0, 42,111,112,
+  0, 42,115,109,111,111,116,104,115, 99,114,111,108,108, 95,116,105,109,101,114,  0, 42,108, 97,121,111,117,116,  0,114,101, 99,
+101,110,116,110,114,  0, 98,111,111,107,109, 97,114,107,110,114,  0,115,121,115,116,101,109,110,114,  0, 42, 99,117,109, 97,112,
+  0,115, 99,111,112,101,115,  0,115, 97,109,112,108,101, 95,108,105,110,101, 95,104,105,115,116,  0, 99,117,114,115,111,114, 91,
+ 50, 93,  0, 99,101,110,116,120,  0, 99,101,110,116,121,  0, 99,117,114,116,105,108,101,  0,108,111, 99,107,  0,112,105,110,  0,
+100,116, 95,117,118,  0,115,116,105, 99,107,121,  0,100,116, 95,117,118,115,116,114,101,116, 99,104,  0, 42,116,101,120,116,  0,
+116,111,112,  0,118,105,101,119,108,105,110,101,115,  0,109,101,110,117,110,114,  0,108,104,101,105,103,104,116,  0, 99,119,105,
+100,116,104,  0,108,105,110,101,110,114,115, 95,116,111,116,  0,108,101,102,116,  0,115,104,111,119,108,105,110,101,110,114,115,
+  0,116, 97, 98,110,117,109, 98,101,114,  0,115,104,111,119,115,121,110,116, 97,120,  0,108,105,110,101, 95,104,108,105,103,104,
+116,  0,111,118,101,114,119,114,105,116,101,  0,108,105,118,101, 95,101,100,105,116,  0,112,105,120, 95,112,101,114, 95,108,105,
+110,101,  0,116,120,116,115, 99,114,111,108,108,  0,116,120,116, 98, 97,114,  0,119,111,114,100,119,114, 97,112,  0,100,111,112,
+108,117,103,105,110,115,  0,102,105,110,100,115,116,114, 91, 50, 53, 54, 93,  0,114,101,112,108, 97, 99,101,115,116,114, 91, 50,
+ 53, 54, 93,  0,109, 97,114,103,105,110, 95, 99,111,108,117,109,110,  0, 42,100,114, 97,119, 99, 97, 99,104,101,  0, 42,112,121,
+ 95,100,114, 97,119,  0, 42,112,121, 95,101,118,101,110,116,  0, 42,112,121, 95, 98,117,116,116,111,110,  0, 42,112,121, 95, 98,
+114,111,119,115,101,114, 99, 97,108,108, 98, 97, 99,107,  0, 42,112,121, 95,103,108,111, 98, 97,108,100,105, 99,116,  0,108, 97,
+115,116,115,112, 97, 99,101,  0,115, 99,114,105,112,116,110, 97,109,101, 91, 49, 48, 50, 52, 93,  0,115, 99,114,105,112,116, 97,
+114,103, 91, 50, 53, 54, 93,  0, 42,115, 99,114,105,112,116,  0, 42, 98,117,116, 95,114,101,102,115,  0, 42,105,100,  0, 97,115,
+112,101, 99,116,  0,112, 97,100,102,  0,109,120,  0,109,121,  0, 42,101,100,105,116,116,114,101,101,  0,116,114,101,101,116,121,
+112,101,  0,116,101,120,102,114,111,109,  0,115,104, 97,100,101,114,102,114,111,109,  0,108,105,110,107,100,114, 97,103,  0,108,
+101,110, 95, 97,108,108,111, 99,  0, 99,117,114,115,111,114,  0,115, 99,114,111,108,108, 98, 97, 99,107,  0,104,105,115,116,111,
+114,121,  0,112,114,111,109,112,116, 91, 50, 53, 54, 93,  0,108, 97,110,103,117, 97,103,101, 91, 51, 50, 93,  0,115,101,108, 95,
+115,116, 97,114,116,  0,115,101,108, 95,101,110,100,  0,102,105,108,116,101,114, 91, 54, 52, 93,  0,120,108,111, 99,107,111,102,
+  0,121,108,111, 99,107,111,102,  0,117,115,101,114,  0,112, 97,116,104, 95,108,101,110,103,116,104,  0,108,111, 99, 91, 50, 93,
+  0,115,116, 97, 98,109, 97,116, 91, 52, 93, 91, 52, 93,  0,117,110,105,115,116, 97, 98,109, 97,116, 91, 52, 93, 91, 52, 93,  0,
+112,111,115,116,112,114,111, 99, 95,102,108, 97,103,  0, 42,100,114, 97,119, 95, 99,111,110,116,101,120,116,  0,100,111,112,101,
+ 95,115,111,114,116,  0,100,111,112,101, 95,102,108, 97,103,  0,102,105,108,101,110, 97,109,101, 91, 49, 48, 50, 52, 93,  0, 98,
+108,102, 95,105,100,  0,117,105,102,111,110,116, 95,105,100,  0,114, 95,116,111, 95,108,  0,112,111,105,110,116,115,  0,107,101,
+114,110,105,110,103,  0,105,116, 97,108,105, 99,  0, 98,111,108,100,  0,115,104, 97,100,111,119,  0,115,104, 97,100,120,  0,115,
+104, 97,100,121,  0,115,104, 97,100,111,119, 97,108,112,104, 97,  0,115,104, 97,100,111,119, 99,111,108,111,114,  0,112, 97,110,
+101,108,116,105,116,108,101,  0,103,114,111,117,112,108, 97, 98,101,108,  0,119,105,100,103,101,116,108, 97, 98,101,108,  0,119,
+105,100,103,101,116,  0,112, 97,110,101,108,122,111,111,109,  0,109,105,110,108, 97, 98,101,108, 99,104, 97,114,115,  0,109,105,
+110,119,105,100,103,101,116, 99,104, 97,114,115,  0, 99,111,108,117,109,110,115,112, 97, 99,101,  0,116,101,109,112,108, 97,116,
+101,115,112, 97, 99,101,  0, 98,111,120,115,112, 97, 99,101,  0, 98,117,116,116,111,110,115,112, 97, 99,101,120,  0, 98,117,116,
+116,111,110,115,112, 97, 99,101,121,  0,112, 97,110,101,108,115,112, 97, 99,101,  0,112, 97,110,101,108,111,117,116,101,114,  0,
+111,117,116,108,105,110,101, 91, 52, 93,  0,105,110,110,101,114, 91, 52, 93,  0,105,110,110,101,114, 95,115,101,108, 91, 52, 93,
+  0,105,116,101,109, 91, 52, 93,  0,116,101,120,116, 91, 52, 93,  0,116,101,120,116, 95,115,101,108, 91, 52, 93,  0,115,104, 97,
+100,101,100,  0,115,104, 97,100,101,116,111,112,  0,115,104, 97,100,101,100,111,119,110,  0, 97,108,112,104, 97, 95, 99,104,101,
+ 99,107,  0,105,110,110,101,114, 95, 97,110,105,109, 91, 52, 93,  0,105,110,110,101,114, 95, 97,110,105,109, 95,115,101,108, 91,
+ 52, 93,  0,105,110,110,101,114, 95,107,101,121, 91, 52, 93,  0,105,110,110,101,114, 95,107,101,121, 95,115,101,108, 91, 52, 93,
+  0,105,110,110,101,114, 95,100,114,105,118,101,110, 91, 52, 93,  0,105,110,110,101,114, 95,100,114,105,118,101,110, 95,115,101,
+108, 91, 52, 93,  0,104,101, 97,100,101,114, 91, 52, 93,  0,115,104,111,119, 95,104,101, 97,100,101,114,  0,119, 99,111,108, 95,
+114,101,103,117,108, 97,114,  0,119, 99,111,108, 95,116,111,111,108,  0,119, 99,111,108, 95,116,101,120,116,  0,119, 99,111,108,
+ 95,114, 97,100,105,111,  0,119, 99,111,108, 95,111,112,116,105,111,110,  0,119, 99,111,108, 95,116,111,103,103,108,101,  0,119,
+ 99,111,108, 95,110,117,109,  0,119, 99,111,108, 95,110,117,109,115,108,105,100,101,114,  0,119, 99,111,108, 95,109,101,110,117,
+  0,119, 99,111,108, 95,112,117,108,108,100,111,119,110,  0,119, 99,111,108, 95,109,101,110,117, 95, 98, 97, 99,107,  0,119, 99,
+111,108, 95,109,101,110,117, 95,105,116,101,109,  0,119, 99,111,108, 95,116,111,111,108,116,105,112,  0,119, 99,111,108, 95, 98,
+111,120,  0,119, 99,111,108, 95,115, 99,114,111,108,108,  0,119, 99,111,108, 95,112,114,111,103,114,101,115,115,  0,119, 99,111,
+108, 95,108,105,115,116, 95,105,116,101,109,  0,119, 99,111,108, 95,115,116, 97,116,101,  0,112, 97,110,101,108,  0,105, 99,111,
+110,102,105,108,101, 91, 50, 53, 54, 93,  0,105, 99,111,110, 95, 97,108,112,104, 97,  0, 98, 97, 99,107, 91, 52, 93,  0,116,105,
+116,108,101, 91, 52, 93,  0,116,101,120,116, 95,104,105, 91, 52, 93,  0,104,101, 97,100,101,114, 95,116,105,116,108,101, 91, 52,
+ 93,  0,104,101, 97,100,101,114, 95,116,101,120,116, 91, 52, 93,  0,104,101, 97,100,101,114, 95,116,101,120,116, 95,104,105, 91,
+ 52, 93,  0, 98,117,116,116,111,110, 91, 52, 93,  0, 98,117,116,116,111,110, 95,116,105,116,108,101, 91, 52, 93,  0, 98,117,116,
+116,111,110, 95,116,101,120,116, 91, 52, 93,  0, 98,117,116,116,111,110, 95,116,101,120,116, 95,104,105, 91, 52, 93,  0,108,105,
+115,116, 91, 52, 93,  0,108,105,115,116, 95,116,105,116,108,101, 91, 52, 93,  0,108,105,115,116, 95,116,101,120,116, 91, 52, 93,
+  0,108,105,115,116, 95,116,101,120,116, 95,104,105, 91, 52, 93,  0,112, 97,110,101,108, 91, 52, 93,  0,112, 97,110,101,108, 95,
+116,105,116,108,101, 91, 52, 93,  0,112, 97,110,101,108, 95,116,101,120,116, 91, 52, 93,  0,112, 97,110,101,108, 95,116,101,120,
+116, 95,104,105, 91, 52, 93,  0,115,104, 97,100,101, 49, 91, 52, 93,  0,115,104, 97,100,101, 50, 91, 52, 93,  0,104,105,108,105,
+116,101, 91, 52, 93,  0,103,114,105,100, 91, 52, 93,  0,119,105,114,101, 91, 52, 93,  0,115,101,108,101, 99,116, 91, 52, 93,  0,
+108, 97,109,112, 91, 52, 93,  0,115,112,101, 97,107,101,114, 91, 52, 93,  0,101,109,112,116,121, 91, 52, 93,  0, 99, 97,109,101,
+114, 97, 91, 52, 93,  0,112, 97,100, 91, 56, 93,  0, 97, 99,116,105,118,101, 91, 52, 93,  0,103,114,111,117,112, 91, 52, 93,  0,
+103,114,111,117,112, 95, 97, 99,116,105,118,101, 91, 52, 93,  0,116,114, 97,110,115,102,111,114,109, 91, 52, 93,  0,118,101,114,
+116,101,120, 91, 52, 93,  0,118,101,114,116,101,120, 95,115,101,108,101, 99,116, 91, 52, 93,  0,101,100,103,101, 91, 52, 93,  0,
+101,100,103,101, 95,115,101,108,101, 99,116, 91, 52, 93,  0,101,100,103,101, 95,115,101, 97,109, 91, 52, 93,  0,101,100,103,101,
+ 95,115,104, 97,114,112, 91, 52, 93,  0,101,100,103,101, 95,102, 97, 99,101,115,101,108, 91, 52, 93,  0,101,100,103,101, 95, 99,
+114,101, 97,115,101, 91, 52, 93,  0,102, 97, 99,101, 91, 52, 93,  0,102, 97, 99,101, 95,115,101,108,101, 99,116, 91, 52, 93,  0,
+102, 97, 99,101, 95,100,111,116, 91, 52, 93,  0,101,120,116,114, 97, 95,101,100,103,101, 95,108,101,110, 91, 52, 93,  0,101,120,
+116,114, 97, 95,102, 97, 99,101, 95, 97,110,103,108,101, 91, 52, 93,  0,101,120,116,114, 97, 95,102, 97, 99,101, 95, 97,114,101,
+ 97, 91, 52, 93,  0,112, 97,100, 51, 91, 52, 93,  0,110,111,114,109, 97,108, 91, 52, 93,  0,118,101,114,116,101,120, 95,110,111,
+114,109, 97,108, 91, 52, 93,  0, 98,111,110,101, 95,115,111,108,105,100, 91, 52, 93,  0, 98,111,110,101, 95,112,111,115,101, 91,
+ 52, 93,  0,115,116,114,105,112, 91, 52, 93,  0,115,116,114,105,112, 95,115,101,108,101, 99,116, 91, 52, 93,  0, 99,102,114, 97,
+109,101, 91, 52, 93,  0,110,117,114, 98, 95,117,108,105,110,101, 91, 52, 93,  0,110,117,114, 98, 95,118,108,105,110,101, 91, 52,
+ 93,  0, 97, 99,116, 95,115,112,108,105,110,101, 91, 52, 93,  0,110,117,114, 98, 95,115,101,108, 95,117,108,105,110,101, 91, 52,
+ 93,  0,110,117,114, 98, 95,115,101,108, 95,118,108,105,110,101, 91, 52, 93,  0,108, 97,115,116,115,101,108, 95,112,111,105,110,
+116, 91, 52, 93,  0,104, 97,110,100,108,101, 95,102,114,101,101, 91, 52, 93,  0,104, 97,110,100,108,101, 95, 97,117,116,111, 91,
+ 52, 93,  0,104, 97,110,100,108,101, 95,118,101, 99,116, 91, 52, 93,  0,104, 97,110,100,108,101, 95, 97,108,105,103,110, 91, 52,
+ 93,  0,104, 97,110,100,108,101, 95, 97,117,116,111, 95, 99,108, 97,109,112,101,100, 91, 52, 93,  0,104, 97,110,100,108,101, 95,
+115,101,108, 95,102,114,101,101, 91, 52, 93,  0,104, 97,110,100,108,101, 95,115,101,108, 95, 97,117,116,111, 91, 52, 93,  0,104,
+ 97,110,100,108,101, 95,115,101,108, 95,118,101, 99,116, 91, 52, 93,  0,104, 97,110,100,108,101, 95,115,101,108, 95, 97,108,105,
+103,110, 91, 52, 93,  0,104, 97,110,100,108,101, 95,115,101,108, 95, 97,117,116,111, 95, 99,108, 97,109,112,101,100, 91, 52, 93,
+  0,100,115, 95, 99,104, 97,110,110,101,108, 91, 52, 93,  0,100,115, 95,115,117, 98, 99,104, 97,110,110,101,108, 91, 52, 93,  0,
+ 99,111,110,115,111,108,101, 95,111,117,116,112,117,116, 91, 52, 93,  0, 99,111,110,115,111,108,101, 95,105,110,112,117,116, 91,
+ 52, 93,  0, 99,111,110,115,111,108,101, 95,105,110,102,111, 91, 52, 93,  0, 99,111,110,115,111,108,101, 95,101,114,114,111,114,
+ 91, 52, 93,  0, 99,111,110,115,111,108,101, 95, 99,117,114,115,111,114, 91, 52, 93,  0,118,101,114,116,101,120, 95,115,105,122,
+101,  0,111,117,116,108,105,110,101, 95,119,105,100,116,104,  0,102, 97, 99,101,100,111,116, 95,115,105,122,101,  0,110,111,111,
+100,108,101, 95, 99,117,114,118,105,110,103,  0,115,121,110,116, 97,120,108, 91, 52, 93,  0,115,121,110,116, 97,120,110, 91, 52,
+ 93,  0,115,121,110,116, 97,120, 98, 91, 52, 93,  0,115,121,110,116, 97,120,118, 91, 52, 93,  0,115,121,110,116, 97,120, 99, 91,
+ 52, 93,  0,109,111,118,105,101, 91, 52, 93,  0,109,111,118,105,101, 99,108,105,112, 91, 52, 93,  0,105,109, 97,103,101, 91, 52,
+ 93,  0,115, 99,101,110,101, 91, 52, 93,  0, 97,117,100,105,111, 91, 52, 93,  0,101,102,102,101, 99,116, 91, 52, 93,  0,104,112,
+ 97,100, 48, 91, 52, 93,  0,116,114, 97,110,115,105,116,105,111,110, 91, 52, 93,  0,109,101,116, 97, 91, 52, 93,  0,101,100,105,
+116,109,101,115,104, 95, 97, 99,116,105,118,101, 91, 52, 93,  0,104, 97,110,100,108,101, 95,118,101,114,116,101,120, 91, 52, 93,
+  0,104, 97,110,100,108,101, 95,118,101,114,116,101,120, 95,115,101,108,101, 99,116, 91, 52, 93,  0,104, 97,110,100,108,101, 95,
+118,101,114,116,101,120, 95,115,105,122,101,  0,109, 97,114,107,101,114, 95,111,117,116,108,105,110,101, 91, 52, 93,  0,109, 97,
+114,107,101,114, 91, 52, 93,  0, 97, 99,116, 95,109, 97,114,107,101,114, 91, 52, 93,  0,115,101,108, 95,109, 97,114,107,101,114,
+ 91, 52, 93,  0,100,105,115, 95,109, 97,114,107,101,114, 91, 52, 93,  0,108,111, 99,107, 95,109, 97,114,107,101,114, 91, 52, 93,
+  0, 98,117,110,100,108,101, 95,115,111,108,105,100, 91, 52, 93,  0,112, 97,116,104, 95, 98,101,102,111,114,101, 91, 52, 93,  0,
+112, 97,116,104, 95, 97,102,116,101,114, 91, 52, 93,  0, 99, 97,109,101,114, 97, 95,112, 97,116,104, 91, 52, 93,  0,104,112, 97,
+100, 91, 55, 93,  0,112,114,101,118,105,101,119, 95, 98, 97, 99,107, 91, 52, 93,  0,112,114,101,118,105,101,119, 95,115,116,105,
+116, 99,104, 95,102, 97, 99,101, 91, 52, 93,  0,112,114,101,118,105,101,119, 95,115,116,105,116, 99,104, 95,101,100,103,101, 91,
+ 52, 93,  0,112,114,101,118,105,101,119, 95,115,116,105,116, 99,104, 95,118,101,114,116, 91, 52, 93,  0,112,114,101,118,105,101,
+119, 95,115,116,105,116, 99,104, 95,115,116,105,116, 99,104, 97, 98,108,101, 91, 52, 93,  0,112,114,101,118,105,101,119, 95,115,
+116,105,116, 99,104, 95,117,110,115,116,105,116, 99,104, 97, 98,108,101, 91, 52, 93,  0,112,114,101,118,105,101,119, 95,115,116,
+105,116, 99,104, 95, 97, 99,116,105,118,101, 91, 52, 93,  0,109, 97,116, 99,104, 91, 52, 93,  0,115,101,108,101, 99,116,101,100,
+ 95,104,105,103,104,108,105,103,104,116, 91, 52, 93,  0,115,107,105,110, 95,114,111,111,116, 91, 52, 93,  0,115,111,108,105,100,
+ 91, 52, 93,  0,116,117,105,  0,116, 98,117,116,115,  0,116,118, 51,100,  0,116,102,105,108,101,  0,116,105,112,111,  0,116,105,
+110,102,111,  0,116, 97, 99,116,  0,116,110,108, 97,  0,116,115,101,113,  0,116,105,109, 97,  0,116,101,120,116,  0,116,111,111,
+112,115,  0,116,116,105,109,101,  0,116,110,111,100,101,  0,116,108,111,103,105, 99,  0,116,117,115,101,114,112,114,101,102,  0,
+116, 99,111,110,115,111,108,101,  0,116, 99,108,105,112,  0,116, 97,114,109, 91, 50, 48, 93,  0, 97, 99,116,105,118,101, 95,116,
+104,101,109,101, 95, 97,114,101, 97,  0,109,111,100,117,108,101, 91, 54, 52, 93,  0,115,112,101, 99, 91, 52, 93,  0,100,117,112,
+102,108, 97,103,  0,115, 97,118,101,116,105,109,101,  0,116,101,109,112,100,105,114, 91, 55, 54, 56, 93,  0,102,111,110,116,100,
+105,114, 91, 55, 54, 56, 93,  0,114,101,110,100,101,114,100,105,114, 91, 49, 48, 50, 52, 93,  0,116,101,120,116,117,100,105,114,
+ 91, 55, 54, 56, 93,  0,112,121,116,104,111,110,100,105,114, 91, 55, 54, 56, 93,  0,115,111,117,110,100,100,105,114, 91, 55, 54,
+ 56, 93,  0,105,109, 97,103,101, 95,101,100,105,116,111,114, 91, 49, 48, 50, 52, 93,  0, 97,110,105,109, 95,112,108, 97,121,101,
+114, 91, 49, 48, 50, 52, 93,  0, 97,110,105,109, 95,112,108, 97,121,101,114, 95,112,114,101,115,101,116,  0,118, 50,100, 95,109,
+105,110, 95,103,114,105,100,115,105,122,101,  0,116,105,109,101, 99,111,100,101, 95,115,116,121,108,101,  0,118,101,114,115,105,
+111,110,115,  0,100, 98,108, 95, 99,108,105, 99,107, 95,116,105,109,101,  0,103, 97,109,101,102,108, 97,103,115,  0,119,104,101,
+101,108,108,105,110,101,115, 99,114,111,108,108,  0,117,105,102,108, 97,103,  0,108, 97,110,103,117, 97,103,101,  0,117,115,101,
+114,112,114,101,102,  0,118,105,101,119,122,111,111,109,  0,109,105,120, 98,117,102,115,105,122,101,  0, 97,117,100,105,111,100,
+101,118,105, 99,101,  0, 97,117,100,105,111,114, 97,116,101,  0, 97,117,100,105,111,102,111,114,109, 97,116,  0, 97,117,100,105,
+111, 99,104, 97,110,110,101,108,115,  0,100,112,105,  0,101,110, 99,111,100,105,110,103,  0,116,114, 97,110,115,111,112,116,115,
+  0,109,101,110,117,116,104,114,101,115,104,111,108,100, 49,  0,109,101,110,117,116,104,114,101,115,104,111,108,100, 50,  0,116,
+104,101,109,101,115,  0,117,105,102,111,110,116,115,  0,117,105,115,116,121,108,101,115,  0,107,101,121,109, 97,112,115,  0,117,
+115,101,114, 95,107,101,121,109, 97,112,115,  0, 97,100,100,111,110,115,  0,107,101,121, 99,111,110,102,105,103,115,116,114, 91,
+ 54, 52, 93,  0,117,110,100,111,115,116,101,112,115,  0,117,110,100,111,109,101,109,111,114,121,  0,103,112, 95,109, 97,110,104,
+ 97,116,116,101,110,100,105,115,116,  0,103,112, 95,101,117, 99,108,105,100,101, 97,110,100,105,115,116,  0,103,112, 95,101,114,
+ 97,115,101,114,  0,103,112, 95,115,101,116,116,105,110,103,115,  0,116, 98, 95,108,101,102,116,109,111,117,115,101,  0,116, 98,
+ 95,114,105,103,104,116,109,111,117,115,101,  0,108,105,103,104,116, 91, 51, 93,  0,116,119, 95,104,111,116,115,112,111,116,  0,
+116,119, 95,102,108, 97,103,  0,116,119, 95,104, 97,110,100,108,101,115,105,122,101,  0,116,119, 95,115,105,122,101,  0,116,101,
+120,116,105,109,101,111,117,116,  0,116,101,120, 99,111,108,108,101, 99,116,114, 97,116,101,  0,119,109,100,114, 97,119,109,101,
+116,104,111,100,  0,100,114, 97,103,116,104,114,101,115,104,111,108,100,  0,109,101,109, 99, 97, 99,104,101,108,105,109,105,116,
+  0,112,114,101,102,101,116, 99,104,102,114, 97,109,101,115,  0,102,114, 97,109,101,115,101,114,118,101,114,112,111,114,116,  0,
+112, 97,100, 95,114,111,116, 95, 97,110,103,108,101,  0,111, 98, 99,101,110,116,101,114, 95,100,105, 97,  0,114,118,105,115,105,
+122,101,  0,114,118,105, 98,114,105,103,104,116,  0,114,101, 99,101,110,116, 95,102,105,108,101,115,  0,115,109,111,111,116,104,
+ 95,118,105,101,119,116,120,  0,103,108,114,101,115,108,105,109,105,116,  0, 99,117,114,115,115,105,122,101,  0, 99,111,108,111,
+114, 95,112,105, 99,107,101,114, 95,116,121,112,101,  0,105,112,111, 95,110,101,119,  0,107,101,121,104, 97,110,100,108,101,115,
+ 95,110,101,119,  0,115, 99,114, 99, 97,115,116,102,112,115,  0,115, 99,114, 99, 97,115,116,119, 97,105,116,  0,119,105,100,103,
+101,116, 95,117,110,105,116,  0, 97,110,105,115,111,116,114,111,112,105, 99, 95,102,105,108,116,101,114,  0,117,115,101, 95, 49,
+ 54, 98,105,116, 95,116,101,120,116,117,114,101,115,  0,112, 97,100, 56,  0,110,100,111,102, 95,115,101,110,115,105,116,105,118,
+105,116,121,  0,110,100,111,102, 95,102,108, 97,103,  0,103,108, 97,108,112,104, 97, 99,108,105,112,  0,116,101,120,116, 95,114,
+101,110,100,101,114,  0,112, 97,100, 57,  0, 99,111, 98, 97, 95,119,101,105,103,104,116,  0,115, 99,117,108,112,116, 95,112, 97,
+105,110,116, 95,111,118,101,114,108, 97,121, 95, 99,111,108, 91, 51, 93,  0,116,119,101, 97,107, 95,116,104,114,101,115,104,111,
+108,100,  0, 97,117,116,104,111,114, 91, 56, 48, 93,  0, 99,111,109,112,117,116,101, 95,100,101,118,105, 99,101, 95,116,121,112,
+101,  0, 99,111,109,112,117,116,101, 95,100,101,118,105, 99,101, 95,105,100,  0,102, 99,117, 95,105,110, 97, 99,116,105,118,101,
+ 95, 97,108,112,104, 97,  0,118,101,114,116, 98, 97,115,101,  0,101,100,103,101, 98, 97,115,101,  0, 97,114,101, 97, 98, 97,115,
+101,  0, 42,110,101,119,115, 99,101,110,101,  0,114,101,100,114, 97,119,115, 95,102,108, 97,103,  0,102,117,108,108,  0,116,101,
+109,112,  0,119,105,110,105,100,  0,100,111, 95,100,114, 97,119,  0,100,111, 95,114,101,102,114,101,115,104,  0,100,111, 95,100,
+114, 97,119, 95,103,101,115,116,117,114,101,  0,100,111, 95,100,114, 97,119, 95,112, 97,105,110,116, 99,117,114,115,111,114,  0,
+100,111, 95,100,114, 97,119, 95,100,114, 97,103,  0,115,119, 97,112,  0,109, 97,105,110,119,105,110,  0,115,117, 98,119,105,110,
+ 97, 99,116,105,118,101,  0, 42, 97,110,105,109,116,105,109,101,114,  0, 42, 99,111,110,116,101,120,116,  0,104, 97,110,100,108,
+101,114, 91, 56, 93,  0, 42,110,101,119,118,  0,118,101, 99,  0, 42,118, 49,  0, 42,118, 50,  0, 42,116,121,112,101,  0,112, 97,
+110,101,108,110, 97,109,101, 91, 54, 52, 93,  0,116, 97, 98,110, 97,109,101, 91, 54, 52, 93,  0,100,114, 97,119,110, 97,109,101,
+ 91, 54, 52, 93,  0,111,102,115,120,  0,111,102,115,121,  0,115,105,122,101,120,  0,115,105,122,101,121,  0,108, 97, 98,101,108,
+111,102,115,  0,114,117,110,116,105,109,101, 95,102,108, 97,103,  0, 99,111,110,116,114,111,108,  0,115,110, 97,112,  0,115,111,
+114,116,111,114,100,101,114,  0, 42,112, 97,110,101,108,116, 97, 98,  0, 42, 97, 99,116,105,118,101,100, 97,116, 97,  0,108,105,
+115,116, 95,115, 99,114,111,108,108,  0,108,105,115,116, 95,115,105,122,101,  0,108,105,115,116, 95,108, 97,115,116, 95,108,101,
+110,  0,108,105,115,116, 95,103,114,105,112, 95,115,105,122,101,  0,108,105,115,116, 95,115,101, 97,114, 99,104, 91, 54, 52, 93,
+  0, 42,118, 51,  0, 42,118, 52,  0, 42,102,117,108,108,  0, 98,117,116,115,112, 97, 99,101,116,121,112,101,  0,104,101, 97,100,
+101,114,116,121,112,101,  0,115,112, 97, 99,101,100, 97,116, 97,  0,104, 97,110,100,108,101,114,115,  0, 97, 99,116,105,111,110,
+122,111,110,101,115,  0,119,105,110,114, 99,116,  0,100,114, 97,119,114, 99,116,  0,115,119,105,110,105,100,  0,114,101,103,105,
+111,110,116,121,112,101,  0, 97,108,105,103,110,109,101,110,116,  0,100,111, 95,100,114, 97,119, 95,111,118,101,114,108, 97,121,
+  0,117,105, 98,108,111, 99,107,115,  0,112, 97,110,101,108,115,  0, 42,104,101, 97,100,101,114,115,116,114,  0, 42,114,101,103,
+105,111,110,100, 97,116, 97,  0,115,117, 98,118,115,116,114, 91, 52, 93,  0,115,117, 98,118,101,114,115,105,111,110,  0,112, 97,
+100,115,  0,109,105,110,118,101,114,115,105,111,110,  0,109,105,110,115,117, 98,118,101,114,115,105,111,110,  0,119,105,110,112,
+111,115,  0, 42, 99,117,114,115, 99,114,101,101,110,  0, 42, 99,117,114,115, 99,101,110,101,  0,102,105,108,101,102,108, 97,103,
+115,  0,103,108,111, 98, 97,108,102,  0,114,101,118,105,115,105,111,110,  0,110, 97,109,101, 91, 50, 53, 54, 93,  0,111,114,105,
+103, 95,119,105,100,116,104,  0,111,114,105,103, 95,104,101,105,103,104,116,  0, 98,111,116,116,111,109,  0,114,105,103,104,116,
+  0,120,111,102,115,  0,121,111,102,115,  0,108,105,102,116, 91, 51, 93,  0,103, 97,109,109, 97, 91, 51, 93,  0,103, 97,105,110,
+ 91, 51, 93,  0,100,105,114, 91, 55, 54, 56, 93,  0,116, 99,  0, 98,117,105,108,100, 95,115,105,122,101, 95,102,108, 97,103,115,
+  0, 98,117,105,108,100, 95,116, 99, 95,102,108, 97,103,115,  0,100,111,110,101,  0,115,116, 97,114,116,115,116,105,108,108,  0,
+101,110,100,115,116,105,108,108,  0, 42,115,116,114,105,112,100, 97,116, 97,  0, 42, 99,114,111,112,  0, 42,116,114, 97,110,115,
+102,111,114,109,  0, 42, 99,111,108,111,114, 95, 98, 97,108, 97,110, 99,101,  0, 42,116,109,112,  0,115,116, 97,114,116,111,102,
+115,  0,101,110,100,111,102,115,  0,109, 97, 99,104,105,110,101,  0,115,116, 97,114,116,100,105,115,112,  0,101,110,100,100,105,
+115,112,  0,115, 97,116,  0,109,117,108,  0,104, 97,110,100,115,105,122,101,  0, 97,110,105,109, 95,112,114,101,115,101,101,107,
+  0,115,116,114,101, 97,109,105,110,100,101,120,  0,109,117,108,116,105, 99, 97,109, 95,115,111,117,114, 99,101,  0, 99,108,105,
+112, 95,102,108, 97,103,  0, 42,115,116,114,105,112,  0, 42,115, 99,101,110,101, 95, 99, 97,109,101,114, 97,  0,101,102,102,101,
+ 99,116, 95,102, 97,100,101,114,  0,115,112,101,101,100, 95,102, 97,100,101,114,  0, 42,115,101,113, 49,  0, 42,115,101,113, 50,
+  0, 42,115,101,113, 51,  0,115,101,113, 98, 97,115,101,  0, 42,115,111,117,110,100,  0, 42,115, 99,101,110,101, 95,115,111,117,
+110,100,  0,112,105,116, 99,104,  0,112, 97,110,  0,115,116,114,111, 98,101,  0, 42,101,102,102,101, 99,116,100, 97,116, 97,  0,
+ 97,110,105,109, 95,115,116, 97,114,116,111,102,115,  0, 97,110,105,109, 95,101,110,100,111,102,115,  0, 98,108,101,110,100, 95,
+109,111,100,101,  0, 98,108,101,110,100, 95,111,112, 97, 99,105,116,121,  0, 42,111,108,100, 98, 97,115,101,112,  0, 42,112, 97,
+114,115,101,113,  0, 42,115,101,113, 98, 97,115,101,112,  0,109,101,116, 97,115,116, 97, 99,107,  0, 42, 97, 99,116, 95,115,101,
+113,  0, 97, 99,116, 95,105,109, 97,103,101,100,105,114, 91, 49, 48, 50, 52, 93,  0, 97, 99,116, 95,115,111,117,110,100,100,105,
+114, 91, 49, 48, 50, 52, 93,  0,111,118,101,114, 95,111,102,115,  0,111,118,101,114, 95, 99,102,114, 97,  0,111,118,101,114, 95,
+102,108, 97,103,  0,111,118,101,114, 95, 98,111,114,100,101,114,  0,101,100,103,101, 87,105,100,116,104,  0,102,111,114,119, 97,
+114,100,  0,119,105,112,101,116,121,112,101,  0,102, 77,105,110,105,  0,102, 67,108, 97,109,112,  0,102, 66,111,111,115,116,  0,
+100, 68,105,115,116,  0,100, 81,117, 97,108,105,116,121,  0, 98, 78,111, 67,111,109,112,  0, 83, 99, 97,108,101,120, 73,110,105,
+  0, 83, 99, 97,108,101,121, 73,110,105,  0,120, 73,110,105,  0,121, 73,110,105,  0,114,111,116, 73,110,105,  0,105,110,116,101,
+114,112,111,108, 97,116,105,111,110,  0,117,110,105,102,111,114,109, 95,115, 99, 97,108,101,  0, 42,102,114, 97,109,101, 77, 97,
+112,  0,103,108,111, 98, 97,108, 83,112,101,101,100,  0,108, 97,115,116, 86, 97,108,105,100, 70,114, 97,109,101,  0, 98,117,116,
+116,121,112,101,  0,117,115,101,114,106,105,116,  0,115,116, 97,  0,116,111,116,112, 97,114,116,  0,110,111,114,109,102, 97, 99,
+  0,111, 98,102, 97, 99,  0,114, 97,110,100,102, 97, 99,  0,116,101,120,102, 97, 99,  0,114, 97,110,100,108,105,102,101,  0,102,
+111,114, 99,101, 91, 51, 93,  0,118,101, 99,116,115,105,122,101,  0,109, 97,120,108,101,110,  0,100,101,102,118,101, 99, 91, 51,
+ 93,  0,109,117,108,116, 91, 52, 93,  0,108,105,102,101, 91, 52, 93,  0, 99,104,105,108,100, 91, 52, 93,  0,109, 97,116, 91, 52,
+ 93,  0,116,101,120,109, 97,112,  0, 99,117,114,109,117,108,116,  0,115,116, 97,116,105, 99,115,116,101,112,  0,111,109, 97,116,
+  0,116,105,109,101,116,101,120,  0,115,112,101,101,100,116,101,120,  0,102,108, 97,103, 50,110,101,103,  0,118,101,114,116,103,
+114,111,117,112, 95,118,  0,118,103,114,111,117,112,110, 97,109,101, 91, 54, 52, 93,  0,118,103,114,111,117,112,110, 97,109,101,
+ 95,118, 91, 54, 52, 93,  0, 42,107,101,121,115,  0,109,105,110,102, 97, 99,  0,110,114,  0,117,115,101,100,  0,117,115,101,100,
+101,108,101,109,  0, 42,112,111,105,110,  0,114,101,115,101,116,100,105,115,116,  0,108, 97,115,116,118, 97,108,  0, 42,109, 97,
+  0,107,101,121,  0,113,117, 97,108,  0,113,117, 97,108, 50,  0,116, 97,114,103,101,116, 78, 97,109,101, 91, 54, 52, 93,  0,116,
+111,103,103,108,101, 78, 97,109,101, 91, 54, 52, 93,  0,118, 97,108,117,101, 91, 54, 52, 93,  0,109, 97,120,118, 97,108,117,101,
+ 91, 54, 52, 93,  0,100,101,108, 97,121,  0,100,117,114, 97,116,105,111,110,  0,109, 97,116,101,114,105, 97,108, 78, 97,109,101,
+ 91, 54, 52, 93,  0,100, 97,109,112,116,105,109,101,114,  0,112,114,111,112,110, 97,109,101, 91, 54, 52, 93,  0,109, 97,116,110,
+ 97,109,101, 91, 54, 52, 93,  0, 97,120,105,115,102,108, 97,103,  0,112,111,115,101, 99,104, 97,110,110,101,108, 91, 54, 52, 93,
+  0, 99,111,110,115,116,114, 97,105,110,116, 91, 54, 52, 93,  0, 42,102,114,111,109, 79, 98,106,101, 99,116,  0,115,117, 98,106,
+101, 99,116, 91, 54, 52, 93,  0, 98,111,100,121, 91, 54, 52, 93,  0,111,116,121,112,101,  0,112,117,108,115,101,  0,102,114,101,
+113,  0,116,111,116,108,105,110,107,115,  0, 42, 42,108,105,110,107,115,  0,116, 97,112,  0,106,111,121,105,110,100,101,120,  0,
+ 97,120,105,115, 95,115,105,110,103,108,101,  0, 97,120,105,115,102,  0, 98,117,116,116,111,110,  0,104, 97,116,  0,104, 97,116,
+102,  0,112,114,101, 99,105,115,105,111,110,  0,115,116,114, 91, 49, 50, 56, 93,  0, 42,109,121,110,101,119,  0,105,110,112,117,
+116,115,  0,116,111,116,115,108,105,110,107,115,  0, 42, 42,115,108,105,110,107,115,  0,118, 97,108,111,  0,115,116, 97,116,101,
+ 95,109, 97,115,107,  0, 42, 97, 99,116,  0,102,114, 97,109,101, 80,114,111,112, 91, 54, 52, 93,  0, 98,108,101,110,100,105,110,
+  0,112,114,105,111,114,105,116,121,  0,101,110,100, 95,114,101,115,101,116,  0,115,116,114,105,100,101, 97,120,105,115,  0,115,
+116,114,105,100,101,108,101,110,103,116,104,  0,108, 97,121,101,114, 95,119,101,105,103,104,116,  0,109,105,110, 95,103, 97,105,
+110,  0,109, 97,120, 95,103, 97,105,110,  0,114,101,102,101,114,101,110, 99,101, 95,100,105,115,116, 97,110, 99,101,  0,109, 97,
+120, 95,100,105,115,116, 97,110, 99,101,  0,114,111,108,108,111,102,102, 95,102, 97, 99,116,111,114,  0, 99,111,110,101, 95,105,
+110,110,101,114, 95, 97,110,103,108,101,  0, 99,111,110,101, 95,111,117,116,101,114, 95, 97,110,103,108,101,  0, 99,111,110,101,
+ 95,111,117,116,101,114, 95,103, 97,105,110,  0,115,110,100,110,114,  0,115,111,117,110,100, 51, 68,  0,112, 97,100, 54, 91, 49,
+ 93,  0, 42,109,101,  0,108,105,110, 86,101,108,111, 99,105,116,121, 91, 51, 93,  0, 97,110,103, 86,101,108,111, 99,105,116,121,
+ 91, 51, 93,  0,108,111, 99, 97,108,102,108, 97,103,  0,100,121,110, 95,111,112,101,114, 97,116,105,111,110,  0,102,111,114, 99,
+101,108,111, 99, 91, 51, 93,  0,102,111,114, 99,101,114,111,116, 91, 51, 93,  0,112, 97,100, 49, 91, 51, 93,  0,108,105,110,101,
+ 97,114,118,101,108,111, 99,105,116,121, 91, 51, 93,  0, 97,110,103,117,108, 97,114,118,101,108,111, 99,105,116,121, 91, 51, 93,
+  0, 42,114,101,102,101,114,101,110, 99,101,  0,109,105,110,  0,109, 97,120,  0,114,111,116,100, 97,109,112,  0,109,105,110,108,
+111, 99, 91, 51, 93,  0,109, 97,120,108,111, 99, 91, 51, 93,  0,109,105,110,114,111,116, 91, 51, 93,  0,109, 97,120,114,111,116,
+ 91, 51, 93,  0,109, 97,116,112,114,111,112, 91, 54, 52, 93,  0, 98,117,116,115,116, 97,  0, 98,117,116,101,110,100,  0,100,105,
+115,116,114,105, 98,117,116,105,111,110,  0,105,110,116, 95, 97,114,103, 95, 49,  0,105,110,116, 95, 97,114,103, 95, 50,  0,102,
+108,111, 97,116, 95, 97,114,103, 95, 49,  0,102,108,111, 97,116, 95, 97,114,103, 95, 50,  0,116,111, 80,114,111,112, 78, 97,109,
+101, 91, 54, 52, 93,  0, 42,116,111, 79, 98,106,101, 99,116,  0, 98,111,100,121, 84,121,112,101,  0,102,105,108,101,110, 97,109,
+101, 91, 54, 52, 93,  0,108,111, 97,100, 97,110,105,110, 97,109,101, 91, 54, 52, 93,  0,105,110,116, 95, 97,114,103,  0,102,108,
+111, 97,116, 95, 97,114,103,  0,105,110,102,108,117,101,110, 99,101,  0, 42,115,117, 98,116, 97,114,103,101,116,  0,102, 97, 99,
+105,110,103, 97,120,105,115,  0,118,101,108,111, 99,105,116,121,  0, 97, 99, 99,101,108,101,114, 97,116,105,111,110,  0,116,117,
+114,110,115,112,101,101,100,  0,117,112,100, 97,116,101, 84,105,109,101,  0, 42,110, 97,118,109,101,115,104,  0,103,111,  0, 42,
+104, 97,110,100,108,101,  0, 42,110,101,119,112, 97, 99,107,101,100,102,105,108,101,  0, 97,116,116,101,110,117, 97,116,105,111,
+110,  0,100,105,115,116, 97,110, 99,101,  0, 42, 99, 97, 99,104,101,  0, 42,119, 97,118,101,102,111,114,109,  0, 42,112,108, 97,
+121, 98, 97, 99,107, 95,104, 97,110,100,108,101,  0, 42,108, 97,109,112,114,101,110,  0,103,111, 98,106,101, 99,116,  0,100,117,
+112,108,105, 95,111,102,115, 91, 51, 93,  0, 42,112,114,111,112,  0, 99,104,105,108,100, 98, 97,115,101,  0,114,111,108,108,  0,
+104,101, 97,100, 91, 51, 93,  0,116, 97,105,108, 91, 51, 93,  0, 98,111,110,101, 95,109, 97,116, 91, 51, 93, 91, 51, 93,  0, 97,
+114,109, 95,104,101, 97,100, 91, 51, 93,  0, 97,114,109, 95,116, 97,105,108, 91, 51, 93,  0, 97,114,109, 95,109, 97,116, 91, 52,
+ 93, 91, 52, 93,  0, 97,114,109, 95,114,111,108,108,  0,120,119,105,100,116,104,  0,122,119,105,100,116,104,  0,101, 97,115,101,
+ 49,  0,101, 97,115,101, 50,  0,114, 97,100, 95,104,101, 97,100,  0,114, 97,100, 95,116, 97,105,108,  0,112, 97,100, 91, 49, 93,
+  0, 98,111,110,101, 98, 97,115,101,  0, 99,104, 97,105,110, 98, 97,115,101,  0, 42,101,100, 98,111,  0, 42, 97, 99,116, 95, 98,
+111,110,101,  0, 42, 97, 99,116, 95,101,100, 98,111,110,101,  0, 42,115,107,101,116, 99,104,  0,103,101,118,101,114,116,100,101,
+102,111,114,109,101,114,  0,108, 97,121,101,114, 95,117,115,101,100,  0,108, 97,121,101,114, 95,112,114,111,116,101, 99,116,101,
+100,  0,103,104,111,115,116,101,112,  0,103,104,111,115,116,115,105,122,101,  0,103,104,111,115,116,116,121,112,101,  0,112, 97,
+116,104,115,105,122,101,  0,103,104,111,115,116,115,102,  0,103,104,111,115,116,101,102,  0,112, 97,116,104,115,102,  0,112, 97,
+116,104,101,102,  0,112, 97,116,104, 98, 99,  0,112, 97,116,104, 97, 99,  0, 42,112,111,105,110,116,115,  0,115,116, 97,114,116,
+ 95,102,114, 97,109,101,  0,101,110,100, 95,102,114, 97,109,101,  0,103,104,111,115,116, 95,115,102,  0,103,104,111,115,116, 95,
+101,102,  0,103,104,111,115,116, 95, 98, 99,  0,103,104,111,115,116, 95, 97, 99,  0,103,104,111,115,116, 95,116,121,112,101,  0,
+103,104,111,115,116, 95,115,116,101,112,  0,103,104,111,115,116, 95,102,108, 97,103,  0,112, 97,116,104, 95,116,121,112,101,  0,
+112, 97,116,104, 95,115,116,101,112,  0,112, 97,116,104, 95,118,105,101,119,102,108, 97,103,  0,112, 97,116,104, 95, 98, 97,107,
+101,102,108, 97,103,  0,112, 97,116,104, 95,115,102,  0,112, 97,116,104, 95,101,102,  0,112, 97,116,104, 95, 98, 99,  0,112, 97,
+116,104, 95, 97, 99,  0,105,107,102,108, 97,103,  0, 97,103,114,112, 95,105,110,100,101,120,  0, 99,111,110,115,116,102,108, 97,
+103,  0,115,101,108,101, 99,116,102,108, 97,103,  0,112, 97,100, 48, 91, 54, 93,  0, 42, 98,111,110,101,  0, 42, 99,104,105,108,
+100,  0,105,107,116,114,101,101,  0,115,105,107,116,114,101,101,  0, 42, 99,117,115,116,111,109,  0, 42, 99,117,115,116,111,109,
+ 95,116,120,  0,101,117,108, 91, 51, 93,  0, 99,104, 97,110, 95,109, 97,116, 91, 52, 93, 91, 52, 93,  0,112,111,115,101, 95,109,
+ 97,116, 91, 52, 93, 91, 52, 93,  0,112,111,115,101, 95,104,101, 97,100, 91, 51, 93,  0,112,111,115,101, 95,116, 97,105,108, 91,
+ 51, 93,  0,108,105,109,105,116,109,105,110, 91, 51, 93,  0,108,105,109,105,116,109, 97,120, 91, 51, 93,  0,115,116,105,102,102,
+110,101,115,115, 91, 51, 93,  0,105,107,115,116,114,101,116, 99,104,  0,105,107,114,111,116,119,101,105,103,104,116,  0,105,107,
+108,105,110,119,101,105,103,104,116,  0, 42,116,101,109,112,  0, 99,104, 97,110, 98, 97,115,101,  0, 42, 99,104, 97,110,104, 97,
+115,104,  0,112,114,111,120,121, 95,108, 97,121,101,114,  0,115,116,114,105,100,101, 95,111,102,102,115,101,116, 91, 51, 93,  0,
+ 99,121, 99,108,105, 99, 95,111,102,102,115,101,116, 91, 51, 93,  0, 97,103,114,111,117,112,115,  0, 97, 99,116,105,118,101, 95,
+103,114,111,117,112,  0,105,107,115,111,108,118,101,114,  0, 42,105,107,100, 97,116, 97,  0, 42,105,107,112, 97,114, 97,109,  0,
+112,114,111,120,121, 95, 97, 99,116, 95, 98,111,110,101, 91, 54, 52, 93,  0,110,117,109,105,116,101,114,  0,110,117,109,115,116,
+101,112,  0,109,105,110,115,116,101,112,  0,109, 97,120,115,116,101,112,  0,115,111,108,118,101,114,  0,102,101,101,100, 98, 97,
+ 99,107,  0,109, 97,120,118,101,108,  0,100, 97,109,112,109, 97,120,  0,100, 97,109,112,101,112,115,  0, 99,104, 97,110,110,101,
+108,115,  0, 99,117,115,116,111,109, 67,111,108,  0, 99,115,  0, 99,117,114,118,101,115,  0,103,114,111,117,112,115,  0, 97, 99,
+116,105,118,101, 95,109, 97,114,107,101,114,  0,105,100,114,111,111,116,  0, 42,115,111,117,114, 99,101,  0, 42,102,105,108,116,
+101,114, 95,103,114,112,  0,115,101, 97,114, 99,104,115,116,114, 91, 54, 52, 93,  0,102,105,108,116,101,114,102,108, 97,103,  0,
+114,101,110, 97,109,101, 73,110,100,101,120,  0, 97,100,115,  0,116,105,109,101,115,108,105,100,101,  0, 42,103,114,112,  0,110,
+ 97,109,101, 91, 51, 48, 93,  0,111,119,110,115,112, 97, 99,101,  0,116, 97,114,115,112, 97, 99,101,  0,101,110,102,111,114, 99,
+101,  0,104,101, 97,100,116, 97,105,108,  0,108,105,110, 95,101,114,114,111,114,  0,114,111,116, 95,101,114,114,111,114,  0, 42,
+116, 97,114,  0,109, 97,116,114,105,120, 91, 52, 93, 91, 52, 93,  0,115,112, 97, 99,101,  0,114,111,116, 79,114,100,101,114,  0,
+116, 97,114,110,117,109,  0,116, 97,114,103,101,116,115,  0,105,116,101,114, 97,116,105,111,110,115,  0,114,111,111,116, 98,111,
+110,101,  0,109, 97,120, 95,114,111,111,116, 98,111,110,101,  0, 42,112,111,108,101,116, 97,114,  0,112,111,108,101,115,117, 98,
+116, 97,114,103,101,116, 91, 54, 52, 93,  0,112,111,108,101, 97,110,103,108,101,  0,111,114,105,101,110,116,119,101,105,103,104,
+116,  0,103,114, 97, 98,116, 97,114,103,101,116, 91, 51, 93,  0,110,117,109,112,111,105,110,116,115,  0, 99,104, 97,105,110,108,
+101,110,  0,120,122, 83, 99, 97,108,101, 77,111,100,101,  0,114,101,115,101,114,118,101,100, 49,  0,114,101,115,101,114,118,101,
+100, 50,  0,109,105,110,109, 97,120,102,108, 97,103,  0,115,116,117, 99,107,  0, 99, 97, 99,104,101, 91, 51, 93,  0,108,111, 99,
+107,102,108, 97,103,  0,102,111,108,108,111,119,102,108, 97,103,  0,118,111,108,109,111,100,101,  0,112,108, 97,110,101,  0,111,
+114,103,108,101,110,103,116,104,  0, 98,117,108,103,101,  0,112,105,118, 88,  0,112,105,118, 89,  0,112,105,118, 90,  0, 97,120,
+ 88,  0, 97,120, 89,  0, 97,120, 90,  0,109,105,110, 76,105,109,105,116, 91, 54, 93,  0,109, 97,120, 76,105,109,105,116, 91, 54,
+ 93,  0,101,120,116,114, 97, 70,122,  0,105,110,118,109, 97,116, 91, 52, 93, 91, 52, 93,  0,102,114,111,109,  0,116,111,  0,109,
+ 97,112, 91, 51, 93,  0,101,120,112,111,  0,102,114,111,109, 95,109,105,110, 91, 51, 93,  0,102,114,111,109, 95,109, 97,120, 91,
+ 51, 93,  0,116,111, 95,109,105,110, 91, 51, 93,  0,116,111, 95,109, 97,120, 91, 51, 93,  0,114,111,116, 65,120,105,115,  0,122,
+109,105,110,  0,122,109, 97,120,  0,112, 97,100, 91, 57, 93,  0,116,114, 97, 99,107, 91, 54, 52, 93,  0,111, 98,106,101, 99,116,
+ 91, 54, 52, 93,  0, 42,100,101,112,116,104, 95,111, 98,  0, 99,104, 97,110,110,101,108, 91, 51, 50, 93,  0,110,111, 95,114,111,
+116, 95, 97,120,105,115,  0,115,116,114,105,100,101, 95, 97,120,105,115,  0, 99,117,114,109,111,100,  0, 97, 99,116,115,116, 97,
+114,116,  0, 97, 99,116,101,110,100,  0, 97, 99,116,111,102,102,115,  0,115,116,114,105,100,101,108,101,110,  0, 98,108,101,110,
+100,111,117,116,  0,115,116,114,105,100,101, 99,104, 97,110,110,101,108, 91, 51, 50, 93,  0,111,102,102,115, 95, 98,111,110,101,
+ 91, 51, 50, 93,  0,104, 97,115,105,110,112,117,116,  0,104, 97,115,111,117,116,112,117,116,  0,100, 97,116, 97,116,121,112,101,
+  0,115,111, 99,107,101,116,116,121,112,101,  0,105,115, 95, 99,111,112,121,  0,101,120,116,101,114,110, 97,108,  0, 42,110,101,
+119, 95,115,111, 99,107,  0, 42,115,116,111,114, 97,103,101,  0,108,105,109,105,116,  0,108,111, 99,120,  0,108,111, 99,121,  0,
+ 42,100,101,102, 97,117,108,116, 95,118, 97,108,117,101,  0,115,116, 97, 99,107, 95,105,110,100,101,120,  0,115,116, 97, 99,107,
+ 95,116,121,112,101,  0,114,101,115,105,122,101,109,111,100,101,  0,111,119,110, 95,105,110,100,101,120,  0,116,111, 95,105,110,
+100,101,120,  0, 42,103,114,111,117,112,115,111, 99,107,  0, 42,108,105,110,107,  0,110,115,  0, 42,114,101, 99,116,  0,120,115,
+105,122,101,  0,121,115,105,122,101,  0, 42,110,101,119, 95,110,111,100,101,  0,108, 97,115,116,121,  0, 99,111,108,111,114, 91,
+ 51, 93,  0,111,117,116,112,117,116,115,  0,109,105,110,105,119,105,100,116,104,  0,111,102,102,115,101,116,120,  0,111,102,102,
+115,101,116,121,  0,117,112,100, 97,116,101,  0,108, 97, 98,101,108, 91, 54, 52, 93,  0, 99,117,115,116,111,109, 49,  0, 99,117,
+115,116,111,109, 50,  0, 99,117,115,116,111,109, 51,  0, 99,117,115,116,111,109, 52,  0,110,101,101,100, 95,101,120,101, 99,  0,
+101,120,101, 99,  0, 42,116,104,114,101, 97,100,100, 97,116, 97,  0,116,111,116,114,  0, 98,117,116,114,  0,112,114,118,114,  0,
+ 42, 98,108,111, 99,107,  0, 42,116,121,112,101,105,110,102,111,  0, 42,102,114,111,109,110,111,100,101,  0, 42,116,111,110,111,
+100,101,  0, 42,102,114,111,109,115,111, 99,107,  0, 42,116,111,115,111, 99,107,  0,110,111,100,101,115,  0,108,105,110,107,115,
+  0,105,110,105,116,  0, 99,117,114, 95,105,110,100,101,120,  0,110,111,100,101,116,121,112,101,  0,101,100,105,116, 95,113,117,
+ 97,108,105,116,121,  0,114,101,110,100,101,114, 95,113,117, 97,108,105,116,121,  0, 99,104,117,110,107,115,105,122,101,  0, 42,
+101,120,101, 99,100, 97,116, 97,  0, 40, 42,112,114,111,103,114,101,115,115, 41, 40, 41,  0, 40, 42,115,116, 97,116,115, 95,100,
+114, 97,119, 41, 40, 41,  0, 40, 42,116,101,115,116, 95, 98,114,101, 97,107, 41, 40, 41,  0, 42,116, 98,104,  0, 42,112,114,104,
+  0, 42,115,100,104,  0,118, 97,108,117,101, 91, 51, 93,  0,118, 97,108,117,101, 91, 52, 93,  0,108, 97, 98,101,108, 95,115,105,
+122,101,  0, 99,121, 99,108,105, 99,  0,109,111,118,105,101,  0,103, 97,109,109, 97,  0,103, 97,105,110,  0,108,105,102,116,  0,
+109, 97,115,116,101,114,  0,115,104, 97,100,111,119,115,  0,109,105,100,116,111,110,101,115,  0,104,105,103,104,108,105,103,104,
+116,115,  0,115,116, 97,114,116,109,105,100,116,111,110,101,115,  0,101,110,100,109,105,100,116,111,110,101,115,  0,102,108, 97,
+112,115,  0,114,111,117,110,100,105,110,103,  0, 99, 97,116, 97,100,105,111,112,116,114,105, 99,  0,108,101,110,115,115,104,105,
+102,116,  0,114,111,116, 97,116,105,111,110,  0,112, 97,115,115, 95,105,110,100,101,120,  0,112, 97,115,115, 95,102,108, 97,103,
+  0,109, 97,120,115,112,101,101,100,  0,109,105,110,115,112,101,101,100,  0, 99,117,114,118,101,100,  0,112,101,114, 99,101,110,
+116,120,  0,112,101,114, 99,101,110,116,121,  0, 98,111,107,101,104,  0,105,109, 97,103,101, 95,105,110, 95,119,105,100,116,104,
+  0,105,109, 97,103,101, 95,105,110, 95,104,101,105,103,104,116,  0, 99,101,110,116,101,114, 95,120,  0, 99,101,110,116,101,114,
+ 95,121,  0,115,112,105,110,  0,119,114, 97,112,  0,115,105,103,109, 97, 95, 99,111,108,111,114,  0,115,105,103,109, 97, 95,115,
+112, 97, 99,101,  0,104,117,101,  0, 98, 97,115,101, 95,112, 97,116,104, 91, 49, 48, 50, 52, 93,  0,102,111,114,109, 97,116,  0,
+ 97, 99,116,105,118,101, 95,105,110,112,117,116,  0,117,115,101, 95,114,101,110,100,101,114, 95,102,111,114,109, 97,116,  0,117,
+115,101, 95,110,111,100,101, 95,102,111,114,109, 97,116,  0,108, 97,121,101,114, 91, 51, 48, 93,  0,116, 49,  0,116, 50,  0,116,
+ 51,  0,102,115,116,114,101,110,103,116,104,  0,102, 97,108,112,104, 97,  0,107,101,121, 91, 52, 93,  0, 97,108,103,111,114,105,
+116,104,109,  0, 99,104, 97,110,110,101,108,  0,120, 49,  0,120, 50,  0,121, 49,  0,121, 50,  0,102, 97, 99, 95,120, 49,  0,102,
+ 97, 99, 95,120, 50,  0,102, 97, 99, 95,121, 49,  0,102, 97, 99, 95,121, 50,  0, 99,111,108,110, 97,109,101, 91, 54, 52, 93,  0,
+ 98,107,116,121,112,101,  0,112, 97,100, 95, 99, 49,  0,103, 97,109, 99,111,  0,110,111, 95,122, 98,117,102,  0,102,115,116,111,
+112,  0,109, 97,120, 98,108,117,114,  0, 98,116,104,114,101,115,104,  0,112, 97,100, 95,102, 49,  0, 42,100,105, 99,116,  0, 42,
+110,111,100,101,  0, 99,111,108,109,111,100,  0,109,105,120,  0,102, 97,100,101,  0, 97,110,103,108,101, 95,111,102,115,  0,109,
+  0, 99,  0,106,105,116,  0,112,114,111,106,  0,102,105,116,  0,115,108,111,112,101, 91, 51, 93,  0,112,111,119,101,114, 91, 51,
+ 93,  0,108,105,102,116, 95,108,103,103, 91, 51, 93,  0,103, 97,109,109, 97, 95,105,110,118, 91, 51, 93,  0,108,105,109, 99,104,
+ 97,110,  0,117,110,115,112,105,108,108,  0,108,105,109,115, 99, 97,108,101,  0,117,115,112,105,108,108,114,  0,117,115,112,105,
+108,108,103,  0,117,115,112,105,108,108, 98,  0,116,101,120, 95,109, 97,112,112,105,110,103,  0, 99,111,108,111,114, 95,109, 97,
+112,112,105,110,103,  0,115,117,110, 95,100,105,114,101, 99,116,105,111,110, 91, 51, 93,  0,116,117,114, 98,105,100,105,116,121,
+  0, 99,111,108,111,114, 95,115,112, 97, 99,101,  0,112,114,111,106,101, 99,116,105,111,110,  0,103,114, 97,100,105,101,110,116,
+ 95,116,121,112,101,  0, 99,111,108,111,114,105,110,103,  0,109,117,115,103,114, 97,118,101, 95,116,121,112,101,  0,119, 97,118,
+101, 95,116,121,112,101,  0,115,104,111,114,116,121,  0,109,105,110,116, 97, 98,108,101,  0,109, 97,120,116, 97, 98,108,101,  0,
+101,120,116, 95,105,110, 91, 50, 93,  0,101,120,116, 95,111,117,116, 91, 50, 93,  0, 42, 99,117,114,118,101,  0, 42,116, 97, 98,
+108,101,  0, 42,112,114,101,109,117,108,116, 97, 98,108,101,  0,112,114,101,115,101,116,  0, 99,104, 97,110,103,101,100, 95,116,
+105,109,101,115,116, 97,109,112,  0, 99,117,114,114,  0, 99,108,105,112,114,  0, 99,109, 91, 52, 93,  0, 98,108, 97, 99,107, 91,
+ 51, 93,  0,119,104,105,116,101, 91, 51, 93,  0, 98,119,109,117,108, 91, 51, 93,  0,115, 97,109,112,108,101, 91, 51, 93,  0,120,
+ 95,114,101,115,111,108,117,116,105,111,110,  0,100, 97,116, 97, 95,114, 91, 50, 53, 54, 93,  0,100, 97,116, 97, 95,103, 91, 50,
+ 53, 54, 93,  0,100, 97,116, 97, 95, 98, 91, 50, 53, 54, 93,  0,100, 97,116, 97, 95,108,117,109, 97, 91, 50, 53, 54, 93,  0,115,
+ 97,109,112,108,101, 95,102,117,108,108,  0,115, 97,109,112,108,101, 95,108,105,110,101,115,  0, 97, 99, 99,117,114, 97, 99,121,
+  0,119, 97,118,101,102,114,109, 95,109,111,100,101,  0,119, 97,118,101,102,114,109, 95, 97,108,112,104, 97,  0,119, 97,118,101,
+102,114,109, 95,121,102, 97, 99,  0,119, 97,118,101,102,114,109, 95,104,101,105,103,104,116,  0,118,101, 99,115, 99,111,112,101,
+ 95, 97,108,112,104, 97,  0,118,101, 99,115, 99,111,112,101, 95,104,101,105,103,104,116,  0,109,105,110,109, 97,120, 91, 51, 93,
+ 91, 50, 93,  0,104,105,115,116,  0, 42,119, 97,118,101,102,111,114,109, 95, 49,  0, 42,119, 97,118,101,102,111,114,109, 95, 50,
+  0, 42,119, 97,118,101,102,111,114,109, 95, 51,  0, 42,118,101, 99,115, 99,111,112,101,  0,119, 97,118,101,102,111,114,109, 95,
+116,111,116,  0,111,102,102,115,101,116, 91, 50, 93,  0, 99,108,111,110,101,  0,109,116,101,120,  0, 42,116,111,103,103,108,101,
+ 95, 98,114,117,115,104,  0, 42,105, 99,111,110, 95,105,109, 98,117,102,  0,105, 99,111,110, 95,102,105,108,101,112, 97,116,104,
+ 91, 49, 48, 50, 52, 93,  0,110,111,114,109, 97,108, 95,119,101,105,103,104,116,  0,111, 98, 95,109,111,100,101,  0,106,105,116,
+116,101,114,  0,115,109,111,111,116,104, 95,115,116,114,111,107,101, 95,114, 97,100,105,117,115,  0,115,109,111,111,116,104, 95,
+115,116,114,111,107,101, 95,102, 97, 99,116,111,114,  0,114, 97,116,101,  0,114,103, 98, 91, 51, 93,  0,115, 99,117,108,112,116,
+ 95,112,108, 97,110,101,  0,112,108, 97,110,101, 95,111,102,102,115,101,116,  0,115, 99,117,108,112,116, 95,116,111,111,108,  0,
+118,101,114,116,101,120,112, 97,105,110,116, 95,116,111,111,108,  0,105,109, 97,103,101,112, 97,105,110,116, 95,116,111,111,108,
+  0,109, 97,115,107, 95,116,111,111,108,  0, 97,117,116,111,115,109,111,111,116,104, 95,102, 97, 99,116,111,114,  0, 99,114,101,
+ 97,115,101, 95,112,105,110, 99,104, 95,102, 97, 99,116,111,114,  0,112,108, 97,110,101, 95,116,114,105,109,  0,116,101,120,116,
+117,114,101, 95,115, 97,109,112,108,101, 95, 98,105, 97,115,  0,116,101,120,116,117,114,101, 95,111,118,101,114,108, 97,121, 95,
+ 97,108,112,104, 97,  0, 97,100,100, 95, 99,111,108, 91, 51, 93,  0,115,117, 98, 95, 99,111,108, 91, 51, 93,  0, 97, 99,116,105,
+118,101, 95,114,110,100,  0, 97, 99,116,105,118,101, 95, 99,108,111,110,101,  0, 97, 99,116,105,118,101, 95,109, 97,115,107,  0,
+ 42,108, 97,121,101,114,115,  0,116,121,112,101,109, 97,112, 91, 51, 55, 93,  0,116,111,116,108, 97,121,101,114,  0,109, 97,120,
+108, 97,121,101,114,  0,116,111,116,115,105,122,101,  0, 42,112,111,111,108,  0, 42,101,120,116,101,114,110, 97,108,  0,114,111,
+116, 91, 52, 93,  0, 97,118,101, 91, 51, 93,  0, 42,103,114,111,117,110,100,  0,119, 97,110,100,101,114, 91, 51, 93,  0,114,101,
+115,116, 95,108,101,110,103,116,104,  0,112, 97,114,116,105, 99,108,101, 95,105,110,100,101,120, 91, 50, 93,  0,100,101,108,101,
+116,101, 95,102,108, 97,103,  0,110,117,109,  0,112, 97,114,101,110,116,  0,112, 97, 91, 52, 93,  0,119, 91, 52, 93,  0,102,117,
+118, 91, 52, 93,  0,102,111,102,102,115,101,116,  0,112,114,101,118, 95,115,116, 97,116,101,  0, 42,104, 97,105,114,  0, 42, 98,
+111,105,100,  0,100,105,101,116,105,109,101,  0,110,117,109, 95,100,109, 99, 97, 99,104,101,  0,104, 97,105,114, 95,105,110,100,
+101,120,  0, 97,108,105,118,101,  0,115,112,114,105,110,103, 95,107,  0,112,108, 97,115,116,105, 99,105,116,121, 95, 99,111,110,
+115,116, 97,110,116,  0,121,105,101,108,100, 95,114, 97,116,105,111,  0,112,108, 97,115,116,105, 99,105,116,121, 95, 98, 97,108,
+ 97,110, 99,101,  0,121,105,101,108,100, 95, 98, 97,108, 97,110, 99,101,  0,118,105,115, 99,111,115,105,116,121, 95,111,109,101,
+103, 97,  0,118,105,115, 99,111,115,105,116,121, 95, 98,101,116, 97,  0,115,116,105,102,102,110,101,115,115, 95,107,  0,115,116,
+105,102,102,110,101,115,115, 95,107,110,101, 97,114,  0,114,101,115,116, 95,100,101,110,115,105,116,121,  0, 98,117,111,121, 97,
+110, 99,121,  0,115,112,114,105,110,103, 95,102,114, 97,109,101,115,  0, 42, 98,111,105,100,115,  0, 42,102,108,117,105,100,  0,
+100,105,115,116,114,  0,112,104,121,115,116,121,112,101,  0, 97,118,101,109,111,100,101,  0,114,101, 97, 99,116,101,118,101,110,
+116,  0,100,114, 97,119,  0,100,114, 97,119, 95, 97,115,  0,100,114, 97,119, 95,115,105,122,101,  0, 99,104,105,108,100,116,121,
+112,101,  0,114,101,110, 95, 97,115,  0,115,117, 98,102,114, 97,109,101,115,  0,100,114, 97,119, 95, 99,111,108,  0,114,101,110,
+ 95,115,116,101,112,  0,104, 97,105,114, 95,115,116,101,112,  0,107,101,121,115, 95,115,116,101,112,  0, 97,100, 97,112,116, 95,
+ 97,110,103,108,101,  0, 97,100, 97,112,116, 95,112,105,120,  0,114,111,116,102,114,111,109,  0,105,110,116,101,103,114, 97,116,
+111,114,  0, 98, 98, 95, 97,108,105,103,110,  0, 98, 98, 95,117,118, 95,115,112,108,105,116,  0, 98, 98, 95, 97,110,105,109,  0,
+ 98, 98, 95,115,112,108,105,116, 95,111,102,102,115,101,116,  0, 98, 98, 95,116,105,108,116,  0, 98, 98, 95,114, 97,110,100, 95,
+116,105,108,116,  0, 98, 98, 95,111,102,102,115,101,116, 91, 50, 93,  0, 98, 98, 95,115,105,122,101, 91, 50, 93,  0, 98, 98, 95,
+118,101,108, 95,104,101, 97,100,  0, 98, 98, 95,118,101,108, 95,116, 97,105,108,  0, 99,111,108,111,114, 95,118,101, 99, 95,109,
+ 97,120,  0,115,105,109,112,108,105,102,121, 95,114,101,102,115,105,122,101,  0,115,105,109,112,108,105,102,121, 95,114, 97,116,
+101,  0,115,105,109,112,108,105,102,121, 95,116,114, 97,110,115,105,116,105,111,110,  0,115,105,109,112,108,105,102,121, 95,118,
+105,101,119,112,111,114,116,  0,116,105,109,101,116,119,101, 97,107,  0, 99,111,117,114, 97,110,116, 95,116, 97,114,103,101,116,
+  0,106,105,116,102, 97, 99,  0,101,102,102, 95,104, 97,105,114,  0,103,114,105,100, 95,114, 97,110,100,  0,112,115, 95,111,102,
+102,115,101,116, 91, 49, 93,  0,103,114,105,100, 95,114,101,115,  0,101,102,102,101, 99,116,111,114, 95, 97,109,111,117,110,116,
+  0,116,105,109,101, 95,102,108, 97,103,  0,116,105,109,101, 95,112, 97,100, 91, 51, 93,  0,112, 97,114,116,102, 97, 99,  0,116,
+ 97,110,102, 97, 99,  0,116, 97,110,112,104, 97,115,101,  0,114,101, 97, 99,116,102, 97, 99,  0,111, 98, 95,118,101,108, 91, 51,
+ 93,  0, 97,118,101,102, 97, 99,  0,112,104, 97,115,101,102, 97, 99,  0,114, 97,110,100,114,111,116,102, 97, 99,  0,114, 97,110,
+100,112,104, 97,115,101,102, 97, 99,  0,114, 97,110,100,115,105,122,101,  0, 97, 99, 99, 91, 51, 93,  0,100,114, 97,103,102, 97,
+ 99,  0, 98,114,111,119,110,102, 97, 99,  0,114, 97,110,100,108,101,110,103,116,104,  0, 99,104,105,108,100, 95,110, 98,114,  0,
+114,101,110, 95, 99,104,105,108,100, 95,110, 98,114,  0,112, 97,114,101,110,116,115,  0, 99,104,105,108,100,115,105,122,101,  0,
+ 99,104,105,108,100,114, 97,110,100,115,105,122,101,  0, 99,104,105,108,100,114, 97,100,  0, 99,104,105,108,100,102,108, 97,116,
+  0, 99,108,117,109,112,112,111,119,  0,107,105,110,107, 95,102,108, 97,116,  0,107,105,110,107, 95, 97,109,112, 95, 99,108,117,
+109,112,  0,114,111,117,103,104, 49,  0,114,111,117,103,104, 49, 95,115,105,122,101,  0,114,111,117,103,104, 50,  0,114,111,117,
+103,104, 50, 95,115,105,122,101,  0,114,111,117,103,104, 50, 95,116,104,114,101,115,  0,114,111,117,103,104, 95,101,110,100,  0,
+114,111,117,103,104, 95,101,110,100, 95,115,104, 97,112,101,  0, 99,108,101,110,103,116,104,  0, 99,108,101,110,103,116,104, 95,
+116,104,114,101,115,  0,112, 97,114,116,105,110,103, 95,102, 97, 99,  0,112, 97,114,116,105,110,103, 95,109,105,110,  0,112, 97,
+114,116,105,110,103, 95,109, 97,120,  0, 98,114, 97,110, 99,104, 95,116,104,114,101,115,  0,100,114, 97,119, 95,108,105,110,101,
+ 91, 50, 93,  0,112, 97,116,104, 95,115,116, 97,114,116,  0,112, 97,116,104, 95,101,110,100,  0,116,114, 97,105,108, 95, 99,111,
+117,110,116,  0,107,101,121,101,100, 95,108,111,111,112,115,  0,100,117,112,108,105,119,101,105,103,104,116,115,  0, 42,101,102,
+102, 95,103,114,111,117,112,  0, 42,100,117,112, 95,111, 98,  0, 42, 98, 98, 95,111, 98,  0, 42,112,100, 50,  0, 42,112, 97,114,
+116,  0, 42,112, 97,114,116,105, 99,108,101,115,  0, 42, 42,112, 97,116,104, 99, 97, 99,104,101,  0, 42, 42, 99,104,105,108,100,
+ 99, 97, 99,104,101,  0,112, 97,116,104, 99, 97, 99,104,101, 98,117,102,115,  0, 99,104,105,108,100, 99, 97, 99,104,101, 98,117,
+102,115,  0, 42, 99,108,109,100,  0, 42,104, 97,105,114, 95,105,110, 95,100,109,  0, 42,104, 97,105,114, 95,111,117,116, 95,100,
+109,  0, 42,116, 97,114,103,101,116, 95,111, 98,  0, 42,108, 97,116,116,105, 99,101,  0,116,114,101,101, 95,102,114, 97,109,101,
+  0, 98,118,104,116,114,101,101, 95,102,114, 97,109,101,  0, 99,104,105,108,100, 95,115,101,101,100,  0,116,111,116,117,110,101,
+120,105,115,116,  0,116,111,116, 99,104,105,108,100,  0,116,111,116, 99, 97, 99,104,101,100,  0,116,111,116, 99,104,105,108,100,
+ 99, 97, 99,104,101,  0,116, 97,114,103,101,116, 95,112,115,121,115,  0,116,111,116,107,101,121,101,100,  0, 98, 97,107,101,115,
+112, 97, 99,101,  0, 98, 98, 95,117,118,110, 97,109,101, 91, 51, 93, 91, 54, 52, 93,  0,118,103,114,111,117,112, 91, 49, 50, 93,
+  0,118,103, 95,110,101,103,  0,114,116, 51,  0, 42,114,101,110,100,101,114,100, 97,116, 97,  0, 42,101,102,102,101, 99,116,111,
+114,115,  0, 42,102,108,117,105,100, 95,115,112,114,105,110,103,115,  0,116,111,116, 95,102,108,117,105,100,115,112,114,105,110,
+103,115,  0, 97,108,108,111, 99, 95,102,108,117,105,100,115,112,114,105,110,103,115,  0, 42,116,114,101,101,  0, 42,112,100,100,
+  0, 42,102,114, 97,110,100,  0,100,116, 95,102,114, 97, 99,  0, 95,112, 97,100,  0, 67,100,105,115,  0, 67,118,105,  0,115,116,
+114,117, 99,116,117,114, 97,108,  0, 98,101,110,100,105,110,103,  0,109, 97,120, 95, 98,101,110,100,  0,109, 97,120, 95,115,116,
+114,117, 99,116,  0,109, 97,120, 95,115,104,101, 97,114,  0, 97,118,103, 95,115,112,114,105,110,103, 95,108,101,110,  0,116,105,
+109,101,115, 99, 97,108,101,  0,101,102,102, 95,102,111,114, 99,101, 95,115, 99, 97,108,101,  0,101,102,102, 95,119,105,110,100,
+ 95,115, 99, 97,108,101,  0,115,105,109, 95,116,105,109,101, 95,111,108,100,  0,118,101,108,111, 99,105,116,121, 95,115,109,111,
+111,116,104,  0, 99,111,108,108,105,100,101,114, 95,102,114,105, 99,116,105,111,110,  0,118,101,108, 95,100, 97,109,112,105,110,
+103,  0,115,116,101,112,115, 80,101,114, 70,114, 97,109,101,  0,112,114,101,114,111,108,108,  0,109, 97,120,115,112,114,105,110,
+103,108,101,110,  0,115,111,108,118,101,114, 95,116,121,112,101,  0,118,103,114,111,117,112, 95, 98,101,110,100,  0,118,103,114,
+111,117,112, 95,109, 97,115,115,  0,118,103,114,111,117,112, 95,115,116,114,117, 99,116,  0,115,104, 97,112,101,107,101,121, 95,
+114,101,115,116,  0,112,114,101,115,101,116,115,  0,114,101,115,101,116,  0, 42, 99,111,108,108,105,115,105,111,110, 95,108,105,
+115,116,  0,101,112,115,105,108,111,110,  0,115,101,108,102, 95,102,114,105, 99,116,105,111,110,  0,115,101,108,102,101,112,115,
+105,108,111,110,  0,114,101,112,101,108, 95,102,111,114, 99,101,  0,100,105,115,116, 97,110, 99,101, 95,114,101,112,101,108,  0,
+115,101,108,102, 95,108,111,111,112, 95, 99,111,117,110,116,  0,108,111,111,112, 95, 99,111,117,110,116,  0,112,114,101,115,115,
+117,114,101,  0,116,104,105, 99,107,110,101,115,115,  0,115,116,114,111,107,101,115,  0,102,114, 97,109,101,110,117,109,  0, 42,
+ 97, 99,116,102,114, 97,109,101,  0,103,115,116,101,112,  0,105,110,102,111, 91, 49, 50, 56, 93,  0,115, 98,117,102,102,101,114,
+ 95,115,105,122,101,  0,115, 98,117,102,102,101,114, 95,115,102,108, 97,103,  0, 42,115, 98,117,102,102,101,114,  0,108,105,115,
+116,  0,112,114,105,110,116,108,101,118,101,108,  0,115,116,111,114,101,108,101,118,101,108,  0, 42,114,101,112,111,114,116,116,
+105,109,101,114,  0, 42,119,105,110,100,114, 97,119, 97, 98,108,101,  0, 42,119,105,110, 97, 99,116,105,118,101,  0,119,105,110,
+100,111,119,115,  0,105,110,105,116,105, 97,108,105,122,101,100,  0,102,105,108,101, 95,115, 97,118,101,100,  0,111,112, 95,117,
+110,100,111, 95,100,101,112,116,104,  0,111,112,101,114, 97,116,111,114,115,  0,113,117,101,117,101,  0,114,101,112,111,114,116,
+115,  0,106,111, 98,115,  0,112, 97,105,110,116, 99,117,114,115,111,114,115,  0,100,114, 97,103,115,  0,107,101,121, 99,111,110,
+102,105,103,115,  0, 42,100,101,102, 97,117,108,116, 99,111,110,102,  0, 42, 97,100,100,111,110, 99,111,110,102,  0, 42,117,115,
+101,114, 99,111,110,102,  0,116,105,109,101,114,115,  0, 42, 97,117,116,111,115, 97,118,101,116,105,109,101,114,  0, 42,103,104,
+111,115,116,119,105,110,  0,103,114, 97, 98, 99,117,114,115,111,114,  0, 42,115, 99,114,101,101,110,  0, 42,110,101,119,115, 99,
+114,101,101,110,  0,115, 99,114,101,101,110,110, 97,109,101, 91, 54, 52, 93,  0,112,111,115,120,  0,112,111,115,121,  0,119,105,
+110,100,111,119,115,116, 97,116,101,  0,109,111,110,105,116,111,114,  0,108, 97,115,116, 99,117,114,115,111,114,  0,109,111,100,
+ 97,108, 99,117,114,115,111,114,  0, 97,100,100,109,111,117,115,101,109,111,118,101,  0, 42,101,118,101,110,116,115,116, 97,116,
+101,  0, 42, 99,117,114,115,119,105,110,  0, 42,116,119,101, 97,107,  0,100,114, 97,119,109,101,116,104,111,100,  0,100,114, 97,
+119,102, 97,105,108,  0, 42,100,114, 97,119,100, 97,116, 97,  0,109,111,100, 97,108,104, 97,110,100,108,101,114,115,  0,115,117,
+ 98,119,105,110,100,111,119,115,  0,103,101,115,116,117,114,101,  0,105,100,110, 97,109,101, 91, 54, 52, 93,  0,112,114,111,112,
+118, 97,108,117,101, 95,115,116,114, 91, 54, 52, 93,  0,112,114,111,112,118, 97,108,117,101,  0,115,104,105,102,116,  0, 99,116,
+114,108,  0, 97,108,116,  0,111,115,107,101,121,  0,107,101,121,109,111,100,105,102,105,101,114,  0,109, 97,112,116,121,112,101,
+  0, 42,112,116,114,  0, 42,114,101,109,111,118,101, 95,105,116,101,109,  0, 42, 97,100,100, 95,105,116,101,109,  0,105,116,101,
+109,115,  0,100,105,102,102, 95,105,116,101,109,115,  0,115,112, 97, 99,101,105,100,  0,114,101,103,105,111,110,105,100,  0,107,
+109,105, 95,105,100,  0, 40, 42,112,111,108,108, 41, 40, 41,  0, 42,109,111,100, 97,108, 95,105,116,101,109,115,  0, 98, 97,115,
+101,110, 97,109,101, 91, 54, 52, 93,  0, 97, 99,116,107,101,121,109, 97,112,  0, 42, 99,117,115,116,111,109,100, 97,116, 97,  0,
+ 42,112,121, 95,105,110,115,116, 97,110, 99,101,  0, 42,114,101,112,111,114,116,115,  0,109, 97, 99,114,111,  0, 42,111,112,109,
+  0, 42,101,100, 97,116, 97,  0, 42, 99,111,101,102,102,105, 99,105,101,110,116,115,  0, 97,114,114, 97,121,115,105,122,101,  0,
+112,111,108,121, 95,111,114,100,101,114,  0, 97,109,112,108,105,116,117,100,101,  0,112,104, 97,115,101, 95,109,117,108,116,105,
+112,108,105,101,114,  0,112,104, 97,115,101, 95,111,102,102,115,101,116,  0,118, 97,108,117,101, 95,111,102,102,115,101,116,  0,
+109,105,100,118, 97,108,  0, 98,101,102,111,114,101, 95,109,111,100,101,  0, 97,102,116,101,114, 95,109,111,100,101,  0, 98,101,
+102,111,114,101, 95, 99,121, 99,108,101,115,  0, 97,102,116,101,114, 95, 99,121, 99,108,101,115,  0,114,101, 99,116,  0,112,104,
+ 97,115,101,  0,109,111,100,105,102,105, 99, 97,116,105,111,110,  0,115,116,101,112, 95,115,105,122,101,  0, 42,114,110, 97, 95,
+112, 97,116,104,  0,112, 99,104, 97,110, 95,110, 97,109,101, 91, 51, 50, 93,  0,116,114, 97,110,115, 67,104, 97,110,  0,105,100,
+116,121,112,101,  0,116, 97,114,103,101,116,115, 91, 56, 93,  0,110,117,109, 95,116, 97,114,103,101,116,115,  0,118, 97,114,105,
+ 97, 98,108,101,115,  0,101,120,112,114,101,115,115,105,111,110, 91, 50, 53, 54, 93,  0, 42,101,120,112,114, 95, 99,111,109,112,
+  0,118,101, 99, 91, 50, 93,  0, 42,102,112,116,  0, 97,114,114, 97,121, 95,105,110,100,101,120,  0, 99,111,108,111,114, 95,109,
+111,100,101,  0,102,114,111,109, 91, 49, 50, 56, 93,  0,116,111, 91, 49, 50, 56, 93,  0,109, 97,112,112,105,110,103,115,  0,115,
+116,114,105,112,115,  0, 42,114,101,109, 97,112,  0,102, 99,117,114,118,101,115,  0,115,116,114,105,112, 95,116,105,109,101,  0,
+ 98,108,101,110,100,109,111,100,101,  0,101,120,116,101,110,100,109,111,100,101,  0, 42,115,112,101, 97,107,101,114, 95,104, 97,
+110,100,108,101,  0,103,114,111,117,112, 91, 54, 52, 93,  0,103,114,111,117,112,109,111,100,101,  0,107,101,121,105,110,103,102,
+108, 97,103,  0,112, 97,116,104,115,  0,100,101,115, 99,114,105,112,116,105,111,110, 91, 50, 52, 48, 93,  0,116,121,112,101,105,
+110,102,111, 91, 54, 52, 93,  0, 97, 99,116,105,118,101, 95,112, 97,116,104,  0, 42,116,109,112, 97, 99,116,  0,110,108, 97, 95,
+116,114, 97, 99,107,115,  0, 42, 97, 99,116,115,116,114,105,112,  0,100,114,105,118,101,114,115,  0,111,118,101,114,114,105,100,
+101,115,  0, 97, 99,116, 95, 98,108,101,110,100,109,111,100,101,  0, 97, 99,116, 95,101,120,116,101,110,100,109,111,100,101,  0,
+ 97, 99,116, 95,105,110,102,108,117,101,110, 99,101,  0,114,117,108,101,  0,111,112,116,105,111,110,115,  0,102,101, 97,114, 95,
+102, 97, 99,116,111,114,  0,115,105,103,110, 97,108, 95,105,100,  0,108,111,111,107, 95, 97,104,101, 97,100,  0,111,108,111, 99,
+ 91, 51, 93,  0,113,117,101,117,101, 95,115,105,122,101,  0,119, 97,110,100,101,114,  0,102,108,101,101, 95,100,105,115,116, 97,
+110, 99,101,  0,104,101, 97,108,116,104,  0,115,116, 97,116,101, 95,105,100,  0,114,117,108,101,115,  0, 99,111,110,100,105,116,
+105,111,110,115,  0, 97, 99,116,105,111,110,115,  0,114,117,108,101,115,101,116, 95,116,121,112,101,  0,114,117,108,101, 95,102,
+117,122,122,105,110,101,115,115,  0,108, 97,115,116, 95,115,116, 97,116,101, 95,105,100,  0,108, 97,110,100,105,110,103, 95,115,
+109,111,111,116,104,110,101,115,115,  0, 98, 97,110,107,105,110,103,  0, 97,103,103,114,101,115,115,105,111,110,  0, 97,105,114,
+ 95,109,105,110, 95,115,112,101,101,100,  0, 97,105,114, 95,109, 97,120, 95,115,112,101,101,100,  0, 97,105,114, 95,109, 97,120,
+ 95, 97, 99, 99,  0, 97,105,114, 95,109, 97,120, 95, 97,118,101,  0, 97,105,114, 95,112,101,114,115,111,110, 97,108, 95,115,112,
+ 97, 99,101,  0,108, 97,110,100, 95,106,117,109,112, 95,115,112,101,101,100,  0,108, 97,110,100, 95,109, 97,120, 95,115,112,101,
+101,100,  0,108, 97,110,100, 95,109, 97,120, 95, 97, 99, 99,  0,108, 97,110,100, 95,109, 97,120, 95, 97,118,101,  0,108, 97,110,
+100, 95,112,101,114,115,111,110, 97,108, 95,115,112, 97, 99,101,  0,108, 97,110,100, 95,115,116,105, 99,107, 95,102,111,114, 99,
+101,  0,115,116, 97,116,101,115,  0, 42,115,109,100,  0, 42,102,108,117,105,100, 95,103,114,111,117,112,  0, 42, 99,111,108,108,
+ 95,103,114,111,117,112,  0, 42,119,116,  0, 42,116,101,120, 95,119,116,  0, 42,116,101,120, 95,115,104, 97,100,111,119,  0, 42,
+115,104, 97,100,111,119,  0,112, 48, 91, 51, 93,  0,112, 49, 91, 51, 93,  0,100,120,  0,111,109,101,103, 97,  0,116,101,109,112,
+ 65,109, 98,  0, 98,101,116, 97,  0,114,101,115, 91, 51, 93,  0, 97,109,112,108,105,102,121,  0,109, 97,120,114,101,115,  0,118,
+105,101,119,115,101,116,116,105,110,103,115,  0,110,111,105,115,101,  0,100,105,115,115, 95,112,101,114, 99,101,110,116,  0,100,
+105,115,115, 95,115,112,101,101,100,  0,114,101,115, 95,119,116, 91, 51, 93,  0,100,120, 95,119,116,  0,118, 51,100,110,117,109,
+  0, 99, 97, 99,104,101, 95, 99,111,109,112,  0, 99, 97, 99,104,101, 95,104,105,103,104, 95, 99,111,109,112,  0, 42,112,111,105,
+110,116, 95, 99, 97, 99,104,101, 91, 50, 93,  0,112,116, 99, 97, 99,104,101,115, 91, 50, 93,  0, 98,111,114,100,101,114, 95, 99,
+111,108,108,105,115,105,111,110,115,  0,116,105,109,101, 95,115, 99, 97,108,101,  0,118,111,114,116,105, 99,105,116,121,  0,118,
+101,108,111, 99,105,116,121, 91, 50, 93,  0,118,101,108, 95,109,117,108,116,105,  0,118,103,114,112, 95,104,101, 97,116, 95,115,
+ 99, 97,108,101, 91, 50, 93,  0,118,103,114,111,117,112, 95,102,108,111,119,  0,118,103,114,111,117,112, 95,100,101,110,115,105,
+116,121,  0,118,103,114,111,117,112, 95,104,101, 97,116,  0, 42,112,111,105,110,116,115, 95,111,108,100,  0, 42,118,101,108,  0,
+ 42,116,114,105,100,105,118,115,  0,109, 97,116, 95,111,108,100, 91, 52, 93, 91, 52, 93,  0,110,117,109,116,114,105,115,  0,118,
+111,108,117,109,101, 95,109, 97,120,  0,118,111,108,117,109,101, 95,109,105,110,  0,100,105,115,116, 97,110, 99,101, 95,109, 97,
+120,  0,100,105,115,116, 97,110, 99,101, 95,114,101,102,101,114,101,110, 99,101,  0, 99,111,110,101, 95, 97,110,103,108,101, 95,
+111,117,116,101,114,  0, 99,111,110,101, 95, 97,110,103,108,101, 95,105,110,110,101,114,  0, 99,111,110,101, 95,118,111,108,117,
+109,101, 95,111,117,116,101,114,  0,114,101,110,100,101,114, 95,102,108, 97,103,  0, 98,117,105,108,100, 95,115,105,122,101, 95,
+102,108, 97,103,  0, 98,117,105,108,100, 95,116, 99, 95,102,108, 97,103,  0,108, 97,115,116,115,105,122,101, 91, 50, 93,  0,116,
+114, 97, 99,107,105,110,103,  0, 42,116,114, 97, 99,107,105,110,103, 95, 99,111,110,116,101,120,116,  0,112,114,111,120,121,  0,
+116,114, 97, 99,107, 95,112,114,101,118,105,101,119, 95,104,101,105,103,104,116,  0, 42,116,114, 97, 99,107, 95,112,114,101,118,
+105,101,119,  0,116,114, 97, 99,107, 95,112,111,115, 91, 50, 93,  0,116,114, 97, 99,107, 95,100,105,115, 97, 98,108,101,100,  0,
+ 42,109, 97,114,107,101,114,  0,115,108,105,100,101, 95,115, 99, 97,108,101, 91, 50, 93,  0,101,114,114,111,114,  0, 42,105,110,
+116,114,105,110,115,105, 99,115,  0,115,101,110,115,111,114, 95,119,105,100,116,104,  0,112,105,120,101,108, 95, 97,115,112,101,
+ 99,116,  0,102,111, 99, 97,108,  0,117,110,105,116,115,  0,112,114,105,110, 99,105,112, 97,108, 91, 50, 93,  0,107, 49,  0,107,
+ 50,  0,107, 51,  0,112,111,115, 91, 50, 93,  0,112, 97,116, 95,109,105,110, 91, 50, 93,  0,112, 97,116, 95,109, 97,120, 91, 50,
+ 93,  0,115,101, 97,114, 99,104, 95,109,105,110, 91, 50, 93,  0,115,101, 97,114, 99,104, 95,109, 97,120, 91, 50, 93,  0,109, 97,
+114,107,101,114,115,110,114,  0,108, 97,115,116, 95,109, 97,114,107,101,114,  0, 42,109, 97,114,107,101,114,115,  0, 98,117,110,
+100,108,101, 95,112,111,115, 91, 51, 93,  0,112, 97,116, 95,102,108, 97,103,  0,115,101, 97,114, 99,104, 95,102,108, 97,103,  0,
+102,114, 97,109,101,115, 95,108,105,109,105,116,  0,112, 97,116,116,101,114,110, 95,109, 97,116, 99,104,  0,116,114, 97, 99,107,
+101,114,  0,112,121,114, 97,109,105,100, 95,108,101,118,101,108,115,  0,109,105,110,105,109,117,109, 95, 99,111,114,114,101,108,
+ 97,116,105,111,110,  0,100,101,102, 97,117,108,116, 95,116,114, 97, 99,107,101,114,  0,100,101,102, 97,117,108,116, 95,112,121,
+114, 97,109,105,100, 95,108,101,118,101,108,115,  0,100,101,102, 97,117,108,116, 95,109,105,110,105,109,117,109, 95, 99,111,114,
+114,101,108, 97,116,105,111,110,  0,100,101,102, 97,117,108,116, 95,112, 97,116,116,101,114,110, 95,115,105,122,101,  0,100,101,
+102, 97,117,108,116, 95,115,101, 97,114, 99,104, 95,115,105,122,101,  0,100,101,102, 97,117,108,116, 95,102,114, 97,109,101,115,
+ 95,108,105,109,105,116,  0,100,101,102, 97,117,108,116, 95,109, 97,114,103,105,110,  0,100,101,102, 97,117,108,116, 95,112, 97,
+116,116,101,114,110, 95,109, 97,116, 99,104,  0,100,101,102, 97,117,108,116, 95,102,108, 97,103,  0,109,111,116,105,111,110, 95,
+102,108, 97,103,  0,107,101,121,102,114, 97,109,101, 49,  0,107,101,121,102,114, 97,109,101, 50,  0,114,101,102,105,110,101, 95,
+ 99, 97,109,101,114, 97, 95,105,110,116,114,105,110,115,105, 99,115,  0, 99,108,101, 97,110, 95,102,114, 97,109,101,115,  0, 99,
+108,101, 97,110, 95, 97, 99,116,105,111,110,  0, 99,108,101, 97,110, 95,101,114,114,111,114,  0,111, 98,106,101, 99,116, 95,100,
+105,115,116, 97,110, 99,101,  0,116,111,116, 95,116,114, 97, 99,107,  0, 97, 99,116, 95,116,114, 97, 99,107,  0,109, 97,120,115,
+ 99, 97,108,101,  0, 42,114,111,116, 95,116,114, 97, 99,107,  0,108,111, 99,105,110,102,  0,115, 99, 97,108,101,105,110,102,  0,
+114,111,116,105,110,102,  0, 42,115, 99, 97,108,101,105, 98,117,102,  0,108, 97,115,116, 95, 99, 97,109,101,114, 97,  0, 99, 97,
+109,110,114,  0, 42, 99, 97,109,101,114, 97,115,  0,116,114, 97, 99,107,115,  0,114,101, 99,111,110,115,116,114,117, 99,116,105,
+111,110,  0,109,101,115,115, 97,103,101, 91, 50, 53, 54, 93,  0,116,111,116, 95,115,101,103,109,101,110,116,  0, 42,115,101,103,
+109,101,110,116,115,  0,109, 97,120, 95,115,101,103,109,101,110,116,  0,116,111,116, 97,108, 95,102,114, 97,109,101,115,  0,116,
+111,116, 95, 99,104, 97,110,110,101,108,  0,115,111,114,116, 95,109,101,116,104,111,100,  0,115,111,114,116, 95,105,110,118,101,
+114,115,101,  0,115,101,116,116,105,110,103,115,  0, 99, 97,109,101,114, 97,  0,115,116, 97, 98,105,108,105,122, 97,116,105,111,
+110,  0, 42, 97, 99,116, 95,116,114, 97, 99,107,  0,111, 98,106,101, 99,116,115,  0,111, 98,106,101, 99,116,110,114,  0,116,111,
+116, 95,111, 98,106,101, 99,116,  0,100,111,112,101,115,104,101,101,116,  0, 42, 98,114,117,115,104, 95,103,114,111,117,112,  0,
+ 99,117,114,114,101,110,116, 95,102,114, 97,109,101,  0,100,105,115,112, 95,116,121,112,101,  0,105,109, 97,103,101, 95,102,105,
+108,101,102,111,114,109, 97,116,  0,101,102,102,101, 99,116, 95,117,105,  0,112,114,101,118,105,101,119, 95,105,100,  0,105,110,
+105,116, 95, 99,111,108,111,114, 95,116,121,112,101,  0,112, 97,100, 95,115,  0,105,109, 97,103,101, 95,114,101,115,111,108,117,
+116,105,111,110,  0,115,117, 98,115,116,101,112,115,  0,105,110,105,116, 95, 99,111,108,111,114, 91, 52, 93,  0, 42,105,110,105,
+116, 95,116,101,120,116,117,114,101,  0,105,110,105,116, 95,108, 97,121,101,114,110, 97,109,101, 91, 54, 52, 93,  0,100,114,121,
+ 95,115,112,101,101,100,  0, 99,111,108,111,114, 95,100,114,121, 95,116,104,114,101,115,104,111,108,100,  0,100,101,112,116,104,
+ 95, 99,108, 97,109,112,  0,100,105,115,112, 95,102, 97, 99,116,111,114,  0,115,112,114,101, 97,100, 95,115,112,101,101,100,  0,
+ 99,111,108,111,114, 95,115,112,114,101, 97,100, 95,115,112,101,101,100,  0,115,104,114,105,110,107, 95,115,112,101,101,100,  0,
+100,114,105,112, 95,118,101,108,  0,100,114,105,112, 95, 97, 99, 99,  0,105,110,102,108,117,101,110, 99,101, 95,115, 99, 97,108,
+101,  0,114, 97,100,105,117,115, 95,115, 99, 97,108,101,  0,119, 97,118,101, 95,100, 97,109,112,105,110,103,  0,119, 97,118,101,
+ 95,115,112,101,101,100,  0,119, 97,118,101, 95,116,105,109,101,115, 99, 97,108,101,  0,119, 97,118,101, 95,115,112,114,105,110,
+103,  0,105,109, 97,103,101, 95,111,117,116,112,117,116, 95,112, 97,116,104, 91, 49, 48, 50, 52, 93,  0,111,117,116,112,117,116,
+ 95,110, 97,109,101, 91, 54, 52, 93,  0,111,117,116,112,117,116, 95,110, 97,109,101, 50, 91, 54, 52, 93,  0, 42,112,109,100,  0,
+115,117,114,102, 97, 99,101,115,  0, 97, 99,116,105,118,101, 95,115,117,114,  0,101,114,114,111,114, 91, 54, 52, 93,  0, 99,111,
+108,108,105,115,105,111,110,  0,119,101,116,110,101,115,115,  0,112, 97,114,116,105, 99,108,101, 95,114, 97,100,105,117,115,  0,
+112, 97,114,116,105, 99,108,101, 95,115,109,111,111,116,104,  0,112, 97,105,110,116, 95,100,105,115,116, 97,110, 99,101,  0, 42,
+112, 97,105,110,116, 95,114, 97,109,112,  0, 42,118,101,108, 95,114, 97,109,112,  0,112,114,111,120,105,109,105,116,121, 95,102,
+ 97,108,108,111,102,102,  0,114, 97,121, 95,100,105,114,  0,119, 97,118,101, 95,102, 97, 99,116,111,114,  0,119, 97,118,101, 95,
+ 99,108, 97,109,112,  0,109, 97,120, 95,118,101,108,111, 99,105,116,121,  0,115,109,117,100,103,101, 95,115,116,114,101,110,103,
+116,104,  0,  0, 84, 89, 80, 69, 26,  2,  0,  0, 99,104, 97,114,  0,117, 99,104, 97,114,  0,115,104,111,114,116,  0,117,115,104,
+111,114,116,  0,105,110,116,  0,108,111,110,103,  0,117,108,111,110,103,  0,102,108,111, 97,116,  0,100,111,117, 98,108,101,  0,
+105,110,116, 54, 52, 95,116,  0,117,105,110,116, 54, 52, 95,116,  0,118,111,105,100,  0, 76,105,110,107,  0, 76,105,110,107, 68,
+ 97,116, 97,  0, 76,105,115,116, 66, 97,115,101,  0,118,101, 99, 50,115,  0,118,101, 99, 50,102,  0,118,101, 99, 51,102,  0,114,
+ 99,116,105,  0,114, 99,116,102,  0, 73, 68, 80,114,111,112,101,114,116,121, 68, 97,116, 97,  0, 73, 68, 80,114,111,112,101,114,
+116,121,  0, 73, 68,  0, 76,105, 98,114, 97,114,121,  0, 70,105,108,101, 68, 97,116, 97,  0, 80,114,101,118,105,101,119, 73,109,
+ 97,103,101,  0, 73,112,111, 68,114,105,118,101,114,  0, 79, 98,106,101, 99,116,  0, 73,112,111, 67,117,114,118,101,  0, 66, 80,
+111,105,110,116,  0, 66,101,122, 84,114,105,112,108,101,  0, 73,112,111,  0, 75,101,121, 66,108,111, 99,107,  0, 75,101,121,  0,
+ 65,110,105,109, 68, 97,116, 97,  0, 84,101,120,116, 76,105,110,101,  0, 84,101,120,116, 77, 97,114,107,101,114,  0, 84,101,120,
+116,  0, 80, 97, 99,107,101,100, 70,105,108,101,  0, 67, 97,109,101,114, 97,  0, 73,109, 97,103,101, 85,115,101,114,  0, 83, 99,
+101,110,101,  0, 73,109, 97,103,101,  0, 71, 80, 85, 84,101,120,116,117,114,101,  0, 97,110,105,109,  0, 82,101,110,100,101,114,
+ 82,101,115,117,108,116,  0, 77, 84,101,120,  0, 84,101,120,  0, 67, 66, 68, 97,116, 97,  0, 67,111,108,111,114, 66, 97,110,100,
+  0, 69,110,118, 77, 97,112,  0, 73,109, 66,117,102,  0, 80,111,105,110,116, 68,101,110,115,105,116,121,  0, 67,117,114,118,101,
+ 77, 97,112,112,105,110,103,  0, 86,111,120,101,108, 68, 97,116, 97,  0, 79, 99,101, 97,110, 84,101,120,  0, 98, 78,111,100,101,
+ 84,114,101,101,  0, 84,101,120, 77, 97,112,112,105,110,103,  0, 67,111,108,111,114, 77, 97,112,112,105,110,103,  0, 76, 97,109,
+112,  0, 86,111,108,117,109,101, 83,101,116,116,105,110,103,115,  0, 71, 97,109,101, 83,101,116,116,105,110,103,115,  0, 77, 97,
+116,101,114,105, 97,108,  0, 71,114,111,117,112,  0, 86, 70,111,110,116,  0, 86, 70,111,110,116, 68, 97,116, 97,  0, 77,101,116,
+ 97, 69,108,101,109,  0, 66,111,117,110,100, 66,111,120,  0, 77,101,116, 97, 66, 97,108,108,  0, 78,117,114, 98,  0, 67,104, 97,
+114, 73,110,102,111,  0, 84,101,120,116, 66,111,120,  0, 69,100,105,116, 78,117,114, 98,  0, 71, 72, 97,115,104,  0, 67,117,114,
+118,101,  0, 80, 97,116,104,  0, 83,101,108, 66,111,120,  0, 69,100,105,116, 70,111,110,116,  0, 77,101,115,104,  0, 77, 83,101,
+108,101, 99,116,  0, 77, 80,111,108,121,  0, 77, 84,101,120, 80,111,108,121,  0, 77, 76,111,111,112,  0, 77, 76,111,111,112, 85,
+ 86,  0, 77, 76,111,111,112, 67,111,108,  0, 77, 70, 97, 99,101,  0, 77, 84, 70, 97, 99,101,  0, 84, 70, 97, 99,101,  0, 77, 86,
+101,114,116,  0, 77, 69,100,103,101,  0, 77, 68,101,102,111,114,109, 86,101,114,116,  0, 77, 67,111,108,  0, 77, 83,116,105, 99,
+107,121,  0, 66, 77, 69,100,105,116, 77,101,115,104,  0, 67,117,115,116,111,109, 68, 97,116, 97,  0, 77,117,108,116,105,114,101,
+115,  0, 77, 68,101,102,111,114,109, 87,101,105,103,104,116,  0, 77, 70,108,111, 97,116, 80,114,111,112,101,114,116,121,  0, 77,
+ 73,110,116, 80,114,111,112,101,114,116,121,  0, 77, 83,116,114,105,110,103, 80,114,111,112,101,114,116,121,  0, 79,114,105,103,
+ 83,112, 97, 99,101, 70, 97, 99,101,  0, 79,114,105,103, 83,112, 97, 99,101, 76,111,111,112,  0, 77, 68,105,115,112,115,  0, 77,
+117,108,116,105,114,101,115, 67,111,108,  0, 77,117,108,116,105,114,101,115, 67,111,108, 70, 97, 99,101,  0, 77,117,108,116,105,
+114,101,115, 70, 97, 99,101,  0, 77,117,108,116,105,114,101,115, 69,100,103,101,  0, 77,117,108,116,105,114,101,115, 76,101,118,
+101,108,  0, 77, 82,101, 99, 97,115,116,  0, 71,114,105,100, 80, 97,105,110,116, 77, 97,115,107,  0, 77, 86,101,114,116, 83,107,
+105,110,  0, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 77, 97,112,112,105,110,103, 73,110,102,111, 77,111,100,105,102,
+105,101,114, 68, 97,116, 97,  0, 83,117, 98,115,117,114,102, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 76, 97,116,116,
+105, 99,101, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 67,117,114,118,101, 77,111,100,105,102,105,101,114, 68, 97,116,
+ 97,  0, 66,117,105,108,100, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 77, 97,115,107, 77,111,100,105,102,105,101,114,
+ 68, 97,116, 97,  0, 65,114,114, 97,121, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 77,105,114,114,111,114, 77,111,100,
+105,102,105,101,114, 68, 97,116, 97,  0, 69,100,103,101, 83,112,108,105,116, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0,
+ 66,101,118,101,108, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 66, 77,101,115,104, 77,111,100,105,102,105,101,114, 68,
+ 97,116, 97,  0, 83,109,111,107,101, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 83,109,111,107,101, 68,111,109, 97,105,
+110, 83,101,116,116,105,110,103,115,  0, 83,109,111,107,101, 70,108,111,119, 83,101,116,116,105,110,103,115,  0, 83,109,111,107,
+101, 67,111,108,108, 83,101,116,116,105,110,103,115,  0, 68,105,115,112,108, 97, 99,101, 77,111,100,105,102,105,101,114, 68, 97,
+116, 97,  0, 85, 86, 80,114,111,106,101, 99,116, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 68,101, 99,105,109, 97,116,
+101, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 83,109,111,111,116,104, 77,111,100,105,102,105,101,114, 68, 97,116, 97,
+  0, 67, 97,115,116, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 87, 97,118,101, 77,111,100,105,102,105,101,114, 68, 97,
+116, 97,  0, 65,114,109, 97,116,117,114,101, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 72,111,111,107, 77,111,100,105,
+102,105,101,114, 68, 97,116, 97,  0, 83,111,102,116, 98,111,100,121, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 67,108,
+111,116,104, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 67,108,111,116,104,  0, 67,108,111,116,104, 83,105,109, 83,101,
+116,116,105,110,103,115,  0, 67,108,111,116,104, 67,111,108,108, 83,101,116,116,105,110,103,115,  0, 80,111,105,110,116, 67, 97,
+ 99,104,101,  0, 67,111,108,108,105,115,105,111,110, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 66, 86, 72, 84,114,101,
+101,  0, 83,117,114,102, 97, 99,101, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 68,101,114,105,118,101,100, 77,101,115,
+104,  0, 66, 86, 72, 84,114,101,101, 70,114,111,109, 77,101,115,104,  0, 66,111,111,108,101, 97,110, 77,111,100,105,102,105,101,
+114, 68, 97,116, 97,  0, 77, 68,101,102, 73,110,102,108,117,101,110, 99,101,  0, 77, 68,101,102, 67,101,108,108,  0, 77,101,115,
+104, 68,101,102,111,114,109, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 80, 97,114,116,105, 99,108,101, 83,121,115,116,
+101,109, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 80, 97,114,116,105, 99,108,101, 83,121,115,116,101,109,  0, 80, 97,
+114,116,105, 99,108,101, 73,110,115,116, 97,110, 99,101, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 69,120,112,108,111,
+100,101, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 77,117,108,116,105,114,101,115, 77,111,100,105,102,105,101,114, 68,
+ 97,116, 97,  0, 70,108,117,105,100,115,105,109, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 70,108,117,105,100,115,105,
+109, 83,101,116,116,105,110,103,115,  0, 83,104,114,105,110,107,119,114, 97,112, 77,111,100,105,102,105,101,114, 68, 97,116, 97,
+  0, 83,105,109,112,108,101, 68,101,102,111,114,109, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 83,104, 97,112,101, 75,
+101,121, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 83,111,108,105,100,105,102,121, 77,111,100,105,102,105,101,114, 68,
+ 97,116, 97,  0, 83, 99,114,101,119, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 79, 99,101, 97,110, 77,111,100,105,102,
+105,101,114, 68, 97,116, 97,  0, 79, 99,101, 97,110,  0, 79, 99,101, 97,110, 67, 97, 99,104,101,  0, 87, 97,114,112, 77,111,100,
+105,102,105,101,114, 68, 97,116, 97,  0, 87,101,105,103,104,116, 86, 71, 69,100,105,116, 77,111,100,105,102,105,101,114, 68, 97,
+116, 97,  0, 87,101,105,103,104,116, 86, 71, 77,105,120, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 87,101,105,103,104,
+116, 86, 71, 80,114,111,120,105,109,105,116,121, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 68,121,110, 97,109,105, 99,
+ 80, 97,105,110,116, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 68,121,110, 97,109,105, 99, 80, 97,105,110,116, 67, 97,
+110,118, 97,115, 83,101,116,116,105,110,103,115,  0, 68,121,110, 97,109,105, 99, 80, 97,105,110,116, 66,114,117,115,104, 83,101,
+116,116,105,110,103,115,  0, 82,101,109,101,115,104, 77,111,100,105,102,105,101,114, 68, 97,116, 97,  0, 83,107,105,110, 77,111,
+100,105,102,105,101,114, 68, 97,116, 97,  0, 69,100,105,116, 76, 97,116,116,  0, 76, 97,116,116,105, 99,101,  0, 98, 68,101,102,
+111,114,109, 71,114,111,117,112,  0, 83, 99,117,108,112,116, 83,101,115,115,105,111,110,  0, 98, 65, 99,116,105,111,110,  0, 98,
+ 80,111,115,101,  0, 98, 71, 80,100, 97,116, 97,  0, 98, 65,110,105,109, 86,105,122, 83,101,116,116,105,110,103,115,  0, 98, 77,
+111,116,105,111,110, 80, 97,116,104,  0, 66,117,108,108,101,116, 83,111,102,116, 66,111,100,121,  0, 80, 97,114,116, 68,101,102,
+108,101, 99,116,  0, 83,111,102,116, 66,111,100,121,  0, 79, 98, 72,111,111,107,  0, 68,117,112,108,105, 79, 98,106,101, 99,116,
+  0, 82, 78, 71,  0, 69,102,102,101, 99,116,111,114, 87,101,105,103,104,116,115,  0, 80, 84, 67, 97, 99,104,101, 69,120,116,114,
+ 97,  0, 80, 84, 67, 97, 99,104,101, 77,101,109,  0, 80, 84, 67, 97, 99,104,101, 69,100,105,116,  0, 83, 66, 86,101,114,116,101,
+120,  0, 66,111,100,121, 80,111,105,110,116,  0, 66,111,100,121, 83,112,114,105,110,103,  0, 83, 66, 83, 99,114, 97,116, 99,104,
+  0, 70,108,117,105,100, 86,101,114,116,101,120, 86,101,108,111, 99,105,116,121,  0, 87,111,114,108,100,  0, 66, 97,115,101,  0,
+ 65,118,105, 67,111,100,101, 99, 68, 97,116, 97,  0, 81,117,105, 99,107,116,105,109,101, 67,111,100,101, 99, 68, 97,116, 97,  0,
+ 81,117,105, 99,107,116,105,109,101, 67,111,100,101, 99, 83,101,116,116,105,110,103,115,  0, 70, 70, 77,112,101,103, 67,111,100,
+101, 99, 68, 97,116, 97,  0, 65,117,100,105,111, 68, 97,116, 97,  0, 83, 99,101,110,101, 82,101,110,100,101,114, 76, 97,121,101,
+114,  0, 73,109, 97,103,101, 70,111,114,109, 97,116, 68, 97,116, 97,  0, 82,101,110,100,101,114, 68, 97,116, 97,  0, 82,101,110,
+100,101,114, 80,114,111,102,105,108,101,  0, 71, 97,109,101, 68,111,109,101,  0, 71, 97,109,101, 70,114, 97,109,105,110,103,  0,
+ 82,101, 99, 97,115,116, 68, 97,116, 97,  0, 71, 97,109,101, 68, 97,116, 97,  0, 84,105,109,101, 77, 97,114,107,101,114,  0, 80,
+ 97,105,110,116,  0, 66,114,117,115,104,  0, 73,109, 97,103,101, 80, 97,105,110,116, 83,101,116,116,105,110,103,115,  0, 80, 97,
+114,116,105, 99,108,101, 66,114,117,115,104, 68, 97,116, 97,  0, 80, 97,114,116,105, 99,108,101, 69,100,105,116, 83,101,116,116,
+105,110,103,115,  0, 83, 99,117,108,112,116,  0, 85,118, 83, 99,117,108,112,116,  0, 86, 80, 97,105,110,116,  0, 84,114, 97,110,
+115,102,111,114,109, 79,114,105,101,110,116, 97,116,105,111,110,  0, 85,110,105,102,105,101,100, 80, 97,105,110,116, 83,101,116,
+116,105,110,103,115,  0, 84,111,111,108, 83,101,116,116,105,110,103,115,  0, 98, 83,116, 97,116,115,  0, 85,110,105,116, 83,101,
+116,116,105,110,103,115,  0, 80,104,121,115,105, 99,115, 83,101,116,116,105,110,103,115,  0, 69,100,105,116,105,110,103,  0, 83,
+ 99,101,110,101, 83,116, 97,116,115,  0, 68, 97,103, 70,111,114,101,115,116,  0, 77,111,118,105,101, 67,108,105,112,  0, 66, 71,
+112,105, 99,  0, 77,111,118,105,101, 67,108,105,112, 85,115,101,114,  0, 82,101,103,105,111,110, 86,105,101,119, 51, 68,  0, 82,
+101,110,100,101,114, 73,110,102,111,  0, 82,101,110,100,101,114, 69,110,103,105,110,101,  0, 86,105,101,119, 68,101,112,116,104,
+115,  0, 83,109,111,111,116,104, 86,105,101,119, 83,116,111,114,101,  0,119,109, 84,105,109,101,114,  0, 86,105,101,119, 51, 68,
+  0, 83,112, 97, 99,101, 76,105,110,107,  0, 86,105,101,119, 50, 68,  0, 83,112, 97, 99,101, 73,110,102,111,  0, 83,112, 97, 99,
+101, 66,117,116,115,  0, 83,112, 97, 99,101, 79,111,112,115,  0, 84,114,101,101, 83,116,111,114,101,  0, 84,114,101,101, 83,116,
+111,114,101, 69,108,101,109,  0, 83,112, 97, 99,101, 73,112,111,  0, 98, 68,111,112,101, 83,104,101,101,116,  0, 83,112, 97, 99,
+101, 78,108, 97,  0, 83,112, 97, 99,101, 84,105,109,101, 67, 97, 99,104,101,  0, 83,112, 97, 99,101, 84,105,109,101,  0, 83,112,
+ 97, 99,101, 83,101,113,  0, 70,105,108,101, 83,101,108,101, 99,116, 80, 97,114, 97,109,115,  0, 83,112, 97, 99,101, 70,105,108,
+101,  0, 70,105,108,101, 76,105,115,116,  0,119,109, 79,112,101,114, 97,116,111,114,  0, 70,105,108,101, 76, 97,121,111,117,116,
+  0, 83,112, 97, 99,101, 73,109, 97,103,101,  0, 83, 99,111,112,101,115,  0, 72,105,115,116,111,103,114, 97,109,  0, 83,112, 97,
+ 99,101, 84,101,120,116,  0, 83, 99,114,105,112,116,  0, 83,112, 97, 99,101, 83, 99,114,105,112,116,  0, 83,112, 97, 99,101, 78,
+111,100,101,  0, 83,112, 97, 99,101, 76,111,103,105, 99,  0, 67,111,110,115,111,108,101, 76,105,110,101,  0, 83,112, 97, 99,101,
+ 67,111,110,115,111,108,101,  0, 83,112, 97, 99,101, 85,115,101,114, 80,114,101,102,  0, 83,112, 97, 99,101, 67,108,105,112,  0,
+ 77,111,118,105,101, 67,108,105,112, 83, 99,111,112,101,115,  0,117,105, 70,111,110,116,  0,117,105, 70,111,110,116, 83,116,121,
+108,101,  0,117,105, 83,116,121,108,101,  0,117,105, 87,105,100,103,101,116, 67,111,108,111,114,115,  0,117,105, 87,105,100,103,
+101,116, 83,116, 97,116,101, 67,111,108,111,114,115,  0,117,105, 80, 97,110,101,108, 67,111,108,111,114,115,  0, 84,104,101,109,
+101, 85, 73,  0, 84,104,101,109,101, 83,112, 97, 99,101,  0, 84,104,101,109,101, 87,105,114,101, 67,111,108,111,114,  0, 98, 84,
+104,101,109,101,  0, 98, 65,100,100,111,110,  0, 83,111,108,105,100, 76,105,103,104,116,  0, 85,115,101,114, 68,101,102,  0, 98,
+ 83, 99,114,101,101,110,  0, 83, 99,114, 86,101,114,116,  0, 83, 99,114, 69,100,103,101,  0, 80, 97,110,101,108,  0, 80, 97,110,
+101,108, 84,121,112,101,  0,117,105, 76, 97,121,111,117,116,  0, 83, 99,114, 65,114,101, 97,  0, 83,112, 97, 99,101, 84,121,112,
+101,  0, 65, 82,101,103,105,111,110,  0, 65, 82,101,103,105,111,110, 84,121,112,101,  0, 70,105,108,101, 71,108,111, 98, 97,108,
+  0, 83,116,114,105,112, 69,108,101,109,  0, 83,116,114,105,112, 67,114,111,112,  0, 83,116,114,105,112, 84,114, 97,110,115,102,
+111,114,109,  0, 83,116,114,105,112, 67,111,108,111,114, 66, 97,108, 97,110, 99,101,  0, 83,116,114,105,112, 80,114,111,120,121,
+  0, 83,116,114,105,112,  0, 83,101,113,117,101,110, 99,101,  0, 98, 83,111,117,110,100,  0, 77,101,116, 97, 83,116, 97, 99,107,
+  0, 87,105,112,101, 86, 97,114,115,  0, 71,108,111,119, 86, 97,114,115,  0, 84,114, 97,110,115,102,111,114,109, 86, 97,114,115,
+  0, 83,111,108,105,100, 67,111,108,111,114, 86, 97,114,115,  0, 83,112,101,101,100, 67,111,110,116,114,111,108, 86, 97,114,115,
+  0, 69,102,102,101, 99,116,  0, 66,117,105,108,100, 69,102,102,  0, 80, 97,114,116, 69,102,102,  0, 80, 97,114,116,105, 99,108,
+101,  0, 87, 97,118,101, 69,102,102,  0, 98, 80,114,111,112,101,114,116,121,  0, 98, 78,101, 97,114, 83,101,110,115,111,114,  0,
+ 98, 77,111,117,115,101, 83,101,110,115,111,114,  0, 98, 84,111,117, 99,104, 83,101,110,115,111,114,  0, 98, 75,101,121, 98,111,
+ 97,114,100, 83,101,110,115,111,114,  0, 98, 80,114,111,112,101,114,116,121, 83,101,110,115,111,114,  0, 98, 65, 99,116,117, 97,
+116,111,114, 83,101,110,115,111,114,  0, 98, 68,101,108, 97,121, 83,101,110,115,111,114,  0, 98, 67,111,108,108,105,115,105,111,
+110, 83,101,110,115,111,114,  0, 98, 82, 97,100, 97,114, 83,101,110,115,111,114,  0, 98, 82, 97,110,100,111,109, 83,101,110,115,
+111,114,  0, 98, 82, 97,121, 83,101,110,115,111,114,  0, 98, 65,114,109, 97,116,117,114,101, 83,101,110,115,111,114,  0, 98, 77,
+101,115,115, 97,103,101, 83,101,110,115,111,114,  0, 98, 83,101,110,115,111,114,  0, 98, 67,111,110,116,114,111,108,108,101,114,
+  0, 98, 74,111,121,115,116,105, 99,107, 83,101,110,115,111,114,  0, 98, 69,120,112,114,101,115,115,105,111,110, 67,111,110,116,
+  0, 98, 80,121,116,104,111,110, 67,111,110,116,  0, 98, 65, 99,116,117, 97,116,111,114,  0, 98, 65,100,100, 79, 98,106,101, 99,
+116, 65, 99,116,117, 97,116,111,114,  0, 98, 65, 99,116,105,111,110, 65, 99,116,117, 97,116,111,114,  0, 83,111,117,110,100, 51,
+ 68,  0, 98, 83,111,117,110,100, 65, 99,116,117, 97,116,111,114,  0, 98, 69,100,105,116, 79, 98,106,101, 99,116, 65, 99,116,117,
+ 97,116,111,114,  0, 98, 83, 99,101,110,101, 65, 99,116,117, 97,116,111,114,  0, 98, 80,114,111,112,101,114,116,121, 65, 99,116,
+117, 97,116,111,114,  0, 98, 79, 98,106,101, 99,116, 65, 99,116,117, 97,116,111,114,  0, 98, 73,112,111, 65, 99,116,117, 97,116,
+111,114,  0, 98, 67, 97,109,101,114, 97, 65, 99,116,117, 97,116,111,114,  0, 98, 67,111,110,115,116,114, 97,105,110,116, 65, 99,
+116,117, 97,116,111,114,  0, 98, 71,114,111,117,112, 65, 99,116,117, 97,116,111,114,  0, 98, 82, 97,110,100,111,109, 65, 99,116,
+117, 97,116,111,114,  0, 98, 77,101,115,115, 97,103,101, 65, 99,116,117, 97,116,111,114,  0, 98, 71, 97,109,101, 65, 99,116,117,
+ 97,116,111,114,  0, 98, 86,105,115,105, 98,105,108,105,116,121, 65, 99,116,117, 97,116,111,114,  0, 98, 84,119,111, 68, 70,105,
+108,116,101,114, 65, 99,116,117, 97,116,111,114,  0, 98, 80, 97,114,101,110,116, 65, 99,116,117, 97,116,111,114,  0, 98, 83,116,
+ 97,116,101, 65, 99,116,117, 97,116,111,114,  0, 98, 65,114,109, 97,116,117,114,101, 65, 99,116,117, 97,116,111,114,  0, 98, 83,
+116,101,101,114,105,110,103, 65, 99,116,117, 97,116,111,114,  0, 71,114,111,117,112, 79, 98,106,101, 99,116,  0, 66,111,110,101,
+  0, 98, 65,114,109, 97,116,117,114,101,  0, 98, 77,111,116,105,111,110, 80, 97,116,104, 86,101,114,116,  0, 98, 80,111,115,101,
+ 67,104, 97,110,110,101,108,  0, 98, 73, 75, 80, 97,114, 97,109,  0, 98, 73,116, 97,115, 99,  0, 98, 65, 99,116,105,111,110, 71,
+114,111,117,112,  0, 83,112, 97, 99,101, 65, 99,116,105,111,110,  0, 98, 65, 99,116,105,111,110, 67,104, 97,110,110,101,108,  0,
+ 98, 67,111,110,115,116,114, 97,105,110,116, 67,104, 97,110,110,101,108,  0, 98, 67,111,110,115,116,114, 97,105,110,116,  0, 98,
+ 67,111,110,115,116,114, 97,105,110,116, 84, 97,114,103,101,116,  0, 98, 80,121,116,104,111,110, 67,111,110,115,116,114, 97,105,
+110,116,  0, 98, 75,105,110,101,109, 97,116,105, 99, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 83,112,108,105,110,101, 73,
+ 75, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 84,114, 97, 99,107, 84,111, 67,111,110,115,116,114, 97,105,110,116,  0, 98,
+ 82,111,116, 97,116,101, 76,105,107,101, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 76,111, 99, 97,116,101, 76,105,107,101,
+ 67,111,110,115,116,114, 97,105,110,116,  0, 98, 83,105,122,101, 76,105,107,101, 67,111,110,115,116,114, 97,105,110,116,  0, 98,
+ 83, 97,109,101, 86,111,108,117,109,101, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 84,114, 97,110,115, 76,105,107,101, 67,
+111,110,115,116,114, 97,105,110,116,  0, 98, 77,105,110, 77, 97,120, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 65, 99,116,
+105,111,110, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 76,111, 99,107, 84,114, 97, 99,107, 67,111,110,115,116,114, 97,105,
+110,116,  0, 98, 68, 97,109,112, 84,114, 97, 99,107, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 70,111,108,108,111,119, 80,
+ 97,116,104, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 83,116,114,101,116, 99,104, 84,111, 67,111,110,115,116,114, 97,105,
+110,116,  0, 98, 82,105,103,105,100, 66,111,100,121, 74,111,105,110,116, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 67,108,
+ 97,109,112, 84,111, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 67,104,105,108,100, 79,102, 67,111,110,115,116,114, 97,105,
+110,116,  0, 98, 84,114, 97,110,115,102,111,114,109, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 80,105,118,111,116, 67,111,
+110,115,116,114, 97,105,110,116,  0, 98, 76,111, 99, 76,105,109,105,116, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 82,111,
+116, 76,105,109,105,116, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 83,105,122,101, 76,105,109,105,116, 67,111,110,115,116,
+114, 97,105,110,116,  0, 98, 68,105,115,116, 76,105,109,105,116, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 83,104,114,105,
+110,107,119,114, 97,112, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 70,111,108,108,111,119, 84,114, 97, 99,107, 67,111,110,
+115,116,114, 97,105,110,116,  0, 98, 67, 97,109,101,114, 97, 83,111,108,118,101,114, 67,111,110,115,116,114, 97,105,110,116,  0,
+ 98, 79, 98,106,101, 99,116, 83,111,108,118,101,114, 67,111,110,115,116,114, 97,105,110,116,  0, 98, 65, 99,116,105,111,110, 77,
+111,100,105,102,105,101,114,  0, 98, 65, 99,116,105,111,110, 83,116,114,105,112,  0, 98, 78,111,100,101, 83,116, 97, 99,107,  0,
+ 98, 78,111,100,101, 83,111, 99,107,101,116,  0, 98, 78,111,100,101, 76,105,110,107,  0, 98, 78,111,100,101, 80,114,101,118,105,
+101,119,  0, 98, 78,111,100,101,  0,117,105, 66,108,111, 99,107,  0, 98, 78,111,100,101, 84,121,112,101,  0, 98, 78,111,100,101,
+ 84,114,101,101, 69,120,101, 99,  0, 98, 78,111,100,101, 83,111, 99,107,101,116, 86, 97,108,117,101, 73,110,116,  0, 98, 78,111,
+100,101, 83,111, 99,107,101,116, 86, 97,108,117,101, 70,108,111, 97,116,  0, 98, 78,111,100,101, 83,111, 99,107,101,116, 86, 97,
+108,117,101, 66,111,111,108,101, 97,110,  0, 98, 78,111,100,101, 83,111, 99,107,101,116, 86, 97,108,117,101, 86,101, 99,116,111,
+114,  0, 98, 78,111,100,101, 83,111, 99,107,101,116, 86, 97,108,117,101, 82, 71, 66, 65,  0, 78,111,100,101, 70,114, 97,109,101,
+  0, 78,111,100,101, 73,109, 97,103,101, 65,110,105,109,  0, 67,111,108,111,114, 67,111,114,114,101, 99,116,105,111,110, 68, 97,
+116, 97,  0, 78,111,100,101, 67,111,108,111,114, 67,111,114,114,101, 99,116,105,111,110,  0, 78,111,100,101, 66,111,107,101,104,
+ 73,109, 97,103,101,  0, 78,111,100,101, 66,111,120, 77, 97,115,107,  0, 78,111,100,101, 69,108,108,105,112,115,101, 77, 97,115,
+107,  0, 78,111,100,101, 73,109, 97,103,101, 76, 97,121,101,114,  0, 78,111,100,101, 66,108,117,114, 68, 97,116, 97,  0, 78,111,
+100,101, 68, 66,108,117,114, 68, 97,116, 97,  0, 78,111,100,101, 66,105,108, 97,116,101,114, 97,108, 66,108,117,114, 68, 97,116,
+ 97,  0, 78,111,100,101, 72,117,101, 83, 97,116,  0, 78,111,100,101, 73,109, 97,103,101, 70,105,108,101,  0, 78,111,100,101, 73,
+109, 97,103,101, 77,117,108,116,105, 70,105,108,101,  0, 78,111,100,101, 73,109, 97,103,101, 77,117,108,116,105, 70,105,108,101,
+ 83,111, 99,107,101,116,  0, 78,111,100,101, 67,104,114,111,109, 97,  0, 78,111,100,101, 84,119,111, 88, 89,115,  0, 78,111,100,
+101, 84,119,111, 70,108,111, 97,116,115,  0, 78,111,100,101, 71,101,111,109,101,116,114,121,  0, 78,111,100,101, 86,101,114,116,
+101,120, 67,111,108,  0, 78,111,100,101, 68,101,102,111, 99,117,115,  0, 78,111,100,101, 83, 99,114,105,112,116, 68,105, 99,116,
+  0, 78,111,100,101, 71,108, 97,114,101,  0, 78,111,100,101, 84,111,110,101,109, 97,112,  0, 78,111,100,101, 76,101,110,115, 68,
+105,115,116,  0, 78,111,100,101, 67,111,108,111,114, 66, 97,108, 97,110, 99,101,  0, 78,111,100,101, 67,111,108,111,114,115,112,
+105,108,108,  0, 78,111,100,101, 84,101,120, 66, 97,115,101,  0, 78,111,100,101, 84,101,120, 83,107,121,  0, 78,111,100,101, 84,
+101,120, 73,109, 97,103,101,  0, 78,111,100,101, 84,101,120, 67,104,101, 99,107,101,114,  0, 78,111,100,101, 84,101,120, 69,110,
+118,105,114,111,110,109,101,110,116,  0, 78,111,100,101, 84,101,120, 71,114, 97,100,105,101,110,116,  0, 78,111,100,101, 84,101,
+120, 78,111,105,115,101,  0, 78,111,100,101, 84,101,120, 86,111,114,111,110,111,105,  0, 78,111,100,101, 84,101,120, 77,117,115,
+103,114, 97,118,101,  0, 78,111,100,101, 84,101,120, 87, 97,118,101,  0, 78,111,100,101, 84,101,120, 77, 97,103,105, 99,  0, 78,
+111,100,101, 83,104, 97,100,101,114, 65,116,116,114,105, 98,117,116,101,  0, 84,101,120, 78,111,100,101, 79,117,116,112,117,116,
+  0, 67,117,114,118,101, 77, 97,112, 80,111,105,110,116,  0, 67,117,114,118,101, 77, 97,112,  0, 66,114,117,115,104, 67,108,111,
+110,101,  0, 67,117,115,116,111,109, 68, 97,116, 97, 76, 97,121,101,114,  0, 67,117,115,116,111,109, 68, 97,116, 97, 69,120,116,
+101,114,110, 97,108,  0, 72, 97,105,114, 75,101,121,  0, 80, 97,114,116,105, 99,108,101, 75,101,121,  0, 66,111,105,100, 80, 97,
+114,116,105, 99,108,101,  0, 66,111,105,100, 68, 97,116, 97,  0, 80, 97,114,116,105, 99,108,101, 83,112,114,105,110,103,  0, 67,
+104,105,108,100, 80, 97,114,116,105, 99,108,101,  0, 80, 97,114,116,105, 99,108,101, 84, 97,114,103,101,116,  0, 80, 97,114,116,
+105, 99,108,101, 68,117,112,108,105, 87,101,105,103,104,116,  0, 80, 97,114,116,105, 99,108,101, 68, 97,116, 97,  0, 83, 80, 72,
+ 70,108,117,105,100, 83,101,116,116,105,110,103,115,  0, 80, 97,114,116,105, 99,108,101, 83,101,116,116,105,110,103,115,  0, 66,
+111,105,100, 83,101,116,116,105,110,103,115,  0, 80, 97,114,116,105, 99,108,101, 67, 97, 99,104,101, 75,101,121,  0, 75, 68, 84,
+114,101,101,  0, 80, 97,114,116,105, 99,108,101, 68,114, 97,119, 68, 97,116, 97,  0, 76,105,110,107, 78,111,100,101,  0, 98, 71,
+ 80, 68,115,112,111,105,110,116,  0, 98, 71, 80, 68,115,116,114,111,107,101,  0, 98, 71, 80, 68,102,114, 97,109,101,  0, 98, 71,
+ 80, 68,108, 97,121,101,114,  0, 82,101,112,111,114,116, 76,105,115,116,  0,119,109, 87,105,110,100,111,119, 77, 97,110, 97,103,
+101,114,  0,119,109, 87,105,110,100,111,119,  0,119,109, 75,101,121, 67,111,110,102,105,103,  0,119,109, 69,118,101,110,116,  0,
+119,109, 83,117, 98, 87,105,110,100,111,119,  0,119,109, 71,101,115,116,117,114,101,  0,119,109, 75,101,121, 77, 97,112, 73,116,
+101,109,  0, 80,111,105,110,116,101,114, 82, 78, 65,  0,119,109, 75,101,121, 77, 97,112, 68,105,102,102, 73,116,101,109,  0,119,
+109, 75,101,121, 77, 97,112,  0,119,109, 79,112,101,114, 97,116,111,114, 84,121,112,101,  0, 70, 77,111,100,105,102,105,101,114,
+  0, 70, 77,111,100, 95, 71,101,110,101,114, 97,116,111,114,  0, 70, 77,111,100, 95, 70,117,110, 99,116,105,111,110, 71,101,110,
+101,114, 97,116,111,114,  0, 70, 67, 77, 95, 69,110,118,101,108,111,112,101, 68, 97,116, 97,  0, 70, 77,111,100, 95, 69,110,118,
+101,108,111,112,101,  0, 70, 77,111,100, 95, 67,121, 99,108,101,115,  0, 70, 77,111,100, 95, 80,121,116,104,111,110,  0, 70, 77,
+111,100, 95, 76,105,109,105,116,115,  0, 70, 77,111,100, 95, 78,111,105,115,101,  0, 70, 77,111,100, 95, 83,116,101,112,112,101,
+100,  0, 68,114,105,118,101,114, 84, 97,114,103,101,116,  0, 68,114,105,118,101,114, 86, 97,114,  0, 67,104, 97,110,110,101,108,
+ 68,114,105,118,101,114,  0, 70, 80,111,105,110,116,  0, 70, 67,117,114,118,101,  0, 65,110,105,109, 77, 97,112, 80, 97,105,114,
+  0, 65,110,105,109, 77, 97,112,112,101,114,  0, 78,108, 97, 83,116,114,105,112,  0, 78,108, 97, 84,114, 97, 99,107,  0, 75, 83,
+ 95, 80, 97,116,104,  0, 75,101,121,105,110,103, 83,101,116,  0, 65,110,105,109, 79,118,101,114,114,105,100,101,  0, 73,100, 65,
+100,116, 84,101,109,112,108, 97,116,101,  0, 66,111,105,100, 82,117,108,101,  0, 66,111,105,100, 82,117,108,101, 71,111, 97,108,
+ 65,118,111,105,100,  0, 66,111,105,100, 82,117,108,101, 65,118,111,105,100, 67,111,108,108,105,115,105,111,110,  0, 66,111,105,
+100, 82,117,108,101, 70,111,108,108,111,119, 76,101, 97,100,101,114,  0, 66,111,105,100, 82,117,108,101, 65,118,101,114, 97,103,
+101, 83,112,101,101,100,  0, 66,111,105,100, 82,117,108,101, 70,105,103,104,116,  0, 66,111,105,100, 83,116, 97,116,101,  0, 70,
+ 76, 85, 73, 68, 95, 51, 68,  0, 87, 84, 85, 82, 66, 85, 76, 69, 78, 67, 69,  0, 83,112,101, 97,107,101,114,  0, 77,111,118,105,
+101, 67,108,105,112, 80,114,111,120,121,  0, 77,111,118,105,101, 67,108,105,112, 67, 97, 99,104,101,  0, 77,111,118,105,101, 84,
+114, 97, 99,107,105,110,103,  0, 77,111,118,105,101, 84,114, 97, 99,107,105,110,103, 84,114, 97, 99,107,  0, 77,111,118,105,101,
+ 84,114, 97, 99,107,105,110,103, 77, 97,114,107,101,114,  0, 77,111,118,105,101, 82,101, 99,111,110,115,116,114,117, 99,116,101,
+100, 67, 97,109,101,114, 97,  0, 77,111,118,105,101, 84,114, 97, 99,107,105,110,103, 67, 97,109,101,114, 97,  0, 77,111,118,105,
+101, 84,114, 97, 99,107,105,110,103, 83,101,116,116,105,110,103,115,  0, 77,111,118,105,101, 84,114, 97, 99,107,105,110,103, 83,
+116, 97, 98,105,108,105,122, 97,116,105,111,110,  0, 77,111,118,105,101, 84,114, 97, 99,107,105,110,103, 82,101, 99,111,110,115,
+116,114,117, 99,116,105,111,110,  0, 77,111,118,105,101, 84,114, 97, 99,107,105,110,103, 79, 98,106,101, 99,116,  0, 77,111,118,
+105,101, 84,114, 97, 99,107,105,110,103, 83,116, 97,116,115,  0, 77,111,118,105,101, 84,114, 97, 99,107,105,110,103, 68,111,112,
+101,115,104,101,101,116, 67,104, 97,110,110,101,108,  0, 77,111,118,105,101, 84,114, 97, 99,107,105,110,103, 68,111,112,101,115,
+104,101,101,116,  0, 68,121,110, 97,109,105, 99, 80, 97,105,110,116, 83,117,114,102, 97, 99,101,  0, 80, 97,105,110,116, 83,117,
+114,102, 97, 99,101, 68, 97,116, 97,  0,  0,  0, 84, 76, 69, 78,  1,  0,  1,  0,  2,  0,  2,  0,  4,  0,  4,  0,  4,  0,  4,  0,
+  8,  0,  8,  0,  8,  0,  0,  0, 16,  0, 24,  0, 16,  0,  4,  0,  8,  0, 12,  0, 16,  0, 16,  0, 32,  0,128,  0,120,  0,144,  8,
+  0,  0, 40,  0,144,  0,128,  5,112,  0, 36,  0, 56,  0,160,  0,192,  0,224,  0, 96,  0, 40,  0, 48,  0,224,  0, 16,  0,200,  0,
+ 40,  0,232, 11, 48,  5,  0,  0,  0,  0,  0,  0, 56,  1,160,  1, 24,  0,  8,  3,200,  0,  0,  0,104,  0, 64,  1, 56,  4, 80,  0,
+ 32,  1,144,  0, 56,  3, 16,  2, 88,  0, 16,  0,128,  3,152,  0,136,  4,  0,  0,104,  0,104,  0,  0,  1, 80,  0,  8,  0, 16,  0,
+ 32,  0,  0,  0, 16,  2,  0,  0,  0,  0,  0,  0, 16,  5,  8,  0, 12,  0, 16,  0,  8,  0, 12,  0,  4,  0, 20,  0, 48,  0, 64,  0,
+ 20,  0, 12,  0, 16,  0,  4,  0,  8,  0,  0,  0,184,  0,160,  1,  8,  0,  4,  0,  4,  0,  0,  1, 32,  0,  8,  0, 24,  0, 16,  0,
+ 64,  0, 24,  0, 12,  0, 64,  0,  4,  0, 16,  0, 16,  0,112,  0,200,  0,136,  0,192,  0,192,  0,128,  0,192,  0,192,  0,128,  0,
+120,  0,200,  0,120,  0,144,  0, 16,  1, 56,  0,200,  0, 24,  1, 40,  1,120,  0,184,  0,200,  0, 64,  1,200,  0, 88,  1,112,  0,
+168,  0,  0,  0,152,  0, 48,  0, 40,  5,192,  0,  0,  0,152,  0,  0,  0,  0,  0,128,  0,  8,  0,  8,  0,112,  1,144,  0,152,  2,
+136,  0,192,  0,120,  0,128,  0,224,  4,208,  0,200,  0,112,  0,208,  0,144,  0, 16,  5,  0,  0,  0,  0, 48,  1,104,  1,160,  1,
+104,  1,136,  0,104,  0,112,  0,128,  0,120,  0, 16,  0, 96,  1, 88,  0,  0,  0,200,  0,216,  0,152,  0, 48,  0, 24,  0,120,  0,
+152,  0,216,  1,  0,  1,184,  0,  0,  0, 72,  0, 32,  0,176,  0,  0,  0, 16,  0,  0,  0,  0,  0,  0,  0, 12,  0, 24,  2, 40,  0,
+184,  0,152,  0, 64,  0, 72,  0, 32,  0,128,  0, 24,  0, 56,  9, 64,  0, 24,  0, 16,  0, 56,  0,184,  0, 96,  0, 32,  0, 96,  6,
+ 56,  0, 16,  0,168,  0,104,  0, 32,  0, 64,  0,120,  0, 24,  0,248,  1, 32,  0,  8,  0, 24,  0, 80,  8,  0,  0,  0,  0,224,  8,
+104,  0,  8,  0,112,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 96,  1, 56,  0,144,  0, 64,  0,248,  0, 24,  1, 16,  0, 16,  0,
+240,  0,112,  0,216,  0, 24,  0,208,  0,240,  0,160,  7,104,  0,  0,  0,168,  0,  0,  0, 40, 33,128, 16, 24, 16,160,  2,168,  5,
+ 64,  0, 48,  1, 72,  0, 40,  0,136,  1,104,  0, 56,  1, 56,  0, 24,  4, 32,  0,232,  0, 32,  0, 32,  0,  8,  0, 80,  3,232,  1,
+ 16,  0, 48, 37, 80,  0, 56,  0,112, 32,  8,  1, 32,  0, 40,  0, 88,  1,  0,  0,  0,  0,160,  0,  0,  0, 40,  1,  0,  0, 48,  4,
+  8,  1, 16,  0,  8,  0, 44,  0, 16,  4, 72,  3, 72,  1,208,  4, 32,  0, 12,  0, 24,  0, 32,  0, 16,  0, 24,  0, 24,  0, 32,  0,
+136,  1,  0,  0, 64,  0, 96,  0, 80,  0,  8,  0, 80,  0,136,  0,200,  0, 72,  0,  8,  0,136,  0, 76,  0, 72,  0,204,  0,136,  0,
+136,  0,128,  0,136,  0, 92,  0,128,  0, 80,  0,112,  0, 16,  0,168,  0, 32,  0, 72,  0,120,  0, 24,  0,144,  0,112,  0,148,  0,
+ 32,  0,128,  0, 88,  0, 88,  0,208,  0,140,  0,  4,  0, 24,  0, 16,  0,  8,  0,160,  0, 48,  0, 40,  0, 72,  1,  0,  1, 16,  0,
+ 32,  2,  4,  0, 40,  0,120,  0, 72,  1,120,  0, 56,  0,120,  0,160,  0,112,  0,184,  0, 24,  0, 88,  0, 80,  0, 80,  0, 80,  0,
+  8,  0, 72,  0,104,  0,104,  0, 80,  0, 80,  0, 24,  0, 88,  0,104,  0, 16,  0,144,  0,128,  0, 88,  0, 28,  0, 28,  0, 28,  0,
+ 88,  0, 24,  0,160,  0, 16,  0,152,  0, 72,  0,168,  0, 48,  0,208,  0, 56,  0, 16,  0,112,  1,  0,  0,  0,  0,  0,  0, 16,  0,
+ 16,  0,  4,  0, 24,  0, 16,  0,  4,  0, 16,  0, 24,  0,104,  0, 20,  0, 24,  0, 24,  0,  8,  0, 40,  0, 28,  0, 12,  0, 12,  0,
+ 32,  4, 40,  4, 64,  4, 44,  0, 24,  0,  8,  0,128,  0, 64,  0, 32,  0, 16,  0, 32,  0, 32,  0,  8,  0, 96,  0, 20,  0,200,  3,
+216,  3,208,  3,200,  3,208,  3,208,  3,200,  3,208,  3,208,  3,208,  3,208,  3, 64,  0, 64,  0, 12,  0, 56,  0, 24,  0,104,  0,
+  0,  4, 24,  0, 56,  0, 56,  0, 20,  0, 16,  0, 64,  0, 40,  0, 32,  0,192,  0, 60,  0, 16,  3,104,  0,  0,  0,  0,  0,  0,  0,
+  0,  0, 16,  0, 32,  0, 40,  0,192,  0, 40,  0, 88,  1,  0,  1,168,  0,  0,  0,  0,  0,  0,  0,184,  0,  0,  0, 32,  0,136,  0,
+  0,  0,120,  0, 24,  0, 24,  0, 16,  0, 24,  0,  8,  0, 16,  0, 24,  0, 20,  0, 20,  0, 56,  0, 24,  2, 40,  1, 16,  0,104,  0,
+  0,  1, 40,  0,208,  0,104,  0,112,  0,216,  1, 32,  0,128,  0, 56,  0, 80,  0, 64,  0,104,  0, 72,  0, 64,  0,128,  0,  0,  0,
+  0,  0,184,  0,  8,  3,  0,  0, 24,  1,192,  0, 16,  0, 72,  0, 48,  0, 64,  0, 56,  0, 24,  0,128,  0,  0,  1, 48,  0, 32,  0,
+ 16,  6,  0,  0, 83, 84, 82, 67,217,  1,  0,  0, 12,  0,  2,  0, 12,  0,  0,  0, 12,  0,  1,  0, 13,  0,  3,  0, 13,  0,  0,  0,
+ 13,  0,  1,  0, 11,  0,  2,  0, 14,  0,  2,  0, 11,  0,  3,  0, 11,  0,  4,  0, 15,  0,  2,  0,  2,  0,  5,  0,  2,  0,  6,  0,
+ 16,  0,  2,  0,  7,  0,  5,  0,  7,  0,  6,  0, 17,  0,  3,  0,  7,  0,  5,  0,  7,  0,  6,  0,  7,  0,  7,  0, 18,  0,  4,  0,
+  4,  0,  8,  0,  4,  0,  9,  0,  4,  0, 10,  0,  4,  0, 11,  0, 19,  0,  4,  0,  7,  0,  8,  0,  7,  0,  9,  0,  7,  0, 10,  0,
+  7,  0, 11,  0, 20,  0,  4,  0, 11,  0, 12,  0, 14,  0, 13,  0,  4,  0, 14,  0,  4,  0, 15,  0, 21,  0, 10,  0, 21,  0,  0,  0,
+ 21,  0,  1,  0,  0,  0, 16,  0,  0,  0, 17,  0,  2,  0, 18,  0,  0,  0, 19,  0,  4,  0, 20,  0, 20,  0, 21,  0,  4,  0, 22,  0,
+  4,  0, 23,  0, 22,  0, 11,  0, 11,  0,  0,  0, 11,  0,  1,  0, 22,  0, 24,  0, 23,  0, 25,  0,  0,  0, 26,  0,  2,  0, 27,  0,
+  2,  0, 28,  0,  2,  0, 18,  0,  4,  0, 29,  0,  4,  0, 30,  0, 21,  0, 31,  0, 23,  0,  6,  0, 22,  0, 32,  0, 22,  0, 33,  0,
+ 24,  0, 34,  0,  0,  0, 35,  0,  0,  0, 36,  0, 23,  0, 37,  0, 25,  0,  5,  0,  4,  0, 38,  0,  4,  0, 39,  0,  2,  0, 40,  0,
+  2,  0, 41,  0,  4,  0, 42,  0, 26,  0,  6,  0, 27,  0, 43,  0,  2,  0, 44,  0,  2,  0, 45,  0,  2,  0, 16,  0,  2,  0, 18,  0,
+  0,  0, 46,  0, 28,  0, 21,  0, 28,  0,  0,  0, 28,  0,  1,  0, 29,  0, 47,  0, 30,  0, 48,  0, 19,  0, 49,  0, 19,  0, 50,  0,
+  2,  0, 44,  0,  2,  0, 45,  0,  2,  0, 51,  0,  2,  0, 52,  0,  2,  0, 53,  0,  2,  0, 54,  0,  2,  0, 18,  0,  2,  0, 55,  0,
+  7,  0, 10,  0,  7,  0, 11,  0,  4,  0, 56,  0,  7,  0, 57,  0,  7,  0, 58,  0,  7,  0, 59,  0, 26,  0, 60,  0, 31,  0,  7,  0,
+ 22,  0, 32,  0, 14,  0, 61,  0, 19,  0, 62,  0,  2,  0, 44,  0,  2,  0, 63,  0,  2,  0, 64,  0,  2,  0, 27,  0, 32,  0, 16,  0,
+ 32,  0,  0,  0, 32,  0,  1,  0,  7,  0, 65,  0,  7,  0, 59,  0,  2,  0, 16,  0,  2,  0, 66,  0,  2,  0, 67,  0,  2,  0, 18,  0,
+  4,  0, 68,  0,  4,  0, 69,  0, 11,  0,  2,  0,  7,  0, 70,  0,  0,  0, 19,  0,  0,  0, 71,  0,  7,  0, 72,  0,  7,  0, 73,  0,
+ 33,  0, 15,  0, 22,  0, 32,  0, 34,  0, 74,  0, 32,  0, 75,  0,  0,  0, 76,  0,  4,  0, 77,  0,  4,  0, 27,  0, 14,  0, 78,  0,
+ 31,  0, 79,  0, 22,  0, 80,  0,  2,  0, 16,  0,  2,  0, 81,  0,  2,  0, 82,  0,  2,  0, 18,  0,  7,  0, 83,  0,  4,  0, 84,  0,
+ 35,  0,  6,  0, 35,  0,  0,  0, 35,  0,  1,  0,  0,  0, 85,  0,  0,  0, 86,  0,  4,  0, 22,  0,  4,  0, 87,  0, 36,  0, 10,  0,
+ 36,  0,  0,  0, 36,  0,  1,  0,  4,  0, 88,  0,  4,  0, 89,  0,  4,  0, 90,  0,  4,  0, 66,  0,  4,  0, 13,  0,  4,  0, 91,  0,
+  0,  0, 92,  0,  0,  0, 93,  0, 37,  0, 15,  0, 22,  0, 32,  0,  0,  0, 94,  0,  4,  0, 91,  0,  4,  0, 95,  0, 14,  0, 96,  0,
+ 35,  0, 97,  0, 35,  0, 98,  0,  4,  0, 99,  0,  4,  0,100,  0, 14,  0,101,  0,  0,  0,102,  0,  4,  0,103,  0,  4,  0,104,  0,
+ 11,  0,105,  0,  8,  0,106,  0, 38,  0,  3,  0,  4,  0,107,  0,  4,  0,108,  0, 11,  0,  2,  0, 39,  0, 20,  0, 22,  0, 32,  0,
+ 34,  0, 74,  0,  0,  0, 16,  0,  0,  0,109,  0,  2,  0, 18,  0,  7,  0,110,  0,  7,  0,111,  0,  7,  0,112,  0,  7,  0,113,  0,
+  7,  0,114,  0,  7,  0,115,  0,  7,  0,116,  0,  7,  0,117,  0,  7,  0,118,  0,  7,  0,119,  0,  7,  0,120,  0, 31,  0, 79,  0,
+ 27,  0,121,  0,  0,  0,122,  0,  0,  0,123,  0, 40,  0, 14,  0, 41,  0,124,  0,  4,  0,125,  0,  4,  0,126,  0,  4,  0,127,  0,
+  4,  0,128,  0,  0,  0,129,  0,  0,  0,130,  0,  0,  0,131,  0,  0,  0, 27,  0,  2,  0,132,  0,  2,  0,133,  0,  2,  0,134,  0,
+  2,  0, 18,  0,  4,  0, 30,  0, 42,  0, 33,  0, 22,  0, 32,  0,  0,  0, 35,  0, 14,  0,135,  0, 43,  0,136,  0, 44,  0,137,  0,
+ 45,  0,138,  0, 45,  0,139,  0,  2,  0,140,  0,  2,  0,141,  0,  2,  0,131,  0,  2,  0, 18,  0,  2,  0,142,  0,  2,  0, 16,  0,
+  4,  0,143,  0,  2,  0,144,  0,  2,  0,145,  0,  2,  0,146,  0,  2,  0,147,  0,  2,  0,148,  0,  2,  0,149,  0,  4,  0,150,  0,
+  4,  0,151,  0, 38,  0,152,  0, 25,  0,153,  0,  7,  0,154,  0,  4,  0,155,  0,  2,  0,156,  0,  2,  0,157,  0,  2,  0,158,  0,
+  0,  0,159,  0,  0,  0,160,  0,  7,  0,161,  0,  7,  0,162,  0, 46,  0, 65,  0,  2,  0,163,  0,  2,  0,164,  0,  2,  0,165,  0,
+  2,  0,166,  0, 27,  0,167,  0, 47,  0,168,  0,  0,  0,169,  0,  0,  0,170,  0,  0,  0,171,  0,  0,  0,172,  0,  0,  0,173,  0,
+  7,  0,174,  0,  7,  0,175,  0,  7,  0,176,  0,  2,  0,177,  0,  2,  0,178,  0,  2,  0,179,  0,  2,  0,180,  0,  2,  0,181,  0,
+  2,  0,182,  0,  0,  0,183,  0,  0,  0,123,  0,  7,  0,184,  0,  7,  0,185,  0,  7,  0,186,  0,  7,  0,187,  0,  7,  0,188,  0,
+  7,  0, 55,  0,  7,  0,189,  0,  7,  0,190,  0,  7,  0,191,  0,  7,  0,192,  0,  7,  0,193,  0,  7,  0,194,  0,  7,  0,195,  0,
+  7,  0,196,  0,  7,  0,197,  0,  7,  0,198,  0,  7,  0,199,  0,  7,  0,200,  0,  7,  0,201,  0,  7,  0,202,  0,  7,  0,203,  0,
+  7,  0,204,  0,  7,  0,205,  0,  7,  0,206,  0,  7,  0,207,  0,  7,  0,208,  0,  7,  0,209,  0,  7,  0,210,  0,  7,  0,211,  0,
+  7,  0,212,  0,  7,  0,213,  0,  7,  0,214,  0,  7,  0,215,  0,  7,  0,216,  0,  7,  0,217,  0,  7,  0,218,  0,  7,  0,219,  0,
+  7,  0,220,  0,  7,  0,221,  0,  7,  0,222,  0,  7,  0,223,  0,  7,  0,224,  0,  7,  0,225,  0, 48,  0,  6,  0,  7,  0,184,  0,
+  7,  0,185,  0,  7,  0,186,  0,  7,  0,226,  0,  7,  0, 65,  0,  4,  0, 62,  0, 49,  0,  5,  0,  2,  0, 18,  0,  2,  0,227,  0,
+  2,  0, 62,  0,  2,  0,228,  0, 48,  0,229,  0, 50,  0, 17,  0, 27,  0,167,  0, 42,  0,230,  0, 51,  0,231,  0,  7,  0,232,  0,
+  7,  0,233,  0,  2,  0, 16,  0,  2,  0,234,  0,  7,  0,111,  0,  7,  0,112,  0,  7,  0,235,  0,  4,  0,236,  0,  2,  0,237,  0,
+  2,  0,238,  0,  4,  0,131,  0,  4,  0,143,  0,  2,  0,239,  0,  2,  0,240,  0, 52,  0, 25,  0,  2,  0, 18,  0,  2,  0,241,  0,
+  7,  0,242,  0,  7,  0,243,  0,  2,  0,142,  0,  2,  0,244,  0,  4,  0,245,  0,  4,  0,246,  0, 27,  0,167,  0,  4,  0,247,  0,
+  2,  0,248,  0,  2,  0,249,  0, 11,  0,250,  0,  7,  0,251,  0,  7,  0,252,  0,  2,  0,253,  0,  2,  0,254,  0,  2,  0,255,  0,
+  2,  0,  0,  1,  7,  0,  1,  1,  7,  0,  2,  1,  7,  0,  3,  1,  7,  0,  4,  1, 49,  0,  5,  1, 53,  0,  6,  1, 54,  0, 13,  0,
+  4,  0,  7,  1,  4,  0,  8,  1,  2,  0,  9,  1,  2,  0, 18,  0,  2,  0, 10,  1,  2,  0, 11,  1, 27,  0,167,  0,  7,  0, 12,  1,
+  4,  0, 13,  1,  0,  0, 14,  1,  7,  0, 15,  1,  4,  0, 16,  1,  4,  0,131,  0, 55,  0,  4,  0, 27,  0,167,  0,  0,  0, 17,  1,
+  4,  0, 18,  1,  4,  0, 27,  0, 47,  0, 63,  0, 22,  0, 32,  0, 34,  0, 74,  0,  7,  0, 19,  1,  7,  0, 20,  1,  7,  0, 21,  1,
+  7,  0, 22,  1,  7,  0, 23,  1,  7,  0, 24,  1,  7,  0, 25,  1,  7,  0, 26,  1,  7,  0, 27,  1,  7,  0, 30,  0,  7,  0, 28,  1,
+  7,  0, 29,  1,  7,  0, 30,  1,  7,  0, 31,  1,  7,  0, 32,  1,  7,  0, 33,  1,  7,  0, 34,  1,  7,  0, 35,  1,  7,  0, 36,  1,
+  7,  0, 37,  1,  7,  0, 38,  1,  7,  0, 39,  1,  2,  0, 40,  1,  2,  0, 41,  1,  2,  0, 42,  1,  2,  0, 43,  1,  2,  0, 44,  1,
+  2,  0, 45,  1,  2,  0, 46,  1,  2,  0, 18,  0,  2,  0, 16,  0,  2,  0,234,  0,  7,  0, 47,  1,  7,  0, 48,  1,  7,  0, 49,  1,
+  7,  0, 50,  1,  4,  0, 51,  1,  4,  0, 52,  1,  2,  0, 53,  1,  2,  0, 54,  1,  2,  0, 10,  1,  2,  0,129,  0,  4,  0, 22,  0,
+  4,  0,126,  0,  4,  0,127,  0,  4,  0,128,  0,  7,  0, 55,  1,  7,  0, 56,  1,  7,  0, 66,  0, 40,  0, 57,  1, 56,  0, 58,  1,
+ 31,  0, 79,  0, 42,  0,230,  0, 49,  0,  5,  1, 50,  0, 59,  1, 25,  0,153,  0, 52,  0, 60,  1, 54,  0, 61,  1, 55,  0, 62,  1,
+  0,  0, 63,  1,  0,  0,123,  0, 57,  0, 13,  0,  7,  0, 64,  1,  7,  0, 65,  1,  7,  0,175,  0,  4,  0, 18,  0,  0,  0,170,  0,
+  0,  0,171,  0,  0,  0,172,  0,  0,  0,173,  0,  4,  0, 27,  0,  7,  0, 66,  1,  7,  0, 67,  1,  7,  0, 68,  1, 27,  0, 43,  0,
+ 58,  0,  9,  0, 49,  0, 69,  1,  7,  0, 21,  1,  7,  0, 22,  1,  7,  0, 23,  1,  4,  0, 18,  0,  7,  0, 70,  1,  7,  0, 71,  1,
+  4,  0, 72,  1,  4,  0, 73,  1, 59,  0, 76,  0, 22,  0, 32,  0, 34,  0, 74,  0,  2,  0, 16,  0,  2,  0, 18,  0,  4,  0, 74,  1,
+  2,  0,178,  0,  2,  0, 75,  1,  7,  0,184,  0,  7,  0,185,  0,  7,  0,186,  0,  7,  0,187,  0,  7,  0, 76,  1,  7,  0, 77,  1,
+  7,  0, 78,  1,  7,  0, 79,  1,  7,  0, 80,  1,  7,  0, 81,  1,  7,  0, 82,  1,  7,  0, 83,  1,  7,  0, 84,  1,  7,  0, 85,  1,
+  7,  0, 86,  1, 53,  0, 87,  1,  2,  0,241,  0,  2,  0, 30,  0,  7,  0,111,  0,  7,  0,112,  0,  7,  0, 88,  1,  7,  0, 89,  1,
+  7,  0, 90,  1,  7,  0, 91,  1,  7,  0, 92,  1,  7,  0, 93,  1,  2,  0, 94,  1,  2,  0, 95,  1,  2,  0, 96,  1,  2,  0, 97,  1,
+  0,  0, 98,  1,  0,  0, 99,  1,  2,  0,100,  1,  2,  0,101,  1,  2,  0,102,  1,  2,  0,103,  1,  2,  0,104,  1,  7,  0,105,  1,
+  7,  0,106,  1,  7,  0,107,  1,  7,  0,108,  1,  2,  0,109,  1,  2,  0,110,  1,  2,  0,111,  1,  2,  0,112,  1,  2,  0,113,  1,
+  2,  0,114,  1,  7,  0,115,  1,  7,  0,116,  1,  7,  0,117,  1,  7,  0,118,  1,  7,  0,119,  1,  7,  0,120,  1,  7,  0,121,  1,
+  7,  0,122,  1,  7,  0,123,  1,  7,  0,124,  1,  7,  0,125,  1,  7,  0,126,  1,  7,  0,127,  1,  2,  0,128,  1,  0,  0,129,  1,
+ 31,  0, 79,  0, 46,  0,130,  1,  2,  0,131,  1,  2,  0, 63,  1,  0,  0,132,  1, 25,  0,153,  0, 56,  0, 58,  1, 60,  0, 18,  0,
   7,  0,133,  1,  7,  0,134,  1,  7,  0,135,  1,  7,  0,136,  1,  7,  0,137,  1,  7,  0,138,  1,  7,  0,139,  1,  7,  0,140,  1,
-  2,  0,141,  1,  0,  0,142,  1, 31,  0, 79,  0, 46,  0,143,  1,  2,  0,144,  1,  2,  0, 76,  1,  0,  0,145,  1, 25,  0,153,  0,
- 57,  0, 70,  1, 61,  0, 18,  0,  7,  0,146,  1,  7,  0,147,  1,  7,  0,148,  1,  7,  0,149,  1,  7,  0,150,  1,  7,  0,151,  1,
-  7,  0,152,  1,  7,  0,153,  1,  7,  0,154,  1,  7,  0,155,  1,  2,  0,156,  1,  2,  0,157,  1,  2,  0,158,  1,  2,  0,159,  1,
-  7,  0,160,  1,  7,  0,161,  1,  7,  0,162,  1,  7,  0,163,  1, 62,  0,  4,  0,  4,  0, 18,  0,  4,  0,164,  1,  4,  0,165,  1,
-  4,  0, 66,  0, 63,  0,126,  0, 22,  0, 32,  0, 34,  0, 74,  0,  2,  0,166,  1,  2,  0, 18,  0,  7,  0,184,  0,  7,  0,185,  0,
-  7,  0,186,  0,  7,  0,167,  1,  7,  0,168,  1,  7,  0,169,  1,  7,  0,170,  1,  7,  0,171,  1,  7,  0,172,  1,  7,  0,173,  1,
-  7,  0,174,  1,  7,  0,175,  1,  7,  0,176,  1,  7,  0,177,  1,  7,  0,178,  1,  7,  0,179,  1,  7,  0,180,  1,  7,  0,181,  1,
-  7,  0,182,  1,  7,  0,183,  1,  7,  0,184,  1,  7,  0,185,  1,  7,  0,186,  1, 61,  0,187,  1, 62,  0,188,  1,  7,  0,189,  1,
-  7,  0,190,  1,  7,  0,191,  1,  7,  0,192,  1,  7,  0,193,  1,  7,  0,194,  1,  7,  0,195,  1,  2,  0,196,  1,  2,  0,197,  1,
-  2,  0,198,  1,  0,  0,199,  1,  0,  0,200,  1,  7,  0,201,  1,  7,  0,202,  1,  2,  0,203,  1,  2,  0,204,  1,  7,  0,205,  1,
-  7,  0,206,  1,  7,  0,207,  1,  7,  0,208,  1,  2,  0,209,  1,  2,  0,210,  1,  4,  0, 87,  1,  4,  0,211,  1,  2,  0,212,  1,
-  2,  0,213,  1,  2,  0,214,  1,  2,  0,215,  1,  7,  0,216,  1,  7,  0,217,  1,  7,  0,218,  1,  7,  0,219,  1,  7,  0,220,  1,
-  7,  0,221,  1,  7,  0,222,  1,  7,  0,223,  1,  7,  0,224,  1,  7,  0,225,  1,  0,  0,226,  1,  7,  0,227,  1,  7,  0,228,  1,
-  7,  0,229,  1,  4,  0,230,  1,  0,  0,231,  1,  0,  0,124,  1,  0,  0,232,  1,  0,  0, 76,  1,  2,  0,233,  1,  2,  0,234,  1,
-  2,  0,144,  1,  2,  0,235,  1,  2,  0,236,  1,  2,  0,237,  1,  7,  0,238,  1,  7,  0,239,  1,  7,  0,240,  1,  7,  0,241,  1,
-  7,  0,242,  1,  2,  0,163,  0,  2,  0,164,  0, 50,  0,243,  1, 50,  0,244,  1,  0,  0,245,  1,  0,  0,246,  1,  0,  0,247,  1,
-  0,  0,248,  1,  2,  0,249,  1,  2,  0,250,  1,  7,  0,251,  1,  7,  0,252,  1, 46,  0,143,  1, 57,  0, 70,  1, 31,  0, 79,  0,
- 64,  0,253,  1, 25,  0,153,  0,  7,  0,254,  1,  7,  0,255,  1,  7,  0,  0,  2,  7,  0,  1,  2,  7,  0,  2,  2,  2,  0,  3,  2,
-  2,  0, 30,  0,  7,  0,  4,  2,  7,  0,  5,  2,  7,  0,  6,  2,  7,  0,  7,  2,  7,  0,  8,  2,  7,  0,  9,  2,  7,  0, 10,  2,
-  7,  0, 11,  2,  7,  0, 12,  2,  2,  0, 13,  2,  2,  0, 14,  2,  4,  0, 15,  2,  2,  0, 16,  2,  2,  0, 17,  2, 14,  0, 18,  2,
- 65,  0,  4,  0, 22,  0, 32,  0,  0,  0, 35,  0, 66,  0,  2,  0, 38,  0,152,  0, 67,  0, 20,  0, 67,  0,  0,  0, 67,  0,  1,  0,
- 68,  0, 19,  2,  2,  0, 16,  0,  2,  0, 18,  0,  2,  0, 20,  2,  2,  0, 21,  2,  7,  0,  5,  0,  7,  0,  6,  0,  7,  0,  7,  0,
-  7,  0, 22,  2,  7,  0, 23,  2,  7,  0, 24,  2,  7,  0, 25,  2,  7,  0, 26,  2,  7,  0, 27,  2,  7,  0, 28,  2,  7,  0, 22,  0,
-  7,  0, 29,  2,  7,  0, 30,  2, 69,  0, 20,  0, 22,  0, 32,  0, 34,  0, 74,  0, 68,  0, 19,  2, 14,  0, 31,  2, 14,  0, 32,  2,
- 14,  0, 33,  2, 31,  0, 79,  0, 63,  0, 34,  2,  0,  0, 18,  0,  0,  0, 35,  2,  2,  0, 36,  2,  2,  0,177,  0,  2,  0, 27,  0,
-  7,  0, 77,  1,  7,  0,175,  0,  7,  0, 78,  1,  7,  0, 37,  2,  7,  0, 38,  2,  7,  0, 39,  2, 67,  0, 40,  2, 30,  0, 11,  0,
-  7,  0, 41,  2,  7,  0, 42,  2,  7,  0, 43,  2,  7,  0,255,  0,  2,  0, 53,  0,  0,  0, 44,  2,  0,  0, 45,  2,  0,  0, 46,  2,
-  0,  0, 47,  2,  0,  0, 48,  2,  0,  0, 49,  2, 29,  0,  7,  0,  7,  0, 50,  2,  7,  0, 42,  2,  7,  0, 43,  2,  2,  0, 46,  2,
-  2,  0, 49,  2,  7,  0,255,  0,  7,  0, 27,  0, 70,  0, 21,  0, 70,  0,  0,  0, 70,  0,  1,  0,  2,  0, 16,  0,  2,  0, 51,  2,
-  2,  0, 49,  2,  2,  0, 18,  0,  2,  0, 52,  2,  2,  0, 53,  2,  2,  0, 54,  2,  2,  0, 55,  2,  2,  0, 56,  2,  2,  0, 57,  2,
-  2,  0, 58,  2,  2,  0, 59,  2,  7,  0, 60,  2,  7,  0, 61,  2, 29,  0, 47,  0, 30,  0, 48,  0,  2,  0, 62,  2,  2,  0, 63,  2,
-  4,  0, 64,  2, 71,  0,  5,  0,  2,  0, 65,  2,  2,  0, 51,  2,  0,  0, 18,  0,  0,  0, 27,  0,  2,  0, 30,  0, 72,  0,  4,  0,
-  7,  0,  5,  0,  7,  0,  6,  0,  7,  0, 66,  2,  7,  0, 67,  2, 73,  0,  4,  0, 14,  0, 68,  2, 74,  0, 69,  2,  4,  0, 70,  2,
-  0,  0, 93,  0, 75,  0, 70,  0, 22,  0, 32,  0, 34,  0, 74,  0, 68,  0, 19,  2, 14,  0, 71,  2, 14,  0, 32,  2, 73,  0, 72,  2,
- 27,  0, 73,  2, 27,  0, 74,  2, 27,  0, 75,  2, 31,  0, 79,  0, 76,  0, 76,  2, 33,  0, 77,  2, 63,  0, 34,  2, 14,  0, 78,  2,
-  7,  0, 77,  1,  7,  0,175,  0,  7,  0, 78,  1,  2,  0, 16,  0,  2,  0,177,  0,  2,  0, 79,  2,  2,  0, 80,  2,  7,  0, 81,  2,
-  7,  0, 82,  2,  4,  0, 83,  2,  2,  0, 27,  0,  2,  0, 36,  2,  2,  0, 18,  0,  2,  0, 84,  2,  7,  0, 85,  2,  7,  0, 86,  2,
-  7,  0, 87,  2,  2,  0, 54,  2,  2,  0, 55,  2,  2,  0, 88,  2,  2,  0, 89,  2,  4,  0, 90,  2, 11,  0, 91,  2,  2,  0, 22,  0,
-  2,  0, 96,  0,  2,  0, 65,  0,  2,  0, 92,  2,  7,  0, 93,  2,  7,  0, 94,  2,  7,  0, 95,  2,  7,  0, 96,  2,  7,  0, 97,  2,
-  7,  0, 98,  2,  7,  0, 99,  2,  7,  0,100,  2,  7,  0,101,  2,  7,  0,102,  2,  0,  0,103,  2, 77,  0,104,  2, 78,  0,105,  2,
-  0,  0,106,  2, 65,  0,107,  2, 65,  0,108,  2, 65,  0,109,  2, 65,  0,110,  2,  4,  0,111,  2,  7,  0, 83,  0,  4,  0,112,  2,
-  4,  0,113,  2, 72,  0,114,  2,  4,  0,115,  2,  4,  0,116,  2, 71,  0,117,  2, 71,  0,118,  2,  7,  0,119,  2,  7,  0,120,  2,
- 79,  0, 47,  0, 22,  0, 32,  0, 34,  0, 74,  0, 68,  0, 19,  2, 31,  0, 79,  0, 33,  0, 77,  2, 63,  0, 34,  2, 80,  0,121,  2,
- 81,  0,122,  2, 82,  0,123,  2, 83,  0,124,  2, 84,  0,125,  2, 85,  0,126,  2, 86,  0,127,  2, 87,  0,128,  2, 88,  0,129,  2,
- 89,  0,130,  2, 90,  0,131,  2, 91,  0,132,  2, 92,  0,133,  2, 93,  0,134,  2, 79,  0,135,  2, 94,  0,136,  2, 95,  0,137,  2,
- 95,  0,138,  2, 95,  0,139,  2, 95,  0,140,  2, 95,  0,141,  2,  4,  0, 52,  0,  4,  0,142,  2,  4,  0,143,  2,  4,  0,144,  2,
-  4,  0,145,  2,  4,  0,146,  2,  4,  0,147,  2,  7,  0, 77,  1,  7,  0,175,  0,  7,  0, 78,  1,  2,  0,177,  0,  2,  0, 79,  2,
-  2,  0,148,  2,  2,  0, 18,  0,  2,  0,149,  2,  2,  0,150,  2,  0,  0,151,  2,  0,  0,152,  2,  2,  0, 36,  2, 96,  0,153,  2,
- 88,  0,  8,  0, 11,  0,154,  2,  7,  0,155,  2,  4,  0,156,  2,  0,  0, 18,  0,  0,  0,157,  2,  2,  0, 87,  1,  2,  0,158,  2,
-  2,  0,159,  2, 86,  0,  7,  0,  4,  0,160,  2,  4,  0,161,  2,  4,  0,162,  2,  4,  0,163,  2,  2,  0, 51,  2,  0,  0,164,  2,
-  0,  0, 18,  0, 90,  0,  5,  0,  4,  0,160,  2,  4,  0,161,  2,  0,  0,165,  2,  0,  0,166,  2,  2,  0, 18,  0, 97,  0,  2,  0,
-  4,  0,167,  2,  7,  0, 43,  2, 91,  0,  3,  0, 97,  0,168,  2,  4,  0,169,  2,  4,  0, 18,  0, 89,  0,  4,  0,  7,  0,170,  2,
-  2,  0,171,  2,  0,  0, 18,  0,  0,  0,166,  2, 92,  0,  4,  0,  0,  0,239,  0,  0,  0,184,  0,  0,  0,185,  0,  0,  0,186,  0,
- 81,  0,  5,  0,  4,  0,172,  2,  4,  0,146,  2,  2,  0, 51,  2,  0,  0, 18,  0,  0,  0, 27,  0, 83,  0,  2,  0,  4,  0,173,  2,
-  4,  0,174,  2, 82,  0,  6,  0, 42,  0,154,  2,  0,  0, 18,  0,  0,  0,157,  2,  2,  0, 87,  1,  2,  0,158,  2,  2,  0,159,  2,
- 84,  0,  2,  0,  7,  0,175,  2,  4,  0, 18,  0, 85,  0,  4,  0,  0,  0,184,  0,  0,  0,185,  0,  0,  0,186,  0,  0,  0,239,  0,
- 93,  0,  1,  0,  7,  0,176,  2, 80,  0,  2,  0,  4,  0, 17,  2,  4,  0, 16,  0, 87,  0,  7,  0,  7,  0,155,  2, 42,  0,154,  2,
-  0,  0, 18,  0,  0,  0,157,  2,  2,  0, 87,  1,  2,  0,158,  2,  2,  0,159,  2, 98,  0,  1,  0,  7,  0,177,  2, 99,  0,  1,  0,
-  4,  0,178,  2,100,  0,  1,  0,  0,  0,179,  2,101,  0,  1,  0,  7,  0,155,  2,102,  0,  1,  0,  7,  0,175,  2,103,  0,  4,  0,
-  4,  0,180,  2,  4,  0,181,  2,  7,  0,182,  2,  4,  0,183,  2,104,  0,  4,  0,  7,  0,239,  0,  7,  0,184,  0,  7,  0,185,  0,
-  7,  0,186,  0,105,  0,  1,  0,104,  0,156,  2,106,  0,  5,  0,  4,  0,184,  2,  4,  0,185,  2,  0,  0, 18,  0,  0,  0, 51,  2,
-  0,  0,186,  2,107,  0,  2,  0,  4,  0,187,  2,  4,  0,185,  2,108,  0, 10,  0,108,  0,  0,  0,108,  0,  1,  0,106,  0,188,  2,
-105,  0,189,  2,107,  0,190,  2,  4,  0, 52,  0,  4,  0,143,  2,  4,  0,142,  2,  4,  0, 27,  0, 89,  0,191,  2, 96,  0, 14,  0,
- 14,  0,192,  2, 89,  0,191,  2,  0,  0,193,  2,  0,  0,194,  2,  0,  0,195,  2,  0,  0,196,  2,  0,  0,197,  2,  0,  0,198,  2,
-  0,  0,199,  2,  0,  0, 18,  0, 95,  0,137,  2, 95,  0,139,  2,  2,  0,200,  2,  0,  0,201,  2,109,  0,  1,  0,  4,  0,178,  2,
-110,  0,  3,  0,  7,  0,  2,  0,  4,  0,181,  2,  4,  0, 27,  0,111,  0,  9,  0,111,  0,  0,  0,111,  0,  1,  0,  4,  0, 16,  0,
-  4,  0, 87,  1,  4,  0,202,  2,  4,  0, 27,  0,  0,  0, 19,  0, 41,  0,124,  0,  0,  0,203,  2,112,  0,  6,  0,111,  0,204,  2,
- 47,  0,205,  2, 27,  0,206,  2,  0,  0,207,  2,  4,  0,208,  2,  4,  0,209,  2,113,  0,  7,  0,111,  0,204,  2,  2,  0,210,  2,
-  2,  0,192,  2,  2,  0,211,  2,  2,  0, 91,  0, 11,  0,212,  2, 11,  0,213,  2,114,  0,  5,  0,111,  0,204,  2, 27,  0,167,  0,
-  0,  0, 19,  0,  7,  0,214,  2,  0,  0, 93,  0,115,  0,  5,  0,111,  0,204,  2, 27,  0,167,  0,  0,  0, 19,  0,  2,  0,215,  2,
-  0,  0,216,  2,116,  0,  5,  0,111,  0,204,  2,  7,  0, 89,  0,  7,  0,217,  2,  4,  0,218,  2,  4,  0,219,  2,117,  0,  5,  0,
-111,  0,204,  2, 27,  0,220,  2,  0,  0, 71,  0,  4,  0, 87,  1,  4,  0, 18,  0,118,  0, 13,  0,111,  0,204,  2, 27,  0,221,  2,
- 27,  0,222,  2, 27,  0,223,  2, 27,  0,224,  2,  7,  0,225,  2,  7,  0,226,  2,  7,  0,217,  2,  7,  0,227,  2,  4,  0,228,  2,
-  4,  0,229,  2,  4,  0, 91,  0,  4,  0,230,  2,119,  0,  5,  0,111,  0,204,  2,  2,  0,231,  2,  2,  0, 18,  0,  7,  0,232,  2,
- 27,  0,233,  2,120,  0,  3,  0,111,  0,204,  2,  7,  0,234,  2,  4,  0, 91,  0,121,  0, 10,  0,111,  0,204,  2,  7,  0,235,  2,
-  4,  0,236,  2,  4,  0, 27,  0,  2,  0, 91,  0,  2,  0,237,  2,  2,  0,238,  2,  2,  0,239,  2,  7,  0,240,  2,  0,  0,241,  2,
-122,  0,  3,  0,111,  0,204,  2,  7,  0, 27,  0,  4,  0, 16,  0,123,  0,  6,  0,111,  0,204,  2,124,  0,242,  2,125,  0,243,  2,
-126,  0,244,  2,  7,  0,245,  2,  4,  0, 16,  0,127,  0, 11,  0,111,  0,204,  2, 47,  0,205,  2, 27,  0,206,  2,  0,  0,207,  2,
-  4,  0,208,  2,  4,  0,209,  2,  7,  0,214,  2,  4,  0,246,  2,  0,  0,241,  2,  7,  0,247,  2,  4,  0, 27,  0,128,  0, 12,  0,
-111,  0,204,  2, 27,  0,248,  2, 42,  0,249,  2,  4,  0, 91,  0,  4,  0,250,  2,  7,  0,251,  2,  7,  0,252,  2,  7,  0,253,  2,
-  7,  0,254,  2,  0,  0,207,  2,  4,  0,208,  2,  4,  0, 27,  0,129,  0,  3,  0,111,  0,204,  2,  7,  0,255,  2,  4,  0,  0,  3,
-130,  0,  5,  0,111,  0,204,  2,  7,  0,  1,  3,  0,  0,241,  2,  2,  0, 18,  0,  2,  0,  2,  3,131,  0,  8,  0,111,  0,204,  2,
- 27,  0,167,  0,  7,  0,  1,  3,  7,  0,255,  0,  7,  0,107,  0,  0,  0,241,  2,  2,  0, 18,  0,  2,  0, 16,  0,132,  0, 21,  0,
-111,  0,204,  2, 47,  0,205,  2, 27,  0,206,  2,  0,  0,207,  2,  4,  0,208,  2,  4,  0,209,  2, 27,  0,  3,  3,  0,  0,241,  2,
-  2,  0, 18,  0,  2,  0, 27,  0,  7,  0,  4,  3,  7,  0,  5,  3,  7,  0,  6,  3,  7,  0, 85,  2,  7,  0,  7,  3,  7,  0,  8,  3,
-  7,  0,  9,  3,  7,  0, 10,  3,  7,  0, 11,  3,  7,  0, 12,  3,  7,  0, 66,  0,133,  0,  7,  0,111,  0,204,  2,  2,  0, 13,  3,
-  2,  0, 14,  3,  4,  0, 30,  0, 27,  0,167,  0,  7,  0, 15,  3,  0,  0,241,  2,134,  0, 10,  0,111,  0,204,  2, 27,  0,167,  0,
-  0,  0, 16,  3,  7,  0, 17,  3,  7,  0, 18,  3,  7,  0, 10,  3,  4,  0, 19,  3,  4,  0, 20,  3,  7,  0, 21,  3,  0,  0, 19,  0,
-135,  0,  1,  0,111,  0,204,  2,136,  0,  7,  0,111,  0,204,  2, 41,  0,124,  0,137,  0, 22,  3,138,  0, 23,  3,139,  0, 24,  3,
-140,  0, 25,  3, 14,  0, 26,  3,141,  0, 13,  0,111,  0,204,  2, 89,  0, 27,  3, 89,  0, 28,  3, 89,  0, 29,  3, 89,  0, 30,  3,
- 89,  0, 31,  3, 89,  0, 32,  3, 86,  0, 33,  3,  4,  0, 34,  3,  4,  0, 35,  3,  7,  0, 36,  3,  7,  0, 37,  3,142,  0, 38,  3,
-143,  0,  7,  0,111,  0,204,  2, 89,  0, 27,  3, 89,  0, 39,  3,144,  0, 40,  3,145,  0, 38,  3,  4,  0, 41,  3,  4,  0, 34,  3,
-146,  0,  4,  0,111,  0,204,  2, 27,  0,167,  0,  4,  0, 42,  3,  4,  0, 27,  0,147,  0,  2,  0,  4,  0, 43,  3,  7,  0, 43,  2,
-148,  0,  2,  0,  4,  0,127,  0,  4,  0, 44,  3,149,  0, 24,  0,111,  0,204,  2, 27,  0,167,  0,  0,  0,241,  2,  2,  0, 45,  3,
-  2,  0, 18,  0,  2,  0, 87,  1,  2,  0, 27,  0,147,  0, 46,  3,  4,  0, 47,  3,  7,  0, 48,  3,  4,  0, 52,  0,  4,  0, 49,  3,
-148,  0, 50,  3,147,  0, 51,  3,  4,  0, 52,  3,  4,  0, 53,  3,  4,  0, 54,  3,  4,  0, 44,  3,  7,  0, 55,  3,  7,  0, 56,  3,
-  7,  0, 57,  3,  7,  0, 58,  3,  7,  0, 59,  3, 11,  0, 60,  3,150,  0,  8,  0,111,  0,204,  2,151,  0, 61,  3,144,  0, 40,  3,
-  4,  0, 62,  3,  4,  0, 63,  3,  4,  0, 64,  3,  2,  0, 18,  0,  2,  0, 55,  0,152,  0,  8,  0,111,  0,204,  2, 27,  0, 43,  0,
-  2,  0,  3,  1,  2,  0, 18,  0,  2,  0,231,  2,  2,  0, 55,  0,  7,  0, 65,  3,  7,  0, 66,  3,153,  0,  6,  0,111,  0,204,  2,
-  4,  0, 67,  3,  2,  0, 18,  0,  2,  0, 68,  3,  7,  0, 69,  3,  0,  0,169,  0,154,  0,  8,  0,111,  0,204,  2,  0,  0, 70,  3,
-  0,  0, 71,  3,  0,  0,198,  2,  0,  0, 72,  3,  0,  0, 73,  3,  0,  0, 91,  0,  0,  0,186,  2,155,  0,  3,  0,111,  0,204,  2,
-156,  0, 74,  3,140,  0, 25,  3,157,  0, 10,  0,111,  0,204,  2, 27,  0, 75,  3, 27,  0, 76,  3,  0,  0, 77,  3,  7,  0, 78,  3,
-  2,  0, 79,  3,  2,  0, 80,  3,  0,  0, 81,  3,  0,  0, 82,  3,  0,  0,216,  2,158,  0,  9,  0,111,  0,204,  2, 27,  0, 83,  3,
-  0,  0, 77,  3,  7,  0, 84,  3,  7,  0, 85,  3,  0,  0, 87,  1,  0,  0,231,  2,  0,  0, 86,  3,  0,  0, 27,  0,159,  0,  1,  0,
-111,  0,204,  2,160,  0, 11,  0,111,  0,204,  2,  0,  0,241,  2,  7,  0,127,  0,  7,  0, 87,  3,  7,  0, 88,  3,  7,  0, 89,  3,
-  7,  0, 90,  3,  7,  0, 91,  3,  4,  0, 18,  0,  2,  0, 92,  3,  2,  0, 93,  3,161,  0,  9,  0,111,  0,204,  2, 27,  0, 94,  3,
-  4,  0, 95,  3,  4,  0, 96,  3,  4,  0, 97,  3,  7,  0, 98,  3,  7,  0, 99,  3,  2,  0,231,  2,  2,  0, 18,  0,162,  0, 29,  0,
-111,  0,204,  2,163,  0,100,  3,164,  0,101,  3,  4,  0,102,  3,  4,  0,103,  3,  7,  0,104,  3,  7,  0,  9,  3,  7,  0,105,  3,
-  7,  0,250,  0,  7,  0,106,  3,  7,  0,107,  3,  7,  0,108,  3,  7,  0,109,  3,  7,  0,110,  3,  7,  0,245,  2,  4,  0,111,  3,
-  4,  0,112,  3,  0,  0,113,  3,  0,  0,114,  3,  0,  0,115,  3,  0,  0,116,  3,  0,  0, 18,  0,  0,  0,117,  3,  2,  0,118,  3,
-  2,  0,119,  3,  4,  0,219,  2,  7,  0,107,  0,  7,  0,120,  3,  4,  0, 27,  0,165,  0, 15,  0,111,  0,204,  2, 47,  0,205,  2,
- 27,  0,206,  2,  0,  0,207,  2,  4,  0,208,  2,  4,  0,209,  2, 27,  0,121,  3, 27,  0,122,  3, 54,  0,100,  1,  0,  0,241,  2,
-  7,  0,214,  2,  7,  0,123,  3,  0,  0, 18,  0,  0,  0,253,  0,  0,  0,216,  2,166,  0, 16,  0,111,  0,204,  2,  0,  0,241,  2,
-  2,  0,124,  3,  2,  0,253,  0,  7,  0,125,  3, 54,  0,126,  3,  7,  0,127,  3,  7,  0,128,  3,  7,  0,129,  3,  0,  0,130,  3,
-  4,  0,131,  3, 47,  0,132,  3, 27,  0,133,  3,  4,  0,134,  3,  0,  0,135,  3,  4,  0,136,  3,167,  0, 16,  0,111,  0,204,  2,
-  0,  0,137,  3,  0,  0,138,  3,  7,  0,139,  3,  7,  0,140,  3,  0,  0,141,  3,  0,  0,142,  3,  0,  0,143,  3,  7,  0,129,  3,
-  0,  0,130,  3,  4,  0,131,  3, 47,  0,132,  3, 27,  0,133,  3,  4,  0,134,  3,  0,  0,135,  3,  4,  0,136,  3,168,  0, 16,  0,
-111,  0,204,  2,  0,  0,241,  2,  4,  0,144,  3,  4,  0,145,  3, 27,  0,146,  3,  7,  0,129,  3,  0,  0,130,  3,  4,  0,131,  3,
- 47,  0,132,  3, 27,  0,133,  3,  4,  0,134,  3,  0,  0,135,  3,  7,  0,147,  3,  7,  0,148,  3,  2,  0,253,  0,  2,  0,149,  3,
-169,  0,  5,  0,111,  0,204,  2,170,  0,150,  3,171,  0,151,  3,  4,  0, 16,  0,  4,  0, 27,  0,172,  0,  8,  0,111,  0,204,  2,
-  7,  0,152,  3,  7,  0,153,  3,  7,  0,154,  3,  0,  0,250,  0,  0,  0, 18,  0,  0,  0, 87,  1,  0,  0, 27,  0,173,  0,  3,  0,
-174,  0,155,  3,  4,  0, 70,  2,  0,  0, 93,  0,174,  0, 29,  0, 22,  0, 32,  0, 34,  0, 74,  0,  2,  0, 52,  2,  2,  0, 53,  2,
-  2,  0,156,  3,  2,  0, 18,  0,  2,  0,157,  3,  2,  0,158,  3,  2,  0,159,  3,  2,  0, 30,  0,  0,  0,160,  3,  0,  0,161,  3,
-  0,  0,162,  3,  0,  0,250,  1,  4,  0, 27,  0,  7,  0,163,  3,  7,  0,164,  3,  7,  0,165,  3,  7,  0,166,  3,  7,  0,167,  3,
-  7,  0,168,  3, 29,  0,169,  3, 31,  0, 79,  0, 33,  0, 77,  2, 91,  0,132,  2,  0,  0, 71,  0,  7,  0,170,  3,  7,  0,171,  3,
-173,  0,172,  3,175,  0,  5,  0,175,  0,  0,  0,175,  0,  1,  0,  0,  0, 19,  0,  0,  0, 18,  0,  0,  0,123,  0, 68,  0,  3,  0,
-  7,  0,173,  3,  4,  0, 18,  0,  4,  0, 27,  0, 27,  0,128,  0, 22,  0, 32,  0, 34,  0, 74,  0,176,  0,174,  3,  2,  0, 16,  0,
-  2,  0,175,  3,  4,  0,176,  3,  4,  0,177,  3,  4,  0,178,  3,  0,  0,179,  3, 27,  0, 37,  0, 27,  0,180,  3, 27,  0,181,  3,
- 27,  0,182,  3, 27,  0,183,  3, 31,  0, 79,  0, 68,  0, 19,  2,177,  0,184,  3,177,  0,185,  3,178,  0,186,  3, 11,  0,  2,  0,
-179,  0,187,  3,180,  0,188,  3,181,  0,189,  3, 14,  0,190,  3, 14,  0,191,  3, 14,  0, 32,  2, 14,  0,192,  3, 14,  0,193,  3,
-  4,  0, 87,  1,  4,  0,194,  3, 63,  0, 34,  2,  0,  0,195,  3,  4,  0, 36,  2,  4,  0,196,  3,  7,  0, 77,  1,  7,  0,197,  3,
-  7,  0,198,  3,  7,  0,175,  0,  7,  0,199,  3,  7,  0,200,  3,  7,  0, 78,  1,  7,  0,201,  3,  7,  0, 22,  2,  7,  0,202,  3,
-  7,  0,203,  3,  7,  0,204,  3,  7,  0,205,  3,  7,  0,206,  3,  7,  0,207,  3,  7,  0, 17,  3,  7,  0,208,  3,  7,  0,244,  0,
-  7,  0,209,  3,  4,  0,210,  3,  4,  0,211,  3,  2,  0, 18,  0,  2,  0,212,  3,  2,  0,213,  3,  2,  0,214,  3,  2,  0,215,  3,
-  2,  0,216,  3,  2,  0,217,  3,  2,  0,218,  3,  2,  0,219,  3,  0,  0,220,  3,  0,  0,221,  3,  4,  0,222,  3,  4,  0,223,  3,
-  4,  0,224,  3,  4,  0,225,  3,  7,  0,226,  3,  7,  0, 83,  0,  7,  0,227,  3,  7,  0,228,  3,  7,  0,229,  3,  7,  0,230,  3,
-  7,  0,231,  3,  7,  0,219,  0,  7,  0,232,  3,  7,  0,233,  3,  7,  0,234,  3,  7,  0,235,  3,  7,  0,236,  3,  2,  0,237,  3,
-  0,  0,238,  3,  0,  0,239,  3,  0,  0,240,  3,  0,  0,241,  3,  0,  0,109,  0,  0,  0,242,  3,  7,  0,243,  3,  7,  0,244,  3,
- 14,  0,245,  3, 14,  0,246,  3, 14,  0,247,  3, 14,  0,248,  3,  7,  0,249,  3,  2,  0, 17,  2,  2,  0,250,  3,  7,  0,156,  2,
-  4,  0,251,  3,  4,  0,252,  3,182,  0,253,  3,  2,  0,254,  3,  2,  0,251,  0,  7,  0,255,  3, 14,  0,  0,  4, 14,  0,  1,  4,
- 14,  0,  2,  4, 14,  0,  3,  4,183,  0, 73,  1,184,  0,  4,  4, 64,  0,  5,  4,  0,  0,  6,  4,  0,  0,  7,  4,  2,  0, 70,  2,
-  7,  0,148,  2,156,  0,  8,  4,144,  0,  9,  4,144,  0, 10,  4, 10,  0, 11,  4, 10,  0, 12,  4,  4,  0, 13,  4,  4,  0, 14,  4,
- 14,  0, 15,  4, 14,  0, 16,  4, 14,  0, 17,  4,  7,  0, 18,  4,185,  0, 14,  0,185,  0,  0,  0,185,  0,  1,  0, 27,  0, 37,  0,
-  7,  0, 17,  3,  7,  0, 79,  1,  7,  0, 18,  3,  7,  0, 10,  3,  0,  0, 19,  0,  4,  0, 19,  3,  4,  0, 20,  3,  4,  0, 19,  4,
-  2,  0, 16,  0,  2,  0, 20,  4,  7,  0, 21,  3,186,  0, 12,  0,186,  0,  0,  0,186,  0,  1,  0, 27,  0, 43,  0,  4,  0, 21,  4,
-  4,  0, 17,  2,  7,  0, 79,  1,  7,  0, 22,  4,  7,  0, 23,  4,  7,  0,175,  2,  2,  0, 16,  0,  0,  0, 24,  4,  0,  0, 25,  4,
-183,  0, 40,  0,  4,  0, 18,  0,  2,  0, 26,  4,  2,  0, 27,  4,  2,  0, 10,  3,  2,  0, 28,  4,  2,  0, 29,  4,  2,  0, 30,  4,
-  2,  0, 31,  4,  2,  0, 32,  4,  7,  0, 33,  4,  7,  0, 34,  4,  7,  0, 35,  4,  7,  0, 36,  4,  7,  0, 37,  4,  7,  0, 38,  4,
-  7,  0, 39,  4,  7,  0, 40,  4,  7,  0, 41,  4,  7,  0, 42,  4,  7,  0, 43,  4,  7,  0, 44,  4,  7,  0, 45,  4,  7,  0, 46,  4,
-  7,  0, 47,  4,  7,  0, 48,  4,  7,  0, 49,  4,  7,  0, 50,  4,  7,  0, 51,  4,  7,  0, 52,  4,  7,  0, 53,  4,  7,  0, 54,  4,
-  7,  0, 55,  4,  7,  0, 56,  4,  7,  0, 57,  4,  7,  0, 58,  4,  7,  0, 59,  4, 47,  0,168,  0,187,  0, 60,  4,  7,  0, 61,  4,
-  4,  0,219,  2,188,  0,  5,  0, 64,  0,253,  1,  7,  0, 62,  4,  7,  0, 63,  4,  2,  0, 18,  0,  2,  0, 64,  4,189,  0,  5,  0,
-189,  0,  0,  0,189,  0,  1,  0,  4,  0, 16,  0,  4,  0, 65,  4, 11,  0,  2,  0,190,  0,  9,  0,190,  0,  0,  0,190,  0,  1,  0,
-  4,  0, 66,  4,  4,  0, 67,  4,  4,  0, 68,  4,  4,  0, 18,  0, 11,  0, 69,  4, 11,  0, 70,  4, 14,  0, 71,  4,140,  0, 23,  0,
-140,  0,  0,  0,140,  0,  1,  0,  4,  0, 18,  0,  4,  0, 72,  4,  4,  0, 73,  4,  4,  0, 74,  4,  4,  0, 75,  4,  4,  0, 76,  4,
-  4,  0, 77,  4,  4,  0, 78,  4,  4,  0, 27,  0,  4,  0, 67,  4,  4,  0, 17,  2,  2,  0, 79,  4,  2,  0, 55,  0,  0,  0, 19,  0,
-  0,  0, 80,  4,  0,  0, 81,  4,  0,  0, 82,  4,  0,  0, 83,  4, 14,  0, 84,  4,191,  0, 85,  4, 11,  0, 86,  4,192,  0,  1,  0,
-  7,  0, 50,  2,182,  0, 30,  0,  4,  0, 18,  0,  7,  0, 87,  4,  7,  0, 88,  4,  7,  0, 89,  4,  4,  0, 90,  4,  4,  0, 91,  4,
-  4,  0, 92,  4,  4,  0, 93,  4,  7,  0, 94,  4,  7,  0, 95,  4,  7,  0, 96,  4,  7,  0, 97,  4,  7,  0, 98,  4,  7,  0, 99,  4,
-  7,  0,100,  4,  7,  0,101,  4,  7,  0,102,  4,  7,  0,103,  4,  7,  0,104,  4,  7,  0,105,  4,  7,  0,106,  4,  7,  0,107,  4,
-  7,  0,108,  4,  7,  0,109,  4,  7,  0,110,  4,  7,  0,111,  4,  4,  0,112,  4,  4,  0,113,  4,  7,  0,114,  4,  7,  0,232,  3,
-184,  0, 54,  0,  4,  0, 67,  4,  4,  0,115,  4,193,  0,116,  4,194,  0,117,  4,  0,  0, 27,  0,  0,  0,118,  4,  2,  0,119,  4,
-  7,  0,120,  4,  0,  0,121,  4,  7,  0,122,  4,  7,  0,123,  4,  7,  0,124,  4,  7,  0,125,  4,  7,  0,126,  4,  7,  0,127,  4,
-  7,  0,128,  4,  7,  0,129,  4,  7,  0,130,  4,  2,  0,131,  4,  0,  0,132,  4,  2,  0,133,  4,  7,  0,134,  4,  7,  0,135,  4,
-  0,  0,136,  4,  4,  0,128,  0,  4,  0,137,  4,  4,  0,138,  4,  2,  0,139,  4,  2,  0,140,  4,192,  0,141,  4,  4,  0,142,  4,
-  4,  0, 81,  0,  7,  0,143,  4,  7,  0,144,  4,  7,  0,145,  4,  7,  0,146,  4,  2,  0,147,  4,  2,  0,148,  4,  2,  0,149,  4,
-  2,  0,150,  4,  2,  0,151,  4,  2,  0,152,  4,  2,  0,153,  4,  2,  0,154,  4,195,  0,155,  4,  7,  0,156,  4,  7,  0,157,  4,
-140,  0,158,  4, 14,  0, 26,  3,188,  0,159,  4,  7,  0,160,  4,  7,  0,161,  4,  7,  0,162,  4,  4,  0,163,  4,196,  0,  1,  0,
-  7,  0,164,  4,156,  0, 52,  0,155,  0,165,  4,  2,  0, 16,  0,  2,  0,166,  4,  2,  0,167,  4,  2,  0,168,  4,  7,  0,169,  4,
-  2,  0,170,  4,  2,  0,171,  4,  7,  0,172,  4,  2,  0,173,  4,  2,  0,174,  4,  7,  0,175,  4,  7,  0,176,  4,  7,  0,177,  4,
-  4,  0,178,  4,  4,  0,179,  4,  4,  0,180,  4,  4,  0, 27,  0,  7,  0,181,  4,  4,  0,182,  4,  7,  0,183,  4,  7,  0,184,  4,
-  7,  0,185,  4, 79,  0,186,  4, 79,  0,187,  4,  0,  0,188,  4,  7,  0,189,  4,  7,  0,190,  4, 31,  0, 79,  0,  2,  0,191,  4,
-  0,  0,192,  4,  0,  0,193,  4,  7,  0,194,  4,  4,  0,195,  4,  7,  0,196,  4,  7,  0,197,  4,  4,  0,198,  4,  4,  0, 18,  0,
-  7,  0,199,  4,  7,  0,200,  4,  7,  0,201,  4,196,  0,202,  4,  4,  0, 52,  0,  7,  0,203,  4,  7,  0,204,  4,  7,  0,205,  4,
-  7,  0,206,  4,  7,  0,207,  4,  7,  0,208,  4,  7,  0,209,  4,  4,  0,210,  4,  7,  0,211,  4,197,  0, 78,  0, 22,  0, 32,  0,
- 34,  0, 74,  0,  2,  0,178,  0,  2,  0, 88,  1,  2,  0,124,  1,  2,  0,212,  4,  7,  0,213,  4,  7,  0,214,  4,  7,  0,215,  4,
-  7,  0,216,  4,  7,  0,217,  4,  7,  0,218,  4,  7,  0,173,  1,  7,  0,175,  1,  7,  0,174,  1,  7,  0, 30,  0,  4,  0,219,  4,
-  7,  0,220,  4,  7,  0,221,  4,  7,  0,222,  4,  7,  0,223,  4,  7,  0,224,  4,  7,  0,225,  4,  7,  0,226,  4,  2,  0,227,  4,
-  2,  0, 87,  1,  2,  0,228,  4,  2,  0,229,  4,  2,  0,230,  4,  2,  0,231,  4,  2,  0,232,  4,  2,  0,233,  4,  7,  0,234,  4,
-  7,  0,235,  4,  7,  0,236,  4,  7,  0,237,  4,  7,  0,238,  4,  7,  0,239,  4,  7,  0,240,  4,  7,  0,241,  4,  7,  0,242,  4,
-  7,  0,243,  4,  7,  0,244,  4,  7,  0,245,  4,  2,  0,246,  4,  2,  0,247,  4,  2,  0,248,  4,  2,  0,249,  4,  7,  0,250,  4,
-  7,  0,251,  4,  7,  0,252,  4,  7,  0,253,  4,  2,  0,254,  4,  2,  0,255,  4,  2,  0,  0,  5,  2,  0,  1,  5,  7,  0,  2,  5,
-  7,  0,  3,  5,  7,  0,  4,  5,  7,  0,  5,  5,  7,  0,  6,  5,  7,  0,  7,  5,  7,  0,  8,  5,  2,  0,  9,  5,  2,  0, 10,  5,
-  2,  0, 11,  5,  2,  0, 12,  5,  2,  0, 13,  5,  2,  0, 18,  0,  7,  0, 14,  5,  7,  0, 15,  5, 31,  0, 79,  0, 46,  0,143,  1,
-  2,  0,144,  1,  2,  0, 76,  1,  2,  0,186,  2, 25,  0,153,  0, 57,  0, 70,  1,198,  0,  8,  0,198,  0,  0,  0,198,  0,  1,  0,
-  4,  0,210,  3,  4,  0, 16,  5,  4,  0, 18,  0,  2,  0, 17,  5,  2,  0, 18,  5, 27,  0,167,  0,199,  0, 13,  0, 11,  0, 19,  5,
- 11,  0, 20,  5,  4,  0, 21,  5,  4,  0, 22,  5,  4,  0, 23,  5,  4,  0, 24,  5,  4,  0, 25,  5,  4,  0, 26,  5,  4,  0, 27,  5,
-  4,  0, 28,  5,  4,  0, 29,  5,  4,  0, 27,  0,  0,  0, 30,  5,200,  0,  5,  0, 11,  0, 31,  5, 11,  0, 32,  5,  4,  0, 33,  5,
-  4,  0, 30,  0,  0,  0, 34,  5,201,  0, 17,  0,  4,  0, 35,  5,  4,  0, 36,  5,  4,  0, 37,  5,  4,  0, 38,  5,  4,  0, 39,  5,
-  4,  0, 40,  5,  4,  0, 41,  5,  4,  0, 42,  5,  4,  0, 43,  5,  4,  0, 44,  5,  4,  0, 45,  5,  4,  0, 46,  5,  2,  0, 47,  5,
-  2,  0, 48,  5,  4,  0, 49,  5,  4,  0, 50,  5,  4,  0, 66,  0,202,  0, 17,  0,  4,  0, 16,  0,  4,  0, 37,  5,  4,  0, 51,  5,
-  4,  0, 52,  5,  4,  0, 53,  5,  4,  0, 54,  5,  4,  0, 55,  5,  4,  0, 56,  5,  7,  0, 57,  5,  4,  0, 58,  5,  4,  0, 91,  0,
-  4,  0, 59,  5,  4,  0, 60,  5,  4,  0, 61,  5,  4,  0, 62,  5,  4,  0, 63,  5, 21,  0, 31,  0,203,  0,  9,  0,  4,  0, 64,  5,
-  7,  0, 65,  5,  7,  0, 66,  5,  7,  0, 67,  5,  4,  0, 68,  5,  2,  0, 18,  0,  2,  0, 27,  0,  7,  0, 89,  4,  7,  0, 30,  0,
-204,  0, 13,  0,204,  0,  0,  0,204,  0,  1,  0,  0,  0, 19,  0, 63,  0, 69,  5, 64,  0, 70,  5,  4,  0,210,  3,  4,  0, 71,  5,
-  4,  0, 72,  5,  4,  0, 73,  5,  4,  0, 74,  5,  4,  0, 75,  5,  4,  0, 76,  5,  4,  0, 27,  0,205,  0, 13,  0,  0,  0, 77,  5,
-  0,  0,250,  0,  0,  0, 78,  5,  0,  0, 18,  0,  0,  0, 79,  5,  0,  0, 80,  5,  0,  0, 81,  5,  0,  0, 82,  5,  2,  0, 83,  5,
-  2,  0, 84,  5,  7,  0, 85,  5,  0,  0, 86,  5,  0,  0,123,  0,206,  0,106,  0,205,  0, 87,  5,199,  0, 88,  5,200,  0, 89,  5,
-201,  0, 90,  5,202,  0, 91,  5,  4,  0, 41,  3,  4,  0,128,  0,  4,  0,137,  4,  7,  0, 92,  5,  4,  0, 93,  5,  4,  0, 94,  5,
-  4,  0, 95,  5,  4,  0, 96,  5,  2,  0, 18,  0,  2,  0, 97,  5,  7,  0, 98,  5,  7,  0, 99,  5,  7,  0,100,  5,  7,  0,101,  5,
-  7,  0,102,  5,  2,  0,103,  5,  2,  0,104,  5,  2,  0,105,  5,  2,  0,106,  5,  2,  0,250,  0,  2,  0,107,  5,  4,  0,108,  5,
-  2,  0,109,  5,  2,  0,110,  5,  2,  0,110,  1,  2,  0,107,  0,  2,  0,111,  5,  2,  0,112,  5,  2,  0,113,  5,  2,  0,114,  5,
-  2,  0,115,  5,  2,  0, 78,  5,  2,  0, 77,  5,  2,  0,116,  5,  2,  0, 79,  5,  2,  0,117,  5,  4,  0,118,  5,  4,  0, 87,  1,
-  4,  0,119,  5,  2,  0,120,  5,  2,  0, 66,  0,  2,  0,121,  5,  2,  0,122,  5,  2,  0,123,  5,  2,  0,124,  5,  2,  0,125,  5,
-  2,  0,126,  5, 19,  0,127,  5, 19,  0,128,  5, 18,  0,129,  5, 14,  0,130,  5,  2,  0,131,  5,  2,  0,132,  5,  7,  0,133,  5,
-  7,  0,134,  5,  7,  0,135,  5,  7,  0,136,  5,  4,  0,137,  5,  7,  0,138,  5,  7,  0,139,  5,  7,  0,140,  5,  7,  0,141,  5,
-  2,  0,142,  5,  2,  0,143,  5,  2,  0,144,  5,  2,  0,145,  5,  2,  0,146,  5,  2,  0,147,  5,  7,  0,148,  5,  7,  0,149,  5,
-  7,  0,150,  5,  0,  0,151,  5,  4,  0,152,  5,  2,  0,153,  5,  2,  0,250,  1,  0,  0,154,  5,  7,  0,155,  5,  7,  0,156,  5,
-  0,  0,157,  5,  0,  0,158,  5,  0,  0,159,  5,  0,  0,160,  5,  4,  0,161,  5,  2,  0,162,  5,  2,  0,163,  5,  7,  0,164,  5,
-  7,  0,165,  5,  2,  0,166,  5,  2,  0,167,  5,  7,  0,168,  5,  2,  0,169,  5,  2,  0,170,  5,  4,  0,171,  5,  2,  0,172,  5,
-  2,  0,173,  5,  2,  0,174,  5,  2,  0,175,  5,  7,  0,176,  5,  7,  0, 30,  0, 37,  0,177,  5,  0,  0,178,  5,207,  0,  9,  0,
-207,  0,  0,  0,207,  0,  1,  0,  0,  0,179,  5,  2,  0,180,  5,  2,  0,181,  5,  2,  0,182,  5,  2,  0, 66,  0,  7,  0,183,  5,
-  7,  0, 30,  0,208,  0,  7,  0,  2,  0,236,  2,  2,  0, 87,  1,  2,  0, 99,  3,  2,  0,184,  5,  7,  0,185,  5,  7,  0, 30,  0,
- 37,  0,186,  5,209,  0,  5,  0,  7,  0,187,  5,  0,  0, 16,  0,  0,  0, 66,  0,  0,  0, 30,  0,  0,  0,250,  1,210,  0, 15,  0,
-  7,  0,188,  5,  7,  0,189,  5,  7,  0,190,  5,  7,  0,191,  5,  7,  0,192,  5,  7,  0,193,  5,  7,  0,194,  5,  7,  0,195,  5,
-  7,  0,196,  5,  7,  0,197,  5,  4,  0,198,  5,  7,  0,199,  5,  7,  0,200,  5,  2,  0, 66,  0,  2,  0, 30,  0,211,  0, 32,  0,
-209,  0,201,  5,  2,  0,202,  5,  2,  0,104,  5,  2,  0,105,  5,  2,  0,106,  5,  2,  0,250,  0,  2,  0,107,  5,  2,  0,203,  5,
-  2,  0,204,  5,  2,  0,205,  5,  2,  0,206,  5,208,  0,207,  5,  2,  0,208,  5,  2,  0,109,  5,  7,  0,209,  5,210,  0,210,  5,
-  7,  0,225,  4,  7,  0,226,  4,  4,  0, 18,  0,  2,  0, 87,  1,  2,  0,211,  5,  2,  0,228,  4,  2,  0,229,  4,  2,  0,212,  5,
-  2,  0, 27,  0,  2,  0,230,  4,  2,  0,231,  4,  2,  0,232,  4,  2,  0,233,  4,  2,  0,213,  5,  2,  0, 66,  0,  7,  0,214,  5,
-212,  0,  6,  0,212,  0,  0,  0,212,  0,  1,  0,  4,  0, 66,  4,  0,  0, 19,  0,  4,  0, 18,  0, 27,  0,215,  5,213,  0,  6,  0,
-214,  0,151,  3, 11,  0,216,  5,  0,  0,217,  5,  4,  0, 91,  0,  4,  0,218,  5,  4,  0, 27,  0,215,  0,  8,  0,213,  0,219,  5,
-  2,  0, 18,  0,  2,  0, 27,  0,  2,  0,220,  5,  2,  0,221,  5,  2,  0,222,  5,  4,  0, 66,  0, 11,  0,223,  5,216,  0,  6,  0,
-  2,  0,107,  0,  2,  0, 72,  4,  2,  0,224,  5,  2,  0,230,  2,  4,  0, 18,  0,  7,  0,214,  2,217,  0, 14,  0,  2,  0, 18,  0,
-  2,  0,225,  5,  2,  0,226,  5,  2,  0,227,  5,216,  0,228,  5, 11,  0,223,  5,  7,  0,229,  5,  7,  0, 55,  0,  4,  0,230,  5,
-  4,  0,231,  5,  4,  0,232,  5,  4,  0,233,  5, 41,  0,124,  0, 27,  0,167,  0,218,  0, 14,  0,213,  0,219,  5,  4,  0, 91,  0,
-  4,  0,234,  5,  7,  0,235,  5,  7,  0,236,  5,  7,  0,237,  5,  4,  0,238,  5,  4,  0,239,  5,  7,  0,240,  5,  7,  0,241,  5,
-  4,  0,242,  5,  7,  0,243,  5,  7,  0,244,  5,  4,  0, 27,  0,219,  0,  1,  0,213,  0,219,  5,220,  0,  7,  0,213,  0,219,  5,
-  2,  0, 18,  0,  2,  0, 27,  0,  4,  0,240,  0,  4,  0,245,  5, 91,  0,246,  5, 11,  0,223,  5,221,  0,  5,  0,221,  0,  0,  0,
-221,  0,  1,  0,  0,  0, 19,  0,  7,  0,247,  5,  4,  0, 27,  0,222,  0,  6,  0,  4,  0,107,  0,  7,  0,248,  5,  7,  0,181,  1,
-  7,  0, 43,  2,  4,  0, 18,  0,  4,  0, 27,  0,223,  0, 85,  0,220,  0,249,  5,220,  0,250,  5,218,  0,174,  3,219,  0,251,  5,
-  7,  0,252,  5,  2,  0,253,  5,  2,  0,250,  1,  7,  0,254,  5,  7,  0,255,  5,  2,  0, 72,  4,  2,  0,  0,  6,  7,  0,  1,  6,
-  7,  0,  2,  6,  7,  0,  3,  6,  2,  0,  4,  6,  2,  0,230,  5,  2,  0,  5,  6,  2,  0,  6,  6,  2,  0,  7,  6,  2,  0,  8,  6,
-  7,  0,  9,  6,  7,  0, 10,  6,  7,  0, 11,  6,  2,  0, 12,  6,  2,  0, 13,  6,  2,  0, 14,  6,  2,  0, 15,  6,  2,  0, 16,  6,
-  2,  0, 17,  6,  2,  0, 18,  6,  2,  0, 19,  6,215,  0, 20,  6,217,  0, 21,  6,  7,  0, 22,  6,  7,  0, 23,  6,  7,  0, 24,  6,
-  2,  0, 25,  6,  2,  0, 26,  6,  0,  0, 27,  6,  0,  0, 28,  6,  2,  0, 29,  6,  7,  0, 30,  6,  7,  0, 31,  6,  7,  0, 32,  6,
-  7,  0, 33,  6,  7,  0, 34,  6,  7,  0, 35,  6,  7,  0, 36,  6,  7,  0, 37,  6,  7,  0, 38,  6,  7,  0, 39,  6,  2,  0, 40,  6,
-  0,  0, 41,  6,  0,  0, 42,  6,  0,  0, 43,  6,  0,  0, 44,  6, 27,  0, 45,  6,  0,  0, 46,  6,  0,  0, 47,  6,  0,  0, 48,  6,
-  0,  0, 49,  6,  0,  0, 50,  6,  0,  0, 51,  6,  0,  0, 52,  6,  0,  0, 53,  6,  0,  0, 54,  6,  0,  0, 55,  6,  2,  0, 56,  6,
-  2,  0, 57,  6,  2,  0, 58,  6,  2,  0, 59,  6,  0,  0, 60,  6,  0,  0, 61,  6,  0,  0, 62,  6,  0,  0, 63,  6,  4,  0, 64,  6,
-  4,  0, 65,  6,  4,  0, 66,  6,  4,  0, 67,  6,  2,  0, 68,  6,  2,  0, 66,  0,  4,  0, 69,  6,  7,  0, 70,  6,  7,  0, 71,  6,
-222,  0, 72,  6,224,  0,  8,  0,  4,  0, 73,  6,  4,  0, 74,  6,  4,  0, 75,  6,  4,  0, 76,  6,  4,  0, 77,  6,  4,  0, 78,  6,
-  4,  0, 52,  0,  4,  0,143,  2,225,  0,  4,  0,  7,  0, 79,  6,  0,  0, 80,  6,  0,  0, 81,  6,  2,  0, 18,  0,226,  0,  4,  0,
-  7,  0, 82,  6,  4,  0, 18,  0,  4,  0, 83,  6,  4,  0, 55,  0, 41,  0, 46,  0, 22,  0, 32,  0, 34,  0, 74,  0, 27,  0,215,  5,
-197,  0, 84,  6, 41,  0, 85,  6, 14,  0, 86,  6,198,  0, 87,  6, 27,  0, 88,  6,  7,  0, 89,  6,  7,  0, 90,  6,  7,  0, 91,  6,
-  7,  0, 92,  6,  4,  0,210,  3,  4,  0, 93,  6,  4,  0, 94,  6,  2,  0, 18,  0,  2,  0, 76,  1, 57,  0, 70,  1,227,  0, 95,  6,
-223,  0, 96,  6,228,  0, 97,  6,206,  0,184,  0,203,  0, 98,  6, 14,  0,101,  0, 14,  0, 99,  6, 11,  0,100,  6, 11,  0,101,  6,
- 11,  0,102,  6, 11,  0,103,  6, 11,  0,104,  6,229,  0,105,  6,  2,  0,106,  6,  2,  0,107,  6,  2,  0,251,  0,  2,  0,211,  3,
-  4,  0,221,  3,  4,  0,108,  6, 14,  0,109,  6,209,  0,201,  5,211,  0,110,  6,225,  0,111,  6,179,  0,187,  3,226,  0,112,  6,
-230,  0,113,  6, 10,  0, 12,  4, 10,  0,114,  6,231,  0, 14,  0,231,  0,  0,  0,231,  0,  1,  0, 42,  0,242,  0, 40,  0, 69,  1,
-230,  0,113,  6,232,  0,115,  6,  7,  0,100,  2,  7,  0,101,  2,  7,  0,107,  0,  7,  0,116,  6,  2,  0,117,  6,  2,  0, 18,  0,
-  2,  0,142,  0,  2,  0, 27,  0,233,  0, 39,  0,  7,  0,118,  6,  7,  0,119,  6,  7,  0,120,  6,  7,  0,121,  6,  7,  0,122,  6,
-  7,  0,123,  6,  7,  0,124,  6,  7,  0,125,  6,  7,  0,126,  6, 68,  0,127,  6,179,  0,187,  3,233,  0,128,  6,234,  0,129,  6,
-235,  0,130,  6,236,  0,131,  6,237,  0,132,  6,238,  0,133,  6,  7,  0,134,  6,  7,  0,135,  6,  7,  0, 94,  1,  7,  0,136,  6,
-  7,  0,137,  6,  7,  0,138,  6,  7,  0,139,  6,  7,  0,174,  0,  7,  0,140,  6,  0,  0,141,  6,  0,  0,142,  6,  0,  0,117,  6,
-  0,  0,143,  6,  2,  0,144,  6,  2,  0,145,  6,  7,  0,146,  6,  2,  0,147,  6,  2,  0,148,  6,  7,  0,149,  6,  7,  0,150,  6,
-  7,  0,151,  6,  7,  0,152,  6,239,  0, 51,  0,240,  0,  0,  0,240,  0,  1,  0, 14,  0,153,  6,  4,  0,154,  6,  7,  0,155,  6,
-  2,  0,156,  6,  7,  0,135,  6,  7,  0, 94,  1,  7,  0,157,  6,  2,  0,158,  6,  0,  0,216,  2,  4,  0,159,  6,  2,  0,142,  6,
-  2,  0,117,  6, 27,  0,215,  5, 27,  0,160,  6, 14,  0,161,  6,231,  0,162,  6,239,  0,128,  6,  0,  0,163,  6,  4,  0,210,  3,
-  4,  0, 93,  6,  2,  0,164,  6,  2,  0,165,  6,  2,  0,166,  6,  2,  0,167,  6,  2,  0, 18,  0,  2,  0, 35,  2,  7,  0,113,  0,
-  7,  0,168,  6,  7,  0,169,  6,  7,  0,170,  6,  7,  0,174,  0,  7,  0, 89,  6,  2,  0,171,  6,  2,  0,172,  6,  2,  0,173,  6,
-  0,  0,174,  6,  0,  0,175,  6,  0,  0,176,  6,  0,  0,177,  6,  0,  0,178,  6, 14,  0,179,  6, 14,  0,180,  6, 14,  0,181,  6,
-  2,  0,182,  6,  2,  0,157,  2,  2,  0,183,  6,  0,  0,184,  6, 11,  0,185,  6,179,  0,187,  3,241,  0, 24,  0, 19,  0,240,  0,
- 19,  0, 62,  0, 18,  0,186,  6, 18,  0,187,  6, 18,  0,188,  6,  7,  0,189,  6,  7,  0,190,  6,  7,  0,191,  6,  7,  0,192,  6,
-  2,  0,193,  6,  2,  0,194,  6,  2,  0,195,  6,  2,  0,196,  6,  2,  0,197,  6,  2,  0, 18,  0,  2,  0,198,  6,  2,  0,199,  6,
-  2,  0,200,  6,  2,  0,201,  6,  2,  0,202,  6,  2,  0,167,  6,  7,  0,203,  6,  4,  0,204,  6,  4,  0,205,  6,240,  0,  6,  0,
-240,  0,  0,  0,240,  0,  1,  0, 14,  0,153,  6,  4,  0,154,  6,  7,  0,155,  6,  2,  0,156,  6,242,  0,  8,  0,240,  0,  0,  0,
-240,  0,  1,  0, 14,  0,153,  6,  4,  0,154,  6,  7,  0,155,  6,  2,  0,156,  6,  0,  0,206,  6,  0,  0,123,  0,243,  0, 14,  0,
-240,  0,  0,  0,240,  0,  1,  0, 14,  0,153,  6,  4,  0,154,  6,  7,  0,155,  6,  2,  0,156,  6,241,  0,207,  6,244,  0,208,  6,
- 14,  0,209,  6,  2,  0, 87,  1,  2,  0,210,  6,  4,  0, 18,  0,  7,  0,211,  6,  4,  0,167,  6,245,  0, 21,  0,240,  0,  0,  0,
-240,  0,  1,  0, 14,  0,153,  6,  4,  0,154,  6,  7,  0,155,  6,  2,  0,156,  6,241,  0,207,  6,  2,  0,212,  6,  2,  0,213,  6,
-  2,  0,214,  6,  2,  0,215,  6,  2,  0,198,  6,  2,  0,216,  6,  2,  0,217,  6,  0,  0, 18,  0,  0,  0, 27,  0, 11,  0, 76,  2,
-  4,  0,218,  6,  4,  0,219,  6, 22,  0,220,  6, 11,  0,221,  6,246,  0, 18,  0,240,  0,  0,  0,240,  0,  1,  0, 14,  0,153,  6,
-  4,  0,154,  6,  7,  0,155,  6,  2,  0,156,  6,241,  0,207,  6,  7,  0,100,  2,  7,  0,101,  2,  2,  0,212,  6,  2,  0,222,  6,
-  2,  0,223,  6,  2,  0,224,  6,  4,  0, 18,  0,  7,  0,225,  6,  4,  0,117,  6,  4,  0, 27,  0,179,  0,187,  3,247,  0, 16,  0,
-  0,  0,226,  6,  0,  0,227,  6,  0,  0,228,  6,  0,  0,229,  6,  0,  0,230,  6,  0,  0,231,  6,  4,  0,232,  6,  4,  0,233,  6,
-  4,  0,234,  6,  2,  0, 16,  0,  2,  0, 18,  0,  2,  0,235,  6,  2,  0,236,  6,  2,  0,193,  1,  2,  0,237,  6,  0,  0,238,  6,
-248,  0, 16,  0,240,  0,  0,  0,240,  0,  1,  0, 14,  0,153,  6,  4,  0,154,  6,  4,  0,239,  6,247,  0,240,  6,249,  0,241,  6,
- 14,  0,242,  6, 14,  0,243,  6,250,  0,244,  6,238,  0,245,  6,251,  0,246,  6,  2,  0,247,  6,  2,  0,248,  6,  2,  0,249,  6,
-  2,  0, 30,  0,252,  0, 15,  0,240,  0,  0,  0,240,  0,  1,  0, 14,  0,153,  6,  4,  0,154,  6,  7,  0,155,  6,  2,  0,156,  6,
-241,  0,207,  6, 14,  0,250,  6,253,  0,251,  6,  0,  0,252,  6,254,  0,253,  6,  2,  0, 18,  0,  2,  0,254,  6,  2,  0,255,  6,
-  2,  0,  0,  7,255,  0, 25,  0,240,  0,  0,  0,240,  0,  1,  0, 14,  0,153,  6,  4,  0,154,  6,  4,  0, 18,  0, 42,  0,249,  2,
- 40,  0, 69,  1, 54,  0,  1,  7,  0,  1,  2,  7,  1,  1,  3,  7,179,  0,187,  3,  7,  0,  4,  7,  7,  0,100,  2,  7,  0,101,  2,
-  7,  0,225,  6,  7,  0,  5,  7,  7,  0,  6,  7,  2,  0,  7,  7,  2,  0, 27,  0,  2,  0,  8,  7,  2,  0,  9,  7,  0,  0, 10,  7,
-  0,  0, 11,  7,  0,  0, 12,  7,  0,  0,167,  6,  2,  1, 11,  0,240,  0,  0,  0,240,  0,  1,  0, 14,  0,153,  6,  4,  0,154,  6,
-  7,  0,155,  6,  2,  0,156,  6,  2,  0,210,  6,  2,  0, 18,  0,  4,  0, 27,  0,244,  0,208,  6,241,  0,207,  6,  3,  1, 31,  0,
-240,  0,  0,  0,240,  0,  1,  0, 14,  0,153,  6,  4,  0,154,  6,  7,  0,155,  6,  2,  0,156,  6, 37,  0, 13,  7,  4,  0, 14,  7,
-  4,  0, 15,  7,  2,  0, 91,  0,  2,  0, 16,  7,  2,  0, 17,  7,  0,  0, 18,  7,  0,  0, 19,  7,  4,  0, 20,  7,  4,  0, 21,  7,
-  4,  0, 22,  7,  2,  0, 23,  7,  2,  0, 24,  7,  2,  0, 25,  7,  2,  0, 26,  7,  7,  0, 27,  7, 18,  0, 28,  7, 18,  0, 29,  7,
-  4,  0, 30,  7,  4,  0, 31,  7,  0,  0, 32,  7,  0,  0, 33,  7,  2,  0, 34,  7,  0,  0,216,  2, 11,  0, 35,  7,  4,  1, 10,  0,
- 22,  0, 32,  0, 11,  0, 36,  7, 11,  0, 37,  7, 11,  0, 38,  7, 11,  0, 39,  7, 11,  0, 40,  7,  4,  0, 91,  0,  4,  0, 41,  7,
-  0,  0, 42,  7,  0,  0, 43,  7,  5,  1, 10,  0,240,  0,  0,  0,240,  0,  1,  0, 14,  0,153,  6,  4,  0,154,  6,  7,  0,155,  6,
-  4,  1, 44,  7,  2,  0, 91,  0,  2,  0, 16,  7,  4,  0, 66,  0, 11,  0, 45,  7,  6,  1,  3,  0,  6,  1,  0,  0,  6,  1,  1,  0,
-  7,  0, 46,  7,  7,  1,  9,  0,240,  0,  0,  0,240,  0,  1,  0, 14,  0,153,  6,  4,  0,154,  6,  7,  0,155,  6,241,  0,207,  6,
- 14,  0, 47,  7,  4,  0, 48,  7,  4,  0, 18,  0,  8,  1, 27,  0,240,  0,  0,  0,240,  0,  1,  0, 14,  0,153,  6,  4,  0,154,  6,
-  7,  0,155,  6,  2,  0,156,  6,241,  0,207,  6, 22,  0, 49,  7, 22,  0, 80,  0,  2,  0, 18,  0,  2,  0, 66,  0,  7,  0, 50,  7,
-  7,  0,100,  2,  7,  0,101,  2,  7,  0,225,  6,  7,  0, 51,  7,  7,  0, 52,  7,  7,  0, 53,  7, 57,  0, 70,  1, 57,  0, 54,  7,
-  4,  0, 55,  7,  2,  0, 56,  7,  2,  0, 57,  7,  2,  0,251,  0,  2,  0, 86,  1, 14,  0, 58,  7,179,  0,187,  3,  9,  1, 10,  0,
-240,  0,  0,  0,240,  0,  1,  0, 14,  0,153,  6,  4,  0,154,  6,  7,  0,155,  6,  2,  0,156,  6,  2,  0, 18,  0,  2,  0,219,  3,
-  4,  0, 27,  0,179,  0,187,  3, 10,  1,  7,  0, 10,  1,  0,  0, 10,  1,  1,  0,  4,  0, 59,  7,  4,  0, 22,  0,  0,  0, 85,  0,
-  4,  0, 60,  7,  4,  0, 16,  0, 11,  1, 14,  0,240,  0,  0,  0,240,  0,  1,  0, 14,  0,153,  6,  4,  0,154,  6,  7,  0,155,  6,
-  2,  0,156,  6,  4,  0, 17,  7,  4,  0, 27,  0, 14,  0, 61,  7, 14,  0, 62,  7,  0,  0, 63,  7,  0,  0, 64,  7,  4,  0, 65,  7,
-  4,  0, 66,  7, 12,  1,  6,  0,240,  0,  0,  0,240,  0,  1,  0, 14,  0,153,  6,  4,  0,154,  6,  4,  0, 27,  0,  0,  0, 67,  7,
- 13,  1, 28,  0,240,  0,  0,  0,240,  0,  1,  0, 14,  0,153,  6,  4,  0,154,  6,  7,  0,100,  2,  7,  0,101,  2,  7,  0, 68,  7,
-  7,  0, 69,  7,  7,  0,225,  6,232,  0, 70,  7,230,  0,113,  6, 14,  1,  2,  7,  4,  0, 18,  0,  2,  0, 87,  1,  2,  0,117,  6,
-  4,  0, 71,  7,  7,  0, 72,  7,  7,  0,153,  3,  7,  0, 99,  3,  4,  0, 27,  0,  7,  0, 73,  7,  7,  0, 74,  7,  4,  0, 75,  7,
-  4,  0, 30,  0, 11,  0, 76,  7,  2,  0, 77,  7,  2,  0, 78,  7,  4,  0,250,  1, 15,  1,  7,  0, 15,  1,  0,  0, 15,  1,  1,  0,
-  0,  0, 79,  7,  2,  0, 80,  7,  2,  0, 81,  7,  2,  0, 82,  7,  2,  0, 27,  0, 16,  1, 12,  0,  2,  0, 81,  7,  2,  0, 83,  7,
-  2,  0, 84,  7,  0,  0,216,  2,  2,  0, 85,  7,  2,  0, 86,  7,  2,  0, 87,  7,  2,  0, 88,  7,  2,  0, 89,  7,  2,  0,198,  6,
-  7,  0, 90,  7,  7,  0, 91,  7, 17,  1, 18,  0, 17,  1,  0,  0, 17,  1,  1,  0,  0,  0, 19,  0, 16,  1, 92,  7, 16,  1, 93,  7,
- 16,  1, 94,  7, 16,  1, 95,  7,  7,  0, 96,  7,  2,  0, 97,  7,  2,  0, 98,  7,  2,  0, 99,  7,  2,  0,100,  7,  2,  0,101,  7,
-  2,  0,102,  7,  2,  0,103,  7,  2,  0,104,  7,  2,  0,105,  7,  2,  0, 27,  0, 18,  1, 10,  0,  0,  0,106,  7,  0,  0,107,  7,
-  0,  0,108,  7,  0,  0,109,  7,  0,  0,110,  7,  0,  0,111,  7,  2,  0,112,  7,  2,  0,113,  7,  2,  0,114,  7,  2,  0,115,  7,
- 19,  1,  8,  0,  0,  0,116,  7,  0,  0,117,  7,  0,  0,118,  7,  0,  0,119,  7,  0,  0,120,  7,  0,  0,121,  7,  7,  0,116,  6,
-  7,  0, 27,  0, 20,  1,  3,  0,  0,  0,122,  7,  2,  0,123,  7,  2,  0, 27,  0, 21,  1, 22,  0, 18,  1,124,  7, 18,  1,125,  7,
- 18,  1,126,  7, 18,  1,127,  7, 18,  1,128,  7, 18,  1,129,  7, 18,  1,130,  7, 18,  1,131,  7, 18,  1,132,  7, 18,  1,133,  7,
- 18,  1,134,  7, 18,  1,135,  7, 18,  1,136,  7, 18,  1,137,  7, 18,  1,138,  7, 18,  1,139,  7, 18,  1,140,  7, 19,  1,141,  7,
- 20,  1,142,  7,  0,  0,143,  7,  7,  0,144,  7,  7,  0, 27,  0, 22,  1,122,  0,  0,  0,145,  7,  0,  0,146,  7,  0,  0,110,  7,
-  0,  0,147,  7,  0,  0,122,  7,  0,  0,148,  7,  0,  0,149,  7,  0,  0,150,  7,  0,  0,151,  7,  0,  0,152,  7,  0,  0,153,  7,
-  0,  0,154,  7,  0,  0,155,  7,  0,  0,156,  7,  0,  0,157,  7,  0,  0,158,  7,  0,  0,159,  7,  0,  0,160,  7,  0,  0,161,  7,
-  0,  0,162,  7,  0,  0,163,  7,  0,  0,164,  7,  0,  0,165,  7,  0,  0,166,  7,  0,  0,167,  7,  0,  0,168,  7,  0,  0,169,  7,
-  0,  0,170,  7,  0,  0,171,  7,  0,  0,172,  7,  0,  0,173,  7,  0,  0,174,  7,  0,  0,175,  7,  0,  0,176,  7,  0,  0,177,  7,
-  0,  0,178,  7,  0,  0,179,  7,  0,  0,180,  7,  0,  0,181,  7,  0,  0,182,  7,  0,  0,183,  7,  0,  0,184,  7,  0,  0,185,  7,
-  0,  0,186,  7,  0,  0,187,  7,  0,  0,188,  7,  0,  0,189,  7,  0,  0,190,  7,  0,  0,191,  7,  0,  0,192,  7,  0,  0,193,  7,
-  0,  0,194,  7,  0,  0,195,  7,  0,  0,196,  7,  0,  0,197,  7,  0,  0,198,  7,  0,  0,199,  7,  0,  0,200,  7,  0,  0,201,  7,
-  0,  0,202,  7,  0,  0,203,  7,  0,  0,204,  7,  0,  0,205,  7,  0,  0,206,  7,  0,  0,207,  7,  0,  0,208,  7,  0,  0,209,  7,
-  0,  0,210,  7,  0,  0,211,  7,  0,  0,212,  7,  0,  0,213,  7,  0,  0,214,  7,  0,  0,215,  7,  0,  0,216,  7,  0,  0,217,  7,
-  0,  0,218,  7,  0,  0,219,  7,  0,  0,220,  7,  0,  0,221,  7,  0,  0,222,  7,  0,  0,223,  7,  0,  0,224,  7,  0,  0,225,  7,
-  0,  0,226,  7,  0,  0,227,  7,  0,  0,228,  7,  0,  0,229,  7,  0,  0,230,  7,  0,  0,231,  7,  0,  0,232,  7,  0,  0,233,  7,
-  0,  0,234,  7,  0,  0,235,  7,  0,  0,236,  7,  0,  0,237,  7,  0,  0,238,  7,  0,  0,239,  7,  0,  0,240,  7,  0,  0,241,  7,
-  0,  0,242,  7,  0,  0,243,  7,  0,  0,244,  7,  0,  0,245,  7,  0,  0,246,  7,  0,  0,247,  7,  0,  0,248,  7,  0,  0,249,  7,
-  0,  0,250,  7,  0,  0,251,  7,  0,  0,252,  7,  0,  0,253,  7,  0,  0,254,  7,  0,  0,255,  7,  0,  0,  0,  8,  0,  0,  1,  8,
-  0,  0,  2,  8,  0,  0,  3,  8,  0,  0,  4,  8,  0,  0,  5,  8,  0,  0,  6,  8,  0,  0,  7,  8,  0,  0,  8,  8, 23,  1,  5,  0,
-  0,  0,  9,  8,  0,  0,168,  7,  0,  0,174,  7,  2,  0, 18,  0,  2,  0, 27,  0, 24,  1, 24,  0, 24,  1,  0,  0, 24,  1,  1,  0,
-  0,  0,179,  5, 21,  1, 10,  8, 22,  1, 11,  8, 22,  1, 12,  8, 22,  1, 13,  8, 22,  1, 14,  8, 22,  1, 15,  8, 22,  1, 16,  8,
- 22,  1, 17,  8, 22,  1, 18,  8, 22,  1, 19,  8, 22,  1, 20,  8, 22,  1, 21,  8, 22,  1, 22,  8, 22,  1, 23,  8, 22,  1, 24,  8,
- 22,  1, 25,  8, 22,  1, 26,  8, 22,  1, 27,  8, 23,  1, 28,  8,  4,  0, 29,  8,  4,  0, 27,  0, 25,  1,  3,  0, 25,  1,  0,  0,
- 25,  1,  1,  0,  0,  0, 30,  8, 26,  1,  5,  0,  4,  0, 18,  0,  4,  0, 27,  0,  7,  0,156,  2,  7,  0, 31,  8,  7,  0, 50,  2,
- 27,  1, 95,  0,  4,  0, 18,  0,  4,  0, 32,  8,  4,  0, 33,  8,  0,  0, 34,  8,  0,  0, 35,  8,  0,  0, 36,  8,  0,  0, 37,  8,
-  0,  0, 38,  8,  0,  0, 39,  8,  0,  0, 40,  8,  0,  0, 41,  8,  0,  0, 42,  8,  0,  0, 43,  8,  4,  0, 44,  8,  2,  0, 45,  8,
-  2,  0, 46,  8,  2,  0, 47,  8,  2,  0, 48,  8,  4,  0, 49,  8,  4,  0, 50,  8,  4,  0, 51,  8,  4,  0, 52,  8,  2,  0, 53,  8,
-  2,  0, 54,  8,  4,  0, 55,  8,  4,  0, 56,  8,  4,  0, 57,  8,  4,  0, 58,  8,  4,  0, 59,  8,  4,  0, 61,  7,  4,  0, 60,  8,
-  2,  0, 61,  8,  2,  0, 62,  8,  2,  0, 63,  8,  2,  0, 64,  8, 14,  0, 65,  8, 14,  0, 66,  8, 14,  0, 67,  8, 14,  0, 68,  8,
- 14,  0, 69,  8, 14,  0, 70,  8,  0,  0, 71,  8,  2,  0, 72,  8,  2,  0, 73,  8,  2,  0, 74,  8,  2,  0, 75,  8,  2,  0, 76,  8,
-  2,  0, 77,  8,  2,  0, 78,  8,  2,  0, 79,  8, 26,  1, 80,  8,  2,  0, 81,  8,  2,  0, 82,  8,  2,  0, 83,  8,  2,  0, 84,  8,
-  2,  0, 85,  8,  2,  0, 86,  8,  2,  0, 87,  8,  2,  0, 88,  8,  4,  0, 89,  8,  4,  0, 90,  8,  2,  0, 91,  8,  2,  0, 92,  8,
-  2,  0, 93,  8,  2,  0, 94,  8,  2,  0, 95,  8,  2,  0, 96,  8,  2,  0, 97,  8,  2,  0, 98,  8,  2,  0, 99,  8,  2,  0,100,  8,
-  2,  0,101,  8,  2,  0,102,  8,  2,  0,103,  8,  2,  0,104,  8,  2,  0,105,  8,  2,  0,106,  8,  2,  0,107,  8,  2,  0,108,  8,
-  7,  0,109,  8,  4,  0,110,  8,  7,  0,111,  8,  2,  0, 25,  6,  2,  0, 26,  6,  2,  0,112,  8,  2,  0,113,  8, 50,  0,114,  8,
-  7,  0,115,  8,  2,  0,116,  8,  2,  0,250,  1,  0,  0,117,  8,  4,  0,118,  8,  4,  0,119,  8,  7,  0,120,  8,  7,  0, 27,  0,
- 28,  1, 24,  0, 22,  0, 32,  0, 14,  0,121,  8, 14,  0,122,  8, 14,  0,123,  8, 14,  0,153,  6, 41,  0,124,  0, 41,  0,124,  8,
-  4,  0,125,  8,  4,  0, 66,  0,  2,  0,126,  8,  2,  0,127,  8,  2,  0,128,  8,  2,  0,129,  8,  2,  0,130,  8,  2,  0,131,  8,
-  2,  0,132,  8,  2,  0,133,  8,  2,  0,134,  8,  2,  0,135,  8,  2,  0,136,  8,  2,  0, 27,  0,238,  0,137,  8, 11,  0,138,  8,
-  2,  0,139,  8, 29,  1,  5,  0, 29,  1,  0,  0, 29,  1,  1,  0, 29,  1,140,  8, 15,  0,141,  8,  4,  0, 18,  0, 30,  1,  7,  0,
- 30,  1,  0,  0, 30,  1,  1,  0, 29,  1,142,  8, 29,  1,143,  8,  2,  0,128,  5,  2,  0, 18,  0,  4,  0, 27,  0, 31,  1, 25,  0,
- 31,  1,  0,  0, 31,  1,  1,  0, 32,  1,144,  8, 33,  1,246,  6,  0,  0,145,  8,  0,  0,146,  8,  0,  0,147,  8,  2,  0,148,  8,
-  2,  0,149,  8,  2,  0,150,  8,  2,  0,151,  8,  2,  0,152,  8,  2,  0, 27,  0,  2,  0, 18,  0,  2,  0,153,  8,  2,  0,154,  8,
-  2,  0,155,  8,  4,  0,156,  8, 31,  1,157,  8, 11,  0,158,  8,  4,  0,159,  8,  4,  0,160,  8,  4,  0,161,  8,  4,  0,162,  8,
-  0,  0,163,  8, 34,  1, 22,  0, 34,  1,  0,  0, 34,  1,  1,  0, 29,  1,142,  8, 29,  1,143,  8, 29,  1,164,  8, 29,  1,165,  8,
- 28,  1,166,  8, 18,  0, 50,  0,  0,  0,154,  6,  0,  0,167,  8,  2,  0,199,  6,  2,  0,200,  6,  2,  0,168,  8,  2,  0, 27,  0,
-  2,  0,130,  8,  2,  0, 60,  7,  2,  0, 18,  0, 35,  1,144,  8, 14,  0,169,  8, 14,  0,153,  6, 14,  0,170,  8, 14,  0,171,  8,
- 36,  1, 24,  0, 36,  1,  0,  0, 36,  1,  1,  0,241,  0,207,  6, 18,  0,172,  8, 18,  0,173,  8,  2,  0,199,  6,  2,  0,200,  6,
-  2,  0,174,  8,  2,  0,175,  8,  2,  0,176,  8,  2,  0, 18,  0,  7,  0, 96,  2,  2,  0,150,  8,  2,  0,151,  8,  2,  0,129,  8,
-  2,  0,177,  8,  2,  0,134,  8,  2,  0, 86,  1, 37,  1,144,  8, 14,  0,178,  8, 14,  0,179,  8, 14,  0,170,  8,  0,  0,180,  8,
- 11,  0,181,  8, 38,  1, 14,  0,  0,  0,182,  8,  2,  0,183,  8,  2,  0,184,  8,  2,  0,185,  8,  2,  0,186,  8,  2,  0,117,  5,
-  2,  0,187,  8, 28,  1,188,  8, 41,  0,189,  8,  4,  0,190,  8,  4,  0,191,  8,  4,  0,192,  8,  4,  0, 27,  0,  0,  0, 79,  7,
- 39,  1,  3,  0,  0,  0,193,  8,  4,  0,194,  8,  4,  0,195,  8, 40,  1,  4,  0,  4,  0, 14,  7,  4,  0,196,  8,  4,  0, 20,  7,
-  4,  0,197,  8, 41,  1,  2,  0,  4,  0,198,  8,  4,  0,199,  8, 42,  1,  5,  0,  7,  0,200,  8,  7,  0,201,  8,  7,  0,202,  8,
-  4,  0, 18,  0,  4,  0, 27,  0, 43,  1,  7,  0,  0,  0,203,  8,  0,  0,228,  6, 44,  0,137,  0,  2,  0,204,  8,  2,  0, 79,  5,
-  2,  0,205,  8,  2,  0,206,  8, 44,  1, 12,  0, 44,  1,  0,  0, 44,  1,  1,  0,  4,  0, 28,  0,  4,  0,207,  8,  4,  0,208,  8,
-  4,  0,209,  8, 39,  1,210,  8,  0,  0,203,  8, 43,  1,181,  3, 40,  1,211,  8, 41,  1,212,  8, 42,  1,213,  8, 45,  1, 12,  0,
-  0,  0, 35,  0, 11,  0,226,  0,  0,  0,227,  0,  4,  0,230,  0,  4,  0,238,  0, 11,  0,231,  0,  7,  0,233,  0,  7,  0,234,  0,
- 11,  0,214,  8, 11,  0,215,  8, 11,  0,235,  0, 11,  0,237,  0, 46,  1, 50,  0, 46,  1,  0,  0, 46,  1,  1,  0, 11,  0,216,  8,
- 11,  0, 25,  0,  0,  0, 19,  0,  4,  0, 18,  0,  4,  0, 16,  0,  4,  0, 22,  0,  4,  0, 89,  0,  4,  0,217,  8,  4,  0,218,  8,
-  4,  0,208,  8,  4,  0,209,  8,  4,  0,219,  8,  4,  0,250,  0,  4,  0,220,  8,  4,  0,221,  8,  7,  0,222,  8,  7,  0,223,  8,
-  7,  0,224,  8,  2,  0,225,  8,  2,  0,226,  8,  4,  0,227,  8,  4,  0,228,  8, 44,  1,229,  8, 31,  0, 79,  0, 41,  0,124,  0,
- 27,  0,230,  8, 44,  0,137,  0,230,  0,113,  6,  7,  0,231,  8,  7,  0,232,  8, 45,  1, 71,  1, 46,  1,233,  8, 46,  1,234,  8,
- 46,  1,235,  8, 14,  0,236,  8, 47,  1,237,  8, 11,  0,238,  8,  7,  0, 89,  4,  7,  0,239,  8,  7,  0,240,  8,  7,  0,241,  8,
- 11,  0,242,  8,  4,  0,243,  8,  4,  0,244,  8,  4,  0,245,  8,  7,  0,246,  8,  4,  0,128,  0,  4,  0, 27,  0, 48,  1,  4,  0,
- 48,  1,  0,  0, 48,  1,  1,  0, 14,  0,247,  8, 46,  1,248,  8,227,  0, 11,  0, 14,  0,249,  8, 14,  0,236,  8, 14,  0,250,  8,
- 46,  1,251,  8,  0,  0,252,  8,  0,  0,253,  8,  4,  0,254,  8,  4,  0,255,  8,  4,  0,  0,  9,  4,  0, 27,  0, 19,  0,  1,  9,
- 49,  1,  4,  0,  7,  0,  2,  9,  7,  0, 99,  3,  2,  0,  3,  9,  2,  0,  4,  9, 50,  1,  6,  0,  7,  0,  5,  9,  7,  0,  6,  9,
-  7,  0,  7,  9,  7,  0,  8,  9,  4,  0,  9,  9,  4,  0, 10,  9, 51,  1,  8,  0,  7,  0, 11,  9,  7,  0, 12,  9,  7,  0, 13,  9,
-  7,  0, 14,  9,  7,  0, 15,  9,  4,  0,255,  2,  4,  0, 16,  9,  4,  0, 17,  9, 52,  1,  2,  0,  7,  0,187,  5,  7,  0, 27,  0,
- 53,  1,  5,  0,  7,  0, 18,  9,  7,  0, 19,  9,  4,  0, 91,  0,  4,  0,217,  2,  4,  0, 20,  9, 54,  1,  6,  0, 54,  1,  0,  0,
- 54,  1,  1,  0,  2,  0, 16,  0,  2,  0, 18,  0,  2,  0, 21,  9,  2,  0, 55,  0, 55,  1,  8,  0, 55,  1,  0,  0, 55,  1,  1,  0,
-  2,  0, 16,  0,  2,  0, 18,  0,  2,  0, 21,  9,  2,  0, 55,  0,  7,  0, 22,  0,  7,  0,128,  0, 56,  1, 45,  0, 56,  1,  0,  0,
- 56,  1,  1,  0,  2,  0, 16,  0,  2,  0, 18,  0,  2,  0, 21,  9,  2,  0,246,  0,  2,  0,131,  4,  2,  0, 22,  9,  7,  0, 23,  9,
-  7,  0, 90,  0,  7,  0, 12,  3,  4,  0, 24,  9,  4,  0, 81,  0,  4,  0,219,  2,  7,  0, 25,  9,  7,  0, 26,  9,  7,  0, 27,  9,
-  7,  0, 28,  9,  7,  0, 29,  9,  7,  0, 30,  9,  7,  0,  9,  3,  7,  0, 68,  1,  7,  0, 31,  9,  7,  0, 32,  9,  7,  0, 27,  0,
-  7,  0, 33,  9,  7,  0, 34,  9,  7,  0, 35,  9,  2,  0, 36,  9,  2,  0, 37,  9,  2,  0, 38,  9,  2,  0, 39,  9,  2,  0, 40,  9,
-  2,  0, 41,  9,  2,  0, 42,  9,  2,  0, 43,  9,  2,  0, 35,  2,  2,  0, 44,  9,  2,  0, 32,  2,  2,  0, 45,  9,  0,  0, 46,  9,
-  0,  0, 47,  9,  7,  0,244,  0, 57,  1, 48,  9, 64,  0,253,  1, 58,  1, 16,  0, 58,  1,  0,  0, 58,  1,  1,  0,  2,  0, 16,  0,
-  2,  0, 18,  0,  2,  0, 21,  9,  2,  0,246,  0,  7,  0,  4,  3,  7,  0,  5,  3,  7,  0,  6,  3,  7,  0, 85,  2,  7,  0,  7,  3,
-  7,  0,  8,  3,  7,  0, 49,  9,  7,  0,  9,  3,  7,  0, 11,  3,  7,  0, 12,  3,254,  0,  5,  0,  2,  0, 16,  0,  2,  0, 50,  9,
-  2,  0, 18,  0,  2,  0, 51,  9, 22,  0, 49,  7,253,  0,  3,  0,  4,  0, 68,  0,  4,  0, 52,  9,254,  0,  2,  0, 59,  1,  7,  0,
- 59,  1,  0,  0, 59,  1,  1,  0,  0,  0, 19,  0,  2,  0, 16,  0,  2,  0, 18,  0,  4,  0, 21,  0, 11,  0, 53,  9, 60,  1,  5,  0,
-  0,  0, 19,  0,  7,  0, 94,  1,  7,  0, 54,  9,  4,  0, 55,  9,  4,  0, 27,  0, 61,  1,  4,  0,  2,  0, 16,  0,  2,  0, 18,  0,
-  2,  0, 66,  0,  2,  0, 30,  0, 62,  1,  4,  0,  0,  0, 19,  0, 63,  0, 56,  9,  7,  0, 94,  1,  7,  0, 27,  0, 63,  1,  6,  0,
-  2,  0, 57,  9,  2,  0, 58,  9,  2,  0, 16,  0,  2,  0, 59,  9,  0,  0, 60,  9,  0,  0, 61,  9, 64,  1,  5,  0,  4,  0, 16,  0,
-  4,  0, 27,  0,  0,  0, 19,  0,  0,  0, 62,  9,  0,  0, 63,  9, 65,  1,  3,  0,  4,  0, 16,  0,  4,  0, 27,  0,  0,  0, 19,  0,
- 66,  1,  4,  0,  2,  0, 64,  9,  2,  0, 65,  9,  2,  0, 18,  0,  2,  0, 27,  0, 67,  1,  6,  0,  0,  0, 19,  0,  0,  0, 66,  9,
-  2,  0, 67,  9,  2,  0,  9,  3,  2,  0, 87,  1,  2,  0, 30,  0, 68,  1,  5,  0,  0,  0, 19,  0,  7,  0, 99,  3,  7,  0,222,  4,
-  2,  0, 18,  0,  2,  0,231,  2, 69,  1,  3,  0,  0,  0, 19,  0,  4,  0,219,  2,  4,  0, 64,  9, 70,  1,  7,  0,  0,  0, 19,  0,
-  7,  0,222,  4,  0,  0, 68,  9,  0,  0, 69,  9,  2,  0, 87,  1,  2,  0, 66,  0,  4,  0, 70,  9, 71,  1,  4,  0,  0,  0, 71,  9,
-  0,  0, 72,  9,  4,  0, 16,  0,  7,  0,235,  2, 72,  1,  3,  0, 27,  0, 73,  9,  0,  0, 74,  9,  0,  0, 75,  9, 73,  1, 18,  0,
- 73,  1,  0,  0, 73,  1,  1,  0,  2,  0, 16,  0,  2,  0, 76,  9,  2,  0, 18,  0,  2,  0, 77,  9,  2,  0, 78,  9,  2,  0, 79,  9,
-  2,  0, 66,  0,  2,  0, 30,  0,  0,  0, 19,  0, 11,  0,  2,  0, 74,  1, 80,  9, 27,  0, 43,  0,  2,  0,224,  5,  2,  0,181,  2,
-  2,  0, 81,  9,  2,  0, 27,  0, 75,  1, 11,  0,  0,  0, 19,  0,  0,  0, 16,  0,  0,  0, 82,  9,  2,  0, 18,  0,  2,  0,231,  2,
-  2,  0, 83,  9,  4,  0, 84,  9,  4,  0, 85,  9,  4,  0, 86,  9,  4,  0, 87,  9,  4,  0, 88,  9, 76,  1,  1,  0,  0,  0, 89,  9,
- 77,  1,  4,  0, 37,  0, 13,  7,  0,  0, 30,  8,  4,  0, 87,  1,  4,  0, 18,  0, 74,  1, 18,  0, 74,  1,  0,  0, 74,  1,  1,  0,
- 74,  1, 90,  9,  2,  0, 16,  0,  2,  0, 18,  0,  2,  0, 91,  9,  2,  0, 79,  9,  2,  0, 76,  9,  2,  0, 92,  9,  2,  0, 30,  0,
-  2,  0,250,  1,  0,  0, 19,  0, 11,  0,  2,  0, 78,  1, 80,  9, 73,  1, 93,  9,  2,  0, 14,  0,  2,  0, 94,  9,  4,  0, 95,  9,
- 79,  1,  3,  0,  4,  0,245,  2,  4,  0, 27,  0, 27,  0, 43,  0, 80,  1, 15,  0,177,  0, 96,  9,  2,  0, 16,  0,  2,  0, 18,  0,
-  7,  0, 23,  9,  7,  0, 90,  0,  0,  0, 19,  0,  0,  0, 97,  9,  2,  0, 98,  9,  2,  0, 99,  9,  2,  0,133,  0,  2,  0,100,  9,
-  2,  0,101,  9,  2,  0, 27,  0,  7,  0,102,  9,  7,  0,103,  9, 81,  1,  8,  0,  7,  0,104,  9,  7,  0,105,  9,  7,  0,106,  9,
-  7,  0,107,  9,  7,  0,108,  9,  7,  0,109,  9,  7,  0,110,  9,  7,  0,111,  9, 82,  1, 13,  0,  2,  0, 18,  0,  2,  0,112,  9,
-  4,  0, 66,  0,  4,  0, 30,  0,  2,  0,184,  6,  7,  0, 89,  4,  7,  0,239,  8, 47,  1,237,  8, 81,  1,113,  9,  2,  0, 16,  0,
-  2,  0,122,  5,  2,  0,221,  3,  2,  0,114,  9, 83,  1, 11,  0,  4,  0,245,  2,  2,  0, 16,  0,  2,  0, 18,  0, 27,  0, 43,  0,
- 79,  0,115,  9,  0,  0, 19,  0,  7,  0,116,  9,  7,  0,117,  9,  7,  0,227,  3,  2,  0,118,  9,  2,  0,119,  9, 84,  1,  5,  0,
-  2,  0, 16,  0,  2,  0, 66,  0,  4,  0, 27,  0, 41,  0,124,  0, 27,  0,215,  5, 85,  1,  5,  0,  4,  0, 27,  0,  4,  0, 16,  0,
-  0,  0, 19,  0,  0,  0, 62,  9, 27,  0, 43,  0, 86,  1, 13,  0,  2,  0, 18,  0,  2,  0, 16,  0,  2,  0, 76,  9,  2,  0,228,  3,
-  7,  0,120,  9,  7,  0,121,  9,  7,  0, 86,  1,  7,  0,122,  9,  7,  0,197,  3,  7,  0,201,  3,  7,  0,123,  9,  7,  0,124,  9,
- 27,  0,125,  9, 87,  1, 10,  0,  2,  0, 18,  0,  2,  0, 16,  0,  7,  0, 23,  9,  7,  0, 90,  0,  0,  0, 19,  0,  0,  0, 97,  9,
-  2,  0, 66,  0,  2,  0, 30,  0,  2,  0,250,  1,  2,  0,122,  5, 88,  1,  8,  0, 27,  0, 43,  0,  7,  0,  6,  3,  7,  0,126,  9,
-  7,  0,127,  9,  7,  0,228,  3,  2,  0, 66,  0,  2,  0,231,  2,  7,  0, 30,  0, 89,  1, 12,  0,  2,  0, 16,  0,  2,  0, 87,  1,
-  2,  0, 18,  0,  2,  0,  9,  3,  2,  0,245,  2,  2,  0,128,  9,  4,  0, 27,  0,  7,  0,129,  9,  7,  0,130,  9,  7,  0,131,  9,
-  7,  0,132,  9,  0,  0,133,  9, 90,  1,  9,  0,  2,  0, 18,  0,  2,  0, 16,  0,  4,  0, 23,  9,  4,  0, 90,  0,  0,  0, 19,  0,
-  2,  0, 86,  1,  2,  0, 62,  0,  2,  0,134,  9,  2,  0,135,  9, 91,  1,  7,  0,  4,  0,219,  2,  4,  0,136,  9,  4,  0,137,  9,
-  4,  0,138,  9,  7,  0,139,  9,  7,  0,140,  9,  0,  0, 68,  9, 92,  1,  7,  0,  0,  0,141,  9, 27,  0,142,  9,  0,  0, 74,  9,
-  2,  0,143,  9,  2,  0, 66,  0,  4,  0, 30,  0,  0,  0, 75,  9, 93,  1,  6,  0,  2,  0, 18,  0,  2,  0, 16,  0,  4,  0, 23,  9,
-  4,  0, 90,  0,  0,  0,144,  9,  0,  0,145,  9, 94,  1,  1,  0,  4,  0, 18,  0, 95,  1,  6,  0,  0,  0, 93,  0,  2,  0, 16,  0,
-  2,  0, 18,  0,  4,  0,146,  9,  7,  0,147,  9, 37,  0, 13,  7, 96,  1,  4,  0,  0,  0,186,  2,  2,  0, 18,  0,  4,  0, 16,  0,
- 27,  0, 43,  0, 97,  1,  2,  0,  4,  0, 16,  0,  4,  0,188,  6, 98,  1,  8,  0,  0,  0, 71,  9,  0,  0, 72,  9,  4,  0, 16,  0,
-  7,  0, 43,  2,  7,  0,148,  9,  7,  0, 27,  0, 27,  0, 75,  3, 27,  0,149,  9, 99,  1, 11,  0,  0,  0, 61,  6,  0,  0, 18,  0,
-  2,  0,150,  9,  4,  0, 16,  0,  7,  0, 94,  1,  7,  0,151,  9,  7,  0,152,  9,  7,  0,153,  9,  4,  0,154,  9, 27,  0, 75,  3,
- 27,  0,155,  9, 78,  1, 10,  0, 78,  1,  0,  0, 78,  1,  1,  0, 78,  1, 90,  9,  2,  0, 16,  0,  2,  0, 18,  0,  2,  0, 76,  9,
-  2,  0,156,  9,  0,  0, 19,  0, 11,  0,  2,  0, 27,  0, 43,  0, 47,  1, 17,  0, 22,  0, 32,  0,  0,  0, 35,  0, 38,  0,152,  0,
- 11,  0,226,  0, 38,  0,157,  9, 31,  0, 79,  0,  7,  0, 89,  4,  7,  0,158,  9,  7,  0,239,  8,  7,  0,104,  9,  7,  0,105,  9,
-  7,  0,159,  9,  4,  0, 91,  0,  4,  0, 27,  0, 11,  0,160,  9, 11,  0,161,  9, 11,  0,162,  9,100,  1,  6,  0,100,  1,  0,  0,
-100,  1,  1,  0, 27,  0, 43,  0, 11,  0,163,  9,  2,  0,251,  0,  0,  0,216,  2, 64,  0,  4,  0, 22,  0, 32,  0, 14,  0,164,  9,
-  4,  0,133,  0,  7,  0,165,  9,101,  1, 28,  0,101,  1,  0,  0,101,  1,  1,  0, 21,  0,166,  9,101,  1, 37,  0, 14,  0,167,  9,
-  0,  0, 19,  0,  7,  0,168,  9,  7,  0,169,  9,  7,  0,170,  9,  7,  0,171,  9,  4,  0, 18,  0,  7,  0,172,  9,  7,  0,173,  9,
-  7,  0,174,  9,  7,  0,175,  9,  7,  0, 94,  1,  7,  0, 43,  2,  7,  0,176,  9,  7,  0,217,  2,  7,  0,177,  9,  7,  0,178,  9,
-  7,  0,179,  9,  7,  0,180,  9,  7,  0,181,  9,  7,  0,175,  0,  4,  0,133,  0,  2,  0,  5,  6,  2,  0,182,  9,102,  1, 27,  0,
- 22,  0, 32,  0, 34,  0, 74,  0, 14,  0,183,  9, 14,  0,184,  9, 14,  0,185,  9,101,  1,186,  9, 11,  0,187,  9, 11,  0,188,  9,
-  4,  0, 18,  0,  4,  0,164,  6,  4,  0,189,  9,  4,  0, 27,  0,  2,  0, 13,  3,  2,  0,218,  6,  4,  0,190,  9,  4,  0,133,  0,
-  4,  0,191,  9,  2,  0,192,  9,  2,  0,193,  9,  2,  0,194,  9,  2,  0,195,  9,  4,  0,196,  9,  4,  0,197,  9,  4,  0,198,  9,
-  4,  0,199,  9,  4,  0,200,  9,  4,  0,201,  9,103,  1,  2,  0,  7,  0,170,  2,  4,  0, 18,  0,181,  0,  5,  0,103,  1,202,  9,
-  4,  0,217,  2,  4,  0,203,  9,  4,  0,204,  9,  4,  0, 18,  0,180,  0, 16,  0,  4,  0,205,  9,  4,  0,206,  9,  4,  0,207,  9,
-  4,  0,208,  9,  2,  0,209,  9,  2,  0,210,  9,  2,  0,211,  9,  2,  0,251,  0,  2,  0,212,  9,  2,  0,213,  9,  2,  0,214,  9,
-  2,  0,215,  9,  4,  0,216,  9,  4,  0,217,  9,  4,  0,218,  9,  4,  0,219,  9,104,  1, 40,  0,104,  1,  0,  0,104,  1,  1,  0,
- 21,  0,166,  9, 14,  0,  0,  4,  0,  0, 19,  0,  2,  0, 18,  0,  2,  0,220,  9,  2,  0,214,  3,  2,  0,221,  9,  0,  0,222,  9,
-  0,  0,223,  9,  0,  0,224,  9,101,  1,225,  9,104,  1, 37,  0,104,  1,226,  9, 14,  0,227,  9, 14,  0,228,  9,181,  0,189,  3,
- 27,  0,229,  9,104,  1,230,  9,  7,  0, 77,  1,  7,  0,175,  0,  7,  0,231,  9,  7,  0, 22,  2,  7,  0,203,  3,  7,  0,205,  3,
-  2,  0,237,  3,  2,  0, 27,  0,  7,  0,232,  9,  7,  0,233,  9,  7,  0,208,  3,  7,  0,234,  9,  7,  0,235,  9,  7,  0,236,  9,
-  7,  0,237,  9,  7,  0,238,  9,  7,  0,239,  9,  7,  0,240,  9,  7,  0,241,  9, 11,  0,242,  9,178,  0, 16,  0, 14,  0,243,  9,
- 74,  0,244,  9,  2,  0, 18,  0,  2,  0, 27,  0,  4,  0,245,  9,  4,  0, 66,  0,  7,  0, 83,  0,  7,  0,246,  9,  7,  0,247,  9,
- 14,  0,248,  9,  4,  0,249,  9,  4,  0,250,  9, 11,  0,251,  9, 11,  0,252,  9,180,  0,188,  3,  0,  0,253,  9,105,  1,  1,  0,
-  4,  0,250,  9,106,  1, 12,  0,  4,  0,250,  9,  7,  0, 88,  9,  2,  0,254,  9,  2,  0,255,  9,  7,  0,  0, 10,  7,  0,  1, 10,
-  2,  0,  2, 10,  2,  0, 18,  0,  7,  0,  3, 10,  7,  0,  4, 10,  7,  0,  5, 10,  7,  0,  6, 10,107,  1,  7,  0,107,  1,  0,  0,
-107,  1,  1,  0, 14,  0,  7, 10,  4,  0, 18,  0,  4,  0,  8, 10,  0,  0, 19,  0, 23,  1,  9, 10,177,  0,  9,  0, 22,  0, 32,  0,
- 14,  0, 10, 10, 14,  0,243,  9, 14,  0, 11, 10, 14,  0,101,  0,  4,  0, 18,  0,  4,  0, 12, 10,  4,  0, 13, 10,  4,  0, 27,  0,
-244,  0,  8,  0, 22,  0, 14, 10, 14,  0,243,  9, 64,  0, 15, 10,  0,  0, 16, 10,  4,  0, 17, 10,  4,  0, 18,  0,  4,  0, 18, 10,
-  4,  0, 27,  0,108,  1, 13,  0,240,  0,  0,  0,240,  0,  1,  0, 14,  0,153,  6,  4,  0,154,  6,  7,  0,155,  6,  2,  0,156,  6,
-241,  0,207,  6,177,  0,184,  3,244,  0, 19, 10,  0,  0, 87,  1,  0,  0,210,  6,  2,  0, 18,  0,  7,  0, 20, 10,109,  1,  8,  0,
-109,  1,  0,  0,109,  1,  1,  0,107,  1, 21, 10, 31,  0, 79,  0, 14,  0,190,  3,  4,  0, 18,  0,  0,  0, 19,  0,  4,  0,127,  8,
-110,  1,  5,  0,110,  1,  0,  0,110,  1,  1,  0, 31,  0, 79,  0,  2,  0, 18,  0,  0,  0, 22, 10,111,  1, 14,  0,111,  1,  0,  0,
-111,  1,  1,  0, 11,  0,  2,  0,  2,  0, 16,  0,  2,  0, 18,  0,  0,  0, 23, 10,  0,  0, 24, 10,  0,  0, 19,  0,  2,  0, 27,  0,
-  7,  0, 25, 10,  7,  0, 26, 10, 31,  0, 79,  0,  7,  0, 27, 10,  7,  0, 28, 10,112,  1,  9,  0,112,  1,  0,  0,112,  1,  1,  0,
- 27,  0, 29, 10,  0,  0, 16,  3,  7,  0, 30, 10,  2,  0, 31, 10,  2,  0, 18,  0,  2,  0, 16,  0,  2,  0, 32, 10,113,  1,  7,  0,
- 37,  0, 13,  7, 21,  0,166,  9,  4,  0, 18,  0,  4,  0, 33, 10, 14,  0, 34, 10, 27,  0, 29, 10,  0,  0, 16,  3,114,  1, 15,  0,
- 27,  0, 29, 10,  2,  0, 35, 10,  2,  0, 18,  0,  2,  0, 36, 10,  2,  0, 37, 10,  0,  0, 16,  3, 27,  0, 38, 10,  0,  0, 39, 10,
-  7,  0, 40, 10,  7,  0, 43,  2,  7,  0, 41, 10,  7,  0, 42, 10,  2,  0, 16,  0,  2,  0, 87,  1,  7,  0, 94,  1,115,  1,  6,  0,
- 27,  0, 29, 10,  7,  0,202,  9,  2,  0, 43, 10,  2,  0, 44, 10,  2,  0, 18,  0,  2,  0, 45, 10,116,  1,  6,  0, 27,  0, 29, 10,
-  4,  0, 46, 10,  4,  0, 47, 10,  4,  0, 91,  0,  4,  0, 27,  0,  0,  0, 16,  3,117,  1,  4,  0, 27,  0, 29, 10,  4,  0, 18,  0,
-  4,  0, 46, 10,  0,  0, 16,  3,118,  1,  4,  0, 27,  0, 29, 10,  4,  0, 18,  0,  4,  0, 46, 10,  0,  0, 16,  3,119,  1,  4,  0,
- 27,  0, 29, 10,  4,  0, 18,  0,  4,  0, 46, 10,  0,  0, 16,  3,120,  1,  2,  0,  4,  0, 18,  0,  7,  0, 89,  4,121,  1,  2,  0,
- 27,  0, 29, 10,  0,  0, 16,  3,122,  1, 10,  0, 27,  0, 29, 10,  4,  0, 48, 10,  7,  0,127,  0,  4,  0, 18,  0,  2,  0, 11,  7,
-  2,  0, 49, 10,  2,  0, 66,  0,  2,  0, 30,  0,  7,  0, 50, 10,  0,  0, 16,  3,123,  1, 10,  0, 27,  0, 29, 10,  2,  0, 16,  0,
-  2,  0,139,  4,  4,  0, 89,  0,  4,  0, 90,  0,  7,  0,126,  9,  7,  0,127,  9,  4,  0, 27,  0,177,  0, 96,  9,  0,  0, 16,  3,
-124,  1,  4,  0, 27,  0, 29, 10,  4,  0,215,  3,  4,  0, 51, 10,  0,  0, 16,  3,125,  1,  4,  0, 27,  0, 29, 10,  4,  0,215,  3,
-  4,  0, 27,  0,  0,  0, 16,  3,126,  1,  6,  0, 27,  0, 29, 10,  7,  0,127,  0,  7,  0, 87,  3,  4,  0, 52, 10,  2,  0,215,  3,
-  2,  0,216,  3,127,  1,  6,  0, 27,  0, 29, 10,  4,  0, 53, 10,  4,  0, 54, 10,  7,  0, 55, 10,  7,  0, 56, 10,  0,  0, 16,  3,
-128,  1, 16,  0, 27,  0, 29, 10, 27,  0,226,  9,  4,  0, 16,  0,  7,  0, 57, 10,  7,  0, 58, 10,  7,  0, 59, 10,  7,  0, 60, 10,
-  7,  0, 61, 10,  7,  0, 62, 10,  7,  0, 63, 10,  7,  0, 64, 10,  7,  0, 65, 10,  2,  0, 18,  0,  2,  0, 27,  0,  2,  0, 66,  0,
-  2,  0, 30,  0,129,  1,  3,  0, 27,  0, 29, 10,  4,  0, 18,  0,  4,  0, 35,  2,130,  1,  5,  0, 27,  0, 29, 10,  4,  0, 18,  0,
-  4,  0, 27,  0,  7,  0, 66, 10,  0,  0, 16,  3,131,  1, 10,  0, 27,  0, 29, 10,  0,  0, 16,  3,  2,  0, 67, 10,  2,  0, 68, 10,
-  0,  0, 69, 10,  0,  0, 70, 10,  7,  0, 71, 10,  7,  0, 72, 10,  7,  0, 73, 10,  7,  0, 74, 10,132,  1,  5,  0, 27,  0, 29, 10,
-  0,  0, 16,  3,  7,  0,225,  2,  2,  0, 75, 10,  2,  0, 18,  0,133,  1,  8,  0,  7,  0,  8,  0,  7,  0,  9,  0,  7,  0, 10,  0,
-  7,  0, 11,  0,  7,  0, 76, 10,  7,  0, 77, 10,  2,  0, 18,  0,  2,  0, 35,  2,134,  1,  8,  0,  7,  0,  8,  0,  7,  0,  9,  0,
-  7,  0, 10,  0,  7,  0, 11,  0,  7,  0, 76, 10,  7,  0, 77, 10,  2,  0, 18,  0,  2,  0, 35,  2,135,  1,  8,  0,  7,  0,  8,  0,
-  7,  0,  9,  0,  7,  0, 10,  0,  7,  0, 11,  0,  7,  0, 76, 10,  7,  0, 77, 10,  2,  0, 18,  0,  2,  0, 35,  2,136,  1,  7,  0,
- 27,  0, 29, 10,  0,  0, 16,  3,  7,  0, 94,  1,  7,  0,103,  1,  2,  0, 18,  0,  2,  0, 87,  1,  4,  0, 27,  0,137,  1,  5,  0,
- 27,  0, 75,  3,  7,  0, 94,  1,  2,  0, 79,  3,  0,  0, 81,  3,  0,  0, 78, 10,138,  1,  7,  0,230,  0,113,  6,  0,  0, 79, 10,
-  4,  0, 18,  0,  4,  0, 27,  0,  0,  0, 80, 10, 27,  0,215,  5, 27,  0, 81, 10,139,  1,  3,  0,230,  0,113,  6,  4,  0, 18,  0,
-  4,  0, 27,  0,140,  1,  6,  0,230,  0,113,  6,  4,  0, 18,  0,  4,  0, 27,  0,  0,  0, 80, 10,  7,  0, 66, 10, 27,  0,215,  5,
-141,  1, 10,  0,141,  1,  0,  0,141,  1,  1,  0,  2,  0, 16,  0,  2,  0, 18,  0,  0,  0, 82, 10,  7,  0, 31,  1,  7,  0, 32,  1,
-  2,  0,  7, 10,  2,  0, 83, 10, 27,  0, 43,  0,142,  1, 22,  0,142,  1,  0,  0,142,  1,  1,  0,  2,  0, 18,  0,  2,  0, 87,  1,
-  2,  0, 84, 10,  2,  0, 85, 10, 31,  0, 79,  0,177,  0, 96,  9, 27,  0,167,  0,  7,  0, 89,  0,  7,  0, 90,  0,  7,  0, 86, 10,
-  7,  0, 87, 10,  7,  0, 88, 10,  7,  0, 89, 10,  7,  0,  2,  3,  7,  0,153,  3,  7,  0, 98,  9,  7,  0, 90, 10,  0,  0, 91, 10,
-  0,  0, 92, 10, 14,  0,193,  3,143,  1, 11,  0,  7,  0, 50,  2,  7,  0,126,  9,  7,  0,127,  9, 11,  0,  2,  0,  2,  0, 93, 10,
-  2,  0, 94, 10,  2,  0, 95, 10,  2,  0, 96, 10,  2,  0, 97, 10,  2,  0, 98, 10,  2,  0,186,  2,144,  1, 21,  0,144,  1,  0,  0,
-144,  1,  1,  0,144,  1, 99, 10,  0,  0, 19,  0, 11,  0,100, 10,  2,  0, 16,  0,  2,  0, 18,  0,  2,  0,101, 10,  2,  0, 66,  0,
-  7,  0,102, 10,  7,  0,103, 10, 11,  0,104, 10,  2,  0,105, 10,  2,  0,106, 10,  4,  0,107, 10, 11,  0,160,  9,  4,  0,108, 10,
-  4,  0,109, 10,144,  1,110, 10,145,  1,111, 10,143,  1,112, 10,146,  1,  4,  0,  0,  0,113, 10,  2,  0,114, 10,  2,  0,115, 10,
-  4,  0, 27,  0,147,  1, 41,  0,147,  1,  0,  0,147,  1,  1,  0,147,  1,116, 10,  0,  0, 19,  0,  4,  0, 18,  0,  2,  0, 16,  0,
-  2,  0, 30,  0,  2,  0,207,  8,  2,  0,181,  2,  2,  0,117, 10,  2,  0, 16,  7,  2,  0,105, 10,  2,  0, 50,  9,  7,  0,118, 10,
- 14,  0, 91,  9, 14,  0,119, 10,147,  1, 37,  0, 22,  0, 49,  7, 11,  0,100, 10,  7,  0,102, 10,  7,  0,103, 10,  7,  0, 85,  2,
-  7,  0,  6,  3,  7,  0,120, 10,  7,  0,121, 10,  7,  0,122, 10,  4,  0,123, 10,  0,  0,124, 10,  2,  0,125, 10,  2,  0,126, 10,
-  7,  0,127, 10,  7,  0,128, 10,  2,  0,129, 10,  2,  0,130, 10, 11,  0,131, 10, 19,  0,132, 10, 19,  0,133, 10, 19,  0,134, 10,
-146,  1,153,  0,148,  1,135, 10,149,  1,136, 10,145,  1,  8,  0,145,  1,  0,  0,145,  1,  1,  0,147,  1,137, 10,147,  1,138, 10,
-144,  1,139, 10,144,  1,140, 10,  4,  0, 18,  0,  4,  0, 27,  0, 57,  0, 23,  0, 22,  0, 32,  0, 34,  0, 74,  0,179,  0,187,  3,
- 14,  0,141, 10, 14,  0,142, 10,  4,  0, 16,  0,  4,  0,143, 10,  4,  0,144, 10,  4,  0, 18,  0,  4,  0,123, 10,  4,  0,145, 10,
-  2,  0,146, 10,  2,  0,147, 10,  4,  0,148, 10, 14,  0, 91,  9, 14,  0,119, 10,150,  1,149, 10, 11,  0,150, 10, 11,  0,151, 10,
-  4,  0,152, 10, 11,  0,153, 10, 11,  0,154, 10, 11,  0,155, 10,151,  1,  4,  0,  4,  0, 17,  0,  4,  0,235,  2,  4,  0,126,  9,
-  4,  0,127,  9,152,  1,  4,  0,  4,  0, 17,  0,  7,  0,235,  2,  7,  0,126,  9,  7,  0,127,  9,153,  1,  2,  0,  0,  0,235,  2,
-  0,  0, 86,  1,154,  1,  4,  0,  4,  0, 17,  0,  7,  0,156, 10,  7,  0,126,  9,  7,  0,127,  9,155,  1,  1,  0,  7,  0,157, 10,
-156,  1,  2,  0,  2,  0, 18,  0,  2,  0,158, 10,157,  1,  6,  0,  4,  0,126,  0,  4,  0,128,  0,  4,  0, 50,  9,  0,  0,159, 10,
-  0,  0,160, 10,  2,  0, 27,  0,158,  1,  6,  0,  7,  0, 35,  1,  7,  0, 34,  1,  7,  0,161, 10,  7,  0,162, 10,  7,  0,163, 10,
-  4,  0, 27,  0,159,  1,  6,  0,158,  1,164, 10,158,  1,165, 10,158,  1,166, 10,158,  1,167, 10,  7,  0,168, 10,  7,  0,169, 10,
-160,  1,  5,  0,  7,  0, 99,  3,  4,  0,170, 10,  7,  0,171, 10,  7,  0,172, 10,  7,  0,173, 10,161,  1,  6,  0,  7,  0,  5,  0,
-  7,  0,  6,  0,  7,  0,174, 10,  7,  0,  6,  3,  7,  0, 85,  2,  4,  0, 27,  0,162,  1,  6,  0,  7,  0,  5,  0,  7,  0,  6,  0,
-  7,  0,174, 10,  7,  0,  6,  3,  7,  0, 85,  2,  4,  0, 27,  0,163,  1,  2,  0,  4,  0,175, 10,  4,  0,176, 10,164,  1, 16,  0,
-  2,  0,150,  8,  2,  0,151,  8,  2,  0, 76,  5,  2,  0,177, 10,  2,  0,178, 10,  2,  0, 67,  0,  2,  0, 50,  7,  2,  0,179, 10,
-  7,  0,  1,  3,  7,  0,180, 10,  7,  0,181, 10,  2,  0,110,  1,  0,  0,182, 10,  0,  0,161, 10,  4,  0,183, 10,  4,  0,184, 10,
-165,  1,  9,  0,  7,  0,185, 10,  7,  0,186, 10,  7,  0,159,  9,  7,  0, 99,  3,  7,  0,187, 10,  7,  0,225,  6,  2,  0, 97,  3,
-  0,  0,188, 10,  0,  0, 27,  0,166,  1,  4,  0,  7,  0,189, 10,  7,  0,190, 10,  2,  0, 97,  3,  2,  0, 27,  0,167,  1,  3,  0,
-  7,  0,191, 10,  7,  0,222,  8,  7,  0, 14,  0,168,  1,  4,  0,  0,  0, 35,  0,205,  0, 87,  5,  4,  0,128,  0,  4,  0,137,  4,
-169,  1,  6,  0,  0,  0,192, 10,205,  0,193, 10,  4,  0,128,  0,  4,  0,137,  4,  4,  0,194, 10,  4,  0, 27,  0,170,  1,  7,  0,
-  2,  0,195, 10,  2,  0,196, 10,  4,  0, 66,  0,  0,  0, 82,  4,205,  0,193, 10,  0,  0,197, 10,  0,  0,178,  6,171,  1,  9,  0,
-  7,  0,198, 10,  7,  0,199, 10,  7,  0,200, 10,  7,  0, 96,  2,  7,  0,201, 10,  7,  0,202, 10,  7,  0,203, 10,  2,  0,204, 10,
-  2,  0,205, 10,172,  1,  8,  0,  2,  0,206, 10,  2,  0,207, 10,  2,  0,208, 10,  2,  0,209, 10,  7,  0,210, 10,  7,  0,211, 10,
-  7,  0,212, 10,  7,  0,213, 10,173,  1,  2,  0,  7,  0,  5,  0,  7,  0,  6,  0,174,  1,  2,  0,  0,  0,169,  0,  0,  0,214, 10,
-175,  1,  1,  0,  0,  0, 19,  0,176,  1, 12,  0,  0,  0,215, 10,  0,  0,216, 10,  0,  0,216,  6,  0,  0,217, 10,  2,  0, 76,  5,
-  2,  0,218, 10,  7,  0,219, 10,  7,  0,220, 10,  7,  0,221, 10,  7,  0,153,  3,  7,  0,174, 10,  7,  0,222, 10,177,  1,  2,  0,
- 11,  0,223, 10, 11,  0,224, 10,178,  1, 13,  0,  0,  0, 79,  5,  0,  0, 16,  0,  0,  0, 97,  3,  0,  0, 99,  3,  0,  0,216, 10,
-  0,  0,107,  0,  0,  0,186,  2,  7,  0,225, 10,  7,  0,226, 10,  7,  0,152,  3,  7,  0,227, 10,  7,  0,228, 10,  7,  0,222, 10,
-179,  1,  8,  0,  7,  0, 57,  9,  7,  0,127,  0,  7,  0,161, 10,  7,  0,177,  2,  7,  0,229, 10,  7,  0,239,  0,  7,  0,230, 10,
-  4,  0, 16,  0,180,  1,  4,  0,  2,  0,231, 10,  2,  0,232, 10,  2,  0,233, 10,  2,  0, 27,  0,181,  1,  8,  0,  7,  0,234, 10,
-  7,  0,225,  2,  7,  0,235, 10,  7,  0,200,  8,  7,  0,201,  8,  7,  0,202,  8,  7,  0,236, 10,  7,  0,237, 10,182,  1,  6,  0,
-  2,  0,238, 10,  2,  0,239, 10,  7,  0,240, 10,  7,  0,241, 10,  7,  0,242, 10,  7,  0,243, 10,183,  1,  2,  0, 58,  0,244, 10,
- 59,  0,245, 10,184,  1,  3,  0,183,  1, 86,  6,  7,  0,246, 10,  7,  0,247, 10,185,  1,  3,  0,183,  1, 86,  6,  4,  0,248, 10,
-  4,  0, 27,  0,186,  1,  1,  0,183,  1, 86,  6,187,  1,  3,  0,183,  1, 86,  6,  4,  0,248, 10,  4,  0,249, 10,188,  1,  3,  0,
-183,  1, 86,  6,  4,  0,250, 10,  4,  0, 27,  0,189,  1,  1,  0,183,  1, 86,  6,190,  1,  3,  0,183,  1, 86,  6,  4,  0,251, 10,
-  4,  0, 27,  0,191,  1,  3,  0,183,  1, 86,  6,  4,  0,252, 10,  4,  0, 27,  0,192,  1,  3,  0,183,  1, 86,  6,  4,  0,253, 10,
-  4,  0, 27,  0,193,  1,  3,  0,183,  1, 86,  6,  4,  0,250,  0,  4,  0, 27,  0,194,  1,  1,  0,  0,  0, 19,  0,195,  1,  1,  0,
-  0,  0, 19,  0,196,  1,  4,  0,  7,  0,  5,  0,  7,  0,  6,  0,  2,  0, 18,  0,  2,  0,254, 10,197,  1, 10,  0,  2,  0, 67,  4,
-  2,  0, 18,  0,  7,  0,222,  4,  7,  0,255, 10,  7,  0,  0, 11,  7,  0,  1, 11,  7,  0,  2, 11,196,  1,  3, 11,196,  1,  4, 11,
-196,  1,  5, 11, 54,  0, 11,  0,  4,  0, 18,  0,  4,  0, 62,  0,  4,  0,  6, 11,  4,  0,  7, 11, 19,  0,  8, 11, 19,  0,  9, 11,
-197,  1, 10, 11,  7,  0, 11, 11,  7,  0, 12, 11,  7,  0, 13, 11,  7,  0, 14, 11,  1,  1, 10,  0,  4,  0,  7, 10,  4,  0, 15, 11,
-  7,  0, 16, 11,  7,  0, 17, 11,  7,  0, 18, 11,  7,  0, 19, 11,  7,  0,  9,  0,  7,  0, 11,  0,  4,  0, 87,  1,  4,  0,  6,  3,
-  0,  1, 18,  0,  4,  0,131,  0,  4,  0, 20, 11,  4,  0, 21, 11,  7,  0, 22, 11,  4,  0, 23, 11,  7,  0, 24, 11,  7,  0, 25, 11,
-  4,  0, 26, 11,  7,  0, 27, 11,  4,  0, 28, 11,  7,  0, 29, 11,  1,  1, 30, 11,  7,  0, 31, 11,  7,  0, 32, 11,  7,  0, 33, 11,
-  7,  0, 34, 11,  4,  0, 35, 11,  4,  0, 27,  0,198,  1,  4,  0, 42,  0,249,  2,  7,  0, 36, 11,  7,  0,181,  1,  7,  0, 27,  0,
-214,  0, 36,  0, 22,  0, 32,  0,198,  1, 37, 11, 54,  0,  3, 11, 46,  0, 38, 11,214,  0, 39, 11, 52,  0, 40, 11, 25,  0,153,  0,
-  0,  0, 41, 11,  7,  0, 42, 11,  2,  0,116,  6,  2,  0, 43, 11,  7,  0, 43,  2,  4,  0,107,  0,  4,  0, 18,  0,  7,  0, 44, 11,
-  4,  0, 93,  2,  4,  0, 45, 11,  7,  0, 46, 11,  7,  0, 47, 11,  7,  0, 48, 11,  7,  0,181,  1,  4,  0, 49, 11,  7,  0, 50, 11,
-  0,  0, 51, 11,  0,  0, 52, 11,  0,  0, 53, 11,  0,  0, 54, 11,  7,  0, 55, 11,  7,  0, 56, 11,  7,  0, 57, 11,  7,  0,  6,  3,
-  7,  0, 58, 11,  4,  0, 59, 11,  7,  0,248,  5,  7,  0, 60, 11,  7,  0, 61, 11,199,  1, 10,  0,  4,  0, 16,  0,  4,  0,127,  0,
-  4,  0, 18,  0,  4,  0, 20,  4,  4,  0, 62, 11,  4,  0, 63, 11,  4,  0, 64, 11,  4,  0, 69,  0,  0,  0, 19,  0, 11,  0,  2,  0,
-200,  1,  1,  0,  0,  0, 79,  7, 95,  0,  8,  0,199,  1, 65, 11,  4,  0, 66, 11,  4,  0, 67, 11,  4,  0, 68, 11,  4,  0, 69, 11,
-  4,  0, 30,  0, 11,  0, 70, 11,200,  1, 71, 11,201,  1,  5,  0,  7,  0,170,  2,  7,  0,245,  2,  7,  0, 43,  2,  2,  0,152,  2,
-  2,  0, 27,  0,202,  1,  5,  0,  7,  0,170,  2,  7,  0,164,  4,  7,  0, 72, 11,  7,  0, 73, 11,  7,  0,245,  2,203,  1,  5,  0,
- 27,  0, 74, 11,204,  1, 21,  0,  7,  0, 82,  6,  7,  0, 75, 11,  7,  0, 55,  0,205,  1,  3,  0,  7,  0, 76, 11,  4,  0, 77, 11,
-  4,  0, 78, 11,206,  1,  7,  0,  4,  0, 79, 11,  4,  0, 80, 11,  4,  0, 81, 11,  7,  0, 82, 11,  7,  0, 83, 11,  7,  0, 84, 11,
-  7,  0, 55,  0,207,  1,  8,  0,207,  1,  0,  0,207,  1,  1,  0, 27,  0, 43,  0,  4,  0,  3,  1,  2,  0, 18,  0,  2,  0, 87,  1,
-  7,  0,245,  2,  7,  0, 65,  9,208,  1,  7,  0,208,  1,  0,  0,208,  1,  1,  0, 27,  0, 43,  0,  2,  0,230,  2,  2,  0, 18,  0,
-  2,  0, 17,  2,  2,  0, 55,  0,209,  1, 17,  0,202,  1, 13,  4,202,  1, 85, 11,201,  1, 86, 11,202,  1, 48,  9,203,  1, 87, 11,
-  4,  0, 81,  0,  7,  0,245,  2,  7,  0, 12,  3,  7,  0, 88, 11,  4,  0, 79, 11,  4,  0, 89, 11,  7,  0, 83, 11,  7,  0, 84, 11,
-  7,  0,107,  0,  4,  0, 90, 11,  2,  0, 18,  0,  2,  0, 91, 11,210,  1, 15,  0,  7,  0,255,  0,  7,  0, 92, 11,  7,  0, 76, 11,
-  7,  0, 93, 11,  7,  0, 94, 11,  7,  0, 95, 11,  7,  0, 96, 11,  7,  0, 97, 11,  7,  0, 98, 11,  7,  0, 99, 11,  7,  0,100, 11,
-  7,  0,101, 11,  7,  0,102, 11,  4,  0, 18,  0,  4,  0,103, 11,211,  1,128,  0, 22,  0, 32,  0, 34,  0, 74,  0,212,  1,104, 11,
-210,  1,105, 11,188,  0,159,  4,  4,  0, 18,  0,  4,  0, 55,  0,  2,  0, 16,  0,  2,  0, 67, 10,  2,  0,106, 11,  2,  0,124,  1,
-  2,  0,107, 11,  2,  0,237,  3,  2,  0,108, 11,  2,  0,109, 11,  2,  0,110, 11,  2,  0,111, 11,  2,  0,112, 11,  2,  0,113, 11,
-  2,  0,114, 11,  2,  0,115, 11,  2,  0,116, 11,  2,  0,232,  5,  2,  0,117, 11,  2,  0,118, 11,  2,  0,119, 11,  2,  0,120, 11,
-  2,  0,121, 11,  2,  0, 32,  2,  2,  0, 41,  9,  2,  0, 16,  9,  2,  0,122, 11,  2,  0,123, 11,  2,  0, 30,  4,  2,  0, 31,  4,
-  2,  0,124, 11,  2,  0,125, 11,  2,  0,126, 11,  2,  0,127, 11,  7,  0,128, 11,  7,  0,129, 11,  7,  0,130, 11,  7,  0,131, 11,
-  7,  0,132, 11,  7,  0,133, 11,  7,  0,134, 11,  2,  0,161,  5,  2,  0,135, 11,  7,  0,136, 11,  7,  0,137, 11,  7,  0,138, 11,
-  7,  0, 23,  9,  7,  0, 90,  0,  7,  0, 12,  3,  7,  0, 29,  9,  7,  0,139, 11,  7,  0,140, 11,  7,  0,141, 11,  7,  0,142, 11,
-  7,  0,143, 11,  7,  0,144, 11,  4,  0, 24,  9,  4,  0, 22,  9,  4,  0,145, 11,  4,  0,146, 11,  2,  0,147, 11,  2,  0,148, 11,
-  7,  0, 25,  9,  7,  0, 26,  9,  7,  0, 27,  9,  7,  0,149, 11,  7,  0,150, 11,  7,  0,151, 11,  7,  0,152, 11,  7,  0,153, 11,
-  7,  0,154, 11,  7,  0,155, 11,  7,  0,156, 11,  7,  0,157, 11,  7,  0,227,  3,  7,  0,107,  0,  7,  0,158, 11,  7,  0,159, 11,
-  7,  0,160, 11,  7,  0,161, 11,  7,  0,213,  0,  7,  0,162, 11,  4,  0,163, 11,  4,  0,164, 11,  7,  0,165, 11,  7,  0,166, 11,
-  7,  0,167, 11,  7,  0,168, 11,  7,  0,169, 11,  7,  0,212,  0,  7,  0,170, 11,  7,  0, 57,  4,  7,  0, 55,  4,  7,  0, 56,  4,
-  7,  0,171, 11,  7,  0,172, 11,  7,  0,173, 11,  7,  0,174, 11,  7,  0,175, 11,  7,  0,176, 11,  7,  0,177, 11,  7,  0,178, 11,
-  7,  0,179, 11,  7,  0,180, 11,  7,  0,181, 11,  7,  0,182, 11,  7,  0,183, 11,  7,  0,184, 11,  7,  0,185, 11,  7,  0,186, 11,
-  7,  0,187, 11,  7,  0,188, 11,  4,  0,189, 11,  4,  0,190, 11, 46,  0,143,  1, 64,  0,  5,  4, 14,  0,191, 11, 64,  0,192, 11,
- 27,  0,193, 11, 27,  0,194, 11, 31,  0, 79,  0,183,  0, 73,  1,183,  0,195, 11,151,  0, 52,  0,151,  0,  0,  0,151,  0,  1,  0,
-211,  1,196, 11,209,  1,197, 11,206,  1,226,  9,191,  0, 85,  4, 11,  0, 86,  4,213,  1,198, 11,213,  1,199, 11, 14,  0,200, 11,
- 14,  0,201, 11,136,  0,202, 11,144,  0,203, 11,144,  0,204, 11, 27,  0,205, 11, 27,  0,206, 11, 27,  0, 37,  0, 14,  0, 34, 10,
-  0,  0, 19,  0,  7,  0,244,  0,  7,  0, 41,  3,  7,  0,207, 11,  7,  0,208, 11,  4,  0,219,  2,  4,  0,209, 11,  4,  0, 18,  0,
-  4,  0, 24,  9,  4,  0,210, 11,  4,  0,211, 11,  4,  0,212, 11,  4,  0,213, 11,  2,  0,251,  0,  2,  0,214, 11,  2,  0,215, 11,
-  2,  0,216, 11,  0,  0,217, 11,  2,  0,218, 11,  2,  0,219, 11,  2,  0,220, 11, 11,  0,221, 11,140,  0,158,  4, 14,  0, 26,  3,
- 14,  0,222, 11,205,  1,223, 11,  4,  0,224, 11,  4,  0,225, 11,214,  1,226, 11,142,  0, 38,  3,215,  1,227, 11,  7,  0,228, 11,
-  7,  0,229, 11,  7,  0,230, 11,138,  0, 38,  0,216,  1,160,  9,  7,  0,128,  4,  7,  0,231, 11,  7,  0,232, 11,  7,  0, 82,  6,
-  7,  0,241,  3,  7,  0,227,  3,  7,  0,233, 11,  7,  0, 95,  2,  7,  0,234, 11,  7,  0,235, 11,  7,  0,236, 11,  7,  0,237, 11,
-  7,  0,238, 11,  7,  0,239, 11,  7,  0,129,  4,  7,  0,240, 11,  7,  0,241, 11,  7,  0,242, 11,  7,  0,130,  4,  7,  0,126,  4,
-  7,  0,127,  4,  7,  0,243, 11,  7,  0,244, 11,  7,  0,245, 11,  4,  0,246, 11,  4,  0, 91,  0,  4,  0,247, 11,  4,  0,248, 11,
-  2,  0,249, 11,  2,  0,250, 11,  2,  0,251, 11,  2,  0,252, 11,  2,  0,253, 11,  2,  0,254, 11,  2,  0,255, 11,  2,  0, 27,  0,
-188,  0,159,  4,139,  0, 11,  0,216,  1,  0, 12,  7,  0,  1, 12,  7,  0,  2, 12,  7,  0,254,  1,  7,  0,  3, 12,  7,  0,  4, 12,
-  7,  0,  5, 12,  4,  0, 91,  0,  2,  0,  6, 12,  2,  0,  7, 12, 64,  0,253,  1,217,  1,  4,  0,  7,  0,  5,  0,  7,  0,  6,  0,
-  7,  0,  7,  0,  7,  0,  8, 12,218,  1,  6,  0,218,  1,  0,  0,218,  1,  1,  0,217,  1,202,  9,  4,  0,  1,  1,  2,  0,  9, 12,
-  2,  0, 18,  0,219,  1,  5,  0,219,  1,  0,  0,219,  1,  1,  0, 14,  0, 10, 12,  4,  0, 11, 12,  4,  0, 18,  0,220,  1,  9,  0,
-220,  1,  0,  0,220,  1,  1,  0, 14,  0,126,  0,219,  1, 12, 12,  4,  0, 18,  0,  2,  0,  9, 12,  2,  0, 13, 12,  7,  0, 92,  0,
-  0,  0, 14, 12,179,  0,  6,  0, 22,  0, 32,  0, 14,  0,130,  5,  4,  0, 18,  0,  2,  0, 15, 12,  2,  0, 16, 12, 11,  0, 17, 12,
-221,  1,  6,  0, 14,  0, 18, 12,  4,  0, 19, 12,  4,  0, 20, 12,  4,  0, 18,  0,  4,  0, 27,  0,238,  0, 21, 12,222,  1, 19,  0,
- 22,  0, 32,  0,223,  1, 22, 12,223,  1, 23, 12, 14,  0, 24, 12,  4,  0, 25, 12,  2,  0, 26, 12,  2,  0, 27, 12, 14,  0, 28, 12,
- 14,  0, 29, 12,221,  1, 30, 12, 14,  0, 31, 12, 14,  0, 32, 12, 14,  0, 33, 12, 14,  0, 34, 12,224,  1, 35, 12,224,  1, 36, 12,
-224,  1, 37, 12, 14,  0, 38, 12,238,  0, 39, 12,223,  1, 32,  0,223,  1,  0,  0,223,  1,  1,  0, 11,  0, 40, 12,  4,  0,128,  8,
-  2,  0, 41, 12,  2,  0, 27,  0, 28,  1, 42, 12, 28,  1, 43, 12,  0,  0, 44, 12,  2,  0, 45, 12,  2,  0, 46, 12,  2,  0,150,  8,
-  2,  0,151,  8,  2,  0, 47, 12,  2,  0, 48, 12,  2,  0, 20,  4,  2,  0, 60,  7,  2,  0, 49, 12,  2,  0, 50, 12,  2,  0, 51, 12,
-  2,  0, 30,  0,225,  1, 52, 12,226,  1, 53, 12,227,  1, 54, 12,  4,  0, 55, 12,  4,  0, 56, 12, 11,  0, 57, 12, 14,  0, 29, 12,
- 14,  0,170,  8, 14,  0, 58, 12, 14,  0, 59, 12, 14,  0, 60, 12,228,  1, 18,  0,228,  1,  0,  0,228,  1,  1,  0,  0,  0, 61, 12,
- 21,  0, 31,  0,  0,  0, 62, 12,  2,  0, 63, 12,  2,  0, 16,  0,  2,  0, 14,  0,  2,  0, 64, 12,  2,  0, 65, 12,  2,  0, 66, 12,
-  2,  0, 67, 12,  2,  0, 68, 12,  2,  0, 18,  0,  2,  0, 69, 12,  2,  0, 32,  0,  2,  0, 27,  0,229,  1, 70, 12,230,  1,  4,  0,
-230,  1,  0,  0,230,  1,  1,  0,228,  1, 71, 12,228,  1, 72, 12,231,  1, 11,  0,231,  1,  0,  0,231,  1,  1,  0, 14,  0, 73, 12,
- 14,  0, 74, 12,  0,  0, 61, 12,  2,  0, 75, 12,  2,  0, 76, 12,  2,  0, 18,  0,  2,  0, 77, 12,  4,  0, 78, 12, 11,  0, 79, 12,
-224,  1,  7,  0,224,  1,  0,  0,224,  1,  1,  0,  0,  0, 61, 12,  0,  0, 80, 12, 14,  0, 68,  8,  4,  0, 81, 12,  4,  0, 18,  0,
-250,  0, 14,  0,250,  0,  0,  0,250,  0,  1,  0,  0,  0, 61, 12, 21,  0, 31,  0,232,  1,144,  8, 11,  0, 82, 12, 11,  0, 83, 12,
-229,  1, 70, 12,221,  1, 84, 12, 14,  0, 85, 12,250,  0, 86, 12, 33,  1,246,  6,  2,  0, 18,  0,  2,  0, 86,  1,233,  1, 12,  0,
-233,  1,  0,  0,233,  1,  1,  0, 11,  0,  2,  0, 11,  0, 87, 12,  0,  0, 19,  0,  2,  0, 16,  0,  2,  0, 18,  0,  7,  0,148,  9,
-  7,  0,128,  0,  7,  0,137,  4,  7,  0, 98,  9,  7,  0, 90, 10,234,  1,  5,  0,  7,  0, 88, 12,  4,  0, 89, 12,  4,  0, 90, 12,
-  4,  0, 87,  1,  4,  0, 18,  0,235,  1,  6,  0,  7,  0, 91, 12,  7,  0, 92, 12,  7,  0, 93, 12,  7,  0, 94, 12,  4,  0, 16,  0,
-  4,  0, 18,  0,236,  1,  5,  0,  7,  0,126,  9,  7,  0,127,  9,  7,  0,245,  2,  2,  0, 46,  2,  2,  0, 47,  2,237,  1,  5,  0,
-236,  1,  2,  0,  4,  0, 52,  0,  7,  0, 95, 12,  7,  0,126,  9,  7,  0,127,  9,238,  1,  4,  0,  2,  0, 96, 12,  2,  0, 97, 12,
-  2,  0, 98, 12,  2,  0, 99, 12,239,  1,  2,  0, 37,  0, 44,  7, 21,  0,166,  9,240,  1,  3,  0, 19,  0,100, 12,  4,  0, 18,  0,
-  4,  0, 27,  0,241,  1,  6,  0,  7,  0,107,  0,  7,  0,214,  2,  7,  0,101, 12,  7,  0, 27,  0,  2,  0,250,  0,  2,  0,102, 12,
-242,  1,  5,  0,  7,  0,103, 12,  7,  0,127,  0,  7,  0,203,  9,  7,  0,204,  9,  4,  0, 18,  0,243,  1,  6,  0, 22,  0, 49,  7,
-  0,  0,104, 12,  0,  0,105, 12,  2,  0,106, 12,  2,  0, 18,  0,  4,  0,107, 12,244,  1,  7,  0,244,  1,  0,  0,244,  1,  1,  0,
-  0,  0, 19,  0,243,  1,108, 12,  2,  0,109, 12,  2,  0, 16,  0,  7,  0, 59,  0,245,  1,  7,  0, 14,  0,110, 12,  0,  0,111, 12,
- 11,  0,112, 12,  7,  0, 59,  0,  7,  0,148,  9,  4,  0, 16,  0,  4,  0, 18,  0,246,  1,  3,  0,  7,  0,113, 12,  4,  0, 18,  0,
-  4,  0, 27,  0,247,  1, 15,  0,247,  1,  0,  0,247,  1,  1,  0,107,  1, 21, 10,245,  1, 60,  0, 14,  0,193,  3, 30,  0, 48,  0,
-246,  1,114, 12,  4,  0, 52,  0,  7,  0, 59,  0,  2,  0, 18,  0,  2,  0, 22,  1,  4,  0,115, 12,  0,  0,104, 12,  4,  0,116, 12,
-  7,  0,118, 10,248,  1,  2,  0,  0,  0,117, 12,  0,  0,118, 12,249,  1,  4,  0,249,  1,  0,  0,249,  1,  1,  0,177,  0, 75,  3,
- 14,  0,119, 12,250,  1, 25,  0,250,  1,  0,  0,250,  1,  1,  0, 14,  0,120, 12,177,  0, 96,  9,249,  1,121, 12, 14,  0,122, 12,
- 14,  0,193,  3,  0,  0, 19,  0,  7,  0,148,  9,  7,  0,123, 12,  7,  0, 89,  0,  7,  0, 90,  0,  7,  0, 86, 10,  7,  0, 87, 10,
-  7,  0,  2,  3,  7,  0,153,  3,  7,  0, 98,  9,  7,  0, 90, 10,  2,  0,124, 12,  2,  0,125, 12,  2,  0, 66,  0,  2,  0, 16,  0,
- 11,  0,126, 12,  4,  0, 18,  0,  4,  0, 30,  0,251,  1,  6,  0,251,  1,  0,  0,251,  1,  1,  0, 14,  0,120, 12,  4,  0, 18,  0,
-  4,  0, 17,  2,  0,  0, 19,  0,252,  1, 11,  0,252,  1,  0,  0,252,  1,  1,  0, 22,  0, 49,  7,  0,  0,127, 12,  4,  0,107, 12,
-  2,  0,128, 12,  2,  0, 27,  0,  0,  0,104, 12,  4,  0,115, 12,  2,  0, 18,  0,  2,  0,129, 12,253,  1, 10,  0,253,  1,  0,  0,
-253,  1,  1,  0, 14,  0,130, 12,  0,  0, 61, 12,  0,  0, 19,  0,  0,  0,131, 12,  0,  0,132, 12,  2,  0, 18,  0,  2,  0,129, 12,
-  4,  0,133, 12,254,  1,  5,  0,254,  1,  0,  0,254,  1,  1,  0,  0,  0,104, 12,  4,  0,115, 12,  7,  0,235,  2, 34,  0, 12,  0,
-177,  0,184,  3,177,  0,134, 12,249,  1,121, 12, 14,  0,135, 12,250,  1,136, 12, 14,  0,137, 12, 14,  0,138, 12,  4,  0, 18,  0,
-  4,  0,251,  0,  2,  0,139, 12,  2,  0,140, 12,  7,  0,141, 12,255,  1,  2,  0, 22,  0, 32,  0, 34,  0, 74,  0,  0,  2,  5,  0,
-  0,  2,  0,  0,  0,  2,  1,  0,  4,  0, 16,  0,  4,  0, 18,  0,  0,  0,179,  5,  1,  2,  6,  0,  0,  2,142, 12, 27,  0, 43,  0,
-  4,  0,143, 12,  7,  0,144, 12,  4,  0,145, 12,  4,  0,  7, 10,  2,  2,  3,  0,  0,  2,142, 12,  4,  0,143, 12,  7,  0,146, 12,
-  3,  2,  8,  0,  0,  2,142, 12, 27,  0, 43,  0,  7,  0, 77,  1,  7,  0,147, 12,  7,  0, 41,  3,  7,  0,159,  9,  4,  0,143, 12,
-  4,  0,148, 12,  4,  2,  5,  0,  0,  2,142, 12,  7,  0,149, 12,  7,  0,181,  2,  7,  0,  8,  3,  7,  0, 55,  0,  5,  2,  3,  0,
-  0,  2,142, 12,  7,  0,159,  9,  7,  0,150, 12,204,  1,  4,  0,  7,  0,151, 12,  7,  0,159, 11,  2,  0,152, 12,  2,  0, 87,  1,
-  6,  2, 14,  0,  6,  2,  0,  0,  6,  2,  1,  0, 14,  0,153, 12, 14,  0,154, 12, 14,  0,155, 12,  0,  0,179,  5,  4,  0, 32,  0,
-  4,  0, 18,  0,  4,  0,156, 12,  7,  0,157, 12,  4,  0,145, 12,  4,  0,  7, 10,  7,  0, 89,  4,  7,  0, 10,  3,212,  1, 23,  0,
-  4,  0,143, 12,  4,  0,158, 12,  7,  0,159, 12,  7,  0,  6,  3,  7,  0,160, 12,  7,  0,239,  8,  7,  0,151, 12,  7,  0,161, 12,
-  7,  0,214,  2,  7,  0, 22, 11,  7,  0,222,  4,  7,  0,162, 12,  7,  0,163, 12,  7,  0,164, 12,  7,  0,165, 12,  7,  0,166, 12,
-  7,  0,167, 12,  7,  0,168, 12,  7,  0,169, 12,  7,  0,170, 12,  7,  0,171, 12,  7,  0,172, 12, 14,  0,173, 12,124,  0, 40,  0,
-123,  0,174, 12,  7,  2,105, 11, 64,  0,175, 12, 64,  0,192, 11, 64,  0,176, 12,  8,  2,177, 12, 43,  0,168,  0, 43,  0,178, 12,
- 43,  0,179, 12,  7,  0,180, 12,  7,  0,181, 12,  7,  0,182, 12,  7,  0,183, 12,  7,  0,184, 12,  7,  0,127,  8,  7,  0,185, 12,
-  7,  0,181,  1,  7,  0,186, 12,  4,  0,187, 12,  4,  0,188, 12,  4,  0,189, 12,  4,  0, 91,  0,  4,  0, 27,  0,  4,  0,190, 12,
-  2,  0,191, 12,  2,  0,192, 12,  4,  0,193, 12,  7,  0,214,  2,  4,  0,194, 12,  7,  0,195, 12,  4,  0,196, 12,  4,  0,197, 12,
-  4,  0,198, 12,140,  0,199, 12, 14,  0,200, 12,188,  0,159,  4,  4,  0,201, 12,  7,  0,202, 12,  7,  0,203, 12,  4,  0, 30,  0,
-125,  0, 12,  0,123,  0,174, 12,151,  0, 61,  3,  7,  0,146,  1,  7,  0,127,  8,  7,  0,204, 12,  7,  0,205, 12,  7,  0,206, 12,
-  2,  0,207, 12,  2,  0,208, 12,  2,  0,209, 12,  2,  0, 16,  0,  4,  0, 91,  0,126,  0, 15,  0,123,  0,174, 12,142,  0, 38,  3,
-  7,  0,202,  9,  7,  0,210, 12,  7,  0,211, 12,  4,  0,212, 12,  7,  0, 79,  1,  7,  0,213, 12,  4,  0, 43, 10,  4,  0, 34,  3,
-  4,  0,214, 12,  7,  0,183, 12,  2,  0, 16,  0,  2,  0, 27,  0,  4,  0, 30,  0,  9,  2, 15,  0, 22,  0, 32,  0, 34,  0, 74,  0,
- 47,  1,237,  8,  7,  0,215, 12,  7,  0,216, 12,  7,  0,217, 12,  7,  0,218, 12,  7,  0,158,  9,  7,  0,219, 12,  7,  0,220, 12,
-  7,  0,221, 12,  7,  0, 89,  4,  7,  0,239,  8,  2,  0, 18,  0,  2,  0,122,  9,232,  0,  3,  0,  4,  0,125,  0,  2,  0,222,  6,
-  2,  0,222, 12, 10,  2,  5,  0,  0,  0,203,  8,  2,  0,204,  8,  2,  0, 79,  5,  2,  0,223, 12,  2,  0,224, 12,230,  0, 16,  0,
- 22,  0, 32,  0, 34,  0, 74,  0,  0,  0, 35,  0,  4,  0,142,  0,  4,  0,143,  0,  4,  0,225, 12,  7,  0,161,  0,  7,  0,162,  0,
- 44,  0,137,  0, 11,  2,160,  9,179,  0,187,  3, 12,  2,226, 12, 11,  0,227, 12, 10,  2,228, 12,  4,  0, 18,  0,  4,  0, 22,  0,
- 14,  1, 10,  0,  4,  0,131,  0,  4,  0,229, 12, 52,  0,230, 12,  7,  0,231, 12,  2,  0,232, 12,  0,  0,186,  2,  4,  0,125,  0,
- 13,  2,180,  3, 14,  2,233, 12,  7,  0,234, 12, 15,  2,  3,  0,  4,  0,125,  0,  7,  0,235, 12,  7,  0, 79,  1, 16,  2, 11,  0,
- 11,  0,236, 12,  7,  0,237, 12,  7,  0,238, 12,  7,  0, 27,  0,  7,  0,239, 12,  2,  0,240, 12,  2,  0, 66,  0,  7,  0,241, 12,
-  7,  0,242, 12,  7,  0,243, 12,  7,  0,244, 12, 14,  2,  3,  0,  7,  0,245, 12,  4,  0,125,  0,  4,  0, 18,  0, 13,  2, 24,  0,
- 13,  2,  0,  0, 13,  2,  1,  0,  0,  0, 19,  0,  7,  0,246, 12,  7,  0,247, 12,  7,  0,248, 12,  7,  0,249, 12,  7,  0, 36, 11,
-  4,  0,250, 12,  4,  0,251, 12, 14,  2,252, 12,  7,  0,253, 12,  7,  0,235, 12,  4,  0, 18,  0,  4,  0,254, 12,  4,  0,255, 12,
-  7,  0,118, 10,  2,  0,  0, 13,  2,  0,232,  3,  2,  0,  1, 13,  2,  0,  2, 13,  2,  0,  3, 13,  2,  0, 30,  0,  7,  0,  4, 13,
- 17,  2, 22,  0,  4,  0, 18,  0,  2,  0,  5, 13,  2,  0,  6, 13,  7,  0,  7, 13,  2,  0,  8, 13,  2,  0,  9, 13,  2,  0, 10, 13,
-  2,  0, 11, 13,  2,  0, 12, 13,  2,  0, 13, 13,  2,  0, 14, 13,  2,  0,  8,  3,  4,  0, 15, 13,  4,  0, 16, 13,  2,  0, 17, 13,
-  2,  0, 30,  0,  7,  0, 94,  1,  4,  0, 18, 13,  4,  0, 19, 13,  7,  0, 20, 13,  7,  0, 21, 13,  4,  0,250,  1, 18,  2, 12,  0,
-  4,  0, 18,  0,  4,  0, 22, 13,  4,  0, 23, 13,  7,  0, 24, 13, 13,  2, 25, 13,  7,  0, 26, 13,  7,  0, 27, 13,  7,  0, 28, 13,
-  4,  0,193,  1,  4,  0,131,  0,  7,  0,153,  3, 52,  0, 29, 13, 19,  2,  5,  0,  4,  0, 18,  0,  7,  0,235, 12,  4,  0, 30, 13,
-  4,  0, 31, 13, 15,  2, 32, 13, 20,  2,  7,  0, 20,  2,  0,  0, 20,  2,  1,  0,  0,  0, 19,  0,  4,  0, 18,  0,  7,  0,153,  3,
- 14,  0, 33, 13, 19,  2, 34, 13, 21,  2,  1,  0,  0,  0, 35, 13, 22,  2,  8,  0, 22,  2,  0,  0, 22,  2,  1,  0, 13,  2,180,  3,
-  4,  0, 27,  0,  4,  0, 36, 13,  4,  0, 37, 13,  4,  0, 38, 13,  4,  0, 39, 13, 23,  2,  6,  0,  4,  0,131,  0,  4,  0, 27,  0,
- 14,  0,  7, 10,  4,  0, 40, 13,  2,  0, 41, 13,  2,  0, 42, 13, 12,  2, 11,  0, 17,  2, 43, 13, 16,  2, 44, 13, 14,  0, 33, 13,
- 19,  2, 34, 13, 18,  2, 45, 13, 13,  2, 46, 13, 14,  0, 47, 13,  4,  0, 48, 13,  4,  0, 49, 13, 21,  2, 97,  6, 23,  2, 50, 13,
- 24,  2, 48,  0, 24,  2,  0,  0, 24,  2,  1,  0,170,  0,150,  3, 25,  2,  2,  0, 64,  0, 51, 13,188,  0,159,  4,140,  0,158,  4,
- 14,  0, 26,  3,  4,  0, 52, 13,  0,  0, 19,  0,  2,  0,193, 10,  2,  0, 16,  0,  2,  0, 53, 13,  2,  0, 54, 13,  2,  0, 55, 13,
-  2,  0, 56, 13,  2,  0, 57, 13,  2,  0, 58, 13,  4,  0, 91,  0,  4,  0,191,  3,  4,  0, 59, 13,  4,  0, 60, 13,  4,  0,203,  9,
-  4,  0,204,  9,  4,  0, 27,  0,  7,  0, 61, 13, 47,  0, 62, 13,  0,  0, 63, 13,  4,  0, 64, 13,  4,  0,193, 12,  7,  0, 65, 13,
-  7,  0, 66, 13,  7,  0, 67, 13,  7,  0, 68, 13,  7,  0, 69, 13,  7,  0, 70, 13,  7,  0, 71, 13,  7,  0, 72, 13,  7,  0, 73, 13,
-  7,  0, 74, 13,  7,  0, 75, 13,  7,  0, 76, 13,  7,  0, 77, 13,  7,  0, 78, 13,  0,  0,207,  2,  0,  0, 79, 13,  0,  0, 80, 13,
-  0,  0, 81, 13,170,  0,  7,  0,169,  0, 82, 13,144,  0, 40,  3, 14,  0, 83, 13,  2,  0, 84, 13,  2,  0, 91,  0,  4,  0, 27,  0,
-  0,  0, 85, 13,171,  0, 24,  0,169,  0, 82, 13,144,  0, 40,  3,151,  0, 61,  3, 63,  0, 29,  2,  4,  0, 91,  0,  4,  0, 86, 13,
-  7,  0,184,  0,  7,  0,185,  0,  7,  0,186,  0,  7,  0,181,  1,  7,  0, 87, 13,  7,  0, 88, 13,  7,  0, 89, 13,  7,  0, 90, 13,
- 50,  0, 91, 13, 50,  0, 92, 13,  2,  0, 93, 13,  2,  0,253, 10,  2,  0, 94, 13,  2,  0, 27,  0,  7,  0, 95, 13,  7,  0, 96, 13,
-  7,  0, 97, 13,  7,  0, 98, 13, 69, 78, 68, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  7,  0,141,  1,  7,  0,142,  1,  2,  0,143,  1,  2,  0,144,  1,  2,  0,145,  1,  2,  0,146,  1,  7,  0,147,  1,  7,  0,148,  1,
+  7,  0,149,  1,  7,  0,150,  1, 61,  0,  4,  0,  4,  0, 18,  0,  4,  0,151,  1,  4,  0,152,  1,  4,  0, 66,  0, 62,  0,126,  0,
+ 22,  0, 32,  0, 34,  0, 74,  0,  2,  0,153,  1,  2,  0, 18,  0,  7,  0,184,  0,  7,  0,185,  0,  7,  0,186,  0,  7,  0,154,  1,
+  7,  0,155,  1,  7,  0,156,  1,  7,  0,157,  1,  7,  0,158,  1,  7,  0,159,  1,  7,  0,160,  1,  7,  0,161,  1,  7,  0,162,  1,
+  7,  0,163,  1,  7,  0,164,  1,  7,  0,165,  1,  7,  0,166,  1,  7,  0,167,  1,  7,  0,168,  1,  7,  0,169,  1,  7,  0,170,  1,
+  7,  0,171,  1,  7,  0,172,  1,  7,  0,173,  1, 60,  0,174,  1, 61,  0,175,  1,  7,  0,176,  1,  7,  0,177,  1,  7,  0,178,  1,
+  7,  0,179,  1,  7,  0,180,  1,  7,  0,181,  1,  7,  0,182,  1,  2,  0,183,  1,  2,  0,184,  1,  2,  0,185,  1,  0,  0,186,  1,
+  0,  0,187,  1,  7,  0,188,  1,  7,  0,189,  1,  2,  0,190,  1,  2,  0,191,  1,  7,  0,192,  1,  7,  0,193,  1,  7,  0,194,  1,
+  7,  0,195,  1,  2,  0,196,  1,  2,  0,197,  1,  4,  0, 74,  1,  4,  0,198,  1,  2,  0,199,  1,  2,  0,200,  1,  2,  0,201,  1,
+  2,  0,202,  1,  7,  0,203,  1,  7,  0,204,  1,  7,  0,205,  1,  7,  0,206,  1,  7,  0,207,  1,  7,  0,208,  1,  7,  0,209,  1,
+  7,  0,210,  1,  7,  0,211,  1,  7,  0,212,  1,  0,  0,213,  1,  7,  0,214,  1,  7,  0,215,  1,  7,  0,216,  1,  4,  0,217,  1,
+  0,  0,218,  1,  0,  0,111,  1,  0,  0,219,  1,  0,  0, 63,  1,  2,  0,220,  1,  2,  0,221,  1,  2,  0,131,  1,  2,  0,222,  1,
+  2,  0,223,  1,  2,  0,224,  1,  7,  0,225,  1,  7,  0,226,  1,  7,  0,227,  1,  7,  0,228,  1,  7,  0,229,  1,  2,  0,163,  0,
+  2,  0,164,  0, 49,  0,230,  1, 49,  0,231,  1,  0,  0,232,  1,  0,  0,233,  1,  0,  0,234,  1,  0,  0,235,  1,  2,  0,236,  1,
+  2,  0,237,  1,  7,  0,238,  1,  7,  0,239,  1, 46,  0,130,  1, 56,  0, 58,  1, 31,  0, 79,  0, 63,  0,240,  1, 25,  0,153,  0,
+  7,  0,241,  1,  7,  0,242,  1,  7,  0,243,  1,  7,  0,244,  1,  7,  0,245,  1,  2,  0,246,  1,  2,  0, 30,  0,  7,  0,247,  1,
+  7,  0,248,  1,  7,  0,249,  1,  7,  0,250,  1,  7,  0,251,  1,  7,  0,252,  1,  7,  0,253,  1,  7,  0,254,  1,  7,  0,255,  1,
+  2,  0,  0,  2,  2,  0,  1,  2,  4,  0,  2,  2,  2,  0,  3,  2,  2,  0,  4,  2, 14,  0,  5,  2, 64,  0,  4,  0, 22,  0, 32,  0,
+  0,  0, 35,  0, 65,  0,  2,  0, 38,  0,152,  0, 66,  0, 20,  0, 66,  0,  0,  0, 66,  0,  1,  0, 67,  0,  6,  2,  2,  0, 16,  0,
+  2,  0, 18,  0,  2,  0,  7,  2,  2,  0,  8,  2,  7,  0,  5,  0,  7,  0,  6,  0,  7,  0,  7,  0,  7,  0,  9,  2,  7,  0, 10,  2,
+  7,  0, 11,  2,  7,  0, 12,  2,  7,  0, 13,  2,  7,  0, 14,  2,  7,  0, 15,  2,  7,  0, 22,  0,  7,  0, 16,  2,  7,  0, 17,  2,
+ 68,  0, 20,  0, 22,  0, 32,  0, 34,  0, 74,  0, 67,  0,  6,  2, 14,  0, 18,  2, 14,  0, 19,  2, 14,  0, 20,  2, 31,  0, 79,  0,
+ 62,  0, 21,  2,  0,  0, 18,  0,  0,  0, 22,  2,  2,  0, 23,  2,  2,  0,177,  0,  2,  0, 27,  0,  7,  0, 64,  1,  7,  0,175,  0,
+  7,  0, 65,  1,  7,  0, 24,  2,  7,  0, 25,  2,  7,  0, 26,  2, 66,  0, 27,  2, 30,  0, 11,  0,  7,  0, 28,  2,  7,  0, 29,  2,
+  7,  0, 30,  2,  7,  0,243,  0,  2,  0, 53,  0,  0,  0, 31,  2,  0,  0, 32,  2,  0,  0, 33,  2,  0,  0, 34,  2,  0,  0, 35,  2,
+  0,  0, 36,  2, 29,  0,  7,  0,  7,  0, 37,  2,  7,  0, 29,  2,  7,  0, 30,  2,  2,  0, 33,  2,  2,  0, 36,  2,  7,  0,243,  0,
+  7,  0, 27,  0, 69,  0, 21,  0, 69,  0,  0,  0, 69,  0,  1,  0,  2,  0, 16,  0,  2,  0, 38,  2,  2,  0, 36,  2,  2,  0, 18,  0,
+  2,  0, 39,  2,  2,  0, 40,  2,  2,  0, 41,  2,  2,  0, 42,  2,  2,  0, 43,  2,  2,  0, 44,  2,  2,  0, 45,  2,  2,  0, 46,  2,
+  7,  0, 47,  2,  7,  0, 48,  2, 29,  0, 47,  0, 30,  0, 48,  0,  2,  0, 49,  2,  2,  0, 50,  2,  4,  0, 51,  2, 70,  0,  5,  0,
+  2,  0, 52,  2,  2,  0, 38,  2,  0,  0, 18,  0,  0,  0, 27,  0,  2,  0, 30,  0, 71,  0,  4,  0,  7,  0,  5,  0,  7,  0,  6,  0,
+  7,  0, 53,  2,  7,  0, 54,  2, 72,  0,  4,  0, 14,  0, 55,  2, 73,  0, 56,  2,  4,  0, 57,  2,  0,  0, 93,  0, 74,  0, 70,  0,
+ 22,  0, 32,  0, 34,  0, 74,  0, 67,  0,  6,  2, 14,  0, 58,  2, 14,  0, 19,  2, 72,  0, 59,  2, 27,  0, 60,  2, 27,  0, 61,  2,
+ 27,  0, 62,  2, 31,  0, 79,  0, 75,  0, 63,  2, 33,  0, 64,  2, 62,  0, 21,  2, 14,  0, 65,  2,  7,  0, 64,  1,  7,  0,175,  0,
+  7,  0, 65,  1,  2,  0, 16,  0,  2,  0,177,  0,  2,  0, 66,  2,  2,  0, 67,  2,  7,  0, 68,  2,  7,  0, 69,  2,  4,  0, 70,  2,
+  2,  0, 27,  0,  2,  0, 23,  2,  2,  0, 18,  0,  2,  0, 71,  2,  7,  0, 72,  2,  7,  0, 73,  2,  7,  0, 74,  2,  2,  0, 41,  2,
+  2,  0, 42,  2,  2,  0, 75,  2,  2,  0, 76,  2,  4,  0, 77,  2, 11,  0, 78,  2,  2,  0, 22,  0,  2,  0, 96,  0,  2,  0, 65,  0,
+  2,  0, 79,  2,  7,  0, 80,  2,  7,  0, 81,  2,  7,  0, 82,  2,  7,  0, 83,  2,  7,  0, 84,  2,  7,  0, 85,  2,  7,  0, 86,  2,
+  7,  0, 87,  2,  7,  0, 88,  2,  7,  0, 89,  2,  0,  0, 90,  2, 76,  0, 91,  2, 77,  0, 92,  2,  0,  0, 93,  2, 64,  0, 94,  2,
+ 64,  0, 95,  2, 64,  0, 96,  2, 64,  0, 97,  2,  4,  0, 98,  2,  7,  0, 83,  0,  4,  0, 99,  2,  4,  0,100,  2, 71,  0,101,  2,
+  4,  0,102,  2,  4,  0,103,  2, 70,  0,104,  2, 70,  0,105,  2,  7,  0,106,  2,  7,  0,107,  2, 78,  0, 47,  0, 22,  0, 32,  0,
+ 34,  0, 74,  0, 67,  0,  6,  2, 31,  0, 79,  0, 33,  0, 64,  2, 62,  0, 21,  2, 79,  0,108,  2, 80,  0,109,  2, 81,  0,110,  2,
+ 82,  0,111,  2, 83,  0,112,  2, 84,  0,113,  2, 85,  0,114,  2, 86,  0,115,  2, 87,  0,116,  2, 88,  0,117,  2, 89,  0,118,  2,
+ 90,  0,119,  2, 91,  0,120,  2, 92,  0,121,  2, 78,  0,122,  2, 93,  0,123,  2, 94,  0,124,  2, 94,  0,125,  2, 94,  0,126,  2,
+ 94,  0,127,  2, 94,  0,128,  2,  4,  0, 52,  0,  4,  0,129,  2,  4,  0,130,  2,  4,  0,131,  2,  4,  0,132,  2,  4,  0,133,  2,
+  4,  0,134,  2,  7,  0, 64,  1,  7,  0,175,  0,  7,  0, 65,  1,  2,  0,177,  0,  2,  0, 66,  2,  2,  0,135,  2,  2,  0, 18,  0,
+  2,  0,136,  2,  2,  0,137,  2,  0,  0,138,  2,  0,  0,139,  2,  2,  0, 23,  2, 95,  0,140,  2, 87,  0,  8,  0, 11,  0,141,  2,
+  7,  0,142,  2,  4,  0,143,  2,  0,  0, 18,  0,  0,  0,144,  2,  2,  0, 74,  1,  2,  0,145,  2,  2,  0,146,  2, 85,  0,  7,  0,
+  4,  0,147,  2,  4,  0,148,  2,  4,  0,149,  2,  4,  0,150,  2,  2,  0, 38,  2,  0,  0,151,  2,  0,  0, 18,  0, 89,  0,  5,  0,
+  4,  0,147,  2,  4,  0,148,  2,  0,  0,152,  2,  0,  0,153,  2,  2,  0, 18,  0, 96,  0,  2,  0,  4,  0,154,  2,  7,  0, 30,  2,
+ 90,  0,  3,  0, 96,  0,155,  2,  4,  0,156,  2,  4,  0, 18,  0, 88,  0,  4,  0,  7,  0,157,  2,  2,  0,158,  2,  0,  0, 18,  0,
+  0,  0,153,  2, 91,  0,  4,  0,  0,  0,226,  0,  0,  0,184,  0,  0,  0,185,  0,  0,  0,186,  0, 80,  0,  5,  0,  4,  0,159,  2,
+  4,  0,133,  2,  2,  0, 38,  2,  0,  0, 18,  0,  0,  0, 27,  0, 82,  0,  2,  0,  4,  0,160,  2,  4,  0,161,  2, 81,  0,  6,  0,
+ 42,  0,141,  2,  0,  0, 18,  0,  0,  0,144,  2,  2,  0, 74,  1,  2,  0,145,  2,  2,  0,146,  2, 83,  0,  2,  0,  7,  0,162,  2,
+  4,  0, 18,  0, 84,  0,  4,  0,  0,  0,184,  0,  0,  0,185,  0,  0,  0,186,  0,  0,  0,226,  0, 92,  0,  1,  0,  7,  0,163,  2,
+ 79,  0,  2,  0,  4,  0,  4,  2,  4,  0, 16,  0, 86,  0,  7,  0,  7,  0,142,  2, 42,  0,141,  2,  0,  0, 18,  0,  0,  0,144,  2,
+  2,  0, 74,  1,  2,  0,145,  2,  2,  0,146,  2, 97,  0,  1,  0,  7,  0,164,  2, 98,  0,  1,  0,  4,  0,165,  2, 99,  0,  1,  0,
+  0,  0,166,  2,100,  0,  1,  0,  7,  0,142,  2,101,  0,  1,  0,  7,  0,162,  2,102,  0,  4,  0,  4,  0,167,  2,  4,  0,168,  2,
+  7,  0,169,  2,  4,  0,170,  2,103,  0,  4,  0,  7,  0,226,  0,  7,  0,184,  0,  7,  0,185,  0,  7,  0,186,  0,104,  0,  1,  0,
+103,  0,143,  2,105,  0,  5,  0,  4,  0,171,  2,  4,  0,172,  2,  0,  0, 18,  0,  0,  0, 38,  2,  0,  0,173,  2,106,  0,  2,  0,
+  4,  0,174,  2,  4,  0,172,  2,107,  0, 10,  0,107,  0,  0,  0,107,  0,  1,  0,105,  0,175,  2,104,  0,176,  2,106,  0,177,  2,
+  4,  0, 52,  0,  4,  0,130,  2,  4,  0,129,  2,  4,  0, 27,  0, 88,  0,178,  2, 95,  0, 14,  0, 14,  0,179,  2, 88,  0,178,  2,
+  0,  0,180,  2,  0,  0,181,  2,  0,  0,182,  2,  0,  0,183,  2,  0,  0,184,  2,  0,  0,185,  2,  0,  0,186,  2,  0,  0, 18,  0,
+ 94,  0,124,  2, 94,  0,126,  2,  2,  0,187,  2,  0,  0,188,  2,108,  0,  1,  0,  4,  0,165,  2,109,  0,  3,  0,  7,  0,  2,  0,
+  4,  0,168,  2,  4,  0, 27,  0,110,  0,  2,  0,  7,  0,189,  2,  4,  0, 18,  0,111,  0,  9,  0,111,  0,  0,  0,111,  0,  1,  0,
+  4,  0, 16,  0,  4,  0, 74,  1,  4,  0,190,  2,  4,  0, 27,  0,  0,  0, 19,  0, 41,  0,124,  0,  0,  0,191,  2,112,  0,  6,  0,
+111,  0,192,  2, 47,  0,193,  2, 27,  0,194,  2,  0,  0,195,  2,  4,  0,196,  2,  4,  0,197,  2,113,  0,  7,  0,111,  0,192,  2,
+  2,  0,198,  2,  2,  0,179,  2,  2,  0,199,  2,  2,  0, 91,  0, 11,  0,200,  2, 11,  0,201,  2,114,  0,  5,  0,111,  0,192,  2,
+ 27,  0,167,  0,  0,  0, 19,  0,  7,  0,202,  2,  0,  0, 93,  0,115,  0,  5,  0,111,  0,192,  2, 27,  0,167,  0,  0,  0, 19,  0,
+  2,  0,203,  2,  0,  0,204,  2,116,  0,  5,  0,111,  0,192,  2,  7,  0, 89,  0,  7,  0,205,  2,  4,  0,206,  2,  4,  0,207,  2,
+117,  0,  5,  0,111,  0,192,  2, 27,  0,208,  2,  0,  0, 71,  0,  4,  0, 74,  1,  4,  0, 18,  0,118,  0, 13,  0,111,  0,192,  2,
+ 27,  0,209,  2, 27,  0,210,  2, 27,  0,211,  2, 27,  0,212,  2,  7,  0,213,  2,  7,  0,214,  2,  7,  0,205,  2,  7,  0,215,  2,
+  4,  0,216,  2,  4,  0,217,  2,  4,  0, 91,  0,  4,  0,218,  2,119,  0,  5,  0,111,  0,192,  2,  2,  0,219,  2,  2,  0, 18,  0,
+  7,  0,220,  2, 27,  0,221,  2,120,  0,  3,  0,111,  0,192,  2,  7,  0,222,  2,  4,  0, 91,  0,121,  0, 10,  0,111,  0,192,  2,
+  7,  0,223,  2,  4,  0,224,  2,  4,  0, 27,  0,  2,  0, 91,  0,  2,  0,225,  2,  2,  0,226,  2,  2,  0,227,  2,  7,  0,228,  2,
+  0,  0,229,  2,122,  0,  3,  0,111,  0,192,  2,  7,  0, 27,  0,  4,  0, 16,  0,123,  0,  6,  0,111,  0,192,  2,124,  0,230,  2,
+125,  0,231,  2,126,  0,232,  2,  7,  0,233,  2,  4,  0, 16,  0,127,  0, 11,  0,111,  0,192,  2, 47,  0,193,  2, 27,  0,194,  2,
+  0,  0,195,  2,  4,  0,196,  2,  4,  0,197,  2,  7,  0,202,  2,  4,  0,234,  2,  0,  0,229,  2,  7,  0,235,  2,  4,  0, 27,  0,
+128,  0, 12,  0,111,  0,192,  2, 27,  0,236,  2, 42,  0,237,  2,  4,  0, 91,  0,  4,  0,238,  2,  7,  0,239,  2,  7,  0,240,  2,
+  7,  0,241,  2,  7,  0,242,  2,  0,  0,195,  2,  4,  0,196,  2,  4,  0, 27,  0,129,  0,  3,  0,111,  0,192,  2,  7,  0,243,  2,
+  4,  0,244,  2,130,  0,  5,  0,111,  0,192,  2,  7,  0,245,  2,  0,  0,229,  2,  2,  0, 18,  0,  2,  0,246,  2,131,  0,  8,  0,
+111,  0,192,  2, 27,  0,167,  0,  7,  0,245,  2,  7,  0,243,  0,  7,  0,107,  0,  0,  0,229,  2,  2,  0, 18,  0,  2,  0, 16,  0,
+132,  0, 21,  0,111,  0,192,  2, 47,  0,193,  2, 27,  0,194,  2,  0,  0,195,  2,  4,  0,196,  2,  4,  0,197,  2, 27,  0,247,  2,
+  0,  0,229,  2,  2,  0, 18,  0,  2,  0, 27,  0,  7,  0,248,  2,  7,  0,249,  2,  7,  0,250,  2,  7,  0, 72,  2,  7,  0,251,  2,
+  7,  0,252,  2,  7,  0,253,  2,  7,  0,254,  2,  7,  0,255,  2,  7,  0,  0,  3,  7,  0, 66,  0,133,  0,  7,  0,111,  0,192,  2,
+  2,  0,  1,  3,  2,  0,  2,  3,  4,  0, 30,  0, 27,  0,167,  0,  7,  0,  3,  3,  0,  0,229,  2,134,  0, 10,  0,111,  0,192,  2,
+ 27,  0,167,  0,  0,  0,  4,  3,  7,  0,  5,  3,  7,  0,  6,  3,  7,  0,254,  2,  4,  0,  7,  3,  4,  0,  8,  3,  7,  0,  9,  3,
+  0,  0, 19,  0,135,  0,  1,  0,111,  0,192,  2,136,  0,  7,  0,111,  0,192,  2, 41,  0,124,  0,137,  0, 10,  3,138,  0, 11,  3,
+139,  0, 12,  3,140,  0, 13,  3, 14,  0, 14,  3,141,  0, 13,  0,111,  0,192,  2, 88,  0, 15,  3, 88,  0, 16,  3, 88,  0, 17,  3,
+ 88,  0, 18,  3, 88,  0, 19,  3, 88,  0, 20,  3, 85,  0, 21,  3,  4,  0, 22,  3,  4,  0, 23,  3,  7,  0, 24,  3,  7,  0, 25,  3,
+142,  0, 26,  3,143,  0,  7,  0,111,  0,192,  2, 88,  0, 15,  3, 88,  0, 27,  3,144,  0, 28,  3,145,  0, 26,  3,  4,  0, 29,  3,
+  4,  0, 22,  3,146,  0,  4,  0,111,  0,192,  2, 27,  0,167,  0,  4,  0, 30,  3,  4,  0, 27,  0,147,  0,  2,  0,  4,  0, 31,  3,
+  7,  0, 30,  2,148,  0,  2,  0,  4,  0,127,  0,  4,  0, 32,  3,149,  0, 24,  0,111,  0,192,  2, 27,  0,167,  0,  0,  0,229,  2,
+  2,  0, 33,  3,  2,  0, 18,  0,  2,  0, 74,  1,  2,  0, 27,  0,147,  0, 34,  3,  4,  0, 35,  3,  7,  0, 36,  3,  4,  0, 52,  0,
+  4,  0, 37,  3,148,  0, 38,  3,147,  0, 39,  3,  4,  0, 40,  3,  4,  0, 41,  3,  4,  0, 42,  3,  4,  0, 32,  3,  7,  0, 43,  3,
+  7,  0, 44,  3,  7,  0, 45,  3,  7,  0, 46,  3,  7,  0, 47,  3, 11,  0, 48,  3,150,  0,  8,  0,111,  0,192,  2,151,  0, 49,  3,
+144,  0, 28,  3,  4,  0, 50,  3,  4,  0, 51,  3,  4,  0, 52,  3,  2,  0, 18,  0,  2,  0, 55,  0,152,  0,  8,  0,111,  0,192,  2,
+ 27,  0, 43,  0,  2,  0,247,  0,  2,  0, 18,  0,  2,  0,219,  2,  2,  0, 55,  0,  7,  0, 53,  3,  7,  0, 54,  3,153,  0,  6,  0,
+111,  0,192,  2,  4,  0, 55,  3,  2,  0, 18,  0,  2,  0, 56,  3,  7,  0, 57,  3,  0,  0,169,  0,154,  0,  8,  0,111,  0,192,  2,
+  0,  0, 58,  3,  0,  0, 59,  3,  0,  0,185,  2,  0,  0, 60,  3,  0,  0, 61,  3,  0,  0, 91,  0,  0,  0,173,  2,155,  0,  3,  0,
+111,  0,192,  2,156,  0, 62,  3,140,  0, 13,  3,157,  0, 10,  0,111,  0,192,  2, 27,  0, 63,  3, 27,  0, 64,  3,  0,  0, 65,  3,
+  7,  0, 66,  3,  2,  0, 67,  3,  2,  0, 68,  3,  0,  0, 69,  3,  0,  0, 70,  3,  0,  0,204,  2,158,  0,  9,  0,111,  0,192,  2,
+ 27,  0, 71,  3,  0,  0, 65,  3,  7,  0, 72,  3,  7,  0, 73,  3,  0,  0, 74,  1,  0,  0,219,  2,  0,  0, 74,  3,  0,  0, 27,  0,
+159,  0,  1,  0,111,  0,192,  2,160,  0, 11,  0,111,  0,192,  2,  0,  0,229,  2,  7,  0,127,  0,  7,  0, 75,  3,  7,  0, 76,  3,
+  7,  0, 77,  3,  7,  0, 78,  3,  7,  0, 79,  3,  4,  0, 18,  0,  2,  0, 80,  3,  2,  0, 81,  3,161,  0,  9,  0,111,  0,192,  2,
+ 27,  0, 82,  3,  4,  0, 83,  3,  4,  0, 84,  3,  4,  0, 85,  3,  7,  0, 86,  3,  7,  0, 87,  3,  2,  0,219,  2,  2,  0, 18,  0,
+162,  0, 29,  0,111,  0,192,  2,163,  0, 88,  3,164,  0, 89,  3,  4,  0, 90,  3,  4,  0, 91,  3,  7,  0, 92,  3,  7,  0,253,  2,
+  7,  0, 93,  3,  7,  0,238,  0,  7,  0, 94,  3,  7,  0, 95,  3,  7,  0, 96,  3,  7,  0, 97,  3,  7,  0, 98,  3,  7,  0,233,  2,
+  4,  0, 99,  3,  4,  0,100,  3,  0,  0,101,  3,  0,  0,102,  3,  0,  0,103,  3,  0,  0,104,  3,  0,  0, 18,  0,  0,  0,105,  3,
+  2,  0,106,  3,  2,  0,107,  3,  4,  0,207,  2,  7,  0,107,  0,  7,  0,108,  3,  4,  0, 27,  0,165,  0, 15,  0,111,  0,192,  2,
+ 47,  0,193,  2, 27,  0,194,  2,  0,  0,195,  2,  4,  0,196,  2,  4,  0,197,  2, 27,  0,109,  3, 27,  0,110,  3, 53,  0, 87,  1,
+  0,  0,229,  2,  7,  0,202,  2,  7,  0,111,  3,  0,  0, 18,  0,  0,  0,241,  0,  0,  0,204,  2,166,  0, 16,  0,111,  0,192,  2,
+  0,  0,229,  2,  2,  0,112,  3,  2,  0,241,  0,  7,  0,113,  3, 53,  0,114,  3,  7,  0,115,  3,  7,  0,116,  3,  7,  0,117,  3,
+  0,  0,118,  3,  4,  0,119,  3, 47,  0,120,  3, 27,  0,121,  3,  4,  0,122,  3,  0,  0,123,  3,  4,  0,124,  3,167,  0, 16,  0,
+111,  0,192,  2,  0,  0,125,  3,  0,  0,126,  3,  7,  0,127,  3,  7,  0,128,  3,  0,  0,129,  3,  0,  0,130,  3,  0,  0,131,  3,
+  7,  0,117,  3,  0,  0,118,  3,  4,  0,119,  3, 47,  0,120,  3, 27,  0,121,  3,  4,  0,122,  3,  0,  0,123,  3,  4,  0,124,  3,
+168,  0, 16,  0,111,  0,192,  2,  0,  0,229,  2,  4,  0,132,  3,  4,  0,133,  3, 27,  0,134,  3,  7,  0,117,  3,  0,  0,118,  3,
+  4,  0,119,  3, 47,  0,120,  3, 27,  0,121,  3,  4,  0,122,  3,  0,  0,123,  3,  7,  0,135,  3,  7,  0,136,  3,  2,  0,241,  0,
+  2,  0,137,  3,169,  0,  5,  0,111,  0,192,  2,170,  0,138,  3,171,  0,139,  3,  4,  0, 16,  0,  4,  0, 27,  0,172,  0,  8,  0,
+111,  0,192,  2,  7,  0,140,  3,  7,  0,141,  3,  7,  0,142,  3,  0,  0,238,  0,  0,  0, 18,  0,  0,  0, 74,  1,  0,  0, 27,  0,
+173,  0,  5,  0,111,  0,192,  2,  7,  0,143,  3,  0,  0, 18,  0,  0,  0,144,  3,  0,  0,173,  2,174,  0,  3,  0,175,  0,145,  3,
+  4,  0, 57,  2,  0,  0, 93,  0,175,  0, 29,  0, 22,  0, 32,  0, 34,  0, 74,  0,  2,  0, 39,  2,  2,  0, 40,  2,  2,  0,146,  3,
+  2,  0, 18,  0,  2,  0,147,  3,  2,  0,148,  3,  2,  0,149,  3,  2,  0, 30,  0,  0,  0,150,  3,  0,  0,151,  3,  0,  0,152,  3,
+  0,  0,237,  1,  4,  0, 27,  0,  7,  0,153,  3,  7,  0,154,  3,  7,  0,155,  3,  7,  0,156,  3,  7,  0,157,  3,  7,  0,158,  3,
+ 29,  0,159,  3, 31,  0, 79,  0, 33,  0, 64,  2, 90,  0,119,  2,  0,  0, 71,  0,  7,  0,160,  3,  7,  0,161,  3,174,  0,162,  3,
+176,  0,  5,  0,176,  0,  0,  0,176,  0,  1,  0,  0,  0, 19,  0,  0,  0, 18,  0,  0,  0,123,  0, 67,  0,  3,  0,  7,  0,163,  3,
+  4,  0, 18,  0,  4,  0, 27,  0, 27,  0,132,  0, 22,  0, 32,  0, 34,  0, 74,  0,177,  0,164,  3,  2,  0, 16,  0,  2,  0,165,  3,
+  4,  0,166,  3,  4,  0,167,  3,  4,  0,168,  3,  0,  0,169,  3, 27,  0, 37,  0, 27,  0,170,  3, 27,  0,171,  3, 27,  0,172,  3,
+ 27,  0,173,  3, 31,  0, 79,  0, 67,  0,  6,  2,178,  0,174,  3,178,  0,175,  3,179,  0,176,  3, 11,  0,  2,  0,180,  0,177,  3,
+181,  0,178,  3,182,  0,179,  3, 14,  0,180,  3, 14,  0,181,  3, 14,  0, 19,  2, 14,  0,182,  3, 14,  0,183,  3,  4,  0, 74,  1,
+  4,  0,184,  3, 62,  0, 21,  2,  0,  0,185,  3,  4,  0, 23,  2,  4,  0,186,  3,  7,  0, 64,  1,  7,  0,187,  3,  7,  0,188,  3,
+  7,  0,175,  0,  7,  0,189,  3,  7,  0,190,  3,  7,  0, 65,  1,  7,  0,191,  3,  7,  0,  9,  2,  7,  0,192,  3,  7,  0,193,  3,
+  7,  0,194,  3,  7,  0,195,  3,  7,  0,196,  3,  7,  0,197,  3,  7,  0,  5,  3,  7,  0,198,  3,  7,  0,232,  0,  7,  0,199,  3,
+  4,  0,200,  3,  4,  0,201,  3,  2,  0, 18,  0,  2,  0,202,  3,  2,  0,203,  3,  2,  0,204,  3,  2,  0,205,  3,  2,  0,206,  3,
+  2,  0,207,  3,  2,  0,208,  3,  2,  0,209,  3,  0,  0,210,  3,  0,  0,211,  3,  4,  0,212,  3,  4,  0,213,  3,  4,  0,214,  3,
+  4,  0,215,  3,  7,  0,216,  3,  7,  0, 83,  0,  7,  0,217,  3,  7,  0,218,  3,  7,  0,219,  3,  7,  0,220,  3,  7,  0,221,  3,
+  7,  0,219,  0,  7,  0,222,  3,  7,  0,223,  3,  7,  0,224,  3,  7,  0,225,  3,  7,  0,226,  3,  7,  0,227,  3,  7,  0,228,  3,
+  7,  0,229,  3,  0,  0,230,  3,  2,  0,231,  3,  0,  0,232,  3,  0,  0,233,  3,  0,  0,234,  3,  0,  0,235,  3,  0,  0,109,  0,
+  0,  0,236,  3,  7,  0,237,  3,  7,  0,238,  3, 14,  0,239,  3, 14,  0,240,  3, 14,  0,241,  3, 14,  0,242,  3,  7,  0,243,  3,
+  2,  0,  4,  2,  2,  0,244,  3,  7,  0,143,  2,  4,  0,245,  3,  4,  0,246,  3,183,  0,247,  3,  2,  0,248,  3,  2,  0,239,  0,
+  7,  0,249,  3, 14,  0,250,  3, 14,  0,251,  3, 14,  0,252,  3, 14,  0,253,  3,184,  0, 60,  1,185,  0,254,  3, 63,  0,255,  3,
+  0,  0,  0,  4,  0,  0,  1,  4,  2,  0, 57,  2,  7,  0,135,  2,156,  0,  2,  4,144,  0,  3,  4,144,  0,  4,  4, 10,  0,  5,  4,
+ 10,  0,  6,  4,  4,  0,  7,  4,  4,  0,  8,  4, 14,  0,  9,  4, 14,  0, 10,  4, 14,  0, 11,  4,  7,  0, 12,  4,186,  0, 14,  0,
+186,  0,  0,  0,186,  0,  1,  0, 27,  0, 37,  0,  7,  0,  5,  3,  7,  0, 66,  1,  7,  0,  6,  3,  7,  0,254,  2,  0,  0, 19,  0,
+  4,  0,  7,  3,  4,  0,  8,  3,  4,  0, 13,  4,  2,  0, 16,  0,  2,  0, 14,  4,  7,  0,  9,  3,187,  0, 12,  0,187,  0,  0,  0,
+187,  0,  1,  0, 27,  0, 43,  0,  4,  0, 15,  4,  4,  0,  4,  2,  7,  0, 66,  1,  7,  0, 16,  4,  7,  0, 17,  4,  7,  0,162,  2,
+  2,  0, 16,  0,  0,  0, 18,  4,  0,  0, 19,  4,184,  0, 40,  0,  4,  0, 18,  0,  2,  0, 20,  4,  2,  0, 21,  4,  2,  0,254,  2,
+  2,  0, 22,  4,  2,  0, 23,  4,  2,  0, 24,  4,  2,  0, 25,  4,  2,  0, 26,  4,  7,  0, 27,  4,  7,  0, 28,  4,  7,  0, 29,  4,
+  7,  0, 30,  4,  7,  0, 31,  4,  7,  0, 32,  4,  7,  0, 33,  4,  7,  0, 34,  4,  7,  0, 35,  4,  7,  0, 36,  4,  7,  0, 37,  4,
+  7,  0, 38,  4,  7,  0, 39,  4,  7,  0, 40,  4,  7,  0, 41,  4,  7,  0, 42,  4,  7,  0, 43,  4,  7,  0, 44,  4,  7,  0, 45,  4,
+  7,  0, 46,  4,  7,  0, 47,  4,  7,  0, 48,  4,  7,  0, 49,  4,  7,  0, 50,  4,  7,  0, 51,  4,  7,  0, 52,  4,  7,  0, 53,  4,
+ 47,  0,168,  0,188,  0, 54,  4,  7,  0, 55,  4,  4,  0,207,  2,189,  0,  5,  0, 63,  0,240,  1,  7,  0, 56,  4,  7,  0, 57,  4,
+  2,  0, 18,  0,  2,  0, 58,  4,190,  0,  5,  0,190,  0,  0,  0,190,  0,  1,  0,  4,  0, 16,  0,  4,  0, 59,  4, 11,  0,  2,  0,
+191,  0,  9,  0,191,  0,  0,  0,191,  0,  1,  0,  4,  0, 60,  4,  4,  0, 61,  4,  4,  0, 62,  4,  4,  0, 18,  0, 11,  0, 63,  4,
+ 11,  0, 64,  4, 14,  0, 65,  4,140,  0, 23,  0,140,  0,  0,  0,140,  0,  1,  0,  4,  0, 18,  0,  4,  0, 66,  4,  4,  0, 67,  4,
+  4,  0, 68,  4,  4,  0, 69,  4,  4,  0, 70,  4,  4,  0, 71,  4,  4,  0, 72,  4,  4,  0, 27,  0,  4,  0, 61,  4,  4,  0,  4,  2,
+  2,  0, 73,  4,  2,  0, 55,  0,  0,  0, 19,  0,  0,  0, 74,  4,  0,  0, 75,  4,  0,  0, 76,  4,  0,  0, 77,  4, 14,  0, 78,  4,
+192,  0, 79,  4, 11,  0, 80,  4,193,  0,  1,  0,  7,  0, 37,  2,183,  0, 30,  0,  4,  0, 18,  0,  7,  0, 81,  4,  7,  0, 82,  4,
+  7,  0, 83,  4,  4,  0, 84,  4,  4,  0, 85,  4,  4,  0, 86,  4,  4,  0, 87,  4,  7,  0, 88,  4,  7,  0, 89,  4,  7,  0, 90,  4,
+  7,  0, 91,  4,  7,  0, 92,  4,  7,  0, 93,  4,  7,  0, 94,  4,  7,  0, 95,  4,  7,  0, 96,  4,  7,  0, 97,  4,  7,  0, 98,  4,
+  7,  0, 99,  4,  7,  0,100,  4,  7,  0,101,  4,  7,  0,102,  4,  7,  0,103,  4,  7,  0,104,  4,  7,  0,105,  4,  4,  0,106,  4,
+  4,  0,107,  4,  7,  0,108,  4,  7,  0,222,  3,185,  0, 54,  0,  4,  0, 61,  4,  4,  0,109,  4,194,  0,110,  4,195,  0,111,  4,
+  0,  0, 27,  0,  0,  0,112,  4,  2,  0,113,  4,  7,  0,114,  4,  0,  0,115,  4,  7,  0,116,  4,  7,  0,117,  4,  7,  0,118,  4,
+  7,  0,119,  4,  7,  0,120,  4,  7,  0,121,  4,  7,  0,122,  4,  7,  0,123,  4,  7,  0,124,  4,  2,  0,125,  4,  0,  0,126,  4,
+  2,  0,127,  4,  7,  0,128,  4,  7,  0,129,  4,  0,  0,130,  4,  4,  0,128,  0,  4,  0,131,  4,  4,  0,132,  4,  2,  0,133,  4,
+  2,  0,134,  4,193,  0,135,  4,  4,  0,136,  4,  4,  0, 81,  0,  7,  0,137,  4,  7,  0,138,  4,  7,  0,139,  4,  7,  0,140,  4,
+  2,  0,141,  4,  2,  0,142,  4,  2,  0,143,  4,  2,  0,144,  4,  2,  0,145,  4,  2,  0,146,  4,  2,  0,147,  4,  2,  0,148,  4,
+196,  0,149,  4,  7,  0,150,  4,  7,  0,151,  4,140,  0,152,  4, 14,  0, 14,  3,189,  0,153,  4,  7,  0,154,  4,  7,  0,155,  4,
+  7,  0,156,  4,  4,  0,157,  4,197,  0,  1,  0,  7,  0,158,  4,156,  0, 52,  0,155,  0,159,  4,  2,  0, 16,  0,  2,  0,160,  4,
+  2,  0,161,  4,  2,  0,162,  4,  7,  0,163,  4,  2,  0,164,  4,  2,  0,165,  4,  7,  0,166,  4,  2,  0,167,  4,  2,  0,168,  4,
+  7,  0,169,  4,  7,  0,170,  4,  7,  0,171,  4,  4,  0,172,  4,  4,  0,173,  4,  4,  0,174,  4,  4,  0, 27,  0,  7,  0,175,  4,
+  4,  0,176,  4,  7,  0,177,  4,  7,  0,178,  4,  7,  0,179,  4, 78,  0,180,  4, 78,  0,181,  4,  0,  0,182,  4,  7,  0,183,  4,
+  7,  0,184,  4, 31,  0, 79,  0,  2,  0,185,  4,  0,  0,186,  4,  0,  0,187,  4,  7,  0,188,  4,  4,  0,189,  4,  7,  0,190,  4,
+  7,  0,191,  4,  4,  0,192,  4,  4,  0, 18,  0,  7,  0,193,  4,  7,  0,194,  4,  7,  0,195,  4,197,  0,196,  4,  4,  0, 52,  0,
+  7,  0,197,  4,  7,  0,198,  4,  7,  0,199,  4,  7,  0,200,  4,  7,  0,201,  4,  7,  0,202,  4,  7,  0,203,  4,  4,  0,204,  4,
+  7,  0,205,  4,198,  0, 78,  0, 22,  0, 32,  0, 34,  0, 74,  0,  2,  0,178,  0,  2,  0, 75,  1,  2,  0,111,  1,  2,  0,206,  4,
+  7,  0,207,  4,  7,  0,208,  4,  7,  0,209,  4,  7,  0,210,  4,  7,  0,211,  4,  7,  0,212,  4,  7,  0,160,  1,  7,  0,162,  1,
+  7,  0,161,  1,  7,  0, 30,  0,  4,  0,213,  4,  7,  0,214,  4,  7,  0,215,  4,  7,  0,216,  4,  7,  0,217,  4,  7,  0,218,  4,
+  7,  0,219,  4,  7,  0,220,  4,  2,  0,221,  4,  2,  0, 74,  1,  2,  0,222,  4,  2,  0,223,  4,  2,  0,224,  4,  2,  0,225,  4,
+  2,  0,226,  4,  2,  0,227,  4,  7,  0,228,  4,  7,  0,229,  4,  7,  0,230,  4,  7,  0,231,  4,  7,  0,232,  4,  7,  0,233,  4,
+  7,  0,234,  4,  7,  0,235,  4,  7,  0,236,  4,  7,  0,237,  4,  7,  0,238,  4,  7,  0,239,  4,  2,  0,240,  4,  2,  0,241,  4,
+  2,  0,242,  4,  2,  0,243,  4,  7,  0,244,  4,  7,  0,245,  4,  7,  0,246,  4,  7,  0,247,  4,  2,  0,248,  4,  2,  0,249,  4,
+  2,  0,250,  4,  2,  0,251,  4,  7,  0,252,  4,  7,  0,253,  4,  7,  0,254,  4,  7,  0,255,  4,  7,  0,  0,  5,  7,  0,  1,  5,
+  7,  0,  2,  5,  2,  0,  3,  5,  2,  0,  4,  5,  2,  0,  5,  5,  2,  0,  6,  5,  2,  0,  7,  5,  2,  0, 18,  0,  7,  0,  8,  5,
+  7,  0,  9,  5, 31,  0, 79,  0, 46,  0,130,  1,  2,  0,131,  1,  2,  0, 63,  1,  2,  0,173,  2, 25,  0,153,  0, 56,  0, 58,  1,
+199,  0,  8,  0,199,  0,  0,  0,199,  0,  1,  0,  4,  0,200,  3,  4,  0, 10,  5,  4,  0, 18,  0,  2,  0, 11,  5,  2,  0, 12,  5,
+ 27,  0,167,  0,200,  0, 13,  0, 11,  0, 13,  5, 11,  0, 14,  5,  4,  0, 15,  5,  4,  0, 16,  5,  4,  0, 17,  5,  4,  0, 18,  5,
+  4,  0, 19,  5,  4,  0, 20,  5,  4,  0, 21,  5,  4,  0, 22,  5,  4,  0, 23,  5,  4,  0, 27,  0,  0,  0, 24,  5,201,  0,  5,  0,
+ 11,  0, 25,  5, 11,  0, 26,  5,  4,  0, 27,  5,  4,  0, 30,  0,  0,  0, 28,  5,202,  0, 17,  0,  4,  0, 29,  5,  4,  0, 30,  5,
+  4,  0, 31,  5,  4,  0, 32,  5,  4,  0, 33,  5,  4,  0, 34,  5,  4,  0, 35,  5,  4,  0, 36,  5,  4,  0, 37,  5,  4,  0, 38,  5,
+  4,  0, 39,  5,  4,  0, 40,  5,  2,  0, 41,  5,  2,  0, 42,  5,  4,  0, 43,  5,  4,  0, 44,  5,  4,  0, 66,  0,203,  0, 17,  0,
+  4,  0, 16,  0,  4,  0, 31,  5,  4,  0, 45,  5,  4,  0, 46,  5,  4,  0, 47,  5,  4,  0, 48,  5,  4,  0, 49,  5,  4,  0, 50,  5,
+  7,  0, 51,  5,  4,  0, 52,  5,  4,  0, 91,  0,  4,  0, 53,  5,  4,  0, 54,  5,  4,  0, 55,  5,  4,  0, 56,  5,  4,  0, 57,  5,
+ 21,  0, 31,  0,204,  0,  9,  0,  4,  0, 58,  5,  7,  0, 59,  5,  7,  0, 60,  5,  7,  0, 61,  5,  4,  0, 62,  5,  2,  0, 18,  0,
+  2,  0, 27,  0,  7,  0, 83,  4,  7,  0, 30,  0,205,  0, 13,  0,205,  0,  0,  0,205,  0,  1,  0,  0,  0, 19,  0, 62,  0, 63,  5,
+ 63,  0, 64,  5,  4,  0,200,  3,  4,  0, 65,  5,  4,  0, 66,  5,  4,  0, 67,  5,  4,  0, 68,  5,  4,  0, 69,  5,  4,  0, 70,  5,
+  4,  0, 27,  0,206,  0, 13,  0,  0,  0, 71,  5,  0,  0,238,  0,  0,  0, 72,  5,  0,  0, 18,  0,  0,  0, 73,  5,  0,  0, 74,  5,
+  0,  0, 75,  5,  0,  0, 76,  5,  2,  0, 77,  5,  2,  0, 78,  5,  7,  0, 79,  5,  0,  0, 80,  5,  0,  0,123,  0,207,  0,106,  0,
+206,  0, 81,  5,200,  0, 82,  5,201,  0, 83,  5,202,  0, 84,  5,203,  0, 85,  5,  4,  0, 29,  3,  4,  0,128,  0,  4,  0,131,  4,
+  7,  0, 86,  5,  4,  0, 87,  5,  4,  0, 88,  5,  4,  0, 89,  5,  4,  0, 90,  5,  2,  0, 18,  0,  2,  0, 91,  5,  7,  0, 92,  5,
+  7,  0, 93,  5,  7,  0, 94,  5,  7,  0, 95,  5,  7,  0, 96,  5,  2,  0, 97,  5,  2,  0, 98,  5,  2,  0, 99,  5,  2,  0,100,  5,
+  2,  0,238,  0,  2,  0,101,  5,  4,  0,102,  5,  2,  0,103,  5,  2,  0,104,  5,  2,  0, 97,  1,  2,  0,107,  0,  2,  0,105,  5,
+  2,  0,106,  5,  2,  0,107,  5,  2,  0,108,  5,  2,  0,109,  5,  2,  0, 72,  5,  2,  0, 71,  5,  2,  0,110,  5,  2,  0, 73,  5,
+  2,  0,111,  5,  4,  0,112,  5,  4,  0, 74,  1,  4,  0,113,  5,  2,  0,114,  5,  2,  0, 66,  0,  2,  0,115,  5,  2,  0,116,  5,
+  2,  0,117,  5,  2,  0,118,  5,  2,  0,119,  5,  2,  0,120,  5, 19,  0,121,  5, 19,  0,122,  5, 18,  0,123,  5, 14,  0,124,  5,
+  2,  0,125,  5,  2,  0,126,  5,  7,  0,127,  5,  7,  0,128,  5,  7,  0,129,  5,  7,  0,130,  5,  4,  0,131,  5,  7,  0,132,  5,
+  7,  0,133,  5,  7,  0,134,  5,  7,  0,135,  5,  2,  0,136,  5,  2,  0,137,  5,  2,  0,138,  5,  2,  0,139,  5,  2,  0,140,  5,
+  2,  0,141,  5,  7,  0,142,  5,  7,  0,143,  5,  7,  0,144,  5,  0,  0,145,  5,  4,  0,146,  5,  2,  0,147,  5,  2,  0,237,  1,
+  0,  0,148,  5,  7,  0,149,  5,  7,  0,150,  5,  0,  0,151,  5,  0,  0,152,  5,  0,  0,153,  5,  0,  0,154,  5,  4,  0,155,  5,
+  2,  0,156,  5,  2,  0,157,  5,  7,  0,158,  5,  7,  0,159,  5,  2,  0,160,  5,  2,  0,161,  5,  7,  0,162,  5,  2,  0,163,  5,
+  2,  0,164,  5,  4,  0,165,  5,  2,  0,166,  5,  2,  0,167,  5,  2,  0,168,  5,  2,  0,169,  5,  7,  0,170,  5,  7,  0, 30,  0,
+ 37,  0,171,  5,  0,  0,172,  5,208,  0,  9,  0,208,  0,  0,  0,208,  0,  1,  0,  0,  0,173,  5,  2,  0,174,  5,  2,  0,175,  5,
+  2,  0,176,  5,  2,  0, 66,  0,  7,  0,177,  5,  7,  0, 30,  0,209,  0,  7,  0,  2,  0,224,  2,  2,  0, 74,  1,  2,  0, 87,  3,
+  2,  0,178,  5,  7,  0,179,  5,  7,  0, 30,  0, 37,  0,180,  5,210,  0,  5,  0,  7,  0,181,  5,  0,  0, 16,  0,  0,  0, 66,  0,
+  0,  0, 30,  0,  0,  0,237,  1,211,  0, 15,  0,  7,  0,182,  5,  7,  0,183,  5,  7,  0,184,  5,  7,  0,185,  5,  7,  0,186,  5,
+  7,  0,187,  5,  7,  0,188,  5,  7,  0,189,  5,  7,  0,190,  5,  7,  0,191,  5,  4,  0,192,  5,  7,  0,193,  5,  7,  0,194,  5,
+  2,  0, 66,  0,  2,  0, 30,  0,212,  0, 36,  0,210,  0,195,  5,  2,  0,196,  5,  2,  0, 98,  5,  2,  0, 99,  5,  2,  0,100,  5,
+  2,  0,238,  0,  2,  0,101,  5,  2,  0,197,  5,  2,  0,198,  5,  2,  0,199,  5,  2,  0,200,  5,209,  0,201,  5,  2,  0,202,  5,
+  2,  0,103,  5,  7,  0,203,  5,211,  0,204,  5,  7,  0,219,  4,  7,  0,220,  4,  4,  0, 18,  0,  2,  0, 74,  1,  2,  0,205,  5,
+  2,  0,222,  4,  2,  0,223,  4,  2,  0,206,  5,  2,  0, 27,  0,  2,  0,224,  4,  2,  0,225,  4,  2,  0,226,  4,  2,  0,227,  4,
+  2,  0,207,  5,  2,  0, 66,  0,  7,  0,208,  5,  7,  0,209,  5,  7,  0,210,  5,  7,  0,211,  5,  7,  0, 30,  0,213,  0,  6,  0,
+213,  0,  0,  0,213,  0,  1,  0,  4,  0, 60,  4,  0,  0, 19,  0,  4,  0, 18,  0, 27,  0,212,  5,214,  0,  6,  0,215,  0,139,  3,
+ 11,  0,213,  5,  0,  0,214,  5,  4,  0, 91,  0,  4,  0,215,  5,  4,  0, 27,  0,216,  0,  8,  0,214,  0,216,  5,  2,  0, 18,  0,
+  2,  0, 27,  0,  2,  0,217,  5,  2,  0,218,  5,  2,  0,219,  5,  4,  0, 66,  0, 11,  0,220,  5,217,  0,  6,  0,  2,  0,107,  0,
+  2,  0, 66,  4,  2,  0,221,  5,  2,  0,218,  2,  4,  0, 18,  0,  7,  0,202,  2,218,  0, 14,  0,  2,  0, 18,  0,  2,  0,222,  5,
+  2,  0,223,  5,  2,  0,224,  5,217,  0,225,  5, 11,  0,220,  5,  7,  0,226,  5,  7,  0, 55,  0,  4,  0,227,  5,  4,  0,228,  5,
+  4,  0,229,  5,  4,  0,230,  5, 41,  0,124,  0, 27,  0,167,  0,219,  0, 14,  0,214,  0,216,  5,  4,  0, 91,  0,  4,  0,231,  5,
+  7,  0,232,  5,  7,  0,233,  5,  7,  0,234,  5,  4,  0,235,  5,  4,  0,236,  5,  7,  0,237,  5,  7,  0,238,  5,  4,  0,239,  5,
+  7,  0,240,  5,  7,  0,241,  5,  4,  0, 27,  0,220,  0,  1,  0,214,  0,216,  5,221,  0,  7,  0,214,  0,216,  5,  2,  0, 18,  0,
+  2,  0, 27,  0,  4,  0,227,  0,  4,  0,242,  5, 90,  0,243,  5, 11,  0,220,  5,222,  0,  5,  0,222,  0,  0,  0,222,  0,  1,  0,
+  0,  0, 19,  0,  7,  0,244,  5,  4,  0, 27,  0,223,  0,  6,  0,  4,  0,107,  0,  7,  0,245,  5,  7,  0,168,  1,  7,  0, 30,  2,
+  4,  0, 18,  0,  4,  0, 27,  0,224,  0, 85,  0,221,  0,246,  5,221,  0,247,  5,219,  0,164,  3,220,  0,248,  5,  7,  0,249,  5,
+  2,  0,250,  5,  2,  0,237,  1,  7,  0,251,  5,  7,  0,252,  5,  2,  0, 66,  4,  2,  0,253,  5,  7,  0,254,  5,  7,  0,255,  5,
+  7,  0,  0,  6,  2,  0,  1,  6,  2,  0,227,  5,  2,  0,  2,  6,  2,  0,  3,  6,  2,  0,  4,  6,  2,  0,  5,  6,  7,  0,  6,  6,
+  7,  0,  7,  6,  7,  0,  8,  6,  2,  0,  9,  6,  2,  0, 10,  6,  2,  0, 11,  6,  2,  0, 12,  6,  2,  0, 13,  6,  2,  0, 14,  6,
+  2,  0, 15,  6,  2,  0, 16,  6,216,  0, 17,  6,218,  0, 18,  6,  7,  0, 19,  6,  7,  0, 20,  6,  7,  0, 21,  6,  2,  0, 22,  6,
+  2,  0, 23,  6,  0,  0, 24,  6,  0,  0, 25,  6,  2,  0, 26,  6,  7,  0, 27,  6,  7,  0, 28,  6,  7,  0, 29,  6,  7,  0, 30,  6,
+  7,  0, 31,  6,  7,  0, 32,  6,  7,  0, 33,  6,  7,  0, 34,  6,  7,  0, 35,  6,  7,  0, 36,  6,  2,  0, 37,  6,  0,  0, 38,  6,
+  0,  0, 39,  6,  0,  0, 40,  6,  0,  0, 41,  6, 27,  0, 42,  6,  0,  0, 43,  6,  0,  0, 44,  6,  0,  0, 45,  6,  0,  0, 46,  6,
+  0,  0, 47,  6,  0,  0, 48,  6,  0,  0, 49,  6,  0,  0, 50,  6,  0,  0, 51,  6,  0,  0, 52,  6,  2,  0, 53,  6,  2,  0, 54,  6,
+  2,  0, 55,  6,  2,  0, 56,  6,  0,  0, 57,  6,  0,  0, 58,  6,  0,  0, 59,  6,  0,  0, 60,  6,  4,  0, 61,  6,  4,  0, 62,  6,
+  4,  0, 63,  6,  4,  0, 64,  6,  2,  0, 65,  6,  2,  0, 66,  0,  4,  0, 66,  6,  7,  0, 67,  6,  7,  0, 68,  6,223,  0, 69,  6,
+225,  0,  8,  0,  4,  0, 70,  6,  4,  0, 71,  6,  4,  0, 72,  6,  4,  0, 73,  6,  4,  0, 74,  6,  4,  0, 75,  6,  4,  0, 52,  0,
+  4,  0,130,  2,226,  0,  4,  0,  7,  0, 76,  6,  0,  0, 77,  6,  0,  0, 78,  6,  2,  0, 18,  0,227,  0,  4,  0,  7,  0, 79,  6,
+  4,  0, 18,  0,  4,  0, 80,  6,  4,  0, 55,  0, 41,  0, 46,  0, 22,  0, 32,  0, 34,  0, 74,  0, 27,  0,212,  5,198,  0, 81,  6,
+ 41,  0, 82,  6, 14,  0, 83,  6,199,  0, 84,  6, 27,  0, 85,  6,  7,  0, 86,  6,  7,  0, 87,  6,  7,  0, 88,  6,  7,  0, 89,  6,
+  4,  0,200,  3,  4,  0, 90,  6,  4,  0, 91,  6,  2,  0, 18,  0,  2,  0, 63,  1, 56,  0, 58,  1,228,  0, 92,  6,224,  0, 93,  6,
+229,  0, 94,  6,207,  0,184,  0,204,  0, 95,  6, 14,  0,101,  0, 14,  0, 96,  6, 11,  0, 97,  6, 11,  0, 98,  6, 11,  0, 99,  6,
+ 11,  0,100,  6, 11,  0,101,  6,230,  0,102,  6,  2,  0,103,  6,  2,  0,104,  6,  2,  0,239,  0,  2,  0,201,  3,  4,  0,211,  3,
+  4,  0,105,  6, 14,  0,106,  6,210,  0,195,  5,212,  0,107,  6,226,  0,108,  6,180,  0,177,  3,227,  0,109,  6,231,  0,110,  6,
+ 10,  0,  6,  4, 10,  0,111,  6,232,  0, 14,  0,232,  0,  0,  0,232,  0,  1,  0, 42,  0,230,  0, 40,  0, 57,  1,231,  0,110,  6,
+233,  0,112,  6,  7,  0, 87,  2,  7,  0, 88,  2,  7,  0,107,  0,  7,  0,113,  6,  2,  0,114,  6,  2,  0, 18,  0,  2,  0,142,  0,
+  2,  0, 27,  0,234,  0, 39,  0,  7,  0,115,  6,  7,  0,116,  6,  7,  0,117,  6,  7,  0,118,  6,  7,  0,119,  6,  7,  0,120,  6,
+  7,  0,121,  6,  7,  0,122,  6,  7,  0,123,  6, 67,  0,124,  6,180,  0,177,  3,234,  0,125,  6,235,  0,126,  6,236,  0,127,  6,
+237,  0,128,  6,238,  0,129,  6,239,  0,130,  6,  7,  0,131,  6,  7,  0,132,  6,  7,  0, 81,  1,  7,  0,133,  6,  7,  0,134,  6,
+  7,  0,135,  6,  7,  0,136,  6,  7,  0,174,  0,  7,  0,137,  6,  0,  0,138,  6,  0,  0,139,  6,  0,  0,114,  6,  0,  0,140,  6,
+  2,  0,141,  6,  2,  0,142,  6,  7,  0,143,  6,  2,  0,144,  6,  2,  0,145,  6,  7,  0,146,  6,  7,  0,147,  6,  7,  0,148,  6,
+  7,  0,149,  6,240,  0, 51,  0,241,  0,  0,  0,241,  0,  1,  0, 14,  0,150,  6,  4,  0,151,  6,  7,  0,152,  6,  2,  0,153,  6,
+  7,  0,132,  6,  7,  0, 81,  1,  7,  0,154,  6,  2,  0,155,  6,  0,  0,204,  2,  4,  0,156,  6,  2,  0,139,  6,  2,  0,114,  6,
+ 27,  0,212,  5, 27,  0,157,  6, 14,  0,158,  6,232,  0,159,  6,240,  0,125,  6,  0,  0,160,  6,  4,  0,200,  3,  4,  0, 90,  6,
+  2,  0,161,  6,  2,  0,162,  6,  2,  0,163,  6,  2,  0,164,  6,  2,  0, 18,  0,  2,  0, 22,  2,  7,  0,113,  0,  7,  0,165,  6,
+  7,  0,166,  6,  7,  0,167,  6,  7,  0,174,  0,  7,  0, 86,  6,  2,  0,168,  6,  2,  0,169,  6,  2,  0,170,  6,  0,  0,171,  6,
+  0,  0,172,  6,  0,  0,173,  6,  0,  0,174,  6,  0,  0,175,  6, 14,  0,176,  6, 14,  0,177,  6, 14,  0,178,  6,  2,  0,179,  6,
+  2,  0,144,  2,  2,  0,180,  6,  0,  0,181,  6, 11,  0,182,  6,180,  0,177,  3,242,  0, 24,  0, 19,  0,227,  0, 19,  0, 62,  0,
+ 18,  0,183,  6, 18,  0,184,  6, 18,  0,185,  6,  7,  0,186,  6,  7,  0,187,  6,  7,  0,188,  6,  7,  0,189,  6,  2,  0,190,  6,
+  2,  0,191,  6,  2,  0,192,  6,  2,  0,193,  6,  2,  0,194,  6,  2,  0, 18,  0,  2,  0,195,  6,  2,  0,196,  6,  2,  0,197,  6,
+  2,  0,198,  6,  2,  0,199,  6,  2,  0,164,  6,  7,  0,200,  6,  4,  0,201,  6,  4,  0,202,  6,241,  0,  6,  0,241,  0,  0,  0,
+241,  0,  1,  0, 14,  0,150,  6,  4,  0,151,  6,  7,  0,152,  6,  2,  0,153,  6,243,  0,  8,  0,241,  0,  0,  0,241,  0,  1,  0,
+ 14,  0,150,  6,  4,  0,151,  6,  7,  0,152,  6,  2,  0,153,  6,  0,  0,203,  6,  0,  0,123,  0,244,  0, 21,  0,241,  0,  0,  0,
+241,  0,  1,  0, 14,  0,150,  6,  4,  0,151,  6,  7,  0,152,  6,  2,  0,153,  6,242,  0,204,  6,  2,  0,205,  6,  2,  0,206,  6,
+  2,  0,207,  6,  2,  0,208,  6,  2,  0,195,  6,  2,  0,209,  6,  2,  0,210,  6,  0,  0, 18,  0,  0,  0, 27,  0, 11,  0, 63,  2,
+  4,  0,211,  6,  4,  0,212,  6, 22,  0,213,  6, 11,  0,214,  6,245,  0, 15,  0,241,  0,  0,  0,241,  0,  1,  0, 14,  0,150,  6,
+  4,  0,151,  6,  7,  0,152,  6,  2,  0,153,  6,242,  0,204,  6, 14,  0,215,  6,246,  0,216,  6,  0,  0,217,  6,247,  0,218,  6,
+  2,  0, 18,  0,  2,  0,219,  6,  2,  0,220,  6,  2,  0,221,  6,248,  0, 14,  0,241,  0,  0,  0,241,  0,  1,  0, 14,  0,150,  6,
+  4,  0,151,  6,  7,  0,152,  6,  2,  0,153,  6,242,  0,204,  6,249,  0,222,  6, 14,  0,223,  6,  2,  0, 74,  1,  2,  0,224,  6,
+  4,  0, 18,  0,  7,  0,225,  6,  4,  0,164,  6,250,  0, 11,  0,241,  0,  0,  0,241,  0,  1,  0, 14,  0,150,  6,  4,  0,151,  6,
+  7,  0,152,  6,  2,  0,153,  6,  2,  0,224,  6,  2,  0, 18,  0,  4,  0, 27,  0,249,  0,222,  6,242,  0,204,  6,251,  0,  3,  0,
+251,  0,  0,  0,251,  0,  1,  0,  7,  0,226,  6,252,  0,  9,  0,241,  0,  0,  0,241,  0,  1,  0, 14,  0,150,  6,  4,  0,151,  6,
+  7,  0,152,  6,242,  0,204,  6, 14,  0,227,  6,  4,  0,228,  6,  4,  0, 18,  0,253,  0, 18,  0,241,  0,  0,  0,241,  0,  1,  0,
+ 14,  0,150,  6,  4,  0,151,  6,  7,  0,152,  6,  2,  0,153,  6,242,  0,204,  6,  7,  0, 87,  2,  7,  0, 88,  2,  2,  0,205,  6,
+  2,  0,229,  6,  2,  0,230,  6,  2,  0,231,  6,  4,  0, 18,  0,  7,  0,232,  6,  4,  0,114,  6,  4,  0, 27,  0,180,  0,177,  3,
+254,  0, 16,  0,  0,  0,233,  6,  0,  0,234,  6,  0,  0,235,  6,  0,  0,236,  6,  0,  0,237,  6,  0,  0,238,  6,  4,  0,239,  6,
+  4,  0,240,  6,  4,  0,241,  6,  2,  0, 16,  0,  2,  0, 18,  0,  2,  0,242,  6,  2,  0,243,  6,  2,  0,180,  1,  2,  0,244,  6,
+  0,  0,245,  6,255,  0, 16,  0,241,  0,  0,  0,241,  0,  1,  0, 14,  0,150,  6,  4,  0,151,  6,  4,  0,246,  6,254,  0,247,  6,
+  0,  1,248,  6, 14,  0,249,  6, 14,  0,250,  6,  1,  1,251,  6,239,  0,252,  6,  2,  1,253,  6,  2,  0,254,  6,  2,  0,255,  6,
+  2,  0,  0,  7,  2,  0, 30,  0,  3,  1, 25,  0,241,  0,  0,  0,241,  0,  1,  0, 14,  0,150,  6,  4,  0,151,  6,  4,  0, 18,  0,
+ 42,  0,237,  2, 40,  0, 57,  1, 53,  0,  1,  7,  4,  1,  2,  7,  5,  1,  3,  7,180,  0,177,  3,  7,  0,  4,  7,  7,  0, 87,  2,
+  7,  0, 88,  2,  7,  0,232,  6,  7,  0,  5,  7,  7,  0,  6,  7,  2,  0,  7,  7,  2,  0, 27,  0,  2,  0,  8,  7,  2,  0,  9,  7,
+  0,  0, 10,  7,  0,  0, 11,  7,  0,  0, 12,  7,  0,  0,164,  6,  6,  1, 31,  0,241,  0,  0,  0,241,  0,  1,  0, 14,  0,150,  6,
+  4,  0,151,  6,  7,  0,152,  6,  2,  0,153,  6, 37,  0, 13,  7,  4,  0, 14,  7,  4,  0, 15,  7,  2,  0, 91,  0,  2,  0, 16,  7,
+  2,  0, 17,  7,  0,  0, 18,  7,  0,  0, 19,  7,  4,  0, 20,  7,  4,  0, 21,  7,  4,  0, 22,  7,  2,  0, 23,  7,  2,  0, 24,  7,
+  2,  0, 25,  7,  2,  0, 26,  7,  7,  0, 27,  7, 18,  0, 28,  7, 18,  0, 29,  7,  4,  0, 30,  7,  4,  0, 31,  7,  0,  0, 32,  7,
+  0,  0, 33,  7,  2,  0, 34,  7,  0,  0,204,  2, 11,  0, 35,  7,  7,  1, 10,  0, 22,  0, 32,  0, 11,  0, 36,  7, 11,  0, 37,  7,
+ 11,  0, 38,  7, 11,  0, 39,  7, 11,  0, 40,  7,  4,  0, 91,  0,  4,  0, 41,  7,  0,  0, 42,  7,  0,  0, 43,  7,  8,  1, 10,  0,
+241,  0,  0,  0,241,  0,  1,  0, 14,  0,150,  6,  4,  0,151,  6,  7,  0,152,  6,  7,  1, 44,  7,  2,  0, 91,  0,  2,  0, 16,  7,
+  4,  0, 66,  0, 11,  0, 45,  7,  9,  1, 27,  0,241,  0,  0,  0,241,  0,  1,  0, 14,  0,150,  6,  4,  0,151,  6,  7,  0,152,  6,
+  2,  0,153,  6,242,  0,204,  6, 22,  0, 46,  7, 22,  0, 80,  0,  2,  0, 18,  0,  2,  0, 66,  0,  7,  0, 47,  7,  7,  0, 87,  2,
+  7,  0, 88,  2,  7,  0,232,  6,  7,  0, 48,  7,  7,  0, 49,  7,  7,  0, 50,  7, 56,  0, 58,  1, 56,  0, 51,  7,  4,  0, 52,  7,
+  2,  0, 53,  7,  2,  0, 54,  7,  2,  0,239,  0,  2,  0, 73,  1, 14,  0, 55,  7,180,  0,177,  3, 10,  1, 10,  0,241,  0,  0,  0,
+241,  0,  1,  0, 14,  0,150,  6,  4,  0,151,  6,  7,  0,152,  6,  2,  0,153,  6,  2,  0, 18,  0,  2,  0,209,  3,  4,  0, 27,  0,
+180,  0,177,  3, 11,  1,  7,  0, 11,  1,  0,  0, 11,  1,  1,  0,  4,  0, 56,  7,  4,  0, 22,  0,  0,  0, 85,  0,  4,  0, 57,  7,
+  4,  0, 16,  0, 12,  1, 14,  0,241,  0,  0,  0,241,  0,  1,  0, 14,  0,150,  6,  4,  0,151,  6,  7,  0,152,  6,  2,  0,153,  6,
+  4,  0, 17,  7,  4,  0, 27,  0, 14,  0, 58,  7, 14,  0, 59,  7,  0,  0, 60,  7,  0,  0, 61,  7,  4,  0, 62,  7,  4,  0, 63,  7,
+ 13,  1,  6,  0,241,  0,  0,  0,241,  0,  1,  0, 14,  0,150,  6,  4,  0,151,  6,  4,  0, 27,  0,  0,  0, 64,  7, 14,  1, 28,  0,
+241,  0,  0,  0,241,  0,  1,  0, 14,  0,150,  6,  4,  0,151,  6,  7,  0, 87,  2,  7,  0, 88,  2,  7,  0, 65,  7,  7,  0, 66,  7,
+  7,  0,232,  6,233,  0, 67,  7,231,  0,110,  6, 15,  1,  2,  7,  4,  0, 18,  0,  2,  0, 74,  1,  2,  0,114,  6,  4,  0, 68,  7,
+  7,  0, 69,  7,  7,  0,141,  3,  7,  0, 87,  3,  4,  0, 27,  0,  7,  0, 70,  7,  7,  0, 71,  7,  4,  0, 72,  7,  4,  0, 30,  0,
+ 11,  0, 73,  7,  2,  0, 74,  7,  2,  0, 75,  7,  4,  0,237,  1, 16,  1,  7,  0, 16,  1,  0,  0, 16,  1,  1,  0,  0,  0, 76,  7,
+  2,  0, 77,  7,  2,  0, 78,  7,  2,  0, 79,  7,  2,  0, 27,  0, 17,  1, 12,  0,  2,  0, 78,  7,  2,  0, 80,  7,  2,  0, 81,  7,
+  0,  0,204,  2,  2,  0, 82,  7,  2,  0, 83,  7,  2,  0, 84,  7,  2,  0, 85,  7,  2,  0, 86,  7,  2,  0,195,  6,  7,  0, 87,  7,
+  7,  0, 88,  7, 18,  1, 18,  0, 18,  1,  0,  0, 18,  1,  1,  0,  0,  0, 19,  0, 17,  1, 89,  7, 17,  1, 90,  7, 17,  1, 91,  7,
+ 17,  1, 92,  7,  7,  0, 93,  7,  2,  0, 94,  7,  2,  0, 95,  7,  2,  0, 96,  7,  2,  0, 97,  7,  2,  0, 98,  7,  2,  0, 99,  7,
+  2,  0,100,  7,  2,  0,101,  7,  2,  0,102,  7,  2,  0, 27,  0, 19,  1, 10,  0,  0,  0,103,  7,  0,  0,104,  7,  0,  0,105,  7,
+  0,  0,106,  7,  0,  0,107,  7,  0,  0,108,  7,  2,  0,109,  7,  2,  0,110,  7,  2,  0,111,  7,  2,  0,112,  7, 20,  1,  8,  0,
+  0,  0,113,  7,  0,  0,114,  7,  0,  0,115,  7,  0,  0,116,  7,  0,  0,117,  7,  0,  0,118,  7,  7,  0,113,  6,  7,  0, 27,  0,
+ 21,  1,  3,  0,  0,  0,119,  7,  2,  0,120,  7,  2,  0, 27,  0, 22,  1, 22,  0, 19,  1,121,  7, 19,  1,122,  7, 19,  1,123,  7,
+ 19,  1,124,  7, 19,  1,125,  7, 19,  1,126,  7, 19,  1,127,  7, 19,  1,128,  7, 19,  1,129,  7, 19,  1,130,  7, 19,  1,131,  7,
+ 19,  1,132,  7, 19,  1,133,  7, 19,  1,134,  7, 19,  1,135,  7, 19,  1,136,  7, 19,  1,137,  7, 20,  1,138,  7, 21,  1,139,  7,
+  0,  0,140,  7,  7,  0,141,  7,  7,  0, 27,  0, 23,  1,124,  0,  0,  0,142,  7,  0,  0,143,  7,  0,  0,107,  7,  0,  0,144,  7,
+  0,  0,119,  7,  0,  0,145,  7,  0,  0,146,  7,  0,  0,147,  7,  0,  0,148,  7,  0,  0,149,  7,  0,  0,150,  7,  0,  0,151,  7,
+  0,  0,152,  7,  0,  0,153,  7,  0,  0,154,  7,  0,  0,155,  7,  0,  0,156,  7,  0,  0,157,  7,  0,  0,158,  7,  0,  0,159,  7,
+  0,  0,160,  7,  0,  0,161,  7,  0,  0,162,  7,  0,  0,163,  7,  0,  0,164,  7,  0,  0,165,  7,  0,  0,166,  7,  0,  0,167,  7,
+  0,  0,168,  7,  0,  0,169,  7,  0,  0,170,  7,  0,  0,171,  7,  0,  0,172,  7,  0,  0,173,  7,  0,  0,174,  7,  0,  0,175,  7,
+  0,  0,176,  7,  0,  0,177,  7,  0,  0,178,  7,  0,  0,179,  7,  0,  0,180,  7,  0,  0,181,  7,  0,  0,182,  7,  0,  0,183,  7,
+  0,  0,184,  7,  0,  0,185,  7,  0,  0,186,  7,  0,  0,187,  7,  0,  0,188,  7,  0,  0,189,  7,  0,  0,190,  7,  0,  0,191,  7,
+  0,  0,192,  7,  0,  0,193,  7,  0,  0,194,  7,  0,  0,195,  7,  0,  0,196,  7,  0,  0,197,  7,  0,  0,198,  7,  0,  0,199,  7,
+  0,  0,200,  7,  0,  0,201,  7,  0,  0,202,  7,  0,  0,203,  7,  0,  0,204,  7,  0,  0,205,  7,  0,  0,206,  7,  0,  0,207,  7,
+  0,  0,208,  7,  0,  0,209,  7,  0,  0,210,  7,  0,  0,211,  7,  0,  0,212,  7,  0,  0,213,  7,  0,  0,214,  7,  0,  0,215,  7,
+  0,  0,216,  7,  0,  0,217,  7,  0,  0,218,  7,  0,  0,219,  7,  0,  0,220,  7,  0,  0,221,  7,  0,  0,222,  7,  0,  0,223,  7,
+  0,  0,224,  7,  0,  0,225,  7,  0,  0,226,  7,  0,  0,227,  7,  0,  0,228,  7,  0,  0,229,  7,  0,  0,230,  7,  0,  0,231,  7,
+  0,  0,232,  7,  0,  0,233,  7,  0,  0,234,  7,  0,  0,235,  7,  0,  0,236,  7,  0,  0,237,  7,  0,  0,238,  7,  0,  0,239,  7,
+  0,  0,240,  7,  0,  0,241,  7,  0,  0,242,  7,  0,  0,243,  7,  0,  0,244,  7,  0,  0,245,  7,  0,  0,246,  7,  0,  0,247,  7,
+  0,  0,248,  7,  0,  0,249,  7,  0,  0,250,  7,  0,  0,251,  7,  0,  0,252,  7,  0,  0,253,  7,  0,  0,254,  7,  0,  0,255,  7,
+  0,  0,  0,  8,  0,  0,  1,  8,  0,  0,  2,  8,  0,  0,  3,  8,  0,  0,  4,  8,  0,  0,  5,  8,  0,  0,  6,  8,  4,  0,116,  5,
+ 24,  1,  5,  0,  0,  0,  7,  8,  0,  0,165,  7,  0,  0,171,  7,  2,  0, 18,  0,  2,  0, 27,  0, 25,  1, 24,  0, 25,  1,  0,  0,
+ 25,  1,  1,  0,  0,  0,173,  5, 22,  1,  8,  8, 23,  1,  9,  8, 23,  1, 10,  8, 23,  1, 11,  8, 23,  1, 12,  8, 23,  1, 13,  8,
+ 23,  1, 14,  8, 23,  1, 15,  8, 23,  1, 16,  8, 23,  1, 17,  8, 23,  1, 18,  8, 23,  1, 19,  8, 23,  1, 20,  8, 23,  1, 21,  8,
+ 23,  1, 22,  8, 23,  1, 23,  8, 23,  1, 24,  8, 23,  1, 25,  8, 24,  1, 26,  8,  4,  0, 27,  8,  4,  0, 27,  0, 26,  1,  3,  0,
+ 26,  1,  0,  0, 26,  1,  1,  0,  0,  0, 28,  8, 27,  1,  5,  0,  4,  0, 18,  0,  4,  0, 27,  0,  7,  0,143,  2,  7,  0, 29,  8,
+  7,  0, 37,  2, 28,  1, 93,  0,  4,  0, 18,  0,  4,  0, 30,  8,  4,  0, 31,  8,  0,  0, 32,  8,  0,  0, 33,  8,  0,  0, 34,  8,
+  0,  0, 35,  8,  0,  0, 36,  8,  0,  0, 37,  8,  0,  0, 38,  8,  0,  0, 39,  8,  4,  0, 40,  8,  2,  0, 41,  8,  2,  0, 42,  8,
+  2,  0, 43,  8,  2,  0, 44,  8,  4,  0, 45,  8,  4,  0, 46,  8,  4,  0, 47,  8,  4,  0, 48,  8,  2,  0, 49,  8,  2,  0, 50,  8,
+  4,  0, 51,  8,  4,  0, 52,  8,  4,  0, 53,  8,  4,  0, 54,  8,  4,  0, 55,  8,  4,  0, 58,  7,  4,  0, 56,  8,  2,  0, 57,  8,
+  2,  0, 58,  8,  2,  0, 59,  8,  2,  0, 60,  8, 14,  0, 61,  8, 14,  0, 62,  8, 14,  0, 63,  8, 14,  0, 64,  8, 14,  0, 65,  8,
+ 14,  0, 66,  8,  0,  0, 67,  8,  2,  0, 68,  8,  2,  0, 69,  8,  2,  0, 70,  8,  2,  0, 71,  8,  2,  0, 72,  8,  2,  0, 73,  8,
+  2,  0, 74,  8,  2,  0, 75,  8, 27,  1, 76,  8,  2,  0, 77,  8,  2,  0, 78,  8,  2,  0, 79,  8,  2,  0, 80,  8,  2,  0, 81,  8,
+  2,  0, 82,  8,  2,  0, 83,  8,  2,  0, 84,  8,  4,  0, 85,  8,  4,  0, 86,  8,  2,  0, 87,  8,  2,  0, 88,  8,  2,  0, 89,  8,
+  2,  0, 90,  8,  2,  0, 91,  8,  2,  0, 92,  8,  2,  0, 93,  8,  2,  0, 94,  8,  2,  0, 95,  8,  2,  0, 96,  8,  2,  0, 97,  8,
+  2,  0, 98,  8,  2,  0, 99,  8,  2,  0,100,  8,  2,  0,101,  8,  2,  0,102,  8,  2,  0,103,  8,  2,  0,104,  8,  7,  0,105,  8,
+  4,  0,106,  8,  7,  0,107,  8,  2,  0, 22,  6,  2,  0, 23,  6,  2,  0,108,  8,  2,  0,109,  8, 49,  0,110,  8,  7,  0,111,  8,
+  2,  0,112,  8,  2,  0,237,  1,  0,  0,113,  8,  4,  0,114,  8,  4,  0,115,  8,  7,  0,116,  8,  7,  0, 27,  0, 29,  1, 24,  0,
+ 22,  0, 32,  0, 14,  0,117,  8, 14,  0,118,  8, 14,  0,119,  8, 14,  0,150,  6, 41,  0,124,  0, 41,  0,120,  8,  4,  0,121,  8,
+  4,  0, 66,  0,  2,  0,122,  8,  2,  0,123,  8,  2,  0,124,  8,  2,  0,125,  8,  2,  0,126,  8,  2,  0,127,  8,  2,  0,128,  8,
+  2,  0,129,  8,  2,  0,130,  8,  2,  0,131,  8,  2,  0,132,  8,  2,  0, 27,  0,239,  0,133,  8, 11,  0,134,  8,  2,  0,135,  8,
+ 30,  1,  5,  0, 30,  1,  0,  0, 30,  1,  1,  0, 30,  1,136,  8, 15,  0,137,  8,  4,  0, 18,  0, 31,  1,  7,  0, 31,  1,  0,  0,
+ 31,  1,  1,  0, 30,  1,138,  8, 30,  1,139,  8,  2,  0,122,  5,  2,  0, 18,  0,  4,  0, 27,  0, 32,  1, 25,  0, 32,  1,  0,  0,
+ 32,  1,  1,  0, 33,  1,140,  8, 34,  1,253,  6,  0,  0,141,  8,  0,  0,142,  8,  0,  0,143,  8,  2,  0,144,  8,  2,  0,145,  8,
+  2,  0,146,  8,  2,  0,147,  8,  2,  0,148,  8,  2,  0, 27,  0,  2,  0, 18,  0,  2,  0,149,  8,  2,  0,150,  8,  2,  0,151,  8,
+  4,  0,152,  8, 32,  1,153,  8, 11,  0,154,  8,  4,  0,155,  8,  4,  0,156,  8,  4,  0,157,  8,  4,  0,158,  8,  0,  0,159,  8,
+ 35,  1, 22,  0, 35,  1,  0,  0, 35,  1,  1,  0, 30,  1,138,  8, 30,  1,139,  8, 30,  1,160,  8, 30,  1,161,  8, 29,  1,162,  8,
+ 18,  0, 50,  0,  0,  0,151,  6,  0,  0,163,  8,  2,  0,196,  6,  2,  0,197,  6,  2,  0,164,  8,  2,  0, 27,  0,  2,  0,126,  8,
+  2,  0, 57,  7,  2,  0, 18,  0, 36,  1,140,  8, 14,  0,165,  8, 14,  0,150,  6, 14,  0,166,  8, 14,  0,167,  8, 37,  1, 24,  0,
+ 37,  1,  0,  0, 37,  1,  1,  0,242,  0,204,  6, 18,  0,168,  8, 18,  0,169,  8,  2,  0,196,  6,  2,  0,197,  6,  2,  0,170,  8,
+  2,  0,171,  8,  2,  0,172,  8,  2,  0, 18,  0,  7,  0, 83,  2,  2,  0,146,  8,  2,  0,147,  8,  2,  0,125,  8,  2,  0,173,  8,
+  2,  0,130,  8,  2,  0, 73,  1, 38,  1,140,  8, 14,  0,174,  8, 14,  0,175,  8, 14,  0,166,  8,  0,  0,176,  8, 11,  0,177,  8,
+ 39,  1, 14,  0,  0,  0,178,  8,  2,  0,179,  8,  2,  0,180,  8,  2,  0,181,  8,  2,  0,182,  8,  2,  0,111,  5,  2,  0,183,  8,
+ 29,  1,184,  8, 41,  0,185,  8,  4,  0,186,  8,  4,  0,187,  8,  4,  0,188,  8,  4,  0, 27,  0,  0,  0, 76,  7, 40,  1,  3,  0,
+  0,  0,189,  8,  4,  0,190,  8,  4,  0,191,  8, 41,  1,  4,  0,  4,  0, 14,  7,  4,  0,192,  8,  4,  0, 20,  7,  4,  0,193,  8,
+ 42,  1,  2,  0,  4,  0,194,  8,  4,  0,195,  8, 43,  1,  5,  0,  7,  0,196,  8,  7,  0,197,  8,  7,  0,198,  8,  4,  0, 18,  0,
+  4,  0, 27,  0, 44,  1,  7,  0,  0,  0,199,  8,  0,  0,235,  6, 44,  0,137,  0,  2,  0,200,  8,  2,  0, 73,  5,  2,  0,201,  8,
+  2,  0,202,  8, 45,  1, 12,  0, 45,  1,  0,  0, 45,  1,  1,  0,  4,  0, 28,  0,  4,  0,203,  8,  4,  0,204,  8,  4,  0,205,  8,
+ 40,  1,206,  8,  0,  0,199,  8, 44,  1,171,  3, 41,  1,207,  8, 42,  1,208,  8, 43,  1,209,  8, 46,  1, 49,  0, 46,  1,  0,  0,
+ 46,  1,  1,  0, 11,  0,210,  8, 11,  0, 25,  0,  0,  0, 19,  0,  4,  0, 18,  0,  4,  0, 16,  0,  4,  0, 22,  0,  4,  0, 89,  0,
+  4,  0,211,  8,  4,  0,212,  8,  4,  0,204,  8,  4,  0,205,  8,  4,  0,213,  8,  4,  0,238,  0,  4,  0,214,  8,  4,  0,215,  8,
+  7,  0,216,  8,  7,  0,217,  8,  7,  0,218,  8,  2,  0,219,  8,  2,  0,220,  8,  4,  0,221,  8,  4,  0,222,  8, 45,  1,223,  8,
+ 31,  0, 79,  0, 41,  0,124,  0, 27,  0,224,  8, 44,  0,137,  0,231,  0,110,  6,  7,  0,225,  8,  7,  0,226,  8, 46,  1,227,  8,
+ 46,  1,228,  8, 46,  1,229,  8, 14,  0,230,  8, 47,  1,231,  8, 11,  0,232,  8,  7,  0, 83,  4,  7,  0,233,  8,  7,  0,234,  8,
+  7,  0,235,  8, 11,  0,236,  8,  4,  0,237,  8,  4,  0,238,  8,  4,  0,239,  8,  7,  0,240,  8,  4,  0,128,  0,  4,  0, 27,  0,
+ 48,  1,  4,  0, 48,  1,  0,  0, 48,  1,  1,  0, 14,  0,241,  8, 46,  1,242,  8,228,  0, 11,  0, 14,  0,243,  8, 14,  0,230,  8,
+ 14,  0,244,  8, 46,  1,245,  8,  0,  0,246,  8,  0,  0,247,  8,  4,  0,248,  8,  4,  0,249,  8,  4,  0,250,  8,  4,  0, 27,  0,
+ 19,  0,251,  8, 49,  1,  4,  0,  7,  0,252,  8,  7,  0, 87,  3,  2,  0,253,  8,  2,  0,254,  8, 50,  1,  6,  0,  7,  0,255,  8,
+  7,  0,  0,  9,  7,  0,  1,  9,  7,  0,  2,  9,  4,  0,  3,  9,  4,  0,  4,  9, 51,  1,  8,  0,  7,  0,  5,  9,  7,  0,  6,  9,
+  7,  0,  7,  9,  7,  0,  8,  9,  7,  0,  9,  9,  4,  0,243,  2,  4,  0, 10,  9,  4,  0, 11,  9, 52,  1,  2,  0,  7,  0,181,  5,
+  7,  0, 27,  0, 53,  1,  5,  0,  7,  0, 12,  9,  7,  0, 13,  9,  4,  0, 91,  0,  4,  0,205,  2,  4,  0, 14,  9, 54,  1,  6,  0,
+ 54,  1,  0,  0, 54,  1,  1,  0,  2,  0, 16,  0,  2,  0, 18,  0,  2,  0, 15,  9,  2,  0, 55,  0, 55,  1,  8,  0, 55,  1,  0,  0,
+ 55,  1,  1,  0,  2,  0, 16,  0,  2,  0, 18,  0,  2,  0, 15,  9,  2,  0, 55,  0,  7,  0, 22,  0,  7,  0,128,  0, 56,  1, 45,  0,
+ 56,  1,  0,  0, 56,  1,  1,  0,  2,  0, 16,  0,  2,  0, 18,  0,  2,  0, 15,  9,  2,  0,234,  0,  2,  0,125,  4,  2,  0, 16,  9,
+  7,  0, 17,  9,  7,  0, 90,  0,  7,  0,  0,  3,  4,  0, 18,  9,  4,  0, 81,  0,  4,  0,207,  2,  7,  0, 19,  9,  7,  0, 20,  9,
+  7,  0, 21,  9,  7,  0, 22,  9,  7,  0, 23,  9,  7,  0, 24,  9,  7,  0,253,  2,  7,  0, 56,  1,  7,  0, 25,  9,  7,  0, 26,  9,
+  7,  0, 27,  0,  7,  0, 27,  9,  7,  0, 28,  9,  7,  0, 29,  9,  2,  0, 30,  9,  2,  0, 31,  9,  2,  0, 32,  9,  2,  0, 33,  9,
+  2,  0, 34,  9,  2,  0, 35,  9,  2,  0, 36,  9,  2,  0, 37,  9,  2,  0, 22,  2,  2,  0, 38,  9,  2,  0, 19,  2,  2,  0, 39,  9,
+  0,  0, 40,  9,  0,  0, 41,  9,  7,  0,232,  0, 57,  1, 42,  9, 63,  0,240,  1, 58,  1, 16,  0, 58,  1,  0,  0, 58,  1,  1,  0,
+  2,  0, 16,  0,  2,  0, 18,  0,  2,  0, 15,  9,  2,  0,234,  0,  7,  0,248,  2,  7,  0,249,  2,  7,  0,250,  2,  7,  0, 72,  2,
+  7,  0,251,  2,  7,  0,252,  2,  7,  0, 43,  9,  7,  0,253,  2,  7,  0,255,  2,  7,  0,  0,  3,247,  0,  5,  0,  2,  0, 16,  0,
+  2,  0, 44,  9,  2,  0, 18,  0,  2,  0, 45,  9, 22,  0, 46,  7,246,  0,  3,  0,  4,  0, 68,  0,  4,  0, 46,  9,247,  0,  2,  0,
+ 59,  1,  7,  0, 59,  1,  0,  0, 59,  1,  1,  0,  0,  0, 19,  0,  2,  0, 16,  0,  2,  0, 18,  0,  4,  0, 21,  0, 11,  0, 47,  9,
+ 60,  1,  5,  0,  0,  0, 19,  0,  7,  0, 81,  1,  7,  0, 48,  9,  4,  0, 49,  9,  4,  0, 27,  0, 61,  1,  4,  0,  2,  0, 16,  0,
+  2,  0, 18,  0,  2,  0, 66,  0,  2,  0, 30,  0, 62,  1,  4,  0,  0,  0, 19,  0, 62,  0, 50,  9,  7,  0, 81,  1,  7,  0, 27,  0,
+ 63,  1,  6,  0,  2,  0, 51,  9,  2,  0, 52,  9,  2,  0, 16,  0,  2,  0, 53,  9,  0,  0, 54,  9,  0,  0, 55,  9, 64,  1,  5,  0,
+  4,  0, 16,  0,  4,  0, 27,  0,  0,  0, 19,  0,  0,  0, 56,  9,  0,  0, 57,  9, 65,  1,  3,  0,  4,  0, 16,  0,  4,  0, 27,  0,
+  0,  0, 19,  0, 66,  1,  4,  0,  2,  0, 58,  9,  2,  0, 59,  9,  2,  0, 18,  0,  2,  0, 27,  0, 67,  1,  6,  0,  0,  0, 19,  0,
+  0,  0, 60,  9,  2,  0, 61,  9,  2,  0,253,  2,  2,  0, 74,  1,  2,  0, 30,  0, 68,  1,  5,  0,  0,  0, 19,  0,  7,  0, 87,  3,
+  7,  0,216,  4,  2,  0, 18,  0,  2,  0,219,  2, 69,  1,  3,  0,  0,  0, 19,  0,  4,  0,207,  2,  4,  0, 58,  9, 70,  1,  7,  0,
+  0,  0, 19,  0,  7,  0,216,  4,  0,  0, 62,  9,  0,  0, 63,  9,  2,  0, 74,  1,  2,  0, 66,  0,  4,  0, 64,  9, 71,  1,  4,  0,
+  0,  0, 65,  9,  0,  0, 66,  9,  4,  0, 16,  0,  7,  0,223,  2, 72,  1,  3,  0, 27,  0, 67,  9,  0,  0, 68,  9,  0,  0, 69,  9,
+ 73,  1, 18,  0, 73,  1,  0,  0, 73,  1,  1,  0,  2,  0, 16,  0,  2,  0, 70,  9,  2,  0, 18,  0,  2,  0, 71,  9,  2,  0, 72,  9,
+  2,  0, 73,  9,  2,  0, 66,  0,  2,  0, 30,  0,  0,  0, 19,  0, 11,  0,  2,  0, 74,  1, 74,  9, 27,  0, 43,  0,  2,  0,221,  5,
+  2,  0,168,  2,  2,  0, 75,  9,  2,  0, 27,  0, 75,  1, 11,  0,  0,  0, 19,  0,  0,  0, 16,  0,  0,  0, 76,  9,  2,  0, 18,  0,
+  2,  0,219,  2,  2,  0, 77,  9,  4,  0, 78,  9,  4,  0, 79,  9,  4,  0, 80,  9,  4,  0, 81,  9,  4,  0, 82,  9, 76,  1,  1,  0,
+  0,  0, 83,  9, 77,  1,  4,  0, 37,  0, 13,  7,  0,  0, 28,  8,  4,  0, 74,  1,  4,  0, 18,  0, 74,  1, 18,  0, 74,  1,  0,  0,
+ 74,  1,  1,  0, 74,  1, 84,  9,  2,  0, 16,  0,  2,  0, 18,  0,  2,  0, 85,  9,  2,  0, 73,  9,  2,  0, 70,  9,  2,  0, 86,  9,
+  2,  0, 30,  0,  2,  0,237,  1,  0,  0, 19,  0, 11,  0,  2,  0, 78,  1, 74,  9, 73,  1, 87,  9,  2,  0, 14,  0,  2,  0, 88,  9,
+  4,  0, 89,  9, 79,  1,  3,  0,  4,  0,233,  2,  4,  0, 27,  0, 27,  0, 43,  0, 80,  1, 15,  0,178,  0, 90,  9,  2,  0, 16,  0,
+  2,  0, 18,  0,  7,  0, 17,  9,  7,  0, 90,  0,  0,  0, 19,  0,  0,  0, 91,  9,  2,  0, 92,  9,  2,  0, 93,  9,  2,  0,133,  0,
+  2,  0, 94,  9,  2,  0, 95,  9,  2,  0, 27,  0,  7,  0, 96,  9,  7,  0, 97,  9, 81,  1,  8,  0,  7,  0, 98,  9,  7,  0, 99,  9,
+  7,  0,100,  9,  7,  0,101,  9,  7,  0,102,  9,  7,  0,103,  9,  7,  0,104,  9,  7,  0,105,  9, 82,  1, 13,  0,  2,  0, 18,  0,
+  2,  0,106,  9,  4,  0, 66,  0,  4,  0, 30,  0,  2,  0,181,  6,  7,  0, 83,  4,  7,  0,233,  8, 47,  1,231,  8, 81,  1,107,  9,
+  2,  0, 16,  0,  2,  0,116,  5,  2,  0,211,  3,  2,  0,108,  9, 83,  1, 11,  0,  4,  0,233,  2,  2,  0, 16,  0,  2,  0, 18,  0,
+ 27,  0, 43,  0, 78,  0,109,  9,  0,  0, 19,  0,  7,  0,110,  9,  7,  0,111,  9,  7,  0,217,  3,  2,  0,112,  9,  2,  0,113,  9,
+ 84,  1,  5,  0,  2,  0, 16,  0,  2,  0, 66,  0,  4,  0, 27,  0, 41,  0,124,  0, 27,  0,212,  5, 85,  1,  5,  0,  4,  0, 27,  0,
+  4,  0, 16,  0,  0,  0, 19,  0,  0,  0, 56,  9, 27,  0, 43,  0, 86,  1, 13,  0,  2,  0, 18,  0,  2,  0, 16,  0,  2,  0, 70,  9,
+  2,  0,218,  3,  7,  0,114,  9,  7,  0,115,  9,  7,  0, 73,  1,  7,  0,116,  9,  7,  0,187,  3,  7,  0,191,  3,  7,  0,117,  9,
+  7,  0,118,  9, 27,  0,119,  9, 87,  1, 10,  0,  2,  0, 18,  0,  2,  0, 16,  0,  7,  0, 17,  9,  7,  0, 90,  0,  0,  0, 19,  0,
+  0,  0, 91,  9,  2,  0, 66,  0,  2,  0, 30,  0,  2,  0,237,  1,  2,  0,116,  5, 88,  1,  8,  0, 27,  0, 43,  0,  7,  0,250,  2,
+  7,  0,120,  9,  7,  0,121,  9,  7,  0,218,  3,  2,  0, 66,  0,  2,  0,219,  2,  7,  0, 30,  0, 89,  1, 12,  0,  2,  0, 16,  0,
+  2,  0, 74,  1,  2,  0, 18,  0,  2,  0,253,  2,  2,  0,233,  2,  2,  0,122,  9,  4,  0, 27,  0,  7,  0,123,  9,  7,  0,124,  9,
+  7,  0,125,  9,  7,  0,126,  9,  0,  0,127,  9, 90,  1,  9,  0,  2,  0, 18,  0,  2,  0, 16,  0,  4,  0, 17,  9,  4,  0, 90,  0,
+  0,  0, 19,  0,  2,  0, 73,  1,  2,  0, 62,  0,  2,  0,128,  9,  2,  0,129,  9, 91,  1,  7,  0,  4,  0,207,  2,  4,  0,130,  9,
+  4,  0,131,  9,  4,  0,132,  9,  7,  0,133,  9,  7,  0,134,  9,  0,  0, 62,  9, 92,  1,  7,  0,  0,  0,135,  9, 27,  0,136,  9,
+  0,  0, 68,  9,  2,  0,137,  9,  2,  0, 66,  0,  4,  0, 30,  0,  0,  0, 69,  9, 93,  1,  6,  0,  2,  0, 18,  0,  2,  0, 16,  0,
+  4,  0, 17,  9,  4,  0, 90,  0,  0,  0,138,  9,  0,  0,139,  9, 94,  1,  1,  0,  4,  0, 18,  0, 95,  1,  6,  0,  0,  0, 93,  0,
+  2,  0, 16,  0,  2,  0, 18,  0,  4,  0,140,  9,  7,  0,141,  9, 37,  0, 13,  7, 96,  1,  4,  0,  0,  0,173,  2,  2,  0, 18,  0,
+  4,  0, 16,  0, 27,  0, 43,  0, 97,  1,  2,  0,  4,  0, 16,  0,  4,  0,185,  6, 98,  1,  8,  0,  0,  0, 65,  9,  0,  0, 66,  9,
+  4,  0, 16,  0,  7,  0, 30,  2,  7,  0,142,  9,  7,  0, 27,  0, 27,  0, 63,  3, 27,  0,143,  9, 99,  1, 11,  0,  0,  0, 58,  6,
+  0,  0, 18,  0,  2,  0,144,  9,  4,  0, 16,  0,  7,  0, 81,  1,  7,  0,145,  9,  7,  0,146,  9,  7,  0,147,  9,  4,  0,148,  9,
+ 27,  0, 63,  3, 27,  0,149,  9, 78,  1, 10,  0, 78,  1,  0,  0, 78,  1,  1,  0, 78,  1, 84,  9,  2,  0, 16,  0,  2,  0, 18,  0,
+  2,  0, 70,  9,  2,  0,150,  9,  0,  0, 19,  0, 11,  0,  2,  0, 27,  0, 43,  0, 47,  1, 17,  0, 22,  0, 32,  0,  0,  0, 35,  0,
+ 38,  0,152,  0, 11,  0,151,  9, 38,  0,152,  9, 31,  0, 79,  0,  7,  0, 83,  4,  7,  0,153,  9,  7,  0,233,  8,  7,  0, 98,  9,
+  7,  0, 99,  9,  7,  0,154,  9,  4,  0, 91,  0,  4,  0, 27,  0, 11,  0,155,  9, 11,  0,156,  9, 11,  0,157,  9,100,  1,  6,  0,
+100,  1,  0,  0,100,  1,  1,  0, 27,  0, 43,  0, 11,  0,158,  9,  2,  0,239,  0,  0,  0,204,  2, 63,  0,  4,  0, 22,  0, 32,  0,
+ 14,  0,159,  9,  4,  0,133,  0,  7,  0,160,  9,101,  1, 28,  0,101,  1,  0,  0,101,  1,  1,  0, 21,  0,161,  9,101,  1, 37,  0,
+ 14,  0,162,  9,  0,  0, 19,  0,  7,  0,163,  9,  7,  0,164,  9,  7,  0,165,  9,  7,  0,166,  9,  4,  0, 18,  0,  7,  0,167,  9,
+  7,  0,168,  9,  7,  0,169,  9,  7,  0,170,  9,  7,  0, 81,  1,  7,  0, 30,  2,  7,  0,171,  9,  7,  0,205,  2,  7,  0,172,  9,
+  7,  0,173,  9,  7,  0,174,  9,  7,  0,175,  9,  7,  0,176,  9,  7,  0,175,  0,  4,  0,133,  0,  2,  0,  2,  6,  2,  0,177,  9,
+102,  1, 27,  0, 22,  0, 32,  0, 34,  0, 74,  0, 14,  0,178,  9, 14,  0,179,  9, 14,  0,180,  9,101,  1,181,  9, 11,  0,182,  9,
+ 11,  0,183,  9,  4,  0, 18,  0,  4,  0,161,  6,  4,  0,184,  9,  4,  0, 27,  0,  2,  0,  1,  3,  2,  0,211,  6,  4,  0,185,  9,
+  4,  0,133,  0,  4,  0,186,  9,  2,  0,187,  9,  2,  0,188,  9,  2,  0,189,  9,  2,  0,190,  9,  4,  0,191,  9,  4,  0,192,  9,
+  4,  0,193,  9,  4,  0,194,  9,  4,  0,195,  9,  4,  0,196,  9,103,  1,  2,  0,  7,  0,157,  2,  4,  0, 18,  0,182,  0,  5,  0,
+103,  1,197,  9,  4,  0,205,  2,  4,  0,198,  9,  4,  0,199,  9,  4,  0, 18,  0,181,  0, 16,  0,  4,  0,200,  9,  4,  0,201,  9,
+  4,  0,202,  9,  4,  0,203,  9,  2,  0,204,  9,  2,  0,205,  9,  2,  0,206,  9,  2,  0,239,  0,  2,  0,207,  9,  2,  0,208,  9,
+  2,  0,209,  9,  2,  0,210,  9,  4,  0,211,  9,  4,  0,212,  9,  4,  0,213,  9,  4,  0,214,  9,104,  1, 40,  0,104,  1,  0,  0,
+104,  1,  1,  0, 21,  0,161,  9, 14,  0,250,  3,  0,  0, 19,  0,  2,  0, 18,  0,  2,  0,215,  9,  2,  0,204,  3,  2,  0,216,  9,
+  0,  0,217,  9,  0,  0,218,  9,  0,  0,219,  9,101,  1,220,  9,104,  1, 37,  0,104,  1,221,  9, 14,  0,222,  9, 14,  0,223,  9,
+182,  0,179,  3, 27,  0,224,  9,104,  1,225,  9,  7,  0, 64,  1,  7,  0,175,  0,  7,  0,226,  9,  7,  0,  9,  2,  7,  0,193,  3,
+  7,  0,195,  3,  2,  0,231,  3,  2,  0, 27,  0,  7,  0,227,  9,  7,  0,228,  9,  7,  0,198,  3,  7,  0,229,  9,  7,  0,230,  9,
+  7,  0,231,  9,  7,  0,232,  9,  7,  0,233,  9,  7,  0,234,  9,  7,  0,235,  9,  7,  0,236,  9, 11,  0,237,  9,179,  0, 16,  0,
+ 14,  0,238,  9, 73,  0,239,  9,  2,  0, 18,  0,  2,  0, 27,  0,  4,  0,240,  9,  4,  0, 66,  0,  7,  0, 83,  0,  7,  0,241,  9,
+  7,  0,242,  9, 14,  0,243,  9,  4,  0,244,  9,  4,  0,245,  9, 11,  0,246,  9, 11,  0,247,  9,181,  0,178,  3,  0,  0,248,  9,
+105,  1,  1,  0,  4,  0,245,  9,106,  1, 12,  0,  4,  0,245,  9,  7,  0, 82,  9,  2,  0,249,  9,  2,  0,250,  9,  7,  0,251,  9,
+  7,  0,252,  9,  2,  0,253,  9,  2,  0, 18,  0,  7,  0,254,  9,  7,  0,255,  9,  7,  0,  0, 10,  7,  0,  1, 10,107,  1,  7,  0,
+107,  1,  0,  0,107,  1,  1,  0, 14,  0,  2, 10,  4,  0, 18,  0,  4,  0,  3, 10,  0,  0, 19,  0, 24,  1,  4, 10,178,  0,  9,  0,
+ 22,  0, 32,  0, 14,  0,  5, 10, 14,  0,238,  9, 14,  0,  6, 10, 14,  0,101,  0,  4,  0, 18,  0,  4,  0,  7, 10,  4,  0,  8, 10,
+  4,  0, 27,  0,249,  0,  8,  0, 22,  0,  9, 10, 14,  0,238,  9, 63,  0, 10, 10,  0,  0, 11, 10,  4,  0, 12, 10,  4,  0, 18,  0,
+  4,  0, 13, 10,  4,  0, 27,  0,108,  1, 13,  0,241,  0,  0,  0,241,  0,  1,  0, 14,  0,150,  6,  4,  0,151,  6,  7,  0,152,  6,
+  2,  0,153,  6,242,  0,204,  6,178,  0,174,  3,249,  0, 14, 10,  0,  0, 74,  1,  0,  0,224,  6,  2,  0, 18,  0,  7,  0, 15, 10,
+109,  1,  8,  0,109,  1,  0,  0,109,  1,  1,  0,107,  1, 16, 10, 31,  0, 79,  0, 14,  0,180,  3,  4,  0, 18,  0,  0,  0, 19,  0,
+  4,  0,123,  8,110,  1,  5,  0,110,  1,  0,  0,110,  1,  1,  0, 31,  0, 79,  0,  2,  0, 18,  0,  0,  0, 17, 10,111,  1, 14,  0,
+111,  1,  0,  0,111,  1,  1,  0, 11,  0,  2,  0,  2,  0, 16,  0,  2,  0, 18,  0,  0,  0, 18, 10,  0,  0, 19, 10,  0,  0, 19,  0,
+  2,  0, 27,  0,  7,  0, 20, 10,  7,  0, 21, 10, 31,  0, 79,  0,  7,  0, 22, 10,  7,  0, 23, 10,112,  1,  9,  0,112,  1,  0,  0,
+112,  1,  1,  0, 27,  0, 24, 10,  0,  0,  4,  3,  7,  0, 25, 10,  2,  0, 26, 10,  2,  0, 18,  0,  2,  0, 16,  0,  2,  0, 27, 10,
+113,  1,  7,  0, 37,  0, 13,  7, 21,  0,161,  9,  4,  0, 18,  0,  4,  0, 28, 10, 14,  0, 29, 10, 27,  0, 24, 10,  0,  0,  4,  3,
+114,  1, 15,  0, 27,  0, 24, 10,  2,  0, 30, 10,  2,  0, 18,  0,  2,  0, 31, 10,  2,  0, 32, 10,  0,  0,  4,  3, 27,  0, 33, 10,
+  0,  0, 34, 10,  7,  0, 35, 10,  7,  0, 30,  2,  7,  0, 36, 10,  7,  0, 37, 10,  2,  0, 16,  0,  2,  0, 74,  1,  7,  0, 81,  1,
+115,  1,  6,  0, 27,  0, 24, 10,  7,  0,197,  9,  2,  0, 38, 10,  2,  0, 39, 10,  2,  0, 18,  0,  2,  0, 40, 10,116,  1,  6,  0,
+ 27,  0, 24, 10,  4,  0, 41, 10,  4,  0, 42, 10,  4,  0, 91,  0,  4,  0, 27,  0,  0,  0,  4,  3,117,  1,  4,  0, 27,  0, 24, 10,
+  4,  0, 18,  0,  4,  0, 41, 10,  0,  0,  4,  3,118,  1,  4,  0, 27,  0, 24, 10,  4,  0, 18,  0,  4,  0, 41, 10,  0,  0,  4,  3,
+119,  1,  4,  0, 27,  0, 24, 10,  4,  0, 18,  0,  4,  0, 41, 10,  0,  0,  4,  3,120,  1,  2,  0,  4,  0, 18,  0,  7,  0, 83,  4,
+121,  1,  2,  0, 27,  0, 24, 10,  0,  0,  4,  3,122,  1, 10,  0, 27,  0, 24, 10,  4,  0, 43, 10,  7,  0,127,  0,  4,  0, 18,  0,
+  2,  0, 11,  7,  2,  0, 44, 10,  2,  0, 66,  0,  2,  0, 30,  0,  7,  0, 45, 10,  0,  0,  4,  3,123,  1, 10,  0, 27,  0, 24, 10,
+  2,  0, 16,  0,  2,  0,133,  4,  4,  0, 89,  0,  4,  0, 90,  0,  7,  0,120,  9,  7,  0,121,  9,  4,  0, 27,  0,178,  0, 90,  9,
+  0,  0,  4,  3,124,  1,  4,  0, 27,  0, 24, 10,  4,  0,205,  3,  4,  0, 46, 10,  0,  0,  4,  3,125,  1,  4,  0, 27,  0, 24, 10,
+  4,  0,205,  3,  4,  0, 27,  0,  0,  0,  4,  3,126,  1,  6,  0, 27,  0, 24, 10,  7,  0,127,  0,  7,  0, 75,  3,  4,  0, 47, 10,
+  2,  0,205,  3,  2,  0,206,  3,127,  1,  6,  0, 27,  0, 24, 10,  4,  0, 48, 10,  4,  0, 49, 10,  7,  0, 50, 10,  7,  0, 51, 10,
+  0,  0,  4,  3,128,  1, 16,  0, 27,  0, 24, 10, 27,  0,221,  9,  4,  0, 16,  0,  7,  0, 52, 10,  7,  0, 53, 10,  7,  0, 54, 10,
+  7,  0, 55, 10,  7,  0, 56, 10,  7,  0, 57, 10,  7,  0, 58, 10,  7,  0, 59, 10,  7,  0, 60, 10,  2,  0, 18,  0,  2,  0, 27,  0,
+  2,  0, 66,  0,  2,  0, 30,  0,129,  1,  3,  0, 27,  0, 24, 10,  4,  0, 18,  0,  4,  0, 22,  2,130,  1,  5,  0, 27,  0, 24, 10,
+  4,  0, 18,  0,  4,  0, 27,  0,  7,  0, 61, 10,  0,  0,  4,  3,131,  1, 10,  0, 27,  0, 24, 10,  0,  0,  4,  3,  2,  0, 62, 10,
+  2,  0, 63, 10,  0,  0, 64, 10,  0,  0, 65, 10,  7,  0, 66, 10,  7,  0, 67, 10,  7,  0, 68, 10,  7,  0, 69, 10,132,  1,  5,  0,
+ 27,  0, 24, 10,  0,  0,  4,  3,  7,  0,213,  2,  2,  0, 70, 10,  2,  0, 18,  0,133,  1,  8,  0,  7,  0,  8,  0,  7,  0,  9,  0,
+  7,  0, 10,  0,  7,  0, 11,  0,  7,  0, 71, 10,  7,  0, 72, 10,  2,  0, 18,  0,  2,  0, 22,  2,134,  1,  8,  0,  7,  0,  8,  0,
+  7,  0,  9,  0,  7,  0, 10,  0,  7,  0, 11,  0,  7,  0, 71, 10,  7,  0, 72, 10,  2,  0, 18,  0,  2,  0, 22,  2,135,  1,  8,  0,
+  7,  0,  8,  0,  7,  0,  9,  0,  7,  0, 10,  0,  7,  0, 11,  0,  7,  0, 71, 10,  7,  0, 72, 10,  2,  0, 18,  0,  2,  0, 22,  2,
+136,  1,  7,  0, 27,  0, 24, 10,  0,  0,  4,  3,  7,  0, 81,  1,  7,  0, 90,  1,  2,  0, 18,  0,  2,  0, 74,  1,  4,  0, 27,  0,
+137,  1,  5,  0, 27,  0, 63,  3,  7,  0, 81,  1,  2,  0, 67,  3,  0,  0, 69,  3,  0,  0, 73, 10,138,  1,  7,  0,231,  0,110,  6,
+  0,  0, 74, 10,  4,  0, 18,  0,  4,  0, 27,  0,  0,  0, 75, 10, 27,  0,212,  5, 27,  0, 76, 10,139,  1,  3,  0,231,  0,110,  6,
+  4,  0, 18,  0,  4,  0, 27,  0,140,  1,  6,  0,231,  0,110,  6,  4,  0, 18,  0,  4,  0, 27,  0,  0,  0, 75, 10,  7,  0, 61, 10,
+ 27,  0,212,  5,141,  1, 10,  0,141,  1,  0,  0,141,  1,  1,  0,  2,  0, 16,  0,  2,  0, 18,  0,  0,  0, 77, 10,  7,  0, 19,  1,
+  7,  0, 20,  1,  2,  0,  2, 10,  2,  0, 78, 10, 27,  0, 43,  0,142,  1, 22,  0,142,  1,  0,  0,142,  1,  1,  0,  2,  0, 18,  0,
+  2,  0, 74,  1,  2,  0, 79, 10,  2,  0, 80, 10, 31,  0, 79,  0,178,  0, 90,  9, 27,  0,167,  0,  7,  0, 89,  0,  7,  0, 90,  0,
+  7,  0, 81, 10,  7,  0, 82, 10,  7,  0, 83, 10,  7,  0, 84, 10,  7,  0,246,  2,  7,  0,141,  3,  7,  0, 92,  9,  7,  0, 85, 10,
+  0,  0, 86, 10,  0,  0, 87, 10, 14,  0,183,  3,143,  1, 11,  0,  7,  0, 37,  2,  7,  0,120,  9,  7,  0,121,  9, 11,  0,  2,  0,
+  2,  0, 88, 10,  2,  0, 89, 10,  2,  0, 90, 10,  2,  0, 91, 10,  2,  0, 92, 10,  2,  0, 93, 10,  2,  0,173,  2,144,  1, 21,  0,
+144,  1,  0,  0,144,  1,  1,  0,144,  1, 94, 10,  0,  0, 19,  0, 11,  0, 95, 10,  2,  0, 16,  0,  2,  0, 18,  0,  2,  0, 96, 10,
+  2,  0, 66,  0,  7,  0, 97, 10,  7,  0, 98, 10, 11,  0, 99, 10,  2,  0,100, 10,  2,  0,101, 10,  4,  0,102, 10, 11,  0,155,  9,
+  4,  0,103, 10,  4,  0,104, 10,144,  1,105, 10,145,  1,106, 10,143,  1,107, 10,146,  1,  4,  0,  0,  0,108, 10,  2,  0,109, 10,
+  2,  0,110, 10,  4,  0, 27,  0,147,  1, 41,  0,147,  1,  0,  0,147,  1,  1,  0,147,  1,111, 10,  0,  0, 19,  0,  4,  0, 18,  0,
+  2,  0, 16,  0,  2,  0, 30,  0,  2,  0,203,  8,  2,  0,168,  2,  2,  0,112, 10,  2,  0, 16,  7,  2,  0,100, 10,  2,  0, 44,  9,
+  7,  0,113, 10, 14,  0, 85,  9, 14,  0,114, 10,147,  1, 37,  0, 22,  0, 46,  7, 11,  0, 95, 10,  7,  0, 97, 10,  7,  0, 98, 10,
+  7,  0, 72,  2,  7,  0,250,  2,  7,  0,115, 10,  7,  0,116, 10,  7,  0,117, 10,  4,  0,118, 10,  0,  0,119, 10,  2,  0,120, 10,
+  2,  0,121, 10,  7,  0,122, 10,  7,  0,123, 10,  2,  0,124, 10,  2,  0,125, 10, 11,  0,126, 10, 19,  0,127, 10, 19,  0,128, 10,
+ 19,  0,129, 10,146,  1,153,  0,148,  1,130, 10,149,  1,131, 10,145,  1,  8,  0,145,  1,  0,  0,145,  1,  1,  0,147,  1,132, 10,
+147,  1,133, 10,144,  1,134, 10,144,  1,135, 10,  4,  0, 18,  0,  4,  0, 27,  0, 56,  0, 23,  0, 22,  0, 32,  0, 34,  0, 74,  0,
+180,  0,177,  3, 14,  0,136, 10, 14,  0,137, 10,  4,  0, 16,  0,  4,  0,138, 10,  4,  0,139, 10,  4,  0, 18,  0,  4,  0,118, 10,
+  4,  0,140, 10,  2,  0,141, 10,  2,  0,142, 10,  4,  0,143, 10, 14,  0, 85,  9, 14,  0,114, 10,150,  1,144, 10, 11,  0,145, 10,
+ 11,  0,146, 10,  4,  0,147, 10, 11,  0,148, 10, 11,  0,149, 10, 11,  0,150, 10,151,  1,  4,  0,  4,  0, 17,  0,  4,  0,223,  2,
+  4,  0,120,  9,  4,  0,121,  9,152,  1,  4,  0,  4,  0, 17,  0,  7,  0,223,  2,  7,  0,120,  9,  7,  0,121,  9,153,  1,  2,  0,
+  0,  0,223,  2,  0,  0, 73,  1,154,  1,  4,  0,  4,  0, 17,  0,  7,  0,151, 10,  7,  0,120,  9,  7,  0,121,  9,155,  1,  1,  0,
+  7,  0,152, 10,156,  1,  2,  0,  2,  0, 18,  0,  2,  0,153, 10,157,  1,  6,  0,  4,  0,126,  0,  4,  0,128,  0,  4,  0, 44,  9,
+  0,  0,154, 10,  0,  0,155, 10,  2,  0, 27,  0,158,  1,  6,  0,  7,  0, 23,  1,  7,  0, 22,  1,  7,  0,156, 10,  7,  0,157, 10,
+  7,  0,158, 10,  4,  0, 27,  0,159,  1,  6,  0,158,  1,159, 10,158,  1,160, 10,158,  1,161, 10,158,  1,162, 10,  7,  0,163, 10,
+  7,  0,164, 10,160,  1,  5,  0,  7,  0, 87,  3,  4,  0,165, 10,  7,  0,166, 10,  7,  0,167, 10,  7,  0,168, 10,161,  1,  6,  0,
+  7,  0,  5,  0,  7,  0,  6,  0,  7,  0,169, 10,  7,  0,250,  2,  7,  0, 72,  2,  4,  0, 27,  0,162,  1,  6,  0,  7,  0,  5,  0,
+  7,  0,  6,  0,  7,  0,169, 10,  7,  0,250,  2,  7,  0, 72,  2,  4,  0, 27,  0,163,  1,  2,  0,  4,  0,170, 10,  4,  0,171, 10,
+164,  1, 16,  0,  2,  0,146,  8,  2,  0,147,  8,  2,  0, 70,  5,  2,  0,172, 10,  2,  0,173, 10,  2,  0, 67,  0,  2,  0, 47,  7,
+  2,  0,174, 10,  7,  0,245,  2,  7,  0,175, 10,  7,  0,176, 10,  2,  0, 97,  1,  0,  0,177, 10,  0,  0,156, 10,  4,  0,178, 10,
+  4,  0,179, 10,165,  1,  9,  0,  7,  0,180, 10,  7,  0,181, 10,  7,  0,154,  9,  7,  0, 87,  3,  7,  0,182, 10,  7,  0,232,  6,
+  2,  0, 85,  3,  0,  0,183, 10,  0,  0, 27,  0,166,  1,  4,  0,  7,  0,184, 10,  7,  0,185, 10,  2,  0, 85,  3,  2,  0, 27,  0,
+167,  1,  3,  0,  7,  0,186, 10,  7,  0,216,  8,  7,  0, 14,  0,168,  1,  4,  0,  0,  0, 35,  0,206,  0, 81,  5,  4,  0,128,  0,
+  4,  0,131,  4,169,  1,  6,  0,  0,  0,187, 10,206,  0,188, 10,  4,  0,128,  0,  4,  0,131,  4,  4,  0,189, 10,  4,  0, 27,  0,
+170,  1,  7,  0,  2,  0,190, 10,  2,  0,191, 10,  4,  0, 66,  0,  0,  0, 76,  4,206,  0,188, 10,  0,  0,192, 10,  0,  0,175,  6,
+171,  1,  9,  0,  7,  0,193, 10,  7,  0,194, 10,  7,  0,195, 10,  7,  0, 83,  2,  7,  0,196, 10,  7,  0,197, 10,  7,  0,198, 10,
+  2,  0,199, 10,  2,  0,200, 10,172,  1,  8,  0,  2,  0,201, 10,  2,  0,202, 10,  2,  0,203, 10,  2,  0,204, 10,  7,  0,205, 10,
+  7,  0,206, 10,  7,  0,207, 10,  7,  0,208, 10,173,  1,  2,  0,  7,  0,  5,  0,  7,  0,  6,  0,174,  1,  2,  0,  0,  0,169,  0,
+  0,  0,209, 10,175,  1,  1,  0,  0,  0, 19,  0,176,  1, 12,  0,  0,  0,210, 10,  0,  0,211, 10,  0,  0,209,  6,  0,  0,212, 10,
+  2,  0, 70,  5,  2,  0,213, 10,  7,  0,214, 10,  7,  0,215, 10,  7,  0,216, 10,  7,  0,141,  3,  7,  0,169, 10,  7,  0,217, 10,
+177,  1,  2,  0, 11,  0,218, 10, 11,  0,219, 10,178,  1, 13,  0,  0,  0, 73,  5,  0,  0, 16,  0,  0,  0, 85,  3,  0,  0, 87,  3,
+  0,  0,211, 10,  0,  0,107,  0,  0,  0,173,  2,  7,  0,220, 10,  7,  0,221, 10,  7,  0,140,  3,  7,  0,222, 10,  7,  0,223, 10,
+  7,  0,217, 10,179,  1,  8,  0,  7,  0, 51,  9,  7,  0,127,  0,  7,  0,156, 10,  7,  0,164,  2,  7,  0,224, 10,  7,  0,226,  0,
+  7,  0,225, 10,  4,  0, 16,  0,180,  1,  4,  0,  2,  0,226, 10,  2,  0,227, 10,  2,  0,228, 10,  2,  0, 27,  0,181,  1,  8,  0,
+  7,  0,229, 10,  7,  0,213,  2,  7,  0,230, 10,  7,  0,196,  8,  7,  0,197,  8,  7,  0,198,  8,  7,  0,231, 10,  7,  0,232, 10,
+182,  1,  6,  0,  2,  0,233, 10,  2,  0,234, 10,  7,  0,235, 10,  7,  0,236, 10,  7,  0,237, 10,  7,  0,238, 10,183,  1,  2,  0,
+ 57,  0,239, 10, 58,  0,240, 10,184,  1,  3,  0,183,  1, 83,  6,  7,  0,241, 10,  7,  0,242, 10,185,  1,  3,  0,183,  1, 83,  6,
+  4,  0,243, 10,  4,  0, 27,  0,186,  1,  1,  0,183,  1, 83,  6,187,  1,  3,  0,183,  1, 83,  6,  4,  0,243, 10,  4,  0,244, 10,
+188,  1,  3,  0,183,  1, 83,  6,  4,  0,245, 10,  4,  0, 27,  0,189,  1,  1,  0,183,  1, 83,  6,190,  1,  3,  0,183,  1, 83,  6,
+  4,  0,246, 10,  4,  0, 27,  0,191,  1,  3,  0,183,  1, 83,  6,  4,  0,247, 10,  4,  0, 27,  0,192,  1,  3,  0,183,  1, 83,  6,
+  4,  0,248, 10,  4,  0, 27,  0,193,  1,  3,  0,183,  1, 83,  6,  4,  0,238,  0,  4,  0, 27,  0,194,  1,  1,  0,  0,  0, 19,  0,
+195,  1,  1,  0,  0,  0, 19,  0,196,  1,  4,  0,  7,  0,  5,  0,  7,  0,  6,  0,  2,  0, 18,  0,  2,  0,249, 10,197,  1, 10,  0,
+  2,  0, 61,  4,  2,  0, 18,  0,  7,  0,216,  4,  7,  0,250, 10,  7,  0,251, 10,  7,  0,252, 10,  7,  0,253, 10,196,  1,254, 10,
+196,  1,255, 10,196,  1,  0, 11, 53,  0, 11,  0,  4,  0, 18,  0,  4,  0, 62,  0,  4,  0,  1, 11,  4,  0,  2, 11, 19,  0,  3, 11,
+ 19,  0,  4, 11,197,  1,  5, 11,  7,  0,  6, 11,  7,  0,  7, 11,  7,  0,  8, 11,  7,  0,  9, 11,  5,  1, 10,  0,  4,  0,  2, 10,
+  4,  0, 10, 11,  7,  0, 11, 11,  7,  0, 12, 11,  7,  0, 13, 11,  7,  0, 14, 11,  7,  0,  9,  0,  7,  0, 11,  0,  4,  0, 74,  1,
+  4,  0,250,  2,  4,  1, 18,  0,  4,  0,131,  0,  4,  0, 15, 11,  4,  0, 16, 11,  7,  0, 17, 11,  4,  0, 18, 11,  7,  0, 19, 11,
+  7,  0, 20, 11,  4,  0, 21, 11,  7,  0, 22, 11,  4,  0, 23, 11,  7,  0, 24, 11,  5,  1, 25, 11,  7,  0, 26, 11,  7,  0, 27, 11,
+  7,  0, 28, 11,  7,  0, 29, 11,  4,  0, 30, 11,  4,  0, 27,  0,198,  1,  4,  0, 42,  0,237,  2,  7,  0, 31, 11,  7,  0,168,  1,
+  7,  0, 27,  0,215,  0, 36,  0, 22,  0, 32,  0,198,  1, 32, 11, 53,  0,254, 10, 46,  0, 33, 11,215,  0, 34, 11, 51,  0, 35, 11,
+ 25,  0,153,  0,  0,  0, 36, 11,  7,  0, 37, 11,  2,  0,113,  6,  2,  0, 38, 11,  7,  0, 30,  2,  4,  0,107,  0,  4,  0, 18,  0,
+  7,  0, 39, 11,  4,  0, 80,  2,  4,  0, 40, 11,  7,  0, 41, 11,  7,  0, 42, 11,  7,  0, 43, 11,  7,  0,168,  1,  4,  0, 44, 11,
+  7,  0, 45, 11,  0,  0, 46, 11,  0,  0, 47, 11,  0,  0, 48, 11,  0,  0, 49, 11,  7,  0, 50, 11,  7,  0, 51, 11,  7,  0, 52, 11,
+  7,  0,250,  2,  7,  0, 53, 11,  4,  0, 54, 11,  7,  0,245,  5,  7,  0, 55, 11,  7,  0, 56, 11,199,  1, 10,  0,  4,  0, 16,  0,
+  4,  0,127,  0,  4,  0, 18,  0,  4,  0, 14,  4,  4,  0, 57, 11,  4,  0, 58, 11,  4,  0, 59, 11,  4,  0, 69,  0,  0,  0, 19,  0,
+ 11,  0,  2,  0,200,  1,  1,  0,  0,  0, 76,  7, 94,  0,  7,  0,199,  1, 60, 11,  4,  0, 61, 11,  4,  0, 62, 11,  4,  0, 63, 11,
+  4,  0, 64, 11, 11,  0, 65, 11,200,  1, 66, 11,201,  1,  5,  0,  7,  0,157,  2,  7,  0,233,  2,  7,  0, 30,  2,  2,  0,139,  2,
+  2,  0, 27,  0,202,  1,  5,  0,  7,  0,157,  2,  7,  0,158,  4,  7,  0, 67, 11,  7,  0, 68, 11,  7,  0,233,  2,203,  1,  5,  0,
+ 27,  0, 69, 11,204,  1, 21,  0,  7,  0, 79,  6,  7,  0, 70, 11,  7,  0, 55,  0,205,  1,  3,  0,  7,  0, 71, 11,  4,  0, 72, 11,
+  4,  0, 73, 11,206,  1,  7,  0,  4,  0, 74, 11,  4,  0, 75, 11,  4,  0, 76, 11,  7,  0, 77, 11,  7,  0, 78, 11,  7,  0, 79, 11,
+  7,  0, 55,  0,207,  1,  8,  0,207,  1,  0,  0,207,  1,  1,  0, 27,  0, 43,  0,  4,  0,247,  0,  2,  0, 18,  0,  2,  0, 74,  1,
+  7,  0,233,  2,  7,  0, 59,  9,208,  1,  7,  0,208,  1,  0,  0,208,  1,  1,  0, 27,  0, 43,  0,  2,  0,218,  2,  2,  0, 18,  0,
+  2,  0,  4,  2,  2,  0, 55,  0,209,  1, 17,  0,202,  1,  7,  4,202,  1, 80, 11,201,  1, 81, 11,202,  1, 42,  9,203,  1, 82, 11,
+  4,  0, 81,  0,  7,  0,233,  2,  7,  0,  0,  3,  7,  0, 83, 11,  4,  0, 74, 11,  4,  0, 84, 11,  7,  0, 78, 11,  7,  0, 79, 11,
+  7,  0,107,  0,  4,  0, 85, 11,  2,  0, 18,  0,  2,  0, 86, 11,210,  1, 15,  0,  7,  0,243,  0,  7,  0, 87, 11,  7,  0, 71, 11,
+  7,  0, 88, 11,  7,  0, 89, 11,  7,  0, 90, 11,  7,  0, 91, 11,  7,  0, 92, 11,  7,  0, 93, 11,  7,  0, 94, 11,  7,  0, 95, 11,
+  7,  0, 96, 11,  7,  0, 97, 11,  4,  0, 18,  0,  4,  0, 98, 11,211,  1,128,  0, 22,  0, 32,  0, 34,  0, 74,  0,212,  1, 99, 11,
+210,  1,100, 11,189,  0,153,  4,  4,  0, 18,  0,  4,  0, 55,  0,  2,  0, 16,  0,  2,  0, 62, 10,  2,  0,101, 11,  2,  0,111,  1,
+  2,  0,102, 11,  2,  0,231,  3,  2,  0,103, 11,  2,  0,104, 11,  2,  0,105, 11,  2,  0,106, 11,  2,  0,107, 11,  2,  0,108, 11,
+  2,  0,109, 11,  2,  0,110, 11,  2,  0,111, 11,  2,  0,229,  5,  2,  0,112, 11,  2,  0,113, 11,  2,  0,114, 11,  2,  0,115, 11,
+  2,  0,116, 11,  2,  0, 19,  2,  2,  0, 35,  9,  2,  0, 10,  9,  2,  0,117, 11,  2,  0,118, 11,  2,  0, 24,  4,  2,  0, 25,  4,
+  2,  0,119, 11,  2,  0,120, 11,  2,  0,121, 11,  2,  0,122, 11,  7,  0,123, 11,  7,  0,124, 11,  7,  0,125, 11,  7,  0,126, 11,
+  7,  0,127, 11,  7,  0,128, 11,  7,  0,129, 11,  2,  0,155,  5,  2,  0,130, 11,  7,  0,131, 11,  7,  0,132, 11,  7,  0,133, 11,
+  7,  0, 17,  9,  7,  0, 90,  0,  7,  0,  0,  3,  7,  0, 23,  9,  7,  0,134, 11,  7,  0,135, 11,  7,  0,136, 11,  7,  0,137, 11,
+  7,  0,138, 11,  7,  0,139, 11,  4,  0, 18,  9,  4,  0, 16,  9,  4,  0,140, 11,  4,  0,141, 11,  2,  0,142, 11,  2,  0,143, 11,
+  7,  0, 19,  9,  7,  0, 20,  9,  7,  0, 21,  9,  7,  0,144, 11,  7,  0,145, 11,  7,  0,146, 11,  7,  0,147, 11,  7,  0,148, 11,
+  7,  0,149, 11,  7,  0,150, 11,  7,  0,151, 11,  7,  0,152, 11,  7,  0,217,  3,  7,  0,107,  0,  7,  0,153, 11,  7,  0,154, 11,
+  7,  0,155, 11,  7,  0,156, 11,  7,  0,213,  0,  7,  0,157, 11,  4,  0,158, 11,  4,  0,159, 11,  7,  0,160, 11,  7,  0,161, 11,
+  7,  0,162, 11,  7,  0,163, 11,  7,  0,164, 11,  7,  0,212,  0,  7,  0,165, 11,  7,  0, 51,  4,  7,  0, 49,  4,  7,  0, 50,  4,
+  7,  0,166, 11,  7,  0,167, 11,  7,  0,168, 11,  7,  0,169, 11,  7,  0,170, 11,  7,  0,171, 11,  7,  0,172, 11,  7,  0,173, 11,
+  7,  0,174, 11,  7,  0,175, 11,  7,  0,176, 11,  7,  0,177, 11,  7,  0,178, 11,  7,  0,179, 11,  7,  0,180, 11,  7,  0,181, 11,
+  7,  0,182, 11,  7,  0,183, 11,  4,  0,184, 11,  4,  0,185, 11, 46,  0,130,  1, 63,  0,255,  3, 14,  0,186, 11, 63,  0,187, 11,
+ 27,  0,188, 11, 27,  0,189, 11, 31,  0, 79,  0,184,  0, 60,  1,184,  0,190, 11,151,  0, 52,  0,151,  0,  0,  0,151,  0,  1,  0,
+211,  1,191, 11,209,  1,192, 11,206,  1,221,  9,192,  0, 79,  4, 11,  0, 80,  4,213,  1,193, 11,213,  1,194, 11, 14,  0,195, 11,
+ 14,  0,196, 11,136,  0,197, 11,144,  0,198, 11,144,  0,199, 11, 27,  0,200, 11, 27,  0,201, 11, 27,  0, 37,  0, 14,  0, 29, 10,
+  0,  0, 19,  0,  7,  0,232,  0,  7,  0, 29,  3,  7,  0,202, 11,  7,  0,203, 11,  4,  0,207,  2,  4,  0,204, 11,  4,  0, 18,  0,
+  4,  0, 18,  9,  4,  0,205, 11,  4,  0,206, 11,  4,  0,207, 11,  4,  0,208, 11,  2,  0,239,  0,  2,  0,209, 11,  2,  0,210, 11,
+  2,  0,211, 11,  0,  0,212, 11,  2,  0,213, 11,  2,  0,214, 11,  2,  0,215, 11, 11,  0,216, 11,140,  0,152,  4, 14,  0, 14,  3,
+ 14,  0,217, 11,205,  1,218, 11,  4,  0,219, 11,  4,  0,220, 11,214,  1,221, 11,142,  0, 26,  3,215,  1,222, 11,  7,  0,223, 11,
+  7,  0,224, 11,  7,  0,225, 11,138,  0, 38,  0,216,  1,155,  9,  7,  0,122,  4,  7,  0,226, 11,  7,  0,227, 11,  7,  0, 79,  6,
+  7,  0,235,  3,  7,  0,217,  3,  7,  0,228, 11,  7,  0, 82,  2,  7,  0,229, 11,  7,  0,230, 11,  7,  0,231, 11,  7,  0,232, 11,
+  7,  0,233, 11,  7,  0,234, 11,  7,  0,123,  4,  7,  0,235, 11,  7,  0,236, 11,  7,  0,237, 11,  7,  0,124,  4,  7,  0,120,  4,
+  7,  0,121,  4,  7,  0,238, 11,  7,  0,239, 11,  7,  0,240, 11,  4,  0,241, 11,  4,  0, 91,  0,  4,  0,242, 11,  4,  0,243, 11,
+  2,  0,244, 11,  2,  0,245, 11,  2,  0,246, 11,  2,  0,247, 11,  2,  0,248, 11,  2,  0,249, 11,  2,  0,250, 11,  2,  0, 27,  0,
+189,  0,153,  4,139,  0, 11,  0,216,  1,251, 11,  7,  0,252, 11,  7,  0,253, 11,  7,  0,241,  1,  7,  0,254, 11,  7,  0,255, 11,
+  7,  0,  0, 12,  4,  0, 91,  0,  2,  0,  1, 12,  2,  0,  2, 12, 63,  0,240,  1,217,  1,  4,  0,  7,  0,  5,  0,  7,  0,  6,  0,
+  7,  0,  7,  0,  7,  0,  3, 12,218,  1,  6,  0,218,  1,  0,  0,218,  1,  1,  0,217,  1,197,  9,  4,  0,245,  0,  2,  0,  4, 12,
+  2,  0, 18,  0,219,  1,  5,  0,219,  1,  0,  0,219,  1,  1,  0, 14,  0,  5, 12,  4,  0,  6, 12,  4,  0, 18,  0,220,  1,  9,  0,
+220,  1,  0,  0,220,  1,  1,  0, 14,  0,126,  0,219,  1,  7, 12,  4,  0, 18,  0,  2,  0,  4, 12,  2,  0,  8, 12,  7,  0, 92,  0,
+  0,  0,  9, 12,180,  0,  6,  0, 22,  0, 32,  0, 14,  0,124,  5,  4,  0, 18,  0,  2,  0, 10, 12,  2,  0, 11, 12, 11,  0, 12, 12,
+221,  1,  6,  0, 14,  0, 13, 12,  4,  0, 14, 12,  4,  0, 15, 12,  4,  0, 18,  0,  4,  0, 27,  0,239,  0, 16, 12,222,  1, 19,  0,
+ 22,  0, 32,  0,223,  1, 17, 12,223,  1, 18, 12, 14,  0, 19, 12,  4,  0, 20, 12,  2,  0, 21, 12,  2,  0, 22, 12, 14,  0, 23, 12,
+ 14,  0, 24, 12,221,  1, 25, 12, 14,  0, 26, 12, 14,  0, 27, 12, 14,  0, 28, 12, 14,  0, 29, 12,224,  1, 30, 12,224,  1, 31, 12,
+224,  1, 32, 12, 14,  0, 33, 12,239,  0, 34, 12,223,  1, 32,  0,223,  1,  0,  0,223,  1,  1,  0, 11,  0, 35, 12,  4,  0,124,  8,
+  2,  0, 36, 12,  2,  0, 27,  0, 29,  1, 37, 12, 29,  1, 38, 12,  0,  0, 39, 12,  2,  0, 40, 12,  2,  0, 41, 12,  2,  0,146,  8,
+  2,  0,147,  8,  2,  0, 42, 12,  2,  0, 43, 12,  2,  0, 14,  4,  2,  0, 57,  7,  2,  0, 44, 12,  2,  0, 45, 12,  2,  0, 46, 12,
+  2,  0, 30,  0,225,  1, 47, 12,226,  1, 48, 12,227,  1, 49, 12,  4,  0, 50, 12,  4,  0, 51, 12, 11,  0, 52, 12, 14,  0, 24, 12,
+ 14,  0,166,  8, 14,  0, 53, 12, 14,  0, 54, 12, 14,  0, 55, 12,228,  1, 18,  0,228,  1,  0,  0,228,  1,  1,  0,  0,  0, 56, 12,
+ 21,  0, 31,  0,  0,  0, 57, 12,  2,  0, 58, 12,  2,  0, 16,  0,  2,  0, 14,  0,  2,  0, 59, 12,  2,  0, 60, 12,  2,  0, 61, 12,
+  2,  0, 62, 12,  2,  0, 63, 12,  2,  0, 18,  0,  2,  0, 64, 12,  2,  0, 32,  0,  2,  0, 27,  0,229,  1, 65, 12,230,  1,  4,  0,
+230,  1,  0,  0,230,  1,  1,  0,228,  1, 66, 12,228,  1, 67, 12,231,  1, 11,  0,231,  1,  0,  0,231,  1,  1,  0, 14,  0, 68, 12,
+ 14,  0, 69, 12,  0,  0, 56, 12,  2,  0, 70, 12,  2,  0, 71, 12,  2,  0, 18,  0,  2,  0, 72, 12,  4,  0, 73, 12, 11,  0, 74, 12,
+224,  1,  7,  0,224,  1,  0,  0,224,  1,  1,  0,  0,  0, 56, 12,  0,  0, 75, 12, 14,  0, 64,  8,  4,  0, 76, 12,  4,  0, 18,  0,
+  1,  1, 14,  0,  1,  1,  0,  0,  1,  1,  1,  0,  0,  0, 56, 12, 21,  0, 31,  0,232,  1,140,  8, 11,  0, 77, 12, 11,  0, 78, 12,
+229,  1, 65, 12,221,  1, 79, 12, 14,  0, 80, 12,  1,  1, 81, 12, 34,  1,253,  6,  2,  0, 18,  0,  2,  0, 73,  1,233,  1, 12,  0,
+233,  1,  0,  0,233,  1,  1,  0, 11,  0,  2,  0, 11,  0, 82, 12,  0,  0, 19,  0,  2,  0, 16,  0,  2,  0, 18,  0,  7,  0,142,  9,
+  7,  0,128,  0,  7,  0,131,  4,  7,  0, 92,  9,  7,  0, 85, 10,234,  1,  5,  0,  7,  0, 83, 12,  4,  0, 84, 12,  4,  0, 85, 12,
+  4,  0, 74,  1,  4,  0, 18,  0,235,  1,  6,  0,  7,  0, 86, 12,  7,  0, 87, 12,  7,  0, 88, 12,  7,  0, 89, 12,  4,  0, 16,  0,
+  4,  0, 18,  0,236,  1,  5,  0,  7,  0,120,  9,  7,  0,121,  9,  7,  0,233,  2,  2,  0, 33,  2,  2,  0, 34,  2,237,  1,  5,  0,
+236,  1,  2,  0,  4,  0, 52,  0,  7,  0, 90, 12,  7,  0,120,  9,  7,  0,121,  9,238,  1,  4,  0,  2,  0, 91, 12,  2,  0, 92, 12,
+  2,  0, 93, 12,  2,  0, 94, 12,239,  1,  2,  0, 37,  0, 44,  7, 21,  0,161,  9,240,  1,  3,  0, 19,  0, 95, 12,  4,  0, 18,  0,
+  4,  0, 27,  0,241,  1,  6,  0,  7,  0,107,  0,  7,  0,202,  2,  7,  0, 96, 12,  7,  0, 27,  0,  2,  0,238,  0,  2,  0, 97, 12,
+242,  1,  5,  0,  7,  0, 98, 12,  7,  0,127,  0,  7,  0,198,  9,  7,  0,199,  9,  4,  0, 18,  0,243,  1,  6,  0, 22,  0, 46,  7,
+  0,  0, 99, 12,  0,  0,100, 12,  2,  0,101, 12,  2,  0, 18,  0,  4,  0,102, 12,244,  1,  7,  0,244,  1,  0,  0,244,  1,  1,  0,
+  0,  0, 19,  0,243,  1,103, 12,  2,  0,104, 12,  2,  0, 16,  0,  7,  0, 59,  0,245,  1,  7,  0, 14,  0,105, 12,  0,  0,106, 12,
+ 11,  0,107, 12,  7,  0, 59,  0,  7,  0,142,  9,  4,  0, 16,  0,  4,  0, 18,  0,246,  1,  3,  0,  7,  0,108, 12,  4,  0, 18,  0,
+  4,  0, 27,  0,247,  1, 15,  0,247,  1,  0,  0,247,  1,  1,  0,107,  1, 16, 10,245,  1, 60,  0, 14,  0,183,  3, 30,  0, 48,  0,
+246,  1,109, 12,  4,  0, 52,  0,  7,  0, 59,  0,  2,  0, 18,  0,  2,  0, 10,  1,  4,  0,110, 12,  0,  0, 99, 12,  4,  0,111, 12,
+  7,  0,113, 10,248,  1,  2,  0,  0,  0,112, 12,  0,  0,113, 12,249,  1,  4,  0,249,  1,  0,  0,249,  1,  1,  0,178,  0, 63,  3,
+ 14,  0,114, 12,250,  1, 25,  0,250,  1,  0,  0,250,  1,  1,  0, 14,  0,115, 12,178,  0, 90,  9,249,  1,116, 12, 14,  0,117, 12,
+ 14,  0,183,  3,  0,  0, 19,  0,  7,  0,142,  9,  7,  0,118, 12,  7,  0, 89,  0,  7,  0, 90,  0,  7,  0, 81, 10,  7,  0, 82, 10,
+  7,  0,246,  2,  7,  0,141,  3,  7,  0, 92,  9,  7,  0, 85, 10,  2,  0,119, 12,  2,  0,120, 12,  2,  0, 66,  0,  2,  0, 16,  0,
+ 11,  0,121, 12,  4,  0, 18,  0,  4,  0, 30,  0,251,  1,  6,  0,251,  1,  0,  0,251,  1,  1,  0, 14,  0,115, 12,  4,  0, 18,  0,
+  4,  0,  4,  2,  0,  0, 19,  0,252,  1, 11,  0,252,  1,  0,  0,252,  1,  1,  0, 22,  0, 46,  7,  0,  0,122, 12,  4,  0,102, 12,
+  2,  0,123, 12,  2,  0, 27,  0,  0,  0, 99, 12,  4,  0,110, 12,  2,  0, 18,  0,  2,  0,124, 12,253,  1, 10,  0,253,  1,  0,  0,
+253,  1,  1,  0, 14,  0,125, 12,  0,  0, 56, 12,  0,  0, 19,  0,  0,  0,126, 12,  0,  0,127, 12,  2,  0, 18,  0,  2,  0,124, 12,
+  4,  0,128, 12,254,  1,  5,  0,254,  1,  0,  0,254,  1,  1,  0,  0,  0, 99, 12,  4,  0,110, 12,  7,  0,223,  2, 34,  0, 12,  0,
+178,  0,174,  3,178,  0,129, 12,249,  1,116, 12, 14,  0,130, 12,250,  1,131, 12, 14,  0,132, 12, 14,  0,133, 12,  4,  0, 18,  0,
+  4,  0,239,  0,  2,  0,134, 12,  2,  0,135, 12,  7,  0,136, 12,255,  1,  2,  0, 22,  0, 32,  0, 34,  0, 74,  0,  0,  2,  5,  0,
+  0,  2,  0,  0,  0,  2,  1,  0,  4,  0, 16,  0,  4,  0, 18,  0,  0,  0,173,  5,  1,  2,  6,  0,  0,  2,137, 12, 27,  0, 43,  0,
+  4,  0,138, 12,  7,  0,139, 12,  4,  0,140, 12,  4,  0,  2, 10,  2,  2,  3,  0,  0,  2,137, 12,  4,  0,138, 12,  7,  0,141, 12,
+  3,  2,  8,  0,  0,  2,137, 12, 27,  0, 43,  0,  7,  0, 64,  1,  7,  0,142, 12,  7,  0, 29,  3,  7,  0,154,  9,  4,  0,138, 12,
+  4,  0,143, 12,  4,  2,  5,  0,  0,  2,137, 12,  7,  0,144, 12,  7,  0,168,  2,  7,  0,252,  2,  7,  0, 55,  0,  5,  2,  3,  0,
+  0,  2,137, 12,  7,  0,154,  9,  7,  0,145, 12,204,  1,  4,  0,  7,  0,146, 12,  7,  0,154, 11,  2,  0,147, 12,  2,  0, 74,  1,
+  6,  2, 14,  0,  6,  2,  0,  0,  6,  2,  1,  0, 14,  0,148, 12, 14,  0,149, 12, 14,  0,150, 12,  0,  0,173,  5,  4,  0, 32,  0,
+  4,  0, 18,  0,  4,  0,151, 12,  7,  0,152, 12,  4,  0,140, 12,  4,  0,  2, 10,  7,  0, 83,  4,  7,  0,254,  2,212,  1, 23,  0,
+  4,  0,138, 12,  4,  0,153, 12,  7,  0,154, 12,  7,  0,250,  2,  7,  0,155, 12,  7,  0,233,  8,  7,  0,146, 12,  7,  0,156, 12,
+  7,  0,202,  2,  7,  0, 17, 11,  7,  0,216,  4,  7,  0,157, 12,  7,  0,158, 12,  7,  0,159, 12,  7,  0,160, 12,  7,  0,161, 12,
+  7,  0,162, 12,  7,  0,163, 12,  7,  0,164, 12,  7,  0,165, 12,  7,  0,166, 12,  7,  0,167, 12, 14,  0,168, 12,124,  0, 40,  0,
+123,  0,169, 12,  7,  2,100, 11, 63,  0,170, 12, 63,  0,187, 11, 63,  0,171, 12,  8,  2,172, 12, 43,  0,168,  0, 43,  0,173, 12,
+ 43,  0,174, 12,  7,  0,175, 12,  7,  0,176, 12,  7,  0,177, 12,  7,  0,178, 12,  7,  0,179, 12,  7,  0,123,  8,  7,  0,180, 12,
+  7,  0,168,  1,  7,  0,181, 12,  7,  0,141,  3,  4,  0,182, 12,  4,  0,183, 12,  4,  0,184, 12,  4,  0, 91,  0,  4,  0,185, 12,
+  2,  0,186, 12,  2,  0,187, 12,  4,  0,188, 12,  7,  0,202,  2,  4,  0,189, 12,  7,  0,190, 12,  4,  0,191, 12,  4,  0,192, 12,
+  4,  0,193, 12,140,  0,194, 12, 14,  0,195, 12,189,  0,153,  4,  4,  0,196, 12,  7,  0,197, 12,  7,  0,198, 12,  4,  0, 30,  0,
+125,  0, 12,  0,123,  0,169, 12,151,  0, 49,  3,  7,  0,133,  1,  7,  0,123,  8,  7,  0,199, 12,  7,  0,200, 12,  7,  0,201, 12,
+  2,  0,202, 12,  2,  0,203, 12,  2,  0,204, 12,  2,  0, 16,  0,  4,  0, 91,  0,126,  0, 15,  0,123,  0,169, 12,142,  0, 26,  3,
+  7,  0,197,  9,  7,  0,205, 12,  7,  0,206, 12,  4,  0,207, 12,  7,  0, 66,  1,  7,  0,208, 12,  4,  0, 38, 10,  4,  0, 22,  3,
+  4,  0,209, 12,  7,  0,178, 12,  2,  0, 16,  0,  2,  0, 27,  0,  4,  0, 30,  0,  9,  2, 15,  0, 22,  0, 32,  0, 34,  0, 74,  0,
+ 47,  1,231,  8,  7,  0,210, 12,  7,  0,211, 12,  7,  0,212, 12,  7,  0,213, 12,  7,  0,153,  9,  7,  0,214, 12,  7,  0,215, 12,
+  7,  0,216, 12,  7,  0, 83,  4,  7,  0,233,  8,  2,  0, 18,  0,  2,  0,116,  9,233,  0,  3,  0,  4,  0,125,  0,  2,  0,229,  6,
+  2,  0,217, 12, 10,  2,  5,  0,  0,  0,199,  8,  2,  0,200,  8,  2,  0, 73,  5,  2,  0,218, 12,  2,  0,219, 12,231,  0, 16,  0,
+ 22,  0, 32,  0, 34,  0, 74,  0,  0,  0, 35,  0,  4,  0,142,  0,  4,  0,143,  0,  4,  0,220, 12,  7,  0,161,  0,  7,  0,162,  0,
+ 44,  0,137,  0, 11,  2,155,  9,180,  0,177,  3, 12,  2,221, 12, 11,  0,222, 12, 10,  2,223, 12,  4,  0, 18,  0,  4,  0, 22,  0,
+ 15,  1, 10,  0,  4,  0,131,  0,  4,  0,224, 12, 51,  0,225, 12,  7,  0,226, 12,  2,  0,227, 12,  0,  0,173,  2,  4,  0,125,  0,
+ 13,  2,170,  3, 14,  2,228, 12,  7,  0,229, 12, 15,  2,  3,  0,  4,  0,125,  0,  7,  0,230, 12,  7,  0, 66,  1, 16,  2, 11,  0,
+ 11,  0,231, 12,  7,  0,232, 12,  7,  0,233, 12,  7,  0, 27,  0,  7,  0,234, 12,  2,  0,235, 12,  2,  0, 66,  0,  7,  0,236, 12,
+  7,  0,237, 12,  7,  0,238, 12,  7,  0,239, 12, 14,  2,  3,  0,  7,  0,240, 12,  4,  0,125,  0,  4,  0, 18,  0, 13,  2, 24,  0,
+ 13,  2,  0,  0, 13,  2,  1,  0,  0,  0, 19,  0,  7,  0,241, 12,  7,  0,242, 12,  7,  0,243, 12,  7,  0,244, 12,  7,  0, 31, 11,
+  4,  0,245, 12,  4,  0,246, 12, 14,  2,247, 12,  7,  0,248, 12,  7,  0,230, 12,  4,  0, 18,  0,  4,  0,249, 12,  4,  0,250, 12,
+  7,  0,113, 10,  2,  0,251, 12,  2,  0,222,  3,  2,  0,252, 12,  2,  0,253, 12,  2,  0,254, 12,  2,  0, 30,  0,  7,  0,255, 12,
+ 17,  2, 22,  0,  4,  0, 18,  0,  2,  0,  0, 13,  2,  0,  1, 13,  7,  0,  2, 13,  2,  0,  3, 13,  2,  0,  4, 13,  2,  0,  5, 13,
+  2,  0,  6, 13,  2,  0,  7, 13,  2,  0,  8, 13,  2,  0,  9, 13,  2,  0,252,  2,  4,  0, 10, 13,  4,  0, 11, 13,  2,  0, 12, 13,
+  2,  0, 30,  0,  7,  0, 81,  1,  4,  0, 13, 13,  4,  0, 14, 13,  7,  0, 15, 13,  7,  0, 16, 13,  4,  0,237,  1, 18,  2, 12,  0,
+  4,  0, 18,  0,  4,  0, 17, 13,  4,  0, 18, 13,  7,  0, 19, 13, 13,  2, 20, 13,  7,  0, 21, 13,  7,  0, 22, 13,  7,  0, 23, 13,
+  4,  0,180,  1,  4,  0,131,  0,  7,  0,141,  3, 51,  0, 24, 13, 19,  2,  5,  0,  4,  0, 18,  0,  7,  0,230, 12,  4,  0, 25, 13,
+  4,  0, 26, 13, 15,  2, 27, 13, 20,  2,  7,  0, 20,  2,  0,  0, 20,  2,  1,  0,  0,  0, 19,  0,  4,  0, 18,  0,  7,  0,141,  3,
+ 14,  0, 28, 13, 19,  2, 29, 13, 21,  2,  1,  0,  0,  0, 30, 13, 22,  2,  8,  0, 22,  2,  0,  0, 22,  2,  1,  0, 13,  2,170,  3,
+  4,  0, 27,  0,  4,  0, 31, 13,  4,  0, 32, 13,  4,  0, 33, 13,  4,  0, 34, 13, 23,  2,  6,  0,  4,  0,131,  0,  4,  0, 27,  0,
+ 14,  0,  2, 10,  4,  0, 35, 13,  2,  0, 36, 13,  2,  0, 37, 13, 12,  2, 11,  0, 17,  2, 38, 13, 16,  2, 39, 13, 14,  0, 28, 13,
+ 19,  2, 29, 13, 18,  2, 40, 13, 13,  2, 41, 13, 14,  0, 42, 13,  4,  0, 43, 13,  4,  0, 44, 13, 21,  2, 94,  6, 23,  2, 45, 13,
+ 24,  2, 48,  0, 24,  2,  0,  0, 24,  2,  1,  0,170,  0,138,  3, 25,  2,  2,  0, 63,  0, 46, 13,189,  0,153,  4,140,  0,152,  4,
+ 14,  0, 14,  3,  4,  0, 47, 13,  0,  0, 19,  0,  2,  0,188, 10,  2,  0, 16,  0,  2,  0, 48, 13,  2,  0, 49, 13,  2,  0, 50, 13,
+  2,  0, 51, 13,  2,  0, 52, 13,  2,  0, 53, 13,  4,  0, 91,  0,  4,  0,181,  3,  4,  0, 54, 13,  4,  0, 55, 13,  4,  0,198,  9,
+  4,  0,199,  9,  4,  0, 27,  0,  7,  0, 56, 13, 47,  0, 57, 13,  0,  0, 58, 13,  4,  0, 59, 13,  4,  0,188, 12,  7,  0, 60, 13,
+  7,  0, 61, 13,  7,  0, 62, 13,  7,  0, 63, 13,  7,  0, 64, 13,  7,  0, 65, 13,  7,  0, 66, 13,  7,  0, 67, 13,  7,  0, 68, 13,
+  7,  0, 69, 13,  7,  0, 70, 13,  7,  0, 71, 13,  7,  0, 72, 13,  7,  0, 73, 13,  0,  0,195,  2,  0,  0, 74, 13,  0,  0, 75, 13,
+  0,  0, 76, 13,170,  0,  7,  0,169,  0, 77, 13,144,  0, 28,  3, 14,  0, 78, 13,  2,  0, 79, 13,  2,  0, 91,  0,  4,  0, 27,  0,
+  0,  0, 80, 13,171,  0, 24,  0,169,  0, 77, 13,144,  0, 28,  3,151,  0, 49,  3, 62,  0, 16,  2,  4,  0, 91,  0,  4,  0, 81, 13,
+  7,  0,184,  0,  7,  0,185,  0,  7,  0,186,  0,  7,  0,168,  1,  7,  0, 82, 13,  7,  0, 83, 13,  7,  0, 84, 13,  7,  0, 85, 13,
+ 49,  0, 86, 13, 49,  0, 87, 13,  2,  0, 88, 13,  2,  0,248, 10,  2,  0, 89, 13,  2,  0, 27,  0,  7,  0, 90, 13,  7,  0, 91, 13,
+  7,  0, 92, 13,  7,  0, 93, 13, 69, 78, 68, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0};
 
diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c
index 8d771f0dc58..fa555b0ddb8 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -37,10 +37,8 @@
 
 #include "BLO_sys_types.h"
 
-#include "IMB_imbuf_types.h"
-
-#include "BLI_math.h"
 #include "BLI_blenlib.h"
+#include "BLI_math.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_gpencil_types.h"
@@ -53,8 +51,6 @@
 #include "BKE_global.h"
 #include "BKE_gpencil.h"
 
-
-
 #include "WM_api.h"
 
 #include "BIF_gl.h"
@@ -64,7 +60,6 @@
 #include "ED_sequencer.h"
 #include "ED_view3d.h"
 
-
 #include "gpencil_intern.h"
 
 /* ************************************************** */
@@ -225,7 +220,7 @@ static void gp_draw_stroke_3d(bGPDspoint *points, int totpoints, short thickness
 			
 			/* need to roll-back one point to ensure that there are no gaps in the stroke */
 			if (i != 0) glVertex3fv(&(pt - 1)->x);
-
+			
 			/* now the point we want... */
 			glVertex3fv(&pt->x);
 			
@@ -340,7 +335,7 @@ static void gp_draw_stroke(bGPDspoint *points, int totpoints, short thickness_s,
 				mt[1] = m2[1] * pthick * 0.5f;
 				sc[0] = s0[0] - (m1[0] * pthick * 0.75f);
 				sc[1] = s0[1] - (m1[1] * pthick * 0.75f);
-
+				
 				t0[0] = sc[0] - mt[0];
 				t0[1] = sc[1] - mt[1];
 				t1[0] = sc[0] + mt[0];
@@ -382,7 +377,7 @@ static void gp_draw_stroke(bGPDspoint *points, int totpoints, short thickness_s,
 				mt[1] = mb[1] * pthick;
 				athick = len_v2(mt);
 				dfac = pthick - (athick * 2);
-
+				
 				if (((athick * 2.0f) < pthick) && (IS_EQF(athick, pthick) == 0)) {
 					mt[0] += (mb[0] * dfac);
 					mt[1] += (mb[1] * dfac);
@@ -429,7 +424,7 @@ static void gp_draw_stroke(bGPDspoint *points, int totpoints, short thickness_s,
 				mt[1] = m2[1] * pthick * 0.5f;
 				sc[0] = s1[0] + (m1[0] * pthick * 0.75f);
 				sc[1] = s1[1] + (m1[1] * pthick * 0.75f);
-
+				
 				t0[0] = sc[0] - mt[0];
 				t0[1] = sc[1] - mt[1];
 				t1[0] = sc[0] + mt[0];
@@ -669,7 +664,7 @@ static void gp_draw_data(bGPdata *gpd, int offsx, int offsy, int winx, int winy,
 // ............................
 
 /* draw grease-pencil sketches to specified 2d-view that uses ibuf corrections */
-void draw_gpencil_2dimage(bContext *C, ImBuf *ibuf)
+void draw_gpencil_2dimage(const bContext *C)
 {
 	ScrArea *sa = CTX_wm_area(C);
 	ARegion *ar = CTX_wm_region(C);
@@ -678,8 +673,6 @@ void draw_gpencil_2dimage(bContext *C, ImBuf *ibuf)
 	int offsx, offsy, sizex, sizey;
 	int dflag = GP_DRAWDATA_NOSTATUS;
 	
-	/* check that we have grease-pencil stuff to draw */
-	if (ELEM(NULL, sa, ibuf)) return;
 	gpd = gpencil_data_get_active(C); // XXX
 	if (gpd == NULL) return;
 	
@@ -701,32 +694,20 @@ void draw_gpencil_2dimage(bContext *C, ImBuf *ibuf)
 			dflag |= GP_DRAWDATA_ONLYV2D | GP_DRAWDATA_IEDITHACK;
 		}
 		break;
-#if 0   /* removed since 2.5x, needs to be added back */
 		case SPACE_SEQ: /* sequence */
 		{
-			SpaceSeq *sseq = (SpaceSeq *)sa->spacedata.first;
-			float zoom, zoomx, zoomy;
-			
-			/* calculate accessory values */
-			zoom = (float)(SEQ_ZOOM_FAC(sseq->zoom));
-			if (sseq->mainb == SEQ_DRAW_IMG_IMBUF) {
-				/* XXX sequencer zoom should store it? */
-				zoomx = zoom; //  * (G.scene->r.xasp / G.scene->r.yasp);
-				zoomy = zoom;
-			} 
-			else
-				zoomx = zoomy = zoom;
-			
-			/* calculate transforms (Note: we use ibuf here, as we have it) */
-			sizex = (int)(zoomx * ibuf->x);
-			sizey = (int)(zoomy * ibuf->y);
-			offsx = (int)( (ar->winx - sizex) / 2 + sseq->xof);
-			offsy = (int)( (ar->winy - sizey) / 2 + sseq->yof);
+			/* just draw using standard scaling (settings here are currently ignored anyways) */
+			offsx = 0;
+			offsy = 0;
+			sizex = ar->winx;
+			sizey = ar->winy;
 			
-			dflag |= GP_DRAWDATA_ONLYI2D;
+			/* NOTE: I2D was used in 2.4x, but the old settings for that have been deprecated 
+			 * and everything moved to standard View2d 
+			 */
+			dflag |= GP_DRAWDATA_ONLYV2D;
 		}
 		break;
-#endif
 		default: /* for spacetype not yet handled */
 			offsx = 0;
 			offsy = 0;
@@ -745,7 +726,7 @@ void draw_gpencil_2dimage(bContext *C, ImBuf *ibuf)
 /* draw grease-pencil sketches to specified 2d-view assuming that matrices are already set correctly 
  * Note: this gets called twice - first time with onlyv2d=1 to draw 'canvas' strokes, second time with onlyv2d=0 for screen-aligned strokes
  */
-void draw_gpencil_view2d(bContext *C, short onlyv2d)
+void draw_gpencil_view2d(const bContext *C, short onlyv2d)
 {
 	ScrArea *sa = CTX_wm_area(C);
 	ARegion *ar = CTX_wm_region(C);
diff --git a/source/blender/editors/gpencil/editaction_gpencil.c b/source/blender/editors/gpencil/editaction_gpencil.c
index 9cc738b016e..a7beaa74eb7 100644
--- a/source/blender/editors/gpencil/editaction_gpencil.c
+++ b/source/blender/editors/gpencil/editaction_gpencil.c
@@ -62,7 +62,7 @@
 /* Generics - Loopers */
 
 /* Loops over the gp-frames for a gp-layer, and applies the given callback */
-short gplayer_frames_looper(bGPDlayer *gpl, Scene *scene, short (*gpf_cb)(bGPDframe *, Scene *))
+short ED_gplayer_frames_looper(bGPDlayer *gpl, Scene *scene, short (*gpf_cb)(bGPDframe *, Scene *))
 {
 	bGPDframe *gpf;
 	
@@ -85,7 +85,7 @@ short gplayer_frames_looper(bGPDlayer *gpl, Scene *scene, short (*gpf_cb)(bGPDfr
 /* Data Conversion Tools */
 
 /* make a listing all the gp-frames in a layer as cfraelems */
-void gplayer_make_cfra_list(bGPDlayer *gpl, ListBase *elems, short onlysel)
+void ED_gplayer_make_cfra_list(bGPDlayer *gpl, ListBase *elems, short onlysel)
 {
 	bGPDframe *gpf;
 	CfraElem *ce;
@@ -111,7 +111,7 @@ void gplayer_make_cfra_list(bGPDlayer *gpl, ListBase *elems, short onlysel)
 /* Selection Tools */
 
 /* check if one of the frames in this layer is selected */
-short is_gplayer_frame_selected(bGPDlayer *gpl)
+short ED_gplayer_frame_select_check(bGPDlayer *gpl)
 {
 	bGPDframe *gpf;
 	
@@ -149,7 +149,7 @@ static void gpframe_select(bGPDframe *gpf, short select_mode)
 }
 
 /* set all/none/invert select (like above, but with SELECT_* modes) */
-void select_gpencil_frames(bGPDlayer *gpl, short select_mode)
+void ED_gpencil_select_frames(bGPDlayer *gpl, short select_mode)
 {
 	bGPDframe *gpf;
 	
@@ -164,36 +164,33 @@ void select_gpencil_frames(bGPDlayer *gpl, short select_mode)
 }
 
 /* set all/none/invert select */
-void set_gplayer_frame_selection(bGPDlayer *gpl, short mode)
+void ED_gplayer_frame_select_set(bGPDlayer *gpl, short mode)
 {
 	/* error checking */
 	if (gpl == NULL) 
 		return;
 	
 	/* now call the standard function */
-	select_gpencil_frames(gpl, mode);
+	ED_gpencil_select_frames(gpl, mode);
 }
 
 /* select the frame in this layer that occurs on this frame (there should only be one at most) */
-void select_gpencil_frame(bGPDlayer *gpl, int selx, short select_mode)
+void ED_gpencil_select_frame(bGPDlayer *gpl, int selx, short select_mode)
 {
 	bGPDframe *gpf;
 	
 	if (gpl == NULL) 
 		return;
-	
-	/* search through frames for a match */
-	for (gpf = gpl->frames.first; gpf; gpf = gpf->next) {
-		/* there should only be one frame with this frame-number */
-		if (gpf->framenum == selx) {
-			gpframe_select(gpf, select_mode);
-			break;
-		}
+
+	gpf = BKE_gpencil_layer_find_frame(gpl, selx);
+
+	if (gpf) {
+		gpframe_select(gpf, select_mode);
 	}
 }
 
 /* select the frames in this layer that occur within the bounds specified */
-void borderselect_gplayer_frames(bGPDlayer *gpl, float min, float max, short select_mode)
+void ED_gplayer_frames_select_border(bGPDlayer *gpl, float min, float max, short select_mode)
 {
 	bGPDframe *gpf;
 	
@@ -211,7 +208,7 @@ void borderselect_gplayer_frames(bGPDlayer *gpl, float min, float max, short sel
 /* Frame Editing Tools */
 
 /* Delete selected frames */
-void delete_gplayer_frames(bGPDlayer *gpl)
+void ED_gplayer_frames_delete(bGPDlayer *gpl)
 {
 	bGPDframe *gpf, *gpfn;
 	
@@ -229,7 +226,7 @@ void delete_gplayer_frames(bGPDlayer *gpl)
 }
 
 /* Duplicate selected frames from given gp-layer */
-void duplicate_gplayer_frames(bGPDlayer *gpl)
+void ED_gplayer_frames_duplicate(bGPDlayer *gpl)
 {
 	bGPDframe *gpf, *gpfn;
 	
@@ -502,19 +499,19 @@ void snap_gplayer_frames(bGPDlayer *gpl, Scene *scene, short mode)
 {
 	switch (mode) {
 		case 1: /* snap to nearest frame */
-			gplayer_frames_looper(gpl, scene, snap_gpf_nearest);
+			ED_gplayer_frames_looper(gpl, scene, snap_gpf_nearest);
 			break;
 		case 2: /* snap to current frame */
-			gplayer_frames_looper(gpl, scene, snap_gpf_cframe);
+			ED_gplayer_frames_looper(gpl, scene, snap_gpf_cframe);
 			break;
 		case 3: /* snap to nearest marker */
-			gplayer_frames_looper(gpl, scene, snap_gpf_nearmarker);
+			ED_gplayer_frames_looper(gpl, scene, snap_gpf_nearmarker);
 			break;
 		case 4: /* snap to nearest second */
-			gplayer_frames_looper(gpl, scene, snap_gpf_nearestsec);
+			ED_gplayer_frames_looper(gpl, scene, snap_gpf_nearestsec);
 			break;
 		default: /* just in case */
-			gplayer_frames_looper(gpl, scene, snap_gpf_nearest);
+			ED_gplayer_frames_looper(gpl, scene, snap_gpf_nearest);
 			break;
 	}
 }
@@ -604,21 +601,21 @@ void mirror_gplayer_frames(bGPDlayer *gpl, Scene *scene, short mode)
 {
 	switch (mode) {
 		case 1: /* mirror over current frame */
-			gplayer_frames_looper(gpl, scene, mirror_gpf_cframe);
+			ED_gplayer_frames_looper(gpl, scene, mirror_gpf_cframe);
 			break;
 		case 2: /* mirror over frame 0 */
-			gplayer_frames_looper(gpl, scene, mirror_gpf_yaxis);
+			ED_gplayer_frames_looper(gpl, scene, mirror_gpf_yaxis);
 			break;
 		case 3: /* mirror over value 0 */
-			gplayer_frames_looper(gpl, scene, mirror_gpf_xaxis);
+			ED_gplayer_frames_looper(gpl, scene, mirror_gpf_xaxis);
 			break;
 		case 4: /* mirror over marker */
 			mirror_gpf_marker(NULL, NULL);
-			gplayer_frames_looper(gpl, scene, mirror_gpf_marker);
+			ED_gplayer_frames_looper(gpl, scene, mirror_gpf_marker);
 			mirror_gpf_marker(NULL, NULL);
 			break;
 		default: /* just in case */
-			gplayer_frames_looper(gpl, scene, mirror_gpf_yaxis);
+			ED_gplayer_frames_looper(gpl, scene, mirror_gpf_yaxis);
 			break;
 	}
 }
diff --git a/source/blender/editors/gpencil/gpencil_buttons.c b/source/blender/editors/gpencil/gpencil_buttons.c
index 3a7e806c2ed..4c125ebe013 100644
--- a/source/blender/editors/gpencil/gpencil_buttons.c
+++ b/source/blender/editors/gpencil/gpencil_buttons.c
@@ -40,6 +40,7 @@
 
 #include "DNA_gpencil_types.h"
 #include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 
 #include "BKE_context.h"
 #include "BKE_global.h"
@@ -230,12 +231,30 @@ typedef enum eGP_Stroke_Ops {
 	STROKE_OPTS_V3D_ON,
 } eGP_Stroke_Ops;
 
+static void draw_gpencil_space_specials(const bContext *C, uiLayout *layout)
+{
+	uiLayout *col, *row;
+	SpaceClip *sc = CTX_wm_space_clip(C);
+
+	col = uiLayoutColumn(layout, 0);
+
+	if (sc) {
+		bScreen *screen = CTX_wm_screen(C);
+		PointerRNA sc_ptr;
+
+		RNA_pointer_create(&screen->id, &RNA_SpaceClipEditor, sc, &sc_ptr);
+		row = uiLayoutRow(col, 1);
+		uiItemR(row, &sc_ptr, "grease_pencil_source", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
+	}
+}
+
 /* Draw the contents for a grease-pencil panel*/
 static void draw_gpencil_panel(bContext *C, uiLayout *layout, bGPdata *gpd, PointerRNA *ctx_ptr)
 {
 	PointerRNA gpd_ptr;
 	bGPDlayer *gpl;
 	uiLayout *col, *row;
+	SpaceClip *sc = CTX_wm_space_clip(C);
 	short v3d_stroke_opts = STROKE_OPTS_NORMAL;
 	const short is_v3d = CTX_wm_view3d(C) != NULL;
 	
@@ -244,6 +263,7 @@ static void draw_gpencil_panel(bContext *C, uiLayout *layout, bGPdata *gpd, Poin
 	
 	/* draw gpd settings first ------------------------------------- */
 	col = uiLayoutColumn(layout, 0);
+
 	/* current Grease Pencil block */
 	/* TODO: show some info about who owns this? */
 	uiTemplateID(col, C, ctx_ptr, "grease_pencil", "GPENCIL_OT_data_add", NULL, "GPENCIL_OT_data_unlink");
@@ -281,14 +301,17 @@ static void draw_gpencil_panel(bContext *C, uiLayout *layout, bGPdata *gpd, Poin
 	row = uiLayoutRow(col, 1);
 	uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "VIEW", NULL, ICON_NONE);
 	uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "CURSOR", NULL, ICON_NONE);
-	row = uiLayoutRow(col, 1);
-	uiLayoutSetActive(row, v3d_stroke_opts);
-	uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "SURFACE", NULL, ICON_NONE);
-	uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "STROKE", NULL, ICON_NONE);
 
-	row = uiLayoutRow(col, 0);
-	uiLayoutSetActive(row, v3d_stroke_opts == STROKE_OPTS_V3D_ON);
-	uiItemR(row, &gpd_ptr, "use_stroke_endpoints", 0, NULL, ICON_NONE);
+	if (sc == NULL) {
+		row = uiLayoutRow(col, 1);
+		uiLayoutSetActive(row, v3d_stroke_opts);
+		uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "SURFACE", NULL, ICON_NONE);
+		uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "STROKE", NULL, ICON_NONE);
+
+		row = uiLayoutRow(col, 0);
+		uiLayoutSetActive(row, v3d_stroke_opts == STROKE_OPTS_V3D_ON);
+		uiItemR(row, &gpd_ptr, "use_stroke_endpoints", 0, NULL, ICON_NONE);
+	}
 }
 
 
@@ -300,6 +323,8 @@ void gpencil_panel_standard(const bContext *C, Panel *pa)
 	
 	/* if (v3d->flag2 & V3D_DISPGP)... etc. */
 	
+	draw_gpencil_space_specials(C, pa->layout);
+	
 	/* get pointer to Grease Pencil Data */
 	gpd_ptr = gpencil_data_get_pointers((bContext *)C, &ptr);
 	
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 9250d48a20c..ed530bea4bd 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -57,6 +57,7 @@
 #include "BKE_library.h"
 #include "BKE_object.h"
 #include "BKE_report.h"
+#include "BKE_tracking.h"
 
 
 #include "WM_api.h"
@@ -77,8 +78,9 @@
 /* Context Wrangling... */
 
 /* Get pointer to active Grease Pencil datablock, and an RNA-pointer to trace back to whatever owns it */
-bGPdata **gpencil_data_get_pointers(bContext *C, PointerRNA *ptr)
+bGPdata **gpencil_data_get_pointers(const bContext *C, PointerRNA *ptr)
 {
+	ID *screen_id = (ID *)CTX_wm_screen(C);
 	Scene *scene = CTX_data_scene(C);
 	ScrArea *sa = CTX_wm_area(C);
 	
@@ -121,9 +123,12 @@ bGPdata **gpencil_data_get_pointers(bContext *C, PointerRNA *ptr)
 				
 			case SPACE_SEQ: /* Sequencer */
 			{
-				//SpaceSeq *sseq= (SpaceSeq *)CTX_wm_space_data(C);
+				SpaceSeq *sseq = (SpaceSeq *)CTX_wm_space_data(C);
 				
-				/* return the GP data for the active strips/image/etc. */
+				/* for now, Grease Pencil data is associated with the space (actually preview region only) */
+				// XXX our convention for everything else is to link to data though...
+				if (ptr) RNA_pointer_create(screen_id, &RNA_SpaceSequenceEditor, sseq, ptr);
+				return &sseq->gpd;
 			}
 			break;
 				
@@ -133,7 +138,7 @@ bGPdata **gpencil_data_get_pointers(bContext *C, PointerRNA *ptr)
 				
 				/* for now, Grease Pencil data is associated with the space... */
 				// XXX our convention for everything else is to link to data though...
-				if (ptr) RNA_pointer_create((ID *)CTX_wm_screen(C), &RNA_SpaceImageEditor, sima, ptr);
+				if (ptr) RNA_pointer_create(screen_id, &RNA_SpaceImageEditor, sima, ptr);
 				return &sima->gpd;
 			}
 			break;
@@ -142,11 +147,25 @@ bGPdata **gpencil_data_get_pointers(bContext *C, PointerRNA *ptr)
 			{
 				SpaceClip *sc = (SpaceClip *)CTX_wm_space_data(C);
 				MovieClip *clip = ED_space_clip(sc);
-
+				
 				if (clip) {
-					/* for now, as long as there's a clip, default to using that in Clip Editor */
-					if (ptr) RNA_id_pointer_create(&clip->id, ptr);
-					return &clip->gpd;
+					if (sc->gpencil_src == SC_GPENCIL_SRC_TRACK) {
+						MovieTrackingTrack *track = BKE_tracking_track_get_active(&clip->tracking);
+
+						if (!track)
+							return NULL;
+
+						if (ptr)
+							RNA_pointer_create(&clip->id, &RNA_MovieTrackingTrack, track, ptr);
+
+						return &track->gpd;
+					}
+					else {
+						if (ptr)
+							RNA_id_pointer_create(&clip->id, ptr);
+
+						return &clip->gpd;
+					}
 				}
 			}
 			break;
@@ -162,7 +181,7 @@ bGPdata **gpencil_data_get_pointers(bContext *C, PointerRNA *ptr)
 }
 
 /* Get the active Grease Pencil datablock */
-bGPdata *gpencil_data_get_active(bContext *C)
+bGPdata *gpencil_data_get_active(const bContext *C)
 {
 	bGPdata **gpd_ptr = gpencil_data_get_pointers(C, NULL);
 	return (gpd_ptr) ? *(gpd_ptr) : NULL;
@@ -199,7 +218,7 @@ static int gp_data_add_exec(bContext *C, wmOperator *op)
 	else {
 		/* decrement user count and add new datablock */
 		bGPdata *gpd = (*gpd_ptr);
-
+		
 		id_us_min(&gpd->id);
 		*gpd_ptr = gpencil_data_addnew("GPencil");
 	}
@@ -464,7 +483,7 @@ static int gp_camera_view_subrect(bContext *C, rctf *subrect)
 
 	if (v3d) {
 		RegionView3D *rv3d = ar->regiondata;
-
+		
 		/* for camera view set the subrect */
 		if (rv3d->persp == RV3D_CAMOB) {
 			Scene *scene = CTX_data_scene(C);
@@ -508,26 +527,26 @@ static void gp_stroke_to_bezier(bContext *C, bGPDlayer *gpl, bGPDstroke *gps, Cu
 	/* add points */
 	for (i = 0, bezt = nu->bezt; i < tot; i++, pt++, bezt++) {
 		float h1[3], h2[3];
-
+		
 		if (i) interp_v3_v3v3(h1, p3d_cur, p3d_prev, 0.3);
 		else interp_v3_v3v3(h1, p3d_cur, p3d_next, -0.3);
-
+		
 		if (i < tot - 1) interp_v3_v3v3(h2, p3d_cur, p3d_next, 0.3);
 		else interp_v3_v3v3(h2, p3d_cur, p3d_prev, -0.3);
-
+		
 		copy_v3_v3(bezt->vec[0], h1);
 		copy_v3_v3(bezt->vec[1], p3d_cur);
 		copy_v3_v3(bezt->vec[2], h2);
-
+		
 		/* set settings */
 		bezt->h1 = bezt->h2 = HD_FREE;
 		bezt->f1 = bezt->f2 = bezt->f3 = SELECT;
 		bezt->radius = bezt->weight = pt->pressure * gpl->thickness * 0.1f;
-
+		
 		/* shift coord vects */
 		copy_v3_v3(p3d_prev, p3d_cur);
 		copy_v3_v3(p3d_cur, p3d_next);
-
+		
 		if (i + 2 < tot) {
 			gp_strokepoint_convertcoords(C, gps, pt + 2, p3d_next, subrect);
 		}
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 6ffe3f1feeb..6d90824668e 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -44,6 +44,7 @@
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_report.h"
+#include "BKE_tracking.h"
 
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
@@ -56,9 +57,12 @@
 #include "ED_screen.h"
 #include "ED_view3d.h"
 
-#include "RNA_access.h"
+#include "BIF_gl.h"
+#include "BIF_glutil.h"
 
+#include "RNA_access.h"
 #include "RNA_define.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -78,15 +82,6 @@ typedef struct tGPsdata {
 	rctf *subrect;      /* for using the camera rect within the 3d view */
 	rctf subrect_data;
 	
-	
-#if 0 // XXX review this 2d image stuff...
-	ImBuf *ibuf;        /* needed for GP_STROKE_2DIMAGE */
-	struct IBufViewSettings {
-		int offsx, offsy;           /* offsets */
-		int sizex, sizey;           /* dimensions to use as scale-factor */
-	} im2d_settings;    /* needed for GP_STROKE_2DIMAGE */
-#endif
-	
 	PointerRNA ownerPtr; /* pointer to owner of gp-datablock */
 	bGPdata *gpd;       /* gp-datablock layer comes from */
 	bGPDlayer *gpl;     /* layer we're working on */
@@ -106,8 +101,10 @@ typedef struct tGPsdata {
 
 	float imat[4][4];   /* inverted transformation matrix applying when converting coords from screen-space
 	                     * to region space */
-
-	float custom_color[4]; /* custom color for (?) */
+	
+	float custom_color[4]; /* custom color - hack for enforcing a particular color for track/mask editing */
+	
+	void *erasercursor; /* radial cursor data for drawing eraser */
 } tGPsdata;
 
 /* values for tGPsdata->status */
@@ -268,7 +265,7 @@ static void gp_stroke_convertcoords(tGPsdata *p, const int mval[2], float out[3]
 			int mval_prj[2];
 			float rvec[3], dvec[3];
 			float mval_f[2];
-
+			
 			/* Current method just converts each point in screen-coordinates to
 			 * 3D-coordinates using the 3D-cursor as reference. In general, this
 			 * works OK, but it could of course be improved.
@@ -282,7 +279,7 @@ static void gp_stroke_convertcoords(tGPsdata *p, const int mval[2], float out[3]
 			
 			/* method taken from editview.c - mouse_cursor() */
 			project_int_noclip(p->ar, rvec, mval_prj);
-
+			
 			VECSUB2D(mval_f, mval_prj, mval);
 			ED_view3d_win_to_delta(p->ar, mval_f, dvec);
 			sub_v3_v3v3(out, rvec, dvec);
@@ -295,25 +292,6 @@ static void gp_stroke_convertcoords(tGPsdata *p, const int mval[2], float out[3]
 		mul_v3_m4v3(out, p->imat, out);
 	}
 	
-#if 0
-	/* 2d - on image 'canvas' (assume that p->v2d is set) */
-	else if (gpd->sbuffer_sflag & GP_STROKE_2DIMAGE) {
-		int sizex, sizey, offsx, offsy;
-		
-		/* get stored settings 
-		 *	- assume that these have been set already (there are checks that set sane 'defaults' just in case)
-		 */
-		sizex = p->im2d_settings.sizex;
-		sizey = p->im2d_settings.sizey;
-		offsx = p->im2d_settings.offsx;
-		offsy = p->im2d_settings.offsy;
-		
-		/* calculate new points */
-		out[0] = (float)(mval[0] - offsx) / (float)sizex;
-		out[1] = (float)(mval[1] - offsy) / (float)sizey;
-	}
-#endif
-	
 	/* 2d - relative to screen (viewport area) */
 	else {
 		if (p->subrect == NULL) { /* normal 3D view */
@@ -392,11 +370,11 @@ static short gp_stroke_addpoint(tGPsdata *p, const int mval[2], float pressure)
 	else if (p->paintmode == GP_PAINTMODE_DRAW_POLY) {
 		/* get pointer to destination point */
 		pt = (tGPspoint *)(gpd->sbuffer);
-
+		
 		/* store settings */
 		copy_v2_v2_int(&pt->x, mval);
 		pt->pressure = pressure;
-
+		
 		/* if there's stroke for this poly line session add (or replace last) point
 		 * to stroke. This allows to draw lines more interactively (see new segment
 		 * during mouse slide, i.e.) 
@@ -404,36 +382,36 @@ static short gp_stroke_addpoint(tGPsdata *p, const int mval[2], float pressure)
 		if (gp_stroke_added_check(p)) {
 			bGPDstroke *gps = p->gpf->strokes.last;
 			bGPDspoint *pts;
-
+			
 			/* first time point is adding to temporary buffer -- need to allocate new point in stroke */
 			if (gpd->sbuffer_size == 0) {
 				gps->points = MEM_reallocN(gps->points, sizeof(bGPDspoint) * (gps->totpoints + 1));
 				gps->totpoints++;
 			}
-
+			
 			pts = &gps->points[gps->totpoints - 1];
-
+			
 			/* special case for poly lines: normally, depth is needed only when creating new stroke from buffer,
 			 * but poly lines are converting to stroke instantly, so initialize depth buffer before converting coordinates 
 			 */
 			if (gpencil_project_check(p)) {
 				View3D *v3d = p->sa->spacedata.first;
-
+				
 				view3d_region_operator_needs_opengl(p->win, p->ar);
 				ED_view3d_autodist_init(p->scene, p->ar, v3d, (p->gpd->flag & GP_DATA_DEPTH_STROKE) ? 1 : 0);
 			}
-
+			
 			/* convert screen-coordinates to appropriate coordinates (and store them) */
 			gp_stroke_convertcoords(p, &pt->x, &pts->x, NULL);
-
+			
 			/* copy pressure */
 			pts->pressure = pt->pressure;
 		}
-
+		
 		/* increment counters */
 		if (gpd->sbuffer_size == 0)
 			gpd->sbuffer_size++;
-
+		
 		return GP_STROKEADD_NORMAL;
 	}
 	
@@ -481,7 +459,7 @@ static void gp_stroke_smooth(tGPsdata *p)
 	/* second pass: apply smoothed coordinates */
 	for (i = 0, spc = smoothArray; i < gpd->sbuffer_size; i++, spc++) {
 		tGPspoint *pc = (((tGPspoint *)gpd->sbuffer) + i);
-
+		
 		copy_v2_v2_int(&pc->x, &spc->x);
 	}
 	
@@ -525,7 +503,7 @@ static void gp_stroke_simplify(tGPsdata *p)
 		co[0] += (float)(old_points[offs].x * sfac); \
 		co[1] += (float)(old_points[offs].y * sfac); \
 		pressure += old_points[offs].pressure * sfac; \
-	}
+	} (void)0
 	
 	for (i = 0, j = 0; i < num_points; i++) {
 		if (i - j == 3) {
@@ -638,10 +616,10 @@ static void gp_stroke_newfrombuffer(tGPsdata *p)
 	else if (p->paintmode == GP_PAINTMODE_DRAW_POLY) {
 		/* first point */
 		ptc = gpd->sbuffer;
-
+		
 		/* convert screen-coordinates to appropriate coordinates (and store them) */
 		gp_stroke_convertcoords(p, &ptc->x, &pt->x, NULL);
-
+		
 		/* copy pressure */
 		pt->pressure = ptc->pressure;
 	}
@@ -655,10 +633,10 @@ static void gp_stroke_newfrombuffer(tGPsdata *p)
 			int found_depth = 0;
 			
 			depth_arr = MEM_mallocN(sizeof(float) * gpd->sbuffer_size, "depth_points");
-
+			
 			for (i = 0, ptc = gpd->sbuffer; i < gpd->sbuffer_size; i++, ptc++, pt++) {
 				copy_v2_v2_int(mval, &ptc->x);
-
+				
 				if ((ED_view3d_autodist_depth(p->ar, mval, depth_margin, depth_arr + i) == 0) &&
 				    (i && (ED_view3d_autodist_depth_seg(p->ar, mval, mval_prev, depth_margin + 1, depth_arr + i) == 0)))
 				{
@@ -667,7 +645,7 @@ static void gp_stroke_newfrombuffer(tGPsdata *p)
 				else {
 					found_depth = TRUE;
 				}
-
+				
 				copy_v2_v2_int(mval_prev, mval);
 			}
 			
@@ -834,21 +812,6 @@ static void gp_stroke_eraser_dostroke(tGPsdata *p, int mval[], int mvalo[], shor
 		else if (gps->flag & GP_STROKE_2DSPACE) {			
 			UI_view2d_view_to_region(p->v2d, gps->points->x, gps->points->y, &x0, &y0);
 		}
-#if 0
-		else if (gps->flag & GP_STROKE_2DIMAGE) {			
-			int offsx, offsy, sizex, sizey;
-			
-			/* get stored settings */
-			sizex = p->im2d_settings.sizex;
-			sizey = p->im2d_settings.sizey;
-			offsx = p->im2d_settings.offsx;
-			offsy = p->im2d_settings.offsy;
-			
-			/* calculate new points */
-			x0 = (int)((gps->points->x * sizex) + offsx);
-			y0 = (int)((gps->points->y * sizey) + offsy);
-		}
-#endif
 		else {
 			if (p->subrect == NULL) { /* normal 3D view */
 				x0 = (int)(gps->points->x / 100 * p->ar->winx);
@@ -894,24 +857,6 @@ static void gp_stroke_eraser_dostroke(tGPsdata *p, int mval[], int mvalo[], shor
 				
 				UI_view2d_view_to_region(p->v2d, pt2->x, pt2->y, &x1, &y1);
 			}
-#if 0
-			else if (gps->flag & GP_STROKE_2DIMAGE) {
-				int offsx, offsy, sizex, sizey;
-				
-				/* get stored settings */
-				sizex = p->im2d_settings.sizex;
-				sizey = p->im2d_settings.sizey;
-				offsx = p->im2d_settings.offsx;
-				offsy = p->im2d_settings.offsy;
-				
-				/* calculate new points */
-				x0 = (int)((pt1->x * sizex) + offsx);
-				y0 = (int)((pt1->y * sizey) + offsy);
-				
-				x1 = (int)((pt2->x * sizex) + offsx);
-				y1 = (int)((pt2->y * sizey) + offsy);
-			}
-#endif
 			else {
 				if (p->subrect == NULL) { /* normal 3D view */
 					x0 = (int)(pt1->x / 100 * p->ar->winx);
@@ -1028,16 +973,6 @@ static int gp_session_initdata(bContext *C, tGPsdata *p)
 					printf("Error: 3D-View active region doesn't have any region data, so cannot be drawable\n");
 				return 0;
 			}
-
-#if 0 // XXX will this sort of antiquated stuff be restored?
-			/* check that gpencil data is allowed to be drawn */
-			if ((v3d->flag2 & V3D_DISPGP) == 0) {
-				p->status = GP_STATUS_ERROR;
-				if (G.debug & G_DEBUG)
-					printf("Error: In active view, Grease Pencil not shown\n");
-				return 0;
-			}
-#endif
 		}
 		break;
 
@@ -1049,19 +984,8 @@ static int gp_session_initdata(bContext *C, tGPsdata *p)
 			p->sa = curarea;
 			p->ar = ar;
 			p->v2d = &ar->v2d;
-			
-#if 0 // XXX will this sort of antiquated stuff be restored?
-			/* check that gpencil data is allowed to be drawn */
-			if ((snode->flag & SNODE_DISPGP) == 0) {
-				p->status = GP_STATUS_ERROR;
-				if (G.debug & G_DEBUG)
-					printf("Error: In active view, Grease Pencil not shown\n");
-				return 0;
-			}
-#endif
 		}
 		break;
-#if 0 // XXX these other spaces will come over time...
 		case SPACE_SEQ:
 		{
 			SpaceSeq *sseq = curarea->spacedata.first;
@@ -1078,15 +1002,8 @@ static int gp_session_initdata(bContext *C, tGPsdata *p)
 					printf("Error: In active view (sequencer), active mode doesn't support Grease Pencil\n");
 				return 0;
 			}
-			if ((sseq->flag & SEQ_DRAW_GPENCIL) == 0) {
-				p->status = GP_STATUS_ERROR;
-				if (G.debug & G_DEBUG)
-					printf("Error: In active view, Grease Pencil not shown\n");
-				return 0;
-			}
 		}
 		break;
-#endif
 		case SPACE_IMAGE:
 		{
 			//SpaceImage *sima= curarea->spacedata.first;
@@ -1095,39 +1012,36 @@ static int gp_session_initdata(bContext *C, tGPsdata *p)
 			p->sa = curarea;
 			p->ar = ar;
 			p->v2d = &ar->v2d;
-			//p->ibuf= BKE_image_get_ibuf(sima->image, &sima->iuser);
-			
-#if 0 // XXX disabled for now
-			/* check that gpencil data is allowed to be drawn */
-			if ((sima->flag & SI_DISPGP) == 0) {
-				p->status = GP_STATUS_ERROR;
-				if (G.debug & G_DEBUG)
-					printf("Error: In active view, Grease Pencil not shown\n");
-				return 0;
-			}
-#endif
 		}
 		break;
 		case SPACE_CLIP:
 		{
 			SpaceClip *sc = curarea->spacedata.first;
-
+			
 			/* set the current area */
 			p->sa = curarea;
 			p->ar = ar;
 			p->v2d = &ar->v2d;
-			//p->ibuf= BKE_image_get_ibuf(sima->image, &sima->iuser);
-
+			
 			invert_m4_m4(p->imat, sc->unistabmat);
-
+			
 			/* custom color for new layer */
 			p->custom_color[0] = 1.0f;
 			p->custom_color[1] = 0.0f;
 			p->custom_color[2] = 0.5f;
 			p->custom_color[3] = 0.9f;
+			
+			if (sc->gpencil_src == SC_GPENCIL_SRC_TRACK) {
+				int framenr = sc->user.framenr;
+				MovieTrackingTrack *track = BKE_tracking_track_get_active(&sc->clip->tracking);
+				MovieTrackingMarker *marker = BKE_tracking_marker_get_exact(track, framenr);
+				
+				p->imat[3][0] -= marker->pos[0];
+				p->imat[3][1] -= marker->pos[1];
+			}
 		}
 		break;
-
+		
 		/* unsupported views */
 		default:
 		{
@@ -1163,12 +1077,6 @@ static int gp_session_initdata(bContext *C, tGPsdata *p)
 	/* clear out buffer (stored in gp-data), in case something contaminated it */
 	gp_session_validatebuffer(p);
 	
-#if 0
-	/* set 'default' im2d_settings just in case something that uses this doesn't set it */
-	p->im2d_settings.sizex = 1;
-	p->im2d_settings.sizey = 1;
-#endif
-
 	return 1;
 }
 
@@ -1214,7 +1122,7 @@ static void gp_paint_initstroke(tGPsdata *p, short paintmode)
 	p->gpl = gpencil_layer_getactive(p->gpd);
 	if (p->gpl == NULL) {
 		p->gpl = gpencil_layer_addnew(p->gpd);
-
+		
 		if (p->custom_color[3])
 			copy_v3_v3(p->gpl->color, p->custom_color);
 	}
@@ -1250,7 +1158,7 @@ static void gp_paint_initstroke(tGPsdata *p, short paintmode)
 		if (p->sa->spacetype == SPACE_VIEW3D) {
 			View3D *v3d = p->sa->spacedata.first;
 			RegionView3D *rv3d = p->ar->regiondata;
-
+			
 			/* for camera view set the subrect */
 			if (rv3d->persp == RV3D_CAMOB) {
 				ED_view3d_calc_camera_border(p->scene, p->ar, v3d, rv3d, &p->subrect_data, TRUE); /* no shift */
@@ -1280,41 +1188,13 @@ static void gp_paint_initstroke(tGPsdata *p, short paintmode)
 				p->gpd->sbuffer_sflag |= GP_STROKE_2DSPACE;
 			}
 			break;
-#if 0 // XXX other spacetypes to be restored in due course
+			
 			case SPACE_SEQ:
 			{
-				SpaceSeq *sseq = (SpaceSeq *)p->sa->spacedata.first;
-				int rectx, recty;
-				float zoom, zoomx, zoomy;
-				
-				/* set draw 2d-stroke flag */
-				p->gpd->sbuffer_sflag |= GP_STROKE_2DIMAGE;
-				
-				/* calculate zoom factor */
-				zoom = (float)(SEQ_ZOOM_FAC(sseq->zoom));
-				if (sseq->mainb == SEQ_DRAW_IMG_IMBUF) {
-					zoomx = zoom * (p->scene->r.xasp / p->scene->r.yasp);
-					zoomy = zoom;
-				} 
-				else
-					zoomx = zoomy = zoom;
-				
-				/* calculate rect size to use to calculate the size of the drawing area
-				 *	- We use the size of the output image not the size of the ibuf being shown
-				 *	  as it is too messy getting the ibuf (and could be too slow). This should be
-				 *	  a reasonable for most cases anyway.
-				 */
-				rectx = (p->scene->r.size * p->scene->r.xsch) / 100;
-				recty = (p->scene->r.size * p->scene->r.ysch) / 100;
-				
-				/* set offset and scale values for opertations to use */
-				p->im2d_settings.sizex = (int)(zoomx * rectx);
-				p->im2d_settings.sizey = (int)(zoomy * recty);
-				p->im2d_settings.offsx = (int)((p->sa->winx - p->im2d_settings.sizex) / 2 + sseq->xof);
-				p->im2d_settings.offsy = (int)((p->sa->winy - p->im2d_settings.sizey) / 2 + sseq->yof);
+				p->gpd->sbuffer_sflag |= GP_STROKE_2DSPACE;
 			}
 			break;
-#endif
+			
 			case SPACE_IMAGE:
 			{
 				SpaceImage *sima = (SpaceImage *)p->sa->spacedata.first;
@@ -1390,6 +1270,49 @@ static void gp_paint_cleanup(tGPsdata *p)
 
 /* ------------------------------- */
 
+/* Helper callback for drawing the cursor itself */
+static void gpencil_draw_eraser(bContext *UNUSED(C), int x, int y, void *p_ptr)
+{
+	tGPsdata *p = (tGPsdata *)p_ptr;
+	
+	if (p->paintmode == GP_PAINTMODE_ERASER) {
+		glPushMatrix();
+		
+		glTranslatef((float)x, (float)y, 0.0f);
+		
+		glColor4ub(255, 255, 255, 128);
+		
+		glEnable(GL_LINE_SMOOTH);
+		glEnable(GL_BLEND);
+		
+		glutil_draw_lined_arc(0.0, M_PI * 2.0, p->radius, 40);
+		
+		glDisable(GL_BLEND);
+		glDisable(GL_LINE_SMOOTH);
+		
+		glPopMatrix();
+	}
+}
+
+/* Turn brush cursor in 3D view on/off */
+static void gpencil_draw_toggle_eraser_cursor(bContext *C, tGPsdata *p, short enable)
+{
+	if (p->erasercursor && !enable) {
+		/* clear cursor */
+		WM_paint_cursor_end(CTX_wm_manager(C), p->erasercursor);
+		p->erasercursor = NULL;
+	}
+	else if (enable) {
+		/* enable cursor */
+		p->erasercursor = WM_paint_cursor_activate(CTX_wm_manager(C), 
+		                                           NULL, // XXX
+		                                           gpencil_draw_eraser, p);
+	}
+}
+
+/* ------------------------------- */
+
+
 static void gpencil_draw_exit(bContext *C, wmOperator *op)
 {
 	tGPsdata *p = op->customdata;
@@ -1404,8 +1327,12 @@ static void gpencil_draw_exit(bContext *C, wmOperator *op)
 	if (p) {
 		/* check size of buffer before cleanup, to determine if anything happened here */
 		if (p->paintmode == GP_PAINTMODE_ERASER) {
-			// TODO clear radial cursor thing
-			// XXX draw_sel_circle(NULL, p.mvalo, 0, p.radius, 0);
+			/* turn off radial brush cursor */
+			gpencil_draw_toggle_eraser_cursor(C, p, FALSE);
+			
+			/* if successful, store the new eraser size to be used again next time */
+			if (p->status == GP_STATUS_DONE)
+				U.gp_eraser = p->radius;
 		}
 		
 		/* cleanup */
@@ -1456,6 +1383,7 @@ static int gpencil_draw_init(bContext *C, wmOperator *op)
 	return 1;
 }
 
+
 /* ------------------------------- */
 
 /* update UI indicators of status, including cursor and header prints */
@@ -1550,8 +1478,9 @@ static void gpencil_draw_apply_event(wmOperator *op, wmEvent *event)
 	float mousef[2];
 	int tablet = 0;
 
-	/* convert from window-space to area-space mouse coordintes */
-	// NOTE: float to ints conversions, +1 factor is probably used to ensure a bit more accurate rounding...
+	/* convert from window-space to area-space mouse coordintes 
+	 * NOTE: float to ints conversions, +1 factor is probably used to ensure a bit more accurate rounding... 
+	 */
 	p->mval[0] = event->mval[0] + 1;
 	p->mval[1] = event->mval[1] + 1;
 
@@ -1700,7 +1629,7 @@ static int gpencil_draw_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	
 	/* if eraser is on, draw radial aid */
 	if (p->paintmode == GP_PAINTMODE_ERASER) {
-		// TODO: this involves mucking around with radial control, so we leave this for now..
+		gpencil_draw_toggle_eraser_cursor(C, p, TRUE);
 	}
 	
 	/* set cursor */
@@ -1733,13 +1662,13 @@ static int gpencil_draw_invoke(bContext *C, wmOperator *op, wmEvent *event)
 }
 
 /* gpencil modal operator stores area, which can be removed while using it (like fullscreen) */
-static int gpencil_area_exists(bContext *C, ScrArea *satest)
+static int gpencil_area_exists(bContext *C, ScrArea *sa_test)
 {
 	bScreen *sc = CTX_wm_screen(C);
 	ScrArea *sa;
 	
 	for (sa = sc->areabase.first; sa; sa = sa->next) {
-		if (sa == satest)
+		if (sa == sa_test)
 			return 1;
 	}
 	
@@ -1829,7 +1758,7 @@ static int gpencil_draw_modal(bContext *C, wmOperator *op, wmEvent *event)
 			sketch |= GPENCIL_SKETCH_SESSIONS_ON(p->scene);
 			/* polyline drawing is also 'sketching' -- all knots should be added during one session */
 			sketch |= p->paintmode == GP_PAINTMODE_DRAW_POLY;
-
+			
 			if (sketch) {
 				/* end stroke only, and then wait to resume painting soon */
 				//printf("\t\tGP - end stroke only\n");
@@ -1837,7 +1766,7 @@ static int gpencil_draw_modal(bContext *C, wmOperator *op, wmEvent *event)
 				
 				/* we've just entered idling state, so this event was processed (but no others yet) */
 				estate = OPERATOR_RUNNING_MODAL;
-
+				
 				/* stroke could be smoothed, send notifier to refresh screen */
 				WM_event_add_notifier(C, NC_SCREEN | ND_GPENCIL | NA_EDITED, NULL);
 			}
@@ -1850,7 +1779,7 @@ static int gpencil_draw_modal(bContext *C, wmOperator *op, wmEvent *event)
 		else if (event->val == KM_PRESS) {
 			/* not painting, so start stroke (this should be mouse-button down) */
 			p = gpencil_stroke_begin(C, op);
-
+			
 			if (p->status == GP_STATUS_ERROR) {
 				estate = OPERATOR_CANCELLED;
 			}
@@ -1879,8 +1808,37 @@ static int gpencil_draw_modal(bContext *C, wmOperator *op, wmEvent *event)
 				estate = OPERATOR_RUNNING_MODAL;
 			}
 		}
+		/* eraser size */
+		else if ((p->paintmode == GP_PAINTMODE_ERASER) &&
+		         ELEM4(event->type, WHEELUPMOUSE, WHEELDOWNMOUSE, PADPLUSKEY, PADMINUS))
+		{
+			/* just resize the brush (local version)
+			 * TODO: fix the hardcoded size jumps (set to make a visible difference) and hardcoded keys
+			 */
+			//printf("\t\tGP - resize eraser\n");
+			switch (event->type) {
+				case WHEELUPMOUSE: /* larger */
+				case PADPLUSKEY:
+					p->radius += 5;
+					break;
+					
+				case WHEELDOWNMOUSE: /* smaller */
+				case PADMINUS:
+					p->radius -= 5;
+					
+					if (p->radius < 0) 
+						p->radius = 0;
+					break;
+			}
+			
+			/* force refresh */
+			ED_region_tag_redraw(p->ar); /* just active area for now, since doing whole screen is too slow */
+			
+			/* event handled, so just tag as running modal */
+			estate = OPERATOR_RUNNING_MODAL;
+		}
 		/* there shouldn't be any other events, but just in case there are, let's swallow them 
-		 * (i.e. to prevent problems with with undo)
+		 * (i.e. to prevent problems with undo)
 		 */
 		else {
 			/* swallow event to save ourselves trouble */
@@ -1906,7 +1864,7 @@ static int gpencil_draw_modal(bContext *C, wmOperator *op, wmEvent *event)
 		case OPERATOR_CANCELLED:
 			gpencil_draw_exit(C, op);
 			break;
-
+		
 		case OPERATOR_RUNNING_MODAL | OPERATOR_PASS_THROUGH:
 			/* event doesn't need to be handled */
 			//printf("unhandled event -> %d (mmb? = %d | mmv? = %d)\n", event->type, event->type == MIDDLEMOUSE, event->type==MOUSEMOVE);
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h
index f4d922dba3c..24aa88a36bd 100644
--- a/source/blender/editors/include/ED_anim_api.h
+++ b/source/blender/editors/include/ED_anim_api.h
@@ -89,15 +89,16 @@ typedef struct bAnimContext {
 
 /* Main Data container types */
 typedef enum eAnimCont_Types {
-	ANIMCONT_NONE = 0,      /* invalid or no data */
-	ANIMCONT_ACTION,        /* action (bAction) */
-	ANIMCONT_SHAPEKEY,      /* shapekey (Key) */
-	ANIMCONT_GPENCIL,       /* grease pencil (screen) */
-	ANIMCONT_DOPESHEET,     /* dopesheet (bDopesheet) */
-	ANIMCONT_FCURVES,       /* animation F-Curves (bDopesheet) */
-	ANIMCONT_DRIVERS,       /* drivers (bDopesheet) */
-	ANIMCONT_NLA,           /* nla (bDopesheet) */
-	ANIMCONT_CHANNEL        /* animation channel (bAnimListElem) */
+	ANIMCONT_NONE      = 0, /* invalid or no data */
+	ANIMCONT_ACTION    = 1, /* action (bAction) */
+	ANIMCONT_SHAPEKEY  = 2, /* shapekey (Key) */
+	ANIMCONT_GPENCIL   = 3, /* grease pencil (screen) */
+	ANIMCONT_DOPESHEET = 4, /* dopesheet (bDopesheet) */
+	ANIMCONT_FCURVES   = 5, /* animation F-Curves (bDopesheet) */
+	ANIMCONT_DRIVERS   = 6, /* drivers (bDopesheet) */
+	ANIMCONT_NLA       = 7, /* nla (bDopesheet) */
+	ANIMCONT_CHANNEL   = 8, /* animation channel (bAnimListElem) */
+	ANIMCONT_MASK      = 9  /* mask dopesheet */
 } eAnimCont_Types;
 
 /* --------------- Channels -------------------- */
@@ -160,6 +161,9 @@ typedef enum eAnim_ChannelType {
 	
 	ANIMTYPE_GPDATABLOCK,
 	ANIMTYPE_GPLAYER,
+
+	ANIMTYPE_MASKDATABLOCK,
+	ANIMTYPE_MASKLAYER,
 	
 	ANIMTYPE_NLATRACK,
 	ANIMTYPE_NLAACTION,
@@ -173,6 +177,7 @@ typedef enum eAnim_KeyType {
 	ALE_NONE = 0,       /* no keyframe data */
 	ALE_FCURVE,         /* F-Curve */
 	ALE_GPFRAME,        /* Grease Pencil Frames */
+	ALE_MASKLAY,           /* Mask */
 	ALE_NLASTRIP,       /* NLA Strips */
 
 	ALE_ALL,            /* All channels summary */
@@ -279,6 +284,15 @@ typedef enum eAnimFilter_Flags {
 #define EDITABLE_GPL(gpl) ((gpl->flag & GP_LAYER_LOCKED) == 0)
 #define SEL_GPL(gpl) (gpl->flag & GP_LAYER_SELECT)
 
+/* Mask Only */
+/* Grease Pencil datablock settings */
+#define EXPANDED_MASK(mask) (mask->flag & MASK_ANIMF_EXPAND)
+/* Grease Pencil Layer settings */
+#define EDITABLE_MASK(masklay) ((masklay->flag & MASK_LAYERFLAG_LOCKED) == 0)
+#define SEL_MASKLAY(masklay) (masklay->flag & SELECT)
+
+
+
 /* NLA only */
 #define SEL_NLT(nlt) (nlt->flag & NLATRACK_SELECTED)
 #define EDITABLE_NLT(nlt) ((nlt->flag & NLATRACK_PROTECTED) == 0)
@@ -341,20 +355,20 @@ short ANIM_animdata_context_getdata(bAnimContext *ac);
 
 /* flag-setting behavior */
 typedef enum eAnimChannels_SetFlag {
-	ACHANNEL_SETFLAG_CLEAR = 0,     /* turn off */
-	ACHANNEL_SETFLAG_ADD,           /* turn on */
-	ACHANNEL_SETFLAG_INVERT,        /* on->off, off->on */
-	ACHANNEL_SETFLAG_TOGGLE         /* some on -> all off // all on */
+	ACHANNEL_SETFLAG_CLEAR  = 0,     /* turn off */
+	ACHANNEL_SETFLAG_ADD    = 1,     /* turn on */
+	ACHANNEL_SETFLAG_INVERT = 2,     /* on->off, off->on */
+	ACHANNEL_SETFLAG_TOGGLE = 3      /* some on -> all off // all on */
 } eAnimChannels_SetFlag;
 
 /* types of settings for AnimChannels */
 typedef enum eAnimChannel_Settings {
-	ACHANNEL_SETTING_SELECT = 0,
-	ACHANNEL_SETTING_PROTECT,           // warning: for drawing UI's, need to check if this is off (maybe inverse this later)
-	ACHANNEL_SETTING_MUTE,
-	ACHANNEL_SETTING_EXPAND,
-	ACHANNEL_SETTING_VISIBLE,           /* only for Graph Editor */
-	ACHANNEL_SETTING_SOLO               /* only for NLA Tracks */
+	ACHANNEL_SETTING_SELECT   = 0,
+	ACHANNEL_SETTING_PROTECT  = 1, /* warning: for drawing UI's, need to check if this is off (maybe inverse this later) */
+	ACHANNEL_SETTING_MUTE     = 2,
+	ACHANNEL_SETTING_EXPAND   = 3,
+	ACHANNEL_SETTING_VISIBLE  = 4,  /* only for Graph Editor */
+	ACHANNEL_SETTING_SOLO     = 5   /* only for NLA Tracks */
 } eAnimChannel_Settings;
 
 
@@ -509,7 +523,7 @@ short ANIM_fmodifiers_paste_from_buf(ListBase *modifiers, short replace);
 int getname_anim_fcurve(char *name, struct ID *id, struct FCurve *fcu);
 
 /* Automatically determine a color for the nth F-Curve */
-void getcolor_fcurve_rainbow(int cur, int tot, float *out);
+void getcolor_fcurve_rainbow(int cur, int tot, float out[3]);
 
 /* ----------------- NLA-Mapping ----------------------- */
 /* anim_draw.c */
diff --git a/source/blender/editors/include/ED_clip.h b/source/blender/editors/include/ED_clip.h
index 7943a17c377..649266beec7 100644
--- a/source/blender/editors/include/ED_clip.h
+++ b/source/blender/editors/include/ED_clip.h
@@ -36,6 +36,7 @@ struct bContext;
 struct bScreen;
 struct ImBuf;
 struct Main;
+struct Mask;
 struct MovieClip;
 struct SpaceClip;
 struct wmEvent;
@@ -46,14 +47,21 @@ int ED_space_clip_poll(struct bContext *C);
 int ED_space_clip_view_clip_poll(struct bContext *C);
 
 int ED_space_clip_tracking_poll(struct bContext *C);
-int ED_space_clip_tracking_size_poll(struct bContext *C);
-int ED_space_clip_tracking_frame_poll(struct bContext *C);
+int ED_space_clip_maskedit_poll(struct bContext *C);
+int ED_space_clip_maskedit_mask_poll(bContext *C);
 
 void ED_space_clip_set(struct bContext *C, struct bScreen *screen, struct SpaceClip *sc, struct MovieClip *clip);
 struct MovieClip *ED_space_clip(struct SpaceClip *sc);
+struct Mask *ED_space_clip_mask(struct SpaceClip *sc);
 void ED_space_clip_size(struct SpaceClip *sc, int *width, int *height);
 void ED_space_clip_zoom(struct SpaceClip *sc, ARegion *ar, float *zoomx, float *zoomy);
 void ED_space_clip_aspect(struct SpaceClip *sc, float *aspx, float *aspy);
+void ED_space_clip_aspect_dimension_aware(struct SpaceClip *sc, float *aspx, float *aspy);
+
+int ED_space_clip_clip_framenr(struct SpaceClip *sc);
+
+void ED_space_clip_mask_size(struct SpaceClip *sc, int *width, int *height);
+void ED_space_clip_mask_aspect(struct SpaceClip *sc, float *aspx, float *aspy);
 
 struct ImBuf *ED_space_clip_get_buffer(struct SpaceClip *sc);
 struct ImBuf *ED_space_clip_get_stable_buffer(struct SpaceClip *sc, float loc[2], float *scale, float *angle);
@@ -61,9 +69,9 @@ struct ImBuf *ED_space_clip_get_stable_buffer(struct SpaceClip *sc, float loc[2]
 void ED_clip_update_frame(const struct Main *mainp, int cfra);
 int ED_clip_view_selection(struct SpaceClip *sc, struct ARegion *ar, int fit);
 
-void ED_clip_point_undistorted_pos(SpaceClip * sc, float co[2], float nco[2]);
+void ED_clip_point_undistorted_pos(SpaceClip * sc, const float co[2], float r_co[2]);
 void ED_clip_point_stable_pos(struct bContext *C, float x, float y, float *xr, float *yr);
-void ED_clip_point_stable_pos__reverse(SpaceClip * sc, ARegion *ar, float co[2], float nco[2]);
+void ED_clip_point_stable_pos__reverse(SpaceClip * sc, ARegion *ar, const float co[2], float r_co[2]);
 void ED_clip_mouse_pos(struct bContext *C, struct wmEvent *event, float co[2]);
 
 int ED_space_clip_texture_buffer_supported(struct SpaceClip *sc);
@@ -72,6 +80,8 @@ void ED_space_clip_unload_movieclip_buffer(struct SpaceClip *sc);
 void ED_space_clip_free_texture_buffer(struct SpaceClip *sc);
 
 int ED_space_clip_show_trackedit(struct SpaceClip *sc);
+int ED_space_clip_show_maskedit(struct SpaceClip *sc);
+void ED_space_clip_set_mask(struct bContext *C, struct SpaceClip *sc, struct Mask *mask);
 
 /* clip_ops.c */
 void ED_operatormacros_clip(void);
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index bd3e4371a79..1d461f797d6 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -64,8 +64,8 @@ typedef struct tGPspoint {
 
 /* ----------- Grease Pencil Tools/Context ------------- */
 
-struct bGPdata **gpencil_data_get_pointers(struct bContext *C, struct PointerRNA *ptr);
-struct bGPdata *gpencil_data_get_active(struct bContext *C);
+struct bGPdata **gpencil_data_get_pointers(const struct bContext *C, struct PointerRNA *ptr);
+struct bGPdata *gpencil_data_get_active(const struct bContext *C);
 struct bGPdata *gpencil_data_get_active_v3d(struct Scene *scene); /* for offscreen rendering */
 
 /* ----------- Grease Pencil Operators ----------------- */
@@ -76,31 +76,34 @@ void ED_operatortypes_gpencil(void);
 /* ------------ Grease-Pencil Drawing API ------------------ */
 /* drawgpencil.c */
 
-void draw_gpencil_2dimage(struct bContext *C, struct ImBuf *ibuf);
-void draw_gpencil_view2d(struct bContext *C, short onlyv2d);
+void draw_gpencil_2dimage(const struct bContext *C);
+void draw_gpencil_view2d(const struct bContext *C, short onlyv2d);
 void draw_gpencil_view3d(struct Scene *scene, struct View3D *v3d, struct ARegion *ar, short only3d);
 
 void gpencil_panel_standard(const struct bContext *C, struct Panel *pa);
 
 /* ----------- Grease-Pencil AnimEdit API ------------------ */
-short gplayer_frames_looper(struct bGPDlayer *gpl, struct Scene *scene, short (*gpf_cb)(struct bGPDframe *, struct Scene *));
-void gplayer_make_cfra_list(struct bGPDlayer *gpl, ListBase *elems, short onlysel);
+short ED_gplayer_frames_looper(struct bGPDlayer *gpl, struct Scene *scene,
+                               short (*gpf_cb)(struct bGPDframe *, struct Scene *));
+void ED_gplayer_make_cfra_list(struct bGPDlayer *gpl, ListBase *elems, short onlysel);
 
-short is_gplayer_frame_selected(struct bGPDlayer *gpl);
-void set_gplayer_frame_selection(struct bGPDlayer *gpl, short mode);
-void select_gpencil_frames(struct bGPDlayer *gpl, short select_mode);
-void select_gpencil_frame(struct bGPDlayer *gpl, int selx, short select_mode);
-void borderselect_gplayer_frames(struct bGPDlayer *gpl, float min, float max, short select_mode);
+short ED_gplayer_frame_select_check(struct bGPDlayer *gpl);
+void  ED_gplayer_frame_select_set(struct bGPDlayer *gpl, short mode);
+void  ED_gplayer_frames_select_border(struct bGPDlayer *gpl, float min, float max, short select_mode);
+void  ED_gpencil_select_frames(struct bGPDlayer *gpl, short select_mode);
+void  ED_gpencil_select_frame(struct bGPDlayer *gpl, int selx, short select_mode);
 
-void delete_gplayer_frames(struct bGPDlayer *gpl);
-void duplicate_gplayer_frames(struct bGPDlayer *gpd);
+void  ED_gplayer_frames_delete(struct bGPDlayer *gpl);
+void  ED_gplayer_frames_duplicate(struct bGPDlayer *gpl);
 
+#if 0
 void free_gpcopybuf(void);
 void copy_gpdata(void);
 void paste_gpdata(void);
 
 void snap_gplayer_frames(struct bGPDlayer *gpl, short mode);
 void mirror_gplayer_frames(struct bGPDlayer *gpl, short mode);
+#endif
 
 /* ------------ Grease-Pencil Undo System ------------------ */
 int ED_gpencil_session_active(void);
diff --git a/source/blender/editors/include/ED_keyframes_draw.h b/source/blender/editors/include/ED_keyframes_draw.h
index cd64427de78..8a65699f404 100644
--- a/source/blender/editors/include/ED_keyframes_draw.h
+++ b/source/blender/editors/include/ED_keyframes_draw.h
@@ -42,6 +42,7 @@ struct bActionGroup;
 struct Object;
 struct ListBase;
 struct bGPDlayer;
+struct MaskLayer;
 struct Scene;
 struct View2D;
 struct DLRBT_Tree;
@@ -122,6 +123,8 @@ void draw_summary_channel(struct View2D *v2d, struct bAnimContext *ac, float ypo
 /* Grease Pencil Layer */ 
 // XXX not restored 
 void draw_gpl_channel(struct View2D *v2d, struct bDopeSheet *ads, struct bGPDlayer *gpl, float ypos);
+/* Mask Layer */
+void draw_masklay_channel(struct View2D *v2d, struct bDopeSheet *ads, struct MaskLayer *masklay, float ypos);
 
 /* Keydata Generation --------------- */
 /* F-Curve */
@@ -139,6 +142,9 @@ void summary_to_keylist(struct bAnimContext *ac, struct DLRBT_Tree *keys, struct
 /* Grease Pencil Layer */
 // XXX not restored
 void gpl_to_keylist(struct bDopeSheet *ads, struct bGPDlayer *gpl, struct DLRBT_Tree *keys);
+/* Mask */
+// XXX not restored
+void mask_to_keylist(struct bDopeSheet *UNUSED(ads), struct MaskLayer *masklay, struct DLRBT_Tree *keys);
 
 /* ActKeyColumn API ---------------- */
 /* Comparator callback used for ActKeyColumns and cframe float-value pointer */
diff --git a/source/blender/editors/include/ED_keyframes_edit.h b/source/blender/editors/include/ED_keyframes_edit.h
index bdb70696742..3020fe6985a 100644
--- a/source/blender/editors/include/ED_keyframes_edit.h
+++ b/source/blender/editors/include/ED_keyframes_edit.h
@@ -43,9 +43,9 @@ struct Scene;
 
 /* --------- BezTriple Selection ------------- */
 
-#define BEZ_SEL(bezt)       { (bezt)->f1 |=  SELECT; (bezt)->f2 |=  SELECT; (bezt)->f3 |=  SELECT; }
-#define BEZ_DESEL(bezt)     { (bezt)->f1 &= ~SELECT; (bezt)->f2 &= ~SELECT; (bezt)->f3 &= ~SELECT; }
-#define BEZ_INVSEL(bezt)    { (bezt)->f1 ^=  SELECT; (bezt)->f2 ^=  SELECT; (bezt)->f3 ^=  SELECT; }
+#define BEZ_SEL(bezt)    { (bezt)->f1 |=  SELECT; (bezt)->f2 |=  SELECT; (bezt)->f3 |=  SELECT; } (void)0
+#define BEZ_DESEL(bezt)  { (bezt)->f1 &= ~SELECT; (bezt)->f2 &= ~SELECT; (bezt)->f3 &= ~SELECT; } (void)0
+#define BEZ_INVSEL(bezt) { (bezt)->f1 ^=  SELECT; (bezt)->f2 ^=  SELECT; (bezt)->f3 ^=  SELECT; } (void)0
 
 /* --------- Tool Flags ------------ */
 
diff --git a/source/blender/editors/include/ED_keyframing.h b/source/blender/editors/include/ED_keyframing.h
index be5ad5b0c70..95fad17274e 100644
--- a/source/blender/editors/include/ED_keyframing.h
+++ b/source/blender/editors/include/ED_keyframing.h
@@ -75,7 +75,8 @@ struct bAction *verify_adt_action(struct ID *id, short add);
 /* Get (or add relevant data to be able to do so) F-Curve from the given Action. 
  * This assumes that all the destinations are valid.
  */
-struct FCurve *verify_fcurve(struct bAction *act, const char group[], const char rna_path[], const int array_index, short add);
+struct FCurve *verify_fcurve(struct bAction *act, const char group[], struct PointerRNA *ptr,
+                             const char rna_path[], const int array_index, short add);
 
 /* -------- */
 
diff --git a/source/blender/editors/include/ED_mask.h b/source/blender/editors/include/ED_mask.h
new file mode 100644
index 00000000000..773da04bc7b
--- /dev/null
+++ b/source/blender/editors/include/ED_mask.h
@@ -0,0 +1,74 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2012 Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): Blender Foundation,
+ *                 Sergey Sharybin
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file ED_mask.h
+ *  \ingroup editors
+ */
+
+#ifndef __ED_MASK_H__
+#define __ED_MASK_H__
+
+struct wmKeyConfig;
+struct MaskLayer;
+struct MaskLayerShape;
+
+/* mask_editor.c */
+void ED_operatortypes_mask(void);
+void ED_keymap_mask(struct wmKeyConfig *keyconf);
+void ED_operatormacros_mask(void);
+
+/* mask_draw.c */
+void ED_mask_draw(const bContext *C, const char draw_flag, const char draw_type);
+
+/* mask_shapekey.c */
+void ED_mask_layer_shape_auto_key(struct MaskLayer *masklay, const int frame);
+int ED_mask_layer_shape_auto_key_all(struct Mask *mask, const int frame);
+int ED_mask_layer_shape_auto_key_select(struct Mask *mask, const int frame);
+
+/* ----------- Mask AnimEdit API ------------------ */
+short ED_masklayer_frames_looper(struct MaskLayer *masklay, struct Scene *scene,
+                                 short (*masklay_shape_cb)(struct MaskLayerShape *, struct Scene *));
+void ED_masklayer_make_cfra_list(struct MaskLayer *masklay, ListBase *elems, short onlysel);
+
+short ED_masklayer_frame_select_check(struct MaskLayer *masklay);
+void  ED_masklayer_frame_select_set(struct MaskLayer *masklay, short mode);
+void  ED_masklayer_frames_select_border(struct MaskLayer *masklay, float min, float max, short select_mode);
+void  ED_mask_select_frames(struct MaskLayer *masklay, short select_mode);
+void  ED_mask_select_frame(struct MaskLayer *masklay, int selx, short select_mode);
+
+void ED_masklayer_frames_delete(struct MaskLayer *masklay);
+void ED_masklayer_frames_duplicate(struct MaskLayer *masklay);
+
+#if 0
+void free_gpcopybuf(void);
+void copy_gpdata(void);
+void paste_gpdata(void);
+
+ void snap_masklayer_frames(struct MaskLayer *masklay, short mode);
+ void mirror_masklayer_frames(struct MaskLayer *masklay, short mode);
+#endif
+
+#endif /* __ED_MASK_H__ */
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h
index 37ed8a6c7c8..9c10a270ef8 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -85,17 +85,14 @@ extern struct EnumPropertyItem prop_clear_parent_types[];
 extern struct EnumPropertyItem prop_make_parent_types[];
 
 int ED_object_parent_set(struct ReportList *reports, struct Main *bmain, struct Scene *scene, struct Object *ob, struct Object *par, int partype);
-void ED_object_parent_clear(struct bContext *C, int type);
+void ED_object_parent_clear(struct Object *ob, int type);
+struct Base *ED_object_scene_link(struct Scene *scene, struct Object *ob);
 
-
-/* generic editmode keys like pet
- * do_pet
- *  0: No
- *  1: Object
- *  2: Edit
- *  3: Edit with connected
- * */
-void ED_object_generic_keymap(struct wmKeyConfig *keyconf, struct wmKeyMap *keymap, int do_pet);
+void ED_keymap_proportional_cycle(struct wmKeyConfig *keyconf, struct wmKeyMap *keymap);
+void ED_keymap_proportional_obmode(struct wmKeyConfig *keyconf, struct wmKeyMap *keymap);
+void ED_keymap_proportional_maskmode(struct wmKeyConfig *keyconf, struct wmKeyMap *keymap);
+void ED_keymap_proportional_editmode(struct wmKeyConfig *keyconf, struct wmKeyMap *keymap,
+                                     const short do_connected);
 
 /* send your own notifier for select! */
 void ED_base_object_select(struct Base *base, short mode);
@@ -120,18 +117,19 @@ void ED_object_toggle_modes(struct bContext *C, int mode);
 void ED_object_exit_editmode(struct bContext *C, int flag);
 void ED_object_enter_editmode(struct bContext *C, int flag);
 
-void ED_object_location_from_view(struct bContext *C, float *loc);
-void ED_object_rotation_from_view(struct bContext *C, float *rot);
-void ED_object_base_init_transform(struct bContext *C, struct Base *base, float *loc, float *rot);
-float ED_object_new_primitive_matrix(struct bContext *C, struct Object *editob, float *loc, float *rot, float primmat[][4]);
+void ED_object_location_from_view(struct bContext *C, float loc[3]);
+void ED_object_rotation_from_view(struct bContext *C, float rot[3]);
+void ED_object_base_init_transform(struct bContext *C, struct Base *base, const float loc[3], const float rot[3]);
+float ED_object_new_primitive_matrix(struct bContext *C, struct Object *editob,
+                                     const float loc[3], const float rot[3], float primmat[][4]);
 
 void ED_object_add_generic_props(struct wmOperatorType *ot, int do_editmode);
 int ED_object_add_generic_invoke(struct bContext *C, struct wmOperator *op, struct wmEvent *event);
-int ED_object_add_generic_get_opts(struct bContext *C, struct wmOperator *op, 
-                                   float *loc, float *rot, int *enter_editmode, unsigned int *layer, int *is_view_aligned);
+int ED_object_add_generic_get_opts(struct bContext *C, struct wmOperator *op,  float loc[3], float rot[3],
+                                   int *enter_editmode, unsigned int *layer, int *is_view_aligned);
 
-struct Object *ED_object_add_type(struct bContext *C, int type, float *loc,
-                                  float *rot, int enter_editmode, unsigned int layer);
+struct Object *ED_object_add_type(struct bContext *C, int type, const float loc[3], const float rot[3],
+                                  int enter_editmode, unsigned int layer);
 
 void ED_object_single_users(struct Main *bmain, struct Scene *scene, int full);
 void ED_object_single_user(struct Scene *scene, struct Object *ob);
@@ -165,13 +163,17 @@ enum {
 	MODIFIER_APPLY_SHAPE
 };
 
-struct ModifierData *ED_object_modifier_add(struct ReportList *reports, struct Main *bmain, struct Scene *scene, struct Object *ob, const char *name, int type);
-int ED_object_modifier_remove(struct ReportList *reports, struct Main *bmain, struct Scene *scene, struct Object *ob, struct ModifierData *md);
+struct ModifierData *ED_object_modifier_add(struct ReportList *reports, struct Main *bmain, struct Scene *scene,
+                                            struct Object *ob, const char *name, int type);
+int ED_object_modifier_remove(struct ReportList *reports, struct Main *bmain, struct Scene *scene,
+                              struct Object *ob, struct ModifierData *md);
 void ED_object_modifier_clear(struct Main *bmain, struct Scene *scene, struct Object *ob);
 int ED_object_modifier_move_down(struct ReportList *reports, struct Object *ob, struct ModifierData *md);
 int ED_object_modifier_move_up(struct ReportList *reports, struct Object *ob, struct ModifierData *md);
-int ED_object_modifier_convert(struct ReportList *reports, struct Main *bmain, struct Scene *scene, struct Object *ob, struct ModifierData *md);
-int ED_object_modifier_apply(struct ReportList *reports, struct Scene *scene, struct Object *ob, struct ModifierData *md, int mode);
+int ED_object_modifier_convert(struct ReportList *reports, struct Main *bmain, struct Scene *scene,
+                               struct Object *ob, struct ModifierData *md);
+int ED_object_modifier_apply(struct ReportList *reports, struct Scene *scene,
+                             struct Object *ob, struct ModifierData *md, int mode);
 int ED_object_modifier_copy(struct ReportList *reports, struct Object *ob, struct ModifierData *md);
 
 #ifdef __cplusplus
diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h
index 464f2db30a2..4faf82eec36 100644
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -170,6 +170,7 @@ int     ED_operator_editmball(struct bContext *C);
 int     ED_operator_uvedit(struct bContext *C);
 int     ED_operator_uvmap(struct bContext *C);
 int     ED_operator_posemode(struct bContext *C);
+int     ED_operator_mask(struct bContext *C);
 
 
 /* default keymaps, bitflags */
diff --git a/source/blender/editors/include/ED_sequencer.h b/source/blender/editors/include/ED_sequencer.h
index f20ebe81189..cea567254de 100644
--- a/source/blender/editors/include/ED_sequencer.h
+++ b/source/blender/editors/include/ED_sequencer.h
@@ -27,6 +27,10 @@
 #ifndef __ED_SEQUENCER_H__
 #define __ED_SEQUENCER_H__
 
-#define SEQ_ZOOM_FAC(szoom) ((szoom) > 0.0f) ? (szoom) : ((szoom) == 0.0f) ? (1.0f) : (-1.0f / (szoom))
+struct Scene;
+struct Sequence;
+
+void ED_sequencer_select_sequence_single(struct Scene *scene, struct Sequence *seq, int deselect_all);
+void ED_sequencer_deselect_all(struct Scene *scene);
 
 #endif /*  __ED_SEQUENCER_H__ */
diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h
index 3bef1f56655..608df8dd9b3 100644
--- a/source/blender/editors/include/ED_transform.h
+++ b/source/blender/editors/include/ED_transform.h
@@ -71,6 +71,7 @@ enum {
 	TFM_BONESIZE,
 	TFM_BONE_ENVELOPE,
 	TFM_CURVE_SHRINKFATTEN,
+	TFM_MASK_SHRINKFATTEN,
 	TFM_BONE_ROLL,
 	TFM_TIME_TRANSLATE,
 	TFM_TIME_SLIDE,
@@ -96,12 +97,13 @@ enum {
 #define CTX_BMESH           64
 #define CTX_NDOF            128
 #define CTX_MOVIECLIP       256
+#define CTX_MASK            512
 
 /* Standalone call to get the transformation center corresponding to the current situation
  * returns 1 if successful, 0 otherwise (usually means there's no selection)
  * (if 0 is returns, *vec is unmodified)
  * */
-int calculateTransformCenter(struct bContext *C, int centerMode, float *cent3d, int *cent2d);
+int calculateTransformCenter(struct bContext *C, int centerMode, float cent3d[3], int cent2d[2]);
 
 struct TransInfo;
 struct ScrArea;
@@ -166,8 +168,7 @@ typedef struct DepthPeel {
 
 struct ListBase;
 
-typedef enum SnapMode
-{
+typedef enum SnapMode {
 	SNAP_ALL = 0,
 	SNAP_NOT_SELECTED = 1,
 	SNAP_NOT_OBEDIT = 2
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index f9f59c9bdd9..34892fb3c27 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -282,7 +282,7 @@ int ED_view3d_scene_layer_set(int lay, const int *values, int *active);
 
 int ED_view3d_context_activate(struct bContext *C);
 void ED_view3d_draw_offscreen(struct Scene *scene, struct View3D *v3d, struct ARegion *ar,
-                              int winx, int winy, float viewmat[][4], float winmat[][4], int draw_background);
+                              int winx, int winy, float viewmat[][4], float winmat[][4], int do_bgpic);
 
 struct ImBuf *ED_view3d_draw_offscreen_imbuf(struct Scene *scene, struct View3D *v3d, struct ARegion *ar, int sizex, int sizey, unsigned int flag, int draw_background, char err_out[256]);
 struct ImBuf *ED_view3d_draw_offscreen_imbuf_simple(struct Scene *scene, struct Object *camera, int width, int height, unsigned int flag, int drawtype, int draw_background, char err_out[256]);
@@ -310,6 +310,8 @@ struct BGpic *ED_view3D_background_image_new(struct View3D *v3d);
 void ED_view3D_background_image_remove(struct View3D *v3d, struct BGpic *bgpic);
 void ED_view3D_background_image_clear(struct View3D *v3d);
 
+float ED_view3d_grid_scale(struct Scene *scene, struct View3D *v3d, const char **grid_unit);
+
 /* view matrix properties utilities */
 /* unused */
 #if 0
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index b82a0c5e480..bb6f9fad771 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -195,7 +195,8 @@ typedef struct uiLayout uiLayout;
 /*#define FUN	192*/ /*UNUSED*/
 #define BIT 256
 
-#define BUTPOIN (128 + 64 + 32)
+/* button reqyires a pointer */
+#define BUTPOIN (FLO | SHO | CHA)
 
 #define BUT (1 << 9)
 #define ROW (2 << 9)
diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h
index 2d409879ba3..51df30d6c28 100644
--- a/source/blender/editors/include/UI_resources.h
+++ b/source/blender/editors/include/UI_resources.h
@@ -141,6 +141,7 @@ enum {
 	TH_NODE_OPERATOR,
 	TH_NODE_CONVERTOR,
 	TH_NODE_GROUP,
+	TH_NODE_FRAME,
 	
 	TH_CONSOLE_OUTPUT,
 	TH_CONSOLE_INPUT,
@@ -150,11 +151,11 @@ enum {
 	
 	TH_SEQ_MOVIE,
 	TH_SEQ_MOVIECLIP,
+	TH_SEQ_MASK,
 	TH_SEQ_IMAGE,
 	TH_SEQ_SCENE,
 	TH_SEQ_AUDIO,
 	TH_SEQ_EFFECT,
-	TH_SEQ_PLUGIN,
 	TH_SEQ_TRANSITION,
 	TH_SEQ_META,
 	TH_SEQ_PREVIEW,
@@ -200,7 +201,20 @@ enum {
 	TH_MATCH,           /* highlight color for search matches */
 	TH_SELECT_HIGHLIGHT, /* highlight color for selected outliner item */
 
-	TH_SKIN_ROOT
+	TH_SKIN_ROOT,
+	
+	TH_ANIM_ACTIVE,   /* active action */
+	TH_ANIM_INACTIVE, /* no active action */
+	
+	TH_NLA_TWEAK,        /* 'tweaking' track in NLA */
+	TH_NLA_TWEAK_DUPLI,  /* error/warning flag for other strips referencing dupli strip */
+	
+	TH_NLA_TRANSITION,
+	TH_NLA_TRANSITION_SEL,
+	TH_NLA_META,
+	TH_NLA_META_SEL,
+	TH_NLA_SOUND,
+	TH_NLA_SOUND_SEL
 };
 /* XXX WARNING: previous is saved in file, so do not change order! */
 
@@ -239,6 +253,9 @@ void    UI_GetThemeColor3fv(int colorid, float col[3]);
 void    UI_GetThemeColorShade3fv(int colorid, int offset, float col[3]);
 void    UI_GetThemeColorShade3ubv(int colorid, int offset, unsigned char col[3]);
 
+// get four color values, scaled to 0.0-1.0 range
+void    UI_GetThemeColor4fv(int colorid, float col[4]);
+
 // get the 3 or 4 byte values
 void UI_GetThemeColor3ubv(int colorid, unsigned char col[3]);
 void UI_GetThemeColor4ubv(int colorid, unsigned char col[4]);
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index c0cd17d16d2..d26c8cefdf0 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -81,7 +81,7 @@
 
 /* avoid unneeded calls to ui_get_but_val */
 #define UI_BUT_VALUE_UNSET DBL_MAX
-#define UI_GET_BUT_VALUE_INIT(_but, _value) if (_value == DBL_MAX) {  (_value) = ui_get_but_val(_but); }
+#define UI_GET_BUT_VALUE_INIT(_but, _value) if (_value == DBL_MAX) {  (_value) = ui_get_but_val(_but); } (void)0
 
 /* 
  * a full doc with API notes can be found in bf-blender/trunk/blender/doc/guides/interface_API.txt
@@ -660,8 +660,8 @@ static int ui_but_update_from_old_block(const bContext *C, uiBlock *block, uiBut
 				/* typically the same pointers, but not on undo/redo */
 				/* XXX some menu buttons store button itself in but->poin. Ugly */
 				if (oldbut->poin != (char *)oldbut) {
-					SWAP(char *, oldbut->poin, but->poin)
-					SWAP(void *, oldbut->func_argN, but->func_argN)
+					SWAP(char *, oldbut->poin, but->poin);
+					SWAP(void *, oldbut->func_argN, but->func_argN);
 				}
 				
 				/* copy hardmin for list rows to prevent 'sticking' highlight to mouse position
@@ -1090,7 +1090,7 @@ static void ui_is_but_sel(uiBut *but, double *value)
 
 	if (but->bit) {
 		int lvalue;
-		UI_GET_BUT_VALUE_INIT(but, *value)
+		UI_GET_BUT_VALUE_INIT(but, *value);
 		lvalue = (int)*value;
 		if (BTST(lvalue, (but->bitnr)) ) is_push = is_true;
 		else is_push = !is_true;
@@ -1111,18 +1111,18 @@ static void ui_is_but_sel(uiBut *but, double *value)
 			case BUT_TOGDUAL:
 			case ICONTOG:
 			case OPTION:
-				UI_GET_BUT_VALUE_INIT(but, *value)
+				UI_GET_BUT_VALUE_INIT(but, *value);
 				if (*value != (double)but->hardmin) is_push = 1;
 				break;
 			case ICONTOGN:
 			case TOGN:
 			case OPTIONN:
-				UI_GET_BUT_VALUE_INIT(but, *value)
+				UI_GET_BUT_VALUE_INIT(but, *value);
 				if (*value == 0.0) is_push = 1;
 				break;
 			case ROW:
 			case LISTROW:
-				UI_GET_BUT_VALUE_INIT(but, *value)
+				UI_GET_BUT_VALUE_INIT(but, *value);
 				/* support for rna enum buts */
 				if (but->rnaprop && (RNA_property_flag(but->rnaprop) & PROP_ENUM_FLAG)) {
 					if ((int)*value & (int)but->hardmax) is_push = 1;
@@ -1437,15 +1437,15 @@ double ui_get_but_val(uiBut *but)
 		}
 	}
 	else if (but->type == HSVSLI) {
-		float h, s, v, *fp;
+		float *fp, hsv[3];
 		
 		fp = (but->editvec) ? but->editvec : (float *)but->poin;
-		rgb_to_hsv(fp[0], fp[1], fp[2], &h, &s, &v);
+		rgb_to_hsv_v(fp, hsv);
 
 		switch (but->str[0]) {
-			case 'H': value = h; break;
-			case 'S': value = s; break;
-			case 'V': value = v; break;
+			case 'H': value = hsv[0]; break;
+			case 'S': value = hsv[1]; break;
+			case 'V': value = hsv[2]; break;
 		}
 	} 
 	else if (but->pointype == CHA) {
@@ -1513,18 +1513,18 @@ void ui_set_but_val(uiBut *but, double value)
 	}
 	else if (but->pointype == 0) ;
 	else if (but->type == HSVSLI) {
-		float h, s, v, *fp;
+		float *fp, hsv[3];
 		
 		fp = (but->editvec) ? but->editvec : (float *)but->poin;
-		rgb_to_hsv(fp[0], fp[1], fp[2], &h, &s, &v);
+		rgb_to_hsv_v(fp, hsv);
 		
 		switch (but->str[0]) {
-			case 'H': h = value; break;
-			case 'S': s = value; break;
-			case 'V': v = value; break;
+			case 'H': hsv[0] = value; break;
+			case 'S': hsv[1] = value; break;
+			case 'V': hsv[2] = value; break;
 		}
 		
-		hsv_to_rgb(h, s, v, fp, fp + 1, fp + 2);
+		hsv_to_rgb_v(hsv, fp);
 		
 	}
 	else {
@@ -2171,7 +2171,7 @@ void ui_check_but(uiBut *but)
 	
 	/* only update soft range while not editing */
 	if (but->rnaprop && !(but->editval || but->editstr || but->editvec)) {
-		UI_GET_BUT_VALUE_INIT(but, value)
+		UI_GET_BUT_VALUE_INIT(but, value);
 		ui_set_but_soft_range(but, value);
 	}
 
@@ -2182,7 +2182,7 @@ void ui_check_but(uiBut *but)
 		case SCROLL:
 		case NUMSLI:
 		case HSVSLI:
-			UI_GET_BUT_VALUE_INIT(but, value)
+			UI_GET_BUT_VALUE_INIT(but, value);
 			if (value < (double)but->hardmin) ui_set_but_val(but, but->hardmin);
 			else if (value > (double)but->hardmax) ui_set_but_val(but, but->hardmax);
 			break;
@@ -2190,7 +2190,7 @@ void ui_check_but(uiBut *but)
 		case NUMABS:
 		{
 			double value_abs;
-			UI_GET_BUT_VALUE_INIT(but, value)
+			UI_GET_BUT_VALUE_INIT(but, value);
 			value_abs = fabs(value);
 			if (value_abs < (double)but->hardmin) ui_set_but_val(but, but->hardmin);
 			else if (value_abs > (double)but->hardmax) ui_set_but_val(but, but->hardmax);
@@ -2206,14 +2206,14 @@ void ui_check_but(uiBut *but)
 			
 		case ICONROW:
 			if (!but->rnaprop || (RNA_property_flag(but->rnaprop) & PROP_ICONS_CONSECUTIVE)) {
-				UI_GET_BUT_VALUE_INIT(but, value)
+				UI_GET_BUT_VALUE_INIT(but, value);
 				but->iconadd = (int)value - (int)(but->hardmin);
 			}
 			break;
 			
 		case ICONTEXTROW:
 			if (!but->rnaprop || (RNA_property_flag(but->rnaprop) & PROP_ICONS_CONSECUTIVE)) {
-				UI_GET_BUT_VALUE_INIT(but, value)
+				UI_GET_BUT_VALUE_INIT(but, value);
 				but->iconadd = (int)value - (int)(but->hardmin);
 			}
 			break;
@@ -2230,7 +2230,7 @@ void ui_check_but(uiBut *but)
 		case ICONTEXTROW:
 		
 			if (but->x2 - but->x1 > 24) {
-				UI_GET_BUT_VALUE_INIT(but, value)
+				UI_GET_BUT_VALUE_INIT(but, value);
 				ui_set_name_menu(but, (int)value);
 			}
 			break;
@@ -2240,7 +2240,7 @@ void ui_check_but(uiBut *but)
 		case HSVSLI:
 		case NUMABS:
 
-			UI_GET_BUT_VALUE_INIT(but, value)
+			UI_GET_BUT_VALUE_INIT(but, value);
 
 			if (ui_is_but_float(but)) {
 				if (value == (double) FLT_MAX) BLI_snprintf(but->drawstr, sizeof(but->drawstr), "%sinf", but->str);
@@ -2271,7 +2271,7 @@ void ui_check_but(uiBut *but)
 		case LABEL:
 			if (ui_is_but_float(but)) {
 				int prec;
-				UI_GET_BUT_VALUE_INIT(but, value)
+				UI_GET_BUT_VALUE_INIT(but, value);
 				prec = ui_but_float_precision(but, value);
 				BLI_snprintf(but->drawstr, sizeof(but->drawstr), "%s%.*f", but->str, prec, value);
 			}
@@ -2299,7 +2299,7 @@ void ui_check_but(uiBut *but)
 				strcat(but->drawstr, "Press a key");
 			}
 			else {
-				UI_GET_BUT_VALUE_INIT(but, value)
+				UI_GET_BUT_VALUE_INIT(but, value);
 				strcat(but->drawstr, WM_key_event_string((short)value));
 			}
 			break;
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c
index e535990e7e9..3c802020747 100644
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@ -43,6 +43,7 @@
 
 #include "BKE_colortools.h"
 #include "BKE_texture.h"
+#include "BKE_tracking.h"
 
 
 #include "IMB_imbuf.h"
@@ -658,37 +659,59 @@ static void draw_scope_end(rctf *rect, GLint *scissor)
 }
 
 static void histogram_draw_one(float r, float g, float b, float alpha,
-                               float x, float y, float w, float h, float *data, int res)
+                               float x, float y, float w, float h, float *data, int res, const short is_line)
 {
 	int i;
 	
-	/* under the curve */
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-	glColor4f(r, g, b, alpha);
-	
-	glShadeModel(GL_FLAT);
-	glBegin(GL_QUAD_STRIP);
-	glVertex2f(x, y);
-	glVertex2f(x, y + (data[0] * h));
-	for (i = 1; i < res; i++) {
-		float x2 = x + i * (w / (float)res);
-		glVertex2f(x2, y + (data[i] * h));
-		glVertex2f(x2, y);
+	if (is_line) {
+
+		glLineWidth(1.5);
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+		glColor4f(r, g, b, alpha);
+
+		/* curve outline */
+
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+		glEnable(GL_LINE_SMOOTH);
+		glBegin(GL_LINE_STRIP);
+		for (i = 0; i < res; i++) {
+			float x2 = x + i * (w / (float)res);
+			glVertex2f(x2, y + (data[i] * h));
+		}
+		glEnd();
+		glDisable(GL_LINE_SMOOTH);
+
+		glLineWidth(1.0);
 	}
-	glEnd();
-	
-	/* curve outline */
-	glColor4f(0.f, 0.f, 0.f, 0.25f);
-	
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	glEnable(GL_LINE_SMOOTH);
-	glBegin(GL_LINE_STRIP);
-	for (i = 0; i < res; i++) {
-		float x2 = x + i * (w / (float)res);
-		glVertex2f(x2, y + (data[i] * h));
+	else {
+		/* under the curve */
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+		glColor4f(r, g, b, alpha);
+
+		glShadeModel(GL_FLAT);
+		glBegin(GL_QUAD_STRIP);
+		glVertex2f(x, y);
+		glVertex2f(x, y + (data[0] * h));
+		for (i = 1; i < res; i++) {
+			float x2 = x + i * (w / (float)res);
+			glVertex2f(x2, y + (data[i] * h));
+			glVertex2f(x2, y);
+		}
+		glEnd();
+
+		/* curve outline */
+		glColor4f(0.f, 0.f, 0.f, 0.25f);
+
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glEnable(GL_LINE_SMOOTH);
+		glBegin(GL_LINE_STRIP);
+		for (i = 0; i < res; i++) {
+			float x2 = x + i * (w / (float)res);
+			glVertex2f(x2, y + (data[i] * h));
+		}
+		glEnd();
+		glDisable(GL_LINE_SMOOTH);
 	}
-	glEnd();
-	glDisable(GL_LINE_SMOOTH);
 }
 
 void ui_draw_but_HISTOGRAM(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wcol), rcti *recti)
@@ -698,6 +721,7 @@ void ui_draw_but_HISTOGRAM(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wcol)
 	rctf rect;
 	int i;
 	float w, h;
+	const short is_line = (hist->flag & HISTO_FLAG_LINE) != 0;
 	//float alpha;
 	GLint scissor[4];
 	
@@ -730,15 +754,19 @@ void ui_draw_but_HISTOGRAM(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wcol)
 		fdrawline(rect.xmin + (i / 4.f) * w, rect.ymin, rect.xmin + (i / 4.f) * w, rect.ymax);
 	}
 	
-	if (hist->mode == HISTO_MODE_LUMA)
-		histogram_draw_one(1.0, 1.0, 1.0, 0.75, rect.xmin, rect.ymin, w, h, hist->data_luma, res);
+	if (hist->mode == HISTO_MODE_LUMA) {
+		histogram_draw_one(1.0, 1.0, 1.0, 0.75, rect.xmin, rect.ymin, w, h, hist->data_luma, res, is_line);
+	}
+	else if (hist->mode == HISTO_MODE_ALPHA) {
+		histogram_draw_one(1.0, 1.0, 1.0, 0.75, rect.xmin, rect.ymin, w, h, hist->data_a, res, is_line);
+	}
 	else {
 		if (hist->mode == HISTO_MODE_RGB || hist->mode == HISTO_MODE_R)
-			histogram_draw_one(1.0, 0.0, 0.0, 0.75, rect.xmin, rect.ymin, w, h, hist->data_r, res);
+			histogram_draw_one(1.0, 0.0, 0.0, 0.75, rect.xmin, rect.ymin, w, h, hist->data_r, res, is_line);
 		if (hist->mode == HISTO_MODE_RGB || hist->mode == HISTO_MODE_G)
-			histogram_draw_one(0.0, 1.0, 0.0, 0.75, rect.xmin, rect.ymin, w, h, hist->data_g, res);
+			histogram_draw_one(0.0, 1.0, 0.0, 0.75, rect.xmin, rect.ymin, w, h, hist->data_g, res, is_line);
 		if (hist->mode == HISTO_MODE_RGB || hist->mode == HISTO_MODE_B)
-			histogram_draw_one(0.0, 0.0, 1.0, 0.75, rect.xmin, rect.ymin, w, h, hist->data_b, res);
+			histogram_draw_one(0.0, 0.0, 1.0, 0.75, rect.xmin, rect.ymin, w, h, hist->data_b, res, is_line);
 	}
 	
 	/* outline, scale gripper */
@@ -1480,36 +1508,10 @@ void ui_draw_but_CURVE(ARegion *ar, uiBut *but, uiWidgetColors *wcol, rcti *rect
 	fdrawbox(rect->xmin, rect->ymin, rect->xmax, rect->ymax);
 }
 
-static ImBuf *scale_trackpreview_ibuf(ImBuf *ibuf, float track_pos[2], int width, float height, int margin)
-{
-	ImBuf *scaleibuf;
-	const float scalex = ((float)ibuf->x - 2 * margin) / width;
-	const float scaley = ((float)ibuf->y - 2 * margin) / height;
-	/* NOTE: 1.0f = 0.5f for integer coordinate coorrection (center of pixel vs. left bottom corner of bixel)
-	 *       and 0.5f for centering image in preview (cross is draving at exact center of widget so image
-	 *       should be shifted by half of pixel for correct centering) - sergey */
-	float off_x = (int)track_pos[0] - track_pos[0] + 1.0f;
-	float off_y = (int)track_pos[1] - track_pos[1] + 1.0f;
-	int x, y;
-
-	scaleibuf = IMB_allocImBuf(width, height, 32, IB_rect);
-
-	for (y = 0; y < height; y++) {
-		for (x = 0; x < width; x++) {
-			float src_x = scalex * (x) + margin - off_x;
-			float src_y = scaley * (y) + margin - off_y;
-
-			bicubic_interpolation(ibuf, scaleibuf, src_x, src_y, x, y);
-		}
-	}
-
-	return scaleibuf;
-}
-
 void ui_draw_but_TRACKPREVIEW(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wcol), rcti *recti)
 {
 	rctf rect;
-	int ok = 0;
+	int ok = 0, width, height;
 	GLint scissor[4];
 	MovieClipScopes *scopes = (MovieClipScopes *)but->poin;
 
@@ -1518,6 +1520,9 @@ void ui_draw_but_TRACKPREVIEW(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wc
 	rect.ymin = (float)recti->ymin + SCOPE_RESIZE_PAD + 2;
 	rect.ymax = (float)recti->ymax - 1;
 
+	width = rect.xmax - rect.xmin + 1;
+	height = rect.ymax - rect.ymin;
+
 	glEnable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
@@ -1535,40 +1540,60 @@ void ui_draw_but_TRACKPREVIEW(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wc
 
 		ok = 1;
 	}
-	else if (scopes->track_preview) {
-		/* additional margin around image */
-		/* NOTE: should be kept in sync with value from BKE_movieclip_update_scopes */
-		const int margin = 3;
-		float zoomx, zoomy, track_pos[2], off_x, off_y;
-		int a, width, height;
+	else if ((scopes->track_search) &&
+	         ((!scopes->track_preview) ||
+	          (scopes->track_preview->x != width || scopes->track_preview->y != height)))
+	{
+		ImBuf *tmpibuf;
+
+		if (scopes->track_preview)
+			IMB_freeImBuf(scopes->track_preview);
+
+		tmpibuf = BKE_tracking_sample_pattern(scopes->frame_width, scopes->frame_height,
+		                                            scopes->track_search, scopes->track,
+		                                            &scopes->undist_marker, scopes->use_track_mask,
+		                                            width, height, scopes->track_pos);
+
+		if (tmpibuf->rect_float)
+			IMB_rect_from_float(tmpibuf);
+
+		// XXX: for debug only
+		// tmpibuf->ftype = PNG;
+		// IMB_saveiff(tmpibuf, "sample.png", IB_rect);
+
+		if (tmpibuf->rect)
+			scopes->track_preview = tmpibuf;
+		else
+			IMB_freeImBuf(tmpibuf);
+	}
+
+	if (!ok && scopes->track_preview) {
+		float track_pos[2];
+		int a;
 		ImBuf *drawibuf;
 
 		glPushMatrix();
 
-		track_pos[0] = scopes->track_pos[0] - margin;
-		track_pos[1] = scopes->track_pos[1] - margin;
+		track_pos[0] = scopes->track_pos[0];
+		track_pos[1] = scopes->track_pos[1];
 
 		/* draw content of pattern area */
 		glScissor(ar->winrct.xmin + rect.xmin, ar->winrct.ymin + rect.ymin, scissor[2], scissor[3]);
 
-		width = rect.xmax - rect.xmin + 1;
-		height = rect.ymax - rect.ymin;
-
 		if (width > 0 && height > 0) {
-			zoomx = (float)width / (scopes->track_preview->x - 2 * margin);
-			zoomy = (float)height / (scopes->track_preview->y - 2 * margin);
-
-			off_x = ((int)track_pos[0] - track_pos[0] + 0.5f) * zoomx;
-			off_y = ((int)track_pos[1] - track_pos[1] + 0.5f) * zoomy;
+			drawibuf = scopes->track_preview;
 
-			drawibuf = scale_trackpreview_ibuf(scopes->track_preview, track_pos, width, height, margin);
+			if (scopes->use_track_mask) {
+				glColor4f(0.0f, 0.0f, 0.0f, 0.3f);
+				uiSetRoundBox(15);
+				uiDrawBox(GL_POLYGON, rect.xmin - 1, rect.ymin, rect.xmax + 1, rect.ymax + 1, 3.0f);
+			}
 
 			glaDrawPixelsSafe(rect.xmin, rect.ymin + 1, drawibuf->x, drawibuf->y,
 			                  drawibuf->x, GL_RGBA, GL_UNSIGNED_BYTE, drawibuf->rect);
-			IMB_freeImBuf(drawibuf);
 
 			/* draw cross for pizel position */
-			glTranslatef(off_x + rect.xmin + track_pos[0] * zoomx, off_y + rect.ymin + track_pos[1] * zoomy, 0.f);
+			glTranslatef(rect.xmin + track_pos[0], rect.ymin + track_pos[1], 0.f);
 			glScissor(ar->winrct.xmin + rect.xmin,
 			          ar->winrct.ymin + rect.ymin,
 			          rect.xmax - rect.xmin,
@@ -1663,12 +1688,12 @@ void uiDrawBoxShadow(unsigned char alpha, float minx, float miny, float maxx, fl
 }
 
 
-void ui_dropshadow(rctf *rct, float radius, float aspect, int UNUSED(select))
+void ui_dropshadow(rctf *rct, float radius, float aspect, float alpha, int UNUSED(select))
 {
 	int i;
 	float rad;
 	float a;
-	char alpha = 2;
+	float dalpha = alpha * 2.0f / 255.0f, calpha;
 	
 	glEnable(GL_BLEND);
 	
@@ -1688,10 +1713,11 @@ void ui_dropshadow(rctf *rct, float radius, float aspect, int UNUSED(select))
 		a = i * aspect;
 	}
 
+	calpha = dalpha;
 	for (; i--; a -= aspect) {
 		/* alpha ranges from 2 to 20 or so */
-		glColor4ub(0, 0, 0, alpha);
-		alpha += 2;
+		glColor4f(0.0f, 0.0f, 0.0f, calpha);
+		calpha += dalpha;
 		
 		uiDrawBox(GL_POLYGON, rct->xmin - a, rct->ymin - a, rct->xmax + a, rct->ymax - 10.0f + a, rad + a);
 	}
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 58dfabd99ce..a8a7a55c653 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -2953,14 +2953,14 @@ static int ui_do_but_BLOCK(bContext *C, uiBut *but, uiHandleButtonData *data, wm
 				float col[3];
 				
 				ui_get_but_vectorf(but, col);
-				rgb_to_hsv_compat(col[0], col[1], col[2], hsv, hsv + 1, hsv + 2);
+				rgb_to_hsv_compat_v(col, hsv);
 
 				if (event->type == WHEELDOWNMOUSE)
 					hsv[2] = CLAMPIS(hsv[2] - 0.05f, 0.0f, 1.0f);
 				else
 					hsv[2] = CLAMPIS(hsv[2] + 0.05f, 0.0f, 1.0f);
 				
-				hsv_to_rgb(hsv[0], hsv[1], hsv[2], data->vec, data->vec + 1, data->vec + 2);
+				hsv_to_rgb_v(hsv, data->vec);
 				ui_set_but_vectorf(but, data->vec);
 				
 				button_activate_state(C, but, BUTTON_STATE_EXIT);
@@ -3106,7 +3106,7 @@ static int ui_numedit_but_HSVCUBE(uiBut *but, uiHandleButtonData *data, int mx,
 
 	ui_get_but_vectorf(but, rgb);
 
-	rgb_to_hsv_compat(rgb[0], rgb[1], rgb[2], hsv, hsv + 1, hsv + 2);
+	rgb_to_hsv_compat_v(rgb, hsv);
 
 	/* relative position within box */
 	x = ((float)mx - but->x1) / (but->x2 - but->x1);
@@ -3152,7 +3152,7 @@ static int ui_numedit_but_HSVCUBE(uiBut *but, uiHandleButtonData *data, int mx,
 			assert(!"invalid hsv type");
 	}
 
-	hsv_to_rgb(hsv[0], hsv[1], hsv[2], rgb, rgb + 1, rgb + 2);
+	hsv_to_rgb_v(hsv, rgb);
 	copy_v3_v3(data->vec, rgb);
 
 	data->draglastx = mx;
@@ -3175,7 +3175,7 @@ static void ui_ndofedit_but_HSVCUBE(uiBut *but, uiHandleButtonData *data, wmNDOF
 	}
 
 	ui_get_but_vectorf(but, rgb);
-	rgb_to_hsv_compat(rgb[0], rgb[1], rgb[2], hsv, hsv + 1, hsv + 2);
+	rgb_to_hsv_compat_v(rgb, hsv);
 	
 	switch ((int)but->a1) {
 		case UI_GRAD_SV:
@@ -3213,7 +3213,7 @@ static void ui_ndofedit_but_HSVCUBE(uiBut *but, uiHandleButtonData *data, wmNDOF
 			assert(!"invalid hsv type");
 	}
 	
-	hsv_to_rgb(hsv[0], hsv[1], hsv[2], rgb, rgb + 1, rgb + 2);
+	hsv_to_rgb_v(hsv, rgb);
 	copy_v3_v3(data->vec, rgb);
 	ui_set_but_vectorf(but, data->vec);
 }
@@ -3265,12 +3265,15 @@ static int ui_do_but_HSVCUBE(bContext *C, uiBlock *block, uiBut *but, uiHandleBu
 					def = MEM_callocN(sizeof(float) * len, "reset_defaults - float");
 					
 					RNA_property_float_get_default_array(&but->rnapoin, but->rnaprop, def);
-					rgb_to_hsv(def[0], def[1], def[2], def_hsv, def_hsv + 1, def_hsv + 2);
+					rgb_to_hsv_v(def, def_hsv);
 					
 					ui_get_but_vectorf(but, rgb);
-					rgb_to_hsv_compat(rgb[0], rgb[1], rgb[2], hsv, hsv + 1, hsv + 2);
+					rgb_to_hsv_compat_v(rgb, hsv);
+
+					def_hsv[0] = hsv[0];
+					def_hsv[1] = hsv[1];
 					
-					hsv_to_rgb(hsv[0], hsv[1], def_hsv[2], rgb, rgb + 1, rgb + 2);
+					hsv_to_rgb_v(def_hsv, rgb);
 					ui_set_but_vectorf(but, rgb);
 					
 					RNA_property_update(C, &but->rnapoin, but->rnaprop);
@@ -3314,7 +3317,7 @@ static int ui_numedit_but_HSVCIRCLE(uiBut *but, uiHandleButtonData *data, int mx
 	
 	ui_get_but_vectorf(but, rgb);
 	copy_v3_v3(hsv, ui_block_hsv_get(but->block));
-	rgb_to_hsv_compat(rgb[0], rgb[1], rgb[2], hsv, hsv + 1, hsv + 2);
+	rgb_to_hsv_compat_v(rgb, hsv);
 	
 	/* exception, when using color wheel in 'locked' value state:
 	 * allow choosing a hue for black values, by giving a tiny increment */
@@ -3334,7 +3337,7 @@ static int ui_numedit_but_HSVCIRCLE(uiBut *but, uiHandleButtonData *data, int mx
 	if (but->flag & UI_BUT_COLOR_CUBIC)
 		hsv[1] = 1.0f - sqrt3f(1.0f - hsv[1]);
 
-	hsv_to_rgb(hsv[0], hsv[1], hsv[2], rgb, rgb + 1, rgb + 2);
+	hsv_to_rgb_v(hsv, rgb);
 
 	if ((but->flag & UI_BUT_VEC_SIZE_LOCK) && (rgb[0] || rgb[1] || rgb[2])) {
 		normalize_v3(rgb);
@@ -3357,7 +3360,7 @@ static void ui_ndofedit_but_HSVCIRCLE(uiBut *but, uiHandleButtonData *data, wmND
 	float sensitivity = (shift ? 0.15f : 0.3f) * ndof->dt;
 	
 	ui_get_but_vectorf(but, rgb);
-	rgb_to_hsv_compat(rgb[0], rgb[1], rgb[2], hsv, hsv + 1, hsv + 2);
+	rgb_to_hsv_compat_v(rgb, hsv);
 	
 	/* Convert current colour on hue/sat disc to circular coordinates phi, r */
 	phi = fmodf(hsv[0] + 0.25f, 1.0f) * -2.0f * (float)M_PI;
@@ -3391,7 +3394,7 @@ static void ui_ndofedit_but_HSVCIRCLE(uiBut *but, uiHandleButtonData *data, wmND
 		if (hsv[2] == 0.0f) hsv[2] = 0.0001f;
 	}
 	
-	hsv_to_rgb(hsv[0], hsv[1], hsv[2], data->vec, data->vec + 1, data->vec + 2);
+	hsv_to_rgb_v(hsv, data->vec);
 	
 	if ((but->flag & UI_BUT_VEC_SIZE_LOCK) && (data->vec[0] || data->vec[1] || data->vec[2])) {
 		normalize_v3(data->vec);
@@ -3447,12 +3450,15 @@ static int ui_do_but_HSVCIRCLE(bContext *C, uiBlock *block, uiBut *but, uiHandle
 				def = MEM_callocN(sizeof(float) * len, "reset_defaults - float");
 				
 				RNA_property_float_get_default_array(&but->rnapoin, but->rnaprop, def);
-				rgb_to_hsv(def[0], def[1], def[2], def_hsv, def_hsv + 1, def_hsv + 2);
+				rgb_to_hsv_v(def, def_hsv);
 				
 				ui_get_but_vectorf(but, rgb);
-				rgb_to_hsv_compat(rgb[0], rgb[1], rgb[2], hsv, hsv + 1, hsv + 2);
+				rgb_to_hsv_compat_v(rgb, hsv);
 				
-				hsv_to_rgb(hsv[0], def_hsv[1], hsv[2], rgb, rgb + 1, rgb + 2);
+				def_hsv[0] = hsv[0];
+				def_hsv[2] = hsv[2];
+
+				hsv_to_rgb_v(def_hsv, rgb);
 				ui_set_but_vectorf(but, rgb);
 				
 				RNA_property_update(C, &but->rnapoin, but->rnaprop);
@@ -3813,22 +3819,21 @@ static int ui_numedit_but_HISTOGRAM(uiBut *but, uiHandleButtonData *data, int mx
 	Histogram *hist = (Histogram *)but->poin;
 	/* rcti rect; */
 	int changed = 1;
-	float /* dx, */ dy, yfac = 1.f; /* UNUSED */
+	float /* dx, */ dy; /* UNUSED */
 	
 	/* rect.xmin = but->x1; rect.xmax = but->x2; */
 	/* rect.ymin = but->y1; rect.ymax = but->y2; */
 	
 	/* dx = mx - data->draglastx; */ /* UNUSED */
 	dy = my - data->draglasty;
-	
-	
+
 	if (in_scope_resize_zone(but, data->dragstartx, data->dragstarty)) {
 		/* resize histogram widget itself */
 		hist->height = (but->y2 - but->y1) + (data->dragstarty - my);
 	}
 	else {
 		/* scale histogram values */
-		yfac = MIN2(powf(hist->ymax, 2.f), 1.f) * 0.5f;
+		const float yfac = MIN2(powf(hist->ymax, 2.f), 1.f) * 0.5f;
 		hist->ymax += dy * yfac;
 	
 		CLAMP(hist->ymax, 1.f, 100.f);
@@ -4196,9 +4201,9 @@ static int ui_numedit_but_TRACKPREVIEW(bContext *C, uiBut *but, uiHandleButtonDa
 		scopes->track_preview_height = (but->y2 - but->y1) + (data->dragstarty - my);
 	}
 	else {
-		if (scopes->marker) {
+		if (!scopes->track_locked) {
 			if (scopes->marker->framenr != scopes->framenr)
-				scopes->marker = BKE_tracking_ensure_marker(scopes->track, scopes->framenr);
+				scopes->marker = BKE_tracking_marker_ensure(scopes->track, scopes->framenr);
 
 			scopes->marker->flag &= ~(MARKER_DISABLED | MARKER_TRACKED);
 			scopes->marker->pos[0] += -dx * scopes->slide_scale[0] / (but->block->maxx - but->block->minx);
@@ -4591,9 +4596,14 @@ static int ui_but_menu(bContext *C, uiBut *but)
 			BLI_snprintf(buf, sizeof(buf), "%s.%s",
 			             RNA_struct_identifier(but->rnapoin.type), RNA_property_identifier(but->rnaprop));
 
+			WM_operator_properties_create(&ptr_props, "WM_OT_doc_view_manual");
+			RNA_string_set(&ptr_props, "doc_id", buf);
+			uiItemFullO(layout, "WM_OT_doc_view_manual", CTX_IFACE_(BLF_I18NCONTEXT_OPERATOR_DEFAULT, "Online Manual"),
+			            ICON_NONE, ptr_props.data, WM_OP_EXEC_DEFAULT, 0);
+
 			WM_operator_properties_create(&ptr_props, "WM_OT_doc_view");
 			RNA_string_set(&ptr_props, "doc_id", buf);
-			uiItemFullO(layout, "WM_OT_doc_view", CTX_IFACE_(BLF_I18NCONTEXT_OPERATOR_DEFAULT, "Python Documentation"),
+			uiItemFullO(layout, "WM_OT_doc_view", CTX_IFACE_(BLF_I18NCONTEXT_OPERATOR_DEFAULT, "Online Python Reference"),
 			            ICON_NONE, ptr_props.data, WM_OP_EXEC_DEFAULT, 0);
 
 			/* XXX inactive option, not for public! */
@@ -4608,18 +4618,26 @@ static int ui_but_menu(bContext *C, uiBut *but)
 		else if (but->optype) {
 			WM_operator_py_idname(buf, but->optype->idname);
 
-			WM_operator_properties_create(&ptr_props, "WM_OT_doc_view");
+
+			WM_operator_properties_create(&ptr_props, "WM_OT_doc_view_manual");
 			RNA_string_set(&ptr_props, "doc_id", buf);
-			uiItemFullO(layout, "WM_OT_doc_view", CTX_IFACE_(BLF_I18NCONTEXT_OPERATOR_DEFAULT, "Python Documentation"),
+			uiItemFullO(layout, "WM_OT_doc_view_manual", CTX_IFACE_(BLF_I18NCONTEXT_OPERATOR_DEFAULT, "Online Manual"),
 			            ICON_NONE, ptr_props.data, WM_OP_EXEC_DEFAULT, 0);
 
+			WM_operator_properties_create(&ptr_props, "WM_OT_doc_view");
+			RNA_string_set(&ptr_props, "doc_id", buf);
+			uiItemFullO(layout, "WM_OT_doc_view", CTX_IFACE_(BLF_I18NCONTEXT_OPERATOR_DEFAULT, "Online Python Reference"),
+			            ICON_NONE, ptr_props.data, WM_OP_EXEC_DEFAULT, 0);
 
+			/* XXX inactive option, not for public! */
+#if 0
 			WM_operator_properties_create(&ptr_props, "WM_OT_doc_edit");
 			RNA_string_set(&ptr_props, "doc_id", buf);
 			RNA_string_set(&ptr_props, "doc_new", but->optype->description);
 
 			uiItemFullO(layout, "WM_OT_doc_edit", CTX_IFACE_(BLF_I18NCONTEXT_OPERATOR_DEFAULT, "Submit Description"),
 			            ICON_NONE, ptr_props.data, WM_OP_INVOKE_DEFAULT, 0);
+#endif
 		}
 	}
 
@@ -6546,6 +6564,18 @@ static int ui_handler_popup(bContext *C, wmEvent *event, void *userdata)
 {
 	uiPopupBlockHandle *menu = userdata;
 
+	/* we block all events, this is modal interaction, except for drop events which is described below */
+	int retval = WM_UI_HANDLER_BREAK;
+
+	if (event->type == EVT_DROP) {
+		/* if we're handling drop event we'll want it to be handled by popup callee as well,
+		 * so it'll be possible to perform such operations as opening .blend files by dropping
+		 * them into blender even if there's opened popup like splash screen (sergey)
+		 */
+
+		retval = WM_UI_HANDLER_CONTINUE;
+	}
+
 	ui_handle_menus_recursive(C, event, menu);
 
 	/* free if done, does not free handle itself */
@@ -6574,17 +6604,7 @@ static int ui_handler_popup(bContext *C, wmEvent *event, void *userdata)
 	/* delayed apply callbacks */
 	ui_apply_but_funcs_after(C);
 
-	if (event->type == EVT_DROP) {
-		/* if we're handling drop event we'll want it to be handled by popup callee as well,
-		 * so it'll be possible to perform such operations as opening .blend files by dropping
-		 * them into blender even if there's opened popup like splash screen (sergey)
-		 */
-
-		return WM_UI_HANDLER_CONTINUE;
-	}
-
-	/* we block all events, this is modal interaction, except for drop events which is described above */
-	return WM_UI_HANDLER_BREAK;
+	return retval;
 }
 
 static void ui_handler_remove_popup(bContext *C, void *userdata)
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index 5d12bdf71da..9af3ff3bdd8 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -445,7 +445,7 @@ extern int ui_handler_panel_region(struct bContext *C, struct wmEvent *event);
 extern void ui_draw_aligned_panel(struct uiStyle *style, uiBlock *block, rcti *rect);
 
 /* interface_draw.c */
-extern void ui_dropshadow(rctf *rct, float radius, float aspect, int select);
+extern void ui_dropshadow(rctf *rct, float radius, float aspect, float alpha, int select);
 
 void ui_draw_gradient(rcti *rect, const float hsv[3], int type, float alpha);
 
diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c
index dfd2d0cc4d0..1c3b642b63b 100644
--- a/source/blender/editors/interface/interface_ops.c
+++ b/source/blender/editors/interface/interface_ops.c
@@ -40,6 +40,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math_color.h"
+#include "BLI_math_vector.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_context.h"
@@ -69,22 +70,42 @@
 /* ********************************************************** */
 
 typedef struct Eyedropper {
+	short do_color_management;
+
 	PointerRNA ptr;
 	PropertyRNA *prop;
 	int index;
+
+	int   accum_start; /* has mouse been presed */
+	float accum_col[3];
+	int   accum_tot;
 } Eyedropper;
 
 static int eyedropper_init(bContext *C, wmOperator *op)
 {
+	Scene *scene = CTX_data_scene(C);
+	const int color_manage = scene->r.color_mgt_flag & R_COLOR_MANAGEMENT;
+
 	Eyedropper *eye;
 	
 	op->customdata = eye = MEM_callocN(sizeof(Eyedropper), "Eyedropper");
 	
 	uiContextActiveProperty(C, &eye->ptr, &eye->prop, &eye->index);
-	
-	return (eye->ptr.data && eye->prop && RNA_property_editable(&eye->ptr, eye->prop));
+
+	if ((eye->ptr.data == NULL) ||
+	    (eye->prop == NULL) ||
+	    (RNA_property_editable(&eye->ptr, eye->prop) == FALSE) ||
+	    (RNA_property_array_length(&eye->ptr, eye->prop) < 3) ||
+	    (RNA_property_type(eye->prop) != PROP_FLOAT))
+	{
+		return FALSE;
+	}
+
+	eye->do_color_management = (color_manage && RNA_property_subtype(eye->prop) == PROP_COLOR);
+
+	return TRUE;
 }
- 
+
 static void eyedropper_exit(bContext *C, wmOperator *op)
 {
 	WM_cursor_restore(CTX_wm_window(C));
@@ -100,29 +121,60 @@ static int eyedropper_cancel(bContext *C, wmOperator *op)
 	return OPERATOR_CANCELLED;
 }
 
-static void eyedropper_sample(bContext *C, Eyedropper *eye, int mx, int my)
+/* *** eyedropper_color_ helper functions *** */
+
+/* simply get the color from the screen */
+static void eyedropper_color_sample_fl(Eyedropper *UNUSED(eye), int mx, int my, float r_col[3])
 {
-	if (RNA_property_type(eye->prop) == PROP_FLOAT) {
-		Scene *scene = CTX_data_scene(C);
-		const int color_manage = scene->r.color_mgt_flag & R_COLOR_MANAGEMENT;
-		float col[4];
-	
-		RNA_property_float_get_array(&eye->ptr, eye->prop, col);
-		
-		glReadBuffer(GL_FRONT);
-		glReadPixels(mx, my, 1, 1, GL_RGB, GL_FLOAT, col);
-		glReadBuffer(GL_BACK);
-	
-		if (RNA_property_array_length(&eye->ptr, eye->prop) < 3) return;
+	glReadBuffer(GL_FRONT);
+	glReadPixels(mx, my, 1, 1, GL_RGB, GL_FLOAT, r_col);
+	glReadBuffer(GL_BACK);
+}
 
-		/* convert from screen (srgb) space to linear rgb space */
-		if (color_manage && RNA_property_subtype(eye->prop) == PROP_COLOR)
-			srgb_to_linearrgb_v3_v3(col, col);
-		
-		RNA_property_float_set_array(&eye->ptr, eye->prop, col);
-		
-		RNA_property_update(C, &eye->ptr, eye->prop);
+/* sets the sample color RGB, maintaining A */
+static void eyedropper_color_set(bContext *C, Eyedropper *eye, const float col[3])
+{
+	float col_conv[4];
+
+	/* to maintain alpha */
+	RNA_property_float_get_array(&eye->ptr, eye->prop, col_conv);
+
+	/* convert from screen (srgb) space to linear rgb space */
+	if (eye->do_color_management) {
+		srgb_to_linearrgb_v3_v3(col_conv, col);
 	}
+	else {
+		copy_v3_v3(col_conv, col);
+	}
+
+	RNA_property_float_set_array(&eye->ptr, eye->prop, col_conv);
+
+	RNA_property_update(C, &eye->ptr, eye->prop);
+}
+
+/* set sample from accumulated values */
+static void eyedropper_color_set_accum(bContext *C, Eyedropper *eye)
+{
+	float col[4];
+	mul_v3_v3fl(col, eye->accum_col, 1.0f / (float)eye->accum_tot);
+	eyedropper_color_set(C, eye, col);
+}
+
+/* single point sample & set */
+static void eyedropper_color_sample(bContext *C, Eyedropper *eye, int mx, int my)
+{
+	float col[3];
+	eyedropper_color_sample_fl(eye, mx, my, col);
+	eyedropper_color_set(C, eye, col);
+}
+
+static void eyedropper_color_sample_accum(Eyedropper *eye, int mx, int my)
+{
+	float col[3];
+	eyedropper_color_sample_fl(eye, mx, my, col);
+	/* delay linear conversion */
+	add_v3_v3(eye->accum_col, col);
+	eye->accum_tot++;
 }
 
 /* main modal status check */
@@ -136,10 +188,35 @@ static int eyedropper_modal(bContext *C, wmOperator *op, wmEvent *event)
 			return eyedropper_cancel(C, op);
 		case LEFTMOUSE:
 			if (event->val == KM_RELEASE) {
-				eyedropper_sample(C, eye, event->x, event->y);
+				if (eye->accum_tot == 0) {
+					eyedropper_color_sample(C, eye, event->x, event->y);
+				}
+				else {
+					eyedropper_color_set_accum(C, eye);
+				}
 				eyedropper_exit(C, op);
 				return OPERATOR_FINISHED;
 			}
+			else if (event->val == KM_PRESS) {
+				/* enable accum and make first sample */
+				eye->accum_start = TRUE;
+				eyedropper_color_sample_accum(eye, event->x, event->y);
+			}
+			break;
+		case MOUSEMOVE:
+			if (eye->accum_start) {
+				/* button is pressed so keep sampling */
+				eyedropper_color_sample_accum(eye, event->x, event->y);
+				eyedropper_color_set_accum(C, eye);
+			}
+			break;
+		case SPACEKEY:
+			if (event->val == KM_RELEASE) {
+				eye->accum_tot = 0;
+				zero_v3(eye->accum_col);
+				eyedropper_color_sample_accum(eye, event->x, event->y);
+				eyedropper_color_set_accum(C, eye);
+			}
 			break;
 	}
 	
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c
index cbe44505263..7f9a998e6d0 100644
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@ -164,6 +164,19 @@ static int panels_re_align(ScrArea *sa, ARegion *ar, Panel **r_pa)
 
 /****************************** panels ******************************/
 
+static void panels_collapse_all(ScrArea *sa, ARegion *ar)
+{
+	Panel *pa;
+	int flag = ((panel_aligned(sa, ar) == BUT_HORIZONTAL) ? PNL_CLOSEDX : PNL_CLOSEDY);
+
+	for (pa = ar->panels.first; pa; pa = pa->next) {
+		if (pa->type && !(pa->type->flag & PNL_NO_HEADER)) {
+			pa->flag = flag;
+		}
+	}
+}
+
+
 static void ui_panel_copy_offset(Panel *pa, Panel *papar)
 {
 	/* with respect to sizes... papar is parent */
@@ -932,7 +945,7 @@ static void check_panel_overlap(ARegion *ar, Panel *panel)
 {
 	Panel *pa;
 
-	/* also called with panel==NULL for clear */
+	/* also called with (panel == NULL) for clear */
 	
 	for (pa = ar->panels.first; pa; pa = pa->next) {
 		pa->flag &= ~PNL_OVERLAP;
@@ -1024,7 +1037,7 @@ static void ui_handle_panel_header(const bContext *C, uiBlock *block, int mx, in
 	else if (block->panel->control & UI_PNL_CLOSE) {
 		/* whole of header can be used to collapse panel (except top-right corner) */
 		if (mx <= block->maxx - 8 - PNL_ICON) button = 2;
-		//else if (mx <= block->minx+10+2*PNL_ICON+2) button= 1;
+		//else if (mx <= block->minx + 10 + 2 * PNL_ICON + 2) button = 1;
 	}
 	else if (mx <= block->maxx - PNL_ICON - 12) {
 		button = 1;
@@ -1074,6 +1087,7 @@ static void ui_handle_panel_header(const bContext *C, uiBlock *block, int mx, in
 
 int ui_handler_panel_region(bContext *C, wmEvent *event)
 {
+	ScrArea *sa = CTX_wm_area(C);
 	ARegion *ar = CTX_wm_region(C);
 	uiBlock *block;
 	Panel *pa;
@@ -1141,6 +1155,8 @@ int ui_handler_panel_region(bContext *C, wmEvent *event)
 				}
 				else if (event->type == LEFTMOUSE) {
 					if (inside_header) {
+						if (event->ctrl)
+							panels_collapse_all(sa, ar);
 						ui_handle_panel_header(C, block, mx, my, 0);
 						break;
 					}
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 5459f689e9f..dd6be9141ca 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -339,13 +339,13 @@ static void rgb_tint(float col[3],
 	float col_hsv_from[3];
 	float col_hsv_to[3];
 
-	rgb_to_hsv(col[0], col[1], col[2],    col_hsv_from + 0, col_hsv_from + 1, col_hsv_from + 2);
+	rgb_to_hsv_v(col, col_hsv_from);
 
 	col_hsv_to[0] = h;
 	col_hsv_to[1] = h_strength;
 	col_hsv_to[2] = (col_hsv_from[2] * (1.0f - v_strength)) + (v * v_strength);
 
-	hsv_to_rgb(col_hsv_to[0], col_hsv_to[1], col_hsv_to[2], col + 0, col + 1, col + 2);
+	hsv_to_rgb_v(col_hsv_to, col);
 }
 
 static void ui_tooltip_region_draw_cb(const bContext *UNUSED(C), ARegion *ar)
@@ -1304,16 +1304,16 @@ static void ui_block_position(wmWindow *window, ARegion *butregion, uiBut *but,
 		}
 	}
 	
-	/*aspect= (float)(block->maxx - block->minx + 4);*/ /*UNUSED*/
+	/* aspect = (float)(block->maxx - block->minx + 4);*/ /*UNUSED*/
 	ui_block_to_window_fl(butregion, but->block, &block->minx, &block->miny);
 	ui_block_to_window_fl(butregion, but->block, &block->maxx, &block->maxy);
 
-	//block->minx-= 2.0; block->miny-= 2.0;
-	//block->maxx+= 2.0; block->maxy+= 2.0;
+	//block->minx -= 2.0; block->miny -= 2.0;
+	//block->maxx += 2.0; block->maxy += 2.0;
 	
 	xsize = block->maxx - block->minx + 4; // 4 for shadow
 	ysize = block->maxy - block->miny + 4;
-	/*aspect/= (float)xsize;*/ /*UNUSED*/
+	/* aspect /= (float)xsize;*/ /*UNUSED*/
 
 	{
 		int left = 0, right = 0, top = 0, down = 0;
@@ -1847,7 +1847,7 @@ void ui_set_but_hsv(uiBut *but)
 	float col[3];
 	float *hsv = ui_block_hsv_get(but->block);
 	
-	hsv_to_rgb(hsv[0], hsv[1], hsv[2], col, col + 1, col + 2);
+	hsv_to_rgb_v(hsv, col);
 	ui_set_but_vectorf(but, col);
 }
 
@@ -1860,7 +1860,7 @@ static void ui_update_block_buts_rgb(uiBlock *block, const float rgb[3])
 	/* this is to keep the H and S value when V is equal to zero
 	 * and we are working in HSV mode, of course!
 	 */
-	rgb_to_hsv_compat(rgb[0], rgb[1], rgb[2], hsv, hsv + 1, hsv + 2);
+	rgb_to_hsv_compat_v(rgb, hsv);
 	
 	// this updates button strings, is hackish... but button pointers are on stack of caller function
 	for (bt = block->buttons.first; bt; bt = bt->next) {
@@ -1942,7 +1942,7 @@ static void do_hsv_rna_cb(bContext *UNUSED(C), void *bt1, void *UNUSED(arg))
 	float rgb[3];
 	float *hsv = ui_block_hsv_get(but->block);
 	
-	hsv_to_rgb(hsv[0], hsv[1], hsv[2], rgb, rgb + 1, rgb + 2);
+	hsv_to_rgb_v(hsv, rgb);
 	
 	ui_update_block_buts_rgb(but->block, rgb);
 	
@@ -2157,7 +2157,7 @@ static void uiBlockPicker(uiBlock *block, float rgba[4], PointerRNA *ptr, Proper
 	uiButSetFunc(bt, do_hex_rna_cb, bt, hexcol);
 	uiDefBut(block, LABEL, 0, IFACE_("(Gamma Corrected)"), 0, -80, butwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
 
-	rgb_to_hsv(rgba[0], rgba[1], rgba[2], hsv, hsv + 1, hsv + 2);
+	rgb_to_hsv_v(rgba, hsv);
 
 	picker_new_hide_reveal(block, colormode);
 }
@@ -2178,18 +2178,18 @@ static int ui_picker_small_wheel_cb(const bContext *UNUSED(C), uiBlock *block, w
 		for (but = block->buttons.first; but; but = but->next) {
 			if (but->type == HSVCUBE && but->active == NULL) {
 				uiPopupBlockHandle *popup = block->handle;
-				float col[3];
+				float rgb[3];
 				float *hsv = ui_block_hsv_get(block);
 				
-				ui_get_but_vectorf(but, col);
+				ui_get_but_vectorf(but, rgb);
 				
-				rgb_to_hsv_compat(col[0], col[1], col[2], hsv, hsv + 1, hsv + 2);
+				rgb_to_hsv_compat_v(rgb, hsv);
 				hsv[2] = CLAMPIS(hsv[2] + add, 0.0f, 1.0f);
-				hsv_to_rgb(hsv[0], hsv[1], hsv[2], col, col + 1, col + 2);
+				hsv_to_rgb_v(hsv, rgb);
 
-				ui_set_but_vectorf(but, col);
+				ui_set_but_vectorf(but, rgb);
 				
-				ui_update_block_buts_rgb(block, col);
+				ui_update_block_buts_rgb(block, rgb);
 				if (popup)
 					popup->menuretval = UI_RETURN_UPDATE;
 				
@@ -2706,7 +2706,7 @@ void uiPupBlockEx(bContext *C, uiBlockCreateFunc func, uiBlockHandleFunc popup_f
 	handle->popup_arg = arg;
 	handle->popup_func = popup_func;
 	handle->cancel_func = cancel_func;
-	// handle->opcontext= opcontext;
+	// handle->opcontext = opcontext;
 	
 	UI_add_popup_handlers(C, &window->modalhandlers, handle);
 	WM_event_add_mousemove(C);
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 6d1766c8bf1..2d9c6ee7657 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -350,7 +350,7 @@ static void template_ID(bContext *C, uiLayout *layout, TemplateID *template, Str
 	idptr = RNA_property_pointer_get(&template->ptr, template->prop);
 	id = idptr.data;
 	idfrom = template->ptr.id.data;
-	// lb= template->idlb;
+	// lb = template->idlb;
 
 	block = uiLayoutGetBlock(layout);
 	uiBlockBeginAlign(block);
@@ -579,8 +579,10 @@ void uiTemplateAnyID(uiLayout *layout, PointerRNA *ptr, const char *propname, co
 	row = uiLayoutRow(layout, 1);
 	
 	/* Label - either use the provided text, or will become "ID-Block:" */
-	if (text)
-		uiItemL(row, text, ICON_NONE);
+	if (text) {
+		if (text[0])
+			uiItemL(row, text, ICON_NONE);
+	}
 	else
 		uiItemL(row, "ID-Block:", ICON_NONE);
 	
@@ -2239,6 +2241,20 @@ static void list_item_row(bContext *C, uiLayout *layout, PointerRNA *ptr, Pointe
 			uiItemL(split, name, ICON_OBJECT_DATA);
 		}
 	}
+	else if (itemptr->type == &RNA_MaskLayer) {
+		split = uiLayoutSplit(sub, 0.5f, 0);
+
+		uiItemL(split, name, icon);
+
+		uiBlockSetEmboss(block, UI_EMBOSSN);
+		row = uiLayoutRow(split, 1);
+		// uiItemR(row, itemptr, "alpha", 0, "", ICON_NONE); // enable when used
+		uiItemR(row, itemptr, "hide", 0, "", 0);
+		uiItemR(row, itemptr, "hide_select", 0, "", 0);
+		uiItemR(row, itemptr, "hide_render", 0, "", 0);
+
+		uiBlockSetEmboss(block, UI_EMBOSS);
+	}
 
 	/* There is a last chance to display custom controls (in addition to the name/label):
 	 * If the given item property group features a string property named as prop_list,
@@ -2299,7 +2315,7 @@ static void list_item_row(bContext *C, uiLayout *layout, PointerRNA *ptr, Pointe
 
 void uiTemplateList(uiLayout *layout, bContext *C, PointerRNA *ptr, const char *propname, PointerRNA *activeptr, const char *activepropname, const char *prop_list, int rows, int maxrows, int listtype)
 {
-	//Scene *scene= CTX_data_scene(C);
+	//Scene *scene = CTX_data_scene(C);
 	PropertyRNA *prop = NULL, *activeprop;
 	PropertyType type, activetype;
 	StructRNA *ptype;
diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c
index a0b83b5fef4..9773918e508 100644
--- a/source/blender/editors/interface/interface_utils.c
+++ b/source/blender/editors/interface/interface_utils.c
@@ -130,7 +130,13 @@ uiBut *uiDefAutoButR(uiBlock *block, PointerRNA *ptr, PropertyRNA *prop, int ind
 	return but;
 }
 
-int uiDefAutoButsRNA(uiLayout *layout, PointerRNA *ptr, int (*check_prop)(PointerRNA *, PropertyRNA *), const char label_align)
+/**
+ * \a check_prop callback filters functions to avoid drawing certain properties,
+ * in cases where PROP_HIDDEN flag can't be used for a property.
+ */
+int uiDefAutoButsRNA(uiLayout *layout, PointerRNA *ptr,
+                     int (*check_prop)(PointerRNA *, PropertyRNA *),
+                     const char label_align)
 {
 	uiLayout *split, *col;
 	int flag;
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 4d483b69ca2..004c5306d65 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -162,9 +162,10 @@ static unsigned int scroll_circle_face[14][3] = {
 };
 
 
-static float menu_tria_vert[6][2]= {
-{-0.33, 0.16}, {0.33, 0.16}, {0, 0.82}, 
-{0, -0.82}, {-0.33, -0.16}, {0.33, -0.16}};
+static float menu_tria_vert[6][2] = {
+	{-0.33, 0.16}, {0.33, 0.16}, {0, 0.82},
+	{0, -0.82}, {-0.33, -0.16}, {0.33, -0.16}
+};
 
 
 
@@ -1168,7 +1169,7 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
 
 #if 0
 	ui_rasterpos_safe(x, y, but->aspect);
-	if (but->type == IDPOIN) transopts = 0;	// no translation, of course!
+	if (but->type == IDPOIN) transopts = 0;  // no translation, of course!
 	else transopts = ui_translate_buttons();
 #endif
 
@@ -1885,7 +1886,7 @@ static void ui_draw_but_HSVCIRCLE(uiBut *but, uiWidgetColors *wcol, rcti *rect)
 	/* color */
 	ui_get_but_vectorf(but, rgb);
 	copy_v3_v3(hsv, ui_block_hsv_get(but->block));
-	rgb_to_hsv_compat(rgb[0], rgb[1], rgb[2], hsv, hsv + 1, hsv + 2);
+	rgb_to_hsv_compat_v(rgb, hsv);
 	copy_v3_v3(hsvo, hsv);
 	
 	/* exception: if 'lock' is set
@@ -1911,7 +1912,7 @@ static void ui_draw_but_HSVCIRCLE(uiBut *but, uiWidgetColors *wcol, rcti *rect)
 		ui_hsvcircle_vals_from_pos(hsv, hsv + 1, rect, centx + co * radius, centy + si * radius);
 		CLAMP(hsv[2], 0.0f, 1.0f); /* for display only */
 
-		hsv_to_rgb(hsv[0], hsv[1], hsv[2], col, col + 1, col + 2);
+		hsv_to_rgb_v(hsv, col);
 		glColor3fv(col);
 		glVertex2f(centx + co * radius, centy + si * radius);
 	}
@@ -2081,37 +2082,31 @@ void ui_draw_gradient(rcti *rect, const float hsv[3], int type, float alpha)
 
 static void ui_draw_but_HSVCUBE(uiBut *but, rcti *rect)
 {
-	float rgb[3], h, s, v;
+	float rgb[3];
 	float x = 0.0f, y = 0.0f;
 	float *hsv = ui_block_hsv_get(but->block);
-	float hsvn[3];
+	float hsv_n[3];
 	
-	h = hsv[0];
-	s = hsv[1];
-	v = hsv[2];
+	copy_v3_v3(hsv_n, hsv);
 	
 	ui_get_but_vectorf(but, rgb);
-	rgb_to_hsv_compat(rgb[0], rgb[1], rgb[2], &h, &s, &v);
-
-	hsvn[0] = h;
-	hsvn[1] = s;
-	hsvn[2] = v;
+	rgb_to_hsv_compat_v(rgb, hsv_n);
 	
-	ui_draw_gradient(rect, hsvn, but->a1, 1.f);
+	ui_draw_gradient(rect, hsv_n, but->a1, 1.0f);
 	
 	switch ((int)but->a1) {
 		case UI_GRAD_SV:
-			x = v; y = s; break;
+			x = hsv_n[2]; y = hsv_n[1]; break;
 		case UI_GRAD_HV:
-			x = h; y = v; break;
+			x = hsv_n[0]; y = hsv_n[2]; break;
 		case UI_GRAD_HS:
-			x = h; y = s; break;
+			x = hsv_n[0]; y = hsv_n[1]; break;
 		case UI_GRAD_H:
-			x = h; y = 0.5; break;
+			x = hsv_n[0]; y = 0.5; break;
 		case UI_GRAD_S:
-			x = s; y = 0.5; break;
+			x = hsv_n[1]; y = 0.5; break;
 		case UI_GRAD_V:
-			x = v; y = 0.5; break;
+			x = hsv_n[2]; y = 0.5; break;
 	}
 	
 	/* cursor */
@@ -2140,7 +2135,7 @@ static void ui_draw_but_HSV_v(uiBut *but, rcti *rect)
 		color_profile = BLI_PR_NONE;
 
 	ui_get_but_vectorf(but, rgb);
-	rgb_to_hsv(rgb[0], rgb[1], rgb[2], hsv, hsv + 1, hsv + 2);
+	rgb_to_hsv_v(rgb, hsv);
 	v = hsv[2];
 	
 	if (color_profile)
@@ -2251,7 +2246,7 @@ void ui_draw_link_bezier(rcti *rect)
 	
 	if (ui_link_bezier_points(rect, coord_array, LINK_RESOL)) {
 		/* we can reuse the dist variable here to increment the GL curve eval amount*/
-		// const float dist= 1.0f/(float)LINK_RESOL; // UNUSED
+		// const float dist = 1.0f/(float)LINK_RESOL; // UNUSED
 
 		glEnable(GL_BLEND);
 		glEnable(GL_LINE_SMOOTH);
@@ -3139,7 +3134,7 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct
 					if (but->drawflag & UI_BUT_DRAW_ENUM_ARROWS)
 						wt = widget_type(UI_WTYPE_MENU_RADIO);  /* with arrows */
 					else
-						wt = widget_type(UI_WTYPE_MENU_ICON_RADIO); /* no arrows */
+						wt = widget_type(UI_WTYPE_MENU_ICON_RADIO);  /* no arrows */
 				}
 				/* with menu arrows */
 				else
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 0d16e0f4dc0..02f34873ea7 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -363,6 +363,8 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo
 					cp = ts->syntaxv; break;
 				case TH_NODE_GROUP:
 					cp = ts->syntaxc; break;
+				case TH_NODE_FRAME:
+					cp = ts->movie; break;
 				case TH_NODE_CURVING:
 					cp = &ts->noodle_curving; break;
 
@@ -370,6 +372,8 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo
 					cp = ts->movie; break;
 				case TH_SEQ_MOVIECLIP:
 					cp = ts->movieclip; break;
+				case TH_SEQ_MASK:
+					cp = ts->mask; break;
 				case TH_SEQ_IMAGE:
 					cp = ts->image; break;
 				case TH_SEQ_SCENE:
@@ -378,8 +382,6 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo
 					cp = ts->audio; break;
 				case TH_SEQ_EFFECT:
 					cp = ts->effect; break;
-				case TH_SEQ_PLUGIN:
-					cp = ts->plugin; break;
 				case TH_SEQ_TRANSITION:
 					cp = ts->transition; break;
 				case TH_SEQ_META:
@@ -473,6 +475,39 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo
 				case TH_SKIN_ROOT:
 					cp = ts->skin_root;
 					break;
+					
+				case TH_ANIM_ACTIVE:
+					cp = ts->anim_active;
+					break;
+				case TH_ANIM_INACTIVE:
+					cp = ts->anim_non_active;
+					break;
+				
+				case TH_NLA_TWEAK:
+					cp = ts->nla_tweaking;
+					break;
+				case TH_NLA_TWEAK_DUPLI:
+					cp = ts->nla_tweakdupli;
+					break;
+				
+				case TH_NLA_TRANSITION:
+					cp = ts->nla_transition;
+					break;
+				case TH_NLA_TRANSITION_SEL:
+					cp = ts->nla_transition_sel;
+					break;
+				case TH_NLA_META:
+					cp = ts->nla_meta;
+					break;
+				case TH_NLA_META_SEL:
+					cp = ts->nla_meta_sel;
+					break;
+				case TH_NLA_SOUND:
+					cp = ts->nla_sound;
+					break;
+				case TH_NLA_SOUND_SEL:
+					cp = ts->nla_sound_sel;
+					break;
 			}
 		}
 	}
@@ -735,19 +770,34 @@ void ui_theme_init_default(void)
 	rgba_char_args_set(btheme->tipo.handle_sel_auto_clamped, 0xf0, 0xaf, 0x90, 255);
 	btheme->tipo.handle_vertex_size = 4;
 	
-	rgba_char_args_set(btheme->tipo.ds_channel,     82, 96, 110, 255);
+	rgba_char_args_set(btheme->tipo.ds_channel,      82, 96, 110, 255);
 	rgba_char_args_set(btheme->tipo.ds_subchannel,  124, 137, 150, 255);
-	rgba_char_args_set(btheme->tipo.group, 79, 101, 73, 255);
-	rgba_char_args_set(btheme->tipo.group_active, 135, 177, 125, 255);
+	rgba_char_args_set(btheme->tipo.group,           79, 101, 73, 255);
+	rgba_char_args_set(btheme->tipo.group_active,   135, 177, 125, 255);
 
 	/* dopesheet */
 	btheme->tact = btheme->tipo;
 	rgba_char_args_set(btheme->tact.strip,          12, 10, 10, 128);
 	rgba_char_args_set(btheme->tact.strip_select,   255, 140, 0, 255);
 	
+	rgba_char_args_set(btheme->tact.anim_active,    204, 112, 26, 102);
+	
 	/* space nla */
 	btheme->tnla = btheme->tact;
 	
+	rgba_char_args_set(btheme->tnla.anim_active,     204, 112, 26, 102); /* same as for dopesheet; duplicate here for easier reference */
+	rgba_char_args_set(btheme->tnla.anim_non_active, 153, 135, 97, 77);
+	
+	rgba_char_args_set(btheme->tnla.nla_tweaking,   77, 243, 26, 77);
+	rgba_char_args_set(btheme->tnla.nla_tweakdupli, 217, 0, 0, 255);
+	
+	rgba_char_args_set(btheme->tnla.nla_transition,     28, 38, 48, 255);
+	rgba_char_args_set(btheme->tnla.nla_transition_sel, 46, 117, 219, 255);
+	rgba_char_args_set(btheme->tnla.nla_meta,           51, 38, 66, 255);
+	rgba_char_args_set(btheme->tnla.nla_meta_sel,       105, 33, 150, 255);
+	rgba_char_args_set(btheme->tnla.nla_sound,          43, 61, 61, 255);
+	rgba_char_args_set(btheme->tnla.nla_sound_sel,      31, 122, 122, 255);
+	
 	/* space file */
 	/* to have something initialized */
 	btheme->tfile = btheme->tv3d;
@@ -771,11 +821,11 @@ void ui_theme_init_default(void)
 	rgba_char_args_set(btheme->tseq.back,   116, 116, 116, 255);
 	rgba_char_args_set(btheme->tseq.movie,  81, 105, 135, 255);
 	rgba_char_args_set(btheme->tseq.movieclip,  32, 32, 143, 255);
+	rgba_char_args_set(btheme->tseq.mask,   152, 78, 62, 255);
 	rgba_char_args_set(btheme->tseq.image,  109, 88, 129, 255);
 	rgba_char_args_set(btheme->tseq.scene,  78, 152, 62, 255);
 	rgba_char_args_set(btheme->tseq.audio,  46, 143, 143, 255);
 	rgba_char_args_set(btheme->tseq.effect,     169, 84, 124, 255);
-	rgba_char_args_set(btheme->tseq.plugin,     126, 126, 80, 255);
 	rgba_char_args_set(btheme->tseq.transition, 162, 95, 111, 255);
 	rgba_char_args_set(btheme->tseq.meta,   109, 145, 131, 255);
 	rgba_char_args_set(btheme->tseq.preview_back,   0, 0, 0, 255);
@@ -1044,6 +1094,17 @@ void UI_GetThemeColor3fv(int colorid, float col[3])
 	col[2] = ((float)cp[2]) / 255.0f;
 }
 
+void UI_GetThemeColor4fv(int colorid, float col[4])
+{
+	const unsigned char *cp;
+	
+	cp = UI_ThemeGetColorPtr(theme_active, theme_spacetype, colorid);
+	col[0] = ((float)cp[0]) / 255.0f;
+	col[1] = ((float)cp[1]) / 255.0f;
+	col[2] = ((float)cp[2]) / 255.0f;
+	col[3] = ((float)cp[3]) / 255.0f;
+}
+
 // get the color, range 0.0-1.0, complete with shading offset
 void UI_GetThemeColorShade3fv(int colorid, int offset, float col[3])
 {
@@ -1248,7 +1309,6 @@ void init_userdef_do_versions(void)
 	vDM_ColorBand_store((U.flag & USER_CUSTOM_RANGE) ? (&U.coba_weight) : NULL);
 
 	if (bmain->versionfile <= 191) {
-		BLI_strncpy(U.plugtexdir, U.textudir, sizeof(U.plugtexdir));
 		strcpy(U.sounddir, "/");
 	}
 	
@@ -1265,7 +1325,7 @@ void init_userdef_do_versions(void)
 		if (U.undosteps == 0) U.undosteps = 32;
 		
 		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
-			/* check for alpha==0 is safe, then color was never set */
+			/* check for (alpha == 0) is safe, then color was never set */
 			if (btheme->tv3d.edge_seam[3] == 0) {
 				rgba_char_args_set(btheme->tv3d.edge_seam, 230, 150, 50, 255);
 			}
@@ -1290,7 +1350,7 @@ void init_userdef_do_versions(void)
 		bTheme *btheme;
 		/* new space type */
 		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
-			/* check for alpha==0 is safe, then color was never set */
+			/* check for (alpha == 0) is safe, then color was never set */
 			if (btheme->ttime.back[3] == 0) {
 				// copied from ui_theme_init_default
 				btheme->ttime = btheme->tv3d;
@@ -1369,7 +1429,6 @@ void init_userdef_do_versions(void)
 				rgba_char_args_set(btheme->tseq.scene,  78, 152, 62, 255);
 				rgba_char_args_set(btheme->tseq.audio,  46, 143, 143, 255);
 				rgba_char_args_set(btheme->tseq.effect,     169, 84, 124, 255);
-				rgba_char_args_set(btheme->tseq.plugin,     126, 126, 80, 255);
 				rgba_char_args_set(btheme->tseq.transition, 162, 95, 111, 255);
 				rgba_char_args_set(btheme->tseq.meta,   109, 145, 131, 255);
 			}
@@ -1819,6 +1878,38 @@ void init_userdef_do_versions(void)
 		for (btheme = U.themes.first; btheme; btheme = btheme->next)
 			rgba_char_args_set(btheme->tv3d.skin_root, 180, 77, 77, 255);
 	}
+	
+	if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 7)) {
+		bTheme *btheme;
+		
+		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+			/* DopeSheet Summary */
+			rgba_char_args_set(btheme->tact.anim_active,    204, 112, 26, 102); 
+			
+			/* NLA Colors */
+			rgba_char_args_set(btheme->tnla.anim_active,    204, 112, 26, 102); /* same as dopesheet above */
+			rgba_char_args_set(btheme->tnla.anim_non_active,153, 135, 97, 77);
+			
+			rgba_char_args_set(btheme->tnla.nla_tweaking,   77, 243, 26, 77);
+			rgba_char_args_set(btheme->tnla.nla_tweakdupli, 217, 0, 0, 255);
+			
+			rgba_char_args_set(btheme->tnla.nla_transition,     28, 38, 48, 255);
+			rgba_char_args_set(btheme->tnla.nla_transition_sel, 46, 117, 219, 255);
+			rgba_char_args_set(btheme->tnla.nla_meta,           51, 38, 66, 255);
+			rgba_char_args_set(btheme->tnla.nla_meta_sel,       105, 33, 150, 255);
+			rgba_char_args_set(btheme->tnla.nla_sound,          43, 61, 61, 255);
+			rgba_char_args_set(btheme->tnla.nla_sound_sel,      31, 122, 122, 255);
+		}
+	}
+
+	if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 11)) {
+		bTheme *btheme;
+		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+			if (btheme->tseq.movieclip[0] == 0) {
+				rgba_char_args_set(btheme->tseq.mask,  152, 78, 62, 255);
+			}
+		}
+	}
 
 	/* GL Texture Garbage Collection (variable abused above!) */
 	if (U.textimeout == 0) {
diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c
index 1d315e9a5b8..b2227405d8b 100644
--- a/source/blender/editors/interface/view2d.c
+++ b/source/blender/editors/interface/view2d.c
@@ -272,7 +272,7 @@ void UI_view2d_region_reinit(View2D *v2d, short type, int winx, int winy)
 				v2d->keepzoom = (V2D_KEEPASPECT | V2D_LIMITZOOM | V2D_KEEPZOOM);
 				v2d->minzoom = 0.5f;
 				v2d->maxzoom = 2.0f;
-				//tot_changed= 1;
+				//tot_changed = 1;
 				
 				v2d->align = (V2D_ALIGN_NO_NEG_X | V2D_ALIGN_NO_POS_Y);
 				v2d->keeptot = V2D_KEEPTOT_BOUNDS;
@@ -428,7 +428,7 @@ void UI_view2d_curRect_validate_resize(View2D *v2d, int resize)
 		if (winx != v2d->oldwinx) do_x = TRUE;
 		if (winy != v2d->oldwiny) do_y = TRUE;
 		
-		/* curRatio= height / width; */ /* UNUSED */
+		/* curRatio = height / width; */ /* UNUSED */
 		winRatio = winy / winx;
 		
 		/* both sizes change (area/region maximised)  */
@@ -442,7 +442,7 @@ void UI_view2d_curRect_validate_resize(View2D *v2d, int resize)
 			else do_x = TRUE;
 		}
 		do_cur = do_x;
-		/* do_win= do_y; */ /* UNUSED */
+		/* do_win = do_y; */ /* UNUSED */
 		
 		if (do_cur) {
 			if ((v2d->keeptot == V2D_KEEPTOT_STRICT) && (winx != v2d->oldwinx)) {
@@ -806,7 +806,7 @@ void UI_view2d_curRect_reset(View2D *v2d)
 		v2d->cur.xmax = (float)width;
 	}
 	else {
-		/* width is centered around x==0 */
+		/* width is centered around (x == 0) */
 		const float dx = (float)width / 2.0f;
 		
 		v2d->cur.xmin = -dx;
@@ -825,7 +825,7 @@ void UI_view2d_curRect_reset(View2D *v2d)
 		v2d->cur.ymax = (float)height;
 	}
 	else {
-		/* height is centered around y==0 */
+		/* height is centered around (y == 0) */
 		const float dy = (float)height / 2.0f;
 		
 		v2d->cur.ymin = -dy;
@@ -869,7 +869,7 @@ void UI_view2d_totRect_set_resize(View2D *v2d, int width, int height, int resize
 		v2d->tot.xmax = (float)width;
 	}
 	else {
-		/* width is centered around x==0 */
+		/* width is centered around (x == 0) */
 		const float dx = (float)width / 2.0f;
 		
 		v2d->tot.xmin = -dx;
@@ -888,7 +888,7 @@ void UI_view2d_totRect_set_resize(View2D *v2d, int width, int height, int resize
 		v2d->tot.ymax = (float)height;
 	}
 	else {
-		/* height is centered around y==0 */
+		/* height is centered around (y == 0) */
 		const float dy = (float)height / 2.0f;
 		
 		v2d->tot.ymin = -dy;
diff --git a/source/blender/blenpluginapi/CMakeLists.txt b/source/blender/editors/mask/CMakeLists.txt
index 3e40b5bb0e5..57be5a2234a 100644
--- a/source/blender/blenpluginapi/CMakeLists.txt
+++ b/source/blender/editors/mask/CMakeLists.txt
@@ -14,45 +14,39 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
-# The Original Code is Copyright (C) 2006, Blender Foundation
-# All rights reserved.
+# The Original Code is Copyright (C) 2012 Blender Foundation.
 #
-# The Original Code is: all of this file.
-#
-# Contributor(s): Jacques Beaurain.
+# Contributor(s): Blender Foundation,
+#                 Sergey Sharybin
 #
 # ***** END GPL LICENSE BLOCK *****
 
-set(INC 
-	.
-	..
-	../blenlib
-	../blenloader
-	../imbuf
-	../makesdna
-	../../../intern/guardedalloc
+set(INC
+	../include
+	../../blenkernel
+	../../blenloader
+	../../blenlib
+	../../makesdna
+	../../makesrna
+	../../windowmanager
+	../../../../intern/guardedalloc
+	${GLEW_INCLUDE_PATH}
 )
 
 set(INC_SYS
-
 )
 
 set(SRC
-	intern/pluginapi.c
+	mask_add.c
+	mask_draw.c
+	mask_edit.c
+	mask_editaction.c
+	mask_ops.c
+	mask_relationships.c
+	mask_select.c
+	mask_shapekey.c
 
-	documentation.h
-	externdef.h
-	floatpatch.h
-	iff.h
-	plugin.h
-	util.h
+	mask_intern.h
 )
 
-if(WITH_CODEC_QUICKTIME)
-	list(APPEND INC_SYS
-		${QUICKTIME_INCLUDE_DIRS}
-	)
-	add_definitions(-DWITH_QUICKTIME)
-endif()
-
-blender_add_lib(bf_blenpluginapi "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_mask "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/mask/SConscript b/source/blender/editors/mask/SConscript
new file mode 100644
index 00000000000..4af000d038d
--- /dev/null
+++ b/source/blender/editors/mask/SConscript
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+Import ('env')
+
+sources = env.Glob('*.c')
+defs = []
+incs = '../include ../../blenkernel ../../blenloader ../../blenlib ../../windowmanager ../../makesdna'
+incs += ' ../../makesrna #/extern/glew/include #/intern/guardedalloc'
+
+env.BlenderLib ( 'bf_editors_mask', sources, Split(incs), defs, libtype=['core'], priority=[100] )
diff --git a/source/blender/editors/mask/mask_add.c b/source/blender/editors/mask/mask_add.c
new file mode 100644
index 00000000000..0bc9adb6577
--- /dev/null
+++ b/source/blender/editors/mask/mask_add.c
@@ -0,0 +1,711 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2012 Blender Foundation.
+ * All rights reserved.
+ *
+ *
+ * Contributor(s): Blender Foundation,
+ *                 Sergey Sharybin
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/mask/mask_add.c
+ *  \ingroup edmask
+ */
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_math.h"
+
+#include "BKE_context.h"
+#include "BKE_depsgraph.h"
+#include "BKE_mask.h"
+
+#include "DNA_scene_types.h"
+#include "DNA_mask_types.h"
+#include "DNA_object_types.h"  /* SELECT */
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "ED_mask.h"  /* own include */
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "mask_intern.h"  /* own include */
+
+
+static int find_nearest_diff_point(bContext *C, Mask *mask, const float normal_co[2], int threshold, int feather,
+                                   MaskLayer **masklay_r, MaskSpline **spline_r, MaskSplinePoint **point_r,
+                                   float *u_r, float tangent[2],
+                                   const short use_deform)
+{
+	MaskLayer *masklay, *point_masklay;
+	MaskSpline *point_spline;
+	MaskSplinePoint *point = NULL;
+	float dist, co[2];
+	int width, height;
+	float u;
+	float scalex, scaley, aspx, aspy;
+
+	ED_mask_size(C, &width, &height);
+	ED_mask_aspect(C, &aspx, &aspy);
+	ED_mask_pixelspace_factor(C, &scalex, &scaley);
+
+	co[0] = normal_co[0] * scalex;
+	co[1] = normal_co[1] * scaley;
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskSpline *spline;
+
+		if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+			continue;
+		}
+
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			int i;
+			MaskSplinePoint *cur_point;
+
+			for (i = 0, cur_point = use_deform ? spline->points_deform : spline->points;
+			     i < spline->tot_point;
+			     i++, cur_point++)
+			{
+				float *diff_points;
+				int tot_diff_point;
+
+				diff_points = BKE_mask_point_segment_diff_with_resolution(spline, cur_point, width, height,
+				                                                          &tot_diff_point);
+
+				if (diff_points) {
+					int i, tot_feather_point, tot_point;
+					float *feather_points = NULL, *points;
+
+					if (feather) {
+						feather_points = BKE_mask_point_segment_feather_diff_with_resolution(spline, cur_point,
+						                                                                     width, height,
+						                                                                     &tot_feather_point);
+
+						points = feather_points;
+						tot_point = tot_feather_point;
+					}
+					else {
+						points = diff_points;
+						tot_point = tot_diff_point;
+					}
+
+					for (i = 0; i < tot_point - 1; i++) {
+						float cur_dist, a[2], b[2];
+
+						a[0] = points[2 * i] * scalex;
+						a[1] = points[2 * i + 1] * scaley;
+
+						b[0] = points[2 * i + 2] * scalex;
+						b[1] = points[2 * i + 3] * scaley;
+
+						cur_dist = dist_to_line_segment_v2(co, a, b);
+
+						if (point == NULL || cur_dist < dist) {
+							if (tangent)
+								sub_v2_v2v2(tangent, &diff_points[2 * i + 2], &diff_points[2 * i]);
+
+							point_masklay = masklay;
+							point_spline = spline;
+							point = use_deform ? &spline->points[(cur_point - spline->points_deform)] : cur_point;
+							dist = cur_dist;
+							u = (float)i / tot_point;
+
+						}
+					}
+
+					if (feather_points)
+						MEM_freeN(feather_points);
+
+					MEM_freeN(diff_points);
+				}
+			}
+		}
+	}
+
+	if (point && dist < threshold) {
+		if (masklay_r)
+			*masklay_r = point_masklay;
+
+		if (spline_r)
+			*spline_r = point_spline;
+
+		if (point_r)
+			*point_r = point;
+
+		if (u_r) {
+			u = BKE_mask_spline_project_co(point_spline, point, u, normal_co, MASK_PROJ_ANY);
+
+			*u_r = u;
+		}
+
+		return TRUE;
+	}
+
+	if (masklay_r)
+		*masklay_r = NULL;
+
+	if (spline_r)
+		*spline_r = NULL;
+
+	if (point_r)
+		*point_r = NULL;
+
+	return FALSE;
+}
+
+/******************** add vertex *********************/
+
+static void setup_vertex_point(bContext *C, Mask *mask, MaskSpline *spline, MaskSplinePoint *new_point,
+                               const float point_co[2], const float tangent[2], const float u,
+                               MaskSplinePoint *reference_point, const short reference_adjacent)
+{
+	MaskSplinePoint *prev_point = NULL;
+	MaskSplinePoint *next_point = NULL;
+	BezTriple *bezt;
+	int width, height;
+	float co[3];
+	const float len = 20.0; /* default length of handle in pixel space */
+
+	copy_v2_v2(co, point_co);
+	co[2] = 0.0f;
+
+	ED_mask_size(C, &width, &height);
+
+	/* point coordinate */
+	bezt = &new_point->bezt;
+
+	bezt->h1 = bezt->h2 = HD_ALIGN;
+
+	if (reference_point) {
+		bezt->h1 = bezt->h2 = MAX2(reference_point->bezt.h2, reference_point->bezt.h1);
+	}
+	else if (reference_adjacent) {
+		if (spline->tot_point != 1) {
+			int index = (int)(new_point - spline->points);
+			prev_point = &spline->points[(index - 1) % spline->tot_point];
+			next_point = &spline->points[(index + 1) % spline->tot_point];
+
+			bezt->h1 = bezt->h2 = MAX2(prev_point->bezt.h2, next_point->bezt.h1);
+
+			/* note, we may want to copy other attributes later, radius? pressure? color? */
+		}
+	}
+
+	copy_v3_v3(bezt->vec[0], co);
+	copy_v3_v3(bezt->vec[1], co);
+	copy_v3_v3(bezt->vec[2], co);
+
+	/* initial offset for handles */
+	if (spline->tot_point == 1) {
+		/* first point of splien is aligned horizontally */
+		bezt->vec[0][0] -= len / width;
+		bezt->vec[2][0] += len / width;
+	}
+	else if (tangent) {
+		float vec[2];
+
+		copy_v2_v2(vec, tangent);
+
+		vec[0] *= width;
+		vec[1] *= height;
+
+		mul_v2_fl(vec, len / len_v2(vec));
+
+		vec[0] /= width;
+		vec[1] /= height;
+
+		sub_v2_v2(bezt->vec[0], vec);
+		add_v2_v2(bezt->vec[2], vec);
+
+		if (reference_adjacent) {
+			BKE_mask_calc_handle_adjacent_interp(spline, new_point, u);
+		}
+	}
+	else {
+
+		/* calculating auto handles works much nicer */
+#if 0
+		/* next points are aligning in the direction of previous/next point */
+		MaskSplinePoint *point;
+		float v1[2], v2[2], vec[2];
+		float dir = 1.0f;
+
+		if (new_point == spline->points) {
+			point = new_point + 1;
+			dir = -1.0f;
+		}
+		else
+			point = new_point - 1;
+
+		if (spline->tot_point < 3) {
+			v1[0] = point->bezt.vec[1][0] * width;
+			v1[1] = point->bezt.vec[1][1] * height;
+
+			v2[0] = new_point->bezt.vec[1][0] * width;
+			v2[1] = new_point->bezt.vec[1][1] * height;
+		}
+		else {
+			if (new_point == spline->points) {
+				v1[0] = spline->points[1].bezt.vec[1][0] * width;
+				v1[1] = spline->points[1].bezt.vec[1][1] * height;
+
+				v2[0] = spline->points[spline->tot_point - 1].bezt.vec[1][0] * width;
+				v2[1] = spline->points[spline->tot_point - 1].bezt.vec[1][1] * height;
+			}
+			else {
+				v1[0] = spline->points[0].bezt.vec[1][0] * width;
+				v1[1] = spline->points[0].bezt.vec[1][1] * height;
+
+				v2[0] = spline->points[spline->tot_point - 2].bezt.vec[1][0] * width;
+				v2[1] = spline->points[spline->tot_point - 2].bezt.vec[1][1] * height;
+			}
+		}
+
+		sub_v2_v2v2(vec, v1, v2);
+		mul_v2_fl(vec, len * dir / len_v2(vec));
+
+		vec[0] /= width;
+		vec[1] /= height;
+
+		add_v2_v2(bezt->vec[0], vec);
+		sub_v2_v2(bezt->vec[2], vec);
+#else
+		BKE_mask_calc_handle_point_auto(spline, new_point, TRUE);
+		BKE_mask_calc_handle_adjacent_interp(spline, new_point, u);
+
+#endif
+	}
+
+	BKE_mask_parent_init(&new_point->parent);
+
+	/* select new point */
+	MASKPOINT_SEL_ALL(new_point);
+	ED_mask_select_flush_all(mask);
+}
+
+
+/* **** add extrude vertex **** */
+
+static void finSelectedSplinePoint(MaskLayer *masklay, MaskSpline **spline, MaskSplinePoint **point, short check_active)
+{
+	MaskSpline *cur_spline = masklay->splines.first;
+
+	*spline = NULL;
+	*point = NULL;
+
+	if (check_active) {
+		if (masklay->act_spline && masklay->act_point && MASKPOINT_ISSEL_ANY(masklay->act_point)) {
+			*spline = masklay->act_spline;
+			*point = masklay->act_point;
+			return;
+		}
+	}
+
+	while (cur_spline) {
+		int i;
+
+		for (i = 0; i < cur_spline->tot_point; i++) {
+			MaskSplinePoint *cur_point = &cur_spline->points[i];
+
+			if (MASKPOINT_ISSEL_ANY(cur_point)) {
+				if (*spline != NULL && *spline != cur_spline) {
+					*spline = NULL;
+					*point = NULL;
+					return;
+				}
+				else if (*point) {
+					*point = NULL;
+				}
+				else {
+					*spline = cur_spline;
+					*point = cur_point;
+				}
+			}
+		}
+
+		cur_spline = cur_spline->next;
+	}
+}
+
+/* **** add subdivide vertex **** */
+
+static void mask_spline_add_point_at_index(MaskSpline *spline, int point_index)
+{
+	MaskSplinePoint *new_point_array;
+
+	new_point_array = MEM_callocN(sizeof(MaskSplinePoint) * (spline->tot_point + 1), "add mask vert points");
+
+	memcpy(new_point_array, spline->points, sizeof(MaskSplinePoint) * (point_index + 1));
+	memcpy(new_point_array + point_index + 2, spline->points + point_index + 1,
+	       sizeof(MaskSplinePoint) * (spline->tot_point - point_index - 1));
+
+	MEM_freeN(spline->points);
+	spline->points = new_point_array;
+	spline->tot_point++;
+}
+
+static int add_vertex_subdivide(bContext *C, Mask *mask, const float co[2])
+{
+	MaskLayer *masklay;
+	MaskSpline *spline;
+	MaskSplinePoint *point = NULL;
+	const float threshold = 9;
+	float tangent[2];
+	float u;
+
+	if (find_nearest_diff_point(C, mask, co, threshold, FALSE, &masklay, &spline, &point, &u, tangent, TRUE)) {
+		MaskSplinePoint *new_point;
+		int point_index = point - spline->points;
+
+		ED_mask_select_toggle_all(mask, SEL_DESELECT);
+
+		mask_spline_add_point_at_index(spline, point_index);
+
+		new_point = &spline->points[point_index + 1];
+
+		setup_vertex_point(C, mask, spline, new_point, co, tangent, u, NULL, TRUE);
+
+		/* TODO - we could pass the spline! */
+		BKE_mask_layer_shape_changed_add(masklay, BKE_mask_layer_shape_spline_to_index(masklay, spline) + point_index + 1, TRUE, TRUE);
+
+		masklay->act_point = new_point;
+
+		WM_event_add_notifier(C, NC_MASK | NA_EDITED, mask);
+
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+static int add_vertex_extrude(bContext *C, Mask *mask, MaskLayer *masklay, const float co[2])
+{
+	MaskSpline *spline;
+	MaskSplinePoint *point;
+	MaskSplinePoint *new_point = NULL, *ref_point = NULL;
+
+	/* check on which side we want to add the point */
+	int point_index;
+	float tangent_point[2];
+	float tangent_co[2];
+	int do_cyclic_correct = FALSE;
+	int do_recalc_src = FALSE;  /* when extruding from endpoints only */
+	int do_prev;                /* use prev point rather then next?? */
+
+	if (!masklay) {
+		return FALSE;
+	}
+	else {
+		finSelectedSplinePoint(masklay, &spline, &point, TRUE);
+	}
+
+	ED_mask_select_toggle_all(mask, SEL_DESELECT);
+
+	point_index = (point - spline->points);
+
+	MASKPOINT_DESEL_ALL(point);
+
+	if ((spline->flag & MASK_SPLINE_CYCLIC) ||
+	    (point_index > 0 && point_index != spline->tot_point - 1))
+	{
+		BKE_mask_calc_tangent_polyline(spline, point, tangent_point);
+		sub_v2_v2v2(tangent_co, co, point->bezt.vec[1]);
+
+		if (dot_v2v2(tangent_point, tangent_co) < 0.0f) {
+			do_prev = TRUE;
+		}
+		else {
+			do_prev = FALSE;
+		}
+	}
+	else if (((spline->flag & MASK_SPLINE_CYCLIC) == 0) && (point_index == 0)) {
+		do_prev = TRUE;
+		do_recalc_src = TRUE;
+	}
+	else if (((spline->flag & MASK_SPLINE_CYCLIC) == 0) && (point_index == spline->tot_point - 1)) {
+		do_prev = FALSE;
+		do_recalc_src = TRUE;
+	}
+	else {
+		do_prev = FALSE;  /* quiet warning */
+		/* should never get here */
+		BLI_assert(0);
+	}
+
+	/* use the point before the active one */
+	if (do_prev) {
+		point_index--;
+		if (point_index < 0) {
+			point_index += spline->tot_point; /* wrap index */
+			if ((spline->flag & MASK_SPLINE_CYCLIC) == 0) {
+				do_cyclic_correct = TRUE;
+				point_index = 0;
+			}
+		}
+	}
+
+//		print_v2("", tangent_point);
+//		printf("%d\n", point_index);
+
+	mask_spline_add_point_at_index(spline, point_index);
+
+	if (do_cyclic_correct) {
+		ref_point = &spline->points[point_index + 1];
+		new_point = &spline->points[point_index];
+		*ref_point = *new_point;
+		memset(new_point, 0, sizeof(*new_point));
+	}
+	else {
+		ref_point = &spline->points[point_index];
+		new_point = &spline->points[point_index + 1];
+	}
+
+	masklay->act_point = new_point;
+
+	setup_vertex_point(C, mask, spline, new_point, co, NULL, 0.5f, ref_point, FALSE);
+
+	if (masklay->splines_shapes.first) {
+		point_index = (((int)(new_point - spline->points) + 0) % spline->tot_point);
+		BKE_mask_layer_shape_changed_add(masklay, BKE_mask_layer_shape_spline_to_index(masklay, spline) + point_index, TRUE, TRUE);
+	}
+
+	if (do_recalc_src) {
+		/* TODO, update keyframes in time */
+		BKE_mask_calc_handle_point_auto(spline, ref_point, FALSE);
+	}
+
+	WM_event_add_notifier(C, NC_MASK | NA_EDITED, mask);
+
+	return TRUE;
+}
+
+static int add_vertex_new(bContext *C, Mask *mask, MaskLayer *masklay, const float co[2])
+{
+	MaskSpline *spline;
+	MaskSplinePoint *point;
+	MaskSplinePoint *new_point = NULL, *ref_point = NULL;
+
+	if (!masklay) {
+		/* if there's no masklay currently operationg on, create new one */
+		masklay = BKE_mask_layer_new(mask, "");
+		mask->masklay_act = mask->masklay_tot - 1;
+		spline = NULL;
+		point = NULL;
+	}
+	else {
+		finSelectedSplinePoint(masklay, &spline, &point, TRUE);
+	}
+
+	ED_mask_select_toggle_all(mask, SEL_DESELECT);
+
+	if (!spline) {
+		/* no selected splines in active masklay, create new spline */
+		spline = BKE_mask_spline_add(masklay);
+	}
+
+	masklay->act_spline = spline;
+	new_point = spline->points;
+
+	masklay->act_point = new_point;
+
+	setup_vertex_point(C, mask, spline, new_point, co, NULL, 0.5f, ref_point, FALSE);
+
+	{
+		int point_index = (((int)(new_point - spline->points) + 0) % spline->tot_point);
+		BKE_mask_layer_shape_changed_add(masklay, BKE_mask_layer_shape_spline_to_index(masklay, spline) + point_index, TRUE, TRUE);
+	}
+
+	WM_event_add_notifier(C, NC_MASK | NA_EDITED, mask);
+
+	return TRUE;
+}
+
+static int add_vertex_exec(bContext *C, wmOperator *op)
+{
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *masklay;
+
+	float co[2];
+
+	masklay = BKE_mask_layer_active(mask);
+
+	if (masklay && masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+		masklay = NULL;
+	}
+
+	RNA_float_get_array(op->ptr, "location", co);
+
+	if (masklay && masklay->act_point && MASKPOINT_ISSEL_ANY(masklay->act_point)) {
+
+		/* cheap trick - double click for cyclic */
+		MaskSpline *spline = masklay->act_spline;
+		MaskSplinePoint *point = masklay->act_point;
+
+		int is_sta = (point == spline->points);
+		int is_end = (point == &spline->points[spline->tot_point - 1]);
+
+		/* then check are we overlapping the mouse */
+		if ((is_sta || is_end) && equals_v2v2(co, point->bezt.vec[1])) {
+			if (spline->flag & MASK_SPLINE_CYCLIC) {
+				/* nothing to do */
+				return OPERATOR_CANCELLED;
+			}
+			else {
+				/* recalc the connecting point as well to make a nice even curve */
+				MaskSplinePoint *point_other = is_end ? spline->points : &spline->points[spline->tot_point - 1];
+				spline->flag |= MASK_SPLINE_CYCLIC;
+
+				/* TODO, update keyframes in time */
+				BKE_mask_calc_handle_point_auto(spline, point, FALSE);
+				BKE_mask_calc_handle_point_auto(spline, point_other, FALSE);
+
+				/* TODO: only update this spline */
+				BKE_mask_update_display(mask, CTX_data_scene(C)->r.cfra);
+
+				WM_event_add_notifier(C, NC_MASK | NA_EDITED, mask);
+				return OPERATOR_FINISHED;
+			}
+		}
+
+		if (!add_vertex_subdivide(C, mask, co)) {
+			if (!add_vertex_extrude(C, mask, masklay, co)) {
+				return OPERATOR_CANCELLED;
+			}
+		}
+	}
+	else {
+		if (!add_vertex_subdivide(C, mask, co)) {
+			if (!add_vertex_new(C, mask, masklay, co)) {
+				return OPERATOR_CANCELLED;
+			}
+		}
+	}
+
+	/* TODO: only update this spline */
+	BKE_mask_update_display(mask, CTX_data_scene(C)->r.cfra);
+
+	return OPERATOR_FINISHED;
+}
+
+static int add_vertex_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	float co[2];
+
+	ED_mask_mouse_pos(C, event, co);
+
+	RNA_float_set_array(op->ptr, "location", co);
+
+	return add_vertex_exec(C, op);
+}
+
+void MASK_OT_add_vertex(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Add Vertex";
+	ot->description = "Add vertex to active spline";
+	ot->idname = "MASK_OT_add_vertex";
+
+	/* api callbacks */
+	ot->exec = add_vertex_exec;
+	ot->invoke = add_vertex_invoke;
+	ot->poll = ED_maskedit_mask_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	/* properties */
+	RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MIN, FLT_MAX,
+	                     "Location", "Location of vertex in normalized space", -1.0f, 1.0f);
+}
+
+/******************** add feather vertex *********************/
+
+static int add_feather_vertex_exec(bContext *C, wmOperator *op)
+{
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *masklay;
+	MaskSpline *spline;
+	MaskSplinePoint *point = NULL;
+	const float threshold = 9;
+	float co[2], u;
+
+	RNA_float_get_array(op->ptr, "location", co);
+
+	point = ED_mask_point_find_nearest(C, mask, co, threshold, NULL, NULL, NULL, NULL);
+	if (point)
+		return OPERATOR_FINISHED;
+
+	if (find_nearest_diff_point(C, mask, co, threshold, TRUE, &masklay, &spline, &point, &u, NULL, TRUE)) {
+		Scene *scene = CTX_data_scene(C);
+		float w = BKE_mask_point_weight(spline, point, u);
+		float weight_scalar = BKE_mask_point_weight_scalar(spline, point, u);
+
+		if (weight_scalar != 0.0f) {
+			w = w / weight_scalar;
+		}
+
+		BKE_mask_point_add_uw(point, u, w);
+
+		BKE_mask_update_display(mask, scene->r.cfra);
+
+		WM_event_add_notifier(C, NC_MASK | NA_EDITED, mask);
+
+		DAG_id_tag_update(&mask->id, 0);
+
+		return OPERATOR_FINISHED;
+	}
+
+	return OPERATOR_CANCELLED;
+}
+
+static int add_feather_vertex_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	float co[2];
+
+	ED_mask_mouse_pos(C, event, co);
+
+	RNA_float_set_array(op->ptr, "location", co);
+
+	return add_feather_vertex_exec(C, op);
+}
+
+void MASK_OT_add_feather_vertex(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Add feather Vertex";
+	ot->description = "Add vertex to feather";
+	ot->idname = "MASK_OT_add_feather_vertex";
+
+	/* api callbacks */
+	ot->exec = add_feather_vertex_exec;
+	ot->invoke = add_feather_vertex_invoke;
+	ot->poll = ED_maskedit_mask_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	/* properties */
+	RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MIN, FLT_MAX,
+	                     "Location", "Location of vertex in normalized space", -1.0f, 1.0f);
+}
diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c
new file mode 100644
index 00000000000..678186f0e8c
--- /dev/null
+++ b/source/blender/editors/mask/mask_draw.c
@@ -0,0 +1,450 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2012 Blender Foundation.
+ * All rights reserved.
+ *
+ *
+ * Contributor(s): Blender Foundation,
+ *                 Sergey Sharybin
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/mask/mask_draw.c
+ *  \ingroup edmask
+ */
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_utildefines.h"
+
+#include "BKE_context.h"
+#include "BKE_mask.h"
+
+#include "DNA_mask_types.h"
+#include "DNA_object_types.h"   /* SELECT */
+
+#include "ED_mask.h"  /* own include */
+#include "BIF_gl.h"
+
+#include "UI_resources.h"
+
+#include "mask_intern.h"  /* own include */
+
+static void mask_spline_color_get(MaskLayer *masklay, MaskSpline *spline, const int is_sel,
+                                  unsigned char r_rgb[4])
+{
+	if (is_sel) {
+		if (masklay->act_spline == spline) {
+			r_rgb[0] = r_rgb[1] = r_rgb[2] = 255;
+		}
+		else {
+			r_rgb[0] = 255;
+			r_rgb[1] = r_rgb[2] = 0;
+		}
+	}
+	else {
+		r_rgb[0] = 128;
+		r_rgb[1] = r_rgb[2] = 0;
+	}
+
+	r_rgb[3] = 255;
+}
+
+static void mask_spline_feather_color_get(MaskLayer *UNUSED(masklay), MaskSpline *UNUSED(spline), const int is_sel,
+                                          unsigned char r_rgb[4])
+{
+	if (is_sel) {
+		r_rgb[1] = 255;
+		r_rgb[0] = r_rgb[2] = 0;
+	}
+	else {
+		r_rgb[1] = 128;
+		r_rgb[0] = r_rgb[2] = 0;
+	}
+
+	r_rgb[3] = 255;
+}
+
+#if 0
+static void draw_spline_parents(MaskLayer *UNUSED(masklay), MaskSpline *spline)
+{
+	int i;
+	MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline);
+
+	if (!spline->tot_point)
+		return;
+
+	glColor3ub(0, 0, 0);
+	glEnable(GL_LINE_STIPPLE);
+	glLineStipple(1, 0xAAAA);
+
+	glBegin(GL_LINES);
+
+	for (i = 0; i < spline->tot_point; i++) {
+		MaskSplinePoint *point = &points_array[i];
+		BezTriple *bezt = &point->bezt;
+
+		if (point->parent.id) {
+			glVertex2f(bezt->vec[1][0],
+			           bezt->vec[1][1]);
+
+			glVertex2f(bezt->vec[1][0] - point->parent.offset[0],
+			           bezt->vec[1][1] - point->parent.offset[1]);
+		}
+	}
+
+	glEnd();
+
+	glDisable(GL_LINE_STIPPLE);
+}
+#endif
+
+/* return non-zero if spline is selected */
+static void draw_spline_points(MaskLayer *masklay, MaskSpline *spline)
+{
+	const int is_spline_sel = (spline->flag & SELECT) && (masklay->restrictflag & MASK_RESTRICT_SELECT) == 0;
+	unsigned char rgb_spline[4];
+	MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline);
+
+	int i, hsize, tot_feather_point;
+	float (*feather_points)[2], (*fp)[2];
+
+	if (!spline->tot_point)
+		return;
+
+	hsize = UI_GetThemeValuef(TH_HANDLE_VERTEX_SIZE);
+
+	glPointSize(hsize);
+
+	mask_spline_color_get(masklay, spline, is_spline_sel, rgb_spline);
+
+	/* feather points */
+	feather_points = fp = BKE_mask_spline_feather_points(spline, &tot_feather_point);
+	for (i = 0; i < spline->tot_point; i++) {
+
+		/* watch it! this is intentionally not the deform array, only check for sel */
+		MaskSplinePoint *point = &spline->points[i];
+
+		int j;
+
+		for (j = 0; j < point->tot_uw + 1; j++) {
+			int sel = FALSE;
+
+			if (j == 0) {
+				sel = MASKPOINT_ISSEL_ANY(point);
+			}
+			else {
+				sel = point->uw[j - 1].flag & SELECT;
+			}
+
+			if (sel) {
+				if (point == masklay->act_point)
+					glColor3f(1.0f, 1.0f, 1.0f);
+				else
+					glColor3f(1.0f, 1.0f, 0.0f);
+			}
+			else {
+				glColor3f(0.5f, 0.5f, 0.0f);
+			}
+
+			glBegin(GL_POINTS);
+			glVertex2fv(*fp);
+			glEnd();
+
+			fp++;
+		}
+	}
+	MEM_freeN(feather_points);
+
+	/* control points */
+	for (i = 0; i < spline->tot_point; i++) {
+
+		/* watch it! this is intentionally not the deform array, only check for sel */
+		MaskSplinePoint *point = &spline->points[i];
+		MaskSplinePoint *point_deform = &points_array[i];
+		BezTriple *bezt = &point_deform->bezt;
+
+		float handle[2];
+		float *vert = bezt->vec[1];
+		int has_handle = BKE_mask_point_has_handle(point);
+
+		BKE_mask_point_handle(point_deform, handle);
+
+		/* draw handle segment */
+		if (has_handle) {
+			glColor3ubv(rgb_spline);
+
+			glBegin(GL_LINES);
+			glVertex3fv(vert);
+			glVertex3fv(handle);
+			glEnd();
+		}
+
+		/* draw CV point */
+		if (MASKPOINT_ISSEL_KNOT(point)) {
+			if (point == masklay->act_point)
+				glColor3f(1.0f, 1.0f, 1.0f);
+			else
+				glColor3f(1.0f, 1.0f, 0.0f);
+		}
+		else
+			glColor3f(0.5f, 0.5f, 0.0f);
+
+		glBegin(GL_POINTS);
+		glVertex3fv(vert);
+		glEnd();
+
+		/* draw handle points */
+		if (has_handle) {
+			if (MASKPOINT_ISSEL_HANDLE(point)) {
+				if (point == masklay->act_point)
+					glColor3f(1.0f, 1.0f, 1.0f);
+				else
+					glColor3f(1.0f, 1.0f, 0.0f);
+			}
+			else {
+				glColor3f(0.5f, 0.5f, 0.0f);
+			}
+
+			glBegin(GL_POINTS);
+			glVertex3fv(handle);
+			glEnd();
+		}
+	}
+
+	glPointSize(1.0f);
+}
+
+/* #define USE_XOR */
+
+static void mask_color_active_tint(unsigned char r_rgb[4], const unsigned char rgb[4], const short is_active)
+{
+	if (!is_active) {
+		r_rgb[0] = (unsigned char)((((int)(rgb[0])) + 128) / 2);
+		r_rgb[1] = (unsigned char)((((int)(rgb[1])) + 128) / 2);
+		r_rgb[2] = (unsigned char)((((int)(rgb[2])) + 128) / 2);
+		r_rgb[3] = rgb[3];
+	}
+	else {
+		*(unsigned int *)r_rgb = *(const unsigned int *)rgb;
+	}
+}
+
+static void mask_draw_curve_type(MaskSpline *spline, float (*points)[2], int tot_point,
+                                 const short is_feather, const short is_smooth, const short is_active,
+                                 const unsigned char rgb_spline[4], const char draw_type)
+{
+	const int draw_method = (spline->flag & MASK_SPLINE_CYCLIC) ? GL_LINE_LOOP : GL_LINE_STRIP;
+	const unsigned char rgb_black[4] = {0x00, 0x00, 0x00, 0xff};
+//	const unsigned char rgb_white[4] = {0xff, 0xff, 0xff, 0xff};
+	unsigned char rgb_tmp[4];
+
+	glEnableClientState(GL_VERTEX_ARRAY);
+	glVertexPointer(2, GL_FLOAT, 0, points);
+
+	switch (draw_type) {
+
+		case MASK_DT_OUTLINE:
+			glLineWidth(3);
+
+			mask_color_active_tint(rgb_tmp, rgb_black, is_active);
+			glColor4ubv(rgb_tmp);
+
+			glDrawArrays(draw_method, 0, tot_point);
+
+			glLineWidth(1);
+			mask_color_active_tint(rgb_tmp, rgb_spline, is_active);
+			glColor4ubv(rgb_tmp);
+			glDrawArrays(draw_method, 0, tot_point);
+
+			break;
+
+		case MASK_DT_DASH:
+		default:
+			glEnable(GL_LINE_STIPPLE);
+
+#ifdef USE_XOR
+			glEnable(GL_COLOR_LOGIC_OP);
+			glLogicOp(GL_OR);
+#endif
+			mask_color_active_tint(rgb_tmp, rgb_spline, is_active);
+			glColor4ubv(rgb_tmp);
+			glLineStipple(3, 0xaaaa);
+			glEnableClientState(GL_VERTEX_ARRAY);
+			glVertexPointer(2, GL_FLOAT, 0, points);
+			glDrawArrays(draw_method, 0, tot_point);
+
+#ifdef USE_XOR
+			glDisable(GL_COLOR_LOGIC_OP);
+#endif
+			mask_color_active_tint(rgb_tmp, rgb_black, is_active);
+			glColor4ubv(rgb_tmp);
+			glLineStipple(3, 0x5555);
+			glDrawArrays(draw_method, 0, tot_point);
+
+			glDisable(GL_LINE_STIPPLE);
+			break;
+
+
+		case MASK_DT_BLACK:
+		case MASK_DT_WHITE:
+			if (draw_type == MASK_DT_BLACK) { rgb_tmp[0] = rgb_tmp[1] = rgb_tmp[2] = 0;   }
+			else                            { rgb_tmp[0] = rgb_tmp[1] = rgb_tmp[2] = 255; }
+			/* alpha values seem too low but gl draws many points that compensate for it */
+			if (is_feather) { rgb_tmp[3] = 64; }
+			else            { rgb_tmp[3] = 128; }
+
+			if (is_feather) {
+				rgb_tmp[0] = (unsigned char)(((short)rgb_tmp[0] + (short)rgb_spline[0]) / 2);
+				rgb_tmp[1] = (unsigned char)(((short)rgb_tmp[1] + (short)rgb_spline[1]) / 2);
+				rgb_tmp[2] = (unsigned char)(((short)rgb_tmp[2] + (short)rgb_spline[2]) / 2);
+			}
+
+			if (is_smooth == FALSE && is_feather) {
+				glEnable(GL_BLEND);
+				glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+			}
+
+			mask_color_active_tint(rgb_tmp, rgb_tmp, is_active);
+			glColor4ubv(rgb_tmp);
+
+			glEnableClientState(GL_VERTEX_ARRAY);
+			glVertexPointer(2, GL_FLOAT, 0, points);
+			glDrawArrays(draw_method, 0, tot_point);
+
+			glDrawArrays(draw_method, 0, tot_point);
+
+			if (is_smooth == FALSE && is_feather) {
+				glDisable(GL_BLEND);
+			}
+
+			break;
+	}
+
+	glDisableClientState(GL_VERTEX_ARRAY);
+
+}
+
+static void draw_spline_curve(MaskLayer *masklay, MaskSpline *spline,
+                              const char draw_flag, const char draw_type,
+                              const short is_active,
+                              int width, int height)
+{
+	unsigned char rgb_tmp[4];
+
+	const short is_spline_sel = (spline->flag & SELECT) && (masklay->restrictflag & MASK_RESTRICT_SELECT) == 0;
+	const short is_smooth = (draw_flag & MASK_DRAWFLAG_SMOOTH);
+
+	int tot_diff_point;
+	float (*diff_points)[2];
+
+	int tot_feather_point;
+	float (*feather_points)[2];
+
+	diff_points = BKE_mask_spline_differentiate_with_resolution(spline, width, height, &tot_diff_point);
+
+	if (!diff_points)
+		return;
+
+	if (is_smooth) {
+		glEnable(GL_LINE_SMOOTH);
+		glEnable(GL_BLEND);
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	}
+
+	feather_points = BKE_mask_spline_feather_differentiated_points_with_resolution(spline, width, height, &tot_feather_point);
+
+	/* draw feather */
+	mask_spline_feather_color_get(masklay, spline, is_spline_sel, rgb_tmp);
+	mask_draw_curve_type(spline, feather_points, tot_feather_point,
+	                     TRUE, is_smooth, is_active,
+	                     rgb_tmp, draw_type);
+	MEM_freeN(feather_points);
+
+	/* draw main curve */
+	mask_spline_color_get(masklay, spline, is_spline_sel, rgb_tmp);
+	mask_draw_curve_type(spline, diff_points, tot_diff_point,
+	                     FALSE, is_smooth, is_active,
+	                     rgb_tmp, draw_type);
+	MEM_freeN(diff_points);
+
+	if (draw_flag & MASK_DRAWFLAG_SMOOTH) {
+		glDisable(GL_LINE_SMOOTH);
+		glDisable(GL_BLEND);
+	}
+
+	(void)draw_type;
+}
+
+static void draw_masklays(Mask *mask, const char draw_flag, const char draw_type,
+                          int width, int height)
+{
+	MaskLayer *masklay;
+	int i;
+
+	for (masklay = mask->masklayers.first, i = 0; masklay; masklay = masklay->next, i++) {
+		MaskSpline *spline;
+		const short is_active = (i == mask->masklay_act);
+
+		if (masklay->restrictflag & MASK_RESTRICT_VIEW) {
+			continue;
+		}
+
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+
+			/* draw curve itself first... */
+			draw_spline_curve(masklay, spline, draw_flag, draw_type, is_active, width, height);
+
+//			draw_spline_parents(masklay, spline);
+
+			if (!(masklay->restrictflag & MASK_RESTRICT_SELECT)) {
+				/* ...and then handles over the curve so they're nicely visible */
+				draw_spline_points(masklay, spline);
+			}
+
+			/* show undeform for testing */
+			if (0) {
+				void *back = spline->points_deform;
+
+				spline->points_deform = NULL;
+				draw_spline_curve(masklay, spline, draw_flag, draw_type, is_active, width, height);
+//				draw_spline_parents(masklay, spline);
+				draw_spline_points(masklay, spline);
+				spline->points_deform = back;
+			}
+		}
+	}
+}
+
+void ED_mask_draw(const bContext *C,
+                  const char draw_flag, const char draw_type)
+{
+	Mask *mask = CTX_data_edit_mask(C);
+	int width, height;
+
+	if (!mask)
+		return;
+
+	/* TODO: for now, in the future better to make sure all utility functions
+	 *       are using const specifier for non-changing pointers
+	 */
+	ED_mask_size((bContext *)C, &width, &height);
+
+	draw_masklays(mask, draw_flag, draw_type, width, height);
+}
diff --git a/source/blender/editors/mask/mask_edit.c b/source/blender/editors/mask/mask_edit.c
new file mode 100644
index 00000000000..52711c8da55
--- /dev/null
+++ b/source/blender/editors/mask/mask_edit.c
@@ -0,0 +1,344 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2012 Blender Foundation.
+ * All rights reserved.
+ *
+ *
+ * Contributor(s): Blender Foundation,
+ *                 Sergey Sharybin
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/mask/mask_edit.c
+ *  \ingroup edmask
+ */
+
+
+#include "BLI_math.h"
+
+#include "BKE_context.h"
+#include "BKE_mask.h"
+
+#include "DNA_scene_types.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "ED_screen.h"
+#include "ED_mask.h"  /* own include */
+#include "ED_object.h" /* ED_keymap_proportional_maskmode only */
+#include "ED_clip.h"
+#include "ED_transform.h"
+
+#include "RNA_access.h"
+
+#include "mask_intern.h"  /* own include */
+
+/********************** generic poll functions *********************/
+
+int ED_maskedit_poll(bContext *C)
+{
+	SpaceClip *sc = CTX_wm_space_clip(C);
+
+	if (sc) {
+		return ED_space_clip_maskedit_poll(C);
+	}
+
+	return FALSE;
+}
+
+int ED_maskedit_mask_poll(bContext *C)
+{
+	SpaceClip *sc = CTX_wm_space_clip(C);
+
+	if (sc) {
+		return ED_space_clip_maskedit_mask_poll(C);
+	}
+
+	return FALSE;
+}
+
+/********************** registration *********************/
+
+void ED_mask_mouse_pos(bContext *C, wmEvent *event, float co[2])
+{
+	SpaceClip *sc = CTX_wm_space_clip(C);
+
+	if (sc) {
+		ED_clip_mouse_pos(C, event, co);
+		BKE_mask_coord_from_movieclip(sc->clip, &sc->user, co, co);
+	}
+	else {
+		/* possible other spaces from which mask editing is available */
+		zero_v2(co);
+	}
+}
+
+/* input:  x/y   - mval space
+ * output: xr/yr - mask point space */
+void ED_mask_point_pos(bContext *C, float x, float y, float *xr, float *yr)
+{
+	SpaceClip *sc = CTX_wm_space_clip(C);
+	float co[2];
+
+	if (sc) {
+		ED_clip_point_stable_pos(C, x, y, &co[0], &co[1]);
+		BKE_mask_coord_from_movieclip(sc->clip, &sc->user, co, co);
+	}
+	else {
+		/* possible other spaces from which mask editing is available */
+		zero_v2(co);
+	}
+
+	*xr = co[0];
+	*yr = co[1];
+}
+
+void ED_mask_point_pos__reverse(bContext *C, float x, float y, float *xr, float *yr)
+{
+	SpaceClip *sc = CTX_wm_space_clip(C);
+	ARegion *ar = CTX_wm_region(C);
+
+	float co[2];
+
+	if (sc && ar) {
+		co[0] = x;
+		co[1] = y;
+		BKE_mask_coord_to_movieclip(sc->clip, &sc->user, co, co);
+		ED_clip_point_stable_pos__reverse(sc, ar, co, co);
+	}
+	else {
+		/* possible other spaces from which mask editing is available */
+		zero_v2(co);
+	}
+
+	*xr = co[0];
+	*yr = co[1];
+}
+
+void ED_mask_size(bContext *C, int *width, int *height)
+{
+	ScrArea *sa = CTX_wm_area(C);
+	if (sa && sa->spacedata.first) {
+		if (sa->spacetype == SPACE_CLIP) {
+			SpaceClip *sc = sa->spacedata.first;
+			ED_space_clip_mask_size(sc, width, height);
+			return;
+		}
+		else if (sa->spacetype == SPACE_SEQ) {
+			Scene *scene = CTX_data_scene(C);
+			*width = (scene->r.size * scene->r.xsch) / 100;
+			*height = (scene->r.size * scene->r.ysch) / 100;
+			return;
+		}
+	}
+
+	/* possible other spaces from which mask editing is available */
+	*width = 0;
+	*height = 0;
+}
+
+void ED_mask_aspect(bContext *C, float *aspx, float *aspy)
+{
+	SpaceClip *sc = CTX_wm_space_clip(C);
+
+	if (sc) {
+		ED_space_clip_mask_aspect(sc, aspx, aspy);
+	}
+	else {
+		/* possible other spaces from which mask editing is available */
+		*aspx = 1.0f;
+		*aspy = 1.0f;
+	}
+}
+
+void ED_mask_pixelspace_factor(bContext *C, float *scalex, float *scaley)
+{
+	SpaceClip *sc = CTX_wm_space_clip(C);
+
+	if (sc) {
+		ARegion *ar = CTX_wm_region(C);
+		int width, height;
+		float zoomx, zoomy, aspx, aspy;
+
+		ED_space_clip_size(sc, &width, &height);
+		ED_space_clip_zoom(sc, ar, &zoomx, &zoomy);
+		ED_space_clip_aspect(sc, &aspx, &aspy);
+
+		*scalex = ((float)width * aspx) * zoomx;
+		*scaley = ((float)height * aspy) * zoomy;
+	}
+	else {
+		/* possible other spaces from which mask editing is available */
+		*scalex = 1.0f;
+		*scaley = 1.0f;
+	}
+}
+
+/********************** registration *********************/
+
+void ED_operatortypes_mask(void)
+{
+	WM_operatortype_append(MASK_OT_new);
+
+	/* mask layers */
+	WM_operatortype_append(MASK_OT_layer_new);
+	WM_operatortype_append(MASK_OT_layer_remove);
+
+	/* add */
+	WM_operatortype_append(MASK_OT_add_vertex);
+	WM_operatortype_append(MASK_OT_add_feather_vertex);
+
+	/* geometry */
+	WM_operatortype_append(MASK_OT_switch_direction);
+	WM_operatortype_append(MASK_OT_normals_make_consistent);
+	WM_operatortype_append(MASK_OT_delete);
+
+	/* select */
+	WM_operatortype_append(MASK_OT_select);
+	WM_operatortype_append(MASK_OT_select_all);
+	WM_operatortype_append(MASK_OT_select_border);
+	WM_operatortype_append(MASK_OT_select_lasso);
+	WM_operatortype_append(MASK_OT_select_circle);
+	WM_operatortype_append(MASK_OT_select_linked_pick);
+	WM_operatortype_append(MASK_OT_select_linked);
+
+	/* hide/reveal */
+	WM_operatortype_append(MASK_OT_hide_view_clear);
+	WM_operatortype_append(MASK_OT_hide_view_set);
+
+	/* feather */
+	WM_operatortype_append(MASK_OT_feather_weight_clear);
+
+	/* shape */
+	WM_operatortype_append(MASK_OT_slide_point);
+	WM_operatortype_append(MASK_OT_cyclic_toggle);
+	WM_operatortype_append(MASK_OT_handle_type_set);
+
+	/* relationships */
+	WM_operatortype_append(MASK_OT_parent_set);
+	WM_operatortype_append(MASK_OT_parent_clear);
+
+	/* shapekeys */
+	WM_operatortype_append(MASK_OT_shape_key_insert);
+	WM_operatortype_append(MASK_OT_shape_key_clear);
+	WM_operatortype_append(MASK_OT_shape_key_feather_reset);
+}
+
+void ED_keymap_mask(wmKeyConfig *keyconf)
+{
+	wmKeyMap *keymap;
+	wmKeyMapItem *kmi;
+
+	keymap = WM_keymap_find(keyconf, "Mask Editing", 0, 0);
+	keymap->poll = ED_maskedit_poll;
+
+	WM_keymap_add_item(keymap, "MASK_OT_new", NKEY, KM_PRESS, KM_ALT, 0);
+
+	/* mask mode supports PET now */
+	ED_keymap_proportional_cycle(keyconf, keymap);
+	ED_keymap_proportional_maskmode(keyconf, keymap);
+
+	/* geometry */
+	WM_keymap_add_item(keymap, "MASK_OT_add_vertex_slide", LEFTMOUSE, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "MASK_OT_add_feather_vertex_slide", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);
+	WM_keymap_add_item(keymap, "MASK_OT_delete", XKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "MASK_OT_delete", DELKEY, KM_PRESS, 0, 0);
+
+	/* selection */
+	kmi = WM_keymap_add_item(keymap, "MASK_OT_select", SELECTMOUSE, KM_PRESS, 0, 0);
+	RNA_boolean_set(kmi->ptr, "extend", FALSE);
+	RNA_boolean_set(kmi->ptr, "deselect", FALSE);
+	RNA_boolean_set(kmi->ptr, "toggle", FALSE);
+	kmi = WM_keymap_add_item(keymap, "MASK_OT_select", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0);
+	RNA_boolean_set(kmi->ptr, "extend", FALSE);
+	RNA_boolean_set(kmi->ptr, "deselect", FALSE);
+	RNA_boolean_set(kmi->ptr, "toggle", TRUE);
+
+	kmi = WM_keymap_add_item(keymap, "MASK_OT_select_all", AKEY, KM_PRESS, 0, 0);
+	RNA_enum_set(kmi->ptr, "action", SEL_TOGGLE);
+	kmi = WM_keymap_add_item(keymap, "MASK_OT_select_all", IKEY, KM_PRESS, KM_CTRL, 0);
+	RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
+
+	WM_keymap_add_item(keymap, "MASK_OT_select_linked", LKEY, KM_PRESS, KM_CTRL, 0);
+	kmi = WM_keymap_add_item(keymap, "MASK_OT_select_linked_pick", LKEY, KM_PRESS, 0, 0);
+	RNA_boolean_set(kmi->ptr, "deselect", FALSE);
+	kmi = WM_keymap_add_item(keymap, "MASK_OT_select_linked_pick", LKEY, KM_PRESS, KM_SHIFT, 0);
+	RNA_boolean_set(kmi->ptr, "deselect", TRUE);
+
+	WM_keymap_add_item(keymap, "MASK_OT_select_border", BKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "MASK_OT_select_circle", CKEY, KM_PRESS, 0, 0);
+
+	kmi = WM_keymap_add_item(keymap, "MASK_OT_select_lasso", EVT_TWEAK_A, KM_ANY, KM_CTRL | KM_ALT, 0);
+	RNA_boolean_set(kmi->ptr, "deselect", FALSE);
+	kmi = WM_keymap_add_item(keymap, "MASK_OT_select_lasso", EVT_TWEAK_A, KM_ANY, KM_CTRL | KM_SHIFT | KM_ALT, 0);
+	RNA_boolean_set(kmi->ptr, "deselect", TRUE);
+
+	/* hide/reveal */
+	WM_keymap_add_item(keymap, "MASK_OT_hide_view_clear", HKEY, KM_PRESS, KM_ALT, 0);
+	kmi = WM_keymap_add_item(keymap, "MASK_OT_hide_view_set", HKEY, KM_PRESS, 0, 0);
+	RNA_boolean_set(kmi->ptr, "unselected", FALSE);
+
+	kmi = WM_keymap_add_item(keymap, "MASK_OT_hide_view_set", HKEY, KM_PRESS, KM_SHIFT, 0);
+	RNA_boolean_set(kmi->ptr, "unselected", TRUE);
+
+	/* select clip while in maker view,
+	 * this matches View3D functionality where you can select an
+	 * object while in editmode to allow vertex parenting */
+	kmi = WM_keymap_add_item(keymap, "CLIP_OT_select", SELECTMOUSE, KM_PRESS, KM_CTRL, 0);
+	RNA_boolean_set(kmi->ptr, "extend", FALSE);
+
+	/* shape */
+	WM_keymap_add_item(keymap, "MASK_OT_cyclic_toggle", CKEY, KM_PRESS, KM_ALT, 0);
+	WM_keymap_add_item(keymap, "MASK_OT_slide_point", LEFTMOUSE, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "MASK_OT_handle_type_set", VKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "MASK_OT_normals_make_consistent", NKEY, KM_PRESS, KM_CTRL, 0);
+	// WM_keymap_add_item(keymap, "MASK_OT_feather_weight_clear", SKEY, KM_PRESS, KM_ALT, 0);
+	/* ... matches curve editmode */
+	RNA_enum_set(WM_keymap_add_item(keymap, "TRANSFORM_OT_transform", SKEY, KM_PRESS, KM_ALT, 0)->ptr, "mode", TFM_MASK_SHRINKFATTEN);
+
+	/* relationships */
+	WM_keymap_add_item(keymap, "MASK_OT_parent_set", PKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "MASK_OT_parent_clear", PKEY, KM_PRESS, KM_ALT, 0);
+
+	WM_keymap_add_item(keymap, "MASK_OT_shape_key_insert", IKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "MASK_OT_shape_key_clear", IKEY, KM_PRESS, KM_ALT, 0);
+
+
+	transform_keymap_for_space(keyconf, keymap, SPACE_CLIP);
+}
+
+void ED_operatormacros_mask(void)
+{
+	/* XXX: just for sample */
+	wmOperatorType *ot;
+	wmOperatorTypeMacro *otmacro;
+
+	ot = WM_operatortype_append_macro("MASK_OT_add_vertex_slide", "Add Vertex and Slide", "Add new vertex and slide it", OPTYPE_UNDO | OPTYPE_REGISTER);
+	ot->description = "Add new vertex and slide it";
+	WM_operatortype_macro_define(ot, "MASK_OT_add_vertex");
+	otmacro = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
+	RNA_boolean_set(otmacro->ptr, "release_confirm", TRUE);
+
+	ot = WM_operatortype_append_macro("MASK_OT_add_feather_vertex_slide", "Add Feather Vertex and Slide", "Add new vertex to feater and slide it", OPTYPE_UNDO | OPTYPE_REGISTER);
+	ot->description = "Add new feather vertex and slide it";
+	WM_operatortype_macro_define(ot, "MASK_OT_add_feather_vertex");
+	otmacro = WM_operatortype_macro_define(ot, "MASK_OT_slide_point");
+	RNA_boolean_set(otmacro->ptr, "slide_feather", TRUE);
+}
diff --git a/source/blender/editors/mask/mask_editaction.c b/source/blender/editors/mask/mask_editaction.c
new file mode 100644
index 00000000000..3836b393bf8
--- /dev/null
+++ b/source/blender/editors/mask/mask_editaction.c
@@ -0,0 +1,250 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2008, Blender Foundation
+ * This is a new part of Blender
+ *
+ * Contributor(s): Joshua Leung
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/mask/mask_editaction.c
+ *  \ingroup edgpencil
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <math.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_blenlib.h"
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
+
+#include "DNA_mask_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+
+#include "BKE_fcurve.h"
+#include "BKE_mask.h"
+
+#include "ED_anim_api.h"
+#include "ED_keyframes_edit.h"
+
+/* ***************************************** */
+/* NOTE ABOUT THIS FILE:
+ *  This file contains code for editing Grease Pencil data in the Action Editor
+ *  as a 'keyframes', so that a user can adjust the timing of Grease Pencil drawings.
+ *  Therefore, this file mostly contains functions for selecting Grease-Pencil frames.
+ */
+/* ***************************************** */
+/* Generics - Loopers */
+
+/* Loops over the gp-frames for a gp-layer, and applies the given callback */
+short ED_masklayer_frames_looper(MaskLayer *masklay, Scene *scene, short (*masklay_shape_cb)(MaskLayerShape *, Scene *))
+{
+	MaskLayerShape *masklay_shape;
+
+	/* error checker */
+	if (masklay == NULL)
+		return 0;
+
+	/* do loop */
+	for (masklay_shape = masklay->splines_shapes.first; masklay_shape; masklay_shape = masklay_shape->next) {
+		/* execute callback */
+		if (masklay_shape_cb(masklay_shape, scene))
+			return 1;
+	}
+
+	/* nothing to return */
+	return 0;
+}
+
+/* ****************************************** */
+/* Data Conversion Tools */
+
+/* make a listing all the gp-frames in a layer as cfraelems */
+void ED_masklayer_make_cfra_list(MaskLayer *masklay, ListBase *elems, short onlysel)
+{
+	MaskLayerShape *masklay_shape;
+	CfraElem *ce;
+
+	/* error checking */
+	if (ELEM(NULL, masklay, elems))
+		return;
+
+	/* loop through gp-frames, adding */
+	for (masklay_shape = masklay->splines_shapes.first; masklay_shape; masklay_shape = masklay_shape->next) {
+		if ((onlysel == 0) || (masklay_shape->flag & MASK_SHAPE_SELECT)) {
+			ce = MEM_callocN(sizeof(CfraElem), "CfraElem");
+
+			ce->cfra = (float)masklay_shape->frame;
+			ce->sel = (masklay_shape->flag & MASK_SHAPE_SELECT) ? 1 : 0;
+
+			BLI_addtail(elems, ce);
+		}
+	}
+}
+
+/* ***************************************** */
+/* Selection Tools */
+
+/* check if one of the frames in this layer is selected */
+short ED_masklayer_frame_select_check(MaskLayer *masklay)
+{
+	MaskLayerShape *masklay_shape;
+
+	/* error checking */
+	if (masklay == NULL)
+		return 0;
+
+	/* stop at the first one found */
+	for (masklay_shape = masklay->splines_shapes.first; masklay_shape; masklay_shape = masklay_shape->next) {
+		if (masklay_shape->flag & MASK_SHAPE_SELECT)
+			return 1;
+	}
+
+	/* not found */
+	return 0;
+}
+
+/* helper function - select gp-frame based on SELECT_* mode */
+static void masklayshape_select(MaskLayerShape *masklay_shape, short select_mode)
+{
+	if (masklay_shape == NULL)
+		return;
+
+	switch (select_mode) {
+		case SELECT_ADD:
+			masklay_shape->flag |= MASK_SHAPE_SELECT;
+			break;
+		case SELECT_SUBTRACT:
+			masklay_shape->flag &= ~MASK_SHAPE_SELECT;
+			break;
+		case SELECT_INVERT:
+			masklay_shape->flag ^= MASK_SHAPE_SELECT;
+			break;
+	}
+}
+
+/* set all/none/invert select (like above, but with SELECT_* modes) */
+void ED_mask_select_frames(MaskLayer *masklay, short select_mode)
+{
+	MaskLayerShape *masklay_shape;
+
+	/* error checking */
+	if (masklay == NULL)
+		return;
+
+	/* handle according to mode */
+	for (masklay_shape = masklay->splines_shapes.first; masklay_shape; masklay_shape = masklay_shape->next) {
+		masklayshape_select(masklay_shape, select_mode);
+	}
+}
+
+/* set all/none/invert select */
+void ED_masklayer_frame_select_set(MaskLayer *masklay, short mode)
+{
+	/* error checking */
+	if (masklay == NULL)
+		return;
+
+	/* now call the standard function */
+	ED_mask_select_frames(masklay, mode);
+}
+
+/* select the frame in this layer that occurs on this frame (there should only be one at most) */
+void ED_mask_select_frame(MaskLayer *masklay, int selx, short select_mode)
+{
+	MaskLayerShape *masklay_shape;
+
+	if (masklay == NULL)
+		return;
+
+	masklay_shape = BKE_mask_layer_shape_find_frame(masklay, selx);
+
+	if (masklay_shape) {
+		masklayshape_select(masklay_shape, select_mode);
+	}
+}
+
+/* select the frames in this layer that occur within the bounds specified */
+void ED_masklayer_frames_select_border(MaskLayer *masklay, float min, float max, short select_mode)
+{
+	MaskLayerShape *masklay_shape;
+
+	if (masklay == NULL)
+		return;
+
+	/* only select those frames which are in bounds */
+	for (masklay_shape = masklay->splines_shapes.first; masklay_shape; masklay_shape = masklay_shape->next) {
+		if (IN_RANGE(masklay_shape->frame, min, max))
+			masklayshape_select(masklay_shape, select_mode);
+	}
+}
+
+/* ***************************************** */
+/* Frame Editing Tools */
+
+/* Delete selected frames */
+void ED_masklayer_frames_delete(MaskLayer *masklay)
+{
+	MaskLayerShape *masklay_shape, *masklay_shape_next;
+
+	/* error checking */
+	if (masklay == NULL)
+		return;
+
+	/* check for frames to delete */
+	for (masklay_shape = masklay->splines_shapes.first; masklay_shape; masklay_shape = masklay_shape_next) {
+		masklay_shape_next = masklay_shape->next;
+
+		if (masklay_shape->flag & MASK_SHAPE_SELECT)
+			BKE_mask_layer_shape_unlink(masklay, masklay_shape);
+	}
+}
+
+/* Duplicate selected frames from given gp-layer */
+void ED_masklayer_frames_duplicate(MaskLayer *masklay)
+{
+	MaskLayerShape *masklay_shape, *gpfn;
+
+	/* error checking */
+	if (masklay == NULL)
+		return;
+
+	/* duplicate selected frames  */
+	for (masklay_shape = masklay->splines_shapes.first; masklay_shape; masklay_shape = gpfn) {
+		gpfn = masklay_shape->next;
+
+		/* duplicate this frame */
+		if (masklay_shape->flag & MASK_SHAPE_SELECT) {
+			MaskLayerShape *mask_shape_dupe;
+
+			/* duplicate frame, and deselect self */
+			mask_shape_dupe = BKE_mask_layer_shape_duplicate(masklay_shape);
+			masklay_shape->flag &= ~MASK_SHAPE_SELECT;
+
+			// XXX - how to handle duplicate frames?
+			BLI_insertlinkafter(&masklay->splines_shapes, masklay_shape, mask_shape_dupe);
+		}
+	}
+}
diff --git a/source/blender/editors/mask/mask_intern.h b/source/blender/editors/mask/mask_intern.h
new file mode 100644
index 00000000000..c34558d2a01
--- /dev/null
+++ b/source/blender/editors/mask/mask_intern.h
@@ -0,0 +1,114 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2011 Blender Foundation.
+ * All rights reserved.
+ *
+ *
+ * Contributor(s): Blender Foundation,
+ *                 Sergey Sharybin
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/mask/mask_intern.h
+ *  \ingroup spclip
+ */
+
+#ifndef __MASK_INTERN_H__
+#define __MASK_INTERN_H__
+
+struct bContext;
+struct wmEvent;
+struct wmOperatorType;
+
+/* internal exports only */
+
+/* mask_add.c */
+void MASK_OT_add_vertex(struct wmOperatorType *ot);
+void MASK_OT_add_feather_vertex(struct wmOperatorType *ot);
+
+/* mask_ops.c */
+void MASK_OT_new(struct wmOperatorType *ot);
+void MASK_OT_layer_new(struct wmOperatorType *ot);
+void MASK_OT_layer_remove(struct wmOperatorType *ot);
+void MASK_OT_cyclic_toggle(struct wmOperatorType *ot);
+
+void MASK_OT_slide_point(struct wmOperatorType *ot);
+
+void MASK_OT_delete(struct wmOperatorType *ot);
+
+void MASK_OT_hide_view_clear(struct wmOperatorType *ot);
+void MASK_OT_hide_view_set(struct wmOperatorType *ot);
+void MASK_OT_feather_weight_clear(struct wmOperatorType *ot);
+void MASK_OT_switch_direction(struct wmOperatorType *ot);
+void MASK_OT_normals_make_consistent(struct wmOperatorType *ot);
+
+void MASK_OT_handle_type_set(struct wmOperatorType *ot);
+
+int ED_mask_feather_find_nearest(
+        struct bContext *C, struct Mask *mask, float normal_co[2], int threshold,
+        struct MaskLayer **masklay_r, struct MaskSpline **spline_r, struct MaskSplinePoint **point_r,
+        struct MaskSplinePointUW **uw_r, float *score);
+
+struct MaskSplinePoint *ED_mask_point_find_nearest(
+        struct bContext *C, struct Mask *mask, float normal_co[2], int threshold,
+        struct MaskLayer **masklay_r, struct MaskSpline **spline_r, int *is_handle_r,
+        float *score);
+
+/* mask_relationships.c */
+void MASK_OT_parent_set(struct wmOperatorType *ot);
+void MASK_OT_parent_clear(struct wmOperatorType *ot);
+
+/* mask_select.c */
+void MASK_OT_select(struct wmOperatorType *ot);
+void MASK_OT_select_all(struct wmOperatorType *ot);
+
+void MASK_OT_select_border(struct wmOperatorType *ot);
+void MASK_OT_select_lasso(struct wmOperatorType *ot);
+void MASK_OT_select_circle(struct wmOperatorType *ot);
+void MASK_OT_select_linked_pick(struct wmOperatorType *ot);
+void MASK_OT_select_linked(struct wmOperatorType *ot);
+
+int ED_mask_spline_select_check(struct MaskSpline *spline);
+int ED_mask_layer_select_check(struct MaskLayer *masklay);
+int ED_mask_select_check(struct Mask *mask);
+
+void ED_mask_spline_select_set(struct MaskSpline *spline, const short do_select);
+void ED_mask_layer_select_set(struct MaskLayer *masklay, const short do_select);
+void ED_mask_select_toggle_all(struct Mask *mask, int action);
+void ED_mask_select_flush_all(struct Mask *mask);
+
+/* mask_editor.c */
+int ED_maskedit_poll(struct bContext *C);
+int ED_maskedit_mask_poll(struct bContext *C);
+
+void ED_mask_size(struct bContext *C, int *width, int *height);
+void ED_mask_aspect(struct bContext *C, float *aspx, float *aspy);
+
+void ED_mask_pixelspace_factor(struct bContext *C, float *scalex, float *scaley);
+void ED_mask_mouse_pos(struct bContext *C, struct wmEvent *event, float co[2]);
+
+void ED_mask_point_pos(struct bContext *C, float x, float y, float *xr, float *yr);
+void ED_mask_point_pos__reverse(struct bContext *C, float x, float y, float *xr, float *yr);
+
+/* mask_shapekey.c */
+void MASK_OT_shape_key_insert(struct wmOperatorType *ot);
+void MASK_OT_shape_key_clear(struct wmOperatorType *ot);
+void MASK_OT_shape_key_feather_reset(struct wmOperatorType *ot);
+
+#endif /* __MASK_INTERN_H__ */
diff --git a/source/blender/editors/mask/mask_ops.c b/source/blender/editors/mask/mask_ops.c
new file mode 100644
index 00000000000..b770e5e9dba
--- /dev/null
+++ b/source/blender/editors/mask/mask_ops.c
@@ -0,0 +1,1343 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2012 Blender Foundation.
+ * All rights reserved.
+ *
+ *
+ * Contributor(s): Blender Foundation,
+ *                 Sergey Sharybin
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/mask/mask_ops.c
+ *  \ingroup edmask
+ */
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_listbase.h"
+#include "BLI_math.h"
+
+#include "BKE_context.h"
+#include "BKE_depsgraph.h"
+#include "BKE_mask.h"
+
+#include "DNA_scene_types.h"
+#include "DNA_mask_types.h"
+#include "DNA_object_types.h"  /* SELECT */
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "ED_screen.h"
+#include "ED_mask.h"
+#include "ED_clip.h"
+#include "ED_keyframing.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "mask_intern.h"  /* own include */
+
+/******************** utility functions *********************/
+
+MaskSplinePoint *ED_mask_point_find_nearest(bContext *C, Mask *mask, float normal_co[2], int threshold,
+                                            MaskLayer **masklay_r, MaskSpline **spline_r, int *is_handle_r,
+                                            float *score)
+{
+	MaskLayer *masklay;
+	MaskLayer *point_masklay = NULL;
+	MaskSpline *point_spline = NULL;
+	MaskSplinePoint *point = NULL;
+	float co[2], aspx, aspy;
+	float len = FLT_MAX, scalex, scaley;
+	int is_handle = FALSE, width, height;
+
+	ED_mask_size(C, &width, &height);
+	ED_mask_aspect(C, &aspx, &aspy);
+	ED_mask_pixelspace_factor(C, &scalex, &scaley);
+
+	co[0] = normal_co[0] * scalex;
+	co[1] = normal_co[1] * scaley;
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskSpline *spline;
+
+		if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+			continue;
+		}
+
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline);
+
+			int i;
+
+			for (i = 0; i < spline->tot_point; i++) {
+				MaskSplinePoint *cur_point = &spline->points[i];
+				MaskSplinePoint *cur_point_deform = &points_array[i];
+				float cur_len, vec[2], handle[2];
+
+				vec[0] = cur_point_deform->bezt.vec[1][0] * scalex;
+				vec[1] = cur_point_deform->bezt.vec[1][1] * scaley;
+
+				if (BKE_mask_point_has_handle(cur_point)) {
+					BKE_mask_point_handle(cur_point_deform, handle);
+					handle[0] *= scalex;
+					handle[1] *= scaley;
+
+					cur_len = len_v2v2(co, handle);
+
+					if (cur_len < len) {
+						point_masklay = masklay;
+						point_spline = spline;
+						point = cur_point;
+						len = cur_len;
+						is_handle = TRUE;
+					}
+				}
+
+				cur_len = len_v2v2(co, vec);
+
+				if (cur_len < len) {
+					point_spline = spline;
+					point_masklay = masklay;
+					point = cur_point;
+					len = cur_len;
+					is_handle = FALSE;
+				}
+			}
+		}
+	}
+
+	if (len < threshold) {
+		if (masklay_r)
+			*masklay_r = point_masklay;
+
+		if (spline_r)
+			*spline_r = point_spline;
+
+		if (is_handle_r)
+			*is_handle_r = is_handle;
+
+		if (score)
+			*score = len;
+
+		return point;
+	}
+
+	if (masklay_r)
+		*masklay_r = NULL;
+
+	if (spline_r)
+		*spline_r = NULL;
+
+	if (is_handle_r)
+		*is_handle_r = FALSE;
+
+	return NULL;
+}
+
+int ED_mask_feather_find_nearest(bContext *C, Mask *mask, float normal_co[2], int threshold,
+                                 MaskLayer **masklay_r, MaskSpline **spline_r, MaskSplinePoint **point_r,
+                                 MaskSplinePointUW **uw_r, float *score)
+{
+	MaskLayer *masklay, *point_masklay = NULL;
+	MaskSpline *point_spline = NULL;
+	MaskSplinePoint *point = NULL;
+	MaskSplinePointUW *uw = NULL;
+	float len = FLT_MAX, co[2];
+	float scalex, scaley, aspx, aspy;
+	int width, height;
+
+	ED_mask_size(C, &width, &height);
+	ED_mask_aspect(C, &aspx, &aspy);
+	ED_mask_pixelspace_factor(C, &scalex, &scaley);
+
+	co[0] = normal_co[0] * scalex;
+	co[1] = normal_co[1] * scaley;
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskSpline *spline;
+
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			//MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline);
+
+			int i, tot_feather_point;
+			float (*feather_points)[2], (*fp)[2];
+
+			if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+				continue;
+			}
+
+			feather_points = fp = BKE_mask_spline_feather_points(spline, &tot_feather_point);
+
+			for (i = 0; i < spline->tot_point; i++) {
+				int j;
+				MaskSplinePoint *cur_point = &spline->points[i];
+
+				for (j = 0; j < cur_point->tot_uw + 1; j++) {
+					float cur_len, vec[2];
+
+					vec[0] = (*fp)[0] * scalex;
+					vec[1] = (*fp)[1] * scaley;
+
+					cur_len = len_v2v2(vec, co);
+
+					if (point == NULL || cur_len < len) {
+						if (j == 0)
+							uw = NULL;
+						else
+							uw = &cur_point->uw[j - 1];
+
+						point_masklay = masklay;
+						point_spline = spline;
+						point = cur_point;
+						len = cur_len;
+					}
+
+					fp++;
+				}
+			}
+
+			MEM_freeN(feather_points);
+		}
+	}
+
+	if (len < threshold) {
+		if (masklay_r)
+			*masklay_r = point_masklay;
+
+		if (spline_r)
+			*spline_r = point_spline;
+
+		if (point_r)
+			*point_r = point;
+
+		if (uw_r)
+			*uw_r = uw;
+
+		if (score)
+			*score = len;
+
+		return TRUE;
+	}
+
+	if (masklay_r)
+		*masklay_r = NULL;
+
+	if (spline_r)
+		*spline_r = NULL;
+
+	if (point_r)
+		*point_r = NULL;
+
+	return FALSE;
+}
+
+
+/******************** create new mask *********************/
+
+static int mask_new_exec(bContext *C, wmOperator *op)
+{
+	SpaceClip *sc = CTX_wm_space_clip(C);
+	Mask *mask;
+	char name[MAX_ID_NAME - 2];
+
+	RNA_string_get(op->ptr, "name", name);
+
+	mask = BKE_mask_new(name);
+
+	if (sc)
+		ED_space_clip_set_mask(C, sc, mask);
+
+	return OPERATOR_FINISHED;
+}
+
+void MASK_OT_new(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "New Mask";
+	ot->description = "Create new mask";
+	ot->idname = "MASK_OT_new";
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	/* api callbacks */
+	ot->exec = mask_new_exec;
+	ot->poll = ED_operator_mask;
+
+	/* properties */
+	RNA_def_string(ot->srna, "name", "", MAX_ID_NAME - 2, "Name", "Name of new mask");
+}
+
+/******************** create new masklay *********************/
+
+static int masklay_new_exec(bContext *C, wmOperator *op)
+{
+	Mask *mask = CTX_data_edit_mask(C);
+	char name[MAX_ID_NAME - 2];
+
+	RNA_string_get(op->ptr, "name", name);
+
+	BKE_mask_layer_new(mask, name);
+	mask->masklay_act = mask->masklay_tot - 1;
+
+	WM_event_add_notifier(C, NC_MASK | NA_EDITED, mask);
+
+	return OPERATOR_FINISHED;
+}
+
+void MASK_OT_layer_new(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Add Mask Layer";
+	ot->description = "Add new mask layer for masking";
+	ot->idname = "MASK_OT_layer_new";
+
+	/* api callbacks */
+	ot->exec = masklay_new_exec;
+	ot->poll = ED_maskedit_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	/* properties */
+	RNA_def_string(ot->srna, "name", "", MAX_ID_NAME - 2, "Name", "Name of new mask layer");
+}
+
+/******************** remove mask layer *********************/
+
+static int masklay_remove_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *masklay = BKE_mask_layer_active(mask);
+
+	if (masklay) {
+		BKE_mask_layer_remove(mask, masklay);
+
+		WM_event_add_notifier(C, NC_MASK | NA_EDITED, mask);
+	}
+
+	return OPERATOR_FINISHED;
+}
+
+void MASK_OT_layer_remove(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Remove Mask Layer";
+	ot->description = "Remove mask layer";
+	ot->idname = "MASK_OT_layer_remove";
+
+	/* api callbacks */
+	ot->exec = masklay_remove_exec;
+	ot->poll = ED_maskedit_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+/******************** slide *********************/
+
+enum {
+	SLIDE_ACTION_NONE    = 0,
+	SLIDE_ACTION_POINT   = 1,
+	SLIDE_ACTION_HANDLE  = 2,
+	SLIDE_ACTION_FEATHER = 3
+};
+
+typedef struct SlidePointData {
+	int action;
+
+	float co[2];
+	float vec[3][3];
+
+	Mask *mask;
+	MaskLayer *masklay;
+	MaskSpline *spline, *orig_spline;
+	MaskSplinePoint *point;
+	MaskSplinePointUW *uw;
+	float handle[2], no[2], feather[2];
+	int width, height;
+	float weight;
+
+	short curvature_only, accurate;
+	short initial_feather, overall_feather;
+} SlidePointData;
+
+static int slide_point_check_initial_feather(MaskSpline *spline)
+{
+	int i;
+
+	for (i = 0; i < spline->tot_point; i++) {
+		MaskSplinePoint *point = &spline->points[i];
+
+		if (point->bezt.weight != 0.0f)
+			return FALSE;
+
+		/* comment for now. if all bezt weights are zero - this is as good-as initial */
+#if 0
+		int j;
+		for (j = 0; j < point->tot_uw; j++) {
+			if (point->uw[j].w != 0.0f)
+				return FALSE;
+		}
+#endif
+	}
+
+	return TRUE;
+}
+
+static void *slide_point_customdata(bContext *C, wmOperator *op, wmEvent *event)
+{
+	Mask *mask = CTX_data_edit_mask(C);
+	SlidePointData *customdata = NULL;
+	MaskLayer *masklay, *cv_masklay, *feather_masklay;
+	MaskSpline *spline, *cv_spline, *feather_spline;
+	MaskSplinePoint *point, *cv_point, *feather_point;
+	MaskSplinePointUW *uw = NULL;
+	int is_handle = FALSE, width, height, action = SLIDE_ACTION_NONE;
+	int slide_feather = RNA_boolean_get(op->ptr, "slide_feather");
+	float co[2], cv_score, feather_score;
+	const float threshold = 19;
+
+	ED_mask_mouse_pos(C, event, co);
+	ED_mask_size(C, &width, &height);
+
+	cv_point = ED_mask_point_find_nearest(C, mask, co, threshold, &cv_masklay, &cv_spline, &is_handle, &cv_score);
+
+	if (ED_mask_feather_find_nearest(C, mask, co, threshold, &feather_masklay, &feather_spline, &feather_point, &uw, &feather_score)) {
+		if (slide_feather || !cv_point || feather_score < cv_score) {
+			action = SLIDE_ACTION_FEATHER;
+
+			masklay = feather_masklay;
+			spline = feather_spline;
+			point = feather_point;
+		}
+	}
+
+	if (cv_point && action == SLIDE_ACTION_NONE) {
+		if (is_handle)
+			action = SLIDE_ACTION_HANDLE;
+		else
+			action = SLIDE_ACTION_POINT;
+
+		masklay = cv_masklay;
+		spline = cv_spline;
+		point = cv_point;
+	}
+
+	if (action != SLIDE_ACTION_NONE) {
+		customdata = MEM_callocN(sizeof(SlidePointData), "mask slide point data");
+
+		customdata->mask = mask;
+		customdata->masklay = masklay;
+		customdata->spline = spline;
+		customdata->point = point;
+		customdata->width = width;
+		customdata->height = height;
+		customdata->action = action;
+		customdata->uw = uw;
+
+		if (uw) {
+			float co[2];
+			float weight_scalar = BKE_mask_point_weight_scalar(spline, point, uw->u);
+
+			customdata->weight = uw->w;
+			BKE_mask_point_segment_co(spline, point, uw->u, co);
+			BKE_mask_point_normal(spline, point, uw->u, customdata->no);
+
+			madd_v2_v2v2fl(customdata->feather, co, customdata->no, uw->w * weight_scalar);
+		}
+		else {
+			BezTriple *bezt = &point->bezt;
+
+			customdata->weight = bezt->weight;
+			BKE_mask_point_normal(spline, point, 0.0f, customdata->no);
+
+			madd_v2_v2v2fl(customdata->feather, bezt->vec[1], customdata->no, bezt->weight);
+		}
+
+		if (customdata->action == SLIDE_ACTION_FEATHER)
+			customdata->initial_feather = slide_point_check_initial_feather(spline);
+
+		copy_m3_m3(customdata->vec, point->bezt.vec);
+		if (BKE_mask_point_has_handle(point))
+			BKE_mask_point_handle(point, customdata->handle);
+		ED_mask_mouse_pos(C, event, customdata->co);
+	}
+
+	return customdata;
+}
+
+static int slide_point_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	SlidePointData *slidedata = slide_point_customdata(C, op, event);
+
+	if (slidedata) {
+		Mask *mask = CTX_data_edit_mask(C);
+
+		op->customdata = slidedata;
+
+		WM_event_add_modal_handler(C, op);
+
+		if (slidedata->uw) {
+			if ((slidedata->uw->flag & SELECT) == 0) {
+				ED_mask_select_toggle_all(mask, SEL_DESELECT);
+
+				slidedata->uw->flag |= SELECT;
+
+				ED_mask_select_flush_all(mask);
+			}
+		}
+		else if (!MASKPOINT_ISSEL_ANY(slidedata->point)) {
+			ED_mask_select_toggle_all(mask, SEL_DESELECT);
+
+			BKE_mask_point_select_set(slidedata->point, TRUE);
+
+			ED_mask_select_flush_all(mask);
+		}
+
+		slidedata->masklay->act_spline = slidedata->spline;
+		slidedata->masklay->act_point = slidedata->point;
+
+		WM_event_add_notifier(C, NC_MASK | ND_SELECT, mask);
+
+		return OPERATOR_RUNNING_MODAL;
+	}
+
+	return OPERATOR_PASS_THROUGH;
+}
+
+static void slide_point_delta_all_feather(SlidePointData *data, float delta)
+{
+	int i;
+
+	for (i = 0; i < data->spline->tot_point; i++) {
+		MaskSplinePoint *point = &data->spline->points[i];
+		MaskSplinePoint *orig_point = &data->orig_spline->points[i];
+
+		point->bezt.weight = orig_point->bezt.weight + delta;
+		if (point->bezt.weight < 0.0f)
+			point->bezt.weight = 0.0f;
+
+		/* not needed anymore */
+#if 0
+		int j;
+		for (j = 0; j < point->tot_uw; j++) {
+			point->uw[j].w = orig_point->uw[j].w + delta;
+			if (point->uw[j].w < 0.0f)
+				point->uw[j].w = 0.0f;
+		}
+#endif
+	}
+}
+
+static void slide_point_restore_spline(SlidePointData *data)
+{
+	int i;
+
+	for (i = 0; i < data->spline->tot_point; i++) {
+		MaskSplinePoint *point = &data->spline->points[i];
+		MaskSplinePoint *orig_point = &data->orig_spline->points[i];
+		int j;
+
+		point->bezt = orig_point->bezt;
+
+		for (j = 0; j < point->tot_uw; j++)
+			point->uw[j] = orig_point->uw[j];
+	}
+}
+
+static void cancel_slide_point(SlidePointData *data)
+{
+	/* cancel sliding */
+
+	if (data->orig_spline) {
+		slide_point_restore_spline(data);
+	}
+	else {
+		if (data->action == SLIDE_ACTION_FEATHER) {
+			if (data->uw)
+				data->uw->w = data->weight;
+			else
+				data->point->bezt.weight = data->weight;
+		}
+		else {
+			copy_m3_m3(data->point->bezt.vec, data->vec);
+		}
+	}
+}
+
+static void free_slide_point_data(SlidePointData *data)
+{
+	if (data->orig_spline)
+		BKE_mask_spline_free(data->orig_spline);
+
+	MEM_freeN(data);
+}
+
+static int slide_point_modal(bContext *C, wmOperator *op, wmEvent *event)
+{
+	SlidePointData *data = (SlidePointData *)op->customdata;
+	BezTriple *bezt = &data->point->bezt;
+	float co[2], dco[2];
+
+	switch (event->type) {
+		case LEFTCTRLKEY:
+		case RIGHTCTRLKEY:
+		case LEFTSHIFTKEY:
+		case RIGHTSHIFTKEY:
+			if (ELEM(event->type, LEFTCTRLKEY, RIGHTCTRLKEY)) {
+				if (data->action == SLIDE_ACTION_FEATHER)
+					data->overall_feather = event->val == KM_PRESS;
+				else
+					data->curvature_only = event->val == KM_PRESS;
+			}
+
+			if (ELEM(event->type, LEFTSHIFTKEY, RIGHTSHIFTKEY))
+				data->accurate = event->val == KM_PRESS;
+
+		/* no break! update CV position */
+
+		case MOUSEMOVE:
+			ED_mask_mouse_pos(C, event, co);
+			sub_v2_v2v2(dco, co, data->co);
+
+			if (data->action == SLIDE_ACTION_HANDLE) {
+				float delta[2], offco[2];
+
+				sub_v2_v2v2(delta, data->handle, data->co);
+
+				sub_v2_v2v2(offco, co, data->co);
+				if (data->accurate)
+					mul_v2_fl(offco, 0.2f);
+				add_v2_v2(offco, data->co);
+				add_v2_v2(offco, delta);
+
+				BKE_mask_point_set_handle(data->point, offco, data->curvature_only, data->handle, data->vec);
+			}
+			else if (data->action == SLIDE_ACTION_POINT) {
+				float delta[2];
+
+				copy_v2_v2(delta, dco);
+				if (data->accurate)
+					mul_v2_fl(delta, 0.2f);
+
+				add_v2_v2v2(bezt->vec[0], data->vec[0], delta);
+				add_v2_v2v2(bezt->vec[1], data->vec[1], delta);
+				add_v2_v2v2(bezt->vec[2], data->vec[2], delta);
+			}
+			else if (data->action == SLIDE_ACTION_FEATHER) {
+				float vec[2], no[2], p[2], c[2], w, offco[2];
+				float *weight = NULL;
+				float weight_scalar = 1.0f;
+				int overall_feather = data->overall_feather || data->initial_feather;
+
+				add_v2_v2v2(offco, data->feather, dco);
+
+				if (data->uw) {
+					/* project on both sides and find the closest one,
+					 * prevents flickering when projecting onto both sides can happen */
+					const float u_pos = BKE_mask_spline_project_co(data->spline, data->point,
+					                                               data->uw->u, offco, MASK_PROJ_NEG);
+					const float u_neg = BKE_mask_spline_project_co(data->spline, data->point,
+					                                               data->uw->u, offco, MASK_PROJ_POS);
+					float dist_pos = FLT_MAX;
+					float dist_neg = FLT_MAX;
+					float co_pos[2];
+					float co_neg[2];
+					float u;
+
+					if (u_pos > 0.0f && u_pos < 1.0f) {
+						BKE_mask_point_segment_co(data->spline, data->point, u_pos, co_pos);
+						dist_pos = len_squared_v2v2(offco, co_pos);
+					}
+
+					if (u_neg > 0.0f && u_neg < 1.0f) {
+						BKE_mask_point_segment_co(data->spline, data->point, u_neg, co_neg);
+						dist_neg = len_squared_v2v2(offco, co_neg);
+					}
+
+					u = dist_pos < dist_neg ? u_pos : u_neg;
+
+					if (u > 0.0f && u < 1.0f) {
+						data->uw->u = u;
+
+						data->uw = BKE_mask_point_sort_uw(data->point, data->uw);
+						weight = &data->uw->w;
+						weight_scalar = BKE_mask_point_weight_scalar(data->spline, data->point, u);
+						if (weight_scalar != 0.0f) {
+							weight_scalar = 1.0f / weight_scalar;
+						}
+
+						BKE_mask_point_normal(data->spline, data->point, data->uw->u, no);
+						BKE_mask_point_segment_co(data->spline, data->point, data->uw->u, p);
+					}
+				}
+				else {
+					weight = &bezt->weight;
+					/* weight_scalar = 1.0f; keep as is */
+					copy_v2_v2(no, data->no);
+					copy_v2_v2(p, bezt->vec[1]);
+				}
+
+				if (weight) {
+					sub_v2_v2v2(c, offco, p);
+					project_v2_v2v2(vec, c, no);
+
+					w = len_v2(vec);
+
+					if (overall_feather) {
+						float delta;
+
+						if (dot_v2v2(no, vec) <= 0.0f)
+							w = -w;
+
+						delta = w - data->weight;
+
+						if (data->orig_spline == NULL) {
+							/* restore weight for currently sliding point, so orig_spline would be created
+							 * with original weights used
+							 */
+							*weight = data->weight * weight_scalar;
+
+							data->orig_spline = BKE_mask_spline_copy(data->spline);
+						}
+
+						slide_point_delta_all_feather(data, delta);
+					}
+					else {
+						if (dot_v2v2(no, vec) <= 0.0f)
+							w = 0.0f;
+
+						if (data->orig_spline) {
+							/* restore possible overall feather changes */
+							slide_point_restore_spline(data);
+
+							BKE_mask_spline_free(data->orig_spline);
+							data->orig_spline = NULL;
+						}
+
+						if (weight_scalar != 0.0f) {
+							*weight = w * weight_scalar;
+						}
+					}
+				}
+			}
+
+			WM_event_add_notifier(C, NC_MASK | NA_EDITED, data->mask);
+			DAG_id_tag_update(&data->mask->id, 0);
+
+			break;
+
+		case LEFTMOUSE:
+			if (event->val == KM_RELEASE) {
+				Scene *scene = CTX_data_scene(C);
+
+				/* dont key sliding feather uw's */
+				if ((data->action == SLIDE_ACTION_FEATHER && data->uw) == FALSE) {
+					if (IS_AUTOKEY_ON(scene)) {
+						ED_mask_layer_shape_auto_key(data->masklay, CFRA);
+					}
+				}
+
+				WM_event_add_notifier(C, NC_MASK | NA_EDITED, data->mask);
+				DAG_id_tag_update(&data->mask->id, 0);
+
+				free_slide_point_data(op->customdata); /* keep this last! */
+				return OPERATOR_FINISHED;
+			}
+
+			break;
+
+		case ESCKEY:
+			cancel_slide_point(op->customdata);
+
+			WM_event_add_notifier(C, NC_MASK | NA_EDITED, data->mask);
+			DAG_id_tag_update(&data->mask->id, 0);
+
+			free_slide_point_data(op->customdata); /* keep this last! */
+			return OPERATOR_CANCELLED;
+	}
+
+	return OPERATOR_RUNNING_MODAL;
+}
+
+void MASK_OT_slide_point(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Slide Point";
+	ot->description = "Slide control points";
+	ot->idname = "MASK_OT_slide_point";
+
+	/* api callbacks */
+	ot->invoke = slide_point_invoke;
+	ot->modal = slide_point_modal;
+	ot->poll = ED_maskedit_mask_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	RNA_def_boolean(ot->srna, "slide_feather", 0, "Slide Feather", "First try to slide feather instead of vertex");
+}
+
+/******************** toggle cyclic *********************/
+
+static int cyclic_toggle_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *masklay;
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskSpline *spline;
+
+		if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+			continue;
+		}
+
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			if (ED_mask_spline_select_check(spline)) {
+				spline->flag ^= MASK_SPLINE_CYCLIC;
+			}
+		}
+	}
+
+	WM_event_add_notifier(C, NC_MASK | NA_EDITED, mask);
+
+	return OPERATOR_FINISHED;
+}
+
+void MASK_OT_cyclic_toggle(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Toggle Cyclic";
+	ot->description = "Toggle cyclic for selected splines";
+	ot->idname = "MASK_OT_cyclic_toggle";
+
+	/* api callbacks */
+	ot->exec = cyclic_toggle_exec;
+	ot->poll = ED_maskedit_mask_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+/******************** delete *********************/
+
+static void delete_feather_points(MaskSplinePoint *point)
+{
+	int i, count = 0;
+
+	if (!point->tot_uw)
+		return;
+
+	for (i = 0; i < point->tot_uw; i++) {
+		if ((point->uw[i].flag & SELECT) == 0)
+			count++;
+	}
+
+	if (count == 0) {
+		MEM_freeN(point->uw);
+		point->uw = NULL;
+		point->tot_uw = 0;
+	}
+	else {
+		MaskSplinePointUW *new_uw;
+		int j = 0;
+
+		new_uw = MEM_callocN(count * sizeof(MaskSplinePointUW), "new mask uw points");
+
+		for (i = 0; i < point->tot_uw; i++) {
+			if ((point->uw[i].flag & SELECT) == 0) {
+				new_uw[j++] = point->uw[i];
+			}
+		}
+
+		MEM_freeN(point->uw);
+
+		point->uw = new_uw;
+		point->tot_uw = count;
+	}
+}
+
+static int delete_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *masklay;
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskSpline *spline;
+		int mask_layer_shape_ofs = 0;
+
+		if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+			continue;
+		}
+
+		spline = masklay->splines.first;
+
+		while (spline) {
+			const int tot_point_orig = spline->tot_point;
+			int i, count = 0;
+			MaskSpline *next_spline = spline->next;
+
+			/* count unselected points */
+			for (i = 0; i < spline->tot_point; i++) {
+				MaskSplinePoint *point = &spline->points[i];
+
+				if (!MASKPOINT_ISSEL_ANY(point))
+					count++;
+			}
+
+			if (count == 0) {
+
+				/* delete the whole spline */
+				BLI_remlink(&masklay->splines, spline);
+				BKE_mask_spline_free(spline);
+
+				if (spline == masklay->act_spline) {
+					masklay->act_spline = NULL;
+					masklay->act_point = NULL;
+				}
+
+				BKE_mask_layer_shape_changed_remove(masklay, mask_layer_shape_ofs, tot_point_orig);
+			}
+			else {
+				MaskSplinePoint *new_points;
+				int j;
+
+				new_points = MEM_callocN(count * sizeof(MaskSplinePoint), "deleteMaskPoints");
+
+				for (i = 0, j = 0; i < tot_point_orig; i++) {
+					MaskSplinePoint *point = &spline->points[i];
+
+					if (!MASKPOINT_ISSEL_ANY(point)) {
+						if (point == masklay->act_point)
+							masklay->act_point = &new_points[j];
+
+						delete_feather_points(point);
+
+						new_points[j] = *point;
+						j++;
+					}
+					else {
+						if (point == masklay->act_point)
+							masklay->act_point = NULL;
+
+						BKE_mask_point_free(point);
+						spline->tot_point--;
+
+						BKE_mask_layer_shape_changed_remove(masklay, mask_layer_shape_ofs + j, 1);
+					}
+				}
+
+				mask_layer_shape_ofs += spline->tot_point;
+
+				MEM_freeN(spline->points);
+				spline->points = new_points;
+
+				ED_mask_select_flush_all(mask);
+			}
+
+			spline = next_spline;
+		}
+
+		/* not essential but confuses users when there are keys with no data!
+		 * assume if they delete all data from the layer they also dont care about keys */
+		if (masklay->splines.first == NULL) {
+			BKE_mask_layer_free_shapes(masklay);
+		}
+	}
+
+	/* TODO: only update edited splines */
+	BKE_mask_update_display(mask, CTX_data_scene(C)->r.cfra);
+
+	WM_event_add_notifier(C, NC_MASK | NA_EDITED, mask);
+
+	return OPERATOR_FINISHED;
+}
+
+void MASK_OT_delete(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Delete";
+	ot->description = "Delete selected control points or splines";
+	ot->idname = "MASK_OT_delete";
+
+	/* api callbacks */
+	ot->invoke = WM_operator_confirm;
+	ot->exec = delete_exec;
+	ot->poll = ED_maskedit_mask_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+/* *** switch direction *** */
+static int mask_switch_direction_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Scene *scene = CTX_data_scene(C);
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *masklay;
+
+	int change = FALSE;
+
+	/* do actual selection */
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskSpline *spline;
+		int change_layer = FALSE;
+
+		if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+			continue;
+		}
+
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			if (ED_mask_spline_select_check(spline)) {
+				BKE_mask_spline_direction_switch(masklay, spline);
+				change = TRUE;
+				change_layer = TRUE;
+			}
+		}
+
+		if (change_layer) {
+			if (IS_AUTOKEY_ON(scene)) {
+				ED_mask_layer_shape_auto_key(masklay, CFRA);
+			}
+		}
+	}
+
+	if (change) {
+		/* TODO: only update this spline */
+		BKE_mask_update_display(mask, CTX_data_scene(C)->r.cfra);
+
+		WM_event_add_notifier(C, NC_MASK | ND_SELECT, mask);
+
+		return OPERATOR_FINISHED;
+	}
+
+	return OPERATOR_CANCELLED;
+}
+
+void MASK_OT_switch_direction(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Switch Direction";
+	ot->description = "Switch direction of selected splines";
+	ot->idname = "MASK_OT_switch_direction";
+
+	/* api callbacks */
+	ot->exec = mask_switch_direction_exec;
+	ot->poll = ED_maskedit_mask_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+
+/* *** recalc normals *** */
+static int mask_normals_make_consistent_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Scene *scene = CTX_data_scene(C);
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *masklay;
+	int i;
+
+	int change = FALSE;
+
+	/* do actual selection */
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskSpline *spline;
+		int change_layer = FALSE;
+
+		if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+			continue;
+		}
+
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			for (i = 0; i < spline->tot_point; i++) {
+				MaskSplinePoint *point = &spline->points[i];
+
+				if (MASKPOINT_ISSEL_ANY(point)) {
+					BKE_mask_calc_handle_point_auto(spline, point, FALSE);
+					change = TRUE;
+					change_layer = TRUE;
+				}
+			}
+		}
+
+		if (change_layer) {
+			if (IS_AUTOKEY_ON(scene)) {
+				ED_mask_layer_shape_auto_key(masklay, CFRA);
+			}
+		}
+	}
+
+	if (change) {
+		/* TODO: only update this spline */
+		BKE_mask_update_display(mask, CTX_data_scene(C)->r.cfra);
+
+		WM_event_add_notifier(C, NC_MASK | ND_SELECT, mask);
+
+		return OPERATOR_FINISHED;
+	}
+
+	return OPERATOR_CANCELLED;
+}
+
+/* named to match mesh recalc normals */
+void MASK_OT_normals_make_consistent(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Recalc Normals";
+	ot->description = "Re-calculate the direction of selected handles";
+	ot->idname = "MASK_OT_normals_make_consistent";
+
+	/* api callbacks */
+	ot->exec = mask_normals_make_consistent_exec;
+	ot->poll = ED_maskedit_mask_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+
+/******************** set handle type *********************/
+
+static int set_handle_type_exec(bContext *C, wmOperator *op)
+{
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *masklay;
+	int handle_type = RNA_enum_get(op->ptr, "type");
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskSpline *spline;
+		int i;
+
+		if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+			continue;
+		}
+
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			for (i = 0; i < spline->tot_point; i++) {
+				MaskSplinePoint *point = &spline->points[i];
+
+				if (MASKPOINT_ISSEL_ANY(point)) {
+					BezTriple *bezt = &point->bezt;
+
+					bezt->h1 = bezt->h2 = handle_type;
+				}
+			}
+		}
+	}
+
+	WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
+	DAG_id_tag_update(&mask->id, 0);
+
+	return OPERATOR_FINISHED;
+}
+
+void MASK_OT_handle_type_set(wmOperatorType *ot)
+{
+	static EnumPropertyItem editcurve_handle_type_items[] = {
+		{HD_AUTO, "AUTO", 0, "Auto", ""},
+		{HD_VECT, "VECTOR", 0, "Vector", ""},
+		{HD_ALIGN, "ALIGNED", 0, "Aligned", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+
+	/* identifiers */
+	ot->name = "Set Handle Type";
+	ot->description = "Set type of handles for selected control points";
+	ot->idname = "MASK_OT_handle_type_set";
+
+	/* api callbacks */
+	ot->invoke = WM_menu_invoke;
+	ot->exec = set_handle_type_exec;
+	ot->poll = ED_maskedit_mask_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	/* properties */
+	ot->prop = RNA_def_enum(ot->srna, "type", editcurve_handle_type_items, 1, "Type", "Spline type");
+}
+
+
+/* ********* clear/set restrict view *********/
+static int mask_hide_view_clear_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *masklay;
+	int changed = FALSE;
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+
+		if (masklay->restrictflag & OB_RESTRICT_VIEW) {
+			ED_mask_layer_select_set(masklay, TRUE);
+			masklay->restrictflag &= ~OB_RESTRICT_VIEW;
+			changed = 1;
+		}
+	}
+
+	if (changed) {
+		WM_event_add_notifier(C, NC_MASK | ND_DRAW, mask);
+		DAG_id_tag_update(&mask->id, 0);
+
+		return OPERATOR_FINISHED;
+	}
+	else {
+		return OPERATOR_CANCELLED;
+	}
+}
+
+void MASK_OT_hide_view_clear(wmOperatorType *ot)
+{
+
+	/* identifiers */
+	ot->name = "Clear Restrict View";
+	ot->description = "Reveal the layer by setting the hide flag";
+	ot->idname = "MASK_OT_hide_view_clear";
+
+	/* api callbacks */
+	ot->exec = mask_hide_view_clear_exec;
+	ot->poll = ED_maskedit_mask_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+static int mask_hide_view_set_exec(bContext *C, wmOperator *op)
+{
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *masklay;
+	const int unselected = RNA_boolean_get(op->ptr, "unselected");
+	int changed = FALSE;
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+
+		if (masklay->restrictflag & MASK_RESTRICT_SELECT) {
+			continue;
+		}
+
+		if (!unselected) {
+			if (ED_mask_layer_select_check(masklay)) {
+				ED_mask_layer_select_set(masklay, FALSE);
+
+				masklay->restrictflag |= OB_RESTRICT_VIEW;
+				changed = 1;
+				if (masklay == BKE_mask_layer_active(mask)) {
+					BKE_mask_layer_active_set(mask, NULL);
+				}
+			}
+		}
+		else {
+			if (!ED_mask_layer_select_check(masklay)) {
+				masklay->restrictflag |= OB_RESTRICT_VIEW;
+				changed = 1;
+				if (masklay == BKE_mask_layer_active(mask)) {
+					BKE_mask_layer_active_set(mask, NULL);
+				}
+			}
+		}
+	}
+
+	if (changed) {
+		WM_event_add_notifier(C, NC_MASK | ND_DRAW, mask);
+		DAG_id_tag_update(&mask->id, 0);
+
+		return OPERATOR_FINISHED;
+	}
+	else {
+		return OPERATOR_CANCELLED;
+	}
+}
+
+void MASK_OT_hide_view_set(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Set Restrict View";
+	ot->description = "Hide the layer by setting the hide flag";
+	ot->idname = "MASK_OT_hide_view_set";
+
+	/* api callbacks */
+	ot->exec = mask_hide_view_set_exec;
+	ot->poll = ED_maskedit_mask_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected layers");
+}
+
+
+static int mask_feather_weight_clear_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *masklay;
+	int changed = FALSE;
+	int i;
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskSpline *spline;
+
+		if (masklay->restrictflag & (MASK_RESTRICT_SELECT | MASK_RESTRICT_VIEW)) {
+			continue;
+		}
+
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			for (i = 0; i < spline->tot_point; i++) {
+				MaskSplinePoint *point = &spline->points[i];
+
+				if (MASKPOINT_ISSEL_ANY(point)) {
+					BezTriple *bezt = &point->bezt;
+					bezt->weight = 0.0f;
+					changed = TRUE;
+				}
+			}
+		}
+	}
+
+	if (changed) {
+		/* TODO: only update edited splines */
+		BKE_mask_update_display(mask, CTX_data_scene(C)->r.cfra);
+
+		WM_event_add_notifier(C, NC_MASK | ND_DRAW, mask);
+		DAG_id_tag_update(&mask->id, 0);
+
+		return OPERATOR_FINISHED;
+	}
+	else {
+		return OPERATOR_CANCELLED;
+	}
+}
+
+void MASK_OT_feather_weight_clear(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Clear Feather Weight";
+	ot->description = "Reset the feather weight to zero";
+	ot->idname = "MASK_OT_feather_weight_clear";
+
+	/* api callbacks */
+	ot->exec = mask_feather_weight_clear_exec;
+	ot->poll = ED_maskedit_mask_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
diff --git a/source/blender/editors/mask/mask_relationships.c b/source/blender/editors/mask/mask_relationships.c
new file mode 100644
index 00000000000..7ba3c27e18d
--- /dev/null
+++ b/source/blender/editors/mask/mask_relationships.c
@@ -0,0 +1,172 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2012 Blender Foundation.
+ * All rights reserved.
+ *
+ *
+ * Contributor(s): Blender Foundation,
+ *                 Campbell Barton
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/mask/mask_relationships.c
+ *  \ingroup edmask
+ */
+
+
+#include "BLI_math.h"
+
+#include "BKE_context.h"
+#include "BKE_depsgraph.h"
+#include "BKE_mask.h"
+#include "BKE_tracking.h"
+
+#include "DNA_mask_types.h"
+#include "DNA_object_types.h"  /* SELECT */
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "ED_screen.h"
+#include "ED_mask.h"  /* own include */
+
+#include "mask_intern.h"  /* own include */
+
+static int mask_parent_clear_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *masklay;
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskSpline *spline;
+		int i;
+
+		if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+			continue;
+		}
+
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			for (i = 0; i < spline->tot_point; i++) {
+				MaskSplinePoint *point = &spline->points[i];
+
+				if (MASKPOINT_ISSEL_ANY(point)) {
+					point->parent.id = NULL;
+				}
+			}
+		}
+	}
+
+	WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
+	DAG_id_tag_update(&mask->id, 0);
+
+	return OPERATOR_FINISHED;
+}
+
+void MASK_OT_parent_clear(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Clear Parent";
+	ot->description = "Clear the mask's parenting";
+	ot->idname = "MASK_OT_parent_clear";
+
+	/* api callbacks */
+	ot->exec = mask_parent_clear_exec;
+
+	ot->poll = ED_maskedit_mask_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+static int mask_parent_set_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *masklay;
+
+	/* parent info */
+	SpaceClip *sc;
+	MovieClip *clip;
+	MovieTrackingTrack *track;
+	MovieTrackingMarker *marker;
+	MovieTrackingObject *tracking;
+	/* done */
+
+	float marker_pos_ofs[2];
+	float parmask_pos[2];
+
+	if ((NULL == (sc = CTX_wm_space_clip(C))) ||
+	    (NULL == (clip = sc->clip)) ||
+	    (NULL == (track = clip->tracking.act_track)) ||
+	    (NULL == (marker = BKE_tracking_marker_get(track, sc->user.framenr))) ||
+	    (NULL == (tracking = BKE_tracking_object_get_active(&clip->tracking))))
+	{
+		return OPERATOR_CANCELLED;
+	}
+
+	add_v2_v2v2(marker_pos_ofs, marker->pos, track->offset);
+
+	BKE_mask_coord_from_movieclip(clip, &sc->user, parmask_pos, marker_pos_ofs);
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskSpline *spline;
+		int i;
+
+		if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+			continue;
+		}
+
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			for (i = 0; i < spline->tot_point; i++) {
+				MaskSplinePoint *point = &spline->points[i];
+
+				if (MASKPOINT_ISSEL_ANY(point)) {
+					point->parent.id_type = ID_MC;
+					point->parent.id = &clip->id;
+					strcpy(point->parent.parent, tracking->name);
+					strcpy(point->parent.sub_parent, track->name);
+
+					copy_v2_v2(point->parent.parent_orig, parmask_pos);
+				}
+			}
+		}
+	}
+
+	WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
+	DAG_id_tag_update(&mask->id, 0);
+
+	return OPERATOR_FINISHED;
+}
+
+/** based on #OBJECT_OT_parent_set */
+void MASK_OT_parent_set(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Make Parent";
+	ot->description = "Set the mask's parenting";
+	ot->idname = "MASK_OT_parent_set";
+
+	/* api callbacks */
+	//ot->invoke = mask_parent_set_invoke;
+	ot->exec = mask_parent_set_exec;
+
+	ot->poll = ED_maskedit_mask_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
diff --git a/source/blender/editors/mask/mask_select.c b/source/blender/editors/mask/mask_select.c
new file mode 100644
index 00000000000..55e09529320
--- /dev/null
+++ b/source/blender/editors/mask/mask_select.c
@@ -0,0 +1,766 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2012 Blender Foundation.
+ * All rights reserved.
+ *
+ *
+ * Contributor(s): Blender Foundation,
+ *                 Sergey Sharybin
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/mask/mask_select.c
+ *  \ingroup edmask
+ */
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_utildefines.h"
+#include "BLI_rect.h"
+#include "BLI_lasso.h"
+
+#include "BKE_context.h"
+#include "BKE_mask.h"
+
+#include "DNA_mask_types.h"
+#include "DNA_object_types.h"  /* SELECT */
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "ED_screen.h"
+#include "ED_clip.h"
+#include "ED_mask.h"  /* own include */
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "mask_intern.h"  /* own include */
+
+/* 'check' select */
+int ED_mask_spline_select_check(MaskSpline *spline)
+{
+	int i;
+
+	for (i = 0; i < spline->tot_point; i++) {
+		MaskSplinePoint *point = &spline->points[i];
+
+		if (MASKPOINT_ISSEL_ANY(point))
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
+int ED_mask_layer_select_check(MaskLayer *masklay)
+{
+	MaskSpline *spline;
+
+	if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+		return FALSE;
+	}
+
+	for (spline = masklay->splines.first; spline; spline = spline->next) {
+		if (ED_mask_spline_select_check(spline)) {
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+int ED_mask_select_check(Mask *mask)
+{
+	MaskLayer *masklay;
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		if (ED_mask_layer_select_check(masklay)) {
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+/* 'sel' select  */
+void ED_mask_spline_select_set(MaskSpline *spline, const short do_select)
+{
+	int i;
+
+	if (do_select)
+		spline->flag |= SELECT;
+	else
+		spline->flag &= ~SELECT;
+
+	for (i = 0; i < spline->tot_point; i++) {
+		MaskSplinePoint *point = &spline->points[i];
+
+		BKE_mask_point_select_set(point, do_select);
+	}
+}
+
+void ED_mask_layer_select_set(MaskLayer *masklay, const short do_select)
+{
+	MaskSpline *spline;
+
+	if (masklay->restrictflag & MASK_RESTRICT_SELECT) {
+		if (do_select == TRUE) {
+			return;
+		}
+	}
+
+	for (spline = masklay->splines.first; spline; spline = spline->next) {
+		ED_mask_spline_select_set(spline, do_select);
+	}
+}
+
+void ED_mask_select_toggle_all(Mask *mask, int action)
+{
+	MaskLayer *masklay;
+
+	if (action == SEL_TOGGLE) {
+		if (ED_mask_select_check(mask))
+			action = SEL_DESELECT;
+		else
+			action = SEL_SELECT;
+	}
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+
+		if (masklay->restrictflag & MASK_RESTRICT_VIEW) {
+			continue;
+		}
+
+		ED_mask_layer_select_set(masklay, (action == SEL_SELECT) ? TRUE : FALSE);
+	}
+}
+
+void ED_mask_select_flush_all(Mask *mask)
+{
+	MaskLayer *masklay;
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskSpline *spline;
+
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			int i;
+
+			spline->flag &= ~SELECT;
+
+			/* intentionally _dont_ do this in the masklay loop
+			 * so we clear flags on all splines */
+			if (masklay->restrictflag & MASK_RESTRICT_VIEW) {
+				continue;
+			}
+
+			for (i = 0; i < spline->tot_point; i++) {
+				MaskSplinePoint *cur_point = &spline->points[i];
+
+				if (MASKPOINT_ISSEL_ANY(cur_point)) {
+					spline->flag |= SELECT;
+				}
+				else {
+					int j;
+
+					for (j = 0; j < cur_point->tot_uw; j++) {
+						if (cur_point->uw[j].flag & SELECT) {
+							spline->flag |= SELECT;
+							break;
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+/******************** toggle selection *********************/
+
+static int select_all_exec(bContext *C, wmOperator *op)
+{
+	Mask *mask = CTX_data_edit_mask(C);
+	int action = RNA_enum_get(op->ptr, "action");
+
+	ED_mask_select_toggle_all(mask, action);
+	ED_mask_select_flush_all(mask);
+
+	WM_event_add_notifier(C, NC_MASK | ND_SELECT, mask);
+
+	return OPERATOR_FINISHED;
+}
+
+void MASK_OT_select_all(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "(De)select All";
+	ot->description = "Change selection of all curve points";
+	ot->idname = "MASK_OT_select_all";
+
+	/* api callbacks */
+	ot->exec = select_all_exec;
+	ot->poll = ED_maskedit_mask_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	/* properties */
+	WM_operator_properties_select_all(ot);
+}
+
+/******************** select *********************/
+
+static int select_exec(bContext *C, wmOperator *op)
+{
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *masklay;
+	MaskSpline *spline;
+	MaskSplinePoint *point = NULL;
+	float co[2];
+	short extend = RNA_boolean_get(op->ptr, "extend");
+	short deselect = RNA_boolean_get(op->ptr, "deselect");
+	short toggle = RNA_boolean_get(op->ptr, "toggle");
+
+	int is_handle = 0;
+	const float threshold = 19;
+
+	RNA_float_get_array(op->ptr, "location", co);
+
+	point = ED_mask_point_find_nearest(C, mask, co, threshold, &masklay, &spline, &is_handle, NULL);
+
+	if (extend == 0 && deselect == 0 && toggle == 0)
+		ED_mask_select_toggle_all(mask, SEL_DESELECT);
+
+	if (point) {
+
+		if (is_handle) {
+			if (extend) {
+				masklay->act_spline = spline;
+				masklay->act_point = point;
+
+				BKE_mask_point_select_set_handle(point, TRUE);
+			}
+			else if (deselect) {
+				BKE_mask_point_select_set_handle(point, FALSE);
+			}
+			else {
+				masklay->act_spline = spline;
+				masklay->act_point = point;
+
+				if (!MASKPOINT_ISSEL_HANDLE(point)) {
+					BKE_mask_point_select_set_handle(point, TRUE);
+				}
+				else if (toggle) {
+					BKE_mask_point_select_set_handle(point, FALSE);
+				}
+			}
+		}
+		else {
+			if (extend) {
+				masklay->act_spline = spline;
+				masklay->act_point = point;
+
+				BKE_mask_point_select_set(point, TRUE);
+			}
+			else if (deselect) {
+				BKE_mask_point_select_set(point, FALSE);
+			}
+			else {
+				masklay->act_spline = spline;
+				masklay->act_point = point;
+
+				if (!MASKPOINT_ISSEL_ANY(point)) {
+					BKE_mask_point_select_set(point, TRUE);
+				}
+				else if (toggle) {
+					BKE_mask_point_select_set(point, FALSE);
+				}
+			}
+		}
+
+		masklay->act_spline = spline;
+		masklay->act_point = point;
+
+		ED_mask_select_flush_all(mask);
+
+		WM_event_add_notifier(C, NC_MASK | ND_SELECT, mask);
+
+		return OPERATOR_FINISHED;
+	}
+	else {
+		MaskSplinePointUW *uw;
+
+		if (ED_mask_feather_find_nearest(C, mask, co, threshold, &masklay, &spline, &point, &uw, NULL)) {
+
+			if (extend) {
+				masklay->act_spline = spline;
+				masklay->act_point = point;
+
+				if (uw) uw->flag |= SELECT;
+			}
+			else if (deselect) {
+				if (uw) uw->flag &= ~SELECT;
+			}
+			else {
+				masklay->act_spline = spline;
+				masklay->act_point = point;
+
+				if (uw) {
+					if (!(uw->flag & SELECT)) {
+						uw->flag |= SELECT;
+					}
+					else if (toggle) {
+						uw->flag &= ~SELECT;
+					}
+				}
+			}
+
+			ED_mask_select_flush_all(mask);
+
+			WM_event_add_notifier(C, NC_MASK | ND_SELECT, mask);
+
+			return OPERATOR_FINISHED;
+		}
+	}
+
+	return OPERATOR_PASS_THROUGH;
+}
+
+static int select_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	float co[2];
+
+	ED_mask_mouse_pos(C, event, co);
+
+	RNA_float_set_array(op->ptr, "location", co);
+
+	return select_exec(C, op);
+}
+
+void MASK_OT_select(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Select";
+	ot->description = "Select spline points";
+	ot->idname = "MASK_OT_select";
+
+	/* api callbacks */
+	ot->exec = select_exec;
+	ot->invoke = select_invoke;
+	ot->poll = ED_maskedit_mask_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_UNDO;
+
+	/* properties */
+	WM_operator_properties_mouse_select(ot);
+
+	RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MIN, FLT_MAX,
+	                     "Location", "Location of vertex in normalized space", -1.0f, 1.0f);
+}
+
+
+
+/********************** border select operator *********************/
+
+static int border_select_exec(bContext *C, wmOperator *op)
+{
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *masklay;
+	int i;
+
+	rcti rect;
+	rctf rectf;
+	int change = FALSE, mode, extend;
+
+	/* get rectangle from operator */
+	rect.xmin = RNA_int_get(op->ptr, "xmin");
+	rect.ymin = RNA_int_get(op->ptr, "ymin");
+	rect.xmax = RNA_int_get(op->ptr, "xmax");
+	rect.ymax = RNA_int_get(op->ptr, "ymax");
+
+	ED_mask_point_pos(C, rect.xmin, rect.ymin, &rectf.xmin, &rectf.ymin);
+	ED_mask_point_pos(C, rect.xmax, rect.ymax, &rectf.xmax, &rectf.ymax);
+
+	mode = RNA_int_get(op->ptr, "gesture_mode");
+	extend = RNA_boolean_get(op->ptr, "extend");
+
+	/* do actual selection */
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskSpline *spline;
+
+		if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+			continue;
+		}
+
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline);
+
+			for (i = 0; i < spline->tot_point; i++) {
+				MaskSplinePoint *point = &spline->points[i];
+				MaskSplinePoint *point_deform = &points_array[i];
+
+				/* TODO: handles? */
+				/* TODO: uw? */
+
+				if (BLI_in_rctf(&rectf, point_deform->bezt.vec[1][0], point_deform->bezt.vec[1][1])) {
+					BKE_mask_point_select_set(point, mode == GESTURE_MODAL_SELECT);
+					BKE_mask_point_select_set_handle(point, mode == GESTURE_MODAL_SELECT);
+				}
+				else if (!extend) {
+					BKE_mask_point_select_set(point, FALSE);
+					BKE_mask_point_select_set_handle(point, FALSE);
+				}
+
+				change = TRUE;
+			}
+		}
+	}
+
+	if (change) {
+		ED_mask_select_flush_all(mask);
+
+		WM_event_add_notifier(C, NC_MASK | ND_SELECT, mask);
+
+		return OPERATOR_FINISHED;
+	}
+
+	return OPERATOR_CANCELLED;
+}
+
+void MASK_OT_select_border(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Border Select";
+	ot->description = "Select markers using border selection";
+	ot->idname = "MASK_OT_select_border";
+
+	/* api callbacks */
+	ot->invoke = WM_border_select_invoke;
+	ot->exec = border_select_exec;
+	ot->modal = WM_border_select_modal;
+	ot->poll = ED_maskedit_mask_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_UNDO;
+
+	/* properties */
+	WM_operator_properties_gesture_border(ot, TRUE);
+}
+
+static int do_lasso_select_mask(bContext *C, int mcords[][2], short moves, short select)
+{
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *masklay;
+	int i;
+
+	rcti rect;
+	int change = FALSE;
+
+	/* get rectangle from operator */
+	BLI_lasso_boundbox(&rect, mcords, moves);
+
+	/* do actual selection */
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskSpline *spline;
+
+		if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+			continue;
+		}
+
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline);
+
+			for (i = 0; i < spline->tot_point; i++) {
+				MaskSplinePoint *point = &spline->points[i];
+				MaskSplinePoint *point_deform = &points_array[i];
+
+				/* TODO: handles? */
+				/* TODO: uw? */
+
+				float screen_co[2];
+
+				/* marker in screen coords */
+				ED_mask_point_pos__reverse(C,
+				                           point_deform->bezt.vec[1][0], point_deform->bezt.vec[1][1],
+				                           &screen_co[0], &screen_co[1]);
+
+				if (BLI_in_rcti(&rect, screen_co[0], screen_co[1]) &&
+				    BLI_lasso_is_point_inside(mcords, moves, screen_co[0], screen_co[1], INT_MAX))
+				{
+					BKE_mask_point_select_set(point, select);
+					BKE_mask_point_select_set_handle(point, select);
+				}
+
+				change = TRUE;
+			}
+		}
+	}
+
+	if (change) {
+		ED_mask_select_flush_all(mask);
+
+		WM_event_add_notifier(C, NC_MASK | ND_SELECT, mask);
+	}
+
+	return change;
+}
+
+static int clip_lasso_select_exec(bContext *C, wmOperator *op)
+{
+	int mcords_tot;
+	int (*mcords)[2] = WM_gesture_lasso_path_to_array(C, op, &mcords_tot);
+
+	if (mcords) {
+		short select;
+
+		select = !RNA_boolean_get(op->ptr, "deselect");
+		do_lasso_select_mask(C, mcords, mcords_tot, select);
+
+		MEM_freeN(mcords);
+
+		return OPERATOR_FINISHED;
+	}
+	return OPERATOR_PASS_THROUGH;
+}
+
+void MASK_OT_select_lasso(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Lasso Select";
+	ot->description = "Select markers using lasso selection";
+	ot->idname = "MASK_OT_select_lasso";
+
+	/* api callbacks */
+	ot->invoke = WM_gesture_lasso_invoke;
+	ot->modal = WM_gesture_lasso_modal;
+	ot->exec = clip_lasso_select_exec;
+	ot->poll = ED_maskedit_mask_poll;
+	ot->cancel = WM_gesture_lasso_cancel;
+
+	/* flags */
+	ot->flag = OPTYPE_UNDO;
+
+	/* properties */
+	RNA_def_collection_runtime(ot->srna, "path", &RNA_OperatorMousePath, "Path", "");
+	RNA_def_boolean(ot->srna, "deselect", 0, "Deselect", "Deselect rather than select items");
+	RNA_def_boolean(ot->srna, "extend", 1, "Extend", "Extend selection instead of deselecting everything first");
+}
+
+/********************** circle select operator *********************/
+
+static int mask_spline_point_inside_ellipse(BezTriple *bezt, float offset[2], float ellipse[2])
+{
+	/* normalized ellipse: ell[0] = scaleX, ell[1] = scaleY */
+	float x, y;
+
+	x = (bezt->vec[1][0] - offset[0]) * ellipse[0];
+	y = (bezt->vec[1][1] - offset[1]) * ellipse[1];
+
+	return x * x + y * y < 1.0f;
+}
+
+static int circle_select_exec(bContext *C, wmOperator *op)
+{
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *masklay;
+	int i;
+
+	SpaceClip *sc = CTX_wm_space_clip(C);
+	ARegion *ar = CTX_wm_region(C);
+	int x, y, radius, width, height, mode, change = FALSE;
+	float zoomx, zoomy, offset[2], ellipse[2];
+
+	/* get operator properties */
+	x = RNA_int_get(op->ptr, "x");
+	y = RNA_int_get(op->ptr, "y");
+	radius = RNA_int_get(op->ptr, "radius");
+
+	mode = RNA_int_get(op->ptr, "gesture_mode");
+
+	/* TODO - make generic! - this is SpaceClip only! */
+	/* compute ellipse and position in unified coordinates */
+	ED_space_clip_size(sc, &width, &height);
+	ED_space_clip_zoom(sc, ar, &zoomx, &zoomy);
+	width = height = MAX2(width, height);
+
+	ellipse[0] = width * zoomx / radius;
+	ellipse[1] = height * zoomy / radius;
+
+	ED_mask_point_pos(C, x, y, &offset[0], &offset[1]);
+
+	/* do actual selection */
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskSpline *spline;
+
+		if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+			continue;
+		}
+
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline);
+
+			for (i = 0; i < spline->tot_point; i++) {
+				MaskSplinePoint *point = &spline->points[i];
+				MaskSplinePoint *point_deform = &points_array[i];
+
+				if (mask_spline_point_inside_ellipse(&point_deform->bezt, offset, ellipse)) {
+					BKE_mask_point_select_set(point, mode == GESTURE_MODAL_SELECT);
+					BKE_mask_point_select_set_handle(point, mode == GESTURE_MODAL_SELECT);
+
+					change = TRUE;
+				}
+			}
+		}
+	}
+
+	if (change) {
+		ED_mask_select_flush_all(mask);
+
+		WM_event_add_notifier(C, NC_MASK | ND_SELECT, mask);
+
+		return OPERATOR_FINISHED;
+	}
+
+	return OPERATOR_CANCELLED;
+}
+
+void MASK_OT_select_circle(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Circle Select";
+	ot->description = "Select markers using circle selection";
+	ot->idname = "MASK_OT_select_circle";
+
+	/* api callbacks */
+	ot->invoke = WM_gesture_circle_invoke;
+	ot->modal = WM_gesture_circle_modal;
+	ot->exec = circle_select_exec;
+	ot->poll = ED_maskedit_mask_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	/* properties */
+	RNA_def_int(ot->srna, "x", 0, INT_MIN, INT_MAX, "X", "", INT_MIN, INT_MAX);
+	RNA_def_int(ot->srna, "y", 0, INT_MIN, INT_MAX, "Y", "", INT_MIN, INT_MAX);
+	RNA_def_int(ot->srna, "radius", 0, INT_MIN, INT_MAX, "Radius", "", INT_MIN, INT_MAX);
+	RNA_def_int(ot->srna, "gesture_mode", 0, INT_MIN, INT_MAX, "Gesture Mode", "", INT_MIN, INT_MAX);
+}
+
+static int mask_select_linked_pick_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *masklay;
+	MaskSpline *spline;
+	MaskSplinePoint *point = NULL;
+	float co[2];
+	int do_select = !RNA_boolean_get(op->ptr, "deselect");
+
+	int is_handle = 0;
+	const float threshold = 19;
+	int change = FALSE;
+
+	ED_mask_mouse_pos(C, event, co);
+
+	point = ED_mask_point_find_nearest(C, mask, co, threshold, &masklay, &spline, &is_handle, NULL);
+
+	if (point) {
+		ED_mask_spline_select_set(spline, do_select);
+		masklay->act_spline = spline;
+		masklay->act_point = point;
+
+		change = TRUE;
+	}
+
+	if (change) {
+		ED_mask_select_flush_all(mask);
+
+		WM_event_add_notifier(C, NC_MASK | ND_SELECT, mask);
+
+		return OPERATOR_FINISHED;
+	}
+
+	return OPERATOR_CANCELLED;
+}
+
+void MASK_OT_select_linked_pick(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Select Linked";
+	ot->idname = "MASK_OT_select_linked_pick";
+	ot->description = "(De)select all points linked to the curve under the mouse cursor";
+
+	/* api callbacks */
+	ot->invoke = mask_select_linked_pick_invoke;
+	ot->poll = ED_maskedit_mask_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	RNA_def_boolean(ot->srna, "deselect", 0, "Deselect", "");
+}
+
+static int mask_select_linked_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *masklay;
+
+	int change = FALSE;
+
+	/* do actual selection */
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskSpline *spline;
+
+		if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+			continue;
+		}
+
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			if (ED_mask_spline_select_check(spline)) {
+				ED_mask_spline_select_set(spline, TRUE);
+				change = TRUE;
+			}
+		}
+	}
+
+	if (change) {
+		ED_mask_select_flush_all(mask);
+
+		WM_event_add_notifier(C, NC_MASK | ND_SELECT, mask);
+
+		return OPERATOR_FINISHED;
+	}
+
+	return OPERATOR_CANCELLED;
+}
+
+void MASK_OT_select_linked(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Select Linked All";
+	ot->idname = "MASK_OT_select_linked";
+	ot->description = "Select all vertices linked to the active mesh";
+
+	/* api callbacks */
+	ot->exec = mask_select_linked_exec;
+	ot->poll = ED_maskedit_mask_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
diff --git a/source/blender/editors/mask/mask_shapekey.c b/source/blender/editors/mask/mask_shapekey.c
new file mode 100644
index 00000000000..8da083ab400
--- /dev/null
+++ b/source/blender/editors/mask/mask_shapekey.c
@@ -0,0 +1,276 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2012 Blender Foundation.
+ * All rights reserved.
+ *
+ *
+ * Contributor(s): Blender Foundation,
+ *                 Campbell Barton
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/mask/mask_shapekey.c
+ *  \ingroup edmask
+ */
+
+#include "BLI_utildefines.h"
+
+#include "BKE_context.h"
+#include "BKE_depsgraph.h"
+#include "BKE_mask.h"
+
+#include "DNA_object_types.h"
+#include "DNA_mask_types.h"
+#include "DNA_scene_types.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "ED_mask.h"  /* own include */
+
+#include "mask_intern.h"  /* own include */
+
+static int mask_shape_key_insert_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Scene *scene = CTX_data_scene(C);
+	const int frame = CFRA;
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *masklay;
+	int change = FALSE;
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskLayerShape *masklay_shape;
+
+		if (!ED_mask_layer_select_check(masklay)) {
+			continue;
+		}
+
+		masklay_shape = BKE_mask_layer_shape_varify_frame(masklay, frame);
+		BKE_mask_layer_shape_from_mask(masklay, masklay_shape);
+		change = TRUE;
+	}
+
+	if (change) {
+		WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
+		DAG_id_tag_update(&mask->id, 0);
+
+		return OPERATOR_FINISHED;
+	}
+	else {
+		return OPERATOR_CANCELLED;
+	}
+}
+
+void MASK_OT_shape_key_insert(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Insert Shape Key";
+	ot->description = "";
+	ot->idname = "MASK_OT_shape_key_insert";
+
+	/* api callbacks */
+	ot->exec = mask_shape_key_insert_exec;
+	ot->poll = ED_maskedit_mask_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+static int mask_shape_key_clear_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Scene *scene = CTX_data_scene(C);
+	const int frame = CFRA;
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *masklay;
+	int change = FALSE;
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskLayerShape *masklay_shape;
+
+		if (!ED_mask_layer_select_check(masklay)) {
+			continue;
+		}
+
+		masklay_shape = BKE_mask_layer_shape_find_frame(masklay, frame);
+
+		if (masklay_shape) {
+			BKE_mask_layer_shape_unlink(masklay, masklay_shape);
+			change = TRUE;
+		}
+	}
+
+	if (change) {
+		WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
+		DAG_id_tag_update(&mask->id, 0);
+
+		return OPERATOR_FINISHED;
+	}
+	else {
+		return OPERATOR_CANCELLED;
+	}
+}
+
+void MASK_OT_shape_key_clear(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Clear Shape Key";
+	ot->description = "";
+	ot->idname = "MASK_OT_shape_key_clear";
+
+	/* api callbacks */
+	ot->exec = mask_shape_key_clear_exec;
+	ot->poll = ED_maskedit_mask_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+static int mask_shape_key_feather_reset_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Scene *scene = CTX_data_scene(C);
+	const int frame = CFRA;
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *masklay;
+	int change = FALSE;
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+
+		if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+			continue;
+		}
+
+		if (masklay->splines_shapes.first) {
+			MaskLayerShape *masklay_shape_reset;
+			MaskLayerShape *masklay_shape;
+
+			/* get the shapekey of the current state */
+			masklay_shape_reset = BKE_mask_layer_shape_alloc(masklay, frame);
+			/* initialize from mask - as if inseting a keyframe */
+			BKE_mask_layer_shape_from_mask(masklay, masklay_shape_reset);
+
+			for (masklay_shape = masklay->splines_shapes.first;
+			     masklay_shape;
+			     masklay_shape = masklay_shape->next)
+			{
+
+				if (masklay_shape_reset->tot_vert == masklay_shape->tot_vert) {
+					int i_abs = 0;
+					int i;
+					MaskSpline *spline;
+					MaskLayerShapeElem *shape_ele_src;
+					MaskLayerShapeElem *shape_ele_dst;
+
+					shape_ele_src = (MaskLayerShapeElem *)masklay_shape_reset->data;
+					shape_ele_dst = (MaskLayerShapeElem *)masklay_shape->data;
+
+					for (spline = masklay->splines.first; spline; spline = spline->next) {
+						for (i = 0; i < spline->tot_point; i++) {
+							MaskSplinePoint *point = &spline->points[i];
+
+							if (MASKPOINT_ISSEL_ANY(point)) {
+								/* TODO - nicer access here */
+								shape_ele_dst->value[6] = shape_ele_src->value[6];
+							}
+
+							shape_ele_src++;
+							shape_ele_dst++;
+
+							i_abs++;
+						}
+					}
+
+				}
+				else {
+					// printf("%s: skipping\n", __func__);
+				}
+
+				change = TRUE;
+			}
+
+			BKE_mask_layer_shape_free(masklay_shape_reset);
+		}
+	}
+
+	if (change) {
+		WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
+		DAG_id_tag_update(&mask->id, 0);
+
+		return OPERATOR_FINISHED;
+	}
+	else {
+		return OPERATOR_CANCELLED;
+	}
+}
+
+void MASK_OT_shape_key_feather_reset(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Feather Reset Animation";
+	ot->description = "Resets fearther weights on all selected points animation values";
+	ot->idname = "MASK_OT_shape_key_feather_reset";
+
+	/* api callbacks */
+	ot->exec = mask_shape_key_feather_reset_exec;
+	ot->poll = ED_maskedit_mask_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+
+/* *** Shape Key Utils *** */
+
+void ED_mask_layer_shape_auto_key(MaskLayer *masklay, const int frame)
+{
+	MaskLayerShape *masklay_shape;
+
+	masklay_shape = BKE_mask_layer_shape_varify_frame(masklay, frame);
+	BKE_mask_layer_shape_from_mask(masklay, masklay_shape);
+}
+
+int ED_mask_layer_shape_auto_key_all(Mask *mask, const int frame)
+{
+	MaskLayer *masklay;
+	int change = FALSE;
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		ED_mask_layer_shape_auto_key(masklay, frame);
+		change = TRUE;
+	}
+
+	return change;
+}
+
+int ED_mask_layer_shape_auto_key_select(Mask *mask, const int frame)
+{
+	MaskLayer *masklay;
+	int change = FALSE;
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+
+		if (!ED_mask_layer_select_check(masklay)) {
+			continue;
+		}
+
+		ED_mask_layer_shape_auto_key(masklay, frame);
+		change = TRUE;
+	}
+
+	return change;
+}
diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c
index 60c0ebbc7b3..9cbd9e0b7da 100644
--- a/source/blender/editors/mesh/editmesh_add.c
+++ b/source/blender/editors/mesh/editmesh_add.c
@@ -53,39 +53,11 @@
 
 #include "mesh_intern.h"
 
-/* uses context to figure out transform for primitive */
-/* returns standard diameter */
-static float new_primitive_matrix(bContext *C, float *loc, float *rot, float primmat[][4])
-{
-	Object *obedit = CTX_data_edit_object(C);
-	View3D *v3d = CTX_wm_view3d(C);
-	float mat[3][3], rmat[3][3], cmat[3][3], imat[3][3];
-	
-	unit_m4(primmat);
-
-	eul_to_mat3(rmat, rot);
-	invert_m3(rmat);
-	
-	/* inverse transform for initial rotation and object */
-	copy_m3_m4(mat, obedit->obmat);
-	mul_m3_m3m3(cmat, rmat, mat);
-	invert_m3_m3(imat, cmat);
-	copy_m4_m3(primmat, imat);
-
-	/* center */
-	copy_v3_v3(primmat[3], loc);
-	sub_v3_v3(primmat[3], obedit->obmat[3]);
-	invert_m3_m3(imat, mat);
-	mul_m3_v3(imat, primmat[3]);
-
-	return v3d ? v3d->grid : 1.0f;
-}
-
 /* ********* add primitive operators ************* */
 
 static void make_prim_init(bContext *C, const char *idname,
                            float *dia, float mat[][4],
-                           int *state, float *loc, float *rot, unsigned int layer)
+                           int *state, const float loc[3], const float rot[3], const unsigned int layer)
 {
 	Object *obedit = CTX_data_edit_object(C);
 
@@ -101,7 +73,7 @@ static void make_prim_init(bContext *C, const char *idname,
 		*state = 1;
 	}
 
-	*dia = new_primitive_matrix(C, loc, rot, mat);
+	*dia = ED_object_new_primitive_matrix(C, obedit, loc, rot, mat);
 }
 
 static void make_prim_finish(bContext *C, int *state, int enter_editmode)
diff --git a/source/blender/editors/mesh/editmesh_bvh.c b/source/blender/editors/mesh/editmesh_bvh.c
index 16948a2372d..2cb03104874 100644
--- a/source/blender/editors/mesh/editmesh_bvh.c
+++ b/source/blender/editors/mesh/editmesh_bvh.c
@@ -308,7 +308,7 @@ static void vertsearchcallback(void *userdata, int index, const float *UNUSED(co
 	}
 }
 
-BMVert *BMBVH_FindClosestVert(BMBVHTree *tree, float *co, float maxdist)
+BMVert *BMBVH_FindClosestVert(BMBVHTree *tree, const float co[3], float maxdist)
 {
 	BVHTreeNearest hit;
 
@@ -370,7 +370,7 @@ int BMBVH_VertVisible(BMBVHTree *tree, BMEdge *e, RegionView3D *r3d)
 }
 #endif
 
-static BMFace *edge_ray_cast(BMBVHTree *tree, float *co, float *dir, float *hitout, BMEdge *e)
+static BMFace *edge_ray_cast(BMBVHTree *tree, const float co[3], const float dir[3], float *hitout, BMEdge *e)
 {
 	BMFace *f = BMBVH_RayCast(tree, co, dir, hitout, NULL);
 	
@@ -380,7 +380,7 @@ static BMFace *edge_ray_cast(BMBVHTree *tree, float *co, float *dir, float *hito
 	return f;
 }
 
-static void scale_point(float *c1, float *p, float s)
+static void scale_point(float c1[3], const float p[3], const float s)
 {
 	sub_v3_v3(c1, p);
 	mul_v3_fl(c1, s);
diff --git a/source/blender/editors/mesh/editmesh_bvh.h b/source/blender/editors/mesh/editmesh_bvh.h
index 6512f054c1b..53d1c36119e 100644
--- a/source/blender/editors/mesh/editmesh_bvh.h
+++ b/source/blender/editors/mesh/editmesh_bvh.h
@@ -57,8 +57,8 @@ int BMBVH_EdgeVisible(struct BMBVHTree *tree, struct BMEdge *e,
                       struct ARegion *ar, struct View3D *v3d, struct Object *obedit);
 
 /*find a vert closest to co in a sphere of radius maxdist*/
-struct BMVert *BMBVH_FindClosestVert(struct BMBVHTree *tree, float *co, float maxdist);
-                                         
+struct BMVert *BMBVH_FindClosestVert(struct BMBVHTree *tree, const float co[3], const float maxdist);
+
 /* BMBVH_NewBVH flag parameter */
 enum {
 	BMBVH_USE_CAGE        = 1, /* project geometry onto modifier cage */
diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c
index 6bbcd1d253e..f154aec2eb4 100644
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -2247,7 +2247,7 @@ static int find_hole_chains(KnifeTool_OpData *kcd, ListBase *hole, BMFace *f, Li
 	ListBase *chain;
 	BMVert *v;
 	BMIter iter;
-	int nh, nf, i, j, k, m, ax, ay, ok, sep, bestsep;
+	int nh, nf, i, j, k, m, ax, ay, ok, sep = 0 /* Quite warnings */, bestsep;
 	int besti[2], bestj[2];
 	float d, bestd;
 
diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c
index 7298153791e..15e3033b7eb 100644
--- a/source/blender/editors/mesh/editmesh_loopcut.c
+++ b/source/blender/editors/mesh/editmesh_loopcut.c
@@ -86,7 +86,7 @@
 /* ringsel operator */
 
 /* struct for properties used while drawing */
-typedef struct tringselOpData {
+typedef struct RingSelOpData {
 	ARegion *ar;        /* region that ringsel was activated in */
 	void *draw_handle;  /* for drawing preview loop */
 	
@@ -102,13 +102,13 @@ typedef struct tringselOpData {
 
 	int extend;
 	int do_cut;
-} tringselOpData;
+} RingSelOpData;
 
 /* modal loop selection drawing callback */
 static void ringsel_draw(const bContext *C, ARegion *UNUSED(ar), void *arg)
 {
 	View3D *v3d = CTX_wm_view3d(C);
-	tringselOpData *lcd = arg;
+	RingSelOpData *lcd = arg;
 	int i;
 	
 	if (lcd->totedge > 0) {
@@ -176,7 +176,7 @@ static void edgering_find_order(BMEdge *lasteed, BMEdge *eed,
 	}
 }
 
-static void edgering_sel(tringselOpData *lcd, int previewlines, int select)
+static void edgering_sel(RingSelOpData *lcd, int previewlines, int select)
 {
 	BMEditMesh *em = lcd->em;
 	BMEdge *startedge = lcd->eed;
@@ -290,7 +290,7 @@ static void edgering_sel(tringselOpData *lcd, int previewlines, int select)
 	lcd->totedge = tot;
 }
 
-static void ringsel_find_edge(tringselOpData *lcd, int cuts)
+static void ringsel_find_edge(RingSelOpData *lcd, int cuts)
 {
 	if (lcd->eed) {
 		edgering_sel(lcd, cuts, 0);
@@ -304,7 +304,7 @@ static void ringsel_find_edge(tringselOpData *lcd, int cuts)
 
 static void ringsel_finish(bContext *C, wmOperator *op)
 {
-	tringselOpData *lcd = op->customdata;
+	RingSelOpData *lcd = op->customdata;
 	int cuts = RNA_int_get(op->ptr, "number_cuts");
 
 	if (lcd->eed) {
@@ -329,6 +329,8 @@ static void ringsel_finish(bContext *C, wmOperator *op)
 
 				WM_event_add_notifier(C, NC_SCENE | ND_TOOLSETTINGS, CTX_data_scene(C));
 			}
+			else
+				EDBM_selectmode_flush(lcd->em);
 
 			WM_event_add_notifier(C, NC_GEOM | ND_SELECT | ND_DATA, lcd->ob->data);
 			DAG_id_tag_update(lcd->ob->data, 0);
@@ -350,7 +352,7 @@ static void ringsel_finish(bContext *C, wmOperator *op)
 /* called when modal loop selection is done... */
 static void ringsel_exit(bContext *UNUSED(C), wmOperator *op)
 {
-	tringselOpData *lcd = op->customdata;
+	RingSelOpData *lcd = op->customdata;
 
 	/* deactivate the extra drawing stuff in 3D-View */
 	ED_region_draw_cb_exit(lcd->ar->type, lcd->draw_handle);
@@ -368,10 +370,10 @@ static void ringsel_exit(bContext *UNUSED(C), wmOperator *op)
 /* called when modal loop selection gets set up... */
 static int ringsel_init(bContext *C, wmOperator *op, int do_cut)
 {
-	tringselOpData *lcd;
+	RingSelOpData *lcd;
 	
 	/* alloc new customdata */
-	lcd = op->customdata = MEM_callocN(sizeof(tringselOpData), "ringsel Modal Op Data");
+	lcd = op->customdata = MEM_callocN(sizeof(RingSelOpData), "ringsel Modal Op Data");
 	
 	/* assign the drawing handle for drawing preview line... */
 	lcd->ar = CTX_wm_region(C);
@@ -402,7 +404,7 @@ static int ringcut_cancel(bContext *C, wmOperator *op)
 static int ringcut_invoke(bContext *C, wmOperator *op, wmEvent *evt)
 {
 	Object *obedit = CTX_data_edit_object(C);
-	tringselOpData *lcd;
+	RingSelOpData *lcd;
 	BMEdge *edge;
 	int dist = 75;
 
@@ -434,7 +436,7 @@ static int ringcut_invoke(bContext *C, wmOperator *op, wmEvent *evt)
 static int loopcut_modal(bContext *C, wmOperator *op, wmEvent *event)
 {
 	int cuts = RNA_int_get(op->ptr, "number_cuts");
-	tringselOpData *lcd = op->customdata;
+	RingSelOpData *lcd = op->customdata;
 	int show_cuts = 0;
 
 	view3d_operator_needs_opengl(C);
diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c
index 0a8fe142aaf..44ec8bd6aaa 100644
--- a/source/blender/editors/mesh/editmesh_select.c
+++ b/source/blender/editors/mesh/editmesh_select.c
@@ -676,6 +676,7 @@ static EnumPropertyItem prop_similar_types[] = {
 	{SIMVERT_NORMAL, "NORMAL", 0, "Normal", ""},
 	{SIMVERT_FACE, "FACE", 0, "Amount of Adjacent Faces", ""},
 	{SIMVERT_VGROUP, "VGROUP", 0, "Vertex Groups", ""},
+	{SIMVERT_EDGE, "EDGE", 0, "Amount of connecting edges", ""},
 
 	{SIMEDGE_LENGTH, "LENGTH", 0, "Length", ""},
 	{SIMEDGE_DIR, "DIR", 0, "Direction", ""},
@@ -1889,7 +1890,7 @@ static int edbm_select_linked_pick_invoke(bContext *C, wmOperator *op, wmEvent *
 		}
 		BMW_end(&walker);
 
-		BM_mesh_select_mode_flush(bm);
+		EDBM_selectmode_flush(em);
 	}
 
 	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit);
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 708273df109..0f7d4c5c547 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -3676,14 +3676,14 @@ enum {
 	SRT_REVERSE,         /* Reverse current order of selected elements. */
 };
 
-typedef struct bmelemsort {
+typedef struct BMElemSort {
 	float srt; /* Sort factor */
 	int org_idx; /* Original index of this element _in its mempool_ */
-} bmelemsort;
+} BMElemSort;
 
 static int bmelemsort_comp(const void *v1, const void *v2)
 {
-	const bmelemsort *x1 = v1, *x2 = v2;
+	const BMElemSort *x1 = v1, *x2 = v2;
 
 	return (x1->srt > x2->srt) - (x1->srt < x2->srt);
 }
@@ -3704,7 +3704,7 @@ static void sort_bmelem_flag(bContext *C, const int types, const int flag, const
 	/* In all five elements below, 0 = vertices, 1 = edges, 2 = faces. */
 	/* Just to mark protected elements. */
 	char *pblock[3] = {NULL, NULL, NULL}, *pb;
-	bmelemsort *sblock[3] = {NULL, NULL, NULL}, *sb;
+	BMElemSort *sblock[3] = {NULL, NULL, NULL}, *sb;
 	int *map[3] = {NULL, NULL, NULL}, *mp;
 	int totelem[3] = {0, 0, 0}, tot;
 	int affected[3] = {0, 0, 0}, aff;
@@ -3733,7 +3733,7 @@ static void sort_bmelem_flag(bContext *C, const int types, const int flag, const
 
 		if (totelem[0]) {
 			pb = pblock[0] = MEM_callocN(sizeof(char) * totelem[0], "sort_bmelem vert pblock");
-			sb = sblock[0] = MEM_callocN(sizeof(bmelemsort) * totelem[0], "sort_bmelem vert sblock");
+			sb = sblock[0] = MEM_callocN(sizeof(BMElemSort) * totelem[0], "sort_bmelem vert sblock");
 
 			BM_ITER_MESH_INDEX (ve, &iter, em->bm, BM_VERTS_OF_MESH, i) {
 				if (BM_elem_flag_test(ve, flag)) {
@@ -3752,7 +3752,7 @@ static void sort_bmelem_flag(bContext *C, const int types, const int flag, const
 
 		if (totelem[1]) {
 			pb = pblock[1] = MEM_callocN(sizeof(char) * totelem[1], "sort_bmelem edge pblock");
-			sb = sblock[1] = MEM_callocN(sizeof(bmelemsort) * totelem[1], "sort_bmelem edge sblock");
+			sb = sblock[1] = MEM_callocN(sizeof(BMElemSort) * totelem[1], "sort_bmelem edge sblock");
 
 			BM_ITER_MESH_INDEX (ed, &iter, em->bm, BM_EDGES_OF_MESH, i) {
 				if (BM_elem_flag_test(ed, flag)) {
@@ -3772,7 +3772,7 @@ static void sort_bmelem_flag(bContext *C, const int types, const int flag, const
 
 		if (totelem[2]) {
 			pb = pblock[2] = MEM_callocN(sizeof(char) * totelem[2], "sort_bmelem face pblock");
-			sb = sblock[2] = MEM_callocN(sizeof(bmelemsort) * totelem[2], "sort_bmelem face sblock");
+			sb = sblock[2] = MEM_callocN(sizeof(BMElemSort) * totelem[2], "sort_bmelem face sblock");
 
 			BM_ITER_MESH_INDEX (fa, &iter, em->bm, BM_FACES_OF_MESH, i) {
 				if (BM_elem_flag_test(fa, flag)) {
@@ -3806,7 +3806,7 @@ static void sort_bmelem_flag(bContext *C, const int types, const int flag, const
 
 		if (totelem[0]) {
 			pb = pblock[0] = MEM_callocN(sizeof(char) * totelem[0], "sort_bmelem vert pblock");
-			sb = sblock[0] = MEM_callocN(sizeof(bmelemsort) * totelem[0], "sort_bmelem vert sblock");
+			sb = sblock[0] = MEM_callocN(sizeof(BMElemSort) * totelem[0], "sort_bmelem vert sblock");
 
 			BM_ITER_MESH_INDEX (ve, &iter, em->bm, BM_VERTS_OF_MESH, i) {
 				if (BM_elem_flag_test(ve, flag)) {
@@ -3822,7 +3822,7 @@ static void sort_bmelem_flag(bContext *C, const int types, const int flag, const
 
 		if (totelem[1]) {
 			pb = pblock[1] = MEM_callocN(sizeof(char) * totelem[1], "sort_bmelem edge pblock");
-			sb = sblock[1] = MEM_callocN(sizeof(bmelemsort) * totelem[1], "sort_bmelem edge sblock");
+			sb = sblock[1] = MEM_callocN(sizeof(BMElemSort) * totelem[1], "sort_bmelem edge sblock");
 
 			BM_ITER_MESH_INDEX (ed, &iter, em->bm, BM_EDGES_OF_MESH, i) {
 				if (BM_elem_flag_test(ed, flag)) {
@@ -3841,7 +3841,7 @@ static void sort_bmelem_flag(bContext *C, const int types, const int flag, const
 
 		if (totelem[2]) {
 			pb = pblock[2] = MEM_callocN(sizeof(char) * totelem[2], "sort_bmelem face pblock");
-			sb = sblock[2] = MEM_callocN(sizeof(bmelemsort) * totelem[2], "sort_bmelem face sblock");
+			sb = sblock[2] = MEM_callocN(sizeof(BMElemSort) * totelem[2], "sort_bmelem face sblock");
 
 			BM_ITER_MESH_INDEX (fa, &iter, em->bm, BM_FACES_OF_MESH, i) {
 				if (BM_elem_flag_test(fa, flag)) {
@@ -3862,7 +3862,7 @@ static void sort_bmelem_flag(bContext *C, const int types, const int flag, const
 	/* Faces only! */
 	else if (action == SRT_MATERIAL && totelem[2]) {
 		pb = pblock[2] = MEM_callocN(sizeof(char) * totelem[2], "sort_bmelem face pblock");
-		sb = sblock[2] = MEM_callocN(sizeof(bmelemsort) * totelem[2], "sort_bmelem face sblock");
+		sb = sblock[2] = MEM_callocN(sizeof(BMElemSort) * totelem[2], "sort_bmelem face sblock");
 
 		BM_ITER_MESH_INDEX (fa, &iter, em->bm, BM_FACES_OF_MESH, i) {
 			if (BM_elem_flag_test(fa, flag)) {
@@ -3966,7 +3966,7 @@ static void sort_bmelem_flag(bContext *C, const int types, const int flag, const
 			 * enabling/disabling an element type. */
 			BLI_srandom(seed);
 			pb = pblock[0] = MEM_callocN(sizeof(char) * totelem[0], "sort_bmelem vert pblock");
-			sb = sblock[0] = MEM_callocN(sizeof(bmelemsort) * totelem[0], "sort_bmelem vert sblock");
+			sb = sblock[0] = MEM_callocN(sizeof(BMElemSort) * totelem[0], "sort_bmelem vert sblock");
 
 			BM_ITER_MESH_INDEX (ve, &iter, em->bm, BM_VERTS_OF_MESH, i) {
 				if (BM_elem_flag_test(ve, flag)) {
@@ -3983,7 +3983,7 @@ static void sort_bmelem_flag(bContext *C, const int types, const int flag, const
 		if (totelem[1]) {
 			BLI_srandom(seed);
 			pb = pblock[1] = MEM_callocN(sizeof(char) * totelem[1], "sort_bmelem edge pblock");
-			sb = sblock[1] = MEM_callocN(sizeof(bmelemsort) * totelem[1], "sort_bmelem edge sblock");
+			sb = sblock[1] = MEM_callocN(sizeof(BMElemSort) * totelem[1], "sort_bmelem edge sblock");
 
 			BM_ITER_MESH_INDEX (ed, &iter, em->bm, BM_EDGES_OF_MESH, i) {
 				if (BM_elem_flag_test(ed, flag)) {
@@ -4000,7 +4000,7 @@ static void sort_bmelem_flag(bContext *C, const int types, const int flag, const
 		if (totelem[2]) {
 			BLI_srandom(seed);
 			pb = pblock[2] = MEM_callocN(sizeof(char) * totelem[2], "sort_bmelem face pblock");
-			sb = sblock[2] = MEM_callocN(sizeof(bmelemsort) * totelem[2], "sort_bmelem face sblock");
+			sb = sblock[2] = MEM_callocN(sizeof(BMElemSort) * totelem[2], "sort_bmelem face sblock");
 
 			BM_ITER_MESH_INDEX (fa, &iter, em->bm, BM_FACES_OF_MESH, i) {
 				if (BM_elem_flag_test(fa, flag)) {
@@ -4018,7 +4018,7 @@ static void sort_bmelem_flag(bContext *C, const int types, const int flag, const
 	else if (action == SRT_REVERSE) {
 		if (totelem[0]) {
 			pb = pblock[0] = MEM_callocN(sizeof(char) * totelem[0], "sort_bmelem vert pblock");
-			sb = sblock[0] = MEM_callocN(sizeof(bmelemsort) * totelem[0], "sort_bmelem vert sblock");
+			sb = sblock[0] = MEM_callocN(sizeof(BMElemSort) * totelem[0], "sort_bmelem vert sblock");
 
 			BM_ITER_MESH_INDEX (ve, &iter, em->bm, BM_VERTS_OF_MESH, i) {
 				if (BM_elem_flag_test(ve, flag)) {
@@ -4034,7 +4034,7 @@ static void sort_bmelem_flag(bContext *C, const int types, const int flag, const
 
 		if (totelem[1]) {
 			pb = pblock[1] = MEM_callocN(sizeof(char) * totelem[1], "sort_bmelem edge pblock");
-			sb = sblock[1] = MEM_callocN(sizeof(bmelemsort) * totelem[1], "sort_bmelem edge sblock");
+			sb = sblock[1] = MEM_callocN(sizeof(BMElemSort) * totelem[1], "sort_bmelem edge sblock");
 
 			BM_ITER_MESH_INDEX (ed, &iter, em->bm, BM_EDGES_OF_MESH, i) {
 				if (BM_elem_flag_test(ed, flag)) {
@@ -4050,7 +4050,7 @@ static void sort_bmelem_flag(bContext *C, const int types, const int flag, const
 
 		if (totelem[2]) {
 			pb = pblock[2] = MEM_callocN(sizeof(char) * totelem[2], "sort_bmelem face pblock");
-			sb = sblock[2] = MEM_callocN(sizeof(bmelemsort) * totelem[2], "sort_bmelem face sblock");
+			sb = sblock[2] = MEM_callocN(sizeof(BMElemSort) * totelem[2], "sort_bmelem face sblock");
 
 			BM_ITER_MESH_INDEX (fa, &iter, em->bm, BM_FACES_OF_MESH, i) {
 				if (BM_elem_flag_test(fa, flag)) {
@@ -4065,9 +4065,9 @@ static void sort_bmelem_flag(bContext *C, const int types, const int flag, const
 		}
 	}
 
-/*	printf("%d vertices: %d to be affected…\n", totelem[0], affected[0]);*/
-/*	printf("%d edges: %d to be affected…\n", totelem[1], affected[1]);*/
-/*	printf("%d faces: %d to be affected…\n", totelem[2], affected[2]);*/
+/*	printf("%d vertices: %d to be affected...\n", totelem[0], affected[0]);*/
+/*	printf("%d edges: %d to be affected...\n", totelem[1], affected[1]);*/
+/*	printf("%d faces: %d to be affected...\n", totelem[2], affected[2]);*/
 	if (affected[0] == 0 && affected[1] == 0 && affected[2] == 0) {
 		for (j = 3; j--; ) {
 			if (pblock[j])
@@ -4086,11 +4086,11 @@ static void sort_bmelem_flag(bContext *C, const int types, const int flag, const
 		sb = sblock[j];
 		if (pb && sb && !map[j]) {
 			char *p_blk;
-			bmelemsort *s_blk;
+			BMElemSort *s_blk;
 			tot = totelem[j];
 			aff = affected[j];
 
-			qsort(sb, aff, sizeof(bmelemsort), bmelemsort_comp);
+			qsort(sb, aff, sizeof(BMElemSort), bmelemsort_comp);
 
 			mp = map[j] = MEM_mallocN(sizeof(int) * tot, "sort_bmelem map");
 			p_blk = pb + tot - 1;
@@ -4498,13 +4498,18 @@ static int edbm_bevel_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	BevelData *opdata;
 	float mlen[2];
 
-	if (!edbm_bevel_init(C, op, TRUE))
+	if (!edbm_bevel_init(C, op, TRUE)) {
 		return OPERATOR_CANCELLED;
+	}
 
-	/* initialize mouse values */
 	opdata = op->customdata;
 
-	calculateTransformCenter(C, V3D_CENTROID, NULL, opdata->mcenter);
+	/* initialize mouse values */
+	if (!calculateTransformCenter(C, V3D_CENTROID, NULL, opdata->mcenter)) {
+		/* in this case the tool will likely do nothing,
+		 * ideally this will never happen and should be checked for above */
+		opdata->mcenter[0] = opdata->mcenter[1] = 0;
+	}
 	mlen[0] = opdata->mcenter[0] - event->mval[0];
 	mlen[1] = opdata->mcenter[1] - event->mval[1];
 	opdata->initial_length = len_v2(mlen);
@@ -4795,8 +4800,12 @@ static int edbm_inset_invoke(bContext *C, wmOperator *op, wmEvent *event)
 
 	opdata = op->customdata;
 
-	calculateTransformCenter(C, V3D_CENTROID, NULL, opdata->mcenter);
 	/* initialize mouse values */
+	if (!calculateTransformCenter(C, V3D_CENTROID, NULL, opdata->mcenter)) {
+		/* in this case the tool will likely do nothing,
+		 * ideally this will never happen and should be checked for above */
+		opdata->mcenter[0] = opdata->mcenter[1] = 0;
+	}
 	mlen[0] = opdata->mcenter[0] - event->mval[0];
 	mlen[1] = opdata->mcenter[1] - event->mval[1];
 	opdata->initial_length = len_v2(mlen);
@@ -4830,13 +4839,11 @@ static int edbm_inset_modal(bContext *C, wmOperator *op, wmEvent *event)
 			mdiff[1] = opdata->mcenter[1] - event->mval[1];
 
 			if (opdata->modify_depth) {
-				amount = opdata->old_depth + (len_v2(mdiff)
-				                              - opdata->initial_length) / opdata->initial_length;
+				amount = opdata->old_depth + (len_v2(mdiff) - opdata->initial_length) / opdata->initial_length;
 				RNA_float_set(op->ptr, "depth", amount);
 			}
 			else {
-				amount = opdata->old_thickness - (len_v2(mdiff)
-				                                  - opdata->initial_length) / opdata->initial_length;
+				amount = opdata->old_thickness - (len_v2(mdiff) - opdata->initial_length) / opdata->initial_length;
 				amount = MAX2(amount, 0.0f);
 
 				RNA_float_set(op->ptr, "thickness", amount);
diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c
index a77a6f4b430..dfa1beb614f 100644
--- a/source/blender/editors/mesh/mesh_ops.c
+++ b/source/blender/editors/mesh/mesh_ops.c
@@ -376,7 +376,9 @@ void ED_keymap_mesh(wmKeyConfig *keyconf)
 		RNA_int_set(kmi->ptr, "level", i);
 	}
 	
-	ED_object_generic_keymap(keyconf, keymap, 3);
+	ED_keymap_proportional_cycle(keyconf, keymap);
+	ED_keymap_proportional_editmode(keyconf, keymap, TRUE);
+
 	knifetool_modal_keymap(keyconf);
 }
 
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c
index 989f1a36f99..59a0475ebb5 100644
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -690,7 +690,8 @@ static void mesh_octree_free_node(MocNode **bt)
 /* temporal define, just to make nicer code below */
 #define MOC_INDEX(vx, vy, vz)  (((vx) * MOC_RES * MOC_RES) + (vy) * MOC_RES + (vz))
 
-static void mesh_octree_add_nodes(MocNode **basetable, float *co, float *offs, float *div, intptr_t index)
+static void mesh_octree_add_nodes(MocNode **basetable, const float co[3], const float offs[3],
+                                  const float div[3], intptr_t index)
 {
 	float fx, fy, fz;
 	int vx, vy, vz;
diff --git a/source/blender/editors/metaball/mball_ops.c b/source/blender/editors/metaball/mball_ops.c
index 1c77eba2019..e98654f589a 100644
--- a/source/blender/editors/metaball/mball_ops.c
+++ b/source/blender/editors/metaball/mball_ops.c
@@ -79,6 +79,7 @@ void ED_keymap_metaball(wmKeyConfig *keyconf)
 	kmi = WM_keymap_add_item(keymap, "MBALL_OT_select_all", IKEY, KM_PRESS, KM_CTRL, 0);
 	RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
 
-	ED_object_generic_keymap(keyconf, keymap, 3);
+	ED_keymap_proportional_cycle(keyconf, keymap);
+	ED_keymap_proportional_editmode(keyconf, keymap, TRUE);
 }
 
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index fe5fafb0ca0..ba26b92f354 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -107,9 +107,21 @@
 
 #include "object_intern.h"
 
+/* this is an exact copy of the define in rna_lamp.c
+ * kept here because of linking order. 
+ * Icons are only defined here */
+EnumPropertyItem lamp_type_items[] = {
+	{LA_LOCAL, "POINT", ICON_LAMP_POINT, "Point", "Omnidirectional point light source"},
+	{LA_SUN, "SUN", ICON_LAMP_SUN, "Sun", "Constant direction parallel ray light source"},
+	{LA_SPOT, "SPOT", ICON_LAMP_SPOT, "Spot", "Directional cone light source"},
+	{LA_HEMI, "HEMI", ICON_LAMP_HEMI, "Hemi", "180 degree constant light source"},
+	{LA_AREA, "AREA", ICON_LAMP_AREA, "Area", "Directional area light source"},
+	{0, NULL, 0, NULL, NULL}
+};
+
 /************************** Exported *****************************/
 
-void ED_object_location_from_view(bContext *C, float *loc)
+void ED_object_location_from_view(bContext *C, float loc[3])
 {
 	View3D *v3d = CTX_wm_view3d(C);
 	Scene *scene = CTX_data_scene(C);
@@ -120,7 +132,7 @@ void ED_object_location_from_view(bContext *C, float *loc)
 	copy_v3_v3(loc, cursor);
 }
 
-void ED_object_rotation_from_view(bContext *C, float *rot)
+void ED_object_rotation_from_view(bContext *C, float rot[3])
 {
 	RegionView3D *rv3d = CTX_wm_region_view3d(C);
 	if (rv3d) {
@@ -134,7 +146,7 @@ void ED_object_rotation_from_view(bContext *C, float *rot)
 	}
 }
 
-void ED_object_base_init_transform(bContext *C, Base *base, float *loc, float *rot)
+void ED_object_base_init_transform(bContext *C, Base *base, const float loc[3], const float rot[3])
 {
 	Object *ob = base->object;
 	Scene *scene = CTX_data_scene(C);
@@ -152,8 +164,10 @@ void ED_object_base_init_transform(bContext *C, Base *base, float *loc, float *r
 
 /* uses context to figure out transform for primitive */
 /* returns standard diameter */
-float ED_object_new_primitive_matrix(bContext *C, Object *obedit, float *loc, float *rot, float primmat[][4])
+float ED_object_new_primitive_matrix(bContext *C, Object *obedit,
+                                     const float loc[3], const float rot[3], float primmat[][4])
 {
+	Scene *scene = CTX_data_scene(C);
 	View3D *v3d = CTX_wm_view3d(C);
 	float mat[3][3], rmat[3][3], cmat[3][3], imat[3][3];
 	
@@ -174,7 +188,9 @@ float ED_object_new_primitive_matrix(bContext *C, Object *obedit, float *loc, fl
 	invert_m3_m3(imat, mat);
 	mul_m3_v3(imat, primmat[3]);
 	
-	if (v3d) return v3d->grid;
+	if (v3d)
+		return ED_view3d_grid_scale(scene, v3d, NULL);
+
 	return 1.0f;
 }
 
@@ -249,8 +265,8 @@ int ED_object_add_generic_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(ev
 	return op->type->exec(C, op);
 }
 
-int ED_object_add_generic_get_opts(bContext *C, wmOperator *op, float *loc,
-                                   float *rot, int *enter_editmode, unsigned int *layer, int *is_view_aligned)
+int ED_object_add_generic_get_opts(bContext *C, wmOperator *op, float loc[3], float rot[3],
+                                   int *enter_editmode, unsigned int *layer, int *is_view_aligned)
 {
 	View3D *v3d = CTX_wm_view3d(C);
 	int a, layer_values[20];
@@ -313,7 +329,7 @@ int ED_object_add_generic_get_opts(bContext *C, wmOperator *op, float *loc,
 
 /* for object add primitive operators */
 /* do not call undo push in this function (users of this function have to) */
-Object *ED_object_add_type(bContext *C, int type, float *loc, float *rot,
+Object *ED_object_add_type(bContext *C, int type, const float loc[3], const float rot[3],
                            int enter_editmode, unsigned int layer)
 {
 	Main *bmain = CTX_data_main(C);
@@ -742,15 +758,7 @@ static int object_lamp_add_exec(bContext *C, wmOperator *op)
 }
 
 void OBJECT_OT_lamp_add(wmOperatorType *ot)
-{	
-	static EnumPropertyItem lamp_type_items[] = {
-		{LA_LOCAL, "POINT", ICON_LAMP_POINT, "Point", "Omnidirectional point light source"},
-		{LA_SUN, "SUN", ICON_LAMP_SUN, "Sun", "Constant direction parallel ray light source"},
-		{LA_SPOT, "SPOT", ICON_LAMP_SPOT, "Spot", "Directional cone light source"},
-		{LA_HEMI, "HEMI", ICON_LAMP_HEMI, "Hemi", "180 degree constant light source"},
-		{LA_AREA, "AREA", ICON_LAMP_AREA, "Area", "Directional area light source"},
-		{0, NULL, 0, NULL, NULL}};
-
+{
 	/* identifiers */
 	ot->name = "Add Lamp";
 	ot->description = "Add a lamp object to the scene";
diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c
index 7cc11fa0209..a38c69fba8a 100644
--- a/source/blender/editors/object/object_constraint.c
+++ b/source/blender/editors/object/object_constraint.c
@@ -418,15 +418,15 @@ static void test_constraints(Object *owner, bPoseChannel *pchan)
 						MovieTrackingObject *tracking_object;
 						
 						if (data->object[0])
-							tracking_object = BKE_tracking_named_object(tracking, data->object);
+							tracking_object = BKE_tracking_object_get_named(tracking, data->object);
 						else
-							tracking_object = BKE_tracking_get_camera_object(tracking);
+							tracking_object = BKE_tracking_object_get_camera(tracking);
 						
 						if (!tracking_object) {
 							curcon->flag |= CONSTRAINT_DISABLE;
 						}
 						else {
-							if (!BKE_tracking_named_track(tracking, tracking_object, data->track))
+							if (!BKE_tracking_track_get_named(tracking, tracking_object, data->track))
 								curcon->flag |= CONSTRAINT_DISABLE;
 						}
 					}
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 107b19b0ed7..5ad663b92d3 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -109,8 +109,7 @@ static void waitcursor(int UNUSED(val)) {}
 static int pupmenu(const char *UNUSED(msg)) {return 0;}
 
 /* port over here */
-static void error_libdata(void) {
-}
+static void error_libdata(void) {}
 
 Object *ED_object_context(bContext *C)
 {
@@ -181,7 +180,7 @@ static int object_hide_view_set_exec(bContext *C, wmOperator *op)
 	short changed = 0;
 	const int unselected = RNA_boolean_get(op->ptr, "unselected");
 	
-	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
+	CTX_DATA_BEGIN(C, Base *, base, visible_bases)
 	{
 		if (!unselected) {
 			if (base->flag & SELECT) {
@@ -198,6 +197,9 @@ static int object_hide_view_set_exec(bContext *C, wmOperator *op)
 			if (!(base->flag & SELECT)) {
 				base->object->restrictflag |= OB_RESTRICT_VIEW;
 				changed = 1;
+				if (base == BASACT) {
+					ED_base_object_activate(C, NULL);
+				}
 			}
 		}	
 	}
@@ -238,7 +240,7 @@ static int object_hide_render_clear_exec(bContext *C, wmOperator *UNUSED(op))
 	short changed = 0;
 
 	/* XXX need a context loop to handle such cases */
-	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
+	CTX_DATA_BEGIN(C, Object *, ob, selected_editable_objects)
 	{
 		if (ob->restrictflag & OB_RESTRICT_RENDER) {
 			ob->restrictflag &= ~OB_RESTRICT_RENDER;
@@ -273,7 +275,7 @@ static int object_hide_render_set_exec(bContext *C, wmOperator *op)
 {
 	const int unselected = RNA_boolean_get(op->ptr, "unselected");
 
-	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
+	CTX_DATA_BEGIN(C, Base *, base, visible_bases)
 	{
 		if (!unselected) {
 			if (base->flag & SELECT) {
@@ -1112,7 +1114,7 @@ void ED_objects_recalculate_paths(bContext *C, Scene *scene)
 	ListBase targets = {NULL, NULL};
 	
 	/* loop over objects in scene */
-	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
+	CTX_DATA_BEGIN(C, Object *, ob, selected_editable_objects)
 	{
 		/* set flag to force recalc, then grab path(s) from object */
 		ob->avs.recalc |= ANIMVIZ_RECALC_PATHS;
@@ -1155,7 +1157,7 @@ static int object_calculate_paths_exec(bContext *C, wmOperator *op)
 	int end = RNA_int_get(op->ptr, "end_frame");
 	
 	/* set up path data for bones being calculated */
-	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
+	CTX_DATA_BEGIN(C, Object *, ob, selected_editable_objects)
 	{
 		bAnimVizSettings *avs = &ob->avs;
 		
@@ -1194,9 +1196,9 @@ void OBJECT_OT_paths_calculate(wmOperatorType *ot)
 	
 	/* properties */
 	RNA_def_int(ot->srna, "start_frame", 1, MINAFRAME, MAXFRAME, "Start", 
-	            "First frame to calculate object paths on", MINFRAME, MAXFRAME/2.0);
+	            "First frame to calculate object paths on", MINFRAME, MAXFRAME / 2.0);
 	RNA_def_int(ot->srna, "end_frame", 250, MINAFRAME, MAXFRAME, "End", 
-	            "Last frame to calculate object paths on", MINFRAME, MAXFRAME/2.0);
+	            "Last frame to calculate object paths on", MINFRAME, MAXFRAME / 2.0);
 }
 
 /* --------- */
@@ -1229,7 +1231,7 @@ void OBJECT_OT_paths_update(wmOperatorType *ot)
 	ot->poll = ED_operator_object_active_editable; /* TODO: this should probably check for existing paths */
 	
 	/* flags */
-	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 
 /* --------- */
@@ -1238,7 +1240,7 @@ void OBJECT_OT_paths_update(wmOperatorType *ot)
 void ED_objects_clear_paths(bContext *C)
 {
 	/* loop over objects in scene */
-	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
+	CTX_DATA_BEGIN(C, Object *, ob, selected_editable_objects)
 	{
 		if (ob->mpath) {
 			animviz_free_motionpath(ob->mpath);
@@ -1286,7 +1288,7 @@ static int shade_smooth_exec(bContext *C, wmOperator *op)
 	int clear = (strcmp(op->idname, "OBJECT_OT_shade_flat") == 0);
 	int done = FALSE;
 
-	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
+	CTX_DATA_BEGIN(C, Object *, ob, selected_editable_objects)
 	{
 
 		if (ob->type == OB_MESH) {
@@ -1664,10 +1666,12 @@ static EnumPropertyItem game_properties_copy_operations[] = {
 	{COPY_PROPERTIES_REPLACE, "REPLACE", 0, "Replace Properties", ""},
 	{COPY_PROPERTIES_MERGE, "MERGE", 0, "Merge Properties", ""},
 	{COPY_PROPERTIES_COPY, "COPY", 0, "Copy a Property", ""},
-	{0, NULL, 0, NULL, NULL}};
+	{0, NULL, 0, NULL, NULL}
+};
 
-static EnumPropertyItem gameprops_items[]= {
-	{0, NULL, 0, NULL, NULL}};
+static EnumPropertyItem gameprops_items[] = {
+	{0, NULL, 0, NULL, NULL}
+};
 
 static EnumPropertyItem *gameprops_itemf(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), int *free)
 {	
@@ -1704,7 +1708,7 @@ static int game_property_copy_exec(bContext *C, wmOperator *op)
 		prop = BLI_findlink(&ob->prop, propid - 1);
 		
 		if (prop) {
-			CTX_DATA_BEGIN (C, Object *, ob_iter, selected_editable_objects)
+			CTX_DATA_BEGIN(C, Object *, ob_iter, selected_editable_objects)
 			{
 				if (ob != ob_iter)
 					set_ob_property(ob_iter, prop);
@@ -1713,7 +1717,7 @@ static int game_property_copy_exec(bContext *C, wmOperator *op)
 	}
 
 	else {
-		CTX_DATA_BEGIN (C, Object *, ob_iter, selected_editable_objects)
+		CTX_DATA_BEGIN(C, Object *, ob_iter, selected_editable_objects)
 		{
 			if (ob != ob_iter) {
 				if (type == COPY_PROPERTIES_REPLACE)
@@ -1754,7 +1758,7 @@ void OBJECT_OT_game_property_copy(wmOperatorType *ot)
 
 static int game_property_clear_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	CTX_DATA_BEGIN (C, Object *, ob_iter, selected_editable_objects)
+	CTX_DATA_BEGIN(C, Object *, ob_iter, selected_editable_objects)
 	{
 		free_properties(&ob_iter->prop);
 	}
@@ -1766,7 +1770,7 @@ static int game_property_clear_exec(bContext *C, wmOperator *UNUSED(op))
 void OBJECT_OT_game_property_clear(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name = "Clear Game Property";
+	ot->name = "Clear Game Properties";
 	ot->idname = "OBJECT_OT_game_property_clear";
 	ot->description = "Remove all game properties from all selected objects";
 
@@ -1784,7 +1788,7 @@ static int logicbricks_copy_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Object *ob = ED_object_active_context(C);
 
-	CTX_DATA_BEGIN (C, Object *, ob_iter, selected_editable_objects)
+	CTX_DATA_BEGIN(C, Object *, ob_iter, selected_editable_objects)
 	{
 		if (ob != ob_iter) {
 			/* first: free all logic */
@@ -1841,7 +1845,7 @@ static int game_physics_copy_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Object *ob = ED_object_active_context(C);
 	
-	CTX_DATA_BEGIN (C, Object *, ob_iter, selected_editable_objects)
+	CTX_DATA_BEGIN(C, Object *, ob_iter, selected_editable_objects)
 	{
 		if (ob != ob_iter) {
 			ob_iter->gameflag = ob->gameflag;
diff --git a/source/blender/editors/object/object_lattice.c b/source/blender/editors/object/object_lattice.c
index f6e8ccf4ec9..0a9944debe1 100644
--- a/source/blender/editors/object/object_lattice.c
+++ b/source/blender/editors/object/object_lattice.c
@@ -344,18 +344,17 @@ int mouse_lattice(bContext *C, const int mval[2], int extend, int deselect, int
 	bp = findnearestLattvert(&vc, mval, 1);
 
 	if (bp) {
-	    if (extend) {
-	        bp->f1 |= SELECT;
-	    }
-	    else if (deselect) {
-	        bp->f1 &= ~SELECT;
-	    }
+		if (extend) {
+			bp->f1 |= SELECT;
+		}
+		else if (deselect) {
+			bp->f1 &= ~SELECT;
+		}
 		else if (toggle) {
 			bp->f1 ^= SELECT;  /* swap */
 		}
-		else
-		{
-		    ED_setflagsLatt(vc.obedit, 0);
+		else {
+			ED_setflagsLatt(vc.obedit, 0);
 			bp->f1 |= SELECT;
 		}
 
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 79a9a29ae8f..d6b5fb9fc10 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -88,6 +88,7 @@
 #include "object_intern.h"
 
 static void modifier_skin_customdata_ensure(struct Object *ob);
+static void modifier_skin_customdata_delete(struct Object *ob);
 
 /******************************** API ****************************/
 
@@ -231,6 +232,21 @@ static int object_modifier_remove(Object *ob, ModifierData *md, int *sort_depsgr
 			multires_customdata_delete(ob->data);
 		}
 	}
+	else if (md->type == eModifierType_Skin) {
+		int ok = 1;
+		ModifierData *tmpmd;
+
+		/* ensure skin CustomData layer isn't used by another skin modifier */
+		for (tmpmd = ob->modifiers.first; tmpmd; tmpmd = tmpmd->next) {
+			if (tmpmd != md && tmpmd->type == eModifierType_Skin) {
+				ok = 0;
+				break;
+			}
+		}
+
+		if (ok)
+			modifier_skin_customdata_delete(ob);
+	}
 
 	if (ELEM(md->type, eModifierType_Softbody, eModifierType_Cloth) &&
 	    ob->particlesystem.first == NULL)
@@ -626,8 +642,10 @@ int ED_object_modifier_apply(ReportList *reports, Scene *scene, Object *ob, Modi
 	BLI_remlink(&ob->modifiers, md);
 	modifier_free(md);
 
-	/* ensure mesh paint mask layer remains after applying */
-	ED_sculpt_mask_layers_ensure(ob, NULL);
+	if (ob->type == OB_MESH) {
+		/* ensure mesh paint mask layer remains after applying */
+		ED_sculpt_mask_layers_ensure(ob, NULL);
+	}
 
 	return 1;
 }
@@ -1369,6 +1387,17 @@ static void modifier_skin_customdata_ensure(Object *ob)
 	}
 }
 
+static void modifier_skin_customdata_delete(Object *ob)
+{
+	Mesh *me = ob->data;
+	BMEditMesh *em = me->edit_btmesh;
+	
+	if (em)
+		BM_data_layer_free(em->bm, &em->bm->vdata, CD_MVERT_SKIN);
+	else
+		CustomData_free_layer_active(&me->vdata, CD_MVERT_SKIN, me->totvert);
+}
+
 static int skin_poll(bContext *C)
 {
 	return (!CTX_data_edit_object(C) &&
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index 0c50ab58487..addc6cd4277 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -298,7 +298,8 @@ void ED_keymap_object(wmKeyConfig *keyconf)
 	keymap->poll = object_mode_poll;
 	
 	/* object mode supports PET now */
-	ED_object_generic_keymap(keyconf, keymap, 1);
+	ED_keymap_proportional_cycle(keyconf, keymap);
+	ED_keymap_proportional_obmode(keyconf, keymap);
 
 	WM_keymap_add_item(keymap, "VIEW3D_OT_game_start", PKEY, KM_PRESS, 0, 0);
 
@@ -421,41 +422,49 @@ void ED_keymap_object(wmKeyConfig *keyconf)
 	/* menus */
 	WM_keymap_add_menu(keymap, "VIEW3D_MT_hook", HKEY, KM_PRESS, KM_CTRL, 0);
 
-	ED_object_generic_keymap(keyconf, keymap, 2);
+	ED_keymap_proportional_cycle(keyconf, keymap);
+	ED_keymap_proportional_editmode(keyconf, keymap, FALSE);
 }
 
-void ED_object_generic_keymap(struct wmKeyConfig *UNUSED(keyconf), struct wmKeyMap *keymap, int do_pet)
+void ED_keymap_proportional_cycle(struct wmKeyConfig *UNUSED(keyconf), struct wmKeyMap *keymap)
 {
 	wmKeyMapItem *kmi;
 
-	/* used by mesh, curve & lattice only */
-	if (do_pet) {
-		/* context ops */
-		kmi = WM_keymap_add_item(keymap, "WM_OT_context_cycle_enum", OKEY, KM_PRESS, KM_SHIFT, 0);
-		RNA_string_set(kmi->ptr, "data_path", "tool_settings.proportional_edit_falloff");
-
-		// Object mode
-		if (do_pet == TRUE) {
-
-			kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", OKEY, KM_PRESS, 0, 0);
-			RNA_string_set(kmi->ptr, "data_path", "tool_settings.use_proportional_edit_objects");
-
-		}
-		else { // Edit mode
-
-			kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", OKEY, KM_PRESS, 0, 0);
-			RNA_string_set(kmi->ptr, "data_path", "tool_settings.proportional_edit");
-			RNA_string_set(kmi->ptr, "value_1", "DISABLED");
-			RNA_string_set(kmi->ptr, "value_2", "ENABLED");
-
-			/* for modes/object types that allow 'connected' mode, add the Alt O key */
-			if (do_pet == 3) {
-				kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", OKEY, KM_PRESS, KM_ALT, 0);
-				RNA_string_set(kmi->ptr, "data_path", "tool_settings.proportional_edit");
-				RNA_string_set(kmi->ptr, "value_1", "DISABLED");
-				RNA_string_set(kmi->ptr, "value_2", "CONNECTED");
-			}
-		}
-	}
+	kmi = WM_keymap_add_item(keymap, "WM_OT_context_cycle_enum", OKEY, KM_PRESS, KM_SHIFT, 0);
+	RNA_string_set(kmi->ptr, "data_path", "tool_settings.proportional_edit_falloff");
+}
+
+void ED_keymap_proportional_obmode(struct wmKeyConfig *UNUSED(keyconf), struct wmKeyMap *keymap)
+{
+	wmKeyMapItem *kmi;
+
+	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", OKEY, KM_PRESS, 0, 0);
+	RNA_string_set(kmi->ptr, "data_path", "tool_settings.use_proportional_edit_objects");
+}
+
+void ED_keymap_proportional_maskmode(struct wmKeyConfig *UNUSED(keyconf), struct wmKeyMap *keymap)
+{
+	wmKeyMapItem *kmi;
+
+	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", OKEY, KM_PRESS, 0, 0);
+	RNA_string_set(kmi->ptr, "data_path", "tool_settings.use_proportional_edit_mask");
 }
 
+void ED_keymap_proportional_editmode(struct wmKeyConfig *UNUSED(keyconf), struct wmKeyMap *keymap,
+                                     const short do_connected)
+{
+	wmKeyMapItem *kmi;
+
+	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", OKEY, KM_PRESS, 0, 0);
+	RNA_string_set(kmi->ptr, "data_path", "tool_settings.proportional_edit");
+	RNA_string_set(kmi->ptr, "value_1", "DISABLED");
+	RNA_string_set(kmi->ptr, "value_2", "ENABLED");
+
+	/* for modes/object types that allow 'connected' mode, add the Alt O key */
+	if (do_connected) {
+		kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", OKEY, KM_PRESS, KM_ALT, 0);
+		RNA_string_set(kmi->ptr, "data_path", "tool_settings.proportional_edit");
+		RNA_string_set(kmi->ptr, "value_1", "DISABLED");
+		RNA_string_set(kmi->ptr, "value_2", "CONNECTED");
+	}
+}
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 2b622b21d2c..fc0aa39e733 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -424,27 +424,35 @@ EnumPropertyItem prop_clear_parent_types[] = {
 	{0, NULL, 0, NULL, NULL}
 };
 
-void ED_object_parent_clear(bContext *C, int type)
+void ED_object_parent_clear(Object *ob, int type)
+{
+
+	if (ob->parent == NULL)
+		return;
+		
+	if (type == 0) {
+		ob->parent = NULL;
+	}
+	else if (type == 1) {
+		ob->parent = NULL;
+		BKE_object_apply_mat4(ob, ob->obmat, TRUE, FALSE);
+	}
+	else if (type == 2)
+		unit_m4(ob->parentinv);
+		
+	ob->recalc |= OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME;
+}
+
+/* note, poll should check for editable scene */
+static int parent_clear_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
+	int type = RNA_enum_get(op->ptr, "type");
 
 	CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
 	{
-		if (ob->parent == NULL)
-			continue;
-		
-		if (type == 0) {
-			ob->parent = NULL;
-		}
-		else if (type == 1) {
-			ob->parent = NULL;
-			BKE_object_apply_mat4(ob, ob->obmat, TRUE, FALSE);
-		}
-		else if (type == 2)
-			unit_m4(ob->parentinv);
-		
-		ob->recalc |= OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME;
+		ED_object_parent_clear(ob, type);
 	}
 	CTX_DATA_END;
 
@@ -452,13 +460,6 @@ void ED_object_parent_clear(bContext *C, int type)
 	DAG_ids_flush_update(bmain, 0);
 	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 	WM_event_add_notifier(C, NC_OBJECT | ND_PARENT, NULL);
-}
-
-/* note, poll should check for editable scene */
-static int parent_clear_exec(bContext *C, wmOperator *op)
-{
-	ED_object_parent_clear(C, RNA_enum_get(op->ptr, "type"));
-
 	return OPERATOR_FINISHED;
 }
 
@@ -541,7 +542,7 @@ int ED_object_parent_set(ReportList *reports, Main *bmain, Scene *scene, Object
 			if (partype == PAR_FOLLOW) {
 				/* get or create F-Curve */
 				bAction *act = verify_adt_action(&cu->id, 1);
-				FCurve *fcu = verify_fcurve(act, NULL, "eval_time", 0, 1);
+				FCurve *fcu = verify_fcurve(act, NULL, NULL, "eval_time", 0, 1);
 				
 				/* setup dummy 'generator' modifier here to get 1-1 correspondence still working */
 				if (!fcu->bezt && !fcu->fpt && !fcu->modifiers.first)
@@ -1195,13 +1196,27 @@ static void link_to_scene(Main *UNUSED(bmain), unsigned short UNUSED(nr))
 }
 #endif
 
+Base *ED_object_scene_link(Scene *scene, Object *ob)
+{
+	Base *base;
+
+	if (BKE_scene_base_find(scene, ob)) {
+		return NULL;
+	}
+
+	base = BKE_scene_base_add(scene, ob);
+	id_us_plus(&ob->id);
+
+	return base;
+}
+
 static int make_links_scene_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene_to = BLI_findlink(&CTX_data_main(C)->scene, RNA_enum_get(op->ptr, "scene"));
 
 	if (scene_to == NULL) {
-		BKE_report(op->reports, RPT_ERROR, "Scene not found");
+		BKE_report(op->reports, RPT_ERROR, "Couldn't find scene");
 		return OPERATOR_CANCELLED;
 	}
 
@@ -1217,12 +1232,7 @@ static int make_links_scene_exec(bContext *C, wmOperator *op)
 
 	CTX_DATA_BEGIN (C, Base *, base, selected_bases)
 	{
-		if (!BKE_scene_base_find(scene_to, base->object)) {
-			Base *nbase = MEM_mallocN(sizeof(Base), "newbase");
-			*nbase = *base;
-			BLI_addhead(&(scene_to->base), nbase);
-			id_us_plus((ID *)base->object);
-		}
+		ED_object_scene_link(scene_to, base->object);
 	}
 	CTX_DATA_END;
 
@@ -1919,6 +1929,7 @@ static int drop_named_material_invoke(bContext *C, wmOperator *op, wmEvent *even
 	
 	DAG_ids_flush_update(bmain, 0);
 	WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, CTX_wm_view3d(C));
+	WM_event_add_notifier(C, NC_MATERIAL | ND_SHADING, ma);
 	
 	return OPERATOR_FINISHED;
 }
diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c
index fa86f089387..89f018a1b76 100644
--- a/source/blender/editors/object/object_select.c
+++ b/source/blender/editors/object/object_select.c
@@ -708,10 +708,11 @@ void OBJECT_OT_select_grouped(wmOperatorType *ot)
 static int object_select_by_layer_exec(bContext *C, wmOperator *op)
 {
 	unsigned int layernum;
-	short extend;
+	short extend, match;
 	
 	extend = RNA_boolean_get(op->ptr, "extend");
 	layernum = RNA_int_get(op->ptr, "layers");
+	match = RNA_enum_get(op->ptr, "match");
 	
 	if (extend == 0) {
 		CTX_DATA_BEGIN (C, Base *, base, visible_bases)
@@ -723,7 +724,14 @@ static int object_select_by_layer_exec(bContext *C, wmOperator *op)
 		
 	CTX_DATA_BEGIN (C, Base *, base, visible_bases)
 	{
-		if (base->lay == (1 << (layernum - 1)))
+		int ok = 0;
+
+		if (match == 1) /* exact */
+			ok = (base->lay == (1 << (layernum - 1)));
+		else /* shared layers */
+			ok = (base->lay & (1 << (layernum - 1)));
+
+		if (ok)
 			ED_base_object_select(base, BA_SELECT);
 	}
 	CTX_DATA_END;
@@ -736,6 +744,12 @@ static int object_select_by_layer_exec(bContext *C, wmOperator *op)
 
 void OBJECT_OT_select_by_layer(wmOperatorType *ot)
 {
+	static EnumPropertyItem match_items[] = {
+		{1, "EXACT", 0, "Exact Match", ""},
+		{2, "SHARED", 0, "Shared Layers", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+
 	/* identifiers */
 	ot->name = "Select by Layer";
 	ot->description = "Select all visible objects on a layer";
@@ -750,6 +764,7 @@ void OBJECT_OT_select_by_layer(wmOperatorType *ot)
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 	
 	/* properties */
+	RNA_def_enum(ot->srna, "match", match_items, 0, "Match", "");
 	RNA_def_boolean(ot->srna, "extend", FALSE, "Extend", "Extend selection instead of deselecting everything first");
 	RNA_def_int(ot->srna, "layers", 1, 1, 20, "Layer", "", 1, 20);
 }
diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c
index 19864ed58cf..40b653a62fd 100644
--- a/source/blender/editors/object/object_shapekey.c
+++ b/source/blender/editors/object/object_shapekey.c
@@ -455,7 +455,7 @@ static int shape_key_move_exec(bContext *C, wmOperator *op)
 			ob->shapenr++;
 		}
 
-		SWAP(float, kb_other->pos, kb->pos) /* for absolute shape keys */
+		SWAP(float, kb_other->pos, kb->pos); /* for absolute shape keys */
 	}
 
 	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index 5a2a9a06e39..f56f9f657bc 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -2085,7 +2085,6 @@ static void vgroup_active_remove_verts(Object *ob, const int allverts, bDeformGr
 		}
 		else {
 			MVert *mv;
-			MDeformVert *dv;
 			int i;
 
 			if (!me->dvert) {
diff --git a/source/blender/editors/physics/physics_ops.c b/source/blender/editors/physics/physics_ops.c
index 272e13e2a62..89ddfe02208 100644
--- a/source/blender/editors/physics/physics_ops.c
+++ b/source/blender/editors/physics/physics_ops.c
@@ -136,7 +136,8 @@ static void keymap_particle(wmKeyConfig *keyconf)
 	
 	WM_keymap_add_item(keymap, "PARTICLE_OT_weight_set", KKEY, KM_PRESS, KM_SHIFT, 0);
 
-	ED_object_generic_keymap(keyconf, keymap, 2);
+	ED_keymap_proportional_cycle(keyconf, keymap);
+	ED_keymap_proportional_editmode(keyconf, keymap, FALSE);
 }
 
 /******************************* boids *************************************/
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index b7bd027ba7f..8fa3c6f992f 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -288,11 +288,12 @@ static void make_renderinfo_string(RenderStats *rs, Scene *scene, char *str)
 	else if (scene->r.scemode & R_SINGLE_LAYER)
 		spos += sprintf(spos, "Single Layer | ");
 
+	spos += sprintf(spos, "Frame:%d ", (scene->r.cfra));
+
 	if (rs->statstr) {
-		spos += sprintf(spos, "%s ", rs->statstr);
+		spos += sprintf(spos, "| %s ", rs->statstr);
 	}
 	else {
-		spos += sprintf(spos, "Fra:%d  ", (scene->r.cfra));
 		if (rs->totvert) spos += sprintf(spos, "Ve:%d ", rs->totvert);
 		if (rs->totface) spos += sprintf(spos, "Fa:%d ", rs->totface);
 		if (rs->tothalo) spos += sprintf(spos, "Ha:%d ", rs->tothalo);
@@ -407,8 +408,12 @@ static void render_endjob(void *rjv)
 		free_main(rj->main);
 
 	/* else the frame will not update for the original value */
-	if (!(rj->scene->r.scemode & R_NO_FRAME_UPDATE))
-		ED_update_for_newframe(G.main, rj->scene, 1);
+	if (!(rj->scene->r.scemode & R_NO_FRAME_UPDATE)) {
+		/* possible this fails of loading new file while rendering */
+		if (G.main->wm.first) {
+			ED_update_for_newframe(G.main, rj->scene, 1);
+		}
+	}
 	
 	/* XXX above function sets all tags in nodes */
 	ntreeCompositClearTags(rj->scene->nodetree);
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 5faa2deb266..4e98d2ae967 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -46,6 +46,7 @@
 #include "DNA_scene_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_mask_types.h"
 #include "DNA_userdef_types.h"
 
 #include "BKE_context.h"
@@ -59,6 +60,7 @@
 #include "BKE_screen.h"
 #include "BKE_tessmesh.h"
 #include "BKE_sound.h"
+#include "BKE_mask.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -71,6 +73,7 @@
 #include "ED_screen_types.h"
 #include "ED_keyframes_draw.h"
 #include "ED_view3d.h"
+#include "ED_clip.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
@@ -304,13 +307,15 @@ int ED_operator_object_active_editable(bContext *C)
 int ED_operator_object_active_editable_mesh(bContext *C)
 {
 	Object *ob = ED_object_active_context(C);
-	return ((ob != NULL) && !(ob->id.lib) && !(ob->restrictflag & OB_RESTRICT_VIEW) && ob->type == OB_MESH && !(((ID *)ob->data)->lib));
+	return ((ob != NULL) && !(ob->id.lib) && !(ob->restrictflag & OB_RESTRICT_VIEW) &&
+	        (ob->type == OB_MESH) && !(((ID *)ob->data)->lib));
 }
 
 int ED_operator_object_active_editable_font(bContext *C)
 {
 	Object *ob = ED_object_active_context(C);
-	return ((ob != NULL) && !(ob->id.lib) && !(ob->restrictflag & OB_RESTRICT_VIEW) && ob->type == OB_FONT);
+	return ((ob != NULL) && !(ob->id.lib) && !(ob->restrictflag & OB_RESTRICT_VIEW) &&
+	        (ob->type == OB_FONT));
 }
 
 int ED_operator_editmesh(bContext *C)
@@ -451,6 +456,13 @@ int ED_operator_editmball(bContext *C)
 	return 0;
 }
 
+int ED_operator_mask(bContext *C)
+{
+	SpaceClip *sc= CTX_wm_space_clip(C);
+
+	return ED_space_clip_show_maskedit(sc);
+}
+
 /* *************************** action zone operator ************************** */
 
 /* operator state vars used:  
@@ -1601,10 +1613,16 @@ static int area_max_regionsize(ScrArea *sa, ARegion *scalear, AZEdge edge)
 		
 		/* case of regions in regions, like operator properties panel */
 		/* these can sit on top of other regions such as headers, so account for this */
-		else if (edge == AE_BOTTOM_TO_TOPLEFT && scalear->alignment & RGN_ALIGN_TOP && ar->alignment == RGN_ALIGN_TOP && ar->regiontype == RGN_TYPE_HEADER)
+		else if (edge == AE_BOTTOM_TO_TOPLEFT && scalear->alignment & RGN_ALIGN_TOP &&
+		         ar->alignment == RGN_ALIGN_TOP && ar->regiontype == RGN_TYPE_HEADER)
+		{
 			dist -= ar->winy;
-		else if (edge == AE_TOP_TO_BOTTOMRIGHT && scalear->alignment & RGN_ALIGN_BOTTOM && ar->alignment == RGN_ALIGN_BOTTOM && ar->regiontype == RGN_TYPE_HEADER)
+		}
+		else if (edge == AE_TOP_TO_BOTTOMRIGHT && scalear->alignment & RGN_ALIGN_BOTTOM &&
+		         ar->alignment == RGN_ALIGN_BOTTOM && ar->regiontype == RGN_TYPE_HEADER)
+		{
 			dist -= ar->winy;
+		}
 	}
 
 	return dist;
@@ -1929,7 +1947,17 @@ static int keyframe_jump_exec(bContext *C, wmOperator *op)
 
 	if (ob)
 		ob_to_keylist(&ads, ob, &keys, NULL);
-	
+
+	{
+		SpaceClip *sc = CTX_wm_space_clip(C);
+		if (sc) {
+			if ((sc->mode == SC_MODE_MASKEDIT) && sc->mask) {
+				MaskLayer *masklay = BKE_mask_layer_active(sc->mask);
+				mask_to_keylist(&ads, masklay, &keys);
+			}
+		}
+	}
+
 	/* build linked-list for searching */
 	BLI_dlrbTree_linkedlist_sync(&keys);
 	
@@ -1951,20 +1979,24 @@ static int keyframe_jump_exec(bContext *C, wmOperator *op)
 				cfra = ak->cfra;
 			}
 		}
-	} while ((ak != NULL) && (done == 0));
-	
-	/* any success? */
-	if (done == 0)
-		BKE_report(op->reports, RPT_INFO, "No more keyframes to jump to in this direction");
-	
+	} while ((ak != NULL) && (done == FALSE));
+
 	/* free temp stuff */
 	BLI_dlrbTree_free(&keys);
-	
-	sound_seek_scene(bmain, scene);
 
-	WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene);
-	
-	return OPERATOR_FINISHED;
+	/* any success? */
+	if (done == FALSE) {
+		BKE_report(op->reports, RPT_INFO, "No more keyframes to jump to in this direction");
+
+		return OPERATOR_CANCELLED;
+	}
+	else {
+		sound_seek_scene(bmain, scene);
+
+		WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene);
+
+		return OPERATOR_FINISHED;
+	}
 }
 
 static void SCREEN_OT_keyframe_jump(wmOperatorType *ot)
@@ -2571,6 +2603,15 @@ static void SCREEN_OT_redo_last(wmOperatorType *ot)
 
 /* ************** region four-split operator ***************************** */
 
+static void view3d_localview_update_rv3d(struct RegionView3D *rv3d)
+{
+	if (rv3d->localvd) {
+		rv3d->localvd->view = rv3d->view;
+		rv3d->localvd->persp = rv3d->persp;
+		copy_qt_qt(rv3d->localvd->viewquat, rv3d->viewquat);
+	}
+}
+
 /* insert a region in the area region list */
 static int region_quadview_exec(bContext *C, wmOperator *op)
 {
@@ -2627,29 +2668,29 @@ static int region_quadview_exec(bContext *C, wmOperator *op)
 			 * We could avoid manipulating rv3d->localvd here if exiting
 			 * localview with a 4-split would assign these view locks */
 			RegionView3D *rv3d;
-			
+
 			rv3d = ar->regiondata;
 			rv3d->viewlock = RV3D_LOCKED; rv3d->view = RV3D_VIEW_FRONT; rv3d->persp = RV3D_ORTHO;
 			ED_view3d_lock(rv3d);
-			if (rv3d->localvd) { rv3d->localvd->view = rv3d->view; rv3d->localvd->persp = rv3d->persp; copy_qt_qt(rv3d->localvd->viewquat, rv3d->viewquat); }
+			view3d_localview_update_rv3d(rv3d);
 			
 			ar = ar->next;
 			rv3d = ar->regiondata;
 			rv3d->viewlock = RV3D_LOCKED; rv3d->view = RV3D_VIEW_TOP; rv3d->persp = RV3D_ORTHO;
 			ED_view3d_lock(rv3d);
-			if (rv3d->localvd) { rv3d->localvd->view = rv3d->view; rv3d->localvd->persp = rv3d->persp; copy_qt_qt(rv3d->localvd->viewquat, rv3d->viewquat); }
+			view3d_localview_update_rv3d(rv3d);
 			
 			ar = ar->next;
 			rv3d = ar->regiondata;
 			rv3d->viewlock = RV3D_LOCKED; rv3d->view = RV3D_VIEW_RIGHT; rv3d->persp = RV3D_ORTHO;
 			ED_view3d_lock(rv3d);
-			if (rv3d->localvd) { rv3d->localvd->view = rv3d->view; rv3d->localvd->persp = rv3d->persp; copy_qt_qt(rv3d->localvd->viewquat, rv3d->viewquat); }
+			view3d_localview_update_rv3d(rv3d);
 			
 			ar = ar->next;
 			rv3d = ar->regiondata;
 			rv3d->view = RV3D_VIEW_CAMERA; rv3d->persp = RV3D_CAMOB;
 			ED_view3d_lock(rv3d);
-			if (rv3d->localvd) {rv3d->localvd->view = rv3d->view; rv3d->localvd->persp = rv3d->persp; copy_qt_qt(rv3d->localvd->viewquat, rv3d->viewquat); }
+			view3d_localview_update_rv3d(rv3d);
 		}
 		ED_area_tag_redraw(sa);
 		WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL);
diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c
index b5d44676cf6..5ca436b07b2 100644
--- a/source/blender/editors/sculpt_paint/paint_cursor.c
+++ b/source/blender/editors/sculpt_paint/paint_cursor.c
@@ -333,7 +333,7 @@ static int sculpt_get_brush_geometry(bContext *C, ViewContext *vc,
                                      float location[3])
 {
 	Scene *scene = CTX_data_scene(C);
-	Paint *paint = paint_get_active(scene);
+	Paint *paint = paint_get_active_from_context(C);
 	Brush *brush = paint_brush(paint);
 	float window[2];
 	int hit;
@@ -503,7 +503,7 @@ static void paint_cursor_on_hit(Sculpt *sd, Brush *brush, ViewContext *vc,
 static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused))
 {
 	Scene *scene = CTX_data_scene(C);
-	Paint *paint = paint_get_active(scene);
+	Paint *paint = paint_get_active_from_context(C);
 	Brush *brush = paint_brush(paint);
 	ViewContext vc;
 	float final_radius;
@@ -605,7 +605,7 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused))
 
 void paint_cursor_start(bContext *C, int (*poll)(bContext *C))
 {
-	Paint *p = paint_get_active(CTX_data_scene(C));
+	Paint *p = paint_get_active_from_context(C);
 
 	if (p && !p->paint_cursor)
 		p->paint_cursor = WM_paint_cursor_activate(CTX_wm_manager(C), poll, paint_draw_cursor, NULL);
diff --git a/source/blender/editors/sculpt_paint/paint_hide.c b/source/blender/editors/sculpt_paint/paint_hide.c
index cd8b9164862..89c328e71d8 100644
--- a/source/blender/editors/sculpt_paint/paint_hide.c
+++ b/source/blender/editors/sculpt_paint/paint_hide.c
@@ -265,7 +265,7 @@ static void get_pbvh_nodes(PBVH *pbvh,
                            float clip_planes[4][4],
                            PartialVisArea mode)
 {
-	BLI_pbvh_SearchCallback cb;
+	BLI_pbvh_SearchCallback cb = NULL;
 
 	/* select search callback */
 	switch (mode) {
@@ -277,7 +277,6 @@ static void get_pbvh_nodes(PBVH *pbvh,
 			break;
 		case PARTIALVIS_ALL:
 		case PARTIALVIS_MASKED:
-			cb = NULL;
 			break;
 	}
 	
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index 88fb728f334..4dee83dbb82 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -2242,11 +2242,11 @@ static void project_bucket_clip_face(
  *         
  *         i = l
  *         while i < len(me.verts):
- *             ii = i+1
- *             if ii==len(me.verts):
+ *             ii = i + 1
+ *             if ii == len(me.verts):
  *                 ii = l
  *             me.edges.extend([i, ii])
- *             i+=1
+ *             i += 1
  * 
  * if __name__ == '__main__':
  *     main()
@@ -5215,7 +5215,7 @@ static void brush_drawcursor(bContext *C, int x, int y, void *UNUSED(customdata)
 
 	Scene *scene = CTX_data_scene(C);
 	//Brush *brush= image_paint_brush(C);
-	Paint *paint = paint_get_active(scene);
+	Paint *paint = paint_get_active_from_context(C);
 	Brush *brush = paint_brush(paint);
 
 	if (paint && brush && paint->flags & PAINT_SHOW_BRUSH) {
@@ -5420,13 +5420,12 @@ void PAINT_OT_grab_clone(wmOperatorType *ot)
 
 static int sample_color_exec(bContext *C, wmOperator *op)
 {
-	Scene *scene = CTX_data_scene(C);
 	Brush *brush = image_paint_brush(C);
 	ARegion *ar = CTX_wm_region(C);
 	int location[2];
 
 	RNA_int_get_array(op->ptr, "location", location);
-	paint_sample_color(scene, ar, location[0], location[1]);
+	paint_sample_color(C, ar, location[0], location[1]);
 
 	WM_event_add_notifier(C, NC_BRUSH | NA_EDITED, brush);
 	
diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h
index de149bf2806..794e7755636 100644
--- a/source/blender/editors/sculpt_paint/paint_intern.h
+++ b/source/blender/editors/sculpt_paint/paint_intern.h
@@ -137,7 +137,7 @@ float paint_get_tex_pixel(struct Brush *br, float u, float v);
 int imapaint_pick_face(struct ViewContext *vc, const int mval[2], unsigned int *index, unsigned int totface);
 void imapaint_pick_uv(struct Scene *scene, struct Object *ob, unsigned int faceindex, const int xy[2], float uv[2]);
 
-void paint_sample_color(struct Scene *scene, struct ARegion *ar, int x, int y);
+void paint_sample_color(const struct bContext *C, struct ARegion *ar, int x, int y);
 void BRUSH_OT_curve_preset(struct wmOperatorType *ot);
 
 void PAINT_OT_face_select_linked(struct wmOperatorType *ot);
diff --git a/source/blender/editors/sculpt_paint/paint_mask.c b/source/blender/editors/sculpt_paint/paint_mask.c
index 298ecf764d6..e309bdb99cb 100644
--- a/source/blender/editors/sculpt_paint/paint_mask.c
+++ b/source/blender/editors/sculpt_paint/paint_mask.c
@@ -61,16 +61,16 @@
 #include <stdlib.h>
 
 static void mask_flood_fill_set_elem(float *elem,
-									 PaintMaskFloodMode mode,
-									 float value)
+                                     PaintMaskFloodMode mode,
+                                     float value)
 {
 	switch (mode) {
-	case PAINT_MASK_FLOOD_VALUE:
-		(*elem) = value;
-		break;
-	case PAINT_MASK_INVERT:
-		(*elem) = 1.0f - (*elem);
-		break;
+		case PAINT_MASK_FLOOD_VALUE:
+			(*elem) = value;
+			break;
+		case PAINT_MASK_INVERT:
+			(*elem) = 1.0f - (*elem);
+			break;
 	}
 }
 
diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c
index 23d1c0090a0..7df6a893b5c 100644
--- a/source/blender/editors/sculpt_paint/paint_ops.c
+++ b/source/blender/editors/sculpt_paint/paint_ops.c
@@ -60,7 +60,7 @@
 static int brush_add_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	/*int type = RNA_enum_get(op->ptr, "type");*/
-	Paint *paint = paint_get_active(CTX_data_scene(C));
+	Paint *paint = paint_get_active_from_context(C);
 	struct Brush *br = paint_brush(paint);
 
 	if (br)
@@ -68,7 +68,7 @@ static int brush_add_exec(bContext *C, wmOperator *UNUSED(op))
 	else
 		br = BKE_brush_add("Brush");
 
-	paint_brush_set(paint_get_active(CTX_data_scene(C)), br);
+	paint_brush_set(paint, br);
 
 	return OPERATOR_FINISHED;
 }
@@ -91,7 +91,7 @@ static void BRUSH_OT_add(wmOperatorType *ot)
 static int brush_scale_size_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
-	Paint  *paint =  paint_get_active(scene);
+	Paint  *paint =  paint_get_active_from_context(C);
 	struct Brush  *brush =  paint_brush(paint);
 	// Object *ob=     CTX_data_active_object(C);
 	float scalar = RNA_float_get(op->ptr, "scalar");
@@ -173,7 +173,7 @@ static void PAINT_OT_vertex_color_set(wmOperatorType *ot)
 
 static int brush_reset_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	Paint *paint = paint_get_active(CTX_data_scene(C));
+	Paint *paint = paint_get_active_from_context(C);
 	struct Brush *brush = paint_brush(paint);
 	Object *ob = CTX_data_active_object(C);
 
diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c
index 987ab932fd6..b53edeadb51 100644
--- a/source/blender/editors/sculpt_paint/paint_stroke.c
+++ b/source/blender/editors/sculpt_paint/paint_stroke.c
@@ -100,10 +100,11 @@ typedef struct PaintStroke {
 /*** Cursor ***/
 static void paint_draw_smooth_stroke(bContext *C, int x, int y, void *customdata) 
 {
-	Brush *brush = paint_brush(paint_get_active(CTX_data_scene(C)));
+	Paint *paint = paint_get_active_from_context(C);
+	Brush *brush = paint_brush(paint);
 	PaintStroke *stroke = customdata;
 
-	glColor4ubv(paint_get_active(CTX_data_scene(C))->paint_cursor_col);
+	glColor4ubv(paint->paint_cursor_col);
 	glEnable(GL_LINE_SMOOTH);
 	glEnable(GL_BLEND);
 
@@ -141,7 +142,7 @@ static float event_tablet_data(wmEvent *event, int *pen_flip)
 static void paint_brush_stroke_add_step(bContext *C, wmOperator *op, wmEvent *event, float mouse_in[2])
 {
 	Scene *scene = CTX_data_scene(C);
-	Paint *paint = paint_get_active(scene);
+	Paint *paint = paint_get_active_from_context(C);
 	Brush *brush = paint_brush(paint);
 	PaintStroke *stroke = op->customdata;
 	float mouse[3];
@@ -202,10 +203,10 @@ static int paint_smooth_stroke(PaintStroke *stroke, float output[2],
 
 	if ((stroke->brush->flag & BRUSH_SMOOTH_STROKE) &&  
 	    !ELEM4(stroke->brush->sculpt_tool,
-			   SCULPT_TOOL_GRAB,
-			   SCULPT_TOOL_THUMB,
-			   SCULPT_TOOL_ROTATE,
-			   SCULPT_TOOL_SNAKE_HOOK) &&
+	           SCULPT_TOOL_GRAB,
+	           SCULPT_TOOL_THUMB,
+	           SCULPT_TOOL_ROTATE,
+	           SCULPT_TOOL_SNAKE_HOOK) &&
 	    !(stroke->brush->flag & BRUSH_ANCHORED) &&
 	    !(stroke->brush->flag & BRUSH_RESTORE_MESH))
 	{
@@ -281,7 +282,7 @@ PaintStroke *paint_stroke_new(bContext *C,
 {
 	PaintStroke *stroke = MEM_callocN(sizeof(PaintStroke), "PaintStroke");
 
-	stroke->brush = paint_brush(paint_get_active(CTX_data_scene(C)));
+	stroke->brush = paint_brush(paint_get_active_from_context(C));
 	view3d_set_viewcontext(C, &stroke->vc);
 	view3d_get_transformation(stroke->vc.ar, stroke->vc.rv3d, stroke->vc.obact, &stroke->mats);
 
@@ -358,12 +359,12 @@ struct wmKeyMap *paint_stroke_modal_keymap(struct wmKeyConfig *keyconf)
 }
 
 static void paint_stroke_add_sample(const Paint *paint,
-									PaintStroke *stroke,
-									float x, float y)
+                                    PaintStroke *stroke,
+                                    float x, float y)
 {
 	PaintSample *sample = &stroke->samples[stroke->cur_sample];
 	int max_samples = MIN2(PAINT_MAX_INPUT_SAMPLES,
-						   MAX2(paint->num_input_samples, 1));
+	                       MAX2(paint->num_input_samples, 1));
 
 	sample->mouse[0] = x;
 	sample->mouse[1] = y;
@@ -376,7 +377,7 @@ static void paint_stroke_add_sample(const Paint *paint,
 }
 
 static void paint_stroke_sample_average(const PaintStroke *stroke,
-										PaintSample *average)
+                                        PaintSample *average)
 {
 	int i;
 	
@@ -394,7 +395,7 @@ static void paint_stroke_sample_average(const PaintStroke *stroke,
 
 int paint_stroke_modal(bContext *C, wmOperator *op, wmEvent *event)
 {
-	Paint *p = paint_get_active(CTX_data_scene(C));
+	Paint *p = paint_get_active_from_context(C);
 	PaintStroke *stroke = op->customdata;
 	PaintSample sample_average;
 	float mouse[2];
@@ -518,7 +519,7 @@ void paint_stroke_set_mode_data(PaintStroke *stroke, void *mode_data)
 
 int paint_poll(bContext *C)
 {
-	Paint *p = paint_get_active(CTX_data_scene(C));
+	Paint *p = paint_get_active_from_context(C);
 	Object *ob = CTX_data_active_object(C);
 
 	return p && ob && paint_brush(p) &&
diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c
index 4c374674c9a..082e40f8e4c 100644
--- a/source/blender/editors/sculpt_paint/paint_utils.c
+++ b/source/blender/editors/sculpt_paint/paint_utils.c
@@ -333,9 +333,9 @@ int imapaint_pick_face(ViewContext *vc, const int mval[2], unsigned int *index,
 }
 
 /* used for both 3d view and image window */
-void paint_sample_color(Scene *scene, ARegion *ar, int x, int y)    /* frontbuf */
+void paint_sample_color(const bContext *C, ARegion *ar, int x, int y)    /* frontbuf */
 {
-	Brush *br = paint_brush(paint_get_active(scene));
+	Brush *br = paint_brush(paint_get_active_from_context(C));
 	unsigned int col;
 	char *cp;
 
@@ -357,7 +357,7 @@ void paint_sample_color(Scene *scene, ARegion *ar, int x, int y)    /* frontbuf
 
 static int brush_curve_preset_exec(bContext *C, wmOperator *op)
 {
-	Brush *br = paint_brush(paint_get_active(CTX_data_scene(C)));
+	Brush *br = paint_brush(paint_get_active_from_context(C));
 	BKE_brush_curve_preset(br, RNA_enum_get(op->ptr, "shape"));
 
 	return OPERATOR_FINISHED;
@@ -365,7 +365,7 @@ static int brush_curve_preset_exec(bContext *C, wmOperator *op)
 
 static int brush_curve_preset_poll(bContext *C)
 {
-	Brush *br = paint_brush(paint_get_active(CTX_data_scene(C)));
+	Brush *br = paint_brush(paint_get_active_from_context(C));
 
 	return br && br->curve;
 }
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index c5c08a94ae5..3c37ad8cf2a 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -1877,7 +1877,8 @@ static void do_weight_paint_vertex(
 		/* use locks and/or multipaint */
 		float oldw;
 		float neww;
-		float testw = 0;
+		/* float testw = 0; */ /* UNUSED */
+		float observedChange = 0;
 		float change = 0;
 		float oldChange = 0;
 		int i;
@@ -1889,13 +1890,14 @@ static void do_weight_paint_vertex(
 		                    wpi->brush_alpha_value, wpi->do_flip, do_multipaint_totsel);
 		
 		/* setup multi-paint */
-		if (do_multipaint_totsel) {
+		observedChange = neww - oldw;
+		if (do_multipaint_totsel && observedChange) {
 			dv_copy.dw = MEM_dupallocN(dv->dw);
 			dv_copy.flag = dv->flag;
 			dv_copy.totweight = dv->totweight;
 			tdw = dw;
 			tdw_prev = dw_prev;
-			change = get_mp_change(&wp->wpaint_prev[index], wpi->defbase_tot, wpi->defbase_sel, neww - oldw);
+			change = get_mp_change(&wp->wpaint_prev[index], wpi->defbase_tot, wpi->defbase_sel, observedChange);
 			if (change) {
 				if (!tdw->weight) {
 					i = get_first_selected_nonzero_weight(dv, wpi->defbase_tot, wpi->defbase_sel);
@@ -1910,8 +1912,8 @@ static void do_weight_paint_vertex(
 				if (change && tdw_prev->weight && tdw_prev->weight * change) {
 					if (tdw->weight != tdw_prev->weight) {
 						oldChange = tdw->weight / tdw_prev->weight;
-						testw = tdw_prev->weight * change;
-						if (testw > tdw_prev->weight) {
+						/* testw = tdw_prev->weight * change; */ /* UNUSED */
+						if (observedChange > 0) {
 							if (change > oldChange) {
 								/* reset the weights and use the new change */
 								defvert_reset_to_prev(wp->wpaint_prev + index, dv);
@@ -2100,8 +2102,7 @@ static char *wpaint_make_validmap(Object *ob)
 					if (chan->bone->flag & BONE_NO_DEFORM)
 						continue;
 
-					if (BLI_ghash_haskey(gh, chan->name)) {
-						BLI_ghash_remove(gh, chan->name, NULL, NULL);
+					if (BLI_ghash_remove(gh, chan->name, NULL, NULL)) {
 						BLI_ghash_insert(gh, chan->name, SET_INT_IN_POINTER(1));
 					}
 				}
@@ -2460,6 +2461,8 @@ static void wpaint_stroke_done(const bContext *C, struct PaintStroke *stroke)
 	}
 	
 	DAG_id_tag_update(ob->data, 0);
+
+	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 }
 
 
@@ -2621,10 +2624,10 @@ void PAINT_OT_vertex_paint_toggle(wmOperatorType *ot)
  * - revise whether op->customdata should be added in object, in set_vpaint
  */
 
-typedef struct polyfacemap_e {
-	struct polyfacemap_e *next, *prev;
+typedef struct PolyFaceMap {
+	struct PolyFaceMap *next, *prev;
 	int facenr;
-} polyfacemap_e;
+} PolyFaceMap;
 
 typedef struct VPaintData {
 	ViewContext vc;
@@ -2645,7 +2648,7 @@ typedef struct VPaintData {
 static void vpaint_build_poly_facemap(struct VPaintData *vd, Mesh *me)
 {
 	MFace *mf;
-	polyfacemap_e *e;
+	PolyFaceMap *e;
 	int *origIndex;
 	int i;
 
@@ -2664,7 +2667,7 @@ static void vpaint_build_poly_facemap(struct VPaintData *vd, Mesh *me)
 		if (*origIndex == ORIGINDEX_NONE)
 			continue;
 
-		e = BLI_memarena_alloc(vd->polyfacemap_arena, sizeof(polyfacemap_e));
+		e = BLI_memarena_alloc(vd->polyfacemap_arena, sizeof(PolyFaceMap));
 		e->facenr = i;
 		
 		BLI_addtail(&vd->polyfacemap[*origIndex], e);
@@ -2781,7 +2784,7 @@ static void vpaint_paint_poly(VPaint *vp, VPaintData *vpd, Object *ob,
 	MCol *mc;
 	MLoop *ml;
 	MLoopCol *mlc;
-	polyfacemap_e *e;
+	PolyFaceMap *e;
 	unsigned int *lcol = ((unsigned int *)me->mloopcol) + mpoly->loopstart;
 	unsigned int *lcolorig = ((unsigned int *)vp->vpaint_prev) + mpoly->loopstart;
 	float alpha;
@@ -2953,6 +2956,8 @@ static void vpaint_stroke_done(const bContext *C, struct PaintStroke *stroke)
 {
 	ToolSettings *ts = CTX_data_tool_settings(C);
 	struct VPaintData *vpd = paint_stroke_mode_data(stroke);
+	ViewContext *vc = &vpd->vc;
+	Object *ob = vc->obact;
 	
 	if (vpd->vertexcosnos)
 		MEM_freeN(vpd->vertexcosnos);
@@ -2965,6 +2970,8 @@ static void vpaint_stroke_done(const bContext *C, struct PaintStroke *stroke)
 		BLI_memarena_free(vpd->polyfacemap_arena);
 	}
 
+	WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
+
 	MEM_freeN(vpd);
 }
 
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 7b8337ff957..89dbe14f62a 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -212,6 +212,11 @@ typedef struct StrokeCache {
 	float clip_tolerance[3];
 	float initial_mouse[2];
 
+	/* Pre-allocated temporary storage used during smoothing */
+	int num_threads;
+	float (**tmpgrid_co)[3], (**tmprow_co)[3];
+	float **tmpgrid_mask, **tmprow_mask;
+
 	/* Variants */
 	float radius;
 	float radius_squared;
@@ -753,8 +758,8 @@ static float tex_strength(SculptSession *ss, Brush *br, float point[3],
 	else if (ss->texcache) {
 		float rotation = -mtex->rot;
 		float symm_point[3], point_2d[2];
-		float x, y;
-		float radius;
+		float x = 0.0f, y = 0.0f; /* Quite warnings */
+		float radius = 1.0f; /* Quite warnings */
 
 		/* if the active area is being applied for symmetry, flip it
 		 * across the symmetry axis and rotate it back to the original
@@ -919,7 +924,7 @@ static void calc_area_normal(Sculpt *sd, Object *ob, float an[3], PBVHNode **nod
 	/* Grab brush requires to test on original data (see r33888 and
 	 * bug #25371) */
 	original = (paint_brush(&sd->paint)->sculpt_tool == SCULPT_TOOL_GRAB ?
-				TRUE : ss->cache->original);
+	            TRUE : ss->cache->original);
 
 	(void)sd; /* unused w/o openmp */
 	
@@ -981,8 +986,8 @@ static void calc_area_normal(Sculpt *sd, Object *ob, float an[3], PBVHNode **nod
 
 /* Calculate primary direction of movement for many brushes */
 static void calc_sculpt_normal(Sculpt *sd, Object *ob,
-							   PBVHNode **nodes, int totnode,
-							   float an[3])
+                               PBVHNode **nodes, int totnode,
+                               float an[3])
 {
 	const Brush *brush = paint_brush(&sd->paint);
 	const SculptSession *ss = ob->sculpt;
@@ -990,8 +995,8 @@ static void calc_sculpt_normal(Sculpt *sd, Object *ob,
 	switch (brush->sculpt_plane) {
 		case SCULPT_DISP_DIR_VIEW:
 			ED_view3d_global_to_vector(ss->cache->vc->rv3d,
-									   ss->cache->vc->rv3d->twmat[3],
-									   an);
+			                           ss->cache->vc->rv3d->twmat[3],
+			                           an);
 			break;
 
 		case SCULPT_DISP_DIR_X:
@@ -1021,7 +1026,7 @@ static void calc_sculpt_normal(Sculpt *sd, Object *ob,
 }
 
 static void update_sculpt_normal(Sculpt *sd, Object *ob,
-								 PBVHNode **nodes, int totnode)
+                                 PBVHNode **nodes, int totnode)
 {
 	const Brush *brush = paint_brush(&sd->paint);
 	StrokeCache *cache = ob->sculpt->cache;
@@ -1056,7 +1061,7 @@ static void calc_local_y(ViewContext *vc, const float center[3], float y[3])
 }
 
 static void calc_brush_local_mat(const Brush *brush, Object *ob,
-								 float local_mat[4][4])
+                                 float local_mat[4][4])
 {
 	const StrokeCache *cache = ob->sculpt->cache;
 	float tmat[4][4];
@@ -1105,10 +1110,10 @@ static void update_brush_local_mat(Sculpt *sd, Object *ob)
 	StrokeCache *cache = ob->sculpt->cache;
 
 	if (cache->mirror_symmetry_pass == 0 &&
-		cache->radial_symmetry_pass == 0)
+	    cache->radial_symmetry_pass == 0)
 	{
 		calc_brush_local_mat(paint_brush(&sd->paint), ob,
-							 cache->brush_local_mat);
+		                     cache->brush_local_mat);
 	}
 }
 
@@ -1117,21 +1122,21 @@ static void update_brush_local_mat(Sculpt *sd, Object *ob)
 static int brush_needs_sculpt_normal(const Brush *brush)
 {
 	return ((ELEM(brush->sculpt_tool,
-				  SCULPT_TOOL_GRAB,
-				  SCULPT_TOOL_SNAKE_HOOK) &&
-			 ((brush->normal_weight > 0) ||
-			  (brush->flag & BRUSH_FRONTFACE))) ||
-
-			ELEM7(brush->sculpt_tool,
-				  SCULPT_TOOL_BLOB,
-				  SCULPT_TOOL_CREASE,
-				  SCULPT_TOOL_DRAW,
-				  SCULPT_TOOL_LAYER,
-				  SCULPT_TOOL_NUDGE,
-				  SCULPT_TOOL_ROTATE,
-				  SCULPT_TOOL_THUMB) ||
-
-			(brush->mtex.brush_map_mode == MTEX_MAP_MODE_AREA));
+	              SCULPT_TOOL_GRAB,
+	              SCULPT_TOOL_SNAKE_HOOK) &&
+	         ((brush->normal_weight > 0) ||
+	          (brush->flag & BRUSH_FRONTFACE))) ||
+
+	        ELEM7(brush->sculpt_tool,
+	              SCULPT_TOOL_BLOB,
+	              SCULPT_TOOL_CREASE,
+	              SCULPT_TOOL_DRAW,
+	              SCULPT_TOOL_LAYER,
+	              SCULPT_TOOL_NUDGE,
+	              SCULPT_TOOL_ROTATE,
+	              SCULPT_TOOL_THUMB) ||
+
+	        (brush->mtex.brush_map_mode == MTEX_MAP_MODE_AREA));
 }
 
 /* For the smooth brush, uses the neighboring vertices around vert to calculate
@@ -1257,6 +1262,7 @@ static void do_multires_smooth_brush(Sculpt *sd, SculptSession *ss, PBVHNode *no
 	float (*tmpgrid_co)[3], (*tmprow_co)[3];
 	float *tmpgrid_mask, *tmprow_mask;
 	int v1, v2, v3, v4;
+	int thread_num;
 	int *grid_indices, totgrid, gridsize, i, x, y;
 
 	sculpt_brush_test_init(ss, &test);
@@ -1267,17 +1273,15 @@ static void do_multires_smooth_brush(Sculpt *sd, SculptSession *ss, PBVHNode *no
 	                        NULL, &gridsize, &griddata, &gridadj);
 	BLI_pbvh_get_grid_key(ss->pbvh, &key);
 
-	#pragma omp critical
-	{
-		if (smooth_mask) {
-			tmpgrid_mask = MEM_mallocN(sizeof(float) * gridsize * gridsize, "tmpgrid_mask");
-			tmprow_mask = MEM_mallocN(sizeof(float) * gridsize, "tmprow_mask");
-		}
-		else {
-			tmpgrid_co = MEM_mallocN(sizeof(float) * 3 * gridsize * gridsize, "tmpgrid_co");
-			tmprow_co = MEM_mallocN(sizeof(float) * 3 * gridsize, "tmprow_co");
-		}
-	}
+	thread_num = 0;
+#ifdef _OPENMP
+	if (sd->flags & SCULPT_USE_OPENMP)
+		thread_num = omp_get_thread_num();
+#endif
+	tmpgrid_co = ss->cache->tmpgrid_co[thread_num];
+	tmprow_co = ss->cache->tmprow_co[thread_num];
+	tmpgrid_mask = ss->cache->tmpgrid_mask[thread_num];
+	tmprow_mask = ss->cache->tmprow_mask[thread_num];
 
 	for (i = 0; i < totgrid; ++i) {
 		data = griddata[grid_indices[i]];
@@ -1393,18 +1397,6 @@ static void do_multires_smooth_brush(Sculpt *sd, SculptSession *ss, PBVHNode *no
 			}
 		}
 	}
-
-	#pragma omp critical
-	{
-		if (smooth_mask) {
-			MEM_freeN(tmpgrid_mask);
-			MEM_freeN(tmprow_mask);
-		}
-		else {
-			MEM_freeN(tmpgrid_co);
-			MEM_freeN(tmprow_co);
-		}
-	}
 }
 
 static void smooth(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode,
@@ -1413,6 +1405,7 @@ static void smooth(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode,
 	SculptSession *ss = ob->sculpt;
 	const int max_iterations = 4;
 	const float fract = 1.0f / max_iterations;
+	PBVHType type = BLI_pbvh_type(ss->pbvh);
 	int iteration, n, count;
 	float last;
 
@@ -1421,16 +1414,25 @@ static void smooth(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode,
 	count = (int)(bstrength * max_iterations);
 	last  = max_iterations * (bstrength - count * fract);
 
+	if (type == PBVH_FACES && !ss->pmap) {
+		BLI_assert(!"sculpt smooth: pmap missing");
+		return;
+	}
+
 	for (iteration = 0; iteration <= count; ++iteration) {
+		float strength = (iteration != count) ? 1.0f : last;
+
 		#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP)
 		for (n = 0; n < totnode; n++) {
-			if (ss->multires) {
-				do_multires_smooth_brush(sd, ss, nodes[n],
-				                         iteration != count ? 1.0f : last, smooth_mask);
-			}
-			else if (ss->pmap) {
-				do_mesh_smooth_brush(sd, ss, nodes[n],
-				                     iteration != count ? 1.0f : last, smooth_mask);
+			switch (type) {
+				case PBVH_GRIDS:
+					do_multires_smooth_brush(sd, ss, nodes[n], strength,
+					                         smooth_mask);
+					break;
+				case PBVH_FACES:
+					do_mesh_smooth_brush(sd, ss, nodes[n], strength,
+					                     smooth_mask);
+					break;
 			}
 		}
 
@@ -1522,7 +1524,7 @@ static void do_draw_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode)
 				/* offset vertex */
 				float fade = tex_strength(ss, brush, vd.co, test.dist,
 				                          ss->cache->sculpt_normal_symm, vd.no,
-										  vd.fno, *vd.mask);
+				                          vd.fno, *vd.mask);
 
 				mul_v3_v3fl(proxy[vd.i], offset, fade);
 
@@ -1578,7 +1580,7 @@ static void do_crease_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnod
 				/* offset vertex */
 				const float fade = tex_strength(ss, brush, vd.co, test.dist,
 				                                ss->cache->sculpt_normal_symm,
-												vd.no, vd.fno, *vd.mask);
+				                                vd.no, vd.fno, *vd.mask);
 				float val1[3];
 				float val2[3];
 
@@ -1716,7 +1718,7 @@ static void do_nudge_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode
 			if (sculpt_brush_test(&test, vd.co)) {
 				const float fade = bstrength * tex_strength(ss, brush, vd.co, test.dist,
 				                                            ss->cache->sculpt_normal_symm,
-															vd.no, vd.fno, *vd.mask);
+				                                            vd.no, vd.fno, *vd.mask);
 
 				mul_v3_v3fl(proxy[vd.i], cono, fade);
 
@@ -1765,7 +1767,7 @@ static void do_snake_hook_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int to
 			if (sculpt_brush_test(&test, vd.co)) {
 				const float fade = bstrength * tex_strength(ss, brush, vd.co, test.dist,
 				                                            ss->cache->sculpt_normal_symm,
-														    vd.no, vd.fno, *vd.mask);
+				                                            vd.no, vd.fno, *vd.mask);
 
 				mul_v3_v3fl(proxy[vd.i], grab_delta, fade);
 
@@ -1813,7 +1815,7 @@ static void do_thumb_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode
 			if (sculpt_brush_test(&test, origco[vd.i])) {
 				const float fade = bstrength * tex_strength(ss, brush, origco[vd.i], test.dist,
 				                                            ss->cache->sculpt_normal_symm,
-															origno[vd.i], NULL, *vd.mask);
+				                                            origno[vd.i], NULL, *vd.mask);
 
 				mul_v3_v3fl(proxy[vd.i], cono, fade);
 
@@ -1866,7 +1868,7 @@ static void do_rotate_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnod
 			if (sculpt_brush_test(&test, origco[vd.i])) {
 				const float fade = bstrength * tex_strength(ss, brush, origco[vd.i], test.dist,
 				                                            ss->cache->sculpt_normal_symm,
-														    origno[vd.i], NULL, *vd.mask);
+				                                            origno[vd.i], NULL, *vd.mask);
 
 				mul_v3_m4v3(proxy[vd.i], m, origco[vd.i]);
 				sub_v3_v3(proxy[vd.i], origco[vd.i]);
@@ -1919,7 +1921,7 @@ static void do_layer_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode
 			if (sculpt_brush_test(&test, origco[vd.i])) {
 				const float fade = bstrength * tex_strength(ss, brush, vd.co, test.dist,
 				                                            ss->cache->sculpt_normal_symm,
-															vd.no, vd.fno, *vd.mask);
+				                                            vd.no, vd.fno, *vd.mask);
 				float *disp = &layer_disp[vd.i];
 				float val[3];
 
@@ -3223,6 +3225,69 @@ static void sculpt_init_mirror_clipping(Object *ob, SculptSession *ss)
 	}
 }
 
+static void sculpt_omp_start(Sculpt *sd, SculptSession *ss)
+{
+	StrokeCache *cache = ss->cache;
+
+#ifdef _OPENMP
+	/* If using OpenMP then create a number of threads two times the
+	 * number of processor cores.
+	 * Justification: Empirically I've found that two threads per
+	 * processor gives higher throughput. */
+	if (sd->flags & SCULPT_USE_OPENMP) {
+		cache->num_threads = 2 * omp_get_num_procs();
+		omp_set_num_threads(cache->num_threads);
+	}
+	else
+#endif
+	{
+		(void)sd;
+		cache->num_threads = 1;
+	}
+
+	if (ss->multires) {
+		int i, gridsize, array_mem_size;
+		BLI_pbvh_node_get_grids(ss->pbvh, NULL, NULL, NULL, NULL,
+								&gridsize, NULL, NULL);
+
+		array_mem_size = cache->num_threads * sizeof(void*);
+
+		cache->tmpgrid_co = MEM_mallocN(array_mem_size, "tmpgrid_co array");
+		cache->tmprow_co = MEM_mallocN(array_mem_size, "tmprow_co array");
+		cache->tmpgrid_mask = MEM_mallocN(array_mem_size, "tmpgrid_mask array");
+		cache->tmprow_mask = MEM_mallocN(array_mem_size, "tmprow_mask array");
+
+		for (i = 0; i < cache->num_threads; i++) {
+			const size_t row_size = sizeof(float) * gridsize;
+			const size_t co_row_size = 3 * row_size;
+
+			cache->tmprow_co[i] = MEM_mallocN(co_row_size, "tmprow_co");
+			cache->tmpgrid_co[i] = MEM_mallocN(co_row_size * gridsize, "tmpgrid_co");
+			cache->tmprow_mask[i] = MEM_mallocN(row_size, "tmprow_mask");
+			cache->tmpgrid_mask[i] = MEM_mallocN(row_size * gridsize, "tmpgrid_mask");
+		}
+	}
+}
+
+static void sculpt_omp_done(SculptSession *ss)
+{
+	if (ss->multires) {
+		int i;
+
+		for (i = 0; i < ss->cache->num_threads; i++) {
+			MEM_freeN(ss->cache->tmpgrid_co[i]);
+			MEM_freeN(ss->cache->tmprow_co[i]);
+			MEM_freeN(ss->cache->tmpgrid_mask[i]);
+			MEM_freeN(ss->cache->tmprow_mask[i]);
+		}
+
+		MEM_freeN(ss->cache->tmpgrid_co);
+		MEM_freeN(ss->cache->tmprow_co);
+		MEM_freeN(ss->cache->tmpgrid_mask);
+		MEM_freeN(ss->cache->tmprow_mask);
+	}
+}
+
 /* Initialize the stroke cache invariants from operator properties */
 static void sculpt_update_cache_invariants(bContext *C, Sculpt *sd, SculptSession *ss, wmOperator *op, const float mouse[2])
 {
@@ -3336,6 +3401,8 @@ static void sculpt_update_cache_invariants(bContext *C, Sculpt *sd, SculptSessio
 	cache->first_time = 1;
 
 	cache->vertex_rotation = 0;
+
+	sculpt_omp_start(sd, ss);
 }
 
 static void sculpt_update_brush_delta(Sculpt *sd, Object *ob, Brush *brush)
@@ -3571,6 +3638,21 @@ static void sculpt_update_cache_variants(bContext *C, Sculpt *sd, Object *ob,
 	sd->special_rotation = cache->special_rotation;
 }
 
+/* Returns true iff any of the smoothing modes are active (currently
+   one of smooth brush, autosmooth, mask smooth, or shift-key
+   smooth) */
+static int sculpt_any_smooth_mode(const Brush *brush,
+                                  StrokeCache *cache,
+                                  int stroke_mode)
+{
+	return ((stroke_mode == BRUSH_STROKE_SMOOTH) ||
+	        (cache && cache->alt_smooth) ||
+	        (brush->sculpt_tool == SCULPT_TOOL_SMOOTH) ||
+	        (brush->autosmooth_factor > 0) ||
+	        ((brush->sculpt_tool == SCULPT_TOOL_MASK) &&
+	         (brush->mask_tool == BRUSH_MASK_SMOOTH)));
+}
+
 static void sculpt_stroke_modifiers_check(const bContext *C, Object *ob)
 {
 	SculptSession *ss = ob->sculpt;
@@ -3579,7 +3661,8 @@ static void sculpt_stroke_modifiers_check(const bContext *C, Object *ob)
 		Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
 		Brush *brush = paint_brush(&sd->paint);
 
-		sculpt_update_mesh_elements(CTX_data_scene(C), sd, ob, brush->sculpt_tool == SCULPT_TOOL_SMOOTH);
+		sculpt_update_mesh_elements(CTX_data_scene(C), sd, ob,
+		                            sculpt_any_smooth_mode(brush, ss->cache, 0));
 	}
 }
 
@@ -3689,11 +3772,7 @@ static int sculpt_brush_stroke_init(bContext *C, wmOperator *op)
 	view3d_operator_needs_opengl(C);
 	sculpt_brush_init_tex(scene, sd, ss);
 
-	is_smooth |= mode == BRUSH_STROKE_SMOOTH;
-	is_smooth |= brush->sculpt_tool == SCULPT_TOOL_SMOOTH;
-	is_smooth |= ((brush->sculpt_tool == SCULPT_TOOL_MASK) &&
-	              (brush->mask_tool == BRUSH_MASK_SMOOTH));
-
+	is_smooth = sculpt_any_smooth_mode(brush, NULL, mode);
 	sculpt_update_mesh_elements(scene, sd, ob, is_smooth);
 
 	return 1;
@@ -3776,19 +3855,6 @@ static int sculpt_stroke_test_start(bContext *C, struct wmOperator *op,
 
 		sculpt_undo_push_begin(sculpt_tool_name(sd));
 
-#ifdef _OPENMP
-		/* If using OpenMP then create a number of threads two times the
-		 * number of processor cores.
-		 * Justification: Empirically I've found that two threads per
-		 * processor gives higher throughput. */
-		if (sd->flags & SCULPT_USE_OPENMP) {
-			int num_procs;
-
-			num_procs = omp_get_num_procs();
-			omp_set_num_threads(2 * num_procs);
-		}
-#endif
-
 		return 1;
 	}
 	else
@@ -3825,6 +3891,8 @@ static void sculpt_stroke_done(const bContext *C, struct PaintStroke *UNUSED(str
 	SculptSession *ss = ob->sculpt;
 	Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
 
+	sculpt_omp_done(ss);
+
 	/* reset values used to draw brush after completing the stroke */
 	sd->draw_anchored = 0;
 	sd->draw_pressure = 0;
diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c
index af7f3bd4aed..9827ffdc324 100644
--- a/source/blender/editors/sound/sound_ops.c
+++ b/source/blender/editors/sound/sound_ops.c
@@ -676,7 +676,7 @@ static int sound_poll(bContext *C)
 {
 	Editing *ed = CTX_data_scene(C)->ed;
 
-	if (!ed || !ed->act_seq || ed->act_seq->type != SEQ_SOUND)
+	if (!ed || !ed->act_seq || ed->act_seq->type != SEQ_TYPE_SOUND_RAM)
 		return 0;
 
 	return 1;
@@ -689,7 +689,7 @@ static int sound_pack_exec(bContext *C, wmOperator *op)
 	Editing *ed = CTX_data_scene(C)->ed;
 	bSound *sound;
 
-	if (!ed || !ed->act_seq || ed->act_seq->type != SEQ_SOUND)
+	if (!ed || !ed->act_seq || ed->act_seq->type != SEQ_TYPE_SOUND_RAM)
 		return OPERATOR_CANCELLED;
 
 	sound = ed->act_seq->sound;
@@ -751,7 +751,7 @@ static int sound_unpack_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(even
 	if (RNA_struct_property_is_set(op->ptr, "id"))
 		return sound_unpack_exec(C, op);
 
-	if (!ed || !ed->act_seq || ed->act_seq->type != SEQ_SOUND)
+	if (!ed || !ed->act_seq || ed->act_seq->type != SEQ_TYPE_SOUND_RAM)
 		return OPERATOR_CANCELLED;
 
 	sound = ed->act_seq->sound;
diff --git a/source/blender/editors/space_action/action_draw.c b/source/blender/editors/space_action/action_draw.c
index 3961e566f80..edec57d9e93 100644
--- a/source/blender/editors/space_action/action_draw.c
+++ b/source/blender/editors/space_action/action_draw.c
@@ -236,8 +236,8 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
 					switch (ale->type) {
 						case ANIMTYPE_SUMMARY:
 						{
-							// FIXME: hardcoded colors - reddish color from NLA
-							glColor4f(0.8f, 0.2f, 0.0f, 0.4f);
+							/* reddish color from NLA */
+							UI_ThemeColor4(TH_ANIM_ACTIVE);
 						}
 						break;
 						
@@ -290,6 +290,18 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
 					else glColor4ub(col2[0], col2[1], col2[2], 0x44);
 					glRectf(v2d->cur.xmin, (float)y - ACHANNEL_HEIGHT_HALF, v2d->cur.xmax + EXTRA_SCROLL_PAD,  (float)y + ACHANNEL_HEIGHT_HALF);
 				}
+				else if (ac->datatype == ANIMCONT_MASK) {
+					/* TODO --- this is a copy of gpencil */
+					/* frames less than one get less saturated background */
+					if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x22);
+					else glColor4ub(col2[0], col2[1], col2[2], 0x22);
+					glRectf(0.0f, (float)y - ACHANNEL_HEIGHT_HALF, v2d->cur.xmin, (float)y + ACHANNEL_HEIGHT_HALF);
+
+					/* frames one and higher get a saturated background */
+					if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x44);
+					else glColor4ub(col2[0], col2[1], col2[2], 0x44);
+					glRectf(v2d->cur.xmin, (float)y - ACHANNEL_HEIGHT_HALF, v2d->cur.xmax + EXTRA_SCROLL_PAD,  (float)y + ACHANNEL_HEIGHT_HALF);
+				}
 			}
 		}
 		
@@ -340,6 +352,9 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
 					case ALE_GPFRAME:
 						draw_gpl_channel(v2d, ads, ale->data, y);
 						break;
+					case ALE_MASKLAY:
+						draw_masklay_channel(v2d, ads, ale->data, y);
+						break;
 				}
 			}
 		}
diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c
index 73c36fd8086..b5cd49cc15c 100644
--- a/source/blender/editors/space_action/action_edit.c
+++ b/source/blender/editors/space_action/action_edit.c
@@ -44,6 +44,7 @@
 #include "DNA_gpencil_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_mask_types.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
@@ -64,6 +65,7 @@
 #include "ED_screen.h"
 #include "ED_transform.h"
 #include "ED_markers.h"
+#include "ED_mask.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -256,6 +258,19 @@ static void get_keyframe_extents(bAnimContext *ac, float *min, float *max, const
 					*max = MAX2(*max, gpf->framenum);
 				}
 			}
+			else if (ale->datatype == ALE_MASKLAY) {
+				MaskLayer *masklay = ale->data;
+				MaskLayerShape *masklay_shape;
+
+				/* find mask layer which is less than or equal to cframe */
+				for (masklay_shape = masklay->splines_shapes.first;
+				     masklay_shape;
+				     masklay_shape = masklay_shape->next)
+				{
+					*min = MIN2(*min, masklay_shape->frame);
+					*max = MAX2(*max, masklay_shape->frame);
+				}
+			}
 			else {
 				FCurve *fcu = (FCurve *)ale->key_data;
 				float tmin, tmax;
@@ -445,9 +460,16 @@ static short paste_action_keys(bAnimContext *ac,
 	ListBase anim_data = {NULL, NULL};
 	int filter, ok = 0;
 	
-	/* filter data */
-	filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
-	ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
+	/* filter data 
+	 * - First time we try to filter more strictly, allowing only selected channels 
+	 *   to allow copying animation between channels
+	 * - Second time, we loosen things up if nothing was found the first time, allowing
+	 *   users to just paste keyframes back into the original curve again [#31670]
+	 */
+	filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
+	
+	if (ANIM_animdata_filter(ac, &anim_data, filter | ANIMFILTER_SEL, ac->data, ac->datatype) == 0)
+		ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
 	
 	/* paste keyframes */
 	ok = paste_animedit_keys(ac, &anim_data, offset_mode, merge_mode);
@@ -469,11 +491,16 @@ static int actkeys_copy_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	
 	/* copy keyframes */
-	if (ac.datatype == ANIMCONT_GPENCIL) {
+	if (ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK)) {
 		// FIXME...
 		BKE_report(op->reports, RPT_ERROR, "Keyframe pasting is not available for Grease Pencil mode");
 		return OPERATOR_CANCELLED;
 	}
+	else if (ac.datatype == ANIMCONT_MASK) {
+		// FIXME...
+		BKE_report(op->reports, RPT_ERROR, "Keyframe pasting is not available for mask mode");
+		return OPERATOR_CANCELLED;
+	}
 	else {
 		if (copy_action_keys(&ac)) {	
 			BKE_report(op->reports, RPT_ERROR, "No keyframes copied to keyframes copy/paste buffer");
@@ -514,9 +541,9 @@ static int actkeys_paste_exec(bContext *C, wmOperator *op)
 	ac.reports = op->reports;
 	
 	/* paste keyframes */
-	if (ac.datatype == ANIMCONT_GPENCIL) {
+	if (ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK)) {
 		// FIXME...
-		BKE_report(op->reports, RPT_ERROR, "Keyframe pasting is not available for Grease Pencil mode");
+		BKE_report(op->reports, RPT_ERROR, "Keyframe pasting is not available for Grease Pencil or Mask mode");
 		return OPERATOR_CANCELLED;
 	}
 	else {
@@ -618,7 +645,7 @@ static int actkeys_insertkey_exec(bContext *C, wmOperator *op)
 	/* get editor data */
 	if (ANIM_animdata_get_context(C, &ac) == 0)
 		return OPERATOR_CANCELLED;
-	if (ac.datatype == ANIMCONT_GPENCIL)
+	if (ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
 		return OPERATOR_CANCELLED;
 		
 	/* what channels to affect? */
@@ -664,7 +691,7 @@ static void duplicate_action_keys(bAnimContext *ac)
 	int filter;
 	
 	/* filter data */
-	if (ac->datatype == ANIMCONT_GPENCIL)
+	if (ELEM(ac->datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
 		filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
 	else
 		filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
@@ -674,8 +701,12 @@ static void duplicate_action_keys(bAnimContext *ac)
 	for (ale = anim_data.first; ale; ale = ale->next) {
 		if (ale->type == ANIMTYPE_FCURVE)
 			duplicate_fcurve_keys((FCurve *)ale->key_data);
+		else if (ale->type == ANIMTYPE_GPLAYER)
+			ED_gplayer_frames_duplicate((bGPDlayer *)ale->data);
+		else if (ale->type == ANIMTYPE_MASKLAYER)
+			ED_masklayer_frames_duplicate((MaskLayer *)ale->data);
 		else
-			duplicate_gplayer_frames((bGPDlayer *)ale->data);
+			BLI_assert(0);
 	}
 	
 	/* free filtered list */
@@ -696,7 +727,7 @@ static int actkeys_duplicate_exec(bContext *C, wmOperator *UNUSED(op))
 	duplicate_action_keys(&ac);
 	
 	/* validate keyframes after editing */
-	if (ac.datatype != ANIMCONT_GPENCIL)
+	if (!ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
 		ANIM_editkeyframes_refresh(&ac);
 	
 	/* set notifier that keyframes have changed */
@@ -737,7 +768,7 @@ static void delete_action_keys(bAnimContext *ac)
 	int filter;
 	
 	/* filter data */
-	if (ac->datatype == ANIMCONT_GPENCIL)
+	if (ELEM(ac->datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
 		filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
 	else
 		filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
@@ -745,7 +776,13 @@ static void delete_action_keys(bAnimContext *ac)
 	
 	/* loop through filtered data and delete selected keys */
 	for (ale = anim_data.first; ale; ale = ale->next) {
-		if (ale->type != ANIMTYPE_GPLAYER) {
+		if (ale->type == ANIMTYPE_GPLAYER) {
+			ED_gplayer_frames_delete((bGPDlayer *)ale->data);
+		}
+		else if (ale->type == ANIMTYPE_MASKLAYER) {
+			ED_masklayer_frames_delete((MaskLayer *)ale->data);
+		}
+		else {
 			FCurve *fcu = (FCurve *)ale->key_data;
 			AnimData *adt = ale->adt;
 			
@@ -756,8 +793,6 @@ static void delete_action_keys(bAnimContext *ac)
 			if ((fcu->totvert == 0) && (list_has_suitable_fmodifier(&fcu->modifiers, 0, FMI_TYPE_GENERATE_CURVE) == 0))
 				ANIM_fcurve_delete_from_animdata(ac, adt, fcu);
 		}
-		else
-			delete_gplayer_frames((bGPDlayer *)ale->data);
 	}
 	
 	/* free filtered list */
@@ -778,7 +813,7 @@ static int actkeys_delete_exec(bContext *C, wmOperator *UNUSED(op))
 	delete_action_keys(&ac);
 	
 	/* validate keyframes after editing */
-	if (ac.datatype != ANIMCONT_GPENCIL)
+	if (!ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
 		ANIM_editkeyframes_refresh(&ac);
 	
 	/* set notifier that keyframes have changed */
@@ -833,7 +868,7 @@ static int actkeys_clean_exec(bContext *C, wmOperator *op)
 	/* get editor data */
 	if (ANIM_animdata_get_context(C, &ac) == 0)
 		return OPERATOR_CANCELLED;
-	if (ac.datatype == ANIMCONT_GPENCIL)
+	if (ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
 		return OPERATOR_PASS_THROUGH;
 		
 	/* get cleaning threshold */
@@ -900,7 +935,7 @@ static int actkeys_sample_exec(bContext *C, wmOperator *UNUSED(op))
 	/* get editor data */
 	if (ANIM_animdata_get_context(C, &ac) == 0)
 		return OPERATOR_CANCELLED;
-	if (ac.datatype == ANIMCONT_GPENCIL)
+	if (ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
 		return OPERATOR_PASS_THROUGH;
 	
 	/* sample keyframes */
@@ -1007,7 +1042,7 @@ static int actkeys_expo_exec(bContext *C, wmOperator *op)
 	/* get editor data */
 	if (ANIM_animdata_get_context(C, &ac) == 0)
 		return OPERATOR_CANCELLED;
-	if (ac.datatype == ANIMCONT_GPENCIL) 
+	if (ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
 		return OPERATOR_PASS_THROUGH;
 		
 	/* get handle setting mode */
@@ -1078,7 +1113,7 @@ static int actkeys_ipo_exec(bContext *C, wmOperator *op)
 	/* get editor data */
 	if (ANIM_animdata_get_context(C, &ac) == 0)
 		return OPERATOR_CANCELLED;
-	if (ac.datatype == ANIMCONT_GPENCIL) 
+	if (ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
 		return OPERATOR_PASS_THROUGH;
 		
 	/* get handle setting mode */
@@ -1158,7 +1193,7 @@ static int actkeys_handletype_exec(bContext *C, wmOperator *op)
 	/* get editor data */
 	if (ANIM_animdata_get_context(C, &ac) == 0)
 		return OPERATOR_CANCELLED;
-	if (ac.datatype == ANIMCONT_GPENCIL) 
+	if (ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
 		return OPERATOR_PASS_THROUGH;
 		
 	/* get handle setting mode */
@@ -1229,7 +1264,7 @@ static int actkeys_keytype_exec(bContext *C, wmOperator *op)
 	/* get editor data */
 	if (ANIM_animdata_get_context(C, &ac) == 0)
 		return OPERATOR_CANCELLED;
-	if (ac.datatype == ANIMCONT_GPENCIL) 
+	if (ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
 		return OPERATOR_PASS_THROUGH;
 		
 	/* get handle setting mode */
@@ -1352,7 +1387,7 @@ static void snap_action_keys(bAnimContext *ac, short mode)
 	KeyframeEditFunc edit_cb;
 	
 	/* filter data */
-	if (ac->datatype == ANIMCONT_GPENCIL)
+	if (ELEM(ac->datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
 		filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT);
 	else
 		filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
@@ -1397,7 +1432,7 @@ static int actkeys_snap_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 		
 	// XXX...
-	if (ac.datatype == ANIMCONT_GPENCIL)
+	if (ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
 		return OPERATOR_PASS_THROUGH;
 		
 	/* get snapping mode */
@@ -1475,7 +1510,7 @@ static void mirror_action_keys(bAnimContext *ac, short mode)
 	}
 	
 	/* filter data */
-	if (ac->datatype == ANIMCONT_GPENCIL)
+	if (ELEM(ac->datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
 		filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
 	else
 		filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
@@ -1511,7 +1546,7 @@ static int actkeys_mirror_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 		
 	// XXX...
-	if (ac.datatype == ANIMCONT_GPENCIL)
+	if (ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
 		return OPERATOR_PASS_THROUGH;
 		
 	/* get mirroring mode */
diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c
index 0c6b0f5eb3d..539a32161e5 100644
--- a/source/blender/editors/space_action/action_select.c
+++ b/source/blender/editors/space_action/action_select.c
@@ -43,6 +43,7 @@
 #include "DNA_gpencil_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_mask_types.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
@@ -55,6 +56,7 @@
 
 #include "ED_anim_api.h"
 #include "ED_gpencil.h"
+#include "ED_mask.h"
 #include "ED_keyframes_draw.h"
 #include "ED_keyframes_edit.h"
 #include "ED_markers.h"
@@ -92,7 +94,7 @@ static void deselect_action_keys(bAnimContext *ac, short test, short sel)
 	KeyframeEditFunc test_cb, sel_cb;
 	
 	/* determine type-based settings */
-	if (ac->datatype == ANIMCONT_GPENCIL)
+	if (ELEM(ac->datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
 		filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_NODUPLIS);
 	else
 		filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
@@ -107,7 +109,13 @@ static void deselect_action_keys(bAnimContext *ac, short test, short sel)
 	if (test) {
 		for (ale = anim_data.first; ale; ale = ale->next) {
 			if (ale->type == ANIMTYPE_GPLAYER) {
-				if (is_gplayer_frame_selected(ale->data)) {
+				if (ED_gplayer_frame_select_check(ale->data)) {
+					sel = SELECT_SUBTRACT;
+					break;
+				}
+			}
+			else if (ale->type == ANIMTYPE_MASKLAYER) {
+				if (ED_masklayer_frame_select_check(ale->data)) {
 					sel = SELECT_SUBTRACT;
 					break;
 				}
@@ -127,7 +135,9 @@ static void deselect_action_keys(bAnimContext *ac, short test, short sel)
 	/* Now set the flags */
 	for (ale = anim_data.first; ale; ale = ale->next) {
 		if (ale->type == ANIMTYPE_GPLAYER)
-			set_gplayer_frame_selection(ale->data, sel);
+			ED_gplayer_frame_select_set(ale->data, sel);
+		else if (ale->type == ANIMTYPE_MASKLAYER)
+			ED_masklayer_frame_select_set(ale->data, sel);
 		else
 			ANIM_fcurve_keyframes_loop(&ked, ale->key_data, NULL, sel_cb, NULL); 
 	}
@@ -249,7 +259,9 @@ static void borderselect_action(bAnimContext *ac, rcti rect, short mode, short s
 		{
 			/* loop over data selecting */
 			if (ale->type == ANIMTYPE_GPLAYER)
-				borderselect_gplayer_frames(ale->data, rectf.xmin, rectf.xmax, selectmode);
+				ED_gplayer_frames_select_border(ale->data, rectf.xmin, rectf.xmax, selectmode);
+			else if (ale->type == ANIMTYPE_MASKLAYER)
+				ED_masklayer_frames_select_border(ale->data, rectf.xmin, rectf.xmax, selectmode);
 			else
 				ANIM_animchannel_keyframes_loop(&ked, ac->ads, ale, ok_cb, select_cb, NULL);
 		}
@@ -398,7 +410,10 @@ static void markers_selectkeys_between(bAnimContext *ac)
 			ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 1, 1);
 		}
 		else if (ale->type == ANIMTYPE_GPLAYER) {
-			borderselect_gplayer_frames(ale->data, min, max, SELECT_ADD);
+			ED_gplayer_frames_select_border(ale->data, min, max, SELECT_ADD);
+		}
+		else if (ale->type == ANIMTYPE_MASKLAYER) {
+			ED_masklayer_frames_select_border(ale->data, min, max, SELECT_ADD);
 		}
 		else {
 			ANIM_fcurve_keyframes_loop(&ked, ale->key_data, ok_cb, select_cb, NULL);
@@ -432,7 +447,7 @@ static void columnselect_action_keys(bAnimContext *ac, short mode)
 				ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
 				
 				for (ale = anim_data.first; ale; ale = ale->next)
-					gplayer_make_cfra_list(ale->data, &ked.list, 1);
+					ED_gplayer_make_cfra_list(ale->data, &ked.list, 1);
 			}
 			else {
 				filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE /*| ANIMFILTER_CURVESONLY*/);
@@ -467,7 +482,7 @@ static void columnselect_action_keys(bAnimContext *ac, short mode)
 	/* loop through all of the keys and select additional keyframes
 	 * based on the keys found to be selected above
 	 */
-	if (ac->datatype == ANIMCONT_GPENCIL)
+	if (ELEM(ac->datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
 		filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE);
 	else
 		filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE /*| ANIMFILTER_CURVESONLY*/);
@@ -488,7 +503,9 @@ static void columnselect_action_keys(bAnimContext *ac, short mode)
 			
 			/* select elements with frame number matching cfraelem */
 			if (ale->type == ANIMTYPE_GPLAYER)
-				select_gpencil_frame(ale->data, ce->cfra, SELECT_ADD);
+				ED_gpencil_select_frame(ale->data, ce->cfra, SELECT_ADD);
+			else if (ale->type == ANIMTYPE_MASKLAYER)
+				ED_mask_select_frame(ale->data, ce->cfra, SELECT_ADD);
 			else
 				ANIM_fcurve_keyframes_loop(&ked, ale->key_data, ok_cb, select_cb, NULL);
 		}
@@ -755,7 +772,7 @@ static void actkeys_select_leftright(bAnimContext *ac, short leftright, short se
 	}
 	
 	/* filter data */
-	if (ac->datatype == ANIMCONT_GPENCIL)
+	if (ELEM(ac->datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
 		filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_NODUPLIS);
 	else
 		filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE /*| ANIMFILTER_CURVESONLY*/ | ANIMFILTER_NODUPLIS);
@@ -771,7 +788,9 @@ static void actkeys_select_leftright(bAnimContext *ac, short leftright, short se
 			ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 1, 1);
 		}
 		else if (ale->type == ANIMTYPE_GPLAYER)	
-			borderselect_gplayer_frames(ale->data, ked.f1, ked.f2, select_mode);
+			ED_gplayer_frames_select_border(ale->data, ked.f1, ked.f2, select_mode);
+		else if (ale->type == ANIMTYPE_MASKLAYER)
+			ED_masklayer_frames_select_border(ale->data, ked.f1, ked.f2, select_mode);
 		else
 			ANIM_fcurve_keyframes_loop(&ked, ale->key_data, ok_cb, select_cb, NULL);
 	}
@@ -908,7 +927,9 @@ static void actkeys_mselect_single(bAnimContext *ac, bAnimListElem *ale, short s
 	
 	/* select the nominated keyframe on the given frame */
 	if (ale->type == ANIMTYPE_GPLAYER)
-		select_gpencil_frame(ale->data, selx, select_mode);
+		ED_gpencil_select_frame(ale->data, selx, select_mode);
+	else if (ale->type == ANIMTYPE_MASKLAYER)
+		ED_mask_select_frame(ale->data, selx, select_mode);
 	else
 		ANIM_animchannel_keyframes_loop(&ked, ac->ads, ale, ok_cb, select_cb, NULL);
 }
@@ -933,7 +954,7 @@ static void actkeys_mselect_column(bAnimContext *ac, short select_mode, float se
 	/* loop through all of the keys and select additional keyframes
 	 * based on the keys found to be selected above
 	 */
-	if (ac->datatype == ANIMCONT_GPENCIL)
+	if (ELEM(ac->datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
 		filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE /*| ANIMFILTER_CURVESONLY */ | ANIMFILTER_NODUPLIS);
 	else
 		filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_NODUPLIS);
@@ -950,8 +971,10 @@ static void actkeys_mselect_column(bAnimContext *ac, short select_mode, float se
 		
 		/* select elements with frame number matching cfra */
 		if (ale->type == ANIMTYPE_GPLAYER)
-			select_gpencil_frame(ale->key_data, selx, select_mode);
-		else 
+			ED_gpencil_select_frame(ale->key_data, selx, select_mode);
+		else if (ale->type == ANIMTYPE_MASKLAYER)
+			ED_mask_select_frame(ale->key_data, selx, select_mode);
+		else
 			ANIM_fcurve_keyframes_loop(&ked, ale->key_data, ok_cb, select_cb, NULL);
 	}
 	
@@ -1051,7 +1074,12 @@ static void mouse_action_keys(bAnimContext *ac, const int mval[2], short select_
 			bGPDlayer *gpl = (bGPDlayer *)ale->data;
 			gpl_to_keylist(ads, gpl, &anim_keys);
 		}
-		
+		else if (ale->type == ANIMTYPE_MASKLAYER) {
+			// TODO: why don't we just give masklayers key_data too?
+			MaskLayer *masklay = (MaskLayer *)ale->data;
+			mask_to_keylist(ads, masklay, &anim_keys);
+		}
+
 		/* start from keyframe at root of BST, traversing until we find one within the range that was clicked on */
 		for (ak = anim_keys.root; ak; ak = akn) {
 			if (IN_RANGE(ak->cfra, rectf.xmin, rectf.xmax)) {
@@ -1120,6 +1148,18 @@ static void mouse_action_keys(bAnimContext *ac, const int mval[2], short select_
 				//gpencil_layer_setactive(gpd, gpl);
 			}
 		}
+		else if (ac->datatype == ANIMCONT_MASK) {
+			/* deselect all other channels first */
+			ANIM_deselect_anim_channels(ac, ac->data, ac->datatype, 0, ACHANNEL_SETFLAG_CLEAR);
+
+			/* Highlight GPencil Layer */
+			if ((ale && ale->data) && (ale->type == ANIMTYPE_MASKLAYER)) {
+				MaskLayer *masklay = ale->data;
+
+				masklay->flag |= MASK_LAYERFLAG_SELECT;
+				//gpencil_layer_setactive(gpd, gpl);
+			}
+		}
 	}
 	
 	/* only select keyframes if we clicked on a valid channel and hit something */
diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c
index ae4020aaaba..db1d4ed1155 100644
--- a/source/blender/editors/space_action/space_action.c
+++ b/source/blender/editors/space_action/space_action.c
@@ -361,7 +361,7 @@ static void action_listener(ScrArea *sa, wmNotifier *wmn)
 		case NC_SCREEN:
 			if (wmn->data == ND_GPENCIL) {
 				/* only handle this event in GPencil mode for performance considerations */
-				if (saction->mode == SACTCONT_GPENCIL)	
+				if (saction->mode == SACTCONT_GPENCIL)
 					ED_area_tag_redraw(sa);
 			}
 			break;
@@ -405,6 +405,18 @@ static void action_listener(ScrArea *sa, wmNotifier *wmn)
 					break;
 			}
 			break;
+		case NC_MASK:
+			if (saction->mode == SACTCONT_MASK) {
+				switch (wmn->data) {
+					case ND_DATA:
+						ED_area_tag_refresh(sa);
+						break;
+					default: /* just redrawing the view will do */
+						ED_area_tag_redraw(sa);
+						break;
+				}
+			}
+			break;
 		case NC_NODE:
 			if (wmn->action == NA_SELECTED) {
 				/* selection changed, so force refresh to flush (needs flag set to do syncing) */
@@ -423,6 +435,12 @@ static void action_listener(ScrArea *sa, wmNotifier *wmn)
 					break;
 			}			
 			break;
+		case NC_WINDOW:
+			if (saction->flag & SACTION_TEMP_NEEDCHANSYNC) {
+				/* force redraw/refresh after undo/redo - [#28962] */
+				ED_area_tag_refresh(sa);
+			}
+			break;
 	}
 }
 
@@ -452,9 +470,21 @@ static void action_refresh(const bContext *C, ScrArea *sa)
 	 * NOTE: the temp flag is used to indicate when this needs to be done, and will be cleared once handled
 	 */
 	if (saction->flag & SACTION_TEMP_NEEDCHANSYNC) {
+		ARegion *ar;
+		
+		/* Perform syncing of channel state incl. selection
+		 * Active action setting also occurs here (as part of anim channel filtering in anim_filter.c)
+		 */
 		ANIM_sync_animchannels_to_data(C);
 		saction->flag &= ~SACTION_TEMP_NEEDCHANSYNC;
+		
+		/* Tag everything for redraw
+		 * - Regions (such as header) need to be manually tagged for redraw too
+		 *   or else they don't update [#28962]
+		 */
 		ED_area_tag_redraw(sa);
+		for (ar = sa->regionbase.first; ar; ar = ar->next)
+			ED_region_tag_redraw(ar);
 	}
 	
 	/* region updates? */
diff --git a/source/blender/editors/space_api/CMakeLists.txt b/source/blender/editors/space_api/CMakeLists.txt
index 611322fc1ab..137cda9c285 100644
--- a/source/blender/editors/space_api/CMakeLists.txt
+++ b/source/blender/editors/space_api/CMakeLists.txt
@@ -35,7 +35,6 @@ set(INC_SYS
 )
 
 set(SRC
-	space.c
 	spacetypes.c
 )
 
diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c
index 956aee84fd3..fa77249a7a1 100644
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@ -62,6 +62,7 @@
 #include "ED_mball.h"
 #include "ED_logic.h"
 #include "ED_clip.h"
+#include "ED_mask.h"
 
 /* only call once on startup, storage is global in BKE kernel listbase */
 void ED_spacetypes_init(void)
@@ -111,6 +112,7 @@ void ED_spacetypes_init(void)
 	ED_operatortypes_sound();
 	ED_operatortypes_render();
 	ED_operatortypes_logic();
+	ED_operatortypes_mask();
 	
 	UI_view2d_operatortypes();
 	UI_buttons_operatortypes();
@@ -133,6 +135,7 @@ void ED_spacetypes_init(void)
 	ED_operatormacros_action();
 	ED_operatormacros_clip();
 	ED_operatormacros_curve();
+	ED_operatormacros_mask();
 	
 	/* register dropboxes (can use macros) */
 	spacetypes = BKE_spacetypes_list();
@@ -164,6 +167,7 @@ void ED_spacetypes_keymap(wmKeyConfig *keyconf)
 	ED_keymap_physics(keyconf);
 	ED_keymap_metaball(keyconf);
 	ED_keymap_paint(keyconf);
+	ED_keymap_mask(keyconf);
 	ED_marker_keymap(keyconf);
 
 	UI_view2d_keymap(keyconf);
diff --git a/source/blender/editors/space_buttons/buttons_header.c b/source/blender/editors/space_buttons/buttons_header.c
index 661f7ad7d0f..b13ba9a1aa3 100644
--- a/source/blender/editors/space_buttons/buttons_header.c
+++ b/source/blender/editors/space_buttons/buttons_header.c
@@ -125,9 +125,9 @@ void buttons_header_buttons(const bContext *C, ARegion *ar)
 	if (sbuts->pathflag & (1 << _ctx)) { \
 		but = uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, _icon, xco += BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)_ctx, 0, 0, TIP_(_tip)); \
 		uiButClearFlag(but, UI_BUT_UNDO); \
-	} \
+	} (void)0
 
-	BUTTON_HEADER_CTX(BCONTEXT_RENDER, ICON_SCENE, N_("Render"))
+	BUTTON_HEADER_CTX(BCONTEXT_RENDER, ICON_SCENE, N_("Render"));
 	BUTTON_HEADER_CTX(BCONTEXT_SCENE, ICON_SCENE_DATA, N_("Scene"));
 	BUTTON_HEADER_CTX(BCONTEXT_WORLD, ICON_WORLD, N_("World"));
 	BUTTON_HEADER_CTX(BCONTEXT_OBJECT, ICON_OBJECT_DATA, N_("Object"));
diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c
index 5c5c24f7bc1..cdecda63432 100644
--- a/source/blender/editors/space_buttons/buttons_texture.c
+++ b/source/blender/editors/space_buttons/buttons_texture.c
@@ -175,7 +175,7 @@ static void buttons_texture_users_from_context(ListBase *users, const bContext *
 	if (!(pinid || pinid == &scene->id)) {
 		ob = (scene->basact) ? scene->basact->object : NULL;
 		wrld = scene->world;
-		brush = paint_brush(paint_get_active(scene));
+		brush = paint_brush(paint_get_active_from_context(C));
 	}
 
 	if (ob && ob->type == OB_LAMP && !la)
diff --git a/source/blender/editors/space_clip/CMakeLists.txt b/source/blender/editors/space_clip/CMakeLists.txt
index ec5e81e4b2c..ecc4dea8b05 100644
--- a/source/blender/editors/space_clip/CMakeLists.txt
+++ b/source/blender/editors/space_clip/CMakeLists.txt
@@ -52,6 +52,7 @@ set(SRC
 	clip_utils.c
 	space_clip.c
 	tracking_ops.c
+	tracking_select.c
 
 	clip_intern.h
 )
diff --git a/source/blender/editors/space_clip/clip_buttons.c b/source/blender/editors/space_clip/clip_buttons.c
index 18f191a46a6..9b3d713d040 100644
--- a/source/blender/editors/space_clip/clip_buttons.c
+++ b/source/blender/editors/space_clip/clip_buttons.c
@@ -59,7 +59,7 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "clip_intern.h"	// own include
+#include "clip_intern.h"  /* own include */
 
 /* Panels */
 
@@ -165,34 +165,36 @@ void uiTemplateTrack(uiLayout *layout, PointerRNA *ptr, const char *propname)
 
 	block = uiLayoutAbsoluteBlock(layout);
 
-	scopes->track_preview_height = (scopes->track_preview_height <= UI_UNIT_Y)?UI_UNIT_Y : scopes->track_preview_height;
+	scopes->track_preview_height =
+		(scopes->track_preview_height <= UI_UNIT_Y) ? UI_UNIT_Y : scopes->track_preview_height;
 
 	uiDefBut(block, TRACKPREVIEW, 0, "", rect.xmin, rect.ymin, rect.xmax - rect.xmin,
-             scopes->track_preview_height, scopes, 0, 0, 0, 0, "");
+	         scopes->track_preview_height, scopes, 0, 0, 0, 0, "");
 }
 
 /********************* Marker Template ************************/
 
-#define B_MARKER_POS			3
-#define B_MARKER_OFFSET			4
-#define B_MARKER_PAT_DIM		5
-#define B_MARKER_SEARCH_POS		6
-#define B_MARKER_SEARCH_DIM		7
-#define B_MARKER_FLAG			8
+#define B_MARKER_POS            3
+#define B_MARKER_OFFSET         4
+#define B_MARKER_PAT_DIM        5
+#define B_MARKER_SEARCH_POS     6
+#define B_MARKER_SEARCH_DIM     7
+#define B_MARKER_FLAG           8
 
 typedef struct {
-	int compact;								/* compact mode */
+	int compact;                                /* compact mode */
 
 	MovieClip *clip;
-	MovieClipUser *user;						/* user of clip */
+	MovieClipUser *user;                        /* user of clip */
 	MovieTrackingTrack *track;
+	MovieTrackingMarker *marker;
 
-	int framenr;								/* current frame number */
-	float marker_pos[2];						/* position of marker in pixel coords */
-	float track_pat[2];							/* position and dimensions of marker pattern in pixel coords */
-	float track_offset[2];						/* offset of "parenting" point */
-	float track_search_pos[2], track_search[2];	/* position and dimensions of marker search in pixel coords */
-	int marker_flag;							/* marker's flags */
+	int framenr;                                    /* current frame number */
+	float marker_pos[2];                            /* position of marker in pixel coords */
+	float marker_pat[2];                            /* position and dimensions of marker pattern in pixel coords */
+	float track_offset[2];                          /* offset of "parenting" point */
+	float marker_search_pos[2], marker_search[2];   /* position and dimensions of marker search in pixel coords */
+	int marker_flag;                                /* marker's flags */
 } MarkerUpdateCb;
 
 static void to_pixel_space(float r[2], float a[2], int width, int height)
@@ -204,13 +206,13 @@ static void to_pixel_space(float r[2], float a[2], int width, int height)
 
 static void marker_update_cb(bContext *C, void *arg_cb, void *UNUSED(arg))
 {
-	MarkerUpdateCb *cb = (MarkerUpdateCb*) arg_cb;
+	MarkerUpdateCb *cb = (MarkerUpdateCb *) arg_cb;
 	MovieTrackingMarker *marker;
 
 	if (!cb->compact)
 		return;
 
-	marker = BKE_tracking_ensure_marker(cb->track, cb->framenr);
+	marker = BKE_tracking_marker_ensure(cb->track, cb->framenr);
 
 	marker->flag = cb->marker_flag;
 
@@ -219,13 +221,13 @@ static void marker_update_cb(bContext *C, void *arg_cb, void *UNUSED(arg))
 
 static void marker_block_handler(bContext *C, void *arg_cb, int event)
 {
-	MarkerUpdateCb *cb = (MarkerUpdateCb*) arg_cb;
+	MarkerUpdateCb *cb = (MarkerUpdateCb *) arg_cb;
 	MovieTrackingMarker *marker;
 	int width, height, ok = FALSE;
 
 	BKE_movieclip_get_size(cb->clip, cb->user, &width, &height);
 
-	marker = BKE_tracking_ensure_marker(cb->track, cb->framenr);
+	marker = BKE_tracking_marker_ensure(cb->track, cb->framenr);
 
 	if (event == B_MARKER_POS) {
 		marker->pos[0] = cb->marker_pos[0] / width;
@@ -238,60 +240,63 @@ static void marker_block_handler(bContext *C, void *arg_cb, int event)
 		ok = TRUE;
 	}
 	else if (event == B_MARKER_PAT_DIM) {
-		float dim[2], pat_dim[2];
+		float dim[2], pat_dim[2], pat_min[2], pat_max[2];
+		float scale_x, scale_y;
+		int a;
 
-		sub_v2_v2v2(pat_dim, cb->track->pat_max, cb->track->pat_min);
+		BKE_tracking_marker_pattern_minmax(cb->marker, pat_min, pat_max);
 
-		dim[0] = cb->track_pat[0] / width;
-		dim[1] = cb->track_pat[1] / height;
+		sub_v2_v2v2(pat_dim, pat_max, pat_min);
 
-		sub_v2_v2(dim, pat_dim);
-		mul_v2_fl(dim, 0.5f);
+		dim[0] = cb->marker_pat[0] / width;
+		dim[1] = cb->marker_pat[1] / height;
 
-		cb->track->pat_min[0] -= dim[0];
-		cb->track->pat_min[1] -= dim[1];
+		scale_x = dim[0] / pat_dim[0];
+		scale_y = dim[1] / pat_dim[1];
 
-		cb->track->pat_max[0] += dim[0];
-		cb->track->pat_max[1] += dim[1];
+		for (a = 0; a < 4; a++) {
+			cb->marker->pattern_corners[a][0] *= scale_x;
+			cb->marker->pattern_corners[a][1] *= scale_y;
+		}
 
-		BKE_tracking_clamp_track(cb->track, CLAMP_PAT_DIM);
+		BKE_tracking_marker_clamp(cb->marker, CLAMP_PAT_DIM);
 
 		ok = TRUE;
 	}
 	else if (event == B_MARKER_SEARCH_POS) {
 		float delta[2], side[2];
 
-		sub_v2_v2v2(side, cb->track->search_max, cb->track->search_min);
+		sub_v2_v2v2(side, cb->marker->search_max, cb->marker->search_min);
 		mul_v2_fl(side, 0.5f);
 
-		delta[0] = cb->track_search_pos[0] / width;
-		delta[1] = cb->track_search_pos[1] / height;
+		delta[0] = cb->marker_search_pos[0] / width;
+		delta[1] = cb->marker_search_pos[1] / height;
 
-		sub_v2_v2v2(cb->track->search_min, delta, side);
-		add_v2_v2v2(cb->track->search_max, delta, side);
+		sub_v2_v2v2(cb->marker->search_min, delta, side);
+		add_v2_v2v2(cb->marker->search_max, delta, side);
 
-		BKE_tracking_clamp_track(cb->track, CLAMP_SEARCH_POS);
+		BKE_tracking_marker_clamp(cb->marker, CLAMP_SEARCH_POS);
 
 		ok = TRUE;
 	}
 	else if (event == B_MARKER_SEARCH_DIM) {
 		float dim[2], search_dim[2];
 
-		sub_v2_v2v2(search_dim, cb->track->search_max, cb->track->search_min);
+		sub_v2_v2v2(search_dim, cb->marker->search_max, cb->marker->search_min);
 
-		dim[0] = cb->track_search[0] / width;
-		dim[1] = cb->track_search[1] / height;
+		dim[0] = cb->marker_search[0] / width;
+		dim[1] = cb->marker_search[1] / height;
 
 		sub_v2_v2(dim, search_dim);
 		mul_v2_fl(dim, 0.5f);
 
-		cb->track->search_min[0] -= dim[0];
-		cb->track->search_min[1] -= dim[1];
+		cb->marker->search_min[0] -= dim[0];
+		cb->marker->search_min[1] -= dim[1];
 
-		cb->track->search_max[0] += dim[0];
-		cb->track->search_max[1] += dim[1];
+		cb->marker->search_max[0] += dim[0];
+		cb->marker->search_max[1] += dim[1];
 
-		BKE_tracking_clamp_track(cb->track, CLAMP_SEARCH_DIM);
+		BKE_tracking_marker_clamp(cb->marker, CLAMP_SEARCH_DIM);
 
 		ok = TRUE;
 	}
@@ -337,6 +342,7 @@ void uiTemplateMarker(uiLayout *layout, PointerRNA *ptr, const char *propname, P
 	MovieTrackingMarker *marker;
 	MarkerUpdateCb *cb;
 	const char *tip;
+	float pat_min[2], pat_max[2];
 
 	if (!ptr->data)
 		return;
@@ -359,13 +365,14 @@ void uiTemplateMarker(uiLayout *layout, PointerRNA *ptr, const char *propname, P
 	user = userptr->data;
 	track = trackptr->data;
 
-	marker = BKE_tracking_get_marker(track, user->framenr);
+	marker = BKE_tracking_marker_get(track, user->framenr);
 
 	cb = MEM_callocN(sizeof(MarkerUpdateCb), "uiTemplateMarker update_cb");
 	cb->compact = compact;
 	cb->clip = clip;
 	cb->user = user;
 	cb->track = track;
+	cb->marker = marker;
 	cb->marker_flag = marker->flag;
 	cb->framenr = user->framenr;
 
@@ -383,7 +390,7 @@ void uiTemplateMarker(uiLayout *layout, PointerRNA *ptr, const char *propname, P
 	}
 	else {
 		int width, height, step, digits;
-		float pat_dim[2], pat_pos[2], search_dim[2], search_pos[2];
+		float pat_dim[2], search_dim[2], search_pos[2];
 		uiLayout *col;
 
 		BKE_movieclip_get_size(clip, user, &width, &height);
@@ -399,19 +406,18 @@ void uiTemplateMarker(uiLayout *layout, PointerRNA *ptr, const char *propname, P
 		step = 100;
 		digits = 2;
 
-		sub_v2_v2v2(pat_dim, track->pat_max, track->pat_min);
-		sub_v2_v2v2(search_dim, track->search_max, track->search_min);
+		BKE_tracking_marker_pattern_minmax(marker, pat_min, pat_max);
 
-		add_v2_v2v2(search_pos, track->search_max, track->search_min);
-		mul_v2_fl(search_pos, 0.5);
+		sub_v2_v2v2(pat_dim, pat_max, pat_min);
+		sub_v2_v2v2(search_dim, marker->search_max, marker->search_min);
 
-		add_v2_v2v2(pat_pos, track->pat_max, track->pat_min);
-		mul_v2_fl(pat_pos, 0.5);
+		add_v2_v2v2(search_pos, marker->search_max, marker->search_min);
+		mul_v2_fl(search_pos, 0.5);
 
 		to_pixel_space(cb->marker_pos, marker->pos, width, height);
-		to_pixel_space(cb->track_pat, pat_dim, width, height);
-		to_pixel_space(cb->track_search, search_dim, width, height);
-		to_pixel_space(cb->track_search_pos, search_pos, width, height);
+		to_pixel_space(cb->marker_pat, pat_dim, width, height);
+		to_pixel_space(cb->marker_search, search_dim, width, height);
+		to_pixel_space(cb->marker_search_pos, search_pos, width, height);
 		to_pixel_space(cb->track_offset, track->offset, width, height);
 
 		cb->marker_flag = marker->flag;
@@ -426,7 +432,7 @@ void uiTemplateMarker(uiLayout *layout, PointerRNA *ptr, const char *propname, P
 			tip = "Marker is enabled at current frame";
 
 		uiDefButBitI(block, OPTIONN, MARKER_DISABLED, B_MARKER_FLAG,  "Enabled", 10, 190, 145, 19, &cb->marker_flag,
-			0, 0, 0, 0, tip);
+		             0, 0, 0, 0, tip);
 
 		col = uiLayoutColumn(layout, 1);
 		uiLayoutSetActive(col, (cb->marker_flag & MARKER_DISABLED) == 0);
@@ -436,31 +442,31 @@ void uiTemplateMarker(uiLayout *layout, PointerRNA *ptr, const char *propname, P
 
 		uiDefBut(block, LABEL, 0, "Position:", 0, 190, 300, 19, NULL, 0, 0, 0, 0, "");
 		uiDefButF(block, NUM, B_MARKER_POS, "X:", 10, 171, 145, 19, &cb->marker_pos[0],
-			-10*width, 10.0*width, step, digits, "X-position of marker at frame in screen coordinates");
+		          -10 * width, 10.0 * width, step, digits, "X-position of marker at frame in screen coordinates");
 		uiDefButF(block, NUM, B_MARKER_POS, "Y:", 165, 171, 145, 19, &cb->marker_pos[1],
-			-10*height, 10.0*height, step, digits, "Y-position of marker at frame in screen coordinates");
+		          -10 * height, 10.0 * height, step, digits, "Y-position of marker at frame in screen coordinates");
 
 		uiDefBut(block, LABEL, 0, "Offset:", 0, 152, 300, 19, NULL, 0, 0, 0, 0, "");
 		uiDefButF(block, NUM, B_MARKER_OFFSET, "X:", 10, 133, 145, 19, &cb->track_offset[0],
-			-10*width, 10.0*width, step, digits, "X-offset to parenting point");
+		          -10 * width, 10.0 * width, step, digits, "X-offset to parenting point");
 		uiDefButF(block, NUM, B_MARKER_OFFSET, "Y:", 165, 133, 145, 19, &cb->track_offset[1],
-			-10*height, 10.0*height, step, digits, "Y-offset to parenting point");
+		          -10 * height, 10.0 * height, step, digits, "Y-offset to parenting point");
 
 		uiDefBut(block, LABEL, 0, "Pattern Area:", 0, 114, 300, 19, NULL, 0, 0, 0, 0, "");
-		uiDefButF(block, NUM, B_MARKER_PAT_DIM, "Width:", 10, 95, 300, 19, &cb->track_pat[0], 3.0f,
-			10.0*width, step, digits, "Width of marker's pattern in screen coordinates");
-		uiDefButF(block, NUM, B_MARKER_PAT_DIM, "Height:", 10, 76, 300, 19, &cb->track_pat[1], 3.0f,
-			10.0*height, step, digits, "Height of marker's pattern in screen coordinates");
+		uiDefButF(block, NUM, B_MARKER_PAT_DIM, "Width:", 10, 95, 300, 19, &cb->marker_pat[0], 3.0f,
+		          10.0 * width, step, digits, "Width of marker's pattern in screen coordinates");
+		uiDefButF(block, NUM, B_MARKER_PAT_DIM, "Height:", 10, 76, 300, 19, &cb->marker_pat[1], 3.0f,
+		          10.0 * height, step, digits, "Height of marker's pattern in screen coordinates");
 
 		uiDefBut(block, LABEL, 0, "Search Area:", 0, 57, 300, 19, NULL, 0, 0, 0, 0, "");
-		uiDefButF(block, NUM, B_MARKER_SEARCH_POS, "X:", 10, 38, 145, 19, &cb->track_search_pos[0],
-			-width, width, step, digits, "X-position of search at frame relative to marker's position");
-		uiDefButF(block, NUM, B_MARKER_SEARCH_POS, "Y:", 165, 38, 145, 19, &cb->track_search_pos[1],
-			-height, height, step, digits, "X-position of search at frame relative to marker's position");
-		uiDefButF(block, NUM, B_MARKER_SEARCH_DIM, "Width:", 10, 19, 300, 19, &cb->track_search[0], 3.0f,
-			10.0*width, step, digits, "Width of marker's search in screen soordinates");
-		uiDefButF(block, NUM, B_MARKER_SEARCH_DIM, "Height:", 10, 0, 300, 19, &cb->track_search[1], 3.0f,
-			10.0*height, step, digits, "Height of marker's search in screen soordinates");
+		uiDefButF(block, NUM, B_MARKER_SEARCH_POS, "X:", 10, 38, 145, 19, &cb->marker_search_pos[0],
+		          -width, width, step, digits, "X-position of search at frame relative to marker's position");
+		uiDefButF(block, NUM, B_MARKER_SEARCH_POS, "Y:", 165, 38, 145, 19, &cb->marker_search_pos[1],
+		          -height, height, step, digits, "X-position of search at frame relative to marker's position");
+		uiDefButF(block, NUM, B_MARKER_SEARCH_DIM, "Width:", 10, 19, 300, 19, &cb->marker_search[0], 3.0f,
+		          10.0 * width, step, digits, "Width of marker's search in screen soordinates");
+		uiDefButF(block, NUM, B_MARKER_SEARCH_DIM, "Height:", 10, 0, 300, 19, &cb->marker_search[1], 3.0f,
+		          10.0 * height, step, digits, "Height of marker's search in screen soordinates");
 
 		uiBlockEndAlign(block);
 	}
diff --git a/source/blender/editors/space_clip/clip_dopesheet_draw.c b/source/blender/editors/space_clip/clip_dopesheet_draw.c
index 84209f7b744..361a3a7d906 100644
--- a/source/blender/editors/space_clip/clip_dopesheet_draw.c
+++ b/source/blender/editors/space_clip/clip_dopesheet_draw.c
@@ -25,12 +25,12 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/space_clip/clip_graph_draw.c
+/** \file blender/editors/space_clip/clip_dopesheet_draw.c
  *  \ingroup spclip
  */
 
 #include "DNA_movieclip_types.h"
-#include "DNA_object_types.h"	/* SELECT */
+#include "DNA_object_types.h"   /* SELECT */
 #include "DNA_scene_types.h"
 
 #include "MEM_guardedalloc.h"
@@ -61,7 +61,7 @@
 
 #include "RNA_access.h"
 
-#include "clip_intern.h"	// own include
+#include "clip_intern.h"  /* own include */
 
 static void track_channel_color(MovieTrackingTrack *track, float default_color[3], float color[3])
 {
@@ -83,10 +83,10 @@ static void draw_keyframe_shape(float x, float y, float xscale, float yscale, sh
 {
 	/* coordinates for diamond shape */
 	static const float _unit_diamond_shape[4][2] = {
-		{0.0f, 1.0f},	/* top vert */
-		{1.0f, 0.0f},	/* mid-right */
-		{0.0f, -1.0f},	/* bottom vert */
-		{-1.0f, 0.0f}	/* mid-left */
+		{0.0f, 1.0f},   /* top vert */
+		{1.0f, 0.0f},   /* mid-right */
+		{0.0f, -1.0f},  /* bottom vert */
+		{-1.0f, 0.0f}   /* mid-left */
 	};
 	static GLuint displist1 = 0;
 	static GLuint displist2 = 0;
@@ -95,26 +95,26 @@ static void draw_keyframe_shape(float x, float y, float xscale, float yscale, sh
 	/* initialize 2 display lists for diamond shape - one empty, one filled */
 	if (displist1 == 0) {
 		displist1 = glGenLists(1);
-			glNewList(displist1, GL_COMPILE);
-
-			glBegin(GL_LINE_LOOP);
-				glVertex2fv(_unit_diamond_shape[0]);
-				glVertex2fv(_unit_diamond_shape[1]);
-				glVertex2fv(_unit_diamond_shape[2]);
-				glVertex2fv(_unit_diamond_shape[3]);
-			glEnd();
+		glNewList(displist1, GL_COMPILE);
+
+		glBegin(GL_LINE_LOOP);
+		glVertex2fv(_unit_diamond_shape[0]);
+		glVertex2fv(_unit_diamond_shape[1]);
+		glVertex2fv(_unit_diamond_shape[2]);
+		glVertex2fv(_unit_diamond_shape[3]);
+		glEnd();
 		glEndList();
 	}
 	if (displist2 == 0) {
 		displist2 = glGenLists(1);
-			glNewList(displist2, GL_COMPILE);
-
-			glBegin(GL_QUADS);
-				glVertex2fv(_unit_diamond_shape[0]);
-				glVertex2fv(_unit_diamond_shape[1]);
-				glVertex2fv(_unit_diamond_shape[2]);
-				glVertex2fv(_unit_diamond_shape[3]);
-			glEnd();
+		glNewList(displist2, GL_COMPILE);
+
+		glBegin(GL_QUADS);
+		glVertex2fv(_unit_diamond_shape[0]);
+		glVertex2fv(_unit_diamond_shape[1]);
+		glVertex2fv(_unit_diamond_shape[2]);
+		glVertex2fv(_unit_diamond_shape[3]);
+		glEnd();
 		glEndList();
 	}
 
@@ -158,6 +158,12 @@ void clip_draw_dopesheet_main(SpaceClip *sc, ARegion *ar, Scene *scene)
 		MovieTrackingDopesheetChannel *channel;
 		float y, xscale, yscale;
 		float strip[4], selected_strip[4];
+		float height = (dopesheet->tot_channel * CHANNEL_STEP) + (CHANNEL_HEIGHT * 2);
+
+		/* don't use totrect set, as the width stays the same
+		 * (NOTE: this is ok here, the configuration is pretty straightforward)
+		 */
+		v2d->tot.ymin = (float)(-height);
 
 		y = (float) CHANNEL_FIRST;
 
@@ -200,8 +206,8 @@ void clip_draw_dopesheet_main(SpaceClip *sc, ARegion *ar, Scene *scene)
 
 				/* tracked segments */
 				for (i = 0; i < channel->tot_segment; i++) {
-					int start_frame = channel->segments[2 * i];
-					int end_frame = channel->segments[2 * i + 1];
+					int start_frame = BKE_movieclip_remap_clip_to_scene_frame(clip, channel->segments[2 * i]);
+					int end_frame = BKE_movieclip_remap_clip_to_scene_frame(clip, channel->segments[2 * i + 1]);
 
 					if (sel)
 						glColor4fv(selected_strip);
@@ -210,7 +216,7 @@ void clip_draw_dopesheet_main(SpaceClip *sc, ARegion *ar, Scene *scene)
 
 					if (start_frame != end_frame) {
 						glRectf(start_frame, (float) y - STRIP_HEIGHT_HALF,
-								end_frame, (float) y + STRIP_HEIGHT_HALF);
+						        end_frame, (float) y + STRIP_HEIGHT_HALF);
 						draw_keyframe_shape(start_frame, y, xscale, yscale, sel, alpha);
 						draw_keyframe_shape(end_frame, y, xscale, yscale, sel, alpha);
 					}
@@ -224,8 +230,11 @@ void clip_draw_dopesheet_main(SpaceClip *sc, ARegion *ar, Scene *scene)
 				while (i < track->markersnr) {
 					MovieTrackingMarker *marker = &track->markers[i];
 
-					if ((marker->flag & (MARKER_DISABLED | MARKER_TRACKED)) == 0)
-						draw_keyframe_shape(marker->framenr, y, xscale, yscale, sel, alpha);
+					if ((marker->flag & (MARKER_DISABLED | MARKER_TRACKED)) == 0) {
+						int framenr = BKE_movieclip_remap_clip_to_scene_frame(clip, marker->framenr);
+
+						draw_keyframe_shape(framenr, y, xscale, yscale, sel, alpha);
+					}
 
 					i++;
 				}
@@ -304,10 +313,10 @@ void clip_draw_dopesheet_channels(const bContext *C, ARegion *ar)
 			else
 				UI_ThemeColor(TH_TEXT);
 
-			font_height = BLF_height(fontid, track->name);
+			font_height = BLF_height(fontid, channel->name);
 			BLF_position(fontid, v2d->cur.xmin + CHANNEL_PAD,
-			                     y - font_height / 2.0f, 0.0f);
-			BLF_draw(fontid, track->name, strlen(track->name));
+			             y - font_height / 2.0f, 0.0f);
+			BLF_draw(fontid, channel->name, strlen(channel->name));
 		}
 
 		/* adjust y-position for next one */
@@ -328,21 +337,15 @@ void clip_draw_dopesheet_channels(const bContext *C, ARegion *ar)
 		    IN_RANGE(ymaxc, v2d->cur.ymin, v2d->cur.ymax))
 		{
 			MovieTrackingTrack *track = channel->track;
-			uiBut *but;
+			const int icon = (track->flag & TRACK_LOCKED) ? ICON_LOCKED : ICON_UNLOCKED;
 			PointerRNA ptr;
-			int icon;
 
 			RNA_pointer_create(&clip->id, &RNA_MovieTrackingTrack, track, &ptr);
 
-			if (track->flag & TRACK_LOCKED)
-				icon = ICON_LOCKED;
-			else
-				icon = ICON_UNLOCKED;
-
 			uiBlockSetEmboss(block, UI_EMBOSSN);
-			but = uiDefIconButR(block, ICONTOG, 1, icon,
-				v2d->cur.xmax - UI_UNIT_X - CHANNEL_PAD, y - UI_UNIT_Y / 2.0f,
-				UI_UNIT_X, UI_UNIT_Y, &ptr, "lock", 0, 0, 0, 0, 0, NULL);
+			uiDefIconButR(block, ICONTOG, 1, icon,
+			              v2d->cur.xmax - UI_UNIT_X - CHANNEL_PAD, y - UI_UNIT_Y / 2.0f,
+			              UI_UNIT_X, UI_UNIT_Y, &ptr, "lock", 0, 0, 0, 0, 0, NULL);
 			uiBlockSetEmboss(block, UI_EMBOSS);
 		}
 
diff --git a/source/blender/editors/space_clip/clip_dopesheet_ops.c b/source/blender/editors/space_clip/clip_dopesheet_ops.c
index 0fd17523425..716994f7487 100644
--- a/source/blender/editors/space_clip/clip_dopesheet_ops.c
+++ b/source/blender/editors/space_clip/clip_dopesheet_ops.c
@@ -25,7 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/space_clip/clip_graph_ops.c
+/** \file blender/editors/space_clip/clip_dopesheet_ops.c
  *  \ingroup spclip
  */
 
@@ -59,6 +59,23 @@
 
 #include "clip_intern.h"	// own include
 
+#if 0
+static int ED_space_clip_dopesheet_poll(bContext *C)
+{
+	SpaceClip *sc = CTX_wm_space_clip(C);
+
+	if (sc && sc->clip) {
+		if (sc->view == SC_VIEW_DOPESHEET) {
+			ARegion *ar = CTX_wm_region(C);
+
+			return ar->regiontype == RGN_TYPE_PREVIEW;
+		}
+	}
+
+	return FALSE;
+}
+#endif
+
 /********************** select channel operator *********************/
 
 static int dopesheet_select_channel_poll(bContext *C)
@@ -76,8 +93,10 @@ static int dopesheet_select_channel_exec(bContext *C, wmOperator *op)
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
+	MovieTrackingObject *object = BKE_tracking_object_get_active(tracking);
 	MovieTrackingDopesheet *dopesheet = &tracking->dopesheet;
 	MovieTrackingDopesheetChannel *channel;
+	ListBase *tracksbase = BKE_tracking_object_get_tracks(tracking, object);
 	float location[2];
 	int extend = RNA_boolean_get(op->ptr, "extend");
 	int current_channel_index = 0, channel_index;
@@ -93,6 +112,11 @@ static int dopesheet_select_channel_exec(bContext *C, wmOperator *op)
 				track->flag ^= TRACK_DOPE_SEL;
 			else
 				track->flag |= TRACK_DOPE_SEL;
+
+			if (track->flag & TRACK_DOPE_SEL) {
+				tracking->act_track = track;
+				BKE_tracking_track_select(tracksbase, track, TRACK_AREA_ALL, TRUE);
+			}
 		}
 		else if (!extend)
 			track->flag &= ~TRACK_DOPE_SEL;
diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index c00359f0f32..1679f784e8c 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -32,13 +32,15 @@
 #include "DNA_gpencil_types.h"
 #include "DNA_movieclip_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_object_types.h"	/* SELECT */
+#include "DNA_object_types.h"  /* SELECT */
+#include "DNA_mask_types.h"
 
 #include "MEM_guardedalloc.h"
 
 #include "BKE_context.h"
 #include "BKE_movieclip.h"
 #include "BKE_tracking.h"
+#include "BKE_mask.h"
 
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
@@ -67,7 +69,7 @@
 
 #include "BLF_api.h"
 
-#include "clip_intern.h"	// own include
+#include "clip_intern.h"    // own include
 
 /*********************** main area drawing *************************/
 
@@ -96,8 +98,8 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
 	float x;
 	int *points, totseg, i, a;
 	float sfra = SFRA, efra = EFRA, framelen = ar->winx / (efra - sfra + 1);
-	MovieTrackingTrack *act_track = BKE_tracking_active_track(&clip->tracking);
-	MovieTrackingReconstruction *reconstruction = BKE_tracking_get_reconstruction(&clip->tracking);
+	MovieTrackingTrack *act_track = BKE_tracking_track_get_active(&clip->tracking);
+	MovieTrackingReconstruction *reconstruction = BKE_tracking_get_active_reconstruction(&clip->tracking);
 
 	glEnable(GL_BLEND);
 
@@ -124,7 +126,7 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
 	if (act_track) {
 		MovieTrackingTrack *track = act_track;
 
-		for (i = sfra, a = 0; i <= efra; i++) {
+		for (i = sfra - clip->start_frame + 1, a = 0; i <= efra - clip->start_frame + 1; i++) {
 			int framenr;
 			MovieTrackingMarker *marker;
 
@@ -153,7 +155,7 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
 				else
 					glColor4ub(255, 255, 0, 96);
 
-				glRecti((i - sfra) * framelen, 0, (i - sfra + 1)*framelen, 4);
+				glRecti((i - sfra + clip->start_frame - 1) * framelen, 0, (i - sfra + clip->start_frame) * framelen, 4);
 			}
 		}
 	}
@@ -181,7 +183,7 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
 			}
 
 			if (!ok)
-				glRecti((i - sfra) * framelen, 0, (i - sfra + 1) * framelen, 8);
+				glRecti((i - sfra + clip->start_frame - 1) * framelen, 0, (i - sfra + clip->start_frame) * framelen, 8);
 		}
 	}
 
@@ -194,6 +196,32 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
 	glRecti(x, 0, x + framelen, 8);
 
 	clip_draw_curfra_label(sc, x, 8.0f);
+
+	/* movie clip animation */
+	if ((sc->mode == SC_MODE_MASKEDIT) && sc->mask) {
+		MaskLayer *masklay = BKE_mask_layer_active(sc->mask);
+		if (masklay) {
+			MaskLayerShape *masklay_shape;
+
+			glColor4ub(255, 175, 0, 255);
+			glBegin(GL_LINES);
+
+			for (masklay_shape = masklay->splines_shapes.first;
+			     masklay_shape;
+			     masklay_shape = masklay_shape->next)
+			{
+				i = masklay_shape->frame;
+
+				/* glRecti((i - sfra) * framelen, 0, (i - sfra + 1) * framelen, 4); */
+
+				/* use a line so we always see the keyframes */
+				glVertex2i((i - sfra) * framelen, 0);
+				glVertex2i((i - sfra) * framelen, (i == CFRA) ? 22 : 10);
+			}
+
+			glEnd();
+		}
+	}
 }
 
 static void draw_movieclip_notes(SpaceClip *sc, ARegion *ar)
@@ -249,10 +277,10 @@ static void draw_movieclip_buffer(SpaceClip *sc, ARegion *ar, ImBuf *ibuf,
 					glScalef(zoomx, zoomy, 1.0f);
 
 					glBegin(GL_QUADS);
-						glTexCoord2f(0.0f, 0.0f); glVertex2f(0.0f,  0.0f);
-						glTexCoord2f(1.0f, 0.0f); glVertex2f(width, 0.0f);
-						glTexCoord2f(1.0f, 1.0f); glVertex2f(width, height);
-						glTexCoord2f(0.0f, 1.0f); glVertex2f(0.0f,  height);
+					glTexCoord2f(0.0f, 0.0f); glVertex2f(0.0f,  0.0f);
+					glTexCoord2f(1.0f, 0.0f); glVertex2f(width, 0.0f);
+					glTexCoord2f(1.0f, 1.0f); glVertex2f(width, height);
+					glTexCoord2f(0.0f, 1.0f); glVertex2f(0.0f,  height);
 					glEnd();
 
 					glPopMatrix();
@@ -292,10 +320,10 @@ static void draw_movieclip_buffer(SpaceClip *sc, ARegion *ar, ImBuf *ibuf,
 		glMultMatrixf(sc->stabmat);
 
 		glBegin(GL_LINE_LOOP);
-			glVertex2f(0.0f, 0.0f);
-			glVertex2f(width, 0.0f);
-			glVertex2f(width, height);
-			glVertex2f(0.0f, height);
+		glVertex2f(0.0f, 0.0f);
+		glVertex2f(width, 0.0f);
+		glVertex2f(width, height);
+		glVertex2f(0.0f, height);
 		glEnd();
 
 		glPopMatrix();
@@ -310,22 +338,22 @@ static void draw_track_path(SpaceClip *sc, MovieClip *UNUSED(clip), MovieTrackin
 	int count = sc->path_length;
 	int i, a, b, curindex = -1;
 	float path[102][2];
-	int tiny = sc->flag & SC_SHOW_TINY_MARKER, framenr;
+	int tiny = sc->flag & SC_SHOW_TINY_MARKER, framenr, start_frame;
 	MovieTrackingMarker *marker;
 
 	if (count == 0)
 		return;
 
-	marker = BKE_tracking_get_marker(track, sc->user.framenr);
-	if (marker->framenr != sc->user.framenr || marker->flag & MARKER_DISABLED)
-		return;
+	start_frame = framenr = ED_space_clip_clip_framenr(sc);
 
-	framenr = marker->framenr;
+	marker = BKE_tracking_marker_get(track, framenr);
+	if (marker->framenr != framenr || marker->flag & MARKER_DISABLED)
+		return;
 
 	a = count;
 	i = framenr - 1;
 	while (i >= framenr - count) {
-		marker = BKE_tracking_get_marker(track, i);
+		marker = BKE_tracking_marker_get(track, i);
 
 		if (!marker || marker->flag & MARKER_DISABLED)
 			break;
@@ -334,7 +362,7 @@ static void draw_track_path(SpaceClip *sc, MovieClip *UNUSED(clip), MovieTrackin
 			add_v2_v2v2(path[--a], marker->pos, track->offset);
 			ED_clip_point_undistorted_pos(sc, path[a], path[a]);
 
-			if (marker->framenr == sc->user.framenr)
+			if (marker->framenr == start_frame)
 				curindex = a;
 		}
 		else {
@@ -347,13 +375,13 @@ static void draw_track_path(SpaceClip *sc, MovieClip *UNUSED(clip), MovieTrackin
 	b = count;
 	i = framenr;
 	while (i <= framenr + count) {
-		marker = BKE_tracking_get_marker(track, i);
+		marker = BKE_tracking_marker_get(track, i);
 
 		if (!marker || marker->flag & MARKER_DISABLED)
 			break;
 
 		if (marker->framenr == i) {
-			if (marker->framenr == sc->user.framenr)
+			if (marker->framenr == start_frame)
 				curindex = b;
 
 			add_v2_v2v2(path[b++], marker->pos, track->offset);
@@ -371,17 +399,17 @@ static void draw_track_path(SpaceClip *sc, MovieClip *UNUSED(clip), MovieTrackin
 		if (TRACK_VIEW_SELECTED(sc, track)) {
 			glPointSize(5.0f);
 			glBegin(GL_POINTS);
-				for (i = a; i < b; i++) {
-					if (i != curindex)
-						glVertex2f(path[i][0], path[i][1]);
-				}
+			for (i = a; i < b; i++) {
+				if (i != curindex)
+					glVertex2f(path[i][0], path[i][1]);
+			}
 			glEnd();
 		}
 
 		glLineWidth(3.0f);
 		glBegin(GL_LINE_STRIP);
-			for (i = a; i < b; i++)
-				glVertex2f(path[i][0], path[i][1]);
+		for (i = a; i < b; i++)
+			glVertex2f(path[i][0], path[i][1]);
 		glEnd();
 		glLineWidth(1.0f);
 	}
@@ -391,25 +419,25 @@ static void draw_track_path(SpaceClip *sc, MovieClip *UNUSED(clip), MovieTrackin
 	if (TRACK_VIEW_SELECTED(sc, track)) {
 		glPointSize(3.0f);
 		glBegin(GL_POINTS);
-			for (i = a; i < b; i++) {
-				if (i == count + 1)
-					UI_ThemeColor(TH_PATH_AFTER);
+		for (i = a; i < b; i++) {
+			if (i == count + 1)
+				UI_ThemeColor(TH_PATH_AFTER);
 
-				if (i != curindex)
-					glVertex2f(path[i][0], path[i][1]);
-			}
+			if (i != curindex)
+				glVertex2f(path[i][0], path[i][1]);
+		}
 		glEnd();
 	}
 
 	UI_ThemeColor(TH_PATH_BEFORE);
 
 	glBegin(GL_LINE_STRIP);
-		for (i = a; i < b; i++) {
-			if (i == count + 1)
-				UI_ThemeColor(TH_PATH_AFTER);
+	for (i = a; i < b; i++) {
+		if (i == count + 1)
+			UI_ThemeColor(TH_PATH_AFTER);
 
-			glVertex2f(path[i][0], path[i][1]);
-		}
+		glVertex2f(path[i][0], path[i][1]);
+	}
 	glEnd();
 	glPointSize(1.0f);
 }
@@ -428,35 +456,38 @@ static void draw_marker_outline(SpaceClip *sc, MovieTrackingTrack *track, MovieT
 
 	if ((marker->flag & MARKER_DISABLED) == 0) {
 		float pos[2];
-		rctf r;
+		float p[2];
 
-		BLI_init_rctf(&r, track->pat_min[0], track->pat_max[0], track->pat_min[1], track->pat_max[1]);
 		add_v2_v2v2(pos, marker->pos, track->offset);
 
 		ED_clip_point_undistorted_pos(sc, pos, pos);
 
-		if (BLI_in_rctf(&r, pos[0] - marker_pos[0], pos[1] - marker_pos[1])) {
+		sub_v2_v2v2(p, pos, marker_pos);
+
+		if (isect_point_quad_v2(p, marker->pattern_corners[0], marker->pattern_corners[1],
+		                        marker->pattern_corners[2], marker->pattern_corners[3]))
+		{
 			if (tiny) glPointSize(3.0f);
 			else glPointSize(4.0f);
 			glBegin(GL_POINTS);
-				glVertex2f(pos[0], pos[1]);
+			glVertex2f(pos[0], pos[1]);
 			glEnd();
 			glPointSize(1.0f);
 		}
 		else {
 			if (!tiny) glLineWidth(3.0f);
 			glBegin(GL_LINES);
-				glVertex2f(pos[0] + px[0]*2, pos[1]);
-				glVertex2f(pos[0] + px[0]*8, pos[1]);
+			glVertex2f(pos[0] + px[0] * 2, pos[1]);
+			glVertex2f(pos[0] + px[0] * 8, pos[1]);
 
-				glVertex2f(pos[0] - px[0]*2, pos[1]);
-				glVertex2f(pos[0] - px[0]*8, pos[1]);
+			glVertex2f(pos[0] - px[0] * 2, pos[1]);
+			glVertex2f(pos[0] - px[0] * 8, pos[1]);
 
-				glVertex2f(pos[0], pos[1] - px[1]*2);
-				glVertex2f(pos[0], pos[1] - px[1]*8);
+			glVertex2f(pos[0], pos[1] - px[1] * 2);
+			glVertex2f(pos[0], pos[1] - px[1] * 8);
 
-				glVertex2f(pos[0], pos[1] + px[1]*2);
-				glVertex2f(pos[0], pos[1] + px[1]*8);
+			glVertex2f(pos[0], pos[1] + px[1] * 2);
+			glVertex2f(pos[0], pos[1] + px[1] * 8);
 			glEnd();
 			if (!tiny) glLineWidth(1.0f);
 		}
@@ -471,10 +502,10 @@ static void draw_marker_outline(SpaceClip *sc, MovieTrackingTrack *track, MovieT
 
 	if (sc->flag & SC_SHOW_MARKER_PATTERN) {
 		glBegin(GL_LINE_LOOP);
-			glVertex2f(track->pat_min[0], track->pat_min[1]);
-			glVertex2f(track->pat_max[0], track->pat_min[1]);
-			glVertex2f(track->pat_max[0], track->pat_max[1]);
-			glVertex2f(track->pat_min[0], track->pat_max[1]);
+		glVertex2fv(marker->pattern_corners[0]);
+		glVertex2fv(marker->pattern_corners[1]);
+		glVertex2fv(marker->pattern_corners[2]);
+		glVertex2fv(marker->pattern_corners[3]);
 		glEnd();
 	}
 
@@ -482,10 +513,10 @@ static void draw_marker_outline(SpaceClip *sc, MovieTrackingTrack *track, MovieT
 	              ((marker->flag & MARKER_DISABLED) == 0 || (sc->flag & SC_SHOW_MARKER_PATTERN) == 0);
 	if (sc->flag & SC_SHOW_MARKER_SEARCH && show_search) {
 		glBegin(GL_LINE_LOOP);
-			glVertex2f(track->search_min[0], track->search_min[1]);
-			glVertex2f(track->search_max[0], track->search_min[1]);
-			glVertex2f(track->search_max[0], track->search_max[1]);
-			glVertex2f(track->search_min[0], track->search_max[1]);
+		glVertex2f(marker->search_min[0], marker->search_min[1]);
+		glVertex2f(marker->search_max[0], marker->search_min[1]);
+		glVertex2f(marker->search_max[0], marker->search_max[1]);
+		glVertex2f(marker->search_min[0], marker->search_max[1]);
 		glEnd();
 	}
 	glPopMatrix();
@@ -515,7 +546,7 @@ static void track_colors(MovieTrackingTrack *track, int act, float col[3], float
 }
 
 static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTrackingMarker *marker,
-                             float marker_pos[2], int width, int height, int act, int sel)
+                              float marker_pos[2], int width, int height, int act, int sel)
 {
 	int tiny = sc->flag & SC_SHOW_TINY_MARKER;
 	int show_search = 0;
@@ -528,8 +559,7 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
 
 	/* marker position and offset position */
 	if ((track->flag & SELECT) == sel && (marker->flag & MARKER_DISABLED) == 0) {
-		float pos[2];
-		rctf r;
+		float pos[2], p[2];
 
 		if (track->flag & TRACK_LOCKED) {
 			if (act)
@@ -546,16 +576,19 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
 				glColor3fv(col);
 		}
 
-		BLI_init_rctf(&r, track->pat_min[0], track->pat_max[0], track->pat_min[1], track->pat_max[1]);
 		add_v2_v2v2(pos, marker->pos, track->offset);
 		ED_clip_point_undistorted_pos(sc, pos, pos);
 
-		if (BLI_in_rctf(&r, pos[0] - marker_pos[0], pos[1] - marker_pos[1])) {
+		sub_v2_v2v2(p, pos, marker_pos);
+
+		if (isect_point_quad_v2(p, marker->pattern_corners[0], marker->pattern_corners[1],
+		                        marker->pattern_corners[2], marker->pattern_corners[3]))
+		{
 			if (!tiny)
 				glPointSize(2.0f);
 
 			glBegin(GL_POINTS);
-				glVertex2f(pos[0], pos[1]);
+			glVertex2f(pos[0], pos[1]);
 			glEnd();
 
 			if (!tiny)
@@ -563,17 +596,17 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
 		}
 		else {
 			glBegin(GL_LINES);
-				glVertex2f(pos[0] + px[0]*3, pos[1]);
-				glVertex2f(pos[0] + px[0]*7, pos[1]);
+			glVertex2f(pos[0] + px[0] * 3, pos[1]);
+			glVertex2f(pos[0] + px[0] * 7, pos[1]);
 
-				glVertex2f(pos[0] - px[0]*3, pos[1]);
-				glVertex2f(pos[0] - px[0]*7, pos[1]);
+			glVertex2f(pos[0] - px[0] * 3, pos[1]);
+			glVertex2f(pos[0] - px[0] * 7, pos[1]);
 
-				glVertex2f(pos[0], pos[1] - px[1]*3);
-				glVertex2f(pos[0], pos[1] - px[1]*7);
+			glVertex2f(pos[0], pos[1] - px[1] * 3);
+			glVertex2f(pos[0], pos[1] - px[1] * 7);
 
-				glVertex2f(pos[0], pos[1] + px[1]*3);
-				glVertex2f(pos[0], pos[1] + px[1]*7);
+			glVertex2f(pos[0], pos[1] + px[1] * 3);
+			glVertex2f(pos[0], pos[1] + px[1] * 7);
 			glEnd();
 
 			glColor3f(0.0f, 0.0f, 0.0f);
@@ -583,8 +616,8 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
 			glLogicOp(GL_NOR);
 
 			glBegin(GL_LINES);
-				glVertex2fv(pos);
-				glVertex2fv(marker_pos);
+			glVertex2fv(pos);
+			glVertex2fv(marker_pos);
 			glEnd();
 
 			glDisable(GL_COLOR_LOGIC_OP);
@@ -623,16 +656,16 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
 		}
 
 		glBegin(GL_LINE_LOOP);
-			glVertex2f(track->pat_min[0], track->pat_min[1]);
-			glVertex2f(track->pat_max[0], track->pat_min[1]);
-			glVertex2f(track->pat_max[0], track->pat_max[1]);
-			glVertex2f(track->pat_min[0], track->pat_max[1]);
+		glVertex2fv(marker->pattern_corners[0]);
+		glVertex2fv(marker->pattern_corners[1]);
+		glVertex2fv(marker->pattern_corners[2]);
+		glVertex2fv(marker->pattern_corners[3]);
 		glEnd();
 	}
 
 	/* search */
 	show_search = TRACK_VIEW_SELECTED(sc, track) &&
-	             ((marker->flag & MARKER_DISABLED) == 0 || (sc->flag & SC_SHOW_MARKER_PATTERN) == 0);
+	              ((marker->flag & MARKER_DISABLED) == 0 || (sc->flag & SC_SHOW_MARKER_PATTERN) == 0);
 	if ((track->search_flag & SELECT) == sel && (sc->flag & SC_SHOW_MARKER_SEARCH) && show_search) {
 		if (track->flag & TRACK_LOCKED) {
 			if (act)
@@ -656,70 +689,82 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
 		}
 
 		glBegin(GL_LINE_LOOP);
-			glVertex2f(track->search_min[0], track->search_min[1]);
-			glVertex2f(track->search_max[0], track->search_min[1]);
-			glVertex2f(track->search_max[0], track->search_max[1]);
-			glVertex2f(track->search_min[0], track->search_max[1]);
+		glVertex2f(marker->search_min[0], marker->search_min[1]);
+		glVertex2f(marker->search_max[0], marker->search_min[1]);
+		glVertex2f(marker->search_max[0], marker->search_max[1]);
+		glVertex2f(marker->search_min[0], marker->search_max[1]);
 		glEnd();
 	}
 
-	/* pyramid */
-	if (sel && TRACK_VIEW_SELECTED(sc, track) &&
-	    (track->tracker == TRACKER_KLT) &&
-		(marker->flag & MARKER_DISABLED) == 0)
-	{
-		if (track->flag & TRACK_LOCKED) {
-			if (act)
-				UI_ThemeColor(TH_ACT_MARKER);
-			else if (track->pat_flag & SELECT)
-				UI_ThemeColorShade(TH_LOCK_MARKER, 64);
-			else UI_ThemeColor(TH_LOCK_MARKER);
-		}
-		else if (marker->flag & MARKER_DISABLED) {
-			if (act)
-				UI_ThemeColor(TH_ACT_MARKER);
-			else if (track->pat_flag & SELECT)
-				UI_ThemeColorShade(TH_DIS_MARKER, 128);
-			else UI_ThemeColor(TH_DIS_MARKER);
-		}
-		else {
-			if (track->pat_flag & SELECT)
-				glColor3fv(scol);
-			else
-				glColor3fv(col);
-		}
-
-		{
-			int i = 0;
-			glPushMatrix();
-			glEnable(GL_LINE_STIPPLE);
-			for (i = 1; i < track->pyramid_levels; ++i) {
-				glScalef(2.0f, 2.0f, 1.0);
-			}
-			/* only draw a pattern for the coarsest level */
-			glBegin(GL_LINE_LOOP);
-				glVertex2f(track->pat_min[0], track->pat_min[1]);
-				glVertex2f(track->pat_max[0], track->pat_min[1]);
-				glVertex2f(track->pat_max[0], track->pat_max[1]);
-				glVertex2f(track->pat_min[0], track->pat_max[1]);
-			glEnd();
-			glDisable(GL_LINE_STIPPLE);
-			glPopMatrix();
-		}
-	}
-
 	if (tiny)
 		glDisable(GL_LINE_STIPPLE);
 
 	glPopMatrix();
 }
 
+static float get_shortest_pattern_side(MovieTrackingMarker *marker)
+{
+	int i, next;
+	float len = FLT_MAX;
+
+	for (i = 0; i < 4; i++) {
+		float cur_len;
+
+		next = (i + 1) % 4;
+
+		cur_len = len_v2v2(marker->pattern_corners[i], marker->pattern_corners[next]);
+
+		len = MIN2(cur_len, len);
+	}
+
+	return len;
+}
+
+static void draw_marker_slide_square(float x, float y, float dx, float dy, int outline, float px[2])
+{
+	float tdx, tdy;
+
+	tdx = dx;
+	tdy = dy;
+
+	if (outline) {
+		tdx += px[0];
+		tdy += px[1];
+	}
+
+	glBegin(GL_QUADS);
+	glVertex3f(x - tdx, y + tdy, 0.0f);
+	glVertex3f(x + tdx, y + tdy, 0.0f);
+	glVertex3f(x + tdx, y - tdy, 0.0f);
+	glVertex3f(x - tdx, y - tdy, 0.0f);
+	glEnd();
+}
+
+static void draw_marker_slide_triangle(float x, float y, float dx, float dy, int outline, float px[2])
+{
+	float tdx, tdy;
+
+	tdx = dx * 2.0f;
+	tdy = dy * 2.0f;
+
+	if (outline) {
+		tdx += px[0];
+		tdy += px[1];
+	}
+
+	glBegin(GL_TRIANGLES);
+	glVertex3f(x,       y,       0.0f);
+	glVertex3f(x - tdx, y,       0.0f);
+	glVertex3f(x,       y + tdy, 0.0f);
+	glEnd();
+}
+
 static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, MovieTrackingMarker *marker,
                                     float marker_pos[2], int outline, int sel, int act, int width, int height)
 {
-	float x, y, dx, dy, patdx, patdy, searchdx, searchdy, tdx, tdy;
+	float dx, dy, patdx, patdy, searchdx, searchdy;
 	int tiny = sc->flag & SC_SHOW_TINY_MARKER;
-	float col[3], scol[3], px[2];
+	float col[3], scol[3], px[2], side;
 
 	if ((tiny && outline) || (marker->flag & MARKER_DISABLED))
 		return;
@@ -740,11 +785,12 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo
 	dx = 6.0f / width / sc->zoom;
 	dy = 6.0f / height / sc->zoom;
 
-	patdx = MIN2(dx * 2.0f / 3.0f, (track->pat_max[0] - track->pat_min[0]) / 6.0f);
-	patdy = MIN2(dy * 2.0f / 3.0f, (track->pat_max[1] - track->pat_min[1]) / 6.0f);
+	side = get_shortest_pattern_side(marker);
+	patdx = MIN2(dx * 2.0f / 3.0f, side / 6.0f);
+	patdy = MIN2(dy * 2.0f / 3.0f, side * width / height / 6.0f);
 
-	searchdx = MIN2(dx, (track->search_max[0] - track->search_min[0]) / 6.0f);
-	searchdy = MIN2(dy, (track->search_max[1] - track->search_min[1]) / 6.0f);
+	searchdx = MIN2(dx, (marker->search_max[0] - marker->search_min[0]) / 6.0f);
+	searchdy = MIN2(dy, (marker->search_max[1] - marker->search_min[1]) / 6.0f);
 
 	px[0] = 1.0f / sc->zoom / width / sc->scale;
 	px[1] = 1.0f / sc->zoom / height / sc->scale;
@@ -758,44 +804,18 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo
 		}
 
 		/* search offset square */
-		x = track->search_min[0];
-		y = track->search_max[1];
-
-		tdx = searchdx;
-		tdy = searchdy;
-
-		if (outline) {
-			tdx += px[0];
-			tdy += px[1];
-		}
-
-		glBegin(GL_QUADS);
-			glVertex3f(x - tdx, y + tdy, 0);
-			glVertex3f(x + tdx, y + tdy, 0);
-			glVertex3f(x + tdx, y - tdy, 0);
-			glVertex3f(x - tdx, y - tdy, 0);
-		glEnd();
+		draw_marker_slide_square(marker->search_min[0], marker->search_max[1], searchdx, searchdy, outline, px);
 
 		/* search re-sizing triangle */
-		x = track->search_max[0];
-		y = track->search_min[1];
-
-		tdx = searchdx * 2.0f;
-		tdy = searchdy * 2.0f;
-
-		if (outline) {
-			tdx += px[0];
-			tdy += px[1];
-		}
-
-		glBegin(GL_TRIANGLES);
-			glVertex3f(x, y, 0);
-			glVertex3f(x - tdx, y, 0);
-			glVertex3f(x, y + tdy, 0);
-		glEnd();
+		draw_marker_slide_triangle(marker->search_max[0], marker->search_min[1], searchdx, searchdy, outline, px);
 	}
 
 	if ((sc->flag & SC_SHOW_MARKER_PATTERN) && ((track->pat_flag & SELECT) == sel || outline)) {
+		int i;
+		float pat_min[2], pat_max[2];
+		float dx = 12.0f / width, dy = 12.0f / height;
+		float tilt_ctrl[2];
+
 		if (!outline) {
 			if (track->pat_flag & SELECT)
 				glColor3fv(scol);
@@ -803,42 +823,42 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo
 				glColor3fv(col);
 		}
 
-		/* pattern offset square */
-		x = track->pat_min[0];
-		y = track->pat_max[1];
+		/* pattern's corners sliding squares */
+		for (i = 0; i < 4; i++) {
+			draw_marker_slide_square(marker->pattern_corners[i][0], marker->pattern_corners[i][1],
+			                         patdx / 1.5f, patdy / 1.5f, outline, px);
+		}
 
-		tdx = patdx;
-		tdy = patdy;
+		/* ** sliders to control overall pattern  ** */
+		add_v2_v2v2(tilt_ctrl, marker->pattern_corners[1], marker->pattern_corners[2]);
 
-		if (outline) {
-			tdx += px[0];
-			tdy += px[1];
-		}
+		BKE_tracking_marker_pattern_minmax(marker, pat_min, pat_max);
+
+		glEnable(GL_LINE_STIPPLE);
+		glLineStipple(3, 0xaaaa);
 
-		glBegin(GL_QUADS);
-			glVertex3f(x - tdx, y + tdy, 0);
-			glVertex3f(x + tdx, y + tdy, 0);
-			glVertex3f(x + tdx, y - tdy, 0);
-			glVertex3f(x - tdx, y - tdy, 0);
+		glBegin(GL_LINE_LOOP);
+		glVertex2f(pat_min[0] - dx, pat_min[1] - dy);
+		glVertex2f(pat_max[0] + dx, pat_min[1] - dy);
+		glVertex2f(pat_max[0] + dx, pat_max[1] + dy);
+		glVertex2f(pat_min[0] - dx, pat_max[1] + dy);
 		glEnd();
 
-		/* pattern re-sizing triangle */
-		x = track->pat_max[0];
-		y = track->pat_min[1];
+		glBegin(GL_LINES);
+		glVertex2f(0.0f, 0.0f);
+		glVertex2fv(tilt_ctrl);
+		glEnd();
 
-		tdx = patdx*2.0f;
-		tdy = patdy*2.0f;
+		glDisable(GL_LINE_STIPPLE);
 
-		if (outline) {
-			tdx += px[0];
-			tdy += px[1];
-		}
+		/* marker's offset slider */
+		draw_marker_slide_square(pat_min[0] - dx, pat_max[1] + dy, patdx, patdy, outline, px);
 
-		glBegin(GL_TRIANGLES);
-			glVertex3f(x, y, 0);
-			glVertex3f(x - tdx, y, 0);
-			glVertex3f(x, y + tdy, 0);
-		glEnd();
+		/* pattern re-sizing triangle */
+		draw_marker_slide_triangle(pat_max[0] + dx, pat_min[1] - dy, patdx, patdy, outline, px);
+
+		/* slider to control pattern tilt */
+		draw_marker_slide_square(tilt_ctrl[0], tilt_ctrl[1], patdx, patdy, outline, px);
 	}
 
 	glPopMatrix();
@@ -875,14 +895,17 @@ static void draw_marker_texts(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
 	}
 
 	if ((sc->flag & SC_SHOW_MARKER_SEARCH) &&
-	   ((marker->flag & MARKER_DISABLED) == 0 || (sc->flag & SC_SHOW_MARKER_PATTERN) == 0))
+	    ((marker->flag & MARKER_DISABLED) == 0 || (sc->flag & SC_SHOW_MARKER_PATTERN) == 0))
 	{
-		dx = track->search_min[0];
-		dy = track->search_min[1];
+		dx = marker->search_min[0];
+		dy = marker->search_min[1];
 	}
 	else if (sc->flag & SC_SHOW_MARKER_PATTERN) {
-		dx = track->pat_min[0];
-		dy = track->pat_min[1];
+		float pat_min[2], pat_max[2];
+
+		BKE_tracking_marker_pattern_minmax(marker, pat_min, pat_max);
+		dx = pat_min[0];
+		dy = pat_min[1];
 	}
 
 	pos[0] = (marker_pos[0] + dx) * width;
@@ -891,12 +914,12 @@ static void draw_marker_texts(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
 
 	mul_m4_v3(sc->stabmat, pos);
 
-	pos[0] = pos[0]*zoomx;
-	pos[1] = pos[1]*zoomy - fontsize;
+	pos[0] = pos[0] * zoomx;
+	pos[1] = pos[1] * zoomy - fontsize;
 
 	if (marker->flag & MARKER_DISABLED)
 		strcpy(state, "disabled");
-	else if (marker->framenr != sc->user.framenr)
+	else if (marker->framenr != ED_space_clip_clip_framenr(sc))
 		strcpy(state, "estimated");
 	else if (marker->flag & MARKER_TRACKED)
 		strcpy(state, "tracked");
@@ -932,8 +955,8 @@ static void view2d_to_region_float(View2D *v2d, float x, float y, float *regionx
 	y = -v2d->cur.ymin / (v2d->cur.ymax - v2d->cur.ymin);
 
 	/* convert proportional distances to screen coordinates */
-	*regionx = v2d->mask.xmin + x*(v2d->mask.xmax - v2d->mask.xmin);
-	*regiony = v2d->mask.ymin + y*(v2d->mask.ymax - v2d->mask.ymin);
+	*regionx = v2d->mask.xmin + x * (v2d->mask.xmax - v2d->mask.xmin);
+	*regiony = v2d->mask.ymin + y * (v2d->mask.ymax - v2d->mask.ymin);
 }
 
 static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
@@ -941,10 +964,10 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 {
 	float x, y;
 	MovieTracking *tracking = &clip->tracking;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
 	MovieTrackingTrack *track, *act_track;
 	MovieTrackingMarker *marker;
-	int framenr = sc->user.framenr;
+	int framenr = ED_space_clip_clip_framenr(sc);
 	int undistort = sc->user.render_flag & MCLIP_PROXY_RENDER_UNDISTORT;
 	float *marker_pos = NULL, *fp, *active_pos = NULL, cur_pos[2];
 
@@ -965,7 +988,7 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 	glMultMatrixf(sc->stabmat);
 	glScalef(width, height, 0);
 
-	act_track = BKE_tracking_active_track(tracking);
+	act_track = BKE_tracking_track_get_active(tracking);
 
 	if (sc->user.render_flag & MCLIP_PROXY_RENDER_UNDISTORT) {
 		int count = 0;
@@ -974,7 +997,7 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 		track = tracksbase->first;
 		while (track) {
 			if ((track->flag & TRACK_HIDDEN) == 0) {
-				marker = BKE_tracking_get_marker(track, framenr);
+				marker = BKE_tracking_marker_get(track, framenr);
 
 				if (MARKER_VISIBLE(sc, track, marker))
 					count++;
@@ -985,13 +1008,13 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 
 		/* undistort */
 		if (count) {
-			marker_pos = MEM_callocN(2*sizeof(float)*count, "draw_tracking_tracks marker_pos");
+			marker_pos = MEM_callocN(2 * sizeof(float) * count, "draw_tracking_tracks marker_pos");
 
 			track = tracksbase->first;
 			fp = marker_pos;
 			while (track) {
 				if ((track->flag & TRACK_HIDDEN) == 0) {
-					marker = BKE_tracking_get_marker(track, framenr);
+					marker = BKE_tracking_marker_get(track, framenr);
 
 					if (MARKER_VISIBLE(sc, track, marker)) {
 						ED_clip_point_undistorted_pos(sc, marker->pos, fp);
@@ -1023,7 +1046,7 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 	fp = marker_pos;
 	while (track) {
 		if ((track->flag & TRACK_HIDDEN) == 0) {
-			marker = BKE_tracking_get_marker(track, framenr);
+			marker = BKE_tracking_marker_get(track, framenr);
 
 			if (MARKER_VISIBLE(sc, track, marker)) {
 				copy_v2_v2(cur_pos, fp ? fp : marker->pos);
@@ -1048,7 +1071,7 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 	while (track) {
 		if ((track->flag & TRACK_HIDDEN) == 0) {
 			int act = track == act_track;
-			marker = BKE_tracking_get_marker(track, framenr);
+			marker = BKE_tracking_marker_get(track, framenr);
 
 			if (MARKER_VISIBLE(sc, track, marker)) {
 				if (!act) {
@@ -1069,7 +1092,7 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 	/* active marker would be displayed on top of everything else */
 	if (act_track) {
 		if ((act_track->flag & TRACK_HIDDEN) == 0) {
-			marker = BKE_tracking_get_marker(act_track, framenr);
+			marker = BKE_tracking_marker_get(act_track, framenr);
 
 			if (MARKER_VISIBLE(sc, act_track, marker)) {
 				copy_v2_v2(cur_pos, active_pos ? active_pos : marker->pos);
@@ -1081,19 +1104,19 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 	}
 
 	if (sc->flag & SC_SHOW_BUNDLES) {
-		MovieTrackingObject *object = BKE_tracking_active_object(tracking);
+		MovieTrackingObject *object = BKE_tracking_object_get_active(tracking);
 		float pos[4], vec[4], mat[4][4], aspy;
 
 		glEnable(GL_POINT_SMOOTH);
 		glPointSize(3.0f);
 
 		aspy = 1.0f / clip->tracking.camera.pixel_aspect;
-		BKE_tracking_projection_matrix(tracking, object, framenr, width, height, mat);
+		BKE_tracking_get_projection_matrix(tracking, object, framenr, width, height, mat);
 
 		track = tracksbase->first;
 		while (track) {
 			if ((track->flag & TRACK_HIDDEN) == 0 && track->flag & TRACK_HAS_BUNDLE) {
-				marker = BKE_tracking_get_marker(track, framenr);
+				marker = BKE_tracking_marker_get(track, framenr);
 
 				if (MARKER_VISIBLE(sc, track, marker)) {
 					float npos[2];
@@ -1105,7 +1128,7 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 					pos[0] = (pos[0] / (pos[3] * 2.0f) + 0.5f) * width;
 					pos[1] = (pos[1] / (pos[3] * 2.0f) + 0.5f) * height * aspy;
 
-					BKE_tracking_apply_intrinsics(tracking, pos, npos);
+					BKE_tracking_distort_v2(tracking, pos, npos);
 
 					if (npos[0] >= 0.0f && npos[1] >= 0.0f && npos[0] <= width && npos[1] <= height * aspy) {
 						vec[0] = (marker->pos[0] + track->offset[0]) * width;
@@ -1119,10 +1142,10 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 							glColor3f(1.0f, 0.0f, 0.0f);
 
 						glBegin(GL_POINTS);
-							if (undistort)
-								glVertex3f(pos[0] / width, pos[1] / (height * aspy), 0);
-							else
-								glVertex3f(npos[0] / width, npos[1] / (height * aspy), 0);
+						if (undistort)
+							glVertex3f(pos[0] / width, pos[1] / (height * aspy), 0);
+						else
+							glVertex3f(npos[0] / width, npos[1] / (height * aspy), 0);
 						glEnd();
 					}
 				}
@@ -1143,7 +1166,7 @@ static void draw_tracking_tracks(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 		fp = marker_pos;
 		while (track) {
 			if ((track->flag & TRACK_HIDDEN) == 0) {
-				marker = BKE_tracking_get_marker(track, framenr);
+				marker = BKE_tracking_marker_get(track, framenr);
 
 				if (MARKER_VISIBLE(sc, track, marker)) {
 					int act = track == act_track;
@@ -1175,8 +1198,10 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 	int i, j, a;
 	float pos[2], tpos[2], grid[11][11][2];
 	MovieTracking *tracking = &clip->tracking;
+	bGPdata *gpd = NULL;
 	float aspy = 1.0f / tracking->camera.pixel_aspect;
 	float dx = (float)width / n, dy = (float)height / n * aspy;
+	float offsx = 0.0f, offsy = 0.0f;
 
 	if (sc->mode != SC_MODE_DISTORTION)
 		return;
@@ -1211,7 +1236,7 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 		for (i = 0; i <= n; i++) {
 			for (j = 0; j <= n; j++) {
 				if (i == 0 || j == 0 || i == n || j == n) {
-					BKE_tracking_apply_intrinsics(tracking, pos, tpos);
+					BKE_tracking_distort_v2(tracking, pos, tpos);
 
 					for (a = 0; a < 4; a++) {
 						int ok;
@@ -1242,7 +1267,7 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 			pos[0] = idx[a][0] * dx;
 			pos[1] = idx[a][1] * dy;
 
-			BKE_tracking_invert_intrinsics(tracking, pos, tpos);
+			BKE_tracking_undistort_v2(tracking, pos, tpos);
 
 			DO_MINMAX2(tpos, min, max);
 		}
@@ -1253,10 +1278,10 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 
 		for (i = 0; i <= n; i++) {
 			for (j = 0; j <= n; j++) {
-				BKE_tracking_apply_intrinsics(tracking, pos, grid[i][j]);
+				BKE_tracking_distort_v2(tracking, pos, grid[i][j]);
 
 				grid[i][j][0] /= width;
-				grid[i][j][1] /= height*aspy;
+				grid[i][j][1] /= height * aspy;
 
 				pos[0] += dx;
 			}
@@ -1269,23 +1294,41 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 
 		for (i = 0; i <= n; i++) {
 			glBegin(GL_LINE_STRIP);
-				for (j = 0; j <= n; j++) {
-					glVertex2fv(grid[i][j]);
-				}
+			for (j = 0; j <= n; j++) {
+				glVertex2fv(grid[i][j]);
+			}
 			glEnd();
 		}
 
 		for (j = 0; j <= n; j++) {
 			glBegin(GL_LINE_STRIP);
-				for (i = 0; i <= n; i++) {
-					glVertex2fv(grid[i][j]);
-				}
+			for (i = 0; i <= n; i++) {
+				glVertex2fv(grid[i][j]);
+			}
 			glEnd();
 		}
 	}
 
-	if (sc->flag & SC_MANUAL_CALIBRATION && clip->gpd) {
-		bGPDlayer *layer = clip->gpd->layers.first;
+	if (sc->gpencil_src == SC_GPENCIL_SRC_TRACK) {
+		MovieTrackingTrack *track = BKE_tracking_track_get_active(&sc->clip->tracking);
+
+		if (track) {
+			int framenr = sc->user.framenr;
+			MovieTrackingMarker *marker = BKE_tracking_marker_get_exact(track, framenr);
+
+			offsx = marker->pos[0];
+			offsy = marker->pos[1];
+
+			gpd = track->gpd;
+		}
+
+	}
+	else {
+		gpd = clip->gpd;
+	}
+
+	if (sc->flag & SC_MANUAL_CALIBRATION && gpd) {
+		bGPDlayer *layer = gpd->layers.first;
 
 		while (layer) {
 			bGPDframe *frame = layer->frames.first;
@@ -1306,40 +1349,40 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 					if (stroke->flag & GP_STROKE_2DSPACE) {
 						if (stroke->totpoints > 1) {
 							glBegin(GL_LINE_STRIP);
-								for (i = 0; i < stroke->totpoints - 1; i++) {
-									float npos[2], dpos[2], len;
-									int steps;
+							for (i = 0; i < stroke->totpoints - 1; i++) {
+								float npos[2], dpos[2], len;
+								int steps;
 
-									pos[0] = stroke->points[i].x * width;
-									pos[1] = stroke->points[i].y * height * aspy;
+								pos[0] = (stroke->points[i].x + offsx) * width;
+								pos[1] = (stroke->points[i].y + offsy) * height * aspy;
 
-									npos[0] = stroke->points[i + 1].x * width;
-									npos[1] = stroke->points[i + 1].y * height * aspy;
+								npos[0] = (stroke->points[i + 1].x + offsx) * width;
+								npos[1] = (stroke->points[i + 1].y + offsy) * height * aspy;
 
-									len = len_v2v2(pos, npos);
-									steps = ceil(len / 5.0f);
+								len = len_v2v2(pos, npos);
+								steps = ceil(len / 5.0f);
 
-									/* we want to distort only long straight lines */
-									if (stroke->totpoints == 2) {
-										BKE_tracking_invert_intrinsics(tracking, pos, pos);
-										BKE_tracking_invert_intrinsics(tracking, npos, npos);
-									}
+								/* we want to distort only long straight lines */
+								if (stroke->totpoints == 2) {
+									BKE_tracking_undistort_v2(tracking, pos, pos);
+									BKE_tracking_undistort_v2(tracking, npos, npos);
+								}
 
-									sub_v2_v2v2(dpos, npos, pos);
-									mul_v2_fl(dpos, 1.0f / steps);
+								sub_v2_v2v2(dpos, npos, pos);
+								mul_v2_fl(dpos, 1.0f / steps);
 
-									for (j = 0; j <= steps; j++) {
-										BKE_tracking_apply_intrinsics(tracking, pos, tpos);
-										glVertex2f(tpos[0] / width, tpos[1] / (height*aspy));
+								for (j = 0; j <= steps; j++) {
+									BKE_tracking_distort_v2(tracking, pos, tpos);
+									glVertex2f(tpos[0] / width, tpos[1] / (height * aspy));
 
-										add_v2_v2(pos, dpos);
-									}
+									add_v2_v2(pos, dpos);
 								}
+							}
 							glEnd();
 						}
 						else if (stroke->totpoints == 1) {
 							glBegin(GL_POINTS);
-								glVertex2f(stroke->points[0].x, stroke->points[0].y);
+							glVertex2f(stroke->points[0].x + offsx, stroke->points[0].y + offsy);
 							glEnd();
 						}
 					}
@@ -1388,7 +1431,7 @@ void clip_draw_main(SpaceClip *sc, ARegion *ar, Scene *scene)
 			else
 				copy_v2_v2(loc, sc->loc);
 
-			BKE_tracking_stabdata_to_mat4(width, height, aspect, loc, sc->scale, sc->angle, sc->stabmat);
+			BKE_tracking_stabilization_data_to_mat4(width, height, aspect, loc, sc->scale, sc->angle, sc->stabmat);
 
 			unit_m4(smat);
 			smat[0][0] = 1.0f / width;
@@ -1429,7 +1472,6 @@ void clip_draw_grease_pencil(bContext *C, int onlyv2d)
 {
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
-	ImBuf *ibuf;
 
 	if (!clip)
 		return;
@@ -1438,16 +1480,25 @@ void clip_draw_grease_pencil(bContext *C, int onlyv2d)
 		/* if manual calibration is used then grease pencil data is already
 		 * drawed in draw_distortion */
 		if ((sc->flag & SC_MANUAL_CALIBRATION) == 0 || sc->mode != SC_MODE_DISTORTION) {
-			ibuf = ED_space_clip_get_buffer(sc);
+			glPushMatrix();
+			glMultMatrixf(sc->unistabmat);
 
-			if (ibuf) {
-				glPushMatrix();
-				glMultMatrixf(sc->unistabmat);
-				draw_gpencil_2dimage(C, ibuf);
+			if (sc->gpencil_src == SC_GPENCIL_SRC_TRACK) {
+				MovieTrackingTrack *track = BKE_tracking_track_get_active(&sc->clip->tracking);
 
-				IMB_freeImBuf(ibuf);
-				glPopMatrix();
+				if (track) {
+					int framenr = sc->user.framenr;
+					/* don't get the exact marker since it may not exist for the frame */
+					MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
+					if (marker) {
+						glTranslatef(marker->pos[0], marker->pos[1], 0.0f);
+					}
+				}
 			}
+
+			draw_gpencil_2dimage(C);
+
+			glPopMatrix();
 		}
 	}
 	else {
diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c
index a477a7435fd..0bad9f86ea1 100644
--- a/source/blender/editors/space_clip/clip_editor.c
+++ b/source/blender/editors/space_clip/clip_editor.c
@@ -34,10 +34,12 @@
 #include "MEM_guardedalloc.h"
 
 #include "BKE_main.h"
+#include "BKE_mask.h"
 #include "BKE_movieclip.h"
 #include "BKE_context.h"
 #include "BKE_tracking.h"
 
+#include "DNA_mask_types.h"
 #include "DNA_object_types.h"	/* SELECT */
 
 #include "BLI_utildefines.h"
@@ -94,33 +96,26 @@ int ED_space_clip_tracking_poll(bContext *C)
 	return FALSE;
 }
 
-int ED_space_clip_tracking_size_poll(bContext *C)
+int ED_space_clip_maskedit_poll(bContext *C)
 {
-	if (ED_space_clip_tracking_poll(C)) {
-		MovieClip *clip = CTX_data_edit_movieclip(C);
-
-		if (clip) {
-			SpaceClip *sc = CTX_wm_space_clip(C);
-			int width, height;
-
-			BKE_movieclip_get_size(clip, &sc->user, &width, &height);
+	SpaceClip *sc = CTX_wm_space_clip(C);
 
-			return width > 0 && height > 0;
-		}
+	if (sc && sc->clip) {
+		return ED_space_clip_show_maskedit(sc);
 	}
 
 	return FALSE;
 }
 
-int ED_space_clip_tracking_frame_poll(bContext *C)
+int ED_space_clip_maskedit_mask_poll(bContext *C)
 {
-	if (ED_space_clip_tracking_poll(C)) {
+	if (ED_space_clip_maskedit_poll(C)) {
 		MovieClip *clip = CTX_data_edit_movieclip(C);
 
 		if (clip) {
 			SpaceClip *sc = CTX_wm_space_clip(C);
 
-			return BKE_movieclip_has_frame(clip, &sc->user);
+			return sc->mask != NULL;
 		}
 	}
 
@@ -170,6 +165,11 @@ MovieClip *ED_space_clip(SpaceClip *sc)
 	return sc->clip;
 }
 
+Mask *ED_space_clip_mask(SpaceClip *sc)
+{
+	return sc->mask;
+}
+
 ImBuf *ED_space_clip_get_buffer(SpaceClip *sc)
 {
 	if (sc->clip) {
@@ -214,6 +214,51 @@ void ED_space_clip_size(SpaceClip *sc, int *width, int *height)
 	}
 }
 
+void ED_space_clip_mask_size(SpaceClip *sc, int *width, int *height)
+{
+	/* quite the same as ED_space_clip_size, but it also runs aspect correction on output resolution
+	 * this is needed because mask should be rasterized with exactly the same resolution as
+	 * currently displaying frame and it doesn't have access to aspect correction currently
+	 * used for display. (sergey)
+	 */
+
+	if (!sc->mask) {
+		*width = 0;
+		*height = 0;
+	} else {
+		float aspx, aspy;
+
+		ED_space_clip_size(sc, width, height);
+		ED_space_clip_aspect(sc, &aspx, &aspy);
+
+		*width *= aspx;
+		*height *= aspy;
+	}
+}
+
+void ED_space_clip_mask_aspect(SpaceClip *sc, float *aspx, float *aspy)
+{
+	int w, h;
+
+	ED_space_clip_aspect(sc, aspx, aspy);
+	ED_space_clip_size(sc, &w, &h);
+
+	/* now this is not accounted for! */
+#if 0
+	*aspx *= (float)w;
+	*aspy *= (float)h;
+#endif
+
+	if (*aspx < *aspy) {
+		*aspy = *aspy / *aspx;
+		*aspx = 1.0f;
+	}
+	else {
+		*aspx = *aspx / *aspy;
+		*aspy = 1.0f;
+	}
+}
+
 void ED_space_clip_zoom(SpaceClip *sc, ARegion *ar, float *zoomx, float *zoomy)
 {
 	int width, height;
@@ -234,6 +279,33 @@ void ED_space_clip_aspect(SpaceClip *sc, float *aspx, float *aspy)
 		*aspx = *aspy = 1.0f;
 }
 
+void ED_space_clip_aspect_dimension_aware(SpaceClip *sc, float *aspx, float *aspy)
+{
+	int w, h;
+
+	/* most of tools does not require aspect to be returned with dimensions correction
+	 * due to they're invariant to this stuff, but some transformation tools like rotation
+	 * should be aware of aspect correction caused by different resolution in different
+	 * directions.
+	 * mainly this is sued for transformation stuff
+	 */
+
+	ED_space_clip_aspect(sc, aspx, aspy);
+	ED_space_clip_size(sc, &w, &h);
+
+	*aspx *= (float)w;
+	*aspy *= (float)h;
+
+	if (*aspx < *aspy) {
+		*aspy = *aspy / *aspx;
+		*aspx = 1.0f;
+	}
+	else {
+		*aspx = *aspx / *aspy;
+		*aspy = 1.0f;
+	}
+}
+
 void ED_clip_update_frame(const Main *mainp, int cfra)
 {
 	wmWindowManager *wm;
@@ -257,12 +329,20 @@ void ED_clip_update_frame(const Main *mainp, int cfra)
 	}
 }
 
+/* return current frame number in clip space */
+int ED_space_clip_clip_framenr(SpaceClip *sc)
+{
+	MovieClip *clip = ED_space_clip(sc);
+
+	return BKE_movieclip_remap_scene_to_clip_frame(clip, sc->user.framenr);
+}
+
 static int selected_boundbox(SpaceClip *sc, float min[2], float max[2])
 {
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTrackingTrack *track;
 	int width, height, ok = FALSE;
-	ListBase *tracksbase = BKE_tracking_get_tracks(&clip->tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(&clip->tracking);
 
 	INIT_MINMAX2(min, max);
 
@@ -271,7 +351,7 @@ static int selected_boundbox(SpaceClip *sc, float min[2], float max[2])
 	track = tracksbase->first;
 	while (track) {
 		if (TRACK_VIEW_SELECTED(sc, track)) {
-			MovieTrackingMarker *marker = BKE_tracking_get_marker(track, sc->user.framenr);
+			MovieTrackingMarker *marker = BKE_tracking_marker_get(track, sc->user.framenr);
 
 			if (marker) {
 				float pos[3];
@@ -345,9 +425,9 @@ int ED_clip_view_selection(SpaceClip *sc, ARegion *ar, int fit)
 	return TRUE;
 }
 
-void ED_clip_point_undistorted_pos(SpaceClip *sc, float co[2], float nco[2])
+void ED_clip_point_undistorted_pos(SpaceClip *sc, const float co[2], float r_co[2])
 {
-	copy_v2_v2(nco, co);
+	copy_v2_v2(r_co, co);
 
 	if (sc->user.render_flag & MCLIP_PROXY_RENDER_UNDISTORT) {
 		MovieClip *clip = ED_space_clip(sc);
@@ -356,13 +436,13 @@ void ED_clip_point_undistorted_pos(SpaceClip *sc, float co[2], float nco[2])
 
 		ED_space_clip_size(sc, &width, &height);
 
-		nco[0] *= width;
-		nco[1] *= height * aspy;
+		r_co[0] *= width;
+		r_co[1] *= height * aspy;
 
-		BKE_tracking_invert_intrinsics(&clip->tracking, nco, nco);
+		BKE_tracking_undistort_v2(&clip->tracking, r_co, r_co);
 
-		nco[0] /= width;
-		nco[1] /= height * aspy;
+		r_co[0] /= width;
+		r_co[1] /= height * aspy;
 	}
 }
 
@@ -371,7 +451,7 @@ void ED_clip_point_stable_pos(bContext *C, float x, float y, float *xr, float *y
 	ARegion *ar = CTX_wm_region(C);
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	int sx, sy, width, height;
-	float zoomx, zoomy, pos[3] = {0.0f, 0.0f, 0.0f}, imat[4][4];
+	float zoomx, zoomy, pos[3], imat[4][4];
 
 	ED_space_clip_zoom(sc, ar, &zoomx, &zoomy);
 	ED_space_clip_size(sc, &width, &height);
@@ -380,6 +460,7 @@ void ED_clip_point_stable_pos(bContext *C, float x, float y, float *xr, float *y
 
 	pos[0] = (x - sx) / zoomx;
 	pos[1] = (y - sy) / zoomy;
+	pos[2] = 0.0f;
 
 	invert_m4_m4(imat, sc->stabmat);
 	mul_v3_m4v3(pos, imat, pos);
@@ -393,7 +474,7 @@ void ED_clip_point_stable_pos(bContext *C, float x, float y, float *xr, float *y
 		float aspy = 1.0f / tracking->camera.pixel_aspect;
 		float tmp[2] = {*xr * width, *yr * height * aspy};
 
-		BKE_tracking_apply_intrinsics(tracking, tmp, tmp);
+		BKE_tracking_distort_v2(tracking, tmp, tmp);
 
 		*xr = tmp[0] / width;
 		*yr = tmp[1] / (height * aspy);
@@ -404,7 +485,7 @@ void ED_clip_point_stable_pos(bContext *C, float x, float y, float *xr, float *y
  * \brief the reverse of ED_clip_point_stable_pos(), gets the marker region coords.
  * better name here? view_to_track / track_to_view or so?
  */
-void ED_clip_point_stable_pos__reverse(SpaceClip *sc, ARegion *ar, float co[2], float nco[2])
+void ED_clip_point_stable_pos__reverse(SpaceClip *sc, ARegion *ar, const float co[2], float r_co[2])
 {
 	float zoomx, zoomy;
 	float pos[3];
@@ -416,12 +497,13 @@ void ED_clip_point_stable_pos__reverse(SpaceClip *sc, ARegion *ar, float co[2],
 	ED_space_clip_zoom(sc, ar, &zoomx, &zoomy);
 
 	ED_clip_point_undistorted_pos(sc, co, pos);
+	pos[2] = 0.0f;
 
 	/* untested */
 	mul_v3_m4v3(pos, sc->stabmat, pos);
 
-	nco[0] = (pos[0] * width  * zoomx) + (float)sx;
-	nco[1] = (pos[1] * height * zoomy) + (float)sy;
+	r_co[0] = (pos[0] * width  * zoomx) + (float)sx;
+	r_co[1] = (pos[1] * height * zoomy) + (float)sy;
 }
 
 void ED_clip_mouse_pos(bContext *C, wmEvent *event, float co[2])
@@ -439,7 +521,10 @@ typedef struct SpaceClipDrawContext {
 	struct ImBuf *texture_ibuf;	/* image buffer for which texture was created */
 	int image_width, image_height;	/* image width and height for which texture was created */
 	unsigned last_texture;		/* ID of previously used texture, so it'll be restored after clip drawing */
-	int framenr;
+
+	/* fields to check if cache is still valid */
+	int framenr, start_frame, frame_offset;
+	short render_size, render_flag;
 } SpaceClipDrawContext;
 
 int ED_space_clip_texture_buffer_supported(SpaceClip *sc)
@@ -477,6 +562,10 @@ int ED_space_clip_load_movieclip_buffer(SpaceClip *sc, ImBuf *ibuf)
 	 * so not changed image buffer pointer means unchanged image content */
 	need_rebind |= context->texture_ibuf != ibuf;
 	need_rebind |= context->framenr != sc->user.framenr;
+	need_rebind |= context->render_size != sc->user.render_size;
+	need_rebind |= context->render_flag != sc->user.render_flag;
+	need_rebind |= context->start_frame != clip->start_frame;
+	need_rebind |= context->frame_offset != clip->frame_offset;
 
 	if (need_rebind) {
 		int width = ibuf->x, height = ibuf->y;
@@ -531,6 +620,10 @@ int ED_space_clip_load_movieclip_buffer(SpaceClip *sc, ImBuf *ibuf)
 		context->image_width = ibuf->x;
 		context->image_height = ibuf->y;
 		context->framenr = sc->user.framenr;
+		context->render_size = sc->user.render_size;
+		context->render_flag = sc->user.render_flag;
+		context->start_frame = clip->start_frame;
+		context->frame_offset = clip->frame_offset;
 	}
 	else {
 		/* displaying exactly the same image which was loaded t oa texture,
@@ -562,6 +655,8 @@ void ED_space_clip_free_texture_buffer(SpaceClip *sc)
 	}
 }
 
+/* ******** masking editing related functions ******** */
+
 int ED_space_clip_show_trackedit(SpaceClip *sc)
 {
 	if (sc) {
@@ -570,3 +665,25 @@ int ED_space_clip_show_trackedit(SpaceClip *sc)
 
 	return FALSE;
 }
+
+int ED_space_clip_show_maskedit(SpaceClip *sc)
+{
+	if (sc) {
+		return sc->mode == SC_MODE_MASKEDIT;
+	}
+
+	return FALSE;
+}
+
+void ED_space_clip_set_mask(bContext *C, SpaceClip *sc, Mask *mask)
+{
+	sc->mask = mask;
+
+	if (sc->mask && sc->mask->id.us == 0) {
+		sc->clip->id.us = 1;
+	}
+
+	if (C) {
+		WM_event_add_notifier(C, NC_MASK | NA_SELECTED, mask);
+	}
+}
diff --git a/source/blender/editors/space_clip/clip_graph_draw.c b/source/blender/editors/space_clip/clip_graph_draw.c
index 853a7d7cad1..323594ea469 100644
--- a/source/blender/editors/space_clip/clip_graph_draw.c
+++ b/source/blender/editors/space_clip/clip_graph_draw.c
@@ -31,7 +31,7 @@
 
 #include "DNA_movieclip_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_object_types.h"	/* SELECT */
+#include "DNA_object_types.h"   /* SELECT */
 
 #include "MEM_guardedalloc.h"
 
@@ -57,7 +57,7 @@
 
 #include "BLF_api.h"
 
-#include "clip_intern.h"	// own include
+#include "clip_intern.h"    // own include
 
 static void draw_curve_knot(float x, float y, float xscale, float yscale, float hsize)
 {
@@ -88,9 +88,10 @@ static void draw_curve_knot(float x, float y, float xscale, float yscale, float
 }
 
 static void tracking_segment_point_cb(void *UNUSED(userdata), MovieTrackingTrack *UNUSED(track),
-			MovieTrackingMarker *marker, int UNUSED(coord), float val)
+                                      MovieTrackingMarker *UNUSED(marker), int UNUSED(coord),
+                                      int scene_framenr, float val)
 {
-	glVertex2f(marker->framenr, val);
+	glVertex2f(scene_framenr, val);
 }
 
 void tracking_segment_start_cb(void *userdata, MovieTrackingTrack *track, int coord)
@@ -123,7 +124,7 @@ void tracking_segment_end_cb(void *UNUSED(userdata))
 }
 
 static void tracking_segment_knot_cb(void *userdata, MovieTrackingTrack *track,
-			MovieTrackingMarker *marker, int coord, float val)
+                                     MovieTrackingMarker *marker, int coord, int scene_framenr, float val)
 {
 	struct { MovieTrackingTrack *act_track; int sel; float xscale, yscale, hsize; } *data = userdata;
 	int sel = 0, sel_flag;
@@ -140,7 +141,7 @@ static void tracking_segment_knot_cb(void *userdata, MovieTrackingTrack *track,
 		else
 			UI_ThemeColor(TH_HANDLE_VERTEX);
 
-		draw_curve_knot(marker->framenr, val, data->xscale, data->yscale, data->hsize);
+		draw_curve_knot(scene_framenr, val, data->xscale, data->yscale, data->hsize);
 	}
 }
 
@@ -148,7 +149,7 @@ static void draw_tracks_curves(View2D *v2d, SpaceClip *sc)
 {
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	MovieTrackingTrack *act_track = BKE_tracking_active_track(tracking);
+	MovieTrackingTrack *act_track = BKE_tracking_track_get_active(tracking);
 	int width, height;
 	struct { MovieTrackingTrack *act_track; int sel; float xscale, yscale, hsize; } userdata;
 
@@ -162,30 +163,34 @@ static void draw_tracks_curves(View2D *v2d, SpaceClip *sc)
 	userdata.sel = FALSE;
 	userdata.act_track = act_track;
 	UI_view2d_getscale(v2d, &userdata.xscale, &userdata.yscale);
-	clip_graph_tracking_values_iterate(sc, &userdata, tracking_segment_knot_cb, NULL, NULL);
+	clip_graph_tracking_values_iterate(sc, sc->flag & SC_SHOW_GRAPH_SEL_ONLY, sc->flag & SC_SHOW_GRAPH_HIDDEN,
+	                                   &userdata, tracking_segment_knot_cb, NULL, NULL);
 
 	/* draw graph lines */
 	glEnable(GL_BLEND);
-	clip_graph_tracking_values_iterate(sc, act_track, tracking_segment_point_cb,
-                                       tracking_segment_start_cb, tracking_segment_end_cb);
+	clip_graph_tracking_values_iterate(sc, sc->flag & SC_SHOW_GRAPH_SEL_ONLY, sc->flag & SC_SHOW_GRAPH_HIDDEN,
+	                                   act_track, tracking_segment_point_cb, tracking_segment_start_cb,
+	                                   tracking_segment_end_cb);
 	glDisable(GL_BLEND);
 
 	/* selected knot handles on top of curves */
 	userdata.sel = TRUE;
-	clip_graph_tracking_values_iterate(sc, &userdata, tracking_segment_knot_cb, NULL, NULL);
+	clip_graph_tracking_values_iterate(sc, sc->flag & SC_SHOW_GRAPH_SEL_ONLY, sc->flag & SC_SHOW_GRAPH_HIDDEN,
+	                                   &userdata, tracking_segment_knot_cb, NULL, NULL);
 }
 
 static void draw_frame_curves(SpaceClip *sc)
 {
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	MovieTrackingReconstruction *reconstruction = BKE_tracking_get_reconstruction(tracking);
+	MovieTrackingReconstruction *reconstruction = BKE_tracking_get_active_reconstruction(tracking);
 	int i, lines = 0, prevfra = 0;
 
 	glColor3f(0.0f, 0.0f, 1.0f);
 
 	for (i = 0; i < reconstruction->camnr; i++) {
 		MovieReconstructedCamera *camera = &reconstruction->cameras[i];
+		int framenr;
 
 		if (lines && camera->framenr != prevfra + 1) {
 			glEnd();
@@ -197,7 +202,8 @@ static void draw_frame_curves(SpaceClip *sc)
 			lines = 1;
 		}
 
-		glVertex2f(camera->framenr, camera->error);
+		framenr = BKE_movieclip_remap_clip_to_scene_frame(clip, camera->framenr);
+		glVertex2f(framenr, camera->error);
 
 		prevfra = camera->framenr;
 	}
diff --git a/source/blender/editors/space_clip/clip_graph_ops.c b/source/blender/editors/space_clip/clip_graph_ops.c
index 10692ada5d9..b7687eba717 100644
--- a/source/blender/editors/space_clip/clip_graph_ops.c
+++ b/source/blender/editors/space_clip/clip_graph_ops.c
@@ -29,7 +29,7 @@
  *  \ingroup spclip
  */
 
-#include "DNA_object_types.h"	/* SELECT */
+#include "DNA_object_types.h"  /* SELECT */
 #include "DNA_scene_types.h"
 
 #include "MEM_guardedalloc.h"
@@ -57,7 +57,7 @@
 
 #include "UI_view2d.h"
 
-#include "clip_intern.h"	// own include
+#include "clip_intern.h"    // own include
 
 /******************** common graph-editing utilities ********************/
 
@@ -96,23 +96,24 @@ static void toggle_selection_cb(void *userdata, MovieTrackingMarker *marker)
 /******************** mouse select operator ********************/
 
 typedef struct {
-	int coord, 		/* coordinate index of found entuty (0 = X-axis, 1 = Y-axis) */
-	    has_prev;		/* if there's valid coordinate of previous point of curve segment */
+	int coord,          /* coordinate index of found entuty (0 = X-axis, 1 = Y-axis) */
+	    has_prev;       /* if there's valid coordinate of previous point of curve segment */
 
-	float min_dist,		/* minimal distance between mouse and currently found entuty */
-	      mouse_co[2],	/* mouse coordinate */
-	      prev_co[2],	/* coordinate of previeous point of segment */
-	      min_co[2];	/* coordinate of entity with minimal distance */
+	float min_dist,     /* minimal distance between mouse and currently found entuty */
+	      mouse_co[2],  /* mouse coordinate */
+	      prev_co[2],   /* coordinate of previeous point of segment */
+	      min_co[2];    /* coordinate of entity with minimal distance */
 
-	MovieTrackingTrack *track;	/* nearest found track */
-	MovieTrackingMarker *marker;	/* nearest found marker */
+	MovieTrackingTrack *track;      /* nearest found track */
+	MovieTrackingMarker *marker;    /* nearest found marker */
 } MouseSelectUserData;
 
 static void find_nearest_tracking_segment_cb(void *userdata, MovieTrackingTrack *track,
-                                             MovieTrackingMarker *marker, int coord, float val)
+                                             MovieTrackingMarker *UNUSED(marker),
+                                             int coord, int scene_framenr, float val)
 {
 	MouseSelectUserData *data = userdata;
-	float co[2] = {marker->framenr, val};
+	float co[2] = {scene_framenr, val};
 
 	if (data->has_prev) {
 		float d = dist_to_line_segment_v2(data->mouse_co, data->prev_co, co);
@@ -137,14 +138,14 @@ void find_nearest_tracking_segment_end_cb(void *userdata)
 }
 
 static void find_nearest_tracking_knot_cb(void *userdata, MovieTrackingTrack *track,
-                                          MovieTrackingMarker *marker, int coord, float val)
+                                          MovieTrackingMarker *marker, int coord, int scene_framenr, float val)
 {
 	MouseSelectUserData *data = userdata;
-	float dx = marker->framenr - data->mouse_co[0], dy = val - data->mouse_co[1];
+	float dx = scene_framenr - data->mouse_co[0], dy = val - data->mouse_co[1];
 	float d = dx * dx + dy * dy;
 
 	if (data->marker == NULL || d < data->min_dist) {
-		float co[2] = {marker->framenr, val};
+		float co[2] = {scene_framenr, val};
 
 		data->track = track;
 		data->marker = marker;
@@ -169,7 +170,7 @@ static int mouse_select_knot(bContext *C, float co[2], int extend)
 	ARegion *ar = CTX_wm_region(C);
 	View2D *v2d = &ar->v2d;
 	MovieTracking *tracking = &clip->tracking;
-	MovieTrackingTrack *act_track = BKE_tracking_active_track(tracking);
+	MovieTrackingTrack *act_track = BKE_tracking_track_get_active(tracking);
 	static const int delta = 6;
 
 	if (act_track) {
@@ -189,7 +190,9 @@ static int mouse_select_knot(bContext *C, float co[2], int extend)
 				if (!extend) {
 					SelectUserData selectdata = {SEL_DESELECT};
 
-					clip_graph_tracking_iterate(sc, &selectdata, toggle_selection_cb);
+					clip_graph_tracking_iterate(sc, sc->flag & SC_SHOW_GRAPH_SEL_ONLY,
+					                            sc->flag & SC_SHOW_GRAPH_HIDDEN, &selectdata,
+					                            toggle_selection_cb);
 				}
 
 				if (userdata.coord == 0)
@@ -210,11 +213,12 @@ static int mouse_select_curve(bContext *C, float co[2], int extend)
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	MovieTrackingTrack *act_track = BKE_tracking_active_track(tracking);
+	MovieTrackingTrack *act_track = BKE_tracking_track_get_active(tracking);
 	MouseSelectUserData userdata;
 
 	mouse_select_init_data(&userdata, co);
-	clip_graph_tracking_values_iterate(sc, &userdata, find_nearest_tracking_segment_cb,
+	clip_graph_tracking_values_iterate(sc, sc->flag & SC_SHOW_GRAPH_SEL_ONLY, sc->flag & SC_SHOW_GRAPH_HIDDEN,
+	                                   &userdata, find_nearest_tracking_segment_cb,
 	                                   NULL, find_nearest_tracking_segment_end_cb);
 
 	if (userdata.track) {
@@ -226,11 +230,16 @@ static int mouse_select_curve(bContext *C, float co[2], int extend)
 		}
 		else if (act_track != userdata.track) {
 			SelectUserData selectdata = {SEL_DESELECT};
+			MovieTrackingObject *object = BKE_tracking_object_get_active(tracking);
+			ListBase *tracksbase = BKE_tracking_object_get_tracks(tracking, object);
 
 			tracking->act_track = userdata.track;
+			BKE_tracking_track_select(tracksbase, userdata.track, TRACK_AREA_ALL, TRUE);
 
 			/* deselect all knots on newly selected curve */
-			clip_graph_tracking_iterate(sc, &selectdata, toggle_selection_cb);
+			clip_graph_tracking_iterate(sc, sc->flag & SC_SHOW_GRAPH_SEL_ONLY,
+			                            sc->flag & SC_SHOW_GRAPH_HIDDEN, &selectdata,
+			                            toggle_selection_cb);
 		}
 
 		return TRUE;
@@ -260,7 +269,7 @@ static int mouse_select(bContext *C, float co[2], int extend)
 static int select_exec(bContext *C, wmOperator *op)
 {
 	float co[2];
-	int  extend = RNA_boolean_get(op->ptr, "extend");
+	int extend = RNA_boolean_get(op->ptr, "extend");
 
 	RNA_float_get_array(op->ptr, "location", co);
 
@@ -295,9 +304,9 @@ void CLIP_OT_graph_select(wmOperatorType *ot)
 
 	/* properties */
 	RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX,
-		"Location", "Mouse location to select nearest entity", -100.0f, 100.0f);
+	                     "Location", "Mouse location to select nearest entity", -100.0f, 100.0f);
 	RNA_def_boolean(ot->srna, "extend", 0,
-		"Extend", "Extend selection rather than clearing the existing selection");
+	                "Extend", "Extend selection rather than clearing the existing selection");
 }
 
 /********************** border select operator *********************/
@@ -308,11 +317,11 @@ typedef struct BorderSelectuserData {
 } BorderSelectuserData;
 
 static void border_select_cb(void *userdata, MovieTrackingTrack *UNUSED(track),
-                             MovieTrackingMarker *marker, int coord, float val)
+                             MovieTrackingMarker *marker, int coord, int scene_framenr, float val)
 {
 	BorderSelectuserData *data = (BorderSelectuserData *) userdata;
 
-	if (BLI_in_rctf(&data->rect, marker->framenr, val)) {
+	if (BLI_in_rctf(&data->rect, scene_framenr, val)) {
 		int flag = 0;
 
 		if (coord == 0)
@@ -338,7 +347,7 @@ static int border_select_graph_exec(bContext *C, wmOperator *op)
 	ARegion *ar = CTX_wm_region(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	MovieTrackingTrack *act_track = BKE_tracking_active_track(tracking);
+	MovieTrackingTrack *act_track = BKE_tracking_track_get_active(tracking);
 	BorderSelectuserData userdata;
 	rcti rect;
 
@@ -393,7 +402,7 @@ static int graph_select_all_markers_exec(bContext *C, wmOperator *op)
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	MovieTrackingTrack *act_track = BKE_tracking_active_track(tracking);
+	MovieTrackingTrack *act_track = BKE_tracking_track_get_active(tracking);
 	MovieTrackingMarker *marker;
 	int action = RNA_enum_get(op->ptr, "action");
 	int a;
@@ -459,8 +468,8 @@ static int delete_curve_exec(bContext *C, wmOperator *UNUSED(op))
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
-	MovieTrackingTrack *act_track = BKE_tracking_active_track(tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
+	MovieTrackingTrack *act_track = BKE_tracking_track_get_active(tracking);
 
 	if (act_track)
 		clip_delete_track(C, clip, tracksbase, act_track);
@@ -491,8 +500,8 @@ static int delete_knot_exec(bContext *C, wmOperator *UNUSED(op))
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
-	MovieTrackingTrack *act_track = BKE_tracking_active_track(tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
+	MovieTrackingTrack *act_track = BKE_tracking_track_get_active(tracking);
 
 	if (act_track) {
 		int a = 0;
@@ -532,7 +541,7 @@ typedef struct {
 } ViewAllUserData;
 
 static void view_all_cb(void *userdata, MovieTrackingTrack *UNUSED(track), MovieTrackingMarker *UNUSED(marker),
-                        int UNUSED(coord), float val)
+                        int UNUSED(coord), int UNUSED(scene_framenr), float val)
 {
 	ViewAllUserData *data = (ViewAllUserData *) userdata;
 
@@ -555,7 +564,9 @@ static int view_all_exec(bContext *C, wmOperator *UNUSED(op))
 	userdata.max = -FLT_MAX;
 	userdata.min = FLT_MAX;
 
-	clip_graph_tracking_values_iterate(sc, &userdata, view_all_cb, NULL, NULL);
+	clip_graph_tracking_values_iterate(sc, sc->flag & SC_SHOW_GRAPH_SEL_ONLY,
+	                                   sc->flag & SC_SHOW_GRAPH_HIDDEN, &userdata,
+	                                   view_all_cb, NULL, NULL);
 
 	/* set extents of view to start/end frames */
 	v2d->cur.xmin = (float) SFRA;
@@ -639,7 +650,7 @@ static int graph_disable_markers_exec(bContext *C, wmOperator *op)
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	MovieTrackingTrack *act_track = BKE_tracking_active_track(tracking);
+	MovieTrackingTrack *act_track = BKE_tracking_track_get_active(tracking);
 	MovieTrackingMarker *marker;
 	int action = RNA_enum_get(op->ptr, "action");
 	int a;
@@ -670,10 +681,10 @@ static int graph_disable_markers_exec(bContext *C, wmOperator *op)
 void CLIP_OT_graph_disable_markers(wmOperatorType *ot)
 {
 	static EnumPropertyItem actions_items[] = {
-			{0, "DISABLE", 0, "Disable", "Disable selected markers"},
-			{1, "ENABLE", 0, "Enable", "Enable selected markers"},
-			{2, "TOGGLE", 0, "Toggle", "Toggle disabled flag for selected markers"},
-			{0, NULL, 0, NULL, NULL}
+		{0, "DISABLE", 0, "Disable", "Disable selected markers"},
+		{1, "ENABLE", 0, "Enable", "Enable selected markers"},
+		{2, "TOGGLE", 0, "Toggle", "Toggle disabled flag for selected markers"},
+		{0, NULL, 0, NULL, NULL}
 	};
 
 	/* identifiers */
diff --git a/source/blender/editors/space_clip/clip_intern.h b/source/blender/editors/space_clip/clip_intern.h
index 00105fb8561..5bc195a1ae2 100644
--- a/source/blender/editors/space_clip/clip_intern.h
+++ b/source/blender/editors/space_clip/clip_intern.h
@@ -43,18 +43,18 @@ struct SpaceClip;
 struct wmOperatorType;
 
 /* channel heights */
-#define CHANNEL_FIRST			-UI_UNIT_Y
-#define CHANNEL_HEIGHT			UI_UNIT_Y
-#define CHANNEL_HEIGHT_HALF		(UI_UNIT_Y / 2.0f)
-#define CHANNEL_SKIP			2
-#define CHANNEL_STEP			(CHANNEL_HEIGHT + CHANNEL_SKIP)
+#define CHANNEL_FIRST           -UI_UNIT_Y
+#define CHANNEL_HEIGHT          UI_UNIT_Y
+#define CHANNEL_HEIGHT_HALF     (UI_UNIT_Y / 2.0f)
+#define CHANNEL_SKIP            2
+#define CHANNEL_STEP            (CHANNEL_HEIGHT + CHANNEL_SKIP)
 
-#define CHANNEL_PAD				4
+#define CHANNEL_PAD             4
 
 /* extra padding for lengths (to go under scrollers) */
-#define EXTRA_SCROLL_PAD		100.0f
+#define EXTRA_SCROLL_PAD        100.0f
 
-#define STRIP_HEIGHT_HALF		5
+#define STRIP_HEIGHT_HALF       5
 
 /* internal exports only */
 
@@ -110,17 +110,17 @@ void ED_clip_tool_props_register(struct ARegionType *art);
 
 /* clip_utils.c */
 void clip_graph_tracking_values_iterate_track(struct SpaceClip *sc, struct MovieTrackingTrack *track, void *userdata,
-			void (*func) (void *userdata, struct MovieTrackingTrack *track, struct MovieTrackingMarker *marker, int coord, float val),
-			void (*segment_start) (void *userdata, struct MovieTrackingTrack *track, int coord),
-			void (*segment_end) (void *userdata));
+                                              void (*func)(void *userdata, struct MovieTrackingTrack *track, struct MovieTrackingMarker *marker, int coord, int scene_framenr, float val),
+                                              void (*segment_start)(void *userdata, struct MovieTrackingTrack *track, int coord),
+                                              void (*segment_end)(void *userdata));
 
-void clip_graph_tracking_values_iterate(struct SpaceClip *sc, void *userdata,
-			void (*func) (void *userdata, struct MovieTrackingTrack *track, struct MovieTrackingMarker *marker, int coord, float val),
-			void (*segment_start) (void *userdata, struct MovieTrackingTrack *track, int coord),
-			void (*segment_end) (void *userdata));
+void clip_graph_tracking_values_iterate(struct SpaceClip *sc, int selected_only, int include_hidden, void *userdata,
+                                        void (*func)(void *userdata, struct MovieTrackingTrack *track, struct MovieTrackingMarker *marker, int coord, int scene_framenr, float val),
+                                        void (*segment_start)(void *userdata, struct MovieTrackingTrack *track, int coord),
+                                        void (*segment_end)(void *userdata));
 
-void clip_graph_tracking_iterate(struct SpaceClip *sc, void *userdata,
-                                 void (*func) (void *userdata, struct MovieTrackingMarker *marker));
+void clip_graph_tracking_iterate(struct SpaceClip *sc, int selected_only, int include_hidden, void *userdata,
+                                 void (*func)(void *userdata, struct MovieTrackingMarker *marker));
 
 void clip_delete_track(struct bContext *C, struct MovieClip *clip, struct ListBase *tracksbase, struct MovieTrackingTrack *track);
 void clip_delete_marker(struct bContext *C, struct MovieClip *clip, struct ListBase *tracksbase, struct MovieTrackingTrack *track, struct MovieTrackingMarker *marker);
@@ -131,12 +131,8 @@ void clip_draw_cfra(struct SpaceClip *sc, struct ARegion *ar, struct Scene *scen
 void clip_draw_sfra_efra(struct View2D *v2d, struct Scene *scene);
 
 /* tracking_ops.c */
-void CLIP_OT_select(struct wmOperatorType *ot);
-void CLIP_OT_select_all(struct wmOperatorType *ot);
-void CLIP_OT_select_border(struct wmOperatorType *ot);
-void CLIP_OT_select_lasso(struct wmOperatorType *ot);
-void CLIP_OT_select_circle(struct wmOperatorType *ot);
-void CLIP_OT_select_grouped(struct wmOperatorType *ot);
+struct MovieTrackingTrack *tracking_marker_check_slide(struct bContext *C, struct wmEvent *event,
+                                                       int *area_r, int *action_r, int *corner_r);
 
 void CLIP_OT_add_marker(struct wmOperatorType *ot);
 void CLIP_OT_delete_track(struct wmOperatorType *ot);
@@ -182,4 +178,12 @@ void CLIP_OT_tracking_object_remove(struct wmOperatorType *ot);
 void CLIP_OT_copy_tracks(struct wmOperatorType *ot);
 void CLIP_OT_paste_tracks(struct wmOperatorType *ot);
 
+/* tracking_select.c */
+void CLIP_OT_select(struct wmOperatorType *ot);
+void CLIP_OT_select_all(struct wmOperatorType *ot);
+void CLIP_OT_select_border(struct wmOperatorType *ot);
+void CLIP_OT_select_lasso(struct wmOperatorType *ot);
+void CLIP_OT_select_circle(struct wmOperatorType *ot);
+void CLIP_OT_select_grouped(struct wmOperatorType *ot);
+
 #endif /* __CLIP_INTERN_H__ */
diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c
index 73eb8ee77ff..d5ec65e68c7 100644
--- a/source/blender/editors/space_clip/clip_ops.c
+++ b/source/blender/editors/space_clip/clip_ops.c
@@ -986,7 +986,7 @@ static void proxy_startjob(void *pjv, short *stop, short *do_update, float *prog
 	}
 
 	if (build_undistort_count)
-		distortion = BKE_tracking_distortion_create();
+		distortion = BKE_tracking_distortion_new();
 
 	for (cfra = sfra; cfra <= efra; cfra++) {
 		if (clip->source != MCLIP_SRC_MOVIE)
@@ -1003,7 +1003,7 @@ static void proxy_startjob(void *pjv, short *stop, short *do_update, float *prog
 	}
 
 	if (distortion)
-		BKE_tracking_distortion_destroy(distortion);
+		BKE_tracking_distortion_free(distortion);
 
 	if (*stop)
 		pj->stop = 1;
diff --git a/source/blender/editors/space_clip/clip_utils.c b/source/blender/editors/space_clip/clip_utils.c
index 4142c30d825..3f8fd5966ec 100644
--- a/source/blender/editors/space_clip/clip_utils.c
+++ b/source/blender/editors/space_clip/clip_utils.c
@@ -30,7 +30,7 @@
  */
 
 #include "DNA_scene_types.h"
-#include "DNA_object_types.h"	/* SELECT */
+#include "DNA_object_types.h"   /* SELECT */
 
 #include "MEM_guardedalloc.h"
 
@@ -61,12 +61,13 @@
 #include "UI_resources.h"
 #include "UI_view2d.h"
 
-#include "clip_intern.h"	// own include
+#include "clip_intern.h"    // own include
 
 void clip_graph_tracking_values_iterate_track(SpaceClip *sc, MovieTrackingTrack *track, void *userdata,
-			void (*func) (void *userdata, MovieTrackingTrack *track, MovieTrackingMarker *marker, int coord, float val),
-			void (*segment_start) (void *userdata, MovieTrackingTrack *track, int coord),
-			void (*segment_end) (void *userdata))
+		void (*func)(void *userdata, MovieTrackingTrack *track, MovieTrackingMarker *marker, int coord,
+		              int scene_framenr, float val),
+		void (*segment_start)(void *userdata, MovieTrackingTrack *track, int coord),
+		void (*segment_end)(void *userdata))
 {
 	MovieClip *clip = ED_space_clip(sc);
 	int width, height, coord;
@@ -104,8 +105,11 @@ void clip_graph_tracking_values_iterate_track(SpaceClip *sc, MovieTrackingTrack
 			val = (marker->pos[coord] - prevval) * ((coord == 0) ? (width) : (height));
 			val /= marker->framenr - prevfra;
 
-			if (func)
-				func(userdata, track, marker, coord, val);
+			if (func) {
+				int scene_framenr = BKE_movieclip_remap_clip_to_scene_frame(clip, marker->framenr);
+
+				func(userdata, track, marker, coord, scene_framenr, val);
+			}
 
 			prevval = marker->pos[coord];
 			prevfra = marker->framenr;
@@ -118,51 +122,54 @@ void clip_graph_tracking_values_iterate_track(SpaceClip *sc, MovieTrackingTrack
 	}
 }
 
-void clip_graph_tracking_values_iterate(SpaceClip *sc, void *userdata,
-			void (*func) (void *userdata, MovieTrackingTrack *track, MovieTrackingMarker *marker, int coord, float val),
-			void (*segment_start) (void *userdata, MovieTrackingTrack *track, int coord),
-			void (*segment_end) (void *userdata))
+void clip_graph_tracking_values_iterate(SpaceClip *sc, int selected_only, int include_hidden, void *userdata,
+		void (*func)(void *userdata, MovieTrackingTrack *track, MovieTrackingMarker *marker,
+		             int coord, int scene_framenr, float val),
+		void (*segment_start)(void *userdata, MovieTrackingTrack *track, int coord),
+		void (*segment_end)(void *userdata))
 {
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
 	MovieTrackingTrack *track;
 
-	track = tracksbase->first;
-	while (track) {
-		if (TRACK_VIEW_SELECTED(sc, track)) {
-			clip_graph_tracking_values_iterate_track(sc, track, userdata, func, segment_start, segment_end);
-		}
+	for (track = tracksbase->first; track; track = track->next) {
+		if (!include_hidden && (track->flag & TRACK_HIDDEN) != 0)
+			continue;
 
-		track = track->next;
+		if (selected_only && !TRACK_SELECTED(track))
+			continue;
+
+		clip_graph_tracking_values_iterate_track(sc, track, userdata, func, segment_start, segment_end);
 	}
 }
 
-void clip_graph_tracking_iterate(SpaceClip *sc, void *userdata,
-			void (*func) (void *userdata, MovieTrackingMarker *marker))
+void clip_graph_tracking_iterate(SpaceClip *sc, int selected_only, int include_hidden, void *userdata,
+                                 void (*func)(void *userdata, MovieTrackingMarker *marker))
 {
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
 	MovieTrackingTrack *track;
 
-	track = tracksbase->first;
-	while (track) {
-		if (TRACK_VIEW_SELECTED(sc, track)) {
-			int i;
+	for (track = tracksbase->first; track; track = track->next) {
+		int i;
 
-			for (i = 0; i < track->markersnr; i++) {
-				MovieTrackingMarker *marker = &track->markers[i];
+		if (!include_hidden && (track->flag & TRACK_HIDDEN) != 0)
+			continue;
 
-				if (marker->flag & MARKER_DISABLED)
-					continue;
+		if (selected_only && !TRACK_SELECTED(track))
+			continue;
 
-				if (func)
-					func(userdata, marker);
-			}
-		}
+		for (i = 0; i < track->markersnr; i++) {
+			MovieTrackingMarker *marker = &track->markers[i];
+
+			if (marker->flag & MARKER_DISABLED)
+				continue;
 
-		track = track->next;
+			if (func)
+				func(userdata, marker);
+		}
 	}
 }
 
@@ -170,7 +177,7 @@ void clip_delete_track(bContext *C, MovieClip *clip, ListBase *tracksbase, Movie
 {
 	MovieTracking *tracking = &clip->tracking;
 	MovieTrackingStabilization *stab = &tracking->stabilization;
-	MovieTrackingTrack *act_track = BKE_tracking_active_track(tracking);
+	MovieTrackingTrack *act_track = BKE_tracking_track_get_active(tracking);
 
 	int has_bundle = FALSE, update_stab = FALSE;
 
@@ -187,7 +194,7 @@ void clip_delete_track(bContext *C, MovieClip *clip, ListBase *tracksbase, Movie
 	if (track->flag & TRACK_HAS_BUNDLE)
 		has_bundle = TRUE;
 
-	BKE_tracking_free_track(track);
+	BKE_tracking_track_free(track);
 	BLI_freelinkN(tracksbase, track);
 
 	WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, clip);
@@ -210,7 +217,7 @@ void clip_delete_marker(bContext *C, MovieClip *clip, ListBase *tracksbase,
 		clip_delete_track(C, clip, tracksbase, track);
 	}
 	else {
-		BKE_tracking_delete_marker(track, marker->framenr);
+		BKE_tracking_marker_delete(track, marker->framenr);
 
 		WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, clip);
 	}
@@ -241,11 +248,11 @@ void clip_draw_cfra(SpaceClip *sc, ARegion *ar, Scene *scene)
 	glLineWidth(2.0);
 
 	glBegin(GL_LINE_STRIP);
-		vec[1] = v2d->cur.ymin;
-		glVertex2fv(vec);
+	vec[1] = v2d->cur.ymin;
+	glVertex2fv(vec);
 
-		vec[1] = v2d->cur.ymax;
-		glVertex2fv(vec);
+	vec[1] = v2d->cur.ymax;
+	glVertex2fv(vec);
 	glEnd();
 
 	glLineWidth(1.0);
@@ -269,10 +276,10 @@ void clip_draw_sfra_efra(View2D *v2d, Scene *scene)
 	/* currently clip editor supposes that editing clip length is equal to scene frame range */
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	glEnable(GL_BLEND);
-		glColor4f(0.0f, 0.0f, 0.0f, 0.4f);
+	glColor4f(0.0f, 0.0f, 0.0f, 0.4f);
 
-		glRectf(v2d->cur.xmin, v2d->cur.ymin, (float)SFRA, v2d->cur.ymax);
-		glRectf((float)EFRA, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
+	glRectf(v2d->cur.xmin, v2d->cur.ymin, (float)SFRA, v2d->cur.ymax);
+	glRectf((float)EFRA, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
 	glDisable(GL_BLEND);
 
 	UI_ThemeColorShade(TH_BACK, -60);
diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c
index a6fda200ff4..174b7fcb373 100644
--- a/source/blender/editors/space_clip/space_clip.c
+++ b/source/blender/editors/space_clip/space_clip.c
@@ -33,7 +33,9 @@
 #include <stdio.h>
 
 #include "DNA_scene_types.h"
+#include "DNA_mask_types.h"
 #include "DNA_movieclip_types.h"
+#include "DNA_view3d_types.h"  /* for pivot point */
 
 #include "MEM_guardedalloc.h"
 
@@ -49,6 +51,8 @@
 
 #include "IMB_imbuf_types.h"
 
+#include "ED_mask.h"
+#include "ED_space_api.h"
 #include "ED_screen.h"
 #include "ED_clip.h"
 #include "ED_transform.h"
@@ -67,7 +71,7 @@
 #include "RNA_access.h"
 
 
-#include "clip_intern.h"	// own include
+#include "clip_intern.h"  /* own include */
 
 static void init_preview_region(const bContext *C, ARegion *ar)
 {
@@ -211,6 +215,15 @@ static void clip_scopes_tag_refresh(ScrArea *sa)
 	sc->scopes.ok = FALSE;
 }
 
+static void clip_scopes_check_gpencil_change(ScrArea *sa)
+{
+	SpaceClip *sc = (SpaceClip *)sa->spacedata.first;
+
+	if (sc->gpencil_src == SC_GPENCIL_SRC_TRACK) {
+		clip_scopes_tag_refresh(sa);
+	}
+}
+
 static void clip_stabilization_tag_refresh(ScrArea *sa)
 {
 	SpaceClip *sc = (SpaceClip *) sa->spacedata.first;
@@ -237,6 +250,7 @@ static SpaceLink *clip_new(const bContext *C)
 	sc->zoom = 1.0f;
 	sc->path_length = 20;
 	sc->scopes.track_preview_height = 120;
+	sc->around = V3D_LOCAL;
 
 	/* header */
 	ar = MEM_callocN(sizeof(ARegion), "header for clip");
@@ -294,13 +308,16 @@ static SpaceLink *clip_new(const bContext *C)
 /* not spacelink itself */
 static void clip_free(SpaceLink *sl)
 {
-	SpaceClip *sc = (SpaceClip*) sl;
+	SpaceClip *sc = (SpaceClip *) sl;
 
 	sc->clip = NULL;
 
 	if (sc->scopes.track_preview)
 		IMB_freeImBuf(sc->scopes.track_preview);
 
+	if (sc->scopes.track_search)
+		IMB_freeImBuf(sc->scopes.track_search);
+
 	ED_space_clip_free_texture_buffer(sc);
 }
 
@@ -318,6 +335,7 @@ static SpaceLink *clip_duplicate(SpaceLink *sl)
 	SpaceClip *scn = MEM_dupallocN(sl);
 
 	/* clear or remove stuff from old */
+	scn->scopes.track_search = NULL;
 	scn->scopes.track_preview = NULL;
 	scn->scopes.ok = FALSE;
 	scn->draw_context = NULL;
@@ -361,6 +379,24 @@ static void clip_listener(ScrArea *sa, wmNotifier *wmn)
 					break;
 			}
 			break;
+		case NC_MASK:
+			switch (wmn->data) {
+				case ND_SELECT:
+				case ND_DATA:
+				case ND_DRAW:
+					ED_area_tag_redraw(sa);
+					break;
+			}
+			switch (wmn->action) {
+				case NA_SELECTED:
+					clip_scopes_tag_refresh(sa);
+					ED_area_tag_redraw(sa);
+					break;
+				case NA_EDITED:
+					ED_area_tag_redraw(sa);
+					break;
+			}
+			break;
 		case NC_GEOM:
 			switch (wmn->data) {
 				case ND_SELECT:
@@ -369,9 +405,13 @@ static void clip_listener(ScrArea *sa, wmNotifier *wmn)
 					break;
 			}
 			break;
-		 case NC_SCREEN:
-			if (wmn->data == ND_ANIMPLAY) {
-				ED_area_tag_redraw(sa);
+		case NC_SCREEN:
+			switch (wmn->data) {
+				case ND_ANIMPLAY:
+				case ND_GPENCIL:
+					clip_scopes_check_gpencil_change(sa);
+					ED_area_tag_redraw(sa);
+					break;
 			}
 			break;
 		case NC_SPACE:
@@ -532,7 +572,7 @@ static void clip_keymap(struct wmKeyConfig *keyconf)
 	/* ******** Hotkeys avalaible for main region only ******** */
 
 	keymap = WM_keymap_find(keyconf, "Clip Editor", SPACE_CLIP, 0);
-
+//	keymap->poll = ED_space_clip_tracking_poll;
 	/* ** View/navigation ** */
 
 	WM_keymap_add_item(keymap, "CLIP_OT_view_pan", MIDDLEMOUSE, KM_PRESS, 0, 0);
@@ -604,17 +644,17 @@ static void clip_keymap(struct wmKeyConfig *keyconf)
 	WM_keymap_add_item(keymap, "CLIP_OT_slide_marker", LEFTMOUSE, KM_PRESS, 0, 0);
 
 	kmi = WM_keymap_add_item(keymap, "CLIP_OT_disable_markers", DKEY, KM_PRESS, KM_SHIFT, 0);
-	RNA_enum_set(kmi->ptr, "action", 2);	/* toggle */
+	RNA_enum_set(kmi->ptr, "action", 2);    /* toggle */
 
 	/* tracks */
 	WM_keymap_add_item(keymap, "CLIP_OT_delete_track", DELKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "CLIP_OT_delete_track", XKEY, KM_PRESS, 0, 0);
 
 	kmi = WM_keymap_add_item(keymap, "CLIP_OT_lock_tracks", LKEY, KM_PRESS, KM_CTRL, 0);
-	RNA_enum_set(kmi->ptr, "action", 0);	/* lock */
+	RNA_enum_set(kmi->ptr, "action", 0);    /* lock */
 
 	kmi = WM_keymap_add_item(keymap, "CLIP_OT_lock_tracks", LKEY, KM_PRESS, KM_ALT, 0);
-	RNA_enum_set(kmi->ptr, "action", 1);	/* unlock */
+	RNA_enum_set(kmi->ptr, "action", 1);    /* unlock */
 
 	kmi = WM_keymap_add_item(keymap, "CLIP_OT_hide_tracks", HKEY, KM_PRESS, 0, 0);
 	RNA_boolean_set(kmi->ptr, "unselected", FALSE);
@@ -703,7 +743,7 @@ static void clip_keymap(struct wmKeyConfig *keyconf)
 
 	/* tracks */
 	kmi = WM_keymap_add_item(keymap, "CLIP_OT_graph_disable_markers", DKEY, KM_PRESS, KM_SHIFT, 0);
-	RNA_enum_set(kmi->ptr, "action", 2);	/* toggle */
+	RNA_enum_set(kmi->ptr, "action", 2);    /* toggle */
 
 	transform_keymap_for_space(keyconf, keymap, SPACE_CLIP);
 
@@ -712,10 +752,10 @@ static void clip_keymap(struct wmKeyConfig *keyconf)
 	keymap = WM_keymap_find(keyconf, "Clip Dopesheet Editor", SPACE_CLIP, 0);
 
 	kmi = WM_keymap_add_item(keymap, "CLIP_OT_dopesheet_select_channel", ACTIONMOUSE, KM_PRESS, 0, 0);
-	RNA_boolean_set(kmi->ptr, "extend", TRUE);	/* toggle */
+	RNA_boolean_set(kmi->ptr, "extend", TRUE);  /* toggle */
 }
 
-const char *clip_context_dir[] = {"edit_movieclip", NULL};
+const char *clip_context_dir[] = {"edit_movieclip", "edit_mask", NULL};
 
 static int clip_context(const bContext *C, const char *member, bContextDataResult *result)
 {
@@ -729,7 +769,11 @@ static int clip_context(const bContext *C, const char *member, bContextDataResul
 	else if (CTX_data_equals(member, "edit_movieclip")) {
 		if (sc->clip)
 			CTX_data_id_pointer_set(result, &sc->clip->id);
-
+		return TRUE;
+	}
+	else if (CTX_data_equals(member, "edit_mask")) {
+		if (sc->mask)
+			CTX_data_id_pointer_set(result, &sc->mask->id);
 		return TRUE;
 	}
 
@@ -1020,6 +1064,9 @@ static void clip_main_area_init(wmWindowManager *wm, ARegion *ar)
 	UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_STANDARD, ar->winx, ar->winy);
 
 	/* own keymap */
+	keymap = WM_keymap_find(wm->defaultconf, "Mask Editing", 0, 0);
+	WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
+
 	keymap = WM_keymap_find(wm->defaultconf, "Clip", SPACE_CLIP, 0);
 	WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
 
@@ -1037,7 +1084,7 @@ static void clip_main_area_draw(const bContext *C, ARegion *ar)
 	/* if tracking is in progress, we should synchronize framenr from clipuser
 	 * so latest tracked frame would be shown */
 	if (clip && clip->tracking_context)
-		BKE_tracking_sync_user(&sc->user, clip->tracking_context);
+		BKE_tracking_context_sync_user(clip->tracking_context, &sc->user);
 
 	if (sc->flag & SC_LOCK_SELECTION) {
 		ImBuf *tmpibuf = NULL;
@@ -1064,6 +1111,49 @@ static void clip_main_area_draw(const bContext *C, ARegion *ar)
 
 	clip_draw_main(sc, ar, scene);
 
+	if (sc->mode == SC_MODE_MASKEDIT) {
+		int x, y;
+		int width, height;
+		float zoomx, zoomy, aspx, aspy;
+
+		/* frame image */
+		float maxdim;
+		float xofs, yofs;
+
+		/* find window pixel coordinates of origin */
+		UI_view2d_to_region_no_clip(&ar->v2d, 0.0f, 0.0f, &x, &y);
+
+		ED_space_clip_size(sc, &width, &height);
+		ED_space_clip_zoom(sc, ar, &zoomx, &zoomy);
+		ED_space_clip_aspect(sc, &aspx, &aspy);
+
+		/* frame the image */
+		maxdim = maxf(width, height);
+		if (width == height) {
+			xofs = yofs = 0;
+		}
+		else if (width < height) {
+			xofs = ((height - width) / -2.0f) * zoomx;
+			yofs = 0.0f;
+		}
+		else { /* (width > height) */
+			xofs = 0.0f;
+			yofs = ((width - height) / -2.0f) * zoomy;
+		}
+
+		/* apply transformation so mask editing tools will assume drawing from the origin in normalized space */
+		glPushMatrix();
+		glTranslatef(x + xofs, y + yofs, 0);
+		glScalef(maxdim * zoomx, maxdim * zoomy, 0);
+		glMultMatrixf(sc->stabmat);
+
+		ED_mask_draw((bContext *)C, sc->mask_draw_flag, sc->mask_draw_type);
+
+		ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_VIEW);
+
+		glPopMatrix();
+	}
+
 	/* Grease Pencil */
 	clip_draw_grease_pencil((bContext *)C, 1);
 
@@ -1081,7 +1171,7 @@ static void clip_main_area_listener(ARegion *ar, wmNotifier *wmn)
 		case NC_SCREEN:
 			if (wmn->data == ND_GPENCIL)
 				ED_region_tag_redraw(ar);
-		break;
+			break;
 	}
 }
 
@@ -1125,7 +1215,7 @@ static void graph_area_draw(const bContext *C, ARegion *ar)
 	UI_view2d_view_restore(C);
 
 	/* scrollers */
-	unitx = (sc->flag & SC_SHOW_SECONDS)? V2D_UNIT_SECONDS : V2D_UNIT_FRAMES;
+	unitx = (sc->flag & SC_SHOW_SECONDS) ? V2D_UNIT_SECONDS : V2D_UNIT_FRAMES;
 	unity = V2D_UNIT_VALUES;
 	scrollers = UI_view2d_scrollers_calc(C, v2d, unitx, V2D_GRID_NOCLAMP, unity, V2D_GRID_NOCLAMP);
 	UI_view2d_scrollers_draw(C, v2d, scrollers);
@@ -1143,7 +1233,7 @@ static void dopesheet_area_draw(const bContext *C, ARegion *ar)
 	short unit = 0;
 
 	if (clip)
-		BKE_tracking_dopesheet_update(&clip->tracking, sc->dope_sort, sc->dope_flag & SC_DOPE_SORT_INVERSE);
+		BKE_tracking_dopesheet_update(&clip->tracking);
 
 	/* clear and setup matrix */
 	UI_ThemeClearColor(TH_BACK);
@@ -1152,7 +1242,7 @@ static void dopesheet_area_draw(const bContext *C, ARegion *ar)
 	UI_view2d_view_ortho(v2d);
 
 	/* time grid */
-	unit = (sc->flag & SC_SHOW_SECONDS)? V2D_UNIT_SECONDS : V2D_UNIT_FRAMES;
+	unit = (sc->flag & SC_SHOW_SECONDS) ? V2D_UNIT_SECONDS : V2D_UNIT_FRAMES;
 	grid = UI_view2d_grid_calc(CTX_data_scene(C), v2d, unit, V2D_GRID_CLAMP,
 	                           V2D_ARG_DUMMY, V2D_ARG_DUMMY, ar->winx, ar->winy);
 	UI_view2d_grid_draw(v2d, grid, V2D_GRIDLINES_ALL);
@@ -1204,7 +1294,7 @@ static void clip_channels_area_draw(const bContext *C, ARegion *ar)
 	View2DScrollers *scrollers;
 
 	if (clip)
-		BKE_tracking_dopesheet_update(&clip->tracking, sc->dope_sort, sc->dope_flag & SC_DOPE_SORT_INVERSE);
+		BKE_tracking_dopesheet_update(&clip->tracking);
 
 	/* clear and setup matrix */
 	UI_ThemeClearColor(TH_BACK);
@@ -1241,6 +1331,26 @@ static void clip_header_area_draw(const bContext *C, ARegion *ar)
 	ED_region_header(C, ar);
 }
 
+static void clip_header_area_listener(ARegion *ar, wmNotifier *wmn)
+{
+	/* context changes */
+	switch (wmn->category) {
+		case NC_SCENE:
+			switch (wmn->data) {
+				/* for proportional editmode only */
+				case ND_TOOLSETTINGS:
+					/* TODO - should do this when in mask mode only but no datas available */
+					// if (sc->mode == SC_MODE_MASKEDIT)
+				{
+					ED_region_tag_redraw(ar);
+				}
+				break;
+			}
+			break;
+	}
+}
+
+
 /****************** tools region ******************/
 
 /* add handlers, stuff you only do once or on area/region changes */
@@ -1402,6 +1512,7 @@ void ED_spacetype_clip(void)
 
 	art->init = clip_header_area_init;
 	art->draw = clip_header_area_draw;
+	art->listener = clip_header_area_listener;
 
 	BLI_addhead(&st->regiontypes, art);
 
diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c
index f6dbae596b8..8ca483c94d3 100644
--- a/source/blender/editors/space_clip/tracking_ops.c
+++ b/source/blender/editors/space_clip/tracking_ops.c
@@ -35,7 +35,7 @@
 #include "DNA_constraint_types.h"
 #include "DNA_gpencil_types.h"
 #include "DNA_movieclip_types.h"
-#include "DNA_object_types.h"	/* SELECT */
+#include "DNA_object_types.h"   /* SELECT */
 #include "DNA_scene_types.h"
 
 #include "BLI_utildefines.h"
@@ -77,7 +77,7 @@
 
 #include "UI_view2d.h"
 
-#include "clip_intern.h"	// own include
+#include "clip_intern.h"    // own include
 
 /********************** add marker operator *********************/
 
@@ -85,15 +85,16 @@ static void add_marker(SpaceClip *sc, float x, float y)
 {
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
 	MovieTrackingTrack *track;
 	int width, height;
+	int framenr = ED_space_clip_clip_framenr(sc);
 
 	ED_space_clip_size(sc, &width, &height);
 
-	track = BKE_tracking_add_track(tracking, tracksbase, x, y, sc->user.framenr, width, height);
+	track = BKE_tracking_track_add(tracking, tracksbase, x, y, framenr, width, height);
 
-	BKE_tracking_select_track(tracksbase, track, TRACK_AREA_ALL, 0);
+	BKE_tracking_track_select(tracksbase, track, TRACK_AREA_ALL, 0);
 
 	clip->tracking.act_track = track;
 }
@@ -106,6 +107,7 @@ static int add_marker_exec(bContext *C, wmOperator *op)
 	int width, height;
 
 	ED_space_clip_size(sc, &width, &height);
+
 	if (!width || !height)
 		return OPERATOR_CANCELLED;
 
@@ -143,14 +145,14 @@ void CLIP_OT_add_marker(wmOperatorType *ot)
 	/* api callbacks */
 	ot->invoke = add_marker_invoke;
 	ot->exec = add_marker_exec;
-	ot->poll = ED_space_clip_tracking_size_poll;
+	ot->poll = ED_space_clip_tracking_poll;
 
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
 	/* properties */
 	RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MIN, FLT_MAX,
-		"Location", "Location of marker on frame", -1.0f, 1.0f);
+	                     "Location", "Location of marker on frame", -1.0f, 1.0f);
 }
 
 /********************** delete track operator *********************/
@@ -160,7 +162,7 @@ static int delete_track_exec(bContext *C, wmOperator *UNUSED(op))
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
 	MovieTrackingTrack *track = tracksbase->first, *next;
 
 	while (track) {
@@ -200,16 +202,16 @@ static int delete_marker_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
-	ListBase *tracksbase = BKE_tracking_get_tracks(&clip->tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(&clip->tracking);
 	MovieTrackingTrack *track = tracksbase->first, *next;
-	int framenr = sc->user.framenr;
+	int framenr = ED_space_clip_clip_framenr(sc);
 	int has_selection = 0;
 
 	while (track) {
 		next = track->next;
 
 		if (TRACK_VIEW_SELECTED(sc, track)) {
-			MovieTrackingMarker *marker = BKE_tracking_exact_marker(track, framenr);
+			MovieTrackingMarker *marker = BKE_tracking_marker_get_exact(track, framenr);
 
 			if (marker) {
 				has_selection |= track->markersnr > 1;
@@ -247,30 +249,43 @@ void CLIP_OT_delete_marker(wmOperatorType *ot)
 
 /********************** slide marker operator *********************/
 
-#define SLIDE_ACTION_POS	0
-#define SLIDE_ACTION_SIZE	1
-#define SLIDE_ACTION_OFFSET	2
+#define SLIDE_ACTION_POS       0
+#define SLIDE_ACTION_SIZE      1
+#define SLIDE_ACTION_OFFSET    2
+#define SLIDE_ACTION_TILT_SIZE 3
 
 typedef struct {
-	int area, action;
+	short area, action;
 	MovieTrackingTrack *track;
 	MovieTrackingMarker *marker;
 
 	int mval[2];
 	int width, height;
-	float *min, *max, *pos, *offset;
-	float smin[2], smax[2], spos[2], soff[2];
-	float (*smarkers)[2];
+	float *min, *max, *pos, *offset, (*corners)[2];
+	float spos[2];
+
+	short lock, accurate;
 
-	int lock, accurate;
+	/* data to restore on cancel */
+	float old_search_min[2], old_search_max[2], old_pos[2], old_offset[2];
+	float old_corners[4][2];
+	float (*old_markers)[2];
 } SlideMarkerData;
 
+static void slide_marker_tilt_slider(MovieTrackingMarker *marker, float slider[2])
+{
+	add_v2_v2v2(slider, marker->pattern_corners[1], marker->pattern_corners[2]);
+	add_v2_v2(slider, marker->pos);
+}
+
 static SlideMarkerData *create_slide_marker_data(SpaceClip *sc, MovieTrackingTrack *track,
-			MovieTrackingMarker *marker, wmEvent *event, int area, int action, int width, int height)
+                                                 MovieTrackingMarker *marker, wmEvent *event,
+                                                 int area, int corner, int action, int width, int height)
 {
 	SlideMarkerData *data = MEM_callocN(sizeof(SlideMarkerData), "slide marker data");
+	int framenr = ED_space_clip_clip_framenr(sc);
 
-	marker = BKE_tracking_ensure_marker(track, sc->user.framenr);
+	marker = BKE_tracking_marker_ensure(track, framenr);
 
 	data->area = area;
 	data->action = action;
@@ -280,35 +295,34 @@ static SlideMarkerData *create_slide_marker_data(SpaceClip *sc, MovieTrackingTra
 	if (area == TRACK_AREA_POINT) {
 		data->pos = marker->pos;
 		data->offset = track->offset;
-		copy_v2_v2(data->spos, marker->pos);
-		copy_v2_v2(data->soff, track->offset);
 	}
 	else if (area == TRACK_AREA_PAT) {
 		if (action == SLIDE_ACTION_SIZE) {
-			data->min = track->pat_min;
-			data->max = track->pat_max;
+			data->corners = marker->pattern_corners;
 		}
-		else {
+		else if (action == SLIDE_ACTION_OFFSET) {
 			int a;
 
 			data->pos = marker->pos;
 			data->offset = track->offset;
 
-			copy_v2_v2(data->soff, track->offset);
-
-			data->smarkers = MEM_callocN(sizeof(*data->smarkers)*track->markersnr, "slide marekrs");
+			data->old_markers = MEM_callocN(sizeof(*data->old_markers) * track->markersnr, "slide marekrs");
 			for (a = 0; a < track->markersnr; a++)
-				copy_v2_v2(data->smarkers[a], track->markers[a].pos);
+				copy_v2_v2(data->old_markers[a], track->markers[a].pos);
+		}
+		else if (action == SLIDE_ACTION_POS) {
+			data->corners = marker->pattern_corners;
+			data->pos = marker->pattern_corners[corner];
+			copy_v2_v2(data->spos, data->pos);
+		}
+		else if (action == SLIDE_ACTION_TILT_SIZE) {
+			data->corners = marker->pattern_corners;
+			slide_marker_tilt_slider(marker, data->spos);
 		}
 	}
 	else if (area == TRACK_AREA_SEARCH) {
-		data->min = track->search_min;
-		data->max = track->search_max;
-	}
-
-	if (area == TRACK_AREA_SEARCH || (area == TRACK_AREA_PAT && action != SLIDE_ACTION_OFFSET)) {
-		copy_v2_v2(data->smin, data->min);
-		copy_v2_v2(data->smax, data->max);
+		data->min = marker->search_min;
+		data->max = marker->search_max;
 	}
 
 	data->mval[0] = event->mval[0];
@@ -320,69 +334,179 @@ static SlideMarkerData *create_slide_marker_data(SpaceClip *sc, MovieTrackingTra
 	if (action == SLIDE_ACTION_SIZE)
 		data->lock = 1;
 
+	/* backup marker's settings */
+	memcpy(data->old_corners, marker->pattern_corners, sizeof(data->old_corners));
+	copy_v2_v2(data->old_search_min, marker->search_min);
+	copy_v2_v2(data->old_search_max, marker->search_max);
+	copy_v2_v2(data->old_pos, marker->pos);
+	copy_v2_v2(data->old_offset, track->offset);
+
 	return data;
 }
 
-/* corner = 0: right-bottom corner,
- * corner = 1: left-top corner */
-static int mouse_on_corner(SpaceClip *sc, MovieTrackingTrack *track, MovieTrackingMarker *marker,
-                           int area, float co[2], int corner, int width, int height)
+static int mouse_on_slide_zone(SpaceClip *sc, MovieTrackingMarker *marker,
+                               int area, float co[2], float slide_zone[2],
+                               float padding, int width, int height)
 {
+	const float size = 12.0f;
 	int inside = 0;
-	float size = 12.0f;
 	float min[2], max[2];
-	float crn[2], dx, dy, tdx, tdy;
+	float dx, dy;
 
 	if (area == TRACK_AREA_SEARCH) {
-		copy_v2_v2(min, track->search_min);
-		copy_v2_v2(max, track->search_max);
+		copy_v2_v2(min, marker->search_min);
+		copy_v2_v2(max, marker->search_max);
 	}
 	else {
-		copy_v2_v2(min, track->pat_min);
-		copy_v2_v2(max, track->pat_max);
+		BKE_tracking_marker_pattern_minmax(marker, min, max);
 	}
 
+	min[0] -= padding / width;
+	min[1] -= padding / height;
+	max[0] += padding / width;
+	max[1] += padding / height;
+
 	dx = size / width / sc->zoom;
 	dy = size / height / sc->zoom;
 
-	tdx = 5.0f / width / sc->zoom;
-	tdy = 5.0f / height / sc->zoom;
+	dx = MIN2(dx, (max[0] - min[0]) / 6.0f);
+	dy = MIN2(dy, (max[1] - min[1]) / 6.0f);
+
+	return IN_RANGE_INCL(co[0], slide_zone[0] - dx, slide_zone[0] + dx) &&
+	       IN_RANGE_INCL(co[1], slide_zone[1] - dy, slide_zone[1] + dy);
 
-	dx = MIN2(dx, (max[0] - min[0]) / 6.0f) + tdx;
-	dy = MIN2(dy, (max[1] - min[1]) / 6.0f) + tdy;
+	return inside;
+}
+
+static int mouse_on_corner(SpaceClip *sc, MovieTrackingMarker *marker,
+                           int area, float co[2], int corner, float padding,
+                           int width, int height)
+{
+	float min[2], max[2], crn[2];
+
+	if (area == TRACK_AREA_SEARCH) {
+		copy_v2_v2(min, marker->search_min);
+		copy_v2_v2(max, marker->search_max);
+	}
+	else {
+		BKE_tracking_marker_pattern_minmax(marker, min, max);
+	}
+
+	min[0] -= padding / width;
+	min[1] -= padding / height;
+	max[0] += padding / width;
+	max[1] += padding / height;
 
 	if (corner == 0) {
 		crn[0] = marker->pos[0] + max[0];
 		crn[1] = marker->pos[1] + min[1];
-
-		inside = co[0] >= crn[0] - dx && co[0] <= crn[0] + tdx && co[1] >= crn[1] - tdy && co[1] <= crn[1] + dy;
 	}
 	else {
 		crn[0] = marker->pos[0] + min[0];
 		crn[1] = marker->pos[1] + max[1];
+	}
+
+	return mouse_on_slide_zone(sc, marker, area, co, crn, padding, width, height);
+}
+
+static int get_mouse_pattern_corner(SpaceClip *sc, MovieTrackingMarker *marker, float co[2], int width, int height)
+{
+	int i, next;
+	float len = FLT_MAX, dx, dy;
+
+	for (i = 0; i < 4; i++) {
+		float cur_len;
+
+		next = (i + 1) % 4;
 
-		inside = co[0] >= crn[0] - dx && co[0] <= crn[0] + dx && co[1] >= crn[1] - dy && co[1] <= crn[1] + dy;
+		cur_len = len_v2v2(marker->pattern_corners[i], marker->pattern_corners[next]);
+
+		len = MIN2(cur_len, len);
 	}
 
-	return inside;
+	dx = 12.0f / width / sc->zoom;
+	dy = 12.0f / height / sc->zoom;
+
+	dx = MIN2(dx, len * 2.0f / 3.0f);
+	dy = MIN2(dy, len * width / height * 2.0f / 3.0f);
+
+	for (i = 0; i < 4; i++) {
+		float crn[2];
+		int inside;
+
+		add_v2_v2v2(crn, marker->pattern_corners[i], marker->pos);
+
+		inside = IN_RANGE_INCL(co[0], crn[0] - dx, crn[0] + dx) &&
+		         IN_RANGE_INCL(co[1], crn[1] - dy, crn[1] + dy);
+
+		if (inside)
+			return i;
+	}
+
+	return -1;
 }
 
 static int mouse_on_offset(SpaceClip *sc, MovieTrackingTrack *track, MovieTrackingMarker *marker,
-			float co[2], int width, int height)
+                           float co[2], int width, int height)
 {
 	float pos[2], dx, dy;
+	float pat_min[2], pat_max[2];
+
+	BKE_tracking_marker_pattern_minmax(marker, pat_min, pat_max);
 
 	add_v2_v2v2(pos, marker->pos, track->offset);
 
 	dx = 12.0f / width / sc->zoom;
 	dy = 12.0f / height / sc->zoom;
 
-	dx = MIN2(dx, (track->pat_max[0] - track->pat_min[0]) / 2.0f);
-	dy = MIN2(dy, (track->pat_max[1] - track->pat_min[1]) / 2.0f);
+	dx = MIN2(dx, (pat_max[0] - pat_min[0]) / 2.0f);
+	dy = MIN2(dy, (pat_max[1] - pat_min[1]) / 2.0f);
 
 	return co[0] >= pos[0] - dx && co[0] <= pos[0] + dx && co[1] >= pos[1] - dy && co[1] <= pos[1] + dy;
 }
 
+static int mouse_on_tilt(SpaceClip *sc, MovieTrackingMarker *marker, float co[2], int width, int height)
+{
+	float slider[2];
+
+	slide_marker_tilt_slider(marker, slider);
+
+	return mouse_on_slide_zone(sc, marker, TRACK_AREA_PAT, co, slider, 0.0f, width, height);
+}
+
+static int slide_check_corners(float (*corners)[2])
+{
+	int i, next, prev;
+	float cross = 0.0f;
+	float p[2] = {0.0f, 0.0f};
+
+	if (!isect_point_quad_v2(p, corners[0], corners[1], corners[2], corners[3]))
+		return FALSE;
+
+	for (i = 0; i < 4; i++) {
+		float v1[2], v2[2], cur_cross;
+
+		next = (i + 1) % 4;
+		prev = (4 + i - 1) % 4;
+
+		sub_v2_v2v2(v1, corners[i], corners[prev]);
+		sub_v2_v2v2(v2, corners[next], corners[i]);
+
+		cur_cross = cross_v2v2(v1, v2);
+
+		if (fabsf(cur_cross) > FLT_EPSILON) {
+			if (cross == 0.0f) {
+				cross = cur_cross;
+			}
+			else if (cross * cur_cross < 0.0f) {
+				return FALSE;
+			}
+		}
+	}
+
+	return TRUE;
+}
+
 static void hide_cursor(bContext *C)
 {
 	wmWindow *win = CTX_wm_window(C);
@@ -397,15 +521,16 @@ static void show_cursor(bContext *C)
 	WM_cursor_set(win, CURSOR_STD);
 }
 
-static void *slide_marker_customdata(bContext *C, wmEvent *event)
+MovieTrackingTrack *tracking_marker_check_slide(bContext *C, wmEvent *event, int *area_r, int *action_r, int *corner_r)
 {
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTrackingTrack *track;
 	int width, height;
 	float co[2];
-	void *customdata = NULL;
-	ListBase *tracksbase = BKE_tracking_get_tracks(&clip->tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(&clip->tracking);
+	int framenr = ED_space_clip_clip_framenr(sc);
+	int action = -1, area = 0, corner = -1;
 
 	ED_space_clip_size(sc, &width, &height);
 
@@ -417,41 +542,102 @@ static void *slide_marker_customdata(bContext *C, wmEvent *event)
 	track = tracksbase->first;
 	while (track) {
 		if (TRACK_VIEW_SELECTED(sc, track) && (track->flag & TRACK_LOCKED) == 0) {
-			MovieTrackingMarker *marker = BKE_tracking_get_marker(track, sc->user.framenr);
+			MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
+			int ok = FALSE;
 
 			if ((marker->flag & MARKER_DISABLED) == 0) {
-				if (!customdata)
-					if (mouse_on_offset(sc, track, marker, co, width, height))
-						customdata = create_slide_marker_data(sc, track, marker, event, TRACK_AREA_POINT,
-						                                      SLIDE_ACTION_POS, width, height);
-
-				if (sc->flag & SC_SHOW_MARKER_SEARCH) {
-					if (mouse_on_corner(sc, track, marker, TRACK_AREA_SEARCH, co, 1, width, height))
-						customdata = create_slide_marker_data(sc, track, marker, event, TRACK_AREA_SEARCH,
-						                                      SLIDE_ACTION_OFFSET, width, height);
-					else if (mouse_on_corner(sc, track, marker, TRACK_AREA_SEARCH, co, 0, width, height))
-						customdata = create_slide_marker_data(sc, track, marker, event, TRACK_AREA_SEARCH,
-						                                      SLIDE_ACTION_SIZE, width, height);
+				if (mouse_on_offset(sc, track, marker, co, width, height)) {
+					area = TRACK_AREA_POINT;
+					action = SLIDE_ACTION_POS;
+					ok = TRUE;
+				}
+
+				if (!ok && (sc->flag & SC_SHOW_MARKER_SEARCH)) {
+					if (mouse_on_corner(sc, marker, TRACK_AREA_SEARCH, co, 1, 0.0f, width, height)) {
+						area = TRACK_AREA_SEARCH;
+						action = SLIDE_ACTION_OFFSET;
+						ok = TRUE;
+					}
+					else if (mouse_on_corner(sc, marker, TRACK_AREA_SEARCH, co, 0, 0.0f, width, height)) {
+						area = TRACK_AREA_SEARCH;
+						action = SLIDE_ACTION_SIZE;
+						ok = TRUE;
+					}
 				}
 
-				if (!customdata && (sc->flag & SC_SHOW_MARKER_PATTERN)) {
-					if (mouse_on_corner(sc, track, marker, TRACK_AREA_PAT, co, 1,  width, height))
-						customdata = create_slide_marker_data(sc, track, marker, event, TRACK_AREA_PAT,
-                                                              SLIDE_ACTION_OFFSET, width, height);
+				if (!ok && (sc->flag & SC_SHOW_MARKER_PATTERN)) {
+					int current_corner = get_mouse_pattern_corner(sc, marker, co, width, height);
 
-					if (!customdata && mouse_on_corner(sc, track, marker, TRACK_AREA_PAT, co, 0, width, height))
-						customdata = create_slide_marker_data(sc, track, marker, event, TRACK_AREA_PAT,
-						                                      SLIDE_ACTION_SIZE, width, height);
+					if (current_corner != -1) {
+						area = TRACK_AREA_PAT;
+						action = SLIDE_ACTION_POS;
+						corner = current_corner;
+						ok = TRUE;
+					}
+					else {
+						if (mouse_on_corner(sc, marker, TRACK_AREA_PAT, co, 1, 12.0f, width, height)) {
+							area = TRACK_AREA_PAT;
+							action = SLIDE_ACTION_OFFSET;
+							ok = TRUE;
+						}
+						if (!ok && mouse_on_corner(sc, marker, TRACK_AREA_PAT, co, 0, 12.0f, width, height)) {
+							area = TRACK_AREA_PAT;
+							action = SLIDE_ACTION_SIZE;
+							ok = TRUE;
+						}
+						if (!ok && mouse_on_tilt(sc, marker, co, width, height)) {
+							area = TRACK_AREA_PAT;
+							action = SLIDE_ACTION_TILT_SIZE;
+							ok = TRUE;
+						}
+					}
 				}
 
-				if (customdata)
-					break;
+				if (ok) {
+					if (area_r)
+						*area_r = area;
+
+					if (action_r)
+						*action_r = action;
+
+					if (corner_r)
+						*corner_r = corner;
+
+					return track;
+				}
 			}
 		}
 
 		track = track->next;
 	}
 
+	return NULL;
+}
+
+static void *slide_marker_customdata(bContext *C, wmEvent *event)
+{
+	SpaceClip *sc = CTX_wm_space_clip(C);
+	MovieTrackingTrack *track;
+	int width, height;
+	float co[2];
+	void *customdata = NULL;
+	int framenr = ED_space_clip_clip_framenr(sc);
+	int area, action, corner;
+
+	ED_space_clip_size(sc, &width, &height);
+
+	if (width == 0 || height == 0)
+		return NULL;
+
+	ED_clip_mouse_pos(C, event, co);
+
+	track = tracking_marker_check_slide(C, event, &area, &action, &corner);
+	if (track) {
+		MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
+
+		customdata = create_slide_marker_data(sc, track, marker, event, area, corner, action, width, height);
+	}
+
 	return customdata;
 }
 
@@ -481,33 +667,27 @@ static int slide_marker_invoke(bContext *C, wmOperator *op, wmEvent *event)
 
 static void cancel_mouse_slide(SlideMarkerData *data)
 {
-	/* cancel sliding */
-	if (data->area == TRACK_AREA_POINT) {
-		if (data->action == SLIDE_ACTION_OFFSET)
-			copy_v2_v2(data->offset, data->soff);
-		else
-			copy_v2_v2(data->pos, data->spos);
-	}
-	else {
-		if (data->action == SLIDE_ACTION_SIZE) {
-			copy_v2_v2(data->min, data->smin);
-			copy_v2_v2(data->max, data->smax);
-		}
-		else {
-			int a;
+	MovieTrackingTrack *track = data->track;
+	MovieTrackingMarker *marker = data->marker;
 
-			for (a = 0; a < data->track->markersnr; a++)
-				copy_v2_v2(data->track->markers[a].pos, data->smarkers[a]);
+	memcpy(marker->pattern_corners, data->old_corners, sizeof(marker->pattern_corners));
+	copy_v2_v2(marker->search_min, data->old_search_min);
+	copy_v2_v2(marker->search_max, data->old_search_max);
+	copy_v2_v2(marker->pos, data->old_pos);
+	copy_v2_v2(track->offset, data->old_offset);
 
-			copy_v2_v2(data->offset, data->soff);
-		}
+	if (data->old_markers) {
+		int a;
+
+		for (a = 0; a < data->track->markersnr; a++)
+			copy_v2_v2(data->track->markers[a].pos, data->old_markers[a]);
 	}
 }
 
 static void free_slide_data(SlideMarkerData *data)
 {
-	if (data->smarkers)
-		MEM_freeN(data->smarkers);
+	if (data->old_markers)
+		MEM_freeN(data->old_markers);
 
 	MEM_freeN(data);
 }
@@ -530,7 +710,7 @@ static int slide_marker_modal(bContext *C, wmOperator *op, wmEvent *event)
 			if (ELEM(event->type, LEFTSHIFTKEY, RIGHTSHIFTKEY))
 				data->accurate = event->val == KM_PRESS;
 
-			/* no break! update area size */
+		/* no break! update area size */
 
 		case MOUSEMOVE:
 			mdelta[0] = event->mval[0] - data->mval[0];
@@ -550,772 +730,206 @@ static int slide_marker_modal(bContext *C, wmOperator *op, wmEvent *event)
 
 			if (data->area == TRACK_AREA_POINT) {
 				if (data->action == SLIDE_ACTION_OFFSET) {
-					data->offset[0] = data->soff[0] + dx;
-					data->offset[1] = data->soff[1] + dy;
+					data->offset[0] = data->old_offset[0] + dx;
+					data->offset[1] = data->old_offset[1] + dy;
 				}
 				else {
-					data->pos[0] = data->spos[0] + dx;
-					data->pos[1] = data->spos[1] + dy;
-
-					data->marker->flag &= ~MARKER_TRACKED;
+					data->pos[0] = data->old_pos[0] + dx;
+					data->pos[1] = data->old_pos[1] + dy;
 				}
 
 				WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 				DAG_id_tag_update(&sc->clip->id, 0);
 			}
-			else {
+			else if (data->area == TRACK_AREA_PAT) {
 				if (data->action == SLIDE_ACTION_SIZE) {
-					data->min[0] = data->smin[0] - dx;
-					data->max[0] = data->smax[0] + dx;
+					float start[2], end[2];
+					float scale;
 
-					data->min[1] = data->smin[1] + dy;
-					data->max[1] = data->smax[1] - dy;
+					ED_clip_point_stable_pos(C, data->mval[0], data->mval[1], &start[0], &start[1]);
 
-					if (data->area == TRACK_AREA_SEARCH)
-						BKE_tracking_clamp_track(data->track, CLAMP_SEARCH_DIM);
-					else
-						BKE_tracking_clamp_track(data->track, CLAMP_PAT_DIM);
-				}
-				else {
-					float d[2] = {dx, dy};
-
-					if (data->area == TRACK_AREA_SEARCH) {
-						add_v2_v2v2(data->min, data->smin, d);
-						add_v2_v2v2(data->max, data->smax, d);
-					}
-					else {
-						int a;
+					sub_v2_v2(start, data->old_pos);
 
-						for (a = 0; a < data->track->markersnr; a++)
-							add_v2_v2v2(data->track->markers[a].pos, data->smarkers[a], d);
+					if (len_v2(start) > 0.0f) {
+						float mval[2];
 
-						sub_v2_v2v2(data->offset, data->soff, d);
-					}
-
-					if (data->area == TRACK_AREA_SEARCH)
-						BKE_tracking_clamp_track(data->track, CLAMP_SEARCH_POS);
-				}
-			}
+						if (data->accurate) {
+							mval[0] = data->mval[0] + (event->mval[0] - data->mval[0]) / 5.0f;
+							mval[1] = data->mval[1] + (event->mval[1] - data->mval[1]) / 5.0f;
+						}
+						else {
+							mval[0] = event->mval[0];
+							mval[1] = event->mval[1];
+						}
 
-			WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, NULL);
+						ED_clip_point_stable_pos(C, mval[0], mval[1], &end[0], &end[1]);
 
-			break;
+						sub_v2_v2(end, data->old_pos);
 
-		case LEFTMOUSE:
-			if (event->val == KM_RELEASE) {
-				free_slide_data(op->customdata);
+						scale = len_v2(end) / len_v2(start);
 
-				show_cursor(C);
+						if (scale > 0.0f) {
+							int a;
 
-				return OPERATOR_FINISHED;
-			}
-
-			break;
-
-		case ESCKEY:
-			cancel_mouse_slide(op->customdata);
-
-			free_slide_data(op->customdata);
-
-			show_cursor(C);
-
-			WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, NULL);
-
-			return OPERATOR_CANCELLED;
-	}
-
-	return OPERATOR_RUNNING_MODAL;
-}
-
-void CLIP_OT_slide_marker(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Slide Marker";
-	ot->description = "Slide marker areas";
-	ot->idname = "CLIP_OT_slide_marker";
-
-	/* api callbacks */
-	ot->poll = ED_space_clip_tracking_size_poll;
-	ot->invoke = slide_marker_invoke;
-	ot->modal = slide_marker_modal;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_GRAB_POINTER | OPTYPE_BLOCKING;
-
-	/* properties */
-	RNA_def_float_vector(ot->srna, "offset", 2, NULL, -FLT_MAX, FLT_MAX,
-		"Offset", "Offset in floating point units, 1.0 is the width and height of the image", -FLT_MAX, FLT_MAX);
-}
-
-/********************** mouse select operator *********************/
-
-static int mouse_on_side(float co[2], float x1, float y1, float x2, float y2, float epsx, float epsy)
-{
-	if (x1 > x2)
-
-		SWAP(float, x1, x2);
-
-	if (y1 > y2)
-		SWAP(float, y1, y2);
-
-	return (co[0] >= x1 - epsx && co[0] <= x2 + epsx) && (co[1] >= y1 - epsy && co[1] <= y2 + epsy);
-}
-
-static int mouse_on_rect(float co[2], float pos[2], float min[2], float max[2], float epsx, float epsy)
-{
-	return mouse_on_side(co, pos[0] + min[0], pos[1] + min[1], pos[0] + max[0], pos[1] + min[1], epsx, epsy) ||
-	       mouse_on_side(co, pos[0] + min[0], pos[1] + min[1], pos[0] + min[0], pos[1] + max[1], epsx, epsy) ||
-	       mouse_on_side(co, pos[0] + min[0], pos[1] + max[1], pos[0] + max[0], pos[1] + max[1], epsx, epsy) ||
-	       mouse_on_side(co, pos[0] + max[0], pos[1] + min[1], pos[0] + max[0], pos[1] + max[1], epsx, epsy);
-}
-
-static int track_mouse_area(SpaceClip *sc, float co[2], MovieTrackingTrack *track)
-{
-	MovieTrackingMarker *marker = BKE_tracking_get_marker(track, sc->user.framenr);
-	float epsx, epsy;
-	int width, height;
-
-	ED_space_clip_size(sc, &width, &height);
-
-	epsx = MIN4(track->pat_min[0] - track->search_min[0], track->search_max[0] - track->pat_max[0],
-	           fabsf(track->pat_min[0]), fabsf(track->pat_max[0])) / 2;
-	epsy = MIN4(track->pat_min[1] - track->search_min[1], track->search_max[1] - track->pat_max[1],
-	           fabsf(track->pat_min[1]), fabsf(track->pat_max[1])) / 2;
-
-	epsx = MAX2(epsx, 2.0f / width);
-	epsy = MAX2(epsy, 2.0f / height);
-
-	if (sc->flag & SC_SHOW_MARKER_SEARCH) {
-		if (mouse_on_rect(co, marker->pos, track->search_min, track->search_max, epsx, epsy))
-			return TRACK_AREA_SEARCH;
-	}
-
-	if ((marker->flag & MARKER_DISABLED) == 0) {
-		if (sc->flag & SC_SHOW_MARKER_PATTERN)
-			if (mouse_on_rect(co, marker->pos, track->pat_min, track->pat_max, epsx, epsy))
-				return TRACK_AREA_PAT;
-
-		epsx = 12.0f / width;
-		epsy = 12.0f / height;
-
-		if (fabsf(co[0] - marker->pos[0] - track->offset[0]) < epsx &&
-		    fabsf(co[1] - marker->pos[1] - track->offset[1]) <= epsy)
-		{
-			return TRACK_AREA_POINT;
-		}
-	}
-
-	return TRACK_AREA_NONE;
-}
-
-static float dist_to_rect(float co[2], float pos[2], float min[2], float max[2])
-{
-	float d1, d2, d3, d4;
-	float p[2] = {co[0] - pos[0], co[1] - pos[1]};
-	float v1[2] = {min[0], min[1]}, v2[2] = {max[0], min[1]};
-	float v3[2] = {max[0], max[1]}, v4[2] = {min[0], max[1]};
-
-	d1 = dist_to_line_segment_v2(p, v1, v2);
-	d2 = dist_to_line_segment_v2(p, v2, v3);
-	d3 = dist_to_line_segment_v2(p, v3, v4);
-	d4 = dist_to_line_segment_v2(p, v4, v1);
-
-	return MIN4(d1, d2, d3, d4);
-}
-
-static MovieTrackingTrack *find_nearest_track(SpaceClip *sc, ListBase *tracksbase, float co[2])
-{
-	MovieTrackingTrack *track = NULL, *cur;
-	float mindist = 0.0f;
-
-	cur = tracksbase->first;
-	while (cur) {
-		MovieTrackingMarker *marker = BKE_tracking_get_marker(cur, sc->user.framenr);
-
-		if (((cur->flag & TRACK_HIDDEN) == 0) && MARKER_VISIBLE(sc, cur, marker)) {
-			float dist, d1, d2 = FLT_MAX, d3 = FLT_MAX;
-
-			/* distance to marker point */
-			d1 = sqrtf((co[0] - marker->pos[0] - cur->offset[0]) * (co[0] - marker->pos[0] - cur->offset[0]) +
-					  (co[1] - marker->pos[1] - cur->offset[1]) * (co[1] - marker->pos[1] - cur->offset[1]));
-
-			/* distance to pattern boundbox */
-			if (sc->flag & SC_SHOW_MARKER_PATTERN)
-				d2 = dist_to_rect(co, marker->pos, cur->pat_min, cur->pat_max);
-
-			/* distance to search boundbox */
-			if (sc->flag & SC_SHOW_MARKER_SEARCH && TRACK_VIEW_SELECTED(sc, cur))
-				d3 = dist_to_rect(co, marker->pos, cur->search_min, cur->search_max);
-
-			/* choose minimal distance. useful for cases of overlapped markers. */
-			dist = MIN3(d1, d2, d3);
-
-			if (track == NULL || dist < mindist) {
-				track = cur;
-				mindist = dist;
-			}
-		}
-
-		cur = cur->next;
-	}
-
-	return track;
-}
-
-static int mouse_select(bContext *C, float co[2], int extend)
-{
-	SpaceClip *sc = CTX_wm_space_clip(C);
-	MovieClip *clip = ED_space_clip(sc);
-	MovieTracking *tracking = &clip->tracking;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
-	MovieTrackingTrack *act_track = BKE_tracking_active_track(tracking);
-	MovieTrackingTrack *track = NULL;	/* selected marker */
-
-	track = find_nearest_track(sc, tracksbase, co);
-
-	if (track) {
-		int area = track_mouse_area(sc, co, track);
-
-		if (!extend || !TRACK_VIEW_SELECTED(sc, track))
-			area = TRACK_AREA_ALL;
-
-		if (extend && TRACK_AREA_SELECTED(track, area)) {
-			if (track == act_track)
-				BKE_tracking_deselect_track(track, area);
-			else
-				clip->tracking.act_track = track;
-		}
-		else {
-			if (area == TRACK_AREA_POINT)
-				area = TRACK_AREA_ALL;
-
-			BKE_tracking_select_track(tracksbase, track, area, extend);
-			clip->tracking.act_track = track;
-		}
-	}
-
-	if (!extend) {
-		sc->xlockof = 0.0f;
-		sc->ylockof = 0.0f;
-	}
-
-	BKE_tracking_dopesheet_tag_update(tracking);
-
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, NULL);
-
-	return OPERATOR_FINISHED;
-}
-
-static int select_exec(bContext *C, wmOperator *op)
-{
-	float co[2];
-	int extend;
-
-	RNA_float_get_array(op->ptr, "location", co);
-	extend = RNA_boolean_get(op->ptr, "extend");
-
-	return mouse_select(C, co, extend);
-}
-
-static int select_invoke(bContext *C, wmOperator *op, wmEvent *event)
-{
-	float co[2];
-	int extend = RNA_boolean_get(op->ptr, "extend");
-
-	if (!extend) {
-		SlideMarkerData *slidedata = slide_marker_customdata(C, event);
+							for (a = 0; a < 4; a++) {
+								mul_v2_v2fl(data->corners[a], data->old_corners[a], scale);
+							}
+						}
+					}
 
-		if (slidedata) {
-			SpaceClip *sc = CTX_wm_space_clip(C);
-			MovieClip *clip = ED_space_clip(sc);
+					BKE_tracking_marker_clamp(data->marker, CLAMP_PAT_DIM);
+				}
+				else if (data->action == SLIDE_ACTION_OFFSET) {
+					float d[2] = {dx, dy};
+					int a;
 
-			clip->tracking.act_track = slidedata->track;
+					for (a = 0; a < data->track->markersnr; a++)
+						add_v2_v2v2(data->track->markers[a].pos, data->old_markers[a], d);
 
-			WM_event_add_notifier(C, NC_GEOM | ND_SELECT, NULL);
+					sub_v2_v2v2(data->offset, data->old_offset, d);
+				}
+				else if (data->action == SLIDE_ACTION_POS) {
+					float spos[2];
 
-			MEM_freeN(slidedata);
+					copy_v2_v2(spos, data->pos);
 
-			return OPERATOR_PASS_THROUGH;
-		}
-	}
+					data->pos[0] = data->spos[0] + dx;
+					data->pos[1] = data->spos[1] + dy;
 
-	ED_clip_mouse_pos(C, event, co);
-	RNA_float_set_array(op->ptr, "location", co);
+					if (!slide_check_corners(data->corners)) {
+						copy_v2_v2(data->pos, spos);
+					}
 
-	return select_exec(C, op);
-}
+					/* currently only patterns are allowed to have such combination of event and data */
+					BKE_tracking_marker_clamp(data->marker, CLAMP_PAT_DIM);
+				}
+				else if (data->action == SLIDE_ACTION_TILT_SIZE) {
+					float start[2], end[2];
+					float scale = 1.0f, angle = 0.0f;
+					int a;
+					float mval[2];
+
+					if (data->accurate) {
+						mval[0] = data->mval[0] + (event->mval[0] - data->mval[0]) / 5.0f;
+						mval[1] = data->mval[1] + (event->mval[1] - data->mval[1]) / 5.0f;
+					}
+					else {
+						mval[0] = event->mval[0];
+						mval[1] = event->mval[1];
+					}
 
-void CLIP_OT_select(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Select";
-	ot->description = "Select tracking markers";
-	ot->idname = "CLIP_OT_select";
+					sub_v2_v2v2(start, data->spos, data->old_pos);
 
-	/* api callbacks */
-	ot->exec = select_exec;
-	ot->invoke = select_invoke;
-	ot->poll = ED_space_clip_tracking_poll;
+					ED_clip_point_stable_pos(C, mval[0], mval[1], &end[0], &end[1]);
+					sub_v2_v2(end, data->old_pos);
 
-	/* flags */
-	ot->flag = OPTYPE_UNDO;
+					if (len_v2(start) > 0.0f) {
+						scale = len_v2(end) / len_v2(start);
 
-	/* properties */
-	RNA_def_boolean(ot->srna, "extend", 0,
-		"Extend", "Extend selection rather than clearing the existing selection");
-	RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX,
-		"Location", "Mouse location in normalized coordinates, 0.0 to 1.0 is within the image bounds", -100.0f, 100.0f);
-}
+						if (scale < 0.0f) {
+							scale = 0.0;
+						}
+					}
 
-/********************** border select operator *********************/
+					angle = -angle_signed_v2v2(start, end);
 
-static int border_select_exec(bContext *C, wmOperator *op)
-{
-	SpaceClip *sc = CTX_wm_space_clip(C);
-	MovieClip *clip = ED_space_clip(sc);
-	MovieTracking *tracking = &clip->tracking;
-	MovieTrackingTrack *track;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
-	rcti rect;
-	rctf rectf;
-	int change = FALSE, mode, extend;
+					for (a = 0; a < 4; a++) {
+						float vec[2];
 
-	/* get rectangle from operator */
-	rect.xmin = RNA_int_get(op->ptr, "xmin");
-	rect.ymin = RNA_int_get(op->ptr, "ymin");
-	rect.xmax = RNA_int_get(op->ptr, "xmax");
-	rect.ymax = RNA_int_get(op->ptr, "ymax");
+						mul_v2_v2fl(data->corners[a], data->old_corners[a], scale);
 
-	ED_clip_point_stable_pos(C, rect.xmin, rect.ymin, &rectf.xmin, &rectf.ymin);
-	ED_clip_point_stable_pos(C, rect.xmax, rect.ymax, &rectf.xmax, &rectf.ymax);
+						copy_v2_v2(vec, data->corners[a]);
+						vec[0] *= data->width;
+						vec[1] *= data->height;
 
-	mode = RNA_int_get(op->ptr, "gesture_mode");
-	extend = RNA_boolean_get(op->ptr, "extend");
+						data->corners[a][0] = (vec[0] * cos(angle) - vec[1] * sin(angle)) / data->width;
+						data->corners[a][1] = (vec[1] * cos(angle) + vec[0] * sin(angle)) / data->height;
+					}
 
-	/* do actual selection */
-	track = tracksbase->first;
-	while (track) {
-		if ((track->flag & TRACK_HIDDEN) == 0) {
-			MovieTrackingMarker *marker = BKE_tracking_get_marker(track, sc->user.framenr);
+					BKE_tracking_marker_clamp(data->marker, CLAMP_PAT_DIM);
 
-			if (MARKER_VISIBLE(sc, track, marker)) {
-				if (BLI_in_rctf(&rectf, marker->pos[0], marker->pos[1])) {
-					BKE_tracking_track_flag(track, TRACK_AREA_ALL, SELECT, mode != GESTURE_MODAL_SELECT);
 				}
-				else if (!extend) {
-					BKE_tracking_track_flag(track, TRACK_AREA_ALL, SELECT, 1);
-				}
-
-				change = TRUE;
 			}
-		}
-
-		track = track->next;
-	}
-
-	if (change) {
-		BKE_tracking_dopesheet_tag_update(tracking);
-
-		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, NULL);
-
-		return OPERATOR_FINISHED;
-	}
-
-	return OPERATOR_CANCELLED;
-}
-
-void CLIP_OT_select_border(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Border Select";
-	ot->description = "Select markers using border selection";
-	ot->idname = "CLIP_OT_select_border";
-
-	/* api callbacks */
-	ot->invoke = WM_border_select_invoke;
-	ot->exec = border_select_exec;
-	ot->modal = WM_border_select_modal;
-	ot->poll = ED_space_clip_tracking_poll;
-
-	/* flags */
-	ot->flag = OPTYPE_UNDO;
-
-	/* properties */
-	WM_operator_properties_gesture_border(ot, TRUE);
-}
-
-
-static int do_lasso_select_marker(bContext *C, int mcords[][2], short moves, short select)
-{
-	ARegion *ar = CTX_wm_region(C);
-	SpaceClip *sc = CTX_wm_space_clip(C);
-	MovieClip *clip = ED_space_clip(sc);
-	MovieTracking *tracking = &clip->tracking;
-	MovieTrackingTrack *track;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
-	rcti rect;
-	int change = FALSE;
-
-	/* get rectangle from operator */
-	BLI_lasso_boundbox(&rect, mcords, moves);
-
-	/* do actual selection */
-	track = tracksbase->first;
-	while (track) {
-		if ((track->flag & TRACK_HIDDEN) == 0) {
-			MovieTrackingMarker *marker = BKE_tracking_get_marker(track, sc->user.framenr);
+			else if (data->area == TRACK_AREA_SEARCH) {
+				if (data->action == SLIDE_ACTION_SIZE) {
+					data->min[0] = data->old_search_min[0] - dx;
+					data->max[0] = data->old_search_max[0] + dx;
 
-			if (MARKER_VISIBLE(sc, track, marker)) {
-				float screen_co[2];
+					data->min[1] = data->old_search_min[1] + dy;
+					data->max[1] = data->old_search_max[1] - dy;
 
-				/* marker in screen coords */
-				ED_clip_point_stable_pos__reverse(sc, ar, marker->pos, screen_co);
+					BKE_tracking_marker_clamp(data->marker, CLAMP_SEARCH_DIM);
+				}
+				else if (data->area == TRACK_AREA_SEARCH) {
+					float d[2] = {dx, dy};
 
-				if (BLI_in_rcti(&rect, screen_co[0], screen_co[1]) &&
-				    BLI_lasso_is_point_inside(mcords, moves, screen_co[0], screen_co[1], V2D_IS_CLIPPED))
-				{
-					BKE_tracking_track_flag(track, TRACK_AREA_ALL, SELECT, !select);
+					add_v2_v2v2(data->min, data->old_search_min, d);
+					add_v2_v2v2(data->max, data->old_search_max, d);
 				}
 
-				change = TRUE;
+				BKE_tracking_marker_clamp(data->marker, CLAMP_SEARCH_POS);
 			}
-		}
-
-		track = track->next;
-	}
-
-	if (change) {
-		BKE_tracking_dopesheet_tag_update(tracking);
-
-		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, NULL);
-	}
-
-	return change;
-}
 
-static int clip_lasso_select_exec(bContext *C, wmOperator *op)
-{
-	int mcords_tot;
-	int (*mcords)[2] = WM_gesture_lasso_path_to_array(C, op, &mcords_tot);
-
-	if (mcords) {
-		short select;
-
-		select = !RNA_boolean_get(op->ptr, "deselect");
-		do_lasso_select_marker(C, mcords, mcords_tot, select);
-
-		MEM_freeN(mcords);
-
-		return OPERATOR_FINISHED;
-	}
-	return OPERATOR_PASS_THROUGH;
-}
-
-void CLIP_OT_select_lasso(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Lasso Select";
-	ot->description = "Select markers using lasso selection";
-	ot->idname = "CLIP_OT_select_lasso";
-
-	/* api callbacks */
-	ot->invoke = WM_gesture_lasso_invoke;
-	ot->modal = WM_gesture_lasso_modal;
-	ot->exec = clip_lasso_select_exec;
-	ot->poll = ED_space_clip_tracking_poll;
-	ot->cancel = WM_gesture_lasso_cancel;
-
-	/* flags */
-	ot->flag = OPTYPE_UNDO;
-
-	/* properties */
-	RNA_def_collection_runtime(ot->srna, "path", &RNA_OperatorMousePath, "Path", "");
-	RNA_def_boolean(ot->srna, "deselect", 0, "Deselect", "Deselect rather than select items");
-	RNA_def_boolean(ot->srna, "extend", 1, "Extend", "Extend selection instead of deselecting everything first");
-}
-
-/********************** circle select operator *********************/
-
-static int marker_inside_ellipse(MovieTrackingMarker *marker, float offset[2], float ellipse[2])
-{
-	/* normalized ellipse: ell[0] = scaleX, ell[1] = scaleY */
-	float x, y;
-
-	x = (marker->pos[0] - offset[0])*ellipse[0];
-	y = (marker->pos[1] - offset[1])*ellipse[1];
-
-	return x*x + y*y < 1.0f;
-}
-
-static int circle_select_exec(bContext *C, wmOperator *op)
-{
-	SpaceClip *sc = CTX_wm_space_clip(C);
-	MovieClip *clip = ED_space_clip(sc);
-	ARegion *ar = CTX_wm_region(C);
-	MovieTracking *tracking = &clip->tracking;
-	MovieTrackingTrack *track;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
-	int x, y, radius, width, height, mode, change = FALSE;
-	float zoomx, zoomy, offset[2], ellipse[2];
-
-	/* get operator properties */
-	x = RNA_int_get(op->ptr, "x");
-	y = RNA_int_get(op->ptr, "y");
-	radius = RNA_int_get(op->ptr, "radius");
+			data->marker->flag &= ~MARKER_TRACKED;
 
-	mode = RNA_int_get(op->ptr, "gesture_mode");
-
-	/* compute ellipse and position in unified coordinates */
-	ED_space_clip_size(sc, &width, &height);
-	ED_space_clip_zoom(sc, ar, &zoomx, &zoomy);
-
-	ellipse[0] = width * zoomx / radius;
-	ellipse[1] = height * zoomy / radius;
+			WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, NULL);
 
-	ED_clip_point_stable_pos(C, x, y, &offset[0], &offset[1]);
+			break;
 
-	/* do selection */
-	track = tracksbase->first;
-	while (track) {
-		if ((track->flag & TRACK_HIDDEN) == 0) {
-			MovieTrackingMarker *marker = BKE_tracking_get_marker(track, sc->user.framenr);
+		case LEFTMOUSE:
+			if (event->val == KM_RELEASE) {
+				free_slide_data(op->customdata);
 
-			if (MARKER_VISIBLE(sc, track, marker) && marker_inside_ellipse(marker, offset, ellipse)) {
-				BKE_tracking_track_flag(track, TRACK_AREA_ALL, SELECT, mode != GESTURE_MODAL_SELECT);
+				show_cursor(C);
 
-				change = TRUE;
+				return OPERATOR_FINISHED;
 			}
-		}
-
-		track = track->next;
-	}
-
-	if (change) {
-		BKE_tracking_dopesheet_tag_update(tracking);
 
-		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, NULL);
-
-		return OPERATOR_FINISHED;
-	}
-
-	return OPERATOR_CANCELLED;
-}
-
-void CLIP_OT_select_circle(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "Circle Select";
-	ot->description = "Select markers using circle selection";
-	ot->idname = "CLIP_OT_select_circle";
-
-	/* api callbacks */
-	ot->invoke = WM_gesture_circle_invoke;
-	ot->modal = WM_gesture_circle_modal;
-	ot->exec = circle_select_exec;
-	ot->poll = ED_space_clip_tracking_poll;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-
-	/* properties */
-	RNA_def_int(ot->srna, "x", 0, INT_MIN, INT_MAX, "X", "", INT_MIN, INT_MAX);
-	RNA_def_int(ot->srna, "y", 0, INT_MIN, INT_MAX, "Y", "", INT_MIN, INT_MAX);
-	RNA_def_int(ot->srna, "radius", 0, INT_MIN, INT_MAX, "Radius", "", INT_MIN, INT_MAX);
-	RNA_def_int(ot->srna, "gesture_mode", 0, INT_MIN, INT_MAX, "Gesture Mode", "", INT_MIN, INT_MAX);
-}
-
-/********************** select all operator *********************/
-
-static int select_all_exec(bContext *C, wmOperator *op)
-{
-	SpaceClip *sc = CTX_wm_space_clip(C);
-	MovieClip *clip = ED_space_clip(sc);
-	MovieTracking *tracking = &clip->tracking;
-	MovieTrackingTrack *track = NULL;	/* selected track */
-	MovieTrackingMarker *marker;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
-	int action = RNA_enum_get(op->ptr, "action");
-	int framenr = sc->user.framenr;
-	int has_selection = FALSE;
-
-	if (action == SEL_TOGGLE) {
-		action = SEL_SELECT;
-		track = tracksbase->first;
-		while (track) {
-			if (TRACK_VIEW_SELECTED(sc, track)) {
-				marker = BKE_tracking_get_marker(track, framenr);
+			break;
 
-				if (MARKER_VISIBLE(sc, track, marker)) {
-					action = SEL_DESELECT;
-					break;
-				}
-			}
+		case ESCKEY:
+			cancel_mouse_slide(op->customdata);
 
-			track = track->next;
-		}
-	}
+			free_slide_data(op->customdata);
 
-	track = tracksbase->first;
-	while (track) {
-		if ((track->flag & TRACK_HIDDEN) == 0) {
-			marker = BKE_tracking_get_marker(track, framenr);
-
-			if (MARKER_VISIBLE(sc, track, marker)) {
-				switch (action) {
-					case SEL_SELECT:
-						track->flag |= SELECT;
-						track->pat_flag |= SELECT;
-						track->search_flag |= SELECT;
-						break;
-					case SEL_DESELECT:
-						track->flag &= ~SELECT;
-						track->pat_flag &= ~SELECT;
-						track->search_flag &= ~SELECT;
-						break;
-					case SEL_INVERT:
-						track->flag ^= SELECT;
-						track->pat_flag ^= SELECT;
-						track->search_flag ^= SELECT;
-						break;
-				}
-			}
-		}
+			show_cursor(C);
 
-		if (TRACK_VIEW_SELECTED(sc, track))
-			has_selection = TRUE;
+			WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, NULL);
 
-		track = track->next;
+			return OPERATOR_CANCELLED;
 	}
 
-	if (!has_selection)
-		sc->flag &= ~SC_LOCK_SELECTION;
-
-	BKE_tracking_dopesheet_tag_update(tracking);
-
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, NULL);
-
-	return OPERATOR_FINISHED;
+	return OPERATOR_RUNNING_MODAL;
 }
 
-void CLIP_OT_select_all(wmOperatorType *ot)
+void CLIP_OT_slide_marker(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name = "(De)select All";
-	ot->description = "Change selection of all tracking markers";
-	ot->idname = "CLIP_OT_select_all";
+	ot->name = "Slide Marker";
+	ot->description = "Slide marker areas";
+	ot->idname = "CLIP_OT_slide_marker";
 
 	/* api callbacks */
-	ot->exec = select_all_exec;
 	ot->poll = ED_space_clip_tracking_poll;
+	ot->invoke = slide_marker_invoke;
+	ot->modal = slide_marker_modal;
 
 	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-
-	WM_operator_properties_select_all(ot);
-}
-
-/********************** select grouped operator *********************/
-
-static int select_groped_exec(bContext *C, wmOperator *op)
-{
-	SpaceClip *sc = CTX_wm_space_clip(C);
-	MovieClip *clip = ED_space_clip(sc);
-	MovieTrackingTrack *track;
-	MovieTrackingMarker *marker;
-	MovieTracking *tracking = &clip->tracking;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
-	int group = RNA_enum_get(op->ptr, "group");
-
-	track = tracksbase->first;
-	while (track) {
-		int ok = FALSE;
-
-		marker = BKE_tracking_get_marker(track, sc->user.framenr);
-
-		if (group == 0) { /* Keyframed */
-			ok = marker->framenr == sc->user.framenr && (marker->flag & MARKER_TRACKED) == 0;
-		}
-		else if (group == 1) { /* Estimated */
-			ok = marker->framenr != sc->user.framenr;
-		}
-		else if (group == 2) { /* tracked */
-			ok = marker->framenr == sc->user.framenr && (marker->flag & MARKER_TRACKED);
-		}
-		else if (group == 3) { /* locked */
-			ok = track->flag & TRACK_LOCKED;
-		}
-		else if (group == 4) { /* disabled */
-			ok = marker->flag & MARKER_DISABLED;
-		}
-		else if (group == 5) { /* color */
-			MovieTrackingTrack *act_track = BKE_tracking_active_track(tracking);
-
-			if (act_track) {
-				ok = (track->flag & TRACK_CUSTOMCOLOR) == (act_track->flag & TRACK_CUSTOMCOLOR);
-
-				if (ok && track->flag & TRACK_CUSTOMCOLOR)
-					ok = equals_v3v3(track->color, act_track->color);
-			}
-		}
-		else if (group == 6) { /* failed */
-			ok = (track->flag & TRACK_HAS_BUNDLE) == 0;
-		}
-
-		if (ok) {
-			track->flag |= SELECT;
-			if (sc->flag & SC_SHOW_MARKER_PATTERN)
-				track->pat_flag |= SELECT;
-			if (sc->flag & SC_SHOW_MARKER_SEARCH)
-				track->search_flag |= SELECT;
-		}
-
-		track = track->next;
-	}
-
-	BKE_tracking_dopesheet_tag_update(tracking);
-
-	WM_event_add_notifier(C, NC_MOVIECLIP | ND_DISPLAY, clip);
-
-	return OPERATOR_FINISHED;
-}
-
-void CLIP_OT_select_grouped(wmOperatorType *ot)
-{
-	static EnumPropertyItem select_group_items[] = {
-			{0, "KEYFRAMED", 0, "Keyframed tracks", "Select all keyframed tracks"},
-			{1, "ESTIMATED", 0, "Estimated tracks", "Select all estimated tracks"},
-			{2, "TRACKED", 0, "Tracked tracks", "Select all tracked tracks"},
-			{3, "LOCKED", 0, "Locked tracks", "Select all locked tracks"},
-			{4, "DISABLED", 0, "Disabled tracks", "Select all disabled tracks"},
-			{5, "COLOR", 0, "Tracks with same color", "Select all tracks with same color as active track"},
-			{6, "FAILED", 0, "Failed Tracks", "Select all tracks which failed to be reconstructed"},
-			{0, NULL, 0, NULL, NULL}
-	};
-
-	/* identifiers */
-	ot->name = "Select Grouped";
-	ot->description = "Select all tracks from specified group";
-	ot->idname = "CLIP_OT_select_grouped";
-
-	/* api callbacks */
-	ot->exec = select_groped_exec;
-	ot->poll = ED_space_clip_tracking_size_poll;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_GRAB_POINTER | OPTYPE_BLOCKING;
 
-	/* proeprties */
-	RNA_def_enum(ot->srna, "group", select_group_items, TRACK_CLEAR_REMAINED, "Action", "Clear action to execute");
+	/* properties */
+	RNA_def_float_vector(ot->srna, "offset", 2, NULL, -FLT_MAX, FLT_MAX,
+	                     "Offset", "Offset in floating point units, 1.0 is the width and height of the image", -FLT_MAX, FLT_MAX);
 }
 
 /********************** track operator *********************/
 
 typedef struct TrackMarkersJob {
-	struct MovieTrackingContext *context;	/* tracking context */
-	int sfra, efra, lastfra;	/* Start, end and recently tracked frames */
-	int backwards;				/* Backwards tracking flag */
-	MovieClip *clip;			/* Clip which is tracking */
-	float delay;				/* Delay in milliseconds to allow tracking at fixed FPS */
+	struct MovieTrackingContext *context;   /* tracking context */
+	int sfra, efra, lastfra;    /* Start, end and recently tracked frames */
+	int backwards;              /* Backwards tracking flag */
+	MovieClip *clip;            /* Clip which is tracking */
+	float delay;                /* Delay in milliseconds to allow tracking at fixed FPS */
 
 	struct Main *main;
 	struct Scene *scene;
@@ -1330,14 +944,14 @@ static int track_markers_testbreak(void)
 static int track_count_markers(SpaceClip *sc, MovieClip *clip)
 {
 	int tot = 0;
-	ListBase *tracksbase = BKE_tracking_get_tracks(&clip->tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(&clip->tracking);
 	MovieTrackingTrack *track;
-	int framenr = sc->user.framenr;
+	int framenr = ED_space_clip_clip_framenr(sc);
 
 	track = tracksbase->first;
 	while (track) {
 		if (TRACK_VIEW_SELECTED(sc, track) && (track->flag & TRACK_LOCKED) == 0) {
-			MovieTrackingMarker *marker = BKE_tracking_get_marker(track, framenr);
+			MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
 
 			if (!marker || (marker->flag & MARKER_DISABLED) == 0)
 				tot++;
@@ -1351,7 +965,7 @@ static int track_count_markers(SpaceClip *sc, MovieClip *clip)
 
 static void clear_invisible_track_selection(SpaceClip *sc, MovieClip *clip)
 {
-	ListBase *tracksbase = BKE_tracking_get_tracks(&clip->tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(&clip->tracking);
 	int hidden = 0;
 
 	if ((sc->flag & SC_SHOW_MARKER_PATTERN) == 0)
@@ -1365,7 +979,7 @@ static void clear_invisible_track_selection(SpaceClip *sc, MovieClip *clip)
 
 		while (track) {
 			if ((track->flag & TRACK_HIDDEN) == 0)
-				BKE_tracking_track_flag(track, hidden, SELECT, 1);
+				BKE_tracking_track_flag_clear(track, hidden, SELECT);
 
 			track = track->next;
 		}
@@ -1374,9 +988,9 @@ static void clear_invisible_track_selection(SpaceClip *sc, MovieClip *clip)
 
 static void track_init_markers(SpaceClip *sc, MovieClip *clip, int *frames_limit_r)
 {
-	ListBase *tracksbase = BKE_tracking_get_tracks(&clip->tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(&clip->tracking);
 	MovieTrackingTrack *track;
-	int framenr = sc->user.framenr;
+	int framenr = ED_space_clip_clip_framenr(sc);
 	int frames_limit = 0;
 
 	clear_invisible_track_selection(sc, clip);
@@ -1385,7 +999,7 @@ static void track_init_markers(SpaceClip *sc, MovieClip *clip, int *frames_limit
 	while (track) {
 		if (TRACK_VIEW_SELECTED(sc, track)) {
 			if ((track->flag & TRACK_HIDDEN) == 0 && (track->flag & TRACK_LOCKED) == 0) {
-				BKE_tracking_ensure_marker(track, framenr);
+				BKE_tracking_marker_ensure(track, framenr);
 
 				if (track->frames_limit) {
 					if (frames_limit == 0)
@@ -1426,7 +1040,7 @@ static int track_markers_initjob(bContext *C, TrackMarkersJob *tmj, int backward
 
 	track_init_markers(sc, clip, &frames_limit);
 
-	tmj->sfra = sc->user.framenr;
+	tmj->sfra = ED_space_clip_clip_framenr(sc);
 	tmj->clip = clip;
 	tmj->backwards = backwards;
 
@@ -1443,6 +1057,8 @@ static int track_markers_initjob(bContext *C, TrackMarkersJob *tmj, int backward
 			tmj->efra = MIN2(tmj->efra, tmj->sfra + frames_limit);
 	}
 
+	tmj->efra = BKE_movieclip_remap_scene_to_clip_frame(clip, tmj->efra);
+
 	if (settings->speed != TRACKING_SPEED_FASTEST) {
 		tmj->delay = 1.0f / scene->r.frs_sec * 1000.0f;
 
@@ -1488,15 +1104,15 @@ static void track_markers_startjob(void *tmv, short *stop, short *do_update, flo
 
 			double start_time = PIL_check_seconds_timer(), exec_time;
 
-			if (!BKE_tracking_next(tmj->context))
+			if (!BKE_tracking_context_step(tmj->context))
 				break;
 
 			exec_time = PIL_check_seconds_timer() - start_time;
 			if (tmj->delay > (float)exec_time)
 				PIL_sleep_ms(tmj->delay - (float)exec_time);
 		}
-		else if (!BKE_tracking_next(tmj->context))
-				break;
+		else if (!BKE_tracking_context_step(tmj->context))
+			break;
 
 		*do_update = TRUE;
 		*progress = (float)(framenr - tmj->sfra) / (tmj->efra - tmj->sfra);
@@ -1519,7 +1135,7 @@ static void track_markers_updatejob(void *tmv)
 {
 	TrackMarkersJob *tmj = (TrackMarkersJob *)tmv;
 
-	BKE_tracking_sync(tmj->context);
+	BKE_tracking_context_sync(tmj->context);
 }
 
 static void track_markers_freejob(void *tmv)
@@ -1527,10 +1143,10 @@ static void track_markers_freejob(void *tmv)
 	TrackMarkersJob *tmj = (TrackMarkersJob *)tmv;
 
 	tmj->clip->tracking_context = NULL;
-	tmj->scene->r.cfra = tmj->lastfra;
+	tmj->scene->r.cfra = BKE_movieclip_remap_clip_to_scene_frame(tmj->clip, tmj->lastfra);
 	ED_update_for_newframe(tmj->main, tmj->scene, 0);
 
-	BKE_tracking_sync(tmj->context);
+	BKE_tracking_context_sync(tmj->context);
 	BKE_tracking_context_free(tmj->context);
 
 	MEM_freeN(tmj);
@@ -1544,7 +1160,7 @@ static int track_markers_exec(bContext *C, wmOperator *op)
 	MovieClip *clip = ED_space_clip(sc);
 	Scene *scene = CTX_data_scene(C);
 	struct MovieTrackingContext *context;
-	int framenr = sc->user.framenr;
+	int framenr = ED_space_clip_clip_framenr(sc);
 	int sfra = framenr, efra;
 	int backwards = RNA_boolean_get(op->ptr, "backwards");
 	int sequence = RNA_boolean_get(op->ptr, "sequence");
@@ -1568,6 +1184,8 @@ static int track_markers_exec(bContext *C, wmOperator *op)
 			efra = MIN2(efra, sfra + frames_limit);
 	}
 
+	efra = BKE_movieclip_remap_scene_to_clip_frame(clip, efra);
+
 	if (!track_markers_check_direction(backwards, framenr, efra))
 		return OPERATOR_CANCELLED;
 
@@ -1575,7 +1193,7 @@ static int track_markers_exec(bContext *C, wmOperator *op)
 	context = BKE_tracking_context_new(clip, &sc->user, backwards, sequence);
 
 	while (framenr != efra) {
-		if (!BKE_tracking_next(context))
+		if (!BKE_tracking_context_step(context))
 			break;
 
 		if (backwards) framenr--;
@@ -1585,11 +1203,11 @@ static int track_markers_exec(bContext *C, wmOperator *op)
 			break;
 	}
 
-	BKE_tracking_sync(context);
+	BKE_tracking_context_sync(context);
 	BKE_tracking_context_free(context);
 
 	/* update scene current frame to the lastes tracked frame */
-	scene->r.cfra = framenr;
+	scene->r.cfra = BKE_movieclip_remap_clip_to_scene_frame(clip, framenr);
 
 	WM_event_add_notifier(C, NC_MOVIECLIP | NA_EVALUATED, clip);
 	WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene);
@@ -1680,7 +1298,7 @@ void CLIP_OT_track_markers(wmOperatorType *ot)
 	/* api callbacks */
 	ot->exec = track_markers_exec;
 	ot->invoke = track_markers_invoke;
-	ot->poll = ED_space_clip_tracking_frame_poll;
+	ot->poll = ED_space_clip_tracking_poll;
 	ot->modal = track_markers_modal;
 
 	/* flags */
@@ -1712,10 +1330,10 @@ static int solve_camera_initjob(bContext *C, SolveCameraJob *scj, wmOperator *op
 	Scene *scene = CTX_data_scene(C);
 	MovieTracking *tracking = &clip->tracking;
 	MovieTrackingSettings *settings = &clip->tracking.settings;
-	MovieTrackingObject *object = BKE_tracking_active_object(tracking);
+	MovieTrackingObject *object = BKE_tracking_object_get_active(tracking);
 	int width, height;
 
-	if (!BKE_tracking_can_reconstruct(tracking, object, error_msg, max_error))
+	if (!BKE_tracking_reconstruction_check(tracking, object, error_msg, max_error))
 		return 0;
 
 	/* could fail if footage uses images with different sizes */
@@ -1727,7 +1345,7 @@ static int solve_camera_initjob(bContext *C, SolveCameraJob *scj, wmOperator *op
 	scj->user = sc->user;
 
 	scj->context = BKE_tracking_reconstruction_context_new(tracking, object,
-			settings->keyframe1, settings->keyframe2, width, height);
+	                                                       settings->keyframe1, settings->keyframe2, width, height);
 
 	tracking->stats = MEM_callocN(sizeof(MovieTrackingStats), "solve camera stats");
 
@@ -1746,8 +1364,8 @@ static void solve_camera_startjob(void *scv, short *stop, short *do_update, floa
 {
 	SolveCameraJob *scj = (SolveCameraJob *)scv;
 
-	BKE_tracking_solve_reconstruction(scj->context, stop, do_update, progress,
-			scj->stats_message, sizeof(scj->stats_message));
+	BKE_tracking_reconstruction_solve(scj->context, stop, do_update, progress,
+	                                  scj->stats_message, sizeof(scj->stats_message));
 }
 
 static void solve_camera_freejob(void *scv)
@@ -1764,7 +1382,7 @@ static void solve_camera_freejob(void *scv)
 		return;
 	}
 
-	solved = BKE_tracking_finish_reconstruction(scj->context, tracking);
+	solved = BKE_tracking_reconstruction_finish(scj->context, tracking);
 
 	if (!solved)
 		BKE_report(scj->reports, RPT_WARNING, "Some data failed to reconstruct, see console for details");
@@ -1780,7 +1398,7 @@ static void solve_camera_freejob(void *scv)
 
 	/* set blender camera focal length so result would look fine there */
 	if (scene->camera) {
-		Camera *camera = (Camera*)scene->camera->data;
+		Camera *camera = (Camera *)scene->camera->data;
 		int width, height;
 
 		BKE_movieclip_get_size(clip, &scj->user, &width, &height);
@@ -1834,7 +1452,7 @@ static int solve_camera_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(even
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	MovieTrackingReconstruction *reconstruction = BKE_tracking_get_reconstruction(tracking);
+	MovieTrackingReconstruction *reconstruction = BKE_tracking_get_active_reconstruction(tracking);
 	wmJob *steve;
 	char error_msg[256] = "\0";
 
@@ -1916,8 +1534,8 @@ static int clear_solution_exec(bContext *C, wmOperator *UNUSED(op))
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	ListBase *tracksbase = BKE_tracking_get_tracks(&clip->tracking);
-	MovieTrackingReconstruction *reconstruction = BKE_tracking_get_reconstruction(tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(&clip->tracking);
+	MovieTrackingReconstruction *reconstruction = BKE_tracking_get_active_reconstruction(tracking);
 	MovieTrackingTrack *track = tracksbase->first;
 
 	while (track) {
@@ -1964,19 +1582,20 @@ static int clear_track_path_exec(bContext *C, wmOperator *op)
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTrackingTrack *track;
-	ListBase *tracksbase = BKE_tracking_get_tracks(&clip->tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(&clip->tracking);
 	int action = RNA_enum_get(op->ptr, "action");
 	int clear_active = RNA_boolean_get(op->ptr, "clear_active");
+	int framenr = ED_space_clip_clip_framenr(sc);
 
 	if (clear_active) {
-		track = BKE_tracking_active_track(&clip->tracking);
-		BKE_tracking_clear_path(track, sc->user.framenr, action);
+		track = BKE_tracking_track_get_active(&clip->tracking);
+		BKE_tracking_track_path_clear(track, framenr, action);
 	}
 	else {
 		track = tracksbase->first;
 		while (track) {
 			if (TRACK_VIEW_SELECTED(sc, track))
-				BKE_tracking_clear_path(track, sc->user.framenr, action);
+				BKE_tracking_track_path_clear(track, framenr, action);
 
 			track = track->next;
 		}
@@ -1990,10 +1609,10 @@ static int clear_track_path_exec(bContext *C, wmOperator *op)
 void CLIP_OT_clear_track_path(wmOperatorType *ot)
 {
 	static EnumPropertyItem clear_path_actions[] = {
-			{TRACK_CLEAR_UPTO, "UPTO", 0, "Clear up-to", "Clear path up to current frame"},
-			{TRACK_CLEAR_REMAINED, "REMAINED", 0, "Clear remained", "Clear path at remaining frames (after current)"},
-			{TRACK_CLEAR_ALL, "ALL", 0, "Clear all", "Clear the whole path"},
-			{0, NULL, 0, NULL, NULL}
+		{TRACK_CLEAR_UPTO, "UPTO", 0, "Clear up-to", "Clear path up to current frame"},
+		{TRACK_CLEAR_REMAINED, "REMAINED", 0, "Clear remained", "Clear path at remaining frames (after current)"},
+		{TRACK_CLEAR_ALL, "ALL", 0, "Clear all", "Clear the whole path"},
+		{0, NULL, 0, NULL, NULL}
 	};
 
 	/* identifiers */
@@ -2020,13 +1639,14 @@ static int disable_markers_exec(bContext *C, wmOperator *op)
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
 	MovieTrackingTrack *track = tracksbase->first;
 	int action = RNA_enum_get(op->ptr, "action");
+	int framenr = ED_space_clip_clip_framenr(sc);
 
 	while (track) {
 		if (TRACK_VIEW_SELECTED(sc, track) && (track->flag & TRACK_LOCKED) == 0) {
-			MovieTrackingMarker *marker = BKE_tracking_ensure_marker(track, sc->user.framenr);
+			MovieTrackingMarker *marker = BKE_tracking_marker_ensure(track, framenr);
 
 			if (action == 0)
 				marker->flag |= MARKER_DISABLED;
@@ -2048,10 +1668,10 @@ static int disable_markers_exec(bContext *C, wmOperator *op)
 void CLIP_OT_disable_markers(wmOperatorType *ot)
 {
 	static EnumPropertyItem actions_items[] = {
-			{0, "DISABLE", 0, "Disable", "Disable selected markers"},
-			{1, "ENABLE", 0, "Enable", "Enable selected markers"},
-			{2, "TOGGLE", 0, "Toggle", "Toggle disabled flag for selected markers"},
-			{0, NULL, 0, NULL, NULL}
+		{0, "DISABLE", 0, "Disable", "Disable selected markers"},
+		{1, "ENABLE", 0, "Enable", "Enable selected markers"},
+		{2, "TOGGLE", 0, "Toggle", "Toggle disabled flag for selected markers"},
+		{0, NULL, 0, NULL, NULL}
 	};
 
 	/* identifiers */
@@ -2101,7 +1721,7 @@ static Object *get_orientation_object(bContext *C)
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	MovieTrackingObject *tracking_object = BKE_tracking_active_object(tracking);
+	MovieTrackingObject *tracking_object = BKE_tracking_object_get_active(tracking);
 	Object *object = NULL;
 
 	if (tracking_object->flag & TRACKING_OBJECT_CAMERA) {
@@ -2119,18 +1739,22 @@ static Object *get_orientation_object(bContext *C)
 
 static int set_orientation_poll(bContext *C)
 {
-	if (ED_space_clip_tracking_size_poll(C)) {
+	SpaceClip *sc = CTX_wm_space_clip(C);
+
+	if (sc) {
 		Scene *scene = CTX_data_scene(C);
-		SpaceClip *sc = CTX_wm_space_clip(C);
 		MovieClip *clip = ED_space_clip(sc);
-		MovieTracking *tracking = &clip->tracking;
-		MovieTrackingObject *tracking_object = BKE_tracking_active_object(tracking);
 
-		if (tracking_object->flag & TRACKING_OBJECT_CAMERA) {
-			return TRUE;
-		}
-		else {
-			return OBACT != NULL;
+		if (clip) {
+			MovieTracking *tracking = &clip->tracking;
+			MovieTrackingObject *tracking_object = BKE_tracking_object_get_active(tracking);
+
+			if (tracking_object->flag & TRACKING_OBJECT_CAMERA) {
+				return TRUE;
+			}
+			else {
+				return OBACT != NULL;
+			}
 		}
 	}
 
@@ -2141,7 +1765,7 @@ static int count_selected_bundles(bContext *C)
 {
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
-	ListBase *tracksbase = BKE_tracking_get_tracks(&clip->tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(&clip->tracking);
 	MovieTrackingTrack *track;
 	int tot = 0;
 
@@ -2223,7 +1847,8 @@ static int set_origin_exec(bContext *C, wmOperator *op)
 	int selected_count = count_selected_bundles(C);
 
 	if (selected_count == 0) {
-		BKE_report(op->reports, RPT_ERROR, "At least one track with bundle should be selected to define origin position");
+		BKE_report(op->reports, RPT_ERROR,
+		           "At least one track with bundle should be selected to define origin position");
 
 		return OPERATOR_CANCELLED;
 	}
@@ -2235,9 +1860,9 @@ static int set_origin_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	tracking_object = BKE_tracking_active_object(tracking);
+	tracking_object = BKE_tracking_object_get_active(tracking);
 
-	tracksbase = BKE_tracking_object_tracks(tracking, tracking_object);
+	tracksbase = BKE_tracking_object_get_tracks(tracking, tracking_object);
 
 	track = tracksbase->first;
 	zero_v3(median);
@@ -2250,7 +1875,7 @@ static int set_origin_exec(bContext *C, wmOperator *op)
 	}
 	mul_v3_fl(median, 1.0f / selected_count);
 
-	BKE_get_tracking_mat(scene, camera, mat);
+	BKE_tracking_get_camera_object_matrix(scene, camera, mat);
 
 	mul_v3_m4v3(vec, mat, median);
 
@@ -2293,16 +1918,16 @@ void CLIP_OT_set_origin(wmOperatorType *ot)
 /********************** set floor operator *********************/
 
 static void set_axis(Scene *scene,  Object *ob, MovieClip *clip, MovieTrackingObject *tracking_object,
-			MovieTrackingTrack *track, char axis)
+                     MovieTrackingTrack *track, char axis)
 {
 	Object *camera = get_camera_with_movieclip(scene, clip);
 	int is_camera = tracking_object->flag & TRACKING_OBJECT_CAMERA;
-	int  flip = FALSE;
+	int flip = FALSE;
 	float mat[4][4], vec[3], obmat[4][4], dvec[3];
 
 	BKE_object_to_mat4(ob, obmat);
 
-	BKE_get_tracking_mat(scene, camera, mat);
+	BKE_tracking_get_camera_object_matrix(scene, camera, mat);
 	mul_v3_m4v3(vec, mat, track->bundle_pos);
 	copy_v3_v3(dvec, vec);
 
@@ -2420,7 +2045,7 @@ static int set_plane_exec(bContext *C, wmOperator *op)
 	float rot[4][4] = {{0.0f, 0.0f, -1.0f, 0.0f},
 	                   {0.0f, 1.0f, 0.0f, 0.0f},
 	                   {1.0f, 0.0f, 0.0f, 0.0f},
-	                   {0.0f, 0.0f, 0.0f, 1.0f}};	/* 90 degrees Y-axis rotation matrix */
+	                   {0.0f, 0.0f, 0.0f, 1.0f}};  /* 90 degrees Y-axis rotation matrix */
 
 	if (count_selected_bundles(C) != 3) {
 		BKE_report(op->reports, RPT_ERROR, "Three tracks with bundles are needed to orient the floor");
@@ -2428,9 +2053,9 @@ static int set_plane_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	tracking_object = BKE_tracking_active_object(tracking);
-	tracksbase = BKE_tracking_object_tracks(tracking, tracking_object);
-	act_track = BKE_tracking_active_track(tracking);
+	tracking_object = BKE_tracking_object_get_active(tracking);
+	tracksbase = BKE_tracking_object_get_tracks(tracking, tracking_object);
+	act_track = BKE_tracking_track_get_active(tracking);
 
 	object = get_orientation_object(C);
 	if (!object) {
@@ -2439,7 +2064,7 @@ static int set_plane_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	BKE_get_tracking_mat(scene, camera, mat);
+	BKE_tracking_get_camera_object_matrix(scene, camera, mat);
 
 	/* get 3 bundles to use as reference */
 	track = tracksbase->first;
@@ -2518,9 +2143,9 @@ static int set_plane_exec(bContext *C, wmOperator *op)
 void CLIP_OT_set_plane(wmOperatorType *ot)
 {
 	static EnumPropertyItem plane_items[] = {
-			{0, "FLOOR", 0, "Floor", "Set floor plane"},
-			{1, "WALL", 0, "Wall", "Set wall plane"},
-			{0, NULL, 0, NULL, NULL}
+		{0, "FLOOR", 0, "Floor", "Set floor plane"},
+		{1, "WALL", 0, "Wall", "Set wall plane"},
+		{0, NULL, 0, NULL, NULL}
 	};
 
 	/* identifiers */
@@ -2546,7 +2171,7 @@ static int set_axis_exec(bContext *C, wmOperator *op)
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	MovieTrackingObject *tracking_object = BKE_tracking_active_object(tracking);
+	MovieTrackingObject *tracking_object = BKE_tracking_object_get_active(tracking);
 	MovieTrackingTrack *track;
 	Scene *scene = CTX_data_scene(C);
 	Object *object;
@@ -2566,7 +2191,7 @@ static int set_axis_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 	}
 
-	tracksbase = BKE_tracking_object_tracks(tracking, tracking_object);
+	tracksbase = BKE_tracking_object_get_tracks(tracking, tracking_object);
 
 	track = tracksbase->first;
 	while (track) {
@@ -2590,9 +2215,9 @@ static int set_axis_exec(bContext *C, wmOperator *op)
 void CLIP_OT_set_axis(wmOperatorType *ot)
 {
 	static EnumPropertyItem axis_actions[] = {
-			{0, "X", 0, "X", "Align bundle align X axis"},
-			{1, "Y", 0, "Y", "Align bundle align Y axis"},
-			{0, NULL, 0, NULL, NULL}
+		{0, "X", 0, "X", "Align bundle align X axis"},
+		{1, "Y", 0, "Y", "Align bundle align Y axis"},
+		{0, NULL, 0, NULL, NULL}
 	};
 
 	/* identifiers */
@@ -2618,12 +2243,12 @@ static int do_set_scale(bContext *C, wmOperator *op, int scale_solution)
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	MovieTrackingObject *tracking_object = BKE_tracking_active_object(tracking);
+	MovieTrackingObject *tracking_object = BKE_tracking_object_get_active(tracking);
 	MovieTrackingTrack *track;
 	Scene *scene = CTX_data_scene(C);
 	Object *object = NULL;
 	Object *camera = get_camera_with_movieclip(scene, clip);
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
 	int tot = 0;
 	float vec[2][3], mat[4][4], scale;
 	float dist = RNA_float_get(op->ptr, "distance");
@@ -2641,7 +2266,7 @@ static int do_set_scale(bContext *C, wmOperator *op, int scale_solution)
 		return OPERATOR_CANCELLED;
 	}
 
-	BKE_get_tracking_mat(scene, camera, mat);
+	BKE_tracking_get_camera_object_matrix(scene, camera, mat);
 
 	track = tracksbase->first;
 	while (track) {
@@ -2722,23 +2347,27 @@ void CLIP_OT_set_scale(wmOperatorType *ot)
 
 	/* properties */
 	RNA_def_float(ot->srna, "distance", 0.0f, -FLT_MAX, FLT_MAX,
-		"Distance", "Distance between selected tracks", -100.0f, 100.0f);
+	              "Distance", "Distance between selected tracks", -100.0f, 100.0f);
 }
 
 /********************** set solution scale operator *********************/
 
 static int set_solution_scale_poll(bContext *C)
 {
-	if (ED_space_clip_tracking_size_poll(C)) {
-		SpaceClip *sc = CTX_wm_space_clip(C);
+	SpaceClip *sc = CTX_wm_space_clip(C);
+
+	if (sc) {
 		MovieClip *clip = ED_space_clip(sc);
-		MovieTracking *tracking = &clip->tracking;
-		MovieTrackingObject *tracking_object = BKE_tracking_active_object(tracking);
 
-		return (tracking_object->flag & TRACKING_OBJECT_CAMERA) == 0;
+		if (clip) {
+			MovieTracking *tracking = &clip->tracking;
+			MovieTrackingObject *tracking_object = BKE_tracking_object_get_active(tracking);
+
+			return (tracking_object->flag & TRACKING_OBJECT_CAMERA) == 0;
+		}
 	}
 
-	return 0;
+	return FALSE;
 }
 
 static int set_solution_scale_exec(bContext *C, wmOperator *op)
@@ -2774,7 +2403,7 @@ void CLIP_OT_set_solution_scale(wmOperatorType *ot)
 
 	/* properties */
 	RNA_def_float(ot->srna, "distance", 0.0f, -FLT_MAX, FLT_MAX,
-		"Distance", "Distance between selected tracks", -100.0f, 100.0f);
+	              "Distance", "Distance between selected tracks", -100.0f, 100.0f);
 }
 
 /********************** set principal center operator *********************/
@@ -2821,8 +2450,8 @@ static int hide_tracks_exec(bContext *C, wmOperator *op)
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTrackingTrack *track;
 	MovieTracking *tracking = &clip->tracking;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
-	MovieTrackingTrack *act_track = BKE_tracking_active_track(tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
+	MovieTrackingTrack *act_track = BKE_tracking_track_get_active(tracking);
 	int unselected;
 
 	unselected = RNA_boolean_get(op->ptr, "unselected");
@@ -2879,7 +2508,7 @@ static int hide_tracks_clear_exec(bContext *C, wmOperator *UNUSED(op))
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
 	MovieTrackingTrack *track;
 
 	track = tracksbase->first;
@@ -2938,15 +2567,21 @@ static int detect_features_exec(bContext *C, wmOperator *op)
 	int clip_flag = clip->flag & MCLIP_TIMECODE_FLAGS;
 	ImBuf *ibuf = BKE_movieclip_get_ibuf_flag(clip, &sc->user, clip_flag, MOVIECLIP_CACHE_SKIP);
 	MovieTracking *tracking = &clip->tracking;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
 	MovieTrackingTrack *track = tracksbase->first;
 	int placement = RNA_enum_get(op->ptr, "placement");
 	int margin = RNA_int_get(op->ptr, "margin");
 	int min_trackability = RNA_int_get(op->ptr, "min_trackability");
 	int min_distance = RNA_int_get(op->ptr, "min_distance");
 	int place_outside_layer = 0;
+	int framenr = ED_space_clip_clip_framenr(sc);
 	bGPDlayer *layer = NULL;
 
+	if (!ibuf) {
+		BKE_report(op->reports, RPT_ERROR, "Feature detection requires valid clip frame");
+		return OPERATOR_CANCELLED;
+	}
+
 	if (placement != 0) {
 		layer = detect_get_layer(clip);
 		place_outside_layer = placement == 2;
@@ -2961,8 +2596,8 @@ static int detect_features_exec(bContext *C, wmOperator *op)
 		track = track->next;
 	}
 
-	BKE_tracking_detect_fast(tracking, tracksbase, ibuf, sc->user.framenr, margin,
-				min_trackability, min_distance, layer, place_outside_layer);
+	BKE_tracking_detect_fast(tracking, tracksbase, ibuf, framenr, margin,
+	                         min_trackability, min_distance, layer, place_outside_layer);
 
 	IMB_freeImBuf(ibuf);
 
@@ -2974,10 +2609,10 @@ static int detect_features_exec(bContext *C, wmOperator *op)
 void CLIP_OT_detect_features(wmOperatorType *ot)
 {
 	static EnumPropertyItem placement_items[] = {
-			{0, "FRAME",			0, "Whole Frame",			"Place markers across the whole frame"},
-			{1, "INSIDE_GPENCIL",	0, "Inside grease pencil",	"Place markers only inside areas outlined with grease pencil"},
-			{2, "OUTSIDE_GPENCIL",	0, "Outside grease pencil",	"Place markers only outside areas outlined with grease pencil"},
-			{0, NULL, 0, NULL, NULL}
+		{0, "FRAME",            0, "Whole Frame",           "Place markers across the whole frame"},
+		{1, "INSIDE_GPENCIL",   0, "Inside grease pencil",  "Place markers only inside areas outlined with grease pencil"},
+		{2, "OUTSIDE_GPENCIL",  0, "Outside grease pencil", "Place markers only outside areas outlined with grease pencil"},
+		{0, NULL, 0, NULL, NULL}
 	};
 
 	/* identifiers */
@@ -2987,7 +2622,7 @@ void CLIP_OT_detect_features(wmOperatorType *ot)
 
 	/* api callbacks */
 	ot->exec = detect_features_exec;
-	ot->poll = ED_space_clip_tracking_frame_poll;
+	ot->poll = ED_space_clip_tracking_poll;
 
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -3010,8 +2645,8 @@ static int frame_jump_exec(bContext *C, wmOperator *op)
 	int pos = RNA_enum_get(op->ptr, "position");
 	int delta;
 
-	if (pos <= 1) {	/* jump to path */
-		track = BKE_tracking_active_track(&clip->tracking);
+	if (pos <= 1) { /* jump to path */
+		track = BKE_tracking_track_get_active(&clip->tracking);
 
 		if (!track)
 			return OPERATOR_CANCELLED;
@@ -3019,7 +2654,8 @@ static int frame_jump_exec(bContext *C, wmOperator *op)
 		delta = pos == 1 ? 1 : -1;
 
 		while (sc->user.framenr + delta >= SFRA && sc->user.framenr + delta <= EFRA) {
-			MovieTrackingMarker *marker = BKE_tracking_exact_marker(track, sc->user.framenr + delta);
+			int framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, sc->user.framenr + delta);
+			MovieTrackingMarker *marker = BKE_tracking_marker_get_exact(track, framenr);
 
 			if (!marker || marker->flag & MARKER_DISABLED)
 				break;
@@ -3027,11 +2663,11 @@ static int frame_jump_exec(bContext *C, wmOperator *op)
 			sc->user.framenr += delta;
 		}
 	}
-	else {	/* to to failed frame */
+	else {  /* to to failed frame */
 		if (clip->tracking.reconstruction.flag & TRACKING_RECONSTRUCTED) {
-			int a = sc->user.framenr;
+			int a = ED_space_clip_clip_framenr(sc);
 			MovieTracking *tracking = &clip->tracking;
-			MovieTrackingObject *object = BKE_tracking_active_object(tracking);
+			MovieTrackingObject *object = BKE_tracking_object_get_active(tracking);
 
 			delta = pos == 3 ? 1 : -1;
 
@@ -3040,10 +2676,10 @@ static int frame_jump_exec(bContext *C, wmOperator *op)
 			while (a + delta >= SFRA && a + delta <= EFRA) {
 				MovieReconstructedCamera *cam;
 
-				cam = BKE_tracking_get_reconstructed_camera(tracking, object, a);
+				cam = BKE_tracking_camera_get_reconstructed(tracking, object, a);
 
 				if (!cam) {
-					sc->user.framenr = a;
+					sc->user.framenr = BKE_movieclip_remap_clip_to_scene_frame(clip, a);
 
 					break;
 				}
@@ -3068,11 +2704,11 @@ static int frame_jump_exec(bContext *C, wmOperator *op)
 void CLIP_OT_frame_jump(wmOperatorType *ot)
 {
 	static EnumPropertyItem position_items[] = {
-			{0, "PATHSTART",	0, "Path Start",		"Jump to start of current path"},
-			{1, "PATHEND",		0, "Path End",			"Jump to end of current path"},
-			{2, "FAILEDPREV",	0, "Previous Failed",	"Jump to previous failed frame"},
-			{2, "FAILNEXT",		0, "Next Failed",		"Jump to next failed frame"},
-			{0, NULL, 0, NULL, NULL}
+		{0, "PATHSTART",    0, "Path Start",        "Jump to start of current path"},
+		{1, "PATHEND",      0, "Path End",          "Jump to end of current path"},
+		{2, "FAILEDPREV",   0, "Previous Failed",   "Jump to previous failed frame"},
+		{2, "FAILNEXT",     0, "Next Failed",       "Jump to next failed frame"},
+		{0, NULL, 0, NULL, NULL}
 	};
 
 	/* identifiers */
@@ -3098,10 +2734,10 @@ static int join_tracks_exec(bContext *C, wmOperator *op)
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
 	MovieTrackingTrack *act_track, *track, *next;
 
-	act_track = BKE_tracking_active_track(tracking);
+	act_track = BKE_tracking_track_get_active(tracking);
 
 	if (!act_track) {
 		BKE_report(op->reports, RPT_ERROR, "No active track to join to");
@@ -3113,12 +2749,12 @@ static int join_tracks_exec(bContext *C, wmOperator *op)
 		next = track->next;
 
 		if (TRACK_VIEW_SELECTED(sc, track) && track != act_track) {
-			BKE_tracking_join_tracks(act_track, track);
+			BKE_tracking_tracks_join(act_track, track);
 
 			if (tracking->stabilization.rot_track == track)
 				tracking->stabilization.rot_track = act_track;
 
-			BKE_tracking_free_track(track);
+			BKE_tracking_track_free(track);
 			BLI_freelinkN(tracksbase, track);
 		}
 
@@ -3139,7 +2775,7 @@ void CLIP_OT_join_tracks(wmOperatorType *ot)
 
 	/* api callbacks */
 	ot->exec = join_tracks_exec;
-	ot->poll = ED_space_clip_tracking_size_poll;
+	ot->poll = ED_space_clip_tracking_poll;
 
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -3152,7 +2788,7 @@ static int lock_tracks_exec(bContext *C, wmOperator *op)
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
 	MovieTrackingTrack *track = tracksbase->first;
 	int action = RNA_enum_get(op->ptr, "action");
 
@@ -3176,10 +2812,10 @@ static int lock_tracks_exec(bContext *C, wmOperator *op)
 void CLIP_OT_lock_tracks(wmOperatorType *ot)
 {
 	static EnumPropertyItem actions_items[] = {
-			{0, "LOCK", 0, "Lock", "Lock selected tracks"},
-			{1, "UNLOCK", 0, "Unlock", "Unlock selected tracks"},
-			{2, "TOGGLE", 0, "Toggle", "Toggle locked flag for selected tracks"},
-			{0, NULL, 0, NULL, NULL}
+		{0, "LOCK", 0, "Lock", "Lock selected tracks"},
+		{1, "UNLOCK", 0, "Unlock", "Unlock selected tracks"},
+		{2, "TOGGLE", 0, "Toggle", "Toggle locked flag for selected tracks"},
+		{0, NULL, 0, NULL, NULL}
 	};
 
 	/* identifiers */
@@ -3205,8 +2841,8 @@ static int track_copy_color_exec(bContext *C, wmOperator *UNUSED(op))
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
-	MovieTrackingTrack *track, *act_track = BKE_tracking_active_track(tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
+	MovieTrackingTrack *track, *act_track = BKE_tracking_track_get_active(tracking);
 
 	if (!act_track)
 		return OPERATOR_CANCELLED;
@@ -3252,7 +2888,7 @@ static int stabilize_2d_add_exec(bContext *C, wmOperator *UNUSED(op))
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
 	MovieTrackingTrack *track;
 	MovieTrackingStabilization *stab = &tracking->stabilization;
 	int update = 0;
@@ -3302,7 +2938,7 @@ static int stabilize_2d_remove_exec(bContext *C, wmOperator *UNUSED(op))
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
 	MovieTrackingStabilization *stab = &tracking->stabilization;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
 	MovieTrackingTrack *track;
 	int a = 0, update = 0;
 
@@ -3361,14 +2997,14 @@ static int stabilize_2d_select_exec(bContext *C, wmOperator *UNUSED(op))
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
 	MovieTrackingTrack *track;
 	int update = 0;
 
 	track = tracksbase->first;
 	while (track) {
 		if (track->flag & TRACK_USE_2D_STAB) {
-			BKE_tracking_track_flag(track, TRACK_AREA_ALL, SELECT, 0);
+			BKE_tracking_track_flag_set(track, TRACK_AREA_ALL, SELECT);
 
 			update = 1;
 		}
@@ -3404,7 +3040,7 @@ static int stabilize_2d_set_rotation_exec(bContext *C, wmOperator *UNUSED(op))
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	MovieTrackingTrack *act_track = BKE_tracking_active_track(tracking);
+	MovieTrackingTrack *act_track = BKE_tracking_track_get_active(tracking);
 
 	if (act_track) {
 		MovieTrackingStabilization *stab = &tracking->stabilization;
@@ -3444,7 +3080,7 @@ static int is_track_clean(MovieTrackingTrack *track, int frames, int del)
 	int markersnr = track->markersnr;
 
 	if (del)
-		new_markers = MEM_callocN(markersnr*sizeof(MovieTrackingMarker), "track cleaned markers");
+		new_markers = MEM_callocN(markersnr * sizeof(MovieTrackingMarker), "track cleaned markers");
 
 	for (a = 0; a < markersnr; a++) {
 		int end = 0;
@@ -3534,8 +3170,8 @@ static int clean_tracks_exec(bContext *C, wmOperator *op)
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	ListBase *tracksbase = BKE_tracking_get_tracks(tracking);
-	MovieTrackingTrack *track, *next, *act_track = BKE_tracking_active_track(tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
+	MovieTrackingTrack *track, *next, *act_track = BKE_tracking_track_get_active(tracking);
 	int frames = RNA_int_get(op->ptr, "frames");
 	int action = RNA_enum_get(op->ptr, "action");
 	float error = RNA_float_get(op->ptr, "error");
@@ -3551,17 +3187,17 @@ static int clean_tracks_exec(bContext *C, wmOperator *op)
 			int ok = 1;
 
 			ok = (is_track_clean(track, frames, action == TRACKING_CLEAN_DELETE_SEGMENT)) &&
-			    (error == 0.0f || (track->flag & TRACK_HAS_BUNDLE) == 0  || track->error < error);
+			     (error == 0.0f || (track->flag & TRACK_HAS_BUNDLE) == 0  || track->error < error);
 
 			if (!ok) {
 				if (action == TRACKING_CLEAN_SELECT) {
-					BKE_tracking_track_flag(track, TRACK_AREA_ALL, SELECT, 0);
+					BKE_tracking_track_flag_set(track, TRACK_AREA_ALL, SELECT);
 				}
 				else if (action == TRACKING_CLEAN_DELETE_TRACK) {
 					if (track == act_track)
 						clip->tracking.act_track = NULL;
 
-					BKE_tracking_free_track(track);
+					BKE_tracking_track_free(track);
 					BLI_freelinkN(tracksbase, track);
 					track = NULL;
 				}
@@ -3571,7 +3207,7 @@ static int clean_tracks_exec(bContext *C, wmOperator *op)
 					if (track == act_track)
 						clip->tracking.act_track = NULL;
 
-					BKE_tracking_free_track(track);
+					BKE_tracking_track_free(track);
 					BLI_freelinkN(tracksbase, track);
 				}
 			}
@@ -3605,10 +3241,10 @@ static int clean_tracks_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(even
 void CLIP_OT_clean_tracks(wmOperatorType *ot)
 {
 	static EnumPropertyItem actions_items[] = {
-			{TRACKING_CLEAN_SELECT, "SELECT", 0, "Select", "Select unclean tracks"},
-			{TRACKING_CLEAN_DELETE_TRACK, "DELETE_TRACK", 0, "Delete Track", "Delete unclean tracks"},
-			{TRACKING_CLEAN_DELETE_SEGMENT, "DELETE_SEGMENTS", 0, "Delete Segments", "Delete unclean segments of tracks"},
-			{0, NULL, 0, NULL, NULL}
+		{TRACKING_CLEAN_SELECT, "SELECT", 0, "Select", "Select unclean tracks"},
+		{TRACKING_CLEAN_DELETE_TRACK, "DELETE_TRACK", 0, "Delete Track", "Delete unclean tracks"},
+		{TRACKING_CLEAN_DELETE_SEGMENT, "DELETE_SEGMENTS", 0, "Delete Segments", "Delete unclean segments of tracks"},
+		{0, NULL, 0, NULL, NULL}
 	};
 
 	/* identifiers */
@@ -3640,7 +3276,7 @@ static int tracking_object_new_exec(bContext *C, wmOperator *UNUSED(op))
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
 
-	BKE_tracking_new_object(tracking, "Object");
+	BKE_tracking_object_add(tracking, "Object");
 
 	WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, clip);
 
@@ -3671,14 +3307,14 @@ static int tracking_object_remove_exec(bContext *C, wmOperator *op)
 	MovieTracking *tracking = &clip->tracking;
 	MovieTrackingObject *object;
 
-	object = BKE_tracking_active_object(tracking);
+	object = BKE_tracking_object_get_active(tracking);
 
 	if (object->flag & TRACKING_OBJECT_CAMERA) {
 		BKE_report(op->reports, RPT_WARNING, "Object used for camera tracking can't be deleted");
 		return OPERATOR_CANCELLED;
 	}
 
-	BKE_tracking_remove_object(tracking, object);
+	BKE_tracking_object_delete(tracking, object);
 
 	WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, clip);
 
@@ -3707,7 +3343,7 @@ static int copy_tracks_exec(bContext *C, wmOperator *UNUSED(op))
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	MovieTrackingObject *object = BKE_tracking_active_object(tracking);
+	MovieTrackingObject *object = BKE_tracking_object_get_active(tracking);
 
 	clear_invisible_track_selection(sc, clip);
 
@@ -3747,7 +3383,7 @@ static int paste_tracks_exec(bContext *C, wmOperator *UNUSED(op))
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
 	MovieTracking *tracking = &clip->tracking;
-	MovieTrackingObject *object = BKE_tracking_active_object(tracking);
+	MovieTrackingObject *object = BKE_tracking_object_get_active(tracking);
 
 	BKE_tracking_clipboard_paste_tracks(tracking, object);
 
diff --git a/source/blender/editors/space_clip/tracking_select.c b/source/blender/editors/space_clip/tracking_select.c
new file mode 100644
index 00000000000..640af498c1f
--- /dev/null
+++ b/source/blender/editors/space_clip/tracking_select.c
@@ -0,0 +1,783 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2011 Blender Foundation.
+ * All rights reserved.
+ *
+ *
+ * Contributor(s): Blender Foundation,
+ *                 Sergey Sharybin
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/space_clip/tracking_select.c
+ *  \ingroup spclip
+ */
+
+#include "MEM_guardedalloc.h"
+
+#include "DNA_camera_types.h"
+#include "DNA_constraint_types.h"
+#include "DNA_gpencil_types.h"
+#include "DNA_movieclip_types.h"
+#include "DNA_object_types.h"   /* SELECT */
+#include "DNA_scene_types.h"
+
+#include "BLI_utildefines.h"
+#include "BLI_math.h"
+#include "BLI_listbase.h"
+#include "BLI_rect.h"
+#include "BLI_lasso.h"
+#include "BLI_blenlib.h"
+
+#include "BKE_main.h"
+#include "BKE_context.h"
+#include "BKE_constraint.h"
+#include "BKE_movieclip.h"
+#include "BKE_tracking.h"
+#include "BKE_global.h"
+#include "BKE_depsgraph.h"
+#include "BKE_object.h"
+#include "BKE_report.h"
+#include "BKE_scene.h"
+#include "BKE_library.h"
+#include "BKE_sound.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "ED_screen.h"
+#include "ED_clip.h"
+#include "ED_keyframing.h"
+
+#include "IMB_imbuf_types.h"
+#include "IMB_imbuf.h"
+
+#include "UI_interface.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "PIL_time.h"
+
+#include "UI_view2d.h"
+
+#include "clip_intern.h"    // own include
+
+static float dist_to_crns(float co[2], float pos[2], float crns[4][2]);
+
+/********************** mouse select operator *********************/
+
+static int mouse_on_side(float co[2], float x1, float y1, float x2, float y2, float epsx, float epsy)
+{
+	if (x1 > x2)
+
+		SWAP(float, x1, x2);
+
+	if (y1 > y2)
+		SWAP(float, y1, y2);
+
+	return (co[0] >= x1 - epsx && co[0] <= x2 + epsx) && (co[1] >= y1 - epsy && co[1] <= y2 + epsy);
+}
+
+static int mouse_on_rect(float co[2], float pos[2], float min[2], float max[2], float epsx, float epsy)
+{
+	return mouse_on_side(co, pos[0] + min[0], pos[1] + min[1], pos[0] + max[0], pos[1] + min[1], epsx, epsy) ||
+	       mouse_on_side(co, pos[0] + min[0], pos[1] + min[1], pos[0] + min[0], pos[1] + max[1], epsx, epsy) ||
+	       mouse_on_side(co, pos[0] + min[0], pos[1] + max[1], pos[0] + max[0], pos[1] + max[1], epsx, epsy) ||
+	       mouse_on_side(co, pos[0] + max[0], pos[1] + min[1], pos[0] + max[0], pos[1] + max[1], epsx, epsy);
+}
+
+static int mouse_on_crns(float co[2], float pos[2], float crns[4][2], float epsx, float epsy)
+{
+	float dist = dist_to_crns(co, pos, crns);
+
+	return dist < MAX2(epsx, epsy);
+}
+
+static int track_mouse_area(SpaceClip *sc, float co[2], MovieTrackingTrack *track)
+{
+	int framenr = ED_space_clip_clip_framenr(sc);
+	MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
+	float pat_min[2], pat_max[2];
+	float epsx, epsy;
+	int width, height;
+
+	ED_space_clip_size(sc, &width, &height);
+
+	BKE_tracking_marker_pattern_minmax(marker, pat_min, pat_max);
+
+	epsx = MIN4(pat_min[0] - marker->search_min[0], marker->search_max[0] - pat_max[0],
+	            fabsf(pat_min[0]), fabsf(pat_max[0])) / 2;
+	epsy = MIN4(pat_min[1] - marker->search_min[1], marker->search_max[1] - pat_max[1],
+	            fabsf(pat_min[1]), fabsf(pat_max[1])) / 2;
+
+	epsx = MAX2(epsx, 2.0f / width);
+	epsy = MAX2(epsy, 2.0f / height);
+
+	if (sc->flag & SC_SHOW_MARKER_SEARCH) {
+		if (mouse_on_rect(co, marker->pos, marker->search_min, marker->search_max, epsx, epsy))
+			return TRACK_AREA_SEARCH;
+	}
+
+	if ((marker->flag & MARKER_DISABLED) == 0) {
+		if (sc->flag & SC_SHOW_MARKER_PATTERN)
+			if (mouse_on_crns(co, marker->pos, marker->pattern_corners, epsx, epsy))
+				return TRACK_AREA_PAT;
+
+		epsx = 12.0f / width;
+		epsy = 12.0f / height;
+
+		if (fabsf(co[0] - marker->pos[0] - track->offset[0]) < epsx &&
+		    fabsf(co[1] - marker->pos[1] - track->offset[1]) <= epsy)
+		{
+			return TRACK_AREA_POINT;
+		}
+	}
+
+	return TRACK_AREA_NONE;
+}
+
+static float dist_to_rect(float co[2], float pos[2], float min[2], float max[2])
+{
+	float d1, d2, d3, d4;
+	float p[2] = {co[0] - pos[0], co[1] - pos[1]};
+	float v1[2] = {min[0], min[1]}, v2[2] = {max[0], min[1]};
+	float v3[2] = {max[0], max[1]}, v4[2] = {min[0], max[1]};
+
+	d1 = dist_to_line_segment_v2(p, v1, v2);
+	d2 = dist_to_line_segment_v2(p, v2, v3);
+	d3 = dist_to_line_segment_v2(p, v3, v4);
+	d4 = dist_to_line_segment_v2(p, v4, v1);
+
+	return MIN4(d1, d2, d3, d4);
+}
+
+static float dist_to_crns(float co[2], float pos[2], float crns[4][2])
+{
+	float d1, d2, d3, d4;
+	float p[2] = {co[0] - pos[0], co[1] - pos[1]};
+	float *v1 = crns[0], *v2 = crns[1];
+	float *v3 = crns[2], *v4 = crns[3];
+
+	d1 = dist_to_line_segment_v2(p, v1, v2);
+	d2 = dist_to_line_segment_v2(p, v2, v3);
+	d3 = dist_to_line_segment_v2(p, v3, v4);
+	d4 = dist_to_line_segment_v2(p, v4, v1);
+
+	return MIN4(d1, d2, d3, d4);
+}
+
+static MovieTrackingTrack *find_nearest_track(SpaceClip *sc, ListBase *tracksbase, float co[2])
+{
+	MovieTrackingTrack *track = NULL, *cur;
+	float mindist = 0.0f;
+	int framenr = ED_space_clip_clip_framenr(sc);
+
+	cur = tracksbase->first;
+	while (cur) {
+		MovieTrackingMarker *marker = BKE_tracking_marker_get(cur, framenr);
+
+		if (((cur->flag & TRACK_HIDDEN) == 0) && MARKER_VISIBLE(sc, cur, marker)) {
+			float dist, d1, d2 = FLT_MAX, d3 = FLT_MAX;
+
+			/* distance to marker point */
+			d1 = sqrtf((co[0] - marker->pos[0] - cur->offset[0]) * (co[0] - marker->pos[0] - cur->offset[0]) +
+			           (co[1] - marker->pos[1] - cur->offset[1]) * (co[1] - marker->pos[1] - cur->offset[1]));
+
+			/* distance to pattern boundbox */
+			if (sc->flag & SC_SHOW_MARKER_PATTERN)
+				d2 = dist_to_crns(co, marker->pos, marker->pattern_corners);
+
+			/* distance to search boundbox */
+			if (sc->flag & SC_SHOW_MARKER_SEARCH && TRACK_VIEW_SELECTED(sc, cur))
+				d3 = dist_to_rect(co, marker->pos, marker->search_min, marker->search_max);
+
+			/* choose minimal distance. useful for cases of overlapped markers. */
+			dist = MIN3(d1, d2, d3);
+
+			if (track == NULL || dist < mindist) {
+				track = cur;
+				mindist = dist;
+			}
+		}
+
+		cur = cur->next;
+	}
+
+	return track;
+}
+
+static int mouse_select(bContext *C, float co[2], int extend)
+{
+	SpaceClip *sc = CTX_wm_space_clip(C);
+	MovieClip *clip = ED_space_clip(sc);
+	MovieTracking *tracking = &clip->tracking;
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
+	MovieTrackingTrack *act_track = BKE_tracking_track_get_active(tracking);
+	MovieTrackingTrack *track = NULL;   /* selected marker */
+
+	track = find_nearest_track(sc, tracksbase, co);
+
+	if (track) {
+		int area = track_mouse_area(sc, co, track);
+
+		if (!extend || !TRACK_VIEW_SELECTED(sc, track))
+			area = TRACK_AREA_ALL;
+
+		if (extend && TRACK_AREA_SELECTED(track, area)) {
+			if (track == act_track)
+				BKE_tracking_track_deselect(track, area);
+			else
+				clip->tracking.act_track = track;
+		}
+		else {
+			if (area == TRACK_AREA_POINT)
+				area = TRACK_AREA_ALL;
+
+			BKE_tracking_track_select(tracksbase, track, area, extend);
+			clip->tracking.act_track = track;
+		}
+	}
+
+	if (!extend) {
+		sc->xlockof = 0.0f;
+		sc->ylockof = 0.0f;
+	}
+
+	BKE_tracking_dopesheet_tag_update(tracking);
+
+	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, NULL);
+
+	return OPERATOR_FINISHED;
+}
+
+static int select_exec(bContext *C, wmOperator *op)
+{
+	float co[2];
+	int extend;
+
+	RNA_float_get_array(op->ptr, "location", co);
+	extend = RNA_boolean_get(op->ptr, "extend");
+
+	return mouse_select(C, co, extend);
+}
+
+static int select_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	float co[2];
+	int extend = RNA_boolean_get(op->ptr, "extend");
+
+	if (!extend) {
+		MovieTrackingTrack *track = tracking_marker_check_slide(C, event, NULL, NULL, NULL);
+
+		if (track) {
+			SpaceClip *sc = CTX_wm_space_clip(C);
+			MovieClip *clip = ED_space_clip(sc);
+
+			clip->tracking.act_track = track;
+
+			WM_event_add_notifier(C, NC_GEOM | ND_SELECT, NULL);
+
+			return OPERATOR_PASS_THROUGH;
+		}
+	}
+
+	ED_clip_mouse_pos(C, event, co);
+	RNA_float_set_array(op->ptr, "location", co);
+
+	return select_exec(C, op);
+}
+
+void CLIP_OT_select(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Select";
+	ot->description = "Select tracking markers";
+	ot->idname = "CLIP_OT_select";
+
+	/* api callbacks */
+	ot->exec = select_exec;
+	ot->invoke = select_invoke;
+	//ot->poll = ED_space_clip_tracking_poll; // so mask view can Ctrl+RMB markers
+	ot->poll = ED_space_clip_view_clip_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_UNDO;
+
+	/* properties */
+	RNA_def_boolean(ot->srna, "extend", 0,
+	                "Extend", "Extend selection rather than clearing the existing selection");
+	RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX,
+	                     "Location", "Mouse location in normalized coordinates, 0.0 to 1.0 is within the image bounds", -100.0f, 100.0f);
+}
+
+/********************** border select operator *********************/
+
+static int border_select_exec(bContext *C, wmOperator *op)
+{
+	SpaceClip *sc = CTX_wm_space_clip(C);
+	MovieClip *clip = ED_space_clip(sc);
+	MovieTracking *tracking = &clip->tracking;
+	MovieTrackingTrack *track;
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
+	rcti rect;
+	rctf rectf;
+	int change = FALSE, mode, extend;
+	int framenr = ED_space_clip_clip_framenr(sc);
+
+	/* get rectangle from operator */
+	rect.xmin = RNA_int_get(op->ptr, "xmin");
+	rect.ymin = RNA_int_get(op->ptr, "ymin");
+	rect.xmax = RNA_int_get(op->ptr, "xmax");
+	rect.ymax = RNA_int_get(op->ptr, "ymax");
+
+	ED_clip_point_stable_pos(C, rect.xmin, rect.ymin, &rectf.xmin, &rectf.ymin);
+	ED_clip_point_stable_pos(C, rect.xmax, rect.ymax, &rectf.xmax, &rectf.ymax);
+
+	mode = RNA_int_get(op->ptr, "gesture_mode");
+	extend = RNA_boolean_get(op->ptr, "extend");
+
+	/* do actual selection */
+	track = tracksbase->first;
+	while (track) {
+		if ((track->flag & TRACK_HIDDEN) == 0) {
+			MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
+
+			if (MARKER_VISIBLE(sc, track, marker)) {
+				if (BLI_in_rctf(&rectf, marker->pos[0], marker->pos[1])) {
+					if (mode == GESTURE_MODAL_SELECT)
+						BKE_tracking_track_flag_set(track, TRACK_AREA_ALL, SELECT);
+					else
+						BKE_tracking_track_flag_clear(track, TRACK_AREA_ALL, SELECT);
+				}
+				else if (!extend) {
+					BKE_tracking_track_flag_clear(track, TRACK_AREA_ALL, SELECT);
+				}
+
+				change = TRUE;
+			}
+		}
+
+		track = track->next;
+	}
+
+	if (change) {
+		BKE_tracking_dopesheet_tag_update(tracking);
+
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, NULL);
+
+		return OPERATOR_FINISHED;
+	}
+
+	return OPERATOR_CANCELLED;
+}
+
+void CLIP_OT_select_border(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Border Select";
+	ot->description = "Select markers using border selection";
+	ot->idname = "CLIP_OT_select_border";
+
+	/* api callbacks */
+	ot->invoke = WM_border_select_invoke;
+	ot->exec = border_select_exec;
+	ot->modal = WM_border_select_modal;
+	ot->poll = ED_space_clip_tracking_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_UNDO;
+
+	/* properties */
+	WM_operator_properties_gesture_border(ot, TRUE);
+}
+
+/********************** lasso select operator *********************/
+
+static int do_lasso_select_marker(bContext *C, int mcords[][2], short moves, short select)
+{
+	ARegion *ar = CTX_wm_region(C);
+	SpaceClip *sc = CTX_wm_space_clip(C);
+	MovieClip *clip = ED_space_clip(sc);
+	MovieTracking *tracking = &clip->tracking;
+	MovieTrackingTrack *track;
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
+	rcti rect;
+	int change = FALSE;
+	int framenr = ED_space_clip_clip_framenr(sc);
+
+	/* get rectangle from operator */
+	BLI_lasso_boundbox(&rect, mcords, moves);
+
+	/* do actual selection */
+	track = tracksbase->first;
+	while (track) {
+		if ((track->flag & TRACK_HIDDEN) == 0) {
+			MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
+
+			if (MARKER_VISIBLE(sc, track, marker)) {
+				float screen_co[2];
+
+				/* marker in screen coords */
+				ED_clip_point_stable_pos__reverse(sc, ar, marker->pos, screen_co);
+
+				if (BLI_in_rcti(&rect, screen_co[0], screen_co[1]) &&
+				    BLI_lasso_is_point_inside(mcords, moves, screen_co[0], screen_co[1], V2D_IS_CLIPPED))
+				{
+					if (select)
+						BKE_tracking_track_flag_set(track, TRACK_AREA_ALL, SELECT);
+					else
+						BKE_tracking_track_flag_clear(track, TRACK_AREA_ALL, SELECT);
+				}
+
+				change = TRUE;
+			}
+		}
+
+		track = track->next;
+	}
+
+	if (change) {
+		BKE_tracking_dopesheet_tag_update(tracking);
+
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, NULL);
+	}
+
+	return change;
+}
+
+static int clip_lasso_select_exec(bContext *C, wmOperator *op)
+{
+	int mcords_tot;
+	int (*mcords)[2] = WM_gesture_lasso_path_to_array(C, op, &mcords_tot);
+
+	if (mcords) {
+		short select;
+
+		select = !RNA_boolean_get(op->ptr, "deselect");
+		do_lasso_select_marker(C, mcords, mcords_tot, select);
+
+		MEM_freeN(mcords);
+
+		return OPERATOR_FINISHED;
+	}
+	return OPERATOR_PASS_THROUGH;
+}
+
+void CLIP_OT_select_lasso(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Lasso Select";
+	ot->description = "Select markers using lasso selection";
+	ot->idname = "CLIP_OT_select_lasso";
+
+	/* api callbacks */
+	ot->invoke = WM_gesture_lasso_invoke;
+	ot->modal = WM_gesture_lasso_modal;
+	ot->exec = clip_lasso_select_exec;
+	ot->poll = ED_space_clip_tracking_poll;
+	ot->cancel = WM_gesture_lasso_cancel;
+
+	/* flags */
+	ot->flag = OPTYPE_UNDO;
+
+	/* properties */
+	RNA_def_collection_runtime(ot->srna, "path", &RNA_OperatorMousePath, "Path", "");
+	RNA_def_boolean(ot->srna, "deselect", 0, "Deselect", "Deselect rather than select items");
+	RNA_def_boolean(ot->srna, "extend", 1, "Extend", "Extend selection instead of deselecting everything first");
+}
+
+/********************** circle select operator *********************/
+
+static int marker_inside_ellipse(MovieTrackingMarker *marker, float offset[2], float ellipse[2])
+{
+	/* normalized ellipse: ell[0] = scaleX, ell[1] = scaleY */
+	float x, y;
+
+	x = (marker->pos[0] - offset[0]) * ellipse[0];
+	y = (marker->pos[1] - offset[1]) * ellipse[1];
+
+	return x * x + y * y < 1.0f;
+}
+
+static int circle_select_exec(bContext *C, wmOperator *op)
+{
+	SpaceClip *sc = CTX_wm_space_clip(C);
+	MovieClip *clip = ED_space_clip(sc);
+	ARegion *ar = CTX_wm_region(C);
+	MovieTracking *tracking = &clip->tracking;
+	MovieTrackingTrack *track;
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
+	int x, y, radius, width, height, mode, change = FALSE;
+	float zoomx, zoomy, offset[2], ellipse[2];
+	int framenr = ED_space_clip_clip_framenr(sc);
+
+	/* get operator properties */
+	x = RNA_int_get(op->ptr, "x");
+	y = RNA_int_get(op->ptr, "y");
+	radius = RNA_int_get(op->ptr, "radius");
+
+	mode = RNA_int_get(op->ptr, "gesture_mode");
+
+	/* compute ellipse and position in unified coordinates */
+	ED_space_clip_size(sc, &width, &height);
+	ED_space_clip_zoom(sc, ar, &zoomx, &zoomy);
+
+	ellipse[0] = width * zoomx / radius;
+	ellipse[1] = height * zoomy / radius;
+
+	ED_clip_point_stable_pos(C, x, y, &offset[0], &offset[1]);
+
+	/* do selection */
+	track = tracksbase->first;
+	while (track) {
+		if ((track->flag & TRACK_HIDDEN) == 0) {
+			MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
+
+			if (MARKER_VISIBLE(sc, track, marker) && marker_inside_ellipse(marker, offset, ellipse)) {
+				if (mode == GESTURE_MODAL_SELECT)
+					BKE_tracking_track_flag_set(track, TRACK_AREA_ALL, SELECT);
+				else
+					BKE_tracking_track_flag_clear(track, TRACK_AREA_ALL, SELECT);
+
+				change = TRUE;
+			}
+		}
+
+		track = track->next;
+	}
+
+	if (change) {
+		BKE_tracking_dopesheet_tag_update(tracking);
+
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, NULL);
+
+		return OPERATOR_FINISHED;
+	}
+
+	return OPERATOR_CANCELLED;
+}
+
+void CLIP_OT_select_circle(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Circle Select";
+	ot->description = "Select markers using circle selection";
+	ot->idname = "CLIP_OT_select_circle";
+
+	/* api callbacks */
+	ot->invoke = WM_gesture_circle_invoke;
+	ot->modal = WM_gesture_circle_modal;
+	ot->exec = circle_select_exec;
+	ot->poll = ED_space_clip_tracking_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	/* properties */
+	RNA_def_int(ot->srna, "x", 0, INT_MIN, INT_MAX, "X", "", INT_MIN, INT_MAX);
+	RNA_def_int(ot->srna, "y", 0, INT_MIN, INT_MAX, "Y", "", INT_MIN, INT_MAX);
+	RNA_def_int(ot->srna, "radius", 0, INT_MIN, INT_MAX, "Radius", "", INT_MIN, INT_MAX);
+	RNA_def_int(ot->srna, "gesture_mode", 0, INT_MIN, INT_MAX, "Gesture Mode", "", INT_MIN, INT_MAX);
+}
+
+/********************** select all operator *********************/
+
+static int select_all_exec(bContext *C, wmOperator *op)
+{
+	SpaceClip *sc = CTX_wm_space_clip(C);
+	MovieClip *clip = ED_space_clip(sc);
+	MovieTracking *tracking = &clip->tracking;
+	MovieTrackingTrack *track = NULL;   /* selected track */
+	MovieTrackingMarker *marker;
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
+	int action = RNA_enum_get(op->ptr, "action");
+	int framenr = ED_space_clip_clip_framenr(sc);
+	int has_selection = FALSE;
+
+	if (action == SEL_TOGGLE) {
+		action = SEL_SELECT;
+		track = tracksbase->first;
+		while (track) {
+			if (TRACK_VIEW_SELECTED(sc, track)) {
+				marker = BKE_tracking_marker_get(track, framenr);
+
+				if (MARKER_VISIBLE(sc, track, marker)) {
+					action = SEL_DESELECT;
+					break;
+				}
+			}
+
+			track = track->next;
+		}
+	}
+
+	track = tracksbase->first;
+	while (track) {
+		if ((track->flag & TRACK_HIDDEN) == 0) {
+			marker = BKE_tracking_marker_get(track, framenr);
+
+			if (MARKER_VISIBLE(sc, track, marker)) {
+				switch (action) {
+					case SEL_SELECT:
+						track->flag |= SELECT;
+						track->pat_flag |= SELECT;
+						track->search_flag |= SELECT;
+						break;
+					case SEL_DESELECT:
+						track->flag &= ~SELECT;
+						track->pat_flag &= ~SELECT;
+						track->search_flag &= ~SELECT;
+						break;
+					case SEL_INVERT:
+						track->flag ^= SELECT;
+						track->pat_flag ^= SELECT;
+						track->search_flag ^= SELECT;
+						break;
+				}
+			}
+		}
+
+		if (TRACK_VIEW_SELECTED(sc, track))
+			has_selection = TRUE;
+
+		track = track->next;
+	}
+
+	if (!has_selection)
+		sc->flag &= ~SC_LOCK_SELECTION;
+
+	BKE_tracking_dopesheet_tag_update(tracking);
+
+	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, NULL);
+
+	return OPERATOR_FINISHED;
+}
+
+void CLIP_OT_select_all(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "(De)select All";
+	ot->description = "Change selection of all tracking markers";
+	ot->idname = "CLIP_OT_select_all";
+
+	/* api callbacks */
+	ot->exec = select_all_exec;
+	ot->poll = ED_space_clip_tracking_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	WM_operator_properties_select_all(ot);
+}
+
+/********************** select grouped operator *********************/
+
+static int select_groped_exec(bContext *C, wmOperator *op)
+{
+	SpaceClip *sc = CTX_wm_space_clip(C);
+	MovieClip *clip = ED_space_clip(sc);
+	MovieTrackingTrack *track;
+	MovieTrackingMarker *marker;
+	MovieTracking *tracking = &clip->tracking;
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(tracking);
+	int group = RNA_enum_get(op->ptr, "group");
+	int framenr = ED_space_clip_clip_framenr(sc);
+
+	track = tracksbase->first;
+	while (track) {
+		int ok = FALSE;
+
+		marker = BKE_tracking_marker_get(track, framenr);
+
+		if (group == 0) { /* Keyframed */
+			ok = marker->framenr == framenr && (marker->flag & MARKER_TRACKED) == 0;
+		}
+		else if (group == 1) { /* Estimated */
+			ok = marker->framenr != framenr;
+		}
+		else if (group == 2) { /* tracked */
+			ok = marker->framenr == framenr && (marker->flag & MARKER_TRACKED);
+		}
+		else if (group == 3) { /* locked */
+			ok = track->flag & TRACK_LOCKED;
+		}
+		else if (group == 4) { /* disabled */
+			ok = marker->flag & MARKER_DISABLED;
+		}
+		else if (group == 5) { /* color */
+			MovieTrackingTrack *act_track = BKE_tracking_track_get_active(tracking);
+
+			if (act_track) {
+				ok = (track->flag & TRACK_CUSTOMCOLOR) == (act_track->flag & TRACK_CUSTOMCOLOR);
+
+				if (ok && track->flag & TRACK_CUSTOMCOLOR)
+					ok = equals_v3v3(track->color, act_track->color);
+			}
+		}
+		else if (group == 6) { /* failed */
+			ok = (track->flag & TRACK_HAS_BUNDLE) == 0;
+		}
+
+		if (ok) {
+			track->flag |= SELECT;
+			if (sc->flag & SC_SHOW_MARKER_PATTERN)
+				track->pat_flag |= SELECT;
+			if (sc->flag & SC_SHOW_MARKER_SEARCH)
+				track->search_flag |= SELECT;
+		}
+
+		track = track->next;
+	}
+
+	BKE_tracking_dopesheet_tag_update(tracking);
+
+	WM_event_add_notifier(C, NC_MOVIECLIP | ND_DISPLAY, clip);
+
+	return OPERATOR_FINISHED;
+}
+
+void CLIP_OT_select_grouped(wmOperatorType *ot)
+{
+	static EnumPropertyItem select_group_items[] = {
+		{0, "KEYFRAMED", 0, "Keyframed tracks", "Select all keyframed tracks"},
+		{1, "ESTIMATED", 0, "Estimated tracks", "Select all estimated tracks"},
+		{2, "TRACKED", 0, "Tracked tracks", "Select all tracked tracks"},
+		{3, "LOCKED", 0, "Locked tracks", "Select all locked tracks"},
+		{4, "DISABLED", 0, "Disabled tracks", "Select all disabled tracks"},
+		{5, "COLOR", 0, "Tracks with same color", "Select all tracks with same color as active track"},
+		{6, "FAILED", 0, "Failed Tracks", "Select all tracks which failed to be reconstructed"},
+		{0, NULL, 0, NULL, NULL}
+	};
+
+	/* identifiers */
+	ot->name = "Select Grouped";
+	ot->description = "Select all tracks from specified group";
+	ot->idname = "CLIP_OT_select_grouped";
+
+	/* api callbacks */
+	ot->exec = select_groped_exec;
+	ot->poll = ED_space_clip_tracking_poll;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	/* proeprties */
+	RNA_def_enum(ot->srna, "group", select_group_items, TRACK_CLEAR_REMAINED, "Action", "Clear action to execute");
+}
diff --git a/source/blender/editors/space_console/console_intern.h b/source/blender/editors/space_console/console_intern.h
index c0abd094e62..3d30dcad710 100644
--- a/source/blender/editors/space_console/console_intern.h
+++ b/source/blender/editors/space_console/console_intern.h
@@ -54,6 +54,9 @@ void CONSOLE_OT_move(struct wmOperatorType *ot);
 void CONSOLE_OT_delete(struct wmOperatorType *ot);
 void CONSOLE_OT_insert(struct wmOperatorType *ot);
 
+void CONSOLE_OT_indent(struct wmOperatorType *ot);
+void CONSOLE_OT_unindent(struct wmOperatorType *ot);
+
 void CONSOLE_OT_history_append(struct wmOperatorType *ot);
 void CONSOLE_OT_scrollback_append(struct wmOperatorType *ot);
 
diff --git a/source/blender/editors/space_console/console_ops.c b/source/blender/editors/space_console/console_ops.c
index 5ed384d22af..7efcbcceb3c 100644
--- a/source/blender/editors/space_console/console_ops.c
+++ b/source/blender/editors/space_console/console_ops.c
@@ -364,9 +364,8 @@ static int console_insert_exec(bContext *C, wmOperator *op)
 	char *str = RNA_string_get_alloc(op->ptr, "text", NULL, 0);
 	int len;
 
-	// XXX, alligned tab key hack
 	if (str[0] == '\t' && str[1] == '\0') {
-		len = TAB_LENGTH - (ci->cursor % TAB_LENGTH);
+		len = TAB_LENGTH;
 		MEM_freeN(str);
 		str = MEM_mallocN(len + 1, "insert_exec");
 		memset(str, ' ', len);
@@ -430,6 +429,95 @@ void CONSOLE_OT_insert(wmOperatorType *ot)
 	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 }
 
+static int console_indent_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	SpaceConsole *sc = CTX_wm_space_console(C);
+	ARegion *ar = CTX_wm_region(C);
+	ConsoleLine *ci = console_history_verify(C);
+	int spaces;
+	int len;
+
+	for (spaces = 0; spaces < ci->len; spaces++) {
+		if (ci->line[spaces] != ' ')
+			break;
+	}
+
+	len = TAB_LENGTH - spaces % TAB_LENGTH;
+
+	console_line_verify_length(ci, ci->len + len);
+
+	memmove(ci->line + len, ci->line, ci->len);
+	memset(ci->line, ' ', len);
+	ci->len += len;
+	console_line_cursor_set(ci, ci->cursor + len);
+
+	console_textview_update_rect(sc, ar);
+	ED_area_tag_redraw(CTX_wm_area(C));
+
+	console_scroll_bottom(ar);
+
+	return OPERATOR_FINISHED;
+}
+
+void CONSOLE_OT_indent(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Indent";
+	ot->description = "Add 4 spaces at line beginning";
+	ot->idname = "CONSOLE_OT_indent";
+
+	/* api callbacks */
+	ot->exec = console_indent_exec;
+	ot->poll = ED_operator_console_active;
+}
+
+static int console_unindent_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	SpaceConsole *sc = CTX_wm_space_console(C);
+	ARegion *ar = CTX_wm_region(C);
+	ConsoleLine *ci = console_history_verify(C);
+	int spaces;
+	int len;
+
+	for (spaces = 0; spaces < ci->len; spaces++) {
+		if (ci->line[spaces] != ' ')
+			break;
+	}
+
+	if (spaces == 0)
+		return OPERATOR_CANCELLED;
+
+	len = spaces % TAB_LENGTH;
+	if (len == 0)
+		len = TAB_LENGTH;
+
+	console_line_verify_length(ci, ci->len - len);
+
+	memmove(ci->line, ci->line + len, (ci->len - len) + 1);
+	ci->len -= len;
+	console_line_cursor_set(ci, ci->cursor - len);
+
+	//console_select_offset(sc, -4);
+
+	console_textview_update_rect(sc, ar);
+	ED_area_tag_redraw(CTX_wm_area(C));
+
+	console_scroll_bottom(ar);
+
+	return OPERATOR_FINISHED;
+}
+
+void CONSOLE_OT_unindent(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Unindent";
+	ot->description = "Delete 4 spaces from line beginning";
+	ot->idname = "CONSOLE_OT_unindent";
+
+	/* api callbacks */
+	ot->exec = console_unindent_exec;
+	ot->poll = ED_operator_console_active;
+}
 
 static EnumPropertyItem console_delete_type_items[] = {
 	{DEL_NEXT_CHAR, "NEXT_CHARACTER", 0, "Next Character", ""},
@@ -757,7 +845,8 @@ void CONSOLE_OT_scrollback_append(wmOperatorType *ot)
 		{CONSOLE_LINE_INPUT,    "INPUT", 0, "Input", ""},
 		{CONSOLE_LINE_INFO,     "INFO", 0, "Information", ""},
 		{CONSOLE_LINE_ERROR,    "ERROR", 0, "Error", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	/* identifiers */
 	ot->name = "Scrollback Append";
diff --git a/source/blender/editors/space_console/space_console.c b/source/blender/editors/space_console/space_console.c
index a25606db2b3..460b31d69bd 100644
--- a/source/blender/editors/space_console/space_console.c
+++ b/source/blender/editors/space_console/space_console.c
@@ -246,6 +246,9 @@ static void console_operatortypes(void)
 	WM_operatortype_append(CONSOLE_OT_move);
 	WM_operatortype_append(CONSOLE_OT_delete);
 	WM_operatortype_append(CONSOLE_OT_insert);
+
+	WM_operatortype_append(CONSOLE_OT_indent);
+	WM_operatortype_append(CONSOLE_OT_unindent);
 	
 	/* for use by python only */
 	WM_operatortype_append(CONSOLE_OT_history_append); 
@@ -332,7 +335,11 @@ static void console_keymap(struct wmKeyConfig *keyconf)
 	
 	WM_keymap_add_item(keymap, "CONSOLE_OT_select_set", LEFTMOUSE, KM_PRESS, 0, 0);
 
-	RNA_string_set(WM_keymap_add_item(keymap, "CONSOLE_OT_insert", TABKEY, KM_PRESS, 0, 0)->ptr, "text", "\t"); /* fake tabs */
+	RNA_string_set(WM_keymap_add_item(keymap, "CONSOLE_OT_insert", TABKEY, KM_PRESS, KM_CTRL, 0)->ptr, "text", "\t"); /* fake tabs */
+
+	WM_keymap_add_item(keymap, "CONSOLE_OT_indent", TABKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "CONSOLE_OT_unindent", TABKEY, KM_PRESS, KM_SHIFT, 0);
+
 	WM_keymap_add_item(keymap, "CONSOLE_OT_insert", KM_TEXTINPUT, KM_ANY, KM_ANY, 0); // last!
 }
 
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index d84214413da..a535e888156 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -102,8 +102,7 @@ typedef struct ThumbnailJob {
 	ReportList reports;
 } ThumbnailJob;
 
-typedef struct FileList
-{
+typedef struct FileList {
 	struct direntry *filelist;
 	int *fidx;
 	int numfiles;
@@ -124,8 +123,7 @@ typedef struct FileList
 
 } FileList;
 
-typedef struct FolderList
-{
+typedef struct FolderList {
 	struct FolderList *next, *prev;
 	char *foldername;
 } FolderList;
diff --git a/source/blender/editors/space_file/filelist.h b/source/blender/editors/space_file/filelist.h
index fac6a387b9f..7a37c5fb3c5 100644
--- a/source/blender/editors/space_file/filelist.h
+++ b/source/blender/editors/space_file/filelist.h
@@ -53,8 +53,7 @@ typedef enum FileSelType {
 	FILE_SEL_TOGGLE	 = 2
 } FileSelType;
 
-typedef enum FileCheckType
-{
+typedef enum FileCheckType {
 	CHECK_DIRS = 1,
 	CHECK_FILES = 2,
 	CHECK_ALL = 3
diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c
index 4b5f4f5cc2e..dbc66b81874 100644
--- a/source/blender/editors/space_graph/graph_edit.c
+++ b/source/blender/editors/space_graph/graph_edit.c
@@ -684,9 +684,16 @@ static short paste_graph_keys(bAnimContext *ac,
 	ListBase anim_data = {NULL, NULL};
 	int filter, ok = 0;
 	
-	/* filter data */
-	filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_SEL | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
-	ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
+	/* filter data 
+	 * - First time we try to filter more strictly, allowing only selected channels 
+	 *   to allow copying animation between channels
+	 * - Second time, we loosen things up if nothing was found the first time, allowing
+	 *   users to just paste keyframes back into the original curve again [#31670]
+	 */
+	filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_CURVE_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_NODUPLIS);
+	
+	if (ANIM_animdata_filter(ac, &anim_data, filter | ANIMFILTER_SEL, ac->data, ac->datatype) == 0)
+		ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
 	
 	/* paste keyframes */
 	ok = paste_animedit_keys(ac, &anim_data, offset_mode, merge_mode);
@@ -776,7 +783,8 @@ void GRAPH_OT_paste(wmOperatorType *ot)
 	
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-
+	
+	/* props */
 	RNA_def_enum(ot->srna, "offset", keyframe_paste_offset_items, KEYFRAME_PASTE_OFFSET_CFRA_START, "Offset", "Paste time offset of keys");
 	RNA_def_enum(ot->srna, "merge", keyframe_paste_merge_items, KEYFRAME_PASTE_MERGE_MIX, "Type", "Method of merging pasted keys and existing");
 }
diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt
index 3975a5f56f3..f397f2387d7 100644
--- a/source/blender/editors/space_image/CMakeLists.txt
+++ b/source/blender/editors/space_image/CMakeLists.txt
@@ -46,6 +46,10 @@ set(SRC
 	image_intern.h
 )
 
+if(WITH_INTERNATIONAL)
+	add_definitions(-DWITH_INTERNATIONAL)
+endif()
+
 if(WITH_IMAGE_OPENJPEG)
 	add_definitions(-DWITH_OPENJPEG)
 endif()
diff --git a/source/blender/editors/space_image/SConscript b/source/blender/editors/space_image/SConscript
index 759d4592992..737da4aac74 100644
--- a/source/blender/editors/space_image/SConscript
+++ b/source/blender/editors/space_image/SConscript
@@ -9,6 +9,8 @@ incs += ' ../../bmesh ../../render/extern/include ../../makesrna ../../blenloade
 
 defs = []
 
+if env['WITH_BF_INTERNATIONAL']:
+    defs.append('WITH_INTERNATIONAL')
 if env['WITH_BF_OPENEXR']:
     defs.append('WITH_OPENEXR')
 if env['WITH_BF_OPENJPEG']:
diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c
index de171bc45f8..332a2ecada4 100644
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@ -44,6 +44,8 @@
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
 
+#include "BLF_translation.h"
+
 #include "BKE_colortools.h"
 #include "BKE_context.h"
 #include "BKE_customdata.h"
@@ -104,36 +106,36 @@ static void image_info(Scene *scene, ImageUser *iuser, Image *ima, ImBuf *ibuf,
 	if (ima == NULL) return;
 
 	if (ibuf == NULL) {
-		ofs += sprintf(str, "Can't Load Image");
+		ofs += sprintf(str, IFACE_("Can't Load Image"));
 	}
 	else {
 		if (ima->source == IMA_SRC_MOVIE) {
-			ofs += sprintf(str, "Movie");
+			ofs += sprintf(str, IFACE_("Movie"));
 			if (ima->anim)
-				ofs += sprintf(str + ofs, "%d frs", IMB_anim_get_duration(ima->anim, IMB_TC_RECORD_RUN));
+				ofs += sprintf(str + ofs, IFACE_("%d frs"), IMB_anim_get_duration(ima->anim, IMB_TC_RECORD_RUN));
 		}
 		else
-			ofs += sprintf(str, "Image");
+			ofs += sprintf(str, IFACE_("Image"));
 
-		ofs += sprintf(str + ofs, ": size %d x %d,", ibuf->x, ibuf->y);
+		ofs += sprintf(str + ofs, IFACE_(": size %d x %d,"), ibuf->x, ibuf->y);
 
 		if (ibuf->rect_float) {
 			if (ibuf->channels != 4) {
-				ofs += sprintf(str + ofs, "%d float channel(s)", ibuf->channels);
+				ofs += sprintf(str + ofs, IFACE_("%d float channel(s)"), ibuf->channels);
 			}
 			else if (ibuf->planes == R_IMF_PLANES_RGBA)
-				ofs += sprintf(str + ofs, " RGBA float");
+				ofs += sprintf(str + ofs, IFACE_(" RGBA float"));
 			else
-				ofs += sprintf(str + ofs, " RGB float");
+				ofs += sprintf(str + ofs, IFACE_(" RGB float"));
 		}
 		else {
 			if (ibuf->planes == R_IMF_PLANES_RGBA)
-				ofs += sprintf(str + ofs, " RGBA byte");
+				ofs += sprintf(str + ofs, IFACE_(" RGBA byte"));
 			else
-				ofs += sprintf(str + ofs, " RGB byte");
+				ofs += sprintf(str + ofs, IFACE_(" RGB byte"));
 		}
 		if (ibuf->zbuf || ibuf->zbuf_float)
-			ofs += sprintf(str + ofs, " + Z");
+			ofs += sprintf(str + ofs, IFACE_(" + Z"));
 
 		if (ima->source == IMA_SRC_SEQUENCE) {
 			char *file = BLI_last_slash(ibuf->name);
@@ -147,7 +149,7 @@ static void image_info(Scene *scene, ImageUser *iuser, Image *ima, ImBuf *ibuf,
 	if (ima->source == IMA_SRC_SEQUENCE) {
 		/* don't use iuser->framenr directly because it may not be updated if auto-refresh is off */
 		const int framenr = BKE_image_user_frame_get(iuser, CFRA, 0);
-		ofs += sprintf(str + ofs, ", Frame: %d", framenr);
+		ofs += sprintf(str + ofs, IFACE_(", Frame: %d"), framenr);
 	}
 
 	(void)ofs;
@@ -357,11 +359,11 @@ static char *slot_menu(void)
 	
 	str = MEM_callocN(IMA_MAX_RENDER_SLOT * 32, "menu slots");
 	
-	strcpy(str, "Slot %t");
+	strcpy(str, IFACE_("Slot %t"));
 	a = strlen(str);
 
 	for (slot = 0; slot < IMA_MAX_RENDER_SLOT; slot++)
-		a += sprintf(str + a, "|Slot %d %%x%d", slot + 1, slot);
+		a += sprintf(str + a, IFACE_("|Slot %d %%x%d"), slot + 1, slot);
 	
 	return str;
 }
@@ -374,16 +376,16 @@ static char *layer_menu(RenderResult *rr, short *UNUSED(curlay))
 	short a, nr = 0;
 	char *str = MEM_callocN(len, "menu layers");
 	
-	strcpy(str, "Layer %t");
+	strcpy(str, IFACE_("Layer %t"));
 	a = strlen(str);
 	
 	/* compo result */
 	if (rr->rectf) {
-		a += sprintf(str + a, "|Composite %%x0");
+		a += sprintf(str + a, IFACE_("|Composite %%x0"));
 		nr = 1;
 	}
 	else if (rr->rect32) {
-		a += sprintf(str + a, "|Sequence %%x0");
+		a += sprintf(str + a, IFACE_("|Sequence %%x0"));
 		nr = 1;
 	}
 	for (rl = rr->layers.first; rl; rl = rl->next, nr++) {
@@ -403,18 +405,18 @@ static char *pass_menu(RenderLayer *rl, short *curpass)
 	short a, nr = 0;
 	char *str = MEM_callocN(len, "menu layers");
 	
-	strcpy(str, "Pass %t");
+	strcpy(str, IFACE_("Pass %t"));
 	a = strlen(str);
 	
 	/* rendered results don't have a Combined pass */
 	if (rl == NULL || rl->rectf) {
-		a += sprintf(str + a, "|Combined %%x0");
+		a += sprintf(str + a, IFACE_("|Combined %%x0"));
 		nr = 1;
 	}
 	
 	if (rl)
 		for (rpass = rl->passes.first; rpass; rpass = rpass->next, nr++)
-			a += sprintf(str + a, "|%s %%x%d", rpass->name, nr);
+			a += sprintf(str + a, "|%s %%x%d", IFACE_(rpass->name), nr);
 	
 	if (*curpass >= nr)
 		*curpass = 0;
@@ -422,18 +424,6 @@ static char *pass_menu(RenderLayer *rl, short *curpass)
 	return str;
 }
 
-static void set_frames_cb(bContext *C, void *ima_v, void *iuser_v)
-{
-	Scene *scene = CTX_data_scene(C);
-	Image *ima = ima_v;
-	ImageUser *iuser = iuser_v;
-	
-	if (ima->anim) {
-		iuser->frames = IMB_anim_get_duration(ima->anim, IMB_TC_RECORD_RUN);
-		BKE_image_user_frame_calc(iuser, scene->r.cfra, 0);
-	}
-}
-
 /* 5 layer button callbacks... */
 static void image_multi_cb(bContext *C, void *rr_v, void *iuser_v) 
 {
@@ -532,14 +522,14 @@ static void uiblock_layer_pass_buttons(uiLayout *layout, RenderResult *rr, Image
 	/* menu buts */
 	if (render_slot) {
 		strp = slot_menu();
-		but = uiDefButS(block, MENU, 0, strp,                   0, 0, wmenu1, UI_UNIT_Y, render_slot, 0, 0, 0, 0, "Select Slot");
+		but = uiDefButS(block, MENU, 0, strp, 0, 0, wmenu1, UI_UNIT_Y, render_slot, 0, 0, 0, 0, TIP_("Select Slot"));
 		uiButSetFunc(but, image_multi_cb, rr, iuser);
 		MEM_freeN(strp);
 	}
 
 	if (rr) {
 		strp = layer_menu(rr, &iuser->layer);
-		but = uiDefButS(block, MENU, 0, strp,                   0, 0, wmenu2, UI_UNIT_Y, &iuser->layer, 0, 0, 0, 0, "Select Layer");
+		but = uiDefButS(block, MENU, 0, strp, 0, 0, wmenu2, UI_UNIT_Y, &iuser->layer, 0, 0, 0, 0, TIP_("Select Layer"));
 		uiButSetFunc(but, image_multi_cb, rr, iuser);
 		MEM_freeN(strp);
 
@@ -549,9 +539,9 @@ static void uiblock_layer_pass_buttons(uiLayout *layout, RenderResult *rr, Image
 		
 		rl = BLI_findlink(&rr->layers, layer); /* return NULL is meant to be */
 		strp = pass_menu(rl, &iuser->pass);
-		but = uiDefButS(block, MENU, 0, strp,                   0, 0, wmenu3, UI_UNIT_Y, &iuser->pass, 0, 0, 0, 0, "Select Pass");
+		but = uiDefButS(block, MENU, 0, strp, 0, 0, wmenu3, UI_UNIT_Y, &iuser->pass, 0, 0, 0, 0, TIP_("Select Pass"));
 		uiButSetFunc(but, image_multi_cb, rr, iuser);
-		MEM_freeN(strp);	
+		MEM_freeN(strp);
 	}
 }
 
@@ -567,22 +557,22 @@ static void uiblock_layer_pass_arrow_buttons(uiLayout *layout, RenderResult *rr,
 	if (rr == NULL || iuser == NULL)
 		return;
 	if (rr->layers.first == NULL) {
-		uiItemL(row, "No Layers in Render Result", ICON_NONE);
+		uiItemL(row, IFACE_("No Layers in Render Result"), ICON_NONE);
 		return;
 	}
 
 	/* decrease, increase arrows */
-	but = uiDefIconBut(block, BUT, 0, ICON_TRIA_LEFT,   0, 0, 17, 20, NULL, 0, 0, 0, 0, "Previous Layer");
+	but = uiDefIconBut(block, BUT, 0, ICON_TRIA_LEFT,   0, 0, 17, 20, NULL, 0, 0, 0, 0, TIP_("Previous Layer"));
 	uiButSetFunc(but, image_multi_declay_cb, rr, iuser);
-	but = uiDefIconBut(block, BUT, 0, ICON_TRIA_RIGHT,  0, 0, 18, 20, NULL, 0, 0, 0, 0, "Next Layer");
+	but = uiDefIconBut(block, BUT, 0, ICON_TRIA_RIGHT,  0, 0, 18, 20, NULL, 0, 0, 0, 0, TIP_("Next Layer"));
 	uiButSetFunc(but, image_multi_inclay_cb, rr, iuser);
 
 	uiblock_layer_pass_buttons(row, rr, iuser, 230 * dpi_fac, render_slot);
 
 	/* decrease, increase arrows */
-	but = uiDefIconBut(block, BUT, 0, ICON_TRIA_LEFT,   0, 0, 17, 20, NULL, 0, 0, 0, 0, "Previous Pass");
+	but = uiDefIconBut(block, BUT, 0, ICON_TRIA_LEFT,   0, 0, 17, 20, NULL, 0, 0, 0, 0, TIP_("Previous Pass"));
 	uiButSetFunc(but, image_multi_decpass_cb, rr, iuser);
-	but = uiDefIconBut(block, BUT, 0, ICON_TRIA_RIGHT,  0, 0, 18, 20, NULL, 0, 0, 0, 0, "Next Pass");
+	but = uiDefIconBut(block, BUT, 0, ICON_TRIA_RIGHT,  0, 0, 18, 20, NULL, 0, 0, 0, 0, TIP_("Next Pass"));
 	uiButSetFunc(but, image_multi_incpass_cb, rr, iuser);
 
 	uiBlockEndAlign(block);
@@ -622,7 +612,6 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, const char
 	Scene *scene = CTX_data_scene(C);
 	uiLayout *row, *split, *col;
 	uiBlock *block;
-	uiBut *but;
 	char str[128];
 	void *lock;
 
@@ -648,12 +637,15 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, const char
 	ima = imaptr.data;
 	iuser = userptr->data;
 
+	BKE_image_user_check_frame_calc(iuser, (int)scene->r.cfra, 0);
+
 	cb = MEM_callocN(sizeof(RNAUpdateCb), "RNAUpdateCb");
 	cb->ptr = *ptr;
 	cb->prop = prop;
 	cb->iuser = iuser;
 
 	uiLayoutSetContextPointer(layout, "edit_image", &imaptr);
+	uiLayoutSetContextPointer(layout, "edit_image_user", userptr);
 
 	if (!compact)
 		uiTemplateID(layout, C, ptr, propname, "IMAGE_OT_new", "IMAGE_OT_open", NULL);
@@ -744,7 +736,18 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, const char
 					split = uiLayoutSplit(layout, 0, 0);
 
 					col = uiLayoutColumn(split, 0);
-					uiItemR(col, &imaptr, "use_fields", 0, NULL, ICON_NONE);
+					/* XXX Why only display fields_per_frame only for video image types?
+					 *     And why allow fields for non-video image types at all??? */
+					if (ELEM(ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE)) {
+						uiLayout *subsplit = uiLayoutSplit(col, 0, 0);
+						uiLayout *subcol = uiLayoutColumn(subsplit, 0);
+						uiItemR(subcol, &imaptr, "use_fields", 0, NULL, ICON_NONE);
+						subcol = uiLayoutColumn(subsplit, 0);
+						uiLayoutSetActive(subcol, RNA_boolean_get(&imaptr, "use_fields"));
+						uiItemR(subcol, userptr, "fields_per_frame", 0, IFACE_("Fields"), ICON_NONE);
+					}
+					else
+						uiItemR(col, &imaptr, "use_fields", 0, NULL, ICON_NONE);
 					row = uiLayoutRow(col, 0);
 					uiLayoutSetActive(row, RNA_boolean_get(&imaptr, "use_fields"));
 					uiItemR(row, &imaptr, "field_order", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
@@ -757,26 +760,18 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, const char
 
 			if (ELEM(ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE)) {
 				uiItemS(layout);
-				
+
 				split = uiLayoutSplit(layout, 0, 0);
 
 				col = uiLayoutColumn(split, 0);
-				 
-				BLI_snprintf(str, sizeof(str), "(%d) Frames", iuser->framenr);
-				uiItemR(col, userptr, "frame_duration", 0, str, ICON_NONE);
-				if (ima->anim) {
-					block = uiLayoutGetBlock(col);
-					but = uiDefBut(block, BUT, 0, "Match Movie Length", 0, 0, UI_UNIT_X * 2, UI_UNIT_Y, NULL, 0, 0, 0, 0, "Set the number of frames to match the movie or sequence");
-					uiButSetFunc(but, set_frames_cb, ima, iuser);
-				}
 
-				uiItemR(col, userptr, "frame_start", 0, "Start", ICON_NONE);
+				BLI_snprintf(str, sizeof(str), IFACE_("(%d) Frames"), iuser->framenr);
+				uiItemR(col, userptr, "frame_duration", 0, str, ICON_NONE);
+				uiItemR(col, userptr, "frame_start", 0, IFACE_("Start"), ICON_NONE);
 				uiItemR(col, userptr, "frame_offset", 0, NULL, ICON_NONE);
 
 				col = uiLayoutColumn(split, 0);
-				row = uiLayoutRow(col, 0);
-				uiLayoutSetActive(row, RNA_boolean_get(&imaptr, "use_fields"));
-				uiItemR(row, userptr, "fields_per_frame", 0, "Fields", ICON_NONE);
+				uiItemO(col, NULL, ICON_NONE, "IMAGE_OT_match_movie_length");
 				uiItemR(col, userptr, "use_auto_refresh", 0, NULL, ICON_NONE);
 				uiItemR(col, userptr, "use_cyclic", 0, NULL, ICON_NONE);
 			}
@@ -815,7 +810,7 @@ void uiTemplateImageSettings(uiLayout *layout, PointerRNA *imfptr)
 	
 	uiItemR(split, imfptr, "file_format", 0, "", ICON_NONE);
 	sub = uiLayoutRow(split, 0);
-	uiItemR(sub, imfptr, "color_mode", UI_ITEM_R_EXPAND, "Color", ICON_NONE);
+	uiItemR(sub, imfptr, "color_mode", UI_ITEM_R_EXPAND, IFACE_("Color"), ICON_NONE);
 
 	/* only display depth setting if multiple depths can be used */
 	if ((ELEM6(depth_ok,
@@ -861,7 +856,7 @@ void uiTemplateImageSettings(uiLayout *layout, PointerRNA *imfptr)
 
 	if (imf->imtype == R_IMF_IMTYPE_CINEON) {
 #if 1
-		uiItemL(col, "Hard coded Non-Linear, Gamma:1.0", ICON_NONE);
+		uiItemL(col, IFACE_("Hard coded Non-Linear, Gamma: 1.0"), ICON_NONE);
 #else
 		uiItemR(col, imfptr, "use_cineon_log", 0, NULL, ICON_NONE);
 		uiItemR(col, imfptr, "cineon_black", 0, NULL, ICON_NONE);
diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c
index aab628180c8..ac71eb972f6 100644
--- a/source/blender/editors/space_image/image_draw.c
+++ b/source/blender/editors/space_image/image_draw.c
@@ -564,27 +564,40 @@ void draw_image_grease_pencil(bContext *C, short onlyv2d)
 {
 	/* draw in View2D space? */
 	if (onlyv2d) {
-		/* assume that UI_view2d_ortho(C) has been called... */
-		SpaceImage *sima = (SpaceImage *)CTX_wm_space_data(C);
-		void *lock;
-		ImBuf *ibuf = ED_space_image_acquire_buffer(sima, &lock);
-		
 		/* draw grease-pencil ('image' strokes) */
-		//if (sima->flag & SI_DISPGP)
-		draw_gpencil_2dimage(C, ibuf);
-
-		ED_space_image_release_buffer(sima, lock);
+		draw_gpencil_2dimage(C);
 	}
 	else {
 		/* assume that UI_view2d_restore(C) has been called... */
 		//SpaceImage *sima= (SpaceImage *)CTX_wm_space_data(C);
 		
 		/* draw grease-pencil ('screen' strokes) */
-		//if (sima->flag & SI_DISPGP)
 		draw_gpencil_view2d(C, 0);
 	}
 }
 
+void draw_image_sample_line(SpaceImage *sima)
+{
+	if (sima->sample_line_hist.flag & HISTO_FLAG_SAMPLELINE) {
+		Histogram *hist = &sima->sample_line_hist;
+
+		glBegin(GL_LINES);
+		glColor3ub(0, 0, 0);
+		glVertex2fv(hist->co[0]);
+		glVertex2fv(hist->co[1]);
+		glEnd();
+
+		setlinestyle(1);
+		glBegin(GL_LINES);
+		glColor3ub(255, 255, 255);
+		glVertex2fv(hist->co[0]);
+		glVertex2fv(hist->co[1]);
+		glEnd();
+		setlinestyle(0);
+
+	}
+}
+
 /* XXX becomes WM paint cursor */
 #if 0
 static void draw_image_view_tool(Scene *scene)
diff --git a/source/blender/editors/space_image/image_intern.h b/source/blender/editors/space_image/image_intern.h
index ca3f543f3b9..0d3a7614f10 100644
--- a/source/blender/editors/space_image/image_intern.h
+++ b/source/blender/editors/space_image/image_intern.h
@@ -54,6 +54,7 @@ extern const char *image_context_dir[]; /* doc access */
 /* image_draw.c */
 void draw_image_main(struct SpaceImage *sima, struct ARegion *ar, struct Scene *scene);
 void draw_image_grease_pencil(struct bContext *C, short onlyv2d);
+void draw_image_sample_line(struct SpaceImage *sima);
 
 /* image_ops.c */
 int space_image_main_area_poll(struct bContext *C);
@@ -69,6 +70,7 @@ void IMAGE_OT_view_ndof(struct wmOperatorType *ot);
 
 void IMAGE_OT_new(struct wmOperatorType *ot);
 void IMAGE_OT_open(struct wmOperatorType *ot);
+void IMAGE_OT_match_movie_length(struct wmOperatorType *ot);
 void IMAGE_OT_replace(struct wmOperatorType *ot);
 void IMAGE_OT_reload(struct wmOperatorType *ot);
 void IMAGE_OT_save(struct wmOperatorType *ot);
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 31389bcb20c..7e67e737cc2 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -934,6 +934,52 @@ void IMAGE_OT_open(wmOperatorType *ot)
 	WM_operator_properties_filesel(ot, FOLDERFILE | IMAGEFILE | MOVIEFILE, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH | WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY);
 }
 
+/******************** Match movie length operator ********************/
+static int image_match_len_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Scene *scene = CTX_data_scene(C);
+	Image *ima = CTX_data_pointer_get_type(C, "edit_image", &RNA_Image).data;
+	ImageUser *iuser = CTX_data_pointer_get_type(C, "edit_image_user", &RNA_ImageUser).data;
+
+	if (!ima || !iuser) {
+		/* Try to get a Texture, or a SpaceImage from context... */
+		SpaceImage *sima = CTX_wm_space_image(C);
+		Tex *tex = CTX_data_pointer_get_type(C, "texture", &RNA_Texture).data;
+		if (tex && tex->type == TEX_IMAGE) {
+			ima = tex->ima;
+			iuser = &tex->iuser;
+		}
+		else if (sima) {
+			ima = sima->image;
+			iuser = &sima->iuser;
+		}
+		
+	}
+
+	if (!ima || !iuser || !ima->anim)
+		return OPERATOR_CANCELLED;
+
+	iuser->frames = IMB_anim_get_duration(ima->anim, IMB_TC_RECORD_RUN);
+	BKE_image_user_frame_calc(iuser, scene->r.cfra, 0);
+
+	return OPERATOR_FINISHED;
+}
+
+/* called by other space types too */
+void IMAGE_OT_match_movie_length(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Match Movie Length";
+	ot->description = "Set image's users length to the one of this video";
+	ot->idname = "IMAGE_OT_match_movie_length";
+	
+	/* api callbacks */
+	ot->exec = image_match_len_exec;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER /* | OPTYPE_UNDO */; /* Don't think we need undo for that. */
+}
+
 /******************** replace image operator ********************/
 
 static int image_replace_exec(bContext *C, wmOperator *op)
@@ -2064,11 +2110,6 @@ static int image_sample_line_exec(bContext *C, wmOperator *op)
 	Histogram *hist = &sima->sample_line_hist;
 	
 	float x1f, y1f, x2f, y2f;
-	int x1, y1, x2, y2;
-	int i, x, y;
-	float *fp;
-	float rgb[3];
-	unsigned char *cp;
 	
 	if (ibuf == NULL) {
 		ED_space_image_release_buffer(sima, lock);
@@ -2082,46 +2123,13 @@ static int image_sample_line_exec(bContext *C, wmOperator *op)
 	
 	UI_view2d_region_to_view(&ar->v2d, x_start, y_start, &x1f, &y1f);
 	UI_view2d_region_to_view(&ar->v2d, x_end, y_end, &x2f, &y2f);
-	x1 = 0.5f + x1f * ibuf->x;
-	x2 = 0.5f + x2f * ibuf->x;
-	y1 = 0.5f + y1f * ibuf->y;
-	y2 = 0.5f + y2f * ibuf->y;
-	
-	hist->channels = 3;
-	hist->x_resolution = 256;
-	hist->xmax = 1.0f;
-	hist->ymax = 1.0f;
-	
-	for (i = 0; i < 256; i++) {
-		x = (int)(0.5f + x1 + (float)i * (x2 - x1) / 255.0f);
-		y = (int)(0.5f + y1 + (float)i * (y2 - y1) / 255.0f);
-		
-		if (x < 0 || y < 0 || x >= ibuf->x || y >= ibuf->y) {
-			hist->data_luma[i] = hist->data_r[i] = hist->data_g[i] = hist->data_b[i] = 0.0f;
-		}
-		else {
-			if (ibuf->rect_float) {
-				fp = (ibuf->rect_float + (ibuf->channels) * (y * ibuf->x + x));
-
-				if (scene->r.color_mgt_flag & R_COLOR_MANAGEMENT)
-					linearrgb_to_srgb_v3_v3(rgb, fp);
-				else
-					copy_v3_v3(rgb, fp);
-
-				hist->data_r[i] = rgb[0];
-				hist->data_g[i] = rgb[1];
-				hist->data_b[i] = rgb[2];
-				hist->data_luma[i] = rgb_to_luma(rgb);
-			}
-			else if (ibuf->rect) {
-				cp = (unsigned char *)(ibuf->rect + y * ibuf->x + x);
-				hist->data_r[i] = (float)cp[0] / 255.0f;
-				hist->data_g[i] = (float)cp[1] / 255.0f;
-				hist->data_b[i] = (float)cp[2] / 255.0f;
-				hist->data_luma[i] = (float)rgb_to_luma_byte(cp) / 255.0f;
-			}
-		}
-	}
+
+	hist->co[0][0] = x1f;
+	hist->co[0][1] = y1f;
+	hist->co[1][0] = x2f;
+	hist->co[1][1] = y2f;
+
+	BKE_histogram_update_sample_line(hist, ibuf, (scene->r.color_mgt_flag & R_COLOR_MANAGEMENT) != 0);
 	
 	ED_space_image_release_buffer(sima, lock);
 	
@@ -2133,7 +2141,10 @@ static int image_sample_line_exec(bContext *C, wmOperator *op)
 static int image_sample_line_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
 	SpaceImage *sima = CTX_wm_space_image(C);
-	
+
+	Histogram *hist = &sima->sample_line_hist;
+	hist->flag &= ~HISTO_FLAG_SAMPLELINE;
+
 	if (!ED_space_image_has_buffer(sima))
 		return OPERATOR_CANCELLED;
 	
@@ -2397,56 +2408,15 @@ void IMAGE_OT_cycle_render_slot(wmOperatorType *ot)
 
 /* goes over all ImageUsers, and sets frame numbers if auto-refresh is set */
 
+static void image_update_frame(struct Image *UNUSED(ima), struct ImageUser *iuser, void *customdata)
+{
+	int cfra = *(int*)customdata;
+
+	BKE_image_user_check_frame_calc(iuser, cfra, 0);
+}
+
 void ED_image_update_frame(const Main *mainp, int cfra)
 {
-	wmWindowManager *wm;
-	wmWindow *win;
-	Tex *tex;
-	
-	/* texture users */
-	for (tex = mainp->tex.first; tex; tex = tex->id.next) {
-		if (tex->type == TEX_IMAGE && tex->ima) {
-			if (ELEM(tex->ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE)) {
-				if (tex->iuser.flag & IMA_ANIM_ALWAYS)
-					BKE_image_user_frame_calc(&tex->iuser, cfra, 0);
-			}
-		}
-	}
-	
-	/* image window, compo node users */
-	for (wm = mainp->wm.first; wm; wm = wm->id.next) { /* only 1 wm */
-		for (win = wm->windows.first; win; win = win->next) {
-			ScrArea *sa;
-			for (sa = win->screen->areabase.first; sa; sa = sa->next) {
-				if (sa->spacetype == SPACE_VIEW3D) {
-					View3D *v3d = sa->spacedata.first;
-					BGpic *bgpic;
-					for (bgpic = v3d->bgpicbase.first; bgpic; bgpic = bgpic->next)
-						if (bgpic->iuser.flag & IMA_ANIM_ALWAYS)
-							BKE_image_user_frame_calc(&bgpic->iuser, cfra, 0);
-				}
-				else if (sa->spacetype == SPACE_IMAGE) {
-					SpaceImage *sima = sa->spacedata.first;
-					if (sima->iuser.flag & IMA_ANIM_ALWAYS)
-						BKE_image_user_frame_calc(&sima->iuser, cfra, 0);
-				}
-				else if (sa->spacetype == SPACE_NODE) {
-					SpaceNode *snode = sa->spacedata.first;
-					if ((snode->treetype == NTREE_COMPOSIT) && (snode->nodetree)) {
-						bNode *node;
-						for (node = snode->nodetree->nodes.first; node; node = node->next) {
-							if (node->id && node->type == CMP_NODE_IMAGE) {
-								Image *ima = (Image *)node->id;
-								ImageUser *iuser = node->storage;
-								if (ELEM(ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE))
-									if (iuser->flag & IMA_ANIM_ALWAYS)
-										BKE_image_user_frame_calc(iuser, cfra, 0);
-							}
-						}
-					}
-				}
-			}
-		}
-	}
+	BKE_image_walk_all_users(mainp, &cfra, image_update_frame);
 }
 
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index 9e0f538056c..32e6f588e27 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -473,6 +473,7 @@ static void image_operatortypes(void)
 
 	WM_operatortype_append(IMAGE_OT_new);
 	WM_operatortype_append(IMAGE_OT_open);
+	WM_operatortype_append(IMAGE_OT_match_movie_length);
 	WM_operatortype_append(IMAGE_OT_replace);
 	WM_operatortype_append(IMAGE_OT_reload);
 	WM_operatortype_append(IMAGE_OT_save);
@@ -589,8 +590,7 @@ static void image_refresh(const bContext *C, ScrArea *UNUSED(sa))
 
 	ima = ED_space_image(sima);
 
-	if (sima->iuser.flag & IMA_ANIM_ALWAYS)
-		BKE_image_user_frame_calc(&sima->iuser, scene->r.cfra, 0);
+	BKE_image_user_check_frame_calc(&sima->iuser, scene->r.cfra, 0);
 	
 	/* check if we have to set the image from the editmesh */
 	if (ima && (ima->source == IMA_SRC_VIEWER || sima->pin)) ;
@@ -824,15 +824,18 @@ static void image_main_area_draw(const bContext *C, ARegion *ar)
 	draw_uvedit_main(sima, ar, scene, obedit, obact);
 
 	ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_VIEW);
-		
+
 	/* Grease Pencil too (in addition to UV's) */
 	draw_image_grease_pencil((bContext *)C, 1); 
 
+	/* sample line */
+	draw_image_sample_line(sima);
+
 	UI_view2d_view_restore(C);
 
 	/* draw Grease Pencil - screen space only */
 	draw_image_grease_pencil((bContext *)C, 0);
-	
+
 	/* scrollers? */
 #if 0
 	scrollers = UI_view2d_scrollers_calc(C, v2d, V2D_UNIT_VALUES, V2D_GRID_CLAMP, V2D_ARG_DUMMY, V2D_ARG_DUMMY);
@@ -911,6 +914,9 @@ static void image_scope_area_draw(const bContext *C, ARegion *ar)
 	void *lock;
 	ImBuf *ibuf = ED_space_image_acquire_buffer(sima, &lock);
 	if (ibuf) {
+		if (!sima->scopes.ok) {
+			BKE_histogram_update_sample_line(&sima->sample_line_hist, ibuf, scene->r.color_mgt_flag & R_COLOR_MANAGEMENT);
+		}
 		scopes_update(&sima->scopes, ibuf, scene->r.color_mgt_flag & R_COLOR_MANAGEMENT);
 	}
 	ED_space_image_release_buffer(sima, lock);
diff --git a/source/blender/editors/space_info/info_draw.c b/source/blender/editors/space_info/info_draw.c
index 2409ab8c4e0..329917a9f7e 100644
--- a/source/blender/editors/space_info/info_draw.c
+++ b/source/blender/editors/space_info/info_draw.c
@@ -63,11 +63,11 @@
 /* complicates things a bit, so leaving in old simple code */
 #define USE_INFO_NEWLINE
 
-static void info_report_color(unsigned char *fg, unsigned char *bg, Report *report, int bool)
+static void info_report_color(unsigned char *fg, unsigned char *bg, Report *report, const short do_tint)
 {
 	if (report->flag & SELECT) {
 		fg[0] = 255; fg[1] = 255; fg[2] = 255;
-		if (bool) {
+		if (do_tint) {
 			bg[0] = 96; bg[1] = 128; bg[2] = 255;
 		}
 		else {
@@ -78,30 +78,30 @@ static void info_report_color(unsigned char *fg, unsigned char *bg, Report *repo
 		fg[0] = 0; fg[1] = 0; fg[2] = 0;
 		
 		if (report->type & RPT_ERROR_ALL) {
-			if (bool) { bg[0] = 220; bg[1] = 0;   bg[2] = 0;   }
-			else      { bg[0] = 214; bg[1] = 0;   bg[2] = 0;   }
+			if (do_tint) { bg[0] = 220; bg[1] = 0;   bg[2] = 0;   }
+			else         { bg[0] = 214; bg[1] = 0;   bg[2] = 0;   }
 		}
 		else if (report->type & RPT_WARNING_ALL) {
-			if (bool) { bg[0] = 220; bg[1] = 128; bg[2] = 96;  }
-			else      { bg[0] = 214; bg[1] = 122; bg[2] = 90;  }
+			if (do_tint) { bg[0] = 220; bg[1] = 128; bg[2] = 96;  }
+			else         { bg[0] = 214; bg[1] = 122; bg[2] = 90;  }
 		}
 #if 0 // XXX: this looks like the selected color, so don't use this
 		else if (report->type & RPT_OPERATOR_ALL) {
-			if (bool) { bg[0] = 96;  bg[1] = 128; bg[2] = 255; }
-			else      { bg[0] = 90;  bg[1] = 122; bg[2] = 249; }
+			if (do_tint) { bg[0] = 96;  bg[1] = 128; bg[2] = 255; }
+			else         { bg[0] = 90;  bg[1] = 122; bg[2] = 249; }
 		}
 #endif
 		else if (report->type & RPT_INFO_ALL) {
-			if (bool) { bg[0] = 0;   bg[1] = 170; bg[2] = 0;   }
-			else      { bg[0] = 0;   bg[1] = 164; bg[2] = 0;   }
+			if (do_tint) { bg[0] = 0;   bg[1] = 170; bg[2] = 0;   }
+			else         { bg[0] = 0;   bg[1] = 164; bg[2] = 0;   }
 		}
 		else if (report->type & RPT_DEBUG_ALL) {
-			if (bool) { bg[0] = 196; bg[1] = 196; bg[2] = 196; }
-			else      { bg[0] = 190; bg[1] = 190; bg[2] = 190; }
+			if (do_tint) { bg[0] = 196; bg[1] = 196; bg[2] = 196; }
+			else         { bg[0] = 190; bg[1] = 190; bg[2] = 190; }
 		}
 		else {
-			if (bool) { bg[0] = 120; bg[1] = 120; bg[2] = 120; }
-			else      { bg[0] = 114; bg[1] = 114; bg[2] = 114; }
+			if (do_tint) { bg[0] = 120; bg[1] = 120; bg[2] = 120; }
+			else         { bg[0] = 114; bg[1] = 114; bg[2] = 114; }
 		}
 	}
 }
diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c
index dd21fca93ce..0eec61f599e 100644
--- a/source/blender/editors/space_logic/logic_window.c
+++ b/source/blender/editors/space_logic/logic_window.c
@@ -1151,155 +1151,155 @@ static short draw_sensorbuttons(Object *ob, bSensor *sens, uiBlock *block, short
 	uiBut *but;
 	short ysize;
 	const char *str;
-	
+
 	/* yco is at the top of the rect, draw downwards */
-	
+
 	set_col_sensor(sens->type, 0);
-	
+
 	switch (sens->type) {
-	case SENS_ALWAYS:
+		case SENS_ALWAYS:
 		{
 			ysize= 24;
-			
+
 			glRects(xco, yco-ysize, xco+width, yco);
 			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-			
+
 			draw_default_sensor_header(sens, block, xco, yco, width);
-			
+
 			yco-= ysize;
-			
+
 			break;
 		}
-	case SENS_TOUCH:
+		case SENS_TOUCH:
 		{
-			ysize= 48; 
-			
-			glRects(xco, yco-ysize, xco+width, yco); 
-			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1); 
-			
+			ysize= 48;
+
+			glRects(xco, yco-ysize, xco+width, yco);
+			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+
 			draw_default_sensor_header(sens, block, xco, yco, width);
-			
-			ts= sens->data; 
-			
+
+			ts= sens->data;
+
 			// uiDefBut(block, TEX, 1, "Property:",	xco, yco-22, width, 19, &ts->name, 0, MAX_NAME, 0, 0, "Only look for Objects with this property");
 			uiDefIDPoinBut(block, test_matpoin_but, ID_MA, 1, "MA:", (short)(xco + 10), (short)(yco-44), (short)(width - 20), 19, &ts->ma,  "Only look for floors with this Material");
 			// uiDefButF(block, NUM, 1, "Margin:",	xco+width/2, yco-44, width/2, 19, &ts->dist, 0.0, 10.0, 100, 0, "Extra margin (distance) for larger sensitivity");
-			yco-= ysize; 
-			break; 
+			yco-= ysize;
+			break;
 		}
-	case SENS_COLLISION:
+		case SENS_COLLISION:
 		{
 			ysize= 48;
-			
+
 			glRects(xco, yco-ysize, xco+width, yco);
 			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-			
+
 			draw_default_sensor_header(sens, block, xco, yco, width);
 			cs= sens->data;
-			
+
 			/* The collision sensor will become a generic collision (i.e. it     */
 			/* absorb the old touch sensor).                                     */
 
 			uiDefButBitS(block, TOG, SENS_COLLISION_PULSE, B_REDR, "Pulse", (short)(xco + 10), (short)(yco - 44),
-				(short)(0.20 * (width-20)), 19, &cs->mode, 0.0, 0.0, 0, 0,
-				"Changes to the set of colliding objects generated pulses");
-			
+			             (short)(0.20 * (width-20)), 19, &cs->mode, 0.0, 0.0, 0, 0,
+			             "Changes to the set of colliding objects generated pulses");
+
 			uiDefButBitS(block, TOG, SENS_COLLISION_MATERIAL, B_REDR, "M/P", (short)(xco + 10 + (0.20 * (width-20))), (short)(yco - 44),
-				(short)(0.20 * (width-20)), 19, &cs->mode, 0.0, 0.0, 0, 0,
-				"Toggle collision on material or property");
-			
+			             (short)(0.20 * (width-20)), 19, &cs->mode, 0.0, 0.0, 0, 0,
+			             "Toggle collision on material or property");
+
 			if (cs->mode & SENS_COLLISION_MATERIAL) {
 				uiDefBut(block, TEX, 1, "Material:", (short)(xco + 10 + 0.40 * (width-20)),
-					(short)(yco-44), (short)(0.6*(width-20)), 19, &cs->materialName, 0, MAX_NAME, 0, 0,
-					"Only look for Objects with this material");
+				         (short)(yco-44), (short)(0.6*(width-20)), 19, &cs->materialName, 0, MAX_NAME, 0, 0,
+				         "Only look for Objects with this material");
 			}
 			else {
 				uiDefBut(block, TEX, 1, "Property:", (short)(xco + 10 + 0.40 * (width-20)), (short)(yco-44),
-					(short)(0.6*(width-20)), 19, &cs->name, 0, MAX_NAME, 0, 0,
-					"Only look for Objects with this property");
+				         (short)(0.6*(width-20)), 19, &cs->name, 0, MAX_NAME, 0, 0,
+				         "Only look for Objects with this property");
 			}
-	
+
 			/* uiDefButS(block, NUM, 1, "Damp:",	xco+10+width-90, yco-24, 70, 19, &cs->damp, 0, 250, 0, 0, "For 'damp' time don't detect another collision"); */
-			
+
 			yco-= ysize;
 			break;
 		}
-	case SENS_NEAR:
+		case SENS_NEAR:
 		{
 			ysize= 72;
-			
+
 			glRects(xco, yco-ysize, xco+width, yco);
 			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-			
+
 			draw_default_sensor_header(sens, block, xco, yco, width);
 			ns= sens->data;
-			
+
 			uiDefBut(block, TEX, 1, "Property:", (short)(10+xco), (short)(yco-44), (short)(width-20), 19,
-				&ns->name, 0, MAX_NAME, 0, 0, "Only look for Objects with this property");
+			         &ns->name, 0, MAX_NAME, 0, 0, "Only look for Objects with this property");
 			uiDefButF(block, NUM, 1, "Dist", (short)(10+xco), (short)(yco-68), (short)((width-22)/2), 19,
-				&ns->dist, 0.0, 1000.0, 1000, 0, "Trigger distance");
+			          &ns->dist, 0.0, 1000.0, 1000, 0, "Trigger distance");
 			uiDefButF(block, NUM, 1, "Reset", (short)(10+xco+(width-22)/2), (short)(yco-68), (short)((width-22)/2), 19,
-				&ns->resetdist, 0.0, 1000.0, 1000, 0, "Reset distance"); 
+			          &ns->resetdist, 0.0, 1000.0, 1000, 0, "Reset distance");
 			yco-= ysize;
 			break;
 		}
-	case SENS_RADAR:
+		case SENS_RADAR:
 		{
-			ysize= 72; 
-			
+			ysize= 72;
+
 			glRects(xco, yco-ysize, xco+width, yco);
 			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-			
+
 			draw_default_sensor_header(sens, block, xco, yco, width);
-			
+
 			rs= sens->data;
-			
+
 			uiDefBut(block, TEX, 1, "Prop:",
-					 (short)(10+xco), (short)(yco-44), (short)(0.7 * (width-20)), 19,
-					 &rs->name, 0, MAX_NAME, 0, 0,
-					 "Only look for Objects with this property");
+			         (short)(10+xco), (short)(yco-44), (short)(0.7 * (width-20)), 19,
+			         &rs->name, 0, MAX_NAME, 0, 0,
+			         "Only look for Objects with this property");
 
-			str = "Type %t|+X axis %x0|+Y axis %x1|+Z axis %x2|-X axis %x3|-Y axis %x4|-Z axis %x5"; 
+			str = "Type %t|+X axis %x0|+Y axis %x1|+Z axis %x2|-X axis %x3|-Y axis %x4|-Z axis %x5";
 			uiDefButS(block, MENU, B_REDR, str,
-				(short)(10+xco+0.7 * (width-20)), (short)(yco-44), (short)(0.3 * (width-22)), 19,
-				&rs->axis, 2.0, 31, 0, 0,
-				"Specify along which axis the radar cone is cast");
-				
+			          (short)(10+xco+0.7 * (width-20)), (short)(yco-44), (short)(0.3 * (width-22)), 19,
+			          &rs->axis, 2.0, 31, 0, 0,
+			          "Specify along which axis the radar cone is cast");
+
 			uiDefButF(block, NUM, 1, "Ang:",
-					 (short)(10+xco), (short)(yco-68), (short)((width-20)/2), 19,
-					 &rs->angle, 0.0, 179.9, 10, 0,
-					 "Opening angle of the radar cone");
+			          (short)(10+xco), (short)(yco-68), (short)((width-20)/2), 19,
+			          &rs->angle, 0.0, 179.9, 10, 0,
+			          "Opening angle of the radar cone");
 			uiDefButF(block, NUM, 1, "Dist:",
-					 (short)(xco+10 + (width-20)/2), (short)(yco-68), (short)((width-20)/2), 19,
-					 &rs->range, 0.01, 10000.0, 100, 0,
-					 "Depth of the radar cone");
+			          (short)(xco+10 + (width-20)/2), (short)(yco-68), (short)((width-20)/2), 19,
+			          &rs->range, 0.01, 10000.0, 100, 0,
+			          "Depth of the radar cone");
 			yco-= ysize;
 			break;
 		}
-	case SENS_KEYBOARD:
+		case SENS_KEYBOARD:
 		{
 			ks= sens->data;
-			
+
 			/* 5 lines: 120 height */
 			ysize= (ks->type&1) ? 96:120;
-			
+
 			glRects(xco, yco-ysize, xco+width, yco);
 			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-			
+
 			/* header line */
 			draw_default_sensor_header(sens, block, xco, yco, width);
-			
+
 			/* part of line 1 */
 			uiDefBut(block, LABEL, 0, "Key",	  xco, yco-44, 40, 19, NULL, 0, 0, 0, 0, "");
 			uiDefButBitS(block, TOG, 1, B_REDR, "All keys",	  xco+40+(width/2), yco-44, (width/2)-50, 19,
-				&ks->type, 0, 0, 0, 0, "");
-			
-			
+			             &ks->type, 0, 0, 0, 0, "");
+
+
 			if ((ks->type&1)==0) { /* is All Keys option off? */
 				/* line 2: hotkey and allkeys toggle */
 				but = uiDefKeyevtButS(block, 0, "", xco+40, yco-44, (width)/2, 19, &ks->key, "Key code");
 				uiButSetFunc(but, test_keyboard_event, ks, NULL);
-				
+
 				/* line 3: two key modifyers (qual1, qual2) */
 				uiDefBut(block, LABEL, 0, "Hold",	  xco, yco-68, 40, 19, NULL, 0, 0, 0, 0, "");
 				but = uiDefKeyevtButS(block, 0, "", xco+40, yco-68, (width-50)/2, 19, &ks->qual, "Modifier key code");
@@ -1307,50 +1307,50 @@ static short draw_sensorbuttons(Object *ob, bSensor *sens, uiBlock *block, short
 				but = uiDefKeyevtButS(block, 0, "", xco+40+(width-50)/2, yco-68, (width-50)/2, 19, &ks->qual2, "Second Modifier key code");
 				uiButSetFunc(but, test_keyboard_event, ks, NULL);
 			}
-			
+
 			/* line 4: toggle property for string logging mode */
 			uiDefBut(block, TEX, 1, "LogToggle: ",
-				xco+10, yco-((ks->type&1) ? 68:92), (width-20), 19,
-				ks->toggleName, 0, MAX_NAME, 0, 0,
-				"Property that indicates whether to log "
-				"keystrokes as a string");
-			
+			         xco+10, yco-((ks->type&1) ? 68:92), (width-20), 19,
+			         ks->toggleName, 0, MAX_NAME, 0, 0,
+			         "Property that indicates whether to log "
+			         "keystrokes as a string");
+
 			/* line 5: target property for string logging mode */
 			uiDefBut(block, TEX, 1, "Target: ",
-				xco+10, yco-((ks->type&1) ? 92:116), (width-20), 19,
-				ks->targetName, 0, MAX_NAME, 0, 0,
-				"Property that receives the keystrokes in case "
-				"a string is logged");
-			
+			         xco+10, yco-((ks->type&1) ? 92:116), (width-20), 19,
+			         ks->targetName, 0, MAX_NAME, 0, 0,
+			         "Property that receives the keystrokes in case "
+			         "a string is logged");
+
 			yco-= ysize;
 			break;
 		}
-	case SENS_PROPERTY:
+		case SENS_PROPERTY:
 		{
 			ysize= 96;
-			
+
 			glRects(xco, yco-ysize, xco+width, yco);
 			uiEmboss((float)xco, (float)yco-ysize,
-				(float)xco+width, (float)yco, 1);
-			
+			         (float)xco+width, (float)yco, 1);
+
 			draw_default_sensor_header(sens, block, xco, yco, width);
 			ps= sens->data;
-			
-			str= "Type %t|Equal %x0|Not Equal %x1|Interval %x2|Changed %x3"; 
+
+			str= "Type %t|Equal %x0|Not Equal %x1|Interval %x2|Changed %x3";
 			/* str= "Type %t|Equal %x0|Not Equal %x1"; */
 			uiDefButI(block, MENU, B_REDR, str,			xco+30, yco-44, width-60, 19,
-				&ps->type, 0, 31, 0, 0, "Type");
-			
+			          &ps->type, 0, 31, 0, 0, "Type");
+
 			if (ps->type != SENS_PROP_EXPRESSION) {
 				uiDefBut(block, TEX, 1, "Prop: ",			xco+30, yco-68, width-60, 19,
-					ps->name, 0, MAX_NAME, 0, 0,  "Property name");
+				         ps->name, 0, MAX_NAME, 0, 0,  "Property name");
 			}
-			
+
 			if (ps->type == SENS_PROP_INTERVAL) {
 				uiDefBut(block, TEX, 1, "Min: ",		xco, yco-92, width/2, 19,
-					ps->value, 0, MAX_NAME, 0, 0, "check for min value");
+				         ps->value, 0, MAX_NAME, 0, 0, "check for min value");
 				uiDefBut(block, TEX, 1, "Max: ",		xco+width/2, yco-92, width/2, 19,
-					ps->maxvalue, 0, MAX_NAME, 0, 0, "check for max value");
+				         ps->maxvalue, 0, MAX_NAME, 0, 0, "check for max value");
 			}
 			else if (ps->type == SENS_PROP_CHANGED) {
 				/* pass */
@@ -1359,199 +1359,199 @@ static short draw_sensorbuttons(Object *ob, bSensor *sens, uiBlock *block, short
 				uiDefBut(block, TEX, 1, "Value: ",		xco+30, yco-92, width-60, 19,
 				         ps->value, 0, MAX_NAME, 0, 0, "check for value");
 			}
-			
+
 			yco-= ysize;
 			break;
 		}
-	case SENS_ARMATURE:
+		case SENS_ARMATURE:
 		{
 			ysize= 70;
-			
+
 			glRects(xco, yco-ysize, xco+width, yco);
 			uiEmboss((float)xco, (float)yco-ysize,
-				(float)xco+width, (float)yco, 1);
-			
+			         (float)xco+width, (float)yco, 1);
+
 			draw_default_sensor_header(sens, block, xco, yco, width);
 			arm= sens->data;
 
 			if (ob->type == OB_ARMATURE) {
 				uiBlockBeginAlign(block);
 				but = uiDefBut(block, TEX, 1, "Bone: ",
-						(xco+10), (yco-44), (width-20)/2, 19,
-						arm->posechannel, 0, MAX_NAME, 0, 0,
-						"Bone on which you want to check a constraint");
+				               (xco+10), (yco-44), (width-20)/2, 19,
+				               arm->posechannel, 0, MAX_NAME, 0, 0,
+				               "Bone on which you want to check a constraint");
 				uiButSetFunc(but, check_armature_sensor, but, arm);
 				but = uiDefBut(block, TEX, 1, "Cons: ",
-						(xco+10)+(width-20)/2, (yco-44), (width-20)/2, 19,
-						arm->constraint, 0, MAX_NAME, 0, 0,
-						"Name of the constraint you want to control");
+				               (xco+10)+(width-20)/2, (yco-44), (width-20)/2, 19,
+				               arm->constraint, 0, MAX_NAME, 0, 0,
+				               "Name of the constraint you want to control");
 				uiButSetFunc(but, check_armature_sensor, but, arm);
 				uiBlockEndAlign(block);
 
-				str= "Type %t|State changed %x0|Lin error below %x1|Lin error above %x2|Rot error below %x3|Rot error above %x4"; 
+				str= "Type %t|State changed %x0|Lin error below %x1|Lin error above %x2|Rot error below %x3|Rot error above %x4";
 
 				uiDefButI(block, MENU, B_REDR, str,			xco+10, yco-66, 0.4*(width-20), 19,
-					&arm->type, 0, 31, 0, 0, "Type");
-			
+				          &arm->type, 0, 31, 0, 0, "Type");
+
 				if (arm->type != SENS_ARM_STATE_CHANGED) {
 					uiDefButF(block, NUM, 1, "Value: ",		xco+10+0.4*(width-20), yco-66, 0.6*(width-20), 19,
-					&arm->value, -10000.0, 10000.0, 100, 0, "Test the error against this value");
+					          &arm->value, -10000.0, 10000.0, 100, 0, "Test the error against this value");
 				}
 			}
 			yco-= ysize;
 			break;
 		}
-	case SENS_ACTUATOR:
+		case SENS_ACTUATOR:
 		{
 			ysize= 48;
-			
+
 			glRects(xco, yco-ysize, xco+width, yco);
 			uiEmboss((float)xco, (float)yco-ysize,
-				(float)xco+width, (float)yco, 1);
-			
+			         (float)xco+width, (float)yco, 1);
+
 			draw_default_sensor_header(sens, block, xco, yco, width);
 			as= sens->data;
-			
+
 			uiDefBut(block, TEX, 1, "Act: ",			xco+30, yco-44, width-60, 19,
-					as->name, 0, MAX_NAME, 0, 0,  "Actuator name, actuator active state modifications will be detected");
+			         as->name, 0, MAX_NAME, 0, 0,  "Actuator name, actuator active state modifications will be detected");
 			yco-= ysize;
 			break;
 		}
-	case SENS_DELAY:
+		case SENS_DELAY:
 		{
 			ysize= 48;
-			
+
 			glRects(xco, yco-ysize, xco+width, yco);
 			uiEmboss((float)xco, (float)yco-ysize,
-				(float)xco+width, (float)yco, 1);
-			
+			         (float)xco+width, (float)yco, 1);
+
 			draw_default_sensor_header(sens, block, xco, yco, width);
 			ds = sens->data;
-			
+
 			uiDefButS(block, NUM, 0, "Delay", (short)(10+xco), (short)(yco-44), (short)((width-22)*0.4+10), 19,
-				&ds->delay, 0.0, 5000.0, 0, 0, "Delay in number of logic tics before the positive trigger (default 60 per second)");
+			          &ds->delay, 0.0, 5000.0, 0, 0, "Delay in number of logic tics before the positive trigger (default 60 per second)");
 			uiDefButS(block, NUM, 0, "Dur", (short)(10+xco+(width-22)*0.4+10), (short)(yco-44), (short)((width-22)*0.4-10), 19,
-				&ds->duration, 0.0, 5000.0, 0, 0, "If >0, delay in number of logic tics before the negative trigger following the positive trigger");
+			          &ds->duration, 0.0, 5000.0, 0, 0, "If >0, delay in number of logic tics before the negative trigger following the positive trigger");
 			uiDefButBitS(block, TOG, SENS_DELAY_REPEAT, 0, "REP", (short)(xco + 10 + (width-22)*0.8), (short)(yco - 44),
-				(short)(0.20 * (width-22)), 19, &ds->flag, 0.0, 0.0, 0, 0,
-				"Toggle repeat option. If selected, the sensor restarts after Delay+Dur logic tics");
+			             (short)(0.20 * (width-22)), 19, &ds->flag, 0.0, 0.0, 0, 0,
+			             "Toggle repeat option. If selected, the sensor restarts after Delay+Dur logic tics");
 			yco-= ysize;
 			break;
 		}
-	case SENS_MOUSE:
+		case SENS_MOUSE:
 		{
 			ms= sens->data;
 			/* Two lines: 48 pixels high. */
 			ysize = 48;
-			
+
 			glRects(xco, yco-ysize, xco+width, yco);
 			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-			
+
 			/* line 1: header */
 			draw_default_sensor_header(sens, block, xco, yco, width);
-			
+
 			/* Line 2: type selection. The number are a bit mangled to get
 			 * proper compatibility with older .blend files. */
 
 			/* Any sensor type default is 0 but the ms enum starts in 1.
 			 * Therefore the mouse sensor is initialized to 1 in sca.c */
 			str= "Type %t|Left button %x1|Middle button %x2|"
-				"Right button %x4|Wheel Up %x5|Wheel Down %x6|Movement %x8|Mouse over %x16|Mouse over any%x32"; 
+			     "Right button %x4|Wheel Up %x5|Wheel Down %x6|Movement %x8|Mouse over %x16|Mouse over any%x32";
 			uiDefButS(block, MENU, B_REDR, str, xco+10, yco-44, (width*0.8f)-20, 19,
-				&ms->type, 0, 31, 0, 0,
-				"Specify the type of event this mouse sensor should trigger on");
-			
+			          &ms->type, 0, 31, 0, 0,
+			          "Specify the type of event this mouse sensor should trigger on");
+
 			if (ms->type==32) {
 				uiDefButBitS(block, TOG, SENS_MOUSE_FOCUS_PULSE, B_REDR, "Pulse", (short)(xco + 10) + (width*0.8f)-20, (short)(yco - 44),
-					(short)(0.20 * (width-20)), 19, &ms->flag, 0.0, 0.0, 0, 0,
-					"Moving the mouse over a different object generates a pulse");	
+				             (short)(0.20 * (width-20)), 19, &ms->flag, 0.0, 0.0, 0, 0,
+				             "Moving the mouse over a different object generates a pulse");
 			}
-			
+
 			yco-= ysize;
 			break;
 		}
-	case SENS_RANDOM:
+		case SENS_RANDOM:
 		{
 			ysize = 48;
-			
+
 			glRects(xco, yco-ysize, xco+width, yco);
 			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-			
+
 			draw_default_sensor_header(sens, block, xco, yco, width);
 			randomSensor = sens->data;
 			/* some files were wrongly written, avoid crash now */
 			if (randomSensor) {
 				uiDefButI(block, NUM, 1, "Seed: ",		xco+10, yco-44, (width-20), 19,
-					&randomSensor->seed, 0, 1000, 0, 0,
-					"Initial seed of the generator. (Choose 0 for not random)");
+				          &randomSensor->seed, 0, 1000, 0, 0,
+				          "Initial seed of the generator. (Choose 0 for not random)");
 			}
 			yco-= ysize;
 			break;
 		}
-	case SENS_RAY:
+		case SENS_RAY:
 		{
 			ysize = 72;
 			glRects(xco, yco-ysize, xco+width, yco);
 			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-			
+
 			draw_default_sensor_header(sens, block, xco, yco, width);
 			raySens = sens->data;
-			
+
 			/* 1. property or material */
 			uiDefButBitS(block, TOG, SENS_COLLISION_MATERIAL, B_REDR, "M/P",
-				xco + 10, yco - 44, 0.20 * (width-20), 19,
-				&raySens->mode, 0.0, 0.0, 0, 0,
-				"Toggle collision on material or property");
-			
+			             xco + 10, yco - 44, 0.20 * (width-20), 19,
+			             &raySens->mode, 0.0, 0.0, 0, 0,
+			             "Toggle collision on material or property");
+
 			if (raySens->mode & SENS_COLLISION_MATERIAL) {
 				uiDefBut(block, TEX, 1, "Material:", xco + 10 + 0.20 * (width-20), yco-44, 0.8*(width-20), 19,
-					&raySens->matname, 0, MAX_NAME, 0, 0,
-					"Only look for Objects with this material");
+				         &raySens->matname, 0, MAX_NAME, 0, 0,
+				         "Only look for Objects with this material");
 			}
 			else {
 				uiDefBut(block, TEX, 1, "Property:", xco + 10 + 0.20 * (width-20), yco-44, 0.8*(width-20), 19,
-					&raySens->propname, 0, MAX_NAME, 0, 0,
-					"Only look for Objects with this property");
+				         &raySens->propname, 0, MAX_NAME, 0, 0,
+				         "Only look for Objects with this property");
 			}
 
 			/* X-Ray option */
 			uiDefButBitS(block, TOG, SENS_RAY_XRAY, 1, "X",
-				xco + 10, yco - 68, 0.10 * (width-20), 19,
-				&raySens->mode, 0.0, 0.0, 0, 0,
-				"Toggle X-Ray option (see through objects that don't have the property)");
+			             xco + 10, yco - 68, 0.10 * (width-20), 19,
+			             &raySens->mode, 0.0, 0.0, 0, 0,
+			             "Toggle X-Ray option (see through objects that don't have the property)");
 			/* 2. sensing range */
 			uiDefButF(block, NUM, 1, "Range", xco+10 + 0.10 * (width-20), yco-68, 0.5 * (width-20), 19,
-				&raySens->range, 0.01, 10000.0, 100, 0,
-				"Sense objects no farther than this distance");
-			
+			          &raySens->range, 0.01, 10000.0, 100, 0,
+			          "Sense objects no farther than this distance");
+
 			/* 3. axis choice */
-			str = "Type %t|+ X axis %x1|+ Y axis %x0|+ Z axis %x2|- X axis %x3|- Y axis %x4|- Z axis %x5"; 
+			str = "Type %t|+ X axis %x1|+ Y axis %x0|+ Z axis %x2|- X axis %x3|- Y axis %x4|- Z axis %x5";
 			uiDefButI(block, MENU, B_REDR, str, xco+10 + 0.6 * (width-20), yco-68, 0.4 * (width-20), 19,
-				&raySens->axisflag, 2.0, 31, 0, 0,
-				"Specify along which axis the ray is cast");
-			
-			yco-= ysize;		
+			          &raySens->axisflag, 2.0, 31, 0, 0,
+			          "Specify along which axis the ray is cast");
+
+			yco-= ysize;
 			break;
 		}
-	case SENS_MESSAGE:
+		case SENS_MESSAGE:
 		{
 			mes = sens->data;
 			ysize = 2 * 24; /* total number of lines * 24 pixels/line */
-			
+
 			glRects(xco, yco-ysize, xco+width, yco);
 			uiEmboss((float)xco, (float)yco-ysize,
-				(float)xco+width, (float)yco, 1);
-			
+			         (float)xco+width, (float)yco, 1);
+
 			/* line 1: header line */
 			draw_default_sensor_header(sens, block, xco, yco, width);
-			
+
 			/* line 2: Subject filter */
 			uiDefBut(block, TEX, 1, "Subject: ",
-				(xco+10), (yco-44), (width-20), 19,
-				mes->subject, 0, MAX_NAME, 0, 0,
-				"Optional subject filter: only accept messages with this subject"
-				", or empty for all");
-			
+			         (xco+10), (yco-44), (width-20), 19,
+			         mes->subject, 0, MAX_NAME, 0, 0,
+			         "Optional subject filter: only accept messages with this subject"
+			         ", or empty for all");
+
 			yco -= ysize;
 			break;
 		}
@@ -1559,96 +1559,96 @@ static short draw_sensorbuttons(Object *ob, bSensor *sens, uiBlock *block, short
 		{
 
 			ysize =  72;
-			
+
 			glRects(xco, yco-ysize, xco+width, yco);
 			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-			
+
 			/* line 1: header */
 			draw_default_sensor_header(sens, block, xco, yco, width);
 
 			joy= sens->data;
 
 			uiDefButC(block, NUM, 1, "Index:", xco+10, yco-44, 0.33 * (width-20), 19,
-			&joy->joyindex, 0, SENS_JOY_MAXINDEX-1, 100, 0,
-			"Specify which joystick to use");			
+			          &joy->joyindex, 0, SENS_JOY_MAXINDEX-1, 100, 0,
+			          "Specify which joystick to use");
 
-			str= "Type %t|Button %x0|Axis %x1|Single Axis %x3|Hat%x2"; 
+			str= "Type %t|Button %x0|Axis %x1|Single Axis %x3|Hat%x2";
 			uiDefButC(block, MENU, B_REDR, str, xco+87, yco-44, 0.26 * (width-20), 19,
-				&joy->type, 0, 31, 0, 0,
-				"The type of event this joystick sensor is triggered on");
-			
+			          &joy->type, 0, 31, 0, 0,
+			          "The type of event this joystick sensor is triggered on");
+
 			if (joy->type != SENS_JOY_AXIS_SINGLE) {
 				if (joy->flag & SENS_JOY_ANY_EVENT) {
 					switch (joy->type) {
-					case SENS_JOY_AXIS:	
-						str = "All Axis Events";
-						break;
-					case SENS_JOY_BUTTON:	
-						str = "All Button Events";
-						break;
-					default:
-						str = "All Hat Events";
-						break;
+						case SENS_JOY_AXIS:
+							str = "All Axis Events";
+							break;
+						case SENS_JOY_BUTTON:
+							str = "All Button Events";
+							break;
+						default:
+							str = "All Hat Events";
+							break;
 					}
 				}
 				else {
 					str = "All";
 				}
-				
+
 				uiDefButBitS(block, TOG, SENS_JOY_ANY_EVENT, B_REDR, str,
-					xco+10 + 0.475 * (width-20), yco-68, ((joy->flag & SENS_JOY_ANY_EVENT) ? 0.525 : 0.12) * (width-20), 19,
-					&joy->flag, 0, 0, 0, 0,
-					"Triggered by all events on this joysticks current type (axis/button/hat)");
+				             xco+10 + 0.475 * (width-20), yco-68, ((joy->flag & SENS_JOY_ANY_EVENT) ? 0.525 : 0.12) * (width-20), 19,
+				             &joy->flag, 0, 0, 0, 0,
+				             "Triggered by all events on this joysticks current type (axis/button/hat)");
 			}
 			if (joy->type == SENS_JOY_BUTTON) {
 				if ((joy->flag & SENS_JOY_ANY_EVENT)==0) {
 					uiDefButI(block, NUM, 1, "Number:", xco+10 + 0.6 * (width-20), yco-68, 0.4 * (width-20), 19,
-					&joy->button, 0, 18, 100, 0,
-					"Specify which button to use");
+					          &joy->button, 0, 18, 100, 0,
+					          "Specify which button to use");
 				}
 			}
 			else if (joy->type == SENS_JOY_AXIS) {
 				uiDefButS(block, NUM, 1, "Number:", xco+10, yco-68, 0.46 * (width-20), 19,
-				&joy->axis, 1, 8.0, 100, 0,
-				"Specify which axis pair to use, 1 is useually the main direction input");
+				          &joy->axis, 1, 8.0, 100, 0,
+				          "Specify which axis pair to use, 1 is useually the main direction input");
 
 				uiDefButI(block, NUM, 1, "Threshold:", xco+10 + 0.6 * (width-20), yco-44, 0.4 * (width-20), 19,
-				&joy->precision, 0, 32768.0, 100, 0,
-				"Specify the precision of the axis");
+				          &joy->precision, 0, 32768.0, 100, 0,
+				          "Specify the precision of the axis");
 
 				if ((joy->flag & SENS_JOY_ANY_EVENT)==0) {
-					str = "Type %t|Up Axis %x1 |Down Axis %x3|Left Axis %x2|Right Axis %x0"; 
+					str = "Type %t|Up Axis %x1 |Down Axis %x3|Left Axis %x2|Right Axis %x0";
 					uiDefButI(block, MENU, B_REDR, str, xco+10 + 0.6 * (width-20), yco-68, 0.4 * (width-20), 19,
-					&joy->axisf, 2.0, 31, 0, 0,
-					"The direction of the axis, use 'All Events' to receive events on any direction");
+					          &joy->axisf, 2.0, 31, 0, 0,
+					          "The direction of the axis, use 'All Events' to receive events on any direction");
 				}
 			}
 			else if (joy->type == SENS_JOY_HAT) {
 				uiDefButI(block, NUM, 1, "Number:", xco+10, yco-68, 0.46 * (width-20), 19,
-				&joy->hat, 1, 4.0, 100, 0,
-				"Specify which hat to use");
-				
+				          &joy->hat, 1, 4.0, 100, 0,
+				          "Specify which hat to use");
+
 				if ((joy->flag & SENS_JOY_ANY_EVENT)==0) {
-					str = "Direction%t|Up%x1|Down%x4|Left%x8|Right%x2|%l|Up/Right%x3|Down/Left%x12|Up/Left%x9|Down/Right%x6"; 
+					str = "Direction%t|Up%x1|Down%x4|Left%x8|Right%x2|%l|Up/Right%x3|Down/Left%x12|Up/Left%x9|Down/Right%x6";
 					uiDefButI(block, MENU, 0, str, xco+10 + 0.6 * (width-20), yco-68, 0.4 * (width-20), 19,
-					&joy->hatf, 2.0, 31, 0, 0,
-					"The direction of the hat, use 'All Events' to receive events on any direction");
+					          &joy->hatf, 2.0, 31, 0, 0,
+					          "The direction of the hat, use 'All Events' to receive events on any direction");
 				}
 			}
 			else { /* (joy->type == SENS_JOY_AXIS_SINGLE)*/
 				uiDefButS(block, NUM, 1, "Number:", xco+10, yco-68, 0.46 * (width-20), 19,
-				&joy->axis_single, 1, 16.0, 100, 0,
-				"Specify a single axis (verticle/horizontal/other) to detect");
-				
+				          &joy->axis_single, 1, 16.0, 100, 0,
+				          "Specify a single axis (verticle/horizontal/other) to detect");
+
 				uiDefButI(block, NUM, 1, "Threshold:", xco+10 + 0.6 * (width-20), yco-44, 0.4 * (width-20), 19,
-				&joy->precision, 0, 32768.0, 100, 0,
-				"Specify the precision of the axis");
+				          &joy->precision, 0, 32768.0, 100, 0,
+				          "Specify the precision of the axis");
 			}
 			yco-= ysize;
 			break;
 		}
 	}
-	
+
 	return yco-4;
 }
 
@@ -1859,7 +1859,7 @@ static short draw_actuatorbuttons(Main *bmain, Object *ob, bActuator *act, uiBlo
 	set_col_actuator(act->type, 0);
 	
 	switch (act->type) {
-	case ACT_OBJECT:
+		case ACT_OBJECT:
 		{
 			oa = act->data;
 			wval = (width-100)/3;
@@ -1890,7 +1890,7 @@ static short draw_actuatorbuttons(Main *bmain, Object *ob, bActuator *act, uiBlo
 
 				uiDefButBitS(block, TOG, ACT_DLOC_LOCAL, 0, "L",		xco+45+3*wval, yco-45, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
 				uiDefButBitS(block, TOG, ACT_DROT_LOCAL, 0, "L",		xco+45+3*wval, yco-64, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
-	
+
 				if (ob->gameflag & OB_DYNAMIC) {
 					uiDefBut(block, LABEL, 0, "Force",	xco, yco-87, 55, 19, NULL, 0, 0, 0, 0, "Sets the force");
 					uiBlockBeginAlign(block);
@@ -1903,7 +1903,7 @@ static short draw_actuatorbuttons(Main *bmain, Object *ob, bActuator *act, uiBlo
 					uiBlockBeginAlign(block);
 					uiDefButF(block, NUM, 0, "",		xco+45, yco-106, wval, 19, oa->forcerot, -10000.0, 10000.0, 10, 0, "");
 					uiDefButF(block, NUM, 0, "",		xco+45+wval, yco-106, wval, 19, oa->forcerot+1, -10000.0, 10000.0, 10, 0, "");
-					uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-106, wval, 19, oa->forcerot+2, -10000.0, 10000.0, 10, 0, "");				
+					uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-106, wval, 19, oa->forcerot+2, -10000.0, 10000.0, 10, 0, "");
 					uiBlockEndAlign(block);
 				}
 				
@@ -1914,14 +1914,14 @@ static short draw_actuatorbuttons(Main *bmain, Object *ob, bActuator *act, uiBlo
 					uiDefButF(block, NUM, 0, "",		xco+45+wval, yco-129, wval, 19, oa->linearvelocity+1, -10000.0, 10000.0, 10, 0, "");
 					uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-129, wval, 19, oa->linearvelocity+2, -10000.0, 10000.0, 10, 0, "");
 					uiBlockEndAlign(block);
-				
+
 					uiDefBut(block, LABEL, 0, "AngV",	xco, yco-148, 45, 19, NULL, 0, 0, 0, 0, "Sets the angular velocity");
 					uiBlockBeginAlign(block);
 					uiDefButF(block, NUM, 0, "",		xco+45, yco-148, wval, 19, oa->angularvelocity, -10000.0, 10000.0, 10, 0, "");
 					uiDefButF(block, NUM, 0, "",		xco+45+wval, yco-148, wval, 19, oa->angularvelocity+1, -10000.0, 10000.0, 10, 0, "");
 					uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-148, wval, 19, oa->angularvelocity+2, -10000.0, 10000.0, 10, 0, "");
 					uiBlockEndAlign(block);
-				
+
 					uiDefBut(block, LABEL, 0, "Damp",	xco, yco-171, 45, 19, NULL, 0, 0, 0, 0, "Number of frames to reach the target velocity");
 					uiDefButS(block, NUM, 0, "",		xco+45, yco-171, wval, 19, &oa->damping, 0.0, 1000.0, 100, 0, "");
 
@@ -1929,9 +1929,9 @@ static short draw_actuatorbuttons(Main *bmain, Object *ob, bActuator *act, uiBlo
 					uiDefButBitS(block, TOG, ACT_TORQUE_LOCAL, 0, "L",		xco+45+3*wval, yco-106, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
 					uiDefButBitS(block, TOG, ACT_LIN_VEL_LOCAL, 0, "L",		xco+45+3*wval, yco-129, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
 					uiDefButBitS(block, TOG, ACT_ANG_VEL_LOCAL, 0, "L",		xco+45+3*wval, yco-148, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
-				
+
 					uiDefButBitS(block, TOG, ACT_ADD_LIN_VEL, 0, "use_additive", xco+45+3*wval+15, yco-129, 35, 19, &oa->flag, 0.0, 0.0, 0, 0, "Toggles between ADD and SET linV");
-				}				
+				}
 			}
 			else if (oa->type == ACT_OBJECT_SERVO) {
 				ysize= 195;
@@ -1984,8 +1984,8 @@ static short draw_actuatorbuttons(Main *bmain, Object *ob, bActuator *act, uiBlo
 			yco-= ysize;
 			break;
 		}
-	case ACT_ACTION:
-	case ACT_SHAPEACTION:
+		case ACT_ACTION:
+		case ACT_SHAPEACTION:
 		{
 			/* DrawAct */
 #ifdef __NLA_ACTION_BY_MOTION_ACTUATOR
@@ -2010,7 +2010,7 @@ static short draw_actuatorbuttons(Main *bmain, Object *ob, bActuator *act, uiBlo
 			uiDefIDPoinBut(block, test_actionpoin_but, ID_AC, 1, "AC: ", xco+10+ (width/3), yco-24, ((width/3)*2) - (20 + 60), 19, &aa->act, "Action name");
 			
 			uiDefButBitS(block, TOGN, 1, 0, "Continue", xco+((width/3)*2)+20, yco-24, 60, 19,
-					 &aa->end_reset, 0.0, 0.0, 0, 0, "Restore last frame when switching on/off, otherwise play from the start each time");
+			             &aa->end_reset, 0.0, 0.0, 0, 0, "Restore last frame when switching on/off, otherwise play from the start each time");
 			
 			
 			if (aa->type == ACT_ACTION_FROM_PROP) {
@@ -2020,7 +2020,7 @@ static short draw_actuatorbuttons(Main *bmain, Object *ob, bActuator *act, uiBlo
 				uiDefButF(block, NUM, 0, "Sta: ", xco+10, yco-44, (width-20)/2, 19, &aa->sta, 1.0, MAXFRAMEF, 0, 0, "Start frame");
 				uiDefButF(block, NUM, 0, "End: ", xco+10+(width-20)/2, yco-44, (width-20)/2, 19, &aa->end, 1.0, MAXFRAMEF, 0, 0, "End frame");
 			}
-						
+
 			uiDefButS(block, NUM, 0, "Blendin: ", xco+10, yco-64, (width-20)/2, 19, &aa->blendin, 0.0, 32767, 0.0, 0.0, "Number of frames of motion blending");
 			uiDefButS(block, NUM, 0, "Priority: ", xco+10+(width-20)/2, yco-64, (width-20)/2, 19, &aa->priority, 0.0, 100.0, 0.0, 0.0, "Execution priority - lower numbers will override actions with higher numbers, With 2 or more actions at once, the overriding channels must be lower in the stack");
 			
@@ -2038,7 +2038,7 @@ static short draw_actuatorbuttons(Main *bmain, Object *ob, bActuator *act, uiBlo
 			yco-=ysize;
 			break;
 		}
-	case ACT_IPO:
+		case ACT_IPO:
 		{
 			ia= act->data;
 			
@@ -2051,55 +2051,55 @@ static short draw_actuatorbuttons(Main *bmain, Object *ob, bActuator *act, uiBlo
 			
 			uiDefButS(block, MENU, B_REDR, str,		xco+10, yco-24, (width-20)/2, 19, &ia->type, 0, 0, 0, 0, "");
 
-			but = uiDefButBitS(block, TOG, ACT_IPOFORCE, ACT_IPOFORCE, 
-				"Force", xco+10+(width-20)/2, yco-24, (width-20)/4-10, 19, 
-				&ia->flag, 0, 0, 0, 0, 
-				"Apply Ipo as a global or local force depending on the local option (dynamic objects only)"); 
+			but = uiDefButBitS(block, TOG, ACT_IPOFORCE, ACT_IPOFORCE,
+			                   "Force", xco+10+(width-20)/2, yco-24, (width-20)/4-10, 19,
+			                   &ia->flag, 0, 0, 0, 0,
+			                   "Apply Ipo as a global or local force depending on the local option (dynamic objects only)");
 			uiButSetFunc(but, change_ipo_actuator, but, ia);
 
-			but = uiDefButBitS(block, TOG, ACT_IPOADD, ACT_IPOADD, 
-				"Add", xco+3*(width-20)/4, yco-24, (width-20)/4-10, 19, 
-				&ia->flag, 0, 0, 0, 0, 
-				"Ipo is added to the current loc/rot/scale in global or local coordinate according to Local flag"); 
+			but = uiDefButBitS(block, TOG, ACT_IPOADD, ACT_IPOADD,
+			                   "Add", xco+3*(width-20)/4, yco-24, (width-20)/4-10, 19,
+			                   &ia->flag, 0, 0, 0, 0,
+			                   "Ipo is added to the current loc/rot/scale in global or local coordinate according to Local flag");
 			uiButSetFunc(but, change_ipo_actuator, but, ia);
 			
 			/* Only show the do-force-local toggle if force is requested */
 			if (ia->flag & (ACT_IPOFORCE|ACT_IPOADD)) {
-				uiDefButBitS(block, TOG, ACT_IPOLOCAL, 0, 
-					"L", xco+width-30, yco-24, 20, 19, 
-					&ia->flag, 0, 0, 0, 0, 
-					"Let the ipo acts in local coordinates, used in Force and Add mode"); 
+				uiDefButBitS(block, TOG, ACT_IPOLOCAL, 0,
+				             "L", xco+width-30, yco-24, 20, 19,
+				             &ia->flag, 0, 0, 0, 0,
+				             "Let the ipo acts in local coordinates, used in Force and Add mode");
 			}
 
 			if (ia->type==ACT_IPO_FROM_PROP) {
-				uiDefBut(block, TEX, 0, 
-					"Prop: ",		xco+10, yco-44, width-80, 19, 
-					ia->name, 0.0, MAX_NAME, 0, 0,
-					"Use this property to define the Ipo position");
+				uiDefBut(block, TEX, 0,
+				         "Prop: ",		xco+10, yco-44, width-80, 19,
+				         ia->name, 0.0, MAX_NAME, 0, 0,
+				         "Use this property to define the Ipo position");
 			}
 			else {
-				uiDefButF(block, NUM, 0, 
-					"Sta",		xco+10, yco-44, (width-80)/2, 19, 
-					&ia->sta, 1.0, MAXFRAMEF, 0, 0, 
-					"Start frame");
-				uiDefButF(block, NUM, 0, 
-					"End",		xco+10+(width-80)/2, yco-44, (width-80)/2, 19, 
-					&ia->end, 1.0, MAXFRAMEF, 0, 0, 
-					"End frame");
+				uiDefButF(block, NUM, 0,
+				          "Sta",		xco+10, yco-44, (width-80)/2, 19,
+				          &ia->sta, 1.0, MAXFRAMEF, 0, 0,
+				          "Start frame");
+				uiDefButF(block, NUM, 0,
+				          "End",		xco+10+(width-80)/2, yco-44, (width-80)/2, 19,
+				          &ia->end, 1.0, MAXFRAMEF, 0, 0,
+				          "End frame");
 			}
-			uiDefButBitS(block, TOG, ACT_IPOCHILD,  B_REDR, 
-				"Child",	xco+10+(width-80), yco-44, 60, 19, 
-				&ia->flag, 0, 0, 0, 0, 
-				"Update IPO on all children Objects as well");
-			uiDefBut(block, TEX, 0, 
-				"FrameProp: ",		xco+10, yco-64, width-20, 19, 
-				ia->frameProp, 0.0, MAX_NAME, 0, 0,
-				"Assign the action's current frame number to this property");
+			uiDefButBitS(block, TOG, ACT_IPOCHILD,  B_REDR,
+			             "Child",	xco+10+(width-80), yco-44, 60, 19,
+			             &ia->flag, 0, 0, 0, 0,
+			             "Update IPO on all children Objects as well");
+			uiDefBut(block, TEX, 0,
+			         "FrameProp: ",		xco+10, yco-64, width-20, 19,
+			         ia->frameProp, 0.0, MAX_NAME, 0, 0,
+			         "Assign the action's current frame number to this property");
 
 			yco-= ysize;
 			break;
 		}
-	case ACT_PROPERTY:
+		case ACT_PROPERTY:
 		{
 			ysize= 68;
 			
@@ -2129,7 +2129,7 @@ static short draw_actuatorbuttons(Main *bmain, Object *ob, bActuator *act, uiBlo
 			
 			break;
 		}
-	case ACT_SOUND:
+		case ACT_SOUND:
 		{
 			sa = act->data;
 			sa->sndnr = 0;
@@ -2193,743 +2193,743 @@ static short draw_actuatorbuttons(Main *bmain, Object *ob, bActuator *act, uiBlo
 					}
 				}
 				MEM_freeN((void *)str);
-			} 
+			}
 			else {
 				uiDefButO(block, BUT, "sound.open", 0, "Load Sound", xco+10, yco-22, width-20, 19, "Load a sound file");
 			}
-					
+
 			yco-= ysize;
 			
 			break;
 		}
-	case ACT_CAMERA:
+		case ACT_CAMERA:
 
-		ysize= 48;
+			ysize= 48;
 
-		glRects(xco, yco-ysize, xco+width, yco);
-		uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-		
-		ca= act->data;
+			glRects(xco, yco-ysize, xco+width, yco);
+			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
 
-		uiDefIDPoinBut(block, test_obpoin_but, ID_OB, 1, "OB:",		xco+10, yco-24, (width-20)/2, 19, &(ca->ob), "Look at this Object");
-		uiDefButF(block, NUM, 0, "Height:",	xco+10+(width-20)/2, yco-24, (width-20)/2, 19, &ca->height, 0.0, 20.0, 0, 0, "");
-		
-		uiDefButF(block, NUM, 0, "Min:",	xco+10, yco-44, (width-60)/2, 19, &ca->min, 0.0, 20.0, 0, 0, "");
-		
-		if (ca->axis==0) ca->axis= 'x';
-		uiDefButS(block, ROW, 0, "X",	xco+10+(width-60)/2, yco-44, 20, 19, &ca->axis, 4.0, (float)'x', 0, 0, "Camera tries to get behind the X axis");
-		uiDefButS(block, ROW, 0, "Y",	xco+30+(width-60)/2, yco-44, 20, 19, &ca->axis, 4.0, (float)'y', 0, 0, "Camera tries to get behind the Y axis");
-		
-		uiDefButF(block, NUM, 0, "Max:",	xco+20+(width)/2, yco-44, (width-60)/2, 19, &ca->max, 0.0, 20.0, 0, 0, "");
+			ca= act->data;
 
-		yco-= ysize;
+			uiDefIDPoinBut(block, test_obpoin_but, ID_OB, 1, "OB:",		xco+10, yco-24, (width-20)/2, 19, &(ca->ob), "Look at this Object");
+			uiDefButF(block, NUM, 0, "Height:",	xco+10+(width-20)/2, yco-24, (width-20)/2, 19, &ca->height, 0.0, 20.0, 0, 0, "");
 
-		break;
+			uiDefButF(block, NUM, 0, "Min:",	xco+10, yco-44, (width-60)/2, 19, &ca->min, 0.0, 20.0, 0, 0, "");
 
-	case ACT_EDIT_OBJECT:
-		
-		eoa= act->data;
+			if (ca->axis==0) ca->axis= 'x';
+			uiDefButS(block, ROW, 0, "X",	xco+10+(width-60)/2, yco-44, 20, 19, &ca->axis, 4.0, (float)'x', 0, 0, "Camera tries to get behind the X axis");
+			uiDefButS(block, ROW, 0, "Y",	xco+30+(width-60)/2, yco-44, 20, 19, &ca->axis, 4.0, (float)'y', 0, 0, "Camera tries to get behind the Y axis");
 
-		if (eoa->type==ACT_EDOB_ADD_OBJECT) {
-			ysize = 92;
-			glRects(xco, yco-ysize, xco+width, yco);
-			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+			uiDefButF(block, NUM, 0, "Max:",	xco+20+(width)/2, yco-44, (width-60)/2, 19, &ca->max, 0.0, 20.0, 0, 0, "");
+
+			yco-= ysize;
+
+			break;
+
+		case ACT_EDIT_OBJECT:
+
+			eoa= act->data;
+
+			if (eoa->type==ACT_EDOB_ADD_OBJECT) {
+				ysize = 92;
+				glRects(xco, yco-ysize, xco+width, yco);
+				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+
+				uiDefIDPoinBut(block, test_obpoin_but, ID_OB, 1, "OB:",		xco+10, yco-44, (width-20)/2, 19, &(eoa->ob), "Add this Object and all its children (cant be on an visible layer)");
+				uiDefButI(block, NUM, 0, "Time:",	xco+10+(width-20)/2, yco-44, (width-20)/2, 19, &eoa->time, 0.0, 2000.0, 0, 0, "Duration the new Object lives");
+
+				wval= (width-60)/3;
+				uiDefBut(block, LABEL, 0, "linV",	xco,           yco-68,   45, 19,
+				         NULL, 0, 0, 0, 0,
+				         "Velocity upon creation");
+				uiDefButF(block, NUM, 0, "",		xco+45,        yco-68, wval, 19,
+				          eoa->linVelocity, -100.0, 100.0, 10, 0,
+				          "Velocity upon creation, x component");
+				uiDefButF(block, NUM, 0, "",		xco+45+wval,   yco-68, wval, 19,
+				          eoa->linVelocity+1, -100.0, 100.0, 10, 0,
+				          "Velocity upon creation, y component");
+				uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-68, wval, 19,
+				          eoa->linVelocity+2, -100.0, 100.0, 10, 0,
+				          "Velocity upon creation, z component");
+				uiDefButBitS(block, TOG, ACT_EDOB_LOCAL_LINV, 0, "L", xco+45+3*wval, yco-68, 15, 19,
+				             &eoa->localflag, 0.0, 0.0, 0, 0,
+				             "Apply the transformation locally");
+
+
+				uiDefBut(block, LABEL, 0, "AngV",	xco,           yco-90,   45, 19,
+				         NULL, 0, 0, 0, 0,
+				         "Angular velocity upon creation");
+				uiDefButF(block, NUM, 0, "",		xco+45,        yco-90, wval, 19,
+				          eoa->angVelocity, -10000.0, 10000.0, 10, 0,
+				          "Angular velocity upon creation, x component");
+				uiDefButF(block, NUM, 0, "",		xco+45+wval,   yco-90, wval, 19,
+				          eoa->angVelocity+1, -10000.0, 10000.0, 10, 0,
+				          "Angular velocity upon creation, y component");
+				uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-90, wval, 19,
+				          eoa->angVelocity+2, -10000.0, 10000.0, 10, 0,
+				          "Angular velocity upon creation, z component");
+				uiDefButBitS(block, TOG, ACT_EDOB_LOCAL_ANGV, 0, "L", xco+45+3*wval, yco-90, 15, 19,
+				             &eoa->localflag, 0.0, 0.0, 0, 0,
+				             "Apply the rotation locally");
 
-			uiDefIDPoinBut(block, test_obpoin_but, ID_OB, 1, "OB:",		xco+10, yco-44, (width-20)/2, 19, &(eoa->ob), "Add this Object and all its children (cant be on an visible layer)");
-			uiDefButI(block, NUM, 0, "Time:",	xco+10+(width-20)/2, yco-44, (width-20)/2, 19, &eoa->time, 0.0, 2000.0, 0, 0, "Duration the new Object lives");
-
-			wval= (width-60)/3;
-			uiDefBut(block, LABEL, 0, "linV",	xco,           yco-68,   45, 19,
-					 NULL, 0, 0, 0, 0,
-					 "Velocity upon creation");
-			uiDefButF(block, NUM, 0, "",		xco+45,        yco-68, wval, 19,
-					 eoa->linVelocity, -100.0, 100.0, 10, 0,
-					 "Velocity upon creation, x component");
-			uiDefButF(block, NUM, 0, "",		xco+45+wval,   yco-68, wval, 19,
-					 eoa->linVelocity+1, -100.0, 100.0, 10, 0,
-					 "Velocity upon creation, y component");
-			uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-68, wval, 19,
-					 eoa->linVelocity+2, -100.0, 100.0, 10, 0,
-					 "Velocity upon creation, z component");
-			uiDefButBitS(block, TOG, ACT_EDOB_LOCAL_LINV, 0, "L", xco+45+3*wval, yco-68, 15, 19,
-					 &eoa->localflag, 0.0, 0.0, 0, 0,
-					 "Apply the transformation locally");
-			
-			
-			uiDefBut(block, LABEL, 0, "AngV",	xco,           yco-90,   45, 19,
-					 NULL, 0, 0, 0, 0,
-					 "Angular velocity upon creation");
-			uiDefButF(block, NUM, 0, "",		xco+45,        yco-90, wval, 19,
-					 eoa->angVelocity, -10000.0, 10000.0, 10, 0,
-					 "Angular velocity upon creation, x component");
-			uiDefButF(block, NUM, 0, "",		xco+45+wval,   yco-90, wval, 19,
-					 eoa->angVelocity+1, -10000.0, 10000.0, 10, 0,
-					 "Angular velocity upon creation, y component");
-			uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-90, wval, 19,
-					 eoa->angVelocity+2, -10000.0, 10000.0, 10, 0,
-					 "Angular velocity upon creation, z component");
-			uiDefButBitS(block, TOG, ACT_EDOB_LOCAL_ANGV, 0, "L", xco+45+3*wval, yco-90, 15, 19,
-					 &eoa->localflag, 0.0, 0.0, 0, 0,
-					 "Apply the rotation locally");
-					 
 
-		}
-		else if (eoa->type==ACT_EDOB_END_OBJECT) {
-			ysize= 28;
-			glRects(xco, yco-ysize, xco+width, yco);
-			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-		}
-		else if (eoa->type==ACT_EDOB_REPLACE_MESH) {
-			ysize= 48;
-			glRects(xco, yco-ysize, xco+width, yco);
-			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-	 
-			uiDefIDPoinBut(block, test_meshpoin_but, ID_ME, 1, "ME:",		xco+40, yco-44, (width-80)/2, 19, &(eoa->me), "replace the existing, when left blank 'Phys' will remake the existing physics mesh");
-			
-			uiDefButBitS(block, TOGN, ACT_EDOB_REPLACE_MESH_NOGFX, 0, "Gfx",	xco+40 + (width-80)/2, yco-44, (width-80)/4, 19, &eoa->flag, 0, 0, 0, 0, "Replace the display mesh");
-			uiDefButBitS(block, TOG, ACT_EDOB_REPLACE_MESH_PHYS, 0, "Phys",	xco+40 + (width-80)/2 +(width-80)/4, yco-44, (width-80)/4, 19, &eoa->flag, 0, 0, 0, 0, "Replace the physics mesh (triangle bounds only. compound shapes not supported)");
-		}
-		else if (eoa->type==ACT_EDOB_TRACK_TO) {
-			ysize= 48;
-			glRects(xco, yco-ysize, xco+width, yco);
-			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-	 
-			uiDefIDPoinBut(block, test_obpoin_but, ID_OB, 1, "OB:",		xco+10, yco-44, (width-20)/2, 19, &(eoa->ob), "Track to this Object");
-			uiDefButI(block, NUM, 0, "Time:",	xco+10+(width-20)/2, yco-44, (width-20)/2-40, 19, &eoa->time, 0.0, 2000.0, 0, 0, "Duration the tracking takes");
-			uiDefButS(block, TOG, 0, "3D",	xco+width-50, yco-44, 40, 19, &eoa->flag, 0.0, 0.0, 0, 0, "Enable 3D tracking");
-		}
-		else if (eoa->type==ACT_EDOB_DYNAMICS) {
-			ysize= 69;
-			glRects(xco, yco-ysize, xco+width, yco);
-			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-			
-			str= "Dynamic Operation %t|Restore Dynamics %x0|Suspend Dynamics %x1|Enable Rigid Body %x2|Disable Rigid Body %x3|Set Mass %x4";
-			uiDefButS(block, MENU, B_REDR, str,		xco+40, yco-44, (width-80), 19,  &(eoa->dyn_operation), 0.0, 0.0, 0, 0, "");
-			if (eoa->dyn_operation==4) {
-				uiDefButF(block, NUM, 0, "",		xco+40, yco-63, width-80, 19,
-					 &eoa->mass, 0.0, 10000.0, 10, 0,
-					 "Mass for object");
 			}
-		}
-		str= "Edit Object %t|Add Object %x0|End Object %x1|Replace Mesh %x2|Track to %x3|Dynamics %x4";
-		uiDefButS(block, MENU, B_REDR, str,		xco+40, yco-24, (width-80), 19, &eoa->type, 0.0, 0.0, 0, 0, "");
+			else if (eoa->type==ACT_EDOB_END_OBJECT) {
+				ysize= 28;
+				glRects(xco, yco-ysize, xco+width, yco);
+				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+			}
+			else if (eoa->type==ACT_EDOB_REPLACE_MESH) {
+				ysize= 48;
+				glRects(xco, yco-ysize, xco+width, yco);
+				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
 
-		yco-= ysize;
+				uiDefIDPoinBut(block, test_meshpoin_but, ID_ME, 1, "ME:",		xco+40, yco-44, (width-80)/2, 19, &(eoa->me), "replace the existing, when left blank 'Phys' will remake the existing physics mesh");
 
-		break;
+				uiDefButBitS(block, TOGN, ACT_EDOB_REPLACE_MESH_NOGFX, 0, "Gfx",	xco+40 + (width-80)/2, yco-44, (width-80)/4, 19, &eoa->flag, 0, 0, 0, 0, "Replace the display mesh");
+				uiDefButBitS(block, TOG, ACT_EDOB_REPLACE_MESH_PHYS, 0, "Phys",	xco+40 + (width-80)/2 +(width-80)/4, yco-44, (width-80)/4, 19, &eoa->flag, 0, 0, 0, 0, "Replace the physics mesh (triangle bounds only. compound shapes not supported)");
+			}
+			else if (eoa->type==ACT_EDOB_TRACK_TO) {
+				ysize= 48;
+				glRects(xco, yco-ysize, xco+width, yco);
+				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
 
-	case ACT_CONSTRAINT:
-		coa= act->data;
-	
-		if (coa->type == ACT_CONST_TYPE_LOC) {
-			ysize= 69;
+				uiDefIDPoinBut(block, test_obpoin_but, ID_OB, 1, "OB:",		xco+10, yco-44, (width-20)/2, 19, &(eoa->ob), "Track to this Object");
+				uiDefButI(block, NUM, 0, "Time:",	xco+10+(width-20)/2, yco-44, (width-20)/2-40, 19, &eoa->time, 0.0, 2000.0, 0, 0, "Duration the tracking takes");
+				uiDefButS(block, TOG, 0, "3D",	xco+width-50, yco-44, 40, 19, &eoa->flag, 0.0, 0.0, 0, 0, "Enable 3D tracking");
+			}
+			else if (eoa->type==ACT_EDOB_DYNAMICS) {
+				ysize= 69;
+				glRects(xco, yco-ysize, xco+width, yco);
+				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
 
-			glRects(xco, yco-ysize, xco+width, yco);
-			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-			
-	/*  		str= "Limit %t|None %x0|Loc X %x1|Loc Y %x2|Loc Z %x4|Rot X %x8|Rot Y %x16|Rot Z %x32"; */
-	/*			coa->flag &= ~(63); */
-			str= "Limit %t|None %x0|Loc X %x1|Loc Y %x2|Loc Z %x4";
-			coa->flag &= 7;
-			coa->time = 0;
-			uiDefButS(block, MENU, 1, str,		xco+10, yco-65, 70, 19, &coa->flag, 0.0, 0.0, 0, 0, "");
-		
-			uiDefButS(block, NUM,		0, "damp",	xco+10, yco-45, 70, 19, &coa->damp, 0.0, 100.0, 0, 0, "Damping factor: time constant (in frame) of low pass filter");
-			uiDefBut(block, LABEL,			0, "Min",	xco+80, yco-45, (width-90)/2, 19, NULL, 0.0, 0.0, 0, 0, "");
-			uiDefBut(block, LABEL,			0, "Max",	xco+80+(width-90)/2, yco-45, (width-90)/2, 19, NULL, 0.0, 0.0, 0, 0, "");
-
-			if (coa->flag & ACT_CONST_LOCX) fp= coa->minloc;
-			else if (coa->flag & ACT_CONST_LOCY) fp= coa->minloc+1;
-			else if (coa->flag & ACT_CONST_LOCZ) fp= coa->minloc+2;
-			else if (coa->flag & ACT_CONST_ROTX) fp= coa->minrot;
-			else if (coa->flag & ACT_CONST_ROTY) fp= coa->minrot+1;
-			else fp= coa->minrot+2;
-			
-			uiDefButF(block, NUM, 0, "",		xco+80, yco-65, (width-90)/2, 19, fp, -2000.0, 2000.0, 10, 0, "");
-			uiDefButF(block, NUM, 0, "",		xco+80+(width-90)/2, yco-65, (width-90)/2, 19, fp+3, -2000.0, 2000.0, 10, 0, "");
-		}
-		else if (coa->type == ACT_CONST_TYPE_DIST) {
-			ysize= 106;
+				str= "Dynamic Operation %t|Restore Dynamics %x0|Suspend Dynamics %x1|Enable Rigid Body %x2|Disable Rigid Body %x3|Set Mass %x4";
+				uiDefButS(block, MENU, B_REDR, str,		xco+40, yco-44, (width-80), 19,  &(eoa->dyn_operation), 0.0, 0.0, 0, 0, "");
+				if (eoa->dyn_operation==4) {
+					uiDefButF(block, NUM, 0, "",		xco+40, yco-63, width-80, 19,
+					          &eoa->mass, 0.0, 10000.0, 10, 0,
+					          "Mass for object");
+				}
+			}
+			str= "Edit Object %t|Add Object %x0|End Object %x1|Replace Mesh %x2|Track to %x3|Dynamics %x4";
+			uiDefButS(block, MENU, B_REDR, str,		xco+40, yco-24, (width-80), 19, &eoa->type, 0.0, 0.0, 0, 0, "");
 
-			glRects(xco, yco-ysize, xco+width, yco);
-			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-			
-			str= "Direction %t|None %x0|X axis %x1|Y axis %x2|Z axis %x4|-X axis %x8|-Y axis %x16|-Z axis %x32";
-			uiDefButS(block, MENU, B_REDR, str,		xco+10, yco-65, 70, 19, &coa->mode, 0.0, 0.0, 0, 0, "Set the direction of the ray");
-		
-			uiDefButS(block, NUM,		0, "damp",	xco+10, yco-45, 70, 19, &coa->damp, 0.0, 100.0, 0, 0, "Damping factor: time constant (in frame) of low pass filter");
-			uiDefBut(block, LABEL,			0, "Range",	xco+80, yco-45, (width-115)/2, 19, NULL, 0.0, 0.0, 0, 0, "Set the maximum length of ray");
-			uiDefButBitS(block, TOG, ACT_CONST_DISTANCE, B_REDR, "Dist",	xco+80+(width-115)/2, yco-45, (width-115)/2, 19, &coa->flag, 0.0, 0.0, 0, 0, "Force distance of object to point of impact of ray");
-			uiDefButBitS(block, TOG, ACT_CONST_LOCAL, 0, "L", xco+80+(width-115), yco-45, 25, 19,
-					 &coa->flag, 0.0, 0.0, 0, 0, "Set ray along object's axis or global axis");
-
-			if (coa->mode & (ACT_CONST_DIRPX|ACT_CONST_DIRNX)) fp= coa->minloc;
-			else if (coa->mode & (ACT_CONST_DIRPY|ACT_CONST_DIRNY)) fp= coa->minloc+1;
-			else fp= coa->minloc+2;
-
-			uiDefButF(block, NUM, 0, "",		xco+80, yco-65, (width-115)/2, 19, fp+3, 0.0, 2000.0, 10, 0, "Maximum length of ray");
-			if (coa->flag & ACT_CONST_DISTANCE)
-				uiDefButF(block, NUM, 0, "",		xco+80+(width-115)/2, yco-65, (width-115)/2, 19, fp, -2000.0, 2000.0, 10, 0, "Keep this distance to target");
-			uiDefButBitS(block, TOG, ACT_CONST_NORMAL, 0, "N", xco+80+(width-115), yco-65, 25, 19,
-					 &coa->flag, 0.0, 0.0, 0, 0, "Set object axis along (local axis) or parallel (global axis) to the normal at hit position");
-			uiDefButBitS(block, TOG, ACT_CONST_MATERIAL, B_REDR, "M/P", xco+10, yco-84, 40, 19,
-					 &coa->flag, 0.0, 0.0, 0, 0, "Detect material instead of property");
-			if (coa->flag & ACT_CONST_MATERIAL) {
-				uiDefBut(block, TEX, 1, "Material:", xco + 50, yco-84, (width-60), 19,
-					coa->matprop, 0, MAX_NAME, 0, 0,
-					"Ray detects only Objects with this material");
+			yco-= ysize;
+
+			break;
+
+		case ACT_CONSTRAINT:
+			coa= act->data;
+
+			if (coa->type == ACT_CONST_TYPE_LOC) {
+				ysize= 69;
+
+				glRects(xco, yco-ysize, xco+width, yco);
+				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+
+				/*  		str= "Limit %t|None %x0|Loc X %x1|Loc Y %x2|Loc Z %x4|Rot X %x8|Rot Y %x16|Rot Z %x32"; */
+				/*			coa->flag &= ~(63); */
+				str= "Limit %t|None %x0|Loc X %x1|Loc Y %x2|Loc Z %x4";
+				coa->flag &= 7;
+				coa->time = 0;
+				uiDefButS(block, MENU, 1, str,		xco+10, yco-65, 70, 19, &coa->flag, 0.0, 0.0, 0, 0, "");
+
+				uiDefButS(block, NUM,		0, "damp",	xco+10, yco-45, 70, 19, &coa->damp, 0.0, 100.0, 0, 0, "Damping factor: time constant (in frame) of low pass filter");
+				uiDefBut(block, LABEL,			0, "Min",	xco+80, yco-45, (width-90)/2, 19, NULL, 0.0, 0.0, 0, 0, "");
+				uiDefBut(block, LABEL,			0, "Max",	xco+80+(width-90)/2, yco-45, (width-90)/2, 19, NULL, 0.0, 0.0, 0, 0, "");
+
+				if (coa->flag & ACT_CONST_LOCX) fp= coa->minloc;
+				else if (coa->flag & ACT_CONST_LOCY) fp= coa->minloc+1;
+				else if (coa->flag & ACT_CONST_LOCZ) fp= coa->minloc+2;
+				else if (coa->flag & ACT_CONST_ROTX) fp= coa->minrot;
+				else if (coa->flag & ACT_CONST_ROTY) fp= coa->minrot+1;
+				else fp= coa->minrot+2;
+
+				uiDefButF(block, NUM, 0, "",		xco+80, yco-65, (width-90)/2, 19, fp, -2000.0, 2000.0, 10, 0, "");
+				uiDefButF(block, NUM, 0, "",		xco+80+(width-90)/2, yco-65, (width-90)/2, 19, fp+3, -2000.0, 2000.0, 10, 0, "");
 			}
-			else {
-				uiDefBut(block, TEX, 1, "Property:", xco + 50, yco-84, (width-60), 19,
-					coa->matprop, 0, MAX_NAME, 0, 0,
-					"Ray detect only Objects with this property");
+			else if (coa->type == ACT_CONST_TYPE_DIST) {
+				ysize= 106;
+
+				glRects(xco, yco-ysize, xco+width, yco);
+				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+
+				str= "Direction %t|None %x0|X axis %x1|Y axis %x2|Z axis %x4|-X axis %x8|-Y axis %x16|-Z axis %x32";
+				uiDefButS(block, MENU, B_REDR, str,		xco+10, yco-65, 70, 19, &coa->mode, 0.0, 0.0, 0, 0, "Set the direction of the ray");
+
+				uiDefButS(block, NUM,		0, "damp",	xco+10, yco-45, 70, 19, &coa->damp, 0.0, 100.0, 0, 0, "Damping factor: time constant (in frame) of low pass filter");
+				uiDefBut(block, LABEL,			0, "Range",	xco+80, yco-45, (width-115)/2, 19, NULL, 0.0, 0.0, 0, 0, "Set the maximum length of ray");
+				uiDefButBitS(block, TOG, ACT_CONST_DISTANCE, B_REDR, "Dist",	xco+80+(width-115)/2, yco-45, (width-115)/2, 19, &coa->flag, 0.0, 0.0, 0, 0, "Force distance of object to point of impact of ray");
+				uiDefButBitS(block, TOG, ACT_CONST_LOCAL, 0, "L", xco+80+(width-115), yco-45, 25, 19,
+				             &coa->flag, 0.0, 0.0, 0, 0, "Set ray along object's axis or global axis");
+
+				if (coa->mode & (ACT_CONST_DIRPX|ACT_CONST_DIRNX)) fp= coa->minloc;
+				else if (coa->mode & (ACT_CONST_DIRPY|ACT_CONST_DIRNY)) fp= coa->minloc+1;
+				else fp= coa->minloc+2;
+
+				uiDefButF(block, NUM, 0, "",		xco+80, yco-65, (width-115)/2, 19, fp+3, 0.0, 2000.0, 10, 0, "Maximum length of ray");
+				if (coa->flag & ACT_CONST_DISTANCE)
+					uiDefButF(block, NUM, 0, "",		xco+80+(width-115)/2, yco-65, (width-115)/2, 19, fp, -2000.0, 2000.0, 10, 0, "Keep this distance to target");
+				uiDefButBitS(block, TOG, ACT_CONST_NORMAL, 0, "N", xco+80+(width-115), yco-65, 25, 19,
+				             &coa->flag, 0.0, 0.0, 0, 0, "Set object axis along (local axis) or parallel (global axis) to the normal at hit position");
+				uiDefButBitS(block, TOG, ACT_CONST_MATERIAL, B_REDR, "M/P", xco+10, yco-84, 40, 19,
+				             &coa->flag, 0.0, 0.0, 0, 0, "Detect material instead of property");
+				if (coa->flag & ACT_CONST_MATERIAL) {
+					uiDefBut(block, TEX, 1, "Material:", xco + 50, yco-84, (width-60), 19,
+					         coa->matprop, 0, MAX_NAME, 0, 0,
+					         "Ray detects only Objects with this material");
+				}
+				else {
+					uiDefBut(block, TEX, 1, "Property:", xco + 50, yco-84, (width-60), 19,
+					         coa->matprop, 0, MAX_NAME, 0, 0,
+					         "Ray detect only Objects with this property");
+				}
+				uiDefButBitS(block, TOG, ACT_CONST_PERMANENT, 0, "PER", xco+10, yco-103, 40, 19,
+				             &coa->flag, 0.0, 0.0, 0, 0, "Persistent actuator: stays active even if ray does not reach target");
+				uiDefButS(block, NUM, 0, "time", xco+50, yco-103, (width-60)/2, 19, &(coa->time), 0.0, 1000.0, 0, 0, "Maximum activation time in frame, 0 for unlimited");
+				uiDefButS(block, NUM, 0, "rotDamp", xco+50+(width-60)/2, yco-103, (width-60)/2, 19, &(coa->rotdamp), 0.0, 100.0, 0, 0, "Use a different damping for orientation");
 			}
-			uiDefButBitS(block, TOG, ACT_CONST_PERMANENT, 0, "PER", xco+10, yco-103, 40, 19,
-				&coa->flag, 0.0, 0.0, 0, 0, "Persistent actuator: stays active even if ray does not reach target");
-			uiDefButS(block, NUM, 0, "time", xco+50, yco-103, (width-60)/2, 19, &(coa->time), 0.0, 1000.0, 0, 0, "Maximum activation time in frame, 0 for unlimited");
-			uiDefButS(block, NUM, 0, "rotDamp", xco+50+(width-60)/2, yco-103, (width-60)/2, 19, &(coa->rotdamp), 0.0, 100.0, 0, 0, "Use a different damping for orientation");
-		}
-		else if (coa->type == ACT_CONST_TYPE_ORI) {
-			ysize= 87;
+			else if (coa->type == ACT_CONST_TYPE_ORI) {
+				ysize= 87;
 
-			glRects(xco, yco-ysize, xco+width, yco);
-			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-			
-			str= "Direction %t|None %x0|X axis %x1|Y axis %x2|Z axis %x4";
-			uiDefButS(block, MENU, B_REDR, str,		xco+10, yco-65, 70, 19, &coa->mode, 0.0, 0.0, 0, 0, "Select the axis to be aligned along the reference direction");
-		
-			uiDefButS(block, NUM,		0, "damp",	xco+10, yco-45, 70, 19, &coa->damp, 0.0, 100.0, 0, 0, "Damping factor: time constant (in frame) of low pass filter");
-			uiDefBut(block, LABEL,			0, "X",	xco+80, yco-45, (width-115)/3, 19, NULL, 0.0, 0.0, 0, 0, "");
-			uiDefBut(block, LABEL,			0, "Y",	xco+80+(width-115)/3, yco-45, (width-115)/3, 19, NULL, 0.0, 0.0, 0, 0, "");
-			uiDefBut(block, LABEL,			0, "Z",	xco+80+2*(width-115)/3, yco-45, (width-115)/3, 19, NULL, 0.0, 0.0, 0, 0, "");
-
-			uiDefButF(block, NUM, 0, "",		xco+80, yco-65, (width-115)/3, 19, &coa->maxrot[0], -2000.0, 2000.0, 10, 0, "X component of reference direction");
-			uiDefButF(block, NUM, 0, "",		xco+80+(width-115)/3, yco-65, (width-115)/3, 19, &coa->maxrot[1], -2000.0, 2000.0, 10, 0, "Y component of reference direction");
-			uiDefButF(block, NUM, 0, "",		xco+80+2*(width-115)/3, yco-65, (width-115)/3, 19, &coa->maxrot[2], -2000.0, 2000.0, 10, 0, "Z component of reference direction");
-
-			uiDefButS(block, NUM, 0, "time", xco+10, yco-84, 70, 19, &(coa->time), 0.0, 1000.0, 0, 0, "Maximum activation time in frame, 0 for unlimited");
-			uiDefButF(block, NUM, 0, "min", xco+80, yco-84, (width-115)/2, 19, &(coa->minloc[0]), 0.0, 180.0, 10, 1, "Minimum angle (in degree) to maintain with target direction. No correction is done if angle with target direction is between min and max");
-			uiDefButF(block, NUM, 0, "max", xco+80+(width-115)/2, yco-84, (width-115)/2, 19, &(coa->maxloc[0]), 0.0, 180.0, 10, 1, "Maximum angle (in degree) allowed with target direction. No correction is done if angle with target direction is between min and max");
-		}
-		else if (coa->type == ACT_CONST_TYPE_FH) {
-			ysize= 106;
+				glRects(xco, yco-ysize, xco+width, yco);
+				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
 
-			glRects(xco, yco-ysize, xco+width, yco);
-			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-			
-			str= "Direction %t|None %x0|X axis %x1|Y axis %x2|Z axis %x4|-X axis %x8|-Y axis %x16|-Z axis %x32";
-			uiDefButS(block, MENU, B_REDR, str,		xco+10, yco-65, 70, 19, &coa->mode, 0.0, 0.0, 0, 0, "Set the direction of the ray (in world coordinate)");
-
-			if (coa->mode & (ACT_CONST_DIRPX|ACT_CONST_DIRNX)) fp= coa->minloc;
-			else if (coa->mode & (ACT_CONST_DIRPY|ACT_CONST_DIRNY)) fp= coa->minloc+1;
-			else fp= coa->minloc+2;
-
-			uiDefButF(block, NUM,		0, "damp",	xco+10, yco-45, (width-70)/2, 19, &coa->maxrot[0], 0.0, 1.0, 1, 0, "Damping factor of the Fh spring force");
-			uiDefButF(block, NUM,		0, "dist",	xco+10+(width-70)/2, yco-45, (width-70)/2, 19, fp, 0.010, 2000.0, 10, 0, "Height of the Fh area");
-			uiDefButBitS(block, TOG, ACT_CONST_DOROTFH, 0, "Rot Fh",	xco+10+(width-70), yco-45, 50, 19, &coa->flag, 0.0, 0.0, 0, 0, "Keep object axis parallel to normal");
-
-			uiDefButF(block, NUMSLI, 0, "Fh ",		xco+80, yco-65, (width-115), 19, fp+3, 0.0, 1.0, 0, 0, "Spring force within the Fh area");
-			uiDefButBitS(block, TOG, ACT_CONST_NORMAL, 0, "N", xco+80+(width-115), yco-65, 25, 19,
-					 &coa->flag, 0.0, 0.0, 0, 0, "Add a horizontal spring force on slopes");
-			uiDefButBitS(block, TOG, ACT_CONST_MATERIAL, B_REDR, "M/P", xco+10, yco-84, 40, 19,
-					 &coa->flag, 0.0, 0.0, 0, 0, "Detect material instead of property");
-			if (coa->flag & ACT_CONST_MATERIAL) {
-				uiDefBut(block, TEX, 1, "Material:", xco + 50, yco-84, (width-60), 19,
-					coa->matprop, 0, MAX_NAME, 0, 0,
-					"Ray detects only Objects with this material");
+				str= "Direction %t|None %x0|X axis %x1|Y axis %x2|Z axis %x4";
+				uiDefButS(block, MENU, B_REDR, str,		xco+10, yco-65, 70, 19, &coa->mode, 0.0, 0.0, 0, 0, "Select the axis to be aligned along the reference direction");
+
+				uiDefButS(block, NUM,		0, "damp",	xco+10, yco-45, 70, 19, &coa->damp, 0.0, 100.0, 0, 0, "Damping factor: time constant (in frame) of low pass filter");
+				uiDefBut(block, LABEL,			0, "X",	xco+80, yco-45, (width-115)/3, 19, NULL, 0.0, 0.0, 0, 0, "");
+				uiDefBut(block, LABEL,			0, "Y",	xco+80+(width-115)/3, yco-45, (width-115)/3, 19, NULL, 0.0, 0.0, 0, 0, "");
+				uiDefBut(block, LABEL,			0, "Z",	xco+80+2*(width-115)/3, yco-45, (width-115)/3, 19, NULL, 0.0, 0.0, 0, 0, "");
+
+				uiDefButF(block, NUM, 0, "",		xco+80, yco-65, (width-115)/3, 19, &coa->maxrot[0], -2000.0, 2000.0, 10, 0, "X component of reference direction");
+				uiDefButF(block, NUM, 0, "",		xco+80+(width-115)/3, yco-65, (width-115)/3, 19, &coa->maxrot[1], -2000.0, 2000.0, 10, 0, "Y component of reference direction");
+				uiDefButF(block, NUM, 0, "",		xco+80+2*(width-115)/3, yco-65, (width-115)/3, 19, &coa->maxrot[2], -2000.0, 2000.0, 10, 0, "Z component of reference direction");
+
+				uiDefButS(block, NUM, 0, "time", xco+10, yco-84, 70, 19, &(coa->time), 0.0, 1000.0, 0, 0, "Maximum activation time in frame, 0 for unlimited");
+				uiDefButF(block, NUM, 0, "min", xco+80, yco-84, (width-115)/2, 19, &(coa->minloc[0]), 0.0, 180.0, 10, 1, "Minimum angle (in degree) to maintain with target direction. No correction is done if angle with target direction is between min and max");
+				uiDefButF(block, NUM, 0, "max", xco+80+(width-115)/2, yco-84, (width-115)/2, 19, &(coa->maxloc[0]), 0.0, 180.0, 10, 1, "Maximum angle (in degree) allowed with target direction. No correction is done if angle with target direction is between min and max");
 			}
-			else {
-				uiDefBut(block, TEX, 1, "Property:", xco + 50, yco-84, (width-60), 19,
-					coa->matprop, 0, MAX_NAME, 0, 0,
-					"Ray detect only Objects with this property");
+			else if (coa->type == ACT_CONST_TYPE_FH) {
+				ysize= 106;
+
+				glRects(xco, yco-ysize, xco+width, yco);
+				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+
+				str= "Direction %t|None %x0|X axis %x1|Y axis %x2|Z axis %x4|-X axis %x8|-Y axis %x16|-Z axis %x32";
+				uiDefButS(block, MENU, B_REDR, str,		xco+10, yco-65, 70, 19, &coa->mode, 0.0, 0.0, 0, 0, "Set the direction of the ray (in world coordinate)");
+
+				if (coa->mode & (ACT_CONST_DIRPX|ACT_CONST_DIRNX)) fp= coa->minloc;
+				else if (coa->mode & (ACT_CONST_DIRPY|ACT_CONST_DIRNY)) fp= coa->minloc+1;
+				else fp= coa->minloc+2;
+
+				uiDefButF(block, NUM,		0, "damp",	xco+10, yco-45, (width-70)/2, 19, &coa->maxrot[0], 0.0, 1.0, 1, 0, "Damping factor of the Fh spring force");
+				uiDefButF(block, NUM,		0, "dist",	xco+10+(width-70)/2, yco-45, (width-70)/2, 19, fp, 0.010, 2000.0, 10, 0, "Height of the Fh area");
+				uiDefButBitS(block, TOG, ACT_CONST_DOROTFH, 0, "Rot Fh",	xco+10+(width-70), yco-45, 50, 19, &coa->flag, 0.0, 0.0, 0, 0, "Keep object axis parallel to normal");
+
+				uiDefButF(block, NUMSLI, 0, "Fh ",		xco+80, yco-65, (width-115), 19, fp+3, 0.0, 1.0, 0, 0, "Spring force within the Fh area");
+				uiDefButBitS(block, TOG, ACT_CONST_NORMAL, 0, "N", xco+80+(width-115), yco-65, 25, 19,
+				             &coa->flag, 0.0, 0.0, 0, 0, "Add a horizontal spring force on slopes");
+				uiDefButBitS(block, TOG, ACT_CONST_MATERIAL, B_REDR, "M/P", xco+10, yco-84, 40, 19,
+				             &coa->flag, 0.0, 0.0, 0, 0, "Detect material instead of property");
+				if (coa->flag & ACT_CONST_MATERIAL) {
+					uiDefBut(block, TEX, 1, "Material:", xco + 50, yco-84, (width-60), 19,
+					         coa->matprop, 0, MAX_NAME, 0, 0,
+					         "Ray detects only Objects with this material");
+				}
+				else {
+					uiDefBut(block, TEX, 1, "Property:", xco + 50, yco-84, (width-60), 19,
+					         coa->matprop, 0, MAX_NAME, 0, 0,
+					         "Ray detect only Objects with this property");
+				}
+				uiDefButBitS(block, TOG, ACT_CONST_PERMANENT, 0, "PER", xco+10, yco-103, 40, 19,
+				             &coa->flag, 0.0, 0.0, 0, 0, "Persistent actuator: stays active even if ray does not reach target");
+				uiDefButS(block, NUM, 0, "time", xco+50, yco-103, 90, 19, &(coa->time), 0.0, 1000.0, 0, 0, "Maximum activation time in frame, 0 for unlimited");
+				uiDefButF(block, NUM, 0, "rotDamp", xco+140, yco-103, (width-150), 19, &coa->maxrot[1], 0.0, 1.0, 1, 0, "Use a different damping for rotation");
 			}
-			uiDefButBitS(block, TOG, ACT_CONST_PERMANENT, 0, "PER", xco+10, yco-103, 40, 19,
-				&coa->flag, 0.0, 0.0, 0, 0, "Persistent actuator: stays active even if ray does not reach target");
-			uiDefButS(block, NUM, 0, "time", xco+50, yco-103, 90, 19, &(coa->time), 0.0, 1000.0, 0, 0, "Maximum activation time in frame, 0 for unlimited");
-			uiDefButF(block, NUM, 0, "rotDamp", xco+140, yco-103, (width-150), 19, &coa->maxrot[1], 0.0, 1.0, 1, 0, "Use a different damping for rotation");
-		}
-		str= "Constraint Type %t|Location %x0|Distance %x1|Orientation %x2|Force field %x3";
-		but = uiDefButS(block, MENU, B_REDR, str,		xco+40, yco-23, (width-80), 19, &coa->type, 0.0, 0.0, 0, 0, "");
-		yco-= ysize;
-		break;
+			str= "Constraint Type %t|Location %x0|Distance %x1|Orientation %x2|Force field %x3";
+			but = uiDefButS(block, MENU, B_REDR, str,		xco+40, yco-23, (width-80), 19, &coa->type, 0.0, 0.0, 0, 0, "");
+			yco-= ysize;
+			break;
 
-	case ACT_SCENE:
-		sca= act->data;
-		
-		if (sca->type==ACT_SCENE_RESTART) {
-			ysize= 28;
-			glRects(xco, yco-ysize, xco+width, yco);
-			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-		}
-		else if (sca->type==ACT_SCENE_CAMERA) {
+		case ACT_SCENE:
+			sca= act->data;
 
-			ysize= 48;
-			glRects(xco, yco-ysize, xco+width, yco);
-			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+			if (sca->type==ACT_SCENE_RESTART) {
+				ysize= 28;
+				glRects(xco, yco-ysize, xco+width, yco);
+				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+			}
+			else if (sca->type==ACT_SCENE_CAMERA) {
 
-			uiDefIDPoinBut(block, test_obpoin_but, ID_OB, 1, "OB:",		xco+40, yco-44, (width-80), 19, &(sca->camera), "Set this Camera. Leave empty to refer to self object");
-		}
-		else if (sca->type==ACT_SCENE_SET) {
-			
-			ysize= 48;
-			glRects(xco, yco-ysize, xco+width, yco);
-			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+				ysize= 48;
+				glRects(xco, yco-ysize, xco+width, yco);
+				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
 
-			uiDefIDPoinBut(block, test_scenepoin_but, ID_SCE, 1, "SCE:",		xco+40, yco-44, (width-80), 19, &(sca->scene), "Set this Scene");
-		}
-		else if (sca->type==ACT_SCENE_ADD_FRONT) {
-			
-			ysize= 48;
-			glRects(xco, yco-ysize, xco+width, yco);
-			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+				uiDefIDPoinBut(block, test_obpoin_but, ID_OB, 1, "OB:",		xco+40, yco-44, (width-80), 19, &(sca->camera), "Set this Camera. Leave empty to refer to self object");
+			}
+			else if (sca->type==ACT_SCENE_SET) {
 
-			uiDefIDPoinBut(block, test_scenepoin_but, ID_SCE, 1, "SCE:",		xco+40, yco-44, (width-80), 19, &(sca->scene), "Add an Overlay Scene");
-		}
-		else if (sca->type==ACT_SCENE_ADD_BACK) {
-			
-			ysize= 48;
-			glRects(xco, yco-ysize, xco+width, yco);
-			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+				ysize= 48;
+				glRects(xco, yco-ysize, xco+width, yco);
+				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
 
-			uiDefIDPoinBut(block, test_scenepoin_but, ID_SCE, 1, "SCE:",		xco+40, yco-44, (width-80), 19, &(sca->scene), "Add a Background Scene");
-		}
-		else if (sca->type==ACT_SCENE_REMOVE) {
-			
-			ysize= 48;
-			glRects(xco, yco-ysize, xco+width, yco);
-			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+				uiDefIDPoinBut(block, test_scenepoin_but, ID_SCE, 1, "SCE:",		xco+40, yco-44, (width-80), 19, &(sca->scene), "Set this Scene");
+			}
+			else if (sca->type==ACT_SCENE_ADD_FRONT) {
 
-			uiDefIDPoinBut(block, test_scenepoin_but, ID_SCE, 1, "SCE:",		xco+40, yco-44, (width-80), 19, &(sca->scene), "Remove a Scene");
-		}
-		else if (sca->type==ACT_SCENE_SUSPEND) {
-			
-			ysize= 48;
-			glRects(xco, yco-ysize, xco+width, yco);
-			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+				ysize= 48;
+				glRects(xco, yco-ysize, xco+width, yco);
+				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
 
-			uiDefIDPoinBut(block, test_scenepoin_but, ID_SCE, 1, "SCE:",		xco+40, yco-44, (width-80), 19, &(sca->scene), "Pause a Scene");
-		}
-		else if (sca->type==ACT_SCENE_RESUME) {
-			
-			ysize= 48;
-			glRects(xco, yco-ysize, xco+width, yco);
-			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+				uiDefIDPoinBut(block, test_scenepoin_but, ID_SCE, 1, "SCE:",		xco+40, yco-44, (width-80), 19, &(sca->scene), "Add an Overlay Scene");
+			}
+			else if (sca->type==ACT_SCENE_ADD_BACK) {
 
-			uiDefIDPoinBut(block, test_scenepoin_but, ID_SCE, 1, "SCE:",		xco+40, yco-44, (width-80), 19, &(sca->scene), "Unpause a Scene");
-		}
+				ysize= 48;
+				glRects(xco, yco-ysize, xco+width, yco);
+				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
 
-		str= "Scene %t|Restart %x0|Set Scene %x1|Set Camera %x2|Add OverlayScene %x3|Add BackgroundScene %x4|Remove Scene %x5|Suspend Scene %x6|Resume Scene %x7";
-		uiDefButS(block, MENU, B_REDR, str,		xco+40, yco-24, (width-80), 19, &sca->type, 0.0, 0.0, 0, 0, ""); 
+				uiDefIDPoinBut(block, test_scenepoin_but, ID_SCE, 1, "SCE:",		xco+40, yco-44, (width-80), 19, &(sca->scene), "Add a Background Scene");
+			}
+			else if (sca->type==ACT_SCENE_REMOVE) {
 
-		  yco-= ysize; 
-		  break; 
-	case ACT_GAME:
+				ysize= 48;
+				glRects(xco, yco-ysize, xco+width, yco);
+				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+
+				uiDefIDPoinBut(block, test_scenepoin_but, ID_SCE, 1, "SCE:",		xco+40, yco-44, (width-80), 19, &(sca->scene), "Remove a Scene");
+			}
+			else if (sca->type==ACT_SCENE_SUSPEND) {
+
+				ysize= 48;
+				glRects(xco, yco-ysize, xco+width, yco);
+				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+
+				uiDefIDPoinBut(block, test_scenepoin_but, ID_SCE, 1, "SCE:",		xco+40, yco-44, (width-80), 19, &(sca->scene), "Pause a Scene");
+			}
+			else if (sca->type==ACT_SCENE_RESUME) {
+
+				ysize= 48;
+				glRects(xco, yco-ysize, xco+width, yco);
+				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+
+				uiDefIDPoinBut(block, test_scenepoin_but, ID_SCE, 1, "SCE:",		xco+40, yco-44, (width-80), 19, &(sca->scene), "Unpause a Scene");
+			}
+
+			str= "Scene %t|Restart %x0|Set Scene %x1|Set Camera %x2|Add OverlayScene %x3|Add BackgroundScene %x4|Remove Scene %x5|Suspend Scene %x6|Resume Scene %x7";
+			uiDefButS(block, MENU, B_REDR, str,		xco+40, yco-24, (width-80), 19, &sca->type, 0.0, 0.0, 0, 0, "");
+
+			yco-= ysize;
+			break;
+		case ACT_GAME:
 		{
 			gma = act->data;
 			if (gma->type == ACT_GAME_LOAD) {
 				//ysize = 68;
 				ysize = 48;
-				glRects(xco, yco-ysize, xco+width, yco); 
-				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1); 
-				   uiDefBut(block, TEX, 1, "File: ", xco+10, yco-44, width-20, 19, &(gma->filename), 0, sizeof(gma->filename), 0, 0, "Load this blend file, use the \"//\" prefix for a path relative to the current blend file");
-//				uiDefBut(block, TEX, 1, "Anim: ", xco+10, yco-64, width-20, 19, &(gma->loadaniname), 0, sizeof(gma->loadaniname), 0, 0, "Use this loadinganimation");
+				glRects(xco, yco-ysize, xco+width, yco);
+				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+				uiDefBut(block, TEX, 1, "File: ", xco+10, yco-44, width-20, 19, &(gma->filename), 0, sizeof(gma->filename), 0, 0, "Load this blend file, use the \"//\" prefix for a path relative to the current blend file");
+				//				uiDefBut(block, TEX, 1, "Anim: ", xco+10, yco-64, width-20, 19, &(gma->loadaniname), 0, sizeof(gma->loadaniname), 0, 0, "Use this loadinganimation");
 			}
 #if 0
 			else if (gma->type == ACT_GAME_START) {
-				ysize = 68; 
-				glRects(xco, yco-ysize, xco+width, yco); 
+				ysize = 68;
+				glRects(xco, yco-ysize, xco+width, yco);
 				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
 
-				   uiDefBut(block, TEX, 1, "File: ", xco+10, yco-44, width-20, 19, &(gma->filename), 0, sizeof(gma->filename), 0, 0, "Load this file");
+				uiDefBut(block, TEX, 1, "File: ", xco+10, yco-44, width-20, 19, &(gma->filename), 0, sizeof(gma->filename), 0, 0, "Load this file");
 				uiDefBut(block, TEX, 1, "Anim: ", xco+10, yco-64, width-20, 19, &(gma->loadaniname), 0, sizeof(gma->loadaniname), 0, 0, "Use this loadinganimation");
 			}
 #endif
 			else if (ELEM4(gma->type, ACT_GAME_RESTART, ACT_GAME_QUIT, ACT_GAME_SAVECFG, ACT_GAME_LOADCFG)) {
-				ysize = 28; 
-				glRects(xco, yco-ysize, xco+width, yco); 
-				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1); 
+				ysize = 28;
+				glRects(xco, yco-ysize, xco+width, yco);
+				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
 			}
 
 			//str = "Scene %t|Load game%x0|Start loaded game%x1|Restart this game%x2|Quit this game %x3";
 			str = "Scene %t|Start new game%x0|Restart this game%x2|Quit this game %x3|Save bge.logic.globalDict %x4|Load bge.logic.globalDict %x5";
-			uiDefButS(block, MENU, B_REDR, str, xco+40, yco-24, (width-80), 19, &gma->type, 0.0, 0.0, 0, 0, ""); 
+			uiDefButS(block, MENU, B_REDR, str, xco+40, yco-24, (width-80), 19, &gma->type, 0.0, 0.0, 0, 0, "");
 			
-			yco -= ysize; 
-			break; 
+			yco -= ysize;
+			break;
 		}
-	case ACT_GROUP:
-		ga= act->data;
+		case ACT_GROUP:
+			ga= act->data;
 
-		ysize= 52;
+			ysize= 52;
 
-		glRects(xco, yco-ysize, xco+width, yco);
-		uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-		
-		str= "GroupKey types   %t|Set Key %x6|Play %x0|Ping Pong %x1|Flipper %x2|Loop Stop %x3|Loop End %x4|Property %x5";
+			glRects(xco, yco-ysize, xco+width, yco);
+			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
 
-		uiDefButS(block, MENU, 1, str,			xco+20, yco-24, width-40, 19, &ga->type, 0, 0, 0, 0, "");
-		if (ga->type==ACT_GROUP_SET) {
-			uiDefBut(block, TEX, 0, "Key: ",		xco+20, yco-44, (width-10)/2, 19, ga->name, 0.0, MAX_NAME, 0, 0, "This name defines groupkey to be set");
-			uiDefButI(block, NUM, 0, "Frame:",	xco+20+(width-10)/2, yco-44, (width-70)/2, 19, &ga->sta, 0.0, 2500.0, 0, 0, "Set this frame");
-		}
-		else if (ga->type==ACT_GROUP_FROM_PROP) {
-			uiDefBut(block, TEX, 0, "Prop: ",		xco+20, yco-44, width-40, 19, ga->name, 0.0, MAX_NAME, 0, 0, "Use this property to define the Group position");
-		}
-		else {
-			uiDefButI(block, NUM, 0, "State",		xco+20, yco-44, (width-40)/2, 19, &ga->sta, 0.0, 2500.0, 0, 0, "Start frame");
-			uiDefButI(block, NUM, 0, "End",		xco+20+(width-40)/2, yco-44, (width-40)/2, 19, &ga->end, 0.0, 2500.0, 0, 0, "End frame");
-		}
-		yco-= ysize;
-		break;
+			str= "GroupKey types   %t|Set Key %x6|Play %x0|Ping Pong %x1|Flipper %x2|Loop Stop %x3|Loop End %x4|Property %x5";
 
-	case ACT_VISIBILITY:
-		ysize = 24;
+			uiDefButS(block, MENU, 1, str,			xco+20, yco-24, width-40, 19, &ga->type, 0, 0, 0, 0, "");
+			if (ga->type==ACT_GROUP_SET) {
+				uiDefBut(block, TEX, 0, "Key: ",		xco+20, yco-44, (width-10)/2, 19, ga->name, 0.0, MAX_NAME, 0, 0, "This name defines groupkey to be set");
+				uiDefButI(block, NUM, 0, "Frame:",	xco+20+(width-10)/2, yco-44, (width-70)/2, 19, &ga->sta, 0.0, 2500.0, 0, 0, "Set this frame");
+			}
+			else if (ga->type==ACT_GROUP_FROM_PROP) {
+				uiDefBut(block, TEX, 0, "Prop: ",		xco+20, yco-44, width-40, 19, ga->name, 0.0, MAX_NAME, 0, 0, "Use this property to define the Group position");
+			}
+			else {
+				uiDefButI(block, NUM, 0, "State",		xco+20, yco-44, (width-40)/2, 19, &ga->sta, 0.0, 2500.0, 0, 0, "Start frame");
+				uiDefButI(block, NUM, 0, "End",		xco+20+(width-40)/2, yco-44, (width-40)/2, 19, &ga->end, 0.0, 2500.0, 0, 0, "End frame");
+			}
+			yco-= ysize;
+			break;
 
-		glRects(xco, yco-ysize, xco+width, yco);
-		uiEmboss((float)xco,
-			 (float)yco-ysize, (float)xco+width, (float)yco, 1);
-		
-		visAct = act->data;
+		case ACT_VISIBILITY:
+			ysize = 24;
 
-		uiBlockBeginAlign(block);
-		uiDefButBitI(block, TOGN, ACT_VISIBILITY_INVISIBLE, B_REDR,
-			  "Visible",
-			  xco + 10, yco - 20, (width - 20)/3, 19, &visAct->flag,
-			  0.0, 0.0, 0, 0,
-			  "Set the objects visible. Initialized from the objects render restriction toggle (access in the outliner)");
-		uiDefButBitI(block, TOG, ACT_VISIBILITY_OCCLUSION, B_REDR,
-			  "Occlusion",
-			  xco + 10 + ((width - 20)/3), yco - 20, (width - 20)/3, 19, &visAct->flag,
-			  0.0, 0.0, 0, 0,
-			  "Set the object to occlude objects behind it. Initialized from the object type in physics button");
-		uiBlockEndAlign(block);
-		
-		uiDefButBitI(block, TOG, ACT_VISIBILITY_RECURSIVE, 0,
-			  "Children",
-			  xco + 10 + (((width - 20)/3)*2)+10, yco - 20, ((width - 20)/3)-10, 19, &visAct->flag,
-			  0.0, 0.0, 0, 0,
-			  "Sets all the children of this object to the same visibility/occlusion recursively");
+			glRects(xco, yco-ysize, xco+width, yco);
+			uiEmboss((float)xco,
+			         (float)yco-ysize, (float)xco+width, (float)yco, 1);
 
-		yco-= ysize;
+			visAct = act->data;
 
-		break;
-		
-	case ACT_STATE:
-		ysize = 34;
+			uiBlockBeginAlign(block);
+			uiDefButBitI(block, TOGN, ACT_VISIBILITY_INVISIBLE, B_REDR,
+			             "Visible",
+			             xco + 10, yco - 20, (width - 20)/3, 19, &visAct->flag,
+			             0.0, 0.0, 0, 0,
+			             "Set the objects visible. Initialized from the objects render restriction toggle (access in the outliner)");
+			uiDefButBitI(block, TOG, ACT_VISIBILITY_OCCLUSION, B_REDR,
+			             "Occlusion",
+			             xco + 10 + ((width - 20)/3), yco - 20, (width - 20)/3, 19, &visAct->flag,
+			             0.0, 0.0, 0, 0,
+			             "Set the object to occlude objects behind it. Initialized from the object type in physics button");
+			uiBlockEndAlign(block);
 
-		glRects(xco, yco-ysize, xco+width, yco);
-		uiEmboss((float)xco,
-			 (float)yco-ysize, (float)xco+width, (float)yco, 1);
-		
-		staAct = act->data;
+			uiDefButBitI(block, TOG, ACT_VISIBILITY_RECURSIVE, 0,
+			             "Children",
+			             xco + 10 + (((width - 20)/3)*2)+10, yco - 20, ((width - 20)/3)-10, 19, &visAct->flag,
+			             0.0, 0.0, 0, 0,
+			             "Sets all the children of this object to the same visibility/occlusion recursively");
 
-		str= "Operation %t|Cpy %x0|Add %x1|Sub %x2|Inv %x3";
+			yco-= ysize;
 
-		uiDefButI(block, MENU, B_REDR, str,
-			  xco + 10, yco - 24, 65, 19, &staAct->type,
-			  0.0, 0.0, 0, 0,
-			  "Select the bit operation on object state mask");
+			break;
 
-		for (wval=0; wval<15; wval+=5) {
-			uiBlockBeginAlign(block);
-			for (stbit=0; stbit<5; stbit++) {
-				but = uiDefButBitI(block,  TOG, 1<<(stbit+wval), stbit+wval, "",	(short)(xco+85+12*stbit+13*wval), yco-17, 12, 12, (int *)&(staAct->mask), 0, 0, 0, 0, get_state_name(ob, (short)(stbit+wval)));
-				uiButSetFunc(but, check_state_mask, but, &(staAct->mask));
-			}
-			for (stbit=0; stbit<5; stbit++) {
-				but = uiDefButBitI(block, TOG, 1<<(stbit+wval+15), stbit+wval+15, "",	(short)(xco+85+12*stbit+13*wval), yco-29, 12, 12, (int *)&(staAct->mask), 0, 0, 0, 0, get_state_name(ob, (short)(stbit+wval+15)));
-				uiButSetFunc(but, check_state_mask, but, &(staAct->mask));
-			}
-		}
-		uiBlockEndAlign(block);
+		case ACT_STATE:
+			ysize = 34;
 
-		yco-= ysize;
+			glRects(xco, yco-ysize, xco+width, yco);
+			uiEmboss((float)xco,
+			         (float)yco-ysize, (float)xco+width, (float)yco, 1);
 
-		break;
+			staAct = act->data;
 
-	case ACT_RANDOM:
-		ysize  = 69;
+			str= "Operation %t|Cpy %x0|Add %x1|Sub %x2|Inv %x3";
+
+			uiDefButI(block, MENU, B_REDR, str,
+			          xco + 10, yco - 24, 65, 19, &staAct->type,
+			          0.0, 0.0, 0, 0,
+			          "Select the bit operation on object state mask");
+
+			for (wval=0; wval<15; wval+=5) {
+				uiBlockBeginAlign(block);
+				for (stbit=0; stbit<5; stbit++) {
+					but = uiDefButBitI(block,  TOG, 1<<(stbit+wval), stbit+wval, "",	(short)(xco+85+12*stbit+13*wval), yco-17, 12, 12, (int *)&(staAct->mask), 0, 0, 0, 0, get_state_name(ob, (short)(stbit+wval)));
+					uiButSetFunc(but, check_state_mask, but, &(staAct->mask));
+				}
+				for (stbit=0; stbit<5; stbit++) {
+					but = uiDefButBitI(block, TOG, 1<<(stbit+wval+15), stbit+wval+15, "",	(short)(xco+85+12*stbit+13*wval), yco-29, 12, 12, (int *)&(staAct->mask), 0, 0, 0, 0, get_state_name(ob, (short)(stbit+wval+15)));
+					uiButSetFunc(but, check_state_mask, but, &(staAct->mask));
+				}
+			}
+			uiBlockEndAlign(block);
+
+			yco-= ysize;
 
-		glRects(xco, yco-ysize, xco+width, yco);
-		uiEmboss((float)xco,
-				  (float)yco-ysize, (float)xco+width, (float)yco, 1);
-		
-		randAct = act->data;
-
-		/* 1. seed */
-		uiDefButI(block, NUM, 1, "Seed: ",		(xco+10), yco-24, 0.4 *(width-20), 19,
-				 &randAct->seed, 0, 1000, 0, 0,
-				 "Initial seed of the random generator. Use Python for more freedom. "
-				 " (Choose 0 for not random)");
-
-		/* 2. distribution type */
-		/* One pick per distribution. These numbers MUST match the #defines  */
-		/* in game.h !!!                                                     */
-		str= "Distribution %t|Bool Constant %x0|Bool Uniform %x1"
-			"|Bool Bernoulli %x2|Int Constant %x3|Int Uniform %x4"
-			"|Int Poisson %x5|Float Constant %x6|Float Uniform %x7"
-			"|Float Normal %x8|Float Neg. Exp. %x9";
-		uiDefButI(block, MENU, B_REDR, str, (xco+10) + 0.4 * (width-20), yco-24, 0.6 * (width-20), 19,
-				 &randAct->distribution, 0.0, 0.0, 0, 0,
-				 "Choose the type of distribution");
-
-		/* 3. property */
-		uiDefBut(block, TEX, 1, "Property:", (xco+10), yco-44, (width-20), 19,
-				 &randAct->propname, 0, MAX_NAME, 0, 0,
-				 "Assign the random value to this property"); 
-
-		/*4. and 5. arguments for the distribution*/
-		switch (randAct->distribution) {
-		case ACT_RANDOM_BOOL_CONST:
-			uiDefButBitI(block, TOG, 1, 1, "Always true", (xco+10), yco-64, (width-20), 19,
-					 &randAct->int_arg_1, 2.0, 1, 0, 0,
-					 "Always false or always true");			
-			break;
-		case ACT_RANDOM_BOOL_UNIFORM:
-			uiDefBut(block, LABEL, 0, "     Do a 50-50 pick",	(xco+10), yco-64, (width-20), 19,
-					 NULL, 0, 0, 0, 0,
-					 "Choose between true and false, 50% chance each");
-			break;
-		case ACT_RANDOM_BOOL_BERNOUILLI:
-			uiDefButF(block, NUM, 1, "Chance", (xco+10), yco-64, (width-20), 19,
-					 &randAct->float_arg_1, 0.0, 1.0, 0, 0,
-					 "Pick a number between 0 and 1. Success if you stay "
-					 "below this value");			
-			break;
-		case ACT_RANDOM_INT_CONST:
-			uiDefButI(block, NUM, 1, "Value: ",		(xco+10), yco-64, (width-20), 19,
-					 &randAct->int_arg_1, -1000, 1000, 0, 0,
-					 "Always return this number");
-			break;
-		case ACT_RANDOM_INT_UNIFORM:
-			uiDefButI(block, NUM, 1, "Min: ",		(xco+10), yco-64, (width-20)/2, 19,
-					 &randAct->int_arg_1, -1000, 1000, 0, 0,
-					 "Choose a number from a range. "
-					 "Lower boundary of the range");
-			uiDefButI(block, NUM, 1, "Max: ",		(xco+10) + (width-20)/2, yco-64, (width-20)/2, 19,
-					 &randAct->int_arg_2, -1000, 1000, 0, 0,
-					 "Choose a number from a range. "
-					 "Upper boundary of the range");
-			break;
-		case ACT_RANDOM_INT_POISSON:
-			uiDefButF(block, NUM, 1, "Mean: ", (xco+10), yco-64, (width-20), 19,
-					 &randAct->float_arg_1, 0.01, 100.0, 0, 0,
-					 "Expected mean value of the distribution");						
-			break;
-		case ACT_RANDOM_FLOAT_CONST:
-			uiDefButF(block, NUM, 1, "Value: ", (xco+10), yco-64, (width-20), 19,
-					 &randAct->float_arg_1, 0.0, 1.0, 0, 0,
-					 "Always return this number");
-			break;
-		case ACT_RANDOM_FLOAT_UNIFORM:
-			uiDefButF(block, NUM, 1, "Min: ",		(xco+10), yco-64, (width-20)/2, 19,
-					 &randAct->float_arg_1, -10000.0, 10000.0, 0, 0,
-					 "Choose a number from a range"
-					 "Lower boundary of the range");
-			uiDefButF(block, NUM, 1, "Max: ",		(xco+10) + (width-20)/2, yco-64, (width-20)/2, 19,
-					 &randAct->float_arg_2, -10000.0, 10000.0, 0, 0,
-					 "Choose a number from a range"
-					 "Upper boundary of the range");
-			break;
-		case ACT_RANDOM_FLOAT_NORMAL:
-			uiDefButF(block, NUM, 1, "Mean: ",		(xco+10), yco-64, (width-20)/2, 19,
-					 &randAct->float_arg_1, -10000.0, 10000.0, 0, 0,
-					 "A normal distribution. Mean of the distribution");
-			uiDefButF(block, NUM, 1, "SD: ",		(xco+10) + (width-20)/2, yco-64, (width-20)/2, 19,
-					 &randAct->float_arg_2, 0.0, 10000.0, 0, 0,
-					 "A normal distribution. Standard deviation of the "
-					 "distribution");
-			break;
-		case ACT_RANDOM_FLOAT_NEGATIVE_EXPONENTIAL:
-			uiDefButF(block, NUM, 1, "Half-life time: ", (xco+10), yco-64, (width-20), 19,
-					 &randAct->float_arg_1, 0.001, 10000.0, 0, 0,
-					 "Negative exponential dropoff");
 			break;
-		default:
-			; /* don't know what this distro is... can be useful for testing */
-			/* though :)                                                     */
-		}
 
-		yco-= ysize;
-		break;
-	case ACT_MESSAGE:
-		ma = act->data;
+		case ACT_RANDOM:
+			ysize  = 69;
 
-		ysize = 4 + (3 * 24); /* footer + number of lines * 24 pixels/line */
-	
-		glRects(xco, yco-ysize, xco+width, yco);
-		uiEmboss((float)xco,	    (float)yco-ysize,
-				 (float)xco+width,  (float)yco, 1);
-
-		myline=1;
-
-		/* line 1: To */
-		uiDefBut(block, TEX, 1, "To: ",
-			(xco+10), (yco-(myline++*24)), (width-20), 19,
-			&ma->toPropName, 0, MAX_NAME, 0, 0,
-			"Optional send message to objects with this name only, or empty to broadcast");
-
-		/* line 2: Message Subject */
-		uiDefBut(block, TEX, 1, "Subject: ",
-		(xco+10), (yco-(myline++*24)), (width-20), 19,
-		&ma->subject, 0, MAX_NAME, 0, 0,
-		"Optional message subject. This is what can be filtered on");
-
-		/* line 3: Text/Property */
-		uiDefButBitS(block, TOG, 1, B_REDR, "T/P",
-			(xco+10), (yco-(myline*24)), (0.20 * (width-20)), 19,
-			&ma->bodyType, 0.0, 0.0, 0, 0,
-			"Toggle message type: either Text or a PropertyName");
-
-		if (ma->bodyType == ACT_MESG_MESG) {
-			/* line 3: Message Body */
-			uiDefBut(block, TEX, 1, "Body: ",
-			(xco+10+(0.20*(width-20))), (yco-(myline++*24)), (0.8*(width-20)), 19,
-			&ma->body, 0, MAX_NAME, 0, 0,
-			"Optional message body Text");
-		}
-		else {
-			/* line 3: Property body (set by property) */
-			uiDefBut(block, TEX, 1, "Propname: ",
-			(xco+10+(0.20*(width-20))), (yco-(myline++*24)), (0.8*(width-20)), 19,
-			&ma->body, 0, MAX_NAME, 0, 0,
-			"The message body will be set by the Property Value");
-		}
-		
-		yco -= ysize;
-		break;
-	case ACT_2DFILTER:
-		tdfa = act->data;
+			glRects(xco, yco-ysize, xco+width, yco);
+			uiEmboss((float)xco,
+			         (float)yco-ysize, (float)xco+width, (float)yco, 1);
+
+			randAct = act->data;
+
+			/* 1. seed */
+			uiDefButI(block, NUM, 1, "Seed: ",		(xco+10), yco-24, 0.4 *(width-20), 19,
+			          &randAct->seed, 0, 1000, 0, 0,
+			          "Initial seed of the random generator. Use Python for more freedom. "
+			          " (Choose 0 for not random)");
+
+			/* 2. distribution type */
+			/* One pick per distribution. These numbers MUST match the #defines  */
+			/* in game.h !!!                                                     */
+			str= "Distribution %t|Bool Constant %x0|Bool Uniform %x1"
+			     "|Bool Bernoulli %x2|Int Constant %x3|Int Uniform %x4"
+			     "|Int Poisson %x5|Float Constant %x6|Float Uniform %x7"
+			     "|Float Normal %x8|Float Neg. Exp. %x9";
+			uiDefButI(block, MENU, B_REDR, str, (xco+10) + 0.4 * (width-20), yco-24, 0.6 * (width-20), 19,
+			          &randAct->distribution, 0.0, 0.0, 0, 0,
+			          "Choose the type of distribution");
+
+			/* 3. property */
+			uiDefBut(block, TEX, 1, "Property:", (xco+10), yco-44, (width-20), 19,
+			         &randAct->propname, 0, MAX_NAME, 0, 0,
+			         "Assign the random value to this property");
+
+			/*4. and 5. arguments for the distribution*/
+			switch (randAct->distribution) {
+				case ACT_RANDOM_BOOL_CONST:
+					uiDefButBitI(block, TOG, 1, 1, "Always true", (xco+10), yco-64, (width-20), 19,
+					             &randAct->int_arg_1, 2.0, 1, 0, 0,
+					             "Always false or always true");
+					break;
+				case ACT_RANDOM_BOOL_UNIFORM:
+					uiDefBut(block, LABEL, 0, "     Do a 50-50 pick",	(xco+10), yco-64, (width-20), 19,
+					         NULL, 0, 0, 0, 0,
+					         "Choose between true and false, 50% chance each");
+					break;
+				case ACT_RANDOM_BOOL_BERNOUILLI:
+					uiDefButF(block, NUM, 1, "Chance", (xco+10), yco-64, (width-20), 19,
+					          &randAct->float_arg_1, 0.0, 1.0, 0, 0,
+					          "Pick a number between 0 and 1. Success if you stay "
+					          "below this value");
+					break;
+				case ACT_RANDOM_INT_CONST:
+					uiDefButI(block, NUM, 1, "Value: ",		(xco+10), yco-64, (width-20), 19,
+					          &randAct->int_arg_1, -1000, 1000, 0, 0,
+					          "Always return this number");
+					break;
+				case ACT_RANDOM_INT_UNIFORM:
+					uiDefButI(block, NUM, 1, "Min: ",		(xco+10), yco-64, (width-20)/2, 19,
+					          &randAct->int_arg_1, -1000, 1000, 0, 0,
+					          "Choose a number from a range. "
+					          "Lower boundary of the range");
+					uiDefButI(block, NUM, 1, "Max: ",		(xco+10) + (width-20)/2, yco-64, (width-20)/2, 19,
+					          &randAct->int_arg_2, -1000, 1000, 0, 0,
+					          "Choose a number from a range. "
+					          "Upper boundary of the range");
+					break;
+				case ACT_RANDOM_INT_POISSON:
+					uiDefButF(block, NUM, 1, "Mean: ", (xco+10), yco-64, (width-20), 19,
+					          &randAct->float_arg_1, 0.01, 100.0, 0, 0,
+					          "Expected mean value of the distribution");
+					break;
+				case ACT_RANDOM_FLOAT_CONST:
+					uiDefButF(block, NUM, 1, "Value: ", (xco+10), yco-64, (width-20), 19,
+					          &randAct->float_arg_1, 0.0, 1.0, 0, 0,
+					          "Always return this number");
+					break;
+				case ACT_RANDOM_FLOAT_UNIFORM:
+					uiDefButF(block, NUM, 1, "Min: ",		(xco+10), yco-64, (width-20)/2, 19,
+					          &randAct->float_arg_1, -10000.0, 10000.0, 0, 0,
+					          "Choose a number from a range"
+					          "Lower boundary of the range");
+					uiDefButF(block, NUM, 1, "Max: ",		(xco+10) + (width-20)/2, yco-64, (width-20)/2, 19,
+					          &randAct->float_arg_2, -10000.0, 10000.0, 0, 0,
+					          "Choose a number from a range"
+					          "Upper boundary of the range");
+					break;
+				case ACT_RANDOM_FLOAT_NORMAL:
+					uiDefButF(block, NUM, 1, "Mean: ",		(xco+10), yco-64, (width-20)/2, 19,
+					          &randAct->float_arg_1, -10000.0, 10000.0, 0, 0,
+					          "A normal distribution. Mean of the distribution");
+					uiDefButF(block, NUM, 1, "SD: ",		(xco+10) + (width-20)/2, yco-64, (width-20)/2, 19,
+					          &randAct->float_arg_2, 0.0, 10000.0, 0, 0,
+					          "A normal distribution. Standard deviation of the "
+					          "distribution");
+					break;
+				case ACT_RANDOM_FLOAT_NEGATIVE_EXPONENTIAL:
+					uiDefButF(block, NUM, 1, "Half-life time: ", (xco+10), yco-64, (width-20), 19,
+					          &randAct->float_arg_1, 0.001, 10000.0, 0, 0,
+					          "Negative exponential dropoff");
+					break;
+				default:
+					; /* don't know what this distro is... can be useful for testing */
+					/* though :)                                                     */
+			}
 
-		ysize = 50;
-		if (tdfa->type == ACT_2DFILTER_CUSTOMFILTER) {
-			ysize +=20;
-		}
-		glRects(xco, yco-ysize, xco+width, yco);
-		uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+			yco-= ysize;
+			break;
+		case ACT_MESSAGE:
+			ma = act->data;
 
-		switch (tdfa->type) {
-			case ACT_2DFILTER_MOTIONBLUR:
-				if (!tdfa->flag) {
-					uiDefButS(block, TOG, B_REDR, "D",	xco+30, yco-44, 19, 19, &tdfa->flag, 0.0, 0.0, 0.0, 0.0, "Disable Motion Blur");
-					uiDefButF(block, NUM, B_REDR, "Value:", xco+52, yco-44, width-82, 19, &tdfa->float_arg, 0.0, 1.0, 0.0, 0.0, "Set motion blur value");
-				}
-				else {
-					uiDefButS(block, TOG, B_REDR, "Disabled",	xco+30, yco-44, width-60, 19, &tdfa->flag, 0.0, 0.0, 0.0, 0.0, "Enable Motion Blur");
-				}
-				break;
-			case ACT_2DFILTER_BLUR:
-			case ACT_2DFILTER_SHARPEN:
-			case ACT_2DFILTER_DILATION:
-			case ACT_2DFILTER_EROSION:
-			case ACT_2DFILTER_LAPLACIAN:
-			case ACT_2DFILTER_SOBEL:
-			case ACT_2DFILTER_PREWITT:
-			case ACT_2DFILTER_GRAYSCALE:
-			case ACT_2DFILTER_SEPIA:
-			case ACT_2DFILTER_INVERT:
-			case ACT_2DFILTER_NOFILTER:
-			case ACT_2DFILTER_DISABLED:
-			case ACT_2DFILTER_ENABLED:
-				uiDefButI(block, NUM, B_REDR, "Pass Number:", xco+30, yco-44, width-60, 19, &tdfa->int_arg, 0.0, MAX_RENDER_PASS-1, 0.0, 0.0, "Set filter order");
-				break;
-			case ACT_2DFILTER_CUSTOMFILTER:
-				uiDefButI(block, NUM, B_REDR, "Pass Number:", xco+30, yco-44, width-60, 19, &tdfa->int_arg, 0.0, MAX_RENDER_PASS-1, 0.0, 0.0, "Set filter order");
-				uiDefIDPoinBut(block, test_scriptpoin_but, ID_SCRIPT, 1, "Script: ", xco+30, yco-64, width-60, 19, &tdfa->text, "");
-				break;
-		}
-		
-		str= "2D Filter   %t|Motion Blur   %x1|Blur %x2|Sharpen %x3|Dilation %x4|Erosion %x5|"
-				"Laplacian %x6|Sobel %x7|Prewitt %x8|Gray Scale %x9|Sepia %x10|Invert %x11|Custom Filter %x12|"
-				"Enable Filter %x-2|Disable Filter %x-1|Remove Filter %x0|";
-		uiDefButS(block, MENU, B_REDR, str,	xco+30, yco-24, width-60, 19, &tdfa->type, 0.0, 0.0, 0.0, 0.0, "2D filter type");
-		
-		yco -= ysize;
-		break;
-	case ACT_PARENT:
-		parAct = act->data;
+			ysize = 4 + (3 * 24); /* footer + number of lines * 24 pixels/line */
 
-		if (parAct->type==ACT_PARENT_SET) {
-			
-			ysize= 48;
 			glRects(xco, yco-ysize, xco+width, yco);
-			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-			uiDefIDPoinBut(block, test_obpoin_but, ID_OB, 1, "OB:",		xco+95, yco-24, (width-100), 19, &(parAct->ob), "Set this object as parent");
-			uiBlockBeginAlign(block);
-			uiDefButBitS(block, TOGN, ACT_PARENT_COMPOUND, B_REDR,
-			"Compound",
-			xco + 5, yco - 44, (width - 10)/2, 19, &parAct->flag,
-			0.0, 0.0, 0, 0,
-			"Add this object shape to the parent shape (only if the parent shape is already compound)");
-			uiDefButBitS(block, TOGN, ACT_PARENT_GHOST, B_REDR,
-			"Ghost",
-			xco + 5 + ((width - 10)/2), yco - 44, (width - 10)/2, 19, &parAct->flag,
-			0.0, 0.0, 0, 0,
-			"Make this object ghost while parented (only if not compound)");
-			uiBlockEndAlign(block);
-		}
-		else if (parAct->type==ACT_PARENT_REMOVE) {
+			uiEmboss((float)xco,	    (float)yco-ysize,
+			         (float)xco+width,  (float)yco, 1);
+
+			myline=1;
+
+			/* line 1: To */
+			uiDefBut(block, TEX, 1, "To: ",
+			         (xco+10), (yco-(myline++*24)), (width-20), 19,
+			         &ma->toPropName, 0, MAX_NAME, 0, 0,
+			         "Optional send message to objects with this name only, or empty to broadcast");
+
+			/* line 2: Message Subject */
+			uiDefBut(block, TEX, 1, "Subject: ",
+			         (xco+10), (yco-(myline++*24)), (width-20), 19,
+			         &ma->subject, 0, MAX_NAME, 0, 0,
+			         "Optional message subject. This is what can be filtered on");
+
+			/* line 3: Text/Property */
+			uiDefButBitS(block, TOG, 1, B_REDR, "T/P",
+			             (xco+10), (yco-(myline*24)), (0.20 * (width-20)), 19,
+			             &ma->bodyType, 0.0, 0.0, 0, 0,
+			             "Toggle message type: either Text or a PropertyName");
+
+			if (ma->bodyType == ACT_MESG_MESG) {
+				/* line 3: Message Body */
+				uiDefBut(block, TEX, 1, "Body: ",
+				         (xco+10+(0.20*(width-20))), (yco-(myline++*24)), (0.8*(width-20)), 19,
+				         &ma->body, 0, MAX_NAME, 0, 0,
+				         "Optional message body Text");
+			}
+			else {
+				/* line 3: Property body (set by property) */
+				uiDefBut(block, TEX, 1, "Propname: ",
+				         (xco+10+(0.20*(width-20))), (yco-(myline++*24)), (0.8*(width-20)), 19,
+				         &ma->body, 0, MAX_NAME, 0, 0,
+				         "The message body will be set by the Property Value");
+			}
 
-			ysize= 28;
+			yco -= ysize;
+			break;
+		case ACT_2DFILTER:
+			tdfa = act->data;
+
+			ysize = 50;
+			if (tdfa->type == ACT_2DFILTER_CUSTOMFILTER) {
+				ysize +=20;
+			}
 			glRects(xco, yco-ysize, xco+width, yco);
 			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-		}
 
-		str= "Parent %t|Set Parent %x0|Remove Parent %x1";
-		uiDefButI(block, MENU, B_REDR, str,		xco+5, yco-24, parAct->type==1?(width-80):90, 19, &parAct->type, 0.0, 0.0, 0, 0, ""); 
+			switch (tdfa->type) {
+				case ACT_2DFILTER_MOTIONBLUR:
+					if (!tdfa->flag) {
+						uiDefButS(block, TOG, B_REDR, "D",	xco+30, yco-44, 19, 19, &tdfa->flag, 0.0, 0.0, 0.0, 0.0, "Disable Motion Blur");
+						uiDefButF(block, NUM, B_REDR, "Value:", xco+52, yco-44, width-82, 19, &tdfa->float_arg, 0.0, 1.0, 0.0, 0.0, "Set motion blur value");
+					}
+					else {
+						uiDefButS(block, TOG, B_REDR, "Disabled",	xco+30, yco-44, width-60, 19, &tdfa->flag, 0.0, 0.0, 0.0, 0.0, "Enable Motion Blur");
+					}
+					break;
+				case ACT_2DFILTER_BLUR:
+				case ACT_2DFILTER_SHARPEN:
+				case ACT_2DFILTER_DILATION:
+				case ACT_2DFILTER_EROSION:
+				case ACT_2DFILTER_LAPLACIAN:
+				case ACT_2DFILTER_SOBEL:
+				case ACT_2DFILTER_PREWITT:
+				case ACT_2DFILTER_GRAYSCALE:
+				case ACT_2DFILTER_SEPIA:
+				case ACT_2DFILTER_INVERT:
+				case ACT_2DFILTER_NOFILTER:
+				case ACT_2DFILTER_DISABLED:
+				case ACT_2DFILTER_ENABLED:
+					uiDefButI(block, NUM, B_REDR, "Pass Number:", xco+30, yco-44, width-60, 19, &tdfa->int_arg, 0.0, MAX_RENDER_PASS-1, 0.0, 0.0, "Set filter order");
+					break;
+				case ACT_2DFILTER_CUSTOMFILTER:
+					uiDefButI(block, NUM, B_REDR, "Pass Number:", xco+30, yco-44, width-60, 19, &tdfa->int_arg, 0.0, MAX_RENDER_PASS-1, 0.0, 0.0, "Set filter order");
+					uiDefIDPoinBut(block, test_scriptpoin_but, ID_SCRIPT, 1, "Script: ", xco+30, yco-64, width-60, 19, &tdfa->text, "");
+					break;
+			}
 
-		yco-= ysize;
-		break;
-	case ACT_ARMATURE:
-		armAct = act->data;
+			str= "2D Filter   %t|Motion Blur   %x1|Blur %x2|Sharpen %x3|Dilation %x4|Erosion %x5|"
+			     "Laplacian %x6|Sobel %x7|Prewitt %x8|Gray Scale %x9|Sepia %x10|Invert %x11|Custom Filter %x12|"
+			     "Enable Filter %x-2|Disable Filter %x-1|Remove Filter %x0|";
+			uiDefButS(block, MENU, B_REDR, str,	xco+30, yco-24, width-60, 19, &tdfa->type, 0.0, 0.0, 0.0, 0.0, "2D filter type");
 
-		if (ob->type == OB_ARMATURE) {
-			str= "Constraint %t|Run armature %x0|Enable %x1|Disable %x2|Set target %x3|Set weight %x4";
-			uiDefButI(block, MENU, B_REDR, str,		xco+5, yco-24, (width-10)*0.35, 19, &armAct->type, 0.0, 0.0, 0, 0, ""); 
+			yco -= ysize;
+			break;
+		case ACT_PARENT:
+			parAct = act->data;
 
-			switch (armAct->type) {
-			case ACT_ARM_RUN:
-				ysize = 28;
-				break;
-			default:
+			if (parAct->type==ACT_PARENT_SET) {
+
+				ysize= 48;
+				glRects(xco, yco-ysize, xco+width, yco);
+				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+				uiDefIDPoinBut(block, test_obpoin_but, ID_OB, 1, "OB:",		xco+95, yco-24, (width-100), 19, &(parAct->ob), "Set this object as parent");
 				uiBlockBeginAlign(block);
-				but = uiDefBut(block, TEX, 1, "Bone: ",
-						(xco+5), (yco-44), (width-10)/2, 19,
-						armAct->posechannel, 0, MAX_NAME, 0, 0,
-						"Bone on which the constraint is defined");
-				uiButSetFunc(but, check_armature_actuator, but, armAct);
-				but = uiDefBut(block, TEX, 1, "Cons: ",
-						(xco+5)+(width-10)/2, (yco-44), (width-10)/2, 19,
-						armAct->constraint, 0, MAX_NAME, 0, 0,
-						"Name of the constraint you want to control");
-				uiButSetFunc(but, check_armature_actuator, but, armAct);
+				uiDefButBitS(block, TOGN, ACT_PARENT_COMPOUND, B_REDR,
+				             "Compound",
+				             xco + 5, yco - 44, (width - 10)/2, 19, &parAct->flag,
+				             0.0, 0.0, 0, 0,
+				             "Add this object shape to the parent shape (only if the parent shape is already compound)");
+				uiDefButBitS(block, TOGN, ACT_PARENT_GHOST, B_REDR,
+				             "Ghost",
+				             xco + 5 + ((width - 10)/2), yco - 44, (width - 10)/2, 19, &parAct->flag,
+				             0.0, 0.0, 0, 0,
+				             "Make this object ghost while parented (only if not compound)");
 				uiBlockEndAlign(block);
-				ysize = 48;
+			}
+			else if (parAct->type==ACT_PARENT_REMOVE) {
+
+				ysize= 28;
+				glRects(xco, yco-ysize, xco+width, yco);
+				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+			}
+
+			str= "Parent %t|Set Parent %x0|Remove Parent %x1";
+			uiDefButI(block, MENU, B_REDR, str,		xco+5, yco-24, parAct->type==1?(width-80):90, 19, &parAct->type, 0.0, 0.0, 0, 0, "");
+
+			yco-= ysize;
+			break;
+		case ACT_ARMATURE:
+			armAct = act->data;
+
+			if (ob->type == OB_ARMATURE) {
+				str= "Constraint %t|Run armature %x0|Enable %x1|Disable %x2|Set target %x3|Set weight %x4";
+				uiDefButI(block, MENU, B_REDR, str,		xco+5, yco-24, (width-10)*0.35, 19, &armAct->type, 0.0, 0.0, 0, 0, "");
+
 				switch (armAct->type) {
-				case ACT_ARM_SETTARGET:
-					uiDefIDPoinBut(block, test_obpoin_but, ID_OB, 1, "Target: ",		xco+5, yco-64, (width-10), 19, &(armAct->target), "Set this object as the target of the constraint"); 
-					uiDefIDPoinBut(block, test_obpoin_but, ID_OB, 1, "Secondary Target: ",		xco+5, yco-84, (width-10), 19, &(armAct->subtarget), "Set this object as the secondary target of the constraint (only IK polar target at the moment)"); 
-					ysize += 40;
-					break;
-				case ACT_ARM_SETWEIGHT:
-					uiDefButF(block, NUM, B_REDR, "Weight:", xco+5+(width-10)*0.35, yco-24, (width-10)*0.65, 19, &armAct->weight, 0.0, 1.0, 0.0, 0.0, "Set weight of this constraint");
-					break;
+					case ACT_ARM_RUN:
+						ysize = 28;
+						break;
+					default:
+						uiBlockBeginAlign(block);
+						but = uiDefBut(block, TEX, 1, "Bone: ",
+						               (xco+5), (yco-44), (width-10)/2, 19,
+						               armAct->posechannel, 0, MAX_NAME, 0, 0,
+						               "Bone on which the constraint is defined");
+						uiButSetFunc(but, check_armature_actuator, but, armAct);
+						but = uiDefBut(block, TEX, 1, "Cons: ",
+						               (xco+5)+(width-10)/2, (yco-44), (width-10)/2, 19,
+						               armAct->constraint, 0, MAX_NAME, 0, 0,
+						               "Name of the constraint you want to control");
+						uiButSetFunc(but, check_armature_actuator, but, armAct);
+						uiBlockEndAlign(block);
+						ysize = 48;
+						switch (armAct->type) {
+							case ACT_ARM_SETTARGET:
+								uiDefIDPoinBut(block, test_obpoin_but, ID_OB, 1, "Target: ",		xco+5, yco-64, (width-10), 19, &(armAct->target), "Set this object as the target of the constraint");
+								uiDefIDPoinBut(block, test_obpoin_but, ID_OB, 1, "Secondary Target: ",		xco+5, yco-84, (width-10), 19, &(armAct->subtarget), "Set this object as the secondary target of the constraint (only IK polar target at the moment)");
+								ysize += 40;
+								break;
+							case ACT_ARM_SETWEIGHT:
+								uiDefButF(block, NUM, B_REDR, "Weight:", xco+5+(width-10)*0.35, yco-24, (width-10)*0.65, 19, &armAct->weight, 0.0, 1.0, 0.0, 0.0, "Set weight of this constraint");
+								break;
+						}
 				}
 			}
-		  }
-		glRects(xco, yco-ysize, xco+width, yco); 
-		uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1); 
-		yco-= ysize;
-		break;
+			glRects(xco, yco-ysize, xco+width, yco);
+			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+			yco-= ysize;
+			break;
 
-	 default:
-		ysize= 4;
+		default:
+			ysize= 4;
 
-		glRects(xco, yco-ysize, xco+width, yco);
-		uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-		
-		yco-= ysize;
-		break;
+			glRects(xco, yco-ysize, xco+width, yco);
+			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+
+			yco-= ysize;
+			break;
 	}
 
 	uiBlockSetEmboss(block, UI_EMBOSS);
diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c
index a6578ffb3f7..7eb0f676707 100644
--- a/source/blender/editors/space_nla/nla_draw.c
+++ b/source/blender/editors/space_nla/nla_draw.c
@@ -80,26 +80,17 @@
 static void nla_action_get_color(AnimData *adt, bAction *act, float color[4])
 {
 	if (adt && (adt->flag & ADT_NLA_EDIT_ON)) {
-		// greenish color (same as tweaking strip) - hardcoded for now
-		color[0] = 0.30f;
-		color[1] = 0.95f;
-		color[2] = 0.10f;
-		color[3] = 0.30f;
+		/* greenish color (same as tweaking strip) */
+		UI_GetThemeColor4fv(TH_NLA_TWEAK, color);
 	}
 	else {
 		if (act) {
-			// reddish color - hardcoded for now 	
-			color[0] = 0.8f;
-			color[1] = 0.2f;
-			color[2] = 0.0f;
-			color[3] = 0.4f;
+			/* reddish color - same as dopesheet summary */
+			UI_GetThemeColor4fv(TH_ANIM_ACTIVE, color);
 		}
 		else {
-			// greyish-red color - hardcoded for now
-			color[0] = 0.6f;
-			color[1] = 0.5f;
-			color[2] = 0.5f;
-			color[3] = 0.3f;
+			/* greyish-red color */
+			UI_GetThemeColor4fv(TH_ANIM_INACTIVE, color);
 		}
 	}
 	
@@ -166,17 +157,11 @@ static void nla_strip_get_color_inside(AnimData *adt, NlaStrip *strip, float col
 		/* Transition Clip */
 		if (strip->flag & NLASTRIP_FLAG_SELECT) {
 			/* selected - use a bright blue color */
-			// FIXME: hardcoded temp-hack colors
-			color[0] = 0.18f;
-			color[1] = 0.46f;
-			color[2] = 0.86f;
+			UI_GetThemeColor3fv(TH_NLA_TRANSITION_SEL, color);
 		}
 		else {
 			/* normal, unselected strip - use (hardly noticeable) blue tinge */
-			// FIXME: hardcoded temp-hack colors
-			color[0] = 0.11f;
-			color[1] = 0.15f;
-			color[2] = 0.19f;
+			UI_GetThemeColor3fv(TH_NLA_TRANSITION, color);
 		}
 	}	
 	else if (strip->type == NLASTRIP_TYPE_META) {
@@ -184,34 +169,22 @@ static void nla_strip_get_color_inside(AnimData *adt, NlaStrip *strip, float col
 		// TODO: should temporary metas get different colors too?
 		if (strip->flag & NLASTRIP_FLAG_SELECT) {
 			/* selected - use a bold purple color */
-			// FIXME: hardcoded temp-hack colors
-			color[0] = 0.41f;
-			color[1] = 0.13f;
-			color[2] = 0.59f;
+			UI_GetThemeColor3fv(TH_NLA_META_SEL, color);
 		}
 		else {
 			/* normal, unselected strip - use (hardly noticeable) dark purple tinge */
-			// FIXME: hardcoded temp-hack colors
-			color[0] = 0.20f;
-			color[1] = 0.15f;
-			color[2] = 0.26f;
+			UI_GetThemeColor3fv(TH_NLA_META, color);
 		}
 	}
 	else if (strip->type == NLASTRIP_TYPE_SOUND) {
 		/* Sound Clip */
 		if (strip->flag & NLASTRIP_FLAG_SELECT) {
 			/* selected - use a bright teal color */
-			// FIXME: hardcoded temp-hack colors
-			color[0] = 0.12f;
-			color[1] = 0.48f;
-			color[2] = 0.48f;
+			UI_GetThemeColor3fv(TH_NLA_SOUND_SEL, color);
 		}
 		else {
 			/* normal, unselected strip - use (hardly noticeable) teal tinge */
-			// FIXME: hardcoded temp-hack colors
-			color[0] = 0.17f;
-			color[1] = 0.24f;
-			color[2] = 0.24f;
+			UI_GetThemeColor3fv(TH_NLA_SOUND, color);
 		}
 	}
 	else {
@@ -220,19 +193,13 @@ static void nla_strip_get_color_inside(AnimData *adt, NlaStrip *strip, float col
 			/* active strip should be drawn green when it is acting as the tweaking strip.
 			 * however, this case should be skipped for when not in EditMode...
 			 */
-			// FIXME: hardcoded temp-hack colors
-			color[0] = 0.3f;
-			color[1] = 0.95f;
-			color[2] = 0.1f;
+			UI_GetThemeColor3fv(TH_NLA_TWEAK, color);
 		}
 		else if (strip->flag & NLASTRIP_FLAG_TWEAKUSER) {
 			/* alert user that this strip is also used by the tweaking track (this is set when going into
 			 * 'editmode' for that strip), since the edits made here may not be what the user anticipated
 			 */
-			// FIXME: hardcoded temp-hack colors
-			color[0] = 0.85f;
-			color[1] = 0.0f;
-			color[2] = 0.0f;
+			UI_GetThemeColor3fv(TH_NLA_TWEAK_DUPLI, color);
 		}
 		else if (strip->flag & NLASTRIP_FLAG_SELECT) {
 			/* selected strip - use theme color for selected */
@@ -792,21 +759,24 @@ static void draw_nla_channel_list_gl(bAnimContext *ac, ListBase *anim_data, View
 				glEnable(GL_BLEND);
 				
 				/* draw backing strip behind channel name */
+				// FIXME: hardcoded colors!!!
 				if (group == 5) {
-					/* Action Line */
-					// TODO: if tweaking some action, use the same color as for the tweaked track (quick hack done for now)
+					float color[4];
+					
+					/* Action Line
+					 *   The alpha values action_get_color returns are only useful for drawing 
+					 *   strips backgrounds but here we're doing channel list backgrounds instead
+					 *   so we ignore that and use our own when needed
+					 */
+					nla_action_get_color(adt, (bAction *)ale->data, color);
+					
 					if (adt && (adt->flag & ADT_NLA_EDIT_ON)) {
-						// greenish color (same as tweaking strip) - hardcoded for now
-						glColor3f(0.3f, 0.95f, 0.1f);
+						/* Yes, the color vector has 4 components, BUT we only want to be using 3 of them! */
+						glColor3fv(color);
 					}
 					else {
-						/* if a track is being solo'd, action is ignored, so draw less boldly (alpha lower) */
-						float alpha = (adt && (adt->flag & ADT_NLA_SOLO_TRACK)) ? 0.3f : 1.0f;
-						
-						if (ale->data)
-							glColor4f(0.8f, 0.2f, 0.0f, alpha);  // reddish color - hardcoded for now
-						else
-							glColor4f(0.6f, 0.5f, 0.5f, alpha);  // greyish-red color - hardcoded for now
+						float alpha = (adt && (adt->flag & ADT_NLA_SOLO_TRACK)) ? 0.3 : 1.0f;
+						glColor4f(color[0], color[1], color[2], alpha);
 					}
 					
 					offset += 7 * indent;
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index db75198bcd4..8aa56823baf 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -54,6 +54,7 @@
 #include "BKE_node.h"
 
 #include "BLF_api.h"
+#include "BLF_translation.h"
 
 #include "NOD_composite.h"
 #include "NOD_shader.h"
@@ -82,30 +83,30 @@
 #include "node_intern.h"
 
 // XXX interface.h
-extern void ui_dropshadow(rctf *rct, float radius, float aspect, int select);
+extern void ui_dropshadow(rctf *rct, float radius, float aspect, float alpha, int select);
 
 /* ****************** SOCKET BUTTON DRAW FUNCTIONS ***************** */
 
 static void node_sync_cb(bContext *UNUSED(C), void *snode_v, void *node_v)
 {
-	SpaceNode *snode= snode_v;
+	SpaceNode *snode = snode_v;
 	
-	if (snode->treetype==NTREE_SHADER) {
+	if (snode->treetype == NTREE_SHADER) {
 		nodeShaderSynchronizeID(node_v, 1);
 		// allqueue(REDRAWBUTSSHADING, 0);
 	}
 }
 
 static void node_socket_button_label(const bContext *UNUSED(C), uiBlock *block,
-							  bNodeTree *UNUSED(ntree), bNode *UNUSED(node), bNodeSocket *sock,
-							  const char *UNUSED(name), int x, int y, int width)
+                                     bNodeTree *UNUSED(ntree), bNode *UNUSED(node), bNodeSocket *sock,
+                                     const char *UNUSED(name), int x, int y, int width)
 {
-	uiDefBut(block, LABEL, 0, sock->name, x, y, width, NODE_DY, NULL, 0, 0, 0, 0, "");
+	uiDefBut(block, LABEL, 0, IFACE_(sock->name), x, y, width, NODE_DY, NULL, 0, 0, 0, 0, "");
 }
 
 static void node_socket_button_default(const bContext *C, uiBlock *block,
-								bNodeTree *ntree, bNode *node, bNodeSocket *sock,
-								const char *name, int x, int y, int width)
+                                       bNodeTree *ntree, bNode *node, bNodeSocket *sock,
+                                       const char *name, int x, int y, int width)
 {
 	if (sock->link || (sock->flag & SOCK_HIDE_VALUE))
 		node_socket_button_label(C, block, ntree, node, sock, name, x, y, width);
@@ -115,9 +116,9 @@ static void node_socket_button_default(const bContext *C, uiBlock *block,
 		
 		RNA_pointer_create(&ntree->id, &RNA_NodeSocket, sock, &ptr);
 		
-		bt = uiDefButR(block, NUM, B_NODE_EXEC, name,
-					   x, y+1, width, NODE_DY-2, 
-					   &ptr, "default_value", 0, 0, 0, -1, -1, NULL);
+		bt = uiDefButR(block, NUM, B_NODE_EXEC, IFACE_(name),
+		               x, y + 1, width, NODE_DY - 2,
+		               &ptr, "default_value", 0, 0, 0, -1, -1, NULL);
 		if (node)
 			uiButSetFunc(bt, node_sync_cb, CTX_wm_space_node(C), node);
 	}
@@ -132,22 +133,22 @@ typedef struct SocketComponentMenuArgs {
 /* NOTE: this is a block-menu, needs 0 events, otherwise the menu closes */
 static uiBlock *socket_component_menu(bContext *C, ARegion *ar, void *args_v)
 {
-	SocketComponentMenuArgs *args= (SocketComponentMenuArgs*)args_v;
+	SocketComponentMenuArgs *args = (SocketComponentMenuArgs *)args_v;
 	uiBlock *block;
 	uiLayout *layout;
 	
-	block= uiBeginBlock(C, ar, __func__, UI_EMBOSS);
+	block = uiBeginBlock(C, ar, __func__, UI_EMBOSS);
 	uiBlockSetFlag(block, UI_BLOCK_KEEP_OPEN);
 	
-	layout= uiLayoutColumn(uiBlockLayout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, args->x, args->y+2, args->width, NODE_DY, UI_GetStyle()), 0);
+	layout = uiLayoutColumn(uiBlockLayout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, args->x, args->y + 2, args->width, NODE_DY, UI_GetStyle()), 0);
 	
 	uiItemR(layout, &args->ptr, "default_value", UI_ITEM_R_EXPAND, "", ICON_NONE);
 	
 	return block;
 }
 static void node_socket_button_components(const bContext *C, uiBlock *block,
-								   bNodeTree *ntree, bNode *node, bNodeSocket *sock,
-								   const char *name, int x, int y, int width)
+                                          bNodeTree *ntree, bNode *node, bNodeSocket *sock,
+                                          const char *name, int x, int y, int width)
 {
 	if (sock->link || (sock->flag & SOCK_HIDE_VALUE))
 		node_socket_button_label(C, block, ntree, node, sock, name, x, y, width);
@@ -157,7 +158,7 @@ static void node_socket_button_components(const bContext *C, uiBlock *block,
 		
 		RNA_pointer_create(&ntree->id, &RNA_NodeSocket, sock, &ptr);
 		
-		args= MEM_callocN(sizeof(SocketComponentMenuArgs), "SocketComponentMenuArgs");
+		args = MEM_callocN(sizeof(SocketComponentMenuArgs), "SocketComponentMenuArgs");
 		
 		args->ptr = ptr;
 		args->x = x;
@@ -167,43 +168,43 @@ static void node_socket_button_components(const bContext *C, uiBlock *block,
 		args->arg1 = CTX_wm_space_node(C);
 		args->arg2 = node;
 		
-		uiDefBlockButN(block, socket_component_menu, args, name, x, y+1, width, NODE_DY-2, "");
+		uiDefBlockButN(block, socket_component_menu, args, IFACE_(name), x, y + 1, width, NODE_DY - 2, "");
 	}
 }
 
 static void node_socket_button_color(const bContext *C, uiBlock *block,
-							  bNodeTree *ntree, bNode *node, bNodeSocket *sock,
-							  const char *name, int x, int y, int width)
+                                     bNodeTree *ntree, bNode *node, bNodeSocket *sock,
+                                     const char *name, int x, int y, int width)
 {
 	if (sock->link || (sock->flag & SOCK_HIDE_VALUE))
-		node_socket_button_label(C, block, ntree, node, sock, name, x, y, width);
+		node_socket_button_label(C, block, ntree, node, sock, IFACE_(name), x, y, width);
 	else {
 		PointerRNA ptr;
 		uiBut *bt;
-		int labelw= width - 40;
+		int labelw = width - 40;
 		RNA_pointer_create(&ntree->id, &RNA_NodeSocket, sock, &ptr);
 		
-		bt=uiDefButR(block, COL, B_NODE_EXEC, "",
-					 x, y+2, (labelw>0 ? 40 : width), NODE_DY-2, 
-					 &ptr, "default_value", 0, 0, 0, -1, -1, NULL);
+		bt = uiDefButR(block, COL, B_NODE_EXEC, "",
+		               x, y + 2, (labelw > 0 ? 40 : width), NODE_DY - 2,
+		               &ptr, "default_value", 0, 0, 0, -1, -1, NULL);
 		if (node)
 			uiButSetFunc(bt, node_sync_cb, CTX_wm_space_node(C), node);
 		
-		if (name[0]!='\0' && labelw>0)
-			uiDefBut(block, LABEL, 0, name, x + 40, y+2, labelw, NODE_DY-2, NULL, 0, 0, 0, 0, "");
+		if (name[0] != '\0' && labelw > 0)
+			uiDefBut(block, LABEL, 0, IFACE_(name), x + 40, y + 2, labelw, NODE_DY - 2, NULL, 0, 0, 0, 0, "");
 	}
 }
 
 /* standard draw function, display the default input value */
 static void node_draw_input_default(const bContext *C, uiBlock *block,
-                                     bNodeTree *ntree, bNode *node, bNodeSocket *sock,
-                                     const char *name, int x, int y, int width)
+                                    bNodeTree *ntree, bNode *node, bNodeSocket *sock,
+                                    const char *name, int x, int y, int width)
 {
 	bNodeSocketType *stype = ntreeGetSocketType(sock->type);
 	if (stype->buttonfunc)
 		stype->buttonfunc(C, block, ntree, node, sock, name, x, y, width);
 	else
-		node_socket_button_label(C, block, ntree, node, sock, name, x, y, width);
+		node_socket_button_label(C, block, ntree, node, sock, IFACE_(name), x, y, width);
 }
 
 static void node_draw_output_default(const bContext *C, uiBlock *block,
@@ -213,14 +214,15 @@ static void node_draw_output_default(const bContext *C, uiBlock *block,
 	SpaceNode *snode = CTX_wm_space_node(C);
 	float slen;
 	int ofs = 0;
+	const char *ui_name = IFACE_(name);
 	UI_ThemeColor(TH_TEXT);
-	slen= snode->aspect*UI_GetStringWidth(name);
+	slen = snode->aspect * UI_GetStringWidth(ui_name);
 	while (slen > node->width) {
 		ofs++;
-		slen= snode->aspect*UI_GetStringWidth(name+ofs);
+		slen = snode->aspect * UI_GetStringWidth(ui_name + ofs);
 	}
-	uiDefBut(block, LABEL, 0, name+ofs, (short)(sock->locx-15.0f-slen), (short)(sock->locy-9.0f), 
-             (short)(node->width-NODE_DY), NODE_DY,  NULL, 0, 0, 0, 0, "");
+	uiDefBut(block, LABEL, 0, ui_name + ofs, (short)(sock->locx - 15.0f - slen), (short)(sock->locy - 9.0f),
+	         (short)(node->width - NODE_DY), NODE_DY,  NULL, 0, 0, 0, 0, "");
 }
 
 /* ****************** BASE DRAW FUNCTIONS FOR NEW OPERATOR NODES ***************** */
@@ -228,37 +230,37 @@ static void node_draw_output_default(const bContext *C, uiBlock *block,
 #if 0 /* UNUSED */
 static void node_draw_socket_new(bNodeSocket *sock, float size)
 {
-	float x=sock->locx, y=sock->locy;
+	float x = sock->locx, y = sock->locy;
 	
 	/* 16 values of sin function */
 	static float si[16] = {
-		0.00000000f, 0.39435585f, 0.72479278f,0.93775213f,
-		0.99871650f,0.89780453f,0.65137248f,0.29936312f,
-		-0.10116832f,-0.48530196f,-0.79077573f,-0.96807711f,
-		-0.98846832f,-0.84864425f,-0.57126821f,-0.20129852f
+		0.00000000f, 0.39435585f, 0.72479278f, 0.93775213f,
+		0.99871650f, 0.89780453f, 0.65137248f, 0.29936312f,
+		-0.10116832f, -0.48530196f, -0.79077573f, -0.96807711f,
+		-0.98846832f, -0.84864425f, -0.57126821f, -0.20129852f
 	};
 	/* 16 values of cos function */
-	static float co[16] ={
-		1.00000000f,0.91895781f,0.68896691f,0.34730525f,
-		-0.05064916f,-0.44039415f,-0.75875812f,-0.95413925f,
-		-0.99486932f,-0.87434661f,-0.61210598f,-0.25065253f,
-		0.15142777f,0.52896401f,0.82076344f,0.97952994f,
+	static float co[16] = {
+		1.00000000f, 0.91895781f, 0.68896691f, 0.34730525f,
+		-0.05064916f, -0.44039415f, -0.75875812f, -0.95413925f,
+		-0.99486932f, -0.87434661f, -0.61210598f, -0.25065253f,
+		0.15142777f, 0.52896401f, 0.82076344f, 0.97952994f,
 	};
 	int a;
 	
 	glColor3ub(180, 180, 180);
 	
 	glBegin(GL_POLYGON);
-	for (a=0; a<16; a++)
-		glVertex2f(x+size*si[a], y+size*co[a]);
+	for (a = 0; a < 16; a++)
+		glVertex2f(x + size * si[a], y + size * co[a]);
 	glEnd();
 	
 	glColor4ub(0, 0, 0, 150);
 	glEnable(GL_BLEND);
 	glEnable(GL_LINE_SMOOTH);
 	glBegin(GL_LINE_LOOP);
-	for (a=0; a<16; a++)
-		glVertex2f(x+size*si[a], y+size*co[a]);
+	for (a = 0; a < 16; a++)
+		glVertex2f(x + size * si[a], y + size * co[a]);
 	glEnd();
 	glDisable(GL_LINE_SMOOTH);
 	glDisable(GL_BLEND);
@@ -298,9 +300,9 @@ static void node_buts_mix_rgb(uiLayout *layout, bContext *UNUSED(C), PointerRNA
 {	
 	uiLayout *row;
 
-	bNodeTree *ntree= (bNodeTree*)ptr->id.data;
+	bNodeTree *ntree = (bNodeTree *)ptr->id.data;
 
-	row= uiLayoutRow(layout, 1);
+	row = uiLayoutRow(layout, 1);
 	uiItemR(row, ptr, "blend_type", 0, "", ICON_NONE);
 	if (ntree->type == NTREE_COMPOSIT)
 		uiItemR(row, ptr, "use_alpha", 0, "", ICON_IMAGE_RGB_ALPHA);
@@ -311,21 +313,21 @@ static void node_buts_time(uiLayout *layout, bContext *UNUSED(C), PointerRNA *pt
 	uiLayout *row;
 #if 0
 	/* XXX no context access here .. */
-	bNode *node= ptr->data;
-	CurveMapping *cumap= node->storage;
+	bNode *node = ptr->data;
+	CurveMapping *cumap = node->storage;
 	
 	if (cumap) {
 		cumap->flag |= CUMA_DRAW_CFRA;
-		if (node->custom1<node->custom2)
-			cumap->sample[0]= (float)(CFRA - node->custom1)/(float)(node->custom2-node->custom1);
+		if (node->custom1 < node->custom2)
+			cumap->sample[0] = (float)(CFRA - node->custom1) / (float)(node->custom2 - node->custom1);
 	}
 #endif
 
 	uiTemplateCurveMapping(layout, ptr, "curve", 's', 0, 0);
 
-	row= uiLayoutRow(layout, 1);
-	uiItemR(row, ptr, "frame_start", 0, "Sta", ICON_NONE);
-	uiItemR(row, ptr, "frame_end", 0, "End", ICON_NONE);
+	row = uiLayoutRow(layout, 1);
+	uiItemR(row, ptr, "frame_start", 0, IFACE_("Sta"), ICON_NONE);
+	uiItemR(row, ptr, "frame_end", 0, IFACE_("End"), ICON_NONE);
 }
 
 static void node_buts_colorramp(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
@@ -338,18 +340,18 @@ static void node_buts_curvevec(uiLayout *layout, bContext *UNUSED(C), PointerRNA
 	uiTemplateCurveMapping(layout, ptr, "mapping", 'v', 0, 0);
 }
 
-static float *_sample_col= NULL;	// bad bad, 2.5 will do better?
+static float *_sample_col = NULL;    // bad bad, 2.5 will do better?
 #if 0
 static void node_curvemap_sample(float *col)
 {
-	_sample_col= col;
+	_sample_col = col;
 }
 #endif
 
 static void node_buts_curvecol(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
-	bNode *node= ptr->data;
-	CurveMapping *cumap= node->storage;
+	bNode *node = ptr->data;
+	CurveMapping *cumap = node->storage;
 
 	if (_sample_col) {
 		cumap->flag |= CUMA_DRAW_SAMPLE;
@@ -366,99 +368,68 @@ static void node_normal_cb(bContext *C, void *ntree_v, void *node_v)
 	Main *bmain = CTX_data_main(C);
 
 	ED_node_generic_update(bmain, ntree_v, node_v);
-	WM_event_add_notifier(C, NC_NODE|NA_EDITED, ntree_v);
+	WM_event_add_notifier(C, NC_NODE | NA_EDITED, ntree_v);
 }
 
 static void node_buts_normal(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
-	uiBlock *block= uiLayoutAbsoluteBlock(layout);
-	bNodeTree *ntree= ptr->id.data;
-	bNode *node= ptr->data;
-	rctf *butr= &node->butr;
-	bNodeSocket *sock= node->outputs.first;		/* first socket stores normal */
-	float *nor= ((bNodeSocketValueVector*)sock->default_value)->value;
+	uiBlock *block = uiLayoutAbsoluteBlock(layout);
+	bNodeTree *ntree = ptr->id.data;
+	bNode *node = ptr->data;
+	rctf *butr = &node->butr;
+	bNodeSocket *sock = node->outputs.first;     /* first socket stores normal */
+	float *nor = ((bNodeSocketValueVector *)sock->default_value)->value;
 	uiBut *bt;
 	
-	bt= uiDefButF(block, BUT_NORMAL, B_NODE_EXEC, "", 
-	              (short)butr->xmin, (short)butr->xmin,
-	              butr->xmax-butr->xmin, butr->xmax-butr->xmin,
-	              nor, 0.0f, 1.0f, 0, 0, "");
+	bt = uiDefButF(block, BUT_NORMAL, B_NODE_EXEC, "",
+	               (short)butr->xmin, (short)butr->xmin,
+	               butr->xmax - butr->xmin, butr->xmax - butr->xmin,
+	               nor, 0.0f, 1.0f, 0, 0, "");
 	uiButSetFunc(bt, node_normal_cb, ntree, node);
 }
 #if 0 // not used in 2.5x yet
 static void node_browse_tex_cb(bContext *C, void *ntree_v, void *node_v)
 {
-	Main *bmain= CTX_data_main(C);
-	bNodeTree *ntree= ntree_v;
-	bNode *node= node_v;
+	Main *bmain = CTX_data_main(C);
+	bNodeTree *ntree = ntree_v;
+	bNode *node = node_v;
 	Tex *tex;
 	
-	if (node->menunr<1) return;
+	if (node->menunr < 1) return;
 	
 	if (node->id) {
 		node->id->us--;
-		node->id= NULL;
+		node->id = NULL;
 	}
-	tex= BLI_findlink(&bmain->tex, node->menunr-1);
+	tex = BLI_findlink(&bmain->tex, node->menunr - 1);
 
-	node->id= &tex->id;
+	node->id = &tex->id;
 	id_us_plus(node->id);
-	BLI_strncpy(node->name, node->id->name+2, sizeof(node->name));
+	BLI_strncpy(node->name, node->id->name + 2, sizeof(node->name));
 	
 	nodeSetActive(ntree, node);
 	
-	if ( ntree->type == NTREE_TEXTURE )
+	if (ntree->type == NTREE_TEXTURE)
 		ntreeTexCheckCyclics(ntree);
 	
 	// allqueue(REDRAWBUTSSHADING, 0);
 	// allqueue(REDRAWNODE, 0);
 	NodeTagChanged(ntree, node); 
 	
-	node->menunr= 0;
+	node->menunr = 0;
 }
 #endif
-static void node_dynamic_update_cb(bContext *C, void *UNUSED(ntree_v), void *node_v)
-{
-	Main *bmain= CTX_data_main(C);
-	Material *ma;
-	bNode *node= (bNode *)node_v;
-	ID *id= node->id;
-	int error= 0;
-
-	if (BTST(node->custom1, NODE_DYNAMIC_ERROR)) error= 1;
-
-	/* Users only have to press the "update" button in one pynode
-	 * and we also update all others sharing the same script */
-	for (ma= bmain->mat.first; ma; ma= ma->id.next) {
-		if (ma->nodetree) {
-			bNode *nd;
-			for (nd= ma->nodetree->nodes.first; nd; nd= nd->next) {
-				if ((nd->type == NODE_DYNAMIC) && (nd->id == id)) {
-					nd->custom1= 0;
-					nd->custom1= BSET(nd->custom1, NODE_DYNAMIC_REPARSE);
-					nd->menunr= 0;
-					if (error)
-						nd->custom1= BSET(nd->custom1, NODE_DYNAMIC_ERROR);
-				}
-			}
-		}
-	}
-
-	// allqueue(REDRAWBUTSSHADING, 0);
-	// allqueue(REDRAWNODE, 0);
-	// XXX BIF_preview_changed(ID_MA);
-}
 
 static void node_buts_texture(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
-	bNode *node= ptr->data;
+	bNode *node = ptr->data;
 
 	short multi = (
-		node->id &&
-		((Tex*)node->id)->use_nodes &&
-		(node->type != CMP_NODE_TEXTURE) &&
-		(node->type != TEX_NODE_TEXTURE)
-	);
+	    node->id &&
+	    ((Tex *)node->id)->use_nodes &&
+	    (node->type != CMP_NODE_TEXTURE) &&
+	    (node->type != TEX_NODE_TEXTURE)
+	    );
 	
 	uiItemR(layout, ptr, "texture", 0, "", ICON_NONE);
 	
@@ -476,9 +447,9 @@ static void node_buts_math(uiLayout *layout, bContext *UNUSED(C), PointerRNA *pt
 static int node_resize_area_default(bNode *node, int x, int y)
 {
 	if (node->flag & NODE_HIDDEN) {
-		rctf totr= node->totr;
+		rctf totr = node->totr;
 		/* right part of node */
-		totr.xmin = node->totr.xmax-20.0f;
+		totr.xmin = node->totr.xmax - 20.0f;
 		if (BLI_in_rctf(&totr, x, y))
 			return NODE_RESIZE_RIGHT;
 		else
@@ -486,12 +457,12 @@ static int node_resize_area_default(bNode *node, int x, int y)
 	}
 	else {
 		const float size = 10.0f;
-		rctf totr= node->totr;
+		rctf totr = node->totr;
 		int dir = 0;
 		
-		if (x >= totr.xmax-size && x < totr.xmax && y >= totr.ymin && y < totr.ymax)
+		if (x >= totr.xmax - size && x < totr.xmax && y >= totr.ymin && y < totr.ymax)
 			dir |= NODE_RESIZE_RIGHT;
-		if (x >= totr.xmin && x < totr.xmin+size && y >= totr.ymin && y < totr.ymax)
+		if (x >= totr.xmin && x < totr.xmin + size && y >= totr.ymin && y < totr.ymax)
 			dir |= NODE_RESIZE_LEFT;
 		return dir;
 	}
@@ -500,7 +471,7 @@ static int node_resize_area_default(bNode *node, int x, int y)
 /* ****************** BUTTON CALLBACKS FOR COMMON NODES ***************** */
 
 /* width of socket columns in group display */
-#define NODE_GROUP_FRAME		120
+#define NODE_GROUP_FRAME        120
 
 /* based on settings in node, sets drawing rect info. each redraw! */
 /* note: this assumes only 1 group at a time is drawn (linked data) */
@@ -511,13 +482,13 @@ static void node_update_group(const bContext *C, bNodeTree *ntree, bNode *gnode)
 		node_update_default(C, ntree, gnode);
 	}
 	else {
-		bNodeTree *ngroup= (bNodeTree *)gnode->id;
+		bNodeTree *ngroup = (bNodeTree *)gnode->id;
 		bNode *node;
 		bNodeSocket *sock, *gsock;
 		float locx, locy;
-		rctf *rect= &gnode->totr;
-		float node_group_frame= U.dpi*NODE_GROUP_FRAME/72;
-		float group_header= 26*U.dpi/72;
+		rctf *rect = &gnode->totr;
+		float node_group_frame = U.dpi * NODE_GROUP_FRAME / 72;
+		float group_header = 26 * U.dpi / 72;
 		int counter;
 		int dy;
 		
@@ -530,64 +501,64 @@ static void node_update_group(const bContext *C, bNodeTree *ntree, bNode *gnode)
 		rect->xmin = rect->xmax = locx;
 		rect->ymin = rect->ymax = locy;
 		
-		counter= 1;
-		for (node= ngroup->nodes.first; node; node= node->next) {
+		counter = 1;
+		for (node = ngroup->nodes.first; node; node = node->next) {
 			if (counter) {
-				*rect= node->totr;
-				counter= 0;
+				*rect = node->totr;
+				counter = 0;
 			}
 			else
 				BLI_union_rctf(rect, &node->totr);
 		}
 		
 		/* add some room for links to group sockets */
-		rect->xmin -= 4*NODE_DY;
-		rect->xmax += 4*NODE_DY;
-		rect->ymin-= NODE_DY;
-		rect->ymax+= NODE_DY;
+		rect->xmin -= 4 * NODE_DY;
+		rect->xmax += 4 * NODE_DY;
+		rect->ymin -= NODE_DY;
+		rect->ymax += NODE_DY;
 		
 		/* input sockets */
-		dy = 0.5f*(rect->ymin+rect->ymax) + NODE_DY*(BLI_countlist(&gnode->inputs)-1);
-		gsock=ngroup->inputs.first;
-		sock=gnode->inputs.first;
+		dy = 0.5f * (rect->ymin + rect->ymax) + NODE_DY * (BLI_countlist(&gnode->inputs) - 1);
+		gsock = ngroup->inputs.first;
+		sock = gnode->inputs.first;
 		while (gsock || sock) {
 			while (sock && !sock->groupsock) {
 				sock->locx = rect->xmin - node_group_frame;
 				sock->locy = dy;
 
 				/* prevent long socket lists from growing out of the group box */
-				if (dy-3*NODE_DYS < rect->ymin)
-					rect->ymin = dy-3*NODE_DYS;
-				if (dy+3*NODE_DYS > rect->ymax)
-					rect->ymax = dy+3*NODE_DYS;
-				dy -= 2*NODE_DY;
+				if (dy - 3 * NODE_DYS < rect->ymin)
+					rect->ymin = dy - 3 * NODE_DYS;
+				if (dy + 3 * NODE_DYS > rect->ymax)
+					rect->ymax = dy + 3 * NODE_DYS;
+				dy -= 2 * NODE_DY;
 				
 				sock = sock->next;
 			}
-			while (gsock && (!sock || sock->groupsock!=gsock)) {
+			while (gsock && (!sock || sock->groupsock != gsock)) {
 				gsock->locx = rect->xmin;
 				gsock->locy = dy;
 				
 				/* prevent long socket lists from growing out of the group box */
-				if (dy-3*NODE_DYS < rect->ymin)
-					rect->ymin = dy-3*NODE_DYS;
-				if (dy+3*NODE_DYS > rect->ymax)
-					rect->ymax = dy+3*NODE_DYS;
-				dy -= 2*NODE_DY;
+				if (dy - 3 * NODE_DYS < rect->ymin)
+					rect->ymin = dy - 3 * NODE_DYS;
+				if (dy + 3 * NODE_DYS > rect->ymax)
+					rect->ymax = dy + 3 * NODE_DYS;
+				dy -= 2 * NODE_DY;
 				
 				gsock = gsock->next;
 			}
-			while (sock && gsock && sock->groupsock==gsock) {
+			while (sock && gsock && sock->groupsock == gsock) {
 				gsock->locx = rect->xmin;
 				sock->locx = rect->xmin - node_group_frame;
 				sock->locy = gsock->locy = dy;
 				
 				/* prevent long socket lists from growing out of the group box */
-				if (dy-3*NODE_DYS < rect->ymin)
-					rect->ymin = dy-3*NODE_DYS;
-				if (dy+3*NODE_DYS > rect->ymax)
-					rect->ymax = dy+3*NODE_DYS;
-				dy -= 2*NODE_DY;
+				if (dy - 3 * NODE_DYS < rect->ymin)
+					rect->ymin = dy - 3 * NODE_DYS;
+				if (dy + 3 * NODE_DYS > rect->ymax)
+					rect->ymax = dy + 3 * NODE_DYS;
+				dy -= 2 * NODE_DY;
 				
 				sock = sock->next;
 				gsock = gsock->next;
@@ -595,47 +566,47 @@ static void node_update_group(const bContext *C, bNodeTree *ntree, bNode *gnode)
 		}
 		
 		/* output sockets */
-		dy = 0.5f*(rect->ymin+rect->ymax) + NODE_DY*(BLI_countlist(&gnode->outputs)-1);
-		gsock=ngroup->outputs.first;
-		sock=gnode->outputs.first;
+		dy = 0.5f * (rect->ymin + rect->ymax) + NODE_DY * (BLI_countlist(&gnode->outputs) - 1);
+		gsock = ngroup->outputs.first;
+		sock = gnode->outputs.first;
 		while (gsock || sock) {
 			while (sock && !sock->groupsock) {
 				sock->locx = rect->xmax + node_group_frame;
 				sock->locy = dy - NODE_DYS;
 				
 				/* prevent long socket lists from growing out of the group box */
-				if (dy-3*NODE_DYS < rect->ymin)
-					rect->ymin = dy-3*NODE_DYS;
-				if (dy+3*NODE_DYS > rect->ymax)
-					rect->ymax = dy+3*NODE_DYS;
-				dy -= 2*NODE_DY;
+				if (dy - 3 * NODE_DYS < rect->ymin)
+					rect->ymin = dy - 3 * NODE_DYS;
+				if (dy + 3 * NODE_DYS > rect->ymax)
+					rect->ymax = dy + 3 * NODE_DYS;
+				dy -= 2 * NODE_DY;
 				
 				sock = sock->next;
 			}
-			while (gsock && (!sock || sock->groupsock!=gsock)) {
+			while (gsock && (!sock || sock->groupsock != gsock)) {
 				gsock->locx = rect->xmax;
 				gsock->locy = dy - NODE_DYS;
 				
 				/* prevent long socket lists from growing out of the group box */
-				if (dy-3*NODE_DYS < rect->ymin)
-					rect->ymin = dy-3*NODE_DYS;
-				if (dy+3*NODE_DYS > rect->ymax)
-					rect->ymax = dy+3*NODE_DYS;
-				dy -= 2*NODE_DY;
+				if (dy - 3 * NODE_DYS < rect->ymin)
+					rect->ymin = dy - 3 * NODE_DYS;
+				if (dy + 3 * NODE_DYS > rect->ymax)
+					rect->ymax = dy + 3 * NODE_DYS;
+				dy -= 2 * NODE_DY;
 				
 				gsock = gsock->next;
 			}
-			while (sock && gsock && sock->groupsock==gsock) {
+			while (sock && gsock && sock->groupsock == gsock) {
 				gsock->locx = rect->xmax;
 				sock->locx = rect->xmax + node_group_frame;
 				sock->locy = gsock->locy = dy - NODE_DYS;
 				
 				/* prevent long socket lists from growing out of the group box */
-				if (dy-3*NODE_DYS < rect->ymin)
-					rect->ymin = dy-3*NODE_DYS;
-				if (dy+3*NODE_DYS > rect->ymax)
-					rect->ymax = dy+3*NODE_DYS;
-				dy -= 2*NODE_DY;
+				if (dy - 3 * NODE_DYS < rect->ymin)
+					rect->ymin = dy - 3 * NODE_DYS;
+				if (dy + 3 * NODE_DYS > rect->ymax)
+					rect->ymax = dy + 3 * NODE_DYS;
+				dy -= 2 * NODE_DY;
 				
 				sock = sock->next;
 				gsock = gsock->next;
@@ -646,16 +617,16 @@ static void node_update_group(const bContext *C, bNodeTree *ntree, bNode *gnode)
 		 * Add margin for header and input/output columns.
 		 */
 		uiExplicitBoundsBlock(gnode->block,
-							  rect->xmin - node_group_frame,
-							  rect->ymin,
-							  rect->xmax + node_group_frame,
-							  rect->ymax + group_header);
+		                      rect->xmin - node_group_frame,
+		                      rect->ymin,
+		                      rect->xmax + node_group_frame,
+		                      rect->ymax + group_header);
 	}
 }
 
 static void update_group_input_cb(bContext *UNUSED(C), void *UNUSED(snode_v), void *ngroup_v)
 {
-	bNodeTree *ngroup= (bNodeTree*)ngroup_v;
+	bNodeTree *ngroup = (bNodeTree *)ngroup_v;
 	
 	ngroup->update |= NTREE_UPDATE_GROUP_IN;
 	ntreeUpdateTree(ngroup);
@@ -663,7 +634,7 @@ static void update_group_input_cb(bContext *UNUSED(C), void *UNUSED(snode_v), vo
 
 static void update_group_output_cb(bContext *UNUSED(C), void *UNUSED(snode_v), void *ngroup_v)
 {
-	bNodeTree *ngroup= (bNodeTree*)ngroup_v;
+	bNodeTree *ngroup = (bNodeTree *)ngroup_v;
 	
 	ngroup->update |= NTREE_UPDATE_GROUP_OUT;
 	ntreeUpdateTree(ngroup);
@@ -671,55 +642,56 @@ static void update_group_output_cb(bContext *UNUSED(C), void *UNUSED(snode_v), v
 
 static void draw_group_socket_name(SpaceNode *snode, bNode *gnode, bNodeSocket *sock, int in_out, float xoffset, float yoffset)
 {
-	bNodeTree *ngroup= (bNodeTree*)gnode->id;
+	bNodeTree *ngroup = (bNodeTree *)gnode->id;
 	uiBut *bt;
+	const char *ui_name = IFACE_(sock->name);
 	
 	if (sock->flag & SOCK_DYNAMIC) {
 		bt = uiDefBut(gnode->block, TEX, 0, "", 
-					  sock->locx+xoffset, sock->locy+1+yoffset, 72, NODE_DY,
-					  sock->name, 0, sizeof(sock->name), 0, 0, "");
-		if (in_out==SOCK_IN)
+		              sock->locx + xoffset, sock->locy + 1 + yoffset, 72, NODE_DY,
+		              sock->name, 0, sizeof(sock->name), 0, 0, "");
+		if (in_out == SOCK_IN)
 			uiButSetFunc(bt, update_group_input_cb, snode, ngroup);
 		else
 			uiButSetFunc(bt, update_group_output_cb, snode, ngroup);
 	}
 	else {
-		uiDefBut(gnode->block, LABEL, 0, sock->name,
-		         sock->locx+xoffset, sock->locy+1+yoffset, 72, NODE_DY,
-		         NULL, 0, sizeof(sock->name), 0, 0, "");
+		uiDefBut(gnode->block, LABEL, 0, ui_name,
+		         sock->locx + xoffset, sock->locy + 1 + yoffset, 72, NODE_DY,
+		         NULL, 0, sizeof(ui_name), 0, 0, "");
 	}
 }
 
 static void draw_group_socket(const bContext *C, SpaceNode *snode, bNodeTree *ntree, bNode *gnode, bNodeSocket *sock, bNodeSocket *gsock, int index, int in_out)
 {
-	bNodeTree *ngroup= (bNodeTree*)gnode->id;
-	bNodeSocketType *stype= ntreeGetSocketType(gsock ? gsock->type : sock->type);
+	bNodeTree *ngroup = (bNodeTree *)gnode->id;
+	bNodeSocketType *stype = ntreeGetSocketType(gsock ? gsock->type : sock->type);
 	uiBut *bt;
 	float offset;
 	int draw_value;
-	float node_group_frame= U.dpi*NODE_GROUP_FRAME/72;
-	float socket_size= NODE_SOCKSIZE*U.dpi/72;
-	float arrowbutw= 0.8f*UI_UNIT_X;
+	float node_group_frame = U.dpi * NODE_GROUP_FRAME / 72;
+	float socket_size = NODE_SOCKSIZE * U.dpi / 72;
+	float arrowbutw = 0.8f * UI_UNIT_X;
 	/* layout stuff for buttons on group left frame */
-	float colw= 0.6f*node_group_frame;
-	float col1= 6 - node_group_frame;
-	float col2= col1 + colw+6;
-	float col3= - arrowbutw - 6;
+	float colw = 0.6f * node_group_frame;
+	float col1 = 6 - node_group_frame;
+	float col2 = col1 + colw + 6;
+	float col3 = -arrowbutw - 6;
 	/* layout stuff for buttons on group right frame */
-	float cor1= 6;
-	float cor2= cor1 + arrowbutw + 6;
-	float cor3= cor2 + arrowbutw + 6;
+	float cor1 = 6;
+	float cor2 = cor1 + arrowbutw + 6;
+	float cor3 = cor2 + arrowbutw + 6;
 	
 	/* node and group socket circles */
 	if (sock)
-		node_socket_circle_draw(ntree, sock, socket_size);
+		node_socket_circle_draw(ntree, sock, socket_size, sock->flag & SELECT);
 	if (gsock)
-		node_socket_circle_draw(ngroup, gsock, socket_size);
+		node_socket_circle_draw(ngroup, gsock, socket_size, gsock->flag & SELECT);
 	
 	/* socket name */
-	offset = (in_out==SOCK_IN ? col1 : cor3);
+	offset = (in_out == SOCK_IN ? col1 : cor3);
 	if (!gsock)
-		offset += (in_out==SOCK_IN ? node_group_frame : -node_group_frame);
+		offset += (in_out == SOCK_IN ? node_group_frame : -node_group_frame);
 	
 	/* draw both name and value button if:
 	 * 1) input: not internal
@@ -727,25 +699,25 @@ static void draw_group_socket(const bContext *C, SpaceNode *snode, bNodeTree *nt
 	 */
 	draw_value = 0;
 	switch (in_out) {
-	case SOCK_IN:
-		draw_value = !(gsock && (gsock->flag & SOCK_INTERNAL));
-		break;
-	case SOCK_OUT:
-		if (gnode->typeinfo->flag & NODE_CONST_OUTPUT)
-			draw_value = !(gsock && gsock->link);
-		break;
+		case SOCK_IN:
+			draw_value = !(gsock && (gsock->flag & SOCK_INTERNAL));
+			break;
+		case SOCK_OUT:
+			if (gnode->typeinfo->flag & NODE_CONST_OUTPUT)
+				draw_value = !(gsock && gsock->link);
+			break;
 	}
 	if (draw_value) {
 		/* both name and value buttons */
 		if (gsock) {
 			draw_group_socket_name(snode, gnode, gsock, in_out, offset, 0);
 			if (stype->buttonfunc)
-				stype->buttonfunc(C, gnode->block, ngroup, NULL, gsock, "", gsock->locx+offset, gsock->locy-NODE_DY, colw);
+				stype->buttonfunc(C, gnode->block, ngroup, NULL, gsock, "", gsock->locx + offset, gsock->locy - NODE_DY, colw);
 		}
 		else {
 			draw_group_socket_name(snode, gnode, sock, in_out, offset, 0);
 			if (stype->buttonfunc)
-				stype->buttonfunc(C, gnode->block, ngroup, NULL, sock, "", sock->locx+offset, sock->locy-NODE_DY, colw);
+				stype->buttonfunc(C, gnode->block, ngroup, NULL, sock, "", sock->locx + offset, sock->locy - NODE_DY, colw);
 		}
 	}
 	else {
@@ -758,17 +730,17 @@ static void draw_group_socket(const bContext *C, SpaceNode *snode, bNodeTree *nt
 	
 	if (gsock && (gsock->flag & SOCK_DYNAMIC)) {
 		/* up/down buttons */
-		offset = (in_out==SOCK_IN ? col2 : cor2);
+		offset = (in_out == SOCK_IN ? col2 : cor2);
 		uiBlockSetDirection(gnode->block, UI_TOP);
 		uiBlockBeginAlign(gnode->block);
 		bt = uiDefIconButO(gnode->block, BUT, "NODE_OT_group_socket_move_up", 0, ICON_TRIA_UP,
-						   gsock->locx+offset, gsock->locy, arrowbutw, arrowbutw, "");
+		                   gsock->locx + offset, gsock->locy, arrowbutw, arrowbutw, "");
 		if (!gsock->prev || !(gsock->prev->flag & SOCK_DYNAMIC))
 			uiButSetFlag(bt, UI_BUT_DISABLED);
 		RNA_int_set(uiButGetOperatorPtrRNA(bt), "index", index);
 		RNA_enum_set(uiButGetOperatorPtrRNA(bt), "in_out", in_out);
 		bt = uiDefIconButO(gnode->block, BUT, "NODE_OT_group_socket_move_down", 0, ICON_TRIA_DOWN,
-						   gsock->locx+offset, gsock->locy-arrowbutw, arrowbutw, arrowbutw, "");
+		                   gsock->locx + offset, gsock->locy - arrowbutw, arrowbutw, arrowbutw, "");
 		if (!gsock->next || !(gsock->next->flag & SOCK_DYNAMIC))
 			uiButSetFlag(bt, UI_BUT_DISABLED);
 		RNA_int_set(uiButGetOperatorPtrRNA(bt), "index", index);
@@ -777,10 +749,10 @@ static void draw_group_socket(const bContext *C, SpaceNode *snode, bNodeTree *nt
 		uiBlockSetDirection(gnode->block, 0);
 		
 		/* remove button */
-		offset = (in_out==SOCK_IN ? col3 : cor1);
+		offset = (in_out == SOCK_IN ? col3 : cor1);
 		uiBlockSetEmboss(gnode->block, UI_EMBOSSN);
 		bt = uiDefIconButO(gnode->block, BUT, "NODE_OT_group_socket_remove", 0, ICON_X,
-						   gsock->locx+offset, gsock->locy-0.5f*arrowbutw, arrowbutw, arrowbutw, "");
+		                   gsock->locx + offset, gsock->locy - 0.5f * arrowbutw, arrowbutw, arrowbutw, "");
 		RNA_int_set(uiButGetOperatorPtrRNA(bt), "index", index);
 		RNA_enum_set(uiButGetOperatorPtrRNA(bt), "in_out", in_out);
 		uiBlockSetEmboss(gnode->block, UI_EMBOSS);
@@ -794,13 +766,13 @@ static void node_draw_group(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 		node_draw_default(C, ar, snode, ntree, gnode);
 	}
 	else {
-		bNodeTree *ngroup= (bNodeTree *)gnode->id;
+		bNodeTree *ngroup = (bNodeTree *)gnode->id;
 		bNodeSocket *sock, *gsock;
 		uiLayout *layout;
 		PointerRNA ptr;
-		rctf rect= gnode->totr;
-		float node_group_frame= U.dpi*NODE_GROUP_FRAME/72;
-		float group_header= 26*U.dpi/72;
+		rctf rect = gnode->totr;
+		float node_group_frame = U.dpi * NODE_GROUP_FRAME / 72;
+		float group_header = 26 * U.dpi / 72;
 		
 		int index;
 		
@@ -808,7 +780,7 @@ static void node_draw_group(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 		glEnable(GL_BLEND);
 		uiSetRoundBox(UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT);
 		UI_ThemeColorShadeAlpha(TH_NODE_GROUP, 0, -70);
-		uiDrawBox(GL_POLYGON, rect.xmin-node_group_frame, rect.ymax, rect.xmax+node_group_frame, rect.ymax+group_header, BASIS_RAD);
+		uiDrawBox(GL_POLYGON, rect.xmin - node_group_frame, rect.ymax, rect.xmax + node_group_frame, rect.ymax + group_header, BASIS_RAD);
 		
 		/* backdrop body */
 		UI_ThemeColorShadeAlpha(TH_BACK, -8, -70);
@@ -818,12 +790,12 @@ static void node_draw_group(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 		/* input column */
 		UI_ThemeColorShadeAlpha(TH_BACK, 10, -50);
 		uiSetRoundBox(UI_CNR_BOTTOM_LEFT);
-		uiDrawBox(GL_POLYGON, rect.xmin-node_group_frame, rect.ymin, rect.xmin, rect.ymax, BASIS_RAD);
+		uiDrawBox(GL_POLYGON, rect.xmin - node_group_frame, rect.ymin, rect.xmin, rect.ymax, BASIS_RAD);
 	
 		/* output column */
 		UI_ThemeColorShadeAlpha(TH_BACK, 10, -50);
 		uiSetRoundBox(UI_CNR_BOTTOM_RIGHT);
-		uiDrawBox(GL_POLYGON, rect.xmax, rect.ymin, rect.xmax+node_group_frame, rect.ymax, BASIS_RAD);
+		uiDrawBox(GL_POLYGON, rect.xmax, rect.ymin, rect.xmax + node_group_frame, rect.ymax, BASIS_RAD);
 	
 		/* input column separator */
 		glColor4ub(200, 200, 200, 140);
@@ -843,57 +815,57 @@ static void node_draw_group(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 		uiSetRoundBox(UI_CNR_ALL);
 		glColor4ub(200, 200, 200, 140);
 		glEnable(GL_LINE_SMOOTH);
-		uiDrawBox(GL_LINE_LOOP, rect.xmin-node_group_frame, rect.ymin, rect.xmax+node_group_frame, rect.ymax+group_header, BASIS_RAD);
+		uiDrawBox(GL_LINE_LOOP, rect.xmin - node_group_frame, rect.ymin, rect.xmax + node_group_frame, rect.ymax + group_header, BASIS_RAD);
 		glDisable(GL_LINE_SMOOTH);
 		glDisable(GL_BLEND);
 		
 		/* backdrop title */
 		UI_ThemeColor(TH_TEXT_HI);
 	
-		layout = uiBlockLayout(gnode->block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, (short)(rect.xmin+15), (short)(rect.ymax+group_header),
-		                       MIN2((int)(rect.xmax - rect.xmin-18.0f), node_group_frame+20), group_header, UI_GetStyle());
+		layout = uiBlockLayout(gnode->block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, (short)(rect.xmin + 15), (short)(rect.ymax + group_header),
+		                       MIN2((int)(rect.xmax - rect.xmin - 18.0f), node_group_frame + 20), group_header, UI_GetStyle());
 		RNA_pointer_create(&ntree->id, &RNA_Node, gnode, &ptr);
-		uiTemplateIDBrowse(layout, (bContext*)C, &ptr, "node_tree", NULL, NULL, NULL);
+		uiTemplateIDBrowse(layout, (bContext *)C, &ptr, "node_tree", NULL, NULL, NULL);
 		uiBlockLayoutResolve(gnode->block, NULL, NULL);
 	
 		/* draw the internal tree nodes and links */
 		node_draw_nodetree(C, ar, snode, ngroup);
 	
 		/* group sockets */
-		gsock=ngroup->inputs.first;
-		sock=gnode->inputs.first;
+		gsock = ngroup->inputs.first;
+		sock = gnode->inputs.first;
 		index = 0;
 		while (gsock || sock) {
 			while (sock && !sock->groupsock) {
 				draw_group_socket(C, snode, ntree, gnode, sock, NULL, index, SOCK_IN);
 				sock = sock->next;
 			}
-			while (gsock && (!sock || sock->groupsock!=gsock)) {
+			while (gsock && (!sock || sock->groupsock != gsock)) {
 				draw_group_socket(C, snode, ntree, gnode, NULL, gsock, index, SOCK_IN);
 				gsock = gsock->next;
 				++index;
 			}
-			while (sock && gsock && sock->groupsock==gsock) {
+			while (sock && gsock && sock->groupsock == gsock) {
 				draw_group_socket(C, snode, ntree, gnode, sock, gsock, index, SOCK_IN);
 				sock = sock->next;
 				gsock = gsock->next;
 				++index;
 			}
 		}
-		gsock=ngroup->outputs.first;
-		sock=gnode->outputs.first;
+		gsock = ngroup->outputs.first;
+		sock = gnode->outputs.first;
 		index = 0;
 		while (gsock || sock) {
 			while (sock && !sock->groupsock) {
 				draw_group_socket(C, snode, ntree, gnode, sock, NULL, index, SOCK_OUT);
 				sock = sock->next;
 			}
-			while (gsock && (!sock || sock->groupsock!=gsock)) {
+			while (gsock && (!sock || sock->groupsock != gsock)) {
 				draw_group_socket(C, snode, ntree, gnode, NULL, gsock, index, SOCK_OUT);
 				gsock = gsock->next;
 				++index;
 			}
-			while (sock && gsock && sock->groupsock==gsock) {
+			while (sock && gsock && sock->groupsock == gsock) {
 				draw_group_socket(C, snode, ntree, gnode, sock, gsock, index, SOCK_OUT);
 				sock = sock->next;
 				gsock = gsock->next;
@@ -903,7 +875,7 @@ static void node_draw_group(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 		
 		uiEndBlock(C, gnode->block);
 		uiDrawBlock(C, gnode->block);
-		gnode->block= NULL;
+		gnode->block = NULL;
 	}
 }
 
@@ -932,15 +904,15 @@ static void node_update_frame(const bContext *UNUSED(C), bNodeTree *ntree, bNode
 	
 	/* init rect from current frame size */
 	nodeToView(node, node->offsetx, node->offsety, &rect.xmin, &rect.ymax);
-	nodeToView(node, node->offsetx+node->width, node->offsety-node->height, &rect.xmax, &rect.ymin);
+	nodeToView(node, node->offsetx + node->width, node->offsety - node->height, &rect.xmax, &rect.ymin);
 	
 	/* frame can be resized manually only if shrinking is disabled or no children are attached */
 	data->flag |= NODE_FRAME_RESIZEABLE;
 	/* for shrinking bbox, initialize the rect from first child node */
 	bbinit = (data->flag & NODE_FRAME_SHRINK);
 	/* fit bounding box to all children */
-	for (tnode=ntree->nodes.first; tnode; tnode=tnode->next) {
-		if (tnode->parent!=node)
+	for (tnode = ntree->nodes.first; tnode; tnode = tnode->next) {
+		if (tnode->parent != node)
 			continue;
 		
 		/* add margin to node rect */
@@ -974,8 +946,8 @@ static void node_draw_frame_label(bNode *node)
 	/* XXX font id is crap design */
 	const int fontid = blf_mono_font;
 	NodeFrame *data = (NodeFrame *)node->storage;
-	rctf *rct= &node->totr;
-	int color_id= node_get_colorid(node);
+	rctf *rct = &node->totr;
+	int color_id = node_get_colorid(node);
 	char label[128];
 	/* XXX a bit hacky, should use separate align values for x and y */
 	float width, ascender;
@@ -990,7 +962,7 @@ static void node_draw_frame_label(bNode *node)
 	width = BLF_width(fontid, label);
 	ascender = BLF_ascender(fontid);
 	
-	x = 0.5f*(rct->xmin + rct->xmax) - 0.5f*width;
+	x = 0.5f * (rct->xmin + rct->xmax) - 0.5f * width;
 	y = rct->ymax - NODE_DYS - ascender;
 	
 	BLF_position(fontid, x, y, 0);
@@ -999,35 +971,40 @@ static void node_draw_frame_label(bNode *node)
 
 static void node_draw_frame(const bContext *C, ARegion *ar, SpaceNode *snode, bNodeTree *UNUSED(ntree), bNode *node)
 {
-	rctf *rct= &node->totr;
-	int color_id= node_get_colorid(node);
+	rctf *rct = &node->totr;
+	int color_id = node_get_colorid(node);
+	unsigned char color[4];
+	float alpha;
+	
+	UI_GetThemeColor4ubv(TH_NODE_FRAME, color);
+	alpha = (float)(color[3])/255.0f;
 	
 	/* skip if out of view */
 	if (node->totr.xmax < ar->v2d.cur.xmin || node->totr.xmin > ar->v2d.cur.xmax ||
-			node->totr.ymax < ar->v2d.cur.ymin || node->totr.ymin > ar->v2d.cur.ymax) {
+	    node->totr.ymax < ar->v2d.cur.ymin || node->totr.ymin > ar->v2d.cur.ymax) {
 		
 		uiEndBlock(C, node->block);
-		node->block= NULL;
+		node->block = NULL;
 		return;
 	}
 	
 	/* shadow */
-	node_draw_shadow(snode, node, BASIS_RAD);
+	node_draw_shadow(snode, node, BASIS_RAD, alpha);
 	
 	/* body */
 	if (node->flag & NODE_CUSTOM_COLOR)
-		glColor3fv(node->color);
+		glColor4f(node->color[0], node->color[1], node->color[2], alpha);
 	else
-		UI_ThemeColor4(TH_NODE);
+		UI_ThemeColor4(TH_NODE_FRAME);
 	glEnable(GL_BLEND);
 	uiSetRoundBox(UI_CNR_ALL);
 	uiRoundBox(rct->xmin, rct->ymin, rct->xmax, rct->ymax, BASIS_RAD);
 	glDisable(GL_BLEND);
 
 	/* outline active and selected emphasis */
-	if ( node->flag & (NODE_ACTIVE|SELECT) ) {
+	if (node->flag & (NODE_ACTIVE | SELECT) ) {
 		glEnable(GL_BLEND);
-		glEnable( GL_LINE_SMOOTH );
+		glEnable(GL_LINE_SMOOTH);
 		
 		if (node->flag & NODE_ACTIVE)
 			UI_ThemeColorShadeAlpha(TH_ACTIVE, 0, -40);
@@ -1036,7 +1013,7 @@ static void node_draw_frame(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 		uiSetRoundBox(UI_CNR_ALL);
 		uiDrawBox(GL_LINE_LOOP, rct->xmin, rct->ymin, rct->xmax, rct->ymax, BASIS_RAD);
 		
-		glDisable( GL_LINE_SMOOTH );
+		glDisable(GL_LINE_SMOOTH);
 		glDisable(GL_BLEND);
 	}
 	
@@ -1047,27 +1024,27 @@ static void node_draw_frame(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 		
 	uiEndBlock(C, node->block);
 	uiDrawBlock(C, node->block);
-	node->block= NULL;
+	node->block = NULL;
 }
 
 static int node_resize_area_frame(bNode *node, int x, int y)
 {
 	const float size = 10.0f;
 	NodeFrame *data = (NodeFrame *)node->storage;
-	rctf totr= node->totr;
+	rctf totr = node->totr;
 	int dir = 0;
 	
 	/* shrinking frame size is determined by child nodes */
 	if (!(data->flag & NODE_FRAME_RESIZEABLE))
 		return 0;
 	
-	if (x >= totr.xmax-size && x < totr.xmax && y >= totr.ymin && y < totr.ymax)
+	if (x >= totr.xmax - size && x < totr.xmax && y >= totr.ymin && y < totr.ymax)
 		dir |= NODE_RESIZE_RIGHT;
-	if (x >= totr.xmin && x < totr.xmin+size && y >= totr.ymin && y < totr.ymax)
+	if (x >= totr.xmin && x < totr.xmin + size && y >= totr.ymin && y < totr.ymax)
 		dir |= NODE_RESIZE_LEFT;
-	if (x >= totr.xmin && x < totr.xmax && y >= totr.ymax-size && y < totr.ymax)
+	if (x >= totr.xmin && x < totr.xmax && y >= totr.ymax - size && y < totr.ymax)
 		dir |= NODE_RESIZE_TOP;
-	if (x >= totr.xmin && x < totr.xmax && y >= totr.ymin && y < totr.ymin+size)
+	if (x >= totr.xmin && x < totr.xmax && y >= totr.ymin && y < totr.ymin + size)
 		dir |= NODE_RESIZE_BOTTOM;
 	
 	return dir;
@@ -1075,76 +1052,193 @@ static int node_resize_area_frame(bNode *node, int x, int y)
 
 static void node_buts_frame_details(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
-	uiItemR(layout, ptr, "label_size", 0, "Label Size", ICON_NONE);
-	uiItemR(layout, ptr, "shrink", 0, "Shrink", ICON_NONE);
+	uiItemR(layout, ptr, "label_size", 0, IFACE_("Label Size"), ICON_NONE);
+	uiItemR(layout, ptr, "shrink", 0, IFACE_("Shrink"), ICON_NONE);
+}
+
+
+#define NODE_REROUTE_SIZE	8.0f
+
+static void node_update_reroute(const bContext *UNUSED(C), bNodeTree *UNUSED(ntree), bNode *node)
+{
+	bNodeSocket *nsock;
+	float locx, locy;
+	float size = NODE_REROUTE_SIZE;
+	
+	/* get "global" coords */
+	nodeToView(node, 0.0f, 0.0f, &locx, &locy);
+	
+	/* reroute node has exactly one input and one output, both in the same place */
+	nsock= node->outputs.first;
+	nsock->locx= locx;
+	nsock->locy= locy;
+
+	nsock= node->inputs.first;
+	nsock->locx= locx;
+	nsock->locy= locy;
+	
+	node->width = size*2;
+	node->totr.xmin= locx - size;
+	node->totr.xmax= locx + size;
+	node->totr.ymax= locy + size;
+	node->totr.ymin= locy - size;
+}
+
+static void node_draw_reroute(const bContext *C, ARegion *ar, SpaceNode *UNUSED(snode),  bNodeTree *ntree, bNode *node)
+{
+	bNodeSocket *sock;
+	#if 0	/* UNUSED */
+	rctf *rct= &node->totr;
+	float size = NODE_REROUTE_SIZE;
+	#endif
+	float socket_size= NODE_SOCKSIZE;
+
+	/* skip if out of view */
+	if (node->totr.xmax < ar->v2d.cur.xmin || node->totr.xmin > ar->v2d.cur.xmax ||
+			node->totr.ymax < ar->v2d.cur.ymin || node->totr.ymin > ar->v2d.cur.ymax) {
+
+		uiEndBlock(C, node->block);
+		node->block= NULL;
+		return;
+	}
+
+	/* XXX only kept for debugging
+	 * selection state is indicated by socket outline below!
+	 */
+	#if 0
+	/* body */
+	uiSetRoundBox(15);
+	UI_ThemeColor4(TH_NODE);
+	glEnable(GL_BLEND);
+	uiRoundBox(rct->xmin, rct->ymin, rct->xmax, rct->ymax, size);
+	glDisable(GL_BLEND);
+
+	/* outline active and selected emphasis */
+	if (node->flag & (NODE_ACTIVE | SELECT)) {
+		glEnable(GL_BLEND);
+		glEnable( GL_LINE_SMOOTH );
+			/* using different shades of TH_TEXT_HI for the empasis, like triangle */
+			if( node->flag & NODE_ACTIVE )
+				UI_ThemeColorShadeAlpha(TH_TEXT_HI, 0, -40);
+			else
+				UI_ThemeColorShadeAlpha(TH_TEXT_HI, -20, -120);
+			uiDrawBox(GL_LINE_LOOP, rct->xmin, rct->ymin, rct->xmax, rct->ymax, size);
+
+		glDisable( GL_LINE_SMOOTH );
+		glDisable(GL_BLEND);
+	}
+	#endif
+
+	/* only draw input socket. as they all are placed on the same position.
+	 * highlight also if node itself is selected, since we don't display the node body separately!
+	 */
+	for (sock= node->inputs.first; sock; sock= sock->next) {
+		node_socket_circle_draw(ntree, sock, socket_size, (sock->flag & SELECT) || (node->flag & SELECT));
+	}
+
+	uiEndBlock(C, node->block);
+	uiDrawBlock(C, node->block);
+	node->block= NULL;
+}
+
+/* Special tweak area for reroute node.
+ * Since this node is quite small, we use a larger tweak area for grabbing than for selection.
+ */
+static int node_tweak_area_reroute(bNode *node, int x, int y)
+{
+	/* square of tweak radius */
+	static const float tweak_radius_sq = 576;	/* 24*24 */
+	
+	bNodeSocket *sock = node->inputs.first;
+	float dx = sock->locx - x;
+	float dy = sock->locy - y;
+	return (dx*dx + dy*dy <= tweak_radius_sq);
 }
 
 static void node_common_set_butfunc(bNodeType *ntype)
 {
 	switch (ntype->type) {
 		case NODE_GROUP:
-			ntype->uifunc= node_uifunc_group;
-			ntype->drawfunc= node_draw_group;
-			ntype->drawupdatefunc= node_update_group;
+			ntype->uifunc = node_uifunc_group;
+			ntype->drawfunc = node_draw_group;
+			ntype->drawupdatefunc = node_update_group;
 			break;
 		case NODE_FORLOOP:
 //			ntype->uifunc= node_common_buts_group;
-			ntype->drawfunc= node_draw_group;
-			ntype->drawupdatefunc= node_update_group;
+			ntype->drawfunc = node_draw_group;
+			ntype->drawupdatefunc = node_update_group;
 			break;
 		case NODE_WHILELOOP:
-			ntype->uifunc= node_common_buts_whileloop;
-			ntype->drawfunc= node_draw_group;
-			ntype->drawupdatefunc= node_update_group;
+			ntype->uifunc = node_common_buts_whileloop;
+			ntype->drawfunc = node_draw_group;
+			ntype->drawupdatefunc = node_update_group;
 			break;
 		case NODE_FRAME:
-			ntype->drawfunc= node_draw_frame;
-			ntype->drawupdatefunc= node_update_frame;
-			ntype->uifuncbut= node_buts_frame_details;
-			ntype->resize_area_func= node_resize_area_frame;
+			ntype->drawfunc = node_draw_frame;
+			ntype->drawupdatefunc = node_update_frame;
+			ntype->uifuncbut = node_buts_frame_details;
+			ntype->resize_area_func = node_resize_area_frame;
+			break;
+		case NODE_REROUTE:
+			ntype->drawfunc= node_draw_reroute;
+			ntype->drawupdatefunc= node_update_reroute;
+			ntype->tweak_area_func= node_tweak_area_reroute;
 			break;
 	}
 }
 
 /* ****************** BUTTON CALLBACKS FOR SHADER NODES ***************** */
 
-static void node_browse_text_cb(bContext *C, void *ntree_v, void *node_v)
+static void node_buts_image_user(uiLayout *layout, bContext *C, PointerRNA *imaptr, PointerRNA *iuserptr)
 {
-	Main *bmain= CTX_data_main(C);
-	bNodeTree *ntree= ntree_v;
-	bNode *node= node_v;
-	/* ID *oldid; */ /* UNUSED */
+	uiLayout *col;
+	int source;
+
+	if(!imaptr->data)
+		return;
+
+	col = uiLayoutColumn(layout, 0);
 	
-	if (node->menunr<1) return;
+	uiItemR(col, imaptr, "source", 0, "", ICON_NONE);
 	
-	if (node->id) {
-		node->id->us--;
+	source = RNA_enum_get(imaptr, "source");
+
+	if (source == IMA_SRC_SEQUENCE) {
+		/* don't use iuser->framenr directly because it may not be updated if auto-refresh is off */
+		Scene *scene = CTX_data_scene(C);
+		ImageUser *iuser = iuserptr->data;
+		char numstr[32];
+		const int framenr = BKE_image_user_frame_get(iuser, CFRA, 0);
+		BLI_snprintf(numstr, sizeof(numstr), IFACE_("Frame: %d"), framenr);
+		uiItemL(layout, numstr, ICON_NONE);
 	}
-	/* oldid= node->id; */ /* UNUSED */
-	node->id= BLI_findlink(&bmain->text, node->menunr-1);
-	id_us_plus(node->id);
-	BLI_strncpy(node->name, node->id->name+2, sizeof(node->name));
 
-	node->custom1= BSET(node->custom1, NODE_DYNAMIC_NEW);
-	
-	nodeSetActive(ntree, node);
+	if (ELEM(source, IMA_SRC_SEQUENCE, IMA_SRC_MOVIE)) {
+		col = uiLayoutColumn(layout, 1);
+		uiItemR(col, iuserptr, "frame_duration", 0, NULL, ICON_NONE);
+		uiItemR(col, iuserptr, "frame_start", 0, NULL, ICON_NONE);
+		uiItemR(col, iuserptr, "frame_offset", 0, NULL, ICON_NONE);
+		uiItemR(col, iuserptr, "use_cyclic", 0, NULL, ICON_NONE);
+		uiItemR(col, iuserptr, "use_auto_refresh", UI_ITEM_R_ICON_ONLY, NULL, ICON_NONE);
+	}
 
-	// allqueue(REDRAWBUTSSHADING, 0);
-	// allqueue(REDRAWNODE, 0);
+	col = uiLayoutColumn(layout, 0);
+
+	if (RNA_enum_get(imaptr, "type") == IMA_TYPE_MULTILAYER)
+		uiItemR(col, iuserptr, "layer", 0, NULL, ICON_NONE);
 
-	node->menunr= 0;
 }
 
 static void node_shader_buts_material(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
-	bNode *node= ptr->data;
+	bNode *node = ptr->data;
 	uiLayout *col;
 	
 	uiTemplateID(layout, C, ptr, "material", "MATERIAL_OT_new", NULL, NULL);
 	
 	if (!node->id) return;
 	
-	col= uiLayoutColumn(layout, 0);
+	col = uiLayoutColumn(layout, 0);
 	uiItemR(col, ptr, "use_diffuse", 0, NULL, ICON_NONE);
 	uiItemR(col, ptr, "use_specular", 0, NULL, ICON_NONE);
 	uiItemR(col, ptr, "invert_normal", 0, NULL, ICON_NONE);
@@ -1154,23 +1248,23 @@ static void node_shader_buts_mapping(uiLayout *layout, bContext *UNUSED(C), Poin
 {
 	uiLayout *row;
 	
-	uiItemL(layout, "Location:", ICON_NONE);
-	row= uiLayoutRow(layout, 1);
+	uiItemL(layout, IFACE_("Location:"), ICON_NONE);
+	row = uiLayoutRow(layout, 1);
 	uiItemR(row, ptr, "translation", 0, "", ICON_NONE);
 	
-	uiItemL(layout, "Rotation:", ICON_NONE);
-	row= uiLayoutRow(layout, 1);
+	uiItemL(layout, IFACE_("Rotation:"), ICON_NONE);
+	row = uiLayoutRow(layout, 1);
 	uiItemR(row, ptr, "rotation", 0, "", ICON_NONE);
 	
-	uiItemL(layout, "Scale:", ICON_NONE);
-	row= uiLayoutRow(layout, 1);
+	uiItemL(layout, IFACE_("Scale:"), ICON_NONE);
+	row = uiLayoutRow(layout, 1);
 	uiItemR(row, ptr, "scale", 0, "", ICON_NONE);
 	
-	row= uiLayoutRow(layout, 1);
+	row = uiLayoutRow(layout, 1);
 	uiItemR(row, ptr, "use_min", 0, "Min", ICON_NONE);
 	uiItemR(row, ptr, "min", 0, "", ICON_NONE);
 	
-	row= uiLayoutRow(layout, 1);
+	row = uiLayoutRow(layout, 1);
 	uiItemR(row, ptr, "use_max", 0, "Max", ICON_NONE);
 	uiItemR(row, ptr, "max", 0, "", ICON_NONE);
 }
@@ -1182,40 +1276,49 @@ static void node_shader_buts_vect_math(uiLayout *layout, bContext *UNUSED(C), Po
 
 static void node_shader_buts_geometry(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
-	PointerRNA obptr= CTX_data_pointer_get(C, "active_object");
+	PointerRNA obptr = CTX_data_pointer_get(C, "active_object");
 	uiLayout *col;
 
-	col= uiLayoutColumn(layout, 0);
+	col = uiLayoutColumn(layout, 0);
 
 	if (obptr.data && RNA_enum_get(&obptr, "type") == OB_MESH) {
-		PointerRNA dataptr= RNA_pointer_get(&obptr, "data");
+		PointerRNA dataptr = RNA_pointer_get(&obptr, "data");
 
 		uiItemPointerR(col, ptr, "uv_layer", &dataptr, "uv_textures", "", ICON_NONE);
 		uiItemPointerR(col, ptr, "color_layer", &dataptr, "vertex_colors", "", ICON_NONE);
 	}
 	else {
-		uiItemR(col, ptr, "uv_layer", 0, "UV", ICON_NONE);
-		uiItemR(col, ptr, "color_layer", 0, "VCol", ICON_NONE);
+		uiItemR(col, ptr, "uv_layer", 0, IFACE_("UV"), ICON_NONE);
+		uiItemR(col, ptr, "color_layer", 0, IFACE_("VCol"), ICON_NONE);
 	}
 }
 
 static void node_shader_buts_attribute(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
-	uiItemR(layout, ptr, "attribute_name", 0, "Name", ICON_NONE);
+	uiItemR(layout, ptr, "attribute_name", 0, IFACE_("Name"), ICON_NONE);
 }
 
 static void node_shader_buts_tex_image(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
+	PointerRNA imaptr = RNA_pointer_get(ptr, "image");
+	PointerRNA iuserptr = RNA_pointer_get(ptr, "image_user");
+
 	uiTemplateID(layout, C, ptr, "image", NULL, "IMAGE_OT_open", NULL);
 	uiItemR(layout, ptr, "color_space", 0, "", ICON_NONE);
-}
 
+	node_buts_image_user(layout, C, &imaptr, &iuserptr);
+}
 
 static void node_shader_buts_tex_environment(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
+	PointerRNA imaptr = RNA_pointer_get(ptr, "image");
+	PointerRNA iuserptr = RNA_pointer_get(ptr, "image_user");
+
 	uiTemplateID(layout, C, ptr, "image", NULL, "IMAGE_OT_open", NULL);
 	uiItemR(layout, ptr, "color_space", 0, "", ICON_NONE);
 	uiItemR(layout, ptr, "projection", 0, "", ICON_NONE);
+
+	node_buts_image_user(layout, C, &imaptr, &iuserptr);
 }
 
 static void node_shader_buts_tex_sky(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
@@ -1254,45 +1357,6 @@ static void node_shader_buts_glossy(uiLayout *layout, bContext *UNUSED(C), Point
 	uiItemR(layout, ptr, "distribution", 0, "", ICON_NONE);
 }
 
-static void node_shader_buts_dynamic(uiLayout *layout, bContext *C, PointerRNA *ptr)
-{ 
-	Main *bmain= CTX_data_main(C);
-	uiBlock *block= uiLayoutAbsoluteBlock(layout);
-	bNode *node= ptr->data;
-	bNodeTree *ntree= ptr->id.data;
-	rctf *butr= &node->butr;
-	uiBut *bt;
-	// XXX SpaceNode *snode= curarea->spacedata.first;
-	short dy= (short)butr->ymin;
-	int xoff=0;
-
-	/* B_NODE_EXEC is handled in butspace.c do_node_buts */
-	if (!node->id) {
-			const char *strp;
-			IDnames_to_pupstring(&strp, NULL, "", &(bmain->text), NULL, NULL);
-			node->menunr= 0;
-			bt= uiDefButS(block, MENU, B_NODE_EXEC/*+node->nr*/, strp, 
-							butr->xmin, dy, 19, 19, 
-							&node->menunr, 0, 0, 0, 0, "Browses existing choices");
-			uiButSetFunc(bt, node_browse_text_cb, ntree, node);
-			xoff=19;
-			if (strp) MEM_freeN((void *)strp);
-	}
-	else {
-		bt = uiDefBut(block, BUT, B_NOP, "Update",
-				butr->xmin+xoff, butr->ymin+20, 50, 19,
-				&node->menunr, 0.0, 19.0, 0, 0, "Refresh this node (and all others that use the same script)");
-		uiButSetFunc(bt, node_dynamic_update_cb, ntree, node);
-
-		if (BTST(node->custom1, NODE_DYNAMIC_ERROR)) {
-			// UI_ThemeColor(TH_REDALERT);
-			// XXX ui_rasterpos_safe(butr->xmin + xoff, butr->ymin + 5, snode->aspect);
-			// XXX snode_drawstring(snode, "Error! Check console...", butr->xmax - butr->xmin);
-			;
-		}
-	}
-}
-
 /* only once called */
 static void node_shader_set_butfunc(bNodeType *ntype)
 {
@@ -1301,77 +1365,74 @@ static void node_shader_set_butfunc(bNodeType *ntype)
 
 		case SH_NODE_MATERIAL:
 		case SH_NODE_MATERIAL_EXT:
-			ntype->uifunc= node_shader_buts_material;
+			ntype->uifunc = node_shader_buts_material;
 			break;
 		case SH_NODE_TEXTURE:
-			ntype->uifunc= node_buts_texture;
+			ntype->uifunc = node_buts_texture;
 			break;
 		case SH_NODE_NORMAL:
-			ntype->uifunc= node_buts_normal;
+			ntype->uifunc = node_buts_normal;
 			break;
 		case SH_NODE_CURVE_VEC:
-			ntype->uifunc= node_buts_curvevec;
+			ntype->uifunc = node_buts_curvevec;
 			break;
 		case SH_NODE_CURVE_RGB:
-			ntype->uifunc= node_buts_curvecol;
+			ntype->uifunc = node_buts_curvecol;
 			break;
 		case SH_NODE_MAPPING:
-			ntype->uifunc= node_shader_buts_mapping;
+			ntype->uifunc = node_shader_buts_mapping;
 			break;
 		case SH_NODE_VALUE:
-			ntype->uifunc= node_buts_value;
+			ntype->uifunc = node_buts_value;
 			break;
 		case SH_NODE_RGB:
-			ntype->uifunc= node_buts_rgb;
+			ntype->uifunc = node_buts_rgb;
 			break;
 		case SH_NODE_MIX_RGB:
-			ntype->uifunc= node_buts_mix_rgb;
+			ntype->uifunc = node_buts_mix_rgb;
 			break;
 		case SH_NODE_VALTORGB:
-			ntype->uifunc= node_buts_colorramp;
+			ntype->uifunc = node_buts_colorramp;
 			break;
 		case SH_NODE_MATH: 
-			ntype->uifunc= node_buts_math;
+			ntype->uifunc = node_buts_math;
 			break; 
 		case SH_NODE_VECT_MATH: 
-			ntype->uifunc= node_shader_buts_vect_math;
+			ntype->uifunc = node_shader_buts_vect_math;
 			break; 
 		case SH_NODE_GEOMETRY:
-			ntype->uifunc= node_shader_buts_geometry;
+			ntype->uifunc = node_shader_buts_geometry;
 			break;
 		case SH_NODE_ATTRIBUTE:
-			ntype->uifunc= node_shader_buts_attribute;
+			ntype->uifunc = node_shader_buts_attribute;
 			break;
 		case SH_NODE_TEX_SKY:
-			ntype->uifunc= node_shader_buts_tex_sky;
+			ntype->uifunc = node_shader_buts_tex_sky;
 			break;
 		case SH_NODE_TEX_IMAGE:
-			ntype->uifunc= node_shader_buts_tex_image;
+			ntype->uifunc = node_shader_buts_tex_image;
 			break;
 		case SH_NODE_TEX_ENVIRONMENT:
-			ntype->uifunc= node_shader_buts_tex_environment;
+			ntype->uifunc = node_shader_buts_tex_environment;
 			break;
 		case SH_NODE_TEX_GRADIENT:
-			ntype->uifunc= node_shader_buts_tex_gradient;
+			ntype->uifunc = node_shader_buts_tex_gradient;
 			break;
 		case SH_NODE_TEX_MAGIC:
-			ntype->uifunc= node_shader_buts_tex_magic;
+			ntype->uifunc = node_shader_buts_tex_magic;
 			break;
 		case SH_NODE_TEX_WAVE:
-			ntype->uifunc= node_shader_buts_tex_wave;
+			ntype->uifunc = node_shader_buts_tex_wave;
 			break;
 		case SH_NODE_TEX_MUSGRAVE:
-			ntype->uifunc= node_shader_buts_tex_musgrave;
+			ntype->uifunc = node_shader_buts_tex_musgrave;
 			break;
 		case SH_NODE_TEX_VORONOI:
-			ntype->uifunc= node_shader_buts_tex_voronoi;
+			ntype->uifunc = node_shader_buts_tex_voronoi;
 			break;
 		case SH_NODE_BSDF_GLOSSY:
 		case SH_NODE_BSDF_GLASS:
-			ntype->uifunc= node_shader_buts_glossy;
-			break;
-		case NODE_DYNAMIC:
-			ntype->uifunc= node_shader_buts_dynamic;
+			ntype->uifunc = node_shader_buts_glossy;
 			break;
 	}
 }
@@ -1380,60 +1441,28 @@ static void node_shader_set_butfunc(bNodeType *ntype)
 
 static void node_composit_buts_image(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
-	uiLayout *col;
-	bNode *node= ptr->data;
-	PointerRNA imaptr;
-	PropertyRNA *prop;
-	int source;
+	bNode *node = ptr->data;
+	PointerRNA imaptr, iuserptr;
 	
 	uiTemplateID(layout, C, ptr, "image", NULL, "IMAGE_OT_open", NULL);
 	
 	if (!node->id) return;
 	
-	prop = RNA_struct_find_property(ptr, "image");
-	if (!prop || RNA_property_type(prop) != PROP_POINTER) return;
-	imaptr= RNA_property_pointer_get(ptr, prop);
-	
-	col= uiLayoutColumn(layout, 0);
+	imaptr = RNA_pointer_get(ptr, "image");
+	RNA_pointer_create((ID *)ptr->id.data, &RNA_ImageUser, node->storage, &iuserptr);
 	
-	uiItemR(col, &imaptr, "source", 0, NULL, ICON_NONE);
-	
-	source= RNA_enum_get(&imaptr, "source");
-
-	if (source == IMA_SRC_SEQUENCE) {
-		/* don't use iuser->framenr directly because it may not be updated if auto-refresh is off */
-		Scene *scene= CTX_data_scene(C);
-		ImageUser *iuser= node->storage;
-		char numstr[32];
-		const int framenr= BKE_image_user_frame_get(iuser, CFRA, 0);
-		BLI_snprintf(numstr, sizeof(numstr), "Frame: %d", framenr);
-		uiItemL(layout, numstr, ICON_NONE);
-	}
-
-	if (ELEM(source, IMA_SRC_SEQUENCE, IMA_SRC_MOVIE)) {
-		col= uiLayoutColumn(layout, 1);
-		uiItemR(col, ptr, "frame_duration", 0, NULL, ICON_NONE);
-		uiItemR(col, ptr, "frame_start", 0, NULL, ICON_NONE);
-		uiItemR(col, ptr, "frame_offset", 0, NULL, ICON_NONE);
-		uiItemR(col, ptr, "use_cyclic", 0, NULL, ICON_NONE);
-		uiItemR(col, ptr, "use_auto_refresh", UI_ITEM_R_ICON_ONLY, NULL, ICON_NONE);
-	}
-
-	col= uiLayoutColumn(layout, 0);
-
-	if (RNA_enum_get(&imaptr, "type")== IMA_TYPE_MULTILAYER)
-		uiItemR(col, ptr, "layer", 0, NULL, ICON_NONE);
+	node_buts_image_user(layout, C, &imaptr, &iuserptr);
 }
 
 static void node_composit_buts_renderlayers(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
-	bNode *node= ptr->data;
+	bNode *node = ptr->data;
 	uiLayout *col, *row;
 	PointerRNA op_ptr;
 	PointerRNA scn_ptr;
 	PropertyRNA *prop;
 	const char *layer_name;
-	char scene_name[MAX_ID_NAME-2];
+	char scene_name[MAX_ID_NAME - 2];
 	wmOperatorType *ot = WM_operatortype_find("RENDER_OT_render", 1);
 
 	BLI_assert(ot != 0);
@@ -1442,7 +1471,7 @@ static void node_composit_buts_renderlayers(uiLayout *layout, bContext *C, Point
 	
 	if (!node->id) return;
 
-	col= uiLayoutColumn(layout, 0);
+	col = uiLayoutColumn(layout, 0);
 	row = uiLayoutRow(col, 0);
 	uiItemR(row, ptr, "layer", 0, "", ICON_NONE);
 	
@@ -1465,10 +1494,10 @@ static void node_composit_buts_blur(uiLayout *layout, bContext *UNUSED(C), Point
 {
 	uiLayout *col, *row;
 	
-	col= uiLayoutColumn(layout, 0);
+	col = uiLayoutColumn(layout, 0);
 	
 	uiItemR(col, ptr, "filter_type", 0, "", ICON_NONE);
-	if (RNA_enum_get(ptr, "filter_type")!= R_FILTER_FAST_GAUSS) {
+	if (RNA_enum_get(ptr, "filter_type") != R_FILTER_FAST_GAUSS) {
 		uiItemR(col, ptr, "use_bokeh", 0, NULL, ICON_NONE);
 		uiItemR(col, ptr, "use_gamma_correction", 0, NULL, ICON_NONE);
 	}
@@ -1476,18 +1505,18 @@ static void node_composit_buts_blur(uiLayout *layout, bContext *UNUSED(C), Point
 	uiItemR(col, ptr, "use_relative", 0, NULL, ICON_NONE);
 	
 	if (RNA_boolean_get(ptr, "use_relative")) {
-		uiItemL(col, "Aspect Correction", 0);
-		row= uiLayoutRow(layout, 1);
+		uiItemL(col, IFACE_("Aspect Correction"), 0);
+		row = uiLayoutRow(layout, 1);
 		uiItemR(row, ptr, "aspect_correction", UI_ITEM_R_EXPAND, NULL, 0);
 		
-		col= uiLayoutColumn(layout, 1);
-		uiItemR(col, ptr, "factor_x", 0, "X", ICON_NONE);
-		uiItemR(col, ptr, "factor_y", 0, "Y", ICON_NONE);
+		col = uiLayoutColumn(layout, 1);
+		uiItemR(col, ptr, "factor_x", 0, IFACE_("X"), ICON_NONE);
+		uiItemR(col, ptr, "factor_y", 0, IFACE_("Y"), ICON_NONE);
 	}
 	else {
-		col= uiLayoutColumn(layout, 1);
-		uiItemR(col, ptr, "size_x", 0, "X", ICON_NONE);
-		uiItemR(col, ptr, "size_y", 0, "Y", ICON_NONE);
+		col = uiLayoutColumn(layout, 1);
+		uiItemR(col, ptr, "size_x", 0, IFACE_("X"), ICON_NONE);
+		uiItemR(col, ptr, "size_y", 0, IFACE_("Y"), ICON_NONE);
 	}
 }
 
@@ -1498,14 +1527,14 @@ static void node_composit_buts_dblur(uiLayout *layout, bContext *UNUSED(C), Poin
 	uiItemR(layout, ptr, "iterations", 0, NULL, ICON_NONE);
 	uiItemR(layout, ptr, "use_wrap", 0, NULL, ICON_NONE);
 	
-	col= uiLayoutColumn(layout, 1);
-	uiItemL(col, "Center:", ICON_NONE);
-	uiItemR(col, ptr, "center_x", 0, "X", ICON_NONE);
-	uiItemR(col, ptr, "center_y", 0, "Y", ICON_NONE);
+	col = uiLayoutColumn(layout, 1);
+	uiItemL(col, IFACE_("Center:"), ICON_NONE);
+	uiItemR(col, ptr, "center_x", 0, IFACE_("X"), ICON_NONE);
+	uiItemR(col, ptr, "center_y", 0, IFACE_("Y"), ICON_NONE);
 	
 	uiItemS(layout);
 	
-	col= uiLayoutColumn(layout, 1);
+	col = uiLayoutColumn(layout, 1);
 	uiItemR(col, ptr, "distance", 0, NULL, ICON_NONE);
 	uiItemR(col, ptr, "angle", 0, NULL, ICON_NONE);
 	
@@ -1519,7 +1548,7 @@ static void node_composit_buts_bilateralblur(uiLayout *layout, bContext *UNUSED(
 {	
 	uiLayout *col;
 	
-	col= uiLayoutColumn(layout, 1);
+	col = uiLayoutColumn(layout, 1);
 	uiItemR(col, ptr, "iterations", 0, NULL, ICON_NONE);
 	uiItemR(col, ptr, "sigma_color", 0, NULL, ICON_NONE);
 	uiItemR(col, ptr, "sigma_space", 0, NULL, ICON_NONE);
@@ -1529,8 +1558,8 @@ static void node_composit_buts_defocus(uiLayout *layout, bContext *UNUSED(C), Po
 {
 	uiLayout *sub, *col;
 	
-	col= uiLayoutColumn(layout, 0);
-	uiItemL(col, "Bokeh Type:", ICON_NONE);
+	col = uiLayoutColumn(layout, 0);
+	uiItemL(col, IFACE_("Bokeh Type:"), ICON_NONE);
 	uiItemR(col, ptr, "bokeh", 0, "", ICON_NONE);
 	uiItemR(col, ptr, "angle", 0, NULL, ICON_NONE);
 
@@ -1562,27 +1591,27 @@ static void node_composit_buts_glare(uiLayout *layout, bContext *UNUSED(C), Poin
 	uiItemR(layout, ptr, "glare_type", 0, "", ICON_NONE);
 	uiItemR(layout, ptr, "quality", 0, "", ICON_NONE);
 
-	if (RNA_enum_get(ptr, "glare_type")!= 1) {
+	if (RNA_enum_get(ptr, "glare_type") != 1) {
 		uiItemR(layout, ptr, "iterations", 0, NULL, ICON_NONE);
 	
-		if (RNA_enum_get(ptr, "glare_type")!= 0) 
+		if (RNA_enum_get(ptr, "glare_type") != 0)
 			uiItemR(layout, ptr, "color_modulation", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	}
 	
 	uiItemR(layout, ptr, "mix", 0, NULL, ICON_NONE);
 	uiItemR(layout, ptr, "threshold", 0, NULL, ICON_NONE);
 
-	if (RNA_enum_get(ptr, "glare_type")== 2) {
+	if (RNA_enum_get(ptr, "glare_type") == 2) {
 		uiItemR(layout, ptr, "streaks", 0, NULL, ICON_NONE);
 		uiItemR(layout, ptr, "angle_offset", 0, NULL, ICON_NONE);
 	}
-	if (RNA_enum_get(ptr, "glare_type")== 0 || RNA_enum_get(ptr, "glare_type")== 2) {
+	if (RNA_enum_get(ptr, "glare_type") == 0 || RNA_enum_get(ptr, "glare_type") == 2) {
 		uiItemR(layout, ptr, "fade", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 		
-		if (RNA_enum_get(ptr, "glare_type")== 0) 
+		if (RNA_enum_get(ptr, "glare_type") == 0)
 			uiItemR(layout, ptr, "use_rotate_45", 0, NULL, ICON_NONE);
 	}
-	if (RNA_enum_get(ptr, "glare_type")== 1) {
+	if (RNA_enum_get(ptr, "glare_type") == 1) {
 		uiItemR(layout, ptr, "size", 0, NULL, ICON_NONE);
 	}
 }
@@ -1593,7 +1622,7 @@ static void node_composit_buts_tonemap(uiLayout *layout, bContext *UNUSED(C), Po
 
 	col = uiLayoutColumn(layout, 0);
 	uiItemR(col, ptr, "tonemap_type", 0, "", ICON_NONE);
-	if (RNA_enum_get(ptr, "tonemap_type")== 0) {
+	if (RNA_enum_get(ptr, "tonemap_type") == 0) {
 		uiItemR(col, ptr, "key", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 		uiItemR(col, ptr, "offset", 0, NULL, ICON_NONE);
 		uiItemR(col, ptr, "gamma", 0, NULL, ICON_NONE);
@@ -1610,7 +1639,7 @@ static void node_composit_buts_lensdist(uiLayout *layout, bContext *UNUSED(C), P
 {
 	uiLayout *col;
 
-	col= uiLayoutColumn(layout, 0);
+	col = uiLayoutColumn(layout, 0);
 	uiItemR(col, ptr, "use_projector", 0, NULL, ICON_NONE);
 
 	col = uiLayoutColumn(col, 0);
@@ -1623,14 +1652,14 @@ static void node_composit_buts_vecblur(uiLayout *layout, bContext *UNUSED(C), Po
 {
 	uiLayout *col;
 	
-	col= uiLayoutColumn(layout, 0);
+	col = uiLayoutColumn(layout, 0);
 	uiItemR(col, ptr, "samples", 0, NULL, ICON_NONE);
-	uiItemR(col, ptr, "factor", 0, "Blur", ICON_NONE);
+	uiItemR(col, ptr, "factor", 0, IFACE_("Blur"), ICON_NONE);
 	
-	col= uiLayoutColumn(layout, 1);
-	uiItemL(col, "Speed:", ICON_NONE);
-	uiItemR(col, ptr, "speed_min", 0, "Min", ICON_NONE);
-	uiItemR(col, ptr, "speed_max", 0, "Max", ICON_NONE);
+	col = uiLayoutColumn(layout, 1);
+	uiItemL(col, IFACE_("Speed:"), ICON_NONE);
+	uiItemR(col, ptr, "speed_min", 0, IFACE_("Min"), ICON_NONE);
+	uiItemR(col, ptr, "speed_max", 0, IFACE_("Max"), ICON_NONE);
 
 	uiItemR(layout, ptr, "use_curved", 0, NULL, ICON_NONE);
 }
@@ -1652,18 +1681,18 @@ static void node_composit_buts_crop(uiLayout *layout, bContext *UNUSED(C), Point
 	uiItemR(layout, ptr, "use_crop_size", 0, NULL, ICON_NONE);
 	uiItemR(layout, ptr, "relative", 0, NULL, ICON_NONE);
 
-	col= uiLayoutColumn(layout, 1);
+	col = uiLayoutColumn(layout, 1);
 	if (RNA_boolean_get(ptr, "relative")) {
-		uiItemR(col, ptr, "rel_min_x", 0, "Left", ICON_NONE);
-		uiItemR(col, ptr, "rel_max_x", 0, "Right", ICON_NONE);
-		uiItemR(col, ptr, "rel_min_y", 0, "Up", ICON_NONE);
-		uiItemR(col, ptr, "rel_max_y", 0, "Down", ICON_NONE);
+		uiItemR(col, ptr, "rel_min_x", 0, IFACE_("Left"), ICON_NONE);
+		uiItemR(col, ptr, "rel_max_x", 0, IFACE_("Right"), ICON_NONE);
+		uiItemR(col, ptr, "rel_min_y", 0, IFACE_("Up"), ICON_NONE);
+		uiItemR(col, ptr, "rel_max_y", 0, IFACE_("Down"), ICON_NONE);
 	}
 	else {
-		uiItemR(col, ptr, "min_x", 0, "Left", ICON_NONE);
-		uiItemR(col, ptr, "max_x", 0, "Right", ICON_NONE);
-		uiItemR(col, ptr, "min_y", 0, "Up", ICON_NONE);
-		uiItemR(col, ptr, "max_y", 0, "Down", ICON_NONE);
+		uiItemR(col, ptr, "min_x", 0, IFACE_("Left"), ICON_NONE);
+		uiItemR(col, ptr, "max_x", 0, IFACE_("Right"), ICON_NONE);
+		uiItemR(col, ptr, "min_y", 0, IFACE_("Up"), ICON_NONE);
+		uiItemR(col, ptr, "max_y", 0, IFACE_("Down"), ICON_NONE);
 	}
 }
 
@@ -1671,8 +1700,8 @@ static void node_composit_buts_splitviewer(uiLayout *layout, bContext *UNUSED(C)
 {
 	uiLayout *row, *col;
 	
-	col= uiLayoutColumn(layout, 0);
-	row= uiLayoutRow(col, 0);
+	col = uiLayoutColumn(layout, 0);
+	row = uiLayoutRow(col, 0);
 	uiItemR(row, ptr, "axis", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
 	uiItemR(col, ptr, "factor", 0, NULL, ICON_NONE);
 }
@@ -1681,11 +1710,11 @@ static void node_composit_buts_double_edge_mask(uiLayout *layout, bContext *UNUS
 {
 	uiLayout *col;
 
-	col= uiLayoutColumn(layout, 0);
+	col = uiLayoutColumn(layout, 0);
 
-	uiItemL(col, "Inner Edge:", ICON_NONE);
+	uiItemL(col, IFACE_("Inner Edge:"), ICON_NONE);
 	uiItemR(col, ptr, "inner_mode", 0, "", ICON_NONE);
-	uiItemL(col, "Buffer Edge:", ICON_NONE);
+	uiItemL(col, IFACE_("Buffer Edge:"), ICON_NONE);
 	uiItemR(col, ptr, "edge_mode", 0, "", ICON_NONE);
 }
 
@@ -1742,7 +1771,7 @@ static void node_composit_buts_dilateerode(uiLayout *layout, bContext *UNUSED(C)
 {
 	uiItemR(layout, ptr, "type", 0, NULL, ICON_NONE);
 	uiItemR(layout, ptr, "distance", 0, NULL, ICON_NONE);
-	if (RNA_enum_get(ptr, "type") == CMP_NODE_DILATEERODE_DISTANCE) {
+	if (RNA_enum_get(ptr, "type") == CMP_NODE_DILATEERODE_DISTANCE_THRESH) {
 		uiItemR(layout, ptr, "edge", 0, NULL, ICON_NONE);
 	}
 }
@@ -1762,8 +1791,8 @@ static void node_composit_buts_distance_matte(uiLayout *layout, bContext *UNUSED
 	
 	col = uiLayoutColumn(layout, 1);
    
-	uiItemL(layout, "Color Space:", ICON_NONE);
-	row= uiLayoutRow(layout, 0);
+	uiItemL(layout, IFACE_("Color Space:"), ICON_NONE);
+	row = uiLayoutRow(layout, 0);
 	uiItemR(row, ptr, "channel", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
 
 	uiItemR(col, ptr, "tolerance", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
@@ -1774,16 +1803,16 @@ static void node_composit_buts_color_spill(uiLayout *layout, bContext *UNUSED(C)
 {
 	uiLayout *row, *col;
 	
-	uiItemL(layout, "Despill Channel:", ICON_NONE);
+	uiItemL(layout, IFACE_("Despill Channel:"), ICON_NONE);
 	row = uiLayoutRow(layout, 0);
 	uiItemR(row, ptr, "channel", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
 
-	col= uiLayoutColumn(layout, 0);
+	col = uiLayoutColumn(layout, 0);
 	uiItemR(col, ptr, "limit_method", 0, NULL, ICON_NONE);
 
-	if (RNA_enum_get(ptr, "limit_method")==0) {
-		uiItemL(col, "Limiting Channel:", ICON_NONE);
-		row=uiLayoutRow(col, 0);
+	if (RNA_enum_get(ptr, "limit_method") == 0) {
+		uiItemL(col, IFACE_("Limiting Channel:"), ICON_NONE);
+		row = uiLayoutRow(col, 0);
 		uiItemR(row, ptr, "limit_channel", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
 	}
 
@@ -1800,11 +1829,11 @@ static void node_composit_buts_chroma_matte(uiLayout *layout, bContext *UNUSED(C
 {
 	uiLayout *col;
 	
-	col= uiLayoutColumn(layout, 0);
+	col = uiLayoutColumn(layout, 0);
 	uiItemR(col, ptr, "tolerance", 0, NULL, ICON_NONE);
 	uiItemR(col, ptr, "threshold", 0, NULL, ICON_NONE);
 	
-	col= uiLayoutColumn(layout, 1);
+	col = uiLayoutColumn(layout, 1);
 	/*uiItemR(col, ptr, "lift", UI_ITEM_R_SLIDER, NULL, ICON_NONE);  Removed for now */
 	uiItemR(col, ptr, "gain", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	/*uiItemR(col, ptr, "shadow_adjust", UI_ITEM_R_SLIDER, NULL, ICON_NONE);  Removed for now*/
@@ -1814,7 +1843,7 @@ static void node_composit_buts_color_matte(uiLayout *layout, bContext *UNUSED(C)
 {
 	uiLayout *col;
 	
-	col= uiLayoutColumn(layout, 1);
+	col = uiLayoutColumn(layout, 1);
 	uiItemR(col, ptr, "color_hue", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	uiItemR(col, ptr, "color_saturation", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	uiItemR(col, ptr, "color_value", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
@@ -1824,21 +1853,21 @@ static void node_composit_buts_channel_matte(uiLayout *layout, bContext *UNUSED(
 {	
 	uiLayout *col, *row;
 
-	uiItemL(layout, "Color Space:", ICON_NONE);
-	row= uiLayoutRow(layout, 0);
+	uiItemL(layout, IFACE_("Color Space:"), ICON_NONE);
+	row = uiLayoutRow(layout, 0);
 	uiItemR(row, ptr, "color_space", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
 
-	col=uiLayoutColumn(layout, 0);
-	uiItemL(col, "Key Channel:", ICON_NONE);
-	row= uiLayoutRow(col, 0);
+	col = uiLayoutColumn(layout, 0);
+	uiItemL(col, IFACE_("Key Channel:"), ICON_NONE);
+	row = uiLayoutRow(col, 0);
 	uiItemR(row, ptr, "matte_channel", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
 
 	col = uiLayoutColumn(layout, 0);
 
 	uiItemR(col, ptr, "limit_method", 0, NULL, ICON_NONE);
-	if (RNA_enum_get(ptr, "limit_method")==0) {
-		uiItemL(col, "Limiting Channel:", ICON_NONE);
-		row=uiLayoutRow(col, 0);
+	if (RNA_enum_get(ptr, "limit_method") == 0) {
+		uiItemL(col, IFACE_("Limiting Channel:"), ICON_NONE);
+		row = uiLayoutRow(col, 0);
 		uiItemR(row, ptr, "limit_channel", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
 	}
 
@@ -1850,7 +1879,7 @@ static void node_composit_buts_luma_matte(uiLayout *layout, bContext *UNUSED(C),
 {
 	uiLayout *col;
 	
-	col= uiLayoutColumn(layout, 1);
+	col = uiLayoutColumn(layout, 1);
 	uiItemR(col, ptr, "limit_max", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	uiItemR(col, ptr, "limit_min", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 }
@@ -1868,8 +1897,8 @@ static void node_composit_buts_id_mask(uiLayout *layout, bContext *UNUSED(C), Po
 
 /* draw function for file output node sockets, displays only sub-path and format, no value button */
 static void node_draw_input_file_output(const bContext *C, uiBlock *block,
-                                         bNodeTree *ntree, bNode *node, bNodeSocket *sock,
-                                         const char *UNUSED(name), int x, int y, int width)
+                                        bNodeTree *ntree, bNode *node, bNodeSocket *sock,
+                                        const char *UNUSED(name), int x, int y, int width)
 {
 	uiLayout *layout, *row;
 	PointerRNA nodeptr, inputptr, imfptr;
@@ -1877,7 +1906,7 @@ static void node_draw_input_file_output(const bContext *C, uiBlock *block,
 	int rx, ry;
 	RNA_pointer_create(&ntree->id, &RNA_Node, node, &nodeptr);
 	
-	layout = uiBlockLayout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, x, y+NODE_DY, width, 20, UI_GetStyle());
+	layout = uiBlockLayout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, x, y + NODE_DY, width, 20, UI_GetStyle());
 	row = uiLayoutRow(layout, 0);
 	
 	imfptr = RNA_pointer_get(&nodeptr, "format");
@@ -1900,7 +1929,7 @@ static void node_draw_input_file_output(const bContext *C, uiBlock *block,
 			imfptr = RNA_pointer_get(&inputptr, "format");
 		
 		imtype_prop = RNA_struct_find_property(&imfptr, "file_format");
-		RNA_property_enum_name((bContext*)C, &imfptr, imtype_prop, RNA_property_enum_get(&imfptr, imtype_prop), &imtype_name);
+		RNA_property_enum_name((bContext *)C, &imfptr, imtype_prop, RNA_property_enum_get(&imfptr, imtype_prop), &imtype_name);
 		uiBlockSetEmboss(block, UI_EMBOSSP);
 		uiItemL(row, imtype_name, 0);
 		uiBlockSetEmboss(block, UI_EMBOSSN);
@@ -1914,9 +1943,9 @@ static void node_composit_buts_file_output(uiLayout *layout, bContext *UNUSED(C)
 	int multilayer = (RNA_enum_get(&imfptr, "file_format") == R_IMF_IMTYPE_MULTILAYER);
 	
 	if (multilayer)
-		uiItemL(layout, "Path:", 0);
+		uiItemL(layout, IFACE_("Path:"), 0);
 	else
-		uiItemL(layout, "Base Path:", 0);
+		uiItemL(layout, IFACE_("Base Path:"), 0);
 	uiItemR(layout, ptr, "base_path", 0, "", ICON_NONE);
 }
 static void node_composit_buts_file_output_details(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -1932,7 +1961,7 @@ static void node_composit_buts_file_output_details(uiLayout *layout, bContext *C
 	
 	uiItemS(layout);
 	
-	uiItemO(layout, "Add Input", ICON_ZOOMIN, "NODE_OT_output_file_add_socket");
+	uiItemO(layout, IFACE_("Add Input"), ICON_ZOOMIN, "NODE_OT_output_file_add_socket");
 	
 	active_index = RNA_int_get(ptr, "active_input_index");
 	/* using different collection properties if multilayer format is enabled */
@@ -1958,7 +1987,7 @@ static void node_composit_buts_file_output_details(uiLayout *layout, bContext *C
 			uiLayout *row, *col;
 			col = uiLayoutColumn(layout, 1);
 			
-			uiItemL(col, "Layer:", 0);
+			uiItemL(col, IFACE_("Layer:"), 0);
 			row = uiLayoutRow(col, 0);
 			uiItemR(row, &active_input_ptr, "name", 0, "", 0);
 			uiItemFullO(row, "NODE_OT_output_file_remove_active_socket", "", ICON_X, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_R_ICON_ONLY);
@@ -1967,7 +1996,7 @@ static void node_composit_buts_file_output_details(uiLayout *layout, bContext *C
 			uiLayout *row, *col;
 			col = uiLayoutColumn(layout, 1);
 			
-			uiItemL(col, "File Path:", 0);
+			uiItemL(col, IFACE_("File Path:"), 0);
 			row = uiLayoutRow(col, 0);
 			uiItemR(row, &active_input_ptr, "path", 0, "", 0);
 			uiItemFullO(row, "NODE_OT_output_file_remove_active_socket", "", ICON_X, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_R_ICON_ONLY);
@@ -1976,10 +2005,10 @@ static void node_composit_buts_file_output_details(uiLayout *layout, bContext *C
 			imfptr = RNA_pointer_get(&active_input_ptr, "format");
 			
 			col = uiLayoutColumn(layout, 1);
-			uiItemL(col, "Format:", 0);
+			uiItemL(col, IFACE_("Format:"), 0);
 			uiItemR(col, &active_input_ptr, "use_node_format", 0, NULL, 0);
 			
-			col= uiLayoutColumn(layout, 0);
+			col = uiLayoutColumn(layout, 0);
 			uiLayoutSetActive(col, RNA_boolean_get(&active_input_ptr, "use_node_format") == FALSE);
 			uiTemplateImageSettings(col, &imfptr);
 		}
@@ -1989,6 +2018,14 @@ static void node_composit_buts_file_output_details(uiLayout *layout, bContext *C
 static void node_composit_buts_scale(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
 	uiItemR(layout, ptr, "space", 0, "", ICON_NONE);
+
+	if (RNA_enum_get(ptr, "space") == CMP_SCALE_RENDERPERCENT) {
+		uiLayout *row;
+		uiItemR(layout, ptr, "frame_method", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
+		row = uiLayoutRow(layout, TRUE);
+		uiItemR(row, ptr, "offset_x", 0, "X", ICON_NONE);
+		uiItemR(row, ptr, "offset_y", 0, "Y", ICON_NONE);
+	}
 }
 
 static void node_composit_buts_rotate(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
@@ -2000,7 +2037,7 @@ static void node_composit_buts_invert(uiLayout *layout, bContext *UNUSED(C), Poi
 {
 	uiLayout *col;
 	
-	col= uiLayoutColumn(layout, 0);
+	col = uiLayoutColumn(layout, 0);
 	uiItemR(col, ptr, "invert_rgb", 0, NULL, ICON_NONE);
 	uiItemR(col, ptr, "invert_alpha", 0, NULL, ICON_NONE);
 }
@@ -2021,7 +2058,7 @@ static void node_composit_buts_colorbalance(uiLayout *layout, bContext *UNUSED(C
 	
 	uiItemR(layout, ptr, "correction_method", 0, NULL, ICON_NONE);
 	
-	if (RNA_enum_get(ptr, "correction_method")== 0) {
+	if (RNA_enum_get(ptr, "correction_method") == 0) {
 	
 		split = uiLayoutSplit(layout, 0, 0);
 		col = uiLayoutColumn(split, 0);
@@ -2064,9 +2101,9 @@ static void node_composit_buts_colorbalance_but(uiLayout *layout, bContext *UNUS
 {
 	uiItemR(layout, ptr, "correction_method", 0, NULL, ICON_NONE);
 
-	if (RNA_enum_get(ptr, "correction_method")== 0) {
+	if (RNA_enum_get(ptr, "correction_method") == 0) {
 
-	uiTemplateColorWheel(layout, ptr, "lift", 1, 1, 0, 1);
+		uiTemplateColorWheel(layout, ptr, "lift", 1, 1, 0, 1);
 		uiItemR(layout, ptr, "lift", 0, NULL, ICON_NONE);
 
 		uiTemplateColorWheel(layout, ptr, "gamma", 1, 1, 1, 1);
@@ -2105,7 +2142,7 @@ static void node_composit_buts_movieclip(uiLayout *layout, bContext *C, PointerR
 
 static void node_composit_buts_stabilize2d(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
-	bNode *node= ptr->data;
+	bNode *node = ptr->data;
 
 	uiTemplateID(layout, C, ptr, "clip", NULL, "CLIP_OT_open", NULL);
 
@@ -2122,7 +2159,7 @@ static void node_composit_buts_transform(uiLayout *layout, bContext *UNUSED(C),
 
 static void node_composit_buts_moviedistortion(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
-	bNode *node= ptr->data;
+	bNode *node = ptr->data;
 
 	uiTemplateID(layout, C, ptr, "clip", NULL, "CLIP_OT_open", NULL);
 
@@ -2143,14 +2180,14 @@ static void node_composit_buts_colorcorrection(uiLayout *layout, bContext *UNUSE
 
 	row = uiLayoutRow(layout, 0);
 	uiItemL(row, "", 0);
-	uiItemL(row, "Saturation", 0);
-	uiItemL(row, "Contrast", 0);
-	uiItemL(row, "Gamma", 0);
-	uiItemL(row, "Gain", 0);
-	uiItemL(row, "Lift", 0);
+	uiItemL(row, IFACE_("Saturation"), 0);
+	uiItemL(row, IFACE_("Contrast"), 0);
+	uiItemL(row, IFACE_("Gamma"), 0);
+	uiItemL(row, IFACE_("Gain"), 0);
+	uiItemL(row, IFACE_("Lift"), 0);
 
 	row = uiLayoutRow(layout, 0);
-	uiItemL(row, "Master", 0);
+	uiItemL(row, IFACE_("Master"), 0);
 	uiItemR(row, ptr, "master_saturation", UI_ITEM_R_SLIDER, "", ICON_NONE);
 	uiItemR(row, ptr, "master_contrast", UI_ITEM_R_SLIDER, "", ICON_NONE);
 	uiItemR(row, ptr, "master_gamma", UI_ITEM_R_SLIDER, "", ICON_NONE);
@@ -2158,7 +2195,7 @@ static void node_composit_buts_colorcorrection(uiLayout *layout, bContext *UNUSE
 	uiItemR(row, ptr, "master_lift", UI_ITEM_R_SLIDER, "", ICON_NONE);
 
 	row = uiLayoutRow(layout, 0);
-	uiItemL(row, "Highlights", 0);
+	uiItemL(row, IFACE_("Highlights"), 0);
 	uiItemR(row, ptr, "highlights_saturation", UI_ITEM_R_SLIDER, "", ICON_NONE);
 	uiItemR(row, ptr, "highlights_contrast", UI_ITEM_R_SLIDER, "", ICON_NONE);
 	uiItemR(row, ptr, "highlights_gamma", UI_ITEM_R_SLIDER, "", ICON_NONE);
@@ -2166,7 +2203,7 @@ static void node_composit_buts_colorcorrection(uiLayout *layout, bContext *UNUSE
 	uiItemR(row, ptr, "highlights_lift", UI_ITEM_R_SLIDER, "", ICON_NONE);
 
 	row = uiLayoutRow(layout, 0);
-	uiItemL(row, "Midtones", 0);
+	uiItemL(row, IFACE_("Midtones"), 0);
 	uiItemR(row, ptr, "midtones_saturation", UI_ITEM_R_SLIDER, "", ICON_NONE);
 	uiItemR(row, ptr, "midtones_contrast", UI_ITEM_R_SLIDER, "", ICON_NONE);
 	uiItemR(row, ptr, "midtones_gamma", UI_ITEM_R_SLIDER, "", ICON_NONE);
@@ -2174,7 +2211,7 @@ static void node_composit_buts_colorcorrection(uiLayout *layout, bContext *UNUSE
 	uiItemR(row, ptr, "midtones_lift", UI_ITEM_R_SLIDER, "", ICON_NONE);
 
 	row = uiLayoutRow(layout, 0);
-	uiItemL(row, "Shadows", 0);
+	uiItemL(row, IFACE_("Shadows"), 0);
 	uiItemR(row, ptr, "shadows_saturation", UI_ITEM_R_SLIDER, "", ICON_NONE);
 	uiItemR(row, ptr, "shadows_contrast", UI_ITEM_R_SLIDER, "", ICON_NONE);
 	uiItemR(row, ptr, "shadows_gamma", UI_ITEM_R_SLIDER, "", ICON_NONE);
@@ -2186,7 +2223,8 @@ static void node_composit_buts_colorcorrection(uiLayout *layout, bContext *UNUSE
 	uiItemR(row, ptr, "midtones_end", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 }
 
-static void node_composit_buts_colorcorrection_but(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) {
+static void node_composit_buts_colorcorrection_but(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
+{
 	uiLayout *row;
 	
 	row = uiLayoutRow(layout, 0);
@@ -2194,31 +2232,31 @@ static void node_composit_buts_colorcorrection_but(uiLayout *layout, bContext *U
 	uiItemR(row, ptr, "green", 0, NULL, ICON_NONE);
 	uiItemR(row, ptr, "blue", 0, NULL, ICON_NONE);
 	row = layout;
-	uiItemL(row, "Saturation", 0);
+	uiItemL(row, IFACE_("Saturation"), 0);
 	uiItemR(row, ptr, "master_saturation", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	uiItemR(row, ptr, "highlights_saturation", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	uiItemR(row, ptr, "midtones_saturation", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	uiItemR(row, ptr, "shadows_saturation", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 
-	uiItemL(row, "Contrast", 0);
+	uiItemL(row, IFACE_("Contrast"), 0);
 	uiItemR(row, ptr, "master_contrast", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	uiItemR(row, ptr, "highlights_contrast", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	uiItemR(row, ptr, "midtones_contrast", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	uiItemR(row, ptr, "shadows_contrast", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 
-	uiItemL(row, "Gamma", 0);
+	uiItemL(row, IFACE_("Gamma"), 0);
 	uiItemR(row, ptr, "master_gamma", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	uiItemR(row, ptr, "highlights_gamma", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	uiItemR(row, ptr, "midtones_gamma", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	uiItemR(row, ptr, "shadows_gamma", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 
-	uiItemL(row, "Gain", 0);
+	uiItemL(row, IFACE_("Gain"), 0);
 	uiItemR(row, ptr, "master_gain", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	uiItemR(row, ptr, "highlights_gain", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	uiItemR(row, ptr, "midtones_gain", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	uiItemR(row, ptr, "shadows_gain", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	
-	uiItemL(row, "Lift", 0);
+	uiItemL(row, IFACE_("Lift"), 0);
 	uiItemR(row, ptr, "master_lift", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	uiItemR(row, ptr, "highlights_lift", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	uiItemR(row, ptr, "midtones_lift", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
@@ -2238,11 +2276,11 @@ static void node_composit_buts_boxmask(uiLayout *layout, bContext *UNUSED(C), Po
 {
 	uiLayout *row;
 	
-	row= uiLayoutRow(layout, 1);
+	row = uiLayoutRow(layout, 1);
 	uiItemR(row, ptr, "x", 0, NULL, ICON_NONE);
 	uiItemR(row, ptr, "y", 0, NULL, ICON_NONE);
 	
-	row= uiLayoutRow(layout, 1);
+	row = uiLayoutRow(layout, 1);
 	uiItemR(row, ptr, "width", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	uiItemR(row, ptr, "height", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 
@@ -2259,32 +2297,32 @@ static void node_composit_buts_bokehimage(uiLayout *layout, bContext *UNUSED(C),
 	uiItemR(layout, ptr, "shift", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 }
 
-void node_composit_backdrop_viewer(SpaceNode* snode, ImBuf* backdrop, bNode* node, int x, int y)
+void node_composit_backdrop_viewer(SpaceNode *snode, ImBuf *backdrop, bNode *node, int x, int y)
 {
 //	node_composit_backdrop_canvas(snode, backdrop, node, x, y);
-	if (node->custom1 == 0) { /// @todo: why did we need this one?
+	if (node->custom1 == 0) {
 		const float backdropWidth = backdrop->x;
 		const float backdropHeight = backdrop->y;
-		const float cx  = x+snode->zoom*backdropWidth*node->custom3;
-		const float cy = y+snode->zoom*backdropHeight*node->custom4;
+		const float cx  = x + snode->zoom * backdropWidth * node->custom3;
+		const float cy = y + snode->zoom * backdropHeight * node->custom4;
 
 		glColor3f(1.0, 1.0, 1.0);
 
 		glBegin(GL_LINES);
-		glVertex2f(cx-25, cy-25);
-		glVertex2f(cx+25, cy+25);
-		glVertex2f(cx+25, cy-25);
-		glVertex2f(cx-25, cy+25);
+		glVertex2f(cx - 25, cy - 25);
+		glVertex2f(cx + 25, cy + 25);
+		glVertex2f(cx + 25, cy - 25);
+		glVertex2f(cx - 25, cy + 25);
 		glEnd();
 	}
 }
 
-void node_composit_backdrop_boxmask(SpaceNode* snode, ImBuf* backdrop, bNode* node, int x, int y)
+void node_composit_backdrop_boxmask(SpaceNode *snode, ImBuf *backdrop, bNode *node, int x, int y)
 {
 	NodeBoxMask *boxmask = node->storage;
 	const float backdropWidth = backdrop->x;
 	const float backdropHeight = backdrop->y;
-	const float aspect = backdropWidth/backdropHeight;
+	const float aspect = backdropWidth / backdropHeight;
 	const float rad = DEG2RADF(-boxmask->rotation);
 	const float cosine = cosf(rad);
 	const float sine = sinf(rad);
@@ -2300,17 +2338,17 @@ void node_composit_backdrop_boxmask(SpaceNode* snode, ImBuf* backdrop, bNode* no
 
 	glColor3f(1.0, 1.0, 1.0);
 
-	cx  = x+snode->zoom*backdropWidth*boxmask->x;
-	cy = y+snode->zoom*backdropHeight*boxmask->y;
+	cx  = x + snode->zoom * backdropWidth * boxmask->x;
+	cy = y + snode->zoom * backdropHeight * boxmask->y;
 
-	x1 = cx - (cosine*halveBoxWidth+sine*halveBoxHeight)*snode->zoom;
-	x2 = cx - (cosine*-halveBoxWidth+sine*halveBoxHeight)*snode->zoom;
-	x3 = cx - (cosine*-halveBoxWidth+sine*-halveBoxHeight)*snode->zoom;
-	x4 = cx - (cosine*halveBoxWidth+sine*-halveBoxHeight)*snode->zoom;
-	y1 = cy - (-sine*halveBoxWidth + cosine*halveBoxHeight)*snode->zoom;
-	y2 = cy - (-sine*-halveBoxWidth + cosine*halveBoxHeight)*snode->zoom;
-	y3 = cy - (-sine*-halveBoxWidth + cosine*-halveBoxHeight)*snode->zoom;
-	y4 = cy - (-sine*halveBoxWidth + cosine*-halveBoxHeight)*snode->zoom;
+	x1 = cx - (cosine * halveBoxWidth + sine * halveBoxHeight) * snode->zoom;
+	x2 = cx - (cosine * -halveBoxWidth + sine * halveBoxHeight) * snode->zoom;
+	x3 = cx - (cosine * -halveBoxWidth + sine * -halveBoxHeight) * snode->zoom;
+	x4 = cx - (cosine * halveBoxWidth + sine * -halveBoxHeight) * snode->zoom;
+	y1 = cy - (-sine * halveBoxWidth + cosine * halveBoxHeight) * snode->zoom;
+	y2 = cy - (-sine * -halveBoxWidth + cosine * halveBoxHeight) * snode->zoom;
+	y3 = cy - (-sine * -halveBoxWidth + cosine * -halveBoxHeight) * snode->zoom;
+	y4 = cy - (-sine * halveBoxWidth + cosine * -halveBoxHeight) * snode->zoom;
 
 	glBegin(GL_LINE_LOOP);
 	glVertex2f(x1, y1);
@@ -2320,9 +2358,9 @@ void node_composit_backdrop_boxmask(SpaceNode* snode, ImBuf* backdrop, bNode* no
 	glEnd();
 }
 
-void node_composit_backdrop_ellipsemask(SpaceNode* snode, ImBuf* backdrop, bNode* node, int x, int y)
+void node_composit_backdrop_ellipsemask(SpaceNode *snode, ImBuf *backdrop, bNode *node, int x, int y)
 {
-	NodeEllipseMask * ellipsemask = node->storage;
+	NodeEllipseMask *ellipsemask = node->storage;
 	const float backdropWidth = backdrop->x;
 	const float backdropHeight = backdrop->y;
 	const float aspect = backdropWidth / backdropHeight;
@@ -2341,17 +2379,17 @@ void node_composit_backdrop_ellipsemask(SpaceNode* snode, ImBuf* backdrop, bNode
 
 	glColor3f(1.0, 1.0, 1.0);
 
-	cx  = x+snode->zoom*backdropWidth*ellipsemask->x;
-	cy = y+snode->zoom*backdropHeight*ellipsemask->y;
+	cx  = x + snode->zoom * backdropWidth * ellipsemask->x;
+	cy = y + snode->zoom * backdropHeight * ellipsemask->y;
 
-	x1 = cx - (cosine*halveBoxWidth+sine*halveBoxHeight)*snode->zoom;
-	x2 = cx - (cosine*-halveBoxWidth+sine*halveBoxHeight)*snode->zoom;
-	x3 = cx - (cosine*-halveBoxWidth+sine*-halveBoxHeight)*snode->zoom;
-	x4 = cx - (cosine*halveBoxWidth+sine*-halveBoxHeight)*snode->zoom;
-	y1 = cy - (-sine*halveBoxWidth + cosine*halveBoxHeight)*snode->zoom;
-	y2 = cy - (-sine*-halveBoxWidth + cosine*halveBoxHeight)*snode->zoom;
-	y3 = cy - (-sine*-halveBoxWidth + cosine*-halveBoxHeight)*snode->zoom;
-	y4 = cy - (-sine*halveBoxWidth + cosine*-halveBoxHeight)*snode->zoom;
+	x1 = cx - (cosine * halveBoxWidth + sine * halveBoxHeight) * snode->zoom;
+	x2 = cx - (cosine * -halveBoxWidth + sine * halveBoxHeight) * snode->zoom;
+	x3 = cx - (cosine * -halveBoxWidth + sine * -halveBoxHeight) * snode->zoom;
+	x4 = cx - (cosine * halveBoxWidth + sine * -halveBoxHeight) * snode->zoom;
+	y1 = cy - (-sine * halveBoxWidth + cosine * halveBoxHeight) * snode->zoom;
+	y2 = cy - (-sine * -halveBoxWidth + cosine * halveBoxHeight) * snode->zoom;
+	y3 = cy - (-sine * -halveBoxWidth + cosine * -halveBoxHeight) * snode->zoom;
+	y4 = cy - (-sine * halveBoxWidth + cosine * -halveBoxHeight) * snode->zoom;
 
 	glBegin(GL_LINE_LOOP);
 
@@ -2365,10 +2403,10 @@ void node_composit_backdrop_ellipsemask(SpaceNode* snode, ImBuf* backdrop, bNode
 static void node_composit_buts_ellipsemask(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
 	uiLayout *row;
-	row= uiLayoutRow(layout, 1);
+	row = uiLayoutRow(layout, 1);
 	uiItemR(row, ptr, "x", 0, NULL, ICON_NONE);
 	uiItemR(row, ptr, "y", 0, NULL, ICON_NONE);
-	row= uiLayoutRow(layout, 1);
+	row = uiLayoutRow(layout, 1);
 	uiItemR(row, ptr, "width", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 	uiItemR(row, ptr, "height", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 
@@ -2381,13 +2419,53 @@ static void node_composit_buts_viewer_but(uiLayout *layout, bContext *UNUSED(C),
 	uiLayout *col;
 	
 	uiItemR(layout, ptr, "tile_order", 0, NULL, ICON_NONE);
-	if (RNA_enum_get(ptr, "tile_order")==0) {
-		col= uiLayoutColumn(layout, 1);
+	if (RNA_enum_get(ptr, "tile_order") == 0) {
+		col = uiLayoutColumn(layout, 1);
 		uiItemR(col, ptr, "center_x", 0, NULL, ICON_NONE);
 		uiItemR(col, ptr, "center_y", 0, NULL, ICON_NONE);
 	}
 }
 
+static void node_composit_buts_mask(uiLayout *layout, bContext *C, PointerRNA *ptr)
+{
+	uiTemplateID(layout, C, ptr, "mask", NULL, NULL, NULL);
+    uiItemR(layout, ptr, "smooth_mask", 0, NULL, ICON_NONE);
+
+}
+
+static void node_composit_buts_keyingscreen(uiLayout *layout, bContext *C, PointerRNA *ptr)
+{
+	bNode *node= ptr->data;
+
+	uiTemplateID(layout, C, ptr, "clip", NULL, NULL, NULL);
+
+	if (node->id) {
+		MovieClip *clip = (MovieClip *) node->id;
+		uiLayout *col;
+		PointerRNA tracking_ptr;
+
+		RNA_pointer_create(&clip->id, &RNA_MovieTracking, &clip->tracking, &tracking_ptr);
+
+		col = uiLayoutColumn(layout, 1);
+		uiItemPointerR(col, ptr, "tracking_object", &tracking_ptr, "objects", "", ICON_OBJECT_DATA);
+	}
+}
+
+static void node_composit_buts_keying(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
+{
+	/* bNode *node= ptr->data; */ /* UNUSED */
+
+	uiItemR(layout, ptr, "blur_pre", 0, NULL, ICON_NONE);
+	uiItemR(layout, ptr, "screen_balance", 0, NULL, ICON_NONE);
+	uiItemR(layout, ptr, "despill_factor", 0, NULL, ICON_NONE);
+	uiItemR(layout, ptr, "edge_kernel_radius", 0, NULL, ICON_NONE);
+	uiItemR(layout, ptr, "edge_kernel_tolerance", 0, NULL, ICON_NONE);
+	uiItemR(layout, ptr, "clip_black", 0, NULL, ICON_NONE);
+	uiItemR(layout, ptr, "clip_white", 0, NULL, ICON_NONE);
+	uiItemR(layout, ptr, "dilate_distance", 0, NULL, ICON_NONE);
+	uiItemR(layout, ptr, "blur_post", 0, NULL, ICON_NONE);
+}
+
 /* only once called */
 static void node_composit_set_butfunc(bNodeType *ntype)
 {
@@ -2395,49 +2473,49 @@ static void node_composit_set_butfunc(bNodeType *ntype)
 		/* case NODE_GROUP:	 note, typeinfo for group is generated... see "XXX ugly hack" */
 
 		case CMP_NODE_IMAGE:
-			ntype->uifunc= node_composit_buts_image;
+			ntype->uifunc = node_composit_buts_image;
 			break;
 		case CMP_NODE_R_LAYERS:
-			ntype->uifunc= node_composit_buts_renderlayers;
+			ntype->uifunc = node_composit_buts_renderlayers;
 			break;
 		case CMP_NODE_NORMAL:
-			ntype->uifunc= node_buts_normal;
+			ntype->uifunc = node_buts_normal;
 			break;
 		case CMP_NODE_CURVE_VEC:
-			ntype->uifunc= node_buts_curvevec;
+			ntype->uifunc = node_buts_curvevec;
 			break;
 		case CMP_NODE_CURVE_RGB:
-			ntype->uifunc= node_buts_curvecol;
+			ntype->uifunc = node_buts_curvecol;
 			break;
 		case CMP_NODE_VALUE:
-			ntype->uifunc= node_buts_value;
+			ntype->uifunc = node_buts_value;
 			break;
 		case CMP_NODE_RGB:
-			ntype->uifunc= node_buts_rgb;
+			ntype->uifunc = node_buts_rgb;
 			break;
 		case CMP_NODE_FLIP:
-			ntype->uifunc= node_composit_buts_flip;
+			ntype->uifunc = node_composit_buts_flip;
 			break;
 		case CMP_NODE_SPLITVIEWER:
-			ntype->uifunc= node_composit_buts_splitviewer;
+			ntype->uifunc = node_composit_buts_splitviewer;
 			break;
 		case CMP_NODE_MIX_RGB:
-			ntype->uifunc= node_buts_mix_rgb;
+			ntype->uifunc = node_buts_mix_rgb;
 			break;
 		case CMP_NODE_VALTORGB:
-			ntype->uifunc= node_buts_colorramp;
+			ntype->uifunc = node_buts_colorramp;
 			break;
 		case CMP_NODE_CROP:
-			ntype->uifunc= node_composit_buts_crop;
+			ntype->uifunc = node_composit_buts_crop;
 			break;
 		case CMP_NODE_BLUR:
-			ntype->uifunc= node_composit_buts_blur;
+			ntype->uifunc = node_composit_buts_blur;
 			break;
 		case CMP_NODE_DBLUR:
-			ntype->uifunc= node_composit_buts_dblur;
+			ntype->uifunc = node_composit_buts_dblur;
 			break;
 		case CMP_NODE_BILATERALBLUR:
-			ntype->uifunc= node_composit_buts_bilateralblur;
+			ntype->uifunc = node_composit_buts_bilateralblur;
 			break;
 		case CMP_NODE_DEFOCUS:
 			ntype->uifunc = node_composit_buts_defocus;
@@ -2452,134 +2530,142 @@ static void node_composit_set_butfunc(bNodeType *ntype)
 			ntype->uifunc = node_composit_buts_lensdist;
 			break;
 		case CMP_NODE_VECBLUR:
-			ntype->uifunc= node_composit_buts_vecblur;
+			ntype->uifunc = node_composit_buts_vecblur;
 			break;
 		case CMP_NODE_FILTER:
-			ntype->uifunc= node_composit_buts_filter;
+			ntype->uifunc = node_composit_buts_filter;
 			break;
 		case CMP_NODE_MAP_VALUE:
-			ntype->uifunc= node_composit_buts_map_value;
+			ntype->uifunc = node_composit_buts_map_value;
 			break;
 		case CMP_NODE_TIME:
-			ntype->uifunc= node_buts_time;
+			ntype->uifunc = node_buts_time;
 			break;
 		case CMP_NODE_ALPHAOVER:
-			ntype->uifunc= node_composit_buts_alphaover;
+			ntype->uifunc = node_composit_buts_alphaover;
 			break;
 		case CMP_NODE_HUE_SAT:
-			ntype->uifunc= node_composit_buts_hue_sat;
+			ntype->uifunc = node_composit_buts_hue_sat;
 			break;
 		case CMP_NODE_TEXTURE:
-			ntype->uifunc= node_buts_texture;
+			ntype->uifunc = node_buts_texture;
 			break;
 		case CMP_NODE_DILATEERODE:
-			ntype->uifunc= node_composit_buts_dilateerode;
+			ntype->uifunc = node_composit_buts_dilateerode;
 			break;
 		case CMP_NODE_OUTPUT_FILE:
-			ntype->uifunc= node_composit_buts_file_output;
-			ntype->uifuncbut= node_composit_buts_file_output_details;
+			ntype->uifunc = node_composit_buts_file_output;
+			ntype->uifuncbut = node_composit_buts_file_output_details;
 			ntype->drawinputfunc = node_draw_input_file_output;
 			break;
 		case CMP_NODE_DIFF_MATTE:
-			ntype->uifunc=node_composit_buts_diff_matte;
+			ntype->uifunc = node_composit_buts_diff_matte;
 			break;
 		case CMP_NODE_DIST_MATTE:
-			ntype->uifunc=node_composit_buts_distance_matte;
+			ntype->uifunc = node_composit_buts_distance_matte;
 			break;
 		case CMP_NODE_COLOR_SPILL:
-			ntype->uifunc=node_composit_buts_color_spill;
+			ntype->uifunc = node_composit_buts_color_spill;
 			break;
 		case CMP_NODE_CHROMA_MATTE:
-			ntype->uifunc=node_composit_buts_chroma_matte;
+			ntype->uifunc = node_composit_buts_chroma_matte;
 			break;
 		case CMP_NODE_COLOR_MATTE:
-			ntype->uifunc=node_composit_buts_color_matte;
+			ntype->uifunc = node_composit_buts_color_matte;
 			break;
 		case CMP_NODE_SCALE:
-			ntype->uifunc= node_composit_buts_scale;
+			ntype->uifunc = node_composit_buts_scale;
 			break;
 		case CMP_NODE_ROTATE:
-			ntype->uifunc=node_composit_buts_rotate;
+			ntype->uifunc = node_composit_buts_rotate;
 			break;
 		case CMP_NODE_CHANNEL_MATTE:
-			ntype->uifunc= node_composit_buts_channel_matte;
+			ntype->uifunc = node_composit_buts_channel_matte;
 			break;
 		case CMP_NODE_LUMA_MATTE:
-			ntype->uifunc= node_composit_buts_luma_matte;
+			ntype->uifunc = node_composit_buts_luma_matte;
 			break;
 		case CMP_NODE_MAP_UV:
-			ntype->uifunc= node_composit_buts_map_uv;
+			ntype->uifunc = node_composit_buts_map_uv;
 			break;
 		case CMP_NODE_ID_MASK:
-			ntype->uifunc= node_composit_buts_id_mask;
+			ntype->uifunc = node_composit_buts_id_mask;
 			break;
 		case CMP_NODE_DOUBLEEDGEMASK:
-			ntype->uifunc= node_composit_buts_double_edge_mask;
+			ntype->uifunc = node_composit_buts_double_edge_mask;
 			break;
 		case CMP_NODE_MATH:
-			ntype->uifunc= node_buts_math;
+			ntype->uifunc = node_buts_math;
 			break;
 		case CMP_NODE_INVERT:
-			ntype->uifunc= node_composit_buts_invert;
+			ntype->uifunc = node_composit_buts_invert;
 			break;
 		case CMP_NODE_PREMULKEY:
-			ntype->uifunc= node_composit_buts_premulkey;
+			ntype->uifunc = node_composit_buts_premulkey;
 			break;
 		case CMP_NODE_VIEW_LEVELS:
-			ntype->uifunc=node_composit_buts_view_levels;
+			ntype->uifunc = node_composit_buts_view_levels;
 			break;
 		case CMP_NODE_COLORBALANCE:
-			ntype->uifunc=node_composit_buts_colorbalance;
-			ntype->uifuncbut=node_composit_buts_colorbalance_but;
+			ntype->uifunc = node_composit_buts_colorbalance;
+			ntype->uifuncbut = node_composit_buts_colorbalance_but;
 			break;
 		case CMP_NODE_HUECORRECT:
-			ntype->uifunc=node_composit_buts_huecorrect;
+			ntype->uifunc = node_composit_buts_huecorrect;
 			break;
 		case CMP_NODE_ZCOMBINE:
-			ntype->uifunc=node_composit_buts_zcombine;
+			ntype->uifunc = node_composit_buts_zcombine;
 			break;
 		case CMP_NODE_COMBYCCA:
 		case CMP_NODE_SEPYCCA:
-			ntype->uifunc=node_composit_buts_ycc;
+			ntype->uifunc = node_composit_buts_ycc;
 			break;
 		case CMP_NODE_MOVIECLIP:
-			ntype->uifunc= node_composit_buts_movieclip;
+			ntype->uifunc = node_composit_buts_movieclip;
 			break;
 		case CMP_NODE_STABILIZE2D:
-			ntype->uifunc= node_composit_buts_stabilize2d;
+			ntype->uifunc = node_composit_buts_stabilize2d;
 			break;
 		case CMP_NODE_TRANSFORM:
-			ntype->uifunc= node_composit_buts_transform;
+			ntype->uifunc = node_composit_buts_transform;
 			break;
 		case CMP_NODE_MOVIEDISTORTION:
-			ntype->uifunc= node_composit_buts_moviedistortion;
+			ntype->uifunc = node_composit_buts_moviedistortion;
 			break;
 		case CMP_NODE_COLORCORRECTION:
-			ntype->uifunc=node_composit_buts_colorcorrection;
-			ntype->uifuncbut=node_composit_buts_colorcorrection_but;
+			ntype->uifunc = node_composit_buts_colorcorrection;
+			ntype->uifuncbut = node_composit_buts_colorcorrection_but;
 			break;
 		case CMP_NODE_SWITCH:
-			ntype->uifunc= node_composit_buts_switch;
+			ntype->uifunc = node_composit_buts_switch;
 			break;
 		case CMP_NODE_MASK_BOX:
-			ntype->uifunc= node_composit_buts_boxmask;
+			ntype->uifunc = node_composit_buts_boxmask;
 			ntype->uibackdropfunc = node_composit_backdrop_boxmask;
 			break;
 		case CMP_NODE_MASK_ELLIPSE:
-			ntype->uifunc= node_composit_buts_ellipsemask;
+			ntype->uifunc = node_composit_buts_ellipsemask;
 			ntype->uibackdropfunc = node_composit_backdrop_ellipsemask;
 			break;
 		case CMP_NODE_BOKEHIMAGE:
-			ntype->uifunc= node_composit_buts_bokehimage;
+			ntype->uifunc = node_composit_buts_bokehimage;
 			break;
 		case CMP_NODE_VIEWER:
 			ntype->uifunc = NULL;
-			ntype->uifuncbut= node_composit_buts_viewer_but;
+			ntype->uifuncbut = node_composit_buts_viewer_but;
 			ntype->uibackdropfunc = node_composit_backdrop_viewer;
 			break;
-
+		case CMP_NODE_MASK:
+			ntype->uifunc= node_composit_buts_mask;
+			break;
+		case CMP_NODE_KEYINGSCREEN:
+			ntype->uifunc = node_composit_buts_keyingscreen;
+			break;
+		case CMP_NODE_KEYING:
+			ntype->uifunc = node_composit_buts_keying;
+			break;
 		default:
-			ntype->uifunc= NULL;
+			ntype->uifunc = NULL;
 	}
 }
 
@@ -2589,42 +2675,42 @@ static void node_texture_buts_bricks(uiLayout *layout, bContext *UNUSED(C), Poin
 {
 	uiLayout *col;
 	
-	col= uiLayoutColumn(layout, 1);
-	uiItemR(col, ptr, "offset", 0, "Offset", ICON_NONE);
-	uiItemR(col, ptr, "offset_frequency", 0, "Frequency", ICON_NONE);
+	col = uiLayoutColumn(layout, 1);
+	uiItemR(col, ptr, "offset", 0, IFACE_("Offset"), ICON_NONE);
+	uiItemR(col, ptr, "offset_frequency", 0, IFACE_("Frequency"), ICON_NONE);
 	
-	col= uiLayoutColumn(layout, 1);
-	uiItemR(col, ptr, "squash", 0, "Squash", ICON_NONE);
-	uiItemR(col, ptr, "squash_frequency", 0, "Frequency", ICON_NONE);
+	col = uiLayoutColumn(layout, 1);
+	uiItemR(col, ptr, "squash", 0, IFACE_("Squash"), ICON_NONE);
+	uiItemR(col, ptr, "squash_frequency", 0, IFACE_("Frequency"), ICON_NONE);
 }
 
 static void node_texture_buts_proc(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
 	PointerRNA tex_ptr;
-	bNode *node= ptr->data;
-	ID *id= ptr->id.data;
+	bNode *node = ptr->data;
+	ID *id = ptr->id.data;
 	Tex *tex = (Tex *)node->storage;
 	uiLayout *col, *row;
 	
 	RNA_pointer_create(id, &RNA_Texture, tex, &tex_ptr);
 
-	col= uiLayoutColumn(layout, 0);
+	col = uiLayoutColumn(layout, 0);
 
-	switch ( tex->type ) {
+	switch (tex->type) {
 		case TEX_BLEND:
 			uiItemR(col, &tex_ptr, "progression", 0, "", ICON_NONE);
-			row= uiLayoutRow(col, 0);
+			row = uiLayoutRow(col, 0);
 			uiItemR(row, &tex_ptr, "use_flip_axis", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
 			break;
 
 		case TEX_MARBLE:
-			row= uiLayoutRow(col, 0);
+			row = uiLayoutRow(col, 0);
 			uiItemR(row, &tex_ptr, "marble_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
-			row= uiLayoutRow(col, 0);
+			row = uiLayoutRow(col, 0);
 			uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
-			row= uiLayoutRow(col, 0);
+			row = uiLayoutRow(col, 0);
 			uiItemR(row, &tex_ptr, "noise_basis", 0, "", ICON_NONE);
-			row= uiLayoutRow(col, 0);
+			row = uiLayoutRow(col, 0);
 			uiItemR(row, &tex_ptr, "noise_basis_2", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
 			break;
 
@@ -2633,9 +2719,9 @@ static void node_texture_buts_proc(uiLayout *layout, bContext *UNUSED(C), Pointe
 			break;
 
 		case TEX_STUCCI:
-			row= uiLayoutRow(col, 0);
+			row = uiLayoutRow(col, 0);
 			uiItemR(row, &tex_ptr, "stucci_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
-			row= uiLayoutRow(col, 0);
+			row = uiLayoutRow(col, 0);
 			uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
 			uiItemR(col, &tex_ptr, "noise_basis", 0, "", ICON_NONE);
 			break;
@@ -2643,20 +2729,20 @@ static void node_texture_buts_proc(uiLayout *layout, bContext *UNUSED(C), Pointe
 		case TEX_WOOD:
 			uiItemR(col, &tex_ptr, "noise_basis", 0, "", ICON_NONE);
 			uiItemR(col, &tex_ptr, "wood_type", 0, "", ICON_NONE);
-			row= uiLayoutRow(col, 0);
+			row = uiLayoutRow(col, 0);
 			uiItemR(row, &tex_ptr, "noise_basis_2", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
-			row= uiLayoutRow(col, 0);
-			uiLayoutSetActive(row, !(RNA_enum_get(&tex_ptr, "wood_type")==TEX_BAND || RNA_enum_get(&tex_ptr, "wood_type")==TEX_RING)); 
+			row = uiLayoutRow(col, 0);
+			uiLayoutSetActive(row, !(RNA_enum_get(&tex_ptr, "wood_type") == TEX_BAND || RNA_enum_get(&tex_ptr, "wood_type") == TEX_RING));
 			uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
 			break;
 			
 		case TEX_CLOUDS:
 			uiItemR(col, &tex_ptr, "noise_basis", 0, "", ICON_NONE);
-			row= uiLayoutRow(col, 0);
+			row = uiLayoutRow(col, 0);
 			uiItemR(row, &tex_ptr, "cloud_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
-			row= uiLayoutRow(col, 0);
+			row = uiLayoutRow(col, 0);
 			uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
-			uiItemR(col, &tex_ptr, "noise_depth", UI_ITEM_R_EXPAND, "Depth", ICON_NONE);
+			uiItemR(col, &tex_ptr, "noise_depth", UI_ITEM_R_EXPAND, IFACE_("Depth"), ICON_NONE);
 			break;
 			
 		case TEX_DISTNOISE:
@@ -2691,47 +2777,47 @@ static void node_texture_buts_output(uiLayout *layout, bContext *UNUSED(C), Poin
 /* only once called */
 static void node_texture_set_butfunc(bNodeType *ntype)
 {
-	if ( ntype->type >= TEX_NODE_PROC && ntype->type < TEX_NODE_PROC_MAX ) {
+	if (ntype->type >= TEX_NODE_PROC && ntype->type < TEX_NODE_PROC_MAX) {
 		ntype->uifunc = node_texture_buts_proc;
 	}
 	else {
 		switch (ntype->type) {
 
-		case TEX_NODE_MATH:
-			ntype->uifunc = node_buts_math;
-			break;
+			case TEX_NODE_MATH:
+				ntype->uifunc = node_buts_math;
+				break;
 
-		case TEX_NODE_MIX_RGB:
-			ntype->uifunc = node_buts_mix_rgb;
-			break;
+			case TEX_NODE_MIX_RGB:
+				ntype->uifunc = node_buts_mix_rgb;
+				break;
 
-		case TEX_NODE_VALTORGB:
-			ntype->uifunc = node_buts_colorramp;
-			break;
+			case TEX_NODE_VALTORGB:
+				ntype->uifunc = node_buts_colorramp;
+				break;
 
-		case TEX_NODE_CURVE_RGB:
-			ntype->uifunc= node_buts_curvecol;
-			break;
+			case TEX_NODE_CURVE_RGB:
+				ntype->uifunc = node_buts_curvecol;
+				break;
 
-		case TEX_NODE_CURVE_TIME:
-			ntype->uifunc = node_buts_time;
-			break;
+			case TEX_NODE_CURVE_TIME:
+				ntype->uifunc = node_buts_time;
+				break;
 
-		case TEX_NODE_TEXTURE:
-			ntype->uifunc = node_buts_texture;
-			break;
+			case TEX_NODE_TEXTURE:
+				ntype->uifunc = node_buts_texture;
+				break;
 
-		case TEX_NODE_BRICKS:
-			ntype->uifunc = node_texture_buts_bricks;
-			break;
+			case TEX_NODE_BRICKS:
+				ntype->uifunc = node_texture_buts_bricks;
+				break;
 
-		case TEX_NODE_IMAGE:
-			ntype->uifunc = node_texture_buts_image;
-			break;
+			case TEX_NODE_IMAGE:
+				ntype->uifunc = node_texture_buts_image;
+				break;
 
-		case TEX_NODE_OUTPUT:
-			ntype->uifunc = node_texture_buts_output;
-			break;
+			case TEX_NODE_OUTPUT:
+				ntype->uifunc = node_texture_buts_output;
+				break;
 		}
 	}
 }
@@ -2746,13 +2832,15 @@ void ED_init_node_butfuncs(void)
 	int i;
 	
 	/* node type ui functions */
-	for (i=0; i < NUM_NTREE_TYPES; ++i) {
+	for (i = 0; i < NUM_NTREE_TYPES; ++i) {
 		treetype = ntreeGetType(i);
 		if (treetype) {
-			for (ntype= treetype->node_types.first; ntype; ntype= ntype->next) {
+			for (ntype = treetype->node_types.first; ntype; ntype = ntype->next) {
 				/* default ui functions */
 				ntype->drawfunc = node_draw_default;
 				ntype->drawupdatefunc = node_update_default;
+				ntype->select_area_func = node_select_area_default;
+				ntype->tweak_area_func = node_tweak_area_default;
 				ntype->uifunc = NULL;
 				ntype->uifuncbut = NULL;
 				ntype->drawinputfunc = node_draw_input_default;
@@ -2762,41 +2850,41 @@ void ED_init_node_butfuncs(void)
 				node_common_set_butfunc(ntype);
 				
 				switch (i) {
-				case NTREE_COMPOSIT:
-					node_composit_set_butfunc(ntype);
-					break;
-				case NTREE_SHADER:
-					node_shader_set_butfunc(ntype);
-					break;
-				case NTREE_TEXTURE:
-					node_texture_set_butfunc(ntype);
-					break;
+					case NTREE_COMPOSIT:
+						node_composit_set_butfunc(ntype);
+						break;
+					case NTREE_SHADER:
+						node_shader_set_butfunc(ntype);
+						break;
+					case NTREE_TEXTURE:
+						node_texture_set_butfunc(ntype);
+						break;
 				}
 			}
 		}
 	}
 	
 	/* socket type ui functions */
-	for (i=0; i < NUM_SOCKET_TYPES; ++i) {
+	for (i = 0; i < NUM_SOCKET_TYPES; ++i) {
 		stype = ntreeGetSocketType(i);
 		if (stype) {
 			switch (stype->type) {
-			case SOCK_FLOAT:
-			case SOCK_INT:
-			case SOCK_BOOLEAN:
-				stype->buttonfunc = node_socket_button_default;
-				break;
-			case SOCK_VECTOR:
-				stype->buttonfunc = node_socket_button_components;
-				break;
-			case SOCK_RGBA:
-				stype->buttonfunc = node_socket_button_color;
-				break;
-			case SOCK_SHADER:
-				stype->buttonfunc = node_socket_button_label;
-				break;
-			default:
-				stype->buttonfunc = NULL;
+				case SOCK_FLOAT:
+				case SOCK_INT:
+				case SOCK_BOOLEAN:
+					stype->buttonfunc = node_socket_button_default;
+					break;
+				case SOCK_VECTOR:
+					stype->buttonfunc = node_socket_button_components;
+					break;
+				case SOCK_RGBA:
+					stype->buttonfunc = node_socket_button_color;
+					break;
+				case SOCK_SHADER:
+					stype->buttonfunc = node_socket_button_label;
+					break;
+				default:
+					stype->buttonfunc = NULL;
 			}
 		}
 	}
@@ -2807,10 +2895,10 @@ void ED_init_node_butfuncs(void)
 void draw_nodespace_back_pix(ARegion *ar, SpaceNode *snode, int color_manage)
 {
 	
-	if ((snode->flag & SNODE_BACKDRAW) && snode->treetype==NTREE_COMPOSIT) {
-		Image *ima= BKE_image_verify_viewer(IMA_TYPE_COMPOSITE, "Viewer Node");
+	if ((snode->flag & SNODE_BACKDRAW) && snode->treetype == NTREE_COMPOSIT) {
+		Image *ima = BKE_image_verify_viewer(IMA_TYPE_COMPOSITE, "Viewer Node");
 		void *lock;
-		ImBuf *ibuf= BKE_image_acquire_ibuf(ima, NULL, &lock);
+		ImBuf *ibuf = BKE_image_acquire_ibuf(ima, NULL, &lock);
 		if (ibuf) {
 			float x, y; 
 			
@@ -2820,16 +2908,16 @@ void draw_nodespace_back_pix(ARegion *ar, SpaceNode *snode, int color_manage)
 			glPushMatrix();
 
 			/* keep this, saves us from a version patch */
-			if (snode->zoom==0.0f) snode->zoom= 1.0f;
+			if (snode->zoom == 0.0f) snode->zoom = 1.0f;
 			
 			/* somehow the offset has to be calculated inverse */
 			
 			glaDefine2DArea(&ar->winrct);
 			/* ortho at pixel level curarea */
-			wmOrtho2(-0.375, ar->winx-0.375, -0.375, ar->winy-0.375);
+			wmOrtho2(-0.375, ar->winx - 0.375, -0.375, ar->winy - 0.375);
 			
-			x = (ar->winx-snode->zoom*ibuf->x)/2 + snode->xof;
-			y = (ar->winy-snode->zoom*ibuf->y)/2 + snode->yof;
+			x = (ar->winx - snode->zoom * ibuf->x) / 2 + snode->xof;
+			y = (ar->winy - snode->zoom * ibuf->y) / 2 + snode->yof;
 			
 			if (!ibuf->rect) {
 				if (color_manage)
@@ -2901,8 +2989,8 @@ static void draw_nodespace_back_tex(ScrArea *sa, SpaceNode *snode)
 	draw_nodespace_grid(snode);
 	
 	if (snode->flag & SNODE_BACKDRAW) {
-		Image *ima= BKE_image_verify_viewer(IMA_TYPE_COMPOSITE, "Viewer Node");
-		ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
+		Image *ima = BKE_image_verify_viewer(IMA_TYPE_COMPOSITE, "Viewer Node");
+		ImBuf *ibuf = BKE_image_get_ibuf(ima, NULL);
 		if (ibuf) {
 			int x, y;
 			float zoom = 1.0;
@@ -2916,20 +3004,20 @@ static void draw_nodespace_back_tex(ScrArea *sa, SpaceNode *snode)
 
 			if (ibuf->x > sa->winx || ibuf->y > sa->winy) {
 				float zoomx, zoomy;
-				zoomx= (float)sa->winx/ibuf->x;
-				zoomy= (float)sa->winy/ibuf->y;
+				zoomx = (float)sa->winx / ibuf->x;
+				zoomy = (float)sa->winy / ibuf->y;
 				zoom = MIN2(zoomx, zoomy);
 			}
 			
-			x = (sa->winx-zoom*ibuf->x)/2 + snode->xof;
-			y = (sa->winy-zoom*ibuf->y)/2 + snode->yof;
+			x = (sa->winx - zoom * ibuf->x) / 2 + snode->xof;
+			y = (sa->winy - zoom * ibuf->y) / 2 + snode->yof;
 
 			glPixelZoom(zoom, zoom);
 
 			glColor4f(1.0, 1.0, 1.0, 1.0);
 			if (ibuf->rect)
 				glaDrawPixelsTex(x, y, ibuf->x, ibuf->y, GL_UNSIGNED_BYTE, ibuf->rect);
-			else if (ibuf->channels==4)
+			else if (ibuf->channels == 4)
 				glaDrawPixelsTex(x, y, ibuf->x, ibuf->y, GL_FLOAT, ibuf->rect_float);
 
 			glPixelZoom(1.0, 1.0);
@@ -2947,76 +3035,128 @@ static void draw_nodespace_back_tex(ScrArea *sa, SpaceNode *snode)
 int node_link_bezier_points(View2D *v2d, SpaceNode *snode, bNodeLink *link, float coord_array[][2], int resol)
 {
 	float dist, vec[4][2];
-	
+	float deltax, deltay;
+	int toreroute, fromreroute;
 	/* in v0 and v3 we put begin/end points */
 	if (link->fromsock) {
-		vec[0][0]= link->fromsock->locx;
-		vec[0][1]= link->fromsock->locy;
+		vec[0][0] = link->fromsock->locx;
+		vec[0][1] = link->fromsock->locy;
+		fromreroute = (link->fromnode && link->fromnode->type == NODE_REROUTE);
 	}
 	else {
-		if (snode==NULL) return 0;
-		vec[0][0]= snode->mx;
-		vec[0][1]= snode->my;
+		if (snode == NULL) return 0;
+		vec[0][0] = snode->mx;
+		vec[0][1] = snode->my;
+		fromreroute = 0;
 	}
 	if (link->tosock) {
-		vec[3][0]= link->tosock->locx;
-		vec[3][1]= link->tosock->locy;
+		vec[3][0] = link->tosock->locx;
+		vec[3][1] = link->tosock->locy;
+		toreroute = (link->tonode && link->tonode->type == NODE_REROUTE);
 	}
 	else {
-		if (snode==NULL) return 0;
-		vec[3][0]= snode->mx;
-		vec[3][1]= snode->my;
+		if (snode == NULL) return 0;
+		vec[3][0] = snode->mx;
+		vec[3][1] = snode->my;
+		toreroute = 0;
 	}
 
-	dist= UI_GetThemeValue(TH_NODE_CURVING)*0.10f*ABS(vec[0][0] - vec[3][0]);
-	
+	dist = UI_GetThemeValue(TH_NODE_CURVING) * 0.10f * ABS(vec[0][0] - vec[3][0]);
+	deltax = vec[3][0] - vec[0][0];
+	deltay = vec[3][1] - vec[0][1];
 	/* check direction later, for top sockets */
-	vec[1][0]= vec[0][0]+dist;
-	vec[1][1]= vec[0][1];
-	
-	vec[2][0]= vec[3][0]-dist;
-	vec[2][1]= vec[3][1];
-	
-	if (v2d && MIN4(vec[0][0], vec[1][0], vec[2][0], vec[3][0]) > v2d->cur.xmax); /* clipped */
-	else if (v2d && MAX4(vec[0][0], vec[1][0], vec[2][0], vec[3][0]) < v2d->cur.xmin); /* clipped */
+	if (fromreroute) {
+		if (ABS(deltax)>ABS(deltay)) {
+			vec[1][1]= vec[0][1];
+			vec[1][0]= vec[0][0]+(deltax>0?dist:-dist);
+		} else {
+			vec[1][0]= vec[0][0];
+			vec[1][1]= vec[0][1]+(deltay>0?dist:-dist);
+		}
+	} else {
+		vec[1][0] = vec[0][0] + dist;
+		vec[1][1] = vec[0][1];
+	}
+	if (toreroute) {
+		if (ABS(deltax)>ABS(deltay)) {
+			vec[2][1]= vec[3][1];
+			vec[2][0]= vec[3][0]+ (deltax>0?-dist:dist);
+		} else {
+			vec[2][0]= vec[3][0];
+			vec[2][1]= vec[3][1]+(deltay>0?-dist:dist);
+		}
+
+	} else {
+		vec[2][0] = vec[3][0] - dist;
+		vec[2][1] = vec[3][1];
+	}
+	if (v2d && MIN4(vec[0][0], vec[1][0], vec[2][0], vec[3][0]) > v2d->cur.xmax) ;  /* clipped */
+	else if (v2d && MAX4(vec[0][0], vec[1][0], vec[2][0], vec[3][0]) < v2d->cur.xmin) ;  /* clipped */
 	else {
 		
 		/* always do all three, to prevent data hanging around */
-		BKE_curve_forward_diff_bezier(vec[0][0], vec[1][0], vec[2][0], vec[3][0], coord_array[0], resol, sizeof(float)*2);
-		BKE_curve_forward_diff_bezier(vec[0][1], vec[1][1], vec[2][1], vec[3][1], coord_array[0]+1, resol, sizeof(float)*2);
+		BKE_curve_forward_diff_bezier(vec[0][0], vec[1][0], vec[2][0], vec[3][0], coord_array[0], resol, sizeof(float) * 2);
+		BKE_curve_forward_diff_bezier(vec[0][1], vec[1][1], vec[2][1], vec[3][1], coord_array[0] + 1, resol, sizeof(float) * 2);
 		
 		return 1;
 	}
 	return 0;
 }
 
-#define LINK_RESOL	24
-void node_draw_link_bezier(View2D *v2d, SpaceNode *snode, bNodeLink *link, int th_col1, int do_shaded, int th_col2, int do_triple, int th_col3 )
+#define LINK_RESOL  24
+#define LINK_ARROW	12	/* position of arrow on the link, LINK_RESOL/2 */
+#define ARROW_SIZE 7
+void node_draw_link_bezier(View2D *v2d, SpaceNode *snode, bNodeLink *link, int th_col1, int do_shaded, int th_col2, int do_triple, int th_col3)
 {
-	float coord_array[LINK_RESOL+1][2];
+	float coord_array[LINK_RESOL + 1][2];
 	
 	if (node_link_bezier_points(v2d, snode, link, coord_array, LINK_RESOL)) {
 		float dist, spline_step = 0.0f;
 		int i;
-		
+		int drawarrow;
 		/* store current linewidth */
 		float linew;
+		float arrow[2], arrow1[2], arrow2[2];
 		glGetFloatv(GL_LINE_WIDTH, &linew);
 		
 		/* we can reuse the dist variable here to increment the GL curve eval amount*/
-		dist = 1.0f/(float)LINK_RESOL;
+		dist = 1.0f / (float)LINK_RESOL;
 		
 		glEnable(GL_LINE_SMOOTH);
 		
+		drawarrow = (link->tonode && (link->tonode->type == NODE_REROUTE)) && (link->fromnode && (link->fromnode->type == NODE_REROUTE));
+		if (drawarrow) {
+			// draw arrow in line segment LINK_ARROW
+			float dx, dy, len;
+			dx = coord_array[LINK_ARROW][0]-coord_array[LINK_ARROW-1][0];
+			dy = coord_array[LINK_ARROW][1]-coord_array[LINK_ARROW-1][1];
+			len = sqrtf(dx*dx+dy*dy);
+			dx = dx /len*ARROW_SIZE;
+			dy = dy /len*ARROW_SIZE;
+			arrow1[0] = coord_array[LINK_ARROW][0]-dx+dy;
+			arrow1[1] = coord_array[LINK_ARROW][1]-dy-dx;
+			arrow2[0] = coord_array[LINK_ARROW][0]-dx-dy;
+			arrow2[1] = coord_array[LINK_ARROW][1]-dy+dx;
+			arrow[0] = coord_array[LINK_ARROW][0];
+			arrow[1] = coord_array[LINK_ARROW][1];
+		}
 		if (do_triple) {
 			UI_ThemeColorShadeAlpha(th_col3, -80, -120);
 			glLineWidth(4.0f);
 			
 			glBegin(GL_LINE_STRIP);
-			for (i=0; i<=LINK_RESOL; i++) {
+			for (i = 0; i <= LINK_RESOL; i++) {
 				glVertex2fv(coord_array[i]);
 			}
 			glEnd();
+			if (drawarrow) {
+				glBegin(GL_LINE_STRIP);
+				glVertex2fv(arrow1);
+				glVertex2fv(arrow);
+				glVertex2fv(arrow);
+				glVertex2fv(arrow2);
+				glEnd();
+			}
 		}
 		
 		/* XXX using GL_LINES for shaded node lines is a workaround
@@ -3026,12 +3166,12 @@ void node_draw_link_bezier(View2D *v2d, SpaceNode *snode, bNodeLink *link, int t
 		glLineWidth(1.5f);
 		if (do_shaded) {
 			glBegin(GL_LINES);
-			for (i=0; i<LINK_RESOL; i++) {
+			for (i = 0; i < LINK_RESOL; i++) {
 				UI_ThemeColorBlend(th_col1, th_col2, spline_step);
 				glVertex2fv(coord_array[i]);
 				
-				UI_ThemeColorBlend(th_col1, th_col2, spline_step+dist);
-				glVertex2fv(coord_array[i+1]);
+				UI_ThemeColorBlend(th_col1, th_col2, spline_step + dist);
+				glVertex2fv(coord_array[i + 1]);
 				
 				spline_step += dist;
 			}
@@ -3040,12 +3180,21 @@ void node_draw_link_bezier(View2D *v2d, SpaceNode *snode, bNodeLink *link, int t
 		else {
 			UI_ThemeColor(th_col1);
 			glBegin(GL_LINE_STRIP);
-			for (i=0; i<=LINK_RESOL; i++) {
+			for (i = 0; i <= LINK_RESOL; i++) {
 				glVertex2fv(coord_array[i]);
 			}
 			glEnd();
 		}
 		
+		if (drawarrow) {
+			glBegin(GL_LINE_STRIP);
+			glVertex2fv(arrow1);
+			glVertex2fv(arrow);
+			glVertex2fv(arrow);
+			glVertex2fv(arrow2);
+			glEnd();
+		}
+		
 		glDisable(GL_LINE_SMOOTH);
 		
 		/* restore previuos linewidth */
@@ -3056,26 +3205,26 @@ void node_draw_link_bezier(View2D *v2d, SpaceNode *snode, bNodeLink *link, int t
 static void node_link_straight_points(View2D *UNUSED(v2d), SpaceNode *snode, bNodeLink *link, float coord_array[][2])
 {
 	if (link->fromsock) {
-		coord_array[0][0]= link->fromsock->locx;
-		coord_array[0][1]= link->fromsock->locy;
+		coord_array[0][0] = link->fromsock->locx;
+		coord_array[0][1] = link->fromsock->locy;
 	}
 	else {
-		if (snode==NULL) return;
-		coord_array[0][0]= snode->mx;
-		coord_array[0][1]= snode->my;
+		if (snode == NULL) return;
+		coord_array[0][0] = snode->mx;
+		coord_array[0][1] = snode->my;
 	}
 	if (link->tosock) {
-		coord_array[1][0]= link->tosock->locx;
-		coord_array[1][1]= link->tosock->locy;
+		coord_array[1][0] = link->tosock->locx;
+		coord_array[1][1] = link->tosock->locy;
 	}
 	else {
-		if (snode==NULL) return;
-		coord_array[1][0]= snode->mx;
-		coord_array[1][1]= snode->my;
+		if (snode == NULL) return;
+		coord_array[1][0] = snode->mx;
+		coord_array[1][1] = snode->my;
 	}
 }
 
-void node_draw_link_straight(View2D *v2d, SpaceNode *snode, bNodeLink *link, int th_col1, int do_shaded, int th_col2, int do_triple, int th_col3 )
+void node_draw_link_straight(View2D *v2d, SpaceNode *snode, bNodeLink *link, int th_col1, int do_shaded, int th_col2, int do_triple, int th_col3)
 {
 	float coord_array[2][2];
 	float linew;
@@ -3107,22 +3256,22 @@ void node_draw_link_straight(View2D *v2d, SpaceNode *snode, bNodeLink *link, int
 	 */
 	if (do_shaded) {
 		glBegin(GL_LINES);
-		for (i=0; i < LINK_RESOL-1; ++i) {
-			float t= (float)i/(float)(LINK_RESOL-1);
+		for (i = 0; i < LINK_RESOL - 1; ++i) {
+			float t = (float)i / (float)(LINK_RESOL - 1);
 			UI_ThemeColorBlend(th_col1, th_col2, t);
-			glVertex2f((1.0f-t)*coord_array[0][0]+t*coord_array[1][0], (1.0f-t)*coord_array[0][1]+t*coord_array[1][1]);
+			glVertex2f((1.0f - t) * coord_array[0][0] + t * coord_array[1][0], (1.0f - t) * coord_array[0][1] + t * coord_array[1][1]);
 			
-			t= (float)(i+1)/(float)(LINK_RESOL-1);
+			t = (float)(i + 1) / (float)(LINK_RESOL - 1);
 			UI_ThemeColorBlend(th_col1, th_col2, t);
-			glVertex2f((1.0f-t)*coord_array[0][0]+t*coord_array[1][0], (1.0f-t)*coord_array[0][1]+t*coord_array[1][1]);
+			glVertex2f((1.0f - t) * coord_array[0][0] + t * coord_array[1][0], (1.0f - t) * coord_array[0][1] + t * coord_array[1][1]);
 		}
 		glEnd();
 	}
 	else {
 		glBegin(GL_LINE_STRIP);
-		for (i=0; i < LINK_RESOL; ++i) {
-			float t= (float)i/(float)(LINK_RESOL-1);
-			glVertex2f((1.0f-t)*coord_array[0][0]+t*coord_array[1][0], (1.0f-t)*coord_array[0][1]+t*coord_array[1][1]);
+		for (i = 0; i < LINK_RESOL; ++i) {
+			float t = (float)i / (float)(LINK_RESOL - 1);
+			glVertex2f((1.0f - t) * coord_array[0][0] + t * coord_array[1][0], (1.0f - t) * coord_array[0][1] + t * coord_array[1][1]);
 		}
 		glEnd();
 	}
@@ -3136,10 +3285,10 @@ void node_draw_link_straight(View2D *v2d, SpaceNode *snode, bNodeLink *link, int
 /* note; this is used for fake links in groups too */
 void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link)
 {
-	int do_shaded= FALSE, th_col1= TH_HEADER, th_col2= TH_HEADER;
-	int do_triple= FALSE, th_col3= TH_WIRE;
+	int do_shaded = FALSE, th_col1 = TH_HEADER, th_col2 = TH_HEADER;
+	int do_triple = FALSE, th_col3 = TH_WIRE;
 	
-	if (link->fromsock==NULL && link->tosock==NULL)
+	if (link->fromsock == NULL && link->tosock == NULL)
 		return;
 	
 	/* new connection */
@@ -3161,17 +3310,17 @@ void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link)
 		}
 		else {
 			/* check cyclic */
-			if ((link->fromnode->level >= link->tonode->level && link->tonode->level!=0xFFF) && (link->flag & NODE_LINK_VALID)) {
+			if ((link->fromnode->level >= link->tonode->level && link->tonode->level != 0xFFF) && (link->flag & NODE_LINK_VALID)) {
 				/* special indicated link, on drop-node */
 				if (link->flag & NODE_LINKFLAG_HILITE) {
-					th_col1= th_col2= TH_ACTIVE;
+					th_col1 = th_col2 = TH_ACTIVE;
 				}
 				else {
 					/* regular link */
 					if (link->fromnode->flag & SELECT)
-						th_col1= TH_EDGE_SELECT;
+						th_col1 = TH_EDGE_SELECT;
 					if (link->tonode->flag & SELECT)
-						th_col2= TH_EDGE_SELECT;
+						th_col2 = TH_EDGE_SELECT;
 				}
 				do_shaded = TRUE;
 				do_triple = TRUE;
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index 7011d605a7e..c65bbd6e15f 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -46,6 +46,7 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
+#include "BLI_rect.h"
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
 
@@ -81,9 +82,8 @@
 
 /* width of socket columns in group display */
 #define NODE_GROUP_FRAME		120
-
 // XXX interface.h
-extern void ui_dropshadow(rctf *rct, float radius, float aspect, int select);
+extern void ui_dropshadow(rctf *rct, float radius, float aspect, float alpha, int select);
 
 /* XXX update functions for node editor are a mess, needs a clear concept */
 void ED_node_tree_update(SpaceNode *snode, Scene *scene)
@@ -496,6 +496,16 @@ void node_update_default(const bContext *C, bNodeTree *ntree, bNode *node)
 		node_update_basis(C, ntree, node);
 }
 
+int node_select_area_default(bNode *node, int x, int y)
+{
+	return BLI_in_rctf(&node->totr, x, y);
+}
+
+int node_tweak_area_default(bNode *node, int x, int y)
+{
+	return BLI_in_rctf(&node->totr, x, y);
+}
+
 int node_get_colorid(bNode *node)
 {
 	if (node->typeinfo->nclass==NODE_CLASS_INPUT)
@@ -585,10 +595,10 @@ static void node_circle_draw(float x, float y, float size, char *col, int highli
 	glLineWidth(1.0f);
 }
 
-void node_socket_circle_draw(bNodeTree *UNUSED(ntree), bNodeSocket *sock, float size)
+void node_socket_circle_draw(bNodeTree *UNUSED(ntree), bNodeSocket *sock, float size, int highlight)
 {
 	bNodeSocketType *stype = ntreeGetSocketType(sock->type);
-	node_circle_draw(sock->locx, sock->locy, size, stype->ui_color, (sock->flag & SELECT));
+	node_circle_draw(sock->locx, sock->locy, size, stype->ui_color, highlight);
 }
 
 /* **************  Socket callbacks *********** */
@@ -659,13 +669,13 @@ static void node_toggle_button_cb(struct bContext *C, void *node_argv, void *op_
 	WM_operator_name_call(C, opname, WM_OP_INVOKE_DEFAULT, NULL);
 }
 
-void node_draw_shadow(SpaceNode *snode, bNode *node, float radius)
+void node_draw_shadow(SpaceNode *snode, bNode *node, float radius, float alpha)
 {
 	rctf *rct = &node->totr;
 	
 	uiSetRoundBox(UI_CNR_ALL);
 	if (node->parent==NULL)
-		ui_dropshadow(rct, radius, snode->aspect, node->flag & SELECT);
+		ui_dropshadow(rct, radius, snode->aspect, alpha, node->flag & SELECT);
 	else {
 		const float margin = 3.0f;
 		
@@ -702,7 +712,7 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 	}
 	
 	/* shadow */
-	node_draw_shadow(snode, node, BASIS_RAD);
+	node_draw_shadow(snode, node, BASIS_RAD, 1.0f);
 	
 	/* header */
 	if (color_id==TH_NODE)
@@ -819,7 +829,7 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 		if (nodeSocketIsHidden(sock))
 			continue;
 		
-		node_socket_circle_draw(ntree, sock, NODE_SOCKSIZE);
+		node_socket_circle_draw(ntree, sock, NODE_SOCKSIZE, sock->flag & SELECT);
 		
 		node->typeinfo->drawinputfunc(C, node->block, ntree, node, sock, IFACE_(sock->name),
 		                              sock->locx+NODE_DYS, sock->locy-NODE_DYS, node->width-NODE_DY);
@@ -830,7 +840,7 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 		if (nodeSocketIsHidden(sock))
 			continue;
 		
-		node_socket_circle_draw(ntree, sock, NODE_SOCKSIZE);
+		node_socket_circle_draw(ntree, sock, NODE_SOCKSIZE, sock->flag & SELECT);
 		
 		node->typeinfo->drawoutputfunc(C, node->block, ntree, node, sock, IFACE_(sock->name),
 		                               sock->locx-node->width+NODE_DYS, sock->locy-NODE_DYS, node->width-NODE_DY);
@@ -862,7 +872,7 @@ static void node_draw_hidden(const bContext *C, ARegion *ar, SpaceNode *snode, b
 	char showname[128];	/* 128 is used below */
 	
 	/* shadow */
-	node_draw_shadow(snode, node, hiddenrad);
+	node_draw_shadow(snode, node, hiddenrad, 1.0f);
 
 	/* body */
 	UI_ThemeColor(color_id);
@@ -935,16 +945,16 @@ static void node_draw_hidden(const bContext *C, ARegion *ar, SpaceNode *snode, b
 	dx-= snode->aspect;
 	fdrawline(rct->xmax-dx, centy-4.0f, rct->xmax-dx, centy+4.0f);
 	fdrawline(rct->xmax-dx-3.0f*snode->aspect, centy-4.0f, rct->xmax-dx-3.0f*snode->aspect, centy+4.0f);
-	
+
 	/* sockets */
 	for (sock= node->inputs.first; sock; sock= sock->next) {
 		if (!nodeSocketIsHidden(sock))
-			node_socket_circle_draw(snode->nodetree, sock, socket_size);
+			node_socket_circle_draw(snode->nodetree, sock, socket_size, sock->flag & SELECT);
 	}
 	
 	for (sock= node->outputs.first; sock; sock= sock->next) {
 		if (!nodeSocketIsHidden(sock))
-			node_socket_circle_draw(snode->nodetree, sock, socket_size);
+			node_socket_circle_draw(snode->nodetree, sock, socket_size, sock->flag & SELECT);
 	}
 	
 	uiEndBlock(C, node->block);
@@ -1128,15 +1138,15 @@ void drawnodespace(const bContext *C, ARegion *ar, View2D *v2d)
 	glDisable(GL_BLEND);
 	
 	/* draw grease-pencil ('canvas' strokes) */
-	if (/*(snode->flag & SNODE_DISPGP) &&*/ (snode->nodetree))
-		draw_gpencil_view2d((bContext*)C, 1);
+	if (snode->nodetree)
+		draw_gpencil_view2d(C, 1);
 	
 	/* reset view matrix */
 	UI_view2d_view_restore(C);
 	
 	/* draw grease-pencil (screen strokes, and also paintbuffer) */
-	if (/*(snode->flag & SNODE_DISPGP) && */(snode->nodetree))
-		draw_gpencil_view2d((bContext*)C, 0);
+	if (snode->nodetree)
+		draw_gpencil_view2d(C, 0);
 	
 	/* scrollers */
 	scrollers= UI_view2d_scrollers_calc(C, v2d, 10, V2D_GRID_CLAMP, V2D_ARG_DUMMY, V2D_ARG_DUMMY);
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index c4ea8c4025f..81e375f26bc 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -46,11 +46,15 @@
 #include "DNA_particle_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_world_types.h"
+#include "DNA_action_types.h"
+#include "DNA_anim_types.h"
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
+#include "BKE_action.h"
+#include "BKE_animsys.h"
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
 #include "BKE_global.h"
@@ -94,6 +98,7 @@
 #include "GPU_material.h"
 
 #include "node_intern.h"
+#include "NOD_socket.h"
 
 static EnumPropertyItem socket_in_out_items[] = {
 	{ SOCK_IN, "SOCK_IN", 0, "Input", "" },
@@ -1109,6 +1114,155 @@ void NODE_OT_group_socket_move_down(wmOperatorType *ot)
 
 /* ******************** Ungroup operator ********************** */
 
+/* returns 1 if its OK */
+static int node_group_ungroup(bNodeTree *ntree, bNode *gnode)
+{
+	bNodeLink *link, *linkn;
+	bNode *node, *nextn;
+	bNodeTree *ngroup, *wgroup;
+	ListBase anim_basepaths = {NULL, NULL};
+	
+	ngroup= (bNodeTree *)gnode->id;
+	if (ngroup==NULL) return 0;
+	
+	/* clear new pointers, set in copytree */
+	for (node= ntree->nodes.first; node; node= node->next)
+		node->new_node= NULL;
+	
+	/* wgroup is a temporary copy of the NodeTree we're merging in
+	 *	- all of wgroup's nodes are transferred across to their new home
+	 *	- ngroup (i.e. the source NodeTree) is left unscathed
+	 */
+	wgroup= ntreeCopyTree(ngroup);
+	
+	/* add the nodes into the ntree */
+	for (node= wgroup->nodes.first; node; node= nextn) {
+		nextn= node->next;
+		
+		/* keep track of this node's RNA "base" path (the part of the path identifying the node) 
+		 * if the old nodetree has animation data which potentially covers this node
+		 */
+		if (wgroup->adt) {
+			PointerRNA ptr;
+			char *path;
+			
+			RNA_pointer_create(&wgroup->id, &RNA_Node, node, &ptr);
+			path = RNA_path_from_ID_to_struct(&ptr);
+			
+			if (path)
+				BLI_addtail(&anim_basepaths, BLI_genericNodeN(path));
+		}
+		
+		/* migrate node */
+		BLI_remlink(&wgroup->nodes, node);
+		BLI_addtail(&ntree->nodes, node);
+		
+		node->locx += gnode->locx;
+		node->locy += gnode->locy;
+		
+		node->flag |= NODE_SELECT;
+	}
+	
+	/* restore external links to and from the gnode */
+	for (link= ntree->links.first; link; link= link->next) {
+		if (link->fromnode==gnode) {
+			if (link->fromsock->groupsock) {
+				bNodeSocket *gsock= link->fromsock->groupsock;
+				if (gsock->link) {
+					if (gsock->link->fromnode) {
+						/* NB: using the new internal copies here! the groupsock pointer still maps to the old tree */
+						link->fromnode = (gsock->link->fromnode ? gsock->link->fromnode->new_node : NULL);
+						link->fromsock = gsock->link->fromsock->new_sock;
+					}
+					else {
+						/* group output directly maps to group input */
+						bNodeSocket *insock= node_group_find_input(gnode, gsock->link->fromsock);
+						if (insock->link) {
+							link->fromnode = insock->link->fromnode;
+							link->fromsock = insock->link->fromsock;
+						}
+					}
+				}
+				else {
+					/* copy the default input value from the group socket default to the external socket */
+					node_socket_convert_default_value(link->tosock->type, link->tosock->default_value, gsock->type, gsock->default_value);
+				}
+			}
+		}
+	}
+	/* remove internal output links, these are not used anymore */
+	for (link=wgroup->links.first; link; link= linkn) {
+		linkn = link->next;
+		if (!link->tonode)
+			nodeRemLink(wgroup, link);
+	}
+	/* restore links from internal nodes */
+	for (link= wgroup->links.first; link; link= link->next) {
+		/* indicates link to group input */
+		if (!link->fromnode) {
+			/* NB: can't use find_group_node_input here,
+			 * because gnode sockets still point to the old tree!
+			 */
+			bNodeSocket *insock;
+			for (insock= gnode->inputs.first; insock; insock= insock->next)
+				if (insock->groupsock->new_sock == link->fromsock)
+					break;
+			if (insock->link) {
+				link->fromnode = insock->link->fromnode;
+				link->fromsock = insock->link->fromsock;
+			}
+			else {
+				/* copy the default input value from the group node socket default to the internal socket */
+				node_socket_convert_default_value(link->tosock->type, link->tosock->default_value, insock->type, insock->default_value);
+				nodeRemLink(wgroup, link);
+			}
+		}
+	}
+	
+	/* add internal links to the ntree */
+	for (link= wgroup->links.first; link; link= linkn) {
+		linkn= link->next;
+		BLI_remlink(&wgroup->links, link);
+		BLI_addtail(&ntree->links, link);
+	}
+	
+	/* and copy across the animation,
+	 * note that the animation data's action can be NULL here */
+	if (wgroup->adt) {
+		LinkData *ld, *ldn=NULL;
+		bAction *waction;
+		
+		/* firstly, wgroup needs to temporary dummy action that can be destroyed, as it shares copies */
+		waction = wgroup->adt->action = BKE_action_copy(wgroup->adt->action);
+		
+		/* now perform the moving */
+		BKE_animdata_separate_by_basepath(&wgroup->id, &ntree->id, &anim_basepaths);
+		
+		/* paths + their wrappers need to be freed */
+		for (ld = anim_basepaths.first; ld; ld = ldn) {
+			ldn = ld->next;
+			
+			MEM_freeN(ld->data);
+			BLI_freelinkN(&anim_basepaths, ld);
+		}
+		
+		/* free temp action too */
+		if (waction) {
+			BKE_libblock_free(&G.main->action, waction);
+		}
+	}
+	
+	/* delete the group instance. this also removes old input links! */
+	nodeFreeNode(ntree, gnode);
+
+	/* free the group tree (takes care of user count) */
+	BKE_libblock_free(&G.main->nodetree, wgroup);
+	
+	ntree->update |= NTREE_UPDATE_NODES | NTREE_UPDATE_LINKS;
+	
+	return 1;
+}
+
 static int node_group_ungroup_exec(bContext *C, wmOperator *op)
 {
 	SpaceNode *snode = CTX_wm_space_node(C);
@@ -1129,7 +1283,10 @@ static int node_group_ungroup_exec(bContext *C, wmOperator *op)
 		BKE_report(op->reports, RPT_WARNING, "Not a group");
 		return OPERATOR_CANCELLED;
 	}
-	else if (!node_group_ungroup(snode->edittree, gnode)) {
+	else if (node_group_ungroup(snode->nodetree, gnode)) {
+		ntreeUpdateTree(snode->nodetree);
+	}
+	else {
 		BKE_report(op->reports, RPT_WARNING, "Can't ungroup");
 		return OPERATOR_CANCELLED;
 	}
@@ -1155,6 +1312,200 @@ void NODE_OT_group_ungroup(wmOperatorType *ot)
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
+/* ******************** Separate operator ********************** */
+
+/* returns 1 if its OK */
+static int node_group_separate_selected(bNodeTree *ntree, bNode *gnode, int make_copy)
+{
+	bNodeLink *link, *link_next;
+	bNode *node, *node_next, *newnode;
+	bNodeTree *ngroup;
+	ListBase anim_basepaths = {NULL, NULL};
+	
+	ngroup= (bNodeTree *)gnode->id;
+	if (ngroup==NULL) return 0;
+	
+	/* deselect all nodes in the target tree */
+	for (node=ntree->nodes.first; node; node=node->next)
+		node_deselect(node);
+	
+	/* clear new pointers, set in nodeCopyNode */
+	for (node= ngroup->nodes.first; node; node= node->next)
+		node->new_node= NULL;
+	
+	/* add selected nodes into the ntree */
+	for (node= ngroup->nodes.first; node; node= node_next) {
+		node_next = node->next;
+		if (!(node->flag & NODE_SELECT))
+			continue;
+		
+		if (make_copy) {
+			/* make a copy */
+			newnode = nodeCopyNode(ngroup, node);
+		}
+		else {
+			/* use the existing node */
+			newnode = node;
+		}
+		
+		/* keep track of this node's RNA "base" path (the part of the path identifying the node) 
+		 * if the old nodetree has animation data which potentially covers this node
+		 */
+		if (ngroup->adt) {
+			PointerRNA ptr;
+			char *path;
+			
+			RNA_pointer_create(&ngroup->id, &RNA_Node, newnode, &ptr);
+			path = RNA_path_from_ID_to_struct(&ptr);
+			
+			if (path)
+				BLI_addtail(&anim_basepaths, BLI_genericNodeN(path));
+		}
+		
+		/* ensure valid parent pointers, detach if parent stays inside the group */
+		if (newnode->parent && !(newnode->parent->flag & NODE_SELECT))
+			nodeDetachNode(newnode);
+		
+		/* migrate node */
+		BLI_remlink(&ngroup->nodes, newnode);
+		BLI_addtail(&ntree->nodes, newnode);
+		
+		newnode->locx += gnode->locx;
+		newnode->locy += gnode->locy;
+	}
+	
+	/* add internal links to the ntree */
+	for (link= ngroup->links.first; link; link= link_next) {
+		int fromselect = (link->fromnode && (link->fromnode->flag & NODE_SELECT));
+		int toselect = (link->tonode && (link->tonode->flag & NODE_SELECT));
+		link_next = link->next;
+		
+		if (make_copy) {
+			/* make a copy of internal links */
+			if (fromselect && toselect)
+				nodeAddLink(ntree, link->fromnode->new_node, link->fromsock->new_sock, link->tonode->new_node, link->tosock->new_sock);
+		}
+		else {
+			/* move valid links over, delete broken links */
+			if (fromselect && toselect) {
+				BLI_remlink(&ngroup->links, link);
+				BLI_addtail(&ntree->links, link);
+			}
+			else if (fromselect || toselect) {
+				nodeRemLink(ngroup, link);
+			}
+		}
+	}
+	
+	/* and copy across the animation,
+	 * note that the animation data's action can be NULL here */
+	if (ngroup->adt) {
+		LinkData *ld, *ldn=NULL;
+		
+		/* now perform the moving */
+		BKE_animdata_separate_by_basepath(&ngroup->id, &ntree->id, &anim_basepaths);
+		
+		/* paths + their wrappers need to be freed */
+		for (ld = anim_basepaths.first; ld; ld = ldn) {
+			ldn = ld->next;
+			
+			MEM_freeN(ld->data);
+			BLI_freelinkN(&anim_basepaths, ld);
+		}
+	}
+	
+	ntree->update |= NTREE_UPDATE_NODES | NTREE_UPDATE_LINKS;
+	if (!make_copy)
+		ngroup->update |= NTREE_UPDATE_NODES | NTREE_UPDATE_LINKS;
+	
+	return 1;
+}
+
+typedef enum eNodeGroupSeparateType {
+	NODE_GS_COPY,
+	NODE_GS_MOVE
+} eNodeGroupSeparateType;
+
+/* Operator Property */
+EnumPropertyItem node_group_separate_types[] = {
+    {NODE_GS_COPY, "COPY", 0, "Copy", "Copy to parent node tree, keep group intact"},
+	{NODE_GS_MOVE, "MOVE", 0, "Move", "Move to parent node tree, remove from group"},
+	{0, NULL, 0, NULL, NULL}
+};
+
+static int node_group_separate_exec(bContext *C, wmOperator *op)
+{
+	SpaceNode *snode = CTX_wm_space_node(C);
+	bNode *gnode;
+	int type = RNA_enum_get(op->ptr, "type");
+
+	ED_preview_kill_jobs(C);
+
+	/* are we inside of a group? */
+	gnode= node_tree_get_editgroup(snode->nodetree);
+	if (!gnode) {
+		BKE_report(op->reports, RPT_WARNING, "Not inside node group");
+		return OPERATOR_CANCELLED;
+	}
+	
+	switch (type) {
+	case NODE_GS_COPY:
+		if (!node_group_separate_selected(snode->nodetree, gnode, 1)) {
+			BKE_report(op->reports, RPT_WARNING, "Can't separate nodes");
+			return OPERATOR_CANCELLED;
+		}
+		break;
+	case NODE_GS_MOVE:
+		if (!node_group_separate_selected(snode->nodetree, gnode, 0)) {
+			BKE_report(op->reports, RPT_WARNING, "Can't separate nodes");
+			return OPERATOR_CANCELLED;
+		}
+		break;
+	}
+	
+	/* switch to parent tree */
+	snode_make_group_editable(snode, NULL);
+	
+	ntreeUpdateTree(snode->nodetree);
+	
+	snode_notify(C, snode);
+	snode_dag_update(C, snode);
+
+	return OPERATOR_FINISHED;
+}
+
+static int node_group_separate_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *UNUSED(event))
+{
+	uiPopupMenu *pup = uiPupMenuBegin(C, "Separate", ICON_NONE);
+	uiLayout *layout = uiPupMenuLayout(pup);
+	
+	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT);
+	uiItemEnumO(layout, "NODE_OT_group_separate", NULL, 0, "type", NODE_GS_COPY);
+	uiItemEnumO(layout, "NODE_OT_group_separate", NULL, 0, "type", NODE_GS_MOVE);
+	
+	uiPupMenuEnd(C, pup);
+	
+	return OPERATOR_CANCELLED;
+}
+
+void NODE_OT_group_separate(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Separate";
+	ot->description = "Separate selected nodes from the node group";
+	ot->idname = "NODE_OT_group_separate";
+	
+	/* api callbacks */
+	ot->invoke = node_group_separate_invoke;
+	ot->exec = node_group_separate_exec;
+	ot->poll = ED_operator_node_active;
+	
+	/* flags */
+	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	RNA_def_enum(ot->srna, "type", node_group_separate_types, NODE_GS_COPY, "Type", "");
+}
+
 /* ************************** Node generic ************** */
 
 /* is rct in visible part of node? */
@@ -1679,7 +2030,7 @@ int node_has_hidden_sockets(bNode *node)
 }
 
 void node_set_hidden_sockets(SpaceNode *snode, bNode *node, int set)
-{	
+{
 	bNodeSocket *sock;
 
 	if (set==0) {
@@ -1785,6 +2136,8 @@ static int node_link_viewer(const bContext *C, bNode *tonode)
 		else {
 			link->fromnode= tonode;
 			link->fromsock= sock;
+			/* make sure the dependency sorting is updated */
+			snode->edittree->update |= NTREE_UPDATE_LINKS;
 		}
 		ntreeUpdateTree(snode->edittree);
 		snode_update(snode, node);
@@ -2399,6 +2752,7 @@ static int node_link_modal(bContext *C, wmOperator *op, wmEvent *event)
 	SpaceNode *snode= CTX_wm_space_node(C);
 	ARegion *ar= CTX_wm_region(C);
 	bNodeLinkDrag *nldrag= op->customdata;
+	bNodeTree *ntree = snode->edittree;
 	bNode *tnode;
 	bNodeSocket *tsock= NULL;
 	bNodeLink *link;
@@ -2429,12 +2783,12 @@ static int node_link_modal(bContext *C, wmOperator *op, wmEvent *event)
 						link->tonode = tnode;
 						link->tosock = tsock;
 						/* add it to the node tree temporarily */
-						if (link->prev==NULL && link->next==NULL)
-							BLI_addtail(&snode->edittree->links, link);
+						if (BLI_findindex(&ntree->links, link) < 0)
+							BLI_addtail(&ntree->links, link);
 						
-						snode->edittree->update |= NTREE_UPDATE_LINKS;
+						ntree->update |= NTREE_UPDATE_LINKS;
 					}
-					ntreeUpdateTree(snode->edittree);
+					ntreeUpdateTree(ntree);
 				}
 				else {
 					int do_update = FALSE;
@@ -2442,17 +2796,17 @@ static int node_link_modal(bContext *C, wmOperator *op, wmEvent *event)
 						link = linkdata->data;
 						
 						if (link->tonode || link->tosock) {
-							BLI_remlink(&snode->edittree->links, link);
+							BLI_remlink(&ntree->links, link);
 							link->prev = link->next = NULL;
 							link->tonode= NULL;
 							link->tosock= NULL;
 							
-							snode->edittree->update |= NTREE_UPDATE_LINKS;
+							ntree->update |= NTREE_UPDATE_LINKS;
 							do_update = TRUE;
 						}
 					}
 					if (do_update) {
-						ntreeUpdateTree(snode->edittree);
+						ntreeUpdateTree(ntree);
 					}
 				}
 			}
@@ -2472,12 +2826,12 @@ static int node_link_modal(bContext *C, wmOperator *op, wmEvent *event)
 						link->fromnode = tnode;
 						link->fromsock = tsock;
 						/* add it to the node tree temporarily */
-						if (link->prev==NULL && link->next==NULL)
-							BLI_addtail(&snode->edittree->links, link);
+						if (BLI_findindex(&ntree->links, link) < 0)
+							BLI_addtail(&ntree->links, link);
 						
-						snode->edittree->update |= NTREE_UPDATE_LINKS;
+						ntree->update |= NTREE_UPDATE_LINKS;
 					}
-					ntreeUpdateTree(snode->edittree);
+					ntreeUpdateTree(ntree);
 				}
 				else {
 					int do_update = FALSE;
@@ -2485,17 +2839,17 @@ static int node_link_modal(bContext *C, wmOperator *op, wmEvent *event)
 						link = linkdata->data;
 						
 						if (link->fromnode || link->fromsock) {
-							BLI_remlink(&snode->edittree->links, link);
+							BLI_remlink(&ntree->links, link);
 							link->prev = link->next = NULL;
 							link->fromnode= NULL;
 							link->fromsock= NULL;
 							
-							snode->edittree->update |= NTREE_UPDATE_LINKS;
+							ntree->update |= NTREE_UPDATE_LINKS;
 							do_update = TRUE;
 						}
 					}
 					if (do_update) {
-						ntreeUpdateTree(snode->edittree);
+						ntreeUpdateTree(ntree);
 					}
 				}
 			}
@@ -2528,27 +2882,27 @@ static int node_link_modal(bContext *C, wmOperator *op, wmEvent *event)
 				else if (outside_group_rect(snode) && (link->tonode || link->fromnode)) {
 					/* automatically add new group socket */
 					if (link->tonode && link->tosock) {
-						link->fromsock = node_group_expose_socket(snode->edittree, link->tosock, SOCK_IN);
+						link->fromsock = node_group_expose_socket(ntree, link->tosock, SOCK_IN);
 						link->fromnode = NULL;
-						if (link->prev==NULL && link->next==NULL)
-							BLI_addtail(&snode->edittree->links, link);
+						if (BLI_findindex(&ntree->links, link) < 0)
+							BLI_addtail(&ntree->links, link);
 						
-						snode->edittree->update |= NTREE_UPDATE_GROUP_IN | NTREE_UPDATE_LINKS;
+						ntree->update |= NTREE_UPDATE_GROUP_IN | NTREE_UPDATE_LINKS;
 					}
 					else if (link->fromnode && link->fromsock) {
-						link->tosock = node_group_expose_socket(snode->edittree, link->fromsock, SOCK_OUT);
+						link->tosock = node_group_expose_socket(ntree, link->fromsock, SOCK_OUT);
 						link->tonode = NULL;
-						if (link->prev==NULL && link->next==NULL)
-							BLI_addtail(&snode->edittree->links, link);
+						if (BLI_findindex(&ntree->links, link) < 0)
+							BLI_addtail(&ntree->links, link);
 						
-						snode->edittree->update |= NTREE_UPDATE_GROUP_OUT | NTREE_UPDATE_LINKS;
+						ntree->update |= NTREE_UPDATE_GROUP_OUT | NTREE_UPDATE_LINKS;
 					}
 				}
 				else
-					nodeRemLink(snode->edittree, link);
+					nodeRemLink(ntree, link);
 			}
 			
-			ntreeUpdateTree(snode->edittree);
+			ntreeUpdateTree(ntree);
 			snode_notify(C, snode);
 			snode_dag_update(C, snode);
 			
@@ -2589,6 +2943,7 @@ static bNodeLinkDrag *node_link_init(SpaceNode *snode, int detach)
 					linkdata = MEM_callocN(sizeof(LinkData), "drag link op link data");
 					linkdata->data = oplink = MEM_callocN(sizeof(bNodeLink), "drag link op link");
 					*oplink = *link;
+					oplink->next = oplink->prev = NULL;
 					BLI_addtail(&nldrag->links, linkdata);
 					nodeRemLink(snode->edittree, link);
 				}
@@ -2620,6 +2975,7 @@ static bNodeLinkDrag *node_link_init(SpaceNode *snode, int detach)
 					linkdata = MEM_callocN(sizeof(LinkData), "drag link op link data");
 					linkdata->data = oplink = MEM_callocN(sizeof(bNodeLink), "drag link op link");
 					*oplink = *link;
+					oplink->next = oplink->prev = NULL;
 					BLI_addtail(&nldrag->links, linkdata);
 					nodeRemLink(snode->edittree, link);
 					
@@ -2744,14 +3100,110 @@ void NODE_OT_link_make(wmOperatorType *ot)
 	RNA_def_boolean(ot->srna, "replace", 0, "Replace", "Replace socket connections with the new links");
 }
 
-/* ********************** Cut Link operator ***************** */
-
+/* ********************** Add reroute operator ***************** */
 #define LINK_RESOL 12
+static int add_reroute_intersect_check(bNodeLink *link, float mcoords[][2], int tot, float result[2])
+{
+	float coord_array[LINK_RESOL+1][2];
+	int i, b;
+
+	if (node_link_bezier_points(NULL, NULL, link, coord_array, LINK_RESOL)) {
+
+		for (i=0; i<tot-1; i++)
+			for (b=0; b<LINK_RESOL; b++)
+				if (isect_line_line_v2(mcoords[i], mcoords[i+1], coord_array[b], coord_array[b+1]) > 0) {
+					result[0] = (mcoords[i][0]+mcoords[i+1][0])/2.0f;
+					result[1] = (mcoords[i][1]+mcoords[i+1][1])/2.0f;
+					return 1;
+				}
+	}
+	return 0;
+}
+
+static int add_reroute_exec(bContext *C, wmOperator *op)
+{
+	SpaceNode *snode= CTX_wm_space_node(C);
+	ARegion *ar= CTX_wm_region(C);
+	float mcoords[256][2];
+	int i= 0;
+
+	RNA_BEGIN(op->ptr, itemptr, "path") {
+		float loc[2];
+
+		RNA_float_get_array(&itemptr, "loc", loc);
+		UI_view2d_region_to_view(&ar->v2d, (short)loc[0], (short)loc[1],
+								 &mcoords[i][0], &mcoords[i][1]);
+		i++;
+		if (i>= 256) break;
+	}
+	RNA_END;
+
+	if (i>1) {
+		bNodeLink *link;
+		float insertPoint[2];
+
+		ED_preview_kill_jobs(C);
+
+		for (link= snode->edittree->links.first; link; link=link->next) {
+			if (add_reroute_intersect_check(link, mcoords, i, insertPoint)) {
+				bNodeTemplate ntemp;
+				bNode *rerouteNode;
+				
+				node_deselect_all(snode);
+				
+				ntemp.type = NODE_REROUTE;
+				rerouteNode = nodeAddNode(snode->edittree, &ntemp);
+				rerouteNode->locx = insertPoint[0];
+				rerouteNode->locy = insertPoint[1];
+				
+				nodeAddLink(snode->edittree, link->fromnode, link->fromsock, rerouteNode, rerouteNode->inputs.first);
+				link->fromnode = rerouteNode;
+				link->fromsock = rerouteNode->outputs.first;
+				
+				break; // add one reroute at the time.
+			}
+		}
+
+		ntreeUpdateTree(snode->edittree);
+		snode_notify(C, snode);
+		snode_dag_update(C, snode);
+
+		return OPERATOR_FINISHED;
+	}
+
+	return OPERATOR_CANCELLED|OPERATOR_PASS_THROUGH;
+}
+
+void NODE_OT_add_reroute(wmOperatorType *ot)
+{
+	PropertyRNA *prop;
+
+	ot->name= "Add reroute";
+	ot->idname= "NODE_OT_add_reroute";
+
+	ot->invoke= WM_gesture_lines_invoke;
+	ot->modal= WM_gesture_lines_modal;
+	ot->exec= add_reroute_exec;
+	ot->cancel= WM_gesture_lines_cancel;
+
+	ot->poll= ED_operator_node_active;
+
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+
+	prop= RNA_def_property(ot->srna, "path", PROP_COLLECTION, PROP_NONE);
+	RNA_def_property_struct_runtime(prop, &RNA_OperatorMousePath);
+	/* internal */
+	RNA_def_int(ot->srna, "cursor", BC_CROSSCURSOR, 0, INT_MAX, "Cursor", "", 0, INT_MAX);
+}
+
+
+/* ********************** Cut Link operator ***************** */
 static int cut_links_intersect(bNodeLink *link, float mcoords[][2], int tot)
 {
 	float coord_array[LINK_RESOL+1][2];
 	int i, b;
-	
+
 	if (node_link_bezier_points(NULL, NULL, link, coord_array, LINK_RESOL)) {
 
 		for (i=0; i<tot-1; i++)
@@ -3148,10 +3600,219 @@ void NODE_OT_render_changed(wmOperatorType *ot)
 
 /* ****************** Make Group operator ******************* */
 
+static int node_group_make_test(bNodeTree *ntree, bNode *gnode)
+{
+	bNode *node;
+	bNodeLink *link;
+	int totnode = 0;
+	
+	/* is there something to group? also do some clearing */
+	for (node= ntree->nodes.first; node; node= node->next) {
+		if (node == gnode)
+			continue;
+		
+		if (node->flag & NODE_SELECT) {
+			/* no groups in groups */
+			if (node->type==NODE_GROUP)
+				return 0;
+			totnode++;
+		}
+		
+		node->done = 0;
+	}
+	if (totnode==0) return 0;
+	
+	/* check if all connections are OK, no unselected node has both
+	 * inputs and outputs to a selection */
+	for (link= ntree->links.first; link; link= link->next) {
+		if (link->fromnode && link->tonode && link->fromnode->flag & NODE_SELECT && link->fromnode != gnode)
+			link->tonode->done |= 1;
+		if (link->fromnode && link->tonode && link->tonode->flag & NODE_SELECT && link->tonode != gnode)
+			link->fromnode->done |= 2;
+	}
+	
+	for (node= ntree->nodes.first; node; node= node->next) {
+		if (node == gnode)
+			continue;
+		if ((node->flag & NODE_SELECT)==0)
+			if (node->done==3)
+				break;
+	}
+	if (node) 
+		return 0;
+	
+	return 1;
+}
+
+static void node_get_selected_minmax(bNodeTree *ntree, bNode *gnode, float *min, float *max)
+{
+	bNode *node;
+	INIT_MINMAX2(min, max);
+	for (node= ntree->nodes.first; node; node= node->next) {
+		if (node == gnode)
+			continue;
+		if (node->flag & NODE_SELECT) {
+			DO_MINMAX2((&node->locx), min, max);
+		}
+	}
+}
+
+static int node_group_make_insert_selected(bNodeTree *ntree, bNode *gnode)
+{
+	bNodeTree *ngroup = (bNodeTree *)gnode->id;
+	bNodeLink *link, *linkn;
+	bNode *node, *nextn;
+	bNodeSocket *gsock;
+	ListBase anim_basepaths = {NULL, NULL};
+	float min[2], max[2];
+	
+	/* deselect all nodes in the target tree */
+	for (node = ngroup->nodes.first; node; node=node->next)
+		node_deselect(node);
+	
+	node_get_selected_minmax(ntree, gnode, min, max);
+	
+	/* move nodes over */
+	for (node= ntree->nodes.first; node; node= nextn) {
+		nextn= node->next;
+		if (node == gnode)
+			continue;
+		if (node->flag & NODE_SELECT) {
+			/* keep track of this node's RNA "base" path (the part of the pat identifying the node) 
+			 * if the old nodetree has animation data which potentially covers this node
+			 */
+			if (ntree->adt) {
+				PointerRNA ptr;
+				char *path;
+				
+				RNA_pointer_create(&ntree->id, &RNA_Node, node, &ptr);
+				path = RNA_path_from_ID_to_struct(&ptr);
+				
+				if (path)
+					BLI_addtail(&anim_basepaths, BLI_genericNodeN(path));
+			}
+			
+			/* ensure valid parent pointers, detach if parent stays outside the group */
+			if (node->parent && !(node->parent->flag & NODE_SELECT))
+				nodeDetachNode(node);
+			
+			/* change node-collection membership */
+			BLI_remlink(&ntree->nodes, node);
+			BLI_addtail(&ngroup->nodes, node);
+			
+			node->locx-= 0.5f*(min[0]+max[0]);
+			node->locy-= 0.5f*(min[1]+max[1]);
+		}
+	}
+
+	/* move animation data over */
+	if (ntree->adt) {
+		LinkData *ld, *ldn=NULL;
+		
+		BKE_animdata_separate_by_basepath(&ntree->id, &ngroup->id, &anim_basepaths);
+		
+		/* paths + their wrappers need to be freed */
+		for (ld = anim_basepaths.first; ld; ld = ldn) {
+			ldn = ld->next;
+			
+			MEM_freeN(ld->data);
+			BLI_freelinkN(&anim_basepaths, ld);
+		}
+	}
+	
+	/* node groups don't use internal cached data */
+	ntreeFreeCache(ngroup);
+	
+	/* relink external sockets */
+	for (link= ntree->links.first; link; link= linkn) {
+		int fromselect = (link->fromnode && (link->fromnode->flag & NODE_SELECT) && link->fromnode != gnode);
+		int toselect = (link->tonode && (link->tonode->flag & NODE_SELECT) && link->tonode != gnode);
+		linkn= link->next;
+		
+		if (gnode && ((fromselect && link->tonode == gnode) || (toselect && link->fromnode == gnode))) {
+			/* remove all links to/from the gnode.
+			 * this can remove link information, but there's no general way to preserve it.
+			 */
+			nodeRemLink(ntree, link);
+		}
+		else if (fromselect && toselect) {
+			BLI_remlink(&ntree->links, link);
+			BLI_addtail(&ngroup->links, link);
+		}
+		else if (toselect) {
+			gsock = node_group_expose_socket(ngroup, link->tosock, SOCK_IN);
+			link->tosock->link = nodeAddLink(ngroup, NULL, gsock, link->tonode, link->tosock);
+			link->tosock = node_group_add_extern_socket(ntree, &gnode->inputs, SOCK_IN, gsock);
+			link->tonode = gnode;
+		}
+		else if (fromselect) {
+			/* search for existing group node socket */
+			for (gsock=ngroup->outputs.first; gsock; gsock=gsock->next)
+				if (gsock->link && gsock->link->fromsock==link->fromsock)
+					break;
+			if (!gsock) {
+				gsock = node_group_expose_socket(ngroup, link->fromsock, SOCK_OUT);
+				gsock->link = nodeAddLink(ngroup, link->fromnode, link->fromsock, NULL, gsock);
+				link->fromsock = node_group_add_extern_socket(ntree, &gnode->outputs, SOCK_OUT, gsock);
+			}
+			else
+				link->fromsock = node_group_find_output(gnode, gsock);
+			link->fromnode = gnode;
+		}
+	}
+
+	/* update of the group tree */
+	ngroup->update |= NTREE_UPDATE;
+	/* update of the tree containing the group instance node */
+	ntree->update |= NTREE_UPDATE_NODES | NTREE_UPDATE_LINKS;
+
+	return 1;
+}
+
+static bNode *node_group_make_from_selected(bNodeTree *ntree)
+{
+	bNode *gnode;
+	bNodeTree *ngroup;
+	float min[2], max[2];
+	bNodeTemplate ntemp;
+	
+	node_get_selected_minmax(ntree, NULL, min, max);
+	
+	/* new nodetree */
+	ngroup= ntreeAddTree("NodeGroup", ntree->type, NODE_GROUP);
+	
+	/* make group node */
+	ntemp.type = NODE_GROUP;
+	ntemp.ngroup = ngroup;
+	gnode= nodeAddNode(ntree, &ntemp);
+	gnode->locx= 0.5f*(min[0]+max[0]);
+	gnode->locy= 0.5f*(min[1]+max[1]);
+	
+	node_group_make_insert_selected(ntree, gnode);
+
+	/* update of the tree containing the group instance node */
+	ntree->update |= NTREE_UPDATE_NODES;
+
+	return gnode;
+}
+
+typedef enum eNodeGroupMakeType {
+	NODE_GM_NEW,
+	NODE_GM_INSERT
+} eNodeGroupMakeType;
+
+/* Operator Property */
+EnumPropertyItem node_group_make_types[] = {
+	{NODE_GM_NEW, "NEW", 0, "New", "Create a new node group from selected nodes"},
+	{NODE_GM_INSERT, "INSERT", 0, "Insert", "Insert into active node group"},
+	{0, NULL, 0, NULL, NULL}
+};
+
 static int node_group_make_exec(bContext *C, wmOperator *op)
 {
 	SpaceNode *snode = CTX_wm_space_node(C);
 	bNode *gnode;
+	int type = RNA_enum_get(op->ptr, "type");
 	
 	if (snode->edittree!=snode->nodetree) {
 		BKE_report(op->reports, RPT_WARNING, "Can not add a new Group in a Group");
@@ -3171,25 +3832,70 @@ static int node_group_make_exec(bContext *C, wmOperator *op)
 			return OPERATOR_CANCELLED;
 		}
 	}
-
-	ED_preview_kill_jobs(C);
 	
-	gnode= node_group_make_from_selected(snode->nodetree);
-	if (gnode==NULL) {
-		BKE_report(op->reports, RPT_WARNING, "Can not make Group");
-		return OPERATOR_CANCELLED;
+	ED_preview_kill_jobs(C);
+
+	switch (type) {
+	case NODE_GM_NEW:
+		if (node_group_make_test(snode->nodetree, NULL)) {
+			gnode = node_group_make_from_selected(snode->nodetree);
+		}
+		else {
+			BKE_report(op->reports, RPT_WARNING, "Can not make Group");
+			return OPERATOR_CANCELLED;
+		}
+		break;
+	case NODE_GM_INSERT:
+		gnode = nodeGetActive(snode->nodetree);
+		if (!gnode || gnode->type != NODE_GROUP) {
+			BKE_report(op->reports, RPT_WARNING, "No active Group node");
+			return OPERATOR_CANCELLED;
+		}
+		if (node_group_make_test(snode->nodetree, gnode)) {
+			node_group_make_insert_selected(snode->nodetree, gnode);
+		}
+		else {
+			BKE_report(op->reports, RPT_WARNING, "Can not insert into Group");
+			return OPERATOR_CANCELLED;
+		}
+		break;
 	}
-	else {
+
+	if (gnode) {
 		nodeSetActive(snode->nodetree, gnode);
-		ntreeUpdateTree(snode->nodetree);
+		snode_make_group_editable(snode, gnode);
 	}
 	
+	if (gnode)
+		ntreeUpdateTree((bNodeTree *)gnode->id);
+	ntreeUpdateTree(snode->nodetree);
+
 	snode_notify(C, snode);
 	snode_dag_update(C, snode);
 	
 	return OPERATOR_FINISHED;
 }
 
+static int node_group_make_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *UNUSED(event))
+{
+	SpaceNode *snode = CTX_wm_space_node(C);
+	bNode *act = nodeGetActive(snode->edittree);
+	uiPopupMenu *pup = uiPupMenuBegin(C, "Make Group", ICON_NONE);
+	uiLayout *layout = uiPupMenuLayout(pup);
+	
+	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT);
+	uiItemEnumO(layout, "NODE_OT_group_make", NULL, 0, "type", NODE_GM_NEW);
+	
+	/* if active node is a group, add insert option */
+	if (act && act->type == NODE_GROUP) {
+		uiItemEnumO(layout, "NODE_OT_group_make", NULL, 0, "type", NODE_GM_INSERT);
+	}
+	
+	uiPupMenuEnd(C, pup);
+	
+	return OPERATOR_CANCELLED;
+}
+
 void NODE_OT_group_make(wmOperatorType *ot)
 {
 	/* identifiers */
@@ -3198,11 +3904,14 @@ void NODE_OT_group_make(wmOperatorType *ot)
 	ot->idname = "NODE_OT_group_make";
 	
 	/* api callbacks */
+	ot->invoke = node_group_make_invoke;
 	ot->exec = node_group_make_exec;
 	ot->poll = ED_operator_node_active;
 	
 	/* flags */
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	RNA_def_enum(ot->srna, "type", node_group_make_types, NODE_GM_NEW, "Type", "");
 }
 
 /* ****************** Hide operator *********************** */
@@ -4055,7 +4764,7 @@ void NODE_OT_join(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name = "Join Nodes";
-	ot->description = "Attaches selected nodes to a new common frame";
+	ot->description = "Attach selected nodes to a new common frame";
 	ot->idname = "NODE_OT_join";
 
 	/* api callbacks */
@@ -4125,7 +4834,7 @@ void NODE_OT_attach(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name = "Attach Nodes";
-	ot->description = "Attaches active node to a frame";
+	ot->description = "Attach active node to a frame";
 	ot->idname = "NODE_OT_attach";
 
 	/* api callbacks */
@@ -4194,7 +4903,7 @@ void NODE_OT_detach(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name = "Detach Nodes";
-	ot->description = "Detaches selected nodes from parents";
+	ot->description = "Detach selected nodes from parents";
 	ot->idname = "NODE_OT_detach";
 
 	/* api callbacks */
diff --git a/source/blender/editors/space_node/node_header.c b/source/blender/editors/space_node/node_header.c
index bb52c1570aa..0d03df2298f 100644
--- a/source/blender/editors/space_node/node_header.c
+++ b/source/blender/editors/space_node/node_header.c
@@ -157,22 +157,6 @@ static void do_node_add_group(bContext *C, void *UNUSED(arg), int event)
 	do_node_add(C, &ntemp);
 }
 
-#if 0 /* disabled */
-static void do_node_add_dynamic(bContext *C, void *UNUSED(arg), int event)
-{
-	Main *bmain = CTX_data_main(C);
-	Scene *scene = CTX_data_scene(C);
-	bNodeTemplate ntemp;
-	
-	ntemp.type = NODE_DYNAMIC;
-	
-	ntemp.main = bmain;
-	ntemp.scene = scene;
-	
-	do_node_add(C, &ntemp);
-}
-#endif
-
 static int node_tree_has_type(int treetype, int nodetype)
 {
 	bNodeTreeType *ttype= ntreeGetType(treetype);
@@ -228,9 +212,6 @@ static void node_add_menu(bContext *C, uiLayout *layout, void *arg_nodeclass)
 			}
 		}
 	}
-	else if (nodeclass==NODE_DYNAMIC) {
-		/* disabled */
-	}
 	else {
 		bNodeType *ntype;
 		
diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h
index 60177192e2a..d9dbd646fa5 100644
--- a/source/blender/editors/space_node/node_intern.h
+++ b/source/blender/editors/space_node/node_intern.h
@@ -50,8 +50,7 @@ struct bNodeLink;
 struct Main;
 
 /* temp data to pass on to modal */
-typedef struct bNodeLinkDrag
-{
+typedef struct bNodeLinkDrag {
 	struct bNodeLinkDrag *next, *prev;
 	
 	/* List of links dragged by the operator.
@@ -70,11 +69,13 @@ void node_menus_register(void);
 
 /* node_draw.c */
 int node_get_colorid(struct bNode *node);
-void node_socket_circle_draw(struct bNodeTree *ntree, struct bNodeSocket *sock, float size);
+void node_socket_circle_draw(struct bNodeTree *ntree, struct bNodeSocket *sock, float size, int highlight);
 int node_get_resize_cursor(int directions);
-void node_draw_shadow(struct SpaceNode *snode, struct bNode *node, float radius);
+void node_draw_shadow(struct SpaceNode *snode, struct bNode *node, float radius, float alpha);
 void node_draw_default(const struct bContext *C, struct ARegion *ar, struct SpaceNode *snode, struct bNodeTree *ntree, struct bNode *node);
 void node_update_default(const struct bContext *C, struct bNodeTree *ntree, struct bNode *node);
+int node_select_area_default(struct bNode *node, int x, int y);
+int node_tweak_area_default(struct bNode *node, int x, int y);
 void node_update_nodetree(const struct bContext *C, struct bNodeTree *ntree, float offsetx, float offsety);
 void node_draw_nodetree(const struct bContext *C, struct ARegion *ar, struct SpaceNode *snode, struct bNodeTree *ntree);
 void drawnodespace(const bContext *C, ARegion *ar, View2D *v2d);
@@ -144,9 +145,11 @@ void NODE_OT_link(struct wmOperatorType *ot);
 void NODE_OT_link_make(struct wmOperatorType *ot);
 void NODE_OT_links_cut(struct wmOperatorType *ot);
 void NODE_OT_links_detach(struct wmOperatorType *ot);
+void NODE_OT_add_reroute(struct wmOperatorType *ot);
 
 void NODE_OT_group_make(struct wmOperatorType *ot);
 void NODE_OT_group_ungroup(struct wmOperatorType *ot);
+void NODE_OT_group_separate(struct wmOperatorType *ot);
 void NODE_OT_group_edit(struct wmOperatorType *ot);
 void NODE_OT_group_socket_add(struct wmOperatorType *ot);
 void NODE_OT_group_socket_remove(struct wmOperatorType *ot);
diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c
index 781a14fca59..ff1661f0327 100644
--- a/source/blender/editors/space_node/node_ops.c
+++ b/source/blender/editors/space_node/node_ops.c
@@ -79,9 +79,11 @@ void node_operatortypes(void)
 	WM_operatortype_append(NODE_OT_link_make);
 	WM_operatortype_append(NODE_OT_links_cut);
 	WM_operatortype_append(NODE_OT_links_detach);
+	WM_operatortype_append(NODE_OT_add_reroute);
 
 	WM_operatortype_append(NODE_OT_group_make);
 	WM_operatortype_append(NODE_OT_group_ungroup);
+	WM_operatortype_append(NODE_OT_group_separate);
 	WM_operatortype_append(NODE_OT_group_edit);
 	WM_operatortype_append(NODE_OT_group_socket_add);
 	WM_operatortype_append(NODE_OT_group_socket_remove);
@@ -218,6 +220,7 @@ void node_keymap(struct wmKeyConfig *keyconf)
 		RNA_boolean_set(kmi->ptr, "detach", TRUE);
 	WM_keymap_add_item(keymap, "NODE_OT_resize", LEFTMOUSE, KM_PRESS, 0, 0);
 	
+	WM_keymap_add_item(keymap, "NODE_OT_add_reroute", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);
 	WM_keymap_add_item(keymap, "NODE_OT_links_cut", LEFTMOUSE, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "NODE_OT_select_link_viewer", LEFTMOUSE, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
 	
@@ -267,6 +270,7 @@ void node_keymap(struct wmKeyConfig *keyconf)
 
 	WM_keymap_add_item(keymap, "NODE_OT_group_make", GKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "NODE_OT_group_ungroup", GKEY, KM_PRESS, KM_ALT, 0);
+	WM_keymap_add_item(keymap, "NODE_OT_group_separate", PKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "NODE_OT_group_edit", TABKEY, KM_PRESS, 0, 0);
 	
 	WM_keymap_add_item(keymap, "NODE_OT_read_renderlayers", RKEY, KM_PRESS, KM_CTRL, 0);
diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c
index 9098c8a4255..e7be750928d 100644
--- a/source/blender/editors/space_node/node_select.c
+++ b/source/blender/editors/space_node/node_select.c
@@ -38,6 +38,7 @@
 
 #include "BKE_context.h"
 #include "BKE_main.h"
+#include "BKE_node.h"
 
 #include "BLI_rect.h"
 #include "BLI_utildefines.h"
@@ -58,14 +59,28 @@
 
 /* ****** helpers ****** */
 
-static bNode *node_under_mouse(bNodeTree *ntree, int mx, int my)
+static bNode *node_under_mouse_select(bNodeTree *ntree, int mx, int my)
 {
 	bNode *node;
 	
 	for (node=ntree->nodes.last; node; node=node->prev) {
-		/* node body (header and scale are in other operators) */
-		if (BLI_in_rctf(&node->totr, mx, my))
-			return node;
+		if (node->typeinfo->select_area_func) {
+			if (node->typeinfo->select_area_func(node, mx, my))
+				return node;
+		}
+	}
+	return NULL;
+}
+
+static bNode *node_under_mouse_tweak(bNodeTree *ntree, int mx, int my)
+{
+	bNode *node;
+	
+	for (node=ntree->nodes.last; node; node=node->prev) {
+		if (node->typeinfo->tweak_area_func) {
+			if (node->typeinfo->tweak_area_func(node, mx, my))
+				return node;
+		}
 	}
 	return NULL;
 }
@@ -350,7 +365,7 @@ static int node_mouse_select(Main *bmain, SpaceNode *snode, ARegion *ar, const i
 		}
 		else {
 			/* find the closest visible node */
-			node = node_under_mouse(snode->edittree, mx, my);
+			node = node_under_mouse_select(snode->edittree, mx, my);
 			
 			if (node) {
 				node_toggle(node);
@@ -363,7 +378,7 @@ static int node_mouse_select(Main *bmain, SpaceNode *snode, ARegion *ar, const i
 	else {	/* extend==0 */
 		
 		/* find the closest visible node */
-		node = node_under_mouse(snode->edittree, mx, my);
+		node = node_under_mouse_select(snode->edittree, mx, my);
 		
 		if (node) {
 			for (tnode=snode->edittree->nodes.first; tnode; tnode=tnode->next)
@@ -490,7 +505,7 @@ static int node_border_select_invoke(bContext *C, wmOperator *op, wmEvent *event
 
 		UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &mx, &my);
 		
-		if (node_under_mouse(snode->edittree, mx, my))
+		if (node_under_mouse_tweak(snode->edittree, mx, my))
 			return OPERATOR_CANCELLED|OPERATOR_PASS_THROUGH;
 	}
 	
diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c
index ee3827428bc..97e64c4acdf 100644
--- a/source/blender/editors/space_node/node_templates.c
+++ b/source/blender/editors/space_node/node_templates.c
@@ -483,7 +483,7 @@ static void ui_template_node_link_menu(bContext *C, uiLayout *layout, void *but_
 	uiBlockSetCurLayout(block, column);
 
 	if (sock->link) {
-		uiItemL(column, "Link", ICON_NONE);
+		uiItemL(column, IFACE_("Link"), ICON_NONE);
 		but= block->buttons.last;
 		but->flag= UI_TEXT_LEFT;
 
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index 4d5964c72e5..e069ba2a5fc 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -226,11 +226,6 @@ static void node_area_listener(ScrArea *sa, wmNotifier *wmn)
 					ED_area_tag_refresh(sa);
 			}
 			break;
-		case NC_TEXT:
-			/* pynodes */
-			if (wmn->data==ND_SHADING)
-				ED_area_tag_refresh(sa);
-			break;
 		case NC_SPACE:
 			if (wmn->data==ND_SPACE_NODE)
 				ED_area_tag_refresh(sa);
@@ -250,6 +245,13 @@ static void node_area_listener(ScrArea *sa, wmNotifier *wmn)
 					break;
 			}
 			break;
+		case NC_MASK:
+			if (wmn->action == NA_EDITED) {
+				if (type==NTREE_COMPOSIT) {
+					ED_area_tag_refresh(sa);
+				}
+			}
+			break;
 
 		case NC_IMAGE:
 			if (wmn->action == NA_EDITED) {
@@ -466,7 +468,7 @@ static void node_region_listener(ARegion *ar, wmNotifier *wmn)
 	}
 }
 
-const char *node_context_dir[] = {"selected_nodes", NULL};
+const char *node_context_dir[] = {"selected_nodes", "active_node", NULL};
 
 static int node_context(const bContext *C, const char *member, bContextDataResult *result)
 {
@@ -490,16 +492,11 @@ static int node_context(const bContext *C, const char *member, bContextDataResul
 		return 1;
 	}
 	else if (CTX_data_equals(member, "active_node")) {
-		bNode *node;
-		
 		if (snode->edittree) {
-			for (node=snode->edittree->nodes.last; node; node=node->prev) {
-				if (node->flag & NODE_ACTIVE) {
-					CTX_data_pointer_set(result, &snode->edittree->id, &RNA_Node, node);
-					break;
-				}
-			}
+			bNode *node = nodeGetActive(snode->edittree);
+			CTX_data_pointer_set(result, &snode->edittree->id, &RNA_Node, node);
 		}
+
 		CTX_data_type_set(result, CTX_DATA_TYPE_POINTER);
 		return 1;
 	}
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index fddd7af93f1..f0ecaf3ab2c 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -69,6 +69,9 @@
 
 #include "outliner_intern.h"
 
+/* disable - this is far too slow - campbell */
+// #define USE_GROUP_SELECT
+
 /* ****************************************************** */
 /* Tree Size Functions */
 
@@ -207,6 +210,7 @@ static int group_restrict_flag(Group *gr, int flag)
 	return 1;
 }
 
+#ifdef USE_GROUP_SELECT
 static int group_select_flag(Group *gr)
 {
 	GroupObject *gob;
@@ -217,6 +221,7 @@ static int group_select_flag(Group *gr)
 
 	return 0;
 }
+#endif
 
 void restrictbutton_gr_restrict_flag(void *poin, void *poin2, int flag)
 {	
@@ -300,7 +305,8 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname)
 				BLI_strncpy(expanded, lib->name, sizeof(expanded));
 				BLI_path_abs(expanded, G.main->name);
 				if (!BLI_exists(expanded)) {
-					BKE_reportf(CTX_wm_reports(C), RPT_ERROR, "Library path '%s' does not exist, correct this before saving", expanded);
+					BKE_reportf(CTX_wm_reports(C), RPT_ERROR,
+					            "Library path '%s' does not exist, correct this before saving", expanded);
 				}
 			}
 		}
@@ -421,16 +427,26 @@ static void outliner_draw_restrictbuts(uiBlock *block, Scene *scene, ARegion *ar
 				gr = (Group *)tselem->id;
 				
 				uiBlockSetEmboss(block, UI_EMBOSSN);
-				
+
+#ifndef USE_GROUP_SELECT
+				restrict_bool = FALSE;
+#endif
+
+#ifdef USE_GROUP_SELECT
 				restrict_bool = group_restrict_flag(gr, OB_RESTRICT_VIEW);
+#endif
 				bt = uiDefIconBut(block, ICONTOG, 0, restrict_bool ? ICON_RESTRICT_VIEW_ON : ICON_RESTRICT_VIEW_OFF, (int)ar->v2d.cur.xmax - OL_TOG_RESTRICT_VIEWX, (int)te->ys, UI_UNIT_X - 1, UI_UNIT_Y - 1, NULL, 0, 0, 0, 0, "Restrict/Allow visibility in the 3D View");
 				uiButSetFunc(bt, restrictbutton_gr_restrict_view, scene, gr);
 
+#ifdef USE_GROUP_SELECT
 				restrict_bool = group_restrict_flag(gr, OB_RESTRICT_SELECT);
+#endif
 				bt = uiDefIconBut(block, ICONTOG, 0, restrict_bool ? ICON_RESTRICT_SELECT_ON : ICON_RESTRICT_SELECT_OFF, (int)ar->v2d.cur.xmax - OL_TOG_RESTRICT_SELECTX, (int)te->ys, UI_UNIT_X - 1, UI_UNIT_Y - 1, NULL, 0, 0, 0, 0, "Restrict/Allow selection in the 3D View");
 				uiButSetFunc(bt, restrictbutton_gr_restrict_select, scene, gr);
-	
+
+#ifdef USE_GROUP_SELECT
 				restrict_bool = group_restrict_flag(gr, OB_RESTRICT_RENDER);
+#endif
 				bt = uiDefIconBut(block, ICONTOG, 0, restrict_bool ? ICON_RESTRICT_RENDER_ON : ICON_RESTRICT_RENDER_OFF, (int)ar->v2d.cur.xmax - OL_TOG_RESTRICT_RENDERX, (int)te->ys, UI_UNIT_X - 1, UI_UNIT_Y - 1, NULL, 0, 0, 0, 0, "Restrict/Allow renderability");
 				uiButSetFunc(bt, restrictbutton_gr_restrict_render, scene, gr);
 
@@ -570,7 +586,8 @@ static void operator_call_cb(struct bContext *UNUSED(C), void *arg_kmi, void *ar
 		BLI_strncpy(kmi->idname, ot->idname, OP_MAX_TYPENAME);
 }
 
-static void operator_search_cb(const struct bContext *UNUSED(C), void *UNUSED(arg_kmi), const char *str, uiSearchItems *items)
+static void operator_search_cb(const struct bContext *UNUSED(C), void *UNUSED(arg_kmi),
+                               const char *str, uiSearchItems *items)
 {
 	GHashIterator *iter = WM_operatortype_iter();
 
@@ -1038,17 +1055,17 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
 			case TSE_LINKED_MAT:
 				UI_icon_draw(x, y, ICON_MATERIAL_DATA); break;
 			case TSE_POSEGRP_BASE:
-				UI_icon_draw(x, y, ICON_VERTEXSEL); break;
+				UI_icon_draw(x, y, ICON_GROUP_BONE); break;
 			case TSE_SEQUENCE:
-				if (te->idcode == SEQ_MOVIE)
+				if (te->idcode == SEQ_TYPE_MOVIE)
 					UI_icon_draw(x, y, ICON_SEQUENCE);
-				else if (te->idcode == SEQ_META)
+				else if (te->idcode == SEQ_TYPE_META)
 					UI_icon_draw(x, y, ICON_DOT);
-				else if (te->idcode == SEQ_SCENE)
+				else if (te->idcode == SEQ_TYPE_SCENE)
 					UI_icon_draw(x, y, ICON_SCENE);
-				else if (te->idcode == SEQ_SOUND)
+				else if (te->idcode == SEQ_TYPE_SOUND_RAM)
 					UI_icon_draw(x, y, ICON_SOUND);
-				else if (te->idcode == SEQ_IMAGE)
+				else if (te->idcode == SEQ_TYPE_IMAGE)
 					UI_icon_draw(x, y, ICON_IMAGE_COL);
 				else
 					UI_icon_draw(x, y, ICON_PARTICLES);
@@ -1192,7 +1209,11 @@ static void outliner_draw_iconrow(bContext *C, uiBlock *block, Scene *scene, Spa
 
 				uiSetRoundBox(UI_CNR_ALL);
 				glColor4ub(255, 255, 255, 100);
-				uiRoundBox((float) *offsx - 0.5f * ufac, (float)ys - 1.0f * ufac, (float)*offsx + UI_UNIT_Y - 3.0f * ufac, (float)ys + UI_UNIT_Y - 3.0f * ufac, UI_UNIT_Y / 2.0f - 2.0f * ufac);
+				uiRoundBox((float) *offsx - 0.5f * ufac,
+				           (float)ys - 1.0f * ufac,
+				           (float)*offsx + UI_UNIT_Y - 3.0f * ufac,
+				           (float)ys + UI_UNIT_Y - 3.0f * ufac,
+				           (float)UI_UNIT_Y / 2.0f - 2.0f * ufac);
 				glEnable(GL_BLEND); /* roundbox disables */
 			}
 			
@@ -1268,8 +1289,8 @@ static void outliner_draw_tree_element(bContext *C, uiBlock *block, Scene *scene
 				}
 			}
 			else if (te->idcode == ID_GR) {
+#ifdef USE_GROUP_SELECT
 				Group *gr = (Group *)tselem->id;
-				
 				if (group_select_flag(gr)) {
 					char col[4];
 					UI_GetThemeColorType4ubv(TH_SELECT, SPACE_VIEW3D, col);
@@ -1278,6 +1299,7 @@ static void outliner_draw_tree_element(bContext *C, uiBlock *block, Scene *scene
 					
 					active = 2;
 				}
+#endif
 			}
 			else if (te->idcode == ID_OB) {
 				Object *ob = (Object *)tselem->id;
@@ -1324,7 +1346,11 @@ static void outliner_draw_tree_element(bContext *C, uiBlock *block, Scene *scene
 		/* active circle */
 		if (active) {
 			uiSetRoundBox(UI_CNR_ALL);
-			uiRoundBox((float)startx + UI_UNIT_Y - 1.5f * ufac, (float)*starty + 2.0f * ufac, (float)startx + 2.0f * UI_UNIT_Y - 4.0f * ufac, (float)*starty + UI_UNIT_Y - 1.0f * ufac, UI_UNIT_Y / 2.0f - 2.0f * ufac);
+			uiRoundBox((float)startx + UI_UNIT_Y - 1.5f * ufac,
+			           (float)*starty + 2.0f * ufac,
+			           (float)startx + 2.0f * UI_UNIT_Y - 4.0f * ufac,
+			           (float)*starty + UI_UNIT_Y - 1.0f * ufac,
+			           UI_UNIT_Y / 2.0f - 2.0f * ufac);
 			glEnable(GL_BLEND); /* roundbox disables it */
 			
 			te->flag |= TE_ACTIVE; // for lookup in display hierarchies
@@ -1549,7 +1575,10 @@ static void outliner_draw_restrictcols(ARegion *ar)
 	
 	/* background underneath */
 	UI_ThemeColor(TH_BACK);
-	glRecti((int)ar->v2d.cur.xmax - OL_TOGW, (int)ar->v2d.cur.ymin - V2D_SCROLL_HEIGHT - 1, (int)ar->v2d.cur.xmax + V2D_SCROLL_WIDTH, (int)ar->v2d.cur.ymax);
+	glRecti((int)ar->v2d.cur.xmax - OL_TOGW,
+	        (int)ar->v2d.cur.ymin - V2D_SCROLL_HEIGHT - 1,
+	        (int)ar->v2d.cur.xmax + V2D_SCROLL_WIDTH,
+	        (int)ar->v2d.cur.ymax);
 	
 	UI_ThemeColorShade(TH_BACK, 6);
 	ystart = (int)ar->v2d.tot.ymax;
diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c
index 04e9cbf24c2..eb740e441b7 100644
--- a/source/blender/editors/space_outliner/outliner_edit.c
+++ b/source/blender/editors/space_outliner/outliner_edit.c
@@ -35,6 +35,7 @@
 #include "DNA_group_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
+#include "DNA_material_types.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
@@ -48,6 +49,7 @@
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
+#include "BKE_material.h"
 
 #include "ED_object.h"
 #include "ED_screen.h"
@@ -205,7 +207,8 @@ static void do_item_rename(ARegion *ar, TreeElement *te, TreeStoreElem *tselem,
 	}
 }
 
-void item_rename_cb(bContext *C, Scene *UNUSED(scene), TreeElement *te, TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+void item_rename_cb(bContext *C, Scene *UNUSED(scene), TreeElement *te,
+                    TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
 {
 	ARegion *ar = CTX_wm_region(C);
 	ReportList *reports = CTX_wm_reports(C); // XXX
@@ -340,7 +343,8 @@ int common_restrict_check(bContext *C, Object *ob)
 
 /* Toggle Visibility ---------------------------------------- */
 
-void object_toggle_visibility_cb(bContext *C, Scene *scene, TreeElement *te, TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+void object_toggle_visibility_cb(bContext *C, Scene *scene, TreeElement *te,
+                                 TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
 {
 	Base *base = (Base *)te->directdata;
 	Object *ob = (Object *)tselem->id;
@@ -355,7 +359,8 @@ void object_toggle_visibility_cb(bContext *C, Scene *scene, TreeElement *te, Tre
 	}
 }
 
-void group_toggle_visibility_cb(bContext *UNUSED(C), Scene *scene, TreeElement *UNUSED(te), TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+void group_toggle_visibility_cb(bContext *UNUSED(C), Scene *scene, TreeElement *UNUSED(te),
+                                TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
 {
 	Group *group = (Group *)tselem->id;
 	restrictbutton_gr_restrict_flag(scene, group, OB_RESTRICT_VIEW);
@@ -391,7 +396,8 @@ void OUTLINER_OT_visibility_toggle(wmOperatorType *ot)
 
 /* Toggle Selectability ---------------------------------------- */
 
-void object_toggle_selectability_cb(bContext *UNUSED(C), Scene *scene, TreeElement *te, TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+void object_toggle_selectability_cb(bContext *UNUSED(C), Scene *scene, TreeElement *te,
+                                    TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
 {
 	Base *base = (Base *)te->directdata;
 	
@@ -401,7 +407,8 @@ void object_toggle_selectability_cb(bContext *UNUSED(C), Scene *scene, TreeEleme
 	}
 }
 
-void group_toggle_selectability_cb(bContext *UNUSED(C), Scene *scene, TreeElement *UNUSED(te), TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+void group_toggle_selectability_cb(bContext *UNUSED(C), Scene *scene, TreeElement *UNUSED(te),
+                                   TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
 {
 	Group *group = (Group *)tselem->id;
 	restrictbutton_gr_restrict_flag(scene, group, OB_RESTRICT_SELECT);
@@ -437,7 +444,8 @@ void OUTLINER_OT_selectability_toggle(wmOperatorType *ot)
 
 /* Toggle Renderability ---------------------------------------- */
 
-void object_toggle_renderability_cb(bContext *UNUSED(C), Scene *scene, TreeElement *te, TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+void object_toggle_renderability_cb(bContext *UNUSED(C), Scene *scene, TreeElement *te,
+                                    TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
 {
 	Base *base = (Base *)te->directdata;
 	
@@ -447,7 +455,8 @@ void object_toggle_renderability_cb(bContext *UNUSED(C), Scene *scene, TreeEleme
 	}
 }
 
-void group_toggle_renderability_cb(bContext *UNUSED(C), Scene *scene, TreeElement *UNUSED(te), TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+void group_toggle_renderability_cb(bContext *UNUSED(C), Scene *scene, TreeElement *UNUSED(te),
+                                   TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
 {
 	Group *group = (Group *)tselem->id;
 	restrictbutton_gr_restrict_flag(scene, group, OB_RESTRICT_RENDER);
@@ -674,7 +683,8 @@ static void outliner_set_coordinates(ARegion *ar, SpaceOops *soops)
 }
 
 /* find next element that has this name */
-static TreeElement *outliner_find_name(SpaceOops *soops, ListBase *lb, char *name, int flags, TreeElement *prev, int *prevFound)
+static TreeElement *outliner_find_name(SpaceOops *soops, ListBase *lb, char *name, int flags,
+                                       TreeElement *prev, int *prevFound)
 {
 	TreeElement *te, *tes;
 	
@@ -961,7 +971,8 @@ static void tree_element_to_path(SpaceOops *soops, TreeElement *te, TreeStoreEle
 		BLI_addhead(&hierarchy, ld);
 	}
 	
-	/* step 2: step down hierarchy building the path (NOTE: addhead in previous loop was needed so that we can loop like this) */
+	/* step 2: step down hierarchy building the path
+	 * (NOTE: addhead in previous loop was needed so that we can loop like this) */
 	for (ld = hierarchy.first; ld; ld = ld->next) {
 		/* get data */
 		tem = (TreeElement *)ld->data;
@@ -972,7 +983,7 @@ static void tree_element_to_path(SpaceOops *soops, TreeElement *te, TreeStoreEle
 		/* check if we're looking for first ID, or appending to path */
 		if (*id) {
 			/* just 'append' property to path 
-			 *	- to prevent memory leaks, we must write to newpath not path, then free old path + swap them
+			 * - to prevent memory leaks, we must write to newpath not path, then free old path + swap them
 			 */
 			if (tse->type == TSE_RNA_PROPERTY) {
 				if (RNA_property_type(prop) == PROP_POINTER) {
@@ -1019,7 +1030,8 @@ static void tree_element_to_path(SpaceOops *soops, TreeElement *te, TreeStoreEle
 		else {
 			/* no ID, so check if entry is RNA-struct, and if that RNA-struct is an ID datablock to extract info from */
 			if (tse->type == TSE_RNA_STRUCT) {
-				/* ptr->data not ptr->id.data seems to be the one we want, since ptr->data is sometimes the owner of this ID? */
+				/* ptr->data not ptr->id.data seems to be the one we want,
+				 * since ptr->data is sometimes the owner of this ID? */
 				if (RNA_struct_is_ID(ptr->type)) {
 					*id = (ID *)ptr->data;
 					
@@ -1090,7 +1102,9 @@ static void do_outliner_drivers_editop(SpaceOops *soops, ListBase *tree, ReportL
 			short groupmode = KSP_GROUP_KSNAME;
 			
 			/* check if RNA-property described by this selected element is an animatable prop */
-			if (ELEM(tselem->type, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM) && RNA_property_animateable(&te->rnaptr, te->directdata)) {
+			if (ELEM(tselem->type, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM) &&
+			    RNA_property_animateable(&te->rnaptr, te->directdata))
+			{
 				/* get id + path + index info from the selected element */
 				tree_element_to_path(soops, te, tselem, 
 				                     &id, &path, &array_index, &flag, &groupmode);
@@ -1269,7 +1283,9 @@ static void do_outliner_keyingset_editop(SpaceOops *soops, KeyingSet *ks, ListBa
 			short groupmode = KSP_GROUP_KSNAME;
 			
 			/* check if RNA-property described by this selected element is an animatable prop */
-			if (ELEM(tselem->type, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM) && RNA_property_animateable(&te->rnaptr, te->directdata)) {
+			if (ELEM(tselem->type, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM) &&
+			    RNA_property_animateable(&te->rnaptr, te->directdata))
+			{
 				/* get id + path + index info from the selected element */
 				tree_element_to_path(soops, te, tselem, 
 				                     &id, &path, &array_index, &flag, &groupmode);
@@ -1282,7 +1298,8 @@ static void do_outliner_keyingset_editop(SpaceOops *soops, KeyingSet *ks, ListBa
 					case KEYINGSET_EDITMODE_ADD:
 					{
 						/* add a new path with the information obtained (only if valid) */
-						// TODO: what do we do with group name? for now, we don't supply one, and just let this use the KeyingSet name
+						/* TODO: what do we do with group name?
+						 * for now, we don't supply one, and just let this use the KeyingSet name */
 						BKE_keyingset_add_path(ks, id, NULL, path, array_index, flag, groupmode);
 						ks->active_path = BLI_countlist(&ks->paths);
 					}
@@ -1426,7 +1443,7 @@ TreeElement *outliner_dropzone_parent(bContext *C, wmEvent *event, TreeElement *
 		/* name and first icon */
 		if ((fmval[0] > te->xs + UI_UNIT_X) && (fmval[0] < te->xend)) {
 			/* always makes active object */
-			if (te->idcode == ID_OB) {
+			if (te->idcode == ID_OB && tselem->type == 0) {
 				return te;
 			}
 			else {
@@ -1453,7 +1470,7 @@ static int parent_drop_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	SpaceOops *soops = CTX_wm_space_outliner(C);
 	ARegion *ar = CTX_wm_region(C);
 	Main *bmain = CTX_data_main(C);
-	Scene *scene = CTX_data_scene(C);
+	Scene *scene = NULL;
 	TreeElement *te = NULL;
 	TreeElement *te_found = NULL;
 	char childname[MAX_ID_NAME];
@@ -1485,10 +1502,17 @@ static int parent_drop_invoke(bContext *C, wmOperator *op, wmEvent *event)
 			return OPERATOR_CANCELLED;
 		}
 		
-		/* check dragged object (child) is active */
-		if (ob != CTX_data_active_object(C))
-			ED_base_object_select(BKE_scene_base_find(scene, ob), BA_SELECT);
-		
+		scene = (Scene *)outliner_search_back(soops, te_found, ID_SCE);
+
+		if (scene == NULL) {
+			/* currently outlier organized in a way, that if there's no parent scene
+			 * element for object it means that all displayed objects belong to
+			 * active scene and parenting them is allowed (sergey)
+			 */
+
+			scene = CTX_data_scene(C);
+		}
+
 		if ((par->type != OB_ARMATURE) && (par->type != OB_CURVE) && (par->type != OB_LATTICE)) {
 			if (ED_object_parent_set(op->reports, bmain, scene, ob, par, partype)) {
 				DAG_scene_sort(bmain, scene);
@@ -1635,7 +1659,7 @@ int outliner_dropzone_parent_clear(bContext *C, wmEvent *event, TreeElement *te,
 		if ((fmval[0] < (te->xs + UI_UNIT_X)) || (fmval[0] > te->xend)) {
 			return 1;
 		}
-		else if (te->idcode != ID_OB) {
+		else if (te->idcode != ID_OB || ELEM(tselem->type, TSE_MODIFIER_BASE, TSE_CONSTRAINT_BASE)) {
 			return 1;
 		}
 		
@@ -1654,19 +1678,31 @@ int outliner_dropzone_parent_clear(bContext *C, wmEvent *event, TreeElement *te,
 
 static int parent_clear_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
 {
-	Scene *scene = CTX_data_scene(C);
+	Main *bmain = CTX_data_main(C);
+	Scene *scene = NULL;
 	Object *ob = NULL;
+	SpaceOops *soops = CTX_wm_space_outliner(C);
+	TreeElement *te;
 	char obname[MAX_ID_NAME];
 
 	RNA_string_get(op->ptr, "dragged_obj", obname);
 	ob = (Object *)BKE_libblock_find_name(ID_OB, obname);
 
-	/* check dragged object (child) is active */
-	if (ob != CTX_data_active_object(C))
-		ED_base_object_select(BKE_scene_base_find(scene, ob), BA_SELECT);
+	/* search forwards to find the object */
+	te = outliner_find_id(soops, &soops->tree, (ID *)ob);
+	/* then search backwards to get the scene */
+	scene = (Scene *)outliner_search_back(soops, te, ID_SCE);
+
+	if (scene == NULL) {
+		return OPERATOR_CANCELLED;
+	}
 
-	ED_object_parent_clear(C, RNA_enum_get(op->ptr, "type"));
+	ED_object_parent_clear(ob, RNA_enum_get(op->ptr, "type"));
 
+	DAG_scene_sort(bmain, scene);
+	DAG_ids_flush_update(bmain, 0);
+	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
+	WM_event_add_notifier(C, NC_OBJECT | ND_PARENT, NULL);
 	return OPERATOR_FINISHED;
 }
 
@@ -1689,3 +1725,161 @@ void OUTLINER_OT_parent_clear(wmOperatorType *ot)
 	RNA_def_string(ot->srna, "dragged_obj", "Object", MAX_ID_NAME, "Child", "Child Object");
 	RNA_def_enum(ot->srna, "type", prop_clear_parent_types, 0, "Type", "");
 }
+
+TreeElement *outliner_dropzone_scene(bContext *C, wmEvent *UNUSED(event), TreeElement *te, float *fmval)
+{
+	SpaceOops *soops = CTX_wm_space_outliner(C);
+	TreeStoreElem *tselem = TREESTORE(te);
+
+	if ((fmval[1] > te->ys) && (fmval[1] < (te->ys + UI_UNIT_Y))) {
+		/* name and first icon */
+		if ((fmval[0] > te->xs + UI_UNIT_X) && (fmval[0] < te->xend)) {
+			if (te->idcode == ID_SCE && tselem->type == 0) {
+				return te;
+			}
+		}
+	}
+	return NULL;
+}
+
+static int scene_drop_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	Scene *scene = NULL;
+	Object *ob = NULL;
+	SpaceOops *soops = CTX_wm_space_outliner(C);
+	ARegion *ar = CTX_wm_region(C);
+	Main *bmain = CTX_data_main(C);
+	TreeElement *te = NULL;
+	TreeElement *te_found = NULL;
+	char obname[MAX_ID_NAME];
+	float fmval[2];
+
+	UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &fmval[0], &fmval[1]);
+
+	/* Find object hovered over */
+	for (te = soops->tree.first; te; te = te->next) {
+		te_found = outliner_dropzone_scene(C, event, te, fmval);
+		if (te_found)
+			break;
+	}
+
+	if (te_found) {
+		Base *base;
+
+		RNA_string_set(op->ptr, "scene", te_found->name);
+		scene = (Scene *)BKE_libblock_find_name(ID_SCE, te_found->name);
+
+		RNA_string_get(op->ptr, "object", obname);
+		ob = (Object *)BKE_libblock_find_name(ID_OB, obname);
+
+		if (ELEM(NULL, ob, scene) || scene->id.lib != NULL) {
+			return OPERATOR_CANCELLED;
+		}
+
+		base = ED_object_scene_link(scene, ob);
+
+		if (base == NULL) {
+			return OPERATOR_CANCELLED;
+		}
+
+		if (scene == CTX_data_scene(C)) {
+			/* when linking to an inactive scene don't touch the layer */
+			ob->lay = base->lay;
+			ED_base_object_select(base, BA_SELECT);
+		}
+
+		DAG_scene_sort(bmain, scene);
+		DAG_ids_flush_update(bmain, 0);
+
+		WM_main_add_notifier(NC_SCENE | ND_OB_SELECT, scene);
+
+		return OPERATOR_FINISHED;
+	}
+
+	return OPERATOR_CANCELLED;
+}
+
+void OUTLINER_OT_scene_drop(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Drop Object to Scene";
+	ot->description = "Drag object to scene in Outliner";
+	ot->idname = "OUTLINER_OT_scene_drop";
+
+	/* api callbacks */
+	ot->invoke = scene_drop_invoke;
+
+	ot->poll = ED_operator_outliner_active;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	/* properties */
+	RNA_def_string(ot->srna, "object", "Object", MAX_ID_NAME, "Object", "Target Object");
+	RNA_def_string(ot->srna, "scene", "Scene", MAX_ID_NAME, "Scene", "Target Scene");
+}
+
+static int material_drop_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	Main *bmain = CTX_data_main(C);
+	Material *ma = NULL;
+	Object *ob = NULL;
+	SpaceOops *soops = CTX_wm_space_outliner(C);
+	ARegion *ar = CTX_wm_region(C);
+	TreeElement *te = NULL;
+	TreeElement *te_found = NULL;
+	char mat_name[MAX_ID_NAME - 2];
+	float fmval[2];
+
+	UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &fmval[0], &fmval[1]);
+
+	/* Find object hovered over */
+	for (te = soops->tree.first; te; te = te->next) {
+		te_found = outliner_dropzone_parent(C, event, te, fmval);
+		if (te_found)
+			break;
+	}
+
+	if (te_found) {
+		RNA_string_set(op->ptr, "object", te_found->name);
+		ob = (Object *)BKE_libblock_find_name(ID_OB, te_found->name);
+
+		RNA_string_get(op->ptr, "material", mat_name);
+		ma = (Material *)BKE_libblock_find_name(ID_MA, mat_name);
+
+		if (ELEM(NULL, ob, ma)) {
+			return OPERATOR_CANCELLED;
+		}
+
+		assign_material(ob, ma, ob->totcol + 1);
+
+		DAG_ids_flush_update(bmain, 0);
+		WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, CTX_wm_view3d(C));		
+		WM_event_add_notifier(C, NC_MATERIAL | ND_SHADING, ma);
+
+		return OPERATOR_FINISHED;
+	}
+
+	return OPERATOR_CANCELLED;
+}
+
+void OUTLINER_OT_material_drop(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Drop Material on Object";
+	ot->description = "Drag material to object in Outliner";
+	ot->idname = "OUTLINER_OT_material_drop";
+
+	/* api callbacks */
+	ot->invoke = material_drop_invoke;
+
+	ot->poll = ED_operator_outliner_active;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	/* properties */
+	RNA_def_string(ot->srna, "object", "Object", MAX_ID_NAME, "Object", "Target Object");
+	RNA_def_string(ot->srna, "material", "Material", MAX_ID_NAME, "Material", "Target Material");
+}
+
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index d8d10519bd6..65de2a27568 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -110,7 +110,7 @@ typedef struct TreeElement {
 /* get TreeStoreElem associated with a TreeElement 
  * < a: (TreeElement) tree element to find stored element for
  */
-#define TREESTORE(a) ((a) ? soops->treestore->data + (a)->store_index : NULL)
+#define TREESTORE(a) (soops->treestore->data + (a)->store_index)
 
 /* size constants */
 #define OL_Y_OFFSET 2
@@ -190,7 +190,7 @@ void item_rename_cb(struct bContext *C, struct Scene *scene, TreeElement *te, st
 
 TreeElement *outliner_dropzone_parent(struct bContext *C, struct wmEvent *event, struct TreeElement *te, float *fmval);
 int outliner_dropzone_parent_clear(struct bContext *C, struct wmEvent *event, struct TreeElement *te, float *fmval);
-
+TreeElement *outliner_dropzone_scene(struct bContext *C, struct wmEvent *event, struct TreeElement *te, float *fmval);
 /* ...................................................... */
 
 void OUTLINER_OT_item_activate(struct wmOperatorType *ot);
@@ -220,6 +220,8 @@ void OUTLINER_OT_drivers_delete_selected(struct wmOperatorType *ot);
 
 void OUTLINER_OT_parent_drop(struct wmOperatorType *ot);
 void OUTLINER_OT_parent_clear(struct wmOperatorType *ot);
+void OUTLINER_OT_scene_drop(struct wmOperatorType *ot);
+void OUTLINER_OT_material_drop(struct wmOperatorType *ot);
 
 /* outliner_tools.c ---------------------------------------------- */
 
diff --git a/source/blender/editors/space_outliner/outliner_ops.c b/source/blender/editors/space_outliner/outliner_ops.c
index 12f8f2cb38b..1dd043409a5 100644
--- a/source/blender/editors/space_outliner/outliner_ops.c
+++ b/source/blender/editors/space_outliner/outliner_ops.c
@@ -76,6 +76,8 @@ void outliner_operatortypes(void)
 
 	WM_operatortype_append(OUTLINER_OT_parent_drop);
 	WM_operatortype_append(OUTLINER_OT_parent_clear);
+	WM_operatortype_append(OUTLINER_OT_scene_drop);
+	WM_operatortype_append(OUTLINER_OT_material_drop);
 }
 
 void outliner_keymap(wmKeyConfig *keyconf)
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index 18769476118..812fba50295 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -43,6 +43,7 @@
 #include "DNA_world_types.h"
 
 #include "BLI_utildefines.h"
+#include "BLI_listbase.h"
 
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
@@ -52,6 +53,7 @@
 #include "ED_armature.h"
 #include "ED_object.h"
 #include "ED_screen.h"
+#include "ED_sequencer.h"
 #include "ED_util.h"
 
 #include "WM_api.h"
@@ -568,16 +570,34 @@ static int tree_element_active_pose(bContext *C, Scene *scene, TreeElement *UNUS
 	return 0;
 }
 
-static int tree_element_active_sequence(TreeElement *te, TreeStoreElem *UNUSED(tselem), int set)
+static int tree_element_active_sequence(bContext *C, Scene *scene, TreeElement *te, TreeStoreElem *UNUSED(tselem), int set)
 {
 	Sequence *seq = (Sequence *) te->directdata;
+	Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
 
 	if (set) {
-// XXX		select_single_seq(seq, 1);
+		/* only check on setting */
+		if (BLI_findindex(ed->seqbasep, seq) != -1) {
+			if (set == 2) {
+				BKE_sequencer_active_set(scene, NULL);
+			}
+			ED_sequencer_deselect_all(scene);
+
+			if (set == 2 && seq->flag & SELECT) {
+				seq->flag &= ~SELECT;
+			}
+			else {
+				seq->flag |= SELECT;
+				BKE_sequencer_active_set(scene, seq);
+			}
+		}
+
+		WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER | NA_SELECTED, scene);
 	}
 	else {
-		if (seq->flag & SELECT)
-			return(1);
+		if (ed->act_seq == seq && seq->flag & SELECT) {
+			return 1;
+		}
 	}
 	return(0);
 }
@@ -650,7 +670,8 @@ int tree_element_active(bContext *C, Scene *scene, SpaceOops *soops, TreeElement
 
 /* generic call for non-id data to make/check active in UI */
 /* Context can be NULL when set==0 */
-int tree_element_type_active(bContext *C, Scene *scene, SpaceOops *soops, TreeElement *te, TreeStoreElem *tselem, int set)
+int tree_element_type_active(bContext *C, Scene *scene, SpaceOops *soops,
+                             TreeElement *te, TreeStoreElem *tselem, int set)
 {
 	switch (tselem->type) {
 		case TSE_DEFGROUP:
@@ -678,7 +699,7 @@ int tree_element_type_active(bContext *C, Scene *scene, SpaceOops *soops, TreeEl
 		case TSE_POSEGRP:
 			return tree_element_active_posegroup(C, scene, te, tselem, set);
 		case TSE_SEQUENCE:
-			return tree_element_active_sequence(te, tselem, set);
+			return tree_element_active_sequence(C, scene, te, tselem, set);
 		case TSE_SEQUENCE_DUP:
 			return tree_element_active_sequence_dup(scene, te, tselem, set);
 		case TSE_KEYMAP_ITEM:
@@ -690,7 +711,8 @@ int tree_element_type_active(bContext *C, Scene *scene, SpaceOops *soops, TreeEl
 
 /* ================================================ */
 
-static int do_outliner_item_activate(bContext *C, Scene *scene, ARegion *ar, SpaceOops *soops, TreeElement *te, int extend, const float mval[2])
+static int do_outliner_item_activate(bContext *C, Scene *scene, ARegion *ar, SpaceOops *soops,
+                                     TreeElement *te, int extend, const float mval[2])
 {
 	
 	if (mval[1] > te->ys && mval[1] < te->ys + UI_UNIT_Y) {
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index a3ed2eac2d5..3d01de1c67a 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -39,6 +39,7 @@
 #include "DNA_mesh_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_sequence_types.h"
 #include "DNA_world_types.h"
 #include "DNA_object_types.h"
 
@@ -54,10 +55,12 @@
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
+#include "BKE_sequencer.h"
 
 #include "ED_armature.h"
 #include "ED_object.h"
 #include "ED_screen.h"
+#include "ED_sequencer.h"
 #include "ED_util.h"
 
 #include "WM_api.h"
@@ -122,13 +125,15 @@ static void set_operation_types(SpaceOops *soops, ListBase *lb,
 	}
 }
 
-static void unlink_action_cb(bContext *C, Scene *UNUSED(scene), TreeElement *UNUSED(te), TreeStoreElem *tsep, TreeStoreElem *UNUSED(tselem))
+static void unlink_action_cb(bContext *C, Scene *UNUSED(scene), TreeElement *UNUSED(te),
+                             TreeStoreElem *tsep, TreeStoreElem *UNUSED(tselem))
 {
 	/* just set action to NULL */
 	BKE_animdata_set_action(CTX_wm_reports(C), tsep->id, NULL);
 }
 
-static void unlink_material_cb(bContext *UNUSED(C), Scene *UNUSED(scene), TreeElement *te, TreeStoreElem *tsep, TreeStoreElem *UNUSED(tselem))
+static void unlink_material_cb(bContext *UNUSED(C), Scene *UNUSED(scene), TreeElement *te,
+                               TreeStoreElem *tsep, TreeStoreElem *UNUSED(tselem))
 {
 	Material **matar = NULL;
 	int a, totcol = 0;
@@ -162,7 +167,8 @@ static void unlink_material_cb(bContext *UNUSED(C), Scene *UNUSED(scene), TreeEl
 	}
 }
 
-static void unlink_texture_cb(bContext *UNUSED(C), Scene *UNUSED(scene), TreeElement *te, TreeStoreElem *tsep, TreeStoreElem *UNUSED(tselem))
+static void unlink_texture_cb(bContext *UNUSED(C), Scene *UNUSED(scene), TreeElement *te,
+                              TreeStoreElem *tsep, TreeStoreElem *UNUSED(tselem))
 {
 	MTex **mtex = NULL;
 	int a;
@@ -191,7 +197,8 @@ static void unlink_texture_cb(bContext *UNUSED(C), Scene *UNUSED(scene), TreeEle
 	}
 }
 
-static void unlink_group_cb(bContext *UNUSED(C), Scene *UNUSED(scene), TreeElement *UNUSED(te), TreeStoreElem *tsep, TreeStoreElem *tselem)
+static void unlink_group_cb(bContext *UNUSED(C), Scene *UNUSED(scene), TreeElement *UNUSED(te),
+                            TreeStoreElem *tsep, TreeStoreElem *tselem)
 {
 	Group *group = (Group *)tselem->id;
 	
@@ -206,7 +213,8 @@ static void unlink_group_cb(bContext *UNUSED(C), Scene *UNUSED(scene), TreeEleme
 	}
 }
 
-static void unlink_world_cb(bContext *UNUSED(C), Scene *UNUSED(scene), TreeElement *UNUSED(te), TreeStoreElem *tsep, TreeStoreElem *tselem)
+static void unlink_world_cb(bContext *UNUSED(C), Scene *UNUSED(scene), TreeElement *UNUSED(te),
+                            TreeStoreElem *tsep, TreeStoreElem *tselem)
 {
 	Scene *parscene = (Scene *)tsep->id;
 	World *wo = (World *)tselem->id;
@@ -217,7 +225,8 @@ static void unlink_world_cb(bContext *UNUSED(C), Scene *UNUSED(scene), TreeEleme
 }
 
 static void outliner_do_libdata_operation(bContext *C, Scene *scene, SpaceOops *soops, ListBase *lb, 
-                                          void (*operation_cb)(bContext *C, Scene *scene, TreeElement *, TreeStoreElem *, TreeStoreElem *))
+                                          void (*operation_cb)(bContext *C, Scene *scene, TreeElement *,
+                                                               TreeStoreElem *, TreeStoreElem *))
 {
 	TreeElement *te;
 	TreeStoreElem *tselem;
@@ -226,7 +235,7 @@ static void outliner_do_libdata_operation(bContext *C, Scene *scene, SpaceOops *
 		tselem = TREESTORE(te);
 		if (tselem->flag & TSE_SELECTED) {
 			if (tselem->type == 0) {
-				TreeStoreElem *tsep = TREESTORE(te->parent);
+				TreeStoreElem *tsep = te->parent ? TREESTORE(te->parent) : NULL;
 				operation_cb(C, scene, te, tsep, tselem);
 			}
 		}
@@ -238,7 +247,8 @@ static void outliner_do_libdata_operation(bContext *C, Scene *scene, SpaceOops *
 
 /* */
 
-static void object_select_cb(bContext *UNUSED(C), Scene *scene, TreeElement *te, TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+static void object_select_cb(bContext *UNUSED(C), Scene *scene, TreeElement *te,
+                             TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
 {
 	Base *base = (Base *)te->directdata;
 	
@@ -249,7 +259,8 @@ static void object_select_cb(bContext *UNUSED(C), Scene *scene, TreeElement *te,
 	}
 }
 
-static void object_deselect_cb(bContext *UNUSED(C), Scene *scene, TreeElement *te, TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+static void object_deselect_cb(bContext *UNUSED(C), Scene *scene, TreeElement *te,
+                               TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
 {
 	Base *base = (Base *)te->directdata;
 	
@@ -260,7 +271,8 @@ static void object_deselect_cb(bContext *UNUSED(C), Scene *scene, TreeElement *t
 	}
 }
 
-static void object_delete_cb(bContext *C, Scene *scene, TreeElement *te, TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+static void object_delete_cb(bContext *C, Scene *scene, TreeElement *te,
+                             TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
 {
 	Base *base = (Base *)te->directdata;
 	
@@ -277,7 +289,8 @@ static void object_delete_cb(bContext *C, Scene *scene, TreeElement *te, TreeSto
 	}
 }
 
-static void id_local_cb(bContext *C, Scene *UNUSED(scene), TreeElement *UNUSED(te), TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+static void id_local_cb(bContext *C, Scene *UNUSED(scene), TreeElement *UNUSED(te),
+                        TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
 {
 	if (tselem->id->lib && (tselem->id->flag & LIB_EXTERN)) {
 		/* if the ID type has no special local function,
@@ -289,7 +302,8 @@ static void id_local_cb(bContext *C, Scene *UNUSED(scene), TreeElement *UNUSED(t
 	}
 }
 
-static void id_fake_user_set_cb(bContext *UNUSED(C), Scene *UNUSED(scene), TreeElement *UNUSED(te), TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+static void id_fake_user_set_cb(bContext *UNUSED(C), Scene *UNUSED(scene), TreeElement *UNUSED(te),
+                                TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
 {
 	ID *id = tselem->id;
 	
@@ -299,7 +313,8 @@ static void id_fake_user_set_cb(bContext *UNUSED(C), Scene *UNUSED(scene), TreeE
 	}
 }
 
-static void id_fake_user_clear_cb(bContext *UNUSED(C), Scene *UNUSED(scene), TreeElement *UNUSED(te), TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+static void id_fake_user_clear_cb(bContext *UNUSED(C), Scene *UNUSED(scene), TreeElement *UNUSED(te),
+                                  TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
 {
 	ID *id = tselem->id;
 	
@@ -309,7 +324,8 @@ static void id_fake_user_clear_cb(bContext *UNUSED(C), Scene *UNUSED(scene), Tre
 	}
 }
 
-static void singleuser_action_cb(bContext *C, Scene *UNUSED(scene), TreeElement *UNUSED(te), TreeStoreElem *tsep, TreeStoreElem *tselem)
+static void singleuser_action_cb(bContext *C, Scene *UNUSED(scene), TreeElement *UNUSED(te),
+                                 TreeStoreElem *tsep, TreeStoreElem *tselem)
 {
 	ID *id = tselem->id;
 	
@@ -325,7 +341,8 @@ static void singleuser_action_cb(bContext *C, Scene *UNUSED(scene), TreeElement
 	}
 }
 
-static void singleuser_world_cb(bContext *C, Scene *UNUSED(scene), TreeElement *UNUSED(te), TreeStoreElem *tsep, TreeStoreElem *tselem)
+static void singleuser_world_cb(bContext *C, Scene *UNUSED(scene), TreeElement *UNUSED(te),
+                                TreeStoreElem *tsep, TreeStoreElem *tselem)
 {
 	ID *id = tselem->id;
 	
@@ -342,7 +359,8 @@ static void singleuser_world_cb(bContext *C, Scene *UNUSED(scene), TreeElement *
 	}
 }
 
-static void group_linkobs2scene_cb(bContext *UNUSED(C), Scene *scene, TreeElement *UNUSED(te), TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+static void group_linkobs2scene_cb(bContext *UNUSED(C), Scene *scene, TreeElement *UNUSED(te),
+                                   TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
 {
 	Group *group = (Group *)tselem->id;
 	GroupObject *gob;
@@ -367,8 +385,21 @@ static void group_linkobs2scene_cb(bContext *UNUSED(C), Scene *scene, TreeElemen
 	}
 }
 
+static void group_instance_cb(bContext *C, Scene *scene, TreeElement *UNUSED(te),
+                              TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+{
+	Group *group = (Group *)tselem->id;
+
+	Object *ob = ED_object_add_type(C, OB_EMPTY, scene->cursor, NULL, FALSE, scene->layact);
+	rename_id(&ob->id, group->id.name + 2);
+	ob->dup_group = group;
+	ob->transflag |= OB_DUPLIGROUP;
+	id_lib_extern(&group->id);
+}
+
 void outliner_do_object_operation(bContext *C, Scene *scene_act, SpaceOops *soops, ListBase *lb, 
-                                  void (*operation_cb)(bContext *C, Scene *scene, TreeElement *, TreeStoreElem *, TreeStoreElem *))
+                                  void (*operation_cb)(bContext *C, Scene *scene, TreeElement *,
+                                                       TreeStoreElem *, TreeStoreElem *))
 {
 	TreeElement *te;
 	TreeStoreElem *tselem;
@@ -396,13 +427,15 @@ void outliner_do_object_operation(bContext *C, Scene *scene_act, SpaceOops *soop
 
 /* ******************************************** */
 
-static void unlinkact_animdata_cb(int UNUSED(event), TreeElement *UNUSED(te), TreeStoreElem *tselem)
+static void unlinkact_animdata_cb(int UNUSED(event), TreeElement *UNUSED(te),
+                                  TreeStoreElem *tselem, void *UNUSED(arg))
 {
 	/* just set action to NULL */
 	BKE_animdata_set_action(NULL, tselem->id, NULL);
 }
 
-static void cleardrivers_animdata_cb(int UNUSED(event), TreeElement *UNUSED(te), TreeStoreElem *tselem)
+static void cleardrivers_animdata_cb(int UNUSED(event), TreeElement *UNUSED(te),
+                                     TreeStoreElem *tselem, void *UNUSED(arg))
 {
 	IdAdtTemplate *iat = (IdAdtTemplate *)tselem->id;
 	
@@ -410,7 +443,8 @@ static void cleardrivers_animdata_cb(int UNUSED(event), TreeElement *UNUSED(te),
 	free_fcurves(&iat->adt->drivers);
 }
 
-static void refreshdrivers_animdata_cb(int UNUSED(event), TreeElement *UNUSED(te), TreeStoreElem *tselem)
+static void refreshdrivers_animdata_cb(int UNUSED(event), TreeElement *UNUSED(te),
+                                       TreeStoreElem *tselem, void *UNUSED(arg))
 {
 	IdAdtTemplate *iat = (IdAdtTemplate *)tselem->id;
 	FCurve *fcu;
@@ -426,7 +460,7 @@ static void refreshdrivers_animdata_cb(int UNUSED(event), TreeElement *UNUSED(te
 
 /* --------------------------------- */
 
-static void pchan_cb(int event, TreeElement *te, TreeStoreElem *UNUSED(tselem))
+static void pchan_cb(int event, TreeElement *te, TreeStoreElem *UNUSED(tselem), void *UNUSED(arg))
 {
 	bPoseChannel *pchan = (bPoseChannel *)te->directdata;
 	
@@ -442,7 +476,7 @@ static void pchan_cb(int event, TreeElement *te, TreeStoreElem *UNUSED(tselem))
 		pchan->bone->flag &= ~BONE_HIDDEN_P;
 }
 
-static void bone_cb(int event, TreeElement *te, TreeStoreElem *UNUSED(tselem))
+static void bone_cb(int event, TreeElement *te, TreeStoreElem *UNUSED(tselem), void *UNUSED(arg))
 {
 	Bone *bone = (Bone *)te->directdata;
 	
@@ -458,7 +492,7 @@ static void bone_cb(int event, TreeElement *te, TreeStoreElem *UNUSED(tselem))
 		bone->flag &= ~BONE_HIDDEN_P;
 }
 
-static void ebone_cb(int event, TreeElement *te, TreeStoreElem *UNUSED(tselem))
+static void ebone_cb(int event, TreeElement *te, TreeStoreElem *UNUSED(tselem), void *UNUSED(arg))
 {
 	EditBone *ebone = (EditBone *)te->directdata;
 	
@@ -474,16 +508,23 @@ static void ebone_cb(int event, TreeElement *te, TreeStoreElem *UNUSED(tselem))
 		ebone->flag &= ~BONE_HIDDEN_A;
 }
 
-static void sequence_cb(int event, TreeElement *UNUSED(te), TreeStoreElem *UNUSED(tselem))
+static void sequence_cb(int event, TreeElement *te, TreeStoreElem *tselem, void *scene_ptr)
 {
-//	Sequence *seq= (Sequence*) te->directdata;
+	Sequence *seq = (Sequence *)te->directdata;
 	if (event == 1) {
-// XXX		select_single_seq(seq, 1);
+		Scene *scene = (Scene *)scene_ptr;
+		Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
+		if (BLI_findindex(ed->seqbasep, seq) != -1) {
+			ED_sequencer_select_sequence_single(scene, seq, TRUE);
+		}
 	}
+
+	(void)tselem;
 }
 
-static void outliner_do_data_operation(SpaceOops *soops, int type, int event, ListBase *lb, 
-                                       void (*operation_cb)(int, TreeElement *, TreeStoreElem *))
+static void outliner_do_data_operation(SpaceOops *soops, int type, int event, ListBase *lb,
+                                       void (*operation_cb)(int, TreeElement *, TreeStoreElem *, void *),
+                                       void *arg)
 {
 	TreeElement *te;
 	TreeStoreElem *tselem;
@@ -492,11 +533,11 @@ static void outliner_do_data_operation(SpaceOops *soops, int type, int event, Li
 		tselem = TREESTORE(te);
 		if (tselem->flag & TSE_SELECTED) {
 			if (tselem->type == type) {
-				operation_cb(event, te, tselem);
+				operation_cb(event, te, tselem, arg);
 			}
 		}
 		if (TSELEM_OPEN(tselem, soops)) {
-			outliner_do_data_operation(soops, type, event, &te->subtree, operation_cb);
+			outliner_do_data_operation(soops, type, event, &te->subtree, operation_cb, arg);
 		}
 	}
 }
@@ -607,13 +648,14 @@ void OUTLINER_OT_object_operation(wmOperatorType *ot)
 /* **************************************** */
 
 static EnumPropertyItem prop_group_op_types[] = {
-	{1, "UNLINK", 0, "Unlink", ""},
-	{2, "LOCAL", 0, "Make Local", ""},
-	{3, "LINK", 0, "Link Group Objects to Scene", ""},
-	{4, "TOGVIS", 0, "Toggle Visible", ""},
-	{5, "TOGSEL", 0, "Toggle Selectable", ""},
-	{6, "TOGREN", 0, "Toggle Renderable", ""},
-	{7, "RENAME", 0, "Rename", ""},
+	{0, "UNLINK",   0, "Unlink Group", ""},
+	{1, "LOCAL",    0, "Make Local Group", ""},
+	{2, "LINK",     0, "Link Group Objects to Scene", ""},
+	{3, "INSTANCE", 0, "Instance Groups in Scene", ""},
+	{4, "TOGVIS",   0, "Toggle Visible Group", ""},
+	{5, "TOGSEL",   0, "Toggle Selectable", ""},
+	{6, "TOGREN",   0, "Toggle Renderable", ""},
+	{7, "RENAME",   0, "Rename", ""},
 	{0, NULL, 0, NULL, NULL}
 };
 
@@ -622,45 +664,36 @@ static int outliner_group_operation_exec(bContext *C, wmOperator *op)
 	Scene *scene = CTX_data_scene(C);
 	SpaceOops *soops = CTX_wm_space_outliner(C);
 	int event;
-	const char *str = NULL;
 	
 	/* check for invalid states */
 	if (soops == NULL)
 		return OPERATOR_CANCELLED;
 	
 	event = RNA_enum_get(op->ptr, "type");
-	
-	if (event == 1) {
-		outliner_do_libdata_operation(C, scene, soops, &soops->tree, unlink_group_cb);
-		str = "Unlink group";
-	}
-	else if (event == 2) {
-		outliner_do_libdata_operation(C, scene, soops, &soops->tree, id_local_cb);
-		str = "Localized Data";
-	}
-	else if (event == 3) {
-		outliner_do_libdata_operation(C, scene, soops, &soops->tree, group_linkobs2scene_cb);
-		str = "Link Group Objects to Scene";
-	}
-	else if (event == 4) {
-		outliner_do_libdata_operation(C, scene, soops, &soops->tree, group_toggle_visibility_cb);
-		str = "Toggle Visibility";
-	}
-	else if (event == 5) {
-		outliner_do_libdata_operation(C, scene, soops, &soops->tree, group_toggle_selectability_cb);
-		str = "Toggle Selectability";
-	}
-	else if (event == 6) {
-		outliner_do_libdata_operation(C, scene, soops, &soops->tree, group_toggle_renderability_cb);
-		str = "Toggle Renderability";
-	}
-	else if (event == 7) {
-		outliner_do_libdata_operation(C, scene, soops, &soops->tree, item_rename_cb);
-		str = "Rename";
+
+	switch (event) {
+		case 0: outliner_do_libdata_operation(C, scene, soops, &soops->tree, unlink_group_cb); break;
+		case 1: outliner_do_libdata_operation(C, scene, soops, &soops->tree, id_local_cb); break;
+		case 2: outliner_do_libdata_operation(C, scene, soops, &soops->tree, group_linkobs2scene_cb); break;
+		case 3: outliner_do_libdata_operation(C, scene, soops, &soops->tree, group_instance_cb); break;
+		case 4: outliner_do_libdata_operation(C, scene, soops, &soops->tree, group_toggle_visibility_cb); break;
+		case 5: outliner_do_libdata_operation(C, scene, soops, &soops->tree, group_toggle_selectability_cb); break;
+		case 6: outliner_do_libdata_operation(C, scene, soops, &soops->tree, group_toggle_renderability_cb); break;
+		case 7: outliner_do_libdata_operation(C, scene, soops, &soops->tree, item_rename_cb); break;
+		default:
+			BLI_assert(0);
+			return OPERATOR_CANCELLED;
 	}
 	
+
+	if (event == 3) { /* instance */
+		Main *bmain = CTX_data_main(C);
+
+		/* works without this except if you try render right after, see: 22027 */
+		DAG_scene_sort(bmain, scene);
+	}
 	
-	ED_undo_push(C, str);
+	ED_undo_push(C, prop_group_op_types[event].name);
 	WM_event_add_notifier(C, NC_GROUP, NULL);
 	
 	return OPERATOR_FINISHED;
@@ -703,7 +736,8 @@ static EnumPropertyItem prop_id_op_types[] = {
 	{OUTLINER_IDOP_UNLINK, "UNLINK", 0, "Unlink", ""},
 	{OUTLINER_IDOP_LOCAL, "LOCAL", 0, "Make Local", ""},
 	{OUTLINER_IDOP_SINGLE, "SINGLE", 0, "Make Single User", ""},
-	{OUTLINER_IDOP_FAKE_ADD, "ADD_FAKE", 0, "Add Fake User", "Ensure datablock gets saved even if it isn't in use (e.g. for motion and material libraries)"},
+	{OUTLINER_IDOP_FAKE_ADD, "ADD_FAKE", 0, "Add Fake User",
+     "Ensure datablock gets saved even if it isn't in use (e.g. for motion and material libraries)"},
 	{OUTLINER_IDOP_FAKE_CLEAR, "CLEAR_FAKE", 0, "Clear Fake User", ""},
 	{OUTLINER_IDOP_RENAME, "RENAME", 0, "Rename", ""},
 	{0, NULL, 0, NULL, NULL}
@@ -866,7 +900,7 @@ static void outliner_do_id_set_operation(SpaceOops *soops, int type, ListBase *l
 		tselem = TREESTORE(te);
 		if (tselem->flag & TSE_SELECTED) {
 			if (tselem->type == type) {
-				TreeStoreElem *tsep = TREESTORE(te->parent);
+				TreeStoreElem *tsep = te->parent ? TREESTORE(te->parent) : NULL;
 				operation_cb(te, tselem, tsep, newid);
 			}
 		}
@@ -918,7 +952,9 @@ static int outliner_action_set_exec(bContext *C, wmOperator *op)
 	else if (act->idroot == 0) {
 		/* hopefully in this case (i.e. library of userless actions), the user knows what they're doing... */
 		BKE_reportf(op->reports, RPT_WARNING,
-		            "Action '%s' does not specify what datablocks it can be used on. Try setting the 'ID Root Type' setting from the Datablocks Editor for this Action to avoid future problems",
+		            "Action '%s' does not specify what datablocks it can be used on. "
+		            "Try setting the 'ID Root Type' setting from the Datablocks Editor "
+		            "for this Action to avoid future problems",
 		            act->id.name + 2);
 	}
 	
@@ -1013,14 +1049,14 @@ static int outliner_animdata_operation_exec(bContext *C, wmOperator *op)
 		
 		case OUTLINER_ANIMOP_CLEAR_ACT:
 			/* clear active action - using standard rules */
-			outliner_do_data_operation(soops, datalevel, event, &soops->tree, unlinkact_animdata_cb);
+			outliner_do_data_operation(soops, datalevel, event, &soops->tree, unlinkact_animdata_cb, NULL);
 			
 			WM_event_add_notifier(C, NC_ANIMATION | ND_NLA_ACTCHANGE, NULL);
 			ED_undo_push(C, "Unlink action");
 			break;
 			
 		case OUTLINER_ANIMOP_REFRESH_DRV:
-			outliner_do_data_operation(soops, datalevel, event, &soops->tree, refreshdrivers_animdata_cb);
+			outliner_do_data_operation(soops, datalevel, event, &soops->tree, refreshdrivers_animdata_cb, NULL);
 			
 			WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN, NULL);
 			//ED_undo_push(C, "Refresh Drivers"); /* no undo needed - shouldn't have any impact? */
@@ -1028,7 +1064,7 @@ static int outliner_animdata_operation_exec(bContext *C, wmOperator *op)
 			break;
 			
 		case OUTLINER_ANIMOP_CLEAR_DRV:
-			outliner_do_data_operation(soops, datalevel, event, &soops->tree, cleardrivers_animdata_cb);
+			outliner_do_data_operation(soops, datalevel, event, &soops->tree, cleardrivers_animdata_cb, NULL);
 			
 			WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN, NULL);
 			ED_undo_push(C, "Clear Drivers");
@@ -1097,28 +1133,29 @@ static int outliner_data_operation_exec(bContext *C, wmOperator *op)
 	
 	if (datalevel == TSE_POSE_CHANNEL) {
 		if (event > 0) {
-			outliner_do_data_operation(soops, datalevel, event, &soops->tree, pchan_cb);
+			outliner_do_data_operation(soops, datalevel, event, &soops->tree, pchan_cb, NULL);
 			WM_event_add_notifier(C, NC_OBJECT | ND_POSE, NULL);
 			ED_undo_push(C, "PoseChannel operation");
 		}
 	}
 	else if (datalevel == TSE_BONE) {
 		if (event > 0) {
-			outliner_do_data_operation(soops, datalevel, event, &soops->tree, bone_cb);
+			outliner_do_data_operation(soops, datalevel, event, &soops->tree, bone_cb, NULL);
 			WM_event_add_notifier(C, NC_OBJECT | ND_POSE, NULL);
 			ED_undo_push(C, "Bone operation");
 		}
 	}
 	else if (datalevel == TSE_EBONE) {
 		if (event > 0) {
-			outliner_do_data_operation(soops, datalevel, event, &soops->tree, ebone_cb);
+			outliner_do_data_operation(soops, datalevel, event, &soops->tree, ebone_cb, NULL);
 			WM_event_add_notifier(C, NC_OBJECT | ND_POSE, NULL);
 			ED_undo_push(C, "EditBone operation");
 		}
 	}
 	else if (datalevel == TSE_SEQUENCE) {
 		if (event > 0) {
-			outliner_do_data_operation(soops, datalevel, event, &soops->tree, sequence_cb);
+			Scene *scene = CTX_data_scene(C);
+			outliner_do_data_operation(soops, datalevel, event, &soops->tree, sequence_cb, scene);
 		}
 	}
 	
@@ -1147,7 +1184,8 @@ void OUTLINER_OT_data_operation(wmOperatorType *ot)
 /* ******************** */
 
 
-static int do_outliner_operation_event(bContext *C, Scene *scene, ARegion *ar, SpaceOops *soops, TreeElement *te, wmEvent *event, const float mval[2])
+static int do_outliner_operation_event(bContext *C, Scene *scene, ARegion *ar, SpaceOops *soops,
+                                       TreeElement *te, wmEvent *event, const float mval[2])
 {
 	ReportList *reports = CTX_wm_reports(C); // XXX...
 	
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index 8a31305d65e..63907f530eb 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -132,6 +132,14 @@ static void outliner_storage_cleanup(SpaceOops *soops)
 	}
 }
 
+/* XXX - THIS FUNCTION IS INCREDIBLY SLOW
+ * ... it can bring blenders tools and viewport to a grinding halt becuase of searching
+ * for duplicate items every times they are added.
+ *
+ * TODO (possible speedups)
+ * - use a hash for duplicate (could even store a hash per type)
+ * - use mempool for TreeElements
+ * */
 static void check_persistent(SpaceOops *soops, TreeElement *te, ID *id, short type, short nr)
 {
 	TreeStore *ts;
@@ -147,8 +155,8 @@ static void check_persistent(SpaceOops *soops, TreeElement *te, ID *id, short ty
 	/* check if 'te' is in treestore */
 	tselem = ts->data;
 	for (a = 0; a < ts->usedelem; a++, tselem++) {
-		if (tselem->id == id && tselem->used == 0) {
-			if ((type == 0 && tselem->type == 0) || (tselem->type == type && tselem->nr == nr)) {
+		if ((tselem->used == 0) && (tselem->type == type) && (tselem->id == id)) {
+			if ((type == 0) || (tselem->nr == nr)) {
 				te->store_index = a;
 				tselem->used = 1;
 				return;
@@ -889,24 +897,16 @@ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *i
 		 */
 		te->idcode = seq->type;
 		te->directdata = seq;
+		te->name = seq->name + 2;
 
-		if (seq->type < 7) {
+		if (seq->type < SEQ_TYPE_EFFECT) {
 			/*
 			 * This work like the sequence.
 			 * If the sequence have a name (not default name)
 			 * show it, in other case put the filename.
 			 */
-			if (strcmp(seq->name, "SQ"))
-				te->name = seq->name;
-			else {
-				if ((seq->strip) && (seq->strip->stripdata))
-					te->name = seq->strip->stripdata->name;
-				else
-					te->name = "SQ None";
-			}
 
-			if (seq->type == SEQ_META) {
-				te->name = "Meta Strip";
+			if (seq->type == SEQ_TYPE_META) {
 				p = seq->seqbase.first;
 				while (p) {
 					outliner_add_element(soops, &te->subtree, (void *)p, te, TSE_SEQUENCE, index);
@@ -916,8 +916,6 @@ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *i
 			else
 				outliner_add_element(soops, &te->subtree, (void *)seq->strip, te, TSE_SEQ_STRIP, index);
 		}
-		else
-			te->name = "Effect";
 	}
 	else if (type == TSE_SEQ_STRIP) {
 		Strip *strip = (Strip *)idv;
diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c
index 3110ff3e29e..489a4efe891 100644
--- a/source/blender/editors/space_outliner/space_outliner.c
+++ b/source/blender/editors/space_outliner/space_outliner.c
@@ -41,6 +41,7 @@
 
 #include "BKE_context.h"
 #include "BKE_screen.h"
+#include "BKE_scene.h"
 
 #include "ED_space_api.h"
 #include "ED_screen.h"
@@ -52,6 +53,9 @@
 
 #include "RNA_access.h"
 
+#include "DNA_scene_types.h"
+#include "DNA_object_types.h"
+
 #include "UI_resources.h"
 #include "UI_view2d.h"
 
@@ -91,7 +95,22 @@ static int outliner_parent_drop_poll(bContext *C, wmDrag *drag, wmEvent *event)
 			for (te = soops->tree.first; te; te = te->next) {
 				TreeElement *te_valid;
 				te_valid = outliner_dropzone_parent(C, event, te, fmval);
-				if (te_valid) return 1;
+				if (te_valid) {
+					/* check that parent/child are both in the same scene */
+					Scene *scene = (Scene *)outliner_search_back(soops, te_valid, ID_SCE);
+
+					if (!scene) {
+						/* currently outlier organized in a way, that if there's no parent scene
+						 * element for object it means that all displayed objects belong to
+						 * active scene and parenting them is allowed (sergey)
+						 */
+						return 1;
+					}
+
+					if (scene && BKE_scene_base_find(scene, (Object *)id)) {
+						return 1;
+					}
+				}
 			}
 		}
 	}
@@ -117,7 +136,9 @@ static int outliner_parent_clear_poll(bContext *C, wmDrag *drag, wmEvent *event)
 	if (drag->type == WM_DRAG_ID) {
 		ID *id = (ID *)drag->poin;
 		if (GS(id->name) == ID_OB) {
-			//TODO: Check if no parent?
+			if (((Object *)id)->parent == NULL) {
+				return 0;
+			}
 			/* Ensure location under cursor is valid dropzone */
 			for (te = soops->tree.first; te; te = te->next) {
 				if (outliner_dropzone_parent_clear(C, event, te, fmval)) return 1;
@@ -144,6 +165,64 @@ static void outliner_parent_clear_copy(wmDrag *drag, wmDropBox *drop)
 	RNA_enum_set(drop->ptr, "type", 0);
 }
 
+static int outliner_scene_drop_poll(bContext *C, wmDrag *drag, wmEvent *event)
+{
+	ARegion *ar = CTX_wm_region(C);
+	SpaceOops *soops = CTX_wm_space_outliner(C);
+	TreeElement *te = NULL;
+	float fmval[2];
+	UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &fmval[0], &fmval[1]);
+
+	if (drag->type == WM_DRAG_ID) {
+		ID *id = (ID *)drag->poin;
+		if (GS(id->name) == ID_OB) {
+			/* Ensure item under cursor is valid drop target */
+			/* Find object hovered over */
+			for (te = soops->tree.first; te; te = te->next) {
+				if (outliner_dropzone_scene(C, event, te, fmval))
+					return 1;
+			}
+		}
+	}
+	return 0;
+}
+
+static void outliner_scene_drop_copy(wmDrag *drag, wmDropBox *drop)
+{
+	ID *id = (ID *)drag->poin;
+
+	RNA_string_set(drop->ptr, "object", id->name + 2);
+}
+
+static int outliner_material_drop_poll(bContext *C, wmDrag *drag, wmEvent *event)
+{
+	ARegion *ar = CTX_wm_region(C);
+	SpaceOops *soops = CTX_wm_space_outliner(C);
+	TreeElement *te = NULL;
+	float fmval[2];
+	UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &fmval[0], &fmval[1]);
+
+	if (drag->type == WM_DRAG_ID) {
+		ID *id = (ID *)drag->poin;
+		if (GS(id->name) == ID_MA) {
+			/* Ensure item under cursor is valid drop target */
+			/* Find object hovered over */
+			for (te = soops->tree.first; te; te = te->next) {
+				if (outliner_dropzone_parent(C, event, te, fmval))
+					return 1;
+			}
+		}
+	}
+	return 0;
+}
+
+static void outliner_material_drop_copy(wmDrag *drag, wmDropBox *drop)
+{
+	ID *id = (ID *)drag->poin;
+
+	RNA_string_set(drop->ptr, "material", id->name + 2);
+}
+
 /* region dropbox definition */
 static void outliner_dropboxes(void)
 {
@@ -151,6 +230,8 @@ static void outliner_dropboxes(void)
 
 	WM_dropbox_add(lb, "OUTLINER_OT_parent_drop", outliner_parent_drop_poll, outliner_parent_drop_copy);
 	WM_dropbox_add(lb, "OUTLINER_OT_parent_clear", outliner_parent_clear_poll, outliner_parent_clear_copy);
+	WM_dropbox_add(lb, "OUTLINER_OT_scene_drop", outliner_scene_drop_poll, outliner_scene_drop_copy);
+	WM_dropbox_add(lb, "OUTLINER_OT_material_drop", outliner_material_drop_poll, outliner_material_drop_copy);
 }
 
 static void outliner_main_area_draw(const bContext *C, ARegion *ar)
diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt
index bfd9ed95ee4..7bee8c2bebf 100644
--- a/source/blender/editors/space_sequencer/CMakeLists.txt
+++ b/source/blender/editors/space_sequencer/CMakeLists.txt
@@ -20,6 +20,7 @@
 
 set(INC
 	../include
+	../../blenfont
 	../../blenkernel
 	../../blenlib
 	../../blenloader
diff --git a/source/blender/editors/space_sequencer/SConscript b/source/blender/editors/space_sequencer/SConscript
index 65aadfa1c8a..ec06eacae9c 100644
--- a/source/blender/editors/space_sequencer/SConscript
+++ b/source/blender/editors/space_sequencer/SConscript
@@ -5,7 +5,7 @@ sources = env.Glob('*.c')
 
 incs = '../include ../../blenlib ../../blenkernel ../../blenfont ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' ../../makesrna ../../blenloader'
+incs += ' ../../makesrna ../../blenloader ../../blenfont'
 incs += ' #/intern/audaspace/intern'
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index 97bfe1bafc2..26bedd14d6e 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -46,6 +46,7 @@
 #include "BLI_utildefines.h"
 
 #include "DNA_scene_types.h"
+#include "DNA_mask_types.h"
 #include "DNA_userdef_types.h"
 
 #include "BKE_context.h"
@@ -54,6 +55,8 @@
 #include "BKE_main.h"
 #include "BKE_sequencer.h"
 #include "BKE_movieclip.h"
+#include "BKE_sequencer.h"
+#include "BKE_mask.h"
 #include "BKE_report.h"
 
 #include "WM_api.h"
@@ -65,6 +68,7 @@
 /* for menu/popup icons etc etc*/
 
 #include "ED_screen.h"
+#include "ED_sequencer.h"
 
 #include "UI_view2d.h"
 
@@ -227,8 +231,8 @@ static int sequencer_add_scene_strip_exec(bContext *C, wmOperator *op)
 	}
 	
 	seq = alloc_sequence(ed->seqbasep, start_frame, channel);
-	seq->type = SEQ_SCENE;
-	seq->blend_mode = SEQ_CROSS; /* so alpha adjustment fade to the strip below */
+	seq->type = SEQ_TYPE_SCENE;
+	seq->blend_mode = SEQ_TYPE_CROSS; /* so alpha adjustment fade to the strip below */
 
 	seq->scene = sce_seq;
 	
@@ -246,7 +250,7 @@ static int sequencer_add_scene_strip_exec(bContext *C, wmOperator *op)
 	BKE_sequencer_sort(scene);
 	
 	if (RNA_boolean_get(op->ptr, "replace_sel")) {
-		deselect_all_seq(scene);
+		ED_sequencer_deselect_all(scene);
 		BKE_sequencer_active_set(scene, seq);
 		seq->flag |= SELECT;
 	}
@@ -326,8 +330,8 @@ static int sequencer_add_movieclip_strip_exec(bContext *C, wmOperator *op)
 	}
 	
 	seq = alloc_sequence(ed->seqbasep, start_frame, channel);
-	seq->type = SEQ_MOVIECLIP;
-	seq->blend_mode = SEQ_CROSS;
+	seq->type = SEQ_TYPE_MOVIECLIP;
+	seq->blend_mode = SEQ_TYPE_CROSS;
 	seq->clip = clip;
 
 	if (seq->clip->id.us == 0)
@@ -345,7 +349,7 @@ static int sequencer_add_movieclip_strip_exec(bContext *C, wmOperator *op)
 	BKE_sequencer_sort(scene);
 	
 	if (RNA_boolean_get(op->ptr, "replace_sel")) {
-		deselect_all_seq(scene);
+		ED_sequencer_deselect_all(scene);
 		BKE_sequencer_active_set(scene, seq);
 		seq->flag |= SELECT;
 	}
@@ -359,7 +363,6 @@ static int sequencer_add_movieclip_strip_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-
 static int sequencer_add_movieclip_strip_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
 	if (!ED_operator_sequencer_active(C)) {
@@ -376,11 +379,10 @@ static int sequencer_add_movieclip_strip_invoke(bContext *C, wmOperator *op, wmE
 	// return WM_menu_invoke(C, op, event);
 }
 
-
 void SEQUENCER_OT_movieclip_strip_add(struct wmOperatorType *ot)
 {
 	PropertyRNA *prop;
-	
+
 	/* identifiers */
 	ot->name = "Add MovieClip Strip";
 	ot->idname = "SEQUENCER_OT_movieclip_strip_add";
@@ -391,16 +393,113 @@ void SEQUENCER_OT_movieclip_strip_add(struct wmOperatorType *ot)
 	ot->exec = sequencer_add_movieclip_strip_exec;
 
 	ot->poll = ED_operator_scene_editable;
-	
+
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-	
+
 	sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME);
 	prop = RNA_def_enum(ot->srna, "clip", DummyRNA_NULL_items, 0, "Clip", "");
 	RNA_def_enum_funcs(prop, RNA_movieclip_itemf);
 	ot->prop = prop;
 }
 
+static int sequencer_add_mask_strip_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene = CTX_data_scene(C);
+	Editing *ed = BKE_sequencer_editing_get(scene, TRUE);
+
+	Mask *mask;
+
+	Sequence *seq;  /* generic strip vars */
+	Strip *strip;
+
+	int start_frame, channel; /* operator props */
+
+	start_frame = RNA_int_get(op->ptr, "frame_start");
+	channel = RNA_int_get(op->ptr, "channel");
+
+	mask = BLI_findlink(&CTX_data_main(C)->mask, RNA_enum_get(op->ptr, "mask"));
+
+	if (mask == NULL) {
+		BKE_report(op->reports, RPT_ERROR, "Mask not found");
+		return OPERATOR_CANCELLED;
+	}
+
+	seq = alloc_sequence(ed->seqbasep, start_frame, channel);
+	seq->type = SEQ_TYPE_MASK;
+	seq->blend_mode = SEQ_TYPE_CROSS;
+	seq->mask = mask;
+
+	if (seq->mask->id.us == 0)
+		seq->mask->id.us = 1;
+
+	/* basic defaults */
+	seq->strip = strip = MEM_callocN(sizeof(Strip), "strip");
+	seq->len = BKE_mask_get_duration(mask);
+	strip->us = 1;
+
+	BLI_strncpy(seq->name + 2, mask->id.name + 2, sizeof(seq->name) - 2);
+	seqbase_unique_name_recursive(&ed->seqbase, seq);
+
+	calc_sequence_disp(scene, seq);
+	BKE_sequencer_sort(scene);
+
+	if (RNA_boolean_get(op->ptr, "replace_sel")) {
+		ED_sequencer_deselect_all(scene);
+		BKE_sequencer_active_set(scene, seq);
+		seq->flag |= SELECT;
+	}
+
+	if (RNA_boolean_get(op->ptr, "overlap") == FALSE) {
+		if (seq_test_overlap(ed->seqbasep, seq)) shuffle_seq(ed->seqbasep, seq, scene);
+	}
+
+	WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene);
+
+	return OPERATOR_FINISHED;
+}
+
+static int sequencer_add_mask_strip_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	if (!ED_operator_sequencer_active(C)) {
+		BKE_report(op->reports, RPT_ERROR, "Sequencer area not active");
+		return OPERATOR_CANCELLED;
+	}
+
+	if (!RNA_struct_property_is_set(op->ptr, "mask"))
+		return WM_enum_search_invoke(C, op, event);
+
+	sequencer_generic_invoke_xy__internal(C, op, event, 0);
+	return sequencer_add_mask_strip_exec(C, op);
+	// needs a menu
+	// return WM_menu_invoke(C, op, event);
+}
+
+
+void SEQUENCER_OT_mask_strip_add(struct wmOperatorType *ot)
+{
+	PropertyRNA *prop;
+
+	/* identifiers */
+	ot->name = "Add Mask Strip";
+	ot->idname = "SEQUENCER_OT_mask_strip_add";
+	ot->description = "Add a mask strip to the sequencer";
+
+	/* api callbacks */
+	ot->invoke = sequencer_add_mask_strip_invoke;
+	ot->exec = sequencer_add_mask_strip_exec;
+
+	ot->poll = ED_operator_scene_editable;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME);
+	prop = RNA_def_enum(ot->srna, "mask", DummyRNA_NULL_items, 0, "Mask", "");
+	RNA_def_enum_funcs(prop, RNA_mask_itemf);
+	ot->prop = prop;
+}
+
 
 static int sequencer_add_generic_strip_exec(bContext *C, wmOperator *op, SeqLoadFunc seq_load_func)
 {
@@ -414,7 +513,7 @@ static int sequencer_add_generic_strip_exec(bContext *C, wmOperator *op, SeqLoad
 	seq_load_operator_info(&seq_load, op);
 
 	if (seq_load.flag & SEQ_LOAD_REPLACE_SEL)
-		deselect_all_seq(scene);
+		ED_sequencer_deselect_all(scene);
 
 	if (RNA_struct_property_is_set(op->ptr, "files"))
 		tot_files = RNA_property_collection_length(op->ptr, RNA_struct_find_property(op->ptr, "files"));
@@ -595,7 +694,7 @@ static int sequencer_add_image_strip_exec(bContext *C, wmOperator *op)
 		return OPERATOR_CANCELLED;
 
 	if (seq_load.flag & SEQ_LOAD_REPLACE_SEL)
-		deselect_all_seq(scene);
+		ED_sequencer_deselect_all(scene);
 
 
 	/* main adding function */
@@ -739,27 +838,14 @@ static int sequencer_add_effect_strip_exec(bContext *C, wmOperator *op)
 	seq->strip = strip = MEM_callocN(sizeof(Strip), "strip");
 	strip->us = 1;
 
-	if (seq->type == SEQ_PLUGIN) {
-		char path[FILE_MAX];
-		RNA_string_get(op->ptr, "filepath", path);
-
-		sh.init_plugin(seq, path);
-
-		if (seq->plugin == NULL) {
-			BLI_remlink(ed->seqbasep, seq);
-			seq_free_sequence(scene, seq);
-			BKE_reportf(op->reports, RPT_ERROR, "Sequencer plugin \"%s\" could not load", path);
-			return OPERATOR_CANCELLED;
-		}
-	}
-	else if (seq->type == SEQ_COLOR) {
+	if (seq->type == SEQ_TYPE_COLOR) {
 		SolidColorVars *colvars = (SolidColorVars *)seq->effectdata;
 		RNA_float_get_array(op->ptr, "color", colvars->col);
-		seq->blend_mode = SEQ_CROSS; /* so alpha adjustment fade to the strip below */
+		seq->blend_mode = SEQ_TYPE_CROSS; /* so alpha adjustment fade to the strip below */
 
 	}
-	else if (seq->type == SEQ_ADJUSTMENT) {
-		seq->blend_mode = SEQ_CROSS;
+	else if (seq->type == SEQ_TYPE_ADJUSTMENT) {
+		seq->blend_mode = SEQ_TYPE_CROSS;
 	}
 
 	/* an unset channel is a special case where we automatically go above
@@ -786,7 +872,7 @@ static int sequencer_add_effect_strip_exec(bContext *C, wmOperator *op)
 	BKE_sequencer_sort(scene); 
 
 	if (RNA_boolean_get(op->ptr, "replace_sel")) {
-		deselect_all_seq(scene);
+		ED_sequencer_deselect_all(scene);
 		BKE_sequencer_active_set(scene, seq);
 		seq->flag |= SELECT;
 	}
@@ -823,14 +909,7 @@ static int sequencer_add_effect_strip_invoke(bContext *C, wmOperator *op, wmEven
 
 	sequencer_generic_invoke_xy__internal(C, op, event, prop_flag);
 
-	if (is_type_set && type == SEQ_PLUGIN) {
-		/* only plugins need the file selector */
-		WM_event_add_fileselect(C, op);
-		return OPERATOR_RUNNING_MODAL;
-	}
-	else {
-		return sequencer_add_effect_strip_exec(C, op);
-	}
+	return sequencer_add_effect_strip_exec(C, op);
 }
 
 void SEQUENCER_OT_effect_strip_add(struct wmOperatorType *ot)
@@ -851,6 +930,6 @@ void SEQUENCER_OT_effect_strip_add(struct wmOperatorType *ot)
 	
 	WM_operator_properties_filesel(ot, 0, FILE_SPECIAL, FILE_OPENFILE, WM_FILESEL_FILEPATH | WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY);
 	sequencer_generic_props__internal(ot, SEQPROP_STARTFRAME | SEQPROP_ENDFRAME);
-	RNA_def_enum(ot->srna, "type", sequencer_prop_effect_types, SEQ_CROSS, "Type", "Sequencer effect type");
+	RNA_def_enum(ot->srna, "type", sequencer_prop_effect_types, SEQ_TYPE_CROSS, "Type", "Sequencer effect type");
 	RNA_def_float_vector(ot->srna, "color", 3, NULL, 0.0f, 1.0f, "Color", "Initialize the strip with this color (only used when type='COLOR')", 0.0f, 1.0f);
 }
diff --git a/source/blender/editors/space_sequencer/sequencer_buttons.c b/source/blender/editors/space_sequencer/sequencer_buttons.c
index aeedafa9992..1e452f2052d 100644
--- a/source/blender/editors/space_sequencer/sequencer_buttons.c
+++ b/source/blender/editors/space_sequencer/sequencer_buttons.c
@@ -25,8 +25,6 @@
  *  \ingroup spseq
  */
 
-
-
 #include <string.h>
 #include <stdio.h>
 
@@ -36,10 +34,13 @@
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
+#include "BLF_translation.h"
+
 #include "BKE_context.h"
 #include "BKE_screen.h"
 
 #include "ED_screen.h"
+#include "ED_gpencil.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -48,6 +49,19 @@
 
 #include "sequencer_intern.h"
 
+/* **************************** buttons ********************************* */
+
+void sequencer_buttons_register(ARegionType *art)
+{
+	PanelType *pt;
+	
+	pt = MEM_callocN(sizeof(PanelType), "spacetype sequencer panel gpencil");
+	strcpy(pt->idname, "SEQUENCER_PT_gpencil");
+	strcpy(pt->label, N_("Grease Pencil"));
+	pt->draw= gpencil_panel_standard;
+	BLI_addtail(&art->paneltypes, pt);
+}
+
 /* **************** operator to open/close properties view ************* */
 
 static int sequencer_properties(bContext *C, wmOperator *UNUSED(op))
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 392e7793a0f..e48450e93bd 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -40,6 +40,7 @@
 #include "IMB_imbuf_types.h"
 
 #include "DNA_scene_types.h"
+#include "DNA_mask_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
 #include "DNA_userdef_types.h"
@@ -57,8 +58,11 @@
 #include "BIF_glutil.h"
 
 #include "ED_anim_api.h"
+#include "ED_gpencil.h"
 #include "ED_markers.h"
+#include "ED_mask.h"
 #include "ED_types.h"
+#include "ED_space_api.h"
 
 #include "UI_interface.h"
 #include "UI_resources.h"
@@ -82,23 +86,27 @@ static void get_seq_color3ubv(Scene *curscene, Sequence *seq, unsigned char col[
 	SolidColorVars *colvars = (SolidColorVars *)seq->effectdata;
 
 	switch (seq->type) {
-		case SEQ_IMAGE:
+		case SEQ_TYPE_IMAGE:
 			UI_GetThemeColor3ubv(TH_SEQ_IMAGE, col);
 			break;
 
-		case SEQ_META:
+		case SEQ_TYPE_META:
 			UI_GetThemeColor3ubv(TH_SEQ_META, col);
 			break;
 
-		case SEQ_MOVIE:
+		case SEQ_TYPE_MOVIE:
 			UI_GetThemeColor3ubv(TH_SEQ_MOVIE, col);
 			break;
 
-		case SEQ_MOVIECLIP:
+		case SEQ_TYPE_MOVIECLIP:
 			UI_GetThemeColor3ubv(TH_SEQ_MOVIECLIP, col);
 			break;
-		
-		case SEQ_SCENE:
+
+		case SEQ_TYPE_MASK:
+			UI_GetThemeColor3ubv(TH_SEQ_MASK, col); /* TODO */
+			break;
+
+		case SEQ_TYPE_SCENE:
 			UI_GetThemeColor3ubv(TH_SEQ_SCENE, col);
 		
 			if (seq->scene == curscene) {
@@ -107,45 +115,45 @@ static void get_seq_color3ubv(Scene *curscene, Sequence *seq, unsigned char col[
 			break;
 		
 		/* transitions */
-		case SEQ_CROSS:
-		case SEQ_GAMCROSS:
-		case SEQ_WIPE:
+		case SEQ_TYPE_CROSS:
+		case SEQ_TYPE_GAMCROSS:
+		case SEQ_TYPE_WIPE:
 			UI_GetThemeColor3ubv(TH_SEQ_TRANSITION, col);
 
 			/* slightly offset hue to distinguish different effects */
-			if (seq->type == SEQ_CROSS)    rgb_byte_set_hue_float_offset(col, 0.04);
-			if (seq->type == SEQ_GAMCROSS) rgb_byte_set_hue_float_offset(col, 0.08);
-			if (seq->type == SEQ_WIPE)     rgb_byte_set_hue_float_offset(col, 0.12);
+			if (seq->type == SEQ_TYPE_CROSS)    rgb_byte_set_hue_float_offset(col, 0.04);
+			if (seq->type == SEQ_TYPE_GAMCROSS) rgb_byte_set_hue_float_offset(col, 0.08);
+			if (seq->type == SEQ_TYPE_WIPE)     rgb_byte_set_hue_float_offset(col, 0.12);
 			break;
 
 		/* effects */
-		case SEQ_TRANSFORM:
-		case SEQ_SPEED:
-		case SEQ_ADD:
-		case SEQ_SUB:
-		case SEQ_MUL:
-		case SEQ_ALPHAOVER:
-		case SEQ_ALPHAUNDER:
-		case SEQ_OVERDROP:
-		case SEQ_GLOW:
-		case SEQ_MULTICAM:
-		case SEQ_ADJUSTMENT:
+		case SEQ_TYPE_TRANSFORM:
+		case SEQ_TYPE_SPEED:
+		case SEQ_TYPE_ADD:
+		case SEQ_TYPE_SUB:
+		case SEQ_TYPE_MUL:
+		case SEQ_TYPE_ALPHAOVER:
+		case SEQ_TYPE_ALPHAUNDER:
+		case SEQ_TYPE_OVERDROP:
+		case SEQ_TYPE_GLOW:
+		case SEQ_TYPE_MULTICAM:
+		case SEQ_TYPE_ADJUSTMENT:
 			UI_GetThemeColor3ubv(TH_SEQ_EFFECT, col);
 
 			/* slightly offset hue to distinguish different effects */
-			if      (seq->type == SEQ_ADD)        rgb_byte_set_hue_float_offset(col, 0.04);
-			else if (seq->type == SEQ_SUB)        rgb_byte_set_hue_float_offset(col, 0.08);
-			else if (seq->type == SEQ_MUL)        rgb_byte_set_hue_float_offset(col, 0.12);
-			else if (seq->type == SEQ_ALPHAOVER)  rgb_byte_set_hue_float_offset(col, 0.16);
-			else if (seq->type == SEQ_ALPHAUNDER) rgb_byte_set_hue_float_offset(col, 0.20);
-			else if (seq->type == SEQ_OVERDROP)   rgb_byte_set_hue_float_offset(col, 0.24);
-			else if (seq->type == SEQ_GLOW)       rgb_byte_set_hue_float_offset(col, 0.28);
-			else if (seq->type == SEQ_TRANSFORM)  rgb_byte_set_hue_float_offset(col, 0.36);
-			else if (seq->type == SEQ_MULTICAM)   rgb_byte_set_hue_float_offset(col, 0.32);
-			else if (seq->type == SEQ_ADJUSTMENT) rgb_byte_set_hue_float_offset(col, 0.40);
+			if      (seq->type == SEQ_TYPE_ADD)        rgb_byte_set_hue_float_offset(col, 0.04);
+			else if (seq->type == SEQ_TYPE_SUB)        rgb_byte_set_hue_float_offset(col, 0.08);
+			else if (seq->type == SEQ_TYPE_MUL)        rgb_byte_set_hue_float_offset(col, 0.12);
+			else if (seq->type == SEQ_TYPE_ALPHAOVER)  rgb_byte_set_hue_float_offset(col, 0.16);
+			else if (seq->type == SEQ_TYPE_ALPHAUNDER) rgb_byte_set_hue_float_offset(col, 0.20);
+			else if (seq->type == SEQ_TYPE_OVERDROP)   rgb_byte_set_hue_float_offset(col, 0.24);
+			else if (seq->type == SEQ_TYPE_GLOW)       rgb_byte_set_hue_float_offset(col, 0.28);
+			else if (seq->type == SEQ_TYPE_TRANSFORM)  rgb_byte_set_hue_float_offset(col, 0.36);
+			else if (seq->type == SEQ_TYPE_MULTICAM)   rgb_byte_set_hue_float_offset(col, 0.32);
+			else if (seq->type == SEQ_TYPE_ADJUSTMENT) rgb_byte_set_hue_float_offset(col, 0.40);
 			break;
 
-		case SEQ_COLOR:
+		case SEQ_TYPE_COLOR:
 			if (colvars->col) {
 				rgb_float_to_uchar(col, colvars->col);
 			}
@@ -153,12 +161,8 @@ static void get_seq_color3ubv(Scene *curscene, Sequence *seq, unsigned char col[
 				col[0] = col[1] = col[2] = 128;
 			}
 			break;
-		
-		case SEQ_PLUGIN:
-			UI_GetThemeColor3ubv(TH_SEQ_PLUGIN, col);
-			break;
 
-		case SEQ_SOUND:
+		case SEQ_TYPE_SOUND_RAM:
 			UI_GetThemeColor3ubv(TH_SEQ_AUDIO, col);
 			blendcol[0] = blendcol[1] = blendcol[2] = 128;
 			if (seq->flag & SEQ_MUTE) UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.5, 20);
@@ -366,7 +370,7 @@ static void draw_seq_handle(View2D *v2d, Sequence *seq, float pixelx, short dire
 	}
 	
 	/* draw! */
-	if (seq->type < SEQ_EFFECT || 
+	if (seq->type < SEQ_TYPE_EFFECT || 
 	    get_sequence_effect_num_inputs(seq->type) == 0)
 	{
 		glEnable(GL_BLEND);
@@ -413,7 +417,7 @@ static void draw_seq_extensions(Scene *scene, ARegion *ar, Sequence *seq)
 	unsigned char col[3], blendcol[3];
 	View2D *v2d = &ar->v2d;
 	
-	if (seq->type >= SEQ_EFFECT) return;
+	if (seq->type >= SEQ_TYPE_EFFECT) return;
 
 	x1 = seq->startdisp;
 	x2 = seq->enddisp;
@@ -525,10 +529,10 @@ static void draw_seq_text(View2D *v2d, Sequence *seq, float x1, float x2, float
 	if (name[0] == '\0')
 		name = give_seqname(seq);
 
-	if (seq->type == SEQ_META || seq->type == SEQ_ADJUSTMENT) {
+	if (seq->type == SEQ_TYPE_META || seq->type == SEQ_TYPE_ADJUSTMENT) {
 		BLI_snprintf(str, sizeof(str), "%d | %s", seq->len, name);
 	}
-	else if (seq->type == SEQ_SCENE) {
+	else if (seq->type == SEQ_TYPE_SCENE) {
 		if (seq->scene) {
 			if (seq->scene_camera) {
 				BLI_snprintf(str, sizeof(str), "%d | %s: %s (%s)",
@@ -544,7 +548,7 @@ static void draw_seq_text(View2D *v2d, Sequence *seq, float x1, float x2, float
 			             seq->len, name);
 		}
 	}
-	else if (seq->type == SEQ_MOVIECLIP) {
+	else if (seq->type == SEQ_TYPE_MOVIECLIP) {
 		if (seq->clip && strcmp(name, seq->clip->id.name + 2) != 0) {
 			BLI_snprintf(str, sizeof(str), "%d | %s: %s",
 			             seq->len, name, seq->clip->id.name + 2);
@@ -554,33 +558,29 @@ static void draw_seq_text(View2D *v2d, Sequence *seq, float x1, float x2, float
 			             seq->len, name);
 		}
 	}
-	else if (seq->type == SEQ_MULTICAM) {
+	else if (seq->type == SEQ_TYPE_MASK) {
+		if (seq->mask && strcmp(name, seq->mask->id.name + 2) != 0) {
+			BLI_snprintf(str, sizeof(str), "%d | %s: %s",
+			             seq->len, name, seq->mask->id.name + 2);
+		}
+		else {
+			BLI_snprintf(str, sizeof(str), "%d | %s",
+			             seq->len, name);
+		}
+	}
+	else if (seq->type == SEQ_TYPE_MULTICAM) {
 		BLI_snprintf(str, sizeof(str), "Cam | %s: %d",
 		             name, seq->multicam_source);
 	}
-	else if (seq->type == SEQ_IMAGE) {
+	else if (seq->type == SEQ_TYPE_IMAGE) {
 		BLI_snprintf(str, sizeof(str), "%d | %s: %s%s",
 		             seq->len, name, seq->strip->dir, seq->strip->stripdata->name);
 	}
-	else if (seq->type & SEQ_EFFECT) {
-		int can_float = (seq->type != SEQ_PLUGIN) || (seq->plugin && seq->plugin->version >= 4);
-
-		if (seq->seq3 != seq->seq2 && seq->seq1 != seq->seq3) {
-			BLI_snprintf(str, sizeof(str), "%d | %s: %d>%d (use %d)%s",
-			             seq->len, name, seq->seq1->machine, seq->seq2->machine, seq->seq3->machine,
-			             can_float ? "" : " No float, upgrade plugin!");
-		}
-		else if (seq->seq1 && seq->seq2) {
-			BLI_snprintf(str, sizeof(str), "%d | %s: %d>%d%s",
-			             seq->len, name, seq->seq1->machine, seq->seq2->machine,
-			             can_float ? "" : " No float, upgrade plugin!");
-		}
-		else {
-			BLI_snprintf(str, sizeof(str), "%d | %s",
+	else if (seq->type & SEQ_TYPE_EFFECT) {
+		BLI_snprintf(str, sizeof(str), "%d | %s",
 			             seq->len, name);
-		}
 	}
-	else if (seq->type == SEQ_SOUND) {
+	else if (seq->type == SEQ_TYPE_SOUND_RAM) {
 		if (seq->sound)
 			BLI_snprintf(str, sizeof(str), "%d | %s: %s",
 			             seq->len, name, seq->sound->name);
@@ -588,7 +588,7 @@ static void draw_seq_text(View2D *v2d, Sequence *seq, float x1, float x2, float
 			BLI_snprintf(str, sizeof(str), "%d | %s",
 			             seq->len, name);
 	}
-	else if (seq->type == SEQ_MOVIE) {
+	else if (seq->type == SEQ_TYPE_MOVIE) {
 		BLI_snprintf(str, sizeof(str), "%d | %s: %s%s",
 		             seq->len, name, seq->strip->dir, seq->strip->stripdata->name);
 	}
@@ -714,7 +714,7 @@ static void draw_seq_strip(Scene *scene, ARegion *ar, Sequence *seq, int outline
 	x2 = seq->enddisp;
 	
 	/* draw sound wave */
-	if (seq->type == SEQ_SOUND) {
+	if (seq->type == SEQ_TYPE_SOUND_RAM) {
 		drawseqwave(scene, seq, x1, y1, x2, y2, (ar->v2d.cur.xmax - ar->v2d.cur.xmin) / ar->winx);
 	}
 
@@ -761,7 +761,7 @@ static void draw_seq_strip(Scene *scene, ARegion *ar, Sequence *seq, int outline
 		glDisable(GL_LINE_STIPPLE);
 	}
 	
-	if (seq->type == SEQ_META) {
+	if (seq->type == SEQ_TYPE_META) {
 		drawmeta_contents(scene, seq, x1, y1, x2, y2);
 	}
 	
@@ -976,17 +976,68 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq
 	}
 	
 	/* draw grease-pencil (image aligned) */
-//	if (sseq->flag & SEQ_DRAW_GPENCIL)
-// XXX		draw_gpencil_2dimage(sa, ibuf);
+	draw_gpencil_2dimage(C);
 
 	IMB_freeImBuf(ibuf);
 	
-	/* draw grease-pencil (screen aligned) */
-//	if (sseq->flag & SEQ_DRAW_GPENCIL)
-// XXX		draw_gpencil_view2d(sa, 0);
-	
 	/* ortho at pixel level */
 	UI_view2d_view_restore(C);
+	
+	/* draw grease-pencil (screen aligned) */
+	draw_gpencil_view2d(C, 0);
+
+	//if (sc->mode == SC_MODE_MASKEDIT) {
+	if (sseq->mainb == SEQ_DRAW_IMG_IMBUF) {
+		Sequence *seq_act = BKE_sequencer_active_get(scene);
+
+		if (seq_act && seq_act->type == SEQ_TYPE_MASK && seq_act->mask) {
+			int x, y;
+			int width, height;
+			float zoomx, zoomy;
+
+			/* frame image */
+			float maxdim;
+			float xofs, yofs;
+
+			/* find window pixel coordinates of origin */
+			UI_view2d_to_region_no_clip(&ar->v2d, 0.0f, 0.0f, &x, &y);
+
+			width = v2d->tot.xmax - v2d->tot.xmin;
+			height = v2d->tot.ymax - v2d->tot.ymin;
+
+			zoomx = (float)(ar->winrct.xmax - ar->winrct.xmin + 1) / (float)((ar->v2d.cur.xmax - ar->v2d.cur.xmin));
+			zoomy = (float)(ar->winrct.ymax - ar->winrct.ymin + 1) / (float)((ar->v2d.cur.ymax - ar->v2d.cur.ymin));
+
+			x += v2d->tot.xmin * zoomx;
+			y += v2d->tot.ymin * zoomy;
+
+			/* frame the image */
+			maxdim = maxf(width, height);
+			if (width == height) {
+				xofs = yofs = 0;
+			}
+			else if (width < height) {
+				xofs = ((height - width) / -2.0f) * zoomx;
+				yofs = 0.0f;
+			}
+			else { /* (width > height) */
+				xofs = 0.0f;
+				yofs = ((width - height) / -2.0f) * zoomy;
+			}
+
+			/* apply transformation so mask editing tools will assume drawing from the origin in normalized space */
+			glPushMatrix();
+			glTranslatef(x + xofs, y + yofs, 0);
+			glScalef(maxdim * zoomx, maxdim * zoomy, 0);
+
+			ED_mask_draw((bContext *)C, 0, 0); // sc->mask_draw_flag, sc->mask_draw_type
+
+			ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_VIEW);
+
+			glPopMatrix();
+		}
+	}
+
 }
 
 #if 0
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index b3b4e47ba81..c686f8440a9 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -79,21 +79,21 @@
 /* XXX */
 /* RNA Enums, used in multiple files */
 EnumPropertyItem sequencer_prop_effect_types[] = {
-	{SEQ_CROSS, "CROSS", 0, "Crossfade", "Crossfade effect strip type"},
-	{SEQ_ADD, "ADD", 0, "Add", "Add effect strip type"},
-	{SEQ_SUB, "SUBTRACT", 0, "Subtract", "Subtract effect strip type"},
-	{SEQ_ALPHAOVER, "ALPHA_OVER", 0, "Alpha Over", "Alpha Over effect strip type"},
-	{SEQ_ALPHAUNDER, "ALPHA_UNDER", 0, "Alpha Under", "Alpha Under effect strip type"},
-	{SEQ_GAMCROSS, "GAMMA_CROSS", 0, "Gamma Cross", "Gamma Cross effect strip type"},
-	{SEQ_MUL, "MULTIPLY", 0, "Multiply", "Multiply effect strip type"},
-	{SEQ_OVERDROP, "OVER_DROP", 0, "Alpha Over Drop", "Alpha Over Drop effect strip type"},
-	{SEQ_WIPE, "WIPE", 0, "Wipe", "Wipe effect strip type"},
-	{SEQ_GLOW, "GLOW", 0, "Glow", "Glow effect strip type"},
-	{SEQ_TRANSFORM, "TRANSFORM", 0, "Transform", "Transform effect strip type"},
-	{SEQ_COLOR, "COLOR", 0, "Color", "Color effect strip type"},
-	{SEQ_SPEED, "SPEED", 0, "Speed", "Color effect strip type"},
-	{SEQ_MULTICAM, "MULTICAM", 0, "Multicam Selector", ""},
-	{SEQ_ADJUSTMENT, "ADJUSTMENT", 0, "Adjustment Layer", ""},
+	{SEQ_TYPE_CROSS, "CROSS", 0, "Crossfade", "Crossfade effect strip type"},
+	{SEQ_TYPE_ADD, "ADD", 0, "Add", "Add effect strip type"},
+	{SEQ_TYPE_SUB, "SUBTRACT", 0, "Subtract", "Subtract effect strip type"},
+	{SEQ_TYPE_ALPHAOVER, "ALPHA_OVER", 0, "Alpha Over", "Alpha Over effect strip type"},
+	{SEQ_TYPE_ALPHAUNDER, "ALPHA_UNDER", 0, "Alpha Under", "Alpha Under effect strip type"},
+	{SEQ_TYPE_GAMCROSS, "GAMMA_CROSS", 0, "Gamma Cross", "Gamma Cross effect strip type"},
+	{SEQ_TYPE_MUL, "MULTIPLY", 0, "Multiply", "Multiply effect strip type"},
+	{SEQ_TYPE_OVERDROP, "OVER_DROP", 0, "Alpha Over Drop", "Alpha Over Drop effect strip type"},
+	{SEQ_TYPE_WIPE, "WIPE", 0, "Wipe", "Wipe effect strip type"},
+	{SEQ_TYPE_GLOW, "GLOW", 0, "Glow", "Glow effect strip type"},
+	{SEQ_TYPE_TRANSFORM, "TRANSFORM", 0, "Transform", "Transform effect strip type"},
+	{SEQ_TYPE_COLOR, "COLOR", 0, "Color", "Color effect strip type"},
+	{SEQ_TYPE_SPEED, "SPEED", 0, "Speed", "Color effect strip type"},
+	{SEQ_TYPE_MULTICAM, "MULTICAM", 0, "Multicam Selector", ""},
+	{SEQ_TYPE_ADJUSTMENT, "ADJUSTMENT", 0, "Adjustment Layer", ""},
 	{0, NULL, 0, NULL, NULL}
 };
 
@@ -231,27 +231,6 @@ void seq_rectf(Sequence *seq, rctf *rectf)
 	rectf->ymax = seq->machine + SEQ_STRIP_OFSTOP;
 }
 
-static void UNUSED_FUNCTION(change_plugin_seq) (Scene * scene, char *str) /* called from fileselect */
-{
-	Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
-	struct SeqEffectHandle sh;
-	Sequence *last_seq = BKE_sequencer_active_get(scene);
-
-	if (last_seq == NULL || last_seq->type != SEQ_PLUGIN) return;
-
-	sh = get_sequence_effect(last_seq);
-	sh.free(last_seq);
-	sh.init_plugin(last_seq, str);
-
-	last_seq->machine = MAX3(last_seq->seq1->machine,
-	                         last_seq->seq2->machine,
-	                         last_seq->seq3->machine);
-
-	if (seq_test_overlap(ed->seqbasep, last_seq) ) shuffle_seq(ed->seqbasep, last_seq, scene);
-	
-}
-
-
 void boundbox_seq(Scene *scene, rctf *rect)
 {
 	Sequence *seq;
@@ -454,7 +433,7 @@ static int seq_is_predecessor(Sequence *pred, Sequence *seq)
 	return 0;
 }
 
-void deselect_all_seq(Scene *scene)
+void ED_sequencer_deselect_all(Scene *scene)
 {
 	Sequence *seq;
 	Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
@@ -499,7 +478,7 @@ int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequen
 
 	for (seq = ed->seqbasep->first; seq; seq = seq->next) {
 		if (seq->flag & SELECT) {
-			if (seq->type == SEQ_SOUND && get_sequence_effect_num_inputs(type) != 0) {
+			if (seq->type == SEQ_TYPE_SOUND_RAM && get_sequence_effect_num_inputs(type) != 0) {
 				*error_str = "Can't apply effects to audio sequence strips";
 				return 0;
 			}
@@ -564,7 +543,7 @@ static Sequence *del_seq_find_replace_recurs(Scene *scene, Sequence *seq)
 
 	if (!seq)
 		return NULL;
-	else if (!(seq->type & SEQ_EFFECT))
+	else if (!(seq->type & SEQ_TYPE_EFFECT))
 		return ((seq->flag & SELECT) ? NULL : seq);
 	else if (!(seq->flag & SELECT)) {
 		/* try to find replacement for effect inputs */
@@ -605,7 +584,7 @@ static void recurs_del_seq_flag(Scene *scene, ListBase *lb, short flag, short de
 		if ((seq->flag & flag) || deleteall) {
 			BLI_remlink(lb, seq);
 			if (seq == last_seq) BKE_sequencer_active_set(scene, NULL);
-			if (seq->type == SEQ_META) recurs_del_seq_flag(scene, &seq->seqbase, flag, 1);
+			if (seq->type == SEQ_TYPE_META) recurs_del_seq_flag(scene, &seq->seqbase, flag, 1);
 			seq_free_sequence(scene, seq);
 		}
 		seq = seqn;
@@ -637,7 +616,7 @@ static Sequence *cut_seq_hard(Scene *scene, Sequence *seq, int cutframe)
 	
 	if ((seq->startstill) && (cutframe < seq->start)) {
 		/* don't do funny things with METAs ... */
-		if (seq->type == SEQ_META) {
+		if (seq->type == SEQ_TYPE_META) {
 			skip_dup = TRUE;
 			seq->startstill = seq->start - cutframe;
 		}
@@ -658,7 +637,7 @@ static Sequence *cut_seq_hard(Scene *scene, Sequence *seq, int cutframe)
 	else if (((seq->start + seq->len) < cutframe) && (seq->endstill)) {
 		seq->endstill -= seq->enddisp - cutframe;
 		/* don't do funny things with METAs ... */
-		if (seq->type == SEQ_META) {
+		if (seq->type == SEQ_TYPE_META) {
 			skip_dup = TRUE;
 		}
 	}
@@ -733,7 +712,7 @@ static Sequence *cut_seq_soft(Scene *scene, Sequence *seq, int cutframe)
 	
 	if ((seq->startstill) && (cutframe < seq->start)) {
 		/* don't do funny things with METAs ... */
-		if (seq->type == SEQ_META) {
+		if (seq->type == SEQ_TYPE_META) {
 			skip_dup = TRUE;
 			seq->startstill = seq->start - cutframe;
 		}
@@ -752,7 +731,7 @@ static Sequence *cut_seq_soft(Scene *scene, Sequence *seq, int cutframe)
 	else if (((seq->start + seq->len) < cutframe) && (seq->endstill)) {
 		seq->endstill -= seq->enddisp - cutframe;
 		/* don't do funny things with METAs ... */
-		if (seq->type == SEQ_META) {
+		if (seq->type == SEQ_TYPE_META) {
 			skip_dup = TRUE;
 		}
 	}
@@ -876,7 +855,7 @@ static void UNUSED_FUNCTION(touch_seq_files) (Scene * scene)
 	SEQP_BEGIN (ed, seq)
 	{
 		if (seq->flag & SELECT) {
-			if (seq->type == SEQ_MOVIE) {
+			if (seq->type == SEQ_TYPE_MOVIE) {
 				if (seq->strip && seq->strip->stripdata) {
 					BLI_make_file_string(G.main->name, str, seq->strip->dir, seq->strip->stripdata->name);
 					BLI_file_touch(seq->name);
@@ -904,7 +883,7 @@ static void set_filter_seq(Scene *scene)
 	SEQP_BEGIN (ed, seq)
 	{
 		if (seq->flag & SELECT) {
-			if (seq->type == SEQ_MOVIE) {
+			if (seq->type == SEQ_TYPE_MOVIE) {
 				seq->flag |= SEQ_FILTERY;
 				reload_sequence_new_file(scene, seq, FALSE);
 				calc_sequence(scene, seq);
@@ -1073,7 +1052,7 @@ static int sequencer_snap_exec(bContext *C, wmOperator *op)
 				shuffle_seq(ed->seqbasep, seq, scene);
 			}
 		}
-		else if (seq->type & SEQ_EFFECT) {
+		else if (seq->type & SEQ_TYPE_EFFECT) {
 			if (seq->seq1 && (seq->seq1->flag & SELECT)) 
 				calc_sequence(scene, seq);
 			else if (seq->seq2 && (seq->seq2->flag & SELECT)) 
@@ -1389,7 +1368,7 @@ static int sequencer_effect_poll(bContext *C)
 
 	if (ed) {
 		Sequence *last_seq = BKE_sequencer_active_get(scene);
-		if (last_seq && (last_seq->type & SEQ_EFFECT)) {
+		if (last_seq && (last_seq->type & SEQ_TYPE_EFFECT)) {
 			return 1;
 		}
 	}
@@ -1647,7 +1626,7 @@ static int sequencer_delete_exec(bContext *C, wmOperator *UNUSED(op))
 
 	/* for effects, try to find a replacement input */
 	for (seq = ed->seqbasep->first; seq; seq = seq->next)
-		if ((seq->type & SEQ_EFFECT) && !(seq->flag & SELECT))
+		if ((seq->type & SEQ_TYPE_EFFECT) && !(seq->flag & SELECT))
 			del_seq_find_replace_recurs(scene, seq);
 
 	/* delete all selected strips */
@@ -1700,7 +1679,7 @@ static int sequencer_offset_clear_exec(bContext *C, wmOperator *UNUSED(op))
 
 	/* for effects, try to find a replacement input */
 	for (seq = ed->seqbasep->first; seq; seq = seq->next) {
-		if ((seq->type & SEQ_EFFECT) == 0 && (seq->flag & SELECT)) {
+		if ((seq->type & SEQ_TYPE_EFFECT) == 0 && (seq->flag & SELECT)) {
 			seq->startofs = seq->endofs = seq->startstill = seq->endstill = 0;
 		}
 	}
@@ -1713,7 +1692,7 @@ static int sequencer_offset_clear_exec(bContext *C, wmOperator *UNUSED(op))
 	}
 
 	for (seq = ed->seqbasep->first; seq; seq = seq->next) {
-		if ((seq->type & SEQ_EFFECT) == 0 && (seq->flag & SELECT)) {
+		if ((seq->type & SEQ_TYPE_EFFECT) == 0 && (seq->flag & SELECT)) {
 			if (seq_test_overlap(ed->seqbasep, seq)) {
 				shuffle_seq(ed->seqbasep, seq, scene);
 			}
@@ -1758,7 +1737,7 @@ static int sequencer_separate_images_exec(bContext *C, wmOperator *op)
 	seq = ed->seqbasep->first; /* poll checks this is valid */
 
 	while (seq) {
-		if ((seq->flag & SELECT) && (seq->type == SEQ_IMAGE) && (seq->len > 1)) {
+		if ((seq->flag & SELECT) && (seq->type == SEQ_TYPE_IMAGE) && (seq->len > 1)) {
 			/* remove seq so overlap tests don't conflict,
 			 * see seq_free_sequence below for the real free'ing */
 			BLI_remlink(ed->seqbasep, seq);
@@ -1776,7 +1755,7 @@ static int sequencer_separate_images_exec(bContext *C, wmOperator *op)
 				BLI_addtail(ed->seqbasep, seq_new);
 
 				seq_new->start = start_ofs;
-				seq_new->type = SEQ_IMAGE;
+				seq_new->type = SEQ_TYPE_IMAGE;
 				seq_new->len = 1;
 				seq_new->endstill = step - 1;
 
@@ -1847,7 +1826,7 @@ static int sequencer_meta_toggle_exec(bContext *C, wmOperator *UNUSED(op))
 	Sequence *last_seq = BKE_sequencer_active_get(scene);
 	MetaStack *ms;
 
-	if (last_seq && last_seq->type == SEQ_META && last_seq->flag & SELECT) {
+	if (last_seq && last_seq->type == SEQ_TYPE_META && last_seq->flag & SELECT) {
 		/* Enter Metastrip */
 		ms = MEM_mallocN(sizeof(MetaStack), "metastack");
 		BLI_addtail(&ed->metastack, ms);
@@ -1925,7 +1904,7 @@ static int sequencer_meta_make_exec(bContext *C, wmOperator *op)
 
 	seqm = alloc_sequence(ed->seqbasep, 1, 1); /* channel number set later */
 	strcpy(seqm->name + 2, "MetaStrip");
-	seqm->type = SEQ_META;
+	seqm->type = SEQ_TYPE_META;
 	seqm->flag = SELECT;
 
 	seq = ed->seqbasep->first;
@@ -1991,7 +1970,7 @@ static int sequencer_meta_separate_exec(bContext *C, wmOperator *UNUSED(op))
 
 	Sequence *seq, *last_seq = BKE_sequencer_active_get(scene); /* last_seq checks (ed == NULL) */
 
-	if (last_seq == NULL || last_seq->type != SEQ_META)
+	if (last_seq == NULL || last_seq->type != SEQ_TYPE_META)
 		return OPERATOR_CANCELLED;
 
 	BLI_movelisttolist(ed->seqbasep, &last_seq->seqbase);
@@ -2004,7 +1983,7 @@ static int sequencer_meta_separate_exec(bContext *C, wmOperator *UNUSED(op))
 
 	/* emtpy meta strip, delete all effects depending on it */
 	for (seq = ed->seqbasep->first; seq; seq = seq->next)
-		if ((seq->type & SEQ_EFFECT) && seq_depends_on_meta(seq, last_seq))
+		if ((seq->type & SEQ_TYPE_EFFECT) && seq_depends_on_meta(seq, last_seq))
 			seq->flag |= SEQ_FLAG_DELETE;
 
 	recurs_del_seq_flag(scene, ed->seqbasep, SEQ_FLAG_DELETE, 0);
@@ -2475,14 +2454,14 @@ static int sequencer_swap_exec(bContext *C, wmOperator *op)
 
 		// XXX - should be a generic function
 		for (iseq = scene->ed->seqbasep->first; iseq; iseq = iseq->next) {
-			if ((iseq->type & SEQ_EFFECT) && (seq_is_parent(iseq, active_seq) || seq_is_parent(iseq, seq))) {
+			if ((iseq->type & SEQ_TYPE_EFFECT) && (seq_is_parent(iseq, active_seq) || seq_is_parent(iseq, seq))) {
 				calc_sequence(scene, iseq);
 			}
 		}
 
 		/* do this in a new loop since both effects need to be calculated first */
 		for (iseq = scene->ed->seqbasep->first; iseq; iseq = iseq->next) {
-			if ((iseq->type & SEQ_EFFECT) && (seq_is_parent(iseq, active_seq) || seq_is_parent(iseq, seq))) {
+			if ((iseq->type & SEQ_TYPE_EFFECT) && (seq_is_parent(iseq, active_seq) || seq_is_parent(iseq, seq))) {
 				/* this may now overlap */
 				if (seq_test_overlap(ed->seqbasep, iseq) ) {
 					shuffle_seq(ed->seqbasep, iseq, scene);
@@ -2533,16 +2512,16 @@ static int sequencer_rendersize_exec(bContext *C, wmOperator *UNUSED(op))
 
 	if (active_seq->strip) {
 		switch (active_seq->type) {
-			case SEQ_IMAGE:
+			case SEQ_TYPE_IMAGE:
 				se = give_stripelem(active_seq, scene->r.cfra);
 				break;
-			case SEQ_MOVIE:
+			case SEQ_TYPE_MOVIE:
 				se = active_seq->strip->stripdata;
 				break;
-			case SEQ_SCENE:
-			case SEQ_META:
-			case SEQ_RAM_SOUND:
-			case SEQ_HD_SOUND:
+			case SEQ_TYPE_SCENE:
+			case SEQ_TYPE_META:
+			case SEQ_TYPE_SOUND_RAM:
+			case SEQ_TYPE_SOUND_HD:
 			default:
 				break;
 		}
@@ -2580,7 +2559,7 @@ void SEQUENCER_OT_rendersize(wmOperatorType *ot)
 
 static void seq_copy_del_sound(Scene *scene, Sequence *seq)
 {
-	if (seq->type == SEQ_META) {
+	if (seq->type == SEQ_TYPE_META) {
 		Sequence *iseq;
 		for (iseq = seq->seqbase.first; iseq; iseq = iseq->next) {
 			seq_copy_del_sound(scene, iseq);
@@ -2665,7 +2644,7 @@ static int sequencer_paste_exec(bContext *C, wmOperator *UNUSED(op))
 	int ofs;
 	Sequence *iseq;
 
-	deselect_all_seq(scene);
+	ED_sequencer_deselect_all(scene);
 	ofs = scene->r.cfra - seqbase_clipboard_frame;
 
 	seqbase_dupli_recursive(scene, NULL, &nseqbase, &seqbase_clipboard, SEQ_DUPE_UNIQUE_NAME);
@@ -2921,7 +2900,7 @@ static int sequencer_change_effect_type_exec(bContext *C, wmOperator *op)
 	/* free previous effect and init new effect */
 	struct SeqEffectHandle sh;
 
-	if ((seq->type & SEQ_EFFECT) == 0) {
+	if ((seq->type & SEQ_TYPE_EFFECT) == 0) {
 		return OPERATOR_CANCELLED;
 	}
 
@@ -2968,7 +2947,7 @@ void SEQUENCER_OT_change_effect_type(struct wmOperatorType *ot)
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
-	ot->prop = RNA_def_enum(ot->srna, "type", sequencer_prop_effect_types, SEQ_CROSS, "Type", "Sequencer effect type");
+	ot->prop = RNA_def_enum(ot->srna, "type", sequencer_prop_effect_types, SEQ_TYPE_CROSS, "Type", "Sequencer effect type");
 }
 
 static int sequencer_change_path_exec(bContext *C, wmOperator *op)
@@ -2979,7 +2958,7 @@ static int sequencer_change_path_exec(bContext *C, wmOperator *op)
 	Sequence *seq = BKE_sequencer_active_get(scene);
 	const int is_relative_path = RNA_boolean_get(op->ptr, "relative_path");
 
-	if (seq->type == SEQ_IMAGE) {
+	if (seq->type == SEQ_TYPE_IMAGE) {
 		char directory[FILE_MAX];
 		const int len = RNA_property_collection_length(op->ptr, RNA_struct_find_property(op->ptr, "files"));
 		StripElem *se;
@@ -3049,7 +3028,7 @@ static int sequencer_change_path_invoke(bContext *C, wmOperator *op, wmEvent *UN
 	RNA_string_set(op->ptr, "directory", seq->strip->dir);
 
 	/* set default display depending on seq type */
-	if (seq->type == SEQ_IMAGE) {
+	if (seq->type == SEQ_TYPE_IMAGE) {
 		RNA_boolean_set(op->ptr, "filter_movie", FALSE);
 	}
 	else {
diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h
index fd536524c11..14d2ccdbbbe 100644
--- a/source/blender/editors/space_sequencer/sequencer_intern.h
+++ b/source/blender/editors/space_sequencer/sequencer_intern.h
@@ -61,7 +61,6 @@ void seq_rectf(struct Sequence *seq, struct rctf *rectf);
 void boundbox_seq(struct Scene *scene, struct rctf *rect);
 struct Sequence *find_nearest_seq(struct Scene *scene, struct View2D *v2d, int *hand, const int mval[2]);
 struct Sequence *find_neighboring_sequence(struct Scene *scene, struct Sequence *test, int lr, int sel);
-void deselect_all_seq(struct Scene *scene);
 void recurs_sel_seq(struct Sequence *seqm);
 int seq_effect_find_selected(struct Scene *scene, struct Sequence *activeseq, int type, struct Sequence **selseq1, struct Sequence **selseq2, struct Sequence **selseq3, const char **error_str);
 
@@ -139,6 +138,7 @@ void SEQUENCER_OT_select_grouped(struct wmOperatorType *ot);
 void SEQUENCER_OT_scene_strip_add(struct wmOperatorType *ot);
 void SEQUENCER_OT_movie_strip_add(struct wmOperatorType *ot);
 void SEQUENCER_OT_movieclip_strip_add(struct wmOperatorType *ot);
+void SEQUENCER_OT_mask_strip_add(struct wmOperatorType *ot);
 void SEQUENCER_OT_sound_strip_add(struct wmOperatorType *ot);
 void SEQUENCER_OT_image_strip_add(struct wmOperatorType *ot);
 void SEQUENCER_OT_effect_strip_add(struct wmOperatorType *ot);
@@ -174,7 +174,7 @@ struct ImBuf *make_zebra_view_from_ibuf(struct ImBuf * ibuf, float perc);
 struct ImBuf *make_histogram_view_from_ibuf(struct ImBuf * ibuf);
 
 /* sequencer_buttons.c */
-
+void sequencer_buttons_register(struct ARegionType *art);
 void SEQUENCER_OT_properties(struct wmOperatorType *ot);
 
 #endif /* __SEQUENCER_INTERN_H__ */
diff --git a/source/blender/editors/space_sequencer/sequencer_ops.c b/source/blender/editors/space_sequencer/sequencer_ops.c
index 3a02c90f99a..79ecd9f7481 100644
--- a/source/blender/editors/space_sequencer/sequencer_ops.c
+++ b/source/blender/editors/space_sequencer/sequencer_ops.c
@@ -105,6 +105,7 @@ void sequencer_operatortypes(void)
 	/* sequencer_add.c */
 	WM_operatortype_append(SEQUENCER_OT_scene_strip_add);
 	WM_operatortype_append(SEQUENCER_OT_movieclip_strip_add);
+	WM_operatortype_append(SEQUENCER_OT_mask_strip_add);
 	WM_operatortype_append(SEQUENCER_OT_movie_strip_add);
 	WM_operatortype_append(SEQUENCER_OT_sound_strip_add);
 	WM_operatortype_append(SEQUENCER_OT_image_strip_add);
diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c
index 811a89b07a8..b03edfc61b9 100644
--- a/source/blender/editors/space_sequencer/sequencer_select.c
+++ b/source/blender/editors/space_sequencer/sequencer_select.c
@@ -58,6 +58,7 @@
 
 #include "ED_types.h"
 #include "ED_screen.h"
+#include "ED_sequencer.h"
 
 #include "UI_view2d.h"
 
@@ -161,20 +162,20 @@ void select_surround_from_last(Scene *scene)
 }
 #endif
 
-
-static void UNUSED_FUNCTION(select_single_seq) (Scene * scene, Sequence * seq, int deselect_all) /* BRING BACK */
+void ED_sequencer_select_sequence_single(Scene * scene, Sequence * seq, int deselect_all)
 {
 	Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
 	
 	if (deselect_all)
-		deselect_all_seq(scene);
+		ED_sequencer_deselect_all(scene);
+
 	BKE_sequencer_active_set(scene, seq);
 
-	if ((seq->type == SEQ_IMAGE) || (seq->type == SEQ_MOVIE)) {
+	if ((seq->type == SEQ_TYPE_IMAGE) || (seq->type == SEQ_TYPE_MOVIE)) {
 		if (seq->strip)
 			BLI_strncpy(ed->act_imagedir, seq->strip->dir, FILE_MAXDIR);
 	}
-	else if (seq->type == SEQ_SOUND) {
+	else if (seq->type == SEQ_TYPE_SOUND_RAM) {
 		if (seq->strip)
 			BLI_strncpy(ed->act_sounddir, seq->strip->dir, FILE_MAXDIR);
 	}
@@ -359,7 +360,7 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	else if (left_right) {
 		/* use different logic for this */
 		float x;
-		deselect_all_seq(scene);
+		ED_sequencer_deselect_all(scene);
 		UI_view2d_region_to_view(v2d, event->mval[0], event->mval[1], &x, NULL);
 
 		SEQP_BEGIN (ed, seq)
@@ -403,18 +404,18 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
 		act_orig = ed->act_seq;
 
 		if (extend == 0 && linked_handle == 0)
-			deselect_all_seq(scene);
+			ED_sequencer_deselect_all(scene);
 	
 		if (seq) {
 			BKE_sequencer_active_set(scene, seq);
 	
-			if ((seq->type == SEQ_IMAGE) || (seq->type == SEQ_MOVIE)) {
+			if ((seq->type == SEQ_TYPE_IMAGE) || (seq->type == SEQ_TYPE_MOVIE)) {
 				if (seq->strip) {
 					BLI_strncpy(ed->act_imagedir, seq->strip->dir, FILE_MAXDIR);
 				}
 			}
 			else
-			if (seq->type == SEQ_SOUND) {
+			if (seq->type == SEQ_TYPE_SOUND_RAM) {
 				if (seq->strip) {
 					BLI_strncpy(ed->act_sounddir, seq->strip->dir, FILE_MAXDIR);
 				}
@@ -442,7 +443,7 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
 			
 			/* On Alt selection, select the strip and bordering handles */
 			if (linked_handle && !ELEM(hand, SEQ_SIDE_LEFT, SEQ_SIDE_RIGHT)) {
-				if (extend == 0) deselect_all_seq(scene);
+				if (extend == 0) ED_sequencer_deselect_all(scene);
 				seq->flag |= SELECT;
 				select_surrounding_handles(scene, seq);
 			}
@@ -458,13 +459,13 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
 					switch (sel_side) {
 						case SEQ_SIDE_LEFT:
 							if ((seq->flag & SEQ_LEFTSEL) && (neighbor->flag & SEQ_RIGHTSEL)) {
-								if (extend == 0) deselect_all_seq(scene);
+								if (extend == 0) ED_sequencer_deselect_all(scene);
 								seq->flag |= SELECT;
 
 								select_active_side(ed->seqbasep, SEQ_SIDE_LEFT, seq->machine, seq->startdisp);
 							}
 							else {
-								if (extend == 0) deselect_all_seq(scene);
+								if (extend == 0) ED_sequencer_deselect_all(scene);
 								seq->flag |= SELECT;
 
 								neighbor->flag |= SELECT;
@@ -475,13 +476,13 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
 							break;
 						case SEQ_SIDE_RIGHT:
 							if ((seq->flag & SEQ_RIGHTSEL) && (neighbor->flag & SEQ_LEFTSEL)) {
-								if (extend == 0) deselect_all_seq(scene);
+								if (extend == 0) ED_sequencer_deselect_all(scene);
 								seq->flag |= SELECT;
 
 								select_active_side(ed->seqbasep, SEQ_SIDE_RIGHT, seq->machine, seq->startdisp);
 							}
 							else {
-								if (extend == 0) deselect_all_seq(scene);
+								if (extend == 0) ED_sequencer_deselect_all(scene);
 								seq->flag |= SELECT;
 
 								neighbor->flag |= SELECT;
@@ -493,7 +494,7 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
 					}
 				}
 				else {
-					if (extend == 0) deselect_all_seq(scene);
+					if (extend == 0) ED_sequencer_deselect_all(scene);
 					select_active_side(ed->seqbasep, sel_side, seq->machine, seq->startdisp);
 				}
 			}
@@ -686,7 +687,7 @@ static int sequencer_select_linked_pick_invoke(bContext *C, wmOperator *op, wmEv
 		return OPERATOR_FINISHED;  /* user error as with mesh?? */
 	
 	if (extend == 0)
-		deselect_all_seq(scene);
+		ED_sequencer_deselect_all(scene);
 	
 	mouse_seq->flag |= SELECT;
 	recurs_sel_seq(mouse_seq);
@@ -929,11 +930,11 @@ static EnumPropertyItem sequencer_prop_select_grouped_types[] = {
 	{0, NULL, 0, NULL, NULL}
 };
 
-#define SEQ_IS_SOUND(_seq) ((_seq->type & SEQ_SOUND) && !(_seq->type & SEQ_EFFECT))
+#define SEQ_IS_SOUND(_seq) ((_seq->type & SEQ_TYPE_SOUND_RAM) && !(_seq->type & SEQ_TYPE_EFFECT))
 
-#define SEQ_IS_EFFECT(_seq) (_seq->type & SEQ_EFFECT)
+#define SEQ_IS_EFFECT(_seq) (_seq->type & SEQ_TYPE_EFFECT)
 
-#define SEQ_USE_DATA(_seq) (ELEM(_seq->type, SEQ_SCENE, SEQ_MOVIECLIP) || SEQ_HAS_PATH(_seq))
+#define SEQ_USE_DATA(_seq) (ELEM3(_seq->type, SEQ_TYPE_SCENE, SEQ_TYPE_MOVIECLIP, SEQ_TYPE_MASK) || SEQ_HAS_PATH(_seq))
 
 static short select_grouped_type(Editing *ed, Sequence *actseq)
 {
@@ -1007,22 +1008,33 @@ static short select_grouped_data(Editing *ed, Sequence *actseq)
 		}
 		SEQ_END;
 	}
-	else if (actseq->type == SEQ_SCENE) {
+	else if (actseq->type == SEQ_TYPE_SCENE) {
 		Scene *sce = actseq->scene;
 		SEQP_BEGIN (ed, seq)
 		{
-			if (seq->type == SEQ_SCENE && seq->scene == sce) {
+			if (seq->type == SEQ_TYPE_SCENE && seq->scene == sce) {
 				seq->flag |= SELECT;
 				changed = TRUE;
 			}
 		}
 		SEQ_END;
 	}
-	else if (actseq->type == SEQ_MOVIECLIP) {
+	else if (actseq->type == SEQ_TYPE_MOVIECLIP) {
 		MovieClip *clip = actseq->clip;
 		SEQP_BEGIN (ed, seq)
 		{
-			if (seq->type == SEQ_MOVIECLIP && seq->clip == clip) {
+			if (seq->type == SEQ_TYPE_MOVIECLIP && seq->clip == clip) {
+				seq->flag |= SELECT;
+				changed = TRUE;
+			}
+		}
+		SEQ_END;
+	}
+	else if (actseq->type == SEQ_TYPE_MASK) {
+		struct Mask *mask = actseq->mask;
+		SEQP_BEGIN (ed, seq)
+		{
+			if (seq->type == SEQ_TYPE_MASK && seq->mask == mask) {
 				seq->flag |= SELECT;
 				changed = TRUE;
 			}
@@ -1037,10 +1049,10 @@ static short select_grouped_effect(Editing *ed, Sequence *actseq)
 {
 	Sequence *seq;
 	short changed = FALSE;
-	short effects[SEQ_EFFECT_MAX + 1];
+	short effects[SEQ_TYPE_EFFECT_MAX + 1];
 	int i;
 
-	for (i = 0; i <= SEQ_EFFECT_MAX; i++)
+	for (i = 0; i <= SEQ_TYPE_EFFECT_MAX; i++)
 		effects[i] = FALSE;
 
 	SEQP_BEGIN (ed, seq)
@@ -1086,7 +1098,7 @@ static short select_grouped_effect_link(Editing *ed, Sequence *actseq)
 {
 	Sequence *seq = NULL;
 	short changed = FALSE;
-	short is_audio = ((actseq->type == SEQ_META) || SEQ_IS_SOUND(actseq));
+	short is_audio = ((actseq->type == SEQ_TYPE_META) || SEQ_IS_SOUND(actseq));
 	int startdisp = actseq->startdisp;
 	int enddisp   = actseq->enddisp;
 	int machine   = actseq->machine;
@@ -1108,7 +1120,7 @@ static short select_grouped_effect_link(Editing *ed, Sequence *actseq)
 		/* Ignore all seqs of incompatible types (audio vs video). */
 		if ((seq->flag & SELECT) || (seq->startdisp >= enddisp) || (seq->enddisp < startdisp) ||
 		    (!is_audio && SEQ_IS_SOUND(seq)) ||
-		    (is_audio && !((seq->type == SEQ_META) || SEQ_IS_SOUND(seq))))
+		    (is_audio && !((seq->type == SEQ_TYPE_META) || SEQ_IS_SOUND(seq))))
 		{
 			continue;
 		}
diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c
index 4168cb9ac77..b8bf764fabc 100644
--- a/source/blender/editors/space_sequencer/space_sequencer.c
+++ b/source/blender/editors/space_sequencer/space_sequencer.c
@@ -33,6 +33,7 @@
 #include <stdio.h>
 
 #include "DNA_scene_types.h"
+#include "DNA_mask_types.h"
 
 #include "MEM_guardedalloc.h"
 
@@ -324,27 +325,43 @@ static void sequencer_main_area_draw(const bContext *C, ARegion *ar)
 
 /* ************* dropboxes ************* */
 
-static int image_drop_poll(bContext *UNUSED(C), wmDrag *drag, wmEvent *UNUSED(event))
+static int image_drop_poll(bContext *C, wmDrag *drag, wmEvent *event)
 {
+	ARegion *ar = CTX_wm_region(C);
+	Scene *scene = CTX_data_scene(C);
+	int hand;
+
 	if (drag->type == WM_DRAG_PATH)
 		if (ELEM(drag->icon, ICON_FILE_IMAGE, ICON_FILE_BLANK)) /* rule might not work? */
-			return 1;
+			if (find_nearest_seq(scene, &ar->v2d, &hand, event->mval) == NULL)
+				return 1;
+
 	return 0;
 }
 
-static int movie_drop_poll(bContext *UNUSED(C), wmDrag *drag, wmEvent *UNUSED(event))
+static int movie_drop_poll(bContext *C, wmDrag *drag, wmEvent *event)
 {
+	ARegion *ar = CTX_wm_region(C);
+	Scene *scene = CTX_data_scene(C);
+	int hand;
+
 	if (drag->type == WM_DRAG_PATH)
 		if (ELEM3(drag->icon, 0, ICON_FILE_MOVIE, ICON_FILE_BLANK)) /* rule might not work? */
-			return 1;
+			if (find_nearest_seq(scene, &ar->v2d, &hand, event->mval) == NULL)
+				return 1;
 	return 0;
 }
 
-static int sound_drop_poll(bContext *UNUSED(C), wmDrag *drag, wmEvent *UNUSED(event))
+static int sound_drop_poll(bContext *C, wmDrag *drag, wmEvent *event)
 {
+	ARegion *ar = CTX_wm_region(C);
+	Scene *scene = CTX_data_scene(C);
+	int hand;
+
 	if (drag->type == WM_DRAG_PATH)
 		if (ELEM(drag->icon, ICON_FILE_SOUND, ICON_FILE_BLANK)) /* rule might not work? */
-			return 1;
+			if (find_nearest_seq(scene, &ar->v2d, &hand, event->mval) == NULL)
+				return 1;
 	return 0;
 }
 
@@ -380,6 +397,29 @@ static void sequencer_dropboxes(void)
 
 /* ************* end drop *********** */
 
+const char *sequencer_context_dir[] = {"edit_mask", NULL};
+
+static int sequencer_context(const bContext *C, const char *member, bContextDataResult *result)
+{
+	Scene *scene = CTX_data_scene(C);
+
+	if (CTX_data_dir(member)) {
+		CTX_data_dir_set(result, sequencer_context_dir);
+
+		return TRUE;
+	}
+	else if (CTX_data_equals(member, "edit_mask")) {
+		Sequence *seq_act = BKE_sequencer_active_get(scene);
+		if (seq_act && seq_act->type == SEQ_TYPE_MASK && seq_act->mask) {
+			CTX_data_id_pointer_set(result, &seq_act->mask->id);
+		}
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+
 /* add handlers, stuff you only do once or on area/region changes */
 static void sequencer_header_area_init(wmWindowManager *UNUSED(wm), ARegion *ar)
 {
@@ -461,6 +501,11 @@ static void sequencer_preview_area_listener(ARegion *ar, wmNotifier *wmn)
 {
 	/* context changes */
 	switch (wmn->category) {
+		case NC_SCREEN:
+			if (wmn->data == ND_GPENCIL) {
+				ED_region_tag_redraw(ar);
+			}
+			break;
 		case NC_SCENE:
 			switch (wmn->data) {
 				case ND_FRAME:
@@ -482,6 +527,12 @@ static void sequencer_preview_area_listener(ARegion *ar, wmNotifier *wmn)
 					break;
 			}
 			break;
+
+		case NC_MASK:
+			if (wmn->action == NA_EDITED) {
+				ED_region_tag_redraw(ar);
+			}
+			break;
 	}
 }
 
@@ -504,6 +555,11 @@ static void sequencer_buttons_area_listener(ARegion *ar, wmNotifier *wmn)
 {
 	/* context changes */
 	switch (wmn->category) {
+		case NC_SCREEN:
+			if (wmn->data == ND_GPENCIL) {
+				ED_region_tag_redraw(ar);
+			}
+			break;
 		case NC_SCENE:
 			switch (wmn->data) {
 				case ND_FRAME:
@@ -539,6 +595,7 @@ void ED_spacetype_sequencer(void)
 	st->duplicate = sequencer_duplicate;
 	st->operatortypes = sequencer_operatortypes;
 	st->keymap = sequencer_keymap;
+	st->context = sequencer_context;
 	st->dropboxes = sequencer_dropboxes;
 	st->refresh = sequencer_refresh;
 
@@ -559,7 +616,7 @@ void ED_spacetype_sequencer(void)
 	art->init = sequencer_preview_area_init;
 	art->draw = sequencer_preview_area_draw;
 	art->listener = sequencer_preview_area_listener;
-	art->keymapflag = ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES | ED_KEYMAP_ANIMATION;
+	art->keymapflag = ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES | ED_KEYMAP_GPENCIL;
 	BLI_addhead(&st->regiontypes, art);
 	
 	/* regions: listview/buttons */
@@ -571,6 +628,8 @@ void ED_spacetype_sequencer(void)
 	art->init = sequencer_buttons_area_init;
 	art->draw = sequencer_buttons_area_draw;
 	BLI_addhead(&st->regiontypes, art);
+	
+	sequencer_buttons_register(art);
 
 	/* regions: header */
 	art = MEM_callocN(sizeof(ARegionType), "spacetype sequencer region");
@@ -591,4 +650,3 @@ void ED_spacetype_sequencer(void)
 		sequencer_view3d_cb = ED_view3d_draw_offscreen_imbuf_simple;
 	}
 }
-
diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c
index 0de7e2569c0..e51f7a312eb 100644
--- a/source/blender/editors/space_view3d/drawarmature.c
+++ b/source/blender/editors/space_view3d/drawarmature.c
@@ -557,7 +557,7 @@ static void draw_bone_solid_octahedral(void)
 /* *************** Armature drawing, bones ******************* */
 
 
-static void draw_bone_points(int dt, int armflag, unsigned int boneflag, int id)
+static void draw_bone_points(const short dt, int armflag, unsigned int boneflag, int id)
 {
 	/*	Draw root point if we are not connected */
 	if ((boneflag & BONE_CONNECTED) == 0) {
@@ -862,7 +862,7 @@ static void draw_sphere_bone_wire(float smat[][4], float imat[][4],
 }
 
 /* does wire only for outline selecting */
-static void draw_sphere_bone(int dt, int armflag, int boneflag, short constflag, unsigned int id,
+static void draw_sphere_bone(const short dt, int armflag, int boneflag, short constflag, unsigned int id,
                              bPoseChannel *pchan, EditBone *ebone)
 {
 	GLUquadricObj *qobj;
@@ -1100,7 +1100,7 @@ static void draw_line_bone(int armflag, int boneflag, short constflag, unsigned
 	glPopMatrix();
 }
 
-static void draw_b_bone_boxes(int dt, bPoseChannel *pchan, float xwidth, float length, float zwidth)
+static void draw_b_bone_boxes(const short dt, bPoseChannel *pchan, float xwidth, float length, float zwidth)
 {
 	int segments = 0;
 	
@@ -1128,7 +1128,7 @@ static void draw_b_bone_boxes(int dt, bPoseChannel *pchan, float xwidth, float l
 	}
 }
 
-static void draw_b_bone(int dt, int armflag, int boneflag, short constflag, unsigned int id,
+static void draw_b_bone(const short dt, int armflag, int boneflag, short constflag, unsigned int id,
                         bPoseChannel *pchan, EditBone *ebone)
 {
 	float xwidth, length, zwidth;
@@ -1242,7 +1242,7 @@ static void draw_wire_bone_segments(bPoseChannel *pchan, Mat4 *bbones, float len
 	}
 }
 
-static void draw_wire_bone(int dt, int armflag, int boneflag, short constflag, unsigned int id,
+static void draw_wire_bone(const short dt, int armflag, int boneflag, short constflag, unsigned int id,
                            bPoseChannel *pchan, EditBone *ebone)
 {
 	Mat4 *bbones = NULL;
@@ -1293,7 +1293,7 @@ static void draw_wire_bone(int dt, int armflag, int boneflag, short constflag, u
 	draw_wire_bone_segments(pchan, bbones, length, segments);
 }
 
-static void draw_bone(int dt, int armflag, int boneflag, short constflag, unsigned int id, float length)
+static void draw_bone(const short dt, int armflag, int boneflag, short constflag, unsigned int id, float length)
 {
 	
 	/* Draw a 3d octahedral bone, we use normalized space based on length,
@@ -1364,7 +1364,7 @@ static void draw_bone(int dt, int armflag, int boneflag, short constflag, unsign
 }
 
 static void draw_custom_bone(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob,
-                             int dt, int armflag, int boneflag, unsigned int id, float length)
+                             const short dt, int armflag, int boneflag, unsigned int id, float length)
 {
 	if (ob == NULL) return;
 	
@@ -1656,8 +1656,9 @@ static void bone_matrix_translate_y(float mat[][4], float y)
 }
 
 /* assumes object is Armature with pose */
-static void draw_pose_bones(Scene *scene, View3D *v3d, ARegion *ar, Base *base, int dt,
-                            const short is_ghost, const short is_outline)
+static void draw_pose_bones(Scene *scene, View3D *v3d, ARegion *ar, Base *base,
+                            const short dt, const unsigned char ob_wire_col[4],
+                            const short do_const_color, const short is_outline)
 {
 	RegionView3D *rv3d = ar->regiondata;
 	Object *ob = base->object;
@@ -1752,8 +1753,13 @@ static void draw_pose_bones(Scene *scene, View3D *v3d, ARegion *ar, Base *base,
 					if (bone == arm->act_bone)
 						flag |= BONE_DRAW_ACTIVE;
 					
-					/* set color-set to use */
-					set_pchan_colorset(ob, pchan);
+					if (do_const_color) {
+						/* keep color */
+					}
+					else {
+						/* set color-set to use */
+						set_pchan_colorset(ob, pchan);
+					}
 					
 					if (use_custom) {
 						/* if drawwire, don't try to draw in solid */
@@ -1827,20 +1833,13 @@ static void draw_pose_bones(Scene *scene, View3D *v3d, ARegion *ar, Base *base,
 							}
 							
 							/* prepare colors */
-							if (is_ghost) {
+							if (do_const_color) {
 								/* 13 October 2009, Disabled this to make ghosting show the right colors (Aligorith) */
 							}
-							else if (arm->flag & ARM_POSEMODE)	
+							else if (arm->flag & ARM_POSEMODE)
 								set_pchan_colorset(ob, pchan);
 							else {
-								if ((scene->basact) == base) {
-									if (base->flag & (SELECT + BA_WAS_SEL)) UI_ThemeColor(TH_ACTIVE);
-									else UI_ThemeColor(TH_WIRE);
-								}
-								else {
-									if (base->flag & (SELECT + BA_WAS_SEL)) UI_ThemeColor(TH_SELECT);
-									else UI_ThemeColor(TH_WIRE);
-								}
+								glColor3ubv(ob_wire_col);
 							}
 								
 							/* catch exception for bone with hidden parent */
@@ -1956,7 +1955,12 @@ static void draw_pose_bones(Scene *scene, View3D *v3d, ARegion *ar, Base *base,
 					/* extra draw service for pose mode */
 
 					/* set color-set to use */
-					set_pchan_colorset(ob, pchan);
+					if (do_const_color) {
+						/* keep color */
+					}
+					else {
+						set_pchan_colorset(ob, pchan);
+					}
 					
 					if ((pchan->custom) && !(arm->flag & ARM_NO_CUSTOM)) {
 						/* custom bone shapes should not be drawn here! */
@@ -1991,20 +1995,35 @@ static void draw_pose_bones(Scene *scene, View3D *v3d, ARegion *ar, Base *base,
 	glDisable(GL_CULL_FACE);
 	
 	/* draw DoFs */
-	if (arm->flag & ARM_POSEMODE)
-		draw_pose_dofs(ob);
+	if (arm->flag & ARM_POSEMODE) {
+		if (((base->flag & OB_FROMDUPLI) == 0)) {
+			draw_pose_dofs(ob);
+		}
+	}
 
 	/* finally names and axes */
-	if ((arm->flag & (ARM_DRAWNAMES | ARM_DRAWAXES)) && (is_outline == 0)) {
+	if ((arm->flag & (ARM_DRAWNAMES | ARM_DRAWAXES)) &&
+	    (is_outline == 0) &&
+	    ((base->flag & OB_FROMDUPLI) == 0))
+	{
 		/* patch for several 3d cards (IBM mostly) that crash on GL_SELECT with text drawing */
 		if ((G.f & G_PICKSEL) == 0) {
 			float vec[3];
-			
+
 			unsigned char col[4];
-			float col_f[4];
-			glGetFloatv(GL_CURRENT_COLOR, col_f); /* in case this is not set below */
-			rgb_float_to_uchar(col, col_f);
-			col[3] = 255;
+			if (do_const_color) {
+				/* so we can draw bone names in current const color */
+				float tcol[4];
+				glGetFloatv(GL_CURRENT_COLOR, tcol);
+				rgb_float_to_uchar(col, tcol);
+				col[3] = 255;
+			}
+			else {
+				col[0] = ob_wire_col[0];
+				col[1] = ob_wire_col[1];
+				col[2] = ob_wire_col[2];
+				col[3] = 255;
+			}
 			
 			if (v3d->zbuf) glDisable(GL_DEPTH_TEST);
 			
@@ -2063,7 +2082,7 @@ static void get_matrix_editbone(EditBone *eBone, float bmat[][4])
 	add_v3_v3(bmat[3], eBone->head);
 }
 
-static void draw_ebones(View3D *v3d, ARegion *ar, Object *ob, int dt)
+static void draw_ebones(View3D *v3d, ARegion *ar, Object *ob, const short dt)
 {
 	RegionView3D *rv3d = ar->regiondata;
 	EditBone *eBone;
@@ -2353,7 +2372,7 @@ static void draw_ghost_poses_range(Scene *scene, View3D *v3d, ARegion *ar, Base
 		
 		BKE_animsys_evaluate_animdata(scene, &ob->id, adt, (float)CFRA, ADT_RECALC_ALL);
 		BKE_pose_where_is(scene, ob);
-		draw_pose_bones(scene, v3d, ar, base, OB_WIRE, TRUE, FALSE);
+		draw_pose_bones(scene, v3d, ar, base, OB_WIRE, NULL, TRUE, FALSE);
 	}
 	glDisable(GL_BLEND);
 	if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
@@ -2432,7 +2451,7 @@ static void draw_ghost_poses_keys(Scene *scene, View3D *v3d, ARegion *ar, Base *
 		
 		BKE_animsys_evaluate_animdata(scene, &ob->id, adt, (float)CFRA, ADT_RECALC_ALL);
 		BKE_pose_where_is(scene, ob);
-		draw_pose_bones(scene, v3d, ar, base, OB_WIRE, TRUE, FALSE);
+		draw_pose_bones(scene, v3d, ar, base, OB_WIRE, NULL, TRUE, FALSE);
 	}
 	glDisable(GL_BLEND);
 	if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
@@ -2502,7 +2521,7 @@ static void draw_ghost_poses(Scene *scene, View3D *v3d, ARegion *ar, Base *base)
 			if (CFRA != cfrao) {
 				BKE_animsys_evaluate_animdata(scene, &ob->id, adt, (float)CFRA, ADT_RECALC_ALL);
 				BKE_pose_where_is(scene, ob);
-				draw_pose_bones(scene, v3d, ar, base, OB_WIRE, TRUE, FALSE);
+				draw_pose_bones(scene, v3d, ar, base, OB_WIRE, NULL, TRUE, FALSE);
 			}
 		}
 		
@@ -2517,7 +2536,7 @@ static void draw_ghost_poses(Scene *scene, View3D *v3d, ARegion *ar, Base *base)
 			if (CFRA != cfrao) {
 				BKE_animsys_evaluate_animdata(scene, &ob->id, adt, (float)CFRA, ADT_RECALC_ALL);
 				BKE_pose_where_is(scene, ob);
-				draw_pose_bones(scene, v3d, ar, base, OB_WIRE, TRUE, FALSE);
+				draw_pose_bones(scene, v3d, ar, base, OB_WIRE, NULL, TRUE, FALSE);
 			}
 		}
 	}
@@ -2537,8 +2556,11 @@ static void draw_ghost_poses(Scene *scene, View3D *v3d, ARegion *ar, Base *base)
 
 /* ********************************** Armature Drawing - Main ************************* */
 
-/* called from drawobject.c, return 1 if nothing was drawn */
-int draw_armature(Scene *scene, View3D *v3d, ARegion *ar, Base *base, int dt, int flag, const short is_outline)
+/* called from drawobject.c, return 1 if nothing was drawn
+ * (ob_wire_col == NULL) when drawing ghost */
+int draw_armature(Scene *scene, View3D *v3d, ARegion *ar, Base *base,
+                  const short dt, const short dflag, const unsigned char ob_wire_col[4],
+                  const short is_outline)
 {
 	Object *ob = base->object;
 	bArmature *arm = ob->data;
@@ -2549,11 +2571,8 @@ int draw_armature(Scene *scene, View3D *v3d, ARegion *ar, Base *base, int dt, in
 	
 	if (dt > OB_WIRE && !ELEM(arm->drawtype, ARM_LINE, ARM_WIRE)) {
 		/* we use color for solid lighting */
-		glColorMaterial(GL_FRONT_AND_BACK, GL_SPECULAR);
-		glEnable(GL_COLOR_MATERIAL);
-		glColor3ub(255, 255, 255);    // clear spec
-		glDisable(GL_COLOR_MATERIAL);
-		
+		const float white[4] = {1.0f, 1.0f, 1.0f, 1.0f};
+		glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, white);
 		glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
 		glFrontFace((ob->transflag & OB_NEG_SCALE) ? GL_CW : GL_CCW); // only for lighting...
 	}
@@ -2594,7 +2613,7 @@ int draw_armature(Scene *scene, View3D *v3d, ARegion *ar, Base *base, int dt, in
 						if (arm->ghostep)
 							draw_ghost_poses(scene, v3d, ar, base);
 					}
-					if ((flag & DRAW_SCENESET) == 0) {
+					if ((dflag & DRAW_SCENESET) == 0) {
 						if (ob == OBACT)
 							arm->flag |= ARM_POSEMODE;
 						else if (OBACT && (OBACT->mode & OB_MODE_WEIGHT_PAINT)) {
@@ -2605,7 +2624,7 @@ int draw_armature(Scene *scene, View3D *v3d, ARegion *ar, Base *base, int dt, in
 					}
 				}	
 			}
-			draw_pose_bones(scene, v3d, ar, base, dt, FALSE, is_outline);
+			draw_pose_bones(scene, v3d, ar, base, dt, ob_wire_col, (dflag & DRAW_CONSTCOLOR), is_outline);
 			arm->flag &= ~ARM_POSEMODE; 
 			
 			if (ob->mode & OB_MODE_POSE)
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c
index de1d9f22667..19696b2b0e0 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -1015,14 +1015,14 @@ void draw_mesh_paint(View3D *v3d, RegionView3D *rv3d, Object *ob, DerivedMesh *d
 	if (ob && ob->mode & OB_MODE_WEIGHT_PAINT) {
 
 		if (do_light) {
+			const float spec[4] = {0.47f, 0.47f, 0.47f, 0.47f};
+
 			/* enforce default material settings */
 			GPU_enable_material(0, NULL);
 		
 			/* but set default spec */
 			glColorMaterial(GL_FRONT_AND_BACK, GL_SPECULAR);
-			glEnable(GL_COLOR_MATERIAL);    /* according manpages needed */
-			glColor3ub(120, 120, 120);
-			glDisable(GL_COLOR_MATERIAL);
+			glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, spec);
 
 			/* diffuse */
 			glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index aec7913e80d..b92d3d9d24c 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -333,7 +333,7 @@ static void view3d_project_short_clip_persmat(ARegion *ar, const float vec[3], s
 
 /* check for glsl drawing */
 
-int draw_glsl_material(Scene *scene, Object *ob, View3D *v3d, int dt)
+int draw_glsl_material(Scene *scene, Object *ob, View3D *v3d, const short dt)
 {
 	if (!GPU_glsl_support())
 		return 0;
@@ -1189,14 +1189,17 @@ static void draw_transp_spot_volume(Lamp *la, float x, float z)
 	glCullFace(GL_BACK);
 }
 
-static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base, int dt, int flag)
+static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
+                     const short dt, const short dflag, const unsigned char ob_wire_col[4])
 {
 	Object *ob = base->object;
 	const float pixsize = ED_view3d_pixel_size(rv3d, ob->obmat[3]);
 	Lamp *la = ob->data;
 	float vec[3], lvec[3], vvec[3], circrad, x, y, z;
 	float lampsize;
-	float imat[4][4], curcol[4];
+	float imat[4][4];
+
+	unsigned char curcol[4];
 	unsigned char col[4];
 	/* cone can't be drawn for duplicated lamps, because duplilist would be freed to */
 	/* the moment of view3d_draw_transp() call */
@@ -1210,7 +1213,7 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 
 	if (drawcone && !v3d->transp) {
 		/* in this case we need to draw delayed */
-		add_view3d_after(&v3d->afterdraw_transp, base, flag);
+		ED_view3d_after_add(&v3d->afterdraw_transp, base, dflag);
 		return;
 	}
 	
@@ -1228,17 +1231,23 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 
 	/* lamp center */
 	copy_v3_v3(vec, ob->obmat[3]);
-	
-	/* for AA effects */
-	glGetFloatv(GL_CURRENT_COLOR, curcol);
-	curcol[3] = 0.6;
-	glColor4fv(curcol);
-	
+
+	if ((dflag & DRAW_CONSTCOLOR) == 0) {
+		/* for AA effects */
+		curcol[0] = ob_wire_col[0];
+		curcol[1] = ob_wire_col[1];
+		curcol[2] = ob_wire_col[2];
+		curcol[3] = 154;
+		glColor4ubv(curcol);
+	}
+
 	if (lampsize > 0.0f) {
 
-		if (ob->id.us > 1) {
-			if (ob == OBACT || (ob->flag & SELECT)) glColor4ub(0x88, 0xFF, 0xFF, 155);
-			else glColor4ub(0x77, 0xCC, 0xCC, 155);
+		if ((dflag & DRAW_CONSTCOLOR) == 0) {
+			if (ob->id.us > 1) {
+				if (ob == OBACT || (ob->flag & SELECT)) glColor4ub(0x88, 0xFF, 0xFF, 155);
+				else glColor4ub(0x77, 0xCC, 0xCC, 155);
+			}
 		}
 		
 		/* Inner Circle */
@@ -1248,8 +1257,10 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 		drawcircball(GL_POLYGON, vec, lampsize, imat);
 		
 		/* restore */
-		if (ob->id.us > 1)
-			glColor4fv(curcol);
+		if ((dflag & DRAW_CONSTCOLOR) == 0) {
+			if (ob->id.us > 1)
+				glColor4ubv(curcol);
+		}
 
 		/* Outer circle */
 		circrad = 3.0f * lampsize;
@@ -1481,9 +1492,10 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 	
 	glDisable(GL_BLEND);
 	
-	/* restore for drawing extra stuff */
-	glColor3fv(curcol);
-
+	if ((dflag & DRAW_CONSTCOLOR) == 0) {
+		/* restore for drawing extra stuff */
+		glColor3ubv(ob_wire_col);
+	}
 }
 
 static void draw_limit_line(float sta, float end, unsigned int col)
@@ -1516,7 +1528,7 @@ static void draw_focus_cross(float dist, float size)
 }
 
 #ifdef VIEW3D_CAMERA_BORDER_HACK
-float view3d_camera_border_hack_col[4];
+unsigned char view3d_camera_border_hack_col[3];
 short view3d_camera_border_hack_test = FALSE;
 #endif
 
@@ -1546,20 +1558,20 @@ static void draw_bundle_sphere(void)
 }
 
 static void draw_viewport_object_reconstruction(Scene *scene, Base *base, View3D *v3d,
-                                                MovieClip *clip, MovieTrackingObject *tracking_object, int flag,
-                                                int *global_track_index, int draw_selected)
+                                                MovieClip *clip, MovieTrackingObject *tracking_object,
+                                                const short dflag, int *global_track_index, int draw_selected)
 {
 	MovieTracking *tracking = &clip->tracking;
 	MovieTrackingTrack *track;
 	float mat[4][4], imat[4][4];
 	unsigned char col[4], scol[4];
 	int tracknr = *global_track_index;
-	ListBase *tracksbase = BKE_tracking_object_tracks(tracking, tracking_object);
+	ListBase *tracksbase = BKE_tracking_object_get_tracks(tracking, tracking_object);
 
 	UI_GetThemeColor4ubv(TH_TEXT, col);
 	UI_GetThemeColor4ubv(TH_SELECT, scol);
 
-	BKE_get_tracking_mat(scene, base->object, mat);
+	BKE_tracking_get_camera_object_matrix(scene, base->object, mat);
 
 	glPushMatrix();
 
@@ -1575,7 +1587,7 @@ static void draw_viewport_object_reconstruction(Scene *scene, Base *base, View3D
 	else {
 		float obmat[4][4];
 
-		BKE_tracking_get_interpolated_camera(tracking, tracking_object, scene->r.cfra, obmat);
+		BKE_tracking_camera_get_reconstructed_interpolate(tracking, tracking_object, scene->r.cfra, obmat);
 
 		invert_m4_m4(imat, obmat);
 		glMultMatrixf(imat);
@@ -1590,7 +1602,7 @@ static void draw_viewport_object_reconstruction(Scene *scene, Base *base, View3D
 		if ((track->flag & TRACK_HAS_BUNDLE) == 0)
 			continue;
 
-		if (flag & DRAW_PICKING)
+		if (dflag & DRAW_PICKING)
 			glLoadName(base->selcol + (tracknr << 16));
 
 		glPushMatrix();
@@ -1656,7 +1668,7 @@ static void draw_viewport_object_reconstruction(Scene *scene, Base *base, View3D
 
 		glPopMatrix();
 
-		if ((flag & DRAW_PICKING) == 0 && (v3d->flag2 & V3D_SHOW_BUNDLENAME)) {
+		if ((dflag & DRAW_PICKING) == 0 && (v3d->flag2 & V3D_SHOW_BUNDLENAME)) {
 			float pos[3];
 			unsigned char tcol[4];
 
@@ -1670,10 +1682,10 @@ static void draw_viewport_object_reconstruction(Scene *scene, Base *base, View3D
 		tracknr++;
 	}
 
-	if ((flag & DRAW_PICKING) == 0) {
+	if ((dflag & DRAW_PICKING) == 0) {
 		if ((v3d->flag2 & V3D_SHOW_CAMERAPATH) && (tracking_object->flag & TRACKING_OBJECT_CAMERA)) {
 			MovieTrackingReconstruction *reconstruction;
-			reconstruction = BKE_tracking_object_reconstruction(tracking, tracking_object);
+			reconstruction = BKE_tracking_object_get_reconstruction(tracking, tracking_object);
 
 			if (reconstruction->camnr) {
 				MovieReconstructedCamera *camera = reconstruction->cameras;
@@ -1701,11 +1713,11 @@ static void draw_viewport_object_reconstruction(Scene *scene, Base *base, View3D
 }
 
 static void draw_viewport_reconstruction(Scene *scene, Base *base, View3D *v3d, MovieClip *clip,
-                                         int flag, int draw_selected)
+                                         const short dflag, const unsigned char ob_wire_col[4],
+                                         int draw_selected)
 {
 	MovieTracking *tracking = &clip->tracking;
 	MovieTrackingObject *tracking_object;
-	float curcol[4];
 	int global_track_index = 1;
 
 	if ((v3d->flag2 & V3D_SHOW_RECONSTRUCTION) == 0)
@@ -1714,8 +1726,6 @@ static void draw_viewport_reconstruction(Scene *scene, Base *base, View3D *v3d,
 	if (v3d->flag2 & V3D_RENDER_OVERRIDE)
 		return;
 
-	glGetFloatv(GL_CURRENT_COLOR, curcol);
-
 	glEnable(GL_LIGHTING);
 	glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
 	glEnable(GL_COLOR_MATERIAL);
@@ -1724,7 +1734,7 @@ static void draw_viewport_reconstruction(Scene *scene, Base *base, View3D *v3d,
 	tracking_object = tracking->objects.first;
 	while (tracking_object) {
 		draw_viewport_object_reconstruction(scene, base, v3d, clip, tracking_object,
-		                                    flag, &global_track_index, draw_selected);
+		                                    dflag, &global_track_index, draw_selected);
 
 		tracking_object = tracking_object->next;
 	}
@@ -1734,14 +1744,17 @@ static void draw_viewport_reconstruction(Scene *scene, Base *base, View3D *v3d,
 	glDisable(GL_COLOR_MATERIAL);
 	glDisable(GL_LIGHTING);
 
-	glColor4fv(curcol);
+	if ((dflag & DRAW_CONSTCOLOR) == 0) {
+		glColor3ubv(ob_wire_col);
+	}
 
-	if (flag & DRAW_PICKING)
+	if (dflag & DRAW_PICKING)
 		glLoadName(base->selcol);
 }
 
 /* flag similar to draw_object() */
-static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base, int flag)
+static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
+                       const short dflag, const unsigned char ob_wire_col[4])
 {
 	/* a standing up pyramid with (0,0,0) as top */
 	Camera *cam;
@@ -1755,13 +1768,22 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base
 
 	/* draw data for movie clip set as active for scene */
 	if (clip) {
-		draw_viewport_reconstruction(scene, base, v3d, clip, flag, FALSE);
-		draw_viewport_reconstruction(scene, base, v3d, clip, flag, TRUE);
+		draw_viewport_reconstruction(scene, base, v3d, clip, dflag, ob_wire_col, FALSE);
+		draw_viewport_reconstruction(scene, base, v3d, clip, dflag, ob_wire_col, TRUE);
 	}
 
 #ifdef VIEW3D_CAMERA_BORDER_HACK
 	if (is_view && !(G.f & G_PICKSEL)) {
-		glGetFloatv(GL_CURRENT_COLOR, view3d_camera_border_hack_col);
+		if ((dflag & DRAW_CONSTCOLOR) == 0) {
+			view3d_camera_border_hack_col[0] = ob_wire_col[0];
+			view3d_camera_border_hack_col[1] = ob_wire_col[1];
+			view3d_camera_border_hack_col[2] = ob_wire_col[2];
+		}
+		else {
+			float col[4];
+			glGetFloatv(GL_CURRENT_COLOR, col);
+			rgb_float_to_uchar(view3d_camera_border_hack_col, col);
+		}
 		view3d_camera_border_hack_test = TRUE;
 		return;
 	}
@@ -1829,7 +1851,7 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base
 		glEnd();
 	}
 
-	if (flag == 0) {
+	if (dflag == 0) {
 		if (cam->flag & (CAM_SHOWLIMITS + CAM_SHOWMIST)) {
 			float nobmat[4][4];
 			World *wrld;
@@ -2451,7 +2473,7 @@ static void draw_dm_verts__mapFunc(void *userData, int index, const float co[3],
 }
 
 static void draw_dm_verts(BMEditMesh *em, DerivedMesh *dm, int sel, BMVert *eve_act,
-						  RegionView3D *rv3d)
+                          RegionView3D *rv3d)
 {
 	drawDMVerts_userData data;
 	data.sel = sel;
@@ -2953,7 +2975,7 @@ static void draw_em_measure_stats(View3D *v3d, Object *ob, BMEditMesh *em, UnitS
 		else                                                                  \
 			BLI_snprintf(numstr, sizeof(numstr), conv_float, area);           \
 		view3d_cached_text_draw_add(vmid, numstr, 0, txt_flag, col);          \
-	}
+	} (void)0
 
 		UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEAREA, col);
 		
@@ -2974,16 +2996,16 @@ static void draw_em_measure_stats(View3D *v3d, Object *ob, BMEditMesh *em, UnitS
 			copy_v3_v3(v1, l[0]->v->co);
 			copy_v3_v3(v2, l[1]->v->co);
 			copy_v3_v3(v3, l[2]->v->co);
+			add_v3_v3(vmid, v1);
+			add_v3_v3(vmid, v2);
+			add_v3_v3(vmid, v3);
+			n += 3;
 			if (do_global) {
 				mul_mat3_m4_v3(ob->obmat, v1);
 				mul_mat3_m4_v3(ob->obmat, v2);
 				mul_mat3_m4_v3(ob->obmat, v3);
 			}
 			area += area_tri_v3(v1, v2, v3);
-			add_v3_v3(vmid, v1);
-			add_v3_v3(vmid, v2);
-			add_v3_v3(vmid, v3);
-			n += 3;
 		}
 
 		if (f) {
@@ -3030,16 +3052,15 @@ static void draw_em_measure_stats(View3D *v3d, Object *ob, BMEditMesh *em, UnitS
 							mul_mat3_m4_v3(ob->obmat, v3);
 
 							angle = angle_v3v3v3(v1, v2, v3);
-							interp_v3_v3v3(fvec, vmid, v2, 0.8f);
 							copy_v3_v3(v1, v2);
 							copy_v3_v3(v2, v3);
 						}
 						else {
 							angle = angle_v3v3v3(loop->prev->v->co, loop->v->co, loop->next->v->co);
-							interp_v3_v3v3(fvec, vmid, loop->v->co, 0.8f);
 						}
 
 						BLI_snprintf(numstr, sizeof(numstr), "%.3f", is_rad ? angle : RAD2DEGF(angle));
+						interp_v3_v3v3(fvec, vmid, loop->v->co, 0.8f);
 						view3d_cached_text_draw_add(fvec, numstr, 0, txt_flag, col);
 					}
 				}
@@ -3125,7 +3146,7 @@ static DMDrawOption draw_em_fancy__setGLSLFaceOpts(void *userData, int index)
 }
 
 static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d,
-                          Object *ob, BMEditMesh *em, DerivedMesh *cageDM, DerivedMesh *finalDM, int dt)
+                          Object *ob, BMEditMesh *em, DerivedMesh *cageDM, DerivedMesh *finalDM, const short dt)
 
 {
 	Mesh *me = ob->data;
@@ -3332,7 +3353,8 @@ static void draw_mesh_object_outline(View3D *v3d, Object *ob, DerivedMesh *dm)
 	}
 }
 
-static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D *rv3d, Base *base, int dt, int flag)
+static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D *rv3d, Base *base,
+                            const short dt, const short dflag)
 {
 	Object *ob = base->object;
 	Mesh *me = ob->data;
@@ -3418,10 +3440,12 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 	else if (dt == OB_SOLID) {
 		if (draw_flags & DRAW_MODIFIERS_PREVIEW) {
 			/* for object selection draws no shade */
-			if (flag & (DRAW_PICKING | DRAW_CONSTCOLOR)) {
+			if (dflag & (DRAW_PICKING | DRAW_CONSTCOLOR)) {
 				dm->drawFacesSolid(dm, NULL, 0, GPU_enable_material);
 			}
 			else {
+				const float spec[4] = {0.47f, 0.47f, 0.47f, 0.47f};
+
 				/* draw outline */
 				if ( (v3d->flag & V3D_SELECT_OUTLINE) &&
 				     ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) &&
@@ -3439,9 +3463,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 				
 				/* set default spec */
 				glColorMaterial(GL_FRONT_AND_BACK, GL_SPECULAR);
-				glEnable(GL_COLOR_MATERIAL);    /* according manpages needed */
-				glColor3ub(120, 120, 120);
-				glDisable(GL_COLOR_MATERIAL);
+				glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, spec);
 				/* diffuse */
 				glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
 				glEnable(GL_LIGHTING);
@@ -3520,7 +3542,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 				UI_ThemeColor(TH_GROUP_ACTIVE);
 			else if (ob->flag & OB_FROMGROUP)
 				UI_ThemeColorShade(TH_GROUP_ACTIVE, -16);
-			else if (flag != DRAW_CONSTCOLOR)
+			else if (dflag != DRAW_CONSTCOLOR)
 				UI_ThemeColor(is_obact ? TH_ACTIVE : TH_SELECT);
 			else
 				glColor3ub(80, 80, 80);
@@ -3529,7 +3551,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 			if (ob->flag & OB_FROMGROUP)
 				UI_ThemeColor(TH_GROUP);
 			else {
-				if (ob->dtx & OB_DRAWWIRE && flag == DRAW_CONSTCOLOR)
+				if (ob->dtx & OB_DRAWWIRE && dflag == DRAW_CONSTCOLOR)
 					glColor3ub(80, 80, 80);
 				else
 					UI_ThemeColor(TH_WIRE);
@@ -3586,7 +3608,8 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 }
 
 /* returns 1 if nothing was drawn, for detecting to draw an object center */
-static int draw_mesh_object(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D *rv3d, Base *base, int dt, int flag)
+static int draw_mesh_object(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D *rv3d, Base *base,
+                            const short dt, const short dflag)
 {
 	Object *ob = base->object;
 	Object *obedit = scene->obedit;
@@ -3650,7 +3673,7 @@ static int draw_mesh_object(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 				                           (check_alpha) ? &do_alpha_after : NULL);
 			}
 
-			draw_mesh_fancy(scene, ar, v3d, rv3d, base, dt, flag);
+			draw_mesh_fancy(scene, ar, v3d, rv3d, base, dt, dflag);
 
 			GPU_end_object_materials();
 			
@@ -3658,20 +3681,20 @@ static int draw_mesh_object(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 		}
 	}
 	
-	if ((flag & DRAW_PICKING) == 0 && (base->flag & OB_FROMDUPLI) == 0) {
+	if ((dflag & DRAW_PICKING) == 0 && (base->flag & OB_FROMDUPLI) == 0) {
 		/* GPU_begin_object_materials checked if this is needed */
 		if (do_alpha_after) {
 			if (ob->dtx & OB_DRAWXRAY) {
-				add_view3d_after(&v3d->afterdraw_xraytransp, base, flag);
+				ED_view3d_after_add(&v3d->afterdraw_xraytransp, base, dflag);
 			}
 			else {
-				add_view3d_after(&v3d->afterdraw_transp, base, flag);
+				ED_view3d_after_add(&v3d->afterdraw_transp, base, dflag);
 			}
 		}
 		else if (ob->dtx & OB_DRAWXRAY && ob->dtx & OB_DRAWTRANSP) {
 			/* special case xray+transp when alpha is 1.0, without this the object vanishes */
 			if (v3d->xray == 0 && v3d->transp == 0) {
-				add_view3d_after(&v3d->afterdraw_xray, base, flag);
+				ED_view3d_after_add(&v3d->afterdraw_xray, base, dflag);
 			}
 		}
 	}
@@ -3779,17 +3802,15 @@ static int drawDispListwire(ListBase *dlbase)
 	return 0;
 }
 
-static void drawDispListsolid(ListBase *lb, Object *ob, int glsl)
+static void drawDispListsolid(ListBase *lb, Object *ob,
+                              const unsigned char ob_wire_col[4], int use_glsl)
 {
 	DispList *dl;
 	GPUVertexAttribs gattribs;
-	float *data, curcol[4];
+	float *data;
 	float *ndata;
 	
 	if (lb == NULL) return;
-	
-	/* for drawing wire */
-	glGetFloatv(GL_CURRENT_COLOR, curcol);
 
 	glEnable(GL_LIGHTING);
 	glEnableClientState(GL_VERTEX_ARRAY);
@@ -3812,7 +3833,7 @@ static void drawDispListsolid(ListBase *lb, Object *ob, int glsl)
 					int nr;
 
 					glDisable(GL_LIGHTING);
-					glColor3fv(curcol);
+					glColor3ubv(ob_wire_col);
 
 					// glVertexPointer(3, GL_FLOAT, 0, dl->verts);
 					// glDrawArrays(GL_LINE_STRIP, 0, dl->nr);
@@ -3846,7 +3867,7 @@ static void drawDispListsolid(ListBase *lb, Object *ob, int glsl)
 			case DL_SURF:
 
 				if (dl->index) {
-					GPU_enable_material(dl->col + 1, (glsl) ? &gattribs : NULL);
+					GPU_enable_material(dl->col + 1, (use_glsl) ? &gattribs : NULL);
 
 					if (dl->rt & CU_SMOOTH) glShadeModel(GL_SMOOTH);
 					else glShadeModel(GL_FLAT);
@@ -3860,11 +3881,11 @@ static void drawDispListsolid(ListBase *lb, Object *ob, int glsl)
 				break;
 
 			case DL_INDEX3:
-				GPU_enable_material(dl->col + 1, (glsl) ? &gattribs : NULL);
+				GPU_enable_material(dl->col + 1, (use_glsl) ? &gattribs : NULL);
 
 				glVertexPointer(3, GL_FLOAT, 0, dl->verts);
 
-				/* voor polys only one normal needed */
+				/* for polys only one normal needed */
 				if (index3_nors_incr) {
 					glEnableClientState(GL_NORMAL_ARRAY);
 					glNormalPointer(GL_FLOAT, 0, dl->nors);
@@ -3880,7 +3901,7 @@ static void drawDispListsolid(ListBase *lb, Object *ob, int glsl)
 				break;
 
 			case DL_INDEX4:
-				GPU_enable_material(dl->col + 1, (glsl) ? &gattribs : NULL);
+				GPU_enable_material(dl->col + 1, (use_glsl) ? &gattribs : NULL);
 
 				glEnableClientState(GL_NORMAL_ARRAY);
 				glVertexPointer(3, GL_FLOAT, 0, dl->verts);
@@ -3906,7 +3927,7 @@ static void drawCurveDMWired(Object *ob)
 }
 
 /* return 1 when nothing was drawn */
-static int drawCurveDerivedMesh(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base, int dt)
+static int drawCurveDerivedMesh(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base, const short dt)
 {
 	Object *ob = base->object;
 	DerivedMesh *dm = ob->derivedFinal;
@@ -3938,7 +3959,8 @@ static int drawCurveDerivedMesh(Scene *scene, View3D *v3d, RegionView3D *rv3d, B
 }
 
 /* returns 1 when nothing was drawn */
-static int drawDispList(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base, int dt)
+static int drawDispList(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
+                        const short dt, const unsigned char ob_wire_col[4])
 {
 	Object *ob = base->object;
 	ListBase *lb = NULL;
@@ -3986,12 +4008,12 @@ static int drawDispList(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *bas
 				else {
 					if (draw_glsl_material(scene, ob, v3d, dt)) {
 						GPU_begin_object_materials(v3d, rv3d, scene, ob, 1, NULL);
-						drawDispListsolid(lb, ob, 1);
+						drawDispListsolid(lb, ob, ob_wire_col, TRUE);
 						GPU_end_object_materials();
 					}
 					else {
 						GPU_begin_object_materials(v3d, rv3d, scene, ob, 0, NULL);
-						drawDispListsolid(lb, ob, 0);
+						drawDispListsolid(lb, ob, ob_wire_col, FALSE);
 						GPU_end_object_materials();
 					}
 					if (cu->editnurb && cu->bevobj == NULL && cu->taperobj == NULL && cu->ext1 == 0.0f && cu->ext2 == 0.0f) {
@@ -4023,12 +4045,12 @@ static int drawDispList(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *bas
 
 				if (draw_glsl_material(scene, ob, v3d, dt)) {
 					GPU_begin_object_materials(v3d, rv3d, scene, ob, 1, NULL);
-					drawDispListsolid(lb, ob, 1);
+					drawDispListsolid(lb, ob, ob_wire_col, TRUE);
 					GPU_end_object_materials();
 				}
 				else {
 					GPU_begin_object_materials(v3d, rv3d, scene, ob, 0, NULL);
-					drawDispListsolid(lb, ob, 0);
+					drawDispListsolid(lb, ob, ob_wire_col, FALSE);
 					GPU_end_object_materials();
 				}
 			}
@@ -4047,12 +4069,12 @@ static int drawDispList(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *bas
 
 					if (draw_glsl_material(scene, ob, v3d, dt)) {
 						GPU_begin_object_materials(v3d, rv3d, scene, ob, 1, NULL);
-						drawDispListsolid(lb, ob, 1);
+						drawDispListsolid(lb, ob, ob_wire_col, TRUE);
 						GPU_end_object_materials();
 					}
 					else {
 						GPU_begin_object_materials(v3d, rv3d, scene, ob, 0, NULL);
-						drawDispListsolid(lb, ob, 0);
+						drawDispListsolid(lb, ob, ob_wire_col, FALSE);
 						GPU_end_object_materials();
 					}
 				}
@@ -5564,7 +5586,8 @@ static void draw_editnurb(Object *ob, Nurb *nurb, int sel)
 	}
 }
 
-static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base, Nurb *nurb, int dt)
+static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base, Nurb *nurb,
+                     const short dt, const unsigned char ob_wire_col[4])
 {
 	ToolSettings *ts = scene->toolsettings;
 	Object *ob = base->object;
@@ -5573,10 +5596,13 @@ static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 	BevList *bl;
 	short hide_handles = (cu->drawflag & CU_HIDE_HANDLES);
 	int index;
+	unsigned char wire_col[3];
 
 	/* DispList */
-	UI_ThemeColor(TH_WIRE);
-	drawDispList(scene, v3d, rv3d, base, dt);
+	UI_GetThemeColor3ubv(TH_WIRE, wire_col);
+	glColor3ubv(wire_col);
+
+	drawDispList(scene, v3d, rv3d, base, dt, ob_wire_col);
 
 	if (v3d->zbuf) glDisable(GL_DEPTH_TEST);
 	
@@ -5888,7 +5914,8 @@ static void drawcone(const float vec[3], float radius, float height, float tmat[
 	glEnd();
 }
 /* return 1 if nothing was drawn */
-static int drawmball(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base, int dt)
+static int drawmball(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
+                     const short dt, const unsigned char ob_wire_col[4])
 {
 	Object *ob = base->object;
 	MetaBall *mb;
@@ -5899,13 +5926,19 @@ static int drawmball(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 	mb = ob->data;
 
 	if (mb->editelems) {
-		UI_ThemeColor(TH_WIRE);
-		if ((G.f & G_PICKSEL) == 0) drawDispList(scene, v3d, rv3d, base, dt);
+		if ((G.f & G_PICKSEL) == 0) {
+			unsigned char wire_col[3];
+			UI_GetThemeColor3ubv(TH_WIRE, wire_col);
+			glColor3ubv(wire_col);
+
+			drawDispList(scene, v3d, rv3d, base, dt, wire_col);
+		}
 		ml = mb->editelems->first;
 	}
 	else {
-		if ((base->flag & OB_FROMDUPLI) == 0)
-			drawDispList(scene, v3d, rv3d, base, dt);
+		if ((base->flag & OB_FROMDUPLI) == 0) {
+			drawDispList(scene, v3d, rv3d, base, dt, ob_wire_col);
+		}
 		ml = mb->elems.first;
 	}
 
@@ -6277,7 +6310,8 @@ static void drawtexspace(Object *ob)
 }
 
 /* draws wire outline */
-static void drawObjectSelect(Scene *scene, View3D *v3d, ARegion *ar, Base *base)
+static void drawObjectSelect(Scene *scene, View3D *v3d, ARegion *ar, Base *base,
+                             const unsigned char ob_wire_col[4])
 {
 	RegionView3D *rv3d = ar->regiondata;
 	Object *ob = base->object;
@@ -6316,7 +6350,7 @@ static void drawObjectSelect(Scene *scene, View3D *v3d, ARegion *ar, Base *base)
 	}
 	else if (ob->type == OB_ARMATURE) {
 		if (!(ob->mode & OB_MODE_POSE && base == scene->basact))
-			draw_armature(scene, v3d, ar, base, OB_WIRE, FALSE, TRUE);
+			draw_armature(scene, v3d, ar, base, OB_WIRE, FALSE, ob_wire_col, TRUE);
 	}
 
 	glLineWidth(1.0);
@@ -6408,19 +6442,13 @@ static void draw_hooks(Object *ob)
 	}
 }
 
-static void drawRBpivot(bRigidBodyJointConstraint *data)
+static void drawRBpivot(bRigidBodyJointConstraint *data, const unsigned char ob_wire_col[4])
 {
 	const char *axis_str[3] = {"px", "py", "pz"};
 	int axis;
 	float mat[4][4];
 
 	/* color */
-	float curcol[4];
-	unsigned char tcol[4];
-
-	glGetFloatv(GL_CURRENT_COLOR, curcol);
-	rgb_float_to_uchar(tcol, curcol);
-	tcol[3] = 255;
 
 	eul_to_mat4(mat, &data->axX);
 	glLineWidth(4.0f);
@@ -6439,14 +6467,89 @@ static void drawRBpivot(bRigidBodyJointConstraint *data)
 		glVertex3fv(v);
 		glEnd();
 
-		view3d_cached_text_draw_add(v, axis_str[axis], 0, V3D_CACHE_TEXT_ASCII, tcol);
+		view3d_cached_text_draw_add(v, axis_str[axis], 0, V3D_CACHE_TEXT_ASCII, ob_wire_col);
 	}
 	glLineWidth(1.0f);
 	setlinestyle(0);
 }
 
+static void draw_object_wire_color(Scene *scene, Base *base, unsigned char r_ob_wire_col[4],
+                                   const int warning_recursive)
+{
+	Object *ob = base->object;
+	int colindex = 0;
+
+	/* confusing logic here, there are 2 methods of setting the color
+	 * 'colortab[colindex]' and 'theme_id', colindex overrides theme_id.
+	 *
+	 * note: no theme yet for 'colindex' */
+	int theme_id = TH_WIRE;
+	int theme_shade = 0;
+
+	if ((scene->obedit == NULL) &&
+	    (G.moving & G_TRANSFORM_OBJ) &&
+	    (base->flag & (SELECT + BA_WAS_SEL)))
+	{
+		theme_id = TH_TRANSFORM;
+	}
+	else {
+		/* Sets the 'colindex' */
+		if (ob->id.lib) {
+			colindex = (base->flag & (SELECT + BA_WAS_SEL)) ? 4 : 3;
+		}
+		else if (warning_recursive == 1) {
+			if (base->flag & (SELECT + BA_WAS_SEL)) {
+				colindex = (scene->basact == base) ? 8 : 7;
+			}
+			else {
+				colindex = 6;
+			}
+		}
+		/* Sets the 'theme_id' or fallback to wire */
+		else {
+			if (ob->flag & OB_FROMGROUP) {
+				if (base->flag & (SELECT + BA_WAS_SEL)) {
+					/* uses darker active color for non-active + selected*/
+					theme_id = TH_GROUP_ACTIVE;
+
+					if (scene->basact != base) {
+						theme_shade = -16;
+					}
+				}
+				else {
+					theme_id = TH_GROUP;
+				}
+			}
+			else {
+				if (base->flag & (SELECT + BA_WAS_SEL)) {
+					theme_id = scene->basact == base ? TH_ACTIVE : TH_SELECT;
+				}
+				else {
+					if (ob->type == OB_LAMP) theme_id = TH_LAMP;
+					else if (ob->type == OB_SPEAKER) theme_id = TH_SPEAKER;
+					else if (ob->type == OB_CAMERA) theme_id = TH_CAMERA;
+					else if (ob->type == OB_EMPTY) theme_id = TH_EMPTY;
+					/* fallback to TH_WIRE */
+				}
+			}
+		}
+	}
+
+	/* finally set the color */
+	if (colindex == 0) {
+		if (theme_shade == 0) UI_GetThemeColor3ubv(theme_id, r_ob_wire_col);
+		else                  UI_GetThemeColorShade3ubv(theme_id, theme_shade, r_ob_wire_col);
+	}
+	else {
+		cpack_cpy_3ub(r_ob_wire_col, colortab[colindex]);
+	}
+
+	/* no reason to use this but some functions take col[4] */
+	r_ob_wire_col[3] = 255;
+}
+
 /* flag can be DRAW_PICKING	and/or DRAW_CONSTCOLOR, DRAW_SCENESET */
-void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
+void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short dflag)
 {
 	static int warning_recursive = 0;
 	ModifierData *md = NULL;
@@ -6455,7 +6558,8 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 	RegionView3D *rv3d = ar->regiondata;
 	float vec1[3], vec2[3];
 	unsigned int col = 0;
-	int /*sel, drawtype,*/ colindex = 0;
+	unsigned char _ob_wire_col[4];      /* dont initialize this */
+	unsigned char *ob_wire_col = NULL;  /* dont initialize this, use NULL crashes as a way to find invalid use */
 	int i, selstart, selend, empty_object = 0;
 	short dt, dtx, zbufoff = 0;
 	const short is_obact = (ob == OBACT);
@@ -6479,12 +6583,12 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 		return;
 
 	/* xray delay? */
-	if ((flag & DRAW_PICKING) == 0 && (base->flag & OB_FROMDUPLI) == 0) {
+	if ((dflag & DRAW_PICKING) == 0 && (base->flag & OB_FROMDUPLI) == 0) {
 		/* don't do xray in particle mode, need the z-buffer */
 		if (!(ob->mode & OB_MODE_PARTICLE_EDIT)) {
 			/* xray and transp are set when it is drawing the 2nd/3rd pass */
 			if (!v3d->xray && !v3d->transp && (ob->dtx & OB_DRAWXRAY) && !(ob->dtx & OB_DRAWTRANSP)) {
-				add_view3d_after(&v3d->afterdraw_xray, base, flag);
+				ED_view3d_after_add(&v3d->afterdraw_xray, base, dflag);
 				return;
 			}
 		}
@@ -6493,9 +6597,6 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 	/* no return after this point, otherwise leaks */
 	view3d_cached_text_draw_begin();
 	
-	/* patch? children objects with a timeoffs change the parents. How to solve! */
-	/* if ( ((int)ob->ctime) != F_(scene->r.cfra)) BKE_object_where_is_calc(scene, ob); */
-	
 	/* draw motion paths (in view space) */
 	if (ob->mpath && (v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
 		bAnimVizSettings *avs = &ob->avs;
@@ -6515,74 +6616,14 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 	ED_view3d_init_mats_rv3d_gl(ob, rv3d);
 
 	/* which wire color */
-	if ((flag & DRAW_CONSTCOLOR) == 0) {
-		/* confusing logic here, there are 2 methods of setting the color
-		 * 'colortab[colindex]' and 'theme_id', colindex overrides theme_id.
-		 *
-		 * note: no theme yet for 'colindex' */
-		int theme_id = TH_WIRE;
-		int theme_shade = 0;
+	if ((dflag & DRAW_CONSTCOLOR) == 0) {
 
 		project_short(ar, ob->obmat[3], &base->sx);
 
-		if ((scene->obedit == NULL) &&
-		    (G.moving & G_TRANSFORM_OBJ) &&
-		    (base->flag & (SELECT + BA_WAS_SEL)))
-		{
-			theme_id = TH_TRANSFORM;
-		}
-		else {
-			/* Sets the 'colindex' */
-			if (ob->id.lib) {
-				colindex = (base->flag & (SELECT + BA_WAS_SEL)) ? 4 : 3;
-			}
-			else if (warning_recursive == 1) {
-				if (base->flag & (SELECT + BA_WAS_SEL)) {
-					colindex = (scene->basact == base) ? 8 : 7;
-				}
-				else {
-					colindex = 6;
-				}
-			}
-			/* Sets the 'theme_id' or fallback to wire */
-			else {
-				if (ob->flag & OB_FROMGROUP) {
-					if (base->flag & (SELECT + BA_WAS_SEL)) {
-						/* uses darker active color for non-active + selected*/
-						theme_id = TH_GROUP_ACTIVE;
-						
-						if (scene->basact != base) {
-							theme_shade = -16;
-						}
-					}
-					else {
-						theme_id = TH_GROUP;
-					}
-				}
-				else {
-					if (base->flag & (SELECT + BA_WAS_SEL)) {
-						theme_id = scene->basact == base ? TH_ACTIVE : TH_SELECT;
-					}
-					else {
-						if (ob->type == OB_LAMP) theme_id = TH_LAMP;
-						else if (ob->type == OB_SPEAKER) theme_id = TH_SPEAKER;
-						else if (ob->type == OB_CAMERA) theme_id = TH_CAMERA;
-						else if (ob->type == OB_EMPTY) theme_id = TH_EMPTY;
-						/* fallback to TH_WIRE */
-					}
-				}
-			}
-		}
+		draw_object_wire_color(scene, base, _ob_wire_col, warning_recursive);
+		ob_wire_col = _ob_wire_col;
 
-		/* finally set the color */
-		if (colindex == 0) {
-			if (theme_shade == 0) UI_ThemeColor(theme_id);
-			else UI_ThemeColorShade(theme_id, theme_shade);
-		}
-		else {
-			col = colortab[colindex];
-			cpack(col);
-		}
+		glColor3ubv(ob_wire_col);
 	}
 
 	/* maximum drawtype */
@@ -6640,18 +6681,18 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 	
 	/* draw outline for selected objects, mesh does itself */
 	if ((v3d->flag & V3D_SELECT_OUTLINE) && ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) && ob->type != OB_MESH) {
-		if (dt > OB_WIRE && (ob->mode & OB_MODE_EDIT) == 0 && (flag & DRAW_SCENESET) == 0) {
-			if (!(ob->dtx & OB_DRAWWIRE) && (ob->flag & SELECT) && !(flag & DRAW_PICKING)) {
+		if (dt > OB_WIRE && (ob->mode & OB_MODE_EDIT) == 0 && (dflag & DRAW_SCENESET) == 0) {
+			if (!(ob->dtx & OB_DRAWWIRE) && (ob->flag & SELECT) && !(dflag & DRAW_PICKING)) {
 				
-				drawObjectSelect(scene, v3d, ar, base);
+				drawObjectSelect(scene, v3d, ar, base, ob_wire_col);
 			}
 		}
 	}
 
 	switch (ob->type) {
 		case OB_MESH:
-			empty_object = draw_mesh_object(scene, ar, v3d, rv3d, base, dt, flag);
-			if (flag != DRAW_CONSTCOLOR) dtx &= ~OB_DRAWWIRE;  // mesh draws wire itself
+			empty_object = draw_mesh_object(scene, ar, v3d, rv3d, base, dt, dflag);
+			if (dflag != DRAW_CONSTCOLOR) dtx &= ~OB_DRAWWIRE;  // mesh draws wire itself
 
 			break;
 		case OB_FONT:
@@ -6662,11 +6703,11 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 				if (cu->flag & CU_FAST) {
 					cpack(0xFFFFFF);
 					set_inverted_drawing(1);
-					drawDispList(scene, v3d, rv3d, base, OB_WIRE);
+					drawDispList(scene, v3d, rv3d, base, OB_WIRE, ob_wire_col);
 					set_inverted_drawing(0);
 				}
 				else {
-					drawDispList(scene, v3d, rv3d, base, dt);
+					drawDispList(scene, v3d, rv3d, base, dt, ob_wire_col);
 				}
 
 				if (cu->linewidth != 0.0f) {
@@ -6741,7 +6782,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 				}
 			}
 			else if (ED_view3d_boundbox_clip(rv3d, ob->obmat, ob->bb ? ob->bb : cu->bb)) {
-				empty_object = drawDispList(scene, v3d, rv3d, base, dt);
+				empty_object = drawDispList(scene, v3d, rv3d, base, dt, ob_wire_col);
 			}
 
 			break;
@@ -6751,7 +6792,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 
 			if (cu->editnurb) {
 				ListBase *nurbs = BKE_curve_editNurbs_get(cu);
-				drawnurb(scene, v3d, rv3d, base, nurbs->first, dt);
+				drawnurb(scene, v3d, rv3d, base, nurbs->first, dt, ob_wire_col);
 			}
 			else if (dt == OB_BOUNDBOX) {
 				if (((v3d->flag2 & V3D_RENDER_OVERRIDE) && (v3d->drawtype >= OB_WIRE)) == 0) {
@@ -6759,7 +6800,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 				}
 			}
 			else if (ED_view3d_boundbox_clip(rv3d, ob->obmat, ob->bb ? ob->bb : cu->bb)) {
-				empty_object = drawDispList(scene, v3d, rv3d, base, dt);
+				empty_object = drawDispList(scene, v3d, rv3d, base, dt, ob_wire_col);
 
 //XXX old animsys				if (cu->path)
 //                                  curve_draw_speed(scene, ob);
@@ -6770,14 +6811,14 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 			MetaBall *mb = ob->data;
 			
 			if (mb->editelems)
-				drawmball(scene, v3d, rv3d, base, dt);
+				drawmball(scene, v3d, rv3d, base, dt, ob_wire_col);
 			else if (dt == OB_BOUNDBOX) {
 				if (((v3d->flag2 & V3D_RENDER_OVERRIDE) && (v3d->drawtype >= OB_WIRE)) == 0) {
 					draw_bounding_volume(scene, ob, ob->boundtype);
 				}
 			}
 			else
-				empty_object = drawmball(scene, v3d, rv3d, base, dt);
+				empty_object = drawmball(scene, v3d, rv3d, base, dt, ob_wire_col);
 			break;
 		}
 		case OB_EMPTY:
@@ -6792,7 +6833,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 			break;
 		case OB_LAMP:
 			if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
-				drawlamp(scene, v3d, rv3d, base, dt, flag);
+				drawlamp(scene, v3d, rv3d, base, dt, dflag, ob_wire_col);
 				if (dtx || (base->flag & SELECT)) glMultMatrixf(ob->obmat);
 			}
 			break;
@@ -6800,12 +6841,12 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 			if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0 ||
 			    (rv3d->persp == RV3D_CAMOB && v3d->camera == ob)) /* special exception for active camera */
 			{
-				drawcamera(scene, v3d, rv3d, base, flag);
+				drawcamera(scene, v3d, rv3d, base, dflag, ob_wire_col);
 				break;
 			}
 		case OB_SPEAKER:
 			if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0)
-				drawspeaker(scene, v3d, rv3d, ob, flag);
+				drawspeaker(scene, v3d, rv3d, ob, dflag);
 			break;
 		case OB_LATTICE:
 			if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
@@ -6823,7 +6864,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 				else {
 					if (dt > OB_WIRE)
 						GPU_enable_material(0, NULL);  /* we use default material */
-					empty_object = draw_armature(scene, v3d, ar, base, dt, flag, FALSE);
+					empty_object = draw_armature(scene, v3d, ar, base, dt, dflag, ob_wire_col, FALSE);
 					if (dt > OB_WIRE)
 						GPU_disable_material();
 				}
@@ -6837,7 +6878,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 
 	if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
 
-		if (ob->soft /*&& flag & OB_SBMOTION*/) {
+		if (ob->soft /*&& dflag & OB_SBMOTION*/) {
 			float mrt[3][3], msc[3][3], mtr[3][3];
 			SoftBody *sb = NULL;
 			float tipw = 0.5f, tiph = 0.5f, drawsize = 4.0f;
@@ -6862,7 +6903,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 	/* code for new particle system */
 	if ((warning_recursive == 0) &&
 	    (ob->particlesystem.first) &&
-	    (flag & DRAW_PICKING) == 0 &&
+	    (dflag & DRAW_PICKING) == 0 &&
 	    (ob != scene->obedit)
 	    )
 	{
@@ -6896,7 +6937,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 
 	/* draw edit particles last so that they can draw over child particles */
 	if ( (warning_recursive == 0) &&
-	     (flag & DRAW_PICKING) == 0 &&
+	     (dflag & DRAW_PICKING) == 0 &&
 	     (!scene->obedit))
 	{
 
@@ -7027,7 +7068,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 			if (con->type == CONSTRAINT_TYPE_RIGIDBODYJOINT) {
 				bRigidBodyJointConstraint *data = (bRigidBodyJointConstraint *)con->data;
 				if (data->flag & CONSTRAINT_DRAW_PIVOT)
-					drawRBpivot(data);
+					drawRBpivot(data, ob_wire_col);
 			}
 		}
 
@@ -7054,14 +7095,9 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 			if (dtx & OB_DRAWNAME) {
 				/* patch for several 3d cards (IBM mostly) that crash on GL_SELECT with text drawing */
 				/* but, we also don't draw names for sets or duplicators */
-				if (flag == 0) {
-					float zero[3] = {0, 0, 0};
-					float curcol[4];
-					unsigned char tcol[4];
-					glGetFloatv(GL_CURRENT_COLOR, curcol);
-					rgb_float_to_uchar(tcol, curcol);
-					tcol[3] = 255;
-					view3d_cached_text_draw_add(zero, ob->id.name + 2, 10, 0, tcol);
+				if (dflag == 0) {
+					const float zero[3] = {0, 0, 0};
+					view3d_cached_text_draw_add(zero, ob->id.name + 2, 10, 0, ob_wire_col);
 				}
 			}
 			/*if (dtx & OB_DRAWIMAGE) drawDispListwire(&ob->disp);*/
@@ -7117,13 +7153,13 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 			do_draw_center = DESELECT;
 
 		if (do_draw_center != -1) {
-			if (flag & DRAW_PICKING) {
+			if (dflag & DRAW_PICKING) {
 				/* draw a single point for opengl selection */
 				glBegin(GL_POINTS);
 				glVertex3fv(ob->obmat[3]);
 				glEnd();
 			}
-			else if ((flag & DRAW_CONSTCOLOR) == 0) {
+			else if ((dflag & DRAW_CONSTCOLOR) == 0) {
 				/* we don't draw centers for duplicators and sets */
 				if (U.obcenter_dia > 0) {
 					/* check > 0 otherwise grease pencil can draw into the circle select which is annoying. */
@@ -7134,7 +7170,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 	}
 
 	/* not for sets, duplicators or picking */
-	if (flag == 0 && (v3d->flag & V3D_HIDE_HELPLINES) == 0 && (v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
+	if (dflag == 0 && (v3d->flag & V3D_HIDE_HELPLINES) == 0 && (v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
 		ListBase *list;
 		
 		/* draw hook center and offset line */
@@ -7476,7 +7512,7 @@ void draw_object_backbufsel(Scene *scene, View3D *v3d, RegionView3D *rv3d, Objec
 
 /* helper function for drawing object instances - meshes */
 static void draw_object_mesh_instance(Scene *scene, View3D *v3d, RegionView3D *rv3d, 
-                                      Object *ob, int dt, int outline)
+                                      Object *ob, const short dt, int outline)
 {
 	Mesh *me = ob->data;
 	DerivedMesh *dm = NULL, *edm = NULL;
@@ -7524,7 +7560,7 @@ static void draw_object_mesh_instance(Scene *scene, View3D *v3d, RegionView3D *r
 	if (dm) dm->release(dm);
 }
 
-void draw_object_instance(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob, int dt, int outline)
+void draw_object_instance(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob, const short dt, int outline)
 {
 	if (ob == NULL)
 		return;
diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c
index 19cf9d9e20f..43252111303 100644
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@ -146,7 +146,7 @@ static int intersect_edges(float *points, float a, float b, float c, float d, fl
 	return numpoints;
 }
 
-static int convex(float *p0, float *up, float *a, float *b)
+static int convex(const float p0[3], const float up[3], const float a[3], const float b[3])
 {
 	// Vec3 va = a-p0, vb = b-p0;
 	float va[3], vb[3], tmp[3];
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 28fd2c8bc74..a6948222d93 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -1016,7 +1016,7 @@ static void space_view3d_listener(struct ScrArea *sa, struct wmNotifier *wmn)
 			break;
 	}
 
-	// removed since BKE_image_user_frame_calc is now called in draw_bgpic because screen_ops doesnt call the notifier.
+	// removed since BKE_image_user_frame_calc is now called in view3d_draw_bgpic because screen_ops doesnt call the notifier.
 #if 0
 	if (wmn->category == NC_SCENE && wmn->data == ND_FRAME) {
 		View3D *v3d = area->spacedata.first;
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index ee02f99d5b7..709a73178aa 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -153,12 +153,14 @@ static void view3d_draw_clipping(RegionView3D *rv3d)
 	BoundBox *bb = rv3d->clipbb;
 
 	if (bb) {
-		static unsigned int clipping_index[6][4] = {{0, 1, 2, 3},
-		                                            {0, 4, 5, 1},
-		                                            {4, 7, 6, 5},
-		                                            {7, 3, 2, 6},
-		                                            {1, 5, 6, 2},
-		                                            {7, 4, 0, 3}};
+		static unsigned int clipping_index[6][4] = {
+			{0, 1, 2, 3},
+			{0, 4, 5, 1},
+			{4, 7, 6, 5},
+			{7, 3, 2, 6},
+			{1, 5, 6, 2},
+			{7, 4, 0, 3}
+		};
 
 		/* fill in zero alpha for rendering & re-projection [#31530] */
 		unsigned char col[4];
@@ -437,16 +439,9 @@ static void drawgrid(UnitSettings *unit, ARegion *ar, View3D *v3d, const char **
 }
 #undef GRID_MIN_PX
 
-static void drawfloor(Scene *scene, View3D *v3d, const char **grid_unit)
+float ED_view3d_grid_scale(Scene *scene, View3D *v3d, const char **grid_unit)
 {
-	float grid, grid_scale;
-	unsigned char col_grid[3];
-	const int gridlines = v3d->gridlines / 2;
-
-	if (v3d->gridlines < 3) return;
-	
-	grid_scale = v3d->grid;
-	/* use 'grid_scale' instead of 'v3d->grid' from now on */
+	float grid_scale = v3d->grid;
 
 	/* apply units */
 	if (scene->unit.system) {
@@ -457,11 +452,25 @@ static void drawfloor(Scene *scene, View3D *v3d, const char **grid_unit)
 
 		if (usys) {
 			int i = bUnit_GetBaseUnit(usys);
-			*grid_unit = bUnit_GetNameDisplay(usys, i);
+			if (grid_unit)
+				*grid_unit = bUnit_GetNameDisplay(usys, i);
 			grid_scale = (grid_scale * (float)bUnit_GetScaler(usys, i)) / scene->unit.scale_length;
 		}
 	}
 
+	return grid_scale;
+}
+
+static void drawfloor(Scene *scene, View3D *v3d, const char **grid_unit)
+{
+	float grid, grid_scale;
+	unsigned char col_grid[3];
+	const int gridlines = v3d->gridlines / 2;
+
+	if (v3d->gridlines < 3) return;
+	
+	/* use 'grid_scale' instead of 'v3d->grid' from now on */
+	grid_scale = ED_view3d_grid_scale(scene, v3d, grid_unit);
 	grid = gridlines * grid_scale;
 
 	if (v3d->zbuf && scene->obedit) glDepthMask(0);  // for zbuffer-select
@@ -501,8 +510,7 @@ static void drawfloor(Scene *scene, View3D *v3d, const char **grid_unit)
 			}
 
 			/* set variable axis */
-			vert[0][1] = vert[1][1] =
-			vert[2][0] = vert[3][0] = line;
+			vert[0][1] = vert[1][1] = vert[2][0] = vert[3][0] = line;
 
 			glDrawArrays(GL_LINES, 0, 4);
 		}
@@ -1121,7 +1129,7 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d)
 
 #ifdef VIEW3D_CAMERA_BORDER_HACK
 	if (view3d_camera_border_hack_test == TRUE) {
-		glColor4fv(view3d_camera_border_hack_col);
+		glColor3ubv(view3d_camera_border_hack_col);
 		glRectf(x1i + 1, y1i + 1, x2i - 1, y2i - 1);
 		view3d_camera_border_hack_test = FALSE;
 	}
@@ -1140,7 +1148,6 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d)
 
 	/* border */
 	if (scene->r.mode & R_BORDER) {
-		
 		cpack(0);
 		x3 = x1 + scene->r.border.xmin * (x2 - x1);
 		y3 = y1 + scene->r.border.ymin * (y2 - y1);
@@ -1521,7 +1528,8 @@ exit:
 
 /* ************************************************************* */
 
-static void draw_bgpic(Scene *scene, ARegion *ar, View3D *v3d, int foreground)
+static void view3d_draw_bgpic(Scene *scene, ARegion *ar, View3D *v3d,
+                              const short do_forground, const short do_camera_frame)
 {
 	RegionView3D *rv3d = ar->regiondata;
 	BGpic *bgpic;
@@ -1530,7 +1538,7 @@ static void draw_bgpic(Scene *scene, ARegion *ar, View3D *v3d, int foreground)
 	ImBuf *ibuf = NULL, *freeibuf;
 	float vec[4], fac, asp, zoomx, zoomy;
 	float x1, y1, x2, y2, cx, cy;
-	int fg_flag = foreground ? V3D_BGPIC_FOREGROUND : 0;
+	int fg_flag = do_forground ? V3D_BGPIC_FOREGROUND : 0;
 
 	for (bgpic = v3d->bgpicbase.first; bgpic; bgpic = bgpic->next) {
 
@@ -1541,6 +1549,8 @@ static void draw_bgpic(Scene *scene, ARegion *ar, View3D *v3d, int foreground)
 		    (bgpic->view & (1 << rv3d->view)) || /* check agaist flags */
 		    (rv3d->persp == RV3D_CAMOB && bgpic->view == (1 << RV3D_VIEW_CAMERA)))
 		{
+			float image_aspect[2];
+
 			/* disable individual images */
 			if ((bgpic->flag & V3D_BGPIC_DISABLED))
 				continue;
@@ -1552,8 +1562,11 @@ static void draw_bgpic(Scene *scene, ARegion *ar, View3D *v3d, int foreground)
 					continue;
 				BKE_image_user_frame_calc(&bgpic->iuser, CFRA, 0);
 				ibuf = BKE_image_get_ibuf(ima, &bgpic->iuser);
+
+				image_aspect[0] = ima->aspx;
+				image_aspect[1] = ima->aspx;
 			}
-			else {
+			else if (bgpic->source == V3D_BGPIC_MOVIE) {
 				clip = NULL;
 
 				if (bgpic->flag & V3D_BGPIC_CAMERACLIP) {
@@ -1568,6 +1581,9 @@ static void draw_bgpic(Scene *scene, ARegion *ar, View3D *v3d, int foreground)
 				BKE_movieclip_user_set_frame(&bgpic->cuser, CFRA);
 				ibuf = BKE_movieclip_get_ibuf(clip, &bgpic->cuser);
 
+				image_aspect[0] = clip->aspx;
+				image_aspect[1] = clip->aspx;
+
 				/* working with ibuf from image and clip has got different workflow now.
 				 * ibuf acquired from clip is referenced by cache system and should
 				 * be dereferenced after usage. */
@@ -1588,14 +1604,65 @@ static void draw_bgpic(Scene *scene, ARegion *ar, View3D *v3d, int foreground)
 				IMB_rect_from_float(ibuf);
 
 			if (rv3d->persp == RV3D_CAMOB) {
-				rctf vb;
 
-				ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &vb, FALSE);
+				if (do_camera_frame) {
+					rctf vb;
+					ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &vb, FALSE);
+					x1 = vb.xmin;
+					y1 = vb.ymin;
+					x2 = vb.xmax;
+					y2 = vb.ymax;
+				}
+				else {
+					x1 = ar->winrct.xmin;
+					y1 = ar->winrct.ymin;
+					x2 = ar->winrct.xmax;
+					y2 = ar->winrct.ymax;
+				}
 
-				x1 = vb.xmin;
-				y1 = vb.ymin;
-				x2 = vb.xmax;
-				y2 = vb.ymax;
+				/* apply offset last - camera offset is different to offset in blender units */
+				/* so this has some sane way of working - this matches camera's shift _exactly_ */
+				{
+					const float max_dim = maxf(x2 - x1, y2 - y1);
+					const float xof_scale = bgpic->xof * max_dim;
+					const float yof_scale = bgpic->yof * max_dim;
+
+					x1 += xof_scale;
+					y1 += yof_scale;
+					x2 += xof_scale;
+					y2 += yof_scale;
+				}
+
+				/* aspect correction */
+				if (bgpic->flag & V3D_BGPIC_CAMERA_ASPECT) {
+					/* apply aspect from clip */
+					const float w_src = ibuf->x * image_aspect[0];
+					const float h_src = ibuf->y * image_aspect[1];
+
+					/* destination aspect is already applied from the camera frame */
+					const float w_dst = x1 - x2;
+					const float h_dst = y1 - y2;
+
+					const float asp_src = w_src / h_src;
+					const float asp_dst = w_dst / h_dst;
+
+					if (fabsf(asp_src - asp_dst) >= FLT_EPSILON) {
+						if ((asp_src > asp_dst) == ((bgpic->flag & V3D_BGPIC_CAMERA_CROP) != 0)) {
+							/* fit X */
+							const float div = asp_src / asp_dst;
+							const float cent = (x1 + x2) / 2.0f;
+							x1 = ((x1 - cent) * div) + cent;
+							x2 = ((x2 - cent) * div) + cent;
+						}
+						else {
+							/* fit Y */
+							const float div = asp_dst / asp_src;
+							const float cent = (y1 + y2) / 2.0f;
+							y1 = ((y1 - cent) * div) + cent;
+							y2 = ((y2 - cent) * div) + cent;
+						}
+					}
+				}
 			}
 			else {
 				float sco[2];
@@ -1689,7 +1756,8 @@ static void draw_bgpic(Scene *scene, ARegion *ar, View3D *v3d, int foreground)
 	}
 }
 
-static void draw_bgpics(Scene *scene, ARegion *ar, View3D *v3d, int foreground)
+static void view3d_draw_bgpic_test(Scene *scene, ARegion *ar, View3D *v3d,
+                                   const short do_forground, const short do_camera_frame)
 {
 	RegionView3D *rv3d = ar->regiondata;
 
@@ -1701,11 +1769,11 @@ static void draw_bgpics(Scene *scene, ARegion *ar, View3D *v3d, int foreground)
 
 	if ((rv3d->view == RV3D_VIEW_USER) || (rv3d->persp != RV3D_ORTHO)) {
 		if (rv3d->persp == RV3D_CAMOB) {
-			draw_bgpic(scene, ar, v3d, foreground);
+			view3d_draw_bgpic(scene, ar, v3d, do_forground, do_camera_frame);
 		}
 	}
 	else {
-		draw_bgpic(scene, ar, v3d, foreground);
+		view3d_draw_bgpic(scene, ar, v3d, do_forground, do_camera_frame);
 	}
 }
 
@@ -1714,17 +1782,17 @@ static void draw_bgpics(Scene *scene, ARegion *ar, View3D *v3d, int foreground)
 typedef struct View3DAfter {
 	struct View3DAfter *next, *prev;
 	struct Base *base;
-	int flag;
+	short dflag;
 } View3DAfter;
 
 /* temp storage of Objects that need to be drawn as last */
-void add_view3d_after(ListBase *lb, Base *base, int flag)
+void ED_view3d_after_add(ListBase *lb, Base *base, const short dflag)
 {
 	View3DAfter *v3da = MEM_callocN(sizeof(View3DAfter), "View 3d after");
 	BLI_assert((base->flag & OB_FROMDUPLI) == 0);
 	BLI_addtail(lb, v3da);
 	v3da->base = base;
-	v3da->flag = flag;
+	v3da->dflag = dflag;
 }
 
 /* disables write in zbuffer and draws it over */
@@ -1737,7 +1805,7 @@ static void view3d_draw_transp(Scene *scene, ARegion *ar, View3D *v3d)
 	
 	for (v3da = v3d->afterdraw_transp.first; v3da; v3da = next) {
 		next = v3da->next;
-		draw_object(scene, ar, v3d, v3da->base, v3da->flag);
+		draw_object(scene, ar, v3d, v3da->base, v3da->dflag);
 		BLI_remlink(&v3d->afterdraw_transp, v3da);
 		MEM_freeN(v3da);
 	}
@@ -1758,7 +1826,7 @@ static void view3d_draw_xray(Scene *scene, ARegion *ar, View3D *v3d, int clear)
 	v3d->xray = TRUE;
 	for (v3da = v3d->afterdraw_xray.first; v3da; v3da = next) {
 		next = v3da->next;
-		draw_object(scene, ar, v3d, v3da->base, v3da->flag);
+		draw_object(scene, ar, v3d, v3da->base, v3da->dflag);
 		BLI_remlink(&v3d->afterdraw_xray, v3da);
 		MEM_freeN(v3da);
 	}
@@ -1779,7 +1847,7 @@ static void view3d_draw_xraytransp(Scene *scene, ARegion *ar, View3D *v3d, int c
 	
 	for (v3da = v3d->afterdraw_xraytransp.first; v3da; v3da = next) {
 		next = v3da->next;
-		draw_object(scene, ar, v3d, v3da->base, v3da->flag);
+		draw_object(scene, ar, v3d, v3da->base, v3da->dflag);
 		BLI_remlink(&v3d->afterdraw_xraytransp, v3da);
 		MEM_freeN(v3da);
 	}
@@ -2421,14 +2489,13 @@ static void view3d_main_area_setup_view(Scene *scene, View3D *v3d, ARegion *ar,
 
 void ED_view3d_draw_offscreen(Scene *scene, View3D *v3d, ARegion *ar,
                               int winx, int winy, float viewmat[][4], float winmat[][4],
-                              int draw_background)
+                              int do_bgpic)
 {
 	RegionView3D *rv3d = ar->regiondata;
 	Base *base;
 	float backcol[3];
 	int bwinx, bwiny;
 	rcti brect;
-	ImBuf *bg_ibuf = NULL;
 
 	glPushMatrix();
 
@@ -2458,66 +2525,21 @@ void ED_view3d_draw_offscreen(Scene *scene, View3D *v3d, ARegion *ar,
 	if (draw_glsl_material(scene, NULL, v3d, v3d->drawtype))
 		gpu_update_lamps_shadows(scene, v3d);
 
-	/* if scene has got active clip, use it for render backdrop */
-	if (draw_background && scene->clip && rv3d->persp == RV3D_CAMOB && v3d->camera) {
-		MovieClipUser user = {0};
-
-		BKE_movieclip_user_set_frame(&user, CFRA);
-		bg_ibuf = BKE_movieclip_get_ibuf(scene->clip, &user);
+	/* set background color, fallback on the view background color
+	 * (if active clip is set but frame is failed to load fallback to horizon color as background) */
+	if (scene->world) {
+		if (scene->r.color_mgt_flag & R_COLOR_MANAGEMENT)
+			linearrgb_to_srgb_v3_v3(backcol, &scene->world->horr);
+		else
+			copy_v3_v3(backcol, &scene->world->horr);
+		glClearColor(backcol[0], backcol[1], backcol[2], 0.0);
 	}
-
-	if (!bg_ibuf) {
-		/* set background color, fallback on the view background color
-		 * (if active clip is set but frame is failed to load fallback to horizon color as background) */
-		if (scene->world) {
-			if (scene->r.color_mgt_flag & R_COLOR_MANAGEMENT)
-				linearrgb_to_srgb_v3_v3(backcol, &scene->world->horr);
-			else
-				copy_v3_v3(backcol, &scene->world->horr);
-			glClearColor(backcol[0], backcol[1], backcol[2], 0.0);
-		}
-		else {
-			UI_ThemeClearColor(TH_BACK);
-		}
+	else {
+		UI_ThemeClearColor(TH_BACK);
 	}
 
-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-	if (bg_ibuf) {
-		unsigned char *pixels, *cp, *dst_cp;
-		int i;
-
-		if (bg_ibuf->rect_float && !bg_ibuf->rect)
-			IMB_rect_from_float(bg_ibuf);
-
-		dst_cp = pixels = MEM_callocN(4 * sizeof(unsigned char) * bg_ibuf->x * bg_ibuf->y, "draw offscreen clip pixels");
-		cp = (unsigned char *)bg_ibuf->rect;
-		for (i = 0; i < bg_ibuf->x * bg_ibuf->y; i++, cp += 4, dst_cp += 4) {
-			dst_cp[0] = cp[0];
-			dst_cp[1] = cp[1];
-			dst_cp[2] = cp[2];
-			dst_cp[3] = 255;
-		}
-
-		glMatrixMode(GL_PROJECTION);
-		glPushMatrix();
-		glMatrixMode(GL_MODELVIEW);
-		glPushMatrix();
-		ED_region_pixelspace(ar);
-
-		glPixelZoom((float)winx / bg_ibuf->x, (float)winy / bg_ibuf->y);
-		glaDrawPixelsTex(0, 0, bg_ibuf->x, bg_ibuf->y, GL_UNSIGNED_BYTE, pixels);
-
-		glPixelZoom(1.0, 1.0);
 
-		glMatrixMode(GL_PROJECTION);
-		glPopMatrix();
-		glMatrixMode(GL_MODELVIEW);
-		glPopMatrix();
-
-		IMB_freeImBuf(bg_ibuf);
-		MEM_freeN(pixels);
-	}
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
 	/* setup view matrices */
 	view3d_main_area_setup_view(scene, v3d, ar, viewmat, winmat);
@@ -2533,6 +2555,11 @@ void ED_view3d_draw_offscreen(Scene *scene, View3D *v3d, ARegion *ar,
 	else
 		v3d->zbuf = FALSE;
 
+	/* important to do before clipping */
+	if (do_bgpic) {
+		view3d_draw_bgpic_test(scene, ar, v3d, FALSE, FALSE);
+	}
+
 	if (rv3d->rflag & RV3D_CLIPPING)
 		ED_view3d_clipping_set(rv3d);
 
@@ -2574,6 +2601,11 @@ void ED_view3d_draw_offscreen(Scene *scene, View3D *v3d, ARegion *ar,
 	if (rv3d->rflag & RV3D_CLIPPING)
 		ED_view3d_clipping_disable();
 
+	/* important to do after clipping */
+	if (do_bgpic) {
+		view3d_draw_bgpic_test(scene, ar, v3d, TRUE, FALSE);
+	}
+
 	/* cleanup */
 	if (v3d->zbuf) {
 		v3d->zbuf = FALSE;
@@ -2756,12 +2788,15 @@ static void draw_viewport_fps(Scene *scene, ARegion *ar)
 	BLF_draw_default_ascii(22,  ar->winy - 17, 0.0f, printable, sizeof(printable));
 }
 
-static int view3d_main_area_draw_engine(const bContext *C, ARegion *ar)
+static void view3d_main_area_draw_objects(const bContext *C, ARegion *ar, const char **grid_unit);
+
+static int view3d_main_area_draw_engine(const bContext *C, ARegion *ar, int draw_border)
 {
 	Scene *scene = CTX_data_scene(C);
 	View3D *v3d = CTX_wm_view3d(C);
 	RegionView3D *rv3d = CTX_wm_region_view3d(C);
 	RenderEngineType *type;
+	GLint scissor[4];
 
 	/* create render engine */
 	if (!rv3d->render_engine) {
@@ -2778,22 +2813,57 @@ static int view3d_main_area_draw_engine(const bContext *C, ARegion *ar)
 	view3d_main_area_setup_view(scene, v3d, ar, NULL, NULL);
 
 	/* background draw */
+	ED_region_pixelspace(ar);
+
+	if (draw_border) {
+		/* for border draw, we only need to clear a subset of the 3d view */
+		rctf viewborder;
+		rcti cliprct;
+
+		ED_view3d_calc_camera_border(scene, ar, v3d, rv3d, &viewborder, FALSE);
+
+		cliprct.xmin = viewborder.xmin + scene->r.border.xmin * (viewborder.xmax - viewborder.xmin);
+		cliprct.ymin = viewborder.ymin + scene->r.border.ymin * (viewborder.ymax - viewborder.ymin);
+		cliprct.xmax = viewborder.xmin + scene->r.border.xmax * (viewborder.xmax - viewborder.xmin);
+		cliprct.ymax = viewborder.ymin + scene->r.border.ymax * (viewborder.ymax - viewborder.ymin);
+
+		cliprct.xmin += ar->winrct.xmin;
+		cliprct.xmax += ar->winrct.xmin;
+		cliprct.ymin += ar->winrct.ymin;
+		cliprct.ymax += ar->winrct.ymin;
+
+		cliprct.xmin = CLAMPIS(cliprct.xmin, ar->winrct.xmin, ar->winrct.xmax);
+		cliprct.ymin = CLAMPIS(cliprct.ymin, ar->winrct.ymin, ar->winrct.ymax);
+		cliprct.xmax = CLAMPIS(cliprct.xmax, ar->winrct.xmin, ar->winrct.xmax);
+		cliprct.ymax = CLAMPIS(cliprct.ymax, ar->winrct.ymin, ar->winrct.ymax);
+
+		if (cliprct.xmax > cliprct.xmin && cliprct.ymax > cliprct.ymin) {
+			glGetIntegerv(GL_SCISSOR_BOX, scissor);
+			glScissor(cliprct.xmin, cliprct.ymin, cliprct.xmax - cliprct.xmin, cliprct.ymax - cliprct.ymin);
+		}
+		else
+			return 0;
+	}
+
 	glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-	ED_region_pixelspace(ar);
-
-	/* render result draw */
 	if (v3d->flag & V3D_DISPBGPICS)
-		draw_bgpic(scene, ar, v3d, FALSE);
+		view3d_draw_bgpic(scene, ar, v3d, FALSE, TRUE);
 	else
 		fdrawcheckerboard(0, 0, ar->winx, ar->winy);
 
+	/* render result draw */
 	type = rv3d->render_engine->type;
 	type->view_draw(rv3d->render_engine, C);
 
 	if (v3d->flag & V3D_DISPBGPICS)
-		draw_bgpic(scene, ar, v3d, TRUE);
+		view3d_draw_bgpic(scene, ar, v3d, TRUE, TRUE);
+
+	if (draw_border) {
+		/* restore scissor as it was before */
+		glScissor(scissor[0], scissor[1], scissor[2], scissor[3]);
+	}
 
 	return 1;
 }
@@ -2889,7 +2959,7 @@ static void view3d_main_area_draw_objects(const bContext *C, ARegion *ar, const
 		}
 	}
 
-	draw_bgpics(scene, ar, v3d, FALSE);
+	view3d_draw_bgpic_test(scene, ar, v3d, FALSE, TRUE);
 
 	if (rv3d->rflag & RV3D_CLIPPING)
 		ED_view3d_clipping_set(rv3d);
@@ -2948,8 +3018,6 @@ static void view3d_main_area_draw_objects(const bContext *C, ARegion *ar, const
 		}
 	}
 
-	draw_bgpics(scene, ar, v3d, TRUE);
-
 //	REEB_draw();
 
 	if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
@@ -2969,6 +3037,9 @@ static void view3d_main_area_draw_objects(const bContext *C, ARegion *ar, const
 	if (rv3d->rflag & RV3D_CLIPPING)
 		ED_view3d_clipping_disable();
 	
+	/* important to do after clipping */
+	view3d_draw_bgpic_test(scene, ar, v3d, TRUE, TRUE);
+
 	BIF_draw_manipulator(C);
 
 #if 0
@@ -3048,15 +3119,21 @@ static void view3d_main_area_draw_info(const bContext *C, ARegion *ar, const cha
 
 void view3d_main_area_draw(const bContext *C, ARegion *ar)
 {
+	Scene *scene = CTX_data_scene(C);
 	View3D *v3d = CTX_wm_view3d(C);
+	RegionView3D *rv3d = CTX_wm_region_view3d(C);
 	const char *grid_unit = NULL;
+	int draw_border = (rv3d->persp == RV3D_CAMOB && (scene->r.mode & R_BORDER));
 
-	/* draw viewport using external renderer? */
-	if (!(v3d->drawtype == OB_RENDER && view3d_main_area_draw_engine(C, ar))) {
-		/* draw viewport using opengl */
+	/* draw viewport using opengl */
+	if (v3d->drawtype != OB_RENDER || draw_border) {
 		view3d_main_area_draw_objects(C, ar, &grid_unit);
 		ED_region_pixelspace(ar);
 	}
+
+	/* draw viewport using external renderer */
+	if (v3d->drawtype == OB_RENDER)
+		view3d_main_area_draw_engine(C, ar, draw_border);
 	
 	view3d_main_area_draw_info(C, ar, grid_unit);
 
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 8ba0d75c786..d632314f3ca 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -498,7 +498,7 @@ static void viewops_data_create(bContext *C, wmOperator *op, wmEvent *event)
 static void viewops_data_free(bContext *C, wmOperator *op)
 {
 	ARegion *ar;
-	Paint *p = paint_get_active(CTX_data_scene(C));
+	Paint *p = paint_get_active_from_context(C);
 
 	if (op->customdata) {
 		ViewOpsData *vod = op->customdata;
diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h
index 29edc0158d6..3c6a0dd4b9f 100644
--- a/source/blender/editors/space_view3d/view3d_intern.h
+++ b/source/blender/editors/space_view3d/view3d_intern.h
@@ -53,13 +53,17 @@ struct wmWindowManager;
 #define BL_NEAR_CLIP 0.001
 
 /* drawing flags: */
-#define DRAW_PICKING    1
-#define DRAW_CONSTCOLOR 2
-#define DRAW_SCENESET   4
+enum {
+	DRAW_PICKING     = (1 << 0),
+	DRAW_CONSTCOLOR  = (1 << 1),
+	DRAW_SCENESET    = (1 << 2)
+};
 
 /* draw_mesh_fancy/draw_mesh_textured draw_flags */
-#define DRAW_MODIFIERS_PREVIEW 1
-#define DRAW_FACE_SELECT 2
+enum {
+	DRAW_MODIFIERS_PREVIEW  = (1 << 0),
+	DRAW_FACE_SELECT        = (1 << 1)
+};
 
 /* view3d_header.c */
 void VIEW3D_OT_layers(struct wmOperatorType *ot);
@@ -112,23 +116,28 @@ void draw_motion_paths_cleanup(View3D *v3d);
 
 
 /* drawobject.c */
-void draw_object(Scene *scene, struct ARegion *ar, View3D *v3d, Base *base, int flag);
-int draw_glsl_material(Scene *scene, struct Object *ob, View3D *v3d, int dt);
-void draw_object_instance(Scene *scene, View3D *v3d, RegionView3D *rv3d, struct Object *ob, int dt, int outline);
+void draw_object(Scene *scene, struct ARegion *ar, View3D *v3d, Base *base, const short dflag);
+int draw_glsl_material(Scene *scene, struct Object *ob, View3D *v3d, const short dt);
+void draw_object_instance(Scene *scene, View3D *v3d, RegionView3D *rv3d, struct Object *ob, const short dt, int outline);
 void draw_object_backbufsel(Scene *scene, View3D *v3d, RegionView3D *rv3d, struct Object *ob);
 void drawaxes(float size, char drawtype);
 
 void view3d_cached_text_draw_begin(void);
 void view3d_cached_text_draw_add(const float co[3], const char *str, short xoffs, short flag, const unsigned char col[4]);
 void view3d_cached_text_draw_end(View3D * v3d, ARegion * ar, int depth_write, float mat[][4]);
-#define V3D_CACHE_TEXT_ZBUF         (1 << 0)
-#define V3D_CACHE_TEXT_WORLDSPACE   (1 << 1)
-#define V3D_CACHE_TEXT_ASCII        (1 << 2)
-#define V3D_CACHE_TEXT_GLOBALSPACE  (1 << 3)
-#define V3D_CACHE_TEXT_LOCALCLIP    (1 << 4)
+
+enum {
+	V3D_CACHE_TEXT_ZBUF         = (1 << 0),
+	V3D_CACHE_TEXT_WORLDSPACE   = (1 << 1),
+	V3D_CACHE_TEXT_ASCII        = (1 << 2),
+	V3D_CACHE_TEXT_GLOBALSPACE  = (1 << 3),
+	V3D_CACHE_TEXT_LOCALCLIP    = (1 << 4)
+};
 
 /* drawarmature.c */
-int draw_armature(Scene *scene, View3D *v3d, ARegion *ar, Base *base, int dt, int flag, const short is_outline);
+int draw_armature(Scene *scene, View3D *v3d, ARegion *ar, Base *base,
+                  const short dt, const short dflag, const unsigned char ob_wire_col[4],
+                  const short is_outline);
 
 /* drawmesh.c */
 void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d,
@@ -140,7 +149,7 @@ void draw_mesh_paint(View3D *v3d, RegionView3D *rv3d,
 void view3d_main_area_draw(const struct bContext *C, struct ARegion *ar);
 void draw_depth(Scene *scene, struct ARegion *ar, View3D *v3d, int (*func)(void *));
 void draw_depth_gpencil(Scene *scene, ARegion *ar, View3D *v3d);
-void add_view3d_after(ListBase *lb, Base *base, int flag);
+void ED_view3d_after_add(ListBase *lb, Base *base, const short dflag);
 
 void circf(float x, float y, float rad);
 void circ(float x, float y, float rad);
@@ -211,7 +220,7 @@ void draw_volume(struct ARegion *ar, struct GPUTexture *tex, float min[3], float
  * any direction it starts to fail */
 #define VIEW3D_CAMERA_BORDER_HACK
 #ifdef VIEW3D_CAMERA_BORDER_HACK
-extern float view3d_camera_border_hack_col[4];
+extern unsigned char view3d_camera_border_hack_col[3];
 extern short view3d_camera_border_hack_test;
 #endif
 
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index 18c7e975356..f9ebd4e39c1 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -64,6 +64,7 @@
 #include "BKE_context.h"
 #include "BKE_paint.h"
 #include "BKE_armature.h"
+#include "BKE_depsgraph.h"
 #include "BKE_tessmesh.h"
 #include "BKE_movieclip.h"
 #include "BKE_object.h"
@@ -333,7 +334,7 @@ static void do_lasso_select_pose(ViewContext *vc, Object *ob, int mcords[][2], s
 	int sco1[2], sco2[2];
 	bArmature *arm = ob->data;
 	
-	if (ob->type != OB_ARMATURE || ob->pose == NULL) return;
+	if ((ob->type != OB_ARMATURE) || (ob->pose == NULL)) return;
 
 	for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
 		if (PBONE_VISIBLE(arm, pchan->bone) && (pchan->bone->flag & BONE_UNSELECTABLE) == 0) {
@@ -348,6 +349,11 @@ static void do_lasso_select_pose(ViewContext *vc, Object *ob, int mcords[][2], s
 			}
 		}
 	}
+	
+	if (arm->flag & ARM_HAS_VIZ_DEPS) {
+		/* mask modifier ('armature' mode), etc. */
+		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	}
 }
 
 static void object_deselect_all_visible(Scene *scene, View3D *v3d)
@@ -1297,11 +1303,11 @@ static void deselect_all_tracks(MovieTracking *tracking)
 
 	object = tracking->objects.first;
 	while (object) {
-		ListBase *tracksbase = BKE_tracking_object_tracks(tracking, object);
+		ListBase *tracksbase = BKE_tracking_object_get_tracks(tracking, object);
 		MovieTrackingTrack *track = tracksbase->first;
 
 		while (track) {
-			BKE_tracking_deselect_track(track, TRACK_AREA_ALL);
+			BKE_tracking_track_deselect(track, TRACK_AREA_ALL);
 
 			track = track->next;
 		}
@@ -1402,18 +1408,18 @@ static int mouse_select(bContext *C, const int mval[2], short extend, short dese
 								ListBase *tracksbase;
 								MovieTrackingTrack *track;
 
-								track = BKE_tracking_indexed_track(&clip->tracking, hitresult >> 16, &tracksbase);
+								track = BKE_tracking_track_get_indexed(&clip->tracking, hitresult >> 16, &tracksbase);
 
 								if (TRACK_SELECTED(track) && extend) {
 									changed = 0;
-									BKE_tracking_deselect_track(track, TRACK_AREA_ALL);
+									BKE_tracking_track_deselect(track, TRACK_AREA_ALL);
 								}
 								else {
 									int oldsel = TRACK_SELECTED(track) ? 1 : 0;
 									if (!extend)
 										deselect_all_tracks(tracking);
 
-									BKE_tracking_select_track(tracksbase, track, TRACK_AREA_ALL, extend);
+									BKE_tracking_track_select(tracksbase, track, TRACK_AREA_ALL, extend);
 
 									if (oldsel != (TRACK_SELECTED(track) ? 1 : 0))
 										changed = 1;
@@ -1864,7 +1870,6 @@ static int do_object_pose_box_select(bContext *C, ViewContext *vc, rcti *rect, i
 		for (base = vc->scene->base.first; base && hits; base = base->next) {
 			if (BASE_SELECTABLE(vc->v3d, base)) {
 				while (base->selcol == (*col & 0xFFFF)) {   /* we got an object */
-					
 					if (*col & 0xFFFF0000) {                    /* we got a bone */
 						bone = get_indexed_bone(base->object, *col & ~(BONESEL_ANY));
 						if (bone) {
@@ -1872,16 +1877,13 @@ static int do_object_pose_box_select(bContext *C, ViewContext *vc, rcti *rect, i
 								if ((bone->flag & BONE_UNSELECTABLE) == 0) {
 									bone->flag |= BONE_SELECTED;
 									bone_selected = 1;
-// XXX									select_actionchannel_by_name(base->object->action, bone->name, 1);
 								}
 							}
 							else {
 								bArmature *arm = base->object->data;
 								bone->flag &= ~BONE_SELECTED;
-// XXX									select_actionchannel_by_name(base->object->action, bone->name, 0);
 								if (arm->act_bone == bone)
 									arm->act_bone = NULL;
-								
 							}
 						}
 					}
@@ -1891,7 +1893,7 @@ static int do_object_pose_box_select(bContext *C, ViewContext *vc, rcti *rect, i
 						else
 							ED_base_object_select(base, BA_DESELECT);
 					}
-
+					
 					col += 4; /* next color */
 					hits--;
 					if (hits == 0) break;
@@ -1899,12 +1901,22 @@ static int do_object_pose_box_select(bContext *C, ViewContext *vc, rcti *rect, i
 			}
 			
 			if (bone_selected) {
-				WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, base->object);
+				Object *ob = base->object;
+				
+				if (ob && (ob->type == OB_ARMATURE)) {
+					bArmature *arm = ob->data;
+					
+					WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, ob);
+					
+					if (arm && (arm->flag & ARM_HAS_VIZ_DEPS)) {
+						/* mask modifier ('armature' mode), etc. */
+						DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+					}
+				}
 			}
 		}
-
+		
 		WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, vc->scene);
-
 	}
 	MEM_freeN(vbuffer);
 
@@ -2152,9 +2164,8 @@ void VIEW3D_OT_select(wmOperatorType *ot)
 	ot->flag = OPTYPE_UNDO;
 	
 	/* properties */
-	RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend selection instead of deselecting everything first");
-	RNA_def_boolean(ot->srna, "deselect", 0, "Deselect", "Remove from selection");
-	RNA_def_boolean(ot->srna, "toggle", 0, "Toggle Selection", "Toggles selection");
+	WM_operator_properties_mouse_select(ot);
+
 	RNA_def_boolean(ot->srna, "center", 0, "Center", "Use the object center when selecting, in editmode used to extend object selection");
 	RNA_def_boolean(ot->srna, "enumerate", 0, "Enumerate", "List objects under the mouse (object mode only)");
 	RNA_def_boolean(ot->srna, "object", 0, "Object", "Use object selection (editmode only)");
diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c
index 5af1829af5a..1991d4bce4f 100644
--- a/source/blender/editors/space_view3d/view3d_snap.c
+++ b/source/blender/editors/space_view3d/view3d_snap.c
@@ -831,12 +831,12 @@ static void bundle_midpoint(Scene *scene, Object *ob, float vec[3])
 
 	copy_m4_m4(cammat, ob->obmat);
 
-	BKE_get_tracking_mat(scene, ob, mat);
+	BKE_tracking_get_camera_object_matrix(scene, ob, mat);
 
 	INIT_MINMAX(min, max);
 
 	for (object = tracking->objects.first; object; object = object->next) {
-		ListBase *tracksbase = BKE_tracking_object_tracks(tracking, object);
+		ListBase *tracksbase = BKE_tracking_object_get_tracks(tracking, object);
 		MovieTrackingTrack *track = tracksbase->first;
 		float obmat[4][4];
 
@@ -846,7 +846,7 @@ static void bundle_midpoint(Scene *scene, Object *ob, float vec[3])
 		else {
 			float imat[4][4];
 
-			BKE_tracking_get_interpolated_camera(tracking, object, scene->r.cfra, imat);
+			BKE_tracking_camera_get_reconstructed_interpolate(tracking, object, scene->r.cfra, imat);
 			invert_m4(imat);
 
 			mult_m4_m4m4(obmat, cammat, imat);
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 43fdb779470..9e7facf1b6f 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -49,8 +49,9 @@
 #include "DNA_constraint_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
+#include "DNA_mask_types.h"
 #include "DNA_movieclip_types.h"
-#include "DNA_scene_types.h"		/* PET modes			*/
+#include "DNA_scene_types.h"  /* PET modes */
 
 #include "RNA_access.h"
 
@@ -104,7 +105,7 @@ static int doEdgeSlide(TransInfo *t, float perc);
 
 void setTransformViewMatrices(TransInfo *t)
 {
-	if (t->spacetype==SPACE_VIEW3D && t->ar && t->ar->regiontype == RGN_TYPE_WINDOW) {
+	if (t->spacetype == SPACE_VIEW3D && t->ar && t->ar->regiontype == RGN_TYPE_WINDOW) {
 		RegionView3D *rv3d = t->ar->regiondata;
 
 		copy_m4_m4(t->viewmat, rv3d->viewmat);
@@ -128,12 +129,12 @@ static void convertViewVec2D(View2D *v2d, float vec[3], int dx, int dy)
 {
 	float divx, divy;
 	
-	divx= v2d->mask.xmax - v2d->mask.xmin;
-	divy= v2d->mask.ymax - v2d->mask.ymin;
+	divx = v2d->mask.xmax - v2d->mask.xmin;
+	divy = v2d->mask.ymax - v2d->mask.ymin;
 
-	vec[0]= (v2d->cur.xmax - v2d->cur.xmin) * dx / divx;
-	vec[1]= (v2d->cur.ymax - v2d->cur.ymin) * dy / divy;
-	vec[2]= 0.0f;
+	vec[0] = (v2d->cur.xmax - v2d->cur.xmin) * dx / divx;
+	vec[1] = (v2d->cur.ymax - v2d->cur.ymin) * dy / divy;
+	vec[2] = 0.0f;
 }
 
 void convertViewVec(TransInfo *t, float r_vec[3], int dx, int dy)
@@ -144,7 +145,7 @@ void convertViewVec(TransInfo *t, float r_vec[3], int dx, int dy)
 		mval_f[1] = dy;
 		ED_view3d_win_to_delta(t->ar, mval_f, r_vec);
 	}
-	else if (t->spacetype==SPACE_IMAGE) {
+	else if (t->spacetype == SPACE_IMAGE) {
 		float aspx, aspy;
 
 		convertViewVec2D(t->view, r_vec, dx, dy);
@@ -159,16 +160,38 @@ void convertViewVec(TransInfo *t, float r_vec[3], int dx, int dy)
 	else if (ELEM(t->spacetype, SPACE_NODE, SPACE_SEQ)) {
 		convertViewVec2D(&t->ar->v2d, r_vec, dx, dy);
 	}
-	else if (t->spacetype==SPACE_CLIP) {
+	else if (t->spacetype == SPACE_CLIP) {
 		View2D *v2d = t->view;
 		float divx, divy;
+		float mulx, muly;
+		float aspx = 1.0f, aspy = 1.0f;
 
-		divx = v2d->mask.xmax-v2d->mask.xmin;
-		divy = v2d->mask.ymax-v2d->mask.ymin;
+		divx = v2d->mask.xmax - v2d->mask.xmin;
+		divy = v2d->mask.ymax - v2d->mask.ymin;
 
-		r_vec[0] = (v2d->cur.xmax-v2d->cur.xmin)*(dx)/divx;
-		r_vec[1] = (v2d->cur.ymax-v2d->cur.ymin)*(dy)/divy;
+		mulx = (v2d->cur.xmax - v2d->cur.xmin);
+		muly = (v2d->cur.ymax - v2d->cur.ymin);
+
+		if (t->options & CTX_MASK) {
+			/* clamp w/h, mask only */
+			divx = divy = maxf(divx, divy);
+			mulx = muly = minf(mulx, muly);
+		}
+
+		r_vec[0] = mulx * (dx) / divx;
+		r_vec[1] = muly * (dy) / divy;
 		r_vec[2] = 0.0f;
+
+		if (t->options & CTX_MOVIECLIP) {
+			ED_space_clip_aspect_dimension_aware(t->sa->spacedata.first, &aspx, &aspy);
+		}
+		else if (t->options & CTX_MASK) {
+			/* TODO - NOT WORKING, this isnt so bad since its only display aspect */
+			ED_space_clip_mask_aspect(t->sa->spacedata.first, &aspx, &aspy);
+		}
+
+		r_vec[0] *= aspx;
+		r_vec[1] *= aspy;
 	}
 	else {
 		printf("%s: called in an invalid context\n", __func__);
@@ -178,18 +201,18 @@ void convertViewVec(TransInfo *t, float r_vec[3], int dx, int dy)
 
 void projectIntView(TransInfo *t, const float vec[3], int adr[2])
 {
-	if (t->spacetype==SPACE_VIEW3D) {
+	if (t->spacetype == SPACE_VIEW3D) {
 		if (t->ar->regiontype == RGN_TYPE_WINDOW)
 			project_int_noclip(t->ar, vec, adr);
 	}
-	else if (t->spacetype==SPACE_IMAGE) {
+	else if (t->spacetype == SPACE_IMAGE) {
 		float aspx, aspy, v[2];
 
 		ED_space_image_uv_aspect(t->sa->spacedata.first, &aspx, &aspy);
-		v[0]= vec[0]/aspx;
-		v[1]= vec[1]/aspy;
+		v[0] = vec[0] / aspx;
+		v[1] = vec[1] / aspy;
 
-		UI_view2d_to_region_no_clip(t->view, v[0], v[1], adr, adr+1);
+		UI_view2d_to_region_no_clip(t->view, v[0], v[1], adr, adr + 1);
 	}
 	else if (t->spacetype == SPACE_ACTION) {
 		int out[2] = {0, 0};
@@ -199,37 +222,46 @@ void projectIntView(TransInfo *t, const float vec[3], int adr[2])
 		if (sact->flag & SACTION_DRAWTIME) {
 			//vec[0] = vec[0]/((t->scene->r.frs_sec / t->scene->r.frs_sec_base));
 			/* same as below */
-			UI_view2d_to_region_no_clip((View2D *)t->view, vec[0], vec[1], out, out+1);
+			UI_view2d_to_region_no_clip((View2D *)t->view, vec[0], vec[1], out, out + 1);
 		} 
 		else
 #endif
 		{
-			UI_view2d_to_region_no_clip((View2D *)t->view, vec[0], vec[1], out, out+1);
+			UI_view2d_to_region_no_clip((View2D *)t->view, vec[0], vec[1], out, out + 1);
 		}
 
-		adr[0]= out[0];
-		adr[1]= out[1];
+		adr[0] = out[0];
+		adr[1] = out[1];
 	}
 	else if (ELEM(t->spacetype, SPACE_IPO, SPACE_NLA)) {
 		int out[2] = {0, 0};
 
-		UI_view2d_to_region_no_clip((View2D *)t->view, vec[0], vec[1], out, out+1);
-		adr[0]= out[0];
-		adr[1]= out[1];
+		UI_view2d_to_region_no_clip((View2D *)t->view, vec[0], vec[1], out, out + 1);
+		adr[0] = out[0];
+		adr[1] = out[1];
 	}
-	else if (t->spacetype==SPACE_SEQ) { /* XXX not tested yet, but should work */
+	else if (t->spacetype == SPACE_SEQ) { /* XXX not tested yet, but should work */
 		int out[2] = {0, 0};
 
-		UI_view2d_to_region_no_clip((View2D *)t->view, vec[0], vec[1], out, out+1);
-		adr[0]= out[0];
-		adr[1]= out[1];
+		UI_view2d_to_region_no_clip((View2D *)t->view, vec[0], vec[1], out, out + 1);
+		adr[0] = out[0];
+		adr[1] = out[1];
 	}
-	else if (t->spacetype==SPACE_CLIP) {
+	else if (t->spacetype == SPACE_CLIP) {
 		float v[2];
+		float aspx = 1.0f, aspy = 1.0f;
 
 		copy_v2_v2(v, vec);
 
-		UI_view2d_to_region_no_clip(t->view, v[0], v[1], adr, adr+1);
+		if (t->options & CTX_MOVIECLIP)
+			ED_space_clip_aspect_dimension_aware(t->sa->spacedata.first, &aspx, &aspy);
+		else if (t->options & CTX_MASK)
+			ED_space_clip_mask_aspect(t->sa->spacedata.first, &aspx, &aspy);
+
+		v[0] /= aspx;
+		v[1] /= aspy;
+
+		UI_view2d_to_region_no_clip(t->view, v[0], v[1], adr, adr + 1);
 	}
 }
 
@@ -262,11 +294,11 @@ void projectFloatView(TransInfo *t, const float vec[3], float adr[2])
 
 void applyAspectRatio(TransInfo *t, float vec[2])
 {
-	if ((t->spacetype==SPACE_IMAGE) && (t->mode==TFM_TRANSLATION)) {
-		SpaceImage *sima= t->sa->spacedata.first;
+	if ((t->spacetype == SPACE_IMAGE) && (t->mode == TFM_TRANSLATION)) {
+		SpaceImage *sima = t->sa->spacedata.first;
 		float aspx, aspy;
 
-		if ((sima->flag & SI_COORDFLOATS)==0) {
+		if ((sima->flag & SI_COORDFLOATS) == 0) {
 			int width, height;
 			ED_space_image_size(sima, &width, &height);
 
@@ -278,28 +310,35 @@ void applyAspectRatio(TransInfo *t, float vec[2])
 		vec[0] /= aspx;
 		vec[1] /= aspy;
 	}
-	else if ((t->spacetype==SPACE_CLIP) && (t->mode==TFM_TRANSLATION)) {
-		if (t->options & CTX_MOVIECLIP) {
+	else if ((t->spacetype == SPACE_CLIP) && (t->mode == TFM_TRANSLATION)) {
+		if (t->options & (CTX_MOVIECLIP | CTX_MASK)) {
 			SpaceClip *sc = t->sa->spacedata.first;
 			float aspx, aspy;
-			int width, height;
 
-			ED_space_clip_size(sc, &width, &height);
-			ED_space_clip_aspect(sc, &aspx, &aspy);
 
-			vec[0] *= width / aspx;
-			vec[1] *= height / aspy;
+			if (t->options & CTX_MOVIECLIP) {
+				ED_space_clip_aspect_dimension_aware(sc, &aspx, &aspy);
+
+				vec[0] /= aspx;
+				vec[1] /= aspy;
+			}
+			else if (t->options & CTX_MASK) {
+				ED_space_clip_mask_aspect(sc, &aspx, &aspy);
+
+				vec[0] /= aspx;
+				vec[1] /= aspy;
+			}
 		}
 	}
 }
 
 void removeAspectRatio(TransInfo *t, float vec[2])
 {
-	if ((t->spacetype==SPACE_IMAGE) && (t->mode==TFM_TRANSLATION)) {
-		SpaceImage *sima= t->sa->spacedata.first;
+	if ((t->spacetype == SPACE_IMAGE) && (t->mode == TFM_TRANSLATION)) {
+		SpaceImage *sima = t->sa->spacedata.first;
 		float aspx, aspy;
 
-		if ((sima->flag & SI_COORDFLOATS)==0) {
+		if ((sima->flag & SI_COORDFLOATS) == 0) {
 			int width, height;
 			ED_space_image_size(sima, &width, &height);
 
@@ -311,17 +350,20 @@ void removeAspectRatio(TransInfo *t, float vec[2])
 		vec[0] *= aspx;
 		vec[1] *= aspy;
 	}
-	else if ((t->spacetype==SPACE_CLIP) && (t->mode==TFM_TRANSLATION)) {
-		if (t->options & CTX_MOVIECLIP) {
+	else if ((t->spacetype == SPACE_CLIP) && (t->mode == TFM_TRANSLATION)) {
+		if (t->options & (CTX_MOVIECLIP | CTX_MASK)) {
 			SpaceClip *sc = t->sa->spacedata.first;
-			float aspx, aspy;
-			int width, height;
+			float aspx = 1.0f, aspy = 1.0f;
 
-			ED_space_clip_size(sc, &width, &height);
-			ED_space_clip_aspect(sc, &aspx, &aspy);
+			if (t->options & CTX_MOVIECLIP) {
+				ED_space_clip_aspect_dimension_aware(sc, &aspx, &aspy);
+			}
+			else if (t->options & CTX_MASK) {
+				ED_space_clip_mask_aspect(sc, &aspx, &aspy);
+			}
 
-			vec[0] *= aspx / width;
-			vec[1] *= aspy / height;
+			vec[0] *= aspx;
+			vec[1] *= aspy;
 		}
 	}
 }
@@ -331,48 +373,56 @@ static void viewRedrawForce(const bContext *C, TransInfo *t)
 	if (t->spacetype == SPACE_VIEW3D) {
 		/* Do we need more refined tags? */
 		if (t->flag & T_POSE)
-			WM_event_add_notifier(C, NC_OBJECT|ND_POSE, NULL);
+			WM_event_add_notifier(C, NC_OBJECT | ND_POSE, NULL);
 		else
-			WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
+			WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 		
 		/* for realtime animation record - send notifiers recognised by animation editors */
 		// XXX: is this notifier a lame duck?
 		if ((t->animtimer) && IS_AUTOKEY_ON(t->scene))
-			WM_event_add_notifier(C, NC_OBJECT|ND_KEYS, NULL);
+			WM_event_add_notifier(C, NC_OBJECT | ND_KEYS, NULL);
 		
 	}
 	else if (t->spacetype == SPACE_ACTION) {
 		//SpaceAction *saction= (SpaceAction *)t->sa->spacedata.first;
-		WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
+		WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
 	}
 	else if (t->spacetype == SPACE_IPO) {
 		//SpaceIpo *sipo= (SpaceIpo *)t->sa->spacedata.first;
-		WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
+		WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
 	}
 	else if (t->spacetype == SPACE_NLA) {
-		WM_event_add_notifier(C, NC_ANIMATION|ND_NLA|NA_EDITED, NULL);
+		WM_event_add_notifier(C, NC_ANIMATION | ND_NLA | NA_EDITED, NULL);
 	}
 	else if (t->spacetype == SPACE_NODE) {
 		//ED_area_tag_redraw(t->sa);
-		WM_event_add_notifier(C, NC_SPACE|ND_SPACE_NODE_VIEW, NULL);
+		WM_event_add_notifier(C, NC_SPACE | ND_SPACE_NODE_VIEW, NULL);
 	}
 	else if (t->spacetype == SPACE_SEQ) {
-		WM_event_add_notifier(C, NC_SCENE|ND_SEQUENCER, NULL);
+		WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, NULL);
 	}
-	else if (t->spacetype==SPACE_IMAGE) {
+	else if (t->spacetype == SPACE_IMAGE) {
 		// XXX how to deal with lock?
-		SpaceImage *sima= (SpaceImage*)t->sa->spacedata.first;
-		if (sima->lock) WM_event_add_notifier(C, NC_GEOM|ND_DATA, t->obedit->data);
+		SpaceImage *sima = (SpaceImage *)t->sa->spacedata.first;
+		if (sima->lock) WM_event_add_notifier(C, NC_GEOM | ND_DATA, t->obedit->data);
 		else ED_area_tag_redraw(t->sa);
 	}
-	else if (t->spacetype==SPACE_CLIP) {
-		SpaceClip *sc = (SpaceClip*)t->sa->spacedata.first;
-		MovieClip *clip = ED_space_clip(sc);
+	else if (t->spacetype == SPACE_CLIP) {
+		SpaceClip *sc = (SpaceClip *)t->sa->spacedata.first;
+
+		if (ED_space_clip_show_trackedit(sc)) {
+			MovieClip *clip = ED_space_clip(sc);
 
-		/* objects could be parented to tracking data, so send this for viewport refresh */
-		WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
+			/* objects could be parented to tracking data, so send this for viewport refresh */
+			WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 
-		WM_event_add_notifier(C, NC_MOVIECLIP|NA_EDITED, clip);
+			WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, clip);
+		}
+		else if (ED_space_clip_show_maskedit(sc)) {
+			Mask *mask = ED_space_clip_mask(sc);
+
+			WM_event_add_notifier(C, NC_MASK | NA_EDITED, mask);
+		}
 	}
 }
 
@@ -383,19 +433,19 @@ static void viewRedrawPost(bContext *C, TransInfo *t)
 	if (t->spacetype == SPACE_VIEW3D) {
 		/* if autokeying is enabled, send notifiers that keyframes were added */
 		if (IS_AUTOKEY_ON(t->scene))
-			WM_main_add_notifier(NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL);
+			WM_main_add_notifier(NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
 		
 		/* XXX temp, first hack to get auto-render in compositor work (ton) */
-		WM_event_add_notifier(C, NC_SCENE|ND_TRANSFORM_DONE, CTX_data_scene(C));
+		WM_event_add_notifier(C, NC_SCENE | ND_TRANSFORM_DONE, CTX_data_scene(C));
 
 	}
 	
 #if 0 // TRANSFORM_FIX_ME
-	if (t->spacetype==SPACE_VIEW3D) {
+	if (t->spacetype == SPACE_VIEW3D) {
 		allqueue(REDRAWBUTSOBJECT, 0);
 		allqueue(REDRAWVIEW3D, 0);
 	}
-	else if (t->spacetype==SPACE_IMAGE) {
+	else if (t->spacetype == SPACE_IMAGE) {
 		allqueue(REDRAWIMAGE, 0);
 		allqueue(REDRAWVIEW3D, 0);
 	}
@@ -419,7 +469,7 @@ void BIF_selectOrientation(void)
 #if 0 // TRANSFORM_FIX_ME
 	short val;
 	char *str_menu = BIF_menustringTransformOrientation("Orientation");
-	val= pupmenu(str_menu);
+	val = pupmenu(str_menu);
 	MEM_freeN(str_menu);
 
 	if (val >= 0) {
@@ -447,8 +497,8 @@ static void view_editmove(unsigned short UNUSED(event))
 	switch (event) {
 		case WHEELUPMOUSE:
 
-			if ( G.qual & LR_SHIFTKEY ) {
-				if ( G.qual & LR_ALTKEY ) {
+			if (G.qual & LR_SHIFTKEY) {
+				if (G.qual & LR_ALTKEY) {
 					G.qual &= ~LR_SHIFTKEY;
 					persptoetsen(PAD2);
 					G.qual |= LR_SHIFTKEY;
@@ -457,8 +507,8 @@ static void view_editmove(unsigned short UNUSED(event))
 					persptoetsen(PAD2);
 				}
 			}
-			else if ( G.qual & LR_CTRLKEY ) {
-				if ( G.qual & LR_ALTKEY ) {
+			else if (G.qual & LR_CTRLKEY) {
+				if (G.qual & LR_ALTKEY) {
 					G.qual &= ~LR_CTRLKEY;
 					persptoetsen(PAD4);
 					G.qual |= LR_CTRLKEY;
@@ -475,8 +525,8 @@ static void view_editmove(unsigned short UNUSED(event))
 			refresh = 1;
 			break;
 		case WHEELDOWNMOUSE:
-			if ( G.qual & LR_SHIFTKEY ) {
-				if ( G.qual & LR_ALTKEY ) {
+			if (G.qual & LR_SHIFTKEY) {
+				if (G.qual & LR_ALTKEY) {
 					G.qual &= ~LR_SHIFTKEY;
 					persptoetsen(PAD8);
 					G.qual |= LR_SHIFTKEY;
@@ -485,8 +535,8 @@ static void view_editmove(unsigned short UNUSED(event))
 					persptoetsen(PAD8);
 				}
 			}
-			else if ( G.qual & LR_CTRLKEY ) {
-				if ( G.qual & LR_ALTKEY ) {
+			else if (G.qual & LR_CTRLKEY) {
+				if (G.qual & LR_ALTKEY) {
 					G.qual &= ~LR_CTRLKEY;
 					persptoetsen(PAD6);
 					G.qual |= LR_CTRLKEY;
@@ -512,73 +562,71 @@ static void view_editmove(unsigned short UNUSED(event))
 /* ************************************************* */
 
 /* NOTE: these defines are saved in keymap files, do not change values but just add new ones */
-#define TFM_MODAL_CANCEL		1
-#define TFM_MODAL_CONFIRM		2
-#define TFM_MODAL_TRANSLATE		3
-#define TFM_MODAL_ROTATE		4
-#define TFM_MODAL_RESIZE		5
-#define TFM_MODAL_SNAP_INV_ON	6
-#define TFM_MODAL_SNAP_INV_OFF	7
-#define TFM_MODAL_SNAP_TOGGLE	8
-#define TFM_MODAL_AXIS_X		9
-#define TFM_MODAL_AXIS_Y		10
-#define TFM_MODAL_AXIS_Z		11
-#define TFM_MODAL_PLANE_X		12
-#define TFM_MODAL_PLANE_Y		13
-#define TFM_MODAL_PLANE_Z		14
-#define TFM_MODAL_CONS_OFF		15
-#define TFM_MODAL_ADD_SNAP		16
-#define TFM_MODAL_REMOVE_SNAP	17
+#define TFM_MODAL_CANCEL        1
+#define TFM_MODAL_CONFIRM       2
+#define TFM_MODAL_TRANSLATE     3
+#define TFM_MODAL_ROTATE        4
+#define TFM_MODAL_RESIZE        5
+#define TFM_MODAL_SNAP_INV_ON   6
+#define TFM_MODAL_SNAP_INV_OFF  7
+#define TFM_MODAL_SNAP_TOGGLE   8
+#define TFM_MODAL_AXIS_X        9
+#define TFM_MODAL_AXIS_Y        10
+#define TFM_MODAL_AXIS_Z        11
+#define TFM_MODAL_PLANE_X       12
+#define TFM_MODAL_PLANE_Y       13
+#define TFM_MODAL_PLANE_Z       14
+#define TFM_MODAL_CONS_OFF      15
+#define TFM_MODAL_ADD_SNAP      16
+#define TFM_MODAL_REMOVE_SNAP   17
 /*	18 and 19 used by numinput, defined in transform.h
  * */
-#define TFM_MODAL_PROPSIZE_UP	20
-#define TFM_MODAL_PROPSIZE_DOWN	21
+#define TFM_MODAL_PROPSIZE_UP   20
+#define TFM_MODAL_PROPSIZE_DOWN 21
 #define TFM_MODAL_AUTOIK_LEN_INC 22
 #define TFM_MODAL_AUTOIK_LEN_DEC 23
 
 #define TFM_MODAL_EDGESLIDE_UP 24
 #define TFM_MODAL_EDGESLIDE_DOWN 25
 
-#define TFM_WHEEL_DOWN_EVT TFM_MODAL_PROPSIZE_DOWN|TFM_MODAL_EDGESLIDE_DOWN
-#define TFM_WHEEL_UP_EVT TFM_MODAL_PROPSIZE_UP|TFM_MODAL_EDGESLIDE_UP
-
 /* called in transform_ops.c, on each regeneration of keymaps */
-wmKeyMap* transform_modal_keymap(wmKeyConfig *keyconf)
+wmKeyMap *transform_modal_keymap(wmKeyConfig *keyconf)
 {
 	static EnumPropertyItem modal_items[] = {
-	{TFM_MODAL_CANCEL, "CANCEL", 0, "Cancel", ""},
-	{TFM_MODAL_CONFIRM, "CONFIRM", 0, "Confirm", ""},
-	{TFM_MODAL_TRANSLATE, "TRANSLATE", 0, "Translate", ""},
-	{TFM_MODAL_ROTATE, "ROTATE", 0, "Rotate", ""},
-	{TFM_MODAL_RESIZE, "RESIZE", 0, "Resize", ""},
-	{TFM_MODAL_SNAP_INV_ON, "SNAP_INV_ON", 0, "Invert Snap On", ""},
-	{TFM_MODAL_SNAP_INV_OFF, "SNAP_INV_OFF", 0, "Invert Snap Off", ""},
-	{TFM_MODAL_SNAP_TOGGLE, "SNAP_TOGGLE", 0, "Snap Toggle", ""},
-	{TFM_MODAL_AXIS_X, "AXIS_X", 0, "Orientation X axis", ""},
-	{TFM_MODAL_AXIS_Y, "AXIS_Y", 0, "Orientation Y axis", ""},
-	{TFM_MODAL_AXIS_Z, "AXIS_Z", 0, "Orientation Z axis", ""},
-	{TFM_MODAL_PLANE_X, "PLANE_X", 0, "Orientation X plane", ""},
-	{TFM_MODAL_PLANE_Y, "PLANE_Y", 0, "Orientation Y plane", ""},
-	{TFM_MODAL_PLANE_Z, "PLANE_Z", 0, "Orientation Z plane", ""},
-	{TFM_MODAL_CONS_OFF, "CONS_OFF", 0, "Remove Constraints", ""},
-	{TFM_MODAL_ADD_SNAP, "ADD_SNAP", 0, "Add Snap Point", ""},
-	{TFM_MODAL_REMOVE_SNAP, "REMOVE_SNAP", 0, "Remove Last Snap Point", ""},
-	{NUM_MODAL_INCREMENT_UP, "INCREMENT_UP", 0, "Numinput Increment Up", ""},
-	{NUM_MODAL_INCREMENT_DOWN, "INCREMENT_DOWN", 0, "Numinput Increment Down", ""},
-	{TFM_MODAL_PROPSIZE_UP, "PROPORTIONAL_SIZE_UP", 0, "Increase Proportional Influence", ""},
-	{TFM_MODAL_PROPSIZE_DOWN, "PROPORTIONAL_SIZE_DOWN", 0, "Decrease Proportional Influence", ""},
-	{TFM_MODAL_AUTOIK_LEN_INC, "AUTOIK_CHAIN_LEN_UP", 0, "Increase Max AutoIK Chain Length", ""},
-	{TFM_MODAL_AUTOIK_LEN_DEC, "AUTOIK_CHAIN_LEN_DOWN", 0, "Decrease Max AutoIK Chain Length", ""},
-	{TFM_MODAL_EDGESLIDE_UP, "EDGESLIDE_EDGE_NEXT", 0, "Select next Edge Slide Edge", ""},
-	{TFM_MODAL_EDGESLIDE_DOWN, "EDGESLIDE_PREV_NEXT", 0, "Select previous Edge Slide Edge", ""},
-	{0, NULL, 0, NULL, NULL}};
-	
-	wmKeyMap *keymap= WM_modalkeymap_get(keyconf, "Transform Modal Map");
+		{TFM_MODAL_CANCEL, "CANCEL", 0, "Cancel", ""},
+		{TFM_MODAL_CONFIRM, "CONFIRM", 0, "Confirm", ""},
+		{TFM_MODAL_TRANSLATE, "TRANSLATE", 0, "Translate", ""},
+		{TFM_MODAL_ROTATE, "ROTATE", 0, "Rotate", ""},
+		{TFM_MODAL_RESIZE, "RESIZE", 0, "Resize", ""},
+		{TFM_MODAL_SNAP_INV_ON, "SNAP_INV_ON", 0, "Invert Snap On", ""},
+		{TFM_MODAL_SNAP_INV_OFF, "SNAP_INV_OFF", 0, "Invert Snap Off", ""},
+		{TFM_MODAL_SNAP_TOGGLE, "SNAP_TOGGLE", 0, "Snap Toggle", ""},
+		{TFM_MODAL_AXIS_X, "AXIS_X", 0, "Orientation X axis", ""},
+		{TFM_MODAL_AXIS_Y, "AXIS_Y", 0, "Orientation Y axis", ""},
+		{TFM_MODAL_AXIS_Z, "AXIS_Z", 0, "Orientation Z axis", ""},
+		{TFM_MODAL_PLANE_X, "PLANE_X", 0, "Orientation X plane", ""},
+		{TFM_MODAL_PLANE_Y, "PLANE_Y", 0, "Orientation Y plane", ""},
+		{TFM_MODAL_PLANE_Z, "PLANE_Z", 0, "Orientation Z plane", ""},
+		{TFM_MODAL_CONS_OFF, "CONS_OFF", 0, "Remove Constraints", ""},
+		{TFM_MODAL_ADD_SNAP, "ADD_SNAP", 0, "Add Snap Point", ""},
+		{TFM_MODAL_REMOVE_SNAP, "REMOVE_SNAP", 0, "Remove Last Snap Point", ""},
+		{NUM_MODAL_INCREMENT_UP, "INCREMENT_UP", 0, "Numinput Increment Up", ""},
+		{NUM_MODAL_INCREMENT_DOWN, "INCREMENT_DOWN", 0, "Numinput Increment Down", ""},
+		{TFM_MODAL_PROPSIZE_UP, "PROPORTIONAL_SIZE_UP", 0, "Increase Proportional Influence", ""},
+		{TFM_MODAL_PROPSIZE_DOWN, "PROPORTIONAL_SIZE_DOWN", 0, "Decrease Proportional Influence", ""},
+		{TFM_MODAL_AUTOIK_LEN_INC, "AUTOIK_CHAIN_LEN_UP", 0, "Increase Max AutoIK Chain Length", ""},
+		{TFM_MODAL_AUTOIK_LEN_DEC, "AUTOIK_CHAIN_LEN_DOWN", 0, "Decrease Max AutoIK Chain Length", ""},
+		{TFM_MODAL_EDGESLIDE_UP, "EDGESLIDE_EDGE_NEXT", 0, "Select next Edge Slide Edge", ""},
+		{TFM_MODAL_EDGESLIDE_DOWN, "EDGESLIDE_PREV_NEXT", 0, "Select previous Edge Slide Edge", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+	
+	wmKeyMap *keymap = WM_modalkeymap_get(keyconf, "Transform Modal Map");
 	
 	/* this function is called for each spacetype, only needs to add map once */
 	if (keymap && keymap->modal_items) return NULL;
 	
-	keymap= WM_modalkeymap_add(keyconf, "Transform Modal Map", modal_items);
+	keymap = WM_modalkeymap_add(keyconf, "Transform Modal Map", modal_items);
 	
 	/* items for modal map */
 	WM_modalkeymap_add_item(keymap, ESCKEY,    KM_PRESS, KM_ANY, 0, TFM_MODAL_CANCEL);
@@ -603,8 +651,11 @@ wmKeyMap* transform_modal_keymap(wmKeyConfig *keyconf)
 
 	WM_modalkeymap_add_item(keymap, PAGEUPKEY, KM_PRESS, 0, 0, TFM_MODAL_PROPSIZE_UP);
 	WM_modalkeymap_add_item(keymap, PAGEDOWNKEY, KM_PRESS, 0, 0, TFM_MODAL_PROPSIZE_DOWN);
-	WM_modalkeymap_add_item(keymap, WHEELDOWNMOUSE, KM_PRESS, 0, 0, TFM_WHEEL_UP_EVT);
-	WM_modalkeymap_add_item(keymap, WHEELUPMOUSE, KM_PRESS, 0, 0, TFM_WHEEL_DOWN_EVT);
+	WM_modalkeymap_add_item(keymap, WHEELDOWNMOUSE, KM_PRESS, 0, 0, TFM_MODAL_PROPSIZE_UP);
+	WM_modalkeymap_add_item(keymap, WHEELUPMOUSE, KM_PRESS, 0, 0, TFM_MODAL_PROPSIZE_DOWN);
+
+	WM_modalkeymap_add_item(keymap, WHEELDOWNMOUSE, KM_PRESS, KM_ALT, 0, TFM_MODAL_EDGESLIDE_UP);
+	WM_modalkeymap_add_item(keymap, WHEELUPMOUSE, KM_PRESS, KM_ALT, 0, TFM_MODAL_EDGESLIDE_DOWN);
 	
 	WM_modalkeymap_add_item(keymap, PAGEUPKEY, KM_PRESS, KM_SHIFT, 0, TFM_MODAL_AUTOIK_LEN_INC);
 	WM_modalkeymap_add_item(keymap, PAGEDOWNKEY, KM_PRESS, KM_SHIFT, 0, TFM_MODAL_AUTOIK_LEN_DEC);
@@ -645,8 +696,7 @@ static void transform_event_xyz_constraint(TransInfo *t, short key_type, char cm
 		msg1[sizeof(msg1) - 2] = axis;
 		msg2[sizeof(msg2) - 2] = axis;
 		msg3[sizeof(msg3) - 2] = axis;
-		constraint_plane = ((CON_AXIS0 | CON_AXIS1 | CON_AXIS2) &
-							(~constraint_axis));
+		constraint_plane = ((CON_AXIS0 | CON_AXIS1 | CON_AXIS2) & (~constraint_axis));
 
 		if (edit_2d && (key_type != ZKEY)) {
 			if (cmode == axis) {
@@ -663,7 +713,7 @@ static void transform_event_xyz_constraint(TransInfo *t, short key_type, char cm
 				}
 				else {
 					short orientation = (t->current_orientation != V3D_MANIP_GLOBAL ?
-										 t->current_orientation : V3D_MANIP_LOCAL);
+					                     t->current_orientation : V3D_MANIP_LOCAL);
 					if (!(t->modifiers & MOD_CONSTRAINT_PLANE))
 						setUserConstraint(t, orientation, constraint_axis, msg2);
 					else if (t->modifiers & MOD_CONSTRAINT_PLANE)
@@ -683,7 +733,7 @@ static void transform_event_xyz_constraint(TransInfo *t, short key_type, char cm
 
 int transformEvent(TransInfo *t, wmEvent *event)
 {
-	float mati[3][3]= MAT3_UNITY;
+	float mati[3][3] = MAT3_UNITY;
 	char cmode = constraintModeToChar(t);
 	int handled = 1;
 
@@ -720,7 +770,7 @@ int transformEvent(TransInfo *t, wmEvent *event)
 				break;
 			case TFM_MODAL_TRANSLATE:
 				/* only switch when... */
-				if ( ELEM3(t->mode, TFM_ROTATION, TFM_RESIZE, TFM_TRACKBALL) ) {
+				if (ELEM3(t->mode, TFM_ROTATION, TFM_RESIZE, TFM_TRACKBALL) ) {
 					resetTransRestrictions(t);
 					restoreTransObjects(t);
 					initTranslation(t);
@@ -728,7 +778,7 @@ int transformEvent(TransInfo *t, wmEvent *event)
 					t->redraw |= TREDRAW_HARD;
 				}
 				else if (t->mode == TFM_TRANSLATION) {
-					if (t->options & CTX_MOVIECLIP) {
+					if (t->options & (CTX_MOVIECLIP | CTX_MASK)) {
 						restoreTransObjects(t);
 
 						t->flag ^= T_ALT_TRANSFORM;
@@ -738,8 +788,8 @@ int transformEvent(TransInfo *t, wmEvent *event)
 				break;
 			case TFM_MODAL_ROTATE:
 				/* only switch when... */
-				if (!(t->options & CTX_TEXTURE) && !(t->options & CTX_MOVIECLIP)) {
-					if ( ELEM4(t->mode, TFM_ROTATION, TFM_RESIZE, TFM_TRACKBALL, TFM_TRANSLATION) ) {
+				if (!(t->options & CTX_TEXTURE) && !(t->options & (CTX_MOVIECLIP | CTX_MASK))) {
+					if (ELEM4(t->mode, TFM_ROTATION, TFM_RESIZE, TFM_TRACKBALL, TFM_TRANSLATION) ) {
 						
 						resetTransRestrictions(t);
 						
@@ -758,13 +808,21 @@ int transformEvent(TransInfo *t, wmEvent *event)
 				break;
 			case TFM_MODAL_RESIZE:
 				/* only switch when... */
-				if ( ELEM3(t->mode, TFM_ROTATION, TFM_TRANSLATION, TFM_TRACKBALL) ) {
+				if (ELEM3(t->mode, TFM_ROTATION, TFM_TRANSLATION, TFM_TRACKBALL) ) {
 					resetTransRestrictions(t);
 					restoreTransObjects(t);
 					initResize(t);
 					initSnapping(t, NULL); // need to reinit after mode change
 					t->redraw |= TREDRAW_HARD;
 				}
+				else if (t->mode == TFM_RESIZE) {
+					if (t->options & CTX_MOVIECLIP) {
+						restoreTransObjects(t);
+
+						t->flag ^= T_ALT_TRANSFORM;
+						t->redraw |= TREDRAW_HARD;
+					}
+				}
 				break;
 				
 			case TFM_MODAL_SNAP_INV_ON:
@@ -780,7 +838,7 @@ int transformEvent(TransInfo *t, wmEvent *event)
 				t->redraw |= TREDRAW_HARD;
 				break;
 			case TFM_MODAL_AXIS_X:
-				if ((t->flag & T_NO_CONSTRAINT)==0) {
+				if ((t->flag & T_NO_CONSTRAINT) == 0) {
 					if (cmode == 'X') {
 						stopConstraint(t);
 					}
@@ -796,7 +854,7 @@ int transformEvent(TransInfo *t, wmEvent *event)
 				}
 				break;
 			case TFM_MODAL_AXIS_Y:
-				if ((t->flag & T_NO_CONSTRAINT)==0) {
+				if ((t->flag & T_NO_CONSTRAINT) == 0) {
 					if (cmode == 'Y') {
 						stopConstraint(t);
 					}
@@ -812,7 +870,7 @@ int transformEvent(TransInfo *t, wmEvent *event)
 				}
 				break;
 			case TFM_MODAL_AXIS_Z:
-				if ((t->flag & (T_NO_CONSTRAINT|T_2D_EDIT))== 0) {
+				if ((t->flag & (T_NO_CONSTRAINT | T_2D_EDIT)) == 0) {
 					if (cmode == 'Z') {
 						stopConstraint(t);
 					}
@@ -823,40 +881,40 @@ int transformEvent(TransInfo *t, wmEvent *event)
 				}
 				break;
 			case TFM_MODAL_PLANE_X:
-				if ((t->flag & (T_NO_CONSTRAINT|T_2D_EDIT))== 0) {
+				if ((t->flag & (T_NO_CONSTRAINT | T_2D_EDIT)) == 0) {
 					if (cmode == 'X') {
 						stopConstraint(t);
 					}
 					else {
-						setUserConstraint(t, t->current_orientation, (CON_AXIS1|CON_AXIS2), "locking %s X");
+						setUserConstraint(t, t->current_orientation, (CON_AXIS1 | CON_AXIS2), "locking %s X");
 					}
 					t->redraw |= TREDRAW_HARD;
 				}
 				break;
 			case TFM_MODAL_PLANE_Y:
-				if ((t->flag & (T_NO_CONSTRAINT|T_2D_EDIT))== 0) {
+				if ((t->flag & (T_NO_CONSTRAINT | T_2D_EDIT)) == 0) {
 					if (cmode == 'Y') {
 						stopConstraint(t);
 					}
 					else {
-						setUserConstraint(t, t->current_orientation, (CON_AXIS0|CON_AXIS2), "locking %s Y");
+						setUserConstraint(t, t->current_orientation, (CON_AXIS0 | CON_AXIS2), "locking %s Y");
 					}
 					t->redraw |= TREDRAW_HARD;
 				}
 				break;
 			case TFM_MODAL_PLANE_Z:
-				if ((t->flag & (T_NO_CONSTRAINT|T_2D_EDIT))== 0) {
+				if ((t->flag & (T_NO_CONSTRAINT | T_2D_EDIT)) == 0) {
 					if (cmode == 'Z') {
 						stopConstraint(t);
 					}
 					else {
-						setUserConstraint(t, t->current_orientation, (CON_AXIS0|CON_AXIS1), "locking %s Z");
+						setUserConstraint(t, t->current_orientation, (CON_AXIS0 | CON_AXIS1), "locking %s Z");
 					}
 					t->redraw |= TREDRAW_HARD;
 				}
 				break;
 			case TFM_MODAL_CONS_OFF:
-				if ((t->flag & T_NO_CONSTRAINT)==0) {
+				if ((t->flag & T_NO_CONSTRAINT) == 0) {
 					stopConstraint(t);
 					t->redraw |= TREDRAW_HARD;
 				}
@@ -869,22 +927,26 @@ int transformEvent(TransInfo *t, wmEvent *event)
 				removeSnapPoint(t);
 				t->redraw |= TREDRAW_HARD;
 				break;
-			case TFM_WHEEL_UP_EVT:
+			case TFM_MODAL_PROPSIZE_UP:
 				if (t->flag & T_PROP_EDIT) {
-					t->prop_size*= 1.1f;
-					if (t->spacetype==SPACE_VIEW3D && t->persp != RV3D_ORTHO)
-						t->prop_size= MIN2(t->prop_size, ((View3D *)t->view)->far);
+					t->prop_size *= 1.1f;
+					if (t->spacetype == SPACE_VIEW3D && t->persp != RV3D_ORTHO)
+						t->prop_size = MIN2(t->prop_size, ((View3D *)t->view)->far);
 					calculatePropRatio(t);
 				}
 				t->redraw |= TREDRAW_HARD;
 				break;
-			case TFM_WHEEL_DOWN_EVT:
+			case TFM_MODAL_PROPSIZE_DOWN:
 				if (t->flag & T_PROP_EDIT) {
-					t->prop_size*= 0.90909090f;
+					t->prop_size *= 0.90909090f;
 					calculatePropRatio(t);
 				}
 				t->redraw |= TREDRAW_HARD;
 				break;
+			case TFM_MODAL_EDGESLIDE_UP:
+			case TFM_MODAL_EDGESLIDE_DOWN:
+				t->redraw |= TREDRAW_HARD;
+				break;
 			case TFM_MODAL_AUTOIK_LEN_INC:
 				if (t->flag & T_AUTOIK)
 					transform_autoik_update(t, 1);
@@ -906,170 +968,170 @@ int transformEvent(TransInfo *t, wmEvent *event)
 	/* else do non-mapped events */
 	else if (event->val == KM_PRESS) {
 		switch (event->type) {
-		case RIGHTMOUSE:
-			t->state = TRANS_CANCEL;
-			break;
-		/* enforce redraw of transform when modifiers are used */
-		case LEFTSHIFTKEY:
-		case RIGHTSHIFTKEY:
-			t->modifiers |= MOD_CONSTRAINT_PLANE;
-			t->redraw |= TREDRAW_HARD;
-			break;
+			case RIGHTMOUSE:
+				t->state = TRANS_CANCEL;
+				break;
+			/* enforce redraw of transform when modifiers are used */
+			case LEFTSHIFTKEY:
+			case RIGHTSHIFTKEY:
+				t->modifiers |= MOD_CONSTRAINT_PLANE;
+				t->redraw |= TREDRAW_HARD;
+				break;
 
-		case SPACEKEY:
-			if ((t->spacetype==SPACE_VIEW3D) && event->alt) {
+			case SPACEKEY:
+				if ((t->spacetype == SPACE_VIEW3D) && event->alt) {
 #if 0 // TRANSFORM_FIX_ME
-				int mval[2];
+					int mval[2];
 
-				getmouseco_sc(mval);
-				BIF_selectOrientation();
-				calc_manipulator_stats(curarea);
-				copy_m3_m4(t->spacemtx, G.vd->twmat);
-				warp_pointer(mval[0], mval[1]);
+					getmouseco_sc(mval);
+					BIF_selectOrientation();
+					calc_manipulator_stats(curarea);
+					copy_m3_m4(t->spacemtx, G.vd->twmat);
+					warp_pointer(mval[0], mval[1]);
 #endif
-			}
-			else {
-				t->state = TRANS_CONFIRM;
-			}
-			break;
-
-		case MIDDLEMOUSE:
-			if ((t->flag & T_NO_CONSTRAINT)==0) {
-				/* exception for switching to dolly, or trackball, in camera view */
-				if (t->flag & T_CAMERA) {
-					if (t->mode==TFM_TRANSLATION)
-						setLocalConstraint(t, (CON_AXIS2), "along local Z");
-					else if (t->mode==TFM_ROTATION) {
-						restoreTransObjects(t);
-						initTrackball(t);
-					}
 				}
 				else {
-					t->modifiers |= MOD_CONSTRAINT_SELECT;
-					if (t->con.mode & CON_APPLY) {
-						stopConstraint(t);
+					t->state = TRANS_CONFIRM;
+				}
+				break;
+
+			case MIDDLEMOUSE:
+				if ((t->flag & T_NO_CONSTRAINT) == 0) {
+					/* exception for switching to dolly, or trackball, in camera view */
+					if (t->flag & T_CAMERA) {
+						if (t->mode == TFM_TRANSLATION)
+							setLocalConstraint(t, (CON_AXIS2), "along local Z");
+						else if (t->mode == TFM_ROTATION) {
+							restoreTransObjects(t);
+							initTrackball(t);
+						}
 					}
 					else {
-						if (event->shift) {
-							initSelectConstraint(t, t->spacemtx);
+						t->modifiers |= MOD_CONSTRAINT_SELECT;
+						if (t->con.mode & CON_APPLY) {
+							stopConstraint(t);
 						}
 						else {
-							/* bit hackish... but it prevents mmb select to print the orientation from menu */
-							strcpy(t->spacename, "global");
-							initSelectConstraint(t, mati);
+							if (event->shift) {
+								initSelectConstraint(t, t->spacemtx);
+							}
+							else {
+								/* bit hackish... but it prevents mmb select to print the orientation from menu */
+								strcpy(t->spacename, "global");
+								initSelectConstraint(t, mati);
+							}
+							postSelectConstraint(t);
 						}
-						postSelectConstraint(t);
 					}
+					t->redraw |= TREDRAW_HARD;
 				}
-				t->redraw |= TREDRAW_HARD;
-			}
-			break;
-		case ESCKEY:
-			t->state = TRANS_CANCEL;
-			break;
-		case PADENTER:
-		case RETKEY:
-			t->state = TRANS_CONFIRM;
-			break;
-		case GKEY:
-			/* only switch when... */
-			if ( ELEM3(t->mode, TFM_ROTATION, TFM_RESIZE, TFM_TRACKBALL) ) {
-				resetTransRestrictions(t);
-				restoreTransObjects(t);
-				initTranslation(t);
-				initSnapping(t, NULL); // need to reinit after mode change
-				t->redraw |= TREDRAW_HARD;
-			}
-			break;
-		case SKEY:
-			/* only switch when... */
-			if ( ELEM3(t->mode, TFM_ROTATION, TFM_TRANSLATION, TFM_TRACKBALL) ) {
-				resetTransRestrictions(t);
-				restoreTransObjects(t);
-				initResize(t);
-				initSnapping(t, NULL); // need to reinit after mode change
-				t->redraw |= TREDRAW_HARD;
-			}
-			break;
-		case RKEY:
-			/* only switch when... */
-			if (!(t->options & CTX_TEXTURE) && !(t->options & CTX_MOVIECLIP)) {
-				if ( ELEM4(t->mode, TFM_ROTATION, TFM_RESIZE, TFM_TRACKBALL, TFM_TRANSLATION) ) {
-
+				break;
+			case ESCKEY:
+				t->state = TRANS_CANCEL;
+				break;
+			case PADENTER:
+			case RETKEY:
+				t->state = TRANS_CONFIRM;
+				break;
+			case GKEY:
+				/* only switch when... */
+				if (ELEM3(t->mode, TFM_ROTATION, TFM_RESIZE, TFM_TRACKBALL) ) {
+					resetTransRestrictions(t);
+					restoreTransObjects(t);
+					initTranslation(t);
+					initSnapping(t, NULL); // need to reinit after mode change
+					t->redraw |= TREDRAW_HARD;
+				}
+				break;
+			case SKEY:
+				/* only switch when... */
+				if (ELEM3(t->mode, TFM_ROTATION, TFM_TRANSLATION, TFM_TRACKBALL) ) {
 					resetTransRestrictions(t);
+					restoreTransObjects(t);
+					initResize(t);
+					initSnapping(t, NULL); // need to reinit after mode change
+					t->redraw |= TREDRAW_HARD;
+				}
+				break;
+			case RKEY:
+				/* only switch when... */
+				if (!(t->options & CTX_TEXTURE)) {
+					if (ELEM4(t->mode, TFM_ROTATION, TFM_RESIZE, TFM_TRACKBALL, TFM_TRANSLATION) ) {
 
-					if (t->mode == TFM_ROTATION) {
-						restoreTransObjects(t);
-						initTrackball(t);
-					}
-					else {
-						restoreTransObjects(t);
-						initRotation(t);
+						resetTransRestrictions(t);
+
+						if (t->mode == TFM_ROTATION) {
+							restoreTransObjects(t);
+							initTrackball(t);
+						}
+						else {
+							restoreTransObjects(t);
+							initRotation(t);
+						}
+						initSnapping(t, NULL); // need to reinit after mode change
+						t->redraw |= TREDRAW_HARD;
 					}
-					initSnapping(t, NULL); // need to reinit after mode change
+				}
+				break;
+			case CKEY:
+				if (event->alt) {
+					t->flag ^= T_PROP_CONNECTED;
+					sort_trans_data_dist(t);
+					calculatePropRatio(t);
+					t->redraw = 1;
+				}
+				else {
+					stopConstraint(t);
 					t->redraw |= TREDRAW_HARD;
 				}
-			}
-			break;
-		case CKEY:
-			if (event->alt) {
-				t->flag ^= T_PROP_CONNECTED;
-				sort_trans_data_dist(t);
-				calculatePropRatio(t);
-				t->redraw= 1;
-			}
-			else {
-				stopConstraint(t);
-				t->redraw |= TREDRAW_HARD;
-			}
-			break;
-		case XKEY:
-		case YKEY:
-		case ZKEY:
-			transform_event_xyz_constraint(t, event->type, cmode);
-			break;
-		case OKEY:
-			if (t->flag & T_PROP_EDIT && event->shift) {
-				t->prop_mode = (t->prop_mode + 1) % PROP_MODE_MAX;
-				calculatePropRatio(t);
-				t->redraw |= TREDRAW_HARD;
-			}
-			break;
-		case PADPLUSKEY:
-			if (event->alt && t->flag & T_PROP_EDIT) {
-				t->prop_size *= 1.1f;
-				if (t->spacetype==SPACE_VIEW3D && t->persp != RV3D_ORTHO)
-					t->prop_size= MIN2(t->prop_size, ((View3D *)t->view)->far);
-				calculatePropRatio(t);
-			}
-			t->redraw= 1;
-			break;
-		case PAGEUPKEY:
-		case WHEELDOWNMOUSE:
-			if (t->flag & T_AUTOIK) {
-				transform_autoik_update(t, 1);
-			}
-			else view_editmove(event->type);
-			t->redraw= 1;
-			break;
-		case PADMINUS:
-			if (event->alt && t->flag & T_PROP_EDIT) {
-				t->prop_size*= 0.90909090f;
-				calculatePropRatio(t);
-			}
-			t->redraw= 1;
-			break;
-		case PAGEDOWNKEY:
-		case WHEELUPMOUSE:
-			if (t->flag & T_AUTOIK) {
-				transform_autoik_update(t, -1);
-			}
-			else view_editmove(event->type);
-			t->redraw= 1;
-			break;
-		default:
-			handled = 0;
-			break;
+				break;
+			case XKEY:
+			case YKEY:
+			case ZKEY:
+				transform_event_xyz_constraint(t, event->type, cmode);
+				break;
+			case OKEY:
+				if (t->flag & T_PROP_EDIT && event->shift) {
+					t->prop_mode = (t->prop_mode + 1) % PROP_MODE_MAX;
+					calculatePropRatio(t);
+					t->redraw |= TREDRAW_HARD;
+				}
+				break;
+			case PADPLUSKEY:
+				if (event->alt && t->flag & T_PROP_EDIT) {
+					t->prop_size *= 1.1f;
+					if (t->spacetype == SPACE_VIEW3D && t->persp != RV3D_ORTHO)
+						t->prop_size = MIN2(t->prop_size, ((View3D *)t->view)->far);
+					calculatePropRatio(t);
+				}
+				t->redraw = 1;
+				break;
+			case PAGEUPKEY:
+			case WHEELDOWNMOUSE:
+				if (t->flag & T_AUTOIK) {
+					transform_autoik_update(t, 1);
+				}
+				else view_editmove(event->type);
+				t->redraw = 1;
+				break;
+			case PADMINUS:
+				if (event->alt && t->flag & T_PROP_EDIT) {
+					t->prop_size *= 0.90909090f;
+					calculatePropRatio(t);
+				}
+				t->redraw = 1;
+				break;
+			case PAGEDOWNKEY:
+			case WHEELUPMOUSE:
+				if (t->flag & T_AUTOIK) {
+					transform_autoik_update(t, -1);
+				}
+				else view_editmove(event->type);
+				t->redraw = 1;
+				break;
+			default:
+				handled = 0;
+				break;
 		}
 
 		// Numerical input events
@@ -1079,30 +1141,30 @@ int transformEvent(TransInfo *t, wmEvent *event)
 		t->redraw |= handleSnapping(t, event);
 
 	}
-	else if (event->val==KM_RELEASE) {
+	else if (event->val == KM_RELEASE) {
 		switch (event->type) {
-		case LEFTSHIFTKEY:
-		case RIGHTSHIFTKEY:
-			t->modifiers &= ~MOD_CONSTRAINT_PLANE;
-			t->redraw |= TREDRAW_HARD;
-			break;
-
-		case MIDDLEMOUSE:
-			if ((t->flag & T_NO_CONSTRAINT)==0) {
-				t->modifiers &= ~MOD_CONSTRAINT_SELECT;
-				postSelectConstraint(t);
+			case LEFTSHIFTKEY:
+			case RIGHTSHIFTKEY:
+				t->modifiers &= ~MOD_CONSTRAINT_PLANE;
 				t->redraw |= TREDRAW_HARD;
-			}
-			break;
+				break;
+
+			case MIDDLEMOUSE:
+				if ((t->flag & T_NO_CONSTRAINT) == 0) {
+					t->modifiers &= ~MOD_CONSTRAINT_SELECT;
+					postSelectConstraint(t);
+					t->redraw |= TREDRAW_HARD;
+				}
+				break;
 //		case LEFTMOUSE:
 //		case RIGHTMOUSE:
 //			if (WM_modal_tweak_exit(event, t->event_type))
 ////			if (t->options & CTX_TWEAK)
 //				t->state = TRANS_CONFIRM;
 //			break;
-		default:
-			handled = 0;
-			break;
+			default:
+				handled = 0;
+				break;
 		}
 
 		/* confirm transform if launch key is released after mouse move */
@@ -1124,10 +1186,10 @@ int transformEvent(TransInfo *t, wmEvent *event)
 		return OPERATOR_PASS_THROUGH;
 }
 
-int calculateTransformCenter(bContext *C, int centerMode, float *cent3d, int *cent2d)
+int calculateTransformCenter(bContext *C, int centerMode, float cent3d[3], int cent2d[2])
 {
 	TransInfo *t = MEM_callocN(sizeof(TransInfo), "TransInfo data");
-	int success = 1;
+	int success;
 
 	t->state = TRANS_RUNNING;
 
@@ -1135,17 +1197,17 @@ int calculateTransformCenter(bContext *C, int centerMode, float *cent3d, int *ce
 
 	t->mode = TFM_DUMMY;
 
-	initTransInfo(C, t, NULL, NULL);	// internal data, mouse, vectors
+	initTransInfo(C, t, NULL, NULL);    // internal data, mouse, vectors
 
-	createTransData(C, t);				// make TransData structs from selection
+	createTransData(C, t);              // make TransData structs from selection
 
-	t->around = centerMode; 			// override userdefined mode
+	t->around = centerMode;             // override userdefined mode
 
 	if (t->total == 0) {
-		success = 0;
+		success = FALSE;
 	}
 	else {
-		success = 1;
+		success = TRUE;
 
 		calculateCenter(t);
 
@@ -1243,7 +1305,7 @@ static void drawArc(float size, float angle_start, float angle_end, int segments
 
 	glBegin(GL_LINE_STRIP);
 
-	for ( angle = angle_start; angle < angle_end; angle += delta) {
+	for (angle = angle_start; angle < angle_end; angle += delta) {
 		glVertex2f(cosf(angle) * size, sinf(angle) * size);
 	}
 	glVertex2f(cosf(angle_end) * size, sinf(angle_end) * size);
@@ -1253,35 +1315,35 @@ static void drawArc(float size, float angle_start, float angle_end, int segments
 
 static int helpline_poll(bContext *C)
 {
-	ARegion *ar= CTX_wm_region(C);
+	ARegion *ar = CTX_wm_region(C);
 	
-	if (ar && ar->regiontype==RGN_TYPE_WINDOW)
+	if (ar && ar->regiontype == RGN_TYPE_WINDOW)
 		return 1;
 	return 0;
 }
 
 static void drawHelpline(bContext *UNUSED(C), int x, int y, void *customdata)
 {
-	TransInfo *t = (TransInfo*)customdata;
+	TransInfo *t = (TransInfo *)customdata;
 
 	if (t->helpline != HLP_NONE && !(t->flag & T_USES_MANIPULATOR)) {
 		float vecrot[3], cent[2];
 		int mval[2];
 
-		mval[0]= x;
-		mval[1]= y;
+		mval[0] = x;
+		mval[1] = y;
 
 		copy_v3_v3(vecrot, t->center);
 		if (t->flag & T_EDIT) {
-			Object *ob= t->obedit;
+			Object *ob = t->obedit;
 			if (ob) mul_m4_v3(ob->obmat, vecrot);
 		}
 		else if (t->flag & T_POSE) {
-			Object *ob=t->poseobj;
+			Object *ob = t->poseobj;
 			if (ob) mul_m4_v3(ob->obmat, vecrot);
 		}
 
-		projectFloatView(t, vecrot, cent);	// no overflow in extreme cases
+		projectFloatView(t, vecrot, cent);  // no overflow in extreme cases
 
 		glPushMatrix();
 
@@ -1326,67 +1388,67 @@ static void drawHelpline(bContext *UNUSED(C), int x, int y, void *customdata)
 				glLineWidth(1.0);
 				break;
 			case HLP_ANGLE:
-				{
-					float dx = t->mval[0] - cent[0], dy = t->mval[1] - cent[1];
-					float angle = atan2f(dy, dx);
-					float dist = sqrtf(dx*dx + dy*dy);
-					float delta_angle = MIN2(15.0f / dist, (float)M_PI/4.0f);
-					float spacing_angle = MIN2(5.0f / dist, (float)M_PI/12.0f);
-					UI_ThemeColor(TH_WIRE);
+			{
+				float dx = t->mval[0] - cent[0], dy = t->mval[1] - cent[1];
+				float angle = atan2f(dy, dx);
+				float dist = sqrtf(dx * dx + dy * dy);
+				float delta_angle = MIN2(15.0f / dist, (float)M_PI / 4.0f);
+				float spacing_angle = MIN2(5.0f / dist, (float)M_PI / 12.0f);
+				UI_ThemeColor(TH_WIRE);
 
-					setlinestyle(3);
-					glBegin(GL_LINE_STRIP);
-					glVertex2iv(t->mval);
-					glVertex2fv(cent);
-					glEnd();
+				setlinestyle(3);
+				glBegin(GL_LINE_STRIP);
+				glVertex2iv(t->mval);
+				glVertex2fv(cent);
+				glEnd();
 
-					glTranslatef(cent[0] - t->mval[0] + mval[0], cent[1] - t->mval[1] + mval[1], 0);
+				glTranslatef(cent[0] - t->mval[0] + mval[0], cent[1] - t->mval[1] + mval[1], 0);
 
-					setlinestyle(0);
-					glLineWidth(3.0);
-					drawArc(dist, angle - delta_angle, angle - spacing_angle, 10);
-					drawArc(dist, angle + spacing_angle, angle + delta_angle, 10);
+				setlinestyle(0);
+				glLineWidth(3.0);
+				drawArc(dist, angle - delta_angle, angle - spacing_angle, 10);
+				drawArc(dist, angle + spacing_angle, angle + delta_angle, 10);
 
-					glPushMatrix();
+				glPushMatrix();
 
-					glTranslatef(cosf(angle - delta_angle) * dist, sinf(angle - delta_angle) * dist, 0);
-					glRotatef(RAD2DEGF(angle - delta_angle), 0, 0, 1);
+				glTranslatef(cosf(angle - delta_angle) * dist, sinf(angle - delta_angle) * dist, 0);
+				glRotatef(RAD2DEGF(angle - delta_angle), 0, 0, 1);
 
-					drawArrowHead(DOWN, 5);
+				drawArrowHead(DOWN, 5);
 
-					glPopMatrix();
+				glPopMatrix();
 
-					glTranslatef(cosf(angle + delta_angle) * dist, sinf(angle + delta_angle) * dist, 0);
-					glRotatef(RAD2DEGF(angle + delta_angle), 0, 0, 1);
+				glTranslatef(cosf(angle + delta_angle) * dist, sinf(angle + delta_angle) * dist, 0);
+				glRotatef(RAD2DEGF(angle + delta_angle), 0, 0, 1);
 
-					drawArrowHead(UP, 5);
+				drawArrowHead(UP, 5);
 
-					glLineWidth(1.0);
-					break;
-				}
-				case HLP_TRACKBALL:
-				{
-					unsigned char col[3], col2[3];
-					UI_GetThemeColor3ubv(TH_GRID, col);
+				glLineWidth(1.0);
+				break;
+			}
+			case HLP_TRACKBALL:
+			{
+				unsigned char col[3], col2[3];
+				UI_GetThemeColor3ubv(TH_GRID, col);
 
-					glTranslatef(mval[0], mval[1], 0);
+				glTranslatef(mval[0], mval[1], 0);
 
-					glLineWidth(3.0);
+				glLineWidth(3.0);
 
-					UI_make_axis_color(col, col2, 'X');
-					glColor3ubv((GLubyte *)col2);
+				UI_make_axis_color(col, col2, 'X');
+				glColor3ubv((GLubyte *)col2);
 
-					drawArrow(RIGHT, 5, 10, 5);
-					drawArrow(LEFT, 5, 10, 5);
+				drawArrow(RIGHT, 5, 10, 5);
+				drawArrow(LEFT, 5, 10, 5);
 
-					UI_make_axis_color(col, col2, 'Y');
-					glColor3ubv((GLubyte *)col2);
+				UI_make_axis_color(col, col2, 'Y');
+				glColor3ubv((GLubyte *)col2);
 
-					drawArrow(UP, 5, 10, 5);
-					drawArrow(DOWN, 5, 10, 5);
-					glLineWidth(1.0);
-					break;
-				}
+				drawArrow(UP, 5, 10, 5);
+				drawArrow(DOWN, 5, 10, 5);
+				glLineWidth(1.0);
+				break;
+			}
 		}
 
 		glPopMatrix();
@@ -1420,12 +1482,12 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
 	PropertyRNA *prop;
 
 	// Save back mode in case we're in the generic operator
-	if ((prop= RNA_struct_find_property(op->ptr, "mode"))) {
+	if ((prop = RNA_struct_find_property(op->ptr, "mode"))) {
 		RNA_property_enum_set(op->ptr, prop, t->mode);
 	}
 
-	if ((prop= RNA_struct_find_property(op->ptr, "value"))) {
-		float *values= (t->flag & T_AUTOVALUES) ? t->auto_values : t->values;
+	if ((prop = RNA_struct_find_property(op->ptr, "value"))) {
+		float *values = (t->flag & T_AUTOVALUES) ? t->auto_values : t->values;
 		if (RNA_property_array_check(prop)) {
 			RNA_property_float_set_array(op->ptr, prop, values);
 		}
@@ -1435,8 +1497,8 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
 	}
 
 	/* convert flag to enum */
-	switch (t->flag & (T_PROP_EDIT|T_PROP_CONNECTED)) {
-		case (T_PROP_EDIT|T_PROP_CONNECTED):
+	switch (t->flag & (T_PROP_EDIT | T_PROP_CONNECTED)) {
+		case (T_PROP_EDIT | T_PROP_CONNECTED):
 			proportional = PROP_EDIT_CONNECTED;
 			break;
 		case T_PROP_EDIT:
@@ -1455,6 +1517,8 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
 		{
 			if (t->obedit)
 				ts->proportional = proportional;
+			else if (t->options & CTX_MASK)
+				ts->proportional_mask = (proportional != PROP_EDIT_OFF);
 			else
 				ts->proportional_objects = (proportional != PROP_EDIT_OFF);
 		}
@@ -1543,7 +1607,7 @@ int initTransform(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event, int
 
 	t->state = TRANS_STARTING;
 
-	if ( (prop = RNA_struct_find_property(op->ptr, "texture_space")) && RNA_property_is_set(op->ptr, prop)) {
+	if ((prop = RNA_struct_find_property(op->ptr, "texture_space")) && RNA_property_is_set(op->ptr, prop)) {
 		if (RNA_property_boolean_get(op->ptr, prop)) {
 			options |= CTX_TEXTURE;
 		}
@@ -1590,12 +1654,11 @@ int initTransform(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event, int
 	else if (t->spacetype == SPACE_CLIP) {
 		unit_m3(t->spacemtx);
 		t->draw_handle_view = ED_region_draw_cb_activate(t->ar->type, drawTransformView, t, REGION_DRAW_POST_VIEW);
-		t->options |= CTX_MOVIECLIP;
 	}
 	else
 		unit_m3(t->spacemtx);
 
-	createTransData(C, t);			// make TransData structs from selection
+	createTransData(C, t);          // make TransData structs from selection
 
 	if (t->total == 0) {
 		postTrans(C, t);
@@ -1635,111 +1698,114 @@ int initTransform(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event, int
 	initMouseInput(t, &t->mouse, t->center2d, t->imval);
 
 	switch (mode) {
-	case TFM_TRANSLATION:
-		initTranslation(t);
-		break;
-	case TFM_ROTATION:
-		initRotation(t);
-		break;
-	case TFM_RESIZE:
-		initResize(t);
-		break;
-	case TFM_SKIN_RESIZE:
-		initSkinResize(t);
-		break;
-	case TFM_TOSPHERE:
-		initToSphere(t);
-		break;
-	case TFM_SHEAR:
-		initShear(t);
-		break;
-	case TFM_WARP:
-		initWarp(t);
-		break;
-	case TFM_SHRINKFATTEN:
-		initShrinkFatten(t);
-		break;
-	case TFM_TILT:
-		initTilt(t);
-		break;
-	case TFM_CURVE_SHRINKFATTEN:
-		initCurveShrinkFatten(t);
-		break;
-	case TFM_TRACKBALL:
-		initTrackball(t);
-		break;
-	case TFM_PUSHPULL:
-		initPushPull(t);
-		break;
-	case TFM_CREASE:
-		initCrease(t);
-		break;
-	case TFM_BONESIZE:
-		{	/* used for both B-Bone width (bonesize) as for deform-dist (envelope) */
-			bArmature *arm= t->poseobj->data;
-			if (arm->drawtype==ARM_ENVELOPE)
+		case TFM_TRANSLATION:
+			initTranslation(t);
+			break;
+		case TFM_ROTATION:
+			initRotation(t);
+			break;
+		case TFM_RESIZE:
+			initResize(t);
+			break;
+		case TFM_SKIN_RESIZE:
+			initSkinResize(t);
+			break;
+		case TFM_TOSPHERE:
+			initToSphere(t);
+			break;
+		case TFM_SHEAR:
+			initShear(t);
+			break;
+		case TFM_WARP:
+			initWarp(t);
+			break;
+		case TFM_SHRINKFATTEN:
+			initShrinkFatten(t);
+			break;
+		case TFM_TILT:
+			initTilt(t);
+			break;
+		case TFM_CURVE_SHRINKFATTEN:
+			initCurveShrinkFatten(t);
+			break;
+		case TFM_MASK_SHRINKFATTEN:
+			initMaskShrinkFatten(t);
+			break;
+		case TFM_TRACKBALL:
+			initTrackball(t);
+			break;
+		case TFM_PUSHPULL:
+			initPushPull(t);
+			break;
+		case TFM_CREASE:
+			initCrease(t);
+			break;
+		case TFM_BONESIZE:
+		{   /* used for both B-Bone width (bonesize) as for deform-dist (envelope) */
+			bArmature *arm = t->poseobj->data;
+			if (arm->drawtype == ARM_ENVELOPE)
 				initBoneEnvelope(t);
 			else
 				initBoneSize(t);
 		}
 		break;
-	case TFM_BONE_ENVELOPE:
-		initBoneEnvelope(t);
-		break;
-	case TFM_EDGE_SLIDE:
-		initEdgeSlide(t);
-		break;
-	case TFM_BONE_ROLL:
-		initBoneRoll(t);
-		break;
-	case TFM_TIME_TRANSLATE:
-		initTimeTranslate(t);
-		break;
-	case TFM_TIME_SLIDE:
-		initTimeSlide(t);
-		break;
-	case TFM_TIME_SCALE:
-		initTimeScale(t);
-		break;
-	case TFM_TIME_DUPLICATE:
-		/* same as TFM_TIME_EXTEND, but we need the mode info for later 
-		 * so that duplicate-culling will work properly
-		 */
-		if (ELEM(t->spacetype, SPACE_IPO, SPACE_NLA))
-			initTranslation(t);
-		else
-			initTimeTranslate(t);
-		t->mode = mode;
-		break;
-	case TFM_TIME_EXTEND:
-		/* now that transdata has been made, do like for TFM_TIME_TRANSLATE (for most Animation
-		 * Editors because they have only 1D transforms for time values) or TFM_TRANSLATION
-		 * (for Graph/NLA Editors only since they uses 'standard' transforms to get 2D movement)
-		 * depending on which editor this was called from
-		 */
-		if (ELEM(t->spacetype, SPACE_IPO, SPACE_NLA))
-			initTranslation(t);
-		else
+		case TFM_BONE_ENVELOPE:
+			initBoneEnvelope(t);
+			break;
+		case TFM_EDGE_SLIDE:
+			initEdgeSlide(t);
+			break;
+		case TFM_BONE_ROLL:
+			initBoneRoll(t);
+			break;
+		case TFM_TIME_TRANSLATE:
 			initTimeTranslate(t);
-		break;
-	case TFM_BAKE_TIME:
-		initBakeTime(t);
-		break;
-	case TFM_MIRROR:
-		initMirror(t);
-		break;
-	case TFM_BEVEL:
-		initBevel(t);
-		break;
-	case TFM_BWEIGHT:
-		initBevelWeight(t);
-		break;
-	case TFM_ALIGN:
-		initAlign(t);
-		break;
-	case TFM_SEQ_SLIDE:
-		initSeqSlide(t);
-		break;
+			break;
+		case TFM_TIME_SLIDE:
+			initTimeSlide(t);
+			break;
+		case TFM_TIME_SCALE:
+			initTimeScale(t);
+			break;
+		case TFM_TIME_DUPLICATE:
+			/* same as TFM_TIME_EXTEND, but we need the mode info for later
+			 * so that duplicate-culling will work properly
+			 */
+			if (ELEM(t->spacetype, SPACE_IPO, SPACE_NLA))
+				initTranslation(t);
+			else
+				initTimeTranslate(t);
+			t->mode = mode;
+			break;
+		case TFM_TIME_EXTEND:
+			/* now that transdata has been made, do like for TFM_TIME_TRANSLATE (for most Animation
+			 * Editors because they have only 1D transforms for time values) or TFM_TRANSLATION
+			 * (for Graph/NLA Editors only since they uses 'standard' transforms to get 2D movement)
+			 * depending on which editor this was called from
+			 */
+			if (ELEM(t->spacetype, SPACE_IPO, SPACE_NLA))
+				initTranslation(t);
+			else
+				initTimeTranslate(t);
+			break;
+		case TFM_BAKE_TIME:
+			initBakeTime(t);
+			break;
+		case TFM_MIRROR:
+			initMirror(t);
+			break;
+		case TFM_BEVEL:
+			initBevel(t);
+			break;
+		case TFM_BWEIGHT:
+			initBevelWeight(t);
+			break;
+		case TFM_ALIGN:
+			initAlign(t);
+			break;
+		case TFM_SEQ_SLIDE:
+			initSeqSlide(t);
+			break;
 	}
 
 	if (t->state == TRANS_CANCEL) {
@@ -1750,13 +1816,13 @@ int initTransform(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event, int
 
 	/* overwrite initial values if operator supplied a non-null vector */
 	if ((prop = RNA_struct_find_property(op->ptr, "value")) && RNA_property_is_set(op->ptr, prop)) {
-		float values[4]= {0}; /* in case value isn't length 4, avoid uninitialized memory  */
+		float values[4] = {0}; /* in case value isn't length 4, avoid uninitialized memory  */
 
 		if (RNA_property_array_check(prop)) {
 			RNA_float_get_array(op->ptr, "value", values);
 		}
 		else {
-			values[0]= RNA_float_get(op->ptr, "value");
+			values[0] = RNA_float_get(op->ptr, "value");
 		}
 
 		copy_v4_v4(t->values, values);
@@ -1849,11 +1915,11 @@ int transformEnd(bContext *C, TransInfo *t)
 		/* handle restoring objects */
 		if (t->state == TRANS_CANCEL) {
 			/* exception, edge slide transformed UVs too */
-			if (t->mode==TFM_EDGE_SLIDE)
+			if (t->mode == TFM_EDGE_SLIDE)
 				doEdgeSlide(t, 0.0f);
 			
 			exit_code = OPERATOR_CANCELLED;
-			restoreTransObjects(t);	// calls recalcData()
+			restoreTransObjects(t); // calls recalcData()
 		}
 		else {
 			exit_code = OPERATOR_FINISHED;
@@ -1877,7 +1943,7 @@ int transformEnd(bContext *C, TransInfo *t)
 //			if (t->undostr) ED_undo_push(C, t->undostr);
 //			else ED_undo_push(C, transform_to_undostr(t));
 		}
-		t->undostr= NULL;
+		t->undostr = NULL;
 
 		viewRedrawForce(C, t);
 	}
@@ -1892,31 +1958,31 @@ int transformEnd(bContext *C, TransInfo *t)
 static void protectedTransBits(short protectflag, float *vec)
 {
 	if (protectflag & OB_LOCK_LOCX)
-		vec[0]= 0.0f;
+		vec[0] = 0.0f;
 	if (protectflag & OB_LOCK_LOCY)
-		vec[1]= 0.0f;
+		vec[1] = 0.0f;
 	if (protectflag & OB_LOCK_LOCZ)
-		vec[2]= 0.0f;
+		vec[2] = 0.0f;
 }
 
 static void protectedSizeBits(short protectflag, float *size)
 {
 	if (protectflag & OB_LOCK_SCALEX)
-		size[0]= 1.0f;
+		size[0] = 1.0f;
 	if (protectflag & OB_LOCK_SCALEY)
-		size[1]= 1.0f;
+		size[1] = 1.0f;
 	if (protectflag & OB_LOCK_SCALEZ)
-		size[2]= 1.0f;
+		size[2] = 1.0f;
 }
 
 static void protectedRotateBits(short protectflag, float *eul, float *oldeul)
 {
 	if (protectflag & OB_LOCK_ROTX)
-		eul[0]= oldeul[0];
+		eul[0] = oldeul[0];
 	if (protectflag & OB_LOCK_ROTY)
-		eul[1]= oldeul[1];
+		eul[1] = oldeul[1];
 	if (protectflag & OB_LOCK_ROTZ)
-		eul[2]= oldeul[2];
+		eul[2] = oldeul[2];
 }
 
 
@@ -1925,19 +1991,19 @@ static void protectedRotateBits(short protectflag, float *eul, float *oldeul)
 static void protectedAxisAngleBits(short protectflag, float axis[3], float *angle, float oldAxis[3], float oldAngle)
 {
 	/* check that protection flags are set */
-	if ((protectflag & (OB_LOCK_ROTX|OB_LOCK_ROTY|OB_LOCK_ROTZ|OB_LOCK_ROTW)) == 0)
+	if ((protectflag & (OB_LOCK_ROTX | OB_LOCK_ROTY | OB_LOCK_ROTZ | OB_LOCK_ROTW)) == 0)
 		return;
 	
 	if (protectflag & OB_LOCK_ROT4D) {
 		/* axis-angle getting limited as 4D entities that they are... */
 		if (protectflag & OB_LOCK_ROTW)
-			*angle= oldAngle;
+			*angle = oldAngle;
 		if (protectflag & OB_LOCK_ROTX)
-			axis[0]= oldAxis[0];
+			axis[0] = oldAxis[0];
 		if (protectflag & OB_LOCK_ROTY)
-			axis[1]= oldAxis[1];
+			axis[1] = oldAxis[1];
 		if (protectflag & OB_LOCK_ROTZ)
-			axis[2]= oldAxis[2];
+			axis[2] = oldAxis[2];
 	}
 	else {
 		/* axis-angle get limited with euler... */
@@ -1947,18 +2013,18 @@ static void protectedAxisAngleBits(short protectflag, float axis[3], float *angl
 		axis_angle_to_eulO(oldeul, EULER_ORDER_DEFAULT, oldAxis, oldAngle);
 		
 		if (protectflag & OB_LOCK_ROTX)
-			eul[0]= oldeul[0];
+			eul[0] = oldeul[0];
 		if (protectflag & OB_LOCK_ROTY)
-			eul[1]= oldeul[1];
+			eul[1] = oldeul[1];
 		if (protectflag & OB_LOCK_ROTZ)
-			eul[2]= oldeul[2];
+			eul[2] = oldeul[2];
 		
 		eulO_to_axis_angle(axis, angle, eul, EULER_ORDER_DEFAULT);
 		
 		/* when converting to axis-angle, we need a special exception for the case when there is no axis */
 		if (IS_EQF(axis[0], axis[1]) && IS_EQF(axis[1], axis[2])) {
 			/* for now, rotate around y-axis then (so that it simply becomes the roll) */
-			axis[1]= 1.0f;
+			axis[1] = 1.0f;
 		}
 	}
 }
@@ -1967,37 +2033,37 @@ static void protectedAxisAngleBits(short protectflag, float axis[3], float *angl
 static void protectedQuaternionBits(short protectflag, float *quat, float *oldquat)
 {
 	/* check that protection flags are set */
-	if ((protectflag & (OB_LOCK_ROTX|OB_LOCK_ROTY|OB_LOCK_ROTZ|OB_LOCK_ROTW)) == 0)
+	if ((protectflag & (OB_LOCK_ROTX | OB_LOCK_ROTY | OB_LOCK_ROTZ | OB_LOCK_ROTW)) == 0)
 		return;
 	
 	if (protectflag & OB_LOCK_ROT4D) {
 		/* quaternions getting limited as 4D entities that they are... */
 		if (protectflag & OB_LOCK_ROTW)
-			quat[0]= oldquat[0];
+			quat[0] = oldquat[0];
 		if (protectflag & OB_LOCK_ROTX)
-			quat[1]= oldquat[1];
+			quat[1] = oldquat[1];
 		if (protectflag & OB_LOCK_ROTY)
-			quat[2]= oldquat[2];
+			quat[2] = oldquat[2];
 		if (protectflag & OB_LOCK_ROTZ)
-			quat[3]= oldquat[3];
+			quat[3] = oldquat[3];
 	}
 	else {
 		/* quaternions get limited with euler... (compatibility mode) */
 		float eul[3], oldeul[3], nquat[4], noldquat[4];
 		float qlen;
 
-		qlen= normalize_qt_qt(nquat, quat);
+		qlen = normalize_qt_qt(nquat, quat);
 		normalize_qt_qt(noldquat, oldquat);
 
 		quat_to_eul(eul, nquat);
 		quat_to_eul(oldeul, noldquat);
 
 		if (protectflag & OB_LOCK_ROTX)
-			eul[0]= oldeul[0];
+			eul[0] = oldeul[0];
 		if (protectflag & OB_LOCK_ROTY)
-			eul[1]= oldeul[1];
+			eul[1] = oldeul[1];
 		if (protectflag & OB_LOCK_ROTZ)
-			eul[2]= oldeul[2];
+			eul[2] = oldeul[2];
 
 		eul_to_quat(quat, eul);
 
@@ -2005,7 +2071,9 @@ static void protectedQuaternionBits(short protectflag, float *quat, float *oldqu
 		mul_qt_fl(quat, qlen);
 		
 		/* quaternions flip w sign to accumulate rotations correctly */
-		if ( (nquat[0]<0.0f && quat[0]>0.0f) || (nquat[0]>0.0f && quat[0]<0.0f) ) {
+		if ((nquat[0] < 0.0f && quat[0] > 0.0f) ||
+		    (nquat[0] > 0.0f && quat[0] < 0.0f))
+		{
 			mul_qt_fl(quat, -1.0f);
 		}
 	}
@@ -2016,22 +2084,22 @@ static void protectedQuaternionBits(short protectflag, float *quat, float *oldqu
 static void constraintTransLim(TransInfo *t, TransData *td)
 {
 	if (td->con) {
-		bConstraintTypeInfo *ctiLoc= get_constraint_typeinfo(CONSTRAINT_TYPE_LOCLIMIT);
-		bConstraintTypeInfo *ctiDist= get_constraint_typeinfo(CONSTRAINT_TYPE_DISTLIMIT);
+		bConstraintTypeInfo *ctiLoc = get_constraint_typeinfo(CONSTRAINT_TYPE_LOCLIMIT);
+		bConstraintTypeInfo *ctiDist = get_constraint_typeinfo(CONSTRAINT_TYPE_DISTLIMIT);
 		
-		bConstraintOb cob= {NULL};
+		bConstraintOb cob = {NULL};
 		bConstraint *con;
 		float ctime = (float)(t->scene->r.cfra);
 		
 		/* Make a temporary bConstraintOb for using these limit constraints
-		 * 	- they only care that cob->matrix is correctly set ;-)
+		 *  - they only care that cob->matrix is correctly set ;-)
 		 *	- current space should be local
 		 */
 		unit_m4(cob.matrix);
 		copy_v3_v3(cob.matrix[3], td->loc);
 		
 		/* Evaluate valid constraints */
-		for (con= td->con; con; con= con->next) {
+		for (con = td->con; con; con = con->next) {
 			bConstraintTypeInfo *cti = NULL;
 			ListBase targets = {NULL, NULL};
 			float tmat[4][4];
@@ -2042,16 +2110,16 @@ static void constraintTransLim(TransInfo *t, TransData *td)
 			
 			/* only use it if it's tagged for this purpose (and the right type) */
 			if (con->type == CONSTRAINT_TYPE_LOCLIMIT) {
-				bLocLimitConstraint *data= con->data;
+				bLocLimitConstraint *data = con->data;
 				
-				if ((data->flag2 & LIMIT_TRANSFORM)==0)
+				if ((data->flag2 & LIMIT_TRANSFORM) == 0)
 					continue;
 				cti = ctiLoc;
 			}
 			else if (con->type == CONSTRAINT_TYPE_DISTLIMIT) {
-				bDistLimitConstraint *data= con->data;
+				bDistLimitConstraint *data = con->data;
 				
-				if ((data->flag & LIMITDIST_TRANSFORM)==0)
+				if ((data->flag & LIMITDIST_TRANSFORM) == 0)
 					continue;
 				cti = ctiDist;
 			}
@@ -2094,7 +2162,7 @@ static void constraintTransLim(TransInfo *t, TransData *td)
 static void constraintob_from_transdata(bConstraintOb *cob, TransData *td)
 {
 	/* Make a temporary bConstraintOb for use by limit constraints
-	 * 	- they only care that cob->matrix is correctly set ;-)
+	 *  - they only care that cob->matrix is correctly set ;-)
 	 *	- current space should be local
 	 */
 	memset(cob, 0, sizeof(bConstraintOb));
@@ -2102,8 +2170,8 @@ static void constraintob_from_transdata(bConstraintOb *cob, TransData *td)
 		if (td->ext->rotOrder == ROT_MODE_QUAT) {
 			/* quats */
 			/* objects and bones do normalization first too, otherwise
-			 * we don't necessarily end up with a rotation matrix, and
-			 * then conversion back to quat gives a different result */
+			* we don't necessarily end up with a rotation matrix, and
+			* then conversion back to quat gives a different result */
 			float quat[4];
 			normalize_qt_qt(quat, td->ext->quat);
 			quat_to_mat4(cob->matrix, quat);
@@ -2122,24 +2190,24 @@ static void constraintob_from_transdata(bConstraintOb *cob, TransData *td)
 static void constraintRotLim(TransInfo *UNUSED(t), TransData *td)
 {
 	if (td->con) {
-		bConstraintTypeInfo *cti= get_constraint_typeinfo(CONSTRAINT_TYPE_ROTLIMIT);
+		bConstraintTypeInfo *cti = get_constraint_typeinfo(CONSTRAINT_TYPE_ROTLIMIT);
 		bConstraintOb cob;
 		bConstraint *con;
 		int do_limit = FALSE;
 		
 		/* Evaluate valid constraints */
-		for (con= td->con; con; con= con->next) {
+		for (con = td->con; con; con = con->next) {
 			/* only consider constraint if enabled */
 			if (con->flag & CONSTRAINT_DISABLE) continue;
 			if (con->enforce == 0.0f) continue;
 			
 			/* we're only interested in Limit-Rotation constraints */
 			if (con->type == CONSTRAINT_TYPE_ROTLIMIT) {
-				bRotLimitConstraint *data= con->data;
+				bRotLimitConstraint *data = con->data;
 				float tmat[4][4];
 				
 				/* only use it if it's tagged for this purpose */
-				if ((data->flag2 & LIMIT_TRANSFORM)==0)
+				if ((data->flag2 & LIMIT_TRANSFORM) == 0)
 					continue;
 
 				/* skip incompatable spacetypes */
@@ -2192,12 +2260,12 @@ static void constraintRotLim(TransInfo *UNUSED(t), TransData *td)
 static void constraintSizeLim(TransInfo *t, TransData *td)
 {
 	if (td->con && td->ext) {
-		bConstraintTypeInfo *cti= get_constraint_typeinfo(CONSTRAINT_TYPE_SIZELIMIT);
-		bConstraintOb cob= {NULL};
+		bConstraintTypeInfo *cti = get_constraint_typeinfo(CONSTRAINT_TYPE_SIZELIMIT);
+		bConstraintOb cob = {NULL};
 		bConstraint *con;
 		
 		/* Make a temporary bConstraintOb for using these limit constraints
-		 * 	- they only care that cob->matrix is correctly set ;-)
+		 *  - they only care that cob->matrix is correctly set ;-)
 		 *	- current space should be local
 		 */
 		if ((td->flag & TD_SINGLESIZE) && !(t->con.mode & CON_APPLY)) {
@@ -2213,18 +2281,18 @@ static void constraintSizeLim(TransInfo *t, TransData *td)
 		}
 		
 		/* Evaluate valid constraints */
-		for (con= td->con; con; con= con->next) {
+		for (con = td->con; con; con = con->next) {
 			/* only consider constraint if enabled */
 			if (con->flag & CONSTRAINT_DISABLE) continue;
 			if (con->enforce == 0.0f) continue;
 			
 			/* we're only interested in Limit-Scale constraints */
 			if (con->type == CONSTRAINT_TYPE_SIZELIMIT) {
-				bSizeLimitConstraint *data= con->data;
+				bSizeLimitConstraint *data = con->data;
 				float tmat[4][4];
 				
 				/* only use it if it's tagged for this purpose */
-				if ((data->flag2 & LIMIT_TRANSFORM)==0)
+				if ((data->flag2 & LIMIT_TRANSFORM) == 0)
 					continue;
 				
 				/* do space conversions */
@@ -2315,8 +2383,8 @@ void initWarp(TransInfo *t)
 
 	mid_v3_v3v3(t->center, min, max);
 
-	if (max[0] == min[0]) max[0] += 0.1f; /* not optimal, but flipping is better than invalid garbage (i.e. division by zero!) */
-	t->val= (max[0]-min[0])/2.0f; /* t->val is X dimension projected boundbox */
+	if (max[0] == min[0]) max[0] += 0.1f;  /* not optimal, but flipping is better than invalid garbage (i.e. division by zero!) */
+	t->val = (max[0] - min[0]) / 2.0f; /* t->val is X dimension projected boundbox */
 }
 
 int handleEventWarp(TransInfo *t, wmEvent *event)
@@ -2343,7 +2411,7 @@ int Warp(TransInfo *t, const int UNUSED(mval[2]))
 	int i;
 	char str[50];
 	
-	curs= give_cursor(t->scene, t->view);
+	curs = give_cursor(t->scene, t->view);
 	/*
 	 * gcursor is the one used for helpline.
 	 * It has to be in the same space as the drawing loop
@@ -2403,18 +2471,18 @@ int Warp(TransInfo *t, const int UNUSED(mval[2]))
 		mul_m4_v3(t->viewmat, vec);
 		sub_v3_v3(vec, t->viewmat[3]);
 		
-		dist= vec[0]-cursor[0];
+		dist = vec[0] - cursor[0];
 		
 		/* t->val is X dimension projected boundbox */
-		phi0= (circumfac*dist/t->val);
+		phi0 = (circumfac * dist / t->val);
 		
-		vec[1]= (vec[1]-cursor[1]);
+		vec[1] = (vec[1] - cursor[1]);
 		
-		co= (float)cos(phi0);
-		si= (float)sin(phi0);
-		loc[0]= -si*vec[1]+cursor[0];
-		loc[1]= co*vec[1]+cursor[1];
-		loc[2]= vec[2];
+		co = (float)cos(phi0);
+		si = (float)sin(phi0);
+		loc[0] = -si * vec[1] + cursor[0];
+		loc[1] = co * vec[1] + cursor[1];
+		loc[2] = vec[2];
 		
 		mul_m4_v3(t->viewinv, loc);
 		sub_v3_v3(loc, t->viewinv[3]);
@@ -2467,7 +2535,7 @@ int handleEventShear(TransInfo *t, wmEvent *event)
 		// Use customData pointer to signal Shear direction
 		if (t->customData == NULL) {
 			initMouseInputMode(t, &t->mouse, INPUT_VERTICAL_ABSOLUTE);
-			t->customData = (void*)1;
+			t->customData = (void *)1;
 		}
 		else {
 			initMouseInputMode(t, &t->mouse, INPUT_HORIZONTAL_ABSOLUTE);
@@ -2525,7 +2593,7 @@ int Shear(TransInfo *t, const int UNUSED(mval[2]))
 	mul_m3_m3m3(tmat, smat, persmat);
 	mul_m3_m3m3(totmat, persinv, tmat);
 	
-	for (i = 0 ; i < t->total; i++, td++) {
+	for (i = 0; i < t->total; i++, td++) {
 		if (td->flag & TD_NOACTION)
 			break;
 		
@@ -2588,7 +2656,7 @@ void initResize(TransInfo *t)
 static void headerResize(TransInfo *t, float vec[3], char *str)
 {
 	char tvec[60];
-	char *spos= str;
+	char *spos = str;
 	if (hasNumInput(&t->num)) {
 		outputNumInput(&(t->num), tvec);
 	}
@@ -2600,14 +2668,14 @@ static void headerResize(TransInfo *t, float vec[3], char *str)
 	
 	if (t->con.mode & CON_APPLY) {
 		switch (t->num.idx_max) {
-		case 0:
-			spos += sprintf(spos, "Scale: %s%s %s", &tvec[0], t->con.text, t->proptext);
-			break;
-		case 1:
-			spos += sprintf(spos, "Scale: %s : %s%s %s", &tvec[0], &tvec[20], t->con.text, t->proptext);
-			break;
-		case 2:
-			spos += sprintf(spos, "Scale: %s : %s : %s%s %s", &tvec[0], &tvec[20], &tvec[40], t->con.text, t->proptext);
+			case 0:
+				spos += sprintf(spos, "Scale: %s%s %s", &tvec[0], t->con.text, t->proptext);
+				break;
+			case 1:
+				spos += sprintf(spos, "Scale: %s : %s%s %s", &tvec[0], &tvec[20], t->con.text, t->proptext);
+				break;
+			case 2:
+				spos += sprintf(spos, "Scale: %s : %s : %s%s %s", &tvec[0], &tvec[20], &tvec[40], t->con.text, t->proptext);
 		}
 	}
 	else {
@@ -2617,15 +2685,15 @@ static void headerResize(TransInfo *t, float vec[3], char *str)
 			spos += sprintf(spos, "Scale X: %s   Y: %s  Z: %s%s %s", &tvec[0], &tvec[20], &tvec[40], t->con.text, t->proptext);
 	}
 	
-	if (t->flag & (T_PROP_EDIT|T_PROP_CONNECTED)) {
+	if (t->flag & (T_PROP_EDIT | T_PROP_CONNECTED)) {
 		spos += sprintf(spos, " Proportional size: %.2f", t->prop_size);
 	}
 
 	(void)spos;
 }
 
-#define SIGN(a)		(a<-FLT_EPSILON?1:a>FLT_EPSILON?2:3)
-#define VECSIGNFLIP(a, b) ((SIGN(a[0]) & SIGN(b[0]))==0 || (SIGN(a[1]) & SIGN(b[1]))==0 || (SIGN(a[2]) & SIGN(b[2]))==0)
+#define SIGN(a)     (a<-FLT_EPSILON ? 1 : a>FLT_EPSILON ? 2 : 3)
+#define VECSIGNFLIP(a, b) ((SIGN(a[0]) & SIGN(b[0])) == 0 || (SIGN(a[1]) & SIGN(b[1])) == 0 || (SIGN(a[2]) & SIGN(b[2])) == 0)
 
 /* smat is reference matrix, only scaled */
 static void TransMat3ToSize(float mat[][3], float smat[][3], float *size)
@@ -2633,16 +2701,16 @@ static void TransMat3ToSize(float mat[][3], float smat[][3], float *size)
 	float vec[3];
 	
 	copy_v3_v3(vec, mat[0]);
-	size[0]= normalize_v3(vec);
+	size[0] = normalize_v3(vec);
 	copy_v3_v3(vec, mat[1]);
-	size[1]= normalize_v3(vec);
+	size[1] = normalize_v3(vec);
 	copy_v3_v3(vec, mat[2]);
-	size[2]= normalize_v3(vec);
+	size[2] = normalize_v3(vec);
 	
 	/* first tried with dotproduct... but the sign flip is crucial */
-	if ( VECSIGNFLIP(mat[0], smat[0]) ) size[0]= -size[0];
-	if ( VECSIGNFLIP(mat[1], smat[1]) ) size[1]= -size[1];
-	if ( VECSIGNFLIP(mat[2], smat[2]) ) size[2]= -size[2];
+	if (VECSIGNFLIP(mat[0], smat[0]) ) size[0] = -size[0];
+	if (VECSIGNFLIP(mat[1], smat[1]) ) size[1] = -size[1];
+	if (VECSIGNFLIP(mat[2], smat[2]) ) size[2] = -size[2];
 }
 
 
@@ -2665,13 +2733,16 @@ static void ElementResize(TransInfo *t, TransData *td, float mat[3][3])
 	
 	/* local constraint shouldn't alter center */
 	if ((t->around == V3D_LOCAL) &&
-	        (   (t->flag & (T_OBJECT|T_POSE)) ||
-	            ((t->flag & T_EDIT) && (t->settings->selectmode & (SCE_SELECT_EDGE|SCE_SELECT_FACE))) ||
-	            (t->obedit && t->obedit->type == OB_ARMATURE))
-	        )
+	    (   (t->flag & (T_OBJECT | T_POSE)) ||
+	        ((t->flag & T_EDIT) && (t->settings->selectmode & (SCE_SELECT_EDGE | SCE_SELECT_FACE))) ||
+	        (t->obedit && t->obedit->type == OB_ARMATURE))
+	    )
 	{
 		copy_v3_v3(center, td->center);
 	}
+	else if (t->options & CTX_MOVIECLIP) {
+		copy_v3_v3(center, td->center);
+	}
 	else {
 		copy_v3_v3(center, t->center);
 	}
@@ -2679,7 +2750,7 @@ static void ElementResize(TransInfo *t, TransData *td, float mat[3][3])
 	if (td->ext) {
 		float fsize[3];
 		
-		if (t->flag & (T_OBJECT|T_TEXTURE|T_POSE)) {
+		if (t->flag & (T_OBJECT | T_TEXTURE | T_POSE)) {
 			float obsizemat[3][3];
 			// Reorient the size mat to fit the oriented object.
 			mul_m3_m3m3(obsizemat, tmat, td->axismtx);
@@ -2693,19 +2764,19 @@ static void ElementResize(TransInfo *t, TransData *td, float mat[3][3])
 		
 		protectedSizeBits(td->protectflag, fsize);
 		
-		if ((t->flag & T_V3D_ALIGN)==0) {	// align mode doesn't resize objects itself
+		if ((t->flag & T_V3D_ALIGN) == 0) {   // align mode doesn't resize objects itself
 			if ((td->flag & TD_SINGLESIZE) && !(t->con.mode & CON_APPLY)) {
 				/* scale val and reset size */
-				 *td->val = td->ival * (1 + (fsize[0] - 1) * td->factor);
+				*td->val = td->ival * (1 + (fsize[0] - 1) * td->factor);
 				
 				td->ext->size[0] = td->ext->isize[0];
 				td->ext->size[1] = td->ext->isize[1];
 				td->ext->size[2] = td->ext->isize[2];
-			 }
+			}
 			else {
 				/* Reset val if SINGLESIZE but using a constraint */
 				if (td->flag & TD_SINGLESIZE)
-					 *td->val = td->ival;
+					*td->val = td->ival;
 				
 				td->ext->size[0] = td->ext->isize[0] * (1 + (fsize[0] - 1) * td->factor);
 				td->ext->size[1] = td->ext->isize[1] * (1 + (fsize[1] - 1) * td->factor);
@@ -2732,7 +2803,7 @@ static void ElementResize(TransInfo *t, TransData *td, float mat[3][3])
 	
 	mul_v3_fl(vec, td->factor);
 	
-	if (t->flag & (T_OBJECT|T_POSE)) {
+	if (t->flag & (T_OBJECT | T_POSE)) {
 		mul_m3_v3(td->smtx, vec);
 	}
 	
@@ -2749,10 +2820,10 @@ int Resize(TransInfo *t, const int mval[2])
 	float ratio;
 	int i;
 	char str[200];
-	
+
 	/* for manipulator, center handle, the scaling can't be done relative to center */
-	if ( (t->flag & T_USES_MANIPULATOR) && t->con.mode==0) {
-		ratio = 1.0f - ((t->imval[0] - mval[0]) + (t->imval[1] - mval[1]))/100.0f;
+	if ((t->flag & T_USES_MANIPULATOR) && t->con.mode == 0) {
+		ratio = 1.0f - ((t->imval[0] - mval[0]) + (t->imval[1] - mval[1])) / 100.0f;
 	}
 	else {
 		ratio = t->values[0];
@@ -2781,11 +2852,11 @@ int Resize(TransInfo *t, const int mval[2])
 		t->con.applySize(t, NULL, mat);
 	}
 	
-	copy_m3_m3(t->mat, mat);	// used in manipulator
+	copy_m3_m3(t->mat, mat);    // used in manipulator
 	
 	headerResize(t, size, str);
 	
-	for (i = 0, td=t->data; i < t->total; i++, td++) {
+	for (i = 0, td = t->data; i < t->total; i++, td++) {
 		if (td->flag & TD_NOACTION)
 			break;
 		
@@ -2802,7 +2873,7 @@ int Resize(TransInfo *t, const int mval[2])
 		if (t->con.applySize)
 			t->con.applySize(t, NULL, mat);
 		
-		for (i = 0, td=t->data; i < t->total; i++, td++)
+		for (i = 0, td = t->data; i < t->total; i++, td++)
 			ElementResize(t, td, mat);
 	}
 	
@@ -2927,7 +2998,7 @@ void initToSphere(TransInfo *t)
 	t->flag |= T_NO_CONSTRAINT;
 	
 	// Calculate average radius
-	for (i = 0 ; i < t->total; i++, td++) {
+	for (i = 0; i < t->total; i++, td++) {
 		t->val += len_v3v3(t->center, td->iloc);
 	}
 	
@@ -2969,7 +3040,7 @@ int ToSphere(TransInfo *t, const int UNUSED(mval[2]))
 	}
 	
 	
-	for (i = 0 ; i < t->total; i++, td++) {
+	for (i = 0; i < t->total; i++, td++) {
 		float tratio;
 		if (td->flag & TD_NOACTION)
 			break;
@@ -3017,7 +3088,7 @@ void initRotation(TransInfo *t)
 	t->idx_max = 0;
 	t->num.idx_max = 0;
 	t->snap[0] = 0.0f;
-	t->snap[1] = (float)((5.0/180)*M_PI);
+	t->snap[1] = (float)((5.0 / 180) * M_PI);
 	t->snap[2] = t->snap[1] * 0.2f;
 	
 	t->num.increment = 1.0f;
@@ -3039,12 +3110,16 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3], short
 
 	/* local constraint shouldn't alter center */
 	if (around == V3D_LOCAL) {
-		if (    (t->flag & (T_OBJECT|T_POSE)) ||
-	            (t->settings->selectmode & (SCE_SELECT_EDGE|SCE_SELECT_FACE)) ||
+		if (    (t->flag & (T_OBJECT | T_POSE)) ||
+		        (t->settings->selectmode & (SCE_SELECT_EDGE | SCE_SELECT_FACE)) ||
 		        (t->obedit && t->obedit->type == OB_ARMATURE))
 		{
 			center = td->center;
 		}
+
+		if (t->options & CTX_MOVIECLIP) {
+			center = td->center;
+		}
 	}
 
 	if (t->flag & T_POINTS) {
@@ -3063,7 +3138,7 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3], short
 		
 		if (td->flag & TD_USEQUAT) {
 			mul_serie_m3(fmat, td->mtx, mat, td->smtx, NULL, NULL, NULL, NULL, NULL);
-			mat3_to_quat(quat, fmat);	// Actual transform
+			mat3_to_quat(quat, fmat);   // Actual transform
 			
 			if (td->ext->quat) {
 				mul_qt_qtqt(td->ext->quat, quat, td->ext->iquat);
@@ -3095,9 +3170,9 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3], short
 		if ((td->flag & TD_NO_LOC) == 0) {
 			sub_v3_v3v3(vec, td->center, center);
 			
-			mul_m3_v3(pmtx, vec);	// To Global space
-			mul_m3_v3(mat, vec);		// Applying rotation
-			mul_m3_v3(imtx, vec);	// To Local space
+			mul_m3_v3(pmtx, vec);   // To Global space
+			mul_m3_v3(mat, vec);        // Applying rotation
+			mul_m3_v3(imtx, vec);   // To Local space
 			
 			add_v3_v3(vec, center);
 			/* vec now is the location where the object has to be */
@@ -3109,12 +3184,12 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3], short
 				/* do nothing */
 			}
 			else if (td->flag & TD_PBONE_LOCAL_MTX_C) {
-				mul_m3_v3(pmtx, vec);	// To Global space
-				mul_m3_v3(td->ext->l_smtx, vec);// To Pose space (Local Location)
+				mul_m3_v3(pmtx, vec);   // To Global space
+				mul_m3_v3(td->ext->l_smtx, vec); // To Pose space (Local Location)
 			}
 			else {
-				mul_m3_v3(pmtx, vec);	// To Global space
-				mul_m3_v3(td->smtx, vec);// To Pose space
+				mul_m3_v3(pmtx, vec);   // To Global space
+				mul_m3_v3(td->smtx, vec); // To Pose space
 			}
 
 			protectedTransBits(td->protectflag, vec);
@@ -3129,7 +3204,7 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3], short
 		 * and ElementRotation() might be called in Translation context (with align snapping),
 		 * we need to be sure to actually use the *rotation* matrix here...
 		 * So no other way than storing it in some dedicated members of td->ext! */
-		if ((t->flag & T_V3D_ALIGN)==0) { /* align mode doesn't rotate objects itself */
+		if ((t->flag & T_V3D_ALIGN) == 0) { /* align mode doesn't rotate objects itself */
 			/* euler or quaternion/axis-angle? */
 			if (td->ext->rotOrder == ROT_MODE_QUAT) {
 				mul_serie_m3(fmat, td->ext->r_mtx, mat, td->ext->r_smtx, NULL, NULL, NULL, NULL, NULL);
@@ -3198,11 +3273,11 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3], short
 		constraintTransLim(t, td);
 		
 		/* rotation */
-		if ((t->flag & T_V3D_ALIGN)==0) { // align mode doesn't rotate objects itself
+		if ((t->flag & T_V3D_ALIGN) == 0) { // align mode doesn't rotate objects itself
 			/* euler or quaternion? */
 			if ((td->ext->rotOrder == ROT_MODE_QUAT) || (td->flag & TD_USEQUAT)) {
 				mul_serie_m3(fmat, td->mtx, mat, td->smtx, NULL, NULL, NULL, NULL, NULL);
-				mat3_to_quat(quat, fmat);	// Actual transform
+				mat3_to_quat(quat, fmat);   // Actual transform
 				
 				mul_qt_qtqt(td->ext->quat, quat, td->ext->iquat);
 				/* this function works on end result */
@@ -3215,7 +3290,7 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3], short
 				axis_angle_to_quat(iquat, td->ext->irotAxis, td->ext->irotAngle);
 				
 				mul_serie_m3(fmat, td->mtx, mat, td->smtx, NULL, NULL, NULL, NULL, NULL);
-				mat3_to_quat(quat, fmat);	// Actual transform
+				mat3_to_quat(quat, fmat);   // Actual transform
 				mul_qt_qtqt(tquat, quat, iquat);
 				
 				quat_to_axis_angle(td->ext->rotAxis, td->ext->rotAngle, tquat);
@@ -3258,7 +3333,7 @@ static void applyRotation(TransInfo *t, float angle, float axis[3])
 	
 	vec_rot_to_mat3(mat, axis, angle);
 	
-	for (i = 0 ; i < t->total; i++, td++) {
+	for (i = 0; i < t->total; i++, td++) {
 		
 		if (td->flag & TD_NOACTION)
 			break;
@@ -3280,7 +3355,7 @@ static void applyRotation(TransInfo *t, float angle, float axis[3])
 
 int Rotation(TransInfo *t, const int UNUSED(mval[2]))
 {
-	char str[128], *spos= str;
+	char str[128], *spos = str;
 	
 	float final;
 
@@ -3305,16 +3380,16 @@ int Rotation(TransInfo *t, const int UNUSED(mval[2]))
 		
 		outputNumInput(&(t->num), c);
 		
-		spos+= sprintf(spos, "Rot: %s %s %s", &c[0], t->con.text, t->proptext);
+		spos += sprintf(spos, "Rot: %s %s %s", &c[0], t->con.text, t->proptext);
 
 		/* Clamp between -180 and 180 */
-		final= angle_wrap_rad(DEG2RADF(final));
+		final = angle_wrap_rad(DEG2RADF(final));
 	}
 	else {
 		spos += sprintf(spos, "Rot: %.2f%s %s", RAD2DEGF(final), t->con.text, t->proptext);
 	}
 	
-	if (t->flag & (T_PROP_EDIT|T_PROP_CONNECTED)) {
+	if (t->flag & (T_PROP_EDIT | T_PROP_CONNECTED)) {
 		spos += sprintf(spos, " Proportional size: %.2f", t->prop_size);
 	}
 	(void)spos;
@@ -3343,7 +3418,7 @@ void initTrackball(TransInfo *t)
 	t->idx_max = 1;
 	t->num.idx_max = 1;
 	t->snap[0] = 0.0f;
-	t->snap[1] = (float)((5.0/180)*M_PI);
+	t->snap[1] = (float)((5.0 / 180) * M_PI);
 	t->snap[2] = t->snap[1] * 0.2f;
 
 	t->num.increment = 1.0f;
@@ -3362,7 +3437,7 @@ static void applyTrackball(TransInfo *t, float axis1[3], float axis2[3], float a
 
 	mul_m3_m3m3(mat, smat, totmat);
 
-	for (i = 0 ; i < t->total; i++, td++) {
+	for (i = 0; i < t->total; i++, td++) {
 		if (td->flag & TD_NOACTION)
 			break;
 
@@ -3382,7 +3457,7 @@ static void applyTrackball(TransInfo *t, float axis1[3], float axis2[3], float a
 
 int Trackball(TransInfo *t, const int UNUSED(mval[2]))
 {
-	char str[128], *spos= str;
+	char str[128], *spos = str;
 	float axis1[3], axis2[3];
 	float mat[3][3], totmat[3][3], smat[3][3];
 	float phi[2];
@@ -3413,7 +3488,7 @@ int Trackball(TransInfo *t, const int UNUSED(mval[2]))
 		spos += sprintf(spos, "Trackball: %.2f %.2f %s", RAD2DEGF(phi[0]), RAD2DEGF(phi[1]), t->proptext);
 	}
 
-	if (t->flag & (T_PROP_EDIT|T_PROP_CONNECTED)) {
+	if (t->flag & (T_PROP_EDIT | T_PROP_CONNECTED)) {
 		spos += sprintf(spos, " Proportional size: %.2f", t->prop_size);
 	}
 	(void)spos;
@@ -3449,7 +3524,7 @@ void initTranslation(TransInfo *t)
 
 	initMouseInputMode(t, &t->mouse, INPUT_VECTOR);
 
-	t->idx_max = (t->flag & T_2D_EDIT)? 1: 2;
+	t->idx_max = (t->flag & T_2D_EDIT) ? 1 : 2;
 	t->num.flag = 0;
 	t->num.idx_max = t->idx_max;
 
@@ -3477,7 +3552,7 @@ void initTranslation(TransInfo *t)
 
 static void headerTranslation(TransInfo *t, float vec[3], char *str)
 {
-	char *spos= str;
+	char *spos = str;
 	char tvec[60];
 	char distvec[20];
 	char autoik[20];
@@ -3495,10 +3570,10 @@ static void headerTranslation(TransInfo *t, float vec[3], char *str)
 
 		dist = len_v3(vec);
 		if (!(t->flag & T_2D_EDIT) && t->scene->unit.system) {
-			int i, do_split= t->scene->unit.flag & USER_UNIT_OPT_SPLIT ? 1:0;
+			int i, do_split = t->scene->unit.flag & USER_UNIT_OPT_SPLIT ? 1 : 0;
 
-			for (i=0; i<3; i++)
-				bUnit_AsString(&tvec[i*20], 20, dvec[i]*t->scene->unit.scale_length, 4, t->scene->unit.system, B_UNIT_LENGTH, do_split, 1);
+			for (i = 0; i < 3; i++)
+				bUnit_AsString(&tvec[i * 20], 20, dvec[i] * t->scene->unit.scale_length, 4, t->scene->unit.system, B_UNIT_LENGTH, do_split, 1);
 		}
 		else {
 			sprintf(&tvec[0], "%.4f", dvec[0]);
@@ -3508,33 +3583,33 @@ static void headerTranslation(TransInfo *t, float vec[3], char *str)
 	}
 
 	if (!(t->flag & T_2D_EDIT) && t->scene->unit.system)
-		bUnit_AsString(distvec, sizeof(distvec), dist*t->scene->unit.scale_length, 4, t->scene->unit.system, B_UNIT_LENGTH, t->scene->unit.flag & USER_UNIT_OPT_SPLIT, 0);
-	else if ( dist > 1e10f || dist < -1e10f )	/* prevent string buffer overflow */
+		bUnit_AsString(distvec, sizeof(distvec), dist * t->scene->unit.scale_length, 4, t->scene->unit.system, B_UNIT_LENGTH, t->scene->unit.flag & USER_UNIT_OPT_SPLIT, 0);
+	else if (dist > 1e10f || dist < -1e10f)     /* prevent string buffer overflow */
 		sprintf(distvec, "%.4e", dist);
 	else
 		sprintf(distvec, "%.4f", dist);
 
 	if (t->flag & T_AUTOIK) {
-		short chainlen= t->settings->autoik_chainlen;
+		short chainlen = t->settings->autoik_chainlen;
 
 		if (chainlen)
 			sprintf(autoik, "AutoIK-Len: %d", chainlen);
 		else
-			autoik[0]= '\0';
+			autoik[0] = '\0';
 	}
 	else
-		autoik[0]= '\0';
+		autoik[0] = '\0';
 
 	if (t->con.mode & CON_APPLY) {
 		switch (t->num.idx_max) {
-		case 0:
-			spos += sprintf(spos, "D: %s (%s)%s %s  %s", &tvec[0], distvec, t->con.text, t->proptext, &autoik[0]);
-			break;
-		case 1:
-			spos += sprintf(spos, "D: %s   D: %s (%s)%s %s  %s", &tvec[0], &tvec[20], distvec, t->con.text, t->proptext, &autoik[0]);
-			break;
-		case 2:
-			spos += sprintf(spos, "D: %s   D: %s  D: %s (%s)%s %s  %s", &tvec[0], &tvec[20], &tvec[40], distvec, t->con.text, t->proptext, &autoik[0]);
+			case 0:
+				spos += sprintf(spos, "D: %s (%s)%s %s  %s", &tvec[0], distvec, t->con.text, t->proptext, &autoik[0]);
+				break;
+			case 1:
+				spos += sprintf(spos, "D: %s   D: %s (%s)%s %s  %s", &tvec[0], &tvec[20], distvec, t->con.text, t->proptext, &autoik[0]);
+				break;
+			case 2:
+				spos += sprintf(spos, "D: %s   D: %s  D: %s (%s)%s %s  %s", &tvec[0], &tvec[20], &tvec[40], distvec, t->con.text, t->proptext, &autoik[0]);
 		}
 	}
 	else {
@@ -3544,7 +3619,7 @@ static void headerTranslation(TransInfo *t, float vec[3], char *str)
 			spos += sprintf(spos, "Dx: %s   Dy: %s  Dz: %s (%s)%s %s  %s", &tvec[0], &tvec[20], &tvec[40], distvec, t->con.text, t->proptext, &autoik[0]);
 	}
 	
-	if (t->flag & (T_PROP_EDIT|T_PROP_CONNECTED)) {
+	if (t->flag & (T_PROP_EDIT | T_PROP_CONNECTED)) {
 		spos += sprintf(spos, " Proportional size: %.2f", t->prop_size);
 	}
 	(void)spos;
@@ -3556,7 +3631,7 @@ static void applyTranslation(TransInfo *t, float vec[3])
 	float tvec[3];
 	int i;
 
-	for (i = 0 ; i < t->total; i++, td++) {
+	for (i = 0; i < t->total; i++, td++) {
 		if (td->flag & TD_NOACTION)
 			break;
 		
@@ -3660,7 +3735,7 @@ int Translation(TransInfo *t, const int UNUSED(mval[2]))
 void initShrinkFatten(TransInfo *t)
 {
 	// If not in mesh edit mode, fallback to Resize
-	if (t->obedit==NULL || t->obedit->type != OB_MESH) {
+	if (t->obedit == NULL || t->obedit->type != OB_MESH) {
 		initResize(t);
 	}
 	else {
@@ -3712,7 +3787,7 @@ int ShrinkFatten(TransInfo *t, const int UNUSED(mval[2]))
 
 	t->values[0] = distance;
 
-	for (i = 0 ; i < t->total; i++, td++) {
+	for (i = 0; i < t->total; i++, td++) {
 		if (td->flag & TD_NOACTION)
 			break;
 
@@ -3745,12 +3820,12 @@ void initTilt(TransInfo *t)
 	t->idx_max = 0;
 	t->num.idx_max = 0;
 	t->snap[0] = 0.0f;
-	t->snap[1] = (float)((5.0/180)*M_PI);
+	t->snap[1] = (float)((5.0 / 180) * M_PI);
 	t->snap[2] = t->snap[1] * 0.2f;
 
 	t->num.increment = t->snap[1];
 
-	t->flag |= T_NO_CONSTRAINT|T_NO_PROJECT;
+	t->flag |= T_NO_CONSTRAINT | T_NO_PROJECT;
 }
 
 
@@ -3782,7 +3857,7 @@ int Tilt(TransInfo *t, const int UNUSED(mval[2]))
 		sprintf(str, "Tilt: %.2f %s", RAD2DEGF(final), t->proptext);
 	}
 
-	for (i = 0 ; i < t->total; i++, td++) {
+	for (i = 0; i < t->total; i++, td++) {
 		if (td->flag & TD_NOACTION)
 			break;
 
@@ -3849,7 +3924,75 @@ int CurveShrinkFatten(TransInfo *t, const int UNUSED(mval[2]))
 		sprintf(str, "Shrink/Fatten: %3f", ratio);
 	}
 
-	for (i = 0 ; i < t->total; i++, td++) {
+	for (i = 0; i < t->total; i++, td++) {
+		if (td->flag & TD_NOACTION)
+			break;
+
+		if (td->flag & TD_SKIP)
+			continue;
+
+		if (td->val) {
+			*td->val = td->ival * ratio;
+			/* apply PET */
+			*td->val = (*td->val * td->factor) + ((1.0f - td->factor) * td->ival);
+			if (*td->val <= 0.0f) *td->val = 0.001f;
+		}
+	}
+
+	recalcData(t);
+
+	ED_area_headerprint(t->sa, str);
+
+	return 1;
+}
+
+
+void initMaskShrinkFatten(TransInfo *t)
+{
+	t->mode = TFM_MASK_SHRINKFATTEN;
+	t->transform = MaskShrinkFatten;
+
+	initMouseInputMode(t, &t->mouse, INPUT_SPRING);
+
+	t->idx_max = 0;
+	t->num.idx_max = 0;
+	t->snap[0] = 0.0f;
+	t->snap[1] = 0.1f;
+	t->snap[2] = t->snap[1] * 0.1f;
+
+	t->num.increment = t->snap[1];
+
+	t->flag |= T_NO_ZERO;
+	t->num.flag |= NUM_NO_ZERO;
+
+	t->flag |= T_NO_CONSTRAINT;
+}
+
+int MaskShrinkFatten(TransInfo *t, const int UNUSED(mval[2]))
+{
+	TransData *td = t->data;
+	float ratio;
+	int i;
+	char str[50];
+
+	ratio = t->values[0];
+
+	snapGrid(t, &ratio);
+
+	applyNumInput(&t->num, &ratio);
+
+	/* header print for NumInput */
+	if (hasNumInput(&t->num)) {
+		char c[20];
+
+		outputNumInput(&(t->num), c);
+		sprintf(str, "Shrink/Fatten: %s", c);
+	}
+	else {
+		sprintf(str, "Shrink/Fatten: %3f", ratio);
+	}
+
+	for (i = 0; i < t->total; i++, td++) {
 		if (td->flag & TD_NOACTION)
 			break;
 
@@ -3857,8 +4000,9 @@ int CurveShrinkFatten(TransInfo *t, const int UNUSED(mval[2]))
 			continue;
 
 		if (td->val) {
-			// *td->val= ratio;
-			*td->val= td->ival*ratio;
+			*td->val = td->ival * ratio;
+			/* apply PET */
+			*td->val = (*td->val * td->factor) + ((1.0f - td->factor) * td->ival);
 			if (*td->val <= 0.0f) *td->val = 0.001f;
 		}
 	}
@@ -3922,7 +4066,7 @@ int PushPull(TransInfo *t, const int UNUSED(mval[2]))
 		t->con.applyRot(t, NULL, axis, NULL);
 	}
 
-	for (i = 0 ; i < t->total; i++, td++) {
+	for (i = 0; i < t->total; i++, td++) {
 		if (td->flag & TD_NOACTION)
 			break;
 
@@ -3995,28 +4139,28 @@ int handleEventBevel(TransInfo *t, wmEvent *event)
 		if (!G.editBMesh) return 0;
 
 		switch (event->type) {
-		case MIDDLEMOUSE:
-			G.editBMesh->options ^= BME_BEVEL_VERT;
-			t->state = TRANS_CANCEL;
-			return 1;
-		//case PADPLUSKEY:
-		//	G.editBMesh->options ^= BME_BEVEL_RES;
-		//	G.editBMesh->res += 1;
-		//	if (G.editBMesh->res > 4) {
-		//		G.editBMesh->res = 4;
-		//	}
-		//	t->state = TRANS_CANCEL;
-		//	return 1;
-		//case PADMINUS:
-		//	G.editBMesh->options ^= BME_BEVEL_RES;
-		//	G.editBMesh->res -= 1;
-		//	if (G.editBMesh->res < 0) {
-		//		G.editBMesh->res = 0;
-		//	}
-		//	t->state = TRANS_CANCEL;
-		//	return 1;
-		default:
-			return 0;
+			case MIDDLEMOUSE:
+				G.editBMesh->options ^= BME_BEVEL_VERT;
+				t->state = TRANS_CANCEL;
+				return 1;
+			//case PADPLUSKEY:
+			//	G.editBMesh->options ^= BME_BEVEL_RES;
+			//	G.editBMesh->res += 1;
+			//	if (G.editBMesh->res > 4) {
+			//		G.editBMesh->res = 4;
+			//	}
+			//	t->state = TRANS_CANCEL;
+			//	return 1;
+			//case PADMINUS:
+			//	G.editBMesh->options ^= BME_BEVEL_RES;
+			//	G.editBMesh->res -= 1;
+			//	if (G.editBMesh->res < 0) {
+			//		G.editBMesh->res = 0;
+			//	}
+			//	t->state = TRANS_CANCEL;
+			//	return 1;
+			default:
+				return 0;
 		}
 	}
 	return 0;
@@ -4053,7 +4197,7 @@ int Bevel(TransInfo *t, const int UNUSED(mval[2]))
 	}
 
 	if (distance < 0) distance = -distance;
-	for (i = 0 ; i < t->total; i++, td++) {
+	for (i = 0; i < t->total; i++, td++) {
 		if (td->axismtx[1][0] > 0 && distance > td->axismtx[1][0]) {
 			d = td->axismtx[1][0];
 		}
@@ -4087,7 +4231,7 @@ void initBevelWeight(TransInfo *t)
 
 	t->num.increment = t->snap[1];
 
-	t->flag |= T_NO_CONSTRAINT|T_NO_PROJECT;
+	t->flag |= T_NO_CONSTRAINT | T_NO_PROJECT;
 }
 
 int BevelWeight(TransInfo *t, const int UNUSED(mval[2]))
@@ -4125,7 +4269,7 @@ int BevelWeight(TransInfo *t, const int UNUSED(mval[2]))
 			sprintf(str, "Bevel Weight: %.3f %s", weight, t->proptext);
 	}
 
-	for (i = 0 ; i < t->total; i++, td++) {
+	for (i = 0; i < t->total; i++, td++) {
 		if (td->flag & TD_NOACTION)
 			break;
 
@@ -4160,7 +4304,7 @@ void initCrease(TransInfo *t)
 
 	t->num.increment = t->snap[1];
 
-	t->flag |= T_NO_CONSTRAINT|T_NO_PROJECT;
+	t->flag |= T_NO_CONSTRAINT | T_NO_PROJECT;
 }
 
 int Crease(TransInfo *t, const int UNUSED(mval[2]))
@@ -4198,7 +4342,7 @@ int Crease(TransInfo *t, const int UNUSED(mval[2]))
 			sprintf(str, "Crease: %.3f %s", crease, t->proptext);
 	}
 
-	for (i = 0 ; i < t->total; i++, td++) {
+	for (i = 0; i < t->total; i++, td++) {
 		if (td->flag & TD_NOACTION)
 			break;
 
@@ -4276,11 +4420,11 @@ static void ElementBoneSize(TransInfo *t, TransData *td, float mat[3][3])
 	}
 
 	/* we've tucked the scale in loc */
-	oldy= td->iloc[1];
+	oldy = td->iloc[1];
 	size_to_mat3(sizemat, td->iloc);
 	mul_m3_m3m3(tmat, tmat, sizemat);
 	mat3_to_size(td->loc, tmat);
-	td->loc[1]= oldy;
+	td->loc[1] = oldy;
 }
 
 int BoneSize(TransInfo *t, const int mval[2])
@@ -4293,8 +4437,8 @@ int BoneSize(TransInfo *t, const int mval[2])
 	
 	// TRANSFORM_FIX_ME MOVE TO MOUSE INPUT
 	/* for manipulator, center handle, the scaling can't be done relative to center */
-	if ((t->flag & T_USES_MANIPULATOR) && t->con.mode==0) {
-		ratio = 1.0f - ((t->imval[0] - mval[0]) + (t->imval[1] - mval[1]))/100.0f;
+	if ((t->flag & T_USES_MANIPULATOR) && t->con.mode == 0) {
+		ratio = 1.0f - ((t->imval[0] - mval[0]) + (t->imval[1] - mval[1])) / 100.0f;
 	}
 	else {
 		ratio = t->values[0];
@@ -4315,11 +4459,11 @@ int BoneSize(TransInfo *t, const int mval[2])
 		t->con.applySize(t, NULL, mat);
 	}
 	
-	copy_m3_m3(t->mat, mat);	// used in manipulator
+	copy_m3_m3(t->mat, mat);    // used in manipulator
 	
 	headerBoneSize(t, size, str);
 	
-	for (i = 0 ; i < t->total; i++, td++) {
+	for (i = 0; i < t->total; i++, td++) {
 		if (td->flag & TD_NOACTION)
 			break;
 		
@@ -4354,7 +4498,7 @@ void initBoneEnvelope(TransInfo *t)
 	
 	t->num.increment = t->snap[1];
 
-	t->flag |= T_NO_CONSTRAINT|T_NO_PROJECT;
+	t->flag |= T_NO_CONSTRAINT | T_NO_PROJECT;
 }
 
 int BoneEnvelope(TransInfo *t, const int UNUSED(mval[2]))
@@ -4381,7 +4525,7 @@ int BoneEnvelope(TransInfo *t, const int UNUSED(mval[2]))
 		sprintf(str, "Envelope: %3f", ratio);
 	}
 	
-	for (i = 0 ; i < t->total; i++, td++) {
+	for (i = 0; i < t->total; i++, td++) {
 		if (td->flag & TD_NOACTION)
 			break;
 		
@@ -4391,9 +4535,9 @@ int BoneEnvelope(TransInfo *t, const int UNUSED(mval[2]))
 		if (td->val) {
 			/* if the old/original value was 0.0f, then just use ratio */
 			if (td->ival)
-				*td->val= td->ival*ratio;
+				*td->val = td->ival * ratio;
 			else
-				*td->val= ratio;
+				*td->val = ratio;
 		}
 	}
 	
@@ -4423,7 +4567,7 @@ static BMLoop *get_next_loop(BMVert *v, BMLoop *l,
 {
 	BMLoop *firstl;
 	float a[3] = {0.0f, 0.0f, 0.0f}, n[3] = {0.0f, 0.0f, 0.0f};
-	int i=0;
+	int i = 0;
 
 	firstl = l;
 	do {
@@ -4525,8 +4669,8 @@ static int createSlideVerts(TransInfo *t)
 	BMBVHTree *btree = BMBVH_NewBVH(em, BMBVH_RESPECT_HIDDEN, NULL, NULL);
 	SmallHash table;
 	SlideData *sld = MEM_callocN(sizeof(*sld), "sld");
-	View3D *v3d = t->sa ? t->sa->spacedata.first : NULL;
-	RegionView3D *rv3d = t->ar ? t->ar->regiondata : NULL; /* background mode support */
+	View3D *v3d = NULL;
+	RegionView3D *rv3d = NULL;
 	ARegion *ar = t->ar;
 	float projectMat[4][4];
 	float mval[2] = {(float)t->mval[0], (float)t->mval[1]};
@@ -4534,11 +4678,17 @@ static int createSlideVerts(TransInfo *t)
 	float vec[3], vec2[3], lastvec[3] /*, size, dis=0.0, z */ /* UNUSED */;
 	int numsel, i, j;
 
+	if (t->spacetype == SPACE_VIEW3D) {
+		/* background mode support */
+		v3d = t->sa ? t->sa->spacedata.first : NULL;
+		rv3d = t->ar ? t->ar->regiondata : NULL;
+	}
+
 	sld->is_proportional = TRUE;
 	sld->curr_sv_index = 0;
 	sld->flipped_vtx = FALSE;
 
-	if (!v3d) {
+	if (!rv3d) {
 		/* ok, let's try to survive this */
 		unit_m4(projectMat);
 	}
@@ -4675,7 +4825,7 @@ static int createSlideVerts(TransInfo *t)
 				sv->down = BM_edge_other_vert(l->e, v);
 			}
 
-			v2=v, v = BM_edge_other_vert(e, v);
+			v2 = v, v = BM_edge_other_vert(e, v);
 
 			e1 = e;
 			e = get_other_edge(v, e);
@@ -4732,13 +4882,13 @@ static int createSlideVerts(TransInfo *t)
 			/* search cross edges for visible edge to the mouse cursor,
 			 * then use the shared vertex to calculate screen vector*/
 			dis2 = -1.0f;
-			for (i=0; i<2; i++) {
-				v = i?e->v1:e->v2;
+			for (i = 0; i < 2; i++) {
+				v = i ? e->v1 : e->v2;
 				BM_ITER_ELEM (e2, &iter2, v, BM_EDGES_OF_VERT) {
 					if (BM_elem_flag_test(e2, BM_ELEM_SELECT))
 						continue;
 					
-					if (!BMBVH_EdgeVisible(btree, e2, ar, v3d, t->obedit))
+					if (v3d && !BMBVH_EdgeVisible(btree, e2, ar, v3d, t->obedit))
 						continue;
 					
 					j = GET_INT_FROM_POINTER(BLI_smallhash_lookup(&table, (uintptr_t)v));
@@ -4775,7 +4925,7 @@ static int createSlideVerts(TransInfo *t)
 
 	/*create copies of faces for customdata projection*/
 	sv_array = sld->sv;
-	for (i=0; i<sld->totsv; i++, sv_array++) {
+	for (i = 0; i < sld->totsv; i++, sv_array++) {
 		BMIter fiter, liter;
 		BMFace *f;
 		BMLoop *l;
@@ -4801,8 +4951,8 @@ static int createSlideVerts(TransInfo *t)
 		BLI_smallhash_insert(&sld->vhash, (uintptr_t)sv_array->v, sv_array);
 	}
 
-	calcNonProportionalEdgeSlide(t, sld, mval);
-
+	if (rv3d)
+		calcNonProportionalEdgeSlide(t, sld, mval);
 
 	sld->origfaces_init = TRUE;
 	sld->em = em;
@@ -4851,7 +5001,7 @@ void projectSVData(TransInfo *t, int final)
 
 	BLI_smallhash_init(&visit);
 	
-	for (i=0, sv = sld->sv; i < sld->totsv; sv++, i++) {
+	for (i = 0, sv = sld->sv; i < sld->totsv; sv++, i++) {
 		BMIter fiter;
 		BMFace *f;
 		
@@ -4917,7 +5067,7 @@ void projectSVData(TransInfo *t, int final)
 					BMEdge *e_sel;
 
 					BM_ITER_ELEM (e_sel, &eiter, l->v, BM_EDGES_OF_VERT) {
-						if (BM_elem_flag_test(e_sel, BM_ELEM_SELECT)) {;
+						if (BM_elem_flag_test(e_sel, BM_ELEM_SELECT)) {
 							break;
 						}
 					}
@@ -4983,7 +5133,7 @@ void freeSlideTempFaces(SlideData *sld)
 		BMFace *copyf;
 
 		copyf = BLI_smallhash_iternew(&sld->origfaces, &hiter, NULL);
-		for (; copyf; copyf=BLI_smallhash_iternext(&hiter, NULL)) {
+		for (; copyf; copyf = BLI_smallhash_iternext(&hiter, NULL)) {
 			BM_face_verts_kill(sld->em->bm, copyf);
 		}
 
@@ -5004,7 +5154,7 @@ void freeSlideVerts(TransInfo *t)
 		LinkNode *look = sld->vertlist;
 		GHash *vertgh = sld->vhash;
 		while (look) {
-			sv  = BLI_ghash_lookup(vertgh, (EditVert*)look->link);
+			sv  = BLI_ghash_lookup(vertgh, (EditVert *)look->link);
 			if (sv != NULL) {
 				sv->up->f &= !SELECT;
 				sv->down->f &= !SELECT;
@@ -5040,7 +5190,7 @@ void initEdgeSlide(TransInfo *t)
 	t->handleEvent = handleEventEdgeSlide;
 
 	if (!createSlideVerts(t)) {
-		t->state= TRANS_CANCEL;
+		t->state = TRANS_CANCEL;
 		return;
 	}
 	
@@ -5063,12 +5213,12 @@ void initEdgeSlide(TransInfo *t)
 
 	t->num.increment = t->snap[1];
 
-	t->flag |= T_NO_CONSTRAINT|T_NO_PROJECT;
+	t->flag |= T_NO_CONSTRAINT | T_NO_PROJECT;
 }
 
 int handleEventEdgeSlide(struct TransInfo *t, struct wmEvent *event)
 {
-	if (t->flag & TFM_EDGE_SLIDE) {
+	if (t->mode == TFM_EDGE_SLIDE) {
 		SlideData *sld = t->customData;
 
 		if (sld) {
@@ -5090,11 +5240,11 @@ int handleEventEdgeSlide(struct TransInfo *t, struct wmEvent *event)
 				}
 				case EVT_MODAL_MAP: {
 					switch (event->val) {
-						case TFM_WHEEL_DOWN_EVT: {
+						case TFM_MODAL_EDGESLIDE_DOWN: {
 							sld->curr_sv_index = ((sld->curr_sv_index - 1) + sld->totsv) % sld->totsv;
 							break;
 						}
-						case TFM_WHEEL_UP_EVT: {
+						case TFM_MODAL_EDGESLIDE_UP: {
 							sld->curr_sv_index = (sld->curr_sv_index + 1) % sld->totsv;
 							break;
 						}
@@ -5110,7 +5260,7 @@ int handleEventEdgeSlide(struct TransInfo *t, struct wmEvent *event)
 
 void drawNonPropEdge(const struct bContext *C, TransInfo *t)
 {
-	if (t->flag & TFM_EDGE_SLIDE) {
+	if (t->mode == TFM_EDGE_SLIDE) {
 		SlideData *sld = (SlideData *)t->customData;
 		/* Non-Prop mode */
 		if (sld && sld->is_proportional == FALSE) {
@@ -5192,7 +5342,7 @@ static int doEdgeSlide(TransInfo *t, float perc)
 	sld->perc = perc;
 
 	sv = svlist;
-	for (i=0; i<sld->totsv; i++, sv++) {
+	for (i = 0; i < sld->totsv; i++, sv++) {
 		if (sld->is_proportional == FALSE) {
 			TransDataSlideVert *curr_sv = &sld->sv[sld->curr_sv_index];
 			float cur_sel = curr_sv->edge_len;
@@ -5257,11 +5407,11 @@ int EdgeSlide(TransInfo *t, const int UNUSED(mval[2]))
 		outputNumInput(&(t->num), c);
 
 		BLI_snprintf(str, sizeof(str), "Edge Slide: %s (E)ven: %s, (F)lipped: %s",
-		             &c[0], !is_proportional ? "ON" : "OFF", flipped ? "ON" : "OFF" );
+		             &c[0], !is_proportional ? "ON" : "OFF", flipped ? "ON" : "OFF");
 	}
 	else {
 		BLI_snprintf(str, sizeof(str), "Edge Slide: %.2f (E)ven: %s, (F)lipped: %s",
-		             final, !is_proportional ? "ON" : "OFF", flipped ? "ON" : "OFF" );
+		             final, !is_proportional ? "ON" : "OFF", flipped ? "ON" : "OFF");
 	}
 
 	CLAMP(final, -1.0f, 1.0f);
@@ -5295,12 +5445,12 @@ void initBoneRoll(TransInfo *t)
 	t->idx_max = 0;
 	t->num.idx_max = 0;
 	t->snap[0] = 0.0f;
-	t->snap[1] = (float)((5.0/180)*M_PI);
+	t->snap[1] = (float)((5.0 / 180) * M_PI);
 	t->snap[2] = t->snap[1] * 0.2f;
 
 	t->num.increment = 1.0f;
 
-	t->flag |= T_NO_CONSTRAINT|T_NO_PROJECT;
+	t->flag |= T_NO_CONSTRAINT | T_NO_PROJECT;
 }
 
 int BoneRoll(TransInfo *t, const int UNUSED(mval[2]))
@@ -5375,11 +5525,11 @@ int BakeTime(TransInfo *t, const int mval[2])
 
 	if (t->mouse.precision) {
 		/* calculate ratio for shiftkey pos, and for total, and blend these for precision */
-		time= (float)(t->center2d[0] - t->mouse.precision_mval[0]) * fac;
-		time+= 0.1f*((float)(t->center2d[0]*fac - mval[0]) -time);
+		time = (float)(t->center2d[0] - t->mouse.precision_mval[0]) * fac;
+		time += 0.1f * ((float)(t->center2d[0] * fac - mval[0]) - time);
 	}
 	else {
-		time = (float)(t->center2d[0] - mval[0])*fac;
+		time = (float)(t->center2d[0] - mval[0]) * fac;
 	}
 
 	snapGrid(t, &time);
@@ -5405,7 +5555,7 @@ int BakeTime(TransInfo *t, const int mval[2])
 			sprintf(str, "Time: %.3f %s", time, t->proptext);
 	}
 
-	for (i = 0 ; i < t->total; i++, td++) {
+	for (i = 0; i < t->total; i++, td++) {
 		if (td->flag & TD_NOACTION)
 			break;
 
@@ -5464,7 +5614,7 @@ int Mirror(TransInfo *t, const int UNUSED(mval[2]))
 
 		sprintf(str, "Mirror%s", t->con.text);
 
-		for (i = 0, td=t->data; i < t->total; i++, td++) {
+		for (i = 0, td = t->data; i < t->total; i++, td++) {
 			if (td->flag & TD_NOACTION)
 				break;
 
@@ -5483,7 +5633,7 @@ int Mirror(TransInfo *t, const int UNUSED(mval[2]))
 
 		size_to_mat3(mat, size);
 
-		for (i = 0, td=t->data; i < t->total; i++, td++) {
+		for (i = 0, td = t->data; i < t->total; i++, td++) {
 			if (td->flag & TD_NOACTION)
 				break;
 
@@ -5524,7 +5674,7 @@ int Align(TransInfo *t, const int UNUSED(mval[2]))
 	/* saving original center */
 	copy_v3_v3(center, t->center);
 
-	for (i = 0 ; i < t->total; i++, td++) {
+	for (i = 0; i < t->total; i++, td++) {
 		float mat[3][3], invmat[3][3];
 
 		if (td->flag & TD_NOACTION)
@@ -5534,7 +5684,7 @@ int Align(TransInfo *t, const int UNUSED(mval[2]))
 			continue;
 
 		/* around local centers */
-		if (t->flag & (T_OBJECT|T_POSE)) {
+		if (t->flag & (T_OBJECT | T_POSE)) {
 			copy_v3_v3(t->center, td->center);
 		}
 		else {
@@ -5598,7 +5748,7 @@ static void applySeqSlide(TransInfo *t, float val[2])
 	TransData *td = t->data;
 	int i;
 
-	for (i = 0 ; i < t->total; i++, td++) {
+	for (i = 0; i < t->total; i++, td++) {
 		float tvec[2];
 
 		if (td->flag & TD_NOACTION)
@@ -5655,38 +5805,38 @@ int SeqSlide(TransInfo *t, const int UNUSED(mval[2]))
 // XXX these modifier checks should be keymappable
 static short getAnimEdit_SnapMode(TransInfo *t)
 {
-	short autosnap= SACTSNAP_OFF;
+	short autosnap = SACTSNAP_OFF;
 	
 	if (t->spacetype == SPACE_ACTION) {
-		SpaceAction *saction= (SpaceAction *)t->sa->spacedata.first;
+		SpaceAction *saction = (SpaceAction *)t->sa->spacedata.first;
 		
 		if (saction)
-			autosnap= saction->autosnap;
+			autosnap = saction->autosnap;
 	}
 	else if (t->spacetype == SPACE_IPO) {
-		SpaceIpo *sipo= (SpaceIpo *)t->sa->spacedata.first;
+		SpaceIpo *sipo = (SpaceIpo *)t->sa->spacedata.first;
 		
 		if (sipo)
-			autosnap= sipo->autosnap;
+			autosnap = sipo->autosnap;
 	}
 	else if (t->spacetype == SPACE_NLA) {
-		SpaceNla *snla= (SpaceNla *)t->sa->spacedata.first;
+		SpaceNla *snla = (SpaceNla *)t->sa->spacedata.first;
 		
 		if (snla)
-			autosnap= snla->autosnap;
+			autosnap = snla->autosnap;
 	}
 	else {
-		autosnap= SACTSNAP_OFF;
+		autosnap = SACTSNAP_OFF;
 	}
 	
 	/* toggle autosnap on/off 
-	 * 	- when toggling on, prefer nearest frame over 1.0 frame increments
+	 *  - when toggling on, prefer nearest frame over 1.0 frame increments
 	 */
 	if (t->modifiers & MOD_SNAP_INVERT) {
 		if (autosnap)
-			autosnap= SACTSNAP_OFF;
+			autosnap = SACTSNAP_OFF;
 		else
-			autosnap= SACTSNAP_FRAME;
+			autosnap = SACTSNAP_FRAME;
 	}
 
 	return autosnap;
@@ -5701,19 +5851,19 @@ static short getAnimEdit_DrawTime(TransInfo *t)
 	short drawtime;
 
 	if (t->spacetype == SPACE_ACTION) {
-		SpaceAction *saction= (SpaceAction *)t->sa->spacedata.first;
+		SpaceAction *saction = (SpaceAction *)t->sa->spacedata.first;
 		
-		drawtime = (saction->flag & SACTION_DRAWTIME)? 1 : 0;
+		drawtime = (saction->flag & SACTION_DRAWTIME) ? 1 : 0;
 	}
 	else if (t->spacetype == SPACE_NLA) {
-		SpaceNla *snla= (SpaceNla *)t->sa->spacedata.first;
+		SpaceNla *snla = (SpaceNla *)t->sa->spacedata.first;
 		
-		drawtime = (snla->flag & SNLA_DRAWTIME)? 1 : 0;
+		drawtime = (snla->flag & SNLA_DRAWTIME) ? 1 : 0;
 	}
 	else if (t->spacetype == SPACE_IPO) {
-		SpaceIpo *sipo= (SpaceIpo *)t->sa->spacedata.first;
+		SpaceIpo *sipo = (SpaceIpo *)t->sa->spacedata.first;
 		
-		drawtime = (sipo->flag & SIPO_DRAWTIME)? 1 : 0;
+		drawtime = (sipo->flag & SIPO_DRAWTIME) ? 1 : 0;
 	}	
 	else {
 		drawtime = 0;
@@ -5733,23 +5883,23 @@ static void doAnimEdit_SnapFrame(TransInfo *t, TransData *td, TransData2D *td2d,
 
 #if 0   /* 'do_time' disabled for now */
 
-		const Scene *scene= t->scene;
-		const short do_time= 0; //getAnimEdit_DrawTime(t); // NOTE: this works, but may be confusing behavior given the option's label, hence disabled
-		const double secf= FPS;
+		const Scene *scene = t->scene;
+		const short do_time = 0; //getAnimEdit_DrawTime(t); // NOTE: this works, but may be confusing behavior given the option's label, hence disabled
+		const double secf = FPS;
 #endif
 		double val;
 		
 		/* convert frame to nla-action time (if needed) */
 		if (adt)
-			val= BKE_nla_tweakedit_remap(adt, *(td->val), NLATIME_CONVERT_MAP);
+			val = BKE_nla_tweakedit_remap(adt, *(td->val), NLATIME_CONVERT_MAP);
 		else
-			val= *(td->val);
+			val = *(td->val);
 		
-#if 0	/* 'do_time' disabled for now */
+#if 0   /* 'do_time' disabled for now */
 
 		/* do the snapping to nearest frame/second */
 		if (do_time) {
-			val= (float)(floor((val/secf) + 0.5f) * secf);
+			val = (float)(floor((val / secf) + 0.5f) * secf);
 		}
 		else
 #endif
@@ -5759,9 +5909,9 @@ static void doAnimEdit_SnapFrame(TransInfo *t, TransData *td, TransData2D *td2d,
 		
 		/* convert frame out of nla-action time */
 		if (adt)
-			*(td->val)= BKE_nla_tweakedit_remap(adt, val, NLATIME_CONVERT_UNMAP);
+			*(td->val) = BKE_nla_tweakedit_remap(adt, val, NLATIME_CONVERT_UNMAP);
 		else
-			*(td->val)= val;
+			*(td->val) = val;
 	}
 	/* snap key to nearest marker? */
 	else if (autosnap == SACTSNAP_MARKER) {
@@ -5769,19 +5919,19 @@ static void doAnimEdit_SnapFrame(TransInfo *t, TransData *td, TransData2D *td2d,
 		
 		/* convert frame to nla-action time (if needed) */
 		if (adt)
-			val= BKE_nla_tweakedit_remap(adt, *(td->val), NLATIME_CONVERT_MAP);
+			val = BKE_nla_tweakedit_remap(adt, *(td->val), NLATIME_CONVERT_MAP);
 		else
-			val= *(td->val);
+			val = *(td->val);
 		
 		/* snap to nearest marker */
 		// TODO: need some more careful checks for where data comes from
-		val= (float)ED_markers_find_nearest_marker_time(&t->scene->markers, val);
+		val = (float)ED_markers_find_nearest_marker_time(&t->scene->markers, val);
 		
 		/* convert frame out of nla-action time */
 		if (adt)
-			*(td->val)= BKE_nla_tweakedit_remap(adt, val, NLATIME_CONVERT_UNMAP);
+			*(td->val) = BKE_nla_tweakedit_remap(adt, val, NLATIME_CONVERT_UNMAP);
 		else
-			*(td->val)= val;
+			*(td->val) = val;
 	}
 	
 	/* if the handles are to be moved too (as side-effect of keyframes moving, to keep the general effect) 
@@ -5832,21 +5982,21 @@ static void headerTimeTranslate(TransInfo *t, char *str)
 	}
 	else {
 		const Scene *scene = t->scene;
-		const short autosnap= getAnimEdit_SnapMode(t);
+		const short autosnap = getAnimEdit_SnapMode(t);
 		const short do_time = getAnimEdit_DrawTime(t);
-		const double secf= FPS;
+		const double secf = FPS;
 		float val = t->values[0];
 		
 		/* apply snapping + frame->seconds conversions */
 		if (autosnap == SACTSNAP_STEP) {
 			if (do_time)
-				val= floorf((double)val / secf + 0.5);
+				val = floorf((double)val / secf + 0.5);
 			else
-				val= floorf(val + 0.5f);
+				val = floorf(val + 0.5f);
 		}
 		else {
 			if (do_time)
-				val= (float)((double)val / secf);
+				val = (float)((double)val / secf);
 		}
 		
 		if (autosnap == SACTSNAP_FRAME)
@@ -5865,20 +6015,20 @@ static void applyTimeTranslate(TransInfo *t, float UNUSED(sval))
 	Scene *scene = t->scene;
 	int i;
 
-	const short do_time= getAnimEdit_DrawTime(t);
-	const double secf= FPS;
+	const short do_time = getAnimEdit_DrawTime(t);
+	const double secf = FPS;
 
-	const short autosnap= getAnimEdit_SnapMode(t);
+	const short autosnap = getAnimEdit_SnapMode(t);
 
 	float deltax, val /* , valprev */;
 
 	/* it doesn't matter whether we apply to t->data or t->data2d, but t->data2d is more convenient */
-	for (i = 0 ; i < t->total; i++, td++, td2d++) {
+	for (i = 0; i < t->total; i++, td++, td2d++) {
 		/* it is assumed that td->extra is a pointer to the AnimData,
 		 * whose active action is where this keyframe comes from
 		 * (this is only valid when not in NLA)
 		 */
-		AnimData *adt= (t->spacetype != SPACE_NLA) ? td->extra : NULL;
+		AnimData *adt = (t->spacetype != SPACE_NLA) ? td->extra : NULL;
 
 		/* valprev = *td->val; */ /* UNUSED */
 
@@ -5949,7 +6099,7 @@ void initTimeSlide(TransInfo *t)
 {
 	/* this tool is only really available in the Action Editor... */
 	if (t->spacetype == SPACE_ACTION) {
-		SpaceAction *saction= (SpaceAction *)t->sa->spacedata.first;
+		SpaceAction *saction = (SpaceAction *)t->sa->spacedata.first;
 
 		/* set flag for drawing stuff */
 		saction->flag |= SACTION_MOVING;
@@ -5985,12 +6135,12 @@ static void headerTimeSlide(TransInfo *t, float sval, char *str)
 		outputNumInput(&(t->num), tvec);
 	}
 	else {
-		float minx= *((float *)(t->customData));
-		float maxx= *((float *)(t->customData) + 1);
-		float cval= t->values[0];
+		float minx = *((float *)(t->customData));
+		float maxx = *((float *)(t->customData) + 1);
+		float cval = t->values[0];
 		float val;
 
-		val= 2.0f*(cval-sval) / (maxx-minx);
+		val = 2.0f * (cval - sval) / (maxx - minx);
 		CLAMP(val, -1.0f, 1.0f);
 
 		sprintf(&tvec[0], "%.4f", val);
@@ -6004,43 +6154,43 @@ static void applyTimeSlide(TransInfo *t, float sval)
 	TransData *td = t->data;
 	int i;
 
-	float minx= *((float *)(t->customData));
-	float maxx= *((float *)(t->customData) + 1);
+	float minx = *((float *)(t->customData));
+	float maxx = *((float *)(t->customData) + 1);
 
 	/* set value for drawing black line */
 	if (t->spacetype == SPACE_ACTION) {
-		SpaceAction *saction= (SpaceAction *)t->sa->spacedata.first;
+		SpaceAction *saction = (SpaceAction *)t->sa->spacedata.first;
 		float cvalf = t->values[0];
 
-		saction->timeslide= cvalf;
+		saction->timeslide = cvalf;
 	}
 
 	/* it doesn't matter whether we apply to t->data or t->data2d, but t->data2d is more convenient */
-	for (i = 0 ; i < t->total; i++, td++) {
+	for (i = 0; i < t->total; i++, td++) {
 		/* it is assumed that td->extra is a pointer to the AnimData,
 		 * whose active action is where this keyframe comes from
 		 * (this is only valid when not in NLA)
 		 */
-		AnimData *adt= (t->spacetype != SPACE_NLA) ? td->extra : NULL;
+		AnimData *adt = (t->spacetype != SPACE_NLA) ? td->extra : NULL;
 		float cval = t->values[0];
 
 		/* apply NLA-mapping to necessary values */
 		if (adt)
-			cval= BKE_nla_tweakedit_remap(adt, cval, NLATIME_CONVERT_UNMAP);
+			cval = BKE_nla_tweakedit_remap(adt, cval, NLATIME_CONVERT_UNMAP);
 
 		/* only apply to data if in range */
 		if ((sval > minx) && (sval < maxx)) {
-			float cvalc= CLAMPIS(cval, minx, maxx);
+			float cvalc = CLAMPIS(cval, minx, maxx);
 			float timefac;
 
 			/* left half? */
 			if (td->ival < sval) {
-				timefac= (sval - td->ival) / (sval - minx);
-				*(td->val)= cvalc - timefac * (cvalc - minx);
+				timefac = (sval - td->ival) / (sval - minx);
+				*(td->val) = cvalc - timefac * (cvalc - minx);
 			}
 			else {
-				timefac= (td->ival - sval) / (maxx - sval);
-				*(td->val)= cvalc + timefac * (maxx - cvalc);
+				timefac = (td->ival - sval) / (maxx - sval);
+				*(td->val) = cvalc + timefac * (maxx - cvalc);
 			}
 		}
 	}
@@ -6050,8 +6200,8 @@ int TimeSlide(TransInfo *t, const int mval[2])
 {
 	View2D *v2d = (View2D *)t->view;
 	float cval[2], sval[2];
-	float minx= *((float *)(t->customData));
-	float maxx= *((float *)(t->customData) + 1);
+	float minx = *((float *)(t->customData));
+	float maxx = *((float *)(t->customData) + 1);
 	char str[200];
 
 	/* calculate mouse co-ordinates */
@@ -6063,9 +6213,9 @@ int TimeSlide(TransInfo *t, const int mval[2])
 	t->values[0] = cval[0];
 
 	/* handle numeric-input stuff */
-	t->vec[0] = 2.0f*(cval[0]-sval[0]) / (maxx-minx);
+	t->vec[0] = 2.0f * (cval[0] - sval[0]) / (maxx - minx);
 	applyNumInput(&t->num, &t->vec[0]);
-	t->values[0] = (maxx-minx) * t->vec[0] / 2.0f + sval[0];
+	t->values[0] = (maxx - minx) * t->vec[0] / 2.0f + sval[0];
 
 	headerTimeSlide(t, sval[0], str);
 	applyTimeSlide(t, sval[0]);
@@ -6138,19 +6288,19 @@ static void applyTimeScale(TransInfo *t)
 	TransData2D *td2d = t->data2d;
 	int i;
 
-	const short autosnap= getAnimEdit_SnapMode(t);
-	const short do_time= getAnimEdit_DrawTime(t);
-	const double secf= FPS;
+	const short autosnap = getAnimEdit_SnapMode(t);
+	const short do_time = getAnimEdit_DrawTime(t);
+	const double secf = FPS;
 
 
-	for (i = 0 ; i < t->total; i++, td++, td2d++) {
+	for (i = 0; i < t->total; i++, td++, td2d++) {
 		/* it is assumed that td->extra is a pointer to the AnimData,
 		 * whose active action is where this keyframe comes from
 		 * (this is only valid when not in NLA)
 		 */
-		AnimData *adt= (t->spacetype != SPACE_NLA) ? td->extra : NULL;
-		float startx= CFRA;
-		float fac= t->values[0];
+		AnimData *adt = (t->spacetype != SPACE_NLA) ? td->extra : NULL;
+		float startx = CFRA;
+		float fac = t->values[0];
 
 		if (autosnap == SACTSNAP_STEP) {
 			if (do_time)
@@ -6161,7 +6311,7 @@ static void applyTimeScale(TransInfo *t)
 
 		/* check if any need to apply nla-mapping */
 		if (adt)
-			startx= BKE_nla_tweakedit_remap(adt, startx, NLATIME_CONVERT_UNMAP);
+			startx = BKE_nla_tweakedit_remap(adt, startx, NLATIME_CONVERT_UNMAP);
 
 		/* now, calculate the new value */
 		*(td->val) = ((td->ival - startx) * fac) + startx;
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index 6051fd2577b..fdc09c1bed0 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -494,6 +494,9 @@ int Tilt(TransInfo *t, const int mval[2]);
 void initCurveShrinkFatten(TransInfo *t);
 int CurveShrinkFatten(TransInfo *t, const int mval[2]);
 
+void initMaskShrinkFatten(TransInfo *t);
+int MaskShrinkFatten(TransInfo *t, const int mval[2]);
+
 void initTrackball(TransInfo *t);
 int Trackball(TransInfo *t, const int mval[2]);
 
@@ -552,7 +555,7 @@ struct wmKeyMap *transform_modal_keymap(struct wmKeyConfig *keyconf);
 /*********************** transform_conversions.c ********** */
 struct ListBase;
 
-void flushTransGPactionData(TransInfo *t);
+void flushTransIntFrameActionData(TransInfo *t);
 void flushTransGraphData(TransInfo *t);
 void remake_graph_transdata(TransInfo *t, struct ListBase *anim_data);
 void flushTransUVs(TransInfo *t);
@@ -561,6 +564,7 @@ int clipUVTransform(TransInfo *t, float *vec, int resize);
 void flushTransNodes(TransInfo *t);
 void flushTransSeq(TransInfo *t);
 void flushTransTracking(TransInfo *t);
+void flushTransMasking(TransInfo *t);
 
 /*********************** exported from transform_manipulator.c ********** */
 int gimbal_axis(struct Object *ob, float gmat[][3]); /* return 0 when no gimbal for selection */
diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c
index b18d132f8df..d2910c5b602 100644
--- a/source/blender/editors/transform/transform_constraints.c
+++ b/source/blender/editors/transform/transform_constraints.c
@@ -77,7 +77,7 @@ static void constraintAutoValues(TransInfo *t, float vec[3])
 {
 	int mode = t->con.mode;
 	if (mode & CON_APPLY) {
-		float nval = (t->flag & T_NULL_ONE)?1.0f:0.0f;
+		float nval = (t->flag & T_NULL_ONE) ? 1.0f : 0.0f;
 
 		if ((mode & CON_AXIS0) == 0) {
 			vec[0] = nval;
@@ -95,21 +95,21 @@ void constraintNumInput(TransInfo *t, float vec[3])
 {
 	int mode = t->con.mode;
 	if (mode & CON_APPLY) {
-		float nval = (t->flag & T_NULL_ONE)?1.0f:0.0f;
+		float nval = (t->flag & T_NULL_ONE) ? 1.0f : 0.0f;
 
 		if (getConstraintSpaceDimension(t) == 2) {
-			int axis = mode & (CON_AXIS0|CON_AXIS1|CON_AXIS2);
-			if (axis == (CON_AXIS0|CON_AXIS1)) {
+			int axis = mode & (CON_AXIS0 | CON_AXIS1 | CON_AXIS2);
+			if (axis == (CON_AXIS0 | CON_AXIS1)) {
 				/* vec[0] = vec[0]; */ /* same */
 				/* vec[1] = vec[1]; */ /* same */
 				vec[2] = nval;
 			}
-			else if (axis == (CON_AXIS1|CON_AXIS2)) {
+			else if (axis == (CON_AXIS1 | CON_AXIS2)) {
 				vec[2] = vec[1];
 				vec[1] = vec[0];
 				vec[0] = nval;
 			}
-			else if (axis == (CON_AXIS0|CON_AXIS2)) {
+			else if (axis == (CON_AXIS0 | CON_AXIS2)) {
 				/* vec[0] = vec[0]; */  /* same */
 				vec[2] = vec[1];
 				vec[1] = nval;
@@ -184,7 +184,7 @@ static void viewAxisCorrectCenter(TransInfo *t, float t_con_center[3])
 {
 	if (t->spacetype == SPACE_VIEW3D) {
 		// View3D *v3d = t->sa->spacedata.first;
-		const float min_dist= 1.0f; // v3d->near;
+		const float min_dist = 1.0f;  /* v3d->near; */
 		float dir[3];
 		float l;
 
@@ -194,7 +194,7 @@ static void viewAxisCorrectCenter(TransInfo *t, float t_con_center[3])
 		}
 		project_v3_v3v3(dir, dir, t->viewinv[2]);
 
-		l= len_v3(dir);
+		l = len_v3(dir);
 
 		if (l < min_dist) {
 			float diff[3];
@@ -211,7 +211,7 @@ static void axisProjection(TransInfo *t, float axis[3], float in[3], float out[3
 	float norm[3], vec[3], factor, angle;
 	float t_con_center[3];
 
-	if (in[0]==0.0f && in[1]==0.0f && in[2]==0.0f)
+	if (in[0] == 0.0f && in[1] == 0.0f && in[2] == 0.0f)
 		return;
 
 	copy_v3_v3(t_con_center, t->con.center);
@@ -232,12 +232,12 @@ static void axisProjection(TransInfo *t, float axis[3], float in[3], float out[3
 		project_v3_v3v3(vec, in, t->viewinv[1]);
 		factor = dot_v3v3(t->viewinv[1], vec) * 2.0f;
 		/* since camera distance is quite relative, use quadratic relationship. holding shift can compensate */
-		if (factor<0.0f) factor*= -factor;
-		else factor*= factor;
+		if (factor < 0.0f) factor *= -factor;
+		else factor *= factor;
 
 		copy_v3_v3(out, axis);
 		normalize_v3(out);
-		mul_v3_fl(out, -factor);	/* -factor makes move down going backwards */
+		mul_v3_fl(out, -factor);  /* -factor makes move down going backwards */
 	}
 	else {
 		float v[3], i1[3], i2[3];
@@ -276,10 +276,10 @@ static void axisProjection(TransInfo *t, float axis[3], float in[3], float out[3
 			sub_v3_v3v3(out, i1, t_con_center);
 
 			/* possible some values become nan when
-			 * viewpoint and object are both zero */
-			if (!finite(out[0])) out[0]= 0.0f;
-			if (!finite(out[1])) out[1]= 0.0f;
-			if (!finite(out[2])) out[2]= 0.0f;
+			* viewpoint and object are both zero */
+			if (!finite(out[0])) out[0] = 0.0f;
+			if (!finite(out[1])) out[1] = 0.0f;
+			if (!finite(out[2])) out[2] = 0.0f;
 		}
 	}
 }
@@ -386,7 +386,7 @@ static void applyObjectConstraintVec(TransInfo *t, TransData *td, float in[3], f
 			copy_v3_v3(out, pvec);
 		}
 		else {
-			int i=0;
+			int i = 0;
 
 			out[0] = out[1] = out[2] = 0.0f;
 			if (t->con.mode & CON_AXIS0) {
@@ -475,21 +475,21 @@ static void applyObjectConstraintSize(TransInfo *t, TransData *td, float smat[3]
 static void applyAxisConstraintRot(TransInfo *t, TransData *td, float vec[3], float *angle)
 {
 	if (!td && t->con.mode & CON_APPLY) {
-		int mode = t->con.mode & (CON_AXIS0|CON_AXIS1|CON_AXIS2);
+		int mode = t->con.mode & (CON_AXIS0 | CON_AXIS1 | CON_AXIS2);
 
 		switch (mode) {
-		case CON_AXIS0:
-		case (CON_AXIS1|CON_AXIS2):
-			copy_v3_v3(vec, t->con.mtx[0]);
-			break;
-		case CON_AXIS1:
-		case (CON_AXIS0|CON_AXIS2):
-			copy_v3_v3(vec, t->con.mtx[1]);
-			break;
-		case CON_AXIS2:
-		case (CON_AXIS0|CON_AXIS1):
-			copy_v3_v3(vec, t->con.mtx[2]);
-			break;
+			case CON_AXIS0:
+			case (CON_AXIS1 | CON_AXIS2):
+				copy_v3_v3(vec, t->con.mtx[0]);
+				break;
+			case CON_AXIS1:
+			case (CON_AXIS0 | CON_AXIS2):
+				copy_v3_v3(vec, t->con.mtx[1]);
+				break;
+			case CON_AXIS2:
+			case (CON_AXIS0 | CON_AXIS1):
+				copy_v3_v3(vec, t->con.mtx[2]);
+				break;
 		}
 		/* don't flip axis if asked to or if num input */
 		if (angle && (mode & CON_NOFLIP) == 0 && hasNumInput(&t->num) == 0) {
@@ -517,26 +517,26 @@ static void applyAxisConstraintRot(TransInfo *t, TransData *td, float vec[3], fl
 static void applyObjectConstraintRot(TransInfo *t, TransData *td, float vec[3], float *angle)
 {
 	if (t->con.mode & CON_APPLY) {
-		int mode = t->con.mode & (CON_AXIS0|CON_AXIS1|CON_AXIS2);
+		int mode = t->con.mode & (CON_AXIS0 | CON_AXIS1 | CON_AXIS2);
 
 		/* on setup call, use first object */
 		if (td == NULL) {
-			td= t->data;
+			td = t->data;
 		}
 
 		switch (mode) {
-		case CON_AXIS0:
-		case (CON_AXIS1|CON_AXIS2):
-			copy_v3_v3(vec, td->axismtx[0]);
-			break;
-		case CON_AXIS1:
-		case (CON_AXIS0|CON_AXIS2):
-			copy_v3_v3(vec, td->axismtx[1]);
-			break;
-		case CON_AXIS2:
-		case (CON_AXIS0|CON_AXIS1):
-			copy_v3_v3(vec, td->axismtx[2]);
-			break;
+			case CON_AXIS0:
+			case (CON_AXIS1 | CON_AXIS2):
+				copy_v3_v3(vec, td->axismtx[0]);
+				break;
+			case CON_AXIS1:
+			case (CON_AXIS0 | CON_AXIS2):
+				copy_v3_v3(vec, td->axismtx[1]);
+				break;
+			case CON_AXIS2:
+			case (CON_AXIS0 | CON_AXIS1):
+				copy_v3_v3(vec, td->axismtx[2]);
+				break;
 		}
 		if (angle && (mode & CON_NOFLIP) == 0 && hasNumInput(&t->num) == 0) {
 			if (dot_v3v3(vec, t->viewinv[2]) > 0.0f) {
@@ -604,33 +604,33 @@ void setUserConstraint(TransInfo *t, short orientation, int mode, const char fte
 	char text[40];
 
 	switch (orientation) {
-	case V3D_MANIP_GLOBAL:
+		case V3D_MANIP_GLOBAL:
 		{
-			float mtx[3][3]= MAT3_UNITY;
+			float mtx[3][3] = MAT3_UNITY;
 			BLI_snprintf(text, sizeof(text), ftext, "global");
 			setConstraint(t, mtx, mode, text);
 		}
 		break;
-	case V3D_MANIP_LOCAL:
-		BLI_snprintf(text, sizeof(text), ftext, "local");
-		setLocalConstraint(t, mode, text);
-		break;
-	case V3D_MANIP_NORMAL:
-		BLI_snprintf(text, sizeof(text), ftext, "normal");
-		setConstraint(t, t->spacemtx, mode, text);
-		break;
-	case V3D_MANIP_VIEW:
-		BLI_snprintf(text, sizeof(text), ftext, "view");
-		setConstraint(t, t->spacemtx, mode, text);
-		break;
-	case V3D_MANIP_GIMBAL:
-		BLI_snprintf(text, sizeof(text), ftext, "gimbal");
-		setConstraint(t, t->spacemtx, mode, text);
-		break;
-	default: /* V3D_MANIP_CUSTOM */
-		BLI_snprintf(text, sizeof(text), ftext, t->spacename);
-		setConstraint(t, t->spacemtx, mode, text);
-		break;
+		case V3D_MANIP_LOCAL:
+			BLI_snprintf(text, sizeof(text), ftext, "local");
+			setLocalConstraint(t, mode, text);
+			break;
+		case V3D_MANIP_NORMAL:
+			BLI_snprintf(text, sizeof(text), ftext, "normal");
+			setConstraint(t, t->spacemtx, mode, text);
+			break;
+		case V3D_MANIP_VIEW:
+			BLI_snprintf(text, sizeof(text), ftext, "view");
+			setConstraint(t, t->spacemtx, mode, text);
+			break;
+		case V3D_MANIP_GIMBAL:
+			BLI_snprintf(text, sizeof(text), ftext, "gimbal");
+			setConstraint(t, t->spacemtx, mode, text);
+			break;
+		default: /* V3D_MANIP_CUSTOM */
+			BLI_snprintf(text, sizeof(text), ftext, t->spacename);
+			setConstraint(t, t->spacemtx, mode, text);
+			break;
 	}
 
 	t->con.orientation = orientation;
@@ -682,8 +682,8 @@ void drawConstraint(TransInfo *t)
 
 			setlinestyle(1);
 			glBegin(GL_LINE_STRIP);
-				glVertex3fv(tc->center);
-				glVertex3fv(vec);
+			glVertex3fv(tc->center);
+			glVertex3fv(vec);
 			glEnd();
 			setlinestyle(0);
 
@@ -733,7 +733,7 @@ void drawPropCircle(const struct bContext *C, TransInfo *t)
 			float aspx, aspy;
 
 			ED_space_image_uv_aspect(t->sa->spacedata.first, &aspx, &aspy);
-			glScalef(1.0f/aspx, 1.0f/aspy, 1.0);
+			glScalef(1.0f / aspx, 1.0f / aspy, 1.0);
 		}
 
 		set_inverted_drawing(1);
@@ -747,7 +747,7 @@ void drawPropCircle(const struct bContext *C, TransInfo *t)
 static void drawObjectConstraint(TransInfo *t)
 {
 	int i;
-	TransData * td = t->data;
+	TransData *td = t->data;
 
 	/* Draw the first one lighter because that's the one who controls the others.
 	 * Meaning the transformation is projected on that one and just copied on the others
@@ -767,7 +767,7 @@ static void drawObjectConstraint(TransInfo *t)
 
 	td++;
 
-	for (i=1; i < t->total; i++, td++) {
+	for (i = 1; i < t->total; i++, td++) {
 		if (t->con.mode & CON_AXIS0) {
 			drawLine(t, td->ob->obmat[3], td->axismtx[0], 'X', 0);
 		}
@@ -791,7 +791,7 @@ void startConstraint(TransInfo *t)
 
 void stopConstraint(TransInfo *t)
 {
-	t->con.mode &= ~(CON_APPLY|CON_SELECT);
+	t->con.mode &= ~(CON_APPLY | CON_SELECT);
 	*t->con.text = '\0';
 	t->num.idx_max = t->idx_max;
 }
@@ -803,21 +803,21 @@ void getConstraintMatrix(TransInfo *t)
 	unit_m3(t->con.pmtx);
 
 	if (!(t->con.mode & CON_AXIS0)) {
-		t->con.pmtx[0][0]		=
-			t->con.pmtx[0][1]	=
-			t->con.pmtx[0][2]	= 0.0f;
+		t->con.pmtx[0][0]       =
+		    t->con.pmtx[0][1]   =
+		    t->con.pmtx[0][2]   = 0.0f;
 	}
 
 	if (!(t->con.mode & CON_AXIS1)) {
-		t->con.pmtx[1][0]		=
-			t->con.pmtx[1][1]	=
-			t->con.pmtx[1][2]	= 0.0f;
+		t->con.pmtx[1][0]       =
+		    t->con.pmtx[1][1]   =
+		    t->con.pmtx[1][2]   = 0.0f;
 	}
 
 	if (!(t->con.mode & CON_AXIS2)) {
-		t->con.pmtx[2][0]		=
-			t->con.pmtx[2][1]	=
-			t->con.pmtx[2][2]	= 0.0f;
+		t->con.pmtx[2][0]       =
+		    t->con.pmtx[2][1]   =
+		    t->con.pmtx[2][2]   = 0.0f;
 	}
 
 	mul_m3_m3m3(mat, t->con.pmtx, t->con.imtx);
@@ -866,7 +866,7 @@ void postSelectConstraint(TransInfo *t)
 static void setNearestAxis2d(TransInfo *t)
 {
 	/* no correction needed... just use whichever one is lower */
-	if ( abs(t->mval[0]-t->con.imval[0]) < abs(t->mval[1]-t->con.imval[1]) ) {
+	if (abs(t->mval[0] - t->con.imval[0]) < abs(t->mval[1] - t->con.imval[1]) ) {
 		t->con.mode |= CON_AXIS1;
 		BLI_snprintf(t->con.text, sizeof(t->con.text), " along Y axis");
 	}
@@ -895,10 +895,10 @@ static void setNearestAxis3d(TransInfo *t)
 	 * of two 2D points 30 pixels apart (that's the last factor in the formula) after
 	 * projecting them with window_to_3d_delta and then get the length of that vector.
 	 */
-	zfac= t->persmat[0][3]*t->center[0]+ t->persmat[1][3]*t->center[1]+ t->persmat[2][3]*t->center[2]+ t->persmat[3][3];
-	zfac = len_v3(t->persinv[0]) * 2.0f/t->ar->winx * zfac * 30.0f;
+	zfac = t->persmat[0][3] * t->center[0] + t->persmat[1][3] * t->center[1] + t->persmat[2][3] * t->center[2] + t->persmat[3][3];
+	zfac = len_v3(t->persinv[0]) * 2.0f / t->ar->winx * zfac * 30.0f;
 
-	for (i = 0; i<3; i++) {
+	for (i = 0; i < 3; i++) {
 		copy_v3_v3(axis, t->con.mtx[i]);
 
 		mul_v3_fl(axis, zfac);
@@ -922,7 +922,7 @@ static void setNearestAxis3d(TransInfo *t)
 
 	if (len[0] <= len[1] && len[0] <= len[2]) {
 		if (t->modifiers & MOD_CONSTRAINT_PLANE) {
-			t->con.mode |= (CON_AXIS1|CON_AXIS2);
+			t->con.mode |= (CON_AXIS1 | CON_AXIS2);
 			BLI_snprintf(t->con.text, sizeof(t->con.text), " locking %s X axis", t->spacename);
 		}
 		else {
@@ -932,7 +932,7 @@ static void setNearestAxis3d(TransInfo *t)
 	}
 	else if (len[1] <= len[0] && len[1] <= len[2]) {
 		if (t->modifiers & MOD_CONSTRAINT_PLANE) {
-			t->con.mode |= (CON_AXIS0|CON_AXIS2);
+			t->con.mode |= (CON_AXIS0 | CON_AXIS2);
 			BLI_snprintf(t->con.text, sizeof(t->con.text), " locking %s Y axis", t->spacename);
 		}
 		else {
@@ -942,7 +942,7 @@ static void setNearestAxis3d(TransInfo *t)
 	}
 	else if (len[2] <= len[1] && len[2] <= len[0]) {
 		if (t->modifiers & MOD_CONSTRAINT_PLANE) {
-			t->con.mode |= (CON_AXIS0|CON_AXIS1);
+			t->con.mode |= (CON_AXIS0 | CON_AXIS1);
 			BLI_snprintf(t->con.text, sizeof(t->con.text), " locking %s Z axis", t->spacename);
 		}
 		else {
@@ -976,21 +976,21 @@ void setNearestAxis(TransInfo *t)
 
 char constraintModeToChar(TransInfo *t)
 {
-	if ((t->con.mode & CON_APPLY)==0) {
+	if ((t->con.mode & CON_APPLY) == 0) {
 		return '\0';
 	}
-	switch (t->con.mode & (CON_AXIS0|CON_AXIS1|CON_AXIS2)) {
-	case (CON_AXIS0):
-	case (CON_AXIS1|CON_AXIS2):
-		return 'X';
-	case (CON_AXIS1):
-	case (CON_AXIS0|CON_AXIS2):
-		return 'Y';
-	case (CON_AXIS2):
-	case (CON_AXIS0|CON_AXIS1):
-		return 'Z';
-	default:
-		return '\0';
+	switch (t->con.mode & (CON_AXIS0 | CON_AXIS1 | CON_AXIS2)) {
+		case (CON_AXIS0):
+		case (CON_AXIS1 | CON_AXIS2):
+			return 'X';
+		case (CON_AXIS1):
+		case (CON_AXIS0 | CON_AXIS2):
+			return 'Y';
+		case (CON_AXIS2):
+		case (CON_AXIS0 | CON_AXIS1):
+			return 'Z';
+		default:
+			return '\0';
 	}
 }
 
@@ -999,13 +999,13 @@ int isLockConstraint(TransInfo *t)
 {
 	int mode = t->con.mode;
 
-	if ( (mode & (CON_AXIS0|CON_AXIS1)) == (CON_AXIS0|CON_AXIS1))
+	if ((mode & (CON_AXIS0 | CON_AXIS1)) == (CON_AXIS0 | CON_AXIS1))
 		return 1;
 
-	if ( (mode & (CON_AXIS1|CON_AXIS2)) == (CON_AXIS1|CON_AXIS2))
+	if ((mode & (CON_AXIS1 | CON_AXIS2)) == (CON_AXIS1 | CON_AXIS2))
 		return 1;
 
-	if ( (mode & (CON_AXIS0|CON_AXIS2)) == (CON_AXIS0|CON_AXIS2))
+	if ((mode & (CON_AXIS0 | CON_AXIS2)) == (CON_AXIS0 | CON_AXIS2))
 		return 1;
 
 	return 0;
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 1b06f42fd2c..fbc59f4c2cb 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -53,6 +53,7 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_gpencil_types.h"
 #include "DNA_movieclip_types.h"
+#include "DNA_mask_types.h"
 
 #include "MEM_guardedalloc.h"
 
@@ -87,6 +88,7 @@
 #include "BKE_sequencer.h"
 #include "BKE_tessmesh.h"
 #include "BKE_tracking.h"
+#include "BKE_mask.h"
 
 
 #include "ED_anim_api.h"
@@ -102,9 +104,10 @@
 #include "ED_types.h"
 #include "ED_uvedit.h"
 #include "ED_clip.h"
+#include "ED_mask.h"
 #include "ED_util.h"  /* for crazyspace correction */
 
-#include "WM_api.h"		/* for WM_event_add_notifier to deal with stabilization nodes */
+#include "WM_api.h"  /* for WM_event_add_notifier to deal with stabilization nodes */
 #include "WM_types.h"
 
 #include "UI_view2d.h"
@@ -159,10 +162,10 @@ static void qsort_trans_data(TransInfo *t, TransData *head, TransData *tail, Tra
 
 	*head = *temp;
 	if (ihead < head) {
-		qsort_trans_data(t, ihead, head-1, temp);
+		qsort_trans_data(t, ihead, head - 1, temp);
 	}
 	if (itail > head) {
-		qsort_trans_data(t, head+1, itail, temp);
+		qsort_trans_data(t, head + 1, itail, temp);
 	}
 }
 
@@ -214,18 +217,18 @@ static void set_prop_dist(TransInfo *t, short with_dist)
 	TransData *tob;
 	int a;
 
-	for (a=0, tob= t->data; a<t->total; a++, tob++) {
+	for (a = 0, tob = t->data; a < t->total; a++, tob++) {
 
-		tob->rdist= 0.0f; // init, it was mallocced
+		tob->rdist = 0.0f; // init, it was mallocced
 
-		if ((tob->flag & TD_SELECTED)==0) {
+		if ((tob->flag & TD_SELECTED) == 0) {
 			TransData *td;
 			int i;
 			float dist, vec[3];
 
 			tob->rdist = -1.0f; // signal for next loop
 
-			for (i = 0, td= t->data; i < t->total; i++, td++) {
+			for (i = 0, td = t->data; i < t->total; i++, td++) {
 				if (td->flag & TD_SELECTED) {
 					sub_v3_v3v3(vec, tob->center, td->center);
 					mul_m3_v3(tob->mtx, vec);
@@ -237,7 +240,7 @@ static void set_prop_dist(TransInfo *t, short with_dist)
 						tob->rdist = dist;
 					}
 				}
-				else break;	// by definition transdata has selected items in beginning
+				else break;  // by definition transdata has selected items in beginning
 			}
 			if (with_dist) {
 				tob->dist = tob->rdist;
@@ -266,16 +269,16 @@ static void createTransTexspace(TransInfo *t)
 	}
 
 	id = ob->data;
-	if (id == NULL || !ELEM3(GS(id->name), ID_ME, ID_CU, ID_MB )) {
+	if (id == NULL || !ELEM3(GS(id->name), ID_ME, ID_CU, ID_MB)) {
 		t->total = 0;
 		return;
 	}
 
 	t->total = 1;
-	td= t->data= MEM_callocN(sizeof(TransData), "TransTexspace");
-	td->ext= t->ext= MEM_callocN(sizeof(TransDataExtension), "TransTexspace");
+	td = t->data = MEM_callocN(sizeof(TransData), "TransTexspace");
+	td->ext = t->ext = MEM_callocN(sizeof(TransDataExtension), "TransTexspace");
 
-	td->flag= TD_SELECTED;
+	td->flag = TD_SELECTED;
 	copy_v3_v3(td->center, ob->obmat[3]);
 	td->ob = ob;
 
@@ -303,7 +306,7 @@ static void createTransEdge(TransInfo *t)
 	BMEdge *eed;
 	BMIter iter;
 	float mtx[3][3], smtx[3][3];
-	int count=0, countsel=0;
+	int count = 0, countsel = 0;
 	int propmode = t->flag & T_PROP_EDIT;
 
 	BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
@@ -323,7 +326,7 @@ static void createTransEdge(TransInfo *t)
 		t->total = countsel;
 	}
 
-	td= t->data= MEM_callocN(t->total * sizeof(TransData), "TransCrease");
+	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransCrease");
 
 	copy_m3_m4(mtx, t->obedit->obmat);
 	invert_m3_m3(smtx, mtx);
@@ -337,11 +340,11 @@ static void createTransEdge(TransInfo *t)
 			add_v3_v3v3(td->center, eed->v1->co, eed->v2->co);
 			mul_v3_fl(td->center, 0.5f);
 
-			td->loc= NULL;
+			td->loc = NULL;
 			if (BM_elem_flag_test(eed, BM_ELEM_SELECT))
-				td->flag= TD_SELECTED;
+				td->flag = TD_SELECTED;
 			else
-				td->flag= 0;
+				td->flag = 0;
 
 
 			copy_m3_m3(td->smtx, smtx);
@@ -366,15 +369,15 @@ static void createTransEdge(TransInfo *t)
 
 static bKinematicConstraint *has_targetless_ik(bPoseChannel *pchan)
 {
-	bConstraint *con= pchan->constraints.first;
+	bConstraint *con = pchan->constraints.first;
 
-	for (;con; con= con->next) {
-		if (con->type==CONSTRAINT_TYPE_KINEMATIC && (con->enforce!=0.0f)) {
-			bKinematicConstraint *data= con->data;
+	for (; con; con = con->next) {
+		if (con->type == CONSTRAINT_TYPE_KINEMATIC && (con->enforce != 0.0f)) {
+			bKinematicConstraint *data = con->data;
 
-			if (data->tar==NULL)
+			if (data->tar == NULL)
 				return data;
-			if (data->tar->type==OB_ARMATURE && data->subtarget[0]==0)
+			if (data->tar->type == OB_ARMATURE && data->subtarget[0] == 0)
 				return data;
 		}
 	}
@@ -385,44 +388,44 @@ static short apply_targetless_ik(Object *ob)
 {
 	bPoseChannel *pchan, *parchan, *chanlist[256];
 	bKinematicConstraint *data;
-	int segcount, apply= 0;
+	int segcount, apply = 0;
 
 	/* now we got a difficult situation... we have to find the
 	 * target-less IK pchans, and apply transformation to the all
 	 * pchans that were in the chain */
 
-	for (pchan=ob->pose->chanbase.first; pchan; pchan=pchan->next) {
-		data= has_targetless_ik(pchan);
+	for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
+		data = has_targetless_ik(pchan);
 		if (data && (data->flag & CONSTRAINT_IK_AUTO)) {
 
 			/* fill the array with the bones of the chain (armature.c does same, keep it synced) */
-			segcount= 0;
+			segcount = 0;
 
 			/* exclude tip from chain? */
 			if (!(data->flag & CONSTRAINT_IK_TIP))
-				parchan= pchan->parent;
+				parchan = pchan->parent;
 			else
-				parchan= pchan;
+				parchan = pchan;
 
 			/* Find the chain's root & count the segments needed */
-			for (; parchan; parchan=parchan->parent) {
-				chanlist[segcount]= parchan;
+			for (; parchan; parchan = parchan->parent) {
+				chanlist[segcount] = parchan;
 				segcount++;
 
-				if (segcount==data->rootbone || segcount>255) break; // 255 is weak
+				if (segcount == data->rootbone || segcount > 255) break;  // 255 is weak
 			}
-			for (;segcount;segcount--) {
+			for (; segcount; segcount--) {
 				Bone *bone;
-				float rmat[4][4]/*, tmat[4][4], imat[4][4]*/;
+				float rmat[4][4] /*, tmat[4][4], imat[4][4]*/;
 
 				/* pose_mat(b) = pose_mat(b-1) * offs_bone * channel * constraint * IK  */
 				/* we put in channel the entire result of rmat= (channel * constraint * IK) */
 				/* pose_mat(b) = pose_mat(b-1) * offs_bone * rmat  */
 				/* rmat = pose_mat(b) * inv(pose_mat(b-1) * offs_bone ) */
 
-				parchan= chanlist[segcount-1];
-				bone= parchan->bone;
-				bone->flag |= BONE_TRANSFORM;	/* ensures it gets an auto key inserted */
+				parchan = chanlist[segcount - 1];
+				bone = parchan->bone;
+				bone->flag |= BONE_TRANSFORM;   /* ensures it gets an auto key inserted */
 
 				BKE_armature_mat_pose_to_bone(parchan, parchan->pose_mat, rmat);
 
@@ -433,11 +436,11 @@ static short apply_targetless_ik(Object *ob)
 					copy_m3_m4(rmat3, rmat);
 					
 					/* rotation */
-						/* [#22409] is partially caused by this, as slight numeric error introduced during 
-						 * the solving process leads to locked-axis values changing. However, we cannot modify
-						 * the values here, or else there are huge discreptancies between IK-solver (interactive)
-						 * and applied poses.
-						 */
+					/* [#22409] is partially caused by this, as slight numeric error introduced during
+					 * the solving process leads to locked-axis values changing. However, we cannot modify
+					 * the values here, or else there are huge discreptancies between IK-solver (interactive)
+					 * and applied poses.
+					 */
 					if (parchan->rotmode > 0)
 						mat3_to_eulO(parchan->eul, parchan->rotmode, rmat3);
 					else if (parchan->rotmode == ROT_MODE_AXISANGLE)
@@ -467,7 +470,7 @@ static short apply_targetless_ik(Object *ob)
 
 			}
 
-			apply= 1;
+			apply = 1;
 			data->flag &= ~CONSTRAINT_IK_AUTO;
 		}
 	}
@@ -477,7 +480,7 @@ static short apply_targetless_ik(Object *ob)
 
 static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, TransData *td)
 {
-	Bone *bone= pchan->bone;
+	Bone *bone = pchan->bone;
 	float pmat[3][3], omat[3][3];
 	float cmat[3][3], tmat[3][3];
 	float vec[3];
@@ -496,40 +499,40 @@ static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, Tr
 		td->flag |= TD_NO_LOC;
 	}
 
-	td->protectflag= pchan->protectflag;
+	td->protectflag = pchan->protectflag;
 
 	td->loc = pchan->loc;
 	copy_v3_v3(td->iloc, pchan->loc);
 
-	td->ext->size= pchan->size;
+	td->ext->size = pchan->size;
 	copy_v3_v3(td->ext->isize, pchan->size);
 
 	if (pchan->rotmode > 0) {
-		td->ext->rot= pchan->eul;
-		td->ext->rotAxis= NULL;
-		td->ext->rotAngle= NULL;
-		td->ext->quat= NULL;
+		td->ext->rot = pchan->eul;
+		td->ext->rotAxis = NULL;
+		td->ext->rotAngle = NULL;
+		td->ext->quat = NULL;
 		
 		copy_v3_v3(td->ext->irot, pchan->eul);
 	}
 	else if (pchan->rotmode == ROT_MODE_AXISANGLE) {
-		td->ext->rot= NULL;
-		td->ext->rotAxis= pchan->rotAxis;
-		td->ext->rotAngle= &pchan->rotAngle;
-		td->ext->quat= NULL;
+		td->ext->rot = NULL;
+		td->ext->rotAxis = pchan->rotAxis;
+		td->ext->rotAngle = &pchan->rotAngle;
+		td->ext->quat = NULL;
 		
-		td->ext->irotAngle= pchan->rotAngle;
+		td->ext->irotAngle = pchan->rotAngle;
 		copy_v3_v3(td->ext->irotAxis, pchan->rotAxis);
 	}
 	else {
-		td->ext->rot= NULL;
-		td->ext->rotAxis= NULL;
-		td->ext->rotAngle= NULL;
-		td->ext->quat= pchan->quat;
+		td->ext->rot = NULL;
+		td->ext->rotAxis = NULL;
+		td->ext->rotAngle = NULL;
+		td->ext->quat = pchan->quat;
 		
 		copy_qt_qt(td->ext->iquat, pchan->quat);
 	}
-	td->ext->rotOrder= pchan->rotmode;
+	td->ext->rotOrder = pchan->rotmode;
 
 
 	/* proper way to get parent transform + own transform + constraints transform */
@@ -556,11 +559,11 @@ static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, Tr
 			copy_m3_m4(tmat, pchan->constinv);
 			invert_m3_m3(cmat, tmat);
 			mul_serie_m3(td->mtx, pmat, omat, cmat, NULL, NULL, NULL, NULL, NULL);
-			mul_serie_m3(td->ext->r_mtx, rpmat, omat, cmat, NULL,NULL,NULL,NULL,NULL);
+			mul_serie_m3(td->ext->r_mtx, rpmat, omat, cmat, NULL, NULL, NULL, NULL, NULL);
 		}
 		else {
-			mul_serie_m3(td->mtx, pmat, omat, NULL, NULL,NULL,NULL,NULL,NULL);
-			mul_serie_m3(td->ext->r_mtx, rpmat, omat, NULL, NULL,NULL,NULL,NULL,NULL);
+			mul_serie_m3(td->mtx, pmat, omat, NULL, NULL, NULL, NULL, NULL, NULL);
+			mul_serie_m3(td->ext->r_mtx, rpmat, omat, NULL, NULL, NULL, NULL, NULL, NULL);
 		}
 		invert_m3_m3(td->ext->r_smtx, td->ext->r_mtx);
 	}
@@ -585,25 +588,25 @@ static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, Tr
 	mul_m3_m3m3(td->axismtx, omat, pmat);
 	normalize_m3(td->axismtx);
 
-	if (t->mode==TFM_BONESIZE) {
-		bArmature *arm= t->poseobj->data;
+	if (t->mode == TFM_BONESIZE) {
+		bArmature *arm = t->poseobj->data;
 
-		if (arm->drawtype==ARM_ENVELOPE) {
-			td->loc= NULL;
-			td->val= &bone->dist;
-			td->ival= bone->dist;
+		if (arm->drawtype == ARM_ENVELOPE) {
+			td->loc = NULL;
+			td->val = &bone->dist;
+			td->ival = bone->dist;
 		}
 		else {
 			// abusive storage of scale in the loc pointer :)
-			td->loc= &bone->xwidth;
+			td->loc = &bone->xwidth;
 			copy_v3_v3(td->iloc, td->loc);
-			td->val= NULL;
+			td->val = NULL;
 		}
 	}
 
 	/* in this case we can do target-less IK grabbing */
-	if (t->mode==TFM_TRANSLATION) {
-		bKinematicConstraint *data= has_targetless_ik(pchan);
+	if (t->mode == TFM_TRANSLATION) {
+		bKinematicConstraint *data = has_targetless_ik(pchan);
 		if (data) {
 			if (data->flag & CONSTRAINT_IK_TIP) {
 				copy_v3_v3(data->grabtarget, pchan->pose_tail);
@@ -622,14 +625,14 @@ static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, Tr
 	}
 
 	/* store reference to first constraint */
-	td->con= pchan->constraints.first;
+	td->con = pchan->constraints.first;
 }
 
 static void bone_children_clear_transflag(int mode, short around, ListBase *lb)
 {
-	Bone *bone= lb->first;
+	Bone *bone = lb->first;
 
-	for ( ; bone;bone= bone->next) {
+	for (; bone; bone = bone->next) {
 		if ((bone->flag & BONE_HINGE) && (bone->flag & BONE_CONNECTED)) {
 			bone->flag |= BONE_HINGE_CHILD_TRANSFORM;
 		}
@@ -651,7 +654,7 @@ static void bone_children_clear_transflag(int mode, short around, ListBase *lb)
  * returns total number of bones with BONE_TRANSFORM */
 int count_set_pose_transflags(int *out_mode, short around, Object *ob)
 {
-	bArmature *arm= ob->data;
+	bArmature *arm = ob->data;
 	bPoseChannel *pchan;
 	Bone *bone;
 	int mode = *out_mode;
@@ -696,7 +699,7 @@ int count_set_pose_transflags(int *out_mode, short around, Object *ob)
 						if (pchan->bone->flag & BONE_HINGE_CHILD_TRANSFORM)
 							hastranslation = 1;
 					}
-					else if ((pchan->protectflag & OB_LOCK_LOC)!=OB_LOCK_LOC)
+					else if ((pchan->protectflag & OB_LOCK_LOC) != OB_LOCK_LOC)
 						hastranslation = 1;
 				}
 				else
@@ -717,26 +720,26 @@ int count_set_pose_transflags(int *out_mode, short around, Object *ob)
 /* -------- Auto-IK ---------- */
 
 /* adjust pose-channel's auto-ik chainlen */
-static void pchan_autoik_adjust (bPoseChannel *pchan, short chainlen)
+static void pchan_autoik_adjust(bPoseChannel *pchan, short chainlen)
 {
 	bConstraint *con;
 
 	/* don't bother to search if no valid constraints */
-	if ((pchan->constflag & (PCHAN_HAS_IK|PCHAN_HAS_TARGET))==0)
+	if ((pchan->constflag & (PCHAN_HAS_IK | PCHAN_HAS_TARGET)) == 0)
 		return;
 
 	/* check if pchan has ik-constraint */
-	for (con= pchan->constraints.first; con; con= con->next) {
-		if (con->type == CONSTRAINT_TYPE_KINEMATIC && (con->enforce!=0.0f)) {
-			bKinematicConstraint *data= con->data;
+	for (con = pchan->constraints.first; con; con = con->next) {
+		if (con->type == CONSTRAINT_TYPE_KINEMATIC && (con->enforce != 0.0f)) {
+			bKinematicConstraint *data = con->data;
 			
 			/* only accept if a temporary one (for auto-ik) */
 			if (data->flag & CONSTRAINT_IK_TEMP) {
 				/* chainlen is new chainlen, but is limited by maximum chainlen */
-				if ((chainlen==0) || (chainlen > data->max_rootbone))
-					data->rootbone= data->max_rootbone;
+				if ((chainlen == 0) || (chainlen > data->max_rootbone))
+					data->rootbone = data->max_rootbone;
 				else
-					data->rootbone= chainlen;
+					data->rootbone = chainlen;
 			}
 		}
 	}
@@ -745,7 +748,7 @@ static void pchan_autoik_adjust (bPoseChannel *pchan, short chainlen)
 /* change the chain-length of auto-ik */
 void transform_autoik_update(TransInfo *t, short mode)
 {
-	short *chainlen= &t->settings->autoik_chainlen;
+	short *chainlen = &t->settings->autoik_chainlen;
 	bPoseChannel *pchan;
 
 	/* mode determines what change to apply to chainlen */
@@ -763,7 +766,7 @@ void transform_autoik_update(TransInfo *t, short mode)
 		return;
 
 	/* apply to all pose-channels */
-	for (pchan=t->poseobj->pose->chanbase.first; pchan; pchan=pchan->next) {
+	for (pchan = t->poseobj->pose->chanbase.first; pchan; pchan = pchan->next) {
 		pchan_autoik_adjust(pchan, *chainlen);
 	}
 }
@@ -775,17 +778,17 @@ static void pose_grab_with_ik_clear(Object *ob)
 	bPoseChannel *pchan;
 	bConstraint *con, *next;
 
-	for (pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
+	for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
 		/* clear all temporary lock flags */
-		pchan->ikflag &= ~(BONE_IK_NO_XDOF_TEMP|BONE_IK_NO_YDOF_TEMP|BONE_IK_NO_ZDOF_TEMP);
+		pchan->ikflag &= ~(BONE_IK_NO_XDOF_TEMP | BONE_IK_NO_YDOF_TEMP | BONE_IK_NO_ZDOF_TEMP);
 		
-		pchan->constflag &= ~(PCHAN_HAS_IK|PCHAN_HAS_TARGET);
+		pchan->constflag &= ~(PCHAN_HAS_IK | PCHAN_HAS_TARGET);
 		
 		/* remove all temporary IK-constraints added */
-		for (con= pchan->constraints.first; con; con= next) {
-			next= con->next;
-			if (con->type==CONSTRAINT_TYPE_KINEMATIC) {
-				data= con->data;
+		for (con = pchan->constraints.first; con; con = next) {
+			next = con->next;
+			if (con->type == CONSTRAINT_TYPE_KINEMATIC) {
+				data = con->data;
 				if (data->flag & CONSTRAINT_IK_TEMP) {
 					BLI_remlink(&pchan->constraints, con);
 					MEM_freeN(con->data);
@@ -793,7 +796,7 @@ static void pose_grab_with_ik_clear(Object *ob)
 					continue;
 				}
 				pchan->constflag |= PCHAN_HAS_IK;
-				if (data->tar==NULL || (data->tar->type==OB_ARMATURE && data->subtarget[0]==0))
+				if (data->tar == NULL || (data->tar->type == OB_ARMATURE && data->subtarget[0] == 0))
 					pchan->constflag |= PCHAN_HAS_TARGET;
 			}
 		}
@@ -812,21 +815,21 @@ static short pose_grab_with_ik_add(bPoseChannel *pchan)
 		return 0;
 
 	/* Rule: not if there's already an IK on this channel */
-	for (con= pchan->constraints.first; con; con= con->next) {
-		if (con->type==CONSTRAINT_TYPE_KINEMATIC) {
-			data= con->data;
+	for (con = pchan->constraints.first; con; con = con->next) {
+		if (con->type == CONSTRAINT_TYPE_KINEMATIC) {
+			data = con->data;
 			
-			if (data->tar==NULL || (data->tar->type==OB_ARMATURE && data->subtarget[0]=='\0')) {
+			if (data->tar == NULL || (data->tar->type == OB_ARMATURE && data->subtarget[0] == '\0')) {
 				/* make reference to constraint to base things off later (if it's the last targetless constraint encountered) */
 				targetless = (bKinematicConstraint *)con->data;
 				
 				/* but, if this is a targetless IK, we make it auto anyway (for the children loop) */
-				if (con->enforce!=0.0f) {
+				if (con->enforce != 0.0f) {
 					data->flag |= CONSTRAINT_IK_AUTO;
 					
 					/* if no chain length has been specified, just make things obey standard rotation locks too */
 					if (data->rootbone == 0) {
-						for (; pchan; pchan=pchan->parent) {
+						for (; pchan; pchan = pchan->parent) {
 							/* here, we set ik-settings for bone from pchan->protectflag */
 							// XXX: careful with quats/axis-angle rotations where we're locking 4d components
 							if (pchan->protectflag & OB_LOCK_ROTX) pchan->ikflag |= BONE_IK_NO_XDOF_TEMP;
@@ -839,23 +842,23 @@ static short pose_grab_with_ik_add(bPoseChannel *pchan)
 				}
 			}
 			
-			if ((con->flag & CONSTRAINT_DISABLE)==0 && (con->enforce!=0.0f))
+			if ((con->flag & CONSTRAINT_DISABLE) == 0 && (con->enforce != 0.0f))
 				return 0;
 		}
 	}
 
 	con = add_pose_constraint(NULL, pchan, "TempConstraint", CONSTRAINT_TYPE_KINEMATIC);
-	pchan->constflag |= (PCHAN_HAS_IK|PCHAN_HAS_TARGET);	/* for draw, but also for detecting while pose solving */
-	data= con->data;
+	pchan->constflag |= (PCHAN_HAS_IK | PCHAN_HAS_TARGET);    /* for draw, but also for detecting while pose solving */
+	data = con->data;
 	if (targetless) { 
 		/* if exists, use values from last targetless (but disabled) IK-constraint as base */
 		*data = *targetless;
 	}
 	else
-		data->flag= CONSTRAINT_IK_TIP;
-	data->flag |= CONSTRAINT_IK_TEMP|CONSTRAINT_IK_AUTO;
+		data->flag = CONSTRAINT_IK_TIP;
+	data->flag |= CONSTRAINT_IK_TEMP | CONSTRAINT_IK_AUTO;
 	copy_v3_v3(data->grabtarget, pchan->pose_tail);
-	data->rootbone= 0; /* watch-it! has to be 0 here, since we're still on the same bone for the first time through the loop [#25885] */
+	data->rootbone = 0; /* watch-it! has to be 0 here, since we're still on the same bone for the first time through the loop [#25885] */
 	
 	/* we only include bones that are part of a continual connected chain */
 	while (pchan) {
@@ -876,7 +879,7 @@ static short pose_grab_with_ik_add(bPoseChannel *pchan)
 	}
 
 	/* make a copy of maximum chain-length */
-	data->max_rootbone= data->rootbone;
+	data->max_rootbone = data->rootbone;
 
 	return 1;
 }
@@ -885,19 +888,19 @@ static short pose_grab_with_ik_add(bPoseChannel *pchan)
 static short pose_grab_with_ik_children(bPose *pose, Bone *bone)
 {
 	Bone *bonec;
-	short wentdeeper=0, added=0;
+	short wentdeeper = 0, added = 0;
 
 	/* go deeper if children & children are connected */
-	for (bonec= bone->childbase.first; bonec; bonec= bonec->next) {
+	for (bonec = bone->childbase.first; bonec; bonec = bonec->next) {
 		if (bonec->flag & BONE_CONNECTED) {
-			wentdeeper= 1;
-			added+= pose_grab_with_ik_children(pose, bonec);
+			wentdeeper = 1;
+			added += pose_grab_with_ik_children(pose, bonec);
 		}
 	}
-	if (wentdeeper==0) {
-		bPoseChannel *pchan= BKE_pose_channel_find_name(pose, bone->name);
+	if (wentdeeper == 0) {
+		bPoseChannel *pchan = BKE_pose_channel_find_name(pose, bone->name);
 		if (pchan)
-			added+= pose_grab_with_ik_add(pchan);
+			added += pose_grab_with_ik_add(pchan);
 	}
 
 	return added;
@@ -909,30 +912,30 @@ static short pose_grab_with_ik(Object *ob)
 	bArmature *arm;
 	bPoseChannel *pchan, *parent;
 	Bone *bonec;
-	short tot_ik= 0;
+	short tot_ik = 0;
 
-	if ((ob==NULL) || (ob->pose==NULL) || (ob->mode & OB_MODE_POSE)==0)
+	if ((ob == NULL) || (ob->pose == NULL) || (ob->mode & OB_MODE_POSE) == 0)
 		return 0;
 
 	arm = ob->data;
 
 	/* Rule: allow multiple Bones (but they must be selected, and only one ik-solver per chain should get added) */
-	for (pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
+	for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
 		if (pchan->bone->layer & arm->layer) {
 			if (pchan->bone->flag & BONE_SELECTED) {
 				/* Rule: no IK for solitatry (unconnected) bones */
-				for (bonec=pchan->bone->childbase.first; bonec; bonec=bonec->next) {
+				for (bonec = pchan->bone->childbase.first; bonec; bonec = bonec->next) {
 					if (bonec->flag & BONE_CONNECTED) {
 						break;
 					}
 				}
-				if ((pchan->bone->flag & BONE_CONNECTED)==0 && (bonec == NULL))
+				if ((pchan->bone->flag & BONE_CONNECTED) == 0 && (bonec == NULL))
 					continue;
 
 				/* rule: if selected Bone is not a root bone, it gets a temporal IK */
 				if (pchan->parent) {
 					/* only adds if there's no IK yet (and no parent bone was selected) */
-					for (parent= pchan->parent; parent; parent= parent->parent) {
+					for (parent = pchan->parent; parent; parent = parent->parent) {
 						if (parent->bone->flag & BONE_SELECTED)
 							break;
 					}
@@ -958,17 +961,17 @@ static void createTransPose(TransInfo *t, Object *ob)
 	bPoseChannel *pchan;
 	TransData *td;
 	TransDataExtension *tdx;
-	short ik_on= 0;
+	short ik_on = 0;
 	int i;
 
-	t->total= 0;
+	t->total = 0;
 
 	/* check validity of state */
-	arm= BKE_armature_from_object(ob);
-	if ((arm==NULL) || (ob->pose==NULL)) return;
+	arm = BKE_armature_from_object(ob);
+	if ((arm == NULL) || (ob->pose == NULL)) return;
 
 	if (arm->flag & ARM_RESTPOS) {
-		if (ELEM(t->mode, TFM_DUMMY, TFM_BONESIZE)==0) {
+		if (ELEM(t->mode, TFM_DUMMY, TFM_BONESIZE) == 0) {
 			// XXX use transform operator reports
 			// BKE_report(op->reports, RPT_ERROR, "Can't select linked when sync selection is enabled");
 			return;
@@ -976,8 +979,8 @@ static void createTransPose(TransInfo *t, Object *ob)
 	}
 
 	/* do we need to add temporal IK chains? */
-	if ((arm->flag & ARM_AUTO_IK) && t->mode==TFM_TRANSLATION) {
-		ik_on= pose_grab_with_ik(ob);
+	if ((arm->flag & ARM_AUTO_IK) && t->mode == TFM_TRANSLATION) {
+		ik_on = pose_grab_with_ik(ob);
 		if (ik_on) t->flag |= T_AUTOIK;
 	}
 
@@ -987,26 +990,26 @@ static void createTransPose(TransInfo *t, Object *ob)
 	if (t->total == 0) return;
 
 	t->flag |= T_POSE;
-	t->poseobj= ob;	/* we also allow non-active objects to be transformed, in weightpaint */
+	t->poseobj = ob; /* we also allow non-active objects to be transformed, in weightpaint */
 
 	/* init trans data */
-	td = t->data = MEM_callocN(t->total*sizeof(TransData), "TransPoseBone");
-	tdx = t->ext = MEM_callocN(t->total*sizeof(TransDataExtension), "TransPoseBoneExt");
-	for (i=0; i<t->total; i++, td++, tdx++) {
-		td->ext= tdx;
+	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransPoseBone");
+	tdx = t->ext = MEM_callocN(t->total * sizeof(TransDataExtension), "TransPoseBoneExt");
+	for (i = 0; i < t->total; i++, td++, tdx++) {
+		td->ext = tdx;
 		td->val = NULL;
 	}
 
 	/* use pose channels to fill trans data */
-	td= t->data;
-	for (pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
+	td = t->data;
+	for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
 		if (pchan->bone->flag & BONE_TRANSFORM) {
 			add_pose_transdata(t, pchan, ob, td);
 			td++;
 		}
 	}
 
-	if (td != (t->data+t->total)) {
+	if (td != (t->data + t->total)) {
 		// XXX use transform operator reports
 		// BKE_report(op->reports, RPT_DEBUG, "Bone selection count error");
 	}
@@ -1020,18 +1023,18 @@ static void createTransPose(TransInfo *t, Object *ob)
 static void createTransArmatureVerts(TransInfo *t)
 {
 	EditBone *ebo;
-	bArmature *arm= t->obedit->data;
+	bArmature *arm = t->obedit->data;
 	ListBase *edbo = arm->edbo;
 	TransData *td;
 	float mtx[3][3], smtx[3][3], delta[3], bonemat[3][3];
 	
 	/* special hack for envelope drawmode and scaling:
-	 * 	to allow scaling the size of the envelope around single points,
+	 *  to allow scaling the size of the envelope around single points,
 	 *	mode should become TFM_BONE_ENVELOPE in this case
 	 */
 	// TODO: maybe we need a separate hotkey for it, but this is consistent with 2.4x for now
-	if ((t->mode == TFM_RESIZE) && (arm->drawtype==ARM_ENVELOPE))
-		t->mode= TFM_BONE_ENVELOPE;
+	if ((t->mode == TFM_RESIZE) && (arm->drawtype == ARM_ENVELOPE))
+		t->mode = TFM_BONE_ENVELOPE;
 	
 	t->total = 0;
 	for (ebo = edbo->first; ebo; ebo = ebo->next) {
@@ -1058,19 +1061,19 @@ static void createTransArmatureVerts(TransInfo *t)
 	copy_m3_m4(mtx, t->obedit->obmat);
 	invert_m3_m3(smtx, mtx);
 
-	td = t->data = MEM_callocN(t->total*sizeof(TransData), "TransEditBone");
+	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransEditBone");
 
 	for (ebo = edbo->first; ebo; ebo = ebo->next) {
-		ebo->oldlength = ebo->length;	// length==0.0 on extrude, used for scaling radius of bone points
+		ebo->oldlength = ebo->length;   // length==0.0 on extrude, used for scaling radius of bone points
 
 		if (EBONE_VISIBLE(arm, ebo) && !(ebo->flag & BONE_EDITMODE_LOCKED)) {
-			if (t->mode==TFM_BONE_ENVELOPE) {
+			if (t->mode == TFM_BONE_ENVELOPE) {
 				if (ebo->flag & BONE_ROOTSEL) {
-					td->val= &ebo->rad_head;
-					td->ival= *td->val;
+					td->val = &ebo->rad_head;
+					td->ival = *td->val;
 
 					copy_v3_v3(td->center, ebo->head);
-					td->flag= TD_SELECTED;
+					td->flag = TD_SELECTED;
 
 					copy_m3_m3(td->smtx, smtx);
 					copy_m3_m3(td->mtx, mtx);
@@ -1082,10 +1085,10 @@ static void createTransArmatureVerts(TransInfo *t)
 					td++;
 				}
 				if (ebo->flag & BONE_TIPSEL) {
-					td->val= &ebo->rad_tail;
-					td->ival= *td->val;
+					td->val = &ebo->rad_tail;
+					td->ival = *td->val;
 					copy_v3_v3(td->center, ebo->tail);
-					td->flag= TD_SELECTED;
+					td->flag = TD_SELECTED;
 
 					copy_m3_m3(td->smtx, smtx);
 					copy_m3_m3(td->mtx, mtx);
@@ -1098,21 +1101,21 @@ static void createTransArmatureVerts(TransInfo *t)
 				}
 
 			}
-			else if (t->mode==TFM_BONESIZE) {
+			else if (t->mode == TFM_BONESIZE) {
 				if (ebo->flag & BONE_SELECTED) {
-					if (arm->drawtype==ARM_ENVELOPE) {
-						td->loc= NULL;
-						td->val= &ebo->dist;
-						td->ival= ebo->dist;
+					if (arm->drawtype == ARM_ENVELOPE) {
+						td->loc = NULL;
+						td->val = &ebo->dist;
+						td->ival = ebo->dist;
 					}
 					else {
 						// abusive storage of scale in the loc pointer :)
-						td->loc= &ebo->xwidth;
+						td->loc = &ebo->xwidth;
 						copy_v3_v3(td->iloc, td->loc);
-						td->val= NULL;
+						td->val = NULL;
 					}
 					copy_v3_v3(td->center, ebo->head);
-					td->flag= TD_SELECTED;
+					td->flag = TD_SELECTED;
 
 					/* use local bone matrix */
 					sub_v3_v3v3(delta, ebo->tail, ebo->head);
@@ -1129,14 +1132,14 @@ static void createTransArmatureVerts(TransInfo *t)
 					td++;
 				}
 			}
-			else if (t->mode==TFM_BONE_ROLL) {
+			else if (t->mode == TFM_BONE_ROLL) {
 				if (ebo->flag & BONE_SELECTED) {
-					td->loc= NULL;
-					td->val= &(ebo->roll);
-					td->ival= ebo->roll;
+					td->loc = NULL;
+					td->val = &(ebo->roll);
+					td->ival = ebo->roll;
 
 					copy_v3_v3(td->center, ebo->head);
-					td->flag= TD_SELECTED;
+					td->flag = TD_SELECTED;
 
 					td->ext = NULL;
 					td->ob = t->obedit;
@@ -1147,11 +1150,11 @@ static void createTransArmatureVerts(TransInfo *t)
 			else {
 				if (ebo->flag & BONE_TIPSEL) {
 					copy_v3_v3(td->iloc, ebo->tail);
-					copy_v3_v3(td->center, (t->around==V3D_LOCAL) ? ebo->head : td->iloc);
-					td->loc= ebo->tail;
-					td->flag= TD_SELECTED;
+					copy_v3_v3(td->center, (t->around == V3D_LOCAL) ? ebo->head : td->iloc);
+					td->loc = ebo->tail;
+					td->flag = TD_SELECTED;
 					if (ebo->flag & BONE_EDITMODE_LOCKED)
-						td->protectflag = OB_LOCK_LOC|OB_LOCK_ROT|OB_LOCK_SCALE;
+						td->protectflag = OB_LOCK_LOC | OB_LOCK_ROT | OB_LOCK_SCALE;
 
 					copy_m3_m3(td->smtx, smtx);
 					copy_m3_m3(td->mtx, mtx);
@@ -1172,10 +1175,10 @@ static void createTransArmatureVerts(TransInfo *t)
 				if (ebo->flag & BONE_ROOTSEL) {
 					copy_v3_v3(td->iloc, ebo->head);
 					copy_v3_v3(td->center, td->iloc);
-					td->loc= ebo->head;
-					td->flag= TD_SELECTED;
+					td->loc = ebo->head;
+					td->flag = TD_SELECTED;
 					if (ebo->flag & BONE_EDITMODE_LOCKED)
-						td->protectflag = OB_LOCK_LOC|OB_LOCK_ROT|OB_LOCK_SCALE;
+						td->protectflag = OB_LOCK_LOC | OB_LOCK_ROT | OB_LOCK_SCALE;
 
 					copy_m3_m3(td->smtx, smtx);
 					copy_m3_m3(td->mtx, mtx);
@@ -1200,40 +1203,40 @@ static void createTransArmatureVerts(TransInfo *t)
 
 static void createTransMBallVerts(TransInfo *t)
 {
-	MetaBall *mb = (MetaBall*)t->obedit->data;
+	MetaBall *mb = (MetaBall *)t->obedit->data;
 	MetaElem *ml;
 	TransData *td;
 	TransDataExtension *tx;
 	float mtx[3][3], smtx[3][3];
-	int count=0, countsel=0;
+	int count = 0, countsel = 0;
 	int propmode = t->flag & T_PROP_EDIT;
 
 	/* count totals */
-	for (ml= mb->editelems->first; ml; ml= ml->next) {
+	for (ml = mb->editelems->first; ml; ml = ml->next) {
 		if (ml->flag & SELECT) countsel++;
 		if (propmode) count++;
 	}
 
 	/* note: in prop mode we need at least 1 selected */
-	if (countsel==0) return;
+	if (countsel == 0) return;
 
 	if (propmode) t->total = count;
 	else t->total = countsel;
 
-	td = t->data= MEM_callocN(t->total*sizeof(TransData), "TransObData(MBall EditMode)");
-	tx = t->ext = MEM_callocN(t->total*sizeof(TransDataExtension), "MetaElement_TransExtension");
+	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransObData(MBall EditMode)");
+	tx = t->ext = MEM_callocN(t->total * sizeof(TransDataExtension), "MetaElement_TransExtension");
 
 	copy_m3_m4(mtx, t->obedit->obmat);
 	invert_m3_m3(smtx, mtx);
 
-	for (ml= mb->editelems->first; ml; ml= ml->next) {
+	for (ml = mb->editelems->first; ml; ml = ml->next) {
 		if (propmode || (ml->flag & SELECT)) {
-			td->loc= &ml->x;
+			td->loc = &ml->x;
 			copy_v3_v3(td->iloc, td->loc);
 			copy_v3_v3(td->center, td->loc);
 
-			if (ml->flag & SELECT) td->flag= TD_SELECTED | TD_USEQUAT | TD_SINGLESIZE;
-			else td->flag= TD_USEQUAT;
+			if (ml->flag & SELECT) td->flag = TD_SELECTED | TD_USEQUAT | TD_SINGLESIZE;
+			else td->flag = TD_USEQUAT;
 
 			copy_m3_m3(td->smtx, smtx);
 			copy_m3_m3(td->mtx, mtx);
@@ -1273,7 +1276,7 @@ static void createTransMBallVerts(TransInfo *t)
 static void calc_distanceCurveVerts(TransData *head, TransData *tail)
 {
 	TransData *td, *td_near = NULL;
-	for (td = head; td<=tail; td++) {
+	for (td = head; td <= tail; td++) {
 		if (td->flag & TD_SELECTED) {
 			td_near = td;
 			td->dist = 0.0f;
@@ -1281,8 +1284,8 @@ static void calc_distanceCurveVerts(TransData *head, TransData *tail)
 		else if (td_near) {
 			float dist;
 			dist = len_v3v3(td_near->center, td->center);
-			if (dist < (td-1)->dist) {
-				td->dist = (td-1)->dist;
+			if (dist < (td - 1)->dist) {
+				td->dist = (td - 1)->dist;
 			}
 			else {
 				td->dist = dist;
@@ -1294,7 +1297,7 @@ static void calc_distanceCurveVerts(TransData *head, TransData *tail)
 		}
 	}
 	td_near = NULL;
-	for (td = tail; td>=head; td--) {
+	for (td = tail; td >= head; td--) {
 		if (td->flag & TD_SELECTED) {
 			td_near = td;
 			td->dist = 0.0f;
@@ -1302,10 +1305,10 @@ static void calc_distanceCurveVerts(TransData *head, TransData *tail)
 		else if (td_near) {
 			float dist;
 			dist = len_v3v3(td_near->center, td->center);
-			if (td->flag & TD_NOTCONNECTED || dist < td->dist || (td+1)->dist < td->dist) {
+			if (td->flag & TD_NOTCONNECTED || dist < td->dist || (td + 1)->dist < td->dist) {
 				td->flag &= ~TD_NOTCONNECTED;
-				if (dist < (td+1)->dist) {
-					td->dist = (td+1)->dist;
+				if (dist < (td + 1)->dist) {
+					td->dist = (td + 1)->dist;
 				}
 				else {
 					td->dist = dist;
@@ -1330,44 +1333,44 @@ static TransDataCurveHandleFlags *initTransDataCurveHandles(TransData *td, struc
 
 static void createTransCurveVerts(bContext *C, TransInfo *t)
 {
-	Object *obedit= CTX_data_edit_object(C);
-	Curve *cu= obedit->data;
+	Object *obedit = CTX_data_edit_object(C);
+	Curve *cu = obedit->data;
 	TransData *td = NULL;
-	  Nurb *nu;
+	Nurb *nu;
 	BezTriple *bezt;
 	BPoint *bp;
 	float mtx[3][3], smtx[3][3];
 	int a;
-	int count=0, countsel=0;
+	int count = 0, countsel = 0;
 	int propmode = t->flag & T_PROP_EDIT;
 	short hide_handles = (cu->drawflag & CU_HIDE_HANDLES);
 	ListBase *nurbs;
 
 	/* to be sure */
-	if (cu->editnurb==NULL) return;
+	if (cu->editnurb == NULL) return;
 
 	/* count total of vertices, check identical as in 2nd loop for making transdata! */
-	nurbs= BKE_curve_editNurbs_get(cu);
-	for (nu= nurbs->first; nu; nu= nu->next) {
+	nurbs = BKE_curve_editNurbs_get(cu);
+	for (nu = nurbs->first; nu; nu = nu->next) {
 		if (nu->type == CU_BEZIER) {
-			for (a=0, bezt= nu->bezt; a<nu->pntsu; a++, bezt++) {
-				if (bezt->hide==0) {
+			for (a = 0, bezt = nu->bezt; a < nu->pntsu; a++, bezt++) {
+				if (bezt->hide == 0) {
 					if (hide_handles) {
-						if (bezt->f2 & SELECT) countsel+=3;
-						if (propmode) count+= 3;
+						if (bezt->f2 & SELECT) countsel += 3;
+						if (propmode) count += 3;
 					}
 					else {
 						if (bezt->f1 & SELECT) countsel++;
 						if (bezt->f2 & SELECT) countsel++;
 						if (bezt->f3 & SELECT) countsel++;
-						if (propmode) count+= 3;
+						if (propmode) count += 3;
 					}
 				}
 			}
 		}
 		else {
-			for (a= nu->pntsu*nu->pntsv, bp= nu->bp; a>0; a--, bp++) {
-				if (bp->hide==0) {
+			for (a = nu->pntsu * nu->pntsv, bp = nu->bp; a > 0; a--, bp++) {
+				if (bp->hide == 0) {
 					if (propmode) count++;
 					if (bp->f1 & SELECT) countsel++;
 				}
@@ -1375,22 +1378,22 @@ static void createTransCurveVerts(bContext *C, TransInfo *t)
 		}
 	}
 	/* note: in prop mode we need at least 1 selected */
-	if (countsel==0) return;
+	if (countsel == 0) return;
 
 	if (propmode) t->total = count;
 	else t->total = countsel;
-	t->data= MEM_callocN(t->total*sizeof(TransData), "TransObData(Curve EditMode)");
+	t->data = MEM_callocN(t->total * sizeof(TransData), "TransObData(Curve EditMode)");
 
 	copy_m3_m4(mtx, t->obedit->obmat);
 	invert_m3_m3(smtx, mtx);
 
 	td = t->data;
-	for (nu= nurbs->first; nu; nu= nu->next) {
+	for (nu = nurbs->first; nu; nu = nu->next) {
 		if (nu->type == CU_BEZIER) {
 			TransData *head, *tail;
 			head = tail = td;
-			for (a=0, bezt= nu->bezt; a<nu->pntsu; a++, bezt++) {
-				if (bezt->hide==0) {
+			for (a = 0, bezt = nu->bezt; a < nu->pntsu; a++, bezt++) {
+				if (bezt->hide == 0) {
 					TransDataCurveHandleFlags *hdata = NULL;
 
 					if (propmode ||
@@ -1398,15 +1401,15 @@ static void createTransCurveVerts(bContext *C, TransInfo *t)
 					    ((bezt->f1 & SELECT) && hide_handles == 0))
 					{
 						copy_v3_v3(td->iloc, bezt->vec[0]);
-						td->loc= bezt->vec[0];
-						copy_v3_v3(td->center, bezt->vec[(hide_handles || bezt->f2 & SELECT) ? 1:0]);
+						td->loc = bezt->vec[0];
+						copy_v3_v3(td->center, bezt->vec[(hide_handles || bezt->f2 & SELECT) ? 1 : 0]);
 						if (hide_handles) {
-							if (bezt->f2 & SELECT) td->flag= TD_SELECTED;
-							else td->flag= 0;
+							if (bezt->f2 & SELECT) td->flag = TD_SELECTED;
+							else td->flag = 0;
 						}
 						else {
-							if (bezt->f1 & SELECT) td->flag= TD_SELECTED;
-							else td->flag= 0;
+							if (bezt->f1 & SELECT) td->flag = TD_SELECTED;
+							else td->flag = 0;
 						}
 						td->ext = NULL;
 						td->val = NULL;
@@ -1424,17 +1427,17 @@ static void createTransCurveVerts(bContext *C, TransInfo *t)
 					/* This is the Curve Point, the other two are handles */
 					if (propmode || (bezt->f2 & SELECT)) {
 						copy_v3_v3(td->iloc, bezt->vec[1]);
-						td->loc= bezt->vec[1];
+						td->loc = bezt->vec[1];
 						copy_v3_v3(td->center, td->loc);
-						if (bezt->f2 & SELECT) td->flag= TD_SELECTED;
-						else td->flag= 0;
+						if (bezt->f2 & SELECT) td->flag = TD_SELECTED;
+						else td->flag = 0;
 						td->ext = NULL;
 
-						if (t->mode==TFM_CURVE_SHRINKFATTEN) { /* || t->mode==TFM_RESIZE) {*/ /* TODO - make points scale */
+						if (t->mode == TFM_CURVE_SHRINKFATTEN) { /* || t->mode==TFM_RESIZE) {*/ /* TODO - make points scale */
 							td->val = &(bezt->radius);
 							td->ival = bezt->radius;
 						}
-						else if (t->mode==TFM_TILT) {
+						else if (t->mode == TFM_TILT) {
 							td->val = &(bezt->alfa);
 							td->ival = bezt->alfa;
 						}
@@ -1445,11 +1448,11 @@ static void createTransCurveVerts(bContext *C, TransInfo *t)
 						copy_m3_m3(td->smtx, smtx);
 						copy_m3_m3(td->mtx, mtx);
 
-						if ((bezt->f1&SELECT)==0 && (bezt->f3&SELECT)==0)
-						/* If the middle is selected but the sides arnt, this is needed */
-						if (hdata==NULL) { /* if the handle was not saved by the previous handle */
-							hdata = initTransDataCurveHandles(td, bezt);
-						}
+						if ((bezt->f1 & SELECT) == 0 && (bezt->f3 & SELECT) == 0)
+							/* If the middle is selected but the sides arnt, this is needed */
+							if (hdata == NULL) { /* if the handle was not saved by the previous handle */
+								hdata = initTransDataCurveHandles(td, bezt);
+							}
 
 						td++;
 						count++;
@@ -1460,20 +1463,20 @@ static void createTransCurveVerts(bContext *C, TransInfo *t)
 					    ((bezt->f3 & SELECT) && hide_handles == 0))
 					{
 						copy_v3_v3(td->iloc, bezt->vec[2]);
-						td->loc= bezt->vec[2];
-						copy_v3_v3(td->center, bezt->vec[(hide_handles || bezt->f2 & SELECT) ? 1:2]);
+						td->loc = bezt->vec[2];
+						copy_v3_v3(td->center, bezt->vec[(hide_handles || bezt->f2 & SELECT) ? 1 : 2]);
 						if (hide_handles) {
-							if (bezt->f2 & SELECT) td->flag= TD_SELECTED;
-							else td->flag= 0;
+							if (bezt->f2 & SELECT) td->flag = TD_SELECTED;
+							else td->flag = 0;
 						}
 						else {
-							if (bezt->f3 & SELECT) td->flag= TD_SELECTED;
-							else td->flag= 0;
+							if (bezt->f3 & SELECT) td->flag = TD_SELECTED;
+							else td->flag = 0;
 						}
 						td->ext = NULL;
 						td->val = NULL;
 
-						if (hdata==NULL) { /* if the handle was not saved by the previous handle */
+						if (hdata == NULL) { /* if the handle was not saved by the previous handle */
 							hdata = initTransDataCurveHandles(td, bezt);
 						}
 
@@ -1486,12 +1489,12 @@ static void createTransCurveVerts(bContext *C, TransInfo *t)
 					}
 				}
 				else if (propmode && head != tail) {
-					calc_distanceCurveVerts(head, tail-1);
+					calc_distanceCurveVerts(head, tail - 1);
 					head = tail;
 				}
 			}
 			if (propmode && head != tail)
-				calc_distanceCurveVerts(head, tail-1);
+				calc_distanceCurveVerts(head, tail - 1);
 
 			/* TODO - in the case of tilt and radius we can also avoid allocating the initTransDataCurveHandles
 			 * but for now just don't change handle types */
@@ -1503,17 +1506,17 @@ static void createTransCurveVerts(bContext *C, TransInfo *t)
 		else {
 			TransData *head, *tail;
 			head = tail = td;
-			for (a= nu->pntsu*nu->pntsv, bp= nu->bp; a>0; a--, bp++) {
-				if (bp->hide==0) {
+			for (a = nu->pntsu * nu->pntsv, bp = nu->bp; a > 0; a--, bp++) {
+				if (bp->hide == 0) {
 					if (propmode || (bp->f1 & SELECT)) {
 						copy_v3_v3(td->iloc, bp->vec);
-						td->loc= bp->vec;
+						td->loc = bp->vec;
 						copy_v3_v3(td->center, td->loc);
-						if (bp->f1 & SELECT) td->flag= TD_SELECTED;
-						else td->flag= 0;
+						if (bp->f1 & SELECT) td->flag = TD_SELECTED;
+						else td->flag = 0;
 						td->ext = NULL;
 
-						if (t->mode==TFM_CURVE_SHRINKFATTEN || t->mode==TFM_RESIZE) {
+						if (t->mode == TFM_CURVE_SHRINKFATTEN || t->mode == TFM_RESIZE) {
 							td->val = &(bp->radius);
 							td->ival = bp->radius;
 						}
@@ -1531,12 +1534,12 @@ static void createTransCurveVerts(bContext *C, TransInfo *t)
 					}
 				}
 				else if (propmode && head != tail) {
-					calc_distanceCurveVerts(head, tail-1);
+					calc_distanceCurveVerts(head, tail - 1);
 					head = tail;
 				}
 			}
 			if (propmode && head != tail)
-				calc_distanceCurveVerts(head, tail-1);
+				calc_distanceCurveVerts(head, tail - 1);
 		}
 	}
 }
@@ -1545,30 +1548,30 @@ static void createTransCurveVerts(bContext *C, TransInfo *t)
 
 static void createTransLatticeVerts(TransInfo *t)
 {
-	Lattice *latt = ((Lattice*)t->obedit->data)->editlatt->latt;
+	Lattice *latt = ((Lattice *)t->obedit->data)->editlatt->latt;
 	TransData *td = NULL;
 	BPoint *bp;
 	float mtx[3][3], smtx[3][3];
 	int a;
-	int count=0, countsel=0;
+	int count = 0, countsel = 0;
 	int propmode = t->flag & T_PROP_EDIT;
 
 	bp = latt->def;
 	a  = latt->pntsu * latt->pntsv * latt->pntsw;
 	while (a--) {
-		if (bp->hide==0) {
+		if (bp->hide == 0) {
 			if (bp->f1 & SELECT) countsel++;
 			if (propmode) count++;
 		}
 		bp++;
 	}
 
-	 /* note: in prop mode we need at least 1 selected */
-	if (countsel==0) return;
+	/* note: in prop mode we need at least 1 selected */
+	if (countsel == 0) return;
 
 	if (propmode) t->total = count;
 	else t->total = countsel;
-	t->data= MEM_callocN(t->total*sizeof(TransData), "TransObData(Lattice EditMode)");
+	t->data = MEM_callocN(t->total * sizeof(TransData), "TransObData(Lattice EditMode)");
 
 	copy_m3_m4(mtx, t->obedit->obmat);
 	invert_m3_m3(smtx, mtx);
@@ -1578,12 +1581,12 @@ static void createTransLatticeVerts(TransInfo *t)
 	a  = latt->pntsu * latt->pntsv * latt->pntsw;
 	while (a--) {
 		if (propmode || (bp->f1 & SELECT)) {
-			if (bp->hide==0) {
+			if (bp->hide == 0) {
 				copy_v3_v3(td->iloc, bp->vec);
-				td->loc= bp->vec;
+				td->loc = bp->vec;
 				copy_v3_v3(td->center, td->loc);
-				if (bp->f1 & SELECT) td->flag= TD_SELECTED;
-				else td->flag= 0;
+				if (bp->f1 & SELECT) td->flag = TD_SELECTED;
+				else td->flag = 0;
 				copy_m3_m3(td->smtx, smtx);
 				copy_m3_m3(td->mtx, mtx);
 
@@ -1616,7 +1619,7 @@ static void createTransParticleVerts(bContext *C, TransInfo *t)
 	int count = 0, hasselected = 0;
 	int propmode = t->flag & T_PROP_EDIT;
 
-	if (edit==NULL || t->settings->particle.selectmode==SCE_SELECT_PATH) return;
+	if (edit == NULL || t->settings->particle.selectmode == SCE_SELECT_PATH) return;
 
 	psys = edit->psys;
 
@@ -1625,19 +1628,19 @@ static void createTransParticleVerts(bContext *C, TransInfo *t)
 
 	base->flag |= BA_HAS_RECALC_DATA;
 
-	for (i=0, point=edit->points; i<edit->totpoint; i++, point++) {
+	for (i = 0, point = edit->points; i < edit->totpoint; i++, point++) {
 		point->flag &= ~PEP_TRANSFORM;
-		transformparticle= 0;
-
-		if ((point->flag & PEP_HIDE)==0) {
-			for (k=0, key=point->keys; k<point->totkey; k++, key++) {
-				if ((key->flag&PEK_HIDE)==0) {
-					if (key->flag&PEK_SELECT) {
-						hasselected= 1;
-						transformparticle= 1;
+		transformparticle = 0;
+
+		if ((point->flag & PEP_HIDE) == 0) {
+			for (k = 0, key = point->keys; k < point->totkey; k++, key++) {
+				if ((key->flag & PEK_HIDE) == 0) {
+					if (key->flag & PEK_SELECT) {
+						hasselected = 1;
+						transformparticle = 1;
 					}
 					else if (propmode)
-						transformparticle= 1;
+						transformparticle = 1;
 				}
 			}
 		}
@@ -1648,8 +1651,8 @@ static void createTransParticleVerts(bContext *C, TransInfo *t)
 		}
 	}
 
-	 /* note: in prop mode we need at least 1 selected */
-	if (hasselected==0) return;
+	/* note: in prop mode we need at least 1 selected */
+	if (hasselected == 0) return;
 
 	t->total = count;
 	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransObData(Particle Mode)");
@@ -1663,7 +1666,7 @@ static void createTransParticleVerts(bContext *C, TransInfo *t)
 
 	invert_m4_m4(ob->imat, ob->obmat);
 
-	for (i=0, point=edit->points; i<edit->totpoint; i++, point++) {
+	for (i = 0, point = edit->points; i < edit->totpoint; i++, point++) {
 		TransData *head, *tail;
 		head = tail = td;
 
@@ -1672,7 +1675,7 @@ static void createTransParticleVerts(bContext *C, TransInfo *t)
 		if (psys && !(psys->flag & PSYS_GLOBAL_HAIR))
 			psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, psys->particles + i, mat);
 
-		for (k=0, key=point->keys; k<point->totkey; k++, key++) {
+		for (k = 0, key = point->keys; k < point->totkey; k++, key++) {
 			if (key->flag & PEK_USE_WCO) {
 				copy_v3_v3(key->world_co, key->co);
 				mul_m4_v3(mat, key->world_co);
@@ -1693,7 +1696,7 @@ static void createTransParticleVerts(bContext *C, TransInfo *t)
 			unit_m3(td->smtx);
 
 			/* don't allow moving roots */
-			if (k==0 && pset->flag & PE_LOCK_FIRST && (!psys || !(psys->flag & PSYS_GLOBAL_HAIR)))
+			if (k == 0 && pset->flag & PE_LOCK_FIRST && (!psys || !(psys->flag & PSYS_GLOBAL_HAIR)))
 				td->protectflag |= OB_LOCK_LOC;
 
 			td->ob = ob;
@@ -1703,7 +1706,7 @@ static void createTransParticleVerts(bContext *C, TransInfo *t)
 				td->ival = *(key->time);
 				/* abuse size and quat for min/max values */
 				td->flag |= TD_NO_EXT;
-				if (k==0) tx->size = NULL;
+				if (k == 0) tx->size = NULL;
 				else tx->size = (key - 1)->time;
 
 				if (k == point->totkey - 1) tx->quat = NULL;
@@ -1738,15 +1741,15 @@ void flushTransParticles(TransInfo *t)
 
 	/* we do transform in world space, so flush world space position
 	 * back to particle local space (only for hair particles) */
-	td= t->data;
-	for (i=0, point=edit->points; i<edit->totpoint; i++, point++, td++) {
+	td = t->data;
+	for (i = 0, point = edit->points; i < edit->totpoint; i++, point++, td++) {
 		if (!(point->flag & PEP_TRANSFORM)) continue;
 
 		if (psys && !(psys->flag & PSYS_GLOBAL_HAIR)) {
 			psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, psys->particles + i, mat);
 			invert_m4_m4(imat, mat);
 
-			for (k=0, key=point->keys; k<point->totkey; k++, key++) {
+			for (k = 0, key = point->keys; k < point->totkey; k++, key++) {
 				copy_v3_v3(co, key->world_co);
 				mul_m4_v3(imat, co);
 
@@ -1768,7 +1771,7 @@ void flushTransParticles(TransInfo *t)
 /* ********************* mesh ****************** */
 
 /* proportional distance based on connectivity  */
-#define THRESHOLDFACTOR (1.0f-0.0001f)
+#define THRESHOLDFACTOR (1.0f - 0.0001f)
 
 /* I did this wrong, it should be a breadth-first search
  * but instead it's a depth-first search, fudged
@@ -1778,10 +1781,10 @@ static void editmesh_set_connectivity_distance(BMEditMesh *em, float mtx[][3], f
 {
 	BMVert **queue = NULL;
 	float *dqueue = NULL;
-	int *tots = MEM_callocN(sizeof(int)*em->bm->totvert, "tots editmesh_set_connectivity_distance");
+	int *tots = MEM_callocN(sizeof(int) * em->bm->totvert, "tots editmesh_set_connectivity_distance");
 	BLI_array_declare(queue);
 	BLI_array_declare(dqueue);
-	SmallHash svisit, *visit=&svisit;
+	SmallHash svisit, *visit = &svisit;
 	BMVert *v;
 	BMIter viter;
 	int i, start;
@@ -1793,7 +1796,7 @@ static void editmesh_set_connectivity_distance(BMEditMesh *em, float mtx[][3], f
 	BLI_smallhash_init(visit);
 
 	BM_ITER_MESH (v, &viter, em->bm, BM_VERTS_OF_MESH) {
-		if (BM_elem_flag_test(v, BM_ELEM_SELECT)==0 || BM_elem_flag_test(v, BM_ELEM_HIDDEN))
+		if (BM_elem_flag_test(v, BM_ELEM_SELECT) == 0 || BM_elem_flag_test(v, BM_ELEM_HIDDEN))
 			continue;
 			
 		
@@ -1846,7 +1849,7 @@ static void editmesh_set_connectivity_distance(BMEditMesh *em, float mtx[][3], f
 
 	BLI_smallhash_release(visit);
 	
-	for (i=0; i<em->bm->totvert; i++) {
+	for (i = 0; i < em->bm->totvert; i++) {
 		if (tots[i])
 			dists[i] /= (float)tots[i];
 	}
@@ -1857,7 +1860,7 @@ static void editmesh_set_connectivity_distance(BMEditMesh *em, float mtx[][3], f
 }
 
 /* loop-in-a-loop I know, but we need it! (ton) */
- static void get_face_center(float cent_r[3], BMVert *eve)
+static void get_face_center(float cent_r[3], BMVert *eve)
 
 {
 	BMFace *efa;
@@ -1886,7 +1889,7 @@ static void get_edge_center(float cent_r[3], BMVert *eve)
 
 /* way to overwrite what data is edited with transform */
 static void VertsToTransData(TransInfo *t, TransData *td, TransDataExtension *tx,
-							 BMEditMesh *em, BMVert *eve, float *bweight)
+                             BMEditMesh *em, BMVert *eve, float *bweight)
 {
 	td->flag = 0;
 	//if (key)
@@ -1896,7 +1899,7 @@ static void VertsToTransData(TransInfo *t, TransData *td, TransDataExtension *tx
 
 	copy_v3_v3(td->center, td->loc);
 
-	if (t->around==V3D_LOCAL) {
+	if (t->around == V3D_LOCAL) {
 		if (em->selectmode & SCE_SELECT_FACE)
 			get_face_center(td->center, eve);
 		else if (em->selectmode & SCE_SELECT_EDGE)
@@ -1906,12 +1909,12 @@ static void VertsToTransData(TransInfo *t, TransData *td, TransDataExtension *tx
 
 	// Setting normals
 	copy_v3_v3(td->axismtx[2], eve->no);
-	td->axismtx[0][0]		=
-		td->axismtx[0][1]	=
-		td->axismtx[0][2]	=
-		td->axismtx[1][0]	=
-		td->axismtx[1][1]	=
-		td->axismtx[1][2]	= 0.0f;
+	td->axismtx[0][0]        =
+	    td->axismtx[0][1]    =
+	    td->axismtx[0][2]    =
+	    td->axismtx[1][0]    =
+	    td->axismtx[1][1]    =
+	    td->axismtx[1][2]    = 0.0f;
 
 	td->ext = NULL;
 	td->val = NULL;
@@ -1942,10 +1945,10 @@ static void createTransEditVerts(bContext *C, TransInfo *t)
 	BMVert *eve;
 	BMIter iter;
 	BMVert *eve_act = NULL;
-	float *mappedcos = NULL, *quats= NULL;
+	float *mappedcos = NULL, *quats = NULL;
 	float mtx[3][3], smtx[3][3], (*defmats)[3][3] = NULL, (*defcos)[3] = NULL;
-	float *dists=NULL;
-	int count=0, countsel=0, a, totleft;
+	float *dists = NULL;
+	int count = 0, countsel = 0, a, totleft;
 	int propmode = (t->flag & T_PROP_EDIT) ? (t->flag & (T_PROP_EDIT | T_PROP_CONNECTED)) : 0;
 	int mirror = 0;
 	char *selstate = NULL;
@@ -1974,10 +1977,10 @@ static void createTransEditVerts(bContext *C, TransInfo *t)
 		BMEdge *eed;
 
 		eve = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, NULL);
-		for ( ; eve; eve=BM_iter_step(&iter)) BM_elem_flag_disable(eve, BM_ELEM_TAG);
+		for (; eve; eve = BM_iter_step(&iter)) BM_elem_flag_disable(eve, BM_ELEM_TAG);
 
 		eed = BM_iter_new(&iter, bm, BM_EDGES_OF_MESH, NULL);
-		for ( ; eed; eed=BM_iter_step(&iter)) {
+		for (; eed; eed = BM_iter_step(&iter)) {
 			if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
 				BM_elem_flag_enable(eed->v1, BM_ELEM_TAG);
 				BM_elem_flag_enable(eed->v2, BM_ELEM_TAG);
@@ -1987,16 +1990,16 @@ static void createTransEditVerts(bContext *C, TransInfo *t)
 	else {
 		BMFace *efa;
 		eve = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, NULL);
-		for ( ; eve; eve=BM_iter_step(&iter)) BM_elem_flag_disable(eve, BM_ELEM_TAG);
+		for (; eve; eve = BM_iter_step(&iter)) BM_elem_flag_disable(eve, BM_ELEM_TAG);
 
 		efa = BM_iter_new(&iter, bm, BM_FACES_OF_MESH, NULL);
-		for ( ; efa; efa=BM_iter_step(&iter)) {
+		for (; efa; efa = BM_iter_step(&iter)) {
 			if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) {
 				BMIter liter;
 				BMLoop *l;
 
 				l = BM_iter_new(&liter, bm, BM_LOOPS_OF_FACE, efa);
-				for (; l; l=BM_iter_step(&liter)) {
+				for (; l; l = BM_iter_step(&liter)) {
 					BM_elem_flag_enable(l->v, BM_ELEM_TAG);
 				}
 			}
@@ -2008,7 +2011,7 @@ static void createTransEditVerts(bContext *C, TransInfo *t)
 	 * verts*/
 	selstate = MEM_callocN(sizeof(*selstate) * bm->totvert, __func__);
 	eve = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, NULL);
-	for (a=0; eve; eve=BM_iter_step(&iter), a++) {
+	for (a = 0; eve; eve = BM_iter_step(&iter), a++) {
 		if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
 			if (BM_elem_flag_test(eve, BM_ELEM_TAG)) {
 				selstate[a] = 1;
@@ -2041,10 +2044,10 @@ static void createTransEditVerts(bContext *C, TransInfo *t)
 	}
 	else t->total = countsel;
 
-	tob= t->data= MEM_callocN(t->total*sizeof(TransData), "TransObData(Mesh EditMode)");
+	tob = t->data = MEM_callocN(t->total * sizeof(TransData), "TransObData(Mesh EditMode)");
 	if (t->mode == TFM_SKIN_RESIZE) {
 		tx = t->ext = MEM_callocN(t->total * sizeof(TransDataExtension),
-								  "TransObData ext");
+		                          "TransObData ext");
 	}
 
 	copy_m3_m4(mtx, t->obedit->obmat);
@@ -2055,19 +2058,19 @@ static void createTransEditVerts(bContext *C, TransInfo *t)
 	}
 
 	/* detect CrazySpace [tm] */
-	if (modifiers_getCageIndex(t->scene, t->obedit, NULL, 1)>=0) {
+	if (modifiers_getCageIndex(t->scene, t->obedit, NULL, 1) >= 0) {
 		if (modifiers_isCorrectableDeformed(t->obedit)) {
 			/* check if we can use deform matrices for modifier from the
 			 * start up to stack, they are more accurate than quats */
-			totleft= editbmesh_get_first_deform_matrices(t->scene, t->obedit, em, &defmats, &defcos);
+			totleft = editbmesh_get_first_deform_matrices(t->scene, t->obedit, em, &defmats, &defcos);
 
 			/* if we still have more modifiers, also do crazyspace
 			 * correction with quats, relative to the coordinates after
 			 * the modifiers that support deform matrices (defcos) */
 			if (totleft > 0) {
-				mappedcos= crazyspace_get_mapped_editverts(t->scene, t->obedit);
-				quats= MEM_mallocN((t->total)*sizeof(float)*4, "crazy quats");
-				crazyspace_set_quats_editmesh(em, (float*)defcos, mappedcos, quats); /* BMESH_TODO, abuses vertex index, should use an int array */
+				mappedcos = crazyspace_get_mapped_editverts(t->scene, t->obedit);
+				quats = MEM_mallocN((t->total) * sizeof(float) * 4, "crazy quats");
+				crazyspace_set_quats_editmesh(em, (float *)defcos, mappedcos, quats); /* BMESH_TODO, abuses vertex index, should use an int array */
 				if (mappedcos)
 					MEM_freeN(mappedcos);
 			}
@@ -2080,8 +2083,8 @@ static void createTransEditVerts(bContext *C, TransInfo *t)
 	/* find out which half we do */
 	if (mirror) {
 		eve = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, NULL);
-		for (a=0; eve; eve=BM_iter_step(&iter), a++) {
-			if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN) && selstate[a] && eve->co[0]!=0.0f) {
+		for (a = 0; eve; eve = BM_iter_step(&iter), a++) {
+			if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN) && selstate[a] && eve->co[0] != 0.0f) {
 				if (eve->co[0] < 0.0f) {
 					t->mirror = -1;
 					mirror = -1;
@@ -2092,7 +2095,7 @@ static void createTransEditVerts(bContext *C, TransInfo *t)
 	}
 
 	eve = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, NULL);
-	for (a=0; eve; eve=BM_iter_step(&iter), a++) {
+	for (a = 0; eve; eve = BM_iter_step(&iter), a++) {
 		if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) {
 			if (propmode || selstate[a]) {
 				float *bweight = CustomData_bmesh_get(&bm->vdata, eve->head.data, CD_BWEIGHT);
@@ -2123,11 +2126,11 @@ static void createTransEditVerts(bContext *C, TransInfo *t)
 
 					/* use both or either quat and defmat correction */
 					if (quats && BM_elem_index_get(eve) != -1) {
-						quat_to_mat3(qmat, quats + 4*BM_elem_index_get(eve));
+						quat_to_mat3(qmat, quats + 4 * BM_elem_index_get(eve));
 
 						if (defmats)
 							mul_serie_m3(mat, mtx, qmat, defmats[a],
-								NULL, NULL, NULL, NULL, NULL);
+							             NULL, NULL, NULL, NULL, NULL);
 						else
 							mul_m3_m3m3(mat, mtx, qmat);
 					}
@@ -2145,8 +2148,8 @@ static void createTransEditVerts(bContext *C, TransInfo *t)
 				}
 
 				/* Mirror? */
-				if ((mirror>0 && tob->iloc[0]>0.0f) || (mirror<0 && tob->iloc[0]<0.0f)) {
-					BMVert *vmir= EDBM_verts_mirror_get(em, eve); //t->obedit, em, eve, tob->iloc, a);
+				if ((mirror > 0 && tob->iloc[0] > 0.0f) || (mirror < 0 && tob->iloc[0] < 0.0f)) {
+					BMVert *vmir = EDBM_verts_mirror_get(em, eve); //t->obedit, em, eve, tob->iloc, a);
 					if (vmir && vmir != eve) {
 						tob->extra = vmir;
 					}
@@ -2158,7 +2161,7 @@ static void createTransEditVerts(bContext *C, TransInfo *t)
 	
 	if (mirror != 0) {
 		tob = t->data;
-		for (a = 0; a < t->total; a++, tob++ ) {
+		for (a = 0; a < t->total; a++, tob++) {
 			if (ABS(tob->loc[0]) <= 0.00001f) {
 				tob->flag |= TD_MIRROR_EDGE;
 			}
@@ -2189,13 +2192,13 @@ void flushTransNodes(TransInfo *t)
 	TransData2D *td;
 
 	/* flush to 2d vector from internally used 3d vector */
-	for (a=0, td= t->data2d; a<t->total; a++, td++) {
-		td->loc2d[0]= td->loc[0];
-		td->loc2d[1]= td->loc[1];
+	for (a = 0, td = t->data2d; a < t->total; a++, td++) {
+		td->loc2d[0] = td->loc[0];
+		td->loc2d[1] = td->loc[1];
 	}
 	
 	/* handle intersection with noodles */
-	if (t->total==1) {
+	if (t->total == 1) {
 		ED_node_link_intersect_test(t->sa, 1);
 	}
 }
@@ -2209,11 +2212,11 @@ void flushTransNodes(TransInfo *t)
 
 void flushTransSeq(TransInfo *t)
 {
-	ListBase *seqbasep= BKE_sequencer_editing_get(t->scene, FALSE)->seqbasep; /* Editing null check already done */
+	ListBase *seqbasep = BKE_sequencer_editing_get(t->scene, FALSE)->seqbasep; /* Editing null check already done */
 	int a, new_frame, old_start;
-	TransData *td= NULL;
-	TransData2D *td2d= NULL;
-	TransDataSeq *tdsq= NULL;
+	TransData *td = NULL;
+	TransData2D *td2d = NULL;
+	TransDataSeq *tdsq = NULL;
 	Sequence *seq;
 
 
@@ -2221,43 +2224,43 @@ void flushTransSeq(TransInfo *t)
 	/* prevent updating the same seq twice
 	 * if the transdata order is changed this will mess up
 	 * but so will TransDataSeq */
-	Sequence *seq_prev= NULL;
+	Sequence *seq_prev = NULL;
 
 	/* flush to 2d vector from internally used 3d vector */
-	for (a=0, td= t->data, td2d= t->data2d; a<t->total; a++, td++, td2d++) {
-		tdsq= (TransDataSeq *)td->extra;
-		seq= tdsq->seq;
+	for (a = 0, td = t->data, td2d = t->data2d; a < t->total; a++, td++, td2d++) {
+		tdsq = (TransDataSeq *)td->extra;
+		seq = tdsq->seq;
 		old_start = seq->start;
-		new_frame= (int)floor(td2d->loc[0] + 0.5f);
+		new_frame = (int)floor(td2d->loc[0] + 0.5f);
 
 		switch (tdsq->sel_flag) {
-		case SELECT:
+			case SELECT:
 #ifdef SEQ_TX_NESTED_METAS
-			if ((seq->depth != 0 || seq_tx_test(seq))) /* for meta's, their children move */
-				seq->start= new_frame - tdsq->start_offset;
+				if ((seq->depth != 0 || seq_tx_test(seq))) /* for meta's, their children move */
+					seq->start = new_frame - tdsq->start_offset;
 #else
-			if (seq->type != SEQ_META && (seq->depth != 0 || seq_tx_test(seq))) /* for meta's, their children move */
-				seq->start= new_frame - tdsq->start_offset;
+				if (seq->type != SEQ_TYPE_META && (seq->depth != 0 || seq_tx_test(seq))) /* for meta's, their children move */
+					seq->start = new_frame - tdsq->start_offset;
 #endif
-			if (seq->depth==0) {
-				seq->machine= (int)floor(td2d->loc[1] + 0.5f);
-				CLAMP(seq->machine, 1, MAXSEQ);
-			}
-			break;
-		case SEQ_LEFTSEL: /* no vertical transform  */
-			seq_tx_set_final_left(seq, new_frame);
-			seq_tx_handle_xlimits(seq, tdsq->flag&SEQ_LEFTSEL, tdsq->flag&SEQ_RIGHTSEL);
-			seq_single_fix(seq); /* todo - move this into aftertrans update? - old seq tx needed it anyway */
-			break;
-		case SEQ_RIGHTSEL: /* no vertical transform  */
-			seq_tx_set_final_right(seq, new_frame);
-			seq_tx_handle_xlimits(seq, tdsq->flag&SEQ_LEFTSEL, tdsq->flag&SEQ_RIGHTSEL);
-			seq_single_fix(seq); /* todo - move this into aftertrans update? - old seq tx needed it anyway */
-			break;
+				if (seq->depth == 0) {
+					seq->machine = (int)floor(td2d->loc[1] + 0.5f);
+					CLAMP(seq->machine, 1, MAXSEQ);
+				}
+				break;
+			case SEQ_LEFTSEL: /* no vertical transform  */
+				seq_tx_set_final_left(seq, new_frame);
+				seq_tx_handle_xlimits(seq, tdsq->flag & SEQ_LEFTSEL, tdsq->flag & SEQ_RIGHTSEL);
+				seq_single_fix(seq); /* todo - move this into aftertrans update? - old seq tx needed it anyway */
+				break;
+			case SEQ_RIGHTSEL: /* no vertical transform  */
+				seq_tx_set_final_right(seq, new_frame);
+				seq_tx_handle_xlimits(seq, tdsq->flag & SEQ_LEFTSEL, tdsq->flag & SEQ_RIGHTSEL);
+				seq_single_fix(seq); /* todo - move this into aftertrans update? - old seq tx needed it anyway */
+				break;
 		}
 
 		if (seq != seq_prev) {
-			if (seq->depth==0) {
+			if (seq->depth == 0) {
 				/* Calculate this strip and all nested strips
 				 * children are ALWAYS transformed first
 				 * so we don't need to do this in another loop. */
@@ -2270,7 +2273,7 @@ void flushTransSeq(TransInfo *t)
 			if (tdsq->sel_flag == SELECT)
 				seq_offset_animdata(t->scene, seq, seq->start - old_start);
 		}
-		seq_prev= seq;
+		seq_prev = seq;
 	}
 
 
@@ -2279,7 +2282,7 @@ void flushTransSeq(TransInfo *t)
 
 		/* calc all meta's then effects [#27953] */
 		for (seq = seqbasep->first; seq; seq = seq->next) {
-			if (seq->type == SEQ_META && seq->flag & SELECT) {
+			if (seq->type == SEQ_TYPE_META && seq->flag & SELECT) {
 				calc_sequence(t->scene, seq);
 			}
 		}
@@ -2292,14 +2295,14 @@ void flushTransSeq(TransInfo *t)
 
 	/* need to do the overlap check in a new loop otherwise adjacent strips
 	 * will not be updated and we'll get false positives */
-	seq_prev= NULL;
-	for (a=0, td= t->data, td2d= t->data2d; a<t->total; a++, td++, td2d++) {
+	seq_prev = NULL;
+	for (a = 0, td = t->data, td2d = t->data2d; a < t->total; a++, td++, td2d++) {
 
-		tdsq= (TransDataSeq *)td->extra;
-		seq= tdsq->seq;
+		tdsq = (TransDataSeq *)td->extra;
+		seq = tdsq->seq;
 
 		if (seq != seq_prev) {
-			if (seq->depth==0) {
+			if (seq->depth == 0) {
 				/* test overlap, displayes red outline */
 				seq->flag &= ~SEQ_OVERLAP;
 				if (seq_test_overlap(seqbasep, seq)) {
@@ -2307,7 +2310,7 @@ void flushTransSeq(TransInfo *t)
 				}
 			}
 		}
-		seq_prev= seq;
+		seq_prev = seq;
 	}
 }
 
@@ -2323,8 +2326,8 @@ static void UVsToTransData(SpaceImage *sima, TransData *td, TransData2D *td2d, f
 	 * proportional editing to be consistent with the stretched uv coords
 	 * that are displayed. this also means that for display and numinput,
 	 * and when the the uv coords are flushed, these are converted each time */
-	td2d->loc[0] = uv[0]*aspx;
-	td2d->loc[1] = uv[1]*aspy;
+	td2d->loc[0] = uv[0] * aspx;
+	td2d->loc[1] = uv[1] * aspy;
 	td2d->loc[2] = 0.0f;
 	td2d->loc2d = uv;
 
@@ -2336,14 +2339,14 @@ static void UVsToTransData(SpaceImage *sima, TransData *td, TransData2D *td2d, f
 	memset(td->axismtx, 0, sizeof(td->axismtx));
 	td->axismtx[2][2] = 1.0f;
 
-	td->ext= NULL; td->val= NULL;
+	td->ext = NULL; td->val = NULL;
 
 	if (selected) {
 		td->flag |= TD_SELECTED;
-		td->dist= 0.0;
+		td->dist = 0.0;
 	}
 	else {
-		td->dist= MAXFLOAT;
+		td->dist = MAXFLOAT;
 	}
 	unit_m3(td->mtx);
 	unit_m3(td->smtx);
@@ -2362,14 +2365,14 @@ static void createTransUVs(bContext *C, TransInfo *t)
 	BMFace *efa;
 	BMLoop *l;
 	BMIter iter, liter;
-	int count=0, countsel=0;
+	int count = 0, countsel = 0;
 	int propmode = t->flag & T_PROP_EDIT;
 
 	if (!ED_space_image_show_uvedit(sima, t->obedit)) return;
 
 	/* count */
 	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-		tf= CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY);
+		tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY);
 
 		if (!uvedit_face_visible_test(scene, ima, efa, tf)) {
 			BM_elem_flag_disable(efa, BM_ELEM_TAG);
@@ -2386,20 +2389,20 @@ static void createTransUVs(bContext *C, TransInfo *t)
 		}
 	}
 
-	 /* note: in prop mode we need at least 1 selected */
-	if (countsel==0) return;
+	/* note: in prop mode we need at least 1 selected */
+	if (countsel == 0) return;
 
-	t->total= (propmode)? count: countsel;
-	t->data= MEM_callocN(t->total*sizeof(TransData), "TransObData(UV Editing)");
+	t->total = (propmode) ? count : countsel;
+	t->data = MEM_callocN(t->total * sizeof(TransData), "TransObData(UV Editing)");
 	/* for each 2d uv coord a 3d vector is allocated, so that they can be
 	 * treated just as if they were 3d verts */
-	t->data2d= MEM_callocN(t->total*sizeof(TransData2D), "TransObData2D(UV Editing)");
+	t->data2d = MEM_callocN(t->total * sizeof(TransData2D), "TransObData2D(UV Editing)");
 
 	if (sima->flag & SI_CLIP_UV)
 		t->flag |= T_CLIP_UV;
 
-	td= t->data;
-	td2d= t->data2d;
+	td = t->data;
+	td2d = t->data2d;
 
 	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
 		if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
@@ -2427,17 +2430,17 @@ void flushTransUVs(TransInfo *t)
 
 	ED_space_image_uv_aspect(sima, &aspx, &aspy);
 	ED_space_image_size(sima, &width, &height);
-	invx= 1.0f/aspx;
-	invy= 1.0f/aspy;
+	invx = 1.0f / aspx;
+	invy = 1.0f / aspy;
 
 	/* flush to 2d vector from internally used 3d vector */
-	for (a=0, td= t->data2d; a<t->total; a++, td++) {
-		td->loc2d[0]= td->loc[0]*invx;
-		td->loc2d[1]= td->loc[1]*invy;
+	for (a = 0, td = t->data2d; a < t->total; a++, td++) {
+		td->loc2d[0] = td->loc[0] * invx;
+		td->loc2d[1] = td->loc[1] * invy;
 
 		if ((sima->flag & SI_PIXELSNAP) && (t->state != TRANS_CANCEL)) {
-			td->loc2d[0]= (float)floor(width*td->loc2d[0] + 0.5f)/width;
-			td->loc2d[1]= (float)floor(height*td->loc2d[1] + 0.5f)/height;
+			td->loc2d[0] = (float)floor(width * td->loc2d[0] + 0.5f) / width;
+			td->loc2d[1] = (float)floor(height * td->loc2d[1] + 0.5f) / height;
 		}
 	}
 }
@@ -2445,46 +2448,46 @@ void flushTransUVs(TransInfo *t)
 int clipUVTransform(TransInfo *t, float *vec, int resize)
 {
 	TransData *td;
-	int a, clipx=1, clipy=1;
+	int a, clipx = 1, clipy = 1;
 	float aspx, aspy, min[2], max[2];
 
 	ED_space_image_uv_aspect(t->sa->spacedata.first, &aspx, &aspy);
-	min[0]= min[1]= 0.0f;
-	max[0]= aspx; max[1]= aspy;
+	min[0] = min[1] = 0.0f;
+	max[0] = aspx; max[1] = aspy;
 
-	for (a=0, td= t->data; a<t->total; a++, td++) {
+	for (a = 0, td = t->data; a < t->total; a++, td++) {
 		DO_MINMAX2(td->loc, min, max);
 	}
 
 	if (resize) {
-		if (min[0] < 0.0f && t->center[0] > 0.0f && t->center[0] < aspx*0.5f)
-			vec[0] *= t->center[0]/(t->center[0] - min[0]);
+		if (min[0] < 0.0f && t->center[0] > 0.0f && t->center[0] < aspx * 0.5f)
+			vec[0] *= t->center[0] / (t->center[0] - min[0]);
 		else if (max[0] > aspx && t->center[0] < aspx)
-			vec[0] *= (t->center[0] - aspx)/(t->center[0] - max[0]);
+			vec[0] *= (t->center[0] - aspx) / (t->center[0] - max[0]);
 		else
-			clipx= 0;
+			clipx = 0;
 
-		if (min[1] < 0.0f && t->center[1] > 0.0f && t->center[1] < aspy*0.5f)
-			vec[1] *= t->center[1]/(t->center[1] - min[1]);
+		if (min[1] < 0.0f && t->center[1] > 0.0f && t->center[1] < aspy * 0.5f)
+			vec[1] *= t->center[1] / (t->center[1] - min[1]);
 		else if (max[1] > aspy && t->center[1] < aspy)
-			vec[1] *= (t->center[1] - aspy)/(t->center[1] - max[1]);
+			vec[1] *= (t->center[1] - aspy) / (t->center[1] - max[1]);
 		else
-			clipy= 0;
+			clipy = 0;
 	}
 	else {
 		if (min[0] < 0.0f)
 			vec[0] -= min[0];
 		else if (max[0] > aspx)
-			vec[0] -= max[0]-aspx;
+			vec[0] -= max[0] - aspx;
 		else
-			clipx= 0;
+			clipx = 0;
 
 		if (min[1] < 0.0f)
 			vec[1] -= min[1];
 		else if (max[1] > aspy)
-			vec[1] -= max[1]-aspy;
+			vec[1] -= max[1] - aspy;
 		else
-			clipy= 0;
+			clipy = 0;
 	}
 
 	return (clipx || clipy);
@@ -2509,7 +2512,7 @@ static short FrameOnMouseSide(char side, float frame, float cframe)
 
 static void createTransNlaData(bContext *C, TransInfo *t)
 {
-	Scene *scene= t->scene;
+	Scene *scene = t->scene;
 	SpaceNla *snla = NULL;
 	TransData *td = NULL;
 	TransDataNla *tdn = NULL;
@@ -2519,7 +2522,7 @@ static void createTransNlaData(bContext *C, TransInfo *t)
 	bAnimListElem *ale;
 	int filter;
 	
-	int count=0;
+	int count = 0;
 	
 	/* determine what type of data we are operating on */
 	if (ANIM_animdata_get_context(C, &ac) == 0)
@@ -2527,7 +2530,7 @@ static void createTransNlaData(bContext *C, TransInfo *t)
 	snla = (SpaceNla *)ac.sl;
 	
 	/* filter data */
-	filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT);
+	filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_FOREDIT);
 	ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
 	
 	/* which side of the current frame should be allowed */
@@ -2536,7 +2539,7 @@ static void createTransNlaData(bContext *C, TransInfo *t)
 		float xmouse, ymouse;
 		
 		UI_view2d_region_to_view(&ac.ar->v2d, t->imval[0], t->imval[1], &xmouse, &ymouse);
-		t->frame_side= (xmouse > CFRA) ? 'R' : 'L';
+		t->frame_side = (xmouse > CFRA) ? 'R' : 'L';
 	}
 	else {
 		/* normal transform - both sides of current frame are considered */
@@ -2544,15 +2547,15 @@ static void createTransNlaData(bContext *C, TransInfo *t)
 	}
 	
 	/* loop 1: count how many strips are selected (consider each strip as 2 points) */
-	for (ale= anim_data.first; ale; ale= ale->next) {
-		NlaTrack *nlt= (NlaTrack *)ale->data;
+	for (ale = anim_data.first; ale; ale = ale->next) {
+		NlaTrack *nlt = (NlaTrack *)ale->data;
 		NlaStrip *strip;
 		
 		/* make some meta-strips for chains of selected strips */
 		BKE_nlastrips_make_metas(&nlt->strips, 1);
 		
 		/* only consider selected strips */
-		for (strip= nlt->strips.first; strip; strip= strip->next) {
+		for (strip = nlt->strips.first; strip; strip = strip->next) {
 			// TODO: we can make strips have handles later on...
 			/* transition strips can't get directly transformed */
 			if (strip->type != NLASTRIP_TYPE_TRANSITION) {
@@ -2572,24 +2575,24 @@ static void createTransNlaData(bContext *C, TransInfo *t)
 	}
 	
 	/* allocate memory for data */
-	t->total= count;
+	t->total = count;
 	
-	t->data= MEM_callocN(t->total*sizeof(TransData), "TransData(NLA Editor)");
-	td= t->data;
-	t->customData= MEM_callocN(t->total*sizeof(TransDataNla), "TransDataNla (NLA Editor)");
-	tdn= t->customData;
+	t->data = MEM_callocN(t->total * sizeof(TransData), "TransData(NLA Editor)");
+	td = t->data;
+	t->customData = MEM_callocN(t->total * sizeof(TransDataNla), "TransDataNla (NLA Editor)");
+	tdn = t->customData;
 	t->flag |= T_FREE_CUSTOMDATA;
 	
 	/* loop 2: build transdata array */
-	for (ale= anim_data.first; ale; ale= ale->next) {
+	for (ale = anim_data.first; ale; ale = ale->next) {
 		/* only if a real NLA-track */
 		if (ale->type == ANIMTYPE_NLATRACK) {
 			AnimData *adt = ale->adt;
-			NlaTrack *nlt= (NlaTrack *)ale->data;
+			NlaTrack *nlt = (NlaTrack *)ale->data;
 			NlaStrip *strip;
 			
 			/* only consider selected strips */
-			for (strip= nlt->strips.first; strip; strip= strip->next) {
+			for (strip = nlt->strips.first; strip; strip = strip->next) {
 				// TODO: we can make strips have handles later on...
 				/* transition strips can't get directly transformed */
 				if (strip->type != NLASTRIP_TYPE_TRANSITION) {
@@ -2599,37 +2602,37 @@ static void createTransNlaData(bContext *C, TransInfo *t)
 						 *	- td structs are transform-elements operated on by the transform system
 						 *	  and represent a single handle. The storage/pointer used (val or loc) depends on
 						 *	  whether we're scaling or transforming. Ultimately though, the handles
-						 * 	  the td writes to will simply be a dummy in tdn
+						 *    the td writes to will simply be a dummy in tdn
 						 *	- for each strip being transformed, a single tdn struct is used, so in some
 						 *	  cases, there will need to be 1 of these tdn elements in the array skipped...
 						 */
 						float center[3], yval;
 						
 						/* firstly, init tdn settings */
-						tdn->id= ale->id;
-						tdn->oldTrack= tdn->nlt= nlt;
-						tdn->strip= strip;
-						tdn->trackIndex= BLI_findindex(&adt->nla_tracks, nlt);
-						
-						yval= (float)(tdn->trackIndex * NLACHANNEL_STEP(snla));
-						
-						tdn->h1[0]= strip->start;
-						tdn->h1[1]= yval;
-						tdn->h2[0]= strip->end;
-						tdn->h2[1]= yval;
-						
-						center[0]= (float)CFRA;
-						center[1]= yval;
-						center[2]= 0.0f;
+						tdn->id = ale->id;
+						tdn->oldTrack = tdn->nlt = nlt;
+						tdn->strip = strip;
+						tdn->trackIndex = BLI_findindex(&adt->nla_tracks, nlt);
+
+						yval = (float)(tdn->trackIndex * NLACHANNEL_STEP(snla));
+
+						tdn->h1[0] = strip->start;
+						tdn->h1[1] = yval;
+						tdn->h2[0] = strip->end;
+						tdn->h2[1] = yval;
+
+						center[0] = (float)CFRA;
+						center[1] = yval;
+						center[2] = 0.0f;
 						
 						/* set td's based on which handles are applicable */
 						if (FrameOnMouseSide(t->frame_side, strip->start, (float)CFRA)) {
 							/* just set tdn to assume that it only has one handle for now */
-							tdn->handle= -1;
+							tdn->handle = -1;
 							
 							/* now, link the transform data up to this data */
 							if (ELEM(t->mode, TFM_TRANSLATION, TFM_TIME_EXTEND)) {
-								td->loc= tdn->h1;
+								td->loc = tdn->h1;
 								copy_v3_v3(td->iloc, tdn->h1);
 								
 								/* store all the other gunk that is required by transform */
@@ -2637,30 +2640,30 @@ static void createTransNlaData(bContext *C, TransInfo *t)
 								memset(td->axismtx, 0, sizeof(td->axismtx));
 								td->axismtx[2][2] = 1.0f;
 								
-								td->ext= NULL; td->val= NULL;
+								td->ext = NULL; td->val = NULL;
 								
 								td->flag |= TD_SELECTED;
-								td->dist= 0.0f;
+								td->dist = 0.0f;
 								
 								unit_m3(td->mtx);
 								unit_m3(td->smtx);
 							}
 							else {
 								/* time scaling only needs single value */
-								td->val= &tdn->h1[0];
-								td->ival= tdn->h1[0];
+								td->val = &tdn->h1[0];
+								td->ival = tdn->h1[0];
 							}
 							
-							td->extra= tdn;
+							td->extra = tdn;
 							td++;
 						}
 						if (FrameOnMouseSide(t->frame_side, strip->end, (float)CFRA)) {
 							/* if tdn is already holding the start handle, then we're doing both, otherwise, only end */
-							tdn->handle= (tdn->handle) ? 2 : 1;
+							tdn->handle = (tdn->handle) ? 2 : 1;
 							
 							/* now, link the transform data up to this data */
 							if (ELEM(t->mode, TFM_TRANSLATION, TFM_TIME_EXTEND)) {
-								td->loc= tdn->h2;
+								td->loc = tdn->h2;
 								copy_v3_v3(td->iloc, tdn->h2);
 								
 								/* store all the other gunk that is required by transform */
@@ -2668,21 +2671,21 @@ static void createTransNlaData(bContext *C, TransInfo *t)
 								memset(td->axismtx, 0, sizeof(td->axismtx));
 								td->axismtx[2][2] = 1.0f;
 								
-								td->ext= NULL; td->val= NULL;
+								td->ext = NULL; td->val = NULL;
 								
 								td->flag |= TD_SELECTED;
-								td->dist= 0.0f;
+								td->dist = 0.0f;
 								
 								unit_m3(td->mtx);
 								unit_m3(td->smtx);
 							}
 							else {
 								/* time scaling only needs single value */
-								td->val= &tdn->h2[0];
-								td->ival= tdn->h2[0];
+								td->val = &tdn->h2[0];
+								td->ival = tdn->h2[0];
 							}
 							
-							td->extra= tdn;
+							td->extra = tdn;
 							td++;
 						}
 						
@@ -2710,11 +2713,11 @@ static void createTransNlaData(bContext *C, TransInfo *t)
  * It also makes sure gp-frames are still stored in chronological order after
  * transform.
  */
-static void posttrans_gpd_clean (bGPdata *gpd)
+static void posttrans_gpd_clean(bGPdata *gpd)
 {
 	bGPDlayer *gpl;
 	
-	for (gpl= gpd->layers.first; gpl; gpl= gpl->next) {
+	for (gpl = gpd->layers.first; gpl; gpl = gpl->next) {
 		ListBase sel_buffer = {NULL, NULL};
 		bGPDframe *gpf, *gpfn;
 		bGPDframe *gfs, *gfsn;
@@ -2722,9 +2725,9 @@ static void posttrans_gpd_clean (bGPdata *gpd)
 		/* loop 1: loop through and isolate selected gp-frames to buffer
 		 * (these need to be sorted as they are isolated)
 		 */
-		for (gpf= gpl->frames.first; gpf; gpf= gpfn) {
-			short added= 0;
-			gpfn= gpf->next;
+		for (gpf = gpl->frames.first; gpf; gpf = gpfn) {
+			short added = 0;
+			gpfn = gpf->next;
 			
 			if (gpf->flag & GP_FRAME_SELECT) {
 				BLI_remlink(&gpl->frames, gpf);
@@ -2733,11 +2736,11 @@ static void posttrans_gpd_clean (bGPdata *gpd)
 				 * - go backwards as most frames will still be in order,
 				 *   so doing it this way will be faster
 				 */
-				for (gfs= sel_buffer.last; gfs; gfs= gfs->prev) {
+				for (gfs = sel_buffer.last; gfs; gfs = gfs->prev) {
 					/* if current (gpf) occurs after this one in buffer, add! */
 					if (gfs->framenum < gpf->framenum) {
 						BLI_insertlinkafter(&sel_buffer, gfs, gpf);
-						added= 1;
+						added = 1;
 						break;
 					}
 				}
@@ -2752,19 +2755,19 @@ static void posttrans_gpd_clean (bGPdata *gpd)
 		
 		/* if all were selected (i.e. gpl->frames is empty), then just transfer sel-buf over */
 		if (gpl->frames.first == NULL) {
-			gpl->frames.first= sel_buffer.first;
-			gpl->frames.last= sel_buffer.last;
+			gpl->frames.first = sel_buffer.first;
+			gpl->frames.last = sel_buffer.last;
 			
 			continue;
 		}
 		
 		/* loop 2: remove duplicates of frames in buffers */
-		for (gpf= gpl->frames.first; gpf && sel_buffer.first; gpf= gpfn) {
-			gpfn= gpf->next;
+		for (gpf = gpl->frames.first; gpf && sel_buffer.first; gpf = gpfn) {
+			gpfn = gpf->next;
 			
 			/* loop through sel_buffer, emptying stuff from front of buffer if ok */
-			for (gfs= sel_buffer.first; gfs && gpf; gfs= gfsn) {
-				gfsn= gfs->next;
+			for (gfs = sel_buffer.first; gfs && gpf; gfs = gfsn) {
+				gfsn = gfs->next;
 				
 				/* if this buffer frame needs to go before current, add it! */
 				if (gfs->framenum < gpf->framenum) {
@@ -2785,8 +2788,8 @@ static void posttrans_gpd_clean (bGPdata *gpd)
 		}
 		
 		/* if anything is still in buffer, append to end */
-		for (gfs= sel_buffer.first; gfs; gfs= gfsn) {
-			gfsn= gfs->next;
+		for (gfs = sel_buffer.first; gfs; gfs = gfsn) {
+			gfsn = gfs->next;
 			
 			BLI_remlink(&sel_buffer, gfs);
 			BLI_addtail(&gpl->frames, gfs);
@@ -2794,21 +2797,114 @@ static void posttrans_gpd_clean (bGPdata *gpd)
 	}
 }
 
+
+/* Called by special_aftertrans_update to make sure selected gp-frames replace
+ * any other gp-frames which may reside on that frame (that are not selected).
+ * It also makes sure sorted are still stored in chronological order after
+ * transform.
+ */
+static void posttrans_mask_clean(Mask *mask)
+{
+	MaskLayer *masklay;
+
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		ListBase sel_buffer = {NULL, NULL};
+		MaskLayerShape *masklay_shape, *masklay_shape_new;
+		MaskLayerShape *masklay_shape_sort, *masklay_shape_sort_new;
+
+		/* loop 1: loop through and isolate selected gp-frames to buffer
+		 * (these need to be sorted as they are isolated)
+		 */
+		for (masklay_shape = masklay->splines_shapes.first; masklay_shape; masklay_shape = masklay_shape_new) {
+			short added = 0;
+			masklay_shape_new = masklay_shape->next;
+
+			if (masklay_shape->flag & GP_FRAME_SELECT) {
+				BLI_remlink(&masklay->splines_shapes, masklay_shape);
+
+				/* find place to add them in buffer
+				 * - go backwards as most frames will still be in order,
+				 *   so doing it this way will be faster
+				 */
+				for (masklay_shape_sort = sel_buffer.last; masklay_shape_sort; masklay_shape_sort = masklay_shape_sort->prev) {
+					/* if current (masklay_shape) occurs after this one in buffer, add! */
+					if (masklay_shape_sort->frame < masklay_shape->frame) {
+						BLI_insertlinkafter(&sel_buffer, masklay_shape_sort, masklay_shape);
+						added = 1;
+						break;
+					}
+				}
+				if (added == 0)
+					BLI_addhead(&sel_buffer, masklay_shape);
+			}
+		}
+
+		/* error checking: it is unlikely, but may be possible to have none selected */
+		if (sel_buffer.first == NULL)
+			continue;
+
+		/* if all were selected (i.e. masklay->splines_shapes is empty), then just transfer sel-buf over */
+		if (masklay->splines_shapes.first == NULL) {
+			masklay->splines_shapes.first = sel_buffer.first;
+			masklay->splines_shapes.last = sel_buffer.last;
+
+			continue;
+		}
+
+		/* loop 2: remove duplicates of splines_shapes in buffers */
+		for (masklay_shape = masklay->splines_shapes.first; masklay_shape && sel_buffer.first; masklay_shape = masklay_shape_new) {
+			masklay_shape_new = masklay_shape->next;
+
+			/* loop through sel_buffer, emptying stuff from front of buffer if ok */
+			for (masklay_shape_sort = sel_buffer.first; masklay_shape_sort && masklay_shape; masklay_shape_sort = masklay_shape_sort_new) {
+				masklay_shape_sort_new = masklay_shape_sort->next;
+
+				/* if this buffer frame needs to go before current, add it! */
+				if (masklay_shape_sort->frame < masklay_shape->frame) {
+					/* transfer buffer frame to splines_shapes list (before current) */
+					BLI_remlink(&sel_buffer, masklay_shape_sort);
+					BLI_insertlinkbefore(&masklay->splines_shapes, masklay_shape, masklay_shape_sort);
+				}
+				/* if this buffer frame is on same frame, replace current with it and stop */
+				else if (masklay_shape_sort->frame == masklay_shape->frame) {
+					/* transfer buffer frame to splines_shapes list (before current) */
+					BLI_remlink(&sel_buffer, masklay_shape_sort);
+					BLI_insertlinkbefore(&masklay->splines_shapes, masklay_shape, masklay_shape_sort);
+
+					/* get rid of current frame */
+					BKE_mask_layer_shape_unlink(masklay, masklay_shape);
+				}
+			}
+		}
+
+		/* if anything is still in buffer, append to end */
+		for (masklay_shape_sort = sel_buffer.first; masklay_shape_sort; masklay_shape_sort = masklay_shape_sort_new) {
+			masklay_shape_sort_new = masklay_shape_sort->next;
+
+			BLI_remlink(&sel_buffer, masklay_shape_sort);
+			BLI_addtail(&masklay->splines_shapes, masklay_shape_sort);
+		}
+
+		/* NOTE: this is the only difference to grease pencil code above */
+		BKE_mask_layer_shape_sort(masklay);
+	}
+}
+
 /* Called during special_aftertrans_update to make sure selected keyframes replace
  * any other keyframes which may reside on that frame (that is not selected).
  */
-static void posttrans_fcurve_clean (FCurve *fcu, const short use_handle)
+static void posttrans_fcurve_clean(FCurve *fcu, const short use_handle)
 {
-	float *selcache;	/* cache for frame numbers of selected frames (fcu->totvert*sizeof(float)) */
-	int len, index, i;	/* number of frames in cache, item index */
+	float *selcache;    /* cache for frame numbers of selected frames (fcu->totvert*sizeof(float)) */
+	int len, index, i;  /* number of frames in cache, item index */
 
 	/* allocate memory for the cache */
 	// TODO: investigate using BezTriple columns instead?
-	if (fcu->totvert == 0 || fcu->bezt==NULL)
+	if (fcu->totvert == 0 || fcu->bezt == NULL)
 		return;
-	selcache= MEM_callocN(sizeof(float)*fcu->totvert, "FCurveSelFrameNums");
-	len= 0;
-	index= 0;
+	selcache = MEM_callocN(sizeof(float) * fcu->totvert, "FCurveSelFrameNums");
+	len = 0;
+	index = 0;
 
 	/* We do 2 loops, 1 for marking keyframes for deletion, one for deleting
 	 * as there is no guarantee what order the keyframes are exactly, even though
@@ -2817,10 +2913,10 @@ static void posttrans_fcurve_clean (FCurve *fcu, const short use_handle)
 
 	/*	Loop 1: find selected keyframes   */
 	for (i = 0; i < fcu->totvert; i++) {
-		BezTriple *bezt= &fcu->bezt[i];
+		BezTriple *bezt = &fcu->bezt[i];
 		
 		if (BEZSELECTED(bezt)) {
-			selcache[index]= bezt->vec[1][0];
+			selcache[index] = bezt->vec[1][0];
 			index++;
 			len++;
 		}
@@ -2830,12 +2926,12 @@ static void posttrans_fcurve_clean (FCurve *fcu, const short use_handle)
 	 * (if any keyframes were found, or the whole curve wasn't affected) 
 	 */
 	if ((len) && (len != fcu->totvert)) {
-		for (i= fcu->totvert-1; i >= 0; i--) {
-			BezTriple *bezt= &fcu->bezt[i];
+		for (i = fcu->totvert - 1; i >= 0; i--) {
+			BezTriple *bezt = &fcu->bezt[i];
 			
 			if (BEZSELECTED(bezt) == 0) {
 				/* check beztriple should be removed according to cache */
-				for (index= 0; index < len; index++) {
+				for (index = 0; index < len; index++) {
 					if (IS_EQF(bezt->vec[1][0], selcache[index])) {
 						delete_fcurve_key(fcu, i, 0);
 						break;
@@ -2859,21 +2955,21 @@ static void posttrans_fcurve_clean (FCurve *fcu, const short use_handle)
  * any other keyframes which may reside on that frame (that is not selected).
  * remake_action_ipos should have already been called
  */
-static void posttrans_action_clean (bAnimContext *ac, bAction *act)
+static void posttrans_action_clean(bAnimContext *ac, bAction *act)
 {
 	ListBase anim_data = {NULL, NULL};
 	bAnimListElem *ale;
 	int filter;
 
 	/* filter data */
-	filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/);
+	filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/);
 	ANIM_animdata_filter(ac, &anim_data, filter, act, ANIMCONT_ACTION);
 
 	/* loop through relevant data, removing keyframes as appropriate
-	 *  	- all keyframes are converted in/out of global time
+	 *      - all keyframes are converted in/out of global time
 	 */
-	for (ale= anim_data.first; ale; ale= ale->next) {
-		AnimData *adt= ANIM_nla_mapping_get(ac, ale);
+	for (ale = anim_data.first; ale; ale = ale->next) {
+		AnimData *adt = ANIM_nla_mapping_get(ac, ale);
 		
 		if (adt) {
 			ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 0, 1);
@@ -2881,7 +2977,7 @@ static void posttrans_action_clean (bAnimContext *ac, bAction *act)
 			ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 1, 1);
 		}
 		else
-			posttrans_fcurve_clean(ale->key_data, FALSE); /* only use handles in graph editor */
+			posttrans_fcurve_clean(ale->key_data, FALSE);  /* only use handles in graph editor */
 	}
 
 	/* free temp data */
@@ -2900,7 +2996,7 @@ static int count_fcurve_keys(FCurve *fcu, char side, float cfra)
 		return count;
 
 	/* only include points that occur on the right side of cfra */
-	for (i=0, bezt=fcu->bezt; i < fcu->totvert; i++, bezt++) {
+	for (i = 0, bezt = fcu->bezt; i < fcu->totvert; i++, bezt++) {
 		if (bezt->f2 & SELECT) {
 			/* no need to adjust the handle selection since they are assumed
 			 * selected (like graph editor with SIPO_NOHANDLES) */
@@ -2923,7 +3019,7 @@ static int count_gplayer_frames(bGPDlayer *gpl, char side, float cfra)
 		return count;
 	
 	/* only include points that occur on the right side of cfra */
-	for (gpf= gpl->frames.first; gpf; gpf= gpf->next) {
+	for (gpf = gpl->frames.first; gpf; gpf = gpf->next) {
 		if (gpf->flag & GP_FRAME_SELECT) {
 			if (FrameOnMouseSide(side, (float)gpf->framenum, cfra))
 				count++;
@@ -2933,6 +3029,27 @@ static int count_gplayer_frames(bGPDlayer *gpl, char side, float cfra)
 	return count;
 }
 
+/* fully select selected beztriples, but only include if it's on the right side of cfra */
+static int count_masklayer_frames(MaskLayer *masklay, char side, float cfra)
+{
+	MaskLayerShape *masklayer_shape;
+	int count = 0;
+
+	if (masklay == NULL)
+		return count;
+
+	/* only include points that occur on the right side of cfra */
+	for (masklayer_shape = masklay->splines_shapes.first; masklayer_shape; masklayer_shape = masklayer_shape->next) {
+		if (masklayer_shape->flag & MASK_SHAPE_SELECT) {
+			if (FrameOnMouseSide(side, (float)masklayer_shape->frame, cfra))
+				count++;
+		}
+	}
+
+	return count;
+}
+
+
 /* This function assigns the information to transdata */
 static void TimeToTransData(TransData *td, float *time, AnimData *adt)
 {
@@ -2943,7 +3060,7 @@ static void TimeToTransData(TransData *td, float *time, AnimData *adt)
 	/* store the AnimData where this keyframe exists as a keyframe of the
 	 * active action as td->extra.
 	 */
-	td->extra= adt;
+	td->extra = adt;
 }
 
 /* This function advances the address to which td points to, so it must return
@@ -2962,7 +3079,7 @@ static TransData *ActionFCurveToTransData(TransData *td, TransData2D **td2dv, FC
 	if (ELEM(NULL, fcu, fcu->bezt))
 		return td;
 
-	for (i=0, bezt=fcu->bezt; i < fcu->totvert; i++, bezt++) {
+	for (i = 0, bezt = fcu->bezt; i < fcu->totvert; i++, bezt++) {
 		/* only add selected keyframes (for now, proportional edit is not enabled) */
 		if (bezt->f2 & SELECT) { /* note this MUST match count_fcurve_keys(), so can't use BEZSELECTED() macro */
 			/* only add if on the right 'side' of the current frame */
@@ -2970,7 +3087,7 @@ static TransData *ActionFCurveToTransData(TransData *td, TransData2D **td2dv, FC
 				TimeToTransData(td, bezt->vec[1], adt);
 				
 				/*set flags to move handles as necessary*/
-				td->flag |= TD_MOVEHANDLE1|TD_MOVEHANDLE2;
+				td->flag |= TD_MOVEHANDLE1 | TD_MOVEHANDLE2;
 				td2d->h1 = bezt->vec[0];
 				td2d->h2 = bezt->vec[2];
 				
@@ -2990,25 +3107,25 @@ static TransData *ActionFCurveToTransData(TransData *td, TransData2D **td2dv, FC
 
 /* helper struct for gp-frame transforms (only used here) */
 typedef struct tGPFtransdata {
-	float val;			/* where transdata writes transform */
-	int *sdata;			/* pointer to gpf->framenum */
+	float val;          /* where transdata writes transform */
+	int *sdata;         /* pointer to gpf->framenum */
 } tGPFtransdata;
 
 /* This function helps flush transdata written to tempdata into the gp-frames  */
-void flushTransGPactionData(TransInfo *t)
+void flushTransIntFrameActionData(TransInfo *t)
 {
 	tGPFtransdata *tfd;
 	int i;
 
 	/* find the first one to start from */
 	if (t->mode == TFM_TIME_SLIDE)
-		tfd= (tGPFtransdata *)((float *)(t->customData) + 2);
+		tfd = (tGPFtransdata *)((float *)(t->customData) + 2);
 	else
-		tfd= (tGPFtransdata *)(t->customData);
+		tfd = (tGPFtransdata *)(t->customData);
 
 	/* flush data! */
 	for (i = 0; i < t->total; i++, tfd++) {
-		*(tfd->sdata)= (int)floor(tfd->val + 0.5f);
+		*(tfd->sdata) = (int)floor(tfd->val + 0.5f);
 	}
 }
 
@@ -3019,21 +3136,21 @@ void flushTransGPactionData(TransInfo *t)
  * The 'side' argument is needed for the extend mode. 'B' = both sides, 'R'/'L' mean only data
  * on the named side are used.
  */
-static int GPLayerToTransData (TransData *td, tGPFtransdata *tfd, bGPDlayer *gpl, char side, float cfra)
+static int GPLayerToTransData(TransData *td, tGPFtransdata *tfd, bGPDlayer *gpl, char side, float cfra)
 {
 	bGPDframe *gpf;
-	int count= 0;
+	int count = 0;
 	
 	/* check for select frames on right side of current frame */
-	for (gpf= gpl->frames.first; gpf; gpf= gpf->next) {
+	for (gpf = gpl->frames.first; gpf; gpf = gpf->next) {
 		if (gpf->flag & GP_FRAME_SELECT) {
 			if (FrameOnMouseSide(side, (float)gpf->framenum, cfra)) {
 				/* memory is calloc'ed, so that should zero everything nicely for us */
-				td->val= &tfd->val;
-				td->ival= (float)gpf->framenum;
+				td->val = &tfd->val;
+				td->ival = (float)gpf->framenum;
 				
-				tfd->val= (float)gpf->framenum;
-				tfd->sdata= &gpf->framenum;
+				tfd->val = (float)gpf->framenum;
+				tfd->sdata = &gpf->framenum;
 				
 				/* advance td now */
 				td++;
@@ -3046,9 +3163,38 @@ static int GPLayerToTransData (TransData *td, tGPFtransdata *tfd, bGPDlayer *gpl
 	return count;
 }
 
+/* refer to comment above #GPLayerToTransData, this is the same but for masks */
+static int MaskLayerToTransData(TransData *td, tGPFtransdata *tfd, MaskLayer *masklay, char side, float cfra)
+{
+	MaskLayerShape *masklay_shape;
+	int count = 0;
+
+	/* check for select frames on right side of current frame */
+	for (masklay_shape = masklay->splines_shapes.first; masklay_shape; masklay_shape = masklay_shape->next) {
+		if (masklay_shape->flag & MASK_SHAPE_SELECT) {
+			if (FrameOnMouseSide(side, (float)masklay_shape->frame, cfra)) {
+				/* memory is calloc'ed, so that should zero everything nicely for us */
+				td->val = &tfd->val;
+				td->ival = (float)masklay_shape->frame;
+
+				tfd->val = (float)masklay_shape->frame;
+				tfd->sdata = &masklay_shape->frame;
+
+				/* advance td now */
+				td++;
+				tfd++;
+				count++;
+			}
+		}
+	}
+
+	return count;
+}
+
+
 static void createTransActionData(bContext *C, TransInfo *t)
 {
-	Scene *scene= t->scene;
+	Scene *scene = t->scene;
 	TransData *td = NULL;
 	TransData2D *td2d = NULL;
 	tGPFtransdata *tfd = NULL;
@@ -3058,7 +3204,7 @@ static void createTransActionData(bContext *C, TransInfo *t)
 	bAnimListElem *ale;
 	int filter;
 	
-	int count=0;
+	int count = 0;
 	float cfra;
 	
 	/* determine what type of data we are operating on */
@@ -3066,10 +3212,10 @@ static void createTransActionData(bContext *C, TransInfo *t)
 		return;
 	
 	/* filter data */
-	if (ac.datatype == ANIMCONT_GPENCIL)
-		filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT);
+	if (ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
+		filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT);
 	else
-		filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/);
+		filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/);
 	ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
 	
 	/* which side of the current frame should be allowed */
@@ -3086,8 +3232,8 @@ static void createTransActionData(bContext *C, TransInfo *t)
 	}
 	
 	/* loop 1: fully select ipo-keys and count how many BezTriples are selected */
-	for (ale= anim_data.first; ale; ale= ale->next) {
-		AnimData *adt= ANIM_nla_mapping_get(&ac, ale);
+	for (ale = anim_data.first; ale; ale = ale->next) {
+		AnimData *adt = ANIM_nla_mapping_get(&ac, ale);
 		
 		/* convert current-frame to action-time (slightly less accurate, especially under
 		 * higher scaling ratios, but is faster than converting all points)
@@ -3099,8 +3245,12 @@ static void createTransActionData(bContext *C, TransInfo *t)
 		
 		if (ale->type == ANIMTYPE_FCURVE)
 			count += count_fcurve_keys(ale->key_data, t->frame_side, cfra);
-		else
+		else if (ale->type == ANIMTYPE_GPLAYER)
 			count += count_gplayer_frames(ale->data, t->frame_side, cfra);
+		else if (ale->type == ANIMTYPE_MASKLAYER)
+			count += count_masklayer_frames(ale->data, t->frame_side, cfra);
+		else
+			BLI_assert(0);
 	}
 	
 	/* stop if trying to build list if nothing selected */
@@ -3111,39 +3261,47 @@ static void createTransActionData(bContext *C, TransInfo *t)
 	}
 	
 	/* allocate memory for data */
-	t->total= count;
+	t->total = count;
 	
-	t->data= MEM_callocN(t->total*sizeof(TransData), "TransData(Action Editor)");
-	t->data2d= MEM_callocN(t->total*sizeof(TransData2D), "transdata2d");
-	td= t->data;
+	t->data = MEM_callocN(t->total * sizeof(TransData), "TransData(Action Editor)");
+	t->data2d = MEM_callocN(t->total * sizeof(TransData2D), "transdata2d");
+	td = t->data;
 	td2d = t->data2d;
 	
-	if (ac.datatype == ANIMCONT_GPENCIL) {
+	if (ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK)) {
 		if (t->mode == TFM_TIME_SLIDE) {
-			t->customData= MEM_callocN((sizeof(float)*2)+(sizeof(tGPFtransdata)*count), "TimeSlide + tGPFtransdata");
-			tfd= (tGPFtransdata *)((float *)(t->customData) + 2);
+			t->customData = MEM_callocN((sizeof(float) * 2) + (sizeof(tGPFtransdata) * count), "TimeSlide + tGPFtransdata");
+			tfd = (tGPFtransdata *)((float *)(t->customData) + 2);
 		}
 		else {
-			t->customData= MEM_callocN(sizeof(tGPFtransdata)*count, "tGPFtransdata");
-			tfd= (tGPFtransdata *)(t->customData);
+			t->customData = MEM_callocN(sizeof(tGPFtransdata) * count, "tGPFtransdata");
+			tfd = (tGPFtransdata *)(t->customData);
 		}
 	}
 	else if (t->mode == TFM_TIME_SLIDE)
-		t->customData= MEM_callocN(sizeof(float)*2, "TimeSlide Min/Max");
+		t->customData = MEM_callocN(sizeof(float) * 2, "TimeSlide Min/Max");
 	
 	/* loop 2: build transdata array */
-	for (ale= anim_data.first; ale; ale= ale->next) {
+	for (ale = anim_data.first; ale; ale = ale->next) {
 		if (ale->type == ANIMTYPE_GPLAYER) {
-			bGPDlayer *gpl= (bGPDlayer *)ale->data;
+			bGPDlayer *gpl = (bGPDlayer *)ale->data;
 			int i;
 			
 			i = GPLayerToTransData(td, tfd, gpl, t->frame_side, cfra);
 			td += i;
 			tfd += i;
 		}
+		else if (ale->type == ANIMTYPE_MASKLAYER) {
+			MaskLayer *masklay = (MaskLayer *)ale->data;
+			int i;
+
+			i = MaskLayerToTransData(td, tfd, masklay, t->frame_side, cfra);
+			td += i;
+			tfd += i;
+		}
 		else {
-			AnimData *adt= ANIM_nla_mapping_get(&ac, ale);
-			FCurve *fcu= (FCurve *)ale->key_data;
+			AnimData *adt = ANIM_nla_mapping_get(&ac, ale);
+			FCurve *fcu = (FCurve *)ale->key_data;
 			
 			/* convert current-frame to action-time (slightly less accurate, especially under
 			 * higher scaling ratios, but is faster than converting all points)
@@ -3153,19 +3311,19 @@ static void createTransActionData(bContext *C, TransInfo *t)
 			else
 				cfra = (float)CFRA;
 			
-			td= ActionFCurveToTransData(td, &td2d, fcu, adt, t->frame_side, cfra);
+			td = ActionFCurveToTransData(td, &td2d, fcu, adt, t->frame_side, cfra);
 		}
 	}
 	
 	/* check if we're supposed to be setting minx/maxx for TimeSlide */
 	if (t->mode == TFM_TIME_SLIDE) {
-		float min=999999999.0f, max=-999999999.0f;
+		float min = 999999999.0f, max = -999999999.0f;
 		int i;
 		
-		td= t->data;
-		for (i=0; i < count; i++, td++) {
-			if (min > *(td->val)) min= *(td->val);
-			if (max < *(td->val)) max= *(td->val);
+		td = t->data;
+		for (i = 0; i < count; i++, td++) {
+			if (min > *(td->val)) min = *(td->val);
+			if (max < *(td->val)) max = *(td->val);
 		}
 		
 		if (min == max) {
@@ -3191,9 +3349,9 @@ static void createTransActionData(bContext *C, TransInfo *t)
 /* Helper function for createTransGraphEditData, which is responsible for associating
  * source data with transform data
  */
-static void bezt_to_transdata (TransData *td, TransData2D *td2d, AnimData *adt, BezTriple *bezt, 
-				int bi, short selected, short ishandle, short intvals, 
-				float mtx[3][3], float smtx[3][3])
+static void bezt_to_transdata(TransData *td, TransData2D *td2d, AnimData *adt, BezTriple *bezt,
+                              int bi, short selected, short ishandle, short intvals,
+                              float mtx[3][3], float smtx[3][3])
 {
 	float *loc = bezt->vec[bi];
 	float *cent = bezt->vec[1];
@@ -3246,17 +3404,17 @@ static void bezt_to_transdata (TransData *td, TransData2D *td2d, AnimData *adt,
 	memset(td->axismtx, 0, sizeof(td->axismtx));
 	td->axismtx[2][2] = 1.0f;
 	
-	td->ext= NULL; td->val= NULL;
+	td->ext = NULL; td->val = NULL;
 	
 	/* store AnimData info in td->extra, for applying mapping when flushing */
-	td->extra= adt;
+	td->extra = adt;
 	
 	if (selected) {
 		td->flag |= TD_SELECTED;
-		td->dist= 0.0f;
+		td->dist = 0.0f;
 	}
 	else
-		td->dist= MAXFLOAT;
+		td->dist = MAXFLOAT;
 	
 	if (ishandle)
 		td->flag |= TD_NOTIMESNAP;
@@ -3271,9 +3429,9 @@ static void bezt_to_transdata (TransData *td, TransData2D *td2d, AnimData *adt,
 static void createTransGraphEditData(bContext *C, TransInfo *t)
 {
 	SpaceIpo *sipo = (SpaceIpo *)t->sa->spacedata.first;
-	Scene *scene= t->scene;
-	ARegion *ar= t->ar;
-	View2D *v2d= &ar->v2d;
+	Scene *scene = t->scene;
+	ARegion *ar = t->ar;
+	View2D *v2d = &ar->v2d;
 	
 	TransData *td = NULL;
 	TransData2D *td2d = NULL;
@@ -3284,7 +3442,7 @@ static void createTransGraphEditData(bContext *C, TransInfo *t)
 	int filter;
 	
 	BezTriple *bezt;
-	int count=0, i;
+	int count = 0, i;
 	float cfra;
 	float mtx[3][3], smtx[3][3];
 	const short use_handle = !(sipo->flag & SIPO_NOHANDLES);
@@ -3294,11 +3452,11 @@ static void createTransGraphEditData(bContext *C, TransInfo *t)
 		return;
 	
 	/* filter data */
-	filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVE_VISIBLE);
+	filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVE_VISIBLE);
 	ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
 	
 	/* which side of the current frame should be allowed */
-		// XXX we still want this mode, but how to get this using standard transform too?
+	// XXX we still want this mode, but how to get this using standard transform too?
 	if (t->mode == TFM_TIME_EXTEND) {
 		/* only side on which mouse is gets transformed */
 		float xmouse, ymouse;
@@ -3312,9 +3470,9 @@ static void createTransGraphEditData(bContext *C, TransInfo *t)
 	}
 	
 	/* loop 1: count how many BezTriples (specifically their verts) are selected (or should be edited) */
-	for (ale= anim_data.first; ale; ale= ale->next) {
-		AnimData *adt= ANIM_nla_mapping_get(&ac, ale);
-		FCurve *fcu= (FCurve *)ale->key_data;
+	for (ale = anim_data.first; ale; ale = ale->next) {
+		AnimData *adt = ANIM_nla_mapping_get(&ac, ale);
+		FCurve *fcu = (FCurve *)ale->key_data;
 		
 		/* convert current-frame to action-time (slightly less accurate, especially under
 		 * higher scaling ratios, but is faster than converting all points)
@@ -3329,11 +3487,11 @@ static void createTransGraphEditData(bContext *C, TransInfo *t)
 			continue;
 		
 		/* only include BezTriples whose 'keyframe' occurs on the same side of the current frame as mouse */
-		for (i=0, bezt=fcu->bezt; i < fcu->totvert; i++, bezt++) {
+		for (i = 0, bezt = fcu->bezt; i < fcu->totvert; i++, bezt++) {
 			if (FrameOnMouseSide(t->frame_side, bezt->vec[1][0], cfra)) {
-				const char sel2= bezt->f2 & SELECT;
-				const char sel1= use_handle ? bezt->f1 & SELECT : sel2;
-				const char sel3= use_handle ? bezt->f3 & SELECT : sel2;
+				const char sel2 = bezt->f2 & SELECT;
+				const char sel1 = use_handle ? bezt->f1 & SELECT : sel2;
+				const char sel3 = use_handle ? bezt->f3 & SELECT : sel2;
 
 				if (ELEM3(t->mode, TFM_TRANSLATION, TFM_TIME_TRANSLATE, TFM_TIME_SLIDE)) {
 					/* for 'normal' pivots - just include anything that is selected.
@@ -3373,14 +3531,14 @@ static void createTransGraphEditData(bContext *C, TransInfo *t)
 	}
 	
 	/* allocate memory for data */
-	t->total= count;
+	t->total = count;
 	
-	t->data= MEM_callocN(t->total*sizeof(TransData), "TransData (Graph Editor)");
-		/* for each 2d vert a 3d vector is allocated, so that they can be treated just as if they were 3d verts */
-	t->data2d= MEM_callocN(t->total*sizeof(TransData2D), "TransData2D (Graph Editor)");
+	t->data = MEM_callocN(t->total * sizeof(TransData), "TransData (Graph Editor)");
+	/* for each 2d vert a 3d vector is allocated, so that they can be treated just as if they were 3d verts */
+	t->data2d = MEM_callocN(t->total * sizeof(TransData2D), "TransData2D (Graph Editor)");
 	
-	td= t->data;
-	td2d= t->data2d;
+	td = t->data;
+	td2d = t->data2d;
 	
 	/* precompute space-conversion matrices for dealing with non-uniform scaling of Graph Editor */
 	unit_m3(mtx);
@@ -3397,15 +3555,15 @@ static void createTransGraphEditData(bContext *C, TransInfo *t)
 		mul_v3_fl(mtx[1], yscale);
 		
 		/* smtx is global (i.e. view) to data conversion */
-		if (IS_EQF(xscale, 0.0f) == 0) mul_v3_fl(smtx[0], 1.0f/xscale);
-		if (IS_EQF(yscale, 0.0f) == 0) mul_v3_fl(smtx[1], 1.0f/yscale);
+		if (IS_EQF(xscale, 0.0f) == 0) mul_v3_fl(smtx[0], 1.0f / xscale);
+		if (IS_EQF(yscale, 0.0f) == 0) mul_v3_fl(smtx[1], 1.0f / yscale);
 	}
 	
 	/* loop 2: build transdata arrays */
-	for (ale= anim_data.first; ale; ale= ale->next) {
-		AnimData *adt= ANIM_nla_mapping_get(&ac, ale);
-		FCurve *fcu= (FCurve *)ale->key_data;
-		short intvals= (fcu->flag & FCURVE_INT_VALUES);
+	for (ale = anim_data.first; ale; ale = ale->next) {
+		AnimData *adt = ANIM_nla_mapping_get(&ac, ale);
+		FCurve *fcu = (FCurve *)ale->key_data;
+		short intvals = (fcu->flag & FCURVE_INT_VALUES);
 		
 		/* convert current-frame to action-time (slightly less accurate, especially under
 		 * higher scaling ratios, but is faster than converting all points)
@@ -3419,14 +3577,14 @@ static void createTransGraphEditData(bContext *C, TransInfo *t)
 		if (fcu->bezt == NULL)
 			continue;
 		
-		ANIM_unit_mapping_apply_fcurve(ac.scene, ale->id, ale->key_data, ANIM_UNITCONV_ONLYSEL|ANIM_UNITCONV_SELVERTS);
+		ANIM_unit_mapping_apply_fcurve(ac.scene, ale->id, ale->key_data, ANIM_UNITCONV_ONLYSEL | ANIM_UNITCONV_SELVERTS);
 		
 		/* only include BezTriples whose 'keyframe' occurs on the same side of the current frame as mouse (if applicable) */
-		for (i=0, bezt= fcu->bezt; i < fcu->totvert; i++, bezt++) {
+		for (i = 0, bezt = fcu->bezt; i < fcu->totvert; i++, bezt++) {
 			if (FrameOnMouseSide(t->frame_side, bezt->vec[1][0], cfra)) {
-				const char sel2= bezt->f2 & SELECT;
-				const char sel1= use_handle ? bezt->f1 & SELECT : sel2;
-				const char sel3= use_handle ? bezt->f3 & SELECT : sel2;
+				const char sel2 = bezt->f2 & SELECT;
+				const char sel1 = use_handle ? bezt->f1 & SELECT : sel2;
+				const char sel3 = use_handle ? bezt->f3 & SELECT : sel2;
 
 				TransDataCurveHandleFlags *hdata = NULL;
 				/* short h1=1, h2=1; */ /* UNUSED */
@@ -3444,7 +3602,7 @@ static void createTransGraphEditData(bContext *C, TransInfo *t)
 					}
 					
 					if (sel3) {
-						if (hdata==NULL)
+						if (hdata == NULL)
 							hdata = initTransDataCurveHandles(td, bezt);
 						bezt_to_transdata(td++, td2d++, adt, bezt, 2, 1, 1, intvals, mtx, smtx);
 					} 
@@ -3481,8 +3639,8 @@ static void createTransGraphEditData(bContext *C, TransInfo *t)
 				    ELEM(t->mode, TFM_ROTATION, TFM_RESIZE))
 				{
 					if (hdata && (sel1) && (sel3)) {
-						bezt->h1= HD_ALIGN;
-						bezt->h2= HD_ALIGN;
+						bezt->h1 = HD_ALIGN;
+						bezt->h2 = HD_ALIGN;
 					}
 				}
 			}
@@ -3502,64 +3660,64 @@ static void createTransGraphEditData(bContext *C, TransInfo *t)
 /* struct for use in re-sorting BezTriples during Graph Editor transform */
 typedef struct BeztMap {
 	BezTriple *bezt;
-	unsigned int oldIndex; 		/* index of bezt in fcu->bezt array before sorting */
-	unsigned int newIndex;		/* index of bezt in fcu->bezt array after sorting */
-	short swapHs; 				/* swap order of handles (-1=clear; 0=not checked, 1=swap) */
-	char pipo, cipo;			/* interpolation of current and next segments */
+	unsigned int oldIndex;      /* index of bezt in fcu->bezt array before sorting */
+	unsigned int newIndex;      /* index of bezt in fcu->bezt array after sorting */
+	short swapHs;               /* swap order of handles (-1=clear; 0=not checked, 1=swap) */
+	char pipo, cipo;            /* interpolation of current and next segments */
 } BeztMap;
 
 
 /* This function converts an FCurve's BezTriple array to a BeztMap array
  * NOTE: this allocates memory that will need to get freed later
  */
-static BeztMap *bezt_to_beztmaps (BezTriple *bezts, int totvert, const short UNUSED(use_handle))
+static BeztMap *bezt_to_beztmaps(BezTriple *bezts, int totvert, const short UNUSED(use_handle))
 {
-	BezTriple *bezt= bezts;
-	BezTriple *prevbezt= NULL;
+	BezTriple *bezt = bezts;
+	BezTriple *prevbezt = NULL;
 	BeztMap *bezm, *bezms;
 	int i;
 	
 	/* allocate memory for this array */
-	if (totvert==0 || bezts==NULL)
+	if (totvert == 0 || bezts == NULL)
 		return NULL;
-	bezm= bezms= MEM_callocN(sizeof(BeztMap)*totvert, "BeztMaps");
+	bezm = bezms = MEM_callocN(sizeof(BeztMap) * totvert, "BeztMaps");
 	
 	/* assign beztriples to beztmaps */
-	for (i=0; i < totvert; i++, bezm++, prevbezt=bezt, bezt++) {
-		bezm->bezt= bezt;
+	for (i = 0; i < totvert; i++, bezm++, prevbezt = bezt, bezt++) {
+		bezm->bezt = bezt;
 		
-		bezm->oldIndex= i;
-		bezm->newIndex= i;
+		bezm->oldIndex = i;
+		bezm->newIndex = i;
 		
-		bezm->pipo= (prevbezt) ? prevbezt->ipo : bezt->ipo;
-		bezm->cipo= bezt->ipo;
+		bezm->pipo = (prevbezt) ? prevbezt->ipo : bezt->ipo;
+		bezm->cipo = bezt->ipo;
 	}
 
 	return bezms;
 }
 
 /* This function copies the code of sort_time_ipocurve, but acts on BeztMap structs instead */
-static void sort_time_beztmaps (BeztMap *bezms, int totvert, const short UNUSED(use_handle))
+static void sort_time_beztmaps(BeztMap *bezms, int totvert, const short UNUSED(use_handle))
 {
 	BeztMap *bezm;
-	int i, ok= 1;
+	int i, ok = 1;
 	
 	/* keep repeating the process until nothing is out of place anymore */
 	while (ok) {
-		ok= 0;
+		ok = 0;
 		
-		bezm= bezms;
-		i= totvert;
+		bezm = bezms;
+		i = totvert;
 		while (i--) {
 			/* is current bezm out of order (i.e. occurs later than next)? */
 			if (i > 0) {
-				if (bezm->bezt->vec[1][0] > (bezm+1)->bezt->vec[1][0]) {
+				if (bezm->bezt->vec[1][0] > (bezm + 1)->bezt->vec[1][0]) {
 					bezm->newIndex++;
-					(bezm+1)->newIndex--;
+					(bezm + 1)->newIndex--;
 					
-					SWAP(BeztMap, *bezm, *(bezm+1));
+					SWAP(BeztMap, *bezm, *(bezm + 1));
 					
-					ok= 1;
+					ok = 1;
 				}
 			}
 			
@@ -3585,7 +3743,7 @@ static void sort_time_beztmaps (BeztMap *bezms, int totvert, const short UNUSED(
 }
 
 /* This function firstly adjusts the pointers that the transdata has to each BezTriple */
-static void beztmap_to_data (TransInfo *t, FCurve *fcu, BeztMap *bezms, int totvert, const short UNUSED(use_handle))
+static void beztmap_to_data(TransInfo *t, FCurve *fcu, BeztMap *bezms, int totvert, const short UNUSED(use_handle))
 {
 	BezTriple *bezts = fcu->bezt;
 	BeztMap *bezm;
@@ -3598,17 +3756,17 @@ static void beztmap_to_data (TransInfo *t, FCurve *fcu, BeztMap *bezms, int totv
 	 * pointers have been fixed already, so that we don't override ones that are
 	 * already done
 	 */
-	adjusted= MEM_callocN(t->total, "beztmap_adjusted_map");
+	adjusted = MEM_callocN(t->total, "beztmap_adjusted_map");
 	
 	/* for each beztmap item, find if it is used anywhere */
-	bezm= bezms;
-	for (i= 0; i < totvert; i++, bezm++) {
+	bezm = bezms;
+	for (i = 0; i < totvert; i++, bezm++) {
 		/* loop through transdata, testing if we have a hit
 		 * for the handles (vec[0]/vec[2]), we must also check if they need to be swapped...
 		 */
-		td2d= t->data2d;
-		td= t->data;
-		for (j= 0; j < t->total; j++, td2d++, td++) {
+		td2d = t->data2d;
+		td = t->data;
+		for (j = 0; j < t->total; j++, td2d++, td++) {
 			/* skip item if already marked */
 			if (adjusted[j] != 0) continue;
 			
@@ -3617,26 +3775,26 @@ static void beztmap_to_data (TransInfo *t, FCurve *fcu, BeztMap *bezms, int totv
 			 */
 			if (td2d->loc2d == bezm->bezt->vec[0]) {
 				if (bezm->swapHs == 1)
-					td2d->loc2d= (bezts + bezm->newIndex)->vec[2];
+					td2d->loc2d = (bezts + bezm->newIndex)->vec[2];
 				else
-					td2d->loc2d= (bezts + bezm->newIndex)->vec[0];
+					td2d->loc2d = (bezts + bezm->newIndex)->vec[0];
 				adjusted[j] = 1;
 			}
 			else if (td2d->loc2d == bezm->bezt->vec[2]) {
 				if (bezm->swapHs == 1)
-					td2d->loc2d= (bezts + bezm->newIndex)->vec[0];
+					td2d->loc2d = (bezts + bezm->newIndex)->vec[0];
 				else
-					td2d->loc2d= (bezts + bezm->newIndex)->vec[2];
+					td2d->loc2d = (bezts + bezm->newIndex)->vec[2];
 				adjusted[j] = 1;
 			}
 			else if (td2d->loc2d == bezm->bezt->vec[1]) {
-				td2d->loc2d= (bezts + bezm->newIndex)->vec[1];
+				td2d->loc2d = (bezts + bezm->newIndex)->vec[1];
 					
 				/* if only control point is selected, the handle pointers need to be updated as well */
 				if (td2d->h1)
-					td2d->h1= (bezts + bezm->newIndex)->vec[0];
+					td2d->h1 = (bezts + bezm->newIndex)->vec[0];
 				if (td2d->h2)
-					td2d->h2= (bezts + bezm->newIndex)->vec[2];
+					td2d->h2 = (bezts + bezm->newIndex)->vec[2];
 					
 				adjusted[j] = 1;
 			}
@@ -3674,15 +3832,15 @@ void remake_graph_transdata(TransInfo *t, ListBase *anim_data)
 	const short use_handle = !(sipo->flag & SIPO_NOHANDLES);
 	
 	/* sort and reassign verts */
-	for (ale= anim_data->first; ale; ale= ale->next) {
-		FCurve *fcu= (FCurve *)ale->key_data;
+	for (ale = anim_data->first; ale; ale = ale->next) {
+		FCurve *fcu = (FCurve *)ale->key_data;
 		
 		if (fcu->bezt) {
 			BeztMap *bezm;
 			
 			/* adjust transform-data pointers */
 			/* note, none of these functions use 'use_handle', it could be removed */
-			bezm= bezt_to_beztmaps(fcu->bezt, fcu->totvert, use_handle);
+			bezm = bezt_to_beztmaps(fcu->bezt, fcu->totvert, use_handle);
 			sort_time_beztmaps(bezm, fcu->totvert, use_handle);
 			beztmap_to_data(t, fcu, bezm, fcu->totvert, use_handle);
 			
@@ -3706,19 +3864,19 @@ void flushTransGraphData(TransInfo *t)
 	SpaceIpo *sipo = (SpaceIpo *)t->sa->spacedata.first;
 	TransData *td;
 	TransData2D *td2d;
-	Scene *scene= t->scene;
-	double secf= FPS;
+	Scene *scene = t->scene;
+	double secf = FPS;
 	int a;
 
 	/* flush to 2d vector from internally used 3d vector */
-	for (a=0, td= t->data, td2d=t->data2d; a<t->total; a++, td++, td2d++) {
-		AnimData *adt= (AnimData *)td->extra; /* pointers to relevant AnimData blocks are stored in the td->extra pointers */
+	for (a = 0, td = t->data, td2d = t->data2d; a < t->total; a++, td++, td2d++) {
+		AnimData *adt = (AnimData *)td->extra; /* pointers to relevant AnimData blocks are stored in the td->extra pointers */
 		
 		/* handle snapping for time values
 		 *	- we should still be in NLA-mapping timespace
 		 *	- only apply to keyframes (but never to handles)
 		 */
-		if ((td->flag & TD_NOTIMESNAP)==0) {
+		if ((td->flag & TD_NOTIMESNAP) == 0) {
 			switch (sipo->autosnap) {
 				case SACTSNAP_FRAME: /* snap to nearest frame (or second if drawing seconds) */
 					if (sipo->flag & SIPO_DRAWTIME)
@@ -3728,22 +3886,22 @@ void flushTransGraphData(TransInfo *t)
 					break;
 				
 				case SACTSNAP_MARKER: /* snap to nearest marker */
-					td2d->loc[0]= (float)ED_markers_find_nearest_marker_time(&t->scene->markers, td2d->loc[0]);
+					td2d->loc[0] = (float)ED_markers_find_nearest_marker_time(&t->scene->markers, td2d->loc[0]);
 					break;
 			}
 		}
 
 		/* we need to unapply the nla-mapping from the time in some situations */
 		if (adt)
-			td2d->loc2d[0]= BKE_nla_tweakedit_remap(adt, td2d->loc[0], NLATIME_CONVERT_UNMAP);
+			td2d->loc2d[0] = BKE_nla_tweakedit_remap(adt, td2d->loc[0], NLATIME_CONVERT_UNMAP);
 		else
-			td2d->loc2d[0]= td2d->loc[0];
+			td2d->loc2d[0] = td2d->loc[0];
 		
 		/* if int-values only, truncate to integers */
 		if (td->flag & TD_INTVALUES)
-			td2d->loc2d[1]= floorf(td2d->loc[1] + 0.5f);
+			td2d->loc2d[1] = floorf(td2d->loc[1] + 0.5f);
 		else
-			td2d->loc2d[1]= td2d->loc[1];
+			td2d->loc2d[1] = td2d->loc[1];
 		
 		if ((td->flag & TD_MOVEHANDLE1) && td2d->h1) {
 			td2d->h1[0] = td2d->ih1[0] + td->loc[0] - td->iloc[0];
@@ -3775,47 +3933,47 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count
 		/* *** Extend Transform *** */
 
 		Scene *scene = t->scene;
-		int cfra= CFRA;
-		int left= seq_tx_get_final_left(seq, 1);
-		int right= seq_tx_get_final_right(seq, 1);
+		int cfra = CFRA;
+		int left = seq_tx_get_final_left(seq, 1);
+		int right = seq_tx_get_final_right(seq, 1);
 
 		if (seq->depth == 0 && ((seq->flag & SELECT) == 0 || (seq->flag & SEQ_LOCK))) {
 			*recursive = FALSE;
 			*count = 0;
 			*flag = 0;
 		}
-		else if (seq->type == SEQ_META) {
+		else if (seq->type == SEQ_TYPE_META) {
 
 			/* for meta's we only ever need to extend their children, no matter what depth
 			 * just check the meta's are in the bounds */
-			if      (t->frame_side=='R' && right <= cfra)  *recursive = FALSE;
-			else if (t->frame_side=='L' && left  >= cfra)  *recursive = FALSE;
-			else                                           *recursive = TRUE;
+			if      (t->frame_side == 'R' && right <= cfra) *recursive = FALSE;
+			else if (t->frame_side == 'L' && left  >= cfra) *recursive = FALSE;
+			else *recursive = TRUE;
 
-			*count= 1;
-			*flag= (seq->flag | SELECT) & ~(SEQ_LEFTSEL|SEQ_RIGHTSEL);
+			*count = 1;
+			*flag = (seq->flag | SELECT) & ~(SEQ_LEFTSEL | SEQ_RIGHTSEL);
 		}
 		else {
 
 			*recursive = FALSE;  /* not a meta, so no thinking here */
 			*count = 1;          /* unless its set to 0, extend will never set 2 handles at once */
-			*flag = (seq->flag | SELECT) & ~(SEQ_LEFTSEL|SEQ_RIGHTSEL);
+			*flag = (seq->flag | SELECT) & ~(SEQ_LEFTSEL | SEQ_RIGHTSEL);
 
-			if (t->frame_side=='R') {
-				if      (right <= cfra) *count = *flag= 0;  /* ignore */
+			if (t->frame_side == 'R') {
+				if      (right <= cfra) *count = *flag = 0;  /* ignore */
 				else if (left   > cfra) ;                  /* keep the selection */
-				else                    *flag |= SEQ_RIGHTSEL;
+				else *flag |= SEQ_RIGHTSEL;
 			}
 			else {
-				if      (left >= cfra)  *count = *flag= 0;  /* ignore */
-				else if (right < cfra)  ;                  /* keep the selection */
-				else                    *flag |= SEQ_LEFTSEL;
+				if      (left >= cfra) *count = *flag = 0;  /* ignore */
+				else if (right < cfra) ;                   /* keep the selection */
+				else *flag |= SEQ_LEFTSEL;
 			}
 		}
 	}
 	else {
 
-		t->frame_side= 'B';
+		t->frame_side = 'B';
 
 		/* *** Normal Transform *** */
 
@@ -3830,18 +3988,18 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count
 				*flag = 0;
 			}
 			else {
-				if ((seq->flag & (SEQ_LEFTSEL|SEQ_RIGHTSEL)) == (SEQ_LEFTSEL|SEQ_RIGHTSEL)) {
-					*flag= seq->flag;
-					*count= 2; /* we need 2 transdata's */
+				if ((seq->flag & (SEQ_LEFTSEL | SEQ_RIGHTSEL)) == (SEQ_LEFTSEL | SEQ_RIGHTSEL)) {
+					*flag = seq->flag;
+					*count = 2; /* we need 2 transdata's */
 				}
 				else {
-					*flag= seq->flag;
-					*count= 1; /* selected or with a handle selected */
+					*flag = seq->flag;
+					*count = 1; /* selected or with a handle selected */
 				}
 
 				/* Recursive */
 
-				if ((seq->type == SEQ_META) && ((seq->flag & (SEQ_LEFTSEL|SEQ_RIGHTSEL)) == 0)) {
+				if ((seq->type == SEQ_TYPE_META) && ((seq->flag & (SEQ_LEFTSEL | SEQ_RIGHTSEL)) == 0)) {
 					/* if any handles are selected, don't recurse */
 					*recursive = TRUE;
 				}
@@ -3854,22 +4012,22 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count
 			/* Nested, different rules apply */
 
 #ifdef SEQ_TX_NESTED_METAS
-			*flag = (seq->flag | SELECT) & ~(SEQ_LEFTSEL|SEQ_RIGHTSEL);
+			*flag = (seq->flag | SELECT) & ~(SEQ_LEFTSEL | SEQ_RIGHTSEL);
 			*count = 1; /* ignore the selection for nested */
-			*recursive = (seq->type == SEQ_META);
+			*recursive = (seq->type == SEQ_TYPE_META);
 #else
-			if (seq->type == SEQ_META) {
+			if (seq->type == SEQ_TYPE_META) {
 				/* Meta's can only directly be moved between channels since they
 				 * don't have their start and length set directly (children affect that)
 				 * since this Meta is nested we don't need any of its data in fact.
 				 * calc_sequence() will update its settings when run on the toplevel meta */
-				*flag= 0;
-				*count= 0;
+				*flag = 0;
+				*count = 0;
 				*recursive = TRUE;
 			}
 			else {
-				*flag= (seq->flag | SELECT) & ~(SEQ_LEFTSEL|SEQ_RIGHTSEL);
-				*count= 1; /* ignore the selection for nested */
+				*flag = (seq->flag | SELECT) & ~(SEQ_LEFTSEL | SEQ_RIGHTSEL);
+				*count = 1; /* ignore the selection for nested */
 				*recursive = FALSE;
 			}
 #endif
@@ -3882,10 +4040,10 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count
 static int SeqTransCount(TransInfo *t, Sequence *parent, ListBase *seqbase, int depth)
 {
 	Sequence *seq;
-	int tot= 0, recursive, count, flag;
+	int tot = 0, recursive, count, flag;
 
-	for (seq= seqbase->first; seq; seq= seq->next) {
-		seq->depth= depth;
+	for (seq = seqbase->first; seq; seq = seq->next) {
+		seq->depth = depth;
 
 		/* seq->tmp is used by seq_tx_get_final_{left, right} to check sequence's range and clamp to it if needed.
 		 * it's first place where digging into sequences tree, so store link to parent here */
@@ -3895,7 +4053,7 @@ static int SeqTransCount(TransInfo *t, Sequence *parent, ListBase *seqbase, int
 		tot += count;
 
 		if (recursive) {
-			tot += SeqTransCount(t, seq, &seq->seqbase, depth+1);
+			tot += SeqTransCount(t, seq, &seq->seqbase, depth + 1);
 		}
 	}
 
@@ -3908,21 +4066,21 @@ static TransData *SeqToTransData(TransData *td, TransData2D *td2d, TransDataSeq
 	int start_left;
 
 	switch (sel_flag) {
-	case SELECT:
-		/* Use seq_tx_get_final_left() and an offset here
-		 * so transform has the left hand location of the strip.
-		 * tdsq->start_offset is used when flushing the tx data back */
-		start_left= seq_tx_get_final_left(seq, 0);
-		td2d->loc[0]= start_left;
-		tdsq->start_offset= start_left - seq->start; /* use to apply the original location */
-		break;
-	case SEQ_LEFTSEL:
-		start_left= seq_tx_get_final_left(seq, 0);
-		td2d->loc[0] = start_left;
-		break;
-	case SEQ_RIGHTSEL:
-		td2d->loc[0] = seq_tx_get_final_right(seq, 0);
-		break;
+		case SELECT:
+			/* Use seq_tx_get_final_left() and an offset here
+			 * so transform has the left hand location of the strip.
+			 * tdsq->start_offset is used when flushing the tx data back */
+			start_left = seq_tx_get_final_left(seq, 0);
+			td2d->loc[0] = start_left;
+			tdsq->start_offset = start_left - seq->start; /* use to apply the original location */
+			break;
+		case SEQ_LEFTSEL:
+			start_left = seq_tx_get_final_left(seq, 0);
+			td2d->loc[0] = start_left;
+			break;
+		case SEQ_RIGHTSEL:
+			td2d->loc[0] = seq_tx_get_final_right(seq, 0);
+			break;
 	}
 
 	td2d->loc[1] = seq->machine; /* channel - Y location */
@@ -3930,15 +4088,15 @@ static TransData *SeqToTransData(TransData *td, TransData2D *td2d, TransDataSeq
 	td2d->loc2d = NULL;
 
 
-	tdsq->seq= seq;
+	tdsq->seq = seq;
 
 	/* Use instead of seq->flag for nested strips and other
 	 * cases where the selection may need to be modified */
-	tdsq->flag= flag;
-	tdsq->sel_flag= sel_flag;
+	tdsq->flag = flag;
+	tdsq->sel_flag = sel_flag;
 
 
-	td->extra= (void *)tdsq; /* allow us to update the strip from here */
+	td->extra = (void *)tdsq; /* allow us to update the strip from here */
 
 	td->flag = 0;
 	td->loc = td2d->loc;
@@ -3948,17 +4106,17 @@ static TransData *SeqToTransData(TransData *td, TransData2D *td2d, TransDataSeq
 	memset(td->axismtx, 0, sizeof(td->axismtx));
 	td->axismtx[2][2] = 1.0f;
 
-	td->ext= NULL; td->val= NULL;
+	td->ext = NULL; td->val = NULL;
 
 	td->flag |= TD_SELECTED;
-	td->dist= 0.0;
+	td->dist = 0.0;
 
 	unit_m3(td->mtx);
 	unit_m3(td->smtx);
 
 	/* Time Transform (extend) */
-	td->val= td2d->loc;
-	td->ival= td2d->loc[0];
+	td->val = td2d->loc;
+	td->ival = td2d->loc[0];
 
 	return td;
 }
@@ -3967,26 +4125,26 @@ static int SeqToTransData_Recursive(TransInfo *t, ListBase *seqbase, TransData *
 {
 	Sequence *seq;
 	int recursive, count, flag;
-	int tot= 0;
+	int tot = 0;
 
-	for (seq= seqbase->first; seq; seq= seq->next) {
+	for (seq = seqbase->first; seq; seq = seq->next) {
 
 		SeqTransInfo(t, seq, &recursive, &count, &flag);
 
 		/* add children first so recalculating metastrips does nested strips first */
 		if (recursive) {
-			int tot_children= SeqToTransData_Recursive(t, &seq->seqbase, td, td2d, tdsq);
+			int tot_children = SeqToTransData_Recursive(t, &seq->seqbase, td, td2d, tdsq);
 
-			td=		td +	tot_children;
-			td2d=	td2d +	tot_children;
-			tdsq=	tdsq +	tot_children;
+			td =     td +    tot_children;
+			td2d =   td2d +  tot_children;
+			tdsq =   tdsq +  tot_children;
 
 			tot += tot_children;
 		}
 
 		/* use 'flag' which is derived from seq->flag but modified for special cases */
 		if (flag & SELECT) {
-			if (flag & (SEQ_LEFTSEL|SEQ_RIGHTSEL)) {
+			if (flag & (SEQ_LEFTSEL | SEQ_RIGHTSEL)) {
 				if (flag & SEQ_LEFTSEL) {
 					SeqToTransData(td++, td2d++, tdsq++, seq, flag, SEQ_LEFTSEL);
 					tot++;
@@ -4008,83 +4166,83 @@ static int SeqToTransData_Recursive(TransInfo *t, ListBase *seqbase, TransData *
 
 static void freeSeqData(TransInfo *t)
 {
-	Editing *ed= BKE_sequencer_editing_get(t->scene, FALSE);
+	Editing *ed = BKE_sequencer_editing_get(t->scene, FALSE);
 
 	if (ed != NULL) {
-		ListBase *seqbasep= ed->seqbasep;
-		TransData *td= t->data;
+		ListBase *seqbasep = ed->seqbasep;
+		TransData *td = t->data;
 		int a;
 
 		/* prevent updating the same seq twice
 		 * if the transdata order is changed this will mess up
 		 * but so will TransDataSeq */
-		Sequence *seq_prev= NULL;
+		Sequence *seq_prev = NULL;
 		Sequence *seq;
 
 
 		if (!(t->state == TRANS_CANCEL)) {
 
-#if 0		// default 2.4 behavior
+#if 0       // default 2.4 behavior
 
 			/* flush to 2d vector from internally used 3d vector */
-			for (a=0; a<t->total; a++, td++) {
-				if ((seq != seq_prev) && (seq->depth==0) && (seq->flag & SEQ_OVERLAP)) {
-				seq= ((TransDataSeq *)td->extra)->seq;
+			for (a = 0; a < t->total; a++, td++) {
+				if ((seq != seq_prev) && (seq->depth == 0) && (seq->flag & SEQ_OVERLAP)) {
+					seq = ((TransDataSeq *)td->extra)->seq;
 					shuffle_seq(seqbasep, seq);
 				}
 
-				seq_prev= seq;
+				seq_prev = seq;
 			}
 
-#else		// durian hack
+#else       // durian hack
 			{
-				int overlap= 0;
+				int overlap = 0;
 
-				for (a=0; a<t->total; a++, td++) {
-					seq_prev= NULL;
-					seq= ((TransDataSeq *)td->extra)->seq;
-					if ((seq != seq_prev) && (seq->depth==0) && (seq->flag & SEQ_OVERLAP)) {
-						overlap= 1;
+				for (a = 0; a < t->total; a++, td++) {
+					seq_prev = NULL;
+					seq = ((TransDataSeq *)td->extra)->seq;
+					if ((seq != seq_prev) && (seq->depth == 0) && (seq->flag & SEQ_OVERLAP)) {
+						overlap = 1;
 						break;
 					}
-					seq_prev= seq;
+					seq_prev = seq;
 				}
 
 				if (overlap) {
-					int has_effect= 0;
-					for (seq= seqbasep->first; seq; seq= seq->next)
-						seq->tmp= NULL;
-
-					td= t->data;
-					seq_prev= NULL;
-					for (a=0; a<t->total; a++, td++) {
-						seq= ((TransDataSeq *)td->extra)->seq;
+					int has_effect = 0;
+					for (seq = seqbasep->first; seq; seq = seq->next)
+						seq->tmp = NULL;
+
+					td = t->data;
+					seq_prev = NULL;
+					for (a = 0; a < t->total; a++, td++) {
+						seq = ((TransDataSeq *)td->extra)->seq;
 						if ((seq != seq_prev)) {
 							/* check effects strips, we cant change their time */
-							if ((seq->type & SEQ_EFFECT) && seq->seq1) {
-								has_effect= TRUE;
+							if ((seq->type & SEQ_TYPE_EFFECT) && seq->seq1) {
+								has_effect = TRUE;
 							}
 							else {
 								/* Tag seq with a non zero value, used by shuffle_seq_time to identify the ones to shuffle */
-								seq->tmp= (void*)1;
+								seq->tmp = (void *)1;
 							}
 						}
 					}
 
-#if 1				/* (mango hack! - for Ian) this is truely bad - should _never_ be in a release :| */
+#if 1               /* (mango hack! - for Ian) this is truely bad - should _never_ be in a release :| */
 					if (CTX_wm_window(t->context)->eventstate->alt) {
 						int minframe = MAXFRAME;
-						td= t->data;
-						seq_prev= NULL;
-						for (a=0; a<t->total; a++, td++) {
-							seq= ((TransDataSeq *)td->extra)->seq;
+						td = t->data;
+						seq_prev = NULL;
+						for (a = 0; a < t->total; a++, td++) {
+							seq = ((TransDataSeq *)td->extra)->seq;
 							if ((seq != seq_prev)) {
 								minframe = MIN2(minframe, seq->startdisp);
 							}
 						}
 
 
-						for (seq= seqbasep->first; seq; seq= seq->next) {
+						for (seq = seqbasep->first; seq; seq = seq->next) {
 							if (!(seq->flag & SELECT)) {
 								if (seq->startdisp >= minframe) {
 									seq->machine += MAXSEQ * 2;
@@ -4094,13 +4252,13 @@ static void freeSeqData(TransInfo *t)
 
 						shuffle_seq_time(seqbasep, t->scene);
 
-						for (seq= seqbasep->first; seq; seq= seq->next) {
+						for (seq = seqbasep->first; seq; seq = seq->next) {
 							if (seq->machine >= MAXSEQ * 2) {
 								seq->machine -= MAXSEQ * 2;
-								seq->tmp= (void*)1;
+								seq->tmp = (void *)1;
 							}
 							else {
-								seq->tmp= NULL;
+								seq->tmp = NULL;
 							}
 						}
 
@@ -4115,24 +4273,24 @@ static void freeSeqData(TransInfo *t)
 
 					if (has_effect) {
 						/* update effects strips based on strips just moved in time */
-						td= t->data;
-						seq_prev= NULL;
-						for (a=0; a<t->total; a++, td++) {
-							seq= ((TransDataSeq *)td->extra)->seq;
+						td = t->data;
+						seq_prev = NULL;
+						for (a = 0; a < t->total; a++, td++) {
+							seq = ((TransDataSeq *)td->extra)->seq;
 							if ((seq != seq_prev)) {
-								if ((seq->type & SEQ_EFFECT) && seq->seq1) {
+								if ((seq->type & SEQ_TYPE_EFFECT) && seq->seq1) {
 									calc_sequence(t->scene, seq);
 								}
 							}
 						}
 
 						/* now if any effects _still_ overlap, we need to move them up */
-						td= t->data;
-						seq_prev= NULL;
-						for (a=0; a<t->total; a++, td++) {
-							seq= ((TransDataSeq *)td->extra)->seq;
+						td = t->data;
+						seq_prev = NULL;
+						for (a = 0; a < t->total; a++, td++) {
+							seq = ((TransDataSeq *)td->extra)->seq;
 							if ((seq != seq_prev)) {
-								if ((seq->type & SEQ_EFFECT) && seq->seq1) {
+								if ((seq->type & SEQ_TYPE_EFFECT) && seq->seq1) {
 									if (seq_test_overlap(seqbasep, seq)) {
 										shuffle_seq(seqbasep, seq, t->scene);
 									}
@@ -4145,9 +4303,9 @@ static void freeSeqData(TransInfo *t)
 			}
 #endif
 
-			for (seq= seqbasep->first; seq; seq= seq->next) {
+			for (seq = seqbasep->first; seq; seq = seq->next) {
 				/* We might want to build a list of effects that need to be updated during transform */
-				if (seq->type & SEQ_EFFECT) {
+				if (seq->type & SEQ_TYPE_EFFECT) {
 					if      (seq->seq1 && seq->seq1->flag & SELECT) calc_sequence(t->scene, seq);
 					else if (seq->seq2 && seq->seq2->flag & SELECT) calc_sequence(t->scene, seq);
 					else if (seq->seq3 && seq->seq3->flag & SELECT) calc_sequence(t->scene, seq);
@@ -4158,12 +4316,12 @@ static void freeSeqData(TransInfo *t)
 		}
 		else {
 			/* Cancelled, need to update the strips display */
-			for (a=0; a<t->total; a++, td++) {
-				seq= ((TransDataSeq *)td->extra)->seq;
-				if ((seq != seq_prev) && (seq->depth==0)) {
+			for (a = 0; a < t->total; a++, td++) {
+				seq = ((TransDataSeq *)td->extra)->seq;
+				if ((seq != seq_prev) && (seq->depth == 0)) {
 					calc_sequence_disp(t->scene, seq);
 				}
-				seq_prev= seq;
+				seq_prev = seq;
 			}
 		}
 	}
@@ -4174,7 +4332,7 @@ static void freeSeqData(TransInfo *t)
 	}
 	if (t->data) {
 		MEM_freeN(t->data); // XXX postTrans usually does this
-		t->data= NULL;
+		t->data = NULL;
 	}
 }
 
@@ -4182,21 +4340,21 @@ static void createTransSeqData(bContext *C, TransInfo *t)
 {
 #define XXX_DURIAN_ANIM_TX_HACK
 
-	View2D *v2d= UI_view2d_fromcontext(C);
-	Scene *scene= t->scene;
-	Editing *ed= BKE_sequencer_editing_get(t->scene, FALSE);
+	View2D *v2d = UI_view2d_fromcontext(C);
+	Scene *scene = t->scene;
+	Editing *ed = BKE_sequencer_editing_get(t->scene, FALSE);
 	TransData *td = NULL;
-	TransData2D *td2d= NULL;
-	TransDataSeq *tdsq= NULL;
+	TransData2D *td2d = NULL;
+	TransDataSeq *tdsq = NULL;
 
-	int count=0;
+	int count = 0;
 
-	if (ed==NULL) {
-		t->total= 0;
+	if (ed == NULL) {
+		t->total = 0;
 		return;
 	}
 
-	t->customFree= freeSeqData;
+	t->customFree = freeSeqData;
 
 	/* which side of the current frame should be allowed */
 	if (t->mode == TFM_TIME_EXTEND) {
@@ -4214,16 +4372,16 @@ static void createTransSeqData(bContext *C, TransInfo *t)
 #ifdef XXX_DURIAN_ANIM_TX_HACK
 	{
 		Sequence *seq;
-		for (seq= ed->seqbasep->first; seq; seq= seq->next) {
+		for (seq = ed->seqbasep->first; seq; seq = seq->next) {
 			/* hack */
-			if ((seq->flag & SELECT)==0 && seq->type & SEQ_EFFECT) {
+			if ((seq->flag & SELECT) == 0 && seq->type & SEQ_TYPE_EFFECT) {
 				Sequence *seq_user;
 				int i;
-				for (i=0; i<3; i++) {
-					seq_user= *((&seq->seq1) + i);
+				for (i = 0; i < 3; i++) {
+					seq_user = *((&seq->seq1) + i);
 					if (seq_user && (seq_user->flag & SELECT) &&
 					    !(seq_user->flag & SEQ_LOCK) &&
-					    !(seq_user->flag & (SEQ_LEFTSEL|SEQ_RIGHTSEL)))
+					    !(seq_user->flag & (SEQ_LEFTSEL | SEQ_RIGHTSEL)))
 					{
 						seq->flag |= SELECT;
 					}
@@ -4236,16 +4394,16 @@ static void createTransSeqData(bContext *C, TransInfo *t)
 	count = SeqTransCount(t, NULL, ed->seqbasep, 0);
 
 	/* allocate memory for data */
-	t->total= count;
+	t->total = count;
 
 	/* stop if trying to build list if nothing selected */
 	if (count == 0) {
 		return;
 	}
 
-	td = t->data = MEM_callocN(t->total*sizeof(TransData), "TransSeq TransData");
-	td2d = t->data2d = MEM_callocN(t->total*sizeof(TransData2D), "TransSeq TransData2D");
-	tdsq = t->customData = MEM_callocN(t->total*sizeof(TransDataSeq), "TransSeq TransDataSeq");
+	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransSeq TransData");
+	td2d = t->data2d = MEM_callocN(t->total * sizeof(TransData2D), "TransSeq TransData2D");
+	tdsq = t->customData = MEM_callocN(t->total * sizeof(TransDataSeq), "TransSeq TransDataSeq");
 	t->flag |= T_FREE_CUSTOMDATA;
 
 
@@ -4273,17 +4431,17 @@ static short constraints_list_needinv(TransInfo *t, ListBase *list)
 	 * constraints needing special crazyspace corrections
 	 */
 	if (list) {
-		for (con= list->first; con; con=con->next) {
+		for (con = list->first; con; con = con->next) {
 			/* only consider constraint if it is enabled, and has influence on result */
-			if ((con->flag & CONSTRAINT_DISABLE)==0 && (con->enforce!=0.0f)) {
+			if ((con->flag & CONSTRAINT_DISABLE) == 0 && (con->enforce != 0.0f)) {
 				/* (affirmative) returns for specific constraints here... */
-					/* constraints that require this regardless  */
+				/* constraints that require this regardless  */
 				if (con->type == CONSTRAINT_TYPE_CHILDOF) return 1;
 				if (con->type == CONSTRAINT_TYPE_FOLLOWPATH) return 1;
 				if (con->type == CONSTRAINT_TYPE_CLAMPTO) return 1;
 				if (con->type == CONSTRAINT_TYPE_OBJECTSOLVER) return 1;
 				
-					/* constraints that require this only under special conditions */
+				/* constraints that require this only under special conditions */
 				if (con->type == CONSTRAINT_TYPE_ROTLIKE) {
 					/* CopyRot constraint only does this when rotating, and offset is on */
 					bRotateLikeConstraint *data = (bRotateLikeConstraint *)con->data;
@@ -4311,11 +4469,11 @@ static void ObjectToTransData(TransInfo *t, TransData *td, Object *ob)
 	copy_m3_m4(td->axismtx, ob->obmat);
 	normalize_m3(td->axismtx);
 
-	td->con= ob->constraints.first;
+	td->con = ob->constraints.first;
 
 	/* hack: temporarily disable tracking and/or constraints when getting
 	 *		object matrix, if tracking is on, or if constraints don't need
-	 * 		inverse correction to stop it from screwing up space conversion
+	 *      inverse correction to stop it from screwing up space conversion
 	 *		matrix later
 	 */
 	constinv = constraints_list_needinv(t, &ob->constraints);
@@ -4326,7 +4484,7 @@ static void ObjectToTransData(TransInfo *t, TransData *td, Object *ob)
 
 	if (skip_invert == 0 && constinv == 0) {
 		if (constinv == 0)
-			ob->transflag |= OB_NO_CONSTRAINTS; /* BKE_object_where_is_calc_time checks this */
+			ob->transflag |= OB_NO_CONSTRAINTS;  /* BKE_object_where_is_calc_time checks this */
 		
 		BKE_object_where_is_calc(t->scene, ob);
 		
@@ -4342,35 +4500,35 @@ static void ObjectToTransData(TransInfo *t, TransData *td, Object *ob)
 	copy_v3_v3(td->iloc, td->loc);
 	
 	if (ob->rotmode > 0) {
-		td->ext->rot= ob->rot;
-		td->ext->rotAxis= NULL;
-		td->ext->rotAngle= NULL;
-		td->ext->quat= NULL;
+		td->ext->rot = ob->rot;
+		td->ext->rotAxis = NULL;
+		td->ext->rotAngle = NULL;
+		td->ext->quat = NULL;
 		
 		copy_v3_v3(td->ext->irot, ob->rot);
 		copy_v3_v3(td->ext->drot, ob->drot);
 	}
 	else if (ob->rotmode == ROT_MODE_AXISANGLE) {
-		td->ext->rot= NULL;
-		td->ext->rotAxis= ob->rotAxis;
-		td->ext->rotAngle= &ob->rotAngle;
-		td->ext->quat= NULL;
+		td->ext->rot = NULL;
+		td->ext->rotAxis = ob->rotAxis;
+		td->ext->rotAngle = &ob->rotAngle;
+		td->ext->quat = NULL;
 		
-		td->ext->irotAngle= ob->rotAngle;
+		td->ext->irotAngle = ob->rotAngle;
 		copy_v3_v3(td->ext->irotAxis, ob->rotAxis);
 		// td->ext->drotAngle= ob->drotAngle;			// XXX, not implemented
 		// copy_v3_v3(td->ext->drotAxis, ob->drotAxis);	// XXX, not implemented
 	}
 	else {
-		td->ext->rot= NULL;
-		td->ext->rotAxis= NULL;
-		td->ext->rotAngle= NULL;
-		td->ext->quat= ob->quat;
+		td->ext->rot = NULL;
+		td->ext->rotAxis = NULL;
+		td->ext->rotAngle = NULL;
+		td->ext->quat = ob->quat;
 		
 		copy_qt_qt(td->ext->iquat, ob->quat);
 		copy_qt_qt(td->ext->dquat, ob->dquat);
 	}
-	td->ext->rotOrder=ob->rotmode;
+	td->ext->rotOrder = ob->rotmode;
 
 	td->ext->size = ob->size;
 	copy_v3_v3(td->ext->isize, ob->size);
@@ -4428,17 +4586,17 @@ static void set_trans_object_base_flags(TransInfo *t)
 	BKE_scene_base_flag_to_objects(t->scene);
 
 	/* handle pending update events, otherwise they got copied below */
-	for (base= scene->base.first; base; base= base->next) {
+	for (base = scene->base.first; base; base = base->next) {
 		if (base->object->recalc)
 			BKE_object_handle_update(t->scene, base->object);
 	}
 
-	for (base= scene->base.first; base; base= base->next) {
+	for (base = scene->base.first; base; base = base->next) {
 		base->flag &= ~BA_WAS_SEL;
 
 		if (TESTBASELIB_BGMODE(v3d, scene, base)) {
-			Object *ob= base->object;
-			Object *parsel= ob->parent;
+			Object *ob = base->object;
+			Object *parsel = ob->parent;
 
 			/* if parent selected, deselect */
 			while (parsel) {
@@ -4450,7 +4608,7 @@ static void set_trans_object_base_flags(TransInfo *t)
 						}
 					}
 				}
-				parsel= parsel->parent;
+				parsel = parsel->parent;
 			}
 
 			if (parsel) {
@@ -4473,7 +4631,7 @@ static void set_trans_object_base_flags(TransInfo *t)
 
 	/* and we store them temporal in base (only used for transform code) */
 	/* this because after doing updates, the object->recalc is cleared */
-	for (base= scene->base.first; base; base= base->next) {
+	for (base = scene->base.first; base; base = base->next) {
 		if (base->object->recalc & OB_RECALC_OB)
 			base->flag |= BA_HAS_RECALC_OB;
 		if (base->object->recalc & OB_RECALC_DATA)
@@ -4483,7 +4641,7 @@ static void set_trans_object_base_flags(TransInfo *t)
 
 static int mark_children(Object *ob)
 {
-	if (ob->flag & (SELECT|BA_TRANSFORM_CHILD))
+	if (ob->flag & (SELECT | BA_TRANSFORM_CHILD))
 		return 1;
 
 	if (ob->parent) {
@@ -4506,7 +4664,7 @@ static int count_proportional_objects(TransInfo *t)
 	/* rotations around local centers are allowed to propagate, so we take all objects */
 	if (!((t->mode == TFM_ROTATION || t->mode == TFM_TRACKBALL) && t->around == V3D_LOCAL)) {
 		/* mark all parents */
-		for (base= scene->base.first; base; base= base->next) {
+		for (base = scene->base.first; base; base = base->next) {
 			if (TESTBASELIB_BGMODE(v3d, scene, base)) {
 				Object *parent = base->object->parent;
 	
@@ -4519,9 +4677,9 @@ static int count_proportional_objects(TransInfo *t)
 		}
 
 		/* mark all children */
-		for (base= scene->base.first; base; base= base->next) {
+		for (base = scene->base.first; base; base = base->next) {
 			/* all base not already selected or marked that is editable */
-			if ((base->object->flag & (SELECT|BA_TRANSFORM_CHILD|BA_TRANSFORM_PARENT)) == 0 &&
+			if ((base->object->flag & (SELECT | BA_TRANSFORM_CHILD | BA_TRANSFORM_PARENT)) == 0 &&
 			    (BASE_EDITABLE_BGMODE(v3d, scene, base)))
 			{
 				mark_children(base->object);
@@ -4529,11 +4687,11 @@ static int count_proportional_objects(TransInfo *t)
 		}
 	}
 	
-	for (base= scene->base.first; base; base= base->next) {
-		Object *ob= base->object;
+	for (base = scene->base.first; base; base = base->next) {
+		Object *ob = base->object;
 
 		/* if base is not selected, not a parent of selection or not a child of selection and it is editable */
-		if ((ob->flag & (SELECT|BA_TRANSFORM_CHILD|BA_TRANSFORM_PARENT)) == 0 &&
+		if ((ob->flag & (SELECT | BA_TRANSFORM_CHILD | BA_TRANSFORM_PARENT)) == 0 &&
 		    (BASE_EDITABLE_BGMODE(v3d, scene, base)))
 		{
 
@@ -4550,7 +4708,7 @@ static int count_proportional_objects(TransInfo *t)
 
 	/* and we store them temporal in base (only used for transform code) */
 	/* this because after doing updates, the object->recalc is cleared */
-	for (base= scene->base.first; base; base= base->next) {
+	for (base = scene->base.first; base; base = base->next) {
 		if (base->object->recalc & OB_RECALC_OB)
 			base->flag |= BA_HAS_RECALC_OB;
 		if (base->object->recalc & OB_RECALC_DATA)
@@ -4565,21 +4723,21 @@ static void clear_trans_object_base_flags(TransInfo *t)
 	Scene *sce = t->scene;
 	Base *base;
 
-	for (base= sce->base.first; base; base = base->next) {
+	for (base = sce->base.first; base; base = base->next) {
 		if (base->flag & BA_WAS_SEL)
 			base->flag |= SELECT;
 
-		base->flag &= ~(BA_WAS_SEL|BA_HAS_RECALC_OB|BA_HAS_RECALC_DATA|BA_TEMP_TAG|BA_TRANSFORM_CHILD|BA_TRANSFORM_PARENT);
+		base->flag &= ~(BA_WAS_SEL | BA_HAS_RECALC_OB | BA_HAS_RECALC_DATA | BA_TEMP_TAG | BA_TRANSFORM_CHILD | BA_TRANSFORM_PARENT);
 	}
 }
 
 /* auto-keyframing feature - for objects
- * 	tmode: should be a transform mode
+ *  tmode: should be a transform mode
  */
 // NOTE: context may not always be available, so must check before using it as it's a luxury for a few cases
 void autokeyframe_ob_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *ob, int tmode)
 {
-	ID *id= &ob->id;
+	ID *id = &ob->id;
 	FCurve *fcu;
 	
 	// TODO: this should probably be done per channel instead...
@@ -4587,7 +4745,7 @@ void autokeyframe_ob_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *ob,
 		ReportList *reports = CTX_wm_reports(C);
 		KeyingSet *active_ks = ANIM_scene_get_active_keyingset(scene);
 		ListBase dsources = {NULL, NULL};
-		float cfra= (float)CFRA; // xxx this will do for now
+		float cfra = (float)CFRA; // xxx this will do for now
 		short flag = 0;
 		
 		/* get flags used for inserting keyframes */
@@ -4603,11 +4761,11 @@ void autokeyframe_ob_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *ob,
 			ANIM_apply_keyingset(C, &dsources, NULL, active_ks, MODIFYKEY_MODE_INSERT, cfra);
 		}
 		else if (IS_AUTOKEY_FLAG(scene, INSERTAVAIL)) {
-			AnimData *adt= ob->adt;
+			AnimData *adt = ob->adt;
 			
 			/* only key on available channels */
 			if (adt && adt->action) {
-				for (fcu= adt->action->curves.first; fcu; fcu= fcu->next) {
+				for (fcu = adt->action->curves.first; fcu; fcu = fcu->next) {
 					fcu->flag &= ~FCURVE_SELECTED;
 					insert_keyframe(reports, id, adt->action,
 					                (fcu->grp ? fcu->grp->name : NULL),
@@ -4630,7 +4788,7 @@ void autokeyframe_ob_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *ob,
 				else if (v3d->around == V3D_CURSOR)
 					do_loc = TRUE;
 				
-				if ((v3d->flag & V3D_ALIGN)==0)
+				if ((v3d->flag & V3D_ALIGN) == 0)
 					do_rot = TRUE;
 			}
 			else if (tmode == TFM_RESIZE) {
@@ -4641,27 +4799,27 @@ void autokeyframe_ob_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *ob,
 				else if (v3d->around == V3D_CURSOR)
 					do_loc = TRUE;
 				
-				if ((v3d->flag & V3D_ALIGN)==0)
+				if ((v3d->flag & V3D_ALIGN) == 0)
 					do_scale = TRUE;
 			}
 			
 			/* insert keyframes for the affected sets of channels using the builtin KeyingSets found */
 			if (do_loc) {
-				KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_LOCATION_ID);
+				KeyingSet *ks = ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_LOCATION_ID);
 				ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
 			}
 			if (do_rot) {
-				KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_ROTATION_ID);
+				KeyingSet *ks = ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_ROTATION_ID);
 				ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
 			}
 			if (do_scale) {
-				KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_SCALING_ID);
+				KeyingSet *ks = ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_SCALING_ID);
 				ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
 			}
 		}
 		/* insert keyframe in all (transform) channels */
 		else {
-			KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_LOC_ROT_SCALE_ID);
+			KeyingSet *ks = ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_LOC_ROT_SCALE_ID);
 			ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
 		}
 		
@@ -4671,16 +4829,16 @@ void autokeyframe_ob_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *ob,
 }
 
 /* auto-keyframing feature - for poses/pose-channels
- * 	tmode: should be a transform mode
+ *  tmode: should be a transform mode
  *	targetless_ik: has targetless ik been done on any channels?
  */
 // NOTE: context may not always be available, so must check before using it as it's a luxury for a few cases
 void autokeyframe_pose_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *ob, int tmode, short targetless_ik)
 {
-	ID *id= &ob->id;
-	AnimData *adt= ob->adt;
-	bAction	*act= (adt) ? adt->action : NULL;
-	bPose	*pose= ob->pose;
+	ID *id = &ob->id;
+	AnimData *adt = ob->adt;
+	bAction *act = (adt) ? adt->action : NULL;
+	bPose   *pose = ob->pose;
 	bPoseChannel *pchan;
 	FCurve *fcu;
 	
@@ -4688,12 +4846,12 @@ void autokeyframe_pose_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *o
 	if (autokeyframe_cfra_can_key(scene, id)) {
 		ReportList *reports = CTX_wm_reports(C);
 		KeyingSet *active_ks = ANIM_scene_get_active_keyingset(scene);
-		float cfra= (float)CFRA;
-		short flag= 0;
+		float cfra = (float)CFRA;
+		short flag = 0;
 		
 		/* flag is initialized from UserPref keyframing settings
 		 *	- special exception for targetless IK - INSERTKEY_MATRIX keyframes should get
-		 * 	  visual keyframes even if flag not set, as it's not that useful otherwise
+		 *    visual keyframes even if flag not set, as it's not that useful otherwise
 		 *	  (for quick animation recording)
 		 */
 		flag = ANIM_get_keyframing_flags(scene, 1);
@@ -4701,7 +4859,7 @@ void autokeyframe_pose_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *o
 		if (targetless_ik) 
 			flag |= INSERTKEY_MATRIX;
 		
-		for (pchan=pose->chanbase.first; pchan; pchan=pchan->next) {
+		for (pchan = pose->chanbase.first; pchan; pchan = pchan->next) {
 			if (pchan->bone->flag & BONE_TRANSFORM) {
 				ListBase dsources = {NULL, NULL};
 				
@@ -4719,16 +4877,16 @@ void autokeyframe_pose_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *o
 				/* only insert into available channels? */
 				else if (IS_AUTOKEY_FLAG(scene, INSERTAVAIL)) {
 					if (act) {
-						for (fcu= act->curves.first; fcu; fcu= fcu->next) {
+						for (fcu = act->curves.first; fcu; fcu = fcu->next) {
 							/* only insert keyframes for this F-Curve if it affects the current bone */
 							if (strstr(fcu->rna_path, "bones")) {
-								char *pchanName= BLI_getQuotedStr(fcu->rna_path, "bones[");
+								char *pchanName = BLI_getQuotedStr(fcu->rna_path, "bones[");
 								
 								/* only if bone name matches too... 
 								 * NOTE: this will do constraints too, but those are ok to do here too?
 								 */
 								if (pchanName && strcmp(pchanName, pchan->name) == 0) 
-									insert_keyframe(reports, id, act, ((fcu->grp)?(fcu->grp->name):(NULL)), fcu->rna_path, fcu->array_index, cfra, flag);
+									insert_keyframe(reports, id, act, ((fcu->grp) ? (fcu->grp->name) : (NULL)), fcu->rna_path, fcu->array_index, cfra, flag);
 									
 								if (pchanName) MEM_freeN(pchanName);
 							}
@@ -4750,33 +4908,33 @@ void autokeyframe_pose_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *o
 						if (ELEM(v3d->around, V3D_CURSOR, V3D_ACTIVE))
 							do_loc = TRUE;
 							
-						if ((v3d->flag & V3D_ALIGN)==0)
+						if ((v3d->flag & V3D_ALIGN) == 0)
 							do_rot = TRUE;
 					}
 					else if (tmode == TFM_RESIZE) {
 						if (ELEM(v3d->around, V3D_CURSOR, V3D_ACTIVE))
 							do_loc = TRUE;
 							
-						if ((v3d->flag & V3D_ALIGN)==0)
+						if ((v3d->flag & V3D_ALIGN) == 0)
 							do_scale = TRUE;
 					}
 					
 					if (do_loc) {
-						KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_LOCATION_ID);
+						KeyingSet *ks = ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_LOCATION_ID);
 						ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
 					}
 					if (do_rot) {
-						KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_ROTATION_ID);
+						KeyingSet *ks = ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_ROTATION_ID);
 						ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
 					}
 					if (do_scale) {
-						KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_SCALING_ID);
+						KeyingSet *ks = ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_SCALING_ID);
 						ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
 					}
 				}
 				/* insert keyframe in all (transform) channels */
 				else {
-					KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_LOC_ROT_SCALE_ID);
+					KeyingSet *ks = ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_LOC_ROT_SCALE_ID);
 					ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, cfra);
 				}
 				
@@ -4786,7 +4944,7 @@ void autokeyframe_pose_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *o
 		}
 		
 		/* do the bone paths 
-		 * 	- only do this when there is context info, since we need that to resolve
+		 *  - only do this when there is context info, since we need that to resolve
 		 *	  how to do the updates and so on...
 		 *	- do not calculate unless there are paths already to update...
 		 */
@@ -4797,7 +4955,7 @@ void autokeyframe_pose_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *o
 	}
 	else {
 		/* tag channels that should have unkeyed data */
-		for (pchan=pose->chanbase.first; pchan; pchan=pchan->next) {
+		for (pchan = pose->chanbase.first; pchan; pchan = pchan->next) {
 			if (pchan->bone->flag & BONE_TRANSFORM) {
 				/* tag this channel */
 				pchan->bone->flag |= BONE_UNKEYED;
@@ -4810,22 +4968,22 @@ void autokeyframe_pose_cb_func(bContext *C, Scene *scene, View3D *v3d, Object *o
 /* inserting keys, pointcache, redraw events... */
 /* 
  * note: sequencer freeing has its own function now because of a conflict with transform's order of freeing (campbell)
- * 		 Order changed, the sequencer stuff should go back in here
+ *       Order changed, the sequencer stuff should go back in here
  * */
 void special_aftertrans_update(bContext *C, TransInfo *t)
 {
 	Object *ob;
 //	short redrawipo=0, resetslowpar=1;
-	int canceled= (t->state == TRANS_CANCEL);
-	short duplicate= (t->mode == TFM_TIME_DUPLICATE);
+	int canceled = (t->state == TRANS_CANCEL);
+	short duplicate = (t->mode == TFM_TIME_DUPLICATE);
 	
 	/* early out when nothing happened */
 	if (t->total == 0 || t->mode == TFM_DUMMY)
 		return;
 	
-	if (t->spacetype==SPACE_VIEW3D) {
+	if (t->spacetype == SPACE_VIEW3D) {
 		if (t->obedit) {
-			if (canceled==0) {
+			if (canceled == 0) {
 				/* we need to delete the temporary faces before automerging */
 				if (t->mode == TFM_EDGE_SLIDE) {
 					SlideData *sld = t->customData;
@@ -4856,7 +5014,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 		/* freeSeqData in transform_conversions.c does this
 		 * keep here so the else at the end wont run... */
 
-		SpaceSeq *sseq= (SpaceSeq *)t->sa->spacedata.first;
+		SpaceSeq *sseq = (SpaceSeq *)t->sa->spacedata.first;
 
 		/* marker transform, not especially nice but we may want to move markers
 		 * at the same time as keyframes in the dope sheet. */
@@ -4875,7 +5033,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 
 	}
 	else if (t->spacetype == SPACE_NODE) {
-		SpaceNode *snode= (SpaceNode *)t->sa->spacedata.first;
+		SpaceNode *snode = (SpaceNode *)t->sa->spacedata.first;
 		if (canceled == 0) {
 			ED_node_post_apply_transform(C, snode->edittree);
 			
@@ -4894,12 +5052,30 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 				/* tracks can be used for stabilization nodes,
 				 * flush update for such nodes */
 				nodeUpdateID(t->scene->nodetree, &clip->id);
-				WM_event_add_notifier(C, NC_SCENE|ND_NODES, NULL);
+				WM_event_add_notifier(C, NC_SCENE | ND_NODES, NULL);
+			}
+		}
+		else if (t->options & CTX_MASK) {
+			SpaceClip *sc = t->sa->spacedata.first;
+			Mask *mask = ED_space_clip_mask(sc);
+
+			if (t->scene->nodetree) {
+				/* tracks can be used for stabilization nodes,
+				 * flush update for such nodes */
+				nodeUpdateID(t->scene->nodetree, &mask->id);
+				WM_event_add_notifier(C, NC_SCENE | ND_NODES, NULL);
+			}
+
+			/* TODO - dont key all masks... */
+			if (IS_AUTOKEY_ON(t->scene)) {
+				Scene *scene = t->scene;
+
+				ED_mask_layer_shape_auto_key_select(mask, CFRA);
 			}
 		}
 	}
 	else if (t->spacetype == SPACE_ACTION) {
-		SpaceAction *saction= (SpaceAction *)t->sa->spacedata.first;
+		SpaceAction *saction = (SpaceAction *)t->sa->spacedata.first;
 		bAnimContext ac;
 		
 		/* initialize relevant anim-context 'context' data */
@@ -4911,22 +5087,22 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 		if (ELEM(ac.datatype, ANIMCONT_DOPESHEET, ANIMCONT_SHAPEKEY)) {
 			ListBase anim_data = {NULL, NULL};
 			bAnimListElem *ale;
-			short filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/);
+			short filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT /*| ANIMFILTER_CURVESONLY*/);
 			
 			/* get channels to work on */
 			ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
 			
 			/* these should all be F-Curves */
-			for (ale= anim_data.first; ale; ale= ale->next) {
-				AnimData *adt= ANIM_nla_mapping_get(&ac, ale);
-				FCurve *fcu= (FCurve *)ale->key_data;
+			for (ale = anim_data.first; ale; ale = ale->next) {
+				AnimData *adt = ANIM_nla_mapping_get(&ac, ale);
+				FCurve *fcu = (FCurve *)ale->key_data;
 				
 				/* 3 cases here for curve cleanups:
 				 * 1) NOTRANSKEYCULL on     -> cleanup of duplicates shouldn't be done
 				 * 2) canceled == 0        -> user confirmed the transform, so duplicates should be removed
 				 * 3) canceled + duplicate -> user canceled the transform, but we made duplicates, so get rid of these
 				 */
-				if ((saction->flag & SACTION_NOTRANSKEYCULL)==0 &&
+				if ((saction->flag & SACTION_NOTRANSKEYCULL) == 0 &&
 				    ((canceled == 0) || (duplicate)) )
 				{
 					if (adt) {
@@ -4935,7 +5111,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 						ANIM_nla_mapping_apply_fcurve(adt, fcu, 1, 1);
 					}
 					else
-						posttrans_fcurve_clean(fcu, FALSE); /* only use handles in graph editor */
+						posttrans_fcurve_clean(fcu, FALSE);  /* only use handles in graph editor */
 				}
 			}
 			
@@ -4947,7 +5123,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 			// fixme... some of this stuff is not good
 			if (ob) {
 				if (ob->pose || ob_get_key(ob))
-					DAG_id_tag_update(&ob->id, OB_RECALC_OB|OB_RECALC_DATA|OB_RECALC_TIME);
+					DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 				else
 					DAG_id_tag_update(&ob->id, OB_RECALC_OB);
 			}
@@ -4957,7 +5133,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 			 * 2) canceled == 0        -> user confirmed the transform, so duplicates should be removed
 			 * 3) canceled + duplicate -> user canceled the transform, but we made duplicates, so get rid of these
 			 */
-			if ((saction->flag & SACTION_NOTRANSKEYCULL)==0 &&
+			if ((saction->flag & SACTION_NOTRANSKEYCULL) == 0 &&
 			    ((canceled == 0) || (duplicate)))
 			{
 				posttrans_action_clean(&ac, (bAction *)ac.data);
@@ -4965,13 +5141,13 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 		}
 		else if (ac.datatype == ANIMCONT_GPENCIL) {
 			/* remove duplicate frames and also make sure points are in order! */
-				/* 3 cases here for curve cleanups:
-				 * 1) NOTRANSKEYCULL on     -> cleanup of duplicates shouldn't be done
-				 * 2) canceled == 0        -> user confirmed the transform, so duplicates should be removed
-				 * 3) canceled + duplicate -> user canceled the transform, but we made duplicates, so get rid of these
-				 */
-			if ((saction->flag & SACTION_NOTRANSKEYCULL)==0 &&
-				((canceled == 0) || (duplicate)))
+			/* 3 cases here for curve cleanups:
+			 * 1) NOTRANSKEYCULL on     -> cleanup of duplicates shouldn't be done
+			 * 2) canceled == 0        -> user confirmed the transform, so duplicates should be removed
+			 * 3) canceled + duplicate -> user canceled the transform, but we made duplicates, so get rid of these
+			 */
+			if ((saction->flag & SACTION_NOTRANSKEYCULL) == 0 &&
+			    ((canceled == 0) || (duplicate)))
 			{
 				bGPdata *gpd;
 				
@@ -4983,6 +5159,26 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 				}
 			}
 		}
+		else if (ac.datatype == ANIMCONT_MASK) {
+			/* remove duplicate frames and also make sure points are in order! */
+			/* 3 cases here for curve cleanups:
+			 * 1) NOTRANSKEYCULL on     -> cleanup of duplicates shouldn't be done
+			 * 2) canceled == 0        -> user confirmed the transform, so duplicates should be removed
+			 * 3) canceled + duplicate -> user canceled the transform, but we made duplicates, so get rid of these
+			 */
+			if ((saction->flag & SACTION_NOTRANSKEYCULL) == 0 &&
+			    ((canceled == 0) || (duplicate)))
+			{
+				Mask *mask;
+
+				// XXX: BAD! this get gpencil datablocks directly from main db...
+				// but that's how this currently works :/
+				for (mask = G.main->mask.first; mask; mask = mask->id.next) {
+					if (ID_REAL_USERS(mask))
+						posttrans_mask_clean(mask);
+				}
+			}
+		}
 		
 		/* marker transform, not especially nice but we may want to move markers
 		 * at the same time as keyframes in the dope sheet. 
@@ -5006,14 +5202,14 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 		}
 		
 		/* make sure all F-Curves are set correctly */
-		if (ac.datatype != ANIMCONT_GPENCIL)
+		if (!ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK))
 			ANIM_editkeyframes_refresh(&ac);
 		
 		/* clear flag that was set for time-slide drawing */
 		saction->flag &= ~SACTION_MOVING;
 	}
 	else if (t->spacetype == SPACE_IPO) {
-		SpaceIpo *sipo= (SpaceIpo *)t->sa->spacedata.first;
+		SpaceIpo *sipo = (SpaceIpo *)t->sa->spacedata.first;
 		bAnimContext ac;
 		const short use_handle = !(sipo->flag & SIPO_NOHANDLES);
 		
@@ -5024,21 +5220,21 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 		if (ac.datatype) {
 			ListBase anim_data = {NULL, NULL};
 			bAnimListElem *ale;
-			short filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVE_VISIBLE);
+			short filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVE_VISIBLE);
 			
 			/* get channels to work on */
 			ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
 			
-			for (ale= anim_data.first; ale; ale= ale->next) {
-				AnimData *adt= ANIM_nla_mapping_get(&ac, ale);
-				FCurve *fcu= (FCurve *)ale->key_data;
+			for (ale = anim_data.first; ale; ale = ale->next) {
+				AnimData *adt = ANIM_nla_mapping_get(&ac, ale);
+				FCurve *fcu = (FCurve *)ale->key_data;
 				
 				/* 3 cases here for curve cleanups:
 				 * 1) NOTRANSKEYCULL on     -> cleanup of duplicates shouldn't be done
 				 * 2) canceled == 0        -> user confirmed the transform, so duplicates should be removed
 				 * 3) canceled + duplicate -> user canceled the transform, but we made duplicates, so get rid of these
 				 */
-				if ((sipo->flag & SIPO_NOTRANSKEYCULL)==0 &&
+				if ((sipo->flag & SIPO_NOTRANSKEYCULL) == 0 &&
 				    ((canceled == 0) || (duplicate)))
 				{
 					if (adt) {
@@ -5073,13 +5269,13 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 		if (ac.datatype) {
 			ListBase anim_data = {NULL, NULL};
 			bAnimListElem *ale;
-			short filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT);
+			short filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT);
 			
 			/* get channels to work on */
 			ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
 			
-			for (ale= anim_data.first; ale; ale= ale->next) {
-				NlaTrack *nlt= (NlaTrack *)ale->data;
+			for (ale = anim_data.first; ale; ale = ale->next) {
+				NlaTrack *nlt = (NlaTrack *)ale->data;
 				
 				/* make sure strips are in order again */
 				BKE_nlatrack_sort_strips(nlt);
@@ -5105,16 +5301,16 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 	else if ((t->flag & T_POSE) && (t->poseobj)) {
 		bArmature *arm;
 		bPoseChannel *pchan;
-		short targetless_ik= 0;
+		short targetless_ik = 0;
 
-		ob= t->poseobj;
-		arm= ob->data;
+		ob = t->poseobj;
+		arm = ob->data;
 
 		if ((t->flag & T_AUTOIK) && (t->options & CTX_AUTOCONFIRM)) {
 			/* when running transform non-interactively (operator exec),
 			 * we need to update the pose otherwise no updates get called during
 			 * transform and the auto-ik is not applied. see [#26164] */
-			struct Object *pose_ob=t->poseobj;
+			struct Object *pose_ob = t->poseobj;
 			BKE_pose_where_is(t->scene, pose_ob);
 		}
 
@@ -5123,17 +5319,17 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 			count_set_pose_transflags(&t->mode, t->around, ob);
 
 		/* if target-less IK grabbing, we calculate the pchan transforms and clear flag */
-		if (!canceled && t->mode==TFM_TRANSLATION)
-			targetless_ik= apply_targetless_ik(ob);
+		if (!canceled && t->mode == TFM_TRANSLATION)
+			targetless_ik = apply_targetless_ik(ob);
 		else {
 			/* not forget to clear the auto flag */
-			for (pchan=ob->pose->chanbase.first; pchan; pchan=pchan->next) {
-				bKinematicConstraint *data= has_targetless_ik(pchan);
+			for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
+				bKinematicConstraint *data = has_targetless_ik(pchan);
 				if (data) data->flag &= ~CONSTRAINT_IK_AUTO;
 			}
 		}
 
-		if (t->mode==TFM_TRANSLATION)
+		if (t->mode == TFM_TRANSLATION)
 			pose_grab_with_ik_clear(ob);
 
 		/* automatic inserting of keys and unkeyed tagging - only if transform wasn't canceled (or TFM_DUMMY) */
@@ -5144,7 +5340,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 		else if (arm->flag & ARM_DELAYDEFORM) {
 			/* old optimize trick... this enforces to bypass the depgraph */
 			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
-			ob->recalc= 0;	// is set on OK position already by recalcData()
+			ob->recalc = 0;  // is set on OK position already by recalcData()
 		}
 		else
 			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
@@ -5158,7 +5354,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 		/* do nothing */
 	}
 	else { /* Objects */
-		int i, recalcObPaths=0;
+		int i, recalcObPaths = 0;
 
 		for (i = 0; i < t->total; i++) {
 			TransData *td = t->data + i;
@@ -5174,7 +5370,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 
 			/* flag object caches as outdated */
 			BKE_ptcache_ids_from_object(&pidlist, ob, t->scene, MAX_DUPLI_RECUR);
-			for (pid=pidlist.first; pid; pid=pid->next) {
+			for (pid = pidlist.first; pid; pid = pid->next) {
 				if (pid->type != PTCACHE_TYPE_PARTICLES) /* particles don't need reset on geometry change */
 					pid->cache->flag |= PTCACHE_OUTDATED;
 			}
@@ -5196,7 +5392,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 				
 				/* only calculate paths if there are paths to be recalculated */
 				if (ob->avs.path_bakeflag & MOTIONPATH_BAKE_HAS_PATHS)
-					recalcObPaths= 1;
+					recalcObPaths = 1;
 			}
 		}
 		
@@ -5238,7 +5434,7 @@ static void createTransObject(bContext *C, TransInfo *t)
 	set_trans_object_base_flags(t);
 
 	/* count */
-	t->total= CTX_DATA_COUNT(C, selected_objects);
+	t->total = CTX_DATA_COUNT(C, selected_objects);
 	
 	if (!t->total) {
 		/* clear here, main transform function escapes too */
@@ -5250,17 +5446,17 @@ static void createTransObject(bContext *C, TransInfo *t)
 		t->total += count_proportional_objects(t);
 	}
 
-	td = t->data = MEM_callocN(t->total*sizeof(TransData), "TransOb");
-	tx = t->ext = MEM_callocN(t->total*sizeof(TransDataExtension), "TransObExtension");
+	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransOb");
+	tx = t->ext = MEM_callocN(t->total * sizeof(TransDataExtension), "TransObExtension");
 
-	CTX_DATA_BEGIN (C, Base*, base, selected_bases)
+	CTX_DATA_BEGIN(C, Base *, base, selected_bases)
 	{
-		Object *ob= base->object;
+		Object *ob = base->object;
 		
 		td->flag = TD_SELECTED;
-		td->protectflag= ob->protectflag;
+		td->protectflag = ob->protectflag;
 		td->ext = tx;
-		td->ext->rotOrder= ob->rotmode;
+		td->ext->rotOrder = ob->rotmode;
 		
 		if (base->flag & BA_TRANSFORM_CHILD) {
 			td->flag |= TD_NOCENTER;
@@ -5284,16 +5480,16 @@ static void createTransObject(bContext *C, TransInfo *t)
 		View3D *v3d = t->view;
 		Base *base;
 
-		for (base= scene->base.first; base; base= base->next) {
-			Object *ob= base->object;
+		for (base = scene->base.first; base; base = base->next) {
+			Object *ob = base->object;
 
 			/* if base is not selected, not a parent of selection or not a child of selection and it is editable */
 			if ((ob->flag & (SELECT | BA_TRANSFORM_CHILD | BA_TRANSFORM_PARENT)) == 0 &&
 			    BASE_EDITABLE_BGMODE(v3d, scene, base))
 			{
-				td->protectflag= ob->protectflag;
+				td->protectflag = ob->protectflag;
 				td->ext = tx;
-				td->ext->rotOrder= ob->rotmode;
+				td->ext->rotOrder = ob->rotmode;
 				
 				ObjectToTransData(t, td, ob);
 				td->val = NULL;
@@ -5326,10 +5522,10 @@ static void NodeToTransData(TransData *td, TransData2D *td2d, bNode *node)
 	memset(td->axismtx, 0, sizeof(td->axismtx));
 	td->axismtx[2][2] = 1.0f;
 
-	td->ext= NULL; td->val= NULL;
+	td->ext = NULL; td->val = NULL;
 
 	td->flag |= TD_SELECTED;
-	td->dist= 0.0;
+	td->dist = 0.0;
 
 	unit_m3(td->mtx);
 	unit_m3(td->smtx);
@@ -5339,29 +5535,29 @@ static void createTransNodeData(bContext *C, TransInfo *t)
 {
 	TransData *td;
 	TransData2D *td2d;
-	SpaceNode *snode= t->sa->spacedata.first;
+	SpaceNode *snode = t->sa->spacedata.first;
 	bNode *node;
 
 	if (!snode->edittree) {
-		t->total= 0;
+		t->total = 0;
 		return;
 	}
 
 	/* set transform flags on nodes */
-	for (node=snode->edittree->nodes.first; node; node=node->next) {
+	for (node = snode->edittree->nodes.first; node; node = node->next) {
 		if ((node->flag & NODE_SELECT) || (node->parent && (node->parent->flag & NODE_TRANSFORM)))
 			node->flag |= NODE_TRANSFORM;
 		else
 			node->flag &= ~NODE_TRANSFORM;
 	}
 
-	t->total= CTX_DATA_COUNT(C, selected_nodes);
+	t->total = CTX_DATA_COUNT(C, selected_nodes);
 
-	td = t->data = MEM_callocN(t->total*sizeof(TransData), "TransNode TransData");
-	td2d = t->data2d = MEM_callocN(t->total*sizeof(TransData2D), "TransNode TransData2D");
+	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransNode TransData");
+	td2d = t->data2d = MEM_callocN(t->total * sizeof(TransData2D), "TransNode TransData2D");
 
-	CTX_DATA_BEGIN (C, bNode *, selnode, selected_nodes)
-		NodeToTransData(td++, td2d++, selnode);
+	CTX_DATA_BEGIN(C, bNode *, selnode, selected_nodes)
+	NodeToTransData(td++, td2d++, selnode);
 	CTX_DATA_END
 }
 
@@ -5392,23 +5588,24 @@ typedef struct TransDataTracking {
 	short coord;
 } TransDataTracking;
 
-static void markerToTransDataInit(TransData *td, TransData2D *td2d, TransDataTracking *tdt, MovieTrackingTrack *track,
-                                  int area, float *loc, float *rel, float *off)
+static void markerToTransDataInit(TransData *td, TransData2D *td2d, TransDataTracking *tdt,
+                                  MovieTrackingTrack *track, MovieTrackingMarker *marker,
+                                  int area, float loc[2], float rel[2], const float off[2], float aspx, float aspy)
 {
 	int anchor = area == TRACK_AREA_POINT && off;
 
 	tdt->mode = transDataTracking_ModeTracks;
 
 	if (anchor) {
-		td2d->loc[0] = rel[0]; /* hold original location */
-		td2d->loc[1] = rel[1];
+		td2d->loc[0] = rel[0] * aspx; /* hold original location */
+		td2d->loc[1] = rel[1] * aspy;
 
-		tdt->loc= loc;
+		tdt->loc = loc;
 		td2d->loc2d = loc; /* current location */
 	}
 	else {
-		td2d->loc[0] = loc[0]; /* hold original location */
-		td2d->loc[1] = loc[1];
+		td2d->loc[0] = loc[0] * aspx; /* hold original location */
+		td2d->loc[1] = loc[1] * aspy;
 
 		td2d->loc2d = loc; /* current location */
 	}
@@ -5422,8 +5619,8 @@ static void markerToTransDataInit(TransData *td, TransData2D *td2d, TransDataTra
 
 	if (rel) {
 		if (!anchor) {
-			td2d->loc[0] += rel[0];
-			td2d->loc[1] += rel[1];
+			td2d->loc[0] += rel[0] * aspx;
+			td2d->loc[1] += rel[1] * aspy;
 		}
 
 		copy_v2_v2(tdt->srelative, rel);
@@ -5434,14 +5631,17 @@ static void markerToTransDataInit(TransData *td, TransData2D *td2d, TransDataTra
 
 	td->flag = 0;
 	td->loc = td2d->loc;
-	copy_v3_v3(td->center, td->loc);
 	copy_v3_v3(td->iloc, td->loc);
 
+	//copy_v3_v3(td->center, td->loc);
+	td->center[0] = marker->pos[0] * aspx;
+	td->center[1] = marker->pos[1] * aspy;
+
 	memset(td->axismtx, 0, sizeof(td->axismtx));
 	td->axismtx[2][2] = 1.0f;
 
-	td->ext= NULL;
-	td->val= NULL;
+	td->ext = NULL;
+	td->val = NULL;
 
 	td->flag |= TD_SELECTED;
 	td->dist = 0.0;
@@ -5451,26 +5651,37 @@ static void markerToTransDataInit(TransData *td, TransData2D *td2d, TransDataTra
 }
 
 static void trackToTransData(SpaceClip *sc, TransData *td, TransData2D *td2d,
-                             TransDataTracking *tdt, MovieTrackingTrack *track)
+                             TransDataTracking *tdt, MovieTrackingTrack *track, float aspx, float aspy)
 {
-	MovieTrackingMarker *marker = BKE_tracking_ensure_marker(track, sc->user.framenr);
+	int framenr = ED_space_clip_clip_framenr(sc);
+	MovieTrackingMarker *marker = BKE_tracking_marker_ensure(track, framenr);
 
 	tdt->flag = marker->flag;
-	marker->flag &= ~(MARKER_DISABLED|MARKER_TRACKED);
+	marker->flag &= ~(MARKER_DISABLED | MARKER_TRACKED);
 
-	markerToTransDataInit(td++, td2d++, tdt++, track, TRACK_AREA_POINT, track->offset, marker->pos, track->offset);
+	markerToTransDataInit(td++, td2d++, tdt++, track, marker, TRACK_AREA_POINT,
+	                      track->offset, marker->pos, track->offset, aspx, aspy);
 
-	if (track->flag & SELECT)
-		markerToTransDataInit(td++, td2d++, tdt++, track, TRACK_AREA_POINT, marker->pos, NULL, NULL);
+	if (track->flag & SELECT) {
+		markerToTransDataInit(td++, td2d++, tdt++, track, marker, TRACK_AREA_POINT,
+		                      marker->pos, NULL, NULL, aspx, aspy);
+	}
 
 	if (track->pat_flag & SELECT) {
-		markerToTransDataInit(td++, td2d++, tdt++, track, TRACK_AREA_PAT, track->pat_min, marker->pos, NULL);
-		markerToTransDataInit(td++, td2d++, tdt++, track, TRACK_AREA_PAT, track->pat_max, marker->pos, NULL);
+		int a;
+
+		for (a = 0; a < 4; a++) {
+			markerToTransDataInit(td++, td2d++, tdt++, track, marker, TRACK_AREA_PAT,
+			                      marker->pattern_corners[a], marker->pos, NULL, aspx, aspy);
+		}
 	}
 
 	if (track->search_flag & SELECT) {
-		markerToTransDataInit(td++, td2d++, tdt++, track, TRACK_AREA_SEARCH, track->search_min, marker->pos, NULL);
-		markerToTransDataInit(td++, td2d++, tdt++, track, TRACK_AREA_SEARCH, track->search_max, marker->pos, NULL);
+		markerToTransDataInit(td++, td2d++, tdt++, track, marker, TRACK_AREA_SEARCH,
+		                      marker->search_min, marker->pos, NULL, aspx, aspy);
+
+		markerToTransDataInit(td++, td2d++, tdt++, track, marker, TRACK_AREA_SEARCH,
+		                      marker->search_max, marker->pos, NULL, aspx, aspy);
 	}
 }
 
@@ -5492,30 +5703,31 @@ static void createTransTrackingTracksData(bContext *C, TransInfo *t)
 	TransData2D *td2d;
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
-	ListBase *tracksbase = BKE_tracking_get_tracks(&clip->tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(&clip->tracking);
 	MovieTrackingTrack *track;
 	MovieTrackingMarker *marker;
 	TransDataTracking *tdt;
-	int framenr = sc->user.framenr;
+	int framenr = ED_space_clip_clip_framenr(sc);
+	float aspx, aspy;
 
 	/* count */
 	t->total = 0;
 
 	track = tracksbase->first;
 	while (track) {
-		if (TRACK_VIEW_SELECTED(sc, track) && (track->flag & TRACK_LOCKED)==0) {
-			marker = BKE_tracking_get_marker(track, framenr);
+		if (TRACK_VIEW_SELECTED(sc, track) && (track->flag & TRACK_LOCKED) == 0) {
+			marker = BKE_tracking_marker_get(track, framenr);
 
-			t->total++;	/* offset */
+			t->total++; /* offset */
 
 			if (track->flag & SELECT)
 				t->total++;
 
 			if (track->pat_flag & SELECT)
-				t->total+= 2;
+				t->total += 4;
 
 			if (track->search_flag & SELECT)
-				t->total+= 2;
+				t->total += 2;
 		}
 
 		track = track->next;
@@ -5524,9 +5736,11 @@ static void createTransTrackingTracksData(bContext *C, TransInfo *t)
 	if (t->total == 0)
 		return;
 
-	td = t->data = MEM_callocN(t->total*sizeof(TransData), "TransTracking TransData");
-	td2d = t->data2d = MEM_callocN(t->total*sizeof(TransData2D), "TransTracking TransData2D");
-	tdt = t->customData = MEM_callocN(t->total*sizeof(TransDataTracking), "TransTracking TransDataTracking");
+	ED_space_clip_aspect_dimension_aware(sc, &aspx, &aspy);
+
+	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransTracking TransData");
+	td2d = t->data2d = MEM_callocN(t->total * sizeof(TransData2D), "TransTracking TransData2D");
+	tdt = t->customData = MEM_callocN(t->total * sizeof(TransDataTracking), "TransTracking TransDataTracking");
 
 	t->customFree = transDataTrackingFree;
 
@@ -5534,27 +5748,25 @@ static void createTransTrackingTracksData(bContext *C, TransInfo *t)
 	track = tracksbase->first;
 	while (track) {
 		if (TRACK_VIEW_SELECTED(sc, track) && (track->flag & TRACK_LOCKED) == 0) {
-			marker = BKE_tracking_get_marker(track, framenr);
+			marker = BKE_tracking_marker_get(track, framenr);
 
-			trackToTransData(sc, td, td2d, tdt, track);
+			trackToTransData(sc, td, td2d, tdt, track, aspx, aspy);
 
 			/* offset */
 			td++;
 			td2d++;
 			tdt++;
 
-			if ((marker->flag & MARKER_DISABLED) == 0) {
-				if (track->flag & SELECT) {
-					td++;
-					td2d++;
-					tdt++;
-				}
+			if (track->flag & SELECT) {
+				td++;
+				td2d++;
+				tdt++;
+			}
 
-				if (track->pat_flag & SELECT) {
-					td += 2;
-					td2d += 2;
-					tdt +=2;
-				}
+			if (track->pat_flag & SELECT) {
+				td += 4;
+				td2d += 4;
+				tdt += 4;
 			}
 
 			if (track->search_flag & SELECT) {
@@ -5603,8 +5815,8 @@ static void markerToTransCurveDataInit(TransData *td, TransData2D *td2d, TransDa
 	memset(td->axismtx, 0, sizeof(td->axismtx));
 	td->axismtx[2][2] = 1.0f;
 
-	td->ext= NULL;
-	td->val= NULL;
+	td->ext = NULL;
+	td->val = NULL;
 
 	td->flag |= TD_SELECTED;
 	td->dist = 0.0;
@@ -5619,7 +5831,7 @@ static void createTransTrackingCurvesData(bContext *C, TransInfo *t)
 	TransData2D *td2d;
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	MovieClip *clip = ED_space_clip(sc);
-	ListBase *tracksbase= BKE_tracking_get_tracks(&clip->tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(&clip->tracking);
 	MovieTrackingTrack *track;
 	MovieTrackingMarker *marker, *prev_marker;
 	TransDataTracking *tdt;
@@ -5632,10 +5844,10 @@ static void createTransTrackingCurvesData(bContext *C, TransInfo *t)
 
 	track = tracksbase->first;
 	while (track) {
-		if (TRACK_VIEW_SELECTED(sc, track) && (track->flag & TRACK_LOCKED)==0) {
+		if (TRACK_VIEW_SELECTED(sc, track) && (track->flag & TRACK_LOCKED) == 0) {
 			for (i = 1; i < track->markersnr; i++) {
 				marker = &track->markers[i];
-				prev_marker = &track->markers[i-1];
+				prev_marker = &track->markers[i - 1];
 
 				if ((marker->flag & MARKER_DISABLED) || (prev_marker->flag & MARKER_DISABLED))
 					continue;
@@ -5654,32 +5866,32 @@ static void createTransTrackingCurvesData(bContext *C, TransInfo *t)
 	if (t->total == 0)
 		return;
 
-	td = t->data = MEM_callocN(t->total*sizeof(TransData), "TransTracking TransData");
-	td2d = t->data2d = MEM_callocN(t->total*sizeof(TransData2D), "TransTracking TransData2D");
-	tdt = t->customData = MEM_callocN(t->total*sizeof(TransDataTracking), "TransTracking TransDataTracking");
+	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransTracking TransData");
+	td2d = t->data2d = MEM_callocN(t->total * sizeof(TransData2D), "TransTracking TransData2D");
+	tdt = t->customData = MEM_callocN(t->total * sizeof(TransDataTracking), "TransTracking TransDataTracking");
 
 	t->customFree = transDataTrackingFree;
 
 	/* create actual data */
 	track = tracksbase->first;
 	while (track) {
-		if (TRACK_VIEW_SELECTED(sc, track) && (track->flag & TRACK_LOCKED)==0) {
+		if (TRACK_VIEW_SELECTED(sc, track) && (track->flag & TRACK_LOCKED) == 0) {
 			for (i = 1; i < track->markersnr; i++) {
 				marker = &track->markers[i];
-				prev_marker = &track->markers[i-1];
+				prev_marker = &track->markers[i - 1];
 
 				if ((marker->flag & MARKER_DISABLED) || (prev_marker->flag & MARKER_DISABLED))
 					continue;
 
 				if (marker->flag & MARKER_GRAPH_SEL_X) {
-					markerToTransCurveDataInit(td, td2d, tdt, marker, &track->markers[i-1], 0, width);
+					markerToTransCurveDataInit(td, td2d, tdt, marker, &track->markers[i - 1], 0, width);
 					td += 1;
 					td2d += 1;
 					tdt += 1;
 				}
 
 				if (marker->flag & MARKER_GRAPH_SEL_Y) {
-					markerToTransCurveDataInit(td, td2d, tdt, marker, &track->markers[i-1], 1, height);
+					markerToTransCurveDataInit(td, td2d, tdt, marker, &track->markers[i - 1], 1, height);
 
 					td += 1;
 					td2d += 1;
@@ -5706,9 +5918,6 @@ static void createTransTrackingData(bContext *C, TransInfo *t)
 	if (!clip || width == 0 || height == 0)
 		return;
 
-	if (!ELEM(t->mode, TFM_RESIZE, TFM_TRANSLATION))
-		return;
-
 	if (ar->regiontype == RGN_TYPE_PREVIEW) {
 		/* transformation was called from graph editor */
 		createTransTrackingCurvesData(C, t);
@@ -5723,16 +5932,16 @@ static void cancelTransTracking(TransInfo *t)
 	TransDataTracking *tdt = t->customData;
 	SpaceClip *sc = t->sa->spacedata.first;
 	MovieClip *clip = ED_space_clip(sc);
-	ListBase *tracksbase = BKE_tracking_get_tracks(&clip->tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(&clip->tracking);
 	MovieTrackingTrack *track;
 	MovieTrackingMarker *marker;
-	int a, framenr = sc->user.framenr;
+	int a, framenr = ED_space_clip_clip_framenr(sc);
 
 	if (tdt->mode == transDataTracking_ModeTracks) {
 		track = tracksbase->first;
 		while (track) {
-			if (TRACK_VIEW_SELECTED(sc, track) && (track->flag & TRACK_LOCKED)==0) {
-				marker = BKE_tracking_get_marker(track, framenr);
+			if (TRACK_VIEW_SELECTED(sc, track) && (track->flag & TRACK_LOCKED) == 0) {
+				marker = BKE_tracking_marker_get(track, framenr);
 				marker->flag = tdt->flag;
 
 				tdt++;
@@ -5755,15 +5964,15 @@ static void cancelTransTracking(TransInfo *t)
 
 		track = tracksbase->first;
 		while (track) {
-			if (TRACK_VIEW_SELECTED(sc, track) && (track->flag & TRACK_LOCKED)==0) {
+			if (TRACK_VIEW_SELECTED(sc, track) && (track->flag & TRACK_LOCKED) == 0) {
 				for (a = 1; a < track->markersnr; a++) {
 					marker = &track->markers[a];
-					prev_marker = &track->markers[a-1];
+					prev_marker = &track->markers[a - 1];
 
 					if ((marker->flag & MARKER_DISABLED) || (prev_marker->flag & MARKER_DISABLED))
 						continue;
 
-					if (marker->flag & (MARKER_GRAPH_SEL_X|MARKER_GRAPH_SEL_Y)) {
+					if (marker->flag & (MARKER_GRAPH_SEL_X | MARKER_GRAPH_SEL_Y)) {
 						marker->flag = tdt->flag;
 					}
 				}
@@ -5776,42 +5985,61 @@ static void cancelTransTracking(TransInfo *t)
 
 void flushTransTracking(TransInfo *t)
 {
+	SpaceClip *sc = t->sa->spacedata.first;
 	TransData *td;
 	TransData2D *td2d;
 	TransDataTracking *tdt;
 	int a;
+	float aspx, aspy;
+
+	ED_space_clip_aspect_dimension_aware(sc, &aspx, &aspy);
 
 	if (t->state == TRANS_CANCEL)
 		cancelTransTracking(t);
 
 	/* flush to 2d vector from internally used 3d vector */
-	for (a=0, td= t->data, td2d= t->data2d, tdt= t->customData; a<t->total; a++, td2d++, td++, tdt++) {
+	for (a = 0, td = t->data, td2d = t->data2d, tdt = t->customData; a < t->total; a++, td2d++, td++, tdt++) {
 		if (tdt->mode == transDataTracking_ModeTracks) {
-			if (t->flag & T_ALT_TRANSFORM) {
-				if (tdt->area == TRACK_AREA_POINT && tdt->relative) {
-					float d[2], d2[2];
+			float loc2d[2];
 
-					if (!tdt->smarkers) {
-						tdt->smarkers = MEM_callocN(sizeof(*tdt->smarkers)*tdt->markersnr, "flushTransTracking markers");
-						for (a = 0; a < tdt->markersnr; a++)
-							copy_v2_v2(tdt->smarkers[a], tdt->markers[a].pos);
-					}
+			if (t->mode == TFM_ROTATION && tdt->area == TRACK_AREA_SEARCH) {
+				continue;
+			}
+
+			loc2d[0] = td2d->loc[0] / aspx;
+			loc2d[1] = td2d->loc[1] / aspy;
 
-					sub_v2_v2v2(d, td2d->loc, tdt->soffset);
-					sub_v2_v2(d, tdt->srelative);
+			if (t->flag & T_ALT_TRANSFORM) {
+				if (t->mode == TFM_RESIZE) {
+					if (tdt->area != TRACK_AREA_PAT)
+						continue;
+				}
+				else if (t->mode == TFM_TRANSLATION) {
+					if (tdt->area == TRACK_AREA_POINT && tdt->relative) {
+						float d[2], d2[2];
+
+						if (!tdt->smarkers) {
+							tdt->smarkers = MEM_callocN(sizeof(*tdt->smarkers) * tdt->markersnr, "flushTransTracking markers");
+							for (a = 0; a < tdt->markersnr; a++)
+								copy_v2_v2(tdt->smarkers[a], tdt->markers[a].pos);
+						}
 
-					sub_v2_v2v2(d2, td2d->loc, tdt->srelative);
+						sub_v2_v2v2(d, loc2d, tdt->soffset);
+						sub_v2_v2(d, tdt->srelative);
 
-					for (a= 0; a<tdt->markersnr; a++)
-						add_v2_v2v2(tdt->markers[a].pos, tdt->smarkers[a], d2);
+						sub_v2_v2v2(d2, loc2d, tdt->srelative);
 
-					negate_v2_v2(td2d->loc2d, d);
+						for (a = 0; a < tdt->markersnr; a++)
+							add_v2_v2v2(tdt->markers[a].pos, tdt->smarkers[a], d2);
+
+						negate_v2_v2(td2d->loc2d, d);
+					}
 				}
 			}
 
-			if (tdt->area!=TRACK_AREA_POINT || tdt->relative==0) {
-				td2d->loc2d[0] = td2d->loc[0];
-				td2d->loc2d[1] = td2d->loc[1];
+			if (tdt->area != TRACK_AREA_POINT || tdt->relative == 0) {
+				td2d->loc2d[0] = loc2d[0];
+				td2d->loc2d[1] = loc2d[1];
 
 				if (tdt->relative)
 					sub_v2_v2(td2d->loc2d, tdt->relative);
@@ -5823,6 +6051,219 @@ void flushTransTracking(TransInfo *t)
 	}
 }
 
+/* * masking * */
+
+typedef struct TransDataMasking {
+	int is_handle;
+
+	float handle[2], orig_handle[2];
+	float vec[3][3];
+	MaskSplinePoint *point;
+} TransDataMasking;
+
+static void MaskPointToTransData(SpaceClip *sc, MaskSplinePoint *point,
+                                 TransData *td, TransData2D *td2d, TransDataMasking *tdm, int propmode)
+{
+	BezTriple *bezt = &point->bezt;
+	float aspx, aspy;
+	short is_sel_point = MASKPOINT_ISSEL_KNOT(point);
+	short is_sel_any = MASKPOINT_ISSEL_ANY(point);
+
+	tdm->point = point;
+	copy_m3_m3(tdm->vec, bezt->vec);
+
+	ED_space_clip_mask_aspect(sc, &aspx, &aspy);
+
+	if (propmode || is_sel_point) {
+		int i;
+		for (i = 0; i < 3; i++) {
+			/* CV coords are scaled by aspects. this is needed for rotations and
+			 * proportional editing to be consistent with the stretched CV coords
+			 * that are displayed. this also means that for display and numinput,
+			 * and when the the CV coords are flushed, these are converted each time */
+			td2d->loc[0] = bezt->vec[i][0] * aspx;
+			td2d->loc[1] = bezt->vec[i][1] * aspy;
+			td2d->loc[2] = 0.0f;
+			td2d->loc2d = bezt->vec[i];
+
+			td->flag = 0;
+			td->loc = td2d->loc;
+			copy_v3_v3(td->center, td->loc);
+			copy_v3_v3(td->iloc, td->loc);
+
+			memset(td->axismtx, 0, sizeof(td->axismtx));
+			td->axismtx[2][2] = 1.0f;
+
+			td->ext = NULL;
+
+			if (i == 1) {
+				/* scaling weights */
+				td->val = &bezt->weight;
+				td->ival = *td->val;
+			}
+			else {
+				td->val = NULL;
+			}
+
+			if (is_sel_any) {
+				td->flag |= TD_SELECTED;
+			}
+			td->dist = 0.0;
+
+			unit_m3(td->mtx);
+			unit_m3(td->smtx);
+
+			td++;
+			td2d++;
+		}
+	}
+	else {
+		tdm->is_handle = TRUE;
+
+		BKE_mask_point_handle(point, tdm->handle);
+
+		copy_v2_v2(tdm->orig_handle, tdm->handle);
+
+		td2d->loc[0] = tdm->handle[0] * aspx;
+		td2d->loc[1] = tdm->handle[1] * aspy;
+		td2d->loc[2] = 0.0f;
+		td2d->loc2d = tdm->handle;
+
+		td->flag = 0;
+		td->loc = td2d->loc;
+		copy_v3_v3(td->center, td->loc);
+		copy_v3_v3(td->iloc, td->loc);
+
+		memset(td->axismtx, 0, sizeof(td->axismtx));
+		td->axismtx[2][2] = 1.0f;
+
+		td->ext = NULL;
+		td->val = NULL;
+
+		if (is_sel_any) {
+			td->flag |= TD_SELECTED;
+		}
+
+		td->dist = 0.0;
+
+		unit_m3(td->mtx);
+		unit_m3(td->smtx);
+
+		td++;
+		td2d++;
+	}
+}
+
+static void createTransMaskingData(bContext *C, TransInfo *t)
+{
+	SpaceClip *sc = CTX_wm_space_clip(C);
+	Mask *mask = CTX_data_edit_mask(C);
+	MaskLayer *masklay;
+	TransData *td = NULL;
+	TransData2D *td2d = NULL;
+	TransDataMasking *tdm = NULL;
+	int count = 0, countsel = 0;
+	int propmode = t->flag & T_PROP_EDIT;
+
+	t->total = 0;
+
+	if (!mask)
+		return;
+
+	/* count */
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskSpline *spline = masklay->splines.first;
+
+		if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+			continue;
+		}
+
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			int i;
+
+			for (i = 0; i < spline->tot_point; i++) {
+				MaskSplinePoint *point = &spline->points[i];
+
+				if (MASKPOINT_ISSEL_ANY(point)) {
+					if (MASKPOINT_ISSEL_KNOT(point))
+						countsel += 3;
+					else
+						countsel += 1;
+				}
+
+				if (propmode)
+					count += 3;
+			}
+		}
+	}
+
+	/* note: in prop mode we need at least 1 selected */
+	if (countsel == 0) return;
+
+	t->total = (propmode) ? count : countsel;
+	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransObData(Mask Editing)");
+	/* for each 2d uv coord a 3d vector is allocated, so that they can be
+	 * treated just as if they were 3d verts */
+	td2d = t->data2d = MEM_callocN(t->total * sizeof(TransData2D), "TransObData2D(Mask Editing)");
+	tdm = t->customData = MEM_callocN(t->total * sizeof(TransDataMasking), "TransDataMasking(Mask Editing)");
+
+	t->flag |= T_FREE_CUSTOMDATA;
+
+	/* create data */
+	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
+		MaskSpline *spline = masklay->splines.first;
+
+		if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+			continue;
+		}
+
+		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			int i;
+
+			for (i = 0; i < spline->tot_point; i++) {
+				MaskSplinePoint *point = &spline->points[i];
+
+				if (propmode || MASKPOINT_ISSEL_ANY(point)) {
+					MaskPointToTransData(sc, point, td, td2d, tdm, propmode);
+
+					if (propmode || MASKPOINT_ISSEL_KNOT(point)) {
+						td += 3;
+						td2d += 3;
+						tdm += 3;
+					}
+					else {
+						td++;
+						td2d++;
+						tdm++;
+					}
+				}
+			}
+		}
+	}
+}
+
+void flushTransMasking(TransInfo *t)
+{
+	SpaceClip *sc = t->sa->spacedata.first;
+	TransData2D *td;
+	TransDataMasking *tdm;
+	int a;
+	float aspx, aspy, invx, invy;
+
+	ED_space_clip_mask_aspect(sc, &aspx, &aspy);
+	invx = 1.0f / aspx;
+	invy = 1.0f / aspy;
+
+	/* flush to 2d vector from internally used 3d vector */
+	for (a = 0, td = t->data2d, tdm = t->customData; a < t->total; a++, td++, tdm++) {
+		td->loc2d[0] = td->loc[0] * invx;
+		td->loc2d[1] = td->loc[1] * invy;
+
+		if (tdm->is_handle)
+			BKE_mask_point_set_handle(tdm->point, td->loc2d, t->flag & T_ALT_TRANSFORM, tdm->orig_handle, tdm->vec);
+	}
+}
+
 void createTransData(bContext *C, TransInfo *t)
 {
 	Scene *scene = t->scene;
@@ -5837,7 +6278,7 @@ void createTransData(bContext *C, TransInfo *t)
 		t->flag |= T_EDIT;
 		createTransEdge(t);
 		if (t->data && t->flag & T_PROP_EDIT) {
-			sort_trans_data(t);	// makes selected become first in array
+			sort_trans_data(t); // makes selected become first in array
 			set_prop_dist(t, 1);
 			sort_trans_data_dist(t);
 		}
@@ -5847,51 +6288,60 @@ void createTransData(bContext *C, TransInfo *t)
 		//createTransBMeshVerts(t, G.editBMesh->bm, G.editBMesh->td);
 	}
 	else if (t->spacetype == SPACE_IMAGE) {
-		t->flag |= T_POINTS|T_2D_EDIT;
+		t->flag |= T_POINTS | T_2D_EDIT;
 		createTransUVs(C, t);
 		if (t->data && (t->flag & T_PROP_EDIT)) {
-			sort_trans_data(t);	// makes selected become first in array
+			sort_trans_data(t); // makes selected become first in array
 			set_prop_dist(t, 1);
 			sort_trans_data_dist(t);
 		}
 	}
 	else if (t->spacetype == SPACE_ACTION) {
-		t->flag |= T_POINTS|T_2D_EDIT;
+		t->flag |= T_POINTS | T_2D_EDIT;
 		createTransActionData(C, t);
 	}
 	else if (t->spacetype == SPACE_NLA) {
-		t->flag |= T_POINTS|T_2D_EDIT;
+		t->flag |= T_POINTS | T_2D_EDIT;
 		createTransNlaData(C, t);
 	}
 	else if (t->spacetype == SPACE_SEQ) {
-		t->flag |= T_POINTS|T_2D_EDIT;
+		t->flag |= T_POINTS | T_2D_EDIT;
 		t->num.flag |= NUM_NO_FRACTION; /* sequencer has no use for floating point transformations */
 		createTransSeqData(C, t);
 	}
 	else if (t->spacetype == SPACE_IPO) {
-		t->flag |= T_POINTS|T_2D_EDIT;
+		t->flag |= T_POINTS | T_2D_EDIT;
 		createTransGraphEditData(C, t);
 #if 0
 		if (t->data && (t->flag & T_PROP_EDIT)) {
-			sort_trans_data(t);	// makes selected become first in array
+			sort_trans_data(t); // makes selected become first in array
 			set_prop_dist(t, 1);
 			sort_trans_data_dist(t);
 		}
 #endif
 	}
 	else if (t->spacetype == SPACE_NODE) {
-		t->flag |= T_2D_EDIT|T_POINTS;
+		t->flag |= T_2D_EDIT | T_POINTS;
 		createTransNodeData(C, t);
 		if (t->data && (t->flag & T_PROP_EDIT)) {
-			sort_trans_data(t);	// makes selected become first in array
+			sort_trans_data(t); // makes selected become first in array
 			set_prop_dist(t, 1);
 			sort_trans_data_dist(t);
 		}
 	}
 	else if (t->spacetype == SPACE_CLIP) {
-		t->flag |= T_POINTS|T_2D_EDIT;
+		t->flag |= T_POINTS | T_2D_EDIT;
 		if (t->options & CTX_MOVIECLIP)
 			createTransTrackingData(C, t);
+		else if (t->options & CTX_MASK) {
+			createTransMaskingData(C, t);
+
+			if (t->data && (t->flag & T_PROP_EDIT)) {
+				sort_trans_data(t); // makes selected become first in array
+				set_prop_dist(t, TRUE);
+				sort_trans_data_dist(t);
+			}
+		}
 	}
 	else if (t->obedit) {
 		t->ext = NULL;
@@ -5901,13 +6351,13 @@ void createTransData(bContext *C, TransInfo *t)
 		else if (ELEM(t->obedit->type, OB_CURVE, OB_SURF)) {
 			createTransCurveVerts(C, t);
 		}
-		else if (t->obedit->type==OB_LATTICE) {
+		else if (t->obedit->type == OB_LATTICE) {
 			createTransLatticeVerts(t);
 		}
-		else if (t->obedit->type==OB_MBALL) {
+		else if (t->obedit->type == OB_MBALL) {
 			createTransMBallVerts(t);
 		}
-		else if (t->obedit->type==OB_ARMATURE) {
+		else if (t->obedit->type == OB_ARMATURE) {
 			t->flag &= ~T_PROP_EDIT;
 			createTransArmatureVerts(t);
 		}
@@ -5915,26 +6365,26 @@ void createTransData(bContext *C, TransInfo *t)
 			printf("edit type not implemented!\n");
 		}
 
-		t->flag |= T_EDIT|T_POINTS;
+		t->flag |= T_EDIT | T_POINTS;
 
 		if (t->data && t->flag & T_PROP_EDIT) {
 			if (ELEM(t->obedit->type, OB_CURVE, OB_MESH)) {
-				sort_trans_data(t);	// makes selected become first in array
+				sort_trans_data(t); // makes selected become first in array
 				set_prop_dist(t, 0);
 				sort_trans_data_dist(t);
 			}
 			else {
-				sort_trans_data(t);	// makes selected become first in array
+				sort_trans_data(t); // makes selected become first in array
 				set_prop_dist(t, 1);
 				sort_trans_data_dist(t);
 			}
 		}
 
 		/* exception... hackish, we want bonesize to use bone orientation matrix (ton) */
-		if (t->mode==TFM_BONESIZE) {
-			t->flag &= ~(T_EDIT|T_POINTS);
+		if (t->mode == TFM_BONESIZE) {
+			t->flag &= ~(T_EDIT | T_POINTS);
 			t->flag |= T_POSE;
-			t->poseobj = ob;	/* <- tsk tsk, this is going to give issues one day */
+			t->poseobj = ob;    /* <- tsk tsk, this is going to give issues one day */
 		}
 	}
 	else if (ob && (ob->mode & OB_MODE_POSE)) {
@@ -5945,9 +6395,9 @@ void createTransData(bContext *C, TransInfo *t)
 	else if (ob && (ob->mode & OB_MODE_WEIGHT_PAINT)) {
 		/* important that ob_armature can be set even when its not selected [#23412]
 		 * lines below just check is also visible */
-		Object *ob_armature= modifiers_isDeformedByArmature(ob);
+		Object *ob_armature = modifiers_isDeformedByArmature(ob);
 		if (ob_armature && ob_armature->mode & OB_MODE_POSE) {
-			Base *base_arm= BKE_scene_base_find(t->scene, ob_armature);
+			Base *base_arm = BKE_scene_base_find(t->scene, ob_armature);
 			if (base_arm) {
 				View3D *v3d = t->view;
 				if (BASE_VISIBLE(v3d, base_arm)) {
@@ -5962,12 +6412,12 @@ void createTransData(bContext *C, TransInfo *t)
 		t->flag |= T_POINTS;
 
 		if (t->data && t->flag & T_PROP_EDIT) {
-			sort_trans_data(t);	// makes selected become first in array
+			sort_trans_data(t); // makes selected become first in array
 			set_prop_dist(t, 1);
 			sort_trans_data_dist(t);
 		}
 	}
-	else if (ob && (ob->mode & (OB_MODE_SCULPT|OB_MODE_TEXTURE_PAINT))) {
+	else if (ob && (ob->mode & (OB_MODE_SCULPT | OB_MODE_TEXTURE_PAINT))) {
 		/* sculpt mode and project paint have own undo stack
 		 * transform ops redo clears sculpt/project undo stack.
 		 *
@@ -5987,7 +6437,7 @@ void createTransData(bContext *C, TransInfo *t)
 		if ((t->spacetype == SPACE_VIEW3D) && (t->ar->regiontype == RGN_TYPE_WINDOW)) {
 			View3D *v3d = t->view;
 			RegionView3D *rv3d = CTX_wm_region_view3d(C);
-			if (rv3d && (t->flag & T_OBJECT) && v3d->camera == OBACT && rv3d->persp==RV3D_CAMOB) {
+			if (rv3d && (t->flag & T_OBJECT) && v3d->camera == OBACT && rv3d->persp == RV3D_CAMOB) {
 				t->flag |= T_CAMERA;
 			}
 		}
@@ -5997,7 +6447,3 @@ void createTransData(bContext *C, TransInfo *t)
 //	/* temporal...? */
 //	t->scene->recalc |= SCE_PRV_CHANGED;	/* test for 3d preview */
 }
-
-
-
-
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 4c8b447cdfd..b7857be5afb 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -49,6 +49,7 @@
 #include "DNA_view3d_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_movieclip_types.h"
+#include "DNA_mask_types.h"
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
@@ -139,13 +140,13 @@ void getViewVector(TransInfo *t, float coord[3], float vec[3])
 
 static void clipMirrorModifier(TransInfo *t, Object *ob)
 {
-	ModifierData *md= ob->modifiers.first;
+	ModifierData *md = ob->modifiers.first;
 	float tolerance[3] = {0.0f, 0.0f, 0.0f};
 	int axis = 0;
 	
-	for (; md; md=md->next) {
-		if ((md->type==eModifierType_Mirror) && (md->mode & eModifierMode_Realtime)) {
-			MirrorModifierData *mmd = (MirrorModifierData*) md;
+	for (; md; md = md->next) {
+		if ((md->type == eModifierType_Mirror) && (md->mode & eModifierMode_Realtime)) {
+			MirrorModifierData *mmd = (MirrorModifierData *) md;
 			
 			if (mmd->flag & MOD_MIR_CLIPPING) {
 				axis = 0;
@@ -174,13 +175,13 @@ static void clipMirrorModifier(TransInfo *t, Object *ob)
 						invert_m4_m4(imtx, mtx);
 					}
 					
-					for (i = 0 ; i < t->total; i++, td++) {
+					for (i = 0; i < t->total; i++, td++) {
 						int clip;
 						float loc[3], iloc[3];
 						
 						if (td->flag & TD_NOACTION)
 							break;
-						if (td->loc==NULL)
+						if (td->loc == NULL)
 							break;
 						
 						if (td->flag & TD_SKIP)
@@ -196,27 +197,27 @@ static void clipMirrorModifier(TransInfo *t, Object *ob)
 						
 						clip = 0;
 						if (axis & 1) {
-							if (fabsf(iloc[0])<=tolerance[0] ||
-							   loc[0]*iloc[0]<0.0f)
+							if (fabsf(iloc[0]) <= tolerance[0] ||
+							    loc[0] * iloc[0] < 0.0f)
 							{
-								loc[0]= 0.0f;
+								loc[0] = 0.0f;
 								clip = 1;
 							}
 						}
 						
 						if (axis & 2) {
 							if (fabsf(iloc[1]) <= tolerance[1] ||
-							   loc[1] * iloc[1]<0.0f)
+							    loc[1] * iloc[1] < 0.0f)
 							{
-								loc[1]= 0.0f;
+								loc[1] = 0.0f;
 								clip = 1;
 							}
 						}
 						if (axis & 4) {
 							if (fabsf(iloc[2]) <= tolerance[2] ||
-							   loc[2] * iloc[2] < 0.0f)
+							    loc[2] * iloc[2] < 0.0f)
 							{
-								loc[2]= 0.0f;
+								loc[2] = 0.0f;
 								clip = 1;
 							}
 						}
@@ -241,19 +242,19 @@ static void editbmesh_apply_to_mirror(TransInfo *t)
 	BMVert *eve;
 	int i;
 	
-	for (i = 0 ; i < t->total; i++, td++) {
+	for (i = 0; i < t->total; i++, td++) {
 		if (td->flag & TD_NOACTION)
 			break;
-		if (td->loc==NULL)
+		if (td->loc == NULL)
 			break;
 		if (td->flag & TD_SKIP)
 			continue;
 		
 		eve = td->extra;
 		if (eve) {
-			eve->co[0]= -td->loc[0];
-			eve->co[1]= td->loc[1];
-			eve->co[2]= td->loc[2];
+			eve->co[0] = -td->loc[0];
+			eve->co[1] = td->loc[1];
+			eve->co[2] = td->loc[2];
 		}
 		
 		if (td->flag & TD_MIRROR_EDGE) {
@@ -263,23 +264,23 @@ static void editbmesh_apply_to_mirror(TransInfo *t)
 }
 
 /* for the realtime animation recording feature, handle overlapping data */
-static void animrecord_check_state (Scene *scene, ID *id, wmTimer *animtimer)
+static void animrecord_check_state(Scene *scene, ID *id, wmTimer *animtimer)
 {
-	ScreenAnimData *sad= (animtimer) ? animtimer->customdata : NULL;
+	ScreenAnimData *sad = (animtimer) ? animtimer->customdata : NULL;
 	
 	/* sanity checks */
 	if (ELEM3(NULL, scene, id, sad))
 		return;
 	
 	/* check if we need a new strip if:
-	 * 	- if animtimer is running 
+	 *  - if animtimer is running
 	 *	- we're not only keying for available channels
 	 *	- the option to add new actions for each round is not enabled
 	 */
-	if (IS_AUTOKEY_FLAG(scene, INSERTAVAIL)==0 && (scene->toolsettings->autokey_flag & ANIMRECORD_FLAG_WITHNLA)) {
+	if (IS_AUTOKEY_FLAG(scene, INSERTAVAIL) == 0 && (scene->toolsettings->autokey_flag & ANIMRECORD_FLAG_WITHNLA)) {
 		/* if playback has just looped around, we need to add a new NLA track+strip to allow a clean pass to occur */
 		if ((sad) && (sad->flag & ANIMPLAY_FLAG_JUMPED)) {
-			AnimData *adt= BKE_animdata_from_id(id);
+			AnimData *adt = BKE_animdata_from_id(id);
 			
 			/* perform push-down manually with some differences 
 			 * NOTE: BKE_nla_action_pushdown() sync warning...
@@ -289,21 +290,21 @@ static void animrecord_check_state (Scene *scene, ID *id, wmTimer *animtimer)
 				
 				/* only push down if action is more than 1-2 frames long */
 				calc_action_range(adt->action, &astart, &aend, 1);
-				if (aend > astart+2.0f) {
-					NlaStrip *strip= add_nlastrip_to_stack(adt, adt->action);
+				if (aend > astart + 2.0f) {
+					NlaStrip *strip = add_nlastrip_to_stack(adt, adt->action);
 					
 					/* clear reference to action now that we've pushed it onto the stack */
 					adt->action->id.us--;
-					adt->action= NULL;
+					adt->action = NULL;
 					
 					/* adjust blending + extend so that they will behave correctly */
-					strip->extendmode= NLASTRIP_EXTEND_NOTHING;
-					strip->flag &= ~(NLASTRIP_FLAG_AUTO_BLENDS|NLASTRIP_FLAG_SELECT|NLASTRIP_FLAG_ACTIVE);
+					strip->extendmode = NLASTRIP_EXTEND_NOTHING;
+					strip->flag &= ~(NLASTRIP_FLAG_AUTO_BLENDS | NLASTRIP_FLAG_SELECT | NLASTRIP_FLAG_ACTIVE);
 					
 					/* also, adjust the AnimData's action extend mode to be on 
 					 * 'nothing' so that previous result still play 
 					 */
-					adt->act_extendmode= NLASTRIP_EXTEND_NOTHING;
+					adt->act_extendmode = NLASTRIP_EXTEND_NOTHING;
 				}
 			}
 		}
@@ -312,13 +313,13 @@ static void animrecord_check_state (Scene *scene, ID *id, wmTimer *animtimer)
 
 static int fcu_test_selected(FCurve *fcu)
 {
-	BezTriple *bezt= fcu->bezt;
+	BezTriple *bezt = fcu->bezt;
 	unsigned int i;
 
-	if (bezt==NULL) /* ignore baked */
+	if (bezt == NULL) /* ignore baked */
 		return 0;
 
-	for (i=0; i < fcu->totvert; i++, bezt++) {
+	for (i = 0; i < fcu->totvert; i++, bezt++) {
 		if (BEZSELECTED(bezt)) return 1;
 	}
 
@@ -328,41 +329,41 @@ static int fcu_test_selected(FCurve *fcu)
 /* helper for recalcData() - for Action Editor transforms */
 static void recalcData_actedit(TransInfo *t)
 {
-	Scene *scene= t->scene;
-	SpaceAction *saction= (SpaceAction *)t->sa->spacedata.first;
+	Scene *scene = t->scene;
+	SpaceAction *saction = (SpaceAction *)t->sa->spacedata.first;
 	
-	bAnimContext ac= {NULL};
+	bAnimContext ac = {NULL};
 	ListBase anim_data = {NULL, NULL};
 	bAnimListElem *ale;
 	int filter;
 	
 	/* initialize relevant anim-context 'context' data from TransInfo data */
-		/* NOTE: sync this with the code in ANIM_animdata_get_context() */
-	ac.scene= t->scene;
-	ac.obact= OBACT;
-	ac.sa= t->sa;
-	ac.ar= t->ar;
-	ac.sl= (t->sa)? t->sa->spacedata.first : NULL;
-	ac.spacetype= (t->sa)? t->sa->spacetype : 0;
-	ac.regiontype= (t->ar)? t->ar->regiontype : 0;
+	/* NOTE: sync this with the code in ANIM_animdata_get_context() */
+	ac.scene = t->scene;
+	ac.obact = OBACT;
+	ac.sa = t->sa;
+	ac.ar = t->ar;
+	ac.sl = (t->sa) ? t->sa->spacedata.first : NULL;
+	ac.spacetype = (t->sa) ? t->sa->spacetype : 0;
+	ac.regiontype = (t->ar) ? t->ar->regiontype : 0;
 	
 	ANIM_animdata_context_getdata(&ac);
 	
 	/* perform flush */
-	if (ac.datatype == ANIMCONT_GPENCIL) {
+	if (ELEM(ac.datatype, ANIMCONT_GPENCIL, ANIMCONT_MASK)) {
 		/* flush transform values back to actual coordinates */
-		flushTransGPactionData(t);
+		flushTransIntFrameActionData(t);
 	}
 	else {
 		/* get animdata blocks visible in editor, assuming that these will be the ones where things changed */
-		filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_ANIMDATA);
+		filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_ANIMDATA);
 		ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
 		
 		/* just tag these animdata-blocks to recalc, assuming that some data there changed 
 		 * BUT only do this if realtime updates are enabled
 		 */
 		if ((saction->flag & SACTION_NOREALTIMEUPDATES) == 0) {
-			for (ale= anim_data.first; ale; ale= ale->next) {
+			for (ale = anim_data.first; ale; ale = ale->next) {
 				/* set refresh tags for objects using this animation */
 				ANIM_list_elem_update(t->scene, ale);
 			}
@@ -375,11 +376,11 @@ static void recalcData_actedit(TransInfo *t)
 /* helper for recalcData() - for Graph Editor transforms */
 static void recalcData_graphedit(TransInfo *t)
 {
-	SpaceIpo *sipo= (SpaceIpo *)t->sa->spacedata.first;
+	SpaceIpo *sipo = (SpaceIpo *)t->sa->spacedata.first;
 	Scene *scene;
 	
 	ListBase anim_data = {NULL, NULL};
-	bAnimContext ac= {NULL};
+	bAnimContext ac = {NULL};
 	int filter;
 	
 	bAnimListElem *ale;
@@ -387,14 +388,14 @@ static void recalcData_graphedit(TransInfo *t)
 	
 	
 	/* initialize relevant anim-context 'context' data from TransInfo data */
-		/* NOTE: sync this with the code in ANIM_animdata_get_context() */
-	scene= ac.scene= t->scene;
-	ac.obact= OBACT;
-	ac.sa= t->sa;
-	ac.ar= t->ar;
-	ac.sl= (t->sa)? t->sa->spacedata.first : NULL;
-	ac.spacetype= (t->sa)? t->sa->spacetype : 0;
-	ac.regiontype= (t->ar)? t->ar->regiontype : 0;
+	/* NOTE: sync this with the code in ANIM_animdata_get_context() */
+	scene = ac.scene = t->scene;
+	ac.obact = OBACT;
+	ac.sa = t->sa;
+	ac.ar = t->ar;
+	ac.sl = (t->sa) ? t->sa->spacedata.first : NULL;
+	ac.spacetype = (t->sa) ? t->sa->spacetype : 0;
+	ac.regiontype = (t->ar) ? t->ar->regiontype : 0;
 	
 	ANIM_animdata_context_getdata(&ac);
 	
@@ -402,19 +403,19 @@ static void recalcData_graphedit(TransInfo *t)
 	flushTransGraphData(t);
 	
 	/* get curves to check if a re-sort is needed */
-	filter= (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVE_VISIBLE);
+	filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_FOREDIT | ANIMFILTER_CURVE_VISIBLE);
 	ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype);
 	
 	/* now test if there is a need to re-sort */
-	for (ale= anim_data.first; ale; ale= ale->next) {
-		FCurve *fcu= (FCurve *)ale->key_data;
+	for (ale = anim_data.first; ale; ale = ale->next) {
+		FCurve *fcu = (FCurve *)ale->key_data;
 		
 		/* ignore unselected fcurves */
 		if (!fcu_test_selected(fcu))
 			continue;
 		
 		// fixme: only do this for selected verts...
-		ANIM_unit_mapping_apply_fcurve(ac.scene, ale->id, ale->key_data, ANIM_UNITCONV_ONLYSEL|ANIM_UNITCONV_SELVERTS|ANIM_UNITCONV_RESTORE);
+		ANIM_unit_mapping_apply_fcurve(ac.scene, ale->id, ale->key_data, ANIM_UNITCONV_ONLYSEL | ANIM_UNITCONV_SELVERTS | ANIM_UNITCONV_RESTORE);
 		
 		
 		/* watch it: if the time is wrong: do not correct handles yet */
@@ -440,10 +441,10 @@ static void recalcData_graphedit(TransInfo *t)
 /* helper for recalcData() - for NLA Editor transforms */
 static void recalcData_nla(TransInfo *t)
 {
-	TransDataNla *tdn= (TransDataNla *)t->customData;
-	SpaceNla *snla= (SpaceNla *)t->sa->spacedata.first;
-	Scene *scene= t->scene;
-	double secf= FPS;
+	TransDataNla *tdn = (TransDataNla *)t->customData;
+	SpaceNla *snla = (SpaceNla *)t->sa->spacedata.first;
+	Scene *scene = t->scene;
+	double secf = FPS;
 	int i;
 	
 	/* for each strip we've got, perform some additional validation of the values that got set before
@@ -451,7 +452,7 @@ static void recalcData_nla(TransInfo *t)
 	 * sure that everything works ok)
 	 */
 	for (i = 0; i < t->total; i++, tdn++) {
-		NlaStrip *strip= tdn->strip;
+		NlaStrip *strip = tdn->strip;
 		PointerRNA strip_ptr;
 		short pExceeded, nExceeded, iter;
 		int delta_y1, delta_y2;
@@ -473,16 +474,16 @@ static void recalcData_nla(TransInfo *t)
 			 */
 			
 			/* start */
-			strip->start= tdn->h1[0];
+			strip->start = tdn->h1[0];
 			
 			if ((strip->prev) && (strip->prev->type == NLASTRIP_TYPE_TRANSITION))
-				strip->prev->end= tdn->h1[0];
+				strip->prev->end = tdn->h1[0];
 			
 			/* end */
-			strip->end= tdn->h2[0];
+			strip->end = tdn->h2[0];
 			
 			if ((strip->next) && (strip->next->type == NLASTRIP_TYPE_TRANSITION))
-				strip->next->start= tdn->h2[0];
+				strip->next->start = tdn->h2[0];
 			
 			/* flush transforms to child strips (since this should be a meta) */
 			BKE_nlameta_flush_transforms(strip);
@@ -502,9 +503,9 @@ static void recalcData_nla(TransInfo *t)
 		 *
 		 * this is done as a iterative procedure (done 5 times max for now)
 		 */
-		for (iter=0; iter < 5; iter++) {
-			pExceeded= ((strip->prev) && (strip->prev->type != NLASTRIP_TYPE_TRANSITION) && (tdn->h1[0] < strip->prev->end));
-			nExceeded= ((strip->next) && (strip->next->type != NLASTRIP_TYPE_TRANSITION) && (tdn->h2[0] > strip->next->start));
+		for (iter = 0; iter < 5; iter++) {
+			pExceeded = ((strip->prev) && (strip->prev->type != NLASTRIP_TYPE_TRANSITION) && (tdn->h1[0] < strip->prev->end));
+			nExceeded = ((strip->next) && (strip->next->type != NLASTRIP_TYPE_TRANSITION) && (tdn->h2[0] > strip->next->start));
 			
 			if ((pExceeded && nExceeded) || (iter == 4) ) {
 				/* both endpoints exceeded (or iteration ping-pong'd meaning that we need a compromise)
@@ -512,24 +513,24 @@ static void recalcData_nla(TransInfo *t)
 				 *	- if there were no neighbors, clear the transforms (make it default to the strip's current values)
 				 */
 				if (strip->prev && strip->next) {
-					tdn->h1[0]= strip->prev->end;
-					tdn->h2[0]= strip->next->start;
+					tdn->h1[0] = strip->prev->end;
+					tdn->h2[0] = strip->next->start;
 				}
 				else {
-					tdn->h1[0]= strip->start;
-					tdn->h2[0]= strip->end;
+					tdn->h1[0] = strip->start;
+					tdn->h2[0] = strip->end;
 				}
 			}
 			else if (nExceeded) {
 				/* move backwards */
-				float offset= tdn->h2[0] - strip->next->start;
+				float offset = tdn->h2[0] - strip->next->start;
 				
 				tdn->h1[0] -= offset;
 				tdn->h2[0] -= offset;
 			}
 			else if (pExceeded) {
 				/* more forwards */
-				float offset= strip->prev->end - tdn->h1[0];
+				float offset = strip->prev->end - tdn->h1[0];
 				
 				tdn->h1[0] += offset;
 				tdn->h2[0] += offset;
@@ -552,8 +553,8 @@ static void recalcData_nla(TransInfo *t)
 				break;
 			
 			case SACTSNAP_MARKER: /* snap to nearest marker */
-				tdn->h1[0]= (float)ED_markers_find_nearest_marker_time(&t->scene->markers, tdn->h1[0]);
-				tdn->h2[0]= (float)ED_markers_find_nearest_marker_time(&t->scene->markers, tdn->h2[0]);
+				tdn->h1[0] = (float)ED_markers_find_nearest_marker_time(&t->scene->markers, tdn->h1[0]);
+				tdn->h2[0] = (float)ED_markers_find_nearest_marker_time(&t->scene->markers, tdn->h2[0]);
 				break;
 		}
 		
@@ -571,8 +572,8 @@ static void recalcData_nla(TransInfo *t)
 		/* now, check if we need to try and move track
 		 *	- we need to calculate both, as only one may have been altered by transform if only 1 handle moved
 		 */
-		delta_y1= ((int)tdn->h1[1] / NLACHANNEL_STEP(snla) - tdn->trackIndex);
-		delta_y2= ((int)tdn->h2[1] / NLACHANNEL_STEP(snla) - tdn->trackIndex);
+		delta_y1 = ((int)tdn->h1[1] / NLACHANNEL_STEP(snla) - tdn->trackIndex);
+		delta_y2 = ((int)tdn->h2[1] / NLACHANNEL_STEP(snla) - tdn->trackIndex);
 		
 		if (delta_y1 || delta_y2) {
 			NlaTrack *track;
@@ -583,14 +584,14 @@ static void recalcData_nla(TransInfo *t)
 			 * stopping on the last track available or that we're able to fit in
 			 */
 			if (delta > 0) {
-				for (track=tdn->nlt->next, n=0; (track) && (n < delta); track=track->next, n++) {
+				for (track = tdn->nlt->next, n = 0; (track) && (n < delta); track = track->next, n++) {
 					/* check if space in this track for the strip */
 					if (BKE_nlatrack_has_space(track, strip->start, strip->end)) {
 						/* move strip to this track */
 						BLI_remlink(&tdn->nlt->strips, strip);
 						BKE_nlatrack_add_strip(track, strip);
 						
-						tdn->nlt= track;
+						tdn->nlt = track;
 						tdn->trackIndex++;
 					}
 					else /* can't move any further */
@@ -599,16 +600,16 @@ static void recalcData_nla(TransInfo *t)
 			}
 			else {
 				/* make delta 'positive' before using it, since we now know to go backwards */
-				delta= -delta;
+				delta = -delta;
 				
-				for (track=tdn->nlt->prev, n=0; (track) && (n < delta); track=track->prev, n++) {
+				for (track = tdn->nlt->prev, n = 0; (track) && (n < delta); track = track->prev, n++) {
 					/* check if space in this track for the strip */
 					if (BKE_nlatrack_has_space(track, strip->start, strip->end)) {
 						/* move strip to this track */
 						BLI_remlink(&tdn->nlt->strips, strip);
 						BKE_nlatrack_add_strip(track, strip);
 						
-						tdn->nlt= track;
+						tdn->nlt = track;
 						tdn->trackIndex--;
 					}
 					else /* can't move any further */
@@ -623,7 +624,7 @@ static void recalcData_nla(TransInfo *t)
 static void recalcData_image(TransInfo *t)
 {
 	if (t->obedit && t->obedit->type == OB_MESH) {
-		SpaceImage *sima= t->sa->spacedata.first;
+		SpaceImage *sima = t->sa->spacedata.first;
 		
 		flushTransUVs(t);
 		if (sima->flag & SI_LIVE_UNWRAP)
@@ -638,33 +639,49 @@ static void recalcData_spaceclip(TransInfo *t)
 {
 	SpaceClip *sc = t->sa->spacedata.first;
 
-	MovieClip *clip = ED_space_clip(sc);
-	ListBase *tracksbase = BKE_tracking_get_tracks(&clip->tracking);
-	MovieTrackingTrack *track;
+	if (ED_space_clip_show_trackedit(sc)) {
+		MovieClip *clip = ED_space_clip(sc);
+		ListBase *tracksbase = BKE_tracking_get_active_tracks(&clip->tracking);
+		MovieTrackingTrack *track;
+		int framenr = sc->user.framenr;
 
-	flushTransTracking(t);
+		flushTransTracking(t);
 
-	track = tracksbase->first;
-	while (track) {
-		if (TRACK_VIEW_SELECTED(sc, track) && (track->flag & TRACK_LOCKED)==0) {
-			if (t->mode == TFM_TRANSLATION) {
-				if (TRACK_AREA_SELECTED(track, TRACK_AREA_PAT))
-					BKE_tracking_clamp_track(track, CLAMP_PAT_POS);
-				if (TRACK_AREA_SELECTED(track, TRACK_AREA_SEARCH))
-					BKE_tracking_clamp_track(track, CLAMP_SEARCH_POS);
-			}
-			else if (t->mode == TFM_RESIZE) {
-				if (TRACK_AREA_SELECTED(track, TRACK_AREA_PAT))
-					BKE_tracking_clamp_track(track, CLAMP_PAT_DIM);
-				if (TRACK_AREA_SELECTED(track, TRACK_AREA_SEARCH))
-					BKE_tracking_clamp_track(track, CLAMP_SEARCH_DIM);
+		track = tracksbase->first;
+		while (track) {
+			if (TRACK_VIEW_SELECTED(sc, track) && (track->flag & TRACK_LOCKED) == 0) {
+				MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
+
+				if (t->mode == TFM_TRANSLATION) {
+					if (TRACK_AREA_SELECTED(track, TRACK_AREA_PAT))
+						BKE_tracking_marker_clamp(marker, CLAMP_PAT_POS);
+					if (TRACK_AREA_SELECTED(track, TRACK_AREA_SEARCH))
+						BKE_tracking_marker_clamp(marker, CLAMP_SEARCH_POS);
+				}
+				else if (t->mode == TFM_RESIZE) {
+					if (TRACK_AREA_SELECTED(track, TRACK_AREA_PAT))
+						BKE_tracking_marker_clamp(marker, CLAMP_PAT_DIM);
+					if (TRACK_AREA_SELECTED(track, TRACK_AREA_SEARCH))
+						BKE_tracking_marker_clamp(marker, CLAMP_SEARCH_DIM);
+				}
+				else if (t->mode == TFM_ROTATION) {
+					if (TRACK_AREA_SELECTED(track, TRACK_AREA_PAT))
+						BKE_tracking_marker_clamp(marker, CLAMP_PAT_POS);
+				}
 			}
+
+			track = track->next;
 		}
 
-		track = track->next;
+		DAG_id_tag_update(&clip->id, 0);
 	}
+	else if (ED_space_clip_show_maskedit(sc)) {
+		Mask *mask = ED_space_clip_mask(sc);
+
+		flushTransMasking(t);
 
-	DAG_id_tag_update(&clip->id, 0);
+		DAG_id_tag_update(&mask->id, 0);
+	}
 }
 
 /* helper for recalcData() - for 3d-view transforms */
@@ -674,9 +691,9 @@ static void recalcData_view3d(TransInfo *t)
 	
 	if (t->obedit) {
 		if (ELEM(t->obedit->type, OB_CURVE, OB_SURF)) {
-			Curve *cu= t->obedit->data;
-			ListBase *nurbs= BKE_curve_editNurbs_get(cu);
-			Nurb *nu= nurbs->first;
+			Curve *cu = t->obedit->data;
+			ListBase *nurbs = BKE_curve_editNurbs_get(cu);
+			Nurb *nu = nurbs->first;
 			
 			if (t->state != TRANS_CANCEL) {
 				clipMirrorModifier(t, t->obedit);
@@ -688,7 +705,7 @@ static void recalcData_view3d(TransInfo *t)
 			if (t->state == TRANS_CANCEL) {
 				while (nu) {
 					BKE_nurb_handles_calc(nu); /* Cant do testhandlesNurb here, it messes up the h1 and h2 flags */
-					nu= nu->next;
+					nu = nu->next;
 				}
 			} 
 			else {
@@ -696,12 +713,12 @@ static void recalcData_view3d(TransInfo *t)
 				while (nu) {
 					BKE_nurb_test2D(nu);
 					BKE_nurb_handles_calc(nu);
-					nu= nu->next;
+					nu = nu->next;
 				}
 			}
 		}
-		else if (t->obedit->type==OB_LATTICE) {
-			Lattice *la= t->obedit->data;
+		else if (t->obedit->type == OB_LATTICE) {
+			Lattice *la = t->obedit->data;
 			
 			if (t->state != TRANS_CANCEL) {
 				applyProject(t);
@@ -727,8 +744,8 @@ static void recalcData_view3d(TransInfo *t)
 			EDBM_mesh_normals_update(em);
 			BMEdit_RecalcTessellation(em);
 		}
-		else if (t->obedit->type==OB_ARMATURE) { /* no recalc flag, does pose */
-			bArmature *arm= t->obedit->data;
+		else if (t->obedit->type == OB_ARMATURE) { /* no recalc flag, does pose */
+			bArmature *arm = t->obedit->data;
 			ListBase *edbo = arm->edbo;
 			EditBone *ebo;
 			TransData *td = t->data;
@@ -744,33 +761,33 @@ static void recalcData_view3d(TransInfo *t)
 				if ((ebo->flag & BONE_CONNECTED) && ebo->parent) {
 					/* If this bone has a parent tip that has been moved */
 					if (ebo->parent->flag & BONE_TIPSEL) {
-						copy_v3_v3 (ebo->head, ebo->parent->tail);
-						if (t->mode==TFM_BONE_ENVELOPE) ebo->rad_head= ebo->parent->rad_tail;
+						copy_v3_v3(ebo->head, ebo->parent->tail);
+						if (t->mode == TFM_BONE_ENVELOPE) ebo->rad_head = ebo->parent->rad_tail;
 					}
 					/* If this bone has a parent tip that has NOT been moved */
 					else {
-						copy_v3_v3 (ebo->parent->tail, ebo->head);
-						if (t->mode==TFM_BONE_ENVELOPE) ebo->parent->rad_tail= ebo->rad_head;
+						copy_v3_v3(ebo->parent->tail, ebo->head);
+						if (t->mode == TFM_BONE_ENVELOPE) ebo->parent->rad_tail = ebo->rad_head;
 					}
 				}
 				
 				/* on extrude bones, oldlength==0.0f, so we scale radius of points */
-				ebo->length= len_v3v3(ebo->head, ebo->tail);
-				if (ebo->oldlength==0.0f) {
-					ebo->rad_head= 0.25f*ebo->length;
-					ebo->rad_tail= 0.10f*ebo->length;
-					ebo->dist= 0.25f*ebo->length;
+				ebo->length = len_v3v3(ebo->head, ebo->tail);
+				if (ebo->oldlength == 0.0f) {
+					ebo->rad_head = 0.25f * ebo->length;
+					ebo->rad_tail = 0.10f * ebo->length;
+					ebo->dist = 0.25f * ebo->length;
 					if (ebo->parent) {
 						if (ebo->rad_head > ebo->parent->rad_tail)
-							ebo->rad_head= ebo->parent->rad_tail;
+							ebo->rad_head = ebo->parent->rad_tail;
 					}
 				}
-				else if (t->mode!=TFM_BONE_ENVELOPE) {
+				else if (t->mode != TFM_BONE_ENVELOPE) {
 					/* if bones change length, lets do that for the deform distance as well */
-					ebo->dist*= ebo->length/ebo->oldlength;
-					ebo->rad_head*= ebo->length/ebo->oldlength;
-					ebo->rad_tail*= ebo->length/ebo->oldlength;
-					ebo->oldlength= ebo->length;
+					ebo->dist *= ebo->length / ebo->oldlength;
+					ebo->rad_head *= ebo->length / ebo->oldlength;
+					ebo->rad_tail *= ebo->length / ebo->oldlength;
+					ebo->oldlength = ebo->length;
 				}
 			}
 			
@@ -811,9 +828,9 @@ static void recalcData_view3d(TransInfo *t)
 			DAG_id_tag_update(t->obedit->data, 0);  /* sets recalc flags */
 		}
 	}
-	else if ( (t->flag & T_POSE) && t->poseobj) {
-		Object *ob= t->poseobj;
-		bArmature *arm= ob->data;
+	else if ((t->flag & T_POSE) && t->poseobj) {
+		Object *ob = t->poseobj;
+		bArmature *arm = ob->data;
 		
 		/* if animtimer is running, and the object already has animation data,
 		 * check if the auto-record feature means that we should record 'samples'
@@ -823,7 +840,7 @@ static void recalcData_view3d(TransInfo *t)
 		 */
 		// TODO: autokeyframe calls need some setting to specify to add samples (FPoints) instead of keyframes?
 		if ((t->animtimer) && (t->context) && IS_AUTOKEY_ON(t->scene)) {
-			int targetless_ik= (t->flag & T_AUTOIK); // XXX this currently doesn't work, since flags aren't set yet!
+			int targetless_ik = (t->flag & T_AUTOIK); // XXX this currently doesn't work, since flags aren't set yet!
 			
 			animrecord_check_state(t->scene, &ob->id, t->animtimer);
 			autokeyframe_pose_cb_func(t->context, t->scene, (View3D *)t->view, ob, t->mode, targetless_ik);
@@ -880,10 +897,10 @@ static void recalcData_view3d(TransInfo *t)
 /* called for updating while transform acts, once per redraw */
 void recalcData(TransInfo *t)
 {
-	if (t->spacetype==SPACE_NODE) {
+	if (t->spacetype == SPACE_NODE) {
 		flushTransNodes(t);
 	}
-	else if (t->spacetype==SPACE_SEQ) {
+	else if (t->spacetype == SPACE_SEQ) {
 		flushTransSeq(t);
 	}
 	else if (t->spacetype == SPACE_ACTION) {
@@ -936,8 +953,8 @@ void drawLine(TransInfo *t, float *center, float *dir, char axis, short options)
 		
 		setlinestyle(0);
 		glBegin(GL_LINE_STRIP);
-			glVertex3fv(v1);
-			glVertex3fv(v2);
+		glVertex3fv(v1);
+		glVertex3fv(v2);
 		glEnd();
 		
 		glPopMatrix();
@@ -994,20 +1011,20 @@ int initTransInfo(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
 	t->mval[0] = t->imval[0];
 	t->mval[1] = t->imval[1];
 	
-	t->transform		= NULL;
-	t->handleEvent		= NULL;
+	t->transform        = NULL;
+	t->handleEvent      = NULL;
 	
-	t->total			= 0;
+	t->total            = 0;
 	
 	t->val = 0.0f;
 	
-	t->vec[0]			=
-		t->vec[1]		=
-		t->vec[2]		= 0.0f;
-	
-	t->center[0]		=
-		t->center[1]	=
-		t->center[2]	= 0.0f;
+	t->vec[0]           =
+	    t->vec[1]       =
+	        t->vec[2]       = 0.0f;
+
+	t->center[0]        =
+	    t->center[1]    =
+	        t->center[2]    = 0.0f;
 	
 	unit_m3(t->mat);
 	
@@ -1025,15 +1042,15 @@ int initTransInfo(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
 	/* Assign the space type, some exceptions for running in different mode */
 	if (sa == NULL) {
 		/* background mode */
-		t->spacetype= SPACE_EMPTY;
+		t->spacetype = SPACE_EMPTY;
 	}
 	else if ((ar == NULL) && (sa->spacetype == SPACE_VIEW3D)) {
 		/* running in the text editor */
-		t->spacetype= SPACE_EMPTY;
+		t->spacetype = SPACE_EMPTY;
 	}
 	else {
 		/* normal operation */
-		t->spacetype= sa->spacetype;
+		t->spacetype = sa->spacetype;
 	}
 
 
@@ -1042,7 +1059,7 @@ int initTransInfo(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
 		bScreen *animscreen = ED_screen_animation_playing(CTX_wm_manager(C));
 		
 		t->view = v3d;
-		t->animtimer= (animscreen)? animscreen->animtimer: NULL;
+		t->animtimer = (animscreen) ? animscreen->animtimer : NULL;
 		
 		/* turn manipulator off during transform */
 		// FIXME: but don't do this when USING the manipulator...
@@ -1068,7 +1085,7 @@ int initTransInfo(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
 		}
 
 		/* exceptional case */
-		if (t->around==V3D_LOCAL && (t->settings->selectmode & SCE_SELECT_FACE)) {
+		if (t->around == V3D_LOCAL && (t->settings->selectmode & SCE_SELECT_FACE)) {
 			if (ELEM3(t->mode, TFM_ROTATION, TFM_RESIZE, TFM_TRACKBALL)) {
 				t->options |= CTX_NO_PET;
 			}
@@ -1090,22 +1107,32 @@ int initTransInfo(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
 		}
 
 	}
-	else if (t->spacetype==SPACE_IMAGE) {
+	else if (t->spacetype == SPACE_IMAGE) {
 		SpaceImage *sima = sa->spacedata.first;
 		// XXX for now, get View2D from the active region
 		t->view = &ar->v2d;
 		t->around = sima->around;
 	}
-	else if (t->spacetype==SPACE_NODE) {
+	else if (t->spacetype == SPACE_NODE) {
 		// XXX for now, get View2D from the active region
 		t->view = &ar->v2d;
 		t->around = V3D_CENTER;
 	}
-	else if (t->spacetype==SPACE_IPO) {
-		SpaceIpo *sipo= sa->spacedata.first;
+	else if (t->spacetype == SPACE_IPO) {
+		SpaceIpo *sipo = sa->spacedata.first;
 		t->view = &ar->v2d;
 		t->around = sipo->around;
 	}
+	else if (t->spacetype == SPACE_CLIP) {
+		SpaceClip *sclip = sa->spacedata.first;
+		t->view = &ar->v2d;
+		t->around = sclip->around;
+
+		if (ED_space_clip_show_trackedit(sclip))
+			t->options |= CTX_MOVIECLIP;
+		else if (ED_space_clip_show_maskedit(sclip))
+			t->options |= CTX_MASK;
+	}
 	else {
 		if (ar) {
 			// XXX for now, get View2D  from the active region
@@ -1113,7 +1140,7 @@ int initTransInfo(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
 			// XXX for now, the center point is the midpoint of the data
 		}
 		else {
-			t->view= NULL;
+			t->view = NULL;
 		}
 		t->around = V3D_CENTER;
 	}
@@ -1167,6 +1194,15 @@ int initTransInfo(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
 							t->flag |= T_PROP_CONNECTED;
 						}
 					}
+					else if (t->options & CTX_MASK) {
+						if (ts->proportional_mask) {
+							t->flag |= T_PROP_EDIT;
+
+							if (ts->proportional == PROP_EDIT_CONNECTED) {
+								t->flag |= T_PROP_CONNECTED;
+							}
+						}
+					}
 					else if (t->obedit == NULL && ts->proportional_objects) {
 						t->flag |= T_PROP_EDIT;
 					}
@@ -1241,7 +1277,7 @@ void postTrans(bContext *C, TransInfo *t)
 		int a;
 		
 		/* free data malloced per trans-data */
-		for (a=0, td= t->data; a<t->total; a++, td++) {
+		for (a = 0, td = t->data; a < t->total; a++, td++) {
 			if (td->flag & TD_BEZTRIPLE) 
 				MEM_freeN(td->hdata);
 		}
@@ -1253,15 +1289,15 @@ void postTrans(bContext *C, TransInfo *t)
 	if (t->ext) MEM_freeN(t->ext);
 	if (t->data2d) {
 		MEM_freeN(t->data2d);
-		t->data2d= NULL;
+		t->data2d = NULL;
 	}
 	
-	if (t->spacetype==SPACE_IMAGE) {
-		SpaceImage *sima= t->sa->spacedata.first;
+	if (t->spacetype == SPACE_IMAGE) {
+		SpaceImage *sima = t->sa->spacedata.first;
 		if (sima->flag & SI_LIVE_UNWRAP)
 			ED_uvedit_live_unwrap_end(t->state == TRANS_CANCEL);
 	}
-	else if (t->spacetype==SPACE_VIEW3D) {
+	else if (t->spacetype == SPACE_VIEW3D) {
 		View3D *v3d = t->sa->spacedata.first;
 		/* restore manipulator */
 		if (t->flag & T_MODAL) {
@@ -1300,12 +1336,12 @@ static void restoreElement(TransData *td)
 		*td->val = td->ival;
 	}
 
-	if (td->ext && (td->flag&TD_NO_EXT)==0) {
+	if (td->ext && (td->flag & TD_NO_EXT) == 0) {
 		if (td->ext->rot) {
 			copy_v3_v3(td->ext->rot, td->ext->irot);
 		}
 		if (td->ext->rotAngle) {
-			*td->ext->rotAngle= td->ext->irotAngle;
+			*td->ext->rotAngle = td->ext->irotAngle;
 		}
 		if (td->ext->rotAxis) {
 			copy_v3_v3(td->ext->rotAxis, td->ext->irotAxis);
@@ -1334,7 +1370,7 @@ void restoreTransObjects(TransInfo *t)
 		restoreElement(td);
 	}
 	
-	for (td2d=t->data2d; t->data2d && td2d < t->data2d + t->total; td2d++) {
+	for (td2d = t->data2d; t->data2d && td2d < t->data2d + t->total; td2d++) {
 		if (td2d->h1) {
 			td2d->h1[0] = td2d->ih1[0];
 			td2d->h1[1] = td2d->ih1[1];
@@ -1352,8 +1388,8 @@ void restoreTransObjects(TransInfo *t)
 
 void calculateCenter2D(TransInfo *t)
 {
-	if (t->flag & (T_EDIT|T_POSE)) {
-		Object *ob= t->obedit?t->obedit:t->poseobj;
+	if (t->flag & (T_EDIT | T_POSE)) {
+		Object *ob = t->obedit ? t->obedit : t->poseobj;
 		float vec[3];
 		
 		copy_v3_v3(vec, t->center);
@@ -1373,8 +1409,8 @@ void calculateCenterCursor(TransInfo *t)
 	copy_v3_v3(t->center, cursor);
 	
 	/* If edit or pose mode, move cursor in local space */
-	if (t->flag & (T_EDIT|T_POSE)) {
-		Object *ob = t->obedit?t->obedit:t->poseobj;
+	if (t->flag & (T_EDIT | T_POSE)) {
+		Object *ob = t->obedit ? t->obedit : t->poseobj;
 		float mat[3][3], imat[3][3];
 		
 		sub_v3_v3v3(t->center, t->center, ob->obmat[3]);
@@ -1388,11 +1424,11 @@ void calculateCenterCursor(TransInfo *t)
 
 void calculateCenterCursor2D(TransInfo *t)
 {
-	float aspx=1.0, aspy=1.0;
-	float *cursor= NULL;
+	float aspx = 1.0, aspy = 1.0;
+	float *cursor = NULL;
 	
-	if (t->spacetype==SPACE_IMAGE) {
-		SpaceImage *sima= (SpaceImage *)t->sa->spacedata.first;
+	if (t->spacetype == SPACE_IMAGE) {
+		SpaceImage *sima = (SpaceImage *)t->sa->spacedata.first;
 		/* only space supported right now but may change */
 		ED_space_image_uv_aspect(sima, &aspx, &aspy);
 		cursor = sima->cursor;
@@ -1408,12 +1444,12 @@ void calculateCenterCursor2D(TransInfo *t)
 
 static void calculateCenterCursorGraph2D(TransInfo *t)
 {
-	SpaceIpo *sipo= (SpaceIpo *)t->sa->spacedata.first;
-	Scene *scene= t->scene;
+	SpaceIpo *sipo = (SpaceIpo *)t->sa->spacedata.first;
+	Scene *scene = t->scene;
 	
 	/* cursor is combination of current frame, and graph-editor cursor value */
-	t->center[0]= (float)(scene->r.cfra);
-	t->center[1]= sipo->cursorVal;
+	t->center[0] = (float)(scene->r.cfra);
+	t->center[1] = sipo->cursorVal;
 	
 	calculateCenter2D(t);
 }
@@ -1479,95 +1515,95 @@ void calculateCenterBound(TransInfo *t)
 void calculateCenter(TransInfo *t)
 {
 	switch (t->around) {
-	case V3D_CENTER:
-		calculateCenterBound(t);
-		break;
-	case V3D_CENTROID:
-		calculateCenterMedian(t);
-		break;
-	case V3D_CURSOR:
-		if (t->spacetype==SPACE_IMAGE)
-			calculateCenterCursor2D(t);
-		else if (t->spacetype==SPACE_IPO)
-			calculateCenterCursorGraph2D(t);
-		else
-			calculateCenterCursor(t);
-		break;
-	case V3D_LOCAL:
-		/* Individual element center uses median center for helpline and such */
-		calculateCenterMedian(t);
-		break;
-	case V3D_ACTIVE:
+		case V3D_CENTER:
+			calculateCenterBound(t);
+			break;
+		case V3D_CENTROID:
+			calculateCenterMedian(t);
+			break;
+		case V3D_CURSOR:
+			if (t->spacetype == SPACE_IMAGE)
+				calculateCenterCursor2D(t);
+			else if (t->spacetype == SPACE_IPO)
+				calculateCenterCursorGraph2D(t);
+			else
+				calculateCenterCursor(t);
+			break;
+		case V3D_LOCAL:
+			/* Individual element center uses median center for helpline and such */
+			calculateCenterMedian(t);
+			break;
+		case V3D_ACTIVE:
 		{
-		/* set median, and if if if... do object center */
+			/* set median, and if if if... do object center */
 		
-		/* EDIT MODE ACTIVE EDITMODE ELEMENT */
+			/* EDIT MODE ACTIVE EDITMODE ELEMENT */
 
-		if (t->obedit) {
-			if (t->obedit && t->obedit->type == OB_MESH) {
-				BMEditSelection ese;
-				BMEditMesh *em = BMEdit_FromObject(t->obedit);
+			if (t->obedit) {
+				if (t->obedit && t->obedit->type == OB_MESH) {
+					BMEditSelection ese;
+					BMEditMesh *em = BMEdit_FromObject(t->obedit);
 
-				if (BM_select_history_active_get(em->bm, &ese)) {
-					BM_editselection_center(&ese, t->center);
-					calculateCenter2D(t);
-					break;
+					if (BM_select_history_active_get(em->bm, &ese)) {
+						BM_editselection_center(&ese, t->center);
+						calculateCenter2D(t);
+						break;
+					}
 				}
-			}
-			else if (ELEM(t->obedit->type, OB_CURVE, OB_SURF)) {
-				float center[3];
-				Curve *cu= (Curve *)t->obedit->data;
+				else if (ELEM(t->obedit->type, OB_CURVE, OB_SURF)) {
+					float center[3];
+					Curve *cu = (Curve *)t->obedit->data;
 
-				if (ED_curve_actSelection(cu, center)) {
-					copy_v3_v3(t->center, center);
-					calculateCenter2D(t);
-					break;
+					if (ED_curve_actSelection(cu, center)) {
+						copy_v3_v3(t->center, center);
+						calculateCenter2D(t);
+						break;
+					}
+				}
+			} /* END EDIT MODE ACTIVE ELEMENT */
+
+			calculateCenterMedian(t);
+			if ((t->flag & (T_EDIT | T_POSE)) == 0) {
+				Scene *scene = t->scene;
+				Object *ob = OBACT;
+				if (ob) {
+					copy_v3_v3(t->center, ob->obmat[3]);
+					projectIntView(t, t->center, t->center2d);
 				}
 			}
-		} /* END EDIT MODE ACTIVE ELEMENT */
-
-		calculateCenterMedian(t);
-		if ((t->flag & (T_EDIT|T_POSE))==0) {
-			Scene *scene = t->scene;
-			Object *ob= OBACT;
-			if (ob) {
-				copy_v3_v3(t->center, ob->obmat[3]);
-				projectIntView(t, t->center, t->center2d);
-			}
-		}
 		
 		}
 	}
 	
 	/* setting constraint center */
 	copy_v3_v3(t->con.center, t->center);
-	if (t->flag & (T_EDIT|T_POSE)) {
-		Object *ob= t->obedit?t->obedit:t->poseobj;
+	if (t->flag & (T_EDIT | T_POSE)) {
+		Object *ob = t->obedit ? t->obedit : t->poseobj;
 		mul_m4_v3(ob->obmat, t->con.center);
 	}
 	
 	/* for panning from cameraview */
 	if (t->flag & T_OBJECT) {
-		if (t->spacetype==SPACE_VIEW3D && t->ar && t->ar->regiontype == RGN_TYPE_WINDOW) {
+		if (t->spacetype == SPACE_VIEW3D && t->ar && t->ar->regiontype == RGN_TYPE_WINDOW) {
 			View3D *v3d = t->view;
 			Scene *scene = t->scene;
 			RegionView3D *rv3d = t->ar->regiondata;
 			
-			if (v3d->camera == OBACT && rv3d->persp==RV3D_CAMOB) {
+			if (v3d->camera == OBACT && rv3d->persp == RV3D_CAMOB) {
 				float axis[3];
 				/* persinv is nasty, use viewinv instead, always right */
 				copy_v3_v3(axis, t->viewinv[2]);
 				normalize_v3(axis);
 				
 				/* 6.0 = 6 grid units */
-				axis[0]= t->center[0]- 6.0f*axis[0];
-				axis[1]= t->center[1]- 6.0f*axis[1];
-				axis[2]= t->center[2]- 6.0f*axis[2];
+				axis[0] = t->center[0] - 6.0f * axis[0];
+				axis[1] = t->center[1] - 6.0f * axis[1];
+				axis[2] = t->center[2] - 6.0f * axis[2];
 				
 				projectIntView(t, axis, t->center2d);
 				
 				/* rotate only needs correct 2d center, grab needs initgrabz() value */
-				if (t->mode==TFM_TRANSLATION) {
+				if (t->mode == TFM_TRANSLATION) {
 					copy_v3_v3(t->center, axis);
 					copy_v3_v3(t->con.center, t->center);
 				}
@@ -1575,10 +1611,10 @@ void calculateCenter(TransInfo *t)
 		}
 	}
 	
-	if (t->spacetype==SPACE_VIEW3D) {
+	if (t->spacetype == SPACE_VIEW3D) {
 		/* initgrabz() defines a factor for perspective depth correction, used in window_to_3d_delta() */
-		if (t->flag & (T_EDIT|T_POSE)) {
-			Object *ob= t->obedit?t->obedit:t->poseobj;
+		if (t->flag & (T_EDIT | T_POSE)) {
+			Object *ob = t->obedit ? t->obedit : t->poseobj;
 			float vec[3];
 			
 			copy_v3_v3(vec, t->center);
@@ -1599,7 +1635,7 @@ void calculatePropRatio(TransInfo *t)
 	short connected = t->flag & T_PROP_CONNECTED;
 
 	if (t->flag & T_PROP_EDIT) {
-		for (i = 0 ; i < t->total; i++, td++) {
+		for (i = 0; i < t->total; i++, td++) {
 			if (td->flag & TD_SELECTED) {
 				td->factor = 1.0f;
 			}
@@ -1624,9 +1660,9 @@ void calculatePropRatio(TransInfo *t)
 				td->flag &= ~TD_NOACTION;
 				
 				if (connected)
-					dist= (t->prop_size-td->dist)/t->prop_size;
+					dist = (t->prop_size - td->dist) / t->prop_size;
 				else
-					dist= (t->prop_size-td->rdist)/t->prop_size;
+					dist = (t->prop_size - td->rdist) / t->prop_size;
 
 				/*
 				 * Clamp to positive numbers.
@@ -1637,63 +1673,63 @@ void calculatePropRatio(TransInfo *t)
 					dist = 0.0f;
 				
 				switch (t->prop_mode) {
-				case PROP_SHARP:
-					td->factor= dist*dist;
-					break;
-				case PROP_SMOOTH:
-					td->factor= 3.0f*dist*dist - 2.0f*dist*dist*dist;
-					break;
-				case PROP_ROOT:
-					td->factor = (float)sqrt(dist);
-					break;
-				case PROP_LIN:
-					td->factor = dist;
-					break;
-				case PROP_CONST:
-					td->factor = 1.0f;
-					break;
-				case PROP_SPHERE:
-					td->factor = (float)sqrt(2*dist - dist * dist);
-					break;
-				case PROP_RANDOM:
-					BLI_srand(BLI_rand()); /* random seed */
-					td->factor = BLI_frand()*dist;
-					break;
-				default:
-					td->factor = 1;
+					case PROP_SHARP:
+						td->factor = dist * dist;
+						break;
+					case PROP_SMOOTH:
+						td->factor = 3.0f * dist * dist - 2.0f * dist * dist * dist;
+						break;
+					case PROP_ROOT:
+						td->factor = (float)sqrt(dist);
+						break;
+					case PROP_LIN:
+						td->factor = dist;
+						break;
+					case PROP_CONST:
+						td->factor = 1.0f;
+						break;
+					case PROP_SPHERE:
+						td->factor = (float)sqrt(2 * dist - dist * dist);
+						break;
+					case PROP_RANDOM:
+						BLI_srand(BLI_rand()); /* random seed */
+						td->factor = BLI_frand() * dist;
+						break;
+					default:
+						td->factor = 1;
 				}
 			}
 		}
 		switch (t->prop_mode) {
-		case PROP_SHARP:
-			strcpy(t->proptext, "(Sharp)");
-			break;
-		case PROP_SMOOTH:
-			strcpy(t->proptext, "(Smooth)");
-			break;
-		case PROP_ROOT:
-			strcpy(t->proptext, "(Root)");
-			break;
-		case PROP_LIN:
-			strcpy(t->proptext, "(Linear)");
-			break;
-		case PROP_CONST:
-			strcpy(t->proptext, "(Constant)");
-			break;
-		case PROP_SPHERE:
-			strcpy(t->proptext, "(Sphere)");
-			break;
-		case PROP_RANDOM:
-			strcpy(t->proptext, "(Random)");
-			break;
-		default:
-			t->proptext[0]= '\0';
+			case PROP_SHARP:
+				strcpy(t->proptext, "(Sharp)");
+				break;
+			case PROP_SMOOTH:
+				strcpy(t->proptext, "(Smooth)");
+				break;
+			case PROP_ROOT:
+				strcpy(t->proptext, "(Root)");
+				break;
+			case PROP_LIN:
+				strcpy(t->proptext, "(Linear)");
+				break;
+			case PROP_CONST:
+				strcpy(t->proptext, "(Constant)");
+				break;
+			case PROP_SPHERE:
+				strcpy(t->proptext, "(Sphere)");
+				break;
+			case PROP_RANDOM:
+				strcpy(t->proptext, "(Random)");
+				break;
+			default:
+				t->proptext[0] = '\0';
 		}
 	}
 	else {
-		for (i = 0 ; i < t->total; i++, td++) {
+		for (i = 0; i < t->total; i++, td++) {
 			td->factor = 1.0;
 		}
-		t->proptext[0]= '\0';
+		t->proptext[0] = '\0';
 	}
 }
diff --git a/source/blender/editors/transform/transform_input.c b/source/blender/editors/transform/transform_input.c
index 9c485e17dc7..7e05fdae364 100644
--- a/source/blender/editors/transform/transform_input.c
+++ b/source/blender/editors/transform/transform_input.c
@@ -64,18 +64,18 @@ static void InputSpring(TransInfo *UNUSED(t), MouseInput *mi, const int mval[2],
 		/* calculate ratio for shiftkey pos, and for total, and blend these for precision */
 		dx = (float)(mi->center[0] - mi->precision_mval[0]);
 		dy = (float)(mi->center[1] - mi->precision_mval[1]);
-		ratio = (float)sqrt( dx*dx + dy*dy);
+		ratio = sqrtf(dx * dx + dy * dy);
 
-		dx= (float)(mi->center[0] - mval[0]);
-		dy= (float)(mi->center[1] - mval[1]);
-		precise_ratio = (float)sqrt( dx*dx + dy*dy);
+		dx = (float)(mi->center[0] - mval[0]);
+		dy = (float)(mi->center[1] - mval[1]);
+		precise_ratio = (float)sqrt(dx * dx + dy * dy);
 
 		ratio = (ratio + (precise_ratio - ratio) / 10.0f) / mi->factor;
 	}
 	else {
 		dx = (float)(mi->center[0] - mval[0]);
 		dy = (float)(mi->center[1] - mval[1]);
-		ratio = (float)sqrt( dx*dx + dy*dy) / mi->factor;
+		ratio = sqrtf(dx * dx + dy * dy) / mi->factor;
 	}
 
 	output[0] = ratio;
@@ -98,12 +98,12 @@ static void InputTrackBall(TransInfo *UNUSED(t), MouseInput *mi, const int mval[
 {
 
 	if (mi->precision) {
-		output[0] = ( mi->imval[1] - mi->precision_mval[1] ) + ( mi->precision_mval[1] - mval[1] ) * 0.1f;
-		output[1] = ( mi->precision_mval[0] - mi->imval[0] ) + ( mval[0] - mi->precision_mval[0] ) * 0.1f;
+		output[0] = (mi->imval[1] - mi->precision_mval[1]) + (mi->precision_mval[1] - mval[1]) * 0.1f;
+		output[1] = (mi->precision_mval[0] - mi->imval[0]) + (mval[0] - mi->precision_mval[0]) * 0.1f;
 	}
 	else {
-		output[0] = (float)( mi->imval[1] - mval[1] );
-		output[1] = (float)( mval[0] - mi->imval[0] );
+		output[0] = (float)(mi->imval[1] - mval[1]);
+		output[1] = (float)(mval[0] - mi->imval[0]);
 	}
 
 	output[0] *= mi->factor;
@@ -191,7 +191,7 @@ static void InputCustomRatio(TransInfo *UNUSED(t), MouseInput *mi, const int mva
 		dx = data[2] - data[0];
 		dy = data[3] - data[1];
 		
-		length = sqrt(dx*dx + dy*dy);
+		length = sqrt(dx * dx + dy * dy);
 		
 		if (mi->precision) {
 			/* deal with Shift key by adding motion / 10 to motion before shift press */
@@ -199,7 +199,7 @@ static void InputCustomRatio(TransInfo *UNUSED(t), MouseInput *mi, const int mva
 			mdx = (mi->precision_mval[0] + (float)(mval[0] - mi->precision_mval[0]) / 10.0f) - data[2];
 			mdy = (mi->precision_mval[1] + (float)(mval[1] - mi->precision_mval[1]) / 10.0f) - data[3];
 
-			distance = (length != 0.0) ? (mdx * dx + mdy * dy) / length: 0.0;
+			distance = (length != 0.0) ? (mdx * dx + mdy * dy) / length : 0.0;
 		}
 		else {
 			int mdx, mdy;
@@ -217,11 +217,11 @@ static void InputAngle(TransInfo *UNUSED(t), MouseInput *mi, const int mval[2],
 {
 	double dx2 = mval[0] - mi->center[0];
 	double dy2 = mval[1] - mi->center[1];
-	double B = sqrt(dx2*dx2+dy2*dy2);
+	double B = sqrt(dx2 * dx2 + dy2 * dy2);
 
 	double dx1 = mi->imval[0] - mi->center[0];
 	double dy1 = mi->imval[1] - mi->center[1];
-	double A = sqrt(dx1*dx1+dy1*dy1);
+	double A = sqrt(dx1 * dx1 + dy1 * dy1);
 
 	double dx3 = mval[0] - mi->imval[0];
 	double dy3 = mval[1] - mi->imval[1];
@@ -237,7 +237,7 @@ static void InputAngle(TransInfo *UNUSED(t), MouseInput *mi, const int mval[2],
 	float dphi;
 
 	dphi = saacos((float)deler);
-	if ( (dx1*dy2-dx2*dy1)>0.0 ) dphi= -dphi;
+	if ((dx1 * dy2 - dx2 * dy1) > 0.0) dphi = -dphi;
 
 	/* If the angle is zero, because of lack of precision close to the 1.0 value in acos
 	 * approximate the angle with the opposite side of the normalized triangle
@@ -256,12 +256,12 @@ static void InputAngle(TransInfo *UNUSED(t), MouseInput *mi, const int mval[2],
 		dx = dx1 - dx2;
 		dy = dy1 - dy2;
 
-		dphi = sqrt(dx*dx + dy*dy);
-		if ( (dx1*dy2-dx2*dy1)>0.0 ) dphi= -dphi;
+		dphi = sqrt(dx * dx + dy * dy);
+		if ((dx1 * dy2 - dx2 * dy1) > 0.0) dphi = -dphi;
 	}
 
 	if (mi->precision) {
-		dphi = dphi/30.0f;
+		dphi = dphi / 30.0f;
 	}
 
 	/* if no delta angle, don't update initial position */
@@ -295,7 +295,7 @@ static void calcSpringFactor(MouseInput *mi)
 	                   ((float)(mi->center[0] - mi->imval[0])) * ((float)(mi->center[0] - mi->imval[0])));
 
 	if (mi->factor == 0.0f) {
-		mi->factor= 1.0f; /* prevent Inf */
+		mi->factor = 1.0f; /* prevent Inf */
 	}
 }
 
@@ -307,68 +307,68 @@ void initMouseInputMode(TransInfo *t, MouseInput *mi, MouseInputMode mode)
 #if 0
 	if (mi->data) {
 		MEM_freeN(mi->data);
-		mi->data= NULL;
+		mi->data = NULL;
 	}
 #endif
 
 	switch (mode) {
-	case INPUT_VECTOR:
-		mi->apply = InputVector;
-		t->helpline = HLP_NONE;
-		break;
-	case INPUT_SPRING:
-		calcSpringFactor(mi);
-		mi->apply = InputSpring;
-		t->helpline = HLP_SPRING;
-		break;
-	case INPUT_SPRING_FLIP:
-		calcSpringFactor(mi);
-		mi->apply = InputSpringFlip;
-		t->helpline = HLP_SPRING;
-		break;
-	case INPUT_ANGLE:
-		mi->data = MEM_callocN(sizeof(double), "angle accumulator");
-		mi->apply = InputAngle;
-		t->helpline = HLP_ANGLE;
-		break;
-	case INPUT_TRACKBALL:
-		/* factor has to become setting or so */
-		mi->factor = 0.01f;
-		mi->apply = InputTrackBall;
-		t->helpline = HLP_TRACKBALL;
-		break;
-	case INPUT_HORIZONTAL_RATIO:
-		mi->factor = (float)(mi->center[0] - mi->imval[0]);
-		mi->apply = InputHorizontalRatio;
-		t->helpline = HLP_HARROW;
-		break;
-	case INPUT_HORIZONTAL_ABSOLUTE:
-		mi->apply = InputHorizontalAbsolute;
-		t->helpline = HLP_HARROW;
-		break;
-	case INPUT_VERTICAL_RATIO:
-		mi->apply = InputVerticalRatio;
-		t->helpline = HLP_VARROW;
-		break;
-	case INPUT_VERTICAL_ABSOLUTE:
-		mi->apply = InputVerticalAbsolute;
-		t->helpline = HLP_VARROW;
-		break;
-	case INPUT_CUSTOM_RATIO:
-		mi->apply = InputCustomRatio;
-		t->helpline = HLP_NONE;
-		break;
-	case INPUT_NONE:
-	default:
-		mi->apply = NULL;
-		break;
+		case INPUT_VECTOR:
+			mi->apply = InputVector;
+			t->helpline = HLP_NONE;
+			break;
+		case INPUT_SPRING:
+			calcSpringFactor(mi);
+			mi->apply = InputSpring;
+			t->helpline = HLP_SPRING;
+			break;
+		case INPUT_SPRING_FLIP:
+			calcSpringFactor(mi);
+			mi->apply = InputSpringFlip;
+			t->helpline = HLP_SPRING;
+			break;
+		case INPUT_ANGLE:
+			mi->data = MEM_callocN(sizeof(double), "angle accumulator");
+			mi->apply = InputAngle;
+			t->helpline = HLP_ANGLE;
+			break;
+		case INPUT_TRACKBALL:
+			/* factor has to become setting or so */
+			mi->factor = 0.01f;
+			mi->apply = InputTrackBall;
+			t->helpline = HLP_TRACKBALL;
+			break;
+		case INPUT_HORIZONTAL_RATIO:
+			mi->factor = (float)(mi->center[0] - mi->imval[0]);
+			mi->apply = InputHorizontalRatio;
+			t->helpline = HLP_HARROW;
+			break;
+		case INPUT_HORIZONTAL_ABSOLUTE:
+			mi->apply = InputHorizontalAbsolute;
+			t->helpline = HLP_HARROW;
+			break;
+		case INPUT_VERTICAL_RATIO:
+			mi->apply = InputVerticalRatio;
+			t->helpline = HLP_VARROW;
+			break;
+		case INPUT_VERTICAL_ABSOLUTE:
+			mi->apply = InputVerticalAbsolute;
+			t->helpline = HLP_VARROW;
+			break;
+		case INPUT_CUSTOM_RATIO:
+			mi->apply = InputCustomRatio;
+			t->helpline = HLP_NONE;
+			break;
+		case INPUT_NONE:
+		default:
+			mi->apply = NULL;
+			break;
 	}
 
 	/* bootstrap mouse input with initial values */
 	applyMouseInput(t, mi, mi->imval, t->values);
 }
 
-void setInputPostFct(MouseInput *mi, void	(*post)(struct TransInfo *, float [3]))
+void setInputPostFct(MouseInput *mi, void (*post)(struct TransInfo *, float[3]))
 {
 	mi->post = post;
 }
@@ -389,21 +389,21 @@ int handleMouseInput(TransInfo *t, MouseInput *mi, wmEvent *event)
 	int redraw = TREDRAW_NOTHING;
 
 	switch (event->type) {
-	case LEFTSHIFTKEY:
-	case RIGHTSHIFTKEY:
-		if (event->val == KM_PRESS) {
-			t->modifiers |= MOD_PRECISION;
-			/* shift is modifier for higher precision transform
-			 * store the mouse position where the normal movement ended */
-			copy_v2_v2_int(mi->precision_mval, event->mval);
-			mi->precision = 1;
-		}
-		else {
-			t->modifiers &= ~MOD_PRECISION;
-			mi->precision = 0;
-		}
-		redraw = TREDRAW_HARD;
-		break;
+		case LEFTSHIFTKEY:
+		case RIGHTSHIFTKEY:
+			if (event->val == KM_PRESS) {
+				t->modifiers |= MOD_PRECISION;
+				/* shift is modifier for higher precision transform
+				 * store the mouse position where the normal movement ended */
+				copy_v2_v2_int(mi->precision_mval, event->mval);
+				mi->precision = 1;
+			}
+			else {
+				t->modifiers &= ~MOD_PRECISION;
+				mi->precision = 0;
+			}
+			redraw = TREDRAW_HARD;
+			break;
 	}
 
 	return redraw;
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index 7d0e9dd6005..b3ccf004810 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -84,35 +84,35 @@
 
 /* return codes for select, and drawing flags */
 
-#define MAN_TRANS_X		1
-#define MAN_TRANS_Y		2
-#define MAN_TRANS_Z		4
-#define MAN_TRANS_C		7
-
-#define MAN_ROT_X		8
-#define MAN_ROT_Y		16
-#define MAN_ROT_Z		32
-#define MAN_ROT_V		64
-#define MAN_ROT_T		128
-#define MAN_ROT_C		248
-
-#define MAN_SCALE_X		256
-#define MAN_SCALE_Y		512
-#define MAN_SCALE_Z		1024
-#define MAN_SCALE_C		1792
+#define MAN_TRANS_X     1
+#define MAN_TRANS_Y     2
+#define MAN_TRANS_Z     4
+#define MAN_TRANS_C     7
+
+#define MAN_ROT_X       8
+#define MAN_ROT_Y       16
+#define MAN_ROT_Z       32
+#define MAN_ROT_V       64
+#define MAN_ROT_T       128
+#define MAN_ROT_C       248
+
+#define MAN_SCALE_X     256
+#define MAN_SCALE_Y     512
+#define MAN_SCALE_Z     1024
+#define MAN_SCALE_C     1792
 
 /* color codes */
 
-#define MAN_RGB		0
-#define MAN_GHOST	1
-#define MAN_MOVECOL	2
+#define MAN_RGB     0
+#define MAN_GHOST   1
+#define MAN_MOVECOL 2
 
 /* transform widget center calc helper for below */
-static void calc_tw_center(Scene *scene, float *co)
+static void calc_tw_center(Scene *scene, const float co[3])
 {
-	float *twcent= scene->twcent;
-	float *min= scene->twmin;
-	float *max= scene->twmax;
+	float *twcent = scene->twcent;
+	float *min = scene->twmin;
+	float *max = scene->twmax;
 
 	minmax_v3v3_v3(min, max, co);
 	add_v3_v3(twcent, co);
@@ -145,7 +145,7 @@ static void protectflag_to_drawflags(short protectflag, short *drawflags)
 /* for pose mode */
 static void stats_pose(Scene *scene, RegionView3D *rv3d, bPoseChannel *pchan)
 {
-	Bone *bone= pchan->bone;
+	Bone *bone = pchan->bone;
 
 	if (bone) {
 		if (bone->flag & BONE_TRANSFORM) {
@@ -159,7 +159,7 @@ static void stats_pose(Scene *scene, RegionView3D *rv3d, bPoseChannel *pchan)
 static void stats_editbone(RegionView3D *rv3d, EditBone *ebo)
 {
 	if (ebo->flag & BONE_EDITMODE_LOCKED)
-		protectflag_to_drawflags(OB_LOCK_LOC|OB_LOCK_ROT|OB_LOCK_SCALE, &rv3d->twdrawflag);
+		protectflag_to_drawflags(OB_LOCK_LOC | OB_LOCK_ROT | OB_LOCK_SCALE, &rv3d->twdrawflag);
 }
 
 /* could move into BLI_math however this is only useful for display/editing purposes */
@@ -172,9 +172,9 @@ static void axis_angle_to_gimbal_axis(float gmat[3][3], float axis[3], float ang
 
 	/* this is an un-scientific method to get a vector to cross with
 	 * XYZ intentionally YZX */
-	cross_vec[0]= axis[1];
-	cross_vec[1]= axis[2];
-	cross_vec[2]= axis[0];
+	cross_vec[0] = axis[1];
+	cross_vec[1] = axis[2];
+	cross_vec[2] = axis[0];
 
 	/* X-axis */
 	cross_v3_v3v3(gmat[0], cross_vec, axis);
@@ -183,7 +183,7 @@ static void axis_angle_to_gimbal_axis(float gmat[3][3], float axis[3], float ang
 	mul_qt_v3(quat, gmat[0]);
 
 	/* Y-axis */
-	axis_angle_to_quat(quat, axis, M_PI/2.0);
+	axis_angle_to_quat(quat, axis, M_PI / 2.0);
 	copy_v3_v3(gmat[1], gmat[0]);
 	mul_qt_v3(quat, gmat[1]);
 
@@ -196,14 +196,14 @@ static void axis_angle_to_gimbal_axis(float gmat[3][3], float axis[3], float ang
 
 static int test_rotmode_euler(short rotmode)
 {
-	return (ELEM(rotmode, ROT_MODE_AXISANGLE, ROT_MODE_QUAT)) ? 0:1;
+	return (ELEM(rotmode, ROT_MODE_AXISANGLE, ROT_MODE_QUAT)) ? 0 : 1;
 }
 
 int gimbal_axis(Object *ob, float gmat[][3])
 {
 	if (ob) {
 		if (ob->mode & OB_MODE_POSE) {
-			bPoseChannel *pchan= BKE_pose_channel_active(ob);
+			bPoseChannel *pchan = BKE_pose_channel_active(ob);
 
 			if (pchan) {
 				float mat[3][3], tmat[3][3], obmat[3][3];
@@ -270,40 +270,40 @@ int gimbal_axis(Object *ob, float gmat[][3])
 /* returns total items selected */
 int calc_manipulator_stats(const bContext *C)
 {
-	ScrArea *sa= CTX_wm_area(C);
-	ARegion *ar= CTX_wm_region(C);
-	Scene *scene= CTX_data_scene(C);
-	Object *obedit= CTX_data_edit_object(C);
+	ScrArea *sa = CTX_wm_area(C);
+	ARegion *ar = CTX_wm_region(C);
+	Scene *scene = CTX_data_scene(C);
+	Object *obedit = CTX_data_edit_object(C);
 	ToolSettings *ts = CTX_data_tool_settings(C);
-	View3D *v3d= sa->spacedata.first;
-	RegionView3D *rv3d= ar->regiondata;
+	View3D *v3d = sa->spacedata.first;
+	RegionView3D *rv3d = ar->regiondata;
 	Base *base;
-	Object *ob= OBACT;
-	int a, totsel= 0;
+	Object *ob = OBACT;
+	int a, totsel = 0;
 
 	/* transform widget matrix */
 	unit_m4(rv3d->twmat);
 
-	rv3d->twdrawflag= 0xFFFF;
+	rv3d->twdrawflag = 0xFFFF;
 
 	/* transform widget centroid/center */
 	INIT_MINMAX(scene->twmin, scene->twmax);
 	zero_v3(scene->twcent);
 
 	if (obedit) {
-		ob= obedit;
-		if ((ob->lay & v3d->lay)==0) return 0;
+		ob = obedit;
+		if ((ob->lay & v3d->lay) == 0) return 0;
 
-		if (obedit->type==OB_MESH) {
+		if (obedit->type == OB_MESH) {
 			BMEditMesh *em = BMEdit_FromObject(obedit);
 			BMEditSelection ese;
-			float vec[3]= {0, 0, 0};
+			float vec[3] = {0, 0, 0};
 
 			/* USE LAST SELECTE WITH ACTIVE */
 			if ((v3d->around == V3D_ACTIVE) && BM_select_history_active_get(em->bm, &ese)) {
 				BM_editselection_center(&ese, vec);
 				calc_tw_center(scene, vec);
-				totsel= 1;
+				totsel = 1;
 			}
 			else {
 				BMesh *bm = em->bm;
@@ -358,10 +358,10 @@ int calc_manipulator_stats(const bContext *C)
 				}
 			}
 		} /* end editmesh */
-		else if (obedit->type==OB_ARMATURE) {
-			bArmature *arm= obedit->data;
+		else if (obedit->type == OB_ARMATURE) {
+			bArmature *arm = obedit->data;
 			EditBone *ebo;
-			for (ebo= arm->edbo->first; ebo; ebo=ebo->next) {
+			for (ebo = arm->edbo->first; ebo; ebo = ebo->next) {
 				if (EBONE_VISIBLE(arm, ebo)) {
 					if (ebo->flag & BONE_TIPSEL) {
 						calc_tw_center(scene, ebo->tail);
@@ -378,24 +378,24 @@ int calc_manipulator_stats(const bContext *C)
 			}
 		}
 		else if (ELEM(obedit->type, OB_CURVE, OB_SURF)) {
-			Curve *cu= obedit->data;
+			Curve *cu = obedit->data;
 			float center[3];
 
-			if (v3d->around==V3D_ACTIVE && ED_curve_actSelection(cu, center)) {
-			calc_tw_center(scene, center);
+			if (v3d->around == V3D_ACTIVE && ED_curve_actSelection(cu, center)) {
+				calc_tw_center(scene, center);
 				totsel++;
 			}
 			else {
 				Nurb *nu;
 				BezTriple *bezt;
 				BPoint *bp;
-				ListBase *nurbs= BKE_curve_editNurbs_get(cu);
+				ListBase *nurbs = BKE_curve_editNurbs_get(cu);
 
-				nu= nurbs->first;
+				nu = nurbs->first;
 				while (nu) {
 					if (nu->type == CU_BEZIER) {
-						bezt= nu->bezt;
-						a= nu->pntsu;
+						bezt = nu->bezt;
+						a = nu->pntsu;
 						while (a--) {
 							/* exceptions
 							 * if handles are hidden then only check the center points.
@@ -425,8 +425,8 @@ int calc_manipulator_stats(const bContext *C)
 						}
 					}
 					else {
-						bp= nu->bp;
-						a= nu->pntsu*nu->pntsv;
+						bp = nu->bp;
+						a = nu->pntsu * nu->pntsv;
 						while (a--) {
 							if (bp->f1 & SELECT) {
 								calc_tw_center(scene, bp->vec);
@@ -435,31 +435,31 @@ int calc_manipulator_stats(const bContext *C)
 							bp++;
 						}
 					}
-					nu= nu->next;
+					nu = nu->next;
 				}
 			}
 		}
-		else if (obedit->type==OB_MBALL) {
-			MetaBall *mb = (MetaBall*)obedit->data;
+		else if (obedit->type == OB_MBALL) {
+			MetaBall *mb = (MetaBall *)obedit->data;
 			MetaElem *ml /* , *ml_sel=NULL */ /* UNUSED */;
 
-			ml= mb->editelems->first;
+			ml = mb->editelems->first;
 			while (ml) {
 				if (ml->flag & SELECT) {
 					calc_tw_center(scene, &ml->x);
 					/* ml_sel = ml; */ /* UNUSED */
 					totsel++;
 				}
-				ml= ml->next;
+				ml = ml->next;
 			}
 		}
-		else if (obedit->type==OB_LATTICE) {
+		else if (obedit->type == OB_LATTICE) {
 			BPoint *bp;
-			Lattice *lt= obedit->data;
+			Lattice *lt = obedit->data;
 
-			bp= lt->editlatt->latt->def;
+			bp = lt->editlatt->latt->def;
 
-			a= lt->editlatt->latt->pntsu*lt->editlatt->latt->pntsv*lt->editlatt->latt->pntsw;
+			a = lt->editlatt->latt->pntsu * lt->editlatt->latt->pntsv * lt->editlatt->latt->pntsw;
 			while (a--) {
 				if (bp->f1 & SELECT) {
 					calc_tw_center(scene, bp->vec);
@@ -471,7 +471,7 @@ int calc_manipulator_stats(const bContext *C)
 
 		/* selection center */
 		if (totsel) {
-			mul_v3_fl(scene->twcent, 1.0f/(float)totsel);	// centroid!
+			mul_v3_fl(scene->twcent, 1.0f / (float)totsel);   // centroid!
 			mul_m4_v3(obedit->obmat, scene->twcent);
 			mul_m4_v3(obedit->obmat, scene->twmin);
 			mul_m4_v3(obedit->obmat, scene->twmax);
@@ -481,17 +481,17 @@ int calc_manipulator_stats(const bContext *C)
 		bPoseChannel *pchan;
 		int mode = TFM_ROTATION; // mislead counting bones... bah. We don't know the manipulator mode, could be mixed
 
-		if ((ob->lay & v3d->lay)==0) return 0;
+		if ((ob->lay & v3d->lay) == 0) return 0;
 
 		totsel = count_set_pose_transflags(&mode, 0, ob);
 
 		if (totsel) {
 			/* use channels to get stats */
-			for (pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
+			for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
 				stats_pose(scene, rv3d, pchan);
 			}
 
-			mul_v3_fl(scene->twcent, 1.0f/(float)totsel);	// centroid!
+			mul_v3_fl(scene->twcent, 1.0f / (float)totsel);   // centroid!
 			mul_m4_v3(ob->obmat, scene->twcent);
 			mul_m4_v3(ob->obmat, scene->twmin);
 			mul_m4_v3(ob->obmat, scene->twmax);
@@ -501,17 +501,17 @@ int calc_manipulator_stats(const bContext *C)
 		;
 	}
 	else if (ob && ob->mode & OB_MODE_PARTICLE_EDIT) {
-		PTCacheEdit *edit= PE_get_current(scene, ob);
+		PTCacheEdit *edit = PE_get_current(scene, ob);
 		PTCacheEditPoint *point;
 		PTCacheEditKey *ek;
 		int k;
 
 		if (edit) {
 			point = edit->points;
-			for (a=0; a<edit->totpoint; a++, point++) {
+			for (a = 0; a < edit->totpoint; a++, point++) {
 				if (point->flag & PEP_HIDE) continue;
 
-				for (k=0, ek=point->keys; k<point->totkey; k++, ek++) {
+				for (k = 0, ek = point->keys; k < point->totkey; k++, ek++) {
 					if (ek->flag & PEK_SELECT) {
 						calc_tw_center(scene, ek->flag & PEK_USE_WCO ? ek->world_co : ek->co);
 						totsel++;
@@ -521,19 +521,19 @@ int calc_manipulator_stats(const bContext *C)
 
 			/* selection center */
 			if (totsel)
-				mul_v3_fl(scene->twcent, 1.0f/(float)totsel);	// centroid!
+				mul_v3_fl(scene->twcent, 1.0f / (float)totsel);  // centroid!
 		}
 	}
 	else {
 
 		/* we need the one selected object, if its not active */
-		ob= OBACT;
-		if (ob && !(ob->flag & SELECT)) ob= NULL;
+		ob = OBACT;
+		if (ob && !(ob->flag & SELECT)) ob = NULL;
 
-		for (base= scene->base.first; base; base= base->next) {
+		for (base = scene->base.first; base; base = base->next) {
 			if (TESTBASELIB(v3d, base)) {
-				if (ob==NULL)
-					ob= base->object;
+				if (ob == NULL)
+					ob = base->object;
 				calc_tw_center(scene, base->object->obmat[3]);
 				protectflag_to_drawflags(base->object->protectflag, &rv3d->twdrawflag);
 				totsel++;
@@ -542,7 +542,7 @@ int calc_manipulator_stats(const bContext *C)
 
 		/* selection center */
 		if (totsel) {
-			mul_v3_fl(scene->twcent, 1.0f/(float)totsel);	// centroid!
+			mul_v3_fl(scene->twcent, 1.0f / (float)totsel);   // centroid!
 		}
 	}
 
@@ -551,32 +551,32 @@ int calc_manipulator_stats(const bContext *C)
 
 		switch (v3d->twmode) {
 		
-		case V3D_MANIP_GLOBAL:
-			break; /* nothing to do */
+			case V3D_MANIP_GLOBAL:
+				break; /* nothing to do */
 
-		case V3D_MANIP_GIMBAL:
-		{
-			float mat[3][3];
-			if (gimbal_axis(ob, mat)) {
-				copy_m4_m3(rv3d->twmat, mat);
-				break;
-			}
-			/* if not gimbal, fall through to normal */
-		}
-		case V3D_MANIP_NORMAL:
-			if (obedit || ob->mode & OB_MODE_POSE) {
+			case V3D_MANIP_GIMBAL:
+			{
 				float mat[3][3];
-				ED_getTransformOrientationMatrix(C, mat, (v3d->around == V3D_ACTIVE));
-				copy_m4_m3(rv3d->twmat, mat);
-				break;
+				if (gimbal_axis(ob, mat)) {
+					copy_m4_m3(rv3d->twmat, mat);
+					break;
+				}
+				/* if not gimbal, fall through to normal */
 			}
+			case V3D_MANIP_NORMAL:
+				if (obedit || ob->mode & OB_MODE_POSE) {
+					float mat[3][3];
+					ED_getTransformOrientationMatrix(C, mat, (v3d->around == V3D_ACTIVE));
+					copy_m4_m3(rv3d->twmat, mat);
+					break;
+				}
 			/* no break we define 'normal' as 'local' in Object mode */
-		case V3D_MANIP_LOCAL:
-			copy_m4_m4(rv3d->twmat, ob->obmat);
-			normalize_m4(rv3d->twmat);
-			break;
+			case V3D_MANIP_LOCAL:
+				copy_m4_m4(rv3d->twmat, ob->obmat);
+				normalize_m4(rv3d->twmat);
+				break;
 
-		case V3D_MANIP_VIEW:
+			case V3D_MANIP_VIEW:
 			{
 				float mat[3][3];
 				copy_m3_m4(mat, rv3d->viewinv);
@@ -584,7 +584,7 @@ int calc_manipulator_stats(const bContext *C)
 				copy_m4_m3(rv3d->twmat, mat);
 			}
 			break;
-		default: /* V3D_MANIP_CUSTOM */
+			default: /* V3D_MANIP_CUSTOM */
 			{
 				float mat[3][3];
 				applyTransformOrientation(C, mat, NULL);
@@ -601,7 +601,7 @@ int calc_manipulator_stats(const bContext *C)
 /* don't draw axis perpendicular to the view */
 static void test_manipulator_axis(const bContext *C)
 {
-	RegionView3D *rv3d= CTX_wm_region_view3d(C);
+	RegionView3D *rv3d = CTX_wm_region_view3d(C);
 	float angle;
 	float vec[3];
 
@@ -613,7 +613,7 @@ static void test_manipulator_axis(const bContext *C)
 	}
 	angle = rv3d->twangle[0] = RAD2DEGF(angle);
 	if (angle < 5.0f) {
-		rv3d->twdrawflag &= ~(MAN_TRANS_X|MAN_SCALE_X);
+		rv3d->twdrawflag &= ~(MAN_TRANS_X | MAN_SCALE_X);
 	}
 
 	angle = fabs(angle_v3v3(rv3d->twmat[1], vec));
@@ -622,7 +622,7 @@ static void test_manipulator_axis(const bContext *C)
 	}
 	angle = rv3d->twangle[1] = RAD2DEGF(angle);
 	if (angle < 5.0f) {
-		rv3d->twdrawflag &= ~(MAN_TRANS_Y|MAN_SCALE_Y);
+		rv3d->twdrawflag &= ~(MAN_TRANS_Y | MAN_SCALE_Y);
 	}
 
 	angle = fabs(angle_v3v3(rv3d->twmat[2], vec));
@@ -631,7 +631,7 @@ static void test_manipulator_axis(const bContext *C)
 	}
 	angle = rv3d->twangle[2] = RAD2DEGF(angle);
 	if (angle < 5.0f) {
-		rv3d->twdrawflag &= ~(MAN_TRANS_Z|MAN_SCALE_Z);
+		rv3d->twdrawflag &= ~(MAN_TRANS_Z | MAN_SCALE_Z);
 	}
 }
 
@@ -643,7 +643,7 @@ static float screen_aligned(RegionView3D *rv3d, float mat[][4])
 	glTranslatef(mat[3][0], mat[3][1], mat[3][2]);
 
 	/* sets view screen aligned */
-	glRotatef(-360.0f*saacos(rv3d->viewquat[0])/(float)M_PI, rv3d->viewquat[1], rv3d->viewquat[2], rv3d->viewquat[3]);
+	glRotatef(-360.0f * saacos(rv3d->viewquat[0]) / (float)M_PI, rv3d->viewquat[1], rv3d->viewquat[2], rv3d->viewquat[3]);
 
 	return len_v3(mat[0]); /* draw scale */
 }
@@ -666,43 +666,43 @@ static void partial_doughnut(float radring, float radhole, int start, int end, i
 
 	if (start == 0 && end == nrings) do_caps = FALSE;
 
-	ring_delta= 2.0f*(float)M_PI/(float)nrings;
-	side_delta= 2.0f*(float)M_PI/(float)nsides;
+	ring_delta = 2.0f * (float)M_PI / (float)nrings;
+	side_delta = 2.0f * (float)M_PI / (float)nsides;
 
-	theta= (float)M_PI+0.5f*ring_delta;
-	cos_theta= (float)cos(theta);
-	sin_theta= (float)sin(theta);
+	theta = (float)M_PI + 0.5f * ring_delta;
+	cos_theta = (float)cos(theta);
+	sin_theta = (float)sin(theta);
 
-	for (i= nrings - 1; i >= 0; i--) {
-		theta1= theta + ring_delta;
-		cos_theta1= (float)cos(theta1);
-		sin_theta1= (float)sin(theta1);
+	for (i = nrings - 1; i >= 0; i--) {
+		theta1 = theta + ring_delta;
+		cos_theta1 = (float)cos(theta1);
+		sin_theta1 = (float)sin(theta1);
 
-		if (do_caps && i==start) {	// cap
+		if (do_caps && i == start) {  // cap
 			glBegin(GL_POLYGON);
-			phi= 0.0;
-			for (j= nsides; j >= 0; j--) {
+			phi = 0.0;
+			for (j = nsides; j >= 0; j--) {
 				float cos_phi, sin_phi, dist;
 
 				phi += side_delta;
-				cos_phi= (float)cos(phi);
-				sin_phi= (float)sin(phi);
-				dist= radhole + radring * cos_phi;
+				cos_phi = (float)cos(phi);
+				sin_phi = (float)sin(phi);
+				dist = radhole + radring * cos_phi;
 
 				glVertex3f(cos_theta1 * dist, -sin_theta1 * dist,  radring * sin_phi);
 			}
 			glEnd();
 		}
-		if (i>=start && i<=end) {
+		if (i >= start && i <= end) {
 			glBegin(GL_QUAD_STRIP);
-			phi= 0.0;
-			for (j= nsides; j >= 0; j--) {
+			phi = 0.0;
+			for (j = nsides; j >= 0; j--) {
 				float cos_phi, sin_phi, dist;
 
 				phi += side_delta;
-				cos_phi= (float)cos(phi);
-				sin_phi= (float)sin(phi);
-				dist= radhole + radring * cos_phi;
+				cos_phi = (float)cos(phi);
+				sin_phi = (float)sin(phi);
+				dist = radhole + radring * cos_phi;
 
 				glVertex3f(cos_theta1 * dist, -sin_theta1 * dist, radring * sin_phi);
 				glVertex3f(cos_theta * dist, -sin_theta * dist,  radring * sin_phi);
@@ -710,16 +710,16 @@ static void partial_doughnut(float radring, float radhole, int start, int end, i
 			glEnd();
 		}
 
-		if (do_caps && i==end) {	// cap
+		if (do_caps && i == end) {    // cap
 			glBegin(GL_POLYGON);
-			phi= 0.0;
-			for (j= nsides; j >= 0; j--) {
+			phi = 0.0;
+			for (j = nsides; j >= 0; j--) {
 				float cos_phi, sin_phi, dist;
 
 				phi -= side_delta;
-				cos_phi= (float)cos(phi);
-				sin_phi= (float)sin(phi);
-				dist= radhole + radring * cos_phi;
+				cos_phi = (float)cos(phi);
+				sin_phi = (float)sin(phi);
+				dist = radhole + radring * cos_phi;
 
 				glVertex3f(cos_theta * dist, -sin_theta * dist,  radring * sin_phi);
 			}
@@ -727,9 +727,9 @@ static void partial_doughnut(float radring, float radhole, int start, int end, i
 		}
 
 
-		theta= theta1;
-		cos_theta= cos_theta1;
-		sin_theta= sin_theta1;
+		theta = theta1;
+		cos_theta = cos_theta1;
+		sin_theta = sin_theta1;
 	}
 }
 
@@ -751,43 +751,43 @@ static char axisBlendAngle(float angle)
  */
 static void manipulator_setcolor(View3D *v3d, char axis, int colcode, unsigned char alpha)
 {
-	unsigned char col[4]= {0};
-	col[3]= alpha;
+	unsigned char col[4] = {0};
+	col[3] = alpha;
 
-	if (colcode==MAN_GHOST) {
-		col[3]= 70;
+	if (colcode == MAN_GHOST) {
+		col[3] = 70;
 	}
-	else if (colcode==MAN_MOVECOL) {
+	else if (colcode == MAN_MOVECOL) {
 		UI_GetThemeColor3ubv(TH_TRANSFORM, col);
 	}
 	else {
 		switch (axis) {
-		case 'C':
-			UI_GetThemeColor3ubv(TH_TRANSFORM, col);
-			if (v3d->twmode == V3D_MANIP_LOCAL) {
-				col[0]= col[0]>200?255:col[0]+55;
-				col[1]= col[1]>200?255:col[1]+55;
-				col[2]= col[2]>200?255:col[2]+55;
-			}
-			else if (v3d->twmode == V3D_MANIP_NORMAL) {
-				col[0]= col[0]<55?0:col[0]-55;
-				col[1]= col[1]<55?0:col[1]-55;
-				col[2]= col[2]<55?0:col[2]-55;
-			}
-			break;
-		case 'X':
-			col[0]= 220;
-			break;
-		case 'Y':
-			col[1]= 220;
-			break;
-		case 'Z':
-			col[0]= 30;
-			col[1]= 30;
-			col[2]= 220;
-			break;
-		default:
-			BLI_assert(!"invalid axis arg");
+			case 'C':
+				UI_GetThemeColor3ubv(TH_TRANSFORM, col);
+				if (v3d->twmode == V3D_MANIP_LOCAL) {
+					col[0] = col[0] > 200 ? 255 : col[0] + 55;
+					col[1] = col[1] > 200 ? 255 : col[1] + 55;
+					col[2] = col[2] > 200 ? 255 : col[2] + 55;
+				}
+				else if (v3d->twmode == V3D_MANIP_NORMAL) {
+					col[0] = col[0] < 55 ? 0 : col[0] - 55;
+					col[1] = col[1] < 55 ? 0 : col[1] - 55;
+					col[2] = col[2] < 55 ? 0 : col[2] - 55;
+				}
+				break;
+			case 'X':
+				col[0] = 220;
+				break;
+			case 'Y':
+				col[1] = 220;
+				break;
+			case 'Z':
+				col[0] = 30;
+				col[1] = 30;
+				col[2] = 220;
+				break;
+			default:
+				BLI_assert(!"invalid axis arg");
 		}
 	}
 
@@ -836,7 +836,7 @@ static void preOrthoFront(int ortho, float twmat[][4], int axis)
 		orthogonalize_m4(omat, axis);
 		glPushMatrix();
 		glMultMatrixf(omat);
-		glFrontFace(is_negative_m4(omat) ? GL_CW:GL_CCW);
+		glFrontFace(is_negative_m4(omat) ? GL_CW : GL_CCW);
 	}
 }
 
@@ -853,42 +853,42 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 	double plane[4];
 	float matt[4][4];
 	float size, unitmat[4][4];
-	float cywid= 0.33f*0.01f*(float)U.tw_handlesize;
-	float cusize= cywid*0.65f;
-	int arcs= (G.rt!=2);
+	float cywid = 0.33f * 0.01f * (float)U.tw_handlesize;
+	float cusize = cywid * 0.65f;
+	int arcs = (G.rt != 2);
 	int colcode;
 	int ortho;
 
-	if (moving) colcode= MAN_MOVECOL;
-	else colcode= MAN_RGB;
+	if (moving) colcode = MAN_MOVECOL;
+	else colcode = MAN_RGB;
 
 	/* when called while moving in mixed mode, do not draw when... */
-	if ((drawflags & MAN_ROT_C)==0) return;
+	if ((drawflags & MAN_ROT_C) == 0) return;
 
 	/* Init stuff */
 	glDisable(GL_DEPTH_TEST);
 	unit_m4(unitmat);
 
-	qobj= gluNewQuadric();
+	qobj = gluNewQuadric();
 	gluQuadricDrawStyle(qobj, GLU_FILL);
 
 	/* prepare for screen aligned draw */
-	size= len_v3(rv3d->twmat[0]);
+	size = len_v3(rv3d->twmat[0]);
 	glPushMatrix();
 	glTranslatef(rv3d->twmat[3][0], rv3d->twmat[3][1], rv3d->twmat[3][2]);
 
 	if (arcs) {
 		/* clipplane makes nice handles, calc here because of multmatrix but with translate! */
 		copy_v3db_v3fl(plane, rv3d->viewinv[2]);
-		plane[3]= -0.02f*size; // clip just a bit more
+		plane[3] = -0.02f * size; // clip just a bit more
 		glClipPlane(GL_CLIP_PLANE0, plane);
 	}
 	/* sets view screen aligned */
-	glRotatef(-360.0f*saacos(rv3d->viewquat[0])/(float)M_PI, rv3d->viewquat[1], rv3d->viewquat[2], rv3d->viewquat[3]);
+	glRotatef(-360.0f * saacos(rv3d->viewquat[0]) / (float)M_PI, rv3d->viewquat[1], rv3d->viewquat[2], rv3d->viewquat[3]);
 
 	/* Screen aligned help circle */
 	if (arcs) {
-		if ((G.f & G_PICKSEL)==0) {
+		if ((G.f & G_PICKSEL) == 0) {
 			UI_ThemeColorShade(TH_BACK, -30);
 			drawcircball(GL_LINE_LOOP, unitmat[3], size, unitmat);
 		}
@@ -899,22 +899,22 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 		if (G.f & G_PICKSEL) glLoadName(MAN_ROT_T);
 
 		UI_ThemeColor(TH_TRANSFORM);
-		drawcircball(GL_LINE_LOOP, unitmat[3], 0.2f*size, unitmat);
+		drawcircball(GL_LINE_LOOP, unitmat[3], 0.2f * size, unitmat);
 	}
 
 	/* Screen aligned view rot circle */
 	if (drawflags & MAN_ROT_V) {
 		if (G.f & G_PICKSEL) glLoadName(MAN_ROT_V);
 		UI_ThemeColor(TH_TRANSFORM);
-		drawcircball(GL_LINE_LOOP, unitmat[3], 1.2f*size, unitmat);
+		drawcircball(GL_LINE_LOOP, unitmat[3], 1.2f * size, unitmat);
 
 		if (moving) {
 			float vec[3];
-			vec[0]= 0; // XXX (float)(t->imval[0] - t->center2d[0]);
-			vec[1]= 0; // XXX (float)(t->imval[1] - t->center2d[1]);
-			vec[2]= 0.0f;
+			vec[0] = 0; // XXX (float)(t->imval[0] - t->center2d[0]);
+			vec[1] = 0; // XXX (float)(t->imval[1] - t->center2d[1]);
+			vec[2] = 0.0f;
 			normalize_v3(vec);
-			mul_v3_fl(vec, 1.2f*size);
+			mul_v3_fl(vec, 1.2f * size);
 			glBegin(GL_LINES);
 			glVertex3f(0.0f, 0.0f, 0.0f);
 			glVertex3fv(vec);
@@ -932,22 +932,22 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 		// XXX mul_m4_m3m4(matt, t->mat, rv3d->twmat);
 		if (ortho) {
 			glMultMatrixf(matt);
-			glFrontFace(is_negative_m4(matt) ? GL_CW:GL_CCW);
+			glFrontFace(is_negative_m4(matt) ? GL_CW : GL_CCW);
 		}
 	}
 	else {
 		if (ortho) {
-			glFrontFace(is_negative_m4(rv3d->twmat) ? GL_CW:GL_CCW);
+			glFrontFace(is_negative_m4(rv3d->twmat) ? GL_CW : GL_CCW);
 			glMultMatrixf(rv3d->twmat);
 		}
 	}
 
 	/* axes */
-	if (arcs==0) {
+	if (arcs == 0) {
 		if (!(G.f & G_PICKSEL)) {
-			if ( (combo & V3D_MANIP_SCALE)==0) {
+			if ((combo & V3D_MANIP_SCALE) == 0) {
 				/* axis */
-				if ( (drawflags & MAN_ROT_X) || (moving && (drawflags & MAN_ROT_Z)) ) {
+				if ((drawflags & MAN_ROT_X) || (moving && (drawflags & MAN_ROT_Z))) {
 					preOrthoFront(ortho, rv3d->twmat, 2);
 					manipulator_setcolor(v3d, 'X', colcode, 255);
 					glBegin(GL_LINES);
@@ -956,7 +956,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 					glEnd();
 					postOrtho(ortho);
 				}
-				if ( (drawflags & MAN_ROT_Y) || (moving && (drawflags & MAN_ROT_X)) ) {
+				if ((drawflags & MAN_ROT_Y) || (moving && (drawflags & MAN_ROT_X))) {
 					preOrthoFront(ortho, rv3d->twmat, 0);
 					manipulator_setcolor(v3d, 'Y', colcode, 255);
 					glBegin(GL_LINES);
@@ -965,7 +965,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 					glEnd();
 					postOrtho(ortho);
 				}
-				if ( (drawflags & MAN_ROT_Z) || (moving && (drawflags & MAN_ROT_Y)) ) {
+				if ((drawflags & MAN_ROT_Z) || (moving && (drawflags & MAN_ROT_Y))) {
 					preOrthoFront(ortho, rv3d->twmat, 1);
 					manipulator_setcolor(v3d, 'Z', colcode, 255);
 					glBegin(GL_LINES);
@@ -978,7 +978,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 		}
 	}
 
-	if (arcs==0 && moving) {
+	if (arcs == 0 && moving) {
 
 		/* Z circle */
 		if (drawflags & MAN_ROT_Z) {
@@ -1020,7 +1020,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 			preOrthoFront(ortho, rv3d->twmat, 2);
 			if (G.f & G_PICKSEL) glLoadName(MAN_ROT_Z);
 			manipulator_setcolor(v3d, 'Z', colcode, 255);
-			partial_doughnut(cusize/4.0f, 1.0f, 0, 48, 8, 48);
+			partial_doughnut(cusize / 4.0f, 1.0f, 0, 48, 8, 48);
 			postOrtho(ortho);
 		}
 		/* X circle */
@@ -1029,7 +1029,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 			if (G.f & G_PICKSEL) glLoadName(MAN_ROT_X);
 			glRotatef(90.0, 0.0, 1.0, 0.0);
 			manipulator_setcolor(v3d, 'X', colcode, 255);
-			partial_doughnut(cusize/4.0f, 1.0f, 0, 48, 8, 48);
+			partial_doughnut(cusize / 4.0f, 1.0f, 0, 48, 8, 48);
 			glRotatef(-90.0, 0.0, 1.0, 0.0);
 			postOrtho(ortho);
 		}
@@ -1039,7 +1039,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 			if (G.f & G_PICKSEL) glLoadName(MAN_ROT_Y);
 			glRotatef(-90.0, 1.0, 0.0, 0.0);
 			manipulator_setcolor(v3d, 'Y', colcode, 255);
-			partial_doughnut(cusize/4.0f, 1.0f, 0, 48, 8, 48);
+			partial_doughnut(cusize / 4.0f, 1.0f, 0, 48, 8, 48);
 			glRotatef(90.0, 1.0, 0.0, 0.0);
 			postOrtho(ortho);
 		}
@@ -1047,7 +1047,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 		glDisable(GL_CLIP_PLANE0);
 	}
 
-	if (arcs==0) {
+	if (arcs == 0) {
 
 		/* Z handle on X axis */
 		if (drawflags & MAN_ROT_Z) {
@@ -1056,7 +1056,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 			if (G.f & G_PICKSEL) glLoadName(MAN_ROT_Z);
 			manipulator_setcolor(v3d, 'Z', colcode, 255);
 
-			partial_doughnut(0.7f*cusize, 1.0f, 31, 33, 8, 64);
+			partial_doughnut(0.7f * cusize, 1.0f, 31, 33, 8, 64);
 
 			glPopMatrix();
 			postOrtho(ortho);
@@ -1071,7 +1071,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 
 			glRotatef(90.0, 1.0, 0.0, 0.0);
 			glRotatef(90.0, 0.0, 0.0, 1.0);
-			partial_doughnut(0.7f*cusize, 1.0f, 31, 33, 8, 64);
+			partial_doughnut(0.7f * cusize, 1.0f, 31, 33, 8, 64);
 
 			glPopMatrix();
 			postOrtho(ortho);
@@ -1086,7 +1086,7 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 
 			glRotatef(-90.0, 0.0, 1.0, 0.0);
 			glRotatef(90.0, 0.0, 0.0, 1.0);
-			partial_doughnut(0.7f*cusize, 1.0f, 31, 33, 8, 64);
+			partial_doughnut(0.7f * cusize, 1.0f, 31, 33, 8, 64);
 
 			glPopMatrix();
 			postOrtho(ortho);
@@ -1104,56 +1104,57 @@ static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving,
 static void drawsolidcube(float size)
 {
 	static float cube[8][3] = {
-	    {-1.0, -1.0, -1.0},
-	    {-1.0, -1.0,  1.0},
-	    {-1.0,  1.0,  1.0},
-	    {-1.0,  1.0, -1.0},
-	    { 1.0, -1.0, -1.0},
-	    { 1.0, -1.0,  1.0},
-	    { 1.0,  1.0,  1.0},
-	    { 1.0,  1.0, -1.0}, };
+		{-1.0, -1.0, -1.0},
+		{-1.0, -1.0,  1.0},
+		{-1.0,  1.0,  1.0},
+		{-1.0,  1.0, -1.0},
+		{ 1.0, -1.0, -1.0},
+		{ 1.0, -1.0,  1.0},
+		{ 1.0,  1.0,  1.0},
+		{ 1.0,  1.0, -1.0},
+	};
 	float n[3] = {0.0f};
 
 	glPushMatrix();
 	glScalef(size, size, size);
 
 	glBegin(GL_QUADS);
-	n[0]= -1.0;
+	n[0] = -1.0;
 	glNormal3fv(n);
 	glVertex3fv(cube[0]); glVertex3fv(cube[1]); glVertex3fv(cube[2]); glVertex3fv(cube[3]);
-	n[0]=0;
+	n[0] = 0;
 	glEnd();
 
 	glBegin(GL_QUADS);
-	n[1]= -1.0;
+	n[1] = -1.0;
 	glNormal3fv(n);
 	glVertex3fv(cube[0]); glVertex3fv(cube[4]); glVertex3fv(cube[5]); glVertex3fv(cube[1]);
-	n[1]=0;
+	n[1] = 0;
 	glEnd();
 
 	glBegin(GL_QUADS);
-	n[0]= 1.0;
+	n[0] = 1.0;
 	glNormal3fv(n);
 	glVertex3fv(cube[4]); glVertex3fv(cube[7]); glVertex3fv(cube[6]); glVertex3fv(cube[5]);
-	n[0]=0;
+	n[0] = 0;
 	glEnd();
 
 	glBegin(GL_QUADS);
-	n[1]= 1.0;
+	n[1] = 1.0;
 	glNormal3fv(n);
 	glVertex3fv(cube[7]); glVertex3fv(cube[3]); glVertex3fv(cube[2]); glVertex3fv(cube[6]);
-	n[1]=0;
+	n[1] = 0;
 	glEnd();
 
 	glBegin(GL_QUADS);
-	n[2]= 1.0;
+	n[2] = 1.0;
 	glNormal3fv(n);
 	glVertex3fv(cube[1]); glVertex3fv(cube[5]); glVertex3fv(cube[6]); glVertex3fv(cube[2]);
-	n[2]=0;
+	n[2] = 0;
 	glEnd();
 
 	glBegin(GL_QUADS);
-	n[2]= -1.0;
+	n[2] = -1.0;
 	glNormal3fv(n);
 	glVertex3fv(cube[7]); glVertex3fv(cube[4]); glVertex3fv(cube[0]); glVertex3fv(cube[3]);
 	glEnd();
@@ -1164,32 +1165,32 @@ static void drawsolidcube(float size)
 
 static void draw_manipulator_scale(View3D *v3d, RegionView3D *rv3d, int moving, int drawflags, int combo, int colcode)
 {
-	float cywid= 0.25f*0.01f*(float)U.tw_handlesize;
-	float cusize= cywid*0.75f, dz;
+	float cywid = 0.25f * 0.01f * (float)U.tw_handlesize;
+	float cusize = cywid * 0.75f, dz;
 
 	/* when called while moving in mixed mode, do not draw when... */
-	if ((drawflags & MAN_SCALE_C)==0) return;
+	if ((drawflags & MAN_SCALE_C) == 0) return;
 
 	glDisable(GL_DEPTH_TEST);
 
 	/* not in combo mode */
-	if ( (combo & (V3D_MANIP_TRANSLATE|V3D_MANIP_ROTATE))==0) {
+	if ((combo & (V3D_MANIP_TRANSLATE | V3D_MANIP_ROTATE)) == 0) {
 		float size, unitmat[4][4];
-		int shift= 0; // XXX
+		int shift = 0; // XXX
 
 		/* center circle, do not add to selection when shift is pressed (planar constraint)  */
-		if ( (G.f & G_PICKSEL) && shift==0) glLoadName(MAN_SCALE_C);
+		if ((G.f & G_PICKSEL) && shift == 0) glLoadName(MAN_SCALE_C);
 
 		manipulator_setcolor(v3d, 'C', colcode, 255);
 		glPushMatrix();
-		size= screen_aligned(rv3d, rv3d->twmat);
+		size = screen_aligned(rv3d, rv3d->twmat);
 		unit_m4(unitmat);
-		drawcircball(GL_LINE_LOOP, unitmat[3], 0.2f*size, unitmat);
+		drawcircball(GL_LINE_LOOP, unitmat[3], 0.2f * size, unitmat);
 		glPopMatrix();
 
-		dz= 1.0;
+		dz = 1.0;
 	}
-	else dz= 1.0f-4.0f*cusize;
+	else dz = 1.0f - 4.0f * cusize;
 
 	if (moving) {
 		float matt[4][4];
@@ -1197,11 +1198,11 @@ static void draw_manipulator_scale(View3D *v3d, RegionView3D *rv3d, int moving,
 		copy_m4_m4(matt, rv3d->twmat); // to copy the parts outside of [3][3]
 		// XXX mul_m4_m3m4(matt, t->mat, rv3d->twmat);
 		glMultMatrixf(matt);
-		glFrontFace(is_negative_m4(matt) ? GL_CW:GL_CCW);
+		glFrontFace(is_negative_m4(matt) ? GL_CW : GL_CCW);
 	}
 	else {
 		glMultMatrixf(rv3d->twmat);
-		glFrontFace(is_negative_m4(rv3d->twmat) ? GL_CW:GL_CCW);
+		glFrontFace(is_negative_m4(rv3d->twmat) ? GL_CW : GL_CCW);
 	}
 
 	/* axis */
@@ -1233,7 +1234,7 @@ static void draw_manipulator_scale(View3D *v3d, RegionView3D *rv3d, int moving,
 
 	/* if shiftkey, center point as last, for selectbuffer order */
 	if (G.f & G_PICKSEL) {
-		int shift= 0; // XXX
+		int shift = 0; // XXX
 
 		if (shift) {
 			glTranslatef(0.0, -dz, 0.0);
@@ -1254,55 +1255,55 @@ static void draw_manipulator_scale(View3D *v3d, RegionView3D *rv3d, int moving,
 
 static void draw_cone(GLUquadricObj *qobj, float len, float width)
 {
-	glTranslatef(0.0, 0.0, -0.5f*len);
+	glTranslatef(0.0, 0.0, -0.5f * len);
 	gluCylinder(qobj, width, 0.0, len, 8, 1);
 	gluQuadricOrientation(qobj, GLU_INSIDE);
 	gluDisk(qobj, 0.0, width, 8, 1);
 	gluQuadricOrientation(qobj, GLU_OUTSIDE);
-	glTranslatef(0.0, 0.0, 0.5f*len);
+	glTranslatef(0.0, 0.0, 0.5f * len);
 }
 
 static void draw_cylinder(GLUquadricObj *qobj, float len, float width)
 {
 
-	width*= 0.8f;	// just for beauty
+	width *= 0.8f;   // just for beauty
 
-	glTranslatef(0.0, 0.0, -0.5f*len);
+	glTranslatef(0.0, 0.0, -0.5f * len);
 	gluCylinder(qobj, width, width, len, 8, 1);
 	gluQuadricOrientation(qobj, GLU_INSIDE);
 	gluDisk(qobj, 0.0, width, 8, 1);
 	gluQuadricOrientation(qobj, GLU_OUTSIDE);
 	glTranslatef(0.0, 0.0, len);
 	gluDisk(qobj, 0.0, width, 8, 1);
-	glTranslatef(0.0, 0.0, -0.5f*len);
+	glTranslatef(0.0, 0.0, -0.5f * len);
 }
 
 
 static void draw_manipulator_translate(View3D *v3d, RegionView3D *rv3d, int UNUSED(moving), int drawflags, int combo, int colcode)
 {
 	GLUquadricObj *qobj;
-	float cylen= 0.01f*(float)U.tw_handlesize;
-	float cywid= 0.25f*cylen, dz, size;
+	float cylen = 0.01f * (float)U.tw_handlesize;
+	float cywid = 0.25f * cylen, dz, size;
 	float unitmat[4][4];
-	int shift= 0; // XXX
+	int shift = 0; // XXX
 
 	/* when called while moving in mixed mode, do not draw when... */
-	if ((drawflags & MAN_TRANS_C)==0) return;
+	if ((drawflags & MAN_TRANS_C) == 0) return;
 
 	// XXX if (moving) glTranslatef(t->vec[0], t->vec[1], t->vec[2]);
 	glDisable(GL_DEPTH_TEST);
 
-	qobj= gluNewQuadric();
+	qobj = gluNewQuadric();
 	gluQuadricDrawStyle(qobj, GLU_FILL);
 
 	/* center circle, do not add to selection when shift is pressed (planar constraint) */
-	if ( (G.f & G_PICKSEL) && shift==0) glLoadName(MAN_TRANS_C);
+	if ((G.f & G_PICKSEL) && shift == 0) glLoadName(MAN_TRANS_C);
 
 	manipulator_setcolor(v3d, 'C', colcode, 255);
 	glPushMatrix();
-	size= screen_aligned(rv3d, rv3d->twmat);
+	size = screen_aligned(rv3d, rv3d->twmat);
 	unit_m4(unitmat);
-	drawcircball(GL_LINE_LOOP, unitmat[3], 0.2f*size, unitmat);
+	drawcircball(GL_LINE_LOOP, unitmat[3], 0.2f * size, unitmat);
 	glPopMatrix();
 
 	/* and now apply matrix, we move to local matrix drawing */
@@ -1312,14 +1313,14 @@ static void draw_manipulator_translate(View3D *v3d, RegionView3D *rv3d, int UNUS
 	glLoadName(-1);
 
 	// translate drawn as last, only axis when no combo with scale, or for ghosting
-	if ((combo & V3D_MANIP_SCALE)==0 || colcode==MAN_GHOST)
+	if ((combo & V3D_MANIP_SCALE) == 0 || colcode == MAN_GHOST)
 		draw_manipulator_axes(v3d, rv3d, colcode, drawflags & MAN_TRANS_X, drawflags & MAN_TRANS_Y, drawflags & MAN_TRANS_Z);
 
 
 	/* offset in combo mode, for rotate a bit more */
-	if (combo & (V3D_MANIP_ROTATE)) dz= 1.0f+2.0f*cylen;
-	else if (combo & (V3D_MANIP_SCALE)) dz= 1.0f+0.5f*cylen;
-	else dz= 1.0f;
+	if (combo & (V3D_MANIP_ROTATE)) dz = 1.0f + 2.0f * cylen;
+	else if (combo & (V3D_MANIP_SCALE)) dz = 1.0f + 0.5f * cylen;
+	else dz = 1.0f;
 
 	/* Z Cone */
 	glTranslatef(0.0, 0.0, dz);
@@ -1357,35 +1358,35 @@ static void draw_manipulator_rotate_cyl(View3D *v3d, RegionView3D *rv3d, int mov
 {
 	GLUquadricObj *qobj;
 	float size;
-	float cylen= 0.01f*(float)U.tw_handlesize;
-	float cywid= 0.25f*cylen;
+	float cylen = 0.01f * (float)U.tw_handlesize;
+	float cywid = 0.25f * cylen;
 
 	/* when called while moving in mixed mode, do not draw when... */
-	if ((drawflags & MAN_ROT_C)==0) return;
+	if ((drawflags & MAN_ROT_C) == 0) return;
 
 	/* prepare for screen aligned draw */
 	glPushMatrix();
-	size= screen_aligned(rv3d, rv3d->twmat);
+	size = screen_aligned(rv3d, rv3d->twmat);
 
 	glDisable(GL_DEPTH_TEST);
 
-	qobj= gluNewQuadric();
+	qobj = gluNewQuadric();
 
 	/* Screen aligned view rot circle */
 	if (drawflags & MAN_ROT_V) {
-		float unitmat[4][4]= MAT4_UNITY;
+		float unitmat[4][4] = MAT4_UNITY;
 
 		if (G.f & G_PICKSEL) glLoadName(MAN_ROT_V);
 		UI_ThemeColor(TH_TRANSFORM);
-		drawcircball(GL_LINE_LOOP, unitmat[3], 1.2f*size, unitmat);
+		drawcircball(GL_LINE_LOOP, unitmat[3], 1.2f * size, unitmat);
 
 		if (moving) {
 			float vec[3];
-			vec[0]= 0; // XXX (float)(t->imval[0] - t->center2d[0]);
-			vec[1]= 0; // XXX (float)(t->imval[1] - t->center2d[1]);
-			vec[2]= 0.0f;
+			vec[0] = 0; // XXX (float)(t->imval[0] - t->center2d[0]);
+			vec[1] = 0; // XXX (float)(t->imval[1] - t->center2d[1]);
+			vec[2] = 0.0f;
 			normalize_v3(vec);
-			mul_v3_fl(vec, 1.2f*size);
+			mul_v3_fl(vec, 1.2f * size);
 			glBegin(GL_LINES);
 			glVertex3f(0.0, 0.0, 0.0);
 			glVertex3fv(vec);
@@ -1398,8 +1399,8 @@ static void draw_manipulator_rotate_cyl(View3D *v3d, RegionView3D *rv3d, int mov
 	if (moving) {
 		float matt[4][4];
 		copy_m4_m4(matt, rv3d->twmat); // to copy the parts outside of [3][3]
-		// XXX 		if (t->flag & T_USES_MANIPULATOR) {
-		// XXX 			mul_m4_m3m4(matt, t->mat, rv3d->twmat);
+		// XXX      if (t->flag & T_USES_MANIPULATOR) {
+		// XXX          mul_m4_m3m4(matt, t->mat, rv3d->twmat);
 		// XXX }
 		glMultMatrixf(matt);
 	}
@@ -1407,13 +1408,13 @@ static void draw_manipulator_rotate_cyl(View3D *v3d, RegionView3D *rv3d, int mov
 		glMultMatrixf(rv3d->twmat);
 	}
 
-	glFrontFace(is_negative_m4(rv3d->twmat) ? GL_CW:GL_CCW);
+	glFrontFace(is_negative_m4(rv3d->twmat) ? GL_CW : GL_CCW);
 
 	/* axis */
-	if ( (G.f & G_PICKSEL)==0 ) {
+	if ((G.f & G_PICKSEL) == 0) {
 
 		// only draw axis when combo didn't draw scale axes
-		if ((combo & V3D_MANIP_SCALE)==0)
+		if ((combo & V3D_MANIP_SCALE) == 0)
 			draw_manipulator_axes(v3d, rv3d, colcode, drawflags & MAN_ROT_X, drawflags & MAN_ROT_Y, drawflags & MAN_ROT_Z);
 
 		/* only has to be set when not in picking */
@@ -1459,15 +1460,15 @@ static void draw_manipulator_rotate_cyl(View3D *v3d, RegionView3D *rv3d, int mov
 
 /* main call, does calc centers & orientation too */
 /* uses global G.moving */
-static int drawflags= 0xFFFF;		// only for the calls below, belongs in scene...?
+static int drawflags = 0xFFFF;       // only for the calls below, belongs in scene...?
 
 void BIF_draw_manipulator(const bContext *C)
 {
-	ScrArea *sa= CTX_wm_area(C);
-	ARegion *ar= CTX_wm_region(C);
-	Scene *scene= CTX_data_scene(C);
-	View3D *v3d= sa->spacedata.first;
-	RegionView3D *rv3d= ar->regiondata;
+	ScrArea *sa = CTX_wm_area(C);
+	ARegion *ar = CTX_wm_region(C);
+	Scene *scene = CTX_data_scene(C);
+	View3D *v3d = sa->spacedata.first;
+	RegionView3D *rv3d = ar->regiondata;
 	int totsel;
 
 	if (!(v3d->twflag & V3D_USE_MANIPULATOR)) return;
@@ -1477,38 +1478,38 @@ void BIF_draw_manipulator(const bContext *C)
 	{
 		v3d->twflag &= ~V3D_DRAW_MANIPULATOR;
 
-		totsel= calc_manipulator_stats(C);
-		if (totsel==0) return;
+		totsel = calc_manipulator_stats(C);
+		if (totsel == 0) return;
 
 		v3d->twflag |= V3D_DRAW_MANIPULATOR;
 
 		/* now we can define center */
 		switch (v3d->around) {
-		case V3D_CENTER:
-		case V3D_ACTIVE:
-			rv3d->twmat[3][0]= (scene->twmin[0] + scene->twmax[0])/2.0f;
-			rv3d->twmat[3][1]= (scene->twmin[1] + scene->twmax[1])/2.0f;
-			rv3d->twmat[3][2]= (scene->twmin[2] + scene->twmax[2])/2.0f;
-			if (v3d->around==V3D_ACTIVE && scene->obedit==NULL) {
-				Object *ob= OBACT;
-				if (ob && !(ob->mode & OB_MODE_POSE))
-					copy_v3_v3(rv3d->twmat[3], ob->obmat[3]);
-			}
-			break;
-		case V3D_LOCAL:
-		case V3D_CENTROID:
-			copy_v3_v3(rv3d->twmat[3], scene->twcent);
-			break;
-		case V3D_CURSOR:
-			copy_v3_v3(rv3d->twmat[3], give_cursor(scene, v3d));
-			break;
+			case V3D_CENTER:
+			case V3D_ACTIVE:
+				rv3d->twmat[3][0] = (scene->twmin[0] + scene->twmax[0]) / 2.0f;
+				rv3d->twmat[3][1] = (scene->twmin[1] + scene->twmax[1]) / 2.0f;
+				rv3d->twmat[3][2] = (scene->twmin[2] + scene->twmax[2]) / 2.0f;
+				if (v3d->around == V3D_ACTIVE && scene->obedit == NULL) {
+					Object *ob = OBACT;
+					if (ob && !(ob->mode & OB_MODE_POSE))
+						copy_v3_v3(rv3d->twmat[3], ob->obmat[3]);
+				}
+				break;
+			case V3D_LOCAL:
+			case V3D_CENTROID:
+				copy_v3_v3(rv3d->twmat[3], scene->twcent);
+				break;
+			case V3D_CURSOR:
+				copy_v3_v3(rv3d->twmat[3], give_cursor(scene, v3d));
+				break;
 		}
 
 		mul_mat3_m4_fl(rv3d->twmat, ED_view3d_pixel_size(rv3d, rv3d->twmat[3]) * U.tw_size * 5.0f);
 	}
 
 	test_manipulator_axis(C);
-	drawflags= rv3d->twdrawflag;	/* set in calc_manipulator_stats */
+	drawflags = rv3d->twdrawflag;    /* set in calc_manipulator_stats */
 
 	if (v3d->twflag & V3D_DRAW_MANIPULATOR) {
 
@@ -1516,7 +1517,7 @@ void BIF_draw_manipulator(const bContext *C)
 		glEnable(GL_BLEND);
 		if (v3d->twtype & V3D_MANIP_ROTATE) {
 
-			if (G.rt==3) {
+			if (G.rt == 3) {
 				if (G.moving) draw_manipulator_rotate_cyl(v3d, rv3d, 1, drawflags, v3d->twtype, MAN_MOVECOL);
 				else draw_manipulator_rotate_cyl(v3d, rv3d, 0, drawflags, v3d->twtype, MAN_RGB);
 			}
@@ -1536,31 +1537,31 @@ void BIF_draw_manipulator(const bContext *C)
 
 static int manipulator_selectbuf(ScrArea *sa, ARegion *ar, const int mval[2], float hotspot)
 {
-	View3D *v3d= sa->spacedata.first;
-	RegionView3D *rv3d= ar->regiondata;
+	View3D *v3d = sa->spacedata.first;
+	RegionView3D *rv3d = ar->regiondata;
 	rctf rect;
-	GLuint buffer[64];		// max 4 items per select, so large enuf
+	GLuint buffer[64];      // max 4 items per select, so large enuf
 	short hits;
 	extern void setwinmatrixview3d(ARegion *ar, View3D *v3d, rctf *rect); // XXX check a bit later on this... (ton)
 
 	G.f |= G_PICKSEL;
 
-	rect.xmin = mval[0]-hotspot;
-	rect.xmax = mval[0]+hotspot;
-	rect.ymin = mval[1]-hotspot;
-	rect.ymax = mval[1]+hotspot;
+	rect.xmin = mval[0] - hotspot;
+	rect.xmax = mval[0] + hotspot;
+	rect.ymin = mval[1] - hotspot;
+	rect.ymax = mval[1] + hotspot;
 
 	setwinmatrixview3d(ar, v3d, &rect);
 	mult_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat);
 
 	glSelectBuffer(64, buffer);
 	glRenderMode(GL_SELECT);
-	glInitNames();	/* these two calls whatfor? It doesnt work otherwise */
+	glInitNames();  /* these two calls whatfor? It doesnt work otherwise */
 	glPushName(-2);
 
 	/* do the drawing */
 	if (v3d->twtype & V3D_MANIP_ROTATE) {
-		if (G.rt==3) draw_manipulator_rotate_cyl(v3d, rv3d, 0, MAN_ROT_C & rv3d->twdrawflag, v3d->twtype, MAN_RGB);
+		if (G.rt == 3) draw_manipulator_rotate_cyl(v3d, rv3d, 0, MAN_ROT_C & rv3d->twdrawflag, v3d->twtype, MAN_RGB);
 		else draw_manipulator_rotate(v3d, rv3d, 0, MAN_ROT_C & rv3d->twdrawflag, v3d->twtype);
 	}
 	if (v3d->twtype & V3D_MANIP_SCALE)
@@ -1569,37 +1570,37 @@ static int manipulator_selectbuf(ScrArea *sa, ARegion *ar, const int mval[2], fl
 		draw_manipulator_translate(v3d, rv3d, 0, MAN_TRANS_C & rv3d->twdrawflag, v3d->twtype, MAN_RGB);
 
 	glPopName();
-	hits= glRenderMode(GL_RENDER);
+	hits = glRenderMode(GL_RENDER);
 
 	G.f &= ~G_PICKSEL;
 	setwinmatrixview3d(ar, v3d, NULL);
 	mult_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat);
 
-	if (hits==1) return buffer[3];
-	else if (hits>1) {
-		GLuint val, dep, mindep=0, mindeprot=0, minval=0, minvalrot=0;
+	if (hits == 1) return buffer[3];
+	else if (hits > 1) {
+		GLuint val, dep, mindep = 0, mindeprot = 0, minval = 0, minvalrot = 0;
 		int a;
 
 		/* we compare the hits in buffer, but value centers highest */
 		/* we also store the rotation hits separate (because of arcs) and return hits on other widgets if there are */
 
-		for (a=0; a<hits; a++) {
-			dep= buffer[4*a + 1];
-			val= buffer[4*a + 3];
+		for (a = 0; a < hits; a++) {
+			dep = buffer[4 * a + 1];
+			val = buffer[4 * a + 3];
 
-			if (val==MAN_TRANS_C) return MAN_TRANS_C;
-			else if (val==MAN_SCALE_C) return MAN_SCALE_C;
+			if (val == MAN_TRANS_C) return MAN_TRANS_C;
+			else if (val == MAN_SCALE_C) return MAN_SCALE_C;
 			else {
 				if (val & MAN_ROT_C) {
-					if (minvalrot==0 || dep<mindeprot) {
-						mindeprot= dep;
-						minvalrot= val;
+					if (minvalrot == 0 || dep < mindeprot) {
+						mindeprot = dep;
+						minvalrot = val;
 					}
 				}
 				else {
-					if (minval==0 || dep<mindep) {
-						mindep= dep;
-						minval= val;
+					if (minval == 0 || dep < mindep) {
+						mindep = dep;
+						minval = val;
 					}
 				}
 			}
@@ -1617,9 +1618,9 @@ static int manipulator_selectbuf(ScrArea *sa, ARegion *ar, const int mval[2], fl
 /* return 0; nothing happened */
 int BIF_do_manipulator(bContext *C, struct wmEvent *event, wmOperator *op)
 {
-	ScrArea *sa= CTX_wm_area(C);
-	View3D *v3d= sa->spacedata.first;
-	ARegion *ar= CTX_wm_region(C);
+	ScrArea *sa = CTX_wm_area(C);
+	View3D *v3d = sa->spacedata.first;
+	ARegion *ar = CTX_wm_region(C);
 	int constraint_axis[3] = {0, 0, 0};
 	int val;
 	int shift = event->shift;
@@ -1631,41 +1632,41 @@ int BIF_do_manipulator(bContext *C, struct wmEvent *event, wmOperator *op)
 	RNA_enum_set(op->ptr, "constraint_orientation", v3d->twmode);
 
 	// find the hotspots first test narrow hotspot
-	val= manipulator_selectbuf(sa, ar, event->mval, 0.5f*(float)U.tw_hotspot);
+	val = manipulator_selectbuf(sa, ar, event->mval, 0.5f * (float)U.tw_hotspot);
 	if (val) {
 
 		// drawflags still global, for drawing call above
-		drawflags= manipulator_selectbuf(sa, ar, event->mval, 0.2f*(float)U.tw_hotspot);
-		if (drawflags==0) drawflags= val;
+		drawflags = manipulator_selectbuf(sa, ar, event->mval, 0.2f * (float)U.tw_hotspot);
+		if (drawflags == 0) drawflags = val;
 
 		if (drawflags & MAN_TRANS_C) {
 			switch (drawflags) {
-			case MAN_TRANS_C:
-				break;
-			case MAN_TRANS_X:
-				if (shift) {
-					constraint_axis[1] = 1;
-					constraint_axis[2] = 1;
-				}
-				else
-					constraint_axis[0] = 1;
-				break;
-			case MAN_TRANS_Y:
-				if (shift) {
-					constraint_axis[0] = 1;
-					constraint_axis[2] = 1;
-				}
-				else
-					constraint_axis[1] = 1;
-				break;
-			case MAN_TRANS_Z:
-				if (shift) {
-					constraint_axis[0] = 1;
-					constraint_axis[1] = 1;
-				}
-				else
-					constraint_axis[2] = 1;
-				break;
+				case MAN_TRANS_C:
+					break;
+				case MAN_TRANS_X:
+					if (shift) {
+						constraint_axis[1] = 1;
+						constraint_axis[2] = 1;
+					}
+					else
+						constraint_axis[0] = 1;
+					break;
+				case MAN_TRANS_Y:
+					if (shift) {
+						constraint_axis[0] = 1;
+						constraint_axis[2] = 1;
+					}
+					else
+						constraint_axis[1] = 1;
+					break;
+				case MAN_TRANS_Z:
+					if (shift) {
+						constraint_axis[0] = 1;
+						constraint_axis[1] = 1;
+					}
+					else
+						constraint_axis[2] = 1;
+					break;
 			}
 			RNA_boolean_set_array(op->ptr, "constraint_axis", constraint_axis);
 			WM_operator_name_call(C, "TRANSFORM_OT_translate", WM_OP_INVOKE_DEFAULT, op->ptr);
@@ -1673,30 +1674,30 @@ int BIF_do_manipulator(bContext *C, struct wmEvent *event, wmOperator *op)
 		}
 		else if (drawflags & MAN_SCALE_C) {
 			switch (drawflags) {
-			case MAN_SCALE_X:
-				if (shift) {
-					constraint_axis[1] = 1;
-					constraint_axis[2] = 1;
-				}
-				else
-					constraint_axis[0] = 1;
-				break;
-			case MAN_SCALE_Y:
-				if (shift) {
-					constraint_axis[0] = 1;
-					constraint_axis[2] = 1;
-				}
-				else
-					constraint_axis[1] = 1;
-				break;
-			case MAN_SCALE_Z:
-				if (shift) {
-					constraint_axis[0] = 1;
-					constraint_axis[1] = 1;
-				}
-				else
-					constraint_axis[2] = 1;
-				break;
+				case MAN_SCALE_X:
+					if (shift) {
+						constraint_axis[1] = 1;
+						constraint_axis[2] = 1;
+					}
+					else
+						constraint_axis[0] = 1;
+					break;
+				case MAN_SCALE_Y:
+					if (shift) {
+						constraint_axis[0] = 1;
+						constraint_axis[2] = 1;
+					}
+					else
+						constraint_axis[1] = 1;
+					break;
+				case MAN_SCALE_Z:
+					if (shift) {
+						constraint_axis[0] = 1;
+						constraint_axis[1] = 1;
+					}
+					else
+						constraint_axis[2] = 1;
+					break;
 			}
 			RNA_boolean_set_array(op->ptr, "constraint_axis", constraint_axis);
 			WM_operator_name_call(C, "TRANSFORM_OT_resize", WM_OP_INVOKE_DEFAULT, op->ptr);
@@ -1708,15 +1709,15 @@ int BIF_do_manipulator(bContext *C, struct wmEvent *event, wmOperator *op)
 		}
 		else if (drawflags & MAN_ROT_C) {
 			switch (drawflags) {
-			case MAN_ROT_X:
-				constraint_axis[0] = 1;
-				break;
-			case MAN_ROT_Y:
-				constraint_axis[1] = 1;
-				break;
-			case MAN_ROT_Z:
-				constraint_axis[2] = 1;
-				break;
+				case MAN_ROT_X:
+					constraint_axis[0] = 1;
+					break;
+				case MAN_ROT_Y:
+					constraint_axis[1] = 1;
+					break;
+				case MAN_ROT_Z:
+					constraint_axis[2] = 1;
+					break;
 			}
 			RNA_boolean_set_array(op->ptr, "constraint_axis", constraint_axis);
 			WM_operator_name_call(C, "TRANSFORM_OT_rotate", WM_OP_INVOKE_DEFAULT, op->ptr);
@@ -1724,7 +1725,7 @@ int BIF_do_manipulator(bContext *C, struct wmEvent *event, wmOperator *op)
 		}
 	}
 	/* after transform, restore drawflags */
-	drawflags= 0xFFFF;
+	drawflags = 0xFFFF;
 
 	return val;
 }
diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c
index 6fd8e07d34a..81a4c082dcc 100644
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@ -40,6 +40,7 @@
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_armature.h"
+#include "BKE_report.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -51,11 +52,10 @@
 
 #include "transform.h"
 
-typedef struct TransformModeItem
-{
+typedef struct TransformModeItem {
 	char *idname;
-	int		mode;
-	void (*opfunc)(wmOperatorType*);
+	int mode;
+	void (*opfunc)(wmOperatorType *);
 } TransformModeItem;
 
 static float VecOne[3] = {1, 1, 1};
@@ -135,6 +135,7 @@ EnumPropertyItem transform_mode_types[] =
 	{TFM_BONESIZE, "BONE_SIZE", 0, "Bonesize", ""},
 	{TFM_BONE_ENVELOPE, "BONE_ENVELOPE", 0, "Bone_Envelope", ""},
 	{TFM_CURVE_SHRINKFATTEN, "CURVE_SHRINKFATTEN", 0, "Curve_Shrinkfatten", ""},
+	{TFM_MASK_SHRINKFATTEN, "MASK_SHRINKFATTEN", 0, "Mask_Shrinkfatten", ""},
 	{TFM_BONE_ROLL, "BONE_ROLL", 0, "Bone_Roll", ""},
 	{TFM_TIME_TRANSLATE, "TIME_TRANSLATE", 0, "Time_Translate", ""},
 	{TFM_TIME_SLIDE, "TIME_SLIDE", 0, "Time_Slide", ""},
@@ -151,11 +152,11 @@ EnumPropertyItem transform_mode_types[] =
 
 static int snap_type_exec(bContext *C, wmOperator *op)
 {
-	ToolSettings *ts= CTX_data_tool_settings(C);
+	ToolSettings *ts = CTX_data_tool_settings(C);
 
 	ts->snap_mode = RNA_enum_get(op->ptr, "type");
 
-	WM_event_add_notifier(C, NC_SCENE|ND_TOOLSETTINGS, NULL); /* header redraw */
+	WM_event_add_notifier(C, NC_SCENE | ND_TOOLSETTINGS, NULL); /* header redraw */
 
 	return OPERATOR_FINISHED;
 }
@@ -187,7 +188,7 @@ static int select_orientation_exec(bContext *C, wmOperator *op)
 
 	BIF_selectTransformOrientationValue(C, orientation);
 	
-	WM_event_add_notifier(C, NC_SPACE|ND_SPACE_VIEW3D, CTX_wm_view3d(C));
+	WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, CTX_wm_view3d(C));
 
 	return OPERATOR_FINISHED;
 }
@@ -197,8 +198,8 @@ static int select_orientation_invoke(bContext *C, wmOperator *UNUSED(op), wmEven
 	uiPopupMenu *pup;
 	uiLayout *layout;
 
-	pup= uiPupMenuBegin(C, "Orientation", ICON_NONE);
-	layout= uiPupMenuLayout(pup);
+	pup = uiPupMenuBegin(C, "Orientation", ICON_NONE);
+	layout = uiPupMenuLayout(pup);
 	uiItemsEnumO(layout, "TRANSFORM_OT_select_orientation", "orientation");
 	uiPupMenuEnd(C, pup);
 
@@ -220,7 +221,7 @@ static void TRANSFORM_OT_select_orientation(struct wmOperatorType *ot)
 	ot->exec   = select_orientation_exec;
 	ot->poll   = ED_operator_view3d_active;
 
-	prop= RNA_def_property(ot->srna, "orientation", PROP_ENUM, PROP_NONE);
+	prop = RNA_def_property(ot->srna, "orientation", PROP_ENUM, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Orientation", "Transformation orientation");
 	RNA_def_enum_funcs(prop, rna_TransformOrientation_itemf);
 }
@@ -233,8 +234,8 @@ static int delete_orientation_exec(bContext *C, wmOperator *UNUSED(op))
 
 	BIF_removeTransformOrientationIndex(C, selected_index);
 	
-	WM_event_add_notifier(C, NC_SPACE|ND_SPACE_VIEW3D, CTX_wm_view3d(C));
-	WM_event_add_notifier(C, NC_SCENE|NA_EDITED, CTX_data_scene(C));
+	WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, CTX_wm_view3d(C));
+	WM_event_add_notifier(C, NC_SCENE | NA_EDITED, CTX_data_scene(C));
 
 	return OPERATOR_FINISHED;
 }
@@ -282,10 +283,15 @@ static int create_orientation_exec(bContext *C, wmOperator *op)
 	
 	RNA_string_get(op->ptr, "name", name);
 
+	if (use && !CTX_wm_view3d(C)) {
+		BKE_report(op->reports, RPT_ERROR, "Create Orientation \"use\" parameter only valid in a 3dView context");
+		return OPERATOR_CANCELLED;
+	}
+
 	BIF_createTransformOrientation(C, op->reports, name, use, overwrite);
 
-	WM_event_add_notifier(C, NC_SPACE|ND_SPACE_VIEW3D, CTX_wm_view3d(C));
-	WM_event_add_notifier(C, NC_SCENE|NA_EDITED, CTX_data_scene(C));
+	WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, CTX_wm_view3d(C));
+	WM_event_add_notifier(C, NC_SCENE | NA_EDITED, CTX_data_scene(C));
 	
 	return OPERATOR_FINISHED;
 }
@@ -301,13 +307,13 @@ static void TRANSFORM_OT_create_orientation(struct wmOperatorType *ot)
 	ot->name   = "Create Orientation";
 	ot->description = "Create transformation orientation from selection";
 	ot->idname = "TRANSFORM_OT_create_orientation";
-	ot->flag   = OPTYPE_REGISTER|OPTYPE_UNDO;
+	ot->flag   = OPTYPE_REGISTER | OPTYPE_UNDO;
 
 	/* api callbacks */
 	ot->invoke = create_orientation_invoke;
 	ot->exec   = create_orientation_exec;
 	ot->poll   = ED_operator_areaactive;
-	ot->flag   = OPTYPE_REGISTER|OPTYPE_UNDO;
+	ot->flag   = OPTYPE_REGISTER | OPTYPE_UNDO;
 
 	RNA_def_string(ot->srna, "name", "", MAX_NAME, "Name", "Text to insert at the cursor position");
 	RNA_def_boolean(ot->srna, "use", 0, "Use after creation", "Select orientation after its creation");
@@ -372,9 +378,9 @@ static int transform_modal(bContext *C, wmOperator *op, wmEvent *event)
 #endif
 
 	/* XXX insert keys are called here, and require context */
-	t->context= C;
+	t->context = C;
 	exit_code = transformEvent(t, event);
-	t->context= NULL;
+	t->context = NULL;
 
 	transformApply(C, t);
 
@@ -418,7 +424,7 @@ static int transform_exec(bContext *C, wmOperator *op)
 
 	transformops_exit(C, op);
 	
-	WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
+	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 
 	return OPERATOR_FINISHED;
 }
@@ -447,7 +453,7 @@ void Transform_Properties(struct wmOperatorType *ot, int flags)
 	PropertyRNA *prop;
 
 	if (flags & P_AXIS) {
-		prop= RNA_def_property(ot->srna, "axis", PROP_FLOAT, PROP_DIRECTION);
+		prop = RNA_def_property(ot->srna, "axis", PROP_FLOAT, PROP_DIRECTION);
 		RNA_def_property_array(prop, 3);
 		/* Make this not hidden when there's a nice axis selection widget */
 		RNA_def_property_flag(prop, PROP_HIDDEN);
@@ -457,7 +463,7 @@ void Transform_Properties(struct wmOperatorType *ot, int flags)
 
 	if (flags & P_CONSTRAINT) {
 		RNA_def_boolean_vector(ot->srna, "constraint_axis", 3, NULL, "Constraint Axis", "");
-		prop= RNA_def_property(ot->srna, "constraint_orientation", PROP_ENUM, PROP_NONE);
+		prop = RNA_def_property(ot->srna, "constraint_orientation", PROP_ENUM, PROP_NONE);
 		RNA_def_property_ui_text(prop, "Orientation", "Transformation orientation");
 		RNA_def_enum_funcs(prop, rna_TransformOrientation_itemf);
 
@@ -476,19 +482,19 @@ void Transform_Properties(struct wmOperatorType *ot, int flags)
 	}
 
 	if (flags & P_SNAP) {
-		prop= RNA_def_boolean(ot->srna, "snap", 0, "Use Snapping Options", "");
+		prop = RNA_def_boolean(ot->srna, "snap", 0, "Use Snapping Options", "");
 		RNA_def_property_flag(prop, PROP_HIDDEN);
 
 		if (flags & P_GEO_SNAP) {
-			prop= RNA_def_enum(ot->srna, "snap_target", snap_target_items, 0, "Target", "");
+			prop = RNA_def_enum(ot->srna, "snap_target", snap_target_items, 0, "Target", "");
 			RNA_def_property_flag(prop, PROP_HIDDEN);
-			prop= RNA_def_float_vector(ot->srna, "snap_point", 3, NULL, -FLT_MAX, FLT_MAX, "Point", "", -FLT_MAX, FLT_MAX);
+			prop = RNA_def_float_vector(ot->srna, "snap_point", 3, NULL, -FLT_MAX, FLT_MAX, "Point", "", -FLT_MAX, FLT_MAX);
 			RNA_def_property_flag(prop, PROP_HIDDEN);
 			
 			if (flags & P_ALIGN_SNAP) {
-				prop= RNA_def_boolean(ot->srna, "snap_align", 0, "Align with Point Normal", "");
+				prop = RNA_def_boolean(ot->srna, "snap_align", 0, "Align with Point Normal", "");
 				RNA_def_property_flag(prop, PROP_HIDDEN);
-				prop= RNA_def_float_vector(ot->srna, "snap_normal", 3, NULL, -FLT_MAX, FLT_MAX, "Normal", "", -FLT_MAX, FLT_MAX);
+				prop = RNA_def_float_vector(ot->srna, "snap_normal", 3, NULL, -FLT_MAX, FLT_MAX, "Normal", "", -FLT_MAX, FLT_MAX);
 				RNA_def_property_flag(prop, PROP_HIDDEN);
 			}
 		}
@@ -513,7 +519,7 @@ static void TRANSFORM_OT_translate(struct wmOperatorType *ot)
 	ot->name   = "Translate";
 	ot->description = "Translate (move) selected items";
 	ot->idname = OP_TRANSLATION;
-	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
 
 	/* api callbacks */
 	ot->invoke = transform_invoke;
@@ -524,7 +530,7 @@ static void TRANSFORM_OT_translate(struct wmOperatorType *ot)
 
 	RNA_def_float_vector_xyz(ot->srna, "value", 3, NULL, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX);
 
-	Transform_Properties(ot, P_CONSTRAINT|P_PROPORTIONAL|P_MIRROR|P_ALIGN_SNAP|P_OPTIONS);
+	Transform_Properties(ot, P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | P_ALIGN_SNAP | P_OPTIONS);
 }
 
 static void TRANSFORM_OT_resize(struct wmOperatorType *ot)
@@ -533,7 +539,7 @@ static void TRANSFORM_OT_resize(struct wmOperatorType *ot)
 	ot->name   = "Resize";
 	ot->description = "Scale (resize) selected items"; 
 	ot->idname = OP_RESIZE;
-	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
 
 	/* api callbacks */
 	ot->invoke = transform_invoke;
@@ -544,7 +550,7 @@ static void TRANSFORM_OT_resize(struct wmOperatorType *ot)
 
 	RNA_def_float_vector(ot->srna, "value", 3, VecOne, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX);
 
-	Transform_Properties(ot, P_CONSTRAINT|P_PROPORTIONAL|P_MIRROR|P_GEO_SNAP|P_OPTIONS);
+	Transform_Properties(ot, P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | P_GEO_SNAP | P_OPTIONS);
 }
 
 static int skin_resize_poll(bContext *C)
@@ -563,7 +569,7 @@ static void TRANSFORM_OT_skin_resize(struct wmOperatorType *ot)
 	ot->name   = "Skin Resize";
 	ot->description = "Scale selected vertices' skin radii"; 
 	ot->idname = OP_SKIN_RESIZE;
-	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
 
 	/* api callbacks */
 	ot->invoke = transform_invoke;
@@ -574,7 +580,7 @@ static void TRANSFORM_OT_skin_resize(struct wmOperatorType *ot)
 
 	RNA_def_float_vector(ot->srna, "value", 3, VecOne, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX);
 
-	Transform_Properties(ot, P_CONSTRAINT|P_PROPORTIONAL|P_MIRROR|P_GEO_SNAP|P_OPTIONS);
+	Transform_Properties(ot, P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | P_GEO_SNAP | P_OPTIONS);
 }
 
 static void TRANSFORM_OT_trackball(struct wmOperatorType *ot)
@@ -583,7 +589,7 @@ static void TRANSFORM_OT_trackball(struct wmOperatorType *ot)
 	ot->name   = "Trackball";
 	ot->description = "Trackball style rotation of selected items";
 	ot->idname = OP_TRACKBALL;
-	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
 
 	/* api callbacks */
 	ot->invoke = transform_invoke;
@@ -594,7 +600,7 @@ static void TRANSFORM_OT_trackball(struct wmOperatorType *ot)
 
 	RNA_def_float_vector(ot->srna, "value", 2, VecOne, -FLT_MAX, FLT_MAX, "Angle", "", -FLT_MAX, FLT_MAX);
 
-	Transform_Properties(ot, P_PROPORTIONAL|P_MIRROR|P_SNAP);
+	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP);
 }
 
 static void TRANSFORM_OT_rotate(struct wmOperatorType *ot)
@@ -603,7 +609,7 @@ static void TRANSFORM_OT_rotate(struct wmOperatorType *ot)
 	ot->name   = "Rotate";
 	ot->description = "Rotate selected items";
 	ot->idname = OP_ROTATION;
-	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
 
 	/* api callbacks */
 	ot->invoke = transform_invoke;
@@ -612,9 +618,9 @@ static void TRANSFORM_OT_rotate(struct wmOperatorType *ot)
 	ot->cancel = transform_cancel;
 	ot->poll   = ED_operator_screenactive;
 
-	RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -M_PI*2, M_PI*2);
+	RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -M_PI * 2, M_PI * 2);
 
-	Transform_Properties(ot, P_AXIS|P_CONSTRAINT|P_PROPORTIONAL|P_MIRROR|P_GEO_SNAP);
+	Transform_Properties(ot, P_AXIS | P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | P_GEO_SNAP);
 }
 
 static void TRANSFORM_OT_tilt(struct wmOperatorType *ot)
@@ -626,7 +632,7 @@ static void TRANSFORM_OT_tilt(struct wmOperatorType *ot)
 	 * "Specify an extra axis rotation for selected vertices of 3d curve" */
 	ot->description = "Tilt selected control vertices of 3d curve"; 
 	ot->idname = OP_TILT;
-	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
 
 	/* api callbacks */
 	ot->invoke = transform_invoke;
@@ -635,9 +641,9 @@ static void TRANSFORM_OT_tilt(struct wmOperatorType *ot)
 	ot->cancel = transform_cancel;
 	ot->poll   = ED_operator_editcurve_3d;
 
-	RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -M_PI*2, M_PI*2);
+	RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -M_PI * 2, M_PI * 2);
 
-	Transform_Properties(ot, P_CONSTRAINT|P_PROPORTIONAL|P_MIRROR|P_SNAP);
+	Transform_Properties(ot, P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | P_SNAP);
 }
 
 static void TRANSFORM_OT_warp(struct wmOperatorType *ot)
@@ -646,7 +652,7 @@ static void TRANSFORM_OT_warp(struct wmOperatorType *ot)
 	ot->name   = "Warp";
 	ot->description = "Warp selected items around the cursor";
 	ot->idname = OP_WARP;
-	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
 
 	/* api callbacks */
 	ot->invoke = transform_invoke;
@@ -655,9 +661,9 @@ static void TRANSFORM_OT_warp(struct wmOperatorType *ot)
 	ot->cancel = transform_cancel;
 	ot->poll   = ED_operator_screenactive;
 
-	RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -M_PI*2, M_PI*2);
+	RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -M_PI * 2, M_PI * 2);
 
-	Transform_Properties(ot, P_PROPORTIONAL|P_MIRROR|P_SNAP);
+	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP);
 	// XXX Warp axis?
 }
 
@@ -667,7 +673,7 @@ static void TRANSFORM_OT_shear(struct wmOperatorType *ot)
 	ot->name   = "Shear";
 	ot->description = "Shear selected items along the horizontal screen axis";
 	ot->idname = OP_SHEAR;
-	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
 
 	/* api callbacks */
 	ot->invoke = transform_invoke;
@@ -678,7 +684,7 @@ static void TRANSFORM_OT_shear(struct wmOperatorType *ot)
 
 	RNA_def_float(ot->srna, "value", 0, -FLT_MAX, FLT_MAX, "Offset", "", -FLT_MAX, FLT_MAX);
 
-	Transform_Properties(ot, P_PROPORTIONAL|P_MIRROR|P_SNAP);
+	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP);
 	// XXX Shear axis?
 }
 
@@ -688,7 +694,7 @@ static void TRANSFORM_OT_push_pull(struct wmOperatorType *ot)
 	ot->name   = "Push/Pull";
 	ot->description = "Push/Pull selected items";
 	ot->idname = OP_PUSH_PULL;
-	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
 
 	/* api callbacks */
 	ot->invoke = transform_invoke;
@@ -699,7 +705,7 @@ static void TRANSFORM_OT_push_pull(struct wmOperatorType *ot)
 
 	RNA_def_float(ot->srna, "value", 0, -FLT_MAX, FLT_MAX, "Distance", "", -FLT_MAX, FLT_MAX);
 
-	Transform_Properties(ot, P_PROPORTIONAL|P_MIRROR|P_SNAP);
+	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP);
 }
 
 static void TRANSFORM_OT_shrink_fatten(struct wmOperatorType *ot)
@@ -708,7 +714,7 @@ static void TRANSFORM_OT_shrink_fatten(struct wmOperatorType *ot)
 	ot->name   = "Shrink/Fatten";
 	ot->description = "Shrink/fatten selected vertices along normals";
 	ot->idname = OP_SHRINK_FATTEN;
-	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
 
 	/* api callbacks */
 	ot->invoke = transform_invoke;
@@ -719,7 +725,7 @@ static void TRANSFORM_OT_shrink_fatten(struct wmOperatorType *ot)
 
 	RNA_def_float(ot->srna, "value", 0, -FLT_MAX, FLT_MAX, "Offset", "", -FLT_MAX, FLT_MAX);
 
-	Transform_Properties(ot, P_PROPORTIONAL|P_MIRROR|P_SNAP);
+	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP);
 }
 
 static void TRANSFORM_OT_tosphere(struct wmOperatorType *ot)
@@ -729,7 +735,7 @@ static void TRANSFORM_OT_tosphere(struct wmOperatorType *ot)
 	//added "around mesh center" to differentiate between "MESH_OT_vertices_to_sphere()" 
 	ot->description = "Move selected vertices outward in a spherical shape around mesh center";
 	ot->idname = OP_TOSPHERE;
-	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
 
 	/* api callbacks */
 	ot->invoke = transform_invoke;
@@ -740,7 +746,7 @@ static void TRANSFORM_OT_tosphere(struct wmOperatorType *ot)
 
 	RNA_def_float_factor(ot->srna, "value", 0, 0, 1, "Factor", "", 0, 1);
 
-	Transform_Properties(ot, P_PROPORTIONAL|P_MIRROR|P_SNAP);
+	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP);
 }
 
 static void TRANSFORM_OT_mirror(struct wmOperatorType *ot)
@@ -749,7 +755,7 @@ static void TRANSFORM_OT_mirror(struct wmOperatorType *ot)
 	ot->name   = "Mirror";
 	ot->description = "Mirror selected vertices around one or more axes";
 	ot->idname = OP_MIRROR;
-	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
 
 	/* api callbacks */
 	ot->invoke = transform_invoke;
@@ -758,7 +764,7 @@ static void TRANSFORM_OT_mirror(struct wmOperatorType *ot)
 	ot->cancel = transform_cancel;
 	ot->poll   = ED_operator_screenactive;
 
-	Transform_Properties(ot, P_CONSTRAINT|P_PROPORTIONAL);
+	Transform_Properties(ot, P_CONSTRAINT | P_PROPORTIONAL);
 }
 
 static void TRANSFORM_OT_edge_slide(struct wmOperatorType *ot)
@@ -767,7 +773,7 @@ static void TRANSFORM_OT_edge_slide(struct wmOperatorType *ot)
 	ot->name   = "Edge Slide";
 	ot->description = "Slide an edge loop along a mesh"; 
 	ot->idname = OP_EDGE_SLIDE;
-	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
 
 	/* api callbacks */
 	ot->invoke = transform_invoke;
@@ -778,7 +784,7 @@ static void TRANSFORM_OT_edge_slide(struct wmOperatorType *ot)
 
 	RNA_def_float_factor(ot->srna, "value", 0, -1.0f, 1.0f, "Factor", "", -1.0f, 1.0f);
 
-	Transform_Properties(ot, P_MIRROR|P_SNAP|P_CORRECT_UV);
+	Transform_Properties(ot, P_MIRROR | P_SNAP | P_CORRECT_UV);
 }
 
 static void TRANSFORM_OT_edge_crease(struct wmOperatorType *ot)
@@ -787,7 +793,7 @@ static void TRANSFORM_OT_edge_crease(struct wmOperatorType *ot)
 	ot->name   = "Edge Crease";
 	ot->description = "Change the crease of edges";
 	ot->idname = OP_EDGE_CREASE;
-	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
 
 	/* api callbacks */
 	ot->invoke = transform_invoke;
@@ -807,7 +813,7 @@ static void TRANSFORM_OT_edge_bevelweight(struct wmOperatorType *ot)
 	ot->name   = "Edge Bevel Weight";
 	ot->description = "Change the bevel weight of edges";
 	ot->idname = OP_EDGE_BWEIGHT;
-	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
 
 	/* api callbacks */
 	ot->invoke = transform_invoke;
@@ -827,7 +833,7 @@ static void TRANSFORM_OT_seq_slide(struct wmOperatorType *ot)
 	ot->name   = "Sequence Slide";
 	ot->description = "Slide a sequence strip in time";
 	ot->idname = OP_SEQ_SLIDE;
-	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
 
 	/* api callbacks */
 	ot->invoke = transform_invoke;
@@ -849,7 +855,7 @@ static void TRANSFORM_OT_transform(struct wmOperatorType *ot)
 	ot->name   = "Transform";
 	ot->description = "Transform selected items by mode type";
 	ot->idname = "TRANSFORM_OT_transform";
-	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
 
 	/* api callbacks */
 	ot->invoke = transform_invoke;
@@ -858,12 +864,12 @@ static void TRANSFORM_OT_transform(struct wmOperatorType *ot)
 	ot->cancel = transform_cancel;
 	ot->poll   = ED_operator_screenactive;
 
-	prop= RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", "");
+	prop = RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", "");
 	RNA_def_property_flag(prop, PROP_HIDDEN);
 
 	RNA_def_float_vector(ot->srna, "value", 4, NULL, -FLT_MAX, FLT_MAX, "Values", "", -FLT_MAX, FLT_MAX);
 
-	Transform_Properties(ot, P_AXIS|P_CONSTRAINT|P_PROPORTIONAL|P_MIRROR|P_ALIGN_SNAP);
+	Transform_Properties(ot, P_AXIS | P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | P_ALIGN_SNAP);
 }
 
 void transform_operatortypes(void)
@@ -913,13 +919,13 @@ void transform_keymap_for_space(wmKeyConfig *keyconf, wmKeyMap *keymap, int spac
 
 			WM_keymap_add_item(keymap, OP_WARP, WKEY, KM_PRESS, KM_SHIFT, 0);
 
-			WM_keymap_add_item(keymap, OP_TOSPHERE, SKEY, KM_PRESS, KM_ALT|KM_SHIFT, 0);
+			WM_keymap_add_item(keymap, OP_TOSPHERE, SKEY, KM_PRESS, KM_ALT | KM_SHIFT, 0);
 
-			WM_keymap_add_item(keymap, OP_SHEAR, SKEY, KM_PRESS, KM_ALT|KM_CTRL|KM_SHIFT, 0);
+			WM_keymap_add_item(keymap, OP_SHEAR, SKEY, KM_PRESS, KM_ALT | KM_CTRL | KM_SHIFT, 0);
 
 			WM_keymap_add_item(keymap, "TRANSFORM_OT_select_orientation", SPACEKEY, KM_PRESS, KM_ALT, 0);
 
-			kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_create_orientation", SPACEKEY, KM_PRESS, KM_CTRL|KM_ALT, 0);
+			kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_create_orientation", SPACEKEY, KM_PRESS, KM_CTRL | KM_ALT, 0);
 			RNA_boolean_set(kmi->ptr, "use", TRUE);
 
 			WM_keymap_add_item(keymap, OP_MIRROR, MKEY, KM_PRESS, KM_CTRL, 0);
@@ -927,12 +933,12 @@ void transform_keymap_for_space(wmKeyConfig *keyconf, wmKeyMap *keymap, int spac
 			kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", TABKEY, KM_PRESS, KM_SHIFT, 0);
 			RNA_string_set(kmi->ptr, "data_path", "tool_settings.use_snap");
 
-			WM_keymap_add_item(keymap, "TRANSFORM_OT_snap_type", TABKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
+			WM_keymap_add_item(keymap, "TRANSFORM_OT_snap_type", TABKEY, KM_PRESS, KM_SHIFT | KM_CTRL, 0);
 
 			kmi = WM_keymap_add_item(keymap, OP_TRANSLATION, TKEY, KM_PRESS, KM_SHIFT, 0);
 			RNA_boolean_set(kmi->ptr, "texture_space", TRUE);
 
-			kmi = WM_keymap_add_item(keymap, OP_RESIZE, TKEY, KM_PRESS, KM_SHIFT|KM_ALT, 0);
+			kmi = WM_keymap_add_item(keymap, OP_RESIZE, TKEY, KM_PRESS, KM_SHIFT | KM_ALT, 0);
 			RNA_boolean_set(kmi->ptr, "texture_space", TRUE);
 
 			WM_keymap_add_item(keymap, OP_SKIN_RESIZE, AKEY, KM_PRESS, KM_CTRL, 0);
@@ -1014,7 +1020,7 @@ void transform_keymap_for_space(wmKeyConfig *keyconf, wmKeyMap *keymap, int spac
 
 			WM_keymap_add_item(keymap, OP_RESIZE, SKEY, KM_PRESS, 0, 0);
 
-			WM_keymap_add_item(keymap, OP_SHEAR, SKEY, KM_PRESS, KM_ALT|KM_CTRL|KM_SHIFT, 0);
+			WM_keymap_add_item(keymap, OP_SHEAR, SKEY, KM_PRESS, KM_ALT | KM_CTRL | KM_SHIFT, 0);
 
 			WM_keymap_add_item(keymap, "TRANSFORM_OT_mirror", MKEY, KM_PRESS, KM_CTRL, 0);
 
@@ -1025,6 +1031,7 @@ void transform_keymap_for_space(wmKeyConfig *keyconf, wmKeyMap *keymap, int spac
 			WM_keymap_add_item(keymap, OP_TRANSLATION, GKEY, KM_PRESS, 0, 0);
 			WM_keymap_add_item(keymap, OP_TRANSLATION, EVT_TWEAK_S, KM_ANY, 0, 0);
 			WM_keymap_add_item(keymap, OP_RESIZE, SKEY, KM_PRESS, 0, 0);
+			WM_keymap_add_item(keymap, OP_ROTATION, RKEY, KM_PRESS, 0, 0);
 			break;
 		default:
 			break;
diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c
index 91f62291450..97fc173f9a1 100644
--- a/source/blender/editors/transform/transform_orientations.c
+++ b/source/blender/editors/transform/transform_orientations.c
@@ -75,16 +75,16 @@ void BIF_clearTransformOrientation(bContext *C)
 	
 	// Need to loop over all view3d
 	if (v3d && v3d->twmode >= V3D_MANIP_CUSTOM) {
-		v3d->twmode = V3D_MANIP_GLOBAL;	/* fallback to global	*/
+		v3d->twmode = V3D_MANIP_GLOBAL; /* fallback to global	*/
 	}
 }
 
-static TransformOrientation* findOrientationName(ListBase *lb, const char *name)
+static TransformOrientation *findOrientationName(ListBase *lb, const char *name)
 {
-	TransformOrientation *ts= NULL;
+	TransformOrientation *ts = NULL;
 
-	for (ts= lb->first; ts; ts = ts->next) {
-		if (strncmp(ts->name, name, sizeof(ts->name)-1) == 0) {
+	for (ts = lb->first; ts; ts = ts->next) {
+		if (strncmp(ts->name, name, sizeof(ts->name) - 1) == 0) {
 			return ts;
 		}
 	}
@@ -115,7 +115,7 @@ void BIF_createTransformOrientation(bContext *C, ReportList *reports, char *name
 			ts = createBoneSpace(C, reports, name, overwrite);
 	}
 	else if (ob && (ob->mode & OB_MODE_POSE)) {
-			ts = createBoneSpace(C, reports, name, overwrite);
+		ts = createBoneSpace(C, reports, name, overwrite);
 	}
 	else {
 		ts = createObjectSpace(C, reports, name, overwrite);
@@ -143,7 +143,7 @@ TransformOrientation *createObjectSpace(bContext *C, ReportList *UNUSED(reports)
 
 	/* use object name if no name is given */
 	if (name[0] == 0) {
-		strncpy(name, ob->id.name+2, MAX_ID_NAME-2);
+		strncpy(name, ob->id.name + 2, MAX_ID_NAME - 2);
 	}
 
 	return addMatrixSpace(C, mat, name, overwrite);	
@@ -262,7 +262,7 @@ int createSpaceNormalTangent(float mat[3][3], float normal[3], float tangent[3])
 	return 1;
 }
 
-TransformOrientation* addMatrixSpace(bContext *C, float mat[3][3], char name[], int overwrite)
+TransformOrientation *addMatrixSpace(bContext *C, float mat[3][3], char name[], int overwrite)
 {
 	ListBase *transform_spaces = &CTX_data_scene(C)->transform_spaces;
 	TransformOrientation *ts = NULL;
@@ -301,7 +301,7 @@ void BIF_removeTransformOrientation(bContext *C, TransformOrientation *target)
 				
 				// Transform_fix_me NEED TO DO THIS FOR ALL VIEW3D
 				if (selected_index == i) {
-					v3d->twmode = V3D_MANIP_GLOBAL;	/* fallback to global	*/
+					v3d->twmode = V3D_MANIP_GLOBAL; /* fallback to global	*/
 				}
 				else if (selected_index > i) {
 					v3d->twmode--;
@@ -318,7 +318,7 @@ void BIF_removeTransformOrientation(bContext *C, TransformOrientation *target)
 void BIF_removeTransformOrientationIndex(bContext *C, int index)
 {
 	ListBase *transform_spaces = &CTX_data_scene(C)->transform_spaces;
-	TransformOrientation *ts= BLI_findlink(transform_spaces, index);
+	TransformOrientation *ts = BLI_findlink(transform_spaces, index);
 
 	if (ts) {
 		View3D *v3d = CTX_wm_view3d(C);
@@ -327,7 +327,7 @@ void BIF_removeTransformOrientationIndex(bContext *C, int index)
 			
 			// Transform_fix_me NEED TO DO THIS FOR ALL VIEW3D
 			if (selected_index == index) {
-				v3d->twmode = V3D_MANIP_GLOBAL;	/* fallback to global	*/
+				v3d->twmode = V3D_MANIP_GLOBAL; /* fallback to global	*/
 			}
 			else if (selected_index > index) {
 				v3d->twmode--;
@@ -365,15 +365,15 @@ EnumPropertyItem *BIF_enumTransformOrientation(bContext *C)
 {
 	Scene *scene;
 	ListBase *transform_spaces;
-	TransformOrientation *ts= NULL;
+	TransformOrientation *ts = NULL;
 
-	EnumPropertyItem global	= {V3D_MANIP_GLOBAL, "GLOBAL", 0, "Global", ""};
+	EnumPropertyItem global = {V3D_MANIP_GLOBAL, "GLOBAL", 0, "Global", ""};
 	EnumPropertyItem normal = {V3D_MANIP_NORMAL, "NORMAL", 0, "Normal", ""};
 	EnumPropertyItem local = {V3D_MANIP_LOCAL, "LOCAL", 0, "Local", ""};
 	EnumPropertyItem view = {V3D_MANIP_VIEW, "VIEW", 0, "View", ""};
 	EnumPropertyItem tmp = {0, "", 0, "", ""};
-	EnumPropertyItem *item= NULL;
-	int i = V3D_MANIP_CUSTOM, totitem= 0;
+	EnumPropertyItem *item = NULL;
+	int i = V3D_MANIP_CUSTOM, totitem = 0;
 
 	RNA_enum_item_add(&item, &totitem, &global);
 	RNA_enum_item_add(&item, &totitem, &normal);
@@ -381,7 +381,7 @@ EnumPropertyItem *BIF_enumTransformOrientation(bContext *C)
 	RNA_enum_item_add(&item, &totitem, &view);
 
 	if (C) {
-		scene= CTX_data_scene(C);
+		scene = CTX_data_scene(C);
 
 		if (scene) {
 			transform_spaces = &scene->transform_spaces;
@@ -394,7 +394,7 @@ EnumPropertyItem *BIF_enumTransformOrientation(bContext *C)
 
 	for (; ts; ts = ts->next) {
 		tmp.identifier = "CUSTOM";
-		tmp.name= ts->name;
+		tmp.name = ts->name;
 		tmp.value = i++;
 		RNA_enum_item_add(&item, &totitem, &tmp);
 	}
@@ -404,9 +404,9 @@ EnumPropertyItem *BIF_enumTransformOrientation(bContext *C)
 	return item;
 }
 
-const char * BIF_menustringTransformOrientation(const bContext *C, const char *title)
+const char *BIF_menustringTransformOrientation(const bContext *C, const char *title)
 {
-	const char* menu = IFACE_("%t|Global%x0|Local%x1|Gimbal%x4|Normal%x2|View%x3");
+	const char *menu = IFACE_("%t|Global%x0|Local%x1|Gimbal%x4|Normal%x2|View%x3");
 	ListBase *transform_spaces = &CTX_data_scene(C)->transform_spaces;
 	TransformOrientation *ts;
 	int i = V3D_MANIP_CUSTOM;
@@ -459,7 +459,7 @@ void applyTransformOrientation(const bContext *C, float mat[3][3], char *name)
 				break;
 			}
 		}
-	  }
+	}
 }
 
 static int count_bone_select(bArmature *arm, ListBase *lb, int do_it) 
@@ -468,7 +468,7 @@ static int count_bone_select(bArmature *arm, ListBase *lb, int do_it)
 	int do_next;
 	int total = 0;
 	
-	for (bone= lb->first; bone; bone= bone->next) {
+	for (bone = lb->first; bone; bone = bone->next) {
 		bone->flag &= ~BONE_TRANSFORM;
 		do_next = do_it;
 		if (do_it) {
@@ -476,7 +476,7 @@ static int count_bone_select(bArmature *arm, ListBase *lb, int do_it)
 				if (bone->flag & BONE_SELECTED) {
 					bone->flag |= BONE_TRANSFORM;
 					total++;
-					do_next = FALSE;	// no transform on children if one parent bone is selected
+					do_next = FALSE;    // no transform on children if one parent bone is selected
 				}
 			}
 		}
@@ -493,55 +493,55 @@ void initTransformOrientation(bContext *C, TransInfo *t)
 	Object *obedit = CTX_data_active_object(C);
 
 	switch (t->current_orientation) {
-	case V3D_MANIP_GLOBAL:
-		unit_m3(t->spacemtx);
-		strcpy(t->spacename, "global");
-		break;
-
-	case V3D_MANIP_GIMBAL:
-		unit_m3(t->spacemtx);
-		if (gimbal_axis(ob, t->spacemtx)) {
-			strcpy(t->spacename, "gimbal");
+		case V3D_MANIP_GLOBAL:
+			unit_m3(t->spacemtx);
+			strcpy(t->spacename, "global");
 			break;
-		}
+
+		case V3D_MANIP_GIMBAL:
+			unit_m3(t->spacemtx);
+			if (gimbal_axis(ob, t->spacemtx)) {
+				strcpy(t->spacename, "gimbal");
+				break;
+			}
 		/* no gimbal fallthrough to normal */
-	case V3D_MANIP_NORMAL:
-		if (obedit || (ob && ob->mode & OB_MODE_POSE)) {
-			strcpy(t->spacename, "normal");
-			ED_getTransformOrientationMatrix(C, t->spacemtx, (v3d->around == V3D_ACTIVE));
-			break;
-		}
+		case V3D_MANIP_NORMAL:
+			if (obedit || (ob && ob->mode & OB_MODE_POSE)) {
+				strcpy(t->spacename, "normal");
+				ED_getTransformOrientationMatrix(C, t->spacemtx, (v3d->around == V3D_ACTIVE));
+				break;
+			}
 		/* no break we define 'normal' as 'local' in Object mode */
-	case V3D_MANIP_LOCAL:
-		strcpy(t->spacename, "local");
+		case V3D_MANIP_LOCAL:
+			strcpy(t->spacename, "local");
 		
-		if (ob) {
-			copy_m3_m4(t->spacemtx, ob->obmat);
-			normalize_m3(t->spacemtx);
-		}
-		else {
-			unit_m3(t->spacemtx);
-		}
+			if (ob) {
+				copy_m3_m4(t->spacemtx, ob->obmat);
+				normalize_m3(t->spacemtx);
+			}
+			else {
+				unit_m3(t->spacemtx);
+			}
 		
-		break;
+			break;
 		
-	case V3D_MANIP_VIEW:
-		if (t->ar->regiontype == RGN_TYPE_WINDOW) {
-			RegionView3D *rv3d = t->ar->regiondata;
-			float mat[3][3];
-
-			strcpy(t->spacename, "view");
-			copy_m3_m4(mat, rv3d->viewinv);
-			normalize_m3(mat);
-			copy_m3_m3(t->spacemtx, mat);
-		}
-		else {
-			unit_m3(t->spacemtx);
-		}
-		break;
-	default: /* V3D_MANIP_CUSTOM */
-		applyTransformOrientation(C, t->spacemtx, t->spacename);
-		break;
+		case V3D_MANIP_VIEW:
+			if (t->ar->regiontype == RGN_TYPE_WINDOW) {
+				RegionView3D *rv3d = t->ar->regiondata;
+				float mat[3][3];
+
+				strcpy(t->spacename, "view");
+				copy_m3_m4(mat, rv3d->viewinv);
+				normalize_m3(mat);
+				copy_m3_m3(t->spacemtx, mat);
+			}
+			else {
+				unit_m3(t->spacemtx);
+			}
+			break;
+		default: /* V3D_MANIP_CUSTOM */
+			applyTransformOrientation(C, t->spacemtx, t->spacename);
+			break;
 	}
 }
 
@@ -549,7 +549,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
 {
 	Scene *scene = CTX_data_scene(C);
 	View3D *v3d = CTX_wm_view3d(C);
-	Object *obedit= CTX_data_edit_object(C);
+	Object *obedit = CTX_data_edit_object(C);
 	Base *base;
 	Object *ob = OBACT;
 	int result = ORIENTATION_NONE;
@@ -566,14 +566,14 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
 		invert_m3_m3(mat, imat);
 		transpose_m3(mat);
 
-		ob= obedit;
+		ob = obedit;
 
-		if (ob->type==OB_MESH) {
-			Mesh *me= ob->data;
+		if (ob->type == OB_MESH) {
+			Mesh *me = ob->data;
 			BMEditMesh *em = me->edit_btmesh;
 			BMVert *eve;
 			BMEditSelection ese;
-			float vec[3]= {0, 0, 0};
+			float vec[3] = {0, 0, 0};
 			
 			/* USE LAST SELECTED WITH ACTIVE */
 			if (activeOnly && BM_select_history_active_get(em->bm, &ese)) {
@@ -711,17 +711,17 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
 			}
 		} /* end editmesh */
 		else if (ELEM(obedit->type, OB_CURVE, OB_SURF)) {
-			Curve *cu= obedit->data;
+			Curve *cu = obedit->data;
 			Nurb *nu;
 			BezTriple *bezt;
 			int a;
-			ListBase *nurbs= BKE_curve_editNurbs_get(cu);
+			ListBase *nurbs = BKE_curve_editNurbs_get(cu);
 
 			for (nu = nurbs->first; nu; nu = nu->next) {
 				/* only bezier has a normal */
 				if (nu->type == CU_BEZIER) {
-					bezt= nu->bezt;
-					a= nu->pntsu;
+					bezt = nu->bezt;
+					a = nu->pntsu;
 					while (a--) {
 						/* exception */
 						if ((bezt->f1 & SELECT) + (bezt->f2 & SELECT) + (bezt->f3 & SELECT) > SELECT) {
@@ -747,7 +747,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
 				result = ORIENTATION_NORMAL;
 			}
 		}
-		else if (obedit->type==OB_MBALL) {
+		else if (obedit->type == OB_MBALL) {
 #if 0 // XXX
 			/* editmball.c */
 			MetaElem *ml, *ml_sel = NULL;
@@ -784,7 +784,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
 			bArmature *arm = obedit->data;
 			EditBone *ebone;
 			
-			for (ebone = arm->edbo->first; ebone; ebone=ebone->next) {
+			for (ebone = arm->edbo->first; ebone; ebone = ebone->next) {
 				if (arm->layer & ebone->layer) {
 					if (ebone->flag & BONE_SELECTED) {
 						float tmat[3][3];
@@ -819,7 +819,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
 		}
 	}
 	else if (ob && (ob->mode & OB_MODE_POSE)) {
-		bArmature *arm= ob->data;
+		bArmature *arm = ob->data;
 		bPoseChannel *pchan;
 		int totsel;
 		
@@ -828,7 +828,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
 			float imat[3][3], mat[3][3];
 
 			/* use channels to get stats */
-			for (pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
+			for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
 				if (pchan->bone && pchan->bone->flag & BONE_TRANSFORM) {
 					add_v3_v3(normal, pchan->pose_mat[2]);
 					add_v3_v3(plane, pchan->pose_mat[1]);
@@ -847,7 +847,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
 			result = ORIENTATION_EDGE;
 		}
 	}
-	else if (ob && (ob->mode & (OB_MODE_ALL_PAINT|OB_MODE_PARTICLE_EDIT))) {
+	else if (ob && (ob->mode & (OB_MODE_ALL_PAINT | OB_MODE_PARTICLE_EDIT))) {
 		/* pass */
 	}
 	else {
@@ -855,10 +855,10 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
 		ob = OBACT;
 		if (ob && !(ob->flag & SELECT)) ob = NULL;
 		
-		for (base= scene->base.first; base; base= base->next) {
+		for (base = scene->base.first; base; base = base->next) {
 			if (TESTBASELIB(v3d, base)) {
 				if (ob == NULL) {
-					ob= base->object;
+					ob = base->object;
 					break;
 				}
 			}
@@ -876,8 +876,8 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
 
 void ED_getTransformOrientationMatrix(const bContext *C, float orientation_mat[][3], int activeOnly)
 {
-	float normal[3]={0.0, 0.0, 0.0};
-	float plane[3]={0.0, 0.0, 0.0};
+	float normal[3] = {0.0, 0.0, 0.0};
+	float plane[3] = {0.0, 0.0, 0.0};
 
 	int type;
 
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index a04ce1ca213..9ebd43cd0d1 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -129,13 +129,13 @@ int BIF_snappingSupported(Object *obedit)
 
 int validSnap(TransInfo *t)
 {
-	return (t->tsnap.status & (POINT_INIT|TARGET_INIT)) == (POINT_INIT|TARGET_INIT) ||
-			(t->tsnap.status & (MULTI_POINTS|TARGET_INIT)) == (MULTI_POINTS|TARGET_INIT);
+	return (t->tsnap.status & (POINT_INIT | TARGET_INIT)) == (POINT_INIT | TARGET_INIT) ||
+	       (t->tsnap.status & (MULTI_POINTS | TARGET_INIT)) == (MULTI_POINTS | TARGET_INIT);
 }
 
 int activeSnap(TransInfo *t)
 {
-	return (t->modifiers & (MOD_SNAP|MOD_SNAP_INVERT)) == MOD_SNAP || (t->modifiers & (MOD_SNAP|MOD_SNAP_INVERT)) == MOD_SNAP_INVERT;
+	return (t->modifiers & (MOD_SNAP | MOD_SNAP_INVERT)) == MOD_SNAP || (t->modifiers & (MOD_SNAP | MOD_SNAP_INVERT)) == MOD_SNAP_INVERT;
 }
 
 void drawSnapping(const struct bContext *C, TransInfo *t)
@@ -144,13 +144,13 @@ void drawSnapping(const struct bContext *C, TransInfo *t)
 		
 		unsigned char col[4], selectedCol[4], activeCol[4];
 		UI_GetThemeColor3ubv(TH_TRANSFORM, col);
-		col[3]= 128;
+		col[3] = 128;
 		
 		UI_GetThemeColor3ubv(TH_SELECT, selectedCol);
-		selectedCol[3]= 128;
+		selectedCol[3] = 128;
 
 		UI_GetThemeColor3ubv(TH_ACTIVE, activeCol);
-		activeCol[3]= 192;
+		activeCol[3] = 192;
 
 		if (t->spacetype == SPACE_VIEW3D) {
 			TransSnapPoint *p;
@@ -187,31 +187,31 @@ void drawSnapping(const struct bContext *C, TransInfo *t)
 				glColor4ubv(activeCol);
 
 				glBegin(GL_LINES);
-					glVertex3f(t->tsnap.snapPoint[0], t->tsnap.snapPoint[1], t->tsnap.snapPoint[2]);
-					glVertex3f(t->tsnap.snapPoint[0] + t->tsnap.snapNormal[0],
-					           t->tsnap.snapPoint[1] + t->tsnap.snapNormal[1],
-					           t->tsnap.snapPoint[2] + t->tsnap.snapNormal[2]);
-					glEnd();
+				glVertex3f(t->tsnap.snapPoint[0], t->tsnap.snapPoint[1], t->tsnap.snapPoint[2]);
+				glVertex3f(t->tsnap.snapPoint[0] + t->tsnap.snapNormal[0],
+				           t->tsnap.snapPoint[1] + t->tsnap.snapNormal[1],
+				           t->tsnap.snapPoint[2] + t->tsnap.snapNormal[2]);
+				glEnd();
 			}
 			
 			if (v3d->zbuf)
 				glEnable(GL_DEPTH_TEST);
 		}
-		else if (t->spacetype==SPACE_IMAGE) {
+		else if (t->spacetype == SPACE_IMAGE) {
 			/* This will not draw, and Im nor sure why - campbell */
 #if 0
 			float xuser_asp, yuser_asp;
 			int wi, hi;
 			float w, h;
 			
-			calc_image_view(G.sima, 'f');	// float
+			calc_image_view(G.sima, 'f');   // float
 			myortho2(G.v2d->cur.xmin, G.v2d->cur.xmax, G.v2d->cur.ymin, G.v2d->cur.ymax);
 			glLoadIdentity();
 			
 			ED_space_image_aspect(t->sa->spacedata.first, &xuser_aspx, &yuser_asp);
 			ED_space_image_width(t->sa->spacedata.first, &wi, &hi);
-			w = (((float)wi)/256.0f)*G.sima->zoom * xuser_asp;
-			h = (((float)hi)/256.0f)*G.sima->zoom * yuser_asp;
+			w = (((float)wi) / 256.0f) * G.sima->zoom * xuser_asp;
+			h = (((float)hi) / 256.0f) * G.sima->zoom * yuser_asp;
 			
 			cpack(0xFFFFFF);
 			glTranslatef(t->tsnap.snapPoint[0], t->tsnap.snapPoint[1], 0.0f);
@@ -220,10 +220,10 @@ void drawSnapping(const struct bContext *C, TransInfo *t)
 			
 			setlinestyle(0);
 			cpack(0x0);
-			fdrawline(-0.020/w, 0, -0.1/w, 0);
-			fdrawline(0.1/w, 0, .020/w, 0);
-			fdrawline(0, -0.020/h, 0, -0.1/h);
-			fdrawline(0, 0.1/h, 0, 0.020/h);
+			fdrawline(-0.020 / w, 0, -0.1 / w, 0);
+			fdrawline(0.1 / w, 0, .020 / w, 0);
+			fdrawline(0, -0.020 / h, 0, -0.1 / h);
+			fdrawline(0, 0.1 / h, 0, 0.020 / h);
 			
 			glTranslatef(-t->tsnap.snapPoint[0], -t->tsnap.snapPoint[1], 0.0f);
 			setlinestyle(0);
@@ -261,12 +261,12 @@ void applyProject(TransInfo *t)
 		float imat[4][4];
 		int i;
 	
-		if (t->flag & (T_EDIT|T_POSE)) {
-			Object *ob = t->obedit?t->obedit:t->poseobj;
+		if (t->flag & (T_EDIT | T_POSE)) {
+			Object *ob = t->obedit ? t->obedit : t->poseobj;
 			invert_m4_m4(imat, ob->obmat);
 		}
 
-		for (i = 0 ; i < t->total; i++, td++) {
+		for (i = 0; i < t->total; i++, td++) {
 			float iloc[3], loc[3], no[3];
 			float mval[2];
 			int dist = 1000;
@@ -278,12 +278,12 @@ void applyProject(TransInfo *t)
 				continue;
 			
 			copy_v3_v3(iloc, td->loc);
-			if (t->flag & (T_EDIT|T_POSE)) {
-				Object *ob = t->obedit?t->obedit:t->poseobj;
+			if (t->flag & (T_EDIT | T_POSE)) {
+				Object *ob = t->obedit ? t->obedit : t->poseobj;
 				mul_m4_v3(ob->obmat, iloc);
 			}
 			else if (t->flag & T_OBJECT) {
-				td->ob->recalc |= OB_RECALC_OB|OB_RECALC_DATA|OB_RECALC_TIME;
+				td->ob->recalc |= OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME;
 				BKE_object_handle_update(t->scene, td->ob);
 				copy_v3_v3(iloc, td->ob->obmat[3]);
 			}
@@ -387,7 +387,7 @@ static void initSnappingMode(TransInfo *t)
 
 		/* Edit mode */
 		if (t->tsnap.applySnap != NULL && // A snapping function actually exist
-			(obedit != NULL && ELEM4(obedit->type, OB_MESH, OB_ARMATURE, OB_CURVE, OB_LATTICE)) ) // Temporary limited to edit mode meshes, armature, curves
+		    (obedit != NULL && ELEM4(obedit->type, OB_MESH, OB_ARMATURE, OB_CURVE, OB_LATTICE)) ) // Temporary limited to edit mode meshes, armature, curves
 		{
 			/* Exclude editmesh if using proportional edit */
 			if ((obedit->type == OB_MESH) && (t->flag & T_PROP_EDIT)) {
@@ -399,13 +399,13 @@ static void initSnappingMode(TransInfo *t)
 		}
 		/* Particles edit mode*/
 		else if (t->tsnap.applySnap != NULL && // A snapping function actually exist
-			(obedit == NULL && BASACT && BASACT->object && BASACT->object->mode & OB_MODE_PARTICLE_EDIT ))
+		         (obedit == NULL && BASACT && BASACT->object && BASACT->object->mode & OB_MODE_PARTICLE_EDIT))
 		{
 			t->tsnap.modeSelect = SNAP_ALL;
 		}
 		/* Object mode */
 		else if (t->tsnap.applySnap != NULL && // A snapping function actually exist
-			(obedit == NULL) ) // Object Mode
+		         (obedit == NULL) ) // Object Mode
 		{
 			t->tsnap.modeSelect = SNAP_NOT_SELECTED;
 		}
@@ -438,7 +438,7 @@ void initSnapping(TransInfo *t, wmOperator *op)
 			
 			if (RNA_struct_property_is_set(op->ptr, "snap_point")) {
 				RNA_float_get_array(op->ptr, "snap_point", t->tsnap.snapPoint);
-				t->tsnap.status |= SNAP_FORCED|POINT_INIT;
+				t->tsnap.status |= SNAP_FORCED | POINT_INIT;
 			}
 			
 			/* snap align only defined in specific cases */
@@ -497,33 +497,33 @@ static void setSnappingCallback(TransInfo *t)
 	}
 
 	switch (t->mode) {
-	case TFM_TRANSLATION:
-		t->tsnap.applySnap = ApplySnapTranslation;
-		t->tsnap.distance = TranslationBetween;
-		break;
-	case TFM_ROTATION:
-		t->tsnap.applySnap = ApplySnapRotation;
-		t->tsnap.distance = RotationBetween;
-		
-		// Can't do TARGET_CENTER with rotation, use TARGET_MEDIAN instead
-		if (t->tsnap.target == SCE_SNAP_TARGET_CENTER) {
-			t->tsnap.target = SCE_SNAP_TARGET_MEDIAN;
-			t->tsnap.targetSnap = TargetSnapMedian;
-		}
-		break;
-	case TFM_RESIZE:
-		t->tsnap.applySnap = ApplySnapResize;
-		t->tsnap.distance = ResizeBetween;
-		
-		// Can't do TARGET_CENTER with resize, use TARGET_MEDIAN instead
-		if (t->tsnap.target == SCE_SNAP_TARGET_CENTER) {
-			t->tsnap.target = SCE_SNAP_TARGET_MEDIAN;
-			t->tsnap.targetSnap = TargetSnapMedian;
-		}
-		break;
-	default:
-		t->tsnap.applySnap = NULL;
-		break;
+		case TFM_TRANSLATION:
+			t->tsnap.applySnap = ApplySnapTranslation;
+			t->tsnap.distance = TranslationBetween;
+			break;
+		case TFM_ROTATION:
+			t->tsnap.applySnap = ApplySnapRotation;
+			t->tsnap.distance = RotationBetween;
+
+			// Can't do TARGET_CENTER with rotation, use TARGET_MEDIAN instead
+			if (t->tsnap.target == SCE_SNAP_TARGET_CENTER) {
+				t->tsnap.target = SCE_SNAP_TARGET_MEDIAN;
+				t->tsnap.targetSnap = TargetSnapMedian;
+			}
+			break;
+		case TFM_RESIZE:
+			t->tsnap.applySnap = ApplySnapResize;
+			t->tsnap.distance = ResizeBetween;
+
+			// Can't do TARGET_CENTER with resize, use TARGET_MEDIAN instead
+			if (t->tsnap.target == SCE_SNAP_TARGET_CENTER) {
+				t->tsnap.target = SCE_SNAP_TARGET_MEDIAN;
+				t->tsnap.targetSnap = TargetSnapMedian;
+			}
+			break;
+		default:
+			t->tsnap.applySnap = NULL;
+			break;
 	}
 }
 
@@ -550,7 +550,7 @@ int updateSelectedSnapPoint(TransInfo *t)
 		int closest_dist = 0;
 		int screen_loc[2];
 
-		for ( p = t->tsnap.points.first; p; p = p->next ) {
+		for (p = t->tsnap.points.first; p; p = p->next) {
 			int dx, dy;
 			int dist;
 
@@ -663,8 +663,8 @@ static float RotationBetween(TransInfo *t, float p1[3], float p2[3])
 	float angle, start[3], end[3], center[3];
 	
 	copy_v3_v3(center, t->center);	
-	if (t->flag & (T_EDIT|T_POSE)) {
-		Object *ob= t->obedit?t->obedit:t->poseobj;
+	if (t->flag & (T_EDIT | T_POSE)) {
+		Object *ob = t->obedit ? t->obedit : t->poseobj;
 		mul_m4_v3(ob->obmat, center);
 	}
 
@@ -719,8 +719,8 @@ static float ResizeBetween(TransInfo *t, float p1[3], float p2[3])
 	float d1[3], d2[3], center[3], len_d1;
 	
 	copy_v3_v3(center, t->center);	
-	if (t->flag & (T_EDIT|T_POSE)) {
-		Object *ob= t->obedit?t->obedit:t->poseobj;
+	if (t->flag & (T_EDIT | T_POSE)) {
+		Object *ob = t->obedit ? t->obedit : t->poseobj;
 		mul_m4_v3(ob->obmat, center);
 	}
 
@@ -739,7 +739,7 @@ static float ResizeBetween(TransInfo *t, float p1[3], float p2[3])
 
 /********************** CALC **************************/
 
-static void UNUSED_FUNCTION(CalcSnapGrid)(TransInfo *t, float *UNUSED(vec))
+static void UNUSED_FUNCTION(CalcSnapGrid) (TransInfo * t, float *UNUSED(vec))
 {
 	snapGridAction(t, t->tsnap.snapPoint, BIG_GEARS);
 }
@@ -830,9 +830,9 @@ static void CalcSnapGeometry(TransInfo *t, float *UNUSED(vec))
 			if (max_dist != FLT_MAX) {
 				copy_v3_v3(loc, p);
 				/* XXX, is there a correct normal in this case ???, for now just z up */
-				no[0]= 0.0;
-				no[1]= 0.0;
-				no[2]= 1.0;
+				no[0] = 0.0;
+				no[1] = 0.0;
+				no[2] = 1.0;
 				found = 1;
 			}
 			
@@ -861,12 +861,12 @@ static void CalcSnapGeometry(TransInfo *t, float *UNUSED(vec))
 			t->tsnap.status &= ~POINT_INIT;
 		}
 	}
-	else if (t->spacetype == SPACE_IMAGE && t->obedit != NULL && t->obedit->type==OB_MESH) {
+	else if (t->spacetype == SPACE_IMAGE && t->obedit != NULL && t->obedit->type == OB_MESH) {
 		/* same as above but for UV's */
-		Image *ima= ED_space_image(t->sa->spacedata.first);
+		Image *ima = ED_space_image(t->sa->spacedata.first);
 		float aspx, aspy, co[2];
 		
-		UI_view2d_region_to_view(&t->ar->v2d, t->mval[0], t->mval[1], co, co+1);
+		UI_view2d_region_to_view(&t->ar->v2d, t->mval[0], t->mval[1], co, co + 1);
 
 		if (ED_uvedit_nearest_uv(t->scene, t->obedit, ima, co, t->tsnap.snapPoint)) {
 			ED_space_image_uv_aspect(t->sa->spacedata.first, &aspx, &aspy);
@@ -888,8 +888,8 @@ static void TargetSnapCenter(TransInfo *t)
 	/* Only need to calculate once */
 	if ((t->tsnap.status & TARGET_INIT) == 0) {
 		copy_v3_v3(t->tsnap.snapTarget, t->center);	
-		if (t->flag & (T_EDIT|T_POSE)) {
-			Object *ob= t->obedit?t->obedit:t->poseobj;
+		if (t->flag & (T_EDIT | T_POSE)) {
+			Object *ob = t->obedit ? t->obedit : t->poseobj;
 			mul_m4_v3(ob->obmat, t->tsnap.snapTarget);
 		}
 		
@@ -905,7 +905,7 @@ static void TargetSnapActive(TransInfo *t)
 		TransData *active_td = NULL;
 		int i;
 
-		for (td = t->data, i = 0 ; i < t->total && td->flag & TD_SELECTED ; i++, td++) {
+		for (td = t->data, i = 0; i < t->total && td->flag & TD_SELECTED; i++, td++) {
 			if (td->flag & TD_ACTIVE) {
 				active_td = td;
 				break;
@@ -915,8 +915,8 @@ static void TargetSnapActive(TransInfo *t)
 		if (active_td) {
 			copy_v3_v3(t->tsnap.snapTarget, active_td->center);
 				
-			if (t->flag & (T_EDIT|T_POSE)) {
-				Object *ob= t->obedit?t->obedit:t->poseobj;
+			if (t->flag & (T_EDIT | T_POSE)) {
+				Object *ob = t->obedit ? t->obedit : t->poseobj;
 				mul_m4_v3(ob->obmat, t->tsnap.snapTarget);
 			}
 			
@@ -942,14 +942,14 @@ static void TargetSnapMedian(TransInfo *t)
 		t->tsnap.snapTarget[1] = 0;
 		t->tsnap.snapTarget[2] = 0;
 		
-		for (td = t->data, i = 0 ; i < t->total && td->flag & TD_SELECTED ; i++, td++) {
+		for (td = t->data, i = 0; i < t->total && td->flag & TD_SELECTED; i++, td++) {
 			add_v3_v3(t->tsnap.snapTarget, td->center);
 		}
 		
 		mul_v3_fl(t->tsnap.snapTarget, 1.0 / i);
 		
-		if (t->flag & (T_EDIT|T_POSE)) {
-			Object *ob= t->obedit?t->obedit:t->poseobj;
+		if (t->flag & (T_EDIT | T_POSE)) {
+			Object *ob = t->obedit ? t->obedit : t->poseobj;
 			mul_m4_v3(ob->obmat, t->tsnap.snapTarget);
 		}
 		
@@ -966,7 +966,7 @@ static void TargetSnapClosest(TransInfo *t)
 		/* Object mode */
 		if (t->flag & T_OBJECT) {
 			int i;
-			for (td = t->data, i = 0 ; i < t->total && td->flag & TD_SELECTED ; i++, td++) {
+			for (td = t->data, i = 0; i < t->total && td->flag & TD_SELECTED; i++, td++) {
 				struct BoundBox *bb = BKE_object_boundbox_get(td->ob);
 				
 				/* use boundbox if possible */
@@ -1008,14 +1008,14 @@ static void TargetSnapClosest(TransInfo *t)
 		}
 		else {
 			int i;
-			for (td = t->data, i = 0 ; i < t->total && td->flag & TD_SELECTED ; i++, td++) {
+			for (td = t->data, i = 0; i < t->total && td->flag & TD_SELECTED; i++, td++) {
 				float loc[3];
 				float dist;
 				
 				copy_v3_v3(loc, td->center);
 				
-				if (t->flag & (T_EDIT|T_POSE)) {
-					Object *ob= t->obedit?t->obedit:t->poseobj;
+				if (t->flag & (T_EDIT | T_POSE)) {
+					Object *ob = t->obedit ? t->obedit : t->poseobj;
 					mul_m4_v3(ob->obmat, loc);
 				}
 				
@@ -1230,10 +1230,10 @@ static int snapArmature(short snap_mode, ARegion *ar, Object *ob, bArmature *arm
 	if (arm->edbo) {
 		EditBone *eBone;
 
-		for (eBone=arm->edbo->first; eBone; eBone=eBone->next) {
+		for (eBone = arm->edbo->first; eBone; eBone = eBone->next) {
 			if (eBone->layer & arm->layer) {
 				/* skip hidden or moving (selected) bones */
-				if ((eBone->flag & (BONE_HIDDEN_A|BONE_ROOTSEL|BONE_TIPSEL))==0) {
+				if ((eBone->flag & (BONE_HIDDEN_A | BONE_ROOTSEL | BONE_TIPSEL)) == 0) {
 					switch (snap_mode) {
 						case SCE_SNAP_MODE_VERTEX:
 							retval |= snapVertex(ar, eBone->head, NULL, obmat, NULL, ray_start, ray_start_local, ray_normal_local, mval, r_loc, NULL, r_dist, r_depth);
@@ -1251,10 +1251,10 @@ static int snapArmature(short snap_mode, ARegion *ar, Object *ob, bArmature *arm
 		bPoseChannel *pchan;
 		Bone *bone;
 		
-		for (pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
-			bone= pchan->bone;
+		for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
+			bone = pchan->bone;
 			/* skip hidden bones */
-			if (bone && !(bone->flag & (BONE_HIDDEN_P|BONE_HIDDEN_PG))) {
+			if (bone && !(bone->flag & (BONE_HIDDEN_P | BONE_HIDDEN_PG))) {
 				float *head_vec = pchan->pose_head;
 				float *tail_vec = pchan->pose_tail;
 				
@@ -1313,22 +1313,22 @@ static int snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMesh
 			switch (snap_mode) {
 				case SCE_SNAP_MODE_FACE:
 				{ 
-#ifdef USE_BVH_FACE_SNAP				// Added for durian
+#ifdef USE_BVH_FACE_SNAP                // Added for durian
 					BVHTreeRayHit hit;
 					BVHTreeFromMesh treeData;
 
 					/* local scale in normal direction */
 					float local_scale = len_v3(ray_normal_local);
 
-					treeData.em_evil= em;
+					treeData.em_evil = em;
 					bvhtree_from_mesh_faces(&treeData, dm, 0.0f, 4, 6);
 
 					hit.index = -1;
 					hit.dist = *r_depth * (*r_depth == FLT_MAX ? 1.0f : local_scale);
 
 					if (treeData.tree && BLI_bvhtree_ray_cast(treeData.tree, ray_start_local, ray_normal_local, 0.0f, &hit, treeData.raycast_callback, &treeData) != -1) {
-						if (hit.dist/local_scale <= *r_depth) {
-							*r_depth= hit.dist/local_scale;
+						if (hit.dist / local_scale <= *r_depth) {
+							*r_depth = hit.dist / local_scale;
 							copy_v3_v3(r_loc, hit.co);
 							copy_v3_v3(r_no, hit.no);
 
@@ -1356,7 +1356,7 @@ static int snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMesh
 						EDBM_index_arrays_init(em, 0, 0, 1);
 					}
 					
-					for ( i = 0; i < totface; i++) {
+					for (i = 0; i < totface; i++) {
 						BMFace *efa = NULL;
 						MFace *f = faces + i;
 						
@@ -1384,7 +1384,7 @@ static int snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMesh
 									BMLoop *l;
 									
 									l = BM_iter_new(&iter, em->bm, BM_LOOPS_OF_FACE, efa);
-									for ( ; l; l=BM_iter_step(&iter)) {
+									for (; l; l = BM_iter_step(&iter)) {
 										if (BM_elem_flag_test(l->v, BM_ELEM_SELECT)) {
 											test = 0;
 											break;
@@ -1430,7 +1430,7 @@ static int snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMesh
 						EDBM_index_arrays_init(em, 1, 0, 0);
 					}
 					
-					for ( i = 0; i < totvert; i++) {
+					for (i = 0; i < totvert; i++) {
 						BMVert *eve = NULL;
 						MVert *v = verts + i;
 						
@@ -1481,7 +1481,7 @@ static int snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMesh
 						EDBM_index_arrays_init(em, 0, 1, 0);
 					}
 					
-					for ( i = 0; i < totedge; i++) {
+					for (i = 0; i < totedge; i++) {
 						BMEdge *eed = NULL;
 						MEdge *e = edges + i;
 						
@@ -1502,8 +1502,8 @@ static int snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMesh
 								eed = EDBM_edge_at_index(em, index);
 								
 								if (eed && (BM_elem_flag_test(eed, BM_ELEM_HIDDEN) ||
-									BM_elem_flag_test(eed->v1, BM_ELEM_SELECT) || 
-									BM_elem_flag_test(eed->v2, BM_ELEM_SELECT)))
+								            BM_elem_flag_test(eed->v1, BM_ELEM_SELECT) ||
+								            BM_elem_flag_test(eed->v2, BM_ELEM_SELECT)))
 								{
 									test = 0;
 								}
@@ -1531,7 +1531,7 @@ static int snapObject(Scene *scene, ARegion *ar, Object *ob, int editobject, flo
                       const float ray_start[3], const float ray_normal[3], const float mval[2],
                       float r_loc[3], float r_no[3], int *r_dist, float *r_depth)
 {
-	ToolSettings *ts= scene->toolsettings;
+	ToolSettings *ts = scene->toolsettings;
 	int retval = 0;
 	
 	if (ob->type == OB_MESH) {
@@ -1580,18 +1580,18 @@ static int snapObjects(Scene *scene, View3D *v3d, ARegion *ar, Object *obedit, c
 	 *
 	 * To solve that problem, we do it first as an exception. 
 	 * */
-	base= BASACT;
+	base = BASACT;
 	if (base && base->object && base->object->mode & OB_MODE_PARTICLE_EDIT) {
 		Object *ob = base->object;
 		retval |= snapObject(scene, ar, ob, 0, ob->obmat, ray_start, ray_normal, mval, r_loc, r_no, r_dist, &depth);
 	}
 
-	for ( base = FIRSTBASE; base != NULL; base = base->next ) {
-		if ( (BASE_VISIBLE(v3d, base)) &&
-		     (base->flag & (BA_HAS_RECALC_OB|BA_HAS_RECALC_DATA)) == 0 &&
+	for (base = FIRSTBASE; base != NULL; base = base->next) {
+		if ((BASE_VISIBLE(v3d, base)) &&
+		    (base->flag & (BA_HAS_RECALC_OB | BA_HAS_RECALC_DATA)) == 0 &&
 
-		     (  (mode == SNAP_NOT_SELECTED && (base->flag & (SELECT|BA_WAS_SEL)) == 0) ||
-		        (ELEM(mode, SNAP_ALL, SNAP_NOT_OBEDIT) && base != BASACT))  )
+		    ((mode == SNAP_NOT_SELECTED && (base->flag & (SELECT | BA_WAS_SEL)) == 0) ||
+		     (ELEM(mode, SNAP_ALL, SNAP_NOT_OBEDIT) && base != BASACT)))
 		{
 			Object *ob = base->object;
 			
@@ -1719,7 +1719,7 @@ static int peelDerivedMesh(Object *ob, DerivedMesh *dm, float obmat[][4],
 			MFace *faces = dm->getTessFaceArray(dm);
 			int i;
 			
-			for ( i = 0; i < totface; i++) {
+			for (i = 0; i < totface; i++) {
 				MFace *f = faces + i;
 				float lambda;
 				int result;
@@ -1837,7 +1837,7 @@ static int peelObjects(Scene *scene, View3D *v3d, ARegion *ar, Object *obedit, L
 			if (ob->type == OB_MESH) {
 				int val = 0;
 
-				if (ob != obedit && ((mode == SNAP_NOT_SELECTED && (base->flag & (SELECT|BA_WAS_SEL)) == 0) || ELEM(mode, SNAP_ALL, SNAP_NOT_OBEDIT))) {
+				if (ob != obedit && ((mode == SNAP_NOT_SELECTED && (base->flag & (SELECT | BA_WAS_SEL)) == 0) || ELEM(mode, SNAP_ALL, SNAP_NOT_OBEDIT))) {
 					DerivedMesh *dm = mesh_get_derived_final(scene, ob, CD_MASK_BAREMESH);
 					
 					val = peelDerivedMesh(ob, dm, ob->obmat, ray_start, ray_normal, mval, depth_peels);
@@ -1918,7 +1918,7 @@ static void applyGrid(TransInfo *t, float *val, int max_index, float fac[3], Gea
 
 	if (max_index > 2) {
 		printf("applyGrid: invalid index %d, clamping\n", max_index);
-		max_index= 2;
+		max_index = 2;
 	}
 
 	// Early bailing out if no need to snap
@@ -1926,11 +1926,11 @@ static void applyGrid(TransInfo *t, float *val, int max_index, float fac[3], Gea
 		return;
 	
 	/* evil hack - snapping needs to be adapted for image aspect ratio */
-	if ((t->spacetype==SPACE_IMAGE) && (t->mode==TFM_TRANSLATION)) {
-		ED_space_image_uv_aspect(t->sa->spacedata.first, asp, asp+1);
+	if ((t->spacetype == SPACE_IMAGE) && (t->mode == TFM_TRANSLATION)) {
+		ED_space_image_uv_aspect(t->sa->spacedata.first, asp, asp + 1);
 	}
 
-	for (i=0; i<=max_index; i++) {
-		val[i]= fac[action]*asp[i]*(float)floor(val[i]/(fac[action]*asp[i]) +0.5f);
+	for (i = 0; i <= max_index; i++) {
+		val[i] = fac[action] * asp[i] * (float)floor(val[i] / (fac[action] * asp[i]) + 0.5f);
 	}
 }
diff --git a/source/blender/editors/util/undo.c b/source/blender/editors/util/undo.c
index e7a9ab9ca73..65d23641ab5 100644
--- a/source/blender/editors/util/undo.c
+++ b/source/blender/editors/util/undo.c
@@ -138,20 +138,20 @@ static int ed_undo_step(bContext *C, int step, const char *undoname)
 		return ED_undo_gpencil_step(C, step, undoname);
 	}
 
-	if (sa && sa->spacetype == SPACE_IMAGE) {
+	if (sa && (sa->spacetype == SPACE_IMAGE)) {
 		SpaceImage *sima = (SpaceImage *)sa->spacedata.first;
 		
-		if ((obact && obact->mode & OB_MODE_TEXTURE_PAINT) || sima->flag & SI_DRAWTOOL) {
+		if ((obact && (obact->mode & OB_MODE_TEXTURE_PAINT)) || (sima->flag & SI_DRAWTOOL)) {
 			if (!ED_undo_paint_step(C, UNDO_PAINT_IMAGE, step, undoname) && undoname)
 				if (U.uiflag & USER_GLOBALUNDO)
 					BKE_undo_name(C, undoname);
-
+			
 			WM_event_add_notifier(C, NC_WINDOW, NULL);
 			return OPERATOR_FINISHED;
 		}
 	}
 
-	if (sa && sa->spacetype == SPACE_TEXT) {
+	if (sa && (sa->spacetype == SPACE_TEXT)) {
 		ED_text_undo_step(C, step);
 	}
 	else if (obedit) {
@@ -160,7 +160,7 @@ static int ed_undo_step(bContext *C, int step, const char *undoname)
 				undo_editmode_name(C, undoname);
 			else
 				undo_editmode_step(C, step);
-
+			
 			WM_event_add_notifier(C, NC_GEOM | ND_DATA, NULL);
 		}
 	}
@@ -195,7 +195,7 @@ static int ed_undo_step(bContext *C, int step, const char *undoname)
 					BKE_undo_name(C, undoname);
 				else
 					BKE_undo_step(C, step);
-
+				
 				WM_event_add_notifier(C, NC_SCENE | ND_LAYER_CONTENT, CTX_data_scene(C));
 			}
 			
@@ -238,12 +238,12 @@ int ED_undo_valid(const bContext *C, const char *undoname)
 	if (sa && sa->spacetype == SPACE_IMAGE) {
 		SpaceImage *sima = (SpaceImage *)sa->spacedata.first;
 		
-		if ((obact && obact->mode & OB_MODE_TEXTURE_PAINT) || sima->flag & SI_DRAWTOOL) {
+		if ((obact && (obact->mode & OB_MODE_TEXTURE_PAINT)) || (sima->flag & SI_DRAWTOOL)) {
 			return 1;
 		}
 	}
 	
-	if (sa && sa->spacetype == SPACE_TEXT) {
+	if (sa && (sa->spacetype == SPACE_TEXT)) {
 		return 1;
 	}
 	else if (obedit) {
@@ -256,11 +256,11 @@ int ED_undo_valid(const bContext *C, const char *undoname)
 		/* if below tests fail, global undo gets executed */
 		
 		if (obact && obact->mode & OB_MODE_TEXTURE_PAINT) {
-			if (ED_undo_paint_valid(UNDO_PAINT_IMAGE, undoname) )
+			if (ED_undo_paint_valid(UNDO_PAINT_IMAGE, undoname))
 				return 1;
 		}
 		else if (obact && obact->mode & OB_MODE_SCULPT) {
-			if (ED_undo_paint_valid(UNDO_PAINT_MESH, undoname) )
+			if (ED_undo_paint_valid(UNDO_PAINT_MESH, undoname))
 				return 1;
 		}
 		else if (obact && obact->mode & OB_MODE_PARTICLE_EDIT) {
@@ -276,7 +276,7 @@ int ED_undo_valid(const bContext *C, const char *undoname)
 
 static int ed_undo_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	/* "last operator" should disappear, later we can tie ths with undo stack nicer */
+	/* "last operator" should disappear, later we can tie this with undo stack nicer */
 	WM_operator_stack_clear(CTX_wm_manager(C));
 	return ed_undo_step(C, 1, NULL);
 }
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index 53331dbe079..b15df9c3e89 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -3784,7 +3784,8 @@ void ED_keymap_uvedit(wmKeyConfig *keyconf)
 	RNA_string_set(kmi->ptr, "data_path", "space_data.uv_editor.pivot_point");
 	RNA_string_set(kmi->ptr, "value", "CURSOR");
 
-	ED_object_generic_keymap(keyconf, keymap, 2);
+	ED_keymap_proportional_cycle(keyconf, keymap);
+	ED_keymap_proportional_editmode(keyconf, keymap, FALSE);
 
 	transform_keymap_for_space(keyconf, keymap, SPACE_IMAGE);
 }
diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c
index 4a6de737e7a..87ff36ebf27 100644
--- a/source/blender/editors/uvedit/uvedit_parametrizer.c
+++ b/source/blender/editors/uvedit/uvedit_parametrizer.c
@@ -706,7 +706,7 @@ static void p_face_restore_uvs(PFace *f)
 
 /* Construction (use only during construction, relies on u.key being set */
 
-static PVert *p_vert_add(PHandle *handle, PHashKey key, float *co, PEdge *e)
+static PVert *p_vert_add(PHandle *handle, PHashKey key, const float co[3], PEdge *e)
 {
 	PVert *v = (PVert *)BLI_memarena_alloc(handle->arena, sizeof *v);
 	copy_v3_v3(v->co, co);
@@ -719,7 +719,7 @@ static PVert *p_vert_add(PHandle *handle, PHashKey key, float *co, PEdge *e)
 	return v;
 }
 
-static PVert *p_vert_lookup(PHandle *handle, PHashKey key, float *co, PEdge *e)
+static PVert *p_vert_lookup(PHandle *handle, PHashKey key, const float co[3], PEdge *e)
 {
 	PVert *v = (PVert *)phash_lookup(handle->hash_verts, key);
 
@@ -3596,7 +3596,7 @@ typedef struct SmoothNode {
 	int axis, ntri;
 } SmoothNode;
 
-static void p_barycentric_2d(float *v1, float *v2, float *v3, float *p, float *b)
+static void p_barycentric_2d(const float v1[2], const float v2[2], const float v3[2], const float p[2], float b[3])
 {
 	float a[2], c[2], h[2], div;
 
@@ -3624,7 +3624,7 @@ static void p_barycentric_2d(float *v1, float *v2, float *v3, float *p, float *b
 	}
 }
 
-static PBool p_triangle_inside(SmoothTriangle *t, float *co)
+static PBool p_triangle_inside(SmoothTriangle *t, float co[2])
 {
 	float b[3];
 
@@ -3706,7 +3706,7 @@ static void p_node_delete(SmoothNode *node)
 		MEM_freeN(node->tri);
 }
 
-static PBool p_node_intersect(SmoothNode *node, float *co)
+static PBool p_node_intersect(SmoothNode *node, float co[2])
 {
 	int i;
 
@@ -3726,7 +3726,7 @@ static PBool p_node_intersect(SmoothNode *node, float *co)
 
 }
 
-/* smooothing */
+/* smoothing */
 
 static int p_compare_float(const void *a, const void *b)
 {
diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
index c8dbee65f6a..0930edbe46d 100644
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
@@ -98,19 +98,14 @@ static int ED_uvedit_ensure_uvs(bContext *C, Scene *scene, Object *obedit)
 	SpaceLink *slink;
 	SpaceImage *sima;
 
-	if (ED_uvedit_test(obedit)) {
+	if (ED_uvedit_test(obedit))
 		return 1;
-	}
 
-	if (em && em->bm->totface && !CustomData_has_layer(&em->bm->pdata, CD_MTEXPOLY)) {
-		BM_data_layer_add(em->bm, &em->bm->pdata, CD_MTEXPOLY);
-		BM_data_layer_add(em->bm, &em->bm->ldata, CD_MLOOPUV);
-		ED_mesh_uv_loop_reset_ex(C, obedit->data, 0);
-	}
+	if (em && em->bm->totface && !CustomData_has_layer(&em->bm->pdata, CD_MTEXPOLY))
+		ED_mesh_uv_texture_add(C, obedit->data, NULL, TRUE);
 
-	if (!ED_uvedit_test(obedit)) {
+	if (!ED_uvedit_test(obedit))
 		return 0;
-	}
 
 	ima = CTX_data_edit_image(C);
 
diff --git a/source/blender/gpu/GPU_draw.h b/source/blender/gpu/GPU_draw.h
index 89976699114..438cfd6b741 100644
--- a/source/blender/gpu/GPU_draw.h
+++ b/source/blender/gpu/GPU_draw.h
@@ -112,6 +112,9 @@ void GPU_paint_set_mipmap(int mipmap);
 void GPU_set_anisotropic(float value);
 float GPU_get_anisotropic(void);
 
+/* enable gpu mipmapping */
+void GPU_set_gpu_mipmapping(int gpu_mipmap);
+
 /* Image updates and free
  * - these deal with images bound as opengl textures */
 
diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c
index f09310e53c7..75ed7d7eb19 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -1151,7 +1151,7 @@ void GPU_buffer_unbind(void)
 			glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
 		}
 	}
-	GLStates &= !(GPU_BUFFER_VERTEX_STATE | GPU_BUFFER_NORMAL_STATE |
+	GLStates &= ~(GPU_BUFFER_VERTEX_STATE | GPU_BUFFER_NORMAL_STATE |
 	              GPU_BUFFER_TEXCOORD_STATE | GPU_BUFFER_COLOR_STATE |
 	              GPU_BUFFER_ELEMENT_STATE);
 
@@ -1191,7 +1191,7 @@ void GPU_color_switch(int mode)
 	else {
 		if (GLStates & GPU_BUFFER_COLOR_STATE)
 			glDisableClientState(GL_COLOR_ARRAY);
-		GLStates &= (!GPU_BUFFER_COLOR_STATE);
+		GLStates &= ~GPU_BUFFER_COLOR_STATE;
 	}
 }
 
@@ -1660,7 +1660,7 @@ static int gpu_count_grid_quads(BLI_bitmap *grid_hidden,
 			glDeleteBuffersARB(1, &(buffer_));                          \
 			(buffer_) = 0;                                              \
 		}                                                               \
-	}
+	} (void)0
 /* end FILL_QUAD_BUFFER */
 
 static GLuint gpu_get_grid_buffer(int gridsize, GLenum *index_type, unsigned *totquad)
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c
index 7ae4aa550f9..a1bd8dcb3a3 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -230,14 +230,27 @@ static struct GPUTextureState {
 	Image *ima, *curima;
 
 	int domipmap, linearmipmap;
+	int texpaint; /* store this so that new images created while texture painting won't be set to mipmapped */
 
 	int alphablend;
 	float anisotropic;
+	int gpu_mipmap;
 	MTFace *lasttface;
-} GTS = {0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, 1, 0, -1, 1.f, NULL};
+} GTS = {0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, 1, 0, 0, -1, 1.f, 0, NULL};
 
 /* Mipmap settings */
 
+void GPU_set_gpu_mipmapping(int gpu_mipmap){
+	int old_value = GTS.gpu_mipmap;
+
+	/* only actually enable if it's supported */
+	GTS.gpu_mipmap = gpu_mipmap && GLEW_EXT_framebuffer_object;
+
+	if(old_value != GTS.gpu_mipmap) {
+		GPU_free_images();
+	}
+}
+
 void GPU_set_mipmap(int mipmap)
 {
 	if (GTS.domipmap != (mipmap != 0)) {
@@ -256,7 +269,7 @@ void GPU_set_linear_mipmap(int linear)
 
 static int gpu_get_mipmap(void)
 {
-	return GTS.domipmap;
+	return GTS.domipmap && !GTS.texpaint;
 }
 
 static GLenum gpu_get_mipmap_filter(int mag)
@@ -631,10 +644,19 @@ int GPU_verify_image(Image *ima, ImageUser *iuser, int tftile, int compare, int
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gpu_get_mipmap_filter(1));
 	}
 	else {
-		if (use_high_bit_depth)
-			gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA16, rectw, recth, GL_RGBA, GL_FLOAT, frect);
-		else
-			gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, rectw, recth, GL_RGBA, GL_UNSIGNED_BYTE, rect);
+		if(GTS.gpu_mipmap) {
+			if (use_high_bit_depth)
+				glTexImage2D(GL_TEXTURE_2D, 0,  GL_RGBA16,  rectw, recth, 0, GL_RGBA, GL_FLOAT, frect);
+			else
+				glTexImage2D(GL_TEXTURE_2D, 0,  GL_RGBA,  rectw, recth, 0, GL_RGBA, GL_UNSIGNED_BYTE, rect);
+
+			glGenerateMipmapEXT(GL_TEXTURE_2D);
+		} else {
+			if (use_high_bit_depth)
+				gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA16, rectw, recth, GL_RGBA, GL_FLOAT, frect);
+			else
+				gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, rectw, recth, GL_RGBA, GL_UNSIGNED_BYTE, rect);
+		}
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gpu_get_mipmap_filter(0));
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gpu_get_mipmap_filter(1));
 
@@ -730,6 +752,8 @@ void GPU_paint_set_mipmap(int mipmap)
 	if (!GTS.domipmap)
 		return;
 
+	GTS.texpaint = !mipmap;
+
 	if (mipmap) {
 		for (ima=G.main->image.first; ima; ima=ima->id.next) {
 			if (ima->bindcode) {
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c
index 31008ff8685..78b5219206d 100644
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -772,7 +772,7 @@ static void shade_one_light(GPUShadeInput *shi, GPUShadeResult *shr, GPULamp *la
 			GPU_link(mat, "mtex_value_invert", shadfac, &shadfac);
 			GPU_link(mat, "mix_mult",  shadfac, rgb, GPU_uniform(lamp->shadow_color), &rgb);
 			GPU_link(mat, "mtex_value_invert", shadfac, &shadfac);
-            add_to_diffuse(mat, ma, shi, is, rgb, &shr->diff);
+			add_to_diffuse(mat, ma, shi, is, rgb, &shr->diff);
 		}
 	}
 
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl
index 65c0bcb3c63..fb248f1b016 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -1105,7 +1105,7 @@ void mtex_normal(vec3 texco, sampler2D ima, out vec3 normal)
 	// It needs to be done because in Blender
 	// the normal used points inward.
 	// Should this ever change this negate must be removed.
-    vec4 color = texture2D(ima, texco.xy);
+	vec4 color = texture2D(ima, texco.xy);
 	normal = 2.0*(vec3(-color.r, color.g, color.b) - vec3(-0.5, 0.5, 0.5));
 }
 
@@ -1190,7 +1190,7 @@ void mtex_bump_init_viewspace( vec3 surf_pos, vec3 surf_norm,
 }
 
 void mtex_bump_tap3( vec3 texco, sampler2D ima, float hScale, 
-                     out float dBs, out float dBt ) 
+                     out float dBs, out float dBt )
 {
 	vec2 STll = texco.xy;
 	vec2 STlr = texco.xy + dFdx(texco.xy) ;
@@ -1261,8 +1261,8 @@ void mtex_bump_bicubic( vec3 texco, sampler2D ima, float hScale,
 
 		mat4 H;
 		
-		for(int i = 0; i < 4; i++){
-			for(int j = 0; j < 4; j++){
+		for(int i = 0; i < 4; i++) {
+			for(int j = 0; j < 4; j++) {
 				ivec2 iTexTmp = iTexLocMod + ivec2(i,j);
 				
 				// wrap texture coordinates manually for texelFetch to work on uvs oitside the 0,1 range.
@@ -1945,22 +1945,23 @@ void shade_alpha_obcolor(vec4 col, vec4 obcol, out vec4 outcol)
 
 float fresnel_dielectric(vec3 Incoming, vec3 Normal, float eta)
 {
-    /* compute fresnel reflectance without explicitly computing
-       the refracted direction */
-    float c = abs(dot(Incoming, Normal));
-    float g = eta * eta - 1.0 + c * c;
-    float result;
-
-    if(g > 0.0) {
-        g = sqrt(g);
-        float A =(g - c)/(g + c);
-        float B =(c *(g + c)- 1.0)/(c *(g - c)+ 1.0);
-        result = 0.5 * A * A *(1.0 + B * B);
-    }
-    else
-        result = 1.0;  /* TIR (no refracted component) */
+	/* compute fresnel reflectance without explicitly computing
+	 * the refracted direction */
+	float c = abs(dot(Incoming, Normal));
+	float g = eta * eta - 1.0 + c * c;
+	float result;
+
+	if(g > 0.0) {
+		g = sqrt(g);
+		float A =(g - c)/(g + c);
+		float B =(c *(g + c)- 1.0)/(c *(g - c)+ 1.0);
+		result = 0.5 * A * A *(1.0 + B * B);
+	}
+	else {
+		result = 1.0;  /* TIR (no refracted component) */
+	}
 
-    return result;
+	return result;
 }
 
 float hypot(float x, float y)
@@ -2135,13 +2136,13 @@ void node_tex_environment_empty(vec3 co, out vec4 color)
 void node_tex_image(vec3 co, sampler2D ima, out vec4 color, out float alpha)
 {
 	color = texture2D(ima, co.xy);
-    alpha = color.a;
+	alpha = color.a;
 }
 
 void node_tex_image_empty(vec3 co, out vec4 color, out float alpha)
 {
 	color = vec4(0.0);
-    alpha = 0.0;
+	alpha = 0.0;
 }
 
 void node_tex_magic(vec3 p, float scale, float distortion, out vec4 color, out float fac)
diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt
index 87b0c6c671a..f37b254d719 100644
--- a/source/blender/ikplugin/CMakeLists.txt
+++ b/source/blender/ikplugin/CMakeLists.txt
@@ -57,8 +57,5 @@ if(WITH_IK_ITASC)
 	)
 endif()
 
-if(WIN32)
-	add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY)
-endif()
 
 blender_add_lib(bf_ikplugin "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/ikplugin/SConscript b/source/blender/ikplugin/SConscript
index 4cff3399fdc..38c53894df8 100644
--- a/source/blender/ikplugin/SConscript
+++ b/source/blender/ikplugin/SConscript
@@ -8,7 +8,4 @@ incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen3'
 
 defs.append('WITH_IK_ITASC')
 
-if env['PLATFORM'] == 'win32':
-    defs.append('EIGEN_DONT_ALIGN_STATICALLY')
-
 env.BlenderLib ( 'bf_ikplugin', sources, Split(incs), defs, libtype=['core','player'], priority=[180, 190] )
diff --git a/source/blender/ikplugin/intern/itasc_plugin.cpp b/source/blender/ikplugin/intern/itasc_plugin.cpp
index 3be096b8935..048dd955726 100644
--- a/source/blender/ikplugin/intern/itasc_plugin.cpp
+++ b/source/blender/ikplugin/intern/itasc_plugin.cpp
@@ -176,6 +176,8 @@ struct IK_Scene
 	KDL::JntArray		jointArray;	// buffer for storing temporary joint array
 	iTaSC::Solver*		solver;
 	Object*				blArmature;
+	float				blScale;	// scale of the Armature object (assume uniform scaling)
+	float				blInvScale;	// inverse of Armature object scale
 	struct bConstraint*	polarConstraint;
 	std::vector<IK_Target*>		targets;
 
@@ -188,6 +190,7 @@ struct IK_Scene
 		scene = NULL;
 		base = NULL;
 		solver = NULL;
+		blScale = blInvScale = 1.0f;
 		blArmature = NULL;
 		numchan = 0;
 		numjoint = 0;
@@ -594,9 +597,10 @@ static bool base_callback(const iTaSC::Timestamp& timestamp, const iTaSC::Frame&
 		float chanmat[4][4];
 		copy_m4_m4(chanmat, pchan->pose_mat);
 		copy_v3_v3(chanmat[3], pchan->pose_tail);
-		// save the base as a frame too so that we can compute deformation
-		// after simulation
+		// save the base as a frame too so that we can compute deformation after simulation
 		ikscene->baseFrame.setValue(&chanmat[0][0]);
+		// iTaSC armature is scaled to object scale, scale the base frame too
+		ikscene->baseFrame.p *= ikscene->blScale;
 		mult_m4_m4m4(rootmat, ikscene->blArmature->obmat, chanmat);
 	} 
 	else {
@@ -996,7 +1000,7 @@ static void convert_pose(IK_Scene *ikscene)
 
 	// assume uniform scaling and take Y scale as general scale for the armature
 	scale = len_v3(ikscene->blArmature->obmat[1]);
-	rot = (ikscene->jointArray.rows() > 0) ? &ikscene->jointArray(0) : NULL;
+	rot = ikscene->jointArray(0);
 	for (joint=a=0, ikchan = ikscene->channels; a<ikscene->numchan && joint<ikscene->numjoint; ++a, ++ikchan) {
 		pchan= ikchan->pchan;
 		bone= pchan->bone;
@@ -1037,7 +1041,7 @@ static void BKE_pose_rest(IK_Scene *ikscene)
 	// rest pose is 0 
 	SetToZero(ikscene->jointArray);
 	// except for transY joints
-	rot = (ikscene->jointArray.rows() > 0) ? &ikscene->jointArray(0) : NULL;
+	rot = ikscene->jointArray(0);
 	for (joint=a=0, ikchan = ikscene->channels; a<ikscene->numchan && joint<ikscene->numjoint; ++a, ++ikchan) {
 		pchan= ikchan->pchan;
 		bone= pchan->bone;
@@ -1116,14 +1120,15 @@ static IK_Scene* convert_tree(Scene *blscene, Object *ob, bPoseChannel *pchan)
 		return NULL;
 	}
 	ikscene->blArmature = ob;
+	// assume uniform scaling and take Y scale as general scale for the armature
+	ikscene->blScale = len_v3(ob->obmat[1]);
+	ikscene->blInvScale = (ikscene->blScale < KDL::epsilon) ? 0.0f : 1.0f/ikscene->blScale;
 
 	std::string  joint;
 	std::string  root("root");
 	std::string  parent;
 	std::vector<double> weights;
 	double weight[3];
-	// assume uniform scaling and take Y scale as general scale for the armature
-	float scale = len_v3(ob->obmat[1]);
 	// build the array of joints corresponding to the IK chain
 	convert_channels(ikscene, tree);
 	if (ingame) {
@@ -1135,7 +1140,7 @@ static IK_Scene* convert_tree(Scene *blscene, Object *ob, bPoseChannel *pchan)
 		// in Blender, the rest pose is always 0 for joints
 		BKE_pose_rest(ikscene);
 	}
-	rot = (ikscene->jointArray.rows() > 0) ? &ikscene->jointArray(0) : NULL;
+	rot = ikscene->jointArray(0);
 	for (a=0, ikchan = ikscene->channels; a<tree->totchannel; ++a, ++ikchan) {
 		pchan= ikchan->pchan;
 		bone= pchan->bone;
@@ -1147,11 +1152,11 @@ static IK_Scene* convert_tree(Scene *blscene, Object *ob, bPoseChannel *pchan)
 						   fl[0][1], fl[1][1], fl[2][1],
 						   fl[0][2], fl[1][2], fl[2][2]);
 		KDL::Vector bpos(bone->head[0], bone->head[1], bone->head[2]);
-		bpos = bpos*scale;
+		bpos *= ikscene->blScale;
 		KDL::Frame head(brot, bpos);
 		
 		// rest pose length of the bone taking scaling into account
-		length= bone->length*scale;
+		length= bone->length*ikscene->blScale;
 		parent = (a > 0) ? ikscene->channels[tree->parent[a]].tail : root;
 		// first the fixed segment to the bone head
 		if (head.p.Norm() > KDL::epsilon || head.M.GetRot().Norm() > KDL::epsilon) {
@@ -1420,7 +1425,7 @@ static IK_Scene* convert_tree(Scene *blscene, Object *ob, bPoseChannel *pchan)
 		// add the end effector
 		// estimate the average bone length, used to clamp feedback error
 		for (bonecnt=0, bonelen=0.f, a=iktarget->channel; a>=0; a=tree->parent[a], bonecnt++)
-			bonelen += scale*tree->pchan[a]->bone->length;
+			bonelen += ikscene->blScale*tree->pchan[a]->bone->length;
 		bonelen /= bonecnt;		
 
 		// store the rest pose of the end effector to compute enforce target
@@ -1527,15 +1532,23 @@ static void create_scene(Scene *scene, Object *ob)
 	}
 }
 
-static void init_scene(Object *ob)
+/* returns 1 if scaling has changed and tree must be reinitialized */
+static int init_scene(Object *ob)
 {
+	// check also if scaling has changed
+	float scale = len_v3(ob->obmat[1]);
+	IK_Scene* scene;
+
 	if (ob->pose->ikdata) {
-		for (IK_Scene* scene = ((IK_Data*)ob->pose->ikdata)->first;
+		for (scene = ((IK_Data*)ob->pose->ikdata)->first;
 			scene != NULL;
 			scene = scene->next) {
+			if (fabs(scene->blScale - scale) > KDL::epsilon)
+				return 1;
 			scene->channels[0].pchan->flag |= POSE_IKTREE;
 		}
 	}
+	return 0;
 }
 
 static void execute_scene(Scene* blscene, IK_Scene* ikscene, bItasc* ikparam, float ctime, float frtime)
@@ -1682,6 +1695,10 @@ static void execute_scene(Scene* blscene, IK_Scene* ikscene, bItasc* ikparam, fl
 		pchan = ikchan->pchan;
 		// tail mat
 		ikchan->frame.getValue(&pchan->pose_mat[0][0]);
+		// the scale of the object was included in the ik scene, take it out now
+		// because the pose channels are relative to the object
+		mul_v3_fl(pchan->pose_mat[3], ikscene->blInvScale);
+		length *= ikscene->blInvScale;
 		copy_v3_v3(pchan->pose_tail, pchan->pose_mat[3]);
 		// shift to head
 		copy_v3_v3(yaxis, pchan->pose_mat[1]);
@@ -1708,8 +1725,8 @@ void itasc_initialize_tree(struct Scene *scene, Object *ob, float ctime)
 	int count = 0;
 
 	if (ob->pose->ikdata != NULL && !(ob->pose->flag & POSE_WAS_REBUILT)) {
-		init_scene(ob);
-		return;
+		if (!init_scene(ob))
+			return;
 	}
 	// first remove old scene
 	itasc_clear_data(ob->pose);
diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h
index a0c737b44fc..1a68d3c1f09 100644
--- a/source/blender/imbuf/IMB_imbuf.h
+++ b/source/blender/imbuf/IMB_imbuf.h
@@ -416,8 +416,6 @@ void bilinear_interpolation_color_wrap(struct ImBuf *in, unsigned char *col, flo
 /**
  *
  * \attention defined in readimage.c
- * \deprecated Only here for backwards compatibility of the
- * \deprecated plugin system.
  */  
 struct ImBuf *IMB_loadifffile(int file, int flags, const char *descr);
 
@@ -480,7 +478,7 @@ void IMB_freezbuffloatImBuf(struct ImBuf *ibuf);
  * \attention Defined in rectop.c
  */
 void IMB_rectfill(struct ImBuf *drect, const float col[4]);
-void IMB_rectfill_area(struct ImBuf *ibuf, float *col, int x1, int y1, int x2, int y2);
+void IMB_rectfill_area(struct ImBuf *ibuf, const float col[4], int x1, int y1, int x2, int y2);
 void IMB_rectfill_alpha(struct ImBuf *ibuf, const float value);
 
 /* this should not be here, really, we needed it for operating on render data, IMB_rectfill_area calls it */
diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h
index 12d71be658e..2cb1dfe149a 100644
--- a/source/blender/imbuf/IMB_imbuf_types.h
+++ b/source/blender/imbuf/IMB_imbuf_types.h
@@ -55,13 +55,8 @@ struct ImMetaData;
  * This is the abstraction of an image.  ImBuf is the basic type used for all
  * imbuf operations.
  *
- * REMINDER: if any changes take place, they need to be carried over
- * to source/blender/blenpluginapi/iff.h too, OTHERWISE PLUGINS WON'T
- * WORK CORRECTLY!
- *
  * Also; add new variables to the end to save pain!
  *
- * Also, that iff.h needs to be in the final release "plugins/include" dir, too!
  */
 typedef struct ImBuf {
 	struct ImBuf *next, *prev;	/**< allow lists of ImBufs, for caches or flipbooks */
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c
index b702e59bc16..2370dbeebc5 100644
--- a/source/blender/imbuf/intern/anim_movie.c
+++ b/source/blender/imbuf/intern/anim_movie.c
@@ -49,7 +49,7 @@
 	{ \
 		if (fcc == 0)       { fcc = mmioFOURCC('N', 'o', 'n', 'e'); } \
 		if (fcc == BI_RLE8) { fcc = mmioFOURCC('R', 'l', 'e', '8'); } \
-	}
+	} (void)0
 
 #endif
 
@@ -120,14 +120,17 @@ int ismovie(const char *UNUSED(filepath))
 }
 
 /* never called, just keep the linker happy */
-static int startmovie(struct anim *UNUSED(anim)) {
+static int startmovie(struct anim *UNUSED(anim))
+{
 	return 1;
 }
-static ImBuf *movie_fetchibuf(struct anim *UNUSED(anim), int UNUSED(position)) {
+static ImBuf *movie_fetchibuf(struct anim *UNUSED(anim), int UNUSED(position))
+{
 	return NULL;
 }
-static void free_anim_movie(struct anim *UNUSED(anim)) {
-	;
+static void free_anim_movie(struct anim *UNUSED(anim))
+{
+	/* pass */
 }
 
 
@@ -1157,9 +1160,9 @@ static void free_anim_redcode(struct anim *anim)
 
 #endif
 
-/* probeer volgende plaatje te lezen */
-/* Geen plaatje, probeer dan volgende animatie te openen */
-/* gelukt, haal dan eerste plaatje van animatie */
+/* Try next picture to read */
+/* No picture, try to open next animation */
+/* Succeed, remove first image from animation */
 
 static ImBuf *anim_getnew(struct anim *anim)
 {
diff --git a/source/blender/imbuf/intern/dds/ColorBlock.cpp b/source/blender/imbuf/intern/dds/ColorBlock.cpp
index 42bec5874ca..0b9f5c163fb 100644
--- a/source/blender/imbuf/intern/dds/ColorBlock.cpp
+++ b/source/blender/imbuf/intern/dds/ColorBlock.cpp
@@ -176,7 +176,7 @@ bool ColorBlock::isSingleColorNoAlpha() const
 	int i;
 	for (i = 0; i < 16; i++)
 	{
-        if (m_color[i].a != 0) c = m_color[i];
+		if (m_color[i].a != 0) c = m_color[i];
 	}
 
 	Color32 mask(0xFF, 0xFF, 0xFF, 0x00);
diff --git a/source/blender/imbuf/intern/divers.c b/source/blender/imbuf/intern/divers.c
index 062c7a9368d..1b68c520336 100644
--- a/source/blender/imbuf/intern/divers.c
+++ b/source/blender/imbuf/intern/divers.c
@@ -538,12 +538,16 @@ void IMB_rect_from_float(ImBuf *ibuf)
 		imb_addrectImBuf(ibuf);
 
 	/* determine profiles */
-	if (ibuf->profile == IB_PROFILE_LINEAR_RGB)
+	if (ibuf->profile == IB_PROFILE_LINEAR_RGB) {
 		profile_from = IB_PROFILE_LINEAR_RGB;
-	else if (ELEM(ibuf->profile, IB_PROFILE_SRGB, IB_PROFILE_NONE))
+	}
+	else if (ELEM(ibuf->profile, IB_PROFILE_SRGB, IB_PROFILE_NONE)) {
 		profile_from = IB_PROFILE_SRGB;
-	else
+	}
+	else {
+		profile_from = IB_PROFILE_SRGB; /* should never happen */
 		BLI_assert(0);
+	}
 
 	/* do conversion */
 	IMB_buffer_byte_from_float((uchar *)ibuf->rect, ibuf->rect_float,
@@ -571,12 +575,16 @@ void IMB_partial_rect_from_float(ImBuf *ibuf, float *buffer, int x, int y, int w
 		imb_addrectImBuf(ibuf);
 
 	/* determine profiles */
-	if (ibuf->profile == IB_PROFILE_LINEAR_RGB)
+	if (ibuf->profile == IB_PROFILE_LINEAR_RGB) {
 		profile_from = IB_PROFILE_LINEAR_RGB;
-	else if (ELEM(ibuf->profile, IB_PROFILE_SRGB, IB_PROFILE_NONE))
+	}
+	else if (ELEM(ibuf->profile, IB_PROFILE_SRGB, IB_PROFILE_NONE)) {
 		profile_from = IB_PROFILE_SRGB;
-	else
+	}
+	else {
+		profile_from = IB_PROFILE_SRGB; /* should never happen */
 		BLI_assert(0);
+	}
 
 	/* do conversion */
 	rect_float = ibuf->rect_float + (x + y * ibuf->x) * ibuf->channels;
@@ -764,7 +772,7 @@ void IMB_saturation(ImBuf *ibuf, float sat)
 		float rgb[3];
 		for (i = ibuf->x * ibuf->y; i > 0; i--, rct += 4) {
 			rgb_uchar_to_float(rgb, rct);
-			rgb_to_hsv(rgb[0], rgb[1], rgb[2], hsv, hsv + 1, hsv + 2);
+			rgb_to_hsv_v(rgb, hsv);
 			hsv_to_rgb(hsv[0], hsv[1] * sat, hsv[2], rgb, rgb + 1, rgb + 2);
 			rgb_float_to_uchar(rct, rgb);
 		}
@@ -772,7 +780,7 @@ void IMB_saturation(ImBuf *ibuf, float sat)
 
 	if (rctf) {
 		for (i = ibuf->x * ibuf->y; i > 0; i--, rctf += 4) {
-			rgb_to_hsv(rctf[0], rctf[1], rctf[2], hsv, hsv + 1, hsv + 2);
+			rgb_to_hsv_v(rctf, hsv);
 			hsv_to_rgb(hsv[0], hsv[1] * sat, hsv[2], rctf, rctf + 1, rctf + 2);
 		}
 	}
diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c
index 3af853ba150..a5826634724 100644
--- a/source/blender/imbuf/intern/jp2.c
+++ b/source/blender/imbuf/intern/jp2.c
@@ -43,6 +43,7 @@
 static char JP2_HEAD[] = {0x0, 0x0, 0x0, 0x0C, 0x6A, 0x50, 0x20, 0x20, 0x0D, 0x0A, 0x87, 0x0A};
 
 /* We only need this because of how the presets are set */
+/* this typedef is copied from 'openjpeg-1.5.0/applications/codec/image_to_j2k.c' */
 typedef struct img_folder {
 	/** The directory path of the folder containing input images*/
 	char *imgdirpath;
@@ -92,27 +93,35 @@ static void info_callback(const char *msg, void *client_data)
 	fprintf(stdout, "[INFO] %s", msg);
 }
 
+#   define PIXEL_LOOPER_BEGIN(_rect)                                          \
+	for (y = h - 1; y != (unsigned int)(-1); y--) {                           \
+		for (i = y * w, i_next = (y + 1) * w;                                 \
+		     i < i_next;                                                      \
+		     i++, _rect += 4)                                                 \
+		{                                                                     \
 
+#   define PIXEL_LOOPER_END \
+	} \
+	} (void)0 \
 
 struct ImBuf *imb_jp2_decode(unsigned char *mem, size_t size, int flags)
 {
 	struct ImBuf *ibuf = NULL;
 	int use_float = FALSE; /* for precision higher then 8 use float */
+	int use_alpha = FALSE;
 	
 	long signed_offsets[4] = {0, 0, 0, 0};
 	int float_divs[4] = {1, 1, 1, 1};
 
-	int index;
-	
-	int w, h, planes;
+	unsigned int i, i_next, w, h, planes;
+	unsigned int y;
+	int *r, *g, *b, *a; /* matching 'opj_image_comp.data' type */
 	
 	opj_dparameters_t parameters;   /* decompression parameters */
 	
 	opj_event_mgr_t event_mgr;      /* event manager */
 	opj_image_t *image = NULL;
-	
-	int i;
-	
+
 	opj_dinfo_t *dinfo = NULL;  /* handle to a decompressor */
 	opj_cio_t *cio = NULL;
 
@@ -169,9 +178,11 @@ struct ImBuf *imb_jp2_decode(unsigned char *mem, size_t size, int flags)
 		case 1: /* Greyscale */
 		case 3: /* Color */
 			planes = 24;
+			use_alpha = FALSE;
 			break;
 		default: /* 2 or 4 - Greyscale or Color + alpha */
 			planes = 32; /* greyscale + alpha */
+			use_alpha = TRUE;
 			break;
 	}
 	
@@ -206,64 +217,102 @@ struct ImBuf *imb_jp2_decode(unsigned char *mem, size_t size, int flags)
 		float *rect_float = ibuf->rect_float;
 
 		if (image->numcomps < 3) {
+			r = image->comps[0].data;
+			a = (use_alpha) ? image->comps[1].data : NULL;
+
 			/* greyscale 12bits+ */
-			for (i = 0; i < w * h; i++, rect_float += 4) {
-				index = w * h - ((i) / (w) + 1) * w + (i) % (w);
-				
-				rect_float[0] = rect_float[1] = rect_float[2] = (float)(image->comps[0].data[index] + signed_offsets[0]) / float_divs[0];
-				
-				if (image->numcomps == 2)
-					rect_float[3] = (image->comps[1].data[index] + signed_offsets[1]) / float_divs[1];
-				else
+			if (use_alpha) {
+				a = image->comps[1].data;
+				PIXEL_LOOPER_BEGIN(rect_float) {
+					rect_float[0] = rect_float[1] = rect_float[2] = (float)(r[i] + signed_offsets[0]) / float_divs[0];
+					rect_float[3] = (a[i] + signed_offsets[1]) / float_divs[1];
+				}
+				PIXEL_LOOPER_END;
+			}
+			else {
+				PIXEL_LOOPER_BEGIN(rect_float) {
+					rect_float[0] = rect_float[1] = rect_float[2] = (float)(r[i] + signed_offsets[0]) / float_divs[0];
 					rect_float[3] = 1.0f;
+				}
+				PIXEL_LOOPER_END;
 			}
 		}
 		else {
+			r = image->comps[0].data;
+			g = image->comps[1].data;
+			b = image->comps[2].data;
+
 			/* rgb or rgba 12bits+ */
-			for (i = 0; i < w * h; i++, rect_float += 4) {
-				index = w * h - ((i) / (w) + 1) * w + (i) % (w);
-				
-				rect_float[0] = (float)(image->comps[0].data[index] + signed_offsets[0]) / float_divs[0];
-				rect_float[1] = (float)(image->comps[1].data[index] + signed_offsets[1]) / float_divs[1];
-				rect_float[2] = (float)(image->comps[2].data[index] + signed_offsets[2]) / float_divs[2];
-				
-				if (image->numcomps >= 4)
-					rect_float[3] = (float)(image->comps[3].data[index] + signed_offsets[3]) / float_divs[3];
-				else
+			if (use_alpha) {
+				a = image->comps[3].data;
+				PIXEL_LOOPER_BEGIN(rect_float) {
+					rect_float[0] = (float)(r[i] + signed_offsets[0]) / float_divs[0];
+					rect_float[1] = (float)(g[i] + signed_offsets[1]) / float_divs[1];
+					rect_float[2] = (float)(b[i] + signed_offsets[2]) / float_divs[2];
+					rect_float[3] = (float)(a[i] + signed_offsets[3]) / float_divs[3];
+				}
+				PIXEL_LOOPER_END;
+			}
+			else {
+				PIXEL_LOOPER_BEGIN(rect_float) {
+					rect_float[0] = (float)(r[i] + signed_offsets[0]) / float_divs[0];
+					rect_float[1] = (float)(g[i] + signed_offsets[1]) / float_divs[1];
+					rect_float[2] = (float)(b[i] + signed_offsets[2]) / float_divs[2];
 					rect_float[3] = 1.0f;
+				}
+				PIXEL_LOOPER_END;
 			}
 		}
 		
 	}
 	else {
-		unsigned char *rect = (unsigned char *)ibuf->rect;
+		unsigned char *rect_uchar = (unsigned char *)ibuf->rect;
 
 		if (image->numcomps < 3) {
+			r = image->comps[0].data;
+			a = (use_alpha) ? image->comps[1].data : NULL;
+
 			/* greyscale */
-			for (i = 0; i < w * h; i++, rect += 4) {
-				index = w * h - ((i) / (w) + 1) * w + (i) % (w);
-				
-				rect[0] = rect[1] = rect[2] = (image->comps[0].data[index] + signed_offsets[0]);
-				
-				if (image->numcomps == 2)
-					rect[3] = image->comps[1].data[index] + signed_offsets[1];
-				else
-					rect[3] = 255;
+			if (use_alpha) {
+				a = image->comps[3].data;
+				PIXEL_LOOPER_BEGIN(rect_uchar) {
+					rect_uchar[0] = rect_uchar[1] = rect_uchar[2] = (r[i] + signed_offsets[0]);
+					rect_uchar[3] = a[i] + signed_offsets[1];
+				}
+				PIXEL_LOOPER_END;
+			}
+			else {
+				PIXEL_LOOPER_BEGIN(rect_uchar) {
+					rect_uchar[0] = rect_uchar[1] = rect_uchar[2] = (r[i] + signed_offsets[0]);
+					rect_uchar[3] = 255;
+				}
+				PIXEL_LOOPER_END;
 			}
 		}
 		else {
+			r = image->comps[0].data;
+			g = image->comps[1].data;
+			b = image->comps[2].data;
+
 			/* 8bit rgb or rgba */
-			for (i = 0; i < w * h; i++, rect += 4) {
-				int index = w * h - ((i) / (w) + 1) * w + (i) % (w);
-				
-				rect[0] = image->comps[0].data[index] + signed_offsets[0];
-				rect[1] = image->comps[1].data[index] + signed_offsets[1];
-				rect[2] = image->comps[2].data[index] + signed_offsets[2];
-				
-				if (image->numcomps >= 4)
-					rect[3] = image->comps[3].data[index] + signed_offsets[3];
-				else
-					rect[3] = 255;
+			if (use_alpha) {
+				a = image->comps[3].data;
+				PIXEL_LOOPER_BEGIN(rect_uchar) {
+					rect_uchar[0] = r[i] + signed_offsets[0];
+					rect_uchar[1] = g[i] + signed_offsets[1];
+					rect_uchar[2] = b[i] + signed_offsets[2];
+					rect_uchar[3] = a[i] + signed_offsets[3];
+				}
+				PIXEL_LOOPER_END;
+			}
+			else {
+				PIXEL_LOOPER_BEGIN(rect_uchar) {
+					rect_uchar[0] = r[i] + signed_offsets[0];
+					rect_uchar[1] = g[i] + signed_offsets[1];
+					rect_uchar[2] = b[i] + signed_offsets[2];
+					rect_uchar[3] = 255;
+				}
+				PIXEL_LOOPER_END;
 			}
 		}
 	}
@@ -286,13 +335,38 @@ struct ImBuf *imb_jp2_decode(unsigned char *mem, size_t size, int flags)
 //static opj_image_t* rawtoimage(const char *filename, opj_cparameters_t *parameters, raw_cparameters_t *raw_cp) {
 /* prec can be 8, 12, 16 */
 
+/* use inline because the float passed can be a function call that would end up being called many times */
+#if 0
 #define UPSAMPLE_8_TO_12(_val) ((_val << 4) | (_val & ((1 << 4) - 1)))
 #define UPSAMPLE_8_TO_16(_val) ((_val << 8) + _val)
 
 #define DOWNSAMPLE_FLOAT_TO_8BIT(_val)  (_val) <= 0.0f ? 0 : ((_val) >= 1.0f ? 255 : (int)(255.0f * (_val)))
 #define DOWNSAMPLE_FLOAT_TO_12BIT(_val) (_val) <= 0.0f ? 0 : ((_val) >= 1.0f ? 4095 : (int)(4095.0f * (_val)))
 #define DOWNSAMPLE_FLOAT_TO_16BIT(_val) (_val) <= 0.0f ? 0 : ((_val) >= 1.0f ? 65535 : (int)(65535.0f * (_val)))
+#else
+
+BLI_INLINE int UPSAMPLE_8_TO_12(const unsigned char _val)
+{
+	return (_val << 4) | (_val & ((1 << 4) - 1));
+}
+BLI_INLINE int UPSAMPLE_8_TO_16(const unsigned char _val)
+{
+	return (_val << 8) + _val;
+}
 
+BLI_INLINE int DOWNSAMPLE_FLOAT_TO_8BIT(const float _val)
+{
+	return (_val) <= 0.0f ? 0 : ((_val) >= 1.0f ? 255 : (int)(255.0f * (_val)));
+}
+BLI_INLINE int DOWNSAMPLE_FLOAT_TO_12BIT(const float _val)
+{
+	return (_val) <= 0.0f ? 0 : ((_val) >= 1.0f ? 4095 : (int)(4095.0f * (_val)));
+}
+BLI_INLINE int DOWNSAMPLE_FLOAT_TO_16BIT(const float _val)
+{
+	return (_val) <= 0.0f ? 0 : ((_val) >= 1.0f ? 65535 : (int)(65535.0f * (_val)));
+}
+#endif
 
 /*
  * 2048x1080 (2K) at 24 fps or 48 fps, or 4096x2160 (4K) at 24 fps; 3x12 bits per pixel, XYZ color space
@@ -345,7 +419,7 @@ static void cinema_parameters(opj_cparameters_t *parameters)
 	parameters->image_offset_x0 = 0;
 	parameters->image_offset_y0 = 0;
 
-	/*Codeblock size= 32*32*/
+	/*Codeblock size = 32 * 32*/
 	parameters->cblockw_init = 32;	
 	parameters->cblockh_init = 32;
 	parameters->csty |= 0x01;
@@ -457,15 +531,15 @@ static void cinema_setup_encoder(opj_cparameters_t *parameters, opj_image_t *ima
 
 static opj_image_t *ibuftoimage(ImBuf *ibuf, opj_cparameters_t *parameters)
 {
-	unsigned char *rect;
+	unsigned char *rect_uchar;
 	float *rect_float;
 	
-	int subsampling_dx = parameters->subsampling_dx;
-	int subsampling_dy = parameters->subsampling_dy;
+	unsigned int subsampling_dx = parameters->subsampling_dx;
+	unsigned int subsampling_dy = parameters->subsampling_dy;
 	
-
-	int i, numcomps, w, h, prec;
-	int x, y, y_row;
+	unsigned int i, i_next, numcomps, w, h, prec;
+	unsigned int y;
+	int *r, *g, *b, *a; /* matching 'opj_image_comp.data' type */
 	OPJ_COLOR_SPACE color_space;
 	opj_image_cmptparm_t cmptparm[4];   /* maximum of 4 components */
 	opj_image_t *image = NULL;
@@ -515,7 +589,7 @@ static opj_image_t *ibuftoimage(ImBuf *ibuf, opj_cparameters_t *parameters)
 	
 	
 	/* initialize image components */
-	memset(&cmptparm[0], 0, 4 * sizeof(opj_image_cmptparm_t));
+	memset(&cmptparm, 0, 4 * sizeof(opj_image_cmptparm_t));
 	for (i = 0; i < numcomps; i++) {
 		cmptparm[i].prec = prec;
 		cmptparm[i].bpp = prec;
@@ -535,78 +609,157 @@ static opj_image_t *ibuftoimage(ImBuf *ibuf, opj_cparameters_t *parameters)
 	/* set image offset and reference grid */
 	image->x0 = parameters->image_offset_x0;
 	image->y0 = parameters->image_offset_y0;
-	image->x1 = parameters->image_offset_x0 + (w - 1) * subsampling_dx + 1;
-	image->y1 = parameters->image_offset_y0 + (h - 1) * subsampling_dy + 1;
-	
+	image->x1 = image->x0 + (w - 1) * subsampling_dx + 1 + image->x0;
+	image->y1 = image->y0 + (h - 1) * subsampling_dy + 1 + image->y0;
+
 	/* set image data */
-	rect = (unsigned char *) ibuf->rect;
+	rect_uchar = (unsigned char *) ibuf->rect;
 	rect_float = ibuf->rect_float;
 	
-	if (rect_float && rect && prec == 8) {
+	/* set the destination channels */
+	r = image->comps[0].data;
+	g = image->comps[1].data;
+	b = image->comps[2].data;
+	a = (numcomps == 4) ? image->comps[3].data : NULL;
+
+	if (rect_float && rect_uchar && prec == 8) {
 		/* No need to use the floating point buffer, just write the 8 bits from the char buffer */
 		rect_float = NULL;
 	}
 	
-	
 	if (rect_float) {
-		float rgb[3];
-		
 		switch (prec) {
 			case 8: /* Convert blenders float color channels to 8, 12 or 16bit ints */
-				for (y = h - 1; y >= 0; y--) {
-					y_row = y * w;
-					for (x = 0; x < w; x++, rect_float += 4) {
-						i = y_row + x;
-
-						if (ibuf->profile == IB_PROFILE_LINEAR_RGB)
-							linearrgb_to_srgb_v3_v3(rgb, rect_float);
-						else
-							copy_v3_v3(rgb, rect_float);
-
-						image->comps[0].data[i] = DOWNSAMPLE_FLOAT_TO_8BIT(rgb[0]);
-						image->comps[1].data[i] = DOWNSAMPLE_FLOAT_TO_8BIT(rgb[1]);
-						image->comps[2].data[i] = DOWNSAMPLE_FLOAT_TO_8BIT(rgb[2]);
-						if (numcomps > 3)
-							image->comps[3].data[i] = DOWNSAMPLE_FLOAT_TO_8BIT(rect_float[3]);
+				if (numcomps == 4) {
+					if (ibuf->profile == IB_PROFILE_LINEAR_RGB) {
+						PIXEL_LOOPER_BEGIN(rect_float)
+						{
+							r[i] = DOWNSAMPLE_FLOAT_TO_8BIT(linearrgb_to_srgb(rect_float[0]));
+							g[i] = DOWNSAMPLE_FLOAT_TO_8BIT(linearrgb_to_srgb(rect_float[1]));
+							b[i] = DOWNSAMPLE_FLOAT_TO_8BIT(linearrgb_to_srgb(rect_float[2]));
+							a[i] = DOWNSAMPLE_FLOAT_TO_8BIT(rect_float[3]);
+						}
+						PIXEL_LOOPER_END;
+					}
+					else {
+						PIXEL_LOOPER_BEGIN(rect_float)
+						{
+							r[i] = DOWNSAMPLE_FLOAT_TO_8BIT(rect_float[0]);
+							g[i] = DOWNSAMPLE_FLOAT_TO_8BIT(rect_float[1]);
+							b[i] = DOWNSAMPLE_FLOAT_TO_8BIT(rect_float[2]);
+							a[i] = DOWNSAMPLE_FLOAT_TO_8BIT(rect_float[3]);
+						}
+						PIXEL_LOOPER_END;
+					}
+				}
+				else {
+					if (ibuf->profile == IB_PROFILE_LINEAR_RGB) {
+						PIXEL_LOOPER_BEGIN(rect_float)
+						{
+							r[i] = DOWNSAMPLE_FLOAT_TO_8BIT(linearrgb_to_srgb(rect_float[0]));
+							g[i] = DOWNSAMPLE_FLOAT_TO_8BIT(linearrgb_to_srgb(rect_float[1]));
+							b[i] = DOWNSAMPLE_FLOAT_TO_8BIT(linearrgb_to_srgb(rect_float[2]));
+						}
+						PIXEL_LOOPER_END;
+					}
+					else {
+						PIXEL_LOOPER_BEGIN(rect_float)
+						{
+							r[i] = DOWNSAMPLE_FLOAT_TO_8BIT(rect_float[0]);
+							g[i] = DOWNSAMPLE_FLOAT_TO_8BIT(rect_float[1]);
+							b[i] = DOWNSAMPLE_FLOAT_TO_8BIT(rect_float[2]);
+						}
+						PIXEL_LOOPER_END;
 					}
 				}
 				break;
 			
 			case 12:
-				for (y = h - 1; y >= 0; y--) {
-					y_row = y * w;
-					for (x = 0; x < w; x++, rect_float += 4) {
-						i = y_row + x;
-
-						if (ibuf->profile == IB_PROFILE_LINEAR_RGB)
-							linearrgb_to_srgb_v3_v3(rgb, rect_float);
-						else
-							copy_v3_v3(rgb, rect_float);
-
-						image->comps[0].data[i] = DOWNSAMPLE_FLOAT_TO_12BIT(rgb[0]);
-						image->comps[1].data[i] = DOWNSAMPLE_FLOAT_TO_12BIT(rgb[1]);
-						image->comps[2].data[i] = DOWNSAMPLE_FLOAT_TO_12BIT(rgb[2]);
-						if (numcomps > 3)
-							image->comps[3].data[i] = DOWNSAMPLE_FLOAT_TO_12BIT(rect_float[3]);
+				if (numcomps == 4) {
+					if (ibuf->profile == IB_PROFILE_LINEAR_RGB) {
+						PIXEL_LOOPER_BEGIN(rect_float)
+						{
+							r[i] = DOWNSAMPLE_FLOAT_TO_12BIT(linearrgb_to_srgb(rect_float[0]));
+							g[i] = DOWNSAMPLE_FLOAT_TO_12BIT(linearrgb_to_srgb(rect_float[1]));
+							b[i] = DOWNSAMPLE_FLOAT_TO_12BIT(linearrgb_to_srgb(rect_float[2]));
+							a[i] = DOWNSAMPLE_FLOAT_TO_12BIT(rect_float[3]);
+						}
+						PIXEL_LOOPER_END;
+					}
+					else {
+						PIXEL_LOOPER_BEGIN(rect_float)
+						{
+							r[i] = DOWNSAMPLE_FLOAT_TO_12BIT(rect_float[0]);
+							g[i] = DOWNSAMPLE_FLOAT_TO_12BIT(rect_float[1]);
+							b[i] = DOWNSAMPLE_FLOAT_TO_12BIT(rect_float[2]);
+							a[i] = DOWNSAMPLE_FLOAT_TO_12BIT(rect_float[3]);
+						}
+						PIXEL_LOOPER_END;
+					}
+				}
+				else {
+					if (ibuf->profile == IB_PROFILE_LINEAR_RGB) {
+						PIXEL_LOOPER_BEGIN(rect_float)
+						{
+							r[i] = DOWNSAMPLE_FLOAT_TO_12BIT(linearrgb_to_srgb(rect_float[0]));
+							g[i] = DOWNSAMPLE_FLOAT_TO_12BIT(linearrgb_to_srgb(rect_float[1]));
+							b[i] = DOWNSAMPLE_FLOAT_TO_12BIT(linearrgb_to_srgb(rect_float[2]));
+						}
+						PIXEL_LOOPER_END;
+					}
+					else {
+						PIXEL_LOOPER_BEGIN(rect_float)
+						{
+							r[i] = DOWNSAMPLE_FLOAT_TO_12BIT(rect_float[0]);
+							g[i] = DOWNSAMPLE_FLOAT_TO_12BIT(rect_float[1]);
+							b[i] = DOWNSAMPLE_FLOAT_TO_12BIT(rect_float[2]);
+						}
+						PIXEL_LOOPER_END;
 					}
 				}
 				break;
+
 			case 16:
-				for (y = h - 1; y >= 0; y--) {
-					y_row = y * w;
-					for (x = 0; x < w; x++, rect_float += 4) {
-						i = y_row + x;
-
-						if (ibuf->profile == IB_PROFILE_LINEAR_RGB)
-							linearrgb_to_srgb_v3_v3(rgb, rect_float);
-						else
-							copy_v3_v3(rgb, rect_float);
-
-						image->comps[0].data[i] = DOWNSAMPLE_FLOAT_TO_16BIT(rgb[0]);
-						image->comps[1].data[i] = DOWNSAMPLE_FLOAT_TO_16BIT(rgb[1]);
-						image->comps[2].data[i] = DOWNSAMPLE_FLOAT_TO_16BIT(rgb[2]);
-						if (numcomps > 3)
-							image->comps[3].data[i] = DOWNSAMPLE_FLOAT_TO_16BIT(rect_float[3]);
+				if (numcomps == 4) {
+					if (ibuf->profile == IB_PROFILE_LINEAR_RGB) {
+						PIXEL_LOOPER_BEGIN(rect_float)
+						{
+							r[i] = DOWNSAMPLE_FLOAT_TO_16BIT(linearrgb_to_srgb(rect_float[0]));
+							g[i] = DOWNSAMPLE_FLOAT_TO_16BIT(linearrgb_to_srgb(rect_float[1]));
+							b[i] = DOWNSAMPLE_FLOAT_TO_16BIT(linearrgb_to_srgb(rect_float[2]));
+							a[i] = DOWNSAMPLE_FLOAT_TO_16BIT(rect_float[3]);
+						}
+						PIXEL_LOOPER_END;
+					}
+					else {
+						PIXEL_LOOPER_BEGIN(rect_float)
+						{
+							r[i] = DOWNSAMPLE_FLOAT_TO_16BIT(rect_float[0]);
+							g[i] = DOWNSAMPLE_FLOAT_TO_16BIT(rect_float[1]);
+							b[i] = DOWNSAMPLE_FLOAT_TO_16BIT(rect_float[2]);
+							a[i] = DOWNSAMPLE_FLOAT_TO_16BIT(rect_float[3]);
+						}
+						PIXEL_LOOPER_END;
+					}
+				}
+				else {
+					if (ibuf->profile == IB_PROFILE_LINEAR_RGB) {
+						PIXEL_LOOPER_BEGIN(rect_float)
+						{
+							r[i] = DOWNSAMPLE_FLOAT_TO_16BIT(linearrgb_to_srgb(rect_float[0]));
+							g[i] = DOWNSAMPLE_FLOAT_TO_16BIT(linearrgb_to_srgb(rect_float[1]));
+							b[i] = DOWNSAMPLE_FLOAT_TO_16BIT(linearrgb_to_srgb(rect_float[2]));
+						}
+						PIXEL_LOOPER_END;
+					}
+					else {
+						PIXEL_LOOPER_BEGIN(rect_float)
+						{
+							r[i] = DOWNSAMPLE_FLOAT_TO_16BIT(rect_float[0]);
+							g[i] = DOWNSAMPLE_FLOAT_TO_16BIT(rect_float[1]);
+							b[i] = DOWNSAMPLE_FLOAT_TO_16BIT(rect_float[2]);
+						}
+						PIXEL_LOOPER_END;
 					}
 				}
 				break;
@@ -616,46 +769,68 @@ static opj_image_t *ibuftoimage(ImBuf *ibuf, opj_cparameters_t *parameters)
 		/* just use rect*/
 		switch (prec) {
 			case 8:
-				for (y = h - 1; y >= 0; y--) {
-					y_row = y * w;
-					for (x = 0; x < w; x++, rect += 4) {
-						i = y_row + x;
-
-						image->comps[0].data[i] = rect[0];
-						image->comps[1].data[i] = rect[1];
-						image->comps[2].data[i] = rect[2];
-						if (numcomps > 3)
-							image->comps[3].data[i] = rect[3];
+				if (numcomps == 4) {
+					PIXEL_LOOPER_BEGIN(rect_uchar)
+					{
+						r[i] = rect_uchar[0];
+						g[i] = rect_uchar[1];
+						b[i] = rect_uchar[2];
+						a[i] = rect_uchar[3];
+					}
+					PIXEL_LOOPER_END;
+				}
+				else {
+					PIXEL_LOOPER_BEGIN(rect_uchar)
+					{
+						r[i] = rect_uchar[0];
+						g[i] = rect_uchar[1];
+						b[i] = rect_uchar[2];
 					}
+					PIXEL_LOOPER_END;
 				}
 				break;
 			
 			case 12: /* Up Sampling, a bit pointless but best write the bit depth requested */
-				for (y = h - 1; y >= 0; y--) {
-					y_row = y * w;
-					for (x = 0; x < w; x++, rect += 4) {
-						i = y_row + x;
-
-						image->comps[0].data[i] = UPSAMPLE_8_TO_12(rect[0]);
-						image->comps[1].data[i] = UPSAMPLE_8_TO_12(rect[1]);
-						image->comps[2].data[i] = UPSAMPLE_8_TO_12(rect[2]);
-						if (numcomps > 3)
-							image->comps[3].data[i] = UPSAMPLE_8_TO_12(rect[3]);
+				if (numcomps == 4) {
+					PIXEL_LOOPER_BEGIN(rect_uchar)
+					{
+						r[i] = UPSAMPLE_8_TO_12(rect_uchar[0]);
+						g[i] = UPSAMPLE_8_TO_12(rect_uchar[1]);
+						b[i] = UPSAMPLE_8_TO_12(rect_uchar[2]);
+						a[i] = UPSAMPLE_8_TO_12(rect_uchar[3]);
+					}
+					PIXEL_LOOPER_END;
+				}
+				else {
+					PIXEL_LOOPER_BEGIN(rect_uchar)
+					{
+						r[i] = UPSAMPLE_8_TO_12(rect_uchar[0]);
+						g[i] = UPSAMPLE_8_TO_12(rect_uchar[1]);
+						b[i] = UPSAMPLE_8_TO_12(rect_uchar[2]);
 					}
+					PIXEL_LOOPER_END;
 				}
 				break;
+
 			case 16:
-				for (y = h - 1; y >= 0; y--) {
-					y_row = y * w;
-					for (x = 0; x < w; x++, rect += 4) {
-						i = y_row + x;
-
-						image->comps[0].data[i] = UPSAMPLE_8_TO_16(rect[0]);
-						image->comps[1].data[i] = UPSAMPLE_8_TO_16(rect[1]);
-						image->comps[2].data[i] = UPSAMPLE_8_TO_16(rect[2]);
-						if (numcomps > 3)
-							image->comps[3].data[i] = UPSAMPLE_8_TO_16(rect[3]);
+				if (numcomps == 4) {
+					PIXEL_LOOPER_BEGIN(rect_uchar)
+					{
+						r[i] = UPSAMPLE_8_TO_16(rect_uchar[0]);
+						g[i] = UPSAMPLE_8_TO_16(rect_uchar[1]);
+						b[i] = UPSAMPLE_8_TO_16(rect_uchar[2]);
+						a[i] = UPSAMPLE_8_TO_16(rect_uchar[3]);
+					}
+					PIXEL_LOOPER_END;
+				}
+				else {
+					PIXEL_LOOPER_BEGIN(rect_uchar)
+					{
+						r[i] = UPSAMPLE_8_TO_16(rect_uchar[0]);
+						g[i] = UPSAMPLE_8_TO_16(rect_uchar[1]);
+						b[i] = UPSAMPLE_8_TO_16(rect_uchar[2]);
 					}
+					PIXEL_LOOPER_END;
 				}
 				break;
 		}
@@ -720,7 +895,7 @@ int imb_savejp2(struct ImBuf *ibuf, const char *name, int flags)
 		opj_cinfo_t *cinfo = opj_create_compress(CODEC_JP2);
 
 		/* catch events using our callbacks and give a local context */
-		opj_set_event_mgr((opj_common_ptr)cinfo, &event_mgr, stderr);			
+		opj_set_event_mgr((opj_common_ptr)cinfo, &event_mgr, stderr);
 
 		/* setup the encoder parameters using the current image and using user parameters */
 		opj_setup_encoder(cinfo, &parameters, image);
diff --git a/source/blender/imbuf/intern/jpeg.c b/source/blender/imbuf/intern/jpeg.c
index 1a96e55e3d1..47555302a59 100644
--- a/source/blender/imbuf/intern/jpeg.c
+++ b/source/blender/imbuf/intern/jpeg.c
@@ -223,7 +223,7 @@ static void memory_source(j_decompress_ptr cinfo, unsigned char *buffer, size_t
 		if (! (*datasrc->fill_input_buffer) (cinfo))                          \
 			{ action; }                                                       \
 		INPUT_RELOAD(cinfo);  \
-	}
+	} (void)0
 
 
 /* Read a byte into variable V.
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index 93a5f8eca7c..18957cb8260 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -4,7 +4,7 @@
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. 
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -64,7 +64,7 @@ _CRTIMP void __cdecl _invalid_parameter_noinfo(void)
 
 #include <iostream>
 
-#if defined (_WIN32) && !defined(FREE_WINDOWS)
+#if defined(_WIN32) && !defined(FREE_WINDOWS)
 #include <half.h>
 #include <IlmImf/ImfVersion.h>
 #include <IlmImf/ImfArray.h>
@@ -95,19 +95,21 @@ _CRTIMP void __cdecl _invalid_parameter_noinfo(void)
 using namespace Imf;
 using namespace Imath;
 
-class Mem_IStream: public Imf::IStream
+class Mem_IStream : public Imf::IStream
 {
 public:
-	
-	Mem_IStream (unsigned char *exrbuf, size_t exrsize):
-	    IStream("dummy"), _exrpos (0), _exrsize(exrsize) { _exrbuf = exrbuf; }
-	
-	virtual bool	read (char c[], int n);
-	virtual Int64	tellg ();
-	virtual void	seekg (Int64 pos);
-	virtual void	clear ();
+
+	Mem_IStream (unsigned char *exrbuf, size_t exrsize) :
+		IStream("dummy"), _exrpos(0), _exrsize(exrsize) {
+		_exrbuf = exrbuf;
+	}
+
+	virtual bool    read(char c[], int n);
+	virtual Int64   tellg();
+	virtual void    seekg(Int64 pos);
+	virtual void    clear();
 	//virtual ~Mem_IStream() {}; // unused
-	
+
 private:
 
 	Int64 _exrpos;
@@ -115,7 +117,7 @@ private:
 	unsigned char *_exrbuf;
 };
 
-bool Mem_IStream::read (char c[], int n)
+bool Mem_IStream::read(char c[], int n)
 {
 	if (n + _exrpos <= _exrsize) {
 		memcpy(c, (void *)(&_exrbuf[_exrpos]), n);
@@ -126,22 +128,21 @@ bool Mem_IStream::read (char c[], int n)
 		return false;
 }
 
-Int64 Mem_IStream::tellg ()
+Int64 Mem_IStream::tellg()
 {
 	return _exrpos;
 }
 
-void Mem_IStream::seekg (Int64 pos)
+void Mem_IStream::seekg(Int64 pos)
 {
 	_exrpos = pos;
 }
 
-void Mem_IStream::clear () 
-{ 
+void Mem_IStream::clear()
+{
 }
 
-struct _RGBAZ
-{
+struct _RGBAZ {
 	half r;
 	half g;
 	half b;
@@ -153,10 +154,10 @@ typedef struct _RGBAZ RGBAZ;
 
 extern "C"
 {
-	
+
 int imb_is_a_openexr(unsigned char *mem)
 {
-	return Imf::isImfMagic ((const char *)mem);
+	return Imf::isImfMagic((const char *)mem);
 }
 
 static void openexr_header_compression(Header *header, int compression)
@@ -179,69 +180,70 @@ static void openexr_header_compression(Header *header, int compression)
 			break;
 		default:
 			header->compression() = ZIP_COMPRESSION;
-			break; 
+			break;
 	}
 }
 
 static void openexr_header_metadata(Header *header, struct ImBuf *ibuf)
 {
-	ImMetaData* info;
+	ImMetaData *info;
 
-	for (info= ibuf->metadata; info; info= info->next)
+	for (info = ibuf->metadata; info; info = info->next)
 		header->insert(info->key, StringAttribute(info->value));
 }
 
 static int imb_save_openexr_half(struct ImBuf *ibuf, const char *name, int flags)
 {
-	int channels = ibuf->channels;
-	int width = ibuf->x;
-	int height = ibuf->y;
-	int write_zbuf = (flags & IB_zbuffloat) && ibuf->zbuf_float != NULL;   // summarize
-	
+	const int channels = ibuf->channels;
+	const int is_alpha = (channels >= 4) && (ibuf->planes == 32);
+	const int is_zbuf = (flags & IB_zbuffloat) && ibuf->zbuf_float != NULL; /* summarize */
+	const int width = ibuf->x;
+	const int height = ibuf->y;
+
 	try
 	{
-		Header header (width, height);
-		
+		Header header(width, height);
+
 		openexr_header_compression(&header, ibuf->ftype & OPENEXR_COMPRESS);
 		openexr_header_metadata(&header, ibuf);
-		
-		header.channels().insert ("R", Channel (HALF));
-		header.channels().insert ("G", Channel (HALF));
-		header.channels().insert ("B", Channel (HALF));
-		if (ibuf->planes==32 && channels >= 4)
-			header.channels().insert ("A", Channel (HALF));
-		if (write_zbuf)		// z we do as float always
-			header.channels().insert ("Z", Channel (Imf::FLOAT));
-		
-		FrameBuffer frameBuffer;			
-		OutputFile *file = new OutputFile(name, header);			
-		
+
+		header.channels().insert("R", Channel(HALF));
+		header.channels().insert("G", Channel(HALF));
+		header.channels().insert("B", Channel(HALF));
+		if (is_alpha)
+			header.channels().insert("A", Channel(HALF));
+		if (is_zbuf)     // z we do as float always
+			header.channels().insert("Z", Channel(Imf::FLOAT));
+
+		FrameBuffer frameBuffer;
+		OutputFile *file = new OutputFile(name, header);
+
 		/* we store first everything in half array */
 		RGBAZ *pixels = new RGBAZ[height * width];
 		RGBAZ *to = pixels;
-		int xstride= sizeof (RGBAZ);
-		int ystride= xstride*width;
+		int xstride = sizeof(RGBAZ);
+		int ystride = xstride * width;
 
 		/* indicate used buffers */
-		frameBuffer.insert ("R", Slice (HALF,  (char *) &pixels[0].r, xstride, ystride));	
-		frameBuffer.insert ("G", Slice (HALF,  (char *) &pixels[0].g, xstride, ystride));
-		frameBuffer.insert ("B", Slice (HALF,  (char *) &pixels[0].b, xstride, ystride));
-		if (ibuf->planes==32 && channels >= 4)
-			frameBuffer.insert ("A", Slice (HALF, (char *) &pixels[0].a, xstride, ystride));
-		if (write_zbuf)
-			frameBuffer.insert ("Z", Slice (Imf::FLOAT, (char *)(ibuf->zbuf_float + (height-1)*width),
-											sizeof(float), sizeof(float) * -width));
+		frameBuffer.insert("R", Slice(HALF,  (char *) &pixels[0].r, xstride, ystride));
+		frameBuffer.insert("G", Slice(HALF,  (char *) &pixels[0].g, xstride, ystride));
+		frameBuffer.insert("B", Slice(HALF,  (char *) &pixels[0].b, xstride, ystride));
+		if (is_alpha)
+			frameBuffer.insert("A", Slice(HALF, (char *) &pixels[0].a, xstride, ystride));
+		if (is_zbuf)
+			frameBuffer.insert("Z", Slice(Imf::FLOAT, (char *)(ibuf->zbuf_float + (height - 1) * width),
+			                              sizeof(float), sizeof(float) * -width));
 		if (ibuf->rect_float) {
 			float *from;
 
-			for (int i = ibuf->y-1; i >= 0; i--) {
-				from= ibuf->rect_float + channels*i*width;
+			for (int i = ibuf->y - 1; i >= 0; i--) {
+				from = ibuf->rect_float + channels * i * width;
 
 				for (int j = ibuf->x; j > 0; j--) {
 					to->r = from[0];
 					to->g = from[1];
 					to->b = from[2];
-					to->a = (channels >= 4)? from[3]: 1.0f;
+					to->a = (channels >= 4) ? from[3] : 1.0f;
 					to++; from += 4;
 				}
 			}
@@ -250,105 +252,106 @@ static int imb_save_openexr_half(struct ImBuf *ibuf, const char *name, int flags
 			unsigned char *from;
 
 			if (ibuf->profile == IB_PROFILE_LINEAR_RGB) {
-				for (int i = ibuf->y-1; i >= 0; i--) {
-					from= (unsigned char *)ibuf->rect + channels*i*width;
+				for (int i = ibuf->y - 1; i >= 0; i--) {
+					from = (unsigned char *)ibuf->rect + channels * i * width;
 
 					for (int j = ibuf->x; j > 0; j--) {
-						to->r = (float)(from[0])/255.0;
-						to->g = (float)(from[1])/255.0;
-						to->b = (float)(from[2])/255.0;
-						to->a = (float)(channels >= 4) ? from[3]/255.0 : 1.0f;
+						to->r = (float)(from[0]) / 255.0;
+						to->g = (float)(from[1]) / 255.0;
+						to->b = (float)(from[2]) / 255.0;
+						to->a = (float)(channels >= 4) ? from[3] / 255.0 : 1.0f;
 						to++; from += 4;
 					}
 				}
 			}
 			else {
-				for (int i = ibuf->y-1; i >= 0; i--) {
-					from= (unsigned char *)ibuf->rect + channels*i*width;
+				for (int i = ibuf->y - 1; i >= 0; i--) {
+					from = (unsigned char *)ibuf->rect + channels * i * width;
 
 					for (int j = ibuf->x; j > 0; j--) {
 						to->r = srgb_to_linearrgb((float)from[0] / 255.0);
 						to->g = srgb_to_linearrgb((float)from[1] / 255.0);
 						to->b = srgb_to_linearrgb((float)from[2] / 255.0);
-						to->a = channels >= 4 ? (float)from[3]/255.0 : 1.0f;
+						to->a = channels >= 4 ? (float)from[3] / 255.0 : 1.0f;
 						to++; from += 4;
 					}
 				}
 			}
 		}
-		
+
 //		printf("OpenEXR-save: Writing OpenEXR file of height %d.\n", height);
-		
-		file->setFrameBuffer (frameBuffer);				  
-		file->writePixels (height);					  
+
+		file->setFrameBuffer(frameBuffer);
+		file->writePixels(height);
 		delete file;
-		delete [] pixels;
+		delete[] pixels;
 	}
 	catch (const std::exception &exc)
 	{
 		printf("OpenEXR-save: ERROR: %s\n", exc.what());
 		if (ibuf) IMB_freeImBuf(ibuf);
-		
+
 		return (0);
 	}
-	
+
 	return (1);
 }
 
 static int imb_save_openexr_float(struct ImBuf *ibuf, const char *name, int flags)
 {
-	int channels = ibuf->channels;
-	int width = ibuf->x;
-	int height = ibuf->y;
-	int write_zbuf = (flags & IB_zbuffloat) && ibuf->zbuf_float != NULL;   // summarize
+	const int channels = ibuf->channels;
+	const int is_alpha = (channels >= 4) && (ibuf->planes == 32);
+	const int is_zbuf = (flags & IB_zbuffloat) && ibuf->zbuf_float != NULL; /* summarize */
+	const int width = ibuf->x;
+	const int height = ibuf->y;
 
 	try
 	{
-		Header header (width, height);
-		
+		Header header(width, height);
+
 		openexr_header_compression(&header, ibuf->ftype & OPENEXR_COMPRESS);
 		openexr_header_metadata(&header, ibuf);
-		
-		header.channels().insert ("R", Channel (Imf::FLOAT));
-		header.channels().insert ("G", Channel (Imf::FLOAT));
-		header.channels().insert ("B", Channel (Imf::FLOAT));
-		if (ibuf->planes==32 && channels >= 4)
-			header.channels().insert ("A", Channel (Imf::FLOAT));
-		if (write_zbuf)
-			header.channels().insert ("Z", Channel (Imf::FLOAT));
-		
-		FrameBuffer frameBuffer;			
-		OutputFile *file = new OutputFile(name, header);			
+
+		header.channels().insert("R", Channel(Imf::FLOAT));
+		header.channels().insert("G", Channel(Imf::FLOAT));
+		header.channels().insert("B", Channel(Imf::FLOAT));
+		if (is_alpha)
+			header.channels().insert("A", Channel(Imf::FLOAT));
+		if (is_zbuf)
+			header.channels().insert("Z", Channel(Imf::FLOAT));
+
+		FrameBuffer frameBuffer;
+		OutputFile *file = new OutputFile(name, header);
 		int xstride = sizeof(float) * channels;
-		int ystride = - xstride*width;
+		int ystride = -xstride * width;
 		float *rect[4] = {NULL, NULL, NULL, NULL};
 
 		/* last scanline, stride negative */
-		rect[0]= ibuf->rect_float + channels*(height-1)*width;
-		rect[1]= rect[0]+1;
-		rect[2]= rect[0]+2;
-		rect[3]= (channels >= 4)? rect[0]+3:rect[0]; /* red as alpha, is this needed since alpha isn't written? */
-
-		frameBuffer.insert ("R", Slice (Imf::FLOAT,  (char *)rect[0], xstride, ystride));
-		frameBuffer.insert ("G", Slice (Imf::FLOAT,  (char *)rect[1], xstride, ystride));
-		frameBuffer.insert ("B", Slice (Imf::FLOAT,  (char *)rect[2], xstride, ystride));
-		if (ibuf->planes==32 && channels >= 4)
-			frameBuffer.insert ("A", Slice (Imf::FLOAT,  (char *)rect[3], xstride, ystride));
-		if (write_zbuf)
-			frameBuffer.insert ("Z", Slice (Imf::FLOAT, (char *) (ibuf->zbuf_float + (height-1)*width),
-											sizeof(float), sizeof(float) * -width));
-		file->setFrameBuffer (frameBuffer);				  
-		file->writePixels (height);					  
+		rect[0] = ibuf->rect_float + channels * (height - 1) * width;
+		rect[1] = rect[0] + 1;
+		rect[2] = rect[0] + 2;
+		rect[3] = (channels >= 4) ? rect[0] + 3 : rect[0]; /* red as alpha, is this needed since alpha isn't written? */
+
+		frameBuffer.insert("R", Slice(Imf::FLOAT,  (char *)rect[0], xstride, ystride));
+		frameBuffer.insert("G", Slice(Imf::FLOAT,  (char *)rect[1], xstride, ystride));
+		frameBuffer.insert("B", Slice(Imf::FLOAT,  (char *)rect[2], xstride, ystride));
+		if (is_alpha)
+			frameBuffer.insert("A", Slice(Imf::FLOAT,  (char *)rect[3], xstride, ystride));
+		if (is_zbuf)
+			frameBuffer.insert("Z", Slice(Imf::FLOAT, (char *) (ibuf->zbuf_float + (height - 1) * width),
+			                              sizeof(float), sizeof(float) * -width));
+		file->setFrameBuffer(frameBuffer);
+		file->writePixels(height);
 		delete file;
 	}
 	catch (const std::exception &exc)
 	{
 		printf("OpenEXR-save: ERROR: %s\n", exc.what());
 		if (ibuf) IMB_freeImBuf(ibuf);
-		
+
 		return (0);
 	}
-	
+
 	return (1);
 	//	printf("OpenEXR-save: Done.\n");
 }
@@ -359,15 +362,15 @@ int imb_save_openexr(struct ImBuf *ibuf, const char *name, int flags)
 	if (flags & IB_mem) {
 		printf("OpenEXR-save: Create EXR in memory CURRENTLY NOT SUPPORTED !\n");
 		imb_addencodedbufferImBuf(ibuf);
-		ibuf->encodedsize = 0;	  
+		ibuf->encodedsize = 0;
 		return(0);
-	} 
-	
-	if (ibuf->ftype & OPENEXR_HALF) 
+	}
+
+	if (ibuf->ftype & OPENEXR_HALF)
 		return imb_save_openexr_half(ibuf, name, flags);
 	else {
 		/* when no float rect, we save as half (16 bits is sufficient) */
-		if (ibuf->rect_float==NULL)
+		if (ibuf->rect_float == NULL)
 			return imb_save_openexr_half(ibuf, name, flags);
 		else
 			return imb_save_openexr_float(ibuf, name, flags);
@@ -383,30 +386,30 @@ int imb_save_openexr(struct ImBuf *ibuf, const char *name, int flags)
  * - separated with a dot: the Layer name (like "Lamp1" or "Walls" or "Characters")
  */
 
-static ListBase exrhandles= {NULL, NULL};
+static ListBase exrhandles = {NULL, NULL};
 
 typedef struct ExrHandle {
 	struct ExrHandle *next, *prev;
-	
+
 	InputFile *ifile;
 	TiledOutputFile *tofile;
 	OutputFile *ofile;
 	int tilex, tiley;
 	int width, height;
 	int mipmap;
-	
-	ListBase channels;	/* flattened out, ExrChannel */
-	ListBase layers;	/* hierarchical, pointing in end to ExrChannel */
+
+	ListBase channels;  /* flattened out, ExrChannel */
+	ListBase layers;    /* hierarchical, pointing in end to ExrChannel */
 } ExrHandle;
 
 /* flattened out channel */
 typedef struct ExrChannel {
 	struct ExrChannel *next, *prev;
-	
-	char name[EXR_TOT_MAXNAME+1];	/* full name of layer+pass */
-	int xstride, ystride;		/* step to next pixel, to next scanline */
-	float *rect;				/* first pointer to write in */
-	char chan_id;				/* quick lookup of channel char */
+
+	char name[EXR_TOT_MAXNAME + 1];  /* full name of layer+pass */
+	int xstride, ystride;            /* step to next pixel, to next scanline */
+	float *rect;                     /* first pointer to write in */
+	char chan_id;                    /* quick lookup of channel char */
 } ExrChannel;
 
 
@@ -422,7 +425,7 @@ typedef struct ExrPass {
 
 typedef struct ExrLayer {
 	struct ExrLayer *next, *prev;
-	char name[EXR_LAY_MAXNAME+1];
+	char name[EXR_LAY_MAXNAME + 1];
 	ListBase passes;
 } ExrLayer;
 
@@ -430,7 +433,7 @@ typedef struct ExrLayer {
 
 void *IMB_exr_get_handle(void)
 {
-	ExrHandle *data= (ExrHandle *)MEM_callocN(sizeof(ExrHandle), "exr handle");
+	ExrHandle *data = (ExrHandle *)MEM_callocN(sizeof(ExrHandle), "exr handle");
 	BLI_addtail(&exrhandles, data);
 	return data;
 }
@@ -439,25 +442,26 @@ void *IMB_exr_get_handle(void)
 /* xstride, ystride and rect can be done in set_channel too, for tile writing */
 void IMB_exr_add_channel(void *handle, const char *layname, const char *passname, int xstride, int ystride, float *rect)
 {
-	ExrHandle *data= (ExrHandle *)handle;
+	ExrHandle *data = (ExrHandle *)handle;
 	ExrChannel *echan;
-	
-	echan= (ExrChannel *)MEM_callocN(sizeof(ExrChannel), "exr tile channel");
-	
+
+	echan = (ExrChannel *)MEM_callocN(sizeof(ExrChannel), "exr tile channel");
+
 	if (layname) {
-		char lay[EXR_LAY_MAXNAME+1], pass[EXR_PASS_MAXNAME+1];
+		char lay[EXR_LAY_MAXNAME + 1], pass[EXR_PASS_MAXNAME + 1];
 		BLI_strncpy(lay, layname, EXR_LAY_MAXNAME);
 		BLI_strncpy(pass, passname, EXR_PASS_MAXNAME);
 
-		sprintf(echan->name, "%s.%s", lay, pass);
+		BLI_snprintf(echan->name, sizeof(echan->name), "%s.%s", lay, pass);
 	}
-	else
-		BLI_strncpy(echan->name, passname, EXR_TOT_MAXNAME-1);
-	
-	echan->xstride= xstride;
-	echan->ystride= ystride;
-	echan->rect= rect;
-	
+	else {
+		BLI_strncpy(echan->name, passname, EXR_TOT_MAXNAME - 1);
+	}
+
+	echan->xstride = xstride;
+	echan->ystride = ystride;
+	echan->rect = rect;
+
 	// printf("added channel %s\n", echan->name);
 	BLI_addtail(&data->channels, echan);
 }
@@ -465,21 +469,21 @@ void IMB_exr_add_channel(void *handle, const char *layname, const char *passname
 /* only used for writing temp. render results (not image files) */
 int IMB_exr_begin_write(void *handle, const char *filename, int width, int height, int compress)
 {
-	ExrHandle *data= (ExrHandle *)handle;
-	Header header (width, height);
+	ExrHandle *data = (ExrHandle *)handle;
+	Header header(width, height);
 	ExrChannel *echan;
-	
-	data->width= width;
-	data->height= height;
-	
-	for (echan= (ExrChannel *)data->channels.first; echan; echan= echan->next)
-		header.channels().insert (echan->name, Channel (Imf::FLOAT));
-	
+
+	data->width = width;
+	data->height = height;
+
+	for (echan = (ExrChannel *)data->channels.first; echan; echan = echan->next)
+		header.channels().insert(echan->name, Channel(Imf::FLOAT));
+
 	openexr_header_compression(&header, compress);
 	// openexr_header_metadata(&header, ibuf); // no imbuf. cant write
 	/* header.lineOrder() = DECREASING_Y; this crashes in windows for file read! */
-	
-	header.insert ("BlenderMultiChannel", StringAttribute ("Blender V2.55.1 and newer"));
+
+	header.insert("BlenderMultiChannel", StringAttribute("Blender V2.55.1 and newer"));
 
 	/* avoid crash/abort when we don't have permission to write here */
 	try {
@@ -495,45 +499,45 @@ int IMB_exr_begin_write(void *handle, const char *filename, int width, int heigh
 
 void IMB_exrtile_begin_write(void *handle, const char *filename, int mipmap, int width, int height, int tilex, int tiley)
 {
-	ExrHandle *data= (ExrHandle *)handle;
-	Header header (width, height);
+	ExrHandle *data = (ExrHandle *)handle;
+	Header header(width, height);
 	ExrChannel *echan;
-	
-	data->tilex= tilex;
-	data->tiley= tiley;
-	data->width= width;
-	data->height= height;
-	data->mipmap= mipmap;
-	
-	for (echan= (ExrChannel *)data->channels.first; echan; echan= echan->next)
-		header.channels().insert (echan->name, Channel (Imf::FLOAT));
-	
-	header.setTileDescription (TileDescription (tilex, tiley, (mipmap)? MIPMAP_LEVELS: ONE_LEVEL));
+
+	data->tilex = tilex;
+	data->tiley = tiley;
+	data->width = width;
+	data->height = height;
+	data->mipmap = mipmap;
+
+	for (echan = (ExrChannel *)data->channels.first; echan; echan = echan->next)
+		header.channels().insert(echan->name, Channel(Imf::FLOAT));
+
+	header.setTileDescription(TileDescription(tilex, tiley, (mipmap) ? MIPMAP_LEVELS : ONE_LEVEL));
 	header.lineOrder() = RANDOM_Y;
 	header.compression() = RLE_COMPRESSION;
-	
-	header.insert ("BlenderMultiChannel", StringAttribute ("Blender V2.43"));
-	
+
+	header.insert("BlenderMultiChannel", StringAttribute("Blender V2.43"));
+
 	data->tofile = new TiledOutputFile(filename, header);
 }
 
 /* read from file */
 int IMB_exr_begin_read(void *handle, const char *filename, int *width, int *height)
 {
-	ExrHandle *data= (ExrHandle *)handle;
-	
-	if (BLI_exists(filename) && BLI_file_size(filename)>32) {	/* 32 is arbitrary, but zero length files crashes exr */
+	ExrHandle *data = (ExrHandle *)handle;
+
+	if (BLI_exists(filename) && BLI_file_size(filename) > 32) {   /* 32 is arbitrary, but zero length files crashes exr */
 		data->ifile = new InputFile(filename);
 		if (data->ifile) {
 			Box2i dw = data->ifile->header().dataWindow();
-			data->width= *width  = dw.max.x - dw.min.x + 1;
-			data->height= *height = dw.max.y - dw.min.y + 1;
-			
+			data->width = *width  = dw.max.x - dw.min.x + 1;
+			data->height = *height = dw.max.y - dw.min.y + 1;
+
 			const ChannelList &channels = data->ifile->header().channels();
-			
+
 			for (ChannelList::ConstIterator i = channels.begin(); i != channels.end(); ++i)
 				IMB_exr_add_channel(data, NULL, i.name(), 0, 0, NULL);
-			
+
 			return 1;
 		}
 	}
@@ -543,26 +547,26 @@ int IMB_exr_begin_read(void *handle, const char *filename, int *width, int *heig
 /* still clumsy name handling, layers/channels can be ordered as list in list later */
 void IMB_exr_set_channel(void *handle, const char *layname, const char *passname, int xstride, int ystride, float *rect)
 {
-	ExrHandle *data= (ExrHandle *)handle;
+	ExrHandle *data = (ExrHandle *)handle;
 	ExrChannel *echan;
 	char name[EXR_TOT_MAXNAME + 1];
-	
+
 	if (layname) {
-		char lay[EXR_LAY_MAXNAME+1], pass[EXR_PASS_MAXNAME+1];
+		char lay[EXR_LAY_MAXNAME + 1], pass[EXR_PASS_MAXNAME + 1];
 		BLI_strncpy(lay, layname, EXR_LAY_MAXNAME);
 		BLI_strncpy(pass, passname, EXR_PASS_MAXNAME);
-		
-		sprintf(name, "%s.%s", lay, pass);
+
+		BLI_snprintf(name, sizeof(name), "%s.%s", lay, pass);
 	}
 	else
-		BLI_strncpy(name, passname, EXR_TOT_MAXNAME-1);
+		BLI_strncpy(name, passname, EXR_TOT_MAXNAME - 1);
 
-	echan= (ExrChannel *)BLI_findstring(&data->channels, name, offsetof(ExrChannel, name));
+	echan = (ExrChannel *)BLI_findstring(&data->channels, name, offsetof(ExrChannel, name));
 
 	if (echan) {
-		echan->xstride= xstride;
-		echan->ystride= ystride;
-		echan->rect= rect;
+		echan->xstride = xstride;
+		echan->ystride = ystride;
+		echan->rect = rect;
 	}
 	else
 		printf("IMB_exrtile_set_channel error %s\n", name);
@@ -570,28 +574,28 @@ void IMB_exr_set_channel(void *handle, const char *layname, const char *passname
 
 void IMB_exrtile_clear_channels(void *handle)
 {
-	ExrHandle *data= (ExrHandle *)handle;
+	ExrHandle *data = (ExrHandle *)handle;
 	BLI_freelistN(&data->channels);
 }
 
 void IMB_exrtile_write_channels(void *handle, int partx, int party, int level)
 {
-	ExrHandle *data= (ExrHandle *)handle;
+	ExrHandle *data = (ExrHandle *)handle;
 	FrameBuffer frameBuffer;
 	ExrChannel *echan;
-	
-	for (echan= (ExrChannel *)data->channels.first; echan; echan= echan->next) {
-		float *rect= echan->rect - echan->xstride*partx - echan->ystride*party;
 
-		frameBuffer.insert (echan->name, Slice (Imf::FLOAT,  (char *)rect,
-							echan->xstride*sizeof(float), echan->ystride*sizeof(float)));
+	for (echan = (ExrChannel *)data->channels.first; echan; echan = echan->next) {
+		float *rect = echan->rect - echan->xstride * partx - echan->ystride * party;
+
+		frameBuffer.insert(echan->name, Slice(Imf::FLOAT,  (char *)rect,
+		                                      echan->xstride * sizeof(float), echan->ystride * sizeof(float)));
 	}
-	
-	data->tofile->setFrameBuffer (frameBuffer);
+
+	data->tofile->setFrameBuffer(frameBuffer);
 
 	try {
 		// printf("write tile %d %d\n", partx/data->tilex, party/data->tiley);
-		data->tofile->writeTile (partx/data->tilex, party/data->tiley, level);
+		data->tofile->writeTile(partx / data->tilex, party / data->tiley, level);
 	}
 	catch (const std::exception &exc) {
 		std::cerr << "OpenEXR-writeTile: ERROR: " << exc.what() << std::endl;
@@ -600,22 +604,22 @@ void IMB_exrtile_write_channels(void *handle, int partx, int party, int level)
 
 void IMB_exr_write_channels(void *handle)
 {
-	ExrHandle *data= (ExrHandle *)handle;
+	ExrHandle *data = (ExrHandle *)handle;
 	FrameBuffer frameBuffer;
 	ExrChannel *echan;
-	
+
 	if (data->channels.first) {
-		for (echan= (ExrChannel *)data->channels.first; echan; echan= echan->next) {
+		for (echan = (ExrChannel *)data->channels.first; echan; echan = echan->next) {
 			/* last scanline, stride negative */
-			float *rect = echan->rect + echan->xstride*(data->height-1)*data->width;
-			
-			frameBuffer.insert (echan->name, Slice (Imf::FLOAT,  (char *)rect,
-													echan->xstride*sizeof(float), -echan->ystride*sizeof(float)));
+			float *rect = echan->rect + echan->xstride * (data->height - 1) * data->width;
+
+			frameBuffer.insert(echan->name, Slice(Imf::FLOAT,  (char *)rect,
+			                                      echan->xstride * sizeof(float), -echan->ystride * sizeof(float)));
 		}
-		
-		data->ofile->setFrameBuffer (frameBuffer);
+
+		data->ofile->setFrameBuffer(frameBuffer);
 		try {
-			data->ofile->writePixels (data->height);	
+			data->ofile->writePixels(data->height);
 		}
 		catch (const std::exception &exc) {
 			std::cerr << "OpenEXR-writePixels: ERROR: " << exc.what() << std::endl;
@@ -628,58 +632,58 @@ void IMB_exr_write_channels(void *handle)
 
 void IMB_exr_read_channels(void *handle)
 {
-	ExrHandle *data= (ExrHandle *)handle;
+	ExrHandle *data = (ExrHandle *)handle;
 	FrameBuffer frameBuffer;
 	ExrChannel *echan;
-	
+
 	/* check if exr was saved with previous versions of blender which flipped images */
 	const StringAttribute *ta = data->ifile->header().findTypedAttribute <StringAttribute> ("BlenderMultiChannel");
-	short flip = (ta && strncmp(ta->value().c_str(), "Blender V2.43", 13)==0); /* 'previous multilayer attribute, flipped */
-	
-	for (echan= (ExrChannel *)data->channels.first; echan; echan= echan->next) {
-		
+	short flip = (ta && strncmp(ta->value().c_str(), "Blender V2.43", 13) == 0); /* 'previous multilayer attribute, flipped */
+
+	for (echan = (ExrChannel *)data->channels.first; echan; echan = echan->next) {
+
 		if (echan->rect) {
 			if (flip)
-				frameBuffer.insert (echan->name, Slice (Imf::FLOAT,  (char *)echan->rect,
-											echan->xstride*sizeof(float), echan->ystride*sizeof(float)));
+				frameBuffer.insert(echan->name, Slice(Imf::FLOAT,  (char *)echan->rect,
+				                                      echan->xstride * sizeof(float), echan->ystride * sizeof(float)));
 			else
-				frameBuffer.insert (echan->name, Slice (Imf::FLOAT,  (char *)(echan->rect + echan->xstride*(data->height-1)*data->width),
-											echan->xstride*sizeof(float), -echan->ystride*sizeof(float)));
+				frameBuffer.insert(echan->name, Slice(Imf::FLOAT,  (char *)(echan->rect + echan->xstride * (data->height - 1) * data->width),
+				                                      echan->xstride * sizeof(float), -echan->ystride * sizeof(float)));
 		}
-		else 
+		else
 			printf("warning, channel with no rect set %s\n", echan->name);
 	}
-	
-	data->ifile->setFrameBuffer (frameBuffer);
+
+	data->ifile->setFrameBuffer(frameBuffer);
 
 	try {
-		data->ifile->readPixels (0, data->height-1);	
+		data->ifile->readPixels(0, data->height - 1);
 	}
 	catch (const std::exception &exc) {
 		std::cerr << "OpenEXR-readPixels: ERROR: " << exc.what() << std::endl;
 	}
 }
 
-void IMB_exr_multilayer_convert(void *handle, void *base,  
-								void * (*addlayer)(void *base, char *str), 
-								void (*addpass)(void *base, void *lay, char *str, 
-												float *rect, int totchan, char *chan_id))
+void IMB_exr_multilayer_convert(void *handle, void *base,
+                                void * (*addlayer)(void *base, char *str),
+                                void (*addpass)(void *base, void *lay, char *str,
+                                                float *rect, int totchan, char *chan_id))
 {
-	ExrHandle *data= (ExrHandle *)handle;
+	ExrHandle *data = (ExrHandle *)handle;
 	ExrLayer *lay;
 	ExrPass *pass;
 
-	if (data->layers.first==NULL) {
+	if (data->layers.first == NULL) {
 		printf("cannot convert multilayer, no layers in handle\n");
 		return;
 	}
 
-	for (lay= (ExrLayer *)data->layers.first; lay; lay= lay->next) {
-		void *laybase= addlayer(base, lay->name);
+	for (lay = (ExrLayer *)data->layers.first; lay; lay = lay->next) {
+		void *laybase = addlayer(base, lay->name);
 		if (laybase) {
-			for (pass= (ExrPass *)lay->passes.first; pass; pass= pass->next) {
+			for (pass = (ExrPass *)lay->passes.first; pass; pass = pass->next) {
 				addpass(base, laybase, pass->name, pass->rect, pass->totchan, pass->chan_id);
-				pass->rect= NULL;
+				pass->rect = NULL;
 			}
 		}
 	}
@@ -688,31 +692,31 @@ void IMB_exr_multilayer_convert(void *handle, void *base,
 
 void IMB_exr_close(void *handle)
 {
-	ExrHandle *data= (ExrHandle *)handle;
+	ExrHandle *data = (ExrHandle *)handle;
 	ExrLayer *lay;
 	ExrPass *pass;
-	
+
 	if (data->ifile)
 		delete data->ifile;
 	else if (data->ofile)
 		delete data->ofile;
 	else if (data->tofile)
 		delete data->tofile;
-	
-	data->ifile= NULL;
-	data->ofile= NULL;
-	data->tofile= NULL;
-	
+
+	data->ifile = NULL;
+	data->ofile = NULL;
+	data->tofile = NULL;
+
 	BLI_freelistN(&data->channels);
-	
-	for (lay= (ExrLayer *)data->layers.first; lay; lay= lay->next) {
-		for (pass= (ExrPass *)lay->passes.first; pass; pass= pass->next)
+
+	for (lay = (ExrLayer *)data->layers.first; lay; lay = lay->next) {
+		for (pass = (ExrPass *)lay->passes.first; pass; pass = pass->next)
 			if (pass->rect)
 				MEM_freeN(pass->rect);
 		BLI_freelistN(&lay->passes);
 	}
 	BLI_freelistN(&data->layers);
-	
+
 	BLI_remlink(&exrhandles, data);
 	MEM_freeN(data);
 }
@@ -722,12 +726,12 @@ void IMB_exr_close(void *handle)
 /* get a substring from the end of the name, separated by '.' */
 static int imb_exr_split_token(const char *str, const char *end, const char **token)
 {
-	int maxlen = end-str;
+	int maxlen = end - str;
 	int len = 0;
-	while (len < maxlen && *(end-len-1) != '.')
+	while (len < maxlen && *(end - len - 1) != '.')
 		++len;
-	
-	*token = end-len;
+
+	*token = end - len;
 	return len;
 }
 
@@ -738,7 +742,7 @@ static int imb_exr_split_channel_name(ExrChannel *echan, char *layname, char *pa
 	const char *token;
 	char tokenbuf[EXR_TOT_MAXNAME];
 	int len;
-	
+
 	/* last token is single character channel identifier */
 	len = imb_exr_split_token(name, end, &token);
 	if (len == 0) {
@@ -751,32 +755,32 @@ static int imb_exr_split_channel_name(ExrChannel *echan, char *layname, char *pa
 		return 0;
 	}
 	echan->chan_id = token[0];
-	end -= len + 1;	/* +1 to skip '.' separator */
-	
+	end -= len + 1; /* +1 to skip '.' separator */
+
 	/* second token is pass name */
 	len = imb_exr_split_token(name, end, &token);
 	if (len == 0) {
 		printf("multilayer read: bad channel name: %s\n", name);
 		return 0;
 	}
-	BLI_strncpy(passname, token, len+1);
-	end -= len + 1;	/* +1 to skip '.' separator */
-	
+	BLI_strncpy(passname, token, len + 1);
+	end -= len + 1; /* +1 to skip '.' separator */
+
 	/* all preceding tokens combined as layer name */
 	if (end > name)
-		BLI_strncpy(layname, name, (int)(end-name)+1);
+		BLI_strncpy(layname, name, (int)(end - name) + 1);
 	else
 		layname[0] = '\0';
-	
+
 	return 1;
 }
 
 static ExrLayer *imb_exr_get_layer(ListBase *lb, char *layname)
 {
-	ExrLayer *lay= (ExrLayer *)BLI_findstring(lb, layname, offsetof(ExrLayer, name));
+	ExrLayer *lay = (ExrLayer *)BLI_findstring(lb, layname, offsetof(ExrLayer, name));
 
-	if (lay==NULL) {
-		lay= (ExrLayer *)MEM_callocN(sizeof(ExrLayer), "exr layer");
+	if (lay == NULL) {
+		lay = (ExrLayer *)MEM_callocN(sizeof(ExrLayer), "exr layer");
 		BLI_addtail(lb, lay);
 		BLI_strncpy(lay->name, layname, EXR_LAY_MAXNAME);
 	}
@@ -786,19 +790,19 @@ static ExrLayer *imb_exr_get_layer(ListBase *lb, char *layname)
 
 static ExrPass *imb_exr_get_pass(ListBase *lb, char *passname)
 {
-	ExrPass *pass= (ExrPass *)BLI_findstring(lb, passname, offsetof(ExrPass, name));
-	
-	if (pass==NULL) {
-		pass= (ExrPass *)MEM_callocN(sizeof(ExrPass), "exr pass");
+	ExrPass *pass = (ExrPass *)BLI_findstring(lb, passname, offsetof(ExrPass, name));
+
+	if (pass == NULL) {
+		pass = (ExrPass *)MEM_callocN(sizeof(ExrPass), "exr pass");
 
-		if (strcmp(passname, "Combined")==0)
+		if (strcmp(passname, "Combined") == 0)
 			BLI_addhead(lb, pass);
 		else
 			BLI_addtail(lb, pass);
 	}
 
 	BLI_strncpy(pass->name, passname, EXR_LAY_MAXNAME);
-	
+
 	return pass;
 }
 
@@ -808,29 +812,29 @@ static ExrHandle *imb_exr_begin_read_mem(InputFile *file, int width, int height)
 	ExrLayer *lay;
 	ExrPass *pass;
 	ExrChannel *echan;
-	ExrHandle *data= (ExrHandle *)IMB_exr_get_handle();
+	ExrHandle *data = (ExrHandle *)IMB_exr_get_handle();
 	int a;
 	char layname[EXR_TOT_MAXNAME], passname[EXR_TOT_MAXNAME];
-	
-	data->ifile= file;
-	data->width= width;
-	data->height= height;
-	
+
+	data->ifile = file;
+	data->width = width;
+	data->height = height;
+
 	const ChannelList &channels = data->ifile->header().channels();
 
 	for (ChannelList::ConstIterator i = channels.begin(); i != channels.end(); ++i)
 		IMB_exr_add_channel(data, NULL, i.name(), 0, 0, NULL);
-	
+
 	/* now try to sort out how to assign memory to the channels */
 	/* first build hierarchical layer list */
-	for (echan= (ExrChannel *)data->channels.first; echan; echan= echan->next) {
-		if ( imb_exr_split_channel_name(echan, layname, passname) ) {
-			ExrLayer *lay= imb_exr_get_layer(&data->layers, layname);
-			ExrPass *pass= imb_exr_get_pass(&lay->passes, passname);
-			
-			pass->chan[pass->totchan]= echan;
+	for (echan = (ExrChannel *)data->channels.first; echan; echan = echan->next) {
+		if (imb_exr_split_channel_name(echan, layname, passname) ) {
+			ExrLayer *lay = imb_exr_get_layer(&data->layers, layname);
+			ExrPass *pass = imb_exr_get_pass(&lay->passes, passname);
+
+			pass->chan[pass->totchan] = echan;
 			pass->totchan++;
-			if (pass->totchan>=EXR_PASS_MAXCHAN)
+			if (pass->totchan >= EXR_PASS_MAXCHAN)
 				break;
 		}
 	}
@@ -839,73 +843,72 @@ static ExrHandle *imb_exr_begin_read_mem(InputFile *file, int width, int height)
 		IMB_exr_close(data);
 		return NULL;
 	}
-	
+
 	/* with some heuristics, try to merge the channels in buffers */
-	for (lay= (ExrLayer *)data->layers.first; lay; lay= lay->next) {
-		for (pass= (ExrPass *)lay->passes.first; pass; pass= pass->next) {
+	for (lay = (ExrLayer *)data->layers.first; lay; lay = lay->next) {
+		for (pass = (ExrPass *)lay->passes.first; pass; pass = pass->next) {
 			if (pass->totchan) {
-				pass->rect= (float *)MEM_mapallocN(width*height*pass->totchan*sizeof(float), "pass rect");
-				if (pass->totchan==1) {
-					echan= pass->chan[0];
-					echan->rect= pass->rect;
-					echan->xstride= 1;
-					echan->ystride= width;
-					pass->chan_id[0]= echan->chan_id;
+				pass->rect = (float *)MEM_mapallocN(width * height * pass->totchan * sizeof(float), "pass rect");
+				if (pass->totchan == 1) {
+					echan = pass->chan[0];
+					echan->rect = pass->rect;
+					echan->xstride = 1;
+					echan->ystride = width;
+					pass->chan_id[0] = echan->chan_id;
 				}
 				else {
 					char lookup[256];
-					
+
 					memset(lookup, 0, sizeof(lookup));
-						   
+
 					/* we can have RGB(A), XYZ(W), UVA */
-					if (pass->totchan==3 || pass->totchan==4) {
-						if (pass->chan[0]->chan_id=='B' || pass->chan[1]->chan_id=='B' ||  pass->chan[2]->chan_id=='B') {
-							lookup[(unsigned int)'R']= 0;
-							lookup[(unsigned int)'G']= 1;
-							lookup[(unsigned int)'B']= 2;
-							lookup[(unsigned int)'A']= 3;
+					if (pass->totchan == 3 || pass->totchan == 4) {
+						if (pass->chan[0]->chan_id == 'B' || pass->chan[1]->chan_id == 'B' ||  pass->chan[2]->chan_id == 'B') {
+							lookup[(unsigned int)'R'] = 0;
+							lookup[(unsigned int)'G'] = 1;
+							lookup[(unsigned int)'B'] = 2;
+							lookup[(unsigned int)'A'] = 3;
 						}
-						else if (pass->chan[0]->chan_id=='Y' || pass->chan[1]->chan_id=='Y' ||  pass->chan[2]->chan_id=='Y') {
-							lookup[(unsigned int)'X']= 0;
-							lookup[(unsigned int)'Y']= 1;
-							lookup[(unsigned int)'Z']= 2;
-							lookup[(unsigned int)'W']= 3;
+						else if (pass->chan[0]->chan_id == 'Y' || pass->chan[1]->chan_id == 'Y' ||  pass->chan[2]->chan_id == 'Y') {
+							lookup[(unsigned int)'X'] = 0;
+							lookup[(unsigned int)'Y'] = 1;
+							lookup[(unsigned int)'Z'] = 2;
+							lookup[(unsigned int)'W'] = 3;
 						}
 						else {
-							lookup[(unsigned int)'U']= 0;
-							lookup[(unsigned int)'V']= 1;
-							lookup[(unsigned int)'A']= 2;
+							lookup[(unsigned int)'U'] = 0;
+							lookup[(unsigned int)'V'] = 1;
+							lookup[(unsigned int)'A'] = 2;
 						}
-						for (a=0; a<pass->totchan; a++) {
-							echan= pass->chan[a];
-							echan->rect= pass->rect + lookup[(unsigned int)echan->chan_id];
-							echan->xstride= pass->totchan;
-							echan->ystride= width*pass->totchan;
-							pass->chan_id[ (unsigned int)lookup[(unsigned int)echan->chan_id] ]= echan->chan_id;
+						for (a = 0; a < pass->totchan; a++) {
+							echan = pass->chan[a];
+							echan->rect = pass->rect + lookup[(unsigned int)echan->chan_id];
+							echan->xstride = pass->totchan;
+							echan->ystride = width * pass->totchan;
+							pass->chan_id[(unsigned int)lookup[(unsigned int)echan->chan_id]] = echan->chan_id;
 						}
 					}
 					else { /* unknown */
-						for (a=0; a<pass->totchan; a++) {
-							echan= pass->chan[a];
-							echan->rect= pass->rect + a;
-							echan->xstride= pass->totchan;
-							echan->ystride= width*pass->totchan;
-							pass->chan_id[a]= echan->chan_id;
+						for (a = 0; a < pass->totchan; a++) {
+							echan = pass->chan[a];
+							echan->rect = pass->rect + a;
+							echan->xstride = pass->totchan;
+							echan->ystride = width * pass->totchan;
+							pass->chan_id[a] = echan->chan_id;
 						}
 					}
 				}
 			}
 		}
 	}
-	
+
 	return data;
 }
 
 
 /* ********************************************************* */
 
-typedef struct RGBA
-{
+typedef struct RGBA {
 	float r;
 	float g;
 	float b;
@@ -917,7 +920,7 @@ typedef struct RGBA
 static void exr_print_filecontents(InputFile *file)
 {
 	const ChannelList &channels = file->header().channels();
-	
+
 	for (ChannelList::ConstIterator i = channels.begin(); i != channels.end(); ++i) {
 		const Channel &channel = i.channel();
 		printf("OpenEXR-load: Found channel %s of type %d\n", i.name(), channel.type);
@@ -928,13 +931,13 @@ static void exr_print_filecontents(InputFile *file)
 static const char *exr_rgba_channelname(InputFile *file, const char *chan)
 {
 	const ChannelList &channels = file->header().channels();
-	
+
 	for (ChannelList::ConstIterator i = channels.begin(); i != channels.end(); ++i) {
 		/* const Channel &channel = i.channel(); */ /* Not used yet */
-		const char *str= i.name();
-		int len= strlen(str);
+		const char *str = i.name();
+		int len = strlen(str);
 		if (len) {
-			if (BLI_strcasecmp(chan, str+len-1)==0) {
+			if (BLI_strcasecmp(chan, str + len - 1) == 0) {
 				return str;
 			}
 		}
@@ -942,23 +945,26 @@ static const char *exr_rgba_channelname(InputFile *file, const char *chan)
 	return chan;
 }
 
-
-
 static int exr_has_zbuffer(InputFile *file)
 {
 	return !(file->header().channels().findChannel("Z") == NULL);
 }
 
+static int exr_has_alpha(InputFile *file)
+{
+	return !(file->header().channels().findChannel("A") == NULL);
+}
+
 static int exr_is_multilayer(InputFile *file)
 {
-	const StringAttribute *comments= file->header().findTypedAttribute<StringAttribute>("BlenderMultiChannel");
+	const StringAttribute *comments = file->header().findTypedAttribute<StringAttribute>("BlenderMultiChannel");
 	const ChannelList &channels = file->header().channels();
 	std::set <std::string> layerNames;
 
 	channels.layers(layerNames);
 
-	if (comments || layerNames.size()>1)
-			return 1;
+	if (comments || layerNames.size() > 1)
+		return 1;
 
 	return 0;
 }
@@ -967,82 +973,84 @@ struct ImBuf *imb_load_openexr(unsigned char *mem, size_t size, int flags)
 {
 	struct ImBuf *ibuf = NULL;
 	InputFile *file = NULL;
-	
+
 	if (imb_is_a_openexr(mem) == 0) return(NULL);
-	
+
 	try
 	{
-		Mem_IStream *membuf = new Mem_IStream(mem, size); 
+		Mem_IStream *membuf = new Mem_IStream(mem, size);
 		int is_multi;
 		file = new InputFile(*membuf);
-		
+
 		Box2i dw = file->header().dataWindow();
-		int width  = dw.max.x - dw.min.x + 1;
-		int height = dw.max.y - dw.min.y + 1;
-		
-		//printf("OpenEXR-load: image data window %d %d %d %d\n", 
+		const int width  = dw.max.x - dw.min.x + 1;
+		const int height = dw.max.y - dw.min.y + 1;
+
+		//printf("OpenEXR-load: image data window %d %d %d %d\n",
 		//	   dw.min.x, dw.min.y, dw.max.x, dw.max.y);
 
 		if (0) // debug
 			exr_print_filecontents(file);
-		
-		is_multi= exr_is_multilayer(file);
-		
+
+		is_multi = exr_is_multilayer(file);
+
 		/* do not make an ibuf when */
 		if (is_multi && !(flags & IB_test) && !(flags & IB_multilayer)) {
 			printf("Error: can't process EXR multilayer file\n");
 		}
 		else {
-		
-			ibuf = IMB_allocImBuf(width, height, 32, 0);
+			const int is_alpha = exr_has_alpha(file);
+
+			ibuf = IMB_allocImBuf(width, height, is_alpha ? 32 : 24, 0);
 			ibuf->ftype = OPENEXR;
 
 			/* openEXR is linear as per EXR spec */
 			ibuf->profile = IB_PROFILE_LINEAR_RGB;
-			
+
 			if (!(flags & IB_test)) {
 				if (is_multi) { /* only enters with IB_multilayer flag set */
 					/* constructs channels for reading, allocates memory in channels */
-					ExrHandle *handle= imb_exr_begin_read_mem(file, width, height);
+					ExrHandle *handle = imb_exr_begin_read_mem(file, width, height);
 					if (handle) {
 						IMB_exr_read_channels(handle);
-						ibuf->userdata= handle;			/* potential danger, the caller has to check for this! */
+						ibuf->userdata = handle;         /* potential danger, the caller has to check for this! */
 					}
 				}
 				else {
 					FrameBuffer frameBuffer;
 					float *first;
 					int xstride = sizeof(float) * 4;
-					int ystride = - xstride*width;
-					
+					int ystride = -xstride * width;
+
 					imb_addrectfloatImBuf(ibuf);
-					
+
 					/* inverse correct first pixel for datawindow coordinates (- dw.min.y because of y flip) */
-					first= ibuf->rect_float - 4*(dw.min.x - dw.min.y*width);
+					first = ibuf->rect_float - 4 * (dw.min.x - dw.min.y * width);
 					/* but, since we read y-flipped (negative y stride) we move to last scanline */
-					first+= 4*(height-1)*width;
-					
-					frameBuffer.insert ( exr_rgba_channelname(file, "R"), 
-										Slice (Imf::FLOAT,  (char *) first, xstride, ystride));
-					frameBuffer.insert ( exr_rgba_channelname(file, "G"), 
-										Slice (Imf::FLOAT,  (char *) (first+1), xstride, ystride));
-					frameBuffer.insert ( exr_rgba_channelname(file, "B"), 
-										Slice (Imf::FLOAT,  (char *) (first+2), xstride, ystride));
-																			
-					frameBuffer.insert ( exr_rgba_channelname(file, "A"), 
-										Slice (Imf::FLOAT,  (char *) (first+3), xstride, ystride, 1, 1, 1.0f)); /* 1.0 is fill value */
+					first += 4 * (height - 1) * width;
+
+					frameBuffer.insert(exr_rgba_channelname(file, "R"),
+					                   Slice(Imf::FLOAT,  (char *) first, xstride, ystride));
+					frameBuffer.insert(exr_rgba_channelname(file, "G"),
+					                   Slice(Imf::FLOAT,  (char *) (first + 1), xstride, ystride));
+					frameBuffer.insert(exr_rgba_channelname(file, "B"),
+					                   Slice(Imf::FLOAT,  (char *) (first + 2), xstride, ystride));
+
+					/* 1.0 is fill value, this still neesd to be assigned even when (is_alpha == 0) */
+					frameBuffer.insert(exr_rgba_channelname(file, "A"),
+					                   Slice(Imf::FLOAT,  (char *) (first + 3), xstride, ystride, 1, 1, 1.0f));
 
 					if (exr_has_zbuffer(file)) {
 						float *firstz;
-						
+
 						addzbuffloatImBuf(ibuf);
-						firstz= ibuf->zbuf_float - (dw.min.x - dw.min.y*width);
-						firstz+= (height-1)*width;
-						frameBuffer.insert("Z", Slice (Imf::FLOAT,  (char *)firstz, sizeof(float), -width * sizeof(float)));
+						firstz = ibuf->zbuf_float - (dw.min.x - dw.min.y * width);
+						firstz += (height - 1) * width;
+						frameBuffer.insert("Z", Slice(Imf::FLOAT,  (char *)firstz, sizeof(float), -width * sizeof(float)));
 					}
-					
-					file->setFrameBuffer (frameBuffer);
-					file->readPixels (dw.min.y, dw.max.y);
+
+					file->setFrameBuffer(frameBuffer);
+					file->readPixels(dw.min.y, dw.max.y);
 
 					// XXX, ImBuf has no nice way to deal with this.
 					// ideally IM_rect would be used when the caller wants a rect BUT
@@ -1053,7 +1061,7 @@ struct ImBuf *imb_load_openexr(unsigned char *mem, size_t size, int flags)
 					//
 					// if (flag & IM_rect)
 					//     IMB_rect_from_float(ibuf);
-					
+
 					/* file is no longer needed */
 					delete file;
 				}
@@ -1066,10 +1074,10 @@ struct ImBuf *imb_load_openexr(unsigned char *mem, size_t size, int flags)
 		std::cerr << exc.what() << std::endl;
 		if (ibuf) IMB_freeImBuf(ibuf);
 		delete file;
-		
+
 		return (0);
 	}
-	
+
 }
 
 void imb_initopenexr(void)
diff --git a/source/blender/imbuf/intern/rectop.c b/source/blender/imbuf/intern/rectop.c
index 2d765c7d6a1..da7618ef806 100644
--- a/source/blender/imbuf/intern/rectop.c
+++ b/source/blender/imbuf/intern/rectop.c
@@ -566,7 +566,7 @@ void buf_rectfill_area(unsigned char *rect, float *rectf, int width, int height,
 	}
 }
 
-void IMB_rectfill_area(struct ImBuf *ibuf, float *col, int x1, int y1, int x2, int y2)
+void IMB_rectfill_area(struct ImBuf *ibuf, const float col[4], int x1, int y1, int x2, int y2)
 {
 	if (!ibuf) return;
 	buf_rectfill_area((unsigned char *) ibuf->rect, ibuf->rect_float, ibuf->x, ibuf->y, col, x1, y1, x2, y2);
diff --git a/source/blender/imbuf/intern/targa.c b/source/blender/imbuf/intern/targa.c
index bf75995fd9c..0260ed46b00 100644
--- a/source/blender/imbuf/intern/targa.c
+++ b/source/blender/imbuf/intern/targa.c
@@ -549,7 +549,7 @@ ImBuf *imb_loadtarga(unsigned char *mem, size_t mem_size, int flags)
 	TARGA tga;
 	struct ImBuf *ibuf;
 	int col, count, size;
-	unsigned int *rect, *cmap = NULL /*, mincol= 0*/, maxcol = 0;
+	unsigned int *rect, *cmap = NULL /*, mincol = 0*/, maxcol = 0;
 	uchar *cp = (uchar *) &col;
 	
 	if (checktarga(&tga, mem) == 0) return(NULL);
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index 777fcc2af0c..95eadc23ef4 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -139,8 +139,8 @@ typedef struct Library {
 } Library;
 
 enum eIconSizes {
-	ICON_SIZE_ICON,
-	ICON_SIZE_PREVIEW
+	ICON_SIZE_ICON = 0,
+	ICON_SIZE_PREVIEW = 1
 };
 #define NUM_ICON_SIZES (ICON_SIZE_PREVIEW + 1)
 
@@ -206,6 +206,7 @@ typedef struct PreviewImage {
 #define ID_GD		MAKE_ID2('G', 'D') /* GreasePencil */
 #define ID_WM		MAKE_ID2('W', 'M') /* WindowManager */
 #define ID_MC		MAKE_ID2('M', 'C') /* MovieClip */
+#define ID_MSK		MAKE_ID2('M', 'S') /* Mask */
 
 	/* NOTE! Fake IDs, needed for g.sipo->blocktype or outliner */
 #define ID_SEQ		MAKE_ID2('S', 'Q')
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index 9cb5ca5da55..ea012090bbd 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -50,37 +50,37 @@ struct GHash;
 
 /* Data point for motion path (mpv) */
 typedef struct bMotionPathVert {
-	float co[3];				/* coordinates of point in 3D-space */
-	int flag;					/* quick settings */
+	float co[3];                /* coordinates of point in 3D-space */
+	int flag;                   /* quick settings */
 } bMotionPathVert;
 
 /* bMotionPathVert->flag */
 typedef enum eMotionPathVert_Flag {
-		/* vert is selected */
-	MOTIONPATH_VERT_SEL		= (1<<0)
+	/* vert is selected */
+	MOTIONPATH_VERT_SEL     = (1 << 0)
 } eMotionPathVert_Flag;
 
 /* ........ */
 
 /* Motion Path data cache (mpath)
- * 	- for elements providing transforms (i.e. Objects or PoseChannels) 
+ *  - for elements providing transforms (i.e. Objects or PoseChannels)
  */
 typedef struct bMotionPath {
-	bMotionPathVert *points;	/* path samples */
-	int	length;					/* the number of cached verts */
+	bMotionPathVert *points;    /* path samples */
+	int length;                 /* the number of cached verts */
 	
-	int start_frame;			/* for drawing paths, the start frame number */
-	int	end_frame;				/* for drawing paths, the end frame number */
+	int start_frame;            /* for drawing paths, the start frame number */
+	int end_frame;              /* for drawing paths, the end frame number */
 	
-	int flag;					/* baking settings - eMotionPath_Flag */ 
+	int flag;                   /* baking settings - eMotionPath_Flag */
 } bMotionPath;
 
 /* bMotionPath->flag */
 typedef enum eMotionPath_Flag {
-		/* (for bones) path represents the head of the bone */
-	MOTIONPATH_FLAG_BHEAD		= (1<<0),
-		/* motion path is being edited */
-	MOTIONPATH_FLAG_EDIT		= (1<<1)
+	/* (for bones) path represents the head of the bone */
+	MOTIONPATH_FLAG_BHEAD       = (1 << 0),
+	/* motion path is being edited */
+	MOTIONPATH_FLAG_EDIT        = (1 << 1)
 } eMotionPath_Flag;
 
 /* Visualisation General --------------------------- */
@@ -89,83 +89,83 @@ typedef enum eMotionPath_Flag {
 /* Animation Visualisation Settings (avs) */
 typedef struct bAnimVizSettings {
 	/* Onion-Skinning Settings ----------------- */
-	int	ghost_sf, ghost_ef;			/* start and end frames of ghost-drawing range (only used for GHOST_TYPE_RANGE) */
-	int ghost_bc, ghost_ac;			/* number of frames before/after current frame to show */
+	int ghost_sf, ghost_ef;         /* start and end frames of ghost-drawing range (only used for GHOST_TYPE_RANGE) */
+	int ghost_bc, ghost_ac;         /* number of frames before/after current frame to show */
 	
-	short ghost_type;				/* eOnionSkin_Types */
-	short ghost_step;				/* number of frames between each ghost shown (not for GHOST_TYPE_KEYS) */
+	short ghost_type;               /* eOnionSkin_Types */
+	short ghost_step;               /* number of frames between each ghost shown (not for GHOST_TYPE_KEYS) */
 	
-	short ghost_flag;				/* eOnionSkin_Flag */
+	short ghost_flag;               /* eOnionSkin_Flag */
 	
 	/* General Settings ------------------------ */
-	short recalc;					/* eAnimViz_RecalcFlags */
+	short recalc;                   /* eAnimViz_RecalcFlags */
 	
 	/* Motion Path Settings ------------------- */
-	short path_type;				/* eMotionPath_Types */
-	short path_step;				/* number of frames between points indicated on the paths */
+	short path_type;                /* eMotionPath_Types */
+	short path_step;                /* number of frames between points indicated on the paths */
 	
-	short path_viewflag;			/* eMotionPaths_ViewFlag */
-	short path_bakeflag;			/* eMotionPaths_BakeFlag */
+	short path_viewflag;            /* eMotionPaths_ViewFlag */
+	short path_bakeflag;            /* eMotionPaths_BakeFlag */
 	
-	int path_sf, path_ef;			/* start and end frames of path-calculation range */
-	int	path_bc, path_ac;			/* number of frames before/after current frame to show */
+	int path_sf, path_ef;           /* start and end frames of path-calculation range */
+	int path_bc, path_ac;           /* number of frames before/after current frame to show */
 } bAnimVizSettings;
 
 
 /* bAnimVizSettings->recalc */
 typedef enum eAnimViz_RecalcFlags {
-		/* motionpaths need recalculating */
-	ANIMVIZ_RECALC_PATHS	= (1<<0)
+	/* motionpaths need recalculating */
+	ANIMVIZ_RECALC_PATHS    = (1 << 0)
 } eAnimViz_RecalcFlags;
 
 
 /* bAnimVizSettings->ghost_type */
 typedef enum eOnionSkin_Types {
-		/* no ghosts at all */
+	/* no ghosts at all */
 	GHOST_TYPE_NONE = 0,
-		/* around current frame */
-	GHOST_TYPE_ACFRA,
-		/* show ghosts within the specified frame range */
-	GHOST_TYPE_RANGE,
-		/* show ghosts on keyframes within the specified range only */
-	GHOST_TYPE_KEYS
+	/* around current frame */
+	GHOST_TYPE_ACFRA = 1,
+	/* show ghosts within the specified frame range */
+	GHOST_TYPE_RANGE = 2,
+	/* show ghosts on keyframes within the specified range only */
+	GHOST_TYPE_KEYS = 3
 } eOnionSkin_Types;
 
 /* bAnimVizSettings->ghost_flag */
 typedef enum eOnionSkin_Flag {
-		/* only show selected bones in ghosts */
-	GHOST_FLAG_ONLYSEL 	= (1<<0)
+	/* only show selected bones in ghosts */
+	GHOST_FLAG_ONLYSEL  = (1 << 0)
 } eOnionSkin_Flag;
 
 
 /* bAnimVizSettings->path_type */
 typedef enum eMotionPaths_Types {
-		/* show the paths along their entire ranges */
+	/* show the paths along their entire ranges */
 	MOTIONPATH_TYPE_RANGE = 0,
-		/* only show the parts of the paths around the current frame */
-	MOTIONPATH_TYPE_ACFRA
+	/* only show the parts of the paths around the current frame */
+	MOTIONPATH_TYPE_ACFRA = 1,
 } eMotionPath_Types;
 
 /* bAnimVizSettings->path_viewflag */
 typedef enum eMotionPaths_ViewFlag {
-		/* show frames on path */
-	MOTIONPATH_VIEW_FNUMS		= (1<<0),
-		/* show keyframes on path */
-	MOTIONPATH_VIEW_KFRAS		= (1<<1),
-		/* show keyframe/frame numbers */
-	MOTIONPATH_VIEW_KFNOS		= (1<<2),
-		/* find keyframes in whole action (instead of just in matching group name) */
-	MOTIONPATH_VIEW_KFACT		= (1<<3)
+	/* show frames on path */
+	MOTIONPATH_VIEW_FNUMS       = (1 << 0),
+	/* show keyframes on path */
+	MOTIONPATH_VIEW_KFRAS       = (1 << 1),
+	/* show keyframe/frame numbers */
+	MOTIONPATH_VIEW_KFNOS       = (1 << 2),
+	/* find keyframes in whole action (instead of just in matching group name) */
+	MOTIONPATH_VIEW_KFACT       = (1 << 3)
 } eMotionPath_ViewFlag;
 
 /* bAnimVizSettings->path_bakeflag */
 typedef enum eMotionPaths_BakeFlag {
-		/* motion paths directly associated with this block of settings needs updating */
-	MOTIONPATH_BAKE_NEEDS_RECALC	= (1<<0),
-		/* for bones - calculate head-points for curves instead of tips */
-	MOTIONPATH_BAKE_HEADS			= (1<<1),
-		/* motion paths exist for AnimVizSettings instance - set when calc for first time, and unset when clearing */
-	MOTIONPATH_BAKE_HAS_PATHS		= (1<<2)
+	/* motion paths directly associated with this block of settings needs updating */
+	MOTIONPATH_BAKE_NEEDS_RECALC    = (1 << 0),
+	/* for bones - calculate head-points for curves instead of tips */
+	MOTIONPATH_BAKE_HEADS           = (1 << 1),
+	/* motion paths exist for AnimVizSettings instance - set when calc for first time, and unset when clearing */
+	MOTIONPATH_BAKE_HAS_PATHS       = (1 << 2)
 } eMotionPath_BakeFlag;
 
 /* ************************************************ */
@@ -179,142 +179,142 @@ typedef enum eMotionPaths_BakeFlag {
  * with respect to the restposition of Armature bones 
  */
 typedef struct bPoseChannel {
-	struct bPoseChannel	*next, *prev;
+	struct bPoseChannel *next, *prev;
 	
-	IDProperty 			*prop;		/* User-Defined Properties on this PoseChannel */			
+	IDProperty          *prop;      /* User-Defined Properties on this PoseChannel */
 	
-	ListBase			constraints;/* Constraints that act on this PoseChannel */
-	char				name[64];	/* need to match bone name length: MAXBONENAME */
+	ListBase constraints;           /* Constraints that act on this PoseChannel */
+	char name[64];                  /* need to match bone name length: MAXBONENAME */
 	
-	short				flag;		/* dynamic, for detecting transform changes */
-	short				ikflag;		/* settings for IK bones */
-	short				protectflag; /* protect channels from being transformed */
-	short				agrp_index; /* index of action-group this bone belongs to (0 = default/no group) */
-	char				constflag;  /* for quick detecting which constraints affect this channel */
-	char                selectflag;	/* copy of bone flag, so you can work with library armatures, not for runtime use */
-	char				pad0[6];
+	short flag;                     /* dynamic, for detecting transform changes */
+	short ikflag;                   /* settings for IK bones */
+	short protectflag;              /* protect channels from being transformed */
+	short agrp_index;               /* index of action-group this bone belongs to (0 = default/no group) */
+	char constflag;                 /* for quick detecting which constraints affect this channel */
+	char selectflag;                /* copy of bone flag, so you can work with library armatures, not for runtime use */
+	char pad0[6];
 
-	struct Bone			*bone;		/* set on read file or rebuild pose */
-	struct bPoseChannel *parent;	/* set on read file or rebuild pose */
-	struct bPoseChannel *child;		/* set on read file or rebuild pose, the 'ik' child, for b-bones */
-	
-	struct ListBase		 iktree;		/* "IK trees" - only while evaluating pose */
-	struct ListBase 	siktree;		/* Spline-IK "trees" - only while evaluating pose */
-	
-	bMotionPath *mpath;				/* motion path cache for this bone */
-	struct Object *custom;			/* draws custom object instead of default bone shape */
-	struct bPoseChannel *custom_tx;	/* odd feature, display with another bones transform.
+	struct Bone         *bone;      /* set on read file or rebuild pose */
+	struct bPoseChannel *parent;    /* set on read file or rebuild pose */
+	struct bPoseChannel *child;     /* set on read file or rebuild pose, the 'ik' child, for b-bones */
+
+	struct ListBase iktree;         /* "IK trees" - only while evaluating pose */
+	struct ListBase siktree;        /* Spline-IK "trees" - only while evaluating pose */
+
+	bMotionPath *mpath;             /* motion path cache for this bone */
+	struct Object *custom;          /* draws custom object instead of default bone shape */
+	struct bPoseChannel *custom_tx; /* odd feature, display with another bones transform.
 	                                 * needed in rare cases for advanced rigs,
 	                                 * since the alternative is highly complicated - campbell */
 
-		/* transforms - written in by actions or transform */
-	float		loc[3];				
-	float		size[3];
-	
-		/* rotations - written in by actions or transform (but only one representation gets used at any time) */
-	float 		eul[3];					/* euler rotation */
-	float		quat[4];				/* quaternion rotation */
-	float 		rotAxis[3], rotAngle;	/* axis-angle rotation */
-	short 		rotmode;				/* eRotationModes - rotation representation to use */
-	short 		pad;
+	/* transforms - written in by actions or transform */
+	float loc[3];
+	float size[3];
+
+	/* rotations - written in by actions or transform (but only one representation gets used at any time) */
+	float eul[3];                       /* euler rotation */
+	float quat[4];                      /* quaternion rotation */
+	float rotAxis[3], rotAngle;         /* axis-angle rotation */
+	short rotmode;                      /* eRotationModes - rotation representation to use */
+	short pad;
 	
-	float		chan_mat[4][4];		/* matrix result of loc/quat/size , and where we put deform in, see next line */
-	float		pose_mat[4][4];		/* constraints accumulate here. in the end, pose_mat = bone->arm_mat * chan_mat
+	float chan_mat[4][4];           /* matrix result of loc/quat/size , and where we put deform in, see next line */
+	float pose_mat[4][4];           /* constraints accumulate here. in the end, pose_mat = bone->arm_mat * chan_mat
 	                                 * this matrix is object space */
-	float		constinv[4][4];		/* inverse result of constraints.
+	float constinv[4][4];           /* inverse result of constraints.
 	                                 * doesn't include effect of restposition, parent, and local transform*/
 	
-	float		pose_head[3];		/* actually pose_mat[3] */
-	float		pose_tail[3];		/* also used for drawing help lines... */
+	float pose_head[3];             /* actually pose_mat[3] */
+	float pose_tail[3];             /* also used for drawing help lines... */
 	
-	float		limitmin[3], limitmax[3];	/* DOF constraint, note! - these are stored in degrees, not radians */
-	float		stiffness[3];				/* DOF stiffness */
-	float		ikstretch;
-	float		ikrotweight;		/* weight of joint rotation constraint */
-	float		iklinweight;		/* weight of joint stretch constraint */
+	float limitmin[3], limitmax[3]; /* DOF constraint, note! - these are stored in degrees, not radians */
+	float stiffness[3];             /* DOF stiffness */
+	float ikstretch;
+	float ikrotweight;              /* weight of joint rotation constraint */
+	float iklinweight;              /* weight of joint stretch constraint */
 
-	void		*temp;				/* use for outliner */
+	void        *temp;              /* use for outliner */
 } bPoseChannel;
 
 
 /* PoseChannel (transform) flags */
 typedef enum ePchan_Flag {
-		/* has transforms */
-	POSE_LOC		=	(1<<0),
-	POSE_ROT		=	(1<<1),
-	POSE_SIZE		=	(1<<2),
-		/* old IK/cache stuff... */
-	POSE_IK_MAT		=	(1<<3),
-	POSE_UNUSED2	=	(1<<4),
-	POSE_UNUSED3	=	(1<<5),
-	POSE_UNUSED4	=	(1<<6),
-	POSE_UNUSED5	=	(1<<7),
-		/* has Standard IK */
-	POSE_HAS_IK		=	(1<<8),
-		/* IK/Pose solving*/
-	POSE_CHAIN		=	(1<<9),
-	POSE_DONE		=   (1<<10),
-		/* visualisation */
-	POSE_KEY		=	(1<<11),
-	POSE_STRIDE		=	(1<<12),
-		/* standard IK solving */
-	POSE_IKTREE		=   (1<<13),
-		/* has Spline IK */
-	POSE_HAS_IKS	= 	(1<<14),
-		/* spline IK solving */
-	POSE_IKSPLINE	= 	(1<<15)
+	/* has transforms */
+	POSE_LOC        =   (1 << 0),
+	POSE_ROT        =   (1 << 1),
+	POSE_SIZE       =   (1 << 2),
+	/* old IK/cache stuff... */
+	POSE_IK_MAT     =   (1 << 3),
+	POSE_UNUSED2    =   (1 << 4),
+	POSE_UNUSED3    =   (1 << 5),
+	POSE_UNUSED4    =   (1 << 6),
+	POSE_UNUSED5    =   (1 << 7),
+	/* has Standard IK */
+	POSE_HAS_IK     =   (1 << 8),
+	/* IK/Pose solving*/
+	POSE_CHAIN      =   (1 << 9),
+	POSE_DONE       =   (1 << 10),
+	/* visualisation */
+	POSE_KEY        =   (1 << 11),
+	POSE_STRIDE     =   (1 << 12),
+	/* standard IK solving */
+	POSE_IKTREE     =   (1 << 13),
+	/* has Spline IK */
+	POSE_HAS_IKS    =   (1 << 14),
+	/* spline IK solving */
+	POSE_IKSPLINE   =   (1 << 15)
 } ePchan_Flag;
 
 /* PoseChannel constflag (constraint detection) */
 typedef enum ePchan_ConstFlag {
-	PCHAN_HAS_IK		= (1<<0),
-	PCHAN_HAS_CONST		= (1<<1),
-		/* only used for drawing Posemode, not stored in channel */
-	PCHAN_HAS_ACTION	= (1<<2),
-	PCHAN_HAS_TARGET	= (1<<3),
-		/* only for drawing Posemode too */
-	PCHAN_HAS_STRIDE	= (1<<4),
-		/* spline IK */
-	PCHAN_HAS_SPLINEIK	= (1<<5)
+	PCHAN_HAS_IK        = (1 << 0),
+	PCHAN_HAS_CONST     = (1 << 1),
+	/* only used for drawing Posemode, not stored in channel */
+	PCHAN_HAS_ACTION    = (1 << 2),
+	PCHAN_HAS_TARGET    = (1 << 3),
+	/* only for drawing Posemode too */
+	PCHAN_HAS_STRIDE    = (1 << 4),
+	/* spline IK */
+	PCHAN_HAS_SPLINEIK  = (1 << 5)
 } ePchan_ConstFlag;
 
 /* PoseChannel->ikflag */
 typedef enum ePchan_IkFlag {
-	BONE_IK_NO_XDOF = (1<<0),
-	BONE_IK_NO_YDOF = (1<<1),
-	BONE_IK_NO_ZDOF = (1<<2),
+	BONE_IK_NO_XDOF = (1 << 0),
+	BONE_IK_NO_YDOF = (1 << 1),
+	BONE_IK_NO_ZDOF = (1 << 2),
 
-	BONE_IK_XLIMIT	= (1<<3),
-	BONE_IK_YLIMIT	= (1<<4),
-	BONE_IK_ZLIMIT	= (1<<5),
-	
-	BONE_IK_ROTCTL  = (1<<6),
-	BONE_IK_LINCTL  = (1<<7),
+	BONE_IK_XLIMIT  = (1 << 3),
+	BONE_IK_YLIMIT  = (1 << 4),
+	BONE_IK_ZLIMIT  = (1 << 5),
+
+	BONE_IK_ROTCTL  = (1 << 6),
+	BONE_IK_LINCTL  = (1 << 7),
 
-	BONE_IK_NO_XDOF_TEMP = (1<<10),
-	BONE_IK_NO_YDOF_TEMP = (1<<11),
-	BONE_IK_NO_ZDOF_TEMP = (1<<12)
+	BONE_IK_NO_XDOF_TEMP = (1 << 10),
+	BONE_IK_NO_YDOF_TEMP = (1 << 11),
+	BONE_IK_NO_ZDOF_TEMP = (1 << 12)
 } ePchan_IkFlag;
 
 /* PoseChannel->rotmode and Object->rotmode */
 typedef enum eRotationModes {
-		/* quaternion rotations (default, and for older Blender versions) */
-	ROT_MODE_QUAT	= 0,
-		/* euler rotations - keep in sync with enum in BLI_math.h */
-	ROT_MODE_EUL = 1,		/* Blender 'default' (classic) - must be as 1 to sync with BLI_math_rotation.h defines */
+	/* quaternion rotations (default, and for older Blender versions) */
+	ROT_MODE_QUAT   = 0,
+	/* euler rotations - keep in sync with enum in BLI_math.h */
+	ROT_MODE_EUL = 1,       /* Blender 'default' (classic) - must be as 1 to sync with BLI_math_rotation.h defines */
 	ROT_MODE_XYZ = 1,
-	ROT_MODE_XZY,
-	ROT_MODE_YXZ,
-	ROT_MODE_YZX,
-	ROT_MODE_ZXY,
-	ROT_MODE_ZYX,
+	ROT_MODE_XZY = 2,
+	ROT_MODE_YXZ = 3,
+	ROT_MODE_YZX = 4,
+	ROT_MODE_ZXY = 5,
+	ROT_MODE_ZYX = 6,
 	/* NOTE: space is reserved here for 18 other possible 
 	 * euler rotation orders not implemented 
 	 */
-		/* axis angle rotations */
+	/* axis angle rotations */
 	ROT_MODE_AXISANGLE = -1,
 
-	ROT_MODE_MIN = ROT_MODE_AXISANGLE,	/* sentinel for Py API */
+	ROT_MODE_MIN = ROT_MODE_AXISANGLE,  /* sentinel for Py API */
 	ROT_MODE_MAX = ROT_MODE_ZYX
 } eRotationModes;
 
@@ -326,46 +326,46 @@ typedef enum eRotationModes {
  * though there is a define for it (hack for the outliner).
  */
 typedef struct bPose {
-	ListBase chanbase; 			/* list of pose channels, PoseBones in RNA */
-	struct GHash *chanhash;		/* ghash for quicker string lookups */
+	ListBase chanbase;          /* list of pose channels, PoseBones in RNA */
+	struct GHash *chanhash;     /* ghash for quicker string lookups */
 	
 	short flag, pad;
-	unsigned int proxy_layer;	/* proxy layer: copy from armature, gets synced */
+	unsigned int proxy_layer;   /* proxy layer: copy from armature, gets synced */
 	int pad1;
 	
-	float ctime;				/* local action time of this pose */
-	float stride_offset[3];		/* applied to object */
-	float cyclic_offset[3];		/* result of match and cycles, applied in BKE_pose_where_is() */
+	float ctime;                /* local action time of this pose */
+	float stride_offset[3];     /* applied to object */
+	float cyclic_offset[3];     /* result of match and cycles, applied in BKE_pose_where_is() */
 	
 	
-	ListBase agroups;			/* list of bActionGroups */
+	ListBase agroups;           /* list of bActionGroups */
 	
-	int active_group;			/* index of active group (starts from 1) */
-	int	iksolver;				/* ik solver to use, see ePose_IKSolverType */
-	void *ikdata;				/* temporary IK data, depends on the IK solver. Not saved in file */
-	void *ikparam;				/* IK solver parameters, structure depends on iksolver */ 
+	int active_group;           /* index of active group (starts from 1) */
+	int iksolver;               /* ik solver to use, see ePose_IKSolverType */
+	void *ikdata;               /* temporary IK data, depends on the IK solver. Not saved in file */
+	void *ikparam;              /* IK solver parameters, structure depends on iksolver */
 	
-	bAnimVizSettings avs;		/* settings for visualization of bone animation */
+	bAnimVizSettings avs;       /* settings for visualization of bone animation */
 	char proxy_act_bone[64];    /* proxy active bone name, MAXBONENAME */
 } bPose;
 
 
 /* Pose->flag */
 typedef enum ePose_Flags {
-		/* results in BKE_pose_rebuild being called */
-	POSE_RECALC = (1<<0),
-		/* prevents any channel from getting overridden by anim from IPO */
-	POSE_LOCKED	= (1<<1),
-		/* clears the POSE_LOCKED flag for the next time the pose is evaluated */
-	POSE_DO_UNLOCK	= (1<<2),
-		/* pose has constraints which depend on time (used when depsgraph updates for a new frame) */
-	POSE_CONSTRAINTS_TIMEDEPEND = (1<<3),
-		/* recalculate bone paths */
-	POSE_RECALCPATHS = (1<<4),
-		/* set by BKE_pose_rebuild to give a chance to the IK solver to rebuild IK tree */
-	POSE_WAS_REBUILT = (1<<5),
-		/* set by game_copy_pose to indicate that this pose is used in the game engine */
-	POSE_GAME_ENGINE = (1<<6)
+	/* results in BKE_pose_rebuild being called */
+	POSE_RECALC = (1 << 0),
+	/* prevents any channel from getting overridden by anim from IPO */
+	POSE_LOCKED = (1 << 1),
+	/* clears the POSE_LOCKED flag for the next time the pose is evaluated */
+	POSE_DO_UNLOCK  = (1 << 2),
+	/* pose has constraints which depend on time (used when depsgraph updates for a new frame) */
+	POSE_CONSTRAINTS_TIMEDEPEND = (1 << 3),
+	/* recalculate bone paths */
+	POSE_RECALCPATHS = (1 << 4),
+	/* set by BKE_pose_rebuild to give a chance to the IK solver to rebuild IK tree */
+	POSE_WAS_REBUILT = (1 << 5),
+	/* set by game_copy_pose to indicate that this pose is used in the game engine */
+	POSE_GAME_ENGINE = (1 << 6)
 } ePose_Flags;
 
 /* IK Solvers ------------------------------------ */
@@ -373,42 +373,42 @@ typedef enum ePose_Flags {
 /* bPose->iksolver and bPose->ikparam->iksolver */
 typedef enum ePose_IKSolverType {
 	IKSOLVER_LEGACY = 0,
-	IKSOLVER_ITASC
+	IKSOLVER_ITASC = 1
 } ePose_IKSolverType;
 
 /* header for all bPose->ikparam structures */
 typedef struct bIKParam {
-	int   iksolver;
+	int iksolver;
 } bIKParam;
 
 /* bPose->ikparam when bPose->iksolver=1 */
 typedef struct bItasc {
-	int   iksolver;
+	int iksolver;
 	float precision;
 	short numiter;
 	short numstep;
 	float minstep;
 	float maxstep;
-	short solver;	
+	short solver;
 	short flag;
 	float feedback;
-	float maxvel;	/* max velocity to SDLS solver */
-	float dampmax;	/* maximum damping for DLS solver */
-	float dampeps;	/* threshold of singular value from which the damping start progressively */
+	float maxvel;   /* max velocity to SDLS solver */
+	float dampmax;  /* maximum damping for DLS solver */
+	float dampeps;  /* threshold of singular value from which the damping start progressively */
 } bItasc;
 
 /* bItasc->flag */
 typedef enum eItasc_Flags {
-	ITASC_AUTO_STEP = (1<<0),
-	ITASC_INITIAL_REITERATION = (1<<1),
-	ITASC_REITERATION = (1<<2),
-	ITASC_SIMULATION = (1<<3)
+	ITASC_AUTO_STEP           = (1 << 0),
+	ITASC_INITIAL_REITERATION = (1 << 1),
+	ITASC_REITERATION         = (1 << 2),
+	ITASC_SIMULATION          = (1 << 3)
 } eItasc_Flags;
 
 /* bItasc->solver */
 typedef enum eItasc_Solver {
-	ITASC_SOLVER_SDLS = 0,	/* selective damped least square, suitable for CopyPose constraint */
-	ITASC_SOLVER_DLS		/* damped least square with numerical filtering of damping */
+	ITASC_SOLVER_SDLS = 0,  /* selective damped least square, suitable for CopyPose constraint */
+	ITASC_SOLVER_DLS  = 1,  /* damped least square with numerical filtering of damping */
 } eItasc_Solver;
 
 /* ************************************************ */
@@ -434,34 +434,34 @@ typedef enum eItasc_Solver {
 typedef struct bActionGroup {
 	struct bActionGroup *next, *prev;
 	
-	ListBase channels;			/* Note: this must not be touched by standard listbase functions which would clear links to other channels */
+	ListBase channels;          /* Note: this must not be touched by standard listbase functions which would clear links to other channels */
 	
-	int flag;					/* settings for this action-group */
-	int customCol;				/* index of custom color set to use when used for bones (0=default - used for all old files, -1=custom set) */				
-	char name[64];				/* name of the group */
+	int flag;                   /* settings for this action-group */
+	int customCol;              /* index of custom color set to use when used for bones (0=default - used for all old files, -1=custom set) */
+	char name[64];              /* name of the group */
 	
-	ThemeWireColor cs;			/* color set to use when customCol == -1 */
+	ThemeWireColor cs;          /* color set to use when customCol == -1 */
 } bActionGroup;
 
 /* Action Group flags */
 typedef enum eActionGroup_Flag {
-		/* group is selected */
-	AGRP_SELECTED 	= (1<<0),
-		/* group is 'active' / last selected one */
-	AGRP_ACTIVE 	= (1<<1),
-		/* keyframes/channels belonging to it cannot be edited */
-	AGRP_PROTECTED 	= (1<<2),
-		/* for UI (DopeSheet), sub-channels are shown */
-	AGRP_EXPANDED 	= (1<<3),
-		/* sub-channels are not evaluated */
-	AGRP_MUTED		= (1<<4),
-		/* sub-channels are not visible in Graph Editor */
-	AGRP_NOTVISIBLE	= (1<<5),
-		/* for UI (Graph Editor), sub-channels are shown */
-	AGRP_EXPANDED_G	= (1<<6),
-	
-	AGRP_TEMP		= (1<<30),
-	AGRP_MOVED 		= (1<<31)
+	/* group is selected */
+	AGRP_SELECTED   = (1 << 0),
+	/* group is 'active' / last selected one */
+	AGRP_ACTIVE     = (1 << 1),
+	/* keyframes/channels belonging to it cannot be edited */
+	AGRP_PROTECTED  = (1 << 2),
+	/* for UI (DopeSheet), sub-channels are shown */
+	AGRP_EXPANDED   = (1 << 3),
+	/* sub-channels are not evaluated */
+	AGRP_MUTED      = (1 << 4),
+	/* sub-channels are not visible in Graph Editor */
+	AGRP_NOTVISIBLE = (1 << 5),
+	/* for UI (Graph Editor), sub-channels are shown */
+	AGRP_EXPANDED_G = (1 << 6),
+	
+	AGRP_TEMP       = (1 << 30),
+	AGRP_MOVED      = (1 << 31)
 } eActionGroup_Flag;
 
 
@@ -478,31 +478,31 @@ typedef enum eActionGroup_Flag {
  * affects a group of related settings (as defined by the user). 
  */
 typedef struct bAction {
-	ID 	id;				/* ID-serialisation for relinking */
+	ID id;              /* ID-serialisation for relinking */
 	
-	ListBase curves;	/* function-curves (FCurve) */
-	ListBase chanbase;	/* legacy data - Action Channels (bActionChannel) in pre-2.5 animation system */
-	ListBase groups;	/* groups of function-curves (bActionGroup) */
-	ListBase markers;	/* markers local to the Action (used to provide Pose-Libraries) */
+	ListBase curves;    /* function-curves (FCurve) */
+	ListBase chanbase;  /* legacy data - Action Channels (bActionChannel) in pre-2.5 animation system */
+	ListBase groups;    /* groups of function-curves (bActionGroup) */
+	ListBase markers;   /* markers local to the Action (used to provide Pose-Libraries) */
 	
-	int flag;			/* settings for this action */
-	int active_marker;	/* index of the active marker */
+	int flag;           /* settings for this action */
+	int active_marker;  /* index of the active marker */
 	
-	int idroot;			/* type of ID-blocks that action can be assigned to (if 0, will be set to whatever ID first evaluates it) */
+	int idroot;         /* type of ID-blocks that action can be assigned to (if 0, will be set to whatever ID first evaluates it) */
 	int pad;
 } bAction;
 
 
 /* Flags for the action */
 typedef enum eAction_Flags {
-		/* flags for displaying in UI */
-	ACT_COLLAPSED	= (1<<0),
-	ACT_SELECTED	= (1<<1),
-	
-		/* flags for evaluation/editing */
-	ACT_MUTED		= (1<<9),
-	ACT_PROTECTED	= (1<<10),
-	ACT_DISABLED	= (1<<11)
+	/* flags for displaying in UI */
+	ACT_COLLAPSED   = (1 << 0),
+	ACT_SELECTED    = (1 << 1),
+
+	/* flags for evaluation/editing */
+	ACT_MUTED       = (1 << 9),
+	ACT_PROTECTED   = (1 << 10),
+	ACT_DISABLED    = (1 << 11)
 } eAction_Flags;
 
 
@@ -511,67 +511,67 @@ typedef enum eAction_Flags {
 
 /* Storage for Dopesheet/Grease-Pencil Editor data */
 typedef struct bDopeSheet {
-	ID 		*source;			/* currently ID_SCE (for Dopesheet), and ID_SC (for Grease Pencil) */
-	ListBase chanbase;			/* cache for channels (only initialized when pinned) */  // XXX not used!
+	ID      *source;            /* currently ID_SCE (for Dopesheet), and ID_SC (for Grease Pencil) */
+	ListBase chanbase; /* cache for channels (only initialized when pinned) */           // XXX not used!
 	
-	struct Group *filter_grp;	/* object group for ADS_FILTER_ONLYOBGROUP filtering option */
-	char searchstr[64];			/* string to search for in displayed names of F-Curves for ADS_FILTER_BY_FCU_NAME filtering option */
+	struct Group *filter_grp;   /* object group for ADS_FILTER_ONLYOBGROUP filtering option */
+	char searchstr[64];         /* string to search for in displayed names of F-Curves for ADS_FILTER_BY_FCU_NAME filtering option */
 	
-	int filterflag;				/* flags to use for filtering data */
-	int flag;					/* standard flags */
+	int filterflag;             /* flags to use for filtering data */
+	int flag;                   /* standard flags */
 	
-	int renameIndex;			/* index+1 of channel to rename - only gets set by renaming operator */
+	int renameIndex;            /* index+1 of channel to rename - only gets set by renaming operator */
 	int pad;
 } bDopeSheet;
 
 
 /* DopeSheet filter-flag */
 typedef enum eDopeSheet_FilterFlag {
-		/* general filtering */
-	ADS_FILTER_ONLYSEL			= (1<<0),	/* only include channels relating to selected data */
-	
-		/* temporary filters */
-	ADS_FILTER_ONLYDRIVERS		= (1<<1),	/* for 'Drivers' editor - only include Driver data from AnimData */
-	ADS_FILTER_ONLYNLA			= (1<<2),	/* for 'NLA' editor - only include NLA data from AnimData */
-	ADS_FILTER_SELEDIT			= (1<<3),	/* for Graph Editor - used to indicate whether to include a filtering flag or not */
-	
-		/* general filtering 2 */
-	ADS_FILTER_SUMMARY			= (1<<4),	/* for 'DopeSheet' Editors - include 'summary' line */
-	ADS_FILTER_ONLYOBGROUP		= (1<<5),	/* only the objects in the specified object group get used */
-	
-		/* datatype-based filtering */
-	ADS_FILTER_NOSHAPEKEYS 		= (1<<6),
-	ADS_FILTER_NOMESH			= (1<<7),
-	ADS_FILTER_NOOBJ			= (1<<8),	/* for animdata on object level, if we only want to concentrate on materials/etc. */
-	ADS_FILTER_NOLAT			= (1<<9),
-	ADS_FILTER_NOCAM			= (1<<10),
-	ADS_FILTER_NOMAT			= (1<<11),
-	ADS_FILTER_NOLAM			= (1<<12),
-	ADS_FILTER_NOCUR			= (1<<13),
-	ADS_FILTER_NOWOR			= (1<<14),
-	ADS_FILTER_NOSCE			= (1<<15),
-	ADS_FILTER_NOPART			= (1<<16),
-	ADS_FILTER_NOMBA			= (1<<17),
-	ADS_FILTER_NOARM			= (1<<18),
-	ADS_FILTER_NONTREE			= (1<<19),
-	ADS_FILTER_NOTEX			= (1<<20),
-	ADS_FILTER_NOSPK			= (1<<21),
-	
-		/* NLA-specific filters */
-	ADS_FILTER_NLA_NOACT		= (1<<25),	/* if the AnimData block has no NLA data, don't include to just show Action-line */
-	
-		/* general filtering 3 */
-	ADS_FILTER_INCL_HIDDEN		= (1<<26),	/* include 'hidden' channels too (i.e. those from hidden Objects/Bones) */
-	ADS_FILTER_BY_FCU_NAME		= (1<<27),	/* for F-Curves, filter by the displayed name (i.e. to isolate all Location curves only) */
-	
-		/* combination filters (some only used at runtime) */
-	ADS_FILTER_NOOBDATA = (ADS_FILTER_NOCAM|ADS_FILTER_NOMAT|ADS_FILTER_NOLAM|ADS_FILTER_NOCUR|ADS_FILTER_NOPART|ADS_FILTER_NOARM|ADS_FILTER_NOSPK)
+	/* general filtering */
+	ADS_FILTER_ONLYSEL          = (1 << 0),   /* only include channels relating to selected data */
+	
+	/* temporary filters */
+	ADS_FILTER_ONLYDRIVERS      = (1 << 1),   /* for 'Drivers' editor - only include Driver data from AnimData */
+	ADS_FILTER_ONLYNLA          = (1 << 2),   /* for 'NLA' editor - only include NLA data from AnimData */
+	ADS_FILTER_SELEDIT          = (1 << 3),   /* for Graph Editor - used to indicate whether to include a filtering flag or not */
+
+	/* general filtering 2 */
+	ADS_FILTER_SUMMARY          = (1 << 4),   /* for 'DopeSheet' Editors - include 'summary' line */
+	ADS_FILTER_ONLYOBGROUP      = (1 << 5),   /* only the objects in the specified object group get used */
+
+	/* datatype-based filtering */
+	ADS_FILTER_NOSHAPEKEYS      = (1 << 6),
+	ADS_FILTER_NOMESH           = (1 << 7),
+	ADS_FILTER_NOOBJ            = (1 << 8),   /* for animdata on object level, if we only want to concentrate on materials/etc. */
+	ADS_FILTER_NOLAT            = (1 << 9),
+	ADS_FILTER_NOCAM            = (1 << 10),
+	ADS_FILTER_NOMAT            = (1 << 11),
+	ADS_FILTER_NOLAM            = (1 << 12),
+	ADS_FILTER_NOCUR            = (1 << 13),
+	ADS_FILTER_NOWOR            = (1 << 14),
+	ADS_FILTER_NOSCE            = (1 << 15),
+	ADS_FILTER_NOPART           = (1 << 16),
+	ADS_FILTER_NOMBA            = (1 << 17),
+	ADS_FILTER_NOARM            = (1 << 18),
+	ADS_FILTER_NONTREE          = (1 << 19),
+	ADS_FILTER_NOTEX            = (1 << 20),
+	ADS_FILTER_NOSPK            = (1 << 21),
+
+	/* NLA-specific filters */
+	ADS_FILTER_NLA_NOACT        = (1 << 25),  /* if the AnimData block has no NLA data, don't include to just show Action-line */
+
+	/* general filtering 3 */
+	ADS_FILTER_INCL_HIDDEN      = (1 << 26),  /* include 'hidden' channels too (i.e. those from hidden Objects/Bones) */
+	ADS_FILTER_BY_FCU_NAME      = (1 << 27),  /* for F-Curves, filter by the displayed name (i.e. to isolate all Location curves only) */
+	
+	/* combination filters (some only used at runtime) */
+	ADS_FILTER_NOOBDATA = (ADS_FILTER_NOCAM | ADS_FILTER_NOMAT | ADS_FILTER_NOLAM | ADS_FILTER_NOCUR | ADS_FILTER_NOPART | ADS_FILTER_NOARM | ADS_FILTER_NOSPK)
 } eDopeSheet_FilterFlag;	
 
 /* DopeSheet general flags */
 typedef enum eDopeSheet_Flag {
-	ADS_FLAG_SUMMARY_COLLAPSED	= (1<<0),	/* when summary is shown, it is collapsed, so all other channels get hidden */
-	ADS_FLAG_SHOW_DBFILTERS		= (1<<1)	/* show filters for datablocks */
+	ADS_FLAG_SUMMARY_COLLAPSED  = (1 << 0),   /* when summary is shown, it is collapsed, so all other channels get hidden */
+	ADS_FLAG_SHOW_DBFILTERS     = (1 << 1)    /* show filters for datablocks */
 } eDopeSheet_Flag;
 
 
@@ -579,72 +579,74 @@ typedef enum eDopeSheet_Flag {
 /* Action Editor Space. This is defined here instead of in DNA_space_types.h */
 typedef struct SpaceAction {
 	struct SpaceLink *next, *prev;
-	ListBase regionbase;		/* storage of regions for inactive spaces */
+	ListBase regionbase;        /* storage of regions for inactive spaces */
 	int spacetype;
 	float blockscale;
 
 	short blockhandler[8];
 
-	View2D v2d  DNA_DEPRECATED; /* copied to region */
+	View2D v2d DNA_DEPRECATED;  /* copied to region */
 	
-	bAction		*action;		/* the currently active action */
-	bDopeSheet 	ads;			/* the currently active context (when not showing action) */
+	bAction     *action;        /* the currently active action */
+	bDopeSheet ads;             /* the currently active context (when not showing action) */
 	
-	char  mode, autosnap;		/* mode: editing context; autosnap: automatic keyframe snapping mode   */
-	short flag; 				/* flag: bitmapped settings; */
-	float timeslide;			/* for Time-Slide transform mode drawing - current frame? */
+	char mode, autosnap;        /* mode: editing context; autosnap: automatic keyframe snapping mode   */
+	short flag;                 /* flag: bitmapped settings; */
+	float timeslide;            /* for Time-Slide transform mode drawing - current frame? */
 } SpaceAction;
 
 /* SpaceAction flag */
 typedef enum eSAction_Flag {
-		/* during transform (only set for TimeSlide) */
-	SACTION_MOVING	= (1<<0),	
-		/* show sliders */
-	SACTION_SLIDERS	= (1<<1),	
-		/* draw time in seconds instead of time in frames */
-	SACTION_DRAWTIME = (1<<2),
-		/* don't filter action channels according to visibility */
+	/* during transform (only set for TimeSlide) */
+	SACTION_MOVING  = (1 << 0),
+	/* show sliders */
+	SACTION_SLIDERS = (1 << 1),
+	/* draw time in seconds instead of time in frames */
+	SACTION_DRAWTIME = (1 << 2),
+	/* don't filter action channels according to visibility */
 	//SACTION_NOHIDE = (1<<3), // XXX depreceated... old animation system
-		/* don't kill overlapping keyframes after transform */
-	SACTION_NOTRANSKEYCULL = (1<<4),
-		/* don't include keyframes that are out of view */
+	/* don't kill overlapping keyframes after transform */
+	SACTION_NOTRANSKEYCULL = (1 << 4),
+	/* don't include keyframes that are out of view */
 	//SACTION_HORIZOPTIMISEON = (1<<5), // XXX depreceated... old irrelevant trick
-		/* show pose-markers (local to action) in Action Editor mode  */
-	SACTION_POSEMARKERS_SHOW = (1<<6),
-		/* don't draw action channels using group colors (where applicable) */
-	SACTION_NODRAWGCOLORS = (1<<7),
-		/* don't draw current frame number beside frame indicator */
-	SACTION_NODRAWCFRANUM = (1<<8),
-		/* temporary flag to force channel selections to be synced with main */
-	SACTION_TEMP_NEEDCHANSYNC = (1<<9),
-		/* don't perform realtime updates */
-	SACTION_NOREALTIMEUPDATES =	(1<<10),
-		/* move markers as well as keyframes */
-	SACTION_MARKERS_MOVE = (1<<11)
+	/* show pose-markers (local to action) in Action Editor mode  */
+	SACTION_POSEMARKERS_SHOW = (1 << 6),
+	/* don't draw action channels using group colors (where applicable) */
+	SACTION_NODRAWGCOLORS = (1 << 7),
+	/* don't draw current frame number beside frame indicator */
+	SACTION_NODRAWCFRANUM = (1 << 8),
+	/* temporary flag to force channel selections to be synced with main */
+	SACTION_TEMP_NEEDCHANSYNC = (1 << 9),
+	/* don't perform realtime updates */
+	SACTION_NOREALTIMEUPDATES = (1 << 10),
+	/* move markers as well as keyframes */
+	SACTION_MARKERS_MOVE = (1 << 11)
 } eSAction_Flag;	
 
 /* SpaceAction Mode Settings */
 typedef enum eAnimEdit_Context {
-		/* action on the active object */
-	SACTCONT_ACTION	= 0,
-		/* list of all shapekeys on the active object, linked with their F-Curves */
-	SACTCONT_SHAPEKEY,
-		/* editing of gpencil data */
-	SACTCONT_GPENCIL,
-		/* dopesheet (default) */
-	SACTCONT_DOPESHEET
+	/* action on the active object */
+	SACTCONT_ACTION = 0,
+	/* list of all shapekeys on the active object, linked with their F-Curves */
+	SACTCONT_SHAPEKEY = 1,
+	/* editing of gpencil data */
+	SACTCONT_GPENCIL = 2,
+	/* dopesheet (default) */
+	SACTCONT_DOPESHEET = 3,
+	/* mask */
+	SACTCONT_MASK = 4
 } eAnimEdit_Context;
 
 /* SpaceAction AutoSnap Settings (also used by other Animation Editors) */
 typedef enum eAnimEdit_AutoSnap {
-		/* no auto-snap */
-	SACTSNAP_OFF = 0,	
-		/* snap to 1.0 frame/second intervals */
-	SACTSNAP_STEP,
-		/* snap to actual frames/seconds (nla-action time) */
-	SACTSNAP_FRAME,
-		/* snap to nearest marker */
-	SACTSNAP_MARKER
+	/* no auto-snap */
+	SACTSNAP_OFF = 0,
+	/* snap to 1.0 frame/second intervals */
+	SACTSNAP_STEP = 1,
+	/* snap to actual frames/seconds (nla-action time) */
+	SACTSNAP_FRAME = 2,
+	/* snap to nearest marker */
+	SACTSNAP_MARKER = 3
 } eAnimEdit_AutoSnap;
 
 
@@ -652,7 +654,7 @@ typedef enum eAnimEdit_AutoSnap {
 /* Legacy Data */
 
 /* WARNING: Action Channels are now depreceated... they were part of the old animation system!
- * 		  (ONLY USED FOR DO_VERSIONS...)
+ *        (ONLY USED FOR DO_VERSIONS...)
  * 
  * Action Channels belong to Actions. They are linked with an IPO block, and can also own 
  * Constraint Channels in certain situations. 
@@ -663,27 +665,27 @@ typedef enum eAnimEdit_AutoSnap {
  * to the position of the group in the list, and their position within the group. 
  */
 typedef struct bActionChannel {
-	struct bActionChannel	*next, *prev;
-	bActionGroup 			*grp;					/* Action Group this Action Channel belongs to */
+	struct bActionChannel   *next, *prev;
+	bActionGroup            *grp;           /* Action Group this Action Channel belongs to */
 	
-	struct Ipo				*ipo;					/* IPO block this action channel references */
-	ListBase				constraintChannels;		/* Constraint Channels (when Action Channel represents an Object or Bone) */
+	struct Ipo              *ipo;           /* IPO block this action channel references */
+	ListBase constraintChannels;            /* Constraint Channels (when Action Channel represents an Object or Bone) */
 	
-	int		flag;			/* settings accessed via bitmapping */
-	char	name[64];		/* channel name, MAX_NAME */
-	int		temp;			/* temporary setting - may be used to indicate group that channel belongs to during syncing  */
+	int flag;               /* settings accessed via bitmapping */
+	char name[64];          /* channel name, MAX_NAME */
+	int temp;               /* temporary setting - may be used to indicate group that channel belongs to during syncing  */
 } bActionChannel;
 
 /* Action Channel flags (ONLY USED FOR DO_VERSIONS...) */
 typedef enum ACHAN_FLAG {
-	ACHAN_SELECTED	= (1<<0),
-	ACHAN_HILIGHTED = (1<<1),
-	ACHAN_HIDDEN	= (1<<2),
-	ACHAN_PROTECTED = (1<<3),
-	ACHAN_EXPANDED 	= (1<<4),
-	ACHAN_SHOWIPO	= (1<<5),
-	ACHAN_SHOWCONS 	= (1<<6),
-	ACHAN_MOVED     = (1<<31)
+	ACHAN_SELECTED  = (1 << 0),
+	ACHAN_HILIGHTED = (1 << 1),
+	ACHAN_HIDDEN    = (1 << 2),
+	ACHAN_PROTECTED = (1 << 3),
+	ACHAN_EXPANDED  = (1 << 4),
+	ACHAN_SHOWIPO   = (1 << 5),
+	ACHAN_SHOWCONS  = (1 << 6),
+	ACHAN_MOVED     = (1 << 31)
 } ACHAN_FLAG; 
 
 #endif
diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h
index f4e06455c63..4a5ad69cb91 100644
--- a/source/blender/makesdna/DNA_actuator_types.h
+++ b/source/blender/makesdna/DNA_actuator_types.h
@@ -62,8 +62,7 @@ typedef struct bActionActuator {
 	float	layer_weight;	/* How much of the previous layer to use for blending. (<0 = disable, 0 = add mode) */
 } bActionActuator;												
 
-typedef struct Sound3D
-{
+typedef struct Sound3D {
 	float min_gain;
 	float max_gain;
 	float reference_distance;
diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h
index fd4b86a4155..55fb3322806 100644
--- a/source/blender/makesdna/DNA_anim_types.h
+++ b/source/blender/makesdna/DNA_anim_types.h
@@ -72,15 +72,15 @@ typedef struct FModifier {
  */
 typedef enum eFModifier_Types {
 	FMODIFIER_TYPE_NULL = 0,
-	FMODIFIER_TYPE_GENERATOR,
-	FMODIFIER_TYPE_FN_GENERATOR,
-	FMODIFIER_TYPE_ENVELOPE,
-	FMODIFIER_TYPE_CYCLES,
-	FMODIFIER_TYPE_NOISE,
-	FMODIFIER_TYPE_FILTER,		/* unimplemented - for applying: fft, high/low pass filters, etc. */
-	FMODIFIER_TYPE_PYTHON,	
-	FMODIFIER_TYPE_LIMITS,
-	FMODIFIER_TYPE_STEPPED,
+	FMODIFIER_TYPE_GENERATOR = 1,
+	FMODIFIER_TYPE_FN_GENERATOR = 2,
+	FMODIFIER_TYPE_ENVELOPE = 3,
+	FMODIFIER_TYPE_CYCLES = 4,
+	FMODIFIER_TYPE_NOISE = 5,
+	FMODIFIER_TYPE_FILTER = 6,		/* unimplemented - for applying: fft, high/low pass filters, etc. */
+	FMODIFIER_TYPE_PYTHON = 7,
+	FMODIFIER_TYPE_LIMITS = 8,
+	FMODIFIER_TYPE_STEPPED = 9,
 	
 	/* NOTE: all new modifiers must be added above this line */
 	FMODIFIER_NUM_TYPES
@@ -120,7 +120,7 @@ typedef struct FMod_Generator {
 /* generator modes */
 typedef enum eFMod_Generator_Modes {
 	FCM_GENERATOR_POLYNOMIAL	= 0,
-	FCM_GENERATOR_POLYNOMIAL_FACTORISED
+	FCM_GENERATOR_POLYNOMIAL_FACTORISED = 1
 } eFMod_Generator_Modes;
 
 
@@ -156,11 +156,11 @@ typedef struct FMod_FunctionGenerator {
 /* 'function' generator types */
 typedef enum eFMod_Generator_Functions {
 	FCM_GENERATOR_FN_SIN	= 0,
-	FCM_GENERATOR_FN_COS,
-	FCM_GENERATOR_FN_TAN,
-	FCM_GENERATOR_FN_SQRT,
-	FCM_GENERATOR_FN_LN,
-	FCM_GENERATOR_FN_SINC
+	FCM_GENERATOR_FN_COS	= 1,
+	FCM_GENERATOR_FN_TAN	= 2,
+	FCM_GENERATOR_FN_SQRT	= 3,
+	FCM_GENERATOR_FN_LN	= 4,
+	FCM_GENERATOR_FN_SINC	= 5
 } eFMod_Generator_Functions;
 
 
diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h
index ea564e8c499..cc08d0e92bd 100644
--- a/source/blender/makesdna/DNA_armature_types.h
+++ b/source/blender/makesdna/DNA_armature_types.h
@@ -128,22 +128,23 @@ typedef enum eArmature_Flag {
 	ARM_NO_CUSTOM		= (1<<10), 	/* made option negative, for backwards compat */
 	ARM_COL_CUSTOM		= (1<<11),	/* draw custom colors  */
 	ARM_GHOST_ONLYSEL 	= (1<<12),	/* when ghosting, only show selected bones (this should belong to ghostflag instead) */ // XXX depreceated
-	ARM_DS_EXPAND 		= (1<<13)
+	ARM_DS_EXPAND 		= (1<<13),	/* dopesheet channel is expanded */
+	ARM_HAS_VIZ_DEPS	= (1<<14),	/* other objects are used for visualising various states (hack for efficient updates) */
 } eArmature_Flag;
 
 /* armature->drawtype */
 typedef enum eArmature_Drawtype {
 	ARM_OCTA = 0,
-	ARM_LINE,
-	ARM_B_BONE,
-	ARM_ENVELOPE,
-	ARM_WIRE
+	ARM_LINE = 1,
+	ARM_B_BONE = 2,
+	ARM_ENVELOPE = 3,
+	ARM_WIRE = 4
 } eArmature_Drawtype;
 
 /* armature->gevertdeformer */
 typedef enum eArmature_VertDeformer {
-	ARM_VDEF_BLENDER,
-	ARM_VDEF_BGE_CPU
+	ARM_VDEF_BLENDER = 0,
+	ARM_VDEF_BGE_CPU = 1
 } eArmature_VertDeformer;
 
 /* armature->deformflag */
@@ -169,8 +170,8 @@ typedef enum eArmature_PathFlag {
 // XXX depreceated... old animation system (armature only viz)
 typedef enum eArmature_GhostType {
 	ARM_GHOST_CUR = 0,
-	ARM_GHOST_RANGE,
-	ARM_GHOST_KEYS
+	ARM_GHOST_RANGE = 1,
+	ARM_GHOST_KEYS = 2
 } eArmature_GhostType;
 
 /* bone->flag */
diff --git a/source/blender/makesdna/DNA_boid_types.h b/source/blender/makesdna/DNA_boid_types.h
index 698667ff33c..ce5fc4b0c3c 100644
--- a/source/blender/makesdna/DNA_boid_types.h
+++ b/source/blender/makesdna/DNA_boid_types.h
@@ -36,18 +36,18 @@
 
 typedef enum BoidRuleType {
 	eBoidRuleType_None = 0,
-	eBoidRuleType_Goal,				/* go to goal assigned object or loudest assigned signal source */
-	eBoidRuleType_Avoid,			/* get away from assigned object or loudest assigned signal source */
-	eBoidRuleType_AvoidCollision,	/* manoeuver to avoid collisions with other boids and deflector object in near future */
-	eBoidRuleType_Separate,			/* keep from going through other boids */
-	eBoidRuleType_Flock,			/* move to center of neighbors and match their velocity */
-	eBoidRuleType_FollowLeader,		/* follow a boid or assigned object */
-	eBoidRuleType_AverageSpeed,		/* maintain speed, flight level or wander*/
-	eBoidRuleType_Fight,			/* go to closest enemy and attack when in range */
-	//eBoidRuleType_Protect,		/* go to enemy closest to target and attack when in range */
-	//eBoidRuleType_Hide,			/* find a deflector move to it's other side from closest enemy */
-	//eBoidRuleType_FollowPath,		/* move along a assigned curve or closest curve in a group */
-	//eBoidRuleType_FollowWall,		/* move next to a deflector object's in direction of it's tangent */
+	eBoidRuleType_Goal = 1,			/* go to goal assigned object or loudest assigned signal source */
+	eBoidRuleType_Avoid = 2,		/* get away from assigned object or loudest assigned signal source */
+	eBoidRuleType_AvoidCollision = 3,	/* manoeuver to avoid collisions with other boids and deflector object in near future */
+	eBoidRuleType_Separate = 4,		/* keep from going through other boids */
+	eBoidRuleType_Flock = 5,		/* move to center of neighbors and match their velocity */
+	eBoidRuleType_FollowLeader = 6,		/* follow a boid or assigned object */
+	eBoidRuleType_AverageSpeed = 7,		/* maintain speed, flight level or wander*/
+	eBoidRuleType_Fight = 8,		/* go to closest enemy and attack when in range */
+	//eBoidRuleType_Protect = 9,		/* go to enemy closest to target and attack when in range */
+	//eBoidRuleType_Hide = 10,		/* find a deflector move to it's other side from closest enemy */
+	//eBoidRuleType_FollowPath = 11,	/* move along a assigned curve or closest curve in a group */
+	//eBoidRuleType_FollowWall = 12,	/* move next to a deflector object's in direction of it's tangent */
 	NUM_BOID_RULE_TYPES
 } BoidRuleType;
 
@@ -98,10 +98,10 @@ typedef struct BoidRuleFight {
 
 typedef enum BoidMode {
 	eBoidMode_InAir = 0,
-	eBoidMode_OnLand,
-	eBoidMode_Climbing,
-	eBoidMode_Falling,
-	eBoidMode_Liftoff,
+	eBoidMode_OnLand = 1,
+	eBoidMode_Climbing = 2,
+	eBoidMode_Falling = 3,
+	eBoidMode_Liftoff = 4,
 	NUM_BOID_MODES
 } BoidMode;
 
@@ -114,20 +114,20 @@ typedef struct BoidData {
 // planned for near future
 //typedef enum BoidConditionMode {
 //	eBoidConditionType_Then = 0,
-//	eBoidConditionType_And,
-//	eBoidConditionType_Or,
+//	eBoidConditionType_And = 1,
+//	eBoidConditionType_Or = 2,
 //	NUM_BOID_CONDITION_MODES
 //} BoidConditionMode;
 //typedef enum BoidConditionType {
 //	eBoidConditionType_None = 0,
-//	eBoidConditionType_Signal,
-//	eBoidConditionType_NoSignal,
-//	eBoidConditionType_HealthBelow,
-//	eBoidConditionType_HealthAbove,
-//	eBoidConditionType_See,
-//	eBoidConditionType_NotSee,
-//	eBoidConditionType_StateTime,
-//	eBoidConditionType_Touching,
+//	eBoidConditionType_Signal = 1,
+//	eBoidConditionType_NoSignal = 2,
+//	eBoidConditionType_HealthBelow = 3,
+//	eBoidConditionType_HealthAbove = 4,
+//	eBoidConditionType_See = 5,
+//	eBoidConditionType_NotSee = 6,
+//	eBoidConditionType_StateTime = 7,
+//	eBoidConditionType_Touching = 8,
 //	NUM_BOID_CONDITION_TYPES
 //} BoidConditionType;
 //typedef struct BoidCondition {
@@ -142,8 +142,8 @@ typedef struct BoidData {
 
 typedef enum BoidRulesetType {
 	eBoidRulesetType_Fuzzy = 0,
-	eBoidRulesetType_Random,
-	eBoidRulesetType_Average,
+	eBoidRulesetType_Random = 1,
+	eBoidRulesetType_Average = 2,
 	NUM_BOID_RULESET_TYPES
 } BoidRulesetType;
 #define BOIDSTATE_CURRENT	1
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index 0cef9aa03b7..cc26ee479d7 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -174,26 +174,26 @@ typedef enum BrushSculptTool {
 
 /* direction that the brush displaces along */
 enum {
-	SCULPT_DISP_DIR_AREA,
-	SCULPT_DISP_DIR_VIEW,
-	SCULPT_DISP_DIR_X,
-	SCULPT_DISP_DIR_Y,
-	SCULPT_DISP_DIR_Z
+	SCULPT_DISP_DIR_AREA = 0,
+	SCULPT_DISP_DIR_VIEW = 1,
+	SCULPT_DISP_DIR_X = 2,
+	SCULPT_DISP_DIR_Y = 3,
+	SCULPT_DISP_DIR_Z = 4
 };
 
 enum {
-	PAINT_BLEND_MIX,
-	PAINT_BLEND_ADD,
-	PAINT_BLEND_SUB,
-	PAINT_BLEND_MUL,
-	PAINT_BLEND_BLUR,
-	PAINT_BLEND_LIGHTEN,
-	PAINT_BLEND_DARKEN
+	PAINT_BLEND_MIX = 0,
+	PAINT_BLEND_ADD = 1,
+	PAINT_BLEND_SUB = 2,
+	PAINT_BLEND_MUL = 3,
+	PAINT_BLEND_BLUR = 4,
+	PAINT_BLEND_LIGHTEN = 5,
+	PAINT_BLEND_DARKEN = 6
 };
 
 typedef enum {
-	BRUSH_MASK_DRAW,
-	BRUSH_MASK_SMOOTH
+	BRUSH_MASK_DRAW = 0,
+	BRUSH_MASK_SMOOTH = 1
 } BrushMaskTool;
 
 #define MAX_BRUSH_PIXEL_RADIUS 200
diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h
index fd8b08e68c6..4928a88b33e 100644
--- a/source/blender/makesdna/DNA_cloth_types.h
+++ b/source/blender/makesdna/DNA_cloth_types.h
@@ -44,8 +44,7 @@
  * variables with different names to minimize confusion.
  */
 
-typedef struct ClothSimSettings
-{
+typedef struct ClothSimSettings {
 	struct	LinkNode *cache; /* UNUSED atm */	
 	float 	mingoal; 	/* see SB */
 	float	Cdis;		/* Mechanical damping of springs.		*/
@@ -83,14 +82,13 @@ typedef struct ClothSimSettings
 	short	shapekey_rest;  /* vertex group for scaling structural stiffness */
 	short	presets; /* used for presets on GUI */
 	short 	reset;
-	short	pad;
+	short pad;
 
 	struct EffectorWeights *effector_weights;
 } ClothSimSettings;
 
 
-typedef struct ClothCollSettings
-{
+typedef struct ClothCollSettings {
 	struct	LinkNode *collision_list; /* e.g. pointer to temp memory for collisions */
 	float	epsilon;		/* min distance for collisions.		*/
 	float	self_friction;		/* Fiction/damping with self contact. */
@@ -101,6 +99,9 @@ typedef struct ClothCollSettings
 	short	self_loop_count;	/* How many iterations for the selfcollision loop	*/
 	short	loop_count;		/* How many iterations for the collision loop.		*/
 	struct Group *group;	/* Only use colliders from this group of objects */
+	short	vgroup_selfcol; /* vgroup to paint which vertices are used for self collisions */
+	short pad;
+	int pad2;
 } ClothCollSettings;
 
 
diff --git a/source/blender/makesdna/DNA_color_types.h b/source/blender/makesdna/DNA_color_types.h
index 676389ffeea..1f8fdd20dda 100644
--- a/source/blender/makesdna/DNA_color_types.h
+++ b/source/blender/makesdna/DNA_color_types.h
@@ -86,32 +86,46 @@ typedef struct CurveMapping {
 
 /* cumapping->preset */
 typedef enum CurveMappingPreset {
-	CURVE_PRESET_LINE,
-	CURVE_PRESET_SHARP,
-	CURVE_PRESET_SMOOTH,
-	CURVE_PRESET_MAX,
-	CURVE_PRESET_MID9,
-	CURVE_PRESET_ROUND,
-	CURVE_PRESET_ROOT,
+	CURVE_PRESET_LINE   = 0,
+	CURVE_PRESET_SHARP  = 1,
+	CURVE_PRESET_SMOOTH = 2,
+	CURVE_PRESET_MAX    = 3,
+	CURVE_PRESET_MID9   = 4,
+	CURVE_PRESET_ROUND  = 5,
+	CURVE_PRESET_ROOT   = 6,
 } CurveMappingPreset;
 
 /* histogram->mode */
-#define HISTO_MODE_LUMA	0
-#define HISTO_MODE_RGB	1
-#define HISTO_MODE_R	2
-#define HISTO_MODE_G	3
-#define HISTO_MODE_B	4
+enum {
+	HISTO_MODE_LUMA   = 0,
+	HISTO_MODE_RGB    = 1,
+	HISTO_MODE_R      = 2,
+	HISTO_MODE_G      = 3,
+	HISTO_MODE_B      = 4,
+	HISTO_MODE_ALPHA  = 5
+};
+
+enum {
+	HISTO_FLAG_LINE        = (1 << 0),
+	HISTO_FLAG_SAMPLELINE  = (1 << 1)
+};
 
 typedef struct Histogram {
 	int channels;
 	int x_resolution;
+	float data_luma[256];
 	float data_r[256];
 	float data_g[256];
 	float data_b[256];
-	float data_luma[256];
+	float data_a[256];
 	float xmax, ymax;
-	int mode;
+	short mode;
+	short flag;
 	int height;
+
+	/* sample line only */
+	/* image coords src -> dst */
+	float co[2][2];
 } Histogram;
 
 struct ImBuf;
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index 7a2d2929e47..40362424532 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -104,9 +104,9 @@ typedef enum B_CONSTRAINT_TARGET_FLAG {
 /* bConstraintTarget/bConstraintOb -> type */
 typedef enum B_CONSTRAINT_OB_TYPE {
 	CONSTRAINT_OBTYPE_OBJECT = 1,	/*	string is ""				*/
-	CONSTRAINT_OBTYPE_BONE,			/*	string is bone-name		*/
-	CONSTRAINT_OBTYPE_VERT,			/*	string is vertex-group name 	*/
-	CONSTRAINT_OBTYPE_CV			/* 	string is vertex-group name - is not available until curves get vgroups */
+	CONSTRAINT_OBTYPE_BONE   = 2,	/*	string is bone-name		*/
+	CONSTRAINT_OBTYPE_VERT   = 3,	/*	string is vertex-group name 	*/
+	CONSTRAINT_OBTYPE_CV     = 4	/*	string is vertex-group name - is not available until curves get vgroups */
 } B_CONSTRAINT_OB_TYPE;
 
 
@@ -152,7 +152,7 @@ typedef struct bKinematicConstraint {
 
 typedef enum B_CONSTRAINT_IK_TYPE {
 	CONSTRAINT_IK_COPYPOSE = 0,		/* 'standard' IK constraint: match position and/or orientation of target */
-	CONSTRAINT_IK_DISTANCE			/* maintain distance with target */
+	CONSTRAINT_IK_DISTANCE = 1		/* maintain distance with target */
 } B_CONSTRAINT_IK_TYPE;
 
 
@@ -247,7 +247,7 @@ typedef struct bActionConstraint {
 	int			end;
 	float		min;
 	float		max;
-	int         pad;
+	int			flag;
 	struct bAction	*act;
 	char		subtarget[64];	/* MAX_ID_NAME-2 */
 } bActionConstraint;
@@ -380,7 +380,7 @@ typedef struct bRotLimitConstraint {
 	short		flag2;
 } bRotLimitConstraint;
 
-/* Limit Scaling Constraint */
+/* Limit Scale Constraint */
 typedef struct bSizeLimitConstraint {
 	float 		xmin, xmax;
 	float		ymin, ymax;
@@ -444,34 +444,34 @@ typedef struct bObjectSolverConstraint {
  */
 typedef enum eBConstraint_Types {
 	CONSTRAINT_TYPE_NULL = 0,			/* Invalid/legacy constraint */
-	CONSTRAINT_TYPE_CHILDOF,			/* Unimplemented non longer :) - during constraints recode, Aligorith */
-	CONSTRAINT_TYPE_TRACKTO,
-	CONSTRAINT_TYPE_KINEMATIC,
-	CONSTRAINT_TYPE_FOLLOWPATH,
-	CONSTRAINT_TYPE_ROTLIMIT,			/* Unimplemented no longer :) - Aligorith */
-	CONSTRAINT_TYPE_LOCLIMIT,			/* Unimplemented no longer :) - Aligorith */
-	CONSTRAINT_TYPE_SIZELIMIT,			/* Unimplemented no longer :) - Aligorith */
-	CONSTRAINT_TYPE_ROTLIKE,	
-	CONSTRAINT_TYPE_LOCLIKE,	
-	CONSTRAINT_TYPE_SIZELIKE,
-	CONSTRAINT_TYPE_PYTHON,				/* Unimplemented no longer :) - Aligorith. Scripts */
-	CONSTRAINT_TYPE_ACTION,
-	CONSTRAINT_TYPE_LOCKTRACK,			/* New Tracking constraint that locks an axis in place - theeth */
-	CONSTRAINT_TYPE_DISTLIMIT,			/* limit distance */
-	CONSTRAINT_TYPE_STRETCHTO, 			/* claiming this to be mine :) is in tuhopuu bjornmose */ 
-	CONSTRAINT_TYPE_MINMAX,  			/* floor constraint */
-	CONSTRAINT_TYPE_RIGIDBODYJOINT,		/* rigidbody constraint */
-	CONSTRAINT_TYPE_CLAMPTO, 			/* clampto constraint */	
-	CONSTRAINT_TYPE_TRANSFORM,			/* transformation (loc/rot/size -> loc/rot/size) constraint */	
-	CONSTRAINT_TYPE_SHRINKWRAP,			/* shrinkwrap (loc/rot) constraint */
-	CONSTRAINT_TYPE_DAMPTRACK,			/* New Tracking constraint that minimises twisting */
-	CONSTRAINT_TYPE_SPLINEIK,			/* Spline-IK - Align 'n' bones to a curve */
-	CONSTRAINT_TYPE_TRANSLIKE,			/* Copy transform matrix */
-	CONSTRAINT_TYPE_SAMEVOL,			/* Maintain volume during scaling */
-	CONSTRAINT_TYPE_PIVOT,				/* Pivot Constraint */
-	CONSTRAINT_TYPE_FOLLOWTRACK,		/* Follow Track Constraint */
-	CONSTRAINT_TYPE_CAMERASOLVER,		/* Camera Solver Constraint */
-	CONSTRAINT_TYPE_OBJECTSOLVER,		/* Object Solver Constraint */
+	CONSTRAINT_TYPE_CHILDOF = 1,			/* Unimplemented non longer :) - during constraints recode, Aligorith */
+	CONSTRAINT_TYPE_TRACKTO = 2,
+	CONSTRAINT_TYPE_KINEMATIC = 3,
+	CONSTRAINT_TYPE_FOLLOWPATH = 4,
+	CONSTRAINT_TYPE_ROTLIMIT = 5,			/* Unimplemented no longer :) - Aligorith */
+	CONSTRAINT_TYPE_LOCLIMIT = 6,			/* Unimplemented no longer :) - Aligorith */
+	CONSTRAINT_TYPE_SIZELIMIT = 7,			/* Unimplemented no longer :) - Aligorith */
+	CONSTRAINT_TYPE_ROTLIKE = 8,
+	CONSTRAINT_TYPE_LOCLIKE = 9,
+	CONSTRAINT_TYPE_SIZELIKE = 10,
+	CONSTRAINT_TYPE_PYTHON = 11,				/* Unimplemented no longer :) - Aligorith. Scripts */
+	CONSTRAINT_TYPE_ACTION = 12,
+	CONSTRAINT_TYPE_LOCKTRACK = 13,			/* New Tracking constraint that locks an axis in place - theeth */
+	CONSTRAINT_TYPE_DISTLIMIT = 14,			/* limit distance */
+	CONSTRAINT_TYPE_STRETCHTO = 15,			/* claiming this to be mine :) is in tuhopuu bjornmose */ 
+	CONSTRAINT_TYPE_MINMAX = 16,  			/* floor constraint */
+	CONSTRAINT_TYPE_RIGIDBODYJOINT = 17,		/* rigidbody constraint */
+	CONSTRAINT_TYPE_CLAMPTO = 18, 			/* clampto constraint */
+	CONSTRAINT_TYPE_TRANSFORM = 19,			/* transformation (loc/rot/size -> loc/rot/size) constraint */
+	CONSTRAINT_TYPE_SHRINKWRAP = 20,		/* shrinkwrap (loc/rot) constraint */
+	CONSTRAINT_TYPE_DAMPTRACK = 21,			/* New Tracking constraint that minimises twisting */
+	CONSTRAINT_TYPE_SPLINEIK = 22,			/* Spline-IK - Align 'n' bones to a curve */
+	CONSTRAINT_TYPE_TRANSLIKE = 23,			/* Copy transform matrix */
+	CONSTRAINT_TYPE_SAMEVOL = 24,			/* Maintain volume during scaling */
+	CONSTRAINT_TYPE_PIVOT = 25,			/* Pivot Constraint */
+	CONSTRAINT_TYPE_FOLLOWTRACK = 26,		/* Follow Track Constraint */
+	CONSTRAINT_TYPE_CAMERASOLVER = 27,		/* Camera Solver Constraint */
+	CONSTRAINT_TYPE_OBJECTSOLVER = 28,		/* Object Solver Constraint */
 	
 	/* NOTE: no constraints are allowed to be added after this */
 	NUM_CONSTRAINT_TYPES
@@ -504,13 +504,13 @@ typedef enum eBConstraint_SpaceTypes {
 		/* for objects (relative to parent/without parent influence), 
 		 * for bones (along normals of bone, without parent/restpositions) 
 		 */
-	CONSTRAINT_SPACE_LOCAL, /* = 1 */
+	CONSTRAINT_SPACE_LOCAL = 1,
 		/* for posechannels - pose space  */
-	CONSTRAINT_SPACE_POSE, /* = 2 */
+	CONSTRAINT_SPACE_POSE = 2,
 		 /* for posechannels - local with parent  */
-	CONSTRAINT_SPACE_PARLOCAL, /* = 3 */
+	CONSTRAINT_SPACE_PARLOCAL = 3,
 		/* for files from between 2.43-2.46 (should have been parlocal) */
-	CONSTRAINT_SPACE_INVALID /* = 4. do not exchange for anything! */
+	CONSTRAINT_SPACE_INVALID = 4 /* do not exchange for anything! */
 } eBConstraint_SpaceTypes;
 
 /* bConstraintChannel.flag */
@@ -557,32 +557,38 @@ typedef enum eCopyScale_Flags {
 /* bSameVolumeConstraint.flag */
 typedef enum eSameVolume_Modes {
 	SAMEVOL_X		= 0,
-	SAMEVOL_Y,
-	SAMEVOL_Z
+	SAMEVOL_Y		= 1,
+	SAMEVOL_Z		= 2
 } eSameVolume_Modes;
 
+/* bActionConstraint.flag */
+typedef enum eActionConstraint_Flags {
+	/* Bones use "object" part of target action, instead of "same bone name" part */
+	ACTCON_BONE_USE_OBJECT_ACTION = (1 << 0), 
+} eActionConstraint_Flags;
+
 /* Locked-Axis Values (Locked Track) */
 typedef enum eLockAxis_Modes {
-	LOCK_X	= 0,
-	LOCK_Y,
-	LOCK_Z
+	LOCK_X = 0,
+	LOCK_Y = 1,
+	LOCK_Z = 2
 } eLockAxis_Modes;
 
 /* Up-Axis Values (TrackTo and Locked Track) */
 typedef enum eUpAxis_Modes {
-	UP_X	= 0,
-	UP_Y,
-	UP_Z
+	UP_X = 0,
+	UP_Y = 1,
+	UP_Z = 2
 } eUpAxis_Modes;
 
 /* Tracking axis (TrackTo, Locked Track, Damped Track) and minmax (floor) constraint */
 typedef enum eTrackToAxis_Modes {
 	TRACK_X		= 0,
-	TRACK_Y,
-	TRACK_Z,
-	TRACK_nX,
-	TRACK_nY,
-	TRACK_nZ
+	TRACK_Y		= 1,
+	TRACK_Z		= 2,
+	TRACK_nX	= 3,
+	TRACK_nY	= 4,
+	TRACK_nZ	= 5
 } eTrackToAxis_Modes;
 
 /* FollowPath flags */
@@ -600,24 +606,24 @@ typedef enum eTrackTo_Flags {
 /* Strech To Constraint -> volmode */
 typedef enum eStretchTo_VolMode {
 	VOLUME_XZ	= 0,
-	VOLUME_X,
-	VOLUME_Z,
-	NO_VOLUME
+	VOLUME_X	= 1,
+	VOLUME_Z	= 2,
+	NO_VOLUME	= 3
 } eStretchTo_VolMode;
 
 /* Stretch To Constraint -> plane mode */
 typedef enum eStretchTo_PlaneMode {
 	PLANE_X		= 0,
-	PLANE_Y,
-	PLANE_Z
+	PLANE_Y		= 1,
+	PLANE_Z		= 2
 } eStretchTo_PlaneMode;
 
 /* Clamp-To Constraint ->flag */
 typedef enum eClampTo_Modes {
 	CLAMPTO_AUTO = 0,
-	CLAMPTO_X,
-	CLAMPTO_Y,
-	CLAMPTO_Z
+	CLAMPTO_X    = 1,
+	CLAMPTO_Y    = 2,
+	CLAMPTO_Z    = 3
 } eClampTo_Modes;
 
 /* ClampTo Constraint ->flag2 */
@@ -667,9 +673,9 @@ typedef enum eSplineIK_XZScaleModes {
 	/* no x/z scaling */
 	CONSTRAINT_SPLINEIK_XZS_NONE			= 0,
 	/* bones in the chain should take their x/z scales from the original scaling */
-	CONSTRAINT_SPLINEIK_XZS_ORIGINAL,
+	CONSTRAINT_SPLINEIK_XZS_ORIGINAL		= 1,
 	/* x/z scales are the inverse of the y-scale */
-	CONSTRAINT_SPLINEIK_XZS_VOLUMETRIC
+	CONSTRAINT_SPLINEIK_XZS_VOLUMETRIC		= 2
 } eSplineIK_XZScaleModes;
 
 /* MinMax (floor) flags */
@@ -715,9 +721,9 @@ typedef enum eDistLimit_Flag {
 
 	/* bDistLimitConstraint->mode */
 typedef enum eDistLimit_Modes {
-	LIMITDIST_INSIDE = 0,
-	LIMITDIST_OUTSIDE,
-	LIMITDIST_ONSURFACE
+	LIMITDIST_INSIDE    = 0,
+	LIMITDIST_OUTSIDE   = 1,
+	LIMITDIST_ONSURFACE = 2
 } eDistLimit_Modes;
 	
 /* python constraint -> flag */
@@ -747,18 +753,18 @@ typedef enum ePivotConstraint_Axis {
 	PIVOTCON_AXIS_NONE = -1,	
 	
 	/* consider -ve x-axis rotations */
-	PIVOTCON_AXIS_X_NEG,
+	PIVOTCON_AXIS_X_NEG = 0,
 	/* consider -ve y-axis rotations */
-	PIVOTCON_AXIS_Y_NEG,
+	PIVOTCON_AXIS_Y_NEG = 1,
 	/* consider -ve z-axis rotations */
-	PIVOTCON_AXIS_Z_NEG,
+	PIVOTCON_AXIS_Z_NEG = 2,
 	
 	/* consider +ve x-axis rotations */
-	PIVOTCON_AXIS_X,
+	PIVOTCON_AXIS_X = 3,
 	/* consider +ve y-axis rotations */
-	PIVOTCON_AXIS_Y,
+	PIVOTCON_AXIS_Y = 4,
 	/* consider +ve z-axis rotations */
-	PIVOTCON_AXIS_Z
+	PIVOTCON_AXIS_Z = 5
 } ePivotConstraint_Axis;
 
 	/* settings for Pivot Constraint in general */
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h
index da8458d587e..f5c0148d9d0 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -315,26 +315,26 @@ typedef struct Curve {
 
 /* h1 h2 (beztriple) */
 typedef enum eBezTriple_Handle {
-	HD_FREE	= 0,
-	HD_AUTO,
-	HD_VECT,
-	HD_ALIGN,
-	HD_AUTO_ANIM 	/* auto-clamped handles for animation */
+	HD_FREE = 0,
+	HD_AUTO = 1,
+	HD_VECT = 2,
+	HD_ALIGN = 3,
+	HD_AUTO_ANIM = 4 	/* auto-clamped handles for animation */
 } eBezTriple_Handle;
 
 /* interpolation modes (used only for BezTriple->ipo) */
 typedef enum eBezTriple_Interpolation {
 	BEZT_IPO_CONST = 0,	/* constant interpolation */
-	BEZT_IPO_LIN,		/* linear interpolation */
-	BEZT_IPO_BEZ		/* bezier interpolation */
+	BEZT_IPO_LIN = 1,	/* linear interpolation */
+	BEZT_IPO_BEZ = 2	/* bezier interpolation */
 } eBezTriple_Interpolation;
 
 /* types of keyframe (used only for BezTriple->hide when BezTriple is used in F-Curves) */
 typedef enum eBezTriple_KeyframeType {
 	BEZT_KEYTYPE_KEYFRAME = 0,	/* default - 'proper' Keyframe */
-	BEZT_KEYTYPE_EXTREME,		/* 'extreme' keyframe */
-	BEZT_KEYTYPE_BREAKDOWN,		/* 'breakdown' keyframe */
-	BEZT_KEYTYPE_JITTER,		/* 'jitter' keyframe (for adding 'filler' secondary motion) */
+	BEZT_KEYTYPE_EXTREME = 1,	/* 'extreme' keyframe */
+	BEZT_KEYTYPE_BREAKDOWN = 2,	/* 'breakdown' keyframe */
+	BEZT_KEYTYPE_JITTER = 3,	/* 'jitter' keyframe (for adding 'filler' secondary motion) */
 } eBezTriple_KeyframeType;
 
 /* checks if the given BezTriple is selected */
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h
index dfc70e5bd66..f6c4822bb55 100644
--- a/source/blender/makesdna/DNA_image_types.h
+++ b/source/blender/makesdna/DNA_image_types.h
@@ -65,6 +65,7 @@ typedef struct ImageUser {
 #define	IMA_ANIM_ALWAYS		1
 #define IMA_ANIM_REFRESHED	2
 /* #define IMA_DO_PREMUL	4 */
+#define IMA_NEED_FRAME_RECALC	8
 
 typedef struct Image {
 	ID id;
diff --git a/source/blender/makesdna/DNA_listBase.h b/source/blender/makesdna/DNA_listBase.h
index 35549aee3d2..333e414278d 100644
--- a/source/blender/makesdna/DNA_listBase.h
+++ b/source/blender/makesdna/DNA_listBase.h
@@ -41,22 +41,19 @@ extern "C" {
 #endif
 
 /* generic - all structs which are used in linked-lists used this */
-typedef struct Link
-{
+typedef struct Link {
 	struct Link *next, *prev;
 } Link;
 
 
 /* use this when it is not worth defining a custom one... */
-typedef struct LinkData
-{
+typedef struct LinkData {
 	struct LinkData *next, *prev;
 	void *data;
 } LinkData;
 
 /* never change the size of this! genfile.c detects pointerlen with it */
-typedef struct ListBase 
-{
+typedef struct ListBase  {
 	void *first, *last;
 } ListBase;
 
diff --git a/source/blender/makesdna/DNA_mask_types.h b/source/blender/makesdna/DNA_mask_types.h
new file mode 100644
index 00000000000..52fedd72e86
--- /dev/null
+++ b/source/blender/makesdna/DNA_mask_types.h
@@ -0,0 +1,191 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2012 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Blender Foundation,
+ *                 Sergey Sharybin
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file DNA_mask_types.h
+ *  \ingroup DNA
+ *  \since march-2012
+ *  \author Sergey Sharybin
+ */
+
+#ifndef __DNA_MASK_TYPES_H__
+#define __DNA_MASK_TYPES_H__
+
+#include "DNA_defs.h"
+#include "DNA_ID.h"
+#include "DNA_listBase.h"
+#include "DNA_curve_types.h"
+
+typedef struct Mask {
+	ID id;
+	struct AnimData *adt;
+	ListBase masklayers;  /* mask layers */
+	int masklay_act;      /* index of active mask layer (-1 == None) */
+	int masklay_tot;      /* total number of mask layers */
+
+	int sfra, efra;       /* frames, used by the sequencer */
+
+	int flag;  /* for anim info */
+	int pad;
+} Mask;
+
+typedef struct MaskParent {
+	// int flag;             /* parenting flags */ /* not used */
+	int pad;
+	int id_type;          /* type of parenting */
+	ID *id;               /* ID block of entity to which mask/spline is parented to
+	                       * in case of parenting to movie tracking data set to MovieClip datablock */
+	char parent[64];      /* entity of parent to which parenting happened
+	                       * in case of parenting to movie tracking data contains name of layer */
+	char sub_parent[64];  /* sub-entity of parent to which parenting happened
+	                       * in case of parenting to movie tracking data contains name of track */
+	float parent_orig[2]; /* track location at the moment of parenting */
+} MaskParent;
+
+typedef struct MaskSplinePointUW {
+	float u, w;            /* u coordinate along spline segment and weight of this point */
+	int flag;              /* different flags of this point */
+} MaskSplinePointUW;
+
+typedef struct MaskSplinePoint {
+	BezTriple bezt;        /* actual point coordinates and it's handles  */
+	int pad;
+	int tot_uw;            /* number of uv feather values */
+	MaskSplinePointUW *uw; /* feather UV values */
+	MaskParent parent;     /* parenting information of particular spline point */
+} MaskSplinePoint;
+
+typedef struct MaskSpline {
+	struct MaskSpline *next, *prev;
+
+	int flag;                /* defferent spline flag (closed, ...) */
+	int tot_point;           /* total number of points */
+	MaskSplinePoint *points; /* points which defines spline itself */
+	MaskParent parent;       /* parenting information of the whole spline */
+
+	int weight_interp, pad;  /* weight interpolation */
+
+	MaskSplinePoint *points_deform; /* deformed copy of 'points' BezTriple data - not saved */
+} MaskSpline;
+
+/* one per frame */
+typedef struct MaskLayerShape {
+	struct MaskLayerShape *next, *prev;
+
+	float *data;             /* u coordinate along spline segment and weight of this point */
+	int    tot_vert;         /* to ensure no buffer overruns's: alloc size is (tot_vert * MASK_OBJECT_SHAPE_ELEM_SIZE) */
+	int    frame;            /* different flags of this point */
+	char   flag;             /* animation flag */
+	char   pad[7];
+} MaskLayerShape;
+
+/* cast to this for convenience, not saved */
+#define MASK_OBJECT_SHAPE_ELEM_SIZE 8 /* 3x 2D points + weight + radius == 8 */
+
+#
+#
+typedef struct MaskLayerShapeElem {
+	float value[MASK_OBJECT_SHAPE_ELEM_SIZE];
+} MaskLayerShapeElem;
+
+typedef struct MaskLayer {
+	struct MaskLayer *next, *prev;
+
+	char name[64];                     /* name of the mask layer (64 = MAD_ID_NAME - 2) */
+
+	ListBase splines;                  /* list of splines which defines this mask layer */
+	ListBase splines_shapes;
+
+	struct MaskSpline *act_spline;     /* active spline */
+	struct MaskSplinePoint *act_point; /* active point */
+
+	/* blending options */
+	float  alpha;
+	char   blend;
+	char   blend_flag;
+
+	char   flag;             /* for animation */
+	char   restrictflag;     /* matching 'Object' flag of the same name - eventually use in the outliner  */
+} MaskLayer;
+
+/* MaskParent->flag */
+/* #define MASK_PARENT_ACTIVE  (1 << 0) */ /* UNUSED */
+
+/* MaskSpline->flag */
+/* reserve (1 << 0) for SELECT */
+#define MASK_SPLINE_CYCLIC  (1 << 1)
+
+/* MaskSpline->weight_interp */
+#define MASK_SPLINE_INTERP_LINEAR   1
+#define MASK_SPLINE_INTERP_EASE     2
+
+/* ob->restrictflag */
+#define MASK_RESTRICT_VIEW      1
+#define MASK_RESTRICT_SELECT    2
+#define MASK_RESTRICT_RENDER    4
+
+/* SpaceClip->mask_draw_flag */
+#define MASK_DRAWFLAG_SMOOTH    1
+
+/* copy of eSpaceImage_UVDT */
+/* SpaceClip->mask_draw_type */
+enum {
+	MASK_DT_OUTLINE = 0,
+	MASK_DT_DASH    = 1,
+	MASK_DT_BLACK   = 2,
+	MASK_DT_WHITE   = 3
+};
+
+/* masklay->blend */
+enum {
+	MASK_BLEND_ADD      = 0,
+	MASK_BLEND_SUBTRACT = 1
+};
+
+/* masklay->blend_flag */
+enum {
+	MASK_BLENDFLAG_INVERT = (1 << 0)
+};
+
+/* masklay->flag */
+enum {
+	MASK_LAYERFLAG_LOCKED = (1 << 4),
+	MASK_LAYERFLAG_SELECT = (1 << 5)
+};
+
+/* masklay_shape->flag */
+enum {
+	MASK_SHAPE_SELECT = (1 << 0)
+};
+
+
+/* mask->flag */
+enum {
+	MASK_ANIMF_EXPAND = (1 << 4)
+};
+
+#endif // __DNA_MASK_TYPES_H__
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index a5a540ff6b4..4172db90c05 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -35,49 +35,49 @@
  * (ONLY ADD NEW ITEMS AT THE END) */
 
 typedef enum ModifierType {
-	eModifierType_None = 0,
-	eModifierType_Subsurf,
-	eModifierType_Lattice,
-	eModifierType_Curve,
-	eModifierType_Build,
-	eModifierType_Mirror,
-	eModifierType_Decimate,
-	eModifierType_Wave,
-	eModifierType_Armature,
-	eModifierType_Hook,
-	eModifierType_Softbody,
-	eModifierType_Boolean,
-	eModifierType_Array,
-	eModifierType_EdgeSplit,
-	eModifierType_Displace,
-	eModifierType_UVProject,
-	eModifierType_Smooth,
-	eModifierType_Cast,
-	eModifierType_MeshDeform,
-	eModifierType_ParticleSystem,
-	eModifierType_ParticleInstance,
-	eModifierType_Explode,
-	eModifierType_Cloth,
-	eModifierType_Collision,
-	eModifierType_Bevel,
-	eModifierType_Shrinkwrap,
-	eModifierType_Fluidsim,
-	eModifierType_Mask,
-	eModifierType_SimpleDeform,
-	eModifierType_Multires,
-	eModifierType_Surface,
-	eModifierType_Smoke,
-	eModifierType_ShapeKey,
-	eModifierType_Solidify,
-	eModifierType_Screw,
-	eModifierType_Warp,
-	eModifierType_WeightVGEdit,
-	eModifierType_WeightVGMix,
-	eModifierType_WeightVGProximity,
-	eModifierType_Ocean,
-	eModifierType_DynamicPaint,
-	eModifierType_Remesh,
-	eModifierType_Skin,
+	eModifierType_None              = 0,
+	eModifierType_Subsurf           = 1,
+	eModifierType_Lattice           = 2,
+	eModifierType_Curve             = 3,
+	eModifierType_Build             = 4,
+	eModifierType_Mirror            = 5,
+	eModifierType_Decimate          = 6,
+	eModifierType_Wave              = 7,
+	eModifierType_Armature          = 8,
+	eModifierType_Hook              = 9,
+	eModifierType_Softbody          = 10,
+	eModifierType_Boolean           = 11,
+	eModifierType_Array             = 12,
+	eModifierType_EdgeSplit         = 13,
+	eModifierType_Displace          = 14,
+	eModifierType_UVProject         = 15,
+	eModifierType_Smooth            = 16,
+	eModifierType_Cast              = 17,
+	eModifierType_MeshDeform        = 18,
+	eModifierType_ParticleSystem    = 19,
+	eModifierType_ParticleInstance  = 20,
+	eModifierType_Explode           = 21,
+	eModifierType_Cloth             = 22,
+	eModifierType_Collision         = 23,
+	eModifierType_Bevel             = 24,
+	eModifierType_Shrinkwrap        = 25,
+	eModifierType_Fluidsim          = 26,
+	eModifierType_Mask              = 27,
+	eModifierType_SimpleDeform      = 28,
+	eModifierType_Multires          = 29,
+	eModifierType_Surface           = 30,
+	eModifierType_Smoke             = 31,
+	eModifierType_ShapeKey          = 32,
+	eModifierType_Solidify          = 33,
+	eModifierType_Screw             = 34,
+	eModifierType_Warp              = 35,
+	eModifierType_WeightVGEdit      = 36,
+	eModifierType_WeightVGMix       = 37,
+	eModifierType_WeightVGProximity = 38,
+	eModifierType_Ocean             = 39,
+	eModifierType_DynamicPaint      = 40,
+	eModifierType_Remesh            = 41,
+	eModifierType_Skin              = 42,
 	NUM_MODIFIER_TYPES
 } ModifierType;
 
@@ -327,19 +327,19 @@ typedef struct DisplaceModifierData {
 
 /* DisplaceModifierData->direction */
 enum {
-	MOD_DISP_DIR_X,
-	MOD_DISP_DIR_Y,
-	MOD_DISP_DIR_Z,
-	MOD_DISP_DIR_NOR,
-	MOD_DISP_DIR_RGB_XYZ,
+	MOD_DISP_DIR_X = 0,
+	MOD_DISP_DIR_Y = 1,
+	MOD_DISP_DIR_Z = 2,
+	MOD_DISP_DIR_NOR = 3,
+	MOD_DISP_DIR_RGB_XYZ = 4,
 };
 
 /* DisplaceModifierData->texmapping */
 enum {
-	MOD_DISP_MAP_LOCAL,
-	MOD_DISP_MAP_GLOBAL,
-	MOD_DISP_MAP_OBJECT,
-	MOD_DISP_MAP_UV
+	MOD_DISP_MAP_LOCAL = 0,
+	MOD_DISP_MAP_GLOBAL = 1,
+	MOD_DISP_MAP_OBJECT = 2,
+	MOD_DISP_MAP_UV = 3
 };
 
 typedef struct UVProjectModifierData {
@@ -509,9 +509,9 @@ typedef struct SurfaceModifierData {
 } SurfaceModifierData;
 
 typedef enum {
-	eBooleanModifierOp_Intersect,
-	eBooleanModifierOp_Union,
-	eBooleanModifierOp_Difference,
+	eBooleanModifierOp_Intersect = 0,
+	eBooleanModifierOp_Union = 1,
+	eBooleanModifierOp_Difference = 2,
 } BooleanModifierOp;
 typedef struct BooleanModifierData {
 	ModifierData modifier;
@@ -728,11 +728,12 @@ typedef struct SolidifyModifierData {
 	short mat_ofs_rim;
 } SolidifyModifierData;
 
-#define MOD_SOLIDIFY_RIM			(1<<0)
-#define MOD_SOLIDIFY_EVEN			(1<<1)
-#define MOD_SOLIDIFY_NORMAL_CALC	(1<<2)
-#define MOD_SOLIDIFY_VGROUP_INV		(1<<3)
-#define MOD_SOLIDIFY_RIM_MATERIAL	(1<<4) /* deprecated, used in do_versions */
+#define MOD_SOLIDIFY_RIM            (1 << 0)
+#define MOD_SOLIDIFY_EVEN           (1 << 1)
+#define MOD_SOLIDIFY_NORMAL_CALC    (1 << 2)
+#define MOD_SOLIDIFY_VGROUP_INV     (1 << 3)
+#define MOD_SOLIDIFY_RIM_MATERIAL   (1 << 4) /* deprecated, used in do_versions */
+#define MOD_SOLIDIFY_FLIP           (1 << 5)
 
 typedef struct ScrewModifierData {
 	ModifierData modifier;
diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h
index f073a1957dc..d8bba4a3bf5 100644
--- a/source/blender/makesdna/DNA_movieclip_types.h
+++ b/source/blender/makesdna/DNA_movieclip_types.h
@@ -47,91 +47,105 @@ struct MovieTrackingTrack;
 struct MovieTrackingMarker;
 
 typedef struct MovieClipUser {
-	int framenr;	/* current frame number */
-	short render_size, render_flag;		/* proxy render size */
+	int framenr;    /* current frame number */
+	short render_size, render_flag;     /* proxy render size */
 } MovieClipUser;
 
 typedef struct MovieClipProxy {
-	char dir[768];			/* 768=FILE_MAXDIR custom directory for index and proxy files (defaults to BL_proxy) */
+	char dir[768];          /* 768=FILE_MAXDIR custom directory for index and proxy files (defaults to BL_proxy) */
 
-	short tc;				/* time code in use */
-	short quality;			/* proxy build quality */
-	short build_size_flag;	/* size flags (see below) of all proxies to build */
-	short build_tc_flag;	/* time code flags (see below) of all tc indices to build */
+	short tc;               /* time code in use */
+	short quality;          /* proxy build quality */
+	short build_size_flag;  /* size flags (see below) of all proxies to build */
+	short build_tc_flag;    /* time code flags (see below) of all tc indices to build */
 } MovieClipProxy;
 
 typedef struct MovieClip {
 	ID id;
-	struct AnimData *adt;	/* animation data (must be immediately after id for utilities to use it) */
+	struct AnimData *adt;   /* animation data (must be immediately after id for utilities to use it) */
 
-	char name[1024];		/* file path, 1024 = FILE_MAX */
+	char name[1024];        /* file path, 1024 = FILE_MAX */
 
-	int source;			/* sequence or movie */
-	int lastframe;		/* last accessed frame number */
-	int lastsize[2];	/* size of last accessed frame */
+	int source;         /* sequence or movie */
+	int lastframe;      /* last accessed frame number */
+	int lastsize[2];    /* size of last accessed frame */
 
-	float aspx, aspy;	/* display aspect */
+	float aspx, aspy;   /* display aspect */
 
-	struct anim *anim;	/* movie source data */
-	struct MovieClipCache *cache;		/* cache for different stuff, not in file */
-	struct bGPdata *gpd;				/* grease pencil data */
+	struct anim *anim;  /* movie source data */
+	struct MovieClipCache *cache;       /* cache for different stuff, not in file */
+	struct bGPdata *gpd;                /* grease pencil data */
 
-	struct MovieTracking tracking;		/* data for SfM tracking */
-	void *tracking_context;				/* context of tracking job
-										 * used to synchronize data like framenumber
-										 * in SpaceClip clip user */
+	struct MovieTracking tracking;      /* data for SfM tracking */
+	void *tracking_context;             /* context of tracking job
+	                                     * used to synchronize data like framenumber
+	                                     * in SpaceClip clip user */
 
-	struct MovieClipProxy proxy;		/* proxy to clip data */
+	struct MovieClipProxy proxy;        /* proxy to clip data */
 	int flag;
 
-	int len;	/* length of movie */
+	int len;    /* length of movie */
+
+	int start_frame;    /* scene frame number footage starts playing at */
+	                    /* affects all data which is associated with a clip */
+	                    /* such as motion tracking, camera reconstruciton and so */
+
+	int frame_offset;   /* offset which is adding to a file number when reading frame */
+	                    /* from a file. affects only a way how scene frame is mapping */
+	                    /* to a file name and not touches other data associated with */
+	                    /* a clip */
 } MovieClip;
 
 typedef struct MovieClipScopes {
-	int ok;							/* 1 means scopes are ok and recalculation is unneeded */
-	int track_preview_height;		/* height of track preview widget */
-	struct ImBuf *track_preview;	/* ImBuf displayed in track preview */
-	float track_pos[2];				/* sub-pizel position of marker in track ImBuf */
-	short track_disabled;			/* active track is disabled, special notifier should be drawn */
-	char pad[2];
-	int framenr;					/* frame number scopes are created for */
-	struct MovieTrackingTrack *track;	/* track scopes are created for */
-	struct MovieTrackingMarker *marker;	/* marker scopes are created for */
-	float slide_scale[2];			/* scale used for sliding from previewe area */
+	short ok;                       /* 1 means scopes are ok and recalculation is unneeded */
+	short use_track_mask;           /* whether track's mask should be applied on preview */
+	int track_preview_height;       /* height of track preview widget */
+	int frame_width, frame_height;  /* width and height of frame for which scopes are calculated */
+	struct MovieTrackingMarker undist_marker;   /* undistorted position of marker used for pattern sampling */
+	struct ImBuf *track_search;     /* search area of a track */
+	struct ImBuf *track_preview;    /* ImBuf displayed in track preview */
+	float track_pos[2];             /* sub-pizel position of marker in track ImBuf */
+	short track_disabled;           /* active track is disabled, special notifier should be drawn */
+	short track_locked;             /* active track is locked, no transformation should be allowed */
+	int framenr;                    /* frame number scopes are created for */
+	struct MovieTrackingTrack *track;   /* track scopes are created for */
+	struct MovieTrackingMarker *marker; /* marker scopes are created for */
+	float slide_scale[2];           /* scale used for sliding from previewe area */
 } MovieClipScopes;
 
 /* MovieClipProxy->build_size_flag */
-#define MCLIP_PROXY_SIZE_25		(1<<0)
-#define MCLIP_PROXY_SIZE_50		(1<<1)
-#define MCLIP_PROXY_SIZE_75		(1<<2)
-#define MCLIP_PROXY_SIZE_100	(1<<3)
-#define MCLIP_PROXY_UNDISTORTED_SIZE_25		(1<<4)
-#define MCLIP_PROXY_UNDISTORTED_SIZE_50		(1<<5)
-#define MCLIP_PROXY_UNDISTORTED_SIZE_75		(1<<6)
-#define MCLIP_PROXY_UNDISTORTED_SIZE_100	(1<<7)
+#define MCLIP_PROXY_SIZE_25     (1 << 0)
+#define MCLIP_PROXY_SIZE_50     (1 << 1)
+#define MCLIP_PROXY_SIZE_75     (1 << 2)
+#define MCLIP_PROXY_SIZE_100    (1 << 3)
+#define MCLIP_PROXY_UNDISTORTED_SIZE_25     (1 << 4)
+#define MCLIP_PROXY_UNDISTORTED_SIZE_50     (1 << 5)
+#define MCLIP_PROXY_UNDISTORTED_SIZE_75     (1 << 6)
+#define MCLIP_PROXY_UNDISTORTED_SIZE_100    (1 << 7)
 
 /* MovieClip->source */
-#define MCLIP_SRC_SEQUENCE	1
-#define MCLIP_SRC_MOVIE		2
+#define MCLIP_SRC_SEQUENCE  1
+#define MCLIP_SRC_MOVIE     2
 
 /* MovieClip->selection types */
-#define MCLIP_SEL_NONE		0
-#define MCLIP_SEL_TRACK		1
+#define MCLIP_SEL_NONE      0
+#define MCLIP_SEL_TRACK     1
 
 /* MovieClip->flag */
-#define MCLIP_USE_PROXY					(1<<0)
-#define MCLIP_USE_PROXY_CUSTOM_DIR		(1<<1)
+#define MCLIP_USE_PROXY                 (1 << 0)
+#define MCLIP_USE_PROXY_CUSTOM_DIR      (1 << 1)
+/*#define MCLIP_CUSTOM_START_FRAME		(1<<2)*/ /* UNUSED */
 
-#define MCLIP_TIMECODE_FLAGS			(MCLIP_USE_PROXY|MCLIP_USE_PROXY_CUSTOM_DIR)
+#define MCLIP_TIMECODE_FLAGS            (MCLIP_USE_PROXY | MCLIP_USE_PROXY_CUSTOM_DIR)
 
 /* MovieClip->render_size */
-#define MCLIP_PROXY_RENDER_SIZE_FULL	0
-#define MCLIP_PROXY_RENDER_SIZE_25		1
-#define MCLIP_PROXY_RENDER_SIZE_50		2
-#define MCLIP_PROXY_RENDER_SIZE_75		3
-#define MCLIP_PROXY_RENDER_SIZE_100		4
+#define MCLIP_PROXY_RENDER_SIZE_FULL    0
+#define MCLIP_PROXY_RENDER_SIZE_25      1
+#define MCLIP_PROXY_RENDER_SIZE_50      2
+#define MCLIP_PROXY_RENDER_SIZE_75      3
+#define MCLIP_PROXY_RENDER_SIZE_100     4
 
 /* MovieClip->render_flag */
-#define MCLIP_PROXY_RENDER_UNDISTORT	1
+#define MCLIP_PROXY_RENDER_UNDISTORT    1
 
 #endif
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index b2781675cbe..9bc002b7bbe 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -241,6 +241,14 @@ typedef struct bNodeLink {
 #define NTREE_QUALITY_MEDIUM  1
 #define NTREE_QUALITY_LOW     2
 
+/* tree->chunksize */
+#define NTREE_CHUNCKSIZE_32 32
+#define NTREE_CHUNCKSIZE_64 64
+#define NTREE_CHUNCKSIZE_128 128
+#define NTREE_CHUNCKSIZE_256 256
+#define NTREE_CHUNCKSIZE_512 512
+#define NTREE_CHUNCKSIZE_1024 1024
+
 /* the basis for a Node tree, all links and nodes reside internal here */
 /* only re-usable node trees are in the library though, materials and textures allocate own tree struct */
 typedef struct bNodeTree {
@@ -350,8 +358,10 @@ typedef struct bNodeSocketValueRGBA {
 #define CMP_NODE_LENSFLARE_CIRCLE  4
 #define CMP_NODE_LENSFLARE_STREAKS 8
 
-#define CMP_NODE_DILATEERODE_STEP     0
-#define CMP_NODE_DILATEERODE_DISTANCE 1
+#define CMP_NODE_DILATEERODE_STEP            0
+#define CMP_NODE_DILATEERODE_DISTANCE_THRESH 1
+#define CMP_NODE_DILATEERODE_DISTANCE        2
+#define CMP_NODE_DILATEERODE_DISTANCE_FEATHER 3
 
 typedef struct NodeFrame {
 	short flag;
@@ -562,6 +572,7 @@ typedef struct NodeTexSky {
 
 typedef struct NodeTexImage {
 	NodeTexBase base;
+	ImageUser iuser;
 	int color_space, pad;
 } NodeTexImage;
 
@@ -571,6 +582,7 @@ typedef struct NodeTexChecker {
 
 typedef struct NodeTexEnvironment {
 	NodeTexBase base;
+	ImageUser iuser;
 	int color_space, projection;
 } NodeTexEnvironment;
 
@@ -617,6 +629,20 @@ typedef struct TexNodeOutput {
 	char name[64];
 } TexNodeOutput;
 
+typedef struct NodeKeyingScreenData {
+	char tracking_object[64];
+} NodeKeyingScreenData;
+
+typedef struct NodeKeyingData {
+	float screen_balance;
+	float despill_factor;
+	int edge_kernel_radius;
+	float edge_kernel_tolerance;
+	float clip_black, clip_white;
+	int dilate_distance;
+	int blur_pre, blur_post;
+} NodeKeyingData;
+
 /* frame node flags */
 #define NODE_FRAME_SHRINK		1	/* keep the bounding box minimal */
 #define NODE_FRAME_RESIZEABLE	2	/* test flag, if frame can be resized by user */
diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h
index cc212dd6d06..854087b3b5b 100644
--- a/source/blender/makesdna/DNA_object_force.h
+++ b/source/blender/makesdna/DNA_object_force.h
@@ -40,20 +40,20 @@ extern "C" {
 
 /* pd->forcefield:  Effector Fields types */
 typedef enum PFieldType {
-	PFIELD_NULL = 0,	/* (this is used for general effector weight)							*/
-	PFIELD_FORCE,		/* Force away/towards a point depending on force strength				*/
-	PFIELD_VORTEX,		/* Force around the effector normal										*/
-	PFIELD_MAGNET,		/* Force from the cross product of effector normal and point velocity	*/
-	PFIELD_WIND,		/* Force away and towards a point depending which side of the effector 	*/
-						/*	 normal the point is												*/
-	PFIELD_GUIDE,		/* Force along curve for dynamics, a shaping curve for hair paths		*/
-	PFIELD_TEXTURE,		/* Force based on texture values calculated at point coordinates		*/
-	PFIELD_HARMONIC,	/* Force of a harmonic (damped) oscillator								*/
-	PFIELD_CHARGE,		/* Force away/towards a point depending on point charge					*/
-	PFIELD_LENNARDJ,	/* Force due to a Lennard-Jones potential								*/
-	PFIELD_BOID,		/* Defines predator / goal for boids									*/
-	PFIELD_TURBULENCE,	/* Force defined by BLI_gTurbulence										*/
-	PFIELD_DRAG,		/* Linear & quadratic drag												*/
+	PFIELD_NULL   = 0,	/* (this is used for general effector weight)							*/
+	PFIELD_FORCE  = 1,	/* Force away/towards a point depending on force strength				*/
+	PFIELD_VORTEX = 2,	/* Force around the effector normal										*/
+	PFIELD_MAGNET = 3,	/* Force from the cross product of effector normal and point velocity	*/
+	PFIELD_WIND   = 4,	/* Force away and towards a point depending which side of the effector 	*/
+				/*	 normal the point is												*/
+	PFIELD_GUIDE      = 5,	/* Force along curve for dynamics, a shaping curve for hair paths		*/
+	PFIELD_TEXTURE    = 6,	/* Force based on texture values calculated at point coordinates		*/
+	PFIELD_HARMONIC   = 7,	/* Force of a harmonic (damped) oscillator								*/
+	PFIELD_CHARGE     = 8,	/* Force away/towards a point depending on point charge					*/
+	PFIELD_LENNARDJ   = 9,	/* Force due to a Lennard-Jones potential								*/
+	PFIELD_BOID       = 10,	/* Defines predator / goal for boids									*/
+	PFIELD_TURBULENCE = 11,	/* Force defined by BLI_gTurbulence										*/
+	PFIELD_DRAG       = 12,	/* Linear & quadratic drag												*/
 	NUM_PFIELD_TYPES
 } PFieldType;
 	
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 1ea50ec9c1a..83bfec3cc52 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -165,7 +165,7 @@ typedef struct Object {
 	
 	unsigned int lay;	/* copy of Base's layer in the scene */
 	
-	int pad6;
+	float sf; /* sf is time-offset */
 
 	short flag;			/* copy of Base */
 	short colbits DNA_DEPRECATED;		/* deprecated */
@@ -180,8 +180,6 @@ typedef struct Object {
 
 	int dupon, dupoff, dupsta, dupend;
 
-	float sf, ctime; /* sf is time-offset, ctime is the objects current time (XXX timing needs to be revised) */
-	
 	/* during realtime */
 
 	/* note that inertia is only called inertia for historical reasons
@@ -201,9 +199,15 @@ typedef struct Object {
 	float rdamping, sizefac;
 	float margin;
 	float max_vel; /* clamp the maximum velocity 0.0 is disabled */
-	float min_vel; /* clamp the maximum velocity 0.0 is disabled */
+	float min_vel; /* clamp the minimum velocity 0.0 is disabled */
 	float m_contactProcessingThreshold;
 	float obstacleRad;
+	
+	/* "Character" physics properties */
+	float step_height;
+	float jump_speed;
+	float fall_speed;
+	char pad1[4];
 
 	short rotmode;		/* rotation mode - uses defines set out in DNA_action_types.h for PoseChannel rotations... */
 
@@ -295,6 +299,15 @@ typedef struct DupliObject {
 
 	short type; /* from Object.transflag */
 	char no_draw, animated;
+
+	/* Lowest-level particle index.
+	 * Note: This is needed for particle info in shaders.
+	 * Otherwise dupli groups in particle systems would override the
+	 * index value from higher dupli levels. Would be nice to have full generic access
+	 * to all dupli levels somehow, but for now this should cover most use-cases.
+	 */
+	int particle_index;
+	int pad;
 } DupliObject;
 
 /* **************** OBJECT ********************* */
@@ -483,6 +496,7 @@ typedef struct DupliObject {
 #define OB_SENSOR		0x80000
 #define OB_NAVMESH		0x100000
 #define OB_HASOBSTACLE	0x200000
+#define OB_CHARACTER		0x400000
 
 /* ob->gameflag2 */
 #define OB_NEVER_DO_ACTIVITY_CULLING	1
@@ -504,6 +518,7 @@ typedef struct DupliObject {
 #define OB_BODY_TYPE_OCCLUDER		5
 #define OB_BODY_TYPE_SENSOR			6
 #define OB_BODY_TYPE_NAVMESH		7
+#define OB_BODY_TYPE_CHARACTER			8
 
 /* ob->scavisflag */
 #define OB_VIS_SENS		1
diff --git a/source/blender/makesdna/DNA_packedFile_types.h b/source/blender/makesdna/DNA_packedFile_types.h
index 339ac0f8c0d..f01e89d18c9 100644
--- a/source/blender/makesdna/DNA_packedFile_types.h
+++ b/source/blender/makesdna/DNA_packedFile_types.h
@@ -43,18 +43,18 @@ typedef struct PackedFile {
 enum PF_FileStatus
 {
 	PF_EQUAL = 0,
-	PF_DIFFERS,
-	PF_NOFILE,
+	PF_DIFFERS = 1,
+	PF_NOFILE = 2,
 			
-	PF_WRITE_ORIGINAL,
-	PF_WRITE_LOCAL,
-	PF_USE_LOCAL,
-	PF_USE_ORIGINAL,
-	PF_KEEP,
-	PF_REMOVE,
-	PF_NOOP,
+	PF_WRITE_ORIGINAL = 3,
+	PF_WRITE_LOCAL = 4,
+	PF_USE_LOCAL = 5,
+	PF_USE_ORIGINAL = 6,
+	PF_KEEP = 7,
+	PF_REMOVE = 8,
+	PF_NOOP = 9,
 			
-	PF_ASK
+	PF_ASK = 10
 };
 
 #endif /* PACKEDFILE_TYPES_H */
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index f5d525d47b5..0853df87a35 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -234,8 +234,8 @@ typedef struct ParticleSettings {
 	struct PartDeflect *pd2;
 } ParticleSettings;
 
-typedef struct ParticleSystem
-{	/* note1: make sure all (runtime) are NULL's in 'copy_particlesystem' XXX, this function is no more! - need to invstigate */
+typedef struct ParticleSystem {
+	/* note1: make sure all (runtime) are NULL's in 'copy_particlesystem' XXX, this function is no more! - need to invstigate */
 	/* note2: make sure any uses of this struct in DNA are accounted for in 'BKE_object_copy_particlesystems' */
 
 	struct ParticleSystem *next, *prev;
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 673156e3d7d..3bceb0277d5 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -34,7 +34,7 @@
 
 #include "DNA_defs.h"
 
-// XXX, temp feature - campbell
+/* XXX, temp feature - campbell */
 #define DURIAN_CAMERA_SWITCH
 
 #ifdef __cplusplus
@@ -625,6 +625,7 @@ typedef struct GameData {
 	short ticrate, maxlogicstep, physubstep, maxphystep;
 	short obstacleSimulation, pad1;
 	float levelHeight;
+	float deactivationtime, lineardeactthreshold, angulardeactthreshold,pad2;
 } GameData;
 
 #define STEREO_NOSTEREO		1
@@ -998,7 +999,8 @@ typedef struct ToolSettings {
 	short snap_flag, snap_target;
 	short proportional, prop_mode;
 	char proportional_objects; /* proportional edit, object mode */
-	char pad[5];
+	char proportional_mask; /* proportional edit, object mode */
+	char pad[4];
 
 	char auto_normalize; /*auto normalizing mode in wpaint*/
 	char multipaint; /* paint multiple bones in wpaint */
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h
index 75d9b91e9c8..34fb7ce60be 100644
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@ -225,13 +225,13 @@ typedef struct ARegion {
 /* Do NOT change order, append on end. Types are hardcoded needed */
 enum {
 	RGN_TYPE_WINDOW = 0,
-	RGN_TYPE_HEADER,
-	RGN_TYPE_CHANNELS,
-	RGN_TYPE_TEMPORARY,
-	RGN_TYPE_UI,
-	RGN_TYPE_TOOLS,
-	RGN_TYPE_TOOL_PROPS,
-	RGN_TYPE_PREVIEW
+	RGN_TYPE_HEADER = 1,
+	RGN_TYPE_CHANNELS = 2,
+	RGN_TYPE_TEMPORARY = 3,
+	RGN_TYPE_UI = 4,
+	RGN_TYPE_TOOLS = 5,
+	RGN_TYPE_TOOL_PROPS = 6,
+	RGN_TYPE_PREVIEW = 7
 };
 
 /* region alignment */
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h
index cd73b692011..161c448476d 100644
--- a/source/blender/makesdna/DNA_sequence_types.h
+++ b/source/blender/makesdna/DNA_sequence_types.h
@@ -72,7 +72,7 @@ typedef struct StripColorBalance {
 } StripColorBalance;
 
 typedef struct StripProxy {
-	char dir[768];	       // custom directory for index and proxy files
+	char dir[768];         // custom directory for index and proxy files
 	                       // (defaults to BL_proxy)
 
 	char file[256];        // custom file
@@ -81,7 +81,7 @@ typedef struct StripProxy {
 	short tc;              // time code in use
 
 	short quality;         // proxy build quality
-	short build_size_flags;// size flags (see below) of all proxies 
+	short build_size_flags; // size flags (see below) of all proxies
 	                       // to build
 	short build_tc_flags;  // time code flags (see below) of all tc indices
 	                       // to build
@@ -101,28 +101,6 @@ typedef struct Strip {
 	StripColorBalance *color_balance;
 } Strip;
 
-
-typedef struct PluginSeq {
-	char name[1024]; /* 1024 = FILE_MAX */
-	void *handle;
-
-	char *pname;
-
-	int vars, version;
-
-	void *varstr;
-	float *cfra;
-
-	float data[32];
-
-	void *instance_private_data;
-	void **current_private_data;
-
-	void (*doit)(void);
-
-	void (*callback)(void);
-} PluginSeq;
-
 /* The sequence structure is the basic struct used by any strip. each of the strips uses a different sequence structure.*/
 /* WATCH IT: first part identical to ID (for use in ipo's) */
 
@@ -132,47 +110,46 @@ typedef struct Sequence {
 	void *lib; /* needed (to be like ipo), else it will raise libdata warnings, this should never be used */
 	char name[64]; /* SEQ_NAME_MAXSTR - name, set by default and needs to be unique, for RNA paths */
 
-	int flag, type;	/*flags bitmap (see below) and the type of sequence*/
+	int flag, type; /*flags bitmap (see below) and the type of sequence*/
 	int len; /* the length of the contents of this strip - before handles are applied */
 	int start, startofs, endofs;
 	int startstill, endstill;
 	int machine, depth; /*machine - the strip channel, depth - the depth in the sequence when dealing with metastrips */
-	int startdisp, enddisp;	/*starting and ending points in the sequence*/
+	int startdisp, enddisp; /*starting and ending points in the sequence*/
 	float sat;
 	float mul, handsize;
 
 	short anim_preseek;
-	short streamindex;   /* streamindex for movie or sound files with several streams */
+	short streamindex;    /* streamindex for movie or sound files with several streams */
 	int multicam_source;  /* for multicam source selection */
-	int clip_flag;          /* MOVIECLIP render flags */
+	int clip_flag;        /* MOVIECLIP render flags */
 
 	Strip *strip;
 
-	struct Ipo *ipo  DNA_DEPRECATED;  /* old animation system, deprecated for 2.5 */
+	struct Ipo *ipo DNA_DEPRECATED;   /* old animation system, deprecated for 2.5 */
 	struct Scene *scene;
 	struct Object *scene_camera; /* override scene camera */
 
 	struct anim *anim;      /* for MOVIE strips */
 	struct MovieClip *clip; /* for MOVIECLIP strips */
+	struct Mask *mask;      /* for MASK strips */
 
 	float effect_fader;
 	float speed_fader;
 
-	PluginSeq *plugin;
-
 	/* pointers for effects: */
 	struct Sequence *seq1, *seq2, *seq3;
 
-	ListBase seqbase;	/* list of strips for metastrips */
+	ListBase seqbase;       /* list of strips for metastrips */
 
-	struct bSound *sound;	/* the linked "bSound" object */
+	struct bSound *sound;   /* the linked "bSound" object */
 	void *scene_sound;
 	float volume;
 
-	float pitch, pan;	/* pitch (-0.1..10), pan -2..2 */
+	float pitch, pan;     /* pitch (-0.1..10), pan -2..2 */
 	float strobe;
 
-	void *effectdata;	/* Struct pointer for effect settings */
+	void *effectdata;     /* Struct pointer for effect settings */
 
 	int anim_startofs;    /* only use part of animation file */
 	int anim_endofs;      /* is subtle different to startofs / endofs */
@@ -181,8 +158,8 @@ typedef struct Sequence {
 	int blend_mode;
 	float blend_opacity;
 
-			/* is sfra needed anymore? - it looks like its only used in one place */
-	int sfra, pad;	/* starting frame according to the timeline of the scene. */
+	/* is sfra needed anymore? - it looks like its only used in one place */
+	int sfra, pad;  /* starting frame according to the timeline of the scene. */
 } Sequence;
 
 typedef struct MetaStack {
@@ -193,7 +170,7 @@ typedef struct MetaStack {
 
 typedef struct Editing {
 	ListBase *seqbasep; /* pointer to the current list of seq's being edited (can be within a meta strip) */
-	ListBase seqbase;	/* pointer to the top-most seq's */
+	ListBase seqbase;   /* pointer to the top-most seq's */
 	ListBase metastack;
 	
 	/* Context vars, used to be static */
@@ -213,12 +190,12 @@ typedef struct WipeVars {
 } WipeVars;
 
 typedef struct GlowVars {	
-	float fMini;	/*	Minimum intensity to trigger a glow */
+	float fMini;    /*	Minimum intensity to trigger a glow */
 	float fClamp;
-	float fBoost;	/*	Amount to multiply glow intensity */
-	float dDist;	/*	Radius of glow blurring */
-	int	dQuality;
-	int	bNoComp;	/*	SHOW/HIDE glow buffer */
+	float fBoost;   /*	Amount to multiply glow intensity */
+	float dDist;    /*	Radius of glow blurring */
+	int dQuality;
+	int bNoComp;    /*	SHOW/HIDE glow buffer */
 } GlowVars;
 
 typedef struct TransformVars {
@@ -238,7 +215,7 @@ typedef struct SolidColorVars {
 } SolidColorVars;
 
 typedef struct SpeedControlVars {
-	float * frameMap;
+	float *frameMap;
 	float globalSpeed;
 	int flags;
 	int length;
@@ -250,11 +227,11 @@ typedef struct SpeedControlVars {
 #define SELECT 1
 
 /* Editor->over_flag */
-#define SEQ_EDIT_OVERLAY_SHOW			1
-#define SEQ_EDIT_OVERLAY_ABS			2
+#define SEQ_EDIT_OVERLAY_SHOW           1
+#define SEQ_EDIT_OVERLAY_ABS            2
 
-#define SEQ_STRIP_OFSBOTTOM		0.2f
-#define SEQ_STRIP_OFSTOP		0.8f
+#define SEQ_STRIP_OFSBOTTOM     0.2f
+#define SEQ_STRIP_OFSTOP        0.8f
 
 /* SpeedControlVars->flags */
 #define SEQ_SPEED_INTEGRATE      1
@@ -262,42 +239,42 @@ typedef struct SpeedControlVars {
 #define SEQ_SPEED_COMPRESS_IPO_Y 4
 
 /* ***************** SEQUENCE ****************** */
-#define SEQ_NAME_MAXSTR			64
+#define SEQ_NAME_MAXSTR         64
 
 /* seq->flag */
-#define SEQ_LEFTSEL                 (1<<1)
-#define SEQ_RIGHTSEL                (1<<2)
-#define SEQ_OVERLAP                 (1<<3)
-#define SEQ_FILTERY                 (1<<4)
-#define SEQ_MUTE                    (1<<5)
-#define SEQ_MAKE_PREMUL             (1<<6)
-#define SEQ_REVERSE_FRAMES          (1<<7)
-#define SEQ_IPO_FRAME_LOCKED        (1<<8)
-#define SEQ_EFFECT_NOT_LOADED       (1<<9)
-#define SEQ_FLAG_DELETE             (1<<10)
-#define SEQ_FLIPX                   (1<<11)
-#define SEQ_FLIPY                   (1<<12)
-#define SEQ_MAKE_FLOAT              (1<<13)
-#define SEQ_LOCK                    (1<<14)
-#define SEQ_USE_PROXY               (1<<15)
-#define SEQ_USE_TRANSFORM           (1<<16)
-#define SEQ_USE_CROP                (1<<17)
-#define SEQ_USE_COLOR_BALANCE       (1<<18)
-#define SEQ_USE_PROXY_CUSTOM_DIR    (1<<19)
-
-#define SEQ_USE_PROXY_CUSTOM_FILE   (1<<21)
-#define SEQ_USE_EFFECT_DEFAULT_FADE (1<<22)
+#define SEQ_LEFTSEL                 (1 << 1)
+#define SEQ_RIGHTSEL                (1 << 2)
+#define SEQ_OVERLAP                 (1 << 3)
+#define SEQ_FILTERY                 (1 << 4)
+#define SEQ_MUTE                    (1 << 5)
+#define SEQ_MAKE_PREMUL             (1 << 6)
+#define SEQ_REVERSE_FRAMES          (1 << 7)
+#define SEQ_IPO_FRAME_LOCKED        (1 << 8)
+#define SEQ_EFFECT_NOT_LOADED       (1 << 9)
+#define SEQ_FLAG_DELETE             (1 << 10)
+#define SEQ_FLIPX                   (1 << 11)
+#define SEQ_FLIPY                   (1 << 12)
+#define SEQ_MAKE_FLOAT              (1 << 13)
+#define SEQ_LOCK                    (1 << 14)
+#define SEQ_USE_PROXY               (1 << 15)
+#define SEQ_USE_TRANSFORM           (1 << 16)
+#define SEQ_USE_CROP                (1 << 17)
+#define SEQ_USE_COLOR_BALANCE       (1 << 18)
+#define SEQ_USE_PROXY_CUSTOM_DIR    (1 << 19)
+
+#define SEQ_USE_PROXY_CUSTOM_FILE   (1 << 21)
+#define SEQ_USE_EFFECT_DEFAULT_FADE (1 << 22)
 
 // flags for whether those properties are animated or not
-#define SEQ_AUDIO_VOLUME_ANIMATED   (1<<24)
-#define SEQ_AUDIO_PITCH_ANIMATED    (1<<25)
-#define SEQ_AUDIO_PAN_ANIMATED      (1<<26)
-#define SEQ_AUDIO_DRAW_WAVEFORM     (1<<27)
+#define SEQ_AUDIO_VOLUME_ANIMATED   (1 << 24)
+#define SEQ_AUDIO_PITCH_ANIMATED    (1 << 25)
+#define SEQ_AUDIO_PAN_ANIMATED      (1 << 26)
+#define SEQ_AUDIO_DRAW_WAVEFORM     (1 << 27)
 
-#define SEQ_INVALID_EFFECT          (1<<31)
+#define SEQ_INVALID_EFFECT          (1 << 31)
 
 /* convenience define for all selection flags */
-#define SEQ_ALLSEL	(SELECT+SEQ_LEFTSEL+SEQ_RIGHTSEL)
+#define SEQ_ALLSEL  (SELECT + SEQ_LEFTSEL + SEQ_RIGHTSEL)
 
 /* deprecated, don't use a flag anymore*/
 /*#define SEQ_ACTIVE                            1048576*/
@@ -320,51 +297,53 @@ typedef struct SpeedControlVars {
 #define SEQ_PROXY_TC_RECORD_RUN_NO_GAPS         8
 #define SEQ_PROXY_TC_ALL                        15
 
-/* seq->type WATCH IT: SEQ_EFFECT BIT is used to determine if this is an effect strip!!! */
-#define SEQ_IMAGE		0
-#define SEQ_META		1
-#define SEQ_SCENE		2
-#define SEQ_MOVIE		3
-#define SEQ_RAM_SOUND		4
-#define SEQ_HD_SOUND            5
-#define SEQ_SOUND		4
-#define SEQ_MOVIECLIP           6
-
-#define SEQ_EFFECT		8
-#define SEQ_CROSS		8
-#define SEQ_ADD			9
-#define SEQ_SUB			10
-#define SEQ_ALPHAOVER	11
-#define SEQ_ALPHAUNDER	12
-#define SEQ_GAMCROSS	13
-#define SEQ_MUL			14
-#define SEQ_OVERDROP	15
-#define SEQ_PLUGIN		24
-#define SEQ_WIPE		25
-#define SEQ_GLOW		26
-#define SEQ_TRANSFORM		27
-#define SEQ_COLOR               28
-#define SEQ_SPEED               29
-#define SEQ_MULTICAM            30
-#define SEQ_ADJUSTMENT          31
-#define SEQ_EFFECT_MAX          31
+/* seq->type WATCH IT: SEQ_TYPE_EFFECT BIT is used to determine if this is an effect strip!!! */
+enum {
+	SEQ_TYPE_IMAGE       = 0,
+	SEQ_TYPE_META        = 1,
+	SEQ_TYPE_SCENE       = 2,
+	SEQ_TYPE_MOVIE       = 3,
+	SEQ_TYPE_SOUND_RAM   = 4,
+	SEQ_TYPE_SOUND_HD    = 5,
+	SEQ_TYPE_MOVIECLIP   = 6,
+	SEQ_TYPE_MASK        = 7,
+
+	SEQ_TYPE_EFFECT      = 8,
+	SEQ_TYPE_CROSS       = 8,
+	SEQ_TYPE_ADD         = 9,
+	SEQ_TYPE_SUB         = 10,
+	SEQ_TYPE_ALPHAOVER   = 11,
+	SEQ_TYPE_ALPHAUNDER  = 12,
+	SEQ_TYPE_GAMCROSS    = 13,
+	SEQ_TYPE_MUL         = 14,
+	SEQ_TYPE_OVERDROP    = 15,
+	/* SEQ_TYPE_PLUGIN      = 24, */ /* Deprecated */
+	SEQ_TYPE_WIPE        = 25,
+	SEQ_TYPE_GLOW        = 26,
+	SEQ_TYPE_TRANSFORM   = 27,
+	SEQ_TYPE_COLOR       = 28,
+	SEQ_TYPE_SPEED       = 29,
+	SEQ_TYPE_MULTICAM    = 30,
+	SEQ_TYPE_ADJUSTMENT  = 31,
+	SEQ_TYPE_EFFECT_MAX  = 31
+};
 
 #define STRIPELEM_FAILED       0
 #define STRIPELEM_OK           1
 
 #define STRIPELEM_PREVIEW_DONE  1
 
-#define SEQ_MOVIECLIP_RENDER_UNDISTORTED (1<<0)
-#define SEQ_MOVIECLIP_RENDER_STABILIZED  (1<<1)
+#define SEQ_MOVIECLIP_RENDER_UNDISTORTED (1 << 0)
+#define SEQ_MOVIECLIP_RENDER_STABILIZED  (1 << 1)
 
 #define SEQ_BLEND_REPLACE      0
-/* all other BLEND_MODEs are simple SEQ_EFFECT ids and therefore identical
+/* all other BLEND_MODEs are simple SEQ_TYPE_EFFECT ids and therefore identical
  * to the table above. (Only those effects that handle _exactly_ two inputs,
  * otherwise, you can't really blend, right :) !)
  */
 
 
-#define SEQ_HAS_PATH(_seq) (ELEM4((_seq)->type, SEQ_MOVIE, SEQ_IMAGE, SEQ_RAM_SOUND, SEQ_HD_SOUND))
+#define SEQ_HAS_PATH(_seq) (ELEM4((_seq)->type, SEQ_TYPE_MOVIE, SEQ_TYPE_IMAGE, SEQ_TYPE_SOUND_RAM, SEQ_TYPE_SOUND_HD))
 
 #endif
 
diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h
index 6f67f1fd3c9..6dc45e4a6de 100644
--- a/source/blender/makesdna/DNA_sound_types.h
+++ b/source/blender/makesdna/DNA_sound_types.h
@@ -104,8 +104,8 @@ typedef struct bSound {
 typedef enum eSound_Type {
 	SOUND_TYPE_INVALID = -1,
 	SOUND_TYPE_FILE = 0,
-	SOUND_TYPE_BUFFER,
-	SOUND_TYPE_LIMITER
+	SOUND_TYPE_BUFFER = 1,
+	SOUND_TYPE_LIMITER = 2
 } eSound_Type;
 #endif
 
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 8f3062655b7..2f6ea861cba 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -35,11 +35,11 @@
 
 #include "DNA_defs.h"
 #include "DNA_listBase.h"
-#include "DNA_color_types.h"		/* for Histogram */
+#include "DNA_color_types.h"        /* for Histogram */
 #include "DNA_vec_types.h"
-#include "DNA_outliner_types.h"		/* for TreeStoreElem */
-#include "DNA_image_types.h"	/* ImageUser */
-#include "DNA_movieclip_types.h"	/* MovieClipUser */
+#include "DNA_outliner_types.h"     /* for TreeStoreElem */
+#include "DNA_image_types.h"        /* ImageUser */
+#include "DNA_movieclip_types.h"    /* MovieClipUser */
 /* Hum ... Not really nice... but needed for spacebuts. */
 #include "DNA_view2d_types.h"
 
@@ -67,6 +67,7 @@ struct wmOperator;
 struct wmTimer;
 struct MovieClip;
 struct MovieClipScopes;
+struct Mask;
 
 
 /* SpaceLink (Base) ==================================== */
@@ -78,9 +79,9 @@ struct MovieClipScopes;
  */
 typedef struct SpaceLink {
 	struct SpaceLink *next, *prev;
-	ListBase regionbase;		/* storage of regions for inactive spaces */
+	ListBase regionbase;        /* storage of regions for inactive spaces */
 	int spacetype;
-	float blockscale  DNA_DEPRECATED;       /* XXX make deprecated */
+	float blockscale DNA_DEPRECATED;        /* XXX make deprecated */
 	short blockhandler[8]  DNA_DEPRECATED;  /* XXX make deprecated */
 } SpaceLink;
 
@@ -90,10 +91,10 @@ typedef struct SpaceLink {
 /* Info Header */
 typedef struct SpaceInfo {
 	SpaceLink *next, *prev;
-	ListBase regionbase;		/* storage of regions for inactive spaces */
+	ListBase regionbase;        /* storage of regions for inactive spaces */
 	int spacetype;
-	float blockscale  DNA_DEPRECATED;
-	short blockhandler[8]  DNA_DEPRECATED;		/* XXX make deprecated */
+	float blockscale DNA_DEPRECATED;
+	short blockhandler[8]  DNA_DEPRECATED;      /* XXX make deprecated */
 	
 	char rpt_mask;
 	char pad[7];
@@ -101,11 +102,11 @@ typedef struct SpaceInfo {
 
 /* SpaceInfo.rpt_mask */
 typedef enum eSpaceInfo_RptMask {
-	INFO_RPT_DEBUG	= (1 << 0),
-	INFO_RPT_INFO	= (1 << 1),
-	INFO_RPT_OP		= (1 << 2),
-	INFO_RPT_WARN	= (1 << 3),
-	INFO_RPT_ERR	= (1 << 4),
+	INFO_RPT_DEBUG  = (1 << 0),
+	INFO_RPT_INFO   = (1 << 1),
+	INFO_RPT_OP     = (1 << 2),
+	INFO_RPT_WARN   = (1 << 3),
+	INFO_RPT_ERR    = (1 << 4),
 } eSpaceInfo_RptMask;
 
 
@@ -114,22 +115,22 @@ typedef enum eSpaceInfo_RptMask {
 /* Properties Editor */
 typedef struct SpaceButs {
 	SpaceLink *next, *prev;
-	ListBase regionbase;		/* storage of regions for inactive spaces */
+	ListBase regionbase;        /* storage of regions for inactive spaces */
 	int spacetype;
-	float blockscale  DNA_DEPRECATED;
+	float blockscale DNA_DEPRECATED;
 	
 	short blockhandler[8]  DNA_DEPRECATED;
 
-	View2D v2d  DNA_DEPRECATED;						/* deprecated, copied to region */
+	View2D v2d DNA_DEPRECATED;                      /* deprecated, copied to region */
 	
-	short mainb, mainbo, mainbuser;	/* context tabs */
-	short re_align, align;			/* align for panels */
-	short preview;					/* preview is signal to refresh */
-	short texture_context;			/* texture context selector (material, world, brush)*/
+	short mainb, mainbo, mainbuser; /* context tabs */
+	short re_align, align;          /* align for panels */
+	short preview;                  /* preview is signal to refresh */
+	short texture_context;          /* texture context selector (material, world, brush)*/
 	char flag, pad;
 	
-	void *path;						/* runtime */
-	int pathflag, dataicon;			/* runtime */
+	void *path;                     /* runtime */
+	int pathflag, dataicon;         /* runtime */
 	ID *pinid;
 
 	void *texuser;
@@ -138,87 +139,87 @@ typedef struct SpaceButs {
 /* button defines (deprecated) */
 /* warning: the values of these defines are used in sbuts->tabs[8] */
 /* sbuts->mainb new */
-#define CONTEXT_SCENE	0
-#define CONTEXT_OBJECT	1
-#define CONTEXT_TYPES	2
-#define CONTEXT_SHADING	3
-#define CONTEXT_EDITING	4
-#define CONTEXT_SCRIPT	5
-#define CONTEXT_LOGIC	6
+#define CONTEXT_SCENE   0
+#define CONTEXT_OBJECT  1
+#define CONTEXT_TYPES   2
+#define CONTEXT_SHADING 3
+#define CONTEXT_EDITING 4
+#define CONTEXT_SCRIPT  5
+#define CONTEXT_LOGIC   6
 
 /* sbuts->mainb old (deprecated) */
-#define BUTS_VIEW			0
-#define BUTS_LAMP			1
-#define BUTS_MAT			2
-#define BUTS_TEX			3
-#define BUTS_ANIM			4
-#define BUTS_WORLD			5
-#define BUTS_RENDER			6
-#define BUTS_EDIT			7
-#define BUTS_GAME			8
-#define BUTS_FPAINT			9
-#define BUTS_RADIO			10
-#define BUTS_SCRIPT			11
-#define BUTS_SOUND			12
-#define BUTS_CONSTRAINT		13
-#define BUTS_EFFECTS		14
+#define BUTS_VIEW           0
+#define BUTS_LAMP           1
+#define BUTS_MAT            2
+#define BUTS_TEX            3
+#define BUTS_ANIM           4
+#define BUTS_WORLD          5
+#define BUTS_RENDER         6
+#define BUTS_EDIT           7
+#define BUTS_GAME           8
+#define BUTS_FPAINT         9
+#define BUTS_RADIO          10
+#define BUTS_SCRIPT         11
+#define BUTS_SOUND          12
+#define BUTS_CONSTRAINT     13
+#define BUTS_EFFECTS        14
 
 /* buts->mainb new */
 typedef enum eSpaceButtons_Context {
 	BCONTEXT_RENDER = 0,
-	BCONTEXT_SCENE,
-	BCONTEXT_WORLD,
-	BCONTEXT_OBJECT,
-	BCONTEXT_DATA,
-	BCONTEXT_MATERIAL,
-	BCONTEXT_TEXTURE,
-	BCONTEXT_PARTICLE,
-	BCONTEXT_PHYSICS,
-	BCONTEXT_BONE,
-	BCONTEXT_MODIFIER,
-	BCONTEXT_CONSTRAINT,
-	BCONTEXT_BONE_CONSTRAINT,
+	BCONTEXT_SCENE = 1,
+	BCONTEXT_WORLD = 2,
+	BCONTEXT_OBJECT = 3,
+	BCONTEXT_DATA = 4,
+	BCONTEXT_MATERIAL = 5,
+	BCONTEXT_TEXTURE = 6,
+	BCONTEXT_PARTICLE = 7,
+	BCONTEXT_PHYSICS = 8,
+	BCONTEXT_BONE = 9,
+	BCONTEXT_MODIFIER = 10,
+	BCONTEXT_CONSTRAINT = 11,
+	BCONTEXT_BONE_CONSTRAINT = 12,
 	
 	/* always as last... */
 	BCONTEXT_TOT
 } eSpaceButtons_Context;
 
 /* sbuts->flag */
-#define SB_PRV_OSA			1
-#define SB_PIN_CONTEXT		2
+#define SB_PRV_OSA          1
+#define SB_PIN_CONTEXT      2
 //#define SB_WORLD_TEX		4	//not used anymore
 //#define SB_BRUSH_TEX		8	//not used anymore	
-#define SB_SHADING_CONTEXT	16
+#define SB_SHADING_CONTEXT  16
 
 /* sbuts->texture_context */
 typedef enum eSpaceButtons_Texture_Context {
 	SB_TEXC_MAT_OR_LAMP = 0,
-	SB_TEXC_WORLD,
-	SB_TEXC_BRUSH,
-	SB_TEXC_PARTICLES,
+	SB_TEXC_WORLD = 1,
+	SB_TEXC_BRUSH = 2,
+	SB_TEXC_PARTICLES = 3,
 } eSpaceButtons_Texture_Context;
 
 /* sbuts->align */
 typedef enum eSpaceButtons_Align {
 	BUT_FREE = 0,
-	BUT_HORIZONTAL,
-	BUT_VERTICAL,
-	BUT_AUTO,
+	BUT_HORIZONTAL = 1,
+	BUT_VERTICAL = 2,
+	BUT_AUTO = 3,
 } eSpaceButtons_Align;
 
 /* sbuts->scaflag */		
-#define BUTS_SENS_SEL		1
-#define BUTS_SENS_ACT		2
-#define BUTS_SENS_LINK		4
-#define BUTS_CONT_SEL		8
-#define BUTS_CONT_ACT		16
-#define BUTS_CONT_LINK		32
-#define BUTS_ACT_SEL		64
-#define BUTS_ACT_ACT		128
-#define BUTS_ACT_LINK		256
-#define BUTS_SENS_STATE		512
-#define BUTS_ACT_STATE		1024
-#define BUTS_CONT_INIT_STATE	2048
+#define BUTS_SENS_SEL           1
+#define BUTS_SENS_ACT           2
+#define BUTS_SENS_LINK          4
+#define BUTS_CONT_SEL           8
+#define BUTS_CONT_ACT           16
+#define BUTS_CONT_LINK          32
+#define BUTS_ACT_SEL            64
+#define BUTS_ACT_ACT            128
+#define BUTS_ACT_LINK           256
+#define BUTS_SENS_STATE         512
+#define BUTS_ACT_STATE          1024
+#define BUTS_CONT_INIT_STATE    2048
 
 
 /* Outliner =============================================== */
@@ -226,12 +227,12 @@ typedef enum eSpaceButtons_Align {
 /* Outliner */
 typedef struct SpaceOops {
 	SpaceLink *next, *prev;
-	ListBase regionbase;		/* storage of regions for inactive spaces */
+	ListBase regionbase;        /* storage of regions for inactive spaces */
 	int spacetype;
-	float blockscale  DNA_DEPRECATED;
+	float blockscale DNA_DEPRECATED;
 	short blockhandler[8]  DNA_DEPRECATED;
 
-	View2D v2d  DNA_DEPRECATED; /* deprecated, copied to region */
+	View2D v2d DNA_DEPRECATED;  /* deprecated, copied to region */
 	
 	ListBase tree;
 	struct TreeStore *treestore;
@@ -255,26 +256,26 @@ typedef enum eSpaceOutliner_Flag {
 /* SpaceOops->outlinevis */
 typedef enum eSpaceOutliner_Mode {
 	SO_ALL_SCENES = 0,
-	SO_CUR_SCENE,
-	SO_VISIBLE,
-	SO_SELECTED,
-	SO_ACTIVE,
-	SO_SAME_TYPE,
-	SO_GROUPS,
-	SO_LIBRARIES,
-	SO_VERSE_SESSION,
-	SO_VERSE_MS,
-	SO_SEQUENCE,
-	SO_DATABLOCKS,
-	SO_USERDEF,
-	SO_KEYMAP,
+	SO_CUR_SCENE = 1,
+	SO_VISIBLE = 2,
+	SO_SELECTED = 3,
+	SO_ACTIVE = 4,
+	SO_SAME_TYPE = 5,
+	SO_GROUPS = 6,
+	SO_LIBRARIES = 7,
+	SO_VERSE_SESSION = 8,
+	SO_VERSE_MS = 9,
+	SO_SEQUENCE = 10,
+	SO_DATABLOCKS = 11,
+	SO_USERDEF = 12,
+	SO_KEYMAP = 13,
 } eSpaceOutliner_Mode;
 
 /* SpaceOops->storeflag */
 typedef enum eSpaceOutliner_StoreFlag {
-		/* rebuild tree */
+	/* rebuild tree */
 	SO_TREESTORE_CLEANUP    = (1 << 0),
-		/* if set, it allows redraws. gets set for some allqueue events */
+	/* if set, it allows redraws. gets set for some allqueue events */
 	SO_TREESTORE_REDRAW     = (1 << 1),
 } eSpaceOutliner_StoreFlag;
 
@@ -291,23 +292,23 @@ typedef enum eSpaceOutliner_Search_Flags {
 /* 'Graph' Editor (formerly known as the IPO Editor) */
 typedef struct SpaceIpo {
 	SpaceLink *next, *prev;
-	ListBase regionbase;		/* storage of regions for inactive spaces */
+	ListBase regionbase;        /* storage of regions for inactive spaces */
 	int spacetype;
-	float blockscale  DNA_DEPRECATED;
+	float blockscale DNA_DEPRECATED;
 	short blockhandler[8]  DNA_DEPRECATED;
 	
-	View2D v2d  DNA_DEPRECATED; /* deprecated, copied to region */
+	View2D v2d DNA_DEPRECATED;  /* deprecated, copied to region */
 	
-	struct bDopeSheet *ads;	/* settings for filtering animation data (NOTE: we use a pointer due to code-linking issues) */
+	struct bDopeSheet *ads; /* settings for filtering animation data (NOTE: we use a pointer due to code-linking issues) */
 	
-	ListBase ghostCurves;	/* sampled snapshots of F-Curves used as in-session guides */
+	ListBase ghostCurves;   /* sampled snapshots of F-Curves used as in-session guides */
 	
-	short mode;				/* mode for the Graph editor (eGraphEdit_Mode) */
-	short autosnap;			/* time-transform autosnapping settings for Graph editor (eAnimEdit_AutoSnap in DNA_action_types.h) */
-	int flag;				/* settings for Graph editor (eGraphEdit_Flag) */
+	short mode;             /* mode for the Graph editor (eGraphEdit_Mode) */
+	short autosnap;         /* time-transform autosnapping settings for Graph editor (eAnimEdit_AutoSnap in DNA_action_types.h) */
+	int flag;               /* settings for Graph editor (eGraphEdit_Flag) */
 	
-	float cursorVal;		/* cursor value (y-value, x-value is current frame) */
-	int around;				/* pivot point for transforms */
+	float cursorVal;        /* cursor value (y-value, x-value is current frame) */
+	int around;             /* pivot point for transforms */
 } SpaceIpo;
 
 
@@ -347,10 +348,10 @@ typedef enum eGraphEdit_Flag {
 
 /* SpaceIpo->mode (Graph Editor Mode) */
 typedef enum eGraphEdit_Mode {
-		/* all animation curves (from all over Blender) */
-	SIPO_MODE_ANIMATION	= 0,
-		/* drivers only */
-	SIPO_MODE_DRIVERS,
+	/* all animation curves (from all over Blender) */
+	SIPO_MODE_ANIMATION = 0,
+	/* drivers only */
+	SIPO_MODE_DRIVERS = 1,
 } eGraphEdit_Mode;
 
 
@@ -359,17 +360,17 @@ typedef enum eGraphEdit_Mode {
 /* NLA Editor */
 typedef struct SpaceNla {
 	struct SpaceLink *next, *prev;
-	ListBase regionbase;		/* storage of regions for inactive spaces */
+	ListBase regionbase;        /* storage of regions for inactive spaces */
 	int spacetype;
-	float blockscale  DNA_DEPRECATED;
+	float blockscale DNA_DEPRECATED;
 	short blockhandler[8]  DNA_DEPRECATED;
 
-	short autosnap;			/* this uses the same settings as autosnap for Action Editor */
+	short autosnap;         /* this uses the same settings as autosnap for Action Editor */
 	short flag;
 	int pad;
 	
 	struct bDopeSheet *ads;
-	View2D v2d  DNA_DEPRECATED;	 /* deprecated, copied to region */
+	View2D v2d DNA_DEPRECATED;   /* deprecated, copied to region */
 } SpaceNla;
 
 /* nla->flag */
@@ -400,11 +401,11 @@ typedef struct SpaceTimeCache {
 /* Timeline View */
 typedef struct SpaceTime {
 	SpaceLink *next, *prev;
-	ListBase regionbase;		/* storage of regions for inactive spaces */
+	ListBase regionbase;        /* storage of regions for inactive spaces */
 	int spacetype;
-	float blockscale  DNA_DEPRECATED;
+	float blockscale DNA_DEPRECATED;
 	
-	View2D v2d  DNA_DEPRECATED; /* deprecated, copied to region */
+	View2D v2d DNA_DEPRECATED;  /* deprecated, copied to region */
 
 	ListBase caches;
 
@@ -453,35 +454,35 @@ typedef enum eTimeline_Cache_Flag {
 /* Sequencer */
 typedef struct SpaceSeq {
 	SpaceLink *next, *prev;
-	ListBase regionbase;		/* storage of regions for inactive spaces */
+	ListBase regionbase;        /* storage of regions for inactive spaces */
 	int spacetype;
-	float blockscale  DNA_DEPRECATED;
+	float blockscale DNA_DEPRECATED;
 
 	short blockhandler[8]  DNA_DEPRECATED;
 
-	View2D v2d  DNA_DEPRECATED; /* deprecated, copied to region */
+	View2D v2d DNA_DEPRECATED;  /* deprecated, copied to region */
 	
-	float xof  DNA_DEPRECATED, yof  DNA_DEPRECATED;	/* deprecated: offset for drawing the image preview */
-	short mainb;	/* weird name for the sequencer subtype (seq, image, luma... etc) */
+	float xof DNA_DEPRECATED, yof DNA_DEPRECATED;   /* deprecated: offset for drawing the image preview */
+	short mainb;    /* weird name for the sequencer subtype (seq, image, luma... etc) */
 	short render_size;
 	short chanshown;
 	short zebra;
 	int flag;
-	float zoom  DNA_DEPRECATED; /* deprecated, handled by View2D now */
+	float zoom DNA_DEPRECATED;  /* deprecated, handled by View2D now */
 	int view; /* see SEQ_VIEW_* below */
 	int pad;
 
-	struct bGPdata *gpd;		/* grease-pencil data */
+	struct bGPdata *gpd;        /* grease-pencil data */
 } SpaceSeq;
 
 
 /* sseq->mainb */
 typedef enum eSpaceSeq_RegionType {
 	SEQ_DRAW_SEQUENCE = 0,
-	SEQ_DRAW_IMG_IMBUF,
-	SEQ_DRAW_IMG_WAVEFORM,
-	SEQ_DRAW_IMG_VECTORSCOPE,
-	SEQ_DRAW_IMG_HISTOGRAM,
+	SEQ_DRAW_IMG_IMBUF = 1,
+	SEQ_DRAW_IMG_WAVEFORM = 2,
+	SEQ_DRAW_IMG_VECTORSCOPE = 3,
+	SEQ_DRAW_IMG_HISTOGRAM = 4,
 } eSpaceSeq_RegionType;
 
 /* sseq->flag */
@@ -490,15 +491,15 @@ typedef enum eSpaceSeq_Flag {
 	SEQ_MARKER_TRANS            = (1 << 1),
 	SEQ_DRAW_COLOR_SEPARATED    = (1 << 2),
 	SEQ_DRAW_SAFE_MARGINS       = (1 << 3),
-	SEQ_DRAW_GPENCIL            = (1 << 4),	/* DEPRECATED */
+/*  SEQ_DRAW_GPENCIL            = (1 << 4), */ /* DEPRECATED */
 	SEQ_NO_DRAW_CFRANUM         = (1 << 5),
 } eSpaceSeq_Flag;
 
 /* sseq->view */
 typedef enum eSpaceSeq_Displays {
 	SEQ_VIEW_SEQUENCE = 1,
-	SEQ_VIEW_PREVIEW,
-	SEQ_VIEW_SEQUENCE_PREVIEW,
+	SEQ_VIEW_PREVIEW = 2,
+	SEQ_VIEW_SEQUENCE_PREVIEW = 3,
 } eSpaceSeq_Dispays;
 
 /* sseq->render_size */
@@ -526,7 +527,7 @@ typedef struct FileSelectParams {
 
 	char filter_glob[64]; /* list of filetypes to filter */
 
-	int	active_file;
+	int active_file;
 	int sel_first;
 	int sel_last;
 
@@ -547,7 +548,7 @@ typedef struct FileSelectParams {
 /* File Browser */
 typedef struct SpaceFile {
 	SpaceLink *next, *prev;
-	ListBase regionbase;		/* storage of regions for inactive spaces */
+	ListBase regionbase;        /* storage of regions for inactive spaces */
 	int spacetype;
 	
 	int scroll_offset;
@@ -578,41 +579,41 @@ typedef struct SpaceFile {
 /* FileSelectParams.display */
 enum FileDisplayTypeE {
 	FILE_DEFAULTDISPLAY = 0,
-	FILE_SHORTDISPLAY,
-	FILE_LONGDISPLAY,
-	FILE_IMGDISPLAY
+	FILE_SHORTDISPLAY = 1,
+	FILE_LONGDISPLAY = 2,
+	FILE_IMGDISPLAY = 3
 };
 
 /* FileSelectParams.sort */
 enum FileSortTypeE {
 	FILE_SORT_NONE = 0,
 	FILE_SORT_ALPHA = 1,
-	FILE_SORT_EXTENSION,
-	FILE_SORT_TIME,
-	FILE_SORT_SIZE
+	FILE_SORT_EXTENSION = 2,
+	FILE_SORT_TIME = 3,
+	FILE_SORT_SIZE = 4
 };
 
 /* these values need to be hardcoded in structs, dna does not recognize defines */
 /* also defined in BKE */
-#define FILE_MAXDIR			768
-#define FILE_MAXFILE		256
-#define FILE_MAX			1024
+#define FILE_MAXDIR         768
+#define FILE_MAXFILE        256
+#define FILE_MAX            1024
 
 #define FILE_MAX_LIBEXTRA   (FILE_MAX + 32)
 
 /* filesel types */
-#define FILE_UNIX			8
-#define FILE_BLENDER		8 /* don't display relative paths */
-#define FILE_SPECIAL		9
+#define FILE_UNIX           8
+#define FILE_BLENDER        8 /* don't display relative paths */
+#define FILE_SPECIAL        9
 
-#define FILE_LOADLIB		1
-#define FILE_MAIN			2
-#define FILE_LOADFONT		3
+#define FILE_LOADLIB        1
+#define FILE_MAIN           2
+#define FILE_LOADFONT       3
 
 /* filesel op property -> action */
 typedef enum eFileSel_Action {
 	FILE_OPENFILE = 0,
-	FILE_SAVE,
+	FILE_SAVE = 1,
 } eFileSel_Action;
 
 /* sfile->params->flag and simasel->flag */
@@ -623,7 +624,7 @@ typedef enum eFileSel_Params_Flag {
 	FILE_HIDE_DOT       = (1 << 3),
 	FILE_AUTOSELECT     = (1 << 4),
 	FILE_ACTIVELAY      = (1 << 5),
-/* 	FILE_ATCURSOR       = (1 << 6), */ /* deprecated */
+/*  FILE_ATCURSOR       = (1 << 6), */ /* deprecated */
 	FILE_DIRSEL_ONLY    = (1 << 7),
 	FILE_FILTER         = (1 << 8),
 	FILE_BOOKMARKS      = (1 << 9),
@@ -650,7 +651,7 @@ typedef enum eFileSel_File_Types {
 
 /* Selection Flags in filesel: struct direntry, unsigned char selflag */
 typedef enum eDirEntry_SelectFlag {
-/* 	ACTIVE_FILE         = (1 << 1), */ /* UNUSED */
+/*  ACTIVE_FILE         = (1 << 1), */ /* UNUSED */
 	HILITED_FILE        = (1 << 2),
 	SELECTED_FILE       = (1 << 3),
 	EDITING_FILE        = (1 << 4),
@@ -661,7 +662,7 @@ typedef enum eDirEntry_SelectFlag {
 /* Image/UV Editor */
 typedef struct SpaceImage {
 	SpaceLink *next, *prev;
-	ListBase regionbase;		/* storage of regions for inactive spaces */
+	ListBase regionbase;        /* storage of regions for inactive spaces */
 	int spacetype;
 
 	int flag;
@@ -670,15 +671,15 @@ typedef struct SpaceImage {
 	struct ImageUser iuser;
 	struct CurveMapping *cumap;		
 	
-	struct Scopes scopes;			/* histogram waveform and vectorscope */
-	struct Histogram sample_line_hist;	/* sample line histogram */
+	struct Scopes scopes;           /* histogram waveform and vectorscope */
+	struct Histogram sample_line_hist;  /* sample line histogram */
 
-	struct bGPdata *gpd;			/* grease pencil data */
+	struct bGPdata *gpd;            /* grease pencil data */
 
-	float cursor[2];				/* UV editor 2d cursor */
-	float xof, yof;					/* user defined offset, image is centered */
-	float zoom;						/* user defined zoom level */
-	float centx, centy;				/* storage for offset while render drawing */
+	float cursor[2];                /* UV editor 2d cursor */
+	float xof, yof;                 /* user defined offset, image is centered */
+	float zoom;                     /* user defined zoom level */
+	float centx, centy;             /* storage for offset while render drawing */
 
 	short curtile; /* the currently active tile of the image when tile is enabled, is kept in sync with the active faces tile */
 	short pad;
@@ -694,15 +695,15 @@ typedef struct SpaceImage {
 /* SpaceImage->dt_uv */
 typedef enum eSpaceImage_UVDT {
 	SI_UVDT_OUTLINE = 0,
-	SI_UVDT_DASH,
-	SI_UVDT_BLACK,
-	SI_UVDT_WHITE,
+	SI_UVDT_DASH = 1,
+	SI_UVDT_BLACK = 2,
+	SI_UVDT_WHITE = 3,
 } eSpaceImage_UVDT;
 
 /* SpaceImage->dt_uvstretch */
 typedef enum eSpaceImage_UVDT_Stretch {
 	SI_UVDT_STRETCH_ANGLE = 0,
-	SI_UVDT_STRETCH_AREA,
+	SI_UVDT_STRETCH_AREA = 1,
 } eSpaceImage_UVDT_Stretch;
 
 /* SpaceImage->sticky
@@ -716,15 +717,15 @@ typedef enum eSpaceImage_Sticky {
 
 /* SpaceImage->flag */
 typedef enum eSpaceImage_Flag {
-	SI_BE_SQUARE	      = (1 << 0),
-	SI_EDITTILE		      = (1 << 1),
-	SI_CLIP_UV		      = (1 << 2),
-	SI_DRAWTOOL		      = (1 << 3),
-	SI_NO_DRAWFACES	      = (1 << 4),
+	SI_BE_SQUARE          = (1 << 0),
+	SI_EDITTILE           = (1 << 1),
+	SI_CLIP_UV            = (1 << 2),
+	SI_DRAWTOOL           = (1 << 3),
+	SI_NO_DRAWFACES       = (1 << 4),
 	SI_DRAWSHADOW         = (1 << 5),
-/* 	SI_SELACTFACE         = (1 << 6), */ /* deprecated */
+/*  SI_SELACTFACE         = (1 << 6), */ /* deprecated */
 	SI_DEPRECATED2        = (1 << 7),
-	SI_DEPRECATED3        = (1 << 8),	/* stick UV selection to mesh vertex (UVs wont always be touching) */
+	SI_DEPRECATED3        = (1 << 8),   /* stick UV selection to mesh vertex (UVs wont always be touching) */
 	SI_COORDFLOATS        = (1 << 9),
 	SI_PIXELSNAP          = (1 << 10),
 	SI_LIVE_UNWRAP        = (1 << 11),
@@ -732,20 +733,20 @@ typedef enum eSpaceImage_Flag {
 	SI_SHOW_ALPHA         = (1 << 13),
 	SI_SHOW_ZBUF          = (1 << 14),
 	
-		/* next two for render window display */
+	/* next two for render window display */
 	SI_PREVSPACE          = (1 << 15),
 	SI_FULLWINDOW         = (1 << 16),
 	
 	SI_DEPRECATED4        = (1 << 17),
 	SI_DEPRECATED5        = (1 << 18),
 	
-		/* this means that the image is drawn until it reaches the view edge,
-		 * in the image view, its unrelated to the 'tile' mode for texface 
-		 */
+	/* this means that the image is drawn until it reaches the view edge,
+	 * in the image view, its unrelated to the 'tile' mode for texface
+	 */
 	SI_DRAW_TILE          = (1 << 19),
 	SI_SMOOTH_UV          = (1 << 20),
 	SI_DRAW_STRETCH       = (1 << 21),
-	SI_DISPGP             = (1 << 22), /* DEPRECATED */
+/*  SI_DISPGP             = (1 << 22), */ /* DEPRECATED */
 	SI_DRAW_OTHER         = (1 << 23),
 
 	SI_COLOR_CORRECTION   = (1 << 24),
@@ -756,9 +757,9 @@ typedef enum eSpaceImage_Flag {
 /* Text Editor */
 typedef struct SpaceText {
 	SpaceLink *next, *prev;
-	ListBase regionbase;		/* storage of regions for inactive spaces */
+	ListBase regionbase;        /* storage of regions for inactive spaces */
 	int spacetype;
-	float blockscale  DNA_DEPRECATED;
+	float blockscale DNA_DEPRECATED;
 	short blockhandler[8]  DNA_DEPRECATED;
 
 	struct Text *text;	
@@ -766,8 +767,8 @@ typedef struct SpaceText {
 	int top, viewlines;
 	short flags, menunr;	
 
-	short lheight;		/* user preference */
-	char cwidth, linenrs_tot;		/* runtime computed, character width and the number of chars to use when showing line numbers */
+	short lheight;      /* user preference */
+	char cwidth, linenrs_tot;       /* runtime computed, character width and the number of chars to use when showing line numbers */
 	int left;
 	int showlinenrs;
 	int tabnumber;
@@ -782,8 +783,8 @@ typedef struct SpaceText {
 
 	int wordwrap, doplugins;
 
-	char findstr[256];		/* ST_MAX_FIND_STR */
-	char replacestr[256];	/* ST_MAX_FIND_STR */
+	char findstr[256];      /* ST_MAX_FIND_STR */
+	char replacestr[256];   /* ST_MAX_FIND_STR */
 
 	short margin_column; /* column number to show right margin at */
 	char pad[6];
@@ -806,7 +807,7 @@ typedef enum eSpaceText_Flags {
 } eSpaceText_Flags;
 
 /* stext->findstr/replacestr */
-#define ST_MAX_FIND_STR		256
+#define ST_MAX_FIND_STR     256
 
 /* Script View (Obsolete) ================================== */
 
@@ -830,9 +831,9 @@ typedef struct Script {
 /* Script View - Obsolete (pre 2.5) */
 typedef struct SpaceScript {
 	SpaceLink *next, *prev;
-	ListBase regionbase;		/* storage of regions for inactive spaces */
+	ListBase regionbase;        /* storage of regions for inactive spaces */
 	int spacetype;
-	float blockscale  DNA_DEPRECATED;
+	float blockscale DNA_DEPRECATED;
 	struct Script *script;
 
 	short flags, menunr;
@@ -846,36 +847,36 @@ typedef struct SpaceScript {
 /* Node Editor */
 typedef struct SpaceNode {
 	SpaceLink *next, *prev;
-	ListBase regionbase;		/* storage of regions for inactive spaces */
+	ListBase regionbase;        /* storage of regions for inactive spaces */
 	int spacetype;
-	float blockscale  DNA_DEPRECATED;
+	float blockscale DNA_DEPRECATED;
 	short blockhandler[8]  DNA_DEPRECATED;
 	
-	View2D v2d  DNA_DEPRECATED; /* deprecated, copied to region */
+	View2D v2d DNA_DEPRECATED;  /* deprecated, copied to region */
 	
-	struct ID *id, *from;		/* context, no need to save in file? well... pinning... */
-	short flag, pad1;			/* menunr: browse id block in header */
+	struct ID *id, *from;       /* context, no need to save in file? well... pinning... */
+	short flag, pad1;           /* menunr: browse id block in header */
 	float aspect;
 	
-	float xof, yof;		/* offset for drawing the backdrop */
-	float zoom, padf;	/* zoom for backdrop */
-	float mx, my;		/* mousepos for drawing socketless link */
+	float xof, yof;     /* offset for drawing the backdrop */
+	float zoom, padf;   /* zoom for backdrop */
+	float mx, my;       /* mousepos for drawing socketless link */
 	
 	struct bNodeTree *nodetree, *edittree;
-	int treetype;		/* treetype: as same nodetree->type */
-	short texfrom;		/* texfrom object, world or brush */
-	short shaderfrom;	/* shader from object or world */
-	short recalc;		/* currently on 0/1, for auto compo */
+	int treetype;       /* treetype: as same nodetree->type */
+	short texfrom;      /* texfrom object, world or brush */
+	short shaderfrom;   /* shader from object or world */
+	short recalc;       /* currently on 0/1, for auto compo */
 	short pad[3];
-	ListBase linkdrag;	/* temporary data for modal linking operator */
+	ListBase linkdrag;  /* temporary data for modal linking operator */
 	
-	struct bGPdata *gpd;		/* grease-pencil data */
+	struct bGPdata *gpd;        /* grease-pencil data */
 } SpaceNode;
 
 /* snode->flag */
 typedef enum eSpaceNode_Flag {
 	SNODE_BACKDRAW     = (1 << 1),
-	SNODE_DISPGP       = (1 << 2), /* XXX: Grease Pencil - deprecated? */
+/*  SNODE_DISPGP       = (1 << 2), */ /* XXX: Grease Pencil - deprecated? */
 	SNODE_USE_ALPHA    = (1 << 3),
 	SNODE_SHOW_ALPHA   = (1 << 4),
 	SNODE_AUTO_RENDER  = (1 << 5),
@@ -884,14 +885,14 @@ typedef enum eSpaceNode_Flag {
 /* snode->texfrom */
 typedef enum eSpaceNode_TexFrom {
 	SNODE_TEX_OBJECT   = 0,
-	SNODE_TEX_WORLD,
-	SNODE_TEX_BRUSH,
+	SNODE_TEX_WORLD    = 1,
+	SNODE_TEX_BRUSH    = 2,
 } eSpaceNode_TexFrom;
 
 /* snode->shaderfrom */
 typedef enum eSpaceNode_ShaderFrom {
-	SNODE_SHADER_OBJECT	= 0,
-	SNODE_SHADER_WORLD,
+	SNODE_SHADER_OBJECT = 0,
+	SNODE_SHADER_WORLD = 1,
 } eSpaceNode_ShaderFrom;
 
 /* Game Logic Editor ===================================== */
@@ -899,16 +900,16 @@ typedef enum eSpaceNode_ShaderFrom {
 /* Logic Editor */
 typedef struct SpaceLogic {
 	SpaceLink *next, *prev;
-	ListBase regionbase;		/* storage of regions for inactive spaces */
+	ListBase regionbase;        /* storage of regions for inactive spaces */
 	int spacetype;
-	float blockscale  DNA_DEPRECATED;
+	float blockscale DNA_DEPRECATED;
 	
 	short blockhandler[8]  DNA_DEPRECATED;
 	
 	short flag, scaflag;
 	int pad;
 	
-	struct bGPdata *gpd;		/* grease-pencil data */
+	struct bGPdata *gpd;        /* grease-pencil data */
 } SpaceLogic;
 
 /* Console ================================================ */
@@ -918,8 +919,8 @@ typedef struct ConsoleLine {
 	struct ConsoleLine *next, *prev;
 	
 	/* keep these 3 vars so as to share free, realloc funcs */
-	int len_alloc;	/* allocated length */
-	int len;	/* real len - strlen() */
+	int len_alloc;  /* allocated length */
+	int len;    /* real len - strlen() */
 	char *line; 
 	
 	int cursor;
@@ -929,19 +930,19 @@ typedef struct ConsoleLine {
 /* ConsoleLine.type */
 typedef enum eConsoleLine_Type {
 	CONSOLE_LINE_OUTPUT = 0,
-	CONSOLE_LINE_INPUT,
-	CONSOLE_LINE_INFO, /* autocomp feedback */
-	CONSOLE_LINE_ERROR
+	CONSOLE_LINE_INPUT = 1,
+	CONSOLE_LINE_INFO = 2, /* autocomp feedback */
+	CONSOLE_LINE_ERROR = 3
 } eConsoleLine_Type;
 
 
 /* Console View */
 typedef struct SpaceConsole {
 	SpaceLink *next, *prev;
-	ListBase regionbase;		/* storage of regions for inactive spaces */
+	ListBase regionbase;        /* storage of regions for inactive spaces */
 	int spacetype;
-	float blockscale  DNA_DEPRECATED;			// XXX are these needed?
-	short blockhandler[8]  DNA_DEPRECATED;		// XXX are these needed?
+	float blockscale DNA_DEPRECATED;            // XXX are these needed?
+	short blockhandler[8]  DNA_DEPRECATED;      // XXX are these needed?
 	
 	/* space vars */
 	int lheight, pad;
@@ -961,12 +962,12 @@ typedef struct SpaceConsole {
 /* User Preferences View */
 typedef struct SpaceUserPref {
 	SpaceLink *next, *prev;
-	ListBase regionbase;		/* storage of regions for inactive spaces */
+	ListBase regionbase;        /* storage of regions for inactive spaces */
 	int spacetype;
 	
 	int pad;
 	
-	char filter[64];		/* search term for filtering in the UI */
+	char filter[64];        /* search term for filtering in the UI */
 } SpaceUserPref;
 
 /* Motion Tracking ======================================== */
@@ -974,39 +975,45 @@ typedef struct SpaceUserPref {
 /* Clip Editor */
 typedef struct SpaceClip {
 	SpaceLink *next, *prev;
-	ListBase regionbase;		/* storage of regions for inactive spaces */
+	ListBase regionbase;        /* storage of regions for inactive spaces */
 	int spacetype;
 
-	float xof, yof;				/* user defined offset, image is centered */
-	float xlockof, ylockof;		/* user defined offset from locked position */
-	float zoom;					/* user defined zoom level */
+	float xof, yof;             /* user defined offset, image is centered */
+	float xlockof, ylockof;     /* user defined offset from locked position */
+	float zoom;                 /* user defined zoom level */
 
-	struct MovieClipUser user;		/* user of clip */
-	struct MovieClip *clip;			/* clip data */
-	struct MovieClipScopes scopes;	/* different scoped displayed in space panels */
+	struct MovieClipUser user;      /* user of clip */
+	struct MovieClip *clip;         /* clip data */
+	struct MovieClipScopes scopes;  /* different scoped displayed in space panels */
 
-	int flag;					/* flags */
-	short mode;					/* editor mode (editing context being displayed) */
-	short view;					/* type of the clip editor view */
+	int flag;                   /* flags */
+	short mode;                 /* editor mode (editing context being displayed) */
+	short view;                 /* type of the clip editor view */
 
-	int path_length;			/* length of displaying path, in frames */
+	int path_length;            /* length of displaying path, in frames */
 
 	/* current stabilization data */
-	float loc[2], scale, angle;	/* pre-composed stabilization data */
+	float loc[2], scale, angle; /* pre-composed stabilization data */
 	int pad;
 	float stabmat[4][4], unistabmat[4][4];  /* current stabilization matrix and the same matrix in unified space,
 	                                         * defined when drawing and used for mouse position calculation */
 
 	/* movie postprocessing */
-	int postproc_flag, pad2;
+	int postproc_flag;
+
+	/* grease pencil */
+	short gpencil_src, pad2;
 
 	void *draw_context;
 
-	/* dopesheet */
-	short dope_sort;		/* sort order in dopesheet view */
-	short dope_flag;		/* dopsheet view flags */
+	int around, pad4;             /* pivot point for transforms */
 
-	int pad3;
+	/* **** mask editing **** */
+	struct Mask *mask;
+	/* draw options */
+	char mask_draw_flag;
+	char mask_draw_type;
+	char pad3[6];
 } SpaceClip;
 
 /* SpaceClip->flag */
@@ -1030,65 +1037,62 @@ typedef enum eSpaceClip_Flag {
 /*	SC_SHOW_PYRAMID_LEVELS = (1 << 16), */	/* UNUSED */
 	SC_LOCK_TIMECURSOR     = (1 << 17),
 	SC_SHOW_SECONDS        = (1 << 18),
+	SC_SHOW_GRAPH_SEL_ONLY = (1 << 19),
+	SC_SHOW_GRAPH_HIDDEN   = (1 << 20),
 } eSpaceClip_Flag;
 
 /* SpaceClip->mode */
 typedef enum eSpaceClip_Mode {
 	SC_MODE_TRACKING = 0,
-	SC_MODE_RECONSTRUCTION,
-	SC_MODE_DISTORTION,
+	SC_MODE_RECONSTRUCTION = 1,
+	SC_MODE_DISTORTION = 2,
+	SC_MODE_MASKEDIT = 3,
 } eSpaceClip_Mode;
 
 /* SpaceClip->view */
 typedef enum eSpaceClip_View {
 	SC_VIEW_CLIP = 0,
-	SC_VIEW_GRAPH,
-	SC_VIEW_DOPESHEET,
+	SC_VIEW_GRAPH = 1,
+	SC_VIEW_DOPESHEET = 2,
 } eSpaceClip_View;
 
-/* SpaceClip->dope_sort */
-typedef enum eSpaceClip_Dopesheet_Sort {
-	SC_DOPE_SORT_NAME = 0,
-	SC_DOPE_SORT_LONGEST,
-	SC_DOPE_SORT_TOTAL,
-} eSpaceClip_Dopesheet_Sort;
-
-/* SpaceClip->dope_flag */
-typedef enum eSpaceClip_Dopesheet_Flag {
-	SC_DOPE_SORT_INVERSE    = (1 << 0),
-} eSpaceClip_Dopesheet_Flag;
+/* SpaceClip->gpencil_src */
+typedef enum eSpaceClip_GPencil_Source {
+	SC_GPENCIL_SRC_CLIP = 0,
+	SC_GPENCIL_SRC_TRACK = 1,
+} eSpaceClip_GPencil_Source;
 
 /* **************** SPACE DEFINES ********************* */
 
 /* headerbuttons: 450-499 */
-#define B_IMASELHOME		451
-#define B_IMASELREMOVEBIP	452
+#define B_IMASELHOME        451
+#define B_IMASELREMOVEBIP   452
 
 
 /* space types, moved from DNA_screen_types.h */
 /* Do NOT change order, append on end. types are hardcoded needed */
 typedef enum eSpace_Type {
-	SPACE_EMPTY,
-	SPACE_VIEW3D,
-	SPACE_IPO,
-	SPACE_OUTLINER,
-	SPACE_BUTS,
-	SPACE_FILE,
-	SPACE_IMAGE,		
-	SPACE_INFO,
-	SPACE_SEQ,
-	SPACE_TEXT,
-	SPACE_IMASEL, /* deprecated */
-	SPACE_SOUND, /* Deprecated */
-	SPACE_ACTION,
-	SPACE_NLA,
-	SPACE_SCRIPT, /* Deprecated */
-	SPACE_TIME,
-	SPACE_NODE,
-	SPACE_LOGIC,
-	SPACE_CONSOLE,
-	SPACE_USERPREF,
-	SPACE_CLIP,
+	SPACE_EMPTY    = 0,
+	SPACE_VIEW3D   = 1,
+	SPACE_IPO      = 2,
+	SPACE_OUTLINER = 3,
+	SPACE_BUTS     = 4,
+	SPACE_FILE     = 5,
+	SPACE_IMAGE    = 6,
+	SPACE_INFO     = 7,
+	SPACE_SEQ      = 8,
+	SPACE_TEXT     = 9,
+	SPACE_IMASEL   = 10, /* deprecated */
+	SPACE_SOUND    = 11, /* Deprecated */
+	SPACE_ACTION   = 12,
+	SPACE_NLA      = 13,
+	SPACE_SCRIPT   = 14, /* Deprecated */
+	SPACE_TIME     = 15,
+	SPACE_NODE     = 16,
+	SPACE_LOGIC    = 17,
+	SPACE_CONSOLE  = 18,
+	SPACE_USERPREF = 19,
+	SPACE_CLIP     = 20,
 	
 	SPACEICONMAX = SPACE_CLIP
 } eSpace_Type;
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 7497f5e7449..606c466ac74 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -44,7 +44,6 @@ extern "C" {
 
 struct AnimData;
 struct Ipo;
-struct PluginTex;
 struct ColorBand;
 struct EnvMap;
 struct Object;
@@ -104,30 +103,6 @@ typedef struct MTex {
 typedef unsigned short dna_ushort_fix;
 #endif
 
-typedef struct PluginTex {
-	char name[1024];
-	void *handle;
-	
-	char *pname;
-	char *stnames;
-
-	int stypes;
-	int vars;
-	void *varstr;
-	float *result;
-	float *cfra;
-	
-	float data[32];
-
-	int (*doit)(void);
-	void (*instance_init)(void *);
-
-	/* should be void (*)(unsigned short)... patched */	
-	void (*callback)(dna_ushort_fix);
-	
-	int version, pad;
-} PluginTex;
-
 typedef struct CBData {
 	float r, g, b, a, pos;
 	int cur;
@@ -267,7 +242,6 @@ typedef struct Tex {
 	struct bNodeTree *nodetree;
 	struct Ipo *ipo  DNA_DEPRECATED;  /* old animation system, deprecated for 2.5 */
 	struct Image *ima;
-	struct PluginTex *plugin;
 	struct ColorBand *coba;
 	struct EnvMap *env;
 	struct PreviewImage * preview;
@@ -324,7 +298,7 @@ typedef struct ColorMapping {
 #define TEX_STUCCI		6
 #define TEX_NOISE		7
 #define TEX_IMAGE		8
-#define TEX_PLUGIN		9
+//#define TEX_PLUGIN		9 /* Deprecated */
 #define TEX_ENVMAP		10
 #define TEX_MUSGRAVE	11
 #define TEX_VORONOI		12
diff --git a/source/blender/makesdna/DNA_tracking_types.h b/source/blender/makesdna/DNA_tracking_types.h
index 6bf059c7ecb..1ab64ed1cc1 100644
--- a/source/blender/makesdna/DNA_tracking_types.h
+++ b/source/blender/makesdna/DNA_tracking_types.h
@@ -35,10 +35,12 @@
 #ifndef __DNA_TRACKING_TYPES_H__
 #define __DNA_TRACKING_TYPES_H__
 
+#include "DNA_defs.h"
 #include "DNA_listBase.h"
 
 /* match-moving data */
 
+struct bGPdata;
 struct ImBuf;
 struct MovieReconstructedCamera;
 struct MovieTrackingCamera;
@@ -54,82 +56,113 @@ typedef struct MovieReconstructedCamera {
 } MovieReconstructedCamera;
 
 typedef struct MovieTrackingCamera {
-	void *intrinsics;	/* intrinsics handle */
+	void *intrinsics;   /* intrinsics handle */
 
-	float sensor_width;	/* width of CCD sensor */
-	float pixel_aspect;	/* pixel aspect ratio */
+	float sensor_width; /* width of CCD sensor */
+	float pixel_aspect; /* pixel aspect ratio */
 	float pad;
-	float focal;		/* focal length */
-	short units;		/* units of focal length user is working with */
+	float focal;        /* focal length */
+	short units;        /* units of focal length user is working with */
 	short pad1;
-	float principal[2];	/* principal point */
-	float k1, k2, k3;	/* radial distortion */
+	float principal[2]; /* principal point */
+	float k1, k2, k3;   /* radial distortion */
 } MovieTrackingCamera;
 
 typedef struct MovieTrackingMarker {
-	float pos[2];	/* 2d position of marker on frame (in unified 0..1 space) */
-	int framenr;	/* number of frame marker is associated with */
-	int flag;		/* Marker's flag (alive, ...) */
+	float pos[2];   /* 2d position of marker on frame (in unified 0..1 space) */
+
+	/* corners of pattern in the following order:
+	 *
+	 *       Y
+	 *       ^
+	 *       | (3) --- (2)
+	 *       |  |       |
+	 *       |  |       |
+	 *       |  |       |
+	 *       | (0) --- (1)
+	 *       +-------------> X
+	 *
+	 * the coordinates are stored relative to pos.
+	 */
+	float pattern_corners[4][2];
+
+	/* positions of left-bottom and right-top corners of search area (in unified 0..1 units,
+	 * relative to marker->pos
+	 */
+	float search_min[2], search_max[2];
+
+	int framenr;    /* number of frame marker is associated with */
+	int flag;       /* Marker's flag (alive, ...) */
 } MovieTrackingMarker;
 
 typedef struct MovieTrackingTrack {
 	struct MovieTrackingTrack *next, *prev;
 
-	char name[64];	/* MAX_NAME */
+	char name[64];  /* MAX_NAME */
 
 	/* ** setings ** */
-	float pat_min[2], pat_max[2];		/* positions of left-bottom and right-top corners of pattern (in unified 0..1 space) */
-	float search_min[2], search_max[2];	/* positions of left-bottom and right-top corners of search area (in unified 0..1 space) */
-	float offset[2];					/* offset to "parenting" point */
+
+	/* positions of left-bottom and right-top corners of pattern (in unified 0..1 units,
+	 * relative to marker->pos)
+	 * moved to marker's corners since planar tracking implementation
+	 */
+	float pat_min[2] DNA_DEPRECATED, pat_max[2] DNA_DEPRECATED;
+
+	/* positions of left-bottom and right-top corners of search area (in unified 0..1 units,
+	 * relative to marker->pos
+	 * moved to marker since affine tracking implementation
+	 */
+	float search_min[2] DNA_DEPRECATED, search_max[2] DNA_DEPRECATED;
+
+	float offset[2];                    /* offset to "parenting" point */
 
 	/* ** track ** */
-	int markersnr;					/* count of markers in track */
-	int last_marker;				/* most recently used marker */
-	MovieTrackingMarker *markers;	/* markers in track */
+	int markersnr;                  /* count of markers in track */
+	int last_marker;                /* most recently used marker */
+	MovieTrackingMarker *markers;   /* markers in track */
 
 	/* ** reconstruction data ** */
-	float bundle_pos[3];			/* reconstructed position */
-	float error;					/* average track reprojection error */
+	float bundle_pos[3];            /* reconstructed position */
+	float error;                    /* average track reprojection error */
 
 	/* ** UI editing ** */
-	int flag, pat_flag, search_flag;	/* flags (selection, ...) */
-	float color[3];						/* custom color for track */
-
-	/* tracking algorithm to use; can be KLT or SAD */
-	short frames_limit;		/* number of frames to be tarcked during single tracking session (if TRACKING_FRAMES_LIMIT is set) */
-	short margin;			/* margin from frame boundaries */
-	short pattern_match;	/* re-adjust every N frames */
+	int flag, pat_flag, search_flag;    /* flags (selection, ...) */
+	float color[3];                     /* custom color for track */
 
-	short tracker;			/* tracking algorithm used for this track */
+	/* ** control how tracking happens */
+	short frames_limit;     /* number of frames to be tarcked during single tracking session (if TRACKING_FRAMES_LIMIT is set) */
+	short margin;           /* margin from frame boundaries */
+	short pattern_match;    /* re-adjust every N frames */
 
-	/* ** KLT tracker settings ** */
-	short pyramid_levels, pad2;		/* number of pyramid levels to use for KLT tracking */
+	/* tracking parameters */
+	short motion_model;     /* model of the motion for this track */
+	int algorithm_flag;    /* flags for the tracking algorithm (use brute, use esm, use pyramid, etc */
+	float minimum_correlation;          /* minimal correlation which is still treated as successful tracking */
 
-	/* ** SAD tracker settings ** */
-	float minimum_correlation;			/* minimal correlation which is still treated as successful tracking */
+	struct bGPdata *gpd;        /* grease-pencil data */
 } MovieTrackingTrack;
 
 typedef struct MovieTrackingSettings {
 	int flag;
 
 	/* ** default tracker settings */
-	short default_tracker;				/* tracking algorithm used by default */
-	short default_pyramid_levels;		/* number of pyramid levels to use for KLT tracking */
-	float default_minimum_correlation;	/* minimal correlation which is still treated as successful tracking */
-	short default_pattern_size;			/* size of pattern area for new tracks */
-	short default_search_size;			/* size of search area for new tracks */
-	short default_frames_limit;			/* number of frames to be tarcked during single tracking session (if TRACKING_FRAMES_LIMIT is set) */
-	short default_margin;				/* margin from frame boundaries */
-	short default_pattern_match;		/* re-adjust every N frames */
-	short default_flag;					/* default flags like color channels used by default */
-
-	short motion_flag;		/* flags describes motion type */
+	short default_motion_model;         /* model of the motion for this track */
+	short default_algorithm_flag;       /* flags for the tracking algorithm (use brute, use esm, use pyramid, etc */
+	float default_minimum_correlation;  /* minimal correlation which is still treated as successful tracking */
+	short default_pattern_size;         /* size of pattern area for new tracks */
+	short default_search_size;          /* size of search area for new tracks */
+	short default_frames_limit;         /* number of frames to be tarcked during single tracking session (if TRACKING_FRAMES_LIMIT is set) */
+	short default_margin;               /* margin from frame boundaries */
+	short default_pattern_match;        /* re-adjust every N frames */
+	short default_flag;                 /* default flags like color channels used by default */
+
+	short motion_flag;      /* flags describes motion type */
 
 	/* ** common tracker settings ** */
-	short speed;			/* speed of tracking */
+	short speed;            /* speed of tracking */
 
 	/* ** reconstruction settings ** */
-	int keyframe1, keyframe2;	/* two keyframes for reconstrution initialization */
+	int keyframe1, keyframe2;   /* two keyframes for reconstrution initialization */
 
 	/* which camera intrinsics to refine. uses on the REFINE_* flags */
 	short refine_camera_intrinsics, pad2;
@@ -137,56 +170,56 @@ typedef struct MovieTrackingSettings {
 	/* ** tool settings ** */
 
 	/* set scale */
-	float dist;					/* distance between two bundles used for scene scaling */
+	float dist;                 /* distance between two bundles used for scene scaling */
 
 	/* cleanup */
 	int clean_frames, clean_action;
 	float clean_error;
 
 	/* set object scale */
-	float object_distance;		/* distance between two bundles used for object scaling */
+	float object_distance;      /* distance between two bundles used for object scaling */
 
 	int pad3;
 } MovieTrackingSettings;
 
 typedef struct MovieTrackingStabilization {
 	int flag;
-	int tot_track, act_track;		/* total number and index of active track in list */
+	int tot_track, act_track;       /* total number and index of active track in list */
 
 	/* 2d stabilization */
-	float maxscale;			/* max auto-scale factor */
-	MovieTrackingTrack *rot_track;	/* track used to stabilize rotation */
+	float maxscale;         /* max auto-scale factor */
+	MovieTrackingTrack *rot_track;  /* track used to stabilize rotation */
 
-	float locinf, scaleinf, rotinf;	/* influence on location, scale and rotation */
+	float locinf, scaleinf, rotinf; /* influence on location, scale and rotation */
 
-	int filter;		/* filter used for pixel interpolation */
+	int filter;     /* filter used for pixel interpolation */
 
 	/* some pre-computing run-time variables */
-	int ok;						/* are precomputed values and scaled buf relevant? */
-	float scale;				/* autoscale factor */
+	int ok;                     /* are precomputed values and scaled buf relevant? */
+	float scale;                /* autoscale factor */
 
-	struct ImBuf *scaleibuf;	/* currently scaled ibuf */
+	struct ImBuf *scaleibuf;    /* currently scaled ibuf */
 } MovieTrackingStabilization;
 
 typedef struct MovieTrackingReconstruction {
 	int flag;
 
-	float error;		/* average error of reconstruction */
+	float error;        /* average error of reconstruction */
 
-	int last_camera;		/* most recently used camera */
-	int camnr;				/* number of reconstructed cameras */
-	struct MovieReconstructedCamera *cameras;	/* reconstructed cameras */
+	int last_camera;        /* most recently used camera */
+	int camnr;              /* number of reconstructed cameras */
+	struct MovieReconstructedCamera *cameras;   /* reconstructed cameras */
 } MovieTrackingReconstruction;
 
 typedef struct MovieTrackingObject {
 	struct MovieTrackingObject *next, *prev;
 
-	char name[64];			/* Name of tracking object, MAX_NAME */
+	char name[64];          /* Name of tracking object, MAX_NAME */
 	int flag;
-	float scale;			/* scale of object solution in amera space */
+	float scale;            /* scale of object solution in amera space */
 
-	ListBase tracks;		/* list of tracks use to tracking this object */
-	MovieTrackingReconstruction reconstruction;	/* reconstruction data for this object */
+	ListBase tracks;        /* list of tracks use to tracking this object */
+	MovieTrackingReconstruction reconstruction; /* reconstruction data for this object */
 } MovieTrackingObject;
 
 typedef struct MovieTrackingStats {
@@ -196,113 +229,138 @@ typedef struct MovieTrackingStats {
 typedef struct MovieTrackingDopesheetChannel {
 	struct MovieTrackingDopesheetChannel *next, *prev;
 
-	MovieTrackingTrack *track;	/* motion track for which channel is created */
+	MovieTrackingTrack *track;  /* motion track for which channel is created */
 	int pad;
 
-	int tot_segment;		/* total number of segments */
-	int *segments;			/* tracked segments */
-	int max_segment, total_frames;	/* longest segment length and total number of tracked frames */
+	char name[64];          /* name of channel */
+
+	int tot_segment;        /* total number of segments */
+	int *segments;          /* tracked segments */
+	int max_segment, total_frames;  /* longest segment length and total number of tracked frames */
 } MovieTrackingDopesheetChannel;
 
 typedef struct MovieTrackingDopesheet {
-	int ok, pad;				/* flag if dopesheet information is still relevant */
+	int ok;                     /* flag if dopesheet information is still relevant */
+
+	short sort_method;          /* method to be used to sort tracks */
+	short flag;                 /* dopesheet building flag such as inverted order of sort */
 
+	/* runtime stuff */
 	ListBase channels;
 	int tot_channel;
 
-	short sort_method;			/* method to be used to sort tracks */
-	short sort_inverse;			/* order of tracks is inverted */
+	int pad;
 } MovieTrackingDopesheet;
 
 typedef struct MovieTracking {
-	MovieTrackingSettings settings;	/* different tracking-related settings */
-	MovieTrackingCamera camera;		/* camera intrinsics */
-	ListBase tracks;				/* list of tracks used for camera object */
-	MovieTrackingReconstruction reconstruction;	/* reconstruction data for camera object */
-	MovieTrackingStabilization stabilization;	/* stabilization data */
-	MovieTrackingTrack *act_track;		/* active track */
+	MovieTrackingSettings settings; /* different tracking-related settings */
+	MovieTrackingCamera camera;     /* camera intrinsics */
+	ListBase tracks;                /* list of tracks used for camera object */
+	MovieTrackingReconstruction reconstruction; /* reconstruction data for camera object */
+	MovieTrackingStabilization stabilization;   /* stabilization data */
+	MovieTrackingTrack *act_track;      /* active track */
 
 	ListBase objects;
-	int objectnr, tot_object;		/* index of active object and total number of objects */
+	int objectnr, tot_object;       /* index of active object and total number of objects */
 
-	MovieTrackingStats *stats;		/* statistics displaying in clip editor */
+	MovieTrackingStats *stats;      /* statistics displaying in clip editor */
 
-	MovieTrackingDopesheet dopesheet;	/* dopesheet data */
+	MovieTrackingDopesheet dopesheet;   /* dopesheet data */
 } MovieTracking;
 
 /* MovieTrackingCamera->units */
 enum {
 	CAMERA_UNITS_PX = 0,
-	CAMERA_UNITS_MM
+	CAMERA_UNITS_MM = 1
 };
 
 /* MovieTrackingMarker->flag */
-#define MARKER_DISABLED	(1<<0)
-#define MARKER_TRACKED	(1<<1)
-#define MARKER_GRAPH_SEL_X (1<<2)
-#define MARKER_GRAPH_SEL_Y (1<<3)
-#define MARKER_GRAPH_SEL	(MARKER_GRAPH_SEL_X|MARKER_GRAPH_SEL_Y)
+#define MARKER_DISABLED (1 << 0)
+#define MARKER_TRACKED  (1 << 1)
+#define MARKER_GRAPH_SEL_X (1 << 2)
+#define MARKER_GRAPH_SEL_Y (1 << 3)
+#define MARKER_GRAPH_SEL    (MARKER_GRAPH_SEL_X | MARKER_GRAPH_SEL_Y)
 
 /* MovieTrackingTrack->flag */
-#define TRACK_HAS_BUNDLE	(1<<1)
-#define TRACK_DISABLE_RED	(1<<2)
-#define TRACK_DISABLE_GREEN	(1<<3)
-#define TRACK_DISABLE_BLUE	(1<<4)
-#define TRACK_HIDDEN		(1<<5)
-#define TRACK_LOCKED		(1<<6)
-#define TRACK_CUSTOMCOLOR	(1<<7)
-#define TRACK_USE_2D_STAB	(1<<8)
-#define TRACK_PREVIEW_GRAYSCALE	(1<<9)
-#define TRACK_DOPE_SEL		(1<<10)
-
-/* MovieTrackingTrack->tracker */
-#define TRACKER_KLT		0
-#define TRACKER_SAD		1
-#define TRACKER_HYBRID		2
+#define TRACK_HAS_BUNDLE    (1 << 1)
+#define TRACK_DISABLE_RED   (1 << 2)
+#define TRACK_DISABLE_GREEN (1 << 3)
+#define TRACK_DISABLE_BLUE  (1 << 4)
+#define TRACK_HIDDEN        (1 << 5)
+#define TRACK_LOCKED        (1 << 6)
+#define TRACK_CUSTOMCOLOR   (1 << 7)
+#define TRACK_USE_2D_STAB   (1 << 8)
+#define TRACK_PREVIEW_GRAYSCALE (1 << 9)
+#define TRACK_DOPE_SEL      (1 << 10)
+#define TRACK_PREVIEW_ALPHA (1 << 11)
+
+/* MovieTrackingTrack->motion_model */
+#define TRACK_MOTION_MODEL_TRANSLATION                 0
+#define TRACK_MOTION_MODEL_TRANSLATION_ROTATION        1
+#define TRACK_MOTION_MODEL_TRANSLATION_SCALE           2
+#define TRACK_MOTION_MODEL_TRANSLATION_ROTATION_SCALE  3
+#define TRACK_MOTION_MODEL_AFFINE                      4
+#define TRACK_MOTION_MODEL_HOMOGRAPHY                  5
+
+/* MovieTrackingTrack->algorithm_flag */
+#define TRACK_ALGORITHM_FLAG_USE_BRUTE			(1 << 0)
+#define TRACK_ALGORITHM_FLAG_USE_NORMALIZATION	(1 << 2)
+#define TRACK_ALGORITHM_FLAG_USE_MASK			(1 << 3)
 
 /* MovieTrackingTrack->adjframes */
-#define TRACK_MATCH_KEYFRAME		0
-#define TRACK_MATCH_PREVFRAME		1
+#define TRACK_MATCH_KEYFRAME        0
+#define TRACK_MATCH_PREVFRAME       1
 
 /* MovieTrackingSettings->flag */
-#define TRACKING_SETTINGS_SHOW_DEFAULT_EXPANDED	(1<<0)
+#define TRACKING_SETTINGS_SHOW_DEFAULT_EXPANDED (1 << 0)
 
 /* MovieTrackingSettings->motion_flag */
-#define TRACKING_MOTION_TRIPOD		(1<<0)
+#define TRACKING_MOTION_TRIPOD      (1 << 0)
 
-#define TRACKING_MOTION_MODAL		(TRACKING_MOTION_TRIPOD)
+#define TRACKING_MOTION_MODAL       (TRACKING_MOTION_TRIPOD)
 
 /* MovieTrackingSettings->speed */
-#define TRACKING_SPEED_FASTEST		0
-#define TRACKING_SPEED_REALTIME		1
-#define TRACKING_SPEED_HALF			2
-#define TRACKING_SPEED_QUARTER		4
-#define TRACKING_SPEED_DOUBLE		5
+#define TRACKING_SPEED_FASTEST      0
+#define TRACKING_SPEED_REALTIME     1
+#define TRACKING_SPEED_HALF         2
+#define TRACKING_SPEED_QUARTER      4
+#define TRACKING_SPEED_DOUBLE       5
 
 /* MovieTrackingSettings->refine_camera_intrinsics */
-#define REFINE_FOCAL_LENGTH			(1<<0)
-#define REFINE_PRINCIPAL_POINT		(1<<1)
-#define REFINE_RADIAL_DISTORTION_K1	(1<<2)
-#define REFINE_RADIAL_DISTORTION_K2	(1<<4)
+#define REFINE_FOCAL_LENGTH         (1 << 0)
+#define REFINE_PRINCIPAL_POINT      (1 << 1)
+#define REFINE_RADIAL_DISTORTION_K1 (1 << 2)
+#define REFINE_RADIAL_DISTORTION_K2 (1 << 4)
 
 /* MovieTrackingStrabilization->flag */
-#define TRACKING_2D_STABILIZATION	(1<<0)
-#define TRACKING_AUTOSCALE			(1<<1)
-#define TRACKING_STABILIZE_ROTATION	(1<<2)
+#define TRACKING_2D_STABILIZATION   (1 << 0)
+#define TRACKING_AUTOSCALE          (1 << 1)
+#define TRACKING_STABILIZE_ROTATION (1 << 2)
 
 /* MovieTrackingStrabilization->filter */
-#define TRACKING_FILTER_NEAREAST	0
-#define TRACKING_FILTER_BILINEAR	1
-#define TRACKING_FILTER_BICUBIC		2
+#define TRACKING_FILTER_NEAREAST    0
+#define TRACKING_FILTER_BILINEAR    1
+#define TRACKING_FILTER_BICUBIC     2
 
 /* MovieTrackingReconstruction->flag */
-#define TRACKING_RECONSTRUCTED	(1<<0)
+#define TRACKING_RECONSTRUCTED  (1 << 0)
 
 /* MovieTrackingObject->flag */
-#define TRACKING_OBJECT_CAMERA		(1<<0)
-
-#define TRACKING_CLEAN_SELECT			0
-#define TRACKING_CLEAN_DELETE_TRACK		1
-#define TRACKING_CLEAN_DELETE_SEGMENT	2
+#define TRACKING_OBJECT_CAMERA      (1 << 0)
+
+#define TRACKING_CLEAN_SELECT           0
+#define TRACKING_CLEAN_DELETE_TRACK     1
+#define TRACKING_CLEAN_DELETE_SEGMENT   2
+
+/* MovieTrackingDopesheet->sort_method */
+#define TRACKING_DOPE_SORT_NAME          0
+#define TRACKING_DOPE_SORT_LONGEST       1
+#define TRACKING_DOPE_SORT_TOTAL         2
+#define TRACKING_DOPE_SORT_AVERAGE_ERROR 3
+
+/* MovieTrackingDopesheet->flag */
+#define TRACKING_DOPE_SORT_INVERSE    (1 << 0)
+#define TRACKING_DOPE_SELECTED_ONLY   (1 << 1)
+#define TRACKING_DOPE_SHOW_HIDDEN     (1 << 2)
 
 #endif
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index b0874eefa4a..1c2844cd8a7 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -236,8 +236,8 @@ typedef struct ThemeSpace {
 	char syntaxl[4], syntaxn[4], syntaxb[4]; // syntax for textwindow and nodes
 	char syntaxv[4], syntaxc[4];
 	
-	char movie[4], movieclip[4], image[4], scene[4], audio[4];		// for sequence editor
-	char effect[4], plugin[4], transition[4], meta[4];
+	char movie[4], movieclip[4], mask[4], image[4], scene[4], audio[4];		// for sequence editor
+	char effect[4], hpad0[4], transition[4], meta[4];
 	char editmesh_active[4]; 
 
 	char handle_vertex[4];
@@ -249,7 +249,7 @@ typedef struct ThemeSpace {
 	char bundle_solid[4];
 	char path_before[4], path_after[4];
 	char camera_path[4];
-	char hpad[7];
+	char hpad[3];
 	
 	char preview_back[4];
 	char preview_stitch_face[4];
@@ -263,8 +263,19 @@ typedef struct ThemeSpace {
 	char selected_highlight[4];	/* outliner - selected item */
 
 	char skin_root[4]; /* Skin modifier root color */
-
+	
 	int pad4;
+	
+	/* NLA */
+	char anim_active[4];	 /* Active Action + Summary Channel */
+	char anim_non_active[4]; /* Active Action = NULL */
+	
+	char nla_tweaking[4];   /* NLA 'Tweaking' action/strip */
+	char nla_tweakdupli[4]; /* NLA - warning color for duplicate instances of tweaking strip */
+	
+	char nla_transition[4], nla_transition_sel[4]; /* NLA "Transition" strips */
+	char nla_meta[4], nla_meta_sel[4];             /* NLA "Meta" strips */
+	char nla_sound[4], nla_sound_sel[4];           /* NLA "Sound" strips */
 } ThemeSpace;
 
 
@@ -334,8 +345,6 @@ typedef struct UserDef {
 	char fontdir[768];
 	char renderdir[1024]; /* FILE_MAX length */
 	char textudir[768];
-	char plugtexdir[768];
-	char plugseqdir[768];
 	char pythondir[768];
 	char sounddir[768];
 	char image_editor[1024];	/* 1024 = FILE_MAX */
@@ -403,7 +412,7 @@ typedef struct UserDef {
 	
 	short widget_unit;		/* defaults to 20 for 72 DPI setting */
 	short anisotropic_filter;
-	short use_16bit_textures, pad8;
+	short use_16bit_textures, use_gpu_mipmap;
 
 	float ndof_sensitivity;	/* overall sensitivity of 3D mouse */
 	int ndof_flag;			/* flags for 3D mouse */
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index e89cc751a69..487c0d97e5e 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -311,11 +311,19 @@ typedef struct View3D {
 /* #define V3D_CALC_MANIPULATOR	4 */ /*UNUSED*/
 
 /* BGPic->flag */
-/* may want to use 1 for select ?*/
-#define V3D_BGPIC_EXPANDED		2
-#define V3D_BGPIC_CAMERACLIP	4
-#define V3D_BGPIC_DISABLED		8
-#define V3D_BGPIC_FOREGROUND		16
+/* may want to use 1 for select ? */
+enum {
+	V3D_BGPIC_EXPANDED      = (1 << 1),
+	V3D_BGPIC_CAMERACLIP    = (1 << 2),
+	V3D_BGPIC_DISABLED      = (1 << 3),
+	V3D_BGPIC_FOREGROUND    = (1 << 4),
+
+	/* Camera framing options */
+	V3D_BGPIC_CAMERA_ASPECT = (1 << 5),  /* don't stretch to fit the camera view  */
+	V3D_BGPIC_CAMERA_CROP   = (1 << 6)   /* crop out the image */
+};
+
+#define V3D_BGPIC_EXPANDED (V3D_BGPIC_EXPANDED | V3D_BGPIC_CAMERACLIP)
 
 /* BGPic->source */
 /* may want to use 1 for select ?*/
diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt
index f8169d5038a..1dd1d7e8f87 100644
--- a/source/blender/makesdna/intern/CMakeLists.txt
+++ b/source/blender/makesdna/intern/CMakeLists.txt
@@ -1,4 +1,3 @@
-# -*- mode: cmake; indent-tabs-mode: t; -*-
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c
index 231dd521f07..2498cba42ef 100644
--- a/source/blender/makesdna/intern/dna_genfile.c
+++ b/source/blender/makesdna/intern/dna_genfile.c
@@ -93,7 +93,7 @@ typedef long long __int64;
  * !!Remember to read/write integer and short aligned!!
  *
  *  While writing a file, the names of a struct is indicated with a type number,
- *  to be found with: type= findstruct_nr(SDNA *, char *)
+ *  to be found with: type = findstruct_nr(SDNA *, char *)
  *  The value of 'type' corresponds with the the index within the structs array
  *
  *  For the moment: the complete DNA file is included in a .blend file. For
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index 548e81a7fc8..b0f8f02ae9f 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -132,6 +132,7 @@ static const char *includefiles[] = {
 	"DNA_movieclip_types.h",
 	"DNA_tracking_types.h",
 	"DNA_dynamicpaint_types.h",
+	"DNA_mask_types.h",
 
 	// empty string to indicate end of includefiles
 	""
@@ -145,7 +146,7 @@ static char **names, *namedata;      /* at address names[a] is string a */
 static char **types, *typedata;      /* at address types[a] is string a */
 static short *typelens;              /* at typelens[a] is de length of type a */
 static short *alphalens;             /* contains sizes as they are calculated on the DEC Alpha (64 bits), in fact any 64bit system */
-static short **structs, *structdata; /* at sp= structs[a] is the first address of a struct definition
+static short **structs, *structdata; /* at sp = structs[a] is the first address of a struct definition
                                       * sp[0] is type number
                                       * sp[1] is amount of elements
                                       * sp[2] sp[3] is typenr,  namenr (etc) */
@@ -909,7 +910,7 @@ void printStructLengths(void)
 	printf("\n\n*** All detected structs:\n");
 
 	while (unknown) {
-		/*lastunknown= unknown;*/ /*UNUSED*/
+		/*lastunknown = unknown;*/ /*UNUSED*/
 		unknown = 0;
 		
 		/* check all structs... */
@@ -1170,7 +1171,7 @@ int main(int argc, char **argv)
 			}
 			else {
 				fprintf(file, "};\n");
-				fprintf(file, "int DNAlen= sizeof(DNAstr);\n");
+				fprintf(file, "int DNAlen = sizeof(DNAstr);\n");
 	
 				fclose(file);
 			}
@@ -1241,4 +1242,5 @@ int main(int argc, char **argv)
 #include "DNA_movieclip_types.h"
 #include "DNA_tracking_types.h"
 #include "DNA_dynamicpaint_types.h"
+#include "DNA_mask_types.h"
 /* end of list */
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index 5ecbc1fea7d..5395f9c8b34 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -145,6 +145,7 @@ extern StructRNA RNA_CompositorNodeLumaMatte;
 extern StructRNA RNA_CompositorNodeMapUV;
 extern StructRNA RNA_CompositorNodeMapValue;
 extern StructRNA RNA_CompositorNodeMath;
+extern StructRNA RNA_CompositorNodeMask;
 extern StructRNA RNA_CompositorNodeMixRGB;
 extern StructRNA RNA_CompositorNodeNormal;
 extern StructRNA RNA_CompositorNodeNormalize;
@@ -294,6 +295,7 @@ extern StructRNA RNA_Macro;
 extern StructRNA RNA_MagicTexture;
 extern StructRNA RNA_MarbleTexture;
 extern StructRNA RNA_MaskModifier;
+extern StructRNA RNA_MaskSequence;
 extern StructRNA RNA_Material;
 extern StructRNA RNA_MaterialHalo;
 extern StructRNA RNA_MaterialPhysics;
@@ -304,6 +306,8 @@ extern StructRNA RNA_MaterialStrand;
 extern StructRNA RNA_MaterialSubsurfaceScattering;
 extern StructRNA RNA_MaterialTextureSlot;
 extern StructRNA RNA_MaterialVolume;
+extern StructRNA RNA_Mask;
+extern StructRNA RNA_MaskLayer;
 extern StructRNA RNA_Menu;
 extern StructRNA RNA_Mesh;
 extern StructRNA RNA_MeshColor;
@@ -339,8 +343,10 @@ extern StructRNA RNA_MotionPathVert;
 extern StructRNA RNA_MouseSensor;
 extern StructRNA RNA_MovieSequence;
 extern StructRNA RNA_MovieClipSequence;
+extern StructRNA RNA_MovieTracking;
 extern StructRNA RNA_MovieTrackingTrack;
 extern StructRNA RNA_MovieTrackingObject;
+extern StructRNA RNA_MovieTrackingTrack;
 extern StructRNA RNA_MulticamSequence;
 extern StructRNA RNA_MultiresModifier;
 extern StructRNA RNA_MusgraveTexture;
@@ -390,8 +396,6 @@ extern StructRNA RNA_ParticleSystem;
 extern StructRNA RNA_ParticleSystemModifier;
 extern StructRNA RNA_ParticleTarget;
 extern StructRNA RNA_PivotConstraint;
-extern StructRNA RNA_PluginSequence;
-extern StructRNA RNA_PluginTexture;
 extern StructRNA RNA_PointCache;
 extern StructRNA RNA_PointDensity;
 extern StructRNA RNA_PointDensityTexture;
@@ -673,7 +677,7 @@ int RNA_struct_contains_property(PointerRNA *ptr, PropertyRNA *prop_test);
 const struct ListBase *RNA_struct_type_properties(StructRNA *srna);
 PropertyRNA *RNA_struct_type_find_property(StructRNA *srna, const char *identifier);
 
-FunctionRNA *RNA_struct_find_function(PointerRNA *ptr, const char *identifier);
+FunctionRNA *RNA_struct_find_function(StructRNA *srna, const char *identifier);
 const struct ListBase *RNA_struct_type_functions(StructRNA *srna);
 
 char *RNA_struct_name_get_alloc(PointerRNA *ptr, char *fixedbuf, int fixedlen, int *r_len);
@@ -839,14 +843,14 @@ int RNA_property_reset(PointerRNA *ptr, PropertyRNA *prop, int index);
  * UI code or Actions, though efficiency is a concern. */
 
 char *RNA_path_append(const char *path, PointerRNA *ptr, PropertyRNA *prop,
-	int intkey, const char *strkey);
+                      int intkey, const char *strkey);
 char *RNA_path_back(const char *path);
 
 int RNA_path_resolve(PointerRNA *ptr, const char *path,
-		PointerRNA *r_ptr, PropertyRNA **r_prop);
+                     PointerRNA *r_ptr, PropertyRNA **r_prop);
 
 int RNA_path_resolve_full(PointerRNA *ptr, const char *path,
-		PointerRNA *r_ptr, PropertyRNA **r_prop, int *index);
+                          PointerRNA *r_ptr, PropertyRNA **r_prop, int *index);
 
 char *RNA_path_from_ID_to_struct(PointerRNA *ptr);
 char *RNA_path_from_ID_to_property(PointerRNA *ptr, PropertyRNA *prop);
@@ -963,7 +967,7 @@ char *RNA_pointer_as_string_keywords_ex(struct bContext *C, PointerRNA *ptr, Poi
 char *RNA_pointer_as_string_keywords(struct bContext *C, PointerRNA *ptr, PointerRNA *ptr_default,
                                      const short skip_optional_value, const short all_args);
 char *RNA_function_as_string_keywords(struct bContext *C, FunctionRNA *func, PointerRNA *ptr_default,
-                                     const short as_function, const short all_args);
+                                      const short as_function, const short all_args);
 
 /* Function */
 
@@ -1002,12 +1006,12 @@ int RNA_function_call_lookup(struct bContext *C, struct ReportList *reports, Poi
 
 int RNA_function_call_direct(struct bContext *C, struct ReportList *reports, PointerRNA *ptr, FunctionRNA *func, const char *format, ...)
 #ifdef __GNUC__
-__attribute__ ((format (printf, 5, 6)))
+__attribute__ ((format(printf, 5, 6)))
 #endif
 ;
 int RNA_function_call_direct_lookup(struct bContext *C, struct ReportList *reports, PointerRNA *ptr, const char *identifier, const char *format, ...)
 #ifdef __GNUC__
-__attribute__ ((format (printf, 5, 6)))
+__attribute__ ((format(printf, 5, 6)))
 #endif
 ;
 int RNA_function_call_direct_va(struct bContext *C, struct ReportList *reports, PointerRNA *ptr, FunctionRNA *func, const char *format, va_list args);
@@ -1021,14 +1025,14 @@ StructRNA *ID_code_to_RNA_type(short idcode);
 
 /* macro which inserts the function name */
 #if defined __GNUC__ || defined __sun
-#  define RNA_warning(format, args...) _RNA_warning("%s: " format "\n", __func__, ##args)
+#  define RNA_warning(format, args ...) _RNA_warning("%s: " format "\n", __func__, ##args)
 #else
 #  define RNA_warning(format, ...) _RNA_warning("%s: " format "\n", __FUNCTION__, __VA_ARGS__)
 #endif
 
 void _RNA_warning(const char *format, ...)
 #ifdef __GNUC__
-__attribute__ ((format (printf, 1, 2)))
+__attribute__ ((format(printf, 1, 2)))
 #endif
 ;
 
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h
index d2eeaa72fed..473ab7485b0 100644
--- a/source/blender/makesrna/RNA_enum_types.h
+++ b/source/blender/makesrna/RNA_enum_types.h
@@ -144,6 +144,7 @@ EnumPropertyItem *RNA_scene_itemf(struct bContext *C, struct PointerRNA *ptr, st
 EnumPropertyItem *RNA_scene_local_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, int *free);
 EnumPropertyItem *RNA_movieclip_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, int *free);
 EnumPropertyItem *RNA_movieclip_local_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, int *free);
-
+EnumPropertyItem *RNA_mask_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, int *free);
+EnumPropertyItem *RNA_mask_local_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, int *free);
 
 #endif /* __RNA_ENUM_TYPES_H__ */
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript
index 2bafc586a58..29910121e2a 100644
--- a/source/blender/makesrna/SConscript
+++ b/source/blender/makesrna/SConscript
@@ -11,12 +11,15 @@ incs += ' ../windowmanager ../editors/include ../gpu ../imbuf ../ikplugin ../ble
 incs += ' ../render/extern/include #/intern/cycles/blender'
 incs += ' ../nodes'
 incs += ' #/extern/glew/include'
+incs += ' #/intern/smoke/extern'
 
 incs += ' ../bmesh'
 
-
 defs = []
 
+if env['WITH_BF_SMOKE']:
+    defs.append('WITH_SMOKE')
+
 if env['WITH_BF_OPENEXR']:
     defs.append('WITH_OPENEXR')
 
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 6f8e7656a83..82c0757456d 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -1,4 +1,3 @@
-# -*- mode: cmake; indent-tabs-mode: t; -*-
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
@@ -56,6 +55,7 @@ set(DEFSRC
 	rna_lamp.c
 	rna_lattice.c
 	rna_main.c
+	rna_mask.c
 	rna_material.c
 	rna_mesh.c
 	rna_meta.c
@@ -209,6 +209,10 @@ if(WITH_FFTW3)
 	add_definitions(-DWITH_FFTW3)
 endif()
 
+if(WITH_MOD_SMOKE)
+	add_definitions(-DWITH_SMOKE)
+endif()
+
 if(WITH_MOD_OCEANSIM)
 	add_definitions(-DWITH_OCEANSIM)
 endif()
@@ -253,6 +257,7 @@ blender_include_dirs(
 	../../../../intern/cycles/blender
 	../../../../intern/guardedalloc
 	../../../../intern/memutil
+	../../../../intern/smoke/extern
 )
 
 blender_include_dirs_sys(
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript
index 99fab18b4bf..d26de50fae0 100644
--- a/source/blender/makesrna/intern/SConscript
+++ b/source/blender/makesrna/intern/SConscript
@@ -35,7 +35,11 @@ incs += ' ../../windowmanager ../../editors/include ../../blenfont'
 incs += ' ../../render/extern/include ../../bmesh'
 incs += ' #/intern/audaspace/intern #/intern/cycles/blender'
 incs += ' #/extern/glew/include '
+incs += ' #/intern/smoke/extern'
 
+if env['WITH_BF_SMOKE']:
+    defs.append('WITH_SMOKE')
+    
 if env['WITH_BF_OPENEXR']:
     defs.append('WITH_OPENEXR')
 
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index 9fa4d73cead..9cab08cbc34 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -627,31 +627,31 @@ static char *rna_def_property_get_func(FILE *f, StructRNA *srna, PropertyRNA *pr
 
 					if (dp->dnaarraylength == 1) {
 						if (prop->type == PROP_BOOLEAN && dp->booleanbit) {
-							fprintf(f, "		values[i]= %s((data->%s & (%d<<i)) != 0);\n",
+							fprintf(f, "		values[i] = %s((data->%s & (%d<<i)) != 0);\n",
 							        (dp->booleannegative) ? "!" : "", dp->dnaname, dp->booleanbit);
 						}
 						else {
-							fprintf(f, "		values[i]= (%s)%s((&data->%s)[i]);\n",
+							fprintf(f, "		values[i] = (%s)%s((&data->%s)[i]);\n",
 							        rna_type_type(prop), (dp->booleannegative) ? "!" : "", dp->dnaname);
 						}
 					}
 					else {
 						if (prop->type == PROP_BOOLEAN && dp->booleanbit) {
-							fprintf(f, "		values[i]= %s((data->%s[i] & ", (dp->booleannegative) ? "!" : "",
+							fprintf(f, "		values[i] = %s((data->%s[i] & ", (dp->booleannegative) ? "!" : "",
 							        dp->dnaname);
 							rna_int_print(f, dp->booleanbit);
 							fprintf(f, ") != 0);\n");
 						}
 						else if (rna_color_quantize(prop, dp)) {
-							fprintf(f, "		values[i]= (%s)(data->%s[i]*(1.0f/255.0f));\n",
+							fprintf(f, "		values[i] = (%s)(data->%s[i]*(1.0f/255.0f));\n",
 							        rna_type_type(prop), dp->dnaname);
 						}
 						else if (dp->dnatype) {
-							fprintf(f, "		values[i]= (%s)%s(((%s*)data->%s)[i]);\n",
+							fprintf(f, "		values[i] = (%s)%s(((%s*)data->%s)[i]);\n",
 							        rna_type_type(prop), (dp->booleannegative) ? "!" : "", dp->dnatype, dp->dnaname);
 						}
 						else {
-							fprintf(f, "		values[i]= (%s)%s((data->%s)[i]);\n",
+							fprintf(f, "		values[i] = (%s)%s((data->%s)[i]);\n",
 							        rna_type_type(prop), (dp->booleannegative) ? "!" : "", dp->dnaname);
 						}
 					}
@@ -839,7 +839,7 @@ static char *rna_def_property_set_func(FILE *f, StructRNA *srna, PropertyRNA *pr
 					}
 				}
 
-				fprintf(f, "	data->%s= value.data;\n", dp->dnaname);
+				fprintf(f, "	data->%s = value.data;\n", dp->dnaname);
 
 			}
 			fprintf(f, "}\n\n");
@@ -882,7 +882,7 @@ static char *rna_def_property_set_func(FILE *f, StructRNA *srna, PropertyRNA *pr
 							fprintf(f, "		else data->%s &= ~(%d<<i);\n", dp->dnaname, dp->booleanbit);
 						}
 						else {
-							fprintf(f, "		(&data->%s)[i]= %s", dp->dnaname, (dp->booleannegative) ? "!" : "");
+							fprintf(f, "		(&data->%s)[i] = %s", dp->dnaname, (dp->booleannegative) ? "!" : "");
 							rna_clamp_value(f, prop, 1);
 						}
 					}
@@ -897,14 +897,14 @@ static char *rna_def_property_set_func(FILE *f, StructRNA *srna, PropertyRNA *pr
 							fprintf(f, ";\n");
 						}
 						else if (rna_color_quantize(prop, dp)) {
-							fprintf(f, "		data->%s[i]= FTOCHAR(values[i]);\n", dp->dnaname);
+							fprintf(f, "		data->%s[i] = FTOCHAR(values[i]);\n", dp->dnaname);
 						}
 						else {
 							if (dp->dnatype)
-								fprintf(f, "		((%s*)data->%s)[i]= %s", dp->dnatype, dp->dnaname,
+								fprintf(f, "		((%s*)data->%s)[i] = %s", dp->dnatype, dp->dnaname,
 								        (dp->booleannegative) ? "!" : "");
 							else
-								fprintf(f, "		(data->%s)[i]= %s", dp->dnaname, (dp->booleannegative) ? "!" : "");
+								fprintf(f, "		(data->%s)[i] = %s", dp->dnaname, (dp->booleannegative) ? "!" : "");
 							rna_clamp_value(f, prop, 1);
 						}
 					}
@@ -937,7 +937,7 @@ static char *rna_def_property_set_func(FILE *f, StructRNA *srna, PropertyRNA *pr
 					}
 					else {
 						rna_clamp_value_range(f, prop);
-						fprintf(f, "	data->%s= %s", dp->dnaname, (dp->booleannegative) ? "!" : "");
+						fprintf(f, "	data->%s = %s", dp->dnaname, (dp->booleannegative) ? "!" : "");
 						rna_clamp_value(f, prop, 0);
 					}
 				}
@@ -1775,7 +1775,7 @@ static void rna_def_function_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA
 			else {
 				data_str = "_data";
 			}
-			fprintf(f, "\t%s= ", dparm->prop->identifier);
+			fprintf(f, "\t%s = ", dparm->prop->identifier);
 
 			if (!pout)
 				fprintf(f, "%s", valstr);
@@ -1785,13 +1785,13 @@ static void rna_def_function_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA
 		}
 
 		if (dparm->next)
-			fprintf(f, "\t_data+= %d;\n", rna_parameter_size_alloc(dparm->prop));
+			fprintf(f, "\t_data += %d;\n", rna_parameter_size_alloc(dparm->prop));
 	}
 
 	if (dfunc->call) {
 		fprintf(f, "\t\n");
 		fprintf(f, "\t");
-		if (func->c_ret) fprintf(f, "%s= ", func->c_ret->identifier);
+		if (func->c_ret) fprintf(f, "%s = ", func->c_ret->identifier);
 		fprintf(f, "%s(", dfunc->call);
 
 		first = 1;
@@ -1845,7 +1845,7 @@ static void rna_def_function_funcs(FILE *f, StructDefRNA *dsrna, FunctionDefRNA
 			dparm = rna_find_parameter_def(func->c_ret);
 			ptrstr = (((dparm->prop->type == PROP_POINTER) && !(dparm->prop->flag & PROP_RNAPTR)) ||
 			          (dparm->prop->arraydimension)) ? "*" : "";
-			fprintf(f, "\t*((%s%s%s*)_retdata)= %s;\n", rna_type_struct(dparm->prop),
+			fprintf(f, "\t*((%s%s%s*)_retdata) = %s;\n", rna_type_struct(dparm->prop),
 			        rna_parameter_type_name(dparm->prop), ptrstr, func->c_ret->identifier);
 		}
 	}
@@ -2681,6 +2681,7 @@ static RNAProcessItem PROCESS_ITEMS[] = {
 	{"rna_world.c", NULL, RNA_def_world},
 	{"rna_movieclip.c", NULL, RNA_def_movieclip},
 	{"rna_tracking.c", NULL, RNA_def_tracking},
+	{"rna_mask.c", NULL, RNA_def_mask},
 	{NULL, NULL}
 };
 
@@ -2960,12 +2961,12 @@ static void rna_generate_header_cpp(BlenderRNA *brna, FILE *f)
 
 		fprintf(f, "class %s : public %s {\n", srna->identifier, (srna->base) ? srna->base->identifier : "Pointer");
 		fprintf(f, "public:\n");
-		fprintf(f, "\t%s(const PointerRNA& ptr) :\n\t\t%s(ptr)", srna->identifier,
+		fprintf(f, "\t%s(const PointerRNA& ptr_arg) :\n\t\t%s(ptr_arg)", srna->identifier,
 		        (srna->base) ? srna->base->identifier : "Pointer");
 		for (dp = ds->cont.properties.first; dp; dp = dp->next)
 			if (!(dp->prop->flag & (PROP_IDPROPERTY | PROP_BUILTIN)))
 				if (dp->prop->type == PROP_COLLECTION)
-					fprintf(f, ",\n\t\t%s(ptr)", dp->prop->identifier);
+					fprintf(f, ",\n\t\t%s(ptr_arg)", dp->prop->identifier);
 		fprintf(f, "\n\t\t{}\n\n");
 
 		for (dp = ds->cont.properties.first; dp; dp = dp->next)
@@ -3122,7 +3123,7 @@ int main(int argc, char **argv)
 		return_status = 1;
 	}
 	else {
-		fprintf(stderr, "Running makesrna");
+		fprintf(stderr, "Running makesrna\n");
 		makesrna_path = argv[0];
 		return_status = rna_preprocess(argv[1]);
 	}
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c
index 6a54c04b44d..7f851c939d2 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -147,6 +147,7 @@ short RNA_type_to_ID_code(StructRNA *type)
 	if (RNA_struct_is_a(type, &RNA_World)) return ID_WO;
 	if (RNA_struct_is_a(type, &RNA_WindowManager)) return ID_WM;
 	if (RNA_struct_is_a(type, &RNA_MovieClip)) return ID_MC;
+	if (RNA_struct_is_a(type, &RNA_Mask)) return ID_MSK;
 
 	return 0;
 }
@@ -182,6 +183,7 @@ StructRNA *ID_code_to_RNA_type(short idcode)
 		case ID_WO: return &RNA_World;
 		case ID_WM: return &RNA_WindowManager;
 		case ID_MC: return &RNA_MovieClip;
+		case ID_MSK: return &RNA_Mask;
 		default: return &RNA_ID;
 	}
 }
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 7676f4a5866..c8ca0be8ab7 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -642,7 +642,7 @@ int RNA_struct_contains_property(PointerRNA *ptr, PropertyRNA *prop_test)
 
 	RNA_PROP_BEGIN(ptr, itemptr, iterprop)
 	{
-		/* PropertyRNA *prop= itemptr.data; */
+		/* PropertyRNA *prop = itemptr.data; */
 		if (prop_test == (PropertyRNA *)itemptr.data) {
 			found = TRUE;
 			break;
@@ -664,12 +664,12 @@ PropertyRNA *RNA_struct_type_find_property(StructRNA *srna, const char *identifi
 	return BLI_findstring_ptr(&srna->cont.properties, identifier, offsetof(PropertyRNA, identifier));
 }
 
-FunctionRNA *RNA_struct_find_function(PointerRNA *ptr, const char *identifier)
+FunctionRNA *RNA_struct_find_function(StructRNA *srna, const char *identifier)
 {
 #if 1
 	FunctionRNA *func;
 	StructRNA *type;
-	for (type = ptr->type; type; type = type->base) {
+	for (type = srna; type; type = type->base) {
 		func = (FunctionRNA *)BLI_findstring_ptr(&type->functions, identifier, offsetof(FunctionRNA, identifier));
 		if (func) {
 			return func;
@@ -683,7 +683,7 @@ FunctionRNA *RNA_struct_find_function(PointerRNA *ptr, const char *identifier)
 	PropertyRNA *iterprop;
 	FunctionRNA *func;
 
-	RNA_pointer_create(NULL, &RNA_Struct, ptr->type, &tptr);
+	RNA_pointer_create(NULL, &RNA_Struct, srna, &tptr);
 	iterprop = RNA_struct_find_property(&tptr, "functions");
 
 	func = NULL;
@@ -1519,7 +1519,7 @@ void RNA_property_update_main(Main *bmain, Scene *scene, PointerRNA *ptr, Proper
  *
  * The cache is structured with a dual-layer structure
  * - L1 = PointerRNA used as key; id.data is used (it should always be defined,
- *		 and most updates end up using just that anyways)
+ *        and most updates end up using just that anyways)
  * - L2 = Update functions to be called on those PointerRNA's
  */
 
@@ -2561,7 +2561,7 @@ void RNA_property_pointer_set(PointerRNA *ptr, PropertyRNA *prop, PointerRNA ptr
 
 	BLI_assert(RNA_property_type(prop) == PROP_POINTER);
 
-	if ((/*idprop=*/ rna_idproperty_check(&prop, ptr))) {
+	if ((/*idprop = */ rna_idproperty_check(&prop, ptr))) {
 		/* not supported */
 		/* rna_idproperty_touch(idprop); */
 	}
@@ -2579,7 +2579,7 @@ void RNA_property_pointer_set(PointerRNA *ptr, PropertyRNA *prop, PointerRNA ptr
 
 PointerRNA RNA_property_pointer_get_default(PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop))
 {
-	/*PointerPropertyRNA *pprop= (PointerPropertyRNA*)prop; */
+	/*PointerPropertyRNA *pprop = (PointerPropertyRNA*)prop; */
 
 	/* BLI_assert(RNA_property_type(prop) == PROP_POINTER); */
 
@@ -2718,7 +2718,7 @@ int RNA_property_collection_length(PointerRNA *ptr, PropertyRNA *prop)
 void RNA_property_collection_add(PointerRNA *ptr, PropertyRNA *prop, PointerRNA *r_ptr)
 {
 	IDProperty *idprop;
-/*	CollectionPropertyRNA *cprop= (CollectionPropertyRNA*)prop; */
+/*	CollectionPropertyRNA *cprop = (CollectionPropertyRNA*)prop; */
 
 	BLI_assert(RNA_property_type(prop) == PROP_COLLECTION);
 
@@ -2777,7 +2777,7 @@ void RNA_property_collection_add(PointerRNA *ptr, PropertyRNA *prop, PointerRNA
 int RNA_property_collection_remove(PointerRNA *ptr, PropertyRNA *prop, int key)
 {
 	IDProperty *idprop;
-/*	CollectionPropertyRNA *cprop= (CollectionPropertyRNA*)prop; */
+/*	CollectionPropertyRNA *cprop = (CollectionPropertyRNA*)prop; */
 
 	BLI_assert(RNA_property_type(prop) == PROP_COLLECTION);
 
@@ -3031,7 +3031,7 @@ int RNA_property_collection_raw_array(PointerRNA *ptr, PropertyRNA *prop, Proper
 		case PROP_RAW_DOUBLE: var = (dtype)((double*)raw.array)[a]; break;    \
 		default: var = (dtype)0;                                              \
 	}                                                                         \
-}
+} (void)0
 
 #define RAW_SET(dtype, raw, a, var)                                           \
 {                                                                             \
@@ -3043,7 +3043,7 @@ int RNA_property_collection_raw_array(PointerRNA *ptr, PropertyRNA *prop, Proper
 		case PROP_RAW_DOUBLE: ((double*)raw.array)[a] = (double)var; break;   \
 		default: break;                                                       \
 	}                                                                         \
-}
+} (void)0
 
 int RNA_raw_type_sizeof(RawPropertyType type)
 {
@@ -5132,7 +5132,7 @@ int RNA_function_call_lookup(bContext *C, ReportList *reports, PointerRNA *ptr,
 {
 	FunctionRNA *func;
 
-	func = RNA_struct_find_function(ptr, identifier);
+	func = RNA_struct_find_function(ptr->type, identifier);
 
 	if (func)
 		return RNA_function_call(C, reports, ptr, func, parms);
@@ -5160,7 +5160,7 @@ int RNA_function_call_direct_lookup(bContext *C, ReportList *reports, PointerRNA
 {
 	FunctionRNA *func;
 
-	func = RNA_struct_find_function(ptr, identifier);
+	func = RNA_struct_find_function(ptr->type, identifier);
 
 	if (func) {
 		va_list args;
@@ -5535,7 +5535,7 @@ int RNA_function_call_direct_va_lookup(bContext *C, ReportList *reports, Pointer
 {
 	FunctionRNA *func;
 
-	func = RNA_struct_find_function(ptr, identifier);
+	func = RNA_struct_find_function(ptr->type, identifier);
 
 	if (func)
 		return RNA_function_call_direct_va(C, reports, ptr, func, format, args);
diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c
index b63109ed137..00a257ab4f9 100644
--- a/source/blender/makesrna/intern/rna_action.c
+++ b/source/blender/makesrna/intern/rna_action.c
@@ -104,12 +104,12 @@ static FCurve *rna_Action_fcurve_new(bAction *act, ReportList *reports, const ch
 	}
 
 	/* annoying, check if this exists */
-	if (verify_fcurve(act, group, data_path, index, 0)) {
+	if (verify_fcurve(act, group, NULL, data_path, index, 0)) {
 		BKE_reportf(reports, RPT_ERROR, "F-Curve '%s[%d]' already exists in action '%s'", data_path,
 		            index, act->id.name + 2);
 		return NULL;
 	}
-	return verify_fcurve(act, group, data_path, index, 1);
+	return verify_fcurve(act, group, NULL, data_path, index, 1);
 }
 
 static void rna_Action_fcurve_remove(bAction *act, ReportList *reports, FCurve *fcu)
diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c
index f3742687fc5..b86077ff1bd 100644
--- a/source/blender/makesrna/intern/rna_armature.c
+++ b/source/blender/makesrna/intern/rna_armature.c
@@ -131,9 +131,10 @@ static void rna_Armature_update_layers(Main *bmain, Scene *UNUSED(scene), Pointe
 
 	/* proxy lib exception, store it here so we can restore layers on file
 	 * load, since it would otherwise get lost due to being linked data */
-	for (ob = bmain->object.first; ob; ob = ob->id.next)
+	for (ob = bmain->object.first; ob; ob = ob->id.next) {
 		if (ob->data == arm && ob->pose)
 			ob->pose->proxy_layer = arm->layer;
+	}
 
 	WM_main_add_notifier(NC_GEOM | ND_DATA, arm);
 }
@@ -141,7 +142,35 @@ static void rna_Armature_update_layers(Main *bmain, Scene *UNUSED(scene), Pointe
 static void rna_Armature_redraw_data(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
 	ID *id = ptr->id.data;
+	
+	WM_main_add_notifier(NC_GEOM | ND_DATA, id);
+}
 
+static void rna_Bone_select_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
+{
+	ID *id = ptr->id.data;
+	
+	/* special updates for cases where rigs try to hook into armature drawing stuff 
+	 * e.g. Mask Modifier - 'Armature' option
+	 */
+	if (id) {
+		if (GS(id->name) == ID_AR) {
+			bArmature *arm = (bArmature *)id;
+			
+			if (arm->flag & ARM_HAS_VIZ_DEPS) {
+				DAG_id_tag_update(id, OB_RECALC_DATA);
+			}
+		}
+		else if (GS(id->name) == ID_OB) {
+			Object *ob = (Object *)id;
+			bArmature *arm = (bArmature *)ob->data;
+			
+			if (arm->flag & ARM_HAS_VIZ_DEPS) {
+				DAG_id_tag_update(id, OB_RECALC_DATA);
+			}
+		}
+	}
+	
 	WM_main_add_notifier(NC_GEOM | ND_DATA, id);
 }
 
@@ -608,8 +637,8 @@ static void rna_def_bone(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", BONE_SELECTED);
 	RNA_def_property_ui_text(prop, "Select", "");
-	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
-	RNA_def_property_update(prop, 0, "rna_Armature_redraw_data");
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); /* XXX: review whether this could be used for interesting effects... */
+	RNA_def_property_update(prop, 0, "rna_Bone_select_update");
 	
 	prop = RNA_def_property(srna, "select_head", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", BONE_ROOTSEL);
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c
index d14675b77c8..e96ed4f38d3 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -173,8 +173,8 @@ static int rna_SculptCapabilities_has_random_texture_angle_get(PointerRNA *ptr)
 {
 	Brush *br = (Brush *)ptr->data;
 	return (ELEM(br->mtex.brush_map_mode,
-				 MTEX_MAP_MODE_VIEW,
-				 MTEX_MAP_MODE_AREA) &&
+	             MTEX_MAP_MODE_VIEW,
+	             MTEX_MAP_MODE_AREA) &&
 	        !(br->flag & BRUSH_ANCHORED) &&
 	        !ELEM4(br->sculpt_tool,
 	               SCULPT_TOOL_GRAB, SCULPT_TOOL_ROTATE,
@@ -236,17 +236,17 @@ static int rna_SculptCapabilities_has_texture_angle_get(PointerRNA *ptr)
 {
 	Brush *br = (Brush *)ptr->data;
 	return ELEM3(br->mtex.brush_map_mode,
-				 MTEX_MAP_MODE_VIEW,
-				 MTEX_MAP_MODE_AREA,
-				 MTEX_MAP_MODE_TILED);
+	             MTEX_MAP_MODE_VIEW,
+	             MTEX_MAP_MODE_AREA,
+	             MTEX_MAP_MODE_TILED);
 }
 
 static int rna_SculptCapabilities_has_texture_angle_source_get(PointerRNA *ptr)
 {
 	Brush *br = (Brush *)ptr->data;
 	return ELEM(br->mtex.brush_map_mode,
-				MTEX_MAP_MODE_VIEW,
-				MTEX_MAP_MODE_AREA);
+	            MTEX_MAP_MODE_VIEW,
+	            MTEX_MAP_MODE_AREA);
 }
 
 static PointerRNA rna_Brush_sculpt_capabilities_get(PointerRNA *ptr)
diff --git a/source/blender/makesrna/intern/rna_cloth.c b/source/blender/makesrna/intern/rna_cloth.c
index 37795edb884..3b4f87d8b95 100644
--- a/source/blender/makesrna/intern/rna_cloth.c
+++ b/source/blender/makesrna/intern/rna_cloth.c
@@ -155,6 +155,25 @@ static void rna_ClothSettings_bend_vgroup_set(PointerRNA *ptr, const char *value
 	rna_object_vgroup_name_index_set(ptr, value, &sim->vgroup_bend);
 }
 
+
+static void rna_CollSettings_selfcol_vgroup_get(PointerRNA *ptr, char *value)
+{
+	ClothCollSettings *coll = (ClothCollSettings *)ptr->data;
+	rna_object_vgroup_name_index_get(ptr, value, coll->vgroup_selfcol);
+}
+
+static int rna_CollSettings_selfcol_vgroup_length(PointerRNA *ptr)
+{
+	ClothCollSettings *coll = (ClothCollSettings *)ptr->data;
+	return rna_object_vgroup_name_index_length(ptr, coll->vgroup_selfcol);
+}
+
+static void rna_CollSettings_selfcol_vgroup_set(PointerRNA *ptr, const char *value)
+{
+	ClothCollSettings *coll = (ClothCollSettings *)ptr->data;
+	rna_object_vgroup_name_index_set(ptr, value, &coll->vgroup_selfcol);
+}
+
 static PointerRNA rna_ClothSettings_rest_shape_key_get(PointerRNA *ptr)
 {
 	Object *ob = (Object *)ptr->id.data;
@@ -523,6 +542,13 @@ static void rna_def_cloth_collision_settings(BlenderRNA *brna)
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Collision Group", "Limit colliders to this Group");
 	RNA_def_property_update(prop, 0, "rna_cloth_update");
+
+	prop = RNA_def_property(srna, "vertex_group_self_collisions", PROP_STRING, PROP_NONE);
+	RNA_def_property_string_funcs(prop, "rna_CollSettings_selfcol_vgroup_get", "rna_CollSettings_selfcol_vgroup_length",
+	                              "rna_CollSettings_selfcol_vgroup_set");
+	RNA_def_property_ui_text(prop, "Selfcollision Vertex Group",
+	                         "Vertex group to define vertices which are not used during self collisions");
+	RNA_def_property_update(prop, 0, "rna_cloth_update");
 }
 
 void RNA_def_cloth(BlenderRNA *brna)
diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c
index 381d0f46c28..ecdfe1505c8 100644
--- a/source/blender/makesrna/intern/rna_color.c
+++ b/source/blender/makesrna/intern/rna_color.c
@@ -179,7 +179,7 @@ static char *rna_ColorRampElement_path(PointerRNA *ptr)
 			MEM_freeN(texture_path);                                          \
 		}                                                                     \
 	}                                                                         \
-}
+} (void)0
 
 	/* determine the path from the ID-block to the ramp */
 	/* FIXME: this is a very slow way to do it, but it will have to suffice... */
@@ -570,14 +570,15 @@ static void rna_def_histogram(BlenderRNA *brna)
 	PropertyRNA *prop;
 	
 	static EnumPropertyItem prop_mode_items[] = {
-		{HISTO_MODE_LUMA, "LUMA", ICON_COLOR, "Luma", ""},
-		{HISTO_MODE_RGB, "RGB", ICON_COLOR, "Red Green Blue", ""},
-		{HISTO_MODE_R, "R", ICON_COLOR, "Red", ""},
-		{HISTO_MODE_G, "G", ICON_COLOR, "Green", ""},
-		{HISTO_MODE_B, "B", ICON_COLOR, "Blue", ""},
+		{HISTO_MODE_LUMA, "LUMA", 0, "Luma", "Luma"},
+		{HISTO_MODE_RGB, "RGB", 0, "RGB", "Red Green Blue"},
+		{HISTO_MODE_R, "R", 0, "R", "Red"},
+		{HISTO_MODE_G, "G", 0, "G", "Green"},
+		{HISTO_MODE_B, "B", 0, "B", "Blue"},
+		{HISTO_MODE_ALPHA, "A", 0, "A", "Alpha"},
 		{0, NULL, 0, NULL, NULL}
 	};
-		
+
 	srna = RNA_def_struct(brna, "Histogram", NULL);
 	RNA_def_struct_ui_text(srna, "Histogram", "Statistical view of the levels of color in an image");
 	
@@ -585,7 +586,11 @@ static void rna_def_histogram(BlenderRNA *brna)
 	RNA_def_property_enum_sdna(prop, NULL, "mode");
 	RNA_def_property_enum_items(prop, prop_mode_items);
 	RNA_def_property_ui_text(prop, "Mode", "Channels to display when drawing the histogram");
-	
+
+	prop = RNA_def_property(srna, "show_line", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", HISTO_FLAG_LINE);
+	RNA_def_property_ui_text(prop, "Show Line", "Display lines rather then filled shapes");
+	RNA_def_property_ui_icon(prop, ICON_IPO, 0);
 }
 
 static void rna_def_scopes(BlenderRNA *brna)
diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c
index e1f1ab97726..ae8b0c51544 100644
--- a/source/blender/makesrna/intern/rna_constraint.c
+++ b/source/blender/makesrna/intern/rna_constraint.c
@@ -44,6 +44,7 @@
 #include "ED_object.h"
 #include "WM_types.h"
 
+/* please keep the names in sync with constraint.c */
 EnumPropertyItem constraint_type_items[] = {
 	{0, "", 0, N_("Motion Tracking"), ""},
 	{CONSTRAINT_TYPE_CAMERASOLVER, "CAMERA_SOLVER", ICON_CONSTRAINT_DATA, "Camera Solver", ""},
@@ -1110,6 +1111,13 @@ static void rna_def_constraint_action(BlenderRNA *brna)
 	RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_REFCOUNT);
 	RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update");
 
+	prop = RNA_def_property(srna, "use_bone_object_action", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", ACTCON_BONE_USE_OBJECT_ACTION);
+	RNA_def_property_ui_text(prop, "Object Action",
+	                         "Bones only: apply the object's transformation channels of the action "
+	                         "to the constrained bone, instead of bone's channels");
+	RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update");
+
 	prop = RNA_def_property(srna, "frame_start", PROP_INT, PROP_TIME);
 	RNA_def_property_int_sdna(prop, NULL, "start");
 	RNA_def_property_range(prop, MINAFRAME, MAXFRAME);
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c
index 09cbf8bd90a..02d8cbef4a3 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -29,6 +29,7 @@
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 #include <ctype.h>
 
@@ -38,6 +39,7 @@
 #include "DNA_sdna_types.h"
 
 #include "BLI_utildefines.h"
+#include "BLI_listbase.h"
 #include "BLI_ghash.h"
 
 #include "RNA_define.h"
@@ -64,7 +66,7 @@ BlenderDefRNA DefRNA = {NULL, {NULL, NULL}, {NULL, NULL}, NULL, 0, 0, 0, 1};
 			fprintf(stderr, "%s: '%s' '%s' description ends with a '.' !\n",  \
 			        __func__, id1 ? id1 : "", id2 ? id2 : "");                \
 		}                                                                     \
-	}                                                                         \
+	} (void)0
 
 #else
 #  define DESCR_CHECK(description, id1, id2)
@@ -2631,6 +2633,11 @@ FunctionRNA *RNA_def_function(StructRNA *srna, const char *identifier, const cha
 	FunctionRNA *func;
 	FunctionDefRNA *dfunc;
 
+	if (BLI_findstring_ptr(&srna->functions, identifier, offsetof(FunctionRNA, identifier))) {
+		fprintf(stderr, "%s: %s.%s already defined.\n", __func__, srna->identifier, identifier);
+		return NULL;
+	}
+
 	func = rna_def_function(srna, identifier);
 
 	if (!DefRNA.preprocess) {
diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c
index b022da97630..03e446c9d91 100644
--- a/source/blender/makesrna/intern/rna_image.c
+++ b/source/blender/makesrna/intern/rna_image.c
@@ -53,6 +53,7 @@ static EnumPropertyItem image_source_items[] = {
 
 #ifdef RNA_RUNTIME
 
+#include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
 static void rna_Image_animated_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
@@ -287,6 +288,15 @@ static int rna_Image_depth_get(PointerRNA *ptr)
 	return planes;
 }
 
+static int rna_Image_frame_duration_get(PointerRNA *ptr)
+{
+	Image *im = (Image *)ptr->data;
+
+	if (im->anim)
+		return IMB_anim_get_duration(im->anim, IMB_TC_RECORD_RUN);
+	return 1;
+}
+
 static int rna_Image_pixels_get_length(PointerRNA *ptr, int length[RNA_MAX_ARRAY_DIMENSION])
 {
 	Image *ima = ptr->id.data;
@@ -629,6 +639,11 @@ static void rna_def_image(BlenderRNA *brna)
 	prop = RNA_def_float_vector(srna, "resolution", 2, NULL, 0, 0, "Resolution", "X/Y pixels per meter", 0, 0);
 	RNA_def_property_float_funcs(prop, "rna_Image_resolution_get", "rna_Image_resolution_set", NULL);
 
+	prop = RNA_def_property(srna, "frame_duration", PROP_INT, PROP_UNSIGNED);
+	RNA_def_property_int_funcs(prop, "rna_Image_frame_duration_get", NULL, NULL);
+	RNA_def_property_ui_text(prop, "Duration", "Duration (in frames) of the image (1 when not a video/sequence)");
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+
 	prop = RNA_def_property(srna, "pixels", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_flag(prop, PROP_DYNAMIC);
 	RNA_def_property_multi_array(prop, 1, NULL);
diff --git a/source/blender/makesrna/intern/rna_image_api.c b/source/blender/makesrna/intern/rna_image_api.c
index cf19002f44e..14d01444681 100644
--- a/source/blender/makesrna/intern/rna_image_api.c
+++ b/source/blender/makesrna/intern/rna_image_api.c
@@ -207,6 +207,9 @@ static int rna_Image_gl_load(Image *image, ReportList *reports, int filter, int
 		error = (int)gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, ibuf->x, ibuf->y, GL_RGBA, GL_UNSIGNED_BYTE, ibuf->rect);
 
 	if (!error) {
+		/* clean glError buffer */
+		while (glGetError() != GL_NO_ERROR) {}
+
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, image->tpageflag & IMA_CLAMP_U ? GL_CLAMP : GL_REPEAT);
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, image->tpageflag & IMA_CLAMP_V ? GL_CLAMP : GL_REPEAT);
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, (GLint)filter);
@@ -232,7 +235,7 @@ static int rna_Image_gl_touch(Image *image, ReportList *reports, int filter, int
 	BKE_image_tag_time(image);
 
 	if (*bind == 0)
-		error = rna_Image_gl_load(image, reports, GL_LINEAR_MIPMAP_NEAREST, GL_LINEAR);
+		error = rna_Image_gl_load(image, reports, filter, mag);
 
 	return error;
 }
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h
index cb90211eff9..e8e40d307fb 100644
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@ -179,6 +179,7 @@ void RNA_def_wm(struct BlenderRNA *brna);
 void RNA_def_world(struct BlenderRNA *brna);
 void RNA_def_movieclip(struct BlenderRNA *brna);
 void RNA_def_tracking(struct BlenderRNA *brna);
+void RNA_def_mask(struct BlenderRNA *brna);
 
 /* Common Define functions */
 
@@ -301,6 +302,7 @@ void RNA_def_main_actions(BlenderRNA *brna, PropertyRNA *cprop);
 void RNA_def_main_particles(BlenderRNA *brna, PropertyRNA *cprop);
 void RNA_def_main_gpencil(BlenderRNA *brna, PropertyRNA *cprop);
 void RNA_def_main_movieclips(BlenderRNA *brna, PropertyRNA *cprop);
+void RNA_def_main_masks(BlenderRNA *brna, PropertyRNA *cprop);
 
 /* ID Properties */
 
diff --git a/source/blender/makesrna/intern/rna_lamp.c b/source/blender/makesrna/intern/rna_lamp.c
index fdad91165c4..9d63e0e687d 100644
--- a/source/blender/makesrna/intern/rna_lamp.c
+++ b/source/blender/makesrna/intern/rna_lamp.c
@@ -180,7 +180,7 @@ static void rna_Lamp_use_nodes_update(Main *blain, Scene *scene, PointerRNA *ptr
 }
 
 #else
-
+/* Don't define icons here, so they don't show up in the Lamp UI (properties Editor) - DingTo */
 EnumPropertyItem lamp_type_items[] = {
 	{LA_LOCAL, "POINT", 0, "Point", "Omnidirectional point light source"},
 	{LA_SUN, "SUN", 0, "Sun", "Constant direction parallel ray light source"},
diff --git a/source/blender/makesrna/intern/rna_main.c b/source/blender/makesrna/intern/rna_main.c
index b0981c19835..6ac032e5d99 100644
--- a/source/blender/makesrna/intern/rna_main.c
+++ b/source/blender/makesrna/intern/rna_main.c
@@ -253,6 +253,12 @@ static void rna_Main_movieclips_begin(CollectionPropertyIterator *iter, PointerR
 	rna_iterator_listbase_begin(iter, &bmain->movieclip, NULL);
 }
 
+static void rna_Main_masks_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
+{
+	Main *bmain= (Main*)ptr->data;
+	rna_iterator_listbase_begin(iter, &bmain->mask, NULL);
+}
+
 #ifdef UNIT_TEST
 
 static PointerRNA rna_Test_test_get(PointerRNA *ptr)
@@ -316,6 +322,7 @@ void RNA_def_main(BlenderRNA *brna)
 		{"particles", "ParticleSettings", "rna_Main_particle_begin", "Particles", "Particle datablocks", RNA_def_main_particles},
 		{"grease_pencil", "GreasePencil", "rna_Main_gpencil_begin", "Grease Pencil", "Grease Pencil datablocks", RNA_def_main_gpencil},
 		{"movieclips", "MovieClip", "rna_Main_movieclips_begin", "Movie Clips", "Movie Clip datablocks", RNA_def_main_movieclips},
+		{"masks", "Mask", "rna_Main_masks_begin", "Masks", "Masks datablocks", RNA_def_main_masks},
 		{NULL, NULL, NULL, NULL, NULL, NULL}
 	};
 
diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c
index 024265c3d18..98b3c0ab9f4 100644
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@ -33,6 +33,8 @@
 #include <stdio.h>
 #include <errno.h>
 
+#include "DNA_ID.h"
+
 #include "RNA_define.h"
 #include "RNA_access.h"
 #include "RNA_enum_types.h"
@@ -67,6 +69,7 @@
 #include "BKE_depsgraph.h"
 #include "BKE_speaker.h"
 #include "BKE_movieclip.h"
+#include "BKE_mask.h"
 
 #include "DNA_armature_types.h"
 #include "DNA_camera_types.h"
@@ -87,6 +90,7 @@
 #include "DNA_vfont_types.h"
 #include "DNA_node_types.h"
 #include "DNA_movieclip_types.h"
+#include "DNA_mask_types.h"
 
 #include "ED_screen.h"
 
@@ -539,6 +543,22 @@ void rna_Main_movieclips_remove(Main *bmain, MovieClip *clip)
 	/* XXX python now has invalid pointer? */
 }
 
+Mask *rna_Main_mask_new(Main *UNUSED(bmain), const char *name)
+{
+	Mask *mask;
+
+	mask = BKE_mask_new("Mask");
+
+	return mask;
+}
+
+void rna_Main_masks_remove(Main *bmain, Mask *mask)
+{
+	BKE_mask_unlink(bmain, mask);
+	BKE_libblock_free(&bmain->mask, mask);
+	/* XXX python now has invalid pointer? */
+}
+
 /* tag functions, all the same */
 void rna_Main_cameras_tag(Main *bmain, int value) { tag_main_lb(&bmain->camera, value); }
 void rna_Main_scenes_tag(Main *bmain, int value) { tag_main_lb(&bmain->scene, value); }
@@ -569,6 +589,7 @@ void rna_Main_actions_tag(Main *bmain, int value) { tag_main_lb(&bmain->action,
 void rna_Main_particles_tag(Main *bmain, int value) { tag_main_lb(&bmain->particle, value); }
 void rna_Main_gpencil_tag(Main *bmain, int value) { tag_main_lb(&bmain->gpencil, value); }
 void rna_Main_movieclips_tag(Main *bmain, int value) { tag_main_lb(&bmain->movieclip, value); }
+void rna_Main_masks_tag(Main *bmain, int value) { tag_main_lb(&bmain->mask, value); }
 
 static int rna_Main_cameras_is_updated_get(PointerRNA *ptr) { return DAG_id_type_tagged(ptr->data, ID_CA); }
 static int rna_Main_scenes_is_updated_get(PointerRNA *ptr) { return DAG_id_type_tagged(ptr->data, ID_SCE); }
@@ -1520,4 +1541,34 @@ void RNA_def_main_movieclips(BlenderRNA *brna, PropertyRNA *cprop)
 	RNA_def_function_return(func, parm);
 }
 
+void RNA_def_main_masks(BlenderRNA *brna, PropertyRNA *cprop)
+{
+	StructRNA *srna;
+	FunctionRNA *func;
+	PropertyRNA *parm;
+
+	RNA_def_property_srna(cprop, "BlendDataMasks");
+	srna= RNA_def_struct(brna, "BlendDataMasks", NULL);
+	RNA_def_struct_sdna(srna, "Main");
+	RNA_def_struct_ui_text(srna, "Main Masks", "Collection of masks");
+
+	func= RNA_def_function(srna, "tag", "rna_Main_masks_tag");
+	parm= RNA_def_boolean(func, "value", 0, "Value", "");
+	RNA_def_property_flag(parm, PROP_REQUIRED);
+
+	/* new func */
+	func = RNA_def_function(srna, "new", "rna_Main_mask_new");
+	RNA_def_function_ui_description(func, "Add a new mask with a given name to the main database");
+	parm = RNA_def_string_file_path(func, "name", "", MAX_ID_NAME - 2, "Mask", "Name of new mask datablock");
+	/* return type */
+	parm = RNA_def_pointer(func, "mask", "Mask", "", "New mask datablock");
+	RNA_def_function_return(func, parm);
+
+	/* remove func */
+	func= RNA_def_function(srna, "remove", "rna_Main_masks_remove");
+	RNA_def_function_ui_description(func, "Remove a masks from the current blendfile.");
+	parm= RNA_def_pointer(func, "mask", "Mask", "", "Mask to remove");
+	RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL);
+}
+
 #endif
diff --git a/source/blender/makesrna/intern/rna_mask.c b/source/blender/makesrna/intern/rna_mask.c
new file mode 100644
index 00000000000..dfcbbe0653b
--- /dev/null
+++ b/source/blender/makesrna/intern/rna_mask.c
@@ -0,0 +1,697 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s): Blender Foundation,
+ *                 Sergey Sharybin
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/makesrna/intern/rna_mask.c
+ *  \ingroup RNA
+ */
+
+
+#include <stdlib.h>
+#include <limits.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "BKE_movieclip.h"
+#include "BKE_tracking.h"
+
+#include "RNA_define.h"
+
+#include "rna_internal.h"
+
+#include "DNA_mask_types.h"
+#include "DNA_object_types.h"	/* SELECT */
+#include "DNA_scene_types.h"
+
+#include "WM_types.h"
+
+#include "IMB_imbuf_types.h"
+#include "IMB_imbuf.h"
+
+#ifdef RNA_RUNTIME
+
+#include "DNA_mask_types.h"
+
+#include "BKE_depsgraph.h"
+#include "BKE_mask.h"
+
+#include "RNA_access.h"
+
+#include "WM_api.h"
+
+static void rna_Mask_update_data(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
+{
+	Mask *mask = ptr->id.data;
+
+	WM_main_add_notifier(NC_MASK|ND_DATA, mask);
+	DAG_id_tag_update( &mask->id, 0);
+}
+
+/* note: this function exists only to avoid id refcounting */
+static void rna_MaskParent_id_set(PointerRNA *ptr, PointerRNA value)
+{
+	MaskParent *mpar = (MaskParent*) ptr->data;
+
+	mpar->id = value.data;
+}
+
+static StructRNA *rna_MaskParent_id_typef(PointerRNA *ptr)
+{
+	MaskParent *mpar = (MaskParent*) ptr->data;
+
+	return ID_code_to_RNA_type(mpar->id_type);
+}
+
+static void rna_MaskParent_id_type_set(PointerRNA *ptr, int value)
+{
+	MaskParent *mpar = (MaskParent*) ptr->data;
+
+	/* change ID-type to the new type */
+	mpar->id_type = value;
+
+	/* clear the id-block if the type is invalid */
+	if ((mpar->id) && (GS(mpar->id->name) != mpar->id_type))
+		mpar->id = NULL;
+}
+
+static void rna_Mask_layers_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
+{
+	Mask *mask = (Mask *)ptr->id.data;
+
+	rna_iterator_listbase_begin(iter, &mask->masklayers, NULL);
+}
+
+static int rna_Mask_layer_active_index_get(PointerRNA *ptr)
+{
+	Mask *mask = (Mask *)ptr->id.data;
+
+	return mask->masklay_act;
+}
+
+static void rna_Mask_layer_active_index_set(PointerRNA *ptr, int value)
+{
+	Mask *mask = (Mask *)ptr->id.data;
+
+	mask->masklay_act = value;
+}
+
+static void rna_Mask_layer_active_index_range(PointerRNA *ptr, int *min, int *max, int *softmin, int *softmax)
+{
+	Mask *mask = (Mask *)ptr->id.data;
+
+	*min = 0;
+	*max = mask->masklay_tot - 1;
+	*max = MAX2(0, *max);
+
+	*softmin = *min;
+	*softmax = *max;
+}
+
+static char *rna_MaskLayer_path(PointerRNA *ptr)
+{
+	return BLI_sprintfN("layers[\"%s\"]", ((MaskLayer *)ptr->data)->name);
+}
+
+static PointerRNA rna_Mask_layer_active_get(PointerRNA *ptr)
+{
+	Mask *mask = (Mask *)ptr->id.data;
+	MaskLayer *masklay = BKE_mask_layer_active(mask);
+
+	return rna_pointer_inherit_refine(ptr, &RNA_MaskLayer, masklay);
+}
+
+static void rna_Mask_layer_active_set(PointerRNA *ptr, PointerRNA value)
+{
+	Mask *mask = (Mask *)ptr->id.data;
+	MaskLayer *masklay = (MaskLayer *)value.data;
+
+	BKE_mask_layer_active_set(mask, masklay);
+}
+
+static void rna_MaskLayer_splines_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
+{
+	MaskLayer *masklay = (MaskLayer *)ptr->data;
+
+	rna_iterator_listbase_begin(iter, &masklay->splines, NULL);
+}
+
+void rna_MaskLayer_name_set(PointerRNA *ptr, const char *value)
+{
+	Mask *mask = (Mask *)ptr->id.data;
+	MaskLayer *masklay = (MaskLayer *)ptr->data;
+
+	BLI_strncpy(masklay->name, value, sizeof(masklay->name));
+
+	BKE_mask_layer_unique_name(mask, masklay);
+}
+
+static PointerRNA rna_MaskLayer_active_spline_get(PointerRNA *ptr)
+{
+	MaskLayer *masklay = (MaskLayer *)ptr->data;
+
+	return rna_pointer_inherit_refine(ptr, &RNA_MaskSpline, masklay->act_spline);
+}
+
+static void rna_MaskLayer_active_spline_set(PointerRNA *ptr, PointerRNA value)
+{
+	MaskLayer *masklay = (MaskLayer *)ptr->data;
+	MaskSpline *spline = (MaskSpline *)value.data;
+	int index = BLI_findindex(&masklay->splines, spline);
+
+	if (index >= 0)
+		masklay->act_spline = spline;
+	else
+		masklay->act_spline = NULL;
+}
+
+static PointerRNA rna_MaskLayer_active_spline_point_get(PointerRNA *ptr)
+{
+	MaskLayer *masklay = (MaskLayer *)ptr->data;
+
+	return rna_pointer_inherit_refine(ptr, &RNA_MaskSplinePoint, masklay->act_point);
+}
+
+static void rna_MaskLayer_active_spline_point_set(PointerRNA *ptr, PointerRNA value)
+{
+	MaskLayer *masklay = (MaskLayer *)ptr->data;
+	MaskSpline *spline;
+	MaskSplinePoint *point = (MaskSplinePoint *)value.data;
+
+	masklay->act_point = NULL;
+
+	for (spline = masklay->splines.first; spline; spline = spline->next) {
+		if (point >= spline->points && point < spline->points + spline->tot_point) {
+			masklay->act_point = point;
+
+			break;
+		}
+	}
+}
+
+static void rna_MaskSplinePoint_handle1_get(PointerRNA *ptr, float *values)
+{
+	MaskSplinePoint *point = (MaskSplinePoint*) ptr->data;
+	BezTriple *bezt = &point->bezt;
+
+	values[0] = bezt->vec[0][0];
+	values[1] = bezt->vec[0][1];
+	values[2] = bezt->vec[0][2];
+}
+
+static void rna_MaskSplinePoint_handle1_set(PointerRNA *ptr, const float *values)
+{
+	MaskSplinePoint *point = (MaskSplinePoint*) ptr->data;
+	BezTriple *bezt = &point->bezt;
+
+	bezt->vec[0][0] = values[0];
+	bezt->vec[0][1] = values[1];
+	bezt->vec[0][2] = values[2];
+}
+
+static void rna_MaskSplinePoint_handle2_get(PointerRNA *ptr, float *values)
+{
+	MaskSplinePoint *point = (MaskSplinePoint*) ptr->data;
+	BezTriple *bezt = &point->bezt;
+
+	values[0] = bezt->vec[2][0];
+	values[1] = bezt->vec[2][1];
+	values[2] = bezt->vec[2][2];
+}
+
+static void rna_MaskSplinePoint_handle2_set(PointerRNA *ptr, const float *values)
+{
+	MaskSplinePoint *point = (MaskSplinePoint*) ptr->data;
+	BezTriple *bezt = &point->bezt;
+
+	bezt->vec[2][0] = values[0];
+	bezt->vec[2][1] = values[1];
+	bezt->vec[2][2] = values[2];
+}
+
+static void rna_MaskSplinePoint_ctrlpoint_get(PointerRNA *ptr, float *values)
+{
+	MaskSplinePoint *point = (MaskSplinePoint*) ptr->data;
+	BezTriple *bezt = &point->bezt;
+
+	values[0] = bezt->vec[1][0];
+	values[1] = bezt->vec[1][1];
+	values[2] = bezt->vec[1][2];
+}
+
+static void rna_MaskSplinePoint_ctrlpoint_set(PointerRNA *ptr, const float *values)
+{
+	MaskSplinePoint *point = (MaskSplinePoint*) ptr->data;
+	BezTriple *bezt = &point->bezt;
+
+	bezt->vec[1][0] = values[0];
+	bezt->vec[1][1] = values[1];
+	bezt->vec[1][2] = values[2];
+}
+
+static int rna_MaskSplinePoint_handle_type_get(PointerRNA *ptr)
+{
+	MaskSplinePoint *point = (MaskSplinePoint*) ptr->data;
+	BezTriple *bezt = &point->bezt;
+
+	return bezt->h1;
+}
+
+static void rna_MaskSplinePoint_handle_type_set(PointerRNA *ptr, int value)
+{
+	MaskSplinePoint *point = (MaskSplinePoint*) ptr->data;
+	BezTriple *bezt = &point->bezt;
+
+	bezt->h1 = bezt->h2 = value;
+}
+
+/* ** API **  */
+
+static MaskLayer *rna_Mask_layer_new(Mask *mask, const char *name)
+{
+	MaskLayer *masklay = BKE_mask_layer_new(mask, name);
+
+	WM_main_add_notifier(NC_MASK|NA_EDITED, mask);
+
+	return masklay;
+}
+
+void rna_Mask_layer_remove(Mask *mask, MaskLayer *masklay)
+{
+	BKE_mask_layer_remove(mask, masklay);
+
+	WM_main_add_notifier(NC_MASK|NA_EDITED, mask);
+}
+
+static void rna_MaskLayer_spline_add(ID *id, MaskLayer *masklay, int number)
+{
+	Mask *mask = (Mask*) id;
+	int i;
+
+	for (i = 0; i < number; i++)
+		BKE_mask_spline_add(masklay);
+
+	WM_main_add_notifier(NC_MASK|NA_EDITED, mask);
+}
+
+static void rna_Mask_start_frame_set(PointerRNA *ptr, int value)
+{
+	Mask *data = (Mask *)ptr->data;
+	/* MINFRAME not MINAFRAME, since some output formats can't taken negative frames */
+	CLAMP(value, MINFRAME, MAXFRAME);
+	data->sfra = value;
+
+	if (data->sfra >= data->efra) {
+		data->efra = MIN2(data->sfra, MAXFRAME);
+	}
+}
+
+static void rna_Mask_end_frame_set(PointerRNA *ptr, int value)
+{
+	Mask *data = (Mask *)ptr->data;
+	CLAMP(value, MINFRAME, MAXFRAME);
+	data->efra = value;
+
+	if (data->sfra >= data->efra) {
+		data->sfra = MAX2(data->efra, MINFRAME);
+	}
+}
+
+#else
+
+static void rna_def_maskParent(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	static EnumPropertyItem mask_id_type_items[] = {
+		{ID_MC, "MOVIECLIP", ICON_SEQUENCE, "Movie Clip", ""},
+		{0, NULL, 0, NULL, NULL}};
+
+	srna = RNA_def_struct(brna, "MaskParent", NULL);
+	RNA_def_struct_ui_text(srna, "Mask Parent", "Parenting settings for masking element");
+
+	/* Target Properties - ID-block to Drive */
+	prop = RNA_def_property(srna, "id", PROP_POINTER, PROP_NONE);
+	RNA_def_property_struct_type(prop, "ID");
+	RNA_def_property_flag(prop, PROP_EDITABLE);
+	// RNA_def_property_editable_func(prop, "rna_maskSpline_id_editable");
+	/* note: custom set function is ONLY to avoid rna setting a user for this. */
+	RNA_def_property_pointer_funcs(prop, NULL, "rna_MaskParent_id_set", "rna_MaskParent_id_typef", NULL);
+	RNA_def_property_ui_text(prop, "ID", "ID-block to which masking element would be parented to or to it's property");
+	RNA_def_property_update(prop, 0, "rna_Mask_update_data");
+
+	prop = RNA_def_property(srna, "id_type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "id_type");
+	RNA_def_property_enum_items(prop, mask_id_type_items);
+	RNA_def_property_enum_default(prop, ID_MC);
+	RNA_def_property_enum_funcs(prop, NULL, "rna_MaskParent_id_type_set", NULL);
+	//RNA_def_property_editable_func(prop, "rna_MaskParent_id_type_editable");
+	RNA_def_property_ui_text(prop, "ID Type", "Type of ID-block that can be used");
+	RNA_def_property_update(prop, 0, "rna_Mask_update_data");
+
+	/* parent */
+	prop = RNA_def_property(srna, "parent", PROP_STRING, PROP_NONE);
+	RNA_def_property_ui_text(prop, "Parent", "Name of parent object in specified data block to which parenting happens");
+	RNA_def_property_string_maxlength(prop, MAX_ID_NAME - 2);
+	RNA_def_property_update(prop, 0, "rna_Mask_update_data");
+
+	/* sub_parent */
+	prop = RNA_def_property(srna, "sub_parent", PROP_STRING, PROP_NONE);
+	RNA_def_property_ui_text(prop, "Sub Parent", "Name of parent sub-object in specified data block to which parenting happens");
+	RNA_def_property_string_maxlength(prop, MAX_ID_NAME - 2);
+	RNA_def_property_update(prop, 0, "rna_Mask_update_data");
+}
+
+static void rna_def_maskSplinePointUW(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	srna = RNA_def_struct(brna, "MaskSplinePointUW", NULL);
+	RNA_def_struct_ui_text(srna, "Mask Spline UW Point", "Single point in spline segment defining feather");
+
+	/* u */
+	prop = RNA_def_property(srna, "u", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "u");
+	RNA_def_property_range(prop, 0.0, 1.0);
+	RNA_def_property_ui_text(prop, "U", "U coordinate of point along spline segment");
+	RNA_def_property_update(prop, 0, "rna_Mask_update_data");
+
+	/* weight */
+	prop = RNA_def_property(srna, "weight", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "w");
+	RNA_def_property_range(prop, 0.0, 1.0);
+	RNA_def_property_ui_text(prop, "Weight", "Weight of feather point");
+	RNA_def_property_update(prop, 0, "rna_Mask_update_data");
+
+	/* select */
+	prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", SELECT);
+	RNA_def_property_ui_text(prop, "Select", "Selection status");
+	RNA_def_property_update(prop, 0, "rna_Mask_update_data");
+}
+
+static void rna_def_maskSplinePoint(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	static EnumPropertyItem handle_type_items[] = {
+		{HD_AUTO, "AUTO", 0, "Auto", ""},
+		{HD_VECT, "VECTOR", 0, "Vector", ""},
+		{HD_ALIGN, "ALIGNED", 0, "Aligned", ""},
+		{0, NULL, 0, NULL, NULL}};
+
+	rna_def_maskSplinePointUW(brna);
+
+	srna = RNA_def_struct(brna, "MaskSplinePoint", NULL);
+	RNA_def_struct_ui_text(srna, "Mask Spline Point", "Single point in spline used for defining mask");
+
+	/* Vector values */
+	prop = RNA_def_property(srna, "handle_left", PROP_FLOAT, PROP_TRANSLATION);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_float_funcs(prop, "rna_MaskSplinePoint_handle1_get", "rna_MaskSplinePoint_handle1_set", NULL);
+	RNA_def_property_ui_text(prop, "Handle 1", "Coordinates of the first handle");
+	RNA_def_property_update(prop, 0, "rna_Mask_update_data");
+
+	prop = RNA_def_property(srna, "co", PROP_FLOAT, PROP_TRANSLATION);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_float_funcs(prop, "rna_MaskSplinePoint_ctrlpoint_get", "rna_MaskSplinePoint_ctrlpoint_set", NULL);
+	RNA_def_property_ui_text(prop, "Control Point", "Coordinates of the control point");
+	RNA_def_property_update(prop, 0, "rna_Mask_update_data");
+
+	prop = RNA_def_property(srna, "handle_right", PROP_FLOAT, PROP_TRANSLATION);
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_float_funcs(prop, "rna_MaskSplinePoint_handle2_get", "rna_MaskSplinePoint_handle2_set", NULL);
+	RNA_def_property_ui_text(prop, "Handle 2", "Coordinates of the second handle");
+	RNA_def_property_update(prop, 0, "rna_Mask_update_data");
+
+	/* handle_type */
+	prop = RNA_def_property(srna, "handle_type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_funcs(prop, "rna_MaskSplinePoint_handle_type_get", "rna_MaskSplinePoint_handle_type_set", NULL);
+	RNA_def_property_enum_items(prop, handle_type_items);
+	RNA_def_property_ui_text(prop, "Handle Type", "Handle type");
+	RNA_def_property_update(prop, 0, "rna_Mask_update_data");
+
+	/* select */
+	prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "bezt.f1", SELECT);
+	RNA_def_property_ui_text(prop, "Select", "Selection status");
+	RNA_def_property_update(prop, 0, "rna_Mask_update_data");
+
+	/* parent */
+	prop = RNA_def_property(srna, "parent", PROP_POINTER, PROP_NONE);
+	RNA_def_property_struct_type(prop, "MaskParent");
+
+	/* feather points */
+	prop = RNA_def_property(srna, "feather_points", PROP_COLLECTION, PROP_NONE);
+	RNA_def_property_struct_type(prop, "MaskSplinePointUW");
+	RNA_def_property_collection_sdna(prop, NULL, "uw", "tot_uw");
+	RNA_def_property_ui_text(prop, "Feather Points", "Points defining feather");
+}
+
+static void rna_def_mask_splines(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	FunctionRNA *func;
+	PropertyRNA *prop;
+
+	srna = RNA_def_struct(brna, "MaskSplines", NULL);
+	RNA_def_struct_sdna(srna, "MaskLayer");
+	RNA_def_struct_ui_text(srna, "Mask Splines", "Collection of masking splines");
+
+	func = RNA_def_function(srna, "add", "rna_MaskLayer_spline_add");
+	RNA_def_function_flag(func, FUNC_USE_SELF_ID);
+	RNA_def_function_ui_description(func, "Add a number of splines to mask layer");
+	RNA_def_int(func, "count", 1, 0, INT_MAX, "Number", "Number of splines to add to the layer", 0, INT_MAX);
+
+	/* active spline */
+	prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE);
+	RNA_def_property_struct_type(prop, "MaskSpline");
+	RNA_def_property_pointer_funcs(prop, "rna_MaskLayer_active_spline_get", "rna_MaskLayer_active_spline_set", NULL, NULL);
+	RNA_def_property_flag(prop, PROP_EDITABLE|PROP_NEVER_UNLINK);
+	RNA_def_property_ui_text(prop, "Active Spline", "Active spline of masking layer");
+
+	/* active point */
+	prop = RNA_def_property(srna, "active_point", PROP_POINTER, PROP_NONE);
+	RNA_def_property_struct_type(prop, "MaskSplinePoint");
+	RNA_def_property_pointer_funcs(prop, "rna_MaskLayer_active_spline_point_get", "rna_MaskLayer_active_spline_point_set", NULL, NULL);
+	RNA_def_property_flag(prop, PROP_EDITABLE|PROP_NEVER_UNLINK);
+	RNA_def_property_ui_text(prop, "Active Spline", "Active spline of masking layer");
+}
+
+static void rna_def_maskSpline(BlenderRNA *brna)
+{
+	static EnumPropertyItem spline_interpolation_items[] = {
+		{MASK_SPLINE_INTERP_LINEAR, "LINEAR", 0, "Linear", ""},
+		{MASK_SPLINE_INTERP_EASE, "EASE", 0, "Ease", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	rna_def_maskSplinePoint(brna);
+
+	srna = RNA_def_struct(brna, "MaskSpline", NULL);
+	RNA_def_struct_ui_text(srna, "Mask spline", "Single spline used for defining mask shape");
+
+	/* weight interpolation */
+	prop = RNA_def_property(srna, "weight_interpolation", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "weight_interp");
+	RNA_def_property_enum_items(prop, spline_interpolation_items);
+	RNA_def_property_ui_text(prop, "Weight Interpolation", "The type of weight interpolation for spline");
+	RNA_def_property_update(prop, 0, "rna_Mask_update_data");
+
+	/* cyclic */
+	prop = RNA_def_property(srna, "use_cyclic", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", MASK_SPLINE_CYCLIC);
+	RNA_def_property_ui_text(prop, "Cyclic", "Make this spline a closed loop");
+	RNA_def_property_update(prop, 0, "rna_Mask_update_data");
+}
+
+static void rna_def_mask_layer(BlenderRNA *brna)
+{
+	static EnumPropertyItem masklay_blend_mode_items[] = {
+		{MASK_BLEND_ADD, "ADD", 0, "Add", ""},
+		{MASK_BLEND_SUBTRACT, "SUBTRACT", 0, "Subtract", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	rna_def_maskSpline(brna);
+	rna_def_mask_splines(brna);
+
+	srna = RNA_def_struct(brna, "MaskLayer", NULL);
+	RNA_def_struct_ui_text(srna, "Mask Layer", "Single layer used for masking pixels");
+	RNA_def_struct_path_func(srna, "rna_MaskLayer_path");
+
+	/* name */
+	prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
+	RNA_def_property_ui_text(prop, "Name", "Unique name of layer");
+	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_MaskLayer_name_set");
+	RNA_def_property_string_maxlength(prop, MAX_ID_NAME - 2);
+	RNA_def_property_update(prop, 0, "rna_Mask_update_data");
+	RNA_def_struct_name_property(srna, prop);
+
+	/* splines */
+	prop = RNA_def_property(srna, "splines", PROP_COLLECTION, PROP_NONE);
+	RNA_def_property_collection_funcs(prop, "rna_MaskLayer_splines_begin", "rna_iterator_listbase_next", "rna_iterator_listbase_end", "rna_iterator_listbase_get", 0, 0, 0, 0);
+	RNA_def_property_struct_type(prop, "MaskSpline");
+	RNA_def_property_ui_text(prop, "Splines", "Collection of splines which defines this layer");
+	RNA_def_property_srna(prop, "MaskSplines");
+
+	/* restrict */
+	prop = RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "restrictflag", MASK_RESTRICT_VIEW);
+	RNA_def_property_ui_text(prop, "Restrict View", "Restrict visibility in the viewport");
+	RNA_def_property_ui_icon(prop, ICON_RESTRICT_VIEW_OFF, 1);
+	RNA_def_property_update(prop, NC_MASK | ND_DRAW, NULL);
+
+	prop = RNA_def_property(srna, "hide_select", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "restrictflag", MASK_RESTRICT_SELECT);
+	RNA_def_property_ui_text(prop, "Restrict Select", "Restrict selection in the viewport");
+	RNA_def_property_ui_icon(prop, ICON_RESTRICT_SELECT_OFF, 1);
+	RNA_def_property_update(prop, NC_MASK | ND_DRAW, NULL);
+
+	prop = RNA_def_property(srna, "hide_render", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "restrictflag", MASK_RESTRICT_RENDER);
+	RNA_def_property_ui_text(prop, "Restrict Render", "Restrict renderability");
+	RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1);
+	RNA_def_property_update(prop, NC_MASK | NA_EDITED, NULL);
+
+	/* select (for dopesheet)*/
+	prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", MASK_LAYERFLAG_SELECT);
+	RNA_def_property_ui_text(prop, "Select", "Layer is selected for editing in the DopeSheet");
+//	RNA_def_property_update(prop, NC_SCREEN | ND_MASK, NULL);
+
+	/* render settings */
+	prop = RNA_def_property(srna, "alpha", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "alpha");
+	RNA_def_property_range(prop, 0.0, 1.0f);
+	RNA_def_property_ui_text(prop, "Opacity", "Render Opacity");
+	RNA_def_property_update(prop, NC_MASK | NA_EDITED, NULL);
+
+	/* weight interpolation */
+	prop = RNA_def_property(srna, "blend", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "blend");
+	RNA_def_property_enum_items(prop, masklay_blend_mode_items);
+	RNA_def_property_ui_text(prop, "Blend", "Method of blending mask layers");
+	RNA_def_property_update(prop, 0, "rna_Mask_update_data");
+	RNA_def_property_update(prop, NC_MASK | NA_EDITED, NULL);
+
+	prop = RNA_def_property(srna, "invert", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "blend_flag", MASK_BLENDFLAG_INVERT);
+	RNA_def_property_ui_text(prop, "Restrict View", "Invert the mask black/white");
+	RNA_def_property_update(prop, NC_MASK | NA_EDITED, NULL);
+
+}
+
+static void rna_def_masklayers(BlenderRNA *brna, PropertyRNA *cprop)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	FunctionRNA *func;
+	PropertyRNA *parm;
+
+	RNA_def_property_srna(cprop, "MaskLayers");
+	srna = RNA_def_struct(brna, "MaskLayers", NULL);
+	RNA_def_struct_sdna(srna, "Mask");
+	RNA_def_struct_ui_text(srna, "Mask Layers", "Collection of layers used by mask");
+
+	func = RNA_def_function(srna, "new", "rna_Mask_layer_new");
+	RNA_def_function_ui_description(func, "Add layer to this mask");
+	RNA_def_string(func, "name", "", 0, "Name", "Name of new layer");
+	parm = RNA_def_pointer(func, "layer", "MaskLayer", "", "New mask layer");
+	RNA_def_function_return(func, parm);
+
+	func = RNA_def_function(srna, "remove", "rna_Mask_layer_remove");
+	RNA_def_function_ui_description(func, "Remove layer from this mask");
+	RNA_def_pointer(func, "layer", "MaskLayer", "", "Shape to be removed");
+
+	/* active layer */
+	prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE);
+	RNA_def_property_struct_type(prop, "MaskLayer");
+	RNA_def_property_pointer_funcs(prop, "rna_Mask_layer_active_get", "rna_Mask_layer_active_set", NULL, NULL);
+	RNA_def_property_flag(prop, PROP_EDITABLE|PROP_NEVER_UNLINK);
+	RNA_def_property_ui_text(prop, "Active Shape", "Active layer in this mask");
+}
+
+static void rna_def_mask(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	rna_def_mask_layer(brna);
+
+	srna = RNA_def_struct(brna, "Mask", "ID");
+	RNA_def_struct_ui_text(srna, "Mask", "Mask datablock defining mask for compositing");
+	RNA_def_struct_ui_icon(srna, ICON_MOD_MASK);
+
+	/* mask layers */
+	prop = RNA_def_property(srna, "layers", PROP_COLLECTION, PROP_NONE);
+	RNA_def_property_collection_funcs(prop, "rna_Mask_layers_begin", "rna_iterator_listbase_next", "rna_iterator_listbase_end", "rna_iterator_listbase_get", 0, 0, 0, 0);
+	RNA_def_property_struct_type(prop, "MaskLayer");
+	RNA_def_property_ui_text(prop, "Layers", "Collection of layers which defines this mask");
+	rna_def_masklayers(brna, prop);
+
+	/* active masklay index */
+	prop = RNA_def_property(srna, "active_layer_index", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "masklay_act");
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_int_funcs(prop, "rna_Mask_layer_active_index_get", "rna_Mask_layer_active_index_set", "rna_Mask_layer_active_index_range");
+	RNA_def_property_ui_text(prop, "Active Shape Index", "Index of active layer in list of all mask's layers");
+	RNA_def_property_update(prop, NC_MASK | ND_DRAW, NULL);
+
+	/* frame range */
+	prop = RNA_def_property(srna, "frame_start", PROP_INT, PROP_TIME);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_int_sdna(prop, NULL, "sfra");
+	RNA_def_property_int_funcs(prop, NULL, "rna_Mask_start_frame_set", NULL);
+	RNA_def_property_range(prop, MINFRAME, MAXFRAME);
+	RNA_def_property_ui_text(prop, "Start Frame", "First frame of the mask (used for sequencer)");
+	RNA_def_property_update(prop, NC_SCENE | ND_FRAME_RANGE, NULL);
+
+	prop = RNA_def_property(srna, "frame_end", PROP_INT, PROP_TIME);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_int_sdna(prop, NULL, "efra");
+	RNA_def_property_int_funcs(prop, NULL, "rna_Mask_end_frame_set", NULL);
+	RNA_def_property_range(prop, MINFRAME, MAXFRAME);
+	RNA_def_property_ui_text(prop, "End Frame", "Final frame of the mask (used for sequencer)");
+	RNA_def_property_update(prop, NC_SCENE | ND_FRAME_RANGE, NULL);
+
+	/* pointers */
+	rna_def_animdata_common(srna);
+}
+
+void RNA_def_mask(BlenderRNA *brna)
+{
+	rna_def_maskParent(brna);
+	rna_def_mask(brna);
+}
+
+#endif
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index 7eb0bdf75df..7daa0d97834 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -1061,7 +1061,7 @@ static char *rna_VertexGroupElement_path(PointerRNA *ptr)
 	for (a = 0, dvert = me->dvert; a < me->totvert; a++, dvert++)
 		for (b = 0; b < dvert->totweight; b++)
 			if (dw == &dvert->dw[b])
-				return BLI_sprintfN("verts[%d].groups[%d]", a, b);
+				return BLI_sprintfN("vertices[%d].groups[%d]", a, b);
 
 	return NULL;
 }
@@ -1703,6 +1703,12 @@ static void rna_def_mloopuv(BlenderRNA *brna)
 	                                  "rna_iterator_array_end", "rna_iterator_array_get",
 	                                  "rna_MeshUVLoopLayer_data_length", NULL, NULL, NULL);
 
+	prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
+	RNA_def_struct_name_property(srna, prop);
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Name", "Name of UV map");
+	RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
+
 	srna = RNA_def_struct(brna, "MeshUVLoop", NULL);
 	RNA_def_struct_sdna(srna, "MLoopUV");
 	RNA_def_struct_path_func(srna, "rna_MeshUVLoop_path");
@@ -2152,7 +2158,7 @@ void rna_def_texmat_common(StructRNA *srna, const char *texspace_editable)
 
 	prop = RNA_def_property(srna, "texspace_location", PROP_FLOAT, PROP_TRANSLATION);
 	RNA_def_property_float_sdna(prop, NULL, "loc");
-	RNA_def_property_ui_text(prop, "Texure Space Location", "Texture space location");
+	RNA_def_property_ui_text(prop, "Texture Space Location", "Texture space location");
 	RNA_def_property_float_funcs(prop, "rna_Mesh_texspace_loc_get", NULL, NULL);
 	RNA_def_property_editable_func(prop, texspace_editable);
 	RNA_def_property_update(prop, 0, "rna_Mesh_update_draw");
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 659c04015df..e9b3faa2c86 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -477,6 +477,15 @@ static void rna_WeightVGModifier_mask_uvlayer_set(PointerRNA *ptr, const char *v
 	}
 }
 
+static void rna_MultiresModifier_type_set(PointerRNA *ptr, int value)
+{
+	Object *ob = (Object *)ptr->id.data;
+	MultiresModifierData *mmd = (MultiresModifierData *)ptr->data;
+
+	multires_force_update(ob);
+	mmd->simple = value;
+}
+
 static void rna_MultiresModifier_level_range(PointerRNA *ptr, int *min, int *max, int *softmin, int *softmax)
 {
 	MultiresModifierData *mmd = (MultiresModifierData *)ptr->data;
@@ -739,7 +748,7 @@ static void rna_BevelModifier_angle_limit_set(PointerRNA *ptr, float value)
 
 #else
 
-static void rna_def_property_subdivision_common(StructRNA *srna, const char type[])
+static PropertyRNA *rna_def_property_subdivision_common(StructRNA *srna, const char type[])
 {
 	static EnumPropertyItem prop_subdivision_type_items[] = {
 		{0, "CATMULL_CLARK", 0, "Catmull-Clark", ""},
@@ -752,6 +761,8 @@ static void rna_def_property_subdivision_common(StructRNA *srna, const char type
 	RNA_def_property_enum_items(prop, prop_subdivision_type_items);
 	RNA_def_property_ui_text(prop, "Subdivision Type", "Select type of subdivision algorithm");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
+
+	return prop;
 }
 
 static void rna_def_modifier_subsurf(BlenderRNA *brna)
@@ -901,7 +912,8 @@ static void rna_def_modifier_multires(BlenderRNA *brna)
 	RNA_def_struct_sdna(srna, "MultiresModifierData");
 	RNA_def_struct_ui_icon(srna, ICON_MOD_MULTIRES);
 
-	rna_def_property_subdivision_common(srna, "simple");
+	prop = rna_def_property_subdivision_common(srna, "simple");
+	RNA_def_property_enum_funcs(prop, NULL, "rna_MultiresModifier_type_set", NULL);
 
 	prop = RNA_def_property(srna, "levels", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_int_sdna(prop, NULL, "lvl");
@@ -2438,12 +2450,12 @@ static void rna_def_modifier_simpledeform(BlenderRNA *brna)
 
 	prop = RNA_def_property(srna, "lock_x", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "axis", MOD_SIMPLEDEFORM_LOCK_AXIS_X);
-	RNA_def_property_ui_text(prop, "Lock X Axis", "Do not allow tapering along the X axis");
+	RNA_def_property_ui_text(prop, "Lock X Axis", "Do not allow deformation along the X axis");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop = RNA_def_property(srna, "lock_y", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "axis", MOD_SIMPLEDEFORM_LOCK_AXIS_Y);
-	RNA_def_property_ui_text(prop, "Lock Y Axis", "Do not allow tapering along the Y axis");
+	RNA_def_property_ui_text(prop, "Lock Y Axis", "Do not allow deformation along the Y axis");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
@@ -2553,8 +2565,11 @@ static void rna_def_modifier_solidify(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SOLIDIFY_VGROUP_INV);
 	RNA_def_property_ui_text(prop, "Vertex Group Invert", "Invert the vertex group influence");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
-	
-	
+
+	prop = RNA_def_property(srna, "use_flip_normals", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SOLIDIFY_FLIP);
+	RNA_def_property_ui_text(prop, "Flip Normals", "Invert the face direction");
+	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
 static void rna_def_modifier_screw(BlenderRNA *brna)
@@ -2636,7 +2651,7 @@ static void rna_def_modifier_screw(BlenderRNA *brna)
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 #if 0
-	prop= RNA_def_property(srna, "use_angle_object", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use_angle_object", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SCREW_OBJECT_ANGLE);
 	RNA_def_property_ui_text(prop, "Object Angle", "Use the angle between the objects rather than the fixed angle");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
@@ -3204,7 +3219,7 @@ static void rna_def_modifier_skin(BlenderRNA *brna)
 	StructRNA *srna;
 	PropertyRNA *prop;
 
-	srna= RNA_def_struct(brna, "SkinModifier", "Modifier");
+	srna = RNA_def_struct(brna, "SkinModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "Skin Modifier", "Generate Skin");
 	RNA_def_struct_sdna(srna, "SkinModifierData");
 	RNA_def_struct_ui_icon(srna, ICON_MOD_SKIN);
diff --git a/source/blender/makesrna/intern/rna_movieclip.c b/source/blender/makesrna/intern/rna_movieclip.c
index 2cbe6946485..2a12fa8b116 100644
--- a/source/blender/makesrna/intern/rna_movieclip.c
+++ b/source/blender/makesrna/intern/rna_movieclip.c
@@ -284,6 +284,19 @@ static void rna_def_movieclip(BlenderRNA *brna)
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_struct_type(prop, "GreasePencil");
 	RNA_def_property_ui_text(prop, "Grease Pencil", "Grease pencil data for this movie clip");
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
+
+	/* start_frame */
+	prop = RNA_def_property(srna, "start_frame", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "start_frame");
+	RNA_def_property_ui_text(prop, "Start Frame", "Global scene frame number at which this movie starts playing. Affects all data associated with a clip");
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, "rna_MovieClip_reload_update");
+
+	/* frame_offset */
+	prop = RNA_def_property(srna, "frame_offset", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "frame_offset");
+	RNA_def_property_ui_text(prop, "Frame Offset", "Offset of footage first frame relative to it's file name. Affects only how footage is loaing, not changes data associated with a clip");
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, "rna_MovieClip_reload_update");
 }
 
 void RNA_def_movieclip(BlenderRNA *brna)
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 8b7e7f7a5d9..906f9cf5b1c 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -58,9 +58,9 @@
 #include "MEM_guardedalloc.h"
 
 EnumPropertyItem nodetree_type_items[] = {
-	{NTREE_SHADER,		"SHADER",		ICON_MATERIAL,		"Shader",		"Shader nodes"	},
-	{NTREE_TEXTURE,		"TEXTURE",		ICON_TEXTURE,		"Texture",		"Texture nodes"		},
-	{NTREE_COMPOSIT,	"COMPOSITING",	ICON_RENDERLAYERS,	"Compositing",	"Compositing nodes"	},
+	{NTREE_SHADER,      "SHADER",       ICON_MATERIAL,      "Shader",       "Shader nodes"},
+	{NTREE_TEXTURE,     "TEXTURE",      ICON_TEXTURE,       "Texture",      "Texture nodes"},
+	{NTREE_COMPOSIT,    "COMPOSITING",  ICON_RENDERLAYERS,  "Compositing",  "Compositing nodes"},
 	{0, NULL, 0, NULL, NULL}
 };
 
@@ -68,7 +68,18 @@ EnumPropertyItem node_quality_items[] = {
 	{NTREE_QUALITY_HIGH,   "HIGH",     0,    "High",     "High quality"},
 	{NTREE_QUALITY_MEDIUM, "MEDIUM",   0,    "Medium",   "Medium quality"},
 	{NTREE_QUALITY_LOW,    "LOW",      0,    "Low",      "Low quality"},
-	{0, NULL, 0, NULL, NULL}};
+	{0, NULL, 0, NULL, NULL}
+};
+
+EnumPropertyItem node_chunksize_items[] = {
+    {NTREE_CHUNCKSIZE_32,   "32",     0,    "32x32",     "Chunksize of 32x32"},
+    {NTREE_CHUNCKSIZE_64,   "64",     0,    "64x64",     "Chunksize of 64x64"},
+    {NTREE_CHUNCKSIZE_128,   "128",     0,    "128x128",     "Chunksize of 128x128"},
+    {NTREE_CHUNCKSIZE_256,   "256",     0,    "256x256",     "Chunksize of 256x256"},
+    {NTREE_CHUNCKSIZE_512,   "512",     0,    "512x512",     "Chunksize of 512x512"},
+    {NTREE_CHUNCKSIZE_1024,   "1024",     0,    "1024x1024",     "Chunksize of 1024x1024"},
+	{0, NULL, 0, NULL, NULL}
+};
 
 EnumPropertyItem node_socket_type_items[] = {
 	{SOCK_FLOAT,   "VALUE",     0,    "Value",     ""},
@@ -78,7 +89,8 @@ EnumPropertyItem node_socket_type_items[] = {
 	{SOCK_BOOLEAN, "BOOLEAN",   0,    "Boolean",   ""},
 	{SOCK_MESH,    "MESH",      0,    "Mesh",      ""},
 	{SOCK_INT,     "INT",       0,    "Int",       ""},
-	{0, NULL, 0, NULL, NULL}};
+	{0, NULL, 0, NULL, NULL}
+};
 
 EnumPropertyItem node_math_items[] = {
 	{ 0, "ADD",          0, "Add",          ""},
@@ -98,7 +110,8 @@ EnumPropertyItem node_math_items[] = {
 	{14, "ROUND",        0, "Round",        ""},
 	{15, "LESS_THAN",    0, "Less Than",    ""},
 	{16, "GREATER_THAN", 0, "Greater Than", ""},
-	{0, NULL, 0, NULL, NULL}};
+	{0, NULL, 0, NULL, NULL}
+};
 
 EnumPropertyItem node_vec_math_items[] = {
 	{0, "ADD",           0, "Add",           ""},
@@ -107,7 +120,8 @@ EnumPropertyItem node_vec_math_items[] = {
 	{3, "DOT_PRODUCT",   0, "Dot Product",   ""},
 	{4, "CROSS_PRODUCT", 0, "Cross Product", ""},
 	{5, "NORMALIZE",     0, "Normalize",     ""},
-	{0, NULL, 0, NULL, NULL}};
+	{0, NULL, 0, NULL, NULL}
+};
 
 EnumPropertyItem node_filter_items[] = {
 	{0, "SOFTEN",  0, "Soften",  ""},
@@ -117,7 +131,8 @@ EnumPropertyItem node_filter_items[] = {
 	{4, "PREWITT", 0, "Prewitt", ""},
 	{5, "KIRSCH",  0, "Kirsch",  ""},
 	{6, "SHADOW",  0, "Shadow",  ""},
-	{0, NULL, 0, NULL, NULL}};
+	{0, NULL, 0, NULL, NULL}
+};
 
 EnumPropertyItem prop_noise_basis_items[] = {
 	{SHD_NOISE_PERLIN, "PERLIN", 0, "Perlin", ""},
@@ -128,19 +143,22 @@ EnumPropertyItem prop_noise_basis_items[] = {
 	{SHD_NOISE_VORONOI_F2_F1, "VORONOI_F2_F1", 0, "Voronoi F2-F1", ""},
 	{SHD_NOISE_VORONOI_CRACKLE, "VORONOI_CRACKLE", 0, "Voronoi Crackle", ""},
 	{SHD_NOISE_CELL_NOISE, "CELL_NOISE", 0, "Cell Noise", ""},
-	{0, NULL, 0, NULL, NULL}};
+	{0, NULL, 0, NULL, NULL}
+};
 
 EnumPropertyItem prop_noise_type_items[] = {
 	{SHD_NOISE_SOFT, "SOFT", 0, "Soft", ""},
 	{SHD_NOISE_HARD, "HARD", 0, "Hard", ""},
-	{0, NULL, 0, NULL, NULL}};
+	{0, NULL, 0, NULL, NULL}
+};
 
 #if 0
 EnumPropertyItem prop_wave_items[] = {
 	{SHD_WAVE_SINE, "SINE", 0, "Sine", "Use a sine wave to produce bands"},
 	{SHD_WAVE_SAW, "SAW", 0, "Saw", "Use a saw wave to produce bands"},
 	{SHD_WAVE_TRI, "TRI", 0, "Tri", "Use a triangle wave to produce bands"},
-	{0, NULL, 0, NULL, NULL}};
+	{0, NULL, 0, NULL, NULL}
+};
 #endif
 
 /* Add any new socket value subtype here.
@@ -151,31 +169,31 @@ EnumPropertyItem prop_wave_items[] = {
  * before using this macro, and undefined afterwards.
  */
 #define NODE_DEFINE_SUBTYPES_INT \
-SUBTYPE(INT, Int, NONE, None) \
-SUBTYPE(INT, Int, UNSIGNED, Unsigned)
+    SUBTYPE(INT, Int, NONE, None) \
+    SUBTYPE(INT, Int, UNSIGNED, Unsigned)
 
 #define NODE_DEFINE_SUBTYPES_FLOAT \
-SUBTYPE(FLOAT, Float, NONE, None) \
-SUBTYPE(FLOAT, Float, UNSIGNED, Unsigned) \
-SUBTYPE(FLOAT, Float, PERCENTAGE, Percentage) \
-SUBTYPE(FLOAT, Float, FACTOR, Factor) \
-SUBTYPE(FLOAT, Float, ANGLE, Angle) \
-SUBTYPE(FLOAT, Float, TIME, Time) \
-SUBTYPE(FLOAT, Float, DISTANCE, Distance)
+    SUBTYPE(FLOAT, Float, NONE, None) \
+    SUBTYPE(FLOAT, Float, UNSIGNED, Unsigned) \
+    SUBTYPE(FLOAT, Float, PERCENTAGE, Percentage) \
+    SUBTYPE(FLOAT, Float, FACTOR, Factor) \
+    SUBTYPE(FLOAT, Float, ANGLE, Angle) \
+    SUBTYPE(FLOAT, Float, TIME, Time) \
+    SUBTYPE(FLOAT, Float, DISTANCE, Distance)
 
 #define NODE_DEFINE_SUBTYPES_VECTOR \
-SUBTYPE(VECTOR, Vector, NONE, None) \
-SUBTYPE(VECTOR, Vector, TRANSLATION, Translation) \
-SUBTYPE(VECTOR, Vector, DIRECTION, Direction) \
-SUBTYPE(VECTOR, Vector, VELOCITY, Velocity) \
-SUBTYPE(VECTOR, Vector, ACCELERATION, Acceleration) \
-SUBTYPE(VECTOR, Vector, EULER, Euler) \
-SUBTYPE(VECTOR, Vector, XYZ, XYZ)
+    SUBTYPE(VECTOR, Vector, NONE, None) \
+    SUBTYPE(VECTOR, Vector, TRANSLATION, Translation) \
+    SUBTYPE(VECTOR, Vector, DIRECTION, Direction) \
+    SUBTYPE(VECTOR, Vector, VELOCITY, Velocity) \
+    SUBTYPE(VECTOR, Vector, ACCELERATION, Acceleration) \
+    SUBTYPE(VECTOR, Vector, EULER, Euler) \
+    SUBTYPE(VECTOR, Vector, XYZ, XYZ)
 
 #define NODE_DEFINE_SUBTYPES \
-NODE_DEFINE_SUBTYPES_INT \
-NODE_DEFINE_SUBTYPES_FLOAT \
-NODE_DEFINE_SUBTYPES_VECTOR
+    NODE_DEFINE_SUBTYPES_INT \
+    NODE_DEFINE_SUBTYPES_FLOAT \
+    NODE_DEFINE_SUBTYPES_VECTOR
 
 #ifdef RNA_RUNTIME
 
@@ -190,7 +208,7 @@ NODE_DEFINE_SUBTYPES_VECTOR
 
 static StructRNA *rna_Node_refine(struct PointerRNA *ptr)
 {
-	bNode *node = (bNode*)ptr->data;
+	bNode *node = (bNode *)ptr->data;
 
 	switch (node->type) {
 		
@@ -215,7 +233,7 @@ static StructRNA *rna_Node_refine(struct PointerRNA *ptr)
 
 static StructRNA *rna_NodeTree_refine(struct PointerRNA *ptr)
 {
-	bNodeTree *ntree = (bNodeTree*)ptr->data;
+	bNodeTree *ntree = (bNodeTree *)ptr->data;
 
 	switch (ntree->type) {
 		case NTREE_SHADER:
@@ -231,14 +249,14 @@ static StructRNA *rna_NodeTree_refine(struct PointerRNA *ptr)
 
 static char *rna_Node_path(PointerRNA *ptr)
 {
-	bNode *node = (bNode*)ptr->data;
+	bNode *node = (bNode *)ptr->data;
 
 	return BLI_sprintfN("nodes[\"%s\"]", node->name);
 }
 
 static StructRNA *rna_NodeSocket_refine(PointerRNA *ptr)
 {
-	bNodeSocket *sock = (bNodeSocket*)ptr->data;
+	bNodeSocket *sock = (bNodeSocket *)ptr->data;
 	
 	if (sock->default_value) {
 		/* This returns the refined socket type with the full definition
@@ -247,27 +265,27 @@ static StructRNA *rna_NodeSocket_refine(PointerRNA *ptr)
 		
 		#define SUBTYPE(socktype, stypename, id, idname) \
 		{ \
-			bNodeSocketValue##stypename *value = (bNodeSocketValue##stypename*)sock->default_value; \
+			bNodeSocketValue##stypename * value = (bNodeSocketValue##stypename *)sock->default_value; \
 			if (value->subtype == PROP_##id) \
 				return &RNA_NodeSocket##stypename##idname; \
 		}
 		
 		switch (sock->type) {
-		case SOCK_FLOAT:
-			NODE_DEFINE_SUBTYPES_FLOAT
-					break;
-		case SOCK_INT:
-			NODE_DEFINE_SUBTYPES_INT
-					break;
-		case SOCK_BOOLEAN:
-			return &RNA_NodeSocketBoolean;
-		case SOCK_VECTOR:
-			NODE_DEFINE_SUBTYPES_VECTOR
-					break;
-		case SOCK_RGBA:
-			return &RNA_NodeSocketRGBA;
-		case SOCK_SHADER:
-			return &RNA_NodeSocketShader;
+			case SOCK_FLOAT:
+				NODE_DEFINE_SUBTYPES_FLOAT
+				break;
+			case SOCK_INT:
+				NODE_DEFINE_SUBTYPES_INT
+				break;
+			case SOCK_BOOLEAN:
+				return &RNA_NodeSocketBoolean;
+			case SOCK_VECTOR:
+				NODE_DEFINE_SUBTYPES_VECTOR
+				break;
+			case SOCK_RGBA:
+				return &RNA_NodeSocketRGBA;
+			case SOCK_SHADER:
+				return &RNA_NodeSocketShader;
 		}
 		
 		#undef SUBTYPE
@@ -278,8 +296,8 @@ static StructRNA *rna_NodeSocket_refine(PointerRNA *ptr)
 
 static char *rna_NodeSocket_path(PointerRNA *ptr)
 {
-	bNodeTree *ntree = (bNodeTree*)ptr->id.data;
-	bNodeSocket *sock = (bNodeSocket*)ptr->data;
+	bNodeTree *ntree = (bNodeTree *)ptr->id.data;
+	bNodeSocket *sock = (bNodeSocket *)ptr->data;
 	bNode *node;
 	int socketindex;
 	
@@ -309,7 +327,7 @@ static char *rna_NodeSocket_path(PointerRNA *ptr)
 /* Button Set Funcs for Matte Nodes */
 static void rna_Matte_t1_set(PointerRNA *ptr, float value)
 {
-	bNode *node = (bNode*)ptr->data;
+	bNode *node = (bNode *)ptr->data;
 	NodeChroma *chroma = node->storage;
 	
 	chroma->t1 = value;
@@ -320,7 +338,7 @@ static void rna_Matte_t1_set(PointerRNA *ptr, float value)
 
 static void rna_Matte_t2_set(PointerRNA *ptr, float value)
 {
-	bNode *node = (bNode*)ptr->data;
+	bNode *node = (bNode *)ptr->data;
 	NodeChroma *chroma = node->storage;
 	
 	if (value > chroma->t1)
@@ -331,7 +349,7 @@ static void rna_Matte_t2_set(PointerRNA *ptr, float value)
 
 static void rna_distance_matte_t1_set(PointerRNA *ptr, float value)
 {
-	bNode *node = (bNode*)ptr->data;
+	bNode *node = (bNode *)ptr->data;
 	NodeChroma *chroma = node->storage;
 
 	chroma->t1 = value;
@@ -339,7 +357,7 @@ static void rna_distance_matte_t1_set(PointerRNA *ptr, float value)
 
 static void rna_distance_matte_t2_set(PointerRNA *ptr, float value)
 {
-	bNode *node = (bNode*)ptr->data;
+	bNode *node = (bNode *)ptr->data;
 	NodeChroma *chroma = node->storage;
 
 	chroma->t2 = value;
@@ -347,7 +365,7 @@ static void rna_distance_matte_t2_set(PointerRNA *ptr, float value)
 
 static void rna_difference_matte_t1_set(PointerRNA *ptr, float value)
 {
-	bNode *node = (bNode*)ptr->data;
+	bNode *node = (bNode *)ptr->data;
 	NodeChroma *chroma = node->storage;
 
 	chroma->t1 = value;
@@ -355,7 +373,7 @@ static void rna_difference_matte_t1_set(PointerRNA *ptr, float value)
 
 static void rna_difference_matte_t2_set(PointerRNA *ptr, float value)
 {
-	bNode *node = (bNode*)ptr->data;
+	bNode *node = (bNode *)ptr->data;
 	NodeChroma *chroma = node->storage;
 
 	chroma->t2 = value;
@@ -364,7 +382,7 @@ static void rna_difference_matte_t2_set(PointerRNA *ptr, float value)
 
 static void rna_Node_scene_set(PointerRNA *ptr, PointerRNA value)
 {
-	bNode *node = (bNode*)ptr->data;
+	bNode *node = (bNode *)ptr->data;
 
 	if (node->id) {
 		id_us_min(node->id);
@@ -385,16 +403,16 @@ static void node_update(Main *bmain, Scene *UNUSED(scene), bNodeTree *ntree, bNo
 
 static void rna_Node_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
-	bNodeTree *ntree = (bNodeTree*)ptr->id.data;
-	bNode *node = (bNode*)ptr->data;
+	bNodeTree *ntree = (bNodeTree *)ptr->id.data;
+	bNode *node = (bNode *)ptr->data;
 
 	node_update(bmain, scene, ntree, node);
 }
 
 static void rna_Node_tex_image_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
-	bNodeTree *ntree = (bNodeTree*)ptr->id.data;
-	bNode *node = (bNode*)ptr->data;
+	bNodeTree *ntree = (bNodeTree *)ptr->id.data;
+	bNode *node = (bNode *)ptr->data;
 
 	node_update(bmain, scene, ntree, node);
 	WM_main_add_notifier(NC_IMAGE, NULL);
@@ -402,8 +420,8 @@ static void rna_Node_tex_image_update(Main *bmain, Scene *scene, PointerRNA *ptr
 
 static void rna_Node_material_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
-	bNodeTree *ntree = (bNodeTree*)ptr->id.data;
-	bNode *node = (bNode*)ptr->data;
+	bNodeTree *ntree = (bNodeTree *)ptr->id.data;
+	bNode *node = (bNode *)ptr->data;
 
 	if (node->id)
 		nodeSetActive(ntree, node);
@@ -413,8 +431,8 @@ static void rna_Node_material_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 
 static void rna_NodeGroup_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
-	bNodeTree *ntree = (bNodeTree*)ptr->id.data;
-	bNode *node = (bNode*)ptr->data;
+	bNodeTree *ntree = (bNodeTree *)ptr->id.data;
+	bNode *node = (bNode *)ptr->data;
 	
 	ntreeUpdateTree((bNodeTree *)node->id);
 	
@@ -423,8 +441,8 @@ static void rna_NodeGroup_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 
 static void rna_Node_name_set(PointerRNA *ptr, const char *value)
 {
-	bNodeTree *ntree = (bNodeTree*)ptr->id.data;
-	bNode *node = (bNode*)ptr->data;
+	bNodeTree *ntree = (bNodeTree *)ptr->id.data;
+	bNode *node = (bNode *)ptr->data;
 	char oldname[sizeof(node->name)];
 	
 	/* make a copy of the old name first */
@@ -440,8 +458,8 @@ static void rna_Node_name_set(PointerRNA *ptr, const char *value)
 
 static void rna_NodeSocket_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
-	bNodeTree *ntree = (bNodeTree*)ptr->id.data;
-	bNodeSocket *sock = (bNodeSocket*)ptr->data;
+	bNodeTree *ntree = (bNodeTree *)ptr->id.data;
+	bNodeSocket *sock = (bNodeSocket *)ptr->data;
 	bNode *node;
 	
 	if (nodeFindNode(ntree, sock, &node, NULL, NULL))
@@ -450,8 +468,8 @@ static void rna_NodeSocket_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 
 static void rna_NodeGroupSocket_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
-	bNodeTree *ntree = (bNodeTree*)ptr->id.data;
-	bNodeSocket *sock = (bNodeSocket*)ptr->data;
+	bNodeTree *ntree = (bNodeTree *)ptr->id.data;
+	bNodeSocket *sock = (bNodeSocket *)ptr->data;
 	bNode *node;
 	
 	ntreeUpdateTree(ntree);
@@ -463,7 +481,7 @@ static void rna_NodeGroupSocket_update(Main *bmain, Scene *scene, PointerRNA *pt
 #if 0 /* UNUSED */
 static void rna_NodeLink_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
-	bNodeTree *ntree = (bNodeTree*)ptr->id.data;
+	bNodeTree *ntree = (bNodeTree *)ptr->id.data;
 
 	ntree->update |= NTREE_UPDATE_LINKS;
 	ntreeUpdateTree(ntree);
@@ -472,31 +490,31 @@ static void rna_NodeLink_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 
 static void rna_NodeSocketInt_range(PointerRNA *ptr, int *min, int *max, int *softmin, int *softmax)
 {
-	bNodeSocket *sock = (bNodeSocket*)ptr->data;
-	bNodeSocketValueInt *val = (bNodeSocketValueInt*)sock->default_value;
+	bNodeSocket *sock = (bNodeSocket *)ptr->data;
+	bNodeSocketValueInt *val = (bNodeSocketValueInt *)sock->default_value;
 	*softmin = val->min;
 	*softmax = val->max;
 }
 
 static void rna_NodeSocketFloat_range(PointerRNA *ptr, float *min, float *max, float *softmin, float *softmax)
 {
-	bNodeSocket *sock = (bNodeSocket*)ptr->data;
-	bNodeSocketValueFloat *val = (bNodeSocketValueFloat*)sock->default_value;
+	bNodeSocket *sock = (bNodeSocket *)ptr->data;
+	bNodeSocketValueFloat *val = (bNodeSocketValueFloat *)sock->default_value;
 	*softmin = val->min;
 	*softmax = val->max;
 }
 
 static void rna_NodeSocketVector_range(PointerRNA *ptr, float *min, float *max, float *softmin, float *softmax)
 {
-	bNodeSocket *sock = (bNodeSocket*)ptr->data;
-	bNodeSocketValueVector *val = (bNodeSocketValueVector*)sock->default_value;
+	bNodeSocket *sock = (bNodeSocket *)ptr->data;
+	bNodeSocketValueVector *val = (bNodeSocketValueVector *)sock->default_value;
 	*softmin = val->min;
 	*softmax = val->max;
 }
 
 static void rna_Node_image_layer_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
-	bNode *node = (bNode*)ptr->data;
+	bNode *node = (bNode *)ptr->data;
 	Image *ima = (Image *)node->id;
 	ImageUser *iuser = node->storage;
 	
@@ -532,7 +550,7 @@ static EnumPropertyItem *renderresult_layers_add_enum(RenderLayer *rl)
 static EnumPropertyItem *rna_Node_image_layer_itemf(bContext *UNUSED(C), PointerRNA *ptr,
                                                     PropertyRNA *UNUSED(prop), int *free)
 {
-	bNode *node = (bNode*)ptr->data;
+	bNode *node = (bNode *)ptr->data;
 	Image *ima = (Image *)node->id;
 	EnumPropertyItem *item = NULL;
 	RenderLayer *rl;
@@ -550,7 +568,7 @@ static EnumPropertyItem *rna_Node_image_layer_itemf(bContext *UNUSED(C), Pointer
 static EnumPropertyItem *rna_Node_scene_layer_itemf(bContext *UNUSED(C), PointerRNA *ptr,
                                                     PropertyRNA *UNUSED(prop), int *free)
 {
-	bNode *node = (bNode*)ptr->data;
+	bNode *node = (bNode *)ptr->data;
 	Scene *sce = (Scene *)node->id;
 	EnumPropertyItem *item = NULL;
 	RenderLayer *rl;
@@ -568,7 +586,7 @@ static EnumPropertyItem *rna_Node_scene_layer_itemf(bContext *UNUSED(C), Pointer
 static EnumPropertyItem *rna_Node_channel_itemf(bContext *UNUSED(C), PointerRNA *ptr,
                                                 PropertyRNA *UNUSED(prop), int *free)
 {
-	bNode *node = (bNode*)ptr->data;
+	bNode *node = (bNode *)ptr->data;
 	EnumPropertyItem *item = NULL;
 	EnumPropertyItem tmp = {0, "", 0, "", ""};
 	int totitem = 0;
@@ -616,6 +634,23 @@ static EnumPropertyItem *rna_Node_channel_itemf(bContext *UNUSED(C), PointerRNA
 	return item;
 }
 
+static PointerRNA rna_NodeTree_active_node_get(PointerRNA *ptr)
+{
+	bNodeTree *ntree = (bNodeTree *)ptr->data;
+	bNode *node = nodeGetActive(ntree);
+	return rna_pointer_inherit_refine(ptr, &RNA_Node, node);
+}
+
+static void rna_NodeTree_active_node_set(PointerRNA *ptr, PointerRNA value)
+{
+	bNodeTree *ntree = (bNodeTree *)ptr->data;
+	bNode *node = (bNode *)value.data;
+	if (node && BLI_findindex(&ntree->nodes, node) != -1)
+		nodeSetActive(ntree, node);
+	else
+		nodeClearActive(ntree);
+}
+
 static bNode *rna_NodeTree_node_new(bNodeTree *ntree, bContext *C, ReportList *reports,
                                     int type, bNodeTree *group)
 {
@@ -639,7 +674,7 @@ static bNode *rna_NodeTree_node_new(bNodeTree *ntree, bContext *C, ReportList *r
 	else {
 		ntreeUpdateTree(ntree); /* update group node socket links*/
 		nodeUpdate(ntree, node);
-		WM_main_add_notifier(NC_NODE|NA_EDITED, ntree);
+		WM_main_add_notifier(NC_NODE | NA_EDITED, ntree);
 
 		if (group)
 			id_us_plus(&group->id);
@@ -699,7 +734,7 @@ static void rna_NodeTree_node_remove(bNodeTree *ntree, ReportList *reports, bNod
 		nodeFreeNode(ntree, node);
 		ntreeUpdateTree(ntree); /* update group node socket links*/
 
-		WM_main_add_notifier(NC_NODE|NA_EDITED, ntree);
+		WM_main_add_notifier(NC_NODE | NA_EDITED, ntree);
 	}
 }
 
@@ -720,7 +755,7 @@ static void rna_NodeTree_node_clear(bNodeTree *ntree)
 
 	ntreeUpdateTree(ntree); /* update group node socket links*/
 
-	WM_main_add_notifier(NC_NODE|NA_EDITED, ntree);
+	WM_main_add_notifier(NC_NODE | NA_EDITED, ntree);
 }
 
 static bNodeLink *rna_NodeTree_link_new(bNodeTree *ntree, ReportList *reports,
@@ -752,7 +787,7 @@ static bNodeLink *rna_NodeTree_link_new(bNodeTree *ntree, ReportList *reports,
 
 		ntreeUpdateTree(ntree);
 
-		WM_main_add_notifier(NC_NODE|NA_EDITED, ntree);
+		WM_main_add_notifier(NC_NODE | NA_EDITED, ntree);
 	}
 
 	return ret;
@@ -767,7 +802,7 @@ static void rna_NodeTree_link_remove(bNodeTree *ntree, ReportList *reports, bNod
 		nodeRemLink(ntree, link);
 		ntreeUpdateTree(ntree);
 
-		WM_main_add_notifier(NC_NODE|NA_EDITED, ntree);
+		WM_main_add_notifier(NC_NODE | NA_EDITED, ntree);
 	}
 }
 
@@ -784,7 +819,7 @@ static void rna_NodeTree_link_clear(bNodeTree *ntree)
 	}
 	ntreeUpdateTree(ntree);
 
-	WM_main_add_notifier(NC_NODE|NA_EDITED, ntree);
+	WM_main_add_notifier(NC_NODE | NA_EDITED, ntree);
 }
 
 static bNodeSocket *rna_NodeTree_input_new(bNodeTree *ntree, ReportList *UNUSED(reports), const char *name, int type)
@@ -794,7 +829,7 @@ static bNodeSocket *rna_NodeTree_input_new(bNodeTree *ntree, ReportList *UNUSED(
 	
 	ntree->update |= NTREE_UPDATE_GROUP_IN;
 	ntreeUpdateTree(ntree);
-	WM_main_add_notifier(NC_NODE|NA_EDITED, ntree);
+	WM_main_add_notifier(NC_NODE | NA_EDITED, ntree);
 	return gsock;
 }
 
@@ -805,7 +840,7 @@ static bNodeSocket *rna_NodeTree_output_new(bNodeTree *ntree, ReportList *UNUSED
 	
 	ntree->update |= NTREE_UPDATE_GROUP_OUT;
 	ntreeUpdateTree(ntree);
-	WM_main_add_notifier(NC_NODE|NA_EDITED, ntree);
+	WM_main_add_notifier(NC_NODE | NA_EDITED, ntree);
 	return gsock;
 }
 
@@ -827,7 +862,7 @@ static bNodeSocket *rna_NodeTree_input_expose(bNodeTree *ntree, ReportList *repo
 		
 		ntree->update |= NTREE_UPDATE_GROUP_IN;
 		ntreeUpdateTree(ntree);
-		WM_main_add_notifier(NC_NODE|NA_EDITED, ntree);
+		WM_main_add_notifier(NC_NODE | NA_EDITED, ntree);
 		return gsock;
 	}
 	return NULL;
@@ -851,7 +886,7 @@ static bNodeSocket *rna_NodeTree_output_expose(bNodeTree *ntree, ReportList *rep
 		
 		ntree->update |= NTREE_UPDATE_GROUP_OUT;
 		ntreeUpdateTree(ntree);
-		WM_main_add_notifier(NC_NODE|NA_EDITED, ntree);
+		WM_main_add_notifier(NC_NODE | NA_EDITED, ntree);
 		return gsock;
 	}
 	return NULL;
@@ -891,10 +926,10 @@ static int rna_NodeOutputFileSocket_find_node(bNodeTree *ntree, NodeImageMultiFi
 	bNode *node;
 	bNodeSocket *sock;
 	
-	for (node= ntree->nodes.first; node; node= node->next) {
-		for (sock= node->inputs.first; sock; sock= sock->next) {
+	for (node = ntree->nodes.first; node; node = node->next) {
+		for (sock = node->inputs.first; sock; sock = sock->next) {
 			NodeImageMultiFileSocket *sockdata = sock->storage;
-			if (sockdata==data) {
+			if (sockdata == data) {
 				*nodep = node;
 				*sockp = sock;
 				return 1;
@@ -902,8 +937,8 @@ static int rna_NodeOutputFileSocket_find_node(bNodeTree *ntree, NodeImageMultiFi
 		}
 	}
 	
-	*nodep= NULL;
-	*sockp= NULL;
+	*nodep = NULL;
+	*sockp = NULL;
 	return 0;
 }
 
@@ -934,36 +969,42 @@ static void rna_NodeOutputFileSlotLayer_name_set(PointerRNA *ptr, const char *va
 #else
 
 static EnumPropertyItem prop_image_layer_items[] = {
-{ 0, "PLACEHOLDER",          0, "Placeholder",          ""},
-{0, NULL, 0, NULL, NULL}};
+	{ 0, "PLACEHOLDER",          0, "Placeholder",          ""},
+	{0, NULL, 0, NULL, NULL}
+};
 
 static EnumPropertyItem prop_scene_layer_items[] = {
-{ 0, "PLACEHOLDER",          0, "Placeholder",          ""},
-{0, NULL, 0, NULL, NULL}};
+	{ 0, "PLACEHOLDER",          0, "Placeholder",          ""},
+	{0, NULL, 0, NULL, NULL}
+};
 
 static EnumPropertyItem prop_tri_channel_items[] = {
-{ 1, "R", 0, "R", ""},
-{ 2, "G", 0, "G", ""},
-{ 3, "B", 0, "B", ""},
-{0, NULL, 0, NULL, NULL}};
+	{ 1, "R", 0, "R", ""},
+	{ 2, "G", 0, "G", ""},
+	{ 3, "B", 0, "B", ""},
+	{0, NULL, 0, NULL, NULL}
+};
 
 static EnumPropertyItem node_flip_items[] = {
-{0, "X",  0, "Flip X",     ""},
-{1, "Y",  0, "Flip Y",     ""},
-{2, "XY", 0, "Flip X & Y", ""},
-{0, NULL, 0, NULL, NULL}};
+	{0, "X",  0, "Flip X",     ""},
+	{1, "Y",  0, "Flip Y",     ""},
+	{2, "XY", 0, "Flip X & Y", ""},
+	{0, NULL, 0, NULL, NULL}
+};
 
 static EnumPropertyItem node_ycc_items[] = {
-{ 0, "ITUBT601", 0, "ITU 601",  ""},
-{ 1, "ITUBT709", 0, "ITU 709",  ""},
-{ 2, "JFIF",     0, "Jpeg",     ""},
-{0, NULL, 0, NULL, NULL}};
+	{ 0, "ITUBT601", 0, "ITU 601",  ""},
+	{ 1, "ITUBT709", 0, "ITU 709",  ""},
+	{ 2, "JFIF",     0, "Jpeg",     ""},
+	{0, NULL, 0, NULL, NULL}
+};
 
 static EnumPropertyItem node_glossy_items[] = {
-{SHD_GLOSSY_SHARP,    "SHARP",    0, "Sharp",    ""},
-{SHD_GLOSSY_BECKMANN, "BECKMANN", 0, "Beckmann", ""},
-{SHD_GLOSSY_GGX,      "GGX",      0, "GGX",      ""},
-{0, NULL, 0, NULL, NULL}};
+	{SHD_GLOSSY_SHARP,    "SHARP",    0, "Sharp",    ""},
+	{SHD_GLOSSY_BECKMANN, "BECKMANN", 0, "Beckmann", ""},
+	{SHD_GLOSSY_GGX,      "GGX",      0, "GGX",      ""},
+	{0, NULL, 0, NULL, NULL}
+};
 
 #define MaxNodes 50000
 
@@ -977,8 +1018,7 @@ enum
 	Category_TextureNode,
 };
 
-typedef struct NodeInfo
-{
+typedef struct NodeInfo {
 	int defined;
 	int category;
 	const char *enum_name;
@@ -992,7 +1032,7 @@ typedef struct NodeInfo
 static NodeInfo nodes[MaxNodes];
 
 static void reg_node(int ID, int category, const char *enum_name, const char *struct_name,
-					 const char *base_name, const char *ui_name, const char *ui_desc)
+		const char *base_name, const char *ui_name, const char *ui_desc)
 {
 	NodeInfo *ni = nodes + ID;
 	
@@ -1018,9 +1058,10 @@ static void init(void)
 	reg_node(NODE_FORLOOP, Category_LoopNode, "FORLOOP", "NodeForLoop", "Node", "ForLoop", "");
 	reg_node(NODE_WHILELOOP, Category_LoopNode, "WHILELOOP", "NodeWhileLoop", "Node", "WhileLoop", "");
 	reg_node(NODE_FRAME, Category_LayoutNode, "FRAME", "NodeFrame", "Node", "Frame", "");
+	reg_node(NODE_REROUTE, Category_LayoutNode, "REROUTE", "NodeReroute", "Node", "Reroute", "");
 }
 
-static StructRNA* def_node(BlenderRNA *brna, int node_id)
+static StructRNA *def_node(BlenderRNA *brna, int node_id)
 {
 	StructRNA *srna;
 	NodeInfo *node = nodes + node_id;
@@ -1035,16 +1076,16 @@ static StructRNA* def_node(BlenderRNA *brna, int node_id)
 static void alloc_node_type_items(EnumPropertyItem *items, int category)
 {
 	int i;
-	int count = 3;
+	int count = 4;
 	EnumPropertyItem *item  = items;
 	
-	for (i = 0; i<MaxNodes; i++)
+	for (i = 0; i < MaxNodes; i++)
 		if (nodes[i].defined && nodes[i].category == category)
 			count++;
 		
 	/*item = items = MEM_callocN(count * sizeof(EnumPropertyItem), "alloc_node_type_items");*/
 	
-	for (i = 0; i<MaxNodes; i++) {
+	for (i = 0; i < MaxNodes; i++) {
 		NodeInfo *node = nodes + i;
 		if (node->defined && node->category == category) {
 			item->value = i;
@@ -1056,19 +1097,19 @@ static void alloc_node_type_items(EnumPropertyItem *items, int category)
 			item++;
 		}
 	}
-	
-	item->value = NODE_DYNAMIC;
-	item->identifier = "SCRIPT";
+
+	item->value = NODE_GROUP;
+	item->identifier = "GROUP";
 	item->icon = 0;
-	item->name = "Script";
+	item->name = "Group";
 	item->description = "";
 	
 	item++;
 	
-	item->value = NODE_GROUP;
-	item->identifier = "GROUP";
+	item->value = NODE_REROUTE;
+	item->identifier = "REROUTE";
 	item->icon = 0;
-	item->name = "Group";
+	item->name = "Reroute";
 	item->description = "";
 	
 	item++;
@@ -1090,7 +1131,7 @@ static void def_group(StructRNA *srna)
 	RNA_def_property_struct_type(prop, "NodeTree");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Node Tree", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_NodeGroup_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_NodeGroup_update");
 }
 
 static void def_forloop(StructRNA *srna)
@@ -1102,7 +1143,7 @@ static void def_forloop(StructRNA *srna)
 	RNA_def_property_struct_type(prop, "NodeTree");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Node Tree", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_NodeGroup_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_NodeGroup_update");
 }
 
 static void def_whileloop(StructRNA *srna)
@@ -1114,13 +1155,13 @@ static void def_whileloop(StructRNA *srna)
 	RNA_def_property_struct_type(prop, "NodeTree");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Node Tree", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_NodeGroup_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_NodeGroup_update");
 
 	prop = RNA_def_property(srna, "max_iterations", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "custom1");
 	RNA_def_property_range(prop, 0.0f, SHRT_MAX);
 	RNA_def_property_ui_text(prop, "Max. Iterations", "Limit for number of iterations");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_NodeGroup_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_NodeGroup_update");
 }
 
 static void def_frame(StructRNA *srna)
@@ -1132,13 +1173,13 @@ static void def_frame(StructRNA *srna)
 	prop = RNA_def_property(srna, "shrink", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", NODE_FRAME_SHRINK);
 	RNA_def_property_ui_text(prop, "Shrink", "Shrink the frame to minimal bounding box");
-	RNA_def_property_update(prop, NC_NODE|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_NODE | ND_DISPLAY, NULL);
 
 	prop = RNA_def_property(srna, "label_size", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "label_size");
 	RNA_def_property_range(prop, 8, 64);
 	RNA_def_property_ui_text(prop, "Label Font Size", "Font size to use for displaying the label");
-	RNA_def_property_update(prop, NC_NODE|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_NODE | ND_DISPLAY, NULL);
 }
 
 static void def_math(StructRNA *srna)
@@ -1149,7 +1190,7 @@ static void def_math(StructRNA *srna)
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, node_math_items);
 	RNA_def_property_ui_text(prop, "Operation", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_vector_math(StructRNA *srna)
@@ -1160,7 +1201,7 @@ static void def_vector_math(StructRNA *srna)
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, node_vec_math_items);
 	RNA_def_property_ui_text(prop, "Operation", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_rgb_curve(StructRNA *srna)
@@ -1171,7 +1212,7 @@ static void def_rgb_curve(StructRNA *srna)
 	RNA_def_property_pointer_sdna(prop, NULL, "storage");
 	RNA_def_property_struct_type(prop, "CurveMapping");
 	RNA_def_property_ui_text(prop, "Mapping", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_vector_curve(StructRNA *srna)
@@ -1182,7 +1223,7 @@ static void def_vector_curve(StructRNA *srna)
 	RNA_def_property_pointer_sdna(prop, NULL, "storage");
 	RNA_def_property_struct_type(prop, "CurveMapping");
 	RNA_def_property_ui_text(prop, "Mapping", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_time(StructRNA *srna)
@@ -1193,17 +1234,17 @@ static void def_time(StructRNA *srna)
 	RNA_def_property_pointer_sdna(prop, NULL, "storage");
 	RNA_def_property_struct_type(prop, "CurveMapping");
 	RNA_def_property_ui_text(prop, "Curve", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "frame_start", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "custom1");
 	RNA_def_property_ui_text(prop, "Start Frame", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "frame_end", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "custom2");
 	RNA_def_property_ui_text(prop, "End Frame", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_colorramp(StructRNA *srna)
@@ -1214,7 +1255,7 @@ static void def_colorramp(StructRNA *srna)
 	RNA_def_property_pointer_sdna(prop, NULL, "storage");
 	RNA_def_property_struct_type(prop, "ColorRamp");
 	RNA_def_property_ui_text(prop, "Color Ramp", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_mix_rgb(StructRNA *srna)
@@ -1225,12 +1266,12 @@ static void def_mix_rgb(StructRNA *srna)
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, ramp_blend_items);
 	RNA_def_property_ui_text(prop, "Blend Type", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "use_alpha", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "custom2", 1);
 	RNA_def_property_ui_text(prop, "Alpha", "Include alpha of second input in this operation");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_texture(StructRNA *srna)
@@ -1242,12 +1283,12 @@ static void def_texture(StructRNA *srna)
 	RNA_def_property_struct_type(prop, "Texture");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Texture", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "node_output", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "custom1");
 	RNA_def_property_ui_text(prop, "Node Output", "For node-based textures, which output node to use");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 
@@ -1262,22 +1303,22 @@ static void def_sh_material(StructRNA *srna)
 	RNA_def_property_struct_type(prop, "Material");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Material", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_material_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_material_update");
 
 	prop = RNA_def_property(srna, "use_diffuse", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "custom1", SH_NODE_MAT_DIFF);
 	RNA_def_property_ui_text(prop, "Diffuse", "Material Node outputs Diffuse");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "use_specular", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "custom1", SH_NODE_MAT_SPEC);
 	RNA_def_property_ui_text(prop, "Specular", "Material Node outputs Specular");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "invert_normal", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "custom1", SH_NODE_MAT_NEG);
 	RNA_def_property_ui_text(prop, "Invert Normal", "Material Node uses inverted normal");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_sh_mapping(StructRNA *srna)
@@ -1291,7 +1332,7 @@ static void def_sh_mapping(StructRNA *srna)
 	RNA_def_property_ui_text(prop, "Location", "");
 	RNA_def_property_update(prop, 0, "rna_Mapping_Node_update");
 	
-		/* Not PROP_XYZ, this is now in radians, no more degrees */
+	/* Not PROP_XYZ, this is now in radians, no more degrees */
 	prop = RNA_def_property(srna, "rotation", PROP_FLOAT, PROP_EULER);
 	RNA_def_property_float_sdna(prop, NULL, "rot");
 	RNA_def_property_ui_text(prop, "Rotation", "");
@@ -1332,12 +1373,12 @@ static void def_sh_geometry(StructRNA *srna)
 	prop = RNA_def_property(srna, "uv_layer", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "uvname");
 	RNA_def_property_ui_text(prop, "UV Map", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "color_layer", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "colname");
 	RNA_def_property_ui_text(prop, "Vertex Color Layer", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_sh_attribute(StructRNA *srna)
@@ -1349,7 +1390,7 @@ static void def_sh_attribute(StructRNA *srna)
 	prop = RNA_def_property(srna, "attribute_name", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "name");
 	RNA_def_property_ui_text(prop, "Attribute Name", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_sh_tex(StructRNA *srna)
@@ -1376,11 +1417,11 @@ static void def_sh_tex_sky(StructRNA *srna)
 	
 	prop = RNA_def_property(srna, "sun_direction", PROP_FLOAT, PROP_DIRECTION);
 	RNA_def_property_ui_text(prop, "Sun Direction", "Direction from where the sun is shining");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "turbidity", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Turbidity", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_sh_tex_environment(StructRNA *srna)
@@ -1391,14 +1432,16 @@ static void def_sh_tex_environment(StructRNA *srna)
 		{SHD_COLORSPACE_NONE, "NONE", 0, "Non-Color Data",
 		                      "Image contains non-color data, for example a displacement or normal map, "
 		                      "and will not be converted"},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	static const EnumPropertyItem prop_projection_items[] = {
 		{SHD_PROJ_EQUIRECTANGULAR, "EQUIRECTANGULAR", 0, "Equirectangular",
 		                           "Equirectangular or latitude-longitude projection"},
 		{SHD_PROJ_MIRROR_BALL, "MIRROR_BALL", 0, "Mirror Ball",
 		                       "Projection from an orthographic photo of a mirror ball"},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 	
 	PropertyRNA *prop;
 
@@ -1407,7 +1450,7 @@ static void def_sh_tex_environment(StructRNA *srna)
 	RNA_def_property_struct_type(prop, "Image");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Image", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_tex_image_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_tex_image_update");
 
 	RNA_def_struct_sdna_from(srna, "NodeTexEnvironment", "storage");
 	def_sh_tex(srna);
@@ -1422,6 +1465,12 @@ static void def_sh_tex_environment(StructRNA *srna)
 	RNA_def_property_ui_text(prop, "Projection", "Projection of the input image");
 	RNA_def_property_update(prop, 0, "rna_Node_update");
 
+	prop = RNA_def_property(srna, "image_user", PROP_POINTER, PROP_NONE);
+	RNA_def_property_flag(prop, PROP_NEVER_NULL);
+	RNA_def_property_pointer_sdna(prop, NULL, "iuser");
+	RNA_def_property_ui_text(prop, "Image User",
+	                         "Parameters defining which layer, pass and frame of the image is displayed");
+	RNA_def_property_update(prop, 0, "rna_Node_update");
 }
 
 static void def_sh_tex_image(StructRNA *srna)
@@ -1432,7 +1481,8 @@ static void def_sh_tex_image(StructRNA *srna)
 		{SHD_COLORSPACE_NONE, "NONE", 0, "Non-Color Data",
 		                      "Image contains non-color data, for example a displacement or normal map, "
 		                      "and will not be converted"},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	PropertyRNA *prop;
 
@@ -1441,7 +1491,7 @@ static void def_sh_tex_image(StructRNA *srna)
 	RNA_def_property_struct_type(prop, "Image");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Image", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_tex_image_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_tex_image_update");
 
 	RNA_def_struct_sdna_from(srna, "NodeTexImage", "storage");
 	def_sh_tex(srna);
@@ -1450,6 +1500,13 @@ static void def_sh_tex_image(StructRNA *srna)
 	RNA_def_property_enum_items(prop, prop_color_space_items);
 	RNA_def_property_ui_text(prop, "Color Space", "Image file color space");
 	RNA_def_property_update(prop, 0, "rna_Node_update");
+
+	prop = RNA_def_property(srna, "image_user", PROP_POINTER, PROP_NONE);
+	RNA_def_property_flag(prop, PROP_NEVER_NULL);
+	RNA_def_property_pointer_sdna(prop, NULL, "iuser");
+	RNA_def_property_ui_text(prop, "Image User",
+	                         "Parameters defining which layer, pass and frame of the image is displayed");
+	RNA_def_property_update(prop, 0, "rna_Node_update");
 }
 
 static void def_sh_tex_gradient(StructRNA *srna)
@@ -1463,7 +1520,8 @@ static void def_sh_tex_gradient(StructRNA *srna)
 		{SHD_BLEND_QUADRATIC_SPHERE, "QUADRATIC_SPHERE", 0, "Quadratic sphere",
 		                             "Create a quadratic progression in the shape of a sphere"},
 		{SHD_BLEND_RADIAL, "RADIAL", 0, "Radial", "Create a radial progression"},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	PropertyRNA *prop;
 	
@@ -1510,7 +1568,8 @@ static void def_sh_tex_musgrave(StructRNA *srna)
 		{SHD_MUSGRAVE_HYBRID_MULTIFRACTAL, "HYBRID_MULTIFRACTAL", 0, "Hybrid Multifractal", ""},
 		{SHD_MUSGRAVE_FBM, "FBM", 0, "fBM", ""},
 		{SHD_MUSGRAVE_HETERO_TERRAIN, "HETERO_TERRAIN", 0, "Hetero Terrain", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	PropertyRNA *prop;
 	
@@ -1529,7 +1588,8 @@ static void def_sh_tex_voronoi(StructRNA *srna)
 	static EnumPropertyItem prop_coloring_items[] = {
 		{SHD_VORONOI_INTENSITY, "INTENSITY", 0, "Intensity", "Only calculate intensity"},
 		{SHD_VORONOI_CELLS, "CELLS", 0, "Cells", "Color cells by position"},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	PropertyRNA *prop;
 	
@@ -1546,9 +1606,10 @@ static void def_sh_tex_voronoi(StructRNA *srna)
 static void def_sh_tex_wave(StructRNA *srna)
 {
 	static EnumPropertyItem prop_wave_type_items[] = {
-	{SHD_WAVE_BANDS, "BANDS", 0, "Bands", "Use standard wave texture in bands"},
-	{SHD_WAVE_RINGS, "RINGS", 0, "Rings", "Use wave texture in rings"},
-	{0, NULL, 0, NULL, NULL}};
+		{SHD_WAVE_BANDS, "BANDS", 0, "Bands", "Use standard wave texture in bands"},
+		{SHD_WAVE_RINGS, "RINGS", 0, "Rings", "Use wave texture in rings"},
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	PropertyRNA *prop;
 	
@@ -1570,7 +1631,7 @@ static void def_glossy(StructRNA *srna)
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, node_glossy_items);
 	RNA_def_property_ui_text(prop, "Distribution", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 /* -- Compositor Nodes ------------------------------------------------------ */
@@ -1583,7 +1644,7 @@ static void def_cmp_alpha_over(StructRNA *srna)
 	prop = RNA_def_property(srna, "use_premultiply", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "custom1", 1);
 	RNA_def_property_ui_text(prop, "Convert Premul", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	RNA_def_struct_sdna_from(srna, "NodeTwoFloats", "storage");
 	
@@ -1591,7 +1652,7 @@ static void def_cmp_alpha_over(StructRNA *srna)
 	RNA_def_property_float_sdna(prop, NULL, "x");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Premul", "Mix Factor");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_hue_saturation(StructRNA *srna)
@@ -1604,19 +1665,19 @@ static void def_cmp_hue_saturation(StructRNA *srna)
 	RNA_def_property_float_sdna(prop, NULL, "hue");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Hue", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "color_saturation", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "sat");
 	RNA_def_property_range(prop, 0.0f, 2.0f);
 	RNA_def_property_ui_text(prop, "Saturation", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "color_value", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "val");
 	RNA_def_property_range(prop, 0.0f, 2.0f);
 	RNA_def_property_ui_text(prop, "Value", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_blur(StructRNA *srna)
@@ -1632,13 +1693,15 @@ static void def_cmp_blur(StructRNA *srna)
 		{R_FILTER_FAST_GAUSS, "FAST_GAUSS", 0, "Fast Gaussian", ""},
 		{R_FILTER_CATROM,     "CATROM",     0, "Catrom",        ""},
 		{R_FILTER_MITCH,      "MITCH",      0, "Mitch",         ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	static EnumPropertyItem aspect_correction_type_items[] = {
-		{CMP_NODE_BLUR_ASPECT_NONE,	"NONE",	0,	"None",	""},
-		{CMP_NODE_BLUR_ASPECT_Y,	"Y",	0,	"Y",	""},
-		{CMP_NODE_BLUR_ASPECT_X,	"X",	0,	"X",	""},
-		{0, NULL, 0, NULL, NULL}};
+		{CMP_NODE_BLUR_ASPECT_NONE, "NONE", 0,  "None", ""},
+		{CMP_NODE_BLUR_ASPECT_Y,    "Y",    0,  "Y",    ""},
+		{CMP_NODE_BLUR_ASPECT_X,    "X",    0,  "X",    ""},
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	RNA_def_struct_sdna_from(srna, "NodeBlurData", "storage");
 	
@@ -1646,58 +1709,58 @@ static void def_cmp_blur(StructRNA *srna)
 	RNA_def_property_int_sdna(prop, NULL, "sizex");
 	RNA_def_property_range(prop, 0, 2048);
 	RNA_def_property_ui_text(prop, "Size X", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "size_y", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "sizey");
 	RNA_def_property_range(prop, 0, 2048);
 	RNA_def_property_ui_text(prop, "Size Y", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "use_relative", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "relative", 1);
 	RNA_def_property_ui_text(prop, "Relative", "Use relative (percent) values to define blur radius");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "aspect_correction", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "aspect");
 	RNA_def_property_enum_items(prop, aspect_correction_type_items);
 	RNA_def_property_ui_text(prop, "Aspect Correction", "Type of aspect correction to use");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "fac");
 	RNA_def_property_range(prop, 0.0f, 2.0f);
 	RNA_def_property_ui_text(prop, "Factor", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "factor_x", PROP_FLOAT, PROP_PERCENTAGE);
 	RNA_def_property_float_sdna(prop, NULL, "percentx");
 	RNA_def_property_range(prop, 0.0f, 100.0f);
 	RNA_def_property_ui_text(prop, "Relative Size X", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "factor_y", PROP_FLOAT, PROP_PERCENTAGE);
 	RNA_def_property_float_sdna(prop, NULL, "percenty");
 	RNA_def_property_range(prop, 0.0f, 100.0f);
 	RNA_def_property_ui_text(prop, "Relative Size Y", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "filter_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "filtertype");
 	RNA_def_property_enum_items(prop, filter_type_items);
 	RNA_def_property_ui_text(prop, "Filter Type", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "use_bokeh", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "bokeh", 1);
 	RNA_def_property_ui_text(prop, "Bokeh", "Use circular filter (slower)");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "use_gamma_correction", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "gamma", 1);
 	RNA_def_property_ui_text(prop, "Gamma", "Apply filter on gamma corrected values");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 }
 
@@ -1709,7 +1772,7 @@ static void def_cmp_filter(StructRNA *srna)
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, node_filter_items);
 	RNA_def_property_ui_text(prop, "Filter Type", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_map_value(StructRNA *srna)
@@ -1723,38 +1786,38 @@ static void def_cmp_map_value(StructRNA *srna)
 	RNA_def_property_array(prop, 1);
 	RNA_def_property_range(prop, -1000.0f, 1000.0f);
 	RNA_def_property_ui_text(prop, "Offset", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "size", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "size");
 	RNA_def_property_array(prop, 1);
 	RNA_def_property_range(prop, -1000.0f, 1000.0f);
 	RNA_def_property_ui_text(prop, "Size", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "use_min", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", TEXMAP_CLIP_MIN);
 	RNA_def_property_ui_text(prop, "Use Minimum", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "use_max", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", TEXMAP_CLIP_MAX);
 	RNA_def_property_ui_text(prop, "Use Maximum", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "min", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "min");
 	RNA_def_property_array(prop, 1);
 	RNA_def_property_range(prop, -1000.0f, 1000.0f);
 	RNA_def_property_ui_text(prop, "Minimum", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "max", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "max");
 	RNA_def_property_array(prop, 1);
 	RNA_def_property_range(prop, -1000.0f, 1000.0f);
 	RNA_def_property_ui_text(prop, "Maximum", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_vector_blur(StructRNA *srna)
@@ -1767,20 +1830,20 @@ static void def_cmp_vector_blur(StructRNA *srna)
 	RNA_def_property_int_sdna(prop, NULL, "samples");
 	RNA_def_property_range(prop, 1, 256);
 	RNA_def_property_ui_text(prop, "Samples", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "speed_min", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "minspeed");
 	RNA_def_property_range(prop, 0, 1024);
 	RNA_def_property_ui_text(prop, "Min Speed",
 	                         "Minimum speed for a pixel to be blurred (used to separate background from foreground)");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 		
 	prop = RNA_def_property(srna, "speed_max", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "maxspeed");
 	RNA_def_property_range(prop, 0, 1024);
 	RNA_def_property_ui_text(prop, "Max Speed", "Maximum speed, or zero for none");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "fac");
@@ -1788,12 +1851,12 @@ static void def_cmp_vector_blur(StructRNA *srna)
 	RNA_def_property_ui_range(prop, 0.0, 2.0, 1.0, 2);
 	RNA_def_property_ui_text(prop, "Blur Factor",
 	                         "Scaling factor for motion vectors (actually, 'shutter speed', in frames)");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "use_curved", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "curved", 1);
 	RNA_def_property_ui_text(prop, "Curved", "Interpolate between frames in a Bezier curve, rather than linearly");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_levels(StructRNA *srna)
@@ -1806,75 +1869,83 @@ static void def_cmp_levels(StructRNA *srna)
 		{3, "GREEN", 0, "G", "Green Channel"},
 		{4, "BLUE", 0, "B", "Blue Channel"},
 		{5, "LUMINANCE", 0, "L", "Luminance Channel"},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 	
 	prop = RNA_def_property(srna, "channel", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, channel_items);
 	RNA_def_property_ui_text(prop, "Channel", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
-static void def_cmp_image(StructRNA *srna)
+static void def_node_image_user(StructRNA *srna)
 {
 	PropertyRNA *prop;
-	
-#if 0
-	static EnumPropertyItem type_items[] = {
-		{IMA_SRC_FILE,      "IMAGE",     0, "Image",     ""},
-		{IMA_SRC_MOVIE,     "MOVIE",     "Movie",     ""},
-		{IMA_SRC_SEQUENCE,  "SEQUENCE",  "Sequence",  ""},
-		{IMA_SRC_GENERATED, "GENERATED", "Generated", ""},
-		{0, NULL, 0, NULL, NULL}};
-#endif
-	
-	prop = RNA_def_property(srna, "image", PROP_POINTER, PROP_NONE);
-	RNA_def_property_pointer_sdna(prop, NULL, "id");
-	RNA_def_property_struct_type(prop, "Image");
-	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_ui_text(prop, "Image", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
-	
-	RNA_def_struct_sdna_from(srna, "ImageUser", "storage");
-	
+
 	prop = RNA_def_property(srna, "frame_duration", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "frames");
 	RNA_def_property_range(prop, 0, MAXFRAMEF);
 	RNA_def_property_ui_text(prop, "Frames", "Number of images of a movie to use"); /* copied from the rna_image.c */
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "frame_start", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "sfra");
 	RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF);
-		 /* copied from the rna_image.c */
+	/* copied from the rna_image.c */
 	RNA_def_property_ui_text(prop, "Start Frame",
 	                         "Global starting frame of the movie/sequence, assuming first picture has a #1");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "frame_offset", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "offset");
 	RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF);
-		/* copied from the rna_image.c */
+	/* copied from the rna_image.c */
 	RNA_def_property_ui_text(prop, "Offset", "Offset the number of the frame to use in the animation");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "use_cyclic", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "cycl", 1);
 	RNA_def_property_ui_text(prop, "Cyclic", "Cycle the images in the movie"); /* copied from the rna_image.c */
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "use_auto_refresh", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", IMA_ANIM_ALWAYS);
-		/* copied from the rna_image.c */
+	/* copied from the rna_image.c */
 	RNA_def_property_ui_text(prop, "Auto-Refresh", "Always refresh image on frame changes");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "layer", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "layer");
 	RNA_def_property_enum_items(prop, prop_image_layer_items);
 	RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Node_image_layer_itemf");
 	RNA_def_property_ui_text(prop, "Layer", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_image_layer_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_image_layer_update");
+}
+
+static void def_cmp_image(StructRNA *srna)
+{
+	PropertyRNA *prop;
+	
+#if 0
+	static EnumPropertyItem type_items[] = {
+		{IMA_SRC_FILE,      "IMAGE",     0, "Image",     ""},
+		{IMA_SRC_MOVIE,     "MOVIE",     "Movie",     ""},
+		{IMA_SRC_SEQUENCE,  "SEQUENCE",  "Sequence",  ""},
+		{IMA_SRC_GENERATED, "GENERATED", "Generated", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+#endif
+	
+	prop = RNA_def_property(srna, "image", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "id");
+	RNA_def_property_struct_type(prop, "Image");
+	RNA_def_property_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Image", "");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
+	
+	RNA_def_struct_sdna_from(srna, "ImageUser", "storage");
+	def_node_image_user(srna);
 }
 
 static void def_cmp_render_layers(StructRNA *srna)
@@ -1885,16 +1956,16 @@ static void def_cmp_render_layers(StructRNA *srna)
 	RNA_def_property_pointer_sdna(prop, NULL, "id");
 	RNA_def_property_pointer_funcs(prop, NULL, "rna_Node_scene_set", NULL, NULL);
 	RNA_def_property_struct_type(prop, "Scene");
-	RNA_def_property_flag(prop, PROP_EDITABLE|PROP_ID_SELF_CHECK);
+	RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
 	RNA_def_property_ui_text(prop, "Scene", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "layer", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, prop_scene_layer_items);
 	RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Node_scene_layer_itemf");
 	RNA_def_property_ui_text(prop, "Layer", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void rna_def_cmp_output_file_slot_file(BlenderRNA *brna)
@@ -1909,7 +1980,7 @@ static void rna_def_cmp_output_file_slot_file(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "use_node_format", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "use_node_format", 1);
 	RNA_def_property_ui_text(prop, "Use Node Format", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, NULL);
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, NULL);
 	
 	prop = RNA_def_property(srna, "format", PROP_POINTER, PROP_NONE);
 	RNA_def_property_struct_type(prop, "ImageFormatSettings");
@@ -1919,7 +1990,7 @@ static void rna_def_cmp_output_file_slot_file(BlenderRNA *brna)
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_NodeOutputFileSlotFile_path_set");
 	RNA_def_struct_name_property(srna, prop);
 	RNA_def_property_ui_text(prop, "Path", "Subpath used for this slot");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, NULL);
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, NULL);
 }
 static void rna_def_cmp_output_file_slot_layer(BlenderRNA *brna)
 {
@@ -1935,7 +2006,7 @@ static void rna_def_cmp_output_file_slot_layer(BlenderRNA *brna)
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_NodeOutputFileSlotLayer_name_set");
 	RNA_def_struct_name_property(srna, prop);
 	RNA_def_property_ui_text(prop, "Name", "OpenEXR layer name used for this slot");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, NULL);
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, NULL);
 }
 static void def_cmp_output_file(StructRNA *srna)
 {
@@ -1946,12 +2017,12 @@ static void def_cmp_output_file(StructRNA *srna)
 	prop = RNA_def_property(srna, "base_path", PROP_STRING, PROP_FILEPATH);
 	RNA_def_property_string_sdna(prop, NULL, "base_path");
 	RNA_def_property_ui_text(prop, "Base Path", "Base output path for the image");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "active_input_index", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "active_input");
 	RNA_def_property_ui_text(prop, "Active Input Index", "Active input index in details view list");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "format", PROP_POINTER, PROP_NONE);
 	RNA_def_property_struct_type(prop, "ImageFormatSettings");
@@ -1978,45 +2049,74 @@ static void def_cmp_dilate_erode(StructRNA *srna)
 	PropertyRNA *prop;
 
 	static EnumPropertyItem type_items[] = {
-	    {CMP_NODE_DILATEERODE_STEP,     "STEP",       0, "Step",     ""},
-	    {CMP_NODE_DILATEERODE_DISTANCE, "DISTANCE",   0, "Distance", ""},
-		{0, NULL, 0, NULL, NULL}};
+	    {CMP_NODE_DILATEERODE_STEP,            "STEP",      0, "Step",      ""},
+	    {CMP_NODE_DILATEERODE_DISTANCE_THRESH, "THRESHOLD", 0, "Threshold", ""},
+	    {CMP_NODE_DILATEERODE_DISTANCE,        "DISTANCE",  0, "Distance",  ""},
+	    {CMP_NODE_DILATEERODE_DISTANCE_FEATHER,"FEATHER",  0,  "Feather",  ""},
+	    {0, NULL, 0, NULL, NULL}
+	};
 	
 	prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, type_items);
 	RNA_def_property_ui_text(prop, "Distance", "Distance to grow/shrink (number of iterations)");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "distance", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "custom2");
 	RNA_def_property_range(prop, -100, 100);
 	RNA_def_property_ui_text(prop, "Distance", "Distance to grow/shrink (number of iterations)");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "edge", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "custom3");
 	RNA_def_property_range(prop, -100, 100);
 	RNA_def_property_ui_text(prop, "Edge", "Edge to inset");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_scale(StructRNA *srna)
 {
 	PropertyRNA *prop;
-	
+
 	static EnumPropertyItem space_items[] = {
-		{0, "RELATIVE",   0, "Relative",   ""},
-		{1, "ABSOLUTE",   0, "Absolute",   ""},
-		{2, "SCENE_SIZE", 0, "Scene Size", ""},
-		{3, "RENDER_SIZE", 0, "Render Size", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{CMP_SCALE_RELATIVE, "RELATIVE",   0, "Relative",   ""},
+		{CMP_SCALE_ABSOLUTE, "ABSOLUTE",   0, "Absolute",   ""},
+		{CMP_SCALE_SCENEPERCENT, "SCENE_SIZE", 0, "Scene Size", ""},
+		{CMP_SCALE_RENDERPERCENT, "RENDER_SIZE", 0, "Render Size", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
 	
+	/* matching bgpic_camera_frame_items[] */
+	static const EnumPropertyItem space_frame_items[] = {
+		{0, "STRETCH", 0, "Stretch", ""},
+		{CMP_SCALE_RENDERSIZE_FRAME_ASPECT, "FIT", 0, "Fit", ""},
+		{CMP_SCALE_RENDERSIZE_FRAME_ASPECT | CMP_SCALE_RENDERSIZE_FRAME_CROP, "CROP", 0, "Crop", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+
 	prop = RNA_def_property(srna, "space", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, space_items);
 	RNA_def_property_ui_text(prop, "Space", "Coordinate space to scale relative to");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
+
+	/* expose 2 flags as a enum of 3 items */
+	prop = RNA_def_property(srna, "frame_method", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_bitflag_sdna(prop, NULL, "custom2");
+	RNA_def_property_enum_items(prop, space_frame_items);
+	RNA_def_property_ui_text(prop, "Frame Method", "How the image fits in the camera frame");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
+
+	prop = RNA_def_property(srna, "offset_x", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "custom3");
+	RNA_def_property_ui_text(prop, "X Offset", "Offset image horizontally (factor of image size)");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
+
+	prop = RNA_def_property(srna, "offset_y", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "custom4");
+	RNA_def_property_ui_text(prop, "Y Offset", "Offset image vertically (factor of image size)");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_rotate(StructRNA *srna)
@@ -2027,13 +2127,14 @@ static void def_cmp_rotate(StructRNA *srna)
 		{0, "NEAREST",   0, "Nearest",   ""},
 		{1, "BILINEAR",   0, "Bilinear",   ""},
 		{2, "BICUBIC", 0, "Bicubic", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 	
 	prop = RNA_def_property(srna, "filter_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, rotate_items);
 	RNA_def_property_ui_text(prop, "Filter", "Method to use to filter rotation");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_diff_matte(StructRNA *srna)
@@ -2047,14 +2148,14 @@ static void def_cmp_diff_matte(StructRNA *srna)
 	RNA_def_property_float_funcs(prop, NULL, "rna_difference_matte_t1_set", NULL);
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Tolerance", "Color distances below this threshold are keyed");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "falloff", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "t2");
 	RNA_def_property_float_funcs(prop, NULL, "rna_difference_matte_t2_set", NULL);
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Falloff", "Color distances below this additional threshold are partially keyed");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_color_matte(StructRNA *srna)
@@ -2067,19 +2168,19 @@ static void def_cmp_color_matte(StructRNA *srna)
 	RNA_def_property_float_sdna(prop, NULL, "t1");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "H", "Hue tolerance for colors to be considered a keying color");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "color_saturation", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "t2");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "S", "Saturation Tolerance for the color");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "color_value", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "t3");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "V", "Value Tolerance for the color");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_distance_matte(StructRNA *srna)
@@ -2089,7 +2190,8 @@ static void def_cmp_distance_matte(StructRNA *srna)
 	static EnumPropertyItem color_space_items[] = {
 		{1, "RGB", 0, "RGB", "RGB color space"},
 		{2, "YCC", 0, "YCC", "YCbCr Suppression"},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	RNA_def_struct_sdna_from(srna, "NodeChroma", "storage");
 
@@ -2097,7 +2199,7 @@ static void def_cmp_distance_matte(StructRNA *srna)
 	RNA_def_property_enum_sdna(prop, NULL, "channel");
 	RNA_def_property_enum_items(prop, color_space_items);
 	RNA_def_property_ui_text(prop, "Channel", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	
 	prop = RNA_def_property(srna, "tolerance", PROP_FLOAT, PROP_NONE);
@@ -2105,14 +2207,14 @@ static void def_cmp_distance_matte(StructRNA *srna)
 	RNA_def_property_float_funcs(prop, NULL, "rna_distance_matte_t1_set", NULL);
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Tolerance", "Color distances below this threshold are keyed");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "falloff", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "t2");
 	RNA_def_property_float_funcs(prop, NULL, "rna_distance_matte_t2_set", NULL);
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Falloff", "Color distances below this additional threshold are partially keyed");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_color_spill(StructRNA *srna)
@@ -2123,30 +2225,33 @@ static void def_cmp_color_spill(StructRNA *srna)
 		{1, "R", 0, "R", "Red Spill Suppression"},
 		{2, "G", 0, "G", "Green Spill Suppression"},
 		{3, "B", 0, "B", "Blue Spill Suppression"},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	static EnumPropertyItem limit_channel_items[] = {
 		{1, "R", 0, "R", "Limit by Red"},
 		{2, "G", 0, "G", "Limit by Green"},
 		{3, "B", 0, "B", "Limit by Blue"},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	static EnumPropertyItem algorithm_items[] = {
 		{0, "SIMPLE", 0, "Simple", "Simple Limit Algorithm"},
 		{1, "AVERAGE", 0, "Average", "Average Limit Algorithm"},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 	
 	prop = RNA_def_property(srna, "channel", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, channel_items);
 	RNA_def_property_ui_text(prop, "Channel", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "limit_method", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "custom2");
 	RNA_def_property_enum_items(prop, algorithm_items);
 	RNA_def_property_ui_text(prop, "Algorithm", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	RNA_def_struct_sdna_from(srna, "NodeColorspill", "storage");
 
@@ -2154,36 +2259,36 @@ static void def_cmp_color_spill(StructRNA *srna)
 	RNA_def_property_enum_sdna(prop, NULL, "limchan");
 	RNA_def_property_enum_items(prop, limit_channel_items);
 	RNA_def_property_ui_text(prop, "Limit Channel", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "ratio", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "limscale");
 	RNA_def_property_range(prop, 0.5f, 1.5f);
 	RNA_def_property_ui_text(prop, "Ratio", "Scale limit by value");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "use_unspill", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "unspill", 0);
 	RNA_def_property_ui_text(prop, "Unspill", "Compensate all channels (differently) by hand");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "unspill_red", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "uspillr");
 	RNA_def_property_range(prop, 0.0f, 1.5f);
 	RNA_def_property_ui_text(prop, "R", "Red spillmap scale");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "unspill_green", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "uspillg");
 	RNA_def_property_range(prop, 0.0f, 1.5f);
 	RNA_def_property_ui_text(prop, "G", "Green spillmap scale");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "unspill_blue", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "uspillb");
 	RNA_def_property_range(prop, 0.0f, 1.5f);
 	RNA_def_property_ui_text(prop, "B", "Blue spillmap scale");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_luma_matte(StructRNA *srna)
@@ -2197,14 +2302,14 @@ static void def_cmp_luma_matte(StructRNA *srna)
 	RNA_def_property_float_funcs(prop, NULL, "rna_Matte_t1_set", NULL);
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "High", "Values higher than this setting are 100% opaque");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "limit_min", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "t2");
 	RNA_def_property_float_funcs(prop, NULL, "rna_Matte_t2_set", NULL);
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Low", "Values lower than this setting are 100% keyed");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_chroma_matte(StructRNA *srna)
@@ -2218,32 +2323,32 @@ static void def_cmp_chroma_matte(StructRNA *srna)
 	RNA_def_property_float_funcs(prop, NULL, "rna_Matte_t1_set", NULL);
 	RNA_def_property_range(prop, DEG2RADF(1.0f), DEG2RADF(80.0f));
 	RNA_def_property_ui_text(prop, "Acceptance", "Tolerance for a color to be considered a keying color");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "threshold", PROP_FLOAT, PROP_ANGLE);
 	RNA_def_property_float_sdna(prop, NULL, "t2");
 	RNA_def_property_float_funcs(prop, NULL, "rna_Matte_t2_set", NULL);
 	RNA_def_property_range(prop, 0.0f, DEG2RADF(30.0f));
 	RNA_def_property_ui_text(prop, "Cutoff", "Tolerance below which colors will be considered as exact matches");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "lift", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "fsize");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Lift", "Alpha lift");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "gain", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "fstrength");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Falloff", "Alpha falloff");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "shadow_adjust", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "t3");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Shadow Adjust", "Adjusts the brightness of any shadows captured");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_channel_matte(StructRNA *srna)
@@ -2255,25 +2360,27 @@ static void def_cmp_channel_matte(StructRNA *srna)
 		{CMP_NODE_CHANNEL_MATTE_CS_HSV, "HSV", 0, "HSV",   "HSV Color Space"},
 		{CMP_NODE_CHANNEL_MATTE_CS_YUV, "YUV", 0, "YUV",   "YUV Color Space"},
 		{CMP_NODE_CHANNEL_MATTE_CS_YCC, "YCC", 0, "YCbCr", "YCbCr Color Space"},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	static EnumPropertyItem algorithm_items[] = {
 		{0, "SINGLE", 0, "Single", "Limit by single channel"},
 		{1, "MAX", 0, "Max", "Limit by max of other channels "},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 	
 	prop = RNA_def_property(srna, "color_space", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, color_space_items);
 	RNA_def_property_ui_text(prop, "Color Space", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "matte_channel", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "custom2");
 	RNA_def_property_enum_items(prop, prop_tri_channel_items);
 	RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Node_channel_itemf");
 	RNA_def_property_ui_text(prop, "Channel", "Channel used to determine matte");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	RNA_def_struct_sdna_from(srna, "NodeChroma", "storage");
 
@@ -2281,28 +2388,28 @@ static void def_cmp_channel_matte(StructRNA *srna)
 	RNA_def_property_enum_sdna(prop, NULL, "algorithm");
 	RNA_def_property_enum_items(prop, algorithm_items);
 	RNA_def_property_ui_text(prop, "Algorithm", "Algorithm to use to limit channel");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "limit_channel", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "channel");
 	RNA_def_property_enum_items(prop, prop_tri_channel_items);
 	RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Node_channel_itemf");
 	RNA_def_property_ui_text(prop, "Limit Channel", "Limit by this channel's value");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "limit_max", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "t1");
 	RNA_def_property_float_funcs(prop, NULL, "rna_Matte_t1_set", NULL);
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "High", "Values higher than this setting are 100% opaque");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "limit_min", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "t2");
 	RNA_def_property_float_funcs(prop, NULL, "rna_Matte_t2_set", NULL);
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Low", "Values lower than this setting are 100% keyed");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_flip(StructRNA *srna)
@@ -2313,7 +2420,7 @@ static void def_cmp_flip(StructRNA *srna)
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, node_flip_items);
 	RNA_def_property_ui_text(prop, "Axis", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_splitviewer(StructRNA *srna)
@@ -2323,19 +2430,20 @@ static void def_cmp_splitviewer(StructRNA *srna)
 	static EnumPropertyItem axis_items[] = {
 		{0, "X",  0, "X",     ""},
 		{1, "Y",  0, "Y",     ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 	
 	prop = RNA_def_property(srna, "axis", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "custom2");
 	RNA_def_property_enum_items(prop, axis_items);
 	RNA_def_property_ui_text(prop, "Axis", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "factor", PROP_INT, PROP_FACTOR);
 	RNA_def_property_int_sdna(prop, NULL, "custom1");
 	RNA_def_property_range(prop, 0, 100);
 	RNA_def_property_ui_text(prop, "Factor", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_id_mask(StructRNA *srna)
@@ -2346,15 +2454,15 @@ static void def_cmp_id_mask(StructRNA *srna)
 	RNA_def_property_int_sdna(prop, NULL, "custom1");
 	RNA_def_property_range(prop, 0, 32767);
 	RNA_def_property_ui_text(prop, "Index", "Pass index number to convert to alpha");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "use_smooth_mask", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "custom2", 0);
 	RNA_def_property_ui_text(prop, "Smooth Mask", "Apply an anti-aliasing filter to the mask");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
-static void def_cmp_double_edge_mask(StructRNA * srna)
+static void def_cmp_double_edge_mask(StructRNA *srna)
 {
 	PropertyRNA *prop;
 
@@ -2367,7 +2475,7 @@ static void def_cmp_double_edge_mask(StructRNA * srna)
 	static EnumPropertyItem InnerEdgeMode_items[] = {
 		{0, "ALL", 0, "All", "All pixels on inner mask edge are considered during mask calculation"},
 		{1, "ADJACENT_ONLY", 0, "Adjacent Only",
-		    "Only inner mask pixels adjacent to outer mask pixels are considered during mask calculation"},
+		 "Only inner mask pixels adjacent to outer mask pixels are considered during mask calculation"},
 		{0, NULL, 0, NULL, NULL}
 	};
 
@@ -2375,13 +2483,13 @@ static void def_cmp_double_edge_mask(StructRNA * srna)
 	RNA_def_property_enum_sdna(prop, NULL, "custom2");
 	RNA_def_property_enum_items(prop, InnerEdgeMode_items);
 	RNA_def_property_ui_text(prop, "Inner Edge Mode", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "edge_mode", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, BufEdgeMode_items);
 	RNA_def_property_ui_text(prop, "Buffer Edge Mode", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_map_uv(StructRNA *srna)
@@ -2392,7 +2500,7 @@ static void def_cmp_map_uv(StructRNA *srna)
 	RNA_def_property_int_sdna(prop, NULL, "custom1");
 	RNA_def_property_range(prop, 0, 100);
 	RNA_def_property_ui_text(prop, "Alpha", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_defocus(StructRNA *srna)
@@ -2407,7 +2515,8 @@ static void def_cmp_defocus(StructRNA *srna)
 		{4, "SQUARE",   0, "Square",     "4 sides"},
 		{3, "TRIANGLE", 0, "Triangular", "3 sides"},
 		{0, "CIRCLE",   0, "Circular",   ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 	
 	RNA_def_struct_sdna_from(srna, "NodeDefocus", "storage");
 	
@@ -2415,19 +2524,19 @@ static void def_cmp_defocus(StructRNA *srna)
 	RNA_def_property_enum_sdna(prop, NULL, "bktype");
 	RNA_def_property_enum_items(prop, bokeh_items);
 	RNA_def_property_ui_text(prop, "Bokeh Type", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	/* TODO: angle in degrees */
 	prop = RNA_def_property(srna, "angle", PROP_FLOAT, PROP_ANGLE);
 	RNA_def_property_float_sdna(prop, NULL, "rotation");
 	RNA_def_property_range(prop, 0.0f, DEG2RADF(90.0f));
 	RNA_def_property_ui_text(prop, "Angle", "Bokeh shape rotation offset");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "use_gamma_correction", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "gamco", 1);
 	RNA_def_property_ui_text(prop, "Gamma Correction", "Enable gamma correction before and after main process");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	/* TODO */
 	prop = RNA_def_property(srna, "f_stop", PROP_FLOAT, PROP_NONE);
@@ -2436,38 +2545,38 @@ static void def_cmp_defocus(StructRNA *srna)
 	RNA_def_property_ui_text(prop, "fStop",
 	                         "Amount of focal blur, 128=infinity=perfect focus, half the value doubles "
 	                         "the blur radius");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "blur_max", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "maxblur");
 	RNA_def_property_range(prop, 0.0f, 10000.0f);
 	RNA_def_property_ui_text(prop, "Max Blur", "Blur limit, maximum CoC radius");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "threshold", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "bthresh");
 	RNA_def_property_range(prop, 0.0f, 100.0f);
 	RNA_def_property_ui_text(prop, "Threshold",
 	                         "CoC radius threshold, prevents background bleed on in-focus midground, 0=off");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "use_preview", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "preview", 1);
 	RNA_def_property_ui_text(prop, "Preview", "Enable sampling mode, useful for preview when using low samplecounts");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "samples", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "samples");
 	RNA_def_property_range(prop, 16, 256);
 	RNA_def_property_ui_text(prop, "Samples", "Number of samples (16=grainy, higher=less noise)");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "use_zbuffer", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "no_zbuf", 1);
 	RNA_def_property_ui_text(prop, "Use Z-Buffer",
 	                         "Disable when using an image as input instead of actual z-buffer "
 	                         "(auto enabled if node not image based, eg. time node)");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "z_scale", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "scale");
@@ -2475,7 +2584,7 @@ static void def_cmp_defocus(StructRNA *srna)
 	RNA_def_property_ui_text(prop, "Z-Scale",
 	                         "Scale the Z input when not using a z-buffer, controls maximum blur designated "
 	                         "by the color white or input value 1");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_invert(StructRNA *srna)
@@ -2485,12 +2594,12 @@ static void def_cmp_invert(StructRNA *srna)
 	prop = RNA_def_property(srna, "invert_rgb", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "custom1", CMP_CHAN_RGB);
 	RNA_def_property_ui_text(prop, "RGB", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "invert_alpha", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "custom1", CMP_CHAN_A);
 	RNA_def_property_ui_text(prop, "Alpha", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_crop(StructRNA *srna)
@@ -2500,12 +2609,12 @@ static void def_cmp_crop(StructRNA *srna)
 	prop = RNA_def_property(srna, "use_crop_size", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "custom1", 1);
 	RNA_def_property_ui_text(prop, "Crop Image Size", "Whether to crop the size of the input image");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "relative", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "custom2", 1);
 	RNA_def_property_ui_text(prop, "Relative", "Use relative values to crop image");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	RNA_def_struct_sdna_from(srna, "NodeTwoXYs", "storage");
 
@@ -2513,49 +2622,49 @@ static void def_cmp_crop(StructRNA *srna)
 	RNA_def_property_int_sdna(prop, NULL, "x1");
 	RNA_def_property_range(prop, 0, 10000);
 	RNA_def_property_ui_text(prop, "X1", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "max_x", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "x2");
 	RNA_def_property_range(prop, 0, 10000);
 	RNA_def_property_ui_text(prop, "X2", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "min_y", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "y1");
 	RNA_def_property_range(prop, 0, 10000);
 	RNA_def_property_ui_text(prop, "Y1", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "max_y", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "y2");
 	RNA_def_property_range(prop, 0, 10000);
 	RNA_def_property_ui_text(prop, "Y2", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "rel_min_x", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "fac_x1");
 	RNA_def_property_range(prop, 0.0, 1.0);
 	RNA_def_property_ui_text(prop, "X1", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "rel_max_x", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "fac_x2");
 	RNA_def_property_range(prop, 0.0, 1.0);
 	RNA_def_property_ui_text(prop, "X2", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "rel_min_y", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "fac_y1");
 	RNA_def_property_range(prop, 0.0, 1.0);
 	RNA_def_property_ui_text(prop, "Y1", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "rel_max_y", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "fac_y2");
 	RNA_def_property_range(prop, 0.0, 1.0);
 	RNA_def_property_ui_text(prop, "Y2", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_dblur(StructRNA *srna)
@@ -2568,48 +2677,48 @@ static void def_cmp_dblur(StructRNA *srna)
 	RNA_def_property_int_sdna(prop, NULL, "iter");
 	RNA_def_property_range(prop, 1, 32);
 	RNA_def_property_ui_text(prop, "Iterations", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "use_wrap", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "wrap", 1);
 	RNA_def_property_ui_text(prop, "Wrap", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "center_x", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "center_x");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Center X", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "center_y", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "center_y");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Center Y", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "distance", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "distance");
 	RNA_def_property_range(prop, -1.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Distance", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "angle", PROP_FLOAT, PROP_ANGLE);
 	RNA_def_property_float_sdna(prop, NULL, "angle");
 	RNA_def_property_range(prop, 0.0f, DEG2RADF(360.0f));
 	RNA_def_property_ui_text(prop, "Angle", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "spin", PROP_FLOAT, PROP_ANGLE);
 	RNA_def_property_float_sdna(prop, NULL, "spin");
 	RNA_def_property_range(prop, DEG2RADF(-360.0f), DEG2RADF(360.0f));
 	RNA_def_property_ui_text(prop, "Spin", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "zoom", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "zoom");
 	RNA_def_property_range(prop, 0.0f, 100.0f);
 	RNA_def_property_ui_text(prop, "Zoom", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_bilateral_blur(StructRNA *srna)
@@ -2622,19 +2731,19 @@ static void def_cmp_bilateral_blur(StructRNA *srna)
 	RNA_def_property_int_sdna(prop, NULL, "iter");
 	RNA_def_property_range(prop, 1, 128);
 	RNA_def_property_ui_text(prop, "Iterations", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "sigma_color", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "sigma_color");
 	RNA_def_property_range(prop, 0.01f, 3.0f);
 	RNA_def_property_ui_text(prop, "Color Sigma", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "sigma_space", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "sigma_space");
 	RNA_def_property_range(prop, 0.01f, 30.0f);
 	RNA_def_property_ui_text(prop, "Space Sigma", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_premul_key(StructRNA *srna)
@@ -2644,13 +2753,14 @@ static void def_cmp_premul_key(StructRNA *srna)
 	static EnumPropertyItem type_items[] = {
 		{0, "KEY_TO_PREMUL", 0, "Key to Premul", ""},
 		{1, "PREMUL_TO_KEY", 0, "Premul to Key", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 	
 	prop = RNA_def_property(srna, "mapping", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, type_items);
 	RNA_def_property_ui_text(prop, "Mapping", "Conversion between premultiplied alpha and key alpha");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 }
 
@@ -2663,13 +2773,15 @@ static void def_cmp_glare(StructRNA *srna)
 		{2, "STREAKS",     0, "Streaks",     ""},
 		{1, "FOG_GLOW",    0, "Fog Glow",    ""},
 		{0, "SIMPLE_STAR", 0, "Simple Star", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 	
 	static EnumPropertyItem quality_items[] = {
 		{0, "HIGH",   0, "High",   ""},
 		{1, "MEDIUM", 0, "Medium", ""},
 		{2, "LOW",    0, "Low",    ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 	
 	RNA_def_struct_sdna_from(srna, "NodeGlare", "storage");
 	
@@ -2677,7 +2789,7 @@ static void def_cmp_glare(StructRNA *srna)
 	RNA_def_property_enum_sdna(prop, NULL, "type");
 	RNA_def_property_enum_items(prop, type_items);
 	RNA_def_property_ui_text(prop, "Glare Type", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "quality", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "quality");
@@ -2685,13 +2797,13 @@ static void def_cmp_glare(StructRNA *srna)
 	RNA_def_property_ui_text(prop, "Quality",
 	                         "If not set to high quality, the effect will be applied to a low-res copy "
 	                         "of the source image");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "iterations", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "iter");
 	RNA_def_property_range(prop, 2, 5);
 	RNA_def_property_ui_text(prop, "Iterations", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "color_modulation", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "colmod");
@@ -2699,51 +2811,51 @@ static void def_cmp_glare(StructRNA *srna)
 	RNA_def_property_ui_text(prop, "Color Modulation",
 	                         "Amount of Color Modulation, modulates colors of streaks and ghosts for "
 	                         "a spectral dispersion effect");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "mix", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "mix");
 	RNA_def_property_range(prop, -1.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Mix",
 	                         "-1 is original image only, 0 is exact 50/50 mix, 1 is processed image only");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "threshold", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "threshold");
 	RNA_def_property_range(prop, 0.0f, 1000.0f);
 	RNA_def_property_ui_text(prop, "Threshold",
 	                         "The glare filter will only be applied to pixels brighter than this value");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "streaks", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "angle");
 	RNA_def_property_range(prop, 2, 16);
 	RNA_def_property_ui_text(prop, "Streaks", "Total number of streaks");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "angle_offset", PROP_FLOAT, PROP_ANGLE);
 	RNA_def_property_float_sdna(prop, NULL, "angle_ofs");
 	RNA_def_property_range(prop, 0.0f, DEG2RADF(180.0f));
 	RNA_def_property_ui_text(prop, "Angle Offset", "Streak angle offset");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "fade", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "fade");
 	RNA_def_property_range(prop, 0.75f, 1.0f);
 	RNA_def_property_ui_text(prop, "Fade", "Streak fade-out factor");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "use_rotate_45", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "angle", 0);
 	RNA_def_property_ui_text(prop, "Rotate 45", "Simple star filter: add 45 degree rotation offset");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "size", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "size");
 	RNA_def_property_range(prop, 6, 9);
 	RNA_def_property_ui_text(prop, "Size",
 	                         "Glow/glare size (not actual size; relative to initial size of bright area of pixels)");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	/* TODO */
 }
@@ -2755,7 +2867,8 @@ static void def_cmp_tonemap(StructRNA *srna)
 	static EnumPropertyItem type_items[] = {
 		{1, "RD_PHOTORECEPTOR", 0, "R/D Photoreceptor", ""},
 		{0, "RH_SIMPLE",        0, "Rh Simple",         ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 	
 	RNA_def_struct_sdna_from(srna, "NodeTonemap", "storage");
 	
@@ -2763,50 +2876,50 @@ static void def_cmp_tonemap(StructRNA *srna)
 	RNA_def_property_enum_sdna(prop, NULL, "type");
 	RNA_def_property_enum_items(prop, type_items);
 	RNA_def_property_ui_text(prop, "Tonemap Type", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "key", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "key");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Key", "The value the average luminance is mapped to");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "offset", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "offset");
 	RNA_def_property_range(prop, 0.001f, 10.0f);
 	RNA_def_property_ui_text(prop, "Offset",
 	                         "Normally always 1, but can be used as an extra control to alter the brightness curve");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "gamma", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "gamma");
 	RNA_def_property_range(prop, 0.001f, 3.0f);
 	RNA_def_property_ui_text(prop, "Gamma", "If not used, set to 1");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "intensity", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "f");
 	RNA_def_property_range(prop, -8.0f, 8.0f);
 	RNA_def_property_ui_text(prop, "Intensity", "If less than zero, darkens image; otherwise, makes it brighter");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "contrast", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "m");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Contrast", "Set to 0 to use estimate from input image");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "adaptation", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "a");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Adaptation", "If 0, global; if 1, based on pixel intensity");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "correction", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "c");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Color Correction", "If 0, same for all channels; if 1, each independent");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_lensdist(StructRNA *srna)
@@ -2819,18 +2932,18 @@ static void def_cmp_lensdist(StructRNA *srna)
 	RNA_def_property_boolean_sdna(prop, NULL, "proj", 1);
 	RNA_def_property_ui_text(prop, "Projector",
 	                         "Enable/disable projector mode (the effect is applied in horizontal direction only)");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "use_jitter", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "jit", 1);
 	RNA_def_property_ui_text(prop, "Jitter", "Enable/disable jittering (faster, but also noisier)");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "use_fit", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "fit", 1);
 	RNA_def_property_ui_text(prop, "Fit",
 	                         "For positive distortion factor only: scale image such that black areas are not visible");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_colorbalance(StructRNA *srna)
@@ -2841,13 +2954,14 @@ static void def_cmp_colorbalance(StructRNA *srna)
 	static EnumPropertyItem type_items[] = {
 		{0, "LIFT_GAMMA_GAIN", 0, "Lift/Gamma/Gain", ""},
 		{1, "OFFSET_POWER_SLOPE", 0, "Offset/Power/Slope (ASC-CDL)", "ASC-CDL standard color correction"},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 	
 	prop = RNA_def_property(srna, "correction_method", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, type_items);
 	RNA_def_property_ui_text(prop, "Correction Formula", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	RNA_def_struct_sdna_from(srna, "NodeColorBalance", "storage");
 	
@@ -2857,7 +2971,7 @@ static void def_cmp_colorbalance(StructRNA *srna)
 	RNA_def_property_float_array_default(prop, default_1);
 	RNA_def_property_ui_range(prop, 0, 2, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Lift", "Correction for Shadows");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "gamma", PROP_FLOAT, PROP_COLOR_GAMMA);
 	RNA_def_property_float_sdna(prop, NULL, "gamma");
@@ -2865,7 +2979,7 @@ static void def_cmp_colorbalance(StructRNA *srna)
 	RNA_def_property_float_array_default(prop, default_1);
 	RNA_def_property_ui_range(prop, 0, 2, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Gamma", "Correction for Midtones");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "gain", PROP_FLOAT, PROP_COLOR_GAMMA);
 	RNA_def_property_float_sdna(prop, NULL, "gain");
@@ -2873,7 +2987,7 @@ static void def_cmp_colorbalance(StructRNA *srna)
 	RNA_def_property_float_array_default(prop, default_1);
 	RNA_def_property_ui_range(prop, 0, 2, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Gain", "Correction for Highlights");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	
 	prop = RNA_def_property(srna, "offset", PROP_FLOAT, PROP_COLOR_GAMMA);
@@ -2881,7 +2995,7 @@ static void def_cmp_colorbalance(StructRNA *srna)
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_range(prop, 0, 1, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Offset", "Correction for Shadows");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "power", PROP_FLOAT, PROP_COLOR_GAMMA);
 	RNA_def_property_float_sdna(prop, NULL, "gamma");
@@ -2890,7 +3004,7 @@ static void def_cmp_colorbalance(StructRNA *srna)
 	RNA_def_property_range(prop, 0.f, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0, 2, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Power", "Correction for Midtones");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "slope", PROP_FLOAT, PROP_COLOR_GAMMA);
 	RNA_def_property_float_sdna(prop, NULL, "gain");
@@ -2899,7 +3013,7 @@ static void def_cmp_colorbalance(StructRNA *srna)
 	RNA_def_property_range(prop, 0.f, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0, 2, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Slope", "Correction for Highlights");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_huecorrect(StructRNA *srna)
@@ -2910,7 +3024,7 @@ static void def_cmp_huecorrect(StructRNA *srna)
 	RNA_def_property_pointer_sdna(prop, NULL, "storage");
 	RNA_def_property_struct_type(prop, "CurveMapping");
 	RNA_def_property_ui_text(prop, "Mapping", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_zcombine(StructRNA *srna)
@@ -2920,7 +3034,7 @@ static void def_cmp_zcombine(StructRNA *srna)
 	prop = RNA_def_property(srna, "use_alpha", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "custom1", 0);
 	RNA_def_property_ui_text(prop, "Use Alpha", "Take Alpha channel into account when doing the Z operation");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_ycc(StructRNA *srna)
@@ -2931,7 +3045,7 @@ static void def_cmp_ycc(StructRNA *srna)
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, node_ycc_items);
 	RNA_def_property_ui_text(prop, "Mode", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_movieclip(StructRNA *srna)
@@ -2943,7 +3057,7 @@ static void def_cmp_movieclip(StructRNA *srna)
 	RNA_def_property_struct_type(prop, "MovieClip");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Movie Clip", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	RNA_def_struct_sdna_from(srna, "MovieClipUser", "storage");
 }
@@ -2956,20 +3070,21 @@ static void def_cmp_stabilize2d(StructRNA *srna)
 		{0, "NEAREST",   0, "Nearest",   ""},
 		{1, "BILINEAR",   0, "Bilinear",   ""},
 		{2, "BICUBIC", 0, "Bicubic", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	prop = RNA_def_property(srna, "clip", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "id");
 	RNA_def_property_struct_type(prop, "MovieClip");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Movie Clip", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "filter_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, filter_type_items);
 	RNA_def_property_ui_text(prop, "Filter", "Method to use to filter stabilization");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_moviedistortion(StructRNA *srna)
@@ -2979,20 +3094,37 @@ static void def_cmp_moviedistortion(StructRNA *srna)
 	static EnumPropertyItem distortion_type_items[] = {
 		{0, "UNDISTORT",   0, "Undistort",   ""},
 		{1, "DISTORT", 0, "Distort", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	prop = RNA_def_property(srna, "clip", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "id");
 	RNA_def_property_struct_type(prop, "MovieClip");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Movie Clip", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "distortion_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, distortion_type_items);
 	RNA_def_property_ui_text(prop, "Distortion", "Distortion to use to filter image");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
+}
+
+static void def_cmp_mask(StructRNA *srna)
+{
+	PropertyRNA *prop;
+
+	prop = RNA_def_property(srna, "smooth_mask", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "custom1", 0);
+	RNA_def_property_ui_text(prop, "Anti-Alias", "Apply an anti-aliasing filter to the mask");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
+
+	prop = RNA_def_property(srna, "mask", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "id");
+	RNA_def_property_struct_type(prop, "Mask");
+	RNA_def_property_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Mask", "");
 }
 
 static void dev_cmd_transform(StructRNA *srna)
@@ -3003,23 +3135,25 @@ static void dev_cmd_transform(StructRNA *srna)
 		{0, "NEAREST",   0, "Nearest",   ""},
 		{1, "BILINEAR",   0, "Bilinear",   ""},
 		{2, "BICUBIC", 0, "Bicubic", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	prop = RNA_def_property(srna, "filter_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, filter_type_items);
 	RNA_def_property_ui_text(prop, "Filter", "Method to use to filter transform");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 /* -- Compositor Nodes ------------------------------------------------------ */
 
 EnumPropertyItem node_masktype_items[] = {
-{0, "ADD",           0, "Add",           ""},
-{1, "SUBTRACT",      0, "Subtract",      ""},
-{2, "MULTIPLY",      0, "Multiply",      ""},
-{3, "NOT",           0, "Not",           ""},
-{0, NULL, 0, NULL, NULL}};
+	{0, "ADD",           0, "Add",           ""},
+	{1, "SUBTRACT",      0, "Subtract",      ""},
+	{2, "MULTIPLY",      0, "Multiply",      ""},
+	{3, "NOT",           0, "Not",           ""},
+	{0, NULL, 0, NULL, NULL}
+};
 
 static void def_cmp_boxmask(StructRNA *srna) 
 {
@@ -3029,7 +3163,7 @@ static void def_cmp_boxmask(StructRNA *srna)
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, node_masktype_items);
 	RNA_def_property_ui_text(prop, "Mask type", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	RNA_def_struct_sdna_from(srna, "NodeBoxMask", "storage");
 
@@ -3038,35 +3172,35 @@ static void def_cmp_boxmask(StructRNA *srna)
 	RNA_def_property_float_default(prop, 0.5f);
 	RNA_def_property_range(prop, -1.0f, 2.0f);
 	RNA_def_property_ui_text(prop, "X", "X position of the middle of the box");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "y", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "y");
 	RNA_def_property_float_default(prop, 0.5f);
 	RNA_def_property_range(prop, -1.0f, 2.0f);
 	RNA_def_property_ui_text(prop, "Y", "Y position of the middle of the box");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "width", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "width");
 	RNA_def_property_float_default(prop, 0.3f);
 	RNA_def_property_range(prop, 0.0f, 2.0f);
 	RNA_def_property_ui_text(prop, "Width", "Width of the box");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "height", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "height");
 	RNA_def_property_float_default(prop, 0.2f);
 	RNA_def_property_range(prop, 0.0f, 2.0f);
 	RNA_def_property_ui_text(prop, "Height", "Height of the box");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "rotation", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "rotation");
 	RNA_def_property_float_default(prop, 0.0f);
 	RNA_def_property_range(prop, -1000.0f, 1000.0f);
 	RNA_def_property_ui_text(prop, "Rotation", "Rotation angle of the box");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_ellipsemask(StructRNA *srna)
@@ -3076,7 +3210,7 @@ static void def_cmp_ellipsemask(StructRNA *srna)
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, node_masktype_items);
 	RNA_def_property_ui_text(prop, "Mask type", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	RNA_def_struct_sdna_from(srna, "NodeEllipseMask", "storage");
 
@@ -3085,35 +3219,54 @@ static void def_cmp_ellipsemask(StructRNA *srna)
 	RNA_def_property_float_default(prop, 0.5f);
 	RNA_def_property_range(prop, -1.0f, 2.0f);
 	RNA_def_property_ui_text(prop, "X", "X position of the middle of the box");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "y", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "y");
 	RNA_def_property_float_default(prop, 0.5f);
 	RNA_def_property_range(prop, -1.0f, 2.0f);
 	RNA_def_property_ui_text(prop, "Y", "Y position of the middle of the box");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "width", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "width");
 	RNA_def_property_float_default(prop, 0.3f);
 	RNA_def_property_range(prop, 0.0f, 2.0f);
 	RNA_def_property_ui_text(prop, "Width", "Width of the box");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "height", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "height");
 	RNA_def_property_float_default(prop, 0.2f);
 	RNA_def_property_range(prop, 0.0f, 2.0f);
 	RNA_def_property_ui_text(prop, "Height", "Height of the box");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "rotation", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "rotation");
 	RNA_def_property_float_default(prop, 0.0f);
 	RNA_def_property_range(prop, -1000.0f, 1000.0f);
 	RNA_def_property_ui_text(prop, "Rotation", "Rotationangle of the box");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
+}
+
+static void def_cmp_bokehblur(StructRNA *srna)
+{
+	PropertyRNA *prop;
+	prop = RNA_def_property(srna, "f_stop", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "custom3");
+	RNA_def_property_range(prop, 0.0f, 128.0f);
+	RNA_def_property_ui_text(prop, "fStop",
+	                         "Amount of focal blur, 128=infinity=perfect focus, half the value doubles "
+	                         "the blur radius");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
+	
+	prop = RNA_def_property(srna, "blur_max", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "custom4");
+	RNA_def_property_range(prop, 0.0f, 10000.0f);
+	RNA_def_property_ui_text(prop, "Max Blur", "Blur limit, maximum CoC radius");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
+	
 }
 
 static void def_cmp_bokehimage(StructRNA *srna)
@@ -3127,35 +3280,35 @@ static void def_cmp_bokehimage(StructRNA *srna)
 	RNA_def_property_float_default(prop, 0.0f);
 	RNA_def_property_range(prop, -720.0f, 720.0f);
 	RNA_def_property_ui_text(prop, "Angle", "Angle of the bokeh");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "flaps", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "flaps");
 	RNA_def_property_int_default(prop, 5);
 	RNA_def_property_range(prop, 3, 24);
 	RNA_def_property_ui_text(prop, "Flaps", "Number of flaps");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "rounding", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "rounding");
 	RNA_def_property_float_default(prop, 0.0f);
 	RNA_def_property_range(prop, -0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Rounding", "Level of rounding of the bokeh");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "catadioptric", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "catadioptric");
 	RNA_def_property_float_default(prop, 0.0f);
 	RNA_def_property_range(prop, -0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Catadioptric", "Level of catadioptric of the bokeh");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "shift", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "lensshift");
 	RNA_def_property_float_default(prop, 0.0f);
 	RNA_def_property_range(prop, -1.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Lens shift", "Shift of the lens components");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 }
 
@@ -3166,7 +3319,7 @@ static void def_cmp_switch(StructRNA *srna)
 	prop = RNA_def_property(srna, "check", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "custom1", 0);
 	RNA_def_property_ui_text(prop, "Switch", "Off: first socket, On: second socket");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_colorcorrection(StructRNA *srna)
@@ -3176,19 +3329,19 @@ static void def_cmp_colorcorrection(StructRNA *srna)
 	RNA_def_property_boolean_sdna(prop, NULL, "custom1", 1);
 	RNA_def_property_boolean_default(prop, TRUE);
 	RNA_def_property_ui_text(prop, "Red", "Red channel active");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "green", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "custom1", 2);
 	RNA_def_property_boolean_default(prop, TRUE);
 	RNA_def_property_ui_text(prop, "Green", "Green channel active");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "blue", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "custom1", 4);
 	RNA_def_property_boolean_default(prop, TRUE);
 	RNA_def_property_ui_text(prop, "Blue", "Blue channel active");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	RNA_def_struct_sdna_from(srna, "NodeColorCorrection", "storage");
 	
@@ -3197,49 +3350,49 @@ static void def_cmp_colorcorrection(StructRNA *srna)
 	RNA_def_property_float_default(prop, 0.2f);
 	RNA_def_property_range(prop, 0, 1);
 	RNA_def_property_ui_text(prop, "Midtones Start", "Start of midtones");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "midtones_end", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "endmidtones");
 	RNA_def_property_float_default(prop, 0.7f);
 	RNA_def_property_range(prop, 0, 1);
 	RNA_def_property_ui_text(prop, "Midtones End", "End of midtones");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "master_saturation", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "master.saturation");
 	RNA_def_property_float_default(prop, 1.0f);
 	RNA_def_property_range(prop, 0, 4);
 	RNA_def_property_ui_text(prop, "Master Saturation", "Master saturation");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "master_contrast", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "master.contrast");
 	RNA_def_property_float_default(prop, 1.0f);
 	RNA_def_property_range(prop, 0, 4);
 	RNA_def_property_ui_text(prop, "Master Contrast", "Master contrast");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "master_gamma", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "master.gamma");
 	RNA_def_property_float_default(prop, 1.0f);
 	RNA_def_property_range(prop, 0, 4);
 	RNA_def_property_ui_text(prop, "Master Gamma", "Master gamma");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "master_gain", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "master.gain");
 	RNA_def_property_float_default(prop, 1.0f);
 	RNA_def_property_range(prop, 0, 4);
 	RNA_def_property_ui_text(prop, "Master Gain", "Master gain");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "master_lift", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "master.lift");
 	RNA_def_property_float_default(prop, 0.0f);
 	RNA_def_property_range(prop, -1, 1);
 	RNA_def_property_ui_text(prop, "Master Lift", "Master lift");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 //
 	prop = RNA_def_property(srna, "shadows_saturation", PROP_FLOAT, PROP_NONE);
@@ -3247,105 +3400,105 @@ static void def_cmp_colorcorrection(StructRNA *srna)
 	RNA_def_property_float_default(prop, 1.0f);
 	RNA_def_property_range(prop, 0, 4);
 	RNA_def_property_ui_text(prop, "Shadows Saturation", "Shadows saturation");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "shadows_contrast", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "shadows.contrast");
 	RNA_def_property_float_default(prop, 1.0f);
 	RNA_def_property_range(prop, 0, 4);
 	RNA_def_property_ui_text(prop, "Shadows Contrast", "Shadows contrast");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "shadows_gamma", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "shadows.gamma");
 	RNA_def_property_float_default(prop, 1.0f);
 	RNA_def_property_range(prop, 0, 4);
 	RNA_def_property_ui_text(prop, "Shadows Gamma", "Shadows gamma");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "shadows_gain", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "shadows.gain");
 	RNA_def_property_float_default(prop, 1.0f);
 	RNA_def_property_range(prop, 0, 4);
 	RNA_def_property_ui_text(prop, "Shadows Gain", "Shadows gain");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "shadows_lift", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "shadows.lift");
 	RNA_def_property_float_default(prop, 0.0f);
 	RNA_def_property_range(prop, -1, 1);
 	RNA_def_property_ui_text(prop, "Shadows Lift", "Shadows lift");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 //
 	prop = RNA_def_property(srna, "midtones_saturation", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "midtones.saturation");
 	RNA_def_property_float_default(prop, 1.0f);
 	RNA_def_property_range(prop, 0, 4);
 	RNA_def_property_ui_text(prop, "Midtones Saturation", "Midtones saturation");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "midtones_contrast", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "midtones.contrast");
 	RNA_def_property_float_default(prop, 1.0f);
 	RNA_def_property_range(prop, 0, 4);
 	RNA_def_property_ui_text(prop, "Midtones Contrast", "Midtones contrast");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "midtones_gamma", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "midtones.gamma");
 	RNA_def_property_float_default(prop, 1.0f);
 	RNA_def_property_range(prop, 0, 4);
 	RNA_def_property_ui_text(prop, "Midtones Gamma", "Midtones gamma");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "midtones_gain", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "midtones.gain");
 	RNA_def_property_float_default(prop, 1.0f);
 	RNA_def_property_range(prop, 0, 4);
 	RNA_def_property_ui_text(prop, "Midtones Gain", "Midtones gain");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "midtones_lift", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "midtones.lift");
 	RNA_def_property_float_default(prop, 0.0f);
 	RNA_def_property_range(prop, -1, 1);
 	RNA_def_property_ui_text(prop, "Midtones Lift", "Midtones lift");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 //
 	prop = RNA_def_property(srna, "highlights_saturation", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "highlights.saturation");
 	RNA_def_property_float_default(prop, 1.0f);
 	RNA_def_property_range(prop, 0, 4);
 	RNA_def_property_ui_text(prop, "Highlights Saturation", "Highlights saturation");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "highlights_contrast", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "highlights.contrast");
 	RNA_def_property_float_default(prop, 1.0f);
 	RNA_def_property_range(prop, 0, 4);
 	RNA_def_property_ui_text(prop, "Highlights Contrast", "Highlights contrast");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "highlights_gamma", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "highlights.gamma");
 	RNA_def_property_float_default(prop, 1.0f);
 	RNA_def_property_range(prop, 0, 4);
 	RNA_def_property_ui_text(prop, "Highlights Gamma", "Highlights gamma");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "highlights_gain", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "highlights.gain");
 	RNA_def_property_float_default(prop, 1.0f);
 	RNA_def_property_range(prop, 0, 4);
 	RNA_def_property_ui_text(prop, "Highlights Gain", "Highlights gain");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "highlights_lift", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "highlights.lift");
 	RNA_def_property_float_default(prop, 0.0f);
 	RNA_def_property_range(prop, -1, 1);
 	RNA_def_property_ui_text(prop, "Highlights Lift", "Highlights lift");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_cmp_viewer(StructRNA *srna)
@@ -3356,29 +3509,109 @@ static void def_cmp_viewer(StructRNA *srna)
 		{1, "RANDOM",         0, "Random",         "Random tiles"},
 		{2, "BOTTOMUP",       0, "Bottom up",      "Expand from bottom"},
 		{3, "RULE_OF_THIRDS", 0, "Rule of thirds", "Expand from 9 places"},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	prop = RNA_def_property(srna, "tile_order", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, tileorder_items);
 	RNA_def_property_ui_text(prop, "Tile order", "Tile order");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "center_x", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "custom3");
 	RNA_def_property_float_default(prop, 0.5f);
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "X", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "center_y", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "custom4");
 	RNA_def_property_float_default(prop, 0.5f);
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Y", "");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
+}
+
+static void def_cmp_keyingscreen(StructRNA *srna)
+{
+	PropertyRNA *prop;
+
+	prop = RNA_def_property(srna, "clip", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "id");
+	RNA_def_property_struct_type(prop, "MovieClip");
+	RNA_def_property_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Movie Clip", "");
+	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+
+	RNA_def_struct_sdna_from(srna, "NodeKeyingScreenData", "storage");
+
+	prop = RNA_def_property(srna, "tracking_object", PROP_STRING, PROP_NONE);
+	RNA_def_property_string_sdna(prop, NULL, "tracking_object");
+	RNA_def_property_ui_text(prop, "Tracking Object", "");
 	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
 }
 
+static void def_cmp_keying(StructRNA *srna)
+{
+	PropertyRNA *prop;
+
+	RNA_def_struct_sdna_from(srna, "NodeKeyingData", "storage");
+
+	prop = RNA_def_property(srna, "screen_balance", PROP_FLOAT, PROP_FACTOR);
+	RNA_def_property_float_sdna(prop, NULL, "screen_balance");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
+	RNA_def_property_ui_text(prop, "Screen Balance", "Balance between two non-primary channels primary channel is comparing against");
+	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+
+	prop = RNA_def_property(srna, "despill_factor", PROP_FLOAT, PROP_FACTOR);
+	RNA_def_property_float_sdna(prop, NULL, "despill_factor");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
+	RNA_def_property_ui_text(prop, "Despill", "Factor of despilling screen color from image");
+	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+
+	prop = RNA_def_property(srna, "clip_black", PROP_FLOAT, PROP_FACTOR);
+	RNA_def_property_float_sdna(prop, NULL, "clip_black");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
+	RNA_def_property_ui_text(prop, "Clip Black", "Value of on-scaled matte pixel which considers as fully background pixel");
+	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+
+	prop = RNA_def_property(srna, "clip_white", PROP_FLOAT, PROP_FACTOR);
+	RNA_def_property_float_sdna(prop, NULL, "clip_white");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
+	RNA_def_property_ui_text(prop, "Clip White", "Value of on-scaled matte pixel which considers as fully foreground pixel");
+	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+
+	prop = RNA_def_property(srna, "blur_pre", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "blur_pre");
+	RNA_def_property_range(prop, 0, 2048);
+	RNA_def_property_ui_text(prop, "Pre Blur", "Chroma pre-blur size which applies before running keyer");
+	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+
+	prop = RNA_def_property(srna, "blur_post", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "blur_post");
+	RNA_def_property_range(prop, 0, 2048);
+	RNA_def_property_ui_text(prop, "Post Blur", "Matte blur size which applies after clipping and dilate/eroding");
+	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+
+	prop = RNA_def_property(srna, "dilate_distance", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "dilate_distance");
+	RNA_def_property_range(prop, -100, 100);
+	RNA_def_property_ui_text(prop, "Dilate/Erode", "Matte dilate/erode side");
+	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+
+	prop = RNA_def_property(srna, "edge_kernel_radius", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "edge_kernel_radius");
+	RNA_def_property_range(prop, -100, 100);
+	RNA_def_property_ui_text(prop, "Edge Kernel Radius", "Radius of kernel used to detect whether pixel belongs to edge");
+	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+
+	prop = RNA_def_property(srna, "edge_kernel_tolerance", PROP_FLOAT, PROP_FACTOR);
+	RNA_def_property_float_sdna(prop, NULL, "edge_kernel_tolerance");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
+	RNA_def_property_ui_text(prop, "Edge Kernel Tolerance", "Tolerance to pixels inside kernel which are treating as belonging to the same plane");
+	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+}
 
 /* -- Texture Nodes --------------------------------------------------------- */
 
@@ -3391,7 +3624,7 @@ static void def_tex_output(StructRNA *srna)
 	prop = RNA_def_property(srna, "filepath", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "name");
 	RNA_def_property_ui_text(prop, "Output Name", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 static void def_tex_image(StructRNA *srna)
@@ -3403,15 +3636,15 @@ static void def_tex_image(StructRNA *srna)
 	RNA_def_property_struct_type(prop, "Image");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Image", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
-	
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
+
 	/* is this supposed to be exposed? not sure.. */
 #if 0
 	prop = RNA_def_property(srna, "settings", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "storage");
 	RNA_def_property_struct_type(prop, "ImageUser");
 	RNA_def_property_ui_text(prop, "Settings", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 #endif
 }
 
@@ -3423,25 +3656,25 @@ static void def_tex_bricks(StructRNA *srna)
 	RNA_def_property_float_sdna(prop, NULL, "custom3");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Offset Amount", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "offset_frequency", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "custom1");
 	RNA_def_property_range(prop, 2, 99);
 	RNA_def_property_ui_text(prop, "Offset Frequency", "Offset every N rows");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "squash", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "custom4");
 	RNA_def_property_range(prop, 0.0f, 99.0f);
 	RNA_def_property_ui_text(prop, "Squash Amount", "");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "squash_frequency", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "custom2");
 	RNA_def_property_range(prop, 2, 99);
 	RNA_def_property_ui_text(prop, "Squash Frequency", "Squash every N rows");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
 /* -------------------------------------------------------------------------- */
@@ -3534,6 +3767,19 @@ static void rna_def_nodetree_link_api(BlenderRNA *brna, PropertyRNA *cprop)
 	RNA_def_function_ui_description(func, "remove all node links from the node tree");
 }
 
+/* shared between all note tree types*/
+static void rna_def_nodetree_active_api(StructRNA *srna, PropertyRNA *cprop)
+{
+	PropertyRNA *prop;
+
+	prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE);
+	RNA_def_property_struct_type(prop, "Node");
+	RNA_def_property_pointer_funcs(prop, "rna_NodeTree_active_node_get", "rna_NodeTree_active_node_set", NULL, NULL);
+	RNA_def_property_flag(prop, PROP_EDITABLE | PROP_NEVER_UNLINK);
+	RNA_def_property_ui_text(prop, "Active Node", "Active node in this tree");
+	RNA_def_property_update(prop, NC_SCENE | ND_OB_ACTIVE, NULL);
+}
+
 static void rna_def_composite_nodetree_api(BlenderRNA *brna, PropertyRNA *cprop)
 {
 	StructRNA *srna;
@@ -3547,7 +3793,7 @@ static void rna_def_composite_nodetree_api(BlenderRNA *brna, PropertyRNA *cprop)
 
 	func = RNA_def_function(srna, "new", "rna_NodeTree_node_composite_new");
 	RNA_def_function_ui_description(func, "Add a node to this node tree");
-	RNA_def_function_flag(func, FUNC_USE_CONTEXT|FUNC_USE_REPORTS);
+	RNA_def_function_flag(func, FUNC_USE_CONTEXT | FUNC_USE_REPORTS);
 	parm = RNA_def_enum(func, "type", compositor_node_type_items, 0, "Type", "Type of node to add");
 	RNA_def_property_flag(parm, PROP_REQUIRED);
 	RNA_def_pointer(func, "group", "NodeTree", "", "The group tree");
@@ -3563,6 +3809,8 @@ static void rna_def_composite_nodetree_api(BlenderRNA *brna, PropertyRNA *cprop)
 
 	func = RNA_def_function(srna, "clear", "rna_NodeTree_node_clear");
 	RNA_def_function_ui_description(func, "Remove all nodes from this node tree");
+
+	rna_def_nodetree_active_api(srna, cprop);
 }
 
 static void rna_def_shader_nodetree_api(BlenderRNA *brna, PropertyRNA *cprop)
@@ -3578,7 +3826,7 @@ static void rna_def_shader_nodetree_api(BlenderRNA *brna, PropertyRNA *cprop)
 
 	func = RNA_def_function(srna, "new", "rna_NodeTree_node_new");
 	RNA_def_function_ui_description(func, "Add a node to this node tree");
-	RNA_def_function_flag(func, FUNC_USE_CONTEXT|FUNC_USE_REPORTS);
+	RNA_def_function_flag(func, FUNC_USE_CONTEXT | FUNC_USE_REPORTS);
 	parm = RNA_def_enum(func, "type", shader_node_type_items, 0, "Type", "Type of node to add");
 	RNA_def_property_flag(parm, PROP_REQUIRED);
 	RNA_def_pointer(func, "group", "NodeTree", "", "The group tree");
@@ -3594,6 +3842,8 @@ static void rna_def_shader_nodetree_api(BlenderRNA *brna, PropertyRNA *cprop)
 
 	func = RNA_def_function(srna, "clear", "rna_NodeTree_node_clear");
 	RNA_def_function_ui_description(func, "Remove all nodes from this node tree");
+
+	rna_def_nodetree_active_api(srna, cprop);
 }
 
 static void rna_def_texture_nodetree_api(BlenderRNA *brna, PropertyRNA *cprop)
@@ -3609,7 +3859,7 @@ static void rna_def_texture_nodetree_api(BlenderRNA *brna, PropertyRNA *cprop)
 
 	func = RNA_def_function(srna, "new", "rna_NodeTree_node_texture_new");
 	RNA_def_function_ui_description(func, "Add a node to this node tree");
-	RNA_def_function_flag(func, FUNC_USE_CONTEXT|FUNC_USE_REPORTS);
+	RNA_def_function_flag(func, FUNC_USE_CONTEXT | FUNC_USE_REPORTS);
 	parm = RNA_def_enum(func, "type", texture_node_type_items, 0, "Type", "Type of node to add");
 	RNA_def_property_flag(parm, PROP_REQUIRED);
 	RNA_def_pointer(func, "group", "NodeTree", "", "The group tree");
@@ -3625,6 +3875,8 @@ static void rna_def_texture_nodetree_api(BlenderRNA *brna, PropertyRNA *cprop)
 
 	func = RNA_def_function(srna, "clear", "rna_NodeTree_node_clear");
 	RNA_def_function_ui_description(func, "Remove all nodes from this node tree");
+
+	rna_def_nodetree_active_api(srna, cprop);
 }
 
 static void rna_def_node_socket(BlenderRNA *brna)
@@ -3651,7 +3903,7 @@ static void rna_def_node_socket(BlenderRNA *brna)
 /*	RNA_def_property_clear_flag(prop, PROP_EDITABLE); */
 	RNA_def_property_ui_text(prop, "Name", "Socket name");
 	RNA_def_struct_name_property(srna, prop);
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_NodeGroupSocket_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_NodeGroupSocket_update");
 
 	prop = RNA_def_property(srna, "group_socket", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "groupsock");
@@ -3662,7 +3914,7 @@ static void rna_def_node_socket(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "show_expanded", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SOCK_COLLAPSED);
 	RNA_def_property_ui_text(prop, "Expanded", "Socket links are expanded in the user interface");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, NULL);
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, NULL);
 }
 
 static void rna_def_node_socket_subtype(BlenderRNA *brna, int type, int subtype, const char *name, const char *ui_name)
@@ -3678,7 +3930,7 @@ static void rna_def_node_socket_subtype(BlenderRNA *brna, int type, int subtype,
 	};
 	#undef SUBTYPE
 
-	#define SUBTYPE(socktype, stypename, id, idname)	if (subtype == (PROP_##id))	propsubtype = PROP_##id;
+	#define SUBTYPE(socktype, stypename, id, idname)    if (subtype == (PROP_##id)) propsubtype = PROP_##id;
 	NODE_DEFINE_SUBTYPES
 	#undef SUBTYPE
 	
@@ -3689,67 +3941,67 @@ static void rna_def_node_socket_subtype(BlenderRNA *brna, int type, int subtype,
 	RNA_def_struct_path_func(srna, "rna_NodeSocket_path");
 	
 	switch (type) {
-	case SOCK_INT:
-		RNA_def_struct_sdna_from(srna, "bNodeSocketValueInt", "default_value");
-		
-		prop = RNA_def_property(srna, "subtype", PROP_ENUM, PROP_NONE);
-		RNA_def_property_enum_sdna(prop, NULL, "subtype");
-		RNA_def_property_enum_items(prop, subtype_items);
-		RNA_def_property_ui_text(prop, "Subtype", "Subtype defining the socket value details");
-		RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_NodeSocket_update");
-		
-		prop = RNA_def_property(srna, "default_value", PROP_INT, propsubtype);
-		RNA_def_property_int_sdna(prop, NULL, "value");
-		RNA_def_property_int_funcs(prop, NULL, NULL, "rna_NodeSocketInt_range");
-		RNA_def_property_ui_text(prop, "Default Value", "");
-		RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_NodeSocket_update");
-		break;
-	case SOCK_FLOAT:
-		RNA_def_struct_sdna_from(srna, "bNodeSocketValueFloat", "default_value");
-		
-		prop = RNA_def_property(srna, "subtype", PROP_ENUM, PROP_NONE);
-		RNA_def_property_enum_sdna(prop, NULL, "subtype");
-		RNA_def_property_enum_items(prop, subtype_items);
-		RNA_def_property_ui_text(prop, "Subtype", "Subtype defining the socket value details");
-		RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_NodeSocket_update");
-		
-		prop = RNA_def_property(srna, "default_value", PROP_FLOAT, propsubtype);
-		RNA_def_property_float_sdna(prop, NULL, "value");
-		RNA_def_property_float_funcs(prop, NULL, NULL, "rna_NodeSocketFloat_range");
-		RNA_def_property_ui_text(prop, "Default Value", "");
-		RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_NodeSocket_update");
-		break;
-	case SOCK_BOOLEAN:
-		RNA_def_struct_sdna_from(srna, "bNodeSocketValueBoolean", "default_value");
-		
-		prop = RNA_def_property(srna, "default_value", PROP_BOOLEAN, PROP_NONE);
-		RNA_def_property_boolean_sdna(prop, NULL, "value", 1);
-		RNA_def_property_ui_text(prop, "Default Value", "");
-		RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_NodeSocket_update");
-		break;
-	case SOCK_VECTOR:
-		RNA_def_struct_sdna_from(srna, "bNodeSocketValueVector", "default_value");
-		
-		prop = RNA_def_property(srna, "subtype", PROP_ENUM, PROP_NONE);
-		RNA_def_property_enum_sdna(prop, NULL, "subtype");
-		RNA_def_property_enum_items(prop, subtype_items);
-		RNA_def_property_ui_text(prop, "Subtype", "Subtype defining the socket value details");
-		RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_NodeSocket_update");
-		
-		prop = RNA_def_property(srna, "default_value", PROP_FLOAT, propsubtype);
-		RNA_def_property_float_sdna(prop, NULL, "value");
-		RNA_def_property_float_funcs(prop, NULL, NULL, "rna_NodeSocketVector_range");
-		RNA_def_property_ui_text(prop, "Default Value", "");
-		RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_NodeSocket_update");
-		break;
-	case SOCK_RGBA:
-		RNA_def_struct_sdna_from(srna, "bNodeSocketValueRGBA", "default_value");
+		case SOCK_INT:
+			RNA_def_struct_sdna_from(srna, "bNodeSocketValueInt", "default_value");
+
+			prop = RNA_def_property(srna, "subtype", PROP_ENUM, PROP_NONE);
+			RNA_def_property_enum_sdna(prop, NULL, "subtype");
+			RNA_def_property_enum_items(prop, subtype_items);
+			RNA_def_property_ui_text(prop, "Subtype", "Subtype defining the socket value details");
+			RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_NodeSocket_update");
+
+			prop = RNA_def_property(srna, "default_value", PROP_INT, propsubtype);
+			RNA_def_property_int_sdna(prop, NULL, "value");
+			RNA_def_property_int_funcs(prop, NULL, NULL, "rna_NodeSocketInt_range");
+			RNA_def_property_ui_text(prop, "Default Value", "");
+			RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_NodeSocket_update");
+			break;
+		case SOCK_FLOAT:
+			RNA_def_struct_sdna_from(srna, "bNodeSocketValueFloat", "default_value");
+
+			prop = RNA_def_property(srna, "subtype", PROP_ENUM, PROP_NONE);
+			RNA_def_property_enum_sdna(prop, NULL, "subtype");
+			RNA_def_property_enum_items(prop, subtype_items);
+			RNA_def_property_ui_text(prop, "Subtype", "Subtype defining the socket value details");
+			RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_NodeSocket_update");
+
+			prop = RNA_def_property(srna, "default_value", PROP_FLOAT, propsubtype);
+			RNA_def_property_float_sdna(prop, NULL, "value");
+			RNA_def_property_float_funcs(prop, NULL, NULL, "rna_NodeSocketFloat_range");
+			RNA_def_property_ui_text(prop, "Default Value", "");
+			RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_NodeSocket_update");
+			break;
+		case SOCK_BOOLEAN:
+			RNA_def_struct_sdna_from(srna, "bNodeSocketValueBoolean", "default_value");
 		
-		prop = RNA_def_property(srna, "default_value", PROP_FLOAT, PROP_COLOR);
-		RNA_def_property_float_sdna(prop, NULL, "value");
-		RNA_def_property_ui_text(prop, "Default Value", "");
-		RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_NodeSocket_update");
-		break;
+			prop = RNA_def_property(srna, "default_value", PROP_BOOLEAN, PROP_NONE);
+			RNA_def_property_boolean_sdna(prop, NULL, "value", 1);
+			RNA_def_property_ui_text(prop, "Default Value", "");
+			RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_NodeSocket_update");
+			break;
+		case SOCK_VECTOR:
+			RNA_def_struct_sdna_from(srna, "bNodeSocketValueVector", "default_value");
+
+			prop = RNA_def_property(srna, "subtype", PROP_ENUM, PROP_NONE);
+			RNA_def_property_enum_sdna(prop, NULL, "subtype");
+			RNA_def_property_enum_items(prop, subtype_items);
+			RNA_def_property_ui_text(prop, "Subtype", "Subtype defining the socket value details");
+			RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_NodeSocket_update");
+
+			prop = RNA_def_property(srna, "default_value", PROP_FLOAT, propsubtype);
+			RNA_def_property_float_sdna(prop, NULL, "value");
+			RNA_def_property_float_funcs(prop, NULL, NULL, "rna_NodeSocketVector_range");
+			RNA_def_property_ui_text(prop, "Default Value", "");
+			RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_NodeSocket_update");
+			break;
+		case SOCK_RGBA:
+			RNA_def_struct_sdna_from(srna, "bNodeSocketValueRGBA", "default_value");
+
+			prop = RNA_def_property(srna, "default_value", PROP_FLOAT, PROP_COLOR);
+			RNA_def_property_float_sdna(prop, NULL, "value");
+			RNA_def_property_ui_text(prop, "Default Value", "");
+			RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_NodeSocket_update");
+			break;
 	}
 	
 	/* XXX need to reset the from-type here, so subtype subclasses cast correctly! (RNA bug) */
@@ -3779,7 +4031,7 @@ static void rna_def_node(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Name", "Unique node identifier");
 	RNA_def_struct_name_property(srna, prop);
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_Node_name_set");
-	RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 	
 	prop = RNA_def_property(srna, "label", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "label");
@@ -3806,13 +4058,34 @@ static void rna_def_node(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", NODE_CUSTOM_COLOR);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_ui_text(prop, "Custom Color", "Use custom color for the node");
-	RNA_def_property_update(prop, NC_NODE|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_NODE | ND_DISPLAY, NULL);
 
 	prop = RNA_def_property(srna, "color", PROP_FLOAT, PROP_COLOR);
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Color", "Custom color of the node body");
-	RNA_def_property_update(prop, NC_NODE|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_NODE | ND_DISPLAY, NULL);
+
+	prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", NODE_SELECT);
+	RNA_def_property_ui_text(prop, "Select", "");
+
+	prop = RNA_def_property(srna, "show_options", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", NODE_OPTIONS);
+	RNA_def_property_ui_text(prop, "Show Options", "");
+
+	prop = RNA_def_property(srna, "show_preview", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", NODE_PREVIEW);
+	RNA_def_property_ui_text(prop, "Show Preview", "");
+
+	prop = RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", NODE_HIDDEN);
+	RNA_def_property_ui_text(prop, "Hide", "");
+
+	prop = RNA_def_property(srna, "mute", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", NODE_MUTED);
+	RNA_def_property_ui_text(prop, "Mute", "");
+	RNA_def_property_update(prop, 0, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "show_texture", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", NODE_ACTIVE_TEXTURE);
@@ -3948,26 +4221,27 @@ static void rna_def_composite_nodetree(BlenderRNA *brna)
 	RNA_def_property_struct_type(prop, "Node");
 	RNA_def_property_ui_text(prop, "Nodes", "");
 
-	prop= RNA_def_property(srna, "render_quality", PROP_ENUM, PROP_NONE);
+	rna_def_composite_nodetree_api(brna, prop);
+
+	prop = RNA_def_property(srna, "render_quality", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "render_quality");
 	RNA_def_property_enum_items(prop, node_quality_items);
 	RNA_def_property_ui_text(prop, "Render Quality", "Quality when rendering");
 
-	prop= RNA_def_property(srna, "edit_quality", PROP_ENUM, PROP_NONE);
+	prop = RNA_def_property(srna, "edit_quality", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "edit_quality");
 	RNA_def_property_enum_items(prop, node_quality_items);
 	RNA_def_property_ui_text(prop, "Edit Quality", "Quality when editing");
 
-	prop= RNA_def_property(srna, "chunksize", PROP_INT, PROP_NONE);
-	RNA_def_property_int_sdna(prop, NULL, "chunksize");
-	RNA_def_property_ui_text(prop, "Chunksize", "Max size of a tile. Smaller values gives better distribution of multiple threads, but more overhead.");
-	RNA_def_property_range(prop, 32, 1024);
+	prop = RNA_def_property(srna, "chunk_size", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "chunksize");
+	RNA_def_property_enum_items(prop, node_chunksize_items);
+	RNA_def_property_ui_text(prop, "Chunksize", "Max size of a tile (smaller values gives better distribution "
+	                                            "of multiple threads, but more overhead)");
 
-	prop= RNA_def_property(srna, "use_opencl", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "use_opencl", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", NTREE_COM_OPENCL);
 	RNA_def_property_ui_text(prop, "OpenCL", "Enable GPU calculations");
-
-	rna_def_composite_nodetree_api(brna, prop);
 }
 
 static void rna_def_shader_nodetree(BlenderRNA *brna)
@@ -4009,7 +4283,7 @@ static void rna_def_texture_nodetree(BlenderRNA *brna)
 	rna_def_texture_nodetree_api(brna, prop);
 }
 
-static void define_specific_node(BlenderRNA *brna, int id, void (*func)(StructRNA*))
+static void define_specific_node(BlenderRNA *brna, int id, void (*func)(StructRNA *))
 {
 	StructRNA *srna = def_node(brna, id);
 	
@@ -4052,6 +4326,7 @@ void RNA_def_nodetree(BlenderRNA *brna)
 	define_specific_node(brna, NODE_FORLOOP, def_forloop);
 	define_specific_node(brna, NODE_WHILELOOP, def_whileloop);
 	define_specific_node(brna, NODE_FRAME, def_frame);
+	define_specific_node(brna, NODE_REROUTE, 0);
 	
 	/* special socket types */
 	rna_def_cmp_output_file_slot_file(brna);
diff --git a/source/blender/makesrna/intern/rna_nodetree_types.h b/source/blender/makesrna/intern/rna_nodetree_types.h
index 351c6d93514..62c3051727d 100644
--- a/source/blender/makesrna/intern/rna_nodetree_types.h
+++ b/source/blender/makesrna/intern/rna_nodetree_types.h
@@ -80,6 +80,7 @@ DefNode( ShaderNode,     SH_NODE_NEW_GEOMETRY,       0,                      "NE
 DefNode( ShaderNode,     SH_NODE_LIGHT_PATH,         0,                      "LIGHT_PATH",         LightPath,        "Light Path",        ""       )
 DefNode( ShaderNode,     SH_NODE_LIGHT_FALLOFF,      0,                      "LIGHT_FALLOFF",      LightFalloff,     "Light Falloff",     ""       )
 DefNode( ShaderNode,     SH_NODE_OBJECT_INFO,        0,                      "OBJECT_INFO",        ObjectInfo,       "Object Info",       ""       )
+DefNode( ShaderNode,     SH_NODE_PARTICLE_INFO,      0,                      "PARTICLE_INFO",      ParticleInfo,     "Particle Info",     ""       )
 DefNode( ShaderNode,     SH_NODE_TEX_IMAGE,          def_sh_tex_image,       "TEX_IMAGE",          TexImage,         "Image Texture",     ""       )
 DefNode( ShaderNode,     SH_NODE_TEX_ENVIRONMENT,    def_sh_tex_environment, "TEX_ENVIRONMENT",    TexEnvironment,   "Environment Texture",""      )
 DefNode( ShaderNode,     SH_NODE_TEX_SKY,            def_sh_tex_sky,         "TEX_SKY",            TexSky,           "Sky Texture",       ""       )
@@ -163,8 +164,12 @@ DefNode( CompositorNode, CMP_NODE_MOVIEDISTORTION,def_cmp_moviedistortion,"MOVIE
 DefNode( CompositorNode, CMP_NODE_MASK_BOX,       def_cmp_boxmask,        "BOXMASK"        ,BoxMask,          "Box mask",          ""              )
 DefNode( CompositorNode, CMP_NODE_MASK_ELLIPSE,   def_cmp_ellipsemask,    "ELLIPSEMASK"    ,EllipseMask,      "Ellipse mask",      ""              )
 DefNode( CompositorNode, CMP_NODE_BOKEHIMAGE,     def_cmp_bokehimage,     "BOKEHIMAGE"     ,BokehImage,       "Bokeh image",       ""              )
+DefNode( CompositorNode, CMP_NODE_BOKEHBLUR,      def_cmp_bokehblur,      "BOKEHBLUR"      ,BokehBlur,        "Bokeh Blur",        ""              )
 DefNode( CompositorNode, CMP_NODE_SWITCH,         def_cmp_switch,         "SWITCH"         ,Switch,           "Switch",            ""              )
 DefNode( CompositorNode, CMP_NODE_COLORCORRECTION,def_cmp_colorcorrection,"COLORCORRECTION",ColorCorrection,  "ColorCorrection",   ""              )
+DefNode( CompositorNode, CMP_NODE_MASK,           def_cmp_mask,           "MASK",           Mask,             "Mask",              ""              )
+DefNode( CompositorNode, CMP_NODE_KEYINGSCREEN,   def_cmp_keyingscreen,   "KEYINGSCREEN",   KeyingScreen,     "KeyingScreen",      ""              )
+DefNode( CompositorNode, CMP_NODE_KEYING,         def_cmp_keying,         "KEYING",         Keying,           "Keying",            ""              )
                                                                                                                                                    
 DefNode( TextureNode,    TEX_NODE_OUTPUT,         def_tex_output,         "OUTPUT",         Output,           "Output",            ""              )
 DefNode( TextureNode,    TEX_NODE_CHECKER,        0,                      "CHECKER",        Checker,          "Checker",           ""              )
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 21c9187cbb8..0399a8ee60d 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -891,6 +891,9 @@ static int rna_GameObjectSettings_physics_type_get(PointerRNA *ptr)
 			ob->body_type = OB_BODY_TYPE_NO_COLLISION;
 		}
 	}
+	else if (ob->gameflag & OB_CHARACTER) {
+		ob->body_type = OB_BODY_TYPE_CHARACTER;
+	}
 	else if (ob->gameflag & OB_SENSOR) {
 		ob->body_type = OB_BODY_TYPE_SENSOR;
 	}
@@ -922,16 +925,16 @@ static void rna_GameObjectSettings_physics_type_set(PointerRNA *ptr, int value)
 	switch (ob->body_type) {
 		case OB_BODY_TYPE_SENSOR:
 			ob->gameflag |= OB_SENSOR | OB_COLLISION | OB_GHOST;
-			ob->gameflag &= ~(OB_OCCLUDER | OB_DYNAMIC | OB_RIGID_BODY | OB_SOFT_BODY | OB_ACTOR |
+			ob->gameflag &= ~(OB_OCCLUDER | OB_CHARACTER | OB_DYNAMIC | OB_RIGID_BODY | OB_SOFT_BODY | OB_ACTOR |
 			                  OB_ANISOTROPIC_FRICTION | OB_DO_FH | OB_ROT_FH | OB_COLLISION_RESPONSE | OB_NAVMESH);
 			break;
 		case OB_BODY_TYPE_OCCLUDER:
 			ob->gameflag |= OB_OCCLUDER;
-			ob->gameflag &= ~(OB_SENSOR | OB_RIGID_BODY | OB_SOFT_BODY | OB_COLLISION | OB_DYNAMIC | OB_NAVMESH);
+			ob->gameflag &= ~(OB_SENSOR | OB_RIGID_BODY | OB_SOFT_BODY | OB_COLLISION | OB_CHARACTER | OB_DYNAMIC | OB_NAVMESH);
 			break;
 		case OB_BODY_TYPE_NAVMESH:
 			ob->gameflag |= OB_NAVMESH;
-			ob->gameflag &= ~(OB_SENSOR | OB_RIGID_BODY | OB_SOFT_BODY | OB_COLLISION | OB_DYNAMIC | OB_OCCLUDER);
+			ob->gameflag &= ~(OB_SENSOR | OB_RIGID_BODY | OB_SOFT_BODY | OB_COLLISION | OB_CHARACTER | OB_DYNAMIC | OB_OCCLUDER);
 
 			if (ob->type == OB_MESH) {
 				/* could be moved into mesh UI but for now ensure mesh data layer */
@@ -940,24 +943,29 @@ static void rna_GameObjectSettings_physics_type_set(PointerRNA *ptr, int value)
 
 			break;
 		case OB_BODY_TYPE_NO_COLLISION:
-			ob->gameflag &= ~(OB_SENSOR | OB_RIGID_BODY | OB_SOFT_BODY | OB_COLLISION | OB_OCCLUDER | OB_DYNAMIC | OB_NAVMESH);
+			ob->gameflag &= ~(OB_SENSOR | OB_RIGID_BODY | OB_SOFT_BODY | OB_COLLISION | OB_CHARACTER | OB_OCCLUDER | OB_DYNAMIC | OB_NAVMESH);
 			break;
+		case OB_BODY_TYPE_CHARACTER:
+			ob->gameflag |= OB_COLLISION | OB_GHOST | OB_CHARACTER;
+			ob->gameflag &= ~(OB_SENSOR | OB_OCCLUDER | OB_DYNAMIC | OB_RIGID_BODY | OB_SOFT_BODY | OB_ACTOR
+		                     | OB_ANISOTROPIC_FRICTION | OB_DO_FH | OB_ROT_FH | OB_COLLISION_RESPONSE | OB_NAVMESH);
+		break;
 		case OB_BODY_TYPE_STATIC:
 			ob->gameflag |= OB_COLLISION;
-			ob->gameflag &= ~(OB_DYNAMIC | OB_RIGID_BODY | OB_SOFT_BODY | OB_OCCLUDER | OB_SENSOR | OB_NAVMESH);
+			ob->gameflag &= ~(OB_DYNAMIC | OB_RIGID_BODY | OB_SOFT_BODY | OB_OCCLUDER | OB_CHARACTER | OB_SENSOR | OB_NAVMESH);
 			break;
 		case OB_BODY_TYPE_DYNAMIC:
 			ob->gameflag |= OB_COLLISION | OB_DYNAMIC | OB_ACTOR;
-			ob->gameflag &= ~(OB_RIGID_BODY | OB_SOFT_BODY | OB_OCCLUDER | OB_SENSOR | OB_NAVMESH);
+			ob->gameflag &= ~(OB_RIGID_BODY | OB_SOFT_BODY | OB_OCCLUDER | OB_CHARACTER | OB_SENSOR | OB_NAVMESH);
 			break;
 		case OB_BODY_TYPE_RIGID:
 			ob->gameflag |= OB_COLLISION | OB_DYNAMIC | OB_RIGID_BODY | OB_ACTOR;
-			ob->gameflag &= ~(OB_SOFT_BODY | OB_OCCLUDER | OB_SENSOR | OB_NAVMESH);
+			ob->gameflag &= ~(OB_SOFT_BODY | OB_OCCLUDER | OB_CHARACTER | OB_SENSOR | OB_NAVMESH);
 			break;
 		default:
 		case OB_BODY_TYPE_SOFT:
 			ob->gameflag |= OB_COLLISION | OB_DYNAMIC | OB_SOFT_BODY | OB_ACTOR;
-			ob->gameflag &= ~(OB_RIGID_BODY | OB_OCCLUDER | OB_SENSOR | OB_NAVMESH);
+			ob->gameflag &= ~(OB_RIGID_BODY | OB_OCCLUDER | OB_CHARACTER | OB_SENSOR | OB_NAVMESH);
 
 			/* assume triangle mesh, if no bounds chosen for soft body */
 			if ((ob->gameflag & OB_BOUNDS) && (ob->boundtype < OB_BOUND_TRIANGLE_MESH)) {
@@ -1436,6 +1444,7 @@ static void rna_def_object_game_settings(BlenderRNA *brna)
 		                      "Collision Sensor, detects static and dynamic objects but not the other "
 		                      "collision sensor objects"},
 		{OB_BODY_TYPE_NAVMESH, "NAVMESH", 0, "Navigation Mesh", "Navigation mesh"},
+		{OB_BODY_TYPE_CHARACTER, "CHARACTER", 0, "Character", "Simple kinematic physics appropiate for game characters"},
 		{0, NULL, 0, NULL, NULL}
 	};
 
@@ -1529,6 +1538,22 @@ static void rna_def_object_game_settings(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "max_vel");
 	RNA_def_property_range(prop, 0.0, 1000.0);
 	RNA_def_property_ui_text(prop, "Velocity Max", "Clamp velocity to this maximum speed");
+	
+	prop= RNA_def_property(srna, "step_height", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "step_height");
+	RNA_def_property_range(prop, 0.0, 1.0);
+	RNA_def_property_ui_text(prop, "Step Height", "Maximum height of steps the character can run over");
+
+	prop= RNA_def_property(srna, "jump_speed", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "jump_speed");
+	RNA_def_property_range(prop, 0.0, 1000.0);
+	RNA_def_property_ui_text(prop, "Jump Force", "Upward velocity applied to the character when jumping (with the Motion actuator)");
+
+	prop= RNA_def_property(srna, "fall_speed", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "fall_speed");
+	RNA_def_property_range(prop, 0.0, 1000.0);
+	RNA_def_property_ui_text(prop, "Fall Speed Max", "Maximum speed at which the character will fall");
+
 
 	/* lock position */
 	prop = RNA_def_property(srna, "lock_location_x", PROP_BOOLEAN, PROP_NONE);
@@ -2520,6 +2545,16 @@ static void rna_def_dupli_object(BlenderRNA *brna)
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE | PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Hide", "Don't show dupli object in viewport or render");
 
+	prop = RNA_def_property(srna, "index", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "index");
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE | PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Index", "Index in the lowest-level dupli list");
+	
+	prop = RNA_def_property(srna, "particle_index", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "particle_index");
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE | PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Particle Index", "Index in the lowest-level particle dupli list");
+
 	/* TODO: DupliObject has more properties that can be wrapped */
 }
 
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index d179612ae04..8cf3b718c30 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -1754,7 +1754,6 @@ static void rna_def_particle_settings(BlenderRNA *brna)
 	RNA_def_property_enum_sdna(prop, NULL, "distr");
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_enum_items(prop, part_dist_items);
-	RNA_def_property_enum_items(prop, part_draw_as_items);
 	RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Particle_dist_itemf");
 	RNA_def_property_ui_text(prop, "Distribution", "How to distribute particles on selected element");
 	RNA_def_property_update(prop, 0, "rna_Particle_reset");
diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c
index 83d40b26cd0..eaf1ae09524 100644
--- a/source/blender/makesrna/intern/rna_pose.c
+++ b/source/blender/makesrna/intern/rna_pose.c
@@ -139,31 +139,12 @@ void rna_ActionGroup_colorset_set(PointerRNA *ptr, int value)
 {
 	bActionGroup *grp = ptr->data;
 	
-	/* if valid value, set the new enum value, then copy the relevant colors? */
-	if ((value >= -1) && (value < 21))
+	/* ensure only valid values get set */
+	if ((value >= -1) && (value < 21)) {
 		grp->customCol = value;
-	else
-		return;
 	
-	/* only do color copying if using a custom color (i.e. not default color)  */
-	if (grp->customCol) {
-		if (grp->customCol > 0) {
-			/* copy theme colors on-to group's custom color in case user tries to edit color */
-			bTheme *btheme = U.themes.first;
-			ThemeWireColor *col_set = &btheme->tarm[(grp->customCol - 1)];
-			
-			memcpy(&grp->cs, col_set, sizeof(ThemeWireColor));
-		}
-		else {
-			/* init custom colors with a generic multi-color rgb set, if not initialized already
-			 * (for custom color set) */
-			if (grp->cs.solid[0] == 0) {
-				/* define for setting colors in theme below */
-				rgba_char_args_set(grp->cs.solid, 0xff, 0x00, 0x00, 255);
-				rgba_char_args_set(grp->cs.select, 0x81, 0xe6, 0x14, 255);
-				rgba_char_args_set(grp->cs.active, 0x18, 0xb6, 0xe0, 255);
-			}
-		}
+		/* sync colors stored with theme colors based on the index specified */
+		action_group_colors_sync(grp);
 	}
 }
 
@@ -765,6 +746,7 @@ static void rna_def_pose_channel(BlenderRNA *brna)
 	RNA_def_struct_ui_text(srna, "Pose Bone", "Channel defining pose data for a bone in a Pose");
 	RNA_def_struct_path_func(srna, "rna_PoseBone_path");
 	RNA_def_struct_idprops_func(srna, "rna_PoseBone_idprops");
+	RNA_def_struct_ui_icon(srna, ICON_BONE_DATA);
 	
 	/* Bone Constraints */
 	prop = RNA_def_property(srna, "constraints", PROP_COLLECTION, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 5b355e56911..85c7b5679c1 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -1565,6 +1565,12 @@ static void rna_def_tool_settings(BlenderRNA  *brna)
 	RNA_def_property_ui_icon(prop, ICON_PROP_OFF, 1);
 	RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* header redraw */
 
+	prop = RNA_def_property(srna, "use_proportional_edit_mask", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "proportional_mask", 0);
+	RNA_def_property_ui_text(prop, "Proportional Editing Objects", "Proportional editing mask mode");
+	RNA_def_property_ui_icon(prop, ICON_PROP_OFF, 1);
+	RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* header redraw */
+
 	prop = RNA_def_property(srna, "proportional_edit_falloff", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "prop_mode");
 	RNA_def_property_enum_items(prop, proportional_falloff_items);
@@ -2577,6 +2583,31 @@ static void rna_def_scene_game_data(BlenderRNA *brna)
 	                         "higher value give better physics precision");
 	RNA_def_property_update(prop, NC_SCENE, NULL);
 
+	prop = RNA_def_property(srna, "deactivation_linear_threshold", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "lineardeactthreshold");
+	RNA_def_property_ui_range(prop, 0.001, 10000.0, 2, 3);
+	RNA_def_property_range(prop, 0.001, 10000.0);
+	RNA_def_property_ui_text(prop, "Deactivation Linear Threshold",
+	                         "Linear velocity that an object must be below before the deactivation timer can start");
+	RNA_def_property_update(prop, NC_SCENE, NULL);
+
+	prop = RNA_def_property(srna, "deactivation_angular_threshold", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "angulardeactthreshold");
+	RNA_def_property_ui_range(prop, 0.001, 10000.0, 2, 3);
+	RNA_def_property_range(prop, 0.001, 10000.0);
+	RNA_def_property_ui_text(prop, "Deactivation Angular Threshold",
+	                         "Angular velocity that an object must be below before the deactivation timer can start");
+	RNA_def_property_update(prop, NC_SCENE, NULL);
+
+	prop = RNA_def_property(srna, "deactivation_time", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "deactivationtime");
+	RNA_def_property_ui_range(prop, 0.0, 60.0, 1, 1);
+	RNA_def_property_range(prop, 0.0, 60.0);
+	RNA_def_property_ui_text(prop, "Deactivation Time",
+	                         "Amount of time (in seconds) after which objects with a velocity less than the given "
+	                         "threshold will deactivate (0.0 means no deactivation)");
+	RNA_def_property_update(prop, NC_SCENE, NULL);
+
 	/* mode */
 	prop = RNA_def_property(srna, "use_occlusion_culling", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", (1 << 5)); /*XXX mode hardcoded  *//* WO_DBVT_CULLING */
@@ -3629,6 +3660,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
 	
 	prop = RNA_def_property(srna, "use_compositing", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_DOCOMP);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_ui_text(prop, "Compositing",
 	                         "Process the render result through the compositing pipeline, "
 	                         "if compositing nodes are enabled");
@@ -3636,6 +3668,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
 	
 	prop = RNA_def_property(srna, "use_sequencer", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_DOSEQ);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_ui_text(prop, "Sequencer",
 	                         "Process the render (and composited) result through the video sequence "
 	                         "editor pipeline, if sequencer strips exist");
diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c
index 439335e69b4..d4611f4a268 100644
--- a/source/blender/makesrna/intern/rna_scene_api.c
+++ b/source/blender/makesrna/intern/rna_scene_api.c
@@ -39,6 +39,7 @@
 #include "DNA_scene_types.h"
 #include "BKE_utildefines.h"
 
+
 #ifdef RNA_RUNTIME
 
 #include "BKE_animsys.h"
@@ -87,13 +88,20 @@ static void rna_SceneRender_get_frame_path(RenderData *rd, int frame, char *name
 
 static void rna_Scene_collada_export(
     Scene *scene,
-	const char *filepath,
-	int selected,
-	int apply_modifiers,
-	int include_bone_children,
-	int second_life)
+    const char *filepath,
+    int apply_modifiers,
+	int export_mesh_type,
+    int selected,
+    int include_children,
+    int include_armatures,
+    int deform_bones_only,
+    int use_object_instantiation,
+    int sort_by_name,
+    int second_life)
 {
-	collada_export(scene, filepath, selected, apply_modifiers, include_bone_children, second_life);
+	collada_export(scene, filepath, apply_modifiers, export_mesh_type, selected,  
+	               include_children, include_armatures, deform_bones_only, 
+	               use_object_instantiation, sort_by_name, second_life);
 }
 
 #endif
@@ -121,9 +129,15 @@ void RNA_api_scene(StructRNA *srna)
 	parm = RNA_def_string(func, "filepath", "", FILE_MAX, "File Path", "File path to write Collada file");
 	RNA_def_property_flag(parm, PROP_REQUIRED);
 	RNA_def_property_subtype(parm, PROP_FILEPATH); /* allow non utf8 */
+	parm = RNA_def_boolean(func, "apply_modifiers", 0, "Apply Modifiers", "Apply modifiers");
+	parm = RNA_def_int(func, "export_mesh_type", 0, INT_MIN, INT_MAX,
+	            "Resolution", "Modifier resolution for export", INT_MIN, INT_MAX);
 	parm = RNA_def_boolean(func, "selected", 0, "Selection Only", "Export only selected elements");
-	parm = RNA_def_boolean(func, "apply_modifiers", 0, "Apply Modifiers", "Apply modifiers (in Preview resolution)");
-	parm = RNA_def_boolean(func, "include_bone_children", 0, "Include Bone Children", "Include all objects attached to bones of selected Armature(s)");
+	parm = RNA_def_boolean(func, "include_children", 0, "Include Children", "Export all children of selected objects (even if not selected)");
+	parm = RNA_def_boolean(func, "include_armatures", 0, "Include Armatures", "Export related armatures (even if not selected)");
+	parm = RNA_def_boolean(func, "deform_bones_only", 0, "Deform Bones only", "Only export deforming bones with armatures");
+	parm = RNA_def_boolean(func, "use_object_instantiation", 1, "Use Object Instances", "Instantiate multiple Objects from same Data");
+	parm = RNA_def_boolean(func, "sort_by_name", 0, "Sort by Object name", "Sort exported data by Object name");
 	parm = RNA_def_boolean(func, "second_life", 0, "Export for Second Life", "Compatibility mode for Second Life");
 	RNA_def_function_ui_description(func, "Export to collada file");
 #endif
diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c
index a3c309625f3..fb8ba2f863e 100644
--- a/source/blender/makesrna/intern/rna_sequencer.c
+++ b/source/blender/makesrna/intern/rna_sequencer.c
@@ -64,7 +64,7 @@ static void meta_tmp_ref(Sequence *seq_par, Sequence *seq)
 {
 	for (; seq; seq = seq->next) {
 		seq->tmp = seq_par;
-		if (seq->type == SEQ_META) {
+		if (seq->type == SEQ_TYPE_META) {
 			meta_tmp_ref(seq, seq->seqbase.first);
 		}
 	}
@@ -396,47 +396,49 @@ static StructRNA *rna_Sequence_refine(struct PointerRNA *ptr)
 	Sequence *seq = (Sequence *)ptr->data;
 
 	switch (seq->type) {
-		case SEQ_IMAGE:
+		case SEQ_TYPE_IMAGE:
 			return &RNA_ImageSequence;
-		case SEQ_META:
+		case SEQ_TYPE_META:
 			return &RNA_MetaSequence;
-		case SEQ_SCENE:
+		case SEQ_TYPE_SCENE:
 			return &RNA_SceneSequence;
-		case SEQ_MOVIE:
+		case SEQ_TYPE_MOVIE:
 			return &RNA_MovieSequence;
-		case SEQ_MOVIECLIP:
+		case SEQ_TYPE_MOVIECLIP:
 			return &RNA_MovieClipSequence;
-		case SEQ_SOUND:
+		case SEQ_TYPE_MASK:
+			return &RNA_MaskSequence;
+		case SEQ_TYPE_SOUND_RAM:
 			return &RNA_SoundSequence;
-		case SEQ_CROSS:
+		case SEQ_TYPE_CROSS:
 			return &RNA_CrossSequence;
-		case SEQ_ADD:
+		case SEQ_TYPE_ADD:
 			return &RNA_AddSequence;
-		case SEQ_SUB:
+		case SEQ_TYPE_SUB:
 			return &RNA_SubtractSequence;
-		case SEQ_ALPHAOVER:
+		case SEQ_TYPE_ALPHAOVER:
 			return &RNA_AlphaOverSequence;
-		case SEQ_ALPHAUNDER:
+		case SEQ_TYPE_ALPHAUNDER:
 			return &RNA_AlphaUnderSequence;
-		case SEQ_GAMCROSS:
+		case SEQ_TYPE_GAMCROSS:
 			return &RNA_GammaCrossSequence;
-		case SEQ_MUL:
+		case SEQ_TYPE_MUL:
 			return &RNA_MultiplySequence;
-		case SEQ_OVERDROP:
+		case SEQ_TYPE_OVERDROP:
 			return &RNA_OverDropSequence;
-		case SEQ_MULTICAM:
+		case SEQ_TYPE_MULTICAM:
 			return &RNA_MulticamSequence;
-		case SEQ_ADJUSTMENT:
+		case SEQ_TYPE_ADJUSTMENT:
 			return &RNA_AdjustmentSequence;
-		case SEQ_WIPE:
+		case SEQ_TYPE_WIPE:
 			return &RNA_WipeSequence;
-		case SEQ_GLOW:
+		case SEQ_TYPE_GLOW:
 			return &RNA_GlowSequence;
-		case SEQ_TRANSFORM:
+		case SEQ_TYPE_TRANSFORM:
 			return &RNA_TransformSequence;
-		case SEQ_COLOR:
+		case SEQ_TYPE_COLOR:
 			return &RNA_ColorSequence;
-		case SEQ_SPEED:
+		case SEQ_TYPE_SPEED:
 			return &RNA_SpeedControlSequence;
 		default:
 			return &RNA_Sequence;
@@ -469,7 +471,7 @@ static void rna_Sequence_filepath_set(PointerRNA *ptr, const char *value)
 {
 	Sequence *seq = (Sequence *)(ptr->data);
 
-	if (seq->type == SEQ_SOUND && seq->sound) {
+	if (seq->type == SEQ_TYPE_SOUND_RAM && seq->sound) {
 		/* for sound strips we need to update the sound as well.
 		 * arguably, this could load in a new sound rather than modify an existing one.
 		 * but while using the sequencer its most likely your not using the sound in the game engine too.
@@ -967,14 +969,14 @@ static void rna_def_strip_color_balance(BlenderRNA *brna)
 
 EnumPropertyItem blend_mode_items[] = {
 	{SEQ_BLEND_REPLACE, "REPLACE", 0, "Replace", ""},
-	{SEQ_CROSS, "CROSS", 0, "Cross", ""},
-	{SEQ_ADD, "ADD", 0, "Add", ""},
-	{SEQ_SUB, "SUBTRACT", 0, "Subtract", ""},
-	{SEQ_ALPHAOVER, "ALPHA_OVER", 0, "Alpha Over", ""},
-	{SEQ_ALPHAUNDER, "ALPHA_UNDER", 0, "Alpha Under", ""},
-	{SEQ_GAMCROSS, "GAMMA_CROSS", 0, "Gamma Cross", ""},
-	{SEQ_MUL, "MULTIPLY", 0, "Multiply", ""},
-	{SEQ_OVERDROP, "OVER_DROP", 0, "Over Drop", ""},
+	{SEQ_TYPE_CROSS, "CROSS", 0, "Cross", ""},
+	{SEQ_TYPE_ADD, "ADD", 0, "Add", ""},
+	{SEQ_TYPE_SUB, "SUBTRACT", 0, "Subtract", ""},
+	{SEQ_TYPE_ALPHAOVER, "ALPHA_OVER", 0, "Alpha Over", ""},
+	{SEQ_TYPE_ALPHAUNDER, "ALPHA_UNDER", 0, "Alpha Under", ""},
+	{SEQ_TYPE_GAMCROSS, "GAMMA_CROSS", 0, "Gamma Cross", ""},
+	{SEQ_TYPE_MUL, "MULTIPLY", 0, "Multiply", ""},
+	{SEQ_TYPE_OVERDROP, "OVER_DROP", 0, "Over Drop", ""},
 	{0, NULL, 0, NULL, NULL}
 };
 
@@ -984,28 +986,28 @@ static void rna_def_sequence(BlenderRNA *brna)
 	PropertyRNA *prop;
 
 	static const EnumPropertyItem seq_type_items[] = {
-		{SEQ_IMAGE, "IMAGE", 0, "Image", ""},
-		{SEQ_META, "META", 0, "Meta", ""},
-		{SEQ_SCENE, "SCENE", 0, "Scene", ""},
-		{SEQ_MOVIE, "MOVIE", 0, "Movie", ""},
-		{SEQ_MOVIECLIP, "MOVIECLIP", 0, "Clip", ""},
-		{SEQ_SOUND, "SOUND", 0, "Sound", ""},
-		{SEQ_CROSS, "CROSS", 0, "Cross", ""},
-		{SEQ_ADD, "ADD", 0, "Add", ""},
-		{SEQ_SUB, "SUBTRACT", 0, "Subtract", ""},
-		{SEQ_ALPHAOVER, "ALPHA_OVER", 0, "Alpha Over", ""},
-		{SEQ_ALPHAUNDER, "ALPHA_UNDER", 0, "Alpha Under", ""},
-		{SEQ_GAMCROSS, "GAMMA_CROSS", 0, "Gamma Cross", ""},
-		{SEQ_MUL, "MULTIPLY", 0, "Multiply", ""},
-		{SEQ_OVERDROP, "OVER_DROP", 0, "Over Drop", ""},
-		{SEQ_PLUGIN, "PLUGIN", 0, "Plugin", ""},
-		{SEQ_WIPE, "WIPE", 0, "Wipe", ""},
-		{SEQ_GLOW, "GLOW", 0, "Glow", ""},
-		{SEQ_TRANSFORM, "TRANSFORM", 0, "Transform", ""},
-		{SEQ_COLOR, "COLOR", 0, "Color", ""},
-		{SEQ_SPEED, "SPEED", 0, "Speed", ""},
-		{SEQ_MULTICAM, "MULTICAM", 0, "Multicam Selector", ""},
-		{SEQ_ADJUSTMENT, "ADJUSTMENT", 0, "Adjustment Layer", ""},
+		{SEQ_TYPE_IMAGE, "IMAGE", 0, "Image", ""},
+		{SEQ_TYPE_META, "META", 0, "Meta", ""},
+		{SEQ_TYPE_SCENE, "SCENE", 0, "Scene", ""},
+		{SEQ_TYPE_MOVIE, "MOVIE", 0, "Movie", ""},
+		{SEQ_TYPE_MOVIECLIP, "MOVIECLIP", 0, "Clip", ""},
+		{SEQ_TYPE_MASK, "MASK", 0, "Mask", ""},
+		{SEQ_TYPE_SOUND_RAM, "SOUND", 0, "Sound", ""},
+		{SEQ_TYPE_CROSS, "CROSS", 0, "Cross", ""},
+		{SEQ_TYPE_ADD, "ADD", 0, "Add", ""},
+		{SEQ_TYPE_SUB, "SUBTRACT", 0, "Subtract", ""},
+		{SEQ_TYPE_ALPHAOVER, "ALPHA_OVER", 0, "Alpha Over", ""},
+		{SEQ_TYPE_ALPHAUNDER, "ALPHA_UNDER", 0, "Alpha Under", ""},
+		{SEQ_TYPE_GAMCROSS, "GAMMA_CROSS", 0, "Gamma Cross", ""},
+		{SEQ_TYPE_MUL, "MULTIPLY", 0, "Multiply", ""},
+		{SEQ_TYPE_OVERDROP, "OVER_DROP", 0, "Over Drop", ""},
+		{SEQ_TYPE_WIPE, "WIPE", 0, "Wipe", ""},
+		{SEQ_TYPE_GLOW, "GLOW", 0, "Glow", ""},
+		{SEQ_TYPE_TRANSFORM, "TRANSFORM", 0, "Transform", ""},
+		{SEQ_TYPE_COLOR, "COLOR", 0, "Color", ""},
+		{SEQ_TYPE_SPEED, "SPEED", 0, "Speed", ""},
+		{SEQ_TYPE_MULTICAM, "MULTICAM", 0, "Multicam Selector", ""},
+		{SEQ_TYPE_ADJUSTMENT, "ADJUSTMENT", 0, "Adjustment Layer", ""},
 		{0, NULL, 0, NULL, NULL}
 	};
 	
@@ -1375,7 +1377,7 @@ static void rna_def_effect_inputs(StructRNA *srna, int count)
 	}
 
 	/*
-	if (count == 3) { // not used by any effects ...except maybe plugins? 
+	if (count == 3) { // not used by any effects (perhaps one day plugins?)
 		prop = RNA_def_property(srna, "input_3",  PROP_POINTER, PROP_NONE);
 		RNA_def_property_pointer_sdna(prop, NULL, "seq3");
 		RNA_def_property_flag(prop, PROP_EDITABLE | PROP_NEVER_NULL);
@@ -1506,6 +1508,8 @@ static void rna_def_movieclip(BlenderRNA *brna)
 	RNA_def_struct_ui_text(srna, "MovieClip Sequence", "Sequence strip to load a video from the clip editor");
 	RNA_def_struct_sdna(srna, "Sequence");
 
+	/* TODO - add clip property? */
+
 	prop = RNA_def_property(srna, "undistort", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "clip_flag", SEQ_MOVIECLIP_RENDER_UNDISTORTED);
 	RNA_def_property_ui_text(prop, "Undistort Clip", "Use the undistorted version of the clip");
@@ -1520,6 +1524,23 @@ static void rna_def_movieclip(BlenderRNA *brna)
 	rna_def_input(srna);
 }
 
+static void rna_def_mask(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	srna = RNA_def_struct(brna, "MaskSequence", "Sequence");
+	RNA_def_struct_ui_text(srna, "Mask Sequence", "Sequence strip to load a video from a mask");
+	RNA_def_struct_sdna(srna, "Sequence");
+
+	prop = RNA_def_property(srna, "mask", PROP_POINTER, PROP_NONE);
+	RNA_def_property_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Mask", "Mask that this sequence uses");
+	RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_update");
+
+	rna_def_filter_video(srna);
+	rna_def_input(srna);
+}
 
 static void rna_def_sound(BlenderRNA *brna)
 {
@@ -1884,6 +1905,7 @@ void RNA_def_sequencer(BlenderRNA *brna)
 	rna_def_scene(brna);
 	rna_def_movie(brna);
 	rna_def_movieclip(brna);
+	rna_def_mask(brna);
 	rna_def_sound(brna);
 	rna_def_effect(brna);
 	rna_def_effects(brna);
diff --git a/source/blender/makesrna/intern/rna_sequencer_api.c b/source/blender/makesrna/intern/rna_sequencer_api.c
index 4d471ae4b41..3a534cd22b4 100644
--- a/source/blender/makesrna/intern/rna_sequencer_api.c
+++ b/source/blender/makesrna/intern/rna_sequencer_api.c
@@ -45,6 +45,7 @@ extern EnumPropertyItem blend_mode_items[];
 #include "DNA_image_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_sequence_types.h"
+#include "DNA_mask_types.h"
 #include "DNA_sound_types.h"
 
 #include "BLI_path_util.h" /* BLI_split_dirfile */
@@ -52,6 +53,7 @@ extern EnumPropertyItem blend_mode_items[];
 #include "BKE_image.h"
 #include "BKE_library.h" /* id_us_plus */
 #include "BKE_movieclip.h"
+#include "BKE_mask.h"
 
 #include "BKE_report.h"
 #include "BKE_sequencer.h"
@@ -104,7 +106,7 @@ static Sequence *rna_Sequences_new_clip(ID *id, Editing *ed, ReportList *reports
 	Scene *scene = (Scene *)id;
 	Sequence *seq;
 
-	seq = alloc_generic_sequence(ed, name, start_frame, channel, SEQ_MOVIECLIP, clip->name);
+	seq = alloc_generic_sequence(ed, name, start_frame, channel, SEQ_TYPE_MOVIECLIP, clip->name);
 	seq->clip = clip;
 	seq->len =  BKE_movieclip_get_duration(clip);
 	id_us_plus((ID *)clip);
@@ -116,6 +118,25 @@ static Sequence *rna_Sequences_new_clip(ID *id, Editing *ed, ReportList *reports
 	return seq;
 }
 
+static Sequence *rna_Sequences_new_mask(ID *id, Editing *ed, ReportList *reports,
+                                        const char *name, Mask *mask, int channel,
+                                        int start_frame)
+{
+	Scene *scene = (Scene *)id;
+	Sequence *seq;
+
+	seq = alloc_generic_sequence(ed, name, start_frame, channel, SEQ_TYPE_MASK, mask->id.name);
+	seq->mask = mask;
+	seq->len = BKE_mask_get_duration(mask);
+	id_us_plus((ID *)mask);
+
+	calc_sequence_disp(scene, seq);
+
+	WM_main_add_notifier(NC_SCENE | ND_SEQUENCER, scene);
+
+	return seq;
+}
+
 static Sequence *rna_Sequences_new_scene(ID *id, Editing *ed, ReportList *reports,
                                          const char *name, Scene *sce_seq, int channel,
                                          int start_frame)
@@ -123,7 +144,7 @@ static Sequence *rna_Sequences_new_scene(ID *id, Editing *ed, ReportList *report
 	Scene *scene = (Scene *)id;
 	Sequence *seq;
 
-	seq = alloc_generic_sequence(ed, name, start_frame, channel, SEQ_SCENE, NULL);
+	seq = alloc_generic_sequence(ed, name, start_frame, channel, SEQ_TYPE_SCENE, NULL);
 	seq->scene = sce_seq;
 	seq->len = sce_seq->r.efra - sce_seq->r.sfra + 1;
 	seq->scene_sound = sound_scene_add_scene_sound(scene, seq, start_frame, start_frame + seq->len, 0);
@@ -143,7 +164,7 @@ static Sequence *rna_Sequences_new_image(ID *id, Editing *ed, ReportList *report
 	Scene *scene = (Scene *)id;
 	Sequence *seq;
 
-	seq = alloc_generic_sequence(ed, name, start_frame, channel, SEQ_IMAGE, file);
+	seq = alloc_generic_sequence(ed, name, start_frame, channel, SEQ_TYPE_IMAGE, file);
 	seq->len = 1;
 
 	if (seq->strip->stripdata->name[0] == '\0') {
@@ -174,7 +195,7 @@ static Sequence *rna_Sequences_new_movie(ID *id, Editing *ed, ReportList *report
 		return NULL;
 	}
 
-	seq = alloc_generic_sequence(ed, name, start_frame, channel, SEQ_MOVIE, file);
+	seq = alloc_generic_sequence(ed, name, start_frame, channel, SEQ_TYPE_MOVIE, file);
 	seq->anim = an;
 	seq->anim_preseek = IMB_anim_get_preseek(an);
 	seq->len = IMB_anim_get_duration(an, IMB_TC_RECORD_RUN);
@@ -200,7 +221,7 @@ static Sequence *rna_Sequences_new_sound(ID *id, Editing *ed, Main *bmain, Repor
 		return NULL;
 	}
 
-	seq = alloc_generic_sequence(ed, name, start_frame, channel, SEQ_SOUND, sound->name);
+	seq = alloc_generic_sequence(ed, name, start_frame, channel, SEQ_TYPE_SOUND_RAM, sound->name);
 	seq->sound = sound;
 	seq->len = ceil((double)sound_get_length(sound) * FPS);
 
@@ -318,7 +339,6 @@ static StripElem *rna_SequenceElements_push(ID *id, Sequence *seq, const char *f
 
 static void rna_SequenceElements_pop(ID *id, Sequence *seq, ReportList *reports, int index)
 {
-	int i;
 	Scene *scene = (Scene *)id;
 	StripElem *new_seq, *se;
 
@@ -327,7 +347,12 @@ static void rna_SequenceElements_pop(ID *id, Sequence *seq, ReportList *reports,
 		return;
 	}
 
-	if (seq->len <= index) {
+	/* python style negative indexing */
+	if (index < 0) {
+		index += seq->len;
+	}
+
+	if (seq->len <= index || index < 0) {
 		BKE_report(reports, RPT_ERROR, "SequenceElements.pop: index out of range");
 		return;
 	}
@@ -335,11 +360,12 @@ static void rna_SequenceElements_pop(ID *id, Sequence *seq, ReportList *reports,
 	new_seq = MEM_callocN(sizeof(StripElem) * (seq->len - 1), "SequenceElements_pop");
 	seq->len--;
 
-	for (i = 0, se = seq->strip->stripdata; i < seq->len; i++, se++) {
-		if (i == index)
-			se++;
-		BLI_strncpy(new_seq[i].name, se->name, sizeof(se->name));
-	}
+	se = seq->strip->stripdata;
+	if (index > 0)
+		memcpy(new_seq, se, sizeof(StripElem) * index);
+
+	if (index < seq->len)
+		memcpy(&new_seq[index], &se[index + 1], sizeof(StripElem) * (seq->len - index));
 
 	MEM_freeN(seq->strip->stripdata);
 	seq->strip->stripdata = new_seq;
@@ -394,7 +420,7 @@ void RNA_api_sequence_elements(BlenderRNA *brna, PropertyRNA *cprop)
 	func = RNA_def_function(srna, "pop", "rna_SequenceElements_pop");
 	RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_SELF_ID);
 	RNA_def_function_ui_description(func, "Pop an image off the collection");
-	parm = RNA_def_int(func, "index", 0, 0, INT_MAX, "", "Index of image to remove", 0, INT_MAX);
+	parm = RNA_def_int(func, "index", -1, INT_MIN, INT_MAX, "", "Index of image to remove", INT_MIN, INT_MAX);
 	RNA_def_property_flag(parm, PROP_REQUIRED);
 }
 
@@ -405,22 +431,21 @@ void RNA_api_sequences(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 
 	static EnumPropertyItem seq_effect_items[] = {
-		{SEQ_CROSS, "CROSS", 0, "Cross", ""},
-		{SEQ_ADD, "ADD", 0, "Add", ""},
-		{SEQ_SUB, "SUBTRACT", 0, "Subtract", ""},
-		{SEQ_ALPHAOVER, "ALPHA_OVER", 0, "Alpha Over", ""},
-		{SEQ_ALPHAUNDER, "ALPHA_UNDER", 0, "Alpha Under", ""},
-		{SEQ_GAMCROSS, "GAMMA_CROSS", 0, "Gamma Cross", ""},
-		{SEQ_MUL, "MULTIPLY", 0, "Multiply", ""},
-		{SEQ_OVERDROP, "OVER_DROP", 0, "Over Drop", ""},
-		// {SEQ_PLUGIN, "PLUGIN", 0, "Plugin", ""},
-		{SEQ_WIPE, "WIPE", 0, "Wipe", ""},
-		{SEQ_GLOW, "GLOW", 0, "Glow", ""},
-		{SEQ_TRANSFORM, "TRANSFORM", 0, "Transform", ""},
-		{SEQ_COLOR, "COLOR", 0, "Color", ""},
-		{SEQ_SPEED, "SPEED", 0, "Speed", ""},
-		{SEQ_MULTICAM, "MULTICAM", 0, "Multicam Selector", ""},
-		{SEQ_ADJUSTMENT, "ADJUSTMENT", 0, "Adjustment Layer", ""},
+		{SEQ_TYPE_CROSS, "CROSS", 0, "Cross", ""},
+		{SEQ_TYPE_ADD, "ADD", 0, "Add", ""},
+		{SEQ_TYPE_SUB, "SUBTRACT", 0, "Subtract", ""},
+		{SEQ_TYPE_ALPHAOVER, "ALPHA_OVER", 0, "Alpha Over", ""},
+		{SEQ_TYPE_ALPHAUNDER, "ALPHA_UNDER", 0, "Alpha Under", ""},
+		{SEQ_TYPE_GAMCROSS, "GAMMA_CROSS", 0, "Gamma Cross", ""},
+		{SEQ_TYPE_MUL, "MULTIPLY", 0, "Multiply", ""},
+		{SEQ_TYPE_OVERDROP, "OVER_DROP", 0, "Over Drop", ""},
+		{SEQ_TYPE_WIPE, "WIPE", 0, "Wipe", ""},
+		{SEQ_TYPE_GLOW, "GLOW", 0, "Glow", ""},
+		{SEQ_TYPE_TRANSFORM, "TRANSFORM", 0, "Transform", ""},
+		{SEQ_TYPE_COLOR, "COLOR", 0, "Color", ""},
+		{SEQ_TYPE_SPEED, "SPEED", 0, "Speed", ""},
+		{SEQ_TYPE_MULTICAM, "MULTICAM", 0, "Multicam Selector", ""},
+		{SEQ_TYPE_ADJUSTMENT, "ADJUSTMENT", 0, "Adjustment Layer", ""},
 		{0, NULL, 0, NULL, NULL}
 	};
 
@@ -446,6 +471,23 @@ void RNA_api_sequences(BlenderRNA *brna, PropertyRNA *cprop)
 	parm = RNA_def_pointer(func, "sequence", "Sequence", "", "New Sequence");
 	RNA_def_function_return(func, parm);
 
+	func = RNA_def_function(srna, "new_mask", "rna_Sequences_new_mask");
+	RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_SELF_ID);
+	RNA_def_function_ui_description(func, "Add a new movie clip sequence");
+	parm = RNA_def_string(func, "name", "Name", 0, "", "New name for the sequence");
+	RNA_def_property_flag(parm, PROP_REQUIRED);
+	parm = RNA_def_pointer(func, "mask", "Mask", "", "Mask to add");
+	RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL);
+	parm = RNA_def_int(func, "channel", 0, 0, MAXSEQ - 1, "Channel",
+	                   "The channel for the new sequence", 0, MAXSEQ - 1);
+	RNA_def_property_flag(parm, PROP_REQUIRED);
+	parm = RNA_def_int(func, "start_frame", 0, -MAXFRAME, MAXFRAME, "",
+	                   "The start frame for the new sequence", -MAXFRAME, MAXFRAME);
+	RNA_def_property_flag(parm, PROP_REQUIRED);
+	/* return type */
+	parm = RNA_def_pointer(func, "sequence", "Sequence", "", "New Sequence");
+	RNA_def_function_return(func, parm);
+
 	func = RNA_def_function(srna, "new_scene", "rna_Sequences_new_scene");
 	RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_SELF_ID);
 	RNA_def_function_ui_description(func, "Add a new scene sequence");
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index 19925546de3..c0efff2d179 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -51,6 +51,8 @@
 #include "BKE_depsgraph.h"
 #include "BKE_particle.h"
 
+#include "smoke_API.h"
+
 
 static void rna_Smoke_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
@@ -111,6 +113,35 @@ static char *rna_SmokeCollSettings_path(PointerRNA *ptr)
 	return BLI_sprintfN("modifiers[\"%s\"].coll_settings", md->name);
 }
 
+static int rna_SmokeModifier_density_get_length(PointerRNA *ptr, int length[RNA_MAX_ARRAY_DIMENSION])
+{
+	SmokeDomainSettings *settings = (SmokeDomainSettings *)ptr->data;
+
+	if (settings->fluid)
+	{
+		float *density = smoke_get_density(settings->fluid);
+		unsigned int size = settings->res[0] * settings->res[1] * settings->res[2];
+
+		if(density)
+			length[0] = size;
+		else
+			length[0] = 0;
+	}
+	else
+		length[0] = 0; // No smoke domain created yet
+
+	return length[0];
+}
+
+static void rna_SmokeModifier_density_get(PointerRNA *ptr, float *values)
+{
+	SmokeDomainSettings *settings = (SmokeDomainSettings *)ptr->data;
+	float *density = smoke_get_density(settings->fluid);
+	unsigned int size = settings->res[0] * settings->res[1] * settings->res[2];
+
+	memcpy(values, density, size * sizeof(float));
+}
+
 #else
 
 static void rna_def_smoke_domain_settings(BlenderRNA *brna)
@@ -282,6 +313,33 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Vorticity", "Amount of turbulence/rotation in fluid");
 	RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_reset");
 
+	prop = RNA_def_property(srna, "density", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_array(prop, 32);
+	RNA_def_property_flag(prop, PROP_DYNAMIC);
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+	RNA_def_property_dynamic_array_funcs(prop, "rna_SmokeModifier_density_get_length");
+	RNA_def_property_float_funcs(prop, "rna_SmokeModifier_density_get", NULL, NULL);
+	RNA_def_property_ui_text(prop, "Density", "Smoke density");
+
+	prop = RNA_def_property(srna, "cell_size", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "dx");
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "dx", "Cell Size");
+
+	prop = RNA_def_property(srna, "start_point", PROP_FLOAT, PROP_XYZ);
+	RNA_def_property_float_sdna(prop, NULL, "p0");
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "p0", "Start point");
+
+	prop = RNA_def_property(srna, "scale", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_sdna(prop, NULL, "scale");
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "scale", "Domain scale factor");
+
+	prop = RNA_def_property(srna, "domain_resolution", PROP_INT, PROP_XYZ);
+	RNA_def_property_int_sdna(prop, NULL, "res");
+	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "res", "Smoke Grid Resolution");
 }
 
 static void rna_def_smoke_flow_settings(BlenderRNA *brna)
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 9b4dcd03c79..30b06017568 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -45,6 +45,7 @@
 #include "DNA_object_types.h"
 #include "DNA_space_types.h"
 #include "DNA_sequence_types.h"
+#include "DNA_mask_types.h"
 #include "DNA_view3d_types.h"
 
 #include "WM_api.h"
@@ -120,6 +121,7 @@ EnumPropertyItem viewport_shade_items[] = {
 #ifdef RNA_RUNTIME
 
 #include "DNA_anim_types.h"
+#include "DNA_mask_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 
@@ -1037,6 +1039,13 @@ static void rna_SpaceClipEditor_clip_set(PointerRNA *ptr, PointerRNA value)
 	ED_space_clip_set(NULL, screen, sc, (MovieClip *)value.data);
 }
 
+static void rna_SpaceClipEditor_mask_set(PointerRNA *ptr, PointerRNA value)
+{
+	SpaceClip *sc = (SpaceClip *)(ptr->data);
+
+	ED_space_clip_set_mask(NULL, sc, (Mask *)value.data);
+}
+
 static void rna_SpaceClipEditor_clip_mode_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
 	SpaceClip *sc = (SpaceClip *)(ptr->data);
@@ -1060,6 +1069,14 @@ static void rna_SpaceClipEditor_view_type_update(Main *UNUSED(bmain), Scene *UNU
 
 #else
 
+static EnumPropertyItem dt_uv_items[] = {
+	{SI_UVDT_OUTLINE, "OUTLINE", 0, "Outline", "Draw white edges with black outline"},
+	{SI_UVDT_DASH, "DASH", 0, "Dash", "Draw dashed black-white edges"},
+	{SI_UVDT_BLACK, "BLACK", 0, "Black", "Draw black edges"},
+	{SI_UVDT_WHITE, "WHITE", 0, "White", "Draw white edges"},
+	{0, NULL, 0, NULL, NULL}
+};
+
 static void rna_def_space(BlenderRNA *brna)
 {
 	StructRNA *srna;
@@ -1091,14 +1108,6 @@ static void rna_def_space_image_uv(BlenderRNA *brna)
 		{0, NULL, 0, NULL, NULL}
 	};
 
-	static EnumPropertyItem dt_uv_items[] = {
-		{SI_UVDT_OUTLINE, "OUTLINE", 0, "Outline", "Draw white edges with black outline"},
-		{SI_UVDT_DASH, "DASH", 0, "Dash", "Draw dashed black-white edges"},
-		{SI_UVDT_BLACK, "BLACK", 0, "Black", "Draw black edges"},
-		{SI_UVDT_WHITE, "WHITE", 0, "White", "Draw white edges"},
-		{0, NULL, 0, NULL, NULL}
-	};
-
 	static EnumPropertyItem dt_uvstretch_items[] = {
 		{SI_UVDT_STRETCH_ANGLE, "ANGLE", 0, "Angle", "Angular distortion between UV and 3D angles"},
 		{SI_UVDT_STRETCH_AREA, "AREA", 0, "Area", "Area distortion between UV and 3D faces"},
@@ -1288,6 +1297,19 @@ static void rna_def_background_image(BlenderRNA *brna)
 		{0, NULL, 0, NULL, NULL}
 	};
 
+	static const EnumPropertyItem bgpic_camera_frame_items[] = {
+		{0, "STRETCH", 0, "Stretch", ""},
+		{V3D_BGPIC_CAMERA_ASPECT, "FIT", 0, "Fit", ""},
+		{V3D_BGPIC_CAMERA_ASPECT | V3D_BGPIC_CAMERA_CROP, "CROP", 0, "Crop", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+
+	static const EnumPropertyItem bgpic_draw_depth_items[] = {
+		{0, "BACK", 0, "Back", ""},
+		{V3D_BGPIC_FOREGROUND, "FRONT", 0, "Front", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+
 	srna = RNA_def_struct(brna, "BackgroundImage", NULL);
 	RNA_def_struct_sdna(srna, "BGpic");
 	RNA_def_struct_ui_text(srna, "Background Image", "Image and settings for display in the 3d View background");
@@ -1372,6 +1394,20 @@ static void rna_def_background_image(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", V3D_BGPIC_FOREGROUND);
 	RNA_def_property_ui_text(prop, "Show On Foreground", "Show this image in front of objects in viewport");
 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
+
+	/* expose 1 flag as a enum of 2 items */
+	prop = RNA_def_property(srna, "draw_depth", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
+	RNA_def_property_enum_items(prop, bgpic_draw_depth_items);
+	RNA_def_property_ui_text(prop, "Depth", "Draw under or over everything");
+	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
+
+	/* expose 2 flags as a enum of 3 items */
+	prop = RNA_def_property(srna, "frame_method", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
+	RNA_def_property_enum_items(prop, bgpic_camera_frame_items);
+	RNA_def_property_ui_text(prop, "Frame Method", "How the image fits in the camera frame");
+	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
 }
 
 static void rna_def_backgroundImages(BlenderRNA *brna, PropertyRNA *cprop)
@@ -1960,12 +1996,7 @@ static void rna_def_space_image(BlenderRNA *brna)
 	RNA_def_property_struct_type(prop, "GreasePencil");
 	RNA_def_property_ui_text(prop, "Grease Pencil", "Grease pencil data for this space");
 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_IMAGE, NULL);
-
-	prop = RNA_def_property(srna, "use_grease_pencil", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_DISPGP);
-	RNA_def_property_ui_text(prop, "Use Grease Pencil",
-	                         "Display and edit the grease pencil freehand annotations overlay");
-
+	
 	/* update */
 	prop = RNA_def_property(srna, "use_realtime_update", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "lock", 0);
@@ -2041,7 +2072,7 @@ static void rna_def_space_sequencer(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Display Mode", "View mode to use for displaying sequencer output");
 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, NULL);
 		
-	/* flag's */
+	/* flags */
 	prop = RNA_def_property(srna, "show_frame_indicator", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SEQ_NO_DRAW_CFRANUM);
 	RNA_def_property_ui_text(prop, "Show Frame Number Indicator",
@@ -2068,23 +2099,10 @@ static void rna_def_space_sequencer(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Safe Margin", "Draw title safe margins in preview");
 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, NULL);
 	
-	prop = RNA_def_property(srna, "use_grease_pencil", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_DRAW_GPENCIL);
-	RNA_def_property_ui_text(prop, "Use Grease Pencil",
-	                         "Display and edit the grease pencil freehand annotations overlay");
-	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, NULL);
-	
 	prop = RNA_def_property(srna, "show_seconds", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SEQ_DRAWFRAMES);
 	RNA_def_property_ui_text(prop, "Show Seconds", "Show timing in seconds not frames");
 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, NULL);
-
-	/* grease pencil */
-	prop = RNA_def_property(srna, "grease_pencil", PROP_POINTER, PROP_NONE);
-	RNA_def_property_pointer_sdna(prop, NULL, "gpd");
-	RNA_def_property_struct_type(prop, "UnknownType");
-	RNA_def_property_ui_text(prop, "Grease Pencil", "Grease pencil data for this space");
-	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, NULL);
 	
 	prop = RNA_def_property(srna, "display_channel", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "chanshown");
@@ -2105,6 +2123,14 @@ static void rna_def_space_sequencer(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Proxy render size",
 	                         "Draw preview using full resolution or different proxy resolutions");
 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, NULL);
+	
+	/* grease pencil */
+	prop = RNA_def_property(srna, "grease_pencil", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "gpd");
+	RNA_def_property_flag(prop, PROP_EDITABLE);
+	RNA_def_property_struct_type(prop, "GreasePencil");
+	RNA_def_property_ui_text(prop, "Grease Pencil", "Grease pencil data for this space");
+	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, NULL);
 }
 
 static void rna_def_space_text(BlenderRNA *brna)
@@ -2220,6 +2246,7 @@ static void rna_def_space_dopesheet(BlenderRNA *brna)
 		{SACTCONT_ACTION, "ACTION", ICON_OBJECT_DATA, "Action Editor", "Action Editor"},
 		{SACTCONT_SHAPEKEY, "SHAPEKEY", ICON_SHAPEKEY_DATA, "ShapeKey Editor", "ShapeKey Editor"},
 		{SACTCONT_GPENCIL, "GPENCIL", ICON_GREASEPENCIL, "Grease Pencil", "Grease Pencil"},
+		{SACTCONT_MASK, "MASK", ICON_MOD_MASK, "Mask", "Mask Editor"},
 		{0, NULL, 0, NULL, NULL}
 	};
 		
@@ -2974,6 +3001,7 @@ static void rna_def_space_clip(BlenderRNA *brna)
 		{SC_MODE_RECONSTRUCTION, "RECONSTRUCTION", ICON_SNAP_FACE, "Reconstruction",
 		                         "Show tracking/reconstruction tools"},
 		{SC_MODE_DISTORTION, "DISTORTION", ICON_GRID, "Distortion", "Show distortion tools"},
+		{SC_MODE_MASKEDIT, "MASKEDIT", ICON_MOD_MASK, "Mask editing", "Show mask editing tools"},
 		{0, NULL, 0, NULL, NULL}
 	};
 
@@ -2984,10 +3012,19 @@ static void rna_def_space_clip(BlenderRNA *brna)
 		{0, NULL, 0, NULL, NULL}
 	};
 
-	static EnumPropertyItem dope_sort_items[] = {
-		{SC_DOPE_SORT_NAME, "NAME", 0, "Name", "Sort channels by their names"},
-		{SC_DOPE_SORT_LONGEST, "LONGEST", 0, "Longest", "Sort channels by longest tracked segment"},
-		{SC_DOPE_SORT_TOTAL, "TOTAL", 0, "Total", "Sort channels by overall amount of tracked segments"},
+	static EnumPropertyItem gpencil_source_items[] = {
+		{SC_GPENCIL_SRC_CLIP, "CLIP", 0, "Clip", "Show grease pencil datablock which belongs to movie clip"},
+		{SC_GPENCIL_SRC_TRACK, "TRACK", 0, "Track", "Show grease pencil datablock which belongs to active track"},
+		{0, NULL, 0, NULL, NULL}
+	};
+
+	static EnumPropertyItem pivot_items[] = {
+		{V3D_CENTER, "BOUNDING_BOX_CENTER", ICON_ROTATE, "Bounding Box Center",
+		             "Pivot around bounding box center of selected object(s)"},
+		{V3D_LOCAL, "INDIVIDUAL_ORIGINS", ICON_ROTATECOLLECTION,
+		            "Individual Origins", "Pivot around each object's own origin"},
+		{V3D_CENTROID, "MEDIAN_POINT", ICON_ROTATECENTER, "Median Point",
+		               "Pivot around the median point of selected objects"},
 		{0, NULL, 0, NULL, NULL}
 	};
 
@@ -3011,6 +3048,26 @@ static void rna_def_space_clip(BlenderRNA *brna)
 	                         "Parameters defining which frame of the movie clip is displayed");
 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_CLIP, NULL);
 
+	/* mask */
+	prop = RNA_def_property(srna, "mask", PROP_POINTER, PROP_NONE);
+	RNA_def_property_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Mask", "Mask displayed and edited in this space");
+	RNA_def_property_pointer_funcs(prop, NULL, "rna_SpaceClipEditor_mask_set", NULL, NULL);
+	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_CLIP, NULL);
+
+	/* mask drawing */
+	prop = RNA_def_property(srna, "mask_draw_type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "mask_draw_type");
+	RNA_def_property_enum_items(prop, dt_uv_items);
+	RNA_def_property_ui_text(prop, "Edge Draw Type", "Draw type for mask splines");
+	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_CLIP, NULL);
+
+	prop = RNA_def_property(srna, "show_mask_smooth", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "mask_draw_flag", MASK_DRAWFLAG_SMOOTH);
+	RNA_def_property_ui_text(prop, "Draw Smooth Splines", "");
+	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_CLIP, NULL);
+
+
 	/* mode */
 	prop = RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "mode");
@@ -3138,6 +3195,20 @@ static void rna_def_space_clip(BlenderRNA *brna)
 	                         "for the selected tracks");
 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_CLIP, NULL);
 
+	/* show_only_selected */
+	prop = RNA_def_property(srna, "show_graph_only_selected", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", SC_SHOW_GRAPH_SEL_ONLY);
+	RNA_def_property_ui_text(prop, "Only Selected", "Only include channels relating to selected objects and data");
+	RNA_def_property_ui_icon(prop, ICON_RESTRICT_SELECT_OFF, 0);
+	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_CLIP, NULL);
+
+	/* show_hidden */
+	prop = RNA_def_property(srna, "show_graph_hidden", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", SC_SHOW_GRAPH_HIDDEN);
+	RNA_def_property_ui_text(prop, "Display Hidden", "Include channels from objects/bone that aren't visible");
+	RNA_def_property_ui_icon(prop, ICON_GHOST_ENABLED, 0);
+	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_CLIP, NULL);
+
 	/* ** channels ** */
 
 	/* show_red_channel */
@@ -3170,19 +3241,18 @@ static void rna_def_space_clip(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Show Seconds", "Show timing in seconds not frames");
 	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
 
-	/* ** dopesheet ** */
-
-	/* dopesheet sort */
-	prop = RNA_def_property(srna, "dopesheet_sort_method", PROP_ENUM, PROP_NONE);
-	RNA_def_property_enum_sdna(prop, NULL, "dope_sort");
-	RNA_def_property_enum_items(prop, dope_sort_items);
-	RNA_def_property_ui_text(prop, "Dopesheet Sort Field", "Method to be used to sort channels in dopesheet view");
-	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_CLIP, NULL);
+	/* grease pencil source */
+	prop = RNA_def_property(srna, "grease_pencil_source", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "gpencil_src");
+	RNA_def_property_enum_items(prop, gpencil_source_items);
+	RNA_def_property_ui_text(prop, "Grease Pencil Source", "Where the grease pencil comes from");
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
 
-	/* invert_dopesheet_sort */
-	prop = RNA_def_property(srna, "invert_dopesheet_sort", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "dope_flag", SC_DOPE_SORT_INVERSE);
-	RNA_def_property_ui_text(prop, "Invert Dopesheet Sort", "Invert sort order of dopesheet channels");
+	/* pivot point */
+	prop = RNA_def_property(srna, "pivot_point", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "around");
+	RNA_def_property_enum_items(prop, pivot_items);
+	RNA_def_property_ui_text(prop, "Pivot Point", "Pivot center for rotation/scaling");
 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_CLIP, NULL);
 }
 
diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c
index 646f9846e58..9b709e9ace1 100644
--- a/source/blender/makesrna/intern/rna_texture.c
+++ b/source/blender/makesrna/intern/rna_texture.c
@@ -68,7 +68,6 @@ EnumPropertyItem texture_type_items[] = {
 	{TEX_MUSGRAVE, "MUSGRAVE", ICON_TEXTURE, "Musgrave", "Procedural - highly flexible fractal noise texture"},
 	{TEX_NOISE, "NOISE", ICON_TEXTURE, "Noise",
 	            "Procedural - random noise, gives a different result every time, for every frame, for every pixel"},
-	/*{TEX_PLUGIN, "PLUGIN", ICON_PLUGIN, "Plugin", ""},  *//* Nothing yet */
 	{TEX_POINTDENSITY, "POINT_DENSITY", ICON_TEXTURE, "Point Density", ""},
 	{TEX_STUCCI, "STUCCI", ICON_TEXTURE, "Stucci", "Procedural - create a fractal noise texture"},
 	{TEX_VORONOI, "VORONOI", ICON_TEXTURE, "Voronoi", "Procedural - create cell-like patterns based on Worley noise"},
diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c
index 7a6753ad588..85dee2617d8 100644
--- a/source/blender/makesrna/intern/rna_tracking.c
+++ b/source/blender/makesrna/intern/rna_tracking.c
@@ -40,7 +40,7 @@
 #include "rna_internal.h"
 
 #include "DNA_movieclip_types.h"
-#include "DNA_object_types.h"	/* SELECT */
+#include "DNA_object_types.h"   /* SELECT */
 #include "DNA_scene_types.h"
 
 #include "WM_types.h"
@@ -59,37 +59,23 @@ static char *rna_tracking_path(PointerRNA *UNUSED(ptr))
 	return BLI_sprintfN("tracking");
 }
 
-static void rna_tracking_defaultSettings_levelsUpdate(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
-{
-	MovieClip *clip = (MovieClip*)ptr->id.data;
-	MovieTracking *tracking = &clip->tracking;
-	MovieTrackingSettings *settings = &tracking->settings;
-
-	if (settings->default_tracker == TRACKER_KLT) {
-		int max_pyramid_level_factor = 1 << (settings->default_pyramid_levels - 1);
-		float search_ratio = 2.3f * max_pyramid_level_factor;
-
-		settings->default_search_size = settings->default_pattern_size*search_ratio;
-	}
-}
-
 static void rna_tracking_defaultSettings_patternUpdate(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
-	MovieClip *clip = (MovieClip*)ptr->id.data;
+	MovieClip *clip = (MovieClip *)ptr->id.data;
 	MovieTracking *tracking = &clip->tracking;
 	MovieTrackingSettings *settings = &tracking->settings;
 
-	if (settings->default_search_size<settings->default_pattern_size)
+	if (settings->default_search_size < settings->default_pattern_size)
 		settings->default_search_size = settings->default_pattern_size;
 }
 
 static void rna_tracking_defaultSettings_searchUpdate(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
-	MovieClip *clip = (MovieClip*)ptr->id.data;
+	MovieClip *clip = (MovieClip *)ptr->id.data;
 	MovieTracking *tracking = &clip->tracking;
 	MovieTrackingSettings *settings = &tracking->settings;
 
-	if (settings->default_pattern_size>settings->default_search_size)
+	if (settings->default_pattern_size > settings->default_search_size)
 		settings->default_pattern_size = settings->default_search_size;
 }
 
@@ -102,54 +88,54 @@ static char *rna_trackingTrack_path(PointerRNA *ptr)
 
 static void rna_trackingTracks_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
 {
-	MovieClip *clip = (MovieClip*)ptr->id.data;
+	MovieClip *clip = (MovieClip *)ptr->id.data;
 
 	rna_iterator_listbase_begin(iter, &clip->tracking.tracks, NULL);
 }
 
 static void rna_trackingObjects_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
 {
-	MovieClip *clip = (MovieClip*)ptr->id.data;
+	MovieClip *clip = (MovieClip *)ptr->id.data;
 
 	rna_iterator_listbase_begin(iter, &clip->tracking.objects, NULL);
 }
 
 static int rna_tracking_active_object_index_get(PointerRNA *ptr)
 {
-	MovieClip *clip = (MovieClip*)ptr->id.data;
+	MovieClip *clip = (MovieClip *)ptr->id.data;
 
 	return clip->tracking.objectnr;
 }
 
 static void rna_tracking_active_object_index_set(PointerRNA *ptr, int value)
 {
-	MovieClip *clip = (MovieClip*)ptr->id.data;
+	MovieClip *clip = (MovieClip *)ptr->id.data;
 
 	clip->tracking.objectnr = value;
 }
 
 static void rna_tracking_active_object_index_range(PointerRNA *ptr, int *min, int *max, int *softmin, int *softmax)
 {
-	MovieClip *clip = (MovieClip*)ptr->id.data;
+	MovieClip *clip = (MovieClip *)ptr->id.data;
 
 	*min = 0;
-	*max = clip->tracking.tot_object-1;
+	*max = clip->tracking.tot_object - 1;
 	*max = MAX2(0, *max);
 }
 
 static PointerRNA rna_tracking_active_track_get(PointerRNA *ptr)
 {
-	MovieClip *clip = (MovieClip*)ptr->id.data;
-	MovieTrackingTrack *act_track = BKE_tracking_active_track(&clip->tracking);
+	MovieClip *clip = (MovieClip *)ptr->id.data;
+	MovieTrackingTrack *act_track = BKE_tracking_track_get_active(&clip->tracking);
 
 	return rna_pointer_inherit_refine(ptr, &RNA_MovieTrackingTrack, act_track);
 }
 
 static void rna_tracking_active_track_set(PointerRNA *ptr, PointerRNA value)
 {
-	MovieClip *clip = (MovieClip*)ptr->id.data;
+	MovieClip *clip = (MovieClip *)ptr->id.data;
 	MovieTrackingTrack *track = (MovieTrackingTrack *)value.data;
-	ListBase *tracksbase = BKE_tracking_get_tracks(&clip->tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(&clip->tracking);
 	int index = BLI_findindex(tracksbase, track);
 
 	if (index >= 0)
@@ -183,7 +169,7 @@ void rna_trackingTrack_name_set(PointerRNA *ptr, const char *value)
 		}
 	}
 
-	BKE_track_unique_name(tracksbase, track);
+	BKE_tracking_track_unique_name(tracksbase, track);
 }
 
 static int rna_trackingTrack_select_get(PointerRNA *ptr)
@@ -209,37 +195,6 @@ static void rna_trackingTrack_select_set(PointerRNA *ptr, int value)
 	}
 }
 
-static void rna_tracking_trackerPattern_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
-{
-	MovieTrackingTrack *track = (MovieTrackingTrack *)ptr->data;
-
-	BKE_tracking_clamp_track(track, CLAMP_PAT_DIM);
-}
-
-static void rna_tracking_trackerSearch_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
-{
-	MovieTrackingTrack *track = (MovieTrackingTrack *)ptr->data;
-
-	BKE_tracking_clamp_track(track, CLAMP_SEARCH_DIM);
-}
-
-static void rna_tracking_trackerAlgorithm_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
-{
-	MovieTrackingTrack *track = (MovieTrackingTrack *)ptr->data;
-
-	if (track->tracker == TRACKER_KLT)
-		BKE_tracking_clamp_track(track, CLAMP_PYRAMID_LEVELS);
-	else
-		BKE_tracking_clamp_track(track, CLAMP_SEARCH_DIM);
-}
-
-static void rna_tracking_trackerPyramid_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
-{
-	MovieTrackingTrack *track = (MovieTrackingTrack *)ptr->data;
-
-	BKE_tracking_clamp_track(track, CLAMP_PYRAMID_LEVELS);
-}
-
 static char *rna_trackingCamera_path(PointerRNA *UNUSED(ptr))
 {
 	return BLI_sprintfN("tracking.camera");
@@ -247,23 +202,23 @@ static char *rna_trackingCamera_path(PointerRNA *UNUSED(ptr))
 
 static float rna_trackingCamera_focal_mm_get(PointerRNA *ptr)
 {
-	MovieClip *clip = (MovieClip*)ptr->id.data;
+	MovieClip *clip = (MovieClip *)ptr->id.data;
 	MovieTrackingCamera *camera = &clip->tracking.camera;
 	float val = camera->focal;
 
 	if (clip->lastsize[0])
-		val = val*camera->sensor_width/(float)clip->lastsize[0];
+		val = val * camera->sensor_width / (float)clip->lastsize[0];
 
 	return val;
 }
 
 static void rna_trackingCamera_focal_mm_set(PointerRNA *ptr, float value)
 {
-	MovieClip *clip = (MovieClip*)ptr->id.data;
+	MovieClip *clip = (MovieClip *)ptr->id.data;
 	MovieTrackingCamera *camera = &clip->tracking.camera;
 
 	if (clip->lastsize[0])
-		value = clip->lastsize[0]*value/camera->sensor_width;
+		value = clip->lastsize[0] * value / camera->sensor_width;
 
 	if (value >= 0.0001f)
 		camera->focal = value;
@@ -276,9 +231,9 @@ static char *rna_trackingStabilization_path(PointerRNA *UNUSED(ptr))
 
 static int rna_track_2d_stabilization(CollectionPropertyIterator *UNUSED(iter), void *data)
 {
-	MovieTrackingTrack *track = (MovieTrackingTrack*)data;
+	MovieTrackingTrack *track = (MovieTrackingTrack *)data;
 
-	if ((track->flag&TRACK_USE_2D_STAB) == 0)
+	if ((track->flag & TRACK_USE_2D_STAB) == 0)
 		return 1;
 
 	return 0;
@@ -286,50 +241,50 @@ static int rna_track_2d_stabilization(CollectionPropertyIterator *UNUSED(iter),
 
 static void rna_tracking_stabTracks_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
 {
-	MovieClip *clip = (MovieClip*)ptr->id.data;
+	MovieClip *clip = (MovieClip *)ptr->id.data;
 	rna_iterator_listbase_begin(iter, &clip->tracking.tracks, rna_track_2d_stabilization);
 }
 
 static int rna_tracking_stabTracks_active_index_get(PointerRNA *ptr)
 {
-	MovieClip *clip = (MovieClip*)ptr->id.data;
+	MovieClip *clip = (MovieClip *)ptr->id.data;
 	return clip->tracking.stabilization.act_track;
 }
 
 static void rna_tracking_stabTracks_active_index_set(PointerRNA *ptr, int value)
 {
-	MovieClip *clip = (MovieClip*)ptr->id.data;
+	MovieClip *clip = (MovieClip *)ptr->id.data;
 	clip->tracking.stabilization.act_track = value;
 }
 
 static void rna_tracking_stabTracks_active_index_range(PointerRNA *ptr, int *min, int *max, int *softmin, int *softmax)
 {
-	MovieClip *clip = (MovieClip*)ptr->id.data;
+	MovieClip *clip = (MovieClip *)ptr->id.data;
 
 	*min = 0;
-	*max = clip->tracking.stabilization.tot_track-1;
+	*max = clip->tracking.stabilization.tot_track - 1;
 	*max = MAX2(0, *max);
 }
 
 static void rna_tracking_flushUpdate(Main *UNUSED(bmain), Scene *scene, PointerRNA *ptr)
 {
-	MovieClip *clip = (MovieClip*)ptr->id.data;
+	MovieClip *clip = (MovieClip *)ptr->id.data;
 	MovieTrackingStabilization *stab = &clip->tracking.stabilization;
 
 	stab->ok = 0;
 
 	nodeUpdateID(scene->nodetree, &clip->id);
 
-	WM_main_add_notifier(NC_SCENE|ND_NODES, NULL);
+	WM_main_add_notifier(NC_SCENE | ND_NODES, NULL);
 	DAG_id_tag_update(&clip->id, 0);
 }
 
 static void rna_trackingObject_tracks_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
 {
-	MovieTrackingObject *object = (MovieTrackingObject* )ptr->data;
+	MovieTrackingObject *object = (MovieTrackingObject * )ptr->data;
 
-	if (object->flag&TRACKING_OBJECT_CAMERA) {
-		MovieClip *clip = (MovieClip*)ptr->id.data;
+	if (object->flag & TRACKING_OBJECT_CAMERA) {
+		MovieClip *clip = (MovieClip *)ptr->id.data;
 
 		rna_iterator_listbase_begin(iter, &clip->tracking.tracks, NULL);
 	}
@@ -338,9 +293,23 @@ static void rna_trackingObject_tracks_begin(CollectionPropertyIterator *iter, Po
 	}
 }
 
+static PointerRNA rna_trackingObject_reconstruction_get(PointerRNA *ptr)
+{
+	MovieTrackingObject *object = (MovieTrackingObject * )ptr->data;
+
+	if (object->flag & TRACKING_OBJECT_CAMERA) {
+		MovieClip *clip = (MovieClip *)ptr->id.data;
+
+		return rna_pointer_inherit_refine(ptr, &RNA_MovieTrackingReconstruction, &clip->tracking.reconstruction);
+	}
+	else {
+		return rna_pointer_inherit_refine(ptr, &RNA_MovieTrackingReconstruction, &object->reconstruction);
+	}
+}
+
 static PointerRNA rna_tracking_active_object_get(PointerRNA *ptr)
 {
-	MovieClip *clip = (MovieClip*)ptr->id.data;
+	MovieClip *clip = (MovieClip *)ptr->id.data;
 	MovieTrackingObject *object = BLI_findlink(&clip->tracking.objects, clip->tracking.objectnr);
 
 	return rna_pointer_inherit_refine(ptr, &RNA_MovieTrackingObject, object);
@@ -348,7 +317,7 @@ static PointerRNA rna_tracking_active_object_get(PointerRNA *ptr)
 
 static void rna_tracking_active_object_set(PointerRNA *ptr, PointerRNA value)
 {
-	MovieClip *clip = (MovieClip*)ptr->id.data;
+	MovieClip *clip = (MovieClip *)ptr->id.data;
 	MovieTrackingObject *object = (MovieTrackingObject *)value.data;
 	int index = BLI_findindex(&clip->tracking.objects, object);
 
@@ -368,9 +337,9 @@ void rna_trackingObject_name_set(PointerRNA *ptr, const char *value)
 
 static void rna_trackingObject_flushUpdate(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
-	MovieClip *clip = (MovieClip*)ptr->id.data;
+	MovieClip *clip = (MovieClip *)ptr->id.data;
 
-	WM_main_add_notifier(NC_OBJECT|ND_TRANSFORM, NULL);
+	WM_main_add_notifier(NC_OBJECT | ND_TRANSFORM, NULL);
 	DAG_id_tag_update(&clip->id, 0);
 }
 
@@ -383,7 +352,7 @@ static void rna_trackingMarker_frame_set(PointerRNA *ptr, int value)
 
 	track = tracking->tracks.first;
 	while (track) {
-		if (marker >= track->markers && marker < track->markers+track->markersnr) {
+		if (marker >= track->markers && marker < track->markers + track->markersnr) {
 			break;
 		}
 
@@ -394,11 +363,33 @@ static void rna_trackingMarker_frame_set(PointerRNA *ptr, int value)
 		MovieTrackingMarker new_marker = *marker;
 		new_marker.framenr = value;
 
-		BKE_tracking_delete_marker(track, marker->framenr);
-		BKE_tracking_insert_marker(track, &new_marker);
+		BKE_tracking_marker_delete(track, marker->framenr);
+		BKE_tracking_marker_insert(track, &new_marker);
 	}
 }
 
+static void rna_tracking_markerPattern_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
+{
+	MovieTrackingMarker *marker = (MovieTrackingMarker *)ptr->data;
+
+	BKE_tracking_marker_clamp(marker, CLAMP_PAT_DIM);
+}
+
+static void rna_tracking_markerSearch_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
+{
+	MovieTrackingMarker *marker = (MovieTrackingMarker *)ptr->data;
+
+	BKE_tracking_marker_clamp(marker, CLAMP_SEARCH_DIM);
+}
+
+static void rna_trackingDopesheet_tagUpdate(Main *UNUSED(bmain), Scene *scene, PointerRNA *ptr)
+{
+	MovieClip *clip = (MovieClip *)ptr->id.data;
+	MovieTrackingDopesheet *dopesheet = &clip->tracking.dopesheet;
+
+	dopesheet->ok = 0;
+}
+
 /* API */
 
 static void add_tracks_to_base(MovieClip *clip, MovieTracking *tracking, ListBase *tracksbase, int frame, int number)
@@ -410,8 +401,8 @@ static void add_tracks_to_base(MovieClip *clip, MovieTracking *tracking, ListBas
 
 	BKE_movieclip_get_size(clip, &user, &width, &height);
 
-	for (a = 0; a<number; a++)
-		BKE_tracking_add_track(tracking, tracksbase, 0, 0, frame, width, height);
+	for (a = 0; a < number; a++)
+		BKE_tracking_track_add(tracking, tracksbase, 0, 0, frame, width, height);
 }
 
 static void rna_trackingTracks_add(ID *id, MovieTracking *tracking, int frame, int number)
@@ -420,7 +411,7 @@ static void rna_trackingTracks_add(ID *id, MovieTracking *tracking, int frame, i
 
 	add_tracks_to_base(clip, tracking, &tracking->tracks, frame, number);
 
-	WM_main_add_notifier(NC_MOVIECLIP|NA_EDITED, clip);
+	WM_main_add_notifier(NC_MOVIECLIP | NA_EDITED, clip);
 }
 
 static void rna_trackingObject_tracks_add(ID *id, MovieTrackingObject *object, int frame, int number)
@@ -428,36 +419,36 @@ static void rna_trackingObject_tracks_add(ID *id, MovieTrackingObject *object, i
 	MovieClip *clip = (MovieClip *) id;
 	ListBase *tracksbase = &object->tracks;
 
-	if (object->flag&TRACKING_OBJECT_CAMERA)
+	if (object->flag & TRACKING_OBJECT_CAMERA)
 		tracksbase = &clip->tracking.tracks;
 
 	add_tracks_to_base(clip, &clip->tracking, tracksbase, frame, number);
 
-	WM_main_add_notifier(NC_MOVIECLIP|NA_EDITED, NULL);
+	WM_main_add_notifier(NC_MOVIECLIP | NA_EDITED, NULL);
 }
 
 static MovieTrackingObject *rna_trackingObject_new(MovieTracking *tracking, const char *name)
 {
-	MovieTrackingObject *object = BKE_tracking_new_object(tracking, name);
+	MovieTrackingObject *object = BKE_tracking_object_add(tracking, name);
 
-	WM_main_add_notifier(NC_MOVIECLIP|NA_EDITED, NULL);
+	WM_main_add_notifier(NC_MOVIECLIP | NA_EDITED, NULL);
 
 	return object;
 }
 
 void rna_trackingObject_remove(MovieTracking *tracking, MovieTrackingObject *object)
 {
-	BKE_tracking_remove_object(tracking, object);
+	BKE_tracking_object_delete(tracking, object);
 
-	WM_main_add_notifier(NC_MOVIECLIP|NA_EDITED, NULL);
+	WM_main_add_notifier(NC_MOVIECLIP | NA_EDITED, NULL);
 }
 
 static MovieTrackingMarker *rna_trackingMarkers_find_frame(MovieTrackingTrack *track, int framenr)
 {
-	return BKE_tracking_exact_marker(track, framenr);
+	return BKE_tracking_marker_get_exact(track, framenr);
 }
 
-static MovieTrackingMarker* rna_trackingMarkers_insert_frame(MovieTrackingTrack *track, int framenr, float *co)
+static MovieTrackingMarker *rna_trackingMarkers_insert_frame(MovieTrackingTrack *track, int framenr, float *co)
 {
 	MovieTrackingMarker marker, *new_marker;
 
@@ -465,9 +456,9 @@ static MovieTrackingMarker* rna_trackingMarkers_insert_frame(MovieTrackingTrack
 	marker.framenr = framenr;
 	copy_v2_v2(marker.pos, co);
 
-	new_marker = BKE_tracking_insert_marker(track, &marker);
+	new_marker = BKE_tracking_marker_insert(track, &marker);
 
-	WM_main_add_notifier(NC_MOVIECLIP|NA_EDITED, NULL);
+	WM_main_add_notifier(NC_MOVIECLIP | NA_EDITED, NULL);
 
 	return new_marker;
 }
@@ -477,26 +468,37 @@ void rna_trackingMarkers_delete_frame(MovieTrackingTrack *track, int framenr)
 	if (track->markersnr == 1)
 		return;
 
-	BKE_tracking_delete_marker(track, framenr);
+	BKE_tracking_marker_delete(track, framenr);
 
-	WM_main_add_notifier(NC_MOVIECLIP|NA_EDITED, NULL);
+	WM_main_add_notifier(NC_MOVIECLIP | NA_EDITED, NULL);
 }
 
 #else
 
-static EnumPropertyItem tracker_items[] = {
-	{TRACKER_KLT, "KLT", 0, "KLT",
-	              "Kanade–Lucas–Tomasi tracker which works with most of video clips, a bit slower than SAD"},
-	{TRACKER_SAD, "SAD", 0, "SAD", "Sum of Absolute Differences tracker which can be used when KLT tracker fails"},
-	{TRACKER_HYBRID, "Hybrid", 0, "Hybrid", "A hybrid tracker that uses SAD for rough tracking, KLT for refinement."},
-	{0, NULL, 0, NULL, NULL}};
+static EnumPropertyItem tracker_motion_model[] = {
+	{TRACK_MOTION_MODEL_HOMOGRAPHY, "Perspective", 0, "Perspective",
+	              "Search for markers that are perspectively deformed (homography) between frames"},
+	{TRACK_MOTION_MODEL_AFFINE, "Affine", 0, "Affine",
+	              "Search for markers that are affine-deformed (t, r, k, and skew) between frames"},
+	{TRACK_MOTION_MODEL_TRANSLATION_ROTATION_SCALE, "LocRotScale", 0, "LocRotScale",
+	              "Search for markers that are translated, rotated, and scaled between frames"},
+	{TRACK_MOTION_MODEL_TRANSLATION_SCALE, "LocScale", 0, "LocScale",
+	              "Search for markers that are translated and scaled between frames"},
+	{TRACK_MOTION_MODEL_TRANSLATION_ROTATION, "LocRot", 0, "LocRot",
+	              "Search for markers that are translated and rotated between frames"},
+	{TRACK_MOTION_MODEL_TRANSLATION, "Loc", 0, "Loc",
+	              "Search for markers that are translated between frames"},
+	{0, NULL, 0, NULL, NULL}
+};
 
 static EnumPropertyItem pattern_match_items[] = {
 	{TRACK_MATCH_KEYFRAME, "KEYFRAME", 0, "Keyframe", "Track pattern from keyframe to next frame"},
 	{TRACK_MATCH_PREVFRAME, "PREV_FRAME", 0, "Previous frame", "Track pattern from current frame to next frame"},
-	{0, NULL, 0, NULL, NULL}};
+	{0, NULL, 0, NULL, NULL}
+};
 
 static int rna_matrix_dimsize_4x4[] = {4, 4};
+static int rna_matrix_dimsize_4x2[] = {4, 2};
 
 static void rna_def_trackingSettings(BlenderRNA *brna)
 {
@@ -505,11 +507,12 @@ static void rna_def_trackingSettings(BlenderRNA *brna)
 
 	static EnumPropertyItem speed_items[] = {
 		{0, "FASTEST", 0, "Fastest", "Track as fast as it's possible"},
-	    {TRACKING_SPEED_DOUBLE, "DOUBLE", 0, "Double", "Track with double speed"},
+		{TRACKING_SPEED_DOUBLE, "DOUBLE", 0, "Double", "Track with double speed"},
 		{TRACKING_SPEED_REALTIME, "REALTIME", 0, "Realtime", "Track with realtime speed"},
 		{TRACKING_SPEED_HALF, "HALF", 0, "Half", "Track with half of realtime speed"},
 		{TRACKING_SPEED_QUARTER, "QUARTER", 0, "Quarter", "Track with quarter of realtime speed"},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	static EnumPropertyItem cleanup_items[] = {
 		{TRACKING_CLEAN_SELECT, "SELECT", 0, "Select", "Select unclean tracks"},
@@ -521,21 +524,21 @@ static void rna_def_trackingSettings(BlenderRNA *brna)
 	static EnumPropertyItem refine_items[] = {
 		{0, "NONE", 0, "Nothing", "Do not refine camera intrinsics"},
 		{REFINE_FOCAL_LENGTH, "FOCAL_LENGTH", 0, "Focal Length", "Refine focal length"},
-		{REFINE_FOCAL_LENGTH|REFINE_RADIAL_DISTORTION_K1, "FOCAL_LENGTH_RADIAL_K1", 0, "Focal length, K1",
-		                                                  "Refine focal length and radial distortion K1"},
-		{REFINE_FOCAL_LENGTH|
-		 REFINE_RADIAL_DISTORTION_K1|
+		{REFINE_FOCAL_LENGTH | REFINE_RADIAL_DISTORTION_K1, "FOCAL_LENGTH_RADIAL_K1", 0, "Focal length, K1",
+		 "Refine focal length and radial distortion K1"},
+		{REFINE_FOCAL_LENGTH |
+		 REFINE_RADIAL_DISTORTION_K1 |
 		 REFINE_RADIAL_DISTORTION_K2, "FOCAL_LENGTH_RADIAL_K1_K2", 0, "Focal length, K1, K2",
-		                              "Refine focal length and radial distortion K1 and K2"},
-		{REFINE_FOCAL_LENGTH|
-		 REFINE_PRINCIPAL_POINT|
-		 REFINE_RADIAL_DISTORTION_K1|
+		 "Refine focal length and radial distortion K1 and K2"},
+		{REFINE_FOCAL_LENGTH |
+		 REFINE_PRINCIPAL_POINT |
+		 REFINE_RADIAL_DISTORTION_K1 |
 		 REFINE_RADIAL_DISTORTION_K2, "FOCAL_LENGTH_PRINCIPAL_POINT_RADIAL_K1_K2", 0,
-		                              "Focal Length, Optical Center, K1, K2",
-		                              "Refine focal length, optical center and radial distortion K1 and K2"},
-		{REFINE_FOCAL_LENGTH|
+		 "Focal Length, Optical Center, K1, K2",
+		 "Refine focal length, optical center and radial distortion K1 and K2"},
+		{REFINE_FOCAL_LENGTH |
 		 REFINE_PRINCIPAL_POINT, "FOCAL_LENGTH_PRINCIPAL_POINT", 0, "Focal Length, Optical Center",
-		                         "Refine focal length and optical center"},
+		 "Refine focal length and optical center"},
 		{0, NULL, 0, NULL, NULL}
 	};
 
@@ -613,14 +616,14 @@ static void rna_def_trackingSettings(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "motion_flag", TRACKING_MOTION_TRIPOD);
 	RNA_def_property_ui_text(prop, "Tripod Motion", "Use special solver to track a stable camera position, such as a tripod");
 
-	/* limit frames */
+	/* default_limit_frames */
 	prop = RNA_def_property(srna, "default_frames_limit", PROP_INT, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_int_sdna(prop, NULL, "default_frames_limit");
 	RNA_def_property_range(prop, 0, SHRT_MAX);
 	RNA_def_property_ui_text(prop, "Frames Limit", "Every tracking cycle, this number of frames are tracked");
 
-	/* pattern match */
+	/* default_pattern_match */
 	prop = RNA_def_property(srna, "default_pattern_match", PROP_ENUM, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_enum_sdna(prop, NULL, "default_pattern_match");
@@ -628,40 +631,48 @@ static void rna_def_trackingSettings(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Pattern Match",
 	                         "Track pattern from given frame when tracking marker to next frame");
 
-	/* margin */
+	/* default_margin */
 	prop = RNA_def_property(srna, "default_margin", PROP_INT, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_int_sdna(prop, NULL, "default_margin");
 	RNA_def_property_range(prop, 0, 300);
 	RNA_def_property_ui_text(prop, "Margin", "Default distance from image boudary at which marker stops tracking");
 
-	/* tracking algorithm */
-	prop = RNA_def_property(srna, "default_tracker", PROP_ENUM, PROP_NONE);
+	/* default_tracking_motion_model */
+	prop = RNA_def_property(srna, "default_motion_model", PROP_ENUM, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
-	RNA_def_property_enum_items(prop, tracker_items);
-	RNA_def_property_update(prop, 0, "rna_tracking_defaultSettings_levelsUpdate");
-	RNA_def_property_ui_text(prop, "Tracker", "Default tracking algorithm to use");
-
-	/* pyramid level for pyramid klt tracking */
-	prop = RNA_def_property(srna, "default_pyramid_levels", PROP_INT, PROP_NONE);
-	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
-	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
-	RNA_def_property_int_sdna(prop, NULL, "default_pyramid_levels");
-	RNA_def_property_range(prop, 1, 16);
-	RNA_def_property_update(prop, 0, "rna_tracking_defaultSettings_levelsUpdate");
-	RNA_def_property_ui_text(prop, "Pyramid levels", "Default number of pyramid levels (increase on blurry footage)");
-
-	/* minmal correlation - only used for SAD tracker */
+	RNA_def_property_enum_items(prop, tracker_motion_model);
+	RNA_def_property_ui_text(prop, "Motion model", "Default motion model to use for tracking");
+
+	/* default_use_brute */
+	prop = RNA_def_property(srna, "default_use_brute", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "default_algorithm_flag", TRACK_ALGORITHM_FLAG_USE_BRUTE);
+	RNA_def_property_ui_text(prop, "Prepass", "Use a brute-force translation-only initialization when tracking");
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
+
+	/* default_use_brute */
+	prop = RNA_def_property(srna, "default_use_mask", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "default_algorithm_flag", TRACK_ALGORITHM_FLAG_USE_MASK);
+	RNA_def_property_ui_text(prop, "Use Mask", "Use a grease pencil datablock as a mask to use only specified areas of pattern when tracking");
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
+
+	/* default_use_normalization */
+	prop = RNA_def_property(srna, "default_use_normalization", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "default_algorithm_flag", TRACK_ALGORITHM_FLAG_USE_NORMALIZATION);
+	RNA_def_property_ui_text(prop, "Normalize", "Normalize light intensities while tracking (slower)");
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
+
+	/* default minmal correlation */
 	prop = RNA_def_property(srna, "default_correlation_min", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_float_sdna(prop, NULL, "default_minimum_correlation");
-	RNA_def_property_range(prop, -1.0f, 1.0f);
-	RNA_def_property_ui_range(prop, -1.0f, 1.0f, 0.1, 3);
+	RNA_def_property_range(prop, 0.0f, 1.0f);
+	RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.05, 3);
 	RNA_def_property_ui_text(prop, "Correlation",
-	                         "Default minimal value of correlation between matched pattern and reference "
-	                         "which is still treated as successful tracking");
+	                         "Default minimum value of correlation between matched pattern and reference "
+	                         "that is still treated as successful tracking");
 
 	/* default pattern size */
 	prop = RNA_def_property(srna, "default_pattern_size", PROP_INT, PROP_NONE);
@@ -679,23 +690,23 @@ static void rna_def_trackingSettings(BlenderRNA *brna)
 	RNA_def_property_update(prop, 0, "rna_tracking_defaultSettings_searchUpdate");
 	RNA_def_property_ui_text(prop, "Search Size", "Size of search area for newly created tracks");
 
-	/* use_red_channel */
+	/* default use_red_channel */
 	prop = RNA_def_property(srna, "use_default_red_channel", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "default_flag", TRACK_DISABLE_RED);
 	RNA_def_property_ui_text(prop, "Use Red Channel", "Use red channel from footage for tracking");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
 
-	/* use_green_channel */
+	/* default_use_green_channel */
 	prop = RNA_def_property(srna, "use_default_green_channel", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "default_flag", TRACK_DISABLE_GREEN);
 	RNA_def_property_ui_text(prop, "Use Green Channel", "Use green channel from footage for tracking");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
 
-	/* use_blue_channel */
+	/* default_use_blue_channel */
 	prop = RNA_def_property(srna, "use_default_blue_channel", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "default_flag", TRACK_DISABLE_BLUE);
 	RNA_def_property_ui_text(prop, "Use Blue Channel", "Use blue channel from footage for tracking");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
 
 	/* ** object tracking ** */
 
@@ -717,7 +728,8 @@ static void rna_def_trackingCamera(BlenderRNA *brna)
 	static EnumPropertyItem camera_units_items[] = {
 		{CAMERA_UNITS_PX, "PIXELS", 0, "px", "Use pixels for units of focal length"},
 		{CAMERA_UNITS_MM, "MILLIMETERS", 0, "mm", "Use millimeters for units of focal length"},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	srna = RNA_def_struct(brna, "MovieTrackingCamera", NULL);
 	RNA_def_struct_path_func(srna, "rna_trackingCamera_path");
@@ -729,7 +741,7 @@ static void rna_def_trackingCamera(BlenderRNA *brna)
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_range(prop, 0.0f, 500.0f);
 	RNA_def_property_ui_text(prop, "Sensor", "Width of CCD sensor in millimeters");
-	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, NULL);
+	RNA_def_property_update(prop, NC_MOVIECLIP | NA_EDITED, NULL);
 
 	/* Focal Length */
 	prop = RNA_def_property(srna, "focal_length", PROP_FLOAT, PROP_NONE);
@@ -738,7 +750,7 @@ static void rna_def_trackingCamera(BlenderRNA *brna)
 	RNA_def_property_range(prop, 0.0001f, 5000.0f);
 	RNA_def_property_float_funcs(prop, "rna_trackingCamera_focal_mm_get", "rna_trackingCamera_focal_mm_set", NULL);
 	RNA_def_property_ui_text(prop, "Focal Length", "Camera's focal length");
-	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, NULL);
+	RNA_def_property_update(prop, NC_MOVIECLIP | NA_EDITED, NULL);
 
 	/* Focal Length in pixels */
 	prop = RNA_def_property(srna, "focal_length_pixels", PROP_FLOAT, PROP_NONE);
@@ -746,7 +758,7 @@ static void rna_def_trackingCamera(BlenderRNA *brna)
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_range(prop, 0.0f, 5000.0f);
 	RNA_def_property_ui_text(prop, "Focal Length", "Camera's focal length");
-	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, NULL);
+	RNA_def_property_update(prop, NC_MOVIECLIP | NA_EDITED, NULL);
 
 	/* Units */
 	prop = RNA_def_property(srna, "units", PROP_ENUM, PROP_NONE);
@@ -762,7 +774,7 @@ static void rna_def_trackingCamera(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "principal");
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_ui_text(prop, "Principal Point", "Optical center of lens");
-	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, NULL);
+	RNA_def_property_update(prop, NC_MOVIECLIP | NA_EDITED, NULL);
 
 	/* Radial distortion parameters */
 	prop = RNA_def_property(srna, "k1", PROP_FLOAT, PROP_NONE);
@@ -770,21 +782,21 @@ static void rna_def_trackingCamera(BlenderRNA *brna)
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_ui_range(prop, -10, 10, .1, 3);
 	RNA_def_property_ui_text(prop, "K1", "First coefficient of third order polynomial radial distortion");
-	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, "rna_tracking_flushUpdate");
+	RNA_def_property_update(prop, NC_MOVIECLIP | NA_EDITED, "rna_tracking_flushUpdate");
 
 	prop = RNA_def_property(srna, "k2", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "k2");
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_ui_range(prop, -10, 10, .1, 3);
 	RNA_def_property_ui_text(prop, "K2", "Second coefficient of third order polynomial radial distortion");
-	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, "rna_tracking_flushUpdate");
+	RNA_def_property_update(prop, NC_MOVIECLIP | NA_EDITED, "rna_tracking_flushUpdate");
 
 	prop = RNA_def_property(srna, "k3", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "k3");
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_ui_range(prop, -10, 10, .1, 3);
 	RNA_def_property_ui_text(prop, "K3", "Third coefficient of third order polynomial radial distortion");
-	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, "rna_tracking_flushUpdate");
+	RNA_def_property_update(prop, NC_MOVIECLIP | NA_EDITED, "rna_tracking_flushUpdate");
 
 	/* pixel aspect */
 	prop = RNA_def_property(srna, "pixel_aspect", PROP_FLOAT, PROP_XYZ);
@@ -794,7 +806,7 @@ static void rna_def_trackingCamera(BlenderRNA *brna)
 	RNA_def_property_ui_range(prop, 0.1f, 5000.0f, 1, 2);
 	RNA_def_property_float_default(prop, 1.0f);
 	RNA_def_property_ui_text(prop, "Pixel Aspect Ratio", "Pixel aspect ratio");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, "rna_tracking_flushUpdate");
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, "rna_tracking_flushUpdate");
 }
 
 static void rna_def_trackingMarker(BlenderRNA *brna)
@@ -811,20 +823,52 @@ static void rna_def_trackingMarker(BlenderRNA *brna)
 	RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, RNA_TRANSLATION_PREC_DEFAULT);
 	RNA_def_property_float_sdna(prop, NULL, "pos");
 	RNA_def_property_ui_text(prop, "Position", "Marker position at frame in normalized coordinates");
-	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, NULL);
+	RNA_def_property_update(prop, NC_MOVIECLIP | NA_EDITED, NULL);
 
 	/* frame */
 	prop = RNA_def_property(srna, "frame", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "framenr");
 	RNA_def_property_ui_text(prop, "Frame", "Frame number marker is keyframed on");
 	RNA_def_property_int_funcs(prop, NULL, "rna_trackingMarker_frame_set", NULL);
-	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, 0);
+	RNA_def_property_update(prop, NC_MOVIECLIP | NA_EDITED, 0);
 
 	/* enable */
 	prop = RNA_def_property(srna, "mute", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", MARKER_DISABLED);
 	RNA_def_property_ui_text(prop, "Mode", "Is marker muted for current frame");
-	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, NULL);
+	RNA_def_property_update(prop, NC_MOVIECLIP | NA_EDITED, NULL);
+
+	/* pattern */
+	prop = RNA_def_property(srna, "pattern_corners", PROP_FLOAT, PROP_MATRIX);
+	RNA_def_property_float_sdna(prop, NULL, "pattern_corners");
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_4x2);
+	RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, RNA_TRANSLATION_PREC_DEFAULT);
+	RNA_def_property_ui_text(prop, "Pattern Corners",
+	                         "Array of coordinates which represents pattern's corners in "
+	                         "normalized coordinates relative to marker position");
+	RNA_def_property_update(prop, NC_MOVIECLIP | NA_EDITED, "rna_tracking_markerPattern_update");
+
+	/* search */
+	prop = RNA_def_property(srna, "search_min", PROP_FLOAT, PROP_TRANSLATION);
+	RNA_def_property_array(prop, 2);
+	RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, RNA_TRANSLATION_PREC_DEFAULT);
+	RNA_def_property_float_sdna(prop, NULL, "search_min");
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_ui_text(prop, "Search Min",
+	                         "Left-bottom corner of search area in normalized coordinates relative "
+	                         "to marker position");
+	RNA_def_property_update(prop, NC_MOVIECLIP | NA_EDITED, "rna_tracking_markerSearch_update");
+
+	prop = RNA_def_property(srna, "search_max", PROP_FLOAT, PROP_TRANSLATION);
+	RNA_def_property_array(prop, 2);
+	RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, RNA_TRANSLATION_PREC_DEFAULT);
+	RNA_def_property_float_sdna(prop, NULL, "search_max");
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_ui_text(prop, "Search Max",
+	                         "Right-bottom corner of search area in normalized coordinates relative "
+	                         "to marker position");
+	RNA_def_property_update(prop, NC_MOVIECLIP | NA_EDITED, "rna_tracking_markerSearch_update");
 }
 
 static void rna_def_trackingMarkers(BlenderRNA *brna, PropertyRNA *cprop)
@@ -881,52 +925,10 @@ static void rna_def_trackingTrack(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Name", "Unique name of track");
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_trackingTrack_name_set");
-	RNA_def_property_string_maxlength(prop, MAX_ID_NAME-2);
-	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, NULL);
+	RNA_def_property_string_maxlength(prop, MAX_ID_NAME - 2);
+	RNA_def_property_update(prop, NC_MOVIECLIP | NA_EDITED, NULL);
 	RNA_def_struct_name_property(srna, prop);
 
-	/* Pattern */
-	prop = RNA_def_property(srna, "pattern_min", PROP_FLOAT, PROP_TRANSLATION);
-	RNA_def_property_array(prop, 2);
-	RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, RNA_TRANSLATION_PREC_DEFAULT);
-	RNA_def_property_float_sdna(prop, NULL, "pat_min");
-	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
-	RNA_def_property_ui_text(prop, "Pattern Min",
-	                         "Left-bottom corner of pattern area in normalized coordinates relative "
-	                         "to marker position");
-	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, "rna_tracking_trackerPattern_update");
-
-	prop = RNA_def_property(srna, "pattern_max", PROP_FLOAT, PROP_TRANSLATION);
-	RNA_def_property_array(prop, 2);
-	RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, RNA_TRANSLATION_PREC_DEFAULT);
-	RNA_def_property_float_sdna(prop, NULL, "pat_max");
-	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
-	RNA_def_property_ui_text(prop, "Pattern Max",
-	                         "Right-bottom corner of pattern area in normalized coordinates relative "
-	                         "to marker position");
-	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, "rna_tracking_trackerPattern_update");
-
-	/* Search */
-	prop = RNA_def_property(srna, "search_min", PROP_FLOAT, PROP_TRANSLATION);
-	RNA_def_property_array(prop, 2);
-	RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, RNA_TRANSLATION_PREC_DEFAULT);
-	RNA_def_property_float_sdna(prop, NULL, "search_min");
-	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
-	RNA_def_property_ui_text(prop, "Search Min",
-	                         "Left-bottom corner of search area in normalized coordinates relative "
-	                         "to marker position");
-	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, "rna_tracking_trackerSearch_update");
-
-	prop = RNA_def_property(srna, "search_max", PROP_FLOAT, PROP_TRANSLATION);
-	RNA_def_property_array(prop, 2);
-	RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, RNA_TRANSLATION_PREC_DEFAULT);
-	RNA_def_property_float_sdna(prop, NULL, "search_max");
-	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
-	RNA_def_property_ui_text(prop, "Search Max",
-	                         "Right-bottom corner of search area in normalized coordinates relative "
-	                         "to marker position");
-	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, "rna_tracking_trackerSearch_update");
-
 	/* limit frames */
 	prop = RNA_def_property(srna, "frames_limit", PROP_INT, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
@@ -952,32 +954,42 @@ static void rna_def_trackingTrack(BlenderRNA *brna)
 	RNA_def_property_range(prop, 0, 300);
 	RNA_def_property_ui_text(prop, "Margin", "Distance from image boudary at which marker stops tracking");
 
-	/* tracking algorithm */
-	prop = RNA_def_property(srna, "tracker", PROP_ENUM, PROP_NONE);
+	/* tracking motion model */
+	prop = RNA_def_property(srna, "motion_model", PROP_ENUM, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
-	RNA_def_property_enum_items(prop, tracker_items);
+	RNA_def_property_enum_items(prop, tracker_motion_model);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
-	RNA_def_property_ui_text(prop, "Tracker", "Tracking algorithm to use");
-	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, "rna_tracking_trackerAlgorithm_update");
+	RNA_def_property_ui_text(prop, "Motion model", "Default motion model to use for tracking");
 
-	/* pyramid level for pyramid klt tracking */
-	prop = RNA_def_property(srna, "pyramid_levels", PROP_INT, PROP_NONE);
-	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
-	RNA_def_property_int_sdna(prop, NULL, "pyramid_levels");
-	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
-	RNA_def_property_range(prop, 1, 16);
-	RNA_def_property_ui_text(prop, "Pyramid levels", "Number of pyramid levels (increase on blurry footage)");
-	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, "rna_tracking_trackerPyramid_update");
-
-	/* minmal correlation - only used for SAD tracker */
+	/* minimum correlation */
 	prop = RNA_def_property(srna, "correlation_min", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_float_sdna(prop, NULL, "minimum_correlation");
-	RNA_def_property_range(prop, -1.0f, 1.0f);
-	RNA_def_property_ui_range(prop, -1.0f, 1.0f, 0.1, 3);
+	RNA_def_property_range(prop, 0.0f, 1.0f);
+	RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.05, 3);
 	RNA_def_property_ui_text(prop, "Correlation",
 	                         "Minimal value of correlation between matched pattern and reference "
-	                         "which is still treated as successful tracking");
+	                         "that is still treated as successful tracking");
+
+	/* use_brute */
+	prop = RNA_def_property(srna, "use_brute", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "algorithm_flag", TRACK_ALGORITHM_FLAG_USE_BRUTE);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_ui_text(prop, "Prepass", "Use a brute-force translation only pre-track before refinement");
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
+
+	/* use_brute */
+	prop = RNA_def_property(srna, "use_mask", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "algorithm_flag", TRACK_ALGORITHM_FLAG_USE_MASK);
+	RNA_def_property_ui_text(prop, "Use Mask", "Use a grease pencil datablock as a mask to use only specified areas of pattern when tracking");
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
+
+	/* use_normalization */
+	prop = RNA_def_property(srna, "use_normalization", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "algorithm_flag", TRACK_ALGORITHM_FLAG_USE_NORMALIZATION);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_ui_text(prop, "Normalize", "Normalize light intensities while tracking. Slower");
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
 
 	/* markers */
 	prop = RNA_def_property(srna, "markers", PROP_COLLECTION, PROP_NONE);
@@ -993,28 +1005,35 @@ static void rna_def_trackingTrack(BlenderRNA *brna)
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", TRACK_DISABLE_RED);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_ui_text(prop, "Use Red Channel", "Use red channel from footage for tracking");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
 
 	/* use_green_channel */
 	prop = RNA_def_property(srna, "use_green_channel", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", TRACK_DISABLE_GREEN);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_ui_text(prop, "Use Green Channel", "Use green channel from footage for tracking");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
 
 	/* use_blue_channel */
 	prop = RNA_def_property(srna, "use_blue_channel", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", TRACK_DISABLE_BLUE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_ui_text(prop, "Use Blue Channel", "Use blue channel from footage for tracking");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
 
 	/* preview_grayscale */
 	prop = RNA_def_property(srna, "use_grayscale_preview", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", TRACK_PREVIEW_GRAYSCALE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_ui_text(prop, "Grayscale", "Display what the tracking algorithm sees in the preview");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
+
+	/* preview_alpha */
+	prop = RNA_def_property(srna, "use_alpha_preview", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", TRACK_PREVIEW_ALPHA);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_ui_text(prop, "Alpha", "Apply track's mask on displaying preview");
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
 
 	/* has bundle */
 	prop = RNA_def_property(srna, "has_bundle", PROP_BOOLEAN, PROP_NONE);
@@ -1035,45 +1054,45 @@ static void rna_def_trackingTrack(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", TRACK_HIDDEN);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_ui_text(prop, "Hide", "Track is hidden");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
 
 	/* select */
 	prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_funcs(prop, "rna_trackingTrack_select_get", "rna_trackingTrack_select_set");
 	RNA_def_property_ui_text(prop, "Select", "Track is selected");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
 
 	/* select_anchor */
 	prop = RNA_def_property(srna, "select_anchor", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SELECT);
 	RNA_def_property_ui_text(prop, "Select Anchor", "Track's anchor point is selected");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
 
 	/* select_pattern */
 	prop = RNA_def_property(srna, "select_pattern", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "pat_flag", SELECT);
 	RNA_def_property_ui_text(prop, "Select Pattern", "Track's pattern area is selected");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
 
 	/* select_search */
 	prop = RNA_def_property(srna, "select_search", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "search_flag", SELECT);
 	RNA_def_property_ui_text(prop, "Select Search", "Track's search area is selected");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
 
 	/* locked */
 	prop = RNA_def_property(srna, "lock", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", TRACK_LOCKED);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_ui_text(prop, "Lock", "Track is locked and all changes to it are disabled");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
 
 	/* custom color */
 	prop = RNA_def_property(srna, "use_custom_color", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", TRACK_CUSTOMCOLOR);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_ui_text(prop, "Custom Color", "Use custom color instead of theme-defined");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
 
 	/* color */
 	prop = RNA_def_property(srna, "color", PROP_FLOAT, PROP_COLOR);
@@ -1081,13 +1100,21 @@ static void rna_def_trackingTrack(BlenderRNA *brna)
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Color",
 	                         "Color of the track in the Movie Clip Editor and the 3D viewport after a solve");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
 
 	/* average error */
 	prop = RNA_def_property(srna, "average_error", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "error");
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Average Error", "Average error of re-projection");
+
+	/* grease pencil */
+	prop = RNA_def_property(srna, "grease_pencil", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "gpd");
+	RNA_def_property_flag(prop, PROP_EDITABLE);
+	RNA_def_property_struct_type(prop, "GreasePencil");
+	RNA_def_property_ui_text(prop, "Grease Pencil", "Grease pencil data for this track");
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
 }
 
 static void rna_def_trackingStabilization(BlenderRNA *brna)
@@ -1099,7 +1126,8 @@ static void rna_def_trackingStabilization(BlenderRNA *brna)
 		{TRACKING_FILTER_NEAREAST, "NEAREST",   0, "Nearest",   ""},
 		{TRACKING_FILTER_BILINEAR, "BILINEAR",   0, "Bilinear",   ""},
 		{TRACKING_FILTER_BICUBIC, "BICUBIC", 0, "Bicubic", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	srna = RNA_def_struct(brna, "MovieTrackingStabilization", NULL);
 	RNA_def_struct_path_func(srna, "rna_trackingStabilization_path");
@@ -1110,7 +1138,7 @@ static void rna_def_trackingStabilization(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", TRACKING_2D_STABILIZATION);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_ui_text(prop, "Use 2D stabilization", "Use 2D stabilization for footage");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, "rna_tracking_flushUpdate");
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, "rna_tracking_flushUpdate");
 
 	/* tracks */
 	prop = RNA_def_property(srna, "tracks", PROP_COLLECTION, PROP_NONE);
@@ -1119,14 +1147,14 @@ static void rna_def_trackingStabilization(BlenderRNA *brna)
 	                                  NULL, NULL, NULL, NULL);
 	RNA_def_property_struct_type(prop, "MovieTrackingTrack");
 	RNA_def_property_ui_text(prop, "Tracks", "Collection of tracks used for stabilization");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, "rna_tracking_flushUpdate");
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, "rna_tracking_flushUpdate");
 
 	/* rotation track */
 	prop = RNA_def_property(srna, "rotation_track", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "rot_track");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Rotation Track", "Track used to compensate rotation");
-	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, "rna_tracking_flushUpdate");
+	RNA_def_property_update(prop, NC_MOVIECLIP | NA_EDITED, "rna_tracking_flushUpdate");
 
 	/* active track index */
 	prop = RNA_def_property(srna, "active_track_index", PROP_INT, PROP_NONE);
@@ -1143,49 +1171,49 @@ static void rna_def_trackingStabilization(BlenderRNA *brna)
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_ui_text(prop, "Autoscale",
 	                         "Automatically scale footage to cover unfilled areas when stabilizating");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, "rna_tracking_flushUpdate");
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, "rna_tracking_flushUpdate");
 
 	/* max scale */
 	prop = RNA_def_property(srna, "scale_max", PROP_FLOAT, PROP_FACTOR);
 	RNA_def_property_float_sdna(prop, NULL, "maxscale");
 	RNA_def_property_range(prop, 0.0f, 10.0f);
 	RNA_def_property_ui_text(prop, "Maximal Scale", "Limit the amount of automatic scaling");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, "rna_tracking_flushUpdate");
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, "rna_tracking_flushUpdate");
 
 	/* influence_location */
 	prop = RNA_def_property(srna, "influence_location", PROP_FLOAT, PROP_FACTOR);
 	RNA_def_property_float_sdna(prop, NULL, "locinf");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Location Influence", "Influence of stabilization algorithm on footage location");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, "rna_tracking_flushUpdate");
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, "rna_tracking_flushUpdate");
 
 	/* influence_scale */
 	prop = RNA_def_property(srna, "influence_scale", PROP_FLOAT, PROP_FACTOR);
 	RNA_def_property_float_sdna(prop, NULL, "scaleinf");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Scale Influence", "Influence of stabilization algorithm on footage scale");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, "rna_tracking_flushUpdate");
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, "rna_tracking_flushUpdate");
 
 	/* use_stabilize_rotation */
 	prop = RNA_def_property(srna, "use_stabilize_rotation", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", TRACKING_STABILIZE_ROTATION);
 	RNA_def_property_ui_text(prop, "Stabilize Rotation", "Stabilize horizon line on the shot");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, "rna_tracking_flushUpdate");
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, "rna_tracking_flushUpdate");
 
 	/* influence_rotation */
 	prop = RNA_def_property(srna, "influence_rotation", PROP_FLOAT, PROP_FACTOR);
 	RNA_def_property_float_sdna(prop, NULL, "rotinf");
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_text(prop, "Rotation Influence", "Influence of stabilization algorithm on footage rotation");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, "rna_tracking_flushUpdate");
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, "rna_tracking_flushUpdate");
 
 	/* filter */
 	prop = RNA_def_property(srna, "filter_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "filter");
 	RNA_def_property_enum_items(prop, filter_items);
 	RNA_def_property_ui_text(prop, "Filter", "Method to use to filter stabilization");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, "rna_tracking_flushUpdate");
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, "rna_tracking_flushUpdate");
 }
 
 static void rna_def_reconstructedCamera(BlenderRNA *brna)
@@ -1267,7 +1295,7 @@ static void rna_def_trackingTracks(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE);
 	RNA_def_property_struct_type(prop, "MovieTrackingTrack");
 	RNA_def_property_pointer_funcs(prop, "rna_tracking_active_track_get", "rna_tracking_active_track_set", NULL, NULL);
-	RNA_def_property_flag(prop, PROP_EDITABLE|PROP_NEVER_UNLINK);
+	RNA_def_property_flag(prop, PROP_EDITABLE | PROP_NEVER_UNLINK);
 	RNA_def_property_ui_text(prop, "Active Track", "Active track in this tracking data object");
 }
 
@@ -1291,7 +1319,7 @@ static void rna_def_trackingObjectTracks(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE);
 	RNA_def_property_struct_type(prop, "MovieTrackingTrack");
 	RNA_def_property_pointer_funcs(prop, "rna_tracking_active_track_get", "rna_tracking_active_track_set", NULL, NULL);
-	RNA_def_property_flag(prop, PROP_EDITABLE|PROP_NEVER_UNLINK);
+	RNA_def_property_flag(prop, PROP_EDITABLE | PROP_NEVER_UNLINK);
 	RNA_def_property_ui_text(prop, "Active Track", "Active track in this tracking data object");
 }
 
@@ -1307,8 +1335,8 @@ static void rna_def_trackingObject(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Name", "Unique name of object");
 	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_trackingObject_name_set");
-	RNA_def_property_string_maxlength(prop, MAX_ID_NAME-2);
-	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, NULL);
+	RNA_def_property_string_maxlength(prop, MAX_ID_NAME - 2);
+	RNA_def_property_update(prop, NC_MOVIECLIP | NA_EDITED, NULL);
 	RNA_def_struct_name_property(srna, prop);
 
 	/* is_camera */
@@ -1316,7 +1344,7 @@ static void rna_def_trackingObject(BlenderRNA *brna)
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", TRACKING_OBJECT_CAMERA);
 	RNA_def_property_ui_text(prop, "Camera", "Object is used for camera tracking");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
 
 	/* tracks */
 	prop = RNA_def_property(srna, "tracks", PROP_COLLECTION, PROP_NONE);
@@ -1330,6 +1358,7 @@ static void rna_def_trackingObject(BlenderRNA *brna)
 	/* reconstruction */
 	prop = RNA_def_property(srna, "reconstruction", PROP_POINTER, PROP_NONE);
 	RNA_def_property_struct_type(prop, "MovieTrackingReconstruction");
+	RNA_def_property_pointer_funcs(prop, "rna_trackingObject_reconstruction_get", NULL, NULL, NULL);
 
 	/* scale */
 	prop = RNA_def_property(srna, "scale", PROP_FLOAT, PROP_NONE);
@@ -1339,7 +1368,7 @@ static void rna_def_trackingObject(BlenderRNA *brna)
 	RNA_def_property_ui_range(prop, 0.0001f, 10000.0, 1, 4);
 	RNA_def_property_float_default(prop, 1.0f);
 	RNA_def_property_ui_text(prop, "Scale", "Scale of object solution in camera space");
-	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, "rna_trackingObject_flushUpdate");
+	RNA_def_property_update(prop, NC_MOVIECLIP | NA_EDITED, "rna_trackingObject_flushUpdate");
 }
 
 static void rna_def_trackingObjects(BlenderRNA *brna, PropertyRNA *cprop)
@@ -1371,10 +1400,54 @@ static void rna_def_trackingObjects(BlenderRNA *brna, PropertyRNA *cprop)
 	RNA_def_property_struct_type(prop, "MovieTrackingObject");
 	RNA_def_property_pointer_funcs(prop, "rna_tracking_active_object_get",
 	                               "rna_tracking_active_object_set", NULL, NULL);
-	RNA_def_property_flag(prop, PROP_EDITABLE|PROP_NEVER_UNLINK);
+	RNA_def_property_flag(prop, PROP_EDITABLE | PROP_NEVER_UNLINK);
 	RNA_def_property_ui_text(prop, "Active Object", "Active object in this tracking data object");
 }
 
+static void rna_def_trackingDopesheet(BlenderRNA *brna)
+{
+	StructRNA *srna;
+	PropertyRNA *prop;
+
+	static EnumPropertyItem sort_items[] = {
+		{TRACKING_DOPE_SORT_NAME, "NAME", 0, "Name", "Sort channels by their names"},
+		{TRACKING_DOPE_SORT_LONGEST, "LONGEST", 0, "Longest", "Sort channels by longest tracked segment"},
+		{TRACKING_DOPE_SORT_TOTAL, "TOTAL", 0, "Total", "Sort channels by overall amount of tracked segments"},
+		{TRACKING_DOPE_SORT_AVERAGE_ERROR, "AVERAGE_ERROR", 0, "Average Error", "Sort channels by average reprojection error of tracks after solve"},
+		{0, NULL, 0, NULL, NULL}
+	};
+
+	srna = RNA_def_struct(brna, "MovieTrackingDopesheet", NULL);
+	RNA_def_struct_ui_text(srna, "Movie Tracking Dopesheet", "Match-moving dopesheet data");
+
+	/* dopesheet sort */
+	prop = RNA_def_property(srna, "sort_method", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "sort_method");
+	RNA_def_property_enum_items(prop, sort_items);
+	RNA_def_property_ui_text(prop, "Dopesheet Sort Field", "Method to be used to sort channels in dopesheet view");
+	RNA_def_property_update(prop, NC_MOVIECLIP | NA_EDITED, "rna_trackingDopesheet_tagUpdate");
+
+	/* invert_dopesheet_sort */
+	prop = RNA_def_property(srna, "use_invert_sort", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", TRACKING_DOPE_SORT_INVERSE);
+	RNA_def_property_ui_text(prop, "Invert Dopesheet Sort", "Invert sort order of dopesheet channels");
+	RNA_def_property_update(prop, NC_MOVIECLIP | NA_EDITED, "rna_trackingDopesheet_tagUpdate");
+
+	/* show_only_selected */
+	prop = RNA_def_property(srna, "show_only_selected", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", TRACKING_DOPE_SELECTED_ONLY);
+	RNA_def_property_ui_text(prop, "Only Selected", "Only include channels relating to selected objects and data");
+	RNA_def_property_ui_icon(prop, ICON_RESTRICT_SELECT_OFF, 0);
+	RNA_def_property_update(prop, NC_MOVIECLIP | NA_EDITED, "rna_trackingDopesheet_tagUpdate");
+
+	/* show_hidden */
+	prop = RNA_def_property(srna, "show_hidden", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", TRACKING_DOPE_SHOW_HIDDEN);
+	RNA_def_property_ui_text(prop, "Display Hidden", "Include channels from objects/bone that aren't visible");
+	RNA_def_property_ui_icon(prop, ICON_GHOST_ENABLED, 0);
+	RNA_def_property_update(prop, NC_MOVIECLIP | NA_EDITED, "rna_trackingDopesheet_tagUpdate");
+}
+
 static void rna_def_tracking(BlenderRNA *brna)
 {
 	StructRNA *srna;
@@ -1388,6 +1461,7 @@ static void rna_def_tracking(BlenderRNA *brna)
 	rna_def_trackingStabilization(brna);
 	rna_def_trackingReconstruction(brna);
 	rna_def_trackingObject(brna);
+	rna_def_trackingDopesheet(brna);
 
 	srna = RNA_def_struct(brna, "MovieTracking", NULL);
 	RNA_def_struct_path_func(srna, "rna_tracking_path");
@@ -1434,7 +1508,11 @@ static void rna_def_tracking(BlenderRNA *brna)
 	RNA_def_property_int_funcs(prop, "rna_tracking_active_object_index_get", "rna_tracking_active_object_index_set",
 	                           "rna_tracking_active_object_index_range");
 	RNA_def_property_ui_text(prop, "Active Object Index", "Index of active object");
-	RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
+	RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
+
+	/* dopesheet */
+	prop = RNA_def_property(srna, "dopesheet", PROP_POINTER, PROP_NONE);
+	RNA_def_property_struct_type(prop, "MovieTrackingDopesheet");
 }
 
 void RNA_def_tracking(BlenderRNA *brna)
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 96d9653839b..42eb06b137a 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -144,6 +144,11 @@ static void rna_userdef_anisotropic_update(Main *bmain, Scene *scene, PointerRNA
 	rna_userdef_update(bmain, scene, ptr);
 }
 
+static void rna_userdef_gl_gpu_mipmaps(Main *bmain, Scene *scene, PointerRNA *ptr) {
+	GPU_set_gpu_mipmapping(U.use_gpu_mipmap);
+	rna_userdef_update(bmain, scene, ptr);
+}
+
 static void rna_userdef_gl_texture_limit_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
 	GPU_free_images();
@@ -1591,6 +1596,12 @@ static void rna_def_userdef_theme_space_node(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Group Node", "");
 	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
+	prop = RNA_def_property(srna, "frame_node", PROP_FLOAT, PROP_COLOR_GAMMA);
+	RNA_def_property_float_sdna(prop, NULL, "movie");
+	RNA_def_property_array(prop, 4);
+	RNA_def_property_ui_text(prop, "Frame Node", "");
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
+
 	prop = RNA_def_property(srna, "noodle_curving", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "noodle_curving");
 	RNA_def_property_int_default(prop, 5);
@@ -1913,6 +1924,12 @@ static void rna_def_userdef_theme_space_action(BlenderRNA *brna)
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "DopeSheet Sub-Channel", "");
 	RNA_def_property_update(prop, 0, "rna_userdef_update");
+	
+	prop = RNA_def_property(srna, "summary", PROP_FLOAT, PROP_COLOR_GAMMA);
+	RNA_def_property_float_sdna(prop, NULL, "anim_active");
+	RNA_def_property_array(prop, 4);
+	RNA_def_property_ui_text(prop, "Summary", "Color of summary channel");
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
 }
 
 static void rna_def_userdef_theme_space_nla(BlenderRNA *brna)
@@ -1941,28 +1958,79 @@ static void rna_def_userdef_theme_space_nla(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "View Sliders", "");
 	RNA_def_property_update(prop, 0, "rna_userdef_update");
 	
-	prop = RNA_def_property(srna, "bars", PROP_FLOAT, PROP_COLOR_GAMMA);
-	RNA_def_property_float_sdna(prop, NULL, "shade2");
-	RNA_def_property_array(prop, 3);
-	RNA_def_property_ui_text(prop, "Bars", "");
+	prop = RNA_def_property(srna, "active_action", PROP_FLOAT, PROP_COLOR_GAMMA);
+	RNA_def_property_float_sdna(prop, NULL, "anim_active");
+	RNA_def_property_array(prop, 4);
+	RNA_def_property_ui_text(prop, "Active Action", "Animation data block has active action");
 	RNA_def_property_update(prop, 0, "rna_userdef_update");
-
-	prop = RNA_def_property(srna, "bars_selected", PROP_FLOAT, PROP_COLOR_GAMMA);
-	RNA_def_property_float_sdna(prop, NULL, "hilite");
-	RNA_def_property_array(prop, 3);
-	RNA_def_property_ui_text(prop, "Bars Selected", "");
+	
+	prop = RNA_def_property(srna, "active_action_unset", PROP_FLOAT, PROP_COLOR_GAMMA);
+	RNA_def_property_float_sdna(prop, NULL, "anim_non_active");
+	RNA_def_property_array(prop, 4);
+	RNA_def_property_ui_text(prop, "No Active Action", "Animation data block doesn't have active action");
 	RNA_def_property_update(prop, 0, "rna_userdef_update");
-
+	
 	prop = RNA_def_property(srna, "strips", PROP_FLOAT, PROP_COLOR_GAMMA);
 	RNA_def_property_float_sdna(prop, NULL, "strip");
 	RNA_def_property_array(prop, 3);
-	RNA_def_property_ui_text(prop, "Strips", "");
+	RNA_def_property_ui_text(prop, "Strips", "Action-Clip Strip - Unselected");
 	RNA_def_property_update(prop, 0, "rna_userdef_update");
-
+	
 	prop = RNA_def_property(srna, "strips_selected", PROP_FLOAT, PROP_COLOR_GAMMA);
 	RNA_def_property_float_sdna(prop, NULL, "strip_select");
 	RNA_def_property_array(prop, 3);
-	RNA_def_property_ui_text(prop, "Strips Selected", "");
+	RNA_def_property_ui_text(prop, "Strips Selected", "Action-Clip Strip - Selected");
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
+	
+	prop = RNA_def_property(srna, "transition_strips", PROP_FLOAT, PROP_COLOR_GAMMA);
+	RNA_def_property_float_sdna(prop, NULL, "nla_transition");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Transitions", "Transition Strip - Unselected");
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
+	
+	prop = RNA_def_property(srna, "transition_strips_selected", PROP_FLOAT, PROP_COLOR_GAMMA);
+	RNA_def_property_float_sdna(prop, NULL, "nla_transition_sel");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Transitions Selected", "Transition Strip - Selected");
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
+	
+	prop = RNA_def_property(srna, "meta_strips", PROP_FLOAT, PROP_COLOR_GAMMA);
+	RNA_def_property_float_sdna(prop, NULL, "nla_meta");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Meta Strips", "Meta Strip - Unselected (for grouping related strips)");
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
+	
+	prop = RNA_def_property(srna, "meta_strips_selected", PROP_FLOAT, PROP_COLOR_GAMMA);
+	RNA_def_property_float_sdna(prop, NULL, "nla_meta_sel");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Meta Strips Selected", "Meta Strip - Selected (for grouping related strips)");
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
+	
+	prop = RNA_def_property(srna, "sound_strips", PROP_FLOAT, PROP_COLOR_GAMMA);
+	RNA_def_property_float_sdna(prop, NULL, "nla_sound");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Sound Strips", 
+	                         "Sound Strip - Unselected (for timing speaker sounds)");
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
+	
+	prop = RNA_def_property(srna, "sound_strips_selected", PROP_FLOAT, PROP_COLOR_GAMMA);
+	RNA_def_property_float_sdna(prop, NULL, "nla_sound_sel");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Sound Strips Selected", 
+	                         "Sound Strip - Selected (for timing speaker sounds)");
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
+	
+	prop = RNA_def_property(srna, "tweak", PROP_FLOAT, PROP_COLOR_GAMMA);
+	RNA_def_property_float_sdna(prop, NULL, "nla_tweaking");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Tweak", "Color for strip/action being 'tweaked' or edited");
+	RNA_def_property_update(prop, 0, "rna_userdef_update");
+	
+	prop = RNA_def_property(srna, "tweak_duplicate", PROP_FLOAT, PROP_COLOR_GAMMA);
+	RNA_def_property_float_sdna(prop, NULL, "nla_tweakdupli");
+	RNA_def_property_array(prop, 3);
+	RNA_def_property_ui_text(prop, "Tweak Duplicate Flag", 
+	                         "Warning/error indicator color for strips referencing the strip being tweaked");
 	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
 	prop = RNA_def_property(srna, "frame_current", PROP_FLOAT, PROP_COLOR_GAMMA);
@@ -2921,7 +2989,7 @@ static void rna_def_userdef_system(BlenderRNA *brna)
 		{10, "CATALAN", 0, "Catalan (Català)", "ca_AD"},
 		{16, "CROATIAN", 0, "Croatian (Hrvatski)", "hr_HR"},
 		{11, "CZECH", 0, "Czech (Český)", "cs_CZ"},
-/*		{ 3, "DUTCH", 0, "Dutch (Nederlandse taal)", "nl_NL"}, */ /* XXX No po's yet. */
+		{ 3, "DUTCH", 0, "Dutch (Nederlandse taal)", "nl_NL"},
 		{ 6, "FINNISH", 0, "Finnish (Suomi)", "fi_FI"},
 		{ 5, "GERMAN", 0, "German (Deutsch)", "de_DE"},
 		{23, "GREEK", 0, "Greek (Ελληνικά)", "el_GR"},
@@ -3080,6 +3148,11 @@ static void rna_def_userdef_system(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "16 Bit Float Textures", "Use 16 bit per component texture for float images");
 	RNA_def_property_update(prop, 0, "rna_userdef_gl_use_16bit_textures");
 
+	prop = RNA_def_property(srna, "use_gpu_mipmap", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "use_gpu_mipmap", 1);
+	RNA_def_property_ui_text(prop, "GPU Mipmap Generation", "Generate Image Mipmaps on the GPU");
+	RNA_def_property_update(prop, 0, "rna_userdef_gl_gpu_mipmaps");
+
 	prop = RNA_def_property(srna, "use_vertex_buffer_objects", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "gameflags", USER_DISABLE_VBO);
 	RNA_def_property_ui_text(prop, "VBOs",
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index 194f48bd32a..8c6a2809ef8 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -115,6 +115,9 @@ EnumPropertyItem event_timer_type_items[] = {
 	{TIMER0, "TIMER0", 0, "Timer 0", ""},
 	{TIMER1, "TIMER1", 0, "Timer 1", ""},
 	{TIMER2, "TIMER2", 0, "Timer 2", ""},
+	{TIMERJOBS, "TIMER_JOBS", 0, "Timer Jobs", ""},
+	{TIMERAUTOSAVE, "TIMER_AUTOSAVE", 0, "Timer Autosave", ""},
+	{TIMERREPORT, "TIMER_REPORT", 0, "Timer Report", ""},
 	{0, NULL, 0, NULL, NULL}
 };
 
@@ -317,6 +320,9 @@ EnumPropertyItem event_type_items[] = {
 	{TIMER0, "TIMER0", 0, "Timer 0", ""},
 	{TIMER1, "TIMER1", 0, "Timer 1", ""},
 	{TIMER2, "TIMER2", 0, "Timer 2", ""},
+	{TIMERJOBS, "TIMER_JOBS", 0, "Timer Jobs", ""},
+	{TIMERAUTOSAVE, "TIMER_AUTOSAVE", 0, "Timer Autosave", ""},
+	{TIMERREPORT, "TIMER_REPORT", 0, "Timer Report", ""},
 	{0, "", 0, NULL, NULL},
 	{NDOF_MOTION, "NDOF_MOTION", 0, "NDOF Motion", ""},
 	/* buttons on all 3dconnexion devices */
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c
index 39e08c1cb5d..41057234d9b 100644
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -220,9 +220,12 @@ static void bm_merge_dm_transform(BMesh *bm, DerivedMesh *dm, float mat[4][4],
                                   const char *dupe_slot_name,
                                   BMOperator *weld_op)
 {
-	BMVert *v, *v2;
+	BMVert *v, *v2, *v3;
 	BMIter iter;
 
+	/* Add the DerivedMesh's elements to the BMesh. The pre-existing
+	   elements were already tagged, so the new elements can be
+	   identified by not having the BM_ELEM_TAG flag set. */
 	DM_to_bmesh_ex(dm, bm);
 
 	if (amd->flags & MOD_ARR_MERGE) {
@@ -252,6 +255,11 @@ static void bm_merge_dm_transform(BMesh *bm, DerivedMesh *dm, float mat[4][4],
 		/* add new merge targets to weld operator */
 		BMO_ITER (v, &oiter, bm, &find_op, "targetmapout", 0) {
 			v2 = BMO_iter_map_value_p(&oiter);
+			/* check in case the target vertex (v2) is already marked
+			 * for merging */
+			while ((v3 = BMO_slot_map_ptr_get(bm, weld_op, "targetmap", v2))) {
+				v2 = v3;
+			}
 			BMO_slot_map_ptr_insert(bm, weld_op, "targetmap", v, v2);
 		}
 
diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c
index eb3334d31ce..1b3e3c16486 100644
--- a/source/blender/modifiers/intern/MOD_edgesplit.c
+++ b/source/blender/modifiers/intern/MOD_edgesplit.c
@@ -79,7 +79,11 @@ static DerivedMesh *doEdgeSplit(DerivedMesh *dm, EdgeSplitModifierData *emd, Obj
 			if ((l1 = e->l) &&
 			    (l2 = e->l->radial_next) != l1)
 			{
-				if (dot_v3v3(l1->f->no, l2->f->no) < threshold) {
+				if (/* 3+ faces on thsi edge, always split */
+				    UNLIKELY(l1 != l2->radial_next) ||
+				    /* 2 face edge - check angle*/
+				    (dot_v3v3(l1->f->no, l2->f->no) < threshold))
+				{
 					BMO_elem_flag_enable(bm, e, EDGE_MARK);
 				}
 			}
diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c
index b69f167f876..b9593353288 100644
--- a/source/blender/modifiers/intern/MOD_explode.c
+++ b/source/blender/modifiers/intern/MOD_explode.c
@@ -205,12 +205,12 @@ static MFace *get_dface(DerivedMesh *dm, DerivedMesh *split, int cur, int i, MFa
 	return df;
 }
 
-#define SET_VERTS(a, b, c, d) \
-    v[0] = mf->v##a; uv[0] = a - 1; \
-    v[1] = mf->v##b; uv[1] = b - 1; \
-    v[2] = mf->v##c; uv[2] = c - 1; \
-    v[3] = mf->v##d; uv[3] = d - 1; \
-    (void)0
+#define SET_VERTS(a, b, c, d)  {        \
+        v[0] = mf->v##a; uv[0] = a - 1; \
+        v[1] = mf->v##b; uv[1] = b - 1; \
+        v[2] = mf->v##c; uv[2] = c - 1; \
+        v[3] = mf->v##d; uv[3] = d - 1; \
+    } (void)0
 
 #define GET_ES(v1, v2) edgecut_get(eh, v1, v2)
 #define INT_UV(uvf, c0, c1) interp_v2_v2v2(uvf, mf->uv[c0], mf->uv[c1], 0.5f)
diff --git a/source/blender/modifiers/intern/MOD_mask.c b/source/blender/modifiers/intern/MOD_mask.c
index 0a14b4d5a08..5039ffef382 100644
--- a/source/blender/modifiers/intern/MOD_mask.c
+++ b/source/blender/modifiers/intern/MOD_mask.c
@@ -86,9 +86,12 @@ static void updateDepgraph(ModifierData *md, DagForest *forest,
 	MaskModifierData *mmd = (MaskModifierData *)md;
 
 	if (mmd->ob_arm) {
+		bArmature *arm = (bArmature *)mmd->ob_arm->data;
 		DagNode *armNode = dag_get_node(forest, mmd->ob_arm);
 		
+		/* tag relationship in depsgraph, but also on the armature */
 		dag_add_relation(forest, armNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Mask Modifier");
+		arm->flag |= ARM_HAS_VIZ_DEPS;
 	}
 }
 
@@ -138,7 +141,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 	
 	/* if mode is to use selected armature bones, aggregate the bone groups */
 	if (mmd->mode == MOD_MASK_MODE_ARM) { /* --- using selected bones --- */
-		GHash *vgroupHash;
 		Object *oba = mmd->ob_arm;
 		bPoseChannel *pchan;
 		bDeformGroup *def;
@@ -147,9 +149,13 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 		const int defbase_tot = BLI_countlist(&ob->defbase);
 		
 		/* check that there is armature object with bones to use, otherwise return original mesh */
-		if (ELEM3(NULL, mmd->ob_arm, mmd->ob_arm->pose, ob->defbase.first))
+		if (ELEM3(NULL, oba, oba->pose, ob->defbase.first))
 			return derivedData;
 		
+		/* determine whether each vertexgroup is associated with a selected bone or not 
+		 * - each cell is a boolean saying whether bone corresponding to the ith group is selected
+		 * - groups that don't match a bone are treated as not existing (along with the corresponding ungrouped verts)
+		 */
 		bone_select_array = MEM_mallocN(defbase_tot * sizeof(char), "mask array");
 		
 		for (i = 0, def = ob->defbase.first; def; def = def->next, i++) {
@@ -162,46 +168,36 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 				bone_select_array[i] = FALSE;
 			}
 		}
-
-		/* hashes for finding mapping of:
-		 * - vgroups to indices -> vgroupHash  (string, int)
-		 * - bones to vgroup indices -> boneHash (index of vgroup, dummy)
-		 */
-		vgroupHash = BLI_ghash_str_new("mask vgroup gh");
-		
-		/* build mapping of names of vertex groups to indices */
-		for (i = 0, def = ob->defbase.first; def; def = def->next, i++) 
-			BLI_ghash_insert(vgroupHash, def->name, SET_INT_IN_POINTER(i));
-		
-		/* if no bones selected, free hashes and return original mesh */
-		if (bone_select_tot == 0) {
-			BLI_ghash_free(vgroupHash, NULL, NULL);
-			MEM_freeN(bone_select_array);
-			
-			return derivedData;
-		}
 		
-		/* repeat the previous check, but for dverts */
+		/* if no dverts (i.e. no data for vertex groups exists), we've got an
+		 * inconsistent situation, so free hashes and return oirginal mesh
+		 */
 		dvert = dm->getVertDataArray(dm, CD_MDEFORMVERT);
 		if (dvert == NULL) {
-			BLI_ghash_free(vgroupHash, NULL, NULL);
 			MEM_freeN(bone_select_array);
-			
 			return derivedData;
 		}
 		
-		/* hashes for quickly providing a mapping from old to new - use key=oldindex, value=newindex */
+		/* verthash gives mapping from original vertex indicies to the new indices (including selected matches only)
+		 * 	key=oldindex, value=newindex 
+		 */
 		vertHash = BLI_ghash_int_new("mask vert gh");
 		
-		/* add vertices which exist in vertexgroups into vertHash for filtering */
+		/* add vertices which exist in vertexgroups into vertHash for filtering 
+		 * - dv = for each vertex, what vertexgroups does it belong to
+		 * - dw = weight that vertex was assigned to a vertexgroup it belongs to
+		 */
 		for (i = 0, dv = dvert; i < maxVerts; i++, dv++) {
 			MDeformWeight *dw = dv->dw;
+			short found = 0;
 			int j;
 			
-			for (j = dv->totweight; j > 0; j--, dw++) {
+			/* check the groups that vertex is assigned to, and see if it was any use */
+			for (j = 0; j < dv->totweight; j++, dw++) {
 				if (dw->def_nr < defbase_tot) {
 					if (bone_select_array[dw->def_nr]) {
 						if (dw->weight != 0.0f) {
+							found = TRUE;
 							break;
 						}
 					}
@@ -211,11 +207,11 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 			/* check if include vert in vertHash */
 			if (mmd->flag & MOD_MASK_INV) {
 				/* if this vert is in the vgroup, don't include it in vertHash */
-				if (dw) continue;
+				if (found) continue;
 			}
 			else {
 				/* if this vert isn't in the vgroup, don't include it in vertHash */
-				if (!dw) continue;
+				if (!found) continue;
 			}
 			
 			/* add to ghash for verts (numVerts acts as counter for mapping) */
@@ -224,7 +220,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 		}
 		
 		/* free temp hashes */
-		BLI_ghash_free(vgroupHash, NULL, NULL);
 		MEM_freeN(bone_select_array);
 	}
 	else {  /* --- Using Nominated VertexGroup only --- */
diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c
index 57966b5824b..2b55471be3d 100644
--- a/source/blender/modifiers/intern/MOD_remesh.c
+++ b/source/blender/modifiers/intern/MOD_remesh.c
@@ -87,6 +87,7 @@ static void init_dualcon_mesh(DualConInput *mesh, DerivedMesh *dm)
 	mesh->face_stride = sizeof(MFace);
 	mesh->totface = dm->getNumTessFaces(dm);
 
+	INIT_MINMAX(mesh->min, mesh->max);
 	dm->getMinMax(dm, mesh->min, mesh->max);
 }
 
diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c
index 36c052440b6..14735810cad 100644
--- a/source/blender/modifiers/intern/MOD_simpledeform.c
+++ b/source/blender/modifiers/intern/MOD_simpledeform.c
@@ -51,8 +51,6 @@
 
 #include "MOD_util.h"
 
-
-
 /* Clamps/Limits the given coordinate to:  limits[0] <= co[axis] <= limits[1]
  * The amount of clamp is saved on dcut */
 static void axis_limit(int axis, const float limits[2], float co[3], float dcut[3])
@@ -65,79 +63,79 @@ static void axis_limit(int axis, const float limits[2], float co[3], float dcut[
 	co[axis] = val;
 }
 
-static void simpleDeform_taper(const float factor, const float dcut[3], float *co)
+static void simpleDeform_taper(const float factor, const float dcut[3], float r_co[3])
 {
-	float x = co[0], y = co[1], z = co[2];
+	float x = r_co[0], y = r_co[1], z = r_co[2];
 	float scale = z * factor;
 
-	co[0] = x + x * scale;
-	co[1] = y + y * scale;
-	co[2] = z;
+	r_co[0] = x + x * scale;
+	r_co[1] = y + y * scale;
+	r_co[2] = z;
 
 	if (dcut) {
-		co[0] += dcut[0];
-		co[1] += dcut[1];
-		co[2] += dcut[2];
+		r_co[0] += dcut[0];
+		r_co[1] += dcut[1];
+		r_co[2] += dcut[2];
 	}
 }
 
-static void simpleDeform_stretch(const float factor, const float dcut[3], float *co)
+static void simpleDeform_stretch(const float factor, const float dcut[3], float r_co[3])
 {
-	float x = co[0], y = co[1], z = co[2];
+	float x = r_co[0], y = r_co[1], z = r_co[2];
 	float scale;
 
 	scale = (z * z * factor - factor + 1.0f);
 
-	co[0] = x * scale;
-	co[1] = y * scale;
-	co[2] = z * (1.0f + factor);
+	r_co[0] = x * scale;
+	r_co[1] = y * scale;
+	r_co[2] = z * (1.0f + factor);
 
 	if (dcut) {
-		co[0] += dcut[0];
-		co[1] += dcut[1];
-		co[2] += dcut[2];
+		r_co[0] += dcut[0];
+		r_co[1] += dcut[1];
+		r_co[2] += dcut[2];
 	}
 }
 
-static void simpleDeform_twist(const float factor, const float *dcut, float *co)
+static void simpleDeform_twist(const float factor, const float *dcut, float r_co[3])
 {
-	float x = co[0], y = co[1], z = co[2];
+	float x = r_co[0], y = r_co[1], z = r_co[2];
 	float theta, sint, cost;
 
 	theta = z * factor;
-	sint  = sin(theta);
-	cost  = cos(theta);
+	sint  = sinf(theta);
+	cost  = cosf(theta);
 
-	co[0] = x * cost - y * sint;
-	co[1] = x * sint + y * cost;
-	co[2] = z;
+	r_co[0] = x * cost - y * sint;
+	r_co[1] = x * sint + y * cost;
+	r_co[2] = z;
 
 	if (dcut) {
-		co[0] += dcut[0];
-		co[1] += dcut[1];
-		co[2] += dcut[2];
+		r_co[0] += dcut[0];
+		r_co[1] += dcut[1];
+		r_co[2] += dcut[2];
 	}
 }
 
-static void simpleDeform_bend(const float factor, const float dcut[3], float *co)
+static void simpleDeform_bend(const float factor, const float dcut[3], float r_co[3])
 {
-	float x = co[0], y = co[1], z = co[2];
+	float x = r_co[0], y = r_co[1], z = r_co[2];
 	float theta, sint, cost;
 
 	theta = x * factor;
-	sint = sin(theta);
-	cost = cos(theta);
+	sint = sinf(theta);
+	cost = cosf(theta);
 
 	if (fabsf(factor) > 1e-7f) {
-		co[0] = -(y - 1.0f / factor) * sint;
-		co[1] =  (y - 1.0f / factor) * cost + 1.0f / factor;
-		co[2] = z;
+		r_co[0] = -(y - 1.0f / factor) * sint;
+		r_co[1] =  (y - 1.0f / factor) * cost + 1.0f / factor;
+		r_co[2] = z;
 	}
 
 	if (dcut) {
-		co[0] += cost * dcut[0];
-		co[1] += sint * dcut[0];
-		co[2] += dcut[2];
+		r_co[0] += cost * dcut[0];
+		r_co[1] += sint * dcut[0];
+		r_co[2] += dcut[2];
 	}
 
 }
@@ -153,7 +151,7 @@ static void SimpleDeformModifier_do(SimpleDeformModifierData *smd, struct Object
 	int limit_axis = 0;
 	float smd_limit[2], smd_factor;
 	SpaceTransform *transf = NULL, tmp_transf;
-	void (*simpleDeform_callback)(const float factor, const float dcut[3], float *co) = NULL;  /* Mode callback */
+	void (*simpleDeform_callback)(const float factor, const float dcut[3], float co[3]) = NULL;  /* Mode callback */
 	int vgroup;
 	MDeformVert *dvert;
 
diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c
index e3a4ff17d7c..d3ea3fd4ebd 100644
--- a/source/blender/modifiers/intern/MOD_skin.c
+++ b/source/blender/modifiers/intern/MOD_skin.c
@@ -1034,7 +1034,7 @@ static BMFace *collapse_face_corners(BMesh *bm, BMFace *f, int n,
 		BMIter iter;
 		int i;
 
-		shortest_edge = BM_face_find_shortest_edge(f);
+		shortest_edge = BM_face_find_shortest_loop(f)->e;
 		BMO_op_initf(bm, &op, "weldverts");
 
 		/* Note: could probably calculate merges in one go to be
@@ -1193,7 +1193,7 @@ static void skin_fix_hole_no_good_verts(BMesh *bm, Frame *frame, BMFace *split_f
 
 		/* Need at least four ring edges, so subdivide longest edge if
 		 * face is a triangle */
-		longest_edge = BM_face_find_longest_edge(split_face);
+		longest_edge = BM_face_find_longest_loop(split_face)->e;
 		
 		BM_mesh_elem_hflag_disable_all(bm, BM_EDGE, BM_ELEM_TAG, FALSE);
 		BM_elem_flag_enable(longest_edge, BM_ELEM_TAG);
diff --git a/source/blender/modifiers/intern/MOD_smooth.c b/source/blender/modifiers/intern/MOD_smooth.c
index 99a5dcb5ef5..545e2135344 100644
--- a/source/blender/modifiers/intern/MOD_smooth.c
+++ b/source/blender/modifiers/intern/MOD_smooth.c
@@ -118,8 +118,14 @@ static void smoothModifier_do(
 	fac = smd->fac;
 	facm = 1 - fac;
 
-	medges = dm->getEdgeArray(dm);
-	numDMEdges = dm->getNumEdges(dm);
+	if (dm->getNumVerts(dm) == numVerts) {
+		medges = dm->getEdgeArray(dm);
+		numDMEdges = dm->getNumEdges(dm);
+	}
+	else {
+		medges = NULL;
+		numDMEdges = 0;
+	}
 
 	modifier_get_vgroup(ob, dm, smd->defgrp_name, &dvert, &defgrp_index);
 
@@ -244,6 +250,7 @@ ModifierTypeInfo modifierType_Smooth = {
 	/* structSize */        sizeof(SmoothModifierData),
 	/* type */              eModifierTypeType_OnlyDeform,
 	/* flags */             eModifierTypeFlag_AcceptsMesh |
+							eModifierTypeFlag_AcceptsCVs |
 	                        eModifierTypeFlag_SupportsEditmode,
 
 	/* copyData */          copyData,
diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c
index 5d31420da86..6f8e65a6e8e 100644
--- a/source/blender/modifiers/intern/MOD_solidify.c
+++ b/source/blender/modifiers/intern/MOD_solidify.c
@@ -18,11 +18,8 @@
  * The Original Code is Copyright (C) 2005 by the Blender Foundation.
  * All rights reserved.
  *
- * Contributor(s): Daniel Dunbar
- *                 Ton Roosendaal,
- *                 Ben Batt,
- *                 Brecht Van Lommel,
- *                 Campbell Barton
+ * Contributor(s): Campbell Barton
+ *                 Shinsuke Irie
  *
  * ***** END GPL LICENSE BLOCK *****
  *
@@ -50,19 +47,14 @@
 #include "MOD_modifiertypes.h"
 #include "MOD_util.h"
 
+/* *** derived mesh high quality normal calculation function  *** */
+/* could be exposed for other functions to use */
+
 typedef struct EdgeFaceRef {
 	int f1; /* init as -1 */
 	int f2;
 } EdgeFaceRef;
 
-/* spesific function for solidify - define locally */
-BLI_INLINE void madd_v3v3short_fl(float r[3], const short a[3], const float f)
-{
-	r[0] += (float)a[0] * f;
-	r[1] += (float)a[1] * f;
-	r[2] += (float)a[2] * f;
-}
-
 static void dm_calc_normal(DerivedMesh *dm, float (*temp_nors)[3])
 {
 	int i, numVerts, numEdges, numFaces;
@@ -80,7 +72,7 @@ static void dm_calc_normal(DerivedMesh *dm, float (*temp_nors)[3])
 	mpoly = dm->getPolyArray(dm);
 	mvert = dm->getVertArray(dm);
 	mloop = dm->getLoopArray(dm);
-	
+
 	/* we don't want to overwrite any referenced layers */
 
 	/* Doesn't work here! */
@@ -112,7 +104,7 @@ static void dm_calc_normal(DerivedMesh *dm, float (*temp_nors)[3])
 			unsigned int ml_v1;
 			unsigned int ml_v2;
 			int j;
-			
+
 			f_no = face_nors[i];
 			if (calc_face_nors)
 				mesh_calc_poly_normal(mp, mloop + mp->loopstart, mvert, f_no);
@@ -207,10 +199,17 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
 	return dataMask;
 }
 
+/* spesific function for solidify - define locally */
+BLI_INLINE void madd_v3v3short_fl(float r[3], const short a[3], const float f)
+{
+	r[0] += (float)a[0] * f;
+	r[1] += (float)a[1] * f;
+	r[2] += (float)a[2] * f;
+}
 
-static DerivedMesh *applyModifier(ModifierData *md, Object *ob, 
-                                  DerivedMesh *dm,
-                                  ModifierApplyFlag UNUSED(flag))
+static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
+		DerivedMesh *dm,
+		ModifierApplyFlag UNUSED(flag))
 {
 	int i;
 	DerivedMesh *result;
@@ -225,7 +224,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 	const int numFaces = dm->getNumPolys(dm);
 	int numLoops = 0, newLoops = 0, newFaces = 0, newEdges = 0;
 	int j;
-	
+
 	/* only use material offsets if we have 2 or more materials  */
 	const short mat_nr_max = ob->totcol > 1 ? ob->totcol - 1 : 0;
 	const short mat_ofs = mat_nr_max ? smd->mat_ofs : 0;
@@ -249,6 +248,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 	const float ofs_new  = smd->offset + ofs_orig;
 	const float offset_fac_vg = smd->offset_fac_vg;
 	const float offset_fac_vg_inv = 1.0f - smd->offset_fac_vg;
+	const int do_flip = (smd->flag & MOD_SOLIDIFY_FLIP) != 0;
 
 	/* weights */
 	MDeformVert *dvert, *dv = NULL;
@@ -259,7 +259,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 
 	numLoops = dm->numLoopData;
 	newLoops = 0;
-	
+
 	orig_mvert = dm->getVertArray(dm);
 	orig_medge = dm->getEdgeArray(dm);
 	orig_mloop = dm->getLoopArray(dm);
@@ -393,9 +393,9 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 			ml2[j].e = ml2[j + 1].e;
 		}
 		ml2[mp->totloop - 1].e = e;
-		
+
 		mp->loopstart += dm->numLoopData;
-		
+
 		for (j = 0; j < mp->totloop; j++) {
 			ml2[j].e += numEdges;
 			ml2[j].v += numVerts;
@@ -420,7 +420,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 
 		if (ofs_new != 0.0f) {
 			scalar_short = scalar_short_vgroup = ofs_new / 32767.0f;
-			mv = mvert + ((ofs_new >= ofs_orig) ? 0 : numVerts);
+			mv = mvert + (((ofs_new >= ofs_orig) == do_flip) ? numVerts : 0);
 			dv = dvert;
 			for (i = 0; i < numVerts; i++, mv++) {
 				if (dv) {
@@ -435,7 +435,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 
 		if (ofs_orig != 0.0f) {
 			scalar_short = scalar_short_vgroup = ofs_orig / 32767.0f;
-			mv = mvert + ((ofs_new >= ofs_orig) ? numVerts : 0); /* as above but swapped, intentional use 'ofs_new' */
+			mv = mvert + (((ofs_new >= ofs_orig) == do_flip) ? 0 : numVerts); /* as above but swapped */
 			dv = dvert;
 			for (i = 0; i < numVerts; i++, mv++) {
 				if (dv) {
@@ -447,7 +447,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 				madd_v3v3short_fl(mv->co, mv->no, scalar_short_vgroup);
 			}
 		}
-
 	}
 	else {
 		/* make a face normal layer if not present */
@@ -536,7 +535,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 		}
 
 		if (ofs_new) {
-			mv = mvert + ((ofs_new >= ofs_orig) ? 0 : numVerts);
+			mv = mvert + (((ofs_new >= ofs_orig) == do_flip) ? numVerts : 0);
 
 			for (i = 0; i < numVerts; i++, mv++) {
 				if (vert_accum[i]) { /* zero if unselected */
@@ -547,7 +546,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 
 		if (ofs_orig) {
 			/* same as above but swapped, intentional use of 'ofs_new' */
-			mv = mvert + ((ofs_new >= ofs_orig) ? numVerts : 0);
+			mv = mvert + (((ofs_new >= ofs_orig) == do_flip) ? 0 : numVerts);
 
 			for (i = 0; i < numVerts; i++, mv++) {
 				if (vert_accum[i]) { /* zero if unselected */
@@ -569,16 +568,16 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 	}
 
 	if (smd->flag & MOD_SOLIDIFY_RIM) {
-		
+
 		/* bugger, need to re-calculate the normals for the new edge faces.
 		 * This could be done in many ways, but probably the quickest way
 		 * is to calculate the average normals for side faces only.
 		 * Then blend them with the normals of the edge verts.
-		 * 
+		 *
 		 * at the moment its easiest to allocate an entire array for every vertex,
 		 * even though we only need edge verts - campbell
 		 */
-		
+
 #define SOLIDIFY_SIDE_NORMALS
 
 #ifdef SOLIDIFY_SIDE_NORMALS
@@ -649,13 +648,13 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 			if (flip == FALSE) {
 				ml[j].v = ed->v1;
 				ml[j++].e = eidx;
-				
+
 				ml[j].v = ed->v2;
 				ml[j++].e = numEdges * 2 + old_vert_arr[ed->v2];
-				
+
 				ml[j].v = ed->v2 + numVerts;
 				ml[j++].e = eidx + numEdges;
-				
+
 				ml[j].v = ed->v1 + numVerts;
 				ml[j++].e = numEdges * 2 + old_vert_arr[ed->v1];
 			}
@@ -672,7 +671,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 				ml[j].v = ed->v2 + numVerts;
 				ml[j++].e = numEdges * 2 + old_vert_arr[ed->v2];
 			}
-			
+
 			origindex_edge[ml[j - 3].e] = ORIGINDEX_NONE;
 			origindex_edge[ml[j - 1].e] = ORIGINDEX_NONE;
 
@@ -694,7 +693,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 				int tcr = *cr + crease_inner;
 				*cr = tcr > 255 ? 255 : tcr;
 			}
-			
+
 #ifdef SOLIDIFY_SIDE_NORMALS
 			normal_quad_v3(nor,
 			               mvert[ml[j - 4].v].co,
@@ -710,17 +709,17 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 			}
 #endif
 		}
-		
+
 #ifdef SOLIDIFY_SIDE_NORMALS
 		ed = medge + (numEdges * 2);
 		for (i = 0; i < newEdges; i++, ed++) {
 			float nor_cpy[3];
 			short *nor_short;
 			int j;
-			
+
 			/* note, only the first vertex (lower half of the index) is calculated */
 			normalize_v3_v3(nor_cpy, edge_vert_nos[ed->v1]);
-			
+
 			for (j = 0; j < 2; j++) { /* loop over both verts of the edge */
 				nor_short = mvert[*(&ed->v1 + j)].no;
 				normal_short_to_float_v3(nor, nor_short);
@@ -741,7 +740,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 
 	if (old_vert_arr)
 		MEM_freeN(old_vert_arr);
-	
+
 	/* must recalculate normals with vgroups since they can displace unevenly [#26888] */
 	if (dvert) {
 		CDDM_calc_normals(result);
diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.c b/source/blender/modifiers/intern/MOD_weightvg_util.c
index 5097ae8c742..81cdad0d5e5 100644
--- a/source/blender/modifiers/intern/MOD_weightvg_util.c
+++ b/source/blender/modifiers/intern/MOD_weightvg_util.c
@@ -154,7 +154,7 @@ void weightvg_do_mask(int num, const int *indices, float *org_w, const float *ne
 		for (i = 0; i < num; ++i) {
 			int idx = indices ? indices[i] : i;
 			TexResult texres;
-			float h, s, v; /* For HSV color space. */
+			float hsv[3]; /* For HSV color space. */
 
 			texres.nor = NULL;
 			get_texture_value(texture, tex_co[idx], &texres);
@@ -173,16 +173,16 @@ void weightvg_do_mask(int num, const int *indices, float *org_w, const float *ne
 					org_w[i] = (new_w[i] * texres.tb * fact) + (org_w[i] * (1.0f - (texres.tb * fact)));
 					break;
 				case MOD_WVG_MASK_TEX_USE_HUE:
-					rgb_to_hsv(texres.tr, texres.tg, texres.tb, &h, &s, &v);
-					org_w[i] = (new_w[i] * h * fact) + (org_w[i] * (1.0f - (h * fact)));
+					rgb_to_hsv_v(&texres.tr, hsv);
+					org_w[i] = (new_w[i] * hsv[0] * fact) + (org_w[i] * (1.0f - (hsv[0] * fact)));
 					break;
 				case MOD_WVG_MASK_TEX_USE_SAT:
-					rgb_to_hsv(texres.tr, texres.tg, texres.tb, &h, &s, &v);
-					org_w[i] = (new_w[i] * s * fact) + (org_w[i] * (1.0f - (s * fact)));
+					rgb_to_hsv_v(&texres.tr, hsv);
+					org_w[i] = (new_w[i] * hsv[1] * fact) + (org_w[i] * (1.0f - (hsv[1] * fact)));
 					break;
 				case MOD_WVG_MASK_TEX_USE_VAL:
-					rgb_to_hsv(texres.tr, texres.tg, texres.tb, &h, &s, &v);
-					org_w[i] = (new_w[i] * v * fact) + (org_w[i] * (1.0f - (v * fact)));
+					rgb_to_hsv_v(&texres.tr, hsv);
+					org_w[i] = (new_w[i] * hsv[2] * fact) + (org_w[i] * (1.0f - (hsv[2] * fact)));
 					break;
 				case MOD_WVG_MASK_TEX_USE_ALPHA:
 					org_w[i] = (new_w[i] * texres.ta * fact) + (org_w[i] * (1.0f - (texres.ta * fact)));
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index f7e0fd57ff6..2415c7842a7 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -76,12 +76,15 @@ set(SRC
 	composite/nodes/node_composite_idMask.c
 	composite/nodes/node_composite_image.c
 	composite/nodes/node_composite_invert.c
+	composite/nodes/node_composite_keyingscreen.c
+	composite/nodes/node_composite_keying.c
 	composite/nodes/node_composite_lensdist.c
 	composite/nodes/node_composite_levels.c
 	composite/nodes/node_composite_lummaMatte.c
 	composite/nodes/node_composite_mapUV.c
 	composite/nodes/node_composite_mapValue.c
 	composite/nodes/node_composite_math.c
+	composite/nodes/node_composite_mask.c
 	composite/nodes/node_composite_mixrgb.c
 	composite/nodes/node_composite_movieclip.c
 	composite/nodes/node_composite_moviedistortion.c
@@ -121,7 +124,6 @@ set(SRC
 	shader/nodes/node_shader_camera.c
 	shader/nodes/node_shader_common.c
 	shader/nodes/node_shader_curves.c
-	shader/nodes/node_shader_dynamic.c
 	shader/nodes/node_shader_gamma.c
 	shader/nodes/node_shader_brightness.c
 	shader/nodes/node_shader_geom.c
@@ -159,6 +161,7 @@ set(SRC
 	shader/nodes/node_shader_light_path.c
 	shader/nodes/node_shader_light_falloff.c
 	shader/nodes/node_shader_object_info.c
+	shader/nodes/node_shader_particle_info.c
 	shader/nodes/node_shader_mix_shader.c
 	shader/nodes/node_shader_add_shader.c
 	shader/nodes/node_shader_output_lamp.c
diff --git a/source/blender/nodes/NOD_composite.h b/source/blender/nodes/NOD_composite.h
index ca925c82afd..33d6327ece1 100644
--- a/source/blender/nodes/NOD_composite.h
+++ b/source/blender/nodes/NOD_composite.h
@@ -50,6 +50,7 @@ void register_node_type_cmp_value(struct bNodeTreeType *ttype);
 void register_node_type_cmp_rgb(struct bNodeTreeType *ttype);
 void register_node_type_cmp_curve_time(struct bNodeTreeType *ttype);
 void register_node_type_cmp_movieclip(struct bNodeTreeType *ttype);
+void register_node_type_cmp_usermask(struct bNodeTreeType *ttype);
 
 void register_node_type_cmp_composite(struct bNodeTreeType *ttype);
 void register_node_type_cmp_viewer(struct bNodeTreeType *ttype);
@@ -104,6 +105,8 @@ void register_node_type_cmp_channel_matte(struct bNodeTreeType *ttype);
 void register_node_type_cmp_color_spill(struct bNodeTreeType *ttype);
 void register_node_type_cmp_luma_matte(struct bNodeTreeType *ttype); 
 void register_node_type_cmp_doubleedgemask(struct bNodeTreeType *ttype);
+void register_node_type_cmp_keyingscreen(struct bNodeTreeType *ttype);
+void register_node_type_cmp_keying(struct bNodeTreeType *ttype);
 
 void register_node_type_cmp_translate(struct bNodeTreeType *ttype);
 void register_node_type_cmp_rotate(struct bNodeTreeType *ttype);
@@ -115,6 +118,7 @@ void register_node_type_cmp_mapuv(struct bNodeTreeType *ttype);
 void register_node_type_cmp_transform(struct bNodeTreeType *ttype);
 void register_node_type_cmp_stabilize2d(struct bNodeTreeType *ttype);
 void register_node_type_cmp_moviedistortion(struct bNodeTreeType *ttype);
+void register_node_type_cmp_mask(struct bNodeTreeType *ttype);
 
 void register_node_type_cmp_glare(struct bNodeTreeType *ttype);
 void register_node_type_cmp_tonemap(struct bNodeTreeType *ttype);
diff --git a/source/blender/nodes/NOD_shader.h b/source/blender/nodes/NOD_shader.h
index dd6d25380b4..6b000181953 100644
--- a/source/blender/nodes/NOD_shader.h
+++ b/source/blender/nodes/NOD_shader.h
@@ -78,6 +78,7 @@ void register_node_type_sh_object_info(struct bNodeTreeType *ttype);
 void register_node_type_sh_fresnel(struct bNodeTreeType *ttype);
 void register_node_type_sh_layer_weight(struct bNodeTreeType *ttype);
 void register_node_type_sh_tex_coord(struct bNodeTreeType *ttype);
+void register_node_type_sh_particle_info(struct bNodeTreeType *ttype);
 
 void register_node_type_sh_background(struct bNodeTreeType *ttype);
 void register_node_type_sh_bsdf_diffuse(struct bNodeTreeType *ttype);
diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c
index 5bc2e1fc004..5813f4d479f 100644
--- a/source/blender/nodes/composite/node_composite_tree.c
+++ b/source/blender/nodes/composite/node_composite_tree.c
@@ -162,11 +162,11 @@ static void localize(bNodeTree *localtree, bNodeTree *ntree)
 		}
 	}
 	
-	/* replace muted nodes by internal links */
+	/* replace muted nodes and reroute nodes by internal links */
 	for (node= localtree->nodes.first; node; node= node_next) {
 		node_next = node->next;
 		
-		if (node->flag & NODE_MUTED) {
+		if (node->flag & NODE_MUTED || node->type == NODE_REROUTE) {
 			/* make sure the update tag isn't lost when removing the muted node.
 			 * propagate this to all downstream nodes.
 			 */
@@ -222,7 +222,7 @@ static void local_merge(bNodeTree *localtree, bNodeTree *ntree)
 				   copied back to original node */
 				if (lnode->storage) {
 					if (lnode->new_node->storage)
-						BKE_tracking_distortion_destroy(lnode->new_node->storage);
+						BKE_tracking_distortion_free(lnode->new_node->storage);
 
 					lnode->new_node->storage= BKE_tracking_distortion_copy(lnode->storage);
 				}
@@ -890,6 +890,10 @@ int ntreeCompositTagAnimated(bNodeTree *ntree)
 			nodeUpdate(ntree, node);
 			tagged= 1;
 		}
+		else if (node->type==CMP_NODE_MASK) {
+			nodeUpdate(ntree, node);
+			tagged= 1;
+		}
 	}
 	
 	return tagged;
diff --git a/source/blender/nodes/composite/node_composite_util.c b/source/blender/nodes/composite/node_composite_util.c
index 0d1840a7a7d..70788dfe0c8 100644
--- a/source/blender/nodes/composite/node_composite_util.c
+++ b/source/blender/nodes/composite/node_composite_util.c
@@ -32,6 +32,8 @@
 
 #include "node_composite_util.h"
 
+#include <limits.h>
+
 CompBuf *alloc_compbuf(int sizex, int sizey, int type, int alloc)
 {
 	CompBuf *cbuf= MEM_callocN(sizeof(CompBuf), "compbuf");
@@ -568,6 +570,22 @@ CompBuf *valbuf_from_rgbabuf(CompBuf *cbuf, int channel)
 	return valbuf;
 }
 
+void valbuf_to_rgbabuf(CompBuf *valbuf, CompBuf *cbuf, int channel)
+{
+	float *valf, *rectf;
+	int tot;
+
+	valf= valbuf->rect;
+
+	/* defaults to returning alpha channel */
+	if ((channel < CHAN_R) || (channel > CHAN_A)) channel = CHAN_A;
+
+	rectf = cbuf->rect + channel;
+
+	for (tot= cbuf->x*cbuf->y; tot>0; tot--, valf++, rectf+=4)
+		*rectf = *valf;
+}
+
 static CompBuf *generate_procedural_preview(CompBuf *cbuf, int newx, int newy)
 {
 	CompBuf *outbuf;
@@ -1006,7 +1024,7 @@ void convolve(CompBuf* dst, CompBuf* in1, CompBuf* in2)
 	for (y=0; y<in2->y; y++) {
 		colp = (fRGB*)&in2->rect[y*in2->x*in2->type];
 		for (x=0; x<in2->x; x++)
-			fRGB_add(wt, colp[x]);
+			add_v3_v3(wt, colp[x]);
 	}
 	if (wt[0] != 0.f) wt[0] = 1.f/wt[0];
 	if (wt[1] != 0.f) wt[1] = 1.f/wt[1];
@@ -1014,7 +1032,7 @@ void convolve(CompBuf* dst, CompBuf* in1, CompBuf* in2)
 	for (y=0; y<in2->y; y++) {
 		colp = (fRGB*)&in2->rect[y*in2->x*in2->type];
 		for (x=0; x<in2->x; x++)
-			fRGB_colormult(colp[x], wt);
+			mul_v3_v3(colp[x], wt);
 	}
 
 	// copy image data, unpacking interleaved RGBA into separate channels
@@ -1263,14 +1281,14 @@ CompBuf* qd_downScaledCopy(CompBuf* src, int scale)
 					xx = x*scale;
 					mx = xx + scale;
 					if (mx > src->x) mx = src->x;
-					colsum[0] = colsum[1] = colsum[2] = 0.f;
+					zero_v3(colsum);
 					for (sy=yy; sy<my; sy++) {
 						fRGB* scolp = (fRGB*)&src->rect[sy*src->x*src->type];
 						for (sx=xx; sx<mx; sx++)
-							fRGB_add(colsum, scolp[sx]);
+							add_v3_v3(colsum, scolp[sx]);
 					}
-					fRGB_mult(colsum, fscale);
-					fRGB_copy(fcolp[x], colsum);
+					mul_v3_fl(colsum, fscale);
+					copy_v3_v3(fcolp[x], colsum);
 				}
 			}
 		}
@@ -1284,33 +1302,35 @@ void IIR_gauss(CompBuf* src, float sigma, int chan, int xy)
 {
 	double q, q2, sc, cf[4], tsM[9], tsu[3], tsv[3];
 	double *X, *Y, *W;
-	int i, x, y, sz;
+	const unsigned int src_width = src->x;
+	const unsigned int src_height = src->y;
+	unsigned int i, x, y, sz;
 
 	// <0.5 not valid, though can have a possibly useful sort of sharpening effect
 	if (sigma < 0.5f) return;
-	
+
 	if ((xy < 1) || (xy > 3)) xy = 3;
-	
+
 	// XXX The YVV macro defined below explicitly expects sources of at least 3x3 pixels,
 	//     so just skiping blur along faulty direction if src's def is below that limit!
-	if (src->x < 3) xy &= ~(int) 1;
-	if (src->y < 3) xy &= ~(int) 2;
+	if (src_width < 3) xy &= ~(int) 1;
+	if (src_height < 3) xy &= ~(int) 2;
 	if (xy < 1) return;
 
 	// see "Recursive Gabor Filtering" by Young/VanVliet
 	// all factors here in double.prec. Required, because for single.prec it seems to blow up if sigma > ~200
 	if (sigma >= 3.556f)
-		q = 0.9804f*(sigma - 3.556f) + 2.5091f;
-	else // sigma >= 0.5
-		q = (0.0561f*sigma + 0.5784f)*sigma - 0.2568f;
-	q2 = q*q;
-	sc = (1.1668 + q)*(3.203729649  + (2.21566 + q)*q);
+		q = 0.9804f * (sigma - 3.556f) + 2.5091f;
+	else     // sigma >= 0.5
+		q = (0.0561f * sigma + 0.5784f) * sigma - 0.2568f;
+	q2 = q * q;
+	sc = (1.1668 + q) * (3.203729649  + (2.21566 + q) * q);
 	// no gabor filtering here, so no complex multiplies, just the regular coefs.
 	// all negated here, so as not to have to recalc Triggs/Sdika matrix
-	cf[1] = q*(5.788961737 + (6.76492 + 3.0*q)*q)/ sc;
-	cf[2] = -q2*(3.38246 + 3.0*q)/sc;
+	cf[1] = q * (5.788961737 + (6.76492 + 3.0 * q) * q) / sc;
+	cf[2] = -q2 * (3.38246 + 3.0 * q) / sc;
 	// 0 & 3 unchanged
-	cf[3] = q2*q/sc;
+	cf[3] = q2 * q / sc;
 	cf[0] = 1.0 - cf[1] - cf[2] - cf[3];
 
 	// Triggs/Sdika border corrections,
@@ -1320,59 +1340,62 @@ void IIR_gauss(CompBuf* src, float sigma, int chan, int xy)
 	// but neither seem to be quite the same, result seems to be ok so far anyway.
 	// Extra scale factor here to not have to do it in filter,
 	// though maybe this had something to with the precision errors
-	sc = cf[0]/((1.0 + cf[1] - cf[2] + cf[3])*(1.0 - cf[1] - cf[2] - cf[3])*(1.0 + cf[2] + (cf[1] - cf[3])*cf[3]));
-	tsM[0] = sc*(-cf[3]*cf[1] + 1.0 - cf[3]*cf[3] - cf[2]);
-	tsM[1] = sc*((cf[3] + cf[1])*(cf[2] + cf[3]*cf[1]));
-	tsM[2] = sc*(cf[3]*(cf[1] + cf[3]*cf[2]));
-	tsM[3] = sc*(cf[1] + cf[3]*cf[2]);
-	tsM[4] = sc*(-(cf[2] - 1.0)*(cf[2] + cf[3]*cf[1]));
-	tsM[5] = sc*(-(cf[3]*cf[1] + cf[3]*cf[3] + cf[2] - 1.0)*cf[3]);
-	tsM[6] = sc*(cf[3]*cf[1] + cf[2] + cf[1]*cf[1] - cf[2]*cf[2]);
-	tsM[7] = sc*(cf[1]*cf[2] + cf[3]*cf[2]*cf[2] - cf[1]*cf[3]*cf[3] - cf[3]*cf[3]*cf[3] - cf[3]*cf[2] + cf[3]);
-	tsM[8] = sc*(cf[3]*(cf[1] + cf[3]*cf[2]));
-
-#define YVV(L)                                                                \
-{                                                                             \
-	W[0] = cf[0]*X[0] + cf[1]*X[0] + cf[2]*X[0] + cf[3]*X[0];                 \
-	W[1] = cf[0]*X[1] + cf[1]*W[0] + cf[2]*X[0] + cf[3]*X[0];                 \
-	W[2] = cf[0]*X[2] + cf[1]*W[1] + cf[2]*W[0] + cf[3]*X[0];                 \
-	for (i=3; i<L; i++)                                                       \
-		W[i] = cf[0]*X[i] + cf[1]*W[i-1] + cf[2]*W[i-2] + cf[3]*W[i-3];       \
-	tsu[0] = W[L-1] - X[L-1];                                                 \
-	tsu[1] = W[L-2] - X[L-1];                                                 \
-	tsu[2] = W[L-3] - X[L-1];                                                 \
-	tsv[0] = tsM[0]*tsu[0] + tsM[1]*tsu[1] + tsM[2]*tsu[2] + X[L-1];          \
-	tsv[1] = tsM[3]*tsu[0] + tsM[4]*tsu[1] + tsM[5]*tsu[2] + X[L-1];          \
-	tsv[2] = tsM[6]*tsu[0] + tsM[7]*tsu[1] + tsM[8]*tsu[2] + X[L-1];          \
-	Y[L-1] = cf[0]*W[L-1] + cf[1]*tsv[0] + cf[2]*tsv[1] + cf[3]*tsv[2];       \
-	Y[L-2] = cf[0]*W[L-2] + cf[1]*Y[L-1] + cf[2]*tsv[0] + cf[3]*tsv[1];       \
-	Y[L-3] = cf[0]*W[L-3] + cf[1]*Y[L-2] + cf[2]*Y[L-1] + cf[3]*tsv[0];       \
-	for (i=L-4; i>=0; i--)                                                    \
-		Y[i] = cf[0]*W[i] + cf[1]*Y[i+1] + cf[2]*Y[i+2] + cf[3]*Y[i+3];       \
-}
+	sc = cf[0] / ((1.0 + cf[1] - cf[2] + cf[3]) * (1.0 - cf[1] - cf[2] - cf[3]) * (1.0 + cf[2] + (cf[1] - cf[3]) * cf[3]));
+	tsM[0] = sc * (-cf[3] * cf[1] + 1.0 - cf[3] * cf[3] - cf[2]);
+	tsM[1] = sc * ((cf[3] + cf[1]) * (cf[2] + cf[3] * cf[1]));
+	tsM[2] = sc * (cf[3] * (cf[1] + cf[3] * cf[2]));
+	tsM[3] = sc * (cf[1] + cf[3] * cf[2]);
+	tsM[4] = sc * (-(cf[2] - 1.0) * (cf[2] + cf[3] * cf[1]));
+	tsM[5] = sc * (-(cf[3] * cf[1] + cf[3] * cf[3] + cf[2] - 1.0) * cf[3]);
+	tsM[6] = sc * (cf[3] * cf[1] + cf[2] + cf[1] * cf[1] - cf[2] * cf[2]);
+	tsM[7] = sc * (cf[1] * cf[2] + cf[3] * cf[2] * cf[2] - cf[1] * cf[3] * cf[3] - cf[3] * cf[3] * cf[3] - cf[3] * cf[2] + cf[3]);
+	tsM[8] = sc * (cf[3] * (cf[1] + cf[3] * cf[2]));
+
+#define YVV(L)                                                                          \
+{                                                                                       \
+	W[0] = cf[0] * X[0] + cf[1] * X[0] + cf[2] * X[0] + cf[3] * X[0];                   \
+	W[1] = cf[0] * X[1] + cf[1] * W[0] + cf[2] * X[0] + cf[3] * X[0];                   \
+	W[2] = cf[0] * X[2] + cf[1] * W[1] + cf[2] * W[0] + cf[3] * X[0];                   \
+	for (i = 3; i < L; i++) {                                                           \
+		W[i] = cf[0] * X[i] + cf[1] * W[i - 1] + cf[2] * W[i - 2] + cf[3] * W[i - 3];   \
+	}                                                                                   \
+	tsu[0] = W[L - 1] - X[L - 1];                                                       \
+	tsu[1] = W[L - 2] - X[L - 1];                                                       \
+	tsu[2] = W[L - 3] - X[L - 1];                                                       \
+	tsv[0] = tsM[0] * tsu[0] + tsM[1] * tsu[1] + tsM[2] * tsu[2] + X[L - 1];            \
+	tsv[1] = tsM[3] * tsu[0] + tsM[4] * tsu[1] + tsM[5] * tsu[2] + X[L - 1];            \
+	tsv[2] = tsM[6] * tsu[0] + tsM[7] * tsu[1] + tsM[8] * tsu[2] + X[L - 1];            \
+	Y[L - 1] = cf[0] * W[L - 1] + cf[1] * tsv[0] + cf[2] * tsv[1] + cf[3] * tsv[2];     \
+	Y[L - 2] = cf[0] * W[L - 2] + cf[1] * Y[L - 1] + cf[2] * tsv[0] + cf[3] * tsv[1];   \
+	Y[L - 3] = cf[0] * W[L - 3] + cf[1] * Y[L - 2] + cf[2] * Y[L - 1] + cf[3] * tsv[0]; \
+	/* 'i != UINT_MAX' is really 'i >= 0', but necessary for unsigned int wrapping */   \
+	for (i = L - 4; i != UINT_MAX; i--) {                                               \
+		Y[i] = cf[0] * W[i] + cf[1] * Y[i + 1] + cf[2] * Y[i + 2] + cf[3] * Y[i + 3];   \
+	}                                                                                   \
+} (void)0
 
 	// intermediate buffers
-	sz = MAX2(src->x, src->y);
-	X = MEM_callocN(sz*sizeof(double), "IIR_gauss X buf");
-	Y = MEM_callocN(sz*sizeof(double), "IIR_gauss Y buf");
-	W = MEM_callocN(sz*sizeof(double), "IIR_gauss W buf");
-	if (xy & 1) {	// H
-		for (y=0; y<src->y; ++y) {
-			const int yx = y*src->x;
-			for (x=0; x<src->x; ++x)
-				X[x] = src->rect[(x + yx)*src->type + chan];
-			YVV(src->x);
-			for (x=0; x<src->x; ++x)
-				src->rect[(x + yx)*src->type + chan] = Y[x];
+	sz = MAX2(src_width, src_height);
+	X = MEM_callocN(sz * sizeof(double), "IIR_gauss X buf");
+	Y = MEM_callocN(sz * sizeof(double), "IIR_gauss Y buf");
+	W = MEM_callocN(sz * sizeof(double), "IIR_gauss W buf");
+	if (xy & 1) {       // H
+		for (y = 0; y < src_height; ++y) {
+			const int yx = y * src_width;
+			for (x = 0; x < src_width; ++x)
+				X[x] = src->rect[(x + yx) * src->type + chan];
+			YVV(src_width);
+			for (x = 0; x < src_width; ++x)
+				src->rect[(x + yx) * src->type + chan] = Y[x];
 		}
 	}
-	if (xy & 2) {	// V
-		for (x=0; x<src->x; ++x) {
-			for (y=0; y<src->y; ++y)
-				X[y] = src->rect[(x + y*src->x)*src->type + chan];
-			YVV(src->y);
-			for (y=0; y<src->y; ++y)
-				src->rect[(x + y*src->x)*src->type + chan] = Y[y];
+	if (xy & 2) {       // V
+		for (x = 0; x < src_width; ++x) {
+			for (y = 0; y < src_height; ++y)
+				X[y] = src->rect[(x + y * src_width) * src->type + chan];
+			YVV(src_height);
+			for (y = 0; y < src_height; ++y)
+				src->rect[(x + y * src_width) * src->type + chan] = Y[y];
 		}
 	}
 
diff --git a/source/blender/nodes/composite/node_composite_util.h b/source/blender/nodes/composite/node_composite_util.h
index 3efdf76f233..8f772b19d5e 100644
--- a/source/blender/nodes/composite/node_composite_util.h
+++ b/source/blender/nodes/composite/node_composite_util.h
@@ -57,6 +57,8 @@
 #include "BLI_utildefines.h"
 #include "BLI_utildefines.h"
 
+#include "BLF_translation.h"
+
 #include "BKE_blender.h"
 #include "BKE_camera.h"
 #include "BKE_colortools.h"
@@ -155,6 +157,7 @@ void composit4_pixel_processor(bNode *node, CompBuf *out, CompBuf *src1_buf, flo
 									  int src1_type, int fac1_type, int src2_type, int fac2_type);
 
 CompBuf *valbuf_from_rgbabuf(CompBuf *cbuf, int channel);
+void valbuf_to_rgbabuf(CompBuf *valbuf, CompBuf *cbuf, int channel);
 void generate_preview(void *data, bNode *node, CompBuf *stackbuf);
 
 void do_copy_rgba(bNode *node, float *out, float *in);
@@ -179,29 +182,8 @@ extern void node_ID_title_cb(void *node_v, void *unused_v);
 /* utility functions used by glare, tonemap and lens distortion */
 /* soms macros for color handling */
 typedef float fRGB[4];
-/* clear color */
-#define fRGB_clear(c) { c[0]=c[1]=c[2]=0.f; }
-/* copy c2 to c1 */
-#define fRGB_copy(c1, c2) { c1[0]=c2[0];  c1[1]=c2[1];  c1[2]=c2[2]; c1[3]=c2[3]; }
-/* add c2 to c1 */
-#define fRGB_add(c1, c2) { c1[0]+=c2[0];  c1[1]+=c2[1];  c1[2]+=c2[2]; }
-/* subtract c2 from c1 */
-#define fRGB_sub(c1, c2) { c1[0]-=c2[0];  c1[1]-=c2[1];  c1[2]-=c2[2]; }
-/* multiply c by float value s */
-#define fRGB_mult(c, s) { c[0]*=s;  c[1]*=s;  c[2]*=s; }
-/* multiply c2 by s and add to c1 */
-#define fRGB_madd(c1, c2, s) { c1[0]+=c2[0]*s;  c1[1]+=c2[1]*s;  c1[2]+=c2[2]*s; }
-/* multiply c2 by color c1 */
-#define fRGB_colormult(c, cs) { c[0]*=cs[0];  c[1]*=cs[1];  c[2]*=cs[2]; }
-/* multiply c2 by color c3 and add to c1 */
-#define fRGB_colormadd(c1, c2, c3) { c1[0]+=c2[0]*c3[0];  c1[1]+=c2[1]*c3[1];  c1[2]+=c2[2]*c3[2]; }
 /* multiply c2 by color rgb, rgb as separate arguments */
-#define fRGB_rgbmult(c, r, g, b) { c[0]*=(r);  c[1]*=(g);  c[2]*=(b); }
-/* swap colors c1 & c2 */
-#define fRGB_swap(c1, c2) { float _t=c1[0];  c1[0]=c2[0];  c2[0]=_t;\
-								  _t=c1[1];  c1[1]=c2[1];  c2[1]=_t;\
-								  _t=c1[2];  c1[2]=c2[2];  c2[2]=_t;\
-								  _t=c1[3];  c1[3]=c2[3];  c3[3]=_t;}
+#define fRGB_rgbmult(c, r, g, b) { c[0]*=(r);  c[1]*=(g);  c[2]*=(b); } (void)0
 
 void qd_getPixel(CompBuf* src, int x, int y, float* col);
 void qd_setPixel(CompBuf* src, int x, int y, float* col);
diff --git a/source/blender/nodes/composite/nodes/node_composite_alphaOver.c b/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
index 5a716e18660..588574e324c 100644
--- a/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
+++ b/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
@@ -34,13 +34,13 @@
 
 /* **************** ALPHAOVER ******************** */
 static bNodeSocketTemplate cmp_node_alphaover_in[]= {
-	{	SOCK_FLOAT, 1, "Fac",			1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_RGBA, 1, "Image",			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_RGBA, 1, "Image",			1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Fac"),			1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_alphaover_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
index b8aabdae77f..62e8138f5e1 100644
--- a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
+++ b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
@@ -32,71 +32,71 @@
 #include "node_composite_util.h"
 
 /* **************** BILATERALBLUR ******************** */
-static bNodeSocketTemplate cmp_node_bilateralblur_in[]= {
-	{ SOCK_RGBA, 1, "Image", 1.0f, 1.0f, 1.0f, 1.0f}, 
-	{ SOCK_RGBA, 1, "Determinator", 1.0f, 1.0f, 1.0f, 1.0f}, 
+static bNodeSocketTemplate cmp_node_bilateralblur_in[] = {
+	{ SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f}, 
+	{ SOCK_RGBA, 1, N_("Determinator"), 1.0f, 1.0f, 1.0f, 1.0f}, 
 	{ -1, 0, "" } 
 };
 
-static bNodeSocketTemplate cmp_node_bilateralblur_out[]= { 
-	{ SOCK_RGBA, 0, "Image"}, 
+static bNodeSocketTemplate cmp_node_bilateralblur_out[] = {
+	{ SOCK_RGBA, 0, N_("Image")}, 
 	{ -1, 0, "" } 
 };
 
 #define INIT_C3                                                               \
-	mean0 = 1;                                                                \
-	mean1[0] = src[0];                                                        \
-	mean1[1] = src[1];                                                        \
-	mean1[2] = src[2];                                                        \
-	mean1[3] = src[3];                                                        \
-	(void)0
+    mean0 = 1;                                                                \
+    mean1[0] = src[0];                                                        \
+    mean1[1] = src[1];                                                        \
+    mean1[2] = src[2];                                                        \
+    mean1[3] = src[3];                                                        \
+    (void)0
 
 /* finds color distances */
 #define COLOR_DISTANCE_C3(c1, c2)                                             \
-	((c1[0] - c2[0])*(c1[0] - c2[0]) +                                        \
-	 (c1[1] - c2[1])*(c1[1] - c2[1]) +                                        \
-	 (c1[2] - c2[2])*(c1[2] - c2[2]) +                                        \
-	 (c1[3] - c2[3])*(c1[3] - c2[3]))
+    ((c1[0] - c2[0]) * (c1[0] - c2[0]) +                                      \
+     (c1[1] - c2[1]) * (c1[1] - c2[1]) +                                      \
+     (c1[2] - c2[2]) * (c1[2] - c2[2]) +                                      \
+     (c1[3] - c2[3]) * (c1[3] - c2[3]))
 
 /* this is the main kernel function for comparing color distances
- and adding them weighted to the final color */
+   and adding them weighted to the final color */
 #define KERNEL_ELEMENT_C3(k)                                                  \
-	temp_color = src + deltas[k];                                             \
-	ref_color = ref + deltas[k];                                              \
-	w = weight_tab[k] +                                                       \
-		(double)COLOR_DISTANCE_C3(ref, ref_color ) * i2sigma_color;           \
-	w = 1.0/(w*w + 1);                                                        \
-	mean0 += w;                                                               \
-	mean1[0] += (double)temp_color[0] * w;                                    \
-	mean1[1] += (double)temp_color[1] * w;                                    \
-	mean1[2] += (double)temp_color[2] * w;                                    \
-	mean1[3] += (double)temp_color[3] * w;                                    \
-	(void)0
+    temp_color = src + deltas[k];                                             \
+    ref_color = ref + deltas[k];                                              \
+    w = weight_tab[k] +                                                       \
+        (double)COLOR_DISTANCE_C3(ref, ref_color) * i2sigma_color;            \
+    w = 1.0 / (w * w + 1);                                                    \
+    mean0 += w;                                                               \
+    mean1[0] += (double)temp_color[0] * w;                                    \
+    mean1[1] += (double)temp_color[1] * w;                                    \
+    mean1[2] += (double)temp_color[2] * w;                                    \
+    mean1[3] += (double)temp_color[3] * w;                                    \
+    (void)0
 
 /* write blurred values to image */
 #define UPDATE_OUTPUT_C3                                                      \
-	mean0 = 1.0/mean0;                                                        \
-	dest[x * pix + 0] = mean1[0] * mean0;                                     \
-	dest[x * pix + 1] = mean1[1] * mean0;                                     \
-	dest[x * pix + 2] = mean1[2] * mean0;                                     \
-	dest[x * pix + 3] = mean1[3] * mean0;                                     \
-	(void)0
+    mean0 = 1.0 / mean0;                                                      \
+    dest[x * pix + 0] = mean1[0] * mean0;                                     \
+    dest[x * pix + 1] = mean1[1] * mean0;                                     \
+    dest[x * pix + 2] = mean1[2] * mean0;                                     \
+    dest[x * pix + 3] = mean1[3] * mean0;                                     \
+    (void)0
 
 /* initializes deltas for fast access to neighbor pixels */
-#define INIT_3X3_DELTAS( deltas, step, nch )                                  \
-	((deltas)[0] =  (nch),  (deltas)[1] = -(step) + (nch),                    \
-	 (deltas)[2] = -(step), (deltas)[3] = -(step) - (nch),                    \
-	 (deltas)[4] = -(nch),  (deltas)[5] =  (step) - (nch),                    \
-	 (deltas)[6] =  (step), (deltas)[7] =  (step) + (nch));                   \
-	(void)0
+#define INIT_3X3_DELTAS(deltas, step, nch)                                    \
+    ((deltas)[0] =  (nch),  (deltas)[1] = -(step) + (nch),                    \
+     (deltas)[2] = -(step), (deltas)[3] = -(step) - (nch),                    \
+     (deltas)[4] = -(nch),  (deltas)[5] =  (step) - (nch),                    \
+     (deltas)[6] =  (step), (deltas)[7] =  (step) + (nch));                   \
+    (void)0
 
 
 /* code of this node was heavily inspired by the smooth function of opencv library.
  * The main change is an optional image input */
 static void node_composit_exec_bilateralblur(void *UNUSED(data), bNode *node, bNodeStack **in, bNodeStack **out)
 {
-	NodeBilateralBlurData *nbbd= node->storage;
-	CompBuf *new, *source, *img= in[0]->data, *refimg= in[1]->data;
+	NodeBilateralBlurData *nbbd = node->storage;
+	CompBuf *new, *source, *img = in[0]->data, *refimg = in[1]->data;
 	double mean0, w, i2sigma_color, i2sigma_space;
 	double mean1[4];
 	double weight_tab[8];
@@ -104,46 +104,46 @@ static void node_composit_exec_bilateralblur(void *UNUSED(data), bNode *node, bN
 	float sigma_color, sigma_space;
 	int imgx, imgy, x, y, pix, i, step;
 	int deltas[8];
-	short found_determinator= 0;
+	short found_determinator = 0;
 
 	if (img == NULL || out[0]->hasoutput == 0)
 		return;
 
 	if (img->type != CB_RGBA) {
-		img= typecheck_compbuf(in[0]->data, CB_RGBA);
+		img = typecheck_compbuf(in[0]->data, CB_RGBA);
 	}
 
-	imgx= img->x;
-	imgy= img->y;
-	pix= img->type;
-	step= pix * imgx;
+	imgx = img->x;
+	imgy = img->y;
+	pix = img->type;
+	step = pix * imgx;
 
 	if (refimg) {
 		if (refimg->x == imgx && refimg->y == imgy) {
 			if (ELEM3(refimg->type, CB_VAL, CB_VEC2, CB_VEC3)) {
-				refimg= typecheck_compbuf(in[1]->data, CB_RGBA);
-				found_determinator= 1;
+				refimg = typecheck_compbuf(in[1]->data, CB_RGBA);
+				found_determinator = 1;
 			}
 		}
 	}
 	else {
-		refimg= img;
+		refimg = img;
 	}
 
 	/* allocs */
-	source= dupalloc_compbuf(img);
-	new= alloc_compbuf(imgx, imgy, pix, 1);
+	source = dupalloc_compbuf(img);
+	new = alloc_compbuf(imgx, imgy, pix, 1);
 	
 	/* accept image offsets from other nodes */
-	new->xof= img->xof;
-	new->yof= img->yof;
+	new->xof = img->xof;
+	new->yof = img->yof;
 
 	/* bilateral code properties */
-	sigma_color= nbbd->sigma_color;
-	sigma_space= nbbd->sigma_space;
+	sigma_color = nbbd->sigma_color;
+	sigma_space = nbbd->sigma_space;
 	
-	i2sigma_color= 1.0f / (sigma_color * sigma_color);
-	i2sigma_space= 1.0f / (sigma_space * sigma_space);
+	i2sigma_color = 1.0f / (sigma_color * sigma_color);
+	i2sigma_space = 1.0f / (sigma_space * sigma_space);
 
 	INIT_3X3_DELTAS(deltas, step, pix);
 
@@ -151,13 +151,13 @@ static void node_composit_exec_bilateralblur(void *UNUSED(data), bNode *node, bN
 	weight_tab[1] = weight_tab[3] = weight_tab[5] = weight_tab[7] = i2sigma_space * 2;
 
 	/* iterations */
-	for (i= 0; i < nbbd->iter; i++) {
-		src= source->rect;
-		ref= refimg->rect;
-		dest= new->rect;
+	for (i = 0; i < nbbd->iter; i++) {
+		src = source->rect;
+		ref = refimg->rect;
+		dest = new->rect;
 		/*goes through image, there are more loops for 1st/last line and all other lines*/
 		/*kernel element accumulates surrounding colors, which are then written with the update_output function*/
-		for (x= 0; x < imgx; x++, src+= pix, ref+= pix) {
+		for (x = 0; x < imgx; x++, src += pix, ref += pix) {
 			INIT_C3;
 
 			KERNEL_ELEMENT_C3(6);
@@ -175,10 +175,10 @@ static void node_composit_exec_bilateralblur(void *UNUSED(data), bNode *node, bN
 			UPDATE_OUTPUT_C3;
 		}
 
-		dest+= step;
+		dest += step;
 
-		for (y= 1; y < imgy - 1; y++, dest+= step, src+= pix, ref+= pix) {
-			x= 0;
+		for (y = 1; y < imgy - 1; y++, dest += step, src += pix, ref += pix) {
+			x = 0;
 
 			INIT_C3;
 
@@ -190,10 +190,10 @@ static void node_composit_exec_bilateralblur(void *UNUSED(data), bNode *node, bN
 
 			UPDATE_OUTPUT_C3;
 
-			src+= pix;
-			ref+= pix;
+			src += pix;
+			ref += pix;
 
-			for (x= 1; x < imgx - 1; x++, src+= pix, ref+= pix) {
+			for (x = 1; x < imgx - 1; x++, src += pix, ref += pix) {
 				INIT_C3;
 
 				KERNEL_ELEMENT_C3(0);
@@ -219,7 +219,7 @@ static void node_composit_exec_bilateralblur(void *UNUSED(data), bNode *node, bN
 			UPDATE_OUTPUT_C3;
 		}
 
-		for (x= 0; x < imgx; x++, src+= pix, ref+= pix) {
+		for (x = 0; x < imgx; x++, src += pix, ref += pix) {
 			INIT_C3;
 
 			KERNEL_ELEMENT_C3(2);
@@ -249,17 +249,17 @@ static void node_composit_exec_bilateralblur(void *UNUSED(data), bNode *node, bN
 			free_compbuf(refimg);
 	}
 
-	out[0]->data= source;
+	out[0]->data = source;
 
 	free_compbuf(new);
 }
 
-static void node_composit_init_bilateralblur(bNodeTree *UNUSED(ntree), bNode* node, bNodeTemplate *UNUSED(ntemp))
+static void node_composit_init_bilateralblur(bNodeTree *UNUSED(ntree), bNode *node, bNodeTemplate *UNUSED(ntemp))
 {
-	NodeBilateralBlurData *nbbd= MEM_callocN(sizeof(NodeBilateralBlurData), "node bilateral blur data");
-	node->storage= nbbd;
-	nbbd->sigma_color= 0.3;
-	nbbd->sigma_space= 5.0;
+	NodeBilateralBlurData *nbbd = MEM_callocN(sizeof(NodeBilateralBlurData), "node bilateral blur data");
+	node->storage = nbbd;
+	nbbd->sigma_color = 0.3;
+	nbbd->sigma_space = 5.0;
 }
 
 void register_node_type_cmp_bilateralblur(bNodeTreeType *ttype)
diff --git a/source/blender/nodes/composite/nodes/node_composite_blur.c b/source/blender/nodes/composite/nodes/node_composite_blur.c
index d19ea3f202f..046623f5b26 100644
--- a/source/blender/nodes/composite/nodes/node_composite_blur.c
+++ b/source/blender/nodes/composite/nodes/node_composite_blur.c
@@ -34,14 +34,14 @@
 #include "node_composite_util.h"
 
 /* **************** BLUR ******************** */
-static bNodeSocketTemplate cmp_node_blur_in[]= {
-	{	SOCK_RGBA, 1, "Image",			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Size",			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	-1, 0, ""	}
+static bNodeSocketTemplate cmp_node_blur_in[] = {
+	{   SOCK_RGBA, 1, N_("Image"),          1.0f, 1.0f, 1.0f, 1.0f},
+	{   SOCK_FLOAT, 1, N_("Size"),          1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{   -1, 0, ""   }
 };
-static bNodeSocketTemplate cmp_node_blur_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
-	{	-1, 0, ""	}
+static bNodeSocketTemplate cmp_node_blur_out[] = {
+	{   SOCK_RGBA, 0, N_("Image")},
+	{   -1, 0, ""   }
 };
 
 static float *make_gausstab(int filtertype, int rad)
@@ -55,14 +55,14 @@ static float *make_gausstab(int filtertype, int rad)
 	
 	sum = 0.0f;
 	for (i = -rad; i <= rad; i++) {
-		val= RE_filter_value(filtertype, (float)i/(float)rad);
+		val = RE_filter_value(filtertype, (float)i / (float)rad);
 		sum += val;
-		gausstab[i+rad] = val;
+		gausstab[i + rad] = val;
 	}
 	
-	sum= 1.0f/sum;
-	for (i=0; i<n; i++)
-		gausstab[i]*= sum;
+	sum = 1.0f / sum;
+	for (i = 0; i < n; i++)
+		gausstab[i] *= sum;
 	
 	return gausstab;
 }
@@ -77,8 +77,8 @@ static float *make_bloomtab(int rad)
 	bloomtab = (float *) MEM_mallocN(n * sizeof(float), "bloom");
 	
 	for (i = -rad; i <= rad; i++) {
-		val = powf(1.0f - fabsf((float)i)/((float)rad), 4.0f);
-		bloomtab[i+rad] = val;
+		val = powf(1.0f - fabsf((float)i) / ((float)rad), 4.0f);
+		bloomtab[i + rad] = val;
 	}
 	
 	return bloomtab;
@@ -87,61 +87,61 @@ static float *make_bloomtab(int rad)
 /* both input images of same type, either 4 or 1 channel */
 static void blur_single_image(bNode *node, CompBuf *new, CompBuf *img, float scale)
 {
-	NodeBlurData *nbd= node->storage;
+	NodeBlurData *nbd = node->storage;
 	CompBuf *work;
 	register float sum, val;
 	float rval, gval, bval, aval;
 	float *gausstab, *gausstabcent;
-	int rad, imgx= img->x, imgy= img->y;
-	int x, y, pix= img->type;
+	int rad, imgx = img->x, imgy = img->y;
+	int x, y, pix = img->type;
 	int i, bigstep;
 	float *src, *dest;
 	
 	/* helper image */
-	work= alloc_compbuf(imgx, imgy, img->type, 1); /* allocs */
+	work = alloc_compbuf(imgx, imgy, img->type, 1); /* allocs */
 
 	/* horizontal */
 	if (nbd->sizex == 0) {
 		memcpy(work->rect, img->rect, sizeof(float) * img->type * imgx * imgy);
 	}
 	else {
-		rad = scale*(float)nbd->sizex;
-		if (rad>imgx/2)
-			rad= imgx/2;
-		else if (rad<1)
-			rad= 1;
+		rad = scale * (float)nbd->sizex;
+		if (rad > imgx / 2)
+			rad = imgx / 2;
+		else if (rad < 1)
+			rad = 1;
 		
-		gausstab= make_gausstab(nbd->filtertype, rad);
-		gausstabcent= gausstab+rad;
+		gausstab = make_gausstab(nbd->filtertype, rad);
+		gausstabcent = gausstab + rad;
 		
 		for (y = 0; y < imgy; y++) {
-			float *srcd= img->rect + pix*(y*img->x);
+			float *srcd = img->rect + pix * (y * img->x);
 			
-			dest = work->rect + pix*(y * img->x);
+			dest = work->rect + pix * (y * img->x);
 			
-			for (x = 0; x < imgx ; x++) {
-				int minr= x-rad<0?-x:-rad;
-				int maxr= x+rad>imgx?imgx-x:rad;
+			for (x = 0; x < imgx; x++) {
+				int minr = x - rad < 0 ? -x : -rad;
+				int maxr = x + rad > imgx ? imgx - x : rad;
 				
-				src= srcd + pix*(x+minr);
+				src = srcd + pix * (x + minr);
 				
-				sum= gval = rval= bval= aval= 0.0f;
-				for (i= minr; i < maxr; i++) {
-					val= gausstabcent[i];
-					sum+= val;
+				sum = gval = rval = bval = aval = 0.0f;
+				for (i = minr; i < maxr; i++) {
+					val = gausstabcent[i];
+					sum += val;
 					rval += val * (*src++);
-					if (pix==4) {
+					if (pix == 4) {
 						gval += val * (*src++);
 						bval += val * (*src++);
 						aval += val * (*src++);
 					}
 				}
-				sum= 1.0f/sum;
-				*dest++ = rval*sum;
-				if (pix==4) {
-					*dest++ = gval*sum;
-					*dest++ = bval*sum;
-					*dest++ = aval*sum;
+				sum = 1.0f / sum;
+				*dest++ = rval * sum;
+				if (pix == 4) {
+					*dest++ = gval * sum;
+					*dest++ = bval * sum;
+					*dest++ = aval * sum;
 				}
 			}
 			if (node->exec & NODE_BREAK)
@@ -156,47 +156,47 @@ static void blur_single_image(bNode *node, CompBuf *new, CompBuf *img, float sca
 		memcpy(new->rect, work->rect, sizeof(float) * img->type * imgx * imgy);
 	}
 	else {
-		rad = scale*(float)nbd->sizey;
-		if (rad>imgy/2)
-			rad= imgy/2;
-		else if (rad<1)
-			rad= 1;
-	
-		gausstab= make_gausstab(nbd->filtertype, rad);
-		gausstabcent= gausstab+rad;
+		rad = scale * (float)nbd->sizey;
+		if (rad > imgy / 2)
+			rad = imgy / 2;
+		else if (rad < 1)
+			rad = 1;
+	
+		gausstab = make_gausstab(nbd->filtertype, rad);
+		gausstabcent = gausstab + rad;
 		
-		bigstep = pix*imgx;
+		bigstep = pix * imgx;
 		for (x = 0; x < imgx; x++) {
-			float *srcd= work->rect + pix*x;
+			float *srcd = work->rect + pix * x;
 			
-			dest = new->rect + pix*x;
+			dest = new->rect + pix * x;
 			
-			for (y = 0; y < imgy ; y++) {
-				int minr= y-rad<0?-y:-rad;
-				int maxr= y+rad>imgy?imgy-y:rad;
+			for (y = 0; y < imgy; y++) {
+				int minr = y - rad < 0 ? -y : -rad;
+				int maxr = y + rad > imgy ? imgy - y : rad;
 				
-				src= srcd + bigstep*(y+minr);
+				src = srcd + bigstep * (y + minr);
 				
-				sum= gval = rval= bval= aval= 0.0f;
-				for (i= minr; i < maxr; i++) {
-					val= gausstabcent[i];
-					sum+= val;
+				sum = gval = rval = bval = aval = 0.0f;
+				for (i = minr; i < maxr; i++) {
+					val = gausstabcent[i];
+					sum += val;
 					rval += val * src[0];
-					if (pix==4) {
+					if (pix == 4) {
 						gval += val * src[1];
 						bval += val * src[2];
 						aval += val * src[3];
 					}
 					src += bigstep;
 				}
-				sum= 1.0f/sum;
-				dest[0] = rval*sum;
-				if (pix==4) {
-					dest[1] = gval*sum;
-					dest[2] = bval*sum;
-					dest[3] = aval*sum;
+				sum = 1.0f / sum;
+				dest[0] = rval * sum;
+				if (pix == 4) {
+					dest[1] = gval * sum;
+					dest[2] = bval * sum;
+					dest[3] = aval * sum;
 				}
-				dest+= bigstep;
+				dest += bigstep;
 			}
 			if (node->exec & NODE_BREAK)
 				break;
@@ -216,83 +216,83 @@ static void bloom_with_reference(CompBuf *new, CompBuf *img, CompBuf *UNUSED(ref
 	float **maintabs;
 	float *gausstabx, *gausstabcenty;
 	float *gausstaby, *gausstabcentx;
-	int radx, rady, imgx= img->x, imgy= img->y;
+	int radx, rady, imgx = img->x, imgy = img->y;
 	int x, y;
 	int i, j;
 	float *src, *dest, *wb;
 	
-	wbuf= alloc_compbuf(imgx, imgy, CB_VAL, 1);
+	wbuf = alloc_compbuf(imgx, imgy, CB_VAL, 1);
 	
 	/* horizontal */
 	radx = (float)nbd->sizex;
-	if (radx>imgx/2)
-		radx= imgx/2;
-	else if (radx<1)
-		radx= 1;
+	if (radx > imgx / 2)
+		radx = imgx / 2;
+	else if (radx < 1)
+		radx = 1;
 	
 	/* vertical */
 	rady = (float)nbd->sizey;
-	if (rady>imgy/2)
-		rady= imgy/2;
-	else if (rady<1)
-		rady= 1;
-	
-	x= MAX2(radx, rady);
-	maintabs= MEM_mallocN(x*sizeof(void *), "gauss array");
-	for (i= 0; i<x; i++)
-		maintabs[i]= make_bloomtab(i+1);
+	if (rady > imgy / 2)
+		rady = imgy / 2;
+	else if (rady < 1)
+		rady = 1;
+
+	x = MAX2(radx, rady);
+	maintabs = MEM_mallocN(x * sizeof(void *), "gauss array");
+	for (i = 0; i < x; i++)
+		maintabs[i] = make_bloomtab(i + 1);
 		
 	/* vars to store before we go */
 //	refd= ref->rect;
-	src= img->rect;
+	src = img->rect;
 	
-	radxf= (float)radx;
-	radyf= (float)rady;
+	radxf = (float)radx;
+	radyf = (float)rady;
 	
 	for (y = 0; y < imgy; y++) {
-		for (x = 0; x < imgx ; x++, src+=4) {//, refd++) {
+		for (x = 0; x < imgx; x++, src += 4) { //, refd++) {
 			
 //			int refradx= (int)(refd[0]*radxf);
 //			int refrady= (int)(refd[0]*radyf);
 			
-			int refradx= (int)(radxf*0.3f*src[3]*(src[0]+src[1]+src[2]));
-			int refrady= (int)(radyf*0.3f*src[3]*(src[0]+src[1]+src[2]));
-			
-			if (refradx>radx) refradx= radx;
-			else if (refradx<1) refradx= 1;
-			if (refrady>rady) refrady= rady;
-			else if (refrady<1) refrady= 1;
+			int refradx = (int)(radxf * 0.3f * src[3] * (src[0] + src[1] + src[2]));
+			int refrady = (int)(radyf * 0.3f * src[3] * (src[0] + src[1] + src[2]));
 			
-			if (refradx==1 && refrady==1) {
-				wb= wbuf->rect + ( y*imgx + x);
-				dest= new->rect + 4*( y*imgx + x);
-				wb[0]+= 1.0f;
+			if (refradx > radx) refradx = radx;
+			else if (refradx < 1) refradx = 1;
+			if (refrady > rady) refrady = rady;
+			else if (refrady < 1) refrady = 1;
+
+			if (refradx == 1 && refrady == 1) {
+				wb = wbuf->rect + (y * imgx + x);
+				dest = new->rect + 4 * (y * imgx + x);
+				wb[0] += 1.0f;
 				dest[0] += src[0];
 				dest[1] += src[1];
 				dest[2] += src[2];
 				dest[3] += src[3];
 			}
 			else {
-				int minxr= x-refradx<0?-x:-refradx;
-				int maxxr= x+refradx>imgx?imgx-x:refradx;
-				int minyr= y-refrady<0?-y:-refrady;
-				int maxyr= y+refrady>imgy?imgy-y:refrady;
-				
-				float *destd= new->rect + 4*( (y + minyr)*imgx + x + minxr);
-				float *wbufd= wbuf->rect + ( (y + minyr)*imgx + x + minxr);
-				
-				gausstabx= maintabs[refradx-1];
-				gausstabcentx= gausstabx+refradx;
-				gausstaby= maintabs[refrady-1];
-				gausstabcenty= gausstaby+refrady;
-				
-				for (i= minyr; i < maxyr; i++, destd+= 4*imgx, wbufd+= imgx) {
-					dest= destd;
-					wb= wbufd;
-					for (j= minxr; j < maxxr; j++, dest+=4, wb++) {
+				int minxr = x - refradx < 0 ? -x : -refradx;
+				int maxxr = x + refradx > imgx ? imgx - x : refradx;
+				int minyr = y - refrady < 0 ? -y : -refrady;
+				int maxyr = y + refrady > imgy ? imgy - y : refrady;
+
+				float *destd = new->rect + 4 * ( (y + minyr) * imgx + x + minxr);
+				float *wbufd = wbuf->rect + ( (y + minyr) * imgx + x + minxr);
+
+				gausstabx = maintabs[refradx - 1];
+				gausstabcentx = gausstabx + refradx;
+				gausstaby = maintabs[refrady - 1];
+				gausstabcenty = gausstaby + refrady;
+
+				for (i = minyr; i < maxyr; i++, destd += 4 * imgx, wbufd += imgx) {
+					dest = destd;
+					wb = wbufd;
+					for (j = minxr; j < maxxr; j++, dest += 4, wb++) {
 						
-						val= gausstabcenty[i]*gausstabcentx[j];
-						wb[0]+= val;
+						val = gausstabcenty[i] * gausstabcentx[j];
+						wb[0] += val;
 						dest[0] += val * src[0];
 						dest[1] += val * src[1];
 						dest[2] += val * src[2];
@@ -303,23 +303,23 @@ static void bloom_with_reference(CompBuf *new, CompBuf *img, CompBuf *UNUSED(ref
 		}
 	}
 	
-	x= imgx*imgy;
-	dest= new->rect;
-	wb= wbuf->rect;
+	x = imgx * imgy;
+	dest = new->rect;
+	wb = wbuf->rect;
 	while (x--) {
-		val= 1.0f/wb[0];
-		dest[0]*= val;
-		dest[1]*= val;
-		dest[2]*= val;
-		dest[3]*= val;
+		val = 1.0f / wb[0];
+		dest[0] *= val;
+		dest[1] *= val;
+		dest[2] *= val;
+		dest[3] *= val;
 		wb++;
-		dest+= 4;
+		dest += 4;
 	}
 	
 	free_compbuf(wbuf);
 	
-	x= MAX2(radx, rady);
-	for (i= 0; i<x; i++)
+	x = MAX2(radx, rady);
+	for (i = 0; i < x; i++)
 		MEM_freeN(maintabs[i]);
 	MEM_freeN(maintabs);
 	
@@ -328,12 +328,12 @@ static void bloom_with_reference(CompBuf *new, CompBuf *img, CompBuf *UNUSED(ref
 #if 0
 static float hexagon_filter(float fi, float fj)
 {
-	fi= fabs(fi);
-	fj= fabs(fj);
+	fi = fabs(fi);
+	fj = fabs(fj);
 	
-	if (fj>0.33f) {
-		fj= (fj-0.33f)/0.66f;
-		if (fi+fj>1.0f)
+	if (fj > 0.33f) {
+		fj = (fj - 0.33f) / 0.66f;
+		if (fi + fj > 1.0f)
 			return 0.0f;
 		else
 			return 1.0f;
@@ -346,85 +346,85 @@ static float hexagon_filter(float fi, float fj)
 /* both images same type, either 1 or 4 channels */
 static void bokeh_single_image(bNode *node, CompBuf *new, CompBuf *img, float fac)
 {
-	NodeBlurData *nbd= node->storage;
+	NodeBlurData *nbd = node->storage;
 	register float val;
 	float radxf, radyf;
 	float *gausstab, *dgauss;
-	int radx, rady, imgx= img->x, imgy= img->y;
-	int x, y, pix= img->type;
+	int radx, rady, imgx = img->x, imgy = img->y;
+	int x, y, pix = img->type;
 	int i, j, n;
-	float *src= NULL, *dest, *srcd= NULL;
+	float *src = NULL, *dest, *srcd = NULL;
 	
 	/* horizontal */
-	radxf = fac*(float)nbd->sizex;
-	if (radxf>imgx/2.0f)
-		radxf= imgx/2.0f;
-	else if (radxf<1.0f)
-		radxf= 1.0f;
+	radxf = fac * (float)nbd->sizex;
+	if (radxf > imgx / 2.0f)
+		radxf = imgx / 2.0f;
+	else if (radxf < 1.0f)
+		radxf = 1.0f;
 	
 	/* vertical */
-	radyf = fac*(float)nbd->sizey;
-	if (radyf>imgy/2.0f)
-		radyf= imgy/2.0f;
-	else if (radyf<1.0f)
-		radyf= 1.0f;
+	radyf = fac * (float)nbd->sizey;
+	if (radyf > imgy / 2.0f)
+		radyf = imgy / 2.0f;
+	else if (radyf < 1.0f)
+		radyf = 1.0f;
 	
-	radx= ceil(radxf);
-	rady= ceil(radyf);
+	radx = ceil(radxf);
+	rady = ceil(radyf);
 	
-	n = (2*radx+1)*(2*rady+1);
+	n = (2 * radx + 1) * (2 * rady + 1);
 	
 	/* create a full filter image */
-	gausstab= MEM_mallocN(sizeof(float)*n, "filter tab");
-	dgauss= gausstab;
-	val= 0.0f;
-	for (j=-rady; j<=rady; j++) {
-		for (i=-radx; i<=radx; i++, dgauss++) {
-			float fj= (float)j/radyf;
-			float fi= (float)i/radxf;
-			float dist= sqrt(fj*fj + fi*fi);
-			
-		//*dgauss= hexagon_filter(fi, fj);
-			*dgauss= RE_filter_value(nbd->filtertype, dist);
+	gausstab = MEM_mallocN(sizeof(float) * n, "filter tab");
+	dgauss = gausstab;
+	val = 0.0f;
+	for (j = -rady; j <= rady; j++) {
+		for (i = -radx; i <= radx; i++, dgauss++) {
+			float fj = (float)j / radyf;
+			float fi = (float)i / radxf;
+			float dist = sqrt(fj * fj + fi * fi);
 
-			val+= *dgauss;
+			//*dgauss= hexagon_filter(fi, fj);
+			*dgauss = RE_filter_value(nbd->filtertype, dist);
+
+			val += *dgauss;
 		}
 	}
 
-	if (val!=0.0f) {
-		val= 1.0f/val;
-		for (j= n -1; j>=0; j--)
-			gausstab[j]*= val;
+	if (val != 0.0f) {
+		val = 1.0f / val;
+		for (j = n - 1; j >= 0; j--)
+			gausstab[j] *= val;
 	}
-	else gausstab[4]= 1.0f;
-	
-	for (y = -rady+1; y < imgy+rady-1; y++) {
-		
-		if (y<=0) srcd= img->rect;
-		else if (y<imgy) srcd+= pix*imgx;
-		else srcd= img->rect + pix*(imgy-1)*imgx;
-			
-		for (x = -radx+1; x < imgx+radx-1 ; x++) {
-			int minxr= x-radx<0?-x:-radx;
-			int maxxr= x+radx>=imgx?imgx-x-1:radx;
-			int minyr= y-rady<0?-y:-rady;
-			int maxyr= y+rady>imgy-1?imgy-y-1:rady;
-			
-			float *destd= new->rect + pix*( (y + minyr)*imgx + x + minxr);
-			float *dgausd= gausstab + (minyr+rady)*(2*radx+1) + minxr+radx;
-			
-			if (x<=0) src= srcd;
-			else if (x<imgx) src+= pix;
-			else src= srcd + pix*(imgx-1);
-			
-			for (i= minyr; i <=maxyr; i++, destd+= pix*imgx, dgausd+= 2*radx + 1) {
-				dest= destd;
-				dgauss= dgausd;
-				for (j= minxr; j <=maxxr; j++, dest+=pix, dgauss++) {
-					val= *dgauss;
-					if (val!=0.0f) {
+	else gausstab[4] = 1.0f;
+
+	for (y = -rady + 1; y < imgy + rady - 1; y++) {
+
+		if (y <= 0) srcd = img->rect;
+		else if (y < imgy) srcd += pix * imgx;
+		else srcd = img->rect + pix * (imgy - 1) * imgx;
+
+		for (x = -radx + 1; x < imgx + radx - 1; x++) {
+			int minxr = x - radx < 0 ? -x : -radx;
+			int maxxr = x + radx >= imgx ? imgx - x - 1 : radx;
+			int minyr = y - rady < 0 ? -y : -rady;
+			int maxyr = y + rady > imgy - 1 ? imgy - y - 1 : rady;
+
+			float *destd = new->rect + pix * ( (y + minyr) * imgx + x + minxr);
+			float *dgausd = gausstab + (minyr + rady) * (2 * radx + 1) + minxr + radx;
+
+			if (x <= 0) src = srcd;
+			else if (x < imgx) src += pix;
+			else src = srcd + pix * (imgx - 1);
+
+			for (i = minyr; i <= maxyr; i++, destd += pix * imgx, dgausd += 2 * radx + 1) {
+				dest = destd;
+				dgauss = dgausd;
+				for (j = minxr; j <= maxxr; j++, dest += pix, dgauss++) {
+					val = *dgauss;
+					if (val != 0.0f) {
 						dest[0] += val * src[0];
-						if (pix>1) {
+						if (pix > 1) {
 							dest[1] += val * src[1];
 							dest[2] += val * src[2];
 							dest[3] += val * src[3];
@@ -444,116 +444,116 @@ static void bokeh_single_image(bNode *node, CompBuf *new, CompBuf *img, float fa
 /* reference has to be mapped 0-1, and equal in size */
 static void blur_with_reference(bNode *node, CompBuf *new, CompBuf *img, CompBuf *ref)
 {
-	NodeBlurData *nbd= node->storage;
+	NodeBlurData *nbd = node->storage;
 	CompBuf *blurbuf, *ref_use;
 	register float sum, val;
 	float rval, gval, bval, aval, radxf, radyf;
 	float **maintabs;
 	float *gausstabx, *gausstabcenty;
 	float *gausstaby, *gausstabcentx;
-	int radx, rady, imgx= img->x, imgy= img->y;
-	int x, y, pix= img->type;
+	int radx, rady, imgx = img->x, imgy = img->y;
+	int x, y, pix = img->type;
 	int i, j;
 	float *src, *dest, *refd, *blurd;
-	float defcol[4] = {1.0f, 1.0f, 1.0f, 1.0f};	/* default color for compbuf_get_pixel */
-	float proccol[4];	/* local color if compbuf is procedural */
+	float defcol[4] = {1.0f, 1.0f, 1.0f, 1.0f}; /* default color for compbuf_get_pixel */
+	float proccol[4];   /* local color if compbuf is procedural */
 	int refradx, refrady;
 
-	if (ref->x!=img->x || ref->y!=img->y)
+	if (ref->x != img->x || ref->y != img->y)
 		return;
 	
-	ref_use= typecheck_compbuf(ref, CB_VAL);
+	ref_use = typecheck_compbuf(ref, CB_VAL);
 	
 	/* trick is; we blur the reference image... but only works with clipped values*/
-	blurbuf= alloc_compbuf(imgx, imgy, CB_VAL, 1);
-	blurbuf->xof= ref_use->xof;
-	blurbuf->yof= ref_use->yof;
-	blurd= blurbuf->rect;
-	refd= ref_use->rect;
-	for (x= imgx*imgy; x>0; x--, refd++, blurd++) {
-		if (refd[0]<0.0f) blurd[0]= 0.0f;
-		else if (refd[0]>1.0f) blurd[0]= 1.0f;
-		else blurd[0]= refd[0];
+	blurbuf = alloc_compbuf(imgx, imgy, CB_VAL, 1);
+	blurbuf->xof = ref_use->xof;
+	blurbuf->yof = ref_use->yof;
+	blurd = blurbuf->rect;
+	refd = ref_use->rect;
+	for (x = imgx * imgy; x > 0; x--, refd++, blurd++) {
+		if (refd[0] < 0.0f) blurd[0] = 0.0f;
+		else if (refd[0] > 1.0f) blurd[0] = 1.0f;
+		else blurd[0] = refd[0];
 	}
 	
 	blur_single_image(node, blurbuf, blurbuf, 1.0f);
 	
 	/* horizontal */
 	radx = (float)nbd->sizex;
-	if (radx>imgx/2)
-		radx= imgx/2;
-	else if (radx<1)
-		radx= 1;
+	if (radx > imgx / 2)
+		radx = imgx / 2;
+	else if (radx < 1)
+		radx = 1;
 	
 	/* vertical */
 	rady = (float)nbd->sizey;
-	if (rady>imgy/2)
-		rady= imgy/2;
-	else if (rady<1)
-		rady= 1;
-	
-	x= MAX2(radx, rady);
-	maintabs= MEM_mallocN(x*sizeof(void *), "gauss array");
-	for (i= 0; i<x; i++)
-		maintabs[i]= make_gausstab(nbd->filtertype, i+1);
-	
-	dest= new->rect;
-	radxf= (float)radx;
-	radyf= (float)rady;
+	if (rady > imgy / 2)
+		rady = imgy / 2;
+	else if (rady < 1)
+		rady = 1;
+
+	x = MAX2(radx, rady);
+	maintabs = MEM_mallocN(x * sizeof(void *), "gauss array");
+	for (i = 0; i < x; i++)
+		maintabs[i] = make_gausstab(nbd->filtertype, i + 1);
+
+	dest = new->rect;
+	radxf = (float)radx;
+	radyf = (float)rady;
 	
 	for (y = 0; y < imgy; y++) {
-		for (x = 0; x < imgx ; x++, dest+=pix) {
-			refd= compbuf_get_pixel(blurbuf, defcol, proccol, x-blurbuf->xrad, y-blurbuf->yrad, blurbuf->xrad, blurbuf->yrad);
-			refradx= (int)(refd[0]*radxf);
-			refrady= (int)(refd[0]*radyf);
-			
-			if (refradx>radx) refradx= radx;
-			else if (refradx<1) refradx= 1;
-			if (refrady>rady) refrady= rady;
-			else if (refrady<1) refrady= 1;
-
-			if (refradx==1 && refrady==1) {
-				src= img->rect + pix*( y*imgx + x);
-				if (pix==1)
-					dest[0]= src[0];
+		for (x = 0; x < imgx; x++, dest += pix) {
+			refd = compbuf_get_pixel(blurbuf, defcol, proccol, x - blurbuf->xrad, y - blurbuf->yrad, blurbuf->xrad, blurbuf->yrad);
+			refradx = (int)(refd[0] * radxf);
+			refrady = (int)(refd[0] * radyf);
+
+			if (refradx > radx) refradx = radx;
+			else if (refradx < 1) refradx = 1;
+			if (refrady > rady) refrady = rady;
+			else if (refrady < 1) refrady = 1;
+
+			if (refradx == 1 && refrady == 1) {
+				src = img->rect + pix * (y * imgx + x);
+				if (pix == 1)
+					dest[0] = src[0];
 				else
 					copy_v4_v4(dest, src);
 			}
 			else {
-				int minxr= x-refradx<0?-x:-refradx;
-				int maxxr= x+refradx>imgx?imgx-x:refradx;
-				int minyr= y-refrady<0?-y:-refrady;
-				int maxyr= y+refrady>imgy?imgy-y:refrady;
-	
-				float *srcd= img->rect + pix*( (y + minyr)*imgx + x + minxr);
-				
-				gausstabx= maintabs[refradx-1];
-				gausstabcentx= gausstabx+refradx;
-				gausstaby= maintabs[refrady-1];
-				gausstabcenty= gausstaby+refrady;
+				int minxr = x - refradx < 0 ? -x : -refradx;
+				int maxxr = x + refradx > imgx ? imgx - x : refradx;
+				int minyr = y - refrady < 0 ? -y : -refrady;
+				int maxyr = y + refrady > imgy ? imgy - y : refrady;
 
-				sum= gval = rval= bval= aval= 0.0f;
-				
-				for (i= minyr; i < maxyr; i++, srcd+= pix*imgx) {
-					src= srcd;
-					for (j= minxr; j < maxxr; j++, src+=pix) {
+				float *srcd = img->rect + pix * ( (y + minyr) * imgx + x + minxr);
+
+				gausstabx = maintabs[refradx - 1];
+				gausstabcentx = gausstabx + refradx;
+				gausstaby = maintabs[refrady - 1];
+				gausstabcenty = gausstaby + refrady;
+
+				sum = gval = rval = bval = aval = 0.0f;
+
+				for (i = minyr; i < maxyr; i++, srcd += pix * imgx) {
+					src = srcd;
+					for (j = minxr; j < maxxr; j++, src += pix) {
 					
-						val= gausstabcenty[i]*gausstabcentx[j];
-						sum+= val;
+						val = gausstabcenty[i] * gausstabcentx[j];
+						sum += val;
 						rval += val * src[0];
-						if (pix>1) {
+						if (pix > 1) {
 							gval += val * src[1];
 							bval += val * src[2];
 							aval += val * src[3];
 						}
 					}
 				}
-				sum= 1.0f/sum;
-				dest[0] = rval*sum;
-				if (pix>1) {
-					dest[1] = gval*sum;
-					dest[2] = bval*sum;
-					dest[3] = aval*sum;
+				sum = 1.0f / sum;
+				dest[0] = rval * sum;
+				if (pix > 1) {
+					dest[1] = gval * sum;
+					dest[2] = bval * sum;
+					dest[3] = aval * sum;
 				}
 			}
 		}
@@ -563,46 +563,46 @@ static void blur_with_reference(bNode *node, CompBuf *new, CompBuf *img, CompBuf
 	
 	free_compbuf(blurbuf);
 	
-	x= MAX2(radx, rady);
-	for (i= 0; i<x; i++)
+	x = MAX2(radx, rady);
+	for (i = 0; i < x; i++)
 		MEM_freeN(maintabs[i]);
 	MEM_freeN(maintabs);
 	
-	if (ref_use!=ref)
+	if (ref_use != ref)
 		free_compbuf(ref_use);
 }
 
 static void node_composit_exec_blur(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
 {
-	CompBuf *new, *img= in[0]->data;
-	NodeBlurData *nbd= node->storage;
+	CompBuf *new, *img = in[0]->data;
+	NodeBlurData *nbd = node->storage;
 	
-	if (img==NULL) return;
+	if (img == NULL) return;
 	
 	/* store image in size that is needed for absolute/relative conversions on ui level */
-	nbd->image_in_width= img->x;
-	nbd->image_in_height= img->y;
+	nbd->image_in_width = img->x;
+	nbd->image_in_height = img->y;
 	
-	if (out[0]->hasoutput==0) return;
+	if (out[0]->hasoutput == 0) return;
 	
 	if (nbd->relative) {
-		if (nbd->aspect==CMP_NODE_BLUR_ASPECT_NONE) {
-			nbd->sizex= (int)(nbd->percentx*0.01f*nbd->image_in_width);
-			nbd->sizey= (int)(nbd->percenty*0.01f*nbd->image_in_height);
+		if (nbd->aspect == CMP_NODE_BLUR_ASPECT_NONE) {
+			nbd->sizex = (int)(nbd->percentx * 0.01f * nbd->image_in_width);
+			nbd->sizey = (int)(nbd->percenty * 0.01f * nbd->image_in_height);
 		}
-		else if (nbd->aspect==CMP_NODE_BLUR_ASPECT_Y) {
-			nbd->sizex= (int)(nbd->percentx*0.01f*nbd->image_in_width);
-			nbd->sizey= (int)(nbd->percenty*0.01f*nbd->image_in_width);
+		else if (nbd->aspect == CMP_NODE_BLUR_ASPECT_Y) {
+			nbd->sizex = (int)(nbd->percentx * 0.01f * nbd->image_in_width);
+			nbd->sizey = (int)(nbd->percenty * 0.01f * nbd->image_in_width);
 		}
-		else if (nbd->aspect==CMP_NODE_BLUR_ASPECT_X) {
-			nbd->sizex= (int)(nbd->percentx*0.01f*nbd->image_in_height);
-			nbd->sizey= (int)(nbd->percenty*0.01f*nbd->image_in_height);
+		else if (nbd->aspect == CMP_NODE_BLUR_ASPECT_X) {
+			nbd->sizex = (int)(nbd->percentx * 0.01f * nbd->image_in_height);
+			nbd->sizey = (int)(nbd->percenty * 0.01f * nbd->image_in_height);
 		}
 	}
 
-	if (nbd->sizex==0 && nbd->sizey==0) {
-		new= pass_on_compbuf(img);
-		out[0]->data= new;
+	if (nbd->sizex == 0 && nbd->sizey == 0) {
+		new = pass_on_compbuf(img);
+		out[0]->data = new;
 	}
 	else if (nbd->filtertype == R_FILTER_FAST_GAUSS) {
 		if (in[1]->vec[0] < 0.001f) { /* time node inputs can be a tiny value */
@@ -610,10 +610,10 @@ static void node_composit_exec_blur(void *data, bNode *node, bNodeStack **in, bN
 		}
 		else {
 			// TODO: can this be mapped with reference, too?
-			const float sx = ((float)nbd->sizex*in[1]->vec[0])/2.0f, sy = ((float)nbd->sizey*in[1]->vec[0])/2.0f;
+			const float sx = ((float)nbd->sizex * in[1]->vec[0]) / 2.0f, sy = ((float)nbd->sizey * in[1]->vec[0]) / 2.0f;
 			int c;
 
-			if ((img==NULL) || (out[0]->hasoutput==0)) return;
+			if ((img == NULL) || (out[0]->hasoutput == 0)) return;
 
 			if (img->type == CB_VEC2)
 				new = typecheck_compbuf(img, CB_VAL);
@@ -623,16 +623,16 @@ static void node_composit_exec_blur(void *data, bNode *node, bNodeStack **in, bN
 				new = dupalloc_compbuf(img);
 
 			if ((sx == sy) && (sx > 0.f)) {
-				for (c=0; c<new->type; ++c)
+				for (c = 0; c < new->type; ++c)
 					IIR_gauss(new, sx, c, 3);
 			}
 			else {
 				if (sx > 0.f) {
-					for (c=0; c<new->type; ++c)
+					for (c = 0; c < new->type; ++c)
 						IIR_gauss(new, sx, c, 1);
 				}
 				if (sy > 0.f) {
-					for (c=0; c<new->type; ++c)
+					for (c = 0; c < new->type; ++c)
 						IIR_gauss(new, sy, c, 2);
 				}
 			}
@@ -641,8 +641,8 @@ static void node_composit_exec_blur(void *data, bNode *node, bNodeStack **in, bN
 	}
 	else {
 		/* All non fast gauss blur methods */
-		if (img->type==CB_VEC2 || img->type==CB_VEC3) {
-			img= typecheck_compbuf(in[0]->data, CB_RGBA);
+		if (img->type == CB_VEC2 || img->type == CB_VEC3) {
+			img = typecheck_compbuf(in[0]->data, CB_RGBA);
 		}
 		
 		/* if fac input, we do it different */
@@ -650,17 +650,17 @@ static void node_composit_exec_blur(void *data, bNode *node, bNodeStack **in, bN
 			CompBuf *gammabuf;
 			
 			/* make output size of input image */
-			new= alloc_compbuf(img->x, img->y, img->type, 1); /* allocs */
+			new = alloc_compbuf(img->x, img->y, img->type, 1); /* allocs */
 			
 			/* accept image offsets from other nodes */
 			new->xof = img->xof;
 			new->yof = img->yof;
 			
 			if (nbd->gamma) {
-				gammabuf= dupalloc_compbuf(img);
+				gammabuf = dupalloc_compbuf(img);
 				gamma_correct_compbuf(gammabuf, 0);
 			}
-			else gammabuf= img;
+			else gammabuf = img;
 			
 			blur_with_reference(node, new, gammabuf, in[1]->data);
 			
@@ -670,30 +670,30 @@ static void node_composit_exec_blur(void *data, bNode *node, bNodeStack **in, bN
 			}
 			if (node->exec & NODE_BREAK) {
 				free_compbuf(new);
-				new= NULL;
+				new = NULL;
 			}
-			out[0]->data= new;
+			out[0]->data = new;
 		}
 		else {
 			
-			if (in[1]->vec[0]<=0.001f) {	/* time node inputs can be a tiny value */
-				new= pass_on_compbuf(img);
+			if (in[1]->vec[0] <= 0.001f) {    /* time node inputs can be a tiny value */
+				new = pass_on_compbuf(img);
 			}
 			else {
 				CompBuf *gammabuf;
 				
 				/* make output size of input image */
-				new= alloc_compbuf(img->x, img->y, img->type, 1); /* allocs */
+				new = alloc_compbuf(img->x, img->y, img->type, 1); /* allocs */
 				
 				/* accept image offsets from other nodes */
 				new->xof = img->xof;
 				new->yof = img->yof;
 					
 				if (nbd->gamma) {
-					gammabuf= dupalloc_compbuf(img);
+					gammabuf = dupalloc_compbuf(img);
 					gamma_correct_compbuf(gammabuf, 0);
 				}
-				else gammabuf= img;
+				else gammabuf = img;
 				
 				if (nbd->bokeh)
 					bokeh_single_image(node, new, gammabuf, in[1]->vec[0]);
@@ -708,28 +708,28 @@ static void node_composit_exec_blur(void *data, bNode *node, bNodeStack **in, bN
 				}
 				if (node->exec & NODE_BREAK) {
 					free_compbuf(new);
-					new= NULL;
+					new = NULL;
 				}
 			}
-			out[0]->data= new;
+			out[0]->data = new;
 		}
-		if (img!=in[0]->data)
+		if (img != in[0]->data)
 			free_compbuf(img);
 	}
 
 	generate_preview(data, node, out[0]->data);
 }
 
-static void node_composit_init_blur(bNodeTree *UNUSED(ntree), bNode* node, bNodeTemplate *UNUSED(ntemp))
+static void node_composit_init_blur(bNodeTree *UNUSED(ntree), bNode *node, bNodeTemplate *UNUSED(ntemp))
 {
-	node->storage= MEM_callocN(sizeof(NodeBlurData), "node blur data");
+	node->storage = MEM_callocN(sizeof(NodeBlurData), "node blur data");
 }
 
 void register_node_type_cmp_blur(bNodeTreeType *ttype)
 {
 	static bNodeType ntype;
 
-	node_type_base(ttype, &ntype, CMP_NODE_BLUR, "Blur", NODE_CLASS_OP_FILTER, NODE_PREVIEW|NODE_OPTIONS);
+	node_type_base(ttype, &ntype, CMP_NODE_BLUR, "Blur", NODE_CLASS_OP_FILTER, NODE_PREVIEW | NODE_OPTIONS);
 	node_type_socket_templates(&ntype, cmp_node_blur_in, cmp_node_blur_out);
 	node_type_size(&ntype, 120, 80, 200);
 	node_type_init(&ntype, node_composit_init_blur);
diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehblur.c b/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
index f239267a128..222ac7a5cdf 100644
--- a/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
+++ b/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
@@ -28,7 +28,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/nodes/intern/CMP_nodes/CMP_blur.c
+/** \file blender/nodes/composite/nodes/node_composite_bokehblur.c
  *  \ingroup cmpnodes
  */
 
@@ -36,19 +36,25 @@
 #include "../node_composite_util.h"
 
 /* **************** BLUR ******************** */
-static bNodeSocketTemplate cmp_node_bokehblur_in[]= {
-	{	SOCK_RGBA, 1, "Image",			0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 1, "Bokeh",			1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Size",			0.01f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f},
-	{	SOCK_FLOAT, 1, "Bounding box",	1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f},
-	{	-1, 0, ""	}
+static bNodeSocketTemplate cmp_node_bokehblur_in[] = {
+	{   SOCK_RGBA, 1, N_("Image"),          0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{   SOCK_RGBA, 1, N_("Bokeh"),          1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f},
+	{   SOCK_FLOAT, 1, N_("Size"),          1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 10.0f},
+	{   SOCK_FLOAT, 1, N_("Bounding box"),  1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f},
+	{   -1, 0, ""   }
 };
 
-static bNodeSocketTemplate cmp_node_bokehblur_out[]= {
-	{	SOCK_RGBA, 0, "Image",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
-	{	-1, 0, ""	}
+static bNodeSocketTemplate cmp_node_bokehblur_out[] = {
+	{   SOCK_RGBA, 0, N_("Image"),          0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+	{   -1, 0, ""   }
 };
 
+static void node_composit_init_bokehblur(bNodeTree *UNUSED(ntree), bNode *node, bNodeTemplate *UNUSED(ntemp))
+{
+	node->custom3 = 4.0f;
+	node->custom4 = 16.0f;
+}
+
 void register_node_type_cmp_bokehblur(bNodeTreeType *ttype)
 {
 	static bNodeType ntype;
@@ -56,5 +62,7 @@ void register_node_type_cmp_bokehblur(bNodeTreeType *ttype)
 	node_type_base(ttype, &ntype, CMP_NODE_BOKEHBLUR, "Bokeh Blur", NODE_CLASS_OP_FILTER, NODE_OPTIONS);
 	node_type_socket_templates(&ntype, cmp_node_bokehblur_in, cmp_node_bokehblur_out);
 	node_type_size(&ntype, 120, 80, 200);
+	node_type_init(&ntype, node_composit_init_bokehblur);
+	
 	nodeRegisterType(ttype, &ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehimage.c b/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
index 15dba89d12b..24378c4d5b7 100644
--- a/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
+++ b/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
@@ -28,7 +28,7 @@
 
 */
 
-/** \file blender/nodes/intern/CMP_nodes/CMP_gamma.c
+/** \file blender/nodes/composite/nodes/node_composite_bokehimage.c
  *  \ingroup cmpnodes
  */
 
@@ -38,7 +38,7 @@
 /* **************** Bokeh image Tools  ******************** */
   
 static bNodeSocketTemplate cmp_node_bokehimage_out[]= {
-	{	SOCK_RGBA, 0, "Image",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Image"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 static void node_composit_init_bokehimage(bNodeTree *UNUSED(ntree), bNode* node, bNodeTemplate *UNUSED(ntemp))
diff --git a/source/blender/nodes/composite/nodes/node_composite_boxmask.c b/source/blender/nodes/composite/nodes/node_composite_boxmask.c
index 8c3744e2930..81c13980f22 100644
--- a/source/blender/nodes/composite/nodes/node_composite_boxmask.c
+++ b/source/blender/nodes/composite/nodes/node_composite_boxmask.c
@@ -27,7 +27,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/nodes/intern/CMP_nodes/CMP_math.c
+/** \file blender/nodes/composite/nodes/node_composite_boxmask.c
  *  \ingroup cmpnodes
  */
 
@@ -36,13 +36,13 @@
 
 /* **************** SCALAR MATH ******************** */ 
 static bNodeSocketTemplate cmp_node_boxmask_in[]= {
-	{	SOCK_FLOAT, 1, "Mask", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Value", 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Mask"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Value"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
 	{	-1, 0, "" } 
 };
 
 static bNodeSocketTemplate cmp_node_boxmask_out[]= {
-	{	SOCK_FLOAT, 0, "Mask", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Mask"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
 	{	-1, 0, "" } 
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_brightness.c b/source/blender/nodes/composite/nodes/node_composite_brightness.c
index 9168a982b5d..8761d35f18f 100644
--- a/source/blender/nodes/composite/nodes/node_composite_brightness.c
+++ b/source/blender/nodes/composite/nodes/node_composite_brightness.c
@@ -37,13 +37,13 @@
 /* **************** Brigh and contrsast  ******************** */
 
 static bNodeSocketTemplate cmp_node_brightcontrast_in[]= {
-	{	SOCK_RGBA, 1, "Image",			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Bright",		0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, "Contrast",		0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, PROP_NONE},
+	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Bright"),		0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, PROP_NONE},
+	{	SOCK_FLOAT, 1, N_("Contrast"),		0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, PROP_NONE},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_brightcontrast_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_channelMatte.c b/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
index 9e3aa9ee13f..6163d8f01b1 100644
--- a/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
@@ -35,13 +35,13 @@
 
 /* ******************* Channel Matte Node ********************************* */
 static bNodeSocketTemplate cmp_node_channel_matte_in[]={
-	{SOCK_RGBA, 1, "Image", 1.0f, 1.0f, 1.0f, 1.0f},
+	{SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
 	{-1, 0, ""}
 };
 
 static bNodeSocketTemplate cmp_node_channel_matte_out[]={
-	{SOCK_RGBA, 0, "Image"},
-	{SOCK_FLOAT, 0, "Matte"},
+	{SOCK_RGBA, 0, N_("Image")},
+	{SOCK_FLOAT, 0, N_("Matte")},
 	{-1, 0, ""}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c b/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
index a7c0ae68271..7c6b4ad1f95 100644
--- a/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
@@ -34,14 +34,14 @@
 
 /* ******************* Chroma Key ********************************************************** */
 static bNodeSocketTemplate cmp_node_chroma_in[]={
-	{SOCK_RGBA, 1, "Image", 1.0f, 1.0f, 1.0f, 1.0f},
-	{SOCK_RGBA, 1, "Key Color", 1.0f, 1.0f, 1.0f, 1.0f},
+	{SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+	{SOCK_RGBA, 1, N_("Key Color"), 1.0f, 1.0f, 1.0f, 1.0f},
 	{-1, 0, ""}
 };
 
 static bNodeSocketTemplate cmp_node_chroma_out[]={
-	{SOCK_RGBA, 0, "Image"},
-	{SOCK_FLOAT, 0, "Matte"},
+	{SOCK_RGBA, 0, N_("Image")},
+	{SOCK_FLOAT, 0, N_("Matte")},
 	{-1, 0, ""}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorMatte.c b/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
index d9f0c741738..8aad5bdf179 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
@@ -34,14 +34,14 @@
 
 /* ******************* Color Key ********************************************************** */
 static bNodeSocketTemplate cmp_node_color_in[]={
-	{SOCK_RGBA, 1, "Image", 1.0f, 1.0f, 1.0f, 1.0f},
-	{SOCK_RGBA, 1, "Key Color", 1.0f, 1.0f, 1.0f, 1.0f},
+	{SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+	{SOCK_RGBA, 1, N_("Key Color"), 1.0f, 1.0f, 1.0f, 1.0f},
 	{-1, 0, ""}
 };
 
 static bNodeSocketTemplate cmp_node_color_out[]={
-	{SOCK_RGBA, 0, "Image"},
-	{SOCK_FLOAT, 0, "Matte"},
+	{SOCK_RGBA, 0, N_("Image")},
+	{SOCK_FLOAT, 0, N_("Matte")},
 	{-1, 0, ""}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorSpill.c b/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
index 81693c31d87..678091790ea 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
+++ b/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
@@ -37,13 +37,13 @@
 
 /* ******************* Color Spill Supression ********************************* */
 static bNodeSocketTemplate cmp_node_color_spill_in[]={
-	{SOCK_RGBA, 1, "Image", 1.0f, 1.0f, 1.0f, 1.0f},
-	{SOCK_FLOAT, 1, "Fac",	1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+	{SOCK_FLOAT, 1, N_("Fac"),	1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
 	{-1, 0, ""}
 };
 
 static bNodeSocketTemplate cmp_node_color_spill_out[]={
-	{SOCK_RGBA, 0, "Image"},
+	{SOCK_RGBA, 0, N_("Image")},
 	{-1, 0, ""}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorbalance.c b/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
index 8dead1babdd..fa32db9b31d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
+++ b/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
@@ -36,13 +36,13 @@
 
 /* ******************* Color Balance ********************************* */
 static bNodeSocketTemplate cmp_node_colorbalance_in[]={
-	{SOCK_FLOAT, 1, "Fac",	1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{SOCK_RGBA, 1, "Image", 1.0f, 1.0f, 1.0f, 1.0f},
+	{SOCK_FLOAT, 1, N_("Fac"),	1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
 	{-1, 0, ""}
 };
 
 static bNodeSocketTemplate cmp_node_colorbalance_out[]={
-	{SOCK_RGBA, 0, "Image"},
+	{SOCK_RGBA, 0, N_("Image")},
 	{-1, 0, ""}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
index 929efaef2c8..6b02202151c 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
+++ b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
@@ -37,13 +37,13 @@
 
 /* ******************* Color Balance ********************************* */
 static bNodeSocketTemplate cmp_node_colorcorrection_in[]={
-	{	SOCK_RGBA,1,"Image", 1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Mask",	1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_RGBA,1,N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Mask"),	1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
 	{	-1,0,""}
 };
 
 static bNodeSocketTemplate cmp_node_colorcorrection_out[]={
-	{	SOCK_RGBA,0,"Image"},
+	{	SOCK_RGBA,0,N_("Image")},
 	{	-1,0,""}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_composite.c b/source/blender/nodes/composite/nodes/node_composite_composite.c
index 9b1e5e451c4..7b189ef40e5 100644
--- a/source/blender/nodes/composite/nodes/node_composite_composite.c
+++ b/source/blender/nodes/composite/nodes/node_composite_composite.c
@@ -36,9 +36,9 @@
 
 /* **************** COMPOSITE ******************** */
 static bNodeSocketTemplate cmp_node_composite_in[]= {
-	{	SOCK_RGBA, 1, "Image",		0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Alpha",		1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_FLOAT, 1, "Z",			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_RGBA, 1, N_("Image"),		0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Alpha"),		1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_FLOAT, 1, N_("Z"),			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_crop.c b/source/blender/nodes/composite/nodes/node_composite_crop.c
index 242bc8396d7..8d676fd6d9f 100644
--- a/source/blender/nodes/composite/nodes/node_composite_crop.c
+++ b/source/blender/nodes/composite/nodes/node_composite_crop.c
@@ -35,11 +35,11 @@
 /* **************** Crop  ******************** */
 
 static bNodeSocketTemplate cmp_node_crop_in[]= {
-	{	SOCK_RGBA, 1, "Image",			1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_crop_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_curves.c b/source/blender/nodes/composite/nodes/node_composite_curves.c
index d17a7bf5dc8..b5a78015d76 100644
--- a/source/blender/nodes/composite/nodes/node_composite_curves.c
+++ b/source/blender/nodes/composite/nodes/node_composite_curves.c
@@ -37,7 +37,7 @@
 
 /* custom1 = sfra, custom2 = efra */
 static bNodeSocketTemplate cmp_node_time_out[]= {
-	{	SOCK_FLOAT, 0, "Fac"},
+	{	SOCK_FLOAT, 0, N_("Fac")},
 	{	-1, 0, ""	}
 };
 
@@ -80,12 +80,12 @@ void register_node_type_cmp_curve_time(bNodeTreeType *ttype)
 
 /* **************** CURVE VEC  ******************** */
 static bNodeSocketTemplate cmp_node_curve_vec_in[]= {
-	{	SOCK_VECTOR, 1, "Vector",	0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_NONE},
+	{	SOCK_VECTOR, 1, N_("Vector"),	0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_NONE},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate cmp_node_curve_vec_out[]= {
-	{	SOCK_VECTOR, 0, "Vector"},
+	{	SOCK_VECTOR, 0, N_("Vector")},
 	{	-1, 0, ""	}
 };
 
@@ -119,15 +119,15 @@ void register_node_type_cmp_curve_vec(bNodeTreeType *ttype)
 
 /* **************** CURVE RGB  ******************** */
 static bNodeSocketTemplate cmp_node_curve_rgb_in[]= {
-	{	SOCK_FLOAT, 1, "Fac",	1.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_RGBA, 1, "Image",	1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_RGBA, 1, "Black Level",	0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 1, "White Level",	1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Fac"),	1.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_RGBA, 1, N_("Image"),	1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Black Level"),	0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("White Level"),	1.0f, 1.0f, 1.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate cmp_node_curve_rgb_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_defocus.c b/source/blender/nodes/composite/nodes/node_composite_defocus.c
index 1a6e3fb1675..2ae3cd6ba56 100644
--- a/source/blender/nodes/composite/nodes/node_composite_defocus.c
+++ b/source/blender/nodes/composite/nodes/node_composite_defocus.c
@@ -29,17 +29,18 @@
  *  \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
+#include <limits.h>
+
 /* ************ qdn: Defocus node ****************** */
 static bNodeSocketTemplate cmp_node_defocus_in[]= {
-	{	SOCK_RGBA, 1, "Image",			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Z",			1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Z"),			1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_defocus_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
@@ -148,11 +149,13 @@ static float RI_vdC(unsigned int bits, unsigned int r)
 // much faster than anything else, constant time independent of width
 // should extend to multichannel and make this a node, could be useful
 // note: this is an almost exact copy of 'IIR_gauss'
-static void IIR_gauss_single(CompBuf* buf, float sigma)
+static void IIR_gauss_single(CompBuf *buf, float sigma)
 {
 	double q, q2, sc, cf[4], tsM[9], tsu[3], tsv[3];
 	float *X, *Y, *W;
-	int i, x, y, sz;
+	const unsigned int src_width = buf->x;
+	const unsigned int src_height = buf->y;
+	unsigned int i, x, y, sz;
 
 	// single channel only for now
 	if (buf->type != CB_VAL) return;
@@ -180,58 +183,61 @@ static void IIR_gauss_single(CompBuf* buf, float sigma)
 	// it seems to work, not entirely sure if it is actually totally correct,
 	// Besides J.M.Geusebroek's anigauss.c (see http://www.science.uva.nl/~mark),
 	// found one other implementation by Cristoph Lampert,
-	// but neither seem to be quite the same, result seems to be ok sofar anyway.
+	// but neither seem to be quite the same, result seems to be ok so far anyway.
 	// Extra scale factor here to not have to do it in filter,
 	// though maybe this had something to with the precision errors
-	sc = cf[0]/((1.0 + cf[1] - cf[2] + cf[3])*(1.0 - cf[1] - cf[2] - cf[3])*(1.0 + cf[2] + (cf[1] - cf[3])*cf[3]));
-	tsM[0] = sc*(-cf[3]*cf[1] + 1.0 - cf[3]*cf[3] - cf[2]);
-	tsM[1] = sc*((cf[3] + cf[1])*(cf[2] + cf[3]*cf[1]));
-	tsM[2] = sc*(cf[3]*(cf[1] + cf[3]*cf[2]));
-	tsM[3] = sc*(cf[1] + cf[3]*cf[2]);
-	tsM[4] = sc*(-(cf[2] - 1.0)*(cf[2] + cf[3]*cf[1]));
-	tsM[5] = sc*(-(cf[3]*cf[1] + cf[3]*cf[3] + cf[2] - 1.0)*cf[3]);
-	tsM[6] = sc*(cf[3]*cf[1] + cf[2] + cf[1]*cf[1] - cf[2]*cf[2]);
-	tsM[7] = sc*(cf[1]*cf[2] + cf[3]*cf[2]*cf[2] - cf[1]*cf[3]*cf[3] - cf[3]*cf[3]*cf[3] - cf[3]*cf[2] + cf[3]);
-	tsM[8] = sc*(cf[3]*(cf[1] + cf[3]*cf[2]));
-
-#define YVV(L)\
-{\
-	W[0] = cf[0]*X[0] + cf[1]*X[0] + cf[2]*X[0] + cf[3]*X[0];\
-	W[1] = cf[0]*X[1] + cf[1]*W[0] + cf[2]*X[0] + cf[3]*X[0];\
-	W[2] = cf[0]*X[2] + cf[1]*W[1] + cf[2]*W[0] + cf[3]*X[0];\
-	for (i=3; i<L; i++)\
-		W[i] = cf[0]*X[i] + cf[1]*W[i-1] + cf[2]*W[i-2] + cf[3]*W[i-3];\
-	tsu[0] = W[L-1] - X[L-1];\
-	tsu[1] = W[L-2] - X[L-1];\
-	tsu[2] = W[L-3] - X[L-1];\
-	tsv[0] = tsM[0]*tsu[0] + tsM[1]*tsu[1] + tsM[2]*tsu[2] + X[L-1];\
-	tsv[1] = tsM[3]*tsu[0] + tsM[4]*tsu[1] + tsM[5]*tsu[2] + X[L-1];\
-	tsv[2] = tsM[6]*tsu[0] + tsM[7]*tsu[1] + tsM[8]*tsu[2] + X[L-1];\
-	Y[L-1] = cf[0]*W[L-1] + cf[1]*tsv[0] + cf[2]*tsv[1] + cf[3]*tsv[2];\
-	Y[L-2] = cf[0]*W[L-2] + cf[1]*Y[L-1] + cf[2]*tsv[0] + cf[3]*tsv[1];\
-	Y[L-3] = cf[0]*W[L-3] + cf[1]*Y[L-2] + cf[2]*Y[L-1] + cf[3]*tsv[0];\
-	for (i=L-4; i>=0; i--)\
-		Y[i] = cf[0]*W[i] + cf[1]*Y[i+1] + cf[2]*Y[i+2] + cf[3]*Y[i+3];\
-}
+	sc = cf[0] / ((1.0 + cf[1] - cf[2] + cf[3]) * (1.0 - cf[1] - cf[2] - cf[3]) * (1.0 + cf[2] + (cf[1] - cf[3]) * cf[3]));
+	tsM[0] = sc * (-cf[3] * cf[1] + 1.0 - cf[3] * cf[3] - cf[2]);
+	tsM[1] = sc * ((cf[3] + cf[1]) * (cf[2] + cf[3] * cf[1]));
+	tsM[2] = sc * (cf[3] * (cf[1] + cf[3] * cf[2]));
+	tsM[3] = sc * (cf[1] + cf[3] * cf[2]);
+	tsM[4] = sc * (-(cf[2] - 1.0) * (cf[2] + cf[3] * cf[1]));
+	tsM[5] = sc * (-(cf[3] * cf[1] + cf[3] * cf[3] + cf[2] - 1.0) * cf[3]);
+	tsM[6] = sc * (cf[3] * cf[1] + cf[2] + cf[1] * cf[1] - cf[2] * cf[2]);
+	tsM[7] = sc * (cf[1] * cf[2] + cf[3] * cf[2] * cf[2] - cf[1] * cf[3] * cf[3] - cf[3] * cf[3] * cf[3] - cf[3] * cf[2] + cf[3]);
+	tsM[8] = sc * (cf[3] * (cf[1] + cf[3] * cf[2]));
+
+#define YVV(L)                                                                          \
+{                                                                                       \
+	W[0] = cf[0] * X[0] + cf[1] * X[0] + cf[2] * X[0] + cf[3] * X[0];                   \
+	W[1] = cf[0] * X[1] + cf[1] * W[0] + cf[2] * X[0] + cf[3] * X[0];                   \
+	W[2] = cf[0] * X[2] + cf[1] * W[1] + cf[2] * W[0] + cf[3] * X[0];                   \
+	for (i = 3; i < L; i++) {                                                           \
+		W[i] = cf[0] * X[i] + cf[1] * W[i - 1] + cf[2] * W[i - 2] + cf[3] * W[i - 3];   \
+	}                                                                                   \
+	tsu[0] = W[L - 1] - X[L - 1];                                                       \
+	tsu[1] = W[L - 2] - X[L - 1];                                                       \
+	tsu[2] = W[L - 3] - X[L - 1];                                                       \
+	tsv[0] = tsM[0] * tsu[0] + tsM[1] * tsu[1] + tsM[2] * tsu[2] + X[L - 1];            \
+	tsv[1] = tsM[3] * tsu[0] + tsM[4] * tsu[1] + tsM[5] * tsu[2] + X[L - 1];            \
+	tsv[2] = tsM[6] * tsu[0] + tsM[7] * tsu[1] + tsM[8] * tsu[2] + X[L - 1];            \
+	Y[L - 1] = cf[0] * W[L - 1] + cf[1] * tsv[0] + cf[2] * tsv[1] + cf[3] * tsv[2];     \
+	Y[L - 2] = cf[0] * W[L - 2] + cf[1] * Y[L - 1] + cf[2] * tsv[0] + cf[3] * tsv[1];   \
+	Y[L - 3] = cf[0] * W[L - 3] + cf[1] * Y[L - 2] + cf[2] * Y[L - 1] + cf[3] * tsv[0]; \
+	/* 'i != UINT_MAX' is really 'i >= 0', but necessary for unsigned int wrapping */   \
+	for (i = L - 4; i != UINT_MAX; i--) {                                               \
+		Y[i] = cf[0] * W[i] + cf[1] * Y[i + 1] + cf[2] * Y[i + 2] + cf[3] * Y[i + 3];   \
+	}                                                                                   \
+} (void)0
 
 	// intermediate buffers
-	sz = MAX2(buf->x, buf->y);
-	Y = MEM_callocN(sz*sizeof(float), "IIR_gauss Y buf");
-	W = MEM_callocN(sz*sizeof(float), "IIR_gauss W buf");
+	sz = MAX2(src_width, src_height);
+	Y = MEM_callocN(sz * sizeof(float), "IIR_gauss Y buf");
+	W = MEM_callocN(sz * sizeof(float), "IIR_gauss W buf");
 	// H
-	for (y=0; y<buf->y; y++) {
-		X = &buf->rect[y*buf->x];
-		YVV(buf->x);
-		memcpy(X, Y, sizeof(float)*buf->x);
+	for (y = 0; y < src_height; y++) {
+		X = &buf->rect[y * src_width];
+		YVV(src_width);
+		memcpy(X, Y, sizeof(float) * src_width);
 	}
 	// V
-	X = MEM_callocN(buf->y*sizeof(float), "IIR_gauss X buf");
-	for (x=0; x<buf->x; x++) {
-		for (y=0; y<buf->y; y++)
-			X[y] = buf->rect[x + y*buf->x];
-		YVV(buf->y);
-		for (y=0; y<buf->y; y++)
-			buf->rect[x + y*buf->x] = Y[y];
+	X = MEM_callocN(src_height * sizeof(float), "IIR_gauss X buf");
+	for (x = 0; x < src_width; x++) {
+		for (y = 0; y < src_height; y++)
+			X[y] = buf->rect[x + y * src_width];
+		YVV(src_height);
+		for (y = 0; y < src_height; y++)
+			buf->rect[x + y * src_width] = Y[y];
 	}
 	MEM_freeN(X);
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_diffMatte.c b/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
index c7fbcb46c23..0569f5c68ef 100644
--- a/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
@@ -34,14 +34,14 @@
 
 /* ******************* channel Difference Matte ********************************* */
 static bNodeSocketTemplate cmp_node_diff_matte_in[]={
-	{SOCK_RGBA, 1, "Image 1", 1.0f, 1.0f, 1.0f, 1.0f},
-	{SOCK_RGBA, 1, "Image 2", 1.0f, 1.0f, 1.0f, 1.0f},
+	{SOCK_RGBA, 1, N_("Image 1"), 1.0f, 1.0f, 1.0f, 1.0f},
+	{SOCK_RGBA, 1, N_("Image 2"), 1.0f, 1.0f, 1.0f, 1.0f},
 	{-1, 0, ""}
 };
 
 static bNodeSocketTemplate cmp_node_diff_matte_out[]={
-	{SOCK_RGBA, 0, "Image"},
-	{SOCK_FLOAT, 0, "Matte"},
+	{SOCK_RGBA, 0, N_("Image")},
+	{SOCK_FLOAT, 0, N_("Matte")},
 	{-1, 0, ""}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_dilate.c b/source/blender/nodes/composite/nodes/node_composite_dilate.c
index ee857dd0007..2f139831cc9 100644
--- a/source/blender/nodes/composite/nodes/node_composite_dilate.c
+++ b/source/blender/nodes/composite/nodes/node_composite_dilate.c
@@ -35,13 +35,13 @@
 
 /* **************** Dilate/Erode ******************** */
 
-static bNodeSocketTemplate cmp_node_dilateerode_in[]= {
-	{	SOCK_FLOAT, 1, "Mask",		0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	-1, 0, ""	}
+static bNodeSocketTemplate cmp_node_dilateerode_in[] = {
+	{   SOCK_FLOAT, 1, N_("Mask"),      0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{   -1, 0, ""   }
 };
-static bNodeSocketTemplate cmp_node_dilateerode_out[]= {
-	{	SOCK_FLOAT, 0, "Mask"},
-	{	-1, 0, ""	}
+static bNodeSocketTemplate cmp_node_dilateerode_out[] = {
+	{   SOCK_FLOAT, 0, N_("Mask")},
+	{   -1, 0, ""   }
 };
 
 static void morpho_dilate(CompBuf *cbuf)
@@ -49,31 +49,31 @@ static void morpho_dilate(CompBuf *cbuf)
 	int x, y;
 	float *p, *rectf = cbuf->rect;
 	
-	for (y=0; y < cbuf->y; y++) {
-		for (x=0; x < cbuf->x-1; x++) {
-			p = rectf + cbuf->x*y + x;
-			*p = MAX2(*p, *(p + 1));
+	for (y = 0; y < cbuf->y; y++) {
+		for (x = 0; x < cbuf->x - 1; x++) {
+			p = rectf + cbuf->x * y + x;
+			*p = maxf(*p, *(p + 1));
 		}
 	}
 
-	for (y=0; y < cbuf->y; y++) {
-		for (x=cbuf->x-1; x >= 1; x--) {
-			p = rectf + cbuf->x*y + x;
-			*p = MAX2(*p, *(p - 1));
+	for (y = 0; y < cbuf->y; y++) {
+		for (x = cbuf->x - 1; x >= 1; x--) {
+			p = rectf + cbuf->x * y + x;
+			*p = maxf(*p, *(p - 1));
 		}
 	}
 
-	for (x=0; x < cbuf->x; x++) {
-		for (y=0; y < cbuf->y-1; y++) {
-			p = rectf + cbuf->x*y + x;
-			*p = MAX2(*p, *(p + cbuf->x));
+	for (x = 0; x < cbuf->x; x++) {
+		for (y = 0; y < cbuf->y - 1; y++) {
+			p = rectf + cbuf->x * y + x;
+			*p = maxf(*p, *(p + cbuf->x));
 		}
 	}
 
-	for (x=0; x < cbuf->x; x++) {
-		for (y=cbuf->y-1; y >= 1; y--) {
-			p = rectf + cbuf->x*y + x;
-			*p = MAX2(*p, *(p - cbuf->x));
+	for (x = 0; x < cbuf->x; x++) {
+		for (y = cbuf->y - 1; y >= 1; y--) {
+			p = rectf + cbuf->x * y + x;
+			*p = maxf(*p, *(p - cbuf->x));
 		}
 	}
 }
@@ -83,31 +83,31 @@ static void morpho_erode(CompBuf *cbuf)
 	int x, y;
 	float *p, *rectf = cbuf->rect;
 	
-	for (y=0; y < cbuf->y; y++) {
-		for (x=0; x < cbuf->x-1; x++) {
-			p = rectf + cbuf->x*y + x;
-			*p = MIN2(*p, *(p + 1));
+	for (y = 0; y < cbuf->y; y++) {
+		for (x = 0; x < cbuf->x - 1; x++) {
+			p = rectf + cbuf->x * y + x;
+			*p = minf(*p, *(p + 1));
 		}
 	}
 
-	for (y=0; y < cbuf->y; y++) {
-		for (x=cbuf->x-1; x >= 1; x--) {
-			p = rectf + cbuf->x*y + x;
-			*p = MIN2(*p, *(p - 1));
+	for (y = 0; y < cbuf->y; y++) {
+		for (x = cbuf->x - 1; x >= 1; x--) {
+			p = rectf + cbuf->x * y + x;
+			*p = minf(*p, *(p - 1));
 		}
 	}
 
-	for (x=0; x < cbuf->x; x++) {
-		for (y=0; y < cbuf->y-1; y++) {
-			p = rectf + cbuf->x*y + x;
-			*p = MIN2(*p, *(p + cbuf->x));
+	for (x = 0; x < cbuf->x; x++) {
+		for (y = 0; y < cbuf->y - 1; y++) {
+			p = rectf + cbuf->x * y + x;
+			*p = minf(*p, *(p + cbuf->x));
 		}
 	}
 
-	for (x=0; x < cbuf->x; x++) {
-		for (y=cbuf->y-1; y >= 1; y--) {
-			p = rectf + cbuf->x*y + x;
-			*p = MIN2(*p, *(p - cbuf->x));
+	for (x = 0; x < cbuf->x; x++) {
+		for (y = cbuf->y - 1; y >= 1; y--) {
+			p = rectf + cbuf->x * y + x;
+			*p = minf(*p, *(p - cbuf->x));
 		}
 	}
 	
@@ -117,18 +117,17 @@ static void node_composit_exec_dilateerode(void *UNUSED(data), bNode *node, bNod
 {
 	/* stack order in: mask */
 	/* stack order out: mask */
-	if (out[0]->hasoutput==0) 
+	if (out[0]->hasoutput == 0)
 		return;
 	
 	/* input no image? then only color operation */
-	if (in[0]->data==NULL) {
-		out[0]->vec[0] = out[0]->vec[1] = out[0]->vec[2] = 0.0f;
-		out[0]->vec[3] = 0.0f;
+	if (in[0]->data == NULL) {
+		zero_v4(out[0]->vec);
 	}
 	else {
 		/* make output size of input image */
-		CompBuf *cbuf= typecheck_compbuf(in[0]->data, CB_VAL);
-		CompBuf *stackbuf= dupalloc_compbuf(cbuf);
+		CompBuf *cbuf = typecheck_compbuf(in[0]->data, CB_VAL);
+		CompBuf *stackbuf = dupalloc_compbuf(cbuf);
 		short i;
 		
 		if (node->custom2 > 0) { // positive, dilate
@@ -140,10 +139,10 @@ static void node_composit_exec_dilateerode(void *UNUSED(data), bNode *node, bNod
 				morpho_erode(stackbuf);
 		}
 		
-		if (cbuf!=in[0]->data)
+		if (cbuf != in[0]->data)
 			free_compbuf(cbuf);
 		
-		out[0]->data= stackbuf;
+		out[0]->data = stackbuf;
 	}
 }
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_directionalblur.c b/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
index 49690499569..73e28658309 100644
--- a/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
+++ b/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
@@ -32,23 +32,23 @@
 
 #include "node_composite_util.h"
 
-static bNodeSocketTemplate cmp_node_dblur_in[]= {
-	{	SOCK_RGBA, 1, "Image", 1.0f, 1.0f, 1.0f, 1.f},
-	{	-1, 0, ""       }
+static bNodeSocketTemplate cmp_node_dblur_in[] = {
+	{   SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.f},
+	{   -1, 0, ""       }
 };
 
-static bNodeSocketTemplate cmp_node_dblur_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
-	{	-1, 0, ""       }
+static bNodeSocketTemplate cmp_node_dblur_out[] = {
+	{   SOCK_RGBA, 0, N_("Image")},
+	{   -1, 0, ""       }
 };
 
 static CompBuf *dblur(bNode *node, CompBuf *img, int iterations, int wrap,
-		  float center_x, float center_y, float dist, float angle, float spin, float zoom)
+                      float center_x, float center_y, float dist, float angle, float spin, float zoom)
 {
 	if ((dist != 0.f) || (spin != 0.f) || (zoom != 0.f)) {
-		void (*getpix)(CompBuf*, float, float, float*) = wrap ? qd_getPixelLerpWrap : qd_getPixelLerp;
-		const float a= angle;
-		const float itsc= 1.f / powf(2.f, (float)iterations);
+		void (*getpix)(CompBuf *, float, float, float *) = wrap ? qd_getPixelLerpWrap : qd_getPixelLerp;
+		const float a = angle;
+		const float itsc = 1.f / powf(2.f, (float)iterations);
 		float D;
 		float center_x_pix, center_y_pix;
 		float tx, ty;
@@ -56,36 +56,36 @@ static CompBuf *dblur(bNode *node, CompBuf *img, int iterations, int wrap,
 		CompBuf *tmp;
 		int i, j;
 		
-		tmp= dupalloc_compbuf(img);
+		tmp = dupalloc_compbuf(img);
 		
-		D= dist * sqrtf(img->x * img->x + img->y * img->y);
-		center_x_pix= center_x * img->x;
-		center_y_pix= center_y * img->y;
+		D = dist * sqrtf(img->x * img->x + img->y * img->y);
+		center_x_pix = center_x * img->x;
+		center_y_pix = center_y * img->y;
 
-		tx=  itsc * D * cosf(a);
-		ty= -itsc * D * sinf(a);
-		sc=  itsc * zoom;
-		rot= itsc * spin;
+		tx =  itsc * D * cosf(a);
+		ty = -itsc *D *sinf(a);
+		sc =  itsc * zoom;
+		rot = itsc * spin;
 
 		/* blur the image */
-		for (i= 0; i < iterations; ++i) {
-			const float cs= cosf(rot), ss= sinf(rot);
-			const float isc= 1.f / (1.f + sc);
+		for (i = 0; i < iterations; ++i) {
+			const float cs = cosf(rot), ss = sinf(rot);
+			const float isc = 1.f / (1.f + sc);
 			unsigned int x, y;
-			float col[4]= {0, 0, 0, 0};
+			float col[4] = {0, 0, 0, 0};
 
-			for (y= 0; y < img->y; ++y) {
-				const float v= isc * (y - center_y_pix) + ty;
+			for (y = 0; y < img->y; ++y) {
+				const float v = isc * (y - center_y_pix) + ty;
 
-				for (x= 0; x < img->x; ++x) {
-					const float  u= isc * (x - center_x_pix) + tx;
-					unsigned int p= (x + y * img->x) * img->type;
+				for (x = 0; x < img->x; ++x) {
+					const float u = isc * (x - center_x_pix) + tx;
+					unsigned int p = (x + y * img->x) * img->type;
 
 					getpix(tmp, cs * u + ss * v + center_x_pix, cs * v - ss * u + center_y_pix, col);
 
 					/* mix img and transformed tmp */
-					for (j= 0; j < 4; ++j) {
-						img->rect[p + j]= 0.5f * (img->rect[p + j] + col[j]);
+					for (j = 0; j < 4; ++j) {
+						img->rect[p + j] = 0.5f * (img->rect[p + j] + col[j]);
 					}
 				}
 			}
@@ -109,8 +109,8 @@ static CompBuf *dblur(bNode *node, CompBuf *img, int iterations, int wrap,
 
 static void node_composit_exec_dblur(void *UNUSED(data), bNode *node, bNodeStack **in, bNodeStack **out)
 {
-	NodeDBlurData *ndbd= node->storage;
-	CompBuf *new, *img= in[0]->data;
+	NodeDBlurData *ndbd = node->storage;
+	CompBuf *new, *img = in[0]->data;
 	
 	if ((img == NULL) || (out[0]->hasoutput == 0)) return;
 
@@ -119,15 +119,15 @@ static void node_composit_exec_dblur(void *UNUSED(data), bNode *node, bNodeStack
 	else
 		new = dupalloc_compbuf(img);
 	
-	out[0]->data= dblur(node, new, ndbd->iter, ndbd->wrap, ndbd->center_x, ndbd->center_y, ndbd->distance, ndbd->angle, ndbd->spin, ndbd->zoom);
+	out[0]->data = dblur(node, new, ndbd->iter, ndbd->wrap, ndbd->center_x, ndbd->center_y, ndbd->distance, ndbd->angle, ndbd->spin, ndbd->zoom);
 }
 
-static void node_composit_init_dblur(bNodeTree *UNUSED(ntree), bNode* node, bNodeTemplate *UNUSED(ntemp))
+static void node_composit_init_dblur(bNodeTree *UNUSED(ntree), bNode *node, bNodeTemplate *UNUSED(ntemp))
 {
-	NodeDBlurData *ndbd= MEM_callocN(sizeof(NodeDBlurData), "node dblur data");
-	node->storage= ndbd;
-	ndbd->center_x= 0.5;
-	ndbd->center_y= 0.5;
+	NodeDBlurData *ndbd = MEM_callocN(sizeof(NodeDBlurData), "node dblur data");
+	node->storage = ndbd;
+	ndbd->center_x = 0.5;
+	ndbd->center_y = 0.5;
 }
 
 void register_node_type_cmp_dblur(bNodeTreeType *ttype)
diff --git a/source/blender/nodes/composite/nodes/node_composite_displace.c b/source/blender/nodes/composite/nodes/node_composite_displace.c
index 3d6e61d1f04..c1a85a0071b 100644
--- a/source/blender/nodes/composite/nodes/node_composite_displace.c
+++ b/source/blender/nodes/composite/nodes/node_composite_displace.c
@@ -36,14 +36,14 @@
 /* **************** Displace  ******************** */
 
 static bNodeSocketTemplate cmp_node_displace_in[]= {
-	{	SOCK_RGBA, 1, "Image",			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_VECTOR, 1, "Vector",			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_TRANSLATION},
-	{	SOCK_FLOAT, 1, "X Scale",				0.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f, PROP_FACTOR},
-	{	SOCK_FLOAT, 1, "Y Scale",				0.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f, PROP_FACTOR},
+	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_VECTOR, 1, N_("Vector"),			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_TRANSLATION},
+	{	SOCK_FLOAT, 1, N_("X Scale"),				0.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f, PROP_FACTOR},
+	{	SOCK_FLOAT, 1, N_("Y Scale"),				0.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f, PROP_FACTOR},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_displace_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c b/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
index 1976aa45eed..a456f45c57e 100644
--- a/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
@@ -34,14 +34,14 @@
 
 /* ******************* channel Distance Matte ********************************* */
 static bNodeSocketTemplate cmp_node_distance_matte_in[]={
-	{SOCK_RGBA, 1, "Image", 1.0f, 1.0f, 1.0f, 1.0f},
-	{SOCK_RGBA, 1, "Key Color", 1.0f, 1.0f, 1.0f, 1.0f},
+	{SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+	{SOCK_RGBA, 1, N_("Key Color"), 1.0f, 1.0f, 1.0f, 1.0f},
 	{-1, 0, ""}
 };
 
 static bNodeSocketTemplate cmp_node_distance_matte_out[]={
-	{SOCK_RGBA, 0, "Image"},
-	{SOCK_FLOAT, 0, "Matte"},
+	{SOCK_RGBA, 0, N_("Image")},
+	{SOCK_FLOAT, 0, N_("Matte")},
 	{-1, 0, ""}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
index a6ba3034d87..18a86680245 100644
--- a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
+++ b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
@@ -27,7 +27,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/nodes/intern/CMP_nodes/CMP_math.c
+/** \file blender/nodes/composite/nodes/node_composite_ellipsemask.c
  *  \ingroup cmpnodes
  */
 
@@ -36,13 +36,13 @@
 
 /* **************** SCALAR MATH ******************** */ 
 static bNodeSocketTemplate cmp_node_ellipsemask_in[]= {
-	{	SOCK_FLOAT, 1, "Mask", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Value", 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Mask"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Value"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
 	{	-1, 0, "" } 
 };
 
 static bNodeSocketTemplate cmp_node_ellipsemask_out[]= {
-	{	SOCK_FLOAT, 0, "Mask", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Mask"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
 	{	-1, 0, "" } 
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_filter.c b/source/blender/nodes/composite/nodes/node_composite_filter.c
index 5adabecba08..be5aab74e02 100644
--- a/source/blender/nodes/composite/nodes/node_composite_filter.c
+++ b/source/blender/nodes/composite/nodes/node_composite_filter.c
@@ -34,12 +34,12 @@
 
 /* **************** FILTER  ******************** */
 static bNodeSocketTemplate cmp_node_filter_in[]= {
-	{	SOCK_FLOAT, 1, "Fac",			1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_RGBA, 1, "Image",			1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Fac"),			1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_filter_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_flip.c b/source/blender/nodes/composite/nodes/node_composite_flip.c
index 3c297299edc..44e93c08509 100644
--- a/source/blender/nodes/composite/nodes/node_composite_flip.c
+++ b/source/blender/nodes/composite/nodes/node_composite_flip.c
@@ -34,12 +34,12 @@
 
 /* **************** Flip  ******************** */
 static bNodeSocketTemplate cmp_node_flip_in[]= {
-	{	SOCK_RGBA, 1, "Image",		    1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Image"),		    1.0f, 1.0f, 1.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate cmp_node_flip_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_gamma.c b/source/blender/nodes/composite/nodes/node_composite_gamma.c
index 2ee94224e4b..f681eb4f630 100644
--- a/source/blender/nodes/composite/nodes/node_composite_gamma.c
+++ b/source/blender/nodes/composite/nodes/node_composite_gamma.c
@@ -36,12 +36,12 @@
 /* **************** Gamma Tools  ******************** */
   
 static bNodeSocketTemplate cmp_node_gamma_in[]= {
-	{	SOCK_RGBA, 1, "Image",			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Gamma",			1.0f, 0.0f, 0.0f, 0.0f, 0.001f, 10.0f, PROP_UNSIGNED},
+	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Gamma"),			1.0f, 0.0f, 0.0f, 0.0f, 0.001f, 10.0f, PROP_UNSIGNED},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_gamma_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_glare.c b/source/blender/nodes/composite/nodes/node_composite_glare.c
index 7484ae266fc..17a23d4295e 100644
--- a/source/blender/nodes/composite/nodes/node_composite_glare.c
+++ b/source/blender/nodes/composite/nodes/node_composite_glare.c
@@ -33,11 +33,11 @@
 #include "node_composite_util.h"
 
 static bNodeSocketTemplate cmp_node_glare_in[]= {
-	{	SOCK_RGBA, 1, "Image",			1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_glare_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
@@ -53,16 +53,16 @@ static void mixImages(CompBuf *dst, CompBuf *src, float mix)
 			dcolp = (fRGB*)&dst->rect[y*dst->x*dst->type];
 			scolp = (fRGB*)&src->rect[y*dst->x*dst->type];
 			for (x=0; x<dst->x; x++) {
-				fRGB_copy(c1, dcolp[x]);
-				fRGB_copy(c2, scolp[x]);
+				copy_v3_v3(c1, dcolp[x]);
+				copy_v3_v3(c2, scolp[x]);
 				c1[0] += mix*(c2[0] - c1[0]);
 				c1[1] += mix*(c2[1] - c1[1]);
 				c1[2] += mix*(c2[2] - c1[2]);
 				if (c1[0] < 0.f) c1[0] = 0.f;
 				if (c1[1] < 0.f) c1[1] = 0.f;
 				if (c1[2] < 0.f) c1[2] = 0.f;
-				fRGB_mult(c1, mf);
-				fRGB_copy(dcolp[x], c1);
+				mul_v3_fl(c1, mf);
+				copy_v3_v3(dcolp[x], c1);
 			}
 		}
 	}
@@ -72,7 +72,7 @@ static void mixImages(CompBuf *dst, CompBuf *src, float mix)
 		for (y=0; y<dst->y; y++) {
 			dcolp = (fRGB*)&dst->rect[y*dst->x*dst->type];
 			for (x=0; x<dst->x; x++) {
-				fRGB_copy(c1, dcolp[x]);
+				copy_v3_v3(c1, dcolp[x]);
 				qd_getPixelLerp(src, (x + 0.5f)*xr - 0.5f, (y + 0.5f)*yr - 0.5f, c2);
 				c1[0] += mix*(c2[0] - c1[0]);
 				c1[1] += mix*(c2[1] - c1[1]);
@@ -80,8 +80,8 @@ static void mixImages(CompBuf *dst, CompBuf *src, float mix)
 				if (c1[0] < 0.f) c1[0] = 0.f;
 				if (c1[1] < 0.f) c1[1] = 0.f;
 				if (c1[2] < 0.f) c1[2] = 0.f;
-				fRGB_mult(c1, mf);
-				fRGB_copy(dcolp[x], c1);
+				mul_v3_fl(c1, mf);
+				copy_v3_v3(dcolp[x], c1);
 			}
 		}
 	}
@@ -107,7 +107,7 @@ static CompBuf* BTP(CompBuf* src, float threshold, int scaledown)
 	float* cr = bsrc->rect;
 	for (y=0; y<bsrc->y; ++y)
 		for (x=0; x<bsrc->x; ++x, cr+=4) {
-			if ((0.212671f*cr[0] + 0.71516f*cr[1] + 0.072169f*cr[2]) >= threshold) {
+			if (rgb_to_luma_y(cr) >= threshold) {
 				cr[0] -= threshold, cr[1] -= threshold, cr[2] -= threshold;
 				cr[0] = MAX2(cr[0], 0.f);
 				cr[1] = MAX2(cr[1], 0.f);
@@ -146,11 +146,11 @@ static void star4(NodeGlare* ndg, CompBuf* dst, CompBuf* src)
 				xm = x - i;
 				xp = x + i;
 				qd_getPixel(tbuf1, x, y, c);
-				fRGB_mult(c, f1);
+				mul_v3_fl(c, f1);
 				qd_getPixel(tbuf1, (ndg->angle ? xm : x), ym, tc);
-				fRGB_madd(c, tc, f2);
+				madd_v3_v3fl(c, tc, f2);
 				qd_getPixel(tbuf1, (ndg->angle ? xp : x), yp, tc);
-				fRGB_madd(c, tc, f2);
+				madd_v3_v3fl(c, tc, f2);
 				qd_setPixel(tbuf1, x, y, c);
 			}
 		}
@@ -162,11 +162,11 @@ static void star4(NodeGlare* ndg, CompBuf* dst, CompBuf* src)
 				xm = x - i;
 				xp = x + i;
 				qd_getPixel(tbuf1, x, y, c);
-				fRGB_mult(c, f1);
+				mul_v3_fl(c, f1);
 				qd_getPixel(tbuf1, (ndg->angle ? xm : x), ym, tc);
-				fRGB_madd(c, tc, f2);
+				madd_v3_v3fl(c, tc, f2);
 				qd_getPixel(tbuf1, (ndg->angle ? xp : x), yp, tc);
-				fRGB_madd(c, tc, f2);
+				madd_v3_v3fl(c, tc, f2);
 				qd_setPixel(tbuf1, x, y, c);
 			}
 		}
@@ -179,11 +179,11 @@ static void star4(NodeGlare* ndg, CompBuf* dst, CompBuf* src)
 				xm = x - i;
 				xp = x + i;
 				qd_getPixel(tbuf2, x, y, c);
-				fRGB_mult(c, f1);
+				mul_v3_fl(c, f1);
 				qd_getPixel(tbuf2, xm, (ndg->angle ? yp : y), tc);
-				fRGB_madd(c, tc, f2);
+				madd_v3_v3fl(c, tc, f2);
 				qd_getPixel(tbuf2, xp, (ndg->angle ? ym : y), tc);
-				fRGB_madd(c, tc, f2);
+				madd_v3_v3fl(c, tc, f2);
 				qd_setPixel(tbuf2, x, y, c);
 			}
 		}
@@ -195,11 +195,11 @@ static void star4(NodeGlare* ndg, CompBuf* dst, CompBuf* src)
 				xm = x - i;
 				xp = x + i;
 				qd_getPixel(tbuf2, x, y, c);
-				fRGB_mult(c, f1);
+				mul_v3_fl(c, f1);
 				qd_getPixel(tbuf2, xm, (ndg->angle ? yp : y), tc);
-				fRGB_madd(c, tc, f2);
+				madd_v3_v3fl(c, tc, f2);
 				qd_getPixel(tbuf2, xp, (ndg->angle ? ym : y), tc);
-				fRGB_madd(c, tc, f2);
+				madd_v3_v3fl(c, tc, f2);
 				qd_setPixel(tbuf2, x, y, c);
 			}
 		}
@@ -342,11 +342,11 @@ static void ghosts(NodeGlare* ndg, CompBuf* dst, CompBuf* src)
 			s = (u-0.5f)*sc + 0.5f, t = (v-0.5f)*sc + 0.5f;
 			qd_getPixelLerp(tbuf1, s*gbuf->x, t*gbuf->y, c);
 			sm = smoothMask(s, t);
-			fRGB_mult(c, sm);
+			mul_v3_fl(c, sm);
 			s = (u-0.5f)*isc + 0.5f, t = (v-0.5f)*isc + 0.5f;
 			qd_getPixelLerp(tbuf2, s*gbuf->x - 0.5f, t*gbuf->y - 0.5f, tc);
 			sm = smoothMask(s, t);
-			fRGB_madd(c, tc, sm);
+			madd_v3_v3fl(c, tc, sm);
 			qd_setPixel(gbuf, x, y, c);
 		}
 	}
@@ -363,9 +363,9 @@ static void ghosts(NodeGlare* ndg, CompBuf* dst, CompBuf* src)
 					s = (u-0.5f)*scalef[np] + 0.5f;
 					t = (v-0.5f)*scalef[np] + 0.5f;
 					qd_getPixelLerp(gbuf, s*gbuf->x - 0.5f, t*gbuf->y - 0.5f, c);
-					fRGB_colormult(c, cm[np]);
+					mul_v3_v3(c, cm[np]);
 					sm = smoothMask(s, t)*0.25f;
-					fRGB_madd(tc, c, sm);
+					madd_v3_v3fl(tc, c, sm);
 				}
 				p = (x + y*tbuf1->x)*tbuf1->type;
 				tbuf1->rect[p] += tc[0];
@@ -413,7 +413,7 @@ static void fglow(NodeGlare* ndg, CompBuf* dst, CompBuf* src)
 			//w = (1.f-fabs(u))*(1.f-fabs(v));
 			// actually, Hanning window is ok, cos^2 for some reason is slower
 			w = (0.5f + 0.5f*cos((double)u*M_PI))*(0.5f + 0.5f*cos((double)v*M_PI));
-			fRGB_mult(fcol, w);
+			mul_v3_fl(fcol, w);
 			qd_setPixel(ckrn, x, y, fcol);
 		}
 	}
diff --git a/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c b/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
index 7089983fdbc..32bfc048cc7 100644
--- a/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
+++ b/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
@@ -35,12 +35,12 @@
 
 /* **************** Hue Saturation ******************** */
 static bNodeSocketTemplate cmp_node_hue_sat_in[]= {
-	{	SOCK_FLOAT, 1, "Fac",			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_RGBA, 1, "Image",			1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Fac"),			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_hue_sat_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_huecorrect.c b/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
index 23d04a28276..d40abbe5f4d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
+++ b/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
@@ -33,13 +33,13 @@
 #include "node_composite_util.h"
 
 static bNodeSocketTemplate cmp_node_huecorrect_in[]= {
-	{	SOCK_FLOAT, 1, "Fac",	1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_RGBA, 1, "Image",	1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Fac"),	1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_RGBA, 1, N_("Image"),	1.0f, 1.0f, 1.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate cmp_node_huecorrect_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_idMask.c b/source/blender/nodes/composite/nodes/node_composite_idMask.c
index c1dba471f20..09be1c54503 100644
--- a/source/blender/nodes/composite/nodes/node_composite_idMask.c
+++ b/source/blender/nodes/composite/nodes/node_composite_idMask.c
@@ -36,11 +36,11 @@
 /* **************** ID Mask  ******************** */
 
 static bNodeSocketTemplate cmp_node_idmask_in[]= {
-	{	SOCK_FLOAT, 1, "ID value",			1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+	{	SOCK_FLOAT, 1, N_("ID value"),			1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_idmask_out[]= {
-	{	SOCK_FLOAT, 0, "Alpha"},
+	{	SOCK_FLOAT, 0, N_("Alpha")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c
index 70d68737032..ba03a2697be 100644
--- a/source/blender/nodes/composite/nodes/node_composite_image.c
+++ b/source/blender/nodes/composite/nodes/node_composite_image.c
@@ -35,34 +35,34 @@
 /* **************** IMAGE (and RenderResult, multilayer image) ******************** */
 
 static bNodeSocketTemplate cmp_node_rlayers_out[]= {
-	{	SOCK_RGBA, 0, "Image",					0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Alpha",					1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Z",						1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_VECTOR, 0, "Normal",				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_VECTOR, 0, "UV",					1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_VECTOR, 0, "Speed",				1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Color",					0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Diffuse",				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Specular",				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Shadow",					0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "AO",						0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Reflect",				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Refract",				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Indirect",				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "IndexOB",				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "IndexMA",				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Mist",					0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Emit",					0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Environment",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Diffuse Direct",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Diffuse Indirect",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Diffuse Color",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Glossy Direct",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Glossy Indirect",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Glossy Color",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Transmission Direct",	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Transmission Indirect",	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Transmission Color",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Image"),					0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Alpha"),					1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Z"),						1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_VECTOR, 0, N_("Normal"),				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_VECTOR, 0, N_("UV"),					1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_VECTOR, 0, N_("Speed"),				1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Color"),					0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Diffuse"),				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Specular"),				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Shadow"),					0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("AO"),						0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Reflect"),				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Refract"),				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Indirect"),				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("IndexOB"),				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("IndexMA"),				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Mist"),					0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Emit"),					0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Environment"),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Diffuse Direct"),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Diffuse Indirect"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Diffuse Color"),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Glossy Direct"),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Glossy Indirect"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Glossy Color"),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Transmission Direct"),	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Transmission Indirect"),	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Transmission Color"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_invert.c b/source/blender/nodes/composite/nodes/node_composite_invert.c
index 8f3a6fc2e25..2a91647d6f5 100644
--- a/source/blender/nodes/composite/nodes/node_composite_invert.c
+++ b/source/blender/nodes/composite/nodes/node_composite_invert.c
@@ -33,13 +33,13 @@
 
 /* **************** INVERT ******************** */
 static bNodeSocketTemplate cmp_node_invert_in[]= { 
-	{ SOCK_FLOAT, 1, "Fac", 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR}, 
-	{ SOCK_RGBA, 1, "Color", 1.0f, 1.0f, 1.0f, 1.0f}, 
+	{ SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR}, 
+	{ SOCK_RGBA, 1, N_("Color"), 1.0f, 1.0f, 1.0f, 1.0f}, 
 	{ -1, 0, "" } 
 };
 
 static bNodeSocketTemplate cmp_node_invert_out[]= { 
-	{ SOCK_RGBA, 0, "Color"}, 
+	{ SOCK_RGBA, 0, N_("Color")}, 
 	{ -1, 0, "" } 
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_keying.c b/source/blender/nodes/composite/nodes/node_composite_keying.c
new file mode 100644
index 00000000000..f37c3686e2b
--- /dev/null
+++ b/source/blender/nodes/composite/nodes/node_composite_keying.c
@@ -0,0 +1,96 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2011 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Blender Foundation,
+ *                 Sergey Sharybin
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/nodes/composite/nodes/node_composite_keying.c
+ *  \ingroup cmpnodes
+ */
+
+#include "BLF_translation.h"
+
+#include "DNA_movieclip_types.h"
+
+#include "BKE_movieclip.h"
+
+#include "BLI_listbase.h"
+#include "BLI_math_base.h"
+#include "BLI_math_color.h"
+#include "BLI_voronoi.h"
+
+#include "node_composite_util.h"
+
+/* **************** Translate  ******************** */
+
+static bNodeSocketTemplate cmp_node_keying_in[] = {
+	{	SOCK_RGBA,  1, "Image",	        0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA,  1, "Key Color",     1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_FLOAT, 1, "Garbage Matte", 0.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_FLOAT, 1, "Core Matte",    0.0f, 1.0f, 1.0f, 1.0f},
+	{	-1, 0, ""	}
+};
+
+static bNodeSocketTemplate cmp_node_keying_out[] = {
+	{	SOCK_RGBA,  0, "Image"},
+	{	SOCK_FLOAT, 0, "Matte"},
+	{	SOCK_FLOAT, 0, "Edges"},
+	{	-1, 0, ""	}
+};
+
+static void exec(void *UNUSED(data), bNode *UNUSED(node), bNodeStack **UNUSED(in), bNodeStack **UNUSED(out))
+{
+}
+
+static void node_composit_init_keying(bNodeTree *UNUSED(ntree), bNode* node, bNodeTemplate *UNUSED(ntemp))
+{
+	NodeKeyingData *data;
+
+	data = MEM_callocN(sizeof(NodeKeyingData), "node keying data");
+
+	data->screen_balance = 0.5f;
+	data->despill_factor = 1.0f;
+	data->edge_kernel_radius = 3;
+	data->edge_kernel_tolerance = 0.1f;
+	data->clip_white = 1.0f;
+	data->clip_black = 0.0f;
+	data->clip_white = 1.0f;
+
+	node->storage = data;
+}
+
+void register_node_type_cmp_keying(bNodeTreeType *ttype)
+{
+	static bNodeType ntype;
+
+	node_type_base(ttype, &ntype, CMP_NODE_KEYING, "Keying", NODE_CLASS_MATTE, NODE_OPTIONS);
+	node_type_socket_templates(&ntype, cmp_node_keying_in, cmp_node_keying_out);
+	node_type_size(&ntype, 140, 100, 320);
+	node_type_init(&ntype, node_composit_init_keying);
+	node_type_storage(&ntype, "NodeKeyingData", node_free_standard_storage, node_copy_standard_storage);
+	node_type_exec(&ntype, exec);
+
+	nodeRegisterType(ttype, &ntype);
+}
diff --git a/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c b/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
new file mode 100644
index 00000000000..73423e2bdd3
--- /dev/null
+++ b/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
@@ -0,0 +1,202 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2011 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Blender Foundation,
+ *                 Sergey Sharybin
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/nodes/composite/nodes/node_composite_keyingscreen.c
+ *  \ingroup cmpnodes
+ */
+
+#include "BLF_translation.h"
+
+#include "DNA_movieclip_types.h"
+
+#include "BKE_movieclip.h"
+
+#include "BLI_listbase.h"
+#include "BLI_math_base.h"
+#include "BLI_math_color.h"
+#include "BLI_voronoi.h"
+
+#include "node_composite_util.h"
+
+/* **************** Translate  ******************** */
+
+static bNodeSocketTemplate cmp_node_keyingscreen_out[] = {
+	{	SOCK_RGBA,  0, "Screen"},
+	{	-1, 0, ""	}
+};
+
+
+static void compute_gradient_screen(RenderData *rd, NodeKeyingScreenData *keyingscreen_data, MovieClip *clip, CompBuf *screenbuf)
+{
+	MovieClipUser user = {0};
+	MovieTracking *tracking = &clip->tracking;
+	MovieTrackingTrack *track;
+	VoronoiTriangulationPoint *triangulated_points;
+	VoronoiSite *sites;
+	ImBuf *ibuf;
+	ListBase *tracksbase;
+	ListBase edges = {NULL, NULL};
+	int sites_total, triangulated_points_total, triangles_total;
+	int (*triangles)[3];
+	int i, x, y;
+	float *rect = screenbuf->rect;
+
+	if (keyingscreen_data->tracking_object[0]) {
+		MovieTrackingObject *object = BKE_tracking_object_get_named(tracking, keyingscreen_data->tracking_object);
+
+		if (!object)
+			return;
+
+		tracksbase = BKE_tracking_object_get_tracks(tracking, object);
+	}
+	else
+		tracksbase = BKE_tracking_get_active_tracks(tracking);
+
+	sites_total = BLI_countlist(tracksbase);
+
+	if (!sites_total)
+		return;
+
+	BKE_movieclip_user_set_frame(&user, rd->cfra);
+	ibuf = BKE_movieclip_get_ibuf(clip, &user);
+
+	sites = MEM_callocN(sizeof(VoronoiSite) * sites_total, "keyingscreen voronoi sites");
+	track = tracksbase->first;
+	i = 0;
+	while (track) {
+		VoronoiSite *site = &sites[i];
+		MovieTrackingMarker *marker = BKE_tracking_marker_get(track, rd->cfra);
+		ImBuf *pattern_ibuf = BKE_tracking_get_pattern_imbuf(ibuf, track, marker, TRUE, FALSE);
+		int j;
+
+		zero_v3(site->color);
+		for (j = 0; j < pattern_ibuf->x * pattern_ibuf->y; j++) {
+			if (pattern_ibuf->rect_float) {
+				add_v3_v3(site->color, &pattern_ibuf->rect_float[4 * j]);
+			}
+			else {
+				unsigned char *rrgb = (unsigned char *)pattern_ibuf->rect;
+
+				site->color[0] += srgb_to_linearrgb((float)rrgb[4 * j + 0] / 255.0f);
+				site->color[1] += srgb_to_linearrgb((float)rrgb[4 * j + 1] / 255.0f);
+				site->color[2] += srgb_to_linearrgb((float)rrgb[4 * j + 2] / 255.0f);
+			}
+		}
+
+		mul_v3_fl(site->color, 1.0f / (pattern_ibuf->x * pattern_ibuf->y));
+		IMB_freeImBuf(pattern_ibuf);
+
+		site->co[0] = marker->pos[0] * screenbuf->x;
+		site->co[1] = marker->pos[1] * screenbuf->y;
+
+		track = track->next;
+		i++;
+	}
+
+	IMB_freeImBuf(ibuf);
+
+	BLI_voronoi_compute(sites, sites_total, screenbuf->x, screenbuf->y, &edges);
+
+	BLI_voronoi_triangulate(sites, sites_total, &edges, screenbuf->x, screenbuf->y,
+	                        &triangulated_points, &triangulated_points_total,
+                            &triangles, &triangles_total);
+
+	for (y = 0; y < screenbuf->y; y++) {
+		for (x = 0; x < screenbuf->x; x++) {
+			int index = 4 * (y * screenbuf->x + x);
+
+			rect[index + 0] = rect[index + 1] = rect[index + 2] = 0.0f;
+			rect[index + 3] = 1.0f;
+
+			for (i = 0; i < triangles_total; i++) {
+				int *triangle = triangles[i];
+				VoronoiTriangulationPoint *a = &triangulated_points[triangle[0]],
+				                          *b = &triangulated_points[triangle[1]],
+				                          *c = &triangulated_points[triangle[2]];
+				float co[2] = {x, y}, w[3];
+
+				if (barycentric_coords_v2(a->co, b->co, c->co, co, w)) {
+					if (barycentric_inside_triangle_v2(w)) {
+						rect[index + 0] += a->color[0] * w[0] + b->color[0] * w[1] + c->color[0] * w[2];
+						rect[index + 1] += a->color[1] * w[0] + b->color[1] * w[1] + c->color[1] * w[2];
+						rect[index + 2] += a->color[2] * w[0] + b->color[2] * w[1] + c->color[2] * w[2];
+					}
+				}
+			}
+		}
+	}
+
+	MEM_freeN(triangulated_points);
+	MEM_freeN(triangles);
+	MEM_freeN(sites);
+	BLI_freelistN(&edges);
+}
+
+static void exec(void *data, bNode *node, bNodeStack **UNUSED(in), bNodeStack **out)
+{
+	NodeKeyingScreenData *keyingscreen_data = node->storage;
+	RenderData *rd = data;
+	CompBuf *screenbuf = NULL;
+
+	if (node->id) {
+		MovieClip *clip = (MovieClip *) node->id;
+		MovieClipUser user = {0};
+		int width, height;
+
+		BKE_movieclip_user_set_frame(&user, rd->cfra);
+		BKE_movieclip_get_size(clip, &user, &width, &height);
+
+		screenbuf = alloc_compbuf(width, height, CB_RGBA, TRUE);
+		compute_gradient_screen(rd, keyingscreen_data, clip, screenbuf);
+	}
+
+	out[0]->data = screenbuf;
+}
+
+static void node_composit_init_keyingscreen(bNodeTree *UNUSED(ntree), bNode* node, bNodeTemplate *UNUSED(ntemp))
+{
+	NodeKeyingScreenData *data;
+
+	data = MEM_callocN(sizeof(NodeKeyingScreenData), "node keyingscreen data");
+
+	node->storage = data;
+}
+
+void register_node_type_cmp_keyingscreen(bNodeTreeType *ttype)
+{
+	static bNodeType ntype;
+
+	node_type_base(ttype, &ntype, CMP_NODE_KEYINGSCREEN, "Keying Screen", NODE_CLASS_MATTE, NODE_OPTIONS);
+	node_type_socket_templates(&ntype, NULL, cmp_node_keyingscreen_out);
+	node_type_size(&ntype, 140, 100, 320);
+	node_type_init(&ntype, node_composit_init_keyingscreen);
+	node_type_storage(&ntype, "NodeKeyingScreenData", node_free_standard_storage, node_copy_standard_storage);
+	node_type_exec(&ntype, exec);
+
+	nodeRegisterType(ttype, &ntype);
+}
diff --git a/source/blender/nodes/composite/nodes/node_composite_lensdist.c b/source/blender/nodes/composite/nodes/node_composite_lensdist.c
index 5d3a9323f52..9b19ca6f5cf 100644
--- a/source/blender/nodes/composite/nodes/node_composite_lensdist.c
+++ b/source/blender/nodes/composite/nodes/node_composite_lensdist.c
@@ -33,13 +33,13 @@
 #include "node_composite_util.h"
 
 static bNodeSocketTemplate cmp_node_lensdist_in[]= {
-	{	SOCK_RGBA, 1, "Image",			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Distort", 	0.f, 0.f, 0.f, 0.f, -0.999f, 1.f, PROP_NONE},
-	{	SOCK_FLOAT, 1, "Dispersion", 0.f, 0.f, 0.f, 0.f, 0.f, 1.f, PROP_NONE},
+	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Distort"), 	0.f, 0.f, 0.f, 0.f, -0.999f, 1.f, PROP_NONE},
+	{	SOCK_FLOAT, 1, N_("Dispersion"), 0.f, 0.f, 0.f, 0.f, 0.f, 1.f, PROP_NONE},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_lensdist_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_levels.c b/source/blender/nodes/composite/nodes/node_composite_levels.c
index 9888966c46a..5594c20a9df 100644
--- a/source/blender/nodes/composite/nodes/node_composite_levels.c
+++ b/source/blender/nodes/composite/nodes/node_composite_levels.c
@@ -35,13 +35,13 @@
 
 /* **************** LEVELS ******************** */
 static bNodeSocketTemplate cmp_node_view_levels_in[]= {
-	{	SOCK_RGBA, 1, "Image", 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Image"), 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate cmp_node_view_levels_out[]={
-	{SOCK_FLOAT, 0, "Mean"},
-	{SOCK_FLOAT, 0, "Std Dev"},
+	{SOCK_FLOAT, 0, N_("Mean")},
+	{SOCK_FLOAT, 0, N_("Std Dev")},
 	{-1, 0, ""}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c b/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
index 1518284e015..955d94942a4 100644
--- a/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
@@ -35,13 +35,13 @@
 
 /* ******************* Luma Matte Node ********************************* */
 static bNodeSocketTemplate cmp_node_luma_matte_in[]={
-	{SOCK_RGBA, 1, "Image", 1.0f, 1.0f, 1.0f, 1.0f},
+	{SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
 	{-1, 0, ""}
 };
 
 static bNodeSocketTemplate cmp_node_luma_matte_out[]={
-	{SOCK_RGBA, 0, "Image"},
-	{SOCK_FLOAT, 0, "Matte"},
+	{SOCK_RGBA, 0, N_("Image")},
+	{SOCK_FLOAT, 0, N_("Matte")},
 	{-1, 0, ""}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_mapUV.c b/source/blender/nodes/composite/nodes/node_composite_mapUV.c
index 7d62e6b8030..a41d010ee95 100644
--- a/source/blender/nodes/composite/nodes/node_composite_mapUV.c
+++ b/source/blender/nodes/composite/nodes/node_composite_mapUV.c
@@ -35,12 +35,12 @@
 /* **************** Map UV  ******************** */
 
 static bNodeSocketTemplate cmp_node_mapuv_in[]= {
-	{	SOCK_RGBA, 1, "Image",			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_VECTOR, 1, "UV",			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
+	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_VECTOR, 1, N_("UV"),			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_mapuv_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_mapValue.c b/source/blender/nodes/composite/nodes/node_composite_mapValue.c
index 2fd115261f8..1d296d540f9 100644
--- a/source/blender/nodes/composite/nodes/node_composite_mapValue.c
+++ b/source/blender/nodes/composite/nodes/node_composite_mapValue.c
@@ -34,11 +34,11 @@
 
 /* **************** MAP VALUE ******************** */
 static bNodeSocketTemplate cmp_node_map_value_in[]= {
-	{	SOCK_FLOAT, 1, "Value",			1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+	{	SOCK_FLOAT, 1, N_("Value"),			1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_map_value_out[]= {
-	{	SOCK_FLOAT, 0, "Value"},
+	{	SOCK_FLOAT, 0, N_("Value")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_mask.c b/source/blender/nodes/composite/nodes/node_composite_mask.c
new file mode 100644
index 00000000000..d323839e690
--- /dev/null
+++ b/source/blender/nodes/composite/nodes/node_composite_mask.c
@@ -0,0 +1,93 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. 
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2012 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Blender Foundation,
+ *                 Sergey Sharybin
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/nodes/composite/nodes/node_composite_mask.c
+ *  \ingroup cmpnodes
+ */
+
+#include "BLF_translation.h"
+
+#include "DNA_mask_types.h"
+
+#include "BKE_mask.h"
+
+#include "node_composite_util.h"
+
+#include "../../../../intern/raskter/raskter.h"
+
+/* **************** Translate  ******************** */
+
+static bNodeSocketTemplate cmp_node_mask_out[] = {
+	{   SOCK_FLOAT, 0, "Mask"},
+	{   -1, 0, ""   }
+};
+
+static void exec(void *data, bNode *node, bNodeStack **UNUSED(in), bNodeStack **out)
+{
+	if (node->id) {
+		Mask *mask = (Mask *)node->id;
+		CompBuf *stackbuf;
+		RenderData *rd = data;
+		float *res;
+		int sx, sy;
+
+		if (!out[0]->hasoutput) {
+			/* the node's output socket is not connected to anything...
+			 * do not execute any further, just exit the node immediately
+			 */
+			return;
+		}
+
+		sx = (rd->size * rd->xsch) / 100;
+		sy = (rd->size * rd->ysch) / 100;
+
+		/* allocate the output buffer */
+		stackbuf = alloc_compbuf(sx, sy, CB_VAL, TRUE);
+		res = stackbuf->rect;
+
+		BKE_mask_rasterize(mask, sx, sy, res, TRUE, node->custom1);
+
+		if(node->custom1){
+			PLX_antialias_buffer(res,sx,sy);
+		}
+		/* pass on output and free */
+		out[0]->data = stackbuf;
+	}
+}
+
+void register_node_type_cmp_mask(bNodeTreeType *ttype)
+{
+	static bNodeType ntype;
+
+	node_type_base(ttype, &ntype, CMP_NODE_MASK, "Mask", NODE_CLASS_INPUT, NODE_OPTIONS);
+	node_type_socket_templates(&ntype, NULL, cmp_node_mask_out);
+	node_type_size(&ntype, 140, 100, 320);
+	node_type_exec(&ntype, exec);
+
+	nodeRegisterType(ttype, &ntype);
+}
diff --git a/source/blender/nodes/composite/nodes/node_composite_math.c b/source/blender/nodes/composite/nodes/node_composite_math.c
index 4c9d1a66fb0..7cf337f2f88 100644
--- a/source/blender/nodes/composite/nodes/node_composite_math.c
+++ b/source/blender/nodes/composite/nodes/node_composite_math.c
@@ -34,13 +34,13 @@
 
 /* **************** SCALAR MATH ******************** */ 
 static bNodeSocketTemplate cmp_node_math_in[]= { 
-	{ SOCK_FLOAT, 1, "Value", 0.5f, 0.5f, 0.5f, 1.0f, -10000.0f, 10000.0f, PROP_NONE}, 
-	{ SOCK_FLOAT, 1, "Value", 0.5f, 0.5f, 0.5f, 1.0f, -10000.0f, 10000.0f, PROP_NONE}, 
+	{ SOCK_FLOAT, 1, N_("Value"), 0.5f, 0.5f, 0.5f, 1.0f, -10000.0f, 10000.0f, PROP_NONE}, 
+	{ SOCK_FLOAT, 1, N_("Value"), 0.5f, 0.5f, 0.5f, 1.0f, -10000.0f, 10000.0f, PROP_NONE}, 
 	{ -1, 0, "" } 
 };
 
 static bNodeSocketTemplate cmp_node_math_out[]= { 
-	{ SOCK_FLOAT, 0, "Value"}, 
+	{ SOCK_FLOAT, 0, N_("Value")}, 
 	{ -1, 0, "" } 
 };
 
@@ -180,12 +180,12 @@ static void node_composit_exec_math(void *UNUSED(data), bNode *node, bNodeStack
 		return;
 	}
 
-	/*create output based on first input */
+	/* create output based on first input */
 	if (cbuf) {
 		stackbuf=alloc_compbuf(cbuf->x, cbuf->y, CB_VAL, 1);
 	}
 	/* and if it doesn't exist use the second input since we 
-	 know that one of them must exist at this point*/
+	 * know that one of them must exist at this point*/
 	else {
 		stackbuf=alloc_compbuf(cbuf2->x, cbuf2->y, CB_VAL, 1);
 	}
diff --git a/source/blender/nodes/composite/nodes/node_composite_mixrgb.c b/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
index 6539e81beec..6f8891f2b81 100644
--- a/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
+++ b/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
@@ -33,13 +33,13 @@
 
 /* **************** MIX RGB ******************** */
 static bNodeSocketTemplate cmp_node_mix_rgb_in[]= {
-	{	SOCK_FLOAT, 1, "Fac",			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 5.0f, PROP_FACTOR},
-	{	SOCK_RGBA, 1, "Image",			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_RGBA, 1, "Image",			1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Fac"),			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 5.0f, PROP_FACTOR},
+	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_mix_rgb_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_movieclip.c b/source/blender/nodes/composite/nodes/node_composite_movieclip.c
index 2f017b52676..e8f09ae08d7 100644
--- a/source/blender/nodes/composite/nodes/node_composite_movieclip.c
+++ b/source/blender/nodes/composite/nodes/node_composite_movieclip.c
@@ -34,11 +34,11 @@
 #include "node_composite_util.h"
 
 static bNodeSocketTemplate cmp_node_movieclip_out[] = {
-	{	SOCK_RGBA,		0,	"Image"},
-	{	SOCK_FLOAT,		1,	"Offset X"},
-	{	SOCK_FLOAT,		1,	"Offset Y"},
-	{	SOCK_FLOAT,		1,	"Scale"},
-	{	SOCK_FLOAT,		1,	"Angle"},
+	{	SOCK_RGBA,		0,	N_("Image")},
+	{	SOCK_FLOAT,		1,	N_("Offset X")},
+	{	SOCK_FLOAT,		1,	N_("Offset Y")},
+	{	SOCK_FLOAT,		1,	N_("Scale")},
+	{	SOCK_FLOAT,		1,	N_("Angle")},
 	{	-1, 0, ""	}
 };
 
@@ -120,8 +120,9 @@ static void node_composit_exec_movieclip(void *data, bNode *node, bNodeStack **U
 
 			if (stab->flag & TRACKING_2D_STABILIZATION) {
 				float loc[2], scale, angle;
+				int clip_framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, rd->cfra);
 
-				BKE_tracking_stabilization_data(&clip->tracking, rd->cfra, stackbuf->x, stackbuf->y,
+				BKE_tracking_stabilization_data_get(&clip->tracking, clip_framenr, stackbuf->x, stackbuf->y,
 							loc, &scale, &angle);
 
 				out[1]->vec[0] = loc[0];
diff --git a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
index 7a28eabec34..65fe3b251d0 100644
--- a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
+++ b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
@@ -38,12 +38,12 @@
 /* **************** Translate  ******************** */
 
 static bNodeSocketTemplate cmp_node_moviedistortion_in[] = {
-	{	SOCK_RGBA, 1, "Image",			0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Image"),			0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate cmp_node_moviedistortion_out[] = {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
@@ -73,7 +73,7 @@ static void exec(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
 				BKE_movieclip_get_size(clip, &user, &width, &height);
 
 				if (!node->storage)
-					node->storage = BKE_tracking_distortion_create();
+					node->storage = BKE_tracking_distortion_new();
 
 				if (node->custom1 == 0)
 					obuf = BKE_tracking_distortion_exec(node->storage, tracking, ibuf, width, height, overscan, 1);
@@ -116,7 +116,7 @@ static const char *label(bNode *node)
 static void storage_free(bNode *node)
 {
 	if (node->storage)
-		BKE_tracking_distortion_destroy(node->storage);
+		BKE_tracking_distortion_free(node->storage);
 
 	node->storage = NULL;
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_normal.c b/source/blender/nodes/composite/nodes/node_composite_normal.c
index e9b5f10172c..99a1f9ea520 100644
--- a/source/blender/nodes/composite/nodes/node_composite_normal.c
+++ b/source/blender/nodes/composite/nodes/node_composite_normal.c
@@ -35,13 +35,13 @@
 
 /* **************** NORMAL  ******************** */
 static bNodeSocketTemplate cmp_node_normal_in[]= {
-	{	SOCK_VECTOR, 1, "Normal",	0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_DIRECTION},
+	{	SOCK_VECTOR, 1, N_("Normal"),	0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_DIRECTION},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate cmp_node_normal_out[]= {
-	{	SOCK_VECTOR, 0, "Normal"},
-	{	SOCK_FLOAT, 0, "Dot"},
+	{	SOCK_VECTOR, 0, N_("Normal")},
+	{	SOCK_FLOAT, 0, N_("Dot")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_normalize.c b/source/blender/nodes/composite/nodes/node_composite_normalize.c
index 69386c3b816..4697ab74a95 100644
--- a/source/blender/nodes/composite/nodes/node_composite_normalize.c
+++ b/source/blender/nodes/composite/nodes/node_composite_normalize.c
@@ -35,11 +35,11 @@
 
 /* **************** NORMALIZE single channel, useful for Z buffer ******************** */
 static bNodeSocketTemplate cmp_node_normalize_in[]= {
-	{   SOCK_FLOAT, 1, "Value",         1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+	{   SOCK_FLOAT, 1, N_("Value"),         1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
 	{   -1, 0, ""   }
 };
 static bNodeSocketTemplate cmp_node_normalize_out[]= {
-	{   SOCK_FLOAT, 0, "Value"},
+	{   SOCK_FLOAT, 0, N_("Value")},
 	{   -1, 0, ""   }
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_premulkey.c b/source/blender/nodes/composite/nodes/node_composite_premulkey.c
index 3d8b0108bbb..63b10b80462 100644
--- a/source/blender/nodes/composite/nodes/node_composite_premulkey.c
+++ b/source/blender/nodes/composite/nodes/node_composite_premulkey.c
@@ -36,11 +36,11 @@
 /* **************** Premul and Key Alpha Convert ******************** */
 
 static bNodeSocketTemplate cmp_node_premulkey_in[]= {
-	{	SOCK_RGBA, 1, "Image",			1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_premulkey_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_rgb.c b/source/blender/nodes/composite/nodes/node_composite_rgb.c
index ca9db716b66..beab47442d5 100644
--- a/source/blender/nodes/composite/nodes/node_composite_rgb.c
+++ b/source/blender/nodes/composite/nodes/node_composite_rgb.c
@@ -35,7 +35,7 @@
 
 /* **************** RGB ******************** */
 static bNodeSocketTemplate cmp_node_rgb_out[]= {
-	{	SOCK_RGBA, 0, "RGBA",			0.5f, 0.5f, 0.5f, 1.0f},
+	{	SOCK_RGBA, 0, N_("RGBA"),			0.5f, 0.5f, 0.5f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_rotate.c b/source/blender/nodes/composite/nodes/node_composite_rotate.c
index 8268977658d..773be2fb41e 100644
--- a/source/blender/nodes/composite/nodes/node_composite_rotate.c
+++ b/source/blender/nodes/composite/nodes/node_composite_rotate.c
@@ -35,12 +35,12 @@
 /* **************** Rotate  ******************** */
 
 static bNodeSocketTemplate cmp_node_rotate_in[]= {
-	{	SOCK_RGBA, 1, "Image",			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Degr",			0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f, PROP_ANGLE},
+	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Degr"),			0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f, PROP_ANGLE},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_rotate_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_scale.c b/source/blender/nodes/composite/nodes/node_composite_scale.c
index 38cce50904b..1df67724762 100644
--- a/source/blender/nodes/composite/nodes/node_composite_scale.c
+++ b/source/blender/nodes/composite/nodes/node_composite_scale.c
@@ -4,7 +4,7 @@
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. 
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -34,82 +34,134 @@
 
 /* **************** Scale  ******************** */
 
-static bNodeSocketTemplate cmp_node_scale_in[]= {
-	{	SOCK_RGBA, 1, "Image",			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "X",				1.0f, 0.0f, 0.0f, 0.0f, 0.0001f, CMP_SCALE_MAX, PROP_FACTOR},
-	{	SOCK_FLOAT, 1, "Y",				1.0f, 0.0f, 0.0f, 0.0f, 0.0001f, CMP_SCALE_MAX, PROP_FACTOR},
-	{	-1, 0, ""	}
+static bNodeSocketTemplate cmp_node_scale_in[] = {
+	{   SOCK_RGBA, 1, N_("Image"),          1.0f, 1.0f, 1.0f, 1.0f},
+	{   SOCK_FLOAT, 1, N_("X"),             1.0f, 0.0f, 0.0f, 0.0f, 0.0001f, CMP_SCALE_MAX, PROP_FACTOR},
+	{   SOCK_FLOAT, 1, N_("Y"),             1.0f, 0.0f, 0.0f, 0.0f, 0.0001f, CMP_SCALE_MAX, PROP_FACTOR},
+	{   -1, 0, ""   }
 };
-static bNodeSocketTemplate cmp_node_scale_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
-	{	-1, 0, ""	}
+static bNodeSocketTemplate cmp_node_scale_out[] = {
+	{   SOCK_RGBA, 0, N_("Image")},
+	{   -1, 0, ""   }
 };
 
 /* only supports RGBA nodes now */
 /* node->custom1 stores if input values are absolute or relative scale */
 static void node_composit_exec_scale(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
 {
-	if (out[0]->hasoutput==0)
+	if (out[0]->hasoutput == 0)
 		return;
-	
+
 	if (in[0]->data) {
-		RenderData *rd= data;
-		CompBuf *stackbuf, *cbuf= typecheck_compbuf(in[0]->data, CB_RGBA);
+		RenderData *rd = data;
+		CompBuf *stackbuf, *cbuf = typecheck_compbuf(in[0]->data, CB_RGBA);
 		ImBuf *ibuf;
 		int newx, newy;
-		
-		if (node->custom1==CMP_SCALE_RELATIVE) {
-			newx= MAX2((int)(in[1]->vec[0]*cbuf->x), 1);
-			newy= MAX2((int)(in[2]->vec[0]*cbuf->y), 1);
+		float ofsx = 0.0f, ofsy = 0.0f;
+
+		if (node->custom1 == CMP_SCALE_RELATIVE) {
+			newx = MAX2((int)(in[1]->vec[0] * cbuf->x), 1);
+			newy = MAX2((int)(in[2]->vec[0] * cbuf->y), 1);
 		}
-		else if (node->custom1==CMP_SCALE_SCENEPERCENT) {
+		else if (node->custom1 == CMP_SCALE_SCENEPERCENT) {
 			newx = cbuf->x * (rd->size / 100.0f);
 			newy = cbuf->y * (rd->size / 100.0f);
 		}
-		else if (node->custom1==CMP_SCALE_RENDERPERCENT) {
-			newx= (rd->xsch * rd->size)/100;
-			newy= (rd->ysch * rd->size)/100;
+		else if (node->custom1 == CMP_SCALE_RENDERPERCENT) {
+
+			if (node->custom3 != 0.0f || node->custom4 != 0.0f) {
+				const float w_dst = (rd->xsch * rd->size) / 100;
+				const float h_dst = (rd->ysch * rd->size) / 100;
+
+				if (w_dst > h_dst) {
+					ofsx = node->custom3 * w_dst;
+					ofsy = node->custom4 * w_dst;
+				}
+				else {
+					ofsx = node->custom3 * h_dst;
+					ofsy = node->custom4 * h_dst;
+				}
+			}
+
+			/* supports framing options */
+			if (node->custom2 & CMP_SCALE_RENDERSIZE_FRAME_ASPECT) {
+				/* apply aspect from clip */
+				const float w_src = cbuf->x;
+				const float h_src = cbuf->y;
+
+				/* destination aspect is already applied from the camera frame */
+				const float w_dst = (rd->xsch * rd->size) / 100;
+				const float h_dst = (rd->ysch * rd->size) / 100;
+
+				const float asp_src = w_src / h_src;
+				const float asp_dst = w_dst / h_dst;
+
+				if (fabsf(asp_src - asp_dst) >= FLT_EPSILON) {
+					if ((asp_src > asp_dst) == ((node->custom2 & CMP_SCALE_RENDERSIZE_FRAME_CROP) != 0)) {
+						/* fit X */
+						const float div = asp_src / asp_dst;
+						newx = w_dst * div;
+						newy = h_dst;
+					}
+					else {
+						/* fit Y */
+						const float div = asp_dst / asp_src;
+						newx = w_dst;
+						newy = h_dst * div;
+					}
+				}
+				else {
+					/* same as below - no aspect correction needed  */
+					newx = w_dst;
+					newy = h_dst;
+				}
+			}
+			else {
+				/* stretch */
+				newx = (rd->xsch * rd->size) / 100;
+				newy = (rd->ysch * rd->size) / 100;
+			}
 		}
-		else {	/* CMP_SCALE_ABSOLUTE */
-			newx= MAX2((int)in[1]->vec[0], 1);
-			newy= MAX2((int)in[2]->vec[0], 1);
+		else {  /* CMP_SCALE_ABSOLUTE */
+			newx = MAX2((int)in[1]->vec[0], 1);
+			newy = MAX2((int)in[2]->vec[0], 1);
 		}
-		newx= MIN2(newx, CMP_SCALE_MAX);
-		newy= MIN2(newy, CMP_SCALE_MAX);
+		newx = MIN2(newx, CMP_SCALE_MAX);
+		newy = MIN2(newy, CMP_SCALE_MAX);
 
-		ibuf= IMB_allocImBuf(cbuf->x, cbuf->y, 32, 0);
+		ibuf = IMB_allocImBuf(cbuf->x, cbuf->y, 32, 0);
 		if (ibuf) {
-			ibuf->rect_float= cbuf->rect;
+			ibuf->rect_float = cbuf->rect;
 			IMB_scaleImBuf(ibuf, newx, newy);
-			
+
 			if (ibuf->rect_float == cbuf->rect) {
 				/* no scaling happened. */
-				stackbuf= pass_on_compbuf(in[0]->data);
+				stackbuf = pass_on_compbuf(in[0]->data);
 			}
 			else {
-				stackbuf= alloc_compbuf(newx, newy, CB_RGBA, 0);
-				stackbuf->rect= ibuf->rect_float;
-				stackbuf->malloc= 1;
+				stackbuf = alloc_compbuf(newx, newy, CB_RGBA, 0);
+				stackbuf->rect = ibuf->rect_float;
+				stackbuf->malloc = 1;
 			}
 
-			ibuf->rect_float= NULL;
+			ibuf->rect_float = NULL;
 			ibuf->mall &= ~IB_rectfloat;
 			IMB_freeImBuf(ibuf);
-			
+
 			/* also do the translation vector */
-			stackbuf->xof = (int)(((float)newx/(float)cbuf->x) * (float)cbuf->xof);
-			stackbuf->yof = (int)(((float)newy/(float)cbuf->y) * (float)cbuf->yof);
+			stackbuf->xof = (int)(ofsx + (((float)newx / (float)cbuf->x) * (float)cbuf->xof));
+			stackbuf->yof = (int)(ofsy + (((float)newy / (float)cbuf->y) * (float)cbuf->yof));
 		}
 		else {
-			stackbuf= dupalloc_compbuf(cbuf);
+			stackbuf = dupalloc_compbuf(cbuf);
 			printf("Scaling to %dx%d failed\n", newx, newy);
 		}
-		
-		out[0]->data= stackbuf;
-		if (cbuf!=in[0]->data)
+
+		out[0]->data = stackbuf;
+		if (cbuf != in[0]->data)
 			free_compbuf(cbuf);
 	}
-	else if (node->custom1==CMP_SCALE_ABSOLUTE) {
+	else if (node->custom1 == CMP_SCALE_ABSOLUTE) {
 		CompBuf *stackbuf;
 		int a, x, y;
 		float *fp;
@@ -126,7 +178,7 @@ static void node_composit_exec_scale(void *data, bNode *node, bNodeStack **in, b
 			fp += 4;
 		}
 
-		out[0]->data= stackbuf;
+		out[0]->data = stackbuf;
 	}
 }
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c b/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
index a30342ee28d..2433cb37763 100644
--- a/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
+++ b/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
@@ -35,14 +35,14 @@
 
 /* **************** SEPARATE HSVA ******************** */
 static bNodeSocketTemplate cmp_node_sephsva_in[]= {
-	{	SOCK_RGBA, 1, "Image",			1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_sephsva_out[]= {
-	{	SOCK_FLOAT, 0, "H"},
-	{	SOCK_FLOAT, 0, "S"},
-	{	SOCK_FLOAT, 0, "V"},
-	{	SOCK_FLOAT, 0, "A"},
+	{	SOCK_FLOAT, 0, N_("H")},
+	{	SOCK_FLOAT, 0, N_("S")},
+	{	SOCK_FLOAT, 0, N_("V")},
+	{	SOCK_FLOAT, 0, N_("A")},
 	{	-1, 0, ""	}
 };
 
@@ -114,14 +114,14 @@ void register_node_type_cmp_sephsva(bNodeTreeType *ttype)
 
 /* **************** COMBINE HSVA ******************** */
 static bNodeSocketTemplate cmp_node_combhsva_in[] = {
-	{	SOCK_FLOAT, 1, "H",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, "S",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, "V",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, "A",			1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+	{	SOCK_FLOAT, 1, N_("H"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+	{	SOCK_FLOAT, 1, N_("S"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+	{	SOCK_FLOAT, 1, N_("V"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+	{	SOCK_FLOAT, 1, N_("A"),			1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_combhsva_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c b/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
index be4a8ac76fe..988656ac454 100644
--- a/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
+++ b/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
@@ -34,14 +34,14 @@
 
 /* **************** SEPARATE RGBA ******************** */
 static bNodeSocketTemplate cmp_node_seprgba_in[]= {
-	{	SOCK_RGBA, 1, "Image",			1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_seprgba_out[]= {
-	{	SOCK_FLOAT, 0, "R"},
-	{	SOCK_FLOAT, 0, "G"},
-	{	SOCK_FLOAT, 0, "B"},
-	{	SOCK_FLOAT, 0, "A"},
+	{	SOCK_FLOAT, 0, N_("R")},
+	{	SOCK_FLOAT, 0, N_("G")},
+	{	SOCK_FLOAT, 0, N_("B")},
+	{	SOCK_FLOAT, 0, N_("A")},
 	{	-1, 0, ""	}
 };
 
@@ -93,14 +93,14 @@ void register_node_type_cmp_seprgba(bNodeTreeType *ttype)
 
 /* **************** COMBINE RGBA ******************** */
 static bNodeSocketTemplate cmp_node_combrgba_in[]= {
-	{	SOCK_FLOAT, 1, "R",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, "G",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, "B",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, "A",			1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+	{	SOCK_FLOAT, 1, N_("R"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+	{	SOCK_FLOAT, 1, N_("G"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+	{	SOCK_FLOAT, 1, N_("B"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+	{	SOCK_FLOAT, 1, N_("A"),			1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_combrgba_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c b/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
index 7f3b8a31a4b..486c0ed61ee 100644
--- a/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
+++ b/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
@@ -35,14 +35,14 @@
 
 /* **************** SEPARATE YCCA ******************** */
 static bNodeSocketTemplate cmp_node_sepycca_in[]= {
-	{  SOCK_RGBA, 1, "Image",        1.0f, 1.0f, 1.0f, 1.0f},
+	{  SOCK_RGBA, 1, N_("Image"),        1.0f, 1.0f, 1.0f, 1.0f},
 	{  -1, 0, ""   }
 };
 static bNodeSocketTemplate cmp_node_sepycca_out[]= {
-	{  SOCK_FLOAT, 0, "Y"},
-	{  SOCK_FLOAT, 0, "Cb"},
-	{  SOCK_FLOAT, 0, "Cr"},
-	{  SOCK_FLOAT, 0, "A"},
+	{  SOCK_FLOAT, 0, N_("Y")},
+	{  SOCK_FLOAT, 0, N_("Cb")},
+	{  SOCK_FLOAT, 0, N_("Cr")},
+	{  SOCK_FLOAT, 0, N_("A")},
 	{  -1, 0, ""   }
 };
 
@@ -162,14 +162,14 @@ void register_node_type_cmp_sepycca(bNodeTreeType *ttype)
 
 /* **************** COMBINE YCCA ******************** */
 static bNodeSocketTemplate cmp_node_combycca_in[]= {
-	{	SOCK_FLOAT, 1, "Y",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, "Cb",			0.5f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, "Cr",			0.5f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, "A",			1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+	{	SOCK_FLOAT, 1, N_("Y"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+	{	SOCK_FLOAT, 1, N_("Cb"),			0.5f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+	{	SOCK_FLOAT, 1, N_("Cr"),			0.5f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+	{	SOCK_FLOAT, 1, N_("A"),			1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_combycca_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c b/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
index 57fcf3af046..fdaae7307f0 100644
--- a/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
+++ b/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
@@ -35,14 +35,14 @@
 
 /* **************** SEPARATE YUVA ******************** */
 static bNodeSocketTemplate cmp_node_sepyuva_in[]= {
-	{  SOCK_RGBA, 1, "Image",        1.0f, 1.0f, 1.0f, 1.0f},
+	{  SOCK_RGBA, 1, N_("Image"),        1.0f, 1.0f, 1.0f, 1.0f},
 	{  -1, 0, ""   }
 };
 static bNodeSocketTemplate cmp_node_sepyuva_out[]= {
-	{  SOCK_FLOAT, 0, "Y"},
-	{  SOCK_FLOAT, 0, "U"},
-	{  SOCK_FLOAT, 0, "V"},
-	{  SOCK_FLOAT, 0, "A"},
+	{  SOCK_FLOAT, 0, N_("Y")},
+	{  SOCK_FLOAT, 0, N_("U")},
+	{  SOCK_FLOAT, 0, N_("V")},
+	{  SOCK_FLOAT, 0, N_("A")},
 	{  -1, 0, ""   }
 };
 
@@ -115,14 +115,14 @@ void register_node_type_cmp_sepyuva(bNodeTreeType *ttype)
 
 /* **************** COMBINE YUVA ******************** */
 static bNodeSocketTemplate cmp_node_combyuva_in[]= {
-	{	SOCK_FLOAT, 1, "Y",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, "U",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, "V",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, "A",			1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+	{	SOCK_FLOAT, 1, N_("Y"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+	{	SOCK_FLOAT, 1, N_("U"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+	{	SOCK_FLOAT, 1, N_("V"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+	{	SOCK_FLOAT, 1, N_("A"),			1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_combyuva_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_setalpha.c b/source/blender/nodes/composite/nodes/node_composite_setalpha.c
index 646bcc47617..c273807c54d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_setalpha.c
+++ b/source/blender/nodes/composite/nodes/node_composite_setalpha.c
@@ -34,12 +34,12 @@
 
 /* **************** SET ALPHA ******************** */
 static bNodeSocketTemplate cmp_node_setalpha_in[]= {
-	{	SOCK_RGBA, 1, "Image",			0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Alpha",			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
+	{	SOCK_RGBA, 1, N_("Image"),			0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Alpha"),			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_setalpha_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_splitViewer.c b/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
index a12a1042553..abccbb83bd0 100644
--- a/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
+++ b/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
@@ -34,8 +34,8 @@
 
 /* **************** SPLIT VIEWER ******************** */
 static bNodeSocketTemplate cmp_node_splitviewer_in[]= {
-	{	SOCK_RGBA, 1, "Image",		0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 1, "Image",		0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Image"),		0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Image"),		0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c b/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
index e5d8fe16d51..fabdf8c0536 100644
--- a/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
+++ b/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
@@ -36,12 +36,12 @@
 /* **************** Translate  ******************** */
 
 static bNodeSocketTemplate cmp_node_stabilize2d_in[]= {
-	{	SOCK_RGBA, 1, "Image",			0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Image"),			0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate cmp_node_stabilize2d_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
@@ -53,8 +53,9 @@ static void node_composit_exec_stabilize2d(void *data, bNode *node, bNodeStack *
 		CompBuf *cbuf = typecheck_compbuf(in[0]->data, CB_RGBA);
 		CompBuf *stackbuf;
 		float loc[2], scale, angle;
+		int clip_framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, rd->cfra);
 
-		BKE_tracking_stabilization_data(&clip->tracking, rd->cfra, cbuf->x, cbuf->y, loc, &scale, &angle);
+		BKE_tracking_stabilization_data_get(&clip->tracking, clip_framenr, cbuf->x, cbuf->y, loc, &scale, &angle);
 
 		stackbuf = node_composit_transform(cbuf, loc[0], loc[1], angle, scale, node->custom1);
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_switch.c b/source/blender/nodes/composite/nodes/node_composite_switch.c
index ee7e3124a7b..258fac18c11 100644
--- a/source/blender/nodes/composite/nodes/node_composite_switch.c
+++ b/source/blender/nodes/composite/nodes/node_composite_switch.c
@@ -27,7 +27,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/nodes/intern/CMP_nodes/CMP_switch.c
+/** \file blender/nodes/composite/nodes/node_composite_switch.c
  *  \ingroup cmpnodes
  */
 
@@ -35,13 +35,13 @@
 
 /* **************** MIX RGB ******************** */
 static bNodeSocketTemplate cmp_node_switch_in[]= {
-	{	SOCK_RGBA, 1, "Off",		0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 1, "On",			0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Off"),		0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("On"),			0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate cmp_node_switch_out[]= {
-	{	SOCK_RGBA, 0, "Image",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Image"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_texture.c b/source/blender/nodes/composite/nodes/node_composite_texture.c
index 5447c2af031..95458ad755b 100644
--- a/source/blender/nodes/composite/nodes/node_composite_texture.c
+++ b/source/blender/nodes/composite/nodes/node_composite_texture.c
@@ -34,13 +34,13 @@
 
 /* **************** TEXTURE ******************** */
 static bNodeSocketTemplate cmp_node_texture_in[]= {
-	{	SOCK_VECTOR, 1, "Offset",		0.0f, 0.0f, 0.0f, 0.0f, -2.0f, 2.0f, PROP_TRANSLATION},
-	{	SOCK_VECTOR, 1, "Scale",		1.0f, 1.0f, 1.0f, 1.0f, -10.0f, 10.0f, PROP_XYZ},
+	{	SOCK_VECTOR, 1, N_("Offset"),		0.0f, 0.0f, 0.0f, 0.0f, -2.0f, 2.0f, PROP_TRANSLATION},
+	{	SOCK_VECTOR, 1, N_("Scale"),		1.0f, 1.0f, 1.0f, 1.0f, -10.0f, 10.0f, PROP_XYZ},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_texture_out[]= {
-	{	SOCK_FLOAT, 0, "Value"},
-	{	SOCK_RGBA, 0, "Color"},
+	{	SOCK_FLOAT, 0, N_("Value")},
+	{	SOCK_RGBA, 0, N_("Color")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_tonemap.c b/source/blender/nodes/composite/nodes/node_composite_tonemap.c
index eae81a4bbd2..50006e599e5 100644
--- a/source/blender/nodes/composite/nodes/node_composite_tonemap.c
+++ b/source/blender/nodes/composite/nodes/node_composite_tonemap.c
@@ -33,11 +33,11 @@
 #include "node_composite_util.h"
 
 static bNodeSocketTemplate cmp_node_tonemap_in[]= {
-	{	SOCK_RGBA, 1, "Image",			1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_tonemap_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
@@ -51,16 +51,16 @@ static float avgLogLum(CompBuf *src, float* auto_key, float* Lav, float* Cav)
 	const float sc = 1.f/(src->x*src->y);
 	*Lav = 0.f;
 	while (p--) {
-		float L = 0.212671f*bc[0][0] + 0.71516f*bc[0][1] + 0.072169f*bc[0][2];
+		float L = rgb_to_luma_y(bc[0]);
 		*Lav += L;
-		fRGB_add(Cav, bc[0]);
+		add_v3_v3(Cav, bc[0]);
 		lsum += (float)log((double)MAX2(L, 0.0) + 1e-5);
 		maxl = (L > maxl) ? L : maxl;
 		minl = (L < minl) ? L : minl;
 		bc++;
 	}
 	*Lav *= sc;
-	fRGB_mult(Cav, sc);
+	mul_v3_fl(Cav, sc);
 	maxl = log((double)maxl + 1e-5); minl = log((double)minl + 1e-5f); avl = lsum*sc;
 	*auto_key = (maxl > minl) ? ((maxl - avl) / (maxl - minl)) : 1.f;
 	return exp((double)avl);
@@ -86,7 +86,7 @@ static void tonemap(NodeTonemap* ntm, CompBuf* dst, CompBuf* src)
 			fRGB* sp = (fRGB*)&src->rect[y*src->x*src->type];
 			fRGB* dp = (fRGB*)&dst->rect[y*src->x*src->type];
 			for (x=0; x<src->x; ++x) {
-				const float L = 0.212671f*sp[x][0] + 0.71516f*sp[x][1] + 0.072169f*sp[x][2];
+				const float L = rgb_to_luma_y(sp[x]);
 				float I_l = sp[x][0] + ic*(L - sp[x][0]);
 				float I_g = Cav[0] + ic*(Lav - Cav[0]);
 				float I_a = I_l + ia*(I_g - I_l);
@@ -109,8 +109,8 @@ static void tonemap(NodeTonemap* ntm, CompBuf* dst, CompBuf* src)
 		fRGB* sp = (fRGB*)&src->rect[y*src->x*src->type];
 		fRGB* dp = (fRGB*)&dst->rect[y*src->x*src->type];
 		for (x=0; x<src->x; x++) {
-			fRGB_copy(dp[x], sp[x]);
-			fRGB_mult(dp[x], al);
+			copy_v4_v4(dp[x], sp[x]);
+			mul_v3_fl(dp[x], al);
 			dr = dp[x][0] + ntm->offset;
 			dg = dp[x][1] + ntm->offset;
 			db = dp[x][2] + ntm->offset;
diff --git a/source/blender/nodes/composite/nodes/node_composite_transform.c b/source/blender/nodes/composite/nodes/node_composite_transform.c
index 2c2a352017a..8af55cde852 100644
--- a/source/blender/nodes/composite/nodes/node_composite_transform.c
+++ b/source/blender/nodes/composite/nodes/node_composite_transform.c
@@ -35,16 +35,16 @@
 /* **************** Transform  ******************** */
 
 static bNodeSocketTemplate cmp_node_transform_in[] = {
-	{	SOCK_RGBA,		1,	"Image",			0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT,		1,	"X",				0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f},
-	{	SOCK_FLOAT,		1,	"Y",				0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f},
-	{	SOCK_FLOAT,		1,	"Angle",			0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f, PROP_ANGLE},
-	{	SOCK_FLOAT,		1,	"Scale",			1.0f, 0.0f, 0.0f, 0.0f, 0.0001f, CMP_SCALE_MAX},
+	{	SOCK_RGBA,		1,	N_("Image"),			0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT,		1,	N_("X"),				0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f},
+	{	SOCK_FLOAT,		1,	N_("Y"),				0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f},
+	{	SOCK_FLOAT,		1,	N_("Angle"),			0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f, PROP_ANGLE},
+	{	SOCK_FLOAT,		1,	N_("Scale"),			1.0f, 0.0f, 0.0f, 0.0f, 0.0001f, CMP_SCALE_MAX},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate cmp_node_transform_out[] = {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_translate.c b/source/blender/nodes/composite/nodes/node_composite_translate.c
index 970e2c79f14..e147b100fce 100644
--- a/source/blender/nodes/composite/nodes/node_composite_translate.c
+++ b/source/blender/nodes/composite/nodes/node_composite_translate.c
@@ -36,13 +36,13 @@
 /* **************** Translate  ******************** */
 
 static bNodeSocketTemplate cmp_node_translate_in[]= {
-	{	SOCK_RGBA, 1, "Image",			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "X",	0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, "Y",	0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f, PROP_NONE},
+	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("X"),	0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f, PROP_NONE},
+	{	SOCK_FLOAT, 1, N_("Y"),	0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f, PROP_NONE},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_translate_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_valToRgb.c b/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
index 86986f6038d..bdf6b4f1635 100644
--- a/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
+++ b/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
@@ -35,12 +35,12 @@
 
 /* **************** VALTORGB ******************** */
 static bNodeSocketTemplate cmp_node_valtorgb_in[]= {
-	{	SOCK_FLOAT, 1, "Fac",			0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_FLOAT, 1, N_("Fac"),			0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_valtorgb_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
-	{	SOCK_FLOAT, 0, "Alpha"},
+	{	SOCK_RGBA, 0, N_("Image")},
+	{	SOCK_FLOAT, 0, N_("Alpha")},
 	{	-1, 0, ""	}
 };
 
@@ -101,11 +101,11 @@ void register_node_type_cmp_valtorgb(bNodeTreeType *ttype)
 
 /* **************** RGBTOBW ******************** */
 static bNodeSocketTemplate cmp_node_rgbtobw_in[]= {
-	{	SOCK_RGBA, 1, "Image",			0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Image"),			0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_rgbtobw_out[]= {
-	{	SOCK_FLOAT, 0, "Val",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Val"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_value.c b/source/blender/nodes/composite/nodes/node_composite_value.c
index 3cecb69bc7e..8d39b38c2fe 100644
--- a/source/blender/nodes/composite/nodes/node_composite_value.c
+++ b/source/blender/nodes/composite/nodes/node_composite_value.c
@@ -35,7 +35,7 @@
 /* **************** VALUE ******************** */
 static bNodeSocketTemplate cmp_node_value_out[]= {
 	/* XXX value nodes use the output sockets for buttons, so we need explicit limits here! */
-	{	SOCK_FLOAT, 0, "Value", 0.0f, 0.0f, 0.0f, 0.0f, -FLT_MAX, FLT_MAX},
+	{	SOCK_FLOAT, 0, N_("Value"), 0.0f, 0.0f, 0.0f, 0.0f, -FLT_MAX, FLT_MAX},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_vecBlur.c b/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
index 1d4662aa87b..e1a20a65227 100644
--- a/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
+++ b/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
@@ -34,63 +34,63 @@
 
 
 /* **************** VECTOR BLUR ******************** */
-static bNodeSocketTemplate cmp_node_vecblur_in[]= {
-	{	SOCK_RGBA, 1, "Image",			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Z",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_VECTOR, 1, "Speed",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_VELOCITY},
-	{	-1, 0, ""	}
+static bNodeSocketTemplate cmp_node_vecblur_in[] = {
+	{   SOCK_RGBA, 1, N_("Image"),          1.0f, 1.0f, 1.0f, 1.0f},
+	{   SOCK_FLOAT, 1, N_("Z"),         0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
+	{   SOCK_VECTOR, 1, N_("Speed"),            0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_VELOCITY},
+	{   -1, 0, ""   }
 };
-static bNodeSocketTemplate cmp_node_vecblur_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
-	{	-1, 0, ""	}
+static bNodeSocketTemplate cmp_node_vecblur_out[] = {
+	{   SOCK_RGBA, 0, N_("Image")},
+	{   -1, 0, ""   }
 };
 
 
 
 static void node_composit_exec_vecblur(void *UNUSED(data), bNode *node, bNodeStack **in, bNodeStack **out)
 {
-	NodeBlurData *nbd= node->storage;
-	CompBuf *new, *img= in[0]->data, *vecbuf= in[2]->data, *zbuf= in[1]->data;
+	NodeBlurData *nbd = node->storage;
+	CompBuf *new, *img = in[0]->data, *vecbuf = in[2]->data, *zbuf = in[1]->data;
 	
-	if (img==NULL || vecbuf==NULL || zbuf==NULL || out[0]->hasoutput==0)
+	if (img == NULL || vecbuf == NULL || zbuf == NULL || out[0]->hasoutput == 0)
 		return;
-	if (vecbuf->x!=img->x || vecbuf->y!=img->y) {
+	if (vecbuf->x != img->x || vecbuf->y != img->y) {
 		printf("ERROR: cannot do different sized vecbuf yet\n");
 		return;
 	}
-	if (vecbuf->type!=CB_VEC4) {
+	if (vecbuf->type != CB_VEC4) {
 		printf("ERROR: input should be vecbuf\n");
 		return;
 	}
-	if (zbuf->type!=CB_VAL) {
+	if (zbuf->type != CB_VAL) {
 		printf("ERROR: input should be zbuf\n");
 		return;
 	}
-	if (zbuf->x!=img->x || zbuf->y!=img->y) {
+	if (zbuf->x != img->x || zbuf->y != img->y) {
 		printf("ERROR: cannot do different sized zbuf yet\n");
 		return;
 	}
 	
 	/* allow the input image to be of another type */
-	img= typecheck_compbuf(in[0]->data, CB_RGBA);
+	img = typecheck_compbuf(in[0]->data, CB_RGBA);
 
-	new= dupalloc_compbuf(img);
+	new = dupalloc_compbuf(img);
 	
 	/* call special zbuffer version */
 	RE_zbuf_accumulate_vecblur(nbd, img->x, img->y, new->rect, img->rect, vecbuf->rect, zbuf->rect);
 	
-	out[0]->data= new;
+	out[0]->data = new;
 	
-	if (img!=in[0]->data)
+	if (img != in[0]->data)
 		free_compbuf(img);
 }
 
-static void node_composit_init_vecblur(bNodeTree *UNUSED(ntree), bNode* node, bNodeTemplate *UNUSED(ntemp))
+static void node_composit_init_vecblur(bNodeTree *UNUSED(ntree), bNode *node, bNodeTemplate *UNUSED(ntemp))
 {
-	NodeBlurData *nbd= MEM_callocN(sizeof(NodeBlurData), "node blur data");
-	node->storage= nbd;
-	nbd->samples= 32;
-	nbd->fac= 1.0f;
+	NodeBlurData *nbd = MEM_callocN(sizeof(NodeBlurData), "node blur data");
+	node->storage = nbd;
+	nbd->samples = 32;
+	nbd->fac = 1.0f;
 }
 
 /* custom1: itterations, custom2: maxspeed (0 = nolimit) */
diff --git a/source/blender/nodes/composite/nodes/node_composite_viewer.c b/source/blender/nodes/composite/nodes/node_composite_viewer.c
index 4a0726e473b..e97863a9463 100644
--- a/source/blender/nodes/composite/nodes/node_composite_viewer.c
+++ b/source/blender/nodes/composite/nodes/node_composite_viewer.c
@@ -34,11 +34,11 @@
 
 
 /* **************** VIEWER ******************** */
-static bNodeSocketTemplate cmp_node_viewer_in[]= {
-	{	SOCK_RGBA, 1, "Image",		0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Alpha",		1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, "Z",			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
-	{	-1, 0, ""	}
+static bNodeSocketTemplate cmp_node_viewer_in[] = {
+	{   SOCK_RGBA, 1, N_("Image"),      0.0f, 0.0f, 0.0f, 1.0f},
+	{   SOCK_FLOAT, 1, N_("Alpha"),     1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
+	{   SOCK_FLOAT, 1, N_("Z"),         1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
+	{   -1, 0, ""   }
 };
 
 
@@ -47,9 +47,9 @@ static void node_composit_exec_viewer(void *data, bNode *node, bNodeStack **in,
 	/* image assigned to output */
 	/* stack order input sockets: col, alpha, z */
 	
-	if (node->id && (node->flag & NODE_DO_OUTPUT)) {	/* only one works on out */
-		RenderData *rd= data;
-		Image *ima= (Image *)node->id;
+	if (node->id && (node->flag & NODE_DO_OUTPUT)) {  /* only one works on out */
+		RenderData *rd = data;
+		Image *ima = (Image *)node->id;
 		ImBuf *ibuf;
 		CompBuf *cbuf, *tbuf;
 		int rectx, recty;
@@ -58,8 +58,8 @@ static void node_composit_exec_viewer(void *data, bNode *node, bNodeStack **in,
 		BKE_image_user_frame_calc(node->storage, rd->cfra, 0);
 
 		/* always returns for viewer image, but we check nevertheless */
-		ibuf= BKE_image_acquire_ibuf(ima, node->storage, &lock);
-		if (ibuf==NULL) {
+		ibuf = BKE_image_acquire_ibuf(ima, node->storage, &lock);
+		if (ibuf == NULL) {
 			printf("node_composit_exec_viewer error\n");
 			BKE_image_release_ibuf(ima, lock);
 			return;
@@ -71,28 +71,28 @@ static void node_composit_exec_viewer(void *data, bNode *node, bNodeStack **in,
 		IMB_freezbuffloatImBuf(ibuf);
 		
 		/* get size */
-		tbuf= in[0]->data?in[0]->data:(in[1]->data?in[1]->data:in[2]->data);
-		if (tbuf==NULL) {
-			rectx= 320; recty= 256;
+		tbuf = in[0]->data ? in[0]->data : (in[1]->data ? in[1]->data : in[2]->data);
+		if (tbuf == NULL) {
+			rectx = 320; recty = 256;
 		}
 		else {
-			rectx= tbuf->x;
-			recty= tbuf->y;
+			rectx = tbuf->x;
+			recty = tbuf->y;
 		}
 		
 		/* make ibuf, and connect to ima */
-		ibuf->x= rectx;
-		ibuf->y= recty;
+		ibuf->x = rectx;
+		ibuf->y = recty;
 		imb_addrectfloatImBuf(ibuf);
 		
-		ima->ok= IMA_OK_LOADED;
+		ima->ok = IMA_OK_LOADED;
 
 		/* now we combine the input with ibuf */
-		cbuf= alloc_compbuf(rectx, recty, CB_RGBA, 0);	/* no alloc*/
-		cbuf->rect= ibuf->rect_float;
+		cbuf = alloc_compbuf(rectx, recty, CB_RGBA, 0);  /* no alloc*/
+		cbuf->rect = ibuf->rect_float;
 		
 		/* when no alpha, we can simply copy */
-		if (in[1]->data==NULL) {
+		if (in[1]->data == NULL) {
 			composit1_pixel_processor(node, cbuf, in[0]->data, in[0]->vec, do_copy_rgba, CB_RGBA);
 		}
 		else
@@ -100,14 +100,14 @@ static void node_composit_exec_viewer(void *data, bNode *node, bNodeStack **in,
 		
 		/* zbuf option */
 		if (in[2]->data) {
-			CompBuf *zbuf= alloc_compbuf(rectx, recty, CB_VAL, 1);
-			ibuf->zbuf_float= zbuf->rect;
+			CompBuf *zbuf = alloc_compbuf(rectx, recty, CB_VAL, 1);
+			ibuf->zbuf_float = zbuf->rect;
 			ibuf->mall |= IB_zbuffloat;
 			
 			composit1_pixel_processor(node, zbuf, in[2]->data, in[2]->vec, do_copy_value, CB_VAL);
 			
 			/* free compbuf, but not the rect */
-			zbuf->malloc= 0;
+			zbuf->malloc = 0;
 			free_compbuf(zbuf);
 		}
 
@@ -122,13 +122,13 @@ static void node_composit_exec_viewer(void *data, bNode *node, bNodeStack **in,
 	}
 }
 
-static void node_composit_init_viewer(bNodeTree *UNUSED(ntree), bNode* node, bNodeTemplate *UNUSED(ntemp))
+static void node_composit_init_viewer(bNodeTree *UNUSED(ntree), bNode *node, bNodeTemplate *UNUSED(ntemp))
 {
-	ImageUser *iuser= MEM_callocN(sizeof(ImageUser), "node image user");
-	node->storage= iuser;
-	iuser->sfra= 1;
-	iuser->fie_ima= 2;
-	iuser->ok= 1;
+	ImageUser *iuser = MEM_callocN(sizeof(ImageUser), "node image user");
+	node->storage = iuser;
+	iuser->sfra = 1;
+	iuser->fie_ima = 2;
+	iuser->ok = 1;
 	node->custom3 = 0.5f;
 	node->custom4 = 0.5f;
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_zcombine.c b/source/blender/nodes/composite/nodes/node_composite_zcombine.c
index 64342751e84..e431ff17be5 100644
--- a/source/blender/nodes/composite/nodes/node_composite_zcombine.c
+++ b/source/blender/nodes/composite/nodes/node_composite_zcombine.c
@@ -36,15 +36,15 @@
 /* **************** Z COMBINE ******************** */
 	/* lazy coder note: node->custom2 is abused to send signal */
 static bNodeSocketTemplate cmp_node_zcombine_in[]= {
-	{	SOCK_RGBA, 1, "Image",		1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Z",			1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 10000.0f, PROP_NONE},
-	{	SOCK_RGBA, 1, "Image",		1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Z",			1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 10000.0f, PROP_NONE},
+	{	SOCK_RGBA, 1, N_("Image"),		1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Z"),			1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 10000.0f, PROP_NONE},
+	{	SOCK_RGBA, 1, N_("Image"),		1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Z"),			1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 10000.0f, PROP_NONE},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate cmp_node_zcombine_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
-	{	SOCK_FLOAT, 0, "Z"},
+	{	SOCK_RGBA, 0, N_("Image")},
+	{	SOCK_FLOAT, 0, N_("Z")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/intern/node_common.c b/source/blender/nodes/intern/node_common.c
index fa1af821a2d..150bede4b7c 100644
--- a/source/blender/nodes/intern/node_common.c
+++ b/source/blender/nodes/intern/node_common.c
@@ -32,8 +32,6 @@
 
 #include <string.h>
 
-#include "DNA_action_types.h"
-#include "DNA_anim_types.h"
 #include "DNA_node_types.h"
 
 #include "BLI_listbase.h"
@@ -42,8 +40,6 @@
 
 #include "BLF_translation.h"
 
-#include "BKE_action.h"
-#include "BKE_animsys.h"
 #include "BKE_global.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
@@ -112,294 +108,6 @@ bNodeSocket *node_group_add_extern_socket(bNodeTree *UNUSED(ntree), ListBase *lb
 	return sock;
 }
 
-bNode *node_group_make_from_selected(bNodeTree *ntree)
-{
-	bNodeLink *link, *linkn;
-	bNode *node, *gnode, *nextn;
-	bNodeTree *ngroup;
-	bNodeSocket *gsock;
-	ListBase anim_basepaths = {NULL, NULL};
-	float min[2], max[2];
-	int totnode=0;
-	bNodeTemplate ntemp;
-	
-	INIT_MINMAX2(min, max);
-	
-	/* is there something to group? also do some clearing */
-	for (node= ntree->nodes.first; node; node= node->next) {
-		if (node->flag & NODE_SELECT) {
-			/* no groups in groups */
-			if (node->type==NODE_GROUP)
-				return NULL;
-			DO_MINMAX2((&node->locx), min, max);
-			totnode++;
-		}
-		node->done = FALSE;
-	}
-	if (totnode==0) return NULL;
-	
-	/* check if all connections are OK, no unselected node has both
-	 * inputs and outputs to a selection */
-	for (link= ntree->links.first; link; link= link->next) {
-		if (link->fromnode && link->tonode && link->fromnode->flag & NODE_SELECT)
-			link->tonode->done |= 1;
-		if (link->fromnode && link->tonode && link->tonode->flag & NODE_SELECT)
-			link->fromnode->done |= 2;
-	}	
-	
-	for (node= ntree->nodes.first; node; node= node->next) {
-		if ((node->flag & NODE_SELECT)==0)
-			if (node->done==3)
-				break;
-	}
-	if (node) 
-		return NULL;
-	
-	/* OK! new nodetree */
-	ngroup= ntreeAddTree("NodeGroup", ntree->type, NODE_GROUP);
-	
-	/* move nodes over */
-	for (node= ntree->nodes.first; node; node= nextn) {
-		nextn= node->next;
-		if (node->flag & NODE_SELECT) {
-			/* keep track of this node's RNA "base" path (the part of the pat identifying the node) 
-			 * if the old nodetree has animation data which potentially covers this node
-			 */
-			if (ntree->adt) {
-				PointerRNA ptr;
-				char *path;
-				
-				RNA_pointer_create(&ntree->id, &RNA_Node, node, &ptr);
-				path = RNA_path_from_ID_to_struct(&ptr);
-				
-				if (path)
-					BLI_addtail(&anim_basepaths, BLI_genericNodeN(path));
-			}
-			
-			/* change node-collection membership */
-			BLI_remlink(&ntree->nodes, node);
-			BLI_addtail(&ngroup->nodes, node);
-			
-			node->locx-= 0.5f*(min[0]+max[0]);
-			node->locy-= 0.5f*(min[1]+max[1]);
-		}
-	}
-
-	/* move animation data over */
-	if (ntree->adt) {
-		LinkData *ld, *ldn=NULL;
-		
-		BKE_animdata_separate_by_basepath(&ntree->id, &ngroup->id, &anim_basepaths);
-		
-		/* paths + their wrappers need to be freed */
-		for (ld = anim_basepaths.first; ld; ld = ldn) {
-			ldn = ld->next;
-			
-			MEM_freeN(ld->data);
-			BLI_freelinkN(&anim_basepaths, ld);
-		}
-	}
-	
-	/* node groups don't use internal cached data */
-	ntreeFreeCache(ngroup);
-	
-	/* make group node */
-	ntemp.type = NODE_GROUP;
-	ntemp.ngroup = ngroup;
-	gnode= nodeAddNode(ntree, &ntemp);
-	gnode->locx= 0.5f*(min[0]+max[0]);
-	gnode->locy= 0.5f*(min[1]+max[1]);
-	
-	/* relink external sockets */
-	for (link= ntree->links.first; link; link= linkn) {
-		linkn= link->next;
-		
-		if (link->fromnode && link->tonode && (link->fromnode->flag & link->tonode->flag & NODE_SELECT)) {
-			BLI_remlink(&ntree->links, link);
-			BLI_addtail(&ngroup->links, link);
-		}
-		else if (link->tonode && (link->tonode->flag & NODE_SELECT)) {
-			gsock = node_group_expose_socket(ngroup, link->tosock, SOCK_IN);
-			link->tosock->link = nodeAddLink(ngroup, NULL, gsock, link->tonode, link->tosock);
-			link->tosock = node_group_add_extern_socket(ntree, &gnode->inputs, SOCK_IN, gsock);
-			link->tonode = gnode;
-		}
-		else if (link->fromnode && (link->fromnode->flag & NODE_SELECT)) {
-			/* search for existing group node socket */
-			for (gsock=ngroup->outputs.first; gsock; gsock=gsock->next)
-				if (gsock->link && gsock->link->fromsock==link->fromsock)
-					break;
-			if (!gsock) {
-				gsock = node_group_expose_socket(ngroup, link->fromsock, SOCK_OUT);
-				gsock->link = nodeAddLink(ngroup, link->fromnode, link->fromsock, NULL, gsock);
-				link->fromsock = node_group_add_extern_socket(ntree, &gnode->outputs, SOCK_OUT, gsock);
-			}
-			else
-				link->fromsock = node_group_find_output(gnode, gsock);
-			link->fromnode = gnode;
-		}
-	}
-
-	/* update of the group tree */
-	ngroup->update |= NTREE_UPDATE;
-	ntreeUpdateTree(ngroup);
-	/* update of the tree containing the group instance node */
-	ntree->update |= NTREE_UPDATE_NODES | NTREE_UPDATE_LINKS;
-	ntreeUpdateTree(ntree);
-
-	return gnode;
-}
-
-/* returns 1 if its OK */
-int node_group_ungroup(bNodeTree *ntree, bNode *gnode)
-{
-	bNodeLink *link, *linkn;
-	bNode *node, *nextn;
-	bNodeTree *ngroup, *wgroup;
-	ListBase anim_basepaths = {NULL, NULL};
-	
-	ngroup= (bNodeTree *)gnode->id;
-	if (ngroup==NULL) return 0;
-	
-	/* clear new pointers, set in copytree */
-	for (node= ntree->nodes.first; node; node= node->next)
-		node->new_node= NULL;
-	
-	/* wgroup is a temporary copy of the NodeTree we're merging in
-	 *	- all of wgroup's nodes are transferred across to their new home
-	 *	- ngroup (i.e. the source NodeTree) is left unscathed
-	 */
-	wgroup= ntreeCopyTree(ngroup);
-	
-	/* add the nodes into the ntree */
-	for (node= wgroup->nodes.first; node; node= nextn) {
-		nextn= node->next;
-		
-		/* keep track of this node's RNA "base" path (the part of the pat identifying the node) 
-		 * if the old nodetree has animation data which potentially covers this node
-		 */
-		if (wgroup->adt) {
-			PointerRNA ptr;
-			char *path;
-			
-			RNA_pointer_create(&wgroup->id, &RNA_Node, node, &ptr);
-			path = RNA_path_from_ID_to_struct(&ptr);
-			
-			if (path)
-				BLI_addtail(&anim_basepaths, BLI_genericNodeN(path));
-		}
-		
-		/* migrate node */
-		BLI_remlink(&wgroup->nodes, node);
-		BLI_addtail(&ntree->nodes, node);
-		
-		node->locx+= gnode->locx;
-		node->locy+= gnode->locy;
-		
-		node->flag |= NODE_SELECT;
-	}
-	
-	/* restore external links to and from the gnode */
-	for (link= ntree->links.first; link; link= link->next) {
-		if (link->fromnode==gnode) {
-			if (link->fromsock->groupsock) {
-				bNodeSocket *gsock= link->fromsock->groupsock;
-				if (gsock->link) {
-					if (gsock->link->fromnode) {
-						/* NB: using the new internal copies here! the groupsock pointer still maps to the old tree */
-						link->fromnode = (gsock->link->fromnode ? gsock->link->fromnode->new_node : NULL);
-						link->fromsock = gsock->link->fromsock->new_sock;
-					}
-					else {
-						/* group output directly maps to group input */
-						bNodeSocket *insock= node_group_find_input(gnode, gsock->link->fromsock);
-						if (insock->link) {
-							link->fromnode = insock->link->fromnode;
-							link->fromsock = insock->link->fromsock;
-						}
-					}
-				}
-				else {
-					/* copy the default input value from the group socket default to the external socket */
-					node_socket_convert_default_value(link->tosock->type, link->tosock->default_value, gsock->type, gsock->default_value);
-				}
-			}
-		}
-	}
-	/* remove internal output links, these are not used anymore */
-	for (link=wgroup->links.first; link; link= linkn) {
-		linkn = link->next;
-		if (!link->tonode)
-			nodeRemLink(wgroup, link);
-	}
-	/* restore links from internal nodes */
-	for (link= wgroup->links.first; link; link= link->next) {
-		/* indicates link to group input */
-		if (!link->fromnode) {
-			/* NB: can't use find_group_node_input here,
-			 * because gnode sockets still point to the old tree!
-			 */
-			bNodeSocket *insock;
-			for (insock= gnode->inputs.first; insock; insock= insock->next)
-				if (insock->groupsock->new_sock == link->fromsock)
-					break;
-			if (insock->link) {
-				link->fromnode = insock->link->fromnode;
-				link->fromsock = insock->link->fromsock;
-			}
-			else {
-				/* copy the default input value from the group node socket default to the internal socket */
-				node_socket_convert_default_value(link->tosock->type, link->tosock->default_value, insock->type, insock->default_value);
-				nodeRemLink(wgroup, link);
-			}
-		}
-	}
-	
-	/* add internal links to the ntree */
-	for (link= wgroup->links.first; link; link= linkn) {
-		linkn= link->next;
-		BLI_remlink(&wgroup->links, link);
-		BLI_addtail(&ntree->links, link);
-	}
-	
-	/* and copy across the animation,
-	 * note that the animation data's action can be NULL here */
-	if (wgroup->adt) {
-		LinkData *ld, *ldn=NULL;
-		bAction *waction;
-		
-		/* firstly, wgroup needs to temporary dummy action that can be destroyed, as it shares copies */
-		waction = wgroup->adt->action = BKE_action_copy(wgroup->adt->action);
-		
-		/* now perform the moving */
-		BKE_animdata_separate_by_basepath(&wgroup->id, &ntree->id, &anim_basepaths);
-		
-		/* paths + their wrappers need to be freed */
-		for (ld = anim_basepaths.first; ld; ld = ldn) {
-			ldn = ld->next;
-			
-			MEM_freeN(ld->data);
-			BLI_freelinkN(&anim_basepaths, ld);
-		}
-		
-		/* free temp action too */
-		if (waction) {
-			BKE_libblock_free(&G.main->action, waction);
-		}
-	}
-	
-	/* delete the group instance. this also removes old input links! */
-	nodeFreeNode(ntree, gnode);
-
-	/* free the group tree (takes care of user count) */
-	BKE_libblock_free(&G.main->nodetree, wgroup);
-	
-	ntree->update |= NTREE_UPDATE_NODES | NTREE_UPDATE_LINKS;
-	ntreeUpdateTree(ntree);
-	
-	return 1;
-}
-
 bNodeSocket *node_group_add_socket(bNodeTree *ngroup, const char *name, int type, int in_out)
 {
 	bNodeSocketType *stype = ntreeGetSocketType(type);
@@ -835,3 +543,70 @@ void register_node_type_frame(bNodeTreeType *ttype)
 	ntype->needs_free = 1;
 	nodeRegisterType(ttype, ntype);
 }
+
+
+/* **************** REROUTE ******************** */
+
+static bNodeSocketTemplate node_reroute_in[]= {
+	{	SOCK_RGBA, 1, "Input",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+	{	-1, 0, ""	}
+};
+static bNodeSocketTemplate node_reroute_out[]= {
+	{	SOCK_RGBA, 0, "Output",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+	{	-1, 0, ""	}
+};
+
+/* simple, only a single input and output here */
+static ListBase node_reroute_internal_connect(bNodeTree *ntree, bNode *node)
+{
+	bNodeLink *link;
+	ListBase ret;
+
+	ret.first = ret.last = NULL;
+
+	/* Security check! */
+	if (!ntree)
+		return ret;
+
+	link = MEM_callocN(sizeof(bNodeLink), "internal node link");
+	link->fromnode = node;
+	link->fromsock = node->inputs.first;
+	link->tonode = node;
+	link->tosock = node->outputs.first;
+	/* internal link is always valid */
+	link->flag |= NODE_LINK_VALID;
+	BLI_addtail(&ret, link);
+
+	return ret;
+}
+
+static void node_reroute_update(bNodeTree *UNUSED(ntree), bNode *node)
+{
+	bNodeSocket *input = node->inputs.first;
+	bNodeSocket *output = node->outputs.first;
+	int type = SOCK_FLOAT;
+	
+	/* determine socket type from unambiguous input/output connection if possible */
+	if (input->limit==1 && input->link)
+		type = input->link->fromsock->type;
+	else if (output->limit==1 && output->link)
+			type = output->link->tosock->type;
+	
+	/* same type for input/output */
+	nodeSocketSetType(input, type);
+	nodeSocketSetType(output, type);
+}
+
+void register_node_type_reroute(bNodeTreeType *ttype)
+{
+	/* frame type is used for all tree types, needs dynamic allocation */
+	bNodeType *ntype= MEM_callocN(sizeof(bNodeType), "frame node type");
+	
+	node_type_base(ttype, ntype, NODE_REROUTE, "Reroute", NODE_CLASS_LAYOUT, 0);
+	node_type_socket_templates(ntype, node_reroute_in, node_reroute_out);
+	node_type_internal_connect(ntype, node_reroute_internal_connect);
+	node_type_update(ntype, node_reroute_update, NULL);
+	
+	ntype->needs_free = 1;
+	nodeRegisterType(ttype, ntype);
+}
diff --git a/source/blender/nodes/intern/node_common.h b/source/blender/nodes/intern/node_common.h
index 616221d6658..f1bb837e483 100644
--- a/source/blender/nodes/intern/node_common.h
+++ b/source/blender/nodes/intern/node_common.h
@@ -37,8 +37,6 @@
 
 struct bNodeTree;
 
-struct bNodeSocket *node_group_add_extern_socket(struct bNodeTree *ntree, ListBase *lb, int in_out, struct bNodeSocket *gsock);
-
 void node_group_init(struct bNodeTree *ntree, struct bNode *node, struct bNodeTemplate *ntemp);
 void node_forloop_init(struct bNodeTree *ntree, struct bNode *node, struct bNodeTemplate *ntemp);
 void node_whileloop_init(struct bNodeTree *ntree, struct bNode *node, struct bNodeTemplate *ntemp);
diff --git a/source/blender/nodes/intern/node_exec.c b/source/blender/nodes/intern/node_exec.c
index 3f77638e25a..d01ef2e2d52 100644
--- a/source/blender/nodes/intern/node_exec.c
+++ b/source/blender/nodes/intern/node_exec.c
@@ -46,7 +46,9 @@
 /* for a given socket, find the actual stack entry */
 bNodeStack *node_get_socket_stack(bNodeStack *stack, bNodeSocket *sock)
 {
-	return stack + sock->stack_index;
+	if (stack && sock)
+		return stack + sock->stack_index;
+	return NULL;
 }
 
 void node_get_stack(bNode *node, bNodeStack *stack, bNodeStack **in, bNodeStack **out)
diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c
index 4794a66d064..a1d873231e7 100644
--- a/source/blender/nodes/shader/node_shader_tree.c
+++ b/source/blender/nodes/shader/node_shader_tree.c
@@ -99,11 +99,11 @@ static void localize(bNodeTree *localtree, bNodeTree *UNUSED(ntree))
 {
 	bNode *node, *node_next;
 	
-	/* replace muted nodes by internal links */
+	/* replace muted nodes and reroute nodes by internal links */
 	for (node= localtree->nodes.first; node; node= node_next) {
 		node_next = node->next;
 		
-		if (node->flag & NODE_MUTED) {
+		if (node->flag & NODE_MUTED || node->type == NODE_REROUTE) {
 			nodeInternalRelink(localtree, node);
 			nodeFreeNode(localtree, node);
 		}
diff --git a/source/blender/nodes/shader/node_shader_util.c b/source/blender/nodes/shader/node_shader_util.c
index 5961c2b330b..9aa3c76e0a5 100644
--- a/source/blender/nodes/shader/node_shader_util.c
+++ b/source/blender/nodes/shader/node_shader_util.c
@@ -88,7 +88,7 @@ void ntreeShaderGetTexcoMode(bNodeTree *ntree, int r_mode, short *texco, int *mo
 		if (node->type==SH_NODE_TEXTURE) {
 			if ((r_mode & R_OSA) && node->id) {
 				Tex *tex= (Tex *)node->id;
-				if (ELEM3(tex->type, TEX_IMAGE, TEX_PLUGIN, TEX_ENVMAP)) {
+				if (ELEM(tex->type, TEX_IMAGE, TEX_ENVMAP)) {
 					*texco |= TEXCO_OSA|NEED_UV;
 				}
 			}
diff --git a/source/blender/nodes/shader/node_shader_util.h b/source/blender/nodes/shader/node_shader_util.h
index 37c272ad61d..e4dc74e8d40 100644
--- a/source/blender/nodes/shader/node_shader_util.h
+++ b/source/blender/nodes/shader/node_shader_util.h
@@ -69,6 +69,8 @@
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
 
+#include "BLF_translation.h"
+
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_add_shader.c b/source/blender/nodes/shader/nodes/node_shader_add_shader.c
index c12ff54d24c..ee8513a4119 100644
--- a/source/blender/nodes/shader/nodes/node_shader_add_shader.c
+++ b/source/blender/nodes/shader/nodes/node_shader_add_shader.c
@@ -30,13 +30,13 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_add_shader_in[]= {
-	{	SOCK_SHADER, 1, "Shader"},
-	{	SOCK_SHADER, 1, "Shader"},
+	{	SOCK_SHADER, 1, N_("Shader")},
+	{	SOCK_SHADER, 1, N_("Shader")},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_add_shader_out[]= {
-	{	SOCK_SHADER, 0, "Shader"},
+	{	SOCK_SHADER, 0, N_("Shader")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_attribute.c b/source/blender/nodes/shader/nodes/node_shader_attribute.c
index bd0779ae5b1..2821c3e3fe6 100644
--- a/source/blender/nodes/shader/nodes/node_shader_attribute.c
+++ b/source/blender/nodes/shader/nodes/node_shader_attribute.c
@@ -30,9 +30,9 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_attribute_out[]= {
-	{	SOCK_RGBA, 0, "Color"},
-	{	SOCK_VECTOR, 0, "Vector", 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Fac", 0.0f, 0.0f, 0.0f, 0.0f, -FLT_MAX, FLT_MAX},
+	{	SOCK_RGBA, 0, N_("Color")},
+	{	SOCK_VECTOR, 0, N_("Vector"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Fac"), 0.0f, 0.0f, 0.0f, 0.0f, -FLT_MAX, FLT_MAX},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_background.c b/source/blender/nodes/shader/nodes/node_shader_background.c
index 6acdc5baa59..7d13c359a2b 100644
--- a/source/blender/nodes/shader/nodes/node_shader_background.c
+++ b/source/blender/nodes/shader/nodes/node_shader_background.c
@@ -30,13 +30,13 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_background_in[]= {
-	{	SOCK_RGBA, 1, "Color",		0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Strength",	1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000000.0f},
+	{	SOCK_RGBA, 1, N_("Color"),		0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Strength"),	1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000000.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_background_out[]= {
-	{	SOCK_SHADER, 0, "Background"},
+	{	SOCK_SHADER, 0, N_("Background")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_brightness.c b/source/blender/nodes/shader/nodes/node_shader_brightness.c
index 7448a0b3bab..2735553cdad 100644
--- a/source/blender/nodes/shader/nodes/node_shader_brightness.c
+++ b/source/blender/nodes/shader/nodes/node_shader_brightness.c
@@ -32,14 +32,14 @@
 /* **************** Brigh and contrsast  ******************** */
 
 static bNodeSocketTemplate sh_node_brightcontrast_in[]= {
-	{	SOCK_RGBA, 1, "Color",			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Bright",		0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, "Contrast",		0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, PROP_NONE},
+	{	SOCK_RGBA, 1, N_("Color"),			1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Bright"),		0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, PROP_NONE},
+	{	SOCK_FLOAT, 1, N_("Contrast"),		0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, PROP_NONE},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_brightcontrast_out[]= {
-	{	SOCK_RGBA, 0, "Color"},
+	{	SOCK_RGBA, 0, N_("Color")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c b/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
index 2fd41fed92f..9157728b546 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
@@ -30,14 +30,14 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_bsdf_anisotropic_in[]= {
-	{	SOCK_RGBA, 1, "Color",			0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Roughness U",	0.2f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Roughness V",	0.2f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Color"),			0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Roughness U"),	0.2f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Roughness V"),	0.2f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_bsdf_anisotropic_out[]= {
-	{	SOCK_SHADER, 0, "BSDF"},
+	{	SOCK_SHADER, 0, N_("BSDF")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c b/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
index 114581f8a20..d2e2db3e78a 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
@@ -30,13 +30,13 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_bsdf_diffuse_in[]= {
-	{	SOCK_RGBA, 1, "Color",		0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Roughness",	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Color"),		0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Roughness"),	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_bsdf_diffuse_out[]= {
-	{	SOCK_SHADER, 0, "BSDF"},
+	{	SOCK_SHADER, 0, N_("BSDF")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c b/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
index 89d469a6a4d..8ff0ad57742 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
@@ -30,14 +30,14 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_bsdf_glass_in[]= {
-	{	SOCK_RGBA, 1, "Color",		0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Roughness",	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "IOR",		1.45f, 0.0f, 0.0f, 0.0f, 1.0f, 1000.0f},
+	{	SOCK_RGBA, 1, N_("Color"),		0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Roughness"),	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("IOR"),		1.45f, 0.0f, 0.0f, 0.0f, 1.0f, 1000.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_bsdf_glass_out[]= {
-	{	SOCK_SHADER, 0, "BSDF"},
+	{	SOCK_SHADER, 0, N_("BSDF")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c b/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
index 000a211805b..d28b3454f02 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
@@ -30,13 +30,13 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_bsdf_glossy_in[]= {
-	{	SOCK_RGBA,  1, "Color",		0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Roughness",	0.2f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA,  1, N_("Color"),		0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Roughness"),	0.2f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_bsdf_glossy_out[]= {
-	{	SOCK_SHADER, 0, "BSDF"},
+	{	SOCK_SHADER, 0, N_("BSDF")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c b/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
index 60fe847ac11..a3ba3ac7ff3 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
@@ -30,12 +30,12 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_bsdf_translucent_in[]= {
-	{	SOCK_RGBA, 1, "Color",		0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Color"),		0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_bsdf_translucent_out[]= {
-	{	SOCK_SHADER, 0, "BSDF"},
+	{	SOCK_SHADER, 0, N_("BSDF")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c b/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
index 301e6dfabab..8c945abdd0d 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
@@ -30,12 +30,12 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_bsdf_transparent_in[]= {
-	{	SOCK_RGBA, 1, "Color",		1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Color"),		1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_bsdf_transparent_out[]= {
-	{	SOCK_SHADER, 0, "BSDF"},
+	{	SOCK_SHADER, 0, N_("BSDF")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c b/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
index fefcf4caeaf..04a1c1b32df 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
@@ -30,13 +30,13 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_bsdf_velvet_in[]= {
-	{	SOCK_RGBA, 1, "Color",		0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Sigma",		1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Color"),		0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Sigma"),		1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_bsdf_velvet_out[]= {
-	{	SOCK_SHADER, 0, "BSDF"},
+	{	SOCK_SHADER, 0, N_("BSDF")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_camera.c b/source/blender/nodes/shader/nodes/node_shader_camera.c
index 69a6a5c04a9..17cec8196e8 100644
--- a/source/blender/nodes/shader/nodes/node_shader_camera.c
+++ b/source/blender/nodes/shader/nodes/node_shader_camera.c
@@ -34,9 +34,9 @@
 
 /* **************** CAMERA INFO  ******************** */
 static bNodeSocketTemplate sh_node_camera_out[]= {
-	{	SOCK_VECTOR, 0, "View Vector"},
-	{	SOCK_FLOAT, 0, "View Z Depth"},
-	{	SOCK_FLOAT, 0, "View Distance"},
+	{	SOCK_VECTOR, 0, N_("View Vector")},
+	{	SOCK_FLOAT, 0, N_("View Z Depth")},
+	{	SOCK_FLOAT, 0, N_("View Distance")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_curves.c b/source/blender/nodes/shader/nodes/node_shader_curves.c
index 50bf4c58e4d..be7f3c1c614 100644
--- a/source/blender/nodes/shader/nodes/node_shader_curves.c
+++ b/source/blender/nodes/shader/nodes/node_shader_curves.c
@@ -35,13 +35,13 @@
 
 /* **************** CURVE VEC  ******************** */
 static bNodeSocketTemplate sh_node_curve_vec_in[]= {
-	{	SOCK_FLOAT, 0, "Fac",	1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_VECTOR, 1, "Vector",	0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_NONE},
+	{	SOCK_FLOAT, 0, N_("Fac"),	1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_VECTOR, 1, N_("Vector"),	0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_NONE},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_curve_vec_out[]= {
-	{	SOCK_VECTOR, 0, "Vector"},
+	{	SOCK_VECTOR, 0, N_("Vector")},
 	{	-1, 0, ""	}
 };
 
@@ -88,13 +88,13 @@ void register_node_type_sh_curve_vec(bNodeTreeType *ttype)
 
 /* **************** CURVE RGB  ******************** */
 static bNodeSocketTemplate sh_node_curve_rgb_in[]= {
-	{	SOCK_FLOAT, 1, "Fac",	1.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_RGBA, 1, "Color",	0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Fac"),	1.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_RGBA, 1, N_("Color"),	0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_curve_rgb_out[]= {
-	{	SOCK_RGBA, 0, "Color"},
+	{	SOCK_RGBA, 0, N_("Color")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_dynamic.c b/source/blender/nodes/shader/nodes/node_shader_dynamic.c
deleted file mode 100644
index b441545441a..00000000000
--- a/source/blender/nodes/shader/nodes/node_shader_dynamic.c
+++ /dev/null
@@ -1,798 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. 
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2007 Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): Nathan Letwory
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/nodes/shader/nodes/node_shader_dynamic.c
- *  \ingroup shdnodes
- */
-
-
-/* TODO, support python3.x */
-#undef WITH_PYTHON 
-
-#ifdef WITH_PYTHON
-#include <Python.h>
-#include <compile.h>
-#include <eval.h>
-#endif
-
-#include "DNA_text_types.h"
-#include "BKE_text.h"
-
-
-// XXX
-#if 0
-#ifdef WITH_PYTHON
-#include "api2_2x/Node.h"
-#include "api2_2x/gen_utils.h"
-#include "BPY_extern.h"
-#endif
-#endif
-
-#include "node_shader_util.h"
-
-// XXX
-#if 0
-static void node_dynamic_setup(bNode *node);
-static void node_dynamic_exec_cb(void *data, bNode *node, bNodeStack **in, bNodeStack **out);
-static void node_dynamic_free_storage_cb(bNode *node);
-
-#ifdef WITH_PYTHON
-static PyObject *init_dynamicdict(void)
-{
-	PyObject *newscriptdict, *item;
-	PyGILState_STATE gilstate = PyGILState_Ensure();
-
-	newscriptdict= PyDict_New();
-
-	PyDict_SetItemString(newscriptdict, "__builtins__", PyEval_GetBuiltins());
-	item= PyString_FromString("__main__");
-	PyDict_SetItemString(newscriptdict, "__name__", item);
-	Py_DECREF(item);
-
-	PyGILState_Release(gilstate);
-
-	return newscriptdict;
-}
-#endif
-
-static bNodeType *node_dynamic_find_typeinfo(ListBase *list, ID *id)
-{
-	bNodeType *ntype = list->first;
-
-	while (ntype) {
-		if (ntype->type == NODE_DYNAMIC && ntype->id == id)
-			break;
-		ntype = ntype->next;
-	}
-
-	return ntype; /* NULL if doesn't exist */
-}
-
-static void node_dynamic_free_typeinfo_sockets(bNodeType *tinfo)
-{
-	bNodeSocketTemplate *sock;
-
-	if (!tinfo) return;
-
-	if (tinfo->inputs) {
-		sock = tinfo->inputs;
-		while (sock->type != -1) {
-			MEM_freeN(sock->name);
-			sock++;
-		}
-		MEM_freeN(tinfo->inputs);
-		tinfo->inputs = NULL;
-	}
-	if (tinfo->outputs) {
-		sock = tinfo->outputs;
-		while (sock->type != -1) {
-			MEM_freeN(sock->name);
-			sock++;
-		}
-		MEM_freeN(tinfo->outputs);
-		tinfo->outputs = NULL;
-	}
-}
-
-static void node_dynamic_free_typeinfo(bNodeType *tinfo)
-{
-	if (!tinfo) return;
-
-	node_dynamic_free_typeinfo_sockets(tinfo);
-
-	if (tinfo->name) { MEM_freeN(tinfo->name); }
-
-	MEM_freeN(tinfo);
-}
-
-static void node_dynamic_free_sockets(bNode *node)
-{
-	BLI_freelistN(&node->inputs);
-	BLI_freelistN(&node->outputs);
-}
-
-/* For now we just remove the socket links. It's the safest
- * route, since an update in the script may change completely the
- * inputs and outputs. Trying to recreate the node links would be
- * nicer for pynode authors, though. */
-static void node_dynamic_update_socket_links(bNode *node, bNodeTree *ntree)
-{
-	if (ntree) {
-		nodeVerifyType(ntree, node);
-	}
-	else {
-		Material *ma;
-
-		for (ma= G.main->mat.first; ma; ma= ma->id.next) {
-			if (ma->nodetree) {
-				bNode *nd;
-				for (nd= ma->nodetree->nodes.first; nd; nd = nd->next) {
-					if (nd == node) nodeVerifyType(ma->nodetree, node);
-				}
-			}
-		}
-	}
-}
-
-static void node_dynamic_free_storage_cb(bNode *node)
-{
-#ifdef WITH_PYTHON
-	NodeScriptDict *nsd;
-	PyObject *pydict;
-	BPy_Node *pynode;
-
-	if (!node->storage) return;
-	nsd = (NodeScriptDict *)(node->storage);
-	pydict = nsd->dict;
-	if (pydict) {
-		Py_DECREF(pydict);
-	}
-	pynode = nsd->node;
-	if (pynode) {
-		Py_DECREF(pynode);
-	}
-#endif
-	MEM_freeN(node->storage);
-	node->storage = NULL;
-}
-
-/* Disable pynode when its script fails */
-static void node_dynamic_disable(bNode *node)
-{
-	node->custom1 = 0;
-	node->custom1 = BSET(node->custom1, NODE_DYNAMIC_ERROR);
-}
-
-/* Disable all pynodes using the given text (script) id */
-static void node_dynamic_disable_all_by_id(ID *id)
-{
-#ifdef WITH_PYTHON
-	Material *ma; /* XXX hardcoded for shaders */
-
-	for (ma= G.main->mat.first; ma; ma= ma->id.next) {
-		if (ma->nodetree) {
-			bNode *nd;
-			bNodeTree *ntree = ma->nodetree;
-			for (nd= ntree->nodes.first; nd; nd= nd->next) {
-				if (nd->id == id) {
-					nd->custom1 = 0;
-					nd->custom1 = BSET(nd->custom1, NODE_DYNAMIC_ERROR);
-				}
-			}
-		}
-	}
-#endif
-}
-
-static void node_rem_socklist_links(bNodeTree *ntree, ListBase *lb)
-{
-	bNodeLink *link, *next;
-	bNodeSocket *sock;
-
-	if (!lb) return;
-
-	for (sock= lb->first; sock; sock= sock->next) {
-		for (link= ntree->links.first; link; link= next) {
-			next= link->next;
-			if (link->fromsock==sock || link->tosock==sock) {
-				nodeRemLink(ntree, link);
-			}
-		}
-	}
-}
-
-/* XXX hardcoded for shaders */
-static void node_dynamic_rem_all_links(bNodeType *tinfo)
-{
-	Material *ma;
-	int in, out;
-
-	in = tinfo->inputs ? 1 : 0;
-	out = tinfo->outputs ? 1 : 0;
-
-	if (!in && !out) return;
-
-	for (ma= G.main->mat.first; ma; ma= ma->id.next) {
-		if (ma->nodetree) {
-			bNode *nd;
-			bNodeTree *ntree = ma->nodetree;
-			for (nd= ntree->nodes.first; nd; nd= nd->next) {
-				if (nd->typeinfo == tinfo) {
-					if (in)
-						node_rem_socklist_links(ntree, &nd->inputs);
-					if (out)
-						node_rem_socklist_links(ntree, &nd->outputs);
-				}
-			}
-		}
-	}
-}
-
-/* node_dynamic_reset: clean a pynode, getting rid of all
- * data dynamically created for it. */
-static void node_dynamic_reset(bNode *node, int BKE_text_unlink)
-{
-	bNodeType *tinfo, *tinfo_default;
-	Material *ma;
-
-	tinfo = node->typeinfo;
-	tinfo_default = node_dynamic_find_typeinfo(&node_all_shaders, NULL);
-
-	if ((tinfo == tinfo_default) && BKE_text_unlink) {
-		ID *textID = node->id;
-	/* already at default (empty) state, which happens if this node's
-	 * script failed to parse at the first stage: definition. We're here
-	 * because its text was removed from Blender. */
-		for (ma= G.main->mat.first; ma; ma= ma->id.next) {
-			if (ma->nodetree) {
-				bNode *nd;
-				for (nd= ma->nodetree->nodes.first; nd; nd = nd->next) {
-					if (nd->id == textID) {
-						nd->id = NULL;
-						nd->custom1 = 0;
-						nd->custom1 = BSET(nd->custom1, NODE_DYNAMIC_NEW);
-						BLI_strncpy(nd->name, "Dynamic", 8);
-						return;
-					}
-				}
-			}
-		}
-	}
-
-	node_dynamic_rem_all_links(tinfo);
-	node_dynamic_free_typeinfo_sockets(tinfo);
-
-	/* reset all other XXX shader nodes sharing this typeinfo */
-	for (ma= G.main->mat.first; ma; ma= ma->id.next) {
-		if (ma->nodetree) {
-			bNode *nd;
-			for (nd= ma->nodetree->nodes.first; nd; nd = nd->next) {
-				if (nd->typeinfo == tinfo) {
-					node_dynamic_free_storage_cb(nd);
-					node_dynamic_free_sockets(nd);
-					//node_dynamic_update_socket_links(nd, ma->nodetree);
-					nd->typeinfo = tinfo_default;
-					if (BKE_text_unlink) {
-						nd->id = NULL;
-						nd->custom1 = 0;
-						nd->custom1 = BSET(nd->custom1, NODE_DYNAMIC_NEW);
-						BLI_strncpy(nd->name, "Dynamic", 8);
-					}
-				}
-			}
-		}
-	}
-
-	/* XXX hardcoded for shaders: */
-	if (tinfo->id) { BLI_remlink(&node_all_shaders, tinfo); }
-	node_dynamic_free_typeinfo(tinfo);
-}
-
-/* Special case of the above function: for working pynodes
- * that were saved on a .blend but fail for some reason when
- * the file is opened. We need this because pynodes are initialized
- * before G.main. */
-static void node_dynamic_reset_loaded(bNode *node)
-{
-	bNodeType *tinfo = node->typeinfo;
-
-	node_dynamic_rem_all_links(tinfo);
-	node_dynamic_free_typeinfo_sockets(tinfo);
-	node_dynamic_free_storage_cb(node);
-	/* XXX hardcoded for shaders: */
-	if (tinfo->id) { BLI_remlink(&node_all_shaders, tinfo); }
-
-	node_dynamic_free_typeinfo(tinfo);
-	node->typeinfo = node_dynamic_find_typeinfo(&node_all_shaders, NULL);
-}
-
-int nodeDynamicUnlinkText(ID *txtid)
-{
-	Material *ma;
-	bNode *nd;
-
-	/* find one node that uses this text */
-	for (ma= G.main->mat.first; ma; ma= ma->id.next) {
-		if (ma->nodetree) {
-			for (nd= ma->nodetree->nodes.first; nd; nd = nd->next) {
-				if ((nd->type == NODE_DYNAMIC) && (nd->id == txtid)) {
-					node_dynamic_reset(nd, 1); /* found, reset all */
-					return 1;
-				}
-			}
-		}
-	}
-	return 0; /* no pynodes used this text */
-}
-
-static void node_dynamic_pyerror_print(bNode *node)
-{
-#ifdef WITH_PYTHON
-	PyGILState_STATE gilstate = PyGILState_Ensure();
-
-	fprintf(stderr, "\nError in dynamic node script \"%s\":\n", node->name);
-	if (PyErr_Occurred()) {
-		PyErr_Print();
-		PyErr_Clear();
-		PySys_SetObject("last_traceback", NULL);
-	}
-	else { fprintf(stderr, "Not a valid dynamic node Python script.\n"); }
-
-	PyGILState_Release(gilstate);
-#endif
-}
-
-static void node_dynamic_register_type(bNode *node)
-{
-	nodeRegisterType(&node_all_shaders, node->typeinfo);
-	/* nodeRegisterType copied it to a new one, so we
-	 * free the typeinfo itself, but not what it
-	 * points to: */
-	MEM_freeN(node->typeinfo);
-	node->typeinfo = node_dynamic_find_typeinfo(&node_all_shaders, node->id);
-	MEM_freeN(node->typeinfo->name);
-	node->typeinfo->name = BLI_strdup(node->name);
-}
-
-#ifdef WITH_PYTHON
-/* node_dynamic_get_pynode:
- * Find the pynode definition from the script */
-static PyObject *node_dynamic_get_pynode(PyObject *dict)
-{
-	PyObject *key= NULL;
-	Py_ssize_t pos = 0;
-	PyObject *value = NULL;
-
-	/* script writer specified a node? */
-	value = PyDict_GetItemString(dict, "__node__");
-
-	if (value) {
-		if (PyObject_TypeCheck(value, &PyType_Type)) {
-			Py_INCREF(value);
-			return value;
-		}
-		else {
-			PyErr_SetString(PyExc_TypeError,
-				"expected class object derived from Scripted node");
-			return NULL;
-		}
-	}
-
-	/* case not, search for it in the script's global dictionary */
-	while (PyDict_Next(dict, &pos, &key, &value)) {
-		/* skip names we know belong to other available objects */
-		if (strcmp("Socket", PyString_AsString(key)) == 0)
-			continue;
-		else if (strcmp("Scripted", PyString_AsString(key)) == 0)
-			continue;
-		/* naive: we grab the first ob of type 'type': */
-		else if (PyObject_TypeCheck(value, &PyType_Type)) {
-			Py_INCREF(value);
-			return value;
-		}
-	}
-
-	PyErr_SetString(PyExc_TypeError,
-		"no PyNode definition found in the script!");
-	return NULL;
-}
-#endif /* WITH_PYTHON */
-
-static int node_dynamic_parse(struct bNode *node)
-{
-#ifndef WITH_PYTHON
-	return -1;
-#else
-	PyObject *dict= NULL;
-	PyObject *pynode_data= NULL;
-	PyObject *pynode= NULL;
-	PyObject *args= NULL;
-	NodeScriptDict *nsd = NULL;
-	PyObject *pyresult = NULL;
-	char *buf = NULL;
-	int is_valid_script = 0;
-	PyGILState_STATE gilstate;
-
-	if (!node->id || !node->storage)
-		return 0;
-
-	/* READY, no need to be here */
-	if (BTST(node->custom1, NODE_DYNAMIC_READY))
-		return 0;
-
-	/* for threading */
-	gilstate = PyGILState_Ensure();
-
-	nsd = (NodeScriptDict *)node->storage;
-
-	dict = (PyObject *)(nsd->dict);
-	buf = txt_to_buf((Text *)node->id);
-
-	pyresult = PyRun_String(buf, Py_file_input, dict, dict);
-
-	MEM_freeN(buf);
-
-	if (!pyresult) {
-		if (BTST(node->custom1, NODE_DYNAMIC_LOADED)) {
-			node_dynamic_disable(node);
-		}
-		else {
-		node_dynamic_disable_all_by_id(node->id);
-		}
-		node_dynamic_pyerror_print(node);
-		PyGILState_Release(gilstate);
-		return -1;
-	}
-
-	Py_DECREF(pyresult);
-
-	pynode_data = node_dynamic_get_pynode(dict);
-
-	if (pynode_data) {
-		BPy_NodeSocketLists *socklists = Node_CreateSocketLists(node);
-
-		args = Py_BuildValue("(O)", socklists);
-
-		/* init it to get the input and output sockets */
-		pynode = PyObject_Call(pynode_data, args, NULL);
-
-		Py_DECREF(pynode_data);
-		Py_DECREF(socklists);
-		Py_DECREF(args);
-
-		if (!PyErr_Occurred() && pynode && pytype_is_pynode(pynode)) {
-			InitNode((BPy_Node *)(pynode), node);
-			nsd->node = pynode;
-			node->typeinfo->execfunc = node_dynamic_exec_cb;
-			is_valid_script = 1;
-
-			/* for NEW, LOADED, REPARSE */
-			if (BNTST(node->custom1, NODE_DYNAMIC_ADDEXIST)) {
-				node->typeinfo->pydict = dict;
-				node->typeinfo->pynode = pynode;
-				node->typeinfo->id = node->id;
-				if (BNTST(node->custom1, NODE_DYNAMIC_LOADED))
-					nodeAddSockets(node, node->typeinfo);
-				if (BNTST(node->custom1, NODE_DYNAMIC_REPARSE))
-					node_dynamic_register_type(node);
-			}
-
-			node->custom1 = 0;
-			node->custom1 = BSET(node->custom1, NODE_DYNAMIC_READY);
-		}
-	}
-
-	PyGILState_Release(gilstate);
-
-	if (!is_valid_script) { /* not a valid pynode script */
-		node_dynamic_disable_all_by_id(node->id);
-		node_dynamic_pyerror_print(node);
-		return -1;
-	}
-
-	return 0;
-#endif
-}
-
-/* node_dynamic_setup: prepare for execution (state: NODE_DYNAMIC_READY)
- * pynodes already linked to a script (node->id != NULL). */
-static void node_dynamic_setup(bNode *node)
-{
-#ifdef WITH_PYTHON
-	NodeScriptDict *nsd = NULL;
-	bNodeTree *nodetree = NULL;
-	bNodeType *ntype = NULL;
-	PyGILState_STATE gilstate;
-
-	/* Possible cases:
-	 * NEW
-	 * ADDEXIST
-	 * LOADED
-	 * REPARSE
-	 * ERROR
-	 * READY
-	 */
-
-	/* NEW, but not linked to a script: link default (empty) typeinfo */
-	if (!node->id) {
-		node->typeinfo = node_dynamic_find_typeinfo(&node_all_shaders,
-				NULL);
-		return;
-	}
-
-	/* READY, no need to be here */
-	if (BTST(node->custom1, NODE_DYNAMIC_READY))
-		return;
-
-	gilstate = PyGILState_Ensure();
-
-	/* ERROR, reset to (empty) defaults */
-	if (BCLR(node->custom1, NODE_DYNAMIC_ERROR) == 0) {
-		node_dynamic_reset(node, 0);
-		PyGILState_Release(gilstate);
-		return;
-	}
-
-	/* User asked to update this pynode, prepare it for reparsing */
-	if (BTST(node->custom1, NODE_DYNAMIC_REPARSE)) {
-		int needs_parsing = 1;
-
-		node->custom1 = BSET(node->custom1, NODE_DYNAMIC_NEW);
-
-		if (BTST(node->custom1, NODE_DYNAMIC_ERROR)) {
-			node->custom1 = BCLR(node->custom1, NODE_DYNAMIC_REPARSE);
-			ntype = node_dynamic_find_typeinfo(&node_all_shaders, node->id);
-
-			if (ntype) {
-				node->typeinfo = ntype;
-				node->custom1 = BSET(node->custom1, NODE_DYNAMIC_ADDEXIST);
-				node->custom1 = BCLR(node->custom1, NODE_DYNAMIC_ERROR);
-				needs_parsing = 0;
-			}
-			else { nodeMakeDynamicType(node); }
-
-		}
-		else {
-			node_dynamic_rem_all_links(node->typeinfo);
-			node_dynamic_free_typeinfo_sockets(node->typeinfo);
-			node_dynamic_update_socket_links(node, NULL);
-			node_dynamic_free_storage_cb(node);
-		}
-
-		if (needs_parsing) {
-			nsd = MEM_callocN(sizeof(NodeScriptDict), "node script dictionary");
-			nsd->dict = init_dynamicdict();
-			node->storage = nsd;
-			/* prepared, now reparse: */
-			node_dynamic_parse(node);
-			PyGILState_Release(gilstate);
-			return;
-		}
-	}
-	else if (BTST(node->custom1, NODE_DYNAMIC_LOADED)) {
-		/* when loading from a .blend we don't have G.main yet, so we
-		 * quickly abuse node->storage in ntreeInitTypes (node.c) to have
-		 * our nodetree ptr (needed if a pynode script that worked before
-		 * saving the .blend for some reason fails upon loading): */
-		nodetree = (bNodeTree *)node->storage;
-		node->storage = NULL;
-	}
-
-	if (node->storage)
-		fprintf(stderr, "\nDEBUG: PYNODES ERROR: non NULL node->storage in node_dynamic_setup()\n");
-
-	nsd = MEM_callocN(sizeof(NodeScriptDict), "node script dictionary");
-	node->storage = nsd;
-	
-	/* NEW, LOADED or REPARSE */
-	if (BNTST(node->custom1, NODE_DYNAMIC_ADDEXIST)) {
-		/* check if there's already a bNodeType linked to this script */
-		/* (XXX hardcoded for shader nodes for now) */
-		ntype = node_dynamic_find_typeinfo(&node_all_shaders, node->id);
-
-		if (ntype) { /* if so, reuse it */
-			node->typeinfo = ntype;
-			/* so this is actually an ADDEXIST type */
-			node->custom1 = BSET(node->custom1, NODE_DYNAMIC_ADDEXIST);
-		}
-		else { /* create bNodeType for this pynode */
-			nodeMakeDynamicType(node);
-			nsd->dict = init_dynamicdict();
-			if ((node_dynamic_parse(node) == -1) && nodetree) {
-				node_dynamic_reset_loaded(node);
-			}
-			PyGILState_Release(gilstate);
-			return;
-		}
-	}
-
-	/* ADDEXIST: new pynode linked to an already registered dynamic type,
-	 * we just reuse existing py dict and pynode */
-	nsd->dict = node->typeinfo->pydict;
-	nsd->node = node->typeinfo->pynode;
-
-	Py_INCREF((PyObject *)(nsd->dict));
-	Py_INCREF((PyObject *)(nsd->node));
-
-	if (BTST(node->custom1, NODE_DYNAMIC_NEW)) {
-		nodeAddSockets(node, node->typeinfo);
-		node->custom1 = BCLR(node->custom1, NODE_DYNAMIC_NEW);
-	}
-
-	node->custom1 = BCLR(node->custom1, NODE_DYNAMIC_ADDEXIST);
-	node->custom1 = BSET(node->custom1, NODE_DYNAMIC_READY);
-
-	PyGILState_Release(gilstate);
-#endif /* WITH_PYTHON */
-	return;
-}
-
-/* node_dynamic_init_cb callback: called when a pynode is created.
- * The pynode type is passed via node->custom2. It can be:
- *  0: for loaded empty nodes
- *  NODE_DYNAMIC_MENU: for the default Dynamic node type
- *  > NODE_DYNAMIC_MENU: for the new types defined by scripts
- */
-static void node_dynamic_init_cb(bNode *node)
-{
-	int type = node->custom2;
-
-	node->custom2 = 0;
-
-	if (type >= NODE_DYNAMIC_MENU) {
-		node->custom1 = 0;
-
-		if (type == NODE_DYNAMIC_MENU) {
-			node->custom1 = BSET(node->custom1, NODE_DYNAMIC_NEW);
-			return;
-		}
-
-		node->custom1 = BSET(node->custom1, NODE_DYNAMIC_ADDEXIST);
-		node->id = node->typeinfo->id;
-	}
-
-	node_dynamic_setup(node);
-}
-
-/* node_dynamic_copy_cb: pynode copy callback */
-static void node_dynamic_copy_cb(bNode *orig_node, bNode *new_node)
-{
-#ifndef WITH_PYTHON
-	return;
-#else
-	NodeScriptDict *nsd;
-	PyGILState_STATE gilstate;
-
-	if (!orig_node->storage) return;
-
-	nsd = (NodeScriptDict *)(orig_node->storage);
-	new_node->storage = MEM_dupallocN(orig_node->storage);
-
-	gilstate = PyGILState_Ensure();
-
-	if (nsd->node)
-		Py_INCREF((PyObject *)(nsd->node));
-	if (nsd->dict)
-		Py_INCREF((PyObject *)(nsd->dict));
-
-	PyGILState_Release(gilstate);
-#endif
-}
-
-/* node_dynamic_exec_cb: the execution callback called per pixel
- * during rendering. */
-static void node_dynamic_exec_cb(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
-{
-#ifndef WITH_PYTHON
-	return;
-#else
-	BPy_Node *mynode = NULL;
-	NodeScriptDict *nsd = NULL;
-	PyObject *pyresult = NULL;
-	PyObject *args = NULL;
-	ShadeInput *shi;
-	PyGILState_STATE gilstate;
-
-	if (!node->id)
-		return;
-
-#if 0
-	if (G.scene->r.threads > 1)
-		return;
-#endif
-
-	if (BTST2(node->custom1, NODE_DYNAMIC_NEW, NODE_DYNAMIC_REPARSE)) {
-		node_dynamic_setup(node);
-		return;
-	}
-
-	if (BTST(node->custom1, NODE_DYNAMIC_ERROR)) {
-		if (node->storage) node_dynamic_setup(node);
-		return;
-	}
-
-	if (BTST(node->custom1, NODE_DYNAMIC_READY)) {
-		nsd = (NodeScriptDict *)node->storage;
-		mynode = (BPy_Node *)(nsd->node);
-
-
-		if (mynode && PyCallable_Check((PyObject *)mynode)) {
-
-			gilstate = PyGILState_Ensure();
-
-			mynode->node = node;
-			shi = ((ShaderCallData *)data)->shi;
-
-			Node_SetStack(mynode, in, NODE_INPUTSTACK);
-			Node_SetStack(mynode, out, NODE_OUTPUTSTACK);
-			Node_SetShi(mynode, shi);
-
-			args=Py_BuildValue("()");
-			pyresult= PyObject_Call((PyObject *)mynode, args, NULL);
-			Py_DECREF(args);
-
-			if (!pyresult) {
-				PyGILState_Release(gilstate);
-				node_dynamic_disable_all_by_id(node->id);
-				node_dynamic_pyerror_print(node);
-				node_dynamic_setup(node);
-				return;
-			}
-			Py_DECREF(pyresult);
-			PyGILState_Release(gilstate);
-		}
-	}
-#endif
-}
-
-void register_node_type_sh_dynamic(bNodeTreeType *ttype)
-{
-	static bNodeType ntype;
-	
-	node_type_base(ttype, &ntype, NODE_DYNAMIC, "Dynamic", NODE_CLASS_OP_DYNAMIC, NODE_OPTIONS, NULL, NULL);
-	node_type_compatibility(&ntype, NODE_OLD_SHADING);
-	node_type_size(&ntype, 150, 60, 300);
-	node_type_init(&ntype, node_dynamic_init_cb);
-	node_type_storage(&ntype, "NodeScriptDict", node_dynamic_free_storage_cb, node_dynamic_copy_cb);
-	node_type_exec(&ntype, node_dynamic_exec_cb);
-	
-	nodeRegisterType(ttype, &ntype);
-}
-
-#else
-
-void register_node_type_sh_dynamic(bNodeTreeType *ttype)
-{
-	static bNodeType ntype;
-	
-	node_type_base(ttype, &ntype, NODE_DYNAMIC, "Dynamic", NODE_CLASS_OP_DYNAMIC, 0);
-	node_type_compatibility(&ntype, NODE_OLD_SHADING);
-	
-	nodeRegisterType(ttype, &ntype);
-}
-
-#endif
diff --git a/source/blender/nodes/shader/nodes/node_shader_emission.c b/source/blender/nodes/shader/nodes/node_shader_emission.c
index 9eb8fc98c69..4854d887592 100644
--- a/source/blender/nodes/shader/nodes/node_shader_emission.c
+++ b/source/blender/nodes/shader/nodes/node_shader_emission.c
@@ -30,13 +30,13 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_emission_in[]= {
-	{	SOCK_RGBA, 1, "Color",		0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Strength",	1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000000.0f},
+	{	SOCK_RGBA, 1, N_("Color"),		0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Strength"),	1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000000.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_emission_out[]= {
-	{	SOCK_SHADER, 0, "Emission"},
+	{	SOCK_SHADER, 0, N_("Emission")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_fresnel.c b/source/blender/nodes/shader/nodes/node_shader_fresnel.c
index 8e5350c2167..610a2149011 100644
--- a/source/blender/nodes/shader/nodes/node_shader_fresnel.c
+++ b/source/blender/nodes/shader/nodes/node_shader_fresnel.c
@@ -29,12 +29,12 @@
 
 /* **************** Fresnel ******************** */
 static bNodeSocketTemplate sh_node_fresnel_in[]= {
-	{	SOCK_FLOAT, 1, "IOR",	1.45f, 0.0f, 0.0f, 0.0f, 1.0f, 1000.0f},
+	{	SOCK_FLOAT, 1, N_("IOR"),	1.45f, 0.0f, 0.0f, 0.0f, 1.0f, 1000.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_fresnel_out[]= {
-	{	SOCK_FLOAT, 0, "Fac",	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Fac"),	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_gamma.c b/source/blender/nodes/shader/nodes/node_shader_gamma.c
index e2907f5ba91..526868f73d3 100644
--- a/source/blender/nodes/shader/nodes/node_shader_gamma.c
+++ b/source/blender/nodes/shader/nodes/node_shader_gamma.c
@@ -31,13 +31,13 @@
 /* **************** Gamma Tools  ******************** */
   
 static bNodeSocketTemplate sh_node_gamma_in[]= {
-	{	SOCK_RGBA, 1, "Color",			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Gamma",			1.0f, 0.0f, 0.0f, 0.0f, 0.001f, 10.0f, PROP_UNSIGNED},
+	{	SOCK_RGBA, 1, N_("Color"),			1.0f, 1.0f, 1.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Gamma"),			1.0f, 0.0f, 0.0f, 0.0f, 0.001f, 10.0f, PROP_UNSIGNED},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_gamma_out[]= {
-	{	SOCK_RGBA, 0, "Color"},
+	{	SOCK_RGBA, 0, N_("Color")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_geom.c b/source/blender/nodes/shader/nodes/node_shader_geom.c
index 5e302390329..aa108271ec3 100644
--- a/source/blender/nodes/shader/nodes/node_shader_geom.c
+++ b/source/blender/nodes/shader/nodes/node_shader_geom.c
@@ -38,15 +38,15 @@
 
 /* output socket type definition */
 static bNodeSocketTemplate sh_node_geom_out[]= {
-	{	SOCK_VECTOR, 0, "Global"},
-	{	SOCK_VECTOR, 0, "Local"},
-	{	SOCK_VECTOR, 0, "View"},
-	{	SOCK_VECTOR, 0, "Orco"},
-	{	SOCK_VECTOR, 0, "UV"},
-	{	SOCK_VECTOR, 0, "Normal"},
-	{	SOCK_RGBA,   0, "Vertex Color"},
-	{	SOCK_FLOAT,   0, "Vertex Alpha"},
-	{	SOCK_FLOAT,   0, "Front/Back"},
+	{	SOCK_VECTOR, 0, N_("Global")},
+	{	SOCK_VECTOR, 0, N_("Local")},
+	{	SOCK_VECTOR, 0, N_("View")},
+	{	SOCK_VECTOR, 0, N_("Orco")},
+	{	SOCK_VECTOR, 0, N_("UV")},
+	{	SOCK_VECTOR, 0, N_("Normal")},
+	{	SOCK_RGBA,   0, N_("Vertex Color")},
+	{	SOCK_FLOAT,   0, N_("Vertex Alpha")},
+	{	SOCK_FLOAT,   0, N_("Front/Back")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_geometry.c b/source/blender/nodes/shader/nodes/node_shader_geometry.c
index 6b576b0c0d1..2ebd93218d6 100644
--- a/source/blender/nodes/shader/nodes/node_shader_geometry.c
+++ b/source/blender/nodes/shader/nodes/node_shader_geometry.c
@@ -30,13 +30,13 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_geometry_out[]= {
-	{	SOCK_VECTOR, 0, "Position",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_VECTOR, 0, "Normal",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_VECTOR, 0, "Tangent",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_VECTOR, 0, "True Normal",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_VECTOR, 0, "Incoming",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_VECTOR, 0, "Parametric",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT,  0, "Backfacing",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_VECTOR, 0, N_("Position"),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_VECTOR, 0, N_("Normal"),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_VECTOR, 0, N_("Tangent"),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_VECTOR, 0, N_("True Normal"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_VECTOR, 0, N_("Incoming"),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_VECTOR, 0, N_("Parametric"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT,  0, N_("Backfacing"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_holdout.c b/source/blender/nodes/shader/nodes/node_shader_holdout.c
index 81dceafe21f..dbd4ed8ab67 100644
--- a/source/blender/nodes/shader/nodes/node_shader_holdout.c
+++ b/source/blender/nodes/shader/nodes/node_shader_holdout.c
@@ -34,7 +34,7 @@ static bNodeSocketTemplate sh_node_holdout_in[]= {
 };
 
 static bNodeSocketTemplate sh_node_holdout_out[]= {
-	{	SOCK_SHADER, 0, "Holdout"},
+	{	SOCK_SHADER, 0, N_("Holdout")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c b/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
index 12b97e65be8..b07650e33c0 100644
--- a/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
+++ b/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
@@ -35,15 +35,15 @@
 
 /* **************** Hue Saturation ******************** */
 static bNodeSocketTemplate sh_node_hue_sat_in[]= {
-	{	SOCK_FLOAT, 1, "Hue",			0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, "Saturation",		1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 2.0f, PROP_FACTOR},
-	{	SOCK_FLOAT, 1, "Value",			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 2.0f, PROP_FACTOR},
-	{	SOCK_FLOAT, 1, "Fac",			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_RGBA, 1, "Color",			0.8f, 0.8f, 0.8f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Hue"),			0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
+	{	SOCK_FLOAT, 1, N_("Saturation"),		1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 2.0f, PROP_FACTOR},
+	{	SOCK_FLOAT, 1, N_("Value"),			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 2.0f, PROP_FACTOR},
+	{	SOCK_FLOAT, 1, N_("Fac"),			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_RGBA, 1, N_("Color"),			0.8f, 0.8f, 0.8f, 1.0f},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate sh_node_hue_sat_out[]= {
-	{	SOCK_RGBA, 0, "Color"},
+	{	SOCK_RGBA, 0, N_("Color")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_invert.c b/source/blender/nodes/shader/nodes/node_shader_invert.c
index 2c20df2274d..ef592a7e2ec 100644
--- a/source/blender/nodes/shader/nodes/node_shader_invert.c
+++ b/source/blender/nodes/shader/nodes/node_shader_invert.c
@@ -36,13 +36,13 @@
 
 /* **************** INVERT ******************** */ 
 static bNodeSocketTemplate sh_node_invert_in[]= { 
-	{ SOCK_FLOAT, 1, "Fac", 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR}, 
-	{ SOCK_RGBA, 1, "Color", 0.0f, 0.0f, 0.0f, 1.0f}, 
+	{ SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR}, 
+	{ SOCK_RGBA, 1, N_("Color"), 0.0f, 0.0f, 0.0f, 1.0f}, 
 	{ -1, 0, "" } 
 };
 
 static bNodeSocketTemplate sh_node_invert_out[]= { 
-	{ SOCK_RGBA, 0, "Color"}, 
+	{ SOCK_RGBA, 0, N_("Color")}, 
 	{ -1, 0, "" } 
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_layer_weight.c b/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
index bcd7fb8639d..6eacea10b5b 100644
--- a/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
+++ b/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
@@ -30,13 +30,13 @@
 /* **************** Layer Weight ******************** */
 
 static bNodeSocketTemplate sh_node_layer_weight_in[]= {
-	{	SOCK_FLOAT, 1, "Blend",		0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Blend"),		0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_layer_weight_out[]= {
-	{	SOCK_FLOAT, 0, "Fresnel",	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Facing",	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Fresnel"),	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Facing"),	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_light_falloff.c b/source/blender/nodes/shader/nodes/node_shader_light_falloff.c
index 8ee0f0adef6..aab5fa8060d 100644
--- a/source/blender/nodes/shader/nodes/node_shader_light_falloff.c
+++ b/source/blender/nodes/shader/nodes/node_shader_light_falloff.c
@@ -30,17 +30,17 @@
 /* **************** INPUT ********************* */
 
 static bNodeSocketTemplate sh_node_light_falloff_in[]= {
-	{	SOCK_FLOAT, 0, "Strength",			100.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Smooth",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Strength"),			100.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000000.0f},
+	{	SOCK_FLOAT, 0, N_("Smooth"),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
 	{	-1, 0, ""	}
 };
 
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_light_falloff_out[]= {
-	{	SOCK_FLOAT, 0, "Quadratic",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Linear",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Constant",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Quadratic"),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Linear"),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Constant"),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_light_path.c b/source/blender/nodes/shader/nodes/node_shader_light_path.c
index 5ebbd63a5a1..264b1390688 100644
--- a/source/blender/nodes/shader/nodes/node_shader_light_path.c
+++ b/source/blender/nodes/shader/nodes/node_shader_light_path.c
@@ -30,14 +30,14 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_light_path_out[]= {
-	{	SOCK_FLOAT, 0, "Is Camera Ray",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Is Shadow Ray",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Is Diffuse Ray",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Is Glossy Ray",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Is Singular Ray",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Is Reflection Ray",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Is Transmission Ray",	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Ray Length",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Is Camera Ray"),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Is Shadow Ray"),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Is Diffuse Ray"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Is Glossy Ray"),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Is Singular Ray"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Is Reflection Ray"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Is Transmission Ray"),	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Ray Length"),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_mapping.c b/source/blender/nodes/shader/nodes/node_shader_mapping.c
index b7b080fa2df..c260cc421b3 100644
--- a/source/blender/nodes/shader/nodes/node_shader_mapping.c
+++ b/source/blender/nodes/shader/nodes/node_shader_mapping.c
@@ -34,12 +34,12 @@
 
 /* **************** MAPPING  ******************** */
 static bNodeSocketTemplate sh_node_mapping_in[]= {
-	{	SOCK_VECTOR, 1, "Vector",	0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_NONE},
+	{	SOCK_VECTOR, 1, N_("Vector"),	0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_NONE},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_mapping_out[]= {
-	{	SOCK_VECTOR, 0, "Vector"},
+	{	SOCK_VECTOR, 0, N_("Vector")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_material.c b/source/blender/nodes/shader/nodes/node_shader_material.c
index 279bbfa8d1b..758660f7d0c 100644
--- a/source/blender/nodes/shader/nodes/node_shader_material.c
+++ b/source/blender/nodes/shader/nodes/node_shader_material.c
@@ -35,44 +35,44 @@
 /* **************** MATERIAL ******************** */
 
 static bNodeSocketTemplate sh_node_material_in[]= {
-	{	SOCK_RGBA, 1, "Color",		0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 1, "Spec",		0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Refl",		0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_VECTOR, 1, "Normal",	0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_DIRECTION},
+	{	SOCK_RGBA, 1, N_("Color"),		0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Spec"),		0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Refl"),		0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_VECTOR, 1, N_("Normal"),	0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_DIRECTION},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_material_out[]= {
-	{	SOCK_RGBA, 0, "Color"},
-	{	SOCK_FLOAT, 0, "Alpha"},
-	{	SOCK_VECTOR, 0, "Normal"},
+	{	SOCK_RGBA, 0, N_("Color")},
+	{	SOCK_FLOAT, 0, N_("Alpha")},
+	{	SOCK_VECTOR, 0, N_("Normal")},
 	{	-1, 0, ""	}
 };
 
 /* **************** EXTENDED MATERIAL ******************** */
 
 static bNodeSocketTemplate sh_node_material_ext_in[]= {
-	{	SOCK_RGBA, 1, "Color",		0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 1, "Spec",		0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Refl",		0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_VECTOR, 1, "Normal",	0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_DIRECTION},
-	{	SOCK_RGBA, 1, "Mirror",		0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Ambient",	0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_FLOAT, 1, "Emit",		0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_UNSIGNED},
-	{	SOCK_FLOAT, 1, "SpecTra",	0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_FLOAT, 1, "Ray Mirror",	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_FLOAT, 1, "Alpha",		0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_UNSIGNED},
-	{	SOCK_FLOAT, 1, "Translucency",	0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_RGBA, 1, N_("Color"),		0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Spec"),		0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Refl"),		0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_VECTOR, 1, N_("Normal"),	0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_DIRECTION},
+	{	SOCK_RGBA, 1, N_("Mirror"),		0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Ambient"),	0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_FLOAT, 1, N_("Emit"),		0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_UNSIGNED},
+	{	SOCK_FLOAT, 1, N_("SpecTra"),	0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_FLOAT, 1, N_("Ray Mirror"),	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_FLOAT, 1, N_("Alpha"),		0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_UNSIGNED},
+	{	SOCK_FLOAT, 1, N_("Translucency"),	0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_material_ext_out[]= {
-	{	SOCK_RGBA, 0, "Color"},
-	{	SOCK_FLOAT, 0, "Alpha"},
-	{	SOCK_VECTOR, 0, "Normal"},
-	{	SOCK_RGBA, 0, "Diffuse"},
-	{	SOCK_RGBA, 0, "Spec"},
-	{	SOCK_RGBA, 0, "AO"},
+	{	SOCK_RGBA, 0, N_("Color")},
+	{	SOCK_FLOAT, 0, N_("Alpha")},
+	{	SOCK_VECTOR, 0, N_("Normal")},
+	{	SOCK_RGBA, 0, N_("Diffuse")},
+	{	SOCK_RGBA, 0, N_("Spec")},
+	{	SOCK_RGBA, 0, N_("AO")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_math.c b/source/blender/nodes/shader/nodes/node_shader_math.c
index db2b57ab51b..c112ae1d448 100644
--- a/source/blender/nodes/shader/nodes/node_shader_math.c
+++ b/source/blender/nodes/shader/nodes/node_shader_math.c
@@ -35,13 +35,13 @@
 
 /* **************** SCALAR MATH ******************** */ 
 static bNodeSocketTemplate sh_node_math_in[]= { 
-	{ SOCK_FLOAT, 1, "Value", 0.5f, 0.5f, 0.5f, 1.0f, -10000.0f, 10000.0f, PROP_NONE}, 
-	{ SOCK_FLOAT, 1, "Value", 0.5f, 0.5f, 0.5f, 1.0f, -10000.0f, 10000.0f, PROP_NONE}, 
+	{ SOCK_FLOAT, 1, N_("Value"), 0.5f, 0.5f, 0.5f, 1.0f, -10000.0f, 10000.0f, PROP_NONE}, 
+	{ SOCK_FLOAT, 1, N_("Value"), 0.5f, 0.5f, 0.5f, 1.0f, -10000.0f, 10000.0f, PROP_NONE}, 
 	{ -1, 0, "" } 
 };
 
 static bNodeSocketTemplate sh_node_math_out[]= { 
-	{ SOCK_FLOAT, 0, "Value"}, 
+	{ SOCK_FLOAT, 0, N_("Value")}, 
 	{ -1, 0, "" } 
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_mixRgb.c b/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
index 4a740a2cfdd..53c1387ca1a 100644
--- a/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
+++ b/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
@@ -34,13 +34,13 @@
 
 /* **************** MIX RGB ******************** */
 static bNodeSocketTemplate sh_node_mix_rgb_in[]= {
-	{	SOCK_FLOAT, 1, "Fac",			0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_RGBA, 1, "Color1",			0.5f, 0.5f, 0.5f, 1.0f},
-	{	SOCK_RGBA, 1, "Color2",			0.5f, 0.5f, 0.5f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Fac"),			0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_RGBA, 1, N_("Color1"),			0.5f, 0.5f, 0.5f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Color2"),			0.5f, 0.5f, 0.5f, 1.0f},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate sh_node_mix_rgb_out[]= {
-	{	SOCK_RGBA, 0, "Color"},
+	{	SOCK_RGBA, 0, N_("Color")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_mix_shader.c b/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
index 43dde9e5b91..80ee1a8499d 100644
--- a/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
+++ b/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
@@ -30,14 +30,14 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_mix_shader_in[]= {
-	{	SOCK_FLOAT,  1, "Fac",		0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_SHADER, 1, "Shader"},
-	{	SOCK_SHADER, 1, "Shader"},
+	{	SOCK_FLOAT,  1, N_("Fac"),		0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_SHADER, 1, N_("Shader")},
+	{	SOCK_SHADER, 1, N_("Shader")},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_mix_shader_out[]= {
-	{	SOCK_SHADER, 0, "Shader"},
+	{	SOCK_SHADER, 0, N_("Shader")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_normal.c b/source/blender/nodes/shader/nodes/node_shader_normal.c
index 34213558317..bb0a85417d9 100644
--- a/source/blender/nodes/shader/nodes/node_shader_normal.c
+++ b/source/blender/nodes/shader/nodes/node_shader_normal.c
@@ -34,13 +34,13 @@
 
 /* **************** NORMAL  ******************** */
 static bNodeSocketTemplate sh_node_normal_in[]= {
-	{	SOCK_VECTOR, 1, "Normal",	0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_NONE},
+	{	SOCK_VECTOR, 1, N_("Normal"),	0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_NONE},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_normal_out[]= {
-	{	SOCK_VECTOR, 0, "Normal"},
-	{	SOCK_FLOAT, 0, "Dot"},
+	{	SOCK_VECTOR, 0, N_("Normal")},
+	{	SOCK_FLOAT, 0, N_("Dot")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_object_info.c b/source/blender/nodes/shader/nodes/node_shader_object_info.c
index ee356dbb3b3..1cafa01ecec 100644
--- a/source/blender/nodes/shader/nodes/node_shader_object_info.c
+++ b/source/blender/nodes/shader/nodes/node_shader_object_info.c
@@ -30,10 +30,10 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_object_info_out[]= {
-	{	SOCK_VECTOR, 0, "Location",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT,  0, "Object Index",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT,  0, "Material Index",	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT,  0, "Random",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_VECTOR, 0, N_("Location"),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT,  0, N_("Object Index"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT,  0, N_("Material Index"),	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT,  0, N_("Random"),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_output.c b/source/blender/nodes/shader/nodes/node_shader_output.c
index 14a115a8353..4434054abae 100644
--- a/source/blender/nodes/shader/nodes/node_shader_output.c
+++ b/source/blender/nodes/shader/nodes/node_shader_output.c
@@ -34,8 +34,8 @@
 
 /* **************** OUTPUT ******************** */
 static bNodeSocketTemplate sh_node_output_in[]= {
-	{	SOCK_RGBA, 1, "Color",		0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Alpha",		1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_RGBA, 1, N_("Color"),		0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Alpha"),		1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_output_lamp.c b/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
index f6d5e789b3f..eb7208302fe 100644
--- a/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
+++ b/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
@@ -30,7 +30,7 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_output_lamp_in[]= {
-	{	SOCK_SHADER, 1, "Surface",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_SHADER, 1, N_("Surface"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_output_material.c b/source/blender/nodes/shader/nodes/node_shader_output_material.c
index 13d8ff1c23f..e81744c44bd 100644
--- a/source/blender/nodes/shader/nodes/node_shader_output_material.c
+++ b/source/blender/nodes/shader/nodes/node_shader_output_material.c
@@ -30,9 +30,9 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_output_material_in[]= {
-	{	SOCK_SHADER, 1, "Surface"},
-	{	SOCK_SHADER, 1, "Volume"},
-	{	SOCK_FLOAT, 1, "Displacement",	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
+	{	SOCK_SHADER, 1, N_("Surface")},
+	{	SOCK_SHADER, 1, N_("Volume")},
+	{	SOCK_FLOAT, 1, N_("Displacement"),	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_output_world.c b/source/blender/nodes/shader/nodes/node_shader_output_world.c
index 5063d0b50aa..3a931c2af53 100644
--- a/source/blender/nodes/shader/nodes/node_shader_output_world.c
+++ b/source/blender/nodes/shader/nodes/node_shader_output_world.c
@@ -30,8 +30,8 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_output_world_in[]= {
-	{	SOCK_SHADER, 1, "Surface",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_SHADER, 1, "Volume",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_SHADER, 1, N_("Surface"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_SHADER, 1, N_("Volume"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_particle_info.c b/source/blender/nodes/shader/nodes/node_shader_particle_info.c
new file mode 100644
index 00000000000..6456742e22b
--- /dev/null
+++ b/source/blender/nodes/shader/nodes/node_shader_particle_info.c
@@ -0,0 +1,48 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "../node_shader_util.h"
+
+static bNodeSocketTemplate outputs[] = {
+        { SOCK_FLOAT,  0, "Age" },
+        { SOCK_FLOAT,  0, "Lifetime" },
+        { -1, 0, "" }
+};
+
+/* node type definition */
+void register_node_type_sh_particle_info(bNodeTreeType *ttype)
+{
+        static bNodeType ntype;
+
+        node_type_base(ttype, &ntype, SH_NODE_PARTICLE_INFO, "Particle Info", NODE_CLASS_INPUT, 0);
+        node_type_compatibility(&ntype, NODE_NEW_SHADING);
+        node_type_socket_templates(&ntype, NULL, outputs);
+        node_type_size(&ntype, 150, 60, 200);
+
+        nodeRegisterType(ttype, &ntype);
+}
+
diff --git a/source/blender/nodes/shader/nodes/node_shader_rgb.c b/source/blender/nodes/shader/nodes/node_shader_rgb.c
index d0c52035f96..5a19c61fe92 100644
--- a/source/blender/nodes/shader/nodes/node_shader_rgb.c
+++ b/source/blender/nodes/shader/nodes/node_shader_rgb.c
@@ -34,7 +34,7 @@
 
 /* **************** RGB ******************** */
 static bNodeSocketTemplate sh_node_rgb_out[]= {
-	{	SOCK_RGBA, 0, "Color"},
+	{	SOCK_RGBA, 0, N_("Color")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c b/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
index bd4f084d156..55f37b666e7 100644
--- a/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
+++ b/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
@@ -34,13 +34,13 @@
 
 /* **************** SEPARATE RGBA ******************** */
 static bNodeSocketTemplate sh_node_seprgb_in[]= {
-	{	SOCK_RGBA, 1, "Image",			0.8f, 0.8f, 0.8f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Image"),			0.8f, 0.8f, 0.8f, 1.0f},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate sh_node_seprgb_out[]= {
-	{	SOCK_FLOAT, 0, "R"},
-	{	SOCK_FLOAT, 0, "G"},
-	{	SOCK_FLOAT, 0, "B"},
+	{	SOCK_FLOAT, 0, N_("R")},
+	{	SOCK_FLOAT, 0, N_("G")},
+	{	SOCK_FLOAT, 0, N_("B")},
 	{	-1, 0, ""	}
 };
 
@@ -74,13 +74,13 @@ void register_node_type_sh_seprgb(bNodeTreeType *ttype)
 
 /* **************** COMBINE RGB ******************** */
 static bNodeSocketTemplate sh_node_combrgb_in[]= {
-	{	SOCK_FLOAT, 1, "R",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_UNSIGNED},
-	{	SOCK_FLOAT, 1, "G",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_UNSIGNED},
-	{	SOCK_FLOAT, 1, "B",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_UNSIGNED},
+	{	SOCK_FLOAT, 1, N_("R"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_UNSIGNED},
+	{	SOCK_FLOAT, 1, N_("G"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_UNSIGNED},
+	{	SOCK_FLOAT, 1, N_("B"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_UNSIGNED},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate sh_node_combrgb_out[]= {
-	{	SOCK_RGBA, 0, "Image"},
+	{	SOCK_RGBA, 0, N_("Image")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_squeeze.c b/source/blender/nodes/shader/nodes/node_shader_squeeze.c
index 4d71aca56be..adab396be02 100644
--- a/source/blender/nodes/shader/nodes/node_shader_squeeze.c
+++ b/source/blender/nodes/shader/nodes/node_shader_squeeze.c
@@ -34,14 +34,14 @@
 
 /* **************** VALUE SQUEEZE ******************** */ 
 static bNodeSocketTemplate sh_node_squeeze_in[]= { 
-	{ SOCK_FLOAT, 1, "Value", 0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, PROP_NONE}, 
-	{ SOCK_FLOAT, 1, "Width", 1.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, PROP_NONE}, 
-	{ SOCK_FLOAT, 1, "Center", 0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, PROP_NONE}, 
+	{ SOCK_FLOAT, 1, N_("Value"), 0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, PROP_NONE}, 
+	{ SOCK_FLOAT, 1, N_("Width"), 1.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, PROP_NONE}, 
+	{ SOCK_FLOAT, 1, N_("Center"), 0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, PROP_NONE}, 
 	{ -1, 0, "" } 
 };
 
 static bNodeSocketTemplate sh_node_squeeze_out[]= { 
-	{ SOCK_FLOAT, 0, "Value"}, 
+	{ SOCK_FLOAT, 0, N_("Value")}, 
 	{ -1, 0, "" } 
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_checker.c b/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
index 2fff2bab1d4..dda451004a3 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
@@ -30,16 +30,16 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_tex_checker_in[]= {
-	{	SOCK_VECTOR, 1, "Vector",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
-	{ 	SOCK_RGBA, 1, 	"Color1", 		0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
-	{ 	SOCK_RGBA, 1, 	"Color2", 		0.2f, 0.2f, 0.2f, 1.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1,  "Scale",		5.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
+	{	SOCK_VECTOR, 1, N_("Vector"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
+	{ 	SOCK_RGBA, 1, 	N_("Color1"), 		0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{ 	SOCK_RGBA, 1, 	N_("Color2"), 		0.2f, 0.2f, 0.2f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1,  N_("Scale"),		5.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_tex_checker_out[]= {
-	{	SOCK_RGBA, 0, "Color",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Fac",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Color"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Fac"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_coord.c b/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
index aa8b7070cab..86f71f6f05b 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
@@ -32,13 +32,13 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_tex_coord_out[]= {
-	{	SOCK_VECTOR, 0, "Generated",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_VECTOR, 0, "Normal",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_VECTOR, 0, "UV",				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_VECTOR, 0, "Object",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_VECTOR, 0, "Camera",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_VECTOR, 0, "Window",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_VECTOR, 0, "Reflection",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_VECTOR, 0, N_("Generated"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_VECTOR, 0, N_("Normal"),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_VECTOR, 0, N_("UV"),				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_VECTOR, 0, N_("Object"),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_VECTOR, 0, N_("Camera"),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_VECTOR, 0, N_("Window"),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_VECTOR, 0, N_("Reflection"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_environment.c b/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
index 9e80f79b0c5..e3300c89a01 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
@@ -30,12 +30,12 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_tex_environment_in[]= {
-	{	SOCK_VECTOR, 1, "Vector",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
+	{	SOCK_VECTOR, 1, N_("Vector"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_tex_environment_out[]= {
-	{	SOCK_RGBA, 0, "Color",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Color"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
@@ -46,6 +46,10 @@ static void node_shader_init_tex_environment(bNodeTree *UNUSED(ntree), bNode* no
 	default_color_mapping(&tex->base.color_mapping);
 	tex->color_space = SHD_COLORSPACE_COLOR;
 	tex->projection = SHD_PROJ_EQUIRECTANGULAR;
+	tex->iuser.frames= 1;
+	tex->iuser.sfra= 1;
+	tex->iuser.fie_ima= 2;
+	tex->iuser.ok= 1;
 
 	node->storage = tex;
 }
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c b/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
index 769cf845b42..20a524ad00c 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
@@ -30,13 +30,13 @@
 /* **************** BLEND ******************** */
 
 static bNodeSocketTemplate sh_node_tex_gradient_in[]= {
-	{	SOCK_VECTOR, 1, "Vector",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
+	{	SOCK_VECTOR, 1, N_("Vector"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_tex_gradient_out[]= {
-	{	SOCK_RGBA, 0, "Color",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Fac",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Color"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Fac"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_image.c b/source/blender/nodes/shader/nodes/node_shader_tex_image.c
index e00467a52ef..d4d43c1430c 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_image.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_image.c
@@ -30,13 +30,13 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_tex_image_in[]= {
-	{	SOCK_VECTOR, 1, "Vector",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
+	{	SOCK_VECTOR, 1, N_("Vector"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_tex_image_out[]= {
-	{	SOCK_RGBA, 0, "Color",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Alpha",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Color"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Alpha"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
@@ -46,6 +46,10 @@ static void node_shader_init_tex_image(bNodeTree *UNUSED(ntree), bNode* node, bN
 	default_tex_mapping(&tex->base.tex_mapping);
 	default_color_mapping(&tex->base.color_mapping);
 	tex->color_space = SHD_COLORSPACE_COLOR;
+	tex->iuser.frames= 1;
+	tex->iuser.sfra= 1;
+	tex->iuser.fie_ima= 2;
+	tex->iuser.ok= 1;
 
 	node->storage = tex;
 }
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_magic.c b/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
index e2c0cfc020f..8d7607a9c72 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
@@ -30,15 +30,15 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_tex_magic_in[]= {
-	{	SOCK_VECTOR, 1, "Vector",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
-	{	SOCK_FLOAT, 1, "Scale",			5.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
-	{	SOCK_FLOAT, 1, "Distortion",	1.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
+	{	SOCK_VECTOR, 1, N_("Vector"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
+	{	SOCK_FLOAT, 1, N_("Scale"),			5.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
+	{	SOCK_FLOAT, 1, N_("Distortion"),	1.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_tex_magic_out[]= {
-	{	SOCK_RGBA, 0, "Color",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Fac",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Color"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Fac"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
index 9fe3e652eea..e71695df680 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
@@ -30,19 +30,19 @@
 /* **************** MUSGRAVE ******************** */
 
 static bNodeSocketTemplate sh_node_tex_musgrave_in[]= {
-	{	SOCK_VECTOR, 1, "Vector",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
-	{	SOCK_FLOAT, 1, "Scale",			5.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
-	{	SOCK_FLOAT, 1, "Detail",		2.0f, 0.0f, 0.0f, 0.0f, 0.0f, 16.0f},
-	{	SOCK_FLOAT, 1, "Dimension",		2.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
-	{	SOCK_FLOAT, 1, "Lacunarity",	1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
-	{	SOCK_FLOAT, 1, "Offset",		0.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
-	{	SOCK_FLOAT, 1, "Gain",			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
+	{	SOCK_VECTOR, 1, N_("Vector"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
+	{	SOCK_FLOAT, 1, N_("Scale"),			5.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
+	{	SOCK_FLOAT, 1, N_("Detail"),		2.0f, 0.0f, 0.0f, 0.0f, 0.0f, 16.0f},
+	{	SOCK_FLOAT, 1, N_("Dimension"),		2.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
+	{	SOCK_FLOAT, 1, N_("Lacunarity"),	1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
+	{	SOCK_FLOAT, 1, N_("Offset"),		0.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
+	{	SOCK_FLOAT, 1, N_("Gain"),			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_tex_musgrave_out[]= {
-	{	SOCK_RGBA, 0, "Color",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Fac",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Color"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Fac"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_noise.c b/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
index 2667d2a5867..95b81c5e1fb 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
@@ -30,16 +30,16 @@
 /* **************** NOISE ******************** */
 
 static bNodeSocketTemplate sh_node_tex_noise_in[]= {
-	{	SOCK_VECTOR, 1, "Vector",    0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
-	{	SOCK_FLOAT, 1, "Scale",      5.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
-	{	SOCK_FLOAT, 1, "Detail",     2.0f, 0.0f, 0.0f, 0.0f, 0.0f, 16.0f},
-	{	SOCK_FLOAT, 1, "Distortion", 0.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
+	{	SOCK_VECTOR, 1, N_("Vector"),    0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
+	{	SOCK_FLOAT, 1, N_("Scale"),      5.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
+	{	SOCK_FLOAT, 1, N_("Detail"),     2.0f, 0.0f, 0.0f, 0.0f, 0.0f, 16.0f},
+	{	SOCK_FLOAT, 1, N_("Distortion"), 0.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_tex_noise_out[]= {
-	{	SOCK_RGBA, 0, "Color",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Fac",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Color"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Fac"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_sky.c b/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
index b4855faaf94..48020c10aa0 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
@@ -30,12 +30,12 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_tex_sky_in[]= {
-	{	SOCK_VECTOR, 1, "Vector",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
+	{	SOCK_VECTOR, 1, N_("Vector"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_tex_sky_out[]= {
-	{	SOCK_RGBA, 0, "Color",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Color"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c b/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
index eebd4886c59..e654666db26 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
@@ -30,14 +30,14 @@
 /* **************** VORONOI ******************** */
 
 static bNodeSocketTemplate sh_node_tex_voronoi_in[]= {
-	{	SOCK_VECTOR, 1, "Vector",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
-	{	SOCK_FLOAT, 1, "Scale",			5.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
+	{	SOCK_VECTOR, 1, N_("Vector"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
+	{	SOCK_FLOAT, 1, N_("Scale"),			5.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_tex_voronoi_out[]= {
-	{	SOCK_RGBA, 0, "Color",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Fac",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Color"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Fac"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_wave.c b/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
index 3e079ffc4f4..8a6994e7b73 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
@@ -30,17 +30,17 @@
 /* **************** WAVE ******************** */
 
 static bNodeSocketTemplate sh_node_tex_wave_in[]= {
-	{	SOCK_VECTOR, 1, "Vector",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
-	{	SOCK_FLOAT, 1, "Scale",			5.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
-	{	SOCK_FLOAT, 1, "Distortion",	0.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
-	{	SOCK_FLOAT, 1, "Detail",		2.0f, 0.0f, 0.0f, 0.0f, 0.0f, 16.0f},
-	{	SOCK_FLOAT, 1, "Detail Scale",	1.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
+	{	SOCK_VECTOR, 1, N_("Vector"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
+	{	SOCK_FLOAT, 1, N_("Scale"),			5.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
+	{	SOCK_FLOAT, 1, N_("Distortion"),	0.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
+	{	SOCK_FLOAT, 1, N_("Detail"),		2.0f, 0.0f, 0.0f, 0.0f, 0.0f, 16.0f},
+	{	SOCK_FLOAT, 1, N_("Detail Scale"),	1.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_tex_wave_out[]= {
-	{	SOCK_RGBA, 0, "Color",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Fac",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, N_("Color"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Fac"),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_texture.c b/source/blender/nodes/shader/nodes/node_shader_texture.c
index b5c7981b4b1..3f90d4fbcd5 100644
--- a/source/blender/nodes/shader/nodes/node_shader_texture.c
+++ b/source/blender/nodes/shader/nodes/node_shader_texture.c
@@ -40,9 +40,9 @@ static bNodeSocketTemplate sh_node_texture_in[]= {
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate sh_node_texture_out[]= {
-	{	SOCK_FLOAT, 0, "Value"},
-	{	SOCK_RGBA, 0, "Color"},
-	{	SOCK_VECTOR, 0, "Normal"},
+	{	SOCK_FLOAT, 0, N_("Value")},
+	{	SOCK_RGBA, 0, N_("Color")},
+	{	SOCK_VECTOR, 0, N_("Normal")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_valToRgb.c b/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
index 0e58fed4357..1738606082f 100644
--- a/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
+++ b/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
@@ -34,12 +34,12 @@
 
 /* **************** VALTORGB ******************** */
 static bNodeSocketTemplate sh_node_valtorgb_in[]= {
-	{	SOCK_FLOAT, 1, "Fac",			0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_FLOAT, 1, N_("Fac"),			0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate sh_node_valtorgb_out[]= {
-	{	SOCK_RGBA, 0, "Color"},
-	{	SOCK_FLOAT, 0, "Alpha"},
+	{	SOCK_RGBA, 0, N_("Color")},
+	{	SOCK_FLOAT, 0, N_("Alpha")},
 	{	-1, 0, ""	}
 };
 
@@ -90,11 +90,11 @@ void register_node_type_sh_valtorgb(bNodeTreeType *ttype)
 
 /* **************** RGBTOBW ******************** */
 static bNodeSocketTemplate sh_node_rgbtobw_in[]= {
-	{	SOCK_RGBA, 1, "Color",			0.5f, 0.5f, 0.5f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Color"),			0.5f, 0.5f, 0.5f, 1.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate sh_node_rgbtobw_out[]= {
-	{	SOCK_FLOAT, 0, "Val",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Val"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_value.c b/source/blender/nodes/shader/nodes/node_shader_value.c
index 3196ce5cbe4..8a6c3c87e0d 100644
--- a/source/blender/nodes/shader/nodes/node_shader_value.c
+++ b/source/blender/nodes/shader/nodes/node_shader_value.c
@@ -35,7 +35,7 @@
 /* **************** VALUE ******************** */
 static bNodeSocketTemplate sh_node_value_out[]= {
 	/* XXX value nodes use the output sockets for buttons, so we need explicit limits here! */
-	{	SOCK_FLOAT, 0, "Value", 0.0f, 0.0f, 0.0f, 0.0f, -FLT_MAX, FLT_MAX},
+	{	SOCK_FLOAT, 0, N_("Value"), 0.0f, 0.0f, 0.0f, 0.0f, -FLT_MAX, FLT_MAX},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_vectMath.c b/source/blender/nodes/shader/nodes/node_shader_vectMath.c
index 73b0582490d..007366c6082 100644
--- a/source/blender/nodes/shader/nodes/node_shader_vectMath.c
+++ b/source/blender/nodes/shader/nodes/node_shader_vectMath.c
@@ -36,14 +36,14 @@
 
 /* **************** VECTOR MATH ******************** */ 
 static bNodeSocketTemplate sh_node_vect_math_in[]= { 
-        { SOCK_VECTOR, 1, "Vector", 0.5f, 0.5f, 0.5f, 1.0f, -10000.0f, 10000.0f, PROP_NONE},
-        { SOCK_VECTOR, 1, "Vector", 0.5f, 0.5f, 0.5f, 1.0f, -10000.0f, 10000.0f, PROP_NONE},
+        { SOCK_VECTOR, 1, N_("Vector"), 0.5f, 0.5f, 0.5f, 1.0f, -10000.0f, 10000.0f, PROP_NONE},
+        { SOCK_VECTOR, 1, N_("Vector"), 0.5f, 0.5f, 0.5f, 1.0f, -10000.0f, 10000.0f, PROP_NONE},
 	{ -1, 0, "" } 
 };
 
 static bNodeSocketTemplate sh_node_vect_math_out[]= {
-	{ SOCK_VECTOR, 0, "Vector"}, 
-	{ SOCK_FLOAT, 0, "Value"},
+	{ SOCK_VECTOR, 0, N_("Vector")}, 
+	{ SOCK_FLOAT, 0, N_("Value")},
 	{ -1, 0, "" } 
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c b/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
index 6eb3178709f..366f50ab4fc 100644
--- a/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
+++ b/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
@@ -30,13 +30,13 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_volume_isotropic_in[]= {
-	{	SOCK_RGBA, 1, "Color",		0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Density",	1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
+	{	SOCK_RGBA, 1, N_("Color"),		0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Density"),	1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_volume_isotropic_out[]= {
-	{	SOCK_SHADER, 0, "Volume"},
+	{	SOCK_SHADER, 0, N_("Volume")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c b/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
index 3d2d4fc689e..9d48f613d34 100644
--- a/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
+++ b/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
@@ -30,13 +30,13 @@
 /* **************** OUTPUT ******************** */
 
 static bNodeSocketTemplate sh_node_volume_transparent_in[]= {
-	{	SOCK_RGBA, 1, "Color",		0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Density",	1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
+	{	SOCK_RGBA, 1, N_("Color"),		0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 1, N_("Density"),	1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate sh_node_volume_transparent_out[]= {
-	{	SOCK_SHADER, 0, "Volume"},
+	{	SOCK_SHADER, 0, N_("Volume")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/texture/node_texture_tree.c b/source/blender/nodes/texture/node_texture_tree.c
index ba5682ee8ad..c84436a84b7 100644
--- a/source/blender/nodes/texture/node_texture_tree.c
+++ b/source/blender/nodes/texture/node_texture_tree.c
@@ -81,11 +81,11 @@ static void localize(bNodeTree *localtree, bNodeTree *UNUSED(ntree))
 {
 	bNode *node, *node_next;
 	
-	/* replace muted nodes by internal links */
+	/* replace muted nodes and reroute nodes by internal links */
 	for (node= localtree->nodes.first; node; node= node_next) {
 		node_next = node->next;
 		
-		if (node->flag & NODE_MUTED) {
+		if (node->flag & NODE_MUTED || node->type == NODE_REROUTE) {
 			nodeInternalRelink(localtree, node);
 			nodeFreeNode(localtree, node);
 		}
diff --git a/source/blender/nodes/texture/node_texture_util.h b/source/blender/nodes/texture/node_texture_util.h
index c9a5a02e277..0fe685996b1 100644
--- a/source/blender/nodes/texture/node_texture_util.h
+++ b/source/blender/nodes/texture/node_texture_util.h
@@ -67,6 +67,8 @@
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
 
+#include "BLF_translation.h"
+
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_at.c b/source/blender/nodes/texture/nodes/node_texture_at.c
index 33548be3208..9e557705b3f 100644
--- a/source/blender/nodes/texture/nodes/node_texture_at.c
+++ b/source/blender/nodes/texture/nodes/node_texture_at.c
@@ -34,12 +34,12 @@
 #include "NOD_texture.h"
 
 static bNodeSocketTemplate inputs[]= {
-	{ SOCK_RGBA,   1, "Texture",     0.0f, 0.0f, 0.0f, 1.0f },
-	{ SOCK_VECTOR, 1, "Coordinates", 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f, PROP_NONE },
+	{ SOCK_RGBA,   1, N_("Texture"),     0.0f, 0.0f, 0.0f, 1.0f },
+	{ SOCK_VECTOR, 1, N_("Coordinates"), 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f, PROP_NONE },
 	{ -1, 0, "" }
 };
 static bNodeSocketTemplate outputs[]= {
-	{ SOCK_RGBA,   0, "Texture" },
+	{ SOCK_RGBA,   0, N_("Texture") },
 	{ -1, 0, "" }
 };
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_bricks.c b/source/blender/nodes/texture/nodes/node_texture_bricks.c
index fbf04715020..7435034845f 100644
--- a/source/blender/nodes/texture/nodes/node_texture_bricks.c
+++ b/source/blender/nodes/texture/nodes/node_texture_bricks.c
@@ -36,17 +36,17 @@
 #include <math.h>
 
 static bNodeSocketTemplate inputs[]= {
-	{ SOCK_RGBA,  1, "Bricks 1",    0.596f, 0.282f, 0.0f,  1.0f },
-	{ SOCK_RGBA,  1, "Bricks 2",    0.632f, 0.504f, 0.05f, 1.0f },
-	{ SOCK_RGBA,  1, "Mortar",      0.0f,   0.0f,   0.0f,  1.0f },
-	{ SOCK_FLOAT, 1, "Thickness",   0.02f,  0.0f,   0.0f,  0.0f,  0.0f,    1.0f, PROP_UNSIGNED },
-	{ SOCK_FLOAT, 1, "Bias",        0.0f,   0.0f,   0.0f,  0.0f, -1.0f,    1.0f, PROP_NONE },
-	{ SOCK_FLOAT, 1, "Brick Width", 0.5f,   0.0f,   0.0f,  0.0f,  0.001f, 99.0f, PROP_UNSIGNED },
-	{ SOCK_FLOAT, 1, "Row Height",  0.25f,  0.0f,   0.0f,  0.0f,  0.001f, 99.0f, PROP_UNSIGNED },
+	{ SOCK_RGBA,  1, N_("Bricks 1"),    0.596f, 0.282f, 0.0f,  1.0f },
+	{ SOCK_RGBA,  1, N_("Bricks 2"),    0.632f, 0.504f, 0.05f, 1.0f },
+	{ SOCK_RGBA,  1, N_("Mortar"),      0.0f,   0.0f,   0.0f,  1.0f },
+	{ SOCK_FLOAT, 1, N_("Thickness"),   0.02f,  0.0f,   0.0f,  0.0f,  0.0f,    1.0f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("Bias"),        0.0f,   0.0f,   0.0f,  0.0f, -1.0f,    1.0f, PROP_NONE },
+	{ SOCK_FLOAT, 1, N_("Brick Width"), 0.5f,   0.0f,   0.0f,  0.0f,  0.001f, 99.0f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("Row Height"),  0.25f,  0.0f,   0.0f,  0.0f,  0.001f, 99.0f, PROP_UNSIGNED },
 	{ -1, 0, "" }
 };
 static bNodeSocketTemplate outputs[]= {
-	{ SOCK_RGBA, 0, "Color"},
+	{ SOCK_RGBA, 0, N_("Color")},
 	{ -1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_checker.c b/source/blender/nodes/texture/nodes/node_texture_checker.c
index c96a73d09f2..cd9c3170cf7 100644
--- a/source/blender/nodes/texture/nodes/node_texture_checker.c
+++ b/source/blender/nodes/texture/nodes/node_texture_checker.c
@@ -35,13 +35,13 @@
 #include <math.h>
 
 static bNodeSocketTemplate inputs[]= {
-	{ SOCK_RGBA, 1, "Color1", 1.0f, 0.0f, 0.0f, 1.0f },
-	{ SOCK_RGBA, 1, "Color2", 1.0f, 1.0f, 1.0f, 1.0f },
-	{ SOCK_FLOAT, 1, "Size",   0.5f, 0.0f, 0.0f, 0.0f,  0.0f, 100.0f, PROP_UNSIGNED },
+	{ SOCK_RGBA, 1, N_("Color1"), 1.0f, 0.0f, 0.0f, 1.0f },
+	{ SOCK_RGBA, 1, N_("Color2"), 1.0f, 1.0f, 1.0f, 1.0f },
+	{ SOCK_FLOAT, 1, N_("Size"),   0.5f, 0.0f, 0.0f, 0.0f,  0.0f, 100.0f, PROP_UNSIGNED },
 	{ -1, 0, "" }
 };
 static bNodeSocketTemplate outputs[]= {
-	{ SOCK_RGBA, 0, "Color" },
+	{ SOCK_RGBA, 0, N_("Color") },
 	{ -1, 0, "" }
 };
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_compose.c b/source/blender/nodes/texture/nodes/node_texture_compose.c
index a3ac196ab12..77521190590 100644
--- a/source/blender/nodes/texture/nodes/node_texture_compose.c
+++ b/source/blender/nodes/texture/nodes/node_texture_compose.c
@@ -34,14 +34,14 @@
 #include "NOD_texture.h"
 
 static bNodeSocketTemplate inputs[]= {
-	{ SOCK_FLOAT, 1, "Red",   0.0f, 0.0f, 0.0f, 0.0f,  0.0f, 1.0f, PROP_UNSIGNED },
-	{ SOCK_FLOAT, 1, "Green", 0.0f, 0.0f, 0.0f, 0.0f,  0.0f, 1.0f, PROP_UNSIGNED },
-	{ SOCK_FLOAT, 1, "Blue",  0.0f, 0.0f, 0.0f, 0.0f,  0.0f, 1.0f, PROP_UNSIGNED },
-	{ SOCK_FLOAT, 1, "Alpha", 1.0f, 0.0f, 0.0f, 0.0f,  0.0f, 1.0f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("Red"),   0.0f, 0.0f, 0.0f, 0.0f,  0.0f, 1.0f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("Green"), 0.0f, 0.0f, 0.0f, 0.0f,  0.0f, 1.0f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("Blue"),  0.0f, 0.0f, 0.0f, 0.0f,  0.0f, 1.0f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("Alpha"), 1.0f, 0.0f, 0.0f, 0.0f,  0.0f, 1.0f, PROP_UNSIGNED },
 	{ -1, 0, "" }
 };
 static bNodeSocketTemplate outputs[]= {
-	{ SOCK_RGBA, 0, "Color" },
+	{ SOCK_RGBA, 0, N_("Color") },
 	{ -1, 0, "" }
 };
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_coord.c b/source/blender/nodes/texture/nodes/node_texture_coord.c
index 6d6f31d6aaa..ded3afe4c6b 100644
--- a/source/blender/nodes/texture/nodes/node_texture_coord.c
+++ b/source/blender/nodes/texture/nodes/node_texture_coord.c
@@ -34,7 +34,7 @@
 #include "NOD_texture.h"
 
 static bNodeSocketTemplate outputs[]= { 
-	{ SOCK_VECTOR, 0, "Coordinates" },
+	{ SOCK_VECTOR, 0, N_("Coordinates") },
 	{ -1, 0, "" }
 };
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_curves.c b/source/blender/nodes/texture/nodes/node_texture_curves.c
index 0f7213a5be0..a56d69a6657 100644
--- a/source/blender/nodes/texture/nodes/node_texture_curves.c
+++ b/source/blender/nodes/texture/nodes/node_texture_curves.c
@@ -37,7 +37,7 @@
 
 /* custom1 = sfra, custom2 = efra */
 static bNodeSocketTemplate time_outputs[]= {
-	{ SOCK_FLOAT, 0, "Value" },
+	{ SOCK_FLOAT, 0, N_("Value") },
 	{ -1, 0, "" }
 };
 
@@ -82,12 +82,12 @@ void register_node_type_tex_curve_time(bNodeTreeType *ttype)
 
 /* **************** CURVE RGB  ******************** */
 static bNodeSocketTemplate rgb_inputs[]= {
-	{	SOCK_RGBA, 1, "Color",	0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Color"),	0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
 static bNodeSocketTemplate rgb_outputs[]= {
-	{	SOCK_RGBA, 0, "Color"},
+	{	SOCK_RGBA, 0, N_("Color")},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_decompose.c b/source/blender/nodes/texture/nodes/node_texture_decompose.c
index 435b87164c4..eae34e2ce47 100644
--- a/source/blender/nodes/texture/nodes/node_texture_decompose.c
+++ b/source/blender/nodes/texture/nodes/node_texture_decompose.c
@@ -35,14 +35,14 @@
 #include <math.h>
 
 static bNodeSocketTemplate inputs[]= {
-	{ SOCK_RGBA, 1, "Color", 0.0f, 0.0f, 0.0f, 1.0f },
+	{ SOCK_RGBA, 1, N_("Color"), 0.0f, 0.0f, 0.0f, 1.0f },
 	{ -1, 0, "" }
 };
 static bNodeSocketTemplate outputs[]= {
-	{ SOCK_FLOAT, 0, "Red" },
-	{ SOCK_FLOAT, 0, "Green" },
-	{ SOCK_FLOAT, 0, "Blue" },
-	{ SOCK_FLOAT, 0, "Alpha" },
+	{ SOCK_FLOAT, 0, N_("Red") },
+	{ SOCK_FLOAT, 0, N_("Green") },
+	{ SOCK_FLOAT, 0, N_("Blue") },
+	{ SOCK_FLOAT, 0, N_("Alpha") },
 	{ -1, 0, "" }
 };
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_distance.c b/source/blender/nodes/texture/nodes/node_texture_distance.c
index a2c1f41c0de..29f08a0ded0 100644
--- a/source/blender/nodes/texture/nodes/node_texture_distance.c
+++ b/source/blender/nodes/texture/nodes/node_texture_distance.c
@@ -36,13 +36,13 @@
 #include "NOD_texture.h"
 
 static bNodeSocketTemplate inputs[]= {
-	{ SOCK_VECTOR, 1, "Coordinate 1", 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f, PROP_NONE },
-	{ SOCK_VECTOR, 1, "Coordinate 2", 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f, PROP_NONE },
+	{ SOCK_VECTOR, 1, N_("Coordinate 1"), 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f, PROP_NONE },
+	{ SOCK_VECTOR, 1, N_("Coordinate 2"), 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f, PROP_NONE },
 	{ -1, 0, "" } 
 };
 
 static bNodeSocketTemplate outputs[]= {
-	{ SOCK_FLOAT, 0, "Value" },
+	{ SOCK_FLOAT, 0, N_("Value") },
 	{ -1, 0, "" }
 };
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c b/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
index d5a957a3b28..52455e024b4 100644
--- a/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
+++ b/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
@@ -35,15 +35,15 @@
 
 
 static bNodeSocketTemplate inputs[]= {
-	{ SOCK_FLOAT, 1, "Hue",        0.0f, 0.0f, 0.0f, 0.0f, -0.5f, 0.5f, PROP_NONE },
-	{ SOCK_FLOAT, 1, "Saturation", 1.0f, 0.0f, 0.0f, 0.0f,  0.0f, 2.0f, PROP_FACTOR },
-	{ SOCK_FLOAT, 1, "Value",      1.0f, 0.0f, 0.0f, 0.0f,  0.0f, 2.0f, PROP_FACTOR },
-	{ SOCK_FLOAT, 1, "Factor",     1.0f, 0.0f, 0.0f, 0.0f,  0.0f, 1.0f, PROP_FACTOR },
-	{ SOCK_RGBA,  1, "Color",      0.8f, 0.8f, 0.8f, 1.0f },
+	{ SOCK_FLOAT, 1, N_("Hue"),        0.0f, 0.0f, 0.0f, 0.0f, -0.5f, 0.5f, PROP_NONE },
+	{ SOCK_FLOAT, 1, N_("Saturation"), 1.0f, 0.0f, 0.0f, 0.0f,  0.0f, 2.0f, PROP_FACTOR },
+	{ SOCK_FLOAT, 1, N_("Value"),      1.0f, 0.0f, 0.0f, 0.0f,  0.0f, 2.0f, PROP_FACTOR },
+	{ SOCK_FLOAT, 1, N_("Factor"),     1.0f, 0.0f, 0.0f, 0.0f,  0.0f, 1.0f, PROP_FACTOR },
+	{ SOCK_RGBA,  1, N_("Color"),      0.8f, 0.8f, 0.8f, 1.0f },
 	{ -1, 0, "" }
 };
 static bNodeSocketTemplate outputs[]= {
-	{ SOCK_RGBA, 0, "Color" },
+	{ SOCK_RGBA, 0, N_("Color") },
 	{ -1, 0, "" }
 };
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_image.c b/source/blender/nodes/texture/nodes/node_texture_image.c
index 38d6db1fd08..d49a1edd70c 100644
--- a/source/blender/nodes/texture/nodes/node_texture_image.c
+++ b/source/blender/nodes/texture/nodes/node_texture_image.c
@@ -34,7 +34,7 @@
 #include "NOD_texture.h"
 
 static bNodeSocketTemplate outputs[]= {
-	{ SOCK_RGBA, 0, "Image"},
+	{ SOCK_RGBA, 0, N_("Image")},
 	{ -1, 0, "" }
 };
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_invert.c b/source/blender/nodes/texture/nodes/node_texture_invert.c
index 297675f498c..0339c3f0cf2 100644
--- a/source/blender/nodes/texture/nodes/node_texture_invert.c
+++ b/source/blender/nodes/texture/nodes/node_texture_invert.c
@@ -35,12 +35,12 @@
 
 /* **************** INVERT ******************** */ 
 static bNodeSocketTemplate inputs[]= { 
-	{ SOCK_RGBA, 1, "Color", 0.0f, 0.0f, 0.0f, 1.0f}, 
+	{ SOCK_RGBA, 1, N_("Color"), 0.0f, 0.0f, 0.0f, 1.0f}, 
 	{ -1, 0, "" } 
 };
 
 static bNodeSocketTemplate outputs[]= { 
-	{ SOCK_RGBA, 0, "Color"}, 
+	{ SOCK_RGBA, 0, N_("Color")}, 
 	{ -1, 0, "" } 
 };
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_math.c b/source/blender/nodes/texture/nodes/node_texture_math.c
index 54c9645fac3..36e9cac0827 100644
--- a/source/blender/nodes/texture/nodes/node_texture_math.c
+++ b/source/blender/nodes/texture/nodes/node_texture_math.c
@@ -36,13 +36,13 @@
 
 /* **************** SCALAR MATH ******************** */ 
 static bNodeSocketTemplate inputs[]= { 
-	{ SOCK_FLOAT, 1, "Value", 0.5f, 0.5f, 0.5f, 1.0f, -100.0f, 100.0f, PROP_NONE}, 
-	{ SOCK_FLOAT, 1, "Value", 0.5f, 0.5f, 0.5f, 1.0f, -100.0f, 100.0f, PROP_NONE}, 
+	{ SOCK_FLOAT, 1, N_("Value"), 0.5f, 0.5f, 0.5f, 1.0f, -100.0f, 100.0f, PROP_NONE}, 
+	{ SOCK_FLOAT, 1, N_("Value"), 0.5f, 0.5f, 0.5f, 1.0f, -100.0f, 100.0f, PROP_NONE}, 
 	{ -1, 0, "" } 
 };
 
 static bNodeSocketTemplate outputs[]= { 
-	{ SOCK_FLOAT, 0, "Value"}, 
+	{ SOCK_FLOAT, 0, N_("Value")}, 
 	{ -1, 0, "" } 
 };
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_mixRgb.c b/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
index c170d03a495..bf6cb7a3262 100644
--- a/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
+++ b/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
@@ -35,13 +35,13 @@
 
 /* **************** MIX RGB ******************** */
 static bNodeSocketTemplate inputs[]= {
-	{ SOCK_FLOAT, 1, "Factor", 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR },
-	{ SOCK_RGBA,  1, "Color1", 0.5f, 0.5f, 0.5f, 1.0f },
-	{ SOCK_RGBA, 1, "Color2", 0.5f, 0.5f, 0.5f, 1.0f },
+	{ SOCK_FLOAT, 1, N_("Factor"), 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR },
+	{ SOCK_RGBA,  1, N_("Color1"), 0.5f, 0.5f, 0.5f, 1.0f },
+	{ SOCK_RGBA, 1, N_("Color2"), 0.5f, 0.5f, 0.5f, 1.0f },
 	{ -1, 0, "" }
 };
 static bNodeSocketTemplate outputs[]= {
-	{ SOCK_RGBA, 0, "Color" },
+	{ SOCK_RGBA, 0, N_("Color") },
 	{ -1, 0, "" }
 };
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_output.c b/source/blender/nodes/texture/nodes/node_texture_output.c
index 19ba0e88639..9383d5675cb 100644
--- a/source/blender/nodes/texture/nodes/node_texture_output.c
+++ b/source/blender/nodes/texture/nodes/node_texture_output.c
@@ -35,8 +35,8 @@
 
 /* **************** COMPOSITE ******************** */
 static bNodeSocketTemplate inputs[]= {
-	{ SOCK_RGBA,   1, "Color",  0.0f, 0.0f, 0.0f, 1.0f},
-	{ SOCK_VECTOR, 1, "Normal", 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, PROP_DIRECTION},
+	{ SOCK_RGBA,   1, N_("Color"),  0.0f, 0.0f, 0.0f, 1.0f},
+	{ SOCK_VECTOR, 1, N_("Normal"), 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, PROP_DIRECTION},
 	{ -1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_proc.c b/source/blender/nodes/texture/nodes/node_texture_proc.c
index 348827bd26c..fe2082d1442 100644
--- a/source/blender/nodes/texture/nodes/node_texture_proc.c
+++ b/source/blender/nodes/texture/nodes/node_texture_proc.c
@@ -41,12 +41,12 @@
 
 
 static bNodeSocketTemplate outputs_both[]= {
-	{ SOCK_RGBA, 0, "Color",  1.0f, 0.0f, 0.0f, 1.0f },
-	{ SOCK_VECTOR, 0, "Normal", 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, PROP_DIRECTION },
+	{ SOCK_RGBA, 0, N_("Color"),  1.0f, 0.0f, 0.0f, 1.0f },
+	{ SOCK_VECTOR, 0, N_("Normal"), 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, PROP_DIRECTION },
 	{ -1, 0, "" }
 };
 static bNodeSocketTemplate outputs_color_only[]= {
-	{ SOCK_RGBA, 0, "Color" },
+	{ SOCK_RGBA, 0, N_("Color") },
 	{ -1, 0, "" }
 };
 
@@ -140,13 +140,13 @@ static int count_outputs(bNode *node)
 /* --- VORONOI -- */
 static bNodeSocketTemplate voronoi_inputs[]= {
 	COMMON_INPUTS,
-	{ SOCK_FLOAT, 1, "W1", 1.0f, 0.0f, 0.0f, 0.0f,   -2.0f, 2.0f, PROP_NONE },
-	{ SOCK_FLOAT, 1, "W2", 0.0f, 0.0f, 0.0f, 0.0f,   -2.0f, 2.0f, PROP_NONE },
-	{ SOCK_FLOAT, 1, "W3", 0.0f, 0.0f, 0.0f, 0.0f,   -2.0f, 2.0f, PROP_NONE },
-	{ SOCK_FLOAT, 1, "W4", 0.0f, 0.0f, 0.0f, 0.0f,   -2.0f, 2.0f, PROP_NONE },
+	{ SOCK_FLOAT, 1, N_("W1"), 1.0f, 0.0f, 0.0f, 0.0f,   -2.0f, 2.0f, PROP_NONE },
+	{ SOCK_FLOAT, 1, N_("W2"), 0.0f, 0.0f, 0.0f, 0.0f,   -2.0f, 2.0f, PROP_NONE },
+	{ SOCK_FLOAT, 1, N_("W3"), 0.0f, 0.0f, 0.0f, 0.0f,   -2.0f, 2.0f, PROP_NONE },
+	{ SOCK_FLOAT, 1, N_("W4"), 0.0f, 0.0f, 0.0f, 0.0f,   -2.0f, 2.0f, PROP_NONE },
 	
-	{ SOCK_FLOAT, 1, "iScale", 1.0f, 0.0f, 0.0f, 0.0f,    0.01f,  10.0f, PROP_UNSIGNED },
-	{ SOCK_FLOAT, 1, "Size",   0.25f, 0.0f, 0.0f, 0.0f,   0.0001f, 4.0f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("iScale"), 1.0f, 0.0f, 0.0f, 0.0f,    0.01f,  10.0f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("Size"),   0.25f, 0.0f, 0.0f, 0.0f,   0.0001f, 4.0f, PROP_UNSIGNED },
 	
 	{ -1, 0, "" }
 };
@@ -173,7 +173,7 @@ ProcDef(blend)
 /* -- MAGIC -- */
 static bNodeSocketTemplate magic_inputs[]= {
 	COMMON_INPUTS,
-	{ SOCK_FLOAT, 1, "Turbulence", 5.0f, 0.0f, 0.0f, 0.0f,   0.0f, 200.0f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("Turbulence"), 5.0f, 0.0f, 0.0f, 0.0f,   0.0f, 200.0f, PROP_UNSIGNED },
 	{ -1, 0, "" }
 };
 static void magic_map_inputs(Tex *tex, bNodeStack **in, TexParams *p, short thread)
@@ -185,8 +185,8 @@ ProcDef(magic)
 /* --- MARBLE --- */
 static bNodeSocketTemplate marble_inputs[]= {
 	COMMON_INPUTS,
-	{ SOCK_FLOAT, 1, "Size",       0.25f, 0.0f, 0.0f, 0.0f,   0.0001f, 2.0f, PROP_UNSIGNED },
-	{ SOCK_FLOAT, 1, "Turbulence", 5.0f,  0.0f, 0.0f, 0.0f,   0.0f, 200.0f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("Size"),       0.25f, 0.0f, 0.0f, 0.0f,   0.0001f, 2.0f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("Turbulence"), 5.0f,  0.0f, 0.0f, 0.0f,   0.0f, 200.0f, PROP_UNSIGNED },
 	{ -1, 0, "" }
 };
 static void marble_map_inputs(Tex *tex, bNodeStack **in, TexParams *p, short thread)
@@ -199,7 +199,7 @@ ProcDef(marble)
 /* --- CLOUDS --- */
 static bNodeSocketTemplate clouds_inputs[]= {
 	COMMON_INPUTS,
-	{ SOCK_FLOAT, 1, "Size",       0.25f, 0.0f, 0.0f, 0.0f,   0.0001f, 2.0f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("Size"),       0.25f, 0.0f, 0.0f, 0.0f,   0.0001f, 2.0f, PROP_UNSIGNED },
 	{ -1, 0, "" }
 };
 static void clouds_map_inputs(Tex *tex, bNodeStack **in, TexParams *p, short thread)
@@ -211,8 +211,8 @@ ProcDef(clouds)
 /* --- DISTORTED NOISE --- */
 static bNodeSocketTemplate distnoise_inputs[]= {
 	COMMON_INPUTS,
-	{ SOCK_FLOAT, 1, "Size",       0.25f, 0.0f, 0.0f, 0.0f,   0.0001f,  2.0f, PROP_UNSIGNED },
-	{ SOCK_FLOAT, 1, "Distortion", 1.00f, 0.0f, 0.0f, 0.0f,   0.0000f, 10.0f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("Size"),       0.25f, 0.0f, 0.0f, 0.0f,   0.0001f,  2.0f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("Distortion"), 1.00f, 0.0f, 0.0f, 0.0f,   0.0000f, 10.0f, PROP_UNSIGNED },
 	{ -1, 0, "" }
 };
 static void distnoise_map_inputs(Tex *tex, bNodeStack **in, TexParams *p, short thread)
@@ -225,8 +225,8 @@ ProcDef(distnoise)
 /* --- WOOD --- */
 static bNodeSocketTemplate wood_inputs[]= {
 	COMMON_INPUTS,
-	{ SOCK_FLOAT, 1, "Size",       0.25f, 0.0f, 0.0f, 0.0f,   0.0001f, 2.0f, PROP_UNSIGNED },
-	{ SOCK_FLOAT, 1, "Turbulence", 5.0f,  0.0f, 0.0f, 0.0f,   0.0f, 200.0f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("Size"),       0.25f, 0.0f, 0.0f, 0.0f,   0.0001f, 2.0f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("Turbulence"), 5.0f,  0.0f, 0.0f, 0.0f,   0.0f, 200.0f, PROP_UNSIGNED },
 	{ -1, 0, "" }
 };
 static void wood_map_inputs(Tex *tex, bNodeStack **in, TexParams *p, short thread)
@@ -239,12 +239,12 @@ ProcDef(wood)
 /* --- MUSGRAVE --- */
 static bNodeSocketTemplate musgrave_inputs[]= {
 	COMMON_INPUTS,
-	{ SOCK_FLOAT, 1, "H",          1.0f, 0.0f, 0.0f, 0.0f,   0.0001f, 2.0f, PROP_UNSIGNED },
-	{ SOCK_FLOAT, 1, "Lacunarity", 2.0f, 0.0f, 0.0f, 0.0f,   0.0f,    6.0f, PROP_UNSIGNED },
-	{ SOCK_FLOAT, 1, "Octaves",    2.0f, 0.0f, 0.0f, 0.0f,   0.0f,    8.0f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("H"),          1.0f, 0.0f, 0.0f, 0.0f,   0.0001f, 2.0f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("Lacunarity"), 2.0f, 0.0f, 0.0f, 0.0f,   0.0f,    6.0f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("Octaves"),    2.0f, 0.0f, 0.0f, 0.0f,   0.0f,    8.0f, PROP_UNSIGNED },
 	
-	{ SOCK_FLOAT, 1, "iScale",     1.0f,  0.0f, 0.0f, 0.0f,  0.0f,   10.0f, PROP_UNSIGNED },
-	{ SOCK_FLOAT, 1, "Size",       0.25f, 0.0f, 0.0f, 0.0f,  0.0001f, 2.0f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("iScale"),     1.0f,  0.0f, 0.0f, 0.0f,  0.0f,   10.0f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("Size"),       0.25f, 0.0f, 0.0f, 0.0f,  0.0001f, 2.0f, PROP_UNSIGNED },
 	{ -1, 0, "" }
 };
 static void musgrave_map_inputs(Tex *tex, bNodeStack **in, TexParams *p, short thread)
@@ -268,8 +268,8 @@ ProcDef(noise)
 /* --- STUCCI --- */
 static bNodeSocketTemplate stucci_inputs[]= {
 	COMMON_INPUTS,
-	{ SOCK_FLOAT, 1, "Size",       0.25f, 0.0f, 0.0f, 0.0f,   0.0001f, 2.0f, PROP_UNSIGNED },
-	{ SOCK_FLOAT, 1, "Turbulence", 5.0f,  0.0f, 0.0f, 0.0f,   0.0f, 200.0f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("Size"),       0.25f, 0.0f, 0.0f, 0.0f,   0.0001f, 2.0f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("Turbulence"), 5.0f,  0.0f, 0.0f, 0.0f,   0.0f, 200.0f, PROP_UNSIGNED },
 	{ -1, 0, "" }
 };
 static void stucci_map_inputs(Tex *tex, bNodeStack **in, TexParams *p, short thread)
diff --git a/source/blender/nodes/texture/nodes/node_texture_rotate.c b/source/blender/nodes/texture/nodes/node_texture_rotate.c
index d1c9cca3f3c..a7832c8c180 100644
--- a/source/blender/nodes/texture/nodes/node_texture_rotate.c
+++ b/source/blender/nodes/texture/nodes/node_texture_rotate.c
@@ -36,14 +36,14 @@
 #include "NOD_texture.h"
 
 static bNodeSocketTemplate inputs[]= { 
-	{ SOCK_RGBA, 1, "Color", 0.0f, 0.0f, 0.0f, 1.0f},
-	{ SOCK_FLOAT, 1, "Turns",   0.0f, 0.0f, 0.0f, 0.0f,  -1.0f, 1.0f, PROP_NONE },
-	{ SOCK_VECTOR, 1, "Axis",   0.0f, 0.0f, 1.0f, 0.0f,  -1.0f, 1.0f, PROP_DIRECTION },
+	{ SOCK_RGBA, 1, N_("Color"), 0.0f, 0.0f, 0.0f, 1.0f},
+	{ SOCK_FLOAT, 1, N_("Turns"),   0.0f, 0.0f, 0.0f, 0.0f,  -1.0f, 1.0f, PROP_NONE },
+	{ SOCK_VECTOR, 1, N_("Axis"),   0.0f, 0.0f, 1.0f, 0.0f,  -1.0f, 1.0f, PROP_DIRECTION },
 	{ -1, 0, "" } 
 };
 
 static bNodeSocketTemplate outputs[]= { 
-	{ SOCK_RGBA, 0, "Color"}, 
+	{ SOCK_RGBA, 0, N_("Color")}, 
 	{ -1, 0, "" } 
 };
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_scale.c b/source/blender/nodes/texture/nodes/node_texture_scale.c
index f8790d414c9..130a21ba84d 100644
--- a/source/blender/nodes/texture/nodes/node_texture_scale.c
+++ b/source/blender/nodes/texture/nodes/node_texture_scale.c
@@ -34,13 +34,13 @@
 #include "node_texture_util.h"
 
 static bNodeSocketTemplate inputs[]= { 
-	{ SOCK_RGBA,   1, "Color", 0.0f, 0.0f, 0.0f, 1.0f },
-	{ SOCK_VECTOR, 1, "Scale", 1.0f, 1.0f, 1.0f, 0.0f,  -10.0f, 10.0f, PROP_XYZ },
+	{ SOCK_RGBA,   1, N_("Color"), 0.0f, 0.0f, 0.0f, 1.0f },
+	{ SOCK_VECTOR, 1, N_("Scale"), 1.0f, 1.0f, 1.0f, 0.0f,  -10.0f, 10.0f, PROP_XYZ },
 	{ -1, 0, "" } 
 };
 
 static bNodeSocketTemplate outputs[]= { 
-	{ SOCK_RGBA, 0, "Color"}, 
+	{ SOCK_RGBA, 0, N_("Color")}, 
 	{ -1, 0, "" } 
 };
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_texture.c b/source/blender/nodes/texture/nodes/node_texture_texture.c
index ecf47a900f9..0d985273eda 100644
--- a/source/blender/nodes/texture/nodes/node_texture_texture.c
+++ b/source/blender/nodes/texture/nodes/node_texture_texture.c
@@ -36,13 +36,13 @@
 #include "RE_shader_ext.h"
 
 static bNodeSocketTemplate inputs[]= {
-	{ SOCK_RGBA, 1, "Color1", 1.0f, 1.0f, 1.0f, 1.0f },
-	{ SOCK_RGBA, 1, "Color2", 0.0f, 0.0f, 0.0f, 1.0f },
+	{ SOCK_RGBA, 1, N_("Color1"), 1.0f, 1.0f, 1.0f, 1.0f },
+	{ SOCK_RGBA, 1, N_("Color2"), 0.0f, 0.0f, 0.0f, 1.0f },
 	{ -1, 0, "" }
 };
 
 static bNodeSocketTemplate outputs[]= {
-	{ SOCK_RGBA, 0, "Color" },
+	{ SOCK_RGBA, 0, N_("Color") },
 	{ -1, 0, "" }
 };
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_translate.c b/source/blender/nodes/texture/nodes/node_texture_translate.c
index 61b0702b333..85f857ca2be 100644
--- a/source/blender/nodes/texture/nodes/node_texture_translate.c
+++ b/source/blender/nodes/texture/nodes/node_texture_translate.c
@@ -35,13 +35,13 @@
 #include "NOD_texture.h"
 
 static bNodeSocketTemplate inputs[]= { 
-	{ SOCK_RGBA, 1, "Color", 0.0f, 0.0f, 0.0f, 1.0f},
-	{ SOCK_VECTOR, 1, "Offset",   0.0f, 0.0f, 0.0f, 0.0f,  -10000.0f, 10000.0f, PROP_TRANSLATION },
+	{ SOCK_RGBA, 1, N_("Color"), 0.0f, 0.0f, 0.0f, 1.0f},
+	{ SOCK_VECTOR, 1, N_("Offset"),   0.0f, 0.0f, 0.0f, 0.0f,  -10000.0f, 10000.0f, PROP_TRANSLATION },
 	{ -1, 0, "" } 
 };
 
 static bNodeSocketTemplate outputs[]= { 
-	{ SOCK_RGBA, 0, "Color"}, 
+	{ SOCK_RGBA, 0, N_("Color")}, 
 	{ -1, 0, "" } 
 };
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_valToNor.c b/source/blender/nodes/texture/nodes/node_texture_valToNor.c
index c8159060433..2d107b87578 100644
--- a/source/blender/nodes/texture/nodes/node_texture_valToNor.c
+++ b/source/blender/nodes/texture/nodes/node_texture_valToNor.c
@@ -34,13 +34,13 @@
 #include "NOD_texture.h"
 
 static bNodeSocketTemplate inputs[]= { 
-	{ SOCK_FLOAT, 1, "Val",   0.0f,   0.0f, 0.0f, 1.0f,  0.0f,   1.0f, PROP_NONE },
-	{ SOCK_FLOAT, 1, "Nabla", 0.025f, 0.0f, 0.0f, 0.0f,  0.001f, 0.1f, PROP_UNSIGNED },
+	{ SOCK_FLOAT, 1, N_("Val"),   0.0f,   0.0f, 0.0f, 1.0f,  0.0f,   1.0f, PROP_NONE },
+	{ SOCK_FLOAT, 1, N_("Nabla"), 0.025f, 0.0f, 0.0f, 0.0f,  0.001f, 0.1f, PROP_UNSIGNED },
 	{ -1, 0, "" } 
 };
 
 static bNodeSocketTemplate outputs[]= { 
-	{ SOCK_VECTOR, 0, "Normal" }, 
+	{ SOCK_VECTOR, 0, N_("Normal") }, 
 	{ -1, 0, "" } 
 };
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_valToRgb.c b/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
index 1d282b4d4cc..d1a02210038 100644
--- a/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
+++ b/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
@@ -35,11 +35,11 @@
 
 /* **************** VALTORGB ******************** */
 static bNodeSocketTemplate valtorgb_in[]= {
-	{	SOCK_FLOAT, 1, "Fac",			0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
+	{	SOCK_FLOAT, 1, N_("Fac"),			0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate valtorgb_out[]= {
-	{	SOCK_RGBA, 0, "Color"},
+	{	SOCK_RGBA, 0, N_("Color")},
 	{	-1, 0, ""	}
 };
 
@@ -78,11 +78,11 @@ void register_node_type_tex_valtorgb(bNodeTreeType *ttype)
 
 /* **************** RGBTOBW ******************** */
 static bNodeSocketTemplate rgbtobw_in[]= {
-	{	SOCK_RGBA, 1, "Color",			0.5f, 0.5f, 0.5f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 1, N_("Color"),			0.5f, 0.5f, 0.5f, 1.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 static bNodeSocketTemplate rgbtobw_out[]= {
-	{	SOCK_FLOAT, 0, "Val",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, N_("Val"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_viewer.c b/source/blender/nodes/texture/nodes/node_texture_viewer.c
index 0d7a04b06e2..03a94d1df67 100644
--- a/source/blender/nodes/texture/nodes/node_texture_viewer.c
+++ b/source/blender/nodes/texture/nodes/node_texture_viewer.c
@@ -35,7 +35,7 @@
 #include <math.h>
 
 static bNodeSocketTemplate inputs[]= {
-	{ SOCK_RGBA, 1, "Color", 1.0f, 0.0f, 0.0f, 1.0f },
+	{ SOCK_RGBA, 1, N_("Color"), 1.0f, 0.0f, 0.0f, 1.0f },
 	{ -1, 0, "" }
 };
 static bNodeSocketTemplate outputs[]= {
diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c
index 6ca4ad15859..053dac71fe6 100644
--- a/source/blender/python/bmesh/bmesh_py_types.c
+++ b/source/blender/python/bmesh/bmesh_py_types.c
@@ -2099,7 +2099,7 @@ static struct PyMethodDef bpy_bmesh_methods[] = {
     {"select_flush_mode", (PyCFunction)bpy_bmesh_select_flush_mode, METH_NOARGS, bpy_bmesh_select_flush_mode_doc},
     {"select_flush", (PyCFunction)bpy_bmesh_select_flush, METH_O, bpy_bmesh_select_flush_doc},
     {"normal_update", (PyCFunction)bpy_bmesh_normal_update, METH_VARARGS, bpy_bmesh_normal_update_doc},
-    {"transform", (PyCFunction)bpy_bmesh_transform, METH_VARARGS|METH_KEYWORDS, bpy_bmesh_transform_doc},
+    {"transform", (PyCFunction)bpy_bmesh_transform, METH_VARARGS | METH_KEYWORDS, bpy_bmesh_transform_doc},
     {NULL, NULL, 0, NULL}
 };
 
@@ -2141,7 +2141,7 @@ static struct PyMethodDef bpy_bmface_methods[] = {
     {"copy_from", (PyCFunction)bpy_bm_elem_copy_from, METH_O, bpy_bm_elem_copy_from_doc},
     {"copy_from_face_interp", (PyCFunction)bpy_bmface_copy_from_face_interp, METH_O, bpy_bmface_copy_from_face_interp_doc},
 
-    {"copy", (PyCFunction)bpy_bmface_copy, METH_VARARGS|METH_KEYWORDS, bpy_bmface_copy_doc},
+    {"copy", (PyCFunction)bpy_bmface_copy, METH_VARARGS | METH_KEYWORDS, bpy_bmface_copy_doc},
 
     {"calc_area",          (PyCFunction)bpy_bmface_calc_area,          METH_NOARGS, bpy_bmface_calc_area_doc},
     {"calc_perimeter",     (PyCFunction)bpy_bmface_calc_perimeter,     METH_NOARGS, bpy_bmface_calc_perimeter_doc},
diff --git a/source/blender/python/bmesh/bmesh_py_utils.c b/source/blender/python/bmesh/bmesh_py_utils.c
index 9fecc0cdeda..374a01c51f8 100644
--- a/source/blender/python/bmesh/bmesh_py_utils.c
+++ b/source/blender/python/bmesh/bmesh_py_utils.c
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/python/bmesh/bmesh_py_api.c
+/** \file blender/python/bmesh/bmesh_py_utils.c
  *  \ingroup pybmesh
  *
  * This file defines the 'bmesh.utils' module.
diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c
index 3a405575926..fd12f7f483d 100644
--- a/source/blender/python/generic/py_capi_utils.c
+++ b/source/blender/python/generic/py_capi_utils.c
@@ -489,7 +489,7 @@ void PyC_SetHomePath(const char *py_path_bundle)
 	/* cmake/MSVC debug build crashes without this, why only
 	 * in this case is unknown.. */
 	{
-		BLI_setenv("PYTHONPATH", py_path_bundle);
+		/*BLI_setenv("PYTHONPATH", py_path_bundle)*/;
 	}
 #endif
 #endif
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 0c88c7d9c81..ac9ff4c8ef5 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -421,7 +421,7 @@ static int python_script_exec(bContext *C, const char *fn, struct Text *text,
 
 				fclose(fp);
 
-				pystring = MEM_mallocN(strlen(fn) + 36, "pystring");
+				pystring = MEM_mallocN(strlen(fn) + 37, "pystring");
 				pystring[0] = '\0';
 				sprintf(pystring, "f=open(r'%s');exec(f.read());f.close()", fn);
 				py_result = PyRun_String(pystring, Py_file_input, py_dict, py_dict);
@@ -537,7 +537,12 @@ int BPY_button_exec(bContext *C, const char *expr, double *value, const short ve
 			val = 0.0;
 
 			for (i = 0; i < PyTuple_GET_SIZE(retval); i++) {
-				val += PyFloat_AsDouble(PyTuple_GET_ITEM(retval, i));
+				const double val_item = PyFloat_AsDouble(PyTuple_GET_ITEM(retval, i));
+				if (val_item == -1 && PyErr_Occurred()) {
+					val = -1;
+					break;
+				}
+				val += val_item;
 			}
 		}
 		else {
diff --git a/source/blender/python/intern/bpy_library.c b/source/blender/python/intern/bpy_library.c
index 1d02acbe983..d34bdfe9448 100644
--- a/source/blender/python/intern/bpy_library.c
+++ b/source/blender/python/intern/bpy_library.c
@@ -170,18 +170,18 @@ static PyTypeObject bpy_lib_Type = {
 };
 
 PyDoc_STRVAR(bpy_lib_load_doc,
-             ".. method:: load(filepath, link=False, relative=False)\n"
-             "\n"
-             "   Returns a context manager which exposes 2 library objects on entering.\n"
-             "   Each object has attributes matching bpy.data which are lists of strings to be linked.\n"
-             "\n"
-             "   :arg filepath: The path to a blend file.\n"
-             "   :type filepath: string\n"
-             "   :arg link: When False reference to the original file is lost.\n"
-             "   :type link: bool\n"
-             "   :arg relative: When True the path is stored relative to the open blend file.\n"
-             "   :type relative: bool\n"
-             );
+".. method:: load(filepath, link=False, relative=False)\n"
+"\n"
+"   Returns a context manager which exposes 2 library objects on entering.\n"
+"   Each object has attributes matching bpy.data which are lists of strings to be linked.\n"
+"\n"
+"   :arg filepath: The path to a blend file.\n"
+"   :type filepath: string\n"
+"   :arg link: When False reference to the original file is lost.\n"
+"   :type link: bool\n"
+"   :arg relative: When True the path is stored relative to the open blend file.\n"
+"   :type relative: bool\n"
+);
 static PyObject *bpy_lib_load(PyObject *UNUSED(self), PyObject *args, PyObject *kwds)
 {
 	static const char *kwlist[] = {"filepath", "link", "relative", NULL};
diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c
index 77ccf802663..f8609859251 100644
--- a/source/blender/python/intern/bpy_props.c
+++ b/source/blender/python/intern/bpy_props.c
@@ -304,7 +304,7 @@ static int py_long_as_int(PyObject *py_long, int *r_int)
 		if (PyErr_Occurred())                                                 \
 			return NULL;                                                      \
 		return bpy_prop_deferred_return(pymeth_##_func, kw);                  \
-	}                                                                         \
+	} (void)0
 
 /* terse macros for error checks shared between all funcs cant use function
  * calls because of static strins passed to pyrna_set_to_enum_bitfield */
@@ -327,10 +327,10 @@ static int py_long_as_int(PyObject *py_long, int *r_int)
 	                                         #_func"(options={ ...}):"))      \
 	{                                                                         \
 		return NULL;                                                          \
-	}                                                                         \
+	} (void)0
 
 #define BPY_PROPDEF_SUBTYPE_CHECK(_func, _property_flag_items, _subtype)      \
-	BPY_PROPDEF_CHECK(_func, _property_flag_items)                            \
+	BPY_PROPDEF_CHECK(_func, _property_flag_items);                           \
 	if (pysubtype && RNA_enum_value_from_id(_subtype,                         \
 	                                        pysubtype,                        \
 	                                        &subtype) == 0)                   \
@@ -339,7 +339,7 @@ static int py_long_as_int(PyObject *py_long, int *r_int)
 		             #_func"(subtype='%s'): invalid subtype",                 \
 		             pysubtype);                                              \
 		return NULL;                                                          \
-	}                                                                         \
+	} (void)0
 
 
 #define BPY_PROPDEF_NAME_DOC \
@@ -397,7 +397,7 @@ static PyObject *BPy_BoolProperty(PyObject *self, PyObject *args, PyObject *kw)
 {
 	StructRNA *srna;
 
-	BPY_PROPDEF_HEAD(BoolProperty)
+	BPY_PROPDEF_HEAD(BoolProperty);
 
 	if (srna) {
 		static const char *kwlist[] = {"attr", "name", "description", "default",
@@ -422,7 +422,7 @@ static PyObject *BPy_BoolProperty(PyObject *self, PyObject *args, PyObject *kw)
 			return NULL;
 		}
 
-		BPY_PROPDEF_SUBTYPE_CHECK(BoolProperty, property_flag_items, property_subtype_number_items)
+		BPY_PROPDEF_SUBTYPE_CHECK(BoolProperty, property_flag_items, property_subtype_number_items);
 
 		if (bpy_prop_callback_check(update_cb, 2) == -1) {
 			return NULL;
@@ -474,7 +474,7 @@ static PyObject *BPy_BoolVectorProperty(PyObject *self, PyObject *args, PyObject
 {
 	StructRNA *srna;
 
-	BPY_PROPDEF_HEAD(BoolVectorProperty)
+	BPY_PROPDEF_HEAD(BoolVectorProperty);
 
 	if (srna) {
 		static const char *kwlist[] = {"attr", "name", "description", "default",
@@ -501,7 +501,7 @@ static PyObject *BPy_BoolVectorProperty(PyObject *self, PyObject *args, PyObject
 			return NULL;
 		}
 
-		BPY_PROPDEF_SUBTYPE_CHECK(BoolVectorProperty, property_flag_items, property_subtype_array_items)
+		BPY_PROPDEF_SUBTYPE_CHECK(BoolVectorProperty, property_flag_items, property_subtype_array_items);
 
 		if (size < 1 || size > PYRNA_STACK_ARRAY) {
 			PyErr_Format(PyExc_TypeError,
@@ -561,7 +561,7 @@ static PyObject *BPy_IntProperty(PyObject *self, PyObject *args, PyObject *kw)
 {
 	StructRNA *srna;
 
-	BPY_PROPDEF_HEAD(IntProperty)
+	BPY_PROPDEF_HEAD(IntProperty);
 
 	if (srna) {
 		static const char *kwlist[] = {"attr", "name", "description", "default",
@@ -588,7 +588,7 @@ static PyObject *BPy_IntProperty(PyObject *self, PyObject *args, PyObject *kw)
 			return NULL;
 		}
 
-		BPY_PROPDEF_SUBTYPE_CHECK(IntProperty, property_flag_items, property_subtype_number_items)
+		BPY_PROPDEF_SUBTYPE_CHECK(IntProperty, property_flag_items, property_subtype_number_items);
 
 		if (bpy_prop_callback_check(update_cb, 2) == -1) {
 			return NULL;
@@ -643,7 +643,7 @@ static PyObject *BPy_IntVectorProperty(PyObject *self, PyObject *args, PyObject
 {
 	StructRNA *srna;
 
-	BPY_PROPDEF_HEAD(IntVectorProperty)
+	BPY_PROPDEF_HEAD(IntVectorProperty);
 
 	if (srna) {
 		static const char *kwlist[] = {"attr", "name", "description", "default",
@@ -674,7 +674,7 @@ static PyObject *BPy_IntVectorProperty(PyObject *self, PyObject *args, PyObject
 			return NULL;
 		}
 
-		BPY_PROPDEF_SUBTYPE_CHECK(IntVectorProperty, property_flag_items, property_subtype_array_items)
+		BPY_PROPDEF_SUBTYPE_CHECK(IntVectorProperty, property_flag_items, property_subtype_array_items);
 
 		if (size < 1 || size > PYRNA_STACK_ARRAY) {
 			PyErr_Format(PyExc_TypeError,
@@ -738,7 +738,7 @@ static PyObject *BPy_FloatProperty(PyObject *self, PyObject *args, PyObject *kw)
 {
 	StructRNA *srna;
 
-	BPY_PROPDEF_HEAD(FloatProperty)
+	BPY_PROPDEF_HEAD(FloatProperty);
 
 	if (srna) {
 		static const char *kwlist[] = {"attr", "name", "description", "default",
@@ -769,7 +769,7 @@ static PyObject *BPy_FloatProperty(PyObject *self, PyObject *args, PyObject *kw)
 			return NULL;
 		}
 
-		BPY_PROPDEF_SUBTYPE_CHECK(FloatProperty, property_flag_items, property_subtype_number_items)
+		BPY_PROPDEF_SUBTYPE_CHECK(FloatProperty, property_flag_items, property_subtype_number_items);
 
 		if (pyunit && RNA_enum_value_from_id(property_unit_items, pyunit, &unit) == 0) {
 			PyErr_Format(PyExc_TypeError, "FloatProperty(unit='%s'): invalid unit", pyunit);
@@ -832,7 +832,7 @@ static PyObject *BPy_FloatVectorProperty(PyObject *self, PyObject *args, PyObjec
 {
 	StructRNA *srna;
 
-	BPY_PROPDEF_HEAD(FloatVectorProperty)
+	BPY_PROPDEF_HEAD(FloatVectorProperty);
 
 	if (srna) {
 		static const char *kwlist[] = {"attr", "name", "description", "default",
@@ -865,7 +865,7 @@ static PyObject *BPy_FloatVectorProperty(PyObject *self, PyObject *args, PyObjec
 			return NULL;
 		}
 
-		BPY_PROPDEF_SUBTYPE_CHECK(FloatVectorProperty, property_flag_items, property_subtype_array_items)
+		BPY_PROPDEF_SUBTYPE_CHECK(FloatVectorProperty, property_flag_items, property_subtype_array_items);
 
 		if (pyunit && RNA_enum_value_from_id(property_unit_items, pyunit, &unit) == 0) {
 			PyErr_Format(PyExc_TypeError, "FloatVectorProperty(unit='%s'): invalid unit", pyunit);
@@ -928,7 +928,7 @@ static PyObject *BPy_StringProperty(PyObject *self, PyObject *args, PyObject *kw
 {
 	StructRNA *srna;
 
-	BPY_PROPDEF_HEAD(StringProperty)
+	BPY_PROPDEF_HEAD(StringProperty);
 
 	if (srna) {
 		static const char *kwlist[] = {"attr", "name", "description", "default",
@@ -953,7 +953,7 @@ static PyObject *BPy_StringProperty(PyObject *self, PyObject *args, PyObject *kw
 			return NULL;
 		}
 
-		BPY_PROPDEF_SUBTYPE_CHECK(StringProperty, property_flag_items, property_subtype_string_items)
+		BPY_PROPDEF_SUBTYPE_CHECK(StringProperty, property_flag_items, property_subtype_string_items);
 
 		if (bpy_prop_callback_check(update_cb, 2) == -1) {
 			return NULL;
@@ -1235,7 +1235,7 @@ static PyObject *BPy_EnumProperty(PyObject *self, PyObject *args, PyObject *kw)
 {
 	StructRNA *srna;
 
-	BPY_PROPDEF_HEAD(EnumProperty)
+	BPY_PROPDEF_HEAD(EnumProperty);
 	
 	if (srna) {
 		static const char *kwlist[] = {"attr", "items", "name", "description", "default",
@@ -1262,7 +1262,7 @@ static PyObject *BPy_EnumProperty(PyObject *self, PyObject *args, PyObject *kw)
 			return NULL;
 		}
 
-		BPY_PROPDEF_CHECK(EnumProperty, property_flag_enum_items)
+		BPY_PROPDEF_CHECK(EnumProperty, property_flag_enum_items);
 
 		if (bpy_prop_callback_check(update_cb, 2) == -1) {
 			return NULL;
@@ -1385,7 +1385,7 @@ static PyObject *BPy_PointerProperty(PyObject *self, PyObject *args, PyObject *k
 {
 	StructRNA *srna;
 
-	BPY_PROPDEF_HEAD(PointerProperty)
+	BPY_PROPDEF_HEAD(PointerProperty);
 
 	if (srna) {
 		static const char *kwlist[] = {"attr", "type", "name", "description", "options", "update", NULL};
@@ -1408,7 +1408,7 @@ static PyObject *BPy_PointerProperty(PyObject *self, PyObject *args, PyObject *k
 			return NULL;
 		}
 
-		BPY_PROPDEF_CHECK(PointerProperty, property_flag_items)
+		BPY_PROPDEF_CHECK(PointerProperty, property_flag_items);
 
 		ptype = pointer_type_from_py(type, "PointerProperty(...):");
 		if (!ptype)
@@ -1450,7 +1450,7 @@ static PyObject *BPy_CollectionProperty(PyObject *self, PyObject *args, PyObject
 {
 	StructRNA *srna;
 
-	BPY_PROPDEF_HEAD(CollectionProperty)
+	BPY_PROPDEF_HEAD(CollectionProperty);
 
 	if (srna) {
 		static const char *kwlist[] = {"attr", "type", "name", "description", "options", NULL};
@@ -1471,7 +1471,7 @@ static PyObject *BPy_CollectionProperty(PyObject *self, PyObject *args, PyObject
 			return NULL;
 		}
 
-		BPY_PROPDEF_CHECK(CollectionProperty, property_flag_items)
+		BPY_PROPDEF_CHECK(CollectionProperty, property_flag_items);
 
 		ptype = pointer_type_from_py(type, "CollectionProperty(...):");
 		if (!ptype)
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index fe18fd040eb..04f9a90f0d2 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -591,7 +591,7 @@ static short pyrna_rotation_euler_order_get(PointerRNA *ptr, PropertyRNA **prop_
 /* note that PROP_NONE is included as a vector subtype. this is because its handy to
  * have x/y access to fcurve keyframes and other fixed size float arrays of length 2-4. */
 #define PROP_ALL_VECTOR_SUBTYPES                                              \
-		 PROP_COORDS:                                                         \
+	     PROP_COORDS:                                                         \
 	case PROP_TRANSLATION:                                                    \
 	case PROP_DIRECTION:                                                      \
 	case PROP_VELOCITY:                                                       \
@@ -2046,7 +2046,7 @@ static int pyrna_prop_collection_bool(BPy_PropertyRNA *self)
 			             "bpy_prop_collection[%d]: out of range.", keynum);   \
 			return ret_err;                                                   \
 		}                                                                     \
-	}                                                                         \
+	} (void)0
 
 
 /* internal use only */
@@ -3467,7 +3467,7 @@ static PyObject *pyrna_struct_getattro(BPy_StructRNA *self, PyObject *pyname)
 		ret = pyrna_prop_to_py(&self->ptr, prop);
 	}
 	/* RNA function only if callback is declared (no optional functions) */
-	else if ((func = RNA_struct_find_function(&self->ptr, name)) && RNA_function_defined(func)) {
+	else if ((func = RNA_struct_find_function(self->ptr.type, name)) && RNA_function_defined(func)) {
 		ret = pyrna_func_to_py(&self->ptr, func);
 	}
 	else if (self->ptr.type == &RNA_Context) {
@@ -3780,7 +3780,7 @@ static PyObject *pyrna_prop_collection_getattro(BPy_PropertyRNA *self, PyObject
 
 				return ret;
 			}
-			else if ((func = RNA_struct_find_function(&r_ptr, name))) {
+			else if ((func = RNA_struct_find_function(r_ptr.type, name))) {
 				PyObject *self_collection = pyrna_struct_CreatePyObject(&r_ptr);
 				ret = pyrna_func_to_py(&((BPy_DummyPointerRNA *)self_collection)->ptr, func);
 				Py_DECREF(self_collection);
@@ -6856,7 +6856,7 @@ static int bpy_class_validate(PointerRNA *dummyptr, void *py_data, int *have_fun
 			}                                                                 \
 		}                                                                     \
 		Py_XDECREF(item);                                                     \
-	}                                                                         \
+	} (void)0
 
 
 			BPY_REPLACEMENT_STRING("bl_idname", "__name__");
diff --git a/source/blender/python/mathutils/mathutils_Color.c b/source/blender/python/mathutils/mathutils_Color.c
index 0f421f1ddea..59c57e916d4 100644
--- a/source/blender/python/mathutils/mathutils_Color.c
+++ b/source/blender/python/mathutils/mathutils_Color.c
@@ -723,10 +723,10 @@ static int Color_channel_hsv_set(ColorObject *self, PyObject *value, void *type)
 	if (BaseMath_ReadCallback(self) == -1)
 		return -1;
 
-	rgb_to_hsv(self->col[0], self->col[1], self->col[2], &(hsv[0]), &(hsv[1]), &(hsv[2]));
+	rgb_to_hsv_v(self->col, hsv);
 	CLAMP(f, 0.0f, 1.0f);
 	hsv[i] = f;
-	hsv_to_rgb(hsv[0], hsv[1], hsv[2], &(self->col[0]), &(self->col[1]), &(self->col[2]));
+	hsv_to_rgb_v(hsv, self->col);
 
 	if (BaseMath_WriteCallback(self) == -1)
 		return -1;
@@ -764,7 +764,7 @@ static int Color_hsv_set(ColorObject *self, PyObject *value, void *UNUSED(closur
 	CLAMP(hsv[1], 0.0f, 1.0f);
 	CLAMP(hsv[2], 0.0f, 1.0f);
 
-	hsv_to_rgb(hsv[0], hsv[1], hsv[2], &(self->col[0]), &(self->col[1]), &(self->col[2]));
+	hsv_to_rgb_v(hsv, self->col);
 
 	if (BaseMath_WriteCallback(self) == -1)
 		return -1;
diff --git a/source/blender/python/mathutils/mathutils_Vector.c b/source/blender/python/mathutils/mathutils_Vector.c
index 07bda4c2b91..54044b62e04 100644
--- a/source/blender/python/mathutils/mathutils_Vector.c
+++ b/source/blender/python/mathutils/mathutils_Vector.c
@@ -2268,6 +2268,11 @@ static int Vector_swizzle_set(VectorObject *self, PyObject *value, void *closure
 	axis_from = 0;
 	swizzleClosure = GET_INT_FROM_POINTER(closure);
 
+	/* We must first copy current vec into tvec, else some org values may be lost.
+	 * See [#31760].
+	 * Assuming self->size can't be higher than MAX_DIMENSIONS! */
+	memcpy(tvec, self->vec, self->size * sizeof(float));
+
 	while (swizzleClosure & SWIZZLE_VALID_AXIS) {
 		axis_to = swizzleClosure & SWIZZLE_AXIS;
 		tvec[axis_to] = vec_assign[axis_from];
@@ -2275,7 +2280,9 @@ static int Vector_swizzle_set(VectorObject *self, PyObject *value, void *closure
 		axis_from++;
 	}
 
-	memcpy(self->vec, tvec, axis_from * sizeof(float));
+	/* We must copy back the whole tvec into vec, else some changes may be lost (e.g. xz...).
+	 * See [#31760]. */
+	memcpy(self->vec, tvec, self->size * sizeof(float));
 	/* continue with BaseMathObject_WriteCallback at the end */
 
 	if (BaseMath_WriteCallback(self) == -1)
diff --git a/source/blender/python/mathutils/mathutils_geometry.c b/source/blender/python/mathutils/mathutils_geometry.c
index c6bfeff1651..4d05b837952 100644
--- a/source/blender/python/mathutils/mathutils_geometry.c
+++ b/source/blender/python/mathutils/mathutils_geometry.c
@@ -807,6 +807,7 @@ PyDoc_STRVAR(M_Geometry_intersect_point_quad_2d_doc,
 "\n"
 "   Takes 5 vectors (using only the x and y coordinates): one is the point and the next 4 define the quad, \n"
 "   only the x and y are used from the vectors. Returns 1 if the point is within the quad, otherwise 0.\n"
+"   Works only with convex quads without singular edges."
 "\n"
 "   :arg pt: Point\n"
 "   :type pt: :class:`mathutils.Vector`\n"
diff --git a/source/blender/quicktime/quicktime_import.h b/source/blender/quicktime/quicktime_import.h
index e6f3c821b85..19bdbb4814c 100644
--- a/source/blender/quicktime/quicktime_import.h
+++ b/source/blender/quicktime/quicktime_import.h
@@ -61,7 +61,7 @@
 #endif /* _WIN32 _ */
 
 
-char *get_valid_qtname(char *name);
+char *get_valid_qtname(const char *name);
 
 
 // quicktime movie import functions
diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h
index cf9e6f7966f..26a1b9908b3 100644
--- a/source/blender/render/extern/include/RE_shader_ext.h
+++ b/source/blender/render/extern/include/RE_shader_ext.h
@@ -45,8 +45,7 @@ typedef struct TexResult {
 } TexResult;
 
 /* localized shade result data */
-typedef struct ShadeResult 
-{
+typedef struct ShadeResult {
 	float combined[4];
 	float col[4];
 	float alpha, mist, z;
@@ -95,8 +94,7 @@ typedef struct ShadeInputCol {
 } ShadeInputCol;
 
 /* localized renderloop data */
-typedef struct ShadeInput
-{
+typedef struct ShadeInput {
 	/* copy from face, also to extract tria from quad */
 	/* note it mirrors a struct above for quick copy */
 	
diff --git a/source/blender/render/intern/include/pixelblending.h b/source/blender/render/intern/include/pixelblending.h
index 97d41107856..bb2e7e7f9f9 100644
--- a/source/blender/render/intern/include/pixelblending.h
+++ b/source/blender/render/intern/include/pixelblending.h
@@ -36,30 +36,30 @@
  * add 1 pixel to into filtered three lines
  * (float vecs to float vec)
  */
-void add_filt_fmask(unsigned int mask, float *col, float *rowbuf, int row_w);
+void add_filt_fmask(unsigned int mask, const float col[4], float *rowbuf, int row_w);
 void add_filt_fmask_pixsize(unsigned int mask, float *in, float *rowbuf, int row_w, int pixsize);
-void add_filt_fmask_coord(float filt[][3], float *col, float *rowbuf, int row_w, int col_h, int x, int y);
+void add_filt_fmask_coord(float filt[][3], const float col[4], float *rowbuf, int row_w, int col_h, int x, int y);
 void mask_array(unsigned int mask, float filt[][3]);
 
 /**
  * Alpha-over blending for floats.
  */
-void addAlphaOverFloat(float *dest, float *source);  
+void addAlphaOverFloat(float dest[4], const float source[4]);
 
 /**
  * Alpha-under blending for floats.
  */
-void addAlphaUnderFloat(float *dest, float *source);  
+void addAlphaUnderFloat(float dest[4], const float source[4]);
 
 
 /**
  * Same for floats
  */
-void addalphaAddfacFloat(float *dest, float *source, char addfac);
+void addalphaAddfacFloat(float dest[4], const float source[4], char addfac);
 
 /**
  * dest = dest + source
  */
-void addalphaAddFloat(float *dest, float *source);
+void addalphaAddFloat(float dest[4], const float source[4]);
 
 #endif /* __PIXELBLENDING_H__ */
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index f84b00451a6..e5af51cf2d7 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -65,16 +65,14 @@ struct Main;
 #define TABLEINITSIZE 1024
 #define LAMPINITSIZE 256
 
-typedef struct SampleTables
-{
+typedef struct SampleTables {
 	float centLut[16];
 	float *fmask1[9], *fmask2[9];
 	char cmask[256], *centmask;
 	
 } SampleTables;
 
-typedef struct QMCSampler
-{
+typedef struct QMCSampler {
 	struct QMCSampler *next, *prev;
 	int type;
 	int tot;
@@ -88,8 +86,7 @@ typedef struct QMCSampler
 #define SAMP_TYPE_HAMMERSLEY	2
 
 /* this is handed over to threaded hiding/passes/shading engine */
-typedef struct RenderPart
-{
+typedef struct RenderPart {
 	struct RenderPart *next, *prev;
 	
 	RenderResult *result;			/* result of part rendering */
@@ -347,8 +344,7 @@ typedef struct ObjectInstanceRen {
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct VertRen
-{
+typedef struct VertRen {
 	float co[3];
 	float n[3];
 	float *orco;
@@ -384,8 +380,7 @@ typedef struct VlakRen {
 	int index;
 } VlakRen;
 
-typedef struct HaloRen
-{	
+typedef struct HaloRen {
 	short miny, maxy;
 	float alfa, xs, ys, rad, radsq, sin, cos, co[3], no[3];
 	float hard, b, g, r;
@@ -456,8 +451,7 @@ typedef struct StrandRen {
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct VolumeOb
-{
+typedef struct VolumeOb {
 	struct VolumeOb *next, *prev;
 	struct Material *ma;
 	struct ObjectRen *obr;
@@ -469,8 +463,7 @@ typedef struct MatInside {
 	struct ObjectInstanceRen *obi;
 } MatInside;
 
-typedef struct VolPrecachePart
-{
+typedef struct VolPrecachePart {
 	struct VolPrecachePart *next, *prev;
 	struct RayObject *tree;
 	struct ShadeInput *shi;
@@ -486,8 +479,7 @@ typedef struct VolPrecachePart
 	struct Render *re;
 } VolPrecachePart;
 
-typedef struct VolumePrecache
-{
+typedef struct VolumePrecache {
 	int res[3];
 	float *bbmin, *bbmax;
 	float *data_r;
diff --git a/source/blender/render/intern/include/rendercore.h b/source/blender/render/intern/include/rendercore.h
index a66165d4680..0fbbf52e613 100644
--- a/source/blender/render/intern/include/rendercore.h
+++ b/source/blender/render/intern/include/rendercore.h
@@ -34,11 +34,6 @@
 
 #include "render_types.h"
 
-
-/* vector defines */
-
-#define CROSS(dest, a, b)		{ dest[0]= a[1] * b[2] - a[2] * b[1]; dest[1]= a[2] * b[0] - a[0] * b[2]; dest[2]= a[0] * b[1] - a[1] * b[0]; }
-
 struct HaloRen;
 struct ShadeInput;
 struct ShadeResult;
@@ -51,16 +46,14 @@ struct RayObject;
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct PixStr
-{
+typedef struct PixStr {
 	struct PixStr *next;
 	int obi, facenr, z, maskz;
 	unsigned short mask;
 	short shadfac;
 } PixStr;
 
-typedef struct PixStrMain
-{
+typedef struct PixStrMain {
 	struct PixStrMain *next, *prev;
 	struct PixStr *ps;
 	int counter;
diff --git a/source/blender/render/intern/include/renderdatabase.h b/source/blender/render/intern/include/renderdatabase.h
index 298fc3b49ac..584e56836fa 100644
--- a/source/blender/render/intern/include/renderdatabase.h
+++ b/source/blender/render/intern/include/renderdatabase.h
@@ -97,8 +97,13 @@ struct VlakRen *RE_findOrAddVlak(struct ObjectRen *obr, int nr);
 struct VertRen *RE_findOrAddVert(struct ObjectRen *obr, int nr);
 struct StrandRen *RE_findOrAddStrand(struct ObjectRen *obr, int nr);
 struct HaloRen *RE_findOrAddHalo(struct ObjectRen *obr, int nr);
-struct HaloRen *RE_inithalo(struct Render *re, struct ObjectRen *obr, struct Material *ma, float *vec, float *vec1, float *orco, float hasize,  float vectsize, int seed);
-struct HaloRen *RE_inithalo_particle(struct Render *re, struct ObjectRen *obr, struct DerivedMesh *dm, struct Material *ma,   float *vec,   float *vec1, float *orco, float *uvco, float hasize, float vectsize, int seed, float *pa_co);
+struct HaloRen *RE_inithalo(struct Render *re, struct ObjectRen *obr, struct Material *ma,
+                            const float vec[3], const float vec1[3],
+                            const float *orco, float hasize,  float vectsize, int seed);
+struct HaloRen *RE_inithalo_particle(struct Render *re, struct ObjectRen *obr, struct DerivedMesh *dm, struct Material *ma,
+                                     const float vec[3], const float vec1[3],
+                                     const float *orco, const float *uvco, float hasize, float vectsize, int seed,
+                                     const float pa_co[3]);
 struct StrandBuffer *RE_addStrandBuffer(struct ObjectRen *obr, int totvert);
 
 struct ObjectRen *RE_addRenderObject(struct Render *re, struct Object *ob, struct Object *par, int index, int psysindex, int lay);
diff --git a/source/blender/render/intern/include/shading.h b/source/blender/render/intern/include/shading.h
index 558342a46ab..a8519d8a7fb 100644
--- a/source/blender/render/intern/include/shading.h
+++ b/source/blender/render/intern/include/shading.h
@@ -96,7 +96,7 @@ ListBase *get_lights(struct ShadeInput *shi);
 float lamp_get_visibility(struct LampRen *lar, const float co[3], float lv[3], float *dist);
 void lamp_get_shadow(struct LampRen *lar, ShadeInput *shi, float inp, float shadfac[4], int do_real);
 
-float	fresnel_fac(float *view, float *vn, float fresnel, float fac);
+float	fresnel_fac(const float view[3], const float vn[3], float fresnel, float fac);
 
 /* rayshade.c */
 extern void shade_ray(struct Isect *is, struct ShadeInput *shi, struct ShadeResult *shr);
diff --git a/source/blender/render/intern/include/sss.h b/source/blender/render/intern/include/sss.h
index 6a179d2f428..91a8b91e638 100644
--- a/source/blender/render/intern/include/sss.h
+++ b/source/blender/render/intern/include/sss.h
@@ -42,13 +42,13 @@ struct ScatterTree;
 typedef struct ScatterTree ScatterTree;
 
 ScatterSettings *scatter_settings_new(float refl, float radius, float ior,
-	float reflfac, float frontweight, float backweight);
+                                      float reflfac, float frontweight, float backweight);
 void scatter_settings_free(ScatterSettings *ss);
 
 ScatterTree *scatter_tree_new(ScatterSettings *ss[3], float scale, float error,
-	float (*co)[3], float (*color)[3], float *area, int totpoint);
+                              float (*co)[3], float (*color)[3], float *area, int totpoint);
 void scatter_tree_build(ScatterTree *tree);
-void scatter_tree_sample(ScatterTree *tree, float *co, float *color);
+void scatter_tree_sample(ScatterTree *tree, const float co[3], float color[3]);
 void scatter_tree_free(ScatterTree *tree);
 
 /* Internal renderer API */
@@ -61,7 +61,7 @@ void make_sss_tree(struct Render *re);
 void sss_add_points(Render *re, float (*co)[3], float (*color)[3], float *area, int totpoint);
 void free_sss(struct Render *re);
 
-int sample_sss(struct Render *re, struct Material *mat, float *co, float *col);
+int sample_sss(struct Render *re, struct Material *mat, const float co[3], float color[3]);
 int sss_pass_done(struct Render *re, struct Material *mat);
 
 #endif /*__SSS_H__*/
diff --git a/source/blender/render/intern/include/sunsky.h b/source/blender/render/intern/include/sunsky.h
index 0afd9246150..4bb7d99ba16 100644
--- a/source/blender/render/intern/include/sunsky.h
+++ b/source/blender/render/intern/include/sunsky.h
@@ -31,8 +31,7 @@
 #define SPECTRUM_START              350.0
 #define SPECTRUM_END                800.0
 
-typedef struct SunSky
-{
+typedef struct SunSky {
 	short effect_type, skyblendtype, sky_colorspace;
 	float turbidity;
 	float theta, phi;
diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h
index 33717d47c82..1c8a2552482 100644
--- a/source/blender/render/intern/include/texture.h
+++ b/source/blender/render/intern/include/texture.h
@@ -67,7 +67,7 @@ void do_halo_tex(struct HaloRen *har, float xn, float yn, float col_r[4]);
 void do_sky_tex(const float rco[3], float lo[3], const float dxyview[2], float hor[3], float zen[3], float *blend, int skyflag, short thread);
 void do_material_tex(struct ShadeInput *shi, struct Render *re);
 void do_lamp_tex(LampRen *la, const float lavec[3], struct ShadeInput *shi, float col_r[3], int effect);
-void do_volume_tex(struct ShadeInput *shi, const float xyz[3], int mapto_flag, float col[3], float *val, struct Render *re);
+void do_volume_tex(struct ShadeInput *shi, const float xyz[3], int mapto_flag, float col_r[3], float *val, struct Render *re);
 
 void init_render_textures(Render *re);
 void end_render_textures(Render *re);
diff --git a/source/blender/render/intern/include/voxeldata.h b/source/blender/render/intern/include/voxeldata.h
index 63620331c85..dd2262e0357 100644
--- a/source/blender/render/intern/include/voxeldata.h
+++ b/source/blender/render/intern/include/voxeldata.h
@@ -35,8 +35,7 @@
 struct Render;
 struct TexResult;
 
-typedef struct VoxelDataHeader
-{
+typedef struct VoxelDataHeader {
 	int resolX, resolY, resolZ;
 	int frames;
 } VoxelDataHeader;
diff --git a/source/blender/render/intern/include/zbuf.h b/source/blender/render/intern/include/zbuf.h
index 518b2f846d3..cdf171443d7 100644
--- a/source/blender/render/intern/include/zbuf.h
+++ b/source/blender/render/intern/include/zbuf.h
@@ -80,8 +80,7 @@ typedef struct APixstrand {
 	struct APixstrand *next;
 } APixstrand;
 
-typedef struct APixstrMain
-{
+typedef struct APixstrMain {
 	struct APixstrMain *next, *prev;
 	void *ps;
 } APixstrMain;
@@ -91,7 +90,7 @@ typedef struct ZSpan {
 	int rectx, recty;						/* range for clipping */
 	
 	int miny1, maxy1, miny2, maxy2;			/* actual filled in range */
-	float *minp1, *maxp1, *minp2, *maxp2;	/* vertex pointers detect min/max range in */
+	const float *minp1, *maxp1, *minp2, *maxp2;	/* vertex pointers detect min/max range in */
 	float *span1, *span2;
 	
 	float zmulx, zmuly, zofsx, zofsy;		/* transform from hoco to zbuf co */
@@ -115,23 +114,26 @@ typedef struct ZSpan {
 	void *sss_handle;						/* used by sss */
 	void (*sss_func)(void *, int, int, int, int, int);
 	
-	void (*zbuffunc)(struct ZSpan *, int, int, float *, float *, float *, float *);
-	void (*zbuflinefunc)(struct ZSpan *, int, int, float *, float *);
+	void (*zbuffunc)(struct ZSpan *, int, int, const float *, const float *, const float *, const float *);
+	void (*zbuflinefunc)(struct ZSpan *, int, int, const float *, const float *);
 	
 } ZSpan;
 
 /* exported to shadbuf.c */
-void zbufclip4(struct ZSpan *zspan, int obi, int zvlnr, float *f1, float *f2, float *f3, float *f4, int c1, int c2, int c3, int c4);
+void zbufclip4(struct ZSpan *zspan, int obi, int zvlnr, float *f1, float *f2, float *f3, float *f4,
+               int c1, int c2, int c3, int c4);
 void zbuf_free_span(struct ZSpan *zspan);
 void freepsA(struct ListBase *lb);
 
 /* to rendercore.c */
-void zspan_scanconvert(struct ZSpan *zpan, void *handle, float *v1, float *v2, float *v3, void (*func)(void *, int, int, float, float) );
+void zspan_scanconvert(struct ZSpan *zpan, void *handle, float *v1, float *v2, float *v3,
+                       void (*func)(void *, int, int, float, float) );
 
 /* exported to edge render... */
 void zbufclip(struct ZSpan *zspan, int obi, int zvlnr, float *f1, float *f2, float *f3, int c1, int c2, int c3);
 void zbuf_alloc_span(struct ZSpan *zspan, int rectx, int recty, float clipcrop);
-void zbufclipwire(struct ZSpan *zspan, int obi, int zvlnr, int ec, float *ho1, float *ho2, float *ho3, float *ho4, int c1, int c2, int c3, int c4);
+void zbufclipwire(struct ZSpan *zspan, int obi, int zvlnr, int ec,
+                  float *ho1, float *ho2, float *ho3, float *ho4, int c1, int c2, int c3, int c4);
 
 /* exported to shadeinput.c */
 void zbuf_make_winmat(Render *re, float winmat[][4]);
diff --git a/source/blender/render/intern/raytrace/rayobject_instance.cpp b/source/blender/render/intern/raytrace/rayobject_instance.cpp
index ce88bac1587..92a412103ba 100644
--- a/source/blender/render/intern/raytrace/rayobject_instance.cpp
+++ b/source/blender/render/intern/raytrace/rayobject_instance.cpp
@@ -62,8 +62,7 @@ static RayObjectAPI instance_api =
 	RE_rayobject_instance_hint_bb	
 };
 
-typedef struct InstanceRayObject
-{
+typedef struct InstanceRayObject {
 	RayObject rayobj;
 	RayObject *target;
 
diff --git a/source/blender/render/intern/raytrace/rayobject_octree.cpp b/source/blender/render/intern/raytrace/rayobject_octree.cpp
index dc7b6dd6e8d..538c5493282 100644
--- a/source/blender/render/intern/raytrace/rayobject_octree.cpp
+++ b/source/blender/render/intern/raytrace/rayobject_octree.cpp
@@ -51,18 +51,15 @@
 #define BRANCH_ARRAY 1024
 #define NODE_ARRAY 4096
 
-typedef struct Branch
-{
+typedef struct Branch {
 	struct Branch *b[8];
 } Branch;
 
-typedef struct OcVal 
-{
+typedef struct OcVal {
 	short ocx, ocy, ocz;
 } OcVal;
 
-typedef struct Node
-{
+typedef struct Node {
 	struct RayFace *v[8];
 	struct OcVal ov[8];
 	struct Node *next;
@@ -73,7 +70,7 @@ typedef struct Octree {
 
 	struct Branch **adrbranch;
 	struct Node **adrnode;
-	float ocsize;	/* ocsize: mult factor,  max size octree */
+	float ocsize;   /* ocsize: mult factor,  max size octree */
 	float ocfacx, ocfacy, ocfacz;
 	float min[3], max[3];
 	int ocres;
@@ -121,8 +118,8 @@ static RayObjectAPI octree_api =
 /* **************** ocval method ******************* */
 /* within one octree node, a set of 3x15 bits defines a 'boundbox' to OR with */
 
-#define OCVALRES	15
-#define BROW16(min, max)      (((max)>=OCVALRES? 0xFFFF: (1<<(max+1))-1) - ((min>0)? ((1<<(min))-1):0) )
+#define OCVALRES    15
+#define BROW16(min, max)  (((max) >= OCVALRES ? 0xFFFF : (1 << (max + 1)) - 1) - ((min > 0) ? ((1 << (min)) - 1) : 0))
 
 static void calc_ocval_face(float *v1, float *v2, float *v3, float *v4, short x, short y, short z, OcVal *ov)
 {
@@ -137,17 +134,17 @@ static void calc_ocval_face(float *v1, float *v2, float *v3, float *v4, short x,
 		DO_MINMAX(v4, min, max);
 	}
 	
-	ocmin= OCVALRES*(min[0]-x); 
-	ocmax= OCVALRES*(max[0]-x);
-	ov->ocx= BROW16(ocmin, ocmax);
-	
-	ocmin= OCVALRES*(min[1]-y); 
-	ocmax= OCVALRES*(max[1]-y);
-	ov->ocy= BROW16(ocmin, ocmax);
-	
-	ocmin= OCVALRES*(min[2]-z); 
-	ocmax= OCVALRES*(max[2]-z);
-	ov->ocz= BROW16(ocmin, ocmax);
+	ocmin = OCVALRES * (min[0] - x);
+	ocmax = OCVALRES * (max[0] - x);
+	ov->ocx = BROW16(ocmin, ocmax);
+
+	ocmin = OCVALRES * (min[1] - y);
+	ocmax = OCVALRES * (max[1] - y);
+	ov->ocy = BROW16(ocmin, ocmax);
+
+	ocmin = OCVALRES * (min[2] - z);
+	ocmax = OCVALRES * (max[2] - z);
+	ov->ocz = BROW16(ocmin, ocmax);
 
 }
 
@@ -155,35 +152,35 @@ static void calc_ocval_ray(OcVal *ov, float xo, float yo, float zo, float *vec1,
 {
 	int ocmin, ocmax;
 	
-	if (vec1[0]<vec2[0]) {
-		ocmin= OCVALRES*(vec1[0] - xo);
-		ocmax= OCVALRES*(vec2[0] - xo);
+	if (vec1[0] < vec2[0]) {
+		ocmin = OCVALRES * (vec1[0] - xo);
+		ocmax = OCVALRES * (vec2[0] - xo);
 	}
 	else {
-		ocmin= OCVALRES*(vec2[0] - xo);
-		ocmax= OCVALRES*(vec1[0] - xo);
+		ocmin = OCVALRES * (vec2[0] - xo);
+		ocmax = OCVALRES * (vec1[0] - xo);
 	}
-	ov->ocx= BROW16(ocmin, ocmax);
+	ov->ocx = BROW16(ocmin, ocmax);
 
-	if (vec1[1]<vec2[1]) {
-		ocmin= OCVALRES*(vec1[1] - yo);
-		ocmax= OCVALRES*(vec2[1] - yo);
+	if (vec1[1] < vec2[1]) {
+		ocmin = OCVALRES * (vec1[1] - yo);
+		ocmax = OCVALRES * (vec2[1] - yo);
 	}
 	else {
-		ocmin= OCVALRES*(vec2[1] - yo);
-		ocmax= OCVALRES*(vec1[1] - yo);
+		ocmin = OCVALRES * (vec2[1] - yo);
+		ocmax = OCVALRES * (vec1[1] - yo);
 	}
-	ov->ocy= BROW16(ocmin, ocmax);
+	ov->ocy = BROW16(ocmin, ocmax);
 
-	if (vec1[2]<vec2[2]) {
-		ocmin= OCVALRES*(vec1[2] - zo);
-		ocmax= OCVALRES*(vec2[2] - zo);
+	if (vec1[2] < vec2[2]) {
+		ocmin = OCVALRES * (vec1[2] - zo);
+		ocmax = OCVALRES * (vec2[2] - zo);
 	}
 	else {
-		ocmin= OCVALRES*(vec2[2] - zo);
-		ocmax= OCVALRES*(vec1[2] - zo);
+		ocmin = OCVALRES * (vec2[2] - zo);
+		ocmax = OCVALRES * (vec1[2] - zo);
 	}
-	ov->ocz= BROW16(ocmin, ocmax);
+	ov->ocz = BROW16(ocmin, ocmax);
 }
 
 /* ************* octree ************** */
@@ -195,17 +192,17 @@ static Branch *addbranch(Octree *oc, Branch *br, short ocb)
 	if (br->b[ocb]) return br->b[ocb];
 	
 	oc->branchcount++;
-	index= oc->branchcount>>12;
+	index = oc->branchcount >> 12;
 	
-	if (oc->adrbranch[index]==NULL)
-		oc->adrbranch[index]= (Branch*)MEM_callocN(4096*sizeof(Branch), "new oc branch");
+	if (oc->adrbranch[index] == NULL)
+		oc->adrbranch[index] = (Branch *)MEM_callocN(4096 * sizeof(Branch), "new oc branch");
 
-	if (oc->branchcount>= BRANCH_ARRAY*4096) {
+	if (oc->branchcount >= BRANCH_ARRAY * 4096) {
 		printf("error; octree branches full\n");
-		oc->branchcount=0;
+		oc->branchcount = 0;
 	}
 	
-	return br->b[ocb]= oc->adrbranch[index]+(oc->branchcount & 4095);
+	return br->b[ocb] = oc->adrbranch[index] + (oc->branchcount & 4095);
 }
 
 static Node *addnode(Octree *oc)
@@ -213,17 +210,17 @@ static Node *addnode(Octree *oc)
 	int index;
 	
 	oc->nodecount++;
-	index= oc->nodecount>>12;
+	index = oc->nodecount >> 12;
 	
-	if (oc->adrnode[index]==NULL)
-		oc->adrnode[index]= (Node*)MEM_callocN(4096*sizeof(Node), "addnode");
+	if (oc->adrnode[index] == NULL)
+		oc->adrnode[index] = (Node *)MEM_callocN(4096 * sizeof(Node), "addnode");
 
-	if (oc->nodecount> NODE_ARRAY*NODE_ARRAY) {
+	if (oc->nodecount > NODE_ARRAY * NODE_ARRAY) {
 		printf("error; octree nodes full\n");
-		oc->nodecount=0;
+		oc->nodecount = 0;
 	}
 	
-	return oc->adrnode[index]+(oc->nodecount & 4095);
+	return oc->adrnode[index] + (oc->nodecount & 4095);
 }
 
 static int face_in_node(RayFace *face, short x, short y, short z, float rtf[][3])
@@ -234,33 +231,33 @@ static int face_in_node(RayFace *face, short x, short y, short z, float rtf[][3]
 	// init static vars 
 	if (face) {
 		normal_tri_v3(nor, rtf[0], rtf[1], rtf[2]);
-		d= -nor[0]*rtf[0][0] - nor[1]*rtf[0][1] - nor[2]*rtf[0][2];
+		d = -nor[0] * rtf[0][0] - nor[1] * rtf[0][1] - nor[2] * rtf[0][2];
 		return 0;
 	}
 	
-	fx= x;
-	fy= y;
-	fz= z;
-	
-	if ((fx)*nor[0] + (fy)*nor[1] + (fz)*nor[2] + d > 0.0f) {
-		if ((fx+1)*nor[0] + (fy  )*nor[1] + (fz  )*nor[2] + d < 0.0f) return 1;
-		if ((fx  )*nor[0] + (fy+1)*nor[1] + (fz  )*nor[2] + d < 0.0f) return 1;
-		if ((fx+1)*nor[0] + (fy+1)*nor[1] + (fz  )*nor[2] + d < 0.0f) return 1;
-	
-		if ((fx  )*nor[0] + (fy  )*nor[1] + (fz+1)*nor[2] + d < 0.0f) return 1;
-		if ((fx+1)*nor[0] + (fy  )*nor[1] + (fz+1)*nor[2] + d < 0.0f) return 1;
-		if ((fx  )*nor[0] + (fy+1)*nor[1] + (fz+1)*nor[2] + d < 0.0f) return 1;
-		if ((fx+1)*nor[0] + (fy+1)*nor[1] + (fz+1)*nor[2] + d < 0.0f) return 1;
+	fx = x;
+	fy = y;
+	fz = z;
+
+	if ((fx) * nor[0] + (fy) * nor[1] + (fz) * nor[2] + d > 0.0f) {
+		if ((fx + 1) * nor[0] + (fy    ) * nor[1] + (fz    ) * nor[2] + d < 0.0f) return 1;
+		if ((fx    ) * nor[0] + (fy + 1) * nor[1] + (fz    ) * nor[2] + d < 0.0f) return 1;
+		if ((fx + 1) * nor[0] + (fy + 1) * nor[1] + (fz    ) * nor[2] + d < 0.0f) return 1;
+
+		if ((fx    ) * nor[0] + (fy    ) * nor[1] + (fz + 1) * nor[2] + d < 0.0f) return 1;
+		if ((fx + 1) * nor[0] + (fy    ) * nor[1] + (fz + 1) * nor[2] + d < 0.0f) return 1;
+		if ((fx    ) * nor[0] + (fy + 1) * nor[1] + (fz + 1) * nor[2] + d < 0.0f) return 1;
+		if ((fx + 1) * nor[0] + (fy + 1) * nor[1] + (fz + 1) * nor[2] + d < 0.0f) return 1;
 	}
 	else {
-		if ((fx+1)*nor[0] + (fy  )*nor[1] + (fz  )*nor[2] + d > 0.0f) return 1;
-		if ((fx  )*nor[0] + (fy+1)*nor[1] + (fz  )*nor[2] + d > 0.0f) return 1;
-		if ((fx+1)*nor[0] + (fy+1)*nor[1] + (fz  )*nor[2] + d > 0.0f) return 1;
-	
-		if ((fx  )*nor[0] + (fy  )*nor[1] + (fz+1)*nor[2] + d > 0.0f) return 1;
-		if ((fx+1)*nor[0] + (fy  )*nor[1] + (fz+1)*nor[2] + d > 0.0f) return 1;
-		if ((fx  )*nor[0] + (fy+1)*nor[1] + (fz+1)*nor[2] + d > 0.0f) return 1;
-		if ((fx+1)*nor[0] + (fy+1)*nor[1] + (fz+1)*nor[2] + d > 0.0f) return 1;
+		if ((fx + 1) * nor[0] + (fy    ) * nor[1] + (fz    ) * nor[2] + d > 0.0f) return 1;
+		if ((fx    ) * nor[0] + (fy + 1) * nor[1] + (fz    ) * nor[2] + d > 0.0f) return 1;
+		if ((fx + 1) * nor[0] + (fy + 1) * nor[1] + (fz    ) * nor[2] + d > 0.0f) return 1;
+
+		if ((fx    ) * nor[0] + (fy    ) * nor[1] + (fz + 1) * nor[2] + d > 0.0f) return 1;
+		if ((fx + 1) * nor[0] + (fy    ) * nor[1] + (fz + 1) * nor[2] + d > 0.0f) return 1;
+		if ((fx    ) * nor[0] + (fy + 1) * nor[1] + (fz + 1) * nor[2] + d > 0.0f) return 1;
+		if ((fx + 1) * nor[0] + (fy + 1) * nor[1] + (fz + 1) * nor[2] + d > 0.0f) return 1;
 	}
 	
 	return 0;
@@ -272,163 +269,163 @@ static void ocwrite(Octree *oc, RayFace *face, int quad, short x, short y, short
 	Node *no;
 	short a, oc0, oc1, oc2, oc3, oc4, oc5;
 
-	x<<=2;
-	y<<=1;
+	x <<= 2;
+	y <<= 1;
 
-	br= oc->adrbranch[0];
+	br = oc->adrbranch[0];
 
-	if (oc->ocres==512) {
-		oc0= ((x & 1024)+(y & 512)+(z & 256))>>8;
-		br= addbranch(oc, br, oc0);
+	if (oc->ocres == 512) {
+		oc0 = ((x & 1024) + (y & 512) + (z & 256)) >> 8;
+		br = addbranch(oc, br, oc0);
 	}
-	if (oc->ocres>=256) {
-		oc0= ((x & 512)+(y & 256)+(z & 128))>>7;
-		br= addbranch(oc, br, oc0);
+	if (oc->ocres >= 256) {
+		oc0 = ((x & 512) + (y & 256) + (z & 128)) >> 7;
+		br = addbranch(oc, br, oc0);
 	}
-	if (oc->ocres>=128) {
-		oc0= ((x & 256)+(y & 128)+(z & 64))>>6;
-		br= addbranch(oc, br, oc0);
+	if (oc->ocres >= 128) {
+		oc0 = ((x & 256) + (y & 128) + (z & 64)) >> 6;
+		br = addbranch(oc, br, oc0);
 	}
 
-	oc0= ((x & 128)+(y & 64)+(z & 32))>>5;
-	oc1= ((x & 64)+(y & 32)+(z & 16))>>4;
-	oc2= ((x & 32)+(y & 16)+(z & 8))>>3;
-	oc3= ((x & 16)+(y & 8)+(z & 4))>>2;
-	oc4= ((x & 8)+(y & 4)+(z & 2))>>1;
-	oc5= ((x & 4)+(y & 2)+(z & 1));
-
-	br= addbranch(oc, br, oc0);
-	br= addbranch(oc, br, oc1);
-	br= addbranch(oc, br, oc2);
-	br= addbranch(oc, br, oc3);
-	br= addbranch(oc, br, oc4);
-	no= (Node *)br->b[oc5];
-	if (no==NULL) br->b[oc5]= (Branch *)(no= addnode(oc));
+	oc0 = ((x & 128) + (y & 64) + (z & 32)) >> 5;
+	oc1 = ((x & 64) + (y & 32) + (z & 16)) >> 4;
+	oc2 = ((x & 32) + (y & 16) + (z & 8)) >> 3;
+	oc3 = ((x & 16) + (y & 8) + (z & 4)) >> 2;
+	oc4 = ((x & 8) + (y & 4) + (z & 2)) >> 1;
+	oc5 = ((x & 4) + (y & 2) + (z & 1));
+
+	br = addbranch(oc, br, oc0);
+	br = addbranch(oc, br, oc1);
+	br = addbranch(oc, br, oc2);
+	br = addbranch(oc, br, oc3);
+	br = addbranch(oc, br, oc4);
+	no = (Node *)br->b[oc5];
+	if (no == NULL) br->b[oc5] = (Branch *)(no = addnode(oc));
 
 	while (no->next) no = no->next;
 
-	a= 0;
-	if (no->v[7]) {		/* node full */
-		no->next= addnode(oc);
-		no= no->next;
+	a = 0;
+	if (no->v[7]) {     /* node full */
+		no->next = addnode(oc);
+		no = no->next;
 	}
 	else {
 		while (no->v[a] != NULL) a++;
 	}
 	
-	no->v[a]= (RayFace*) RE_rayobject_align(face);
+	no->v[a] = (RayFace *) RE_rayobject_align(face);
 	
 	if (quad)
-		calc_ocval_face(rtf[0], rtf[1], rtf[2], rtf[3], x>>2, y>>1, z, &no->ov[a]);
+		calc_ocval_face(rtf[0], rtf[1], rtf[2], rtf[3], x >> 2, y >> 1, z, &no->ov[a]);
 	else
-		calc_ocval_face(rtf[0], rtf[1], rtf[2], NULL, x>>2, y>>1, z, &no->ov[a]);
+		calc_ocval_face(rtf[0], rtf[1], rtf[2], NULL, x >> 2, y >> 1, z, &no->ov[a]);
 }
 
 static void d2dda(Octree *oc, short b1, short b2, short c1, short c2, char *ocface, short rts[][3], float rtf[][3])
 {
 	int ocx1, ocx2, ocy1, ocy2;
-	int x, y, dx=0, dy=0;
+	int x, y, dx = 0, dy = 0;
 	float ox1, ox2, oy1, oy2;
 	float labda, labdao, labdax, labday, ldx, ldy;
 
-	ocx1= rts[b1][c1];
-	ocy1= rts[b1][c2];
-	ocx2= rts[b2][c1];
-	ocy2= rts[b2][c2];
+	ocx1 = rts[b1][c1];
+	ocy1 = rts[b1][c2];
+	ocx2 = rts[b2][c1];
+	ocy2 = rts[b2][c2];
 
-	if (ocx1==ocx2 && ocy1==ocy2) {
-		ocface[oc->ocres*ocx1+ocy1]= 1;
+	if (ocx1 == ocx2 && ocy1 == ocy2) {
+		ocface[oc->ocres * ocx1 + ocy1] = 1;
 		return;
 	}
 
-	ox1= rtf[b1][c1];
-	oy1= rtf[b1][c2];
-	ox2= rtf[b2][c1];
-	oy2= rtf[b2][c2];
+	ox1 = rtf[b1][c1];
+	oy1 = rtf[b1][c2];
+	ox2 = rtf[b2][c1];
+	oy2 = rtf[b2][c2];
 
-	if (ox1!=ox2) {
-		if (ox2-ox1>0.0f) {
-			labdax= (ox1-ocx1-1.0f)/(ox1-ox2);
-			ldx= -1.0f/(ox1-ox2);
-			dx= 1;
+	if (ox1 != ox2) {
+		if (ox2 - ox1 > 0.0f) {
+			labdax = (ox1 - ocx1 - 1.0f) / (ox1 - ox2);
+			ldx = -1.0f / (ox1 - ox2);
+			dx = 1;
 		}
 		else {
-			labdax= (ox1-ocx1)/(ox1-ox2);
-			ldx= 1.0f/(ox1-ox2);
-			dx= -1;
+			labdax = (ox1 - ocx1) / (ox1 - ox2);
+			ldx = 1.0f / (ox1 - ox2);
+			dx = -1;
 		}
 	}
 	else {
-		labdax=1.0f;
-		ldx=0;
+		labdax = 1.0f;
+		ldx = 0;
 	}
 
-	if (oy1!=oy2) {
-		if (oy2-oy1>0.0f) {
-			labday= (oy1-ocy1-1.0f)/(oy1-oy2);
-			ldy= -1.0f/(oy1-oy2);
-			dy= 1;
+	if (oy1 != oy2) {
+		if (oy2 - oy1 > 0.0f) {
+			labday = (oy1 - ocy1 - 1.0f) / (oy1 - oy2);
+			ldy = -1.0f / (oy1 - oy2);
+			dy = 1;
 		}
 		else {
-			labday= (oy1-ocy1)/(oy1-oy2);
-			ldy= 1.0f/(oy1-oy2);
-			dy= -1;
+			labday = (oy1 - ocy1) / (oy1 - oy2);
+			ldy = 1.0f / (oy1 - oy2);
+			dy = -1;
 		}
 	}
 	else {
-		labday=1.0f;
-		ldy=0;
+		labday = 1.0f;
+		ldy = 0;
 	}
 	
-	x=ocx1; y=ocy1;
-	labda= MIN2(labdax, labday);
+	x = ocx1; y = ocy1;
+	labda = MIN2(labdax, labday);
 	
 	while (TRUE) {
 		
-		if (x<0 || y<0 || x>=oc->ocres || y>=oc->ocres);
-		else ocface[oc->ocres*x+y]= 1;
+		if (x < 0 || y < 0 || x >= oc->ocres || y >= oc->ocres) ;
+		else ocface[oc->ocres * x + y] = 1;
 		
-		labdao=labda;
-		if (labdax==labday) {
-			labdax+=ldx;
-			x+=dx;
-			labday+=ldy;
-			y+=dy;
+		labdao = labda;
+		if (labdax == labday) {
+			labdax += ldx;
+			x += dx;
+			labday += ldy;
+			y += dy;
 		}
 		else {
-			if (labdax<labday) {
-				labdax+=ldx;
-				x+=dx;
+			if (labdax < labday) {
+				labdax += ldx;
+				x += dx;
 			}
 			else {
-				labday+=ldy;
-				y+=dy;
+				labday += ldy;
+				y += dy;
 			}
 		}
-		labda=MIN2(labdax, labday);
-		if (labda==labdao) break;
-		if (labda>=1.0f) break;
+		labda = MIN2(labdax, labday);
+		if (labda == labdao) break;
+		if (labda >= 1.0f) break;
 	}
-	ocface[oc->ocres*ocx2+ocy2]=1;
+	ocface[oc->ocres * ocx2 + ocy2] = 1;
 }
 
 static void filltriangle(Octree *oc, short c1, short c2, char *ocface, short *ocmin, short *ocmax)
 {
 	int a, x, y, y1, y2;
 
-	for (x=ocmin[c1];x<=ocmax[c1];x++) {
-		a= oc->ocres*x;
-		for (y=ocmin[c2];y<=ocmax[c2];y++) {
-			if (ocface[a+y]) {
+	for (x = ocmin[c1]; x <= ocmax[c1]; x++) {
+		a = oc->ocres * x;
+		for (y = ocmin[c2]; y <= ocmax[c2]; y++) {
+			if (ocface[a + y]) {
 				y++;
-				while (ocface[a+y] && y!=ocmax[c2]) y++;
-				for (y1=ocmax[c2];y1>y;y1--) {
-					if (ocface[a+y1]) {
-						for (y2=y;y2<=y1;y2++) ocface[a+y2]=1;
-						y1=0;
+				while (ocface[a + y] && y != ocmax[c2]) y++;
+				for (y1 = ocmax[c2]; y1 > y; y1--) {
+					if (ocface[a + y1]) {
+						for (y2 = y; y2 <= y1; y2++) ocface[a + y2] = 1;
+						y1 = 0;
 					}
 				}
-				y=ocmax[c2];
+				y = ocmax[c2];
 			}
 		}
 	}
@@ -436,7 +433,7 @@ static void filltriangle(Octree *oc, short c1, short c2, char *ocface, short *oc
 
 static void RE_rayobject_octree_free(RayObject *tree)
 {
-	Octree *oc= (Octree*)tree;
+	Octree *oc = (Octree *)tree;
 
 #if 0
 	printf("branches %d nodes %d\n", oc->branchcount, oc->nodecount);
@@ -448,28 +445,28 @@ static void RE_rayobject_octree_free(RayObject *tree)
 		MEM_freeN(oc->ocface);
 
 	if (oc->adrbranch) {
-		int a= 0;
+		int a = 0;
 		while (oc->adrbranch[a]) {
 			MEM_freeN(oc->adrbranch[a]);
-			oc->adrbranch[a]= NULL;
+			oc->adrbranch[a] = NULL;
 			a++;
 		}
 		MEM_freeN(oc->adrbranch);
-		oc->adrbranch= NULL;
+		oc->adrbranch = NULL;
 	}
-	oc->branchcount= 0;
+	oc->branchcount = 0;
 	
 	if (oc->adrnode) {
-		int a= 0;
+		int a = 0;
 		while (oc->adrnode[a]) {
 			MEM_freeN(oc->adrnode[a]);
-			oc->adrnode[a]= NULL;
+			oc->adrnode[a] = NULL;
 			a++;
 		}
 		MEM_freeN(oc->adrnode);
-		oc->adrnode= NULL;
+		oc->adrnode = NULL;
 	}
-	oc->nodecount= 0;
+	oc->nodecount = 0;
 
 	MEM_freeN(oc);
 }
@@ -477,29 +474,29 @@ static void RE_rayobject_octree_free(RayObject *tree)
 
 RayObject *RE_rayobject_octree_create(int ocres, int size)
 {
-	Octree *oc= (Octree*)MEM_callocN(sizeof(Octree), "Octree");
-	assert( RE_rayobject_isAligned(oc) ); /* RayObject API assumes real data to be 4-byte aligned */	
+	Octree *oc = (Octree *)MEM_callocN(sizeof(Octree), "Octree");
+	assert(RE_rayobject_isAligned(oc) );  /* RayObject API assumes real data to be 4-byte aligned */
 	
 	oc->rayobj.api = &octree_api;
 	
 	oc->ocres = ocres;
 	
-	oc->ro_nodes = (RayFace**)MEM_callocN(sizeof(RayFace*)*size, "octree rayobject nodes");
+	oc->ro_nodes = (RayFace **)MEM_callocN(sizeof(RayFace *) * size, "octree rayobject nodes");
 	oc->ro_nodes_size = size;
 	oc->ro_nodes_used = 0;
 
 	
-	return RE_rayobject_unalignRayAPI((RayObject*) oc);
+	return RE_rayobject_unalignRayAPI((RayObject *) oc);
 }
 
 
 static void RE_rayobject_octree_add(RayObject *tree, RayObject *node)
 {
-	Octree *oc = (Octree*)tree;
+	Octree *oc = (Octree *)tree;
 
-	assert( RE_rayobject_isRayFace(node) );
-	assert( oc->ro_nodes_used < oc->ro_nodes_size );
-	oc->ro_nodes[ oc->ro_nodes_used++ ] = (RayFace*)RE_rayobject_align(node);
+	assert(RE_rayobject_isRayFace(node) );
+	assert(oc->ro_nodes_used < oc->ro_nodes_size);
+	oc->ro_nodes[oc->ro_nodes_used++] = (RayFace *)RE_rayobject_align(node);
 }
 
 static void octree_fill_rayface(Octree *oc, RayFace *face)
@@ -508,14 +505,14 @@ static void octree_fill_rayface(Octree *oc, RayFace *face)
 	float co1[3], co2[3], co3[3], co4[3];
 	short rts[4][3];
 	short ocmin[3], ocmax[3];
-	char *ocface= oc->ocface;	// front, top, size view of face, to fill in
+	char *ocface = oc->ocface;   // front, top, size view of face, to fill in
 	int a, b, c, oc1, oc2, oc3, oc4, x, y, z, ocres2;
 
-	ocfac[0]= oc->ocfacx;
-	ocfac[1]= oc->ocfacy;
-	ocfac[2]= oc->ocfacz;
+	ocfac[0] = oc->ocfacx;
+	ocfac[1] = oc->ocfacy;
+	ocfac[2] = oc->ocfacz;
 
-	ocres2= oc->ocres*oc->ocres;
+	ocres2 = oc->ocres * oc->ocres;
 
 	copy_v3_v3(co1, face->v1);
 	copy_v3_v3(co2, face->v2);
@@ -523,7 +520,7 @@ static void octree_fill_rayface(Octree *oc, RayFace *face)
 	if (face->v4)
 		copy_v3_v3(co4, face->v4);
 
-	for (c=0;c<3;c++) {
+	for (c = 0; c < 3; c++) {
 		rtf[0][c] = (co1[c] - oc->min[c]) * ocfac[c];
 		rts[0][c] = (short)rtf[0][c];
 		rtf[1][c] = (co2[c] - oc->min[c]) * ocfac[c];
@@ -536,62 +533,62 @@ static void octree_fill_rayface(Octree *oc, RayFace *face)
 		}
 	}
 	
-	for (c=0;c<3;c++) {
-		oc1= rts[0][c];
-		oc2= rts[1][c];
-		oc3= rts[2][c];
+	for (c = 0; c < 3; c++) {
+		oc1 = rts[0][c];
+		oc2 = rts[1][c];
+		oc3 = rts[2][c];
 		if (!RE_rayface_isQuad(face)) {
-			ocmin[c]= MIN3(oc1, oc2, oc3);
-			ocmax[c]= MAX3(oc1, oc2, oc3);
+			ocmin[c] = MIN3(oc1, oc2, oc3);
+			ocmax[c] = MAX3(oc1, oc2, oc3);
 		}
 		else {
-			oc4= rts[3][c];
-			ocmin[c]= MIN4(oc1, oc2, oc3, oc4);
-			ocmax[c]= MAX4(oc1, oc2, oc3, oc4);
+			oc4 = rts[3][c];
+			ocmin[c] = MIN4(oc1, oc2, oc3, oc4);
+			ocmax[c] = MAX4(oc1, oc2, oc3, oc4);
 		}
-		if (ocmax[c]>oc->ocres-1) ocmax[c]=oc->ocres-1;
-		if (ocmin[c]<0) ocmin[c]=0;
+		if (ocmax[c] > oc->ocres - 1) ocmax[c] = oc->ocres - 1;
+		if (ocmin[c] < 0) ocmin[c] = 0;
 	}
 	
-	if (ocmin[0]==ocmax[0] && ocmin[1]==ocmax[1] && ocmin[2]==ocmax[2]) {
+	if (ocmin[0] == ocmax[0] && ocmin[1] == ocmax[1] && ocmin[2] == ocmax[2]) {
 		ocwrite(oc, face, RE_rayface_isQuad(face), ocmin[0], ocmin[1], ocmin[2], rtf);
 	}
 	else {
 		
-		d2dda(oc, 0, 1, 0, 1, ocface+ocres2, rts, rtf);
+		d2dda(oc, 0, 1, 0, 1, ocface + ocres2, rts, rtf);
 		d2dda(oc, 0, 1, 0, 2, ocface, rts, rtf);
-		d2dda(oc, 0, 1, 1, 2, ocface+2*ocres2, rts, rtf);
-		d2dda(oc, 1, 2, 0, 1, ocface+ocres2, rts, rtf);
+		d2dda(oc, 0, 1, 1, 2, ocface + 2 * ocres2, rts, rtf);
+		d2dda(oc, 1, 2, 0, 1, ocface + ocres2, rts, rtf);
 		d2dda(oc, 1, 2, 0, 2, ocface, rts, rtf);
-		d2dda(oc, 1, 2, 1, 2, ocface+2*ocres2, rts, rtf);
+		d2dda(oc, 1, 2, 1, 2, ocface + 2 * ocres2, rts, rtf);
 		if (!RE_rayface_isQuad(face)) {
-			d2dda(oc, 2, 0, 0, 1, ocface+ocres2, rts, rtf);
+			d2dda(oc, 2, 0, 0, 1, ocface + ocres2, rts, rtf);
 			d2dda(oc, 2, 0, 0, 2, ocface, rts, rtf);
-			d2dda(oc, 2, 0, 1, 2, ocface+2*ocres2, rts, rtf);
+			d2dda(oc, 2, 0, 1, 2, ocface + 2 * ocres2, rts, rtf);
 		}
 		else {
-			d2dda(oc, 2, 3, 0, 1, ocface+ocres2, rts, rtf);
+			d2dda(oc, 2, 3, 0, 1, ocface + ocres2, rts, rtf);
 			d2dda(oc, 2, 3, 0, 2, ocface, rts, rtf);
-			d2dda(oc, 2, 3, 1, 2, ocface+2*ocres2, rts, rtf);
-			d2dda(oc, 3, 0, 0, 1, ocface+ocres2, rts, rtf);
+			d2dda(oc, 2, 3, 1, 2, ocface + 2 * ocres2, rts, rtf);
+			d2dda(oc, 3, 0, 0, 1, ocface + ocres2, rts, rtf);
 			d2dda(oc, 3, 0, 0, 2, ocface, rts, rtf);
-			d2dda(oc, 3, 0, 1, 2, ocface+2*ocres2, rts, rtf);
+			d2dda(oc, 3, 0, 1, 2, ocface + 2 * ocres2, rts, rtf);
 		}
 		/* nothing todo with triangle..., just fills :) */
-		filltriangle(oc, 0, 1, ocface+ocres2, ocmin, ocmax);
+		filltriangle(oc, 0, 1, ocface + ocres2, ocmin, ocmax);
 		filltriangle(oc, 0, 2, ocface, ocmin, ocmax);
-		filltriangle(oc, 1, 2, ocface+2*ocres2, ocmin, ocmax);
+		filltriangle(oc, 1, 2, ocface + 2 * ocres2, ocmin, ocmax);
 		
 		/* init static vars here */
 		face_in_node(face, 0, 0, 0, rtf);
 		
-		for (x=ocmin[0];x<=ocmax[0];x++) {
-			a= oc->ocres*x;
-			for (y=ocmin[1];y<=ocmax[1];y++) {
-				if (ocface[a+y+ocres2]) {
-					b= oc->ocres*y+2*ocres2;
-					for (z=ocmin[2];z<=ocmax[2];z++) {
-						if (ocface[b+z] && ocface[a+z]) {
+		for (x = ocmin[0]; x <= ocmax[0]; x++) {
+			a = oc->ocres * x;
+			for (y = ocmin[1]; y <= ocmax[1]; y++) {
+				if (ocface[a + y + ocres2]) {
+					b = oc->ocres * y + 2 * ocres2;
+					for (z = ocmin[2]; z <= ocmax[2]; z++) {
+						if (ocface[b + z] && ocface[a + z]) {
 							if (face_in_node(NULL, x, y, z, rtf))
 								ocwrite(oc, face, RE_rayface_isQuad(face), x, y, z, rtf);
 						}
@@ -601,18 +598,18 @@ static void octree_fill_rayface(Octree *oc, RayFace *face)
 		}
 		
 		/* same loops to clear octree, doubt it can be done smarter */
-		for (x=ocmin[0];x<=ocmax[0];x++) {
-			a= oc->ocres*x;
-			for (y=ocmin[1];y<=ocmax[1];y++) {
+		for (x = ocmin[0]; x <= ocmax[0]; x++) {
+			a = oc->ocres * x;
+			for (y = ocmin[1]; y <= ocmax[1]; y++) {
 				/* x-y */
-				ocface[a+y+ocres2]= 0;
+				ocface[a + y + ocres2] = 0;
 
-				b= oc->ocres*y + 2*ocres2;
-				for (z=ocmin[2];z<=ocmax[2];z++) {
+				b = oc->ocres * y + 2 * ocres2;
+				for (z = ocmin[2]; z <= ocmax[2]; z++) {
 					/* y-z */
-					ocface[b+z]= 0;
+					ocface[b + z] = 0;
 					/* x-z */
-					ocface[a+z]= 0;
+					ocface[a + z] = 0;
 				}
 			}
 		}
@@ -621,44 +618,44 @@ static void octree_fill_rayface(Octree *oc, RayFace *face)
 
 static void RE_rayobject_octree_done(RayObject *tree)
 {
-	Octree *oc = (Octree*)tree;
+	Octree *oc = (Octree *)tree;
 	int c;
 	float t00, t01, t02;
-	int ocres2 = oc->ocres*oc->ocres;
+	int ocres2 = oc->ocres * oc->ocres;
 	
 	INIT_MINMAX(oc->min, oc->max);
 	
 	/* Calculate Bounding Box */
-	for (c=0; c<oc->ro_nodes_used; c++)
-		RE_rayobject_merge_bb( RE_rayobject_unalignRayFace(oc->ro_nodes[c]), oc->min, oc->max);
+	for (c = 0; c < oc->ro_nodes_used; c++)
+		RE_rayobject_merge_bb(RE_rayobject_unalignRayFace(oc->ro_nodes[c]), oc->min, oc->max);
 		
 	/* Alloc memory */
-	oc->adrbranch= (Branch**)MEM_callocN(sizeof(void *)*BRANCH_ARRAY, "octree branches");
-	oc->adrnode= (Node**)MEM_callocN(sizeof(void *)*NODE_ARRAY, "octree nodes");
+	oc->adrbranch = (Branch **)MEM_callocN(sizeof(void *) * BRANCH_ARRAY, "octree branches");
+	oc->adrnode = (Node **)MEM_callocN(sizeof(void *) * NODE_ARRAY, "octree nodes");
 	
-	oc->adrbranch[0]=(Branch *)MEM_callocN(4096*sizeof(Branch), "makeoctree");
+	oc->adrbranch[0] = (Branch *)MEM_callocN(4096 * sizeof(Branch), "makeoctree");
 	
 	/* the lookup table, per face, for which nodes to fill in */
-	oc->ocface= (char*)MEM_callocN( 3*ocres2 + 8, "ocface");
-	memset(oc->ocface, 0, 3*ocres2);
+	oc->ocface = (char *)MEM_callocN(3 * ocres2 + 8, "ocface");
+	memset(oc->ocface, 0, 3 * ocres2);
 
-	for (c=0;c<3;c++) {	/* octree enlarge, still needed? */
-		oc->min[c]-= 0.01f;
-		oc->max[c]+= 0.01f;
+	for (c = 0; c < 3; c++) { /* octree enlarge, still needed? */
+		oc->min[c] -= 0.01f;
+		oc->max[c] += 0.01f;
 	}
 
-	t00= oc->max[0]-oc->min[0];
-	t01= oc->max[1]-oc->min[1];
-	t02= oc->max[2]-oc->min[2];
+	t00 = oc->max[0] - oc->min[0];
+	t01 = oc->max[1] - oc->min[1];
+	t02 = oc->max[2] - oc->min[2];
 	
 	/* this minus 0.1 is old safety... seems to be needed? */
-	oc->ocfacx= (oc->ocres-0.1)/t00;
-	oc->ocfacy= (oc->ocres-0.1)/t01;
-	oc->ocfacz= (oc->ocres-0.1)/t02;
+	oc->ocfacx = (oc->ocres - 0.1) / t00;
+	oc->ocfacy = (oc->ocres - 0.1) / t01;
+	oc->ocfacz = (oc->ocres - 0.1) / t02;
 	
-	oc->ocsize= sqrt(t00*t00+t01*t01+t02*t02);	/* global, max size octree */
+	oc->ocsize = sqrt(t00 * t00 + t01 * t01 + t02 * t02);  /* global, max size octree */
 
-	for (c=0; c<oc->ro_nodes_used; c++) {
+	for (c = 0; c < oc->ro_nodes_used; c++) {
 		octree_fill_rayface(oc, oc->ro_nodes[c]);
 	}
 
@@ -667,14 +664,14 @@ static void RE_rayobject_octree_done(RayObject *tree)
 	MEM_freeN(oc->ro_nodes);
 	oc->ro_nodes = NULL;
 	
-	printf("%f %f - %f\n", oc->min[0], oc->max[0], oc->ocfacx );
-	printf("%f %f - %f\n", oc->min[1], oc->max[1], oc->ocfacy );
-	printf("%f %f - %f\n", oc->min[2], oc->max[2], oc->ocfacz );
+	printf("%f %f - %f\n", oc->min[0], oc->max[0], oc->ocfacx);
+	printf("%f %f - %f\n", oc->min[1], oc->max[1], oc->ocfacy);
+	printf("%f %f - %f\n", oc->min[2], oc->max[2], oc->ocfacz);
 }
 
 static void RE_rayobject_octree_bb(RayObject *tree, float *min, float *max)
 {
-	Octree *oc = (Octree*)tree;
+	Octree *oc = (Octree *)tree;
 	DO_MINMAX(oc->min, min, max);
 	DO_MINMAX(oc->max, min, max);
 }
@@ -687,7 +684,7 @@ static int testnode(Octree *UNUSED(oc), Isect *is, Node *no, OcVal ocval)
 	/* return on any first hit */
 	if (is->mode == RE_RAY_SHADOW) {
 	
-		for ( ; no; no = no->next) {
+		for (; no; no = no->next) {
 			for (nr = 0; nr < 8; nr++) {
 				RayFace *face = no->v[nr];
 				OcVal     *ov = no->ov + nr;
@@ -695,7 +692,7 @@ static int testnode(Octree *UNUSED(oc), Isect *is, Node *no, OcVal ocval)
 				if (!face) break;
 
 				if ( (ov->ocx & ocval.ocx) && (ov->ocy & ocval.ocy) && (ov->ocz & ocval.ocz) ) {
-					if ( RE_rayobject_intersect( RE_rayobject_unalignRayFace(face), is) )
+					if (RE_rayobject_intersect(RE_rayobject_unalignRayFace(face), is) )
 						return 1;
 				}
 			}
@@ -703,9 +700,9 @@ static int testnode(Octree *UNUSED(oc), Isect *is, Node *no, OcVal ocval)
 	}
 	else {
 		/* else mirror or glass or shadowtra, return closest face  */
-		int found= 0;
+		int found = 0;
 		
-		for ( ; no; no = no->next) {
+		for (; no; no = no->next) {
 			for (nr = 0; nr < 8; nr++) {
 				RayFace *face = no->v[nr];
 				OcVal     *ov = no->ov + nr;
@@ -713,7 +710,7 @@ static int testnode(Octree *UNUSED(oc), Isect *is, Node *no, OcVal ocval)
 				if (!face) break;
 
 				if ( (ov->ocx & ocval.ocx) && (ov->ocy & ocval.ocy) && (ov->ocz & ocval.ocz) ) {
-					if ( RE_rayobject_intersect( RE_rayobject_unalignRayFace(face), is) ) {
+					if (RE_rayobject_intersect(RE_rayobject_unalignRayFace(face), is) ) {
 						found = 1;
 					}
 				}
@@ -732,49 +729,49 @@ static Node *ocread(Octree *oc, int x, int y, int z)
 	Branch *br;
 	int oc1;
 	
-	x<<=2;
-	y<<=1;
+	x <<= 2;
+	y <<= 1;
 	
-	br= oc->adrbranch[0];
+	br = oc->adrbranch[0];
 	
-	if (oc->ocres==512) {
-		oc1= ((x & 1024)+(y & 512)+(z & 256))>>8;
-		br= br->b[oc1];
-		if (br==NULL) {
+	if (oc->ocres == 512) {
+		oc1 = ((x & 1024) + (y & 512) + (z & 256)) >> 8;
+		br = br->b[oc1];
+		if (br == NULL) {
 			return NULL;
 		}
 	}
-	if (oc->ocres>=256) {
-		oc1= ((x & 512)+(y & 256)+(z & 128))>>7;
-		br= br->b[oc1];
-		if (br==NULL) {
+	if (oc->ocres >= 256) {
+		oc1 = ((x & 512) + (y & 256) + (z & 128)) >> 7;
+		br = br->b[oc1];
+		if (br == NULL) {
 			return NULL;
 		}
 	}
-	if (oc->ocres>=128) {
-		oc1= ((x & 256)+(y & 128)+(z & 64))>>6;
-		br= br->b[oc1];
-		if (br==NULL) {
+	if (oc->ocres >= 128) {
+		oc1 = ((x & 256) + (y & 128) + (z & 64)) >> 6;
+		br = br->b[oc1];
+		if (br == NULL) {
 			return NULL;
 		}
 	}
 	
-	oc1= ((x & 128)+(y & 64)+(z & 32))>>5;
-	br= br->b[oc1];
+	oc1 = ((x & 128) + (y & 64) + (z & 32)) >> 5;
+	br = br->b[oc1];
 	if (br) {
-		oc1= ((x & 64)+(y & 32)+(z & 16))>>4;
-		br= br->b[oc1];
+		oc1 = ((x & 64) + (y & 32) + (z & 16)) >> 4;
+		br = br->b[oc1];
 		if (br) {
-			oc1= ((x & 32)+(y & 16)+(z & 8))>>3;
-			br= br->b[oc1];
+			oc1 = ((x & 32) + (y & 16) + (z & 8)) >> 3;
+			br = br->b[oc1];
 			if (br) {
-				oc1= ((x & 16)+(y & 8)+(z & 4))>>2;
-				br= br->b[oc1];
+				oc1 = ((x & 16) + (y & 8) + (z & 4)) >> 2;
+				br = br->b[oc1];
 				if (br) {
-					oc1= ((x & 8)+(y & 4)+(z & 2))>>1;
-					br= br->b[oc1];
+					oc1 = ((x & 8) + (y & 4) + (z & 2)) >> 1;
+					br = br->b[oc1];
 					if (br) {
-						oc1= ((x & 4)+(y & 2)+(z & 1));
+						oc1 = ((x & 4) + (y & 2) + (z & 1));
 						return (Node *)br->b[oc1];
 					}
 				}
@@ -789,24 +786,24 @@ static int cliptest(float p, float q, float *u1, float *u2)
 {
 	float r;
 
-	if (p<0.0f) {
-		if (q<p) return 0;
-		else if (q<0.0f) {
-			r= q/p;
-			if (r>*u2) return 0;
-			else if (r>*u1) *u1=r;
+	if (p < 0.0f) {
+		if (q < p) return 0;
+		else if (q < 0.0f) {
+			r = q / p;
+			if (r > *u2) return 0;
+			else if (r > *u1) *u1 = r;
 		}
 	}
 	else {
-		if (p>0.0f) {
-			if (q<0.0f) return 0;
-			else if (q<p) {
-				r= q/p;
-				if (r<*u1) return 0;
-				else if (r<*u2) *u2=r;
+		if (p > 0.0f) {
+			if (q < 0.0f) return 0;
+			else if (q < p) {
+				r = q / p;
+				if (r < *u1) return 0;
+				else if (r < *u2) *u2 = r;
 			}
 		}
-		else if (q<0.0f) return 0;
+		else if (q < 0.0f) return 0;
 	}
 	return 1;
 }
@@ -816,16 +813,16 @@ static int cliptest(float p, float q, float *u1, float *u2)
  
 #if 0
 
-in top: static int coh_nodes[16*16*16][6];
-in makeoctree: memset(coh_nodes, 0, sizeof(coh_nodes));
+in top : static int coh_nodes[16 * 16 * 16][6];
+in makeoctree : memset(coh_nodes, 0, sizeof(coh_nodes));
  
 static void add_coherence_test(int ocx1, int ocx2, int ocy1, int ocy2, int ocz1, int ocz2)
 {
 	short *sp;
 	
-	sp= coh_nodes[ (ocx2 & 15) + 16*(ocy2 & 15) + 256*(ocz2 & 15) ];
-	sp[0]= ocx1; sp[1]= ocy1; sp[2]= ocz1;
-	sp[3]= ocx2; sp[4]= ocy2; sp[5]= ocz2;
+	sp = coh_nodes[(ocx2 & 15) + 16 * (ocy2 & 15) + 256 * (ocz2 & 15)];
+	sp[0] = ocx1; sp[1] = ocy1; sp[2] = ocz1;
+	sp[3] = ocx2; sp[4] = ocy2; sp[5] = ocz2;
 	
 }
 
@@ -833,9 +830,9 @@ static int do_coherence_test(int ocx1, int ocx2, int ocy1, int ocy2, int ocz1, i
 {
 	short *sp;
 	
-	sp= coh_nodes[ (ocx2 & 15) + 16*(ocy2 & 15) + 256*(ocz2 & 15) ];
-	if (sp[0]==ocx1 && sp[1]==ocy1 && sp[2]==ocz1 &&
-	   sp[3]==ocx2 && sp[4]==ocy2 && sp[5]==ocz2) return 1;
+	sp = coh_nodes[(ocx2 & 15) + 16 * (ocy2 & 15) + 256 * (ocz2 & 15)];
+	if (sp[0] == ocx1 && sp[1] == ocy1 && sp[2] == ocz1 &&
+	    sp[3] == ocx2 && sp[4] == ocy2 && sp[5] == ocz2) return 1;
 	return 0;
 }
 
@@ -845,7 +842,7 @@ static int do_coherence_test(int ocx1, int ocx2, int ocy1, int ocy2, int ocz1, i
 /* starts with is->orig.face */
 static int RE_rayobject_octree_intersect(RayObject *tree, Isect *is)
 {
-	Octree *oc= (Octree*)tree;
+	Octree *oc = (Octree *)tree;
 	Node *no;
 	OcVal ocval;
 	float vec1[3], vec2[3], start[3], end[3];
@@ -853,47 +850,47 @@ static int RE_rayobject_octree_intersect(RayObject *tree, Isect *is)
 	float labdao, labdax, ldx, labday, ldy, labdaz, ldz, ddalabda;
 	float olabda = 0;
 	int dx, dy, dz;
-	int xo, yo, zo, c1=0;
+	int xo, yo, zo, c1 = 0;
 	int ocx1, ocx2, ocy1, ocy2, ocz1, ocz2;
 	
 	/* clip with octree */
-	if (oc->branchcount==0) return 0;
+	if (oc->branchcount == 0) return 0;
 	
 	/* do this before intersect calls */
 #if 0
-	is->facecontr= NULL;				/* to check shared edge */
-	is->obcontr= 0;
-	is->faceisect= is->isect= 0;		/* shared edge, quad half flag */
-	is->userdata= oc->userdata;
+	is->facecontr = NULL;                /* to check shared edge */
+	is->obcontr = 0;
+	is->faceisect = is->isect = 0;        /* shared edge, quad half flag */
+	is->userdata = oc->userdata;
 #endif
 
-	copy_v3_v3( start, is->start );
-	madd_v3_v3v3fl( end, is->start, is->dir, is->dist );
-	ldx= is->dir[0]*is->dist;
+	copy_v3_v3(start, is->start);
+	madd_v3_v3v3fl(end, is->start, is->dir, is->dist);
+	ldx = is->dir[0] * is->dist;
 	olabda = is->dist;
-	u1= 0.0f;
-	u2= 1.0f;
+	u1 = 0.0f;
+	u2 = 1.0f;
 	
 	/* clip with octree cube */
-	if (cliptest(-ldx, start[0]-oc->min[0], &u1, &u2)) {
-		if (cliptest(ldx, oc->max[0]-start[0], &u1, &u2)) {
-			ldy= is->dir[1]*is->dist;
-			if (cliptest(-ldy, start[1]-oc->min[1], &u1, &u2)) {
-				if (cliptest(ldy, oc->max[1]-start[1], &u1, &u2)) {
-					ldz = is->dir[2]*is->dist;
-					if (cliptest(-ldz, start[2]-oc->min[2], &u1, &u2)) {
-						if (cliptest(ldz, oc->max[2]-start[2], &u1, &u2)) {
-							c1=1;
-							if (u2<1.0f) {
-								end[0] = start[0]+u2*ldx;
-								end[1] = start[1]+u2*ldy;
-								end[2] = start[2]+u2*ldz;
+	if (cliptest(-ldx, start[0] - oc->min[0], &u1, &u2)) {
+		if (cliptest(ldx, oc->max[0] - start[0], &u1, &u2)) {
+			ldy = is->dir[1] * is->dist;
+			if (cliptest(-ldy, start[1] - oc->min[1], &u1, &u2)) {
+				if (cliptest(ldy, oc->max[1] - start[1], &u1, &u2)) {
+					ldz = is->dir[2] * is->dist;
+					if (cliptest(-ldz, start[2] - oc->min[2], &u1, &u2)) {
+						if (cliptest(ldz, oc->max[2] - start[2], &u1, &u2)) {
+							c1 = 1;
+							if (u2 < 1.0f) {
+								end[0] = start[0] + u2 * ldx;
+								end[1] = start[1] + u2 * ldy;
+								end[2] = start[2] + u2 * ldz;
 							}
 
-							if (u1>0.0f) {
-								start[0] += u1*ldx;
-								start[1] += u1*ldy;
-								start[2] += u1*ldz;
+							if (u1 > 0.0f) {
+								start[0] += u1 * ldx;
+								start[1] += u1 * ldy;
+								start[2] += u1 * ldz;
 							}
 						}
 					}
@@ -902,34 +899,34 @@ static int RE_rayobject_octree_intersect(RayObject *tree, Isect *is)
 		}
 	}
 
-	if (c1==0) return 0;
+	if (c1 == 0) return 0;
 
 	/* reset static variables in ocread */
 	//ocread(oc, oc->ocres, 0, 0);
 
 	/* setup 3dda to traverse octree */
-	ox1= (start[0]-oc->min[0])*oc->ocfacx;
-	oy1= (start[1]-oc->min[1])*oc->ocfacy;
-	oz1= (start[2]-oc->min[2])*oc->ocfacz;
-	ox2= (end[0]-oc->min[0])*oc->ocfacx;
-	oy2= (end[1]-oc->min[1])*oc->ocfacy;
-	oz2= (end[2]-oc->min[2])*oc->ocfacz;
-
-	ocx1= (int)ox1;
-	ocy1= (int)oy1;
-	ocz1= (int)oz1;
-	ocx2= (int)ox2;
-	ocy2= (int)oy2;
-	ocz2= (int)oz2;
+	ox1 = (start[0] - oc->min[0]) * oc->ocfacx;
+	oy1 = (start[1] - oc->min[1]) * oc->ocfacy;
+	oz1 = (start[2] - oc->min[2]) * oc->ocfacz;
+	ox2 = (end[0] - oc->min[0]) * oc->ocfacx;
+	oy2 = (end[1] - oc->min[1]) * oc->ocfacy;
+	oz2 = (end[2] - oc->min[2]) * oc->ocfacz;
+
+	ocx1 = (int)ox1;
+	ocy1 = (int)oy1;
+	ocz1 = (int)oz1;
+	ocx2 = (int)ox2;
+	ocy2 = (int)oy2;
+	ocz2 = (int)oz2;
 	
-	if (ocx1==ocx2 && ocy1==ocy2 && ocz1==ocz2) {
-		no= ocread(oc, ocx1, ocy1, ocz1);
+	if (ocx1 == ocx2 && ocy1 == ocy2 && ocz1 == ocz2) {
+		no = ocread(oc, ocx1, ocy1, ocz1);
 		if (no) {
 			/* exact intersection with node */
-			vec1[0]= ox1; vec1[1]= oy1; vec1[2]= oz1;
-			vec2[0]= ox2; vec2[1]= oy2; vec2[2]= oz2;
+			vec1[0] = ox1; vec1[1] = oy1; vec1[2] = oz1;
+			vec2[0] = ox2; vec2[1] = oy2; vec2[2] = oz2;
 			calc_ocval_ray(&ocval, (float)ocx1, (float)ocy1, (float)ocz1, vec1, vec2);
-			if ( testnode(oc, is, no, ocval) ) return 1;
+			if (testnode(oc, is, no, ocval) ) return 1;
 		}
 	}
 	else {
@@ -939,153 +936,153 @@ static int RE_rayobject_octree_intersect(RayObject *tree, Isect *is)
 		int eqval;
 		
 		/* calc labda en ld */
-		dox= ox1-ox2;
-		doy= oy1-oy2;
-		doz= oz1-oz2;
-
-		if (dox<-FLT_EPSILON) {
-			ldx= -1.0f/dox;
-			labdax= (ocx1-ox1+1.0f)*ldx;
-			dx= 1;
+		dox = ox1 - ox2;
+		doy = oy1 - oy2;
+		doz = oz1 - oz2;
+
+		if (dox < -FLT_EPSILON) {
+			ldx = -1.0f / dox;
+			labdax = (ocx1 - ox1 + 1.0f) * ldx;
+			dx = 1;
 		}
-		else if (dox>FLT_EPSILON) {
-			ldx= 1.0f/dox;
-			labdax= (ox1-ocx1)*ldx;
-			dx= -1;
+		else if (dox > FLT_EPSILON) {
+			ldx = 1.0f / dox;
+			labdax = (ox1 - ocx1) * ldx;
+			dx = -1;
 		}
 		else {
-			labdax=1.0f;
-			ldx=0;
-			dx= 0;
+			labdax = 1.0f;
+			ldx = 0;
+			dx = 0;
 		}
 
-		if (doy<-FLT_EPSILON) {
-			ldy= -1.0f/doy;
-			labday= (ocy1-oy1+1.0f)*ldy;
-			dy= 1;
+		if (doy < -FLT_EPSILON) {
+			ldy = -1.0f / doy;
+			labday = (ocy1 - oy1 + 1.0f) * ldy;
+			dy = 1;
 		}
-		else if (doy>FLT_EPSILON) {
-			ldy= 1.0f/doy;
-			labday= (oy1-ocy1)*ldy;
-			dy= -1;
+		else if (doy > FLT_EPSILON) {
+			ldy = 1.0f / doy;
+			labday = (oy1 - ocy1) * ldy;
+			dy = -1;
 		}
 		else {
-			labday=1.0f;
-			ldy=0;
-			dy= 0;
+			labday = 1.0f;
+			ldy = 0;
+			dy = 0;
 		}
 
-		if (doz<-FLT_EPSILON) {
-			ldz= -1.0f/doz;
-			labdaz= (ocz1-oz1+1.0f)*ldz;
-			dz= 1;
+		if (doz < -FLT_EPSILON) {
+			ldz = -1.0f / doz;
+			labdaz = (ocz1 - oz1 + 1.0f) * ldz;
+			dz = 1;
 		}
-		else if (doz>FLT_EPSILON) {
-			ldz= 1.0f/doz;
-			labdaz= (oz1-ocz1)*ldz;
-			dz= -1;
+		else if (doz > FLT_EPSILON) {
+			ldz = 1.0f / doz;
+			labdaz = (oz1 - ocz1) * ldz;
+			dz = -1;
 		}
 		else {
-			labdaz=1.0f;
-			ldz=0;
-			dz= 0;
+			labdaz = 1.0f;
+			ldz = 0;
+			dz = 0;
 		}
 		
-		xo=ocx1; yo=ocy1; zo=ocz1;
-		ddalabda= MIN3(labdax, labday, labdaz);
+		xo = ocx1; yo = ocy1; zo = ocz1;
+		ddalabda = MIN3(labdax, labday, labdaz);
 		
-		vec2[0]= ox1;
-		vec2[1]= oy1;
-		vec2[2]= oz1;
+		vec2[0] = ox1;
+		vec2[1] = oy1;
+		vec2[2] = oz1;
 		
 		/* this loop has been constructed to make sure the first and last node of ray
 		 * are always included, even when ddalabda==1.0f or larger */
 
 		while (TRUE) {
 
-			no= ocread(oc, xo, yo, zo);
+			no = ocread(oc, xo, yo, zo);
 			if (no) {
 				
 				/* calculate ray intersection with octree node */
 				copy_v3_v3(vec1, vec2);
 				// dox, y, z is negative
-				vec2[0]= ox1-ddalabda*dox;
-				vec2[1]= oy1-ddalabda*doy;
-				vec2[2]= oz1-ddalabda*doz;
+				vec2[0] = ox1 - ddalabda * dox;
+				vec2[1] = oy1 - ddalabda * doy;
+				vec2[2] = oz1 - ddalabda * doz;
 				calc_ocval_ray(&ocval, (float)xo, (float)yo, (float)zo, vec1, vec2);
 
 				//is->dist = (u1+ddalabda*(u2-u1))*olabda;
-				if ( testnode(oc, is, no, ocval) )
+				if (testnode(oc, is, no, ocval) )
 					found = 1;
 
-				if (is->dist < (u1+ddalabda*(u2-u1))*olabda)
+				if (is->dist < (u1 + ddalabda * (u2 - u1)) * olabda)
 					return found;
 			}
 
 
-			labdao= ddalabda;
+			labdao = ddalabda;
 			
 			/* traversing ocree nodes need careful detection of smallest values, with proper
 			 * exceptions for equal labdas */
-			eqval= (labdax==labday);
-			if (labday==labdaz) eqval += 2;
-			if (labdax==labdaz) eqval += 4;
-			
-			if (eqval) {	// only 4 cases exist!
-				if (eqval==7) {	// x=y=z
-					xo+=dx; labdax+=ldx;
-					yo+=dy; labday+=ldy;
-					zo+=dz; labdaz+=ldz;
+			eqval = (labdax == labday);
+			if (labday == labdaz) eqval += 2;
+			if (labdax == labdaz) eqval += 4;
+
+			if (eqval) {    // only 4 cases exist!
+				if (eqval == 7) { // x=y=z
+					xo += dx; labdax += ldx;
+					yo += dy; labday += ldy;
+					zo += dz; labdaz += ldz;
 				}
-				else if (eqval==1) { // x=y 
+				else if (eqval == 1) { // x=y
 					if (labday < labdaz) {
-						xo+=dx; labdax+=ldx;
-						yo+=dy; labday+=ldy;
+						xo += dx; labdax += ldx;
+						yo += dy; labday += ldy;
 					}
 					else {
-						zo+=dz; labdaz+=ldz;
+						zo += dz; labdaz += ldz;
 					}
 				}
-				else if (eqval==2) { // y=z
+				else if (eqval == 2) { // y=z
 					if (labdax < labday) {
-						xo+=dx; labdax+=ldx;
+						xo += dx; labdax += ldx;
 					}
 					else {
-						yo+=dy; labday+=ldy;
-						zo+=dz; labdaz+=ldz;
+						yo += dy; labday += ldy;
+						zo += dz; labdaz += ldz;
 					}
 				}
 				else { // x=z
 					if (labday < labdax) {
-						yo+=dy; labday+=ldy;
+						yo += dy; labday += ldy;
 					}
 					else {
-						xo+=dx; labdax+=ldx;
-						zo+=dz; labdaz+=ldz;
+						xo += dx; labdax += ldx;
+						zo += dz; labdaz += ldz;
 					}
 				}
 			}
-			else {	// all three different, just three cases exist
-				eqval= (labdax<labday);
-				if (labday<labdaz) eqval += 2;
-				if (labdax<labdaz) eqval += 4;
+			else {  // all three different, just three cases exist
+				eqval = (labdax < labday);
+				if (labday < labdaz) eqval += 2;
+				if (labdax < labdaz) eqval += 4;
 				
-				if (eqval==7 || eqval==5) { // x smallest
-					xo+=dx; labdax+=ldx;
+				if (eqval == 7 || eqval == 5) { // x smallest
+					xo += dx; labdax += ldx;
 				}
-				else if (eqval==2 || eqval==6) { // y smallest
-					yo+=dy; labday+=ldy;
+				else if (eqval == 2 || eqval == 6) { // y smallest
+					yo += dy; labday += ldy;
 				}
 				else { // z smallest
-					zo+=dz; labdaz+=ldz;
+					zo += dz; labdaz += ldz;
 				}
 				
 			}
 
-			ddalabda=MIN3(labdax, labday, labdaz);
-			if (ddalabda==labdao) break;
+			ddalabda = MIN3(labdax, labday, labdaz);
+			if (ddalabda == labdao) break;
 			/* to make sure the last node is always checked */
-			if (labdao>=1.0f) break;
+			if (labdao >= 1.0f) break;
 		}
 	}
 	
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index bda8baa5e30..4eebc967823 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -130,7 +130,7 @@
 /* ------------------------------------------------------------------------- */
 /* this is a bad beast, since it is misused by the 3d view drawing as well. */
 
-static HaloRen *initstar(Render *re, ObjectRen *obr, float *vec, float hasize)
+static HaloRen *initstar(Render *re, ObjectRen *obr, const float vec[3], float hasize)
 {
 	HaloRen *har;
 	float hoco[4];
@@ -520,8 +520,7 @@ static void calc_tangent_vector(ObjectRen *obr, VertexTangent **vtangents, MemAr
  ************ tangent space generation interface ****************
  ****************************************************************/
 
-typedef struct
-{
+typedef struct {
 	ObjectRen *obr;
 
 } SRenderMeshToTangent;
@@ -1011,8 +1010,7 @@ static Material *give_render_material(Render *re, Object *ob, short nr)
 /* ------------------------------------------------------------------------- */
 /* Particles                                                                 */
 /* ------------------------------------------------------------------------- */
-typedef struct ParticleStrandData
-{
+typedef struct ParticleStrandData {
 	struct MCol *mcol;
 	float *orco, *uvco, *surfnor;
 	float time, adapt_angle, adapt_pix, size;
@@ -1324,7 +1322,8 @@ static void static_particle_wire(ObjectRen *obr, Material *ma, const float vec[3
 
 }
 
-static void particle_curve(Render *re, ObjectRen *obr, DerivedMesh *dm, Material *ma, ParticleStrandData *sd, float *loc, float *loc1,	int seed, float *pa_co)
+static void particle_curve(Render *re, ObjectRen *obr, DerivedMesh *dm, Material *ma, ParticleStrandData *sd,
+                           const float loc[3], const float loc1[3], int seed, float *pa_co)
 {
 	HaloRen *har=0;
 
@@ -1730,7 +1729,7 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 			strandbuf->minwidth= ma->strand_min;
 
 			if (ma->strand_widthfade == 0.0f)
-				strandbuf->widthfade= 0.0f;
+				strandbuf->widthfade= -1.0f;
 			else if (ma->strand_widthfade >= 1.0f)
 				strandbuf->widthfade= 2.0f - ma->strand_widthfade;
 			else
@@ -5645,7 +5644,7 @@ void RE_Database_FromScene_Vectors(Render *re, Main *bmain, Scene *sce, unsigned
 						ok= 1;
 				}
 				if (ok==0) {
-					 printf("speed table: missing object %s\n", obi->ob->id.name+2);
+					printf("speed table: missing object %s\n", obi->ob->id.name+2);
 					continue;
 				}
 
diff --git a/source/blender/render/intern/source/envmap.c b/source/blender/render/intern/source/envmap.c
index 6714fe1a29d..61de4d39585 100644
--- a/source/blender/render/intern/source/envmap.c
+++ b/source/blender/render/intern/source/envmap.c
@@ -74,49 +74,49 @@ static void envmap_split_ima(EnvMap *env, ImBuf *ibuf)
 	
 	/* after lock we test cube[1], if set the other thread has done it fine */
 	BLI_lock_thread(LOCK_IMAGE);
-	if (env->cube[1]==NULL) {
+	if (env->cube[1] == NULL) {
 
 		BKE_free_envmapdata(env);	
 	
-		dx= ibuf->y;
-		dx/= 2;
-		if (3*dx == ibuf->x) {
+		dx = ibuf->y;
+		dx /= 2;
+		if (3 * dx == ibuf->x) {
 			env->type = ENV_CUBE;
-			env->ok= ENV_OSA;
+			env->ok = ENV_OSA;
 		}
 		else if (ibuf->x == ibuf->y) {
 			env->type = ENV_PLANE;
-			env->ok= ENV_OSA;
+			env->ok = ENV_OSA;
 		}
 		else {
 			printf("Incorrect envmap size\n");
-			env->ok= 0;
-			env->ima->ok= 0;
+			env->ok = 0;
+			env->ima->ok = 0;
 		}
 		
 		if (env->ok) {
 			if (env->type == ENV_CUBE) {
-				for (part=0; part<6; part++) {
-					env->cube[part]= IMB_allocImBuf(dx, dx, 24, IB_rect|IB_rectfloat);
+				for (part = 0; part < 6; part++) {
+					env->cube[part] = IMB_allocImBuf(dx, dx, 24, IB_rect | IB_rectfloat);
 				}
 				IMB_float_from_rect(ibuf);
 				
 				IMB_rectcpy(env->cube[0], ibuf, 
-					0, 0, 0, 0, dx, dx);
+				            0, 0, 0, 0, dx, dx);
 				IMB_rectcpy(env->cube[1], ibuf, 
-					0, 0, dx, 0, dx, dx);
+				            0, 0, dx, 0, dx, dx);
 				IMB_rectcpy(env->cube[2], ibuf, 
-					0, 0, 2*dx, 0, dx, dx);
+				            0, 0, 2 * dx, 0, dx, dx);
 				IMB_rectcpy(env->cube[3], ibuf, 
-					0, 0, 0, dx, dx, dx);
+				            0, 0, 0, dx, dx, dx);
 				IMB_rectcpy(env->cube[4], ibuf, 
-					0, 0, dx, dx, dx, dx);
+				            0, 0, dx, dx, dx, dx);
 				IMB_rectcpy(env->cube[5], ibuf, 
-					0, 0, 2*dx, dx, dx, dx);
+				            0, 0, 2 * dx, dx, dx, dx);
 				
 			}
 			else { /* ENV_PLANE */
-				env->cube[1]= IMB_dupImBuf(ibuf);
+				env->cube[1] = IMB_dupImBuf(ibuf);
 				IMB_float_from_rect(env->cube[1]);
 			}
 		}
@@ -134,53 +134,53 @@ static Render *envmap_render_copy(Render *re, EnvMap *env)
 	float viewscale;
 	int cuberes;
 	
-	envre= RE_NewRender("Envmap");
+	envre = RE_NewRender("Envmap");
 	
-	env->lastsize= re->r.size;
+	env->lastsize = re->r.size;
 	cuberes = (env->cuberes * re->r.size) / 100;
 	cuberes &= 0xFFFC;
 	
 	/* this flag has R_ZTRA in it for example */
-	envre->flag= re->flag;
+	envre->flag = re->flag;
 	
 	/* set up renderdata */
-	envre->r= re->r;
+	envre->r = re->r;
 	envre->r.mode &= ~(R_BORDER | R_PANORAMA | R_ORTHO | R_MBLUR);
-	envre->r.layers.first= envre->r.layers.last= NULL;
-	envre->r.filtertype= 0;
-	envre->r.xparts= envre->r.yparts= 2;
-	envre->r.size= 100;
-	envre->r.yasp= envre->r.xasp= 1;
+	envre->r.layers.first = envre->r.layers.last = NULL;
+	envre->r.filtertype = 0;
+	envre->r.xparts = envre->r.yparts = 2;
+	envre->r.size = 100;
+	envre->r.yasp = envre->r.xasp = 1;
 	
 	RE_InitState(envre, NULL, &envre->r, NULL, cuberes, cuberes, NULL);
-	envre->scene= re->scene;	/* unsure about this... */
-	envre->lay= re->lay;
+	envre->scene = re->scene;    /* unsure about this... */
+	envre->lay = re->lay;
 
 	/* view stuff in env render */
-	viewscale= (env->type == ENV_PLANE)? env->viewscale: 1.0f;
+	viewscale = (env->type == ENV_PLANE) ? env->viewscale : 1.0f;
 	RE_SetEnvmapCamera(envre, env->object, viewscale, env->clipsta, env->clipend);
 	
 	/* callbacks */
-	envre->display_draw= re->display_draw;
-	envre->ddh= re->ddh;
-	envre->test_break= re->test_break;
-	envre->tbh= re->tbh;
+	envre->display_draw = re->display_draw;
+	envre->ddh = re->ddh;
+	envre->test_break = re->test_break;
+	envre->tbh = re->tbh;
 	
 	/* and for the evil stuff; copy the database... */
-	envre->totvlak= re->totvlak;
-	envre->totvert= re->totvert;
-	envre->tothalo= re->tothalo;
-	envre->totstrand= re->totstrand;
-	envre->totlamp= re->totlamp;
-	envre->sortedhalos= re->sortedhalos;
-	envre->lights= re->lights;
-	envre->objecttable= re->objecttable;
-	envre->customdata_names= re->customdata_names;
-	envre->raytree= re->raytree;
-	envre->totinstance= re->totinstance;
-	envre->instancetable= re->instancetable;
-	envre->objectinstance= re->objectinstance;
-	envre->qmcsamplers= re->qmcsamplers;
+	envre->totvlak = re->totvlak;
+	envre->totvert = re->totvert;
+	envre->tothalo = re->tothalo;
+	envre->totstrand = re->totstrand;
+	envre->totlamp = re->totlamp;
+	envre->sortedhalos = re->sortedhalos;
+	envre->lights = re->lights;
+	envre->objecttable = re->objecttable;
+	envre->customdata_names = re->customdata_names;
+	envre->raytree = re->raytree;
+	envre->totinstance = re->totinstance;
+	envre->instancetable = re->instancetable;
+	envre->objectinstance = re->objectinstance;
+	envre->qmcsamplers = re->qmcsamplers;
 	
 	return envre;
 }
@@ -188,20 +188,20 @@ static Render *envmap_render_copy(Render *re, EnvMap *env)
 static void envmap_free_render_copy(Render *envre)
 {
 
-	envre->totvlak= 0;
-	envre->totvert= 0;
-	envre->tothalo= 0;
-	envre->totstrand= 0;
-	envre->totlamp= 0;
-	envre->totinstance= 0;
-	envre->sortedhalos= NULL;
-	envre->lights.first= envre->lights.last= NULL;
-	envre->objecttable.first= envre->objecttable.last= NULL;
-	envre->customdata_names.first= envre->customdata_names.last= NULL;
-	envre->raytree= NULL;
-	envre->instancetable.first= envre->instancetable.last= NULL;
-	envre->objectinstance= NULL;
-	envre->qmcsamplers= NULL;
+	envre->totvlak = 0;
+	envre->totvert = 0;
+	envre->tothalo = 0;
+	envre->totstrand = 0;
+	envre->totlamp = 0;
+	envre->totinstance = 0;
+	envre->sortedhalos = NULL;
+	envre->lights.first = envre->lights.last = NULL;
+	envre->objecttable.first = envre->objecttable.last = NULL;
+	envre->customdata_names.first = envre->customdata_names.last = NULL;
+	envre->raytree = NULL;
+	envre->instancetable.first = envre->instancetable.last = NULL;
+	envre->objectinstance = NULL;
+	envre->qmcsamplers = NULL;
 	
 	RE_FreeRender(envre);
 }
@@ -212,28 +212,28 @@ static void envmap_transmatrix(float mat[][4], int part)
 {
 	float tmat[4][4], eul[3], rotmat[4][4];
 	
-	eul[0]= eul[1]= eul[2]= 0.0;
+	eul[0] = eul[1] = eul[2] = 0.0;
 	
-	if (part==0) {			/* neg z */
+	if (part == 0) {          /* neg z */
 		;
 	}
-	else if (part==1) {	/* pos z */
-		eul[0]= M_PI;
+	else if (part == 1) { /* pos z */
+		eul[0] = M_PI;
 	}
-	else if (part==2) {	/* pos y */
-		eul[0]= M_PI/2.0;
+	else if (part == 2) { /* pos y */
+		eul[0] = M_PI / 2.0;
 	}
-	else if (part==3) {	/* neg x */
-		eul[0]= M_PI/2.0;
-		eul[2]= M_PI/2.0;
+	else if (part == 3) { /* neg x */
+		eul[0] = M_PI / 2.0;
+		eul[2] = M_PI / 2.0;
 	}
-	else if (part==4) {	/* neg y */
-		eul[0]= M_PI/2.0;
-		eul[2]= M_PI;
+	else if (part == 4) { /* neg y */
+		eul[0] = M_PI / 2.0;
+		eul[2] = M_PI;
 	}
-	else {				/* pos x */
-		eul[0]= M_PI/2.0;
-		eul[2]= -M_PI/2.0;
+	else {              /* pos x */
+		eul[0] = M_PI / 2.0;
+		eul[2] = -M_PI / 2.0;
 	}
 	
 	copy_m4_m4(tmat, mat);
@@ -255,7 +255,7 @@ static void env_rotate_scene(Render *re, float mat[][4], int mode)
 	float imat[3][3], pmat[4][4], smat[4][4], tmat[4][4], cmat[3][3], tmpmat[4][4];
 	int a;
 	
-	if (mode==0) {
+	if (mode == 0) {
 		invert_m4_m4(tmat, mat);
 		copy_m3_m4(imat, tmat);
 	}
@@ -264,13 +264,13 @@ static void env_rotate_scene(Render *re, float mat[][4], int mode)
 		copy_m3_m4(imat, mat);
 	}
 
-	for (obi=re->instancetable.first; obi; obi=obi->next) {
+	for (obi = re->instancetable.first; obi; obi = obi->next) {
 		/* append or set matrix depending on dupli */
 		if (obi->flag & R_DUPLI_TRANSFORMED) {
 			copy_m4_m4(tmpmat, obi->mat);
 			mult_m4_m4m4(obi->mat, tmat, tmpmat);
 		}
-		else if (mode==1)
+		else if (mode == 1)
 			copy_m4_m4(obi->mat, tmat);
 		else
 			unit_m4(obi->mat);
@@ -280,24 +280,24 @@ static void env_rotate_scene(Render *re, float mat[][4], int mode)
 		transpose_m3(obi->nmat);
 
 		/* indicate the renderer has to use transform matrices */
-		if (mode==0)
+		if (mode == 0)
 			obi->flag &= ~R_ENV_TRANSFORMED;
 		else
 			obi->flag |= R_ENV_TRANSFORMED;
 	}
 	
 
-	for (obr=re->objecttable.first; obr; obr=obr->next) {
-		for (a=0; a<obr->tothalo; a++) {
-			if ((a & 255)==0) har= obr->bloha[a>>8];
+	for (obr = re->objecttable.first; obr; obr = obr->next) {
+		for (a = 0; a < obr->tothalo; a++) {
+			if ((a & 255) == 0) har = obr->bloha[a >> 8];
 			else har++;
 		
 			mul_m4_v3(tmat, har->co);
 		}
 	}
 	
-	for (go=re->lights.first; go; go= go->next) {
-		lar= go->lampren;
+	for (go = re->lights.first; go; go = go->next) {
+		lar = go->lampren;
 		
 		/* removed here some horrible code of someone in NaN who tried to fix
 		 * prototypes... just solved by introducing a correct cmat[3][3] instead
@@ -308,14 +308,14 @@ static void env_rotate_scene(Render *re, float mat[][4], int mode)
 		mul_m3_v3(imat, lar->vec);
 		mul_m4_v3(tmat, lar->co);
 
-		lar->sh_invcampos[0]= -lar->co[0];
-		lar->sh_invcampos[1]= -lar->co[1];
-		lar->sh_invcampos[2]= -lar->co[2];
+		lar->sh_invcampos[0] = -lar->co[0];
+		lar->sh_invcampos[1] = -lar->co[1];
+		lar->sh_invcampos[2] = -lar->co[2];
 		mul_m3_v3(lar->imat, lar->sh_invcampos);
-		lar->sh_invcampos[2]*= lar->sh_zfac;
+		lar->sh_invcampos[2] *= lar->sh_zfac;
 		
 		if (lar->shb) {
-			if (mode==1) {
+			if (mode == 1) {
 				invert_m4_m4(pmat, mat);
 				mult_m4_m4m4(smat, lar->shb->viewmat, pmat);
 				mult_m4_m4m4(lar->shb->persmat, lar->shb->winmat, smat);
@@ -342,12 +342,12 @@ static void env_layerflags(Render *re, unsigned int notlay)
 	 * now (face & ~not) is true
 	 */
 	
-	notlay= ~notlay;
+	notlay = ~notlay;
 	
-	for (obr=re->objecttable.first; obr; obr=obr->next) {
-		if ((obr->lay & notlay)==0) {
-			for (a=0; a<obr->totvlak; a++) {
-				if ((a & 255)==0) vlr= obr->vlaknodes[a>>8].vlak;
+	for (obr = re->objecttable.first; obr; obr = obr->next) {
+		if ((obr->lay & notlay) == 0) {
+			for (a = 0; a < obr->totvlak; a++) {
+				if ((a & 255) == 0) vlr = obr->vlaknodes[a >> 8].vlak;
 				else vlr++;
 
 				vlr->flag |= R_HIDDEN;
@@ -362,9 +362,9 @@ static void env_hideobject(Render *re, Object *ob)
 	VlakRen *vlr = NULL;
 	int a;
 	
-	for (obr=re->objecttable.first; obr; obr=obr->next) {
-		for (a=0; a<obr->totvlak; a++) {
-			if ((a & 255)==0) vlr= obr->vlaknodes[a>>8].vlak;
+	for (obr = re->objecttable.first; obr; obr = obr->next) {
+		for (a = 0; a < obr->totvlak; a++) {
+			if ((a & 255) == 0) vlr = obr->vlaknodes[a >> 8].vlak;
 			else vlr++;
 
 			if (obr->ob == ob)
@@ -379,9 +379,9 @@ static void env_showobjects(Render *re)
 	VlakRen *vlr = NULL;
 	int a;
 	
-	for (obr=re->objecttable.first; obr; obr=obr->next) {
-		for (a=0; a<obr->totvlak; a++) {
-			if ((a & 255)==0) vlr= obr->vlaknodes[a>>8].vlak;
+	for (obr = re->objecttable.first; obr; obr = obr->next) {
+		for (a = 0; a < obr->totvlak; a++) {
+			if ((a & 255) == 0) vlr = obr->vlaknodes[a >> 8].vlak;
 			else vlr++;
 
 			vlr->flag &= ~R_HIDDEN;
@@ -396,12 +396,12 @@ static void env_set_imats(Render *re)
 	Base *base;
 	float mat[4][4];
 	
-	base= re->scene->base.first;
+	base = re->scene->base.first;
 	while (base) {
 		mult_m4_m4m4(mat, re->viewmat, base->object->obmat);
 		invert_m4_m4(base->object->imat, mat);
 		
-		base= base->next;
+		base = base->next;
 	}
 
 }	
@@ -420,7 +420,7 @@ static void render_envmap(Render *re, EnvMap *env)
 	/* need a recalc: ortho-render has no correct viewinv */
 	invert_m4_m4(oldviewinv, re->viewmat);
 
-	envre= envmap_render_copy(re, env);
+	envre = envmap_render_copy(re, env);
 	
 	/* precalc orthmat for object */
 	copy_m4_m4(orthmat, env->object->obmat);
@@ -431,8 +431,8 @@ static void render_envmap(Render *re, EnvMap *env)
 	invert_m4_m4(tmat, mat);
 	copy_m3_m4(env->obimat, tmat);
 
-	for (part=0; part<6; part++) {
-		if (env->type==ENV_PLANE && part!=1)
+	for (part = 0; part < 6; part++) {
+		if (env->type == ENV_PLANE && part != 1)
 			continue;
 		
 		re->display_clear(re->dch, envre->result);
@@ -456,7 +456,7 @@ static void render_envmap(Render *re, EnvMap *env)
 		env_hideobject(envre, env->object);
 		env_set_imats(envre);
 				
-		if (re->test_break(re->tbh)==0) {
+		if (re->test_break(re->tbh) == 0) {
 			RE_TileProcessor(envre);
 		}
 		
@@ -464,23 +464,23 @@ static void render_envmap(Render *re, EnvMap *env)
 		env_showobjects(envre);
 		env_rotate_scene(envre, tmat, 0);
 
-		if (re->test_break(re->tbh)==0) {
-			RenderLayer *rl= envre->result->layers.first;
+		if (re->test_break(re->tbh) == 0) {
+			RenderLayer *rl = envre->result->layers.first;
 			int y;
 			float *alpha;
 			
-			ibuf= IMB_allocImBuf(envre->rectx, envre->recty, 24, IB_rect|IB_rectfloat);
+			ibuf = IMB_allocImBuf(envre->rectx, envre->recty, 24, IB_rect | IB_rectfloat);
 			memcpy(ibuf->rect_float, rl->rectf, ibuf->channels * ibuf->x * ibuf->y * sizeof(float));
 			
 			if (re->scene->r.color_mgt_flag & R_COLOR_MANAGEMENT)
 				ibuf->profile = IB_PROFILE_LINEAR_RGB;
 			
 			/* envmap renders without alpha */
-			alpha= ((float *)ibuf->rect_float)+3;
-			for (y= ibuf->x*ibuf->y - 1; y>=0; y--, alpha+=4)
-				*alpha= 1.0;
+			alpha = ((float *)ibuf->rect_float) + 3;
+			for (y = ibuf->x * ibuf->y - 1; y >= 0; y--, alpha += 4)
+				*alpha = 1.0;
 			
-			env->cube[part]= ibuf;
+			env->cube[part] = ibuf;
 		}
 		
 		if (re->test_break(re->tbh)) break;
@@ -489,9 +489,9 @@ static void render_envmap(Render *re, EnvMap *env)
 	
 	if (re->test_break(re->tbh)) BKE_free_envmapdata(env);
 	else {
-		if (envre->r.mode & R_OSA) env->ok= ENV_OSA;
-		else env->ok= ENV_NORMAL;
-		env->lastframe= re->scene->r.cfra;
+		if (envre->r.mode & R_OSA) env->ok = ENV_OSA;
+		else env->ok = ENV_NORMAL;
+		env->lastframe = re->scene->r.cfra;
 	}
 	
 	/* restore */
@@ -505,27 +505,27 @@ static void render_envmap(Render *re, EnvMap *env)
 void make_envmaps(Render *re)
 {
 	Tex *tex;
-	int do_init = FALSE, depth= 0, trace;
+	int do_init = FALSE, depth = 0, trace;
 	
 	if (!(re->r.mode & R_ENVMAP)) return;
 	
 	/* we don't raytrace, disabling the flag will cause ray_transp render solid */
-	trace= (re->r.mode & R_RAYTRACE);
+	trace = (re->r.mode & R_RAYTRACE);
 	re->r.mode &= ~R_RAYTRACE;
 
-	re->i.infostr= "Creating Environment maps";
+	re->i.infostr = "Creating Environment maps";
 	re->stats_draw(re->sdh, &re->i);
 	
 	/* 5 = hardcoded max recursion level */
-	while (depth<5) {
-		tex= re->main->tex.first;
+	while (depth < 5) {
+		tex = re->main->tex.first;
 		while (tex) {
-			if (tex->id.us && tex->type==TEX_ENVMAP) {
+			if (tex->id.us && tex->type == TEX_ENVMAP) {
 				if (tex->env && tex->env->object) {
-					EnvMap *env= tex->env;
+					EnvMap *env = tex->env;
 					
 					if (env->object->lay & re->lay) {
-						if (env->stype==ENV_LOAD) {
+						if (env->stype == ENV_LOAD) {
 							float orthmat[4][4], mat[4][4], tmat[4][4];
 							
 							/* precalc orthmat for object */
@@ -545,31 +545,31 @@ void make_envmaps(Render *re)
 								/* set 'recalc' to make sure it does an entire loop of recalcs */
 								
 								if (env->ok) {
-										/* free when OSA, and old one isn't OSA */
-									if ((re->r.mode & R_OSA) && env->ok==ENV_NORMAL)
+									/* free when OSA, and old one isn't OSA */
+									if ((re->r.mode & R_OSA) && env->ok == ENV_NORMAL)
 										BKE_free_envmapdata(env);
-										/* free when size larger */
+									/* free when size larger */
 									else if (env->lastsize < re->r.size)
 										BKE_free_envmapdata(env);
-										/* free when env is in recalcmode */
+									/* free when env is in recalcmode */
 									else if (env->recalc)
 										BKE_free_envmapdata(env);
 								}
 								
-								if (env->ok==0 && depth==0) env->recalc= 1;
+								if (env->ok == 0 && depth == 0) env->recalc = 1;
 								
-								if (env->ok==0) {
+								if (env->ok == 0) {
 									do_init = TRUE;
 									render_envmap(re, env);
 									
-									if (depth==env->depth) env->recalc= 0;
+									if (depth == env->depth) env->recalc = 0;
 								}
 							}
 						}
 					}
 				}
 			}
-			tex= tex->id.next;
+			tex = tex->id.next;
 		}
 		depth++;
 	}
@@ -586,60 +586,60 @@ void make_envmaps(Render *re)
 
 /* ------------------------------------------------------------------------- */
 
-static int envcube_isect(EnvMap *env, float *vec, float *answ)
+static int envcube_isect(EnvMap *env, const float vec[3], float answ[2])
 {
 	float labda;
 	int face;
 	
-	if (env->type==ENV_PLANE) {
-		face= 1;
+	if (env->type == ENV_PLANE) {
+		face = 1;
 		
-		labda= 1.0f/vec[2];
-		answ[0]= env->viewscale*labda*vec[0];
-		answ[1]= -env->viewscale*labda*vec[1];
+		labda = 1.0f / vec[2];
+		answ[0] = env->viewscale * labda * vec[0];
+		answ[1] = -env->viewscale * labda * vec[1];
 	}
 	else {
 		/* which face */
-		if ( vec[2] <= -fabsf(vec[0]) && vec[2] <= -fabsf(vec[1]) ) {
-			face= 0;
-			labda= -1.0f/vec[2];
-			answ[0]= labda*vec[0];
-			answ[1]= labda*vec[1];
+		if (vec[2] <= -fabsf(vec[0]) && vec[2] <= -fabsf(vec[1]) ) {
+			face = 0;
+			labda = -1.0f / vec[2];
+			answ[0] = labda * vec[0];
+			answ[1] = labda * vec[1];
 		}
 		else if (vec[2] >= fabsf(vec[0]) && vec[2] >= fabsf(vec[1])) {
-			face= 1;
-			labda= 1.0f/vec[2];
-			answ[0]= labda*vec[0];
-			answ[1]= -labda*vec[1];
+			face = 1;
+			labda = 1.0f / vec[2];
+			answ[0] = labda * vec[0];
+			answ[1] = -labda * vec[1];
 		}
 		else if (vec[1] >= fabsf(vec[0])) {
-			face= 2;
-			labda= 1.0f/vec[1];
-			answ[0]= labda*vec[0];
-			answ[1]= labda*vec[2];
+			face = 2;
+			labda = 1.0f / vec[1];
+			answ[0] = labda * vec[0];
+			answ[1] = labda * vec[2];
 		}
 		else if (vec[0] <= -fabsf(vec[1])) {
-			face= 3;
-			labda= -1.0f/vec[0];
-			answ[0]= labda*vec[1];
-			answ[1]= labda*vec[2];
+			face = 3;
+			labda = -1.0f / vec[0];
+			answ[0] = labda * vec[1];
+			answ[1] = labda * vec[2];
 		}
 		else if (vec[1] <= -fabsf(vec[0])) {
-			face= 4;
-			labda= -1.0f/vec[1];
-			answ[0]= -labda*vec[0];
-			answ[1]= labda*vec[2];
+			face = 4;
+			labda = -1.0f / vec[1];
+			answ[0] = -labda * vec[0];
+			answ[1] = labda * vec[2];
 		}
 		else {
-			face= 5;
-			labda= 1.0f/vec[0];
-			answ[0]= -labda*vec[1];
-			answ[1]= labda*vec[2];
+			face = 5;
+			labda = 1.0f / vec[0];
+			answ[0] = -labda * vec[1];
+			answ[1] = labda * vec[2];
 		}
 	}
 	
-	answ[0]= 0.5f+0.5f*answ[0];
-	answ[1]= 0.5f+0.5f*answ[1];
+	answ[0] = 0.5f + 0.5f * answ[0];
+	answ[1] = 0.5f + 0.5f * answ[1];
 	return face;
 }
 
@@ -647,23 +647,23 @@ static int envcube_isect(EnvMap *env, float *vec, float *answ)
 
 static void set_dxtdyt(float *dxts, float *dyts, float *dxt, float *dyt, int face)
 {
-	if (face==2 || face==4) {
-		dxts[0]= dxt[0];
-		dyts[0]= dyt[0];
-		dxts[1]= dxt[2];
-		dyts[1]= dyt[2];
+	if (face == 2 || face == 4) {
+		dxts[0] = dxt[0];
+		dyts[0] = dyt[0];
+		dxts[1] = dxt[2];
+		dyts[1] = dyt[2];
 	}
-	else if (face==3 || face==5) {
-		dxts[0]= dxt[1];
-		dxts[1]= dxt[2];
-		dyts[0]= dyt[1];
-		dyts[1]= dyt[2];
+	else if (face == 3 || face == 5) {
+		dxts[0] = dxt[1];
+		dxts[1] = dxt[2];
+		dyts[0] = dyt[1];
+		dyts[1] = dyt[2];
 	}
 	else {
-		dxts[0]= dxt[0];
-		dyts[0]= dyt[0];
-		dxts[1]= dxt[1];
-		dyts[1]= dyt[1];
+		dxts[0] = dxt[0];
+		dyts[0] = dyt[0];
+		dxts[1] = dxt[1];
+		dyts[1] = dyt[1];
 	}
 }
 
@@ -671,34 +671,34 @@ static void set_dxtdyt(float *dxts, float *dyts, float *dxt, float *dyt, int fac
 
 int envmaptex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, TexResult *texres)
 {
-	extern Render R;				/* only in this call */
+	extern Render R;                /* only in this call */
 	/* texvec should be the already reflected normal */
 	EnvMap *env;
 	ImBuf *ibuf;
 	float fac, vec[3], sco[3], dxts[3], dyts[3];
 	int face, face1;
 	
-	env= tex->env;
-	if (env==NULL || (env->stype!=ENV_LOAD && env->object==NULL)) {
-		texres->tin= 0.0;
+	env = tex->env;
+	if (env == NULL || (env->stype != ENV_LOAD && env->object == NULL)) {
+		texres->tin = 0.0;
 		return 0;
 	}
 	
-	if (env->stype==ENV_LOAD) {
-		env->ima= tex->ima;
+	if (env->stype == ENV_LOAD) {
+		env->ima = tex->ima;
 		if (env->ima && env->ima->ok) {
-			if (env->cube[1]==NULL) {
-				ImBuf *ibuf_ima= BKE_image_get_ibuf(env->ima, NULL);
+			if (env->cube[1] == NULL) {
+				ImBuf *ibuf_ima = BKE_image_get_ibuf(env->ima, NULL);
 				if (ibuf_ima)
 					envmap_split_ima(env, ibuf_ima);
 				else
-					env->ok= 0;
+					env->ok = 0;
 			}
 		}
 	}
 
-	if (env->ok==0) {
-		texres->tin= 0.0;
+	if (env->ok == 0) {
+		texres->tin = 0.0;
 		return 0;
 	}
 	
@@ -707,8 +707,8 @@ int envmaptex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, TexRe
 	if (env->object) mul_m3_v3(env->obimat, vec);
 	else mul_mat3_m4_v3(R.viewinv, vec);
 	
-	face= envcube_isect(env, vec, sco);
-	ibuf= env->cube[face];
+	face = envcube_isect(env, vec, sco);
+	ibuf = env->cube[face];
 	
 	if (osatex) {
 		if (env->object) {
@@ -724,45 +724,45 @@ int envmaptex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, TexRe
 		
 		/* edges? */
 		
-		if (texres->ta<1.0f) {
+		if (texres->ta < 1.0f) {
 			TexResult texr1, texr2;
 	
-			texr1.nor= texr2.nor= NULL;
-			texr1.talpha= texr2.talpha= texres->talpha; /* boxclip expects this initialized */
+			texr1.nor = texr2.nor = NULL;
+			texr1.talpha = texr2.talpha = texres->talpha; /* boxclip expects this initialized */
 
 			add_v3_v3(vec, dxt);
-			face1= envcube_isect(env, vec, sco);
+			face1 = envcube_isect(env, vec, sco);
 			sub_v3_v3(vec, dxt);
 			
-			if (face!=face1) {
-				ibuf= env->cube[face1];
+			if (face != face1) {
+				ibuf = env->cube[face1];
 				set_dxtdyt(dxts, dyts, dxt, dyt, face1);
 				imagewraposa(tex, NULL, ibuf, sco, dxts, dyts, &texr1);
 			}
-			else texr1.tr= texr1.tg= texr1.tb= texr1.ta= 0.0;
+			else texr1.tr = texr1.tg = texr1.tb = texr1.ta = 0.0;
 			
 			/* here was the nasty bug! results were not zero-ed. FPE! */
 			
 			add_v3_v3(vec, dyt);
-			face1= envcube_isect(env, vec, sco);
+			face1 = envcube_isect(env, vec, sco);
 			sub_v3_v3(vec, dyt);
 			
-			if (face!=face1) {
-				ibuf= env->cube[face1];
+			if (face != face1) {
+				ibuf = env->cube[face1];
 				set_dxtdyt(dxts, dyts, dxt, dyt, face1);
 				imagewraposa(tex, NULL, ibuf, sco, dxts, dyts, &texr2);
 			}
-			else texr2.tr= texr2.tg= texr2.tb= texr2.ta= 0.0;
+			else texr2.tr = texr2.tg = texr2.tb = texr2.ta = 0.0;
 			
-			fac= (texres->ta+texr1.ta+texr2.ta);
-			if (fac!=0.0f) {
-				fac= 1.0f/fac;
+			fac = (texres->ta + texr1.ta + texr2.ta);
+			if (fac != 0.0f) {
+				fac = 1.0f / fac;
 
-				texres->tr= fac*(texres->ta*texres->tr + texr1.ta*texr1.tr + texr2.ta*texr2.tr );
-				texres->tg= fac*(texres->ta*texres->tg + texr1.ta*texr1.tg + texr2.ta*texr2.tg );
-				texres->tb= fac*(texres->ta*texres->tb + texr1.ta*texr1.tb + texr2.ta*texr2.tb );
+				texres->tr = fac * (texres->ta * texres->tr + texr1.ta * texr1.tr + texr2.ta * texr2.tr);
+				texres->tg = fac * (texres->ta * texres->tg + texr1.ta * texr1.tg + texr2.ta * texr2.tg);
+				texres->tb = fac * (texres->ta * texres->tb + texr1.ta * texr1.tb + texr2.ta * texr2.tb);
 			}
-			texres->ta= 1.0;
+			texres->ta = 1.0;
 		}
 	}
 	else {
@@ -771,7 +771,3 @@ int envmaptex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, TexRe
 	
 	return 1;
 }
-
-/* ------------------------------------------------------------------------- */
-
-/* eof */
diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c
index c23a93a52fe..5bb3e4605a2 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -64,15 +64,17 @@ static RenderEngineType internal_render_type = {
 	NULL, NULL,
 	"BLENDER_RENDER", N_("Blender Render"), RE_INTERNAL,
 	NULL, NULL, NULL, NULL,
-	{NULL, NULL, NULL}};
+	{NULL, NULL, NULL}
+};
 
 #ifdef WITH_GAMEENGINE
 
 static RenderEngineType internal_game_type = {
 	NULL, NULL,
-	"BLENDER_GAME", N_("Blender Game"), RE_INTERNAL|RE_GAME,
+	"BLENDER_GAME", N_("Blender Game"), RE_INTERNAL | RE_GAME,
 	NULL, NULL, NULL, NULL,
-	{NULL, NULL, NULL}};
+	{NULL, NULL, NULL}
+};
 
 #endif
 
@@ -90,8 +92,8 @@ void RE_engines_exit(void)
 {
 	RenderEngineType *type, *next;
 
-	for (type=R_engines.first; type; type=next) {
-		next= type->next;
+	for (type = R_engines.first; type; type = next) {
+		next = type->next;
 
 		BLI_remlink(&R_engines, type);
 
@@ -108,16 +110,16 @@ RenderEngineType *RE_engines_find(const char *idname)
 {
 	RenderEngineType *type;
 	
-	type= BLI_findstring(&R_engines, idname, offsetof(RenderEngineType, idname));
+	type = BLI_findstring(&R_engines, idname, offsetof(RenderEngineType, idname));
 	if (!type)
-		type= &internal_render_type;
+		type = &internal_render_type;
 
 	return type;
 }
 
 int RE_engine_is_external(Render *re)
 {
-	RenderEngineType *type= RE_engines_find(re->r.engine);
+	RenderEngineType *type = RE_engines_find(re->r.engine);
 	return (type && type->render);
 }
 
@@ -126,7 +128,7 @@ int RE_engine_is_external(Render *re)
 RenderEngine *RE_engine_create(RenderEngineType *type)
 {
 	RenderEngine *engine = MEM_callocN(sizeof(RenderEngine), "RenderEngine");
-	engine->type= type;
+	engine->type = type;
 
 	return engine;
 }
@@ -149,7 +151,7 @@ void RE_engine_free(RenderEngine *engine)
 
 RenderResult *RE_engine_begin_result(RenderEngine *engine, int x, int y, int w, int h)
 {
-	Render *re= engine->re;
+	Render *re = engine->re;
 	RenderResult *result;
 	rcti disprect;
 
@@ -160,17 +162,17 @@ RenderResult *RE_engine_begin_result(RenderEngine *engine, int x, int y, int w,
 	CLAMP(h, 0, re->result->recty);
 
 	if (x + w > re->result->rectx)
-		w= re->result->rectx - x;
+		w = re->result->rectx - x;
 	if (y + h > re->result->recty)
-		h= re->result->recty - y;
+		h = re->result->recty - y;
 
 	/* allocate a render result */
 	disprect.xmin = x;
-	disprect.xmax = x+w;
+	disprect.xmax = x + w;
 	disprect.ymin = y;
-	disprect.ymax = y+h;
+	disprect.ymax = y + h;
 
-	result= render_result_new(re, &disprect, 0, RR_USE_MEM);
+	result = render_result_new(re, &disprect, 0, RR_USE_MEM);
 	BLI_addtail(&engine->fullresult, result);
 	
 	result->tilerect.xmin += re->disprect.xmin;
@@ -183,17 +185,17 @@ RenderResult *RE_engine_begin_result(RenderEngine *engine, int x, int y, int w,
 
 void RE_engine_update_result(RenderEngine *engine, RenderResult *result)
 {
-	Render *re= engine->re;
+	Render *re = engine->re;
 
 	if (result) {
-		result->renlay= result->layers.first; // weak, draws first layer always
+		result->renlay = result->layers.first; // weak, draws first layer always
 		re->display_draw(re->ddh, result, NULL);
 	}
 }
 
 void RE_engine_end_result(RenderEngine *engine, RenderResult *result)
 {
-	Render *re= engine->re;
+	Render *re = engine->re;
 
 	if (!result)
 		return;
@@ -204,7 +206,7 @@ void RE_engine_end_result(RenderEngine *engine, RenderResult *result)
 
 	/* draw */
 	if (!re->test_break(re->tbh)) {
-		result->renlay= result->layers.first; // weak, draws first layer always
+		result->renlay = result->layers.first; // weak, draws first layer always
 		re->display_draw(re->ddh, result, NULL);
 	}
 
@@ -216,7 +218,7 @@ void RE_engine_end_result(RenderEngine *engine, RenderResult *result)
 
 int RE_engine_test_break(RenderEngine *engine)
 {
-	Render *re= engine->re;
+	Render *re = engine->re;
 
 	if (re)
 		return re->test_break(re->tbh);
@@ -228,34 +230,34 @@ int RE_engine_test_break(RenderEngine *engine)
 
 void RE_engine_update_stats(RenderEngine *engine, const char *stats, const char *info)
 {
-	Render *re= engine->re;
+	Render *re = engine->re;
 
 	/* stats draw callback */
 	if (re) {
-		re->i.statstr= stats;
-		re->i.infostr= info;
+		re->i.statstr = stats;
+		re->i.infostr = info;
 		re->stats_draw(re->sdh, &re->i);
-		re->i.infostr= NULL;
-		re->i.statstr= NULL;
+		re->i.infostr = NULL;
+		re->i.statstr = NULL;
 	}
 
 	/* set engine text */
 	if (engine->text) {
 		MEM_freeN(engine->text);
-		engine->text= NULL;
+		engine->text = NULL;
 	}
 
 	if (stats && stats[0] && info && info[0])
-		engine->text= BLI_sprintfN("%s | %s", stats, info);
+		engine->text = BLI_sprintfN("%s | %s", stats, info);
 	else if (info && info[0])
-		engine->text= BLI_strdup(info);
+		engine->text = BLI_strdup(info);
 	else if (stats && stats[0])
-		engine->text= BLI_strdup(stats);
+		engine->text = BLI_strdup(stats);
 }
 
 void RE_engine_update_progress(RenderEngine *engine, float progress)
 {
-	Render *re= engine->re;
+	Render *re = engine->re;
 
 	if (re) {
 		CLAMP(progress, 0.0f, 1.0f);
@@ -272,7 +274,7 @@ void RE_engine_report(RenderEngine *engine, int type, const char *msg)
 
 int RE_engine_render(Render *re, int do_all)
 {
-	RenderEngineType *type= RE_engines_find(re->r.engine);
+	RenderEngineType *type = RE_engines_find(re->r.engine);
 	RenderEngine *engine;
 
 	/* verify if we can render */
@@ -287,24 +289,24 @@ int RE_engine_render(Render *re, int do_all)
 
 	/* create render result */
 	BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
-	if (re->result==NULL || !(re->r.scemode & R_PREVIEWBUTS)) {
+	if (re->result == NULL || !(re->r.scemode & R_PREVIEWBUTS)) {
 		if (re->result)
 			render_result_free(re->result);
-		re->result= render_result_new(re, &re->disprect, 0, 0);
+		re->result = render_result_new(re, &re->disprect, 0, 0);
 	}
 	BLI_rw_mutex_unlock(&re->resultmutex);
 	
-	if (re->result==NULL)
+	if (re->result == NULL)
 		return 1;
 
 	/* set render info */
-	re->i.cfra= re->scene->r.cfra;
-	BLI_strncpy(re->i.scenename, re->scene->id.name+2, sizeof(re->i.scenename));
-	re->i.totface=re->i.totvert=re->i.totstrand=re->i.totlamp=re->i.tothalo= 0;
+	re->i.cfra = re->scene->r.cfra;
+	BLI_strncpy(re->i.scenename, re->scene->id.name + 2, sizeof(re->i.scenename));
+	re->i.totface = re->i.totvert = re->i.totstrand = re->i.totlamp = re->i.tothalo = 0;
 
 	/* render */
 	engine = RE_engine_create(type);
-	engine->re= re;
+	engine->re = re;
 
 	if (re->flag & R_ANIMATION)
 		engine->flag |= RE_ENGINE_ANIMATION;
@@ -312,7 +314,7 @@ int RE_engine_render(Render *re, int do_all)
 		engine->flag |= RE_ENGINE_PREVIEW;
 	engine->camera_override = re->camera_override;
 
-	if ((re->r.scemode & (R_NO_FRAME_UPDATE|R_PREVIEWBUTS))==0)
+	if ((re->r.scemode & (R_NO_FRAME_UPDATE | R_PREVIEWBUTS)) == 0)
 		BKE_scene_update_for_newframe(re->main, re->scene, re->lay);
 
 	if (type->update)
diff --git a/source/blender/render/intern/source/imagetexture.c b/source/blender/render/intern/source/imagetexture.c
index d454ea60705..dcc09c92bb0 100644
--- a/source/blender/render/intern/source/imagetexture.c
+++ b/source/blender/render/intern/source/imagetexture.c
@@ -76,7 +76,7 @@ static void boxsample(ImBuf *ibuf, float minx, float miny, float maxx, float max
 
 
 /* x and y have to be checked for image size */
-static void ibuf_get_color(float *col, struct ImBuf *ibuf, int x, int y)
+static void ibuf_get_color(float col[4], struct ImBuf *ibuf, int x, int y)
 {
 	int ofs = y * ibuf->x + x;
 	
@@ -637,7 +637,7 @@ enum {TXC_XMIR=1, TXC_YMIR, TXC_REPT, TXC_EXTD};
 
 // similar to ibuf_get_color() but clips/wraps coords according to repeat/extend flags
 // returns true if out of range in clipmode
-static int ibuf_get_color_clip(float *col, ImBuf *ibuf, int x, int y, int extflag)
+static int ibuf_get_color_clip(float col[4], ImBuf *ibuf, int x, int y, int extflag)
 {
 	int clip = 0;
 	switch (extflag) {
@@ -695,7 +695,7 @@ static int ibuf_get_color_clip(float *col, ImBuf *ibuf, int x, int y, int extfla
 }
 
 // as above + bilerp
-static int ibuf_get_color_clip_bilerp(float *col, ImBuf *ibuf, float u, float v, int intpol, int extflag)
+static int ibuf_get_color_clip_bilerp(float col[4], ImBuf *ibuf, float u, float v, int intpol, int extflag)
 {
 	if (intpol) {
 		float c00[4], c01[4], c10[4], c11[4];
diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c
index c0382834987..33a777381aa 100644
--- a/source/blender/render/intern/source/initrender.c
+++ b/source/blender/render/intern/source/initrender.c
@@ -87,12 +87,12 @@
 
 static void init_render_jit(Render *re)
 {
-	static float jit[32][2];	/* simple caching */
-	static float mblur_jit[32][2];	/* simple caching */
-	static int lastjit= 0;
-	static int last_mblur_jit= 0;
+	static float jit[32][2];        /* simple caching */
+	static float mblur_jit[32][2];  /* simple caching */
+	static int lastjit = 0;
+	static int last_mblur_jit = 0;
 	
-	if (lastjit!=re->r.osa || last_mblur_jit != re->r.mblur_samples) {
+	if (lastjit != re->r.osa || last_mblur_jit != re->r.mblur_samples) {
 		memset(jit, 0, sizeof(jit));
 		BLI_jitter_init(jit[0], re->r.osa);
 		
@@ -100,10 +100,10 @@ static void init_render_jit(Render *re)
 		BLI_jitter_init(mblur_jit[0], re->r.mblur_samples);
 	}
 	
-	lastjit= re->r.osa;
+	lastjit = re->r.osa;
 	memcpy(re->jit, jit, sizeof(jit));
 	
-	last_mblur_jit= re->r.mblur_samples;
+	last_mblur_jit = re->r.mblur_samples;
 	memcpy(re->mblur_jit, mblur_jit, sizeof(mblur_jit));
 }
 
@@ -113,135 +113,135 @@ static void init_render_jit(Render *re)
 static float filt_quadratic(float x)
 {
 	if (x <  0.0f) x = -x;
-	if (x < 0.5f) return 0.75f-(x*x);
-	if (x < 1.5f) return 0.50f*(x-1.5f)*(x-1.5f);
+	if (x < 0.5f) return 0.75f - (x * x);
+	if (x < 1.5f) return 0.50f * (x - 1.5f) * (x - 1.5f);
 	return 0.0f;
 }
 
 
 static float filt_cubic(float x)
 {
-	float x2= x*x;
+	float x2 = x * x;
 	
 	if (x <  0.0f) x = -x;
 	
-	if (x < 1.0f) return 0.5f*x*x2 - x2 + 2.0f/3.0f;
-	if (x < 2.0f) return (2.0f-x)*(2.0f-x)*(2.0f-x)/6.0f;
+	if (x < 1.0f) return 0.5f * x * x2 - x2 + 2.0f / 3.0f;
+	if (x < 2.0f) return (2.0f - x) * (2.0f - x) * (2.0f - x) / 6.0f;
 	return 0.0f;
 }
 
 
 static float filt_catrom(float x)
 {
-	float x2= x*x;
+	float x2 = x * x;
 	
 	if (x <  0.0f) x = -x;
-	if (x < 1.0f) return  1.5f*x2*x - 2.5f*x2  + 1.0f;
-	if (x < 2.0f) return -0.5f*x2*x + 2.5f*x2 - 4.0f*x + 2.0f;
+	if (x < 1.0f) return  1.5f * x2 * x - 2.5f * x2 + 1.0f;
+	if (x < 2.0f) return -0.5f * x2 * x + 2.5f * x2 - 4.0f * x + 2.0f;
 	return 0.0f;
 }
 
-static float filt_mitchell(float x)	/* Mitchell & Netravali's two-param cubic */
+static float filt_mitchell(float x) /* Mitchell & Netravali's two-param cubic */
 {
-	float b = 1.0f/3.0f, c = 1.0f/3.0f;
-	float p0 = (  6.0f -  2.0f*b         ) / 6.0f;
-	float p2 = (-18.0f + 12.0f*b +  6.0f*c) / 6.0f;
-	float p3 = ( 12.0f -  9.0f*b -  6.0f*c) / 6.0f;
-	float q0 = (	   8.0f*b + 24.0f*c) / 6.0f;
-	float q1 = (      - 12.0f *b - 48.0f*c) / 6.0f;
-	float q2 = (         6.0f *b + 30.0f*c) / 6.0f;
-	float q3 = (       -       b -  6.0f*c) / 6.0f;
-
-	if (x<-2.0f) return 0.0f;
-	if (x<-1.0f) return (q0-x*(q1-x*(q2-x*q3)));
-	if (x< 0.0f) return (p0+x*x*(p2-x*p3));
-	if (x< 1.0f) return (p0+x*x*(p2+x*p3));
-	if (x< 2.0f) return (q0+x*(q1+x*(q2+x*q3)));
+	float b = 1.0f / 3.0f, c = 1.0f / 3.0f;
+	float p0 = (  6.0f -  2.0f * b)             / 6.0f;
+	float p2 = (-18.0f + 12.0f * b +  6.0f * c) / 6.0f;
+	float p3 = ( 12.0f -  9.0f * b -  6.0f * c) / 6.0f;
+	float q0 = (          8.0f * b + 24.0f * c) / 6.0f;
+	float q1 = (        -12.0f * b - 48.0f * c) / 6.0f;
+	float q2 = (          6.0f * b + 30.0f * c) / 6.0f;
+	float q3 = (                -b -  6.0f * c) / 6.0f;
+
+	if (x < -2.0f) return 0.0f;
+	if (x < -1.0f) return (q0 - x * (q1 - x * (q2 - x * q3)));
+	if (x < 0.0f) return (p0 + x * x * (p2 - x * p3));
+	if (x < 1.0f) return (p0 + x * x * (p2 + x * p3));
+	if (x < 2.0f) return (q0 + x * (q1 + x * (q2 + x * q3)));
 	return 0.0f;
 }
 
 /* x ranges from -1 to 1 */
 float RE_filter_value(int type, float x)
 {
-	float gaussfac= 1.6f;
+	float gaussfac = 1.6f;
 	
-	x= ABS(x);
+	x = ABS(x);
 	
 	switch (type) {
 		case R_FILTER_BOX:
-			if (x>1.0f) return 0.0f;
+			if (x > 1.0f) return 0.0f;
 			return 1.0f;
 			
 		case R_FILTER_TENT:
-			if (x>1.0f) return 0.0f;
-			return 1.0f-x;
+			if (x > 1.0f) return 0.0f;
+			return 1.0f - x;
 			
 		case R_FILTER_GAUSS:
-			x*= gaussfac;
-			return (1.0f/expf(x*x) - 1.0f/expf(gaussfac*gaussfac*2.25f));
+			x *= gaussfac;
+			return (1.0f / expf(x * x) - 1.0f / expf(gaussfac * gaussfac * 2.25f));
 			
 		case R_FILTER_MITCH:
-			return filt_mitchell(x*gaussfac);
+			return filt_mitchell(x * gaussfac);
 			
 		case R_FILTER_QUAD:
-			return filt_quadratic(x*gaussfac);
+			return filt_quadratic(x * gaussfac);
 			
 		case R_FILTER_CUBIC:
-			return filt_cubic(x*gaussfac);
+			return filt_cubic(x * gaussfac);
 			
 		case R_FILTER_CATROM:
-			return filt_catrom(x*gaussfac);
+			return filt_catrom(x * gaussfac);
 	}
 	return 0.0f;
 }
 
 static float calc_weight(Render *re, float *weight, int i, int j)
 {
-	float x, y, dist, totw= 0.0;
+	float x, y, dist, totw = 0.0;
 	int a;
 
-	for (a=0; a<re->osa; a++) {
-		x= re->jit[a][0] + i;
-		y= re->jit[a][1] + j;
-		dist= sqrt(x*x+y*y);
+	for (a = 0; a < re->osa; a++) {
+		x = re->jit[a][0] + i;
+		y = re->jit[a][1] + j;
+		dist = sqrt(x * x + y * y);
 
-		weight[a]= 0.0;
+		weight[a] = 0.0;
 
 		/* Weighting choices */
 		switch (re->r.filtertype) {
-		case R_FILTER_BOX:
-			if (i==0 && j==0) weight[a]= 1.0;
-			break;
+			case R_FILTER_BOX:
+				if (i == 0 && j == 0) weight[a] = 1.0;
+				break;
 			
-		case R_FILTER_TENT:
-			if (dist < re->r.gauss)
-				weight[a]= re->r.gauss - dist;
-			break;
+			case R_FILTER_TENT:
+				if (dist < re->r.gauss)
+					weight[a] = re->r.gauss - dist;
+				break;
 			
-		case R_FILTER_GAUSS:
-			x = dist*re->r.gauss;
-			weight[a]= (1.0f/expf(x*x) - 1.0f/expf(re->r.gauss*re->r.gauss*2.25f));
-			break;
+			case R_FILTER_GAUSS:
+				x = dist * re->r.gauss;
+				weight[a] = (1.0f / expf(x * x) - 1.0f / expf(re->r.gauss * re->r.gauss * 2.25f));
+				break;
 		
-		case R_FILTER_MITCH:
-			weight[a]= filt_mitchell(dist*re->r.gauss);
-			break;
+			case R_FILTER_MITCH:
+				weight[a] = filt_mitchell(dist * re->r.gauss);
+				break;
 		
-		case R_FILTER_QUAD:
-			weight[a]= filt_quadratic(dist*re->r.gauss);
-			break;
+			case R_FILTER_QUAD:
+				weight[a] = filt_quadratic(dist * re->r.gauss);
+				break;
 			
-		case R_FILTER_CUBIC:
-			weight[a]= filt_cubic(dist*re->r.gauss);
-			break;
+			case R_FILTER_CUBIC:
+				weight[a] = filt_cubic(dist * re->r.gauss);
+				break;
 			
-		case R_FILTER_CATROM:
-			weight[a]= filt_catrom(dist*re->r.gauss);
-			break;
+			case R_FILTER_CATROM:
+				weight[a] = filt_catrom(dist * re->r.gauss);
+				break;
 			
 		}
 		
-		totw+= weight[a];
+		totw += weight[a];
 
 	}
 	return totw;
@@ -252,21 +252,21 @@ void free_sample_tables(Render *re)
 	int a;
 	
 	if (re->samples) {
-		for (a=0; a<9; a++) {
+		for (a = 0; a < 9; a++) {
 			MEM_freeN(re->samples->fmask1[a]);
 			MEM_freeN(re->samples->fmask2[a]);
 		}
 		
 		MEM_freeN(re->samples->centmask);
 		MEM_freeN(re->samples);
-		re->samples= NULL;
+		re->samples = NULL;
 	}
 }
 
 /* based on settings in render, it makes the lookup tables */
 void make_sample_tables(Render *re)
 {
-	static int firsttime= 1;
+	static int firsttime = 1;
 	SampleTables *st;
 	float flweight[32];
 	float weight[32], totw, val, *fpx1, *fpx2, *fpy1, *fpy2, *m3, *m4;
@@ -274,27 +274,27 @@ void make_sample_tables(Render *re)
 
 	/* optimization tables, only once */
 	if (firsttime) {
-		firsttime= 0;
+		firsttime = 0;
 	}
 	
 	free_sample_tables(re);
 	
-	init_render_jit(re);	/* needed for mblur too */
+	init_render_jit(re);    /* needed for mblur too */
 	
-	if (re->osa==0) {
+	if (re->osa == 0) {
 		/* just prevents cpu cycles for larger render and copying */
-		re->r.filtertype= 0;
+		re->r.filtertype = 0;
 		return;
 	}
 	
-	st= re->samples= MEM_callocN(sizeof(SampleTables), "sample tables");
+	st = re->samples = MEM_callocN(sizeof(SampleTables), "sample tables");
 	
-	for (a=0; a<9;a++) {
-		st->fmask1[a]= MEM_callocN(256*sizeof(float), "initfilt");
-		st->fmask2[a]= MEM_callocN(256*sizeof(float), "initfilt");
+	for (a = 0; a < 9; a++) {
+		st->fmask1[a] = MEM_callocN(256 * sizeof(float), "initfilt");
+		st->fmask2[a] = MEM_callocN(256 * sizeof(float), "initfilt");
 	}
-	for (a=0; a<256; a++) {
-		st->cmask[a]= 0;
+	for (a = 0; a < 256; a++) {
+		st->cmask[a] = 0;
 		if (a &   1) st->cmask[a]++;
 		if (a &   2) st->cmask[a]++;
 		if (a &   4) st->cmask[a]++;
@@ -305,64 +305,64 @@ void make_sample_tables(Render *re)
 		if (a & 128) st->cmask[a]++;
 	}
 	
-	st->centmask= MEM_mallocN((1<<re->osa), "Initfilt3");
+	st->centmask = MEM_mallocN((1 << re->osa), "Initfilt3");
 	
-	for (a=0; a<16; a++) {
-		st->centLut[a]= -0.45f+((float)a)/16.0f;
+	for (a = 0; a < 16; a++) {
+		st->centLut[a] = -0.45f + ((float)a) / 16.0f;
 	}
 
 	/* calculate totw */
-	totw= 0.0;
-	for (j= -1; j<2; j++) {
-		for (i= -1; i<2; i++) {
-			totw+= calc_weight(re, weight, i, j);
+	totw = 0.0;
+	for (j = -1; j < 2; j++) {
+		for (i = -1; i < 2; i++) {
+			totw += calc_weight(re, weight, i, j);
 		}
 	}
 
-	for (j= -1; j<2; j++) {
-		for (i= -1; i<2; i++) {
+	for (j = -1; j < 2; j++) {
+		for (i = -1; i < 2; i++) {
 			/* calculate using jit, with offset the weights */
 
 			memset(weight, 0, sizeof(weight));
 			calc_weight(re, weight, i, j);
 
-			for (a=0; a<16; a++) flweight[a]= weight[a]*(1.0f/totw);
+			for (a = 0; a < 16; a++) flweight[a] = weight[a] * (1.0f / totw);
 
-			m3= st->fmask1[ 3*(j+1)+i+1 ];
-			m4= st->fmask2[ 3*(j+1)+i+1 ];
+			m3 = st->fmask1[3 * (j + 1) + i + 1];
+			m4 = st->fmask2[3 * (j + 1) + i + 1];
 
-			for (a=0; a<256; a++) {
+			for (a = 0; a < 256; a++) {
 				if (a &   1) {
-					m3[a]+= flweight[0];
-					m4[a]+= flweight[8];
+					m3[a] += flweight[0];
+					m4[a] += flweight[8];
 				}
 				if (a &   2) {
-					m3[a]+= flweight[1];
-					m4[a]+= flweight[9];
+					m3[a] += flweight[1];
+					m4[a] += flweight[9];
 				}
 				if (a &   4) {
-					m3[a]+= flweight[2];
-					m4[a]+= flweight[10];
+					m3[a] += flweight[2];
+					m4[a] += flweight[10];
 				}
 				if (a &   8) {
-					m3[a]+= flweight[3];
-					m4[a]+= flweight[11];
+					m3[a] += flweight[3];
+					m4[a] += flweight[11];
 				}
 				if (a &  16) {
-					m3[a]+= flweight[4];
-					m4[a]+= flweight[12];
+					m3[a] += flweight[4];
+					m4[a] += flweight[12];
 				}
 				if (a &  32) {
-					m3[a]+= flweight[5];
-					m4[a]+= flweight[13];
+					m3[a] += flweight[5];
+					m4[a] += flweight[13];
 				}
 				if (a &  64) {
-					m3[a]+= flweight[6];
-					m4[a]+= flweight[14];
+					m3[a] += flweight[6];
+					m4[a] += flweight[14];
 				}
 				if (a & 128) {
-					m3[a]+= flweight[7];
-					m4[a]+= flweight[15];
+					m3[a] += flweight[7];
+					m4[a] += flweight[15];
 				}
 			}
 		}
@@ -370,71 +370,71 @@ void make_sample_tables(Render *re)
 
 	/* centmask: the correct subpixel offset per mask */
 
-	fpx1= MEM_mallocN(256*sizeof(float), "initgauss4");
-	fpx2= MEM_mallocN(256*sizeof(float), "initgauss4");
-	fpy1= MEM_mallocN(256*sizeof(float), "initgauss4");
-	fpy2= MEM_mallocN(256*sizeof(float), "initgauss4");
-	for (a=0; a<256; a++) {
-		fpx1[a]= fpx2[a]= 0.0;
-		fpy1[a]= fpy2[a]= 0.0;
+	fpx1 = MEM_mallocN(256 * sizeof(float), "initgauss4");
+	fpx2 = MEM_mallocN(256 * sizeof(float), "initgauss4");
+	fpy1 = MEM_mallocN(256 * sizeof(float), "initgauss4");
+	fpy2 = MEM_mallocN(256 * sizeof(float), "initgauss4");
+	for (a = 0; a < 256; a++) {
+		fpx1[a] = fpx2[a] = 0.0;
+		fpy1[a] = fpy2[a] = 0.0;
 		if (a & 1) {
-			fpx1[a]+= re->jit[0][0];
-			fpy1[a]+= re->jit[0][1];
-			fpx2[a]+= re->jit[8][0];
-			fpy2[a]+= re->jit[8][1];
+			fpx1[a] += re->jit[0][0];
+			fpy1[a] += re->jit[0][1];
+			fpx2[a] += re->jit[8][0];
+			fpy2[a] += re->jit[8][1];
 		}
 		if (a & 2) {
-			fpx1[a]+= re->jit[1][0];
-			fpy1[a]+= re->jit[1][1];
-			fpx2[a]+= re->jit[9][0];
-			fpy2[a]+= re->jit[9][1];
+			fpx1[a] += re->jit[1][0];
+			fpy1[a] += re->jit[1][1];
+			fpx2[a] += re->jit[9][0];
+			fpy2[a] += re->jit[9][1];
 		}
 		if (a & 4) {
-			fpx1[a]+= re->jit[2][0];
-			fpy1[a]+= re->jit[2][1];
-			fpx2[a]+= re->jit[10][0];
-			fpy2[a]+= re->jit[10][1];
+			fpx1[a] += re->jit[2][0];
+			fpy1[a] += re->jit[2][1];
+			fpx2[a] += re->jit[10][0];
+			fpy2[a] += re->jit[10][1];
 		}
 		if (a & 8) {
-			fpx1[a]+= re->jit[3][0];
-			fpy1[a]+= re->jit[3][1];
-			fpx2[a]+= re->jit[11][0];
-			fpy2[a]+= re->jit[11][1];
+			fpx1[a] += re->jit[3][0];
+			fpy1[a] += re->jit[3][1];
+			fpx2[a] += re->jit[11][0];
+			fpy2[a] += re->jit[11][1];
 		}
 		if (a & 16) {
-			fpx1[a]+= re->jit[4][0];
-			fpy1[a]+= re->jit[4][1];
-			fpx2[a]+= re->jit[12][0];
-			fpy2[a]+= re->jit[12][1];
+			fpx1[a] += re->jit[4][0];
+			fpy1[a] += re->jit[4][1];
+			fpx2[a] += re->jit[12][0];
+			fpy2[a] += re->jit[12][1];
 		}
 		if (a & 32) {
-			fpx1[a]+= re->jit[5][0];
-			fpy1[a]+= re->jit[5][1];
-			fpx2[a]+= re->jit[13][0];
-			fpy2[a]+= re->jit[13][1];
+			fpx1[a] += re->jit[5][0];
+			fpy1[a] += re->jit[5][1];
+			fpx2[a] += re->jit[13][0];
+			fpy2[a] += re->jit[13][1];
 		}
 		if (a & 64) {
-			fpx1[a]+= re->jit[6][0];
-			fpy1[a]+= re->jit[6][1];
-			fpx2[a]+= re->jit[14][0];
-			fpy2[a]+= re->jit[14][1];
+			fpx1[a] += re->jit[6][0];
+			fpy1[a] += re->jit[6][1];
+			fpx2[a] += re->jit[14][0];
+			fpy2[a] += re->jit[14][1];
 		}
 		if (a & 128) {
-			fpx1[a]+= re->jit[7][0];
-			fpy1[a]+= re->jit[7][1];
-			fpx2[a]+= re->jit[15][0];
-			fpy2[a]+= re->jit[15][1];
+			fpx1[a] += re->jit[7][0];
+			fpy1[a] += re->jit[7][1];
+			fpx2[a] += re->jit[15][0];
+			fpy2[a] += re->jit[15][1];
 		}
 	}
 
-	for (a= (1<<re->osa)-1; a>0; a--) {
-		val= st->cmask[a & 255] + st->cmask[a>>8];
-		i= 8+(15.9f*(fpy1[a & 255]+fpy2[a>>8])/val);
+	for (a = (1 << re->osa) - 1; a > 0; a--) {
+		val = st->cmask[a & 255] + st->cmask[a >> 8];
+		i = 8 + (15.9f * (fpy1[a & 255] + fpy2[a >> 8]) / val);
 		CLAMP(i, 0, 15);
-		j= 8+(15.9f*(fpx1[a & 255]+fpx2[a>>8])/val);
+		j = 8 + (15.9f * (fpx1[a & 255] + fpx2[a >> 8]) / val);
 		CLAMP(j, 0, 15);
-		i= j + (i<<4);
-		st->centmask[a]= i;
+		i = j + (i << 4);
+		st->centmask[a] = i;
 	}
 
 	MEM_freeN(fpx1);
@@ -455,13 +455,13 @@ static void re_camera_params_get(Render *re, CameraParams *params, Object *cam_o
 {
 	copy_m4_m4(re->winmat, params->winmat);
 
-	re->clipsta= params->clipsta;
-	re->clipend= params->clipend;
+	re->clipsta = params->clipsta;
+	re->clipend = params->clipend;
 
-	re->ycor= params->ycor;
-	re->viewdx= params->viewdx;
-	re->viewdy= params->viewdy;
-	re->viewplane= params->viewplane;
+	re->ycor = params->ycor;
+	re->viewdx = params->viewdx;
+	re->viewdy = params->viewdy;
+	re->viewplane = params->viewplane;
 
 	BKE_camera_object_mode(&re->r, cam_ob);
 }
@@ -474,12 +474,12 @@ void RE_SetEnvmapCamera(Render *re, Object *cam_ob, float viewscale, float clips
 	BKE_camera_params_init(&params);
 	BKE_camera_params_from_object(&params, cam_ob);
 
-	params.lens= 16.0f*viewscale;
-	params.sensor_x= 32.0f;
-	params.sensor_y= 32.0f;
+	params.lens = 16.0f * viewscale;
+	params.sensor_x = 32.0f;
+	params.sensor_y = 32.0f;
 	params.sensor_fit = CAMERA_SENSOR_FIT_AUTO;
-	params.clipsta= clipsta;
-	params.clipend= clipend;
+	params.clipsta = clipsta;
+	params.clipend = clipend;
 	
 	/* compute matrix, viewplane, .. */
 	BKE_camera_params_compute_viewplane(&params, re->winx, re->winy, 1.0f, 1.0f);
@@ -499,9 +499,9 @@ void RE_SetCamera(Render *re, Object *cam_ob)
 	BKE_camera_params_init(&params);
 	BKE_camera_params_from_object(&params, cam_ob);
 
-	params.use_fields= (re->r.mode & R_FIELDS);
-	params.field_second= (re->flag & R_SEC_FIELD);
-	params.field_odd= (re->r.mode & R_ODDFIELD);
+	params.use_fields = (re->r.mode & R_FIELDS);
+	params.field_second = (re->flag & R_SEC_FIELD);
+	params.field_odd = (re->r.mode & R_ODDFIELD);
 
 	/* compute matrix, viewplane, .. */
 	BKE_camera_params_compute_viewplane(&params, re->winx, re->winy, re->r.xasp, re->r.yasp);
@@ -513,13 +513,13 @@ void RE_SetCamera(Render *re, Object *cam_ob)
 
 void RE_SetPixelSize(Render *re, float pixsize)
 {
-	re->viewdx= pixsize;
-	re->viewdy= re->ycor*pixsize;
+	re->viewdx = pixsize;
+	re->viewdy = re->ycor * pixsize;
 }
 
 void RE_GetCameraWindow(struct Render *re, struct Object *camera, int frame, float mat[][4])
 {
-	re->r.cfra= frame;
+	re->r.cfra = frame;
 	RE_SetCamera(re, camera);
 	copy_m4_m4(mat, re->winmat);
 }
@@ -529,12 +529,12 @@ void RE_GetCameraWindow(struct Render *re, struct Object *camera, int frame, flo
 
 void freeparts(Render *re)
 {
-	RenderPart *part= re->parts.first;
+	RenderPart *part = re->parts.first;
 	
 	while (part) {
 		if (part->rectp) MEM_freeN(part->rectp);
 		if (part->rectz) MEM_freeN(part->rectz);
-		part= part->next;
+		part = part->next;
 	}
 	BLI_freelistN(&re->parts);
 }
@@ -547,91 +547,91 @@ void initparts(Render *re)
 	freeparts(re);
 	
 	/* this is render info for caller, is not reset when parts are freed! */
-	re->i.totpart= 0;
-	re->i.curpart= 0;
+	re->i.totpart = 0;
+	re->i.curpart = 0;
 	re->i.partsdone = FALSE;
 	
 	/* just for readable code.. */
-	xminb= re->disprect.xmin;
-	yminb= re->disprect.ymin;
-	xmaxb= re->disprect.xmax;
-	ymaxb= re->disprect.ymax;
+	xminb = re->disprect.xmin;
+	yminb = re->disprect.ymin;
+	xmaxb = re->disprect.xmax;
+	ymaxb = re->disprect.ymax;
 	
-	xparts= re->r.xparts;
-	yparts= re->r.yparts;
+	xparts = re->r.xparts;
+	yparts = re->r.yparts;
 	
 	/* mininum part size, but for exr tile saving it was checked already */
-	if (!(re->r.scemode & (R_EXR_TILE_FILE|R_FULL_SAMPLE))) {
+	if (!(re->r.scemode & (R_EXR_TILE_FILE | R_FULL_SAMPLE))) {
 		if (re->r.mode & R_PANORAMA) {
-			if (ceil(re->rectx/(float)xparts) < 8) 
-				xparts= 1 + re->rectx/8;
+			if (ceil(re->rectx / (float)xparts) < 8)
+				xparts = 1 + re->rectx / 8;
 		}
 		else
-			if (ceil(re->rectx/(float)xparts) < 64) 
-				xparts= 1 + re->rectx/64;
+		if (ceil(re->rectx / (float)xparts) < 64)
+			xparts = 1 + re->rectx / 64;
 		
-		if (ceil(re->recty/(float)yparts) < 64) 
-			yparts= 1 + re->recty/64;
+		if (ceil(re->recty / (float)yparts) < 64)
+			yparts = 1 + re->recty / 64;
 	}
 	
 	/* part size */
-	partx= ceil(re->rectx/(float)xparts);
-	party= ceil(re->recty/(float)yparts);
+	partx = ceil(re->rectx / (float)xparts);
+	party = ceil(re->recty / (float)yparts);
 	
-	re->xparts= xparts;
-	re->yparts= yparts;
-	re->partx= partx;
-	re->party= party;
+	re->xparts = xparts;
+	re->yparts = yparts;
+	re->partx = partx;
+	re->party = party;
 	
 	/* calculate rotation factor of 1 pixel */
 	if (re->r.mode & R_PANORAMA)
-		re->panophi= panorama_pixel_rot(re);
+		re->panophi = panorama_pixel_rot(re);
 	
-	for (nr=0; nr<xparts*yparts; nr++) {
+	for (nr = 0; nr < xparts * yparts; nr++) {
 		rcti disprect;
 		int rectx, recty;
 		
-		xd= (nr % xparts);
-		yd= (nr-xd)/xparts;
+		xd = (nr % xparts);
+		yd = (nr - xd) / xparts;
 		
-		disprect.xmin = xminb+ xd*partx;
-		disprect.ymin = yminb+ yd*party;
+		disprect.xmin = xminb + xd * partx;
+		disprect.ymin = yminb + yd * party;
 		
 		/* ensure we cover the entire picture, so last parts go to end */
-		if (xd<xparts-1) {
+		if (xd < xparts - 1) {
 			disprect.xmax = disprect.xmin + partx;
 			if (disprect.xmax > xmaxb)
 				disprect.xmax = xmaxb;
 		}
 		else disprect.xmax = xmaxb;
 		
-		if (yd<yparts-1) {
+		if (yd < yparts - 1) {
 			disprect.ymax = disprect.ymin + party;
 			if (disprect.ymax > ymaxb)
 				disprect.ymax = ymaxb;
 		}
 		else disprect.ymax = ymaxb;
 		
-		rectx= disprect.xmax - disprect.xmin;
-		recty= disprect.ymax - disprect.ymin;
+		rectx = disprect.xmax - disprect.xmin;
+		recty = disprect.ymax - disprect.ymin;
 		
 		/* so, now can we add this part? */
-		if (rectx>0 && recty>0) {
-			RenderPart *pa= MEM_callocN(sizeof(RenderPart), "new part");
+		if (rectx > 0 && recty > 0) {
+			RenderPart *pa = MEM_callocN(sizeof(RenderPart), "new part");
 			
 			/* Non-box filters need 2 pixels extra to work */
 			if ((re->r.filtertype || (re->r.mode & R_EDGE))) {
-				pa->crop= 2;
+				pa->crop = 2;
 				disprect.xmin -= pa->crop;
 				disprect.ymin -= pa->crop;
 				disprect.xmax += pa->crop;
 				disprect.ymax += pa->crop;
-				rectx+= 2*pa->crop;
-				recty+= 2*pa->crop;
+				rectx += 2 * pa->crop;
+				recty += 2 * pa->crop;
 			}
-			pa->disprect= disprect;
-			pa->rectx= rectx;
-			pa->recty= recty;
+			pa->disprect = disprect;
+			pa->rectx = rectx;
+			pa->recty = recty;
 
 			BLI_addtail(&re->parts, pa);
 			re->i.totpart++;
diff --git a/source/blender/render/intern/source/occlusion.c b/source/blender/render/intern/source/occlusion.c
index 21e4e216063..b3eb8c0fd5c 100644
--- a/source/blender/render/intern/source/occlusion.c
+++ b/source/blender/render/intern/source/occlusion.c
@@ -1197,7 +1197,8 @@ static float occ_form_factor(OccFace *face, float *p, float *n)
 	return contrib;
 }
 
-static void occ_lookup(OcclusionTree *tree, int thread, OccFace *exclude, float *pp, float *pn, float *occ, float rad[3], float bentn[3])
+static void occ_lookup(OcclusionTree *tree, int thread, OccFace *exclude,
+                       const float pp[3], const float pn[3], float *occ, float rad[3], float bentn[3])
 {
 	OccNode *node, **stack;
 	OccFace *face;
@@ -1391,7 +1392,9 @@ static void occ_compute_passes(Render *re, OcclusionTree *tree, int totpass)
 	MEM_freeN(occ);
 }
 
-static void sample_occ_tree(Render *re, OcclusionTree *tree, OccFace *exclude, float *co, float *n, int thread, int onlyshadow, float *ao, float *env, float *indirect)
+static void sample_occ_tree(Render *re, OcclusionTree *tree, OccFace *exclude,
+                            const float co[3], const float n[3], int thread, int onlyshadow,
+                            float *ao, float *env, float *indirect)
 {
 	float nn[3], bn[3], fac, occ, occlusion, correction, rad[3];
 	int envcolor;
@@ -1415,9 +1418,9 @@ static void sample_occ_tree(Render *re, OcclusionTree *tree, OccFace *exclude, f
 		/* sky shading using bent normal */
 		if (ELEM(envcolor, WO_AOSKYCOL, WO_AOSKYTEX)) {
 			fac= 0.5f * (1.0f + dot_v3v3(bn, re->grvec));
-			env[0]= (1.0f-fac)*re->wrld.horr + fac*re->wrld.zenr;
-			env[1]= (1.0f-fac)*re->wrld.horg + fac*re->wrld.zeng;
-			env[2]= (1.0f-fac)*re->wrld.horb + fac*re->wrld.zenb;
+			env[0] = (1.0f - fac) * re->wrld.horr + fac * re->wrld.zenr;
+			env[1] = (1.0f - fac) * re->wrld.horg + fac * re->wrld.zeng;
+			env[2] = (1.0f - fac) * re->wrld.horb + fac * re->wrld.zenb;
 
 			mul_v3_fl(env, occlusion);
 		}
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 170d2efd60c..eab152262f8 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -45,7 +45,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BKE_animsys.h"	/* <------ should this be here?, needed for sequencer update */
+#include "BKE_animsys.h"  /* <------ should this be here?, needed for sequencer update */
 #include "BKE_camera.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
@@ -56,7 +56,7 @@
 #include "BKE_scene.h"
 #include "BKE_sequencer.h"
 #include "BKE_utildefines.h"
-#include "BKE_writeavi.h"	/* <------ should be replaced once with generic movie module */
+#include "BKE_writeavi.h"  /* <------ should be replaced once with generic movie module */
 
 #include "BLI_math.h"
 #include "BLI_listbase.h"
@@ -127,7 +127,7 @@ Render R;
 
 static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovieHandle *mh, const char *name_override);
 
-static volatile int g_break= 0;
+static volatile int g_break = 0;
 static int thread_break(void *UNUSED(arg))
 {
 	return g_break;
@@ -145,13 +145,13 @@ static void stats_background(void *UNUSED(arg), RenderStats *rs)
 	uintptr_t mem_in_use, mmap_in_use, peak_memory;
 	float megs_used_memory, mmap_used_memory, megs_peak_memory;
 
-	mem_in_use= MEM_get_memory_in_use();
-	mmap_in_use= MEM_get_mapped_memory_in_use();
+	mem_in_use = MEM_get_memory_in_use();
+	mmap_in_use = MEM_get_mapped_memory_in_use();
 	peak_memory = MEM_get_peak_memory();
 
-	megs_used_memory= (mem_in_use-mmap_in_use)/(1024.0*1024.0);
-	mmap_used_memory= (mmap_in_use)/(1024.0*1024.0);
-	megs_peak_memory = (peak_memory)/(1024.0*1024.0);
+	megs_used_memory = (mem_in_use - mmap_in_use) / (1024.0 * 1024.0);
+	mmap_used_memory = (mmap_in_use) / (1024.0 * 1024.0);
+	megs_peak_memory = (peak_memory) / (1024.0 * 1024.0);
 
 	fprintf(stdout, "Fra:%d Mem:%.2fM (%.2fM, peak %.2fM) ", rs->cfra,
 	        megs_used_memory, mmap_used_memory, megs_peak_memory);
@@ -186,8 +186,8 @@ float *RE_RenderLayerGetPass(RenderLayer *rl, int passtype)
 {
 	RenderPass *rpass;
 	
-	for (rpass=rl->passes.first; rpass; rpass= rpass->next)
-		if (rpass->passtype== passtype)
+	for (rpass = rl->passes.first; rpass; rpass = rpass->next)
+		if (rpass->passtype == passtype)
 			return rpass->rect;
 	return NULL;
 }
@@ -196,10 +196,10 @@ RenderLayer *RE_GetRenderLayer(RenderResult *rr, const char *name)
 {
 	RenderLayer *rl;
 	
-	if (rr==NULL) return NULL;
+	if (rr == NULL) return NULL;
 	
-	for (rl= rr->layers.first; rl; rl= rl->next)
-		if (strncmp(rl->name, name, RE_MAXNAME)==0)
+	for (rl = rr->layers.first; rl; rl = rl->next)
+		if (strncmp(rl->name, name, RE_MAXNAME) == 0)
 			return rl;
 	return NULL;
 }
@@ -211,7 +211,7 @@ RenderResult *RE_MultilayerConvert(void *exrhandle, int rectx, int recty)
 
 RenderLayer *render_get_active_layer(Render *re, RenderResult *rr)
 {
-	RenderLayer *rl= BLI_findlink(&rr->layers, re->r.actlay);
+	RenderLayer *rl = BLI_findlink(&rr->layers, re->r.actlay);
 	
 	if (rl)
 		return rl;
@@ -223,7 +223,7 @@ static int render_scene_needs_vector(Render *re)
 {
 	SceneRenderLayer *srl;
 	
-	for (srl= re->scene->r.layers.first; srl; srl= srl->next)
+	for (srl = re->scene->r.layers.first; srl; srl = srl->next)
 		if (!(srl->layflag & SCE_LAY_DISABLE))
 			if (srl->passflag & SCE_PASS_VECTOR)
 				return 1;
@@ -238,8 +238,8 @@ Render *RE_GetRender(const char *name)
 	Render *re;
 
 	/* search for existing renders */
-	for (re= RenderGlobal.renderlist.first; re; re= re->next)
-		if (strncmp(re->name, name, RE_MAXNAME)==0)
+	for (re = RenderGlobal.renderlist.first; re; re = re->next)
+		if (strncmp(re->name, name, RE_MAXNAME) == 0)
 			break;
 
 	return re;
@@ -270,7 +270,7 @@ void RE_SwapResult(Render *re, RenderResult **rr)
 {
 	/* for keeping render buffers */
 	if (re) {
-		SWAP(RenderResult*, re->result, *rr);
+		SWAP(RenderResult *, re->result, *rr);
 	}
 }
 
@@ -300,25 +300,25 @@ void RE_AcquireResultImage(Render *re, RenderResult *rr)
 		if (re->result) {
 			RenderLayer *rl;
 			
-			rr->rectx= re->result->rectx;
-			rr->recty= re->result->recty;
+			rr->rectx = re->result->rectx;
+			rr->recty = re->result->recty;
 			
-			rr->rectf= re->result->rectf;
-			rr->rectz= re->result->rectz;
-			rr->rect32= re->result->rect32;
+			rr->rectf = re->result->rectf;
+			rr->rectz = re->result->rectz;
+			rr->rect32 = re->result->rect32;
 			
 			/* active layer */
-			rl= render_get_active_layer(re, re->result);
+			rl = render_get_active_layer(re, re->result);
 
 			if (rl) {
-				if (rr->rectf==NULL)
-					rr->rectf= rl->rectf;
-				if (rr->rectz==NULL)
-					rr->rectz= RE_RenderLayerGetPass(rl, SCE_PASS_Z);	
+				if (rr->rectf == NULL)
+					rr->rectf = rl->rectf;
+				if (rr->rectz == NULL)
+					rr->rectz = RE_RenderLayerGetPass(rl, SCE_PASS_Z);
 			}
 
-			rr->have_combined= (re->result->rectf != NULL);
-			rr->layers= re->result->layers;
+			rr->have_combined = (re->result->rectf != NULL);
+			rr->layers = re->result->layers;
 		}
 	}
 }
@@ -349,11 +349,11 @@ Render *RE_NewRender(const char *name)
 	Render *re;
 
 	/* only one render per name exists */
-	re= RE_GetRender(name);
-	if (re==NULL) {
+	re = RE_GetRender(name);
+	if (re == NULL) {
 		
 		/* new render data struct */
-		re= MEM_callocN(sizeof(Render), "new render");
+		re = MEM_callocN(sizeof(Render), "new render");
 		BLI_addtail(&RenderGlobal.renderlist, re);
 		BLI_strncpy(re->name, name, RE_MAXNAME);
 		BLI_rw_mutex_init(&re->resultmutex);
@@ -362,7 +362,7 @@ Render *RE_NewRender(const char *name)
 	RE_InitRenderCB(re);
 
 	/* init some variables */
-	re->ycor= 1.0f;
+	re->ycor = 1.0f;
 	
 	return re;
 }
@@ -372,17 +372,17 @@ Render *RE_NewRender(const char *name)
 void RE_InitRenderCB(Render *re)
 {
 	/* set default empty callbacks */
-	re->display_init= result_nothing;
-	re->display_clear= result_nothing;
-	re->display_draw= result_rcti_nothing;
-	re->progress= float_nothing;
-	re->test_break= default_break;
+	re->display_init = result_nothing;
+	re->display_clear = result_nothing;
+	re->display_draw = result_rcti_nothing;
+	re->progress = float_nothing;
+	re->test_break = default_break;
 	if (G.background)
-		re->stats_draw= stats_background;
+		re->stats_draw = stats_background;
 	else
-		re->stats_draw= stats_nothing;
+		re->stats_draw = stats_nothing;
 	/* clear callback handles */
-	re->dih= re->dch= re->ddh= re->sdh= re->prh= re->tbh= NULL;
+	re->dih = re->dch = re->ddh = re->sdh = re->prh = re->tbh = NULL;
 }
 
 /* only call this while you know it will remove the link too */
@@ -429,66 +429,66 @@ void RE_FreeAllRenderResults(void)
 /* disprect is optional, if NULL it assumes full window render */
 void RE_InitState(Render *re, Render *source, RenderData *rd, SceneRenderLayer *srl, int winx, int winy, rcti *disprect)
 {
-	re->ok= TRUE;	/* maybe flag */
+	re->ok = TRUE;   /* maybe flag */
 	
-	re->i.starttime= PIL_check_seconds_timer();
-	re->r= *rd;		/* hardcopy */
+	re->i.starttime = PIL_check_seconds_timer();
+	re->r = *rd;     /* hardcopy */
 	
-	re->winx= winx;
-	re->winy= winy;
+	re->winx = winx;
+	re->winy = winy;
 	if (disprect) {
-		re->disprect= *disprect;
-		re->rectx= disprect->xmax-disprect->xmin;
-		re->recty= disprect->ymax-disprect->ymin;
+		re->disprect = *disprect;
+		re->rectx = disprect->xmax - disprect->xmin;
+		re->recty = disprect->ymax - disprect->ymin;
 	}
 	else {
 		re->disprect.xmin = re->disprect.ymin = 0;
 		re->disprect.xmax = winx;
 		re->disprect.ymax = winy;
-		re->rectx= winx;
-		re->recty= winy;
+		re->rectx = winx;
+		re->recty = winy;
 	}
 	
 	if (re->rectx < 2 || re->recty < 2 || (BKE_imtype_is_movie(rd->im_format.imtype) &&
 	                                       (re->rectx < 16 || re->recty < 16) ))
 	{
 		BKE_report(re->reports, RPT_ERROR, "Image too small");
-		re->ok= 0;
+		re->ok = 0;
 		return;
 	}
 
-	if ((re->r.mode & (R_OSA))==0)
+	if ((re->r.mode & (R_OSA)) == 0)
 		re->r.scemode &= ~R_FULL_SAMPLE;
 
 #ifdef WITH_OPENEXR
 	if (re->r.scemode & R_FULL_SAMPLE)
-		re->r.scemode |= R_EXR_TILE_FILE;	/* enable automatic */
+		re->r.scemode |= R_EXR_TILE_FILE;   /* enable automatic */
 
 	/* Until use_border is made compatible with save_buffers/full_sample, render without the later instead of not rendering at all.*/
 	if (re->r.mode & R_BORDER) {
-		re->r.scemode &= ~(R_EXR_TILE_FILE|R_FULL_SAMPLE);
+		re->r.scemode &= ~(R_EXR_TILE_FILE | R_FULL_SAMPLE);
 	}
 
 #else
 	/* can't do this without openexr support */
-	re->r.scemode &= ~(R_EXR_TILE_FILE|R_FULL_SAMPLE);
+	re->r.scemode &= ~(R_EXR_TILE_FILE | R_FULL_SAMPLE);
 #endif
 	
 	/* fullsample wants uniform osa levels */
 	if (source && (re->r.scemode & R_FULL_SAMPLE)) {
 		/* but, if source has no full sample we disable it */
-		if ((source->r.scemode & R_FULL_SAMPLE)==0)
+		if ((source->r.scemode & R_FULL_SAMPLE) == 0)
 			re->r.scemode &= ~R_FULL_SAMPLE;
 		else
-			re->r.osa= re->osa= source->osa;
+			re->r.osa = re->osa = source->osa;
 	}
 	else {
 		/* check state variables, osa? */
 		if (re->r.mode & (R_OSA)) {
-			re->osa= re->r.osa;
-			if (re->osa>16) re->osa= 16;
+			re->osa = re->r.osa;
+			if (re->osa > 16) re->osa = 16;
 		}
-		else re->osa= 0;
+		else re->osa = 0;
 	}
 	
 	if (srl) {
@@ -506,25 +506,25 @@ void RE_InitState(Render *re, Render *source, RenderData *rd, SceneRenderLayer *
 	BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
 
 	if (re->r.scemode & R_PREVIEWBUTS) {
-		if (re->result && re->result->rectx==re->rectx && re->result->recty==re->recty);
+		if (re->result && re->result->rectx == re->rectx && re->result->recty == re->recty) ;
 		else {
 			render_result_free(re->result);
-			re->result= NULL;
+			re->result = NULL;
 		}
 	}
 	else {
 		
 		/* make empty render result, so display callbacks can initialize */
 		render_result_free(re->result);
-		re->result= MEM_callocN(sizeof(RenderResult), "new render result");
-		re->result->rectx= re->rectx;
-		re->result->recty= re->recty;
+		re->result = MEM_callocN(sizeof(RenderResult), "new render result");
+		re->result->rectx = re->rectx;
+		re->result->recty = re->recty;
 	}
 
 	BLI_rw_mutex_unlock(&re->resultmutex);
 	
 	/* we clip faces with a minimum of 2 pixel boundary outside of image border. see zbuf.c */
-	re->clipcrop= 1.0f + 2.0f/(float)(re->winx>re->winy?re->winy:re->winx);
+	re->clipcrop = 1.0f + 2.0f / (float)(re->winx > re->winy ? re->winy : re->winx);
 	
 	re->mblur_offs = re->field_offs = 0.f;
 	
@@ -535,9 +535,9 @@ void RE_SetWindow(Render *re, rctf *viewplane, float clipsta, float clipend)
 {
 	/* re->ok flag? */
 	
-	re->viewplane= *viewplane;
-	re->clipsta= clipsta;
-	re->clipend= clipend;
+	re->viewplane = *viewplane;
+	re->clipsta = clipsta;
+	re->clipend = clipend;
 	re->r.mode &= ~R_ORTHO;
 
 	perspective_m4(re->winmat,
@@ -550,9 +550,9 @@ void RE_SetOrtho(Render *re, rctf *viewplane, float clipsta, float clipend)
 {
 	/* re->ok flag? */
 	
-	re->viewplane= *viewplane;
-	re->clipsta= clipsta;
-	re->clipend= clipend;
+	re->viewplane = *viewplane;
+	re->clipsta = clipsta;
+	re->clipend = clipend;
 	re->r.mode |= R_ORTHO;
 
 	orthographic_m4(re->winmat,
@@ -570,40 +570,40 @@ void RE_SetView(Render *re, float mat[][4])
 /* image and movie output has to move to either imbuf or kernel */
 void RE_display_init_cb(Render *re, void *handle, void (*f)(void *handle, RenderResult *rr))
 {
-	re->display_init= f;
-	re->dih= handle;
+	re->display_init = f;
+	re->dih = handle;
 }
 void RE_display_clear_cb(Render *re, void *handle, void (*f)(void *handle, RenderResult *rr))
 {
-	re->display_clear= f;
-	re->dch= handle;
+	re->display_clear = f;
+	re->dch = handle;
 }
 void RE_display_draw_cb(Render *re, void *handle, void (*f)(void *handle, RenderResult *rr, volatile rcti *rect))
 {
-	re->display_draw= f;
-	re->ddh= handle;
+	re->display_draw = f;
+	re->ddh = handle;
 }
 void RE_stats_draw_cb(Render *re, void *handle, void (*f)(void *handle, RenderStats *rs))
 {
-	re->stats_draw= f;
-	re->sdh= handle;
+	re->stats_draw = f;
+	re->sdh = handle;
 }
 void RE_progress_cb(Render *re, void *handle, void (*f)(void *handle, float))
 {
-	re->progress= f;
-	re->prh= handle;
+	re->progress = f;
+	re->prh = handle;
 }
 
 void RE_draw_lock_cb(Render *re, void *handle, void (*f)(void *handle, int i))
 {
-	re->draw_lock= f;
-	re->tbh= handle;
+	re->draw_lock = f;
+	re->tbh = handle;
 }
 
 void RE_test_break_cb(Render *re, void *handle, int (*f)(void *handle))
 {
-	re->test_break= f;
-	re->tbh= handle;
+	re->test_break = f;
+	re->tbh = handle;
 }
 
 
@@ -632,15 +632,15 @@ static int render_display_draw_enabled(Render *re)
 /* the main thread call, renders an entire part */
 static void *do_part_thread(void *pa_v)
 {
-	RenderPart *pa= pa_v;
+	RenderPart *pa = pa_v;
 	
 	/* need to return nicely all parts on esc */
-	if (R.test_break(R.tbh)==0) {
+	if (R.test_break(R.tbh) == 0) {
 		
 		if (!R.sss_points && (R.r.scemode & R_FULL_SAMPLE))
-			pa->result= render_result_new_full_sample(&R, &pa->fullresult, &pa->disprect, pa->crop, RR_USE_MEM);
+			pa->result = render_result_new_full_sample(&R, &pa->fullresult, &pa->disprect, pa->crop, RR_USE_MEM);
 		else
-			pa->result= render_result_new(&R, &pa->disprect, pa->crop, RR_USE_MEM);
+			pa->result = render_result_new(&R, &pa->disprect, pa->crop, RR_USE_MEM);
 
 		if (R.sss_points)
 			zbufshade_sss_tile(pa);
@@ -655,12 +655,12 @@ static void *do_part_thread(void *pa_v)
 		}
 		else if (render_display_draw_enabled(&R)) {
 			/* on break, don't merge in result for preview renders, looks nicer */
-			if (R.test_break(R.tbh) && (R.r.scemode & R_PREVIEWBUTS));
+			if (R.test_break(R.tbh) && (R.r.scemode & R_PREVIEWBUTS)) ;
 			else render_result_merge(R.result, pa->result);
 		}
 	}
 	
-	pa->ready= 1;
+	pa->ready = 1;
 	
 	return NULL;
 }
@@ -671,21 +671,21 @@ static void *do_part_thread(void *pa_v)
 float panorama_pixel_rot(Render *re)
 {
 	float psize, phi, xfac;
-	float borderfac= (float)(re->disprect.xmax - re->disprect.xmin) / (float)re->winx;
+	float borderfac = (float)(re->disprect.xmax - re->disprect.xmin) / (float)re->winx;
 	
 	/* size of 1 pixel mapped to viewplane coords */
-	psize= (re->viewplane.xmax-re->viewplane.xmin)/(float)(re->winx);
+	psize = (re->viewplane.xmax - re->viewplane.xmin) / (float)(re->winx);
 	/* angle of a pixel */
-	phi= atan(psize/re->clipsta);
+	phi = atan(psize / re->clipsta);
 	
 	/* correction factor for viewplane shifting, first calculate how much the viewplane angle is */
-	xfac= borderfac*((re->viewplane.xmax-re->viewplane.xmin))/(float)re->xparts;
-	xfac= atan(0.5f*xfac/re->clipsta); 
+	xfac = borderfac * ((re->viewplane.xmax - re->viewplane.xmin)) / (float)re->xparts;
+	xfac = atan(0.5f * xfac / re->clipsta);
 	/* and how much the same viewplane angle is wrapped */
-	psize= 0.5f*phi*((float)re->partx);
+	psize = 0.5f * phi * ((float)re->partx);
 	
 	/* the ratio applied to final per-pixel angle */
-	phi*= xfac/psize;
+	phi *= xfac / psize;
 	
 	return phi;
 }
@@ -694,25 +694,25 @@ float panorama_pixel_rot(Render *re)
 /* if slice found, it rotates the dbase */
 static RenderPart *find_next_pano_slice(Render *re, int *minx, rctf *viewplane)
 {
-	RenderPart *pa, *best= NULL;
+	RenderPart *pa, *best = NULL;
 	
-	*minx= re->winx;
+	*minx = re->winx;
 	
 	/* most left part of the non-rendering parts */
-	for (pa= re->parts.first; pa; pa= pa->next) {
-		if (pa->ready==0 && pa->nr==0) {
+	for (pa = re->parts.first; pa; pa = pa->next) {
+		if (pa->ready == 0 && pa->nr == 0) {
 			if (pa->disprect.xmin < *minx) {
-				best= pa;
-				*minx= pa->disprect.xmin;
+				best = pa;
+				*minx = pa->disprect.xmin;
 			}
 		}
 	}
 			
 	if (best) {
-		float phi= panorama_pixel_rot(re);
+		float phi = panorama_pixel_rot(re);
 
-		R.panodxp= (re->winx - (best->disprect.xmin + best->disprect.xmax) )/2;
-		R.panodxv= ((viewplane->xmax-viewplane->xmin)*R.panodxp)/(float)(re->winx);
+		R.panodxp = (re->winx - (best->disprect.xmin + best->disprect.xmax) ) / 2;
+		R.panodxv = ((viewplane->xmax - viewplane->xmin) * R.panodxp) / (float)(re->winx);
 
 		/* shift viewplane */
 		R.viewplane.xmin = viewplane->xmin + R.panodxv;
@@ -721,48 +721,48 @@ static RenderPart *find_next_pano_slice(Render *re, int *minx, rctf *viewplane)
 		copy_m4_m4(R.winmat, re->winmat);
 		
 		/* rotate database according to part coordinates */
-		project_renderdata(re, projectverto, 1, -R.panodxp*phi, 1);
-		R.panosi= sin(R.panodxp*phi);
-		R.panoco= cos(R.panodxp*phi);
+		project_renderdata(re, projectverto, 1, -R.panodxp * phi, 1);
+		R.panosi = sin(R.panodxp * phi);
+		R.panoco = cos(R.panodxp * phi);
 	}
 	return best;
 }
 
 static RenderPart *find_next_part(Render *re, int minx)
 {
-	RenderPart *pa, *best= NULL;
+	RenderPart *pa, *best = NULL;
 
 	/* long long int's needed because of overflow [#24414] */
-	long long int centx=re->winx/2, centy=re->winy/2, tot=1;
-	long long int mindist= (long long int)re->winx * (long long int)re->winy;
+	long long int centx = re->winx / 2, centy = re->winy / 2, tot = 1;
+	long long int mindist = (long long int)re->winx * (long long int)re->winy;
 	
 	/* find center of rendered parts, image center counts for 1 too */
-	for (pa= re->parts.first; pa; pa= pa->next) {
+	for (pa = re->parts.first; pa; pa = pa->next) {
 		if (pa->ready) {
-			centx+= (pa->disprect.xmin+pa->disprect.xmax)/2;
-			centy+= (pa->disprect.ymin+pa->disprect.ymax)/2;
+			centx += (pa->disprect.xmin + pa->disprect.xmax) / 2;
+			centy += (pa->disprect.ymin + pa->disprect.ymax) / 2;
 			tot++;
 		}
 	}
-	centx/=tot;
-	centy/=tot;
+	centx /= tot;
+	centy /= tot;
 	
 	/* closest of the non-rendering parts */
-	for (pa= re->parts.first; pa; pa= pa->next) {
-		if (pa->ready==0 && pa->nr==0) {
-			long long int distx= centx - (pa->disprect.xmin+pa->disprect.xmax)/2;
-			long long int disty= centy - (pa->disprect.ymin+pa->disprect.ymax)/2;
-			distx= (long long int)sqrt(distx*distx + disty*disty);
-			if (distx<mindist) {
+	for (pa = re->parts.first; pa; pa = pa->next) {
+		if (pa->ready == 0 && pa->nr == 0) {
+			long long int distx = centx - (pa->disprect.xmin + pa->disprect.xmax) / 2;
+			long long int disty = centy - (pa->disprect.ymin + pa->disprect.ymax) / 2;
+			distx = (long long int)sqrt(distx * distx + disty * disty);
+			if (distx < mindist) {
 				if (re->r.mode & R_PANORAMA) {
-					if (pa->disprect.xmin==minx) {
-						best= pa;
-						mindist= distx;
+					if (pa->disprect.xmin == minx) {
+						best = pa;
+						mindist = distx;
 					}
 				}
 				else {
-					best= pa;
-					mindist= distx;
+					best = pa;
+					mindist = distx;
 				}
 			}
 		}
@@ -774,37 +774,37 @@ static void print_part_stats(Render *re, RenderPart *pa)
 {
 	char str[64];
 	
-	BLI_snprintf(str, sizeof(str), "%s, Part %d-%d", re->scene->id.name+2, pa->nr, re->i.totpart);
-	re->i.infostr= str;
+	BLI_snprintf(str, sizeof(str), "%s, Part %d-%d", re->scene->id.name + 2, pa->nr, re->i.totpart);
+	re->i.infostr = str;
 	re->stats_draw(re->sdh, &re->i);
-	re->i.infostr= NULL;
+	re->i.infostr = NULL;
 }
 
 static void threaded_tile_processor(Render *re)
 {
 	ListBase threads;
 	RenderPart *pa, *nextpa;
-	rctf viewplane= re->viewplane;
-	int rendering=1, counter= 1, drawtimer=0, hasdrawn, minx=0;
+	rctf viewplane = re->viewplane;
+	int rendering = 1, counter = 1, drawtimer = 0, hasdrawn, minx = 0;
 	
 	BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
 
 	/* first step; free the entire render result, make new, and/or prepare exr buffer saving */
-	if (re->result==NULL || !(re->r.scemode & R_PREVIEWBUTS)) {
+	if (re->result == NULL || !(re->r.scemode & R_PREVIEWBUTS)) {
 		render_result_free(re->result);
 	
 		if (re->sss_points && render_display_draw_enabled(re))
-			re->result= render_result_new(re, &re->disprect, 0, RR_USE_MEM);
+			re->result = render_result_new(re, &re->disprect, 0, RR_USE_MEM);
 		else if (re->r.scemode & R_FULL_SAMPLE)
-			re->result= render_result_new_full_sample(re, &re->fullresult, &re->disprect, 0, RR_USE_EXR);
+			re->result = render_result_new_full_sample(re, &re->fullresult, &re->disprect, 0, RR_USE_EXR);
 		else
-			re->result= render_result_new(re, &re->disprect, 0,
-				(re->r.scemode & R_EXR_TILE_FILE)? RR_USE_EXR: RR_USE_MEM);
+			re->result = render_result_new(re, &re->disprect, 0,
+			                               (re->r.scemode & R_EXR_TILE_FILE) ? RR_USE_EXR : RR_USE_MEM);
 	}
 
 	BLI_rw_mutex_unlock(&re->resultmutex);
 	
-	if (re->result==NULL)
+	if (re->result == NULL)
 		return;
 	
 	/* warning; no return here without closing exr file */
@@ -817,32 +817,32 @@ static void threaded_tile_processor(Render *re)
 	BLI_init_threads(&threads, do_part_thread, re->r.threads);
 	
 	/* assuming no new data gets added to dbase... */
-	R= *re;
+	R = *re;
 	
 	/* set threadsafe break */
-	R.test_break= thread_break;
+	R.test_break = thread_break;
 	
 	/* timer loop demands to sleep when no parts are left, so we enter loop with a part */
 	if (re->r.mode & R_PANORAMA)
-		nextpa= find_next_pano_slice(re, &minx, &viewplane);
+		nextpa = find_next_pano_slice(re, &minx, &viewplane);
 	else
-		nextpa= find_next_part(re, 0);
+		nextpa = find_next_part(re, 0);
 	
 	while (rendering) {
 		
 		if (re->test_break(re->tbh))
 			PIL_sleep_ms(50);
 		else if (nextpa && BLI_available_threads(&threads)) {
-			drawtimer= 0;
-			nextpa->nr= counter++;	/* for nicest part, and for stats */
-			nextpa->thread= BLI_available_thread_index(&threads);	/* sample index */
+			drawtimer = 0;
+			nextpa->nr = counter++;  /* for nicest part, and for stats */
+			nextpa->thread = BLI_available_thread_index(&threads);   /* sample index */
 			BLI_insert_thread(&threads, nextpa);
 
-			nextpa= find_next_part(re, minx);
+			nextpa = find_next_part(re, minx);
 		}
 		else if (re->r.mode & R_PANORAMA) {
-			if (nextpa==NULL && BLI_available_threads(&threads)==re->r.threads)
-				nextpa= find_next_pano_slice(re, &minx, &viewplane);
+			if (nextpa == NULL && BLI_available_threads(&threads) == re->r.threads)
+				nextpa = find_next_pano_slice(re, &minx, &viewplane);
 			else {
 				PIL_sleep_ms(50);
 				drawtimer++;
@@ -854,9 +854,9 @@ static void threaded_tile_processor(Render *re)
 		}
 		
 		/* check for ready ones to display, and if we need to continue */
-		rendering= 0;
-		hasdrawn= 0;
-		for (pa= re->parts.first; pa; pa= pa->next) {
+		rendering = 0;
+		hasdrawn = 0;
+		for (pa = re->parts.first; pa; pa = pa->next) {
 			if (pa->ready) {
 				
 				BLI_remove_thread(&threads, pa);
@@ -867,27 +867,27 @@ static void threaded_tile_processor(Render *re)
 					print_part_stats(re, pa);
 					
 					render_result_free_list(&pa->fullresult, pa->result);
-					pa->result= NULL;
+					pa->result = NULL;
 					re->i.partsdone++;
 					re->progress(re->prh, re->i.partsdone / (float)re->i.totpart);
-					hasdrawn= 1;
+					hasdrawn = 1;
 				}
 			}
 			else {
-				rendering= 1;
-				if (pa->nr && pa->result && drawtimer>20) {
+				rendering = 1;
+				if (pa->nr && pa->result && drawtimer > 20) {
 					if (render_display_draw_enabled(re))
 						re->display_draw(re->ddh, pa->result, &pa->result->renrect);
-					hasdrawn= 1;
+					hasdrawn = 1;
 				}
 			}
 		}
 		if (hasdrawn)
-			drawtimer= 0;
+			drawtimer = 0;
 
 		/* on break, wait for all slots to get freed */
-		if ( (g_break=re->test_break(re->tbh)) && BLI_available_threads(&threads)==re->r.threads)
-			rendering= 0;
+		if ( (g_break = re->test_break(re->tbh)) && BLI_available_threads(&threads) == re->r.threads)
+			rendering = 0;
 		
 	}
 	
@@ -898,11 +898,11 @@ static void threaded_tile_processor(Render *re)
 	}
 	
 	/* unset threadsafety */
-	g_break= 0;
+	g_break = 0;
 	
 	BLI_end_threads(&threads);
 	freeparts(re);
-	re->viewplane= viewplane; /* restore viewplane, modified by pano render */
+	re->viewplane = viewplane; /* restore viewplane, modified by pano render */
 }
 
 /* currently only called by preview renders and envmap */
@@ -954,59 +954,59 @@ static void do_render_3d(Render *re)
 /* called by blur loop, accumulate RGBA key alpha */
 static void addblur_rect_key(RenderResult *rr, float *rectf, float *rectf1, float blurfac)
 {
-	float mfac= 1.0f - blurfac;
-	int a, b, stride= 4*rr->rectx;
-	int len= stride*sizeof(float);
+	float mfac = 1.0f - blurfac;
+	int a, b, stride = 4 * rr->rectx;
+	int len = stride * sizeof(float);
 	
-	for (a=0; a<rr->recty; a++) {
-		if (blurfac==1.0f) {
+	for (a = 0; a < rr->recty; a++) {
+		if (blurfac == 1.0f) {
 			memcpy(rectf, rectf1, len);
 		}
 		else {
-			float *rf= rectf, *rf1= rectf1;
+			float *rf = rectf, *rf1 = rectf1;
 			
-			for ( b= rr->rectx; b>0; b--, rf+=4, rf1+=4) {
-				if (rf1[3]<0.01f)
-					rf[3]= mfac*rf[3];
-				else if (rf[3]<0.01f) {
-					rf[0]= rf1[0];
-					rf[1]= rf1[1];
-					rf[2]= rf1[2];
-					rf[3]= blurfac*rf1[3];
+			for (b = rr->rectx; b > 0; b--, rf += 4, rf1 += 4) {
+				if (rf1[3] < 0.01f)
+					rf[3] = mfac * rf[3];
+				else if (rf[3] < 0.01f) {
+					rf[0] = rf1[0];
+					rf[1] = rf1[1];
+					rf[2] = rf1[2];
+					rf[3] = blurfac * rf1[3];
 				}
 				else {
-					rf[0]= mfac*rf[0] + blurfac*rf1[0];
-					rf[1]= mfac*rf[1] + blurfac*rf1[1];
-					rf[2]= mfac*rf[2] + blurfac*rf1[2];
-					rf[3]= mfac*rf[3] + blurfac*rf1[3];
+					rf[0] = mfac * rf[0] + blurfac * rf1[0];
+					rf[1] = mfac * rf[1] + blurfac * rf1[1];
+					rf[2] = mfac * rf[2] + blurfac * rf1[2];
+					rf[3] = mfac * rf[3] + blurfac * rf1[3];
 				}				
 			}
 		}
-		rectf+= stride;
-		rectf1+= stride;
+		rectf += stride;
+		rectf1 += stride;
 	}
 }
 
 /* called by blur loop, accumulate renderlayers */
 static void addblur_rect(RenderResult *rr, float *rectf, float *rectf1, float blurfac, int channels)
 {
-	float mfac= 1.0f - blurfac;
-	int a, b, stride= channels*rr->rectx;
-	int len= stride*sizeof(float);
+	float mfac = 1.0f - blurfac;
+	int a, b, stride = channels * rr->rectx;
+	int len = stride * sizeof(float);
 	
-	for (a=0; a<rr->recty; a++) {
-		if (blurfac==1.0f) {
+	for (a = 0; a < rr->recty; a++) {
+		if (blurfac == 1.0f) {
 			memcpy(rectf, rectf1, len);
 		}
 		else {
-			float *rf= rectf, *rf1= rectf1;
+			float *rf = rectf, *rf1 = rectf1;
 			
-			for ( b= rr->rectx*channels; b>0; b--, rf++, rf1++) {
-				rf[0]= mfac*rf[0] + blurfac*rf1[0];
+			for (b = rr->rectx * channels; b > 0; b--, rf++, rf1++) {
+				rf[0] = mfac * rf[0] + blurfac * rf1[0];
 			}
 		}
-		rectf+= stride;
-		rectf1+= stride;
+		rectf += stride;
+		rectf1 += stride;
 	}
 }
 
@@ -1017,8 +1017,8 @@ static void merge_renderresult_blur(RenderResult *rr, RenderResult *brr, float b
 	RenderLayer *rl, *rl1;
 	RenderPass *rpass, *rpass1;
 	
-	rl1= brr->layers.first;
-	for (rl= rr->layers.first; rl && rl1; rl= rl->next, rl1= rl1->next) {
+	rl1 = brr->layers.first;
+	for (rl = rr->layers.first; rl && rl1; rl = rl->next, rl1 = rl1->next) {
 		
 		/* combined */
 		if (rl->rectf && rl1->rectf) {
@@ -1029,8 +1029,8 @@ static void merge_renderresult_blur(RenderResult *rr, RenderResult *brr, float b
 		}
 		
 		/* passes are allocated in sync */
-		rpass1= rl1->passes.first;
-		for (rpass= rl->passes.first; rpass && rpass1; rpass= rpass->next, rpass1= rpass1->next) {
+		rpass1 = rl1->passes.first;
+		for (rpass = rl->passes.first; rpass && rpass1; rpass = rpass->next, rpass1 = rpass1->next) {
 			addblur_rect(rr, rpass->rect, rpass1->rect, blurfac, rpass->channels);
 		}
 	}
@@ -1041,20 +1041,20 @@ static void do_render_blur_3d(Render *re)
 {
 	RenderResult *rres;
 	float blurfac;
-	int blur= re->r.mblur_samples;
+	int blur = re->r.mblur_samples;
 	
 	/* create accumulation render result */
-	rres= render_result_new(re, &re->disprect, 0, RR_USE_MEM);
+	rres = render_result_new(re, &re->disprect, 0, RR_USE_MEM);
 	
 	/* do the blur steps */
 	while (blur--) {
-		re->mblur_offs = re->r.blurfac*((float)(re->r.mblur_samples-blur))/(float)re->r.mblur_samples;
+		re->mblur_offs = re->r.blurfac * ((float)(re->r.mblur_samples - blur)) / (float)re->r.mblur_samples;
 		
-		re->i.curblur= re->r.mblur_samples-blur;	/* stats */
+		re->i.curblur = re->r.mblur_samples - blur;    /* stats */
 		
 		do_render_3d(re);
 		
-		blurfac= 1.0f/(float)(re->r.mblur_samples-blur);
+		blurfac = 1.0f / (float)(re->r.mblur_samples - blur);
 		
 		merge_renderresult_blur(rres, re->result, blurfac, re->r.alphamode & R_ALPHAKEY);
 		if (re->test_break(re->tbh)) break;
@@ -1063,14 +1063,14 @@ static void do_render_blur_3d(Render *re)
 	/* swap results */
 	BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
 	render_result_free(re->result);
-	re->result= rres;
+	re->result = rres;
 	BLI_rw_mutex_unlock(&re->resultmutex);
 	
 	re->mblur_offs = 0.0f;
-	re->i.curblur= 0;	/* stats */
+	re->i.curblur = 0;   /* stats */
 	
 	/* weak... the display callback wants an active renderlayer pointer... */
-	re->result->renlay= render_get_active_layer(re, re->result);
+	re->result->renlay = render_get_active_layer(re, re->result);
 	re->display_draw(re->ddh, re->result, NULL);	
 }
 
@@ -1078,16 +1078,16 @@ static void do_render_blur_3d(Render *re)
 /* function assumes rectf1 and rectf2 to be half size of rectf */
 static void interleave_rect(RenderResult *rr, float *rectf, float *rectf1, float *rectf2, int channels)
 {
-	int a, stride= channels*rr->rectx;
-	int len= stride*sizeof(float);
+	int a, stride = channels * rr->rectx;
+	int len = stride * sizeof(float);
 	
-	for (a=0; a<rr->recty; a+=2) {
+	for (a = 0; a < rr->recty; a += 2) {
 		memcpy(rectf, rectf1, len);
-		rectf+= stride;
-		rectf1+= stride;
+		rectf += stride;
+		rectf1 += stride;
 		memcpy(rectf, rectf2, len);
-		rectf+= stride;
-		rectf2+= stride;
+		rectf += stride;
+		rectf2 += stride;
 	}
 }
 
@@ -1097,18 +1097,18 @@ static void merge_renderresult_fields(RenderResult *rr, RenderResult *rr1, Rende
 	RenderLayer *rl, *rl1, *rl2;
 	RenderPass *rpass, *rpass1, *rpass2;
 	
-	rl1= rr1->layers.first;
-	rl2= rr2->layers.first;
-	for (rl= rr->layers.first; rl && rl1 && rl2; rl= rl->next, rl1= rl1->next, rl2= rl2->next) {
+	rl1 = rr1->layers.first;
+	rl2 = rr2->layers.first;
+	for (rl = rr->layers.first; rl && rl1 && rl2; rl = rl->next, rl1 = rl1->next, rl2 = rl2->next) {
 		
 		/* combined */
 		if (rl->rectf && rl1->rectf && rl2->rectf)
 			interleave_rect(rr, rl->rectf, rl1->rectf, rl2->rectf, 4);
 		
 		/* passes are allocated in sync */
-		rpass1= rl1->passes.first;
-		rpass2= rl2->passes.first;
-		for (rpass= rl->passes.first; rpass && rpass1 && rpass2; rpass= rpass->next, rpass1= rpass1->next, rpass2= rpass2->next) {
+		rpass1 = rl1->passes.first;
+		rpass2 = rl2->passes.first;
+		for (rpass = rl->passes.first; rpass && rpass1 && rpass2; rpass = rpass->next, rpass1 = rpass1->next, rpass2 = rpass2->next) {
 			interleave_rect(rr, rpass->rect, rpass1->rect, rpass2->rect, rpass->channels);
 		}
 	}
@@ -1118,8 +1118,8 @@ static void merge_renderresult_fields(RenderResult *rr, RenderResult *rr1, Rende
 /* interleaves 2 frames */
 static void do_render_fields_3d(Render *re)
 {
-	Object *camera= RE_GetCamera(re);
-	RenderResult *rr1, *rr2= NULL;
+	Object *camera = RE_GetCamera(re);
+	RenderResult *rr1, *rr2 = NULL;
 	
 	/* no render result was created, we can safely halve render y */
 	re->winy /= 2;
@@ -1127,31 +1127,31 @@ static void do_render_fields_3d(Render *re)
 	re->disprect.ymin /= 2;
 	re->disprect.ymax /= 2;
 	
-	re->i.curfield= 1;	/* stats */
+	re->i.curfield = 1;  /* stats */
 	
 	/* first field, we have to call camera routine for correct aspect and subpixel offset */
 	RE_SetCamera(re, camera);
-	if (re->r.mode & R_MBLUR && (re->r.scemode & R_FULL_SAMPLE)==0)
+	if (re->r.mode & R_MBLUR && (re->r.scemode & R_FULL_SAMPLE) == 0)
 		do_render_blur_3d(re);
 	else
 		do_render_3d(re);
 
 	BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
-	rr1= re->result;
-	re->result= NULL;
+	rr1 = re->result;
+	re->result = NULL;
 	BLI_rw_mutex_unlock(&re->resultmutex);
 	
 	/* second field */
 	if (!re->test_break(re->tbh)) {
 		
-		re->i.curfield= 2;	/* stats */
+		re->i.curfield = 2;  /* stats */
 		
 		re->flag |= R_SEC_FIELD;
-		if ((re->r.mode & R_FIELDSTILL)==0) {
+		if ((re->r.mode & R_FIELDSTILL) == 0) {
 			re->field_offs = 0.5f;
 		}
 		RE_SetCamera(re, camera);
-		if (re->r.mode & R_MBLUR && (re->r.scemode & R_FULL_SAMPLE)==0)
+		if (re->r.mode & R_MBLUR && (re->r.scemode & R_FULL_SAMPLE) == 0)
 			do_render_blur_3d(re);
 		else
 			do_render_3d(re);
@@ -1159,7 +1159,7 @@ static void do_render_fields_3d(Render *re)
 		
 		re->field_offs = 0.0f;
 		
-		rr2= re->result;
+		rr2 = re->result;
 	}
 	
 	/* allocate original height new buffers */
@@ -1169,7 +1169,7 @@ static void do_render_fields_3d(Render *re)
 	re->disprect.ymax *= 2;
 
 	BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
-	re->result= render_result_new(re, &re->disprect, 0, RR_USE_MEM);
+	re->result = render_result_new(re, &re->disprect, 0, RR_USE_MEM);
 
 	if (rr2) {
 		if (re->r.mode & R_ODDFIELD)
@@ -1182,10 +1182,10 @@ static void do_render_fields_3d(Render *re)
 
 	render_result_free(rr1);
 	
-	re->i.curfield= 0;	/* stats */
+	re->i.curfield = 0;  /* stats */
 	
 	/* weak... the display callback wants an active renderlayer pointer... */
-	re->result->renlay= render_get_active_layer(re, re->result);
+	re->result->renlay = render_get_active_layer(re, re->result);
 
 	BLI_rw_mutex_unlock(&re->resultmutex);
 
@@ -1195,11 +1195,11 @@ static void do_render_fields_3d(Render *re)
 /* main render routine, no compositing */
 static void do_render_fields_blur_3d(Render *re)
 {
-	Object *camera= RE_GetCamera(re);
+	Object *camera = RE_GetCamera(re);
 	/* also check for camera here */
 	if (camera == NULL) {
 		printf("ERROR: Cannot render, no camera\n");
-		G.afbreek= 1;
+		G.afbreek = 1;
 		return;
 	}
 
@@ -1208,7 +1208,7 @@ static void do_render_fields_blur_3d(Render *re)
 	
 	if (re->r.mode & R_FIELDS)
 		do_render_fields_3d(re);
-	else if (re->r.mode & R_MBLUR && (re->r.scemode & R_FULL_SAMPLE)==0)
+	else if (re->r.mode & R_MBLUR && (re->r.scemode & R_FULL_SAMPLE) == 0)
 		do_render_blur_3d(re);
 	else
 		do_render_3d(re);
@@ -1216,30 +1216,30 @@ static void do_render_fields_blur_3d(Render *re)
 	/* when border render, check if we have to insert it in black */
 	if (re->result) {
 		if (re->r.mode & R_BORDER) {
-			if ((re->r.mode & R_CROP)==0) {
+			if ((re->r.mode & R_CROP) == 0) {
 				RenderResult *rres;
 				
 				BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
 
 				/* sub-rect for merge call later on */
-				re->result->tilerect= re->disprect;
+				re->result->tilerect = re->disprect;
 				
 				/* this copying sequence could become function? */
 				/* weak is: it chances disprect from border */
 				re->disprect.xmin = re->disprect.ymin = 0;
 				re->disprect.xmax = re->winx;
 				re->disprect.ymax = re->winy;
-				re->rectx= re->winx;
-				re->recty= re->winy;
+				re->rectx = re->winx;
+				re->recty = re->winy;
 				
-				rres= render_result_new(re, &re->disprect, 0, RR_USE_MEM);
+				rres = render_result_new(re, &re->disprect, 0, RR_USE_MEM);
 				
 				render_result_merge(rres, re->result);
 				render_result_free(re->result);
-				re->result= rres;
+				re->result = rres;
 				
 				/* weak... the display callback wants an active renderlayer pointer... */
-				re->result->renlay= render_get_active_layer(re, re->result);
+				re->result->renlay = render_get_active_layer(re, re->result);
 				
 				BLI_rw_mutex_unlock(&re->resultmutex);
 		
@@ -1248,8 +1248,8 @@ static void do_render_fields_blur_3d(Render *re)
 			}
 			else {
 				/* set offset (again) for use in compositor, disprect was manipulated. */
-				re->result->xof= 0;
-				re->result->yof= 0;
+				re->result->xof = 0;
+				re->result->yof = 0;
 			}
 		}
 	}
@@ -1261,37 +1261,37 @@ static void do_render_fields_blur_3d(Render *re)
  */
 static void render_scene(Render *re, Scene *sce, int cfra)
 {
-	Render *resc= RE_NewRender(sce->id.name);
-	int winx= re->winx, winy= re->winy;
+	Render *resc = RE_NewRender(sce->id.name);
+	int winx = re->winx, winy = re->winy;
 	
-	sce->r.cfra= cfra;
+	sce->r.cfra = cfra;
 
 	BKE_scene_camera_switch_update(sce);
 
 	/* exception: scene uses own size (unfinished code) */
 	if (0) {
-		winx= (sce->r.size*sce->r.xsch)/100;
-		winy= (sce->r.size*sce->r.ysch)/100;
+		winx = (sce->r.size * sce->r.xsch) / 100;
+		winy = (sce->r.size * sce->r.ysch) / 100;
 	}
 	
 	/* initial setup */
 	RE_InitState(resc, re, &sce->r, NULL, winx, winy, &re->disprect);
 	
 	/* still unsure entity this... */
-	resc->main= re->main;
-	resc->scene= sce;
-	resc->lay= sce->lay;
+	resc->main = re->main;
+	resc->scene = sce;
+	resc->lay = sce->lay;
 	
 	/* ensure scene has depsgraph, base flags etc OK */
 	BKE_scene_set_background(re->main, sce);
 
 	/* copy callbacks */
-	resc->display_draw= re->display_draw;
-	resc->ddh= re->ddh;
-	resc->test_break= re->test_break;
-	resc->tbh= re->tbh;
-	resc->stats_draw= re->stats_draw;
-	resc->sdh= re->sdh;
+	resc->display_draw = re->display_draw;
+	resc->ddh = re->ddh;
+	resc->test_break = re->test_break;
+	resc->tbh = re->tbh;
+	resc->stats_draw = re->stats_draw;
+	resc->sdh = re->sdh;
 	
 	do_render_fields_blur_3d(resc);
 }
@@ -1299,16 +1299,16 @@ static void render_scene(Render *re, Scene *sce, int cfra)
 /* helper call to detect if this scene needs a render, or if there's a any render layer to render */
 static int composite_needs_render(Scene *sce, int this_scene)
 {
-	bNodeTree *ntree= sce->nodetree;
+	bNodeTree *ntree = sce->nodetree;
 	bNode *node;
 	
-	if (ntree==NULL) return 1;
+	if (ntree == NULL) return 1;
 	if (sce->use_nodes == FALSE) return 1;
-	if ((sce->r.scemode & R_DOCOMP)==0) return 1;
+	if ((sce->r.scemode & R_DOCOMP) == 0) return 1;
 	
-	for (node= ntree->nodes.first; node; node= node->next) {
-		if (node->type==CMP_NODE_R_LAYERS)
-			if (this_scene==0 || node->id==NULL || node->id==&sce->id)
+	for (node = ntree->nodes.first; node; node = node->next) {
+		if (node->type == CMP_NODE_R_LAYERS)
+			if (this_scene == 0 || node->id == NULL || node->id == &sce->id)
 				return 1;
 	}
 	return 0;
@@ -1319,17 +1319,17 @@ static void tag_scenes_for_render(Render *re)
 	bNode *node;
 	Scene *sce;
 	
-	for (sce= re->main->scene.first; sce; sce= sce->id.next)
+	for (sce = re->main->scene.first; sce; sce = sce->id.next)
 		sce->id.flag &= ~LIB_DOIT;
 	
 	if (RE_GetCamera(re) && composite_needs_render(re->scene, 1))
 		re->scene->id.flag |= LIB_DOIT;
 	
-	if (re->scene->nodetree==NULL) return;
+	if (re->scene->nodetree == NULL) return;
 	
 	/* check for render-layers nodes using other scenes, we tag them LIB_DOIT */
-	for (node= re->scene->nodetree->nodes.first; node; node= node->next) {
-		if (node->type==CMP_NODE_R_LAYERS) {
+	for (node = re->scene->nodetree->nodes.first; node; node = node->next) {
+		if (node->type == CMP_NODE_R_LAYERS) {
 			if (node->id) {
 				if (node->id != (ID *)re->scene)
 					node->id->flag |= LIB_DOIT;
@@ -1342,23 +1342,23 @@ static void tag_scenes_for_render(Render *re)
 static void ntree_render_scenes(Render *re)
 {
 	bNode *node;
-	int cfra= re->scene->r.cfra;
-	int restore_scene= 0;
+	int cfra = re->scene->r.cfra;
+	int restore_scene = 0;
 	
-	if (re->scene->nodetree==NULL) return;
+	if (re->scene->nodetree == NULL) return;
 	
 	tag_scenes_for_render(re);
 	
 	/* now foreach render-result node tagged we do a full render */
 	/* results are stored in a way compisitor will find it */
-	for (node= re->scene->nodetree->nodes.first; node; node= node->next) {
-		if (node->type==CMP_NODE_R_LAYERS) {
+	for (node = re->scene->nodetree->nodes.first; node; node = node->next) {
+		if (node->type == CMP_NODE_R_LAYERS) {
 			if (node->id && node->id != (ID *)re->scene) {
 				if (node->id->flag & LIB_DOIT) {
-					Scene *scene = (Scene*)node->id;
+					Scene *scene = (Scene *)node->id;
 
 					render_scene(re, scene, cfra);
-					restore_scene= (scene != re->scene);
+					restore_scene = (scene != re->scene);
 					node->id->flag &= ~LIB_DOIT;
 					
 					nodeUpdate(re->scene->nodetree, node);
@@ -1375,9 +1375,9 @@ static void ntree_render_scenes(Render *re)
 /* bad call... need to think over proper method still */
 static void render_composit_stats(void *UNUSED(arg), char *str)
 {
-	R.i.infostr= str;
+	R.i.infostr = str;
 	R.stats_draw(R.sdh, &R.i);
-	R.i.infostr= NULL;
+	R.i.infostr = NULL;
 }
 
 
@@ -1389,33 +1389,33 @@ static void do_merge_fullsample(Render *re, bNodeTree *ntree)
 	
 	/* interaction callbacks */
 	if (ntree) {
-		ntree->stats_draw= render_composit_stats;
-		ntree->test_break= re->test_break;
-		ntree->progress= re->progress;
-		ntree->sdh= re->sdh;
-		ntree->tbh= re->tbh;
-		ntree->prh= re->prh;
+		ntree->stats_draw = render_composit_stats;
+		ntree->test_break = re->test_break;
+		ntree->progress = re->progress;
+		ntree->sdh = re->sdh;
+		ntree->tbh = re->tbh;
+		ntree->prh = re->prh;
 	}
 	
 	/* filtmask needs it */
-	R= *re;
+	R = *re;
 	
 	/* we accumulate in here */
-	rectf= MEM_mapallocN(re->rectx*re->recty*sizeof(float)*4, "fullsample rgba");
+	rectf = MEM_mapallocN(re->rectx * re->recty * sizeof(float) * 4, "fullsample rgba");
 	
-	for (sample=0; sample<re->r.osa; sample++) {
+	for (sample = 0; sample < re->r.osa; sample++) {
 		Render *re1;
 		RenderResult rres;
 		int x, y, mask;
 		
 		/* enable full sample print */
-		R.i.curfsa= sample+1;
+		R.i.curfsa = sample + 1;
 		
 		/* set all involved renders on the samplebuffers (first was done by render itself, but needs tagged) */
 		/* also function below assumes this */
 			
 		tag_scenes_for_render(re);
-		for (re1= RenderGlobal.renderlist.first; re1; re1= re1->next) {
+		for (re1 = RenderGlobal.renderlist.first; re1; re1 = re1->next) {
 			if (re1->scene->id.flag & LIB_DOIT) {
 				if (re1->r.scemode & R_FULL_SAMPLE) {
 					if (sample) {
@@ -1433,25 +1433,25 @@ static void do_merge_fullsample(Render *re, bNodeTree *ntree)
 			ntreeCompositTagRender(re->scene);
 			ntreeCompositTagAnimated(ntree);
 			
-			ntreeCompositExecTree(ntree, &re->r, 1, G.background==0);
+			ntreeCompositExecTree(ntree, &re->r, 1, G.background == 0);
 		}
 		
 		/* ensure we get either composited result or the active layer */
 		RE_AcquireResultImage(re, &rres);
 		
 		/* accumulate with filter, and clip */
-		mask= (1<<sample);
+		mask = (1 << sample);
 		mask_array(mask, filt);
 
-		for (y=0; y<re->recty; y++) {
-			float *rf= rectf + 4*y*re->rectx;
-			float *col= rres.rectf + 4*y*re->rectx;
+		for (y = 0; y < re->recty; y++) {
+			float *rf = rectf + 4 * y * re->rectx;
+			float *col = rres.rectf + 4 * y * re->rectx;
 				
-			for (x=0; x<re->rectx; x++, rf+=4, col+=4) {
+			for (x = 0; x < re->rectx; x++, rf += 4, col += 4) {
 				/* clamping to 1.0 is needed for correct AA */
-				if (col[0]<0.0f) col[0]=0.0f; else if (col[0] > 1.0f) col[0]= 1.0f;
-				if (col[1]<0.0f) col[1]=0.0f; else if (col[1] > 1.0f) col[1]= 1.0f;
-				if (col[2]<0.0f) col[2]=0.0f; else if (col[2] > 1.0f) col[2]= 1.0f;
+				if (col[0] < 0.0f) col[0] = 0.0f; else if (col[0] > 1.0f) col[0] = 1.0f;
+				if (col[1] < 0.0f) col[1] = 0.0f; else if (col[1] > 1.0f) col[1] = 1.0f;
+				if (col[2] < 0.0f) col[2] = 0.0f; else if (col[2] > 1.0f) col[2] = 1.0f;
 				
 				add_filt_fmask_coord(filt, col, rf, re->rectx, re->recty, x, y);
 			}
@@ -1460,9 +1460,9 @@ static void do_merge_fullsample(Render *re, bNodeTree *ntree)
 		RE_ReleaseResultImage(re);
 
 		/* show stuff */
-		if (sample!=re->osa-1) {
+		if (sample != re->osa - 1) {
 			/* weak... the display callback wants an active renderlayer pointer... */
-			re->result->renlay= render_get_active_layer(re, re->result);
+			re->result->renlay = render_get_active_layer(re, re->result);
 			re->display_draw(re->ddh, re->result, NULL);
 		}
 		
@@ -1472,19 +1472,19 @@ static void do_merge_fullsample(Render *re, bNodeTree *ntree)
 	
 	/* clear interaction callbacks */
 	if (ntree) {
-		ntree->stats_draw= NULL;
-		ntree->test_break= NULL;
-		ntree->progress= NULL;
-		ntree->tbh= ntree->sdh= ntree->prh= NULL;
+		ntree->stats_draw = NULL;
+		ntree->test_break = NULL;
+		ntree->progress = NULL;
+		ntree->tbh = ntree->sdh = ntree->prh = NULL;
 	}
 	
 	/* disable full sample print */
-	R.i.curfsa= 0;
+	R.i.curfsa = 0;
 	
 	BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
 	if (re->result->rectf)
 		MEM_freeN(re->result->rectf);
-	re->result->rectf= rectf;
+	re->result->rectf = rectf;
 	BLI_rw_mutex_unlock(&re->resultmutex);
 }
 
@@ -1495,24 +1495,24 @@ void RE_MergeFullSample(Render *re, Main *bmain, Scene *sce, bNodeTree *ntree)
 	bNode *node;
 
 	/* default start situation */
-	G.afbreek= 0;
+	G.afbreek = 0;
 	
-	re->main= bmain;
-	re->scene= sce;
+	re->main = bmain;
+	re->scene = sce;
 	
 	/* first call RE_ReadRenderResult on every renderlayer scene. this creates Render structs */
 	
 	/* tag scenes unread */
-	for (scene= re->main->scene.first; scene; scene= scene->id.next)
+	for (scene = re->main->scene.first; scene; scene = scene->id.next)
 		scene->id.flag |= LIB_DOIT;
 	
-	for (node= ntree->nodes.first; node; node= node->next) {
-		if (node->type==CMP_NODE_R_LAYERS) {
-			Scene *nodescene= (Scene *)node->id;
+	for (node = ntree->nodes.first; node; node = node->next) {
+		if (node->type == CMP_NODE_R_LAYERS) {
+			Scene *nodescene = (Scene *)node->id;
 			
-			if (nodescene==NULL) nodescene= sce;
+			if (nodescene == NULL) nodescene = sce;
 			if (nodescene->id.flag & LIB_DOIT) {
-				nodescene->r.mode |= R_OSA;	/* render struct needs tables */
+				nodescene->r.mode |= R_OSA; /* render struct needs tables */
 				RE_ReadRenderResult(sce, nodescene);
 				nodescene->id.flag &= ~LIB_DOIT;
 			}
@@ -1535,8 +1535,8 @@ void RE_MergeFullSample(Render *re, Main *bmain, Scene *sce, bNodeTree *ntree)
 /* returns fully composited render-result on given time step (in RenderData) */
 static void do_render_composite_fields_blur_3d(Render *re)
 {
-	bNodeTree *ntree= re->scene->nodetree;
-	int update_newframe=0;
+	bNodeTree *ntree = re->scene->nodetree;
+	int update_newframe = 0;
 	
 	/* INIT seeding, compositor can use random texture */
 	BLI_srandom(re->r.cfra);
@@ -1552,7 +1552,7 @@ static void do_render_composite_fields_blur_3d(Render *re)
 		BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
 		
 		render_result_free(re->result);
-		re->result= render_result_new(re, &re->disprect, 0, RR_USE_MEM);
+		re->result = render_result_new(re, &re->disprect, 0, RR_USE_MEM);
 
 		BLI_rw_mutex_unlock(&re->resultmutex);
 		
@@ -1576,20 +1576,20 @@ static void do_render_composite_fields_blur_3d(Render *re)
 		
 		if (ntree && re->scene->use_nodes && re->r.scemode & R_DOCOMP) {
 			/* checks if there are render-result nodes that need scene */
-			if ((re->r.scemode & R_SINGLE_LAYER)==0)
+			if ((re->r.scemode & R_SINGLE_LAYER) == 0)
 				ntree_render_scenes(re);
 			
 			if (!re->test_break(re->tbh)) {
-				ntree->stats_draw= render_composit_stats;
-				ntree->test_break= re->test_break;
-				ntree->progress= re->progress;
-				ntree->sdh= re->sdh;
-				ntree->tbh= re->tbh;
-				ntree->prh= re->prh;
+				ntree->stats_draw = render_composit_stats;
+				ntree->test_break = re->test_break;
+				ntree->progress = re->progress;
+				ntree->sdh = re->sdh;
+				ntree->tbh = re->tbh;
+				ntree->prh = re->prh;
 				
 				/* in case it was never initialized */
-				R.sdh= re->sdh;
-				R.stats_draw= re->stats_draw;
+				R.sdh = re->sdh;
+				R.stats_draw = re->stats_draw;
 				
 				if (update_newframe)
 					BKE_scene_update_for_newframe(re->main, re->scene, re->lay);
@@ -1597,13 +1597,13 @@ static void do_render_composite_fields_blur_3d(Render *re)
 				if (re->r.scemode & R_FULL_SAMPLE)
 					do_merge_fullsample(re, ntree);
 				else {
-					ntreeCompositExecTree(ntree, &re->r, 1, G.background==0);
+					ntreeCompositExecTree(ntree, &re->r, 1, G.background == 0);
 				}
 				
-				ntree->stats_draw= NULL;
-				ntree->test_break= NULL;
-				ntree->progress= NULL;
-				ntree->tbh= ntree->sdh= ntree->prh= NULL;
+				ntree->stats_draw = NULL;
+				ntree->test_break = NULL;
+				ntree->progress = NULL;
+				ntree->tbh = ntree->sdh = ntree->prh = NULL;
 			}
 		}
 		else if (re->r.scemode & R_FULL_SAMPLE)
@@ -1611,7 +1611,7 @@ static void do_render_composite_fields_blur_3d(Render *re)
 	}
 
 	/* weak... the display callback wants an active renderlayer pointer... */
-	re->result->renlay= render_get_active_layer(re, re->result);
+	re->result->renlay = render_get_active_layer(re, re->result);
 	re->display_draw(re->ddh, re->result, NULL);
 }
 
@@ -1635,15 +1635,15 @@ int RE_seq_render_active(Scene *scene, RenderData *rd)
 	if (!(rd->scemode & R_DOSEQ) || !ed || !ed->seqbase.first)
 		return 0;
 	
-	for (seq= ed->seqbase.first; seq; seq= seq->next) {
-		if (seq->type != SEQ_SOUND)
+	for (seq = ed->seqbase.first; seq; seq = seq->next) {
+		if (seq->type != SEQ_TYPE_SOUND_RAM)
 			return 1;
 	}
 	
 	return 0;
 }
 
-static void do_render_seq(Render * re)
+static void do_render_seq(Render *re)
 {
 	static int recurs_depth = 0;
 	struct ImBuf *ibuf;
@@ -1651,26 +1651,26 @@ static void do_render_seq(Render * re)
 	int cfra = re->r.cfra;
 	SeqRenderData context;
 
-	re->i.cfra= cfra;
+	re->i.cfra = cfra;
 
-	if (recurs_depth==0) {
+	if (recurs_depth == 0) {
 		/* otherwise sequencer animation isn't updated */
 		BKE_animsys_evaluate_all_animation(re->main, re->scene, (float)cfra); // XXX, was BKE_scene_frame_get(re->scene)
 	}
 
 	recurs_depth++;
 
-	if ((re->r.mode & R_BORDER) && (re->r.mode & R_CROP)==0) {
+	if ((re->r.mode & R_BORDER) && (re->r.mode & R_CROP) == 0) {
 		/* if border rendering is used and cropping is disabled, final buffer should
 		 * be as large as the whole frame */
 		context = seq_new_render_data(re->main, re->scene,
-					      re->winx, re->winy,
-					      100);
+		                              re->winx, re->winy,
+		                              100);
 	}
 	else {
 		context = seq_new_render_data(re->main, re->scene,
-					      re->result->rectx, re->result->recty,
-					      100);
+		                              re->result->rectx, re->result->recty,
+		                              100);
 	}
 
 	ibuf = give_ibuf_seq(context, cfra, 0);
@@ -1686,7 +1686,7 @@ static void do_render_seq(Render * re)
 		render_result_rect_from_ibuf(rr, &re->r, ibuf);
 		
 		if (recurs_depth == 0) { /* with nested scenes, only free on toplevel... */
-			Editing * ed = re->scene->ed;
+			Editing *ed = re->scene->ed;
 			if (ed)
 				free_imbuf_seq(re->scene, &ed->seqbase, TRUE, TRUE);
 		}
@@ -1703,8 +1703,8 @@ static void do_render_seq(Render * re)
 	re->r.scemode |= R_DOSEQ;
 
 	/* set overall progress of sequence rendering */
-	if (re->r.efra!=re->r.sfra)
-		re->progress(re->prh, (float)(cfra-re->r.sfra) / (re->r.efra-re->r.sfra));
+	if (re->r.efra != re->r.sfra)
+		re->progress(re->prh, (float)(cfra - re->r.sfra) / (re->r.efra - re->r.sfra));
 	else
 		re->progress(re->prh, 1.0f);
 }
@@ -1716,7 +1716,7 @@ static void do_render_all_options(Render *re)
 {
 	BKE_scene_camera_switch_update(re->scene);
 
-	re->i.starttime= PIL_check_seconds_timer();
+	re->i.starttime = PIL_check_seconds_timer();
 
 	/* ensure no images are in memory from previous animated sequences */
 	BKE_image_all_free_anim_ibufs(re->r.cfra);
@@ -1736,7 +1736,7 @@ static void do_render_all_options(Render *re)
 		do_render_composite_fields_blur_3d(re);
 	}
 	
-	re->i.lastframetime= PIL_check_seconds_timer()- re->i.starttime;
+	re->i.lastframetime = PIL_check_seconds_timer() - re->i.starttime;
 	
 	re->stats_draw(re->sdh, &re->i);
 	
@@ -1749,24 +1749,24 @@ static void do_render_all_options(Render *re)
 
 static int check_valid_camera(Scene *scene, Object *camera_override)
 {
-	int check_comp= 1;
+	int check_comp = 1;
 
 	if (camera_override == NULL && scene->camera == NULL)
-		scene->camera= BKE_scene_camera_find(scene);
+		scene->camera = BKE_scene_camera_find(scene);
 
-	if (scene->r.scemode&R_DOSEQ) {
+	if (scene->r.scemode & R_DOSEQ) {
 		if (scene->ed) {
-			Sequence *seq= scene->ed->seqbase.first;
+			Sequence *seq = scene->ed->seqbase.first;
 
-			check_comp= 0;
+			check_comp = 0;
 
 			while (seq) {
-				if (seq->type == SEQ_SCENE && seq->scene) {
+				if (seq->type == SEQ_TYPE_SCENE && seq->scene) {
 					if (!seq->scene_camera) {
 						if (!seq->scene->camera && !BKE_scene_camera_find(seq->scene)) {
 							if (seq->scene == scene) {
 								/* for current scene camera could be unneeded due to compisite nodes */
-								check_comp= 1;
+								check_comp = 1;
 							}
 							else {
 								/* for other scenes camera is necessary */
@@ -1776,18 +1776,18 @@ static int check_valid_camera(Scene *scene, Object *camera_override)
 					}
 				}
 
-				seq= seq->next;
+				seq = seq->next;
 			}
 		}
 	}
 
 	if (check_comp) { /* no sequencer or sequencer depends on compositor */
-		if (scene->r.scemode&R_DOCOMP && scene->use_nodes) {
-			bNode *node= scene->nodetree->nodes.first;
+		if (scene->r.scemode & R_DOCOMP && scene->use_nodes) {
+			bNode *node = scene->nodetree->nodes.first;
 
 			while (node) {
 				if (node->type == CMP_NODE_R_LAYERS) {
-					Scene *sce= node->id ? (Scene*)node->id : scene;
+					Scene *sce = node->id ? (Scene *)node->id : scene;
 
 					if (!sce->camera && !BKE_scene_camera_find(sce)) {
 						/* all render layers nodes need camera */
@@ -1795,7 +1795,7 @@ static int check_valid_camera(Scene *scene, Object *camera_override)
 					}
 				}
 
-				node= node->next;
+				node = node->next;
 			}
 		}
 		else {
@@ -1841,12 +1841,12 @@ int RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList *r
 		}
 	}
 	
-	if (scene->r.scemode & (R_EXR_TILE_FILE|R_FULL_SAMPLE)) {
+	if (scene->r.scemode & (R_EXR_TILE_FILE | R_FULL_SAMPLE)) {
 		char str[FILE_MAX];
 		
 		render_result_exr_file_path(scene, 0, str);
 		
-		if (BLI_file_is_writable(str)==0) {
+		if (BLI_file_is_writable(str) == 0) {
 			BKE_report(reports, RPT_ERROR, "Can not save render buffers, check the temp default path");
 			return 0;
 		}
@@ -1859,7 +1859,7 @@ int RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList *r
 		
 	}
 	else
-		scene->r.scemode &= ~R_FULL_SAMPLE;	/* clear to be sure */
+		scene->r.scemode &= ~R_FULL_SAMPLE;  /* clear to be sure */
 	
 	if (scene->r.scemode & R_DOCOMP) {
 		if (scene->use_nodes) {
@@ -1874,7 +1874,7 @@ int RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList *r
 			}
 			
 			if (scene->r.scemode & R_FULL_SAMPLE) {
-				if (composite_needs_render(scene, 0)==0) {
+				if (composite_needs_render(scene, 0) == 0) {
 					BKE_report(reports, RPT_ERROR, "Full Sample AA not supported without 3d rendering");
 					return 0;
 				}
@@ -1882,7 +1882,7 @@ int RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList *r
 		}
 	}
 	
-	 /* check valid camera, without camera render is OK (compo, seq) */
+	/* check valid camera, without camera render is OK (compo, seq) */
 	if (!check_valid_camera(scene, camera_override)) {
 		BKE_report(reports, RPT_ERROR, "No camera");
 		return 0;
@@ -1901,15 +1901,15 @@ int RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList *r
 
 	/* layer flag tests */
 	if (scene->r.scemode & R_SINGLE_LAYER) {
-		srl= BLI_findlink(&scene->r.layers, scene->r.actlay);
+		srl = BLI_findlink(&scene->r.layers, scene->r.actlay);
 		/* force layer to be enabled */
 		srl->layflag &= ~SCE_LAY_DISABLE;
 	}
 	
-	for (srl= scene->r.layers.first; srl; srl= srl->next)
+	for (srl = scene->r.layers.first; srl; srl = srl->next)
 		if (!(srl->layflag & SCE_LAY_DISABLE))
 			break;
-	if (srl==NULL) {
+	if (srl == NULL) {
 		BKE_report(reports, RPT_ERROR, "All RenderLayers are disabled");
 		return 0;
 	}
@@ -1919,17 +1919,17 @@ int RE_is_rendering_allowed(Scene *scene, Object *camera_override, ReportList *r
 
 static void validate_render_settings(Render *re)
 {
-	if (re->r.scemode & (R_EXR_TILE_FILE|R_FULL_SAMPLE)) {
+	if (re->r.scemode & (R_EXR_TILE_FILE | R_FULL_SAMPLE)) {
 		/* no osa + fullsample won't work... */
-		if (re->r.osa==0)
+		if (re->r.osa == 0)
 			re->r.scemode &= ~R_FULL_SAMPLE;
 	}
-	else re->r.scemode &= ~R_FULL_SAMPLE;	/* clear to be sure */
+	else re->r.scemode &= ~R_FULL_SAMPLE;   /* clear to be sure */
 
 	if (RE_engine_is_external(re)) {
 		/* not supported yet */
-		re->r.scemode &= ~(R_EXR_TILE_FILE|R_FULL_SAMPLE);
-		re->r.mode &= ~(R_FIELDS|R_MBLUR);
+		re->r.scemode &= ~(R_EXR_TILE_FILE | R_FULL_SAMPLE);
+		re->r.mode &= ~(R_FIELDS | R_MBLUR);
 	}
 }
 
@@ -1960,16 +1960,16 @@ static int render_initialize_from_main(Render *re, Main *bmain, Scene *scene, Sc
 	 * r.border is the clipping rect */
 	
 	/* calculate actual render result and display size */
-	winx= (scene->r.size*scene->r.xsch)/100;
-	winy= (scene->r.size*scene->r.ysch)/100;
+	winx = (scene->r.size * scene->r.xsch) / 100;
+	winy = (scene->r.size * scene->r.ysch) / 100;
 	
 	/* we always render smaller part, inserting it in larger image is compositor bizz, it uses disprect for it */
 	if (scene->r.mode & R_BORDER) {
-		disprect.xmin = scene->r.border.xmin*winx;
-		disprect.xmax = scene->r.border.xmax*winx;
+		disprect.xmin = scene->r.border.xmin * winx;
+		disprect.xmax = scene->r.border.xmax * winx;
 		
-		disprect.ymin = scene->r.border.ymin*winy;
-		disprect.ymax = scene->r.border.ymax*winy;
+		disprect.ymin = scene->r.border.ymin * winy;
+		disprect.ymax = scene->r.border.ymax * winy;
 	}
 	else {
 		disprect.xmin = disprect.ymin = 0;
@@ -1977,14 +1977,14 @@ static int render_initialize_from_main(Render *re, Main *bmain, Scene *scene, Sc
 		disprect.ymax = winy;
 	}
 	
-	re->main= bmain;
-	re->scene= scene;
-	re->camera_override= camera_override;
-	re->lay= lay;
+	re->main = bmain;
+	re->scene = scene;
+	re->camera_override = camera_override;
+	re->lay = lay;
 	
 	/* not too nice, but it survives anim-border render */
 	if (anim) {
-		re->disprect= disprect;
+		re->disprect = disprect;
 		return 1;
 	}
 	
@@ -2024,16 +2024,16 @@ static int render_initialize_from_main(Render *re, Main *bmain, Scene *scene, Sc
 
 void RE_SetReports(Render *re, ReportList *reports)
 {
-	re->reports= reports;
+	re->reports = reports;
 }
 
 /* general Blender frame render call */
 void RE_BlenderFrame(Render *re, Main *bmain, Scene *scene, SceneRenderLayer *srl, Object *camera_override, unsigned int lay, int frame, const short write_still)
 {
 	/* ugly global still... is to prevent preview events and signal subsurfs etc to make full resol */
-	G.rendering= 1;
+	G.rendering = 1;
 	
-	scene->r.cfra= frame;
+	scene->r.cfra = frame;
 	
 	if (render_initialize_from_main(re, bmain, scene, srl, camera_override, lay, 0, 0)) {
 		MEM_reset_peak_memory();
@@ -2062,15 +2062,15 @@ void RE_BlenderFrame(Render *re, Main *bmain, Scene *scene, SceneRenderLayer *sr
 	BLI_callback_exec(re->main, (ID *)scene, G.afbreek ? BLI_CB_EVT_RENDER_CANCEL : BLI_CB_EVT_RENDER_COMPLETE);
 
 	/* UGLY WARNING */
-	G.rendering= 0;
+	G.rendering = 0;
 }
 
 static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovieHandle *mh, const char *name_override)
 {
 	char name[FILE_MAX];
 	RenderResult rres;
-	Object *camera= RE_GetCamera(re);
-	int ok= 1;
+	Object *camera = RE_GetCamera(re);
+	int ok = 1;
 	
 	RE_AcquireResultImage(re, &rres);
 
@@ -2080,13 +2080,13 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie
 		unsigned int *rect32 = (unsigned int *)rres.rect32;
 		/* note; the way it gets 32 bits rects is weak... */
 		if (rres.rect32 == NULL) {
-			rect32 = MEM_mapallocN(sizeof(int)*rres.rectx*rres.recty, "temp 32 bits rect");
+			rect32 = MEM_mapallocN(sizeof(int) * rres.rectx * rres.recty, "temp 32 bits rect");
 			RE_ResultGet32(re, rect32);
 			do_free = TRUE;
 		}
 
-		ok= mh->append_movie(&re->r, scene->r.sfra, scene->r.cfra, (int *)rect32,
-		                     rres.rectx, rres.recty, re->reports);
+		ok = mh->append_movie(&re->r, scene->r.sfra, scene->r.cfra, (int *)rect32,
+		                      rres.rectx, rres.recty, re->reports);
 		if (do_free) {
 			MEM_freeN(rect32);
 		}
@@ -2098,36 +2098,36 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie
 		else
 			BKE_makepicstring(name, scene->r.pic, bmain->name, scene->r.cfra, scene->r.im_format.imtype, scene->r.scemode & R_EXTENSION, TRUE);
 		
-		if (re->r.im_format.imtype==R_IMF_IMTYPE_MULTILAYER) {
+		if (re->r.im_format.imtype == R_IMF_IMTYPE_MULTILAYER) {
 			if (re->result) {
 				RE_WriteRenderResult(re->reports, re->result, name, scene->r.im_format.exr_codec);
 				printf("Saved: %s", name);
 			}
 		}
 		else {
-			ImBuf *ibuf= render_result_rect_to_ibuf(&rres, &scene->r);
+			ImBuf *ibuf = render_result_rect_to_ibuf(&rres, &scene->r);
 
-			ok= BKE_imbuf_write_stamp(scene, camera, ibuf, name, &scene->r.im_format);
+			ok = BKE_imbuf_write_stamp(scene, camera, ibuf, name, &scene->r.im_format);
 			
-			if (ok==0) {
+			if (ok == 0) {
 				printf("Render error: cannot save %s\n", name);
 			}
 			else printf("Saved: %s", name);
 			
 			/* optional preview images for exr */
-			if (ok && scene->r.im_format.imtype==R_IMF_IMTYPE_OPENEXR && (scene->r.im_format.flag & R_IMF_FLAG_PREVIEW_JPG)) {
-				ImageFormatData imf= scene->r.im_format;
-				imf.imtype= R_IMF_IMTYPE_JPEG90;
+			if (ok && scene->r.im_format.imtype == R_IMF_IMTYPE_OPENEXR && (scene->r.im_format.flag & R_IMF_FLAG_PREVIEW_JPG)) {
+				ImageFormatData imf = scene->r.im_format;
+				imf.imtype = R_IMF_IMTYPE_JPEG90;
 
 				if (BLI_testextensie(name, ".exr"))
-					name[strlen(name)-4]= 0;
+					name[strlen(name) - 4] = 0;
 				BKE_add_image_extension(name, R_IMF_IMTYPE_JPEG90);
-				ibuf->planes= 24;
+				ibuf->planes = 24;
 				BKE_imbuf_write_stamp(scene, camera, ibuf, name, &imf);
 				printf("\nSaved: %s", name);
 			}
 			
-					/* imbuf knows which rects are not part of ibuf */
+			/* imbuf knows which rects are not part of ibuf */
 			IMB_freeImBuf(ibuf);
 		}
 	}
@@ -2148,9 +2148,9 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie
 /* saves images to disk */
 void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_override, unsigned int lay, int sfra, int efra, int tfra)
 {
-	bMovieHandle *mh= BKE_movie_handle_get(scene->r.im_format.imtype);
-	int cfrao= scene->r.cfra;
-	int nfra, totrendered= 0, totskipped= 0;
+	bMovieHandle *mh = BKE_movie_handle_get(scene->r.im_format.imtype);
+	int cfrao = scene->r.cfra;
+	int nfra, totrendered = 0, totskipped = 0;
 	
 	/* do not fully call for each frame, it initializes & pops output window */
 	if (!render_initialize_from_main(re, bmain, scene, NULL, camera_override, lay, 0, 1))
@@ -2158,13 +2158,13 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri
 	
 	/* ugly global still... is to prevent renderwin events and signal subsurfs etc to make full resol */
 	/* is also set by caller renderwin.c */
-	G.rendering= 1;
+	G.rendering = 1;
 
 	re->flag |= R_ANIMATION;
 
 	if (BKE_imtype_is_movie(scene->r.im_format.imtype))
 		if (!mh->start_movie(scene, &re->r, re->rectx, re->recty, re->reports))
-			G.afbreek= 1;
+			G.afbreek = 1;
 
 	if (mh->get_next_frame) {
 		while (!(G.afbreek == 1)) {
@@ -2179,7 +2179,7 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri
 
 				if (re->test_break(re->tbh) == 0) {
 					if (!do_write_image_or_movie(re, bmain, scene, mh, NULL))
-						G.afbreek= 1;
+						G.afbreek = 1;
 				}
 
 				if (G.afbreek == 0) {
@@ -2188,18 +2188,18 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri
 			}
 			else {
 				if (re->test_break(re->tbh))
-					G.afbreek= 1;
+					G.afbreek = 1;
 			}
 		}
 	}
 	else {
-		for (nfra= sfra, scene->r.cfra= sfra; scene->r.cfra<=efra; scene->r.cfra++) {
+		for (nfra = sfra, scene->r.cfra = sfra; scene->r.cfra <= efra; scene->r.cfra++) {
 			char name[FILE_MAX];
 			
 			/* only border now, todo: camera lens. (ton) */
 			render_initialize_from_main(re, bmain, scene, NULL, camera_override, lay, 1, 0);
 
-			if (nfra!=scene->r.cfra) {
+			if (nfra != scene->r.cfra) {
 				/*
 				 * Skip this frame, but update for physics and particles system.
 				 * From convertblender.c:
@@ -2208,15 +2208,15 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri
 				unsigned int updatelay;
 
 				if (re->lay & 0xFF000000)
-					updatelay= re->lay & 0xFF000000;
+					updatelay = re->lay & 0xFF000000;
 				else
-					updatelay= re->lay;
+					updatelay = re->lay;
 
 				BKE_scene_update_for_newframe(bmain, scene, updatelay);
 				continue;
 			}
 			else
-				nfra+= tfra;
+				nfra += tfra;
 
 			/* Touch/NoOverwrite options are only valid for image's */
 			if (BKE_imtype_is_movie(scene->r.im_format.imtype) == 0) {
@@ -2234,7 +2234,7 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri
 				}
 			}
 
-			re->r.cfra= scene->r.cfra;	   /* weak.... */
+			re->r.cfra = scene->r.cfra;     /* weak.... */
 
 			/* run callbacs before rendering, before the scene is updated */
 			BLI_callback_exec(re->main, (ID *)scene, BLI_CB_EVT_RENDER_PRE);
@@ -2246,12 +2246,12 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri
 			if (re->test_break(re->tbh) == 0) {
 				if (!G.afbreek)
 					if (!do_write_image_or_movie(re, bmain, scene, mh, NULL))
-						G.afbreek= 1;
+						G.afbreek = 1;
 			}
 			else
-				G.afbreek= 1;
+				G.afbreek = 1;
 		
-			if (G.afbreek==1) {
+			if (G.afbreek == 1) {
 				/* remove touched file */
 				if (BKE_imtype_is_movie(scene->r.im_format.imtype) == 0) {
 					if (scene->r.mode & R_TOUCH && BLI_exists(name) && BLI_file_size(name) == 0) {
@@ -2262,7 +2262,7 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri
 				break;
 			}
 
-			if (G.afbreek==0) {
+			if (G.afbreek == 0) {
 				BLI_callback_exec(re->main, (ID *)scene, BLI_CB_EVT_RENDER_POST); /* keep after file save */
 			}
 		}
@@ -2275,14 +2275,14 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri
 	if (totskipped && totrendered == 0)
 		BKE_report(re->reports, RPT_INFO, "No frames rendered, skipped to not overwrite");
 
-	scene->r.cfra= cfrao;
+	scene->r.cfra = cfrao;
 
 	re->flag &= ~R_ANIMATION;
 
 	BLI_callback_exec(re->main, (ID *)scene, G.afbreek ? BLI_CB_EVT_RENDER_CANCEL : BLI_CB_EVT_RENDER_COMPLETE);
 
 	/* UGLY WARNING */
-	G.rendering= 0;
+	G.rendering = 0;
 }
 
 void RE_PreviewRender(Render *re, Main *bmain, Scene *sce)
@@ -2290,8 +2290,8 @@ void RE_PreviewRender(Render *re, Main *bmain, Scene *sce)
 	Object *camera;
 	int winx, winy;
 
-	winx= (sce->r.size*sce->r.xsch)/100;
-	winy= (sce->r.size*sce->r.ysch)/100;
+	winx = (sce->r.size * sce->r.xsch) / 100;
+	winy = (sce->r.size * sce->r.ysch) / 100;
 
 	RE_InitState(re, NULL, &sce->r, NULL, winx, winy, NULL);
 
@@ -2315,16 +2315,16 @@ int RE_ReadRenderResult(Scene *scene, Scene *scenode)
 	rcti disprect;
 	
 	/* calculate actual render result and display size */
-	winx= (scene->r.size*scene->r.xsch)/100;
-	winy= (scene->r.size*scene->r.ysch)/100;
+	winx = (scene->r.size * scene->r.xsch) / 100;
+	winy = (scene->r.size * scene->r.ysch) / 100;
 	
 	/* only in movie case we render smaller part */
 	if (scene->r.mode & R_BORDER) {
-		disprect.xmin = scene->r.border.xmin*winx;
-		disprect.xmax = scene->r.border.xmax*winx;
+		disprect.xmin = scene->r.border.xmin * winx;
+		disprect.xmax = scene->r.border.xmax * winx;
 		
-		disprect.ymin = scene->r.border.ymin*winy;
-		disprect.ymax = scene->r.border.ymax*winy;
+		disprect.ymin = scene->r.border.ymin * winy;
+		disprect.ymax = scene->r.border.ymax * winy;
 	}
 	else {
 		disprect.xmin = disprect.ymin = 0;
@@ -2333,17 +2333,17 @@ int RE_ReadRenderResult(Scene *scene, Scene *scenode)
 	}
 	
 	if (scenode)
-		scene= scenode;
+		scene = scenode;
 	
 	/* get render: it can be called from UI with draw callbacks */
-	re= RE_GetRender(scene->id.name);
-	if (re==NULL)
-		re= RE_NewRender(scene->id.name);
+	re = RE_GetRender(scene->id.name);
+	if (re == NULL)
+		re = RE_NewRender(scene->id.name);
 	RE_InitState(re, NULL, &scene->r, NULL, winx, winy, &disprect);
-	re->scene= scene;
+	re->scene = scene;
 	
 	BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
-	success= render_result_exr_file_read(re, 0);
+	success = render_result_exr_file_read(re, 0);
 	BLI_rw_mutex_unlock(&re->resultmutex);
 
 	return success;
@@ -2351,11 +2351,11 @@ int RE_ReadRenderResult(Scene *scene, Scene *scenode)
 
 void RE_set_max_threads(int threads)
 {
-	if (threads==0) {
+	if (threads == 0) {
 		RenderGlobal.threads = BLI_system_thread_count();
 	}
-	else if (threads>=1 && threads<=BLENDER_MAX_THREADS) {
-		RenderGlobal.threads= threads;
+	else if (threads >= 1 && threads <= BLENDER_MAX_THREADS) {
+		RenderGlobal.threads = threads;
 	}
 	else {
 		printf("Error, threads has to be in range 0-%d\n", BLENDER_MAX_THREADS);
@@ -2365,9 +2365,9 @@ void RE_set_max_threads(int threads)
 void RE_init_threadcount(Render *re) 
 {
 	if (RenderGlobal.threads >= 1) { /* only set as an arg in background mode */
-		re->r.threads= MIN2(RenderGlobal.threads, BLENDER_MAX_THREADS);
+		re->r.threads = MIN2(RenderGlobal.threads, BLENDER_MAX_THREADS);
 	}
-	else if ((re->r.mode & R_FIXED_THREADS)==0 || RenderGlobal.threads == 0) { /* Automatic threads */
+	else if ((re->r.mode & R_FIXED_THREADS) == 0 || RenderGlobal.threads == 0) { /* Automatic threads */
 		re->r.threads = BLI_system_thread_count();
 	}
 }
@@ -2380,23 +2380,23 @@ void RE_layer_load_from_file(RenderLayer *layer, ReportList *reports, const char
 
 	if (ibuf && (ibuf->rect || ibuf->rect_float)) {
 		if (ibuf->x == layer->rectx && ibuf->y == layer->recty) {
-			if (ibuf->rect_float==NULL)
+			if (ibuf->rect_float == NULL)
 				IMB_float_from_rect(ibuf);
 
-			memcpy(layer->rectf, ibuf->rect_float, sizeof(float)*4*layer->rectx*layer->recty);
+			memcpy(layer->rectf, ibuf->rect_float, sizeof(float) * 4 * layer->rectx * layer->recty);
 		}
 		else {
 			if ((ibuf->x - x >= layer->rectx) && (ibuf->y - y >= layer->recty)) {
 				ImBuf *ibuf_clip;
 
-				if (ibuf->rect_float==NULL)
+				if (ibuf->rect_float == NULL)
 					IMB_float_from_rect(ibuf);
 
 				ibuf_clip = IMB_allocImBuf(layer->rectx, layer->recty, 32, IB_rectfloat);
 				if (ibuf_clip) {
 					IMB_rectcpy(ibuf_clip, ibuf, 0, 0, x, y, layer->rectx, layer->recty);
 
-					memcpy(layer->rectf, ibuf_clip->rect_float, sizeof(float)*4*layer->rectx*layer->recty);
+					memcpy(layer->rectf, ibuf_clip->rect_float, sizeof(float) * 4 * layer->rectx * layer->recty);
 					IMB_freeImBuf(ibuf_clip);
 				}
 				else {
@@ -2428,33 +2428,33 @@ const float default_envmap_layout[] = { 0, 0, 1, 0, 2, 0, 0, 1, 1, 1, 2, 1 };
 int RE_WriteEnvmapResult(struct ReportList *reports, Scene *scene, EnvMap *env, const char *relpath, const char imtype, float layout[12])
 {
 	ImageFormatData imf;
-	ImBuf *ibuf=NULL;
+	ImBuf *ibuf = NULL;
 	int ok;
 	int dx;
-	int maxX=0, maxY=0, i=0;
+	int maxX = 0, maxY = 0, i = 0;
 	char filepath[FILE_MAX];
 
-	if (env->cube[1]==NULL) {
+	if (env->cube[1] == NULL) {
 		BKE_report(reports, RPT_ERROR, "There is no generated environment map available to save");
 		return 0;
 	}
 
-	imf= scene->r.im_format;
-	imf.imtype= imtype;
+	imf = scene->r.im_format;
+	imf.imtype = imtype;
 
-	dx= env->cube[1]->x;
+	dx = env->cube[1]->x;
 
 	if (env->type == ENV_CUBE) {
-		for (i=0; i < 12; i+=2) {
+		for (i = 0; i < 12; i += 2) {
 			maxX = MAX2(maxX, layout[i] + 1);
-			maxY = MAX2(maxY, layout[i+1] + 1);
+			maxY = MAX2(maxY, layout[i + 1] + 1);
 		}
 
-		ibuf = IMB_allocImBuf(maxX*dx, maxY*dx, 24, IB_rectfloat);
+		ibuf = IMB_allocImBuf(maxX * dx, maxY * dx, 24, IB_rectfloat);
 
-		for (i=0; i < 12; i+=2)
-			if (layout[i] > -1 && layout[i+1] > -1)
-				IMB_rectcpy(ibuf, env->cube[i/2], layout[i]*dx, layout[i+1]*dx, 0, 0, dx, dx);
+		for (i = 0; i < 12; i += 2)
+			if (layout[i] > -1 && layout[i + 1] > -1)
+				IMB_rectcpy(ibuf, env->cube[i / 2], layout[i] * dx, layout[i + 1] * dx, 0, 0, dx, dx);
 	}
 	else if (env->type == ENV_PLANE) {
 		ibuf = IMB_allocImBuf(dx, dx, 24, IB_rectfloat);
@@ -2472,7 +2472,7 @@ int RE_WriteEnvmapResult(struct ReportList *reports, Scene *scene, EnvMap *env,
 	BLI_strncpy(filepath, relpath, sizeof(filepath));
 	BLI_path_abs(filepath, G.main->name);
 
-	ok= BKE_imbuf_write(ibuf, filepath, &imf);
+	ok = BKE_imbuf_write(ibuf, filepath, &imf);
 
 	IMB_freeImBuf(ibuf);
 
diff --git a/source/blender/render/intern/source/pixelblending.c b/source/blender/render/intern/source/pixelblending.c
index 522a41d9af7..2acf3a4bc77 100644
--- a/source/blender/render/intern/source/pixelblending.c
+++ b/source/blender/render/intern/source/pixelblending.c
@@ -73,74 +73,74 @@ extern struct Render R;
 
 /* ------------------------------------------------------------------------- */
 
-void addAlphaOverFloat(float *dest, float *source)
+void addAlphaOverFloat(float dest[4], const float source[4])
 {
 	/* d = s + (1-alpha_s)d*/
 	float mul;
 
-	mul= 1.0f - source[3];
+	mul = 1.0f - source[3];
 
-	dest[0]= (mul*dest[0]) + source[0];
-	dest[1]= (mul*dest[1]) + source[1];
-	dest[2]= (mul*dest[2]) + source[2];
-	dest[3]= (mul*dest[3]) + source[3];
+	dest[0] = (mul * dest[0]) + source[0];
+	dest[1] = (mul * dest[1]) + source[1];
+	dest[2] = (mul * dest[2]) + source[2];
+	dest[3] = (mul * dest[3]) + source[3];
 
 }
 
 
 /* ------------------------------------------------------------------------- */
 
-void addAlphaUnderFloat(float *dest, float *source)
+void addAlphaUnderFloat(float dest[4], const float source[4])
 {
 	float mul;
 
-	mul= 1.0f - dest[3];
+	mul = 1.0f - dest[3];
 
-	dest[0]+= (mul*source[0]);
-	dest[1]+= (mul*source[1]);
-	dest[2]+= (mul*source[2]);
-	dest[3]+= (mul*source[3]);
+	dest[0] += (mul * source[0]);
+	dest[1] += (mul * source[1]);
+	dest[2] += (mul * source[2]);
+	dest[3] += (mul * source[3]);
 } 
 
 
 /* ------------------------------------------------------------------------- */
-void addalphaAddfacFloat(float *dest, float *source, char addfac)
+void addalphaAddfacFloat(float dest[4], const float source[4], char addfac)
 {
 	float m; /* weiging factor of destination */
 	float c; /* intermediate color           */
 
 	/* Addfac is a number between 0 and 1: rescale */
 	/* final target is to diminish the influence of dest when addfac rises */
-	m = 1.0f - ( source[3] * ((255 - addfac) / 255.0f));
+	m = 1.0f - (source[3] * ((255 - addfac) / 255.0f));
 
 	/* blend colors*/
-	c= (m * dest[0]) + source[0];
+	c = (m * dest[0]) + source[0];
 #ifdef RE_FLOAT_COLOR_CLIPPING
 	if (c >= RE_FULL_COLOR_FLOAT) dest[0] = RE_FULL_COLOR_FLOAT; 
 	else 
 #endif
-		dest[0]= c;
+	dest[0] = c;
    
-	c= (m * dest[1]) + source[1];
+	c = (m * dest[1]) + source[1];
 #ifdef RE_FLOAT_COLOR_CLIPPING
 	if (c >= RE_FULL_COLOR_FLOAT) dest[1] = RE_FULL_COLOR_FLOAT; 
 	else 
 #endif
-		dest[1]= c;
+	dest[1] = c;
 
-	c= (m * dest[2]) + source[2];
+	c = (m * dest[2]) + source[2];
 #ifdef RE_FLOAT_COLOR_CLIPPING
 	if (c >= RE_FULL_COLOR_FLOAT) dest[2] = RE_FULL_COLOR_FLOAT; 
 	else 
 #endif
-		dest[2]= c;
+	dest[2] = c;
 
-	c= (m * dest[3]) + source[3];
+	c = (m * dest[3]) + source[3];
 #ifdef RE_ALPHA_CLIPPING
 	if (c >= RE_FULL_COLOR_FLOAT) dest[3] = RE_FULL_COLOR_FLOAT; 
 	else 
 #endif
-	dest[3]= c;
+	dest[3] = c;
 
 }
 
@@ -148,84 +148,84 @@ void addalphaAddfacFloat(float *dest, float *source, char addfac)
 /* ------------------------------------------------------------------------- */
 
 /* filtered adding to scanlines */
-void add_filt_fmask(unsigned int mask, float *col, float *rowbuf, int row_w)
+void add_filt_fmask(unsigned int mask, const float col[4], float *rowbuf, int row_w)
 {
 	/* calc the value of mask */
-	float **fmask1= R.samples->fmask1, **fmask2=R.samples->fmask2;
+	float **fmask1 = R.samples->fmask1, **fmask2 = R.samples->fmask2;
 	float *rb1, *rb2, *rb3;
 	float val, r, g, b, al;
 	unsigned int a, maskand, maskshift;
 	int j;
 	
-	r= col[0];
-	g= col[1];
-	b= col[2];
-	al= col[3];
-	
-	rb2= rowbuf-4;
-	rb3= rb2-4*row_w;
-	rb1= rb2+4*row_w;
-	
-	maskand= (mask & 255);
-	maskshift= (mask >>8);
-	
-	for (j=2; j>=0; j--) {
-		
-		a= j;
-		
-		val= *(fmask1[a] +maskand) + *(fmask2[a] +maskshift);
-		if (val!=0.0f) {
-			rb1[0]+= val*r;
-			rb1[1]+= val*g;
-			rb1[2]+= val*b;
-			rb1[3]+= val*al;
+	r = col[0];
+	g = col[1];
+	b = col[2];
+	al = col[3];
+
+	rb2 = rowbuf - 4;
+	rb3 = rb2 - 4 * row_w;
+	rb1 = rb2 + 4 * row_w;
+
+	maskand = (mask & 255);
+	maskshift = (mask >> 8);
+
+	for (j = 2; j >= 0; j--) {
+
+		a = j;
+
+		val = *(fmask1[a] + maskand) + *(fmask2[a] + maskshift);
+		if (val != 0.0f) {
+			rb1[0] += val * r;
+			rb1[1] += val * g;
+			rb1[2] += val * b;
+			rb1[3] += val * al;
 		}
-		a+=3;
+		a += 3;
 		
-		val= *(fmask1[a] +maskand) + *(fmask2[a] +maskshift);
-		if (val!=0.0f) {
-			rb2[0]+= val*r;
-			rb2[1]+= val*g;
-			rb2[2]+= val*b;
-			rb2[3]+= val*al;
+		val = *(fmask1[a] + maskand) + *(fmask2[a] + maskshift);
+		if (val != 0.0f) {
+			rb2[0] += val * r;
+			rb2[1] += val * g;
+			rb2[2] += val * b;
+			rb2[3] += val * al;
 		}
-		a+=3;
+		a += 3;
 		
-		val= *(fmask1[a] +maskand) + *(fmask2[a] +maskshift);
-		if (val!=0.0f) {
-			rb3[0]+= val*r;
-			rb3[1]+= val*g;
-			rb3[2]+= val*b;
-			rb3[3]+= val*al;
+		val = *(fmask1[a] + maskand) + *(fmask2[a] + maskshift);
+		if (val != 0.0f) {
+			rb3[0] += val * r;
+			rb3[1] += val * g;
+			rb3[2] += val * b;
+			rb3[3] += val * al;
 		}
 		
-		rb1+= 4;
-		rb2+= 4;
-		rb3+= 4;
+		rb1 += 4;
+		rb2 += 4;
+		rb3 += 4;
 	}
 }
 
 
 void mask_array(unsigned int mask, float filt[][3])
 {
-	float **fmask1= R.samples->fmask1, **fmask2=R.samples->fmask2;
-	unsigned int maskand= (mask & 255);
-	unsigned int maskshift= (mask >>8);
+	float **fmask1 = R.samples->fmask1, **fmask2 = R.samples->fmask2;
+	unsigned int maskand = (mask & 255);
+	unsigned int maskshift = (mask >> 8);
 	int a, j;
 	
-	for (j=2; j>=0; j--) {
+	for (j = 2; j >= 0; j--) {
 		
-		a= j;
+		a = j;
 		
-		filt[2][2-j]= *(fmask1[a] +maskand) + *(fmask2[a] +maskshift);
+		filt[2][2 - j] = *(fmask1[a] + maskand) + *(fmask2[a] + maskshift);
 
-		a+=3;
+		a += 3;
 		
-		filt[1][2-j]= *(fmask1[a] +maskand) + *(fmask2[a] +maskshift);
+		filt[1][2 - j] = *(fmask1[a] + maskand) + *(fmask2[a] + maskshift);
 		
-		a+=3;
+		a += 3;
 		
-		filt[0][2-j]= *(fmask1[a] +maskand) + *(fmask2[a] +maskshift);
+		filt[0][2 - j] = *(fmask1[a] + maskand) + *(fmask2[a] + maskshift);
 	}
 }
 
@@ -242,135 +242,145 @@ void mask_array(unsigned int mask, float filt[][3])
  *      ---    ---   ---
  */
 
-void add_filt_fmask_coord(float filt[][3], float *col, float *rowbuf, int row_w, int col_h, int x, int y)
+void add_filt_fmask_coord(float filt[][3], const float col[4], float *rowbuf, int row_w, int col_h, int x, int y)
 {
 	float *fpoin[3][3];
 	float val, r, g, b, al, lfilt[3][3];
 	
-	r= col[0];
-	g= col[1];
-	b= col[2];
-	al= col[3];
+	r = col[0];
+	g = col[1];
+	b = col[2];
+	al = col[3];
 	
 	memcpy(lfilt, filt, sizeof(lfilt));
 	
-	fpoin[0][1]= rowbuf-4*row_w;
-	fpoin[1][1]= rowbuf;
-	fpoin[2][1]= rowbuf+4*row_w;
-	
-	fpoin[0][0]= fpoin[0][1] - 4;
-	fpoin[1][0]= fpoin[1][1] - 4;
-	fpoin[2][0]= fpoin[2][1] - 4;
-	
-	fpoin[0][2]= fpoin[0][1] + 4;
-	fpoin[1][2]= fpoin[1][1] + 4;
-	fpoin[2][2]= fpoin[2][1] + 4;
-	
-	if (y==0) {
-		fpoin[0][0]= fpoin[1][0];
-		fpoin[0][1]= fpoin[1][1];
-		fpoin[0][2]= fpoin[1][2];
+	fpoin[0][1] = rowbuf - 4 * row_w;
+	fpoin[1][1] = rowbuf;
+	fpoin[2][1] = rowbuf + 4 * row_w;
+
+	fpoin[0][0] = fpoin[0][1] - 4;
+	fpoin[1][0] = fpoin[1][1] - 4;
+	fpoin[2][0] = fpoin[2][1] - 4;
+
+	fpoin[0][2] = fpoin[0][1] + 4;
+	fpoin[1][2] = fpoin[1][1] + 4;
+	fpoin[2][2] = fpoin[2][1] + 4;
+
+	if (y == 0) {
+		fpoin[0][0] = fpoin[1][0];
+		fpoin[0][1] = fpoin[1][1];
+		fpoin[0][2] = fpoin[1][2];
 		/* filter needs the opposite value yes! */
-		lfilt[0][0]= filt[2][0];
-		lfilt[0][1]= filt[2][1];
-		lfilt[0][2]= filt[2][2];
+		lfilt[0][0] = filt[2][0];
+		lfilt[0][1] = filt[2][1];
+		lfilt[0][2] = filt[2][2];
 	}
-	else if (y==col_h-1) {
-		fpoin[2][0]= fpoin[1][0];
-		fpoin[2][1]= fpoin[1][1];
-		fpoin[2][2]= fpoin[1][2];
-		
-		lfilt[2][0]= filt[0][0];
-		lfilt[2][1]= filt[0][1];
-		lfilt[2][2]= filt[0][2];
+	else if (y == col_h - 1) {
+		fpoin[2][0] = fpoin[1][0];
+		fpoin[2][1] = fpoin[1][1];
+		fpoin[2][2] = fpoin[1][2];
+
+		lfilt[2][0] = filt[0][0];
+		lfilt[2][1] = filt[0][1];
+		lfilt[2][2] = filt[0][2];
 	}
 	
-	if (x==0) {
-		fpoin[2][0]= fpoin[2][1];
-		fpoin[1][0]= fpoin[1][1];
-		fpoin[0][0]= fpoin[0][1];
-		
-		lfilt[2][0]= filt[2][2];
-		lfilt[1][0]= filt[1][2];
-		lfilt[0][0]= filt[0][2];
+	if (x == 0) {
+		fpoin[2][0] = fpoin[2][1];
+		fpoin[1][0] = fpoin[1][1];
+		fpoin[0][0] = fpoin[0][1];
+
+		lfilt[2][0] = filt[2][2];
+		lfilt[1][0] = filt[1][2];
+		lfilt[0][0] = filt[0][2];
 	}
-	else if (x==row_w-1) {
-		fpoin[2][2]= fpoin[2][1];
-		fpoin[1][2]= fpoin[1][1];
-		fpoin[0][2]= fpoin[0][1];
-		
-		lfilt[2][2]= filt[2][0];
-		lfilt[1][2]= filt[1][0];
-		lfilt[0][2]= filt[0][0];
+	else if (x == row_w - 1) {
+		fpoin[2][2] = fpoin[2][1];
+		fpoin[1][2] = fpoin[1][1];
+		fpoin[0][2] = fpoin[0][1];
+
+		lfilt[2][2] = filt[2][0];
+		lfilt[1][2] = filt[1][0];
+		lfilt[0][2] = filt[0][0];
 	}
 	
 	
 	/* loop unroll */
-#define MASKFILT(i, j) 	val= lfilt[i][j]; if (val!=0.0f) {float *fp= fpoin[i][j]; fp[0]+= val*r; fp[1]+= val*g; fp[2]+= val*b; fp[3]+= val*al; }
+#define MASKFILT(i, j)                                                        \
+	val = lfilt[i][j];                                                        \
+	if (val != 0.0f) {                                                        \
+		float *fp = fpoin[i][j];                                              \
+		fp[0] += val * r;                                                     \
+		fp[1] += val * g;                                                     \
+		fp[2] += val * b;                                                     \
+		fp[3] += val * al;                                                    \
+	} (void)0
 	
-	MASKFILT(0, 0)
-	MASKFILT(0, 1)
-	MASKFILT(0, 2)
-	MASKFILT(1, 0)
-	MASKFILT(1, 1)
-	MASKFILT(1, 2)
-	MASKFILT(2, 0)
-	MASKFILT(2, 1)
-	MASKFILT(2, 2)
+	MASKFILT(0, 0);
+	MASKFILT(0, 1);
+	MASKFILT(0, 2);
+	MASKFILT(1, 0);
+	MASKFILT(1, 1);
+	MASKFILT(1, 2);
+	MASKFILT(2, 0);
+	MASKFILT(2, 1);
+	MASKFILT(2, 2);
+
+#undef MASKFILT
 }
 
 void add_filt_fmask_pixsize(unsigned int mask, float *in, float *rowbuf, int row_w, int pixsize)
 {
 	/* calc the value of mask */
-	float **fmask1= R.samples->fmask1, **fmask2=R.samples->fmask2;
+	float **fmask1 = R.samples->fmask1, **fmask2 = R.samples->fmask2;
 	float *rb1, *rb2, *rb3;
 	float val;
 	unsigned int a, maskand, maskshift;
 	int i, j;
 	
-	rb2= rowbuf-pixsize;
-	rb3= rb2-pixsize*row_w;
-	rb1= rb2+pixsize*row_w;
+	rb2 = rowbuf - pixsize;
+	rb3 = rb2 - pixsize * row_w;
+	rb1 = rb2 + pixsize * row_w;
 	
-	maskand= (mask & 255);
-	maskshift= (mask >>8);
+	maskand = (mask & 255);
+	maskshift = (mask >> 8);
 	
-	for (j=2; j>=0; j--) {
+	for (j = 2; j >= 0; j--) {
 		
-		a= j;
+		a = j;
 		
-		val= *(fmask1[a] +maskand) + *(fmask2[a] +maskshift);
-		if (val!=0.0f) {
-			for (i= 0; i<pixsize; i++)
-				rb1[i]+= val*in[i];
+		val = *(fmask1[a] + maskand) + *(fmask2[a] + maskshift);
+		if (val != 0.0f) {
+			for (i = 0; i < pixsize; i++)
+				rb1[i] += val * in[i];
 		}
-		a+=3;
+		a += 3;
 		
-		val= *(fmask1[a] +maskand) + *(fmask2[a] +maskshift);
-		if (val!=0.0f) {
-			for (i= 0; i<pixsize; i++)
-				rb2[i]+= val*in[i];
+		val = *(fmask1[a] + maskand) + *(fmask2[a] + maskshift);
+		if (val != 0.0f) {
+			for (i = 0; i < pixsize; i++)
+				rb2[i] += val * in[i];
 		}
-		a+=3;
+		a += 3;
 		
-		val= *(fmask1[a] +maskand) + *(fmask2[a] +maskshift);
-		if (val!=0.0f) {
-			for (i= 0; i<pixsize; i++)
-				rb3[i]+= val*in[i];
+		val = *(fmask1[a] + maskand) + *(fmask2[a] + maskshift);
+		if (val != 0.0f) {
+			for (i = 0; i < pixsize; i++)
+				rb3[i] += val * in[i];
 		}
 		
-		rb1+= pixsize;
-		rb2+= pixsize;
-		rb3+= pixsize;
+		rb1 += pixsize;
+		rb2 += pixsize;
+		rb3 += pixsize;
 	}
 }
 
 /* ------------------------------------------------------------------------- */
-void addalphaAddFloat(float *dest, float *source)
+void addalphaAddFloat(float dest[4], const float source[4])
 {
 
 	/* Makes me wonder whether this is required... */
-	if ( dest[3] < RE_EMPTY_COLOR_FLOAT) {
+	if (dest[3] < RE_EMPTY_COLOR_FLOAT) {
 		dest[0] = source[0];
 		dest[1] = source[1];
 		dest[2] = source[2];
@@ -379,15 +389,12 @@ void addalphaAddFloat(float *dest, float *source)
 	}
 
 	/* no clipping! */
-	dest[0] = dest[0]+source[0];
-	dest[1] = dest[1]+source[1];
-	dest[2] = dest[2]+source[2];
-	dest[3] = dest[3]+source[3];
+	dest[0] = dest[0] + source[0];
+	dest[1] = dest[1] + source[1];
+	dest[2] = dest[2] + source[2];
+	dest[3] = dest[3] + source[3];
 
 }
 
 
 /* ---------------------------------------------------------------------------- */
-
-
-/* eof pixelblending.c */
diff --git a/source/blender/render/intern/source/pixelshading.c b/source/blender/render/intern/source/pixelshading.c
index 0aeee7e22e8..8e6078b18e0 100644
--- a/source/blender/render/intern/source/pixelshading.c
+++ b/source/blender/render/intern/source/pixelshading.c
@@ -280,8 +280,8 @@ static float haloZtoDist(int z)
  * \param xn The x coordinate of the pixel relaticve to the center of the halo. given in pixels
  * \param yn The y coordinate of the pixel relaticve to the center of the halo. given in pixels
  */
-int shadeHaloFloat(HaloRen *har,  float *col, int zz, 
-					float dist, float xn,  float yn, short flarec)
+int shadeHaloFloat(HaloRen *har, float col[4], int zz,
+                   float dist, float xn,  float yn, short flarec)
 {
 	/* fill in col */
 	float t, zn, radist, ringf=0.0f, linef=0.0f, alpha, si, co;
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index 96a1a13b75f..3c1a18316ca 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -325,8 +325,7 @@ void free_pointdensities(Render *re)
 	}
 }
 
-typedef struct PointDensityRangeData
-{
+typedef struct PointDensityRangeData {
 	float *density;
 	float squared_radius;
 	float *point_data;
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c
index 726d89a7c3e..f11e5d22574 100644
--- a/source/blender/render/intern/source/rayshade.c
+++ b/source/blender/render/intern/source/rayshade.c
@@ -604,7 +604,7 @@ static void reflection(float ref[3], float n[3], const float view[3], const floa
 }
 
 #if 0
-static void color_combine(float *result, float fac1, float fac2, float *col1, float *col2)
+static void color_combine(float *result, float fac1, float fac2, float col1[3], float col2[3])
 {
 	float col1t[3], col2t[3];
 	
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index a88057ef3d2..6f572b43a15 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -59,10 +59,10 @@
 
 void render_result_free(RenderResult *res)
 {
-	if (res==NULL) return;
+	if (res == NULL) return;
 
 	while (res->layers.first) {
-		RenderLayer *rl= res->layers.first;
+		RenderLayer *rl = res->layers.first;
 		
 		if (rl->rectf) MEM_freeN(rl->rectf);
 		/* acolrect and scolrect are optionally allocated in shade_tile, only free here since it can be used for drawing */
@@ -70,7 +70,7 @@ void render_result_free(RenderResult *res)
 		if (rl->scolrect) MEM_freeN(rl->scolrect);
 		
 		while (rl->passes.first) {
-			RenderPass *rpass= rl->passes.first;
+			RenderPass *rpass = rl->passes.first;
 			if (rpass->rect) MEM_freeN(rpass->rect);
 			BLI_remlink(&rl->passes, rpass);
 			MEM_freeN(rpass);
@@ -96,8 +96,8 @@ void render_result_free_list(ListBase *lb, RenderResult *rr)
 {
 	RenderResult *rrnext;
 	
-	for (; rr; rr= rrnext) {
-		rrnext= rr->next;
+	for (; rr; rr = rrnext) {
+		rrnext = rr->next;
 		
 		if (lb && lb->first)
 			BLI_remlink(lb, rr);
@@ -114,166 +114,166 @@ static const char *get_pass_name(int passtype, int channel)
 {
 	
 	if (passtype == SCE_PASS_COMBINED) {
-		if (channel==-1) return "Combined";
-		if (channel==0) return "Combined.R";
-		if (channel==1) return "Combined.G";
-		if (channel==2) return "Combined.B";
+		if (channel == -1) return "Combined";
+		if (channel == 0) return "Combined.R";
+		if (channel == 1) return "Combined.G";
+		if (channel == 2) return "Combined.B";
 		return "Combined.A";
 	}
 	if (passtype == SCE_PASS_Z) {
-		if (channel==-1) return "Depth";
+		if (channel == -1) return "Depth";
 		return "Depth.Z";
 	}
 	if (passtype == SCE_PASS_VECTOR) {
-		if (channel==-1) return "Vector";
-		if (channel==0) return "Vector.X";
-		if (channel==1) return "Vector.Y";
-		if (channel==2) return "Vector.Z";
+		if (channel == -1) return "Vector";
+		if (channel == 0) return "Vector.X";
+		if (channel == 1) return "Vector.Y";
+		if (channel == 2) return "Vector.Z";
 		return "Vector.W";
 	}
 	if (passtype == SCE_PASS_NORMAL) {
-		if (channel==-1) return "Normal";
-		if (channel==0) return "Normal.X";
-		if (channel==1) return "Normal.Y";
+		if (channel == -1) return "Normal";
+		if (channel == 0) return "Normal.X";
+		if (channel == 1) return "Normal.Y";
 		return "Normal.Z";
 	}
 	if (passtype == SCE_PASS_UV) {
-		if (channel==-1) return "UV";
-		if (channel==0) return "UV.U";
-		if (channel==1) return "UV.V";
+		if (channel == -1) return "UV";
+		if (channel == 0) return "UV.U";
+		if (channel == 1) return "UV.V";
 		return "UV.A";
 	}
 	if (passtype == SCE_PASS_RGBA) {
-		if (channel==-1) return "Color";
-		if (channel==0) return "Color.R";
-		if (channel==1) return "Color.G";
-		if (channel==2) return "Color.B";
+		if (channel == -1) return "Color";
+		if (channel == 0) return "Color.R";
+		if (channel == 1) return "Color.G";
+		if (channel == 2) return "Color.B";
 		return "Color.A";
 	}
 	if (passtype == SCE_PASS_EMIT) {
-		if (channel==-1) return "Emit";
-		if (channel==0) return "Emit.R";
-		if (channel==1) return "Emit.G";
+		if (channel == -1) return "Emit";
+		if (channel == 0) return "Emit.R";
+		if (channel == 1) return "Emit.G";
 		return "Emit.B";
 	}
 	if (passtype == SCE_PASS_DIFFUSE) {
-		if (channel==-1) return "Diffuse";
-		if (channel==0) return "Diffuse.R";
-		if (channel==1) return "Diffuse.G";
+		if (channel == -1) return "Diffuse";
+		if (channel == 0) return "Diffuse.R";
+		if (channel == 1) return "Diffuse.G";
 		return "Diffuse.B";
 	}
 	if (passtype == SCE_PASS_SPEC) {
-		if (channel==-1) return "Spec";
-		if (channel==0) return "Spec.R";
-		if (channel==1) return "Spec.G";
+		if (channel == -1) return "Spec";
+		if (channel == 0) return "Spec.R";
+		if (channel == 1) return "Spec.G";
 		return "Spec.B";
 	}
 	if (passtype == SCE_PASS_SHADOW) {
-		if (channel==-1) return "Shadow";
-		if (channel==0) return "Shadow.R";
-		if (channel==1) return "Shadow.G";
+		if (channel == -1) return "Shadow";
+		if (channel == 0) return "Shadow.R";
+		if (channel == 1) return "Shadow.G";
 		return "Shadow.B";
 	}
 	if (passtype == SCE_PASS_AO) {
-		if (channel==-1) return "AO";
-		if (channel==0) return "AO.R";
-		if (channel==1) return "AO.G";
+		if (channel == -1) return "AO";
+		if (channel == 0) return "AO.R";
+		if (channel == 1) return "AO.G";
 		return "AO.B";
 	}
 	if (passtype == SCE_PASS_ENVIRONMENT) {
-		if (channel==-1) return "Env";
-		if (channel==0) return "Env.R";
-		if (channel==1) return "Env.G";
+		if (channel == -1) return "Env";
+		if (channel == 0) return "Env.R";
+		if (channel == 1) return "Env.G";
 		return "Env.B";
 	}
 	if (passtype == SCE_PASS_INDIRECT) {
-		if (channel==-1) return "Indirect";
-		if (channel==0) return "Indirect.R";
-		if (channel==1) return "Indirect.G";
+		if (channel == -1) return "Indirect";
+		if (channel == 0) return "Indirect.R";
+		if (channel == 1) return "Indirect.G";
 		return "Indirect.B";
 	}
 	if (passtype == SCE_PASS_REFLECT) {
-		if (channel==-1) return "Reflect";
-		if (channel==0) return "Reflect.R";
-		if (channel==1) return "Reflect.G";
+		if (channel == -1) return "Reflect";
+		if (channel == 0) return "Reflect.R";
+		if (channel == 1) return "Reflect.G";
 		return "Reflect.B";
 	}
 	if (passtype == SCE_PASS_REFRACT) {
-		if (channel==-1) return "Refract";
-		if (channel==0) return "Refract.R";
-		if (channel==1) return "Refract.G";
+		if (channel == -1) return "Refract";
+		if (channel == 0) return "Refract.R";
+		if (channel == 1) return "Refract.G";
 		return "Refract.B";
 	}
 	if (passtype == SCE_PASS_INDEXOB) {
-		if (channel==-1) return "IndexOB";
+		if (channel == -1) return "IndexOB";
 		return "IndexOB.X";
 	}
 	if (passtype == SCE_PASS_INDEXMA) {
-		if (channel==-1) return "IndexMA";
+		if (channel == -1) return "IndexMA";
 		return "IndexMA.X";
 	}
 	if (passtype == SCE_PASS_MIST) {
-		if (channel==-1) return "Mist";
+		if (channel == -1) return "Mist";
 		return "Mist.Z";
 	}
 	if (passtype == SCE_PASS_RAYHITS) {
-		if (channel==-1) return "Rayhits";
-		if (channel==0) return "Rayhits.R";
-		if (channel==1) return "Rayhits.G";
+		if (channel == -1) return "Rayhits";
+		if (channel == 0) return "Rayhits.R";
+		if (channel == 1) return "Rayhits.G";
 		return "Rayhits.B";
 	}
 	if (passtype == SCE_PASS_DIFFUSE_DIRECT) {
-		if (channel==-1) return "DiffDir";
-		if (channel==0) return "DiffDir.R";
-		if (channel==1) return "DiffDir.G";
+		if (channel == -1) return "DiffDir";
+		if (channel == 0) return "DiffDir.R";
+		if (channel == 1) return "DiffDir.G";
 		return "DiffDir.B";
 	}
 	if (passtype == SCE_PASS_DIFFUSE_INDIRECT) {
-		if (channel==-1) return "DiffInd";
-		if (channel==0) return "DiffInd.R";
-		if (channel==1) return "DiffInd.G";
+		if (channel == -1) return "DiffInd";
+		if (channel == 0) return "DiffInd.R";
+		if (channel == 1) return "DiffInd.G";
 		return "DiffInd.B";
 	}
 	if (passtype == SCE_PASS_DIFFUSE_COLOR) {
-		if (channel==-1) return "DiffCol";
-		if (channel==0) return "DiffCol.R";
-		if (channel==1) return "DiffCol.G";
+		if (channel == -1) return "DiffCol";
+		if (channel == 0) return "DiffCol.R";
+		if (channel == 1) return "DiffCol.G";
 		return "DiffCol.B";
 	}
 	if (passtype == SCE_PASS_GLOSSY_DIRECT) {
-		if (channel==-1) return "GlossDir";
-		if (channel==0) return "GlossDir.R";
-		if (channel==1) return "GlossDir.G";
+		if (channel == -1) return "GlossDir";
+		if (channel == 0) return "GlossDir.R";
+		if (channel == 1) return "GlossDir.G";
 		return "GlossDir.B";
 	}
 	if (passtype == SCE_PASS_GLOSSY_INDIRECT) {
-		if (channel==-1) return "GlossInd";
-		if (channel==0) return "GlossInd.R";
-		if (channel==1) return "GlossInd.G";
+		if (channel == -1) return "GlossInd";
+		if (channel == 0) return "GlossInd.R";
+		if (channel == 1) return "GlossInd.G";
 		return "GlossInd.B";
 	}
 	if (passtype == SCE_PASS_GLOSSY_COLOR) {
-		if (channel==-1) return "GlossCol";
-		if (channel==0) return "GlossCol.R";
-		if (channel==1) return "GlossCol.G";
+		if (channel == -1) return "GlossCol";
+		if (channel == 0) return "GlossCol.R";
+		if (channel == 1) return "GlossCol.G";
 		return "GlossCol.B";
 	}
 	if (passtype == SCE_PASS_TRANSM_DIRECT) {
-		if (channel==-1) return "TransDir";
-		if (channel==0) return "TransDir.R";
-		if (channel==1) return "TransDir.G";
+		if (channel == -1) return "TransDir";
+		if (channel == 0) return "TransDir.R";
+		if (channel == 1) return "TransDir.G";
 		return "TransDir.B";
 	}
 	if (passtype == SCE_PASS_TRANSM_INDIRECT) {
-		if (channel==-1) return "TransInd";
-		if (channel==0) return "TransInd.R";
-		if (channel==1) return "TransInd.G";
+		if (channel == -1) return "TransInd";
+		if (channel == 0) return "TransInd.R";
+		if (channel == 1) return "TransInd.G";
 		return "TransInd.B";
 	}
 	if (passtype == SCE_PASS_TRANSM_COLOR) {
-		if (channel==-1) return "TransCol";
-		if (channel==0) return "TransCol.R";
-		if (channel==1) return "TransCol.G";
+		if (channel == -1) return "TransCol";
+		if (channel == 0) return "TransCol.R";
+		if (channel == 1) return "TransCol.G";
 		return "TransCol.B";
 	}
 	return "Unknown";
@@ -282,88 +282,88 @@ static const char *get_pass_name(int passtype, int channel)
 static int passtype_from_name(const char *str)
 {
 	
-	if (strcmp(str, "Combined")==0)
+	if (strcmp(str, "Combined") == 0)
 		return SCE_PASS_COMBINED;
 
-	if (strcmp(str, "Depth")==0)
+	if (strcmp(str, "Depth") == 0)
 		return SCE_PASS_Z;
 
-	if (strcmp(str, "Vector")==0)
+	if (strcmp(str, "Vector") == 0)
 		return SCE_PASS_VECTOR;
 
-	if (strcmp(str, "Normal")==0)
+	if (strcmp(str, "Normal") == 0)
 		return SCE_PASS_NORMAL;
 
-	if (strcmp(str, "UV")==0)
+	if (strcmp(str, "UV") == 0)
 		return SCE_PASS_UV;
 
-	if (strcmp(str, "Color")==0)
+	if (strcmp(str, "Color") == 0)
 		return SCE_PASS_RGBA;
 
-	if (strcmp(str, "Emit")==0)
+	if (strcmp(str, "Emit") == 0)
 		return SCE_PASS_EMIT;
 
-	if (strcmp(str, "Diffuse")==0)
+	if (strcmp(str, "Diffuse") == 0)
 		return SCE_PASS_DIFFUSE;
 
-	if (strcmp(str, "Spec")==0)
+	if (strcmp(str, "Spec") == 0)
 		return SCE_PASS_SPEC;
 
-	if (strcmp(str, "Shadow")==0)
+	if (strcmp(str, "Shadow") == 0)
 		return SCE_PASS_SHADOW;
 	
-	if (strcmp(str, "AO")==0)
+	if (strcmp(str, "AO") == 0)
 		return SCE_PASS_AO;
 
-	if (strcmp(str, "Env")==0)
+	if (strcmp(str, "Env") == 0)
 		return SCE_PASS_ENVIRONMENT;
 
-	if (strcmp(str, "Indirect")==0)
+	if (strcmp(str, "Indirect") == 0)
 		return SCE_PASS_INDIRECT;
 
-	if (strcmp(str, "Reflect")==0)
+	if (strcmp(str, "Reflect") == 0)
 		return SCE_PASS_REFLECT;
 
-	if (strcmp(str, "Refract")==0)
+	if (strcmp(str, "Refract") == 0)
 		return SCE_PASS_REFRACT;
 
-	if (strcmp(str, "IndexOB")==0)
+	if (strcmp(str, "IndexOB") == 0)
 		return SCE_PASS_INDEXOB;
 
-	if (strcmp(str, "IndexMA")==0)
+	if (strcmp(str, "IndexMA") == 0)
 		return SCE_PASS_INDEXMA;
 
-	if (strcmp(str, "Mist")==0)
+	if (strcmp(str, "Mist") == 0)
 		return SCE_PASS_MIST;
 	
-	if (strcmp(str, "RayHits")==0)
+	if (strcmp(str, "RayHits") == 0)
 		return SCE_PASS_RAYHITS;
 
-	if (strcmp(str, "DiffDir")==0)
+	if (strcmp(str, "DiffDir") == 0)
 		return SCE_PASS_DIFFUSE_DIRECT;
 
-	if (strcmp(str, "DiffInd")==0)
+	if (strcmp(str, "DiffInd") == 0)
 		return SCE_PASS_DIFFUSE_INDIRECT;
 
-	if (strcmp(str, "DiffCol")==0)
+	if (strcmp(str, "DiffCol") == 0)
 		return SCE_PASS_DIFFUSE_COLOR;
 
-	if (strcmp(str, "GlossDir")==0)
+	if (strcmp(str, "GlossDir") == 0)
 		return SCE_PASS_GLOSSY_DIRECT;
 
-	if (strcmp(str, "GlossInd")==0)
+	if (strcmp(str, "GlossInd") == 0)
 		return SCE_PASS_GLOSSY_INDIRECT;
 
-	if (strcmp(str, "GlossCol")==0)
+	if (strcmp(str, "GlossCol") == 0)
 		return SCE_PASS_GLOSSY_COLOR;
 
-	if (strcmp(str, "TransDir")==0)
+	if (strcmp(str, "TransDir") == 0)
 		return SCE_PASS_TRANSM_DIRECT;
 
-	if (strcmp(str, "TransInd")==0)
+	if (strcmp(str, "TransInd") == 0)
 		return SCE_PASS_TRANSM_INDIRECT;
 
-	if (strcmp(str, "TransCol")==0)
+	if (strcmp(str, "TransCol") == 0)
 		return SCE_PASS_TRANSM_COLOR;
 
 	return 0;
@@ -373,38 +373,38 @@ static int passtype_from_name(const char *str)
 
 static void render_layer_add_pass(RenderResult *rr, RenderLayer *rl, int channels, int passtype)
 {
-	const char *typestr= get_pass_name(passtype, 0);
-	RenderPass *rpass= MEM_callocN(sizeof(RenderPass), typestr);
-	int rectsize= rr->rectx*rr->recty*channels;
+	const char *typestr = get_pass_name(passtype, 0);
+	RenderPass *rpass = MEM_callocN(sizeof(RenderPass), typestr);
+	int rectsize = rr->rectx * rr->recty * channels;
 	
 	BLI_addtail(&rl->passes, rpass);
-	rpass->passtype= passtype;
-	rpass->channels= channels;
-	rpass->rectx= rl->rectx;
-	rpass->recty= rl->recty;
+	rpass->passtype = passtype;
+	rpass->channels = channels;
+	rpass->rectx = rl->rectx;
+	rpass->recty = rl->recty;
 	BLI_strncpy(rpass->name, get_pass_name(rpass->passtype, -1), sizeof(rpass->name));
 	
 	if (rr->exrhandle) {
 		int a;
-		for (a=0; a<channels; a++)
+		for (a = 0; a < channels; a++)
 			IMB_exr_add_channel(rr->exrhandle, rl->name, get_pass_name(passtype, a), 0, 0, NULL);
 	}
 	else {
 		float *rect;
 		int x;
 		
-		rpass->rect= MEM_mapallocN(sizeof(float)*rectsize, typestr);
+		rpass->rect = MEM_mapallocN(sizeof(float) * rectsize, typestr);
 		
-		if (passtype==SCE_PASS_VECTOR) {
+		if (passtype == SCE_PASS_VECTOR) {
 			/* initialize to max speed */
-			rect= rpass->rect;
-			for (x= rectsize-1; x>=0; x--)
-				rect[x]= PASS_VECTOR_MAX;
+			rect = rpass->rect;
+			for (x = rectsize - 1; x >= 0; x--)
+				rect[x] = PASS_VECTOR_MAX;
 		}
-		else if (passtype==SCE_PASS_Z) {
-			rect= rpass->rect;
-			for (x= rectsize-1; x>=0; x--)
-				rect[x]= 10e10;
+		else if (passtype == SCE_PASS_Z) {
+			rect = rpass->rect;
+			for (x = rectsize - 1; x >= 0; x--)
+				rect[x] = 10e10;
 		}
 	}
 }
@@ -420,18 +420,18 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf
 	SceneRenderLayer *srl;
 	int rectx, recty, nr;
 	
-	rectx= partrct->xmax - partrct->xmin;
-	recty= partrct->ymax - partrct->ymin;
+	rectx = partrct->xmax - partrct->xmin;
+	recty = partrct->ymax - partrct->ymin;
 	
-	if (rectx<=0 || recty<=0)
+	if (rectx <= 0 || recty <= 0)
 		return NULL;
 	
-	rr= MEM_callocN(sizeof(RenderResult), "new render result");
-	rr->rectx= rectx;
-	rr->recty= recty;
-	rr->renrect.xmin = 0; rr->renrect.xmax = rectx-2*crop;
+	rr = MEM_callocN(sizeof(RenderResult), "new render result");
+	rr->rectx = rectx;
+	rr->recty = recty;
+	rr->renrect.xmin = 0; rr->renrect.xmax = rectx - 2 * crop;
 	/* crop is one or two extra pixels rendered for filtering, is used for merging and display too */
-	rr->crop= crop;
+	rr->crop = crop;
 	
 	/* tilerect is relative coordinates within render disprect. do not subtract crop yet */
 	rr->tilerect.xmin = partrct->xmin - re->disprect.xmin;
@@ -440,31 +440,31 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf
 	rr->tilerect.ymax = partrct->ymax - re->disprect.ymax;
 	
 	if (savebuffers) {
-		rr->exrhandle= IMB_exr_get_handle();
+		rr->exrhandle = IMB_exr_get_handle();
 	}
 	
 	/* check renderdata for amount of layers */
-	for (nr=0, srl= re->r.layers.first; srl; srl= srl->next, nr++) {
+	for (nr = 0, srl = re->r.layers.first; srl; srl = srl->next, nr++) {
 		
-		if ((re->r.scemode & R_SINGLE_LAYER) && nr!=re->r.actlay)
+		if ((re->r.scemode & R_SINGLE_LAYER) && nr != re->r.actlay)
 			continue;
 		if (srl->layflag & SCE_LAY_DISABLE)
 			continue;
 		
-		rl= MEM_callocN(sizeof(RenderLayer), "new render layer");
+		rl = MEM_callocN(sizeof(RenderLayer), "new render layer");
 		BLI_addtail(&rr->layers, rl);
 		
 		BLI_strncpy(rl->name, srl->name, sizeof(rl->name));
-		rl->lay= srl->lay;
-		rl->lay_zmask= srl->lay_zmask;
-		rl->lay_exclude= srl->lay_exclude;
-		rl->layflag= srl->layflag;
-		rl->passflag= srl->passflag; // for debugging: srl->passflag|SCE_PASS_RAYHITS;
-		rl->pass_xor= srl->pass_xor;
-		rl->light_override= srl->light_override;
-		rl->mat_override= srl->mat_override;
-		rl->rectx= rectx;
-		rl->recty= recty;
+		rl->lay = srl->lay;
+		rl->lay_zmask = srl->lay_zmask;
+		rl->lay_exclude = srl->lay_exclude;
+		rl->layflag = srl->layflag;
+		rl->passflag = srl->passflag; // for debugging: srl->passflag|SCE_PASS_RAYHITS;
+		rl->pass_xor = srl->pass_xor;
+		rl->light_override = srl->light_override;
+		rl->mat_override = srl->mat_override;
+		rl->rectx = rectx;
+		rl->recty = recty;
 		
 		if (rr->exrhandle) {
 			IMB_exr_add_channel(rr->exrhandle, rl->name, "Combined.R", 0, 0, NULL);
@@ -473,7 +473,7 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf
 			IMB_exr_add_channel(rr->exrhandle, rl->name, "Combined.A", 0, 0, NULL);
 		}
 		else
-			rl->rectf= MEM_mapallocN(rectx*recty*sizeof(float)*4, "Combined rgba");
+			rl->rectf = MEM_mapallocN(rectx * recty * sizeof(float) * 4, "Combined rgba");
 		
 		if (srl->passflag  & SCE_PASS_Z)
 			render_layer_add_pass(rr, rl, 1, SCE_PASS_Z);
@@ -532,12 +532,12 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf
 		
 	}
 	/* sss, previewrender and envmap don't do layers, so we make a default one */
-	if (rr->layers.first==NULL) {
-		rl= MEM_callocN(sizeof(RenderLayer), "new render layer");
+	if (rr->layers.first == NULL) {
+		rl = MEM_callocN(sizeof(RenderLayer), "new render layer");
 		BLI_addtail(&rr->layers, rl);
 		
-		rl->rectx= rectx;
-		rl->recty= recty;
+		rl->rectx = rectx;
+		rl->recty = recty;
 
 		/* duplicate code... */
 		if (rr->exrhandle) {
@@ -547,19 +547,19 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf
 			IMB_exr_add_channel(rr->exrhandle, rl->name, "Combined.A", 0, 0, NULL);
 		}
 		else
-			rl->rectf= MEM_mapallocN(rectx*recty*sizeof(float)*4, "Combined rgba");
+			rl->rectf = MEM_mapallocN(rectx * recty * sizeof(float) * 4, "Combined rgba");
 		
 		/* note, this has to be in sync with scene.c */
-		rl->lay= (1<<20) -1;
-		rl->layflag= 0x7FFF;	/* solid ztra halo strand */
-		rl->passflag= SCE_PASS_COMBINED;
+		rl->lay = (1 << 20) - 1;
+		rl->layflag = 0x7FFF;    /* solid ztra halo strand */
+		rl->passflag = SCE_PASS_COMBINED;
 		
-		re->r.actlay= 0;
+		re->r.actlay = 0;
 	}
 	
 	/* border render; calculate offset for use in compositor. compo is centralized coords */
-	rr->xof= re->disprect.xmin + (re->disprect.xmax - re->disprect.xmin)/2 - re->winx/2;
-	rr->yof= re->disprect.ymin + (re->disprect.ymax - re->disprect.ymin)/2 - re->winy/2;
+	rr->xof = re->disprect.xmin + (re->disprect.xmax - re->disprect.xmin) / 2 - re->winx / 2;
+	rr->yof = re->disprect.ymin + (re->disprect.ymax - re->disprect.ymin) / 2 - re->winy / 2;
 	
 	return rr;
 }
@@ -569,13 +569,13 @@ RenderResult *render_result_new_full_sample(Render *re, ListBase *lb, rcti *part
 {
 	int a;
 	
-	if (re->osa==0)
+	if (re->osa == 0)
 		return render_result_new(re, partrct, crop, savebuffers);
 	
-	for (a=0; a<re->osa; a++) {
-		RenderResult *rr= render_result_new(re, partrct, crop, savebuffers);
+	for (a = 0; a < re->osa; a++) {
+		RenderResult *rr = render_result_new(re, partrct, crop, savebuffers);
 		BLI_addtail(lb, rr);
-		rr->sample_nr= a;
+		rr->sample_nr = a;
 	}
 	
 	return lb->first;
@@ -584,10 +584,10 @@ RenderResult *render_result_new_full_sample(Render *re, ListBase *lb, rcti *part
 /* callbacks for render_result_new_from_exr */
 static void *ml_addlayer_cb(void *base, char *str)
 {
-	RenderResult *rr= base;
+	RenderResult *rr = base;
 	RenderLayer *rl;
 	
-	rl= MEM_callocN(sizeof(RenderLayer), "new render layer");
+	rl = MEM_callocN(sizeof(RenderLayer), "new render layer");
 	BLI_addtail(&rr->layers, rl);
 	
 	BLI_strncpy(rl->name, str, EXR_LAY_MAXNAME);
@@ -596,44 +596,44 @@ static void *ml_addlayer_cb(void *base, char *str)
 
 static void ml_addpass_cb(void *UNUSED(base), void *lay, char *str, float *rect, int totchan, char *chan_id)
 {
-	RenderLayer *rl= lay;	
-	RenderPass *rpass= MEM_callocN(sizeof(RenderPass), "loaded pass");
+	RenderLayer *rl = lay;
+	RenderPass *rpass = MEM_callocN(sizeof(RenderPass), "loaded pass");
 	int a;
 	
 	BLI_addtail(&rl->passes, rpass);
-	rpass->channels= totchan;
+	rpass->channels = totchan;
 
-	rpass->passtype= passtype_from_name(str);
-	if (rpass->passtype==0) printf("unknown pass %s\n", str);
+	rpass->passtype = passtype_from_name(str);
+	if (rpass->passtype == 0) printf("unknown pass %s\n", str);
 	rl->passflag |= rpass->passtype;
 	
 	BLI_strncpy(rpass->name, str, EXR_PASS_MAXNAME);
 	/* channel id chars */
-	for (a=0; a<totchan; a++)
-		rpass->chan_id[a]= chan_id[a];
+	for (a = 0; a < totchan; a++)
+		rpass->chan_id[a] = chan_id[a];
 	
-	rpass->rect= rect;
+	rpass->rect = rect;
 }
 
 /* from imbuf, if a handle was returned we convert this to render result */
 RenderResult *render_result_new_from_exr(void *exrhandle, int rectx, int recty)
 {
-	RenderResult *rr= MEM_callocN(sizeof(RenderResult), "loaded render result");
+	RenderResult *rr = MEM_callocN(sizeof(RenderResult), "loaded render result");
 	RenderLayer *rl;
 	RenderPass *rpass;
 	
-	rr->rectx= rectx;
-	rr->recty= recty;
+	rr->rectx = rectx;
+	rr->recty = recty;
 	
 	IMB_exr_multilayer_convert(exrhandle, rr, ml_addlayer_cb, ml_addpass_cb);
 
-	for (rl=rr->layers.first; rl; rl=rl->next) {
-		rl->rectx= rectx;
-		rl->recty= recty;
+	for (rl = rr->layers.first; rl; rl = rl->next) {
+		rl->rectx = rectx;
+		rl->recty = recty;
 
-		for (rpass=rl->passes.first; rpass; rpass=rpass->next) {
-			rpass->rectx= rectx;
-			rpass->recty= recty;
+		for (rpass = rl->passes.first; rpass; rpass = rpass->next) {
+			rpass->rectx = rectx;
+			rpass->recty = recty;
 		}
 	}
 	
@@ -646,31 +646,31 @@ static void do_merge_tile(RenderResult *rr, RenderResult *rrpart, float *target,
 {
 	int y, ofs, copylen, tilex, tiley;
 	
-	copylen= tilex= rrpart->rectx;
-	tiley= rrpart->recty;
+	copylen = tilex = rrpart->rectx;
+	tiley = rrpart->recty;
 	
-	if (rrpart->crop) {	/* filters add pixel extra */
-		tile+= pixsize*(rrpart->crop + rrpart->crop*tilex);
+	if (rrpart->crop) { /* filters add pixel extra */
+		tile += pixsize * (rrpart->crop + rrpart->crop * tilex);
 		
-		copylen= tilex - 2*rrpart->crop;
-		tiley -= 2*rrpart->crop;
+		copylen = tilex - 2 * rrpart->crop;
+		tiley -= 2 * rrpart->crop;
 		
-		ofs= (rrpart->tilerect.ymin + rrpart->crop)*rr->rectx + (rrpart->tilerect.xmin+rrpart->crop);
-		target+= pixsize*ofs;
+		ofs = (rrpart->tilerect.ymin + rrpart->crop) * rr->rectx + (rrpart->tilerect.xmin + rrpart->crop);
+		target += pixsize * ofs;
 	}
 	else {
-		ofs= (rrpart->tilerect.ymin*rr->rectx + rrpart->tilerect.xmin);
-		target+= pixsize*ofs;
+		ofs = (rrpart->tilerect.ymin * rr->rectx + rrpart->tilerect.xmin);
+		target += pixsize * ofs;
 	}
 
-	copylen *= sizeof(float)*pixsize;
+	copylen *= sizeof(float) * pixsize;
 	tilex *= pixsize;
-	ofs= pixsize*rr->rectx;
+	ofs = pixsize * rr->rectx;
 
-	for (y=0; y<tiley; y++) {
+	for (y = 0; y < tiley; y++) {
 		memcpy(target, tile, copylen);
-		target+= ofs;
-		tile+= tilex;
+		target += ofs;
+		tile += tilex;
 	}
 }
 
@@ -682,14 +682,14 @@ void render_result_merge(RenderResult *rr, RenderResult *rrpart)
 	RenderLayer *rl, *rlp;
 	RenderPass *rpass, *rpassp;
 	
-	for (rl= rr->layers.first, rlp= rrpart->layers.first; rl && rlp; rl= rl->next, rlp= rlp->next) {
+	for (rl = rr->layers.first, rlp = rrpart->layers.first; rl && rlp; rl = rl->next, rlp = rlp->next) {
 		
 		/* combined */
 		if (rl->rectf && rlp->rectf)
 			do_merge_tile(rr, rrpart, rl->rectf, rlp->rectf, 4);
 		
 		/* passes are allocated in sync */
-		for (rpass= rl->passes.first, rpassp= rlp->passes.first; rpass && rpassp; rpass= rpass->next, rpassp= rpassp->next) {
+		for (rpass = rl->passes.first, rpassp = rlp->passes.first; rpass && rpassp; rpass = rpass->next, rpassp = rpassp->next) {
 			do_merge_tile(rr, rrpart, rpass->rect, rpassp->rect, rpass->channels);
 		}
 	}
@@ -702,10 +702,10 @@ static char *make_pass_name(RenderPass *rpass, int chan)
 	int len;
 	
 	BLI_strncpy(name, rpass->name, EXR_PASS_MAXNAME);
-	len= strlen(name);
-	name[len]= '.';
-	name[len+1]= rpass->chan_id[chan];
-	name[len+2]= 0;
+	len = strlen(name);
+	name[len] = '.';
+	name[len + 1] = rpass->chan_id[chan];
+	name[len + 2] = 0;
 
 	return name;
 }
@@ -716,40 +716,40 @@ int RE_WriteRenderResult(ReportList *reports, RenderResult *rr, const char *file
 {
 	RenderLayer *rl;
 	RenderPass *rpass;
-	void *exrhandle= IMB_exr_get_handle();
+	void *exrhandle = IMB_exr_get_handle();
 	int success;
 
 	BLI_make_existing_file(filename);
 	
 	/* composite result */
 	if (rr->rectf) {
-		IMB_exr_add_channel(exrhandle, "Composite", "Combined.R", 4, 4*rr->rectx, rr->rectf);
-		IMB_exr_add_channel(exrhandle, "Composite", "Combined.G", 4, 4*rr->rectx, rr->rectf+1);
-		IMB_exr_add_channel(exrhandle, "Composite", "Combined.B", 4, 4*rr->rectx, rr->rectf+2);
-		IMB_exr_add_channel(exrhandle, "Composite", "Combined.A", 4, 4*rr->rectx, rr->rectf+3);
+		IMB_exr_add_channel(exrhandle, "Composite", "Combined.R", 4, 4 * rr->rectx, rr->rectf);
+		IMB_exr_add_channel(exrhandle, "Composite", "Combined.G", 4, 4 * rr->rectx, rr->rectf + 1);
+		IMB_exr_add_channel(exrhandle, "Composite", "Combined.B", 4, 4 * rr->rectx, rr->rectf + 2);
+		IMB_exr_add_channel(exrhandle, "Composite", "Combined.A", 4, 4 * rr->rectx, rr->rectf + 3);
 	}
 	
 	/* add layers/passes and assign channels */
-	for (rl= rr->layers.first; rl; rl= rl->next) {
+	for (rl = rr->layers.first; rl; rl = rl->next) {
 		
 		/* combined */
 		if (rl->rectf) {
-			int a, xstride= 4;
-			for (a=0; a<xstride; a++)
+			int a, xstride = 4;
+			for (a = 0; a < xstride; a++)
 				IMB_exr_add_channel(exrhandle, rl->name, get_pass_name(SCE_PASS_COMBINED, a), 
-									xstride, xstride*rr->rectx, rl->rectf+a);
+				                    xstride, xstride * rr->rectx, rl->rectf + a);
 		}
 		
 		/* passes are allocated in sync */
-		for (rpass= rl->passes.first; rpass; rpass= rpass->next) {
-			int a, xstride= rpass->channels;
-			for (a=0; a<xstride; a++) {
+		for (rpass = rl->passes.first; rpass; rpass = rpass->next) {
+			int a, xstride = rpass->channels;
+			for (a = 0; a < xstride; a++) {
 				if (rpass->passtype)
 					IMB_exr_add_channel(exrhandle, rl->name, get_pass_name(rpass->passtype, a), 
-										xstride, xstride*rr->rectx, rpass->rect+a);
+					                    xstride, xstride * rr->rectx, rpass->rect + a);
 				else
 					IMB_exr_add_channel(exrhandle, rl->name, make_pass_name(rpass, a), 
-										xstride, xstride*rr->rectx, rpass->rect+a);
+					                    xstride, xstride * rr->rectx, rpass->rect + a);
 			}
 		}
 	}
@@ -757,12 +757,12 @@ int RE_WriteRenderResult(ReportList *reports, RenderResult *rr, const char *file
 	/* when the filename has no permissions, this can fail */
 	if (IMB_exr_begin_write(exrhandle, filename, rr->rectx, rr->recty, compress)) {
 		IMB_exr_write_channels(exrhandle);
-		success= TRUE;
+		success = TRUE;
 	}
 	else {
 		/* TODO, get the error from openexr's exception */
 		BKE_report(reports, RPT_ERROR, "Error Writing Render Result, see console");
-		success= FALSE;
+		success = FALSE;
 	}
 	IMB_exr_close(exrhandle);
 
@@ -778,8 +778,8 @@ void render_result_single_layer_begin(Render *re)
 	/* officially pushed result should be NULL... error can happen with do_seq */
 	RE_FreeRenderResult(re->pushedresult);
 	
-	re->pushedresult= re->result;
-	re->result= NULL;
+	re->pushedresult = re->result;
+	re->result = NULL;
 }
 
 /* if scemode is R_SINGLE_LAYER, at end of rendering, merge the both render results */
@@ -790,7 +790,7 @@ void render_result_single_layer_end(Render *re)
 	RenderLayer *rl;
 	int nr;
 
-	if (re->result==NULL) {
+	if (re->result == NULL) {
 		printf("pop render result error; no current result!\n");
 		return;
 	}
@@ -798,19 +798,19 @@ void render_result_single_layer_end(Render *re)
 	if (!re->pushedresult)
 		return;
 
-	if (re->pushedresult->rectx==re->result->rectx && re->pushedresult->recty==re->result->recty) {
+	if (re->pushedresult->rectx == re->result->rectx && re->pushedresult->recty == re->result->recty) {
 		/* find which layer in re->pushedresult should be replaced */
-		rl= re->result->layers.first;
+		rl = re->result->layers.first;
 		
 		/* render result should be empty after this */
 		BLI_remlink(&re->result->layers, rl);
 		
 		/* reconstruct render result layers */
-		for (nr=0, srl= re->scene->r.layers.first; srl; srl= srl->next, nr++) {
-			if (nr==re->r.actlay)
+		for (nr = 0, srl = re->scene->r.layers.first; srl; srl = srl->next, nr++) {
+			if (nr == re->r.actlay)
 				BLI_addtail(&re->result->layers, rl);
 			else {
-				rlpush= RE_GetRenderLayer(re->pushedresult, srl->name);
+				rlpush = RE_GetRenderLayer(re->pushedresult, srl->name);
 				if (rlpush) {
 					BLI_remlink(&re->pushedresult->layers, rlpush);
 					BLI_addtail(&re->result->layers, rlpush);
@@ -820,7 +820,7 @@ void render_result_single_layer_end(Render *re)
 	}
 
 	RE_FreeRenderResult(re->pushedresult);
-	re->pushedresult= NULL;
+	re->pushedresult = NULL;
 }
 
 /************************* EXR Tile File Rendering ***************************/
@@ -833,35 +833,35 @@ static void save_render_result_tile(RenderResult *rr, RenderResult *rrpart)
 	
 	BLI_lock_thread(LOCK_IMAGE);
 	
-	for (rlp= rrpart->layers.first; rlp; rlp= rlp->next) {
+	for (rlp = rrpart->layers.first; rlp; rlp = rlp->next) {
 		
-		if (rrpart->crop) {	/* filters add pixel extra */
-			offs= (rrpart->crop + rrpart->crop*rrpart->rectx);
+		if (rrpart->crop) { /* filters add pixel extra */
+			offs = (rrpart->crop + rrpart->crop * rrpart->rectx);
 		}
 		else {
-			offs= 0;
+			offs = 0;
 		}
 		
 		/* combined */
 		if (rlp->rectf) {
-			int a, xstride= 4;
-			for (a=0; a<xstride; a++)
+			int a, xstride = 4;
+			for (a = 0; a < xstride; a++)
 				IMB_exr_set_channel(rr->exrhandle, rlp->name, get_pass_name(SCE_PASS_COMBINED, a), 
-								xstride, xstride*rrpart->rectx, rlp->rectf+a + xstride*offs);
+				                    xstride, xstride * rrpart->rectx, rlp->rectf + a + xstride * offs);
 		}
 		
 		/* passes are allocated in sync */
-		for (rpassp= rlp->passes.first; rpassp; rpassp= rpassp->next) {
-			int a, xstride= rpassp->channels;
-			for (a=0; a<xstride; a++)
+		for (rpassp = rlp->passes.first; rpassp; rpassp = rpassp->next) {
+			int a, xstride = rpassp->channels;
+			for (a = 0; a < xstride; a++)
 				IMB_exr_set_channel(rr->exrhandle, rlp->name, get_pass_name(rpassp->passtype, a), 
-									xstride, xstride*rrpart->rectx, rpassp->rect+a + xstride*offs);
+				                    xstride, xstride * rrpart->rectx, rpassp->rect + a + xstride * offs);
 		}
 		
 	}
 
-	party= rrpart->tilerect.ymin + rrpart->crop;
-	partx= rrpart->tilerect.xmin + rrpart->crop;
+	party = rrpart->tilerect.ymin + rrpart->crop;
+	partx = rrpart->tilerect.xmin + rrpart->crop;
 	IMB_exrtile_write_channels(rr->exrhandle, partx, party, 0);
 
 	BLI_unlock_thread(LOCK_IMAGE);
@@ -872,13 +872,13 @@ static void save_empty_result_tiles(Render *re)
 	RenderPart *pa;
 	RenderResult *rr;
 	
-	for (rr= re->result; rr; rr= rr->next) {
+	for (rr = re->result; rr; rr = rr->next) {
 		IMB_exrtile_clear_channels(rr->exrhandle);
 		
-		for (pa= re->parts.first; pa; pa= pa->next) {
-			if (pa->ready==0) {
-				int party= pa->disprect.ymin - re->disprect.ymin + pa->crop;
-				int partx= pa->disprect.xmin - re->disprect.xmin + pa->crop;
+		for (pa = re->parts.first; pa; pa = pa->next) {
+			if (pa->ready == 0) {
+				int party = pa->disprect.ymin - re->disprect.ymin + pa->crop;
+				int partx = pa->disprect.xmin - re->disprect.xmin + pa->crop;
 				IMB_exrtile_write_channels(rr->exrhandle, partx, party, 0);
 			}
 		}
@@ -891,7 +891,7 @@ void render_result_exr_file_begin(Render *re)
 	RenderResult *rr;
 	char str[FILE_MAX];
 	
-	for (rr= re->result; rr; rr= rr->next) {
+	for (rr = re->result; rr; rr = rr->next) {
 		render_result_exr_file_path(re->scene, rr->sample_nr, str);
 	
 		printf("write exr tmp file, %dx%d, %s\n", rr->rectx, rr->recty, str);
@@ -906,13 +906,13 @@ void render_result_exr_file_end(Render *re)
 
 	save_empty_result_tiles(re);
 	
-	for (rr= re->result; rr; rr= rr->next) {
+	for (rr = re->result; rr; rr = rr->next) {
 		IMB_exr_close(rr->exrhandle);
-		rr->exrhandle= NULL;
+		rr->exrhandle = NULL;
 	}
 	
 	render_result_free_list(&re->fullresult, re->result);
-	re->result= NULL;
+	re->result = NULL;
 
 	render_result_exr_file_read(re, 0);
 }
@@ -920,22 +920,22 @@ void render_result_exr_file_end(Render *re)
 /* save part into exr file */
 void render_result_exr_file_merge(RenderResult *rr, RenderResult *rrpart)
 {
-	for (; rr && rrpart; rr= rr->next, rrpart= rrpart->next)
+	for (; rr && rrpart; rr = rr->next, rrpart = rrpart->next)
 		save_render_result_tile(rr, rrpart);
 }
 
 /* path to temporary exr file */
 void render_result_exr_file_path(Scene *scene, int sample, char *filepath)
 {
-	char di[FILE_MAX], name[FILE_MAXFILE+MAX_ID_NAME+100], fi[FILE_MAXFILE];
+	char di[FILE_MAX], name[FILE_MAXFILE + MAX_ID_NAME + 100], fi[FILE_MAXFILE];
 	
 	BLI_strncpy(di, G.main->name, FILE_MAX);
 	BLI_splitdirstring(di, fi);
 	
-	if (sample==0)
-		BLI_snprintf(name, sizeof(name), "%s_%s.exr", fi, scene->id.name+2);
+	if (sample == 0)
+		BLI_snprintf(name, sizeof(name), "%s_%s.exr", fi, scene->id.name + 2);
 	else
-		BLI_snprintf(name, sizeof(name), "%s_%s%d.exr", fi, scene->id.name+2, sample);
+		BLI_snprintf(name, sizeof(name), "%s_%s%d.exr", fi, scene->id.name + 2, sample);
 
 	BLI_make_file_string("/", filepath, BLI_temporary_dir(), name);
 }
@@ -947,17 +947,17 @@ int render_result_exr_file_read(Render *re, int sample)
 	int success;
 
 	RE_FreeRenderResult(re->result);
-	re->result= render_result_new(re, &re->disprect, 0, RR_USE_MEM);
+	re->result = render_result_new(re, &re->disprect, 0, RR_USE_MEM);
 
 	render_result_exr_file_path(re->scene, sample, str);
 	printf("read exr tmp file: %s\n", str);
 
 	if (render_result_exr_file_read_path(re->result, str)) {
-		success= TRUE;
+		success = TRUE;
 	}
 	else {
 		printf("cannot read: %s\n", str);
-		success= FALSE;
+		success = FALSE;
 
 	}
 
@@ -969,16 +969,16 @@ int render_result_exr_file_read_path(RenderResult *rr, const char *filepath)
 {
 	RenderLayer *rl;
 	RenderPass *rpass;
-	void *exrhandle= IMB_exr_get_handle();
+	void *exrhandle = IMB_exr_get_handle();
 	int rectx, recty;
 
-	if (IMB_exr_begin_read(exrhandle, filepath, &rectx, &recty)==0) {
+	if (IMB_exr_begin_read(exrhandle, filepath, &rectx, &recty) == 0) {
 		printf("failed being read %s\n", filepath);
 		IMB_exr_close(exrhandle);
 		return 0;
 	}
 
-	if (rr == NULL || rectx!=rr->rectx || recty!=rr->recty) {
+	if (rr == NULL || rectx != rr->rectx || recty != rr->recty) {
 		if (rr)
 			printf("error in reading render result: dimensions don't match\n");
 		else
@@ -987,21 +987,21 @@ int render_result_exr_file_read_path(RenderResult *rr, const char *filepath)
 		return 0;
 	}
 
-	for (rl= rr->layers.first; rl; rl= rl->next) {
+	for (rl = rr->layers.first; rl; rl = rl->next) {
 		/* combined */
 		if (rl->rectf) {
-			int a, xstride= 4;
-			for (a=0; a<xstride; a++)
+			int a, xstride = 4;
+			for (a = 0; a < xstride; a++)
 				IMB_exr_set_channel(exrhandle, rl->name, get_pass_name(SCE_PASS_COMBINED, a), 
-									xstride, xstride*rectx, rl->rectf+a);
+				                    xstride, xstride * rectx, rl->rectf + a);
 		}
 		
 		/* passes are allocated in sync */
-		for (rpass= rl->passes.first; rpass; rpass= rpass->next) {
-			int a, xstride= rpass->channels;
-			for (a=0; a<xstride; a++)
+		for (rpass = rl->passes.first; rpass; rpass = rpass->next) {
+			int a, xstride = rpass->channels;
+			for (a = 0; a < xstride; a++)
 				IMB_exr_set_channel(exrhandle, rl->name, get_pass_name(rpass->passtype, a), 
-									xstride, xstride*rectx, rpass->rect+a);
+				                    xstride, xstride * rectx, rpass->rect + a);
 
 			BLI_strncpy(rpass->name, get_pass_name(rpass->passtype, -1), sizeof(rpass->name));
 		}
@@ -1017,23 +1017,23 @@ int render_result_exr_file_read_path(RenderResult *rr, const char *filepath)
 
 ImBuf *render_result_rect_to_ibuf(RenderResult *rr, RenderData *rd)
 {
-	int flags = (rd->color_mgt_flag & R_COLOR_MANAGEMENT_PREDIVIDE)? IB_cm_predivide: 0;
-	ImBuf *ibuf= IMB_allocImBuf(rr->rectx, rr->recty, rd->im_format.planes, flags);
+	int flags = (rd->color_mgt_flag & R_COLOR_MANAGEMENT_PREDIVIDE) ? IB_cm_predivide : 0;
+	ImBuf *ibuf = IMB_allocImBuf(rr->rectx, rr->recty, rd->im_format.planes, flags);
 	
 	/* if not exists, BKE_imbuf_write makes one */
-	ibuf->rect= (unsigned int *)rr->rect32;    
-	ibuf->rect_float= rr->rectf;
-	ibuf->zbuf_float= rr->rectz;
+	ibuf->rect = (unsigned int *)rr->rect32;
+	ibuf->rect_float = rr->rectf;
+	ibuf->zbuf_float = rr->rectz;
 	
 	/* float factor for random dither, imbuf takes care of it */
-	ibuf->dither= rd->dither_intensity;
+	ibuf->dither = rd->dither_intensity;
 	
 	/* prepare to gamma correct to sRGB color space */
 	if (rd->color_mgt_flag & R_COLOR_MANAGEMENT) {
 		/* sequence editor can generate 8bpc render buffers */
 		if (ibuf->rect) {
 			ibuf->profile = IB_PROFILE_SRGB;
-			if (BKE_imtype_valid_depths(rd->im_format.imtype) & (R_IMF_CHAN_DEPTH_12|R_IMF_CHAN_DEPTH_16|R_IMF_CHAN_DEPTH_24|R_IMF_CHAN_DEPTH_32))
+			if (BKE_imtype_valid_depths(rd->im_format.imtype) & (R_IMF_CHAN_DEPTH_12 | R_IMF_CHAN_DEPTH_16 | R_IMF_CHAN_DEPTH_24 | R_IMF_CHAN_DEPTH_32))
 				IMB_float_from_rect(ibuf);
 		}
 		else {
@@ -1044,10 +1044,10 @@ ImBuf *render_result_rect_to_ibuf(RenderResult *rr, RenderData *rd)
 	/* color -> greyscale */
 	/* editing directly would alter the render view */
 	if (rd->im_format.planes == R_IMF_PLANES_BW) {
-		ImBuf *ibuf_bw= IMB_dupImBuf(ibuf);
+		ImBuf *ibuf_bw = IMB_dupImBuf(ibuf);
 		IMB_color_to_bw(ibuf_bw);
 		IMB_freeImBuf(ibuf);
-		ibuf= ibuf_bw;
+		ibuf = ibuf_bw;
 	}
 
 	return ibuf;
@@ -1058,34 +1058,34 @@ void render_result_rect_from_ibuf(RenderResult *rr, RenderData *rd, ImBuf *ibuf)
 	if (ibuf->rect_float) {
 		/* color management: when off ensure rectf is non-lin, since thats what the internal
 		 * render engine delivers */
-		int profile_to= (rd->color_mgt_flag & R_COLOR_MANAGEMENT)? IB_PROFILE_LINEAR_RGB: IB_PROFILE_SRGB;
-		int profile_from= (ibuf->profile == IB_PROFILE_LINEAR_RGB)? IB_PROFILE_LINEAR_RGB: IB_PROFILE_SRGB;
-		int predivide= (rd->color_mgt_flag & R_COLOR_MANAGEMENT_PREDIVIDE);
+		int profile_to = (rd->color_mgt_flag & R_COLOR_MANAGEMENT) ? IB_PROFILE_LINEAR_RGB : IB_PROFILE_SRGB;
+		int profile_from = (ibuf->profile == IB_PROFILE_LINEAR_RGB) ? IB_PROFILE_LINEAR_RGB : IB_PROFILE_SRGB;
+		int predivide = (rd->color_mgt_flag & R_COLOR_MANAGEMENT_PREDIVIDE);
 
 		if (!rr->rectf)
-			rr->rectf= MEM_mallocN(4*sizeof(float)*rr->rectx*rr->recty, "render_seq rectf");
+			rr->rectf = MEM_mallocN(4 * sizeof(float) * rr->rectx * rr->recty, "render_seq rectf");
 		
 		IMB_buffer_float_from_float(rr->rectf, ibuf->rect_float,
-			4, profile_to, profile_from, predivide,
-			rr->rectx, rr->recty, rr->rectx, rr->rectx);
+		                            4, profile_to, profile_from, predivide,
+		                            rr->rectx, rr->recty, rr->rectx, rr->rectx);
 		
 		/* TSK! Since sequence render doesn't free the *rr render result, the old rect32
 		 * can hang around when sequence render has rendered a 32 bits one before */
 		if (rr->rect32) {
 			MEM_freeN(rr->rect32);
-			rr->rect32= NULL;
+			rr->rect32 = NULL;
 		}
 	}
 	else if (ibuf->rect) {
 		if (!rr->rect32)
-			rr->rect32= MEM_mallocN(sizeof(int)*rr->rectx*rr->recty, "render_seq rect");
+			rr->rect32 = MEM_mallocN(sizeof(int) * rr->rectx * rr->recty, "render_seq rect");
 
-		memcpy(rr->rect32, ibuf->rect, 4*rr->rectx*rr->recty);
+		memcpy(rr->rect32, ibuf->rect, 4 * rr->rectx * rr->recty);
 
 		/* Same things as above, old rectf can hang around from previous render. */
 		if (rr->rectf) {
 			MEM_freeN(rr->rectf);
-			rr->rectf= NULL;
+			rr->rectf = NULL;
 		}
 	}
 }
@@ -1093,29 +1093,29 @@ void render_result_rect_from_ibuf(RenderResult *rr, RenderData *rd, ImBuf *ibuf)
 void render_result_rect_fill_zero(RenderResult *rr)
 {
 	if (rr->rectf)
-		memset(rr->rectf, 0, 4*sizeof(float)*rr->rectx*rr->recty);
+		memset(rr->rectf, 0, 4 * sizeof(float) * rr->rectx * rr->recty);
 	else if (rr->rect32)
-		memset(rr->rect32, 0, 4*rr->rectx*rr->recty);
+		memset(rr->rect32, 0, 4 * rr->rectx * rr->recty);
 	else
-		rr->rect32= MEM_callocN(sizeof(int)*rr->rectx*rr->recty, "render_seq rect");
+		rr->rect32 = MEM_callocN(sizeof(int) * rr->rectx * rr->recty, "render_seq rect");
 }
 
 void render_result_rect_get_pixels(RenderResult *rr, RenderData *rd, unsigned int *rect, int rectx, int recty)
 {
 	if (rr->rect32) {
-		memcpy(rect, rr->rect32, sizeof(int)*rr->rectx*rr->recty);
+		memcpy(rect, rr->rect32, sizeof(int) * rr->rectx * rr->recty);
 	}
 	else if (rr->rectf) {
-		int profile_from= (rd->color_mgt_flag & R_COLOR_MANAGEMENT)? IB_PROFILE_LINEAR_RGB: IB_PROFILE_SRGB;
-		int predivide= (rd->color_mgt_flag & R_COLOR_MANAGEMENT_PREDIVIDE);
-		int dither= 0;
+		int profile_from = (rd->color_mgt_flag & R_COLOR_MANAGEMENT) ? IB_PROFILE_LINEAR_RGB : IB_PROFILE_SRGB;
+		int predivide = (rd->color_mgt_flag & R_COLOR_MANAGEMENT_PREDIVIDE);
+		int dither = 0;
 
-		IMB_buffer_byte_from_float((unsigned char*)rect, rr->rectf,
-			4, dither, IB_PROFILE_SRGB, profile_from, predivide,
-			rr->rectx, rr->recty, rr->rectx, rr->rectx);
+		IMB_buffer_byte_from_float((unsigned char *)rect, rr->rectf,
+		                           4, dither, IB_PROFILE_SRGB, profile_from, predivide,
+		                           rr->rectx, rr->recty, rr->rectx, rr->rectx);
 	}
 	else
 		/* else fill with black */
-		memset(rect, 0, sizeof(int)*rectx*recty);
+		memset(rect, 0, sizeof(int) * rectx * recty);
 }
 
diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c
index 7e8a1fbc53e..f6fe8e8974d 100644
--- a/source/blender/render/intern/source/render_texture.c
+++ b/source/blender/render/intern/source/render_texture.c
@@ -54,7 +54,6 @@
 #include "BKE_colortools.h"
 #include "BKE_image.h"
 #include "BKE_node.h"
-#include "BKE_plugin_types.h"
 
 #include "BKE_animsys.h"
 #include "BKE_DerivedMesh.h"
@@ -103,13 +102,6 @@ static void init_render_texture(Render *re, Tex *tex)
 		BKE_image_user_frame_calc(&tex->iuser, cfra, re?re->flag & R_SEC_FIELD:0);
 	}
 	
-	if (tex->type==TEX_PLUGIN) {
-		if (tex->plugin && tex->plugin->doit) {
-			if (tex->plugin->cfra) {
-				*(tex->plugin->cfra)= (float)cfra; //BKE_scene_frame_get(re->scene); // XXX old animsys - timing stuff to be fixed 
-			}
-		}
-	}
 	else if (tex->type==TEX_ENVMAP) {
 		/* just in case */
 		tex->imaflag |= TEX_INTERPOL | TEX_MIPMAP;
@@ -747,74 +739,7 @@ static int texnoise(Tex *tex, TexResult *texres)
 
 /* ------------------------------------------------------------------------- */
 
-static int plugintex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, TexResult *texres)
-{
-	PluginTex *pit;
-	int rgbnor=0;
-	float result[8]= {0.0f};
-
-	texres->tin= 0.0;
-
-	pit= tex->plugin;
-	if (pit && pit->doit) {
-		if (texres->nor) {
-			if (pit->version < 6) {
-				copy_v3_v3(pit->result+5, texres->nor);
-			}
-			else {
-				copy_v3_v3(result+5, texres->nor);
-			}
-		}
-		if (pit->version < 6) {
-			if (osatex) rgbnor= ((TexDoitold)pit->doit)(tex->stype,
-				pit->data, texvec, dxt, dyt);
-			else rgbnor= ((TexDoitold)pit->doit)(tex->stype, 
-				pit->data, texvec, NULL, NULL);
-		}
-		else {
-			if (osatex) rgbnor= ((TexDoit)pit->doit)(tex->stype,
-				pit->data, texvec, dxt, dyt, result);
-			else rgbnor= ((TexDoit)pit->doit)(tex->stype, 
-				pit->data, texvec, NULL, NULL, result);
-		}
-
-		if (pit->version < 6) {
-			texres->tin = pit->result[0];
-		}
-		else {
-			texres->tin = result[0]; /* XXX, assigning garbage value, fixme! */
-		}
-
-		if (rgbnor & TEX_NOR) {
-			if (texres->nor) {
-				if (pit->version < 6) {
-					copy_v3_v3(texres->nor, pit->result+5);
-				}
-				else {
-					copy_v3_v3(texres->nor, result+5);
-				}
-			}
-		}
-		
-		if (rgbnor & TEX_RGB) {
-			if (pit->version < 6) {
-				copy_v4_v4(&texres->tr, pit->result + 1);
-			}
-			else {
-				copy_v4_v4(&texres->tr, result + 1);
-			}
-
-			BRICONTRGB;
-		}
-		
-		BRICONT;
-	}
-
-	return rgbnor;
-}
-
-
-static int cubemap_glob(float *n, float x, float y, float z, float *adr1, float *adr2)
+static int cubemap_glob(const float n[3], float x, float y, float z, float *adr1, float *adr2)
 {
 	float x1, y1, z1, nor[3];
 	int ret;
@@ -852,7 +777,7 @@ static int cubemap_glob(float *n, float x, float y, float z, float *adr1, float
 /* ------------------------------------------------------------------------- */
 
 /* mtex argument only for projection switches */
-static int cubemap(MTex *mtex, VlakRen *vlr, float *n, float x, float y, float z, float *adr1, float *adr2)
+static int cubemap(MTex *mtex, VlakRen *vlr, const float n[3], float x, float y, float z, float *adr1, float *adr2)
 {
 	int proj[4]={0, ME_PROJXY, ME_PROJXZ, ME_PROJYZ}, ret= 0;
 	
@@ -910,7 +835,7 @@ static int cubemap(MTex *mtex, VlakRen *vlr, float *n, float x, float y, float z
 
 /* ------------------------------------------------------------------------- */
 
-static int cubemap_ob(Object *ob, float *n, float x, float y, float z, float *adr1, float *adr2)
+static int cubemap_ob(Object *ob, const float n[3], float x, float y, float z, float *adr1, float *adr2)
 {
 	float x1, y1, z1, nor[3];
 	int ret;
@@ -944,7 +869,7 @@ static int cubemap_ob(Object *ob, float *n, float x, float y, float z, float *ad
 
 /* ------------------------------------------------------------------------- */
 
-static void do_2d_mapping(MTex *mtex, float *t, VlakRen *vlr, float *n, float *dxt, float *dyt)
+static void do_2d_mapping(MTex *mtex, float *t, VlakRen *vlr, const float n[3], float *dxt, float *dyt)
 {
 	Tex *tex;
 	Object *ob= NULL;
@@ -1210,9 +1135,6 @@ static int multitex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex,
 		else retval= imagewrap(tex, tex->ima, NULL, texvec, texres); 
 		BKE_image_tag_time(tex->ima); /* tag image as having being used */
 		break;
-	case TEX_PLUGIN:
-		retval= plugintex(tex, texvec, dxt, dyt, osatex, texres);
-		break;
 	case TEX_ENVMAP:
 		retval= envmaptex(tex, texvec, dxt, dyt, osatex, texres);
 		break;
@@ -2690,7 +2612,7 @@ void do_material_tex(ShadeInput *shi, Render *re)
 }
 
 
-void do_volume_tex(ShadeInput *shi, const float *xyz, int mapto_flag, float *col, float *val, Render *re)
+void do_volume_tex(ShadeInput *shi, const float *xyz, int mapto_flag, float col_r[3], float *val, Render *re)
 {
 	MTex *mtex;
 	Tex *tex;
@@ -2811,17 +2733,17 @@ void do_volume_tex(ShadeInput *shi, const float *xyz, int mapto_flag, float *col
 				/* used for emit */
 				if ((mapto_flag & MAP_EMISSION_COL) && (mtex->mapto & MAP_EMISSION_COL)) {
 					float colemitfac= mtex->colemitfac*stencilTin;
-					texture_rgb_blend(col, tcol, col, texres.tin, colemitfac, mtex->blendtype);
+					texture_rgb_blend(col_r, tcol, col_r, texres.tin, colemitfac, mtex->blendtype);
 				}
 				
 				if ((mapto_flag & MAP_REFLECTION_COL) && (mtex->mapto & MAP_REFLECTION_COL)) {
 					float colreflfac= mtex->colreflfac*stencilTin;
-					texture_rgb_blend(col, tcol, col, texres.tin, colreflfac, mtex->blendtype);
+					texture_rgb_blend(col_r, tcol, col_r, texres.tin, colreflfac, mtex->blendtype);
 				}
 				
 				if ((mapto_flag & MAP_TRANSMISSION_COL) && (mtex->mapto & MAP_TRANSMISSION_COL)) {
 					float coltransfac= mtex->coltransfac*stencilTin;
-					texture_rgb_blend(col, tcol, col, texres.tin, coltransfac, mtex->blendtype);
+					texture_rgb_blend(col_r, tcol, col_r, texres.tin, coltransfac, mtex->blendtype);
 				}
 			}
 			
@@ -3508,7 +3430,7 @@ void render_realtime_texture(ShadeInput *shi, Image *ima)
 
 /* A modified part of shadeinput.c -> shade_input_set_uv()
  *  Used for sampling UV mapped texture color */
-static void textured_face_generate_uv(float *uv, float *normal, float *hit, float *v1, float *v2, float *v3)
+static void textured_face_generate_uv(float *uv, const float normal[3], float *hit, float *v1, float *v2, float *v3)
 {
 
 	float detsh, t00, t10, t01, t11;
@@ -3612,8 +3534,7 @@ Material *RE_init_sample_material(Material *orig_mat, Scene *scene)
 
 			/* update image sequences and movies */
 			if (tex->ima && ELEM(tex->ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE)) {
-				if (tex->iuser.flag & IMA_ANIM_ALWAYS)
-					BKE_image_user_frame_calc(&tex->iuser, (int)scene->r.cfra, 0);
+				BKE_image_user_check_frame_calc(&tex->iuser, (int)scene->r.cfra, 0);
 			}
 		}
 	}
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c
index 7addc1e6679..931a81f2543 100644
--- a/source/blender/render/intern/source/rendercore.c
+++ b/source/blender/render/intern/source/rendercore.c
@@ -1509,7 +1509,7 @@ static void addps_sss(void *cb_handle, int obi, int facenr, int x, int y, int z)
 	}
 }
 
-static void shade_sample_sss(ShadeSample *ssamp, Material *mat, ObjectInstanceRen *obi, VlakRen *vlr, int quad, float x, float y, float z, float *co, float *color, float *area)
+static void shade_sample_sss(ShadeSample *ssamp, Material *mat, ObjectInstanceRen *obi, VlakRen *vlr, int quad, float x, float y, float z, float *co, float color[3], float *area)
 {
 	ShadeInput *shi= ssamp->shi;
 	ShadeResult shr;
diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c
index bc61a26564d..85d0c36be1a 100644
--- a/source/blender/render/intern/source/renderdatabase.c
+++ b/source/blender/render/intern/source/renderdatabase.c
@@ -444,16 +444,16 @@ VlakRen *RE_vlakren_copy(ObjectRen *obr, VlakRen *vlr)
 	return vlr1;
 }
 
-void RE_vlakren_get_normal(Render *UNUSED(re), ObjectInstanceRen *obi, VlakRen *vlr, float *nor)
+void RE_vlakren_get_normal(Render *UNUSED(re), ObjectInstanceRen *obi, VlakRen *vlr, float r_nor[3])
 {
 	float (*nmat)[3]= obi->nmat;
 
 	if (obi->flag & R_TRANSFORMED) {
-		mul_v3_m3v3(nor, nmat, vlr->n);
-		normalize_v3(nor);
+		mul_v3_m3v3(r_nor, nmat, vlr->n);
+		normalize_v3(r_nor);
 	}
 	else {
-		copy_v3_v3(nor, vlr->n);
+		copy_v3_v3(r_nor, vlr->n);
 	}
 }
 
@@ -931,8 +931,9 @@ HaloRen *RE_findOrAddHalo(ObjectRen *obr, int nr)
 
 /* ------------------------------------------------------------------------- */
 
-HaloRen *RE_inithalo(Render *re, ObjectRen *obr, Material *ma,   float *vec,   float *vec1, 
-				  float *orco,   float hasize,   float vectsize, int seed)
+HaloRen *RE_inithalo(Render *re, ObjectRen *obr, Material *ma,
+                     const float vec[3], const float vec1[3],
+                     const float *orco, float hasize, float vectsize, int seed)
 {
 	HaloRen *har;
 	MTex *mtex;
@@ -1044,8 +1045,9 @@ HaloRen *RE_inithalo(Render *re, ObjectRen *obr, Material *ma,   float *vec,   f
 	return har;
 }
 
-HaloRen *RE_inithalo_particle(Render *re, ObjectRen *obr, DerivedMesh *dm, Material *ma,   float *vec,   float *vec1, 
-				  float *orco, float *uvco, float hasize, float vectsize, int seed, float *pa_co)
+HaloRen *RE_inithalo_particle(Render *re, ObjectRen *obr, DerivedMesh *dm, Material *ma,
+                              const float vec[3], const float vec1[3],
+                              const float *orco, const float *uvco, float hasize, float vectsize, int seed, const float pa_co[3])
 {
 	HaloRen *har;
 	MTex *mtex;
diff --git a/source/blender/render/intern/source/shadbuf.c b/source/blender/render/intern/source/shadbuf.c
index b3167e15df5..93587734e2b 100644
--- a/source/blender/render/intern/source/shadbuf.c
+++ b/source/blender/render/intern/source/shadbuf.c
@@ -1449,7 +1449,7 @@ typedef struct ISBBranch {
 
 typedef struct BSPFace {
 	Boxf box;
-	float *v1, *v2, *v3, *v4;
+	const float *v1, *v2, *v3, *v4;
 	int obi;		/* object for face lookup */
 	int facenr;		/* index to retrieve VlakRen */
 	int type;		/* only for strand now */
@@ -1868,7 +1868,8 @@ static void isb_bsp_recalc_box(ISBBranch *root)
 }
 
 /* callback function for zbuf clip */
-static void isb_bsp_test_strand(ZSpan *zspan, int obi, int zvlnr, float *v1, float *v2, float *v3, float *v4)
+static void isb_bsp_test_strand(ZSpan *zspan, int obi, int zvlnr,
+                                const float *v1, const float *v2, const float *v3, const float *v4)
 {
 	BSPFace face;
 	
@@ -1902,7 +1903,8 @@ static void isb_bsp_test_strand(ZSpan *zspan, int obi, int zvlnr, float *v1, flo
 }
 
 /* callback function for zbuf clip */
-static void isb_bsp_test_face(ZSpan *zspan, int obi, int zvlnr, float *v1, float *v2, float *v3, float *v4) 
+static void isb_bsp_test_face(ZSpan *zspan, int obi, int zvlnr,
+                              const float *v1, const float *v2, const float *v3, const float *v4)
 {
 	BSPFace face;
 	
diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c
index a266914c085..82f2add7c3d 100644
--- a/source/blender/render/intern/source/shadeoutput.c
+++ b/source/blender/render/intern/source/shadeoutput.c
@@ -77,7 +77,7 @@ ListBase *get_lights(ShadeInput *shi)
 }
 
 #if 0
-static void fogcolor(float *colf, float *rco, float *view)
+static void fogcolor(const float colf[3], float *rco, float *view)
 {
 	float alpha, stepsize, startdist, dist, hor[4], zen[3], vec[3], dview[3];
 	float div=0.0f, distfac;
@@ -408,13 +408,13 @@ static double Normalize_d(double *n)
 }
 
 /* mix of 'real' fresnel and allowing control. grad defines blending gradient */
-float fresnel_fac(float *view, float *vn, float grad, float fac)
+float fresnel_fac(const float view[3], const float vn[3], float grad, float fac)
 {
 	float t1, t2;
 	
 	if (fac==0.0f) return 1.0f;
 	
-	t1= (view[0]*vn[0] + view[1]*vn[1] + view[2]*vn[2]);
+	t1 = dot_v3v3(view, vn);
 	if (t1>0.0f)  t2= 1.0f+t1;
 	else t2= 1.0f-t1;
 	
@@ -433,7 +433,7 @@ static double saacos_d(double fac)
 }
 
 /* Stoke's form factor. Need doubles here for extreme small area sizes */
-static float area_lamp_energy(float (*area)[3], float *co, float *vn)
+static float area_lamp_energy(float (*area)[3], const float co[3], const float vn[3])
 {
 	double fac;
 	double vec[4][3];	/* vectors of rendered co to vertices lamp */
@@ -451,11 +451,19 @@ static float area_lamp_energy(float (*area)[3], float *co, float *vn)
 	Normalize_d(vec[3]);
 
 	/* cross product */
+#define CROSS(dest, a, b) \
+	{ dest[0]= a[1] * b[2] - a[2] * b[1]; \
+	  dest[1]= a[2] * b[0] - a[0] * b[2]; \
+	  dest[2]= a[0] * b[1] - a[1] * b[0]; \
+	} (void)0
+
 	CROSS(cross[0], vec[0], vec[1]);
 	CROSS(cross[1], vec[1], vec[2]);
 	CROSS(cross[2], vec[2], vec[3]);
 	CROSS(cross[3], vec[3], vec[0]);
 
+#undef CROSS
+
 	Normalize_d(cross[0]);
 	Normalize_d(cross[1]);
 	Normalize_d(cross[2]);
@@ -482,7 +490,7 @@ static float area_lamp_energy(float (*area)[3], float *co, float *vn)
 	return fac;
 }
 
-static float area_lamp_energy_multisample(LampRen *lar, float *co, float *vn)
+static float area_lamp_energy_multisample(LampRen *lar, const float co[3], float *vn)
 {
 	/* corner vectors are moved around according lamp jitter */
 	float *jitlamp= lar->jitter, vec[3];
@@ -554,7 +562,7 @@ static float spec(float inp, int hard)
 	return inp;
 }
 
-static float Phong_Spec(float *n, float *l, float *v, int hard, int tangent )
+static float Phong_Spec(const float n[3], const float l[3], const float v[3], int hard, int tangent )
 {
 	float h[3];
 	float rslt;
@@ -575,7 +583,7 @@ static float Phong_Spec(float *n, float *l, float *v, int hard, int tangent )
 
 
 /* reduced cook torrance spec (for off-specular peak) */
-static float CookTorr_Spec(float *n, float *l, float *v, int hard, int tangent)
+static float CookTorr_Spec(const float n[3], const float l[3], const float v[3], int hard, int tangent)
 {
 	float i, nh, nv, h[3];
 
@@ -599,7 +607,7 @@ static float CookTorr_Spec(float *n, float *l, float *v, int hard, int tangent)
 }
 
 /* Blinn spec */
-static float Blinn_Spec(float *n, float *l, float *v, float refrac, float spec_power, int tangent)
+static float Blinn_Spec(const float n[3], const float l[3], const float v[3], float refrac, float spec_power, int tangent)
 {
 	float i, nh, nv, nl, vh, h[3];
 	float a, b, c, g=0.0f, p, f, ang;
@@ -653,7 +661,7 @@ static float Blinn_Spec(float *n, float *l, float *v, float refrac, float spec_p
 }
 
 /* cartoon render spec */
-static float Toon_Spec(float *n, float *l, float *v, float size, float smooth, int tangent)
+static float Toon_Spec(const float n[3], const float l[3], const float v[3], float size, float smooth, int tangent)
 {
 	float h[3];
 	float ang;
@@ -677,7 +685,7 @@ static float Toon_Spec(float *n, float *l, float *v, float size, float smooth, i
 }
 
 /* Ward isotropic gaussian spec */
-static float WardIso_Spec(float *n, float *l, float *v, float rms, int tangent)
+static float WardIso_Spec(const float n[3], const float l[3], const float v[3], float rms, int tangent)
 {
 	float i, nh, nv, nl, h[3], angle, alpha;
 
@@ -709,7 +717,7 @@ static float WardIso_Spec(float *n, float *l, float *v, float rms, int tangent)
 }
 
 /* cartoon render diffuse */
-static float Toon_Diff(float *n, float *l, float *UNUSED(v), float size, float smooth)
+static float Toon_Diff(const float n[3], const float l[3], const float UNUSED(v[3]), float size, float smooth)
 {
 	float rslt, ang;
 
@@ -728,7 +736,7 @@ static float Toon_Diff(float *n, float *l, float *UNUSED(v), float size, float s
 
 /* 'nl' is either dot product, or return value of area light */
 /* in latter case, only last multiplication uses 'nl' */
-static float OrenNayar_Diff(float nl, float *n, float *l, float *v, float rough )
+static float OrenNayar_Diff(float nl, const float n[3], const float l[3], const float v[3], float rough )
 {
 	float i/*, nh*/, nv /*, vh */, realnl, h[3];
 	float a, b, t, A, B;
@@ -788,7 +796,7 @@ static float OrenNayar_Diff(float nl, float *n, float *l, float *v, float rough
 }
 
 /* Minnaert diffuse */
-static float Minnaert_Diff(float nl, float *n, float *v, float darkness)
+static float Minnaert_Diff(float nl, const float n[3], const float v[3], float darkness)
 {
 
 	float i, nv;
diff --git a/source/blender/render/intern/source/sss.c b/source/blender/render/intern/source/sss.c
index 061cb7852db..46d52e83eda 100644
--- a/source/blender/render/intern/source/sss.c
+++ b/source/blender/render/intern/source/sss.c
@@ -810,12 +810,12 @@ void scatter_tree_build(ScatterTree *tree)
 	sum_radiance(tree, tree->root);
 }
 
-void scatter_tree_sample(ScatterTree *tree, float *co, float *color)
+void scatter_tree_sample(ScatterTree *tree, const float co[3], float color[3])
 {
 	float sco[3];
 
 	copy_v3_v3(sco, co);
-	mul_v3_fl(sco, 1.0f/tree->scale);
+	mul_v3_fl(sco, 1.0f / tree->scale);
 
 	compute_radiance(tree, sco, color);
 }
@@ -1025,7 +1025,7 @@ void free_sss(Render *re)
 	}
 }
 
-int sample_sss(Render *re, Material *mat, float *co, float *color)
+int sample_sss(Render *re, Material *mat, const float co[3], float color[3])
 {
 	if (re->sss_hash) {
 		SSSData *sss= BLI_ghash_lookup(re->sss_hash, mat);
diff --git a/source/blender/render/intern/source/strand.c b/source/blender/render/intern/source/strand.c
index 02d342754ea..0e7c8a13043 100644
--- a/source/blender/render/intern/source/strand.c
+++ b/source/blender/render/intern/source/strand.c
@@ -400,7 +400,7 @@ void strand_shade_segment(Render *re, StrandShadeCache *cache, StrandSegment *ss
 	interpolate_shade_result(&shr1, &shr2, t, ssamp->shr, addpassflag);
 
 	/* apply alpha along width */
-	if (sseg->buffer->widthfade != 0.0f) {
+	if (sseg->buffer->widthfade != -1.0f) {
 		s = 1.0f - powf(fabsf(s), sseg->buffer->widthfade);
 
 		strand_apply_shaderesult_alpha(ssamp->shr, s);
@@ -569,10 +569,10 @@ static void do_strand_fillac(void *handle, int x, int y, float u, float v, float
 
 #define CHECK_ADD(n) \
 	if (apn->p[n]==strnr && apn->obi[n]==obi && apn->seg[n]==seg) \
-	{ if (!(apn->mask[n] & mask)) { apn->mask[n] |= mask; apn->v[n] += t; apn->u[n] += s; } break; }
+	{ if (!(apn->mask[n] & mask)) { apn->mask[n] |= mask; apn->v[n] += t; apn->u[n] += s; } break; } (void)0
 #define CHECK_ASSIGN(n) \
 	if (apn->p[n]==0) \
-	{apn->obi[n]= obi; apn->p[n]= strnr; apn->z[n]= zverg; apn->mask[n]= mask; apn->v[n]= t; apn->u[n]= s; apn->seg[n]= seg; break; }
+	{apn->obi[n]= obi; apn->p[n]= strnr; apn->z[n]= zverg; apn->mask[n]= mask; apn->v[n]= t; apn->u[n]= s; apn->seg[n]= seg; break; } (void)0
 
 	/* add to pixel list */
 	if (zverg < bufferz && (spart->totapixbuf[offset] < MAX_ZROW)) {
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index b599da48803..e4c4e905aa6 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -68,19 +68,13 @@
 extern struct Render R;
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-/* luminance rec. 709 */
-BLI_INLINE float luminance(const float col[3])
-{
-	return (0.212671f*col[0] + 0.71516f*col[1] + 0.072169f*col[2]);
-}
-
 /* tracing */
 static float vol_get_shadow(ShadeInput *shi, LampRen *lar, const float co[3])
 {
 	float visibility = 1.f;
 	
 	if (lar->shb) {
-		float dxco[3]={0.f, 0.f, 0.f}, dyco[3]={0.f, 0.f, 0.f};
+		float dxco[3] = {0.f, 0.f, 0.f}, dyco[3] = {0.f, 0.f, 0.f};
 		
 		visibility = testshadowbuf(&R, lar->shb, co, dxco, dyco, 1.0, 0.0);		
 	}
@@ -89,7 +83,7 @@ static float vol_get_shadow(ShadeInput *shi, LampRen *lar, const float co[3])
 		Isect is;
 		
 		copy_v3_v3(is.start, co);
-		if (lar->type==LA_SUN || lar->type==LA_HEMI) {
+		if (lar->type == LA_SUN || lar->type == LA_HEMI) {
 			is.dir[0] = -lar->vec[0];
 			is.dir[1] = -lar->vec[1];
 			is.dir[2] = -lar->vec[2];
@@ -97,17 +91,17 @@ static float vol_get_shadow(ShadeInput *shi, LampRen *lar, const float co[3])
 		}
 		else {
 			sub_v3_v3v3(is.dir, lar->co, is.start);
-			is.dist = normalize_v3(is.dir );
+			is.dist = normalize_v3(is.dir);
 		}
 
 		is.mode = RE_RAY_MIRROR;
 		is.check = RE_CHECK_VLR_NON_SOLID_MATERIAL;
 		is.skip = 0;
 		
-		if (lar->mode & (LA_LAYER|LA_LAYER_SHADOW))
-			is.lay= lar->lay;	
+		if (lar->mode & (LA_LAYER | LA_LAYER_SHADOW))
+			is.lay = lar->lay;
 		else
-			is.lay= -1;
+			is.lay = -1;
 			
 		is.orig.ob = NULL;
 		is.orig.face = NULL;
@@ -117,7 +111,7 @@ static float vol_get_shadow(ShadeInput *shi, LampRen *lar, const float co[3])
 			visibility = 0.f;
 		}
 		
-		lar->last_hit[shi->thread]= is.last_hit;
+		lar->last_hit[shi->thread] = is.last_hit;
 	}
 	return visibility;
 }
@@ -128,26 +122,26 @@ static int vol_get_bounds(ShadeInput *shi, const float co[3], const float vec[3]
 	copy_v3_v3(isect->start, co);
 	copy_v3_v3(isect->dir, vec);
 	isect->dist = FLT_MAX;
-	isect->mode= RE_RAY_MIRROR;
+	isect->mode = RE_RAY_MIRROR;
 	isect->last_hit = NULL;
-	isect->lay= -1;
-	isect->check= RE_CHECK_VLR_NONE;
+	isect->lay = -1;
+	isect->check = RE_CHECK_VLR_NONE;
 	
 	if (intersect_type == VOL_BOUNDS_DEPTH) {
 		isect->skip = RE_SKIP_VLR_NEIGHBOUR;
-		isect->orig.face = (void*)shi->vlr;
-		isect->orig.ob = (void*)shi->obi;
+		isect->orig.face = (void *)shi->vlr;
+		isect->orig.ob = (void *)shi->obi;
 	}
 	else { // if (intersect_type == VOL_BOUNDS_SS) {
-		isect->skip= 0;
-		isect->orig.face= NULL;
+		isect->skip = 0;
+		isect->orig.face = NULL;
 		isect->orig.ob = NULL;
 	}
 	
 	if (RE_rayobject_raycast(R.raytree, isect)) {
-		hitco[0] = isect->start[0] + isect->dist*isect->dir[0];
-		hitco[1] = isect->start[1] + isect->dist*isect->dir[1];
-		hitco[2] = isect->start[2] + isect->dist*isect->dir[2];
+		hitco[0] = isect->start[0] + isect->dist * isect->dir[0];
+		hitco[1] = isect->start[1] + isect->dist * isect->dir[1];
+		hitco[2] = isect->start[2] + isect->dist * isect->dir[2];
 		return 1;
 	}
 	else {
@@ -162,18 +156,18 @@ static void shade_intersection(ShadeInput *shi, float col_r[4], Isect *is)
 	
 	memset(&shi_new, 0, sizeof(ShadeInput)); 
 	
-	shi_new.mask= shi->mask;
-	shi_new.osatex= shi->osatex;
-	shi_new.thread= shi->thread;
+	shi_new.mask = shi->mask;
+	shi_new.osatex = shi->osatex;
+	shi_new.thread = shi->thread;
 	shi_new.depth = shi->depth + 1;
-	shi_new.volume_depth= shi->volume_depth + 1;
-	shi_new.xs= shi->xs;
-	shi_new.ys= shi->ys;
-	shi_new.lay= shi->lay;
-	shi_new.passflag= SCE_PASS_COMBINED; /* result of tracing needs no pass info */
-	shi_new.combinedflag= 0xFFFFFF;		 /* ray trace does all options */
-	shi_new.light_override= shi->light_override;
-	shi_new.mat_override= shi->mat_override;
+	shi_new.volume_depth = shi->volume_depth + 1;
+	shi_new.xs = shi->xs;
+	shi_new.ys = shi->ys;
+	shi_new.lay = shi->lay;
+	shi_new.passflag = SCE_PASS_COMBINED; /* result of tracing needs no pass info */
+	shi_new.combinedflag = 0xFFFFFF;      /* ray trace does all options */
+	shi_new.light_override = shi->light_override;
+	shi_new.mat_override = shi->mat_override;
 	
 	copy_v3_v3(shi_new.camera_co, is->start);
 	
@@ -196,13 +190,13 @@ static void vol_trace_behind(ShadeInput *shi, VlakRen *vlr, const float co[3], f
 	copy_v3_v3(isect.dir, shi->view);
 	isect.dist = FLT_MAX;
 	
-	isect.mode= RE_RAY_MIRROR;
+	isect.mode = RE_RAY_MIRROR;
 	isect.check = RE_CHECK_VLR_NONE;
 	isect.skip = RE_SKIP_VLR_NEIGHBOUR;
-	isect.orig.ob = (void*) shi->obi;
-	isect.orig.face = (void*)vlr;
+	isect.orig.ob = (void *) shi->obi;
+	isect.orig.face = (void *)vlr;
 	isect.last_hit = NULL;
-	isect.lay= -1;
+	isect.lay = -1;
 	
 	/* check to see if there's anything behind the volume, otherwise shade the sky */
 	if (RE_rayobject_raycast(R.raytree, &isect)) {
@@ -241,11 +235,11 @@ static void vol_get_precached_scattering(Render *re, ShadeInput *shi, float scat
 
 /* Meta object density, brute force for now 
  * (might be good enough anyway, don't need huge number of metaobs to model volumetric objects */
-static float metadensity(Object* ob, const float co[3])
+static float metadensity(Object *ob, const float co[3])
 {
 	float mat[4][4], imat[4][4], dens = 0.f;
-	MetaBall* mb = (MetaBall*)ob->data;
-	MetaElem* ml;
+	MetaBall *mb = (MetaBall *)ob->data;
+	MetaElem *ml;
 	
 	/* transform co to meta-element */
 	float tco[3] = {co[0], co[1], co[2]};
@@ -253,13 +247,13 @@ static float metadensity(Object* ob, const float co[3])
 	invert_m4_m4(imat, mat);
 	mul_m4_v3(imat, tco);
 	
-	for (ml = mb->elems.first; ml; ml=ml->next) {
+	for (ml = mb->elems.first; ml; ml = ml->next) {
 		float bmat[3][3], dist2;
 		
 		/* element rotation transform */
 		float tp[3] = {ml->x - tco[0], ml->y - tco[1], ml->z - tco[2]};
 		quat_to_mat3(bmat, ml->quat);
-		transpose_m3(bmat);	// rot.only, so inverse == transpose
+		transpose_m3(bmat); // rot.only, so inverse == transpose
 		mul_m3_v3(bmat, tp);
 		
 		/* MB_BALL default */
@@ -269,10 +263,10 @@ static float metadensity(Object* ob, const float co[3])
 				break;
 			case MB_CUBE:
 				tp[2] = (tp[2] > ml->expz) ? (tp[2] - ml->expz) : ((tp[2] < -ml->expz) ? (tp[2] + ml->expz) : 0.f);
-				// no break, xy as plane
+			// no break, xy as plane
 			case MB_PLANE:
 				tp[1] = (tp[1] > ml->expy) ? (tp[1] - ml->expy) : ((tp[1] < -ml->expy) ? (tp[1] + ml->expy) : 0.f);
-				// no break, x as tube
+			// no break, x as tube
 			case MB_TUBE:
 				tp[0] = (tp[0] > ml->expx) ? (tp[0] - ml->expx) : ((tp[0] < -ml->expx) ? (tp[0] + ml->expx) : 0.f);
 		}
@@ -280,7 +274,7 @@ static float metadensity(Object* ob, const float co[3])
 		/* ml->rad2 is not set */
 		dist2 = 1.0f - (dot_v3v3(tp, tp) / (ml->rad * ml->rad));
 		if (dist2 > 0.f)
-			dens += (ml->flag & MB_NEGATIVE) ? -ml->s*dist2*dist2*dist2 : ml->s*dist2*dist2*dist2;
+			dens += (ml->flag & MB_NEGATIVE) ? -ml->s * dist2 * dist2 * dist2 : ml->s * dist2 * dist2 * dist2;
 	}
 	
 	dens -= mb->thresh;
@@ -299,7 +293,7 @@ float vol_get_density(struct ShadeInput *shi, const float co[3])
 	if (shi->obi->obr->ob->type == OB_MBALL) {
 		const float md = metadensity(shi->obi->obr->ob, co);
 		if (md < 1.f) density *= md;
-	 }
+	}
 	
 	return density * density_scale;
 }
@@ -311,11 +305,11 @@ float vol_get_density(struct ShadeInput *shi, const float co[3])
 static void vol_get_reflection_color(ShadeInput *shi, float ref_col[3], const float co[3])
 {
 	float scatter = shi->mat->vol.scattering;
-	float reflection= shi->mat->vol.reflection;
+	float reflection = shi->mat->vol.reflection;
 	copy_v3_v3(ref_col, shi->mat->vol.reflection_col);
 	
-	if (shi->mat->mapto_textured & (MAP_SCATTERING+MAP_REFLECTION_COL))
-		do_volume_tex(shi, co, MAP_SCATTERING+MAP_REFLECTION_COL, ref_col, &scatter, &R);
+	if (shi->mat->mapto_textured & (MAP_SCATTERING + MAP_REFLECTION_COL))
+		do_volume_tex(shi, co, MAP_SCATTERING + MAP_REFLECTION_COL, ref_col, &scatter, &R);
 	
 	/* only one single float parameter at a time... :s */
 	if (shi->mat->mapto_textured & (MAP_REFLECTION))
@@ -333,8 +327,8 @@ static void vol_get_emission(ShadeInput *shi, float emission_col[3], const float
 	float emission = shi->mat->vol.emission;
 	copy_v3_v3(emission_col, shi->mat->vol.emission_col);
 	
-	if (shi->mat->mapto_textured & (MAP_EMISSION+MAP_EMISSION_COL))
-		do_volume_tex(shi, co, MAP_EMISSION+MAP_EMISSION_COL, emission_col, &emission, &R);
+	if (shi->mat->mapto_textured & (MAP_EMISSION + MAP_EMISSION_COL))
+		do_volume_tex(shi, co, MAP_EMISSION + MAP_EMISSION_COL, emission_col, &emission, &R);
 	
 	emission_col[0] = emission_col[0] * emission;
 	emission_col[1] = emission_col[1] * emission;
@@ -353,8 +347,8 @@ static void vol_get_sigma_t(ShadeInput *shi, float sigma_t[3], const float co[3]
 	float transmission_col[3] = {shi->mat->vol.transmission_col[0], shi->mat->vol.transmission_col[1], shi->mat->vol.transmission_col[2]};
 	float scattering = shi->mat->vol.scattering;
 	
-	if (shi->mat->mapto_textured & (MAP_SCATTERING+MAP_TRANSMISSION_COL))
-		do_volume_tex(shi, co, MAP_SCATTERING+MAP_TRANSMISSION_COL, transmission_col, &scattering, &R);
+	if (shi->mat->mapto_textured & (MAP_SCATTERING + MAP_TRANSMISSION_COL))
+		do_volume_tex(shi, co, MAP_SCATTERING + MAP_TRANSMISSION_COL, transmission_col, &scattering, &R);
 	
 	sigma_t[0] = (1.0f - transmission_col[0]) + scattering;
 	sigma_t[1] = (1.0f - transmission_col[1]) + scattering;
@@ -378,13 +372,13 @@ static float vol_get_phasefunc(ShadeInput *UNUSED(shi), float g, const float w[3
 	 * until Blender's shading system supports this better. --matt
 	 */
 	
-	if (g == 0.f) {	/* isotropic */
+	if (g == 0.f) { /* isotropic */
 		return normalize * 1.f;
 	}
-	else {		/* schlick */
+	else {      /* schlick */
 		const float k = 1.55f * g - .55f * g * g * g;
 		const float kcostheta = k * dot_v3v3(w, wp);
-		return normalize * (1.f - k*k) / ((1.f - kcostheta) * (1.f - kcostheta));
+		return normalize * (1.f - k * k) / ((1.f - kcostheta) * (1.f - kcostheta));
 	}
 	
 	/* not used, but here for reference: */
@@ -395,14 +389,14 @@ static float vol_get_phasefunc(ShadeInput *UNUSED(shi), float g, const float w[3
 		case MA_VOL_PH_MIEMURKY:
 			return normalize * (0.5f + 16.5f * powf(0.5 * (1.f + costheta), 32.f));
 		case MA_VOL_PH_RAYLEIGH:
-			return normalize * 3.f/4.f * (1 + costheta * costheta);
+			return normalize * 3.f / 4.f * (1 + costheta * costheta);
 		case MA_VOL_PH_HG:
 			return normalize * (1.f - g * g) / powf(1.f + g * g - 2.f * g * costheta, 1.5f);
 		case MA_VOL_PH_SCHLICK:
 		{
 			const float k = 1.55f * g - .55f * g * g * g;
 			const float kcostheta = k * costheta;
-			return normalize * (1.f - k*k) / ((1.f - kcostheta) * (1.f - kcostheta));
+			return normalize * (1.f - k * k) / ((1.f - kcostheta) * (1.f - kcostheta));
 		}
 		case MA_VOL_PH_ISOTROPIC:
 		default:
@@ -471,20 +465,20 @@ static void vol_get_transmittance(ShadeInput *shi, float tr[3], const float co[3
 static void vol_shade_one_lamp(struct ShadeInput *shi, const float co[3], const float view[3], LampRen *lar, float lacol[3])
 {
 	float visifac, lv[3], lampdist;
-	float tr[3]={1.0, 1.0, 1.0};
+	float tr[3] = {1.0, 1.0, 1.0};
 	float hitco[3], *atten_co;
 	float p, ref_col[3];
 	
-	if (lar->mode & LA_LAYER) if ((lar->lay & shi->obi->lay)==0) return;
-	if ((lar->lay & shi->lay)==0) return;
+	if (lar->mode & LA_LAYER) if ((lar->lay & shi->obi->lay) == 0) return;
+	if ((lar->lay & shi->lay) == 0) return;
 	if (lar->energy == 0.0f) return;
 	
-	if ((visifac= lamp_get_visibility(lar, co, lv, &lampdist)) == 0.f) return;
+	if ((visifac = lamp_get_visibility(lar, co, lv, &lampdist)) == 0.f) return;
 	
 	copy_v3_v3(lacol, &lar->r);
 	
 	if (lar->mode & LA_TEXTURE) {
-		shi->osatex= 0;
+		shi->osatex = 0;
 		do_lamp_tex(lar, lv, shi, lacol, LA_TEXTURE);
 	}
 
@@ -502,7 +496,7 @@ static void vol_shade_one_lamp(struct ShadeInput *shi, const float co[3], const
 		
 		if (shi->mat->vol.shadeflag & MA_VOL_RECV_EXT_SHADOW) {
 			mul_v3_fl(lacol, vol_get_shadow(shi, lar, co));
-			if (luminance(lacol) < 0.001f) return;
+			if (rgb_to_luma_y(lacol) < 0.001f) return;
 		}
 		
 		/* find minimum of volume bounds, or lamp coord */
@@ -519,7 +513,7 @@ static void vol_shade_one_lamp(struct ShadeInput *shi, const float co[3], const
 			if (ELEM(lar->type, LA_SUN, LA_HEMI))
 				/* infinite lights, can never be inside volume */
 				atten_co = hitco;
-			else if ( lampdist < dist ) {
+			else if (lampdist < dist) {
 				atten_co = lar->co;
 			}
 			else
@@ -536,7 +530,7 @@ static void vol_shade_one_lamp(struct ShadeInput *shi, const float co[3], const
 		}
 	}
 	
-	if (luminance(lacol) < 0.001f) return;
+	if (rgb_to_luma_y(lacol) < 0.001f) return;
 	
 	normalize_v3(lv);
 	p = vol_get_phasefunc(shi, shi->mat->vol.asymmetry, view, lv);
@@ -558,10 +552,10 @@ void vol_get_scattering(ShadeInput *shi, float scatter_col[3], const float co[3]
 
 	zero_v3(scatter_col);
 
-	lights= get_lights(shi);
-	for (go=lights->first; go; go= go->next) {
+	lights = get_lights(shi);
+	for (go = lights->first; go; go = go->next) {
 		float lacol[3] = {0.f, 0.f, 0.f};
-		lar= go->lampren;
+		lar = go->lampren;
 		
 		if (lar) {
 			vol_shade_one_lamp(shi, co, view, lar, lacol);
@@ -598,7 +592,7 @@ static void volumeintegrate(struct ShadeInput *shi, float col[4], const float co
 	
 	float t0 = 0.f;
 	float pt0 = t0;
-	float t1 = normalize_v3(step_vec);	/* returns vector length */
+	float t1 = normalize_v3(step_vec);  /* returns vector length */
 	
 	t0 += stepsize * ((shi->mat->vol.stepsize_type == MA_VOL_STEP_CONSTANT) ? 0.5f : BLI_thread_frand(shi->thread));
 	p[0] += t0 * step_vec[0];
@@ -618,7 +612,7 @@ static void volumeintegrate(struct ShadeInput *shi, float col[4], const float co
 			
 			if (t0 > t1 * 0.25f) {
 				/* only use depth cutoff after we've traced a little way into the volume */
-				if (luminance(tr) < shi->mat->vol.depth_cutoff) break;
+				if (rgb_to_luma_y(tr) < shi->mat->vol.depth_cutoff) break;
 			}
 			
 			vol_get_emission(shi, emit_col, p);
@@ -647,7 +641,7 @@ static void volumeintegrate(struct ShadeInput *shi, float col[4], const float co
 	add_v3_v3(col, radiance);
 	
 	/* alpha <-- transmission luminance */
-	col[3] = 1.0f - luminance(tr);
+	col[3] = 1.0f - rgb_to_luma_y(tr);
 }
 
 /* the main entry point for volume shading */
@@ -656,7 +650,7 @@ static void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr, int in
 	float hitco[3], col[4] = {0.f, 0.f, 0.f, 0.f};
 	float *startco, *endco;
 	int trace_behind = 1;
-	const int ztransp= ((shi->depth==0) && (shi->mat->mode & MA_TRANSP) && (shi->mat->mode & MA_ZTRANSP));
+	const int ztransp = ((shi->depth == 0) && (shi->mat->mode & MA_TRANSP) && (shi->mat->mode & MA_ZTRANSP));
 	Isect is;
 
 	/* check for shading an internal face a volume object directly */
@@ -669,7 +663,7 @@ static void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr, int in
 	
 	if (ztransp && inside_volume == VOL_SHADE_INSIDE) {
 		MatInside *mi;
-		int render_this=0;
+		int render_this = 0;
 		
 		/* don't render the backfaces of ztransp volume materials.
 		 *
@@ -683,9 +677,9 @@ static void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr, int in
 		 * which would otherwise render the volume in between the camera and the backface
 		 * --matt */
 		
-		for (mi=R.render_volumes_inside.first; mi; mi=mi->next) {
+		for (mi = R.render_volumes_inside.first; mi; mi = mi->next) {
 			/* weak... */
-			if (mi->ma == shi->mat) render_this=1;
+			if (mi->ma == shi->mat) render_this = 1;
 		}
 		if (!render_this) return;
 	}
@@ -733,7 +727,7 @@ static void volume_trace(struct ShadeInput *shi, struct ShadeResult *shr, int in
 	}
 	
 	if (ztransp)
-		col[3] = col[3]>1.f?1.f:col[3];
+		col[3] = col[3] > 1.f ? 1.f : col[3];
 	else
 		col[3] = 1.f;
 	
@@ -749,7 +743,7 @@ void shade_volume_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct
 {
 	float hitco[3];
 	float tr[3] = {1.0, 1.0, 1.0};
-	Isect is= {{0}};
+	Isect is = {{0}};
 	float *startco, *endco;
 
 	memset(shr, 0, sizeof(ShadeResult));
@@ -787,7 +781,7 @@ void shade_volume_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct
 
 	
 	copy_v3_v3(shr->combined, tr);
-	shr->combined[3] = 1.0f - luminance(tr);
+	shr->combined[3] = 1.0f - rgb_to_luma_y(tr);
 	shr->alpha = shr->combined[3];
 }
 
@@ -825,5 +819,3 @@ void shade_volume_inside(ShadeInput *shi, ShadeResult *shr)
 	shi->obi = obi_backup;
 	shi->obr = obi_backup->obr;
 }
-
-
diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c
index 90e6594d888..7d54f77fc90 100644
--- a/source/blender/render/intern/source/voxeldata.c
+++ b/source/blender/render/intern/source/voxeldata.c
@@ -66,10 +66,10 @@
 static int is_vd_res_ok(VoxelData *vd)
 {
 	/* arbitrary large value so corrupt headers don't break */
-	const int min= 1, max= 100000;
-	return	(vd->resol[0] >= min && vd->resol[0] <= max) &&
-			(vd->resol[1] >= min && vd->resol[1] <= max) &&
-			(vd->resol[2] >= min && vd->resol[2] <= max);
+	const int min = 1, max = 100000;
+	return (vd->resol[0] >= min && vd->resol[0] <= max) &&
+	       (vd->resol[1] >= min && vd->resol[1] <= max) &&
+	       (vd->resol[2] >= min && vd->resol[2] <= max);
 }
 
 /* use size_t because the result may exceed INT_MAX */
@@ -86,10 +86,10 @@ static int load_frame_blendervoxel(VoxelData *vd, FILE *fp, int frame)
 	if (is_vd_res_ok(vd) == FALSE)
 		return 0;
 
-	vd->dataset = MEM_mapallocN(sizeof(float)*size, "voxel dataset");
+	vd->dataset = MEM_mapallocN(sizeof(float) * size, "voxel dataset");
 	if (vd->dataset == NULL) return 0;
 
-	if (fseek(fp, frame*size*sizeof(float)+offset, 0) == -1)
+	if (fseek(fp, frame * size * sizeof(float) + offset, 0) == -1)
 		return 0;
 	if (fread(vd->dataset, sizeof(float), size, fp) != size)
 		return 0;
@@ -108,29 +108,29 @@ static int load_frame_raw8(VoxelData *vd, FILE *fp, int frame)
 	if (is_vd_res_ok(vd) == FALSE)
 		return 0;
 
-	vd->dataset = MEM_mapallocN(sizeof(float)*size, "voxel dataset");
+	vd->dataset = MEM_mapallocN(sizeof(float) * size, "voxel dataset");
 	if (vd->dataset == NULL) return 0;
-	data_c = (char *)MEM_mallocN(sizeof(char)*size, "temporary voxel file reading storage");
+	data_c = (char *)MEM_mallocN(sizeof(char) * size, "temporary voxel file reading storage");
 	if (data_c == NULL) {
 		MEM_freeN(vd->dataset);
-		vd->dataset= NULL;
+		vd->dataset = NULL;
 		return 0;
 	}
 
-	if (fseek(fp, (frame-1)*size*sizeof(char), 0) == -1) {
+	if (fseek(fp, (frame - 1) * size * sizeof(char), 0) == -1) {
 		MEM_freeN(data_c);
 		MEM_freeN(vd->dataset);
-		vd->dataset= NULL;
+		vd->dataset = NULL;
 		return 0;
 	}
 	if (fread(data_c, sizeof(char), size, fp) != size) {
 		MEM_freeN(data_c);
 		MEM_freeN(vd->dataset);
-		vd->dataset= NULL;
+		vd->dataset = NULL;
 		return 0;
 	}
 	
-	for (i=0; i<size; i++) {
+	for (i = 0; i < size; i++) {
 		vd->dataset[i] = (float)data_c[i] / 255.f;
 	}
 	MEM_freeN(data_c);
@@ -146,7 +146,7 @@ static void load_frame_image_sequence(VoxelData *vd, Tex *tex)
 	Image *ima = tex->ima;
 	ImageUser *tiuser = &tex->iuser;
 	ImageUser iuser = *(tiuser);
-	int x=0, y=0, z=0;
+	int x = 0, y = 0, z = 0;
 	float *rf;
 
 	if (!ima || !tiuser) return;
@@ -157,10 +157,10 @@ static void load_frame_image_sequence(VoxelData *vd, Tex *tex)
 
 	/* find the first valid ibuf and use it to initialize the resolution of the data set */
 	/* need to do this in advance so we know how much memory to allocate */
-	ibuf= BKE_image_get_ibuf(ima, &iuser);
+	ibuf = BKE_image_get_ibuf(ima, &iuser);
 	while (!ibuf && (iuser.framenr < iuser.frames)) {
 		iuser.framenr++;
-		ibuf= BKE_image_get_ibuf(ima, &iuser);
+		ibuf = BKE_image_get_ibuf(ima, &iuser);
 	}
 	if (!ibuf) return;
 	if (!ibuf->rect_float) IMB_float_from_rect(ibuf);
@@ -169,23 +169,23 @@ static void load_frame_image_sequence(VoxelData *vd, Tex *tex)
 	vd->resol[0] = ibuf->x;
 	vd->resol[1] = ibuf->y;
 	vd->resol[2] = iuser.frames;
-	vd->dataset = MEM_mapallocN(sizeof(float)*vd_resol_size(vd), "voxel dataset");
+	vd->dataset = MEM_mapallocN(sizeof(float) * vd_resol_size(vd), "voxel dataset");
 	
-	for (z=0; z < iuser.frames; z++) {
+	for (z = 0; z < iuser.frames; z++) {
 		/* get a new ibuf for each frame */
 		if (z > 0) {
 			iuser.framenr++;
-			ibuf= BKE_image_get_ibuf(ima, &iuser);
+			ibuf = BKE_image_get_ibuf(ima, &iuser);
 			if (!ibuf) break;
 			if (!ibuf->rect_float) IMB_float_from_rect(ibuf);
 		}
 		rf = ibuf->rect_float;
 		
-		for (y=0; y < ibuf->y; y++) {
-			for (x=0; x < ibuf->x; x++) {
+		for (y = 0; y < ibuf->y; y++) {
+			for (x = 0; x < ibuf->x; x++) {
 				/* currently averaged to monchrome */
-				vd->dataset[ BLI_VOXEL_INDEX(x, y, z, vd->resol) ] = (rf[0] + rf[1] + rf[2]) * 0.333f;
-				rf +=4;
+				vd->dataset[BLI_VOXEL_INDEX(x, y, z, vd->resol)] = (rf[0] + rf[1] + rf[2]) * 0.333f;
+				rf += 4;
 			}
 		}
 		
@@ -198,7 +198,7 @@ static void load_frame_image_sequence(VoxelData *vd, Tex *tex)
 
 static int read_voxeldata_header(FILE *fp, struct VoxelData *vd)
 {
-	VoxelDataHeader *h=(VoxelDataHeader *)MEM_mallocN(sizeof(VoxelDataHeader), "voxel data header");
+	VoxelDataHeader *h = (VoxelDataHeader *)MEM_mallocN(sizeof(VoxelDataHeader), "voxel data header");
 	
 	rewind(fp);
 	if (fread(h, sizeof(VoxelDataHeader), 1, fp) != 1) {
@@ -206,9 +206,9 @@ static int read_voxeldata_header(FILE *fp, struct VoxelData *vd)
 		return 0;
 	}
 	
-	vd->resol[0]=h->resolX;
-	vd->resol[1]=h->resolY;
-	vd->resol[2]=h->resolZ;
+	vd->resol[0] = h->resolX;
+	vd->resol[1] = h->resolY;
+	vd->resol[2] = h->resolZ;
 
 	MEM_freeN(h);
 	return 1;
@@ -221,8 +221,8 @@ static void init_frame_smoke(VoxelData *vd, float cfra)
 	ModifierData *md;
 	
 	vd->dataset = NULL;
-	if (vd->object == NULL)	return;	
-	ob= vd->object;
+	if (vd->object == NULL) return;
+	ob = vd->object;
 	
 	/* draw code for smoke */
 	if ((md = (ModifierData *)modifiers_findByType(ob, eModifierType_Smoke))) {
@@ -231,23 +231,23 @@ static void init_frame_smoke(VoxelData *vd, float cfra)
 		
 		if (smd->domain && smd->domain->fluid) {
 			if (cfra < smd->domain->point_cache[0]->startframe)
-				; /* don't show smoke before simulation starts, this could be made an option in the future */
+				;  /* don't show smoke before simulation starts, this could be made an option in the future */
 			else if (vd->smoked_type == TEX_VD_SMOKEHEAT) {
 				size_t totRes;
 				size_t i;
 				float *heat;
 
 				copy_v3_v3_int(vd->resol, smd->domain->res);
-				totRes= vd_resol_size(vd);
+				totRes = vd_resol_size(vd);
 
 				// scaling heat values from -2.0-2.0 to 0.0-1.0
-				vd->dataset = MEM_mapallocN(sizeof(float)*(totRes), "smoke data");
+				vd->dataset = MEM_mapallocN(sizeof(float) * (totRes), "smoke data");
 
 
 				heat = smoke_get_heat(smd->domain->fluid);
 
-				for (i=0; i<totRes; i++) {
-					vd->dataset[i] = (heat[i]+2.0f)/4.0f;
+				for (i = 0; i < totRes; i++) {
+					vd->dataset[i] = (heat[i] + 2.0f) / 4.0f;
 				}
 
 				//vd->dataset = smoke_get_heat(smd->domain->fluid);
@@ -258,17 +258,17 @@ static void init_frame_smoke(VoxelData *vd, float cfra)
 				float *xvel, *yvel, *zvel;
 
 				copy_v3_v3_int(vd->resol, smd->domain->res);
-				totRes= vd_resol_size(vd);
+				totRes = vd_resol_size(vd);
 
 				// scaling heat values from -2.0-2.0 to 0.0-1.0
-				vd->dataset = MEM_mapallocN(sizeof(float)*(totRes), "smoke data");
+				vd->dataset = MEM_mapallocN(sizeof(float) * (totRes), "smoke data");
 
 				xvel = smoke_get_velocity_x(smd->domain->fluid);
 				yvel = smoke_get_velocity_y(smd->domain->fluid);
 				zvel = smoke_get_velocity_z(smd->domain->fluid);
 
-				for (i=0; i<totRes; i++) {
-					vd->dataset[i] = sqrt(xvel[i]*xvel[i] + yvel[i]*yvel[i] + zvel[i]*zvel[i])*3.0f;
+				for (i = 0; i < totRes; i++) {
+					vd->dataset[i] = sqrt(xvel[i] * xvel[i] + yvel[i] * yvel[i] + zvel[i] * zvel[i]) * 3.0f;
 				}
 
 			}
@@ -286,10 +286,10 @@ static void init_frame_smoke(VoxelData *vd, float cfra)
 				}
 
 				/* TODO: is_vd_res_ok(rvd) doesnt check this resolution */
-				totRes= vd_resol_size(vd);
+				totRes = vd_resol_size(vd);
 				/* always store copy, as smoke internal data can change */
-				vd->dataset = MEM_mapallocN(sizeof(float)*(totRes), "smoke data");
-				memcpy(vd->dataset, density, sizeof(float)*totRes);
+				vd->dataset = MEM_mapallocN(sizeof(float) * (totRes), "smoke data");
+				memcpy(vd->dataset, density, sizeof(float) * totRes);
 			} // end of fluid condition
 		}
 	}
@@ -300,7 +300,7 @@ static void init_frame_smoke(VoxelData *vd, float cfra)
 	(void)vd;
 	(void)cfra;
 
-	vd->dataset= NULL;
+	vd->dataset = NULL;
 #endif
 }
 
@@ -342,7 +342,7 @@ void cache_voxeldata(Tex *tex, int scene_frame)
 			if (!fp) return;
 			
 			if (read_voxeldata_header(fp, vd))
-				load_frame_blendervoxel(vd, fp, curframe-1);
+				load_frame_blendervoxel(vd, fp, curframe - 1);
 
 			fclose(fp);
 			return;
@@ -362,17 +362,17 @@ void make_voxeldata(struct Render *re)
 {
 	Tex *tex;
 	
-	re->i.infostr= "Loading voxel datasets";
+	re->i.infostr = "Loading voxel datasets";
 	re->stats_draw(re->sdh, &re->i);
 	
 	/* XXX: should be doing only textures used in this render */
-	for (tex= re->main->tex.first; tex; tex= tex->id.next) {
-		if (tex->id.us && tex->type==TEX_VOXELDATA) {
+	for (tex = re->main->tex.first; tex; tex = tex->id.next) {
+		if (tex->id.us && tex->type == TEX_VOXELDATA) {
 			cache_voxeldata(tex, re->r.cfra);
 		}
 	}
 	
-	re->i.infostr= NULL;
+	re->i.infostr = NULL;
 	re->stats_draw(re->sdh, &re->i);
 	
 }
@@ -383,7 +383,7 @@ int voxeldatatex(struct Tex *tex, const float texvec[3], struct TexResult *texre
 	VoxelData *vd = tex->vd;	
 	float co[3], offset[3] = {0.5, 0.5, 0.5};
 
-	if (vd->dataset==NULL) {
+	if (vd->dataset == NULL) {
 		texres->tin = 0.0f;
 		return 0;
 	}
@@ -448,5 +448,3 @@ int voxeldatatex(struct Tex *tex, const float texvec[3], struct TexResult *texre
 	
 	return retval;	
 }
-
-
diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c
index cfbdf04d75a..ecde9bb2de8 100644
--- a/source/blender/render/intern/source/zbuf.c
+++ b/source/blender/render/intern/source/zbuf.c
@@ -116,9 +116,10 @@ static void zbuf_init_span(ZSpan *zspan)
 	zspan->minp1= zspan->maxp1= zspan->minp2= zspan->maxp2= NULL;
 }
 
-static void zbuf_add_to_span(ZSpan *zspan, float *v1, float *v2)
+static void zbuf_add_to_span(ZSpan *zspan, const float *v1, const float *v2)
 {
-	float *minv, *maxv, *span;
+	const float *minv, *maxv;
+	float *span;
 	float xx1, dx0, xs0;
 	int y, my0, my2;
 	
@@ -301,7 +302,8 @@ static APixstr *addpsA(ZSpan *zspan)
 	return zspan->curpstr;
 }
 
-static void zbuffillAc4(ZSpan *zspan, int obi, int zvlnr, float *v1, float *v2, float *v3, float *v4)
+static void zbuffillAc4(ZSpan *zspan, int obi, int zvlnr,
+                        const float *v1, const float *v2, const float *v3, const float *v4)
 {
 	APixstr *ap, *apofs, *apn;
 	double zxd, zyd, zy0, zverg;
@@ -427,7 +429,7 @@ static void zbuffillAc4(ZSpan *zspan, int obi, int zvlnr, float *v1, float *v2,
 
 
 
-static void zbuflineAc(ZSpan *zspan, int obi, int zvlnr, float *vec1, float *vec2)
+static void zbuflineAc(ZSpan *zspan, int obi, int zvlnr, const float vec1[3], const float vec2[3])
 {
 	APixstr *ap, *apn;
 	int *rectz, *rectmask;
@@ -584,7 +586,7 @@ static void zbuflineAc(ZSpan *zspan, int obi, int zvlnr, float *vec1, float *vec
 
 /* *************  NORMAL ZBUFFER ************ */
 
-static void zbufline(ZSpan *zspan, int obi, int zvlnr, float *vec1, float *vec2)
+static void zbufline(ZSpan *zspan, int obi, int zvlnr, const float vec1[3], const float vec2[3])
 {
 	int *rectz, *rectp, *recto, *rectmask;
 	int start, end, x, y, oldx, oldy, ofs;
@@ -714,7 +716,7 @@ static void zbufline(ZSpan *zspan, int obi, int zvlnr, float *vec1, float *vec2)
 	}
 }
 
-static void zbufline_onlyZ(ZSpan *zspan, int UNUSED(obi), int UNUSED(zvlnr), float *vec1, float *vec2)
+static void zbufline_onlyZ(ZSpan *zspan, int UNUSED(obi), int UNUSED(zvlnr), const float vec1[3], const float vec2[3])
 {
 	int *rectz, *rectz1= NULL;
 	int start, end, x, y, oldx, oldy, ofs;
@@ -1039,7 +1041,8 @@ void zbufsinglewire(ZSpan *zspan, int obi, int zvlnr, const float ho1[4], const
 
 /* WATCH IT: zbuffillGLinv4 and zbuffillGL4 are identical except for a 2 lines,
  * commented below */
-static void zbuffillGLinv4(ZSpan *zspan, int obi, int zvlnr, float *v1, float *v2, float *v3, float *v4) 
+static void zbuffillGLinv4(ZSpan *zspan, int obi, int zvlnr,
+                           const float *v1, const float *v2, const float *v3, const float *v4)
 {
 	double zxd, zyd, zy0, zverg;
 	float x0, y0, z0;
@@ -1161,7 +1164,8 @@ static void zbuffillGLinv4(ZSpan *zspan, int obi, int zvlnr, float *v1, float *v
 
 /* WATCH IT: zbuffillGLinv4 and zbuffillGL4 are identical except for a 2 lines,
  * commented below */
-static void zbuffillGL4(ZSpan *zspan, int obi, int zvlnr, float *v1, float *v2, float *v3, float *v4)
+static void zbuffillGL4(ZSpan *zspan, int obi, int zvlnr,
+                        const float *v1, const float *v2, const float *v3, const float *v4)
 {
 	double zxd, zyd, zy0, zverg;
 	float x0, y0, z0;
@@ -1291,7 +1295,8 @@ static void zbuffillGL4(ZSpan *zspan, int obi, int zvlnr, float *v1, float *v2,
  */
 
 /* now: filling two Z values, the closest and 2nd closest */
-static void zbuffillGL_onlyZ(ZSpan *zspan, int UNUSED(obi), int UNUSED(zvlnr), float *v1, float *v2, float *v3, float *v4)
+static void zbuffillGL_onlyZ(ZSpan *zspan, int UNUSED(obi), int UNUSED(zvlnr),
+                             const float *v1, const float *v2, const float *v3, const float *v4)
 {
 	double zxd, zyd, zy0, zverg;
 	float x0, y0, z0;
@@ -1977,7 +1982,7 @@ void zbufclip4(ZSpan *zspan, int obi, int zvlnr, float *f1, float *f2, float *f3
 
 /* ************** ZMASK ******************************** */
 
-#define EXTEND_PIXEL(a)	if (temprectp[a]) {z+= rectz[a]; tot++;}
+#define EXTEND_PIXEL(a)	if (temprectp[a]) { z += rectz[a]; tot++; } (void)0
 
 /* changes the zbuffer to be ready for z-masking: applies an extend-filter, and then clears */
 static void zmask_rect(int *rectz, int *rectp, int xs, int ys, int neg)
@@ -2445,7 +2450,8 @@ void zbuffer_shadow(Render *re, float winmat[][4], LampRen *lar, int *rectz, int
 	zbuf_free_span(&zspan);
 }
 
-static void zbuffill_sss(ZSpan *zspan, int obi, int zvlnr, float *v1, float *v2, float *v3, float *v4)
+static void zbuffill_sss(ZSpan *zspan, int obi, int zvlnr,
+                         const float *v1, const float *v2, const float *v3, const float *v4)
 {
 	double zxd, zyd, zy0, z;
 	float x0, y0, x1, y1, x2, y2, z0, z1, z2, xx1, *span1, *span2;
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 3bbd5583aa5..bfea3f3c40b 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -209,6 +209,7 @@ void		WM_operator_properties_create_ptr(struct PointerRNA *ptr, struct wmOperato
 void		WM_operator_properties_free(struct PointerRNA *ptr);
 void		WM_operator_properties_filesel(struct wmOperatorType *ot, int filter, short type, short action, short flag, short display);
 void		WM_operator_properties_gesture_border(struct wmOperatorType *ot, int extend);
+void        WM_operator_properties_mouse_select(struct wmOperatorType *ot);
 void		WM_operator_properties_gesture_straightline(struct wmOperatorType *ot, int cursor);
 void		WM_operator_properties_select_all(struct wmOperatorType *ot);
 
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 7cbeab6a02e..a15d020c230 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -167,6 +167,7 @@ typedef struct wmNotifier {
 #define NC_ID				(18<<24)
 #define NC_LOGIC			(19<<24)
 #define NC_MOVIECLIP			(20<<24)
+#define NC_MASK				(21<<24)
 
 /* data type, 256 entries is enough, it can overlap */
 #define NOTE_DATA			0x00FF0000
@@ -384,7 +385,7 @@ typedef struct wmTabletData {
 	float Ytilt;		/* as above */
 } wmTabletData;
 
-typedef enum { // motion progress, for modal handlers
+typedef enum {  /* motion progress, for modal handlers */
 	P_NOT_STARTED,
 	P_STARTING,    // <--
 	P_IN_PROGRESS, // <-- only these are sent for NDOF motion
diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c
index f97391c0d6e..039f3bff4d1 100644
--- a/source/blender/windowmanager/intern/wm_cursors.c
+++ b/source/blender/windowmanager/intern/wm_cursors.c
@@ -300,7 +300,7 @@ void WM_timecursor(wmWindow *win, int nr)
  * (3 bytes = 17 bits rounded up to nearest whole byte).  Pad extra bits
  * in mask with 0's.
  *
- * Setting big_bm=NULL disables the large version of the cursor.
+ * Setting big_bm = NULL disables the large version of the cursor.
  *
  * *******************************************************************
  *
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index fccd3b387f9..c46c382c37f 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -831,7 +831,7 @@ static int wm_operator_invoke(bContext *C, wmOperatorType *ot, wmEvent *event, P
 		return WM_operator_poll(C, ot);
 
 	if (WM_operator_poll(C, ot)) {
-		wmOperator *op = wm_operator_create(wm, ot, properties, reports); /* if reports==NULL, theyll be initialized */
+		wmOperator *op = wm_operator_create(wm, ot, properties, reports); /* if reports == NULL, they'll be initialized */
 		const short is_nested_call = (wm->op_undo_depth != 0);
 		
 		/* initialize setting from previous run */
@@ -2716,7 +2716,6 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U
 		case GHOST_kEventButtonUp: {
 			GHOST_TEventButtonData *bd = customdata;
 
-			/* Note!, this starts as 0/1 but later is converted to KM_PRESS/KM_RELEASE by tweak */
 			event.val = (type == GHOST_kEventButtonDown) ? KM_PRESS : KM_RELEASE;
 			
 			if (bd->button == GHOST_kButtonMaskLeft)
diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c
index 14a25cc13e0..e4b7d1c5d5f 100644
--- a/source/blender/windowmanager/intern/wm_gesture.c
+++ b/source/blender/windowmanager/intern/wm_gesture.c
@@ -331,7 +331,7 @@ void wm_gesture_draw(wmWindow *win)
 		
 		if (gt->type == WM_GESTURE_RECT)
 			wm_gesture_draw_rect(gt);
-//		else if (gt->type==WM_GESTURE_TWEAK)
+//		else if (gt->type == WM_GESTURE_TWEAK)
 //			wm_gesture_draw_line(gt);
 		else if (gt->type == WM_GESTURE_CIRCLE)
 			wm_gesture_draw_circle(gt);
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index ab377d53ec7..431094c9ec4 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -178,7 +178,8 @@ void WM_init(bContext *C, int argc, const char **argv)
 		GPU_extensions_init();
 		GPU_set_mipmap(!(U.gameflags & USER_DISABLE_MIPMAP));
 		GPU_set_anisotropic(U.anisotropic_filter);
-	
+		GPU_set_gpu_mipmapping(U.use_gpu_mipmap);
+
 		UI_init();
 	}
 	
@@ -372,7 +373,7 @@ void WM_exit_ext(bContext *C, const short do_python)
 		wm_free_reports(C);  /* before free_blender! - since the ListBases get freed there */
 
 	seq_free_clipboard(); /* sequencer.c */
-	BKE_tracking_free_clipboard();
+	BKE_tracking_clipboard_free();
 		
 	free_blender();  /* blender.c, does entire library and spacetypes */
 //	free_matcopybuf();
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 05af3c04573..696def2cebe 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -591,7 +591,7 @@ void WM_operator_properties_alloc(PointerRNA **ptr, IDProperty **properties, con
 
 void WM_operator_properties_sanitize(PointerRNA *ptr, const short no_context)
 {
-	RNA_STRUCT_BEGIN (ptr, prop)
+	RNA_STRUCT_BEGIN(ptr, prop)
 	{
 		switch (RNA_property_type(prop)) {
 			case PROP_ENUM:
@@ -625,7 +625,7 @@ void WM_operator_properties_reset(wmOperator *op)
 		PropertyRNA *iterprop;
 		iterprop = RNA_struct_iterator_property(op->type->srna);
 
-		RNA_PROP_BEGIN (op->ptr, itemptr, iterprop)
+		RNA_PROP_BEGIN(op->ptr, itemptr, iterprop)
 		{
 			PropertyRNA *prop = itemptr.data;
 
@@ -918,6 +918,13 @@ void WM_operator_properties_gesture_border(wmOperatorType *ot, int extend)
 		RNA_def_boolean(ot->srna, "extend", 1, "Extend", "Extend selection instead of deselecting everything first");
 }
 
+void WM_operator_properties_mouse_select(wmOperatorType *ot)
+{
+	RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend selection instead of deselecting everything first");
+	RNA_def_boolean(ot->srna, "deselect", 0, "Deselect", "Remove from selection");
+	RNA_def_boolean(ot->srna, "toggle", 0, "Toggle Selection", "Toggle the selection");
+}
+
 void WM_operator_properties_gesture_straightline(wmOperatorType *ot, int cursor)
 {
 	RNA_def_int(ot->srna, "xstart", 0, INT_MIN, INT_MAX, "X Start", "", INT_MIN, INT_MAX);
@@ -1015,8 +1022,8 @@ static void dialog_exec_cb(bContext *C, void *arg1, void *arg2)
 	WM_operator_call(C, data->op);
 
 	/* let execute handle freeing it */
-	//data->free_op= FALSE;
-	//data->op= NULL;
+	//data->free_op = FALSE;
+	//data->op = NULL;
 
 	/* in this case, wm_operator_ui_popup_cancel wont run */
 	MEM_freeN(data);
@@ -1314,7 +1321,7 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar
 		menu.type = mt;
 		mt->draw(C, &menu);
 
-//		wmWindowManager *wm= CTX_wm_manager(C);
+//		wmWindowManager *wm = CTX_wm_manager(C);
 //		uiItemM(layout, C, "USERPREF_MT_keyconfigs", U.keyconfigstr, ICON_NONE);
 	}
 	
@@ -1802,7 +1809,7 @@ static int wm_link_append_exec(bContext *C, wmOperator *op)
 		BLO_library_append_named_part_ex(C, mainl, &bh, name, idcode, flag);
 	}
 	else {
-		RNA_BEGIN (op->ptr, itemptr, "files")
+		RNA_BEGIN(op->ptr, itemptr, "files")
 		{
 			RNA_string_get(&itemptr, "name", name);
 			BLO_library_append_named_part_ex(C, mainl, &bh, name, idcode, flag);
@@ -2154,33 +2161,51 @@ static int wm_collada_export_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED
 /* function used for WM_OT_save_mainfile too */
 static int wm_collada_export_exec(bContext *C, wmOperator *op)
 {
-	char filename[FILE_MAX];
-	int selected, second_life, apply_modifiers, include_bone_children;
-	
+	char filepath[FILE_MAX];
+	int apply_modifiers;
+	int export_mesh_type;
+	int selected;
+	int include_children;
+	int include_armatures;
+	int deform_bones_only;
+	int use_object_instantiation;
+	int sort_by_name;
+	int second_life; 
+
 	if (!RNA_struct_property_is_set(op->ptr, "filepath")) {
 		BKE_report(op->reports, RPT_ERROR, "No filename given");
 		return OPERATOR_CANCELLED;
 	}
 
-	RNA_string_get(op->ptr, "filepath", filename);
+	RNA_string_get(op->ptr, "filepath", filepath);
+	BLI_ensure_extension(filepath, sizeof(filepath), ".dae");
 
 	/* Options panel */
-	selected              = RNA_boolean_get(op->ptr, "selected");
-	apply_modifiers       = RNA_boolean_get(op->ptr, "apply_modifiers");
-    include_bone_children = RNA_boolean_get(op->ptr, "include_bone_children");
-
-	second_life           = RNA_boolean_get(op->ptr, "second_life");
+	apply_modifiers          = RNA_boolean_get(op->ptr, "apply_modifiers");
+	export_mesh_type       = RNA_enum_get(op->ptr, "export_mesh_type_selection");
+	selected                 = RNA_boolean_get(op->ptr, "selected");
+	include_children         = RNA_boolean_get(op->ptr, "include_children");
+	include_armatures        = RNA_boolean_get(op->ptr, "include_armatures");
+	deform_bones_only        = RNA_boolean_get(op->ptr, "deform_bones_only");
+	use_object_instantiation = RNA_boolean_get(op->ptr, "use_object_instantiation");
+	sort_by_name             = RNA_boolean_get(op->ptr, "sort_by_name");
+	second_life              = RNA_boolean_get(op->ptr, "second_life");
 
 	/* get editmode results */
 	ED_object_exit_editmode(C, 0);  /* 0 = does not exit editmode */
 
 	if (collada_export(
-		CTX_data_scene(C),
-		filename,
-		selected,
-		apply_modifiers,
-		include_bone_children,
-		second_life)) {
+	        CTX_data_scene(C),
+	        filepath,
+	        apply_modifiers,
+			export_mesh_type,
+	        selected,
+	        include_children,
+	        include_armatures,
+	        deform_bones_only,
+	        use_object_instantiation,
+	        sort_by_name,
+	        second_life)) {
 		return OPERATOR_FINISHED;
 	}
 	else {
@@ -2188,6 +2213,66 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op)
 	}
 }
 
+
+void uiCollada_exportSettings(uiLayout *layout, PointerRNA *imfptr)
+{
+	uiLayout *box, *row, *col, *sub, *split;
+
+	// Export Options:
+	box = uiLayoutBox(layout);
+	row = uiLayoutRow(box, 0);
+	uiItemL(row, IFACE_("Export Data Options:"), ICON_MESH_DATA);
+
+	row = uiLayoutRow(box, 0);
+	col = uiLayoutColumn(row, 0);
+	split = uiLayoutSplit(col, 0.5f, 0);
+	uiItemR(split, imfptr, "apply_modifiers", 0, NULL, ICON_NONE);	
+	sub = uiLayoutRow(split, 0);
+	uiItemR(sub, imfptr, "export_mesh_type_selection", UI_ITEM_R_EXPAND, IFACE_("Color"), ICON_NONE);
+	uiLayoutSetEnabled(sub, RNA_boolean_get(imfptr, "apply_modifiers"));
+
+	row = uiLayoutRow(box, 0);
+	uiItemR(row, imfptr, "selected", 0, NULL, ICON_NONE);
+
+	row = uiLayoutRow(box, 0);
+	col = uiLayoutColumn(row, 0);
+	split = uiLayoutSplit(col, 0.1f, 0);
+	sub = uiLayoutRow(split, 0);
+	uiItemR(split, imfptr, "include_children", 0, NULL, ICON_NONE);
+	uiLayoutSetEnabled(row, RNA_boolean_get(imfptr, "selected"));
+
+	row = uiLayoutRow(box, 0);
+	col = uiLayoutColumn(row, 0);
+	split = uiLayoutSplit(col, 0.1f, 0);
+	sub = uiLayoutRow(split, 0);
+	uiItemR(split, imfptr, "include_armatures", 0, NULL, ICON_NONE);
+	uiLayoutSetEnabled(row, RNA_boolean_get(imfptr, "selected"));
+
+	row = uiLayoutRow(box, 0);
+	uiItemR(row, imfptr, "deform_bones_only", 0, NULL, ICON_NONE);
+
+	// Collada options:
+	box = uiLayoutBox(layout);
+	row = uiLayoutRow(box, 0);
+	uiItemL(row, IFACE_("Collada Options:"), ICON_MODIFIER);
+
+	row = uiLayoutRow(box, 0);
+	uiItemR(row, imfptr, "use_object_instantiation", 0, NULL, ICON_NONE);
+	row = uiLayoutRow(box, 0);
+	uiItemR(row, imfptr, "sort_by_name", 0, NULL, ICON_NONE);
+	row = uiLayoutRow(box, 0);
+	uiItemR(row, imfptr, "second_life", 0, NULL, ICON_NONE);
+
+}
+
+static void wm_collada_export_draw(bContext *UNUSED(C), wmOperator *op)
+{
+	PointerRNA ptr;
+
+	RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr);
+	uiCollada_exportSettings(op->layout, &ptr);
+}
+
 static void WM_OT_collada_export(wmOperatorType *ot)
 {
 	ot->name = "Export COLLADA";
@@ -2199,22 +2284,44 @@ static void WM_OT_collada_export(wmOperatorType *ot)
 	ot->poll = WM_operator_winactive;
 
 	ot->flag |= OPTYPE_PRESET;
+
+	ot->ui = wm_collada_export_draw;
 	
 	WM_operator_properties_filesel(ot, FOLDERFILE | COLLADAFILE, FILE_BLENDER, FILE_SAVE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY);
 
+	RNA_def_boolean(ot->srna, "apply_modifiers", 0, "Apply Modifiers",
+	                "Apply modifiers (Preview Resolution)");
+
+	RNA_def_int(ot->srna, "export_mesh_type", 0, INT_MIN, INT_MAX,
+	            "Resolution", "Modifier resolution for export", INT_MIN, INT_MAX);
+
+	RNA_def_enum(ot->srna, "export_mesh_type_selection", prop_bc_export_mesh_type,
+                          0, "Resolution", "Modifier resolution for export");
+
 	RNA_def_boolean(ot->srna, "selected", 0, "Selection Only",
 	                "Export only selected elements");
 
-	RNA_def_boolean(ot->srna, "apply_modifiers", 0, "Apply Modifiers",
-	                "Apply modifiers (Preview Resolution)");
+	RNA_def_boolean(ot->srna, "include_children", 0, "Include Children",
+	                "Export all children of selected objects (even if not selected)");
+
+	RNA_def_boolean(ot->srna, "include_armatures", 0, "Include Armatures",
+	                "Export related armatures (even if not selected)");
+
+	RNA_def_boolean(ot->srna, "deform_bones_only", 0, "Deform Bones only",
+	                "Only export deforming bones with armatures");
+
 
-	RNA_def_boolean(ot->srna, "include_bone_children", 0, "Include Bone Children",
-	                "Include all objects attached to bones of selected Armature(s)");
+	RNA_def_boolean(ot->srna, "use_object_instantiation", 1, "Use Object Instances",
+	                "Instantiate multiple Objects from same Data");
+
+	RNA_def_boolean(ot->srna, "sort_by_name", 0, "Sort by Object name",
+	                "Sort exported data by Object name");
 
 	RNA_def_boolean(ot->srna, "second_life", 0, "Export for Second Life",
 	                "Compatibility mode for Second Life");
 }
 
+
 /* function used for WM_OT_save_mainfile too */
 static int wm_collada_import_exec(bContext *C, wmOperator *op)
 {
@@ -2295,7 +2402,7 @@ static void WM_OT_console_toggle(wmOperatorType *ot)
 {
 	/* XXX Have to mark these for xgettext, as under linux they do not exists...
 	 *     And even worth, have to give the context as text, as xgettext doesn't expand macros. :( */
-	ot->name = CTX_N_("Operator"/* BLF_I18NCONTEXT_OPERATOR_DEFAULT */, "Toggle System Console");
+	ot->name = CTX_N_("Operator" /* BLF_I18NCONTEXT_OPERATOR_DEFAULT */, "Toggle System Console");
 	ot->idname = "WM_OT_console_toggle";
 	ot->description = N_("Toggle System Console");
 	
@@ -2849,7 +2956,7 @@ int (*WM_gesture_lasso_path_to_array(bContext *UNUSED(C), wmOperator *op, int *m
 
 static int gesture_lasso_exec(bContext *C, wmOperator *op)
 {
-	RNA_BEGIN (op->ptr, itemptr, "path")
+	RNA_BEGIN(op->ptr, itemptr, "path")
 	{
 		float loc[2];
 		
@@ -3805,7 +3912,8 @@ static void gesture_circle_modal_keymap(wmKeyConfig *keyconf)
 		{GESTURE_MODAL_DESELECT, "DESELECT", 0, "DeSelect", ""},
 		{GESTURE_MODAL_NOP, "NOP", 0, "No Operation", ""},
 
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	wmKeyMap *keymap = WM_modalkeymap_get(keyconf, "View3D Gesture Circle");
 
@@ -3842,6 +3950,7 @@ static void gesture_circle_modal_keymap(wmKeyConfig *keyconf)
 	WM_modalkeymap_assign(keymap, "VIEW3D_OT_select_circle");
 	WM_modalkeymap_assign(keymap, "UV_OT_circle_select");
 	WM_modalkeymap_assign(keymap, "CLIP_OT_select_circle");
+	WM_modalkeymap_assign(keymap, "MASK_OT_select_circle");
 
 }
 
@@ -3852,7 +3961,8 @@ static void gesture_straightline_modal_keymap(wmKeyConfig *keyconf)
 		{GESTURE_MODAL_CANCEL,  "CANCEL", 0, "Cancel", ""},
 		{GESTURE_MODAL_SELECT,  "SELECT", 0, "Select", ""},
 		{GESTURE_MODAL_BEGIN,   "BEGIN", 0, "Begin", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 	
 	wmKeyMap *keymap = WM_modalkeymap_get(keyconf, "Gesture Straight Line");
 	
@@ -3881,7 +3991,8 @@ static void gesture_border_modal_keymap(wmKeyConfig *keyconf)
 		{GESTURE_MODAL_SELECT,  "SELECT", 0, "Select", ""},
 		{GESTURE_MODAL_DESELECT, "DESELECT", 0, "DeSelect", ""},
 		{GESTURE_MODAL_BEGIN,   "BEGIN", 0, "Begin", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	wmKeyMap *keymap = WM_modalkeymap_get(keyconf, "Gesture Border");
 
@@ -3925,6 +4036,7 @@ static void gesture_border_modal_keymap(wmKeyConfig *keyconf)
 	WM_modalkeymap_assign(keymap, "UV_OT_select_border");
 	WM_modalkeymap_assign(keymap, "CLIP_OT_select_border");
 	WM_modalkeymap_assign(keymap, "CLIP_OT_graph_select_border");
+	WM_modalkeymap_assign(keymap, "MASK_OT_select_border");
 	WM_modalkeymap_assign(keymap, "VIEW2D_OT_zoom_border");
 	WM_modalkeymap_assign(keymap, "VIEW3D_OT_clip_border");
 	WM_modalkeymap_assign(keymap, "VIEW3D_OT_render_border");
@@ -3940,7 +4052,8 @@ static void gesture_zoom_border_modal_keymap(wmKeyConfig *keyconf)
 		{GESTURE_MODAL_IN,  "IN", 0, "In", ""},
 		{GESTURE_MODAL_OUT, "OUT", 0, "Out", ""},
 		{GESTURE_MODAL_BEGIN, "BEGIN", 0, "Begin", ""},
-		{0, NULL, 0, NULL, NULL}};
+		{0, NULL, 0, NULL, NULL}
+	};
 
 	wmKeyMap *keymap = WM_modalkeymap_get(keyconf, "Gesture Zoom Border");
 
@@ -4144,3 +4257,13 @@ EnumPropertyItem *RNA_movieclip_local_itemf(bContext *C, PointerRNA *ptr, Proper
 {
 	return rna_id_itemf(C, ptr, do_free, C ? (ID *)CTX_data_main(C)->movieclip.first : NULL, TRUE);
 }
+
+EnumPropertyItem *RNA_mask_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), int *do_free)
+{
+	return rna_id_itemf(C, ptr, do_free, C ? (ID *)CTX_data_main(C)->mask.first : NULL, FALSE);
+}
+EnumPropertyItem *RNA_mask_local_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), int *do_free)
+{
+	return rna_id_itemf(C, ptr, do_free, C ? (ID *)CTX_data_main(C)->mask.first : NULL, TRUE);
+}
+
diff --git a/source/blender/windowmanager/intern/wm_subwindow.c b/source/blender/windowmanager/intern/wm_subwindow.c
index 563eef8304c..cf983f7795f 100644
--- a/source/blender/windowmanager/intern/wm_subwindow.c
+++ b/source/blender/windowmanager/intern/wm_subwindow.c
@@ -149,7 +149,7 @@ void wm_subwindow_getmatrix(wmWindow *win, int swinid, float mat[][4])
 }
 
 /* always sets pixel-precise 2D window/view matrices */
-/* coords is in whole pixels. xmin = 15, xmax= 16: means window is 2 pix big */
+/* coords is in whole pixels. xmin = 15, xmax = 16: means window is 2 pix big */
 int wm_subwindow_open(wmWindow *win, rcti *winrct)
 {
 	wmSubWindow *swin;
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index e6eff908e33..265a3c11377 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -577,12 +577,11 @@ int wm_window_fullscreen_toggle_exec(bContext *C, wmOperator *UNUSED(op))
 
 /* ************ events *************** */
 
-typedef enum
-{
-	SHIFT = 's',
-	CONTROL = 'c',
-	ALT = 'a',
-	OS = 'C'
+typedef enum {
+	SHIFT    = 's',
+	CONTROL  = 'c',
+	ALT      = 'a',
+	OS       = 'C'
 } modifierKeyType;
 
 /* check if specified modifier key type is pressed */
@@ -622,7 +621,7 @@ void wm_window_make_drawable(bContext *C, wmWindow *win)
 	wmWindowManager *wm = CTX_wm_manager(C);
 
 	if (win != wm->windrawable && win->ghostwin) {
-//		win->lmbut= 0;	/* keeps hanging when mousepressed while other window opened */
+//		win->lmbut = 0;	/* keeps hanging when mousepressed while other window opened */
 		
 		wm->windrawable = win;
 		if (G.debug & G_DEBUG_EVENTS) {
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
index 7edf5314821..99db5576fa0 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -1,4 +1,3 @@
-# -*- mode: cmake; indent-tabs-mode: t; -*-
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
@@ -32,12 +31,6 @@ if(WITH_CODEC_QUICKTIME)
 	add_definitions(-DWITH_QUICKTIME)
 endif()
 
-add_custom_command(
-	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c
-	COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_SOURCE_DIR}/source/blender/makesdna/
-	DEPENDS ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna
-)
-
 if(WIN32 AND NOT UNIX)
 	string(SUBSTRING ${BLENDER_VERSION} 0 1 bver1)
 	string(SUBSTRING ${BLENDER_VERSION} 2 1 bver2)
@@ -61,10 +54,10 @@ if(WIN32 AND NOT UNIX)
 		)
 	endif()
 
-	add_executable(blenderplayer ${EXETYPE} ${CMAKE_CURRENT_BINARY_DIR}/dna.c ../icons/winblender.rc)
+	add_executable(blenderplayer ${EXETYPE} bad_level_call_stubs/stubs.c ../icons/winblender.rc)
 
 elseif(APPLE)
-	add_executable(blenderplayer ${EXETYPE} ${CMAKE_CURRENT_BINARY_DIR}/dna.c)
+	add_executable(blenderplayer ${EXETYPE} bad_level_call_stubs/stubs.c)
 	# setup Info.plist
 	execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BLENDER_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
 	set(PLAYER_SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blenderplayer.app)
@@ -75,7 +68,7 @@ elseif(APPLE)
 		MACOSX_BUNDLE_LONG_VERSION_STRING "${BLENDER_VERSION} ${BLENDER_DATE}")
 
 else()
-	add_executable(blenderplayer ${CMAKE_CURRENT_BINARY_DIR}/dna.c)
+	add_executable(blenderplayer bad_level_call_stubs/stubs.c)
 endif()
 
 add_dependencies(blenderplayer makesdna)
@@ -102,8 +95,7 @@ endif()
 		bf_rna
 		bf_bmesh
 		bf_blenkernel
-		bf_blenloader 
-		bf_blenpluginapi 
+		bf_blenloader
 		ge_blen_routines
 		bf_editor_datafiles
 		ge_converter 
@@ -154,6 +146,7 @@ endif()
 		bf_blenkernel # duplicate for linking
 		bf_intern_mikktspace
 		extern_recastnavigation
+		bf_intern_raskter
 	)
 
 	if(WITH_MOD_CLOTH_ELTOPO)
@@ -170,6 +163,7 @@ endif()
 
 	if(WITH_LIBMV)
 		list(APPEND BLENDER_SORTED_LIBS extern_libmv)
+		list(APPEND BLENDER_SORTED_LIBS extern_ceres)
 	endif()
 
 	list(APPEND BLENDER_SORTED_LIBS extern_colamd)
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 86567873256..4c45099808c 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -228,6 +228,7 @@ void ED_space_image_uv_sculpt_update(struct wmWindowManager *wm, struct ToolSett
 
 void ED_screen_set_scene(struct bContext *C, struct Scene *scene) {}
 void ED_space_clip_set(struct bContext *C, struct SpaceClip *sc, struct MovieClip *clip) {}
+void ED_space_clip_set_mask(struct bContext *C, struct SpaceClip *sc, struct Mask *mask){}
 
 void ED_area_tag_redraw_regiontype(struct ScrArea *sa, int regiontype) {}
 void ED_render_engine_changed(struct Main *bmain) {}
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 0f674b407e2..0e1a597386f 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -1,4 +1,3 @@
-# -*- mode: cmake; indent-tabs-mode: t; -*-
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
@@ -396,14 +395,6 @@ if(UNIX AND NOT APPLE)
 		)
 	endif()
 
-		# plugins in blender 2.6 don't work at the moment.
-		#
-		# install(
-		# 	DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins
-		# 	DESTINATION ${TARGETDIR_VER}
-		# 	PATTERN ".svn" EXCLUDE
-		# )
-
 	if(WITH_PYTHON)
 		if(WITH_PYTHON_INSTALL)
 			# on some platforms (like openSUSE) Python is linked
@@ -483,14 +474,6 @@ elseif(WIN32)
 		endif()
 	endif()
 
-	# plugins in blender 2.6 don't work at the moment.
-	#
-	# install(
-	# 	DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins
-	# 	DESTINATION ${TARGETDIR_VER}
-	# 	PATTERN ".svn" EXCLUDE
-	# )
-
 	if(WITH_PYTHON)
 		set_lib_path(PYLIB "python/lib")
 		install(
@@ -840,6 +823,7 @@ endif()
 		bf_editor_sound
 		bf_editor_animation
 		bf_editor_datafiles
+		bf_editor_mask
 
 		bf_render
 		bf_intern_opennl
@@ -858,7 +842,6 @@ endif()
 		bf_blenlib
 		bf_intern_ghost
 		bf_intern_string
-		bf_blenpluginapi
 		bf_avi
 		bf_imbuf_cineon
 		bf_imbuf_openexr
@@ -912,10 +895,12 @@ endif()
 		cycles_subd
 		bf_compositor #added for opencl compositor
 		bf_opencl #added for opencl compositor
+		bf_intern_raskter
 	)
 
 	if(WITH_LIBMV)
 		list(APPEND BLENDER_SORTED_LIBS extern_libmv)
+		list(APPEND BLENDER_SORTED_LIBS extern_ceres)
 	endif()
 
 	if(WITH_MOD_CLOTH_ELTOPO)
diff --git a/source/creator/creator.c b/source/creator/creator.c
index a21497b82fa..8b6d92414c8 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -145,20 +145,22 @@ extern char build_system[];
 #endif
 
 /*	Local Function prototypes */
+#ifndef WITH_PYTHON_MODULE
 static int print_help(int argc, const char **argv, void *data);
 static int print_version(int argc, const char **argv, void *data);
+#endif
 
 /* for the callbacks: */
 
-extern int pluginapi_force_ref(void);  /* from blenpluginapi:pluginapi.c */
-
 #define BLEND_VERSION_STRING_FMT                                              \
-	"Blender %d.%02d (sub %d)\n",                                             \
-	BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION              \
+    "Blender %d.%02d (sub %d)\n",                                             \
+    BLENDER_VERSION / 100, BLENDER_VERSION % 100, BLENDER_SUBVERSION          \
 
 /* Initialize callbacks for the modules that need them */
 static void setCallbacks(void); 
 
+#ifndef WITH_PYTHON_MODULE
+
 /* set breakpoints here when running in debug mode, useful to catch floating point errors */
 #if defined(__linux__) || defined(_WIN32) || defined(OSX_SSE_FPE)
 static void fpe_handler(int UNUSED(sig))
@@ -167,7 +169,6 @@ static void fpe_handler(int UNUSED(sig))
 }
 #endif
 
-#ifndef WITH_PYTHON_MODULE
 /* handling ctrl-c event in console */
 static void blender_esc(int sig)
 {
@@ -184,7 +185,6 @@ static void blender_esc(int sig)
 		count++;
 	}
 }
-#endif
 
 static int print_version(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
 {
@@ -263,7 +263,6 @@ static int print_help(int UNUSED(argc), const char **UNUSED(argv), void *data)
 	BLI_argsPrintArgDoc(ba, "--env-system-config");
 	BLI_argsPrintArgDoc(ba, "--env-system-datafiles");
 	BLI_argsPrintArgDoc(ba, "--env-system-scripts");
-	BLI_argsPrintArgDoc(ba, "--env-system-plugins");
 	BLI_argsPrintArgDoc(ba, "--env-system-python");
 	printf("\n");
 	BLI_argsPrintArgDoc(ba, "-nojoystick");
@@ -975,7 +974,6 @@ static int set_addons(int argc, const char **argv, void *data)
 	}
 }
 
-
 static int load_file(int UNUSED(argc), const char **argv, void *data)
 {
 	bContext *C = data;
@@ -1107,7 +1105,7 @@ static void setupArguments(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle)
 #endif
 
 	BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic python script execution" PY_ENABLE_AUTO, enable_python, NULL);
-	BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic python script execution (pydrivers, pyconstraints, pynodes)" PY_DISABLE_AUTO, disable_python, NULL);
+	BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic python script execution (pydrivers & startup scripts)" PY_DISABLE_AUTO, disable_python, NULL);
 
 #undef PY_ENABLE_AUTO
 #undef PY_DISABLE_AUTO
@@ -1138,7 +1136,6 @@ static void setupArguments(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle)
 	/* TODO, add user env vars? */
 	BLI_argsAdd(ba, 1, NULL, "--env-system-datafiles",  "\n\tSet the "STRINGIFY_ARG (BLENDER_SYSTEM_DATAFILES)" environment variable", set_env, NULL);
 	BLI_argsAdd(ba, 1, NULL, "--env-system-scripts",    "\n\tSet the "STRINGIFY_ARG (BLENDER_SYSTEM_SCRIPTS)" environment variable", set_env, NULL);
-	BLI_argsAdd(ba, 1, NULL, "--env-system-plugins",    "\n\tSet the "STRINGIFY_ARG (BLENDER_SYSTEM_PLUGINS)" environment variable", set_env, NULL);
 	BLI_argsAdd(ba, 1, NULL, "--env-system-python",     "\n\tSet the "STRINGIFY_ARG (BLENDER_SYSTEM_PYTHON)" environment variable", set_env, NULL);
 
 	/* second pass: custom window stuff */
@@ -1175,6 +1172,7 @@ static void setupArguments(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle)
 	BLI_argsAdd(ba, 4, "-x", "--use-extension", "<bool>\n\tSet option to add the file extension to the end of the file", set_extension, C);
 
 }
+#endif /* WITH_PYTHON_MODULE */
 
 #ifdef WITH_PYTHON_MODULE
 /* allow python module to call main */
@@ -1195,9 +1193,12 @@ int main(int argc, const char **UNUSED(argv_c)) /* Do not mess with const */
 int main(int argc, const char **argv)
 #endif
 {
-	SYS_SystemHandle syshandle;
 	bContext *C = CTX_create();
+	SYS_SystemHandle syshandle;
+
+#ifndef WITH_PYTHON_MODULE
 	bArgs *ba;
+#endif
 
 #ifdef WIN32
 	wchar_t **argv_16 = CommandLineToArgvW(GetCommandLineW(), &argc);
@@ -1257,11 +1258,6 @@ int main(int argc, const char **argv)
 	RNA_init();
 	RE_engines_init();
 
-	/* Hack - force inclusion of the plugin api functions,
-	 * see blenpluginapi:pluginapi.c
-	 */
-	pluginapi_force_ref();
-
 	init_nodesystem();
 	
 	initglobals();  /* blender.c */
@@ -1277,10 +1273,12 @@ int main(int argc, const char **argv)
 #endif
 
 	/* first test for background */
+#ifndef WITH_PYTHON_MODULE
 	ba = BLI_argsInit(argc, (const char **)argv); /* skip binary path */
 	setupArguments(C, ba, &syshandle);
 
 	BLI_argsParse(ba, 1, NULL, NULL);
+#endif
 
 #if defined(WITH_PYTHON_MODULE) || defined(WITH_HEADLESS)
 	G.background = 1; /* python module mode ALWAYS runs in background mode (for now) */
@@ -1299,9 +1297,10 @@ int main(int argc, const char **argv)
 	init_def_material();
 
 	if (G.background == 0) {
+#ifndef WITH_PYTHON_MODULE
 		BLI_argsParse(ba, 2, NULL, NULL);
 		BLI_argsParse(ba, 3, NULL, NULL);
-
+#endif
 		WM_init(C, argc, (const char **)argv);
 
 		/* this is properly initialized with user defs, but this is default */
@@ -1313,7 +1312,9 @@ int main(int argc, const char **argv)
 #endif
 	}
 	else {
+#ifndef WITH_PYTHON_MODULE
 		BLI_argsParse(ba, 3, NULL, NULL);
+#endif
 
 		WM_init(C, argc, (const char **)argv);
 
@@ -1337,9 +1338,13 @@ int main(int argc, const char **argv)
 	WM_keymap_init(C);
 
 	/* OK we are ready for it */
+#ifndef WITH_PYTHON_MODULE
 	BLI_argsParse(ba, 4, load_file, C);
+#endif
 
+#ifndef WITH_PYTHON_MODULE
 	BLI_argsFree(ba);
+#endif
 
 #ifdef WIN32
 	while (argci) {
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h b/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
index 84991b9a9ad..43296fc9760 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
@@ -51,7 +51,7 @@ public:
 	virtual void	NextFrame();
 	virtual void	HookEscape();
 private:
-	short		m_exit_key;
+	/* short		m_exit_key; */ /* UNUSED */
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
diff --git a/source/gameengine/CMakeLists.txt b/source/gameengine/CMakeLists.txt
index 5a3d42f33e3..a205ccbdc12 100644
--- a/source/gameengine/CMakeLists.txt
+++ b/source/gameengine/CMakeLists.txt
@@ -1,4 +1,3 @@
-# -*- mode: cmake; indent-tabs-mode: t; -*-
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
diff --git a/source/gameengine/Converter/BL_ArmatureObject.cpp b/source/gameengine/Converter/BL_ArmatureObject.cpp
index f38782a9405..7174a563efa 100644
--- a/source/gameengine/Converter/BL_ArmatureObject.cpp
+++ b/source/gameengine/Converter/BL_ArmatureObject.cpp
@@ -529,7 +529,7 @@ bool BL_ArmatureObject::SetActiveAction(BL_ActionActuator *act, short priority,
 		
 			return true;
 		}
-		else{
+		else {
 			act->SetBlendTime(0.0);
 			return false;
 		}
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 196f032e584..927a0535870 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -488,11 +488,10 @@ static void GetRGB(short type,
 	}
 }
 
-typedef struct MTF_localLayer
-{
+typedef struct MTF_localLayer {
 	MTFace *face;
 	const char *name;
-}MTF_localLayer;
+} MTF_localLayer;
 
 // ------------------------------------
 bool ConvertMaterial(
@@ -1193,7 +1192,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, KX_Scene* scene,
 				twoside = ((ma->game.flag  & GEMAT_BACKCULL)==0);
 				collider = ((ma->game.flag & GEMAT_NOPHYSICS)==0);
 			}
-			else{
+			else {
 				visible = true;
 				twoside = false;
 				collider = true;
@@ -1346,6 +1345,11 @@ static PHY_ShapeProps *CreateShapePropsFromBlenderObject(struct Object* blendero
 	shapeProps->m_clamp_vel_min = blenderobject->min_vel;
 	shapeProps->m_clamp_vel_max = blenderobject->max_vel;
 	
+//  Character physics properties
+	shapeProps->m_step_height = blenderobject->step_height;
+	shapeProps->m_jump_speed = blenderobject->jump_speed;
+	shapeProps->m_fall_speed = blenderobject->fall_speed;
+	
 	return shapeProps;
 }
 
@@ -1638,6 +1642,7 @@ void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj,
 	objprop.m_dyna = (blenderobject->gameflag & OB_DYNAMIC) != 0;
 	objprop.m_softbody = (blenderobject->gameflag & OB_SOFT_BODY) != 0;
 	objprop.m_angular_rigidbody = (blenderobject->gameflag & OB_RIGID_BODY) != 0;
+	objprop.m_character = (blenderobject->gameflag & OB_CHARACTER) != 0;
 	
 	///contact processing threshold is only for rigid bodies and static geometry, not 'dynamic'
 	if (objprop.m_angular_rigidbody || !objprop.m_dyna )
@@ -1754,6 +1759,11 @@ void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj,
 		objprop.m_boundclass = KX_BOUNDMESH;
 	}
 
+	if ((blenderobject->gameflag & OB_CHARACTER) && !(blenderobject->gameflag & OB_BOUNDS))
+	{
+		objprop.m_boundclass = KX_BOUNDSPHERE;
+	}
+
 	KX_BoxBounds bb;
 	DerivedMesh* dm = NULL;
 	if (gameobj->GetDeformer())
diff --git a/source/gameengine/Converter/BL_DeformableGameObject.cpp b/source/gameengine/Converter/BL_DeformableGameObject.cpp
index dd4c51b5403..4967401f279 100644
--- a/source/gameengine/Converter/BL_DeformableGameObject.cpp
+++ b/source/gameengine/Converter/BL_DeformableGameObject.cpp
@@ -76,7 +76,7 @@ bool BL_DeformableGameObject::SetActiveAction(BL_ShapeActionActuator *act, short
 	
 		return true;
 	}
-	else{
+	else {
 		act->SetBlendTime(0.0f);
 		return false;
 	}
diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.cpp b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
index 13e79b13304..c339e10f673 100644
--- a/source/gameengine/Converter/BL_ShapeActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
@@ -316,7 +316,7 @@ bool BL_ShapeActionActuator::Update(double curtime, bool frame)
 			m_localtime += (length/m_stridelength) * deltapos.length();
 			m_lastpos = newpos;
 		}
-		else{
+		else {
 			SetLocalTime(curtime);
 		}
 	}
@@ -466,7 +466,7 @@ bool BL_ShapeActionActuator::Update(double curtime, bool frame)
 				BLI_freelistN(&tchanbase);
 			}
 		}
-		else{
+		else {
 			m_blendframe = 0.0f;
 		}
 	}
diff --git a/source/gameengine/Converter/BL_SkinDeformer.cpp b/source/gameengine/Converter/BL_SkinDeformer.cpp
index ab275fa773a..9bbf07a3ed2 100644
--- a/source/gameengine/Converter/BL_SkinDeformer.cpp
+++ b/source/gameengine/Converter/BL_SkinDeformer.cpp
@@ -49,6 +49,7 @@
 #include "DNA_action_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
+#include "DNA_modifier_types.h"
 #include "BLI_utildefines.h"
 #include "BKE_armature.h"
 #include "BKE_action.h"
@@ -66,6 +67,23 @@ extern "C"{
 #define __NLA_DEFNORMALS
 //#undef __NLA_DEFNORMALS
 
+short get_deformflags(struct Object *bmeshobj)
+{
+	short flags = ARM_DEF_VGROUP;
+
+	ModifierData *md;
+	for (md = (ModifierData*)bmeshobj->modifiers.first; md; md = (ModifierData*)md->next)
+	{
+		if (md->type == eModifierType_Armature)
+		{
+			flags |= ((ArmatureModifierData*)md)->deformflag;
+			break;
+		}
+	}
+
+	return flags;
+}
+
 BL_SkinDeformer::BL_SkinDeformer(BL_DeformableGameObject *gameobj,
 								struct Object *bmeshobj, 
 								class RAS_MeshObject *mesh,
@@ -82,6 +100,7 @@ BL_SkinDeformer::BL_SkinDeformer(BL_DeformableGameObject *gameobj,
 							m_dfnrToPC(NULL)
 {
 	copy_m4_m4(m_obmat, bmeshobj->obmat);
+	m_deformflags = get_deformflags(bmeshobj);
 };
 
 BL_SkinDeformer::BL_SkinDeformer(
@@ -107,6 +126,7 @@ BL_SkinDeformer::BL_SkinDeformer(
 		// in the calculation, so we must use the matrix of the original object to
 		// simulate a pure replacement of the mesh.
 		copy_m4_m4(m_obmat, bmeshobj_new->obmat);
+		m_deformflags = get_deformflags(bmeshobj_new);
 	}
 
 BL_SkinDeformer::~BL_SkinDeformer()
@@ -201,7 +221,7 @@ void BL_SkinDeformer::BlenderDeformVerts()
 	// set reference matrix
 	copy_m4_m4(m_objMesh->obmat, m_obmat);
 
-	armature_deform_verts( par_arma, m_objMesh, NULL, m_transverts, NULL, m_bmesh->totvert, ARM_DEF_VGROUP, NULL, NULL );
+	armature_deform_verts( par_arma, m_objMesh, NULL, m_transverts, NULL, m_bmesh->totvert, m_deformflags, NULL, NULL );
 		
 	// restore matrix 
 	copy_m4_m4(m_objMesh->obmat, obmat);
diff --git a/source/gameengine/Converter/BL_SkinDeformer.h b/source/gameengine/Converter/BL_SkinDeformer.h
index dd8577b382e..8e3d5851573 100644
--- a/source/gameengine/Converter/BL_SkinDeformer.h
+++ b/source/gameengine/Converter/BL_SkinDeformer.h
@@ -109,6 +109,7 @@ protected:
 	bool					m_recalcNormal;
 	bool					m_copyNormals; // dirty flag so we know if Apply() needs to copy normal information (used for BGEDeformVerts())
 	struct bPoseChannel**	m_dfnrToPC;
+	short					m_deformflags;
 
 	void BlenderDeformVerts();
 	void BGEDeformVerts();
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index b62e667c211..78e5d7b32c2 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -324,8 +324,9 @@ void KX_BlenderSceneConverter::ConvertScene(class KX_Scene* destinationscene,
 			{
 				CcdPhysicsEnvironment* ccdPhysEnv = new CcdPhysicsEnvironment(useDbvtCulling);
 				ccdPhysEnv->setDebugDrawer(new BlenderDebugDraw());
-				ccdPhysEnv->setDeactivationLinearTreshold(0.8f); // default, can be overridden by Python
-				ccdPhysEnv->setDeactivationAngularTreshold(1.0f); // default, can be overridden by Python
+				ccdPhysEnv->setDeactivationLinearTreshold(blenderscene->gm.lineardeactthreshold);
+				ccdPhysEnv->setDeactivationAngularTreshold(blenderscene->gm.angulardeactthreshold);
+				ccdPhysEnv->setDeactivationTime(blenderscene->gm.deactivationtime);
 
 				SYS_SystemHandle syshandle = SYS_GetSystem(); /*unused*/
 				int visualizePhysics = SYS_GetCommandLineInt(syshandle,"show_physics",0);
@@ -929,13 +930,34 @@ bool KX_BlenderSceneConverter::LinkBlendFilePath(const char *path, char *group,
 	return LinkBlendFile(bpy_openlib, path, group, scene_merge, err_str, options);
 }
 
-bool KX_BlenderSceneConverter::LinkBlendFile(BlendHandle *bpy_openlib, const char *path, char *group, KX_Scene *scene_merge, char **err_str, short options)
+static void load_datablocks(Main *main_newlib, BlendHandle *bpy_openlib, const char *path, int idcode)
 {
-	Main *main_newlib; /* stored as a dynamic 'main' until we free it */
 	Main *main_tmp= NULL; /* created only for linking, then freed */
 	LinkNode *names = NULL;
-	int idcode= BKE_idcode_from_name(group);
 	short flag= 0; /* don't need any special options */
+
+	/* here appending/linking starts */
+	main_tmp = BLO_library_append_begin(main_newlib, &bpy_openlib, (char *)path);
+
+	int totnames_dummy;
+	names = BLO_blendhandle_get_datablock_names( bpy_openlib, idcode, &totnames_dummy);
+	
+	int i=0;
+	LinkNode *n= names;
+	while(n) {
+		BLO_library_append_named_part(main_tmp, &bpy_openlib, (char *)n->link, idcode);
+		n= (LinkNode *)n->next;
+		i++;
+	}
+	BLI_linklist_free(names, free);	/* free linklist *and* each node's data */
+	
+	BLO_library_append_end(NULL, main_tmp, &bpy_openlib, idcode, flag);
+}
+
+bool KX_BlenderSceneConverter::LinkBlendFile(BlendHandle *bpy_openlib, const char *path, char *group, KX_Scene *scene_merge, char **err_str, short options)
+{
+	Main *main_newlib; /* stored as a dynamic 'main' until we free it */
+	int idcode= BKE_idcode_from_name(group);
 	ReportList reports;
 	static char err_local[255];
 	
@@ -963,40 +985,11 @@ bool KX_BlenderSceneConverter::LinkBlendFile(BlendHandle *bpy_openlib, const cha
 	main_newlib= (Main *)MEM_callocN( sizeof(Main), "BgeMain");
 	BKE_reports_init(&reports, RPT_STORE);	
 
-	/* here appending/linking starts */
-	main_tmp = BLO_library_append_begin(main_newlib, &bpy_openlib, (char *)path);
-
-	int totnames_dummy;
-	names = BLO_blendhandle_get_datablock_names( bpy_openlib, idcode, &totnames_dummy);
-	
-	int i=0;
-	LinkNode *n= names;
-	while(n) {
-		BLO_library_append_named_part(main_tmp, &bpy_openlib, (char *)n->link, idcode);
-		n= (LinkNode *)n->next;
-		i++;
-	}
-	BLI_linklist_free(names, free);	/* free linklist *and* each node's data */
-	
-	BLO_library_append_end(NULL, main_tmp, &bpy_openlib, idcode, flag);
+	load_datablocks(main_newlib, bpy_openlib, path, idcode);
 
 	/* now do another round of linking for Scenes so all actions are properly loaded */
 	if (idcode==ID_SCE && options & LIB_LOAD_LOAD_ACTIONS) {
-		main_tmp = BLO_library_append_begin(main_newlib, &bpy_openlib, (char *)path);
-
-		int totnames_dummy;
-		names = BLO_blendhandle_get_datablock_names( bpy_openlib, ID_AC, &totnames_dummy);
-	
-		int i=0;
-		LinkNode *n= names;
-		while(n) {
-			BLO_library_append_named_part(main_tmp, &bpy_openlib, (char *)n->link, ID_AC);
-			n= (LinkNode *)n->next;
-			i++;
-		}
-		BLI_linklist_free(names, free);	/* free linklist *and* each node's data */
-	
-		BLO_library_append_end(NULL, main_tmp, &bpy_openlib, ID_AC, flag);
+		load_datablocks(main_newlib, bpy_openlib, path, ID_AC);
 	}
 	
 	BLO_blendhandle_close(bpy_openlib);
diff --git a/source/gameengine/Converter/KX_ConvertSensors.cpp b/source/gameengine/Converter/KX_ConvertSensors.cpp
index fa9eb5317b9..2bd1688ca6d 100644
--- a/source/gameengine/Converter/KX_ConvertSensors.cpp
+++ b/source/gameengine/Converter/KX_ConvertSensors.cpp
@@ -302,7 +302,8 @@ void BL_ConvertSensors(struct Object* blenderobject,
 						(blenderkeybdsensor->type == SENS_ALL_KEYS),
 						blenderkeybdsensor->targetName,
 						blenderkeybdsensor->toggleName,
-						gameobj); //			blenderkeybdsensor->pad);
+						gameobj,
+						KX_KetsjiEngine::GetExitKey()); //			blenderkeybdsensor->pad);
 					
 				} 
 				
diff --git a/source/gameengine/Expressions/PyObjectPlus.h b/source/gameengine/Expressions/PyObjectPlus.h
index 278febee4ac..c50e42446a5 100644
--- a/source/gameengine/Expressions/PyObjectPlus.h
+++ b/source/gameengine/Expressions/PyObjectPlus.h
@@ -527,7 +527,7 @@ typedef struct KX_PYATTRIBUTE_DEF {
 /*------------------------------
  * PyObjectPlus
 ------------------------------*/
-typedef PyTypeObject * PyParentObject;				// Define the PyParent Object
+typedef PyTypeObject *PyParentObject;  /* Define the PyParent Object */
 
 #else // WITH_PYTHON
 
diff --git a/source/gameengine/Expressions/Value.h b/source/gameengine/Expressions/Value.h
index 00320ff9ed2..261f5244f21 100644
--- a/source/gameengine/Expressions/Value.h
+++ b/source/gameengine/Expressions/Value.h
@@ -158,7 +158,7 @@ class CAction
 public:
 	CAction() {
 	};
-	virtual ~CAction(){
+	virtual ~CAction() {
 	};
 	virtual void Execute() const =0;
 	
diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.h b/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
index a6809716e32..685cc3fcc48 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
+++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
@@ -99,7 +99,7 @@ class SCA_Joystick
 	void OnButtonDown(SDL_Event *sdl_event);
 	void OnNothing(SDL_Event *sdl_event);
 #if 0 /* not used yet */
-	void OnBallMotion(SDL_Event *sdl_event){}
+	void OnBallMotion(SDL_Event *sdl_event) {}
 #endif
 		
 #endif /* WITH_SDL */
@@ -156,27 +156,27 @@ public:
 
 	void cSetPrecision(int val);
 
-	int GetAxisPosition(int index){
+	int GetAxisPosition(int index) {
 		return m_axis_array[index];
 	}
 
-	int GetHat(int index){
+	int GetHat(int index) {
 		return m_hat_array[index];
 	}
 
-	int GetThreshold(void){
+	int GetThreshold(void) {
 		return m_prec;
 	}
 
-	bool IsTrigAxis(void){
+	bool IsTrigAxis(void) {
 		return m_istrig_axis;
 	}
 	
-	bool IsTrigButton(void){
+	bool IsTrigButton(void) {
 		return m_istrig_button;
 	}
 	
-	bool IsTrigHat(void){
+	bool IsTrigHat(void) {
 		return m_istrig_hat;
 	}
 
diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
index 07fad3bfe37..c82e015919d 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
@@ -137,7 +137,8 @@ bool SCA_JoystickSensor::Evaluate()
 				if (js->aAxisPairIsPositive(m_axis-1)) { /* use zero based axis index internally */
 					m_istrig = 1;
 					result = true;
-				}else{
+				}
+				else {
 					if (m_istrig) {
 						m_istrig = 0;
 						result = true;
@@ -148,7 +149,8 @@ bool SCA_JoystickSensor::Evaluate()
 				if (js->aAxisPairDirectionIsPositive(m_axis-1, m_axisf)) { /* use zero based axis index internally */
 					m_istrig = 1;
 					result = true;
-				}else{
+				}
+				else {
 					if (m_istrig) {
 						m_istrig = 0;
 						result = true;
@@ -168,7 +170,8 @@ bool SCA_JoystickSensor::Evaluate()
 			if (js->aAxisIsPositive(m_axis-1)) { /* use zero based axis index internally */
 				m_istrig = 1;
 				result = true;
-			}else{
+			}
+			else {
 				if (m_istrig) {
 					m_istrig = 0;
 					result = true;
@@ -209,7 +212,8 @@ bool SCA_JoystickSensor::Evaluate()
 			if ((m_bAllEvents && js->GetHat(m_hat-1)) || js->aHatIsPositive(m_hat-1, m_hatf)) {
 				m_istrig = 1;
 				result = true;
-			}else{
+			}
+			else {
 				if (m_istrig) {
 					m_istrig = 0;
 					result = true;
diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.h b/source/gameengine/GameLogic/SCA_JoystickSensor.h
index eecbf2c4183..5dc35faf244 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.h
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.h
@@ -117,7 +117,7 @@ public:
 	virtual bool IsPositiveTrigger();
 	virtual void Init();
 	
-	short int GetJoyIndex(void){
+	short int GetJoyIndex(void) {
 		return m_joyindex;
 	}
 
diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
index b39ae209d67..5bdf2e96e93 100644
--- a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
@@ -54,7 +54,8 @@ SCA_KeyboardSensor::SCA_KeyboardSensor(SCA_KeyboardManager* keybdmgr,
 									   bool bAllKeys,
 									   const STR_String& targetProp,
 									   const STR_String& toggleProp,
-									   SCA_IObject* gameobj)
+									   SCA_IObject* gameobj,
+									   short int exitKey)
 	:SCA_ISensor(gameobj,keybdmgr),
 	 m_hotkey(hotkey),
 	 m_qual(qual),
@@ -63,7 +64,7 @@ SCA_KeyboardSensor::SCA_KeyboardSensor(SCA_KeyboardManager* keybdmgr,
 	 m_targetprop(targetProp),
 	 m_toggleprop(toggleProp)
 {
-	if (hotkey == SCA_IInputDevice::KX_ESCKEY)
+	if (hotkey == exitKey)
 		keybdmgr->GetInputDevice()->HookEscape();
 //	SetDrawColor(0xff0000ff);
 	Init();
diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.h b/source/gameengine/GameLogic/SCA_KeyboardSensor.h
index 8e21d6bfde1..778929a2551 100644
--- a/source/gameengine/GameLogic/SCA_KeyboardSensor.h
+++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.h
@@ -94,7 +94,8 @@ public:
 					   bool bAllKeys,
 					   const STR_String& targetProp,
 					   const STR_String& toggleProp,
-					   SCA_IObject* gameobj);
+					   SCA_IObject* gameobj,
+					   short int exitKey);
 	virtual ~SCA_KeyboardSensor();
 	virtual CValue* GetReplica();
 	virtual void Init();
diff --git a/source/gameengine/GameLogic/SCA_PropertySensor.cpp b/source/gameengine/GameLogic/SCA_PropertySensor.cpp
index d0d940a2e42..ce183b37498 100644
--- a/source/gameengine/GameLogic/SCA_PropertySensor.cpp
+++ b/source/gameengine/GameLogic/SCA_PropertySensor.cpp
@@ -91,10 +91,10 @@ void SCA_PropertySensor::PrecalculateRangeExpression()
 		//The context is needed to retrieve the property at runtime but it creates
 		//loop of references
 		pars.SetContext(this->AddRef());
-		STR_String checkstr = "(" + m_checkpropval + " <= " 
-							+ m_checkpropname + ") && ( " 
-							+ m_checkpropname + " <= " 
-							+ m_checkpropmaxval + ")";
+		STR_String checkstr = ("(" + m_checkpropval + " <= "  +
+		                       m_checkpropname + ") && ( " +
+		                       m_checkpropname + " <= " +
+		                       m_checkpropmaxval + ")");
 
 		m_range_expr = pars.ProcessText(checkstr);
 }
diff --git a/source/gameengine/GameLogic/SCA_RandomActuator.cpp b/source/gameengine/GameLogic/SCA_RandomActuator.cpp
index 40dba3bf03a..c727eebd015 100644
--- a/source/gameengine/GameLogic/SCA_RandomActuator.cpp
+++ b/source/gameengine/GameLogic/SCA_RandomActuator.cpp
@@ -34,13 +34,13 @@
 
 
 #include <stddef.h>
+#include <math.h>
 
 #include "BoolValue.h"
 #include "IntValue.h"
 #include "FloatValue.h"
 #include "SCA_IActuator.h"
 #include "SCA_RandomActuator.h"
-#include "math.h"
 #include "MT_Transform.h"
 
 /* ------------------------------------------------------------------------- */
@@ -141,8 +141,7 @@ bool SCA_RandomActuator::Update()
 		int res; 
 		/* The [0, 1] interval is projected onto the [min, max+1] domain,    */
 		/* and then rounded.                                                 */
-		res = (int) floor( ((m_parameter2 - m_parameter1 + 1) * m_base->DrawFloat())
-						   + m_parameter1);
+		res = (int)floor( ((m_parameter2 - m_parameter1 + 1) * m_base->DrawFloat()) + m_parameter1);
 		tmpval = new CIntValue(res);
 	}
 	break;
@@ -172,8 +171,7 @@ bool SCA_RandomActuator::Update()
 	}
 	break;
 	case KX_RANDOMACT_FLOAT_UNIFORM: {
-		float res = ((m_parameter2 - m_parameter1) * m_base->DrawFloat())
-			+ m_parameter1;
+		float res = ((m_parameter2 - m_parameter1) * m_base->DrawFloat()) + m_parameter1;
 		tmpval = new CFloatValue(res);
 	}
 	break;
@@ -239,8 +237,7 @@ bool SCA_RandomActuator::Update()
 		/* controlling parameter. Using the 'normal' exponent is not very     */
 		/* intuitive...                                                       */
 		/* tmpval = new CFloatValue( (1.0 / m_parameter1)                     */
-		tmpval = new CFloatValue( (m_parameter1) 
-								  * (-log(1.0 - m_base->DrawFloat())) );
+		tmpval = new CFloatValue((m_parameter1)  * (-log(1.0 - m_base->DrawFloat())));
 
 	}
 	break;
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index 1e16cbd51f2..26cfc560b6d 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -118,8 +118,7 @@ static void mem_error_cb(const char *errorStr)
 }
 
 #ifdef WIN32
-typedef enum 
-{
+typedef enum {
   SCREEN_SAVER_MODE_NONE = 0,
   SCREEN_SAVER_MODE_PREVIEW,
   SCREEN_SAVER_MODE_SAVER,
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
index 018a8d44cc1..939f0693161 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
@@ -175,8 +175,8 @@ void KX_BlenderMaterial::OnConstruction(int layer)
 				spit("unable to initialize image("<<i<<") in "<< 
 						 mMaterial->matname<< ", image will not be available");
 		} 
-	
-		else {
+		// If we're using glsl materials, the textures are handled by bf_gpu, so don't load them twice!
+		else if (!mMaterial->glslmat) {
 			if ( mMaterial->img[i] ) {
 				if ( ! mTextures[i].InitFromImage(i, mMaterial->img[i], (mMaterial->flag[i] &MIPMAP)!=0 ))
 					spit("unable to initialize image("<<i<<") in "<< 
diff --git a/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp b/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
index f5926818e7d..abc2460a5ba 100644
--- a/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
+++ b/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
@@ -20,8 +20,8 @@
 #include "BulletSoftBody/btSoftBody.h"
 
 
-KX_BulletPhysicsController::KX_BulletPhysicsController (const CcdConstructionInfo& ci, bool dyna, bool sensor, bool compound)
-: KX_IPhysicsController(dyna,sensor,compound,(PHY_IPhysicsController*)this),
+KX_BulletPhysicsController::KX_BulletPhysicsController (const CcdConstructionInfo& ci, bool dyna, bool sensor, bool character, bool compound)
+: KX_IPhysicsController(dyna,sensor,character,compound,(PHY_IPhysicsController*)this),
 CcdPhysicsController(ci),
 m_savedCollisionFlags(0),
 m_savedCollisionFilterGroup(0),
@@ -472,7 +472,7 @@ SG_Controller*	KX_BulletPhysicsController::GetReplica(class SG_Node* destnode)
 void	KX_BulletPhysicsController::SetSumoTransform(bool nondynaonly)
 {
 
-	if (!m_bDyna && !m_bSensor)
+	if (!m_bDyna && !m_bSensor && !m_bCharacter)
 	{
 		btCollisionObject* object = GetRigidBody();
 		object->setActivationState(ACTIVE_TAG);
diff --git a/source/gameengine/Ketsji/KX_BulletPhysicsController.h b/source/gameengine/Ketsji/KX_BulletPhysicsController.h
index d2f56bccaa0..3b3a1f5cbfb 100644
--- a/source/gameengine/Ketsji/KX_BulletPhysicsController.h
+++ b/source/gameengine/Ketsji/KX_BulletPhysicsController.h
@@ -26,7 +26,7 @@ private:
 
 public:
 #ifdef USE_BULLET
-	KX_BulletPhysicsController (const CcdConstructionInfo& ci, bool dyna, bool sensor, bool compound);
+	KX_BulletPhysicsController (const CcdConstructionInfo& ci, bool dyna, bool sensor, bool character, bool compound);
 	virtual ~KX_BulletPhysicsController ();
 #endif
 	///////////////////////////////////
@@ -86,7 +86,7 @@ public:
 	SetOption(
 		int option,
 		int value
-	){
+	) {
 		// intentionally empty
 	};
 
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
index f1f58d7da9a..0f1ce403881 100644
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
@@ -72,6 +72,7 @@ struct KX_ObjectProperties
 	class KX_GameObject*	m_dynamic_parent;
 	bool	m_isactor;
 	bool	m_sensor;
+	bool	m_character;
 	bool	m_concave;
 	bool	m_isdeformable;
 	bool	m_disableSleeping;
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
index e0e8e2d9b3f..227ca39281f 100644
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
@@ -100,6 +100,7 @@ void	KX_ConvertBulletObject(	class	KX_GameObject* gameobj,
 
 	bool isbulletdyna = false;
 	bool isbulletsensor = false;
+	bool isbulletchar = false;
 	bool useGimpact = false;
 	CcdConstructionInfo ci;
 	class PHY_IMotionState* motionstate = new KX_MotionState(gameobj->GetSGNode());
@@ -122,9 +123,13 @@ void	KX_ConvertBulletObject(	class	KX_GameObject* gameobj,
 	ci.m_clamp_vel_min = shapeprops->m_clamp_vel_min;
 	ci.m_clamp_vel_max = shapeprops->m_clamp_vel_max;
 	ci.m_margin = objprop->m_margin;
+	ci.m_stepHeight = objprop->m_character ? shapeprops->m_step_height : 0.f;
+	ci.m_jumpSpeed = objprop->m_character ? shapeprops->m_jump_speed : 0.f;
+	ci.m_fallSpeed = objprop->m_character ? shapeprops->m_fall_speed : 0.f;
 	shapeInfo->m_radius = objprop->m_radius;
 	isbulletdyna = objprop->m_dyna;
 	isbulletsensor = objprop->m_sensor;
+	isbulletchar = objprop->m_character;
 	useGimpact = ((isbulletdyna || isbulletsensor) && !objprop->m_softbody);
 
 	ci.m_localInertiaTensor = btVector3(ci.m_mass/3.f,ci.m_mass/3.f,ci.m_mass/3.f);
@@ -400,21 +405,24 @@ void	KX_ConvertBulletObject(	class	KX_GameObject* gameobj,
 	////////////////////
 	ci.m_collisionFilterGroup = 
 		(isbulletsensor) ? short(CcdConstructionInfo::SensorFilter) :
-		(isbulletdyna) ? short(CcdConstructionInfo::DefaultFilter) : 
+		(isbulletdyna) ? short(CcdConstructionInfo::DefaultFilter) :
+		(isbulletchar) ? short(CcdConstructionInfo::CharacterFilter) : 
 		short(CcdConstructionInfo::StaticFilter);
 	ci.m_collisionFilterMask = 
 		(isbulletsensor) ? short(CcdConstructionInfo::AllFilter ^ CcdConstructionInfo::SensorFilter) :
 		(isbulletdyna) ? short(CcdConstructionInfo::AllFilter) : 
+		(isbulletchar) ? short(CcdConstructionInfo::AllFilter) :
 		short(CcdConstructionInfo::AllFilter ^ CcdConstructionInfo::StaticFilter);
 	ci.m_bRigid = objprop->m_dyna && objprop->m_angular_rigidbody;
 	
 	ci.m_contactProcessingThreshold = objprop->m_contactProcessingThreshold;//todo: expose this in advanced settings, just like margin, default to 10000 or so
 	ci.m_bSoft = objprop->m_softbody;
 	ci.m_bSensor = isbulletsensor;
+	ci.m_bCharacter = isbulletchar;
 	ci.m_bGimpact = useGimpact;
 	MT_Vector3 scaling = gameobj->NodeGetWorldScaling();
 	ci.m_scaling.setValue(scaling[0], scaling[1], scaling[2]);
-	KX_BulletPhysicsController* physicscontroller = new KX_BulletPhysicsController(ci,isbulletdyna,isbulletsensor,objprop->m_hasCompoundChildren);
+	KX_BulletPhysicsController* physicscontroller = new KX_BulletPhysicsController(ci,isbulletdyna,isbulletsensor,isbulletchar,objprop->m_hasCompoundChildren);
 	// shapeInfo is reference counted, decrement now as we don't use it anymore
 	if (shapeInfo)
 		shapeInfo->Release();
diff --git a/source/gameengine/Ketsji/KX_Dome.cpp b/source/gameengine/Ketsji/KX_Dome.cpp
index eaabbdd8233..6d57b6950f1 100644
--- a/source/gameengine/Ketsji/KX_Dome.cpp
+++ b/source/gameengine/Ketsji/KX_Dome.cpp
@@ -445,7 +445,8 @@ void KX_Dome::GLDrawWarpQuads(void)
 			}
 		}
 		glEnd();
-	} else{
+	}
+	else {
 		printf("Dome Error: Warp Mode %d unsupported. Try 1 for Polar Mesh or 2 for Fisheye.\n", warp.mode);
 	}
 }
@@ -502,7 +503,8 @@ bool KX_Dome::ParseWarpMesh(STR_String text)
 	if ((int)lines.size() < 2 + (warp.n_width * warp.n_height)) {
 		printf("Dome Error: Warp Mesh File with insufficient data!\n");
 		return false;
-	}else{
+	}
+	else {
 		warp.nodes = vector<vector<WarpMeshNode> > (warp.n_height, vector<WarpMeshNode>(warp.n_width));
 
 		for (i=2; i-2 < (warp.n_width*warp.n_height); i++) {
@@ -520,7 +522,7 @@ bool KX_Dome::ParseWarpMesh(STR_String text)
 				warp.nodes[nodeY][nodeX].v = atof(columns[3]);
 				warp.nodes[nodeY][nodeX].i = atof(columns[4]);
 			}
-			else{
+			else {
 				warp.nodes.clear();
 				printf("Dome Error: Warp Mesh File with wrong number of fields. You should use 5: x y u v i.\n");
 				return false;
@@ -1671,7 +1673,8 @@ void KX_Dome::DrawEnvMap(void)
 		if (can_width/3 <= can_height/2) {
 			ortho_width = 1.0;
 			ortho_height = (float)can_height/can_width;
-		}else{
+		}
+		else {
 			ortho_height = 2.0f / 3;
 			ortho_width = (float)can_width/can_height * ortho_height;
 		}
@@ -1801,7 +1804,8 @@ void KX_Dome::DrawDomeFisheye(void)
 			if (can_width < can_height) {
 				ortho_width = 1.0;
 				ortho_height = (float)can_height/can_width;
-			}else{
+			}
+			else {
 				ortho_width = (float)can_width/can_height;
 				ortho_height = 1.0;
 			}
@@ -1897,7 +1901,8 @@ void KX_Dome::DrawPanorama(void)
 		if ((can_width / 2) <= (can_height)) {
 			ortho_width = 1.0;
 			ortho_height = (float)can_height/can_width;
-		}else{
+		}
+		else {
 			ortho_width = (float)can_width/can_height * 0.5;
 			ortho_height = 0.5;
 		}
@@ -1995,7 +2000,7 @@ void KX_Dome::DrawDomeWarped(void)
 		glBindTexture(GL_TEXTURE_2D, domefacesId[m_numfaces]);
 		glCallList(dlistId + m_numfaces);
 	}
-	else{
+	else {
 		glBindTexture(GL_TEXTURE_2D, domefacesId[m_numfaces]);
 		GLDrawWarpQuads();
 	}
diff --git a/source/gameengine/Ketsji/KX_Dome.h b/source/gameengine/Ketsji/KX_Dome.h
index 313d6fd1535..125df573893 100644
--- a/source/gameengine/Ketsji/KX_Dome.h
+++ b/source/gameengine/Ketsji/KX_Dome.h
@@ -18,7 +18,7 @@ http://www.gnu.org/copyleft/lesser.txt.
 Contributor(s): Dalai Felinto
 
 This source uses some of the ideas and code from Paul Bourke.
-Developed as part of a Research and Development project for SAT - La Soci�t� des arts technologiques.
+Developed as part of a Research and Development project for SAT - La Société des arts technologiques.
 -----------------------------------------------------------------------------
 */
 
@@ -81,8 +81,9 @@ public:
 	bool	fboSupported;
 
 	//openGL names:
-	GLuint domefacesId[7];		// ID of the images -- room for 7 images, using only 4 for 180� x 360� dome, 6 for panoramic and +1 for warp mesh
-	GLuint dlistId;				// ID of the Display Lists of the images (used as an offset)
+	GLuint domefacesId[7];      /* ID of the images -- room for 7 images, using only 4 for 180deg x 360deg dome,
+	                             * 6 for panoramic and +1 for warp mesh */
+	GLuint dlistId;             /* ID of the Display Lists of the images (used as an offset) */
 	
 	typedef struct {
 		double u[3], v[3];
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h
index a173ef1ed8f..2b0d13ff2f7 100644
--- a/source/gameengine/Ketsji/KX_GameObject.h
+++ b/source/gameengine/Ketsji/KX_GameObject.h
@@ -712,7 +712,7 @@ public:
 		void						
 	AddMesh(
 		RAS_MeshObject* mesh
-	){ 
+	) {
 		m_meshes.push_back(mesh);
 	}
 
diff --git a/source/gameengine/Ketsji/KX_IPhysicsController.cpp b/source/gameengine/Ketsji/KX_IPhysicsController.cpp
index bd75246a97f..f0e57ceac02 100644
--- a/source/gameengine/Ketsji/KX_IPhysicsController.cpp
+++ b/source/gameengine/Ketsji/KX_IPhysicsController.cpp
@@ -33,10 +33,11 @@
 
 #include "PHY_DynamicTypes.h"
 
-KX_IPhysicsController::KX_IPhysicsController(bool dyna, bool sensor, bool compound, void* userdata)
+KX_IPhysicsController::KX_IPhysicsController(bool dyna, bool sensor, bool character, bool compound, void* userdata)
 
 :	m_bDyna(dyna),
 	m_bSensor(sensor),
+	m_bCharacter(character),
 	m_bCompound(compound),
 	m_suspendDynamics(false),
 	m_userdata(userdata)
diff --git a/source/gameengine/Ketsji/KX_IPhysicsController.h b/source/gameengine/Ketsji/KX_IPhysicsController.h
index 68577f09414..528bf00d574 100644
--- a/source/gameengine/Ketsji/KX_IPhysicsController.h
+++ b/source/gameengine/Ketsji/KX_IPhysicsController.h
@@ -53,11 +53,12 @@ class KX_IPhysicsController : public SG_Controller
 protected:
 	bool		m_bDyna;
 	bool		m_bSensor;
+	bool		m_bCharacter;
 	bool		m_bCompound;
 	bool		m_suspendDynamics;
 	void*		m_userdata;
 public:
-	KX_IPhysicsController(bool dyna,bool sensor,bool compound, void* userdata);
+	KX_IPhysicsController(bool dyna,bool sensor,bool character,bool compound, void* userdata);
 	virtual ~KX_IPhysicsController();
 
 
@@ -109,6 +110,10 @@ public:
 		m_bSensor = isSensor;
 	}
 
+	void	SetCharacter(bool isCharacter) {
+		m_bCharacter = isCharacter;
+	}
+
 	bool	IsDyna(void) {
 		return m_bDyna;
 	}
@@ -117,6 +122,10 @@ public:
 		return m_bSensor;
 	}
 
+	bool	IsCharacter(void) {
+		return m_bCharacter;
+	}
+
 	bool	IsCompound(void) {
 		return m_bCompound;
 	}
diff --git a/source/gameengine/Ketsji/KX_IpoActuator.cpp b/source/gameengine/Ketsji/KX_IpoActuator.cpp
index 9777eaf333e..7e7e7f8cef2 100644
--- a/source/gameengine/Ketsji/KX_IpoActuator.cpp
+++ b/source/gameengine/Ketsji/KX_IpoActuator.cpp
@@ -297,7 +297,7 @@ bool KX_IpoActuator::Update(double curtime, bool frame)
 			{
 				SetLocalTime(curtime);
 			}
-			else{
+			else {
 				if (!m_bNegativeEvent) {
 					/* Perform wraparound */
 					SetLocalTime(curtime);
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.h b/source/gameengine/Ketsji/KX_KetsjiEngine.h
index 0a50ab0a43a..f9c6d59b668 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.h
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.h
@@ -150,8 +150,7 @@ private:
 	int m_curreye;
 
 	/** Categories for profiling display. */
-	typedef enum
-	{
+	typedef enum {
 		tc_first = 0,
 		tc_physics = 0,
 		tc_logic,
diff --git a/source/gameengine/Ketsji/KX_LightIpoSGController.h b/source/gameengine/Ketsji/KX_LightIpoSGController.h
index 78466e822e7..15591bfa981 100644
--- a/source/gameengine/Ketsji/KX_LightIpoSGController.h
+++ b/source/gameengine/Ketsji/KX_LightIpoSGController.h
@@ -90,7 +90,7 @@ public:
 	SetOption(
 		int option,
 		int value
-	){
+	) {
 		// intentionally empty
 	};
 
diff --git a/source/gameengine/Ketsji/KX_MaterialIpoController.h b/source/gameengine/Ketsji/KX_MaterialIpoController.h
index 85b2a971fbe..11d92925a02 100644
--- a/source/gameengine/Ketsji/KX_MaterialIpoController.h
+++ b/source/gameengine/Ketsji/KX_MaterialIpoController.h
@@ -49,7 +49,7 @@ public:
 	SetOption(
 		int option,
 		int value
-	){
+	) {
 		// intentionally empty
 	};
 
diff --git a/source/gameengine/Ketsji/KX_NearSensor.h b/source/gameengine/Ketsji/KX_NearSensor.h
index 8655d93d406..82f523283ed 100644
--- a/source/gameengine/Ketsji/KX_NearSensor.h
+++ b/source/gameengine/Ketsji/KX_NearSensor.h
@@ -74,7 +74,7 @@ public:
 
 	virtual void ReParent(SCA_IObject* parent);
 	virtual bool	NewHandleCollision(void* obj1,void* obj2,
-						 const PHY_CollData * coll_data); 
+	                                   const PHY_CollData * coll_data);
 	virtual bool	BroadPhaseFilterCollision(void*obj1,void*obj2);
 	virtual bool	BroadPhaseSensorFilterCollision(void* obj1,void* obj2) { return false; }
 	virtual sensortype GetSensorType() { return ST_NEAR; }
diff --git a/source/gameengine/Ketsji/KX_ObColorIpoSGController.h b/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
index d2d69d6db12..d2f4c69bf47 100644
--- a/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
+++ b/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
@@ -64,7 +64,7 @@ public:
 	SetOption(
 		int option,
 		int value
-	){
+	) {
 		// intentionally empty
 	};
 
diff --git a/source/gameengine/Ketsji/KX_RadarSensor.cpp b/source/gameengine/Ketsji/KX_RadarSensor.cpp
index 678794f2beb..978944c20e8 100644
--- a/source/gameengine/Ketsji/KX_RadarSensor.cpp
+++ b/source/gameengine/Ketsji/KX_RadarSensor.cpp
@@ -212,9 +212,19 @@ PyAttributeDef KX_RadarSensor::Attributes[] = {
 	KX_PYATTRIBUTE_FLOAT_ARRAY_RO("coneOrigin", KX_RadarSensor, m_cone_origin, 3),
 	KX_PYATTRIBUTE_FLOAT_ARRAY_RO("coneTarget", KX_RadarSensor, m_cone_target, 3),
 	KX_PYATTRIBUTE_FLOAT_RO("distance", KX_RadarSensor, m_coneheight),
-	KX_PYATTRIBUTE_FLOAT_RW("angle", 0, 360, KX_RadarSensor, m_coneradius),
+	KX_PYATTRIBUTE_RO_FUNCTION("angle", KX_RadarSensor, pyattr_get_angle),
 	KX_PYATTRIBUTE_INT_RW("axis", 0, 5, true, KX_RadarSensor, m_axis),
 	{NULL} //Sentinel
 };
 
+PyObject* KX_RadarSensor::pyattr_get_angle(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+{
+	KX_RadarSensor* self= static_cast<KX_RadarSensor*>(self_v);
+
+	// The original angle from the gui was converted, so we recalculate the value here to maintain
+	// consistency between Python and the gui
+	return PyFloat_FromDouble(MT_degrees(atan(self->m_coneradius / self->m_coneheight)) * 2);
+	
+}
+
 #endif // WITH_PYTHON
diff --git a/source/gameengine/Ketsji/KX_RadarSensor.h b/source/gameengine/Ketsji/KX_RadarSensor.h
index 903413ca89b..f1ed5b3c982 100644
--- a/source/gameengine/Ketsji/KX_RadarSensor.h
+++ b/source/gameengine/Ketsji/KX_RadarSensor.h
@@ -93,6 +93,7 @@ public:
 	/* python */
 	virtual sensortype GetSensorType() { return ST_RADAR; }
 
+	static PyObject*	pyattr_get_angle(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 };
 
 #endif //__KX_RADARSENSOR_H__
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index 503c16fae9c..695ad1f945c 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -2267,7 +2267,10 @@ KX_PYMETHODDEF_DOC(KX_Scene, addObject,
 			!ConvertPythonToGameObject(pyother, &other, false, "scene.addObject(object, other, time): KX_Scene (second argument)") )
 		return NULL;
 
-
+	if (!m_inactivelist->SearchValue(ob)) {
+		PyErr_Format(PyExc_ValueError, "scene.addObject(object, other, time): KX_Scene (second argument): object does not belong to scene");
+		return NULL;
+	}
 	SCA_IObject* replica = AddReplicaObject((SCA_IObject*)ob, other, time);
 	
 	// release here because AddReplicaObject AddRef's
diff --git a/source/gameengine/Ketsji/KX_SoundActuator.h b/source/gameengine/Ketsji/KX_SoundActuator.h
index 71ec3ae2f59..dbdb17d0da5 100644
--- a/source/gameengine/Ketsji/KX_SoundActuator.h
+++ b/source/gameengine/Ketsji/KX_SoundActuator.h
@@ -43,8 +43,7 @@
 
 #include "BKE_sound.h"
 
-typedef struct KX_3DSoundSettings
-{
+typedef struct KX_3DSoundSettings {
 	float min_gain;
 	float max_gain;
 	float reference_distance;
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.h b/source/gameengine/Ketsji/KX_TouchSensor.h
index 1a22067f9ac..d739144d70d 100644
--- a/source/gameengine/Ketsji/KX_TouchSensor.h
+++ b/source/gameengine/Ketsji/KX_TouchSensor.h
@@ -93,8 +93,10 @@ public:
 	virtual void UnregisterSumo(KX_TouchEventManager* touchman);
 	virtual void UnregisterToManager();
 
-//	virtual DT_Bool HandleCollision(void* obj1,void* obj2,
-//						 const DT_CollData * coll_data); 
+#if 0
+	virtual DT_Bool HandleCollision(void* obj1,void* obj2,
+	                                const DT_CollData * coll_data);
+#endif
 
 	virtual bool	NewHandleCollision(void*obj1,void*obj2,const PHY_CollData* colldata);
 
diff --git a/source/gameengine/Ketsji/KX_WorldIpoController.h b/source/gameengine/Ketsji/KX_WorldIpoController.h
index 1f60280e355..9578130b51e 100644
--- a/source/gameengine/Ketsji/KX_WorldIpoController.h
+++ b/source/gameengine/Ketsji/KX_WorldIpoController.h
@@ -88,7 +88,7 @@ public:
 	SetOption(
 		int option,
 		int value
-	){
+	) {
 		// intentionally empty
 	};
 
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
index 6c1e2998bdb..21158a9461d 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
@@ -22,6 +22,7 @@ subject to the following restrictions:
 
 #include "CcdPhysicsController.h"
 #include "btBulletDynamicsCommon.h"
+#include "BulletCollision/CollisionDispatch/btGhostObject.h"
 #include "BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h"
 
 #include "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h"
@@ -59,8 +60,8 @@ extern float gDeactivationTime;
 extern bool gDisableDeactivation;
 
 
-float gLinearSleepingTreshold = 0.8f;
-float gAngularSleepingTreshold = 1.0f;
+float gLinearSleepingTreshold;
+float gAngularSleepingTreshold;
 
 
 btVector3 startVel(0,0,0);//-10000);
@@ -88,7 +89,7 @@ CcdPhysicsController::CcdPhysicsController (const CcdConstructionInfo& ci)
 		m_shapeInfo->AddRef();
 	
 	m_bulletMotionState = 0;
-	
+	m_characterController = 0;
 	
 	CreateRigidbody();
 	
@@ -151,6 +152,24 @@ public:
 
 };
 
+class BlenderBulletCharacterController : public btKinematicCharacterController
+{
+private:
+	btMotionState* m_motionState;
+
+public:
+	BlenderBulletCharacterController(btMotionState *motionState, btPairCachingGhostObject *ghost, btConvexShape* shape, float stepHeight)
+		: btKinematicCharacterController(ghost,shape,stepHeight,2),
+		  m_motionState(motionState)
+	{
+	}
+
+	virtual void updateAction(btCollisionWorld *collisionWorld, btScalar dt)
+	{
+		btKinematicCharacterController::updateAction(collisionWorld,dt);
+		m_motionState->setWorldTransform(getGhostObject()->getWorldTransform());
+	}
+};
 
 btRigidBody* CcdPhysicsController::GetRigidBody()
 {
@@ -164,6 +183,10 @@ btSoftBody* CcdPhysicsController::GetSoftBody()
 {
 	return btSoftBody::upcast(m_object);
 }
+btKinematicCharacterController* CcdPhysicsController::GetCharacterController()
+{
+	return m_characterController;
+}
 
 #include "BulletSoftBody/btSoftBodyHelpers.h"
 
@@ -425,6 +448,29 @@ bool CcdPhysicsController::CreateSoftbody()
 	return true;
 }
 
+bool CcdPhysicsController::CreateCharacterController()
+{
+	if (!m_cci.m_bCharacter)
+		return false;
+ 
+	m_object = new btPairCachingGhostObject();
+	m_object->setCollisionShape(m_collisionShape);
+	m_object->setCollisionFlags(btCollisionObject::CF_CHARACTER_OBJECT);
+
+	btTransform trans;
+	m_bulletMotionState->getWorldTransform(trans);
+	m_object->setWorldTransform(trans);
+
+	m_characterController = new BlenderBulletCharacterController(m_bulletMotionState,(btPairCachingGhostObject*)m_object,(btConvexShape*)m_collisionShape,m_cci.m_stepHeight);
+
+	PHY__Vector3 gravity;
+	m_cci.m_physicsEnv->getGravity(gravity);
+	m_characterController->setGravity(-gravity.m_vec[2]); // need positive gravity
+	m_characterController->setJumpSpeed(m_cci.m_jumpSpeed);
+	m_characterController->setFallSpeed(m_cci.m_fallSpeed);
+
+	return true;
+}
 
 void CcdPhysicsController::CreateRigidbody()
 {
@@ -433,7 +479,7 @@ void CcdPhysicsController::CreateRigidbody()
 	m_bulletMotionState = new BlenderBulletMotionState(m_MotionState);
 
 	///either create a btCollisionObject, btRigidBody or btSoftBody
-	if (CreateSoftbody())
+	if (CreateSoftbody() || CreateCharacterController())
 		// soft body created, done
 		return;
 
@@ -473,6 +519,7 @@ void CcdPhysicsController::CreateRigidbody()
 			body->setAngularFactor(0.f);
 		}
 		body->setContactProcessingThreshold(m_cci.m_contactProcessingThreshold);
+		body->setSleepingThresholds(gLinearSleepingTreshold, gAngularSleepingTreshold);
 
 	}
 	if (m_object && m_cci.m_do_anisotropic)
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
index 2228b6511ce..63c267443aa 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
@@ -29,6 +29,7 @@ subject to the following restrictions:
 ///	PHY_IPhysicsController is the abstract simplified Interface to a physical object.
 ///	It contains the IMotionState and IDeformableMesh Interfaces.
 #include "btBulletDynamicsCommon.h"
+#include "BulletDynamics/Character/btKinematicCharacterController.h"
 #include "LinearMath/btTransform.h"
 
 #include "PHY_IMotionState.h"
@@ -221,7 +222,8 @@ struct CcdConstructionInfo
 		KinematicFilter = 4,
 		DebrisFilter = 8,
 		SensorFilter = 16,
-		AllFilter = DefaultFilter | StaticFilter | KinematicFilter | DebrisFilter | SensorFilter,
+		CharacterFilter = 32,
+		AllFilter = DefaultFilter | StaticFilter | KinematicFilter | DebrisFilter | SensorFilter | CharacterFilter,
 	};
 
 
@@ -301,6 +303,10 @@ struct CcdConstructionInfo
 	btScalar	m_margin;
 
 	////////////////////
+	float	m_stepHeight;
+	float	m_jumpSpeed;
+	float	m_fallSpeed;
+	
 	int		m_gamesoftFlag;
 	float	m_soft_linStiff;			/* linear stiffness 0..1 */
 	float	m_soft_angStiff;		/* angular stiffness 0..1 */
@@ -343,6 +349,7 @@ struct CcdConstructionInfo
 	bool		m_bRigid;
 	bool		m_bSoft;
 	bool		m_bSensor;
+	bool		m_bCharacter;
 	bool		m_bGimpact;			// use Gimpact for mesh body
 
 	///optional use of collision group/mask:
@@ -391,6 +398,7 @@ class CcdPhysicsController : public PHY_IPhysicsController
 {
 protected:
 	btCollisionObject* m_object;
+	btKinematicCharacterController* m_characterController;
 	
 
 	class PHY_IMotionState*		m_MotionState;
@@ -417,6 +425,7 @@ protected:
 
 	void CreateRigidbody();
 	bool CreateSoftbody();
+	bool CreateCharacterController();
 
 	bool Register()	{ 
 		return (m_registerCount++ == 0) ? true : false;
@@ -453,6 +462,7 @@ protected:
 		btRigidBody* GetRigidBody();
 		btCollisionObject*	GetCollisionObject();
 		btSoftBody* GetSoftBody();
+		btKinematicCharacterController* GetCharacterController();
 
 		CcdShapeConstructionInfo* GetShapeInfo() { return m_shapeInfo; }
 
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
index ba0d3f18b1d..343cb549337 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
@@ -26,6 +26,7 @@ subject to the following restrictions:
 #include <algorithm>
 #include "btBulletDynamicsCommon.h"
 #include "LinearMath/btIDebugDraw.h"
+#include "BulletCollision/CollisionDispatch/btGhostObject.h"
 #include "BulletCollision/CollisionDispatch/btSimulationIslandManager.h"
 #include "BulletSoftBody/btSoftRigidDynamicsWorld.h"
 #include "BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h"
@@ -369,6 +370,7 @@ m_scalingPropagated(false)
 
 	m_filterCallback = new CcdOverlapFilterCallBack(this);
 	m_broadphase->getOverlappingPairCache()->setOverlapFilterCallback(m_filterCallback);
+	m_broadphase->getOverlappingPairCache()->setInternalGhostPairCallback(new btGhostPairCallback());
 
 	setSolverType(1);//issues with quickstep and memory allocations
 //	m_dynamicsWorld = new btDiscreteDynamicsWorld(dispatcher,m_broadphase,m_solver,m_collisionConfiguration);
@@ -406,7 +408,11 @@ void	CcdPhysicsEnvironment::addCcdPhysicsController(CcdPhysicsController* ctrl)
 		{
 			if (obj->getCollisionShape())
 			{
-				m_dynamicsWorld->addCollisionObject(obj,ctrl->GetCollisionFilterGroup(), ctrl->GetCollisionFilterMask());
+				m_dynamicsWorld->addCollisionObject(obj, ctrl->GetCollisionFilterGroup(), ctrl->GetCollisionFilterMask());
+			}
+			if (ctrl->GetCharacterController())
+			{
+				m_dynamicsWorld->addAction(ctrl->GetCharacterController());
 			}
 		}
 	}
@@ -713,8 +719,8 @@ void	CcdPhysicsEnvironment::processFhSprings(double curTime,float interval)
 					{
 						if (ctrl->getConstructionInfo().m_do_fh) 
 						{
-							btVector3 lspot = cl_object->getCenterOfMassPosition()
-								+ rayDirLocal * resultCallback.m_closestHitFraction;
+							btVector3 lspot = cl_object->getCenterOfMassPosition() +
+							        rayDirLocal * resultCallback.m_closestHitFraction;
 
 
 								
diff --git a/source/gameengine/Physics/common/PHY_Pro.h b/source/gameengine/Physics/common/PHY_Pro.h
index 110d4731cdc..b930177d3a8 100644
--- a/source/gameengine/Physics/common/PHY_Pro.h
+++ b/source/gameengine/Physics/common/PHY_Pro.h
@@ -46,6 +46,9 @@ struct PHY_ShapeProps {
 	bool       m_do_anisotropic;        // Should I do anisotropic friction? 
 	bool       m_do_fh;                 // Should the object have a linear Fh spring?
 	bool       m_do_rot_fh;             // Should the object have an angular Fh spring?
+	MT_Scalar  m_step_height;			// Max height of climbable steps (Character)
+	MT_Scalar  m_jump_speed;			// Velocity of jumps (Character)
+	MT_Scalar  m_fall_speed;			// Max velocity of falling (Character)
 };
 
 
diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
index 95a2dc59c5e..0a1958e509a 100644
--- a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
@@ -53,7 +53,7 @@
 RAS_2DFilterManager::RAS_2DFilterManager():
 texturewidth(-1), textureheight(-1),
 canvaswidth(-1), canvasheight(-1),
-numberoffilters(0), need_tex_update(true)
+/* numberoffilters(0), */ /* UNUSED */ need_tex_update(true)
 {
 	isshadersupported = GLEW_ARB_shader_objects &&
 		GLEW_ARB_fragment_shader && GLEW_ARB_multitexture;
diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.h b/source/gameengine/Rasterizer/RAS_2DFilterManager.h
index d3b23deab52..c9af48fe516 100644
--- a/source/gameengine/Rasterizer/RAS_2DFilterManager.h
+++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.h
@@ -57,14 +57,14 @@ private:
  
 	float			canvascoord[4];
 	float			textureoffsets[18];
-	float			view[4];
+	/* float			view[4]; */ /* UNUSED */
 	/* texname[0] contains render to texture, texname[1] contains depth texture,  texname[2] contains luminance texture*/
 	unsigned int	texname[3]; 
 	int				texturewidth;
 	int				textureheight;
 	int				canvaswidth;
 	int				canvasheight;
-	int				numberoffilters;
+	/* int				numberoffilters; */ /* UNUSED */
 	/* bit 0: enable/disable depth texture
 	 * bit 1: enable/disable luminance texture*/
 	short			texflag[MAX_RENDER_PASS];
diff --git a/source/gameengine/Rasterizer/RAS_LightObject.h b/source/gameengine/Rasterizer/RAS_LightObject.h
index c378a9ea0c2..ddf360683cd 100644
--- a/source/gameengine/Rasterizer/RAS_LightObject.h
+++ b/source/gameengine/Rasterizer/RAS_LightObject.h
@@ -36,7 +36,7 @@
 
 struct RAS_LightObject
 {
-	enum LightType{
+	enum LightType {
 		LIGHT_SPOT,
 		LIGHT_SUN,
 		LIGHT_NORMAL
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.h b/source/gameengine/Rasterizer/RAS_MeshObject.h
index b3e84c4656b..ffe2964c058 100644
--- a/source/gameengine/Rasterizer/RAS_MeshObject.h
+++ b/source/gameengine/Rasterizer/RAS_MeshObject.h
@@ -57,7 +57,7 @@ class RAS_Deformer;
 class RAS_MeshObject
 {
 private:
-	unsigned int				m_debugcolor;
+	/* unsigned int				m_debugcolor; */ /* UNUSED */
 
 	bool						m_bModified;
 	bool						m_bMeshModified;
diff --git a/source/gameengine/SceneGraph/SG_ParentRelation.h b/source/gameengine/SceneGraph/SG_ParentRelation.h
index 689ada84edd..4140563828f 100644
--- a/source/gameengine/SceneGraph/SG_ParentRelation.h
+++ b/source/gameengine/SceneGraph/SG_ParentRelation.h
@@ -76,8 +76,7 @@ public :
 
 	virtual 
 	~SG_ParentRelation(
-	){
-	};
+	) {};
 
 	/** 
 	 * You must provide a way of duplicating an
diff --git a/source/gameengine/VideoTexture/Exception.cpp b/source/gameengine/VideoTexture/Exception.cpp
index dc63a867e30..8609cd73875 100644
--- a/source/gameengine/VideoTexture/Exception.cpp
+++ b/source/gameengine/VideoTexture/Exception.cpp
@@ -27,7 +27,7 @@ http://www.gnu.org/copyleft/lesser.txt.
 #include <sstream>
 #include <fstream>
 
-#include <PyObjectPlus.h>
+#include "PyObjectPlus.h"
 
 #include "Exception.h"
 
diff --git a/source/gameengine/VideoTexture/FilterBase.cpp b/source/gameengine/VideoTexture/FilterBase.cpp
index 6fa249ff00a..90ea8436ffe 100644
--- a/source/gameengine/VideoTexture/FilterBase.cpp
+++ b/source/gameengine/VideoTexture/FilterBase.cpp
@@ -27,7 +27,7 @@ http://www.gnu.org/copyleft/lesser.txt.
 
 #include "FilterBase.h"
 
-#include <PyObjectPlus.h>
+#include "PyObjectPlus.h"
 #include <structmember.h>
 
 
diff --git a/source/gameengine/VideoTexture/FilterBase.h b/source/gameengine/VideoTexture/FilterBase.h
index cd25a7ea313..63561c25ffa 100644
--- a/source/gameengine/VideoTexture/FilterBase.h
+++ b/source/gameengine/VideoTexture/FilterBase.h
@@ -29,7 +29,7 @@ http://www.gnu.org/copyleft/lesser.txt.
 
 #include "Common.h"
 
-#include <PyObjectPlus.h>
+#include "PyObjectPlus.h"
 
 #include "PyTypeList.h"
 
diff --git a/source/gameengine/VideoTexture/FilterBlueScreen.cpp b/source/gameengine/VideoTexture/FilterBlueScreen.cpp
index fb5a83c7043..02a6a8f0344 100644
--- a/source/gameengine/VideoTexture/FilterBlueScreen.cpp
+++ b/source/gameengine/VideoTexture/FilterBlueScreen.cpp
@@ -24,7 +24,7 @@ http://www.gnu.org/copyleft/lesser.txt.
  *  \ingroup bgevideotex
  */
 
-#include <PyObjectPlus.h>
+#include "PyObjectPlus.h"
 #include <structmember.h>
 
 #include "FilterBlueScreen.h"
diff --git a/source/gameengine/VideoTexture/FilterColor.cpp b/source/gameengine/VideoTexture/FilterColor.cpp
index f3931c7e047..ed75b4f8da8 100644
--- a/source/gameengine/VideoTexture/FilterColor.cpp
+++ b/source/gameengine/VideoTexture/FilterColor.cpp
@@ -24,7 +24,7 @@ http://www.gnu.org/copyleft/lesser.txt.
  *  \ingroup bgevideotex
  */
 
-#include <PyObjectPlus.h>
+#include "PyObjectPlus.h"
 #include <structmember.h>
 
 #include "FilterColor.h"
diff --git a/source/gameengine/VideoTexture/FilterColor.h b/source/gameengine/VideoTexture/FilterColor.h
index 9b1976cf40f..cd61900bbda 100644
--- a/source/gameengine/VideoTexture/FilterColor.h
+++ b/source/gameengine/VideoTexture/FilterColor.h
@@ -91,9 +91,9 @@ protected:
 	/// calculate one color component
 	unsigned char calcColor (unsigned int val, short idx)
 	{
-		return (((m_matrix[idx][0]  * (VT_R(val)) + m_matrix[idx][1] * (VT_G(val))
-			+ m_matrix[idx][2] * (VT_B(val)) + m_matrix[idx][3] * (VT_A(val))
-			+ m_matrix[idx][4]) >> 8) & 0xFF);
+		return (((m_matrix[idx][0]  * (VT_R(val)) + m_matrix[idx][1] * (VT_G(val)) +
+		          m_matrix[idx][2] * (VT_B(val)) + m_matrix[idx][3] * (VT_A(val)) +
+		          m_matrix[idx][4]) >> 8) & 0xFF);
 	}
 
 	/// filter pixel template, source int buffer
diff --git a/source/gameengine/VideoTexture/FilterNormal.cpp b/source/gameengine/VideoTexture/FilterNormal.cpp
index aacbc87a414..dda1a493291 100644
--- a/source/gameengine/VideoTexture/FilterNormal.cpp
+++ b/source/gameengine/VideoTexture/FilterNormal.cpp
@@ -24,7 +24,7 @@ http://www.gnu.org/copyleft/lesser.txt.
  *  \ingroup bgevideotex
  */
 
-#include <PyObjectPlus.h>
+#include "PyObjectPlus.h"
 #include <structmember.h>
 
 #include "FilterNormal.h"
diff --git a/source/gameengine/VideoTexture/FilterSource.cpp b/source/gameengine/VideoTexture/FilterSource.cpp
index c5c164822a5..e5fe4711cff 100644
--- a/source/gameengine/VideoTexture/FilterSource.cpp
+++ b/source/gameengine/VideoTexture/FilterSource.cpp
@@ -26,7 +26,7 @@ http://www.gnu.org/copyleft/lesser.txt.
 
 // implementation
 
-#include <PyObjectPlus.h>
+#include "PyObjectPlus.h"
 #include <structmember.h>
 
 #include "FilterSource.h"
diff --git a/source/gameengine/VideoTexture/ImageBase.cpp b/source/gameengine/VideoTexture/ImageBase.cpp
index b1d77d8807f..090b4f6ff4a 100644
--- a/source/gameengine/VideoTexture/ImageBase.cpp
+++ b/source/gameengine/VideoTexture/ImageBase.cpp
@@ -33,7 +33,7 @@ extern "C" {
 #include <vector>
 #include <string.h>
 
-#include <PyObjectPlus.h>
+#include "PyObjectPlus.h"
 #include <structmember.h>
 
 #include "FilterBase.h"
@@ -444,9 +444,9 @@ PyObject * Image_getImage (PyImage * self, char * mode)
 				// get an empty buffer
 				buffer = BGL_MakeBuffer( GL_BYTE, 1, &dimensions, NULL);
 				// and fill it
-				for (i=0, d=(unsigned char*)buffer->buf.asbyte, s=(unsigned char*)image; 
-					 i<pixels; 
-					 ++i, d+=ncolor, s+=4)
+				for (i = 0, d = (unsigned char *)buffer->buf.asbyte, s = (unsigned char *)image;
+				     i < pixels;
+				     i++, d += ncolor, s += 4)
 				{
 					for (c=0; c<ncolor; c++)
 					{
diff --git a/source/gameengine/VideoTexture/ImageBase.h b/source/gameengine/VideoTexture/ImageBase.h
index 91c7dce9637..6c38b107a4d 100644
--- a/source/gameengine/VideoTexture/ImageBase.h
+++ b/source/gameengine/VideoTexture/ImageBase.h
@@ -30,7 +30,7 @@ http://www.gnu.org/copyleft/lesser.txt.
 #include "Common.h"
 
 #include <vector>
-#include <PyObjectPlus.h>
+#include "PyObjectPlus.h"
 
 #include "PyTypeList.h"
 
diff --git a/source/gameengine/VideoTexture/ImageBuff.cpp b/source/gameengine/VideoTexture/ImageBuff.cpp
index d28babfcc90..9854da0ea86 100644
--- a/source/gameengine/VideoTexture/ImageBuff.cpp
+++ b/source/gameengine/VideoTexture/ImageBuff.cpp
@@ -26,7 +26,7 @@ http://www.gnu.org/copyleft/lesser.txt.
 
 // implementation
 
-#include <PyObjectPlus.h>
+#include "PyObjectPlus.h"
 #include <structmember.h>
 
 #include "ImageBuff.h"
diff --git a/source/gameengine/VideoTexture/ImageMix.cpp b/source/gameengine/VideoTexture/ImageMix.cpp
index e2409920230..cd8c6683a7f 100644
--- a/source/gameengine/VideoTexture/ImageMix.cpp
+++ b/source/gameengine/VideoTexture/ImageMix.cpp
@@ -27,7 +27,7 @@ http://www.gnu.org/copyleft/lesser.txt.
 
 // implementation
 
-#include <PyObjectPlus.h>
+#include "PyObjectPlus.h"
 #include <structmember.h>
 
 #include "ImageMix.h"
diff --git a/source/gameengine/VideoTexture/ImageRender.cpp b/source/gameengine/VideoTexture/ImageRender.cpp
index 98a3dc8f96a..97e52e3af3d 100644
--- a/source/gameengine/VideoTexture/ImageRender.cpp
+++ b/source/gameengine/VideoTexture/ImageRender.cpp
@@ -26,7 +26,7 @@ http://www.gnu.org/copyleft/lesser.txt.
 
 // implementation
 
-#include <PyObjectPlus.h>
+#include "PyObjectPlus.h"
 #include <structmember.h>
 #include <float.h>
 #include <math.h>
diff --git a/source/gameengine/VideoTexture/ImageRender.h b/source/gameengine/VideoTexture/ImageRender.h
index 0062175e0af..df6337e1c24 100644
--- a/source/gameengine/VideoTexture/ImageRender.h
+++ b/source/gameengine/VideoTexture/ImageRender.h
@@ -30,12 +30,12 @@ http://www.gnu.org/copyleft/lesser.txt.
 
 #include "Common.h"
 
-#include <KX_Scene.h>
-#include <KX_Camera.h>
-#include <DNA_screen_types.h>
-#include <RAS_ICanvas.h>
-#include <RAS_IRasterizer.h>
-#include <RAS_IRenderTools.h>
+#include "KX_Scene.h"
+#include "KX_Camera.h"
+#include "DNA_screen_types.h"
+#include "RAS_ICanvas.h"
+#include "RAS_IRasterizer.h"
+#include "RAS_IRenderTools.h"
 
 #include "ImageViewport.h"
 
diff --git a/source/gameengine/VideoTexture/ImageViewport.cpp b/source/gameengine/VideoTexture/ImageViewport.cpp
index 12f1fa0e20c..a780fdcc38c 100644
--- a/source/gameengine/VideoTexture/ImageViewport.cpp
+++ b/source/gameengine/VideoTexture/ImageViewport.cpp
@@ -26,7 +26,7 @@ http://www.gnu.org/copyleft/lesser.txt.
 
 // implementation
 
-#include <PyObjectPlus.h>
+#include "PyObjectPlus.h"
 #include <structmember.h>
 
 #include "GL/glew.h"
diff --git a/source/gameengine/VideoTexture/PyTypeList.cpp b/source/gameengine/VideoTexture/PyTypeList.cpp
index 508ce233def..ed53e8bd1f1 100644
--- a/source/gameengine/VideoTexture/PyTypeList.cpp
+++ b/source/gameengine/VideoTexture/PyTypeList.cpp
@@ -29,7 +29,7 @@ http://www.gnu.org/copyleft/lesser.txt.
 #include <memory>
 #include <vector>
 
-#include <PyObjectPlus.h>
+#include "PyObjectPlus.h"
 
 /// destructor
 PyTypeList::~PyTypeList()
diff --git a/source/gameengine/VideoTexture/PyTypeList.h b/source/gameengine/VideoTexture/PyTypeList.h
index e0f7480438d..aa1df0ce54b 100644
--- a/source/gameengine/VideoTexture/PyTypeList.h
+++ b/source/gameengine/VideoTexture/PyTypeList.h
@@ -32,7 +32,7 @@ http://www.gnu.org/copyleft/lesser.txt.
 #include <memory>
 #include <vector>
 
-#include <PyObjectPlus.h>
+#include "PyObjectPlus.h"
 
 // forward declaration
 class PyTypeListItem;
diff --git a/source/gameengine/VideoTexture/Texture.cpp b/source/gameengine/VideoTexture/Texture.cpp
index 382d3d0bc32..f08a5a4a0b3 100644
--- a/source/gameengine/VideoTexture/Texture.cpp
+++ b/source/gameengine/VideoTexture/Texture.cpp
@@ -26,22 +26,22 @@ http://www.gnu.org/copyleft/lesser.txt.
 
 // implementation
 
-#include <PyObjectPlus.h>
+#include "PyObjectPlus.h"
 #include <structmember.h>
 
-#include <KX_GameObject.h>
-#include <KX_Light.h>
-#include <RAS_MeshObject.h>
-#include <DNA_mesh_types.h>
-#include <DNA_meshdata_types.h>
-#include <DNA_image_types.h>
-#include <IMB_imbuf_types.h>
-#include <KX_PolygonMaterial.h>
+#include "KX_GameObject.h"
+#include "KX_Light.h"
+#include "RAS_MeshObject.h"
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+#include "DNA_image_types.h"
+#include "IMB_imbuf_types.h"
+#include "KX_PolygonMaterial.h"
 
-#include <MEM_guardedalloc.h>
+#include "MEM_guardedalloc.h"
 
-#include <KX_BlenderMaterial.h>
-#include <BL_Texture.h>
+#include "KX_BlenderMaterial.h"
+#include "BL_Texture.h"
 
 #include "KX_KetsjiEngine.h"
 #include "KX_PythonInit.h"
diff --git a/source/gameengine/VideoTexture/Texture.h b/source/gameengine/VideoTexture/Texture.h
index d6e2ba0174f..ad5b7b9fb44 100644
--- a/source/gameengine/VideoTexture/Texture.h
+++ b/source/gameengine/VideoTexture/Texture.h
@@ -27,12 +27,12 @@ http://www.gnu.org/copyleft/lesser.txt.
 #ifndef __TEXTURE_H__
 #define __TEXTURE_H__
 
-#include <PyObjectPlus.h>
+#include "PyObjectPlus.h"
 #include <structmember.h>
 
-#include <DNA_image_types.h>
-#include <BL_Texture.h>
-#include <KX_BlenderMaterial.h>
+#include "DNA_image_types.h"
+#include "BL_Texture.h"
+#include "KX_BlenderMaterial.h"
 
 #include "ImageBase.h"
 #include "BlendType.h"
diff --git a/source/gameengine/VideoTexture/VideoBase.h b/source/gameengine/VideoTexture/VideoBase.h
index 7ad3c6a9c77..3657a20b841 100644
--- a/source/gameengine/VideoTexture/VideoBase.h
+++ b/source/gameengine/VideoTexture/VideoBase.h
@@ -28,7 +28,7 @@ http://www.gnu.org/copyleft/lesser.txt.
 #define __VIDEOBASE_H__
 
 
-#include <PyObjectPlus.h>
+#include "PyObjectPlus.h"
 
 #include "ImageBase.h"
 
diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.cpp b/source/gameengine/VideoTexture/VideoFFmpeg.cpp
index 99f2431ac1e..f4d3fb75223 100644
--- a/source/gameengine/VideoTexture/VideoFFmpeg.cpp
+++ b/source/gameengine/VideoTexture/VideoFFmpeg.cpp
@@ -588,7 +588,8 @@ void VideoFFmpeg::openCam (char * file, short camIdx)
 	AVInputFormat		*inputFormat;
 	AVFormatParameters	formatParams;
 	AVRational			frameRate;
-	char				*p, filename[28], rateStr[20];
+	char				filename[28], rateStr[20];
+	char                *p;
 
 	do_init_ffmpeg();
 
diff --git a/source/gameengine/VideoTexture/blendVideoTex.cpp b/source/gameengine/VideoTexture/blendVideoTex.cpp
index a82935c30bf..627da57baac 100644
--- a/source/gameengine/VideoTexture/blendVideoTex.cpp
+++ b/source/gameengine/VideoTexture/blendVideoTex.cpp
@@ -24,7 +24,7 @@ http://www.gnu.org/copyleft/lesser.txt.
  *  \ingroup bgevideotex
  */
 
-#include <PyObjectPlus.h>
+#include "PyObjectPlus.h"
 
 #include <RAS_GLExtensionManager.h>
 
diff --git a/source/tests/CMakeLists.txt b/source/tests/CMakeLists.txt
index 74a0ad1c628..2bad58699a8 100644
--- a/source/tests/CMakeLists.txt
+++ b/source/tests/CMakeLists.txt
@@ -1,4 +1,3 @@
-# -*- mode: cmake; indent-tabs-mode: t; -*-
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or